From ad9bb0f654664157fc5ef06e495544102c4119db Mon Sep 17 00:00:00 2001
From: Lars Francke <git@lars-francke.de>
Date: Mon, 15 Jul 2024 10:03:15 +0200
Subject: [PATCH 1/4] WIP

---
 hadoop/Dockerfile                             |   160 +-
 .../3.4.0/01-remove-hadoop-archive-logs.patch |  2194 +
 .../3.4.0/02-remove-hadoop-archives.patch     |  2315 +
 .../3.4.0/03-remove-hadoop-benchmark.patch    |   470 +
 .../3.4.0/04-remove-hadoop-datajoin.patch     |  1631 +
 .../3.4.0/05-remove-hadoop-dynamometer.patch  | 16095 +++++
 .../3.4.0/06-remove-hadoop-extras.patch       |  1420 +
 .../3.4.0/07-remove-hadoop-gridmix.patch      | 20311 ++++++
 .../3.4.0/08-remove-hadoop-kafka.patch        |   572 +
 .../3.4.0/09-remove-hadoop-openstack.patch    |   103 +
 .../3.4.0/10-remove-hadoop-pipes.patch        |  3191 +
 .../11-remove-hadoop-resourceestimator.patch  | 10758 +++
 .../patches/3.4.0/12-remove-hadoop-sls.patch  | 59834 ++++++++++++++++
 .../3.4.0/13-remove-hadoop-rumen.patch        | 17825 +++++
 .../3.4.0/14-remove-hadoop-streaming.patch    | 16871 +++++
 .../patches/3.4.0/15-hadoop-yarn-csi.patch    |  4142 ++
 .../3.4.0/16-remove-hadoop-yarn-ui.patch      | 47411 ++++++++++++
 .../17-remove-hadoop-yarn-registry.patch      |    68 +
 ...ove-hadoop-yarn-applications-catalog.patch | 10509 +++
 ...p-yarn-applications-distributedshell.patch |  7270 ++
 ...remove-hadoop-yarn-applications-mawo.patch |  2674 +
 ...n-applications-unmanaged-am-launcher.patch |   974 +
 .../22-remove-hadoop-yarn-services.patch      | 39503 ++++++++++
 .../23-remove-hadoop-yarn-applications.patch  |    82 +
 .../24-remove-hadoop-yarn-server-router.patch | 44560 ++++++++++++
 ...op-yarn-server-globalpolicygenerator.patch |  5330 ++
 ...p-yarn-server-timeline-pluginstorage.patch |  4196 ++
 ...-hadoop-client-check-test-invariants.patch |   376 +
 ...move-hadoop-client-integration-tests.patch |   630 +
 .../29-remove-hadoop-client-minicluster.patch |  1171 +
 ...adoop-yarn-server-sharedcachemanager.patch |  4544 ++
 hadoop/stackable/patches/3.4.0/series         |    31 +
 .../001-YARN-11527-3.4.0.patch                |     0
 ...datanode-registration-override-3.4.0.patch |     0
 .../003-add-perf-event-itimer-3.4.0.patch     |     0
 .../004-HDFS-17378-3.4.0.patch                |     0
 36 files changed, 327086 insertions(+), 135 deletions(-)
 create mode 100644 hadoop/stackable/patches/3.4.0/01-remove-hadoop-archive-logs.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/02-remove-hadoop-archives.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/03-remove-hadoop-benchmark.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/04-remove-hadoop-datajoin.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/05-remove-hadoop-dynamometer.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/06-remove-hadoop-extras.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/07-remove-hadoop-gridmix.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/08-remove-hadoop-kafka.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/09-remove-hadoop-openstack.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/10-remove-hadoop-pipes.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/11-remove-hadoop-resourceestimator.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/12-remove-hadoop-sls.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/13-remove-hadoop-rumen.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/14-remove-hadoop-streaming.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/15-hadoop-yarn-csi.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/16-remove-hadoop-yarn-ui.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/17-remove-hadoop-yarn-registry.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/18-remove-hadoop-yarn-applications-catalog.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/19-remove-hadoop-yarn-applications-distributedshell.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/20-remove-hadoop-yarn-applications-mawo.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/21-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/22-remove-hadoop-yarn-services.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/23-remove-hadoop-yarn-applications.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/24-remove-hadoop-yarn-server-router.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/25-remove-hadoop-yarn-server-globalpolicygenerator.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/26-remove-hadoop-yarn-server-timeline-pluginstorage.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/27-remove-hadoop-client-check-test-invariants.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/28-remove-hadoop-client-integration-tests.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/29-remove-hadoop-client-minicluster.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/30-remove-hadoop-yarn-server-sharedcachemanager.patch
 create mode 100644 hadoop/stackable/patches/3.4.0/series
 rename hadoop/stackable/patches/{3.4.0 => old3.4.0}/001-YARN-11527-3.4.0.patch (100%)
 rename hadoop/stackable/patches/{3.4.0 => old3.4.0}/002-datanode-registration-override-3.4.0.patch (100%)
 rename hadoop/stackable/patches/{3.4.0 => old3.4.0}/003-add-perf-event-itimer-3.4.0.patch (100%)
 rename hadoop/stackable/patches/{3.4.0 => old3.4.0}/004-HDFS-17378-3.4.0.patch (100%)

diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile
index f5e00e2f6..99973f2fe 100644
--- a/hadoop/Dockerfile
+++ b/hadoop/Dockerfile
@@ -5,7 +5,7 @@
 # hadolint global ignore=DL3038,DL4006
 
 # hadolint ignore=DL3006
-FROM stackable/image/java-devel AS builder
+FROM stackable/image/java-devel AS hadoop-builder
 
 ARG PRODUCT
 ARG ASYNC_PROFILER
@@ -25,25 +25,31 @@ COPY hadoop/stackable/fuse_dfs_wrapper /stackable/fuse_dfs_wrapper
 # At the same time a new HDFS Operator will still work with older images which do not have the symlink to the versionless jar.
 # After one of our next releases (23.11 or 24.x) we should update the operator to point at the non-versioned symlink (jmx_prometheus_javaagent.jar)
 # And then we can also remove the symlink to 0.16.1 from this Dockerfile.
-RUN curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" && \
-    chmod -x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" && \
-    ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar && \
-    ln -s /stackable/jmx/jmx_prometheus_javaagent.jar /stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar
+RUN <<EOF
+curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
+chmod -x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
+ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
+ln -s /stackable/jmx/jmx_prometheus_javaagent.jar /stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar
+#TODO: Can the symlink go?
 
-RUN ARCH="${TARGETARCH/amd64/x64}" && \
-    curl --fail -L "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC . && \
-    ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
+ARCH="${TARGETARCH/amd64/x64}"
+curl --fail -L "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC .
+ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
 
 # This Protobuf version is the exact version as used in the Hadoop Dockerfile
 # See https://github.com/apache/hadoop/blob/trunk/dev-support/docker/pkg-resolver/install-protobuf.sh
 # (this was hardcoded in the Dockerfile in earlier versions of Hadoop, make sure to look at the exact version in Github)
-WORKDIR /opt/protobuf-src
-RUN curl --fail -L -s -S https://repo.stackable.tech/repository/packages/protobuf/protobuf-java-${PROTOBUF}.tar.gz -o /opt/protobuf.tar.gz && \
-    tar xzf /opt/protobuf.tar.gz --strip-components 1 --no-same-owner && \
-    ./configure --prefix=/opt/protobuf && \
-    make "-j$(nproc)" && \
-    make install && \
-    rm -rf /opt/protobuf-src
+# At the time of writing we could save around ~350MB if we included this in the later RUN statement and deleted it afterwards
+mkdir /opt/protobuf-src
+cd /opt/protobuf-src
+curl --fail -L -s -S https://repo.stackable.tech/repository/packages/protobuf/protobuf-java-${PROTOBUF}.tar.gz -o /opt/protobuf.tar.gz
+tar xzf /opt/protobuf.tar.gz --strip-components 1 --no-same-owner
+./configure --prefix=/opt/protobuf
+make "-j$(nproc)"
+make install
+rm -rf /opt/protobuf-src
+rm -f /opt/protobuf.tar.gz
+EOF
 
 ENV PROTOBUF_HOME=/opt/protobuf
 ENV PATH="${PATH}:/opt/protobuf/bin"
@@ -56,6 +62,7 @@ RUN microdnf update && \
     microdnf clean all && \
     rm -rf /var/cache/yum
 
+USER stackable
 WORKDIR /stackable
 
 COPY hadoop/stackable/patches /stackable/patches
@@ -65,123 +72,6 @@ COPY hadoop/stackable/patches /stackable/patches
 # Also skip building the yarn, mapreduce and minicluster modules: this will result in the modules being excluded but not all
 # jar files will be stripped if they are needed elsewhere e.g. share/hadoop/yarn will not be part of the build, but yarn jars
 # will still exist in share/hadoop/tools as they would be needed by the resource estimator tool. Such jars are removed in a later step.
-RUN curl --fail -L "https://repo.stackable.tech/repository/packages/hadoop/hadoop-${PRODUCT}-src.tar.gz" | tar -xzC . && \
-    patches/apply_patches.sh ${PRODUCT} && \
-    cd hadoop-${PRODUCT}-src && \
-    mvn clean package -Pdist,native -pl '!hadoop-tools/hadoop-pipes,!hadoop-yarn-project,!hadoop-mapreduce-project,!hadoop-minicluster' -Drequire.fuse=true -DskipTests -Dmaven.javadoc.skip=true && \
-    cp -r hadoop-dist/target/hadoop-${PRODUCT} /stackable/hadoop-${PRODUCT} && \
-    # HDFS fuse-dfs is not part of the regular dist output, so we need to copy it in ourselves
-    cp hadoop-hdfs-project/hadoop-hdfs-native-client/target/main/native/fuse-dfs/fuse_dfs /stackable/hadoop-${PRODUCT}/bin && \
-    rm -rf /stackable/hadoop-${PRODUCT}-src
-
-# For earlier versions this script removes the .class file that contains the
-# vulnerable code.
-# TODO: This can be restricted to target only versions which do not honor the environment
-#   varible that has been set above but this has not currently been implemented
-COPY shared/log4shell.sh /bin
-RUN /bin/log4shell.sh "/stackable/hadoop-${PRODUCT}"
-
-# Ensure no vulnerable files are left over
-# This will currently report vulnerable files being present, as it also alerts on
-# SocketNode.class, which we do not remove with our scripts.
-# Further investigation will be needed whether this should also be removed.
-COPY shared/log4shell_1.6.1-log4shell_Linux_x86_64 /bin/log4shell_scanner_x86_64
-COPY shared/log4shell_1.6.1-log4shell_Linux_aarch64 /bin/log4shell_scanner_aarch64
-COPY shared/log4shell_scanner /bin/log4shell_scanner
-RUN /bin/log4shell_scanner s "/stackable/hadoop-${PRODUCT}"
-# ===
-
-FROM stackable/image/java-devel AS hdfs-utils-builder
-
-ARG HDFS_UTILS
-ARG PRODUCT
-
-WORKDIR /stackable
-
-# The Stackable HDFS utils contain an OPA authorizer, group mapper & topology provider.
-# The topology provider provides rack awareness functionality for HDFS by allowing users to specify Kubernetes
-# labels to build a rackID from.
-# Starting with hdfs-utils version 0.3.0 the topology provider is not a standalone jar anymore and included in hdfs-utils.
-
-RUN curl --fail -L "https://github.com/stackabletech/hdfs-utils/archive/refs/tags/v${HDFS_UTILS}.tar.gz" | tar -xzC . && \
-    cd hdfs-utils-${HDFS_UTILS} && \
-    mvn clean package -P hadoop-${PRODUCT} -DskipTests -Dmaven.javadoc.skip=true && \
-    mkdir -p /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib && \
-    cp target/hdfs-utils-$HDFS_UTILS.jar /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar && \
-    rm -rf /stackable/hdfs-utils-main
-
-FROM stackable/image/java-base AS final
-
-ARG PRODUCT
-ARG RELEASE
-ARG HDFS_UTILS
-
-LABEL name="Apache Hadoop" \
-      maintainer="info@stackable.tech" \
-      vendor="Stackable GmbH" \
-      version="${PRODUCT}" \
-      release="${RELEASE}" \
-      summary="The Stackable image for Apache Hadoop." \
-      description="This image is deployed by the Stackable Operator for Apache Hadoop / HDFS."
-
-# fuse is required for fusermount (called by fuse_dfs)
-# fuse-libs is required for fuse_dfs (not included in fuse)
-# openssl -> not sure
-RUN microdnf update && \
-    microdnf install \
-    fuse \
-    fuse-libs \
-    # tar is required for `kubectl cp` which can be used to copy the log files
-    # or profiler flamegraph from the Pod
-    tar && \
-    microdnf clean all && \
-    rm -rf /var/cache/yum
-
-COPY hadoop/licenses /licenses
-
-# Without this fuse_dfs does not work
-# It is so non-root users (as we are) can mount a FUSE device and let other users access it
-RUN echo "user_allow_other" > /etc/fuse.conf
-
-USER stackable
-WORKDIR /stackable
-
-COPY --chown=stackable:stackable --from=builder /stackable/hadoop-${PRODUCT} /stackable/hadoop-${PRODUCT}/
-COPY --chown=stackable:stackable --from=builder /stackable/jmx /stackable/jmx/
-COPY --chown=stackable:stackable --from=builder /stackable/async-profiler /stackable/async-profiler/
-COPY --chown=stackable:stackable --from=hdfs-utils-builder /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar
-RUN ln -s /stackable/hadoop-${PRODUCT} /stackable/hadoop
-
-COPY hadoop/stackable/fuse_dfs_wrapper /stackable/hadoop/bin
-
-ENV HOME=/stackable
-ENV LD_LIBRARY_PATH=/stackable/hadoop/lib/native:/usr/lib/jvm/jre/lib/server
-ENV PATH="${PATH}":/stackable/hadoop/bin
-ENV HADOOP_HOME=/stackable/hadoop
-ENV HADOOP_CONF_DIR=/stackable/config
-ENV ASYNC_PROFILER_HOME=/stackable/async-profiler
-# The following 2 env-vars are required for common scripts even if the respective libraries are never used.
-# HADOOP_HOME is often used internally if HADOOP_YARN_HOME/HADOOP_MAPRED_HOME are not set, although
-# a subdirectory is also required in (at least)
-#   hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
-# if HADOOP_YARN_HOME does not exist at all, so we set it here to a sensible default.
-ENV HADOOP_YARN_HOME=/stackable/hadoop
-ENV HADOOP_MAPRED_HOME=/stackable/hadoop
-
-# Remove unneeded binaries:
-#  - code sources
-#  - mapreduce/yarn binaries that were built as cross-project dependencies
-#  - minicluster (only used for testing) and test .jars
-#  - json-io: this is a transitive dependency pulled in by cedarsoft/java-utils/json-io and is excluded in 3.4.0. See CVE-2023-34610.
-RUN rm -rf /stackable/hadoop/share/hadoop/common/sources/ && \
-  rm -rf /stackable/hadoop/share/hadoop/hdfs/sources/ && \
-  rm -rf /stackable/hadoop/share/hadoop/tools/sources/ && \
-  rm -rf /stackable/hadoop/share/hadoop/tools/lib/json-io-*.jar && \
-  rm -rf /stackable/hadoop/share/hadoop/tools/lib/hadoop-mapreduce-client-*.jar && \
-  rm -rf /stackable/hadoop/share/hadoop/tools/lib/hadoop-yarn-server*.jar && \
-  find . -name 'hadoop-minicluster-*.jar' -type f -delete && \
-  find . -name 'hadoop-client-minicluster-*.jar' -type f -delete && \
-  find . -name 'hadoop-*tests.jar' -type f -delete
-
-WORKDIR /stackable/hadoop
-CMD ["echo", "This image is not meant to be 'run' directly."]
+RUN <<EOF
+curl --fail -L "https://repo.stackable.tech/repository/packages/hadoop/hadoop-${PRODUCT}-src.tar.gz" | tar -xzC .
+EOF
diff --git a/hadoop/stackable/patches/3.4.0/01-remove-hadoop-archive-logs.patch b/hadoop/stackable/patches/3.4.0/01-remove-hadoop-archive-logs.patch
new file mode 100644
index 000000000..99ddc156d
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/01-remove-hadoop-archive-logs.patch
@@ -0,0 +1,2194 @@
+Remove hadoop-archive-logs entirely
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 
+ hadoop-project/pom.xml                             |    5 
+ hadoop-project/src/site/site.xml                   |    7 
+ .../dev-support/findbugs-exclude.xml               |   32 -
+ hadoop-tools/hadoop-archive-logs/pom.xml           |  210 ------
+ .../org/apache/hadoop/tools/HadoopArchiveLogs.java |  708 --------------------
+ .../hadoop/tools/HadoopArchiveLogsRunner.java      |  240 -------
+ .../src/main/shellprofile.d/hadoop-archive-logs.sh |   37 -
+ .../src/site/markdown/HadoopArchiveLogs.md         |  102 ---
+ .../src/site/resources/css/site.css                |   30 -
+ .../apache/hadoop/tools/TestHadoopArchiveLogs.java |  441 ------------
+ .../hadoop/tools/TestHadoopArchiveLogsRunner.java  |  193 -----
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 14 files changed, 3 insertions(+), 2023 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogsRunner.java
+ delete mode 100755 hadoop-tools/hadoop-archive-logs/src/main/shellprofile.d/hadoop-archive-logs.sh
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/site/markdown/HadoopArchiveLogs.md
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java
+ delete mode 100644 hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index c01d9c42820..ee9e9040ec8 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -23,14 +23,6 @@
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
+   <fileSets>
+-    <fileSet>
+-      <directory>../hadoop-archive-logs/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-archives/src/main/shellprofile.d</directory>
+       <includes>
+@@ -98,13 +90,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-archive-logs/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-datajoin/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 0ed96d087bc..f9255e5bdf3 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -646,11 +646,6 @@
+         <artifactId>hadoop-archives</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-archive-logs</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 8e85f379ef7..a0a58657161 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -71,7 +71,7 @@
+       <item name="Registry" href="hadoop-project-dist/hadoop-common/registry/index.html"/>
+       <item name="Async Profiler" href="hadoop-project-dist/hadoop-common/AsyncProfilerServlet.html" />
+     </menu>
+-    
++
+     <menu name="HDFS" inherit="top">
+       <item name="Architecture" href="hadoop-project-dist/hadoop-hdfs/HdfsDesign.html"/>
+       <item name="User Guide" href="hadoop-project-dist/hadoop-hdfs/HdfsUserGuide.html"/>
+@@ -90,7 +90,7 @@
+       <item name="libhdfs (C API)" href="hadoop-project-dist/hadoop-hdfs/LibHdfs.html"/>
+       <item name="WebHDFS (REST API)" href="hadoop-project-dist/hadoop-hdfs/WebHDFS.html"/>
+       <item name="HttpFS" href="hadoop-hdfs-httpfs/index.html"/>
+-      <item name="Short Circuit Local Reads" 
++      <item name="Short Circuit Local Reads"
+           href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/>
+       <item name="Centralized Cache Management" href="hadoop-project-dist/hadoop-hdfs/CentralizedCacheManagement.html"/>
+       <item name="NFS Gateway" href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
+@@ -192,7 +192,6 @@
+     <menu name="Tools" inherit="top">
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="Hadoop Archives" href="hadoop-archives/HadoopArchives.html"/>
+-      <item name="Hadoop Archive Logs" href="hadoop-archive-logs/HadoopArchiveLogs.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+@@ -209,7 +208,7 @@
+       <item name="Unix Shell API" href="hadoop-project-dist/hadoop-common/UnixShellAPI.html"/>
+       <item name="Metrics" href="hadoop-project-dist/hadoop-common/Metrics.html"/>
+     </menu>
+-    
++
+     <menu name="Configuration" inherit="top">
+       <item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
+       <item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
+diff --git a/hadoop-tools/hadoop-archive-logs/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-archive-logs/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 7f2064ea24d..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,32 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-  <!--
+-   Ignore warnings for usage of System.exit. These are appropriate.
+-  -->
+-  <Match>
+-    <Class name="org.apache.hadoop.tools.HadoopArchiveLogs" />
+-    <Method name="handleOpts" />
+-    <Bug pattern="DM_EXIT" />
+-  </Match>
+-  <Match>
+-    <Class name="org.apache.hadoop.tools.HadoopArchiveLogs" />
+-    <Method name="run" />
+-    <Bug pattern="DM_EXIT" />
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-archive-logs/pom.xml b/hadoop-tools/hadoop-archive-logs/pom.xml
+deleted file mode 100644
+index e0dfd280d62..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/pom.xml
++++ /dev/null
+@@ -1,210 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-archive-logs</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Archive Logs</description>
+-  <name>Apache Hadoop Archive Logs</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-archives</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-io</groupId>
+-      <artifactId>commons-io</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-cli</groupId>
+-      <artifactId>commons-cli</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-         <configuration>
+-          <archive>
+-           <manifest>
+-            <mainClass>org.apache.hadoop.tools.HadoopArchiveLogs</mainClass>
+-           </manifest>
+-         </archive>
+-        </configuration>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>
+-            ${basedir}/dev-support/findbugs-exclude.xml
+-          </excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java b/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
+deleted file mode 100644
+index 9b28ca406d6..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
++++ /dev/null
+@@ -1,708 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.commons.io.output.FileWriterWithEncoding;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.LogAggregationStatus;
+-import org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster;
+-import org.apache.hadoop.yarn.applications.distributedshell.Client;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileController;
+-import org.apache.hadoop.yarn.logaggregation.filecontroller.LogAggregationFileControllerFactory;
+-import org.apache.hadoop.yarn.util.ConverterUtils;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.Comparator;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Set;
+-
+-
+-/**
+- * This tool moves Aggregated Log files into HAR archives using the
+- * {@link HadoopArchives} tool and the Distributed Shell via the
+- * {@link HadoopArchiveLogsRunner}.
+- */
+-public class HadoopArchiveLogs implements Tool {
+-  private static final Logger LOG = LoggerFactory.getLogger(HadoopArchiveLogs.class);
+-
+-  private static final String HELP_OPTION = "help";
+-  private static final String MAX_ELIGIBLE_APPS_OPTION = "maxEligibleApps";
+-  private static final String MIN_NUM_LOG_FILES_OPTION = "minNumberLogFiles";
+-  private static final String MAX_TOTAL_LOGS_SIZE_OPTION = "maxTotalLogsSize";
+-  private static final String MEMORY_OPTION = "memory";
+-  private static final String VERBOSE_OPTION = "verbose";
+-  private static final String FORCE_OPTION = "force";
+-  private static final String NO_PROXY_OPTION = "noProxy";
+-
+-  private static final int DEFAULT_MAX_ELIGIBLE = -1;
+-  private static final int DEFAULT_MIN_NUM_LOG_FILES = 20;
+-  private static final long DEFAULT_MAX_TOTAL_LOGS_SIZE = 1024L;
+-  private static final long DEFAULT_MEMORY = 1024L;
+-
+-  @VisibleForTesting
+-  int maxEligible = DEFAULT_MAX_ELIGIBLE;
+-  @VisibleForTesting
+-  int minNumLogFiles = DEFAULT_MIN_NUM_LOG_FILES;
+-  @VisibleForTesting
+-  long maxTotalLogsSize = DEFAULT_MAX_TOTAL_LOGS_SIZE * 1024L * 1024L;
+-  @VisibleForTesting
+-  long memory = DEFAULT_MEMORY;
+-  private boolean verbose = false;
+-  @VisibleForTesting
+-  boolean force = false;
+-  @VisibleForTesting
+-  boolean proxy = true;
+-
+-  @VisibleForTesting
+-  Set<AppInfo> eligibleApplications;
+-
+-  private Set<Path> workingDirs;
+-
+-  private JobConf conf;
+-
+-  public HadoopArchiveLogs(Configuration conf) {
+-    setConf(conf);
+-    eligibleApplications = new HashSet<>();
+-    workingDirs = new HashSet<>();
+-  }
+-
+-  public static void main(String[] args) {
+-    JobConf job = new JobConf(HadoopArchiveLogs.class);
+-
+-    HadoopArchiveLogs hal = new HadoopArchiveLogs(job);
+-    int ret = 0;
+-
+-    try{
+-      ret = ToolRunner.run(hal, args);
+-    } catch(Exception e) {
+-      LOG.debug("Exception", e);
+-      System.err.println(e.getClass().getSimpleName());
+-      final String s = e.getLocalizedMessage();
+-      if (s != null) {
+-        System.err.println(s);
+-      } else {
+-        e.printStackTrace(System.err);
+-      }
+-      System.exit(1);
+-    }
+-    System.exit(ret);
+-  }
+-
+-  @Override
+-  public int run(String[] args) throws Exception {
+-    int exitCode = 1;
+-
+-    handleOpts(args);
+-
+-    FileSystem fs = null;
+-
+-    LogAggregationFileControllerFactory factory =
+-        new LogAggregationFileControllerFactory(conf);
+-    List<LogAggregationFileController> fileControllers = factory
+-        .getConfiguredLogAggregationFileControllerList();
+-    if (fileControllers == null || fileControllers.isEmpty()) {
+-      LOG.info("Can not find any valid fileControllers.");
+-      if (verbose) {
+-        LOG.info("The configurated fileControllers:"
+-            + YarnConfiguration.LOG_AGGREGATION_FILE_FORMATS);
+-      }
+-      return 0;
+-    }
+-    try {
+-      fs = FileSystem.get(conf);
+-      // find eligibleApplications for all the fileControllers
+-      int previousTotal = 0;
+-      for (LogAggregationFileController fileController : fileControllers) {
+-        Path remoteRootLogDir = fileController.getRemoteRootLogDir();
+-        String suffix = fileController.getRemoteRootLogDirSuffix();
+-        Path workingDir = new Path(remoteRootLogDir, "archive-logs-work");
+-        if (verbose) {
+-          LOG.info("LogAggregationFileController:" + fileController
+-              .getClass().getName());
+-          LOG.info("Remote Log Dir Root: " + remoteRootLogDir);
+-          LOG.info("Log Suffix: " + suffix);
+-          LOG.info("Working Dir: " + workingDir);
+-        }
+-        checkFilesAndSeedApps(fs, remoteRootLogDir, suffix, workingDir);
+-
+-        filterAppsByAggregatedStatus();
+-
+-        if (eligibleApplications.size() > previousTotal) {
+-          workingDirs.add(workingDir);
+-          previousTotal = eligibleApplications.size();
+-        }
+-      }
+-      checkMaxEligible();
+-      if (workingDirs.isEmpty() || eligibleApplications.isEmpty()) {
+-        LOG.info("No eligible applications to process");
+-        return 0;
+-      }
+-      for (Path workingDir : workingDirs) {
+-        if (!prepareWorkingDir(fs, workingDir)) {
+-          LOG.error("Failed to create the workingDir:"
+-              + workingDir.toString());
+-          return 1;
+-        }
+-      }
+-      StringBuilder sb =
+-          new StringBuilder("Will process the following applications:");
+-      for (AppInfo app : eligibleApplications) {
+-        sb.append("\n\t").append(app.getAppId());
+-      }
+-      LOG.info(sb.toString());
+-      File localScript = File.createTempFile("hadoop-archive-logs-", ".sh");
+-      generateScript(localScript);
+-
+-      exitCode = runDistributedShell(localScript) ? 0 : 1;
+-    } finally {
+-      if (fs != null) {
+-        // Cleanup working directory
+-        for (Path workingDir : workingDirs) {
+-          fs.delete(workingDir, true);
+-        }
+-        fs.close();
+-      }
+-    }
+-    return exitCode;
+-  }
+-
+-  private void handleOpts(String[] args) throws ParseException {
+-    Options opts = new Options();
+-    Option helpOpt = new Option(HELP_OPTION, false, "Prints this message");
+-    Option maxEligibleOpt = new Option(MAX_ELIGIBLE_APPS_OPTION, true,
+-        "The maximum number of eligible apps to process (default: "
+-            + DEFAULT_MAX_ELIGIBLE + " (all))");
+-    maxEligibleOpt.setArgName("n");
+-    Option minNumLogFilesOpt = new Option(MIN_NUM_LOG_FILES_OPTION, true,
+-        "The minimum number of log files required to be eligible (default: "
+-            + DEFAULT_MIN_NUM_LOG_FILES + ")");
+-    minNumLogFilesOpt.setArgName("n");
+-    Option maxTotalLogsSizeOpt = new Option(MAX_TOTAL_LOGS_SIZE_OPTION, true,
+-        "The maximum total logs size (in megabytes) required to be eligible" +
+-            " (default: " + DEFAULT_MAX_TOTAL_LOGS_SIZE + ")");
+-    maxTotalLogsSizeOpt.setArgName("megabytes");
+-    Option memoryOpt = new Option(MEMORY_OPTION, true,
+-        "The amount of memory (in megabytes) for each container (default: "
+-            + DEFAULT_MEMORY + ")");
+-    memoryOpt.setArgName("megabytes");
+-    Option verboseOpt = new Option(VERBOSE_OPTION, false,
+-        "Print more details.");
+-    Option forceOpt = new Option(FORCE_OPTION, false,
+-        "Force recreating the working directory if an existing one is found. " +
+-            "This should only be used if you know that another instance is " +
+-            "not currently running");
+-    Option noProxyOpt = new Option(NO_PROXY_OPTION, false,
+-        "When specified, all processing will be done as the user running this" +
+-            " command (or the Yarn user if DefaultContainerExecutor is in " +
+-            "use). When not specified, all processing will be done as the " +
+-            "user who owns that application; if the user running this command" +
+-            " is not allowed to impersonate that user, it will fail");
+-    opts.addOption(helpOpt);
+-    opts.addOption(maxEligibleOpt);
+-    opts.addOption(minNumLogFilesOpt);
+-    opts.addOption(maxTotalLogsSizeOpt);
+-    opts.addOption(memoryOpt);
+-    opts.addOption(verboseOpt);
+-    opts.addOption(forceOpt);
+-    opts.addOption(noProxyOpt);
+-
+-    try {
+-      CommandLineParser parser = new GnuParser();
+-      CommandLine commandLine = parser.parse(opts, args);
+-      if (commandLine.hasOption(HELP_OPTION)) {
+-        HelpFormatter formatter = new HelpFormatter();
+-        formatter.printHelp("mapred archive-logs", opts);
+-        System.exit(0);
+-      }
+-      if (commandLine.hasOption(MAX_ELIGIBLE_APPS_OPTION)) {
+-        maxEligible = Integer.parseInt(
+-            commandLine.getOptionValue(MAX_ELIGIBLE_APPS_OPTION));
+-        if (maxEligible == 0) {
+-          LOG.info("Setting " + MAX_ELIGIBLE_APPS_OPTION + " to 0 accomplishes "
+-              + "nothing. Please either set it to a negative value "
+-              + "(default, all) or a more reasonable value.");
+-          System.exit(0);
+-        }
+-      }
+-      if (commandLine.hasOption(MIN_NUM_LOG_FILES_OPTION)) {
+-        minNumLogFiles = Integer.parseInt(
+-            commandLine.getOptionValue(MIN_NUM_LOG_FILES_OPTION));
+-      }
+-      if (commandLine.hasOption(MAX_TOTAL_LOGS_SIZE_OPTION)) {
+-        maxTotalLogsSize = Long.parseLong(
+-            commandLine.getOptionValue(MAX_TOTAL_LOGS_SIZE_OPTION));
+-        maxTotalLogsSize *= 1024L * 1024L;
+-      }
+-      if (commandLine.hasOption(MEMORY_OPTION)) {
+-        memory = Long.parseLong(commandLine.getOptionValue(MEMORY_OPTION));
+-      }
+-      if (commandLine.hasOption(VERBOSE_OPTION)) {
+-        verbose = true;
+-      }
+-      if (commandLine.hasOption(FORCE_OPTION)) {
+-        force = true;
+-      }
+-      if (commandLine.hasOption(NO_PROXY_OPTION)) {
+-        proxy = false;
+-      }
+-    } catch (ParseException pe) {
+-      HelpFormatter formatter = new HelpFormatter();
+-      formatter.printHelp("mapred archive-logs", opts);
+-      throw pe;
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  boolean prepareWorkingDir(FileSystem fs, Path workingDir) throws IOException {
+-    if (fs.exists(workingDir)) {
+-      if (force) {
+-        LOG.info("Existing Working Dir detected: -" + FORCE_OPTION +
+-            " specified -> recreating Working Dir");
+-        fs.delete(workingDir, true);
+-      } else {
+-        LOG.info("Existing Working Dir detected: -" + FORCE_OPTION +
+-            " not specified -> exiting");
+-        return false;
+-      }
+-    }
+-    fs.mkdirs(workingDir);
+-    fs.setPermission(workingDir,
+-        new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL, true));
+-    return true;
+-  }
+-
+-  @VisibleForTesting
+-  void filterAppsByAggregatedStatus() throws IOException, YarnException {
+-    YarnClient client = YarnClient.createYarnClient();
+-    try {
+-      client.init(getConf());
+-      client.start();
+-      for (Iterator<AppInfo> it = eligibleApplications
+-          .iterator(); it.hasNext();) {
+-        AppInfo app = it.next();
+-        try {
+-          ApplicationReport report = client.getApplicationReport(
+-              ApplicationId.fromString(app.getAppId()));
+-          LogAggregationStatus aggStatus = report.getLogAggregationStatus();
+-          if (aggStatus.equals(LogAggregationStatus.RUNNING) ||
+-              aggStatus.equals(LogAggregationStatus.RUNNING_WITH_FAILURE) ||
+-              aggStatus.equals(LogAggregationStatus.NOT_START) ||
+-              aggStatus.equals(LogAggregationStatus.DISABLED) ||
+-              aggStatus.equals(LogAggregationStatus.FAILED)) {
+-            if (verbose) {
+-              LOG.info("Skipping " + app.getAppId() +
+-                  " due to aggregation status being " + aggStatus);
+-            }
+-            it.remove();
+-          } else {
+-            if (verbose) {
+-              LOG.info(app.getAppId() + " has aggregation status " + aggStatus);
+-            }
+-            app.setFinishTime(report.getFinishTime());
+-          }
+-        } catch (ApplicationNotFoundException e) {
+-          // Assume the aggregation has finished
+-          if (verbose) {
+-            LOG.info(app.getAppId() + " not in the ResourceManager");
+-          }
+-        }
+-      }
+-    } finally {
+-      if (client != null) {
+-        client.stop();
+-      }
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  void checkFilesAndSeedApps(FileSystem fs, Path remoteRootLogDir,
+-       String suffix, Path workingDir) throws IOException {
+-    for (RemoteIterator<FileStatus> userIt =
+-         fs.listStatusIterator(remoteRootLogDir); userIt.hasNext();) {
+-      Path userLogPath = userIt.next().getPath();
+-      try {
+-        for (RemoteIterator<FileStatus> appIt =
+-             fs.listStatusIterator(new Path(userLogPath, suffix));
+-             appIt.hasNext();) {
+-          Path appLogPath = appIt.next().getPath();
+-          try {
+-            FileStatus[] files = fs.listStatus(appLogPath);
+-            if (files.length >= minNumLogFiles) {
+-              boolean eligible = true;
+-              long totalFileSize = 0L;
+-              for (FileStatus file : files) {
+-                if (file.getPath().getName().equals(appLogPath.getName()
+-                    + ".har")) {
+-                  eligible = false;
+-                  if (verbose) {
+-                    LOG.info("Skipping " + appLogPath.getName() +
+-                        " due to existing .har file");
+-                  }
+-                  break;
+-                }
+-                totalFileSize += file.getLen();
+-                if (totalFileSize > maxTotalLogsSize) {
+-                  eligible = false;
+-                  if (verbose) {
+-                    LOG.info("Skipping " + appLogPath.getName() + " due to " +
+-                        "total file size being too large (" + totalFileSize +
+-                        " > " + maxTotalLogsSize + ")");
+-                  }
+-                  break;
+-                }
+-              }
+-              if (eligible) {
+-                if (verbose) {
+-                  LOG.info("Adding " + appLogPath.getName() + " for user " +
+-                      userLogPath.getName());
+-                }
+-                AppInfo context = new AppInfo();
+-                context.setAppId(appLogPath.getName());
+-                context.setUser(userLogPath.getName());
+-                context.setSuffix(suffix);
+-                context.setRemoteRootLogDir(remoteRootLogDir);
+-                context.setWorkingDir(workingDir);
+-                eligibleApplications.add(context);
+-              }
+-            } else {
+-              if (verbose) {
+-                LOG.info("Skipping " + appLogPath.getName() + " due to not " +
+-                    "having enough log files (" + files.length + " < " +
+-                    minNumLogFiles + ")");
+-              }
+-            }
+-          } catch (IOException ioe) {
+-            // Ignore any apps we can't read
+-            if (verbose) {
+-              LOG.info("Skipping logs under " + appLogPath + " due to " +
+-                  ioe.getMessage());
+-            }
+-          }
+-        }
+-      } catch (IOException ioe) {
+-        // Ignore any apps we can't read
+-        if (verbose) {
+-          LOG.info("Skipping all logs under " + userLogPath + " due to " +
+-              ioe.getMessage());
+-        }
+-      }
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  void checkMaxEligible() {
+-    // If we have too many eligible apps, remove the newest ones first
+-    if (maxEligible > 0 && eligibleApplications.size()
+-        > maxEligible) {
+-      if (verbose) {
+-        LOG.info("Too many applications (" + eligibleApplications
+-            .size() +
+-            " > " + maxEligible + ")");
+-      }
+-      List<AppInfo> sortedApplications =
+-          new ArrayList<AppInfo>(eligibleApplications);
+-      Collections.sort(sortedApplications, new Comparator<
+-          AppInfo>() {
+-        @Override
+-        public int compare(AppInfo o1, AppInfo o2) {
+-          int lCompare = Long.compare(o1.getFinishTime(), o2.getFinishTime());
+-          if (lCompare == 0) {
+-            return o1.getAppId().compareTo(o2.getAppId());
+-          }
+-          return lCompare;
+-        }
+-      });
+-      for (int i = maxEligible; i < sortedApplications.size(); i++) {
+-        if (verbose) {
+-          LOG.info("Removing " + sortedApplications.get(i));
+-        }
+-        eligibleApplications.remove(sortedApplications.get(i));
+-      }
+-    }
+-  }
+-
+-  /*
+-  The generated script looks like this:
+-  #!/bin/bash
+-  set -e
+-  set -x
+-  if [ "$YARN_SHELL_ID" == "1" ]; then
+-        appId="application_1440448768987_0001"
+-        user="rkanter"
+-        workingDir="/tmp/logs/archive-logs-work"
+-        remoteRootLogDir="/tmp/logs"
+-        suffix="logs"
+-  elif [ "$YARN_SHELL_ID" == "2" ]; then
+-        appId="application_1440448768987_0002"
+-        user="rkanter"
+-        workingDir="/tmp/logs/archive-logs-work"
+-        remoteRootLogDir="/tmp/logs"
+-        suffix="logs"
+-  else
+-        echo "Unknown Mapping!"
+-        exit 1
+-  fi
+-  export HADOOP_CLIENT_OPTS="-Xmx1024m"
+-  export HADOOP_CLASSPATH=/dist/share/hadoop/tools/lib/hadoop-archive-logs-2.8.0-SNAPSHOT.jar:/dist/share/hadoop/tools/lib/hadoop-archives-2.8.0-SNAPSHOT.jar
+-  "$HADOOP_HOME"/bin/hadoop org.apache.hadoop.tools.HadoopArchiveLogsRunner -appId "$appId" -user "$user" -workingDir "$workingDir" -remoteRootLogDir "$remoteRootLogDir" -suffix "$suffix"
+-   */
+-  @VisibleForTesting
+-  void generateScript(File localScript) throws IOException {
+-    if (verbose) {
+-      LOG.info("Generating script at: " + localScript.getAbsolutePath());
+-    }
+-    String halrJarPath = HadoopArchiveLogsRunner.class.getProtectionDomain()
+-        .getCodeSource().getLocation().getPath();
+-    String harJarPath = HadoopArchives.class.getProtectionDomain()
+-        .getCodeSource().getLocation().getPath();
+-    String classpath = halrJarPath + File.pathSeparator + harJarPath;
+-    FileWriterWithEncoding fw = null;
+-    try {
+-      fw = FileWriterWithEncoding.builder()
+-              .setFile(localScript)
+-              .setCharset(StandardCharsets.UTF_8)
+-              .get();
+-      fw.write("#!/bin/bash\nset -e\nset -x\n");
+-      int containerCount = 1;
+-      for (AppInfo context : eligibleApplications) {
+-        fw.write("if [ \"$YARN_SHELL_ID\" == \"");
+-        fw.write(Integer.toString(containerCount));
+-        fw.write("\" ]; then\n\tappId=\"");
+-        fw.write(context.getAppId());
+-        fw.write("\"\n\tuser=\"");
+-        fw.write(context.getUser());
+-        fw.write("\"\n\tworkingDir=\"");
+-        fw.write(context.getWorkingDir().toString());
+-        fw.write("\"\n\tremoteRootLogDir=\"");
+-        fw.write(context.getRemoteRootLogDir().toString());
+-        fw.write("\"\n\tsuffix=\"");
+-        fw.write(context.getSuffix());
+-        fw.write("\"\nel");
+-        containerCount++;
+-      }
+-      fw.write("se\n\techo \"Unknown Mapping!\"\n\texit 1\nfi\n");
+-      fw.write("export HADOOP_CLIENT_OPTS=\"-Xmx");
+-      fw.write(Long.toString(memory));
+-      fw.write("m\"\n");
+-      fw.write("export HADOOP_CLASSPATH=");
+-      fw.write(classpath);
+-      fw.write("\n\"$HADOOP_HOME\"/bin/hadoop ");
+-      fw.write(HadoopArchiveLogsRunner.class.getName());
+-      fw.write(" -appId \"$appId\" -user \"$user\" -workingDir ");
+-      fw.write("\"$workingDir\"");
+-      fw.write(" -remoteRootLogDir ");
+-      fw.write("\"$remoteRootLogDir\"");
+-      fw.write(" -suffix ");
+-      fw.write("\"$suffix\"");
+-      if (!proxy) {
+-        fw.write(" -noProxy\n");
+-      }
+-      fw.write("\n");
+-    } finally {
+-      if (fw != null) {
+-        fw.close();
+-      }
+-    }
+-  }
+-
+-  private boolean runDistributedShell(File localScript) throws Exception {
+-    String[] dsArgs = {
+-        "--appname",
+-        "ArchiveLogs",
+-        "--jar",
+-        ApplicationMaster.class.getProtectionDomain().getCodeSource()
+-            .getLocation().getPath(),
+-        "--num_containers",
+-        Integer.toString(eligibleApplications.size()),
+-        "--container_memory",
+-        Long.toString(memory),
+-        "--shell_script",
+-        localScript.getAbsolutePath()
+-    };
+-    if (verbose) {
+-      LOG.info("Running Distributed Shell with arguments: " +
+-          Arrays.toString(dsArgs));
+-    }
+-    final Client dsClient = new Client(new Configuration(conf));
+-    dsClient.init(dsArgs);
+-    return dsClient.run();
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    if (conf instanceof JobConf) {
+-      this.conf = (JobConf) conf;
+-    } else {
+-      this.conf = new JobConf(conf, HadoopArchiveLogs.class);
+-    }
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  @VisibleForTesting
+-  static class AppInfo {
+-    private String appId;
+-    private Path remoteRootLogDir;
+-    private String suffix;
+-    private Path workingDir;
+-    private String user;
+-    private long finishTime;
+-
+-    AppInfo() {}
+-
+-    AppInfo(String appId, String user) {
+-      this.setAppId(appId);
+-      this.setUser(user);
+-    }
+-
+-    public String getAppId() {
+-      return appId;
+-    }
+-
+-    public void setAppId(String appId) {
+-      this.appId = appId;
+-    }
+-
+-    public Path getRemoteRootLogDir() {
+-      return remoteRootLogDir;
+-    }
+-
+-    public void setRemoteRootLogDir(Path remoteRootLogDir) {
+-      this.remoteRootLogDir = remoteRootLogDir;
+-    }
+-
+-    public String getSuffix() {
+-      return suffix;
+-    }
+-
+-    public void setSuffix(String suffix) {
+-      this.suffix = suffix;
+-    }
+-
+-    public Path getWorkingDir() {
+-      return workingDir;
+-    }
+-
+-    public void setWorkingDir(Path workingDir) {
+-      this.workingDir = workingDir;
+-    }
+-
+-    public String getUser() {
+-      return user;
+-    }
+-
+-    public void setUser(String user) {
+-      this.user = user;
+-    }
+-
+-    public long getFinishTime() {
+-      return finishTime;
+-    }
+-
+-    public void setFinishTime(long finishTime) {
+-      this.finishTime = finishTime;
+-    }
+-
+-    @Override
+-    public boolean equals(Object o) {
+-      if (this == o) {
+-        return true;
+-      }
+-      if (o == null || getClass() != o.getClass()) {
+-        return false;
+-      }
+-
+-      AppInfo appInfo = (AppInfo) o;
+-
+-      if (appId != null
+-          ? !appId.equals(appInfo.appId) : appInfo.appId != null) {
+-        return false;
+-      }
+-
+-      if (user != null
+-          ? !user.equals(appInfo.user) : appInfo.user != null) {
+-        return false;
+-      }
+-
+-      if (suffix != null
+-          ? !suffix.equals(appInfo.suffix) : appInfo.suffix != null) {
+-        return false;
+-      }
+-
+-      if (workingDir != null ? !workingDir.equals(
+-          appInfo.workingDir) : appInfo.workingDir != null) {
+-        return false;
+-      }
+-
+-      if (remoteRootLogDir != null ? !remoteRootLogDir.equals(
+-          appInfo.remoteRootLogDir) : appInfo.remoteRootLogDir != null) {
+-        return false;
+-      }
+-
+-      return Long.compare(finishTime, appInfo.finishTime) == 0;
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-      int result = appId != null ? appId.hashCode() : 0;
+-      result = 31 * result + (user != null ? user.hashCode() : 0);
+-      result = 31 * result + (suffix != null ? suffix.hashCode() : 0);
+-      result = 31 * result + (workingDir != null ? workingDir.hashCode() : 0);
+-      result = 31 * result + (remoteRootLogDir != null ?
+-          remoteRootLogDir.hashCode() : 0);
+-      result = 31 * result + Long.valueOf(finishTime).hashCode();
+-      return result;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogsRunner.java b/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogsRunner.java
+deleted file mode 100644
+index 4191d216878..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogsRunner.java
++++ /dev/null
+@@ -1,240 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.PathFilter;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-import java.io.File;
+-import java.security.PrivilegedExceptionAction;
+-
+-/**
+- * This is a child program designed to be used by the {@link HadoopArchiveLogs}
+- * tool via the Distributed Shell.  It's not meant to be run directly.
+- */
+-public class HadoopArchiveLogsRunner implements Tool {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(HadoopArchiveLogsRunner.class);
+-
+-  private static final String APP_ID_OPTION = "appId";
+-  private static final String USER_OPTION = "user";
+-  private static final String WORKING_DIR_OPTION = "workingDir";
+-  private static final String REMOTE_ROOT_LOG_DIR_OPTION = "remoteRootLogDir";
+-  private static final String SUFFIX_OPTION = "suffix";
+-  private static final String NO_PROXY_OPTION = "noProxy";
+-
+-  private String appId;
+-  private String user;
+-  private String workingDir;
+-  private String remoteLogDir;
+-  private String suffix;
+-  private boolean proxy;
+-
+-  private JobConf conf;
+-
+-  @VisibleForTesting
+-  HadoopArchives hadoopArchives;
+-
+-  private static final FsPermission HAR_DIR_PERM =
+-      new FsPermission(FsAction.ALL, FsAction.READ_EXECUTE, FsAction.NONE);
+-  private static final FsPermission HAR_INNER_FILES_PERM =
+-      new FsPermission(FsAction.READ_WRITE, FsAction.READ, FsAction.NONE);
+-
+-  public HadoopArchiveLogsRunner(Configuration conf) {
+-    setConf(conf);
+-    hadoopArchives = new HadoopArchives(conf);
+-  }
+-
+-  public static void main(String[] args) {
+-    JobConf job = new JobConf(HadoopArchiveLogsRunner.class);
+-
+-    HadoopArchiveLogsRunner halr = new HadoopArchiveLogsRunner(job);
+-    int ret = 0;
+-
+-    try{
+-      ret = ToolRunner.run(halr, args);
+-    } catch(Exception e) {
+-      LOG.debug("Exception", e);
+-      System.err.println(e.getClass().getSimpleName());
+-      final String s = e.getLocalizedMessage();
+-      if (s != null) {
+-        System.err.println(s);
+-      } else {
+-        e.printStackTrace(System.err);
+-      }
+-      System.exit(1);
+-    }
+-    System.exit(ret);
+-  }
+-
+-  @Override
+-  public int run(String[] args) throws Exception {
+-    handleOpts(args);
+-
+-    Integer exitCode = 1;
+-    UserGroupInformation loginUser = UserGroupInformation.getLoginUser();
+-    // If we're running as the user, then no need to impersonate
+-    // (which might fail if user is not a proxyuser for themselves)
+-    // Also if !proxy is set
+-    if (!proxy || loginUser.getShortUserName().equals(user)) {
+-      LOG.info("Running as " + user);
+-      exitCode = runInternal();
+-    } else {
+-      // Otherwise impersonate user.  If we're not allowed to, then this will
+-      // fail with an Exception
+-      LOG.info("Running as " + loginUser.getShortUserName() + " but will " +
+-          "impersonate " + user);
+-      UserGroupInformation proxyUser =
+-          UserGroupInformation.createProxyUser(user, loginUser);
+-      exitCode = proxyUser.doAs(new PrivilegedExceptionAction<Integer>() {
+-        @Override
+-        public Integer run() throws Exception {
+-          return runInternal();
+-        }
+-      });
+-    }
+-    return exitCode;
+-  }
+-
+-  private int runInternal() throws Exception {
+-    String remoteAppLogDir = remoteLogDir + File.separator + user
+-        + File.separator + suffix + File.separator + appId;
+-    // Run 'hadoop archives' command in local mode
+-    conf.set("mapreduce.framework.name", "local");
+-    // Set the umask so we get 640 files and 750 dirs
+-    conf.set("fs.permissions.umask-mode", "027");
+-    String harName = appId + ".har";
+-    String[] haArgs = {
+-        "-archiveName",
+-        harName,
+-        "-p",
+-        remoteAppLogDir,
+-        "*",
+-        workingDir
+-    };
+-    StringBuilder sb = new StringBuilder("Executing 'hadoop archives'");
+-    for (String haArg : haArgs) {
+-      sb.append("\n\t").append(haArg);
+-    }
+-    LOG.info(sb.toString());
+-    int exitCode = hadoopArchives.run(haArgs);
+-    if (exitCode != 0) {
+-      LOG.warn("Failed to create archives for " + appId);
+-      return -1;
+-    }
+-
+-    FileSystem fs = null;
+-    // Move har file to correct location and delete original logs
+-    try {
+-      fs = FileSystem.get(conf);
+-      Path harPath = new Path(workingDir, harName);
+-      if (!fs.exists(harPath) ||
+-          fs.listStatus(harPath).length == 0) {
+-        LOG.warn("The created archive \"" + harName +
+-            "\" is missing or empty.");
+-        return -1;
+-      }
+-      Path harDest = new Path(remoteAppLogDir, harName);
+-      LOG.info("Moving har to original location");
+-      fs.rename(harPath, harDest);
+-      LOG.info("Deleting original logs");
+-      for (FileStatus original : fs.listStatus(new Path(remoteAppLogDir),
+-          new PathFilter() {
+-            @Override
+-            public boolean accept(Path path) {
+-              return !path.getName().endsWith(".har");
+-            }
+-          })) {
+-        fs.delete(original.getPath(), false);
+-      }
+-    } finally {
+-      if (fs != null) {
+-        fs.close();
+-      }
+-    }
+-    return 0;
+-  }
+-
+-  private void handleOpts(String[] args) throws ParseException {
+-    Options opts = new Options();
+-    Option appIdOpt = new Option(APP_ID_OPTION, true, "Application ID");
+-    appIdOpt.setRequired(true);
+-    Option userOpt = new Option(USER_OPTION, true, "User");
+-    userOpt.setRequired(true);
+-    Option workingDirOpt = new Option(WORKING_DIR_OPTION, true,
+-        "Working Directory");
+-    workingDirOpt.setRequired(true);
+-    Option remoteLogDirOpt = new Option(REMOTE_ROOT_LOG_DIR_OPTION, true,
+-        "Remote Root Log Directory");
+-    remoteLogDirOpt.setRequired(true);
+-    Option suffixOpt = new Option(SUFFIX_OPTION, true, "Suffix");
+-    suffixOpt.setRequired(true);
+-    Option useProxyOpt = new Option(NO_PROXY_OPTION, false, "Use Proxy");
+-    opts.addOption(appIdOpt);
+-    opts.addOption(userOpt);
+-    opts.addOption(workingDirOpt);
+-    opts.addOption(remoteLogDirOpt);
+-    opts.addOption(suffixOpt);
+-    opts.addOption(useProxyOpt);
+-
+-    CommandLineParser parser = new GnuParser();
+-    CommandLine commandLine = parser.parse(opts, args);
+-    appId = commandLine.getOptionValue(APP_ID_OPTION);
+-    user = commandLine.getOptionValue(USER_OPTION);
+-    workingDir = commandLine.getOptionValue(WORKING_DIR_OPTION);
+-    remoteLogDir = commandLine.getOptionValue(REMOTE_ROOT_LOG_DIR_OPTION);
+-    suffix = commandLine.getOptionValue(SUFFIX_OPTION);
+-    proxy = true;
+-    if (commandLine.hasOption(NO_PROXY_OPTION)) {
+-      proxy = false;
+-    }
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    if (conf instanceof JobConf) {
+-      this.conf = (JobConf) conf;
+-    } else {
+-      this.conf = new JobConf(conf, HadoopArchiveLogsRunner.class);
+-    }
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-archive-logs/src/main/shellprofile.d/hadoop-archive-logs.sh b/hadoop-tools/hadoop-archive-logs/src/main/shellprofile.d/hadoop-archive-logs.sh
+deleted file mode 100755
+index 278a0895f2c..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/main/shellprofile.d/hadoop-archive-logs.sh
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f mapred_subcommand_archive-logs >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = mapred ]]; then
+-    hadoop_add_subcommand "archive-logs" client "combine aggregated logs into hadoop archives"
+-  fi
+-
+-  # this can't be indented otherwise shelldocs won't get it
+-
+-## @description  archive-logs command for mapred
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function mapred_subcommand_archive-logs
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.HadoopArchiveLogs
+-  hadoop_add_to_classpath_tools hadoop-archive-logs
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-archive-logs/src/site/markdown/HadoopArchiveLogs.md b/hadoop-tools/hadoop-archive-logs/src/site/markdown/HadoopArchiveLogs.md
+deleted file mode 100644
+index 406c2d5adec..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/site/markdown/HadoopArchiveLogs.md
++++ /dev/null
+@@ -1,102 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-Hadoop Archive Logs Guide
+-=========================
+-
+- - [Overview](#Overview)
+- - [How to Archive Logs](#How_to_Archive_Logs)
+-
+-Overview
+---------
+-
+-For clusters with a lot of YARN aggregated logs, it can be helpful to combine
+-them into hadoop archives in order to reduce the number of small files, and
+-hence the stress on the NameNode.  This tool provides an easy way to do this.
+-Aggregated logs in hadoop archives can still be read by the Job History Server
+-and by the `yarn logs` command.
+-
+-For more on hadoop archives, see
+-[Hadoop Archives Guide](../hadoop-archives/HadoopArchives.html).
+-
+-How to Archive Logs
+--------------------
+-
+-    usage: mapred archive-logs
+-    -force                         Force recreating the working directory if
+-                                   an existing one is found. This should
+-                                   only be used if you know that another
+-                                   instance is not currently running
+-    -help                          Prints this message
+-    -maxEligibleApps <n>           The maximum number of eligible apps to
+-                                   process (default: -1 (all))
+-    -maxTotalLogsSize <megabytes>  The maximum total logs size (in
+-                                   megabytes) required to be eligible
+-                                   (default: 1024)
+-    -memory <megabytes>            The amount of memory (in megabytes) for
+-                                   each container (default: 1024)
+-    -minNumberLogFiles <n>         The minimum number of log files required
+-                                   to be eligible (default: 20)
+-    -noProxy                       When specified, all processing will be
+-                                   done as the user running this command (or
+-                                   the YARN user if DefaultContainerExecutor
+-                                   is in use). When not specified, all
+-                                   processing will be done as the user who
+-                                   owns that application; if the user
+-                                   running this command is not allowed to
+-                                   impersonate that user, it will fail
+-    -verbose                       Print more details.
+-
+-The tool only supports running one instance on a cluster at a time in order
+-to prevent conflicts. It does this by checking for the existence of a
+-directory named ``archive-logs-work`` under
+-``yarn.nodemanager.remote-app-log-dir`` in HDFS
+-(default: ``/tmp/logs/archive-logs-work``). If for some reason that
+-directory was not cleaned up properly, and the tool refuses to run, you can
+-force it with the ``-force`` option.
+-
+-The ``-help`` option prints out the usage information.
+-
+-The tool works by performing the following procedure:
+-
+- 1. Determine the list of eligible applications, based on the following
+-    criteria:
+-    - is not already archived
+-    - its aggregation status has successfully completed
+-    - has at least ``-minNumberLogFiles`` log files
+-    - the sum of its log files size is less than ``-maxTotalLogsSize`` megabytes
+- 2. If there are more than ``-maxEligibleApps`` applications found, the
+-    newest applications are dropped. They can be processed next time.
+- 3. A shell script is generated based on the eligible applications
+- 4. The Distributed Shell program is run with the aformentioned script. It
+-    will run with ``-maxEligibleApps`` containers, one to process each
+-    application, and with ``-memory`` megabytes of memory. Each container runs
+-    the ``hadoop archives`` command for a single application and replaces
+-    its aggregated log files with the resulting archive.
+-
+-The ``-noProxy`` option makes the tool process everything as the user who is
+-currently running it, or the YARN user if DefaultContainerExecutor is in use.
+-When not specified, all processing will be done by the user who owns that
+-application; if the user running this command is not allowed to impersonate that
+-user, it will fail.  This is useful if you want an admin user to handle all
+-aggregation without enabling impersonation.  With ``-noProxy`` the resulting
+-HAR files will be owned by whoever ran the tool, instead of whoever originally
+-owned the logs.
+-
+-The ``-verbose`` option makes the tool print more details about what it's
+-doing.
+-
+-The end result of running the tool is that the original aggregated log files for
+-a processed application will be replaced by a hadoop archive containing all of
+-those logs.
+diff --git a/hadoop-tools/hadoop-archive-logs/src/site/resources/css/site.css b/hadoop-tools/hadoop-archive-logs/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java
+deleted file mode 100644
+index b475cc25e8e..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogs.java
++++ /dev/null
+@@ -1,441 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import org.apache.commons.io.IOUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.util.Shell;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.LogAggregationStatus;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Random;
+-
+-public class TestHadoopArchiveLogs {
+-
+-  private static final long CLUSTER_TIMESTAMP = System.currentTimeMillis();
+-  private static final String USER = System.getProperty("user.name");
+-  private static final int FILE_SIZE_INCREMENT = 4096;
+-  private static final byte[] DUMMY_DATA = new byte[FILE_SIZE_INCREMENT];
+-  static {
+-    new Random().nextBytes(DUMMY_DATA);
+-  }
+-
+-  @Test(timeout = 10000)
+-  public void testCheckFilesAndSeedApps() throws Exception {
+-    Configuration conf = new Configuration();
+-    HadoopArchiveLogs hal = new HadoopArchiveLogs(conf);
+-    FileSystem fs = FileSystem.getLocal(conf);
+-    Path rootLogDir = new Path("target", "logs");
+-    String suffix = "logs";
+-    Path logDir = new Path(rootLogDir, new Path(USER, suffix));
+-    fs.delete(logDir, true);
+-    Assert.assertFalse(fs.exists(logDir));
+-    fs.mkdirs(logDir);
+-
+-    // no files found
+-    ApplicationId appId1 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 1);
+-    Path app1Path = new Path(logDir, appId1.toString());
+-    fs.mkdirs(app1Path);
+-    // too few files
+-    ApplicationId appId2 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 2);
+-    Path app2Path = new Path(logDir, appId2.toString());
+-    fs.mkdirs(app2Path);
+-    createFile(fs, new Path(app2Path, "file1"), 1);
+-    hal.minNumLogFiles = 2;
+-    // too large
+-    ApplicationId appId3 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 3);
+-    Path app3Path = new Path(logDir, appId3.toString());
+-    fs.mkdirs(app3Path);
+-    createFile(fs, new Path(app3Path, "file1"), 2);
+-    createFile(fs, new Path(app3Path, "file2"), 5);
+-    hal.maxTotalLogsSize = FILE_SIZE_INCREMENT * 6;
+-    // has har already
+-    ApplicationId appId4 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 4);
+-    Path app4Path = new Path(logDir, appId4.toString());
+-    fs.mkdirs(app4Path);
+-    createFile(fs, new Path(app4Path, appId4 + ".har"), 1);
+-    // just right
+-    ApplicationId appId5 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 5);
+-    Path app5Path = new Path(logDir, appId5.toString());
+-    fs.mkdirs(app5Path);
+-    createFile(fs, new Path(app5Path, "file1"), 2);
+-    createFile(fs, new Path(app5Path, "file2"), 3);
+-
+-    Assert.assertEquals(0, hal.eligibleApplications.size());
+-    hal.checkFilesAndSeedApps(fs, rootLogDir, suffix, new Path(rootLogDir,
+-        "archive-logs-work"));
+-    Assert.assertEquals(1, hal.eligibleApplications.size());
+-    Assert.assertEquals(appId5.toString(),
+-        hal.eligibleApplications.iterator().next().getAppId());
+-  }
+-
+-  @Test(timeout = 10000)
+-  public void testCheckMaxEligible() throws Exception {
+-    Configuration conf = new Configuration();
+-    HadoopArchiveLogs.AppInfo app1 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 1).toString(), USER);
+-    app1.setFinishTime(CLUSTER_TIMESTAMP - 5);
+-    HadoopArchiveLogs.AppInfo app2 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 2).toString(), USER);
+-    app2.setFinishTime(CLUSTER_TIMESTAMP - 10);
+-    HadoopArchiveLogs.AppInfo app3 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 3).toString(), USER);
+-    // app3 has no finish time set
+-    HadoopArchiveLogs.AppInfo app4 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 4).toString(), USER);
+-    app4.setFinishTime(CLUSTER_TIMESTAMP + 5);
+-    HadoopArchiveLogs.AppInfo app5 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 5).toString(), USER);
+-    app5.setFinishTime(CLUSTER_TIMESTAMP + 10);
+-    HadoopArchiveLogs.AppInfo app6 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 6).toString(), USER);
+-    // app6 has no finish time set
+-    HadoopArchiveLogs.AppInfo app7 = new HadoopArchiveLogs.AppInfo(
+-        ApplicationId.newInstance(CLUSTER_TIMESTAMP, 7).toString(), USER);
+-    app7.setFinishTime(CLUSTER_TIMESTAMP);
+-    HadoopArchiveLogs hal = new HadoopArchiveLogs(conf);
+-    Assert.assertEquals(0, hal.eligibleApplications.size());
+-    hal.eligibleApplications.add(app1);
+-    hal.eligibleApplications.add(app2);
+-    hal.eligibleApplications.add(app3);
+-    hal.eligibleApplications.add(app4);
+-    hal.eligibleApplications.add(app5);
+-    hal.eligibleApplications.add(app6);
+-    hal.eligibleApplications.add(app7);
+-    Assert.assertEquals(7, hal.eligibleApplications.size());
+-    hal.maxEligible = -1;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(7, hal.eligibleApplications.size());
+-    hal.maxEligible = 6;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(6, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app5));
+-    hal.maxEligible = 5;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(5, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app4));
+-    hal.maxEligible = 4;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(4, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app7));
+-    hal.maxEligible = 3;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(3, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app1));
+-    hal.maxEligible = 2;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(2, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app2));
+-    hal.maxEligible = 1;
+-    hal.checkMaxEligible();
+-    Assert.assertEquals(1, hal.eligibleApplications.size());
+-    Assert.assertFalse(hal.eligibleApplications.contains(app6));
+-    Assert.assertTrue(hal.eligibleApplications.contains(app3));
+-  }
+-
+-  @Test(timeout = 30000)
+-  public void testFilterAppsByAggregatedStatus() throws Exception {
+-    try (MiniYARNCluster yarnCluster =
+-        new MiniYARNCluster(TestHadoopArchiveLogs.class.getSimpleName(),
+-            1, 1, 1, 1)) {
+-      Configuration conf = new Configuration();
+-      conf.setBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED, true);
+-      yarnCluster.init(conf);
+-      yarnCluster.start();
+-      conf = yarnCluster.getConfig();
+-
+-      RMContext rmContext = yarnCluster.getResourceManager().getRMContext();
+-      RMAppImpl appImpl1 = (RMAppImpl)createRMApp(1, conf, rmContext,
+-          LogAggregationStatus.DISABLED);
+-      RMAppImpl appImpl2 = (RMAppImpl)createRMApp(2, conf, rmContext,
+-          LogAggregationStatus.FAILED);
+-      RMAppImpl appImpl3 = (RMAppImpl)createRMApp(3, conf, rmContext,
+-          LogAggregationStatus.NOT_START);
+-      RMAppImpl appImpl4 = (RMAppImpl)createRMApp(4, conf, rmContext,
+-          LogAggregationStatus.SUCCEEDED);
+-      RMAppImpl appImpl5 = (RMAppImpl)createRMApp(5, conf, rmContext,
+-          LogAggregationStatus.RUNNING);
+-      RMAppImpl appImpl6 = (RMAppImpl)createRMApp(6, conf, rmContext,
+-          LogAggregationStatus.RUNNING_WITH_FAILURE);
+-      RMAppImpl appImpl7 = (RMAppImpl)createRMApp(7, conf, rmContext,
+-          LogAggregationStatus.TIME_OUT);
+-      RMAppImpl appImpl8 = (RMAppImpl)createRMApp(8, conf, rmContext,
+-          LogAggregationStatus.SUCCEEDED);
+-      rmContext.getRMApps().put(appImpl1.getApplicationId(), appImpl1);
+-      rmContext.getRMApps().put(appImpl2.getApplicationId(), appImpl2);
+-      rmContext.getRMApps().put(appImpl3.getApplicationId(), appImpl3);
+-      rmContext.getRMApps().put(appImpl4.getApplicationId(), appImpl4);
+-      rmContext.getRMApps().put(appImpl5.getApplicationId(), appImpl5);
+-      rmContext.getRMApps().put(appImpl6.getApplicationId(), appImpl6);
+-      rmContext.getRMApps().put(appImpl7.getApplicationId(), appImpl7);
+-      // appImpl8 is not in the RM
+-
+-      HadoopArchiveLogs hal = new HadoopArchiveLogs(conf);
+-      Assert.assertEquals(0, hal.eligibleApplications.size());
+-      hal.eligibleApplications.add(
+-          new HadoopArchiveLogs.AppInfo(appImpl1.getApplicationId().toString(),
+-              USER));
+-      hal.eligibleApplications.add(
+-          new HadoopArchiveLogs.AppInfo(appImpl2.getApplicationId().toString(),
+-              USER));
+-      hal.eligibleApplications.add(
+-          new HadoopArchiveLogs.AppInfo(appImpl3.getApplicationId().toString(),
+-              USER));
+-      HadoopArchiveLogs.AppInfo app4 =
+-          new HadoopArchiveLogs.AppInfo(appImpl4.getApplicationId().toString(),
+-              USER);
+-      hal.eligibleApplications.add(app4);
+-      hal.eligibleApplications.add(
+-          new HadoopArchiveLogs.AppInfo(appImpl5.getApplicationId().toString(),
+-              USER));
+-      hal.eligibleApplications.add(
+-          new HadoopArchiveLogs.AppInfo(appImpl6.getApplicationId().toString(),
+-              USER));
+-      HadoopArchiveLogs.AppInfo app7 =
+-          new HadoopArchiveLogs.AppInfo(appImpl7.getApplicationId().toString(),
+-              USER);
+-      hal.eligibleApplications.add(app7);
+-      HadoopArchiveLogs.AppInfo app8 =
+-          new HadoopArchiveLogs.AppInfo(appImpl8.getApplicationId().toString(),
+-              USER);
+-      hal.eligibleApplications.add(app8);
+-      Assert.assertEquals(8, hal.eligibleApplications.size());
+-      hal.filterAppsByAggregatedStatus();
+-      Assert.assertEquals(3, hal.eligibleApplications.size());
+-      Assert.assertTrue(hal.eligibleApplications.contains(app4));
+-      Assert.assertTrue(hal.eligibleApplications.contains(app7));
+-      Assert.assertTrue(hal.eligibleApplications.contains(app8));
+-    }
+-  }
+-
+-  @Test(timeout = 10000)
+-  public void testGenerateScript() throws Exception {
+-    _testGenerateScript(false);
+-    _testGenerateScript(true);
+-  }
+-
+-  private void _testGenerateScript(boolean proxy) throws Exception {
+-    Configuration conf = new Configuration();
+-    HadoopArchiveLogs hal = new HadoopArchiveLogs(conf);
+-    Path workingDir = new Path("/tmp", "working");
+-    Path remoteRootLogDir = new Path("/tmp", "logs");
+-    String suffix = "logs";
+-    ApplicationId app1 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 1);
+-    HadoopArchiveLogs.AppInfo appInfo1 = new HadoopArchiveLogs.AppInfo(
+-        app1.toString(), USER);
+-    appInfo1.setSuffix(suffix);
+-    appInfo1.setRemoteRootLogDir(remoteRootLogDir);
+-    appInfo1.setWorkingDir(workingDir);
+-    hal.eligibleApplications.add(appInfo1);
+-    ApplicationId app2 = ApplicationId.newInstance(CLUSTER_TIMESTAMP, 2);
+-    Path workingDir2 = new Path("/tmp", "working2");
+-    Path remoteRootLogDir2 = new Path("/tmp", "logs2");
+-    String suffix2 = "logs2";
+-    HadoopArchiveLogs.AppInfo appInfo2 = new HadoopArchiveLogs.AppInfo(
+-        app2.toString(), USER);
+-    appInfo2.setSuffix(suffix2);
+-    appInfo2.setRemoteRootLogDir(remoteRootLogDir2);
+-    appInfo2.setWorkingDir(workingDir2);
+-    hal.eligibleApplications.add(appInfo2);
+-    hal.proxy = proxy;
+-
+-    File localScript = new File("target", "script.sh");
+-    localScript.delete();
+-    Assert.assertFalse(localScript.exists());
+-    hal.generateScript(localScript);
+-    Assert.assertTrue(localScript.exists());
+-    String script = IOUtils.toString(localScript.toURI(), StandardCharsets.UTF_8);
+-    String[] lines = script.split("\n");
+-    Assert.assertEquals(22, lines.length);
+-    Assert.assertEquals("#!/bin/bash", lines[0]);
+-    Assert.assertEquals("set -e", lines[1]);
+-    Assert.assertEquals("set -x", lines[2]);
+-    Assert.assertEquals("if [ \"$YARN_SHELL_ID\" == \"1\" ]; then", lines[3]);
+-    boolean oneBefore = true;
+-    if (lines[4].contains(app1.toString())) {
+-      Assert.assertEquals("\tappId=\"" + app1.toString() + "\"", lines[4]);
+-      Assert.assertEquals("\tappId=\"" + app2.toString() + "\"", lines[10]);
+-    } else {
+-      oneBefore = false;
+-      Assert.assertEquals("\tappId=\"" + app2.toString() + "\"", lines[4]);
+-      Assert.assertEquals("\tappId=\"" + app1.toString() + "\"", lines[10]);
+-    }
+-    Assert.assertEquals("\tuser=\"" + USER + "\"", lines[5]);
+-    Assert.assertEquals("\tworkingDir=\"" + (oneBefore ? workingDir.toString()
+-        : workingDir2.toString()) + "\"", lines[6]);
+-    Assert.assertEquals("\tremoteRootLogDir=\"" + (oneBefore
+-        ? remoteRootLogDir.toString() : remoteRootLogDir2.toString())
+-        + "\"", lines[7]);
+-    Assert.assertEquals("\tsuffix=\"" + (oneBefore ? suffix : suffix2)
+-        + "\"", lines[8]);
+-    Assert.assertEquals("elif [ \"$YARN_SHELL_ID\" == \"2\" ]; then",
+-        lines[9]);
+-    Assert.assertEquals("\tuser=\"" + USER + "\"", lines[11]);
+-    Assert.assertEquals("\tworkingDir=\"" + (oneBefore
+-        ? workingDir2.toString() : workingDir.toString()) + "\"",
+-        lines[12]);
+-    Assert.assertEquals("\tremoteRootLogDir=\"" + (oneBefore
+-        ? remoteRootLogDir2.toString() : remoteRootLogDir.toString())
+-        + "\"", lines[13]);
+-    Assert.assertEquals("\tsuffix=\"" + (oneBefore ? suffix2 : suffix)
+-        + "\"", lines[14]);
+-    Assert.assertEquals("else", lines[15]);
+-    Assert.assertEquals("\techo \"Unknown Mapping!\"", lines[16]);
+-    Assert.assertEquals("\texit 1", lines[17]);
+-    Assert.assertEquals("fi", lines[18]);
+-    Assert.assertEquals("export HADOOP_CLIENT_OPTS=\"-Xmx1024m\"", lines[19]);
+-    Assert.assertTrue(lines[20].startsWith("export HADOOP_CLASSPATH="));
+-    if (proxy) {
+-      Assert.assertEquals(
+-          "\"$HADOOP_HOME\"/bin/hadoop org.apache.hadoop.tools." +
+-              "HadoopArchiveLogsRunner -appId \"$appId\" -user \"$user\" " +
+-              "-workingDir \"$workingDir\" -remoteRootLogDir " +
+-              "\"$remoteRootLogDir\" -suffix \"$suffix\"",
+-          lines[21]);
+-    } else {
+-      Assert.assertEquals(
+-          "\"$HADOOP_HOME\"/bin/hadoop org.apache.hadoop.tools." +
+-              "HadoopArchiveLogsRunner -appId \"$appId\" -user \"$user\" " +
+-              "-workingDir \"$workingDir\" -remoteRootLogDir " +
+-              "\"$remoteRootLogDir\" -suffix \"$suffix\" -noProxy",
+-          lines[21]);
+-    }
+-  }
+-
+-  /**
+-   * If this test failes, then a new Log Aggregation Status was added.  Make
+-   * sure that {@link HadoopArchiveLogs#filterAppsByAggregatedStatus()} and this test
+-   * are updated as well, if necessary.
+-   * @throws Exception
+-   */
+-  @Test(timeout = 5000)
+-  public void testStatuses() throws Exception {
+-    LogAggregationStatus[] statuses = new LogAggregationStatus[7];
+-    statuses[0] = LogAggregationStatus.DISABLED;
+-    statuses[1] = LogAggregationStatus.NOT_START;
+-    statuses[2] = LogAggregationStatus.RUNNING;
+-    statuses[3] = LogAggregationStatus.RUNNING_WITH_FAILURE;
+-    statuses[4] = LogAggregationStatus.SUCCEEDED;
+-    statuses[5] = LogAggregationStatus.FAILED;
+-    statuses[6] = LogAggregationStatus.TIME_OUT;
+-    Assert.assertArrayEquals(statuses, LogAggregationStatus.values());
+-  }
+-
+-  @Test(timeout = 5000)
+-  public void testPrepareWorkingDir() throws Exception {
+-    Configuration conf = new Configuration();
+-    HadoopArchiveLogs hal = new HadoopArchiveLogs(conf);
+-    FileSystem fs = FileSystem.getLocal(conf);
+-    Path workingDir = new Path("target", "testPrepareWorkingDir");
+-    fs.delete(workingDir, true);
+-    Assert.assertFalse(fs.exists(workingDir));
+-    // -force is false and the dir doesn't exist so it will create one
+-    hal.force = false;
+-    boolean dirPrepared = hal.prepareWorkingDir(fs, workingDir);
+-    Assert.assertTrue(dirPrepared);
+-    Assert.assertTrue(fs.exists(workingDir));
+-    Assert.assertEquals(
+-        new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL,
+-            !Shell.WINDOWS),
+-        fs.getFileStatus(workingDir).getPermission());
+-    // Throw a file in the dir
+-    Path dummyFile = new Path(workingDir, "dummy.txt");
+-    fs.createNewFile(dummyFile);
+-    Assert.assertTrue(fs.exists(dummyFile));
+-    // -force is false and the dir exists, so nothing will happen and the dummy
+-    // still exists
+-    dirPrepared = hal.prepareWorkingDir(fs, workingDir);
+-    Assert.assertFalse(dirPrepared);
+-    Assert.assertTrue(fs.exists(workingDir));
+-    Assert.assertTrue(fs.exists(dummyFile));
+-    Assert.assertEquals(
+-        new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL,
+-            !Shell.WINDOWS),
+-        fs.getFileStatus(workingDir).getPermission());
+-    // -force is true and the dir exists, so it will recreate it and the dummy
+-    // won't exist anymore
+-    hal.force = true;
+-    dirPrepared = hal.prepareWorkingDir(fs, workingDir);
+-    Assert.assertTrue(dirPrepared);
+-    Assert.assertTrue(fs.exists(workingDir));
+-    Assert.assertEquals(
+-        new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL,
+-            !Shell.WINDOWS),
+-        fs.getFileStatus(workingDir).getPermission());
+-    Assert.assertFalse(fs.exists(dummyFile));
+-  }
+-
+-  private static void createFile(FileSystem fs, Path p, long sizeMultiple)
+-      throws IOException {
+-    FSDataOutputStream out = null;
+-    try {
+-      out = fs.create(p);
+-      for (int i = 0 ; i < sizeMultiple; i++) {
+-        out.write(DUMMY_DATA);
+-      }
+-    } finally {
+-      if (out != null) {
+-        out.close();
+-      }
+-    }
+-    Assert.assertTrue(fs.exists(p));
+-  }
+-
+-  private static RMApp createRMApp(int id, Configuration conf, RMContext rmContext,
+-       final LogAggregationStatus aggStatus) {
+-    ApplicationId appId = ApplicationId.newInstance(CLUSTER_TIMESTAMP, id);
+-    ApplicationSubmissionContext submissionContext =
+-        ApplicationSubmissionContext.newInstance(appId, "test", "default",
+-            Priority.newInstance(0), null, true, true,
+-            2, Resource.newInstance(10, 2), "test");
+-    return new RMAppImpl(appId, rmContext, conf, "test",
+-        USER, "default", submissionContext, rmContext.getScheduler(),
+-        rmContext.getApplicationMasterService(),
+-        System.currentTimeMillis(), "test",
+-        null, null) {
+-      @Override
+-      public ApplicationReport createAndGetApplicationReport(
+-          String clientUserName, boolean allowAccess) {
+-        ApplicationReport report =
+-            super.createAndGetApplicationReport(clientUserName, allowAccess);
+-        report.setLogAggregationStatus(aggStatus);
+-        return report;
+-      }
+-    };
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java b/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java
+deleted file mode 100644
+index 5369338d486..00000000000
+--- a/hadoop-tools/hadoop-archive-logs/src/test/java/org/apache/hadoop/tools/TestHadoopArchiveLogsRunner.java
++++ /dev/null
+@@ -1,193 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.HarFs;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.junit.rules.Timeout;
+-import org.mockito.Mockito;
+-
+-import java.io.IOException;
+-import java.util.Arrays;
+-import java.util.Comparator;
+-import java.util.Random;
+-
+-import static org.junit.Assert.*;
+-import static org.mockito.Mockito.*;
+-
+-public class TestHadoopArchiveLogsRunner {
+-
+-  private static final int FILE_SIZE_INCREMENT = 4096;
+-  private static final int[] FILE_SIZES = {3, 4, 2};
+-  private static final int FILE_COUNT = FILE_SIZES.length;
+-  private static final byte[] DUMMY_DATA = new byte[FILE_SIZE_INCREMENT];
+-  static {
+-    new Random().nextBytes(DUMMY_DATA);
+-  }
+-
+-  private Configuration conf;
+-  private MiniDFSCluster dfsCluster;
+-  private MiniYARNCluster yarnCluster;
+-  private FileSystem fs;
+-  private ApplicationId app1;
+-  private Path app1Path;
+-  private Path workingDir;
+-  private Path remoteRootLogDir;
+-  private String suffix;
+-
+-  @Rule
+-  public Timeout globalTimeout = new Timeout(50000);
+-
+-  @Before
+-  public void setup() throws Exception {
+-    yarnCluster = new MiniYARNCluster(
+-        TestHadoopArchiveLogsRunner.class.getSimpleName(), 1, 2, 1, 1);
+-    conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED, true);
+-    conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true);
+-    yarnCluster.init(conf);
+-    yarnCluster.start();
+-    conf = yarnCluster.getConfig();
+-    dfsCluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
+-    conf = new JobConf(conf);
+-
+-    app1 = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    fs = FileSystem.get(conf);
+-    remoteRootLogDir = new Path(conf.get(
+-        YarnConfiguration.NM_REMOTE_APP_LOG_DIR,
+-        YarnConfiguration.DEFAULT_NM_REMOTE_APP_LOG_DIR));
+-    workingDir = new Path(remoteRootLogDir, "archive-logs-work");
+-    suffix = "logs";
+-    Path logDir = new Path(remoteRootLogDir,
+-        new Path(System.getProperty("user.name"), suffix));
+-    fs.mkdirs(logDir);
+-    app1Path = new Path(logDir, app1.toString());
+-    fs.mkdirs(app1Path);
+-    for (int i = 0; i < FILE_COUNT; i++) {
+-      createFile(fs, new Path(app1Path, "log" + (i + 1)), FILE_SIZES[i]);
+-    }
+-    FileStatus[] app1Files = fs.listStatus(app1Path);
+-    Assert.assertEquals(FILE_COUNT, app1Files.length);
+-  }
+-
+-  @After
+-  public void teardown() throws IOException {
+-    if (fs != null) {
+-      fs.close();
+-    }
+-    if (yarnCluster != null) {
+-      yarnCluster.close();
+-    }
+-    if (dfsCluster != null) {
+-      dfsCluster.shutdown();
+-    }
+-  }
+-
+-  @Test
+-  public void testHadoopArchiveLogs() throws Exception {
+-    String[] args = getArgs();
+-    final HadoopArchiveLogsRunner halr = new HadoopArchiveLogsRunner(conf);
+-    assertEquals(0, ToolRunner.run(halr, args));
+-
+-    fs = FileSystem.get(conf);
+-    FileStatus[] app1Files = fs.listStatus(app1Path);
+-    Assert.assertEquals(1, app1Files.length);
+-    FileStatus harFile = app1Files[0];
+-    Assert.assertEquals(app1.toString() + ".har", harFile.getPath().getName());
+-    Path harPath = new Path("har:///" + harFile.getPath().toUri().getRawPath());
+-    FileStatus[] harLogs = HarFs.get(harPath.toUri(), conf).listStatus(harPath);
+-    Assert.assertEquals(FILE_COUNT, harLogs.length);
+-    Arrays.sort(harLogs, new Comparator<FileStatus>() {
+-      @Override
+-      public int compare(FileStatus o1, FileStatus o2) {
+-        return o1.getPath().getName().compareTo(o2.getPath().getName());
+-      }
+-    });
+-    for (int i = 0; i < FILE_COUNT; i++) {
+-      FileStatus harLog = harLogs[i];
+-      Assert.assertEquals("log" + (i + 1), harLog.getPath().getName());
+-      Assert.assertEquals(FILE_SIZES[i] * FILE_SIZE_INCREMENT, harLog.getLen());
+-      Assert.assertEquals(
+-          new FsPermission(FsAction.READ_WRITE, FsAction.READ, FsAction.NONE),
+-          harLog.getPermission());
+-      Assert.assertEquals(System.getProperty("user.name"),
+-          harLog.getOwner());
+-    }
+-    Assert.assertEquals(0, fs.listStatus(workingDir).length);
+-  }
+-
+-  @Test
+-  public void testHadoopArchiveLogsWithArchiveError() throws Exception {
+-    String[] args = getArgs();
+-    final HadoopArchiveLogsRunner halr = new HadoopArchiveLogsRunner(conf);
+-    HadoopArchives mockHadoopArchives = mock(HadoopArchives.class);
+-    when(mockHadoopArchives.run(Mockito.<String[]>any())).thenReturn(-1);
+-    halr.hadoopArchives = mockHadoopArchives;
+-    assertNotEquals(0, ToolRunner.run(halr, args));
+-
+-    // Make sure the original log files are intact
+-    FileStatus[] app1Files = fs.listStatus(app1Path);
+-    assertEquals(FILE_COUNT, app1Files.length);
+-    for (int i = 0; i < FILE_COUNT; i++) {
+-      Assert.assertEquals(FILE_SIZES[i] * FILE_SIZE_INCREMENT,
+-          app1Files[i].getLen());
+-    }
+-  }
+-
+-  private String[] getArgs() {
+-    return new String[]{
+-        "-appId", app1.toString(),
+-        "-user", System.getProperty("user.name"),
+-        "-workingDir", workingDir.toString(),
+-        "-remoteRootLogDir", remoteRootLogDir.toString(),
+-        "-suffix", suffix};
+-  }
+-
+-  private static void createFile(FileSystem fs, Path p, long sizeMultiple)
+-      throws IOException {
+-    FSDataOutputStream out = null;
+-    try {
+-      out = fs.create(p);
+-      for (int i = 0 ; i < sizeMultiple; i++) {
+-        out.write(DUMMY_DATA);
+-      }
+-    } finally {
+-      if (out != null) {
+-        out.close();
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index dd6aaaf2741..583506a7278 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-archives</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-archive-logs</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 030bd8bd759..6e5f06e6fae 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-dynamometer</module>
+     <module>hadoop-archives</module>
+-    <module>hadoop-archive-logs</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-datajoin</module>
diff --git a/hadoop/stackable/patches/3.4.0/02-remove-hadoop-archives.patch b/hadoop/stackable/patches/3.4.0/02-remove-hadoop-archives.patch
new file mode 100644
index 000000000..a0fae6c83
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/02-remove-hadoop-archives.patch
@@ -0,0 +1,2315 @@
+Entirely remove hadoop-archives
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 
+ hadoop-project/pom.xml                             |    5 
+ hadoop-project/src/site/site.xml                   |    1 
+ hadoop-tools/hadoop-archives/pom.xml               |  160 ---
+ .../org/apache/hadoop/tools/HadoopArchives.java    |  947 --------------------
+ .../src/main/shellprofile.d/hadoop-archives.sh     |   58 -
+ .../src/site/markdown/HadoopArchives.md.vm         |  162 ---
+ .../src/site/resources/css/site.css                |   30 -
+ .../apache/hadoop/tools/TestHadoopArchives.java    |  808 -----------------
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 11 files changed, 2192 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-archives/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
+ delete mode 100755 hadoop-tools/hadoop-archives/src/main/shellprofile.d/hadoop-archives.sh
+ delete mode 100644 hadoop-tools/hadoop-archives/src/site/markdown/HadoopArchives.md.vm
+ delete mode 100644 hadoop-tools/hadoop-archives/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index ee9e9040ec8..67f1c9a4586 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -23,14 +23,6 @@
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
+   <fileSets>
+-    <fileSet>
+-      <directory>../hadoop-archives/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/src/main/shellprofile.d</directory>
+       <includes>
+@@ -83,13 +75,6 @@
+       </includes>
+       <outputDirectory>lib/native/examples</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-archives/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-datajoin/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index f9255e5bdf3..16d692848b0 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -641,11 +641,6 @@
+         <artifactId>hadoop-streaming</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-archives</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index a0a58657161..eb28b16f9f9 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -191,7 +191,6 @@
+ 
+     <menu name="Tools" inherit="top">
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+-      <item name="Hadoop Archives" href="hadoop-archives/HadoopArchives.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml
+deleted file mode 100644
+index b2be121ed61..00000000000
+--- a/hadoop-tools/hadoop-archives/pom.xml
++++ /dev/null
+@@ -1,160 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-archives</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Archives</description>
+-  <name>Apache Hadoop Archives</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.assertj</groupId>
+-      <artifactId>assertj-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-         <configuration>
+-          <archive>
+-           <manifest>
+-            <mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass>
+-           </manifest>
+-         </archive>
+-        </configuration>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java b/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
+deleted file mode 100644
+index c72a926b131..00000000000
+--- a/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java
++++ /dev/null
+@@ -1,947 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.io.UnsupportedEncodingException;
+-import java.net.URLEncoder;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.Set;
+-import java.util.TreeMap;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.Parser;
+-import org.apache.hadoop.mapreduce.security.TokenCache;
+-import org.apache.hadoop.security.Credentials;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.HarFileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.mapred.FileInputFormat;
+-import org.apache.hadoop.mapred.FileOutputFormat;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.InputFormat;
+-import org.apache.hadoop.mapred.InputSplit;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Mapper;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.Reducer;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.SequenceFileRecordReader;
+-import org.apache.hadoop.mapred.lib.NullOutputFormat;
+-import org.apache.hadoop.mapreduce.Cluster;
+-import org.apache.hadoop.mapreduce.JobSubmissionFiles;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * a archive creation utility.
+- * This class provides methods that can be used 
+- * to create hadoop archives. For understanding of 
+- * Hadoop archives look at {@link HarFileSystem}.
+- */
+-public class HadoopArchives implements Tool {
+-  public static final int VERSION = 3;
+-  private static final Logger LOG = LoggerFactory.getLogger(HadoopArchives.class);
+-  
+-  private static final String NAME = "har"; 
+-  private static final String ARCHIVE_NAME = "archiveName";
+-  private static final String REPLICATION = "r";
+-  private static final String PARENT_PATH = "p";
+-  private static final String HELP = "help";
+-  static final String SRC_LIST_LABEL = NAME + ".src.list";
+-  static final String DST_DIR_LABEL = NAME + ".dest.path";
+-  static final String TMP_DIR_LABEL = NAME + ".tmp.dir";
+-  static final String JOB_DIR_LABEL = NAME + ".job.dir";
+-  static final String SRC_COUNT_LABEL = NAME + ".src.count";
+-  static final String TOTAL_SIZE_LABEL = NAME + ".total.size";
+-  static final String DST_HAR_LABEL = NAME + ".archive.name";
+-  static final String SRC_PARENT_LABEL = NAME + ".parent.path";
+-  /** the size of the blocks that will be created when archiving **/
+-  static final String HAR_BLOCKSIZE_LABEL = NAME + ".block.size";
+-  /** the replication factor for the file in archiving. **/
+-  static final String HAR_REPLICATION_LABEL = NAME + ".replication.factor";
+-  /** the size of the part files that will be created when archiving **/
+-  static final String HAR_PARTSIZE_LABEL = NAME + ".partfile.size";
+-
+-  /** size of each part file size **/
+-  long partSize = 2 * 1024 * 1024 * 1024l;
+-  /** size of blocks in hadoop archives **/
+-  long blockSize = 512 * 1024 * 1024l;
+-  /** the desired replication degree; default is 3 **/
+-  short repl = 3;
+-
+-  private static final String usage = "archive"
+-  + " <-archiveName <NAME>.har> <-p <parent path>> [-r <replication factor>]" +
+-      " <src>* <dest>" +
+-  "\n";
+-  
+- 
+-  private JobConf conf;
+-
+-  public void setConf(Configuration conf) {
+-    if (conf instanceof JobConf) {
+-      this.conf = (JobConf) conf;
+-    } else {
+-      this.conf = new JobConf(conf, HadoopArchives.class);
+-    }
+-
+-    // This is for test purposes since MR2, different from Streaming
+-    // here it is not possible to add a JAR to the classpath the tool
+-    // will when running the mapreduce job.
+-    String testJar = System.getProperty(TEST_HADOOP_ARCHIVES_JAR_PATH, null);
+-    if (testJar != null) {
+-      this.conf.setJar(testJar);
+-    }
+-  }
+-
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  public HadoopArchives(Configuration conf) {
+-    setConf(conf);
+-  }
+-
+-  // check the src paths
+-  private static void checkPaths(Configuration conf, List<Path> paths) throws
+-  IOException {
+-    for (Path p : paths) {
+-      FileSystem fs = p.getFileSystem(conf);
+-      fs.getFileStatus(p);
+-    }
+-  }
+-
+-  /**
+-   * this assumes that there are two types of files file/dir
+-   * @param fs the input filesystem
+-   * @param fdir the filestatusdir of the path  
+-   * @param out the list of paths output of recursive ls
+-   * @throws IOException
+-   */
+-  private void recursivels(FileSystem fs, FileStatusDir fdir, List<FileStatusDir> out) 
+-  throws IOException {
+-    if (fdir.getFileStatus().isFile()) {
+-      out.add(fdir);
+-      return;
+-    }
+-    else {
+-      out.add(fdir);
+-      FileStatus[] listStatus = fs.listStatus(fdir.getFileStatus().getPath());
+-      fdir.setChildren(listStatus);
+-      for (FileStatus stat: listStatus) {
+-        FileStatusDir fstatDir = new FileStatusDir(stat, null);
+-        recursivels(fs, fstatDir, out);
+-      }
+-    }
+-  }
+-
+-  /** HarEntry is used in the {@link HArchivesMapper} as the input value. */
+-  private static class HarEntry implements Writable {
+-    String path;
+-    String[] children;
+-
+-    HarEntry() {}
+-    
+-    HarEntry(String path, String[] children) {
+-      this.path = path;
+-      this.children = children;
+-    }
+-
+-    boolean isDir() {
+-      return children != null;      
+-    }
+-
+-    @Override
+-    public void readFields(DataInput in) throws IOException {
+-      path = Text.readString(in);
+-
+-      if (in.readBoolean()) {
+-        children = new String[in.readInt()];
+-        for(int i = 0; i < children.length; i++) {
+-          children[i] = Text.readString(in);
+-        }
+-      } else {
+-        children = null;
+-      }
+-    }
+-
+-    @Override
+-    public void write(DataOutput out) throws IOException {
+-      Text.writeString(out, path);
+-
+-      final boolean dir = isDir();
+-      out.writeBoolean(dir);
+-      if (dir) {
+-        out.writeInt(children.length);
+-        for(String c : children) {
+-          Text.writeString(out, c);
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Input format of a hadoop archive job responsible for 
+-   * generating splits of the file list
+-   */
+-  static class HArchiveInputFormat implements InputFormat<LongWritable, HarEntry> {
+-
+-    //generate input splits from the src file lists
+-    public InputSplit[] getSplits(JobConf jconf, int numSplits)
+-    throws IOException {
+-      String srcfilelist = jconf.get(SRC_LIST_LABEL, "");
+-      if ("".equals(srcfilelist)) {
+-          throw new IOException("Unable to get the " +
+-              "src file for archive generation.");
+-      }
+-      long totalSize = jconf.getLong(TOTAL_SIZE_LABEL, -1);
+-      if (totalSize == -1) {
+-        throw new IOException("Invalid size of files to archive");
+-      }
+-      //we should be safe since this is set by our own code
+-      Path src = new Path(srcfilelist);
+-      FileSystem fs = src.getFileSystem(jconf);
+-      FileStatus fstatus = fs.getFileStatus(src);
+-      ArrayList<FileSplit> splits = new ArrayList<FileSplit>(numSplits);
+-      LongWritable key = new LongWritable();
+-      final HarEntry value = new HarEntry();
+-      // the remaining bytes in the file split
+-      long remaining = fstatus.getLen();
+-      // the count of sizes calculated till now
+-      long currentCount = 0L;
+-      // the endposition of the split
+-      long lastPos = 0L;
+-      // the start position of the split
+-      long startPos = 0L;
+-      long targetSize = totalSize/numSplits;
+-      // create splits of size target size so that all the maps 
+-      // have equals sized data to read and write to.
+-      try (SequenceFile.Reader reader = new SequenceFile.Reader(fs, src, jconf)) {
+-        while(reader.next(key, value)) {
+-          if (currentCount + key.get() > targetSize && currentCount != 0){
+-            long size = lastPos - startPos;
+-            splits.add(new FileSplit(src, startPos, size, (String[]) null));
+-            remaining = remaining - size;
+-            startPos = lastPos;
+-            currentCount = 0L;
+-          }
+-          currentCount += key.get();
+-          lastPos = reader.getPosition();
+-        }
+-        // the remaining not equal to the target size.
+-        if (remaining != 0) {
+-          splits.add(new FileSplit(src, startPos, remaining, (String[])null));
+-        }
+-      }
+-      return splits.toArray(new FileSplit[splits.size()]);
+-    }
+-
+-    @Override
+-    public RecordReader<LongWritable, HarEntry> getRecordReader(InputSplit split,
+-        JobConf job, Reporter reporter) throws IOException {
+-      return new SequenceFileRecordReader<LongWritable, HarEntry>(job,
+-                 (FileSplit)split);
+-    }
+-  }
+-
+-  private boolean checkValidName(String name) {
+-    Path tmp = new Path(name);
+-    if (tmp.depth() != 1) {
+-      return false;
+-    }
+-    if (name.endsWith(".har")) 
+-      return true;
+-    return false;
+-  }
+-  
+-
+-  private Path largestDepth(List<Path> paths) {
+-    Path deepest = paths.get(0);
+-    for (Path p: paths) {
+-      if (p.depth() > deepest.depth()) {
+-        deepest = p;
+-      }
+-    }
+-    return deepest;
+-  }
+-  
+-  /**
+-   * truncate the prefix root from the full path
+-   * @param fullPath the full path
+-   * @param root the prefix root to be truncated
+-   * @return the relative path
+-   */
+-  private Path relPathToRoot(Path fullPath, Path root) {
+-    // just take some effort to do it 
+-    // rather than just using substring 
+-    // so that we do not break sometime later
+-    final Path justRoot = new Path(Path.SEPARATOR);
+-    if (fullPath.depth() == root.depth()) {
+-      return justRoot;
+-    }
+-    else if (fullPath.depth() > root.depth()) {
+-      Path retPath = new Path(fullPath.getName());
+-      Path parent = fullPath.getParent();
+-      for (int i=0; i < (fullPath.depth() - root.depth() -1); i++) {
+-        retPath = new Path(parent.getName(), retPath);
+-        parent = parent.getParent();
+-      }
+-      return new Path(justRoot, retPath);
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * this method writes all the valid top level directories 
+-   * into the srcWriter for indexing. This method is a little
+-   * tricky. example- 
+-   * for an input with parent path /home/user/ and sources 
+-   * as /home/user/source/dir1, /home/user/source/dir2 - this 
+-   * will output <source, dir, dir1, dir2> (dir means that source is a dir
+-   * with dir1 and dir2 as children) and <source/dir1, file, null>
+-   * and <source/dir2, file, null>
+-   * @param srcWriter the sequence file writer to write the
+-   * directories to
+-   * @param paths the source paths provided by the user. They
+-   * are glob free and have full path (not relative paths)
+-   * @param parentPath the parent path that you want the archives
+-   * to be relative to. example - /home/user/dir1 can be archived with
+-   * parent as /home or /home/user.
+-   * @throws IOException
+-   */
+-  private void writeTopLevelDirs(SequenceFile.Writer srcWriter, 
+-      List<Path> paths, Path parentPath) throws IOException {
+-    // extract paths from absolute URI's
+-    List<Path> justPaths = new ArrayList<Path>();
+-    for (Path p: paths) {
+-      justPaths.add(new Path(p.toUri().getPath()));
+-    }
+-    /* find all the common parents of paths that are valid archive
+-     * paths. The below is done so that we do not add a common path
+-     * twice and also we need to only add valid child of a path that
+-     * are specified the user.
+-     */
+-    TreeMap<String, HashSet<String>> allpaths = new TreeMap<String, 
+-                                                HashSet<String>>();
+-    /* the largest depth of paths. the max number of times
+-     * we need to iterate
+-     */
+-    Path deepest = largestDepth(paths);
+-    Path root = new Path(Path.SEPARATOR);
+-    for (int i = parentPath.depth(); i < deepest.depth(); i++) {
+-      List<Path> parents = new ArrayList<Path>();
+-      for (Path p: justPaths) {
+-        if (p.compareTo(root) == 0){
+-          //do nothing
+-        }
+-        else {
+-          Path parent = p.getParent();
+-          if (null != parent) {
+-            if (allpaths.containsKey(parent.toString())) {
+-              HashSet<String> children = allpaths.get(parent.toString());
+-              children.add(p.getName());
+-            } 
+-            else {
+-              HashSet<String> children = new HashSet<String>();
+-              children.add(p.getName());
+-              allpaths.put(parent.toString(), children);
+-            }
+-            parents.add(parent);
+-          }
+-        }
+-      }
+-      justPaths = parents;
+-    }
+-    Set<Map.Entry<String, HashSet<String>>> keyVals = allpaths.entrySet();
+-    for (Map.Entry<String, HashSet<String>> entry : keyVals) {
+-      final Path relPath = relPathToRoot(new Path(entry.getKey()), parentPath);
+-      if (relPath != null) {
+-        final String[] children = new String[entry.getValue().size()];
+-        int i = 0;
+-        for(String child: entry.getValue()) {
+-          children[i++] = child;
+-        }
+-        append(srcWriter, 0L, relPath.toString(), children);
+-      }
+-    }
+-  }
+-
+-  private void append(SequenceFile.Writer srcWriter, long len,
+-      String path, String[] children) throws IOException {
+-    srcWriter.append(new LongWritable(len), new HarEntry(path, children));
+-  }
+-    
+-  /**
+-   * A static class that keeps
+-   * track of status of a path 
+-   * and there children if path is a dir
+-   */
+-  static class FileStatusDir {
+-    private FileStatus fstatus;
+-    private FileStatus[] children = null;
+-    
+-    /**
+-     * constructor for filestatusdir
+-     * @param fstatus the filestatus object that maps to filestatusdir
+-     * @param children the children list if fs is a directory
+-     */
+-    FileStatusDir(FileStatus fstatus, FileStatus[] children) {
+-      this.fstatus  = fstatus;
+-      this.children = children;
+-    }
+-    
+-    /**
+-     * set children of this object
+-     * @param listStatus the list of children
+-     */
+-    public void setChildren(FileStatus[] listStatus) {
+-      this.children = listStatus;
+-    }
+-
+-    /**
+-     * the filestatus of this object
+-     * @return the filestatus of this object
+-     */
+-    FileStatus getFileStatus() {
+-      return this.fstatus;
+-    }
+-    
+-    /**
+-     * the children list of this object, null if  
+-     * @return the children list
+-     */
+-    FileStatus[] getChildren() {
+-      return this.children;
+-    }
+-  }
+-  
+-  /**archive the given source paths into
+-   * the dest
+-   * @param parentPath the parent path of all the source paths
+-   * @param srcPaths the src paths to be archived
+-   * @param dest the dest dir that will contain the archive
+-   */
+-  void archive(Path parentPath, List<Path> srcPaths, 
+-      String archiveName, Path dest) throws IOException {
+-    checkPaths(conf, srcPaths);
+-    int numFiles = 0;
+-    long totalSize = 0;
+-    FileSystem fs = parentPath.getFileSystem(conf);
+-    this.blockSize = conf.getLong(HAR_BLOCKSIZE_LABEL, blockSize);
+-    this.partSize = conf.getLong(HAR_PARTSIZE_LABEL, partSize);
+-    conf.setLong(HAR_BLOCKSIZE_LABEL, blockSize);
+-    conf.setLong(HAR_PARTSIZE_LABEL, partSize);
+-    conf.set(DST_HAR_LABEL, archiveName);
+-    conf.set(SRC_PARENT_LABEL, fs.makeQualified(parentPath).toString());
+-    conf.setInt(HAR_REPLICATION_LABEL, repl);
+-    Path outputPath = new Path(dest, archiveName);
+-    FileOutputFormat.setOutputPath(conf, outputPath);
+-    FileSystem outFs = outputPath.getFileSystem(conf);
+-    if (outFs.exists(outputPath)) {
+-      throw new IOException("Archive path: "
+-          + outputPath.toString() + " already exists");
+-    }
+-    if (outFs.isFile(dest)) {
+-      throw new IOException("Destination " + dest.toString()
+-          + " should be a directory but is a file");
+-    }
+-    conf.set(DST_DIR_LABEL, outputPath.toString());
+-    Credentials credentials = conf.getCredentials();
+-    Path[] allPaths = new Path[] {parentPath, dest};
+-    TokenCache.obtainTokensForNamenodes(credentials, allPaths, conf);
+-    conf.setCredentials(credentials);
+-
+-    Path stagingArea;
+-    try {
+-      stagingArea = JobSubmissionFiles.getStagingDir(new Cluster(conf), 
+-          conf);
+-    } catch (InterruptedException ie) {
+-      throw new IOException(ie);
+-    }
+-    Path jobDirectory = new Path(stagingArea,
+-        NAME+"_"+Integer.toString(new Random().nextInt(Integer.MAX_VALUE), 36));
+-    FsPermission mapredSysPerms = 
+-      new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION);
+-    FileSystem jobfs = jobDirectory.getFileSystem(conf);
+-    FileSystem.mkdirs(jobfs, jobDirectory,
+-        mapredSysPerms);
+-    conf.set(JOB_DIR_LABEL, jobDirectory.toString());
+-    //get a tmp directory for input splits
+-    Path srcFiles = new Path(jobDirectory, "_har_src_files");
+-    conf.set(SRC_LIST_LABEL, srcFiles.toString());
+-    SequenceFile.Writer srcWriter = SequenceFile.createWriter(jobfs, conf,
+-        srcFiles, LongWritable.class, HarEntry.class, 
+-        SequenceFile.CompressionType.NONE);
+-    // get the list of files 
+-    // create single list of files and dirs
+-    try {
+-      // write the top level dirs in first 
+-      writeTopLevelDirs(srcWriter, srcPaths, parentPath);
+-      srcWriter.sync();
+-      // these are the input paths passed 
+-      // from the command line
+-      // we do a recursive ls on these paths 
+-      // and then write them to the input file 
+-      // one at a time
+-      for (Path src: srcPaths) {
+-        ArrayList<FileStatusDir> allFiles = new ArrayList<FileStatusDir>();
+-        FileStatus fstatus = fs.getFileStatus(src);
+-        FileStatusDir fdir = new FileStatusDir(fstatus, null);
+-        recursivels(fs, fdir, allFiles);
+-        for (FileStatusDir statDir: allFiles) {
+-          FileStatus stat = statDir.getFileStatus();
+-          long len = stat.isDirectory()? 0:stat.getLen();
+-          final Path path = relPathToRoot(stat.getPath(), parentPath);
+-          final String[] children;
+-          if (stat.isDirectory()) {
+-            //get the children 
+-            FileStatus[] list = statDir.getChildren();
+-            children = new String[list.length];
+-            for (int i = 0; i < list.length; i++) {
+-              children[i] = list[i].getPath().getName();
+-            }
+-          }
+-          else {
+-            children = null;
+-          }
+-          append(srcWriter, len, path.toString(), children);
+-          srcWriter.sync();
+-          numFiles++;
+-          totalSize += len;
+-        }
+-      }
+-    } finally {
+-      srcWriter.close();
+-    }
+-    conf.setInt(SRC_COUNT_LABEL, numFiles);
+-    conf.setLong(TOTAL_SIZE_LABEL, totalSize);
+-    int numMaps = (int)(totalSize/partSize);
+-    //run atleast one map.
+-    conf.setNumMapTasks(numMaps == 0? 1:numMaps);
+-    conf.setNumReduceTasks(1);
+-    conf.setInputFormat(HArchiveInputFormat.class);
+-    conf.setOutputFormat(NullOutputFormat.class);
+-    conf.setMapperClass(HArchivesMapper.class);
+-    conf.setReducerClass(HArchivesReducer.class);
+-    conf.setMapOutputKeyClass(IntWritable.class);
+-    conf.setMapOutputValueClass(Text.class);
+-    FileInputFormat.addInputPath(conf, jobDirectory);
+-    //make sure no speculative execution is done
+-    conf.setSpeculativeExecution(false);
+-    JobClient.runJob(conf);
+-    //delete the tmp job directory
+-    try {
+-      jobfs.delete(jobDirectory, true);
+-    } catch(IOException ie) {
+-      LOG.info("Unable to clean tmp directory " + jobDirectory);
+-    }
+-  }
+-
+-  static class HArchivesMapper 
+-  implements Mapper<LongWritable, HarEntry, IntWritable, Text> {
+-    private JobConf conf = null;
+-    int partId = -1 ; 
+-    Path tmpOutputDir = null;
+-    Path tmpOutput = null;
+-    String partname = null;
+-    Path rootPath = null;
+-    FSDataOutputStream partStream = null;
+-    FileSystem destFs = null;
+-    byte[] buffer;
+-    int buf_size = 128 * 1024;
+-    private int replication = 3;
+-    long blockSize = 512 * 1024 * 1024l;
+-
+-    // configure the mapper and create 
+-    // the part file.
+-    // use map reduce framework to write into
+-    // tmp files. 
+-    public void configure(JobConf conf) {
+-      this.conf = conf;
+-      replication = conf.getInt(HAR_REPLICATION_LABEL, 3);
+-      // this is tightly tied to map reduce
+-      // since it does not expose an api 
+-      // to get the partition
+-      partId = conf.getInt(MRJobConfig.TASK_PARTITION, -1);
+-      // create a file name using the partition
+-      // we need to write to this directory
+-      tmpOutputDir = FileOutputFormat.getWorkOutputPath(conf);
+-      blockSize = conf.getLong(HAR_BLOCKSIZE_LABEL, blockSize);
+-      // get the output path and write to the tmp 
+-      // directory 
+-      partname = "part-" + partId;
+-      tmpOutput = new Path(tmpOutputDir, partname);
+-      rootPath = (conf.get(SRC_PARENT_LABEL, null) == null) ? null :
+-                  new Path(conf.get(SRC_PARENT_LABEL));
+-      if (rootPath == null) {
+-        throw new RuntimeException("Unable to read parent " +
+-        		"path for har from config");
+-      }
+-      try {
+-        destFs = tmpOutput.getFileSystem(conf);
+-        //this was a stale copy
+-        destFs.delete(tmpOutput, false);
+-        partStream = destFs.create(tmpOutput, false, conf.getInt("io.file.buffer.size", 4096), 
+-            destFs.getDefaultReplication(tmpOutput), blockSize);
+-      } catch(IOException ie) {
+-        throw new RuntimeException("Unable to open output file " + tmpOutput, ie);
+-      }
+-      buffer = new byte[buf_size];
+-    }
+-
+-    // copy raw data.
+-    public void copyData(Path input, FSDataInputStream fsin, 
+-        FSDataOutputStream fout, Reporter reporter) throws IOException {
+-      try {
+-        for (int cbread=0; (cbread = fsin.read(buffer))>= 0;) {
+-          fout.write(buffer, 0,cbread);
+-          reporter.progress();
+-        }
+-      } finally {
+-        fsin.close();
+-      }
+-    }
+-    
+-    /**
+-     * get rid of / in the beginning of path
+-     * @param p the path
+-     * @return return path without /
+-     */
+-    private Path realPath(Path p, Path parent) {
+-      Path rootPath = new Path(Path.SEPARATOR);
+-      if (rootPath.compareTo(p) == 0) {
+-        return parent;
+-      }
+-      return new Path(parent, new Path(p.toString().substring(1)));
+-    }
+-
+-    private static String encodeName(String s) 
+-      throws UnsupportedEncodingException {
+-      return URLEncoder.encode(s,"UTF-8");
+-    }
+-
+-    private static String encodeProperties( FileStatus fStatus )
+-      throws UnsupportedEncodingException {
+-      String propStr = encodeName(
+-          fStatus.getModificationTime() + " "
+-        + fStatus.getPermission().toShort() + " "
+-        + encodeName(fStatus.getOwner()) + " "
+-        + encodeName(fStatus.getGroup()));
+-      return propStr;
+-    }
+-
+-    // read files from the split input 
+-    // and write it onto the part files.
+-    // also output hash(name) and string 
+-    // for reducer to create index 
+-    // and masterindex files.
+-    public void map(LongWritable key, HarEntry value,
+-        OutputCollector<IntWritable, Text> out,
+-        Reporter reporter) throws IOException {
+-      Path relPath = new Path(value.path);
+-      int hash = HarFileSystem.getHarHash(relPath);
+-      String towrite = null;
+-      Path srcPath = realPath(relPath, rootPath);
+-      long startPos = partStream.getPos();
+-      FileSystem srcFs = srcPath.getFileSystem(conf);
+-      FileStatus srcStatus = srcFs.getFileStatus(srcPath);
+-      String propStr = encodeProperties(srcStatus);
+-      if (value.isDir()) { 
+-        towrite = encodeName(relPath.toString())
+-                  + " dir " + propStr + " 0 0 ";
+-        StringBuffer sbuff = new StringBuffer();
+-        sbuff.append(towrite);
+-        for (String child: value.children) {
+-          sbuff.append(encodeName(child) + " ");
+-        }
+-        towrite = sbuff.toString();
+-        //reading directories is also progress
+-        reporter.progress();
+-      }
+-      else {
+-        FSDataInputStream input = srcFs.open(srcStatus.getPath());
+-        reporter.setStatus("Copying file " + srcStatus.getPath() + 
+-            " to archive.");
+-        copyData(srcStatus.getPath(), input, partStream, reporter);
+-        towrite = encodeName(relPath.toString())
+-                  + " file " + partname + " " + startPos
+-                  + " " + srcStatus.getLen() + " " + propStr + " ";
+-      }
+-      out.collect(new IntWritable(hash), new Text(towrite));
+-    }
+-    
+-    public void close() throws IOException {
+-      // close the part files.
+-      partStream.close();
+-      destFs.setReplication(tmpOutput, (short) replication);
+-    }
+-  }
+-  
+-  /** the reduce for creating the index and the master index 
+-   * 
+-   */
+-  static class HArchivesReducer implements Reducer<IntWritable, 
+-  Text, Text, Text> {
+-    private JobConf conf = null;
+-    private long startIndex = 0;
+-    private long endIndex = 0;
+-    private long startPos = 0;
+-    private Path masterIndex = null;
+-    private Path index = null;
+-    private FileSystem fs = null;
+-    private FSDataOutputStream outStream = null;
+-    private FSDataOutputStream indexStream = null;
+-    private int numIndexes = 1000;
+-    private Path tmpOutputDir = null;
+-    private int written = 0;
+-    private int replication = 3;
+-    private int keyVal = 0;
+-    
+-    // configure 
+-    public void configure(JobConf conf) {
+-      this.conf = conf;
+-      tmpOutputDir = FileOutputFormat.getWorkOutputPath(this.conf);
+-      masterIndex = new Path(tmpOutputDir, "_masterindex");
+-      index = new Path(tmpOutputDir, "_index");
+-      replication = conf.getInt(HAR_REPLICATION_LABEL, 3);
+-      try {
+-        fs = masterIndex.getFileSystem(conf);
+-        fs.delete(masterIndex, false);
+-        fs.delete(index, false);
+-        indexStream = fs.create(index);
+-        outStream = fs.create(masterIndex);
+-        String version = VERSION + " \n";
+-        outStream.write(version.getBytes(StandardCharsets.UTF_8));
+-        
+-      } catch(IOException e) {
+-        throw new RuntimeException(e);
+-      }
+-    }
+-    
+-    // create the index and master index. The input to 
+-    // the reduce is already sorted by the hash of the 
+-    // files. SO we just need to write it to the index. 
+-    // We update the masterindex as soon as we update 
+-    // numIndex entries.
+-    public void reduce(IntWritable key, Iterator<Text> values,
+-        OutputCollector<Text, Text> out,
+-        Reporter reporter) throws IOException {
+-      keyVal = key.get();
+-      while(values.hasNext()) {
+-        Text value = values.next();
+-        String towrite = value.toString() + "\n";
+-        indexStream.write(towrite.getBytes(StandardCharsets.UTF_8));
+-        written++;
+-        if (written > numIndexes -1) {
+-          // every 1000 indexes we report status
+-          reporter.setStatus("Creating index for archives");
+-          reporter.progress();
+-          endIndex = keyVal;
+-          String masterWrite = startIndex + " " + endIndex + " " + startPos 
+-                              +  " " + indexStream.getPos() + " \n" ;
+-          outStream.write(masterWrite.getBytes(StandardCharsets.UTF_8));
+-          startPos = indexStream.getPos();
+-          startIndex = endIndex;
+-          written = 0;
+-        }
+-      }
+-    }
+-    
+-    public void close() throws IOException {
+-      //write the last part of the master index.
+-      if (written > 0) {
+-        String masterWrite = startIndex + " " + keyVal + " " + startPos  +
+-                             " " + indexStream.getPos() + " \n";
+-        outStream.write(masterWrite.getBytes(StandardCharsets.UTF_8));
+-      }
+-      // close the streams
+-      outStream.close();
+-      indexStream.close();
+-      // try increasing the replication 
+-      fs.setReplication(index, (short) replication);
+-      fs.setReplication(masterIndex, (short) replication);
+-    }
+-    
+-  }
+-
+-  private void printUsage(Options opts, boolean printDetailed) {
+-    HelpFormatter helpFormatter = new HelpFormatter();
+-    if (printDetailed) {
+-      helpFormatter.printHelp(usage.length() + 10, usage, null, opts, null,
+-          false);
+-    } else {
+-      System.out.println(usage);
+-    }
+-  }
+-
+-  /** the main driver for creating the archives
+-   *  it takes at least three command line parameters. The parent path, 
+-   *  The src and the dest. It does an lsr on the source paths.
+-   *  The mapper created archuves and the reducer creates 
+-   *  the archive index.
+-   */
+-
+-  public int run(String[] args) throws Exception {
+-    try {
+-      // Parse CLI options
+-      Options options = new Options();
+-      options.addOption(ARCHIVE_NAME, true,
+-          "Name of the Archive. This is mandatory option");
+-      options.addOption(PARENT_PATH, true,
+-          "Parent path of sources. This is mandatory option");
+-      options.addOption(REPLICATION, true, "Replication factor archive files");
+-      options.addOption(HELP, false, "Show the usage");
+-      Parser parser = new GnuParser();
+-      CommandLine commandLine = parser.parse(options, args, true);
+-
+-      if (commandLine.hasOption(HELP)) {
+-        printUsage(options, true);
+-        return 0;
+-      }
+-      if (!commandLine.hasOption(ARCHIVE_NAME)) {
+-        printUsage(options, false);
+-        throw new IOException("Archive Name not specified.");
+-      }
+-      String archiveName = commandLine.getOptionValue(ARCHIVE_NAME);
+-      if (!checkValidName(archiveName)) {
+-        printUsage(options, false);
+-        throw new IOException("Invalid name for archives. " + archiveName);
+-      }
+-      //check to see if relative parent has been provided or not
+-      //this is a required parameter. 
+-      if (!commandLine.hasOption(PARENT_PATH)) {
+-        printUsage(options, false);
+-        throw new IOException("Parent path not specified.");
+-      }
+-      Path parentPath = new Path(commandLine.getOptionValue(PARENT_PATH));
+-      if (!parentPath.isAbsolute()) {
+-        parentPath = parentPath.getFileSystem(getConf()).makeQualified(
+-            parentPath);
+-      }
+-
+-      if (commandLine.hasOption(REPLICATION)) {
+-        repl = Short.parseShort(commandLine.getOptionValue(REPLICATION));
+-      }
+-      // Remaining args
+-      args = commandLine.getArgs();
+-      List<Path> srcPaths = new ArrayList<Path>();
+-      Path destPath = null;
+-      //read the rest of the paths
+-      for (int i = 0; i < args.length; i++) {
+-        if (i == (args.length - 1)) {
+-          destPath = new Path(args[i]);
+-          if (!destPath.isAbsolute()) {
+-            destPath = destPath.getFileSystem(getConf()).makeQualified(destPath);
+-          }
+-        }
+-        else {
+-          Path argPath = new Path(args[i]);
+-          if (argPath.isAbsolute()) {
+-            printUsage(options, false);
+-            throw new IOException("Source path " + argPath +
+-                " is not relative to "+ parentPath);
+-          }
+-          srcPaths.add(new Path(parentPath, argPath));
+-        }
+-      }
+-      if (destPath == null) {
+-        printUsage(options, false);
+-        throw new IOException("Destination path not specified.");
+-      }
+-      if (srcPaths.size() == 0) {
+-        // assuming if the user does not specify path for sources
+-        // the whole parent directory needs to be archived. 
+-        srcPaths.add(parentPath);
+-      }
+-      // do a glob on the srcPaths and then pass it on
+-      List<Path> globPaths = new ArrayList<Path>();
+-      for (Path p: srcPaths) {
+-        FileSystem fs = p.getFileSystem(getConf());
+-        FileStatus[] statuses = fs.globStatus(p);
+-        if (statuses != null) {
+-          for (FileStatus status: statuses) {
+-            globPaths.add(fs.makeQualified(status.getPath()));
+-          }
+-        }
+-      }
+-      if (globPaths.isEmpty()) {
+-        throw new IOException("The resolved paths set is empty."
+-            + "  Please check whether the srcPaths exist, where srcPaths = "
+-            + srcPaths);
+-      }
+-
+-      archive(parentPath, globPaths, archiveName, destPath);
+-    } catch(IOException ie) {
+-      System.err.println(ie.getLocalizedMessage());
+-      return -1;
+-    }
+-    return 0;
+-  }
+-
+-  static final String TEST_HADOOP_ARCHIVES_JAR_PATH = "test.hadoop.archives.jar";
+-
+-  /** the main functions **/
+-  public static void main(String[] args) {
+-    JobConf job = new JobConf(HadoopArchives.class);
+-
+-    HadoopArchives harchives = new HadoopArchives(job);
+-    int ret = 0;
+-
+-    try{
+-      ret = ToolRunner.run(harchives, args);
+-    } catch(Exception e) {
+-      LOG.debug("Exception in archives  ", e);
+-      System.err.println(e.getClass().getSimpleName() + " in archives");
+-      final String s = e.getLocalizedMessage();
+-      if (s != null) {
+-        System.err.println(s);
+-      } else {
+-        e.printStackTrace(System.err);
+-      }
+-      System.exit(1);
+-    }
+-    System.exit(ret);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-archives/src/main/shellprofile.d/hadoop-archives.sh b/hadoop-tools/hadoop-archives/src/main/shellprofile.d/hadoop-archives.sh
+deleted file mode 100755
+index 42fc1a093bc..00000000000
+--- a/hadoop-tools/hadoop-archives/src/main/shellprofile.d/hadoop-archives.sh
++++ /dev/null
+@@ -1,58 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f hadoop_subcommand_archive >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = hadoop ]]; then
+-    hadoop_add_subcommand "archive" client "create a Hadoop archive"
+-  fi
+-
+-  # this can't be indented otherwise shelldocs won't get it
+-
+-## @description  archive command for hadoop (and mapred)
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function hadoop_subcommand_archive
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.HadoopArchives
+-  hadoop_add_to_classpath_tools hadoop-archives
+-}
+-
+-fi
+-
+-if ! declare -f mapred_subcommand_archive >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = mapred ]]; then
+-    hadoop_add_subcommand "archive" client "create a Hadoop archive"
+-  fi
+-
+-  # this can't be indented otherwise shelldocs won't get it
+-
+-## @description  archive command for mapred (calls hadoop version)
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function mapred_subcommand_archive
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.HadoopArchives
+-  hadoop_add_to_classpath_tools hadoop-archives
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-archives/src/site/markdown/HadoopArchives.md.vm b/hadoop-tools/hadoop-archives/src/site/markdown/HadoopArchives.md.vm
+deleted file mode 100644
+index 9d83ed9700c..00000000000
+--- a/hadoop-tools/hadoop-archives/src/site/markdown/HadoopArchives.md.vm
++++ /dev/null
+@@ -1,162 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-#set ( $H3 = '###' )
+-
+-Hadoop Archives Guide
+-=====================
+-
+- - [Overview](#Overview)
+- - [How to Create an Archive](#How_to_Create_an_Archive)
+- - [How to Look Up Files in Archives](#How_to_Look_Up_Files_in_Archives)
+- - [How to Unarchive an Archive](#How_to_Unarchive_an_Archive)
+- - [Archives Examples](#Archives_Examples)
+-     - [Creating an Archive](#Creating_an_Archive)
+-     - [Looking Up Files](#Looking_Up_Files)
+- - [Hadoop Archives and MapReduce](#Hadoop_Archives_and_MapReduce)
+-
+-Overview
+---------
+-
+-  Hadoop archives are special format archives. A Hadoop archive maps to a file
+-  system directory. A Hadoop archive always has a \*.har extension. A Hadoop
+-  archive directory contains metadata (in the form of _index and _masterindex)
+-  and data (part-\*) files. The _index file contains the name of the files that
+-  are part of the archive and the location within the part files.
+-
+-How to Create an Archive
+-------------------------
+-
+-  `Usage: hadoop archive -archiveName name -p <parent> [-r <replication factor>] <src>* <dest>`
+-
+-  -archiveName is the name of the archive you would like to create. An example
+-  would be foo.har. The name should have a \*.har extension. The parent argument
+-  is to specify the relative path to which the files should be archived to.
+-  Example would be :
+-
+-  `-p /foo/bar a/b/c e/f/g`
+-
+-  Here /foo/bar is the parent path and a/b/c, e/f/g are relative paths to
+-  parent. Note that this is a Map/Reduce job that creates the archives. You
+-  would need a map reduce cluster to run this. For a detailed example the later
+-  sections.
+-
+-  -r indicates the desired replication factor; if this optional argument is
+-  not specified, a replication factor of 3 will be used.
+-
+-  If you just want to archive a single directory /foo/bar then you can just use
+-
+-  `hadoop archive -archiveName zoo.har -p /foo/bar -r 3 /outputdir`
+-
+-  If you specify source files that are in an encryption zone, they will be
+-  decrypted and written into the archive. If the har file is not located in an
+-  encryption zone, then they will be stored in clear (decrypted) form. If the
+-  har file is located in an encryption zone they will stored in encrypted form.
+-
+-How to Look Up Files in Archives
+---------------------------------
+-
+-  The archive exposes itself as a file system layer. So all the fs shell
+-  commands in the archives work but with a different URI. Also, note that
+-  archives are immutable. So, rename's, deletes and creates return an error.
+-  URI for Hadoop Archives is
+-
+-  `har://scheme-hostname:port/archivepath/fileinarchive`
+-
+-  If no scheme is provided it assumes the underlying filesystem. In that case
+-  the URI would look like
+-
+-  `har:///archivepath/fileinarchive`
+-
+-How to Unarchive an Archive
+----------------------------
+-
+-  Since all the fs shell commands in the archives work transparently,
+-  unarchiving is just a matter of copying.
+-
+-  To unarchive sequentially:
+-
+-  `hdfs dfs -cp har:///user/zoo/foo.har/dir1 hdfs:/user/zoo/newdir`
+-
+-  To unarchive in parallel, use DistCp:
+-
+-  `hadoop distcp har:///user/zoo/foo.har/dir1 hdfs:/user/zoo/newdir`
+-
+-Archives Examples
+------------------
+-
+-$H3 Creating an Archive
+-
+-  `hadoop archive -archiveName foo.har -p /user/hadoop -r 3 dir1 dir2 /user/zoo`
+-
+-  The above example is creating an archive using /user/hadoop as the relative
+-  archive directory. The directories /user/hadoop/dir1 and /user/hadoop/dir2
+-  will be archived in the following file system directory -- /user/zoo/foo.har.
+-  Archiving does not delete the input files. If you want to delete the input
+-  files after creating the archives (to reduce namespace), you will have to do
+-  it on your own. In this example, because `-r 3` is specified, a replication
+-  factor of 3 will be used.
+-
+-$H3 Looking Up Files
+-
+-  Looking up files in hadoop archives is as easy as doing an ls on the
+-  filesystem. After you have archived the directories /user/hadoop/dir1 and
+-  /user/hadoop/dir2 as in the example above, to see all the files in the
+-  archives you can just run:
+-
+-  `hdfs dfs -ls -R har:///user/zoo/foo.har/`
+-
+-  To understand the significance of the -p argument, lets go through the above
+-  example again. If you just do an ls (not lsr) on the hadoop archive using
+-
+-  `hdfs dfs -ls har:///user/zoo/foo.har`
+-
+-  The output should be:
+-
+-```
+-har:///user/zoo/foo.har/dir1
+-har:///user/zoo/foo.har/dir2
+-```
+-
+-  As you can recall the archives were created with the following command
+-
+-  `hadoop archive -archiveName foo.har -p /user/hadoop dir1 dir2 /user/zoo`
+-
+-  If we were to change the command to:
+-
+-  `hadoop archive -archiveName foo.har -p /user/ hadoop/dir1 hadoop/dir2 /user/zoo`
+-
+-  then a ls on the hadoop archive using
+-
+-  `hdfs dfs -ls har:///user/zoo/foo.har`
+-
+-  would give you
+-
+-```
+-har:///user/zoo/foo.har/hadoop/dir1
+-har:///user/zoo/foo.har/hadoop/dir2
+-```
+-
+-  Notice that the archived files have been archived relative to /user/ rather
+-  than /user/hadoop.
+-
+-Hadoop Archives and MapReduce
+------------------------------
+-
+-  Using Hadoop Archives in MapReduce is as easy as specifying a different input
+-  filesystem than the default file system. If you have a hadoop archive stored
+-  in HDFS in /user/zoo/foo.har then for using this archive for MapReduce input,
+-  all you need is to specify the input directory as har:///user/zoo/foo.har. Since
+-  Hadoop Archives is exposed as a file system MapReduce will be able to use all
+-  the logical input files in Hadoop Archives as input.
+diff --git a/hadoop-tools/hadoop-archives/src/site/resources/css/site.css b/hadoop-tools/hadoop-archives/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-archives/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java b/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
+deleted file mode 100644
+index 3267a683c27..00000000000
+--- a/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
++++ /dev/null
+@@ -1,808 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.FilterInputStream;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.net.URI;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.StringTokenizer;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FsShell;
+-import org.apache.hadoop.fs.HarFileSystem;
+-import org.apache.hadoop.fs.LocalFileSystem;
+-import org.apache.hadoop.fs.LocatedFileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.JarFinder;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.junit.After;
+-import org.junit.Assert;
+-import static org.junit.Assert.*;
+-import static org.slf4j.LoggerFactory.getLogger;
+-import static org.assertj.core.api.Assertions.assertThat;
+-
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.slf4j.event.Level;
+-
+-/**
+- * test {@link HadoopArchives}
+- */
+-public class TestHadoopArchives {
+-
+-  public static final String HADOOP_ARCHIVES_JAR = JarFinder
+-      .getJar(HadoopArchives.class);
+-
+-  {
+-    GenericTestUtils.setLogLevel(
+-        getLogger(org.apache.hadoop.security.Groups.class), Level.ERROR);
+-  }
+-
+-  private static final String inputDir = "input";
+-
+-  private Path inputPath;
+-  private Path archivePath;
+-  private final List<String> fileList = new ArrayList<String>();
+-  private MiniDFSCluster dfscluster;
+-
+-  private Configuration conf;
+-  private FileSystem fs;
+-
+-  private static String createFile(Path root, FileSystem fs, String... dirsAndFile
+-      ) throws IOException {
+-    String fileBaseName = dirsAndFile[dirsAndFile.length - 1]; 
+-    return createFile(root, fs, fileBaseName.getBytes(StandardCharsets.UTF_8), dirsAndFile);
+-  }
+-  
+-  private static String createFile(Path root, FileSystem fs, byte[] fileContent, String... dirsAndFile
+-    ) throws IOException {
+-    StringBuilder sb = new StringBuilder();
+-    for (String segment: dirsAndFile) {
+-      if (sb.length() > 0) {
+-        sb.append(Path.SEPARATOR);  
+-      }
+-      sb.append(segment);
+-    }
+-    final Path f = new Path(root, sb.toString());
+-    final FSDataOutputStream out = fs.create(f);
+-    try {
+-         out.write(fileContent);
+-    } finally {
+-      out.close();
+-    }
+-    return sb.toString();
+-  }
+-
+-  @Before
+-  public void setUp() throws Exception {
+-    conf = new Configuration();
+-    conf.set(CapacitySchedulerConfiguration.PREFIX
+-        + CapacitySchedulerConfiguration.ROOT + "."
+-        + CapacitySchedulerConfiguration.QUEUES, "default");
+-    conf.set(CapacitySchedulerConfiguration.PREFIX
+-        + CapacitySchedulerConfiguration.ROOT + ".default."
+-        + CapacitySchedulerConfiguration.CAPACITY, "100");
+-    dfscluster =
+-        new MiniDFSCluster.Builder(conf).checkExitOnShutdown(true)
+-            .numDataNodes(3).format(true).racks(null).build();
+-
+-    fs = dfscluster.getFileSystem();
+-    
+-    // prepare archive path:
+-    archivePath = new Path(fs.getHomeDirectory(), "archive");
+-    fs.delete(archivePath, true);
+-    
+-    // prepare input path:
+-    inputPath = new Path(fs.getHomeDirectory(), inputDir);
+-    fs.delete(inputPath, true);
+-    fs.mkdirs(inputPath);
+-    // create basic input files:
+-    fileList.add(createFile(inputPath, fs, "a"));
+-    fileList.add(createFile(inputPath, fs, "b"));
+-    fileList.add(createFile(inputPath, fs, "c"));
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (dfscluster != null) {
+-      dfscluster.shutdown();
+-    }
+-  }
+-
+-  @Test
+-  public void testRelativePath() throws Exception {
+-    final Path sub1 = new Path(inputPath, "dir1");
+-    fs.mkdirs(sub1);
+-    createFile(inputPath, fs, sub1.getName(), "a");
+-    final FsShell shell = new FsShell(conf);
+-
+-    final List<String> originalPaths = lsr(shell, "input");
+-    System.out.println("originalPaths: " + originalPaths);
+-
+-    // make the archive:
+-    final String fullHarPathStr = makeArchive();
+-
+-    // compare results:
+-    final List<String> harPaths = lsr(shell, fullHarPathStr);
+-    Assert.assertEquals(originalPaths, harPaths);
+-  }
+-
+-  @Test
+-  public void testRelativePathWitRepl() throws Exception {
+-    final Path sub1 = new Path(inputPath, "dir1");
+-    fs.mkdirs(sub1);
+-    createFile(inputPath, fs, sub1.getName(), "a");
+-    final FsShell shell = new FsShell(conf);
+-
+-    final List<String> originalPaths = lsr(shell, "input");
+-    System.out.println("originalPaths: " + originalPaths);
+-
+-    // make the archive:
+-    final String fullHarPathStr = makeArchiveWithRepl();
+-
+-    // compare results:
+-    final List<String> harPaths = lsr(shell, fullHarPathStr);
+-    Assert.assertEquals(originalPaths, harPaths);
+-  }
+-
+-  @Test
+-  public void testOutputPathValidity() throws Exception {
+-    final String inputPathStr = inputPath.toUri().getPath();
+-    final URI uri = fs.getUri();
+-    final String harName = "foo.har";
+-    System.setProperty(HadoopArchives.TEST_HADOOP_ARCHIVES_JAR_PATH,
+-        HADOOP_ARCHIVES_JAR);
+-    final HadoopArchives har = new HadoopArchives(conf);
+-
+-    PrintStream stderr = System.err;
+-    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+-    PrintStream newErr = new PrintStream(byteStream);
+-    System.setErr(newErr);
+-
+-    // fail if the archive path already exists
+-    createFile(archivePath, fs, harName);
+-    final String[] args = { "-archiveName", harName, "-p", inputPathStr, "*",
+-        archivePath.toString() };
+-    Assert.assertEquals(-1, ToolRunner.run(har, args));
+-    String output = byteStream.toString();
+-    final Path outputPath = new Path(archivePath, harName);
+-    Assert.assertTrue(output.indexOf("Archive path: " + outputPath.toString()
+-        + " already exists") != -1);
+-
+-    byteStream.reset();
+-
+-    // fail if the destination directory is a file
+-    createFile(archivePath, fs, "sub1");
+-    final Path archivePath2 = new Path(archivePath, "sub1");
+-    final String[] args2 = { "-archiveName", harName, "-p", inputPathStr, "*",
+-        archivePath2.toString() };
+-    Assert.assertEquals(-1, ToolRunner.run(har, args2));
+-    output = byteStream.toString();
+-    Assert.assertTrue(output.indexOf("Destination " + archivePath2.toString()
+-        + " should be a directory but is a file") != -1);
+-
+-    System.setErr(stderr);
+-  }
+-
+-  @Test
+-  public void testPathWithSpaces() throws Exception {
+-    // create files/directories with spaces
+-    createFile(inputPath, fs, "c c");
+-    final Path sub1 = new Path(inputPath, "sub 1");
+-    fs.mkdirs(sub1);
+-    createFile(sub1, fs, "file x y z");
+-    createFile(sub1, fs, "file");
+-    createFile(sub1, fs, "x");
+-    createFile(sub1, fs, "y");
+-    createFile(sub1, fs, "z");
+-    final Path sub2 = new Path(inputPath, "sub 1 with suffix");
+-    fs.mkdirs(sub2);
+-    createFile(sub2, fs, "z");
+-
+-    final FsShell shell = new FsShell(conf);
+-    final String inputPathStr = inputPath.toUri().getPath();
+-    final List<String> originalPaths = lsr(shell, inputPathStr);
+-
+-    // make the archive:
+-    final String fullHarPathStr = makeArchive();
+-
+-    // compare results
+-    final List<String> harPaths = lsr(shell, fullHarPathStr);
+-    Assert.assertEquals(originalPaths, harPaths);
+-  }
+-
+-  @Test
+-  public void testSingleFile() throws Exception {
+-    final Path sub1 = new Path(inputPath, "dir1");
+-    fs.mkdirs(sub1);
+-    String singleFileName = "a";
+-    createFile(inputPath, fs, sub1.getName(), singleFileName);
+-    final FsShell shell = new FsShell(conf);
+-
+-    final List<String> originalPaths = lsr(shell, sub1.toString());
+-    System.out.println("originalPaths: " + originalPaths);
+-
+-    // make the archive:
+-    final String fullHarPathStr = makeArchive(sub1, singleFileName);
+-
+-    // compare results:
+-    final List<String> harPaths = lsr(shell, fullHarPathStr);
+-    Assert.assertEquals(originalPaths, harPaths);
+-  }
+-
+-  @Test
+-  public void testGlobFiles() throws Exception {
+-    final Path sub1 = new Path(inputPath, "dir1");
+-    final Path sub2 = new Path(inputPath, "dir2");
+-    fs.mkdirs(sub1);
+-    String fileName = "a";
+-    createFile(inputPath, fs, sub1.getName(), fileName);
+-    createFile(inputPath, fs, sub2.getName(), fileName);
+-    createFile(inputPath, fs, sub1.getName(), "b"); // not part of result
+-
+-    final String glob =  "dir{1,2}/a";
+-    final FsShell shell = new FsShell(conf);
+-    final List<String> originalPaths = lsr(shell, inputPath.toString(),
+-        inputPath + "/" + glob);
+-    System.out.println("originalPaths: " + originalPaths);
+-
+-    // make the archive:
+-    final String fullHarPathStr = makeArchive(inputPath, glob);
+-
+-    // compare results:
+-    final List<String> harPaths = lsr(shell, fullHarPathStr,
+-        fullHarPathStr + "/" + glob);
+-    Assert.assertEquals(originalPaths, harPaths);
+-  }
+-
+-  private static List<String> lsr(final FsShell shell, String rootDir) throws Exception {
+-    return lsr(shell, rootDir, null);
+-  }
+-
+-  private static List<String> lsr(final FsShell shell, String rootDir,
+-      String glob) throws Exception {
+-    final String dir = glob == null ? rootDir : glob;
+-    System.out.println("lsr root=" + rootDir);
+-    final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+-    final PrintStream out = new PrintStream(bytes);
+-    final PrintStream oldOut = System.out;
+-    final PrintStream oldErr = System.err;
+-    System.setOut(out);
+-    System.setErr(out);
+-    final String results;
+-    try {
+-      Assert.assertEquals(0, shell.run(new String[] { "-lsr", dir }));
+-      results = bytes.toString();
+-    } finally {
+-      IOUtils.closeStream(out);
+-      System.setOut(oldOut);
+-      System.setErr(oldErr);
+-    }
+-    System.out.println("lsr results:\n" + results);
+-    String dirname = rootDir;
+-    if (rootDir.lastIndexOf(Path.SEPARATOR) != -1) {
+-      dirname = rootDir.substring(rootDir.lastIndexOf(Path.SEPARATOR));
+-    }
+-
+-    final List<String> paths = new ArrayList<String>();
+-    for (StringTokenizer t = new StringTokenizer(results, "\n"); t
+-        .hasMoreTokens();) {
+-      final String s = t.nextToken();
+-      final int i = s.indexOf(dirname);
+-      if (i >= 0) {
+-        paths.add(s.substring(i + dirname.length()));
+-      }
+-    }
+-    Collections.sort(paths);
+-    System.out
+-        .println("lsr paths = " + paths.toString().replace(", ", ",\n  "));
+-    return paths;
+-  }
+-  
+-  @Test
+-  public void testReadFileContent() throws Exception {
+-    fileList.add(createFile(inputPath, fs, "c c"));
+-    final Path sub1 = new Path(inputPath, "sub 1");
+-    fs.mkdirs(sub1);
+-    fileList.add(createFile(inputPath, fs, sub1.getName(), "file x y z"));
+-    fileList.add(createFile(inputPath, fs, sub1.getName(), "file"));
+-    fileList.add(createFile(inputPath, fs, sub1.getName(), "x"));
+-    fileList.add(createFile(inputPath, fs, sub1.getName(), "y"));
+-    fileList.add(createFile(inputPath, fs, sub1.getName(), "z"));
+-    final Path sub2 = new Path(inputPath, "sub 1 with suffix");
+-    fs.mkdirs(sub2);
+-    fileList.add(createFile(inputPath, fs, sub2.getName(), "z"));
+-    // Generate a big binary file content:
+-    final byte[] binContent = prepareBin();
+-    fileList.add(createFile(inputPath, fs, binContent, sub2.getName(), "bin"));
+-    fileList.add(createFile(inputPath, fs, new byte[0], sub2.getName(), "zero-length"));
+-
+-    final String fullHarPathStr = makeArchive();
+-
+-    // Create fresh HarFs:
+-    final HarFileSystem harFileSystem = new HarFileSystem(fs);
+-    try {
+-      final URI harUri = new URI(fullHarPathStr);
+-      harFileSystem.initialize(harUri, fs.getConf());
+-      // now read the file content and compare it against the expected:
+-      int readFileCount = 0;
+-      for (final String pathStr0 : fileList) {
+-        final Path path = new Path(fullHarPathStr + Path.SEPARATOR + pathStr0);
+-        final String baseName = path.getName();
+-        final FileStatus status = harFileSystem.getFileStatus(path);
+-        if (status.isFile()) {
+-          // read the file:
+-          final byte[] actualContentSimple = readAllSimple(
+-              harFileSystem.open(path), true);
+-          
+-          final byte[] actualContentBuffer = readAllWithBuffer(
+-              harFileSystem.open(path), true);
+-          assertArrayEquals(actualContentSimple, actualContentBuffer);
+-          
+-          final byte[] actualContentFully = readAllWithReadFully(
+-              actualContentSimple.length,
+-              harFileSystem.open(path), true);
+-          assertArrayEquals(actualContentSimple, actualContentFully);
+-          
+-          final byte[] actualContentSeek = readAllWithSeek(
+-              actualContentSimple.length,
+-              harFileSystem.open(path), true);
+-          assertArrayEquals(actualContentSimple, actualContentSeek);
+-          
+-          final byte[] actualContentRead4
+-          = readAllWithRead4(harFileSystem.open(path), true);
+-          assertArrayEquals(actualContentSimple, actualContentRead4);
+-          
+-          final byte[] actualContentSkip = readAllWithSkip(
+-              actualContentSimple.length, 
+-              harFileSystem.open(path), 
+-              harFileSystem.open(path), 
+-              true);
+-          assertArrayEquals(actualContentSimple, actualContentSkip);
+-          
+-          if ("bin".equals(baseName)) {
+-            assertArrayEquals(binContent, actualContentSimple);
+-          } else if ("zero-length".equals(baseName)) {
+-            assertEquals(0, actualContentSimple.length);
+-          } else {
+-            String actual = new String(actualContentSimple, StandardCharsets.UTF_8);
+-            assertEquals(baseName, actual);
+-          }
+-          readFileCount++;
+-        }
+-      }
+-      assertThat(fileList.size()).isEqualTo(readFileCount);
+-    } finally {
+-      harFileSystem.close();
+-    }
+-  }
+-  
+-  private static byte[] readAllSimple(FSDataInputStream fsdis, boolean close) throws IOException {
+-    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-    try {
+-      int b;
+-      while (true) {
+-        b = fsdis.read();
+-        if (b < 0) {
+-          break;
+-        } else {
+-          baos.write(b);
+-        }
+-      }
+-      baos.close();
+-      return baos.toByteArray();
+-    } finally {
+-      if (close) {
+-        fsdis.close();
+-      }
+-    }
+-  }
+-
+-  private static byte[] readAllWithBuffer(FSDataInputStream fsdis, boolean close)
+-      throws IOException {
+-    try {
+-      final int available = fsdis.available();
+-      final byte[] buffer;
+-      final ByteArrayOutputStream baos;
+-      if (available < 0) {
+-        buffer = new byte[1024];
+-        baos = new ByteArrayOutputStream(buffer.length * 2);
+-      } else {
+-        buffer = new byte[available];
+-        baos = new ByteArrayOutputStream(available);
+-      }
+-      int readIntoBuffer = 0;
+-      int read; 
+-      while (true) {
+-        read = fsdis.read(buffer, readIntoBuffer, buffer.length - readIntoBuffer);
+-        if (read <= 0) {
+-          // end of stream:
+-          if (readIntoBuffer > 0) {
+-            baos.write(buffer, 0, readIntoBuffer);
+-          }
+-          return baos.toByteArray();
+-        } else {
+-          readIntoBuffer += read;
+-          if (readIntoBuffer == buffer.length) {
+-            // buffer is full, need to clean the buffer.
+-            // drop the buffered data to baos:
+-            baos.write(buffer);
+-            // reset the counter to start reading to the buffer beginning:
+-            readIntoBuffer = 0;
+-          } else if (readIntoBuffer > buffer.length) {
+-            throw new IOException("Read more than the buffer length: "
+-                + readIntoBuffer + ", buffer length = " + buffer.length);
+-          }
+-        }
+-      }
+-    } finally {
+-      if (close) {
+-        fsdis.close();
+-      }
+-    }
+-  }
+-
+-  private static byte[] readAllWithReadFully(int totalLength, FSDataInputStream fsdis, boolean close)
+-      throws IOException {
+-    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-    // Simulate reading of some data structures of known length:
+-    final byte[] buffer = new byte[17];
+-    final int times = totalLength / buffer.length;
+-    final int remainder = totalLength % buffer.length;
+-    // it would be simpler to leave the position tracking to the 
+-    // InputStream, but we need to check the methods #readFully(2) 
+-    // and #readFully(4) that receive the position as a parameter:
+-    int position = 0;
+-    try {
+-      // read "data structures":
+-      for (int i=0; i<times; i++) {
+-        fsdis.readFully(position, buffer);
+-        position += buffer.length;
+-        baos.write(buffer);
+-      }
+-      if (remainder > 0) {
+-        // read the remainder:
+-        fsdis.readFully(position, buffer, 0, remainder);
+-        position += remainder;
+-        baos.write(buffer, 0, remainder);
+-      }
+-      try {
+-        fsdis.readFully(position, buffer, 0, 1);
+-        assertTrue(false);
+-      } catch (IOException ioe) {
+-        // okay
+-      }
+-      assertEquals(totalLength, position);
+-      final byte[] result = baos.toByteArray();
+-      assertEquals(totalLength, result.length);
+-      return result;
+-    } finally {
+-      if (close) {
+-        fsdis.close();
+-      }
+-    }
+-  }
+-
+-  private static byte[] readAllWithRead4(FSDataInputStream fsdis, boolean close)
+-      throws IOException {
+-    try {
+-      final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-      final byte[] buffer = new byte[17];
+-      int totalRead = 0;
+-      int read;
+-      while (true) {
+-        read = fsdis.read(totalRead, buffer, 0, buffer.length);
+-        if (read > 0) {
+-          totalRead += read;
+-          baos.write(buffer, 0, read);
+-        } else if (read < 0) {
+-          break; // EOF
+-        } else {
+-          // read == 0:
+-          // zero result may be returned *only* in case if the 4th 
+-          // parameter is 0. Since in our case this is 'buffer.length',
+-          // zero return value clearly indicates a bug: 
+-          throw new AssertionError("FSDataInputStream#read(4) returned 0, while " +
+-          		" the 4th method parameter is " + buffer.length + ".");
+-        }
+-      }
+-      final byte[] result = baos.toByteArray();
+-      return result;
+-    } finally {
+-      if (close) {
+-        fsdis.close();
+-      }
+-    }
+-  }
+-  
+-  private static byte[] readAllWithSeek(final int totalLength, 
+-      final FSDataInputStream fsdis, final boolean close)
+-      throws IOException {
+-    final byte[] result = new byte[totalLength];
+-    long pos;
+-    try {
+-      // read the data in the reverse order, from 
+-      // the tail to the head by pieces of 'buffer' length:
+-      final byte[] buffer = new byte[17];
+-      final int times = totalLength / buffer.length;
+-      int read;
+-      int expectedRead;
+-      for (int i=times; i>=0; i--) {
+-        pos = i * buffer.length;
+-        fsdis.seek(pos);
+-        // check that seek is successful:
+-        assertEquals(pos, fsdis.getPos());
+-        read = fsdis.read(buffer);
+-        // check we read right number of bytes:
+-        if (i == times) {
+-          expectedRead = totalLength % buffer.length; // remainder
+-          if (expectedRead == 0) {
+-            // zero remainder corresponds to the EOS, so
+-            // by the contract of DataInpitStream#read(byte[]) -1 should be 
+-            // returned:
+-            expectedRead = -1;
+-          }
+-        } else {
+-          expectedRead = buffer.length;
+-        }
+-        assertEquals(expectedRead, read);
+-        if (read > 0) {
+-          System.arraycopy(buffer, 0, result, (int)pos, read);
+-        }
+-      }
+-      
+-      // finally, check that #seek() to not existing position leads to IOE:
+-      expectSeekIOE(fsdis, Long.MAX_VALUE, "Seek to Long.MAX_VALUE should lead to IOE.");
+-      expectSeekIOE(fsdis, Long.MIN_VALUE, "Seek to Long.MIN_VALUE should lead to IOE.");
+-      long pp = -1L;
+-      expectSeekIOE(fsdis, pp, "Seek to "+pp+" should lead to IOE.");
+-      
+-      // NB: is is *possible* to #seek(length), but *impossible* to #seek(length + 1):
+-      fsdis.seek(totalLength);
+-      assertEquals(totalLength, fsdis.getPos());
+-      pp = totalLength + 1;
+-      expectSeekIOE(fsdis, pp, "Seek to the length position + 1 ("+pp+") should lead to IOE.");
+-      
+-      return result;
+-    } finally {
+-      if (close) {
+-        fsdis.close();
+-      }
+-    }
+-  }  
+-
+-  private static void expectSeekIOE(FSDataInputStream fsdis, long seekPos, String message) {
+-    try {
+-      fsdis.seek(seekPos);
+-      assertTrue(message + " (Position = " + fsdis.getPos() + ")", false);
+-    } catch (IOException ioe) {
+-      // okay
+-    }
+-  }
+-  
+-  /*
+-   * Reads data by chunks from 2 input streams:
+-   * reads chunk from stream 1, and skips this chunk in the stream 2;
+-   * Then reads next chunk from stream 2, and skips this chunk in stream 1. 
+-   */
+-  private static byte[] readAllWithSkip(
+-      final int totalLength, 
+-      final FSDataInputStream fsdis1, 
+-      final FSDataInputStream fsdis2, 
+-      final boolean close)
+-      throws IOException {
+-    // test negative skip arg: 
+-    assertEquals(0, fsdis1.skip(-1));
+-    // test zero skip arg: 
+-    assertEquals(0, fsdis1.skip(0));
+-    
+-    final ByteArrayOutputStream baos = new ByteArrayOutputStream(totalLength);
+-    try {
+-      // read the data in the reverse order, from 
+-      // the tail to the head by pieces of 'buffer' length:
+-      final byte[] buffer = new byte[17];
+-      final int times = totalLength / buffer.length;
+-      final int remainder = totalLength % buffer.length;
+-      long skipped;
+-      long expectedPosition;
+-      int toGo;
+-      for (int i=0; i<=times; i++) {
+-        toGo = (i < times) ? buffer.length : remainder;
+-        if (i % 2 == 0) {
+-          fsdis1.readFully(buffer, 0, toGo);
+-          skipped = skipUntilZero(fsdis2, toGo);
+-        } else {
+-          fsdis2.readFully(buffer, 0, toGo);
+-          skipped = skipUntilZero(fsdis1, toGo);
+-        }
+-        if (i < times) {
+-          assertEquals(buffer.length, skipped);
+-          expectedPosition = (i + 1) * buffer.length;
+-        } else { 
+-          // remainder:
+-          if (remainder > 0) {
+-            assertEquals(remainder, skipped);
+-          } else {
+-            assertEquals(0, skipped);
+-          }
+-          expectedPosition = totalLength;
+-        }
+-        // check if the 2 streams have equal and correct positions:
+-        assertEquals(expectedPosition, fsdis1.getPos());
+-        assertEquals(expectedPosition, fsdis2.getPos());
+-        // save the read data:
+-        if (toGo > 0) {
+-          baos.write(buffer, 0, toGo);
+-        }
+-      }
+-
+-      // finally, check up if ended stream cannot skip:
+-      assertEquals(0, fsdis1.skip(-1));
+-      assertEquals(0, fsdis1.skip(0));
+-      assertEquals(0, fsdis1.skip(1));
+-      assertEquals(0, fsdis1.skip(Long.MAX_VALUE));
+-      
+-      return baos.toByteArray();
+-    } finally {
+-      if (close) {
+-        fsdis1.close();
+-        fsdis2.close();
+-      }
+-    }
+-  }  
+-  
+-  private static long skipUntilZero(final FilterInputStream fis, 
+-      final long toSkip) throws IOException {
+-    long skipped = 0;
+-    long remainsToSkip = toSkip;
+-    long s;
+-    while (skipped < toSkip) {
+-      s = fis.skip(remainsToSkip); // actually skippped
+-      if (s == 0) {
+-        return skipped; // EOF or impossible to skip.
+-      }
+-      skipped += s; 
+-      remainsToSkip -= s;
+-    }
+-    return skipped;
+-  }
+-  
+-  private static byte[] prepareBin() {
+-    byte[] bb = new byte[77777];
+-    for (int i=0; i<bb.length; i++) {
+-      // Generate unique values, as possible:
+-      double d = Math.log(i + 2);
+-      long bits = Double.doubleToLongBits(d);
+-      bb[i] = (byte)bits;
+-    }
+-    return bb;
+-  }
+-
+-
+-  private String makeArchive() throws Exception {
+-    return makeArchive(inputPath, null);
+-  }
+-
+-  /*
+-   * Run the HadoopArchives tool to create an archive on the 
+-   * given file system.
+-   */
+-  private String makeArchive(Path parentPath, String relGlob) throws Exception {
+-    final String parentPathStr = parentPath.toUri().getPath();
+-    final String relPathGlob = relGlob == null ? "*" : relGlob;
+-    System.out.println("parentPathStr = " + parentPathStr);
+-
+-    final URI uri = fs.getUri();
+-    final String prefix = "har://hdfs-" + uri.getHost() + ":" + uri.getPort()
+-        + archivePath.toUri().getPath() + Path.SEPARATOR;
+-
+-    final String harName = "foo.har";
+-    final String fullHarPathStr = prefix + harName;
+-    final String[] args = { "-archiveName", harName, "-p", parentPathStr,
+-        relPathGlob, archivePath.toString() };
+-    System.setProperty(HadoopArchives.TEST_HADOOP_ARCHIVES_JAR_PATH,
+-        HADOOP_ARCHIVES_JAR);
+-    final HadoopArchives har = new HadoopArchives(conf);
+-    assertEquals(0, ToolRunner.run(har, args));
+-    return fullHarPathStr;
+-  }
+-
+-  /*
+- * Run the HadoopArchives tool to create an archive on the
+- * given file system with a specified replication degree.
+- */
+-  private String makeArchiveWithRepl() throws Exception {
+-    final String inputPathStr = inputPath.toUri().getPath();
+-    System.out.println("inputPathStr = " + inputPathStr);
+-
+-    final URI uri = fs.getUri();
+-    final String prefix = "har://hdfs-" + uri.getHost() + ":" + uri.getPort()
+-        + archivePath.toUri().getPath() + Path.SEPARATOR;
+-
+-    final String harName = "foo.har";
+-    final String fullHarPathStr = prefix + harName;
+-    final String[] args =
+-        { "-archiveName", harName, "-p", inputPathStr, "-r", "2", "*",
+-            archivePath.toString() };
+-    System.setProperty(HadoopArchives.TEST_HADOOP_ARCHIVES_JAR_PATH,
+-        HADOOP_ARCHIVES_JAR);
+-    final HadoopArchives har = new HadoopArchives(conf);
+-    assertEquals(0, ToolRunner.run(har, args));
+-    RemoteIterator<LocatedFileStatus> listFiles =
+-        fs.listFiles(new Path(archivePath.toString() + "/" + harName), false);
+-    while (listFiles.hasNext()) {
+-      LocatedFileStatus next = listFiles.next();
+-      if (!next.getPath().toString().endsWith("_SUCCESS")) {
+-        assertEquals(next.getPath().toString(), 2, next.getReplication());
+-      }
+-    }
+-    return fullHarPathStr;
+-  }
+-  
+-  @Test
+-  /*
+-   * Tests copying from archive file system to a local file system
+-   */
+-  public void testCopyToLocal() throws Exception {
+-    final String fullHarPathStr = makeArchive();
+-
+-    // make path to copy the file to:
+-    final String tmpDir
+-      = System.getProperty("test.build.data","build/test/data") + "/work-dir/har-fs-tmp";
+-    final Path tmpPath = new Path(tmpDir);
+-    final LocalFileSystem localFs = FileSystem.getLocal(new Configuration());
+-    localFs.delete(tmpPath, true);
+-    localFs.mkdirs(tmpPath);
+-    assertTrue(localFs.exists(tmpPath));
+-    
+-    // Create fresh HarFs:
+-    final HarFileSystem harFileSystem = new HarFileSystem(fs);
+-    try {
+-      final URI harUri = new URI(fullHarPathStr);
+-      harFileSystem.initialize(harUri, fs.getConf());
+-      
+-      final Path sourcePath = new Path(fullHarPathStr + Path.SEPARATOR + "a");
+-      final Path targetPath = new Path(tmpPath, "straus");
+-      // copy the Har file to a local file system:
+-      harFileSystem.copyToLocalFile(false, sourcePath, targetPath);
+-      FileStatus straus = localFs.getFileStatus(targetPath);
+-      // the file should contain just 1 character:
+-      assertEquals(1, straus.getLen());
+-    } finally {
+-      harFileSystem.close();
+-      localFs.delete(tmpPath, true);      
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 583506a7278..7c232c158a2 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -55,11 +55,6 @@
+       <artifactId>hadoop-federation-balance</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-archives</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 6e5f06e6fae..5ed1976b8a9 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -34,7 +34,6 @@
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-dynamometer</module>
+-    <module>hadoop-archives</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-datajoin</module>
diff --git a/hadoop/stackable/patches/3.4.0/03-remove-hadoop-benchmark.patch b/hadoop/stackable/patches/3.4.0/03-remove-hadoop-benchmark.patch
new file mode 100644
index 000000000..34b6763db
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/03-remove-hadoop-benchmark.patch
@@ -0,0 +1,470 @@
+Entirely remove hadoop-benchmark
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-tools/hadoop-benchmark/pom.xml              |   87 -------
+ .../hadoop-benchmark/src/main/assembly/uber.xml    |   33 ---
+ .../hadoop-benchmark/src/main/findbugs/exclude.xml |   22 --
+ .../hadoop/benchmark/VectoredReadBenchmark.java    |  245 --------------------
+ .../org/apache/hadoop/benchmark/package-info.java  |   22 --
+ hadoop-tools/pom.xml                               |    1 
+ 6 files changed, 410 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-benchmark/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-benchmark/src/main/assembly/uber.xml
+ delete mode 100644 hadoop-tools/hadoop-benchmark/src/main/findbugs/exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/VectoredReadBenchmark.java
+ delete mode 100644 hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/package-info.java
+
+diff --git a/hadoop-tools/hadoop-benchmark/pom.xml b/hadoop-tools/hadoop-benchmark/pom.xml
+deleted file mode 100644
+index e045a5a6e97..00000000000
+--- a/hadoop-tools/hadoop-benchmark/pom.xml
++++ /dev/null
+@@ -1,87 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-  http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+-
+-
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project/pom.xml</relativePath>
+-  </parent>
+-  <artifactId>hadoop-benchmark</artifactId>
+-  <version>3.4.0</version>
+-  <packaging>jar</packaging>
+-
+-  <name>Apache Hadoop Common Benchmark</name>
+-  <description>Apache Hadoop Common Benchmark</description>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.openjdk.jmh</groupId>
+-      <artifactId>jmh-core</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.openjdk.jmh</groupId>
+-      <artifactId>jmh-generator-annprocess</artifactId>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-assembly-plugin</artifactId>
+-        <configuration>
+-          <archive>
+-            <manifest>
+-              <mainClass>org.apache.hadoop.benchmark.VectoredReadBenchmark</mainClass>
+-            </manifest>
+-          </archive>
+-          <descriptors>
+-            <descriptor>src/main/assembly/uber.xml</descriptor>
+-          </descriptors>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+-            <phase>package</phase> <!-- bind to the packaging phase -->
+-            <goals>
+-              <goal>single</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <excludeFilterFile>${basedir}/src/main/findbugs/exclude.xml</excludeFilterFile>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-compiler-plugin</artifactId>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-benchmark/src/main/assembly/uber.xml b/hadoop-tools/hadoop-benchmark/src/main/assembly/uber.xml
+deleted file mode 100644
+index 014eab951b3..00000000000
+--- a/hadoop-tools/hadoop-benchmark/src/main/assembly/uber.xml
++++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly>
+-  <id>uber</id>
+-  <formats>
+-    <format>jar</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-  <dependencySets>
+-    <dependencySet>
+-      <outputDirectory>/</outputDirectory>
+-      <useProjectArtifact>true</useProjectArtifact>
+-      <unpack>true</unpack>
+-      <scope>runtime</scope>
+-    </dependencySet>
+-  </dependencySets>
+-  <containerDescriptorHandlers>
+-    <containerDescriptorHandler>
+-      <handlerName>metaInf-services</handlerName>
+-    </containerDescriptorHandler>
+-  </containerDescriptorHandlers>
+-</assembly>
+diff --git a/hadoop-tools/hadoop-benchmark/src/main/findbugs/exclude.xml b/hadoop-tools/hadoop-benchmark/src/main/findbugs/exclude.xml
+deleted file mode 100644
+index 05f2a067cf0..00000000000
+--- a/hadoop-tools/hadoop-benchmark/src/main/findbugs/exclude.xml
++++ /dev/null
+@@ -1,22 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<FindBugsFilter>
+-  <Match>
+-    <Class name="~org\.apache\.hadoop\.benchmark\.generated.*"/>
+-  </Match>
+-  <Match>
+-    <Class name="~org\.openjdk\.jmh\.infra\.generated.*"/>
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/VectoredReadBenchmark.java b/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/VectoredReadBenchmark.java
+deleted file mode 100644
+index 5df46c36786..00000000000
+--- a/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/VectoredReadBenchmark.java
++++ /dev/null
+@@ -1,245 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.benchmark;
+-
+-import org.openjdk.jmh.annotations.Benchmark;
+-import org.openjdk.jmh.annotations.BenchmarkMode;
+-import org.openjdk.jmh.annotations.Level;
+-import org.openjdk.jmh.annotations.Mode;
+-import org.openjdk.jmh.annotations.OutputTimeUnit;
+-import org.openjdk.jmh.annotations.Param;
+-import org.openjdk.jmh.annotations.Scope;
+-import org.openjdk.jmh.annotations.Setup;
+-import org.openjdk.jmh.annotations.State;
+-import org.openjdk.jmh.infra.Blackhole;
+-import org.openjdk.jmh.runner.Runner;
+-import org.openjdk.jmh.runner.options.OptionsBuilder;
+-
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.nio.channels.AsynchronousFileChannel;
+-import java.nio.channels.CompletionHandler;
+-import java.nio.file.FileSystems;
+-import java.nio.file.StandardOpenOption;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.concurrent.TimeUnit;
+-import java.util.function.IntFunction;
+-
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.LocalFileSystem;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileRange;
+-import org.apache.hadoop.fs.impl.FileRangeImpl;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-
+-@BenchmarkMode(Mode.AverageTime)
+-@OutputTimeUnit(TimeUnit.MICROSECONDS)
+-public class VectoredReadBenchmark {
+-
+-  static final Path DATA_PATH = getTestDataPath();
+-  static final String DATA_PATH_PROPERTY = "bench.data";
+-  static final int READ_SIZE = 64 * 1024;
+-  static final long SEEK_SIZE = 1024L * 1024;
+-
+-
+-  static Path getTestDataPath() {
+-    String value = System.getProperty(DATA_PATH_PROPERTY);
+-    return new Path(value == null ? "/tmp/taxi.orc" : value);
+-  }
+-
+-  @State(Scope.Thread)
+-  public static class FileSystemChoice {
+-
+-    @Param({"local", "raw"})
+-    private String fileSystemKind;
+-
+-    private Configuration conf;
+-    private FileSystem fs;
+-
+-    @Setup(Level.Trial)
+-    public void setup() {
+-      conf = new Configuration();
+-      try {
+-        LocalFileSystem local = FileSystem.getLocal(conf);
+-        fs = "raw".equals(fileSystemKind) ? local.getRaw() : local;
+-      } catch (IOException e) {
+-        throw new IllegalArgumentException("Can't get filesystem", e);
+-      }
+-    }
+-  }
+-
+-  @State(Scope.Thread)
+-  public static class BufferChoice {
+-    @Param({"direct", "array"})
+-    private String bufferKind;
+-
+-    private IntFunction<ByteBuffer> allocate;
+-    @Setup(Level.Trial)
+-    public void setup() {
+-      allocate = "array".equals(bufferKind)
+-                     ? ByteBuffer::allocate : ByteBuffer::allocateDirect;
+-    }
+-  }
+-
+-  @Benchmark
+-  public void asyncRead(FileSystemChoice fsChoice,
+-                        BufferChoice bufferChoice,
+-                        Blackhole blackhole) throws Exception {
+-    FSDataInputStream stream = fsChoice.fs.open(DATA_PATH);
+-    List<FileRange> ranges = new ArrayList<>();
+-    for(int m=0; m < 100; ++m) {
+-      FileRange range = FileRange.createFileRange(m * SEEK_SIZE, READ_SIZE);
+-      ranges.add(range);
+-    }
+-    stream.readVectored(ranges, bufferChoice.allocate);
+-    for(FileRange range: ranges) {
+-      blackhole.consume(range.getData().get());
+-    }
+-    stream.close();
+-  }
+-
+-  static class Joiner implements CompletionHandler<ByteBuffer, FileRange> {
+-    private int remaining;
+-    private final ByteBuffer[] result;
+-    private Throwable exception = null;
+-
+-    Joiner(int total) {
+-      remaining = total;
+-      result = new ByteBuffer[total];
+-    }
+-
+-    synchronized void finish() {
+-      remaining -= 1;
+-      if (remaining == 0) {
+-        notify();
+-      }
+-    }
+-
+-    synchronized ByteBuffer[] join() throws InterruptedException, IOException {
+-      while (remaining > 0 && exception == null) {
+-        wait();
+-      }
+-      if (exception != null) {
+-        throw new IOException("problem reading", exception);
+-      }
+-      return result;
+-    }
+-
+-
+-    @Override
+-    public synchronized void completed(ByteBuffer buffer, FileRange attachment) {
+-      result[--remaining] = buffer;
+-      if (remaining == 0) {
+-        notify();
+-      }
+-    }
+-
+-    @Override
+-    public synchronized void failed(Throwable exc, FileRange attachment) {
+-      this.exception = exc;
+-      notify();
+-    }
+-  }
+-
+-  static class FileRangeCallback extends FileRangeImpl implements
+-          CompletionHandler<Integer, FileRangeCallback> {
+-    private final AsynchronousFileChannel channel;
+-    private final ByteBuffer buffer;
+-    private int completed = 0;
+-    private final Joiner joiner;
+-
+-    FileRangeCallback(AsynchronousFileChannel channel, long offset,
+-                      int length, Joiner joiner, ByteBuffer buffer) {
+-      super(offset, length, null);
+-      this.channel = channel;
+-      this.joiner = joiner;
+-      this.buffer = buffer;
+-    }
+-
+-    @Override
+-    public void completed(Integer result, FileRangeCallback attachment) {
+-      final int bytes = result;
+-      if (bytes == -1) {
+-        failed(new EOFException("Read past end of file"), this);
+-      }
+-      completed += bytes;
+-      if (completed < this.getLength()) {
+-        channel.read(buffer, this.getOffset() + completed, this, this);
+-      } else {
+-        buffer.flip();
+-        joiner.finish();
+-      }
+-    }
+-
+-    @Override
+-    public void failed(Throwable exc, FileRangeCallback attachment) {
+-      joiner.failed(exc, this);
+-    }
+-  }
+-
+-  @Benchmark
+-  public void asyncFileChanArray(BufferChoice bufferChoice,
+-                                 Blackhole blackhole) throws Exception {
+-    java.nio.file.Path path = FileSystems.getDefault().getPath(DATA_PATH.toString());
+-    AsynchronousFileChannel channel = AsynchronousFileChannel.open(path, StandardOpenOption.READ);
+-    List<FileRangeImpl> ranges = new ArrayList<>();
+-    Joiner joiner = new Joiner(100);
+-    for(int m=0; m < 100; ++m) {
+-      ByteBuffer buffer = bufferChoice.allocate.apply(READ_SIZE);
+-      FileRangeCallback range = new FileRangeCallback(channel, m * SEEK_SIZE,
+-          READ_SIZE, joiner, buffer);
+-      ranges.add(range);
+-      channel.read(buffer, range.getOffset(), range, range);
+-    }
+-    joiner.join();
+-    channel.close();
+-    blackhole.consume(ranges);
+-  }
+-
+-  @Benchmark
+-  public void syncRead(FileSystemChoice fsChoice,
+-                       Blackhole blackhole) throws Exception {
+-    FSDataInputStream stream = fsChoice.fs.open(DATA_PATH);
+-    List<byte[]> result = new ArrayList<>();
+-    for(int m=0; m < 100; ++m) {
+-      byte[] buffer = new byte[READ_SIZE];
+-      stream.readFully(m * SEEK_SIZE, buffer);
+-      result.add(buffer);
+-    }
+-    blackhole.consume(result);
+-    stream.close();
+-  }
+-
+-  /**
+-   * Run the benchmarks.
+-   * @param args the pathname of a 100MB data file
+-   * @throws Exception any ex.
+-   */
+-  public static void main(String[] args) throws Exception {
+-    OptionsBuilder opts = new OptionsBuilder();
+-    opts.include("VectoredReadBenchmark");
+-    opts.jvmArgs("-server", "-Xms256m", "-Xmx2g",
+-        "-D" + DATA_PATH_PROPERTY + "=" + args[0]);
+-    opts.forks(1);
+-    new Runner(opts.build()).run();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/package-info.java b/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/package-info.java
+deleted file mode 100644
+index 95d6977e3ab..00000000000
+--- a/hadoop-tools/hadoop-benchmark/src/main/java/org/apache/hadoop/benchmark/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Benchmark for Vectored Read IO operations.
+- */
+-package org.apache.hadoop.benchmark;
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 5ed1976b8a9..f3556a81351 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -49,7 +49,6 @@
+     <module>hadoop-azure-datalake</module>
+     <module>hadoop-aliyun</module>
+     <module>hadoop-fs2img</module>
+-    <module>hadoop-benchmark</module>
+   </modules>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.0/04-remove-hadoop-datajoin.patch b/hadoop/stackable/patches/3.4.0/04-remove-hadoop-datajoin.patch
new file mode 100644
index 000000000..0d2288d89
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/04-remove-hadoop-datajoin.patch
@@ -0,0 +1,1631 @@
+Entirely remove hadoop-datajoin
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |    7 -
+ hadoop-project/pom.xml                             |    5 
+ .../dev-support/findbugs-exclude.xml               |   29 --
+ hadoop-tools/hadoop-datajoin/pom.xml               |  169 --------------
+ .../utils/join/ArrayListBackedIterator.java        |   70 ------
+ .../hadoop/contrib/utils/join/DataJoinJob.java     |  174 ---------------
+ .../contrib/utils/join/DataJoinMapperBase.java     |  122 ----------
+ .../contrib/utils/join/DataJoinReducerBase.java    |  237 --------------------
+ .../apache/hadoop/contrib/utils/join/JobBase.java  |  173 ---------------
+ .../contrib/utils/join/ResetableIterator.java      |   35 ---
+ .../hadoop/contrib/utils/join/TaggedMapOutput.java |   56 -----
+ .../apache/hadoop/contrib/utils/join/README.txt    |   50 ----
+ .../contrib/utils/join/SampleDataJoinMapper.java   |   54 -----
+ .../contrib/utils/join/SampleDataJoinReducer.java  |   58 -----
+ .../contrib/utils/join/SampleTaggedMapOutput.java  |   60 -----
+ .../hadoop/contrib/utils/join/TestDataJoin.java    |  158 -------------
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 18 files changed, 1463 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-datajoin/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-datajoin/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
+ delete mode 100644 hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 67f1c9a4586..9121e90cdbd 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -75,13 +75,6 @@
+       </includes>
+       <outputDirectory>lib/native/examples</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-datajoin/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 16d692848b0..2082412a131 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -663,11 +663,6 @@
+         <version>${hadoop.version}</version>
+         <type>test-jar</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-datajoin</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/hadoop-datajoin/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-datajoin/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 3544581dba5..00000000000
+--- a/hadoop-tools/hadoop-datajoin/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,29 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-  <!-- These fields are useful for MapReduce jobs, so leave them as-is. -->
+-  <Match>
+-    <Class name="org.apache.hadoop.contrib.utils.join.DataJoinMapperBase" />
+-    <Field name="inputTag" />
+-    <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
+-  </Match>
+-  <Match>
+-    <Class name="org.apache.hadoop.contrib.utils.join.DataJoinMapperBase" />
+-    <Field name="job" />
+-    <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-datajoin/pom.xml b/hadoop-tools/hadoop-datajoin/pom.xml
+deleted file mode 100644
+index b527939cf6c..00000000000
+--- a/hadoop-tools/hadoop-datajoin/pom.xml
++++ /dev/null
+@@ -1,169 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-datajoin</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Data Join</description>
+-  <name>Apache Hadoop Data Join</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-hs</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml
+-          </excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <outputFile>${project.basedir}/../../hadoop-dist/target/hadoop-tools-deps/${project.artifactId}.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+-
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
+deleted file mode 100644
+index 1ffd4b5d3c1..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Iterator;
+-
+-/**
+- * This class provides an implementation of ResetableIterator. The
+- * implementation will be based on ArrayList.
+- * 
+- * 
+- */
+-public class ArrayListBackedIterator implements ResetableIterator {
+-
+-  private Iterator iter;
+-
+-  private ArrayList<Object> data;
+-
+-  public ArrayListBackedIterator() {
+-    this(new ArrayList<Object>());
+-  }
+-
+-  public ArrayListBackedIterator(ArrayList<Object> data) {
+-    this.data = data;
+-    this.iter = this.data.iterator();
+-  }
+-
+-  public void add(Object item) {
+-    this.data.add(item);
+-  }
+-
+-  public boolean hasNext() {
+-    return this.iter.hasNext();
+-  }
+-
+-  public Object next() {
+-    return this.iter.next();
+-  }
+-
+-  public void remove() {
+-
+-  }
+-
+-  public void reset() {
+-    this.iter = this.data.iterator();
+-  }
+-
+-  public void close() throws IOException {
+-    this.iter = null;
+-    this.data = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
+deleted file mode 100644
+index 9a1b8f1b9a3..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
++++ /dev/null
+@@ -1,174 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.FileOutputFormat;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.FileInputFormat;
+-import org.apache.hadoop.mapred.RunningJob;
+-import org.apache.hadoop.mapred.SequenceFileInputFormat;
+-import org.apache.hadoop.mapred.SequenceFileOutputFormat;
+-import org.apache.hadoop.mapred.TextInputFormat;
+-import org.apache.hadoop.mapred.TextOutputFormat;
+-import org.apache.hadoop.mapred.JobID;
+-
+-/**
+- * This class implements the main function for creating a map/reduce
+- * job to join data of different sources. To create sucn a job, the 
+- * user must implement a mapper class that extends DataJoinMapperBase class,
+- * and a reducer class that extends DataJoinReducerBase. 
+- * 
+- */
+-public class DataJoinJob {
+-
+-  public static Class getClassByName(String className) {
+-    Class retv = null;
+-    try {
+-      ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+-      retv = Class.forName(className, true, classLoader);
+-    } catch (Exception e) {
+-      throw new RuntimeException(e);
+-    }
+-    return retv;
+-  }
+-
+-  public static JobConf createDataJoinJob(String args[]) throws IOException {
+-
+-    String inputDir = args[0];
+-    String outputDir = args[1];
+-    Class inputFormat = SequenceFileInputFormat.class;
+-    if (args[2].compareToIgnoreCase("text") != 0) {
+-      System.out.println("Using SequenceFileInputFormat: " + args[2]);
+-    } else {
+-      System.out.println("Using TextInputFormat: " + args[2]);
+-      inputFormat = TextInputFormat.class;
+-    }
+-    int numOfReducers = Integer.parseInt(args[3]);
+-    Class mapper = getClassByName(args[4]);
+-    Class reducer = getClassByName(args[5]);
+-    Class mapoutputValueClass = getClassByName(args[6]);
+-    Class outputFormat = TextOutputFormat.class;
+-    Class outputValueClass = Text.class;
+-    if (args[7].compareToIgnoreCase("text") != 0) {
+-      System.out.println("Using SequenceFileOutputFormat: " + args[7]);
+-      outputFormat = SequenceFileOutputFormat.class;
+-      outputValueClass = getClassByName(args[7]);
+-    } else {
+-      System.out.println("Using TextOutputFormat: " + args[7]);
+-    }
+-    long maxNumOfValuesPerGroup = 100;
+-    String jobName = "";
+-    if (args.length > 8) {
+-      maxNumOfValuesPerGroup = Long.parseLong(args[8]);
+-    }
+-    if (args.length > 9) {
+-      jobName = args[9];
+-    }
+-    Configuration defaults = new Configuration();
+-    JobConf job = new JobConf(defaults, DataJoinJob.class);
+-    job.setJobName("DataJoinJob: " + jobName);
+-
+-    FileSystem fs = FileSystem.get(defaults);
+-    fs.delete(new Path(outputDir), true);
+-    FileInputFormat.setInputPaths(job, inputDir);
+-
+-    job.setInputFormat(inputFormat);
+-
+-    job.setMapperClass(mapper);
+-    FileOutputFormat.setOutputPath(job, new Path(outputDir));
+-    job.setOutputFormat(outputFormat);
+-    SequenceFileOutputFormat.setOutputCompressionType(job,
+-            SequenceFile.CompressionType.BLOCK);
+-    job.setMapOutputKeyClass(Text.class);
+-    job.setMapOutputValueClass(mapoutputValueClass);
+-    job.setOutputKeyClass(Text.class);
+-    job.setOutputValueClass(outputValueClass);
+-    job.setReducerClass(reducer);
+-
+-    job.setNumMapTasks(1);
+-    job.setNumReduceTasks(numOfReducers);
+-    job.setLong("datajoin.maxNumOfValuesPerGroup", maxNumOfValuesPerGroup);
+-    return job;
+-  }
+-
+-  /**
+-   * Submit/run a map/reduce job.
+-   * 
+-   * @param job
+-   * @return true for success
+-   * @throws IOException
+-   */
+-  public static boolean runJob(JobConf job) throws IOException {
+-    JobClient jc = new JobClient(job);
+-    boolean sucess = true;
+-    RunningJob running = null;
+-    try {
+-      running = jc.submitJob(job);
+-      JobID jobId = running.getID();
+-      System.out.println("Job " + jobId + " is submitted");
+-      while (!running.isComplete()) {
+-        System.out.println("Job " + jobId + " is still running.");
+-        try {
+-          Thread.sleep(60000);
+-        } catch (InterruptedException e) {
+-        }
+-        running = jc.getJob(jobId);
+-      }
+-      sucess = running.isSuccessful();
+-    } finally {
+-      if (!sucess && (running != null)) {
+-        running.killJob();
+-      }
+-      jc.close();
+-    }
+-    return sucess;
+-  }
+-
+-  /**
+-   * @param args
+-   */
+-  public static void main(String[] args) {
+-    boolean success;
+-    if (args.length < 8 || args.length > 10) {
+-      System.out.println("usage: DataJoinJob " + "inputdirs outputdir map_input_file_format "
+-                         + "numofParts " + "mapper_class " + "reducer_class "
+-                         + "map_output_value_class "
+-                         + "output_value_class [maxNumOfValuesPerGroup [descriptionOfJob]]]");
+-      System.exit(-1);
+-    }
+-
+-    try {
+-      JobConf job = DataJoinJob.createDataJoinJob(args);
+-      success = DataJoinJob.runJob(job);
+-      if (!success) {
+-        System.out.println("Job failed");
+-      }
+-    } catch (IOException ioe) {
+-      ioe.printStackTrace();
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
+deleted file mode 100644
+index 1e1296a7451..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java
++++ /dev/null
+@@ -1,122 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-
+-/**
+- * This abstract class serves as the base class for the mapper class of a data
+- * join job. This class expects its subclasses to implement methods for the
+- * following functionalities:
+- * 
+- * 1. Compute the source tag of input values 2. Compute the map output value
+- * object 3. Compute the map output key object
+- * 
+- * The source tag will be used by the reducer to determine from which source
+- * (which table in SQL terminology) a value comes. Computing the map output
+- * value object amounts to performing projecting/filtering work in a SQL
+- * statement (through the select/where clauses). Computing the map output key
+- * amounts to choosing the join key. This class provides the appropriate plugin
+- * points for the user defined subclasses to implement the appropriate logic.
+- * 
+- */
+-public abstract class DataJoinMapperBase extends JobBase {
+-
+-  protected String inputFile = null;
+-
+-  protected JobConf job = null;
+-
+-  protected Text inputTag = null;
+-
+-  protected Reporter reporter = null;
+-
+-  public void configure(JobConf job) {
+-    super.configure(job);
+-    this.job = job;
+-    this.inputFile = job.get(MRJobConfig.MAP_INPUT_FILE);
+-    this.inputTag = generateInputTag(this.inputFile);
+-  }
+-
+-  /**
+-   * Determine the source tag based on the input file name.
+-   * 
+-   * @param inputFile
+-   * @return the source tag computed from the given file name.
+-   */
+-  protected abstract Text generateInputTag(String inputFile);
+-
+-  /**
+-   * Generate a tagged map output value. The user code can also perform
+-   * projection/filtering. If it decides to discard the input record when
+-   * certain conditions are met,it can simply return a null.
+-   * 
+-   * @param value
+-   * @return an object of TaggedMapOutput computed from the given value.
+-   */
+-  protected abstract TaggedMapOutput generateTaggedMapOutput(Object value);
+-
+-  /**
+-   * Generate a map output key. The user code can compute the key
+-   * programmatically, not just selecting the values of some fields. In this
+-   * sense, it is more general than the joining capabilities of SQL.
+-   * 
+-   * @param aRecord
+-   * @return the group key for the given record
+-   */
+-  protected abstract Text generateGroupKey(TaggedMapOutput aRecord);
+-
+-  public void map(Object key, Object value,
+-                  OutputCollector output, Reporter reporter) throws IOException {
+-    if (this.reporter == null) {
+-      this.reporter = reporter;
+-    }
+-    addLongValue("totalCount", 1);
+-    TaggedMapOutput aRecord = generateTaggedMapOutput(value);
+-    if (aRecord == null) {
+-      addLongValue("discardedCount", 1);
+-      return;
+-    }
+-    Text groupKey = generateGroupKey(aRecord);
+-    if (groupKey == null) {
+-      addLongValue("nullGroupKeyCount", 1);
+-      return;
+-    }
+-    output.collect(groupKey, aRecord);
+-    addLongValue("collectedCount", 1);
+-  }
+-
+-  public void close() throws IOException {
+-    if (this.reporter != null) {
+-      this.reporter.setStatus(super.getReport());
+-    }
+-  }
+-
+-  public void reduce(Object arg0, Iterator arg1,
+-                     OutputCollector arg2, Reporter arg3) throws IOException {
+-    // TODO Auto-generated method stub
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
+deleted file mode 100644
+index e340d79e141..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
++++ /dev/null
+@@ -1,237 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-import java.util.SortedMap;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.Reporter;
+-
+-/**
+- * This abstract class serves as the base class for the reducer class of a data
+- * join job. The reduce function will first group the values according to their
+- * input tags, and then compute the cross product of over the groups. For each
+- * tuple in the cross product, it calls the following method, which is expected
+- * to be implemented in a subclass.
+- * 
+- * protected abstract TaggedMapOutput combine(Object[] tags, Object[] values);
+- * 
+- * The above method is expected to produce one output value from an array of
+- * records of different sources. The user code can also perform filtering here.
+- * It can return null if it decides to the records do not meet certain
+- * conditions.
+- * 
+- */
+-public abstract class DataJoinReducerBase extends JobBase {
+-
+-  protected Reporter reporter = null;
+-
+-  private long maxNumOfValuesPerGroup = 100;
+-
+-  protected long largestNumOfValues = 0;
+-
+-  protected long numOfValues = 0;
+-
+-  protected long collected = 0;
+-
+-  protected JobConf job;
+-
+-  public void close() throws IOException {
+-    if (this.reporter != null) {
+-      this.reporter.setStatus(super.getReport());
+-    }
+-  }
+-
+-  public void configure(JobConf job) {
+-    super.configure(job);
+-    this.job = job;
+-    this.maxNumOfValuesPerGroup = job.getLong("datajoin.maxNumOfValuesPerGroup", 100);
+-  }
+-
+-  /**
+-   * The subclass can provide a different implementation on ResetableIterator.
+-   * This is necessary if the number of values in a reduce call is very high.
+-   * 
+-   * The default provided here uses ArrayListBackedIterator
+-   * 
+-   * @return an Object of ResetableIterator.
+-   */
+-  protected ResetableIterator createResetableIterator() {
+-    return new ArrayListBackedIterator();
+-  }
+-
+-  /**
+-   * This is the function that re-groups values for a key into sub-groups based
+-   * on a secondary key (input tag).
+-   * 
+-   * @param arg1
+-   * @return
+-   */
+-  private SortedMap<Object, ResetableIterator> regroup(Object key,
+-                                                       Iterator arg1, Reporter reporter) throws IOException {
+-    this.numOfValues = 0;
+-    SortedMap<Object, ResetableIterator> retv = new TreeMap<Object, ResetableIterator>();
+-    TaggedMapOutput aRecord = null;
+-    while (arg1.hasNext()) {
+-      this.numOfValues += 1;
+-      if (this.numOfValues % 100 == 0) {
+-        reporter.setStatus("key: " + key.toString() + " numOfValues: "
+-                           + this.numOfValues);
+-      }
+-      if (this.numOfValues > this.maxNumOfValuesPerGroup) {
+-        continue;
+-      }
+-      aRecord = ((TaggedMapOutput) arg1.next()).clone(job);
+-      Text tag = aRecord.getTag();
+-      ResetableIterator data = retv.get(tag);
+-      if (data == null) {
+-        data = createResetableIterator();
+-        retv.put(tag, data);
+-      }
+-      data.add(aRecord);
+-    }
+-    if (this.numOfValues > this.largestNumOfValues) {
+-      this.largestNumOfValues = numOfValues;
+-      LOG.info("key: " + key.toString() + " this.largestNumOfValues: "
+-               + this.largestNumOfValues);
+-    }
+-    return retv;
+-  }
+-
+-  public void reduce(Object key, Iterator values,
+-                     OutputCollector output, Reporter reporter) throws IOException {
+-    if (this.reporter == null) {
+-      this.reporter = reporter;
+-    }
+-
+-    SortedMap<Object, ResetableIterator> groups = regroup(key, values, reporter);
+-    Object[] tags = groups.keySet().toArray();
+-    ResetableIterator[] groupValues = new ResetableIterator[tags.length];
+-    for (int i = 0; i < tags.length; i++) {
+-      groupValues[i] = groups.get(tags[i]);
+-    }
+-    joinAndCollect(tags, groupValues, key, output, reporter);
+-    addLongValue("groupCount", 1);
+-    for (int i = 0; i < tags.length; i++) {
+-      groupValues[i].close();
+-    }
+-  }
+-
+-  /**
+-   * The subclass can overwrite this method to perform additional filtering
+-   * and/or other processing logic before a value is collected.
+-   * 
+-   * @param key
+-   * @param aRecord
+-   * @param output
+-   * @param reporter
+-   * @throws IOException
+-   */
+-  protected void collect(Object key, TaggedMapOutput aRecord,
+-                         OutputCollector output, Reporter reporter) throws IOException {
+-    this.collected += 1;
+-    addLongValue("collectedCount", 1);
+-    if (aRecord != null) {
+-      output.collect(key, aRecord.getData());
+-      reporter.setStatus("key: " + key.toString() + " collected: " + collected);
+-      addLongValue("actuallyCollectedCount", 1);
+-    }
+-  }
+-
+-  /**
+-   * join the list of the value lists, and collect the results.
+-   * 
+-   * @param tags
+-   *          a list of input tags
+-   * @param values
+-   *          a list of value lists, each corresponding to one input source
+-   * @param key
+-   * @param output
+-   * @throws IOException
+-   */
+-  private void joinAndCollect(Object[] tags, ResetableIterator[] values,
+-                              Object key, OutputCollector output, Reporter reporter)
+-    throws IOException {
+-    if (values.length < 1) {
+-      return;
+-    }
+-    Object[] partialList = new Object[values.length];
+-    joinAndCollect(tags, values, 0, partialList, key, output, reporter);
+-  }
+-
+-  /**
+-   * Perform the actual join recursively.
+-   * 
+-   * @param tags
+-   *          a list of input tags
+-   * @param values
+-   *          a list of value lists, each corresponding to one input source
+-   * @param pos
+-   *          indicating the next value list to be joined
+-   * @param partialList
+-   *          a list of values, each from one value list considered so far.
+-   * @param key
+-   * @param output
+-   * @throws IOException
+-   */
+-  private void joinAndCollect(Object[] tags, ResetableIterator[] values,
+-                              int pos, Object[] partialList, Object key,
+-                              OutputCollector output, Reporter reporter) throws IOException {
+-
+-    if (values.length == pos) {
+-      // get a value from each source. Combine them
+-      TaggedMapOutput combined = combine(tags, partialList);
+-      collect(key, combined, output, reporter);
+-      return;
+-    }
+-    ResetableIterator nextValues = values[pos];
+-    nextValues.reset();
+-    while (nextValues.hasNext()) {
+-      Object v = nextValues.next();
+-      partialList[pos] = v;
+-      joinAndCollect(tags, values, pos + 1, partialList, key, output, reporter);
+-    }
+-  }
+-
+-  public static Text SOURCE_TAGS_FIELD = new Text("SOURCE_TAGS");
+-
+-  public static Text NUM_OF_VALUES_FIELD = new Text("NUM_OF_VALUES");
+-
+-  /**
+-   * 
+-   * @param tags
+-   *          a list of source tags
+-   * @param values
+-   *          a value per source
+-   * @return combined value derived from values of the sources
+-   */
+-  protected abstract TaggedMapOutput combine(Object[] tags, Object[] values);
+-
+-  public void map(Object arg0, Object arg1, OutputCollector arg2,
+-                  Reporter arg3) throws IOException {
+-    // TODO Auto-generated method stub
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
+deleted file mode 100644
+index 7267fdecac4..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
++++ /dev/null
+@@ -1,173 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.util.SortedMap;
+-import java.util.TreeMap;
+-import java.util.Map.Entry;
+-import java.util.Iterator;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Mapper;
+-import org.apache.hadoop.mapred.Reducer;
+-
+-/**
+- * A common base implementing some statics collecting mechanisms that are
+- * commonly used in a typical map/reduce job.
+- * 
+- */
+-public abstract class JobBase implements Mapper, Reducer {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger("datajoin.job");
+-
+-  private SortedMap<Object, Long> longCounters = null;
+-
+-  private SortedMap<Object, Double> doubleCounters = null;
+-
+-  /**
+-   * Set the given counter to the given value
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @param value
+-   *          the value for the counter
+-   */
+-  protected void setLongValue(Object name, long value) {
+-    this.longCounters.put(name, Long.valueOf(value));
+-  }
+-
+-  /**
+-   * Set the given counter to the given value
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @param value
+-   *          the value for the counter
+-   */
+-  protected void setDoubleValue(Object name, double value) {
+-    this.doubleCounters.put(name, new Double(value));
+-  }
+-
+-  /**
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @return return the value of the given counter.
+-   */
+-  protected Long getLongValue(Object name) {
+-    return this.longCounters.get(name);
+-  }
+-
+-  /**
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @return return the value of the given counter.
+-   */
+-  protected Double getDoubleValue(Object name) {
+-    return this.doubleCounters.get(name);
+-  }
+-
+-  /**
+-   * Increment the given counter by the given incremental value If the counter
+-   * does not exist, one is created with value 0.
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @param inc
+-   *          the incremental value
+-   * @return the updated value.
+-   */
+-  protected Long addLongValue(Object name, long inc) {
+-    Long val = this.longCounters.get(name);
+-    Long retv = null;
+-    if (val == null) {
+-      retv = Long.valueOf(inc);
+-    } else {
+-      retv = Long.valueOf(val.longValue() + inc);
+-    }
+-    this.longCounters.put(name, retv);
+-    return retv;
+-  }
+-
+-  /**
+-   * Increment the given counter by the given incremental value If the counter
+-   * does not exist, one is created with value 0.
+-   * 
+-   * @param name
+-   *          the counter name
+-   * @param inc
+-   *          the incremental value
+-   * @return the updated value.
+-   */
+-  protected Double addDoubleValue(Object name, double inc) {
+-    Double val = this.doubleCounters.get(name);
+-    Double retv = null;
+-    if (val == null) {
+-      retv = new Double(inc);
+-    } else {
+-      retv = new Double(val.doubleValue() + inc);
+-    }
+-    this.doubleCounters.put(name, retv);
+-    return retv;
+-  }
+-
+-  /**
+-   * log the counters
+-   * 
+-   */
+-  protected void report() {
+-    LOG.info(getReport());
+-  }
+-
+-  /**
+-   * log the counters
+-   * 
+-   */
+-  protected String getReport() {
+-    StringBuffer sb = new StringBuffer();
+-
+-    Iterator iter = this.longCounters.entrySet().iterator();
+-    while (iter.hasNext()) {
+-      Entry e = (Entry) iter.next();
+-      sb.append(e.getKey().toString()).append("\t").append(e.getValue())
+-        .append("\n");
+-    }
+-    iter = this.doubleCounters.entrySet().iterator();
+-    while (iter.hasNext()) {
+-      Entry e = (Entry) iter.next();
+-      sb.append(e.getKey().toString()).append("\t").append(e.getValue())
+-        .append("\n");
+-    }
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Initializes a new instance from a {@link JobConf}.
+-   * 
+-   * @param job
+-   *          the configuration
+-   */
+-  public void configure(JobConf job) {
+-    this.longCounters = new TreeMap<Object, Long>();
+-    this.doubleCounters = new TreeMap<Object, Double>();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
+deleted file mode 100644
+index f20f2e45ac8..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-
+-/**
+- * This defines an iterator interface that will help the reducer class
+- * re-group its input by source tags. Once the values are re-grouped,
+- * the reducer will receive the cross product of values from different groups.
+- */
+-public interface ResetableIterator extends Iterator {
+-  public void reset();
+-
+-  public void add(Object item);
+-
+-  public void close() throws IOException;
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java b/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
+deleted file mode 100644
+index 71a5d85bca0..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapred.JobConf;
+-
+-/**
+- * This abstract class serves as the base class for the values that 
+- * flow from the mappers to the reducers in a data join job. 
+- * Typically, in such a job, the mappers will compute the source
+- * tag of an input record based on its attributes or based on the 
+- * file name of the input file. This tag will be used by the reducers
+- * to re-group the values of a given key according to their source tags.
+- * 
+- */
+-public abstract class TaggedMapOutput implements Writable {
+-  protected Text tag;
+-
+-  public TaggedMapOutput() {
+-    this.tag = new Text("");
+-  }
+-
+-  public Text getTag() {
+-    return tag;
+-  }
+-
+-  public void setTag(Text tag) {
+-    this.tag = tag;
+-  }
+-
+-  public abstract Writable getData();
+-  
+-  public TaggedMapOutput clone(JobConf job) {
+-    return (TaggedMapOutput) WritableUtils.clone(this, job);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt
+deleted file mode 100644
+index 47ef31c4677..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt
++++ /dev/null
+@@ -1,50 +0,0 @@
+-*************************************************
+-*** Input Files (Note: tab-separated columns) ***
+-*************************************************
+-[:~]$ cat datajoin/input/A
+-A.a11   A.a12
+-A.a21   A.a22
+-B.a21   A.a32
+-A.a31   A.a32
+-B.a31   A.a32
+-
+-[:~]$ cat datajoin/input/B
+-A.a11   B.a12
+-A.a11   B.a13
+-B.a11   B.a12
+-B.a21   B.a22
+-A.a31   B.a32
+-B.a31   B.a32
+-
+-
+-*****************************
+-*** Invoke SampleDataJoin ***
+-*****************************
+-[:~]$ $HADOOP_HOME/bin/hadoop jar hadoop-datajoin-examples.jar org.apache.hadoop.contrib.utils.join.DataJoinJob datajoin/input datajoin/output Text 1 org.apache.hadoop.contrib.utils.join.SampleDataJoinMapper org.apache.hadoop.contrib.utils.join.SampleDataJoinReducer org.apache.hadoop.contrib.utils.join.SampleTaggedMapOutput Text
+-Using TextInputFormat: Text
+-Using TextOutputFormat: Text
+-07/06/01 19:58:23 INFO mapred.FileInputFormat: Total input paths to process : 2
+-Job job_kkzk08 is submitted
+-Job job_kkzk08 is still running.
+-07/06/01 19:58:24 INFO mapred.LocalJobRunner: collectedCount    5
+-totalCount      5
+-
+-07/06/01 19:58:24 INFO mapred.LocalJobRunner: collectedCount    6
+-totalCount      6
+-
+-07/06/01 19:58:24 INFO datajoin.job: key: A.a11 this.largestNumOfValues: 3
+-07/06/01 19:58:24 INFO mapred.LocalJobRunner: actuallyCollectedCount    5
+-collectedCount  7
+-groupCount      6
+- > reduce
+-
+-
+-*******************
+-*** Output File ***
+-*******************
+-[:~]$ cat datajoin/output/part-00000  
+-A.a11   A.a12   B.a12
+-A.a11   A.a12   B.a13
+-A.a31   A.a32   B.a32
+-B.a21   A.a32   B.a22
+-B.a31   A.a32   B.a32
+diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
+deleted file mode 100644
+index 3f1d4f0f1b2..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import org.apache.hadoop.io.Text;
+-
+-import org.apache.hadoop.contrib.utils.join.DataJoinMapperBase;
+-import org.apache.hadoop.contrib.utils.join.TaggedMapOutput;
+-import org.apache.hadoop.contrib.utils.join.SampleTaggedMapOutput;
+-
+-/**
+- * This is a subclass of DataJoinMapperBase that is used to
+- * demonstrate the functionality of INNER JOIN between 2 data
+- * sources (TAB separated text files) based on the first column.
+- */
+-public class SampleDataJoinMapper extends DataJoinMapperBase {
+-
+-
+-  protected Text generateInputTag(String inputFile) {
+-    // tag the row with input file name (data source)
+-    return new Text(inputFile);
+-  }
+-
+-  protected Text generateGroupKey(TaggedMapOutput aRecord) {
+-    // first column in the input tab separated files becomes the key (to perform the JOIN)
+-    String line = ((Text) aRecord.getData()).toString();
+-    String groupKey = "";
+-    String[] tokens = line.split("\\t", 2);
+-    groupKey = tokens[0];
+-    return new Text(groupKey);
+-  }
+-
+-  protected TaggedMapOutput generateTaggedMapOutput(Object value) {
+-    TaggedMapOutput retv = new SampleTaggedMapOutput((Text) value);
+-    retv.setTag(new Text(this.inputTag));
+-    return retv;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
+deleted file mode 100644
+index f8eb00db49a..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import org.apache.hadoop.io.Text;
+-
+-import org.apache.hadoop.contrib.utils.join.DataJoinReducerBase;
+-import org.apache.hadoop.contrib.utils.join.TaggedMapOutput;
+-
+-/**
+- * This is a subclass of DataJoinReducerBase that is used to
+- * demonstrate the functionality of INNER JOIN between 2 data
+- * sources (TAB separated text files) based on the first column.
+- */
+-public class SampleDataJoinReducer extends DataJoinReducerBase {
+-
+-  /**
+-   * 
+-   * @param tags
+-   *          a list of source tags
+-   * @param values
+-   *          a value per source
+-   * @return combined value derived from values of the sources
+-   */
+-  protected TaggedMapOutput combine(Object[] tags, Object[] values) {
+-    // eliminate rows which didnot match in one of the two tables (for INNER JOIN)
+-    if (tags.length < 2)
+-       return null;  
+-    String joinedStr = ""; 
+-    for (int i=0; i<tags.length; i++) {
+-      if (i > 0)
+-         joinedStr += "\t";
+-      // strip first column as it is the key on which we joined
+-      String line = ((Text) (((TaggedMapOutput) values[i]).getData())).toString();
+-      String[] tokens = line.split("\\t", 2);
+-      joinedStr += tokens[1];
+-    }
+-    TaggedMapOutput retv = new SampleTaggedMapOutput(new Text(joinedStr));
+-    retv.setTag((Text) tags[0]); 
+-    return retv;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
+deleted file mode 100644
+index 59f1bd1adcd..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.Text;
+-
+-import org.apache.hadoop.contrib.utils.join.TaggedMapOutput;
+-
+-/**
+- * This is a subclass of TaggedMapOutput that is used to
+- * demonstrate the functionality of INNER JOIN between 2 data
+- * sources (TAB separated text files) based on the first column.
+- */
+-public class SampleTaggedMapOutput extends TaggedMapOutput {
+-
+-  private Text data;
+-
+-  public SampleTaggedMapOutput() {
+-    this.data = new Text("");
+-  }
+-
+-  public SampleTaggedMapOutput(Text data) {
+-    this.data = data;
+-  }
+-
+-  public Writable getData() {
+-    return data;
+-  }
+-
+-  public void write(DataOutput out) throws IOException {
+-    this.tag.write(out);
+-    this.data.write(out);
+-  }
+-
+-  public void readFields(DataInput in) throws IOException {
+-    this.tag.readFields(in);
+-    this.data.readFields(in);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
+deleted file mode 100644
+index 2daae2e803b..00000000000
+--- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
++++ /dev/null
+@@ -1,158 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.contrib.utils.join;
+-
+-import java.io.IOException;
+-
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.*;
+-
+-/**
+- * Class to test JOIN between 2 data
+- * sources.
+- */
+-public class TestDataJoin {
+-  private static MiniDFSCluster cluster = null;
+-
+-  @Before
+-  public void setUp() throws Exception {
+-    Configuration conf = new Configuration();
+-    cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build();
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (cluster != null) {
+-      cluster.shutdown();
+-    }
+-  }
+-
+-  @Test
+-  public void testDataJoin() throws Exception {
+-    final int srcs = 4;
+-    JobConf job = new JobConf();
+-    job.setBoolean("mapreduce.fileoutputcommitter.marksuccessfuljobs", false);
+-    Path base = cluster.getFileSystem().makeQualified(new Path("/inner"));
+-    Path[] src = writeSimpleSrc(base, job, srcs);
+-    job.setInputFormat(SequenceFileInputFormat.class);
+-    Path outdir = new Path(base, "out");
+-    FileOutputFormat.setOutputPath(job, outdir);
+-
+-    job.setMapperClass(SampleDataJoinMapper.class);
+-    job.setReducerClass(SampleDataJoinReducer.class);
+-    job.setMapOutputKeyClass(Text.class);
+-    job.setMapOutputValueClass(SampleTaggedMapOutput.class);
+-    job.setOutputKeyClass(Text.class);
+-    job.setOutputValueClass(Text.class);
+-    job.setOutputFormat(TextOutputFormat.class);
+-    job.setNumMapTasks(1);
+-    job.setNumReduceTasks(1);
+-    FileInputFormat.setInputPaths(job, src);
+-    try {
+-      JobClient.runJob(job);
+-      confirmOutput(outdir, job, srcs);
+-    } finally {
+-      base.getFileSystem(job).delete(base, true);
+-    }
+-  }
+-
+-  private static void confirmOutput(Path out, JobConf job, int srcs)
+-      throws IOException {
+-    FileSystem fs = out.getFileSystem(job);
+-    FileStatus[] outlist = fs.listStatus(out);
+-    assertEquals(1, outlist.length);
+-    assertTrue(0 < outlist[0].getLen());
+-    FSDataInputStream in = fs.open(outlist[0].getPath());
+-    LineRecordReader rr = new LineRecordReader(in, 0, Integer.MAX_VALUE, job);
+-    LongWritable k = new LongWritable();
+-    Text v = new Text();
+-    int count = 0;
+-    while (rr.next(k, v)) {
+-      String[] vals = v.toString().split("\t");
+-      assertEquals(srcs + 1, vals.length);
+-      int[] ivals = new int[vals.length];
+-      for (int i = 0; i < vals.length; ++i)
+-        ivals[i] = Integer.parseInt(vals[i]);
+-      assertEquals(0, ivals[0] % (srcs * srcs));
+-      for (int i = 1; i < vals.length; ++i) {
+-        assertEquals((ivals[i] - (i - 1)) * srcs, 10 * ivals[0]);
+-      }
+-      ++count;
+-    }
+-    assertEquals(4, count);
+-  }
+-
+-  private static SequenceFile.Writer[] createWriters(Path testdir,
+-      JobConf conf, int srcs, Path[] src) throws IOException {
+-    for (int i = 0; i < srcs; ++i) {
+-      src[i] = new Path(testdir, Integer.toString(i + 10, 36));
+-    }
+-    SequenceFile.Writer out[] = new SequenceFile.Writer[srcs];
+-    for (int i = 0; i < srcs; ++i) {
+-      out[i] = new SequenceFile.Writer(testdir.getFileSystem(conf), conf,
+-          src[i], Text.class, Text.class);
+-    }
+-    return out;
+-  }
+-
+-  private static Path[] writeSimpleSrc(Path testdir, JobConf conf,
+-      int srcs) throws IOException {
+-    SequenceFile.Writer out[] = null;
+-    Path[] src = new Path[srcs];
+-    try {
+-      out = createWriters(testdir, conf, srcs, src);
+-      final int capacity = srcs * 2 + 1;
+-      Text key = new Text();
+-      key.set("ignored");
+-      Text val = new Text();
+-      for (int k = 0; k < capacity; ++k) {
+-        for (int i = 0; i < srcs; ++i) {
+-          val.set(Integer.toString(k % srcs == 0 ? k * srcs : k * srcs + i) +
+-              "\t" + Integer.toString(10 * k + i));
+-          out[i].append(key, val);
+-          if (i == k) {
+-            // add duplicate key
+-            out[i].append(key, val);
+-          }
+-        }
+-      }
+-    } finally {
+-      if (out != null) {
+-        for (int i = 0; i < srcs; ++i) {
+-          if (out[i] != null)
+-            out[i].close();
+-        }
+-      }
+-    }
+-    return src;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 7c232c158a2..4acf66c3b8c 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-datajoin</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-extras</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index f3556a81351..6cb112b67b7 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-dynamometer</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+-    <module>hadoop-datajoin</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-extras</module>
+     <module>hadoop-pipes</module>
diff --git a/hadoop/stackable/patches/3.4.0/05-remove-hadoop-dynamometer.patch b/hadoop/stackable/patches/3.4.0/05-remove-hadoop-dynamometer.patch
new file mode 100644
index 000000000..5108c949a
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/05-remove-hadoop-dynamometer.patch
@@ -0,0 +1,16095 @@
+Entirely remove hadoop-dynamometer
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ dev-support/bin/dist-layout-stitching              |    1 
+ .../assemblies/hadoop-dynamometer-blockgen.xml     |   35 -
+ .../assemblies/hadoop-dynamometer-infra.xml        |   35 -
+ .../assemblies/hadoop-dynamometer-workload.xml     |   35 -
+ .../resources/assemblies/hadoop-dynamometer.xml    |   73 -
+ hadoop-project/src/site/site.xml                   |    1 
+ .../hadoop-dynamometer-blockgen/pom.xml            |  130 --
+ .../src/main/bash/generate-block-lists.sh          |   38 -
+ .../dynamometer/blockgenerator/BlockInfo.java      |  102 --
+ .../blockgenerator/GenerateBlockImagesDriver.java  |  141 --
+ .../GenerateDNBlockInfosReducer.java               |   99 --
+ .../dynamometer/blockgenerator/XMLParser.java      |  174 ---
+ .../blockgenerator/XMLParserMapper.java            |   81 -
+ .../dynamometer/blockgenerator/package-info.java   |   26 
+ .../dynamometer/blockgenerator/TestBlockGen.java   |   89 --
+ .../dynamometer/blockgenerator/TestXMLParser.java  |   93 --
+ .../test/resources/fsimage_0000000000000061740.xml |  553 ----------
+ .../hadoop-dynamometer-dist/pom.xml                |  128 --
+ .../hadoop-dynamometer-infra/pom.xml               |  216 ----
+ .../src/main/bash/create-slim-hadoop-tar.sh        |   53 -
+ .../src/main/bash/parse-metrics.sh                 |   84 -
+ .../src/main/bash/start-dynamometer-cluster.sh     |   41 -
+ .../src/main/bash/upload-fsimage.sh                |   84 -
+ .../apache/hadoop/tools/dynamometer/AMOptions.java |  317 ------
+ .../dynamometer/AllowAllImpersonationProvider.java |   46 -
+ .../tools/dynamometer/ApplicationMaster.java       |  889 ----------------
+ .../BlockPlacementPolicyAlwaysSatisfied.java       |   58 -
+ .../apache/hadoop/tools/dynamometer/Client.java    | 1134 --------------------
+ .../hadoop/tools/dynamometer/DynoConstants.java    |  130 --
+ .../hadoop/tools/dynamometer/DynoInfraUtils.java   |  594 ----------
+ .../hadoop/tools/dynamometer/DynoResource.java     |   72 -
+ .../tools/dynamometer/SimulatedDataNodes.java      |  185 ---
+ .../hadoop/tools/dynamometer/package-info.java     |   29 -
+ .../src/main/resources/start-component.sh          |  348 ------
+ .../tools/dynamometer/TestDynamometerInfra.java    |  580 ----------
+ .../tools/dynamometer/TestDynoInfraUtils.java      |   66 -
+ .../src/test/resources/blocks/dn0-a-0-r-00000      |   34 -
+ .../src/test/resources/blocks/dn1-a-0-r-00001      |   33 -
+ .../src/test/resources/blocks/dn2-a-0-r-00002      |   33 -
+ .../test/resources/conf/etc/hadoop/core-site.xml   |   20 
+ .../test/resources/conf/etc/hadoop/hdfs-site.xml   |   20 
+ .../resources/conf/etc/hadoop/log4j.properties     |   26 
+ .../src/test/resources/hadoop_3_1/VERSION          |    7 
+ .../hadoop_3_1/fsimage_0000000000000061740         |  Bin
+ .../hadoop_3_1/fsimage_0000000000000061740.md5     |    1 
+ .../src/test/resources/yarn-site.xml               |   19 
+ .../hadoop-dynamometer-workload/pom.xml            |  151 ---
+ .../src/main/bash/parse-start-timestamp.sh         |   52 -
+ .../src/main/bash/start-workload.sh                |   42 -
+ .../workloadgenerator/CreateFileMapper.java        |  147 ---
+ .../workloadgenerator/VirtualInputFormat.java      |   57 -
+ .../workloadgenerator/VirtualInputSplit.java       |   52 -
+ .../workloadgenerator/VirtualRecordReader.java     |   78 -
+ .../workloadgenerator/WorkloadDriver.java          |  213 ----
+ .../workloadgenerator/WorkloadMapper.java          |   70 -
+ .../audit/AuditCommandParser.java                  |   59 -
+ .../audit/AuditLogDirectParser.java                |  158 ---
+ .../audit/AuditLogHiveTableParser.java             |   72 -
+ .../audit/AuditReplayCommand.java                  |  163 ---
+ .../workloadgenerator/audit/AuditReplayMapper.java |  311 -----
+ .../audit/AuditReplayReducer.java                  |   44 -
+ .../workloadgenerator/audit/AuditReplayThread.java |  328 ------
+ .../workloadgenerator/audit/CountTimeWritable.java |   82 -
+ .../audit/NoSplitTextInputFormat.java              |   47 -
+ .../workloadgenerator/audit/UserCommandKey.java    |  111 --
+ .../workloadgenerator/audit/package-info.java      |   27 
+ .../workloadgenerator/package-info.java            |   28 
+ .../workloadgenerator/TestWorkloadGenerator.java   |  165 ---
+ .../audit/TestAuditLogDirectParser.java            |  152 ---
+ .../src/test/resources/audit_trace_direct/audit0   |    6 
+ .../src/test/resources/audit_trace_hive/audit0     |    6 
+ hadoop-tools/hadoop-dynamometer/pom.xml            |   55 -
+ .../src/site/markdown/Dynamometer.md               |  302 -----
+ .../src/site/resources/css/site.css                |   30 -
+ .../images/dynamometer-architecture-infra.png      |  Bin
+ .../images/dynamometer-architecture-replay.png     |  Bin
+ hadoop-tools/pom.xml                               |    1 
+ 77 files changed, 9962 deletions(-)
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-blockgen.xml
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-infra.xml
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-workload.xml
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/bash/generate-block-lists.sh
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/BlockInfo.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateBlockImagesDriver.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateDNBlockInfosReducer.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParserMapper.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestBlockGen.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestXMLParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/resources/fsimage_0000000000000061740.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/create-slim-hadoop-tar.sh
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/parse-metrics.sh
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/start-dynamometer-cluster.sh
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/upload-fsimage.sh
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AMOptions.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/ApplicationMaster.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/BlockPlacementPolicyAlwaysSatisfied.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoConstants.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoResource.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/SimulatedDataNodes.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/resources/start-component.sh
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynoInfraUtils.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn0-a-0-r-00000
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn1-a-0-r-00001
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn2-a-0-r-00002
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/core-site.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/hdfs-site.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/log4j.properties
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/VERSION
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740.md5
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/yarn-site.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/parse-start-timestamp.sh
+ delete mode 100755 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/start-workload.sh
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/CreateFileMapper.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputSplit.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadDriver.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadMapper.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditCommandParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogDirectParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogHiveTableParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayCommand.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayMapper.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayReducer.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayThread.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/CountTimeWritable.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/NoSplitTextInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/UserCommandKey.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/TestWorkloadGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/TestAuditLogDirectParser.java
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_direct/audit0
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_hive/audit0
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/src/site/markdown/Dynamometer.md
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-infra.png
+ delete mode 100644 hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-replay.png
+
+diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
+index d4bfd8aaada..e769b26ff84 100755
+--- a/dev-support/bin/dist-layout-stitching
++++ b/dev-support/bin/dist-layout-stitching
+@@ -149,7 +149,6 @@ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-runtime/target/hadoop-cli
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/
+ 
+ run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
+-run copy "${ROOT}/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/target/hadoop-dynamometer-dist-${VERSION}" .
+ 
+ 
+ echo
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-blockgen.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-blockgen.xml
+deleted file mode 100644
+index 8d35141f64a..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-blockgen.xml
++++ /dev/null
+@@ -1,35 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-dynamometer-blockgen</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bash</directory>
+-      <outputDirectory>dynamometer-blockgen/bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-  </fileSets>
+-
+-</assembly>
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-infra.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-infra.xml
+deleted file mode 100644
+index a8d4c09b952..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-infra.xml
++++ /dev/null
+@@ -1,35 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-dynamometer-infra</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bash</directory>
+-      <outputDirectory>dynamometer-infra/bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-  </fileSets>
+-
+-</assembly>
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-workload.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-workload.xml
+deleted file mode 100644
+index 80cf304840e..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer-workload.xml
++++ /dev/null
+@@ -1,35 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-dynamometer-workload</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bash</directory>
+-      <outputDirectory>dynamometer-workload/bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-  </fileSets>
+-
+-</assembly>
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
+deleted file mode 100644
+index b2ce562231c..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
++++ /dev/null
+@@ -1,73 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the Li2cense is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-dynamometer</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-  <fileSets>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-blockgen/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-blockgen/target/hadoop-dynamometer-blockgen-${project.version}/dynamometer-blockgen</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/dynamometer/dynamometer-blockgen</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-workload/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-workload/target/hadoop-dynamometer-workload-${project.version}/dynamometer-workload</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/dynamometer/dynamometer-workload</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-infra/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-dynamometer-infra/target/hadoop-dynamometer-infra-${project.version}/dynamometer-infra</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/dynamometer/dynamometer-infra</outputDirectory>
+-    </fileSet>
+-  </fileSets>
+-  <dependencySets>
+-    <dependencySet>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
+-      <unpack>false</unpack>
+-      <scope>runtime</scope>
+-      <useProjectArtifact>false</useProjectArtifact>
+-      <excludes>
+-        <!-- use slf4j from common to avoid multiple binding warnings -->
+-        <exclude>org.slf4j:slf4j-api</exclude>
+-        <exclude>org.slf4j:slf4j-reload4j</exclude>
+-      </excludes>
+-    </dependencySet>
+-  </dependencySets>
+-</assembly>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index eb28b16f9f9..c42c8756bd9 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -198,7 +198,6 @@
+       <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+-      <item name="Dynamometer" href="hadoop-dynamometer/Dynamometer.html"/>
+     </menu>
+ 
+     <menu name="Reference" inherit="top">
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml
+deleted file mode 100644
+index bbe4e3cec33..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/pom.xml
++++ /dev/null
+@@ -1,130 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-dynamometer-blockgen</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Dynamometer Block Listing Generator</description>
+-  <name>Apache Hadoop Dynamometer Block Listing Generator</name>
+-  <packaging>jar</packaging>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-source-plugin</artifactId>
+-        <configuration>
+-          <attach>true</attach>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>dist</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-assembly-plugin</artifactId>
+-            <dependencies>
+-              <dependency>
+-                <groupId>org.apache.hadoop</groupId>
+-                <artifactId>hadoop-assemblies</artifactId>
+-                <version>${project.version}</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <id>dist</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>single</goal>
+-                </goals>
+-                <configuration>
+-                  <appendAssemblyId>false</appendAssemblyId>
+-                  <attach>false</attach>
+-                  <finalName>${project.artifactId}-${project.version}</finalName>
+-                  <descriptorRefs>
+-                    <descriptorRef>hadoop-dynamometer-blockgen</descriptorRef>
+-                  </descriptorRefs>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/bash/generate-block-lists.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/bash/generate-block-lists.sh
+deleted file mode 100755
+index 9ea63ba5412..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/bash/generate-block-lists.sh
++++ /dev/null
+@@ -1,38 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if type hadoop &> /dev/null; then
+-  hadoop_cmd="hadoop"
+-elif type "$HADOOP_COMMON_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_COMMON_HOME/bin/hadoop"
+-elif type "$HADOOP_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_HOME/bin/hadoop"
+-else
+-  echo "Unable to find a valid hadoop command to execute; exiting."
+-  exit 1
+-fi
+-
+-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
+-
+-for f in ${script_pwd}/lib/*.jar; do
+-  # Skip adding the blockgen JAR since it is added by the `hadoop jar` command
+-  if [[ "$f" != *"dynamometer-blockgen-"* ]]; then
+-    export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
+-  fi
+-done
+-"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-blockgen-*.jar \
+-  org.apache.hadoop.tools.dynamometer.blockgenerator.GenerateBlockImagesDriver "$@"
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/BlockInfo.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/BlockInfo.java
+deleted file mode 100644
+index 97739f60f63..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/BlockInfo.java
++++ /dev/null
+@@ -1,102 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Writable;
+-
+-/**
+- * This is the MapOutputValue class. It has the blockId and the block generation
+- * stamp which is needed to generate the block images in the reducer.
+- *
+- * This also stores the replication of the block, but note that it does not
+- * serialize this value as part of its {@link Writable} interface, and does not
+- * consider the replication when doing equality / hash comparisons.
+- */
+-
+-public class BlockInfo implements Writable {
+-
+-  LongWritable getBlockId() {
+-    return blockId;
+-  }
+-
+-  LongWritable getBlockGenerationStamp() {
+-    return blockGenerationStamp;
+-  }
+-
+-  LongWritable getSize() {
+-    return size;
+-  }
+-
+-  short getReplication() {
+-    return replication;
+-  }
+-
+-  private LongWritable blockId;
+-  private LongWritable blockGenerationStamp;
+-  private LongWritable size;
+-  private transient short replication;
+-
+-  @SuppressWarnings("unused") // Used via reflection
+-  private BlockInfo() {
+-    this.blockId = new LongWritable();
+-    this.blockGenerationStamp = new LongWritable();
+-    this.size = new LongWritable();
+-  }
+-
+-  BlockInfo(long blockid, long blockgenerationstamp, long size,
+-      short replication) {
+-    this.blockId = new LongWritable(blockid);
+-    this.blockGenerationStamp = new LongWritable(blockgenerationstamp);
+-    this.size = new LongWritable(size);
+-    this.replication = replication;
+-  }
+-
+-  public void write(DataOutput dataOutput) throws IOException {
+-    blockId.write(dataOutput);
+-    blockGenerationStamp.write(dataOutput);
+-    size.write(dataOutput);
+-  }
+-
+-  public void readFields(DataInput dataInput) throws IOException {
+-    blockId.readFields(dataInput);
+-    blockGenerationStamp.readFields(dataInput);
+-    size.readFields(dataInput);
+-  }
+-
+-  @Override
+-  public boolean equals(Object o) {
+-    if (!(o instanceof BlockInfo)) {
+-      return false;
+-    }
+-    BlockInfo blkInfo = (BlockInfo) o;
+-    return blkInfo.getBlockId().equals(this.getBlockId())
+-        && blkInfo.getBlockGenerationStamp()
+-            .equals(this.getBlockGenerationStamp())
+-        && blkInfo.getSize().equals(this.getSize());
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return blockId.hashCode() + 357 * blockGenerationStamp.hashCode()
+-        + 9357 * size.hashCode();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateBlockImagesDriver.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateBlockImagesDriver.java
+deleted file mode 100644
+index 0f7624d2f8d..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateBlockImagesDriver.java
++++ /dev/null
+@@ -1,141 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.net.URI;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.PosixParser;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.LazyOutputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * This is the main driver class. It takes in the following arguments: -
+- * Required: input path of the fsImage from the HDFS cluster to be simulated -
+- * Required: output path for generated block image files for each Dynamometer
+- * DataNode - Required: Number of DataNodes to generate blocks for - Optional:
+- * Number of reducers to use for the job (defaults to number of DataNodes)
+- */
+-
+-public class GenerateBlockImagesDriver extends Configured implements Tool {
+-
+-  public static final String FSIMAGE_INPUT_PATH_ARG = "fsimage_input_path";
+-  public static final String BLOCK_IMAGE_OUTPUT_ARG = "block_image_output_dir";
+-  public static final String NUM_REDUCERS_ARG = "num_reducers";
+-  public static final String NUM_DATANODES_ARG = "num_datanodes";
+-
+-  public static final String NUM_DATANODES_KEY = "dyno.blockgen.num.datanodes";
+-
+-  public GenerateBlockImagesDriver(Configuration conf) {
+-    setConf(conf);
+-  }
+-
+-  public int run(String[] args) throws Exception {
+-    Options options = new Options();
+-    options.addOption("h", "help", false, "Shows this message");
+-    options.addOption(Option.builder(FSIMAGE_INPUT_PATH_ARG)
+-        .argName("Input path of the XML fsImage")
+-        .hasArg().required(true)
+-        .desc("Input path to the Hadoop fsImage XML file (required)")
+-        .build());
+-    options.addOption(Option.builder(BLOCK_IMAGE_OUTPUT_ARG).argName("BlockImage output directory")
+-        .hasArg().required(true)
+-        .desc("Directory where the generated files containing the "
+-            + "block listing for each DataNode should be stored (required)")
+-        .build());
+-    options.addOption(Option.builder(NUM_REDUCERS_ARG).argName("Number of reducers").hasArg()
+-        .required(false)
+-        .desc(
+-            "Number of reducers for this job (defaults to number of datanodes)")
+-        .build());
+-    options.addOption(Option.builder(NUM_DATANODES_ARG).argName("Number of datanodes").hasArg()
+-        .required(true)
+-        .desc("Number of DataNodes to create blocks for (required)")
+-        .build());
+-
+-    CommandLineParser parser = new PosixParser();
+-    CommandLine cli = parser.parse(options, args);
+-    if (cli.hasOption("h")) {
+-      HelpFormatter formatter = new HelpFormatter();
+-      formatter.printHelp(200, "hadoop jar dynamometer-*.jar "
+-              + "org.apache.hadoop.tools.dynamometer.blockgenerator."
+-              + "GenerateBlockImagesDriver [options]",
+-          null, options, null);
+-      return 0;
+-    }
+-
+-    String fsImageInputPath = cli.getOptionValue(FSIMAGE_INPUT_PATH_ARG);
+-    String blockImageOutputDir = cli.getOptionValue(BLOCK_IMAGE_OUTPUT_ARG);
+-    int numDataNodes = Integer.parseInt(cli.getOptionValue(NUM_DATANODES_ARG));
+-    int numReducers = Integer.parseInt(
+-        cli.getOptionValue(NUM_REDUCERS_ARG, String.valueOf(numDataNodes)));
+-
+-    FileSystem fs = FileSystem.get(new URI(blockImageOutputDir), getConf());
+-    Job job = Job.getInstance(getConf(), "Create blocksImages for Dynamometer");
+-    FileInputFormat.setInputPaths(job, new Path(fsImageInputPath));
+-    Path blockImagesDir = new Path(blockImageOutputDir);
+-    fs.delete(blockImagesDir, true);
+-    FileOutputFormat.setOutputPath(job, blockImagesDir);
+-    job.getConfiguration().setInt(NUM_DATANODES_KEY, numDataNodes);
+-
+-    job.setJarByClass(GenerateBlockImagesDriver.class);
+-    job.setInputFormatClass(NoSplitTextInputFormat.class);
+-    job.setNumReduceTasks(numReducers);
+-    LazyOutputFormat.setOutputFormatClass(job, TextOutputFormat.class);
+-    job.setMapperClass(XMLParserMapper.class);
+-    job.setReducerClass(GenerateDNBlockInfosReducer.class);
+-    job.setMapOutputKeyClass(IntWritable.class);
+-    job.setMapOutputValueClass(BlockInfo.class);
+-    job.setOutputKeyClass(NullWritable.class);
+-    job.setOutputValueClass(Text.class);
+-
+-    boolean success = job.waitForCompletion(true);
+-    return success ? 0 : 1;
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    GenerateBlockImagesDriver driver = new GenerateBlockImagesDriver(
+-        new Configuration());
+-    System.exit(ToolRunner.run(driver, args));
+-  }
+-
+-  /** A simple text input format that doesn't allow splitting of files. */
+-  public static class NoSplitTextInputFormat extends TextInputFormat {
+-    @Override
+-    public boolean isSplitable(JobContext context, Path file) {
+-      return false;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateDNBlockInfosReducer.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateDNBlockInfosReducer.java
+deleted file mode 100644
+index 93cbe5fd721..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/GenerateDNBlockInfosReducer.java
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.Reducer;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.MultipleOutputs;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * This Reducer class generates a simple text file for each DN, listing the
+- * blocks to be generated.
+- *
+- * Input: {@link BlockInfo}'s from {@link XMLParserMapper}
+- *
+- * Output: A text file named as dni-XXX, where i is the ID of the DN and XXX is
+- * a reducer ID. Each line in the file is in format:
+- * blockID,blockGenStamp,blockSize
+- */
+-public class GenerateDNBlockInfosReducer
+-    extends Reducer<IntWritable, BlockInfo, NullWritable, Text> {
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(GenerateDNBlockInfosReducer.class);
+-
+-  private MultipleOutputs<NullWritable, Text> multiOutputs;
+-
+-  @Override
+-  public void setup(
+-      Reducer<IntWritable, BlockInfo, NullWritable, Text>.Context context) {
+-    multiOutputs = new MultipleOutputs<>(context);
+-  }
+-
+-  @Override
+-  public void cleanup(Context context)
+-      throws IOException, InterruptedException {
+-    multiOutputs.close();
+-    multiOutputs = null;
+-  }
+-
+-  @Override
+-  public void reduce(IntWritable key, Iterable<BlockInfo> values,
+-      Context context) throws IOException, InterruptedException {
+-    long blockIndex = 0;
+-    int datanodeId = key.get();
+-    String dnFile = "dn" + datanodeId + "-a-"
+-        + context.getTaskAttemptID().getId();
+-    Iterator<BlockInfo> it = values.iterator();
+-    long startTimestamp = System.currentTimeMillis();
+-    long endTimestamp;
+-
+-    Path baseOutputPath = FileOutputFormat.getOutputPath(context);
+-    String fullPath = new Path(baseOutputPath, dnFile).toString();
+-
+-    Text out = new Text();
+-    while (it.hasNext()) {
+-      BlockInfo blockInfo = it.next();
+-      String blockLine = blockInfo.getBlockId() + ","
+-          + blockInfo.getBlockGenerationStamp() + "," + blockInfo.getSize();
+-      out.set(blockLine);
+-      multiOutputs.write(NullWritable.get(), out, fullPath);
+-
+-      blockIndex++;
+-
+-      // Report progress for every 1000 blocks
+-      if (blockIndex % 1000 == 0) {
+-        context.progress();
+-        endTimestamp = System.currentTimeMillis();
+-        System.out.println("Time taken to process 1000 records in ms:"
+-            + (endTimestamp - startTimestamp));
+-        startTimestamp = endTimestamp;
+-      }
+-    }
+-
+-    LOG.info("Number of blocks processed:" + blockIndex);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParser.java
+deleted file mode 100644
+index d0f3e383ba6..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParser.java
++++ /dev/null
+@@ -1,174 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collections;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-// Checkstyle complains about the XML tags even though they are wrapped
+-// within <pre> and {@code} tags. The SupressWarnings has to go before the
+-// Javadoc to take effect.
+-@SuppressWarnings("checkstyle:javadocstyle")
+-/**
+- * This class parses an fsimage file in XML format. It accepts the file
+- * line-by-line and maintains an internal state machine to keep track of
+- * contextual information. A single parser must process the entire file with the
+- * lines in the order they appear in the original file.
+- *
+- * A file may be spread across multiple lines, so we need to track the
+- * replication of the file we are currently processing to be aware of what the
+- * replication factor is for each block we encounter. This is why we require a
+- * single mapper.
+- *
+- * The format is illustrated below (line breaks for readability):
+- * <pre>{@code
+- * <inode><id>inode_ID<id/> <type>inode_type</type>
+- * <replication>inode_replication</replication> [file attributes] <blocks>
+- * <block><id>XXX</id><genstamp>XXX</genstamp><numBytes>XXX</numBytes><block/>
+- * <blocks/> <inode/>
+- * }</pre>
+- *
+- * This is true in both Hadoop 2 and 3.
+- */
+-class XMLParser {
+-
+-  private static final Pattern BLOCK_PATTERN = Pattern.compile("<block>"
+-      + "<id>(\\d+)</id>"
+-      + "<genstamp>(\\d+)</genstamp>"
+-      + "<numBytes>(\\d+)</numBytes>"
+-      + "</block>");
+-
+-  private State currentState = State.DEFAULT;
+-  private short currentReplication;
+-
+-  /**
+-   * Accept a single line of the XML file, and return a {@link BlockInfo} for
+-   * any blocks contained within that line. Update internal state dependent on
+-   * other XML values seen, e.g. the beginning of a file.
+-   *
+-   * @param line The XML line to parse.
+-   * @return {@code BlockInfo}s for any blocks found.
+-   */
+-  List<BlockInfo> parseLine(String line) throws IOException {
+-    if (currentState == State.DEFAULT) {
+-      if (line.contains("<INodeSection>")) {
+-        transitionTo(State.INODE_SECTION);
+-      } else {
+-        return Collections.emptyList();
+-      }
+-    }
+-    if (line.contains("<inode>")) {
+-      transitionTo(State.INODE);
+-    }
+-    if (line.contains("<type>FILE</type>")) {
+-      transitionTo(State.FILE);
+-    }
+-    List<String> replicationStrings = valuesFromXMLString(line, "replication");
+-    if (!replicationStrings.isEmpty()) {
+-      if (replicationStrings.size() > 1) {
+-        throw new IOException(String.format("Found %s replication strings",
+-            replicationStrings.size()));
+-      }
+-      transitionTo(State.FILE_WITH_REPLICATION);
+-      currentReplication = Short.parseShort(replicationStrings.get(0));
+-    }
+-    Matcher blockMatcher = BLOCK_PATTERN.matcher(line);
+-    List<BlockInfo> blockInfos = new ArrayList<>();
+-    while (blockMatcher.find()) {
+-      if (currentState != State.FILE_WITH_REPLICATION) {
+-        throw new IOException(
+-            "Found a block string when in state: " + currentState);
+-      }
+-      long id = Long.parseLong(blockMatcher.group(1));
+-      long gs = Long.parseLong(blockMatcher.group(2));
+-      long size = Long.parseLong(blockMatcher.group(3));
+-      blockInfos.add(new BlockInfo(id, gs, size, currentReplication));
+-    }
+-    if (line.contains("</inode>")) {
+-      transitionTo(State.INODE_SECTION);
+-    }
+-    if (line.contains("</INodeSection>")) {
+-      transitionTo(State.DEFAULT);
+-    }
+-    return blockInfos;
+-  }
+-
+-  /**
+-   * Attempt to transition to another state.
+-   *
+-   * @param nextState The new state to transition to.
+-   * @throws IOException If the transition from the current state to
+-   *                     {@code nextState} is not allowed.
+-   */
+-  private void transitionTo(State nextState) throws IOException {
+-    if (currentState.transitionAllowed(nextState)) {
+-      currentState = nextState;
+-    } else {
+-      throw new IOException("State transition not allowed; from " + currentState
+-          + " to " + nextState);
+-    }
+-  }
+-
+-  /**
+-   * @param xml An XML string
+-   * @param field The field whose value(s) should be extracted
+-   * @return List of the field's values.
+-   */
+-  private static List<String> valuesFromXMLString(String xml, String field) {
+-    Matcher m = Pattern.compile("<" + field + ">(.+?)</" + field + ">")
+-        .matcher(xml);
+-    List<String> found = new ArrayList<>();
+-    while (m.find()) {
+-      found.add(m.group(1));
+-    }
+-    return found;
+-  }
+-
+-  private enum State {
+-    DEFAULT,
+-    INODE_SECTION,
+-    INODE,
+-    FILE,
+-    FILE_WITH_REPLICATION;
+-
+-    private final Set<State> allowedTransitions = new HashSet<>();
+-    static {
+-      DEFAULT.addTransitions(DEFAULT, INODE_SECTION);
+-      INODE_SECTION.addTransitions(DEFAULT, INODE);
+-      INODE.addTransitions(INODE_SECTION, FILE);
+-      FILE.addTransitions(INODE_SECTION, FILE_WITH_REPLICATION);
+-      FILE_WITH_REPLICATION.addTransitions(INODE_SECTION);
+-    }
+-
+-    private void addTransitions(State... nextState) {
+-      allowedTransitions.addAll(Arrays.asList(nextState));
+-    }
+-
+-    boolean transitionAllowed(State nextState) {
+-      return allowedTransitions.contains(nextState);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParserMapper.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParserMapper.java
+deleted file mode 100644
+index 29c9fb3ce13..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/XMLParserMapper.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.io.IOException;
+-import java.util.List;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * This Mapper class generates a list of {@link BlockInfo}'s from a given
+- * fsimage.
+- *
+- * Input: fsimage in XML format. It should be generated using
+- * {@code org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer}.
+- *
+- * Output: list of all {@link BlockInfo}'s
+- */
+-public class XMLParserMapper
+-    extends Mapper<LongWritable, Text, IntWritable, BlockInfo> {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(XMLParserMapper.class);
+-
+-  @Override
+-  public void setup(Mapper.Context context) {
+-    Configuration conf = context.getConfiguration();
+-    numDataNodes = conf.getInt(GenerateBlockImagesDriver.NUM_DATANODES_KEY, -1);
+-    parser = new XMLParser();
+-  }
+-
+-  // Blockindexes should be generated serially
+-  private int blockIndex = 0;
+-  private int numDataNodes;
+-  private XMLParser parser;
+-
+-  /**
+-   * Read the input XML file line by line, and generate list of blocks. The
+-   * actual parsing logic is handled by {@link XMLParser}. This mapper just
+-   * delegates to that class and then writes the blocks to the corresponding
+-   * index to be processed by reducers.
+-   */
+-  @Override
+-  public void map(LongWritable lineNum, Text line,
+-      Mapper<LongWritable, Text, IntWritable, BlockInfo>.Context context)
+-      throws IOException, InterruptedException {
+-    List<BlockInfo> blockInfos = parser.parseLine(line.toString());
+-    for (BlockInfo blockInfo : blockInfos) {
+-      for (short i = 0; i < blockInfo.getReplication(); i++) {
+-        context.write(new IntWritable((blockIndex + i) % numDataNodes),
+-            blockInfo);
+-      }
+-
+-      blockIndex++;
+-      if (blockIndex % 1000000 == 0) {
+-        LOG.info("Processed " + blockIndex + " blocks");
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/package-info.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/package-info.java
+deleted file mode 100644
+index 2974432e4a0..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/main/java/org/apache/hadoop/tools/dynamometer/blockgenerator/package-info.java
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Tools to help generate block files as input to Dynamometer.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestBlockGen.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestBlockGen.java
+deleted file mode 100644
+index 61c6dce0dbd..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestBlockGen.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-
+-/** Tests for block generation via {@link GenerateBlockImagesDriver}. */
+-public class TestBlockGen {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestBlockGen.class);
+-
+-  private MiniDFSCluster dfsCluster;
+-  private FileSystem fs;
+-  private static final String FS_IMAGE_NAME = "fsimage_0000000000000061740.xml";
+-  private static final String BLOCK_LIST_OUTPUT_DIR_NAME = "blockLists";
+-  private Path tmpPath;
+-
+-  @Before
+-  public void setup() throws Exception {
+-    Configuration conf = new Configuration();
+-    dfsCluster = new MiniDFSCluster.Builder(conf).build();
+-    dfsCluster.waitActive();
+-    LOG.info("Started MiniDFSCluster");
+-    fs = dfsCluster.getFileSystem();
+-    FileSystem.setDefaultUri(conf, fs.getUri());
+-    tmpPath = fs.makeQualified(new Path("/tmp"));
+-    fs.mkdirs(tmpPath);
+-    String fsImageFile = this.getClass().getClassLoader()
+-        .getResource(FS_IMAGE_NAME).getPath();
+-
+-    fs.copyFromLocalFile(new Path(fsImageFile),
+-        new Path(tmpPath, FS_IMAGE_NAME));
+-  }
+-
+-  @After
+-  public void cleanUp() {
+-    dfsCluster.shutdown();
+-  }
+-
+-  @Test
+-  public void testBlockGen() throws Exception {
+-    LOG.info("Started test");
+-
+-    int datanodeCount = 40;
+-
+-    GenerateBlockImagesDriver driver = new GenerateBlockImagesDriver(
+-        new Configuration());
+-    driver.run(
+-        new String[] {"-" + GenerateBlockImagesDriver.FSIMAGE_INPUT_PATH_ARG,
+-            new Path(tmpPath, FS_IMAGE_NAME).toString(),
+-            "-" + GenerateBlockImagesDriver.BLOCK_IMAGE_OUTPUT_ARG,
+-            new Path(tmpPath, BLOCK_LIST_OUTPUT_DIR_NAME).toString(),
+-            "-" + GenerateBlockImagesDriver.NUM_DATANODES_ARG,
+-            String.valueOf(datanodeCount)});
+-
+-    for (int i = 0; i < datanodeCount; i++) {
+-      final int idx = i;
+-      assertEquals(1, fs.listStatus(
+-          new Path(tmpPath, BLOCK_LIST_OUTPUT_DIR_NAME),
+-          (path) -> path.getName().startsWith(String.format("dn%d-", idx))
+-      ).length);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestXMLParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestXMLParser.java
+deleted file mode 100644
+index 149b72a3749..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/java/org/apache/hadoop/tools/dynamometer/blockgenerator/TestXMLParser.java
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.blockgenerator;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-
+-/** Tests for {@link XMLParser}. */
+-public class TestXMLParser {
+-
+-  /**
+-   * Testing whether {@link XMLParser} correctly parses an XML fsimage file into
+-   * {@link BlockInfo}'s. Note that some files have multiple lines.
+-   */
+-  @Test
+-  public void testBlocksFromLine() throws Exception {
+-    String[] lines = {
+-        "<INodeSection><lastInodeId>1"
+-            + "</lastInodeId><inode><id>2</id><type>FILE</type>"
+-            + "<name>fake-file</name>"
+-            + "<replication>3</replication><mtime>3</mtime>"
+-            + "<atime>4</atime>" + "<perferredBlockSize>5</perferredBlockSize>"
+-            + "<permission>hdfs:hdfs:rw-------</permission>"
+-            + "<blocks><block><id>6</id><genstamp>7</genstamp>"
+-            + "<numBytes>8</numBytes></block>"
+-            + "<block><id>9</id><genstamp>10</genstamp>"
+-            + "<numBytes>11</numBytes></block></inode>",
+-        "<inode><type>DIRECTORY</type></inode>", "<inode><type>FILE</type>",
+-        "<replication>12</replication>",
+-        "<blocks><block><id>13</id><genstamp>14</genstamp>"
+-            + "<numBytes>15</numBytes></block>",
+-        "</inode>",
+-        "</INodeSection>"
+-    };
+-
+-    short replCount = 0; // This is ignored
+-    Map<BlockInfo, Short> expectedBlockCount = new HashMap<>();
+-    expectedBlockCount.put(new BlockInfo(6, 7, 8, replCount), (short) 3);
+-    expectedBlockCount.put(new BlockInfo(9, 10, 11, replCount), (short) 3);
+-    expectedBlockCount.put(new BlockInfo(13, 14, 15, replCount), (short) 12);
+-
+-    final Map<BlockInfo, Short> actualBlockCount = new HashMap<>();
+-    XMLParser parser = new XMLParser();
+-    for (String line : lines) {
+-      for (BlockInfo info : parser.parseLine(line)) {
+-        actualBlockCount.put(info, info.getReplication());
+-      }
+-    }
+-
+-    for (Map.Entry<BlockInfo, Short> expect : expectedBlockCount.entrySet()) {
+-      assertEquals(expect.getValue(), actualBlockCount.get(expect.getKey()));
+-    }
+-  }
+-
+-  @Test
+-  public void testNonInodeSectionIgnored() throws Exception {
+-    String[] lines = {
+-        "<INodeSection>",
+-        "</INodeSection>",
+-        "<OtherSection>",
+-        "<inode><id>1</id><type>FILE</type><name>fake-file</name>"
+-            + "<replication>1</replication>",
+-        "<blocks><block><id>2</id><genstamp>1</genstamp>"
+-            + "<numBytes>1</numBytes></block>",
+-        "</inode>",
+-        "<replication>3</replication>",
+-        "</OtherSection>"
+-    };
+-
+-    XMLParser parser = new XMLParser();
+-    for (String line : lines) {
+-      assertTrue((parser.parseLine(line).isEmpty()));
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/resources/fsimage_0000000000000061740.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/resources/fsimage_0000000000000061740.xml
+deleted file mode 100644
+index fea4d1249ae..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-blockgen/src/test/resources/fsimage_0000000000000061740.xml
++++ /dev/null
+@@ -1,553 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<fsimage><NameSection>
+-<genstampV1>1000</genstampV1><genstampV2>11100</genstampV2><genstampV1Limit>0</genstampV1Limit><lastAllocatedBlockId>1073751924</lastAllocatedBlockId><txid>61740</txid></NameSection>
+-<INodeSection><lastInodeId>26700</lastInodeId><inode><id>16385</id><type>DIRECTORY</type><name></name><mtime>1494453394091</mtime><permission>hdfs:hdfs:rwxr-xr-x</permission><nsquota>9223372036854775807</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>16386</id><type>DIRECTORY</type><name>tmp</name><mtime>1494453775668</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>16387</id><type>DIRECTORY</type><name>data</name><mtime>1494453387057</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>16388</id><type>DIRECTORY</type><name>user</name><mtime>1494453399239</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>16389</id><type>DIRECTORY</type><name>hdfs</name><mtime>1494453399239</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>16390</id><type>DIRECTORY</type><name>files</name><mtime>1494614176953</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26491</id><type>DIRECTORY</type><name>0</name><mtime>1494614175397</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26492</id><type>DIRECTORY</type><name>0</name><mtime>1494614175198</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26493</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175183</mtime><atime>1494614175049</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751825</id><genstamp>11001</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26494</id><type>DIRECTORY</type><name>1</name><mtime>1494614175224</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26495</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175222</mtime><atime>1494614175212</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751826</id><genstamp>11002</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26496</id><type>DIRECTORY</type><name>2</name><mtime>1494614175259</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26497</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175257</mtime><atime>1494614175234</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751827</id><genstamp>11003</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26498</id><type>DIRECTORY</type><name>3</name><mtime>1494614175280</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26499</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175278</mtime><atime>1494614175269</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751828</id><genstamp>11004</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26500</id><type>DIRECTORY</type><name>4</name><mtime>1494614175302</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26501</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175299</mtime><atime>1494614175291</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751829</id><genstamp>11005</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26502</id><type>DIRECTORY</type><name>5</name><mtime>1494614175323</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26503</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175321</mtime><atime>1494614175312</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751830</id><genstamp>11006</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26504</id><type>DIRECTORY</type><name>6</name><mtime>1494614175345</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26505</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175343</mtime><atime>1494614175333</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751831</id><genstamp>11007</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26506</id><type>DIRECTORY</type><name>7</name><mtime>1494614175366</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26507</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175363</mtime><atime>1494614175355</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751832</id><genstamp>11008</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26508</id><type>DIRECTORY</type><name>8</name><mtime>1494614175387</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26509</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175385</mtime><atime>1494614175376</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751833</id><genstamp>11009</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26510</id><type>DIRECTORY</type><name>9</name><mtime>1494614175413</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26511</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175410</mtime><atime>1494614175402</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751834</id><genstamp>11010</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26512</id><type>DIRECTORY</type><name>1</name><mtime>1494614175626</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26513</id><type>DIRECTORY</type><name>0</name><mtime>1494614175447</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26514</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175445</mtime><atime>1494614175437</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751835</id><genstamp>11011</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26515</id><type>DIRECTORY</type><name>1</name><mtime>1494614175467</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26516</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175464</mtime><atime>1494614175456</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751836</id><genstamp>11012</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26517</id><type>DIRECTORY</type><name>2</name><mtime>1494614175486</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26518</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175484</mtime><atime>1494614175475</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751837</id><genstamp>11013</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26519</id><type>DIRECTORY</type><name>3</name><mtime>1494614175514</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26520</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175512</mtime><atime>1494614175496</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751838</id><genstamp>11014</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26521</id><type>DIRECTORY</type><name>4</name><mtime>1494614175533</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26522</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175531</mtime><atime>1494614175523</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751839</id><genstamp>11015</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26523</id><type>DIRECTORY</type><name>5</name><mtime>1494614175552</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26524</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175549</mtime><atime>1494614175540</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751840</id><genstamp>11016</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26525</id><type>DIRECTORY</type><name>6</name><mtime>1494614175574</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26526</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175572</mtime><atime>1494614175563</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751841</id><genstamp>11017</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26527</id><type>DIRECTORY</type><name>7</name><mtime>1494614175603</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26528</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175592</mtime><atime>1494614175583</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751842</id><genstamp>11018</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26529</id><type>DIRECTORY</type><name>8</name><mtime>1494614175622</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26530</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175620</mtime><atime>1494614175612</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751843</id><genstamp>11019</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26531</id><type>DIRECTORY</type><name>9</name><mtime>1494614175643</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26532</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175640</mtime><atime>1494614175631</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751844</id><genstamp>11020</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26533</id><type>DIRECTORY</type><name>2</name><mtime>1494614175829</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26534</id><type>DIRECTORY</type><name>0</name><mtime>1494614175669</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26535</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175666</mtime><atime>1494614175658</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751845</id><genstamp>11021</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26536</id><type>DIRECTORY</type><name>1</name><mtime>1494614175688</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26537</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175686</mtime><atime>1494614175678</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751846</id><genstamp>11022</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26538</id><type>DIRECTORY</type><name>2</name><mtime>1494614175708</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26539</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175705</mtime><atime>1494614175697</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751847</id><genstamp>11023</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26540</id><type>DIRECTORY</type><name>3</name><mtime>1494614175727</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26541</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175725</mtime><atime>1494614175716</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751848</id><genstamp>11024</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26542</id><type>DIRECTORY</type><name>4</name><mtime>1494614175746</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26543</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175744</mtime><atime>1494614175736</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751849</id><genstamp>11025</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26544</id><type>DIRECTORY</type><name>5</name><mtime>1494614175772</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26545</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175770</mtime><atime>1494614175755</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751850</id><genstamp>11026</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26546</id><type>DIRECTORY</type><name>6</name><mtime>1494614175790</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26547</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175788</mtime><atime>1494614175780</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751851</id><genstamp>11027</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26548</id><type>DIRECTORY</type><name>7</name><mtime>1494614175808</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26549</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175806</mtime><atime>1494614175798</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751852</id><genstamp>11028</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26550</id><type>DIRECTORY</type><name>8</name><mtime>1494614175826</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26551</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175823</mtime><atime>1494614175816</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751853</id><genstamp>11029</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26552</id><type>DIRECTORY</type><name>9</name><mtime>1494614175853</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26553</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175842</mtime><atime>1494614175834</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751854</id><genstamp>11030</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26554</id><type>DIRECTORY</type><name>3</name><mtime>1494614176026</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26555</id><type>DIRECTORY</type><name>0</name><mtime>1494614175875</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26556</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175873</mtime><atime>1494614175865</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751855</id><genstamp>11031</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26557</id><type>DIRECTORY</type><name>1</name><mtime>1494614175893</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26558</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175891</mtime><atime>1494614175883</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751856</id><genstamp>11032</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26559</id><type>DIRECTORY</type><name>2</name><mtime>1494614175911</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26560</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175908</mtime><atime>1494614175901</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751857</id><genstamp>11033</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26561</id><type>DIRECTORY</type><name>3</name><mtime>1494614175930</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26562</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175927</mtime><atime>1494614175919</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751858</id><genstamp>11034</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26563</id><type>DIRECTORY</type><name>4</name><mtime>1494614175947</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26564</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175946</mtime><atime>1494614175938</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751859</id><genstamp>11035</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26565</id><type>DIRECTORY</type><name>5</name><mtime>1494614175964</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26566</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175962</mtime><atime>1494614175955</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751860</id><genstamp>11036</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26567</id><type>DIRECTORY</type><name>6</name><mtime>1494614175980</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26568</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175978</mtime><atime>1494614175971</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751861</id><genstamp>11037</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26569</id><type>DIRECTORY</type><name>7</name><mtime>1494614176000</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26570</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614175997</mtime><atime>1494614175989</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751862</id><genstamp>11038</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26571</id><type>DIRECTORY</type><name>8</name><mtime>1494614176018</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26572</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176016</mtime><atime>1494614176009</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751863</id><genstamp>11039</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26573</id><type>DIRECTORY</type><name>9</name><mtime>1494614176040</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26574</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176038</mtime><atime>1494614176031</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751864</id><genstamp>11040</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26575</id><type>DIRECTORY</type><name>4</name><mtime>1494614176214</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26576</id><type>DIRECTORY</type><name>0</name><mtime>1494614176063</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26577</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176061</mtime><atime>1494614176053</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751865</id><genstamp>11041</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26578</id><type>DIRECTORY</type><name>1</name><mtime>1494614176081</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26579</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176080</mtime><atime>1494614176071</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751866</id><genstamp>11042</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26580</id><type>DIRECTORY</type><name>2</name><mtime>1494614176101</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26581</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176098</mtime><atime>1494614176089</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751867</id><genstamp>11043</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26582</id><type>DIRECTORY</type><name>3</name><mtime>1494614176118</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26583</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176115</mtime><atime>1494614176108</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751868</id><genstamp>11044</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26584</id><type>DIRECTORY</type><name>4</name><mtime>1494614176136</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26585</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176134</mtime><atime>1494614176127</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751869</id><genstamp>11045</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26586</id><type>DIRECTORY</type><name>5</name><mtime>1494614176153</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26587</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176151</mtime><atime>1494614176144</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751870</id><genstamp>11046</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26588</id><type>DIRECTORY</type><name>6</name><mtime>1494614176178</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26589</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176176</mtime><atime>1494614176160</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751871</id><genstamp>11047</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26590</id><type>DIRECTORY</type><name>7</name><mtime>1494614176194</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26591</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176193</mtime><atime>1494614176186</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751872</id><genstamp>11048</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26592</id><type>DIRECTORY</type><name>8</name><mtime>1494614176211</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26593</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176209</mtime><atime>1494614176201</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751873</id><genstamp>11049</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26594</id><type>DIRECTORY</type><name>9</name><mtime>1494614176228</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26595</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176226</mtime><atime>1494614176219</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751874</id><genstamp>11050</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26596</id><type>DIRECTORY</type><name>5</name><mtime>1494614176388</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26597</id><type>DIRECTORY</type><name>0</name><mtime>1494614176249</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26598</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176247</mtime><atime>1494614176240</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751875</id><genstamp>11051</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26599</id><type>DIRECTORY</type><name>1</name><mtime>1494614176266</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26600</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176264</mtime><atime>1494614176257</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751876</id><genstamp>11052</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26601</id><type>DIRECTORY</type><name>2</name><mtime>1494614176288</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26602</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176286</mtime><atime>1494614176274</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751877</id><genstamp>11053</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26603</id><type>DIRECTORY</type><name>3</name><mtime>1494614176304</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26604</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176303</mtime><atime>1494614176295</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751878</id><genstamp>11054</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26605</id><type>DIRECTORY</type><name>4</name><mtime>1494614176320</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26606</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176318</mtime><atime>1494614176311</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751879</id><genstamp>11055</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26607</id><type>DIRECTORY</type><name>5</name><mtime>1494614176336</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26608</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176334</mtime><atime>1494614176327</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751880</id><genstamp>11056</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26609</id><type>DIRECTORY</type><name>6</name><mtime>1494614176354</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26610</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176351</mtime><atime>1494614176343</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751881</id><genstamp>11057</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26611</id><type>DIRECTORY</type><name>7</name><mtime>1494614176369</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26612</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176368</mtime><atime>1494614176360</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751882</id><genstamp>11058</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26613</id><type>DIRECTORY</type><name>8</name><mtime>1494614176385</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26614</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176383</mtime><atime>1494614176376</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751883</id><genstamp>11059</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26615</id><type>DIRECTORY</type><name>9</name><mtime>1494614176401</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26616</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176399</mtime><atime>1494614176392</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751884</id><genstamp>11060</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26617</id><type>DIRECTORY</type><name>6</name><mtime>1494614176584</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26618</id><type>DIRECTORY</type><name>0</name><mtime>1494614176432</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26619</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176421</mtime><atime>1494614176413</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751885</id><genstamp>11061</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26620</id><type>DIRECTORY</type><name>1</name><mtime>1494614176450</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26621</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176448</mtime><atime>1494614176440</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751886</id><genstamp>11062</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26622</id><type>DIRECTORY</type><name>2</name><mtime>1494614176468</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26623</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176465</mtime><atime>1494614176457</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751887</id><genstamp>11063</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26624</id><type>DIRECTORY</type><name>3</name><mtime>1494614176486</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26625</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176483</mtime><atime>1494614176475</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751888</id><genstamp>11064</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26626</id><type>DIRECTORY</type><name>4</name><mtime>1494614176503</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26627</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176501</mtime><atime>1494614176493</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751889</id><genstamp>11065</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26628</id><type>DIRECTORY</type><name>5</name><mtime>1494614176519</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26629</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176517</mtime><atime>1494614176511</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751890</id><genstamp>11066</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26630</id><type>DIRECTORY</type><name>6</name><mtime>1494614176550</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26631</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176540</mtime><atime>1494614176526</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751891</id><genstamp>11067</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26632</id><type>DIRECTORY</type><name>7</name><mtime>1494614176566</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26633</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176564</mtime><atime>1494614176557</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751892</id><genstamp>11068</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26634</id><type>DIRECTORY</type><name>8</name><mtime>1494614176580</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26635</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176578</mtime><atime>1494614176572</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751893</id><genstamp>11069</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26636</id><type>DIRECTORY</type><name>9</name><mtime>1494614176596</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26637</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176594</mtime><atime>1494614176588</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751894</id><genstamp>11070</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26638</id><type>DIRECTORY</type><name>7</name><mtime>1494614176756</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26639</id><type>DIRECTORY</type><name>0</name><mtime>1494614176616</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26640</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176613</mtime><atime>1494614176606</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751895</id><genstamp>11071</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26641</id><type>DIRECTORY</type><name>1</name><mtime>1494614176631</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26642</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176629</mtime><atime>1494614176622</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751896</id><genstamp>11072</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26643</id><type>DIRECTORY</type><name>2</name><mtime>1494614176647</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26644</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176645</mtime><atime>1494614176638</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751897</id><genstamp>11073</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26645</id><type>DIRECTORY</type><name>3</name><mtime>1494614176662</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26646</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176660</mtime><atime>1494614176653</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751898</id><genstamp>11074</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26647</id><type>DIRECTORY</type><name>4</name><mtime>1494614176678</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26648</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176676</mtime><atime>1494614176669</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751899</id><genstamp>11075</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26649</id><type>DIRECTORY</type><name>5</name><mtime>1494614176703</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26650</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176701</mtime><atime>1494614176694</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751900</id><genstamp>11076</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26651</id><type>DIRECTORY</type><name>6</name><mtime>1494614176719</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26652</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176717</mtime><atime>1494614176710</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751901</id><genstamp>11077</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26653</id><type>DIRECTORY</type><name>7</name><mtime>1494614176736</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26654</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176734</mtime><atime>1494614176726</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751902</id><genstamp>11078</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26655</id><type>DIRECTORY</type><name>8</name><mtime>1494614176753</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26656</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176751</mtime><atime>1494614176743</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751903</id><genstamp>11079</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26657</id><type>DIRECTORY</type><name>9</name><mtime>1494614176770</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26658</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176768</mtime><atime>1494614176761</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751904</id><genstamp>11080</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26659</id><type>DIRECTORY</type><name>8</name><mtime>1494614176936</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26660</id><type>DIRECTORY</type><name>0</name><mtime>1494614176791</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26661</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176789</mtime><atime>1494614176782</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751905</id><genstamp>11081</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26662</id><type>DIRECTORY</type><name>1</name><mtime>1494614176822</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26663</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176820</mtime><atime>1494614176798</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751906</id><genstamp>11082</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26664</id><type>DIRECTORY</type><name>2</name><mtime>1494614176837</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26665</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176835</mtime><atime>1494614176828</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751907</id><genstamp>11083</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26666</id><type>DIRECTORY</type><name>3</name><mtime>1494614176853</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26667</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176851</mtime><atime>1494614176844</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751908</id><genstamp>11084</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26668</id><type>DIRECTORY</type><name>4</name><mtime>1494614176868</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26669</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176866</mtime><atime>1494614176859</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751909</id><genstamp>11085</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26670</id><type>DIRECTORY</type><name>5</name><mtime>1494614176886</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26671</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176883</mtime><atime>1494614176875</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751910</id><genstamp>11086</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26672</id><type>DIRECTORY</type><name>6</name><mtime>1494614176901</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26673</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176900</mtime><atime>1494614176892</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751911</id><genstamp>11087</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26674</id><type>DIRECTORY</type><name>7</name><mtime>1494614176917</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26675</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176915</mtime><atime>1494614176908</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751912</id><genstamp>11088</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26676</id><type>DIRECTORY</type><name>8</name><mtime>1494614176933</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26677</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176931</mtime><atime>1494614176924</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751913</id><genstamp>11089</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26678</id><type>DIRECTORY</type><name>9</name><mtime>1494614176949</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26679</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176947</mtime><atime>1494614176940</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751914</id><genstamp>11090</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26680</id><type>DIRECTORY</type><name>9</name><mtime>1494614177104</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26681</id><type>DIRECTORY</type><name>0</name><mtime>1494614176970</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26682</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176967</mtime><atime>1494614176961</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751915</id><genstamp>11091</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26683</id><type>DIRECTORY</type><name>1</name><mtime>1494614176984</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26684</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176982</mtime><atime>1494614176976</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751916</id><genstamp>11092</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26685</id><type>DIRECTORY</type><name>2</name><mtime>1494614176999</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26686</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614176998</mtime><atime>1494614176991</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751917</id><genstamp>11093</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26687</id><type>DIRECTORY</type><name>3</name><mtime>1494614177016</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26688</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177014</mtime><atime>1494614177007</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751918</id><genstamp>11094</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26689</id><type>DIRECTORY</type><name>4</name><mtime>1494614177031</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26690</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177029</mtime><atime>1494614177022</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751919</id><genstamp>11095</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26691</id><type>DIRECTORY</type><name>5</name><mtime>1494614177046</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26692</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177044</mtime><atime>1494614177037</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751920</id><genstamp>11096</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26693</id><type>DIRECTORY</type><name>6</name><mtime>1494614177063</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26694</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177061</mtime><atime>1494614177054</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751921</id><genstamp>11097</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26695</id><type>DIRECTORY</type><name>7</name><mtime>1494614177086</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26696</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177084</mtime><atime>1494614177077</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751922</id><genstamp>11098</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26697</id><type>DIRECTORY</type><name>8</name><mtime>1494614177101</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26698</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177099</mtime><atime>1494614177093</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751923</id><genstamp>11099</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-<inode><id>26699</id><type>DIRECTORY</type><name>9</name><mtime>1494614177117</mtime><permission>hdfs:hdfs:rwxr-x---</permission><nsquota>-1</nsquota><dsquota>-1</dsquota></inode>
+-<inode><id>26700</id><type>FILE</type><name>foo</name><replication>1</replication><mtime>1494614177115</mtime><atime>1494614177108</atime><perferredBlockSize>536870912</perferredBlockSize><permission>hdfs:hdfs:rw-r-----</permission><blocks><block><id>1073751924</id><genstamp>11100</genstamp><numBytes>4</numBytes></block>
+-</blocks>
+-</inode>
+-</INodeSection>
+-<INodeReferenceSection></INodeReferenceSection><SnapshotSection><snapshotCounter>0</snapshotCounter></SnapshotSection>
+-<INodeDirectorySection><directory><parent>16385</parent><inode>16387</inode><inode>16386</inode><inode>16388</inode></directory>
+-<directory><parent>16386</parent><inode>16390</inode></directory>
+-<directory><parent>16388</parent><inode>16389</inode></directory>
+-<directory><parent>16390</parent><inode>26491</inode><inode>26512</inode><inode>26533</inode><inode>26554</inode><inode>26575</inode><inode>26596</inode><inode>26617</inode><inode>26638</inode><inode>26659</inode><inode>26680</inode></directory>
+-<directory><parent>26491</parent><inode>26492</inode><inode>26494</inode><inode>26496</inode><inode>26498</inode><inode>26500</inode><inode>26502</inode><inode>26504</inode><inode>26506</inode><inode>26508</inode><inode>26510</inode></directory>
+-<directory><parent>26492</parent><inode>26493</inode></directory>
+-<directory><parent>26494</parent><inode>26495</inode></directory>
+-<directory><parent>26496</parent><inode>26497</inode></directory>
+-<directory><parent>26498</parent><inode>26499</inode></directory>
+-<directory><parent>26500</parent><inode>26501</inode></directory>
+-<directory><parent>26502</parent><inode>26503</inode></directory>
+-<directory><parent>26504</parent><inode>26505</inode></directory>
+-<directory><parent>26506</parent><inode>26507</inode></directory>
+-<directory><parent>26508</parent><inode>26509</inode></directory>
+-<directory><parent>26510</parent><inode>26511</inode></directory>
+-<directory><parent>26512</parent><inode>26513</inode><inode>26515</inode><inode>26517</inode><inode>26519</inode><inode>26521</inode><inode>26523</inode><inode>26525</inode><inode>26527</inode><inode>26529</inode><inode>26531</inode></directory>
+-<directory><parent>26513</parent><inode>26514</inode></directory>
+-<directory><parent>26515</parent><inode>26516</inode></directory>
+-<directory><parent>26517</parent><inode>26518</inode></directory>
+-<directory><parent>26519</parent><inode>26520</inode></directory>
+-<directory><parent>26521</parent><inode>26522</inode></directory>
+-<directory><parent>26523</parent><inode>26524</inode></directory>
+-<directory><parent>26525</parent><inode>26526</inode></directory>
+-<directory><parent>26527</parent><inode>26528</inode></directory>
+-<directory><parent>26529</parent><inode>26530</inode></directory>
+-<directory><parent>26531</parent><inode>26532</inode></directory>
+-<directory><parent>26533</parent><inode>26534</inode><inode>26536</inode><inode>26538</inode><inode>26540</inode><inode>26542</inode><inode>26544</inode><inode>26546</inode><inode>26548</inode><inode>26550</inode><inode>26552</inode></directory>
+-<directory><parent>26534</parent><inode>26535</inode></directory>
+-<directory><parent>26536</parent><inode>26537</inode></directory>
+-<directory><parent>26538</parent><inode>26539</inode></directory>
+-<directory><parent>26540</parent><inode>26541</inode></directory>
+-<directory><parent>26542</parent><inode>26543</inode></directory>
+-<directory><parent>26544</parent><inode>26545</inode></directory>
+-<directory><parent>26546</parent><inode>26547</inode></directory>
+-<directory><parent>26548</parent><inode>26549</inode></directory>
+-<directory><parent>26550</parent><inode>26551</inode></directory>
+-<directory><parent>26552</parent><inode>26553</inode></directory>
+-<directory><parent>26554</parent><inode>26555</inode><inode>26557</inode><inode>26559</inode><inode>26561</inode><inode>26563</inode><inode>26565</inode><inode>26567</inode><inode>26569</inode><inode>26571</inode><inode>26573</inode></directory>
+-<directory><parent>26555</parent><inode>26556</inode></directory>
+-<directory><parent>26557</parent><inode>26558</inode></directory>
+-<directory><parent>26559</parent><inode>26560</inode></directory>
+-<directory><parent>26561</parent><inode>26562</inode></directory>
+-<directory><parent>26563</parent><inode>26564</inode></directory>
+-<directory><parent>26565</parent><inode>26566</inode></directory>
+-<directory><parent>26567</parent><inode>26568</inode></directory>
+-<directory><parent>26569</parent><inode>26570</inode></directory>
+-<directory><parent>26571</parent><inode>26572</inode></directory>
+-<directory><parent>26573</parent><inode>26574</inode></directory>
+-<directory><parent>26575</parent><inode>26576</inode><inode>26578</inode><inode>26580</inode><inode>26582</inode><inode>26584</inode><inode>26586</inode><inode>26588</inode><inode>26590</inode><inode>26592</inode><inode>26594</inode></directory>
+-<directory><parent>26576</parent><inode>26577</inode></directory>
+-<directory><parent>26578</parent><inode>26579</inode></directory>
+-<directory><parent>26580</parent><inode>26581</inode></directory>
+-<directory><parent>26582</parent><inode>26583</inode></directory>
+-<directory><parent>26584</parent><inode>26585</inode></directory>
+-<directory><parent>26586</parent><inode>26587</inode></directory>
+-<directory><parent>26588</parent><inode>26589</inode></directory>
+-<directory><parent>26590</parent><inode>26591</inode></directory>
+-<directory><parent>26592</parent><inode>26593</inode></directory>
+-<directory><parent>26594</parent><inode>26595</inode></directory>
+-<directory><parent>26596</parent><inode>26597</inode><inode>26599</inode><inode>26601</inode><inode>26603</inode><inode>26605</inode><inode>26607</inode><inode>26609</inode><inode>26611</inode><inode>26613</inode><inode>26615</inode></directory>
+-<directory><parent>26597</parent><inode>26598</inode></directory>
+-<directory><parent>26599</parent><inode>26600</inode></directory>
+-<directory><parent>26601</parent><inode>26602</inode></directory>
+-<directory><parent>26603</parent><inode>26604</inode></directory>
+-<directory><parent>26605</parent><inode>26606</inode></directory>
+-<directory><parent>26607</parent><inode>26608</inode></directory>
+-<directory><parent>26609</parent><inode>26610</inode></directory>
+-<directory><parent>26611</parent><inode>26612</inode></directory>
+-<directory><parent>26613</parent><inode>26614</inode></directory>
+-<directory><parent>26615</parent><inode>26616</inode></directory>
+-<directory><parent>26617</parent><inode>26618</inode><inode>26620</inode><inode>26622</inode><inode>26624</inode><inode>26626</inode><inode>26628</inode><inode>26630</inode><inode>26632</inode><inode>26634</inode><inode>26636</inode></directory>
+-<directory><parent>26618</parent><inode>26619</inode></directory>
+-<directory><parent>26620</parent><inode>26621</inode></directory>
+-<directory><parent>26622</parent><inode>26623</inode></directory>
+-<directory><parent>26624</parent><inode>26625</inode></directory>
+-<directory><parent>26626</parent><inode>26627</inode></directory>
+-<directory><parent>26628</parent><inode>26629</inode></directory>
+-<directory><parent>26630</parent><inode>26631</inode></directory>
+-<directory><parent>26632</parent><inode>26633</inode></directory>
+-<directory><parent>26634</parent><inode>26635</inode></directory>
+-<directory><parent>26636</parent><inode>26637</inode></directory>
+-<directory><parent>26638</parent><inode>26639</inode><inode>26641</inode><inode>26643</inode><inode>26645</inode><inode>26647</inode><inode>26649</inode><inode>26651</inode><inode>26653</inode><inode>26655</inode><inode>26657</inode></directory>
+-<directory><parent>26639</parent><inode>26640</inode></directory>
+-<directory><parent>26641</parent><inode>26642</inode></directory>
+-<directory><parent>26643</parent><inode>26644</inode></directory>
+-<directory><parent>26645</parent><inode>26646</inode></directory>
+-<directory><parent>26647</parent><inode>26648</inode></directory>
+-<directory><parent>26649</parent><inode>26650</inode></directory>
+-<directory><parent>26651</parent><inode>26652</inode></directory>
+-<directory><parent>26653</parent><inode>26654</inode></directory>
+-<directory><parent>26655</parent><inode>26656</inode></directory>
+-<directory><parent>26657</parent><inode>26658</inode></directory>
+-<directory><parent>26659</parent><inode>26660</inode><inode>26662</inode><inode>26664</inode><inode>26666</inode><inode>26668</inode><inode>26670</inode><inode>26672</inode><inode>26674</inode><inode>26676</inode><inode>26678</inode></directory>
+-<directory><parent>26660</parent><inode>26661</inode></directory>
+-<directory><parent>26662</parent><inode>26663</inode></directory>
+-<directory><parent>26664</parent><inode>26665</inode></directory>
+-<directory><parent>26666</parent><inode>26667</inode></directory>
+-<directory><parent>26668</parent><inode>26669</inode></directory>
+-<directory><parent>26670</parent><inode>26671</inode></directory>
+-<directory><parent>26672</parent><inode>26673</inode></directory>
+-<directory><parent>26674</parent><inode>26675</inode></directory>
+-<directory><parent>26676</parent><inode>26677</inode></directory>
+-<directory><parent>26678</parent><inode>26679</inode></directory>
+-<directory><parent>26680</parent><inode>26681</inode><inode>26683</inode><inode>26685</inode><inode>26687</inode><inode>26689</inode><inode>26691</inode><inode>26693</inode><inode>26695</inode><inode>26697</inode><inode>26699</inode></directory>
+-<directory><parent>26681</parent><inode>26682</inode></directory>
+-<directory><parent>26683</parent><inode>26684</inode></directory>
+-<directory><parent>26685</parent><inode>26686</inode></directory>
+-<directory><parent>26687</parent><inode>26688</inode></directory>
+-<directory><parent>26689</parent><inode>26690</inode></directory>
+-<directory><parent>26691</parent><inode>26692</inode></directory>
+-<directory><parent>26693</parent><inode>26694</inode></directory>
+-<directory><parent>26695</parent><inode>26696</inode></directory>
+-<directory><parent>26697</parent><inode>26698</inode></directory>
+-<directory><parent>26699</parent><inode>26700</inode></directory>
+-</INodeDirectorySection>
+-<FileUnderConstructionSection></FileUnderConstructionSection>
+-<SnapshotDiffSection><diff><inodeid>16385</inodeid></diff></SnapshotDiffSection>
+-<SecretManagerSection><currentId>0</currentId><tokenSequenceNumber>0</tokenSequenceNumber></SecretManagerSection><CacheManagerSection><nextDirectiveId>1</nextDirectiveId></CacheManagerSection>
+-</fsimage>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/pom.xml
+deleted file mode 100644
+index ea884927791..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/pom.xml
++++ /dev/null
+@@ -1,128 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project-dist</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../../hadoop-project-dist</relativePath>
+-  </parent>
+-  <artifactId>hadoop-dynamometer-dist</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Dynamometer Dist</description>
+-  <name>Apache Hadoop Dynamometer Dist</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.component>tools</hadoop.component>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-dynamometer-blockgen</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-dynamometer-workload</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-dynamometer-infra</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-deploy-plugin</artifactId>
+-        <configuration>
+-          <skip>true</skip>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>dist</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <build>
+-        <plugins>
+-         <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-assembly-plugin</artifactId>
+-            <dependencies>
+-              <dependency>
+-                <groupId>org.apache.hadoop</groupId>
+-                <artifactId>hadoop-assemblies</artifactId>
+-                <version>${project.version}</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <id>dist</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>single</goal>
+-                </goals>
+-                <configuration>
+-                  <appendAssemblyId>false</appendAssemblyId>
+-                  <attach>false</attach>
+-                  <finalName>${project.artifactId}-${project.version}</finalName>
+-                  <descriptorRefs>
+-                    <descriptorRef>hadoop-dynamometer</descriptorRef>
+-                  </descriptorRefs>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-          <plugin>
+-          <artifactId>maven-dependency-plugin</artifactId>
+-          <executions>
+-          <execution>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>copy-dependencies</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/tools/lib</outputDirectory>
+-            </configuration>
+-          </execution>
+-          </executions>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
+deleted file mode 100644
+index 7a4379b1570..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/pom.xml
++++ /dev/null
+@@ -1,216 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-dynamometer-infra</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Dynamometer Cluster Simulator</description>
+-  <name>Apache Hadoop Dynamometer Cluster Simulator</name>
+-  <packaging>jar</packaging>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>commons-cli</groupId>
+-      <artifactId>commons-cli</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.commons</groupId>
+-      <artifactId>commons-lang3</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <!-- JUnit is required by MiniDFSCluster, which is used outside of tests -->
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <type>test-jar</type>
+-      <scope>compile</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-dynamometer-workload</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-dynamometer-workload</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-source-plugin</artifactId>
+-        <configuration>
+-          <attach>true</attach>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/test/resources/blocks/dn1-a-0-r-00001</exclude>
+-            <exclude>src/test/resources/blocks/dn0-a-0-r-00000</exclude>
+-            <exclude>src/test/resources/blocks/dn2-a-0-r-00002</exclude>
+-            <exclude>src/test/resources/hadoop_3_1/fsimage_0000000000000061740.md5</exclude>
+-            <exclude>src/test/resources/hadoop_3_1/VERSION</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+-          <environmentVariables>
+-            <JAVA_HOME>${java.home}</JAVA_HOME>
+-          </environmentVariables>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>dist</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-assembly-plugin</artifactId>
+-            <dependencies>
+-              <dependency>
+-                <groupId>org.apache.hadoop</groupId>
+-                <artifactId>hadoop-assemblies</artifactId>
+-                <version>${project.version}</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <id>dist</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>single</goal>
+-                </goals>
+-                <configuration>
+-                  <appendAssemblyId>false</appendAssemblyId>
+-                  <attach>false</attach>
+-                  <finalName>${project.artifactId}-${project.version}</finalName>
+-                  <descriptorRefs>
+-                    <descriptorRef>hadoop-dynamometer-infra</descriptorRef>
+-                  </descriptorRefs>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-          <execution>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>copy-dependencies</goal>
+-            </goals>
+-            <configuration>
+-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+-              <includeScope>runtime</includeScope>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/create-slim-hadoop-tar.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/create-slim-hadoop-tar.sh
+deleted file mode 100755
+index 12669a33dd0..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/create-slim-hadoop-tar.sh
++++ /dev/null
+@@ -1,53 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if [[ "$#" != 1 ]] || [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]]; then
+-  echo "Usage: ./create-slim-hadoop-tar.sh path-to-hadoop-tar"
+-  echo "  Takes path-to-hadoop-tar as a hadoop.tar.gz binary distribution"
+-  echo "  and removes portions of it that are unnecessary for dynamometer"
+-  echo "  (e.g. unrelated components like YARN)."
+-  echo "  This overwrites the original file."
+-  echo "  This is idempotent; you can safely rerun it on the same tar."
+-  exit 1
+-fi
+-
+-hadoopTar="$1"
+-
+-# ls output is intended for human consumption
+-# shellcheck disable=SC2012
+-echo "Slimming $hadoopTar; size before is $(ls -lh "$hadoopTar" | awk '{ print $5 }')"
+-
+-hadoopTarTmp="$hadoopTar.temporary"
+-
+-mkdir -p "$hadoopTarTmp"
+-
+-tar xzf "$hadoopTar" -C "$hadoopTarTmp"
+-baseDir="$(find -H "$hadoopTarTmp" -maxdepth 1 -mindepth 1 -type d | head -n 1)" # Should only be one subdir
+-hadoopShare="$baseDir/share/hadoop"
+-
+-# Remove unnecessary files
+-rm -rf "${baseDir}/share/doc" "${hadoopShare}/mapreduce ${hadoopShare}/yarn" \
+-       "${hadoopShare}/kms" "${hadoopShare}/tools" "${hadoopShare}/httpfs" \
+-       "${hadoopShare}"/*/sources "${hadoopShare}"/*/jdiff
+-
+-tar czf "$hadoopTarTmp.tar.gz" -C "$hadoopTarTmp" .
+-rm -rf "$hadoopTarTmp"
+-mv -f "$hadoopTarTmp.tar.gz" "$hadoopTar"
+-
+-# ls output is intended for human consumption
+-# shellcheck disable=SC2012
+-echo "Finished; size after is $(ls -lh "$hadoopTar" | awk '{ print $5 }')"
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/parse-metrics.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/parse-metrics.sh
+deleted file mode 100755
+index 1ea94c2edab..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/parse-metrics.sh
++++ /dev/null
+@@ -1,84 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# This script is used for fetching the standard Hadoop metrics which the
+-# Dynamometer NameNode generates during its execution (standard Hadoop metrics).
+-# Those metrics are uploaded onto HDFS when the Dynamometer application completes.
+-# This script will download them locally and parse out the specified metric for
+-# the given time period. This is useful to, for example, isolate only the metrics
+-# produced during the workload replay portion of a job. For this, specify startTimeMs
+-# as the start time of the workload job (which it logs during execution) and
+-# periodMinutes the period (in minutes) of the replay.
+-
+-if [ $# -lt 5 ]; then
+-  echo "Usage:"
+-  echo "./parse-metrics.sh applicationID outputFileName startTimeMs periodMinutes metricName [ context ] [ isCounter ]"
+-  echo "If no file namenode_metrics_{applicationID} is present in the working directory,"
+-  echo "attempts to download one from HDFS for applicationID. Filters values"
+-  echo "for the specified metric, during the range"
+-  echo "(startTimeMs, startTimeMs + periodMinutes) optionally filtering on the context as well"
+-  echo "(which is just applied as a regex search across the metric line output)"
+-  echo "and outputs CSV pairs of (seconds_since_start_time,value)."
+-  echo "If isCounter is true, treats the metrics as a counter and outputs per-second rate values."
+-  exit 1
+-fi
+-
+-appId="$1"
+-output="$2"
+-start_ts="$3"
+-period_minutes="$4"
+-metric="$5"
+-context="$6"
+-is_counter="$7"
+-
+-localFile="namenode_metrics_$appId"
+-if [ ! -f "$localFile" ]; then
+-  remoteFile=".dynamometer/$appId/namenode_metrics"
+-  echo "Downloading file from HDFS: $remoteFile"
+-  if ! hdfs dfs -copyToLocal "$remoteFile" "$localFile"; then
+-    exit 1
+-  fi
+-fi
+-
+-read -d '' -r awk_script <<'EOF'
+-BEGIN {
+-    metric_regex="[[:space:]]"metric"=([[:digit:].E]+)";
+-    end_ts=start_ts+(period_minutes*60*1000)
+-    last_val=0
+-    last_ts=start_ts
+-}
+-"true" ~ is_counter && $0 ~ metric_regex && $0 ~ context && $1 < start_ts {
+-    match($0, metric_regex, val_arr);
+-    last_val=val_arr[1]
+-    last_ts=$1
+-}
+-$0 ~ metric_regex && $0 ~ context && $1 >= start_ts && $1 <= end_ts {
+-    match($0, metric_regex, val_arr);
+-    val=val_arr[1]
+-    if (is_counter == "true") {
+-      tmp=val
+-      val=val-last_val
+-      val=val/(($1-last_ts)/1000)
+-      last_ts=$1
+-      last_val=tmp
+-    }
+-    printf("%.0f,%.6f\n", ($0-start_ts)/1000, val)
+-}
+-EOF
+-
+-gawk -v metric="$metric" -v context="$context" -v start_ts="$start_ts" \
+-  -v period_minutes="$period_minutes" -v is_counter="$is_counter" -v OFS="," "$awk_script" "$localFile" > "$output"
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/start-dynamometer-cluster.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/start-dynamometer-cluster.sh
+deleted file mode 100755
+index 44fcb85eff6..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/start-dynamometer-cluster.sh
++++ /dev/null
+@@ -1,41 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# This script simply passes its arguments along to the infrastructure / cluster
+-# driver after finding a hadoop command in PATH/HADOOP_COMMON_HOME/HADOOP_HOME
+-# (searching in that order).
+-
+-if type hadoop &> /dev/null; then
+-  hadoop_cmd="hadoop"
+-elif type "$HADOOP_COMMON_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_COMMON_HOME/bin/hadoop"
+-elif type "$HADOOP_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_HOME/bin/hadoop"
+-else
+-  echo "Unable to find a valid hadoop command to execute; exiting."
+-  exit 1
+-fi
+-
+-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
+-
+-for f in ${script_pwd}/lib/*.jar; do
+-  # Skip adding the infra JAR since it is added by the `hadoop jar` command
+-  if [[ "$f" != *"dynamometer-infra-"* ]]; then
+-    export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
+-  fi
+-done
+-"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-infra-*.jar org.apache.hadoop.tools.dynamometer.Client "$@"
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/upload-fsimage.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/upload-fsimage.sh
+deleted file mode 100755
+index 8308adbfef6..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/bash/upload-fsimage.sh
++++ /dev/null
+@@ -1,84 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if [ $# -lt 2 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+-  echo "Usage: ./upload-fsimage.sh image-txid remote-dir [ name-dir ]"
+-  echo "       Takes the steps necessary to place all necessary components for"
+-  echo "       the fsimage with the specified transaction ID (leading 0s not"
+-  echo "       required) onto HDFS. This includes the fsimage file itself,"
+-  echo "       the MD5 hash, the VERSION file, and the XML version of the"
+-  echo "       fsimage file, which will be temporarily generated by this script"
+-  echo "       (into \$TMPDIR if specified, else /tmp)."
+-  echo "       These files will be uploaded to remote_dir (created if it does"
+-  echo "       not yet exist). This is the same directory that should be passed"
+-  echo "       to the Client as fs_image_dir."
+-  echo "       If name-dir is specified, looks for fsimage files under"
+-  echo "       \${name-dir}/current. Otherwise, looks in the current directory."
+-  exit 1
+-fi
+-image_txid="$1"
+-remote_dir="$2"
+-if [[ $# -ge 3 ]]; then
+-  name_dir="$3/current"
+-else
+-  name_dir="$(pwd)"
+-fi
+-
+-image_file_count="$(find -H "${name_dir}" -maxdepth 1 -mindepth 1 -name "fsimage_*$image_txid" -type f | wc -l)"
+-if [[ "$image_file_count" != 1 ]]; then
+-  echo "Error; found $image_file_count matching fsimage files."
+-  exit 1
+-fi
+-image_file="$(find -H "${name_dir}" -maxdepth 1 -mindepth 1 -name "fsimage_*$image_txid" -type f)"
+-image_file_name="$(basename "${image_file}")"
+-echo "Using fsimage: $image_file_name"
+-image_file_md5="${image_file}.md5"
+-version_file="${name_dir}/VERSION"
+-
+-if ! [[ -f "$image_file_md5" ]]; then
+-  echo "Unable to find MD5 file for fsimage; looked at $image_file_md5"
+-  exit 1
+-fi
+-if ! [[ -f "$version_file" ]]; then
+-  echo "Unable to find VERSION file; looked at $version_file"
+-  exit 1
+-fi
+-
+-if ! tmp_dir="$(mktemp -d)"; then
+-  echo "mktemp failed to make a temporary directory; exiting"
+-  exit 1
+-fi
+-image_file_xml="${tmp_dir}/${image_file_name}.xml"
+-echo "Creating temporary XML fsimage file at $image_file_xml"
+-hdfs oiv -p XML -i "$image_file" -o "$image_file_xml"
+-echo "Created temporary XML fsimage file"
+-
+-if ! hdfs dfs -mkdir -p "$remote_dir"; then
+-  echo "Unable to create ${remote_dir}; exiting"
+-  rm -rf "${tmp_dir}"
+-  exit 1
+-fi
+-for file in ${image_file} ${image_file_xml} ${image_file_md5} ${version_file}; do
+-  echo "Uploading ${file}..."
+-  if ! hdfs dfs -copyFromLocal -f "$file" "${remote_dir}"; then
+-    echo "Error while uploading ${file}; exiting"
+-      rm -rf "${tmp_dir}"
+-    exit 1
+-  fi
+-done
+-rm -rf "${tmp_dir}"
+-echo "Complete!"
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AMOptions.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AMOptions.java
+deleted file mode 100644
+index b7726e4d733..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AMOptions.java
++++ /dev/null
+@@ -1,317 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.Options;
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * Options supplied to the Client which are then passed through to the
+- * ApplicationMaster.
+- */
+-final class AMOptions {
+-
+-  public static final String NAMENODE_MEMORY_MB_ARG = "namenode_memory_mb";
+-  public static final String NAMENODE_MEMORY_MB_DEFAULT = "2048";
+-  public static final String NAMENODE_VCORES_ARG = "namenode_vcores";
+-  public static final String NAMENODE_VCORES_DEFAULT = "1";
+-  public static final String NAMENODE_NODELABEL_ARG = "namenode_nodelabel";
+-  public static final String NAMENODE_ARGS_ARG = "namenode_args";
+-  public static final String DATANODE_MEMORY_MB_ARG = "datanode_memory_mb";
+-  public static final String DATANODE_MEMORY_MB_DEFAULT = "2048";
+-  public static final String DATANODE_VCORES_ARG = "datanode_vcores";
+-  public static final String DATANODE_VCORES_DEFAULT = "1";
+-  public static final String DATANODE_NODELABEL_ARG = "datanode_nodelabel";
+-  public static final String DATANODE_ARGS_ARG = "datanode_args";
+-  public static final String NAMENODE_METRICS_PERIOD_ARG =
+-      "namenode_metrics_period";
+-  public static final String NAMENODE_METRICS_PERIOD_DEFAULT = "60";
+-  public static final String SHELL_ENV_ARG = "shell_env";
+-  public static final String DATANODES_PER_CLUSTER_ARG =
+-      "datanodes_per_cluster";
+-  public static final String DATANODES_PER_CLUSTER_DEFAULT = "1";
+-  public static final String DATANODE_LAUNCH_DELAY_ARG =
+-      "datanode_launch_delay";
+-  public static final String DATANODE_LAUNCH_DELAY_DEFAULT = "0s";
+-  public static final String NAMENODE_NAME_DIR_ARG = "namenode_name_dir";
+-  public static final String NAMENODE_EDITS_DIR_ARG = "namenode_edits_dir";
+-
+-  private final int datanodeMemoryMB;
+-  private final int datanodeVirtualCores;
+-  private final String datanodeArgs;
+-  private final String datanodeNodeLabelExpression;
+-  private final int datanodesPerCluster;
+-  private final String datanodeLaunchDelay;
+-  private final int namenodeMemoryMB;
+-  private final int namenodeVirtualCores;
+-  private final String namenodeArgs;
+-  private final String namenodeNodeLabelExpression;
+-  private final int namenodeMetricsPeriod;
+-  private final String namenodeNameDir;
+-  private final String namenodeEditsDir;
+-  // Original shellEnv as passed in through arguments
+-  private final Map<String, String> originalShellEnv;
+-  // Extended shellEnv including custom environment variables
+-  private final Map<String, String> shellEnv;
+-
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  private AMOptions(int datanodeMemoryMB, int datanodeVirtualCores,
+-      String datanodeArgs, String datanodeNodeLabelExpression,
+-      int datanodesPerCluster, String datanodeLaunchDelay, int namenodeMemoryMB,
+-      int namenodeVirtualCores, String namenodeArgs,
+-      String namenodeNodeLabelExpression, int namenodeMetricsPeriod,
+-      String namenodeNameDir, String namenodeEditsDir,
+-      Map<String, String> shellEnv) {
+-    this.datanodeMemoryMB = datanodeMemoryMB;
+-    this.datanodeVirtualCores = datanodeVirtualCores;
+-    this.datanodeArgs = datanodeArgs;
+-    this.datanodeNodeLabelExpression = datanodeNodeLabelExpression;
+-    this.datanodesPerCluster = datanodesPerCluster;
+-    this.datanodeLaunchDelay = datanodeLaunchDelay;
+-    this.namenodeMemoryMB = namenodeMemoryMB;
+-    this.namenodeVirtualCores = namenodeVirtualCores;
+-    this.namenodeArgs = namenodeArgs;
+-    this.namenodeNodeLabelExpression = namenodeNodeLabelExpression;
+-    this.namenodeMetricsPeriod = namenodeMetricsPeriod;
+-    this.namenodeNameDir = namenodeNameDir;
+-    this.namenodeEditsDir = namenodeEditsDir;
+-    this.originalShellEnv = shellEnv;
+-    this.shellEnv = new HashMap<>(this.originalShellEnv);
+-    this.shellEnv.put(DynoConstants.NN_ADDITIONAL_ARGS_ENV, this.namenodeArgs);
+-    this.shellEnv.put(DynoConstants.DN_ADDITIONAL_ARGS_ENV, this.datanodeArgs);
+-    this.shellEnv.put(DynoConstants.NN_FILE_METRIC_PERIOD_ENV,
+-        String.valueOf(this.namenodeMetricsPeriod));
+-    this.shellEnv.put(DynoConstants.NN_NAME_DIR_ENV, this.namenodeNameDir);
+-    this.shellEnv.put(DynoConstants.NN_EDITS_DIR_ENV, this.namenodeEditsDir);
+-  }
+-
+-  /**
+-   * Verifies that arguments are valid; throws IllegalArgumentException if not.
+-   */
+-  void verify(long maxMemory, int maxVcores) throws IllegalArgumentException {
+-    Preconditions.checkArgument(
+-        datanodeMemoryMB > 0 && datanodeMemoryMB <= maxMemory,
+-        "datanodeMemoryMB (%s) must be between 0 and %s", datanodeMemoryMB,
+-        maxMemory);
+-    Preconditions.checkArgument(
+-        datanodeVirtualCores > 0 && datanodeVirtualCores <= maxVcores,
+-        "datanodeVirtualCores (%s) must be between 0 and %s",
+-        datanodeVirtualCores, maxVcores);
+-    Preconditions.checkArgument(
+-        namenodeMemoryMB > 0 && namenodeMemoryMB <= maxMemory,
+-        "namenodeMemoryMB (%s) must be between 0 and %s", namenodeMemoryMB,
+-        maxMemory);
+-    Preconditions.checkArgument(
+-        namenodeVirtualCores > 0 && namenodeVirtualCores <= maxVcores,
+-        "namenodeVirtualCores (%s) must be between 0 and %s",
+-        namenodeVirtualCores, maxVcores);
+-    Preconditions.checkArgument(datanodesPerCluster > 0,
+-        "datanodesPerCluster (%s) must be > 0", datanodesPerCluster);
+-  }
+-
+-  /**
+-   * Same as {@link #verify(long, int)} but does not set a max.
+-   */
+-  void verify() throws IllegalArgumentException {
+-    verify(Integer.MAX_VALUE, Integer.MAX_VALUE);
+-  }
+-
+-  void addToVargs(List<String> vargs) {
+-    vargs.add("--" + DATANODE_MEMORY_MB_ARG + " " + datanodeMemoryMB);
+-    vargs.add("--" + DATANODE_VCORES_ARG + " " + datanodeVirtualCores);
+-    addStringValToVargs(vargs, DATANODE_ARGS_ARG, datanodeArgs);
+-    addStringValToVargs(vargs, DATANODE_NODELABEL_ARG,
+-        datanodeNodeLabelExpression);
+-    vargs.add("--" + DATANODES_PER_CLUSTER_ARG + " " + datanodesPerCluster);
+-    vargs.add("--" + DATANODE_LAUNCH_DELAY_ARG + " " + datanodeLaunchDelay);
+-    vargs.add("--" + NAMENODE_MEMORY_MB_ARG + " " + namenodeMemoryMB);
+-    vargs.add("--" + NAMENODE_VCORES_ARG + " " + namenodeVirtualCores);
+-    addStringValToVargs(vargs, NAMENODE_ARGS_ARG, namenodeArgs);
+-    addStringValToVargs(vargs, NAMENODE_NODELABEL_ARG,
+-        namenodeNodeLabelExpression);
+-    vargs.add("--" + NAMENODE_METRICS_PERIOD_ARG + " " + namenodeMetricsPeriod);
+-    addStringValToVargs(vargs, NAMENODE_NAME_DIR_ARG, namenodeNameDir);
+-    addStringValToVargs(vargs, NAMENODE_EDITS_DIR_ARG, namenodeEditsDir);
+-    for (Map.Entry<String, String> entry : originalShellEnv.entrySet()) {
+-      vargs.add(
+-          "--" + SHELL_ENV_ARG + " " + entry.getKey() + "=" + entry.getValue());
+-    }
+-  }
+-
+-  private void addStringValToVargs(List<String> vargs, String optionName,
+-      String val) {
+-    if (!val.isEmpty()) {
+-      vargs.add("--" + optionName + " \\\"" + val + "\\\"");
+-    }
+-  }
+-
+-  int getDataNodeMemoryMB() {
+-    return datanodeMemoryMB;
+-  }
+-
+-  int getDataNodeVirtualCores() {
+-    return datanodeVirtualCores;
+-  }
+-
+-  String getDataNodeNodeLabelExpression() {
+-    return datanodeNodeLabelExpression;
+-  }
+-
+-  int getDataNodesPerCluster() {
+-    return datanodesPerCluster;
+-  }
+-
+-  long getDataNodeLaunchDelaySec() {
+-    // Leverage the human-readable time parsing capabilities of Configuration
+-    String tmpConfKey = "___temp_config_property___";
+-    Configuration tmpConf = new Configuration();
+-    tmpConf.set(tmpConfKey, datanodeLaunchDelay);
+-    return tmpConf.getTimeDuration(tmpConfKey, 0, TimeUnit.SECONDS);
+-  }
+-
+-  int getNameNodeMemoryMB() {
+-    return namenodeMemoryMB;
+-  }
+-
+-  int getNameNodeVirtualCores() {
+-    return namenodeVirtualCores;
+-  }
+-
+-  String getNameNodeNodeLabelExpression() {
+-    return namenodeNodeLabelExpression;
+-  }
+-
+-  Map<String, String> getShellEnv() {
+-    return shellEnv;
+-  }
+-
+-  /**
+-   * Set all of the command line options relevant to this class into the passed
+-   * {@link Options}.
+-   *
+-   * @param opts
+-   *          Where to set the command line options.
+-   */
+-  static void setOptions(Options opts) {
+-    opts.addOption(SHELL_ENV_ARG, true,
+-        "Environment for shell script. Specified as env_key=env_val pairs");
+-    opts.addOption(NAMENODE_MEMORY_MB_ARG, true,
+-        "Amount of memory in MB to be requested to run the NN (default "
+-            + NAMENODE_MEMORY_MB_DEFAULT + "). "
+-            + "Ignored unless the NameNode is run within YARN.");
+-    opts.addOption(NAMENODE_VCORES_ARG, true,
+-        "Amount of virtual cores to be requested to run the NN (default "
+-            + NAMENODE_VCORES_DEFAULT + "). "
+-            + "Ignored unless the NameNode is run within YARN.");
+-    opts.addOption(NAMENODE_ARGS_ARG, true,
+-        "Additional arguments to add when starting the NameNode. "
+-            + "Ignored unless the NameNode is run within YARN.");
+-    opts.addOption(NAMENODE_NODELABEL_ARG, true,
+-        "The node label to specify for the container to use to "
+-            + "run the NameNode.");
+-    opts.addOption(NAMENODE_METRICS_PERIOD_ARG, true,
+-        "The period in seconds for the NameNode's metrics to be emitted to "
+-            + "file; if <=0, disables this functionality. Otherwise, a "
+-            + "metrics file will be stored in the container logs for the "
+-            + "NameNode (default " + NAMENODE_METRICS_PERIOD_DEFAULT + ").");
+-    opts.addOption(NAMENODE_NAME_DIR_ARG, true,
+-        "The directory to use for the NameNode's name data directory. "
+-            + "If not specified, a location  within the container's working "
+-            + "directory will be used.");
+-    opts.addOption(NAMENODE_EDITS_DIR_ARG, true,
+-        "The directory to use for the NameNode's edits directory. "
+-            + "If not specified, a location  within the container's working "
+-            + "directory will be used.");
+-    opts.addOption(DATANODE_MEMORY_MB_ARG, true,
+-        "Amount of memory in MB to be requested to run the DNs (default "
+-            + DATANODE_MEMORY_MB_DEFAULT + ")");
+-    opts.addOption(DATANODE_VCORES_ARG, true,
+-        "Amount of virtual cores to be requested to run the DNs (default "
+-            + DATANODE_VCORES_DEFAULT + ")");
+-    opts.addOption(DATANODE_ARGS_ARG, true,
+-        "Additional arguments to add when starting the DataNodes.");
+-    opts.addOption(DATANODE_NODELABEL_ARG, true, "The node label to specify "
+-        + "for the container to use to run the DataNode.");
+-    opts.addOption(DATANODES_PER_CLUSTER_ARG, true,
+-        "How many simulated DataNodes to run within each YARN container "
+-            + "(default " + DATANODES_PER_CLUSTER_DEFAULT + ")");
+-    opts.addOption(DATANODE_LAUNCH_DELAY_ARG, true,
+-        "The period over which to launch the DataNodes; this will "
+-            + "be used as the maximum delay and each DataNode container will "
+-            + "be launched with some random delay less than  this value. "
+-            + "Accepts human-readable time durations (e.g. 10s, 1m) (default "
+-            + DATANODE_LAUNCH_DELAY_DEFAULT + ")");
+-
+-    opts.addOption("help", false, "Print usage");
+-  }
+-
+-  /**
+-   * Initialize an {@code AMOptions} from a command line parser.
+-   *
+-   * @param cliParser
+-   *          Where to initialize from.
+-   * @return A new {@code AMOptions} filled out with options from the parser.
+-   */
+-  static AMOptions initFromParser(CommandLine cliParser) {
+-    Map<String, String> originalShellEnv = new HashMap<>();
+-    if (cliParser.hasOption(SHELL_ENV_ARG)) {
+-      for (String env : cliParser.getOptionValues(SHELL_ENV_ARG)) {
+-        String trimmed = env.trim();
+-        int index = trimmed.indexOf('=');
+-        if (index == -1) {
+-          originalShellEnv.put(trimmed, "");
+-          continue;
+-        }
+-        String key = trimmed.substring(0, index);
+-        String val = "";
+-        if (index < (trimmed.length() - 1)) {
+-          val = trimmed.substring(index + 1);
+-        }
+-        originalShellEnv.put(key, val);
+-      }
+-    }
+-    return new AMOptions(
+-        Integer.parseInt(cliParser.getOptionValue(DATANODE_MEMORY_MB_ARG,
+-            DATANODE_MEMORY_MB_DEFAULT)),
+-        Integer.parseInt(cliParser.getOptionValue(DATANODE_VCORES_ARG,
+-            DATANODE_VCORES_DEFAULT)),
+-        cliParser.getOptionValue(DATANODE_ARGS_ARG, ""),
+-        cliParser.getOptionValue(DATANODE_NODELABEL_ARG, ""),
+-        Integer.parseInt(cliParser.getOptionValue(DATANODES_PER_CLUSTER_ARG,
+-            DATANODES_PER_CLUSTER_DEFAULT)),
+-        cliParser.getOptionValue(DATANODE_LAUNCH_DELAY_ARG,
+-            DATANODE_LAUNCH_DELAY_DEFAULT),
+-        Integer.parseInt(cliParser.getOptionValue(NAMENODE_MEMORY_MB_ARG,
+-            NAMENODE_MEMORY_MB_DEFAULT)),
+-        Integer.parseInt(cliParser.getOptionValue(NAMENODE_VCORES_ARG,
+-            NAMENODE_VCORES_DEFAULT)),
+-        cliParser.getOptionValue(NAMENODE_ARGS_ARG, ""),
+-        cliParser.getOptionValue(NAMENODE_NODELABEL_ARG, ""),
+-        Integer.parseInt(cliParser.getOptionValue(NAMENODE_METRICS_PERIOD_ARG,
+-            NAMENODE_METRICS_PERIOD_DEFAULT)),
+-        cliParser.getOptionValue(NAMENODE_NAME_DIR_ARG, ""),
+-        cliParser.getOptionValue(NAMENODE_EDITS_DIR_ARG, ""), originalShellEnv);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java
+deleted file mode 100644
+index 14f52ac2b28..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/AllowAllImpersonationProvider.java
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import java.net.InetAddress;
+-
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.ImpersonationProvider;
+-
+-/**
+- * An {@link ImpersonationProvider} that indiscriminately allows all users to
+- * proxy as any other user.
+- */
+-public class AllowAllImpersonationProvider extends Configured
+-    implements ImpersonationProvider {
+-
+-  public void init(String configurationPrefix) {
+-    // Do nothing
+-  }
+-
+-  public void authorize(UserGroupInformation user, InetAddress remoteAddress) {
+-    // Do nothing
+-  }
+-
+-  // Although this API was removed from the interface by HADOOP-17367, we need
+-  // to keep it here because TestDynamometerInfra uses an old hadoop binary.
+-  public void authorize(UserGroupInformation user, String remoteAddress) {
+-    // Do nothing
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/ApplicationMaster.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/ApplicationMaster.java
+deleted file mode 100644
+index e44f811f0db..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/ApplicationMaster.java
++++ /dev/null
+@@ -1,889 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.thirdparty.com.google.common.primitives.Ints;
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Optional;
+-import java.util.Properties;
+-import java.util.Random;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.atomic.AtomicInteger;
+-
+-import java.util.function.Supplier;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
+-import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.NodeReport;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.api.records.UpdatedContainer;
+-import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.NMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.impl.NMClientAsyncImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * The ApplicationMaster for Dynamometer. This will launch DataNodes in YARN
+- * containers. If the RPC address of a NameNode is specified, it will configure
+- * the DataNodes to talk to that NameNode. Else, a NameNode will be launched as
+- * part of this YARN application. This does not implement any retry/failure
+- * handling.
+- * TODO: Add proper retry/failure handling
+- * <p>
+- * The AM will persist until it has run for a period of time equal to the
+- * timeout specified or until the application is killed.
+- * <p>
+- * If the NameNode is launched internally, it will upload some information
+- * onto the remote HDFS instance (i.e., the default FileSystem) about its
+- * hostname and ports. This is in the location determined by the
+- * {@link DynoConstants#DYNAMOMETER_STORAGE_DIR} and
+- * {@link DynoConstants#NN_INFO_FILE_NAME} constants and is in the
+- * {@link Properties} file format. This is consumed by this AM as well as the
+- * {@link Client} to determine how to contact the NameNode.
+- * <p>
+- * Information about the location of the DataNodes is logged by the AM.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class ApplicationMaster {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ApplicationMaster.class);
+-  private static final Random RAND = new Random();
+-
+-  // Configuration
+-  private Configuration conf;
+-
+-  // Handle to communicate with the Resource Manager
+-  private AMRMClientAsync<ContainerRequest> amRMClient;
+-
+-  // Handle to communicate with the Node Manager
+-  private NMClientAsync nmClientAsync;
+-  // Listen to process the response from the Node Manager
+-  private NMCallbackHandler containerListener;
+-  // The collection of options passed in via the Client
+-  private AMOptions amOptions;
+-
+-  private List<LocalResource> blockListFiles;
+-  private int numTotalDataNodes;
+-  private int numTotalDataNodeContainers;
+-
+-  // Counter for completed datanodes (complete denotes successful or failed )
+-  private AtomicInteger numCompletedDataNodeContainers = new AtomicInteger();
+-  // Allocated datanode count so that we know how many datanodes has the RM
+-  // allocated to us
+-  private AtomicInteger numAllocatedDataNodeContainers = new AtomicInteger();
+-  // Count of failed datanodes
+-  private AtomicInteger numFailedDataNodeContainers = new AtomicInteger();
+-
+-  // True iff the application has completed and is ready for cleanup
+-  // Once true, will never be false. This variable should not be accessed
+-  // directly but rather through the isComplete, waitForCompletion, and
+-  // markCompleted methods.
+-  private boolean completed = false;
+-  private final Object completionLock = new Object();
+-
+-  private ByteBuffer allTokens;
+-
+-  // Launch threads
+-  private List<Thread> launchThreads = new ArrayList<>();
+-
+-  // True iff this AM should launch and manage a Namanode
+-  private boolean launchNameNode;
+-  // The service RPC address of a remote NameNode to be contacted by the
+-  // launched DataNodes
+-  private String namenodeServiceRpcAddress = "";
+-  // Directory to use for remote storage (a location on the remote FS which
+-  // can be accessed by all components)
+-  private Path remoteStoragePath;
+-  // The ACLs to view the launched containers
+-  private Map<ApplicationAccessType, String> applicationAcls;
+-  // The container the NameNode is running within
+-  private volatile Container namenodeContainer;
+-  // Map of the containers that the DataNodes are running within
+-  private ConcurrentMap<ContainerId, Container> datanodeContainers =
+-      new ConcurrentHashMap<>();
+-
+-  // Username of the user who launched this application.
+-  private String launchingUser;
+-
+-  /**
+-   * @param args Command line args
+-   */
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    try {
+-      ApplicationMaster appMaster = new ApplicationMaster();
+-      LOG.info("Initializing ApplicationMaster");
+-      boolean doRun = appMaster.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      result = appMaster.run();
+-    } catch (Throwable t) {
+-      LOG.error("Error running ApplicationMaster", t);
+-      System.exit(1);
+-    }
+-    if (result) {
+-      LOG.info("Application Master completed successfully. exiting");
+-      System.exit(0);
+-    } else {
+-      LOG.info("Application Master failed. exiting");
+-      System.exit(2);
+-    }
+-  }
+-
+-  public ApplicationMaster() {
+-    // Set up the configuration
+-    conf = new YarnConfiguration();
+-  }
+-
+-  /**
+-   * Parse command line options.
+-   *
+-   * @param args Command line args
+-   * @return Whether init successful and run should be invoked
+-   * @throws ParseException on error while parsing options
+-   */
+-  public boolean init(String[] args) throws ParseException {
+-
+-    Options opts = new Options();
+-    AMOptions.setOptions(opts);
+-    CommandLine cliParser = new GnuParser().parse(opts, args);
+-
+-    if (args.length == 0) {
+-      printUsage(opts);
+-      throw new IllegalArgumentException(
+-          "No args specified for application master to initialize");
+-    }
+-
+-    if (cliParser.hasOption("help")) {
+-      printUsage(opts);
+-      return false;
+-    }
+-
+-    Map<String, String> envs = System.getenv();
+-
+-    remoteStoragePath = new Path(
+-        envs.get(DynoConstants.REMOTE_STORAGE_PATH_ENV));
+-    applicationAcls = new HashMap<>();
+-    applicationAcls.put(ApplicationAccessType.VIEW_APP,
+-        envs.get(DynoConstants.JOB_ACL_VIEW_ENV));
+-    launchingUser = envs.get(Environment.USER.name());
+-    if (envs.containsKey(DynoConstants.REMOTE_NN_RPC_ADDR_ENV)) {
+-      launchNameNode = false;
+-      namenodeServiceRpcAddress = envs
+-          .get(DynoConstants.REMOTE_NN_RPC_ADDR_ENV);
+-    } else {
+-      launchNameNode = true;
+-      // namenodeServiceRpcAddress will be set in run() once properties are
+-      // available
+-    }
+-
+-    ContainerId containerId =
+-        ContainerId.fromString(envs.get(Environment.CONTAINER_ID.name()));
+-    ApplicationAttemptId appAttemptID = containerId.getApplicationAttemptId();
+-    LOG.info("Application master for app: appId={}, clusterTimestamp={}, "
+-        + "attemptId={}", appAttemptID.getApplicationId().getId(),
+-        appAttemptID.getApplicationId().getClusterTimestamp(),
+-        appAttemptID.getAttemptId());
+-
+-    amOptions = AMOptions.initFromParser(cliParser);
+-
+-    return true;
+-  }
+-
+-  /**
+-   * Helper function to print usage.
+-   *
+-   * @param opts arsed command line options
+-   */
+-  private void printUsage(Options opts) {
+-    new HelpFormatter().printHelp("ApplicationMaster", opts);
+-  }
+-
+-  /**
+-   * Main run function for the application master.
+-   *
+-   * @return True if the application completed successfully; false if if exited
+-   *         unexpectedly, failed, was killed, etc.
+-   * @throws YarnException for issues while contacting YARN daemons
+-   * @throws IOException for other issues
+-   * @throws InterruptedException when the thread is interrupted
+-   */
+-  public boolean run() throws YarnException, IOException, InterruptedException {
+-    LOG.info("Starting ApplicationMaster");
+-
+-    Credentials credentials = UserGroupInformation.getCurrentUser()
+-        .getCredentials();
+-    DataOutputBuffer dob = new DataOutputBuffer();
+-    credentials.writeTokenStorageToStream(dob);
+-    // Now remove the AM->RM token so that containers cannot access it.
+-    credentials.getAllTokens().removeIf((token) ->
+-            token.getKind().equals(AMRMTokenIdentifier.KIND_NAME));
+-    allTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-
+-    AMRMClientAsync.AbstractCallbackHandler allocListener =
+-        new RMCallbackHandler();
+-    amRMClient = AMRMClientAsync.createAMRMClientAsync(1000, allocListener);
+-    amRMClient.init(conf);
+-    amRMClient.start();
+-
+-    containerListener = createNMCallbackHandler();
+-    nmClientAsync = new NMClientAsyncImpl(containerListener);
+-    nmClientAsync.init(conf);
+-    nmClientAsync.start();
+-
+-    // Register self with ResourceManager
+-    // This will start heartbeating to the RM
+-    String appMasterHostname = NetUtils.getHostname();
+-    amRMClient.registerApplicationMaster(appMasterHostname, -1, "");
+-
+-    // Supplier to use to indicate to wait-loops to stop waiting
+-    Supplier<Boolean> exitCritera = this::isComplete;
+-
+-    Optional<Properties> namenodeProperties = Optional.empty();
+-    if (launchNameNode) {
+-      ContainerRequest nnContainerRequest = setupContainerAskForRM(
+-          amOptions.getNameNodeMemoryMB(), amOptions.getNameNodeVirtualCores(),
+-          0, amOptions.getNameNodeNodeLabelExpression());
+-      LOG.info("Requested NameNode ask: " + nnContainerRequest.toString());
+-      amRMClient.addContainerRequest(nnContainerRequest);
+-
+-      // Wait for the NN container to make its information available on the
+-      // shared
+-      // remote file storage
+-      Path namenodeInfoPath = new Path(remoteStoragePath,
+-          DynoConstants.NN_INFO_FILE_NAME);
+-      LOG.info("Waiting on availability of NameNode information at "
+-          + namenodeInfoPath);
+-
+-      namenodeProperties = DynoInfraUtils.waitForAndGetNameNodeProperties(
+-          exitCritera, conf, namenodeInfoPath, LOG);
+-      if (!namenodeProperties.isPresent()) {
+-        cleanup();
+-        return false;
+-      }
+-      namenodeServiceRpcAddress = DynoInfraUtils
+-          .getNameNodeServiceRpcAddr(namenodeProperties.get()).toString();
+-      LOG.info("NameNode information: " + namenodeProperties.get());
+-      LOG.info("NameNode can be reached at: " + DynoInfraUtils
+-          .getNameNodeHdfsUri(namenodeProperties.get()).toString());
+-      DynoInfraUtils.waitForNameNodeStartup(namenodeProperties.get(),
+-          exitCritera, LOG);
+-    } else {
+-      LOG.info("Using remote NameNode with RPC address: "
+-          + namenodeServiceRpcAddress);
+-    }
+-
+-    blockListFiles = Collections
+-        .synchronizedList(getDataNodeBlockListingFiles());
+-    numTotalDataNodes = blockListFiles.size();
+-    if (numTotalDataNodes == 0) {
+-      LOG.error(
+-          "No block listing files were found! Cannot run with 0 DataNodes.");
+-      markCompleted();
+-      return false;
+-    }
+-    numTotalDataNodeContainers = (int) Math.ceil(((double) numTotalDataNodes)
+-        / Math.max(1, amOptions.getDataNodesPerCluster()));
+-
+-    LOG.info("Requesting {} DataNode containers with {} MB memory, {} vcores",
+-        numTotalDataNodeContainers, amOptions.getDataNodeMemoryMB(),
+-        amOptions.getDataNodeVirtualCores());
+-    for (int i = 0; i < numTotalDataNodeContainers; ++i) {
+-      ContainerRequest datanodeAsk = setupContainerAskForRM(
+-          amOptions.getDataNodeMemoryMB(), amOptions.getDataNodeVirtualCores(),
+-          1, amOptions.getDataNodeNodeLabelExpression());
+-      amRMClient.addContainerRequest(datanodeAsk);
+-      LOG.debug("Requested datanode ask: " + datanodeAsk.toString());
+-    }
+-    LOG.info("Finished requesting datanode containers");
+-
+-    if (launchNameNode) {
+-      DynoInfraUtils.waitForNameNodeReadiness(namenodeProperties.get(),
+-          numTotalDataNodes, true, exitCritera, conf, LOG);
+-    }
+-
+-    waitForCompletion();
+-    return cleanup();
+-  }
+-
+-  private NMCallbackHandler createNMCallbackHandler() {
+-    return new NMCallbackHandler();
+-  }
+-
+-  /**
+-   * Wait until the application has finished and is ready for cleanup.
+-   */
+-  private void waitForCompletion() throws InterruptedException {
+-    synchronized (completionLock) {
+-      while (!completed) {
+-        completionLock.wait();
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Check completion status of the application.
+-   *
+-   * @return True iff it has completed.
+-   */
+-  private boolean isComplete() {
+-    synchronized (completionLock) {
+-      return completed;
+-    }
+-  }
+-
+-  /**
+-   * Mark that this application should begin cleaning up and exit.
+-   */
+-  private void markCompleted() {
+-    synchronized (completionLock) {
+-      completed = true;
+-      completionLock.notify();
+-    }
+-  }
+-
+-  /**
+-   * @return True iff the application successfully completed
+-   */
+-  private boolean cleanup() {
+-    // Join all launched threads
+-    // needed for when we time out
+-    // and we need to release containers
+-    for (Thread launchThread : launchThreads) {
+-      try {
+-        launchThread.join(10000);
+-      } catch (InterruptedException e) {
+-        LOG.info("Exception thrown in thread join: " + e.getMessage());
+-        e.printStackTrace();
+-      }
+-    }
+-
+-    // When the application completes, it should stop all running containers
+-    LOG.info("Application completed. Stopping running containers");
+-    nmClientAsync.stop();
+-
+-    // When the application completes, it should send a finish application
+-    // signal to the RM
+-    LOG.info("Application completed. Signalling finish to RM");
+-
+-    FinalApplicationStatus appStatus;
+-    String appMessage = null;
+-    boolean success;
+-    if (numFailedDataNodeContainers.get() == 0
+-        && numCompletedDataNodeContainers.get() == numTotalDataNodes) {
+-      appStatus = FinalApplicationStatus.SUCCEEDED;
+-      success = true;
+-    } else {
+-      appStatus = FinalApplicationStatus.FAILED;
+-      appMessage = "Diagnostics: total=" + numTotalDataNodeContainers
+-          + ", completed=" + numCompletedDataNodeContainers.get()
+-          + ", allocated=" + numAllocatedDataNodeContainers.get()
+-          + ", failed=" + numFailedDataNodeContainers.get();
+-      success = false;
+-    }
+-    try {
+-      amRMClient.unregisterApplicationMaster(appStatus, appMessage, null);
+-    } catch (YarnException|IOException ex) {
+-      LOG.error("Failed to unregister application", ex);
+-    }
+-
+-    amRMClient.stop();
+-    return success;
+-  }
+-
+-  private class RMCallbackHandler
+-      extends AMRMClientAsync.AbstractCallbackHandler {
+-
+-    @Override
+-    public void onContainersCompleted(
+-        List<ContainerStatus> completedContainers) {
+-      LOG.info("Got response from RM for container ask, completedCnt="
+-          + completedContainers.size());
+-      for (ContainerStatus containerStatus : completedContainers) {
+-        String containerInfo = "containerID=" + containerStatus.getContainerId()
+-            + ", state=" + containerStatus.getState() + ", exitStatus="
+-            + containerStatus.getExitStatus() + ", diagnostics="
+-            + StringUtils.abbreviate(containerStatus.getDiagnostics(), 1000);
+-        String component;
+-        if (isNameNode(containerStatus.getContainerId())) {
+-          component = "NAMENODE";
+-        } else if (isDataNode(containerStatus.getContainerId())) {
+-          component = "DATANODE";
+-        } else {
+-          LOG.error("Received container status for unknown container: "
+-              + containerInfo);
+-          continue;
+-        }
+-        LOG.info(
+-            "Got container status for " + component + ": " + containerInfo);
+-
+-        // non complete containers should not be here
+-        assert (containerStatus.getState() == ContainerState.COMPLETE);
+-
+-        if (component.equals("NAMENODE")) {
+-          LOG.info("NameNode container completed; marking application as done");
+-          markCompleted();
+-        }
+-
+-        // increment counters for completed/failed containers
+-        int exitStatus = containerStatus.getExitStatus();
+-        int completedIdx = numCompletedDataNodeContainers.incrementAndGet();
+-        if (0 != exitStatus) {
+-          numFailedDataNodeContainers.incrementAndGet();
+-        } else {
+-          LOG.info("DataNode {} completed successfully, containerId={}",
+-              completedIdx, containerStatus.getContainerId());
+-        }
+-      }
+-
+-      if (numCompletedDataNodeContainers.get() == numTotalDataNodeContainers) {
+-        LOG.info(
+-            "All datanode containers completed; marking application as done");
+-        markCompleted();
+-      }
+-    }
+-
+-    @Override
+-    public void onContainersAllocated(List<Container> allocatedContainers) {
+-      LOG.info("Got response from RM for container ask, allocatedCnt="
+-          + allocatedContainers.size());
+-      for (Container container : allocatedContainers) {
+-        LaunchContainerRunnable containerLauncher;
+-        String componentType;
+-        Resource rsrc = container.getResource();
+-        if (launchNameNode
+-            && rsrc.getMemorySize() >= amOptions.getNameNodeMemoryMB()
+-            && rsrc.getVirtualCores() >= amOptions.getNameNodeVirtualCores()
+-            && namenodeContainer == null) {
+-          namenodeContainer = container;
+-          componentType = "NAMENODE";
+-          containerLauncher = new LaunchContainerRunnable(container, true);
+-        } else if (rsrc.getMemorySize() >= amOptions.getDataNodeMemoryMB()
+-            && rsrc.getVirtualCores() >= amOptions.getDataNodeVirtualCores()
+-            && numAllocatedDataNodeContainers.get() < numTotalDataNodes) {
+-          if (launchNameNode && namenodeContainer == null) {
+-            LOG.error("Received a container with following resources suited "
+-                + "for a DataNode but no NameNode container exists: "
+-                + "containerMem=" + rsrc.getMemorySize() + ", containerVcores="
+-                + rsrc.getVirtualCores());
+-            continue;
+-          }
+-          numAllocatedDataNodeContainers.getAndIncrement();
+-          datanodeContainers.put(container.getId(), container);
+-          componentType = "DATANODE";
+-          containerLauncher = new LaunchContainerRunnable(container, false);
+-        } else {
+-          LOG.warn("Received unwanted container allocation: " + container);
+-          nmClientAsync.stopContainerAsync(container.getId(),
+-              container.getNodeId());
+-          continue;
+-        }
+-        LOG.info("Launching " + componentType + " on a new container."
+-            + ", containerId=" + container.getId() + ", containerNode="
+-            + container.getNodeId().getHost() + ":"
+-            + container.getNodeId().getPort() + ", containerNodeURI="
+-            + container.getNodeHttpAddress() + ", containerResourceMemory="
+-            + rsrc.getMemorySize() + ", containerResourceVirtualCores="
+-            + rsrc.getVirtualCores());
+-        Thread launchThread = new Thread(containerLauncher);
+-
+-        // launch and start the container on a separate thread to keep
+-        // the main thread unblocked
+-        // as all containers may not be allocated at one go.
+-        launchThreads.add(launchThread);
+-        launchThread.start();
+-      }
+-    }
+-
+-    @Override
+-    public void onShutdownRequest() {
+-      markCompleted();
+-    }
+-
+-    @Override
+-    public void onNodesUpdated(List<NodeReport> updatedNodes) {
+-      LOG.info("onNodesUpdated: " + Joiner.on(",").join(updatedNodes));
+-    }
+-
+-    @Override
+-    public float getProgress() {
+-      return 0.0f;
+-    }
+-
+-    @Override
+-    public void onError(Throwable e) {
+-      markCompleted();
+-      amRMClient.stop();
+-    }
+-
+-    @Override
+-    public void onContainersUpdated(List<UpdatedContainer> containers) {
+-      LOG.info("onContainersUpdated: " + Joiner.on(",").join(containers));
+-    }
+-  }
+-
+-  private class NMCallbackHandler
+-      extends NMClientAsync.AbstractCallbackHandler {
+-
+-    @Override
+-    public void onContainerStopped(ContainerId containerId) {
+-      if (isNameNode(containerId)) {
+-        LOG.info("NameNode container stopped: " + containerId);
+-        namenodeContainer = null;
+-        markCompleted();
+-      } else if (isDataNode(containerId)) {
+-        LOG.debug("DataNode container stopped: " + containerId);
+-        datanodeContainers.remove(containerId);
+-      } else {
+-        LOG.error(
+-            "onContainerStopped received unknown container ID: " + containerId);
+-      }
+-    }
+-
+-    @Override
+-    public void onContainerStatusReceived(ContainerId containerId,
+-        ContainerStatus containerStatus) {
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug("Container Status: id=" + containerId + ", status="
+-            + containerStatus);
+-      }
+-    }
+-
+-    @Override
+-    public void onContainerStarted(ContainerId containerId,
+-        Map<String, ByteBuffer> allServiceResponse) {
+-      if (isNameNode(containerId)) {
+-        LOG.info("NameNode container started at ID " + containerId);
+-      } else if (isDataNode(containerId)) {
+-        if (LOG.isDebugEnabled()) {
+-          LOG.debug("Succeeded to start DataNode Container " + containerId);
+-        }
+-        nmClientAsync.getContainerStatusAsync(containerId,
+-            datanodeContainers.get(containerId).getNodeId());
+-      } else {
+-        LOG.error(
+-            "onContainerStarted received unknown container ID: " + containerId);
+-      }
+-    }
+-
+-    @Override
+-    public void onStartContainerError(ContainerId containerId, Throwable t) {
+-      if (isNameNode(containerId)) {
+-        LOG.error("Failed to start namenode container ID " + containerId, t);
+-        namenodeContainer = null;
+-        markCompleted();
+-      } else if (isDataNode(containerId)) {
+-        LOG.error("Failed to start DataNode Container " + containerId);
+-        datanodeContainers.remove(containerId);
+-        numCompletedDataNodeContainers.incrementAndGet();
+-        numFailedDataNodeContainers.incrementAndGet();
+-      } else {
+-        LOG.error("onStartContainerError received unknown container ID: "
+-            + containerId);
+-      }
+-    }
+-
+-    @Override
+-    public void onGetContainerStatusError(ContainerId containerId,
+-        Throwable t) {
+-      LOG.error("Failed to query the status of Container " + containerId);
+-    }
+-
+-    @Override
+-    public void onStopContainerError(ContainerId containerId, Throwable t) {
+-      if (isNameNode(containerId)) {
+-        LOG.error("Failed to stop NameNode container ID " + containerId);
+-        namenodeContainer = null;
+-      } else if (isDataNode(containerId)) {
+-        LOG.error("Failed to stop DataNode Container " + containerId);
+-        datanodeContainers.remove(containerId);
+-      } else {
+-        LOG.error("onStopContainerError received unknown containerID: "
+-            + containerId);
+-      }
+-    }
+-
+-    @Override
+-    @Deprecated
+-    public void onContainerResourceIncreased(ContainerId containerId,
+-        Resource resource) {
+-      LOG.info("onContainerResourceIncreased: {}, {}", containerId, resource);
+-    }
+-
+-    @Override
+-    public void onContainerResourceUpdated(ContainerId containerId,
+-        Resource resource) {
+-      LOG.info("onContainerResourceUpdated: {}, {}", containerId, resource);
+-    }
+-
+-    @Override
+-    @Deprecated
+-    public void onIncreaseContainerResourceError(ContainerId containerId,
+-        Throwable t) {
+-      LOG.info("onIncreaseContainerResourceError: {}", containerId, t);
+-    }
+-
+-    @Override
+-    public void onUpdateContainerResourceError(ContainerId containerId,
+-        Throwable t) {
+-      LOG.info("onUpdateContainerResourceError: {}", containerId, t);
+-    }
+-  }
+-
+-  /**
+-   * Thread to connect to the {@link ContainerManagementProtocol} and launch the
+-   * container that will execute the shell command.
+-   */
+-  private class LaunchContainerRunnable implements Runnable {
+-
+-    // Allocated container
+-    private Container container;
+-    private boolean isNameNodeLauncher;
+-
+-    /**
+-     * @param lcontainer Allocated container
+-     * @param isNameNode True iff this should launch a NameNode
+-     */
+-    LaunchContainerRunnable(Container lcontainer, boolean isNameNode) {
+-      this.container = lcontainer;
+-      this.isNameNodeLauncher = isNameNode;
+-    }
+-
+-    /**
+-     * Get the map of local resources to be used for launching this container.
+-     */
+-    private Map<String, LocalResource> getLocalResources() {
+-      Map<String, LocalResource> localResources = new HashMap<>();
+-
+-      Map<String, String> envs = System.getenv();
+-      addAsLocalResourceFromEnv(DynoConstants.CONF_ZIP, localResources, envs);
+-      addAsLocalResourceFromEnv(DynoConstants.START_SCRIPT, localResources,
+-          envs);
+-      addAsLocalResourceFromEnv(DynoConstants.HADOOP_BINARY, localResources,
+-          envs);
+-      addAsLocalResourceFromEnv(DynoConstants.VERSION, localResources, envs);
+-      addAsLocalResourceFromEnv(DynoConstants.DYNO_DEPENDENCIES, localResources,
+-          envs);
+-      if (isNameNodeLauncher) {
+-        addAsLocalResourceFromEnv(DynoConstants.FS_IMAGE, localResources, envs);
+-        addAsLocalResourceFromEnv(DynoConstants.FS_IMAGE_MD5, localResources,
+-            envs);
+-      } else {
+-        int blockFilesToLocalize = Math.max(1,
+-            amOptions.getDataNodesPerCluster());
+-        for (int i = 0; i < blockFilesToLocalize; i++) {
+-          try {
+-            localResources.put(
+-                DynoConstants.BLOCK_LIST_RESOURCE_PATH_PREFIX + i,
+-                blockListFiles.remove(0));
+-          } catch (IndexOutOfBoundsException e) {
+-            break;
+-          }
+-        }
+-      }
+-      return localResources;
+-    }
+-
+-    /**
+-     * Connects to CM, sets up container launch context for shell command and
+-     * eventually dispatches the container start request to the CM.
+-     */
+-    @Override
+-    public void run() {
+-      LOG.info("Setting up container launch context for containerid="
+-          + container.getId() + ", isNameNode=" + isNameNodeLauncher);
+-      ContainerLaunchContext ctx = Records
+-          .newRecord(ContainerLaunchContext.class);
+-
+-      // Set the environment
+-      ctx.setEnvironment(amOptions.getShellEnv());
+-      ctx.setApplicationACLs(applicationAcls);
+-
+-      try {
+-        ctx.setLocalResources(getLocalResources());
+-
+-        ctx.setCommands(getContainerStartCommand());
+-      } catch (IOException e) {
+-        LOG.error("Error while configuring container!", e);
+-        return;
+-      }
+-
+-      // Set up tokens for the container
+-      ctx.setTokens(allTokens.duplicate());
+-
+-      nmClientAsync.startContainerAsync(container, ctx);
+-      LOG.info("Starting {}; track at: http://{}/node/containerlogs/{}/{}/",
+-          isNameNodeLauncher ? "NAMENODE" : "DATANODE",
+-          container.getNodeHttpAddress(), container.getId(), launchingUser);
+-    }
+-
+-    /**
+-     * Return the command used to start this container.
+-     */
+-    private List<String> getContainerStartCommand() throws IOException {
+-      // Set the necessary command to execute on the allocated container
+-      List<String> vargs = new ArrayList<>();
+-
+-      // Set executable command
+-      vargs.add("./" + DynoConstants.START_SCRIPT.getResourcePath());
+-      String component = isNameNodeLauncher ? "namenode" : "datanode";
+-      vargs.add(component);
+-      if (isNameNodeLauncher) {
+-        vargs.add(remoteStoragePath.getFileSystem(conf)
+-            .makeQualified(remoteStoragePath).toString());
+-      } else {
+-        vargs.add(namenodeServiceRpcAddress);
+-        vargs.add(String.valueOf(amOptions.getDataNodeLaunchDelaySec() < 1 ? 0
+-            : RAND.nextInt(
+-                Ints.checkedCast(amOptions.getDataNodeLaunchDelaySec()))));
+-      }
+-
+-      // Add log redirect params
+-      vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout");
+-      vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr");
+-
+-      LOG.info("Completed setting up command for " + component + ": " + vargs);
+-      return Lists.newArrayList(Joiner.on(" ").join(vargs));
+-    }
+-
+-    /**
+-     * Add the given resource into the map of resources, using information from
+-     * the supplied environment variables.
+-     *
+-     * @param resource The resource to add.
+-     * @param localResources Map of local resources to insert into.
+-     * @param env Map of environment variables.
+-     */
+-    public void addAsLocalResourceFromEnv(DynoResource resource,
+-        Map<String, LocalResource> localResources, Map<String, String> env) {
+-      LOG.debug("Adding resource to localResources: " + resource);
+-      String resourcePath = resource.getResourcePath();
+-      if (resourcePath == null) {
+-        // Default to using the file name in the path
+-        resourcePath = resource.getPath(env).getName();
+-      }
+-      localResources.put(resourcePath,
+-          LocalResource.newInstance(URL.fromPath(resource.getPath(env)),
+-              resource.getType(), LocalResourceVisibility.APPLICATION,
+-              resource.getLength(env), resource.getTimestamp(env)));
+-    }
+-  }
+-
+-  private List<LocalResource> getDataNodeBlockListingFiles()
+-      throws IOException {
+-    Path blockListDirPath = new Path(
+-        System.getenv().get(DynoConstants.BLOCK_LIST_PATH_ENV));
+-    LOG.info("Looking for block listing files in " + blockListDirPath);
+-    FileSystem blockZipFS = blockListDirPath.getFileSystem(conf);
+-    List<LocalResource> files = new LinkedList<>();
+-    for (FileStatus stat : blockZipFS.listStatus(blockListDirPath,
+-        DynoConstants.BLOCK_LIST_FILE_FILTER)) {
+-      LocalResource blockListResource = LocalResource.newInstance(
+-          URL.fromPath(stat.getPath()),
+-          LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
+-          stat.getLen(), stat.getModificationTime());
+-      files.add(blockListResource);
+-    }
+-    return files;
+-  }
+-
+-  /**
+-   * Return true iff {@code containerId} represents the NameNode container.
+-   */
+-  private boolean isNameNode(ContainerId containerId) {
+-    return namenodeContainer != null
+-        && namenodeContainer.getId().equals(containerId);
+-  }
+-
+-  /**
+-   * Return true iff {@code containerId} represents a DataNode container.
+-   */
+-  private boolean isDataNode(ContainerId containerId) {
+-    return datanodeContainers.containsKey(containerId);
+-  }
+-
+-  /**
+-   * Setup the request that will be sent to the RM for the container ask.
+-   *
+-   * @return the setup ResourceRequest to be sent to RM
+-   */
+-  private ContainerRequest setupContainerAskForRM(int memory, int vcores,
+-      int priority, String nodeLabel) {
+-    Priority pri = Records.newRecord(Priority.class);
+-    pri.setPriority(priority);
+-
+-    // Set up resource type requirements
+-    // For now, memory and CPU are supported so we set memory and cpu
+-    // requirements
+-    Resource capability = Records.newRecord(Resource.class);
+-    capability.setMemorySize(memory);
+-    capability.setVirtualCores(vcores);
+-
+-    return new ContainerRequest(capability, null, null, pri, true, nodeLabel);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/BlockPlacementPolicyAlwaysSatisfied.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/BlockPlacementPolicyAlwaysSatisfied.java
+deleted file mode 100644
+index de12aec4137..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/BlockPlacementPolicyAlwaysSatisfied.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+-import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicyDefault;
+-import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementStatus;
+-
+-/**
+- * A BlockPlacementPolicy which always considered itself satisfied. This avoids
+- * the issue that the Dynamometer NameNode will complain about blocks being
+- * under-replicated because they're not being put on distinct racks.
+- */
+-public class BlockPlacementPolicyAlwaysSatisfied
+-    extends BlockPlacementPolicyDefault {
+-
+-  private static final BlockPlacementStatusSatisfied SATISFIED =
+-      new BlockPlacementStatusSatisfied();
+-
+-  private static class BlockPlacementStatusSatisfied
+-      implements BlockPlacementStatus {
+-    @Override
+-    public boolean isPlacementPolicySatisfied() {
+-      return true;
+-    }
+-
+-    public String getErrorDescription() {
+-      return null;
+-    }
+-
+-    @Override
+-    public int getAdditionalReplicasRequired() {
+-      return 0;
+-    }
+-  }
+-
+-  @Override
+-  public BlockPlacementStatus verifyBlockPlacement(DatanodeInfo[] locs,
+-      int numberOfReplicas) {
+-    return SATISFIED;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
+deleted file mode 100644
+index 0c57542747e..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
++++ /dev/null
+@@ -1,1134 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+-import org.apache.hadoop.util.Lists;
+-import java.util.Optional;
+-import java.util.function.Supplier;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadDriver;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.net.URI;
+-import java.net.URL;
+-import java.nio.ByteBuffer;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.Set;
+-import java.util.concurrent.TimeUnit;
+-import java.util.stream.Collectors;
+-import java.util.zip.ZipEntry;
+-import java.util.zip.ZipOutputStream;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.OptionGroup;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobStatus;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.util.ClassUtil;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.QueueInfo;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.client.api.YarnClientApplication;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.util.Apps;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * Client for submitting a Dynamometer YARN application, and optionally, a
+- * workload MapReduce job. This client uploads resources to HDFS as necessary
+- * for them to be accessed by the YARN app, then launches an
+- * {@link ApplicationMaster}, which is responsible for managing the lifetime of
+- * the application.
+- * <p>
+- * The Dynamometer YARN application starts up the DataNodes of an HDFS
+- * cluster. If the namenode_servicerpc_addr option is specified, it should point
+- * to the service RPC address of an existing namenode, which the datanodes will
+- * talk to. Else, a namenode will be launched internal to this YARN application.
+- * The ApplicationMaster's logs contain links to the NN / DN containers to be
+- * able to access their logs. Some of this information is also printed by the
+- * client.
+- * <p>
+- * The application will store files in the submitting user's home directory
+- * under a `.dynamometer/applicationID/` folder. This is mostly for uses
+- * internal to the application, but if the NameNode is launched through YARN,
+- * the NameNode's metrics will also be uploaded to a file `namenode_metrics`
+- * within this folder. This file is also accessible as part of the NameNode's
+- * logs, but this centralized location is easier to access for subsequent
+- * parsing.
+- * <p>
+- * If the NameNode is launched internally, this Client will monitor the
+- * status of the NameNode, printing information about its availability as the
+- * DataNodes register (e.g., outstanding under replicated blocks as block
+- * reports arrive). If this is configured to launch the workload job, once the
+- * NameNode has gathered information from all of its DataNodes, the client will
+- * launch a workload job which is configured to act against the newly launched
+- * NameNode. Once the workload job completes, the infrastructure application
+- * will be shut down. At this time only the audit log replay
+- * ({@link AuditReplayMapper}) workload is supported.
+- * <p>
+- * If there is no workload job configured, this application will, by
+- * default, persist indefinitely until killed by YARN. You can specify the
+- * timeout option to have it exit automatically after some time. This timeout
+- * will enforced if there is a workload job configured as well.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class Client extends Configured implements Tool {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(Client.class);
+-
+-  public static final String APPNAME_ARG = "appname";
+-  public static final String APPNAME_DEFAULT = "DynamometerTest";
+-  public static final String QUEUE_ARG = "queue";
+-  public static final String QUEUE_DEFAULT = "default";
+-  public static final String TIMEOUT_ARG = "timeout";
+-  public static final String TIMEOUT_DEFAULT = "-1";
+-  public static final String HADOOP_VERSION_ARG = "hadoop_version";
+-  public static final String HADOOP_BINARY_PATH_ARG = "hadoop_binary_path";
+-  public static final String NAMENODE_SERVICERPC_ADDR_ARG =
+-      "namenode_servicerpc_addr";
+-  public static final String FS_IMAGE_DIR_ARG = "fs_image_dir";
+-  public static final String BLOCK_LIST_PATH_ARG = "block_list_path";
+-  public static final String CONF_PATH_ARG = "conf_path";
+-  public static final String MASTER_VCORES_ARG = "master_vcores";
+-  public static final String MASTER_VCORES_DEFAULT = "1";
+-  public static final String MASTER_MEMORY_MB_ARG = "master_memory_mb";
+-  public static final String MASTER_MEMORY_MB_DEFAULT = "2048";
+-  public static final String TOKEN_FILE_LOCATION_ARG = "token_file_location";
+-  public static final String WORKLOAD_REPLAY_ENABLE_ARG =
+-      "workload_replay_enable";
+-  public static final String WORKLOAD_INPUT_PATH_ARG = "workload_input_path";
+-  public static final String WORKLOAD_OUTPUT_PATH_ARG = "workload_output_path";
+-  public static final String WORKLOAD_THREADS_PER_MAPPER_ARG =
+-      "workload_threads_per_mapper";
+-  public static final String WORKLOAD_START_DELAY_ARG = "workload_start_delay";
+-  public static final String WORKLOAD_RATE_FACTOR_ARG = "workload_rate_factor";
+-  public static final String WORKLOAD_RATE_FACTOR_DEFAULT = "1.0";
+-  public static final String WORKLOAD_CONFIG_ARG = "workload_config";
+-
+-  private static final String[] ARCHIVE_FILE_TYPES =
+-      {".zip", ".tar", ".tgz", ".tar.gz"};
+-
+-  private static final String START_SCRIPT_LOCATION = Client.class
+-      .getClassLoader()
+-      .getResource(DynoConstants.START_SCRIPT.getResourcePath()).toString();
+-
+-  private YarnClient yarnClient;
+-  // Application master specific info to register a new Application with RM/ASM
+-  private String appName = "";
+-  // Queue for App master
+-  private String amQueue = "";
+-  // Amt. of memory resource to request for to run the App Master
+-  private int amMemory = 10;
+-  // Amt. of virtual core resource to request for to run the App Master
+-  private int amVCores = 1;
+-
+-  // Dependency JARs. Should include, at minimum, the JAR for the App Master
+-  private final String[] dependencyJars;
+-
+-  private String hadoopBinary = "";
+-  // Location of DN conf zip
+-  private String confPath = "";
+-  // Location of root dir for DN block image zips
+-  private String blockListPath = "";
+-  // Location of NN fs image
+-  private String fsImagePath = "";
+-  // Location of NN fs image md5 file
+-  private String fsImageMD5Path = "";
+-  // Location of NN VERSION file
+-  private String versionFilePath = "";
+-  // Service RPC address of the NameNode, if it is external
+-  private String remoteNameNodeRpcAddress = "";
+-  // True iff the NameNode should be launched within YARN
+-  private boolean launchNameNode;
+-  // The path to the file which contains the delegation tokens to be used for
+-  // the launched
+-  // containers (may be null)
+-  private String tokenFileLocation;
+-
+-  // Holds all of the options which are passed to the AM
+-  private AMOptions amOptions;
+-
+-  // The ApplicationId of the YARN infrastructure application.
+-  private ApplicationId infraAppId;
+-  // The current state of the YARN infrastructure application.
+-  private volatile YarnApplicationState infraAppState =
+-      YarnApplicationState.NEW;
+-  private volatile JobStatus.State workloadAppState = JobStatus.State.PREP;
+-  // Total number of DataNodes which will be launched.
+-  private int numTotalDataNodes;
+-
+-  // Whether or not the workload job should be launched.
+-  private boolean launchWorkloadJob = false;
+-  // The workload job itself.
+-  private volatile Job workloadJob;
+-  // The input path for the workload job.
+-  private String workloadInputPath = "";
+-  // The output path for the workload job metric results.
+-  private String workloadOutputPath = "";
+-  // The number of threads to use per mapper for the workload job.
+-  private int workloadThreadsPerMapper;
+-  // The startup delay for the workload job.
+-  private long workloadStartDelayMs;
+-  private double workloadRateFactor = 0.0;
+-  private Map<String, String> workloadExtraConfigs;
+-
+-  // Start time for client
+-  private final long clientStartTime = System.currentTimeMillis();
+-  // Timeout threshold for client. Kill app after time interval expires.
+-  private long clientTimeout;
+-
+-  // Command line options
+-  private Options opts;
+-
+-  /**
+-   * @param args Command line arguments
+-   * @throws Exception on error
+-   */
+-  public static void main(String[] args) throws Exception {
+-    Client client = new Client(
+-        ClassUtil.findContainingJar(ApplicationMaster.class));
+-    System.exit(ToolRunner.run(new YarnConfiguration(), client, args));
+-  }
+-
+-  public int run(String[] args) {
+-    boolean result;
+-    try {
+-      LOG.info("Initializing Client");
+-      try {
+-        boolean doRun = init(args);
+-        if (!doRun) {
+-          return 0;
+-        }
+-      } catch (IllegalArgumentException e) {
+-        System.err.println(e.getLocalizedMessage());
+-        printUsage();
+-        return -1;
+-      }
+-      result = run();
+-    } catch (Throwable t) {
+-      LOG.error("Error running Client", t);
+-      return 1;
+-    }
+-    if (result) {
+-      LOG.info("Application completed successfully");
+-      return 0;
+-    }
+-    LOG.error("Application failed to complete successfully");
+-    return 2;
+-  }
+-
+-  public Client(String... dependencyJars) {
+-    Preconditions.checkArgument(
+-        dependencyJars != null && dependencyJars.length > 0,
+-        "Must specify at least one dependency JAR for the ApplicationMaster");
+-    this.dependencyJars = dependencyJars;
+-    opts = new Options();
+-    opts.addOption(APPNAME_ARG, true,
+-        "Application Name. (default '" + APPNAME_DEFAULT + "')");
+-    opts.addOption(QUEUE_ARG, true, "RM Queue in which this application is "
+-        + "to be submitted (default '" + QUEUE_DEFAULT + "')");
+-    opts.addOption(TIMEOUT_ARG, true, "Application timeout in milliseconds "
+-        + "(default " + TIMEOUT_DEFAULT + " = unlimited)");
+-    opts.addOption(MASTER_MEMORY_MB_ARG, true, "Amount of memory in MB to be "
+-        + "requested to run the application master (default "
+-        + MASTER_MEMORY_MB_DEFAULT + ")");
+-    opts.addOption(MASTER_VCORES_ARG, true, "Amount of virtual cores to be "
+-        + "requested to run the application master (default "
+-        + MASTER_VCORES_DEFAULT + ")");
+-    // Dynamometer
+-    opts.addOption(CONF_PATH_ARG, true, "Location of the directory or archive "
+-        + "containing the Hadoop configuration. If this is already on a "
+-        + "remote FS, will save the copy step, but must be an archive file. "
+-        + "This must have the standard Hadoop conf layout containing e.g. "
+-        + "etc/hadoop/*-site.xml");
+-    opts.addOption(BLOCK_LIST_PATH_ARG, true,
+-        "Location on HDFS of the files containing the DN block lists.");
+-    opts.addOption(FS_IMAGE_DIR_ARG, true, "Location of the directory "
+-        + "containing, at minimum, the VERSION file for the namenode. If "
+-        + "running the namenode within YARN (namenode_info_path is not "
+-        + "specified), this must also include the fsimage file and its md5 "
+-        + "hash with names conforming to: `fsimage_XXXXXXXX[.md5]`.");
+-    for (String option :
+-        new String[] {CONF_PATH_ARG, BLOCK_LIST_PATH_ARG, FS_IMAGE_DIR_ARG}) {
+-      opts.getOption(option).setRequired(true);
+-    }
+-    OptionGroup hadoopBinaryGroup = new OptionGroup();
+-    hadoopBinaryGroup.addOption(new Option(HADOOP_BINARY_PATH_ARG, true,
+-        "Location of Hadoop binary to be deployed (archive). One of this or "
+-            + "hadoop_version is required."));
+-    hadoopBinaryGroup.addOption(new Option(HADOOP_VERSION_ARG, true,
+-        "Version of Hadoop (like '2.7.4' or '3.0.0-beta1') for which to "
+-            + "download a binary. If this is specified, a Hadoop tarball "
+-            + "will be downloaded from an Apache mirror. By default the "
+-            + "Berkeley OCF mirror is used; specify "
+-            + DynoInfraUtils.APACHE_DOWNLOAD_MIRROR_KEY
+-            + " as a configuration or system property to change which mirror "
+-            + "is used. The tarball will be downloaded to the working "
+-            + "directory. One of this or hadoop_binary_path is required."));
+-    hadoopBinaryGroup.setRequired(true);
+-    opts.addOptionGroup(hadoopBinaryGroup);
+-    opts.addOption(NAMENODE_SERVICERPC_ADDR_ARG, true, "Specify this option "
+-        + "to run the NameNode external to YARN. This is the service RPC "
+-        + "address of the NameNode, e.g. localhost:9020.");
+-    opts.addOption(TOKEN_FILE_LOCATION_ARG, true, "If specified, this file "
+-        + "will be used as the delegation token(s) for the launched "
+-        + "containers. Otherwise, the delegation token(s) for the default "
+-        + "FileSystem will be used.");
+-    AMOptions.setOptions(opts);
+-
+-    opts.addOption(WORKLOAD_REPLAY_ENABLE_ARG, false, "If specified, this "
+-        + "client will additionally launch the workload replay job to replay "
+-        + "audit logs against the HDFS cluster which is started.");
+-    opts.addOption(WORKLOAD_INPUT_PATH_ARG, true,
+-        "Location of the audit traces to replay (Required for workload)");
+-    opts.addOption(WORKLOAD_OUTPUT_PATH_ARG, true,
+-        "Location of the metrics output (Required for workload)");
+-    opts.addOption(WORKLOAD_THREADS_PER_MAPPER_ARG, true, "Number of threads "
+-        + "per mapper to use to replay the workload. (default "
+-        + AuditReplayMapper.NUM_THREADS_DEFAULT + ")");
+-    opts.addOption(WORKLOAD_START_DELAY_ARG, true, "Delay between launching "
+-        + "the Workload MR job and starting the audit logic replay; this is "
+-        + "used in an attempt to allow all mappers to be launched before any "
+-        + "of them start replaying. Workloads with more mappers may need a "
+-        + "longer delay to get all of the containers allocated. Human-readable "
+-        + "units accepted (e.g. 30s, 10m). (default "
+-        + WorkloadDriver.START_TIME_OFFSET_DEFAULT + ")");
+-    opts.addOption(WORKLOAD_RATE_FACTOR_ARG, true, "Rate factor "
+-        + "(multiplicative speed factor) to apply to workload replay (Default "
+-        + WORKLOAD_RATE_FACTOR_DEFAULT + ")");
+-    opts.addOption(WORKLOAD_CONFIG_ARG, true, "Additional configurations to "
+-        + "pass only to the workload job. This can be used multiple times "
+-        + "and should be specified as a key=value pair, e.g. '-"
+-        + WORKLOAD_CONFIG_ARG + " conf.one=val1 -" + WORKLOAD_CONFIG_ARG
+-        + " conf.two=val2'");
+-  }
+-
+-  /**
+-   * Helper function to print out usage.
+-   */
+-  private void printUsage() {
+-    HelpFormatter formatter = new HelpFormatter();
+-    // Option names are long so increasing the width is helpful
+-    formatter.setWidth(100);
+-    formatter.printHelp("Client", opts);
+-  }
+-
+-  /**
+-   * Parse command line options.
+-   *
+-   * @param args Parsed command line options
+-   * @return Whether the init was successful to run the client
+-   * @throws ParseException on error while parsing
+-   * @throws IOException for other errors
+-   */
+-  public boolean init(String[] args) throws ParseException, IOException {
+-
+-    List<String> list = Arrays.asList(args);
+-    if (list.contains("-h") || list.contains("--help")) {
+-      printUsage();
+-      return false;
+-    }
+-
+-    CommandLineParser parser = new GnuParser();
+-    CommandLine commandLine = parser.parse(opts, args);
+-
+-    yarnClient = YarnClient.createYarnClient();
+-    yarnClient.init(getConf());
+-
+-    LOG.info("Starting with arguments: [\"{}\"]",
+-        Joiner.on("\" \"").join(args));
+-
+-    Path fsImageDir = new Path(commandLine.getOptionValue(FS_IMAGE_DIR_ARG,
+-        ""));
+-    versionFilePath = new Path(fsImageDir, "VERSION").toString();
+-    if (commandLine.hasOption(NAMENODE_SERVICERPC_ADDR_ARG)) {
+-      launchNameNode = false;
+-      remoteNameNodeRpcAddress =
+-          commandLine.getOptionValue(NAMENODE_SERVICERPC_ADDR_ARG);
+-    } else {
+-      launchNameNode = true;
+-      FileSystem localFS = FileSystem.getLocal(getConf());
+-      fsImageDir = fsImageDir.makeQualified(localFS.getUri(),
+-          localFS.getWorkingDirectory());
+-      FileSystem fsImageFS = fsImageDir.getFileSystem(getConf());
+-      FileStatus[] fsImageFiles = fsImageFS.listStatus(fsImageDir,
+-          (path) -> path.getName().matches("^fsimage_(\\d)+$"));
+-      if (fsImageFiles.length != 1) {
+-        throw new IllegalArgumentException(
+-            "Must be exactly one fsimage file present in fs_image_dir");
+-      }
+-      fsImagePath = fsImageFiles[0].getPath().toString();
+-      fsImageMD5Path = fsImageFiles[0].getPath().suffix(".md5").toString();
+-    }
+-
+-    if (amMemory < 0) {
+-      throw new IllegalArgumentException("Invalid memory specified for "
+-          + "application master, exiting. Specified memory=" + amMemory);
+-    }
+-    if (amVCores < 0) {
+-      throw new IllegalArgumentException("Invalid virtual cores specified for "
+-          + "application master, exiting. Specified virtual cores=" + amVCores);
+-    }
+-
+-    this.appName = commandLine.getOptionValue(APPNAME_ARG, APPNAME_DEFAULT);
+-    this.amQueue = commandLine.getOptionValue(QUEUE_ARG, QUEUE_DEFAULT);
+-    this.amMemory = Integer.parseInt(commandLine
+-        .getOptionValue(MASTER_MEMORY_MB_ARG, MASTER_MEMORY_MB_DEFAULT));
+-    this.amVCores = Integer.parseInt(
+-        commandLine.getOptionValue(MASTER_VCORES_ARG, MASTER_VCORES_DEFAULT));
+-    this.confPath = commandLine.getOptionValue(CONF_PATH_ARG);
+-    this.blockListPath = commandLine.getOptionValue(BLOCK_LIST_PATH_ARG);
+-    if (commandLine.hasOption(HADOOP_BINARY_PATH_ARG)) {
+-      this.hadoopBinary = commandLine.getOptionValue(HADOOP_BINARY_PATH_ARG);
+-    } else {
+-      this.hadoopBinary = DynoInfraUtils.fetchHadoopTarball(
+-          new File(".").getAbsoluteFile(),
+-          commandLine.getOptionValue(HADOOP_VERSION_ARG), getConf(), LOG)
+-          .toString();
+-    }
+-    this.amOptions = AMOptions.initFromParser(commandLine);
+-    this.clientTimeout = Integer
+-        .parseInt(commandLine.getOptionValue(TIMEOUT_ARG, TIMEOUT_DEFAULT));
+-    this.tokenFileLocation = commandLine.
+-        getOptionValue(TOKEN_FILE_LOCATION_ARG);
+-
+-    amOptions.verify();
+-
+-    Path blockPath = new Path(blockListPath);
+-    FileSystem blockListFS = blockPath.getFileSystem(getConf());
+-    if (blockListFS.getUri().equals(FileSystem.getLocal(getConf()).getUri())
+-        || !blockListFS.exists(blockPath)) {
+-      throw new IllegalArgumentException(
+-          "block list path must already exist on remote fs!");
+-    }
+-    numTotalDataNodes = blockListFS.listStatus(blockPath,
+-        DynoConstants.BLOCK_LIST_FILE_FILTER).length;
+-
+-    if (commandLine.hasOption(WORKLOAD_REPLAY_ENABLE_ARG)) {
+-      if (!commandLine.hasOption(WORKLOAD_INPUT_PATH_ARG)
+-          || !commandLine.hasOption(WORKLOAD_START_DELAY_ARG)) {
+-        throw new IllegalArgumentException("workload_replay_enable was "
+-            + "specified; must include all required workload_ parameters.");
+-      }
+-      launchWorkloadJob = true;
+-      workloadInputPath = commandLine.getOptionValue(WORKLOAD_INPUT_PATH_ARG);
+-      workloadOutputPath = commandLine.getOptionValue(WORKLOAD_OUTPUT_PATH_ARG);
+-      workloadThreadsPerMapper = Integer
+-          .parseInt(commandLine.getOptionValue(WORKLOAD_THREADS_PER_MAPPER_ARG,
+-              String.valueOf(AuditReplayMapper.NUM_THREADS_DEFAULT)));
+-      workloadRateFactor = Double.parseDouble(commandLine.getOptionValue(
+-          WORKLOAD_RATE_FACTOR_ARG, WORKLOAD_RATE_FACTOR_DEFAULT));
+-      workloadExtraConfigs = new HashMap<>();
+-      if (commandLine.getOptionValues(WORKLOAD_CONFIG_ARG) != null) {
+-        for (String opt : commandLine.getOptionValues(WORKLOAD_CONFIG_ARG)) {
+-          Iterator<String> kvPair =
+-              Splitter.on("=").trimResults().split(opt).iterator();
+-          workloadExtraConfigs.put(kvPair.next(), kvPair.next());
+-        }
+-      }
+-      String delayString = commandLine.getOptionValue(WORKLOAD_START_DELAY_ARG,
+-          WorkloadDriver.START_TIME_OFFSET_DEFAULT);
+-      // Store a temporary config to leverage Configuration's time duration
+-      // parsing.
+-      getConf().set("___temp___", delayString);
+-      workloadStartDelayMs = getConf().getTimeDuration("___temp___", 0,
+-          TimeUnit.MILLISECONDS);
+-    }
+-
+-    return true;
+-  }
+-
+-  /**
+-   * Main run function for the client.
+-   *
+-   * @return true if application completed successfully
+-   * @throws IOException for general issues
+-   * @throws YarnException for issues while contacting YARN daemons
+-   */
+-  public boolean run() throws IOException, YarnException {
+-
+-    LOG.info("Running Client");
+-    yarnClient.start();
+-
+-    YarnClusterMetrics clusterMetrics = yarnClient.getYarnClusterMetrics();
+-    LOG.info("Got Cluster metric info from ASM, numNodeManagers={}",
+-        clusterMetrics.getNumNodeManagers());
+-
+-    QueueInfo queueInfo = yarnClient.getQueueInfo(this.amQueue);
+-    LOG.info("Queue info: queueName={}, queueCurrentCapacity={}, "
+-        + "queueMaxCapacity={}, queueApplicationCount={}, "
+-        + "queueChildQueueCount={}", queueInfo.getQueueName(),
+-        queueInfo.getCurrentCapacity(), queueInfo.getMaximumCapacity(),
+-        queueInfo.getApplications().size(), queueInfo.getChildQueues().size());
+-
+-    // Get a new application id
+-    YarnClientApplication app = yarnClient.createApplication();
+-    GetNewApplicationResponse appResponse = app.getNewApplicationResponse();
+-    long maxMem = appResponse.getMaximumResourceCapability().getMemorySize();
+-    LOG.info("Max mem capabililty of resources in this cluster " + maxMem);
+-    int maxVCores = appResponse.getMaximumResourceCapability()
+-        .getVirtualCores();
+-    LOG.info("Max virtual cores capabililty of resources in this cluster {}",
+-        maxVCores);
+-    if (amMemory > maxMem || amMemory < 0 || amVCores > maxVCores
+-        || amVCores < 0) {
+-      throw new IllegalArgumentException("Invalid AM memory or vcores: memory="
+-          + amMemory + ", vcores=" + amVCores);
+-    }
+-    amOptions.verify(maxMem, maxVCores);
+-
+-    // set the application name
+-    ApplicationSubmissionContext appContext =
+-        app.getApplicationSubmissionContext();
+-    infraAppId = appContext.getApplicationId();
+-    appContext.setApplicationName(appName);
+-
+-    // Set up the container launch context for the application master
+-    ContainerLaunchContext amContainer = Records
+-        .newRecord(ContainerLaunchContext.class);
+-    Map<ApplicationAccessType, String> acls = new HashMap<>();
+-    acls.put(ApplicationAccessType.VIEW_APP, getConf().get(
+-        MRJobConfig.JOB_ACL_VIEW_JOB, MRJobConfig.DEFAULT_JOB_ACL_VIEW_JOB));
+-    amContainer.setApplicationACLs(acls);
+-
+-    FileSystem fs = FileSystem.get(getConf());
+-    fs.mkdirs(getRemoteStoragePath(getConf(), infraAppId));
+-
+-    // Set the env variables to be setup in the env where the application master
+-    // will be run
+-    Map<String, String> env = setupRemoteResourcesGetEnv();
+-
+-    amContainer.setEnvironment(env);
+-
+-    // All of the resources for both AM and NN/DNs have been put on remote
+-    // storage
+-    // Only the application master JAR is needed as a local resource for the AM
+-    // so
+-    // we explicitly add it here
+-    Map<String, LocalResource> localResources = new HashMap<>();
+-    LocalResource scRsrc = LocalResource.newInstance(
+-        org.apache.hadoop.yarn.api.records.URL
+-            .fromPath(DynoConstants.DYNO_DEPENDENCIES.getPath(env)),
+-        LocalResourceType.ARCHIVE, LocalResourceVisibility.APPLICATION,
+-        DynoConstants.DYNO_DEPENDENCIES.getLength(env),
+-        DynoConstants.DYNO_DEPENDENCIES.getTimestamp(env));
+-    localResources.put(DynoConstants.DYNO_DEPENDENCIES.getResourcePath(),
+-        scRsrc);
+-    // Set local resource info into app master container launch context
+-    amContainer.setLocalResources(localResources);
+-
+-    // Set the necessary command to execute the application master
+-    amContainer.setCommands(getAMCommand());
+-
+-    Resource capability = Records.newRecord(Resource.class);
+-    capability.setMemorySize(amMemory);
+-    capability.setVirtualCores(amVCores);
+-    appContext.setResource(capability);
+-
+-    // Setup security tokens
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      ByteBuffer fsTokens;
+-      if (tokenFileLocation != null) {
+-        fsTokens = ByteBuffer
+-            .wrap(Files.readAllBytes(Paths.get(tokenFileLocation)));
+-      } else {
+-        Credentials credentials = new Credentials();
+-        String tokenRenewer = getConf().get(YarnConfiguration.RM_PRINCIPAL);
+-        if (tokenRenewer == null || tokenRenewer.length() == 0) {
+-          throw new IOException("Can't get Master Kerberos principal for the "
+-              + "RM to use as renewer");
+-        }
+-
+-        // For now, only getting tokens for the default file-system.
+-        final Token<?>[] tokens = fs.addDelegationTokens(tokenRenewer,
+-            credentials);
+-        if (tokens != null) {
+-          for (Token<?> token : tokens) {
+-            LOG.info("Got dt for " + fs.getUri() + "; " + token);
+-          }
+-        }
+-        DataOutputBuffer dob = new DataOutputBuffer();
+-        credentials.writeTokenStorageToStream(dob);
+-        fsTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-      }
+-      amContainer.setTokens(fsTokens);
+-    }
+-
+-    appContext.setAMContainerSpec(amContainer);
+-
+-    // Set the queue to which this application is to be submitted in the RM
+-    appContext.setQueue(amQueue);
+-
+-    LOG.info("Submitting application to RM");
+-    yarnClient.submitApplication(appContext);
+-
+-    // Monitor the application
+-    return monitorInfraApplication();
+-
+-  }
+-
+-  /**
+-   * Set up the remote resources for the application. Upload them to remote
+-   * storage as necessary, and set up the requisite environment variables. Does
+-   * not set up any local resources.
+-   *
+-   * @return A Map representing the environment to be used for the
+-   *         ApplicationMaster containing the information about all of the
+-   *         remote resources.
+-   */
+-  private Map<String, String> setupRemoteResourcesGetEnv() throws IOException {
+-    LOG.info("Set the environment for the application master");
+-    Map<String, String> env = new HashMap<>();
+-
+-    // Copy local resources to a remote FS to prepare them for localization
+-    // by containers. We do not need to set them as local resources here as
+-    // the AM does not need them.
+-    if (launchNameNode) {
+-      setupRemoteResource(infraAppId, DynoConstants.FS_IMAGE, env, fsImagePath);
+-      setupRemoteResource(infraAppId, DynoConstants.FS_IMAGE_MD5, env,
+-          fsImageMD5Path);
+-    } else {
+-      env.put(DynoConstants.REMOTE_NN_RPC_ADDR_ENV, remoteNameNodeRpcAddress);
+-    }
+-    setupRemoteResource(infraAppId, DynoConstants.VERSION, env,
+-        versionFilePath);
+-    setupRemoteResource(infraAppId, DynoConstants.CONF_ZIP, env, confPath);
+-    setupRemoteResource(infraAppId, DynoConstants.START_SCRIPT, env,
+-        START_SCRIPT_LOCATION);
+-    setupRemoteResource(infraAppId, DynoConstants.HADOOP_BINARY, env,
+-        hadoopBinary);
+-    setupRemoteResource(infraAppId, DynoConstants.DYNO_DEPENDENCIES, env,
+-        dependencyJars);
+-
+-    env.put(DynoConstants.BLOCK_LIST_PATH_ENV, blockListPath);
+-    env.put(DynoConstants.JOB_ACL_VIEW_ENV, getConf().get(
+-        MRJobConfig.JOB_ACL_VIEW_JOB, MRJobConfig.DEFAULT_JOB_ACL_VIEW_JOB));
+-
+-    env.put(DynoConstants.REMOTE_STORAGE_PATH_ENV,
+-        getRemoteStoragePath(getConf(), infraAppId).toString());
+-
+-    env.put(Environment.CLASSPATH.key(), getAMClassPathEnv());
+-    return env;
+-  }
+-
+-  private String getAMClassPathEnv() {
+-    // Add AppMaster.jar location to classpath
+-    // At some point we should not be required to add
+-    // the hadoop specific classpaths to the env.
+-    // It should be provided out of the box.
+-    // For now setting all required classpaths including
+-    // the classpath to "." for the application jar
+-    StringBuilder classPathEnv = new StringBuilder(Environment.CLASSPATH.$())
+-        .append(ApplicationConstants.CLASS_PATH_SEPARATOR).append("./")
+-        .append(DynoConstants.DYNO_DEPENDENCIES.getResourcePath()).append("/*");
+-    for (String c : getConf().getStrings(
+-        YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-        YarnConfiguration.DEFAULT_YARN_APPLICATION_CLASSPATH)) {
+-      classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR);
+-      classPathEnv.append(c.trim());
+-    }
+-    classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR)
+-        .append("./log4j.properties");
+-
+-    // add the runtime classpath needed for tests to work
+-    if (getConf().getBoolean(YarnConfiguration.IS_MINI_YARN_CLUSTER, false)) {
+-      classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR);
+-      classPathEnv.append(System.getProperty("java.class.path"));
+-    }
+-    return classPathEnv.toString();
+-  }
+-
+-  private List<String> getAMCommand() {
+-    List<String> vargs = new ArrayList<>();
+-
+-    // Set java executable command
+-    vargs.add(Environment.JAVA_HOME.$() + "/bin/java");
+-    // Set Xmx based on am memory size
+-    long appMasterHeapSize = Math.round(amMemory * 0.85);
+-    vargs.add("-Xmx" + appMasterHeapSize + "m");
+-    // Set class name
+-    vargs.add(ApplicationMaster.class.getCanonicalName());
+-    // Set params for Application Master
+-
+-    amOptions.addToVargs(vargs);
+-
+-    vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout");
+-    vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr");
+-
+-    LOG.info("Completed setting up app master command: " + vargs);
+-    return Lists.newArrayList(Joiner.on(" ").join(vargs));
+-  }
+-
+-  /**
+-   * Upload a local resource to HDFS, or if it is nonlocal, just set environment
+-   * appropriately. The location, length and timestamp information is added to
+-   * AM container's environment, so it can launch containers later with the
+-   * correct resource settings.
+-   */
+-  private void setupRemoteResource(ApplicationId appId, DynoResource resource,
+-      Map<String, String> env, String... srcPaths) throws IOException {
+-
+-    FileStatus remoteFileStatus;
+-    Path dstPath;
+-
+-    Preconditions.checkArgument(srcPaths.length > 0,
+-        "Must supply at least one source path");
+-    Preconditions.checkArgument(
+-        resource.getType() == LocalResourceType.ARCHIVE || srcPaths.length == 1,
+-        "Can only specify multiple source paths if using an ARCHIVE type");
+-
+-    List<URI> srcURIs = Arrays.stream(srcPaths).map(URI::create)
+-        .collect(Collectors.toList());
+-    Set<String> srcSchemes = srcURIs.stream().map(URI::getScheme)
+-        .collect(Collectors.toSet());
+-    Preconditions.checkArgument(srcSchemes.size() == 1,
+-        "All source paths must have the same scheme");
+-    String srcScheme = srcSchemes.iterator().next();
+-
+-    String srcPathString = "[" + Joiner.on(",").join(srcPaths) + "]";
+-
+-    if (srcScheme == null
+-        || srcScheme.equals(FileSystem.getLocal(getConf()).getScheme())
+-        || srcScheme.equals("jar")) {
+-      // Need to upload this resource to remote storage
+-      List<File> srcFiles = srcURIs.stream().map(URI::getSchemeSpecificPart)
+-          .map(File::new).collect(Collectors.toList());
+-      Path dstPathBase = getRemoteStoragePath(getConf(), appId);
+-      boolean shouldArchive = srcFiles.size() > 1
+-          || srcFiles.get(0).isDirectory()
+-          || (resource.getType() == LocalResourceType.ARCHIVE
+-              && Arrays.stream(ARCHIVE_FILE_TYPES).noneMatch(
+-                  suffix -> srcFiles.get(0).getName().endsWith(suffix)));
+-      if (shouldArchive) {
+-        if ("jar".equals(srcScheme)) {
+-          throw new IllegalArgumentException(String.format("Resources in JARs "
+-                  + "can't be zipped; resource %s is ARCHIVE and src is: %s",
+-              resource.getResourcePath(), srcPathString));
+-        } else if (resource.getType() != LocalResourceType.ARCHIVE) {
+-          throw new IllegalArgumentException(
+-              String.format("Resource type is %s but srcPaths were: %s",
+-                  resource.getType(), srcPathString));
+-        }
+-        dstPath = new Path(dstPathBase, resource.getResourcePath())
+-            .suffix(".zip");
+-      } else {
+-        dstPath = new Path(dstPathBase, srcFiles.get(0).getName());
+-      }
+-      FileSystem remoteFS = dstPath.getFileSystem(getConf());
+-      LOG.info("Uploading resource " + resource + " from " + srcPathString
+-          + " to " + dstPath);
+-      try (OutputStream outputStream = remoteFS.create(dstPath, true)) {
+-        if ("jar".equals(srcScheme)) {
+-          try (InputStream inputStream = new URL(srcPaths[0]).openStream()) {
+-            IOUtils.copyBytes(inputStream, outputStream, getConf());
+-          }
+-        } else if (shouldArchive) {
+-          List<File> filesToZip;
+-          if (srcFiles.size() == 1 && srcFiles.get(0).isDirectory()) {
+-            File[] childFiles = srcFiles.get(0).listFiles();
+-            if (childFiles == null || childFiles.length == 0) {
+-              throw new IllegalArgumentException(
+-                  "Specified a directory to archive with no contents");
+-            }
+-            filesToZip = Lists.newArrayList(childFiles);
+-          } else {
+-            filesToZip = srcFiles;
+-          }
+-          ZipOutputStream zout = new ZipOutputStream(outputStream);
+-          for (File fileToZip : filesToZip) {
+-            addFileToZipRecursively(fileToZip.getParentFile(), fileToZip, zout);
+-          }
+-          zout.close();
+-        } else {
+-          try (InputStream inputStream = new FileInputStream(srcFiles.get(0))) {
+-            IOUtils.copyBytes(inputStream, outputStream, getConf());
+-          }
+-        }
+-      }
+-      remoteFileStatus = remoteFS.getFileStatus(dstPath);
+-    } else {
+-      if (srcPaths.length > 1) {
+-        throw new IllegalArgumentException("If resource is on remote, must be "
+-            + "a single file: " + srcPathString);
+-      }
+-      LOG.info("Using resource {} directly from current location: {}",
+-          resource, srcPaths[0]);
+-      dstPath = new Path(srcPaths[0]);
+-      // non-local file system; we can just use it directly from where it is
+-      remoteFileStatus = FileSystem.get(dstPath.toUri(), getConf())
+-          .getFileStatus(dstPath);
+-      if (remoteFileStatus.isDirectory()) {
+-        throw new IllegalArgumentException("If resource is on remote "
+-            + "filesystem, must be a file: " + srcPaths[0]);
+-      }
+-    }
+-    env.put(resource.getLocationEnvVar(), dstPath.toString());
+-    env.put(resource.getTimestampEnvVar(),
+-        String.valueOf(remoteFileStatus.getModificationTime()));
+-    env.put(resource.getLengthEnvVar(),
+-        String.valueOf(remoteFileStatus.getLen()));
+-  }
+-
+-  /**
+-   * Get the directory on the default FS which will be used for storing files
+-   * relevant to this Dynamometer application. This is inside of the
+-   * {@value DynoConstants#DYNAMOMETER_STORAGE_DIR} directory within the
+-   * submitter's home directory.
+-   *
+-   * @param conf Configuration for this application.
+-   * @param appId This application's ID.
+-   * @return Fully qualified path on the default FS.
+-   */
+-  private static Path getRemoteStoragePath(Configuration conf,
+-      ApplicationId appId) throws IOException {
+-    FileSystem remoteFS = FileSystem.get(conf);
+-    return remoteFS.makeQualified(new Path(remoteFS.getHomeDirectory(),
+-        DynoConstants.DYNAMOMETER_STORAGE_DIR + "/" + appId));
+-  }
+-
+-  private void addFileToZipRecursively(File root, File file,
+-      ZipOutputStream out) throws IOException {
+-
+-    File[] files = file.listFiles();
+-    if (files == null) { // Not a directory
+-      String relativePath = file.getAbsolutePath()
+-          .substring(root.getAbsolutePath().length() + 1);
+-      try {
+-        try (FileInputStream in = new FileInputStream(file.getAbsolutePath())) {
+-          out.putNextEntry(new ZipEntry(relativePath));
+-          IOUtils.copyBytes(in, out, getConf(), false);
+-          out.closeEntry();
+-        }
+-      } catch (FileNotFoundException fnfe) {
+-        LOG.warn("Skipping file; it is a symlink with a nonexistent target: {}",
+-            file);
+-      }
+-    } else {
+-      for (File containedFile : files) {
+-        addFileToZipRecursively(root, containedFile, out);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Monitor the submitted application for completion. Kill application if time
+-   * expires.
+-   *
+-   * @return true if application completed successfully
+-   */
+-  private boolean monitorInfraApplication() throws YarnException, IOException {
+-
+-    boolean loggedApplicationInfo = false;
+-    boolean success = false;
+-
+-    Thread namenodeMonitoringThread = new Thread(() -> {
+-      Supplier<Boolean> exitCritera = () ->
+-          Apps.isApplicationFinalState(infraAppState);
+-      Optional<Properties> namenodeProperties = Optional.empty();
+-      while (!exitCritera.get()) {
+-        try {
+-          if (!namenodeProperties.isPresent()) {
+-            namenodeProperties = DynoInfraUtils
+-                .waitForAndGetNameNodeProperties(exitCritera, getConf(),
+-                    getNameNodeInfoPath(), LOG);
+-            if (namenodeProperties.isPresent()) {
+-              Properties props = namenodeProperties.get();
+-              LOG.info("NameNode can be reached via HDFS at: {}",
+-                  DynoInfraUtils.getNameNodeHdfsUri(props));
+-              LOG.info("NameNode web UI available at: {}",
+-                  DynoInfraUtils.getNameNodeWebUri(props));
+-              LOG.info("NameNode can be tracked at: {}",
+-                  DynoInfraUtils.getNameNodeTrackingUri(props));
+-            } else {
+-              // Only happens if we should be shutting down
+-              break;
+-            }
+-          }
+-          DynoInfraUtils.waitForNameNodeStartup(namenodeProperties.get(),
+-              exitCritera, LOG);
+-          DynoInfraUtils.waitForNameNodeReadiness(namenodeProperties.get(),
+-              numTotalDataNodes, false, exitCritera, getConf(), LOG);
+-          break;
+-        } catch (IOException ioe) {
+-          LOG.error(
+-              "Unexpected exception while waiting for NameNode readiness",
+-              ioe);
+-        } catch (InterruptedException ie) {
+-          return;
+-        }
+-      }
+-      if (!Apps.isApplicationFinalState(infraAppState) && launchWorkloadJob) {
+-        launchAndMonitorWorkloadDriver(namenodeProperties.get());
+-      }
+-    });
+-    if (launchNameNode) {
+-      namenodeMonitoringThread.start();
+-    }
+-
+-    while (true) {
+-
+-      // Check app status every 1 second.
+-      try {
+-        Thread.sleep(1000);
+-      } catch (InterruptedException e) {
+-        LOG.debug("Thread sleep in monitoring loop interrupted");
+-      }
+-
+-      // Get application report for the appId we are interested in
+-      ApplicationReport report = yarnClient.getApplicationReport(infraAppId);
+-
+-      if (report.getTrackingUrl() != null && !loggedApplicationInfo) {
+-        loggedApplicationInfo = true;
+-        LOG.info("Track the application at: " + report.getTrackingUrl());
+-        LOG.info("Kill the application using: yarn application -kill "
+-            + report.getApplicationId());
+-      }
+-
+-      LOG.debug("Got application report from ASM for: appId={}, "
+-          + "clientToAMToken={}, appDiagnostics={}, appMasterHost={}, "
+-          + "appQueue={}, appMasterRpcPort={}, appStartTime={}, "
+-          + "yarnAppState={}, distributedFinalState={}, appTrackingUrl={}, "
+-          + "appUser={}",
+-          infraAppId.getId(), report.getClientToAMToken(),
+-          report.getDiagnostics(), report.getHost(), report.getQueue(),
+-          report.getRpcPort(), report.getStartTime(),
+-          report.getYarnApplicationState(), report.getFinalApplicationStatus(),
+-          report.getTrackingUrl(), report.getUser());
+-
+-      infraAppState = report.getYarnApplicationState();
+-      if (infraAppState == YarnApplicationState.KILLED) {
+-        if (!launchWorkloadJob) {
+-          success = true;
+-        } else if (workloadJob == null) {
+-          LOG.error("Infra app was killed before workload job was launched.");
+-        } else if (!workloadJob.isComplete()) {
+-          LOG.error("Infra app was killed before workload job completed.");
+-        } else if (workloadJob.isSuccessful()) {
+-          success = true;
+-        }
+-        LOG.info("Infra app was killed; exiting from client.");
+-        break;
+-      } else if (infraAppState == YarnApplicationState.FINISHED
+-          || infraAppState == YarnApplicationState.FAILED) {
+-        LOG.info("Infra app exited unexpectedly. YarnState="
+-            + infraAppState.toString() + ". Exiting from client.");
+-        break;
+-      }
+-
+-      if ((clientTimeout != -1)
+-          && (System.currentTimeMillis() > (clientStartTime + clientTimeout))) {
+-        LOG.info("Reached client specified timeout of {} ms for application. "
+-            + "Killing application", clientTimeout);
+-        attemptCleanup();
+-        break;
+-      }
+-
+-      if (isCompleted(workloadAppState)) {
+-        LOG.info("Killing infrastructure app");
+-        try {
+-          forceKillApplication(infraAppId);
+-        } catch (YarnException | IOException e) {
+-          LOG.error("Exception encountered while killing infra app", e);
+-        }
+-      }
+-    }
+-    if (launchNameNode) {
+-      try {
+-        namenodeMonitoringThread.interrupt();
+-        namenodeMonitoringThread.join();
+-      } catch (InterruptedException ie) {
+-        LOG.warn("Interrupted while joining workload job thread; "
+-            + "continuing to cleanup.");
+-      }
+-    }
+-    attemptCleanup();
+-    return success;
+-  }
+-
+-  /**
+-   * Return the path to the property file containing information about the
+-   * launched NameNode.
+-   */
+-  @VisibleForTesting
+-  Path getNameNodeInfoPath() throws IOException {
+-    return new Path(getRemoteStoragePath(getConf(), infraAppId),
+-        DynoConstants.NN_INFO_FILE_NAME);
+-  }
+-
+-  /**
+-   * Launch the workload driver ({@link WorkloadDriver}) and monitor the job.
+-   * Waits for the launched job to complete.
+-   *
+-   * @param nameNodeProperties The set of properties with information about the
+-   *                           launched NameNode.
+-   */
+-  private void launchAndMonitorWorkloadDriver(Properties nameNodeProperties) {
+-    URI nameNodeURI = DynoInfraUtils.getNameNodeHdfsUri(nameNodeProperties);
+-    LOG.info("Launching workload job using input path: " + workloadInputPath);
+-    try {
+-      long workloadStartTime = System.currentTimeMillis()
+-          + workloadStartDelayMs;
+-      Configuration workloadConf = new Configuration(getConf());
+-      workloadConf.set(AuditReplayMapper.INPUT_PATH_KEY, workloadInputPath);
+-      workloadConf.set(AuditReplayMapper.OUTPUT_PATH_KEY, workloadOutputPath);
+-      workloadConf.setInt(AuditReplayMapper.NUM_THREADS_KEY,
+-          workloadThreadsPerMapper);
+-      workloadConf.setDouble(AuditReplayMapper.RATE_FACTOR_KEY,
+-          workloadRateFactor);
+-      for (Map.Entry<String, String> configPair : workloadExtraConfigs
+-          .entrySet()) {
+-        workloadConf.set(configPair.getKey(), configPair.getValue());
+-      }
+-      workloadJob = WorkloadDriver.getJobForSubmission(workloadConf,
+-          nameNodeURI.toString(), workloadStartTime, AuditReplayMapper.class);
+-      workloadJob.submit();
+-      while (!Apps.isApplicationFinalState(infraAppState) &&
+-          !isCompleted(workloadAppState)) {
+-        workloadJob.monitorAndPrintJob();
+-        Thread.sleep(5000);
+-        workloadAppState = workloadJob.getJobState();
+-      }
+-      if (isCompleted(workloadAppState)) {
+-        LOG.info("Workload job completed successfully!");
+-      } else {
+-        LOG.warn("Workload job failed.");
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Exception encountered while running workload job", e);
+-    }
+-  }
+-
+-  /**
+-   * Best-effort attempt to clean up any remaining applications (infrastructure
+-   * or workload).
+-   */
+-  public void attemptCleanup() {
+-    LOG.info("Attempting to clean up remaining running applications.");
+-    if (workloadJob != null) {
+-      try {
+-        workloadAppState = workloadJob.getJobState();
+-      } catch (IOException ioe) {
+-        LOG.warn("Unable to fetch completion status of workload job. Will "
+-                + "proceed to attempt to kill it.", ioe);
+-      } catch (InterruptedException ie) {
+-        Thread.currentThread().interrupt();
+-        return;
+-      }
+-      if (!isCompleted(workloadAppState)) {
+-        try {
+-          LOG.info("Attempting to kill workload app: {}",
+-              workloadJob.getJobID());
+-          workloadJob.killJob();
+-          LOG.info("Killed workload app");
+-        } catch (IOException ioe) {
+-          LOG.error("Unable to kill workload app ({})", workloadJob.getJobID(),
+-              ioe);
+-        }
+-      }
+-    }
+-    if (infraAppId != null && !Apps.isApplicationFinalState(infraAppState)) {
+-      try {
+-        LOG.info("Attempting to kill infrastructure app: " + infraAppId);
+-        forceKillApplication(infraAppId);
+-        LOG.info("Killed infrastructure app");
+-      } catch (YarnException | IOException e) {
+-        LOG.error("Unable to kill infrastructure app ({})", infraAppId, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Check if the input state represents completion.
+-   */
+-  private static boolean isCompleted(JobStatus.State state) {
+-    return state == JobStatus.State.SUCCEEDED || state == JobStatus.State.FAILED
+-        || state == JobStatus.State.KILLED;
+-  }
+-
+-  /**
+-   * Kill a submitted application by sending a call to the AM.
+-   *
+-   * @param appId Application Id to be killed.
+-   */
+-  private void forceKillApplication(ApplicationId appId)
+-      throws YarnException, IOException {
+-    // Response can be ignored as it is non-null on success or
+-    // throws an exception in case of failures
+-    yarnClient.killApplication(appId);
+-  }
+-
+-  @VisibleForTesting
+-  Job getWorkloadJob() {
+-    return workloadJob;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoConstants.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoConstants.java
+deleted file mode 100644
+index c789f67502a..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoConstants.java
++++ /dev/null
+@@ -1,130 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import java.util.regex.Pattern;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.fs.PathFilter;
+-
+-import static org.apache.hadoop.yarn.api.records.LocalResourceType.*;
+-
+-/**
+- * Constants used in both Client and Application Master.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-public final class DynoConstants {
+-
+-  private DynoConstants() {}
+-
+-  // Directory to use for remote storage (a location on the remote FS which
+-  // can be accessed by all components). This will be the name of the directory
+-  // within the submitter's home directory.
+-  public static final String DYNAMOMETER_STORAGE_DIR = ".dynamometer";
+-
+-  /* The following used for Client -> AM communication */
+-
+-  // Resource for the zip file of all of the configuration for the
+-  // DataNodes/NameNode
+-  public static final DynoResource CONF_ZIP =
+-      new DynoResource("CONF_ZIP", ARCHIVE, "conf");
+-  // Resource for the Hadoop binary archive (distribution tar)
+-  public static final DynoResource HADOOP_BINARY =
+-      new DynoResource("HADOOP_BINARY", ARCHIVE, "hadoopBinary");
+-  // Resource for the script used to start the DataNodes/NameNode
+-  public static final DynoResource START_SCRIPT =
+-      new DynoResource("START_SCRIPT", FILE, "start-component.sh");
+-  // Resource for the file system image file used by the NameNode
+-  public static final DynoResource FS_IMAGE =
+-      new DynoResource("FS_IMAGE", FILE, null);
+-  // Resource for the md5 file accompanying the file system image for the
+-  // NameNode
+-  public static final DynoResource FS_IMAGE_MD5 =
+-      new DynoResource("FS_IMAGE_MD5", FILE, null);
+-  // Resource for the VERSION file accompanying the file system image
+-  public static final DynoResource VERSION =
+-      new DynoResource("VERSION", FILE, "VERSION");
+-  // Resource for the archive containing all dependencies
+-  public static final DynoResource DYNO_DEPENDENCIES =
+-      new DynoResource("DYNO_DEPS", ARCHIVE, "dependencies");
+-
+-  // Environment variable which will contain the location of the directory
+-  // which holds all of the block files for the DataNodes
+-  public static final String BLOCK_LIST_PATH_ENV = "BLOCK_ZIP_PATH";
+-  // The format of the name of a single block file
+-  public static final Pattern BLOCK_LIST_FILE_PATTERN =
+-      Pattern.compile("dn[0-9]+-a-[0-9]+-r-[0-9]+");
+-  // The file name to use when localizing the block file on a DataNode; will be
+-  // suffixed with an integer
+-  public static final String BLOCK_LIST_RESOURCE_PATH_PREFIX = "blocks/block";
+-  public static final PathFilter BLOCK_LIST_FILE_FILTER = (path) ->
+-      DynoConstants.BLOCK_LIST_FILE_PATTERN.matcher(path.getName()).find();
+-
+-  // Environment variable which will contain the full path of the directory
+-  // which should be used for remote (shared) storage
+-  public static final String REMOTE_STORAGE_PATH_ENV = "REMOTE_STORAGE_PATH";
+-  // Environment variable which will contain the RPC address of the NameNode
+-  // which the DataNodes should contact, if the NameNode is not launched
+-  // internally by this application
+-  public static final String REMOTE_NN_RPC_ADDR_ENV = "REMOTE_NN_RPC_ADDR";
+-
+-  // Environment variable which will contain the view ACLs for the launched
+-  // containers.
+-  public static final String JOB_ACL_VIEW_ENV = "JOB_ACL_VIEW";
+-
+-  /* The following used for AM -> DN, NN communication */
+-
+-  // The name of the file which will store information about the NameNode
+-  // (within the remote storage directory)
+-  public static final String NN_INFO_FILE_NAME = "nn_info.prop";
+-
+-  // Environment variable which will contain additional arguments for the
+-  // NameNode
+-  public static final String NN_ADDITIONAL_ARGS_ENV = "NN_ADDITIONAL_ARGS";
+-  // Environment variable which will contain additional arguments for the
+-  // DataNode
+-  public static final String DN_ADDITIONAL_ARGS_ENV = "DN_ADDITIONAL_ARGS";
+-  // Environment variable which will contain the directory to use for the
+-  // NameNode's name directory;
+-  // if not specified a directory within the YARN container working directory
+-  // will be used.
+-  public static final String NN_NAME_DIR_ENV = "NN_NAME_DIR";
+-  // Environment variable which will contain the directory to use for the
+-  // NameNode's edits directory;
+-  // if not specified a directory within the YARN container working directory
+-  // will be used.
+-  public static final String NN_EDITS_DIR_ENV = "NN_EDITS_DIR";
+-
+-  public static final String NN_FILE_METRIC_PERIOD_ENV =
+-      "NN_FILE_METRIC_PERIOD";
+-
+-  /*
+-   * These are used as the names of properties and as the environment variables
+-   */
+-
+-  // The port to use on the NameNode host when contacting for client RPCs
+-  public static final String NN_RPC_PORT = "NN_RPC_PORT";
+-  // The hostname of the machine running the NameNode
+-  public static final String NN_HOSTNAME = "NN_HOSTNAME";
+-  // The port to use on the NameNode host when contacting for service RPCs
+-  public static final String NN_SERVICERPC_PORT = "NN_SERVICERPC_PORT";
+-  // The port to use on the NameNode host when contacting for HTTP access
+-  public static final String NN_HTTP_PORT = "NN_HTTP_PORT";
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java
+deleted file mode 100644
+index f6c8a6ac4d5..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoInfraUtils.java
++++ /dev/null
+@@ -1,594 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.net.HttpURLConnection;
+-import java.net.InetSocketAddress;
+-import java.net.MalformedURLException;
+-import java.net.URI;
+-import java.net.URL;
+-import java.nio.charset.StandardCharsets;
+-import java.util.HashSet;
+-import java.util.Optional;
+-import java.util.Properties;
+-import java.util.Set;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-import java.util.function.Supplier;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.commons.io.IOUtils;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.DFSUtilClient;
+-import org.apache.hadoop.hdfs.DistributedFileSystem;
+-import org.apache.hadoop.hdfs.client.BlockReportOptions;
+-import org.apache.hadoop.hdfs.protocol.ClientDatanodeProtocol;
+-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonToken;
+-import org.slf4j.Logger;
+-
+-
+-/**
+- * A collection of utilities used by the Dynamometer infrastructure application.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-public final class DynoInfraUtils {
+-
+-  private DynoInfraUtils() {}
+-
+-  public static final String DYNO_CONF_PREFIX = "dyno.";
+-  public static final String DYNO_INFRA_PREFIX = DYNO_CONF_PREFIX + "infra.";
+-
+-  public static final String APACHE_DOWNLOAD_MIRROR_KEY = DYNO_CONF_PREFIX
+-      + "apache-mirror";
+-  // Set a generic mirror as the default.
+-  public static final String APACHE_DOWNLOAD_MIRROR_DEFAULT =
+-      "http://mirrors.ocf.berkeley.edu/apache/";
+-  private static final String APACHE_DOWNLOAD_MIRROR_SUFFIX_FORMAT =
+-      "hadoop/common/hadoop-%s/hadoop-%s.tar.gz";
+-  public static final String HADOOP_TAR_FILENAME_FORMAT = "hadoop-%s.tar.gz";
+-
+-  public static final String DATANODE_LIVE_MIN_FRACTION_KEY =
+-      DYNO_INFRA_PREFIX + "ready.datanode-min-fraction";
+-  public static final float DATANODE_LIVE_MIN_FRACTION_DEFAULT = 0.99f;
+-  public static final String MISSING_BLOCKS_MAX_FRACTION_KEY =
+-      DYNO_INFRA_PREFIX + "ready.missing-blocks-max-fraction";
+-  public static final float MISSING_BLOCKS_MAX_FRACTION_DEFAULT = 0.0001f;
+-  public static final String UNDERREPLICATED_BLOCKS_MAX_FRACTION_KEY =
+-      DYNO_INFRA_PREFIX + "ready.underreplicated-blocks-max-fraction";
+-  public static final float UNDERREPLICATED_BLOCKS_MAX_FRACTION_DEFAULT = 0.01f;
+-
+-  // The JMX bean queries to execute for various beans.
+-  public static final String NAMENODE_STARTUP_PROGRESS_JMX_QUERY =
+-      "Hadoop:service=NameNode,name=StartupProgress";
+-  public static final String FSNAMESYSTEM_JMX_QUERY =
+-      "Hadoop:service=NameNode,name=FSNamesystem";
+-  public static final String FSNAMESYSTEM_STATE_JMX_QUERY =
+-      "Hadoop:service=NameNode,name=FSNamesystemState";
+-  public static final String NAMENODE_INFO_JMX_QUERY =
+-      "Hadoop:service=NameNode,name=NameNodeInfo";
+-  // The JMX property names of various properties.
+-  public static final String JMX_MISSING_BLOCKS = "MissingBlocks";
+-  public static final String JMX_UNDER_REPLICATED_BLOCKS =
+-      "UnderReplicatedBlocks";
+-  public static final String JMX_BLOCKS_TOTAL = "BlocksTotal";
+-  public static final String JMX_LIVE_NODE_COUNT = "NumLiveDataNodes";
+-  public static final String JMX_LIVE_NODES_LIST = "LiveNodes";
+-
+-  /**
+-   * If a file matching {@value HADOOP_TAR_FILENAME_FORMAT} and {@code version}
+-   * is found in {@code destinationDir}, return its path. Otherwise, first
+-   * download the tarball from an Apache mirror. If the
+-   * {@value APACHE_DOWNLOAD_MIRROR_KEY} configuration or system property
+-   * (checked in that order) is set, use that as the mirror; else use
+-   * {@value APACHE_DOWNLOAD_MIRROR_DEFAULT}.
+-   *
+-   * @param destinationDir destination directory to save a tarball
+-   * @param version The version of Hadoop to download, like "2.7.4"
+-   *                or "3.0.0-beta1"
+-   * @param conf configuration
+-   * @param log logger instance
+-   * @return The path to the tarball.
+-   * @throws IOException on failure
+-   */
+-  public static File fetchHadoopTarball(File destinationDir, String version,
+-      Configuration conf, Logger log) throws IOException {
+-    log.info("Looking for Hadoop tarball for version: " + version);
+-    File destinationFile = new File(destinationDir,
+-        String.format(HADOOP_TAR_FILENAME_FORMAT, version));
+-    if (destinationFile.exists()) {
+-      log.info("Found tarball at: " + destinationFile.getAbsolutePath());
+-      return destinationFile;
+-    }
+-    String apacheMirror = conf.get(APACHE_DOWNLOAD_MIRROR_KEY);
+-    if (apacheMirror == null) {
+-      apacheMirror = System.getProperty(APACHE_DOWNLOAD_MIRROR_KEY,
+-          APACHE_DOWNLOAD_MIRROR_DEFAULT);
+-    }
+-
+-    if (!destinationDir.exists()) {
+-      if (!destinationDir.mkdirs()) {
+-        throw new IOException("Unable to create local dir: " + destinationDir);
+-      }
+-    }
+-    URL downloadURL = new URL(apacheMirror + String
+-        .format(APACHE_DOWNLOAD_MIRROR_SUFFIX_FORMAT, version, version));
+-    log.info("Downloading tarball from: <{}> to <{}>", downloadURL,
+-        destinationFile.getAbsolutePath());
+-    FileUtils.copyURLToFile(downloadURL, destinationFile, 10000, 60000);
+-    log.info("Completed downloading of Hadoop tarball");
+-    return destinationFile;
+-  }
+-
+-  /**
+-   * Get the URI that can be used to access the launched NameNode for HDFS RPCs.
+-   *
+-   * @param nameNodeProperties The set of properties representing the
+-   *                           information about the launched NameNode.
+-   * @return The HDFS URI.
+-   */
+-  static URI getNameNodeHdfsUri(Properties nameNodeProperties) {
+-    return URI.create(String.format("hdfs://%s:%s/",
+-        nameNodeProperties.getProperty(DynoConstants.NN_HOSTNAME),
+-        nameNodeProperties.getProperty(DynoConstants.NN_RPC_PORT)));
+-  }
+-
+-  /**
+-   * Get the URI that can be used to access the launched NameNode for HDFS
+-   * Service RPCs (i.e. from DataNodes).
+-   *
+-   * @param nameNodeProperties The set of properties representing the
+-   *                           information about the launched NameNode.
+-   * @return The service RPC URI.
+-   */
+-  static URI getNameNodeServiceRpcAddr(Properties nameNodeProperties) {
+-    return URI.create(String.format("hdfs://%s:%s/",
+-        nameNodeProperties.getProperty(DynoConstants.NN_HOSTNAME),
+-        nameNodeProperties.getProperty(DynoConstants.NN_SERVICERPC_PORT)));
+-  }
+-
+-  /**
+-   * Get the URI that can be used to access the launched NameNode's web UI, e.g.
+-   * for JMX calls.
+-   *
+-   * @param nameNodeProperties The set of properties representing the
+-   *                           information about the launched NameNode.
+-   * @return The URI to the web UI.
+-   */
+-  static URI getNameNodeWebUri(Properties nameNodeProperties) {
+-    return URI.create(String.format("http://%s:%s/",
+-        nameNodeProperties.getProperty(DynoConstants.NN_HOSTNAME),
+-        nameNodeProperties.getProperty(DynoConstants.NN_HTTP_PORT)));
+-  }
+-
+-  /**
+-   * Get the URI that can be used to access the tracking interface for the
+-   * NameNode, i.e. the web UI of the NodeManager hosting the NameNode
+-   * container.
+-   *
+-   * @param nameNodeProperties The set of properties representing the
+-   *                           information about the launched NameNode.
+-   * @return The tracking URI.
+-   */
+-  static URI getNameNodeTrackingUri(Properties nameNodeProperties)
+-      throws IOException {
+-    return URI.create(String.format("http://%s:%s/node/containerlogs/%s/%s/",
+-        nameNodeProperties.getProperty(DynoConstants.NN_HOSTNAME),
+-        nameNodeProperties.getProperty(Environment.NM_HTTP_PORT.name()),
+-        nameNodeProperties.getProperty(Environment.CONTAINER_ID.name()),
+-        UserGroupInformation.getCurrentUser().getShortUserName()));
+-  }
+-
+-  /**
+-   * Get the set of properties representing information about the launched
+-   * NameNode. This method will wait for the information to be available until
+-   * it is interrupted, or {@code shouldExit} returns true. It polls for a file
+-   * present at {@code nameNodeInfoPath} once a second and uses that file to
+-   * load the NameNode information.
+-   *
+-   * @param shouldExit Should return true iff this should stop waiting.
+-   * @param conf The configuration.
+-   * @param nameNodeInfoPath The path at which to expect the NameNode
+-   *                         information file to be present.
+-   * @param log Where to log information.
+-   * @return Absent if this exited prematurely (i.e. due to {@code shouldExit}),
+-   *         else returns a set of properties representing information about the
+-   *         launched NameNode.
+-   */
+-  static Optional<Properties> waitForAndGetNameNodeProperties(
+-      Supplier<Boolean> shouldExit, Configuration conf, Path nameNodeInfoPath,
+-      Logger log) throws IOException, InterruptedException {
+-    while (!shouldExit.get()) {
+-      try (FSDataInputStream nnInfoInputStream = nameNodeInfoPath
+-          .getFileSystem(conf).open(nameNodeInfoPath)) {
+-        Properties nameNodeProperties = new Properties();
+-        nameNodeProperties.load(nnInfoInputStream);
+-        return Optional.of(nameNodeProperties);
+-      } catch (FileNotFoundException fnfe) {
+-        log.debug("NameNode host information not yet available");
+-        Thread.sleep(1000);
+-      } catch (IOException ioe) {
+-        log.warn("Unable to fetch NameNode host information; retrying", ioe);
+-        Thread.sleep(1000);
+-      }
+-    }
+-    return Optional.empty();
+-  }
+-
+-  /**
+-   * Wait for the launched NameNode to finish starting up. Continues until
+-   * {@code shouldExit} returns true.
+-   *
+-   * @param nameNodeProperties The set of properties containing information
+-   *                           about the NameNode.
+-   * @param shouldExit Should return true iff this should stop waiting.
+-   * @param log Where to log information.
+-   */
+-  static void waitForNameNodeStartup(Properties nameNodeProperties,
+-      Supplier<Boolean> shouldExit, Logger log)
+-      throws IOException, InterruptedException {
+-    if (shouldExit.get()) {
+-      return;
+-    }
+-    log.info("Waiting for NameNode to finish starting up...");
+-    waitForNameNodeJMXValue("Startup progress",
+-        NAMENODE_STARTUP_PROGRESS_JMX_QUERY, "PercentComplete", 1.0, 0.01,
+-        false, nameNodeProperties, shouldExit, log);
+-    log.info("NameNode has started!");
+-  }
+-
+-  /**
+-   * Wait for the launched NameNode to be ready, i.e. to have at least 99% of
+-   * its DataNodes register, have fewer than 0.01% of its blocks missing, and
+-   * less than 1% of its blocks under replicated. Continues until the criteria
+-   * have been met or {@code shouldExit} returns true.
+-   *
+-   * @param nameNodeProperties The set of properties containing information
+-   *                           about the NameNode.
+-   * @param numTotalDataNodes Total expected number of DataNodes to register.
+-   * @param shouldExit Should return true iff this should stop waiting.
+-   * @param log Where to log information.
+-   */
+-  static void waitForNameNodeReadiness(final Properties nameNodeProperties,
+-      int numTotalDataNodes, boolean triggerBlockReports,
+-      Supplier<Boolean> shouldExit, final Configuration conf, final Logger log)
+-      throws IOException, InterruptedException {
+-    if (shouldExit.get()) {
+-      return;
+-    }
+-    int minDataNodes = (int) (conf.getFloat(DATANODE_LIVE_MIN_FRACTION_KEY,
+-        DATANODE_LIVE_MIN_FRACTION_DEFAULT) * numTotalDataNodes);
+-    log.info(String.format(
+-        "Waiting for %d DataNodes to register with the NameNode...",
+-        minDataNodes));
+-    waitForNameNodeJMXValue("Number of live DataNodes",
+-        FSNAMESYSTEM_STATE_JMX_QUERY, JMX_LIVE_NODE_COUNT, minDataNodes,
+-        numTotalDataNodes * 0.001, false, nameNodeProperties, shouldExit, log);
+-    final int totalBlocks = Integer.parseInt(fetchNameNodeJMXValue(
+-        nameNodeProperties, FSNAMESYSTEM_STATE_JMX_QUERY, JMX_BLOCKS_TOTAL));
+-    final AtomicBoolean doneWaiting = new AtomicBoolean(false);
+-    if (triggerBlockReports) {
+-      // This will be significantly lower than the actual expected number of
+-      // blocks because it does not
+-      // take into account replication factor. However the block reports are
+-      // pretty binary; either a full
+-      // report has been received or it hasn't. Thus we don't mind the large
+-      // underestimate here.
+-      final int blockThreshold = totalBlocks / numTotalDataNodes * 2;
+-      // The Configuration object here is based on the host cluster, which may
+-      // have security enabled; we need to disable it to talk to the Dyno NN
+-      conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
+-          "simple");
+-      conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
+-          "false");
+-      final DistributedFileSystem dfs = (DistributedFileSystem) FileSystem
+-          .get(getNameNodeHdfsUri(nameNodeProperties), conf);
+-      log.info("Launching thread to trigger block reports for Datanodes with <"
+-          + blockThreshold + " blocks reported");
+-      Thread blockReportThread = new Thread(() -> {
+-        // Here we count both Missing and UnderReplicated within under
+-        // replicated
+-        long lastUnderRepBlocks = Long.MAX_VALUE;
+-        try {
+-          while (true) { // this will eventually exit via an interrupt
+-            try {
+-              Thread.sleep(TimeUnit.MINUTES.toMillis(1));
+-              long underRepBlocks = Long
+-                  .parseLong(fetchNameNodeJMXValue(nameNodeProperties,
+-                      FSNAMESYSTEM_JMX_QUERY, JMX_MISSING_BLOCKS))
+-                  + Long.parseLong(fetchNameNodeJMXValue(nameNodeProperties,
+-                      FSNAMESYSTEM_STATE_JMX_QUERY,
+-                      JMX_UNDER_REPLICATED_BLOCKS));
+-              long blockDecrease = lastUnderRepBlocks - underRepBlocks;
+-              lastUnderRepBlocks = underRepBlocks;
+-              if (blockDecrease < 0
+-                  || blockDecrease > (totalBlocks * 0.001)) {
+-                continue;
+-              }
+-
+-              String liveNodeListString = fetchNameNodeJMXValue(
+-                  nameNodeProperties, NAMENODE_INFO_JMX_QUERY,
+-                  JMX_LIVE_NODES_LIST);
+-              Set<String> datanodesToReport = parseStaleDataNodeList(
+-                  liveNodeListString, blockThreshold, log);
+-              if (datanodesToReport.isEmpty() && doneWaiting.get()) {
+-                log.info("BlockReportThread exiting; all DataNodes have "
+-                    + "reported blocks");
+-                break;
+-              }
+-              log.info("Queueing {} Datanodes for block report: {}",
+-                      datanodesToReport.size(),
+-                      Joiner.on(",").join(datanodesToReport));
+-              DatanodeInfo[] datanodes = dfs.getDataNodeStats();
+-              int cnt = 0;
+-              for (DatanodeInfo datanode : datanodes) {
+-                if (datanodesToReport.contains(datanode.getXferAddr(true))) {
+-                  Thread.sleep(1); // to throw an interrupt if one is found
+-                  triggerDataNodeBlockReport(conf, datanode.getIpcAddr(true));
+-                  cnt++;
+-                  Thread.sleep(1000);
+-                }
+-              }
+-              if (cnt != datanodesToReport.size()) {
+-                log.warn("Found {} Datanodes to queue block reports for but "
+-                        + "was only able to trigger {}",
+-                    datanodesToReport.size(), cnt);
+-              }
+-            } catch (IOException ioe) {
+-              log.warn("Exception encountered in block report thread", ioe);
+-            }
+-          }
+-        } catch (InterruptedException ie) {
+-          // Do nothing; just exit
+-        }
+-        log.info("Block reporting thread exiting");
+-      });
+-      blockReportThread.setDaemon(true);
+-      blockReportThread
+-          .setUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
+-      blockReportThread.start();
+-    }
+-    float maxMissingBlocks = totalBlocks * conf.getFloat(
+-        MISSING_BLOCKS_MAX_FRACTION_KEY, MISSING_BLOCKS_MAX_FRACTION_DEFAULT);
+-    log.info("Waiting for MissingBlocks to fall below {}...",
+-        maxMissingBlocks);
+-    waitForNameNodeJMXValue("Number of missing blocks", FSNAMESYSTEM_JMX_QUERY,
+-        JMX_MISSING_BLOCKS, maxMissingBlocks, totalBlocks * 0.0001, true,
+-        nameNodeProperties, shouldExit, log);
+-    float maxUnderreplicatedBlocks = totalBlocks
+-        * conf.getFloat(UNDERREPLICATED_BLOCKS_MAX_FRACTION_KEY,
+-            UNDERREPLICATED_BLOCKS_MAX_FRACTION_DEFAULT);
+-    log.info("Waiting for UnderReplicatedBlocks to fall below {}...",
+-        maxUnderreplicatedBlocks);
+-    waitForNameNodeJMXValue("Number of under replicated blocks",
+-        FSNAMESYSTEM_STATE_JMX_QUERY, JMX_UNDER_REPLICATED_BLOCKS,
+-        maxUnderreplicatedBlocks, totalBlocks * 0.001, true, nameNodeProperties,
+-        shouldExit, log);
+-    log.info("NameNode is ready for use!");
+-    doneWaiting.set(true);
+-  }
+-
+-  /**
+-   * Trigger a block report on a given DataNode.
+-   *
+-   * @param conf Configuration
+-   * @param dataNodeTarget The target; should be like {@code <host>:<port>}
+-   */
+-  private static void triggerDataNodeBlockReport(Configuration conf,
+-      String dataNodeTarget) throws IOException {
+-    InetSocketAddress datanodeAddr = NetUtils.createSocketAddr(dataNodeTarget);
+-
+-    ClientDatanodeProtocol dnProtocol = DFSUtilClient
+-        .createClientDatanodeProtocolProxy(datanodeAddr,
+-            UserGroupInformation.getCurrentUser(), conf,
+-            NetUtils.getSocketFactory(conf, ClientDatanodeProtocol.class));
+-
+-    dnProtocol.triggerBlockReport(new BlockReportOptions.Factory().build());
+-  }
+-
+-  /**
+-   * Poll the launched NameNode's JMX for a specific value, waiting for it to
+-   * cross some threshold. Continues until the threshold has been crossed or
+-   * {@code shouldExit} returns true. Periodically logs the current value.
+-   *
+-   * @param valueName The human-readable name of the value which is being
+-   *                  polled (for printing purposes only).
+-   * @param jmxBeanQuery The JMX bean query to execute; should return a JMX
+-   *                     property matching {@code jmxProperty}.
+-   * @param jmxProperty The name of the JMX property whose value should be
+-   *                    polled.
+-   * @param threshold The threshold value to wait for the JMX property to be
+-   *                  above/below.
+-   * @param printThreshold The threshold between each log statement; controls
+-   *                       how frequently the value is printed. For example,
+-   *                       if this was 10, a statement would be logged every
+-   *                       time the value has changed by more than 10.
+-   * @param decreasing True iff the property's value is decreasing and this
+-   *                   should wait until it is lower than threshold; else the
+-   *                   value is treated as increasing and will wait until it
+-   *                   is higher than threshold.
+-   * @param nameNodeProperties The set of properties containing information
+-   *                           about the NameNode.
+-   * @param shouldExit Should return true iff this should stop waiting.
+-   * @param log Where to log information.
+-   */
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  private static void waitForNameNodeJMXValue(String valueName,
+-      String jmxBeanQuery, String jmxProperty, double threshold,
+-      double printThreshold, boolean decreasing, Properties nameNodeProperties,
+-      Supplier<Boolean> shouldExit, Logger log) throws InterruptedException {
+-    double lastPrintedValue = decreasing ? Double.MAX_VALUE : Double.MIN_VALUE;
+-    double value;
+-    int retryCount = 0;
+-    long startTime = Time.monotonicNow();
+-    while (!shouldExit.get()) {
+-      try {
+-        value = Double.parseDouble(fetchNameNodeJMXValue(nameNodeProperties,
+-            jmxBeanQuery, jmxProperty));
+-        if ((decreasing && value <= threshold)
+-            || (!decreasing && value >= threshold)) {
+-          log.info(String.format(
+-              "%s = %.2f; %s threshold of %.2f; done waiting after %d ms.",
+-              valueName, value, decreasing ? "below" : "above", threshold,
+-              Time.monotonicNow() - startTime));
+-          break;
+-        } else if (Math.abs(value - lastPrintedValue) >= printThreshold) {
+-          log.info(String.format("%s: %.2f", valueName, value));
+-          lastPrintedValue = value;
+-        }
+-      } catch (IOException ioe) {
+-        if (++retryCount % 20 == 0) {
+-          log.warn("Unable to fetch {}; retried {} times / waited {} ms",
+-              valueName, retryCount, Time.monotonicNow() - startTime, ioe);
+-        }
+-      }
+-      Thread.sleep(3000);
+-    }
+-  }
+-
+-  static Set<String> parseStaleDataNodeList(String liveNodeJsonString,
+-      final int blockThreshold, final Logger log) throws IOException {
+-    final Set<String> dataNodesToReport = new HashSet<>();
+-
+-    JsonFactory fac = new JsonFactory();
+-    JsonParser parser = fac.createParser(IOUtils
+-        .toInputStream(liveNodeJsonString, StandardCharsets.UTF_8.name()));
+-
+-    int objectDepth = 0;
+-    String currentNodeAddr = null;
+-    for (JsonToken tok = parser.nextToken(); tok != null; tok = parser
+-        .nextToken()) {
+-      if (tok == JsonToken.START_OBJECT) {
+-        objectDepth++;
+-      } else if (tok == JsonToken.END_OBJECT) {
+-        objectDepth--;
+-      } else if (tok == JsonToken.FIELD_NAME) {
+-        if (objectDepth == 1) {
+-          // This is where the Datanode identifiers are stored
+-          currentNodeAddr = parser.getCurrentName();
+-        } else if (objectDepth == 2) {
+-          if (parser.getCurrentName().equals("numBlocks")) {
+-            JsonToken valueToken = parser.nextToken();
+-            if (valueToken != JsonToken.VALUE_NUMBER_INT
+-                || currentNodeAddr == null) {
+-              throw new IOException(String.format("Malformed LiveNodes JSON; "
+-                      + "got token = %s; currentNodeAddr = %s: %s",
+-                  valueToken, currentNodeAddr, liveNodeJsonString));
+-            }
+-            int numBlocks = parser.getIntValue();
+-            if (numBlocks < blockThreshold) {
+-              log.debug(String.format(
+-                  "Queueing Datanode <%s> for block report; numBlocks = %d",
+-                  currentNodeAddr, numBlocks));
+-              dataNodesToReport.add(currentNodeAddr);
+-            } else {
+-              log.debug(String.format(
+-                  "Not queueing Datanode <%s> for block report; numBlocks = %d",
+-                  currentNodeAddr, numBlocks));
+-            }
+-          }
+-        }
+-      }
+-    }
+-    return dataNodesToReport;
+-  }
+-
+-  /**
+-   * Fetch a value from the launched NameNode's JMX.
+-   *
+-   * @param nameNodeProperties The set of properties containing information
+-   *                           about the NameNode.
+-   * @param jmxBeanQuery The JMX bean query to execute; should return a
+-   *                     JMX property matching {@code jmxProperty}.
+-   * @param property The name of the JMX property whose value should be polled.
+-   * @return The value associated with the property.
+-   */
+-  static String fetchNameNodeJMXValue(Properties nameNodeProperties,
+-      String jmxBeanQuery, String property) throws IOException {
+-    URI nnWebUri = getNameNodeWebUri(nameNodeProperties);
+-    URL queryURL;
+-    try {
+-      queryURL = new URL(nnWebUri.getScheme(), nnWebUri.getHost(),
+-          nnWebUri.getPort(), "/jmx?qry=" + jmxBeanQuery);
+-    } catch (MalformedURLException e) {
+-      throw new IllegalArgumentException("Invalid JMX query: \"" + jmxBeanQuery
+-          + "\" against " + "NameNode URI: " + nnWebUri);
+-    }
+-    HttpURLConnection conn = (HttpURLConnection) queryURL.openConnection();
+-    if (conn.getResponseCode() != 200) {
+-      throw new IOException(
+-          "Unable to retrieve JMX: " + conn.getResponseMessage());
+-    }
+-    InputStream in = conn.getInputStream();
+-    JsonFactory fac = new JsonFactory();
+-    JsonParser parser = fac.createParser(in);
+-    if (parser.nextToken() != JsonToken.START_OBJECT
+-        || parser.nextToken() != JsonToken.FIELD_NAME
+-        || !parser.getCurrentName().equals("beans")
+-        || parser.nextToken() != JsonToken.START_ARRAY
+-        || parser.nextToken() != JsonToken.START_OBJECT) {
+-      throw new IOException(
+-          "Unexpected format of JMX JSON response for: " + jmxBeanQuery);
+-    }
+-    int objectDepth = 1;
+-    String ret = null;
+-    while (objectDepth > 0) {
+-      JsonToken tok = parser.nextToken();
+-      if (tok == JsonToken.START_OBJECT) {
+-        objectDepth++;
+-      } else if (tok == JsonToken.END_OBJECT) {
+-        objectDepth--;
+-      } else if (tok == JsonToken.FIELD_NAME) {
+-        if (parser.getCurrentName().equals(property)) {
+-          parser.nextToken();
+-          ret = parser.getText();
+-          break;
+-        }
+-      }
+-    }
+-    parser.close();
+-    in.close();
+-    conn.disconnect();
+-    if (ret == null) {
+-      throw new IOException(
+-          "Property " + property + " not found within " + jmxBeanQuery);
+-    } else {
+-      return ret;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoResource.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoResource.java
+deleted file mode 100644
+index 1a9253f5aa6..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/DynoResource.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import java.util.Map;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-
+-class DynoResource {
+-
+-  private final String name;
+-  private final LocalResourceType type;
+-  private final String resourcePath;
+-
+-  DynoResource(String name, LocalResourceType type, String resourcePath) {
+-    this.name = name;
+-    this.type = type;
+-    this.resourcePath = resourcePath;
+-  }
+-
+-  public Path getPath(Map<String, String> env) {
+-    return new Path(env.get(getLocationEnvVar()));
+-  }
+-
+-  public long getTimestamp(Map<String, String> env) {
+-    return Long.parseLong(env.get(getTimestampEnvVar()));
+-  }
+-
+-  public long getLength(Map<String, String> env) {
+-    return Long.parseLong(env.get(getLengthEnvVar()));
+-  }
+-
+-  public String getLocationEnvVar() {
+-    return name + "_LOCATION";
+-  }
+-
+-  public String getTimestampEnvVar() {
+-    return name + "_TIMESTAMP";
+-  }
+-
+-  public String getLengthEnvVar() {
+-    return name + "_LENGTH";
+-  }
+-
+-  public LocalResourceType getType() {
+-    return type;
+-  }
+-
+-  public String getResourcePath() {
+-    return resourcePath;
+-  }
+-
+-  public String toString() {
+-    return name;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/SimulatedDataNodes.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/SimulatedDataNodes.java
+deleted file mode 100644
+index 0189d1fd1a1..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/SimulatedDataNodes.java
++++ /dev/null
+@@ -1,185 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.net.URI;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import org.apache.commons.lang3.exception.ExceptionUtils;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.hdfs.protocol.Block;
+-import org.apache.hadoop.hdfs.protocol.HdfsConstants;
+-import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
+-import org.apache.hadoop.hdfs.server.datanode.DataNode;
+-import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
+-import org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * Starts up a number of DataNodes within the same JVM. These DataNodes all use
+- * {@link org.apache.hadoop.hdfs.server.datanode.SimulatedFSDataset}, so they do
+- * not store any actual data, and do not persist anything to disk; they maintain
+- * all metadata in memory. This is useful for testing and simulation purposes.
+- * <p>
+- * The DataNodes will attempt to connect to a NameNode defined by the default
+- * FileSystem. There will be one DataNode started for each block list file
+- * passed as an argument. Each of these files should contain a list of blocks
+- * that the corresponding DataNode should contain, as specified by a triplet of
+- * block ID, block size, and generation stamp. Each line of the file is one
+- * block, in the format:
+- * <p>
+- * {@code blockID,blockGenStamp,blockSize}
+- * <p>
+- * This class is loosely based off of
+- * {@link org.apache.hadoop.hdfs.DataNodeCluster}.
+- */
+-public class SimulatedDataNodes extends Configured implements Tool {
+-
+-  // Set this arbitrarily large (100TB) since we don't care about storage
+-  // capacity
+-  private static final long STORAGE_CAPACITY = 100 * 2L << 40;
+-  private static final String USAGE = "Usage: "
+-      + "org.apache.hadoop.tools.dynamometer.SimulatedDataNodes "
+-      + "bpid blockListFile1 [ blockListFileN ... ]\n"
+-      + "   bpid should be the ID of the block pool to which these DataNodes "
+-      + "belong.\n"
+-      + "   Each blockListFile specified should contain a list of blocks to "
+-      + "be served by one DataNode.\n"
+-      + "   See the Javadoc of this class for more detail.";
+-
+-  static void printUsageExit(String err) {
+-    System.out.println(err);
+-    System.out.println(USAGE);
+-    throw new RuntimeException(err);
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    SimulatedDataNodes datanodes = new SimulatedDataNodes();
+-    ToolRunner.run(new HdfsConfiguration(), datanodes, args);
+-  }
+-
+-  public int run(String[] args) throws Exception {
+-    if (args.length < 2) {
+-      printUsageExit("Not enough arguments");
+-    }
+-    String bpid = args[0];
+-    List<Path> blockListFiles = new ArrayList<>();
+-    for (int i = 1; i < args.length; i++) {
+-      blockListFiles.add(new Path(args[i]));
+-    }
+-
+-    URI defaultFS = FileSystem.getDefaultUri(getConf());
+-    if (!HdfsConstants.HDFS_URI_SCHEME.equals(defaultFS.getScheme())) {
+-      printUsageExit(
+-          "Must specify an HDFS-based default FS! Got <" + defaultFS + ">");
+-    }
+-    String nameNodeAdr = defaultFS.getAuthority();
+-    if (nameNodeAdr == null) {
+-      printUsageExit("No NameNode address and port in config");
+-    }
+-    System.out.println("DataNodes will connect to NameNode at " + nameNodeAdr);
+-
+-    String loc = DataNode.getStorageLocations(getConf()).get(0).toString();
+-    loc = loc.substring(loc.indexOf("]") + 1); // delete storage type
+-    String path = new URI(loc).getPath();
+-    System.setProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA, path);
+-    SimulatedFSDataset.setFactory(getConf());
+-    getConf().setLong(SimulatedFSDataset.CONFIG_PROPERTY_CAPACITY,
+-        STORAGE_CAPACITY);
+-
+-    UserGroupInformation.setConfiguration(getConf());
+-    MiniDFSCluster mc = new MiniDFSCluster();
+-    try {
+-      mc.formatDataNodeDirs();
+-    } catch (IOException e) {
+-      System.out.println("Error formatting DataNode dirs: " + e);
+-      throw new RuntimeException("Error formatting DataNode dirs", e);
+-    }
+-
+-    try {
+-      System.out.println("Found " + blockListFiles.size()
+-          + " block listing files; launching DataNodes accordingly.");
+-      mc.startDataNodes(getConf(), blockListFiles.size(), null, false,
+-          StartupOption.REGULAR, null, null, null, null, false, true, true,
+-          null, null, null);
+-      long startTime = Time.monotonicNow();
+-      System.out.println("Waiting for DataNodes to connect to NameNode and "
+-          + "init storage directories.");
+-      Set<DataNode> datanodesWithoutFSDataset = new HashSet<>(
+-          mc.getDataNodes());
+-      while (!datanodesWithoutFSDataset.isEmpty()) {
+-        datanodesWithoutFSDataset
+-            .removeIf((dn) -> DataNodeTestUtils.getFSDataset(dn) != null);
+-        Thread.sleep(100);
+-      }
+-      System.out.println("Waited " + (Time.monotonicNow() - startTime)
+-          + " ms for DataNode FSDatasets to be ready");
+-
+-      for (int dnIndex = 0; dnIndex < blockListFiles.size(); dnIndex++) {
+-        Path blockListFile = blockListFiles.get(dnIndex);
+-        try (FSDataInputStream fsdis =
+-            blockListFile.getFileSystem(getConf()).open(blockListFile);
+-            BufferedReader reader = new BufferedReader(
+-                new InputStreamReader(fsdis, StandardCharsets.UTF_8))) {
+-          List<Block> blockList = new ArrayList<>();
+-          int cnt = 0;
+-          for (String line = reader.readLine(); line != null; line = reader
+-              .readLine()) {
+-            // Format of the listing files is blockID,blockGenStamp,blockSize
+-            String[] blockInfo = line.split(",");
+-            blockList.add(new Block(Long.parseLong(blockInfo[0]),
+-                Long.parseLong(blockInfo[2]), Long.parseLong(blockInfo[1])));
+-            cnt++;
+-          }
+-          try {
+-            mc.injectBlocks(dnIndex, blockList, bpid);
+-          } catch (IOException ioe) {
+-            System.out.printf("Error injecting blocks into DataNode %d for "
+-                    + "block pool %s: %s%n", dnIndex, bpid,
+-                ExceptionUtils.getStackTrace(ioe));
+-          }
+-          System.out.printf(
+-              "Injected %d blocks into DataNode %d for block pool %s%n",
+-              cnt, dnIndex, bpid);
+-        }
+-      }
+-
+-    } catch (IOException e) {
+-      System.out.println(
+-          "Error creating DataNodes: " + ExceptionUtils.getStackTrace(e));
+-      return 1;
+-    }
+-    return 0;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/package-info.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/package-info.java
+deleted file mode 100644
+index b6a7630a93c..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/package-info.java
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * The Dynamometer tool is used to stress test the HDFS NameNode by setting
+- * up a realistic environment consistent of fake DataNodes and a real NameNode
+- * with a real FS namesystem and near-real user workload (RPCs). Please see
+- * the documentation for more detail.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.tools.dynamometer;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/resources/start-component.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/resources/start-component.sh
+deleted file mode 100644
+index 3a07b72f182..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/resources/start-component.sh
++++ /dev/null
+@@ -1,348 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# Script for launching Dynamometer components within YARN containers.
+-# USAGE:
+-# ./start-component.sh namenode hdfs_storage
+-# OR
+-# ./start-component.sh datanode nn_servicerpc_address sleep_time_sec
+-# First parameter should be component being launched, either `datanode` or `namenode`
+-# If component is namenode, hdfs_storage is expected to point to a location to
+-#   write out shared files such as the file containing the information about
+-#   which ports the NN started on (at nn_info.prop) and the namenode's metrics
+-#   (at namenode_metrics)
+-# If component is datanode, nn_servicerpc_address is expected to point to the
+-#   servicerpc address of the namenode. sleep_time_sec is the amount of time that
+-#   should be allowed to elapse before launching anything. The
+-#   `org.apache.hadoop.tools.dynamometer.SimulatedDataNodes` class will be used to start multiple
+-#   DataNodes within the same JVM, and they will store their block files in memory.
+-
+-component="$1"
+-if [[ "$component" != "datanode" && "$component" != "namenode" ]]; then
+-  echo "Unknown component type: '${component}'"
+-  exit 1
+-fi
+-if [[ "$component" = "namenode" ]]; then
+-  if [[ $# -lt 2 ]]; then
+-    echo "Not enough arguments for NameNode"
+-    exit 1
+-  fi
+-  hdfsStoragePath="$2"
+-else
+-  if [[ $# -lt 3 ]]; then
+-    echo "Not enough arguments for DataNode"
+-    exit 1
+-  fi
+-  nnServiceRpcAddress="$2"
+-  launchDelaySec="$3"
+-fi
+-containerID=${CONTAINER_ID##*_}
+-
+-echo "Starting ${component} with ID ${containerID}"
+-echo "PWD is: $(pwd)"
+-
+-confDir="$(pwd)/conf/etc/hadoop"
+-umask 022
+-baseDir="$(pwd)/dyno-node"
+-
+-# Set Hadoop's log dir to that of the NodeManager,
+-# then YARN will automatically help us handle the logs
+-# May be a comma-separated list; just take the first one
+-logDir=${LOG_DIRS%%,*}
+-
+-pidDir="$baseDir/pid"
+-baseHttpPort=50075
+-baseRpcPort=9000
+-baseServiceRpcPort=9020
+-
+-rm -rf "$baseDir"
+-mkdir -p "$pidDir"
+-chmod 755 "$baseDir"
+-chmod 700 "$pidDir"
+-
+-# Set Hadoop variables for component
+-hadoopHome="$(find -H "$(pwd)/hadoopBinary" -maxdepth 1 -mindepth 1 -type d | head -n 1)"
+-# Save real environment for later
+-hadoopConfOriginal=${HADOOP_CONF_DIR:-$confDir}
+-hadoopHomeOriginal=${HADOOP_HOME:-$hadoopHome}
+-echo "Saving original HADOOP_HOME as: $hadoopHomeOriginal"
+-echo "Saving original HADOOP_CONF_DIR as: $hadoopConfOriginal"
+-## @description  A function to perform an HDFS command under the system Hadoop
+-##               instead of the Hadoop-under-test.
+-## @audience     private
+-## @stability    evolving
+-function hdfs_original {
+-  HADOOP_HOME="${hadoopHomeOriginal}" HADOOP_CONF_DIR="${hadoopConfOriginal}" \
+-  HADOOP_HDFS_HOME="${hadoopHomeOriginal}" HADOOP_COMMON_HOME="${hadoopHomeOriginal}" \
+-  "${hadoopHomeOriginal}/bin/hdfs" "$@"
+-}
+-
+-extraClasspathDir="$(pwd)/additionalClasspath/"
+-mkdir -p "${extraClasspathDir}"
+-
+-# DataNodes need junit jar to run SimulatedDataNodes
+-junitClassPath="$(find "${hadoopHome}" -name "junit*.jar" | head -n 1)"
+-if [[ -z "$junitClassPath" ]]; then
+-  echo "Can't find junit jar file in ${hadoopHome}."
+-  exit 1
+-fi
+-
+-# Change environment variables for the Hadoop process
+-export HADOOP_HOME="$hadoopHome"
+-export HADOOP_PREFIX="$hadoopHome"
+-export PATH="$HADOOP_HOME/bin:$PATH"
+-export HADOOP_HDFS_HOME="$hadoopHome"
+-export HADOOP_COMMON_HOME="$hadoopHome"
+-export HADOOP_YARN_HOME="$hadoopHome"
+-export LIBHDFS_OPTS="-Djava.library.path=$hadoopHome/lib/native"
+-export HADOOP_MAPRED_HOME="$hadoopHome"
+-export HADOOP_CONF_DIR="${confDir}"
+-export YARN_CONF_DIR="${confDir}"
+-export HADOOP_LOG_DIR="${logDir}"
+-export HADOOP_PID_DIR="${pidDir}"
+-HADOOP_CLASSPATH="$(pwd)/dependencies/*:$extraClasspathDir:$junitClassPath"
+-export HADOOP_CLASSPATH
+-echo "Environment variables are set as:"
+-echo "(note that this doesn't include changes made by hadoop-env.sh)"
+-printenv
+-echo -e "\n\n"
+-
+-# Starting from base_port, add the last two digits of the containerID,
+-# then keep searching upwards for a free port
+-# find_available_port base_port
+-find_available_port() {
+-  basePort="$1"
+-  currPort=$((basePort+((10#$containerID)%100)))
+-  while netstat -nl | grep -q ":${currPort}[[:space:]]"; do
+-    currPort=$((currPort+1))
+-  done
+-  echo "$currPort"
+-}
+-
+-configOverrides=(
+-  -D "hadoop.tmp.dir=${baseDir}"
+-  -D "hadoop.security.authentication=simple"
+-  -D "hadoop.security.authorization=false"
+-  -D "dfs.http.policy=HTTP_ONLY"
+-  -D "dfs.nameservices="
+-  -D "dfs.web.authentication.kerberos.principal="
+-  -D "dfs.web.authentication.kerberos.keytab="
+-  -D "hadoop.http.filter.initializers="
+-  -D "dfs.datanode.kerberos.principal="
+-  -D "dfs.datanode.keytab.file="
+-  -D "dfs.domain.socket.path="
+-  -D "dfs.client.read.shortcircuit=false"
+-)
+-# NOTE: Must manually unset dfs.namenode.shared.edits.dir in configs
+-#       because setting it to be empty is not enough (must be null)
+-
+-if [[ "$component" = "datanode" ]]; then
+-
+-  if ! dataDirsOrig="$(hdfs getconf "${configOverrides[@]}" -confKey dfs.datanode.data.dir)"; then
+-    echo "Unable to fetch data directories from config; using default"
+-    dataDirsOrig="/data-dir/1,/data-dir/2"
+-  fi
+-  dataDirsOrig=(${dataDirsOrig//,/ })
+-  dataDirs=""
+-  for dataDir in "${dataDirsOrig[@]}"; do
+-    stripped="file://$baseDir/${dataDir#file://}"
+-    dataDirs="$dataDirs,$stripped"
+-  done
+-  dataDirs=${dataDirs:1}
+-
+-  echo "Going to sleep for $launchDelaySec sec..."
+-  for _ in $(seq 1 "${launchDelaySec}"); do
+-    sleep 1
+-    if ! kill -0 $PPID 2>/dev/null; then
+-      echo "Parent process ($PPID) exited while waiting; now exiting"
+-      exit 0
+-     fi
+-  done
+-
+-  versionFile="$(pwd)/VERSION"
+-  bpId="$(grep "${versionFile}" -e blockpoolID | awk -F= '{print $2}')"
+-  listingFiles=()
+-  blockDir="$(pwd)/blocks"
+-  for listingFile in "${blockDir}"/*; do
+-    listingFiles+=("file://${listingFile}")
+-  done
+-
+-  datanodeClusterConfigs=(
+-    -D "fs.defaultFS=${nnServiceRpcAddress}"
+-    -D "dfs.datanode.hostname=$(hostname)"
+-    -D "dfs.datanode.data.dir=${dataDirs}"
+-    -D "dfs.datanode.ipc.address=0.0.0.0:0"
+-    -D "dfs.datanode.http.address=0.0.0.0:0"
+-    -D "dfs.datanode.address=0.0.0.0:0"
+-    -D "dfs.datanode.directoryscan.interval=-1"
+-    -D "fs.du.interval=43200000"
+-    -D "fs.getspaceused.jitterMillis=21600000"
+-    ${configOverrides[@]}
+-    "${bpId}"
+-    ${listingFiles[@]}
+-  )
+-
+-  echo "Executing the following:"
+-  echo "${HADOOP_HOME}/bin/hadoop org.apache.hadoop.tools.dynamometer.SimulatedDataNodes \
+-    $DN_ADDITIONAL_ARGS" "${datanodeClusterConfigs[@]}"
+-  # The argument splitting of DN_ADDITIONAL_ARGS is desirable behavior here
+-  # shellcheck disable=SC2086
+-  "${HADOOP_HOME}/bin/hadoop" org.apache.hadoop.tools.dynamometer.SimulatedDataNodes \
+-    $DN_ADDITIONAL_ARGS "${datanodeClusterConfigs[@]}" &
+-  launchSuccess="$?"
+-  componentPID="$!"
+-  if [[ ${launchSuccess} -ne 0 ]]; then
+-    echo "Unable to launch DataNode cluster; exiting."
+-    exit 1
+-  fi
+-
+-elif [[ "$component" = "namenode" ]]; then
+-
+-  nnHostname="${NM_HOST}"
+-  nnRpcPort="$(find_available_port "$baseRpcPort")"
+-  nnServiceRpcPort="$(find_available_port "$baseServiceRpcPort")"
+-  nnHttpPort="$(find_available_port "$baseHttpPort")"
+-
+-  nnInfoLocalPath="$(pwd)/nn_info.prop"
+-  rm -f "$nnInfoLocalPath"
+-  # Port and host information to be uploaded to the non-Dynamometer HDFS
+-  # to be consumed by the AM and Client
+-  cat > "$nnInfoLocalPath" << EOF
+-NN_HOSTNAME=${nnHostname}
+-NN_RPC_PORT=${nnRpcPort}
+-NN_SERVICERPC_PORT=${nnServiceRpcPort}
+-NN_HTTP_PORT=${nnHttpPort}
+-NM_HTTP_PORT=${NM_HTTP_PORT}
+-CONTAINER_ID=${CONTAINER_ID}
+-EOF
+-  echo "Using the following ports for the namenode:"
+-  cat "$nnInfoLocalPath"
+-  nnInfoRemotePath="$hdfsStoragePath/nn_info.prop"
+-  # We use the original conf dir since we are uploading to the non-dynamometer cluster
+-  hdfs_original dfs -copyFromLocal -f "$nnInfoLocalPath" "$nnInfoRemotePath"
+-  echo "Uploaded namenode port info to $nnInfoRemotePath"
+-
+-  if [[ "$NN_FILE_METRIC_PERIOD" -gt 0 ]]; then
+-    nnMetricOutputFileLocal="$HADOOP_LOG_DIR/namenode_metrics"
+-    nnMetricPropsFileLocal="$extraClasspathDir/hadoop-metrics2-namenode.properties"
+-    if [[ -f "$confDir/hadoop-metrics2-namenode.properties" ]]; then
+-      cp "$confDir/hadoop-metrics2-namenode.properties" "$nnMetricPropsFileLocal"
+-      chmod u+w "$nnMetricPropsFileLocal"
+-    elif [[ -f "$confDir/hadoop-metrics2.properties" ]]; then
+-      cp "$confDir/hadoop-metrics2.properties" "$nnMetricPropsFileLocal"
+-      chmod u+w "$nnMetricPropsFileLocal"
+-    fi
+-    cat >> "$nnMetricPropsFileLocal" << EOF
+-namenode.sink.dyno-file.period=${NN_FILE_METRIC_PERIOD}
+-namenode.sink.dyno-file.class=org.apache.hadoop.metrics2.sink.FileSink
+-namenode.sink.dyno-file.filename=${nnMetricOutputFileLocal}
+-EOF
+-  fi
+-
+-  nameDir="${NN_NAME_DIR:-${baseDir}/name-data}"
+-  editsDir="${NN_EDITS_DIR:-${baseDir}/name-data}"
+-  checkpointDir="$baseDir/checkpoint"
+-  rm -rf "$nameDir" "$editsDir" "$checkpointDir"
+-  mkdir -p "$nameDir/current" "$editsDir/current" "$checkpointDir"
+-  chmod -R 700 "$nameDir" "$editsDir" "$checkpointDir"
+-  # Link all of the fsimage files into the name dir
+-  find "$(pwd)" -maxdepth 1 -mindepth 1 \( -name "fsimage_*" -or -name "VERSION" \) -execdir ln -snf "$(pwd)/{}" "$nameDir/current/{}" \;
+-  chmod 700 "$nameDir"/current/*
+-
+-  namenodeConfigs=(
+-    -D "fs.defaultFS=hdfs://${nnHostname}:${nnRpcPort}"
+-    -D "dfs.namenode.rpc-address=${nnHostname}:${nnRpcPort}"
+-    -D "dfs.namenode.servicerpc-address=${nnHostname}:${nnServiceRpcPort}"
+-    -D "dfs.namenode.http-address=${nnHostname}:${nnHttpPort}"
+-    -D "dfs.namenode.https-address=${nnHostname}:0"
+-    -D "dfs.namenode.name.dir=file://${nameDir}"
+-    -D "dfs.namenode.edits.dir=file://${editsDir}"
+-    -D "dfs.namenode.checkpoint.dir=file://${baseDir}/checkpoint"
+-    -D "dfs.namenode.kerberos.internal.spnego.principal="
+-    -D "dfs.hosts="
+-    -D "dfs.hosts.exclude="
+-    -D "dfs.namenode.legacy-oiv-image.dir="
+-    -D "dfs.namenode.kerberos.principal="
+-    -D "dfs.namenode.keytab.file="
+-    -D "dfs.namenode.safemode.threshold-pct=0.0f"
+-    -D "dfs.permissions.enabled=true"
+-    -D "dfs.cluster.administrators=\"*\""
+-    -D "dfs.block.replicator.classname=org.apache.hadoop.tools.dynamometer.BlockPlacementPolicyAlwaysSatisfied"
+-    -D "hadoop.security.impersonation.provider.class=org.apache.hadoop.tools.dynamometer.AllowAllImpersonationProvider"
+-    ${configOverrides[@]}
+-  )
+-
+-  echo "Executing the following:"
+-  echo "${HADOOP_HOME}/sbin/hadoop-daemon.sh start namenode" "${namenodeConfigs[@]}" "$NN_ADDITIONAL_ARGS"
+-  # The argument splitting of NN_ADDITIONAL_ARGS is desirable behavior here
+-  # shellcheck disable=SC2086
+-  if ! "${HADOOP_HOME}/sbin/hadoop-daemon.sh" start namenode "${namenodeConfigs[@]}" $NN_ADDITIONAL_ARGS; then
+-    echo "Unable to launch NameNode; exiting."
+-    exit 1
+-  fi
+-  componentPIDFile="${pidDir}/hadoop-$(whoami)-${component}.pid"
+-  while [[ ! -f "$componentPIDFile" ]]; do sleep 1; done
+-  componentPID=$(cat "$componentPIDFile")
+-
+-  if [[ "$NN_FILE_METRIC_PERIOD" -gt 0 ]]; then
+-    nnMetricOutputFileRemote="$hdfsStoragePath/namenode_metrics"
+-    echo "Going to attempt to upload metrics to: $nnMetricOutputFileRemote"
+-
+-    touch "$nnMetricOutputFileLocal"
+-    (tail -n 999999 -f "$nnMetricOutputFileLocal" & echo $! >&3) 3>metricsTailPIDFile | \
+-      hdfs_original dfs -appendToFile - "$nnMetricOutputFileRemote" &
+-    metricsTailPID="$(cat metricsTailPIDFile)"
+-    if [[ "$metricsTailPID" = "" ]]; then
+-      echo "Unable to upload metrics to HDFS"
+-    else
+-      echo "Metrics will be uploaded to HDFS by PID: $metricsTailPID"
+-    fi
+-  fi
+-fi
+-
+-echo "Started $component at pid $componentPID"
+-
+-## @description  Perform cleanup, killing any outstanding processes and deleting files
+-## @audience     private
+-## @stability    evolving
+-function cleanup {
+-  echo "Cleaning up $component at pid $componentPID"
+-  kill -9 "$componentPID"
+-
+-  if [[ "$metricsTailPID" != "" ]]; then
+-    echo "Stopping metrics streaming at pid $metricsTailPID"
+-    kill "$metricsTailPID"
+-  fi
+-
+-  echo "Deleting any remaining files"
+-  rm -rf "$baseDir"
+-}
+-
+-trap cleanup EXIT
+-
+-echo "Waiting for parent process (PID: $PPID) OR $component process to exit"
+-while kill -0 "${componentPID}" 2>/dev/null && kill -0 $PPID 2>/dev/null; do
+-  sleep 1
+-done
+-
+-if kill -0 $PPID 2>/dev/null; then
+-  echo "$component process exited; continuing to finish"
+-  exit 1
+-else
+-  echo "Parent process exited; continuing to finish"
+-  exit 0
+-fi
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
+deleted file mode 100644
+index 8818b1ef244..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
++++ /dev/null
+@@ -1,580 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import org.apache.hadoop.util.Sets;
+-import java.util.Optional;
+-import java.util.concurrent.TimeoutException;
+-import java.util.concurrent.TimeUnit;
+-import java.util.function.Supplier;
+-import org.apache.hadoop.test.PlatformAssumptions;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditLogDirectParser;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper;
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.net.URL;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.Set;
+-import java.util.UUID;
+-import java.util.zip.ZipEntry;
+-import java.util.zip.ZipOutputStream;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.DistributedFileSystem;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.util.JarFinder;
+-import org.apache.hadoop.util.Shell;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
+-import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
+-import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
+-import org.junit.After;
+-import org.junit.AfterClass;
+-import org.junit.Assert;
+-import org.junit.Assume;
+-import org.junit.BeforeClass;
+-import org.junit.Ignore;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.tools.dynamometer.DynoInfraUtils.fetchHadoopTarball;
+-import static org.apache.hadoop.hdfs.MiniDFSCluster.PROP_TEST_BUILD_DATA;
+-import static org.hamcrest.CoreMatchers.notNullValue;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-import static org.junit.Assert.fail;
+-
+-/**
+- * Start a Dynamometer cluster in a MiniYARNCluster. Ensure that the NameNode is
+- * able to start correctly, exit safemode, and run some commands. Subsequently
+- * the workload job is launched and it is verified that it completes
+- * successfully and is able to replay commands as expected.
+- *
+- * To run this test JAVA_HOME must be set correctly, and the {@code tar} utility
+- * must be available.
+- *
+- * You can optionally specify which version of HDFS should be started within the
+- * Dynamometer cluster; the default is {@value HADOOP_BIN_VERSION_DEFAULT}. This
+- * can be adjusted by setting the {@value HADOOP_BIN_VERSION_KEY} property. This
+- * will automatically download the correct Hadoop tarball for the specified
+- * version. It downloads from an Apache mirror (by default
+- * {@value DynoInfraUtils#APACHE_DOWNLOAD_MIRROR_DEFAULT}); which mirror is used
+- * can be controlled with the {@value DynoInfraUtils#APACHE_DOWNLOAD_MIRROR_KEY}
+- * property. Note that mirrors normally contain only the latest releases on any
+- * given release line; you may need to use
+- * {@code http://archive.apache.org/dist/} for older releases. The downloaded
+- * tarball will be stored in the test directory and can be reused between test
+- * executions. Alternatively, you can specify the {@value HADOOP_BIN_PATH_KEY}
+- * property to point directly to a Hadoop tarball which is present locally and
+- * no download will occur.
+- */
+-@Ignore
+-public class TestDynamometerInfra {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDynamometerInfra.class);
+-
+-  private static final int MINICLUSTER_NUM_NMS = 3;
+-  private static final int MINICLUSTER_NUM_DNS = 1;
+-
+-  private static final String HADOOP_BIN_PATH_KEY = "dyno.hadoop.bin.path";
+-  private static final String HADOOP_BIN_VERSION_KEY =
+-      "dyno.hadoop.bin.version";
+-  private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.4";
+-  private static final String FSIMAGE_FILENAME = "fsimage_0000000000000061740";
+-  private static final String VERSION_FILENAME = "VERSION";
+-
+-  private static final String HADOOP_BIN_UNPACKED_DIR_PREFIX =
+-      "hadoop_unpacked_";
+-
+-  private static final String NAMENODE_NODELABEL = "dyno_namenode";
+-  private static final String DATANODE_NODELABEL = "dyno_datanode";
+-
+-  private static final String OUTPUT_PATH = "/tmp/trace_output_direct";
+-
+-  private static MiniDFSCluster miniDFSCluster;
+-  private static MiniYARNCluster miniYARNCluster;
+-  private static YarnClient yarnClient;
+-  private static FileSystem fs;
+-  private static Configuration conf;
+-  private static Configuration yarnConf;
+-  private static Path fsImageTmpPath;
+-  private static Path fsVersionTmpPath;
+-  private static Path blockImageOutputDir;
+-  private static Path auditTraceDir;
+-  private static Path confZip;
+-  private static File testBaseDir;
+-  private static File hadoopTarballPath;
+-  private static File hadoopUnpackedDir;
+-
+-  private ApplicationId infraAppId;
+-
+-  @BeforeClass
+-  public static void setupClass() throws Exception {
+-    PlatformAssumptions.assumeNotWindows("Dynamometer will not run on Windows");
+-    Assume.assumeThat("JAVA_HOME must be set properly",
+-        System.getenv("JAVA_HOME"), notNullValue());
+-    try {
+-      Shell.ShellCommandExecutor tarCheck = new Shell.ShellCommandExecutor(
+-          new String[]{"bash", "-c", "command -v tar"});
+-      tarCheck.execute();
+-      Assume.assumeTrue("tar command is not available",
+-          tarCheck.getExitCode() == 0);
+-    } catch (IOException ioe) {
+-      Assume.assumeNoException("Unable to execute a shell command", ioe);
+-    }
+-
+-    conf = new Configuration();
+-    // Follow the conventions of MiniDFSCluster
+-    testBaseDir = new File(
+-        System.getProperty(PROP_TEST_BUILD_DATA, "build/test/data"));
+-    String hadoopBinVersion = System.getProperty(HADOOP_BIN_VERSION_KEY,
+-        HADOOP_BIN_VERSION_DEFAULT);
+-    if (System.getProperty(HADOOP_BIN_PATH_KEY) == null) {
+-      hadoopTarballPath = fetchHadoopTarball(testBaseDir, hadoopBinVersion,
+-          conf, LOG);
+-    } else {
+-      hadoopTarballPath = new File(System.getProperty(HADOOP_BIN_PATH_KEY));
+-    }
+-    if (testBaseDir.exists()) {
+-      // Delete any old unpacked bin dirs that weren't previously cleaned up
+-      File[] oldUnpackedDirs = testBaseDir.listFiles(
+-          (dir, name) -> name.startsWith(HADOOP_BIN_UNPACKED_DIR_PREFIX));
+-      if (oldUnpackedDirs != null) {
+-        for (File oldDir : oldUnpackedDirs) {
+-          FileUtils.deleteQuietly(oldDir);
+-        }
+-      }
+-    }
+-    // Set up the Hadoop binary to be used as the system-level Hadoop install
+-    hadoopUnpackedDir = new File(testBaseDir,
+-        HADOOP_BIN_UNPACKED_DIR_PREFIX + UUID.randomUUID());
+-    assertTrue("Failed to make temporary directory",
+-        hadoopUnpackedDir.mkdirs());
+-    Shell.ShellCommandExecutor shexec = new Shell.ShellCommandExecutor(
+-        new String[] {"tar", "xzf", hadoopTarballPath.getAbsolutePath(), "-C",
+-            hadoopUnpackedDir.getAbsolutePath()});
+-    shexec.execute();
+-    if (shexec.getExitCode() != 0) {
+-      fail("Unable to execute tar to expand Hadoop binary");
+-    }
+-
+-    conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128);
+-    conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true);
+-    for (String q : new String[] {"root", "root.default"}) {
+-      conf.setInt(CapacitySchedulerConfiguration.PREFIX + q + "."
+-          + CapacitySchedulerConfiguration.CAPACITY, 100);
+-      String accessibleNodeLabelPrefix = CapacitySchedulerConfiguration.PREFIX
+-          + q + "." + CapacitySchedulerConfiguration.ACCESSIBLE_NODE_LABELS;
+-      conf.set(accessibleNodeLabelPrefix,
+-          CapacitySchedulerConfiguration.ALL_ACL);
+-      conf.setInt(accessibleNodeLabelPrefix + "." + DATANODE_NODELABEL + "."
+-          + CapacitySchedulerConfiguration.CAPACITY, 100);
+-      conf.setInt(accessibleNodeLabelPrefix + "." + NAMENODE_NODELABEL + "."
+-          + CapacitySchedulerConfiguration.CAPACITY, 100);
+-    }
+-    // This is necessary to have the RM respect our vcore allocation request
+-    conf.setClass(CapacitySchedulerConfiguration.RESOURCE_CALCULATOR_CLASS,
+-        DominantResourceCalculator.class, ResourceCalculator.class);
+-    conf.setBoolean(YarnConfiguration.NM_DISK_HEALTH_CHECK_ENABLE, false);
+-    miniYARNCluster = new MiniYARNCluster(TestDynamometerInfra.class.getName(),
+-        1, MINICLUSTER_NUM_NMS, 1, 1);
+-    miniYARNCluster.init(conf);
+-    miniYARNCluster.start();
+-
+-    yarnConf = miniYARNCluster.getConfig();
+-    miniDFSCluster = new MiniDFSCluster.Builder(conf).format(true)
+-        .numDataNodes(MINICLUSTER_NUM_DNS).build();
+-    miniDFSCluster.waitClusterUp();
+-    FileSystem.setDefaultUri(conf, miniDFSCluster.getURI());
+-    FileSystem.setDefaultUri(yarnConf, miniDFSCluster.getURI());
+-    fs = miniDFSCluster.getFileSystem();
+-
+-    URL url = Thread.currentThread().getContextClassLoader()
+-        .getResource("yarn-site.xml");
+-    if (url == null) {
+-      throw new RuntimeException(
+-          "Could not find 'yarn-site.xml' dummy file in classpath");
+-    }
+-    yarnConf.set(YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-        new File(url.getPath()).getParent());
+-    // Write the XML to a buffer before writing to the file. writeXml() can
+-    // trigger a read of the existing yarn-site.xml, so writing directly could
+-    // trigger a read of the file while it is in an inconsistent state
+-    // (partially written)
+-    try (ByteArrayOutputStream bytesOut = new ByteArrayOutputStream()) {
+-      yarnConf.writeXml(bytesOut);
+-      try (OutputStream fileOut = new FileOutputStream(
+-          new File(url.getPath()))) {
+-        fileOut.write(bytesOut.toByteArray());
+-      }
+-    }
+-
+-    yarnClient = YarnClient.createYarnClient();
+-    yarnClient.init(new Configuration(yarnConf));
+-    yarnClient.start();
+-
+-    fsImageTmpPath = fs.makeQualified(new Path("/tmp/" + FSIMAGE_FILENAME));
+-    fsVersionTmpPath = fs.makeQualified(new Path("/tmp/" + VERSION_FILENAME));
+-    blockImageOutputDir = fs.makeQualified(new Path("/tmp/blocks"));
+-    auditTraceDir = fs.makeQualified(new Path("/tmp/audit_trace_direct"));
+-    confZip = fs.makeQualified(new Path("/tmp/conf.zip"));
+-
+-    uploadFsimageResourcesToHDFS(hadoopBinVersion);
+-
+-    miniYARNCluster.waitForNodeManagersToConnect(30000);
+-
+-    RMNodeLabelsManager nodeLabelManager = miniYARNCluster.getResourceManager()
+-        .getRMContext().getNodeLabelManager();
+-    nodeLabelManager.addToCluserNodeLabelsWithDefaultExclusivity(
+-        Sets.newHashSet(NAMENODE_NODELABEL, DATANODE_NODELABEL));
+-    Map<NodeId, Set<String>> nodeLabels = new HashMap<>();
+-    nodeLabels.put(miniYARNCluster.getNodeManager(0).getNMContext().getNodeId(),
+-        Sets.newHashSet(NAMENODE_NODELABEL));
+-    nodeLabels.put(miniYARNCluster.getNodeManager(1).getNMContext().getNodeId(),
+-        Sets.newHashSet(DATANODE_NODELABEL));
+-    nodeLabelManager.addLabelsToNode(nodeLabels);
+-  }
+-
+-  @AfterClass
+-  public static void teardownClass() throws Exception {
+-    if (miniDFSCluster != null) {
+-      miniDFSCluster.shutdown(true);
+-      miniDFSCluster = null;
+-    }
+-    if (yarnClient != null) {
+-      yarnClient.stop();
+-      yarnClient = null;
+-    }
+-    if (miniYARNCluster != null) {
+-      miniYARNCluster.getResourceManager().stop();
+-      miniYARNCluster.getResourceManager().waitForServiceToStop(30000);
+-      miniYARNCluster.stop();
+-      miniYARNCluster.waitForServiceToStop(30000);
+-      FileUtils.deleteDirectory(miniYARNCluster.getTestWorkDir());
+-      miniYARNCluster = null;
+-    }
+-    if (hadoopUnpackedDir != null) {
+-      FileUtils.deleteDirectory(hadoopUnpackedDir);
+-    }
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (infraAppId != null && yarnClient != null) {
+-      yarnClient.killApplication(infraAppId);
+-    }
+-    infraAppId = null;
+-  }
+-
+-  @Test(timeout = 15 * 60 * 1000)
+-  public void testNameNodeInYARN() throws Exception {
+-    Configuration localConf = new Configuration(yarnConf);
+-    localConf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY, 60000);
+-
+-    final Client client = createAndStartClient(localConf);
+-
+-    awaitApplicationStartup();
+-
+-    long startTime = System.currentTimeMillis();
+-    long maxWaitTimeMs = TimeUnit.MINUTES.toMillis(10);
+-    Supplier<Boolean> exitCheckSupplier = () -> {
+-      if (System.currentTimeMillis() - startTime > maxWaitTimeMs) {
+-        // Wait at most 10 minutes for the NameNode to start and be ready
+-        return true;
+-      }
+-      try {
+-        // Exit immediately if the YARN app fails
+-        return yarnClient.getApplicationReport(infraAppId)
+-            .getYarnApplicationState() == YarnApplicationState.FAILED;
+-      } catch (IOException | YarnException e) {
+-        return true;
+-      }
+-    };
+-    Optional<Properties> namenodeProperties = DynoInfraUtils
+-        .waitForAndGetNameNodeProperties(exitCheckSupplier, localConf,
+-            client.getNameNodeInfoPath(), LOG);
+-    if (!namenodeProperties.isPresent()) {
+-      fail("Unable to fetch NameNode properties");
+-    }
+-
+-    DynoInfraUtils.waitForNameNodeReadiness(namenodeProperties.get(), 3, false,
+-        exitCheckSupplier, localConf, LOG);
+-
+-    assertClusterIsFunctional(localConf, namenodeProperties.get());
+-
+-    Map<ContainerId, Container> namenodeContainers = miniYARNCluster
+-        .getNodeManager(0).getNMContext().getContainers();
+-    Map<ContainerId, Container> datanodeContainers = miniYARNCluster
+-        .getNodeManager(1).getNMContext().getContainers();
+-    Map<ContainerId, Container> amContainers = miniYARNCluster.getNodeManager(2)
+-        .getNMContext().getContainers();
+-    assertEquals(1, namenodeContainers.size());
+-    assertEquals(2,
+-        namenodeContainers.keySet().iterator().next().getContainerId());
+-    assertEquals(2, datanodeContainers.size());
+-    assertEquals(1, amContainers.size());
+-    assertEquals(1, amContainers.keySet().iterator().next().getContainerId());
+-
+-    LOG.info("Waiting for workload job to start and complete");
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        return client.getWorkloadJob() != null
+-            && client.getWorkloadJob().isComplete();
+-      } catch (IOException | IllegalStateException e) {
+-        return false;
+-      }
+-    }, 3000, 60000);
+-    LOG.info("Workload job completed");
+-
+-    if (!client.getWorkloadJob().isSuccessful()) {
+-      fail("Workload job failed");
+-    }
+-    Counters counters = client.getWorkloadJob().getCounters();
+-    assertEquals(6,
+-        counters.findCounter(AuditReplayMapper.REPLAYCOUNTERS.TOTALCOMMANDS)
+-            .getValue());
+-    assertEquals(1,
+-        counters
+-            .findCounter(AuditReplayMapper.REPLAYCOUNTERS.TOTALINVALIDCOMMANDS)
+-            .getValue());
+-
+-    LOG.info("Waiting for infra application to exit");
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ApplicationReport report = yarnClient
+-            .getApplicationReport(infraAppId);
+-        return report
+-              .getYarnApplicationState() == YarnApplicationState.KILLED;
+-      } catch (IOException | YarnException e) {
+-        return false;
+-      }
+-    }, 3000, 300000);
+-
+-    LOG.info("Waiting for metrics file to be ready");
+-    // Try to read the metrics file
+-    Path hdfsStoragePath = new Path(fs.getHomeDirectory(),
+-        DynoConstants.DYNAMOMETER_STORAGE_DIR + "/" + infraAppId);
+-    final Path metricsPath = new Path(hdfsStoragePath, "namenode_metrics");
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        FSDataInputStream in = fs.open(metricsPath);
+-        String metricsOutput = in.readUTF();
+-        in.close();
+-        // Just assert that there is some metrics content in there
+-        assertTrue(metricsOutput.contains("JvmMetrics"));
+-        return true;
+-      } catch (IOException ioe) {
+-        return false;
+-      }
+-    }, 3000, 60000);
+-    assertTrue(fs.exists(new Path(OUTPUT_PATH)));
+-  }
+-
+-  private void assertClusterIsFunctional(Configuration localConf,
+-      Properties namenodeProperties) throws IOException {
+-    // Test that we can successfully write to / read from the cluster
+-    try {
+-      URI nameNodeUri = DynoInfraUtils.getNameNodeHdfsUri(namenodeProperties);
+-      DistributedFileSystem dynoFS =
+-          (DistributedFileSystem) FileSystem.get(nameNodeUri, localConf);
+-      Path testFile = new Path("/tmp/test/foo");
+-      dynoFS.mkdir(testFile.getParent(), FsPermission.getDefault());
+-      FSDataOutputStream out = dynoFS.create(testFile, (short) 1);
+-      out.write(42);
+-      out.hsync();
+-      out.close();
+-      FileStatus[] stats = dynoFS.listStatus(testFile.getParent());
+-      assertEquals(1, stats.length);
+-      assertEquals("foo", stats[0].getPath().getName());
+-    } catch (IOException e) {
+-      LOG.error("Failed to write or read", e);
+-      throw e;
+-    }
+-  }
+-
+-  private void awaitApplicationStartup()
+-      throws TimeoutException, InterruptedException {
+-    LOG.info("Waiting for application ID to become available");
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        List<ApplicationReport> apps = yarnClient.getApplications();
+-        if (apps.size() == 1) {
+-          infraAppId = apps.get(0).getApplicationId();
+-          return true;
+-        } else if (apps.size() > 1) {
+-          fail("Unexpected: more than one application");
+-        }
+-      } catch (IOException | YarnException e) {
+-        fail("Unexpected exception: " + e);
+-      }
+-      return false;
+-    }, 1000, 60000);
+-  }
+-
+-  private Client createAndStartClient(Configuration localConf) {
+-    final Client client = new Client(JarFinder.getJar(ApplicationMaster.class),
+-        JarFinder.getJar(Assert.class));
+-    client.setConf(localConf);
+-    Thread appThread = new Thread(() -> {
+-      try {
+-        client.run(new String[] {"-" + Client.MASTER_MEMORY_MB_ARG, "128",
+-            "-" + Client.CONF_PATH_ARG, confZip.toString(),
+-            "-" + Client.BLOCK_LIST_PATH_ARG,
+-            blockImageOutputDir.toString(), "-" + Client.FS_IMAGE_DIR_ARG,
+-            fsImageTmpPath.getParent().toString(),
+-            "-" + Client.HADOOP_BINARY_PATH_ARG,
+-            hadoopTarballPath.getAbsolutePath(),
+-            "-" + AMOptions.DATANODES_PER_CLUSTER_ARG, "2",
+-            "-" + AMOptions.DATANODE_MEMORY_MB_ARG, "128",
+-            "-" + AMOptions.DATANODE_NODELABEL_ARG, DATANODE_NODELABEL,
+-            "-" + AMOptions.NAMENODE_MEMORY_MB_ARG, "256",
+-            "-" + AMOptions.NAMENODE_METRICS_PERIOD_ARG, "1",
+-            "-" + AMOptions.NAMENODE_NODELABEL_ARG, NAMENODE_NODELABEL,
+-            "-" + AMOptions.SHELL_ENV_ARG,
+-            "HADOOP_HOME=" + getHadoopHomeLocation(),
+-            "-" + AMOptions.SHELL_ENV_ARG,
+-            "HADOOP_CONF_DIR=" + getHadoopHomeLocation() + "/etc/hadoop",
+-            "-" + Client.WORKLOAD_REPLAY_ENABLE_ARG,
+-            "-" + Client.WORKLOAD_INPUT_PATH_ARG,
+-            fs.makeQualified(new Path("/tmp/audit_trace_direct")).toString(),
+-            "-" + Client.WORKLOAD_OUTPUT_PATH_ARG,
+-            fs.makeQualified(new Path(OUTPUT_PATH)).toString(),
+-            "-" + Client.WORKLOAD_THREADS_PER_MAPPER_ARG, "1",
+-            "-" + Client.WORKLOAD_START_DELAY_ARG, "10s",
+-            "-" + AMOptions.NAMENODE_ARGS_ARG,
+-            "-Ddfs.namenode.safemode.extension=0"});
+-      } catch (Exception e) {
+-        LOG.error("Error running client", e);
+-      }
+-    });
+-
+-    appThread.start();
+-    return client;
+-  }
+-
+-  private static URI getResourcePath(String resourceName) {
+-    try {
+-      return TestDynamometerInfra.class.getClassLoader()
+-          .getResource(resourceName).toURI();
+-    } catch (URISyntaxException e) {
+-      return null;
+-    }
+-  }
+-
+-  /**
+-   * Get the Hadoop home location (i.e. for {@code HADOOP_HOME}) as the only
+-   * directory within the unpacked location of the Hadoop tarball.
+-   *
+-   * @return The absolute path to the Hadoop home directory.
+-   */
+-  private String getHadoopHomeLocation() {
+-    File[] files = hadoopUnpackedDir.listFiles();
+-    if (files == null || files.length != 1) {
+-      fail("Should be 1 directory within the Hadoop unpacked dir");
+-    }
+-    return files[0].getAbsolutePath();
+-  }
+-
+-  /**
+-   * Look for the resource files relevant to {@code hadoopBinVersion} and upload
+-   * them onto the MiniDFSCluster's HDFS for use by the subsequent jobs.
+-   *
+-   * @param hadoopBinVersion
+-   *          The version string (e.g. "3.1.1") for which to look for resources.
+-   */
+-  private static void uploadFsimageResourcesToHDFS(String hadoopBinVersion)
+-      throws IOException {
+-    // Keep only the major/minor version for the resources path
+-    String[] versionComponents = hadoopBinVersion.split("\\.");
+-    if (versionComponents.length < 2) {
+-      fail(
+-          "At least major and minor version are required to be specified; got: "
+-              + hadoopBinVersion);
+-    }
+-    String hadoopResourcesPath = "hadoop_" + versionComponents[0] + "_"
+-        + versionComponents[1];
+-    String fsImageResourcePath = hadoopResourcesPath + "/" + FSIMAGE_FILENAME;
+-    fs.copyFromLocalFile(new Path(getResourcePath(fsImageResourcePath)),
+-        fsImageTmpPath);
+-    fs.copyFromLocalFile(
+-        new Path(getResourcePath(fsImageResourcePath + ".md5")),
+-        fsImageTmpPath.suffix(".md5"));
+-    fs.copyFromLocalFile(
+-        new Path(getResourcePath(hadoopResourcesPath + "/" + VERSION_FILENAME)),
+-        fsVersionTmpPath);
+-    fs.mkdirs(auditTraceDir);
+-    IOUtils.copyBytes(
+-        TestDynamometerInfra.class.getClassLoader()
+-            .getResourceAsStream("audit_trace_direct/audit0"),
+-        fs.create(new Path(auditTraceDir, "audit0")), conf, true);
+-    fs.mkdirs(blockImageOutputDir);
+-    for (String blockFile : new String[] {"dn0-a-0-r-00000", "dn1-a-0-r-00001",
+-        "dn2-a-0-r-00002"}) {
+-      IOUtils.copyBytes(
+-          TestDynamometerInfra.class.getClassLoader()
+-              .getResourceAsStream("blocks/" + blockFile),
+-          fs.create(new Path(blockImageOutputDir, blockFile)), conf, true);
+-    }
+-    File tempConfZip = new File(testBaseDir, "conf.zip");
+-    ZipOutputStream zos = new ZipOutputStream(
+-        new FileOutputStream(tempConfZip));
+-    for (String file : new String[] {"core-site.xml", "hdfs-site.xml",
+-        "log4j.properties"}) {
+-      zos.putNextEntry(new ZipEntry("etc/hadoop/" + file));
+-      InputStream is = TestDynamometerInfra.class.getClassLoader()
+-          .getResourceAsStream("conf/etc/hadoop/" + file);
+-      IOUtils.copyBytes(is, zos, conf, false);
+-      is.close();
+-      zos.closeEntry();
+-    }
+-    zos.close();
+-    fs.copyFromLocalFile(new Path(tempConfZip.toURI()), confZip);
+-    tempConfZip.delete();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynoInfraUtils.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynoInfraUtils.java
+deleted file mode 100644
+index 0881347e734..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynoInfraUtils.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer;
+-
+-import java.util.Set;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-
+-/** Tests for {@link DynoInfraUtils}. */
+-public class TestDynoInfraUtils {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDynoInfraUtils.class);
+-
+-  @Test
+-  public void testParseStaleDatanodeListSingleDatanode() throws Exception {
+-    // Confirm all types of values can be properly parsed
+-    String json = "{"
+-        + "\"1.2.3.4:5\": {"
+-        + "  \"numBlocks\": 5,"
+-        + "  \"fooString\":\"stringValue\","
+-        + "  \"fooInteger\": 1,"
+-        + "  \"fooFloat\": 1.0,"
+-        + "  \"fooArray\": []"
+-        + "}"
+-        + "}";
+-    Set<String> out = DynoInfraUtils.parseStaleDataNodeList(json, 10, LOG);
+-    assertEquals(1, out.size());
+-    assertTrue(out.contains("1.2.3.4:5"));
+-  }
+-
+-  @Test
+-  public void testParseStaleDatanodeListMultipleDatanodes() throws Exception {
+-    String json = "{"
+-        + "\"1.2.3.4:1\": {\"numBlocks\": 0}, "
+-        + "\"1.2.3.4:2\": {\"numBlocks\": 15}, "
+-        + "\"1.2.3.4:3\": {\"numBlocks\": 5}, "
+-        + "\"1.2.3.4:4\": {\"numBlocks\": 10} "
+-        + "}";
+-    Set<String> out = DynoInfraUtils.parseStaleDataNodeList(json, 10, LOG);
+-    assertEquals(2, out.size());
+-    assertTrue(out.contains("1.2.3.4:1"));
+-    assertTrue(out.contains("1.2.3.4:3"));
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn0-a-0-r-00000 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn0-a-0-r-00000
+deleted file mode 100644
+index d2768e86cf8..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn0-a-0-r-00000
++++ /dev/null
+@@ -1,34 +0,0 @@
+-1073751825,11001,4
+-1073751921,11097,4
+-1073751918,11094,4
+-1073751915,11091,4
+-1073751912,11088,4
+-1073751909,11085,4
+-1073751906,11082,4
+-1073751903,11079,4
+-1073751900,11076,4
+-1073751897,11073,4
+-1073751894,11070,4
+-1073751891,11067,4
+-1073751888,11064,4
+-1073751885,11061,4
+-1073751882,11058,4
+-1073751879,11055,4
+-1073751876,11052,4
+-1073751924,11100,4
+-1073751873,11049,4
+-1073751870,11046,4
+-1073751867,11043,4
+-1073751864,11040,4
+-1073751861,11037,4
+-1073751858,11034,4
+-1073751855,11031,4
+-1073751852,11028,4
+-1073751849,11025,4
+-1073751846,11022,4
+-1073751843,11019,4
+-1073751840,11016,4
+-1073751837,11013,4
+-1073751834,11010,4
+-1073751831,11007,4
+-1073751828,11004,4
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn1-a-0-r-00001 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn1-a-0-r-00001
+deleted file mode 100644
+index f8b3d74d02f..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn1-a-0-r-00001
++++ /dev/null
+@@ -1,33 +0,0 @@
+-1073751847,11023,4
+-1073751922,11098,4
+-1073751841,11017,4
+-1073751829,11005,4
+-1073751919,11095,4
+-1073751856,11032,4
+-1073751886,11062,4
+-1073751916,11092,4
+-1073751871,11047,4
+-1073751880,11056,4
+-1073751913,11089,4
+-1073751826,11002,4
+-1073751868,11044,4
+-1073751910,11086,4
+-1073751853,11029,4
+-1073751838,11014,4
+-1073751907,11083,4
+-1073751889,11065,4
+-1073751865,11041,4
+-1073751904,11080,4
+-1073751874,11050,4
+-1073751877,11053,4
+-1073751901,11077,4
+-1073751850,11026,4
+-1073751862,11038,4
+-1073751898,11074,4
+-1073751832,11008,4
+-1073751883,11059,4
+-1073751895,11071,4
+-1073751844,11020,4
+-1073751859,11035,4
+-1073751892,11068,4
+-1073751835,11011,4
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn2-a-0-r-00002 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn2-a-0-r-00002
+deleted file mode 100644
+index d191112a544..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/blocks/dn2-a-0-r-00002
++++ /dev/null
+@@ -1,33 +0,0 @@
+-1073751890,11066,4
+-1073751887,11063,4
+-1073751845,11021,4
+-1073751884,11060,4
+-1073751881,11057,4
+-1073751830,11006,4
+-1073751878,11054,4
+-1073751842,11018,4
+-1073751875,11051,4
+-1073751872,11048,4
+-1073751839,11015,4
+-1073751869,11045,4
+-1073751866,11042,4
+-1073751863,11039,4
+-1073751836,11012,4
+-1073751860,11036,4
+-1073751857,11033,4
+-1073751920,11096,4
+-1073751917,11093,4
+-1073751827,11003,4
+-1073751914,11090,4
+-1073751854,11030,4
+-1073751911,11087,4
+-1073751908,11084,4
+-1073751833,11009,4
+-1073751905,11081,4
+-1073751851,11027,4
+-1073751902,11078,4
+-1073751899,11075,4
+-1073751896,11072,4
+-1073751848,11024,4
+-1073751893,11069,4
+-1073751923,11099,4
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/core-site.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/core-site.xml
+deleted file mode 100644
+index cdb482a5425..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/core-site.xml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version='1.0' encoding='UTF-8'?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<configuration>
+-  <property>
+-  <name>hadoop.security.impersonation.provider.class</name>
+-  <value>org.apache.hadoop.tools.dynamometer.AllowAllImpersonationProvider</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/hdfs-site.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/hdfs-site.xml
+deleted file mode 100644
+index 34069d4b040..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/hdfs-site.xml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version='1.0' encoding='UTF-8'?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<configuration>
+-  <property>
+-    <name>dfs.datanode.data.dir</name>
+-    <value>file:///dynamometer/dfs/data1,file:///dynamometer/dfs/data2</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/log4j.properties b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/log4j.properties
+deleted file mode 100644
+index d06da872168..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/conf/etc/hadoop/log4j.properties
++++ /dev/null
+@@ -1,26 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-hadoop.root.logger=INFO,RFA
+-hadoop.log.dir=.
+-hadoop.log.file=hadoop.log
+-
+-log4j.rootLogger=${hadoop.root.logger}
+-log4j.appender.RFA=org.apache.log4j.ConsoleAppender
+-log4j.appender.RFA.target=System.err
+-log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
+-log4j.appender.console=org.apache.log4j.ConsoleAppender
+-log4j.appender.console.target=System.err
+-log4j.appender.console.layout=org.apache.log4j.PatternLayout
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/VERSION b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/VERSION
+deleted file mode 100644
+index ff3f84e1048..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/VERSION
++++ /dev/null
+@@ -1,7 +0,0 @@
+-#Wed Jan 09 11:28:34 PST 2019
+-namespaceID=1157798435
+-clusterID=CID-91db90f5-16f6-4309-a88e-263223234059
+-cTime=1547062025277
+-storageType=NAME_NODE
+-blockpoolID=BP-963098314-0.0.0.0-1494453277231
+-layoutVersion=-64
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740
+deleted file mode 100644
+index 6ea4f237a83b7e6d995cf268a21f63a6b744bee2..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 13795
+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
+VvwMd>e2|;<V)}lsjEs!B{{R^A;Nt)Q
+
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740.md5 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740.md5
+deleted file mode 100644
+index 178794afdf1..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/hadoop_3_1/fsimage_0000000000000061740.md5
++++ /dev/null
+@@ -1 +0,0 @@
+-211ac2f198a2d8f0488638d3b11f5238 *fsimage_0000000000000061740
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/yarn-site.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index bbe179963b0..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,19 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <!-- Dummy (invalid) config file to be overwritten by tests with MiniCluster configuration. -->
+-</configuration>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml
+deleted file mode 100644
+index 919d5cf776f..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/pom.xml
++++ /dev/null
+@@ -1,151 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-dynamometer-workload</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Dynamometer Workload Simulator</description>
+-  <name>Apache Hadoop Dynamometer Workload Simulator</name>
+-  <packaging>jar</packaging>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-source-plugin</artifactId>
+-        <configuration>
+-          <attach>true</attach>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-            <phase>test-compile</phase>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/test/resources/audit_trace_direct/audit0</exclude>
+-            <exclude>src/test/resources/audit_trace_hive/audit0</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>dist</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-assembly-plugin</artifactId>
+-            <dependencies>
+-              <dependency>
+-                <groupId>org.apache.hadoop</groupId>
+-                <artifactId>hadoop-assemblies</artifactId>
+-                <version>${project.version}</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <id>dist</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>single</goal>
+-                </goals>
+-                <configuration>
+-                  <appendAssemblyId>false</appendAssemblyId>
+-                  <attach>false</attach>
+-                  <finalName>${project.artifactId}-${project.version}</finalName>
+-                  <descriptorRefs>
+-                    <descriptorRef>hadoop-dynamometer-workload</descriptorRef>
+-                  </descriptorRefs>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/parse-start-timestamp.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/parse-start-timestamp.sh
+deleted file mode 100755
+index f7e299e2605..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/parse-start-timestamp.sh
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# This script will determine the timestamp of the last transaction appearing in a
+-# given fsimage by looking at the corresponding edits file. This is useful to determine
+-# from whence to start collecting audit logs to replay against the fsimage.
+-
+-if [ $# -lt 1 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+-  echo "Usage: ./parse-start-timestamp.sh image-txid [ edits-dir ]"
+-  echo "       Finds the last timestamp present in the edit file which ends in"
+-  echo "       the specified transaction ID (leading 0s not required)."
+-  echo "       If edits-dir is specified, looks for edit files under"
+-  echo "       edits-dir/current. Otherwise, looks in the current directory."
+-  exit 1
+-fi
+-if [[ $(command -v gawk) == "" ]]; then
+-  echo "This script requires gawk to be available."
+-  exit 1
+-fi
+-image_txid="$1"
+-if [[ $# -ge 2 ]]; then
+-  edits_dir="$2/current"
+-else
+-  edits_dir="$(pwd)"
+-fi
+-
+-edits_file_count="$(find -H "${edits_dir}" -maxdepth 1 -type f -name "edits_*-*$image_txid" | wc -l)"
+-if [[ "$edits_file_count" != 1 ]]; then
+-  echo "Error; found $edits_file_count matching edit files."
+-  exit 1
+-fi
+-edits_file="$(find -H "${edits_dir}" -maxdepth 1 -type f -name "edits_*-*$image_txid")"
+-
+-# Shellcheck complains about the $ in the single-quote because it won't expand, but this is intentional
+-# shellcheck disable=SC2016
+-awk_script='/TIMESTAMP/ { line=$0 } END { match(line, />([[:digit:]]+)</, output); print output[1] }'
+-echo "Start timestamp for $image_txid is: (this may take a moment)"
+-hdfs oev -i "$edits_dir/$edits_file" -o >(gawk "$awk_script")
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/start-workload.sh b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/start-workload.sh
+deleted file mode 100755
+index 7c4cec00c01..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/bash/start-workload.sh
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# This script simply passes its arguments along to the workload driver
+-# driver after finding a hadoop command in PATH/HADOOP_COMMON_HOME/HADOOP_HOME
+-# (searching in that order).
+-
+-if type hadoop &> /dev/null; then
+-  hadoop_cmd="hadoop"
+-elif type "$HADOOP_COMMON_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_COMMON_HOME/bin/hadoop"
+-elif type "$HADOOP_HOME/bin/hadoop" &> /dev/null; then
+-  hadoop_cmd="$HADOOP_HOME/bin/hadoop"
+-else
+-  echo "Unable to find a valid hadoop command to execute; exiting."
+-  exit 1
+-fi
+-
+-script_pwd="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../.."
+-
+-for f in ${script_pwd}/lib/*.jar; do
+-  # Skip adding the workload JAR since it is added by the `hadoop jar` command
+-  if [[ "$f" != *"dynamometer-workload-"* ]]; then
+-    export HADOOP_CLASSPATH="$HADOOP_CLASSPATH:$f"
+-  fi
+-done
+-"$hadoop_cmd" jar "${script_pwd}"/lib/hadoop-dynamometer-workload-*.jar \
+-  org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadDriver "$@"
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/CreateFileMapper.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/CreateFileMapper.java
+deleted file mode 100644
+index 318b47d19ff..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/CreateFileMapper.java
++++ /dev/null
+@@ -1,147 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import org.apache.hadoop.util.Lists;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.net.URI;
+-import java.util.List;
+-import java.util.concurrent.TimeUnit;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.mapreduce.Mapper;
+-
+-/**
+- * CreateFileMapper continuously creates 1 byte files for the specified duration
+- * to increase the number of file objects on the NN.
+- * <p>
+- * Configuration options available:
+- * <ul>
+- *   <li>{@value NUM_MAPPERS_KEY} (required): Number of mappers to launch.</li>
+- *   <li>{@value DURATION_MIN_KEY} (required): Number of minutes to induce
+- *       workload for.</li>
+- *   <li>{@value SHOULD_DELETE_KEY} (default: {@value SHOULD_DELETE_DEFAULT}):
+- *       If true, delete the files after creating them. This can be useful for
+- *       generating constant load without increasing the number of file
+- *       objects.</li>
+- *   <li>{@value FILE_PARENT_PATH_KEY} (default:
+- *       {@value FILE_PARENT_PATH_DEFAULT}): The root directory in which to
+- *       create files.</li>
+- * </ul>
+- */
+-public class CreateFileMapper
+-    extends WorkloadMapper<NullWritable, NullWritable, NullWritable,
+-    NullWritable> {
+-
+-  public static final String NUM_MAPPERS_KEY = "createfile.num-mappers";
+-  public static final String DURATION_MIN_KEY = "createfile.duration-min";
+-  public static final String FILE_PARENT_PATH_KEY =
+-      "createfile.file-parent-path";
+-  public static final String FILE_PARENT_PATH_DEFAULT = "/tmp/createFileMapper";
+-  public static final String SHOULD_DELETE_KEY = "createfile.should-delete";
+-  public static final boolean SHOULD_DELETE_DEFAULT = false;
+-
+-  /** Custom {@link org.apache.hadoop.mapreduce.Counter} definitions. */
+-  public enum CREATEFILECOUNTERS {
+-    NUMFILESCREATED
+-  }
+-
+-  private long startTimestampMs;
+-  private FileSystem fs;
+-  private Configuration conf;
+-  private int taskID;
+-  private String fileParentPath;
+-  private boolean shouldDelete;
+-  private long endTimeStampMs;
+-
+-  @Override
+-  public String getDescription() {
+-    return "This mapper creates 1-byte files for the specified duration.";
+-  }
+-
+-  @Override
+-  public List<String> getConfigDescriptions() {
+-    return Lists.newArrayList(
+-        NUM_MAPPERS_KEY + " (required): Number of mappers to launch.",
+-        DURATION_MIN_KEY
+-            + " (required): Number of minutes to induce workload for.",
+-        SHOULD_DELETE_KEY + " (default: " + SHOULD_DELETE_DEFAULT
+-            + "): If true, delete the files after creating "
+-            + "them. This can be useful for generating constant load without "
+-            + "increasing the number of file objects.",
+-        FILE_PARENT_PATH_KEY + " (default: " + FILE_PARENT_PATH_DEFAULT
+-            + "): The root directory in which to create files.");
+-  }
+-
+-  @Override
+-  public boolean verifyConfigurations(Configuration confToVerify) {
+-    return confToVerify.get(NUM_MAPPERS_KEY) != null
+-        && confToVerify.get(DURATION_MIN_KEY) != null;
+-  }
+-
+-  @Override
+-  public void map(NullWritable key, NullWritable value,
+-      Mapper.Context mapperContext) throws IOException, InterruptedException {
+-    taskID = mapperContext.getTaskAttemptID().getTaskID().getId();
+-    conf = mapperContext.getConfiguration();
+-    String namenodeURI = conf.get(WorkloadDriver.NN_URI);
+-    startTimestampMs = conf.getLong(WorkloadDriver.START_TIMESTAMP_MS, -1);
+-    fileParentPath = conf.get(FILE_PARENT_PATH_KEY, FILE_PARENT_PATH_DEFAULT);
+-    shouldDelete = conf.getBoolean(SHOULD_DELETE_KEY, SHOULD_DELETE_DEFAULT);
+-    int durationMin = conf.getInt(DURATION_MIN_KEY, -1);
+-    if (durationMin < 0) {
+-      throw new IOException("Duration must be positive; got: " + durationMin);
+-    }
+-    endTimeStampMs = startTimestampMs
+-        + TimeUnit.MILLISECONDS.convert(durationMin, TimeUnit.MINUTES);
+-    fs = FileSystem.get(URI.create(namenodeURI), conf);
+-    System.out.println("Start timestamp: " + startTimestampMs);
+-
+-    long currentEpoch = System.currentTimeMillis();
+-    long delay = startTimestampMs - currentEpoch;
+-    if (delay > 0) {
+-      System.out.println("Sleeping for " + delay + " ms");
+-      Thread.sleep(delay);
+-    }
+-
+-    String mapperSpecifcPathPrefix = fileParentPath + "/mapper" + taskID;
+-    System.out.println("Mapper path prefix: " + mapperSpecifcPathPrefix);
+-    long numFilesCreated = 0;
+-    Path path;
+-    final byte[] content = {0x0};
+-    while (System.currentTimeMillis() < endTimeStampMs) {
+-      path = new Path(mapperSpecifcPathPrefix + "/file" + numFilesCreated);
+-      OutputStream out = fs.create(path);
+-      out.write(content);
+-      out.close();
+-      numFilesCreated++;
+-      mapperContext.getCounter(CREATEFILECOUNTERS.NUMFILESCREATED)
+-          .increment(1L);
+-      if (numFilesCreated % 1000 == 0) {
+-        mapperContext.progress();
+-        System.out.println("Number of files created: " + numFilesCreated);
+-      }
+-      if (shouldDelete) {
+-        fs.delete(path, true);
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputFormat.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputFormat.java
+deleted file mode 100644
+index 220641262e1..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputFormat.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-
+-
+-/**
+- * An input format which does not read any input, but rather starts a
+- * configurable number of mappers and runs them for a configurable duration.
+- */
+-public class VirtualInputFormat<K, V> extends FileInputFormat<K, V> {
+-  // Number of splits = Number of mappers. Creates fakeSplits to launch
+-  // the required number of mappers
+-  @Override
+-  public List<InputSplit> getSplits(JobContext job) throws IOException {
+-    Configuration conf = job.getConfiguration();
+-    int numMappers = conf.getInt(CreateFileMapper.NUM_MAPPERS_KEY, -1);
+-    if (numMappers == -1) {
+-      throw new IOException("Number of mappers should be provided as input");
+-    }
+-    List<InputSplit> splits = new ArrayList<InputSplit>(numMappers);
+-    for (int i = 0; i < numMappers; i++) {
+-      splits.add(new VirtualInputSplit());
+-    }
+-    return splits;
+-  }
+-
+-  @Override
+-  public RecordReader<K, V> createRecordReader(InputSplit split,
+-      TaskAttemptContext context) throws IOException, InterruptedException {
+-    return new VirtualRecordReader<>();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputSplit.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputSplit.java
+deleted file mode 100644
+index cd4c87fcfe8..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualInputSplit.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-
+-
+-/**
+- * A fake input split.
+- */
+-public class VirtualInputSplit extends InputSplit implements Writable {
+-
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    // do Nothing
+-  }
+-
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    // do Nothing
+-  }
+-
+-  @Override
+-  public long getLength() throws IOException, InterruptedException {
+-    return 0;
+-  }
+-
+-  @Override
+-  public String[] getLocations() throws IOException, InterruptedException {
+-    return new String[] {};
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualRecordReader.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualRecordReader.java
+deleted file mode 100644
+index b9c176e8fb8..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/VirtualRecordReader.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import java.io.IOException;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-
+-
+-/**
+- * A simple fake record reader which simply runs for some time duration.
+- */
+-@SuppressWarnings("unchecked")
+-public class VirtualRecordReader<K, V> extends RecordReader<K, V> {
+-  private int durationMs;
+-  private long startTimestampInMs;
+-  private long endTimestampInMs;
+-  private int numRows = 1;
+-
+-  @Override
+-  public void initialize(InputSplit split, TaskAttemptContext context)
+-      throws IOException, InterruptedException {
+-    Configuration conf = context.getConfiguration();
+-    durationMs = conf.getInt(CreateFileMapper.DURATION_MIN_KEY, 0) * 60 * 1000;
+-    startTimestampInMs = conf.getInt(WorkloadDriver.START_TIMESTAMP_MS, 0);
+-    endTimestampInMs = startTimestampInMs + durationMs;
+-  }
+-
+-  // The map function per split should be invoked only once.
+-  @Override
+-  public boolean nextKeyValue() throws IOException, InterruptedException {
+-    if (numRows > 0) {
+-      numRows--;
+-      return true;
+-    } else {
+-      return false;
+-    }
+-  }
+-
+-  @Override
+-  public K getCurrentKey() throws IOException, InterruptedException {
+-    return (K) NullWritable.get();
+-  }
+-
+-  @Override
+-  public V getCurrentValue() throws IOException, InterruptedException {
+-    return (V) NullWritable.get();
+-  }
+-
+-  @Override
+-  public float getProgress() throws IOException, InterruptedException {
+-    long remainingMs = endTimestampInMs - System.currentTimeMillis();
+-    return (remainingMs * 100.0f) / durationMs;
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    // do Nothing
+-  }
+-};
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadDriver.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadDriver.java
+deleted file mode 100644
+index 7c416bb14b2..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadDriver.java
++++ /dev/null
+@@ -1,213 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper;
+-import java.io.IOException;
+-import java.text.SimpleDateFormat;
+-import java.util.Date;
+-import java.util.concurrent.TimeUnit;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.OptionGroup;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.PosixParser;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * This is the driver for generating generic workloads against a NameNode under
+- * test. It launches a map-only job with a mapper class specified by the
+- * {@value MAPPER_CLASS_NAME} argument. See the specific mappers (currently
+- * {@link AuditReplayMapper} and {@link CreateFileMapper}) for information on
+- * their specific behavior and parameters.
+- */
+-public class WorkloadDriver extends Configured implements Tool {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(WorkloadDriver.class);
+-
+-  public static final String START_TIMESTAMP_MS = "start_timestamp_ms";
+-  public static final String START_TIME_OFFSET = "start_time_offset";
+-  public static final String START_TIME_OFFSET_DEFAULT = "1m";
+-  public static final String NN_URI = "nn_uri";
+-  public static final String MAPPER_CLASS_NAME = "mapper_class_name";
+-
+-  public int run(String[] args) throws Exception {
+-    Option helpOption = new Option("h", "help", false,
+-        "Shows this message. Additionally specify the " + MAPPER_CLASS_NAME
+-            + " argument to show help for a specific mapper class.");
+-    Options options = new Options();
+-    options.addOption(helpOption);
+-    options.addOption(Option.builder(NN_URI).argName("NN URI").hasArg()
+-        .desc("URI of the NameNode under test").required()
+-        .build());
+-    OptionGroup startTimeOptions = new OptionGroup();
+-    startTimeOptions.addOption(Option.builder(START_TIMESTAMP_MS).argName("Start Timestamp")
+-        .hasArg().desc("Mapper start UTC timestamp in ms")
+-        .build());
+-    startTimeOptions
+-        .addOption(Option.builder(START_TIME_OFFSET_DEFAULT).argName("Start Time Offset").hasArg()
+-            .desc("Mapper start time as an offset from current "
+-                + "time. Human-readable formats accepted, e.g. 10m (default "
+-                + START_TIME_OFFSET_DEFAULT + ").")
+-            .build());
+-    options.addOptionGroup(startTimeOptions);
+-    Option mapperClassOption = Option.builder(MAPPER_CLASS_NAME).argName("Mapper ClassName")
+-        .hasArg()
+-        .desc("Class name of the mapper; must be a WorkloadMapper "
+-            + "subclass. Mappers supported currently: \n"
+-            + "1. AuditReplayMapper \n"
+-            + "2. CreateFileMapper \n"
+-            + "Fully specified class names are also supported.")
+-        .required().build();
+-    options.addOption(mapperClassOption);
+-
+-    Options helpOptions = new Options();
+-    helpOptions.addOption(helpOption);
+-    Option mapperClassNotRequiredOption = (Option) mapperClassOption.clone();
+-    mapperClassNotRequiredOption.setRequired(false);
+-    helpOptions.addOption(mapperClassNotRequiredOption);
+-
+-    CommandLineParser parser = new PosixParser();
+-    CommandLine cli = parser.parse(helpOptions, args, true);
+-    if (cli.hasOption("h")) {
+-      String footer = null;
+-      if (cli.hasOption(MAPPER_CLASS_NAME)) {
+-        footer = getMapperUsageInfo(cli.getOptionValue(MAPPER_CLASS_NAME));
+-      }
+-
+-      HelpFormatter formatter = new HelpFormatter();
+-      formatter.printHelp(200, "./start-workload [options]", null, options,
+-          footer);
+-      return 1;
+-    }
+-
+-    cli = parser.parse(options, args);
+-    String nnURI = cli.getOptionValue(NN_URI);
+-    long startTimestampMs;
+-    if (cli.hasOption(START_TIMESTAMP_MS)) {
+-      startTimestampMs = Long.parseLong(cli.getOptionValue(START_TIMESTAMP_MS));
+-    } else {
+-      // Leverage the human-readable time parsing capabilities of Configuration
+-      String tmpConfKey = "___temp_config_property___";
+-      Configuration tmpConf = new Configuration();
+-      tmpConf.set(tmpConfKey,
+-          cli.getOptionValue(START_TIME_OFFSET, START_TIME_OFFSET_DEFAULT));
+-      startTimestampMs = tmpConf.getTimeDuration(tmpConfKey, 0,
+-          TimeUnit.MILLISECONDS) + System.currentTimeMillis();
+-    }
+-    Class<? extends WorkloadMapper<?, ?, ?, ?>> mapperClass = getMapperClass(
+-        cli.getOptionValue(MAPPER_CLASS_NAME));
+-    if (!mapperClass.newInstance().verifyConfigurations(getConf())) {
+-      System.err
+-          .println(getMapperUsageInfo(cli.getOptionValue(MAPPER_CLASS_NAME)));
+-      return 1;
+-    }
+-
+-    Job job = getJobForSubmission(getConf(), nnURI, startTimestampMs,
+-        mapperClass);
+-
+-    boolean success = job.waitForCompletion(true);
+-    return success ? 0 : 1;
+-  }
+-
+-  public static Job getJobForSubmission(Configuration baseConf, String nnURI,
+-      long startTimestampMs, Class<? extends WorkloadMapper<?, ?, ?, ?>>
+-      mapperClass) throws IOException, InstantiationException,
+-      IllegalAccessException {
+-    Configuration conf = new Configuration(baseConf);
+-    conf.set(NN_URI, nnURI);
+-    conf.setBoolean(MRJobConfig.MAP_SPECULATIVE, false);
+-
+-    String startTimeString = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss z")
+-        .format(new Date(startTimestampMs));
+-    LOG.info("The workload will start at " + startTimestampMs + " ms ("
+-        + startTimeString + ")");
+-    conf.setLong(START_TIMESTAMP_MS, startTimestampMs);
+-
+-    Job job = Job.getInstance(conf, "Dynamometer Workload Driver");
+-    job.setJarByClass(mapperClass);
+-    job.setMapperClass(mapperClass);
+-    mapperClass.newInstance().configureJob(job);
+-
+-    return job;
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    WorkloadDriver driver = new WorkloadDriver();
+-    System.exit(ToolRunner.run(driver, args));
+-  }
+-
+-  // The cast is actually checked via isAssignableFrom but the compiler doesn't
+-  // recognize this
+-  @SuppressWarnings("unchecked")
+-  private Class<? extends WorkloadMapper<?, ?, ?, ?>> getMapperClass(
+-      String className) {
+-    String[] potentialQualifiedClassNames = {
+-        WorkloadDriver.class.getPackage().getName() + "." + className,
+-        AuditReplayMapper.class.getPackage().getName() + "." + className,
+-        className
+-    };
+-    for (String qualifiedClassName : potentialQualifiedClassNames) {
+-      Class<?> mapperClass;
+-      try {
+-        mapperClass = getConf().getClassByName(qualifiedClassName);
+-      } catch (ClassNotFoundException cnfe) {
+-        continue;
+-      }
+-      if (!WorkloadMapper.class.isAssignableFrom(mapperClass)) {
+-        throw new IllegalArgumentException(className + " is not a subclass of "
+-            + WorkloadMapper.class.getCanonicalName());
+-      }
+-      return (Class<? extends WorkloadMapper<?, ?, ?, ?>>) mapperClass;
+-    }
+-    throw new IllegalArgumentException("Unable to find workload mapper class: "
+-        + className);
+-  }
+-
+-  private String getMapperUsageInfo(String mapperClassName)
+-      throws ClassNotFoundException, InstantiationException,
+-      IllegalAccessException {
+-    WorkloadMapper<?, ?, ?, ?> mapper = getMapperClass(mapperClassName)
+-        .newInstance();
+-    StringBuilder builder = new StringBuilder("Usage for ");
+-    builder.append(mapper.getClass().getSimpleName());
+-    builder.append(":\n");
+-    builder.append(mapper.getDescription());
+-    for (String configDescription : mapper.getConfigDescriptions()) {
+-      builder.append("\n    ");
+-      builder.append(configDescription);
+-    }
+-    builder.append("\nConfiguration parameters can be set at the ");
+-    builder.append("_start_ of the argument list like:\n");
+-    builder.append("  -Dconfiguration.key=configurationValue");
+-
+-    return builder.toString();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadMapper.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadMapper.java
+deleted file mode 100644
+index d73f5962d74..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/WorkloadMapper.java
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import java.util.List;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.mapreduce.InputFormat;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
+-
+-/**
+- * Represents the base class for a generic workload-generating mapper. By
+- * default, it will expect to use {@link VirtualInputFormat} as its
+- * {@link InputFormat}. Subclasses requiring a reducer or expecting a different
+- * {@link InputFormat} should override the {@link #configureJob(Job)} method.
+- */
+-public abstract class WorkloadMapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> extends
+-    Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> {
+-
+-  /**
+-   * Get the description of the behavior of this mapper.
+-   * @return description string.
+-   */
+-  public abstract String getDescription();
+-
+-  /**
+-   * Get a list of the description of each configuration that this mapper
+-   * accepts.
+-   * @return list of the description of each configuration.
+-   */
+-  public abstract List<String> getConfigDescriptions();
+-
+-  /**
+-   * Verify that the provided configuration contains all configurations required
+-   * by this mapper.
+-   * @param conf configuration.
+-   * @return whether or not all configurations required are provided.
+-   */
+-  public abstract boolean verifyConfigurations(Configuration conf);
+-
+-  /**
+-   * Setup input and output formats and optional reducer.
+-   */
+-  public void configureJob(Job job) {
+-    job.setInputFormatClass(VirtualInputFormat.class);
+-
+-    job.setNumReduceTasks(0);
+-    job.setOutputKeyClass(NullWritable.class);
+-    job.setOutputValueClass(NullWritable.class);
+-    job.setOutputFormatClass(NullOutputFormat.class);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditCommandParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditCommandParser.java
+deleted file mode 100644
+index c076a2061ef..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditCommandParser.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.io.IOException;
+-import java.util.function.Function;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-
+-/**
+- * This interface represents a pluggable command parser. It will accept in one
+- * line of {@link Text} input at a time and return an {@link AuditReplayCommand}
+- * which represents the input text. Each input line should produce exactly one
+- * command.
+- */
+-public interface AuditCommandParser {
+-
+-  /**
+-   * Initialize this parser with the given configuration. Guaranteed to be
+-   * called prior to any calls to {@link #parse(Text, Function)}.
+-   *
+-   * @param conf The Configuration to be used to set up this parser.
+-   * @throws IOException if error on initializing a parser.
+-   */
+-  void initialize(Configuration conf) throws IOException;
+-
+-  /**
+-   * Convert a line of input into an {@link AuditReplayCommand}. Since
+-   * {@link AuditReplayCommand}s store absolute timestamps, relativeToAbsolute
+-   * can be used to convert relative timestamps (i.e., milliseconds elapsed
+-   * between the start of the audit log and this command) into absolute
+-   * timestamps.
+-   *
+-   * @param inputLine Single input line to convert.
+-   * @param relativeToAbsolute Function converting relative timestamps
+-   *                           (in milliseconds) to absolute timestamps
+-   *                           (in milliseconds).
+-   * @return A command representing the input line.
+-   * @throws IOException if error on parsing.
+-   */
+-  AuditReplayCommand parse(Text inputLine,
+-      Function<Long, Long> relativeToAbsolute) throws IOException;
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogDirectParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogDirectParser.java
+deleted file mode 100644
+index e649b69be73..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogDirectParser.java
++++ /dev/null
+@@ -1,158 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+-import java.io.IOException;
+-import java.text.DateFormat;
+-import java.text.ParseException;
+-import java.text.SimpleDateFormat;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.TimeZone;
+-import java.util.function.Function;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-
+-/**
+- * This {@link AuditCommandParser} is used to read commands from an audit log in
+- * the original format audit logs are produced in with a standard configuration.
+- * It requires setting the {@value AUDIT_START_TIMESTAMP_KEY} configuration to
+- * specify what the start time of the audit log was to determine when events
+- * occurred relative to this start time.
+- * <p>
+- * By default, this assumes that the audit log is in the default log format
+- * set up by Hadoop, like:
+- * <pre>{@code
+- *   1970-01-01 00:00:00,000 INFO FSNamesystem.audit: allowed=true ...
+- * }</pre>
+- * You can adjust this parsing behavior using the various configurations
+- * available.
+- */
+-public class AuditLogDirectParser implements AuditCommandParser {
+-
+-  /** See class Javadoc for more detail. */
+-  public static final String AUDIT_START_TIMESTAMP_KEY =
+-      "auditreplay.log-start-time.ms";
+-
+-  /**
+-   * The format string used to parse the date which is present in the audit
+-   * log. This must be a format understood by {@link SimpleDateFormat}.
+-   */
+-  public static final String AUDIT_LOG_DATE_FORMAT_KEY =
+-      "auditreplay.log-date.format";
+-  public static final String AUDIT_LOG_DATE_FORMAT_DEFAULT =
+-      "yyyy-MM-dd HH:mm:ss,SSS";
+-
+-  /**
+-   * The time zone to use when parsing the audit log timestamp. This must
+-   * be a format recognized by {@link TimeZone#getTimeZone(String)}.
+-   */
+-  public static final String AUDIT_LOG_DATE_TIME_ZONE_KEY =
+-      "auditreplay.log-date.time-zone";
+-  public static final String AUDIT_LOG_DATE_TIME_ZONE_DEFAULT = "UTC";
+-
+-  /**
+-   * The regex to use when parsing the audit log lines. This should match
+-   * against a single log line, and create two named capture groups. One
+-   * must be titled "timestamp" and return a timestamp which can be parsed
+-   * by a {@link DateFormat date formatter}. The other must be titled "message"
+-   * and return the audit content, such as "allowed=true ugi=user ...". See
+-   * {@link #AUDIT_LOG_PARSE_REGEX_DEFAULT} for an example.
+-   */
+-  public static final String AUDIT_LOG_PARSE_REGEX_KEY =
+-      "auditreplay.log-parse-regex";
+-  public static final String AUDIT_LOG_PARSE_REGEX_DEFAULT =
+-      "^(?<timestamp>.+?) INFO [^:]+: (?<message>.+)$";
+-
+-  private static final Splitter SPACE_SPLITTER = Splitter.on(" ").trimResults()
+-      .omitEmptyStrings();
+-
+-  private long startTimestamp;
+-  private DateFormat dateFormat;
+-  private Pattern logLineParseRegex;
+-
+-  @Override
+-  public void initialize(Configuration conf) throws IOException {
+-    startTimestamp = conf.getLong(AUDIT_START_TIMESTAMP_KEY, -1);
+-    if (startTimestamp < 0) {
+-      throw new IOException(
+-          "Invalid or missing audit start timestamp: " + startTimestamp);
+-    }
+-    dateFormat = new SimpleDateFormat(conf.get(AUDIT_LOG_DATE_FORMAT_KEY,
+-        AUDIT_LOG_DATE_FORMAT_DEFAULT));
+-    String timeZoneString = conf.get(AUDIT_LOG_DATE_TIME_ZONE_KEY,
+-        AUDIT_LOG_DATE_TIME_ZONE_DEFAULT);
+-    dateFormat.setTimeZone(TimeZone.getTimeZone(timeZoneString));
+-    String logLineParseRegexString =
+-        conf.get(AUDIT_LOG_PARSE_REGEX_KEY, AUDIT_LOG_PARSE_REGEX_DEFAULT);
+-    if (!logLineParseRegexString.contains("(?<timestamp>")
+-        && logLineParseRegexString.contains("(?<message>")) {
+-      throw new IllegalArgumentException("Must configure regex with named "
+-          + "capture groups 'timestamp' and 'message'");
+-    }
+-    logLineParseRegex = Pattern.compile(logLineParseRegexString);
+-  }
+-
+-  @Override
+-  public AuditReplayCommand parse(Text inputLine,
+-      Function<Long, Long> relativeToAbsolute) throws IOException {
+-    Matcher m = logLineParseRegex.matcher(inputLine.toString());
+-    if (!m.find()) {
+-      throw new IOException(
+-          "Unable to find valid message pattern from audit log line: `"
+-              + inputLine + "` using regex `" + logLineParseRegex + "`");
+-    }
+-    long relativeTimestamp;
+-    try {
+-      relativeTimestamp = dateFormat.parse(m.group("timestamp")).getTime()
+-          - startTimestamp;
+-    } catch (ParseException p) {
+-      throw new IOException(
+-          "Exception while parsing timestamp from audit log line: `"
+-          + inputLine + "`", p);
+-    }
+-    // Sanitize the = in the rename options field into a : so we can split on =
+-    String auditMessageSanitized =
+-        m.group("message").replace("(options=", "(options:");
+-
+-    Map<String, String> parameterMap = new HashMap<String, String>();
+-    String[] auditMessageSanitizedList = auditMessageSanitized.split("\t");
+-
+-    for (String auditMessage : auditMessageSanitizedList) {
+-      String[] splitMessage = auditMessage.split("=", 2);
+-      try {
+-        parameterMap.put(splitMessage[0], splitMessage[1]);
+-      } catch (ArrayIndexOutOfBoundsException e) {
+-        throw new IOException(
+-            "Exception while parsing a message from audit log line: `"
+-            + inputLine + "`", e);
+-      }
+-    }
+-
+-    return new AuditReplayCommand(relativeToAbsolute.apply(relativeTimestamp),
+-        // Split the UGI on space to remove the auth and proxy portions of it
+-        SPACE_SPLITTER.split(parameterMap.get("ugi")).iterator().next(),
+-        parameterMap.get("cmd").replace("(options:", "(options="),
+-        parameterMap.get("src"), parameterMap.get("dst"),
+-        parameterMap.get("ip"));
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogHiveTableParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogHiveTableParser.java
+deleted file mode 100644
+index abc10f4e33f..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditLogHiveTableParser.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.io.IOException;
+-import java.util.function.Function;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-
+-/**
+- * This {@link AuditCommandParser} is used to read commands assuming that the
+- * input was generated by a Hive query storing uncompressed output files, in
+- * which fields should be separated by the start-of-heading (U+0001) character.
+- * The fields available should be, in order:
+- *
+- * <pre>
+- *   relativeTimestampMs,ugi,command,src,dest,sourceIP
+- * </pre>
+- *
+- * Where relativeTimestampMs represents the time elapsed between the start of
+- * the audit log and the occurrence of the audit event. Assuming your audit logs
+- * are available in Hive, this can be generated with a query looking like:
+- *
+- * <pre>
+- *   INSERT OVERWRITE DIRECTORY '${outputPath}'
+- *   SELECT (timestamp - ${startTime} AS relTime, ugi, cmd, src, dst, ip
+- *   FROM '${auditLogTableLocation}'
+- *   WHERE
+- *     timestamp {@literal >=} ${startTime}
+- *     AND timestamp {@literal <} ${endTime}
+- *   DISTRIBUTE BY src
+- *   SORT BY relTime ASC;
+- * </pre>
+- *
+- * Note that the sorting step is important; events in each distinct file must be
+- * in time-ascending order.
+- */
+-public class AuditLogHiveTableParser implements AuditCommandParser {
+-
+-  private static final String FIELD_SEPARATOR = "\u0001";
+-
+-  @Override
+-  public void initialize(Configuration conf) throws IOException {
+-    // Nothing to be done
+-  }
+-
+-  @Override
+-  public AuditReplayCommand parse(Text inputLine,
+-      Function<Long, Long> relativeToAbsolute) throws IOException {
+-    String[] fields = inputLine.toString().split(FIELD_SEPARATOR);
+-    long absoluteTimestamp = relativeToAbsolute
+-        .apply(Long.parseLong(fields[0]));
+-    return new AuditReplayCommand(absoluteTimestamp, fields[1], fields[2],
+-        fields[3], fields[4], fields[5]);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayCommand.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayCommand.java
+deleted file mode 100644
+index 038312d2e9f..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayCommand.java
++++ /dev/null
+@@ -1,163 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.io.IOException;
+-import java.util.Objects;
+-import java.util.concurrent.Delayed;
+-import java.util.concurrent.TimeUnit;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This class represents a single command to be replayed by the workload
+- * generator. It implements the {@link Delayed} interface so that they can be
+- * fetched in timestamp order from a {@link java.util.concurrent.DelayQueue}.
+- * You can use the {@link #getPoisonPill(long)} method to retrieve "Poison Pill"
+- * {@link AuditReplayCommand} which has {@link #isPoison()} as true,
+- * representing to a consumer(s) of the {@link java.util.concurrent.DelayQueue}
+- * that it should stop processing further items and instead terminate itself.
+- */
+-class AuditReplayCommand implements Delayed {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(AuditReplayCommand.class);
+-  private static final Pattern SIMPLE_UGI_PATTERN = Pattern
+-      .compile("([^/@ ]*).*?");
+-
+-  private long absoluteTimestamp;
+-  private String ugi;
+-  private String command;
+-  private String src;
+-  private String dest;
+-  private String sourceIP;
+-
+-  AuditReplayCommand(long absoluteTimestamp, String ugi, String command,
+-      String src, String dest, String sourceIP) {
+-    this.absoluteTimestamp = absoluteTimestamp;
+-    this.ugi = ugi;
+-    this.command = command;
+-    this.src = src;
+-    this.dest = dest;
+-    this.sourceIP = sourceIP;
+-  }
+-
+-  long getAbsoluteTimestamp() {
+-    return absoluteTimestamp;
+-  }
+-
+-  String getSimpleUgi() {
+-    Matcher m = SIMPLE_UGI_PATTERN.matcher(ugi);
+-    if (m.matches()) {
+-      return m.group(1);
+-    } else {
+-      LOG.error("Error parsing simple UGI <{}>; falling back to current user",
+-          ugi);
+-      try {
+-        return UserGroupInformation.getCurrentUser().getShortUserName();
+-      } catch (IOException ioe) {
+-        return "";
+-      }
+-    }
+-  }
+-
+-  String getCommand() {
+-    return command;
+-  }
+-
+-  String getSrc() {
+-    return src;
+-  }
+-
+-  String getDest() {
+-    return dest;
+-  }
+-
+-  String getSourceIP() {
+-    return sourceIP;
+-  }
+-
+-  @Override
+-  public long getDelay(TimeUnit unit) {
+-    return unit.convert(absoluteTimestamp - System.currentTimeMillis(),
+-        TimeUnit.MILLISECONDS);
+-  }
+-
+-  @Override
+-  public int compareTo(Delayed o) {
+-    return Long.compare(absoluteTimestamp,
+-        ((AuditReplayCommand) o).absoluteTimestamp);
+-  }
+-
+-  /**
+-   * If true, the thread which consumes this item should not process any further
+-   * items and instead simply terminate itself.
+-   */
+-  boolean isPoison() {
+-    return false;
+-  }
+-
+-  /**
+-   * A command representing a Poison Pill, indicating that the processing thread
+-   * should not process any further items and instead should terminate itself.
+-   * Always returns true for {@link #isPoison()}. It does not contain any other
+-   * information besides a timestamp; other getter methods wil return null.
+-   */
+-  private static final class PoisonPillCommand extends AuditReplayCommand {
+-
+-    private PoisonPillCommand(long absoluteTimestamp) {
+-      super(absoluteTimestamp, null, null, null, null, null);
+-    }
+-
+-    @Override
+-    boolean isPoison() {
+-      return true;
+-    }
+-
+-  }
+-
+-  static AuditReplayCommand getPoisonPill(long relativeTimestamp) {
+-    return new PoisonPillCommand(relativeTimestamp);
+-  }
+-
+-  @Override
+-  public boolean equals(Object other) {
+-    if (!(other instanceof AuditReplayCommand)) {
+-      return false;
+-    }
+-    AuditReplayCommand o = (AuditReplayCommand) other;
+-    return absoluteTimestamp == o.absoluteTimestamp && ugi.equals(o.ugi)
+-        && command.equals(o.command) && src.equals(o.src) && dest.equals(o.dest)
+-        && sourceIP.equals(o.sourceIP);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(absoluteTimestamp, ugi, command, src, dest, sourceIP);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return String.format("AuditReplayCommand(absoluteTimestamp=%d, ugi=%s, "
+-            + "command=%s, src=%s, dest=%s, sourceIP=%s",
+-        absoluteTimestamp, ugi, command, src, dest, sourceIP);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayMapper.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayMapper.java
+deleted file mode 100644
+index fdd8f20d85b..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayMapper.java
++++ /dev/null
+@@ -1,311 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import org.apache.hadoop.util.Lists;
+-import java.util.Optional;
+-import java.util.function.Function;
+-
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadDriver;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadMapper;
+-import java.io.IOException;
+-import java.lang.reflect.InvocationTargetException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.DelayQueue;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.CommandType.READ;
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.CommandType.WRITE;
+-
+-/**
+- * AuditReplayMapper replays the given audit trace against the NameNode under
+- * test. Each mapper spawns a number of threads equal to the
+- * {@value NUM_THREADS_KEY} configuration (by default
+- * {@value NUM_THREADS_DEFAULT}) to use for replaying. Each mapper reads a
+- * single input file which will be consumed by all of the available threads. A
+- * {@link FileInputFormat} with splitting disabled is used so any files present
+- * in the input path directory (given by the {@value INPUT_PATH_KEY}
+- * configuration) will be used as input; one file per mapper. The expected
+- * format of these files is determined by the value of the
+- * {@value COMMAND_PARSER_KEY} configuration, which defaults to
+- * {@link AuditLogDirectParser}.
+- * <p>
+- * This generates a number of {@link org.apache.hadoop.mapreduce.Counter}
+- * values which can be used to get information into the replay, including the
+- * number of commands replayed, how many of them were "invalid" (threw an
+- * exception), how many were "late" (replayed later than they should have been),
+- * and the latency (from client perspective) of each command. If there are a
+- * large number of "late" commands, you likely need to increase the number of
+- * threads used and/or the number of mappers.
+- * <p>
+- * By default, commands will be replayed at the same rate as they were
+- * originally performed. However a rate factor can be specified via the
+- * {@value RATE_FACTOR_KEY} configuration; all of the (relative) timestamps will
+- * be divided by this rate factor, effectively changing the rate at which they
+- * are replayed. For example, a rate factor of 2 would make the replay occur
+- * twice as fast, and a rate factor of 0.5 would make it occur half as fast.
+- */
+-public class AuditReplayMapper extends WorkloadMapper<LongWritable, Text,
+-    UserCommandKey, CountTimeWritable> {
+-
+-  public static final String INPUT_PATH_KEY = "auditreplay.input-path";
+-  public static final String OUTPUT_PATH_KEY = "auditreplay.output-path";
+-  public static final String NUM_THREADS_KEY = "auditreplay.num-threads";
+-  public static final int NUM_THREADS_DEFAULT = 1;
+-  public static final String CREATE_BLOCKS_KEY = "auditreplay.create-blocks";
+-  public static final boolean CREATE_BLOCKS_DEFAULT = true;
+-  public static final String RATE_FACTOR_KEY = "auditreplay.rate-factor";
+-  public static final double RATE_FACTOR_DEFAULT = 1.0;
+-  public static final String COMMAND_PARSER_KEY =
+-      "auditreplay.command-parser.class";
+-  public static final Class<AuditLogDirectParser> COMMAND_PARSER_DEFAULT =
+-      AuditLogDirectParser.class;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(AuditReplayMapper.class);
+-  // This is the maximum amount that the mapper should read ahead from the input
+-  // as compared to the replay time. Setting this to one minute avoids reading
+-  // too
+-  // many entries into memory simultaneously but ensures that the replay threads
+-  // should not ever run out of entries to replay.
+-  private static final long MAX_READAHEAD_MS = 60000;
+-
+-  public static final String INDIVIDUAL_COMMANDS_COUNTER_GROUP =
+-      "INDIVIDUAL_COMMANDS";
+-  public static final String INDIVIDUAL_COMMANDS_LATENCY_SUFFIX = "_LATENCY";
+-  public static final String INDIVIDUAL_COMMANDS_INVALID_SUFFIX = "_INVALID";
+-  public static final String INDIVIDUAL_COMMANDS_COUNT_SUFFIX = "_COUNT";
+-
+-  /** {@link org.apache.hadoop.mapreduce.Counter} definitions for replay. */
+-  public enum REPLAYCOUNTERS {
+-    // Total number of commands that were replayed
+-    TOTALCOMMANDS,
+-    // Total number of commands that returned an error during replay (incl
+-    // unsupported)
+-    TOTALINVALIDCOMMANDS,
+-    // Total number of commands that are unsupported for replay
+-    TOTALUNSUPPORTEDCOMMANDS,
+-    // Total number of commands that were performed later than they should have
+-    // been
+-    LATECOMMANDS,
+-    // Total delay time of all commands that were performed later than they
+-    // should have been
+-    LATECOMMANDSTOTALTIME,
+-    // Total number of write operations
+-    TOTALWRITECOMMANDS,
+-    // Total latency for all write operations
+-    TOTALWRITECOMMANDLATENCY,
+-    // Total number of read operations
+-    TOTALREADCOMMANDS,
+-    // Total latency for all read operations
+-    TOTALREADCOMMANDLATENCY
+-  }
+-
+-  /** Definitions of the various commands that can be replayed. */
+-  public enum ReplayCommand {
+-    APPEND(WRITE),
+-    CREATE(WRITE),
+-    GETFILEINFO(READ),
+-    CONTENTSUMMARY(READ),
+-    MKDIRS(WRITE),
+-    RENAME(WRITE),
+-    LISTSTATUS(READ),
+-    DELETE(WRITE),
+-    OPEN(READ),
+-    SETPERMISSION(WRITE),
+-    SETOWNER(WRITE),
+-    SETTIMES(WRITE),
+-    SETREPLICATION(WRITE),
+-    CONCAT(WRITE);
+-
+-    private final CommandType type;
+-
+-    ReplayCommand(CommandType type) {
+-      this.type = type;
+-    }
+-
+-    public CommandType getType() {
+-      return type;
+-    }
+-  }
+-
+-  /** Define the type of command, either read or write. */
+-  public enum CommandType {
+-    READ, WRITE
+-  }
+-
+-  private long startTimestampMs;
+-  private int numThreads;
+-  private double rateFactor;
+-  private long highestTimestamp;
+-  private List<AuditReplayThread> threads;
+-  private DelayQueue<AuditReplayCommand> commandQueue;
+-  private Function<Long, Long> relativeToAbsoluteTimestamp;
+-  private AuditCommandParser commandParser;
+-  private ScheduledThreadPoolExecutor progressExecutor;
+-
+-  @Override
+-  public String getDescription() {
+-    return "This mapper replays audit log files.";
+-  }
+-
+-  @Override
+-  public List<String> getConfigDescriptions() {
+-    return Lists.newArrayList(
+-        INPUT_PATH_KEY
+-            + " (required): Path to directory containing input files.",
+-        OUTPUT_PATH_KEY + " (required): Path to destination for output files.",
+-        NUM_THREADS_KEY + " (default " + NUM_THREADS_DEFAULT
+-            + "): Number of threads to use per mapper for replay.",
+-        CREATE_BLOCKS_KEY + " (default " + CREATE_BLOCKS_DEFAULT
+-            + "): Whether or not to create 1-byte blocks when "
+-            + "performing `create` commands.",
+-        RATE_FACTOR_KEY + " (default " + RATE_FACTOR_DEFAULT
+-            + "): Multiplicative speed at which to replay the audit "
+-            + "log; e.g. a value of 2.0 would make the replay occur at "
+-            + "twice the original speed. This can be useful "
+-            + "to induce heavier loads.");
+-  }
+-
+-  @Override
+-  public boolean verifyConfigurations(Configuration conf) {
+-    return conf.get(INPUT_PATH_KEY) != null
+-        && conf.get(OUTPUT_PATH_KEY) != null;
+-  }
+-
+-  @Override
+-  public void setup(final Mapper.Context context) throws IOException {
+-    Configuration conf = context.getConfiguration();
+-    // WorkloadDriver ensures that the starttimestamp is set
+-    startTimestampMs = conf.getLong(WorkloadDriver.START_TIMESTAMP_MS, -1);
+-    numThreads = conf.getInt(NUM_THREADS_KEY, NUM_THREADS_DEFAULT);
+-    rateFactor = conf.getDouble(RATE_FACTOR_KEY, RATE_FACTOR_DEFAULT);
+-    try {
+-      commandParser = conf.getClass(COMMAND_PARSER_KEY, COMMAND_PARSER_DEFAULT,
+-          AuditCommandParser.class).getConstructor().newInstance();
+-    } catch (NoSuchMethodException | InstantiationException
+-        | IllegalAccessException | InvocationTargetException e) {
+-      throw new IOException(
+-          "Exception encountered while instantiating the command parser", e);
+-    }
+-    commandParser.initialize(conf);
+-    relativeToAbsoluteTimestamp =
+-        (input) -> startTimestampMs + Math.round(input / rateFactor);
+-
+-    LOG.info("Starting " + numThreads + " threads");
+-
+-    progressExecutor = new ScheduledThreadPoolExecutor(1);
+-    // half of the timeout or once per minute if none specified
+-    long progressFrequencyMs = conf.getLong(MRJobConfig.TASK_TIMEOUT,
+-        2 * 60 * 1000) / 2;
+-    progressExecutor.scheduleAtFixedRate(context::progress,
+-        progressFrequencyMs, progressFrequencyMs, TimeUnit.MILLISECONDS);
+-
+-    threads = new ArrayList<>();
+-    ConcurrentMap<String, FileSystem> fsCache = new ConcurrentHashMap<>();
+-    commandQueue = new DelayQueue<>();
+-    for (int i = 0; i < numThreads; i++) {
+-      AuditReplayThread thread = new AuditReplayThread(context, commandQueue,
+-          fsCache);
+-      threads.add(thread);
+-      thread.start();
+-    }
+-  }
+-
+-  @Override
+-  public void map(LongWritable lineNum, Text inputLine, Mapper.Context context)
+-      throws IOException, InterruptedException {
+-    AuditReplayCommand cmd = commandParser.parse(inputLine,
+-        relativeToAbsoluteTimestamp);
+-    long delay = cmd.getDelay(TimeUnit.MILLISECONDS);
+-    // Prevent from loading too many elements into memory all at once
+-    if (delay > MAX_READAHEAD_MS) {
+-      Thread.sleep(delay - (MAX_READAHEAD_MS / 2));
+-    }
+-    commandQueue.put(cmd);
+-    highestTimestamp = cmd.getAbsoluteTimestamp();
+-  }
+-
+-  @Override
+-  public void cleanup(Mapper.Context context)
+-      throws InterruptedException, IOException {
+-    for (AuditReplayThread t : threads) {
+-      // Add in an indicator for each thread to shut down after the last real
+-      // command
+-      t.addToQueue(AuditReplayCommand.getPoisonPill(highestTimestamp + 1));
+-    }
+-    Optional<Exception> threadException = Optional.empty();
+-    for (AuditReplayThread t : threads) {
+-      t.join();
+-      t.drainCounters(context);
+-      t.drainCommandLatencies(context);
+-      if (t.getException() != null) {
+-        threadException = Optional.of(t.getException());
+-      }
+-    }
+-    progressExecutor.shutdown();
+-
+-    if (threadException.isPresent()) {
+-      throw new RuntimeException("Exception in AuditReplayThread",
+-          threadException.get());
+-    }
+-    LOG.info("Time taken to replay the logs in ms: "
+-        + (System.currentTimeMillis() - startTimestampMs));
+-    long totalCommands = context.getCounter(REPLAYCOUNTERS.TOTALCOMMANDS)
+-        .getValue();
+-    if (totalCommands != 0) {
+-      double percentageOfInvalidOps =
+-          context.getCounter(REPLAYCOUNTERS.TOTALINVALIDCOMMANDS).getValue()
+-              * 100.0 / totalCommands;
+-      LOG.info("Percentage of invalid ops: " + percentageOfInvalidOps);
+-    }
+-  }
+-
+-  @Override
+-  public void configureJob(Job job) {
+-    job.setMapOutputKeyClass(UserCommandKey.class);
+-    job.setMapOutputValueClass(CountTimeWritable.class);
+-    job.setInputFormatClass(NoSplitTextInputFormat.class);
+-
+-    job.setNumReduceTasks(1);
+-    job.setReducerClass(AuditReplayReducer.class);
+-    job.setOutputKeyClass(UserCommandKey.class);
+-    job.setOutputValueClass(CountTimeWritable.class);
+-    job.setOutputFormatClass(TextOutputFormat.class);
+-
+-    TextOutputFormat.setOutputPath(job, new Path(
+-        job.getConfiguration().get(OUTPUT_PATH_KEY)));
+-    job.getConfiguration().set(TextOutputFormat.SEPARATOR, ",");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayReducer.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayReducer.java
+deleted file mode 100644
+index cde1630c8ac..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayReducer.java
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import org.apache.hadoop.mapreduce.Reducer;
+-
+-import java.io.IOException;
+-
+-/**
+- * AuditReplayReducer aggregates the returned latency values from
+- * {@link AuditReplayMapper} and sums them up by {@link UserCommandKey}, which
+- * combines the user's id that ran the command and the type of the command
+- * (READ/WRITE).
+- */
+-public class AuditReplayReducer extends Reducer<UserCommandKey,
+-    CountTimeWritable, UserCommandKey, CountTimeWritable> {
+-
+-  @Override
+-  protected void reduce(UserCommandKey key, Iterable<CountTimeWritable> values,
+-      Context context) throws IOException, InterruptedException {
+-    long countSum = 0;
+-    long timeSum = 0;
+-    for (CountTimeWritable v : values) {
+-      countSum += v.getCount();
+-      timeSum += v.getTime();
+-    }
+-    context.write(key, new CountTimeWritable(countSum, timeSum));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayThread.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayThread.java
+deleted file mode 100644
+index 14e8c9cb82f..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/AuditReplayThread.java
++++ /dev/null
+@@ -1,328 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Splitter;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.WorkloadDriver;
+-import java.io.IOException;
+-import java.net.URI;
+-import java.security.PrivilegedAction;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.DelayQueue;
+-import java.util.concurrent.TimeUnit;
+-import java.util.Map;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.DistributedFileSystem;
+-import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
+-import org.apache.hadoop.mapreduce.Counter;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.counters.GenericCounter;
+-import org.apache.hadoop.security.UserGroupInformation;
+-
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.REPLAYCOUNTERS;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.ReplayCommand;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.INDIVIDUAL_COMMANDS_COUNTER_GROUP;
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.INDIVIDUAL_COMMANDS_COUNT_SUFFIX;
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.INDIVIDUAL_COMMANDS_INVALID_SUFFIX;
+-import static org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper.INDIVIDUAL_COMMANDS_LATENCY_SUFFIX;
+-
+-/**
+- * This class replays each audit log entry at a specified timestamp in the
+- * future. Each of these threads maintains a {@link DelayQueue} into which items
+- * are inserted by the {@link AuditReplayMapper}. Once an item is ready, this
+- * thread will fetch the command from the queue and attempt to replay it.
+- */
+-public class AuditReplayThread extends Thread {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(AuditReplayThread.class);
+-
+-  private DelayQueue<AuditReplayCommand> commandQueue;
+-  private ConcurrentMap<String, FileSystem> fsCache;
+-  private URI namenodeUri;
+-  private UserGroupInformation loginUser;
+-  private Configuration mapperConf;
+-  // If any exception is encountered it will be stored here
+-  private Exception exception;
+-  private long startTimestampMs;
+-  private boolean createBlocks;
+-
+-  // Counters are not thread-safe so we store a local mapping in our thread
+-  // and merge them all together at the end.
+-  private Map<REPLAYCOUNTERS, Counter> replayCountersMap = new HashMap<>();
+-  private Map<String, Counter> individualCommandsMap = new HashMap<>();
+-  private Map<UserCommandKey, CountTimeWritable> commandLatencyMap
+-      = new HashMap<>();
+-
+-  AuditReplayThread(Mapper.Context mapperContext,
+-      DelayQueue<AuditReplayCommand> queue,
+-      ConcurrentMap<String, FileSystem> fsCache) throws IOException {
+-    commandQueue = queue;
+-    this.fsCache = fsCache;
+-    loginUser = UserGroupInformation.getLoginUser();
+-    mapperConf = mapperContext.getConfiguration();
+-    namenodeUri = URI.create(mapperConf.get(WorkloadDriver.NN_URI));
+-    startTimestampMs = mapperConf.getLong(WorkloadDriver.START_TIMESTAMP_MS,
+-        -1);
+-    createBlocks = mapperConf.getBoolean(AuditReplayMapper.CREATE_BLOCKS_KEY,
+-        AuditReplayMapper.CREATE_BLOCKS_DEFAULT);
+-    LOG.info("Start timestamp: " + startTimestampMs);
+-    for (REPLAYCOUNTERS rc : REPLAYCOUNTERS.values()) {
+-      replayCountersMap.put(rc, new GenericCounter());
+-    }
+-    for (ReplayCommand replayCommand : ReplayCommand.values()) {
+-      individualCommandsMap.put(
+-          replayCommand + INDIVIDUAL_COMMANDS_COUNT_SUFFIX,
+-          new GenericCounter());
+-      individualCommandsMap.put(
+-          replayCommand + INDIVIDUAL_COMMANDS_LATENCY_SUFFIX,
+-          new GenericCounter());
+-      individualCommandsMap.put(
+-          replayCommand + INDIVIDUAL_COMMANDS_INVALID_SUFFIX,
+-          new GenericCounter());
+-    }
+-  }
+-
+-  /**
+-   * Merge all of this thread's counter values into the counters contained
+-   * within the passed context.
+-   *
+-   * @param context The context holding the counters to increment.
+-   */
+-  void drainCounters(Mapper.Context context) {
+-    for (Map.Entry<REPLAYCOUNTERS, Counter> ent : replayCountersMap
+-        .entrySet()) {
+-      context.getCounter(ent.getKey()).increment(ent.getValue().getValue());
+-    }
+-    for (Map.Entry<String, Counter> ent : individualCommandsMap.entrySet()) {
+-      context.getCounter(INDIVIDUAL_COMMANDS_COUNTER_GROUP, ent.getKey())
+-          .increment(ent.getValue().getValue());
+-    }
+-  }
+-
+-  void drainCommandLatencies(Mapper.Context context)
+-      throws InterruptedException, IOException {
+-    for (Map.Entry<UserCommandKey, CountTimeWritable> ent
+-        : commandLatencyMap.entrySet()) {
+-      context.write(ent.getKey(), ent.getValue());
+-    }
+-  }
+-
+-  /**
+-   * Add a command to this thread's processing queue.
+-   *
+-   * @param cmd Command to add.
+-   */
+-  void addToQueue(AuditReplayCommand cmd) {
+-    commandQueue.put(cmd);
+-  }
+-
+-  /**
+-   * Get the Exception that caused this thread to stop running, if any, else
+-   * null. Should not be called until this thread has already completed (i.e.,
+-   * after {@link #join()} has been called).
+-   *
+-   * @return The exception which was thrown, if any.
+-   */
+-  Exception getException() {
+-    return exception;
+-  }
+-
+-  @Override
+-  public void run() {
+-    long currentEpoch = System.currentTimeMillis();
+-    long delay = startTimestampMs - currentEpoch;
+-    try {
+-      if (delay > 0) {
+-        LOG.info("Sleeping for " + delay + " ms");
+-        Thread.sleep(delay);
+-      } else {
+-        LOG.warn("Starting late by " + (-1 * delay) + " ms");
+-      }
+-
+-      AuditReplayCommand cmd = commandQueue.take();
+-      while (!cmd.isPoison()) {
+-        replayCountersMap.get(REPLAYCOUNTERS.TOTALCOMMANDS).increment(1);
+-        delay = cmd.getDelay(TimeUnit.MILLISECONDS);
+-        if (delay < -5) { // allow some tolerance here
+-          replayCountersMap.get(REPLAYCOUNTERS.LATECOMMANDS).increment(1);
+-          replayCountersMap.get(REPLAYCOUNTERS.LATECOMMANDSTOTALTIME)
+-              .increment(-1 * delay);
+-        }
+-        if (!replayLog(cmd)) {
+-          replayCountersMap.get(REPLAYCOUNTERS.TOTALINVALIDCOMMANDS)
+-              .increment(1);
+-        }
+-        cmd = commandQueue.take();
+-      }
+-    } catch (InterruptedException e) {
+-      LOG.error("Interrupted; exiting from thread.", e);
+-    } catch (Exception e) {
+-      exception = e;
+-      LOG.error("ReplayThread encountered exception; exiting.", e);
+-    }
+-  }
+-
+-  /**
+-   * Attempt to replay the provided command. Updates counters accordingly.
+-   *
+-   * @param command The command to replay
+-   * @return True iff the command was successfully replayed (i.e., no exceptions
+-   *         were thrown).
+-   */
+-  private boolean replayLog(final AuditReplayCommand command) {
+-    final String src = command.getSrc();
+-    final String dst = command.getDest();
+-    FileSystem proxyFs = fsCache.get(command.getSimpleUgi());
+-    if (proxyFs == null) {
+-      UserGroupInformation ugi = UserGroupInformation
+-          .createProxyUser(command.getSimpleUgi(), loginUser);
+-      proxyFs = ugi.doAs((PrivilegedAction<FileSystem>) () -> {
+-        try {
+-          FileSystem fs = new DistributedFileSystem();
+-          fs.initialize(namenodeUri, mapperConf);
+-          return fs;
+-        } catch (IOException ioe) {
+-          throw new RuntimeException(ioe);
+-        }
+-      });
+-      fsCache.put(command.getSimpleUgi(), proxyFs);
+-    }
+-    final FileSystem fs = proxyFs;
+-    ReplayCommand replayCommand;
+-    try {
+-      replayCommand = ReplayCommand
+-          .valueOf(command.getCommand().split(" ")[0].toUpperCase());
+-    } catch (IllegalArgumentException iae) {
+-      LOG.warn("Unsupported/invalid command: " + command);
+-      replayCountersMap.get(REPLAYCOUNTERS.TOTALUNSUPPORTEDCOMMANDS)
+-          .increment(1);
+-      return false;
+-    }
+-    try {
+-      long startTime = System.currentTimeMillis();
+-      switch (replayCommand) {
+-      case CREATE:
+-        FSDataOutputStream fsDos = fs.create(new Path(src));
+-        if (createBlocks) {
+-          fsDos.writeByte(0);
+-        }
+-        fsDos.close();
+-        break;
+-      case GETFILEINFO:
+-        fs.getFileStatus(new Path(src));
+-        break;
+-      case CONTENTSUMMARY:
+-        fs.getContentSummary(new Path(src));
+-        break;
+-      case MKDIRS:
+-        fs.mkdirs(new Path(src));
+-        break;
+-      case RENAME:
+-        fs.rename(new Path(src), new Path(dst));
+-        break;
+-      case LISTSTATUS:
+-        ((DistributedFileSystem) fs).getClient().listPaths(src,
+-            HdfsFileStatus.EMPTY_NAME);
+-        break;
+-      case APPEND:
+-        fs.append(new Path(src));
+-        return true;
+-      case DELETE:
+-        fs.delete(new Path(src), true);
+-        break;
+-      case OPEN:
+-        fs.open(new Path(src)).close();
+-        break;
+-      case SETPERMISSION:
+-        fs.setPermission(new Path(src), FsPermission.getDefault());
+-        break;
+-      case SETOWNER:
+-        fs.setOwner(new Path(src),
+-            UserGroupInformation.getCurrentUser().getShortUserName(),
+-            UserGroupInformation.getCurrentUser().getPrimaryGroupName());
+-        break;
+-      case SETTIMES:
+-        fs.setTimes(new Path(src), System.currentTimeMillis(),
+-            System.currentTimeMillis());
+-        break;
+-      case SETREPLICATION:
+-        fs.setReplication(new Path(src), (short) 1);
+-        break;
+-      case CONCAT:
+-        // dst is like [path1, path2] - strip brackets and split on comma
+-        String bareDist = dst.length() < 2 ? ""
+-            : dst.substring(1, dst.length() - 1).trim();
+-        List<Path> dsts = new ArrayList<>();
+-        for (String s : Splitter.on(",").omitEmptyStrings().trimResults()
+-            .split(bareDist)) {
+-          dsts.add(new Path(s));
+-        }
+-        fs.concat(new Path(src), dsts.toArray(new Path[] {}));
+-        break;
+-      default:
+-        throw new RuntimeException("Unexpected command: " + replayCommand);
+-      }
+-      long latency = System.currentTimeMillis() - startTime;
+-
+-      UserCommandKey userCommandKey = new UserCommandKey(command.getSimpleUgi(),
+-          replayCommand.toString(), replayCommand.getType().toString());
+-      commandLatencyMap.putIfAbsent(userCommandKey, new CountTimeWritable());
+-      CountTimeWritable latencyWritable = commandLatencyMap.get(userCommandKey);
+-      latencyWritable.setCount(latencyWritable.getCount() + 1);
+-      latencyWritable.setTime(latencyWritable.getTime() + latency);
+-
+-      switch (replayCommand.getType()) {
+-      case WRITE:
+-        replayCountersMap.get(REPLAYCOUNTERS.TOTALWRITECOMMANDLATENCY)
+-            .increment(latency);
+-        replayCountersMap.get(REPLAYCOUNTERS.TOTALWRITECOMMANDS).increment(1);
+-        break;
+-      case READ:
+-        replayCountersMap.get(REPLAYCOUNTERS.TOTALREADCOMMANDLATENCY)
+-            .increment(latency);
+-        replayCountersMap.get(REPLAYCOUNTERS.TOTALREADCOMMANDS).increment(1);
+-        break;
+-      default:
+-        throw new RuntimeException("Unexpected command type: "
+-            + replayCommand.getType());
+-      }
+-      individualCommandsMap
+-          .get(replayCommand + INDIVIDUAL_COMMANDS_LATENCY_SUFFIX)
+-          .increment(latency);
+-      individualCommandsMap
+-          .get(replayCommand + INDIVIDUAL_COMMANDS_COUNT_SUFFIX).increment(1);
+-      return true;
+-    } catch (IOException e) {
+-      LOG.debug("IOException: " + e.getLocalizedMessage());
+-      individualCommandsMap
+-          .get(replayCommand + INDIVIDUAL_COMMANDS_INVALID_SUFFIX).increment(1);
+-      return false;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/CountTimeWritable.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/CountTimeWritable.java
+deleted file mode 100644
+index 6b851c84b64..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/CountTimeWritable.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Writable;
+-
+-/**
+- * UserCommandKey is a {@link Writable} used as a composite value that
+- * accumulates the count and cumulative latency of replayed commands. It is
+- * used as the output value for AuditReplayMapper and AuditReplayReducer.
+- */
+-public class CountTimeWritable implements Writable {
+-  private LongWritable count;
+-  private LongWritable time;
+-
+-  public CountTimeWritable() {
+-    count = new LongWritable();
+-    time = new LongWritable();
+-  }
+-
+-  public CountTimeWritable(LongWritable count, LongWritable time) {
+-    this.count = count;
+-    this.time = time;
+-  }
+-
+-  public CountTimeWritable(long count, long time) {
+-    this.count = new LongWritable(count);
+-    this.time = new LongWritable(time);
+-  }
+-
+-  public long getCount() {
+-    return count.get();
+-  }
+-
+-  public long getTime() {
+-    return time.get();
+-  }
+-
+-  public void setCount(long count) {
+-    this.count.set(count);
+-  }
+-
+-  public void setTime(long time) {
+-    this.time.set(time);
+-  }
+-
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    count.write(out);
+-    time.write(out);
+-  }
+-
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    count.readFields(in);
+-    time.readFields(in);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return getCount() + "," + getTime();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/NoSplitTextInputFormat.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/NoSplitTextInputFormat.java
+deleted file mode 100644
+index e941d9df29c..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/NoSplitTextInputFormat.java
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.io.IOException;
+-import java.util.List;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
+-
+-/**
+- * A simple {@link TextInputFormat} that disables splitting of files. This is
+- * the {@link org.apache.hadoop.mapreduce.InputFormat} used by
+- * {@link AuditReplayMapper}.
+- */
+-public class NoSplitTextInputFormat extends TextInputFormat {
+-
+-  @Override
+-  public List<FileStatus> listStatus(JobContext context) throws IOException {
+-    context.getConfiguration().set(FileInputFormat.INPUT_DIR,
+-        context.getConfiguration().get(AuditReplayMapper.INPUT_PATH_KEY));
+-    return super.listStatus(context);
+-  }
+-
+-  @Override
+-  public boolean isSplitable(JobContext context, Path file) {
+-    return false;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/UserCommandKey.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/UserCommandKey.java
+deleted file mode 100644
+index 5cfe09f3bf2..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/UserCommandKey.java
++++ /dev/null
+@@ -1,111 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.WritableComparable;
+-
+-import javax.annotation.Nonnull;
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.Objects;
+-
+-/**
+- * UserCommandKey is a {@link org.apache.hadoop.io.Writable} used as a composite
+- * key combining the user id, name, and type of a replayed command. It is used
+- * as the output key for AuditReplayMapper and the keys for AuditReplayReducer.
+- */
+-public class UserCommandKey implements WritableComparable {
+-  private Text user;
+-  private Text command;
+-  private Text type;
+-
+-  public UserCommandKey() {
+-    user = new Text();
+-    command = new Text();
+-    type = new Text();
+-  }
+-
+-  public UserCommandKey(Text user, Text command, Text type) {
+-    this.user = user;
+-    this.command = command;
+-    this.type = type;
+-  }
+-
+-  public UserCommandKey(String user, String command, String type) {
+-    this.user = new Text(user);
+-    this.command = new Text(command);
+-    this.type = new Text(type);
+-  }
+-
+-  public String getUser() {
+-    return user.toString();
+-  }
+-
+-  public String getCommand() {
+-    return command.toString();
+-  }
+-
+-  public String getType() {
+-    return type.toString();
+-  }
+-
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    user.write(out);
+-    command.write(out);
+-    type.write(out);
+-  }
+-
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    user.readFields(in);
+-    command.readFields(in);
+-    type.readFields(in);
+-  }
+-
+-  @Override
+-  public int compareTo(@Nonnull Object o) {
+-    return toString().compareTo(o.toString());
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return getUser() + "," + getType() + "," + getCommand();
+-  }
+-
+-  @Override
+-  public boolean equals(Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    UserCommandKey that = (UserCommandKey) o;
+-    return getUser().equals(that.getUser()) &&
+-        getCommand().equals(that.getCommand()) &&
+-        getType().equals(that.getType());
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(getUser(), getCommand(), getType());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/package-info.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/package-info.java
+deleted file mode 100644
+index 745302a7126..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/package-info.java
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * This contains the tooling necessary to use audit logs as a way to generate
+- * a realistic workload against a Dynamometer-simulated NameNode.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/package-info.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/package-info.java
+deleted file mode 100644
+index 5903a85861a..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/main/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/package-info.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * This contains the tooling necessary to generate a realistic workload,
+- * for example collected from audit logs, against a Dynamometer-simulated
+- * NameNode.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/TestWorkloadGenerator.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/TestWorkloadGenerator.java
+deleted file mode 100644
+index f3edc24b704..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/TestWorkloadGenerator.java
++++ /dev/null
+@@ -1,165 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator;
+-
+-import org.apache.commons.io.IOUtils;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditCommandParser;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditLogDirectParser;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditLogHiveTableParser;
+-import org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditReplayMapper;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.security.authorize.ImpersonationProvider;
+-import org.jline.utils.Log;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_IMPERSONATION_PROVIDER_CLASS;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertFalse;
+-import static org.junit.Assert.assertTrue;
+-
+-
+-/** Tests for {@link WorkloadDriver} and related classes. */
+-public class TestWorkloadGenerator {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestWorkloadGenerator.class);
+-
+-  private Configuration conf;
+-  private MiniDFSCluster miniCluster;
+-  private FileSystem dfs;
+-
+-  @Before
+-  public void setup() throws Exception {
+-    conf = new Configuration();
+-    conf.setClass(HADOOP_SECURITY_IMPERSONATION_PROVIDER_CLASS,
+-        AllowUserImpersonationProvider.class, ImpersonationProvider.class);
+-    miniCluster = new MiniDFSCluster.Builder(conf).build();
+-    miniCluster.waitClusterUp();
+-    dfs = miniCluster.getFileSystem();
+-    dfs.mkdirs(new Path("/tmp"),
+-        new FsPermission(FsAction.ALL, FsAction.ALL, FsAction.ALL));
+-    dfs.setOwner(new Path("/tmp"), "hdfs", "hdfs");
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (miniCluster != null) {
+-      miniCluster.shutdown();
+-      miniCluster = null;
+-    }
+-  }
+-
+-  @Test
+-  public void testAuditWorkloadDirectParserWithOutput() throws Exception {
+-    String workloadInputPath = TestWorkloadGenerator.class.getClassLoader()
+-        .getResource("audit_trace_direct").toString();
+-    String auditOutputPath = "/tmp/trace_output_direct";
+-    conf.set(AuditReplayMapper.INPUT_PATH_KEY, workloadInputPath);
+-    conf.set(AuditReplayMapper.OUTPUT_PATH_KEY, auditOutputPath);
+-    conf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY, 60 * 1000);
+-    testAuditWorkloadWithOutput(auditOutputPath);
+-  }
+-
+-  @Test
+-  public void testAuditWorkloadHiveParserWithOutput() throws Exception {
+-    String workloadInputPath =
+-        TestWorkloadGenerator.class.getClassLoader()
+-            .getResource("audit_trace_hive").toString();
+-    String auditOutputPath = "/tmp/trace_output_hive";
+-    conf.set(AuditReplayMapper.INPUT_PATH_KEY, workloadInputPath);
+-    conf.set(AuditReplayMapper.OUTPUT_PATH_KEY, auditOutputPath);
+-    conf.setClass(AuditReplayMapper.COMMAND_PARSER_KEY,
+-        AuditLogHiveTableParser.class, AuditCommandParser.class);
+-    testAuditWorkloadWithOutput(auditOutputPath);
+-  }
+-
+-  /**
+-   * {@link ImpersonationProvider} that confirms the user doing the
+-   * impersonating is the same as the user running the MiniCluster.
+-   */
+-  private static class AllowUserImpersonationProvider extends Configured
+-      implements ImpersonationProvider {
+-    public void init(String configurationPrefix) {
+-      // Do nothing
+-    }
+-
+-    public void authorize(UserGroupInformation user, InetAddress remoteAddress)
+-        throws AuthorizationException {
+-      try {
+-        if (!user.getRealUser().getShortUserName()
+-            .equals(UserGroupInformation.getCurrentUser().getShortUserName())) {
+-          throw new AuthorizationException();
+-        }
+-      } catch (IOException ioe) {
+-        throw new AuthorizationException(ioe);
+-      }
+-    }
+-  }
+-
+-  private void testAuditWorkloadWithOutput(String auditOutputPath)
+-      throws Exception {
+-    long workloadStartTime = System.currentTimeMillis() + 10000;
+-    Job workloadJob = WorkloadDriver.getJobForSubmission(conf,
+-        dfs.getUri().toString(), workloadStartTime, AuditReplayMapper.class);
+-    boolean success = workloadJob.waitForCompletion(true);
+-    assertTrue("workload job should succeed", success);
+-    Counters counters = workloadJob.getCounters();
+-    assertEquals(6,
+-        counters.findCounter(AuditReplayMapper.REPLAYCOUNTERS.TOTALCOMMANDS)
+-            .getValue());
+-    assertEquals(1,
+-        counters
+-            .findCounter(AuditReplayMapper.REPLAYCOUNTERS.TOTALINVALIDCOMMANDS)
+-            .getValue());
+-    assertTrue(dfs.getFileStatus(new Path("/tmp/test1")).isFile());
+-    assertTrue(
+-        dfs.getFileStatus(new Path("/tmp/testDirRenamed")).isDirectory());
+-    assertFalse(dfs.exists(new Path("/denied")));
+-
+-    assertTrue(dfs.exists(new Path(auditOutputPath)));
+-    try (FSDataInputStream auditOutputFile = dfs.open(new Path(auditOutputPath,
+-        "part-r-00000"))) {
+-      String auditOutput = IOUtils.toString(auditOutputFile,
+-          StandardCharsets.UTF_8);
+-      Log.info(auditOutput);
+-      assertTrue(auditOutput.matches(
+-          ".*(hdfs,WRITE,[A-Z]+,[13]+,[0-9]+\\n){3}.*"));
+-      // Matches three lines of the format "hdfs,WRITE,name,count,time"
+-      // Using [13] for the count group because each operation is run either
+-      // 1 or 3 times but the output order isn't guaranteed
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/TestAuditLogDirectParser.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/TestAuditLogDirectParser.java
+deleted file mode 100644
+index a98b5c47164..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/java/org/apache/hadoop/tools/dynamometer/workloadgenerator/audit/TestAuditLogDirectParser.java
++++ /dev/null
+@@ -1,152 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.dynamometer.workloadgenerator.audit;
+-
+-import java.util.function.Function;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-/** Tests for {@link AuditLogDirectParser}. */
+-public class TestAuditLogDirectParser {
+-
+-  private static final long START_TIMESTAMP = 10000;
+-  private AuditLogDirectParser parser;
+-
+-  @Before
+-  public void setup() throws Exception {
+-    parser = new AuditLogDirectParser();
+-    Configuration conf = new Configuration();
+-    conf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY,
+-        START_TIMESTAMP);
+-    parser.initialize(conf);
+-  }
+-
+-  private Text getAuditString(String timestamp, String ugi, String cmd,
+-      String src, String dst) {
+-    return new Text(
+-        String.format("%s INFO FSNamesystem.audit: "
+-                + "allowed=true\tugi=%s\tip=0.0.0.0\tcmd=%s\tsrc=%s\t"
+-                + "dst=%s\tperm=null\tproto=rpc",
+-            timestamp, ugi, cmd, src, dst));
+-  }
+-
+-  @Test
+-  public void testSimpleInput() throws Exception {
+-    Text in = getAuditString("1970-01-01 00:00:11,000", "fakeUser",
+-        "listStatus", "sourcePath", "null");
+-    AuditReplayCommand expected = new AuditReplayCommand(1000, "fakeUser",
+-        "listStatus", "sourcePath", "null", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testInputWithEquals() throws Exception {
+-    Text in = getAuditString("1970-01-01 00:00:11,000", "fakeUser",
+-            "listStatus", "day=1970", "null");
+-    AuditReplayCommand expected = new AuditReplayCommand(1000, "fakeUser",
+-            "listStatus", "day=1970", "null", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testInputWithRenameOptions() throws Exception {
+-    Text in = getAuditString("1970-01-01 00:00:11,000", "fakeUser",
+-        "rename (options=[TO_TRASH])", "sourcePath", "destPath");
+-    AuditReplayCommand expected = new AuditReplayCommand(1000, "fakeUser",
+-        "rename (options=[TO_TRASH])", "sourcePath", "destPath", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testInputWithTokenAuth() throws Exception {
+-    Text in = getAuditString("1970-01-01 00:00:11,000", "fakeUser (auth:TOKEN)",
+-        "create", "sourcePath", "null");
+-    AuditReplayCommand expected = new AuditReplayCommand(1000, "fakeUser",
+-        "create", "sourcePath", "null", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testInputWithProxyUser() throws Exception {
+-    Text in = getAuditString("1970-01-01 00:00:11,000",
+-        "proxyUser (auth:TOKEN) via fakeUser", "create", "sourcePath", "null");
+-    AuditReplayCommand expected = new AuditReplayCommand(1000, "proxyUser",
+-        "create", "sourcePath", "null", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testParseDefaultDateFormat() throws Exception {
+-    Text in = getAuditString("1970-01-01 13:00:00,000",
+-        "ignored", "ignored", "ignored", "ignored");
+-    AuditReplayCommand expected = new AuditReplayCommand(
+-        13 * 60 * 60 * 1000 - START_TIMESTAMP,
+-        "ignored", "ignored", "ignored", "ignored", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testParseCustomDateFormat() throws Exception {
+-    parser = new AuditLogDirectParser();
+-    Configuration conf = new Configuration();
+-    conf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY, 0);
+-    conf.set(AuditLogDirectParser.AUDIT_LOG_DATE_FORMAT_KEY,
+-        "yyyy-MM-dd hh:mm:ss,SSS a");
+-    parser.initialize(conf);
+-    Text in = getAuditString("1970-01-01 01:00:00,000 PM",
+-        "ignored", "ignored", "ignored", "ignored");
+-    AuditReplayCommand expected = new AuditReplayCommand(13 * 60 * 60 * 1000,
+-        "ignored", "ignored", "ignored", "ignored", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testParseCustomTimeZone() throws Exception {
+-    parser = new AuditLogDirectParser();
+-    Configuration conf = new Configuration();
+-    conf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY, 0);
+-    conf.set(AuditLogDirectParser.AUDIT_LOG_DATE_TIME_ZONE_KEY, "Etc/GMT-1");
+-    parser.initialize(conf);
+-    Text in = getAuditString("1970-01-01 01:00:00,000",
+-        "ignored", "ignored", "ignored", "ignored");
+-    AuditReplayCommand expected = new AuditReplayCommand(0,
+-        "ignored", "ignored", "ignored", "ignored", "0.0.0.0");
+-    assertEquals(expected, parser.parse(in, Function.identity()));
+-  }
+-
+-  @Test
+-  public void testParseCustomAuditLineFormat() throws Exception {
+-    Text auditLine = new Text("CUSTOM FORMAT (1970-01-01 00:00:00,000) "
+-        + "allowed=true\tugi=fakeUser\tip=0.0.0.0\tcmd=fakeCommand\tsrc=src\t"
+-        + "dst=null\tperm=null\tproto=rpc");
+-    parser = new AuditLogDirectParser();
+-    Configuration conf = new Configuration();
+-    conf.setLong(AuditLogDirectParser.AUDIT_START_TIMESTAMP_KEY, 0);
+-    conf.set(AuditLogDirectParser.AUDIT_LOG_PARSE_REGEX_KEY,
+-        "CUSTOM FORMAT \\((?<timestamp>.+?)\\) (?<message>.+)");
+-    parser.initialize(conf);
+-    AuditReplayCommand expected = new AuditReplayCommand(0,
+-        "fakeUser", "fakeCommand", "src", "null", "0.0.0.0");
+-    assertEquals(expected, parser.parse(auditLine, Function.identity()));
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_direct/audit0 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_direct/audit0
+deleted file mode 100644
+index 9e7bc2ca346..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_direct/audit0
++++ /dev/null
+@@ -1,6 +0,0 @@
+-1970-01-01 00:00:01,010 INFO FSNamesystem.audit: allowed=true	ugi=hdfs	ip=/0.0.0.0	cmd=create	src=/tmp/test1	dst=null	perm=null	proto=rpc
+-1970-01-01 00:00:01,020 INFO FSNamesystem.audit: allowed=true	ugi=hdfs	ip=/0.0.0.0	cmd=mkdirs	src=/tmp/testDir	dst=null	perm=null	proto=rpc
+-1970-01-01 00:00:01,030 INFO FSNamesystem.audit: allowed=true	ugi=hdfs	ip=/0.0.0.0	cmd=rename	src=/tmp/testDir	dst=/tmp/testDirRenamed	perm=null	proto=rpc
+-1970-01-01 00:00:01,040 INFO FSNamesystem.audit: allowed=true	ugi=hdfs@REALM.COM	ip=/0.0.0.0	cmd=mkdirs	src=/tmp/testDir2	dst=null	perm=null	proto=rpc
+-1970-01-01 00:00:01,050 INFO FSNamesystem.audit: allowed=true	ugi=hdfs/127.0.0.1@REALM.COM	ip=/0.0.0.0	cmd=mkdirs	src=/tmp/testDir3	dst=null	perm=null	proto=rpc
+-1970-01-01 00:00:01,060 INFO FSNamesystem.audit: allowed=true	ugi=otherUser	ip=/0.0.0.0	cmd=mkdirs	src=/denied	dst=null	perm=null	proto=rpc
+diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_hive/audit0 b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_hive/audit0
+deleted file mode 100644
+index 5f49bbe4778..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-workload/src/test/resources/audit_trace_hive/audit0
++++ /dev/null
+@@ -1,6 +0,0 @@
+-+10
hdfs
create
/tmp/test1
 
0.0.0.0

+-+20
hdfs
mkdirs
/tmp/testDir
 
0.0.0.0

+-+30
hdfs
rename
/tmp/testDir
/tmp/testDirRenamed
0.0.0.0

+-+40
hdfs@REALM.COM
mkdirs
/tmp/testDir2
 
0.0.0.0

+-+50
hdfs/127.0.0.1@REALM.COM
mkdirs
/tmp/testDir3
 
0.0.0.0

+-+60
otherUser
mkdirs
/denied
 
0.0.0.0

+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-dynamometer/pom.xml b/hadoop-tools/hadoop-dynamometer/pom.xml
+deleted file mode 100644
+index ddc65a6e179..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/pom.xml
++++ /dev/null
+@@ -1,55 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-dynamometer</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Dynamometer</description>
+-  <name>Apache Hadoop Dynamometer</name>
+-  <packaging>pom</packaging>
+-
+-  <modules>
+-    <module>hadoop-dynamometer-infra</module>
+-    <module>hadoop-dynamometer-workload</module>
+-    <module>hadoop-dynamometer-blockgen</module>
+-    <module>hadoop-dynamometer-dist</module>
+-  </modules>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-deploy-plugin</artifactId>
+-        <configuration>
+-          <skip>true</skip>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-dynamometer/src/site/markdown/Dynamometer.md b/hadoop-tools/hadoop-dynamometer/src/site/markdown/Dynamometer.md
+deleted file mode 100644
+index e6b3136a34a..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/src/site/markdown/Dynamometer.md
++++ /dev/null
+@@ -1,302 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-# Dynamometer Guide
+-
+-<!-- MACRO{toc|fromDepth=0|toDepth=3} -->
+-
+-## Overview
+-
+-Dynamometer is a tool to performance test Hadoop's HDFS NameNode. The intent is to provide a
+-real-world environment by initializing the NameNode against a production file system image and replaying
+-a production workload collected via e.g. the NameNode's audit logs. This allows for replaying a workload
+-which is not only similar in characteristic to that experienced in production, but actually identical.
+-
+-Dynamometer will launch a YARN application which starts a single NameNode and a configurable number of
+-DataNodes, simulating an entire HDFS cluster as a single application. There is an additional `workload`
+-job run as a MapReduce job which accepts audit logs as input and uses the information contained within to
+-submit matching requests to the NameNode, inducing load on the service.
+-
+-Dynamometer can execute this same workload against different Hadoop versions or with different
+-configurations, allowing for the testing of configuration tweaks and code changes at scale without the
+-necessity of deploying to a real large-scale cluster.
+-
+-Throughout this documentation, we will use "Dyno-HDFS", "Dyno-NN", and "Dyno-DN" to refer to the HDFS
+-cluster, NameNode, and DataNodes (respectively) which are started _inside of_ a Dynamometer application.
+-Terms like HDFS, YARN, and NameNode used without qualification refer to the existing infrastructure on
+-top of which Dynamometer is run.
+-
+-For more details on how Dynamometer works, as opposed to how to use it, see the Architecture section
+-at the end of this page.
+-
+-## Requirements
+-
+-Dynamometer is based around YARN applications, so an existing YARN cluster will be required for execution.
+-It also requires an accompanying HDFS instance to store some temporary files for communication.
+-
+-## Building
+-
+-Dynamometer consists of three main components, each one in its own module:
+-
+-* Infrastructure (`dynamometer-infra`): This is the YARN application which starts a Dyno-HDFS cluster.
+-* Workload (`dynamometer-workload`): This is the MapReduce job which replays audit logs.
+-* Block Generator (`dynamometer-blockgen`): This is a MapReduce job used to generate input files for each Dyno-DN; its
+-  execution is a prerequisite step to running the infrastructure application.
+-
+-The compiled version of all of these components will be included in a standard Hadoop distribution.
+-You can find them in the packaged distribution within `share/hadoop/tools/dynamometer`.
+-
+-## Setup Steps
+-
+-Before launching a Dynamometer application, there are a number of setup steps that must be completed,
+-instructing Dynamometer what configurations to use, what version to use, what fsimage to use when
+-loading, etc. These steps can be performed a single time to put everything in place, and then many
+-Dynamometer executions can be performed against them with minor tweaks to measure variations.
+-
+-Scripts discussed below can be found in the `share/hadoop/tools/dynamometer/dynamometer-{infra,workload,blockgen}/bin`
+-directories of the distribution. The corresponding Java JAR files can be found in the `share/hadoop/tools/lib/` directory.
+-References to bin files below assume that the current working directory is `share/hadoop/tools/dynamometer`.
+-
+-### Step 1: Preparing Requisite Files
+-
+-A number of steps are required in advance of starting your first Dyno-HDFS cluster:
+-
+-### Step 2: Prepare FsImage Files
+-
+-Collect an fsimage and related files from your NameNode. This will include the `fsimage_TXID` file
+-which the NameNode creates as part of checkpointing, the `fsimage_TXID.md5` containing the md5 hash
+-of the image, the `VERSION` file containing some metadata, and the `fsimage_TXID.xml` file which can
+-be generated from the fsimage using the offline image viewer:
+-```
+-hdfs oiv -i fsimage_TXID -o fsimage_TXID.xml -p XML
+-```
+-It is recommended that you collect these files from your Secondary/Standby NameNode if you have one
+-to avoid placing additional load on your Active NameNode.
+-
+-All of these files must be placed somewhere on HDFS where the various jobs will be able to access them.
+-They should all be in the same folder, e.g. `hdfs:///dyno/fsimage`.
+-
+-All these steps can be automated with the `upload-fsimage.sh` script, e.g.:
+-```
+-./dynamometer-infra/bin/upload-fsimage.sh 0001 hdfs:///dyno/fsimage
+-```
+-Where 0001 is the transaction ID of the desired fsimage. See usage info of the script for more detail.
+-
+-### Step 3: Prepare a Hadoop Binary
+-
+-Collect the Hadoop distribution tarball to use to start the Dyno-NN and -DNs. For example, if
+-testing against Hadoop 3.0.2, use
+-[hadoop-3.0.2.tar.gz](http://www.apache.org/dyn/closer.cgi/hadoop/common/hadoop-3.0.2/hadoop-3.0.2.tar.gz).
+-This distribution contains several components unnecessary for Dynamometer (e.g. YARN), so to reduce
+-its size, you can optionally use the `create-slim-hadoop-tar.sh` script:
+-```
+-./dynamometer-infra/bin/create-slim-hadoop-tar.sh hadoop-VERSION.tar.gz
+-```
+-The Hadoop tar can be present on HDFS or locally where the client will be run from. Its path will be
+-supplied to the client via the `-hadoop_binary_path` argument.
+-
+-Alternatively, if you use the `-hadoop_version` argument, you can simply specify which version you would
+-like to run against (e.g. '3.0.2') and the client will attempt to download it automatically from an
+-Apache mirror. See the usage information of the client for more details.
+-
+-### Step 4: Prepare Configurations
+-
+-Prepare a configuration directory. You will need to specify a configuration directory with the standard
+-Hadoop configuration layout, e.g. it should contain `etc/hadoop/*-site.xml`. This determines with what
+-configuration the Dyno-NN and -DNs will be launched. Configurations that must be modified for
+-Dynamometer to work properly (e.g. `fs.defaultFS` or `dfs.namenode.name.dir`) will be overridden
+-at execution time. This can be a directory if it is available locally, else an archive file on local
+-or remote (HDFS) storage.
+-
+-### Step 5: Execute the Block Generation Job
+-
+-This will use the `fsimage_TXID.xml` file to generate the list of blocks that each Dyno-DN should
+-advertise to the Dyno-NN. It runs as a MapReduce job.
+-```
+-./dynamometer-blockgen/bin/generate-block-lists.sh
+-    -fsimage_input_path hdfs:///dyno/fsimage/fsimage_TXID.xml
+-    -block_image_output_dir hdfs:///dyno/blocks
+-    -num_reducers R
+-    -num_datanodes D
+-```
+-In this example, the XML file uploaded above is used to generate block listings into `hdfs:///dyno/blocks`.
+-`R` reducers are used for the job, and `D` block listings are generated - this will determine how many
+-Dyno-DNs are started in the Dyno-HDFS cluster.
+-
+-### Step 6: Prepare Audit Traces (Optional)
+-
+-This step is only necessary if you intend to use the audit trace replay capabilities of Dynamometer; if you
+-just intend to start a Dyno-HDFS cluster you can skip to the next section.
+-
+-The audit trace replay accepts one input file per mapper, and currently supports two input formats, configurable
+-via the `auditreplay.command-parser.class` configuration. One mapper will automatically be created for every
+-audit log file within the audit log directory specified at launch time.
+-
+-The default is a direct format,
+-`org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditLogDirectParser`. This accepts files in the format produced
+-by a standard configuration audit logger, e.g. lines like:
+-```
+-1970-01-01 00:00:42,000 INFO FSNamesystem.audit: allowed=true	ugi=hdfs	ip=/127.0.0.1	cmd=open	src=/tmp/foo	dst=null	perm=null	proto=rpc
+-```
+-When using this format you must also specify `auditreplay.log-start-time.ms`, which should be (in milliseconds since
+-the Unix epoch) the start time of the audit traces. This is needed for all mappers to agree on a single start time. For
+-example, if the above line was the first audit event, you would specify `auditreplay.log-start-time.ms=42000`. Within a
+-file, the audit logs must be in order of ascending timestamp.
+-
+-The other supported format is `org.apache.hadoop.tools.dynamometer.workloadgenerator.audit.AuditLogHiveTableParser`. This accepts
+-files in the format produced by a Hive query with output fields, in order:
+-
+-* `relativeTimestamp`: event time offset, in milliseconds, from the start of the trace
+-* `ugi`: user information of the submitting user
+-* `command`: name of the command, e.g. 'open'
+-* `source`: source path
+-* `dest`: destination path
+-* `sourceIP`: source IP of the event
+-
+-Assuming your audit logs are available in Hive, this can be produced via a Hive query looking like:
+-```sql
+-INSERT OVERWRITE DIRECTORY '${outputPath}'
+-SELECT (timestamp - ${startTimestamp} AS relativeTimestamp, ugi, command, source, dest, sourceIP
+-FROM '${auditLogTableLocation}'
+-WHERE timestamp >= ${startTimestamp} AND timestamp < ${endTimestamp}
+-DISTRIBUTE BY src
+-SORT BY relativeTimestamp ASC;
+-```
+-
+-#### Partitioning the Audit Logs
+-
+-You may notice that in the Hive query shown above, there is a `DISTRIBUTE BY src` clause which indicates that the
+-output files should be partitioned by the source IP of the caller. This is done to try to maintain closer ordering
+-of requests which originated from a single client. Dynamometer does not guarantee strict ordering of operations even
+-within a partition, but ordering will typically be maintained more closely within a partition than across partitions.
+-
+-Whether you use Hive or raw audit logs, it will be necessary to partition the audit logs based on the number of
+-simultaneous clients you required to perform your workload replay. Using the source IP as a partition key is one
+-approach with the potential advantages discussed above, but any partition scheme should work reasonably well.
+-
+-## Running Dynamometer
+-
+-After the setup steps above have been completed, you're ready to start up a Dyno-HDFS cluster and replay
+-some workload against it!
+-
+-The client which launches the Dyno-HDFS YARN application can optionally launch the workload replay
+-job once the Dyno-HDFS cluster has fully started. This makes each replay into a single execution of the client,
+-enabling easy testing of various configurations. You can also launch the two separately to have more control.
+-Similarly, it is possible to launch Dyno-DNs for an external NameNode which is not controlled by Dynamometer/YARN.
+-This can be useful for testing NameNode configurations which are not yet supported (e.g. HA NameNodes). You can do
+-this by passing the `-namenode_servicerpc_addr` argument to the infrastructure application with a value that points
+-to an external NameNode's service RPC address.
+-
+-### Manual Workload Launch
+-
+-First launch the infrastructure application to begin the startup of the internal HDFS cluster, e.g.:
+-```
+-./dynamometer-infra/bin/start-dynamometer-cluster.sh
+-    -hadoop_binary_path hadoop-3.0.2.tar.gz
+-    -conf_path my-hadoop-conf
+-    -fs_image_dir hdfs:///fsimage
+-    -block_list_path hdfs:///dyno/blocks
+-```
+-This demonstrates the required arguments. You can run this with the `-help` flag to see further usage information.
+-
+-The client will track the Dyno-NN's startup progress and how many Dyno-DNs it considers live. It will notify
+-via logging when the Dyno-NN has exited safemode and is ready for use.
+-
+-At this point, a workload job (map-only MapReduce job) can be launched, e.g.:
+-```
+-./dynamometer-workload/bin/start-workload.sh
+-    -Dauditreplay.input-path=hdfs:///dyno/audit_logs/
+-    -Dauditreplay.output-path=hdfs:///dyno/results/
+-    -Dauditreplay.num-threads=50
+-    -nn_uri hdfs://namenode_address:port/
+-    -start_time_offset 5m
+-    -mapper_class_name AuditReplayMapper
+-```
+-The type of workload generation is configurable; AuditReplayMapper replays an audit log trace as discussed previously.
+-The AuditReplayMapper is configured via configurations; `auditreplay.input-path`, `auditreplay.output-path` and
+-`auditreplay.num-threads` are required to specify the input path for audit log files, the output path for the results,
+-and the number of threads per map task. A number of map tasks equal to the number of files in `input-path` will be
+-launched; each task will read in one of these input files and use `num-threads` threads to replay the events contained
+-within that file. A best effort is made to faithfully replay the audit log events at the same pace at which they
+-originally occurred (optionally, this can be adjusted by specifying `auditreplay.rate-factor` which is a multiplicative
+-factor towards the rate of replay, e.g. use 2.0 to replay the events at twice the original speed).
+-
+-The AuditReplayMapper will output the benchmark results to a file `part-r-00000` in the output directory in CSV format.
+-Each line is in the format `user,type,operation,numops,cumulativelatency`, e.g. `hdfs,WRITE,MKDIRS,2,150`.
+-
+-### Integrated Workload Launch
+-
+-To have the infrastructure application client launch the workload automatically, parameters for the workload job
+-are passed to the infrastructure script. Only the AuditReplayMapper is supported in this fashion at this time. To
+-launch an integrated application with the same parameters as were used above, the following can be used:
+-```
+-./dynamometer-infra/bin/start-dynamometer-cluster.sh
+-    -hadoop_binary hadoop-3.0.2.tar.gz
+-    -conf_path my-hadoop-conf
+-    -fs_image_dir hdfs:///fsimage
+-    -block_list_path hdfs:///dyno/blocks
+-    -workload_replay_enable
+-    -workload_input_path hdfs:///dyno/audit_logs/
+-    -workload_output_path hdfs:///dyno/results/
+-    -workload_threads_per_mapper 50
+-    -workload_start_delay 5m
+-```
+-When run in this way, the client will automatically handle tearing down the Dyno-HDFS cluster once the
+-workload has completed. To see the full list of supported parameters, run this with the `-help` flag.
+-
+-## Architecture
+-
+-Dynamometer is implemented as an application on top of YARN. There are three main actors in a Dynamometer application:
+-
+-* Infrastructure is the simulated HDFS cluster.
+-* Workload simulates HDFS clients to generate load on the simulated NameNode.
+-* The driver coordinates the two other components.
+-
+-The logic encapsulated in the driver enables a user to perform a full test execution of Dynamometer with a single command,
+-making it possible to do things like sweeping over different parameters to find optimal configurations.
+-
+-![Dynamometer Infrastructure Application Architecture](./images/dynamometer-architecture-infra.png)
+-
+-The infrastructure application is written as a native YARN application in which a single NameNode and numerous DataNodes
+-are launched and wired together to create a fully simulated HDFS cluster. For Dynamometer to provide an extremely realistic scenario,
+-it is necessary to have a cluster which contains, from the NameNode’s perspective, the same information as a production cluster.
+-This is why the setup steps described above involve first collecting the FsImage file from a production NameNode and placing it onto
+-the host HDFS cluster. To avoid having to copy an entire cluster’s worth of blocks, Dynamometer leverages the fact that the actual
+-data stored in blocks is irrelevant to the NameNode, which is only aware of the block metadata. Dynamometer's blockgen job first
+-uses the Offline Image Viewer to turn the FsImage into XML, then parses this to extract the metadata for each block, then partitions this
+-information before placing it on HDFS for the simulated DataNodes to consume. `SimulatedFSDataset` is used to bypass the DataNode storage
+-layer and store only the block metadata, loaded from the information extracted in the previous step. This scheme allows Dynamometer to
+-pack many simulated DataNodes onto each physical node, as the size of the metadata is many orders of magnitude smaller than the data itself.
+-
+-To create a stress test that matches a production environment, Dynamometer needs a way to collect the information about the production workload.
+-For this the HDFS audit log is used, which contains a faithful record of all client-facing operations against the NameNode. By replaying this
+-audit log to recreate the client load, and running simulated DataNodes to recreate the cluster management load, Dynamometer is able to provide
+-a realistic simulation of the conditions of a production NameNode.
+-
+-![Dynamometer Replay Architecture](./images/dynamometer-architecture-replay.png)
+-
+-A heavily-loaded NameNode can service tens of thousands of operations per second; to induce such a load, Dynamometer needs numerous clients to submit
+-requests. In an effort to ensure that each request has the same effect and performance implications as its original submission, Dynamometer
+-attempts to make related requests (for example, a directory creation followed by a listing of that directory) in such a way as to preserve their original
+-ordering. It is for this reason that audit log files are suggested to be partitioned by source IP address, using the assumption that requests which
+-originated from the same host have more tightly coupled causal relationships than those which originated from different hosts. In the interest of
+-simplicity, the stress testing job is written as a map-only MapReduce job, in which each mapper consumes a partitioned audit log file and replays
+-the commands contained within against the simulated NameNode. During execution statistics are collected about the replay, such as latency for
+-different types of requests.
+-
+-## External Resources
+-
+-To see more information on Dynamometer, you can see the
+-[blog post announcing its initial release](https://engineering.linkedin.com/blog/2018/02/dynamometer--scale-testing-hdfs-on-minimal-hardware-with-maximum)
+-or [this presentation](https://www.slideshare.net/xkrogen/hadoop-meetup-jan-2019-dynamometer-and-a-case-study-in-namenode-gc).
+diff --git a/hadoop-tools/hadoop-dynamometer/src/site/resources/css/site.css b/hadoop-tools/hadoop-dynamometer/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-dynamometer/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-infra.png b/hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-infra.png
+deleted file mode 100644
+index 2f921f612412ecc7ebf8cfa2932c9473f56782fe..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 123874
+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
+MNlURp-s=7T0cYcK*Z=?k
+
+diff --git a/hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-replay.png b/hadoop-tools/hadoop-dynamometer/src/site/resources/images/dynamometer-architecture-replay.png
+deleted file mode 100644
+index 897828d49e2f704e884398be6eef42dbcc5cecf8..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 159507
+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
+
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 6cb112b67b7..c4ee6f7375f 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -33,7 +33,6 @@
+     <module>hadoop-streaming</module>
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+-    <module>hadoop-dynamometer</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
diff --git a/hadoop/stackable/patches/3.4.0/06-remove-hadoop-extras.patch b/hadoop/stackable/patches/3.4.0/06-remove-hadoop-extras.patch
new file mode 100644
index 000000000..15dd379e0
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/06-remove-hadoop-extras.patch
@@ -0,0 +1,1420 @@
+Entirely remove hadoop-extras
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 -
+ hadoop-project/pom.xml                             |    5 
+ hadoop-tools/hadoop-extras/pom.xml                 |  185 -------
+ .../org/apache/hadoop/mapred/tools/GetGroups.java  |   57 --
+ .../apache/hadoop/mapred/tools/package-info.java   |   22 -
+ .../main/java/org/apache/hadoop/tools/DistCh.java  |  510 --------------------
+ .../apache/hadoop/tools/DistCp_Counter.properties  |   22 -
+ .../java/org/apache/hadoop/tools/DistTool.java     |  114 ----
+ .../java/org/apache/hadoop/tools/package-info.java |   22 -
+ .../src/main/shellprofile.d/hadoop-extras.sh       |   37 -
+ .../apache/hadoop/mapred/tools/TestGetGroups.java  |   55 --
+ .../java/org/apache/hadoop/tools/TestDistCh.java   |  226 ---------
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 14 files changed, 1276 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-extras/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java
+ delete mode 100644 hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java
+ delete mode 100755 hadoop-tools/hadoop-extras/src/main/shellprofile.d/hadoop-extras.sh
+ delete mode 100644 hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java
+ delete mode 100644 hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 9121e90cdbd..5d59374cbf0 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -39,14 +39,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-extras/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-pipes/src/main/native/pipes/api/hadoop</directory>
+       <includes>
+@@ -89,13 +81,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-extras/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-gridmix/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 2082412a131..9d6f373a9a8 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -668,11 +668,6 @@
+         <artifactId>hadoop-rumen</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-extras</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+ 
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml
+deleted file mode 100644
+index d3346f7a2b0..00000000000
+--- a/hadoop-tools/hadoop-extras/pom.xml
++++ /dev/null
+@@ -1,185 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-extras</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Extras</description>
+-  <name>Apache Hadoop Extras</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-hs</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>servlet-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.enterprise</groupId>
+-          <artifactId>cdi-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-       <groupId>cglib</groupId>
+-       <artifactId>cglib</artifactId>
+-       <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcprov-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcpkix-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+-
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java
+deleted file mode 100644
+index 3793749a9cd..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.tools;
+-
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.net.InetSocketAddress;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.GetGroupsBase;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * MR implementation of a tool for getting the groups which a given user
+- * belongs to.
+- */
+-public class GetGroups extends GetGroupsBase {
+-
+-  static {
+-    Configuration.addDefaultResource("mapred-default.xml");
+-    Configuration.addDefaultResource("mapred-site.xml");
+-  }
+-  
+-  GetGroups(Configuration conf) {
+-    super(conf);
+-  }
+-  
+-  GetGroups(Configuration conf, PrintStream out) {
+-    super(conf, out);
+-  }
+-
+-  @Override
+-  protected InetSocketAddress getProtocolAddress(Configuration conf)
+-      throws IOException {
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  public static void main(String[] argv) throws Exception {
+-    int res = ToolRunner.run(new GetGroups(new Configuration()), argv);
+-    System.exit(res);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java
+deleted file mode 100644
+index ead265c2a6c..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Command-line tools associated with MapReduce.
+- */
+-package org.apache.hadoop.mapred.tools;
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java
+deleted file mode 100644
+index ed081396235..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java
++++ /dev/null
+@@ -1,510 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Stack;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.mapred.FileOutputFormat;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.InputFormat;
+-import org.apache.hadoop.mapred.InputSplit;
+-import org.apache.hadoop.mapred.InvalidInputException;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Mapper;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.SequenceFileRecordReader;
+-import org.apache.hadoop.mapreduce.JobSubmissionFiles;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * A Map-reduce program to recursively change files properties
+- * such as owner, group and permission.
+- */
+-public class DistCh extends DistTool {
+-  static final String NAME = "distch";
+-  static final String JOB_DIR_LABEL = NAME + ".job.dir";
+-  static final String OP_LIST_LABEL = NAME + ".op.list";
+-  static final String OP_COUNT_LABEL = NAME + ".op.count";
+-
+-  static final String USAGE = "java " + DistCh.class.getName() 
+-      + " [OPTIONS] <path:owner:group:permission>+ "
+-
+-      + "\n\nThe values of owner, group and permission can be empty."
+-      + "\nPermission is a octal number."
+-
+-      + "\n\nOPTIONS:"
+-      + "\n-f <urilist_uri>       Use list at <urilist_uri> as src list"
+-      + "\n-i                     Ignore failures"
+-      + "\n-log <logdir>          Write logs to <logdir>"
+-      ;
+-
+-  private static final long OP_PER_MAP =  1000;
+-  private static final int MAX_MAPS_PER_NODE = 20;
+-  private static final int SYNC_FILE_MAX = 10;
+-
+-  static enum Counter { SUCCEED, FAIL }
+-
+-  static enum Option {
+-    IGNORE_FAILURES("-i", NAME + ".ignore.failures");
+-
+-    final String cmd, propertyname;
+-
+-    private Option(String cmd, String propertyname) {
+-      this.cmd = cmd;
+-      this.propertyname = propertyname;
+-    }
+-  }
+-
+-  DistCh(Configuration conf) {
+-    super(createJobConf(conf));
+-  }
+-
+-  private static JobConf createJobConf(Configuration conf) {
+-    JobConf jobconf = new JobConf(conf, DistCh.class);
+-    jobconf.setJobName(NAME);
+-    jobconf.setMapSpeculativeExecution(false);
+-
+-    jobconf.setInputFormat(ChangeInputFormat.class);
+-    jobconf.setOutputKeyClass(Text.class);
+-    jobconf.setOutputValueClass(Text.class);
+-
+-    jobconf.setMapperClass(ChangeFilesMapper.class);
+-    jobconf.setNumReduceTasks(0);
+-    return jobconf;
+-  }
+-
+-  /** File operations. */
+-  static class FileOperation implements Writable {
+-    private Path src;
+-    private String owner;
+-    private String group;
+-    private FsPermission permission;
+-
+-    FileOperation() {}
+-
+-    FileOperation(Path src, FileOperation that) {
+-      this.src = src;
+-      this.owner = that.owner;
+-      this.group = that.group;
+-      this.permission = that.permission;
+-      checkState();
+-    }
+-
+-    /**
+-     * path:owner:group:permission
+-     * e.g.
+-     * /user/foo:foo:bar:700 
+-     */
+-    FileOperation(String line) {
+-      try {
+-        String[] t = line.split(":", 4);
+-        for(int i = 0; i < t.length; i++) {
+-          if ("".equals(t[i])) {
+-            t[i] = null;
+-          }
+-        }
+-
+-        src = new Path(t[0]);
+-        owner = t[1];
+-        group = t[2];
+-        permission = t[3] == null? null:
+-          new FsPermission(Short.parseShort(t[3], 8));
+-
+-        checkState();
+-      }
+-      catch(Exception e) {
+-        throw (IllegalArgumentException)new IllegalArgumentException(
+-            "line=" + line).initCause(e);
+-      }
+-    }
+-
+-    private void checkState() throws IllegalStateException {
+-      if (owner == null && group == null && permission == null) {
+-        throw new IllegalStateException(
+-            "owner == null && group == null && permission == null");
+-      }
+-    }
+-
+-    static final FsPermission FILE_UMASK
+-        = FsPermission.createImmutable((short)0111);
+-
+-    private boolean isDifferent(FileStatus original) {
+-      if (owner != null && !owner.equals(original.getOwner())) {
+-        return true;
+-      }
+-      if (group != null && !group.equals(original.getGroup())) {
+-        return true;
+-      }
+-      if (permission != null) {
+-        FsPermission orig = original.getPermission();
+-        return original.isDirectory()? !permission.equals(orig):
+-          !permission.applyUMask(FILE_UMASK).equals(orig);
+-      }
+-      return false;
+-    }
+-
+-    void run(Configuration conf) throws IOException {
+-      FileSystem fs = src.getFileSystem(conf);
+-      if (permission != null) {
+-        fs.setPermission(src, permission);
+-      }
+-      if (owner != null || group != null) {
+-        fs.setOwner(src, owner, group);
+-      }
+-    }
+-
+-    /** {@inheritDoc} */
+-    public void readFields(DataInput in) throws IOException {
+-      this.src = new Path(Text.readString(in));
+-      owner = DistTool.readString(in);
+-      group = DistTool.readString(in);
+-      permission = in.readBoolean()? FsPermission.read(in): null;
+-    }
+-
+-    /** {@inheritDoc} */
+-    public void write(DataOutput out) throws IOException {
+-      Text.writeString(out, src.toString());
+-      DistTool.writeString(out, owner);
+-      DistTool.writeString(out, group);
+-
+-      boolean b = permission != null;
+-      out.writeBoolean(b);
+-      if (b) {permission.write(out);}
+-    }
+-
+-    /** {@inheritDoc} */
+-    public String toString() {
+-      return src + ":" + owner + ":" + group + ":" + permission; 
+-    }
+-  }
+-
+-  /** Responsible for generating splits of the src file list. */
+-  static class ChangeInputFormat implements InputFormat<Text, FileOperation> {
+-    /** Do nothing. */
+-    public void validateInput(JobConf job) {}
+-
+-    /**
+-     * Produce splits such that each is no greater than the quotient of the
+-     * total size and the number of splits requested.
+-     * @param job The handle to the JobConf object
+-     * @param numSplits Number of splits requested
+-     */
+-    public InputSplit[] getSplits(JobConf job, int numSplits
+-        ) throws IOException {
+-      final int srcCount = job.getInt(OP_COUNT_LABEL, -1);
+-      final int targetcount = srcCount / numSplits;
+-      String srclist = job.get(OP_LIST_LABEL, "");
+-      if (srcCount < 0 || "".equals(srclist)) {
+-        throw new RuntimeException("Invalid metadata: #files(" + srcCount +
+-                                   ") listuri(" + srclist + ")");
+-      }
+-      Path srcs = new Path(srclist);
+-      FileSystem fs = srcs.getFileSystem(job);
+-
+-      List<FileSplit> splits = new ArrayList<FileSplit>(numSplits);
+-
+-      Text key = new Text();
+-      FileOperation value = new FileOperation();
+-      long prev = 0L;
+-      int count = 0; //count src
+-      try (SequenceFile.Reader in = new SequenceFile.Reader(fs, srcs, job)) {
+-        for ( ; in.next(key, value); ) {
+-          long curr = in.getPosition();
+-          long delta = curr - prev;
+-          if (++count > targetcount) {
+-            count = 0;
+-            splits.add(new FileSplit(srcs, prev, delta, (String[])null));
+-            prev = curr;
+-          }
+-        }
+-      }
+-      long remaining = fs.getFileStatus(srcs).getLen() - prev;
+-      if (remaining != 0) {
+-        splits.add(new FileSplit(srcs, prev, remaining, (String[])null));
+-      }
+-      LOG.info("numSplits="  + numSplits + ", splits.size()=" + splits.size());
+-      return splits.toArray(new FileSplit[splits.size()]);
+-    }
+-
+-    /** {@inheritDoc} */
+-    public RecordReader<Text, FileOperation> getRecordReader(InputSplit split,
+-        JobConf job, Reporter reporter) throws IOException {
+-      return new SequenceFileRecordReader<Text, FileOperation>(job,
+-          (FileSplit)split);
+-    }
+-  }
+-
+-  /** The mapper for changing files. */
+-  static class ChangeFilesMapper 
+-      implements Mapper<Text, FileOperation, WritableComparable<?>, Text> {
+-    private JobConf jobconf;
+-    private boolean ignoreFailures;
+-
+-    private int failcount = 0;
+-    private int succeedcount = 0;
+-
+-    private String getCountString() {
+-      return "Succeeded: " + succeedcount + " Failed: " + failcount;
+-    }
+-
+-    /** {@inheritDoc} */
+-    public void configure(JobConf job) {
+-      this.jobconf = job;
+-      ignoreFailures=job.getBoolean(Option.IGNORE_FAILURES.propertyname,false);
+-    }
+-
+-    /** Run a FileOperation */
+-    public void map(Text key, FileOperation value,
+-        OutputCollector<WritableComparable<?>, Text> out, Reporter reporter
+-        ) throws IOException {
+-      try {
+-        value.run(jobconf);
+-        ++succeedcount;
+-        reporter.incrCounter(Counter.SUCCEED, 1);
+-      } catch (IOException e) {
+-        ++failcount;
+-        reporter.incrCounter(Counter.FAIL, 1);
+-
+-        String s = "FAIL: " + value + ", " + StringUtils.stringifyException(e);
+-        out.collect(null, new Text(s));
+-        LOG.info(s);
+-      } finally {
+-        reporter.setStatus(getCountString());
+-      }
+-    }
+-
+-    /** {@inheritDoc} */
+-    public void close() throws IOException {
+-      if (failcount == 0 || ignoreFailures) {
+-        return;
+-      }
+-      throw new IOException(getCountString());
+-    }
+-  }
+-
+-  private static void check(Configuration conf, List<FileOperation> ops
+-      ) throws InvalidInputException {
+-    List<Path> srcs = new ArrayList<Path>();
+-    for(FileOperation op : ops) {
+-      srcs.add(op.src);
+-    }
+-    DistTool.checkSource(conf, srcs);
+-  }
+-
+-  private static List<FileOperation> fetchList(Configuration conf, Path inputfile
+-      ) throws IOException {
+-    List<FileOperation> result = new ArrayList<FileOperation>();
+-    for(String line : readFile(conf, inputfile)) {
+-      result.add(new FileOperation(line));
+-    }
+-    return result;
+-  }
+-
+-  /** This is the main driver for recursively changing files properties. */
+-  public int run(String[] args) throws Exception {
+-    List<FileOperation> ops = new ArrayList<FileOperation>();
+-    Path logpath = null;
+-    boolean isIgnoreFailures = false;
+-
+-    try {
+-      for (int idx = 0; idx < args.length; idx++) {
+-        if ("-f".equals(args[idx])) {
+-          if (++idx ==  args.length) {
+-            System.out.println("urilist_uri not specified");
+-            System.out.println(USAGE);
+-            return -1;
+-          }
+-          ops.addAll(fetchList(jobconf, new Path(args[idx])));
+-        } else if (Option.IGNORE_FAILURES.cmd.equals(args[idx])) {
+-          isIgnoreFailures = true;
+-        } else if ("-log".equals(args[idx])) {
+-          if (++idx ==  args.length) {
+-            System.out.println("logdir not specified");
+-            System.out.println(USAGE);
+-            return -1;
+-          }
+-          logpath = new Path(args[idx]);
+-        } else if ('-' == args[idx].codePointAt(0)) {
+-          System.out.println("Invalid switch " + args[idx]);
+-          System.out.println(USAGE);
+-          ToolRunner.printGenericCommandUsage(System.out);
+-          return -1;
+-        } else {
+-          ops.add(new FileOperation(args[idx]));
+-        }
+-      }
+-      // mandatory command-line parameters
+-      if (ops.isEmpty()) {
+-        throw new IllegalStateException("Operation is empty");
+-      }
+-      LOG.info("ops=" + ops);
+-      LOG.info("isIgnoreFailures=" + isIgnoreFailures);
+-      jobconf.setBoolean(Option.IGNORE_FAILURES.propertyname, isIgnoreFailures);
+-      check(jobconf, ops);
+-
+-      try {
+-        if (setup(ops, logpath)) {
+-          JobClient.runJob(jobconf);
+-        }
+-      } finally {
+-        try {
+-          if (logpath == null) {
+-            //delete log directory
+-            final Path logdir = FileOutputFormat.getOutputPath(jobconf);
+-            if (logdir != null) {
+-              logdir.getFileSystem(jobconf).delete(logdir, true);
+-            }
+-          }
+-        }
+-        finally {
+-          //delete job directory
+-          final String jobdir = jobconf.get(JOB_DIR_LABEL);
+-          if (jobdir != null) {
+-            final Path jobpath = new Path(jobdir);
+-            jobpath.getFileSystem(jobconf).delete(jobpath, true);
+-          }
+-        }
+-      }
+-    } catch(DuplicationException e) {
+-      LOG.error("Input error:", e);
+-      return DuplicationException.ERROR_CODE;
+-    } catch(Exception e) {
+-      LOG.error(NAME + " failed: ", e);
+-      System.out.println(USAGE);
+-      ToolRunner.printGenericCommandUsage(System.out);
+-      return -1;
+-    }
+-    return 0;
+-  }
+-
+-  /** Calculate how many maps to run. */
+-  private static int getMapCount(int srcCount, int numNodes) {
+-    int numMaps = (int)(srcCount / OP_PER_MAP);
+-    numMaps = Math.min(numMaps, numNodes * MAX_MAPS_PER_NODE);
+-    return Math.max(numMaps, 1);
+-  }
+-
+-  private boolean setup(List<FileOperation> ops, Path log) 
+-  throws IOException {
+-    final String randomId = getRandomId();
+-    JobClient jClient = new JobClient(jobconf);
+-    Path stagingArea;
+-    try {
+-      stagingArea = JobSubmissionFiles.getStagingDir(
+-                       jClient.getClusterHandle(), jobconf);
+-    } catch (InterruptedException ie){
+-      throw new IOException(ie);
+-    }
+-    Path jobdir = new Path(stagingArea + NAME + "_" + randomId);
+-    FsPermission mapredSysPerms = 
+-      new FsPermission(JobSubmissionFiles.JOB_DIR_PERMISSION);
+-    FileSystem.mkdirs(jClient.getFs(), jobdir, mapredSysPerms);
+-    LOG.info(JOB_DIR_LABEL + "=" + jobdir);
+-
+-    if (log == null) {
+-      log = new Path(jobdir, "_logs");
+-    }
+-    FileOutputFormat.setOutputPath(jobconf, log);
+-    LOG.info("log=" + log);
+-
+-    //create operation list
+-    FileSystem fs = jobdir.getFileSystem(jobconf);
+-    Path opList = new Path(jobdir, "_" + OP_LIST_LABEL);
+-    jobconf.set(OP_LIST_LABEL, opList.toString());
+-    int opCount = 0, synCount = 0;
+-    try (SequenceFile.Writer opWriter = SequenceFile.createWriter(fs, jobconf, opList, Text.class,
+-            FileOperation.class, SequenceFile.CompressionType.NONE)) {
+-      for(FileOperation op : ops) {
+-        FileStatus srcstat = fs.getFileStatus(op.src); 
+-        if (srcstat.isDirectory() && op.isDifferent(srcstat)) {
+-          ++opCount;
+-          opWriter.append(new Text(op.src.toString()), op);
+-        }
+-
+-        Stack<Path> pathstack = new Stack<Path>();
+-        for(pathstack.push(op.src); !pathstack.empty(); ) {
+-          for(FileStatus stat : fs.listStatus(pathstack.pop())) {
+-            if (stat.isDirectory()) {
+-              pathstack.push(stat.getPath());
+-            }
+-
+-            if (op.isDifferent(stat)) {              
+-              ++opCount;
+-              if (++synCount > SYNC_FILE_MAX) {
+-                opWriter.sync();
+-                synCount = 0;
+-              }
+-              Path f = stat.getPath();
+-              opWriter.append(new Text(f.toString()), new FileOperation(f, op));
+-            }
+-          }
+-        }
+-      }
+-    }
+-
+-    checkDuplication(fs, opList, new Path(jobdir, "_sorted"), jobconf);
+-    jobconf.setInt(OP_COUNT_LABEL, opCount);
+-    LOG.info(OP_COUNT_LABEL + "=" + opCount);
+-    jobconf.setNumMapTasks(getMapCount(opCount,
+-        new JobClient(jobconf).getClusterStatus().getTaskTrackers()));
+-    return opCount != 0;    
+-  }
+-
+-  private static void checkDuplication(FileSystem fs, Path file, Path sorted,
+-    Configuration conf) throws IOException {
+-    SequenceFile.Sorter sorter = new SequenceFile.Sorter(fs,
+-        new Text.Comparator(), Text.class, FileOperation.class, conf);
+-    sorter.sort(file, sorted);
+-    try (SequenceFile.Reader in = new SequenceFile.Reader(fs, sorted, conf)) {
+-      FileOperation curop = new FileOperation();
+-      Text prevsrc = null, cursrc = new Text(); 
+-      for(; in.next(cursrc, curop); ) {
+-        if (prevsrc != null && cursrc.equals(prevsrc)) {
+-          throw new DuplicationException(
+-            "Invalid input, there are duplicated files in the sources: "
+-            + prevsrc + ", " + cursrc);
+-        }
+-        prevsrc = cursrc;
+-        cursrc = new Text();
+-        curop = new FileOperation();
+-      }
+-    }
+-  } 
+-
+-  public static void main(String[] args) throws Exception {
+-    System.exit(ToolRunner.run(new DistCh(new Configuration()), args));
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties
+deleted file mode 100644
+index 77f6c02e6bd..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties
++++ /dev/null
+@@ -1,22 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# ResourceBundle properties file for distcp counters
+-
+-CounterGroupName=       distcp
+-
+-COPY.name=              Files copied
+-DIR_COPY.name=          Directories copied
+-SKIP.name=              Files skipped
+-FAIL.name=              Files failed
+-BYTESCOPIED.name=       Bytes copied
+-BYTESEXPECTED.name=     Bytes expected
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java
+deleted file mode 100644
+index 7e5b7154790..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java
++++ /dev/null
+@@ -1,114 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools;
+-
+-import java.io.BufferedReader;
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.InvalidInputException;
+-import org.apache.hadoop.mapred.JobConf;
+-
+-/**
+- * An abstract class for distributed tool for file related operations.
+- */
+-abstract class DistTool implements org.apache.hadoop.util.Tool {
+-  protected static final Logger LOG = LoggerFactory.getLogger(DistTool.class);
+-
+-  protected JobConf jobconf;
+-
+-  /** {@inheritDoc} */
+-  public void setConf(Configuration conf) {
+-    if (jobconf != conf) {
+-      jobconf = conf instanceof JobConf? (JobConf)conf: new JobConf(conf);
+-    }
+-  }
+-
+-  /** {@inheritDoc} */
+-  public JobConf getConf() {return jobconf;}
+-
+-  protected DistTool(Configuration conf) {setConf(conf);}
+-
+-  private static final Random RANDOM = new Random();
+-  protected static String getRandomId() {
+-    return Integer.toString(RANDOM.nextInt(Integer.MAX_VALUE), 36);
+-  }
+-
+-  /** Sanity check for source */
+-  protected static void checkSource(Configuration conf, List<Path> srcs
+-      ) throws InvalidInputException {
+-    List<IOException> ioes = new ArrayList<IOException>();
+-    for(Path p : srcs) {
+-      try {
+-        p.getFileSystem(conf).getFileStatus(p);
+-      } catch(IOException e) {
+-        ioes.add(e);
+-      }
+-    }
+-    if (!ioes.isEmpty()) {
+-      throw new InvalidInputException(ioes);
+-    }
+-  }
+-
+-  protected static String readString(DataInput in) throws IOException {
+-    if (in.readBoolean()) {
+-      return Text.readString(in);
+-    }
+-    return null;
+-  }
+-
+-  protected static void writeString(DataOutput out, String s
+-      ) throws IOException {
+-    boolean b = s != null;
+-    out.writeBoolean(b);
+-    if (b) {Text.writeString(out, s);}
+-  }
+-
+-  protected static List<String> readFile(Configuration conf, Path inputfile
+-      ) throws IOException {
+-    List<String> result = new ArrayList<String>();
+-    FileSystem fs = inputfile.getFileSystem(conf);
+-    try (BufferedReader input = new BufferedReader(new InputStreamReader(fs.open(inputfile),
+-            StandardCharsets.UTF_8))) {
+-      for(String line; (line = input.readLine()) != null;) {
+-        result.add(line);
+-      }
+-    }
+-    return result;
+-  }
+-
+-  /** An exception class for duplicated source files. */
+-  public static class DuplicationException extends IOException {
+-    private static final long serialVersionUID = 1L;
+-    /** Error code for this exception */
+-    public static final int ERROR_CODE = -2;
+-    DuplicationException(String message) {super(message);}
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java
+deleted file mode 100644
+index 44f533e2f75..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Command-line tools for MapReduce.
+- */
+-package org.apache.hadoop.tools;
+diff --git a/hadoop-tools/hadoop-extras/src/main/shellprofile.d/hadoop-extras.sh b/hadoop-tools/hadoop-extras/src/main/shellprofile.d/hadoop-extras.sh
+deleted file mode 100755
+index 364c950c466..00000000000
+--- a/hadoop-tools/hadoop-extras/src/main/shellprofile.d/hadoop-extras.sh
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f hadoop_subcommand_distch >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = hadoop ]]; then
+-    hadoop_add_subcommand "distch" client "distributed metadata changer"
+-  fi
+-
+-  # this can't be indented otherwise shelldocs won't get it
+-
+-## @description  distch command for hadoop
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function hadoop_subcommand_distch
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.DistCh
+-  hadoop_add_to_classpath_tools hadoop-extras
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java
+deleted file mode 100644
+index ed7b8aa8632..00000000000
+--- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.tools;
+-
+-import java.io.IOException;
+-import java.io.PrintStream;
+-
+-import org.apache.hadoop.mapred.MiniMRCluster;
+-import org.apache.hadoop.mapred.tools.GetGroups;
+-import org.apache.hadoop.tools.GetGroupsTestBase;
+-import org.apache.hadoop.util.Tool;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Ignore;
+-
+-/**
+- * Tests for the MR implementation of {@link GetGroups}
+- */
+-@Ignore
+-public class TestGetGroups extends GetGroupsTestBase {
+-  
+-  private MiniMRCluster cluster;
+-
+-  @Before
+-  public void setUpJobTracker() throws IOException, InterruptedException {
+-    cluster = new MiniMRCluster(0, "file:///", 1);
+-    conf = cluster.createJobConf();
+-  }
+-  
+-  @After
+-  public void tearDownJobTracker() throws IOException {
+-    cluster.shutdown();
+-  }
+-
+-  @Override
+-  protected Tool getTool(PrintStream o) {
+-    return new GetGroups(conf, o);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java
+deleted file mode 100644
+index 3e52b3cb6d1..00000000000
+--- a/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java
++++ /dev/null
+@@ -1,226 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.util.Arrays;
+-import java.util.Random;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FsShell;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.fs.permission.PermissionStatus;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.hdfs.server.datanode.DataNode;
+-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapred.MiniMRClientClusterFactory;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.event.Level;
+-
+-import static org.slf4j.LoggerFactory.getLogger;
+-
+-public class TestDistCh {
+-  {
+-    GenericTestUtils.setLogLevel(
+-        getLogger("org.apache.hadoop.hdfs.StateChange"), Level.ERROR);
+-    GenericTestUtils.setLogLevel(DataNode.LOG, Level.ERROR);
+-    GenericTestUtils.setLogLevel(getLogger(FSNamesystem.class), Level.ERROR);
+-  }
+-
+-  static final Long RANDOM_NUMBER_GENERATOR_SEED = null;
+-  static final FsPermission UMASK = FsPermission.createImmutable((short)0111);
+-  
+-  private static final Random RANDOM = new Random();
+-  static {
+-    final long seed = RANDOM_NUMBER_GENERATOR_SEED == null?
+-        RANDOM.nextLong(): RANDOM_NUMBER_GENERATOR_SEED;
+-    System.out.println("seed=" + seed);
+-    RANDOM.setSeed(seed);
+-  }
+-
+-  static final String TEST_ROOT_DIR =
+-    new Path(System.getProperty("test.build.data","/tmp")
+-        ).toString().replace(' ', '+');
+-
+-  static final int NUN_SUBS = 7;
+-
+-  static class FileTree {
+-    private final FileSystem fs;
+-    private final String root;
+-    private final Path rootdir;
+-    private int fcount = 0;
+-
+-    Path createSmallFile(Path dir) throws IOException {
+-      final Path f = new Path(dir, "f" + ++fcount);
+-      Assert.assertTrue(!fs.exists(f));
+-      final DataOutputStream out = fs.create(f);
+-      try {
+-        out.writeBytes("createSmallFile: f=" + f);
+-      } finally {
+-        out.close();
+-      }
+-      Assert.assertTrue(fs.exists(f));
+-      return f;
+-    }
+-
+-    Path mkdir(Path dir) throws IOException {
+-      Assert.assertTrue(fs.mkdirs(dir));
+-      Assert.assertTrue(fs.getFileStatus(dir).isDirectory());
+-      return dir;
+-    }
+-    
+-    FileTree(FileSystem fs, String name) throws IOException {
+-      this.fs = fs;
+-      this.root = "/test/" + name;
+-      this.rootdir = mkdir(new Path(root));
+-  
+-      for(int i = 0; i < 3; i++) {
+-        createSmallFile(rootdir);
+-      }
+-      
+-      for(int i = 0; i < NUN_SUBS; i++) {
+-        final Path sub = mkdir(new Path(root, "sub" + i));
+-        int num_files = RANDOM.nextInt(3);
+-        for(int j = 0; j < num_files; j++) {
+-          createSmallFile(sub);
+-        }
+-      }
+-      
+-      System.out.println("rootdir = " + rootdir);
+-    }
+-  }
+-
+-  static class ChPermissionStatus extends PermissionStatus {
+-    private final boolean defaultPerm;
+-    
+-    ChPermissionStatus(FileStatus filestatus) {
+-      this(filestatus, "", "", "");
+-    }
+-
+-    ChPermissionStatus(FileStatus filestatus, String owner, String group, String permission) {
+-      super("".equals(owner)? filestatus.getOwner(): owner, 
+-          "".equals(group)? filestatus.getGroup(): group,
+-          "".equals(permission)? filestatus.getPermission(): new FsPermission(Short.parseShort(permission, 8)));
+-      defaultPerm = permission == null || "".equals(permission);
+-    }
+-  }
+-
+-  @Test
+-  public void testDistCh() throws Exception {
+-    final Configuration conf = new Configuration();
+-
+-    conf.set(CapacitySchedulerConfiguration.PREFIX+CapacitySchedulerConfiguration.ROOT+"."+CapacitySchedulerConfiguration.QUEUES, "default");
+-    conf.set(CapacitySchedulerConfiguration.PREFIX+CapacitySchedulerConfiguration.ROOT+".default."+CapacitySchedulerConfiguration.CAPACITY, "100");
+-    final MiniDFSCluster cluster=  new MiniDFSCluster.Builder(conf).numDataNodes(2).format(true).build();
+-    
+-    final FileSystem fs = cluster.getFileSystem();
+-    final FsShell shell = new FsShell(conf);
+-    
+-    try {
+-      final FileTree tree = new FileTree(fs, "testDistCh");
+-      final FileStatus rootstatus = fs.getFileStatus(tree.rootdir);
+-
+-      runLsr(shell, tree.root, 0);
+-
+-      final String[] args = new String[NUN_SUBS];
+-      final ChPermissionStatus[] newstatus = new ChPermissionStatus[NUN_SUBS];
+-
+-      
+-      args[0]="/test/testDistCh/sub0:sub1::";
+-      newstatus[0] = new ChPermissionStatus(rootstatus, "sub1", "", "");
+-
+-      args[1]="/test/testDistCh/sub1::sub2:";
+-      newstatus[1] = new ChPermissionStatus(rootstatus, "", "sub2", "");
+-
+-      args[2]="/test/testDistCh/sub2:::437";
+-      newstatus[2] = new ChPermissionStatus(rootstatus, "", "", "437");
+-
+-      args[3]="/test/testDistCh/sub3:sub1:sub2:447";
+-      newstatus[3] = new ChPermissionStatus(rootstatus, "sub1", "sub2", "447");
+- 
+-      args[4]="/test/testDistCh/sub4::sub5:437";
+-      newstatus[4] = new ChPermissionStatus(rootstatus, "", "sub5", "437");
+-
+-      args[5]="/test/testDistCh/sub5:sub1:sub5:";
+-      newstatus[5] = new ChPermissionStatus(rootstatus, "sub1", "sub5", "");
+-
+-      args[6]="/test/testDistCh/sub6:sub3::437";
+-      newstatus[6] = new ChPermissionStatus(rootstatus, "sub3", "", "437");
+-      
+-      System.out.println("args=" + Arrays.asList(args).toString().replace(",", ",\n  "));
+-      System.out.println("newstatus=" + Arrays.asList(newstatus).toString().replace(",", ",\n  "));
+-
+-      //run DistCh
+-      new DistCh(MiniMRClientClusterFactory.create(this.getClass(), 2, conf).getConfig()).run(args);
+-      runLsr(shell, tree.root, 0);
+-
+-      //check results
+-      for(int i = 0; i < NUN_SUBS; i++) {
+-        Path sub = new Path(tree.root + "/sub" + i);
+-        checkFileStatus(newstatus[i], fs.getFileStatus(sub));
+-        for(FileStatus status : fs.listStatus(sub)) {
+-          checkFileStatus(newstatus[i], status);
+-        }
+-      }
+-    } finally {
+-      cluster.shutdown();
+-    }
+-  }
+-
+-  static void checkFileStatus(ChPermissionStatus expected, FileStatus actual) {
+-    Assert.assertEquals(expected.getUserName(), actual.getOwner());
+-    Assert.assertEquals(expected.getGroupName(), actual.getGroup());
+-    FsPermission perm = expected.getPermission();
+-    if (actual.isFile() && expected.defaultPerm) {
+-      perm = perm.applyUMask(UMASK);
+-    }
+-    Assert.assertEquals(perm, actual.getPermission());
+-  }
+-
+-  private static String runLsr(final FsShell shell, String root, int returnvalue
+-      ) throws Exception {
+-    System.out.println("root=" + root + ", returnvalue=" + returnvalue);
+-    final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); 
+-    final PrintStream out = new PrintStream(bytes);
+-    final PrintStream oldOut = System.out;
+-    final PrintStream oldErr = System.err;
+-    System.setOut(out);
+-    System.setErr(out);
+-    final String results;
+-    try {
+-      Assert.assertEquals(returnvalue, shell.run(new String[]{"-lsr", root}));
+-      results = bytes.toString();
+-    } finally {
+-      IOUtils.closeStream(out);
+-      System.setOut(oldOut);
+-      System.setErr(oldErr);
+-    }
+-    System.out.println("results:\n" + results);
+-    return results;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 4acf66c3b8c..1a78cc5cc0f 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-extras</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-gridmix</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index c4ee6f7375f..eab1d560d97 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-extras</module>
+     <module>hadoop-pipes</module>
+     <module>hadoop-openstack</module>
+     <module>hadoop-sls</module>
diff --git a/hadoop/stackable/patches/3.4.0/07-remove-hadoop-gridmix.patch b/hadoop/stackable/patches/3.4.0/07-remove-hadoop-gridmix.patch
new file mode 100644
index 000000000..b5fe23bac
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/07-remove-hadoop-gridmix.patch
@@ -0,0 +1,20311 @@
+Entirely remove hadoop-gridmix
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 
+ hadoop-project/pom.xml                             |    5 
+ hadoop-project/src/site/site.xml                   |    1 
+ .../dev-support/findbugs-exclude.xml               |   40 -
+ hadoop-tools/hadoop-gridmix/pom.xml                |  199 ----
+ .../hadoop/mapred/gridmix/AvgRecordFactory.java    |  123 --
+ .../hadoop/mapred/gridmix/ClusterSummarizer.java   |  116 --
+ .../mapred/gridmix/CompressionEmulationUtil.java   |  600 ------------
+ .../mapred/gridmix/DistributedCacheEmulator.java   |  551 -----------
+ .../hadoop/mapred/gridmix/EchoUserResolver.java    |   57 -
+ .../hadoop/mapred/gridmix/ExecutionSummarizer.java |  320 ------
+ .../org/apache/hadoop/mapred/gridmix/FilePool.java |  301 ------
+ .../apache/hadoop/mapred/gridmix/FileQueue.java    |  103 --
+ .../apache/hadoop/mapred/gridmix/GenerateData.java |  412 --------
+ .../mapred/gridmix/GenerateDistCacheData.java      |  267 -----
+ .../org/apache/hadoop/mapred/gridmix/Gridmix.java  |  809 ----------------
+ .../apache/hadoop/mapred/gridmix/GridmixJob.java   |  526 -----------
+ .../mapred/gridmix/GridmixJobSubmissionPolicy.java |   90 --
+ .../apache/hadoop/mapred/gridmix/GridmixKey.java   |  301 ------
+ .../hadoop/mapred/gridmix/GridmixRecord.java       |  272 ------
+ .../apache/hadoop/mapred/gridmix/GridmixSplit.java |  148 ---
+ .../apache/hadoop/mapred/gridmix/InputStriper.java |  137 ---
+ .../mapred/gridmix/IntermediateRecordFactory.java  |  110 --
+ .../apache/hadoop/mapred/gridmix/JobCreator.java   |  135 ---
+ .../apache/hadoop/mapred/gridmix/JobFactory.java   |  276 ------
+ .../apache/hadoop/mapred/gridmix/JobMonitor.java   |  294 ------
+ .../apache/hadoop/mapred/gridmix/JobSubmitter.java |  225 -----
+ .../org/apache/hadoop/mapred/gridmix/LoadJob.java  |  663 -------------
+ .../apache/hadoop/mapred/gridmix/LoadSplit.java    |  180 ----
+ .../apache/hadoop/mapred/gridmix/Progressive.java  |   25 -
+ .../hadoop/mapred/gridmix/PseudoLocalFs.java       |  338 -------
+ .../hadoop/mapred/gridmix/RandomAlgorithms.java    |  209 ----
+ .../mapred/gridmix/RandomTextDataGenerator.java    |  147 ---
+ .../hadoop/mapred/gridmix/ReadRecordFactory.java   |   85 --
+ .../hadoop/mapred/gridmix/RecordFactory.java       |   40 -
+ .../hadoop/mapred/gridmix/ReplayJobFactory.java    |  128 ---
+ .../mapred/gridmix/RoundRobinUserResolver.java     |  141 ---
+ .../hadoop/mapred/gridmix/SerialJobFactory.java    |  182 ----
+ .../org/apache/hadoop/mapred/gridmix/SleepJob.java |  412 --------
+ .../apache/hadoop/mapred/gridmix/StatListener.java |   32 -
+ .../apache/hadoop/mapred/gridmix/Statistics.java   |  405 --------
+ .../hadoop/mapred/gridmix/StressJobFactory.java    |  610 ------------
+ .../mapred/gridmix/SubmitterUserResolver.java      |   59 -
+ .../apache/hadoop/mapred/gridmix/Summarizer.java   |   75 --
+ .../apache/hadoop/mapred/gridmix/UserResolver.java |   65 -
+ .../CumulativeCpuUsageEmulatorPlugin.java          |  324 -------
+ .../resourceusage/ResourceUsageEmulatorPlugin.java |   63 -
+ .../resourceusage/ResourceUsageMatcher.java        |  111 --
+ .../TotalHeapUsageEmulatorPlugin.java              |  279 ------
+ .../src/main/shellprofile.d/hadoop-gridmix.sh      |   36 -
+ .../hadoop-gridmix/src/site/markdown/GridMix.md.vm |  807 ----------------
+ .../hadoop-gridmix/src/site/resources/css/site.css |   30 -
+ .../hadoop/mapred/gridmix/CommonJobTest.java       |  385 --------
+ .../hadoop/mapred/gridmix/DebugJobFactory.java     |  106 --
+ .../hadoop/mapred/gridmix/DebugJobProducer.java    |  311 ------
+ .../gridmix/DummyResourceCalculatorPlugin.java     |  154 ---
+ .../hadoop/mapred/gridmix/GridmixTestUtils.java    |  120 --
+ .../gridmix/TestCompressionEmulationUtils.java     |  586 ------------
+ .../mapred/gridmix/TestDistCacheEmulation.java     |  430 ---------
+ .../apache/hadoop/mapred/gridmix/TestFilePool.java |  189 ----
+ .../hadoop/mapred/gridmix/TestFileQueue.java       |  143 ---
+ .../hadoop/mapred/gridmix/TestGridMixClasses.java  |  989 --------------------
+ .../mapred/gridmix/TestGridmixMemoryEmulation.java |  457 ---------
+ .../hadoop/mapred/gridmix/TestGridmixRecord.java   |  278 ------
+ .../mapred/gridmix/TestGridmixSubmission.java      |  203 ----
+ .../hadoop/mapred/gridmix/TestGridmixSummary.java  |  391 --------
+ .../hadoop/mapred/gridmix/TestHighRamJob.java      |  194 ----
+ .../apache/hadoop/mapred/gridmix/TestLoadJob.java  |   82 --
+ .../hadoop/mapred/gridmix/TestPseudoLocalFs.java   |  233 -----
+ .../hadoop/mapred/gridmix/TestRandomAlgorithm.java |  132 ---
+ .../gridmix/TestRandomTextDataGenerator.java       |   84 --
+ .../hadoop/mapred/gridmix/TestRecordFactory.java   |   81 --
+ .../mapred/gridmix/TestResourceUsageEmulators.java |  614 ------------
+ .../apache/hadoop/mapred/gridmix/TestSleepJob.java |  142 ---
+ .../hadoop/mapred/gridmix/TestUserResolve.java     |  172 ---
+ .../src/test/resources/data/wordcount.json         |  414 --------
+ .../src/test/resources/data/wordcount.json.gz      |  Bin
+ .../src/test/resources/data/wordcount2.json        |  828 -----------------
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 80 files changed, 19603 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-gridmix/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
+ delete mode 100755 hadoop-tools/hadoop-gridmix/src/main/shellprofile.d/hadoop-gridmix.sh
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/site/markdown/GridMix.md.vm
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/CommonJobTest.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestDistCacheEmulation.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestLoadJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz
+ delete mode 100644 hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount2.json
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 5d59374cbf0..f99ebc66e8a 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -81,21 +81,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-gridmix/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-gridmix/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-rumen/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 9d6f373a9a8..6015bb3ef10 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -630,11 +630,6 @@
+         <artifactId>hadoop-mapreduce-examples</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-gridmix</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+ 
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index c42c8756bd9..05c8f152a4d 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -193,7 +193,6 @@
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+-      <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+       <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+diff --git a/hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index cb043c4330e..00000000000
+--- a/hadoop-tools/hadoop-gridmix/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,40 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-
+- <!-- Ignore some irrelevant serialization warnings -->
+-  <Match>
+-    <Class name="org.apache.hadoop.mapred.gridmix.GridmixRecord$Comparator" />
+-    <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
+-  </Match>
+-
+-  <!-- The called methods actually might throw Exceptions -->
+-  <Match>
+-    <Class name="org.apache.hadoop.mapred.gridmix.ExecutionSummarizer"/>
+-    <Method name="processJobState"/>
+-    <Bug pattern="REC_CATCH_EXCEPTION"/>
+-    <Bug code="REC"/>
+-  </Match>
+-
+-  <!-- This has been done knowingly and meant to fool JVM so that it doesn't optimize code -->
+-  <Match>
+-    <Class name="org.apache.hadoop.mapred.gridmix.emulators.resourceusage.CumulativeCpuUsageEmulatorPlugin$DefaultCpuUsageEmulator"/>
+-    <Field name="returnValue"/>
+-    <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml
+deleted file mode 100644
+index 85d9254578d..00000000000
+--- a/hadoop-tools/hadoop-gridmix/pom.xml
++++ /dev/null
+@@ -1,199 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-gridmix</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Gridmix</description>
+-  <name>Apache Hadoop Gridmix</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-hs</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-rumen</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-     <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcprov-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcpkix-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-       <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-         <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-        <excludes>
+-        <exclude>src/test/resources/data/*</exclude>
+-        </excludes>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-         <configuration>
+-          <archive>
+-           <manifest>
+-            <mainClass>org.apache.hadoop.mapred.gridmix.Gridmix</mainClass>
+-           </manifest>
+-         </archive>
+-        </configuration>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
+deleted file mode 100644
+index 9ba6e9a7ad1..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * Given byte and record targets, emit roughly equal-sized records satisfying
+- * the contract.
+- */
+-class AvgRecordFactory extends RecordFactory {
+-
+-  /**
+-   * Percentage of record for key data.
+-   */
+-  public static final String GRIDMIX_KEY_FRC = "gridmix.key.fraction";
+-  public static final String GRIDMIX_MISSING_REC_SIZE = 
+-    "gridmix.missing.rec.size";
+-
+-
+-  private final long targetBytes;
+-  private final long targetRecords;
+-  private final long step;
+-  private final int avgrec;
+-  private final int keyLen;
+-  private long accBytes = 0L;
+-  private long accRecords = 0L;
+-  private int unspilledBytes = 0;
+-  private int minSpilledBytes = 0;
+-
+-  /**
+-   * @param targetBytes Expected byte count.
+-   * @param targetRecords Expected record count.
+-   * @param conf Used to resolve edge cases @see #GRIDMIX_KEY_FRC
+-   */
+-  public AvgRecordFactory(long targetBytes, long targetRecords,
+-      Configuration conf) {
+-    this(targetBytes, targetRecords, conf, 0);
+-  }
+-  
+-  /**
+-   * @param minSpilledBytes Minimum amount of data expected per record
+-   */
+-  public AvgRecordFactory(long targetBytes, long targetRecords,
+-      Configuration conf, int minSpilledBytes) {
+-    this.targetBytes = targetBytes;
+-    this.targetRecords = targetRecords <= 0 && this.targetBytes >= 0
+-      ? Math.max(1,
+-          this.targetBytes / conf.getInt(GRIDMIX_MISSING_REC_SIZE, 64 * 1024))
+-      : targetRecords;
+-    final long tmp = this.targetBytes / this.targetRecords;
+-    step = this.targetBytes - this.targetRecords * tmp;
+-    avgrec = (int) Math.min(Integer.MAX_VALUE, tmp + 1);
+-    keyLen = Math.max(1,
+-        (int)(tmp * Math.min(1.0f, conf.getFloat(GRIDMIX_KEY_FRC, 0.1f))));
+-    this.minSpilledBytes = minSpilledBytes;
+-  }
+-
+-  @Override
+-  public boolean next(GridmixKey key, GridmixRecord val) throws IOException {
+-    if (accBytes >= targetBytes) {
+-      return false;
+-    }
+-    final int reclen = accRecords++ >= step ? avgrec - 1 : avgrec;
+-    final int len = (int) Math.min(targetBytes - accBytes, reclen);
+-    
+-    unspilledBytes += len;
+-    
+-    // len != reclen?
+-    if (key != null) {
+-      if (unspilledBytes < minSpilledBytes && accRecords < targetRecords) {
+-        key.setSize(1);
+-        val.setSize(1);
+-        accBytes += key.getSize() + val.getSize();
+-        unspilledBytes -= (key.getSize() + val.getSize());
+-      } else {
+-        key.setSize(keyLen);
+-        val.setSize(unspilledBytes - key.getSize());
+-        accBytes += unspilledBytes;
+-        unspilledBytes = 0;
+-      }
+-    } else {
+-      if (unspilledBytes < minSpilledBytes && accRecords < targetRecords) {
+-        val.setSize(1);
+-        accBytes += val.getSize();
+-        unspilledBytes -= val.getSize();
+-      } else {
+-        val.setSize(unspilledBytes);
+-        accBytes += unspilledBytes;
+-        unspilledBytes = 0;
+-      }
+-    }
+-    return true;
+-  }
+-
+-  @Override
+-  public float getProgress() throws IOException {
+-    return Math.min(1.0f, accBytes / ((float)targetBytes));
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    // noop
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
+deleted file mode 100644
+index 16e4c3a3503..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ClusterSummarizer.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.commons.lang3.time.FastDateFormat;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-
+-/**
+- * Summarizes the Hadoop cluster used in this {@link Gridmix} run. 
+- * Statistics that are reported are
+- * <ul>
+- *   <li>Total number of active trackers in the cluster</li>
+- *   <li>Total number of blacklisted trackers in the cluster</li>
+- *   <li>Max map task capacity of the cluster</li>
+- *   <li>Max reduce task capacity of the cluster</li>
+- * </ul>
+- * 
+- * Apart from these statistics, {@link JobTracker} and {@link FileSystem} 
+- * addresses are also recorded in the summary.
+- */
+-class ClusterSummarizer implements StatListener<ClusterStats> {
+-  static final Logger LOG = LoggerFactory.getLogger(ClusterSummarizer.class);
+-  
+-  private int numBlacklistedTrackers;
+-  private int numActiveTrackers;
+-  private int maxMapTasks;
+-  private int maxReduceTasks;
+-  private String jobTrackerInfo = Summarizer.NA;
+-  private String namenodeInfo = Summarizer.NA;
+-  
+-  @Override
+-  @SuppressWarnings("deprecation")
+-  public void update(ClusterStats item) {
+-    try {
+-      numBlacklistedTrackers = item.getStatus().getBlacklistedTrackers();
+-      numActiveTrackers = item.getStatus().getTaskTrackers();
+-      maxMapTasks = item.getStatus().getMaxMapTasks();
+-      maxReduceTasks = item.getStatus().getMaxReduceTasks();
+-    } catch (Exception e) {
+-      long time = System.currentTimeMillis();
+-      LOG.info("Error in processing cluster status at " 
+-               + FastDateFormat.getInstance().format(time));
+-    }
+-  }
+-  
+-  /**
+-   * Summarizes the cluster used for this {@link Gridmix} run.
+-   */
+-  @Override
+-  public String toString() {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append("Cluster Summary:-");
+-    builder.append("\nJobTracker: ").append(getJobTrackerInfo());
+-    builder.append("\nFileSystem: ").append(getNamenodeInfo());
+-    builder.append("\nNumber of blacklisted trackers: ")
+-           .append(getNumBlacklistedTrackers());
+-    builder.append("\nNumber of active trackers: ")
+-           .append(getNumActiveTrackers());
+-    builder.append("\nMax map task capacity: ")
+-           .append(getMaxMapTasks());
+-    builder.append("\nMax reduce task capacity: ").append(getMaxReduceTasks());
+-    builder.append("\n\n");
+-    return builder.toString();
+-  }
+-  
+-  void start(Configuration conf) {
+-    jobTrackerInfo = conf.get(JTConfig.JT_IPC_ADDRESS);
+-    namenodeInfo = conf.getTrimmed(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY);
+-  }
+-  
+-  // Getters
+-  protected int getNumBlacklistedTrackers() {
+-    return numBlacklistedTrackers;
+-  }
+-  
+-  protected int getNumActiveTrackers() {
+-    return numActiveTrackers;
+-  }
+-  
+-  protected int getMaxMapTasks() {
+-    return maxMapTasks;
+-  }
+-  
+-  protected int getMaxReduceTasks() {
+-    return maxReduceTasks;
+-  }
+-  
+-  protected String getJobTrackerInfo() {
+-    return jobTrackerInfo;
+-  }
+-  
+-  protected String getNamenodeInfo() {
+-    return namenodeInfo;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java
+deleted file mode 100644
+index 99c621a3e92..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/CompressionEmulationUtil.java
++++ /dev/null
+@@ -1,600 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.nio.charset.Charset;
+-import java.nio.charset.StandardCharsets;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.compress.CodecPool;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.io.compress.CompressionInputStream;
+-import org.apache.hadoop.io.compress.Decompressor;
+-import org.apache.hadoop.io.compress.GzipCodec;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Utils;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.DataStatistics;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.GenDataFormat;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * This is a utility class for all the compression related modules.
+- */
+-class CompressionEmulationUtil {
+-  static final Logger LOG = LoggerFactory.getLogger(CompressionEmulationUtil.class);
+-  
+-  /**
+-   * Enable compression usage in GridMix runs.
+-   */
+-  private static final String COMPRESSION_EMULATION_ENABLE = 
+-    "gridmix.compression-emulation.enable";
+-  
+-  /**
+-   * Enable input data decompression.
+-   */
+-  private static final String INPUT_DECOMPRESSION_EMULATION_ENABLE = 
+-    "gridmix.compression-emulation.input-decompression.enable";
+-  
+-  /**
+-   * Configuration property for setting the compression ratio for map input 
+-   * data.
+-   */
+-  private static final String GRIDMIX_MAP_INPUT_COMPRESSION_RATIO = 
+-    "gridmix.compression-emulation.map-input.decompression-ratio";
+-  
+-  /**
+-   * Configuration property for setting the compression ratio of map output.
+-   */
+-  private static final String GRIDMIX_MAP_OUTPUT_COMPRESSION_RATIO = 
+-    "gridmix.compression-emulation.map-output.compression-ratio";
+-  
+-  /**
+-   * Configuration property for setting the compression ratio of job output.
+-   */
+-  private static final String GRIDMIX_JOB_OUTPUT_COMPRESSION_RATIO = 
+-    "gridmix.compression-emulation.job-output.compression-ratio";
+-  
+-  /**
+-   * Default compression ratio.
+-   */
+-  static final float DEFAULT_COMPRESSION_RATIO = 0.5F;
+-  
+-  private static final CompressionRatioLookupTable COMPRESSION_LOOKUP_TABLE = 
+-    new CompressionRatioLookupTable();
+-
+-  private static final Charset charsetUTF8 = StandardCharsets.UTF_8;
+-
+-  /**
+-   * This is a {@link Mapper} implementation for generating random text data.
+-   * It uses {@link RandomTextDataGenerator} for generating text data and the
+-   * output files are compressed.
+-   */
+-  public static class RandomTextDataMapper
+-  extends Mapper<NullWritable, LongWritable, Text, Text> {
+-    private RandomTextDataGenerator rtg;
+-
+-    @Override
+-    protected void setup(Context context)
+-        throws IOException, InterruptedException {
+-      Configuration conf = context.getConfiguration();
+-      int listSize = 
+-        RandomTextDataGenerator.getRandomTextDataGeneratorListSize(conf);
+-      int wordSize = 
+-        RandomTextDataGenerator.getRandomTextDataGeneratorWordSize(conf);
+-      rtg = new RandomTextDataGenerator(listSize, wordSize);
+-    }
+-    
+-    /**
+-     * Emits random words sequence of desired size. Note that the desired output
+-     * size is passed as the value parameter to this map.
+-     */
+-    @Override
+-    public void map(NullWritable key, LongWritable value, Context context)
+-    throws IOException, InterruptedException {
+-      //TODO Control the extra data written ..
+-      //TODO Should the key\tvalue\n be considered for measuring size?
+-      //     Can counters like BYTES_WRITTEN be used? What will be the value of
+-      //     such counters in LocalJobRunner?
+-      for (long bytes = value.get(); bytes > 0;) {
+-        String randomKey = rtg.getRandomWord();
+-        String randomValue = rtg.getRandomWord();
+-        context.write(new Text(randomKey), new Text(randomValue));
+-        bytes -= (randomValue.getBytes(charsetUTF8).length +
+-            randomKey.getBytes(charsetUTF8).length);
+-      }
+-    }
+-  }
+-  
+-  /**
+-   * Configure the {@link Job} for enabling compression emulation.
+-   */
+-  static void configure(final Job job) throws IOException, InterruptedException,
+-                                              ClassNotFoundException {
+-    // set the random text mapper
+-    job.setMapperClass(RandomTextDataMapper.class);
+-    job.setNumReduceTasks(0);
+-    job.setMapOutputKeyClass(Text.class);
+-    job.setMapOutputValueClass(Text.class);
+-    job.setInputFormatClass(GenDataFormat.class);
+-    job.setJarByClass(GenerateData.class);
+-
+-    // set the output compression true
+-    FileOutputFormat.setCompressOutput(job, true);
+-    try {
+-      FileInputFormat.addInputPath(job, new Path("ignored"));
+-    } catch (IOException e) {
+-      LOG.error("Error while adding input path ", e);
+-    }
+-  }
+-
+-  /**
+-   * This is the lookup table for mapping compression ratio to the size of the 
+-   * word in the {@link RandomTextDataGenerator}'s dictionary. 
+-   * 
+-   * Note that this table is computed (empirically) using a dictionary of 
+-   * default length i.e {@value RandomTextDataGenerator#DEFAULT_LIST_SIZE}.
+-   */
+-  private static class CompressionRatioLookupTable {
+-    private static Map<Float, Integer> map = new HashMap<Float, Integer>(60);
+-    private static final float MIN_RATIO = 0.07F;
+-    private static final float MAX_RATIO = 0.68F;
+-    
+-    // add the empirically obtained data points in the lookup table
+-    CompressionRatioLookupTable() {
+-      map.put(.07F,30);
+-      map.put(.08F,25);
+-      map.put(.09F,60);
+-      map.put(.10F,20);
+-      map.put(.11F,70);
+-      map.put(.12F,15);
+-      map.put(.13F,80);
+-      map.put(.14F,85);
+-      map.put(.15F,90);
+-      map.put(.16F,95);
+-      map.put(.17F,100);
+-      map.put(.18F,105);
+-      map.put(.19F,110);
+-      map.put(.20F,115);
+-      map.put(.21F,120);
+-      map.put(.22F,125);
+-      map.put(.23F,130);
+-      map.put(.24F,140);
+-      map.put(.25F,145);
+-      map.put(.26F,150);
+-      map.put(.27F,155);
+-      map.put(.28F,160);
+-      map.put(.29F,170);
+-      map.put(.30F,175);
+-      map.put(.31F,180);
+-      map.put(.32F,190);
+-      map.put(.33F,195);
+-      map.put(.34F,205);
+-      map.put(.35F,215);
+-      map.put(.36F,225);
+-      map.put(.37F,230);
+-      map.put(.38F,240);
+-      map.put(.39F,250);
+-      map.put(.40F,260);
+-      map.put(.41F,270);
+-      map.put(.42F,280);
+-      map.put(.43F,295);
+-      map.put(.44F,310);
+-      map.put(.45F,325);
+-      map.put(.46F,335);
+-      map.put(.47F,355);
+-      map.put(.48F,375);
+-      map.put(.49F,395);
+-      map.put(.50F,420);
+-      map.put(.51F,440);
+-      map.put(.52F,465);
+-      map.put(.53F,500);
+-      map.put(.54F,525);
+-      map.put(.55F,550);
+-      map.put(.56F,600);
+-      map.put(.57F,640);
+-      map.put(.58F,680);
+-      map.put(.59F,734);
+-      map.put(.60F,813);
+-      map.put(.61F,905);
+-      map.put(.62F,1000);
+-      map.put(.63F,1055);
+-      map.put(.64F,1160);
+-      map.put(.65F,1355);
+-      map.put(.66F,1510);
+-      map.put(.67F,1805);
+-      map.put(.68F,2170);
+-    }
+-    
+-    /**
+-     * Returns the size of the word in {@link RandomTextDataGenerator}'s 
+-     * dictionary that can generate text with the desired compression ratio.
+-     * 
+-     * @throws RuntimeException If ratio is less than {@value #MIN_RATIO} or 
+-     *                          greater than {@value #MAX_RATIO}.
+-     */
+-    int getWordSizeForRatio(float ratio) {
+-      ratio = standardizeCompressionRatio(ratio);
+-      if (ratio >= MIN_RATIO && ratio <= MAX_RATIO) {
+-        return map.get(ratio);
+-      } else {
+-        throw new RuntimeException("Compression ratio should be in the range [" 
+-          + MIN_RATIO + "," + MAX_RATIO + "]. Configured compression ratio is " 
+-          + ratio + ".");
+-      }
+-    }
+-  }
+-  
+-  /**
+-   * Setup the data generator's configuration to generate compressible random 
+-   * text data with the desired compression ratio.
+-   * Note that the compression ratio, if configured, will set the 
+-   * {@link RandomTextDataGenerator}'s list-size and word-size based on 
+-   * empirical values using the compression ratio set in the configuration. 
+-   * 
+-   * Hence to achieve the desired compression ratio, 
+-   * {@link RandomTextDataGenerator}'s list-size will be set to the default 
+-   * value i.e {@value RandomTextDataGenerator#DEFAULT_LIST_SIZE}.
+-   */
+-  static void setupDataGeneratorConfig(Configuration conf) {
+-    boolean compress = isCompressionEmulationEnabled(conf);
+-    if (compress) {
+-      float ratio = getMapInputCompressionEmulationRatio(conf);
+-      LOG.info("GridMix is configured to generate compressed input data with "
+-               + " a compression ratio of " + ratio);
+-      int wordSize = COMPRESSION_LOOKUP_TABLE.getWordSizeForRatio(ratio);
+-      RandomTextDataGenerator.setRandomTextDataGeneratorWordSize(conf, 
+-                                                                 wordSize);
+-
+-      // since the compression ratios are computed using the default value of 
+-      // list size
+-      RandomTextDataGenerator.setRandomTextDataGeneratorListSize(conf, 
+-          RandomTextDataGenerator.DEFAULT_LIST_SIZE);
+-    }
+-  }
+-  
+-  /**
+-   * Returns a {@link RandomTextDataGenerator} that generates random 
+-   * compressible text with the desired compression ratio.
+-   */
+-  static RandomTextDataGenerator getRandomTextDataGenerator(float ratio, 
+-                                                            long seed) {
+-    int wordSize = COMPRESSION_LOOKUP_TABLE.getWordSizeForRatio(ratio);
+-    RandomTextDataGenerator rtg = 
+-      new RandomTextDataGenerator(RandomTextDataGenerator.DEFAULT_LIST_SIZE, 
+-            seed, wordSize);
+-    return rtg;
+-  }
+-  
+-  /** Publishes compression related data statistics. Following statistics are
+-   * published
+-   * <ul>
+-   *   <li>Total compressed input data size</li>
+-   *   <li>Number of compressed input data files</li>
+-   *   <li>Compression Ratio</li>
+-   *   <li>Text data dictionary size</li>
+-   *   <li>Random text word size</li>
+-   * </ul>
+-   */
+-  static DataStatistics publishCompressedDataStatistics(Path inputDir, 
+-                          Configuration conf, long uncompressedDataSize) 
+-  throws IOException {
+-    FileSystem fs = inputDir.getFileSystem(conf);
+-    CompressionCodecFactory compressionCodecs = 
+-      new CompressionCodecFactory(conf);
+-
+-    // iterate over compressed files and sum up the compressed file sizes
+-    long compressedDataSize = 0;
+-    int numCompressedFiles = 0;
+-    // obtain input data file statuses
+-    FileStatus[] outFileStatuses = 
+-      fs.listStatus(inputDir, new Utils.OutputFileUtils.OutputFilesFilter());
+-    for (FileStatus status : outFileStatuses) {
+-      // check if the input file is compressed
+-      if (compressionCodecs != null) {
+-        CompressionCodec codec = compressionCodecs.getCodec(status.getPath());
+-        if (codec != null) {
+-          ++numCompressedFiles;
+-          compressedDataSize += status.getLen();
+-        }
+-      }
+-    }
+-
+-    LOG.info("Gridmix is configured to use compressed input data.");
+-    // publish the input data size
+-    LOG.info("Total size of compressed input data : " 
+-             + StringUtils.humanReadableInt(compressedDataSize));
+-    LOG.info("Total number of compressed input data files : " 
+-             + numCompressedFiles);
+-
+-    if (numCompressedFiles == 0) {
+-      throw new RuntimeException("No compressed file found in the input" 
+-          + " directory : " + inputDir.toString() + ". To enable compression"
+-          + " emulation, run Gridmix either with "
+-          + " an input directory containing compressed input file(s) or" 
+-          + " use the -generate option to (re)generate it. If compression"
+-          + " emulation is not desired, disable it by setting '" 
+-          + COMPRESSION_EMULATION_ENABLE + "' to 'false'.");
+-    }
+-    
+-    // publish compression ratio only if its generated in this gridmix run
+-    if (uncompressedDataSize > 0) {
+-      // compute the compression ratio
+-      double ratio = ((double)compressedDataSize) / uncompressedDataSize;
+-
+-      // publish the compression ratio
+-      LOG.info("Input Data Compression Ratio : " + ratio);
+-    }
+-    
+-    return new DataStatistics(compressedDataSize, numCompressedFiles, true);
+-  }
+-  
+-  /**
+-   * Enables/Disables compression emulation.
+-   * @param conf Target configuration where the parameter 
+-   * {@value #COMPRESSION_EMULATION_ENABLE} will be set. 
+-   * @param val The value to be set.
+-   */
+-  static void setCompressionEmulationEnabled(Configuration conf, boolean val) {
+-    conf.setBoolean(COMPRESSION_EMULATION_ENABLE, val);
+-  }
+-  
+-  /**
+-   * Checks if compression emulation is enabled or not. Default is {@code true}.
+-   */
+-  static boolean isCompressionEmulationEnabled(Configuration conf) {
+-    return conf.getBoolean(COMPRESSION_EMULATION_ENABLE, true);
+-  }
+-  
+-  /**
+-   * Enables/Disables input decompression emulation.
+-   * @param conf Target configuration where the parameter 
+-   * {@value #INPUT_DECOMPRESSION_EMULATION_ENABLE} will be set. 
+-   * @param val The value to be set.
+-   */
+-  static void setInputCompressionEmulationEnabled(Configuration conf, 
+-                                                  boolean val) {
+-    conf.setBoolean(INPUT_DECOMPRESSION_EMULATION_ENABLE, val);
+-  }
+-  
+-  /**
+-   * Check if input decompression emulation is enabled or not. 
+-   * Default is {@code false}.
+-   */
+-  static boolean isInputCompressionEmulationEnabled(Configuration conf) {
+-    return conf.getBoolean(INPUT_DECOMPRESSION_EMULATION_ENABLE, false);
+-  }
+-  
+-  /**
+-   * Set the map input data compression ratio in the given conf.
+-   */
+-  static void setMapInputCompressionEmulationRatio(Configuration conf, 
+-                                                   float ratio) {
+-    conf.setFloat(GRIDMIX_MAP_INPUT_COMPRESSION_RATIO, ratio);
+-  }
+-  
+-  /**
+-   * Get the map input data compression ratio using the given configuration.
+-   * If the compression ratio is not set in the configuration then use the 
+-   * default value i.e {@value #DEFAULT_COMPRESSION_RATIO}.
+-   */
+-  static float getMapInputCompressionEmulationRatio(Configuration conf) {
+-    return conf.getFloat(GRIDMIX_MAP_INPUT_COMPRESSION_RATIO, 
+-                         DEFAULT_COMPRESSION_RATIO);
+-  }
+-  
+-  /**
+-   * Set the map output data compression ratio in the given configuration.
+-   */
+-  static void setMapOutputCompressionEmulationRatio(Configuration conf, 
+-                                                    float ratio) {
+-    conf.setFloat(GRIDMIX_MAP_OUTPUT_COMPRESSION_RATIO, ratio);
+-  }
+-  
+-  /**
+-   * Get the map output data compression ratio using the given configuration.
+-   * If the compression ratio is not set in the configuration then use the 
+-   * default value i.e {@value #DEFAULT_COMPRESSION_RATIO}.
+-   */
+-  static float getMapOutputCompressionEmulationRatio(Configuration conf) {
+-    return conf.getFloat(GRIDMIX_MAP_OUTPUT_COMPRESSION_RATIO, 
+-                         DEFAULT_COMPRESSION_RATIO);
+-  }
+-  
+-  /**
+-   * Set the job output data compression ratio in the given configuration.
+-   */
+-  static void setJobOutputCompressionEmulationRatio(Configuration conf, 
+-                                                    float ratio) {
+-    conf.setFloat(GRIDMIX_JOB_OUTPUT_COMPRESSION_RATIO, ratio);
+-  }
+-  
+-  /**
+-   * Get the job output data compression ratio using the given configuration.
+-   * If the compression ratio is not set in the configuration then use the 
+-   * default value i.e {@value #DEFAULT_COMPRESSION_RATIO}.
+-   */
+-  static float getJobOutputCompressionEmulationRatio(Configuration conf) {
+-    return conf.getFloat(GRIDMIX_JOB_OUTPUT_COMPRESSION_RATIO, 
+-                         DEFAULT_COMPRESSION_RATIO);
+-  }
+-  
+-  /**
+-   * Standardize the compression ratio i.e round off the compression ratio to
+-   * only 2 significant digits.
+-   */
+-  static float standardizeCompressionRatio(float ratio) {
+-    // round off to 2 significant digits
+-    int significant = (int)Math.round(ratio * 100);
+-    return ((float)significant)/100;
+-  }
+-  
+-  /**
+-   * Returns a {@link InputStream} for a file that might be compressed.
+-   */
+-  static InputStream getPossiblyDecompressedInputStream(Path file, 
+-                                                        Configuration conf,
+-                                                        long offset)
+-  throws IOException {
+-    FileSystem fs = file.getFileSystem(conf);
+-    if (isCompressionEmulationEnabled(conf)
+-        && isInputCompressionEmulationEnabled(conf)) {
+-      CompressionCodecFactory compressionCodecs = 
+-        new CompressionCodecFactory(conf);
+-      CompressionCodec codec = compressionCodecs.getCodec(file);
+-      if (codec != null) {
+-        Decompressor decompressor = CodecPool.getDecompressor(codec);
+-        if (decompressor != null) {
+-          CompressionInputStream in = 
+-            codec.createInputStream(fs.open(file), decompressor);
+-          //TODO Seek doesnt work with compressed input stream. 
+-          //     Use SplittableCompressionCodec?
+-          return (InputStream)in;
+-        }
+-      }
+-    }
+-    FSDataInputStream in = fs.open(file);
+-    in.seek(offset);
+-    return (InputStream)in;
+-  }
+-  
+-  /**
+-   * Returns a {@link OutputStream} for a file that might need 
+-   * compression.
+-   */
+-  static OutputStream getPossiblyCompressedOutputStream(Path file, 
+-                                                        Configuration conf)
+-  throws IOException {
+-    FileSystem fs = file.getFileSystem(conf);
+-    JobConf jConf = new JobConf(conf);
+-    if (org.apache.hadoop.mapred.FileOutputFormat.getCompressOutput(jConf)) {
+-      // get the codec class
+-      Class<? extends CompressionCodec> codecClass =
+-        org.apache.hadoop.mapred.FileOutputFormat
+-                                .getOutputCompressorClass(jConf, 
+-                                                          GzipCodec.class);
+-      // get the codec implementation
+-      CompressionCodec codec = ReflectionUtils.newInstance(codecClass, conf);
+-
+-      // add the appropriate extension
+-      file = file.suffix(codec.getDefaultExtension());
+-
+-      if (isCompressionEmulationEnabled(conf)) {
+-        FSDataOutputStream fileOut = fs.create(file, false);
+-        return new DataOutputStream(codec.createOutputStream(fileOut));
+-      }
+-    }
+-    return fs.create(file, false);
+-  }
+-  
+-  /**
+-   * Extracts compression/decompression related configuration parameters from 
+-   * the source configuration to the target configuration.
+-   */
+-  static void configureCompressionEmulation(Configuration source, 
+-                                            Configuration target) {
+-    // enable output compression
+-    target.setBoolean(FileOutputFormat.COMPRESS, 
+-        source.getBoolean(FileOutputFormat.COMPRESS, false));
+-
+-    // set the job output compression codec
+-    String jobOutputCompressionCodec = 
+-      source.get(FileOutputFormat.COMPRESS_CODEC);
+-    if (jobOutputCompressionCodec != null) {
+-      target.set(FileOutputFormat.COMPRESS_CODEC, jobOutputCompressionCodec);
+-    }
+-
+-    // set the job output compression type
+-    String jobOutputCompressionType = 
+-      source.get(FileOutputFormat.COMPRESS_TYPE);
+-    if (jobOutputCompressionType != null) {
+-      target.set(FileOutputFormat.COMPRESS_TYPE, jobOutputCompressionType);
+-    }
+-
+-    // enable map output compression
+-    target.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS,
+-        source.getBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, false));
+-
+-    // set the map output compression codecs
+-    String mapOutputCompressionCodec = 
+-      source.get(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC);
+-    if (mapOutputCompressionCodec != null) {
+-      target.set(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC, 
+-                 mapOutputCompressionCodec);
+-    }
+-
+-    // enable input decompression
+-    //TODO replace with mapInputBytes and hdfsBytesRead
+-    Path[] inputs = 
+-      org.apache.hadoop.mapred.FileInputFormat
+-         .getInputPaths(new JobConf(source));
+-    boolean needsCompressedInput = false;
+-    CompressionCodecFactory compressionCodecs = 
+-      new CompressionCodecFactory(source);
+-    for (Path input : inputs) {
+-      CompressionCodec codec = compressionCodecs.getCodec(input);
+-      if (codec != null) {
+-        needsCompressedInput = true;
+-      }
+-    }
+-    setInputCompressionEmulationEnabled(target, needsCompressedInput);
+-  }
+-
+-  /**
+-   * Get the uncompressed input bytes count from the given possibly compressed
+-   * input bytes count.
+-   * @param possiblyCompressedInputBytes input bytes count. This is compressed
+-   *        input size if compression emulation is on.
+-   * @param conf configuration of the Gridmix simulated job
+-   * @return uncompressed input bytes count. Compute this in case if compressed
+-   *         input was used
+-   */
+-  static long getUncompressedInputBytes(long possiblyCompressedInputBytes,
+-                                        Configuration conf) {
+-    long uncompressedInputBytes = possiblyCompressedInputBytes;
+-
+-    if (CompressionEmulationUtil.isInputCompressionEmulationEnabled(conf)) {
+-      float inputCompressionRatio =
+-          CompressionEmulationUtil.getMapInputCompressionEmulationRatio(conf);
+-      uncompressedInputBytes /= inputCompressionRatio;
+-    }
+-    return uncompressedInputBytes;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java
+deleted file mode 100644
+index a6f986ce260..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/DistributedCacheEmulator.java
++++ /dev/null
+@@ -1,551 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configuration.DeprecationDelta;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.MD5Hash;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.charset.Charset;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.Comparator;
+-import java.util.HashMap;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * Emulation of Distributed Cache Usage in gridmix.
+- * <br> Emulation of Distributed Cache Load in gridmix will put load on
+- * TaskTrackers and affects execution time of tasks because of localization of
+- * distributed cache files by TaskTrackers.
+- * <br> Gridmix creates distributed cache files for simulated jobs by launching
+- * a MapReduce job {@link GenerateDistCacheData} in advance i.e. before
+- * launching simulated jobs.
+- * <br> The distributed cache file paths used in the original cluster are mapped
+- * to unique file names in the simulated cluster.
+- * <br> All HDFS-based distributed cache files generated by gridmix are
+- * public distributed cache files. But Gridmix makes sure that load incurred due
+- * to localization of private distributed cache files on the original cluster
+- * is also faithfully simulated. Gridmix emulates the load due to private
+- * distributed cache files by mapping private distributed cache files of
+- * different users in the original cluster to different public distributed cache
+- * files in the simulated cluster.
+- *
+- * <br> The configuration properties like
+- * {@link MRJobConfig#CACHE_FILES}, {@link MRJobConfig#CACHE_FILE_VISIBILITIES},
+- * {@link MRJobConfig#CACHE_FILES_SIZES} and
+- * {@link MRJobConfig#CACHE_FILE_TIMESTAMPS} obtained from trace are used to
+- *  decide
+- * <li> file size of each distributed cache file to be generated
+- * <li> whether a distributed cache file is already seen in this trace file
+- * <li> whether a distributed cache file was considered public or private.
+- * <br>
+- * <br> Gridmix configures these generated files as distributed cache files for
+- * the simulated jobs.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Evolving
+-class DistributedCacheEmulator {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DistributedCacheEmulator.class);
+-
+-  static final long AVG_BYTES_PER_MAP = 128 * 1024 * 1024L;// 128MB
+-
+-  private Path distCachePath;
+-
+-  /**
+-   * Map between simulated cluster's distributed cache file paths and their
+-   * file sizes. Unique distributed cache files are entered into this map.
+-   * 2 distributed cache files are considered same if and only if their
+-   * file paths, visibilities and timestamps are same.
+-   */
+-  private Map<String, Long> distCacheFiles = new HashMap<String, Long>();
+-
+-  /**
+-   * Configuration property for whether gridmix should emulate
+-   * distributed cache usage or not. Default value is true.
+-   */
+-  static final String GRIDMIX_EMULATE_DISTRIBUTEDCACHE =
+-      "gridmix.distributed-cache-emulation.enable";
+-
+-  // Whether to emulate distributed cache usage or not
+-  boolean emulateDistributedCache = true;
+-
+-  // Whether to generate distributed cache data or not
+-  boolean generateDistCacheData = false;
+-
+-  Configuration conf; // gridmix configuration
+-
+-  private static final Charset charsetUTF8 = StandardCharsets.UTF_8;
+-
+-  // Pseudo local file system where local FS based distributed cache files are
+-  // created by gridmix.
+-  FileSystem pseudoLocalFs = null;
+-
+-  {
+-    // Need to handle deprecation of these MapReduce-internal configuration
+-    // properties as MapReduce doesn't handle their deprecation.
+-    Configuration.addDeprecations(new DeprecationDelta[] {
+-      new DeprecationDelta("mapred.cache.files.filesizes",
+-          MRJobConfig.CACHE_FILES_SIZES),
+-      new DeprecationDelta("mapred.cache.files.visibilities",
+-          MRJobConfig.CACHE_FILE_VISIBILITIES)
+-    });
+-  }
+-
+-  /**
+-   * @param conf gridmix configuration
+-   * @param ioPath &lt;ioPath&gt;/distributedCache/ is the gridmix Distributed
+-   *               Cache directory
+-   */
+-  public DistributedCacheEmulator(Configuration conf, Path ioPath) {
+-    this.conf = conf;
+-    distCachePath = new Path(ioPath, "distributedCache");
+-    this.conf.setClass("fs.pseudo.impl", PseudoLocalFs.class, FileSystem.class);
+-  }
+-
+-  /**
+-   * This is to be called before any other method of DistributedCacheEmulator.
+-   * <br> Checks if emulation of distributed cache load is needed and is feasible.
+-   *  Sets the flags generateDistCacheData and emulateDistributedCache to the
+-   *  appropriate values.
+-   * <br> Gridmix does not emulate distributed cache load if
+-   * <ol><li> the specific gridmix job type doesn't need emulation of
+-   * distributed cache load OR
+-   * <li> the trace is coming from a stream instead of file OR
+-   * <li> the distributed cache dir where distributed cache data is to be
+-   * generated by gridmix is on local file system OR
+-   * <li> execute permission is not there for any of the ascendant directories
+-   * of &lt;ioPath&gt; till root. This is because for emulation of distributed
+-   * cache load, distributed cache files created under
+-   * &lt;ioPath/distributedCache/&gt; should be considered by hadoop
+-   * as public distributed cache files.
+-   * <li> creation of pseudo local file system fails.</ol>
+-   * <br> For (2), (3), (4) and (5), generation of distributed cache data
+-   * is also disabled.
+-   * 
+-   * @param traceIn trace file path. If this is '-', then trace comes from the
+-   *                stream stdin.
+-   * @param jobCreator job creator of gridmix jobs of a specific type
+-   * @param generate  true if -generate option was specified
+-   * @throws IOException
+-   */
+-  void init(String traceIn, JobCreator jobCreator, boolean generate)
+-      throws IOException {
+-    emulateDistributedCache = jobCreator.canEmulateDistCacheLoad()
+-        && conf.getBoolean(GRIDMIX_EMULATE_DISTRIBUTEDCACHE, true);
+-    generateDistCacheData = generate;
+-
+-    if (generateDistCacheData || emulateDistributedCache) {
+-      if ("-".equals(traceIn)) {// trace is from stdin
+-        LOG.warn("Gridmix will not emulate Distributed Cache load because "
+-            + "the input trace source is a stream instead of file.");
+-        emulateDistributedCache = generateDistCacheData = false;
+-      } else if (FileSystem.getLocal(conf).getUri().getScheme().equals(
+-          distCachePath.toUri().getScheme())) {// local FS
+-        LOG.warn("Gridmix will not emulate Distributed Cache load because "
+-            + "<iopath> provided is on local file system.");
+-        emulateDistributedCache = generateDistCacheData = false;
+-      } else {
+-        // Check if execute permission is there for all the ascendant
+-        // directories of distCachePath till root.
+-        FileSystem fs = FileSystem.get(conf);
+-        Path cur = distCachePath.getParent();
+-        while (cur != null) {
+-          if (cur.toString().length() > 0) {
+-            FsPermission perm = fs.getFileStatus(cur).getPermission();
+-            if (!perm.getOtherAction().and(FsAction.EXECUTE).equals(
+-                FsAction.EXECUTE)) {
+-              LOG.warn("Gridmix will not emulate Distributed Cache load "
+-                  + "because the ascendant directory (of distributed cache "
+-                  + "directory) " + cur + " doesn't have execute permission "
+-                  + "for others.");
+-              emulateDistributedCache = generateDistCacheData = false;
+-              break;
+-            }
+-          }
+-          cur = cur.getParent();
+-        }
+-      }
+-    }
+-
+-    // Check if pseudo local file system can be created
+-    try {
+-      pseudoLocalFs = FileSystem.get(new URI("pseudo:///"), conf);
+-    } catch (URISyntaxException e) {
+-      LOG.warn("Gridmix will not emulate Distributed Cache load because "
+-          + "creation of pseudo local file system failed.");
+-      e.printStackTrace();
+-      emulateDistributedCache = generateDistCacheData = false;
+-      return;
+-    }
+-  }
+-
+-  /**
+-   * @return true if gridmix should emulate distributed cache load
+-   */
+-  boolean shouldEmulateDistCacheLoad() {
+-    return emulateDistributedCache;
+-  }
+-
+-  /**
+-   * @return true if gridmix should generate distributed cache data
+-   */
+-  boolean shouldGenerateDistCacheData() {
+-    return generateDistCacheData;
+-  }
+-
+-  /**
+-   * @return the distributed cache directory path
+-   */
+-  Path getDistributedCacheDir() {
+-    return distCachePath;
+-  }
+-
+-  /**
+-   * Create distributed cache directories.
+-   * Also create a file that contains the list of distributed cache files
+-   * that will be used as distributed cache files for all the simulated jobs.
+-   * @param jsp job story producer for the trace
+-   * @return exit code
+-   * @throws IOException
+-   */
+-  int setupGenerateDistCacheData(JobStoryProducer jsp)
+-      throws IOException {
+-
+-    createDistCacheDirectory();
+-    return buildDistCacheFilesList(jsp);
+-  }
+-
+-  /**
+-   * Create distributed cache directory where distributed cache files will be
+-   * created by the MapReduce job {@link GenerateDistCacheData#JOB_NAME}.
+-   * @throws IOException
+-   */
+-  private void createDistCacheDirectory() throws IOException {
+-    FileSystem fs = FileSystem.get(conf);
+-    FileSystem.mkdirs(fs, distCachePath, new FsPermission((short) 0777));
+-  }
+-
+-  /**
+-   * Create the list of unique distributed cache files needed for all the
+-   * simulated jobs and write the list to a special file.
+-   * @param jsp job story producer for the trace
+-   * @return exit code
+-   * @throws IOException
+-   */
+-  private int buildDistCacheFilesList(JobStoryProducer jsp) throws IOException {
+-    // Read all the jobs from the trace file and build the list of unique
+-    // distributed cache files.
+-    JobStory jobStory;
+-    while ((jobStory = jsp.getNextJob()) != null) {
+-      if (jobStory.getOutcome() == Pre21JobHistoryConstants.Values.SUCCESS && 
+-         jobStory.getSubmissionTime() >= 0) {
+-        updateHDFSDistCacheFilesList(jobStory);
+-      }
+-    }
+-    jsp.close();
+-
+-    return writeDistCacheFilesList();
+-  }
+-
+-  /**
+-   * For the job to be simulated, identify the needed distributed cache files by
+-   * mapping original cluster's distributed cache file paths to the simulated cluster's
+-   * paths and add these paths in the map {@code distCacheFiles}.
+-   *<br>
+-   * JobStory should contain distributed cache related properties like
+-   * <li> {@link MRJobConfig#CACHE_FILES}
+-   * <li> {@link MRJobConfig#CACHE_FILE_VISIBILITIES}
+-   * <li> {@link MRJobConfig#CACHE_FILES_SIZES}
+-   * <li> {@link MRJobConfig#CACHE_FILE_TIMESTAMPS}
+-   * <li> {@link MRJobConfig#CLASSPATH_FILES}
+-   *
+-   * <li> {@link MRJobConfig#CACHE_ARCHIVES}
+-   * <li> {@link MRJobConfig#CACHE_ARCHIVES_VISIBILITIES}
+-   * <li> {@link MRJobConfig#CACHE_ARCHIVES_SIZES}
+-   * <li> {@link MRJobConfig#CACHE_ARCHIVES_TIMESTAMPS}
+-   * <li> {@link MRJobConfig#CLASSPATH_ARCHIVES}
+-   *
+-   * <li> {@link MRJobConfig#CACHE_SYMLINK}
+-   *
+-   * @param jobdesc JobStory of original job obtained from trace
+-   * @throws IOException
+-   */
+-  void updateHDFSDistCacheFilesList(JobStory jobdesc) throws IOException {
+-
+-    // Map original job's distributed cache file paths to simulated cluster's
+-    // paths, to be used by this simulated job.
+-    JobConf jobConf = jobdesc.getJobConf();
+-
+-    String[] files = jobConf.getStrings(MRJobConfig.CACHE_FILES);
+-    if (files != null) {
+-
+-      String[] fileSizes = jobConf.getStrings(MRJobConfig.CACHE_FILES_SIZES);
+-      String[] visibilities =
+-        jobConf.getStrings(MRJobConfig.CACHE_FILE_VISIBILITIES);
+-      String[] timeStamps =
+-        jobConf.getStrings(MRJobConfig.CACHE_FILE_TIMESTAMPS);
+-
+-      FileSystem fs = FileSystem.get(conf);
+-      String user = jobConf.getUser();
+-      for (int i = 0; i < files.length; i++) {
+-        // Check if visibilities are available because older hadoop versions
+-        // didn't have public, private Distributed Caches separately.
+-        boolean visibility =
+-            (visibilities == null) || Boolean.parseBoolean(visibilities[i]);
+-        if (isLocalDistCacheFile(files[i], user, visibility)) {
+-          // local FS based distributed cache file.
+-          // Create this file on the pseudo local FS on the fly (i.e. when the
+-          // simulated job is submitted).
+-          continue;
+-        }
+-        // distributed cache file on hdfs
+-        String mappedPath = mapDistCacheFilePath(files[i], timeStamps[i],
+-                                                 visibility, user);
+-
+-        // No need to add a distributed cache file path to the list if
+-        // (1) the mapped path is already there in the list OR
+-        // (2) the file with the mapped path already exists.
+-        // In any of the above 2 cases, file paths, timestamps, file sizes and
+-        // visibilities match. File sizes should match if file paths and
+-        // timestamps match because single file path with single timestamp
+-        // should correspond to a single file size.
+-        if (distCacheFiles.containsKey(mappedPath) ||
+-            fs.exists(new Path(mappedPath))) {
+-          continue;
+-        }
+-        distCacheFiles.put(mappedPath, Long.valueOf(fileSizes[i]));
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Check if the file path provided was constructed by MapReduce for a
+-   * distributed cache file on local file system.
+-   * @param filePath path of the distributed cache file
+-   * @param user job submitter of the job for which &lt;filePath&gt; is a
+-   *             distributed cache file
+-   * @param visibility <code>true</code> for public distributed cache file
+-   * @return true if the path provided is of a local file system based
+-   *              distributed cache file
+-   */
+-  static boolean isLocalDistCacheFile(String filePath, String user,
+-                                       boolean visibility) {
+-    return (!visibility && filePath.contains(user + "/.staging"));
+-  }
+-
+-  /**
+-   * Map the HDFS based distributed cache file path from original cluster to
+-   * a unique file name on the simulated cluster.
+-   * <br> Unique  distributed file names on simulated cluster are generated
+-   * using original cluster's <li>file path, <li>timestamp and <li> the
+-   * job-submitter for private distributed cache file.
+-   * <br> This implies that if on original cluster, a single HDFS file
+-   * considered as two private distributed cache files for two jobs of
+-   * different users, then the corresponding simulated jobs will have two
+-   * different files of the same size in public distributed cache, one for each
+-   * user. Both these simulated jobs will not share these distributed cache
+-   * files, thus leading to the same load as seen in the original cluster.
+-   * @param file distributed cache file path
+-   * @param timeStamp time stamp of dist cachce file
+-   * @param isPublic true if this distributed cache file is a public
+-   *                 distributed cache file
+-   * @param user job submitter on original cluster
+-   * @return the mapped path on simulated cluster
+-   */
+-  private String mapDistCacheFilePath(String file, String timeStamp,
+-      boolean isPublic, String user) {
+-    String id = file + timeStamp;
+-    if (!isPublic) {
+-      // consider job-submitter for private distributed cache file
+-      id = id.concat(user);
+-    }
+-    return new Path(distCachePath, MD5Hash.digest(id).toString()).toUri()
+-               .getPath();
+-  }
+-
+-  /**
+-   * Write the list of distributed cache files in the decreasing order of
+-   * file sizes into the sequence file. This file will be input to the job
+-   * {@link GenerateDistCacheData}.
+-   * Also validates if -generate option is missing and distributed cache files
+-   * are missing.
+-   * @return exit code
+-   * @throws IOException
+-   */
+-  private int writeDistCacheFilesList()
+-      throws IOException {
+-    // Sort the distributed cache files in the decreasing order of file sizes.
+-    List dcFiles = new ArrayList(distCacheFiles.entrySet());
+-    Collections.sort(dcFiles, new Comparator() {
+-      public int compare(Object dc1, Object dc2) {
+-        return ((Comparable) ((Map.Entry) (dc2)).getValue())
+-            .compareTo(((Map.Entry) (dc1)).getValue());
+-      }
+-    });
+-
+-    // write the sorted distributed cache files to the sequence file
+-    FileSystem fs = FileSystem.get(conf);
+-    Path distCacheFilesList = new Path(distCachePath, "_distCacheFiles.txt");
+-    conf.set(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_LIST,
+-        distCacheFilesList.toString());
+-    SequenceFile.Writer src_writer = SequenceFile.createWriter(fs, conf,
+-        distCacheFilesList, LongWritable.class, BytesWritable.class,
+-        SequenceFile.CompressionType.NONE);
+-
+-    // Total number of unique distributed cache files
+-    int fileCount = dcFiles.size();
+-    long byteCount = 0;// Total size of all distributed cache files
+-    long bytesSync = 0;// Bytes after previous sync;used to add sync marker
+-
+-    for (Iterator it = dcFiles.iterator(); it.hasNext();) {
+-      Map.Entry entry = (Map.Entry)it.next();
+-      LongWritable fileSize =
+-          new LongWritable(Long.parseLong(entry.getValue().toString()));
+-      BytesWritable filePath =
+-          new BytesWritable(
+-          entry.getKey().toString().getBytes(charsetUTF8));
+-
+-      byteCount += fileSize.get();
+-      bytesSync += fileSize.get();
+-      if (bytesSync > AVG_BYTES_PER_MAP) {
+-        src_writer.sync();
+-        bytesSync = fileSize.get();
+-      }
+-      src_writer.append(fileSize, filePath);
+-    }
+-    if (src_writer != null) {
+-      src_writer.close();
+-    }
+-    // Set delete on exit for 'dist cache files list' as it is not needed later.
+-    fs.deleteOnExit(distCacheFilesList);
+-
+-    conf.setInt(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_COUNT, fileCount);
+-    conf.setLong(GenerateDistCacheData.GRIDMIX_DISTCACHE_BYTE_COUNT, byteCount);
+-    LOG.info("Number of HDFS based distributed cache files to be generated is "
+-        + fileCount + ". Total size of HDFS based distributed cache files "
+-        + "to be generated is " + byteCount);
+-
+-    if (!shouldGenerateDistCacheData() && fileCount > 0) {
+-      LOG.error("Missing " + fileCount + " distributed cache files under the "
+-          + " directory\n" + distCachePath + "\nthat are needed for gridmix"
+-          + " to emulate distributed cache load. Either use -generate\noption"
+-          + " to generate distributed cache data along with input data OR "
+-          + "disable\ndistributed cache emulation by configuring '"
+-          + DistributedCacheEmulator.GRIDMIX_EMULATE_DISTRIBUTEDCACHE
+-          + "' to false.");
+-      return Gridmix.MISSING_DIST_CACHE_FILES_ERROR;
+-    }
+-    return 0;
+-  }
+-
+-  /**
+-   * If gridmix needs to emulate distributed cache load, then configure
+-   * distributed cache files of a simulated job by mapping the original
+-   * cluster's distributed cache file paths to the simulated cluster's paths and
+-   * setting these mapped paths in the job configuration of the simulated job.
+-   * <br>
+-   * Configure local FS based distributed cache files through the property
+-   * "tmpfiles" and hdfs based distributed cache files through the property
+-   * {@link MRJobConfig#CACHE_FILES}.
+-   * @param conf configuration for the simulated job to be run
+-   * @param jobConf job configuration of original cluster's job, obtained from
+-   *                trace
+-   * @throws IOException
+-   */
+-  void configureDistCacheFiles(Configuration conf, JobConf jobConf)
+-      throws IOException {
+-    if (shouldEmulateDistCacheLoad()) {
+-
+-      String[] files = jobConf.getStrings(MRJobConfig.CACHE_FILES);
+-      if (files != null) {
+-        // hdfs based distributed cache files to be configured for simulated job
+-        List<String> cacheFiles = new ArrayList<String>();
+-        // local FS based distributed cache files to be configured for
+-        // simulated job
+-        List<String> localCacheFiles = new ArrayList<String>();
+-
+-        String[] visibilities =
+-          jobConf.getStrings(MRJobConfig.CACHE_FILE_VISIBILITIES);
+-        String[] timeStamps =
+-          jobConf.getStrings(MRJobConfig.CACHE_FILE_TIMESTAMPS);
+-        String[] fileSizes = jobConf.getStrings(MRJobConfig.CACHE_FILES_SIZES);
+-
+-        String user = jobConf.getUser();
+-        for (int i = 0; i < files.length; i++) {
+-          // Check if visibilities are available because older hadoop versions
+-          // didn't have public, private Distributed Caches separately.
+-          boolean visibility =
+-              (visibilities == null) || Boolean.parseBoolean(visibilities[i]);
+-          if (isLocalDistCacheFile(files[i], user, visibility)) {
+-            // local FS based distributed cache file.
+-            // Create this file on the pseudo local FS.
+-            String fileId = MD5Hash.digest(files[i] + timeStamps[i]).toString();
+-            long fileSize = Long.parseLong(fileSizes[i]);
+-            Path mappedLocalFilePath =
+-                PseudoLocalFs.generateFilePath(fileId, fileSize)
+-                    .makeQualified(pseudoLocalFs.getUri(),
+-                                   pseudoLocalFs.getWorkingDirectory());
+-            pseudoLocalFs.create(mappedLocalFilePath);
+-            localCacheFiles.add(mappedLocalFilePath.toUri().toString());
+-          } else {
+-            // hdfs based distributed cache file.
+-            // Get the mapped HDFS path on simulated cluster
+-            String mappedPath = mapDistCacheFilePath(files[i], timeStamps[i],
+-                                                     visibility, user);
+-            cacheFiles.add(mappedPath);
+-          }
+-        }
+-        if (cacheFiles.size() > 0) {
+-          // configure hdfs based distributed cache files for simulated job
+-          conf.setStrings(MRJobConfig.CACHE_FILES,
+-                          cacheFiles.toArray(new String[cacheFiles.size()]));
+-        }
+-        if (localCacheFiles.size() > 0) {
+-          // configure local FS based distributed cache files for simulated job
+-          conf.setStrings("tmpfiles", localCacheFiles.toArray(
+-                                        new String[localCacheFiles.size()]));
+-        }
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
+deleted file mode 100644
+index 43f54bc96e9..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Echos the UGI offered.
+- */
+-public class EchoUserResolver implements UserResolver {
+-  public static final Logger LOG = LoggerFactory.getLogger(Gridmix.class);
+-
+-  public EchoUserResolver() {
+-    LOG.info(" Current user resolver is EchoUserResolver ");
+-  }
+-
+-  public synchronized boolean setTargetUsers(URI userdesc, Configuration conf)
+-  throws IOException {
+-    return false;
+-  }
+-
+-  public synchronized UserGroupInformation getTargetUgi(
+-    UserGroupInformation ugi) {
+-    return ugi;
+-  }
+-
+-  /**
+-   * {@inheritDoc}
+-   * <br><br>
+-   * Since {@link EchoUserResolver} simply returns the user's name passed as
+-   * the argument, it doesn't need a target list of users.
+-   */
+-  public boolean needsTargetUsersList() {
+-    return false;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java
+deleted file mode 100644
+index 9ecd9e8e5da..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ExecutionSummarizer.java
++++ /dev/null
+@@ -1,320 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import org.apache.commons.lang3.time.FastDateFormat;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.MD5Hash;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.DataStatistics;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * Summarizes a {@link Gridmix} run. Statistics that are reported are
+- * <ul>
+- *   <li>Total number of jobs in the input trace</li>
+- *   <li>Trace signature</li>
+- *   <li>Total number of jobs processed from the input trace</li>
+- *   <li>Total number of jobs submitted</li>
+- *   <li>Total number of successful and failed jobs</li>
+- *   <li>Total number of map/reduce tasks launched</li>
+- *   <li>Gridmix start & end time</li>
+- *   <li>Total time for the Gridmix run (data-generation and simulation)</li>
+- *   <li>Gridmix Configuration (i.e job-type, submission-type, resolver)</li>
+- * </ul>
+- */
+-class ExecutionSummarizer implements StatListener<JobStats> {
+-  static final Logger LOG = LoggerFactory.getLogger(ExecutionSummarizer.class);
+-  private static final FastDateFormat UTIL = FastDateFormat.getInstance();
+-  
+-  private int numJobsInInputTrace;
+-  private int totalSuccessfulJobs;
+-  private int totalFailedJobs;
+-  private int totalLostJobs;
+-  private int totalMapTasksLaunched;
+-  private int totalReduceTasksLaunched;
+-  private long totalSimulationTime;
+-  private long totalRuntime;
+-  private final String commandLineArgs;
+-  private long startTime;
+-  private long endTime;
+-  private long simulationStartTime;
+-  private String inputTraceLocation;
+-  private String inputTraceSignature;
+-  private String jobSubmissionPolicy;
+-  private String resolver;
+-  private DataStatistics dataStats;
+-  private String expectedDataSize;
+-  
+-  /**
+-   * Basic constructor initialized with the runtime arguments. 
+-   */
+-  ExecutionSummarizer(String[] args) {
+-    startTime = System.currentTimeMillis();
+-    // flatten the args string and store it
+-    commandLineArgs = 
+-      org.apache.commons.lang3.StringUtils.join(args, ' ');
+-  }
+-  
+-  /**
+-   * Default constructor. 
+-   */
+-  ExecutionSummarizer() {
+-    startTime = System.currentTimeMillis();
+-    commandLineArgs = Summarizer.NA; 
+-  }
+-  
+-  void start(Configuration conf) {
+-    simulationStartTime = System.currentTimeMillis();
+-  }
+-  
+-  private void processJobState(JobStats stats) {
+-    Job job = stats.getJob();
+-    try {
+-      if (job.isSuccessful()) {
+-        ++totalSuccessfulJobs;
+-      } else {
+-        ++totalFailedJobs;
+-      }
+-    } catch (Exception e) {
+-      // this behavior is consistent with job-monitor which marks the job as 
+-      // complete (lost) if the status polling bails out
+-      ++totalLostJobs; 
+-    }
+-  }
+-  
+-  private void processJobTasks(JobStats stats) {
+-    totalMapTasksLaunched += stats.getNoOfMaps();
+-    totalReduceTasksLaunched += stats.getNoOfReds();
+-  }
+-  
+-  private void process(JobStats stats) {
+-    // process the job run state
+-    processJobState(stats);
+-
+-    // process the tasks information
+-    processJobTasks(stats);
+-  }
+-  
+-  @Override
+-  public void update(JobStats item) {
+-    // process only if the simulation has started
+-    if (simulationStartTime > 0) {
+-      process(item);
+-      totalSimulationTime = 
+-        System.currentTimeMillis() - getSimulationStartTime();
+-    }
+-  }
+-  
+-  // Generates a signature for the trace file based on
+-  //   - filename
+-  //   - modification time
+-  //   - file length
+-  //   - owner
+-  protected static String getTraceSignature(String input) throws IOException {
+-    Path inputPath = new Path(input);
+-    FileSystem fs = inputPath.getFileSystem(new Configuration());
+-    FileStatus status = fs.getFileStatus(inputPath);
+-    Path qPath = fs.makeQualified(status.getPath());
+-    String traceID = status.getModificationTime() + qPath.toString()
+-                     + status.getOwner() + status.getLen();
+-    return MD5Hash.digest(traceID).toString();
+-  }
+-  
+-  @SuppressWarnings("unchecked")
+-  void finalize(JobFactory factory, String inputPath, long dataSize, 
+-                UserResolver userResolver, DataStatistics stats,
+-                Configuration conf) 
+-  throws IOException {
+-    numJobsInInputTrace = factory.numJobsInTrace;
+-    endTime = System.currentTimeMillis();
+-     if ("-".equals(inputPath)) {
+-      inputTraceLocation = Summarizer.NA;
+-      inputTraceSignature = Summarizer.NA;
+-    } else {
+-      Path inputTracePath = new Path(inputPath);
+-      FileSystem fs = inputTracePath.getFileSystem(conf);
+-      inputTraceLocation = fs.makeQualified(inputTracePath).toString();
+-      inputTraceSignature = getTraceSignature(inputPath);
+-    }
+-    jobSubmissionPolicy = Gridmix.getJobSubmissionPolicy(conf).name();
+-    resolver = userResolver.getClass().getName();
+-    if (dataSize > 0) {
+-      expectedDataSize = StringUtils.humanReadableInt(dataSize);
+-    } else {
+-      expectedDataSize = Summarizer.NA;
+-    }
+-    dataStats = stats;
+-    totalRuntime = System.currentTimeMillis() - getStartTime();
+-  }
+-  
+-  /**
+-   * Summarizes the current {@link Gridmix} run.
+-   */
+-  @Override
+-  public String toString() {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append("Execution Summary:-");
+-    builder.append("\nInput trace: ").append(getInputTraceLocation());
+-    builder.append("\nInput trace signature: ")
+-           .append(getInputTraceSignature());
+-    builder.append("\nTotal number of jobs in trace: ")
+-           .append(getNumJobsInTrace());
+-    builder.append("\nExpected input data size: ")
+-           .append(getExpectedDataSize());
+-    builder.append("\nInput data statistics: ")
+-           .append(getInputDataStatistics());
+-    builder.append("\nTotal number of jobs processed: ")
+-           .append(getNumSubmittedJobs());
+-    builder.append("\nTotal number of successful jobs: ")
+-           .append(getNumSuccessfulJobs());
+-    builder.append("\nTotal number of failed jobs: ")
+-           .append(getNumFailedJobs());
+-    builder.append("\nTotal number of lost jobs: ")
+-           .append(getNumLostJobs());
+-    builder.append("\nTotal number of map tasks launched: ")
+-           .append(getNumMapTasksLaunched());
+-    builder.append("\nTotal number of reduce task launched: ")
+-           .append(getNumReduceTasksLaunched());
+-    builder.append("\nGridmix start time: ")
+-           .append(UTIL.format(getStartTime()));
+-    builder.append("\nGridmix end time: ").append(UTIL.format(getEndTime()));
+-    builder.append("\nGridmix simulation start time: ")
+-           .append(UTIL.format(getStartTime()));
+-    builder.append("\nGridmix runtime: ")
+-           .append(StringUtils.formatTime(getRuntime()));
+-    builder.append("\nTime spent in initialization (data-gen etc): ")
+-           .append(StringUtils.formatTime(getInitTime()));
+-    builder.append("\nTime spent in simulation: ")
+-           .append(StringUtils.formatTime(getSimulationTime()));
+-    builder.append("\nGridmix configuration parameters: ")
+-           .append(getCommandLineArgsString());
+-    builder.append("\nGridmix job submission policy: ")
+-           .append(getJobSubmissionPolicy());
+-    builder.append("\nGridmix resolver: ").append(getUserResolver());
+-    builder.append("\n\n");
+-    return builder.toString();
+-  }
+-  
+-  // Gets the stringified version of DataStatistics
+-  static String stringifyDataStatistics(DataStatistics stats) {
+-    if (stats != null) {
+-      StringBuffer buffer = new StringBuffer();
+-      String compressionStatus = stats.isDataCompressed() 
+-                                 ? "Compressed" 
+-                                 : "Uncompressed";
+-      buffer.append(compressionStatus).append(" input data size: ");
+-      buffer.append(StringUtils.humanReadableInt(stats.getDataSize()));
+-      buffer.append(", ");
+-      buffer.append("Number of files: ").append(stats.getNumFiles());
+-
+-      return buffer.toString();
+-    } else {
+-      return Summarizer.NA;
+-    }
+-  }
+-  
+-  // Getters
+-  protected String getExpectedDataSize() {
+-    return expectedDataSize;
+-  }
+-  
+-  protected String getUserResolver() {
+-    return resolver;
+-  }
+-  
+-  protected String getInputDataStatistics() {
+-    return stringifyDataStatistics(dataStats);
+-  }
+-  
+-  protected String getInputTraceSignature() {
+-    return inputTraceSignature;
+-  }
+-  
+-  protected String getInputTraceLocation() {
+-    return inputTraceLocation;
+-  }
+-  
+-  protected int getNumJobsInTrace() {
+-    return numJobsInInputTrace;
+-  }
+-  
+-  protected int getNumSuccessfulJobs() {
+-    return totalSuccessfulJobs;
+-  }
+-  
+-  protected int getNumFailedJobs() {
+-    return totalFailedJobs;
+-  }
+-  
+-  protected int getNumLostJobs() {
+-    return totalLostJobs;
+-  }
+-  
+-  protected int getNumSubmittedJobs() {
+-    return totalSuccessfulJobs + totalFailedJobs + totalLostJobs;
+-  }
+-  
+-  protected int getNumMapTasksLaunched() {
+-    return totalMapTasksLaunched;
+-  }
+-  
+-  protected int getNumReduceTasksLaunched() {
+-    return totalReduceTasksLaunched;
+-  }
+-  
+-  protected long getStartTime() {
+-    return startTime;
+-  }
+-  
+-  protected long getEndTime() {
+-    return endTime;
+-  }
+-  
+-  protected long getInitTime() {
+-    return simulationStartTime - startTime;
+-  }
+-  
+-  protected long getSimulationStartTime() {
+-    return simulationStartTime;
+-  }
+-  
+-  protected long getSimulationTime() {
+-    return totalSimulationTime;
+-  }
+-  
+-  protected long getRuntime() {
+-    return totalRuntime;
+-  }
+-  
+-  protected String getCommandLineArgsString() {
+-    return commandLineArgs;
+-  }
+-  
+-  protected String getJobSubmissionPolicy() {
+-    return jobSubmissionPolicy;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java
+deleted file mode 100644
+index 9a0cca380bc..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java
++++ /dev/null
+@@ -1,301 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import java.util.Arrays;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Comparator;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.concurrent.locks.ReadWriteLock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.BlockLocation;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapred.gridmix.RandomAlgorithms.Selector;
+-
+-/**
+- * Class for caching a pool of input data to be used by synthetic jobs for
+- * simulating read traffic.
+- */
+-class FilePool {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(FilePool.class);
+-
+-  /**
+-   * The minimum file size added to the pool. Default 128MiB.
+-   */
+-  public static final String GRIDMIX_MIN_FILE = "gridmix.min.file.size";
+-
+-  /**
+-   * The maximum size for files added to the pool. Defualts to 100TiB.
+-   */
+-  public static final String GRIDMIX_MAX_TOTAL = "gridmix.max.total.scan";
+-
+-  private Node root;
+-  private final Path path;
+-  private final FileSystem fs;
+-  private final Configuration conf;
+-  private final ReadWriteLock updateLock;
+-
+-  /**
+-   * Initialize a filepool under the path provided, but do not populate the
+-   * cache.
+-   */
+-  public FilePool(Configuration conf, Path input) throws IOException {
+-    root = null;
+-    this.conf = conf;
+-    this.path = input;
+-    this.fs = path.getFileSystem(conf);
+-    updateLock = new ReentrantReadWriteLock();
+-  }
+-
+-  /**
+-   * Gather a collection of files at least as large as minSize.
+-   * @return The total size of files returned.
+-   */
+-  public long getInputFiles(long minSize, Collection<FileStatus> files)
+-      throws IOException {
+-    updateLock.readLock().lock();
+-    try {
+-      return root.selectFiles(minSize, files);
+-    } finally {
+-      updateLock.readLock().unlock();
+-    }
+-  }
+-
+-  /**
+-   * (Re)generate cache of input FileStatus objects.
+-   */
+-  public void refresh() throws IOException {
+-    updateLock.writeLock().lock();
+-    try {
+-      root = new InnerDesc(fs, fs.getFileStatus(path),
+-        new MinFileFilter(conf.getLong(GRIDMIX_MIN_FILE, 128 * 1024 * 1024),
+-                          conf.getLong(GRIDMIX_MAX_TOTAL, 100L * (1L << 40))));
+-      if (0 == root.getSize()) {
+-        throw new IOException("Found no satisfactory file in " + path);
+-      }
+-    } finally {
+-      updateLock.writeLock().unlock();
+-    }
+-  }
+-
+-  /**
+-   * Get a set of locations for the given file.
+-   */
+-  public BlockLocation[] locationsFor(FileStatus stat, long start, long len)
+-      throws IOException {
+-    // TODO cache
+-    return fs.getFileBlockLocations(stat, start, len);
+-  }
+-
+-  static abstract class Node {
+-
+-    protected final static Random rand = new Random();
+-
+-    /**
+-     * Total size of files and directories under the current node.
+-     */
+-    abstract long getSize();
+-
+-    /**
+-     * Return a set of files whose cumulative size is at least
+-     * <tt>targetSize</tt>.
+-     * TODO Clearly size is not the only criterion, e.g. refresh from
+-     * generated data without including running task output, tolerance
+-     * for permission issues, etc.
+-     */
+-    abstract long selectFiles(long targetSize, Collection<FileStatus> files)
+-        throws IOException;
+-  }
+-
+-  /**
+-   * Files in current directory of this Node.
+-   */
+-  static class LeafDesc extends Node {
+-    final long size;
+-    final ArrayList<FileStatus> curdir;
+-
+-    LeafDesc(ArrayList<FileStatus> curdir, long size) {
+-      this.size = size;
+-      this.curdir = curdir;
+-    }
+-
+-    @Override
+-    public long getSize() {
+-      return size;
+-    }
+-
+-    @Override
+-    public long selectFiles(long targetSize, Collection<FileStatus> files)
+-        throws IOException {
+-      if (targetSize >= getSize()) {
+-        files.addAll(curdir);
+-        return getSize();
+-      }
+-
+-      Selector selector = new Selector(curdir.size(), (double) targetSize
+-          / getSize(), rand);
+-      
+-      ArrayList<Integer> selected = new ArrayList<Integer>();
+-      long ret = 0L;
+-      do {
+-        int index = selector.next();
+-        selected.add(index);
+-        ret += curdir.get(index).getLen();
+-      } while (ret < targetSize);
+-
+-      for (Integer i : selected) {
+-        files.add(curdir.get(i));
+-      }
+-
+-      return ret;
+-    }
+-  }
+-
+-  /**
+-   * A subdirectory of the current Node.
+-   */
+-  static class InnerDesc extends Node {
+-    final long size;
+-    final double[] dist;
+-    final Node[] subdir;
+-
+-    private static final Comparator<Node> nodeComparator =
+-      new Comparator<Node>() {
+-          public int compare(Node n1, Node n2) {
+-            return n1.getSize() < n2.getSize() ? -1
+-                 : n1.getSize() > n2.getSize() ? 1 : 0;
+-          }
+-    };
+-
+-    InnerDesc(final FileSystem fs, FileStatus thisDir, MinFileFilter filter)
+-        throws IOException {
+-      long fileSum = 0L;
+-      final ArrayList<FileStatus> curFiles = new ArrayList<FileStatus>();
+-      final ArrayList<FileStatus> curDirs = new ArrayList<FileStatus>();
+-      for (FileStatus stat : fs.listStatus(thisDir.getPath())) {
+-        if (stat.isDirectory()) {
+-          curDirs.add(stat);
+-        } else if (filter.accept(stat)) {
+-          curFiles.add(stat);
+-          fileSum += stat.getLen();
+-        }
+-      }
+-      ArrayList<Node> subdirList = new ArrayList<Node>();
+-      if (!curFiles.isEmpty()) {
+-        subdirList.add(new LeafDesc(curFiles, fileSum));
+-      }
+-      for (Iterator<FileStatus> i = curDirs.iterator();
+-          !filter.done() && i.hasNext();) {
+-        // add subdirectories
+-        final Node d = new InnerDesc(fs, i.next(), filter);
+-        final long dSize = d.getSize();
+-        if (dSize > 0) {
+-          fileSum += dSize;
+-          subdirList.add(d);
+-        }
+-      }
+-      size = fileSum;
+-      LOG.debug(size + " bytes in " + thisDir.getPath());
+-      subdir = subdirList.toArray(new Node[subdirList.size()]);
+-      Arrays.sort(subdir, nodeComparator);
+-      dist = new double[subdir.length];
+-      for (int i = dist.length - 1; i > 0; --i) {
+-        fileSum -= subdir[i].getSize();
+-        dist[i] = fileSum / (1.0 * size);
+-      }
+-    }
+-
+-    @Override
+-    public long getSize() {
+-      return size;
+-    }
+-
+-    @Override
+-    public long selectFiles(long targetSize, Collection<FileStatus> files)
+-        throws IOException {
+-      long ret = 0L;
+-      if (targetSize >= getSize()) {
+-        // request larger than all subdirs; add everything
+-        for (Node n : subdir) {
+-          long added = n.selectFiles(targetSize, files);
+-          ret += added;
+-          targetSize -= added;
+-        }
+-        return ret;
+-      }
+-
+-      // can satisfy request in proper subset of contents
+-      // select random set, weighted by size
+-      final HashSet<Node> sub = new HashSet<Node>();
+-      do {
+-        assert sub.size() < subdir.length;
+-        final double r = rand.nextDouble();
+-        int pos = Math.abs(Arrays.binarySearch(dist, r) + 1) - 1;
+-        while (sub.contains(subdir[pos])) {
+-          pos = (pos + 1) % subdir.length;
+-        }
+-        long added = subdir[pos].selectFiles(targetSize, files);
+-        ret += added;
+-        targetSize -= added;
+-        sub.add(subdir[pos]);
+-      } while (targetSize > 0);
+-      return ret;
+-    }
+-  }
+-
+-  /**
+-   * Filter enforcing the minFile/maxTotal parameters of the scan.
+-   */
+-  private static class MinFileFilter {
+-
+-    private long totalScan;
+-    private final long minFileSize;
+-
+-    public MinFileFilter(long minFileSize, long totalScan) {
+-      this.minFileSize = minFileSize;
+-      this.totalScan = totalScan;
+-    }
+-    public boolean done() {
+-      return totalScan <= 0;
+-    }
+-    public boolean accept(FileStatus stat) {
+-      final boolean done = done();
+-      if (!done && stat.getLen() >= minFileSize) {
+-        totalScan -= stat.getLen();
+-        return true;
+-      }
+-      return false;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
+deleted file mode 100644
+index 2e4222c89c6..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FileQueue.java
++++ /dev/null
+@@ -1,103 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-
+-/**
+- * Given a {@link org.apache.hadoop.mapreduce.lib.input.CombineFileSplit},
+- * circularly read through each input source.
+- */
+-class FileQueue extends InputStream {
+-
+-  private int idx = -1;
+-  private long curlen = -1L;
+-  private InputStream input;
+-  private final byte[] z = new byte[1];
+-  private final Path[] paths;
+-  private final long[] lengths;
+-  private final long[] startoffset;
+-  private final Configuration conf;
+-
+-  /**
+-   * @param split Description of input sources.
+-   * @param conf Used to resolve FileSystem instances.
+-   */
+-  public FileQueue(CombineFileSplit split, Configuration conf)
+-      throws IOException {
+-    this.conf = conf;
+-    paths = split.getPaths();
+-    startoffset = split.getStartOffsets();
+-    lengths = split.getLengths();
+-    nextSource();
+-  }
+-
+-  protected void nextSource() throws IOException {
+-    if (0 == paths.length) {
+-      return;
+-    }
+-    if (input != null) {
+-      input.close();
+-    }
+-    idx = (idx + 1) % paths.length;
+-    curlen = lengths[idx];
+-    final Path file = paths[idx];
+-    input = 
+-      CompressionEmulationUtil.getPossiblyDecompressedInputStream(file, 
+-                                 conf, startoffset[idx]);
+-  }
+-
+-  @Override
+-  public int read() throws IOException {
+-    final int tmp = read(z);
+-    return tmp == -1 ? -1 : (0xFF & z[0]);
+-  }
+-
+-  @Override
+-  public int read(byte[] b) throws IOException {
+-    return read(b, 0, b.length);
+-  }
+-
+-  @Override
+-  public int read(byte[] b, int off, int len) throws IOException {
+-    int kvread = 0;
+-    while (kvread < len) {
+-      if (curlen <= 0) {
+-        nextSource();
+-        continue;
+-      }
+-      final int srcRead = (int) Math.min(len - kvread, curlen);
+-      IOUtils.readFully(input, b, kvread, srcRead);
+-      curlen -= srcRead;
+-      kvread += srcRead;
+-    }
+-    return kvread;
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    input.close();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
+deleted file mode 100644
+index 41e937fe3c8..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateData.java
++++ /dev/null
+@@ -1,412 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.OutputStream;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Arrays;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.LocatedFileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.PathFilter;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.mapred.ClusterStatus;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Utils;
+-import org.apache.hadoop.mapreduce.InputFormat;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.RecordWriter;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.StringUtils;
+-
+-// TODO can replace with form of GridmixJob
+-class GenerateData extends GridmixJob {
+-
+-  /**
+-   * Total bytes to write.
+-   */
+-  public static final String GRIDMIX_GEN_BYTES = "gridmix.gen.bytes";
+-
+-  /**
+-   * Maximum size per file written.
+-   */
+-  public static final String GRIDMIX_GEN_CHUNK = "gridmix.gen.bytes.per.file";
+-
+-  /**
+-   * Size of writes to output file.
+-   */
+-  public static final String GRIDMIX_VAL_BYTES = "gendata.val.bytes";
+-
+-  /**
+-   * Status reporting interval, in megabytes.
+-   */
+-  public static final String GRIDMIX_GEN_INTERVAL = "gendata.interval.mb";
+-
+-  /**
+-   * Blocksize of generated data.
+-   */
+-  public static final String GRIDMIX_GEN_BLOCKSIZE = "gridmix.gen.blocksize";
+-
+-  /**
+-   * Replication of generated data.
+-   */
+-  public static final String GRIDMIX_GEN_REPLICATION = "gridmix.gen.replicas";
+-  static final String JOB_NAME = "GRIDMIX_GENERATE_INPUT_DATA";
+-
+-  public GenerateData(Configuration conf, Path outdir, long genbytes)
+-      throws IOException {
+-    super(conf, 0L, JOB_NAME);
+-    job.getConfiguration().setLong(GRIDMIX_GEN_BYTES, genbytes);
+-    FileOutputFormat.setOutputPath(job, outdir);
+-  }
+-
+-  /**
+-   * Represents the input data characteristics.
+-   */
+-  static class DataStatistics {
+-    private long dataSize;
+-    private long numFiles;
+-    private boolean isDataCompressed;
+-    
+-    DataStatistics(long dataSize, long numFiles, boolean isCompressed) {
+-      this.dataSize = dataSize;
+-      this.numFiles = numFiles;
+-      this.isDataCompressed = isCompressed;
+-    }
+-    
+-    long getDataSize() {
+-      return dataSize;
+-    }
+-    
+-    long getNumFiles() {
+-      return numFiles;
+-    }
+-    
+-    boolean isDataCompressed() {
+-      return isDataCompressed;
+-    }
+-  }
+-  
+-  /**
+-   * Publish the data statistics.
+-   */
+-  static DataStatistics publishDataStatistics(Path inputDir, long genBytes, 
+-                                              Configuration conf) 
+-  throws IOException {
+-    if (CompressionEmulationUtil.isCompressionEmulationEnabled(conf)) {
+-      return CompressionEmulationUtil.publishCompressedDataStatistics(inputDir, 
+-                                        conf, genBytes);
+-    } else {
+-      return publishPlainDataStatistics(conf, inputDir);
+-    }
+-  }
+-  
+-  static DataStatistics publishPlainDataStatistics(Configuration conf, 
+-                                                   Path inputDir) 
+-  throws IOException {
+-    FileSystem fs = inputDir.getFileSystem(conf);
+-
+-    // obtain input data file statuses
+-    long dataSize = 0;
+-    long fileCount = 0;
+-    RemoteIterator<LocatedFileStatus> iter = fs.listFiles(inputDir, true);
+-    PathFilter filter = new Utils.OutputFileUtils.OutputFilesFilter();
+-    while (iter.hasNext()) {
+-      LocatedFileStatus lStatus = iter.next();
+-      if (filter.accept(lStatus.getPath())) {
+-        dataSize += lStatus.getLen();
+-        ++fileCount;
+-      }
+-    }
+-
+-    // publish the plain data statistics
+-    LOG.info("Total size of input data : " 
+-             + StringUtils.humanReadableInt(dataSize));
+-    LOG.info("Total number of input data files : " + fileCount);
+-    
+-    return new DataStatistics(dataSize, fileCount, false);
+-  }
+-  
+-  @Override
+-  public Job call() throws IOException, InterruptedException,
+-                           ClassNotFoundException {
+-    UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-    ugi.doAs( new PrivilegedExceptionAction <Job>() {
+-       public Job run() throws IOException, ClassNotFoundException,
+-                               InterruptedException {
+-         // check if compression emulation is enabled
+-         if (CompressionEmulationUtil
+-             .isCompressionEmulationEnabled(job.getConfiguration())) {
+-           CompressionEmulationUtil.configure(job);
+-         } else {
+-           configureRandomBytesDataGenerator();
+-         }
+-         job.submit();
+-         return job;
+-       }
+-       
+-       private void configureRandomBytesDataGenerator() {
+-        job.setMapperClass(GenDataMapper.class);
+-        job.setNumReduceTasks(0);
+-        job.setMapOutputKeyClass(NullWritable.class);
+-        job.setMapOutputValueClass(BytesWritable.class);
+-        job.setInputFormatClass(GenDataFormat.class);
+-        job.setOutputFormatClass(RawBytesOutputFormat.class);
+-        job.setJarByClass(GenerateData.class);
+-        try {
+-          FileInputFormat.addInputPath(job, new Path("ignored"));
+-        } catch (IOException e) {
+-          LOG.error("Error while adding input path ", e);
+-        }
+-      }
+-    });
+-    return job;
+-  }
+-  
+-  @Override
+-  protected boolean canEmulateCompression() {
+-    return false;
+-  }
+-
+-  public static class GenDataMapper
+-      extends Mapper<NullWritable,LongWritable,NullWritable,BytesWritable> {
+-
+-    private BytesWritable val;
+-    private final Random r = new Random();
+-
+-    @Override
+-    protected void setup(Context context)
+-        throws IOException, InterruptedException {
+-      val = new BytesWritable(new byte[
+-          context.getConfiguration().getInt(GRIDMIX_VAL_BYTES, 1024 * 1024)]);
+-    }
+-
+-    @Override
+-    public void map(NullWritable key, LongWritable value, Context context)
+-        throws IOException, InterruptedException {
+-      for (long bytes = value.get(); bytes > 0; bytes -= val.getLength()) {
+-        r.nextBytes(val.getBytes());
+-        val.setSize((int)Math.min(val.getLength(), bytes));
+-        context.write(key, val);
+-      }
+-    }
+-
+-  }
+-
+-  static class GenDataFormat extends InputFormat<NullWritable,LongWritable> {
+-
+-    @Override
+-    public List<InputSplit> getSplits(JobContext jobCtxt) throws IOException {
+-      final JobClient client =
+-        new JobClient(new JobConf(jobCtxt.getConfiguration()));
+-      ClusterStatus stat = client.getClusterStatus(true);
+-      final long toGen =
+-        jobCtxt.getConfiguration().getLong(GRIDMIX_GEN_BYTES, -1);
+-      if (toGen < 0) {
+-        throw new IOException("Invalid/missing generation bytes: " + toGen);
+-      }
+-      final int nTrackers = stat.getTaskTrackers();
+-      final long bytesPerTracker = toGen / nTrackers;
+-      final ArrayList<InputSplit> splits = new ArrayList<InputSplit>(nTrackers);
+-      final Pattern trackerPattern = Pattern.compile("tracker_([^:]*):.*");
+-      final Matcher m = trackerPattern.matcher("");
+-      for (String tracker : stat.getActiveTrackerNames()) {
+-        m.reset(tracker);
+-        if (!m.find()) {
+-          System.err.println("Skipping node: " + tracker);
+-          continue;
+-        }
+-        final String name = m.group(1);
+-        splits.add(new GenSplit(bytesPerTracker, new String[] { name }));
+-      }
+-      return splits;
+-    }
+-
+-    @Override
+-    public RecordReader<NullWritable,LongWritable> createRecordReader(
+-        InputSplit split, final TaskAttemptContext taskContext)
+-        throws IOException {
+-      return new RecordReader<NullWritable,LongWritable>() {
+-        long written = 0L;
+-        long write = 0L;
+-        long RINTERVAL;
+-        long toWrite;
+-        final NullWritable key = NullWritable.get();
+-        final LongWritable val = new LongWritable();
+-
+-        @Override
+-        public void initialize(InputSplit split, TaskAttemptContext ctxt)
+-            throws IOException, InterruptedException {
+-          toWrite = split.getLength();
+-          RINTERVAL = ctxt.getConfiguration().getInt(
+-              GRIDMIX_GEN_INTERVAL, 10) << 20;
+-        }
+-        @Override
+-        public boolean nextKeyValue() throws IOException {
+-          written += write;
+-          write = Math.min(toWrite - written, RINTERVAL);
+-          val.set(write);
+-          return written < toWrite;
+-        }
+-        @Override
+-        public float getProgress() throws IOException {
+-          return written / ((float)toWrite);
+-        }
+-        @Override
+-        public NullWritable getCurrentKey() { return key; }
+-        @Override
+-        public LongWritable getCurrentValue() { return val; }
+-        @Override
+-        public void close() throws IOException {
+-          taskContext.setStatus("Wrote " + toWrite);
+-        }
+-      };
+-    }
+-  }
+-
+-  static class GenSplit extends InputSplit implements Writable {
+-    private long bytes;
+-    private int nLoc;
+-    private String[] locations;
+-
+-    public GenSplit() { }
+-    public GenSplit(long bytes, String[] locations) {
+-      this(bytes, locations.length, locations);
+-    }
+-    public GenSplit(long bytes, int nLoc, String[] locations) {
+-      this.bytes = bytes;
+-      this.nLoc = nLoc;
+-      this.locations = Arrays.copyOf(locations, nLoc);
+-    }
+-    @Override
+-    public long getLength() {
+-      return bytes;
+-    }
+-    @Override
+-    public String[] getLocations() {
+-      return locations;
+-    }
+-    @Override
+-    public void readFields(DataInput in) throws IOException {
+-      bytes = in.readLong();
+-      nLoc = in.readInt();
+-      if (null == locations || locations.length < nLoc) {
+-        locations = new String[nLoc];
+-      }
+-      for (int i = 0; i < nLoc; ++i) {
+-        locations[i] = Text.readString(in);
+-      }
+-    }
+-    @Override
+-    public void write(DataOutput out) throws IOException {
+-      out.writeLong(bytes);
+-      out.writeInt(nLoc);
+-      for (int i = 0; i < nLoc; ++i) {
+-        Text.writeString(out, locations[i]);
+-      }
+-    }
+-  }
+-
+-  static class RawBytesOutputFormat
+-      extends FileOutputFormat<NullWritable,BytesWritable> {
+-
+-    @Override
+-    public RecordWriter<NullWritable,BytesWritable> getRecordWriter(
+-        TaskAttemptContext job) throws IOException {
+-
+-      return new ChunkWriter(getDefaultWorkFile(job, ""),
+-          job.getConfiguration());
+-    }
+-
+-    static class ChunkWriter extends RecordWriter<NullWritable,BytesWritable> {
+-      private final Path outDir;
+-      private final FileSystem fs;
+-      private final int blocksize;
+-      private final short replicas;
+-      private final FsPermission genPerms = new FsPermission((short) 0777);
+-      private final long maxFileBytes;
+-
+-      private long accFileBytes = 0L;
+-      private long fileIdx = -1L;
+-      private OutputStream fileOut = null;
+-
+-      public ChunkWriter(Path outDir, Configuration conf) throws IOException {
+-        this.outDir = outDir;
+-        fs = outDir.getFileSystem(conf);
+-        blocksize = conf.getInt(GRIDMIX_GEN_BLOCKSIZE, 1 << 28);
+-        replicas = (short) conf.getInt(GRIDMIX_GEN_REPLICATION, 3);
+-        maxFileBytes = conf.getLong(GRIDMIX_GEN_CHUNK, 1L << 30);
+-        nextDestination();
+-      }
+-      private void nextDestination() throws IOException {
+-        if (fileOut != null) {
+-          fileOut.close();
+-        }
+-        fileOut = fs.create(new Path(outDir, "segment-" + (++fileIdx)),
+-                            genPerms, false, 64 * 1024, replicas, 
+-                            blocksize, null);
+-        accFileBytes = 0L;
+-      }
+-      @Override
+-      public void write(NullWritable key, BytesWritable value)
+-          throws IOException {
+-        int written = 0;
+-        final int total = value.getLength();
+-        while (written < total) {
+-          if (accFileBytes >= maxFileBytes) {
+-            nextDestination();
+-          }
+-          final int write = (int)
+-            Math.min(total - written, maxFileBytes - accFileBytes);
+-          fileOut.write(value.getBytes(), written, write);
+-          written += write;
+-          accFileBytes += write;
+-        }
+-      }
+-      @Override
+-      public void close(TaskAttemptContext ctxt) throws IOException {
+-        fileOut.close();
+-      }
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java
+deleted file mode 100644
+index aa191629cf1..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GenerateDistCacheData.java
++++ /dev/null
+@@ -1,267 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.nio.charset.Charset;
+-import java.nio.charset.StandardCharsets;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.mapred.ClusterStatus;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.lib.input.SequenceFileRecordReader;
+-import org.apache.hadoop.mapreduce.InputFormat;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
+-import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
+-import org.apache.hadoop.security.UserGroupInformation;
+-
+-/**
+- * GridmixJob that generates distributed cache files.
+- * {@link GenerateDistCacheData} expects a list of distributed cache files to be
+- * generated as input. This list is expected to be stored as a sequence file
+- * and the filename is expected to be configured using
+- * {@code gridmix.distcache.file.list}.
+- * This input file contains the list of distributed cache files and their sizes.
+- * For each record (i.e. file size and file path) in this input file,
+- * a file with the specific file size at the specific path is created.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Evolving
+-class GenerateDistCacheData extends GridmixJob {
+-
+-  /**
+-   * Number of distributed cache files to be created by gridmix
+-   */
+-  static final String GRIDMIX_DISTCACHE_FILE_COUNT =
+-      "gridmix.distcache.file.count";
+-  /**
+-   * Total number of bytes to be written to the distributed cache files by
+-   * gridmix. i.e. Sum of sizes of all unique distributed cache files to be
+-   * created by gridmix.
+-   */
+-  static final String GRIDMIX_DISTCACHE_BYTE_COUNT =
+-      "gridmix.distcache.byte.count";
+-  /**
+-   * The special file created(and used) by gridmix, that contains the list of
+-   * unique distributed cache files that are to be created and their sizes.
+-   */
+-  static final String GRIDMIX_DISTCACHE_FILE_LIST =
+-      "gridmix.distcache.file.list";
+-  static final String JOB_NAME = "GRIDMIX_GENERATE_DISTCACHE_DATA";
+-
+-  /**
+-   * Create distributed cache file with the permissions 0644.
+-   * Since the private distributed cache directory doesn't have execute
+-   * permission for others, it is OK to set read permission for others for
+-   * the files under that directory and still they will become 'private'
+-   * distributed cache files on the simulated cluster.
+-   */
+-  static final short GRIDMIX_DISTCACHE_FILE_PERM = 0644;
+-
+-  private static final Charset charsetUTF8 = StandardCharsets.UTF_8;
+-
+-  public GenerateDistCacheData(Configuration conf) throws IOException {
+-    super(conf, 0L, JOB_NAME);
+-  }
+-
+-  @Override
+-  public Job call() throws IOException, InterruptedException,
+-                           ClassNotFoundException {
+-    UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-    ugi.doAs( new PrivilegedExceptionAction <Job>() {
+-       public Job run() throws IOException, ClassNotFoundException,
+-                               InterruptedException {
+-        job.setMapperClass(GenDCDataMapper.class);
+-        job.setNumReduceTasks(0);
+-        job.setMapOutputKeyClass(NullWritable.class);
+-        job.setMapOutputValueClass(BytesWritable.class);
+-        job.setInputFormatClass(GenDCDataFormat.class);
+-        job.setOutputFormatClass(NullOutputFormat.class);
+-        job.setJarByClass(GenerateDistCacheData.class);
+-        try {
+-          FileInputFormat.addInputPath(job, new Path("ignored"));
+-        } catch (IOException e) {
+-          LOG.error("Error while adding input path ", e);
+-        }
+-        job.submit();
+-        return job;
+-      }
+-    });
+-    return job;
+-  }
+-
+-  @Override
+-  protected boolean canEmulateCompression() {
+-    return false;
+-  }
+-
+-  public static class GenDCDataMapper
+-      extends Mapper<LongWritable, BytesWritable, NullWritable, BytesWritable> {
+-
+-    private BytesWritable val;
+-    private final Random r = new Random();
+-    private FileSystem fs;
+-
+-    @Override
+-    protected void setup(Context context)
+-        throws IOException, InterruptedException {
+-      val = new BytesWritable(new byte[context.getConfiguration().getInt(
+-              GenerateData.GRIDMIX_VAL_BYTES, 1024 * 1024)]);
+-      fs = FileSystem.get(context.getConfiguration());
+-    }
+-
+-    // Create one distributed cache file with the needed file size.
+-    // key is distributed cache file size and
+-    // value is distributed cache file path.
+-    @Override
+-    public void map(LongWritable key, BytesWritable value, Context context)
+-        throws IOException, InterruptedException {
+-
+-      String fileName = new String(value.getBytes(), 0,
+-          value.getLength(), charsetUTF8);
+-      Path path = new Path(fileName);
+-
+-      FSDataOutputStream dos =
+-          FileSystem.create(fs, path, new FsPermission(GRIDMIX_DISTCACHE_FILE_PERM));
+-
+-      int size = 0;
+-      for (long bytes = key.get(); bytes > 0; bytes -= size) {
+-        r.nextBytes(val.getBytes());
+-        size = (int)Math.min(val.getLength(), bytes);
+-        dos.write(val.getBytes(), 0, size);// Write to distCache file
+-      }
+-      dos.close();
+-    }
+-  }
+-
+-  /**
+-   * InputFormat for GenerateDistCacheData.
+-   * Input to GenerateDistCacheData is the special file(in SequenceFile format)
+-   * that contains the list of distributed cache files to be generated along
+-   * with their file sizes.
+-   */
+-  static class GenDCDataFormat
+-      extends InputFormat<LongWritable, BytesWritable> {
+-
+-    // Split the special file that contains the list of distributed cache file
+-    // paths and their file sizes such that each split corresponds to
+-    // approximately same amount of distributed cache data to be generated.
+-    // Consider numTaskTrackers * numMapSlotsPerTracker as the number of maps
+-    // for this job, if there is lot of data to be generated.
+-    @Override
+-    public List<InputSplit> getSplits(JobContext jobCtxt) throws IOException {
+-      final JobConf jobConf = new JobConf(jobCtxt.getConfiguration());
+-      final JobClient client = new JobClient(jobConf);
+-      ClusterStatus stat = client.getClusterStatus(true);
+-      int numTrackers = stat.getTaskTrackers();
+-      final int fileCount = jobConf.getInt(GRIDMIX_DISTCACHE_FILE_COUNT, -1);
+-
+-      // Total size of distributed cache files to be generated
+-      final long totalSize = jobConf.getLong(GRIDMIX_DISTCACHE_BYTE_COUNT, -1);
+-      // Get the path of the special file
+-      String distCacheFileList = jobConf.get(GRIDMIX_DISTCACHE_FILE_LIST);
+-      if (fileCount < 0 || totalSize < 0 || distCacheFileList == null) {
+-        throw new RuntimeException("Invalid metadata: #files (" + fileCount
+-            + "), total_size (" + totalSize + "), filelisturi ("
+-            + distCacheFileList + ")");
+-      }
+-
+-      Path sequenceFile = new Path(distCacheFileList);
+-      FileSystem fs = sequenceFile.getFileSystem(jobConf);
+-      FileStatus srcst = fs.getFileStatus(sequenceFile);
+-      // Consider the number of TTs * mapSlotsPerTracker as number of mappers.
+-      int numMapSlotsPerTracker = jobConf.getInt(TTConfig.TT_MAP_SLOTS, 2);
+-      int numSplits = numTrackers * numMapSlotsPerTracker;
+-
+-      List<InputSplit> splits = new ArrayList<InputSplit>(numSplits);
+-      LongWritable key = new LongWritable();
+-      BytesWritable value = new BytesWritable();
+-
+-      // Average size of data to be generated by each map task
+-      final long targetSize = Math.max(totalSize / numSplits,
+-                                DistributedCacheEmulator.AVG_BYTES_PER_MAP);
+-      long splitStartPosition = 0L;
+-      long splitEndPosition = 0L;
+-      long acc = 0L;
+-      long bytesRemaining = srcst.getLen();
+-      SequenceFile.Reader reader = null;
+-      try {
+-        reader = new SequenceFile.Reader(fs, sequenceFile, jobConf);
+-        while (reader.next(key, value)) {
+-
+-          // If adding this file would put this split past the target size,
+-          // cut the last split and put this file in the next split.
+-          if (acc + key.get() > targetSize && acc != 0) {
+-            long splitSize = splitEndPosition - splitStartPosition;
+-            splits.add(new FileSplit(
+-                sequenceFile, splitStartPosition, splitSize, (String[])null));
+-            bytesRemaining -= splitSize;
+-            splitStartPosition = splitEndPosition;
+-            acc = 0L;
+-          }
+-          acc += key.get();
+-          splitEndPosition = reader.getPosition();
+-        }
+-      } finally {
+-        if (reader != null) {
+-          reader.close();
+-        }
+-      }
+-      if (bytesRemaining != 0) {
+-        splits.add(new FileSplit(
+-            sequenceFile, splitStartPosition, bytesRemaining, (String[])null));
+-      }
+-
+-      return splits;
+-    }
+-
+-    /**
+-     * Returns a reader for this split of the distributed cache file list.
+-     */
+-    @Override
+-    public RecordReader<LongWritable, BytesWritable> createRecordReader(
+-        InputSplit split, final TaskAttemptContext taskContext)
+-        throws IOException, InterruptedException {
+-      return new SequenceFileRecordReader<LongWritable, BytesWritable>();
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
+deleted file mode 100644
+index e476223cf1e..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
++++ /dev/null
+@@ -1,809 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.PrintStream;
+-import java.net.URI;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.List;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FsShell;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.DataStatistics;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.tools.rumen.ZombieJobProducer;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Driver class for the Gridmix3 benchmark. Gridmix accepts a timestamped
+- * stream (trace) of job/task descriptions. For each job in the trace, the
+- * client will submit a corresponding, synthetic job to the target cluster at
+- * the rate in the original trace. The intent is to provide a benchmark that
+- * can be configured and extended to closely match the measured resource
+- * profile of actual, production loads.
+- */
+-public class Gridmix extends Configured implements Tool {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(Gridmix.class);
+-
+-  /**
+-   * Output (scratch) directory for submitted jobs. Relative paths are
+-   * resolved against the path provided as input and absolute paths remain
+-   * independent of it. The default is &quot;gridmix&quot;.
+-   */
+-  public static final String GRIDMIX_OUT_DIR = "gridmix.output.directory";
+-
+-  /**
+-   * Number of submitting threads at the client and upper bound for
+-   * in-memory split data. Submitting threads precompute InputSplits for
+-   * submitted jobs. This limits the number of splits held in memory waiting
+-   * for submission and also permits parallel computation of split data.
+-   */
+-  public static final String GRIDMIX_SUB_THR = "gridmix.client.submit.threads";
+-
+-  /**
+-   * The depth of the queue of job descriptions. Before splits are computed,
+-   * a queue of pending descriptions is stored in memoory. This parameter
+-   * limits the depth of that queue.
+-   */
+-  public static final String GRIDMIX_QUE_DEP =
+-    "gridmix.client.pending.queue.depth";
+-
+-  /**
+-   * Multiplier to accelerate or decelerate job submission. As a crude means of
+-   * sizing a job trace to a cluster, the time separating two jobs is
+-   * multiplied by this factor.
+-   */
+-  public static final String GRIDMIX_SUB_MUL = "gridmix.submit.multiplier";
+-
+-  /**
+-   * Class used to resolve users in the trace to the list of target users
+-   * on the cluster.
+-   */
+-  public static final String GRIDMIX_USR_RSV = "gridmix.user.resolve.class";
+-
+-  /**
+-   * The configuration key which determines the duration for which the 
+-   * job-monitor sleeps while polling for job status.
+-   * This value should be specified in milliseconds.
+-   */
+-  public static final String GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS = 
+-    "gridmix.job-monitor.sleep-time-ms";
+-  
+-  /**
+-   * Default value for {@link #GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS}.
+-   */
+-  public static final int GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS_DEFAULT = 500;
+-  
+-  /**
+-   * The configuration key which determines the total number of job-status
+-   * monitoring threads.
+-   */
+-  public static final String GRIDMIX_JOBMONITOR_THREADS = 
+-    "gridmix.job-monitor.thread-count";
+-  
+-  /**
+-   * Default value for {@link #GRIDMIX_JOBMONITOR_THREADS}.
+-   */
+-  public static final int GRIDMIX_JOBMONITOR_THREADS_DEFAULT = 1;
+-  
+-  /**
+-   * Configuration property set in simulated job's configuration whose value is
+-   * set to the corresponding original job's name. This is not configurable by
+-   * gridmix user.
+-   */
+-  public static final String ORIGINAL_JOB_NAME =
+-      "gridmix.job.original-job-name";
+-  /**
+-   * Configuration property set in simulated job's configuration whose value is
+-   * set to the corresponding original job's id. This is not configurable by
+-   * gridmix user.
+-   */
+-  public static final String ORIGINAL_JOB_ID = "gridmix.job.original-job-id";
+-
+-  private DistributedCacheEmulator distCacheEmulator;
+-
+-  // Submit data structures
+-  private JobFactory factory;
+-  private JobSubmitter submitter;
+-  private JobMonitor monitor;
+-  private Statistics statistics;
+-  private Summarizer summarizer;
+-
+-  // Shutdown hook
+-  private final Shutdown sdh = new Shutdown();
+-
+-  /** Error while parsing/analyzing the arguments to Gridmix */
+-  static final int ARGS_ERROR = 1;
+-  /** Error while trying to start/setup the Gridmix run */
+-  static final int STARTUP_FAILED_ERROR = 2;
+-  /**
+-   * If at least 1 distributed cache file is missing in the expected
+-   * distributed cache dir, Gridmix cannot proceed with emulation of
+-   * distributed cache load.
+-   */
+-  static final int MISSING_DIST_CACHE_FILES_ERROR = 3;
+-
+-
+-  Gridmix(String[] args) {
+-    summarizer = new Summarizer(args);
+-  }
+-  
+-  public Gridmix() {
+-    summarizer = new Summarizer();
+-  }
+-  
+-  // Get the input data directory for Gridmix. Input directory is 
+-  // <io-path>/input
+-  static Path getGridmixInputDataPath(Path ioPath) {
+-    return new Path(ioPath, "input");
+-  }
+-  
+-  /**
+-   * Write random bytes at the path &lt;inputDir&gt; if needed.
+-   * @see org.apache.hadoop.mapred.gridmix.GenerateData
+-   * @return exit status
+-   */
+-  protected int writeInputData(long genbytes, Path inputDir)
+-      throws IOException, InterruptedException {
+-    if (genbytes > 0) {
+-      final Configuration conf = getConf();
+-
+-      if (inputDir.getFileSystem(conf).exists(inputDir)) {
+-        LOG.error("Gridmix input data directory {} already exists " +
+-            "when -generate option is used.", inputDir);
+-        return STARTUP_FAILED_ERROR;
+-      }
+-
+-      // configure the compression ratio if needed
+-      CompressionEmulationUtil.setupDataGeneratorConfig(conf);
+-    
+-      final GenerateData genData = new GenerateData(conf, inputDir, genbytes);
+-      LOG.info("Generating {} of test data...",
+-          StringUtils.TraditionalBinaryPrefix.long2String(genbytes, "", 1));
+-      launchGridmixJob(genData);
+-    
+-      FsShell shell = new FsShell(conf);
+-      try {
+-        LOG.info("Changing the permissions for inputPath {}", inputDir);
+-        shell.run(new String[] {"-chmod","-R","777", inputDir.toString()});
+-      } catch (Exception e) {
+-        LOG.error("Couldnt change the file permissions " , e);
+-        throw new IOException(e);
+-      }
+-
+-      LOG.info("Input data generation successful.");
+-    }
+-
+-    return 0;
+-  }
+-
+-  /**
+-   * Write random bytes in the distributed cache files that will be used by all
+-   * simulated jobs of current gridmix run, if files are to be generated.
+-   * Do this as part of the MapReduce job {@link GenerateDistCacheData#JOB_NAME}
+-   * @see org.apache.hadoop.mapred.gridmix.GenerateDistCacheData
+-   */
+-  protected void writeDistCacheData(Configuration conf)
+-      throws IOException, InterruptedException {
+-    int fileCount =
+-        conf.getInt(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_COUNT, -1);
+-    if (fileCount > 0) {// generate distributed cache files
+-      final GridmixJob genDistCacheData = new GenerateDistCacheData(conf);
+-      LOG.info("Generating distributed cache data of size " + conf.getLong(
+-          GenerateDistCacheData.GRIDMIX_DISTCACHE_BYTE_COUNT, -1));
+-      launchGridmixJob(genDistCacheData);
+-    }
+-  }
+-
+-  // Launch Input/DistCache Data Generation job and wait for completion
+-  void launchGridmixJob(GridmixJob job)
+-      throws IOException, InterruptedException {
+-    submitter.add(job);
+-
+-    // TODO add listeners, use for job dependencies
+-    try {
+-      while (!job.isSubmitted()) {
+-        try {
+-            Thread.sleep(100); // sleep
+-          } catch (InterruptedException ie) {}
+-      }
+-      // wait for completion
+-      job.getJob().waitForCompletion(false);
+-    } catch (ClassNotFoundException e) {
+-      throw new IOException("Internal error", e);
+-    }
+-    if (!job.getJob().isSuccessful()) {
+-      throw new IOException(job.getJob().getJobName() + " job failed!");
+-    }
+-  }
+-
+-  /**
+-   * Create an appropriate {@code JobStoryProducer} object for the
+-   * given trace.
+-   * 
+-   * @param traceIn the path to the trace file. The special path
+-   * &quot;-&quot; denotes the standard input stream.
+-   *
+-   * @param conf the configuration to be used.
+-   *
+-   * @throws IOException if there was an error.
+-   */
+-  protected JobStoryProducer createJobStoryProducer(String traceIn,
+-      Configuration conf) throws IOException {
+-    if ("-".equals(traceIn)) {
+-      return new ZombieJobProducer(System.in, null);
+-    }
+-    return new ZombieJobProducer(new Path(traceIn), null, conf);
+-  }
+-
+-  // get the gridmix job submission policy
+-  protected static GridmixJobSubmissionPolicy getJobSubmissionPolicy(
+-                                                Configuration conf) {
+-    return GridmixJobSubmissionPolicy.getPolicy(conf, 
+-                                        GridmixJobSubmissionPolicy.STRESS);
+-  }
+-  
+-  /**
+-   * Create each component in the pipeline and start it.
+-   * @param conf Configuration data, no keys specific to this context
+-   * @param traceIn Either a Path to the trace data or &quot;-&quot; for
+-   *                stdin
+-   * @param ioPath &lt;ioPath&gt;/input/ is the dir from which input data is
+-   *               read and &lt;ioPath&gt;/distributedCache/ is the gridmix
+-   *               distributed cache directory.
+-   * @param scratchDir Path into which job output is written
+-   * @param startFlag Semaphore for starting job trace pipeline
+-   */
+-  private void startThreads(Configuration conf, String traceIn, Path ioPath,
+-      Path scratchDir, CountDownLatch startFlag, UserResolver userResolver)
+-      throws IOException {
+-    try {
+-      Path inputDir = getGridmixInputDataPath(ioPath);
+-      GridmixJobSubmissionPolicy policy = getJobSubmissionPolicy(conf);
+-      LOG.info(" Submission policy is " + policy.name());
+-      statistics = new Statistics(conf, policy.getPollingInterval(), startFlag);
+-      monitor = createJobMonitor(statistics, conf);
+-      int noOfSubmitterThreads = 
+-        (policy == GridmixJobSubmissionPolicy.SERIAL) 
+-        ? 1
+-        : Runtime.getRuntime().availableProcessors() + 1;
+-
+-      int numThreads = conf.getInt(GRIDMIX_SUB_THR, noOfSubmitterThreads);
+-      int queueDep = conf.getInt(GRIDMIX_QUE_DEP, 5);
+-      submitter = createJobSubmitter(monitor, numThreads, queueDep,
+-                                     new FilePool(conf, inputDir), userResolver, 
+-                                     statistics);
+-      distCacheEmulator = new DistributedCacheEmulator(conf, ioPath);
+-
+-      factory = createJobFactory(submitter, traceIn, scratchDir, conf, 
+-                                 startFlag, userResolver);
+-      factory.jobCreator.setDistCacheEmulator(distCacheEmulator);
+-
+-      if (policy == GridmixJobSubmissionPolicy.SERIAL) {
+-        statistics.addJobStatsListeners(factory);
+-      } else {
+-        statistics.addClusterStatsObservers(factory);
+-      }
+-
+-      // add the gridmix run summarizer to the statistics
+-      statistics.addJobStatsListeners(summarizer.getExecutionSummarizer());
+-      statistics.addClusterStatsObservers(summarizer.getClusterSummarizer());
+-      
+-      monitor.start();
+-      submitter.start();
+-    }catch(Exception e) {
+-      LOG.error(" Exception at start " ,e);
+-      throw new IOException(e);
+-    }
+-   }
+-
+-  protected JobMonitor createJobMonitor(Statistics stats, Configuration conf) 
+-  throws IOException {
+-    int delay = conf.getInt(GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS, 
+-                            GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS_DEFAULT);
+-    int numThreads = conf.getInt(GRIDMIX_JOBMONITOR_THREADS, 
+-                                 GRIDMIX_JOBMONITOR_THREADS_DEFAULT);
+-    return new JobMonitor(delay, TimeUnit.MILLISECONDS, stats, numThreads);
+-  }
+-
+-  protected JobSubmitter createJobSubmitter(JobMonitor monitor, int threads,
+-      int queueDepth, FilePool pool, UserResolver resolver, 
+-      Statistics statistics) throws IOException {
+-    return new JobSubmitter(monitor, threads, queueDepth, pool, statistics);
+-  }
+-
+-  protected JobFactory createJobFactory(JobSubmitter submitter, String traceIn,
+-      Path scratchDir, Configuration conf, CountDownLatch startFlag, 
+-      UserResolver resolver)
+-      throws IOException {
+-     return GridmixJobSubmissionPolicy.getPolicy(
+-       conf, GridmixJobSubmissionPolicy.STRESS).createJobFactory(
+-       submitter, createJobStoryProducer(traceIn, conf), scratchDir, conf,
+-       startFlag, resolver);
+-  }
+-
+-  private static UserResolver userResolver;
+-
+-  public UserResolver getCurrentUserResolver() {
+-    return userResolver;
+-  }
+-  
+-  public int run(final String[] argv) throws IOException, InterruptedException {
+-    int val = -1;
+-    final Configuration conf = getConf();
+-    UserGroupInformation.setConfiguration(conf);
+-    UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-
+-    val = ugi.doAs(new PrivilegedExceptionAction<Integer>() {
+-      public Integer run() throws Exception {
+-        return runJob(conf, argv);
+-      }
+-    });
+-    
+-    // print the gridmix summary if the run was successful
+-    if (val == 0) {
+-        // print the run summary
+-        System.out.print("\n\n");
+-        System.out.println(summarizer.toString());
+-    }
+-    
+-    return val; 
+-  }
+-
+-  private int runJob(Configuration conf, String[] argv)
+-    throws IOException, InterruptedException {
+-    if (argv.length < 2) {
+-      LOG.error("Too few arguments to Gridmix.\n");
+-      printUsage(System.err);
+-      return ARGS_ERROR;
+-    }
+-
+-    long genbytes = -1L;
+-    String traceIn = null;
+-    Path ioPath = null;
+-    URI userRsrc = null;
+-    try {
+-      userResolver = ReflectionUtils.newInstance(conf.getClass(GRIDMIX_USR_RSV, 
+-                       SubmitterUserResolver.class, UserResolver.class), conf);
+-
+-      for (int i = 0; i < argv.length - 2; ++i) {
+-        if ("-generate".equals(argv[i])) {
+-          genbytes = StringUtils.TraditionalBinaryPrefix.string2long(argv[++i]);
+-          if (genbytes <= 0) {
+-            LOG.error("size of input data to be generated specified using "
+-                      + "-generate option should be nonnegative.\n");
+-            return ARGS_ERROR;
+-          }
+-        } else if ("-users".equals(argv[i])) {
+-          userRsrc = new URI(argv[++i]);
+-        } else {
+-          LOG.error("Unknown option " + argv[i] + " specified.\n");
+-          printUsage(System.err);
+-          return ARGS_ERROR;
+-        }
+-      }
+-
+-      if (userResolver.needsTargetUsersList()) {
+-        if (userRsrc != null) {
+-          if (!userResolver.setTargetUsers(userRsrc, conf)) {
+-            LOG.warn("Ignoring the user resource '" + userRsrc + "'.");
+-          }
+-        } else {
+-          LOG.error(userResolver.getClass()
+-              + " needs target user list. Use -users option.\n");
+-          printUsage(System.err);
+-          return ARGS_ERROR;
+-        }
+-      } else if (userRsrc != null) {
+-        LOG.warn("Ignoring the user resource '" + userRsrc + "'.");
+-      }
+-
+-      ioPath = new Path(argv[argv.length - 2]);
+-      traceIn = argv[argv.length - 1];
+-    } catch (Exception e) {
+-      LOG.error(e.toString() + "\n");
+-      if (LOG.isDebugEnabled()) {
+-        e.printStackTrace();
+-      }
+-
+-      printUsage(System.err);
+-      return ARGS_ERROR;
+-    }
+-
+-    // Create <ioPath> with 777 permissions
+-    final FileSystem inputFs = ioPath.getFileSystem(conf);
+-    ioPath = inputFs.makeQualified(ioPath);
+-    boolean succeeded = false;
+-    try {
+-      succeeded = FileSystem.mkdirs(inputFs, ioPath,
+-                                    new FsPermission((short)0777));
+-    } catch(IOException e) {
+-      // No need to emit this exception message
+-    } finally {
+-      if (!succeeded) {
+-        LOG.error("Failed creation of <ioPath> directory " + ioPath + "\n");
+-        return STARTUP_FAILED_ERROR;
+-      }
+-    }
+-
+-    return start(conf, traceIn, ioPath, genbytes, userResolver);
+-  }
+-
+-  /**
+-   * 
+-   * @param conf gridmix configuration
+-   * @param traceIn trace file path(if it is '-', then trace comes from the
+-   *                stream stdin)
+-   * @param ioPath Working directory for gridmix. GenerateData job
+-   *               will generate data in the directory &lt;ioPath&gt;/input/ and
+-   *               distributed cache data is generated in the directory
+-   *               &lt;ioPath&gt;/distributedCache/, if -generate option is
+-   *               specified.
+-   * @param genbytes size of input data to be generated under the directory
+-   *                 &lt;ioPath&gt;/input/
+-   * @param userResolver gridmix user resolver
+-   * @return exit code
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  int start(Configuration conf, String traceIn, Path ioPath, long genbytes,
+-      UserResolver userResolver)
+-      throws IOException, InterruptedException {
+-    DataStatistics stats = null;
+-    InputStream trace = null;
+-    int exitCode = 0;
+-
+-    try {
+-      Path scratchDir = new Path(ioPath, conf.get(GRIDMIX_OUT_DIR, "gridmix"));
+-
+-      // add shutdown hook for SIGINT, etc.
+-      Runtime.getRuntime().addShutdownHook(sdh);
+-      CountDownLatch startFlag = new CountDownLatch(1);
+-      try {
+-        // Create, start job submission threads
+-        startThreads(conf, traceIn, ioPath, scratchDir, startFlag,
+-                     userResolver);
+-        
+-        Path inputDir = getGridmixInputDataPath(ioPath);
+-        
+-        // Write input data if specified
+-        exitCode = writeInputData(genbytes, inputDir);
+-        if (exitCode != 0) {
+-          return exitCode;
+-        }
+-
+-        // publish the data statistics
+-        stats = GenerateData.publishDataStatistics(inputDir, genbytes, conf);
+-        
+-        // scan input dir contents
+-        submitter.refreshFilePool();
+-
+-        boolean shouldGenerate = (genbytes > 0);
+-        // set up the needed things for emulation of various loads
+-        exitCode = setupEmulation(conf, traceIn, scratchDir, ioPath,
+-                                  shouldGenerate);
+-        if (exitCode != 0) {
+-          return exitCode;
+-        }
+-
+-        // start the summarizer
+-        summarizer.start(conf);
+-        
+-        factory.start();
+-        statistics.start();
+-      } catch (Throwable e) {
+-        LOG.error("Startup failed. " + e.toString() + "\n");
+-        LOG.debug("Startup failed", e);
+-        if (factory != null) factory.abort(); // abort pipeline
+-        exitCode = STARTUP_FAILED_ERROR;
+-      } finally {
+-        // signal for factory to start; sets start time
+-        startFlag.countDown();
+-      }
+-      if (factory != null) {
+-        // wait for input exhaustion
+-        factory.join(Long.MAX_VALUE);
+-        final Throwable badTraceException = factory.error();
+-        if (null != badTraceException) {
+-          LOG.error("Error in trace", badTraceException);
+-          throw new IOException("Error in trace", badTraceException);
+-        }
+-        // wait for pending tasks to be submitted
+-        submitter.shutdown();
+-        submitter.join(Long.MAX_VALUE);
+-        // wait for running tasks to complete
+-        monitor.shutdown();
+-        monitor.join(Long.MAX_VALUE);
+-
+-        statistics.shutdown();
+-        statistics.join(Long.MAX_VALUE);
+-
+-      }
+-    } finally {
+-      if (factory != null) {
+-        summarizer.finalize(factory, traceIn, genbytes, userResolver, stats, 
+-                            conf);
+-      }
+-      IOUtils.cleanupWithLogger(LOG, trace);
+-    }
+-    return exitCode;
+-  }
+-
+-  /**
+-   * Create gridmix output directory. Setup things for emulation of
+-   * various loads, if needed.
+-   * @param conf gridmix configuration
+-   * @param traceIn trace file path(if it is '-', then trace comes from the
+-   *                stream stdin)
+-   * @param scratchDir gridmix output directory
+-   * @param ioPath Working directory for gridmix.
+-   * @param generate true if -generate option was specified
+-   * @return exit code
+-   * @throws IOException
+-   * @throws InterruptedException 
+-   */
+-  private int setupEmulation(Configuration conf, String traceIn,
+-      Path scratchDir, Path ioPath, boolean generate)
+-      throws IOException, InterruptedException {
+-    // create scratch directory(output directory of gridmix)
+-    final FileSystem scratchFs = scratchDir.getFileSystem(conf);
+-    FileSystem.mkdirs(scratchFs, scratchDir, new FsPermission((short) 0777));
+-
+-    // Setup things needed for emulation of distributed cache load
+-    return setupDistCacheEmulation(conf, traceIn, ioPath, generate);
+-    // Setup emulation of other loads like CPU load, Memory load
+-  }
+-
+-  /**
+-   * Setup gridmix for emulation of distributed cache load. This includes
+-   * generation of distributed cache files, if needed.
+-   * @param conf gridmix configuration
+-   * @param traceIn trace file path(if it is '-', then trace comes from the
+-   *                stream stdin)
+-   * @param ioPath &lt;ioPath&gt;/input/ is the dir where input data (a) exists
+-   *               or (b) is generated. &lt;ioPath&gt;/distributedCache/ is the
+-   *               folder where distributed cache data (a) exists or (b) is to be
+-   *               generated by gridmix.
+-   * @param generate true if -generate option was specified
+-   * @return exit code
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  private int setupDistCacheEmulation(Configuration conf, String traceIn,
+-      Path ioPath, boolean generate) throws IOException, InterruptedException {
+-    distCacheEmulator.init(traceIn, factory.jobCreator, generate);
+-    int exitCode = 0;
+-    if (distCacheEmulator.shouldGenerateDistCacheData() ||
+-        distCacheEmulator.shouldEmulateDistCacheLoad()) {
+-
+-      JobStoryProducer jsp = createJobStoryProducer(traceIn, conf);
+-      exitCode = distCacheEmulator.setupGenerateDistCacheData(jsp);
+-      if (exitCode == 0) {
+-        // If there are files to be generated, run a MapReduce job to generate
+-        // these distributed cache files of all the simulated jobs of this trace.
+-        writeDistCacheData(conf);
+-      }
+-    }
+-    return exitCode;
+-  }
+-
+-  /**
+-   * Handles orderly shutdown by requesting that each component in the
+-   * pipeline abort its progress, waiting for each to exit and killing
+-   * any jobs still running on the cluster.
+-   */
+-  class Shutdown extends Thread {
+-
+-    static final long FAC_SLEEP = 1000;
+-    static final long SUB_SLEEP = 4000;
+-    static final long MON_SLEEP = 15000;
+-
+-    private void killComponent(Component<?> component, long maxwait) {
+-      if (component == null) {
+-        return;
+-      }
+-      component.abort();
+-      try {
+-        component.join(maxwait);
+-      } catch (InterruptedException e) {
+-        LOG.warn("Interrupted waiting for " + component);
+-      }
+-
+-    }
+-
+-    @Override
+-    public void run() {
+-      LOG.info("Exiting...");
+-      try {
+-        killComponent(factory, FAC_SLEEP);   // read no more tasks
+-        killComponent(submitter, SUB_SLEEP); // submit no more tasks
+-        killComponent(monitor, MON_SLEEP);   // process remaining jobs here
+-        killComponent(statistics,MON_SLEEP);
+-      } finally {
+-        if (monitor == null) {
+-          return;
+-        }
+-        List<JobStats> remainingJobs = monitor.getRemainingJobs();
+-        if (remainingJobs.isEmpty()) {
+-          return;
+-        }
+-        LOG.info("Killing running jobs...");
+-        for (JobStats stats : remainingJobs) {
+-          Job job = stats.getJob();
+-          try {
+-            if (!job.isComplete()) {
+-              job.killJob();
+-              LOG.info("Killed " + job.getJobName() + " (" + job.getJobID() + ")");
+-            } else {
+-              if (job.isSuccessful()) {
+-                monitor.onSuccess(job);
+-              } else {
+-                monitor.onFailure(job);
+-              }
+-            }
+-          } catch (IOException e) {
+-            LOG.warn("Failure killing " + job.getJobName(), e);
+-          } catch (Exception e) {
+-            LOG.error("Unexpected exception", e);
+-          }
+-        }
+-        LOG.info("Done.");
+-      }
+-    }
+-
+-  }
+-
+-  public static void main(String[] argv) throws Exception {
+-    int res = -1;
+-    try {
+-      res = ToolRunner.run(new Configuration(), new Gridmix(argv), argv);
+-    } finally {
+-      ExitUtil.terminate(res);
+-    }
+-  }
+-
+-  private String getEnumValues(Enum<?>[] e) {
+-    StringBuilder sb = new StringBuilder();
+-    String sep = "";
+-    for (Enum<?> v : e) {
+-      sb.append(sep);
+-      sb.append(v.name());
+-      sep = "|";
+-    }
+-    return sb.toString();
+-  }
+-  
+-  private String getJobTypes() {
+-    return getEnumValues(JobCreator.values());
+-  }
+-  
+-  private String getSubmissionPolicies() {
+-    return getEnumValues(GridmixJobSubmissionPolicy.values());
+-  }
+-  
+-  protected void printUsage(PrintStream out) {
+-    ToolRunner.printGenericCommandUsage(out);
+-    out.println("Usage: gridmix [-generate <MiB>] [-users URI] [-Dname=value ...] <iopath> <trace>");
+-    out.println("  e.g. gridmix -generate 100m foo -");
+-    out.println("Options:");
+-    out.println("   -generate <MiB> : Generate input data of size MiB under "
+-        + "<iopath>/input/ and generate\n\t\t     distributed cache data under "
+-        + "<iopath>/distributedCache/.");
+-    out.println("   -users <usersResourceURI> : URI that contains the users list.");
+-    out.println("Configuration parameters:");
+-    out.println("   General parameters:");
+-    out.printf("       %-48s : Output directory%n", GRIDMIX_OUT_DIR);
+-    out.printf("       %-48s : Submitting threads%n", GRIDMIX_SUB_THR);
+-    out.printf("       %-48s : Queued job desc%n", GRIDMIX_QUE_DEP);
+-    out.printf("       %-48s : User resolution class%n", GRIDMIX_USR_RSV);
+-    out.printf("       %-48s : Job types (%s)%n", JobCreator.GRIDMIX_JOB_TYPE, getJobTypes());
+-    out.println("   Parameters related to job submission:");    
+-    out.printf("       %-48s : Default queue%n",
+-        GridmixJob.GRIDMIX_DEFAULT_QUEUE);
+-    out.printf("       %-48s : Enable/disable using queues in trace%n",
+-        GridmixJob.GRIDMIX_USE_QUEUE_IN_TRACE);
+-    out.printf("       %-48s : Job submission policy (%s)%n",
+-        GridmixJobSubmissionPolicy.JOB_SUBMISSION_POLICY, getSubmissionPolicies());
+-    out.println("   Parameters specific for LOADJOB:");
+-    out.printf("       %-48s : Key fraction of rec%n",
+-        AvgRecordFactory.GRIDMIX_KEY_FRC);
+-    out.println("   Parameters specific for SLEEPJOB:");
+-    out.printf("       %-48s : Whether to ignore reduce tasks%n",
+-        SleepJob.SLEEPJOB_MAPTASK_ONLY);
+-    out.printf("       %-48s : Number of fake locations for map tasks%n",
+-        JobCreator.SLEEPJOB_RANDOM_LOCATIONS);
+-    out.printf("       %-48s : Maximum map task runtime in mili-sec%n",
+-        SleepJob.GRIDMIX_SLEEP_MAX_MAP_TIME);
+-    out.printf("       %-48s : Maximum reduce task runtime in mili-sec (merge+reduce)%n",
+-        SleepJob.GRIDMIX_SLEEP_MAX_REDUCE_TIME);
+-    out.println("   Parameters specific for STRESS submission throttling policy:");
+-    out.printf("       %-48s : jobs vs task-tracker ratio%n",
+-        StressJobFactory.CONF_MAX_JOB_TRACKER_RATIO);
+-    out.printf("       %-48s : maps vs map-slot ratio%n",
+-        StressJobFactory.CONF_OVERLOAD_MAPTASK_MAPSLOT_RATIO);
+-    out.printf("       %-48s : reduces vs reduce-slot ratio%n",
+-        StressJobFactory.CONF_OVERLOAD_REDUCETASK_REDUCESLOT_RATIO);
+-    out.printf("       %-48s : map-slot share per job%n",
+-        StressJobFactory.CONF_MAX_MAPSLOT_SHARE_PER_JOB);
+-    out.printf("       %-48s : reduce-slot share per job%n",
+-        StressJobFactory.CONF_MAX_REDUCESLOT_SHARE_PER_JOB);
+-   }
+-
+-  /**
+-   * Components in the pipeline must support the following operations for
+-   * orderly startup and shutdown.
+-   */
+-  interface Component<T> {
+-
+-    /**
+-     * Accept an item into this component from an upstream component. If
+-     * shutdown or abort have been called, this may fail, depending on the
+-     * semantics for the component.
+-     */
+-    void add(T item) throws InterruptedException;
+-
+-    /**
+-     * Attempt to start the service.
+-     */
+-    void start();
+-
+-    /**
+-     * Wait until the service completes. It is assumed that either a
+-     * {@link #shutdown} or {@link #abort} has been requested.
+-     */
+-    void join(long millis) throws InterruptedException;
+-
+-    /**
+-     * Shut down gracefully, finishing all pending work. Reject new requests.
+-     */
+-    void shutdown();
+-
+-    /**
+-     * Shut down immediately, aborting any work in progress and discarding
+-     * all pending work. It is legal to store pending work for another
+-     * thread to process.
+-     */
+-    void abort();
+-  }
+-  // it is need for tests
+-  protected Summarizer getSummarizer() {
+-    return summarizer;
+-  }
+-  
+-}
+-
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
+deleted file mode 100644
+index 325c15c9971..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java
++++ /dev/null
+@@ -1,526 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Formatter;
+-import java.util.List;
+-import java.util.concurrent.Callable;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.Delayed;
+-import java.util.concurrent.TimeUnit;
+-import java.security.PrivilegedExceptionAction;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.RawComparator;
+-import org.apache.hadoop.io.WritableComparator;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.MRConfig;
+-import org.apache.hadoop.mapreduce.Partitioner;
+-import org.apache.hadoop.mapreduce.RecordWriter;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import static org.apache.hadoop.tools.rumen.datatypes.util.MapReduceJobPropertiesParser.extractMaxHeapOpts;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Synthetic job generated from a trace description.
+- */
+-abstract class GridmixJob implements Callable<Job>, Delayed {
+-
+-  // Gridmix job name format is GRIDMIX<6 digit sequence number>
+-  public static final String JOB_NAME_PREFIX = "GRIDMIX";
+-  public static final Logger LOG = LoggerFactory.getLogger(GridmixJob.class);
+-
+-  private static final ThreadLocal<Formatter> nameFormat =
+-    new ThreadLocal<Formatter>() {
+-      @Override
+-      protected Formatter initialValue() {
+-        final StringBuilder sb =
+-            new StringBuilder(JOB_NAME_PREFIX.length() + 6);
+-        sb.append(JOB_NAME_PREFIX);
+-        return new Formatter(sb);
+-      }
+-    };
+-
+-  private boolean submitted;
+-  protected final int seq;
+-  protected final Path outdir;
+-  protected final Job job;
+-  protected final JobStory jobdesc;
+-  protected final UserGroupInformation ugi;
+-  protected final long submissionTimeNanos;
+-  private static final ConcurrentHashMap<Integer,List<InputSplit>> descCache =
+-     new ConcurrentHashMap<Integer,List<InputSplit>>();
+-  protected static final String GRIDMIX_JOB_SEQ = "gridmix.job.seq";
+-  protected static final String GRIDMIX_USE_QUEUE_IN_TRACE = 
+-      "gridmix.job-submission.use-queue-in-trace";
+-  protected static final String GRIDMIX_DEFAULT_QUEUE = 
+-      "gridmix.job-submission.default-queue";
+-  // configuration key to enable/disable High-Ram feature emulation
+-  static final String GRIDMIX_HIGHRAM_EMULATION_ENABLE = 
+-    "gridmix.highram-emulation.enable";
+-  // configuration key to enable/disable task jvm options
+-  static final String GRIDMIX_TASK_JVM_OPTIONS_ENABLE = 
+-    "gridmix.task.jvm-options.enable";
+-
+-  private static void setJobQueue(Job job, String queue) {
+-    if (queue != null) {
+-      job.getConfiguration().set(MRJobConfig.QUEUE_NAME, queue);
+-    }
+-  }
+-  
+-  public GridmixJob(final Configuration conf, long submissionMillis,
+-      final JobStory jobdesc, Path outRoot, UserGroupInformation ugi, 
+-      final int seq) throws IOException {
+-    this.ugi = ugi;
+-    this.jobdesc = jobdesc;
+-    this.seq = seq;
+-
+-    ((StringBuilder)nameFormat.get().out()).setLength(JOB_NAME_PREFIX.length());
+-    try {
+-      job = this.ugi.doAs(new PrivilegedExceptionAction<Job>() {
+-        public Job run() throws IOException {
+-
+-          String jobId = null == jobdesc.getJobID() 
+-                         ? "<unknown>" 
+-                         : jobdesc.getJobID().toString();
+-          Job ret = Job.getInstance(conf, nameFormat.get().format("%06d", seq)
+-                                          .toString());
+-          ret.getConfiguration().setInt(GRIDMIX_JOB_SEQ, seq);
+-
+-          ret.getConfiguration().set(Gridmix.ORIGINAL_JOB_ID, jobId);
+-          ret.getConfiguration().set(Gridmix.ORIGINAL_JOB_NAME,
+-                                     jobdesc.getName());
+-          if (conf.getBoolean(GRIDMIX_USE_QUEUE_IN_TRACE, false)) {
+-            setJobQueue(ret, jobdesc.getQueueName());
+-          } else {
+-            setJobQueue(ret, conf.get(GRIDMIX_DEFAULT_QUEUE));
+-          }
+-
+-          // check if the job can emulate compression
+-          if (canEmulateCompression()) {
+-            // set the compression related configs if compression emulation is
+-            // enabled
+-            if (CompressionEmulationUtil.isCompressionEmulationEnabled(conf)) {
+-              CompressionEmulationUtil.configureCompressionEmulation(
+-                  jobdesc.getJobConf(), ret.getConfiguration());
+-            }
+-          }
+-          
+-          // configure high ram properties if enabled
+-          if (conf.getBoolean(GRIDMIX_HIGHRAM_EMULATION_ENABLE, true)) {
+-            configureHighRamProperties(jobdesc.getJobConf(), 
+-                                       ret.getConfiguration());
+-          }
+-          
+-          // configure task jvm options if enabled
+-          // this knob can be turned off if there is a mismatch between the
+-          // target (simulation) cluster and the original cluster. Such a 
+-          // mismatch can result in job failures (due to memory issues) on the 
+-          // target (simulated) cluster.
+-          //
+-          // TODO If configured, scale the original task's JVM (heap related)
+-          //      options to suit the target (simulation) cluster
+-          if (conf.getBoolean(GRIDMIX_TASK_JVM_OPTIONS_ENABLE, true)) {
+-            configureTaskJVMOptions(jobdesc.getJobConf(), 
+-                                    ret.getConfiguration());
+-          }
+-          
+-          return ret;
+-        }
+-      });
+-    } catch (InterruptedException e) {
+-      throw new IOException(e);
+-    }
+-
+-    submissionTimeNanos = TimeUnit.NANOSECONDS.convert(
+-        submissionMillis, TimeUnit.MILLISECONDS);
+-    outdir = new Path(outRoot, "" + seq);
+-  }
+-  
+-  @SuppressWarnings("deprecation")
+-  protected static void configureTaskJVMOptions(Configuration originalJobConf,
+-                                                Configuration simulatedJobConf){
+-    // Get the heap related java opts used for the original job and set the 
+-    // same for the simulated job.
+-    //    set task task heap options
+-    configureTaskJVMMaxHeapOptions(originalJobConf, simulatedJobConf, 
+-                                   JobConf.MAPRED_TASK_JAVA_OPTS);
+-    //  set map task heap options
+-    configureTaskJVMMaxHeapOptions(originalJobConf, simulatedJobConf, 
+-                                   MRJobConfig.MAP_JAVA_OPTS);
+-
+-    //  set reduce task heap options
+-    configureTaskJVMMaxHeapOptions(originalJobConf, simulatedJobConf, 
+-                                   MRJobConfig.REDUCE_JAVA_OPTS);
+-  }
+-  
+-  // Configures the task's max heap options using the specified key
+-  private static void configureTaskJVMMaxHeapOptions(Configuration srcConf, 
+-                                                     Configuration destConf,
+-                                                     String key) {
+-    String srcHeapOpts = srcConf.get(key);
+-    if (srcHeapOpts != null) {
+-      List<String> srcMaxOptsList = new ArrayList<String>();
+-      // extract the max heap options and ignore the rest
+-      extractMaxHeapOpts(srcHeapOpts, srcMaxOptsList, 
+-                         new ArrayList<String>());
+-      if (srcMaxOptsList.size() > 0) {
+-        List<String> destOtherOptsList = new ArrayList<String>();
+-        // extract the other heap options and ignore the max options in the 
+-        // destination configuration
+-        String destHeapOpts = destConf.get(key);
+-        if (destHeapOpts != null) {
+-          extractMaxHeapOpts(destHeapOpts, new ArrayList<String>(), 
+-                             destOtherOptsList);
+-        }
+-        
+-        // the source configuration might have some task level max heap opts set
+-        // remove these opts from the destination configuration and replace
+-        // with the options set in the original configuration
+-        StringBuilder newHeapOpts = new StringBuilder();
+-        
+-        for (String otherOpt : destOtherOptsList) {
+-          newHeapOpts.append(otherOpt).append(" ");
+-        }
+-        
+-        for (String opts : srcMaxOptsList) {
+-          newHeapOpts.append(opts).append(" ");
+-        }
+-        
+-        // set the final heap opts 
+-        destConf.set(key, newHeapOpts.toString().trim());
+-      }
+-    }
+-  }
+-
+-  // Scales the desired job-level configuration parameter. This API makes sure 
+-  // that the ratio of the job level configuration parameter to the cluster 
+-  // level configuration parameter is maintained in the simulated run. Hence 
+-  // the values are scaled from the original cluster's configuration to the 
+-  // simulated cluster's configuration for higher emulation accuracy.
+-  // This kind of scaling is useful for memory parameters.
+-  private static void scaleConfigParameter(Configuration sourceConf, 
+-                        Configuration destConf, String clusterValueKey, 
+-                        String jobValueKey, long defaultValue) {
+-    long simulatedClusterDefaultValue = 
+-           destConf.getLong(clusterValueKey, defaultValue);
+-    
+-    long originalClusterDefaultValue = 
+-           sourceConf.getLong(clusterValueKey, defaultValue);
+-    
+-    long originalJobValue = 
+-           sourceConf.getLong(jobValueKey, defaultValue);
+-    
+-    double scaleFactor = (double)originalJobValue/originalClusterDefaultValue;
+-    
+-    long simulatedJobValue = (long)(scaleFactor * simulatedClusterDefaultValue);
+-    
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("For the job configuration parameter '" + jobValueKey 
+-                + "' and the cluster configuration parameter '" 
+-                + clusterValueKey + "', the original job's configuration value"
+-                + " is scaled from '" + originalJobValue + "' to '" 
+-                + simulatedJobValue + "' using the default (unit) value of "
+-                + "'" + originalClusterDefaultValue + "' for the original "
+-                + " cluster and '" + simulatedClusterDefaultValue + "' for the"
+-                + " simulated cluster.");
+-    }
+-    
+-    destConf.setLong(jobValueKey, simulatedJobValue);
+-  }
+-  
+-  // Checks if the scaling of original job's memory parameter value is 
+-  // valid
+-  @SuppressWarnings("deprecation")
+-  private static boolean checkMemoryUpperLimits(String jobKey, String limitKey,  
+-                                                Configuration conf, 
+-                                                boolean convertLimitToMB) {
+-    if (conf.get(limitKey) != null) {
+-      long limit = conf.getLong(limitKey, JobConf.DISABLED_MEMORY_LIMIT);
+-      // scale only if the max memory limit is set.
+-      if (limit >= 0) {
+-        if (convertLimitToMB) {
+-          limit /= (1024 * 1024); //Converting to MB
+-        }
+-        
+-        long scaledConfigValue = 
+-               conf.getLong(jobKey, JobConf.DISABLED_MEMORY_LIMIT);
+-        
+-        // check now
+-        if (scaledConfigValue > limit) {
+-          throw new RuntimeException("Simulated job's configuration" 
+-              + " parameter '" + jobKey + "' got scaled to a value '" 
+-              + scaledConfigValue + "' which exceeds the upper limit of '" 
+-              + limit + "' defined for the simulated cluster by the key '" 
+-              + limitKey + "'. To disable High-Ram feature emulation, set '" 
+-              + GRIDMIX_HIGHRAM_EMULATION_ENABLE + "' to 'false'.");
+-        }
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-  
+-  // Check if the parameter scaling does not exceed the cluster limits.
+-  @SuppressWarnings("deprecation")
+-  private static void validateTaskMemoryLimits(Configuration conf, 
+-                        String jobKey, String clusterMaxKey) {
+-    if (!checkMemoryUpperLimits(jobKey, 
+-        JobConf.UPPER_LIMIT_ON_TASK_VMEM_PROPERTY, conf, true)) {
+-      checkMemoryUpperLimits(jobKey, clusterMaxKey, conf, false);
+-    }
+-  }
+-
+-  /**
+-   * Sets the high ram job properties in the simulated job's configuration.
+-   */
+-  @SuppressWarnings("deprecation")
+-  static void configureHighRamProperties(Configuration sourceConf, 
+-                                         Configuration destConf) {
+-    // set the memory per map task
+-    scaleConfigParameter(sourceConf, destConf, 
+-                         MRConfig.MAPMEMORY_MB, MRJobConfig.MAP_MEMORY_MB, 
+-                         MRJobConfig.DEFAULT_MAP_MEMORY_MB);
+-    
+-    // validate and fail early
+-    validateTaskMemoryLimits(destConf, MRJobConfig.MAP_MEMORY_MB, 
+-                             JTConfig.JT_MAX_MAPMEMORY_MB);
+-    
+-    // set the memory per reduce task
+-    scaleConfigParameter(sourceConf, destConf, 
+-                         MRConfig.REDUCEMEMORY_MB, MRJobConfig.REDUCE_MEMORY_MB,
+-                         MRJobConfig.DEFAULT_REDUCE_MEMORY_MB);
+-    // validate and fail early
+-    validateTaskMemoryLimits(destConf, MRJobConfig.REDUCE_MEMORY_MB, 
+-                             JTConfig.JT_MAX_REDUCEMEMORY_MB);
+-  }
+-  
+-  /**
+-   * Indicates whether this {@link GridmixJob} supports compression emulation.
+-   */
+-  protected abstract boolean canEmulateCompression();
+-  
+-  protected GridmixJob(final Configuration conf, long submissionMillis, 
+-                       final String name) throws IOException {
+-    submissionTimeNanos = TimeUnit.NANOSECONDS.convert(
+-        submissionMillis, TimeUnit.MILLISECONDS);
+-    jobdesc = null;
+-    outdir = null;
+-    seq = -1;
+-    ugi = UserGroupInformation.getCurrentUser();
+-
+-    try {
+-      job = this.ugi.doAs(new PrivilegedExceptionAction<Job>() {
+-        public Job run() throws IOException {
+-          Job ret = Job.getInstance(conf, name);
+-          ret.getConfiguration().setInt(GRIDMIX_JOB_SEQ, seq);
+-          setJobQueue(ret, conf.get(GRIDMIX_DEFAULT_QUEUE));
+-          return ret;
+-        }
+-      });
+-    } catch (InterruptedException e) {
+-      throw new IOException(e);
+-    }
+-  }
+-
+-  public UserGroupInformation getUgi() {
+-    return ugi;
+-  }
+-
+-  public String toString() {
+-    return job.getJobName();
+-  }
+-
+-  public long getDelay(TimeUnit unit) {
+-    return unit.convert(submissionTimeNanos - System.nanoTime(),
+-        TimeUnit.NANOSECONDS);
+-  }
+-
+-  @Override
+-  public int compareTo(Delayed other) {
+-    if (this == other) {
+-      return 0;
+-    }
+-    if (other instanceof GridmixJob) {
+-      final long otherNanos = ((GridmixJob)other).submissionTimeNanos;
+-      if (otherNanos < submissionTimeNanos) {
+-        return 1;
+-      }
+-      if (otherNanos > submissionTimeNanos) {
+-        return -1;
+-      }
+-      return id() - ((GridmixJob)other).id();
+-    }
+-    final long diff =
+-      getDelay(TimeUnit.NANOSECONDS) - other.getDelay(TimeUnit.NANOSECONDS);
+-    return 0 == diff ? 0 : (diff > 0 ? 1 : -1);
+-  }
+-
+-  @Override
+-  public boolean equals(Object other) {
+-    if (this == other) {
+-      return true;
+-    }
+-    // not possible unless job is cloned; all jobs should be unique
+-    return other instanceof GridmixJob && id() == ((GridmixJob)other).id();
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return id();
+-  }
+-
+-  int id() {
+-    return seq;
+-  }
+-
+-  Job getJob() {
+-    return job;
+-  }
+-
+-  JobStory getJobDesc() {
+-    return jobdesc;
+-  }
+-
+-  void setSubmitted() {
+-    submitted = true;
+-  }
+-  
+-  boolean isSubmitted() {
+-    return submitted;
+-  }
+-  
+-  static void pushDescription(int seq, List<InputSplit> splits) {
+-    if (null != descCache.putIfAbsent(seq, splits)) {
+-      throw new IllegalArgumentException("Description exists for id " + seq);
+-    }
+-  }
+-
+-  static List<InputSplit> pullDescription(JobContext jobCtxt) {
+-    return pullDescription(GridmixJob.getJobSeqId(jobCtxt));
+-  }
+-  
+-  static List<InputSplit> pullDescription(int seq) {
+-    return descCache.remove(seq);
+-  }
+-
+-  static void clearAll() {
+-    descCache.clear();
+-  }
+-
+-  void buildSplits(FilePool inputDir) throws IOException {
+-
+-  }
+-  static int getJobSeqId(JobContext job) {
+-    return job.getConfiguration().getInt(GRIDMIX_JOB_SEQ,-1);
+-  }
+-
+-  public static class DraftPartitioner<V> extends Partitioner<GridmixKey,V> {
+-    public int getPartition(GridmixKey key, V value, int numReduceTasks) {
+-      return key.getPartition();
+-    }
+-  }
+-
+-  public static class SpecGroupingComparator
+-      implements RawComparator<GridmixKey> {
+-    private final DataInputBuffer di = new DataInputBuffer();
+-    private final byte[] reset = di.getData();
+-    @Override
+-    public int compare(GridmixKey g1, GridmixKey g2) {
+-      final byte t1 = g1.getType();
+-      final byte t2 = g2.getType();
+-      if (t1 == GridmixKey.REDUCE_SPEC ||
+-          t2 == GridmixKey.REDUCE_SPEC) {
+-        return t1 - t2;
+-      }
+-      assert t1 == GridmixKey.DATA;
+-      assert t2 == GridmixKey.DATA;
+-      return g1.compareTo(g2);
+-    }
+-    @Override
+-    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+-      try {
+-        final int ret;
+-        di.reset(b1, s1, l1);
+-        final int x1 = WritableUtils.readVInt(di);
+-        di.reset(b2, s2, l2);
+-        final int x2 = WritableUtils.readVInt(di);
+-        final int t1 = b1[s1 + x1];
+-        final int t2 = b2[s2 + x2];
+-        if (t1 == GridmixKey.REDUCE_SPEC ||
+-            t2 == GridmixKey.REDUCE_SPEC) {
+-          ret = t1 - t2;
+-        } else {
+-          assert t1 == GridmixKey.DATA;
+-          assert t2 == GridmixKey.DATA;
+-          ret =
+-            WritableComparator.compareBytes(b1, s1, x1, b2, s2, x2);
+-        }
+-        di.reset(reset, 0, 0);
+-        return ret;
+-      } catch (IOException e) {
+-        throw new RuntimeException(e);
+-      }
+-    }
+-  }
+-
+-  static class RawBytesOutputFormat<K>
+-      extends FileOutputFormat<K,GridmixRecord> {
+-
+-    @Override
+-    public RecordWriter<K,GridmixRecord> getRecordWriter(
+-        TaskAttemptContext job) throws IOException {
+-
+-      Path file = getDefaultWorkFile(job, "");
+-      final DataOutputStream fileOut;
+-
+-      fileOut = 
+-        new DataOutputStream(CompressionEmulationUtil
+-            .getPossiblyCompressedOutputStream(file, job.getConfiguration()));
+-
+-      return new RecordWriter<K,GridmixRecord>() {
+-        @Override
+-        public void write(K ignored, GridmixRecord value)
+-            throws IOException {
+-          // Let the Gridmix record fill itself.
+-          value.write(fileOut);
+-        }
+-        @Override
+-        public void close(TaskAttemptContext ctxt) throws IOException {
+-          fileOut.close();
+-        }
+-      };
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java
+deleted file mode 100644
+index b8035386d16..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java
++++ /dev/null
+@@ -1,90 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats;
+-
+-import java.util.concurrent.CountDownLatch;
+-import java.io.IOException;
+-import org.apache.hadoop.util.StringUtils;
+-
+-enum GridmixJobSubmissionPolicy {
+-
+-  REPLAY("REPLAY", 320000) {
+-    @Override
+-    public JobFactory<ClusterStats> createJobFactory(
+-      JobSubmitter submitter, JobStoryProducer producer, Path scratchDir,
+-      Configuration conf, CountDownLatch startFlag, UserResolver userResolver)
+-      throws IOException {
+-      return new ReplayJobFactory(
+-        submitter, producer, scratchDir, conf, startFlag, userResolver);
+-    }
+-  },
+-
+-  STRESS("STRESS", 5000) {
+-    @Override
+-    public JobFactory<ClusterStats> createJobFactory(
+-      JobSubmitter submitter, JobStoryProducer producer, Path scratchDir,
+-      Configuration conf, CountDownLatch startFlag, UserResolver userResolver)
+-      throws IOException {
+-      return new StressJobFactory(
+-        submitter, producer, scratchDir, conf, startFlag, userResolver);
+-    }
+-  },
+-
+-  SERIAL("SERIAL", 0) {
+-    @Override
+-    public JobFactory<JobStats> createJobFactory(
+-      JobSubmitter submitter, JobStoryProducer producer, Path scratchDir,
+-      Configuration conf, CountDownLatch startFlag, UserResolver userResolver)
+-      throws IOException {
+-      return new SerialJobFactory(
+-        submitter, producer, scratchDir, conf, startFlag, userResolver);
+-    }
+-  };
+-
+-  public static final String JOB_SUBMISSION_POLICY =
+-    "gridmix.job-submission.policy";
+-
+-  private final String name;
+-  private final int pollingInterval;
+-
+-  GridmixJobSubmissionPolicy(String name, int pollingInterval) {
+-    this.name = name;
+-    this.pollingInterval = pollingInterval;
+-  }
+-
+-  public abstract JobFactory createJobFactory(
+-    JobSubmitter submitter, JobStoryProducer producer, Path scratchDir,
+-    Configuration conf, CountDownLatch startFlag, UserResolver userResolver)
+-    throws IOException;
+-
+-  public int getPollingInterval() {
+-    return pollingInterval;
+-  }
+-
+-  public static GridmixJobSubmissionPolicy getPolicy(
+-    Configuration conf, GridmixJobSubmissionPolicy defaultPolicy) {
+-    String policy = conf.get(JOB_SUBMISSION_POLICY, defaultPolicy.name());
+-    return valueOf(StringUtils.toUpperCase(policy));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
+deleted file mode 100644
+index e03e1b9d3cc..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java
++++ /dev/null
+@@ -1,301 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.io.WritableComparator;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-
+-class GridmixKey extends GridmixRecord {
+-  static final byte REDUCE_SPEC = 0;
+-  static final byte DATA = 1;
+-
+-  static final int META_BYTES = 1;
+-
+-  private byte type;
+-  private int partition; // NOT serialized
+-  private Spec spec = new Spec();
+-
+-  GridmixKey() {
+-    this(DATA, 1, 0L);
+-  }
+-  GridmixKey(byte type, int size, long seed) {
+-    super(size, seed);
+-    this.type = type;
+-    // setting type may change pcnt random bytes
+-    setSize(size);
+-  }
+-
+-  @Override
+-  public int getSize() {
+-    switch (type) {
+-      case REDUCE_SPEC:
+-        return super.getSize() + spec.getSize() + META_BYTES;
+-      case DATA:
+-        return super.getSize() + META_BYTES;
+-      default:
+-        throw new IllegalStateException("Invalid type: " + type);
+-    }
+-  }
+-
+-  @Override
+-  public void setSize(int size) {
+-    switch (type) {
+-      case REDUCE_SPEC:
+-        super.setSize(size - (META_BYTES + spec.getSize()));
+-        break;
+-      case DATA:
+-        super.setSize(size - META_BYTES);
+-        break;
+-      default:
+-        throw new IllegalStateException("Invalid type: " + type);
+-    }
+-  }
+-
+-  /**
+-   * Partition is not serialized.
+-   */
+-  public int getPartition() {
+-    return partition;
+-  }
+-  public void setPartition(int partition) {
+-    this.partition = partition;
+-  }
+-
+-  public long getReduceInputRecords() {
+-    assert REDUCE_SPEC == getType();
+-    return spec.rec_in;
+-  }
+-  public void setReduceInputRecords(long rec_in) {
+-    assert REDUCE_SPEC == getType();
+-    final int origSize = getSize();
+-    spec.rec_in = rec_in;
+-    setSize(origSize);
+-  }
+-
+-  public long getReduceOutputRecords() {
+-    assert REDUCE_SPEC == getType();
+-    return spec.rec_out;
+-  }
+-  public void setReduceOutputRecords(long rec_out) {
+-    assert REDUCE_SPEC == getType();
+-    final int origSize = getSize();
+-    spec.rec_out = rec_out;
+-    setSize(origSize);
+-  }
+-
+-  public long getReduceOutputBytes() {
+-    assert REDUCE_SPEC == getType();
+-    return spec.bytes_out;
+-  };
+-  public void setReduceOutputBytes(long b_out) {
+-    assert REDUCE_SPEC == getType();
+-    final int origSize = getSize();
+-    spec.bytes_out = b_out;
+-    setSize(origSize);
+-  }
+-
+-  /**
+-   * Get the {@link ResourceUsageMetrics} stored in the key.
+-   */
+-  public ResourceUsageMetrics getReduceResourceUsageMetrics() {
+-    assert REDUCE_SPEC == getType();
+-    return spec.metrics;
+-  }
+-  
+-  /**
+-   * Store the {@link ResourceUsageMetrics} in the key.
+-   */
+-  public void setReduceResourceUsageMetrics(ResourceUsageMetrics metrics) {
+-    assert REDUCE_SPEC == getType();
+-    spec.setResourceUsageSpecification(metrics);
+-  }
+-  
+-  public byte getType() {
+-    return type;
+-  }
+-  public void setType(byte type) throws IOException {
+-    final int origSize = getSize();
+-    switch (type) {
+-      case REDUCE_SPEC:
+-      case DATA:
+-        this.type = type;
+-        break;
+-      default:
+-        throw new IOException("Invalid type: " + type);
+-    }
+-    setSize(origSize);
+-  }
+-
+-  public void setSpec(Spec spec) {
+-    assert REDUCE_SPEC == getType();
+-    final int origSize = getSize();
+-    this.spec.set(spec);
+-    setSize(origSize);
+-  }
+-
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    super.readFields(in);
+-    setType(in.readByte());
+-    if (REDUCE_SPEC == getType()) {
+-      spec.readFields(in);
+-    }
+-  }
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    super.write(out);
+-    final byte t = getType();
+-    out.writeByte(t);
+-    if (REDUCE_SPEC == t) {
+-      spec.write(out);
+-    }
+-  }
+-  int fixedBytes() {
+-    return super.fixedBytes() +
+-      (REDUCE_SPEC == getType() ? spec.getSize() : 0) + META_BYTES;
+-  }
+-  @Override
+-  public int compareTo(GridmixRecord other) {
+-    final GridmixKey o = (GridmixKey) other;
+-    final byte t1 = getType();
+-    final byte t2 = o.getType();
+-    if (t1 != t2) {
+-      return t1 - t2;
+-    }
+-    return super.compareTo(other);
+-  }
+-
+-  /**
+-   * Note that while the spec is not explicitly included, changing the spec
+-   * may change its size, which will affect equality.
+-   */
+-  @Override
+-  public boolean equals(Object other) {
+-    if (this == other) {
+-      return true;
+-    }
+-    if (other != null && other.getClass() == getClass()) {
+-      final GridmixKey o = ((GridmixKey)other);
+-      return getType() == o.getType() && super.equals(o);
+-    }
+-    return false;
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return super.hashCode() ^ getType();
+-  }
+-
+-  public static class Spec implements Writable {
+-    long rec_in;
+-    long rec_out;
+-    long bytes_out;
+-    private ResourceUsageMetrics metrics = null;
+-    private int sizeOfResourceUsageMetrics = 0;
+-    public Spec() { }
+-
+-    public void set(Spec other) {
+-      rec_in = other.rec_in;
+-      bytes_out = other.bytes_out;
+-      rec_out = other.rec_out;
+-      setResourceUsageSpecification(other.metrics);
+-    }
+-
+-    /**
+-     * Sets the {@link ResourceUsageMetrics} for this {@link Spec}.
+-     */
+-    public void setResourceUsageSpecification(ResourceUsageMetrics metrics) {
+-      this.metrics = metrics;
+-      if (metrics != null) {
+-        this.sizeOfResourceUsageMetrics = metrics.size();
+-      } else {
+-        this.sizeOfResourceUsageMetrics = 0;
+-      }
+-    }
+-    
+-    public int getSize() {
+-      return WritableUtils.getVIntSize(rec_in) +
+-             WritableUtils.getVIntSize(rec_out) +
+-             WritableUtils.getVIntSize(bytes_out) +
+-             WritableUtils.getVIntSize(sizeOfResourceUsageMetrics) +
+-             sizeOfResourceUsageMetrics;
+-    }
+-
+-    @Override
+-    public void readFields(DataInput in) throws IOException {
+-      rec_in = WritableUtils.readVLong(in);
+-      rec_out = WritableUtils.readVLong(in);
+-      bytes_out = WritableUtils.readVLong(in);
+-      sizeOfResourceUsageMetrics =  WritableUtils.readVInt(in);
+-      if (sizeOfResourceUsageMetrics > 0) {
+-        metrics = new ResourceUsageMetrics();
+-        metrics.readFields(in);
+-      }
+-    }
+-
+-    @Override
+-    public void write(DataOutput out) throws IOException {
+-      WritableUtils.writeVLong(out, rec_in);
+-      WritableUtils.writeVLong(out, rec_out);
+-      WritableUtils.writeVLong(out, bytes_out);
+-      WritableUtils.writeVInt(out, sizeOfResourceUsageMetrics);
+-      if (sizeOfResourceUsageMetrics > 0) {
+-        metrics.write(out);
+-      }
+-    }
+-  }
+-
+-  public static class Comparator extends GridmixRecord.Comparator {
+-
+-    private final DataInputBuffer di = new DataInputBuffer();
+-    private final byte[] reset = di.getData();
+-
+-    public Comparator() {
+-      super(GridmixKey.class);
+-    }
+-
+-    @Override
+-    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+-      try {
+-        di.reset(b1, s1, l1);
+-        final int x1 = WritableUtils.readVInt(di);
+-        di.reset(b2, s2, l2);
+-        final int x2 = WritableUtils.readVInt(di);
+-        final int ret = (b1[s1 + x1] != b2[s2 + x2])
+-          ? b1[s1 + x1] - b2[s2 + x2]
+-          : super.compare(b1, s1, x1, b2, s2, x2);
+-        di.reset(reset, 0, 0);
+-        return ret;
+-      } catch (IOException e) {
+-        throw new RuntimeException(e);
+-      }
+-    }
+-
+-    static {
+-      WritableComparator.define(GridmixKey.class, new Comparator());
+-    }
+-  }
+-}
+-
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
+deleted file mode 100644
+index afb95cab87c..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java
++++ /dev/null
+@@ -1,272 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Arrays;
+-
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.io.WritableComparator;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-
+-class GridmixRecord implements WritableComparable<GridmixRecord> {
+-
+-  private static final int FIXED_BYTES = 1;
+-  private int size = -1;
+-  private long seed;
+-  private final DataInputBuffer dib =
+-    new DataInputBuffer();
+-  private final DataOutputBuffer dob =
+-    new DataOutputBuffer(Long.SIZE / Byte.SIZE);
+-  private byte[] literal = dob.getData();
+-  private boolean compressible = false;
+-  private float compressionRatio = 
+-    CompressionEmulationUtil.DEFAULT_COMPRESSION_RATIO;
+-  private RandomTextDataGenerator rtg = null;
+-
+-  GridmixRecord() {
+-    this(1, 0L);
+-  }
+-
+-  GridmixRecord(int size, long seed) {
+-    this.seed = seed;
+-    setSizeInternal(size);
+-  }
+-
+-  public int getSize() {
+-    return size;
+-  }
+-
+-  public void setSize(int size) {
+-    setSizeInternal(size);
+-  }
+-
+-  void setCompressibility(boolean compressible, float ratio) {
+-    this.compressible = compressible;
+-    this.compressionRatio = ratio;
+-    // Initialize the RandomTextDataGenerator once for every GridMix record
+-    // Note that RandomTextDataGenerator is needed only when the GridMix record
+-    // is configured to generate compressible text data.
+-    if (compressible) {
+-      rtg = 
+-        CompressionEmulationUtil.getRandomTextDataGenerator(ratio, 
+-                                   RandomTextDataGenerator.DEFAULT_SEED);
+-    }
+-  }
+-  
+-  private void setSizeInternal(int size) {
+-    this.size = Math.max(1, size);
+-    try {
+-      seed = maskSeed(seed, this.size);
+-      dob.reset();
+-      dob.writeLong(seed);
+-    } catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  public final void setSeed(long seed) {
+-    this.seed = seed;
+-  }
+-
+-  /** Marsaglia, 2003. */
+-  long nextRand(long x) {
+-    x ^= (x << 13);
+-    x ^= (x >>> 7);
+-    return (x ^= (x << 17));
+-  }
+-
+-  /**
+-   * Generate random text data that can be compressed. If the record is marked
+-   * compressible (via {@link FileOutputFormat#COMPRESS}), only then the 
+-   * random data will be text data else 
+-   * {@link GridmixRecord#writeRandom(DataOutput, int)} will be invoked.
+-   */
+-  private void writeRandomText(DataOutput out, final int size) 
+-  throws IOException {
+-    long tmp = seed;
+-    out.writeLong(tmp);
+-    int i = size - (Long.SIZE / Byte.SIZE);
+-    //TODO Should we use long for size. What if the data is more than 4G?
+-    
+-    String randomWord = rtg.getRandomWord();
+-    byte[] bytes = randomWord.getBytes(StandardCharsets.UTF_8);
+-    long randomWordSize = bytes.length;
+-    while (i >= randomWordSize) {
+-      out.write(bytes);
+-      i -= randomWordSize;
+-      
+-      // get the next random word
+-      randomWord = rtg.getRandomWord();
+-      bytes = randomWord.getBytes(StandardCharsets.UTF_8);
+-      // determine the random word size
+-      randomWordSize = bytes.length;
+-    }
+-    
+-    // pad the remaining bytes
+-    if (i > 0) {
+-      out.write(bytes, 0, i);
+-    }
+-  }
+-  
+-  public void writeRandom(DataOutput out, final int size) throws IOException {
+-    long tmp = seed;
+-    out.writeLong(tmp);
+-    int i = size - (Long.SIZE / Byte.SIZE);
+-    while (i > Long.SIZE / Byte.SIZE - 1) {
+-      tmp = nextRand(tmp);
+-      out.writeLong(tmp);
+-      i -= Long.SIZE / Byte.SIZE;
+-    }
+-    for (tmp = nextRand(tmp); i > 0; --i) {
+-      out.writeByte((int)(tmp & 0xFF));
+-      tmp >>>= Byte.SIZE;
+-    }
+-  }
+-
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    size = WritableUtils.readVInt(in);
+-    int payload = size - WritableUtils.getVIntSize(size);
+-    if (payload > Long.SIZE / Byte.SIZE) {
+-      seed = in.readLong();
+-      payload -= Long.SIZE / Byte.SIZE;
+-    } else {
+-      Arrays.fill(literal, (byte)0);
+-      in.readFully(literal, 0, payload);
+-      dib.reset(literal, 0, literal.length);
+-      seed = dib.readLong();
+-      payload = 0;
+-    }
+-    final int vBytes = in.skipBytes(payload);
+-    if (vBytes != payload) {
+-      throw new EOFException("Expected " + payload + ", read " + vBytes);
+-    }
+-  }
+-
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    // data bytes including vint encoding
+-    WritableUtils.writeVInt(out, size);
+-    final int payload = size - WritableUtils.getVIntSize(size);
+-    if (payload > Long.SIZE / Byte.SIZE) {
+-      if (compressible) {
+-        writeRandomText(out, payload);
+-      } else {
+-        writeRandom(out, payload);
+-      }
+-    } else if (payload > 0) {
+-      //TODO What is compressible is turned on? LOG is a bad idea!
+-      out.write(literal, 0, payload);
+-    }
+-  }
+-
+-  @Override
+-  public int compareTo(GridmixRecord other) {
+-    return compareSeed(other.seed,
+-        Math.max(0, other.getSize() - other.fixedBytes()));
+-  }
+-
+-  int fixedBytes() {
+-    // min vint size
+-    return FIXED_BYTES;
+-  }
+-
+-  private static long maskSeed(long sd, int sz) {
+-    // Don't use fixedBytes here; subclasses will set intended random len
+-    if (sz <= FIXED_BYTES) {
+-      sd = 0L;
+-    } else if (sz < Long.SIZE / Byte.SIZE + FIXED_BYTES) {
+-      final int tmp = sz - FIXED_BYTES;
+-      final long mask = (1L << (Byte.SIZE * tmp)) - 1;
+-      sd &= mask << (Byte.SIZE * (Long.SIZE / Byte.SIZE - tmp));
+-    }
+-    return sd;
+-  }
+-
+-  int compareSeed(long jSeed, int jSize) {
+-    final int iSize = Math.max(0, getSize() - fixedBytes());
+-    final int seedLen = Math.min(iSize, jSize) + FIXED_BYTES;
+-    jSeed = maskSeed(jSeed, seedLen);
+-    long iSeed = maskSeed(seed, seedLen);
+-    final int cmplen = Math.min(iSize, jSize);
+-    for (int i = 0; i < cmplen; i += Byte.SIZE) {
+-      final int k = cmplen - i;
+-      for (long j = Long.SIZE - Byte.SIZE;
+-          j >= Math.max(0, Long.SIZE / Byte.SIZE - k) * Byte.SIZE;
+-          j -= Byte.SIZE) {
+-        final int xi = (int)((iSeed >>> j) & 0xFFL);
+-        final int xj = (int)((jSeed >>> j) & 0xFFL);
+-        if (xi != xj) {
+-          return xi - xj;
+-        }
+-      }
+-      iSeed = nextRand(iSeed);
+-      jSeed = nextRand(jSeed);
+-    }
+-    return iSize - jSize;
+-  }
+-
+-  @Override
+-  public boolean equals(Object other) {
+-    if (this == other) {
+-      return true;
+-    }
+-    if (other != null && other.getClass() == getClass()) {
+-      final GridmixRecord o = ((GridmixRecord)other);
+-      return getSize() == o.getSize() && seed == o.seed;
+-    }
+-    return false;
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return (int)(seed * getSize());
+-  }
+-
+-  public static class Comparator extends WritableComparator {
+-
+-    public Comparator() {
+-      super(GridmixRecord.class);
+-    }
+-
+-    public Comparator(Class<? extends WritableComparable<?>> sub) {
+-      super(sub);
+-    }
+-
+-    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+-      int n1 = WritableUtils.decodeVIntSize(b1[s1]);
+-      int n2 = WritableUtils.decodeVIntSize(b2[s2]);
+-      n1 -= WritableUtils.getVIntSize(n1);
+-      n2 -= WritableUtils.getVIntSize(n2);
+-      return compareBytes(b1, s1+n1, l1-n1, b2, s2+n2, l2-n2);
+-    }
+-
+-    static {
+-      WritableComparator.define(GridmixRecord.class, new Comparator());
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
+deleted file mode 100644
+index b611c9dfd00..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/GridmixSplit.java
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-
+-class GridmixSplit extends CombineFileSplit {
+-  private int id;
+-  private int nSpec;
+-  private int maps;
+-  private int reduces;
+-  private long inputRecords;
+-  private long outputBytes;
+-  private long outputRecords;
+-  private long maxMemory;
+-  private double[] reduceBytes = new double[0];
+-  private double[] reduceRecords = new double[0];
+-
+-  // Spec for reduces id mod this
+-  private long[] reduceOutputBytes = new long[0];
+-  private long[] reduceOutputRecords = new long[0];
+-
+-  GridmixSplit() {
+-    super();
+-  }
+-
+-  public GridmixSplit(CombineFileSplit cfsplit, int maps, int id,
+-      long inputBytes, long inputRecords, long outputBytes,
+-      long outputRecords, double[] reduceBytes, double[] reduceRecords,
+-      long[] reduceOutputBytes, long[] reduceOutputRecords)
+-      throws IOException {
+-    super(cfsplit);
+-    this.id = id;
+-    this.maps = maps;
+-    reduces = reduceBytes.length;
+-    this.inputRecords = inputRecords;
+-    this.outputBytes = outputBytes;
+-    this.outputRecords = outputRecords;
+-    this.reduceBytes = reduceBytes;
+-    this.reduceRecords = reduceRecords;
+-    nSpec = reduceOutputBytes.length;
+-    this.reduceOutputBytes = reduceOutputBytes;
+-    this.reduceOutputRecords = reduceOutputRecords;
+-  }
+-  public int getId() {
+-    return id;
+-  }
+-  public int getMapCount() {
+-    return maps;
+-  }
+-  public long getInputRecords() {
+-    return inputRecords;
+-  }
+-  public long[] getOutputBytes() {
+-    if (0 == reduces) {
+-      return new long[] { outputBytes };
+-    }
+-    final long[] ret = new long[reduces];
+-    for (int i = 0; i < reduces; ++i) {
+-      ret[i] = Math.round(outputBytes * reduceBytes[i]);
+-    }
+-    return ret;
+-  }
+-  public long[] getOutputRecords() {
+-    if (0 == reduces) {
+-      return new long[] { outputRecords };
+-    }
+-    final long[] ret = new long[reduces];
+-    for (int i = 0; i < reduces; ++i) {
+-      ret[i] = Math.round(outputRecords * reduceRecords[i]);
+-    }
+-    return ret;
+-  }
+-  public long getReduceBytes(int i) {
+-    return reduceOutputBytes[i];
+-  }
+-  public long getReduceRecords(int i) {
+-    return reduceOutputRecords[i];
+-  }
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    super.write(out);
+-    WritableUtils.writeVInt(out, id);
+-    WritableUtils.writeVInt(out, maps);
+-    WritableUtils.writeVLong(out, inputRecords);
+-    WritableUtils.writeVLong(out, outputBytes);
+-    WritableUtils.writeVLong(out, outputRecords);
+-    WritableUtils.writeVLong(out, maxMemory);
+-    WritableUtils.writeVInt(out, reduces);
+-    for (int i = 0; i < reduces; ++i) {
+-      out.writeDouble(reduceBytes[i]);
+-      out.writeDouble(reduceRecords[i]);
+-    }
+-    WritableUtils.writeVInt(out, nSpec);
+-    for (int i = 0; i < nSpec; ++i) {
+-      WritableUtils.writeVLong(out, reduceOutputBytes[i]);
+-      WritableUtils.writeVLong(out, reduceOutputRecords[i]);
+-    }
+-  }
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    super.readFields(in);
+-    id = WritableUtils.readVInt(in);
+-    maps = WritableUtils.readVInt(in);
+-    inputRecords = WritableUtils.readVLong(in);
+-    outputBytes = WritableUtils.readVLong(in);
+-    outputRecords = WritableUtils.readVLong(in);
+-    maxMemory = WritableUtils.readVLong(in);
+-    reduces = WritableUtils.readVInt(in);
+-    if (reduceBytes.length < reduces) {
+-      reduceBytes = new double[reduces];
+-      reduceRecords = new double[reduces];
+-    }
+-    for (int i = 0; i < reduces; ++i) {
+-      reduceBytes[i] = in.readDouble();
+-      reduceRecords[i] = in.readDouble();
+-    }
+-    nSpec = WritableUtils.readVInt(in);
+-    if (reduceOutputBytes.length < nSpec) {
+-      reduceOutputBytes = new long[nSpec];
+-      reduceOutputRecords = new long[nSpec];
+-    }
+-    for (int i = 0; i < nSpec; ++i) {
+-      reduceOutputBytes[i] = WritableUtils.readVLong(in);
+-      reduceOutputRecords[i] = WritableUtils.readVLong(in);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
+deleted file mode 100644
+index 4867fa4b8c1..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/InputStriper.java
++++ /dev/null
+@@ -1,137 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.Comparator;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map.Entry;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.BlockLocation;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Given a {@link #FilePool}, obtain a set of files capable of satisfying
+- * a full set of splits, then iterate over each source to fill the request.
+- */
+-class InputStriper {
+-  public static final Logger LOG = LoggerFactory.getLogger(InputStriper.class);
+-  int idx;
+-  long currentStart;
+-  FileStatus current;
+-  final List<FileStatus> files = new ArrayList<FileStatus>();
+-  final Configuration conf = new Configuration();
+-
+-  /**
+-   * @param inputDir Pool from which files are requested.
+-   * @param mapBytes Sum of all expected split requests.
+-   */
+-  InputStriper(FilePool inputDir, long mapBytes)
+-      throws IOException {
+-    final long inputBytes = inputDir.getInputFiles(mapBytes, files);
+-    if (mapBytes > inputBytes) {
+-      LOG.warn("Using " + inputBytes + "/" + mapBytes + " bytes");
+-    }
+-    if (files.isEmpty() && mapBytes > 0) {
+-      throw new IOException("Failed to satisfy request for " + mapBytes);
+-    }
+-    current = files.isEmpty() ? null : files.get(0);
+-  }
+-
+-  /**
+-   * @param inputDir Pool used to resolve block locations.
+-   * @param bytes Target byte count
+-   * @param nLocs Number of block locations per split.
+-   * @return A set of files satisfying the byte count, with locations weighted
+-   *         to the dominating proportion of input bytes.
+-   */
+-  CombineFileSplit splitFor(FilePool inputDir, long bytes, int nLocs)
+-      throws IOException {
+-    final ArrayList<Path> paths = new ArrayList<Path>();
+-    final ArrayList<Long> start = new ArrayList<Long>();
+-    final ArrayList<Long> length = new ArrayList<Long>();
+-    final HashMap<String,Double> sb = new HashMap<String,Double>();
+-    do {
+-      paths.add(current.getPath());
+-      start.add(currentStart);
+-      final long fromFile = Math.min(bytes, current.getLen() - currentStart);
+-      length.add(fromFile);
+-      for (BlockLocation loc :
+-          inputDir.locationsFor(current, currentStart, fromFile)) {
+-        final double tedium = loc.getLength() / (1.0 * bytes);
+-        for (String l : loc.getHosts()) {
+-          Double j = sb.get(l);
+-          if (null == j) {
+-            sb.put(l, tedium);
+-          } else {
+-            sb.put(l, j.doubleValue() + tedium);
+-          }
+-        }
+-      }
+-      currentStart += fromFile;
+-      bytes -= fromFile;
+-      // Switch to a new file if
+-      //  - the current file is uncompressed and completely used
+-      //  - the current file is compressed
+-      
+-      CompressionCodecFactory compressionCodecs = 
+-        new CompressionCodecFactory(conf);
+-      CompressionCodec codec = compressionCodecs.getCodec(current.getPath());
+-      if (current.getLen() - currentStart == 0
+-          || codec != null) {
+-        current = files.get(++idx % files.size());
+-        currentStart = 0;
+-      }
+-    } while (bytes > 0);
+-    final ArrayList<Entry<String,Double>> sort =
+-      new ArrayList<Entry<String,Double>>(sb.entrySet());
+-    Collections.sort(sort, hostRank);
+-    final String[] hosts = new String[Math.min(nLocs, sort.size())];
+-    for (int i = 0; i < nLocs && i < sort.size(); ++i) {
+-      hosts[i] = sort.get(i).getKey();
+-    }
+-    return new CombineFileSplit(paths.toArray(new Path[0]),
+-        toLongArray(start), toLongArray(length), hosts);
+-  }
+-
+-  private long[] toLongArray(final ArrayList<Long> sigh) {
+-    final long[] ret = new long[sigh.size()];
+-    for (int i = 0; i < ret.length; ++i) {
+-      ret[i] = sigh.get(i);
+-    }
+-    return ret;
+-  }
+-
+-  static final Comparator<Entry<String,Double>> hostRank =
+-    new Comparator<Entry<String,Double>>() {
+-      public int compare(Entry<String,Double> a, Entry<String,Double> b) {
+-        return Double.compare(a.getValue(), b.getValue());
+-      }
+-    };
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
+deleted file mode 100644
+index a6fc6c69546..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * Factory passing reduce specification as its last record.
+- */
+-class IntermediateRecordFactory extends RecordFactory {
+-
+-  private final GridmixKey.Spec spec;
+-  private final RecordFactory factory;
+-  private final int partition;
+-  private final long targetRecords;
+-  private boolean done = false;
+-  private long accRecords = 0L;
+-
+-  /**
+-   * @param targetBytes Expected byte count.
+-   * @param targetRecords Expected record count; will emit spec records after
+-   *                      this boundary is passed.
+-   * @param partition Reduce to which records are emitted.
+-   * @param spec Specification to emit.
+-   * @param conf Unused.
+-   */
+-  public IntermediateRecordFactory(long targetBytes, long targetRecords,
+-      int partition, GridmixKey.Spec spec, Configuration conf) {
+-    this(new AvgRecordFactory(targetBytes, targetRecords, conf), partition,
+-        targetRecords, spec, conf);
+-  }
+-
+-  /**
+-   * @param factory Factory from which byte/record counts are obtained.
+-   * @param partition Reduce to which records are emitted.
+-   * @param targetRecords Expected record count; will emit spec records after
+-   *                      this boundary is passed.
+-   * @param spec Specification to emit.
+-   * @param conf Unused.
+-   */
+-  public IntermediateRecordFactory(RecordFactory factory, int partition,
+-      long targetRecords, GridmixKey.Spec spec, Configuration conf) {
+-    this.spec = spec;
+-    this.factory = factory;
+-    this.partition = partition;
+-    this.targetRecords = targetRecords;
+-  }
+-
+-  @Override
+-  public boolean next(GridmixKey key, GridmixRecord val) throws IOException {
+-    assert key != null;
+-    final boolean rslt = factory.next(key, val);
+-    ++accRecords;
+-    if (rslt) {
+-      if (accRecords < targetRecords) {
+-        key.setType(GridmixKey.DATA);
+-      } else {
+-        final int orig = key.getSize();
+-        key.setType(GridmixKey.REDUCE_SPEC);
+-        spec.rec_in = accRecords;
+-        key.setSpec(spec);
+-        val.setSize(val.getSize() - (key.getSize() - orig));
+-        // reset counters
+-        accRecords = 0L;
+-        spec.bytes_out = 0L;
+-        spec.rec_out = 0L;
+-        done = true;
+-      }
+-    } else if (!done) {
+-      // ensure spec emitted
+-      key.setType(GridmixKey.REDUCE_SPEC);
+-      key.setPartition(partition);
+-      key.setSize(0);
+-      val.setSize(0);
+-      spec.rec_in = 0L;
+-      key.setSpec(spec);
+-      done = true;
+-      return true;
+-    }
+-    key.setPartition(partition);
+-    return rslt;
+-  }
+-
+-  @Override
+-  public float getProgress() throws IOException {
+-    return factory.getProgress();
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    factory.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
+deleted file mode 100644
+index c109e3fa3e2..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
++++ /dev/null
+@@ -1,135 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.ClusterStatus;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-@InterfaceAudience.Private
+-@InterfaceStability.Evolving
+-public enum JobCreator {
+-
+-  LOADJOB {
+-    @Override
+-    public GridmixJob createGridmixJob(
+-      Configuration gridmixConf, long submissionMillis, JobStory jobdesc,
+-      Path outRoot, UserGroupInformation ugi, int seq) throws IOException {
+-
+-      // Build configuration for this simulated job
+-      Configuration conf = new Configuration(gridmixConf);
+-      dce.configureDistCacheFiles(conf, jobdesc.getJobConf());
+-      return new LoadJob(conf, submissionMillis, jobdesc, outRoot, ugi, seq);
+-    }
+-
+-    @Override
+-    public boolean canEmulateDistCacheLoad() {
+-      return true;
+-    }
+-  },
+-
+-  SLEEPJOB {
+-    private String[] hosts;
+-      
+-    @Override
+-    public GridmixJob createGridmixJob(
+-      Configuration conf, long submissionMillis, JobStory jobdesc, Path outRoot,
+-      UserGroupInformation ugi, int seq) throws IOException {
+-      int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
+-      if (numLocations < 0) numLocations = 0;
+-      if (hosts == null) {
+-        final JobClient client = new JobClient(new JobConf(conf));
+-        ClusterStatus stat = client.getClusterStatus(true);
+-        final int nTrackers = stat.getTaskTrackers();
+-        final ArrayList<String> hostList = new ArrayList<String>(nTrackers);
+-        final Pattern trackerPattern = Pattern.compile("tracker_([^:]*):.*");
+-        final Matcher m = trackerPattern.matcher("");
+-        for (String tracker : stat.getActiveTrackerNames()) {
+-          m.reset(tracker);
+-          if (!m.find()) {
+-            continue;
+-          }
+-          final String name = m.group(1);
+-          hostList.add(name);
+-        }
+-        hosts = hostList.toArray(new String[hostList.size()]);
+-      }
+-      return new SleepJob(conf, submissionMillis, jobdesc, outRoot, ugi, seq,
+-          numLocations, hosts);
+-    }
+-
+-    @Override
+-    public boolean canEmulateDistCacheLoad() {
+-      return false;
+-    }
+-  };
+-
+-  public static final String GRIDMIX_JOB_TYPE = "gridmix.job.type";
+-  public static final String SLEEPJOB_RANDOM_LOCATIONS = 
+-    "gridmix.sleep.fake-locations";
+-
+-  /**
+-   * Create Gridmix simulated job.
+-   * @param conf configuration of simulated job
+-   * @param submissionMillis At what time submission of this simulated job be
+-   *                         done
+-   * @param jobdesc JobStory obtained from trace
+-   * @param outRoot gridmix output directory
+-   * @param ugi UGI of job submitter of this simulated job
+-   * @param seq job sequence number
+-   * @return the created simulated job
+-   * @throws IOException
+-   */
+-  public abstract GridmixJob createGridmixJob(
+-    final Configuration conf, long submissionMillis, final JobStory jobdesc,
+-    Path outRoot, UserGroupInformation ugi, final int seq) throws IOException;
+-
+-  public static JobCreator getPolicy(
+-    Configuration conf, JobCreator defaultPolicy) {
+-    return conf.getEnum(GRIDMIX_JOB_TYPE, defaultPolicy);
+-  }
+-
+-  /**
+-   * @return true if gridmix simulated jobs of this job type can emulate
+-   *         distributed cache load
+-   */
+-  abstract boolean canEmulateDistCacheLoad();
+-
+-  DistributedCacheEmulator dce;
+-  /**
+-   * This method is to be called before calling any other method in JobCreator
+-   * except canEmulateDistCacheLoad(), especially if canEmulateDistCacheLoad()
+-   * returns true for that job type.
+-   * @param e Distributed Cache Emulator
+-   */
+-  void setDistCacheEmulator(DistributedCacheEmulator e) {
+-    this.dce = e;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
+deleted file mode 100644
+index 4536e513361..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobFactory.java
++++ /dev/null
+@@ -1,276 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.TaskInfo;
+-import org.apache.hadoop.tools.rumen.ZombieJobProducer;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.locks.ReentrantLock;
+-import java.util.concurrent.atomic.AtomicInteger;
+-
+-
+-/**
+- * Component reading job traces generated by Rumen. Each job in the trace is
+- * assigned a sequence number and given a submission time relative to the
+- * job that preceded it. Jobs are enqueued in the JobSubmitter provided at
+- * construction.
+- * @see org.apache.hadoop.tools.rumen.HadoopLogsAnalyzer
+- */
+-abstract class JobFactory<T> implements Gridmix.Component<Void>,StatListener<T> {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(JobFactory.class);
+-
+-  protected final Path scratch;
+-  protected final float rateFactor;
+-  protected final Configuration conf;
+-  protected final Thread rThread;
+-  protected final AtomicInteger sequence;
+-  protected final JobSubmitter submitter;
+-  protected final CountDownLatch startFlag;
+-  protected final UserResolver userResolver;
+-  protected final JobCreator jobCreator;
+-  protected volatile IOException error = null;
+-  protected final JobStoryProducer jobProducer;
+-  protected final ReentrantLock lock = new ReentrantLock(true);
+-  protected int numJobsInTrace = 0;
+-
+-  /**
+-   * Creating a new instance does not start the thread.
+-   * @param submitter Component to which deserialized jobs are passed
+-   * @param jobTrace Stream of job traces with which to construct a
+-   *                 {@link org.apache.hadoop.tools.rumen.ZombieJobProducer}
+-   * @param scratch Directory into which to write output from simulated jobs
+-   * @param conf Config passed to all jobs to be submitted
+-   * @param startFlag Latch released from main to start pipeline
+-   * @throws java.io.IOException
+-   */
+-  public JobFactory(JobSubmitter submitter, InputStream jobTrace,
+-      Path scratch, Configuration conf, CountDownLatch startFlag,
+-      UserResolver userResolver) throws IOException {
+-    this(submitter, new ZombieJobProducer(jobTrace, null), scratch, conf,
+-        startFlag, userResolver);
+-  }
+-
+-  /**
+-   * Constructor permitting JobStoryProducer to be mocked.
+-   * @param submitter Component to which deserialized jobs are passed
+-   * @param jobProducer Producer generating JobStory objects.
+-   * @param scratch Directory into which to write output from simulated jobs
+-   * @param conf Config passed to all jobs to be submitted
+-   * @param startFlag Latch released from main to start pipeline
+-   */
+-  protected JobFactory(JobSubmitter submitter, JobStoryProducer jobProducer,
+-      Path scratch, Configuration conf, CountDownLatch startFlag,
+-      UserResolver userResolver) {
+-    sequence = new AtomicInteger(0);
+-    this.scratch = scratch;
+-    this.rateFactor = conf.getFloat(Gridmix.GRIDMIX_SUB_MUL, 1.0f);
+-    this.jobProducer = jobProducer;
+-    this.conf = new Configuration(conf);
+-    this.submitter = submitter;
+-    this.startFlag = startFlag;
+-    this.rThread = createReaderThread();
+-    if(LOG.isDebugEnabled()) {
+-      LOG.debug(" The submission thread name is " + rThread.getName());
+-    }
+-    this.userResolver = userResolver;
+-    this.jobCreator = JobCreator.getPolicy(conf, JobCreator.LOADJOB);
+-  }
+-
+-  static class MinTaskInfo extends TaskInfo {
+-    public MinTaskInfo(TaskInfo info) {
+-      super(info.getInputBytes(), info.getInputRecords(),
+-            info.getOutputBytes(), info.getOutputRecords(),
+-            info.getTaskMemory(), info.getResourceUsageMetrics());
+-    }
+-    public long getInputBytes() {
+-      return Math.max(0, super.getInputBytes());
+-    }
+-    public int getInputRecords() {
+-      return Math.max(0, super.getInputRecords());
+-    }
+-    public long getOutputBytes() {
+-      return Math.max(0, super.getOutputBytes());
+-    }
+-    public int getOutputRecords() {
+-      return Math.max(0, super.getOutputRecords());
+-    }
+-    public long getTaskMemory() {
+-      return Math.max(0, super.getTaskMemory());
+-    }
+-  }
+-
+-  protected static class FilterJobStory implements JobStory {
+-
+-    protected final JobStory job;
+-
+-    public FilterJobStory(JobStory job) {
+-      this.job = job;
+-    }
+-    public JobConf getJobConf() { return job.getJobConf(); }
+-    public String getName() { return job.getName(); }
+-    public JobID getJobID() { return job.getJobID(); }
+-    public String getUser() { return job.getUser(); }
+-    public long getSubmissionTime() { return job.getSubmissionTime(); }
+-    public InputSplit[] getInputSplits() { return job.getInputSplits(); }
+-    public int getNumberMaps() { return job.getNumberMaps(); }
+-    public int getNumberReduces() { return job.getNumberReduces(); }
+-    public TaskInfo getTaskInfo(TaskType taskType, int taskNumber) {
+-      return job.getTaskInfo(taskType, taskNumber);
+-    }
+-    public TaskAttemptInfo getTaskAttemptInfo(TaskType taskType, int taskNumber,
+-        int taskAttemptNumber) {
+-      return job.getTaskAttemptInfo(taskType, taskNumber, taskAttemptNumber);
+-    }
+-    public TaskAttemptInfo getMapTaskAttemptInfoAdjusted(
+-        int taskNumber, int taskAttemptNumber, int locality) {
+-      return job.getMapTaskAttemptInfoAdjusted(
+-          taskNumber, taskAttemptNumber, locality);
+-    }
+-    public Values getOutcome() {
+-      return job.getOutcome();
+-    }
+-    public String getQueueName() {
+-      return job.getQueueName();
+-    }
+-  }
+-
+-  protected abstract Thread createReaderThread() ; 
+-
+-  // gets the next job from the trace and does some bookkeeping for the same
+-  private JobStory getNextJobFromTrace() throws IOException {
+-    JobStory story = jobProducer.getNextJob();
+-    if (story != null) {
+-      ++numJobsInTrace;
+-    }
+-    return story;
+-  }
+-  
+-  protected JobStory getNextJobFiltered() throws IOException {
+-    JobStory job = getNextJobFromTrace();
+-    // filter out the following jobs
+-    //    - unsuccessful jobs
+-    //    - jobs with missing submit-time
+-    //    - reduce only jobs
+-    // These jobs are not yet supported in Gridmix
+-    while (job != null &&
+-      (job.getOutcome() != Pre21JobHistoryConstants.Values.SUCCESS ||
+-        job.getSubmissionTime() < 0 || job.getNumberMaps() == 0)) {
+-      if (LOG.isDebugEnabled()) {
+-        List<String> reason = new ArrayList<String>();
+-        if (job.getOutcome() != Pre21JobHistoryConstants.Values.SUCCESS) {
+-          reason.add("STATE (" + job.getOutcome().name() + ")");
+-        }
+-        if (job.getSubmissionTime() < 0) {
+-          reason.add("SUBMISSION-TIME (" + job.getSubmissionTime() + ")");
+-        }
+-        if (job.getNumberMaps() == 0) {
+-          reason.add("ZERO-MAPS-JOB");
+-        }
+-        
+-        // TODO This should never happen. Probably we missed something!
+-        if (reason.size() == 0) {
+-          reason.add("N/A");
+-        }
+-        
+-        LOG.debug("Ignoring job " + job.getJobID() + " from the input trace."
+-                  + " Reason: " + StringUtils.join(reason, ","));
+-      }
+-      job = getNextJobFromTrace();
+-    }
+-    return null == job ? null : new FilterJobStory(job) {
+-      @Override
+-      public TaskInfo getTaskInfo(TaskType taskType, int taskNumber) {
+-        TaskInfo info = this.job.getTaskInfo(taskType, taskNumber);
+-        if (info != null) {
+-          info = new MinTaskInfo(info);
+-        } else {
+-          info = new MinTaskInfo(new TaskInfo(0, 0, 0, 0, 0));
+-        }
+-        return info;
+-      }
+-    };
+-  }
+-
+-
+-  /**
+-   * Obtain the error that caused the thread to exit unexpectedly.
+-   */
+-  public IOException error() {
+-    return error;
+-  }
+-
+-  /**
+-   * Add is disabled.
+-   * @throws UnsupportedOperationException
+-   */
+-  public void add(Void ignored) {
+-    throw new UnsupportedOperationException(getClass().getName() +
+-        " is at the start of the pipeline and accepts no events");
+-  }
+-
+-  /**
+-   * Start the reader thread, wait for latch if necessary.
+-   */
+-  public void start() {
+-    rThread.start();
+-  }
+-
+-  /**
+-   * Wait for the reader thread to exhaust the job trace.
+-   */
+-  public void join(long millis) throws InterruptedException {
+-    rThread.join(millis);
+-  }
+-
+-  /**
+-   * Interrupt the reader thread.
+-   */
+-  public void shutdown() {
+-    rThread.interrupt();
+-  }
+-
+-  /**
+-   * Interrupt the reader thread. This requires no special consideration, as
+-   * the thread has no pending work queue.
+-   */
+-  public void abort() {
+-    // Currently no special work
+-    rThread.interrupt();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
+deleted file mode 100644
+index 0b06911be08..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java
++++ /dev/null
+@@ -1,294 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.nio.channels.ClosedByInterruptException;
+-import java.util.ArrayList;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Queue;
+-import java.util.concurrent.BlockingQueue;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.LinkedBlockingQueue;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobStatus;
+-
+-/**
+- * Component accepting submitted, running {@link Statistics.JobStats} and 
+- * responsible for monitoring jobs for success and failure. Once a job is 
+- * submitted, it is polled for status until complete. If a job is complete, 
+- * then the monitor thread returns immediately to the queue. If not, the monitor
+- * will sleep for some duration.
+- * 
+- * {@link JobMonitor} can be configured to use multiple threads for polling
+- * the job statuses. Use {@link Gridmix#GRIDMIX_JOBMONITOR_THREADS} to specify
+- * the total number of monitoring threads. 
+- * 
+- * The duration for which a monitoring thread sleeps if the first job in the 
+- * queue is running can also be configured. Use 
+- * {@link Gridmix#GRIDMIX_JOBMONITOR_SLEEPTIME_MILLIS} to specify a custom 
+- * value.
+- */
+-class JobMonitor implements Gridmix.Component<JobStats> {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(JobMonitor.class);
+-
+-  private final Queue<JobStats> mJobs;
+-  private ExecutorService executor;
+-  private int numPollingThreads;
+-  private final BlockingQueue<JobStats> runningJobs;
+-  private final long pollDelayMillis;
+-  private Statistics statistics;
+-  private boolean graceful = false;
+-  private boolean shutdown = false;
+-
+-  /**
+-   * Create a JobMonitor that sleeps for the specified duration after
+-   * polling a still-running job.
+-   * @param pollDelay Delay after polling a running job
+-   * @param unit Time unit for pollDelaySec (rounded to milliseconds)
+-   * @param statistics StatCollector , listener to job completion.
+-   */
+-  public JobMonitor(int pollDelay, TimeUnit unit, Statistics statistics, 
+-                    int numPollingThreads) {
+-    executor = Executors.newCachedThreadPool();
+-    this.numPollingThreads = numPollingThreads;
+-    runningJobs = new LinkedBlockingQueue<JobStats>();
+-    mJobs = new LinkedList<JobStats>();
+-    this.pollDelayMillis = TimeUnit.MILLISECONDS.convert(pollDelay, unit);
+-    this.statistics = statistics;
+-  }
+-
+-  /**
+-   * Add a running job's status to the polling queue.
+-   */
+-  public void add(JobStats job) throws InterruptedException {
+-      runningJobs.put(job);
+-  }
+-
+-  /**
+-   * Add a submission failed job's status, such that it can be communicated
+-   * back to serial.
+-   * TODO: Cleaner solution for this problem
+-   * @param job
+-   */
+-  public void submissionFailed(JobStats job) {
+-    String jobID = job.getJob().getConfiguration().get(Gridmix.ORIGINAL_JOB_ID);
+-    LOG.info("Job submission failed notification for job " + jobID);
+-    synchronized (statistics) {
+-      this.statistics.add(job);
+-    }
+-  }
+-
+-  /**
+-   * Temporary hook for recording job success.
+-   */
+-  protected void onSuccess(Job job) {
+-    LOG.info(job.getJobName() + " (" + job.getJobID() + ")" + " success");
+-  }
+-
+-  /**
+-   * Temporary hook for recording job failure.
+-   */
+-  protected void onFailure(Job job) {
+-    LOG.info(job.getJobName() + " (" + job.getJobID() + ")" + " failure");
+-  }
+-
+-  /**
+-   * If shutdown before all jobs have completed, any still-running jobs
+-   * may be extracted from the component.
+-   * @throws IllegalStateException If monitoring thread is still running.
+-   * @return Any jobs submitted and not known to have completed.
+-   */
+-  List<JobStats> getRemainingJobs() {
+-    synchronized (mJobs) {
+-      return new ArrayList<JobStats>(mJobs);
+-    }
+-  }
+-
+-  /**
+-   * Monitoring thread pulling running jobs from the component and into
+-   * a queue to be polled for status.
+-   */
+-  private class MonitorThread extends Thread {
+-
+-    public MonitorThread(int i) {
+-      super("GridmixJobMonitor-" + i);
+-    }
+-
+-    @Override
+-    public void run() {
+-      boolean graceful;
+-      boolean shutdown;
+-      while (true) {
+-        try {
+-          synchronized (mJobs) {
+-            graceful = JobMonitor.this.graceful;
+-            shutdown = JobMonitor.this.shutdown;
+-            runningJobs.drainTo(mJobs);
+-          }
+-
+-          // shutdown conditions; either shutdown requested and all jobs
+-          // have completed or abort requested and there are recently
+-          // submitted jobs not in the monitored set
+-          if (shutdown) {
+-            if (!graceful) {
+-              while (!runningJobs.isEmpty()) {
+-                synchronized (mJobs) {
+-                  runningJobs.drainTo(mJobs);
+-                }
+-              }
+-              break;
+-            }
+-            
+-            synchronized (mJobs) {
+-              if (graceful && mJobs.isEmpty()) {
+-                break;
+-              }
+-            }
+-          }
+-          JobStats jobStats = null;
+-          synchronized (mJobs) {
+-            jobStats = mJobs.poll();
+-          }
+-          while (jobStats != null) {
+-            Job job = jobStats.getJob();
+-            
+-            try {
+-              // get the job status
+-              long start = System.currentTimeMillis();
+-              JobStatus status = job.getStatus(); // cache the job status
+-              long end = System.currentTimeMillis();
+-              
+-              if (LOG.isDebugEnabled()) {
+-                LOG.debug("Status polling for job " + job.getJobID() + " took "
+-                          + (end-start) + "ms.");
+-              }
+-              
+-              // update the job progress
+-              jobStats.updateJobStatus(status);
+-              
+-              // if the job is complete, let others know
+-              if (status.isJobComplete()) {
+-                if (status.getState() == JobStatus.State.SUCCEEDED) {
+-                  onSuccess(job);
+-                } else {
+-                  onFailure(job);
+-                }
+-                synchronized (statistics) {
+-                  statistics.add(jobStats);
+-                }
+-              } else {
+-                // add the running job back and break
+-                synchronized (mJobs) {
+-                  if (!mJobs.offer(jobStats)) {
+-                    LOG.error("Lost job " + (null == job.getJobName()
+-                         ? "<unknown>" : job.getJobName())); // should never
+-                                                             // happen
+-                  }
+-                }
+-                break;
+-              }
+-            } catch (IOException e) {
+-              if (e.getCause() instanceof ClosedByInterruptException) {
+-                // Job doesn't throw InterruptedException, but RPC socket layer
+-                // is blocking and may throw a wrapped Exception if this thread
+-                // is interrupted. Since the lower level cleared the flag,
+-                // reset it here
+-                Thread.currentThread().interrupt();
+-              } else {
+-                LOG.warn("Lost job " + (null == job.getJobName()
+-                     ? "<unknown>" : job.getJobName()), e);
+-                synchronized (statistics) {
+-                  statistics.add(jobStats);
+-                }
+-              }
+-            }
+-            
+-            // get the next job
+-            synchronized (mJobs) {
+-              jobStats = mJobs.poll();
+-            }
+-          }
+-          
+-          // sleep for a while before checking again
+-          try {
+-            TimeUnit.MILLISECONDS.sleep(pollDelayMillis);
+-          } catch (InterruptedException e) {
+-            shutdown = true;
+-            continue;
+-          }
+-        } catch (Throwable e) {
+-          LOG.warn("Unexpected exception: ", e);
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Start the internal, monitoring thread.
+-   */
+-  public void start() {
+-    for (int i = 0; i < numPollingThreads; ++i) {
+-      executor.execute(new MonitorThread(i));
+-    }
+-  }
+-
+-  /**
+-   * Wait for the monitor to halt, assuming shutdown or abort have been
+-   * called. Note that, since submission may be sporatic, this will hang
+-   * if no form of shutdown has been requested.
+-   */
+-  public void join(long millis) throws InterruptedException {
+-    executor.awaitTermination(millis, TimeUnit.MILLISECONDS);
+-  }
+-
+-  /**
+-   * Drain all submitted jobs to a queue and stop the monitoring thread.
+-   * Upstream submitter is assumed dead.
+-   */
+-  public void abort() {
+-    synchronized (mJobs) {
+-      graceful = false;
+-      shutdown = true;
+-    }
+-    executor.shutdown();
+-  }
+-
+-  /**
+-   * When all monitored jobs have completed, stop the monitoring thread.
+-   * Upstream submitter is assumed dead.
+-   */
+-  public void shutdown() {
+-    synchronized (mJobs) {
+-      graceful = true;
+-      shutdown = true;
+-    }
+-    executor.shutdown();
+-  }
+-}
+-
+-
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
+deleted file mode 100644
+index ac41256da9e..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java
++++ /dev/null
+@@ -1,225 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.nio.channels.ClosedByInterruptException;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.LinkedBlockingQueue;
+-import java.util.concurrent.RejectedExecutionException;
+-import java.util.concurrent.Semaphore;
+-import java.util.concurrent.ThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-
+-/**
+- * Component accepting deserialized job traces, computing split data, and
+- * submitting to the cluster on deadline. Each job added from an upstream
+- * factory must be submitted to the cluster by the deadline recorded on it.
+- * Once submitted, jobs must be added to a downstream component for
+- * monitoring.
+- */
+-class JobSubmitter implements Gridmix.Component<GridmixJob> {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(JobSubmitter.class);
+-
+-  private final Semaphore sem;
+-  private final Statistics statistics;
+-  private final FilePool inputDir;
+-  private final JobMonitor monitor;
+-  private final ExecutorService sched;
+-  private volatile boolean shutdown = false;
+-  private final int queueDepth;
+-
+-  /**
+-   * Initialize the submission component with downstream monitor and pool of
+-   * files from which split data may be read.
+-   * @param monitor Monitor component to which jobs should be passed
+-   * @param threads Number of submission threads
+-   *   See {@link Gridmix#GRIDMIX_SUB_THR}.
+-   * @param queueDepth Max depth of pending work queue
+-   *   See {@link Gridmix#GRIDMIX_QUE_DEP}.
+-   * @param inputDir Set of files from which split data may be mined for
+-   *   synthetic jobs.
+-   * @param statistics
+-   */
+-  public JobSubmitter(JobMonitor monitor, int threads, int queueDepth,
+-      FilePool inputDir, Statistics statistics) {
+-    this.queueDepth = queueDepth;
+-    sem = new Semaphore(queueDepth);
+-    sched = new ThreadPoolExecutor(threads, threads, 0L,
+-        TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+-    this.inputDir = inputDir;
+-    this.monitor = monitor;
+-    this.statistics = statistics;
+-  }
+-
+-  /**
+-   * Runnable wrapping a job to be submitted to the cluster.
+-   */
+-  private class SubmitTask implements Runnable {
+-
+-    final GridmixJob job;
+-    public SubmitTask(GridmixJob job) {
+-      this.job = job;
+-    }
+-    public void run() {
+-      JobStats stats = 
+-        Statistics.generateJobStats(job.getJob(), job.getJobDesc());
+-      try {
+-        // pre-compute split information
+-        try {
+-          long start = System.currentTimeMillis();
+-          job.buildSplits(inputDir);
+-          long end = System.currentTimeMillis();
+-          LOG.info("[JobSubmitter] Time taken to build splits for job " 
+-                   + job.getJob().getJobID() + ": " + (end - start) + " ms.");
+-        } catch (IOException e) {
+-          LOG.warn("Failed to submit " + job.getJob().getJobName() + " as " 
+-                   + job.getUgi(), e);
+-          monitor.submissionFailed(stats);
+-          return;
+-        } catch (Exception e) {
+-          LOG.warn("Failed to submit " + job.getJob().getJobName() + " as " 
+-                   + job.getUgi(), e);
+-          monitor.submissionFailed(stats);
+-          return;
+-        }
+-        // Sleep until deadline
+-        long nsDelay = job.getDelay(TimeUnit.NANOSECONDS);
+-        while (nsDelay > 0) {
+-          TimeUnit.NANOSECONDS.sleep(nsDelay);
+-          nsDelay = job.getDelay(TimeUnit.NANOSECONDS);
+-        }
+-        try {
+-          // submit job
+-          long start = System.currentTimeMillis();
+-          job.call();
+-          long end = System.currentTimeMillis();
+-          LOG.info("[JobSubmitter] Time taken to submit the job " 
+-                   + job.getJob().getJobID() + ": " + (end - start) + " ms.");
+-          
+-          // mark it as submitted
+-          job.setSubmitted();
+-          
+-          // add to the monitor
+-          monitor.add(stats);
+-          
+-          // add to the statistics
+-          statistics.addJobStats(stats);
+-          if (LOG.isDebugEnabled()) {
+-            String jobID = 
+-              job.getJob().getConfiguration().get(Gridmix.ORIGINAL_JOB_ID);
+-            LOG.debug("Original job '" + jobID + "' is being simulated as '" 
+-                      + job.getJob().getJobID() + "'");
+-            LOG.debug("SUBMIT " + job + "@" + System.currentTimeMillis() 
+-                      + " (" + job.getJob().getJobID() + ")");
+-          }
+-        } catch (IOException e) {
+-          LOG.warn("Failed to submit " + job.getJob().getJobName() + " as " 
+-                   + job.getUgi(), e);
+-          if (e.getCause() instanceof ClosedByInterruptException) {
+-            throw new InterruptedException("Failed to submit " +
+-                job.getJob().getJobName());
+-          }
+-          monitor.submissionFailed(stats);
+-        } catch (ClassNotFoundException e) {
+-          LOG.warn("Failed to submit " + job.getJob().getJobName(), e);
+-          monitor.submissionFailed(stats);
+-        }
+-      } catch (InterruptedException e) {
+-        // abort execution, remove splits if nesc
+-        // TODO release ThdLoc
+-        GridmixJob.pullDescription(job.id());
+-        Thread.currentThread().interrupt();
+-        monitor.submissionFailed(stats);
+-      } catch(Exception e) {
+-        //Due to some exception job wasnt submitted.
+-        LOG.info(" Job " + job.getJob().getJobID() + " submission failed " , e);
+-        monitor.submissionFailed(stats);
+-      } finally {
+-        sem.release();
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Enqueue the job to be submitted per the deadline associated with it.
+-   */
+-  public void add(final GridmixJob job) throws InterruptedException {
+-    final boolean addToQueue = !shutdown;
+-    if (addToQueue) {
+-      final SubmitTask task = new SubmitTask(job);
+-      LOG.info("Total number of queued jobs: " 
+-               + (queueDepth - sem.availablePermits()));
+-      sem.acquire();
+-      try {
+-        sched.execute(task);
+-      } catch (RejectedExecutionException e) {
+-        sem.release();
+-      }
+-    }
+-  }
+-
+-  /**
+-   * (Re)scan the set of input files from which splits are derived.
+-   * @throws java.io.IOException
+-   */
+-  public void refreshFilePool() throws IOException {
+-    inputDir.refresh();
+-  }
+-
+-  /**
+-   * Does nothing, as the threadpool is already initialized and waiting for
+-   * work from the upstream factory.
+-   */
+-  public void start() { }
+-
+-  /**
+-   * Continue running until all queued jobs have been submitted to the
+-   * cluster.
+-   */
+-  public void join(long millis) throws InterruptedException {
+-    if (!shutdown) {
+-      throw new IllegalStateException("Cannot wait for active submit thread");
+-    }
+-    sched.awaitTermination(millis, TimeUnit.MILLISECONDS);
+-  }
+-
+-  /**
+-   * Finish all jobs pending submission, but do not accept new work.
+-   */
+-  public void shutdown() {
+-    // complete pending tasks, but accept no new tasks
+-    shutdown = true;
+-    sched.shutdown();
+-  }
+-
+-  /**
+-   * Discard pending work, including precomputed work waiting to be
+-   * submitted.
+-   */
+-  public void abort() {
+-    //pendingJobs.clear();
+-    shutdown = true;
+-    sched.shutdownNow();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java
+deleted file mode 100644
+index d1229ce2d8f..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadJob.java
++++ /dev/null
+@@ -1,663 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.ResourceUsageMatcher;
+-import org.apache.hadoop.mapreduce.InputFormat;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.Reducer;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.TaskCounter;
+-import org.apache.hadoop.mapreduce.TaskInputOutputContext;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.tools.rumen.TaskInfo;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-
+-/**
+- * Synthetic job generated from a trace description.
+- */
+-class LoadJob extends GridmixJob {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(LoadJob.class);
+-
+-  public LoadJob(final Configuration conf, long submissionMillis, 
+-                 final JobStory jobdesc, Path outRoot, UserGroupInformation ugi,
+-                 final int seq) throws IOException {
+-    super(conf, submissionMillis, jobdesc, outRoot, ugi, seq);
+-  }
+-
+-  public Job call() throws IOException, InterruptedException,
+-                           ClassNotFoundException {
+-    ugi.doAs(
+-      new PrivilegedExceptionAction<Job>() {
+-        public Job run() throws IOException, ClassNotFoundException,
+-                                InterruptedException {
+-          job.setMapperClass(LoadMapper.class);
+-          job.setReducerClass(LoadReducer.class);
+-          job.setNumReduceTasks(jobdesc.getNumberReduces());
+-          job.setMapOutputKeyClass(GridmixKey.class);
+-          job.setMapOutputValueClass(GridmixRecord.class);
+-          job.setSortComparatorClass(LoadSortComparator.class);
+-          job.setGroupingComparatorClass(SpecGroupingComparator.class);
+-          job.setInputFormatClass(LoadInputFormat.class);
+-          job.setOutputFormatClass(RawBytesOutputFormat.class);
+-          job.setPartitionerClass(DraftPartitioner.class);
+-          job.setJarByClass(LoadJob.class);
+-          job.getConfiguration().setBoolean(Job.USED_GENERIC_PARSER, true);
+-          FileOutputFormat.setOutputPath(job, outdir);
+-          job.submit();
+-          return job;
+-        }
+-      });
+-
+-    return job;
+-  }
+-
+-  @Override
+-  protected boolean canEmulateCompression() {
+-    return true;
+-  }
+-  
+-  /**
+-   * This is a load matching key comparator which will make sure that the
+-   * resource usage load is matched even when the framework is in control.
+-   */
+-  public static class LoadSortComparator extends GridmixKey.Comparator {
+-    private ResourceUsageMatcherRunner matcher = null;
+-    private boolean isConfigured = false;
+-    
+-    public LoadSortComparator() {
+-      super();
+-    }
+-    
+-    @Override
+-    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+-      configure();
+-      int ret = super.compare(b1, s1, l1, b2, s2, l2);
+-      if (matcher != null) {
+-        try {
+-          matcher.match(); // match the resource usage now
+-        } catch (Exception e) {}
+-      }
+-      return ret;
+-    }
+-    
+-    //TODO Note that the sorter will be instantiated 2 times as follows
+-    //       1. During the sort/spill in the map phase
+-    //       2. During the merge in the sort phase
+-    // We need the handle to the matcher thread only in (2).
+-    // This logic can be relaxed to run only in (2).
+-    private void configure() {
+-      if (!isConfigured) {
+-        ThreadGroup group = Thread.currentThread().getThreadGroup();
+-        Thread[] threads = new Thread[group.activeCount() * 2];
+-        group.enumerate(threads, true);
+-        for (Thread t : threads) {
+-          if (t != null && (t instanceof ResourceUsageMatcherRunner)) {
+-            this.matcher = (ResourceUsageMatcherRunner) t;
+-            isConfigured = true;
+-            break;
+-          }
+-        }
+-      }
+-    }
+-  }
+-  
+-  /**
+-   * This is a progress based resource usage matcher.
+-   */
+-  @SuppressWarnings("unchecked")
+-  static class ResourceUsageMatcherRunner extends Thread 
+-  implements Progressive {
+-    private final ResourceUsageMatcher matcher;
+-    private final BoostingProgress progress;
+-    private final long sleepTime;
+-    private static final String SLEEP_CONFIG = 
+-      "gridmix.emulators.resource-usage.sleep-duration";
+-    private static final long DEFAULT_SLEEP_TIME = 100; // 100ms
+-    
+-    /**
+-     * This is a progress bar that can be boosted for weaker use-cases.
+-     */
+-    private static class BoostingProgress implements Progressive {
+-      private float boostValue = 0f;
+-      TaskInputOutputContext context;
+-      
+-      BoostingProgress(TaskInputOutputContext context) {
+-        this.context = context;
+-      }
+-      
+-      void setBoostValue(float boostValue) {
+-        this.boostValue = boostValue;
+-      }
+-      
+-      @Override
+-      public float getProgress() {
+-        return Math.min(1f, context.getProgress() + boostValue);
+-      }
+-    }
+-    
+-    ResourceUsageMatcherRunner(final TaskInputOutputContext context, 
+-                               ResourceUsageMetrics metrics) {
+-      Configuration conf = context.getConfiguration();
+-      
+-      // set the resource calculator plugin
+-      Class<? extends ResourceCalculatorPlugin> clazz =
+-        conf.getClass(TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN,
+-                      null, ResourceCalculatorPlugin.class);
+-      ResourceCalculatorPlugin plugin = 
+-        ResourceCalculatorPlugin.getResourceCalculatorPlugin(clazz, conf);
+-      
+-      // set the other parameters
+-      this.sleepTime = conf.getLong(SLEEP_CONFIG, DEFAULT_SLEEP_TIME);
+-      progress = new BoostingProgress(context);
+-      
+-      // instantiate a resource-usage-matcher
+-      matcher = new ResourceUsageMatcher();
+-      matcher.configure(conf, plugin, metrics, progress);
+-    }
+-    
+-    protected void match() throws IOException, InterruptedException {
+-      // match the resource usage
+-      matcher.matchResourceUsage();
+-    }
+-    
+-    @Override
+-    public void run() {
+-      LOG.info("Resource usage matcher thread started.");
+-      try {
+-        while (progress.getProgress() < 1) {
+-          // match
+-          match();
+-          
+-          // sleep for some time
+-          try {
+-            Thread.sleep(sleepTime);
+-          } catch (Exception e) {}
+-        }
+-        
+-        // match for progress = 1
+-        match();
+-        LOG.info("Resource usage emulation complete! Matcher exiting");
+-      } catch (Exception e) {
+-        LOG.info("Exception while running the resource-usage-emulation matcher"
+-                 + " thread! Exiting.", e);
+-      }
+-    }
+-    
+-    @Override
+-    public float getProgress() {
+-      return matcher.getProgress();
+-    }
+-    
+-    // boost the progress bar as fasten up the emulation cycles.
+-    void boost(float value) {
+-      progress.setBoostValue(value);
+-    }
+-  }
+-  
+-  // Makes sure that the TaskTracker doesn't kill the map/reduce tasks while
+-  // they are emulating
+-  private static class StatusReporter extends Thread {
+-    private final TaskAttemptContext context;
+-    private final Progressive progress;
+-    
+-    StatusReporter(TaskAttemptContext context, Progressive progress) {
+-      this.context = context;
+-      this.progress = progress;
+-    }
+-    
+-    @Override
+-    public void run() {
+-      LOG.info("Status reporter thread started.");
+-      try {
+-        while (!isInterrupted() && progress.getProgress() < 1) {
+-          // report progress
+-          context.progress();
+-
+-          // sleep for some time
+-          try {
+-            Thread.sleep(100); // sleep for 100ms
+-          } catch (Exception e) {}
+-        }
+-        
+-        LOG.info("Status reporter thread exiting");
+-      } catch (Exception e) {
+-        LOG.info("Exception while running the status reporter thread!", e);
+-      }
+-    }
+-  }
+-  
+-  public static class LoadMapper
+-  extends Mapper<NullWritable, GridmixRecord, GridmixKey, GridmixRecord> {
+-
+-    private double acc;
+-    private double ratio;
+-    private final ArrayList<RecordFactory> reduces =
+-      new ArrayList<RecordFactory>();
+-    private final Random r = new Random();
+-
+-    private final GridmixKey key = new GridmixKey();
+-    private final GridmixRecord val = new GridmixRecord();
+-
+-    private ResourceUsageMatcherRunner matcher = null;
+-    private StatusReporter reporter = null;
+-    
+-    @Override
+-    protected void setup(Context ctxt) 
+-    throws IOException, InterruptedException {
+-      final Configuration conf = ctxt.getConfiguration();
+-      final LoadSplit split = (LoadSplit) ctxt.getInputSplit();
+-      final int maps = split.getMapCount();
+-      final long[] reduceBytes = split.getOutputBytes();
+-      final long[] reduceRecords = split.getOutputRecords();
+-
+-      long totalRecords = 0L;
+-      final int nReduces = ctxt.getNumReduceTasks();
+-      if (nReduces > 0) {
+-        // enable gridmix map output record for compression
+-        boolean emulateMapOutputCompression = 
+-          CompressionEmulationUtil.isCompressionEmulationEnabled(conf)
+-          && conf.getBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, false);
+-        float compressionRatio = 1.0f;
+-        if (emulateMapOutputCompression) {
+-          compressionRatio = 
+-            CompressionEmulationUtil.getMapOutputCompressionEmulationRatio(conf);
+-          LOG.info("GridMix is configured to use a compression ratio of " 
+-                   + compressionRatio + " for the map output data.");
+-          key.setCompressibility(true, compressionRatio);
+-          val.setCompressibility(true, compressionRatio);
+-        }
+-        
+-        int idx = 0;
+-        int id = split.getId();
+-        for (int i = 0; i < nReduces; ++i) {
+-          final GridmixKey.Spec spec = new GridmixKey.Spec();
+-          if (i == id) {
+-            spec.bytes_out = split.getReduceBytes(idx);
+-            spec.rec_out = split.getReduceRecords(idx);
+-            spec.setResourceUsageSpecification(
+-                   split.getReduceResourceUsageMetrics(idx));
+-            ++idx;
+-            id += maps;
+-          }
+-          
+-          // set the map output bytes such that the final reduce input bytes 
+-          // match the expected value obtained from the original job
+-          long mapOutputBytes = reduceBytes[i];
+-          if (emulateMapOutputCompression) {
+-            mapOutputBytes /= compressionRatio;
+-          }
+-          reduces.add(new IntermediateRecordFactory(
+-              new AvgRecordFactory(mapOutputBytes, reduceRecords[i], conf, 
+-                                   5*1024),
+-              i, reduceRecords[i], spec, conf));
+-          totalRecords += reduceRecords[i];
+-        }
+-      } else {
+-        long mapOutputBytes = reduceBytes[0];
+-        
+-        // enable gridmix job output compression
+-        boolean emulateJobOutputCompression = 
+-          CompressionEmulationUtil.isCompressionEmulationEnabled(conf)
+-          && conf.getBoolean(FileOutputFormat.COMPRESS, false);
+-
+-        if (emulateJobOutputCompression) {
+-          float compressionRatio = 
+-            CompressionEmulationUtil.getJobOutputCompressionEmulationRatio(conf);
+-          LOG.info("GridMix is configured to use a compression ratio of " 
+-                   + compressionRatio + " for the job output data.");
+-          key.setCompressibility(true, compressionRatio);
+-          val.setCompressibility(true, compressionRatio);
+-
+-          // set the output size accordingly
+-          mapOutputBytes /= compressionRatio;
+-        }
+-        reduces.add(new AvgRecordFactory(mapOutputBytes, reduceRecords[0],
+-                                         conf, 5*1024));
+-        totalRecords = reduceRecords[0];
+-      }
+-      final long splitRecords = split.getInputRecords();
+-      int missingRecSize = 
+-        conf.getInt(AvgRecordFactory.GRIDMIX_MISSING_REC_SIZE, 64*1024);
+-      final long inputRecords = 
+-        (splitRecords <= 0 && split.getLength() >= 0)
+-        ? Math.max(1, split.getLength() / missingRecSize)
+-        : splitRecords;
+-      ratio = totalRecords / (1.0 * inputRecords);
+-      acc = 0.0;
+-      
+-      matcher = new ResourceUsageMatcherRunner(ctxt, 
+-                      split.getMapResourceUsageMetrics());
+-      matcher.setDaemon(true);
+-      
+-      // start the status reporter thread
+-      reporter = new StatusReporter(ctxt, matcher);
+-      reporter.setDaemon(true);
+-      reporter.start();
+-    }
+-
+-    @Override
+-    public void map(NullWritable ignored, GridmixRecord rec,
+-                    Context context) throws IOException, InterruptedException {
+-      acc += ratio;
+-      while (acc >= 1.0 && !reduces.isEmpty()) {
+-        key.setSeed(r.nextLong());
+-        val.setSeed(r.nextLong());
+-        final int idx = r.nextInt(reduces.size());
+-        final RecordFactory f = reduces.get(idx);
+-        if (!f.next(key, val)) {
+-          reduces.remove(idx);
+-          continue;
+-        }
+-        context.write(key, val);
+-        acc -= 1.0;
+-        
+-        // match inline
+-        try {
+-          matcher.match();
+-        } catch (Exception e) {
+-          LOG.debug("Error in resource usage emulation! Message: ", e);
+-        }
+-      }
+-    }
+-
+-    @Override
+-    public void cleanup(Context context) 
+-    throws IOException, InterruptedException {
+-      LOG.info("Starting the cleanup phase.");
+-      for (RecordFactory factory : reduces) {
+-        key.setSeed(r.nextLong());
+-        while (factory.next(key, val)) {
+-          // send the progress update (maybe make this a thread)
+-          context.progress();
+-          
+-          context.write(key, val);
+-          key.setSeed(r.nextLong());
+-          
+-          // match inline
+-          try {
+-            matcher.match();
+-          } catch (Exception e) {
+-            LOG.debug("Error in resource usage emulation! Message: ", e);
+-          }
+-        }
+-      }
+-      
+-      // check if the thread will get a chance to run or not
+-      //  check if there will be a sort&spill->merge phase or not
+-      //  check if the final sort&spill->merge phase is gonna happen or not
+-      if (context.getNumReduceTasks() > 0 
+-          && context.getCounter(TaskCounter.SPILLED_RECORDS).getValue() == 0) {
+-        LOG.info("Boosting the map phase progress.");
+-        // add the sort phase progress to the map phase and emulate
+-        matcher.boost(0.33f);
+-        matcher.match();
+-      }
+-      
+-      // start the matcher thread since the map phase ends here
+-      matcher.start();
+-    }
+-  }
+-
+-  public static class LoadReducer
+-  extends Reducer<GridmixKey,GridmixRecord,NullWritable,GridmixRecord> {
+-
+-    private final Random r = new Random();
+-    private final GridmixRecord val = new GridmixRecord();
+-
+-    private double acc;
+-    private double ratio;
+-    private RecordFactory factory;
+-
+-    private ResourceUsageMatcherRunner matcher = null;
+-    private StatusReporter reporter = null;
+-    
+-    @Override
+-    protected void setup(Context context)
+-    throws IOException, InterruptedException {
+-      if (!context.nextKey() 
+-          || context.getCurrentKey().getType() != GridmixKey.REDUCE_SPEC) {
+-        throw new IOException("Missing reduce spec");
+-      }
+-      long outBytes = 0L;
+-      long outRecords = 0L;
+-      long inRecords = 0L;
+-      ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-      for (GridmixRecord ignored : context.getValues()) {
+-        final GridmixKey spec = context.getCurrentKey();
+-        inRecords += spec.getReduceInputRecords();
+-        outBytes += spec.getReduceOutputBytes();
+-        outRecords += spec.getReduceOutputRecords();
+-        if (spec.getReduceResourceUsageMetrics() != null) {
+-          metrics = spec.getReduceResourceUsageMetrics();
+-        }
+-      }
+-      if (0 == outRecords && inRecords > 0) {
+-        LOG.info("Spec output bytes w/o records. Using input record count");
+-        outRecords = inRecords;
+-      }
+-      
+-      // enable gridmix reduce output record for compression
+-      Configuration conf = context.getConfiguration();
+-      if (CompressionEmulationUtil.isCompressionEmulationEnabled(conf)
+-          && FileOutputFormat.getCompressOutput(context)) {
+-        float compressionRatio = 
+-          CompressionEmulationUtil
+-            .getJobOutputCompressionEmulationRatio(conf);
+-        LOG.info("GridMix is configured to use a compression ratio of " 
+-                 + compressionRatio + " for the reduce output data.");
+-        val.setCompressibility(true, compressionRatio);
+-        
+-        // Set the actual output data size to make sure that the actual output 
+-        // data size is same after compression
+-        outBytes /= compressionRatio;
+-      }
+-      
+-      factory =
+-        new AvgRecordFactory(outBytes, outRecords, 
+-                             context.getConfiguration(), 5*1024);
+-      ratio = outRecords / (1.0 * inRecords);
+-      acc = 0.0;
+-      
+-      matcher = new ResourceUsageMatcherRunner(context, metrics);
+-      
+-      // start the status reporter thread
+-      reporter = new StatusReporter(context, matcher);
+-      reporter.start();
+-    }
+-    @Override
+-    protected void reduce(GridmixKey key, Iterable<GridmixRecord> values,
+-                          Context context) 
+-    throws IOException, InterruptedException {
+-      for (GridmixRecord ignored : values) {
+-        acc += ratio;
+-        while (acc >= 1.0 && factory.next(null, val)) {
+-          context.write(NullWritable.get(), val);
+-          acc -= 1.0;
+-          
+-          // match inline
+-          try {
+-            matcher.match();
+-          } catch (Exception e) {
+-            LOG.debug("Error in resource usage emulation! Message: ", e);
+-          }
+-        }
+-      }
+-    }
+-    @Override
+-    protected void cleanup(Context context)
+-    throws IOException, InterruptedException {
+-      val.setSeed(r.nextLong());
+-      while (factory.next(null, val)) {
+-        context.write(NullWritable.get(), val);
+-        val.setSeed(r.nextLong());
+-        
+-        // match inline
+-        try {
+-          matcher.match();
+-        } catch (Exception e) {
+-          LOG.debug("Error in resource usage emulation! Message: ", e);
+-        }
+-      }
+-    }
+-  }
+-
+-  static class LoadRecordReader
+-  extends RecordReader<NullWritable,GridmixRecord> {
+-
+-    private RecordFactory factory;
+-    private final Random r = new Random();
+-    private final GridmixRecord val = new GridmixRecord();
+-
+-    public LoadRecordReader() { }
+-
+-    @Override
+-    public void initialize(InputSplit genericSplit, TaskAttemptContext ctxt)
+-    throws IOException, InterruptedException {
+-      final LoadSplit split = (LoadSplit)genericSplit;
+-      final Configuration conf = ctxt.getConfiguration();
+-      factory = 
+-        new ReadRecordFactory(split.getLength(), split.getInputRecords(), 
+-                              new FileQueue(split, conf), conf);
+-    }
+-
+-    @Override
+-    public boolean nextKeyValue() throws IOException {
+-      val.setSeed(r.nextLong());
+-      return factory.next(null, val);
+-    }
+-    @Override
+-    public float getProgress() throws IOException {
+-      return factory.getProgress();
+-    }
+-    @Override
+-    public NullWritable getCurrentKey() {
+-      return NullWritable.get();
+-    }
+-    @Override
+-    public GridmixRecord getCurrentValue() {
+-      return val;
+-    }
+-    @Override
+-    public void close() throws IOException {
+-      factory.close();
+-    }
+-  }
+-
+-  static class LoadInputFormat
+-  extends InputFormat<NullWritable,GridmixRecord> {
+-
+-    @Override
+-    public List<InputSplit> getSplits(JobContext jobCtxt) throws IOException {
+-      return pullDescription(jobCtxt);
+-    }
+-    @Override
+-    public RecordReader<NullWritable,GridmixRecord> createRecordReader(
+-        InputSplit split, final TaskAttemptContext taskContext)
+-        throws IOException {
+-      return new LoadRecordReader();
+-    }
+-  }
+-
+-  @Override
+-  void buildSplits(FilePool inputDir) throws IOException {
+-    long mapInputBytesTotal = 0L;
+-    long mapOutputBytesTotal = 0L;
+-    long mapOutputRecordsTotal = 0L;
+-    final JobStory jobdesc = getJobDesc();
+-    if (null == jobdesc) {
+-      return;
+-    }
+-    final int maps = jobdesc.getNumberMaps();
+-    final int reds = jobdesc.getNumberReduces();
+-    for (int i = 0; i < maps; ++i) {
+-      final TaskInfo info = jobdesc.getTaskInfo(TaskType.MAP, i);
+-      mapInputBytesTotal += info.getInputBytes();
+-      mapOutputBytesTotal += info.getOutputBytes();
+-      mapOutputRecordsTotal += info.getOutputRecords();
+-    }
+-    final double[] reduceRecordRatio = new double[reds];
+-    final double[] reduceByteRatio = new double[reds];
+-    for (int i = 0; i < reds; ++i) {
+-      final TaskInfo info = jobdesc.getTaskInfo(TaskType.REDUCE, i);
+-      reduceByteRatio[i] = info.getInputBytes() / (1.0 * mapOutputBytesTotal);
+-      reduceRecordRatio[i] =
+-        info.getInputRecords() / (1.0 * mapOutputRecordsTotal);
+-    }
+-    final InputStriper striper = new InputStriper(inputDir, mapInputBytesTotal);
+-    final List<InputSplit> splits = new ArrayList<InputSplit>();
+-    for (int i = 0; i < maps; ++i) {
+-      final int nSpec = reds / maps + ((reds % maps) > i ? 1 : 0);
+-      final long[] specBytes = new long[nSpec];
+-      final long[] specRecords = new long[nSpec];
+-      final ResourceUsageMetrics[] metrics = new ResourceUsageMetrics[nSpec];
+-      for (int j = 0; j < nSpec; ++j) {
+-        final TaskInfo info =
+-          jobdesc.getTaskInfo(TaskType.REDUCE, i + j * maps);
+-        specBytes[j] = info.getOutputBytes();
+-        specRecords[j] = info.getOutputRecords();
+-        metrics[j] = info.getResourceUsageMetrics();
+-        if (LOG.isDebugEnabled()) {
+-          LOG.debug(String.format("SPEC(%d) %d -> %d %d %d %d %d %d %d", id(), i,
+-                    i + j * maps, info.getOutputRecords(), 
+-                    info.getOutputBytes(), 
+-                    info.getResourceUsageMetrics().getCumulativeCpuUsage(),
+-                    info.getResourceUsageMetrics().getPhysicalMemoryUsage(),
+-                    info.getResourceUsageMetrics().getVirtualMemoryUsage(),
+-                    info.getResourceUsageMetrics().getHeapUsage()));
+-        }
+-      }
+-      final TaskInfo info = jobdesc.getTaskInfo(TaskType.MAP, i);
+-      long possiblyCompressedInputBytes = info.getInputBytes();
+-      Configuration conf = job.getConfiguration();
+-      long uncompressedInputBytes =
+-          CompressionEmulationUtil.getUncompressedInputBytes(
+-          possiblyCompressedInputBytes, conf);
+-      splits.add(
+-        new LoadSplit(striper.splitFor(inputDir, uncompressedInputBytes, 3), 
+-                      maps, i, uncompressedInputBytes, info.getInputRecords(),
+-                      info.getOutputBytes(), info.getOutputRecords(),
+-                      reduceByteRatio, reduceRecordRatio, specBytes, 
+-                      specRecords, info.getResourceUsageMetrics(),
+-                      metrics));
+-    }
+-    pushDescription(id(), splits);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java
+deleted file mode 100644
+index 27e75473a70..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java
++++ /dev/null
+@@ -1,180 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-
+-class LoadSplit extends CombineFileSplit {
+-  private int id;
+-  private int nSpec;
+-  private int maps;
+-  private int reduces;
+-  private long inputRecords;
+-  private long outputBytes;
+-  private long outputRecords;
+-  private long maxMemory;
+-  private double[] reduceBytes = new double[0];
+-  private double[] reduceRecords = new double[0];
+-
+-  // Spec for reduces id mod this
+-  private long[] reduceOutputBytes = new long[0];
+-  private long[] reduceOutputRecords = new long[0];
+-
+-  private ResourceUsageMetrics mapMetrics;
+-  private ResourceUsageMetrics[] reduceMetrics;
+-
+-  LoadSplit() {
+-    super();
+-  }
+-
+-  public LoadSplit(CombineFileSplit cfsplit, int maps, int id, long inputBytes, 
+-                   long inputRecords, long outputBytes, long outputRecords, 
+-                   double[] reduceBytes, double[] reduceRecords, 
+-                   long[] reduceOutputBytes, long[] reduceOutputRecords,
+-                   ResourceUsageMetrics metrics,
+-                   ResourceUsageMetrics[] rMetrics)
+-  throws IOException {
+-    super(cfsplit);
+-    this.id = id;
+-    this.maps = maps;
+-    reduces = reduceBytes.length;
+-    this.inputRecords = inputRecords;
+-    this.outputBytes = outputBytes;
+-    this.outputRecords = outputRecords;
+-    this.reduceBytes = reduceBytes;
+-    this.reduceRecords = reduceRecords;
+-    nSpec = reduceOutputBytes.length;
+-    this.reduceOutputBytes = reduceOutputBytes;
+-    this.reduceOutputRecords = reduceOutputRecords;
+-    this.mapMetrics = metrics;
+-    this.reduceMetrics = rMetrics;
+-  }
+-
+-  public int getId() {
+-    return id;
+-  }
+-  public int getMapCount() {
+-    return maps;
+-  }
+-  public long getInputRecords() {
+-    return inputRecords;
+-  }
+-  public long[] getOutputBytes() {
+-    if (0 == reduces) {
+-      return new long[] { outputBytes };
+-    }
+-    final long[] ret = new long[reduces];
+-    for (int i = 0; i < reduces; ++i) {
+-      ret[i] = Math.round(outputBytes * reduceBytes[i]);
+-    }
+-    return ret;
+-  }
+-  public long[] getOutputRecords() {
+-    if (0 == reduces) {
+-      return new long[] { outputRecords };
+-    }
+-    final long[] ret = new long[reduces];
+-    for (int i = 0; i < reduces; ++i) {
+-      ret[i] = Math.round(outputRecords * reduceRecords[i]);
+-    }
+-    return ret;
+-  }
+-  public long getReduceBytes(int i) {
+-    return reduceOutputBytes[i];
+-  }
+-  public long getReduceRecords(int i) {
+-    return reduceOutputRecords[i];
+-  }
+-  
+-  public ResourceUsageMetrics getMapResourceUsageMetrics() {
+-    return mapMetrics;
+-  }
+-  
+-  public ResourceUsageMetrics getReduceResourceUsageMetrics(int i) {
+-    return reduceMetrics[i];
+-  }
+-  
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    super.write(out);
+-    WritableUtils.writeVInt(out, id);
+-    WritableUtils.writeVInt(out, maps);
+-    WritableUtils.writeVLong(out, inputRecords);
+-    WritableUtils.writeVLong(out, outputBytes);
+-    WritableUtils.writeVLong(out, outputRecords);
+-    WritableUtils.writeVLong(out, maxMemory);
+-    WritableUtils.writeVInt(out, reduces);
+-    for (int i = 0; i < reduces; ++i) {
+-      out.writeDouble(reduceBytes[i]);
+-      out.writeDouble(reduceRecords[i]);
+-    }
+-    WritableUtils.writeVInt(out, nSpec);
+-    for (int i = 0; i < nSpec; ++i) {
+-      WritableUtils.writeVLong(out, reduceOutputBytes[i]);
+-      WritableUtils.writeVLong(out, reduceOutputRecords[i]);
+-    }
+-    mapMetrics.write(out);
+-    int numReduceMetrics = (reduceMetrics == null) ? 0 : reduceMetrics.length;
+-    WritableUtils.writeVInt(out, numReduceMetrics);
+-    for (int i = 0; i < numReduceMetrics; ++i) {
+-      reduceMetrics[i].write(out);
+-    }
+-  }
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    super.readFields(in);
+-    id = WritableUtils.readVInt(in);
+-    maps = WritableUtils.readVInt(in);
+-    inputRecords = WritableUtils.readVLong(in);
+-    outputBytes = WritableUtils.readVLong(in);
+-    outputRecords = WritableUtils.readVLong(in);
+-    maxMemory = WritableUtils.readVLong(in);
+-    reduces = WritableUtils.readVInt(in);
+-    if (reduceBytes.length < reduces) {
+-      reduceBytes = new double[reduces];
+-      reduceRecords = new double[reduces];
+-    }
+-    for (int i = 0; i < reduces; ++i) {
+-      reduceBytes[i] = in.readDouble();
+-      reduceRecords[i] = in.readDouble();
+-    }
+-    nSpec = WritableUtils.readVInt(in);
+-    if (reduceOutputBytes.length < nSpec) {
+-      reduceOutputBytes = new long[nSpec];
+-      reduceOutputRecords = new long[nSpec];
+-    }
+-    for (int i = 0; i < nSpec; ++i) {
+-      reduceOutputBytes[i] = WritableUtils.readVLong(in);
+-      reduceOutputRecords[i] = WritableUtils.readVLong(in);
+-    }
+-    mapMetrics = new ResourceUsageMetrics();
+-    mapMetrics.readFields(in);
+-    int numReduceMetrics = WritableUtils.readVInt(in);
+-    reduceMetrics = new ResourceUsageMetrics[numReduceMetrics];
+-    for (int i = 0; i < numReduceMetrics; ++i) {
+-      reduceMetrics[i] = new ResourceUsageMetrics();
+-      reduceMetrics[i].readFields(in);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java
+deleted file mode 100644
+index 4f1399e4fe4..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Progressive.java
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-/**
+- * Used to track progress of tasks.
+- */
+-public interface Progressive {
+-  public float getProgress();
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java
+deleted file mode 100644
+index 15fc68e2d15..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/PseudoLocalFs.java
++++ /dev/null
+@@ -1,338 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.Random;
+-import java.net.URI;
+-
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.PositionedReadable;
+-import org.apache.hadoop.fs.Seekable;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.util.Progressable;
+-
+-/**
+- * Pseudo local file system that generates random data for any file on the fly
+- * instead of storing files on disk. So opening same file multiple times will
+- * not give same file content. There are no directories in this file system
+- * other than the root and all the files are under root i.e. "/". All file URIs
+- * on pseudo local file system should be of the format <code>
+- * pseudo:///&lt;name&gt;.&lt;fileSize&gt;</code> where name is a unique name
+- * and &lt;fileSize&gt; is a number representing the size of the file in bytes.
+- */
+-class PseudoLocalFs extends FileSystem {
+-  Path home;
+-  /**
+-   * The creation time and modification time of all files in
+-   * {@link PseudoLocalFs} is same.
+-   */
+-  private static final long TIME = System.currentTimeMillis();
+-  private static final String HOME_DIR = "/";
+-  private static final long BLOCK_SIZE  = 4 * 1024 * 1024L; // 4 MB
+-  private static final int DEFAULT_BUFFER_SIZE = 1024  * 1024; // 1MB
+-
+-  static final URI NAME = URI.create("pseudo:///");
+-
+-  PseudoLocalFs() {
+-    this(new Path(HOME_DIR));
+-  }
+-
+-  PseudoLocalFs(Path home) {
+-    super();
+-    this.home = home;
+-  }
+-
+-  @Override
+-  public URI getUri() {
+-    return NAME;
+-  }
+-
+-  @Override
+-  public Path getHomeDirectory() {
+-    return home;
+-  }
+-
+-  @Override
+-  public Path getWorkingDirectory() {
+-    return getHomeDirectory();
+-  }
+-
+-  /**
+-   * Generates a valid pseudo local file path from the given <code>fileId</code>
+-   * and <code>fileSize</code>.
+-   * @param fileId unique file id string
+-   * @param fileSize file size
+-   * @return the generated relative path
+-   */
+-  static Path generateFilePath(String fileId, long fileSize) {
+-    return new Path(fileId + "." + fileSize);
+-  }
+-
+-  /**
+-   * Creating a pseudo local file is nothing but validating the file path.
+-   * Actual data of the file is generated on the fly when client tries to open
+-   * the file for reading.
+-   * @param path file path to be created
+-   */
+-  @Override
+-  public FSDataOutputStream create(Path path) throws IOException {
+-    try {
+-      validateFileNameFormat(path);
+-    } catch (FileNotFoundException e) {
+-      throw new IOException("File creation failed for " + path);
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Validate if the path provided is of expected format of Pseudo Local File
+-   * System based files.
+-   * @param path file path
+-   * @return the file size
+-   * @throws FileNotFoundException
+-   */
+-  long validateFileNameFormat(Path path) throws FileNotFoundException {
+-    path = this.makeQualified(path);
+-    boolean valid = true;
+-    long fileSize = 0;
+-    if (!path.toUri().getScheme().equals(getUri().getScheme())) {
+-      valid = false;
+-    } else {
+-      String[] parts = path.toUri().getPath().split("\\.");
+-      try {
+-        fileSize = Long.parseLong(parts[parts.length - 1]);
+-        valid = (fileSize >= 0);
+-      } catch (NumberFormatException e) {
+-        valid = false;
+-      }
+-    }
+-    if (!valid) {
+-      throw new FileNotFoundException("File " + path
+-          + " does not exist in pseudo local file system");
+-    }
+-    return fileSize;
+-  }
+-
+-  /**
+-   * @See create(Path) for details
+-   */
+-  @Override
+-  public FSDataInputStream open(Path path, int bufferSize) throws IOException {
+-    long fileSize = validateFileNameFormat(path);
+-    InputStream in = new RandomInputStream(fileSize, bufferSize);
+-    return new FSDataInputStream(in);
+-  }
+-
+-  /**
+-   * @See create(Path) for details
+-   */
+-  @Override
+-  public FSDataInputStream open(Path path) throws IOException {
+-    return open(path, DEFAULT_BUFFER_SIZE);
+-  }
+-
+-  @Override
+-  public FileStatus getFileStatus(Path path) throws IOException {
+-    long fileSize = validateFileNameFormat(path);
+-    return new FileStatus(fileSize, false, 1, BLOCK_SIZE, TIME, path);
+-  }
+-
+-  @Override
+-  public boolean exists(Path path) {
+-    try{
+-      validateFileNameFormat(path);
+-    } catch (FileNotFoundException e) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override
+-  public FSDataOutputStream create(Path path, FsPermission permission,
+-      boolean overwrite, int bufferSize, short replication, long blockSize,
+-      Progressable progress) throws IOException {
+-    return create(path);
+-  }
+-
+-  @Override
+-  public FileStatus[] listStatus(Path path) throws FileNotFoundException,
+-      IOException {
+-    return new FileStatus[] {getFileStatus(path)};
+-  }
+-
+-  /**
+-   * Input Stream that generates specified number of random bytes.
+-   */
+-  static class RandomInputStream extends InputStream
+-      implements Seekable, PositionedReadable {
+-
+-    private final Random r = new Random();
+-    private BytesWritable val = null;
+-    private int positionInVal = 0;// current position in the buffer 'val'
+-
+-    private long totalSize = 0;// total number of random bytes to be generated
+-    private long curPos = 0;// current position in this stream
+-
+-    /**
+-     * @param size total number of random bytes to be generated in this stream
+-     * @param bufferSize the buffer size. An internal buffer array of length
+-     * <code>bufferSize</code> is created. If <code>bufferSize</code> is not a
+-     * positive number, then a default value of 1MB is used.
+-     */
+-    RandomInputStream(long size, int bufferSize) {
+-      totalSize = size;
+-      if (bufferSize <= 0) {
+-        bufferSize = DEFAULT_BUFFER_SIZE;
+-      }
+-      val = new BytesWritable(new byte[bufferSize]);
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-      byte[] b = new byte[1];
+-      if (curPos < totalSize) {
+-        if (positionInVal < val.getLength()) {// use buffered byte
+-          b[0] = val.getBytes()[positionInVal++];
+-          ++curPos;
+-        } else {// generate data
+-          int num = read(b);
+-          if (num < 0) {
+-            return num;
+-          }
+-        }
+-      } else {
+-        return -1;
+-      }
+-      return b[0];
+-    }
+-
+-    @Override
+-    public int read(byte[] bytes) throws IOException {
+-      return read(bytes, 0, bytes.length);
+-    }
+-
+-    @Override
+-    public int read(byte[] bytes, int off, int len) throws IOException {
+-      if (curPos == totalSize) {
+-        return -1;// EOF
+-      }
+-      int numBytes = len;
+-      if (numBytes > (totalSize - curPos)) {// position in file is close to EOF
+-        numBytes = (int)(totalSize - curPos);
+-      }
+-      if (numBytes > (val.getLength() - positionInVal)) {
+-        // need to generate data into val
+-        r.nextBytes(val.getBytes());
+-        positionInVal = 0;
+-      }
+-
+-      System.arraycopy(val.getBytes(), positionInVal, bytes, off, numBytes);
+-      curPos += numBytes;
+-      positionInVal += numBytes;
+-      return numBytes;
+-    }
+-
+-    @Override
+-    public int available() {
+-      return (int)(val.getLength() - positionInVal);
+-    }
+-
+-    @Override
+-    public int read(long position, byte[] buffer, int offset, int length)
+-        throws IOException {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public void readFully(long position, byte[] buffer) throws IOException {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public void readFully(long position, byte[] buffer, int offset, int length)
+-        throws IOException {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    /**
+-     * Get the current position in this stream/pseudo-file
+-     * @return the position in this stream/pseudo-file
+-     * @throws IOException
+-     */
+-    @Override
+-    public long getPos() throws IOException {
+-      return curPos;
+-    }
+-
+-    @Override
+-    public void seek(long pos) throws IOException {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public boolean seekToNewSource(long targetPos) throws IOException {
+-      throw new UnsupportedOperationException();
+-    }
+-  }
+-
+-  @Override
+-  public FSDataOutputStream append(Path path, int bufferSize,
+-      Progressable progress) throws IOException {
+-    throw new UnsupportedOperationException("Append is not supported"
+-        + " in pseudo local file system.");
+-  }
+-
+-  @Override
+-  public boolean mkdirs(Path f, FsPermission permission) throws IOException {
+-    throw new UnsupportedOperationException("Mkdirs is not supported"
+-        + " in pseudo local file system.");
+-  }
+-
+-  @Override
+-  public boolean rename(Path src, Path dst) throws IOException {
+-    throw new UnsupportedOperationException("Rename is not supported"
+-        + " in pseudo local file system.");
+-  }
+-
+-  @Override
+-  public boolean delete(Path path, boolean recursive) {
+-    throw new UnsupportedOperationException("File deletion is not supported "
+-        + "in pseudo local file system.");
+-  }
+-
+-  @Override
+-  public void setWorkingDirectory(Path newDir) {
+-    throw new UnsupportedOperationException("SetWorkingDirectory "
+-        + "is not supported in pseudo local file system.");
+-  }
+-
+-  @Override
+-  public Path makeQualified(Path path) {
+-    // skip FileSystem#checkPath() to validate some other Filesystems
+-    return path.makeQualified(this.getUri(), this.getWorkingDirectory());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java
+deleted file mode 100644
+index 95e8f908d1b..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java
++++ /dev/null
+@@ -1,209 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Random;
+-
+-/**
+- * Random algorithms.
+- */
+-public class RandomAlgorithms {
+-  
+-  private interface IndexMapper {
+-    int get(int pos);
+-    void swap(int a, int b);
+-    int getSize();
+-    void reset();
+-  }
+-
+-  /**
+-   * A sparse index mapping table - useful when we want to
+-   * non-destructively permute a small fraction of a large array.
+-   */
+-  private static class SparseIndexMapper implements IndexMapper {
+-    Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();
+-    int size;
+-    
+-    SparseIndexMapper(int size) { 
+-      this.size = size;
+-    }
+-    
+-    public int get(int pos) {
+-      Integer mapped = mapping.get(pos);
+-      if (mapped == null) return pos;
+-      return mapped;
+-    }
+-
+-    public void swap(int a, int b) {
+-      if (a == b) return;
+-      int valA = get(a);
+-      int valB = get(b);
+-      if (b == valA) {
+-        mapping.remove(b);
+-      } else {
+-        mapping.put(b, valA);
+-      }
+-      if (a == valB) {
+-        mapping.remove(a);
+-      } else {
+-        mapping.put(a, valB);
+-      }
+-    }
+-    
+-    public int getSize() {
+-      return size;
+-    }
+-    
+-    public void reset() {
+-      mapping.clear();
+-    }
+-  }
+-
+-  /**
+-   * A dense index mapping table - useful when we want to
+-   * non-destructively permute a large fraction of an array.
+-   */
+-  private static class DenseIndexMapper implements IndexMapper {
+-    int[] mapping;
+-
+-    DenseIndexMapper(int size) {
+-      mapping = new int[size];
+-      for (int i=0; i<size; ++i) {
+-        mapping[i] = i;
+-      }
+-    }
+-
+-    public int get(int pos) {
+-      if ( (pos < 0) || (pos>=mapping.length) ) {
+-        throw new IndexOutOfBoundsException();
+-      }
+-      return mapping[pos];
+-    }
+-
+-    public void swap(int a, int b) {
+-      if (a == b) return;
+-      int valA = get(a);
+-      int valB = get(b);
+-      mapping[a]=valB;
+-      mapping[b]=valA;
+-    }
+-    
+-    public int getSize() {
+-      return mapping.length;
+-    }
+-    
+-    public void reset() {
+-      return;
+-    }
+-  }
+-
+-  /**
+-   * Iteratively pick random numbers from pool 0..n-1. Each number can only be
+-   * picked once.
+-   */
+-  public static class Selector {
+-    private IndexMapper mapping;
+-    private int n;
+-    private Random rand;
+-
+-    /**
+-     * Constructor.
+-     * 
+-     * @param n
+-     *          The pool of integers: 0..n-1.
+-     * @param selPcnt
+-     *          Percentage of selected numbers. This is just a hint for internal
+-     *          memory optimization.
+-     * @param rand
+-     *          Random number generator.
+-     */
+-    public Selector(int n, double selPcnt, Random rand) {
+-      if (n <= 0) {
+-        throw new IllegalArgumentException("n should be positive");
+-      }
+-      
+-      boolean sparse = (n > 200) && (selPcnt < 0.1);
+-      
+-      this.n = n;
+-      mapping = (sparse) ? new SparseIndexMapper(n) : new DenseIndexMapper(n);
+-      this.rand = rand;
+-    }
+-    
+-    /**
+-     * Select the next random number.
+-     * @return Random number selected. Or -1 if the remaining pool is empty.
+-     */
+-    public int next() {
+-      switch (n) {
+-      case 0: return -1;
+-      case 1: 
+-      {
+-        int index = mapping.get(0);
+-        --n;
+-        return index;
+-      }
+-      default:
+-      {
+-        int pos = rand.nextInt(n);
+-        int index = mapping.get(pos);
+-        mapping.swap(pos, --n);
+-        return index;
+-      }
+-      }
+-    }
+-
+-    /**
+-     * Get the remaining random number pool size.
+-     */
+-    public int getPoolSize() {
+-      return n;
+-    }
+-    
+-    /**
+-     * Reset the selector for reuse usage.
+-     */
+-    public void reset() {
+-      mapping.reset();
+-      n = mapping.getSize();
+-    }
+-  }
+-  
+-  
+-  /**
+-   * Selecting m random integers from 0..n-1.
+-   * @return An array of selected integers.
+-   */
+-  public static int[] select(int m, int n, Random rand) {
+-    if (m >= n) {
+-      int[] ret = new int[n];
+-      for (int i=0; i<n; ++i) {
+-        ret[i] = i;
+-      }
+-      return ret;
+-    }
+-    
+-    Selector selector = new Selector(n, (float)m/n, rand);
+-    int[] selected = new int[m];
+-    for (int i=0; i<m; ++i) {
+-      selected[i] = selector.next();
+-    }
+-    return selected;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java
+deleted file mode 100644
+index d5b7ad8c4b9..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RandomTextDataGenerator.java
++++ /dev/null
+@@ -1,147 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Random;
+-
+-import org.apache.commons.lang3.RandomStringUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * A random text generator. The words are simply sequences of alphabets.
+- */
+-class RandomTextDataGenerator {
+-  static final Logger LOG = LoggerFactory.getLogger(RandomTextDataGenerator.class);
+-  
+-  /**
+-   * Configuration key for random text data generator's list size.
+-   */
+-  static final String GRIDMIX_DATAGEN_RANDOMTEXT_LISTSIZE = 
+-    "gridmix.datagenerator.randomtext.listsize";
+-  
+-  /**
+-   * Configuration key for random text data generator's word size.
+-   */
+-  static final String GRIDMIX_DATAGEN_RANDOMTEXT_WORDSIZE = 
+-    "gridmix.datagenerator.randomtext.wordsize";
+-  
+-  /**
+-   * Default random text data generator's list size.
+-   */
+-  static final int DEFAULT_LIST_SIZE = 200;
+-  
+-  /**
+-   * Default random text data generator's word size.
+-   */
+-  static final int DEFAULT_WORD_SIZE = 10;
+-  
+-  /**
+-   * Default random text data generator's seed.
+-   */
+-  static final long DEFAULT_SEED = 0L;
+-  
+-  /**
+-   * A list of random words
+-   */
+-  private String[] words;
+-  private Random random;
+-  
+-  /**
+-   * Constructor for {@link RandomTextDataGenerator} with default seed.
+-   * @param size the total number of words to consider.
+-   * @param wordSize Size of each word
+-   */
+-  RandomTextDataGenerator(int size, int wordSize) {
+-    this(size, DEFAULT_SEED , wordSize);
+-  }
+-  
+-  /**
+-   * Constructor for {@link RandomTextDataGenerator}.
+-   * @param size the total number of words to consider.
+-   * @param seed Random number generator seed for repeatability
+-   * @param wordSize Size of each word
+-   */
+-  RandomTextDataGenerator(int size, Long seed, int wordSize) {
+-    random = new Random(seed);
+-    words = new String[size];
+-    
+-    //TODO change the default with the actual stats
+-    //TODO do u need varied sized words?
+-    for (int i = 0; i < size; ++i) {
+-      words[i] = 
+-        RandomStringUtils.random(wordSize, 0, 0, true, false, null, random);
+-    }
+-  }
+-  
+-  /**
+-   * Get the configured random text data generator's list size.
+-   */
+-  static int getRandomTextDataGeneratorListSize(Configuration conf) {
+-    return conf.getInt(GRIDMIX_DATAGEN_RANDOMTEXT_LISTSIZE, DEFAULT_LIST_SIZE);
+-  }
+-  
+-  /**
+-   * Set the random text data generator's list size.
+-   */
+-  static void setRandomTextDataGeneratorListSize(Configuration conf, 
+-                                                 int listSize) {
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Random text data generator is configured to use a dictionary " 
+-                + " with " + listSize + " words");
+-    }
+-    conf.setInt(GRIDMIX_DATAGEN_RANDOMTEXT_LISTSIZE, listSize);
+-  }
+-  
+-  /**
+-   * Get the configured random text data generator word size.
+-   */
+-  static int getRandomTextDataGeneratorWordSize(Configuration conf) {
+-    return conf.getInt(GRIDMIX_DATAGEN_RANDOMTEXT_WORDSIZE, DEFAULT_WORD_SIZE);
+-  }
+-  
+-  /**
+-   * Set the random text data generator word size.
+-   */
+-  static void setRandomTextDataGeneratorWordSize(Configuration conf, 
+-                                                 int wordSize) {
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Random text data generator is configured to use a dictionary " 
+-                + " with words of length " + wordSize);
+-    }
+-    conf.setInt(GRIDMIX_DATAGEN_RANDOMTEXT_WORDSIZE, wordSize);
+-  }
+-  
+-  /**
+-   * Returns a randomly selected word from a list of random words.
+-   */
+-  String getRandomWord() {
+-    int index = random.nextInt(words.length);
+-    return words[index];
+-  }
+-  
+-  /**
+-   * This is mainly for testing.
+-   */
+-  List<String> getRandomWords() {
+-    return Arrays.asList(words);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
+deleted file mode 100644
+index f95c4b36a5c..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java
++++ /dev/null
+@@ -1,85 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.IOUtils;
+-
+-/**
+- * For every record consumed, read key + val bytes from the stream provided.
+- */
+-class ReadRecordFactory extends RecordFactory {
+-
+-  /**
+-   * Size of internal, scratch buffer to read from internal stream.
+-   */
+-  public static final String GRIDMIX_READ_BUF_SIZE = "gridmix.read.buffer.size";
+-
+-  private final byte[] buf;
+-  private final InputStream src;
+-  private final RecordFactory factory;
+-
+-  /**
+-   * @param targetBytes Expected byte count.
+-   * @param targetRecords Expected record count.
+-   * @param src Stream to read bytes.
+-   * @param conf Used to establish read buffer size. @see #GRIDMIX_READ_BUF_SIZE
+-   */
+-  public ReadRecordFactory(long targetBytes, long targetRecords,
+-      InputStream src, Configuration conf) {
+-    this(new AvgRecordFactory(targetBytes, targetRecords, conf), src, conf);
+-  }
+-
+-  /**
+-   * @param factory Factory to draw record sizes.
+-   * @param src Stream to read bytes.
+-   * @param conf Used to establish read buffer size. @see #GRIDMIX_READ_BUF_SIZE
+-   */
+-  public ReadRecordFactory(RecordFactory factory, InputStream src,
+-      Configuration conf) {
+-    this.src = src;
+-    this.factory = factory;
+-    buf = new byte[conf.getInt(GRIDMIX_READ_BUF_SIZE, 64 * 1024)];
+-  }
+-
+-  @Override
+-  public boolean next(GridmixKey key, GridmixRecord val) throws IOException {
+-    if (!factory.next(key, val)) {
+-      return false;
+-    }
+-    for (int len = (null == key ? 0 : key.getSize()) + val.getSize();
+-         len > 0; len -= buf.length) {
+-      IOUtils.readFully(src, buf, 0, Math.min(buf.length, len));
+-    }
+-    return true;
+-  }
+-
+-  @Override
+-  public float getProgress() throws IOException {
+-    return factory.getProgress();
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    IOUtils.cleanupWithLogger(null, src);
+-    factory.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
+deleted file mode 100644
+index 7abcf783300..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-
+-/**
+- * Interface for producing records as inputs and outputs to tasks.
+- */
+-abstract class RecordFactory implements Closeable {
+-
+-  /**
+-   * Transform the given record or perform some operation.
+-   * @return true if the record should be emitted.
+-   */
+-  public abstract boolean next(GridmixKey key, GridmixRecord val)
+-    throws IOException;
+-
+-  /**
+-   * Estimate of exhausted record capacity.
+-   */
+-  public abstract float getProgress() throws IOException;
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java
+deleted file mode 100644
+index fe3b5d36d98..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.TimeUnit;
+-
+- class ReplayJobFactory extends JobFactory<Statistics.ClusterStats> {
+-  public static final Logger LOG = LoggerFactory.getLogger(ReplayJobFactory.class);
+-
+-  /**
+-   * Creating a new instance does not start the thread.
+-   *
+-   * @param submitter   Component to which deserialized jobs are passed
+-   * @param jobProducer Job story producer
+-   *                    {@link org.apache.hadoop.tools.rumen.ZombieJobProducer}
+-   * @param scratch     Directory into which to write output from simulated jobs
+-   * @param conf        Config passed to all jobs to be submitted
+-   * @param startFlag   Latch released from main to start pipeline
+-   * @param resolver
+-   * @throws java.io.IOException
+-   */
+-  public ReplayJobFactory(
+-    JobSubmitter submitter, JobStoryProducer jobProducer, Path scratch,
+-    Configuration conf, CountDownLatch startFlag, UserResolver resolver)
+-    throws IOException {
+-    super(submitter, jobProducer, scratch, conf, startFlag, resolver);
+-  }
+-
+-   
+-    @Override
+-  public Thread createReaderThread() {
+-    return new ReplayReaderThread("ReplayJobFactory");
+-  }
+-
+-   /**
+-    * @param item
+-    */
+-   public void update(Statistics.ClusterStats item) {
+-   }
+-
+-   private class ReplayReaderThread extends Thread {
+-
+-    public ReplayReaderThread(String threadName) {
+-      super(threadName);
+-    }
+-
+-
+-    public void run() {
+-      try {
+-        startFlag.await();
+-        if (Thread.currentThread().isInterrupted()) {
+-          return;
+-        }
+-        final long initTime = TimeUnit.MILLISECONDS.convert(
+-          System.nanoTime(), TimeUnit.NANOSECONDS);
+-        LOG.info("START REPLAY @ " + initTime);
+-        long first = -1;
+-        long last = -1;
+-        while (!Thread.currentThread().isInterrupted()) {
+-          try {
+-            final JobStory job = getNextJobFiltered();
+-            if (null == job) {
+-              return;
+-            }
+-            if (first < 0) {
+-              first = job.getSubmissionTime();
+-            }
+-            final long current = job.getSubmissionTime();
+-            if (current < last) {
+-              LOG.warn("Job " + job.getJobID() + " out of order");
+-              continue;
+-            }
+-            last = current;
+-            submitter.add(
+-              jobCreator.createGridmixJob(
+-                conf, initTime + Math.round(rateFactor * (current - first)),
+-                job, scratch,
+-                userResolver.getTargetUgi(
+-                  UserGroupInformation.createRemoteUser(job.getUser())), 
+-                sequence.getAndIncrement()));
+-          } catch (IOException e) {
+-            error = e;
+-            return;
+-          }
+-        }
+-      } catch (InterruptedException e) {
+-        // exit thread; ignore any jobs remaining in the trace
+-      } finally {
+-        IOUtils.cleanupWithLogger(null, jobProducer);
+-      }
+-    }
+-  }
+-
+-   /**
+-    * Start the reader thread, wait for latch if necessary.
+-    */
+-   @Override
+-   public void start() {
+-     this.rThread.start();
+-   }
+-
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
+deleted file mode 100644
+index 28379ae6639..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java
++++ /dev/null
+@@ -1,141 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.LineReader;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-
+-public class RoundRobinUserResolver implements UserResolver {
+-  public static final Logger LOG = LoggerFactory.getLogger(RoundRobinUserResolver.class);
+-
+-  private int uidx = 0;
+-  private List<UserGroupInformation> users = Collections.emptyList();
+-
+-  /**
+-   *  Mapping between user names of original cluster and UGIs of proxy users of
+-   *  simulated cluster
+-   */
+-  private final HashMap<String,UserGroupInformation> usercache =
+-      new HashMap<String,UserGroupInformation>();
+-  
+-  /**
+-   * Userlist assumes one user per line.
+-   * Each line in users-list-file is of the form &lt;username&gt;[,group]* 
+-   * <br> Group names are ignored(they are not parsed at all).
+-   */
+-  private List<UserGroupInformation> parseUserList(URI userUri, 
+-                                                   Configuration conf) 
+-  throws IOException {
+-    if (null == userUri) {
+-      return Collections.emptyList();
+-    }
+-    
+-    final Path userloc = new Path(userUri.toString());
+-    final Text rawUgi = new Text();
+-    final FileSystem fs = userloc.getFileSystem(conf);
+-    final ArrayList<UserGroupInformation> ugiList =
+-        new ArrayList<UserGroupInformation>();
+-
+-    LineReader in = null;
+-    try {
+-      in = new LineReader(fs.open(userloc));
+-      while (in.readLine(rawUgi) > 0) {//line is of the form username[,group]*
+-        if(rawUgi.toString().trim().equals("")) {
+-          continue; //Continue on empty line
+-        }
+-        // e is end position of user name in this line
+-        int e = rawUgi.find(",");
+-        if (e == 0) {
+-          throw new IOException("Missing username: " + rawUgi);
+-        }
+-        if (e == -1) {
+-          e = rawUgi.getLength();
+-        }
+-        final String username = Text.decode(rawUgi.getBytes(), 0, e).trim();
+-        UserGroupInformation ugi = null;
+-        try {
+-          ugi = UserGroupInformation.createProxyUser(username,
+-                    UserGroupInformation.getLoginUser());
+-        } catch (IOException ioe) {
+-          LOG.error("Error while creating a proxy user " ,ioe);
+-        }
+-        if (ugi != null) {
+-          ugiList.add(ugi);
+-        }
+-        // No need to parse groups, even if they exist. Go to next line
+-      }
+-    } finally {
+-      if (in != null) {
+-        in.close();
+-      }
+-    }
+-    return ugiList;
+-  }
+-
+-  @Override
+-  public synchronized boolean setTargetUsers(URI userloc, Configuration conf)
+-  throws IOException {
+-    uidx = 0;
+-    users = parseUserList(userloc, conf);
+-    if (users.size() == 0) {
+-      throw new IOException(buildEmptyUsersErrorMsg(userloc));
+-    }
+-    usercache.clear();
+-    return true;
+-  }
+-
+-  static String buildEmptyUsersErrorMsg(URI userloc) {
+-    return "Empty user list is not allowed for RoundRobinUserResolver. Provided"
+-    + " user resource URI '" + userloc + "' resulted in an empty user list.";
+-  }
+-
+-  @Override
+-  public synchronized UserGroupInformation getTargetUgi(
+-    UserGroupInformation ugi) {
+-    // UGI of proxy user
+-    UserGroupInformation targetUGI = usercache.get(ugi.getUserName());
+-    if (targetUGI == null) {
+-      targetUGI = users.get(uidx++ % users.size());
+-      usercache.put(ugi.getUserName(), targetUGI);
+-    }
+-    return targetUGI;
+-  }
+-
+-  /**
+-   * {@inheritDoc}
+-   * <p>
+-   * {@link RoundRobinUserResolver} needs to map the users in the
+-   * trace to the provided list of target users. So user list is needed.
+-   */
+-  public boolean needsTargetUsersList() {
+-    return true;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java
+deleted file mode 100644
+index cb05ab63f1c..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java
++++ /dev/null
+@@ -1,182 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.locks.Condition;
+-
+-public class SerialJobFactory extends JobFactory<JobStats> {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(SerialJobFactory.class);
+-  private final Condition jobCompleted = lock.newCondition();
+-
+-  /**
+-   * Creating a new instance does not start the thread.
+-   *
+-   * @param submitter   Component to which deserialized jobs are passed
+-   * @param jobProducer Job story producer
+-   *                    {@link org.apache.hadoop.tools.rumen.ZombieJobProducer}
+-   * @param scratch     Directory into which to write output from simulated jobs
+-   * @param conf        Config passed to all jobs to be submitted
+-   * @param startFlag   Latch released from main to start pipeline
+-   * @throws java.io.IOException
+-   */
+-  public SerialJobFactory(
+-    JobSubmitter submitter, JobStoryProducer jobProducer, Path scratch,
+-    Configuration conf, CountDownLatch startFlag, UserResolver resolver)
+-    throws IOException {
+-    super(submitter, jobProducer, scratch, conf, startFlag, resolver);
+-  }
+-
+-  @Override
+-  public Thread createReaderThread() {
+-    return new SerialReaderThread("SerialJobFactory");
+-  }
+-
+-  private class SerialReaderThread extends Thread {
+-
+-    public SerialReaderThread(String threadName) {
+-      super(threadName);
+-    }
+-
+-    /**
+-     * SERIAL : In this scenario .  method waits on notification ,
+-     * that a submitted job is actually completed. Logic is simple.
+-     * ===
+-     * while(true) {
+-     * wait till previousjob is completed.
+-     * break;
+-     * }
+-     * submit newJob.
+-     * previousJob = newJob;
+-     * ==
+-     */
+-    @Override
+-    public void run() {
+-      try {
+-        startFlag.await();
+-        if (Thread.currentThread().isInterrupted()) {
+-          return;
+-        }
+-        LOG.info("START SERIAL @ " + System.currentTimeMillis());
+-        GridmixJob prevJob;
+-        while (!Thread.currentThread().isInterrupted()) {
+-          final JobStory job;
+-          try {
+-            job = getNextJobFiltered();
+-            if (null == job) {
+-              return;
+-            }
+-            if (LOG.isDebugEnabled()) {
+-              LOG.debug(
+-                "Serial mode submitting job " + job.getName());
+-            }
+-            prevJob = jobCreator.createGridmixJob(
+-              conf, 0L, job, scratch, 
+-              userResolver.getTargetUgi(
+-                UserGroupInformation.createRemoteUser(job.getUser())),
+-              sequence.getAndIncrement());
+-
+-            lock.lock();
+-            try {
+-              LOG.info(" Submitted the job " + prevJob);
+-              submitter.add(prevJob);
+-            } finally {
+-              lock.unlock();
+-            }
+-          } catch (IOException e) {
+-            error = e;
+-            //If submission of current job fails , try to submit the next job.
+-            return;
+-          }
+-
+-          if (prevJob != null) {
+-            //Wait till previous job submitted is completed.
+-            lock.lock();
+-            try {
+-              while (true) {
+-                try {
+-                  jobCompleted.await();
+-                } catch (InterruptedException ie) {
+-                  LOG.error(
+-                    " Error in SerialJobFactory while waiting for job completion ",
+-                    ie);
+-                  return;
+-                }
+-                if (LOG.isDebugEnabled()) {
+-                  LOG.debug(" job " + job.getName() + " completed ");
+-                }
+-                break;
+-              }
+-            } finally {
+-              lock.unlock();
+-            }
+-            prevJob = null;
+-          }
+-        }
+-      } catch (InterruptedException e) {
+-        return;
+-      } finally {
+-        IOUtils.cleanupWithLogger(null, jobProducer);
+-      }
+-    }
+-
+-  }
+-
+-  /**
+-   * SERIAL. Once you get notification from StatsCollector about the job
+-   * completion ,simply notify the waiting thread.
+-   *
+-   * @param item
+-   */
+-  @Override
+-  public void update(Statistics.JobStats item) {
+-    //simply notify in case of serial submissions. We are just bothered
+-    //if submitted job is completed or not.
+-    lock.lock();
+-    try {
+-      jobCompleted.signalAll();
+-    } finally {
+-      lock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Start the reader thread, wait for latch if necessary.
+-   */
+-  @Override
+-  public void start() {
+-    LOG.info(" Starting Serial submission ");
+-    this.rThread.start();
+-  }
+-  // it is need for test 
+-  void setDistCacheEmulator(DistributedCacheEmulator e) {
+-    jobCreator.setDistCacheEmulator(e);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
+deleted file mode 100644
+index 50261139f94..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SleepJob.java
++++ /dev/null
+@@ -1,412 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapred.TaskStatus;
+-import org.apache.hadoop.mapred.gridmix.RandomAlgorithms.Selector;
+-import org.apache.hadoop.mapreduce.InputFormat;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.Reducer;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.lib.output.NullOutputFormat;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.ReduceTaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.util.Time;
+-
+-public class SleepJob extends GridmixJob {
+-  public static final Logger LOG = LoggerFactory.getLogger(SleepJob.class);
+-  private static final ThreadLocal <Random> rand = 
+-    new ThreadLocal <Random> () {
+-        @Override protected Random initialValue() {
+-            return new Random();
+-    }
+-  };
+-  
+-  public static final String SLEEPJOB_MAPTASK_ONLY="gridmix.sleep.maptask-only";
+-  private final boolean mapTasksOnly;
+-  private final int fakeLocations;
+-  private final String[] hosts;
+-  private final Selector selector;
+-  
+-  /**
+-   * Interval at which to report progress, in seconds.
+-   */
+-  public static final String GRIDMIX_SLEEP_INTERVAL = "gridmix.sleep.interval";
+-  public static final String GRIDMIX_SLEEP_MAX_MAP_TIME = 
+-    "gridmix.sleep.max-map-time";
+-  public static final String GRIDMIX_SLEEP_MAX_REDUCE_TIME = 
+-    "gridmix.sleep.max-reduce-time";
+-
+-  private final long mapMaxSleepTime, reduceMaxSleepTime;
+-
+-  public SleepJob(Configuration conf, long submissionMillis, JobStory jobdesc,
+-      Path outRoot, UserGroupInformation ugi, int seq, int numLocations,
+-      String[] hosts) throws IOException {
+-    super(conf, submissionMillis, jobdesc, outRoot, ugi, seq);
+-    this.fakeLocations = numLocations;
+-    this.hosts = hosts.clone();
+-    this.selector = (fakeLocations > 0)? new Selector(hosts.length, (float) fakeLocations
+-        / hosts.length, rand.get()) : null;
+-    this.mapTasksOnly = conf.getBoolean(SLEEPJOB_MAPTASK_ONLY, false);
+-    mapMaxSleepTime = conf.getLong(GRIDMIX_SLEEP_MAX_MAP_TIME, Long.MAX_VALUE);
+-    reduceMaxSleepTime = conf.getLong(GRIDMIX_SLEEP_MAX_REDUCE_TIME,
+-        Long.MAX_VALUE);
+-  }
+-
+-  @Override
+-  protected boolean canEmulateCompression() {
+-    return false;
+-  }
+-  
+-  @Override
+-  public Job call()
+-    throws IOException, InterruptedException, ClassNotFoundException {
+-    ugi.doAs(
+-      new PrivilegedExceptionAction<Job>() {
+-        public Job run()
+-          throws IOException, ClassNotFoundException, InterruptedException {
+-          job.setMapperClass(SleepMapper.class);
+-          job.setReducerClass(SleepReducer.class);
+-          job.setNumReduceTasks((mapTasksOnly) ? 0 : jobdesc.getNumberReduces());
+-          job.setMapOutputKeyClass(GridmixKey.class);
+-          job.setMapOutputValueClass(NullWritable.class);
+-          job.setSortComparatorClass(GridmixKey.Comparator.class);
+-          job.setGroupingComparatorClass(SpecGroupingComparator.class);
+-          job.setInputFormatClass(SleepInputFormat.class);
+-          job.setOutputFormatClass(NullOutputFormat.class);
+-          job.setPartitionerClass(DraftPartitioner.class);
+-          job.setJarByClass(SleepJob.class);
+-          job.getConfiguration().setBoolean(Job.USED_GENERIC_PARSER, true);
+-          job.submit();
+-          return job;
+-
+-        }
+-      });
+-
+-    return job;
+-  }
+-
+-  public static class SleepMapper
+-  extends Mapper<LongWritable, LongWritable, GridmixKey, NullWritable> {
+-
+-    @Override
+-    public void map(LongWritable key, LongWritable value, Context context)
+-    throws IOException, InterruptedException {
+-      context.setStatus("Sleeping... " + value.get() + " ms left");
+-      long now = System.currentTimeMillis();
+-      if (now < key.get()) {
+-        TimeUnit.MILLISECONDS.sleep(key.get() - now);
+-      }
+-    }
+-
+-    @Override
+-    public void cleanup(Context context)
+-    throws IOException, InterruptedException {
+-      final int nReds = context.getNumReduceTasks();
+-      if (nReds > 0) {
+-        final SleepSplit split = (SleepSplit) context.getInputSplit();
+-        int id = split.getId();
+-        final int nMaps = split.getNumMaps();
+-        //This is a hack to pass the sleep duration via Gridmix key
+-        //TODO: We need to come up with better solution for this.
+-        
+-        final GridmixKey key = new GridmixKey(GridmixKey.REDUCE_SPEC, 0, 0L);
+-        for (int i = id, idx = 0; i < nReds; i += nMaps) {
+-          key.setPartition(i);
+-          key.setReduceOutputBytes(split.getReduceDurations(idx++));
+-          id += nReds;
+-          context.write(key, NullWritable.get());
+-        }
+-      }
+-    }
+-
+-  }
+-
+-  public static class SleepReducer
+-  extends Reducer<GridmixKey, NullWritable, NullWritable, NullWritable> {
+-
+-    private long duration = 0L;
+-
+-    @Override
+-    protected void setup(Context context)
+-    throws IOException, InterruptedException {
+-      if (!context.nextKey() ||
+-        context.getCurrentKey().getType() != GridmixKey.REDUCE_SPEC) {
+-        throw new IOException("Missing reduce spec");
+-      }
+-      for (NullWritable ignored : context.getValues()) {
+-        final GridmixKey spec = context.getCurrentKey();
+-        duration += spec.getReduceOutputBytes();
+-      }
+-      long sleepInterval = 
+-        context.getConfiguration().getLong(GRIDMIX_SLEEP_INTERVAL, 5);
+-      final long RINTERVAL = 
+-        TimeUnit.MILLISECONDS.convert(sleepInterval, TimeUnit.SECONDS);
+-      //This is to stop accumulating deviation from expected sleep time
+-      //over a period of time.
+-      long start = Time.monotonicNow();
+-      long slept = 0L;
+-      long sleep = 0L;
+-      while (slept < duration) {
+-        final long rem = duration - slept;
+-        sleep = Math.min(rem, RINTERVAL);
+-        context.setStatus("Sleeping... " + rem + " ms left");
+-        TimeUnit.MILLISECONDS.sleep(sleep);
+-        slept = Time.monotonicNow() - start;
+-      }
+-    }
+-
+-    @Override
+-    protected void cleanup(Context context)
+-    throws IOException, InterruptedException {
+-      final String msg = "Slept for " + duration;
+-      LOG.info(msg);
+-      context.setStatus(msg);
+-    }
+-  }
+-
+-  public static class SleepInputFormat
+-  extends InputFormat<LongWritable, LongWritable> {
+-
+-    @Override
+-    public List<InputSplit> getSplits(JobContext jobCtxt) throws IOException {
+-      return pullDescription(jobCtxt);
+-    }
+-
+-    @Override
+-    public RecordReader<LongWritable, LongWritable> createRecordReader(
+-      InputSplit split, final TaskAttemptContext context)
+-      throws IOException, InterruptedException {
+-      final long duration = split.getLength();
+-      long sleepInterval = 
+-    	  context.getConfiguration().getLong(GRIDMIX_SLEEP_INTERVAL, 5);
+-      final long RINTERVAL = 
+-        TimeUnit.MILLISECONDS.convert(sleepInterval, TimeUnit.SECONDS);
+-      if (RINTERVAL <= 0) {
+-        throw new IOException(
+-          "Invalid " + GRIDMIX_SLEEP_INTERVAL + ": " + RINTERVAL);
+-      }
+-      return new RecordReader<LongWritable, LongWritable>() {
+-        long start = -1;
+-        long slept = 0L;
+-        long sleep = 0L;
+-        final LongWritable key = new LongWritable();
+-        final LongWritable val = new LongWritable();
+-
+-        @Override
+-        public boolean nextKeyValue() throws IOException {
+-          if (start == -1) {
+-            start = System.currentTimeMillis();
+-          }
+-          slept += sleep;
+-          sleep = Math.min(duration - slept, RINTERVAL);
+-          key.set(slept + sleep + start);
+-          val.set(duration - slept);
+-          return slept < duration;
+-        }
+-
+-        @Override
+-        public float getProgress() throws IOException {
+-          return slept / ((float) duration);
+-        }
+-
+-        @Override
+-        public LongWritable getCurrentKey() {
+-          return key;
+-        }
+-
+-        @Override
+-        public LongWritable getCurrentValue() {
+-          return val;
+-        }
+-
+-        @Override
+-        public void close() throws IOException {
+-          final String msg = "Slept for " + duration;
+-          LOG.info(msg);
+-        }
+-
+-        public void initialize(InputSplit split, TaskAttemptContext ctxt) {
+-        }
+-      };
+-    }
+-  }
+-
+-  public static class SleepSplit extends InputSplit implements Writable {
+-    private int id;
+-    private int nSpec;
+-    private int nMaps;
+-    private long sleepDuration;
+-    private long[] reduceDurations = new long[0];
+-    private String[] locations = new String[0];
+-
+-    public SleepSplit() {
+-    }
+-
+-    public SleepSplit(
+-      int id, long sleepDuration, long[] reduceDurations, int nMaps,
+-      String[] locations) {
+-      this.id = id;
+-      this.sleepDuration = sleepDuration;
+-      nSpec = reduceDurations.length;
+-      this.reduceDurations = reduceDurations.clone();
+-      this.nMaps = nMaps;
+-      this.locations = locations.clone();
+-    }
+-
+-    @Override
+-    public void write(DataOutput out) throws IOException {
+-      WritableUtils.writeVInt(out, id);
+-      WritableUtils.writeVLong(out, sleepDuration);
+-      WritableUtils.writeVInt(out, nMaps);
+-      WritableUtils.writeVInt(out, nSpec);
+-      for (int i = 0; i < nSpec; ++i) {
+-        WritableUtils.writeVLong(out, reduceDurations[i]);
+-      }
+-      WritableUtils.writeVInt(out, locations.length);
+-      for (int i = 0; i < locations.length; ++i) {
+-        Text.writeString(out, locations[i]);
+-      }
+-    }
+-
+-    @Override
+-    public void readFields(DataInput in) throws IOException {
+-      id = WritableUtils.readVInt(in);
+-      sleepDuration = WritableUtils.readVLong(in);
+-      nMaps = WritableUtils.readVInt(in);
+-      nSpec = WritableUtils.readVInt(in);
+-      if (reduceDurations.length < nSpec) {
+-        reduceDurations = new long[nSpec];
+-      }
+-      for (int i = 0; i < nSpec; ++i) {
+-        reduceDurations[i] = WritableUtils.readVLong(in);
+-      }
+-      final int nLoc = WritableUtils.readVInt(in);
+-      if (nLoc != locations.length) {
+-        locations = new String[nLoc];
+-      }
+-      for (int i = 0; i < nLoc; ++i) {
+-        locations[i] = Text.readString(in);
+-      }
+-    }
+-
+-    @Override
+-    public long getLength() {
+-      return sleepDuration;
+-    }
+-
+-    public int getId() {
+-      return id;
+-    }
+-
+-    public int getNumMaps() {
+-      return nMaps;
+-    }
+-
+-    public long getReduceDurations(int i) {
+-      return reduceDurations[i];
+-    }
+-
+-    @Override
+-    public String[] getLocations() {
+-      return locations.clone();
+-    }
+-  }
+-
+-  private TaskAttemptInfo getSuccessfulAttemptInfo(TaskType type, int task) {
+-    TaskAttemptInfo ret;
+-    for (int i = 0; true; ++i) {
+-      // Rumen should make up an attempt if it's missing. Or this won't work
+-      // at all. It's hard to discern what is happening in there.
+-      ret = jobdesc.getTaskAttemptInfo(type, task, i);
+-      if (ret.getRunState() == TaskStatus.State.SUCCEEDED) {
+-        break;
+-      }
+-    }
+-    if(ret.getRunState() != TaskStatus.State.SUCCEEDED) {
+-      LOG.warn("No sucessful attempts tasktype " + type +" task "+ task);
+-    }
+-
+-    return ret;
+-  }
+-
+-  @Override
+-  void buildSplits(FilePool inputDir) throws IOException {
+-    final List<InputSplit> splits = new ArrayList<InputSplit>();
+-    final int reds = (mapTasksOnly) ? 0 : jobdesc.getNumberReduces();
+-    final int maps = jobdesc.getNumberMaps();
+-    for (int i = 0; i < maps; ++i) {
+-      final int nSpec = reds / maps + ((reds % maps) > i ? 1 : 0);
+-      final long[] redDurations = new long[nSpec];
+-      for (int j = 0; j < nSpec; ++j) {
+-        final ReduceTaskAttemptInfo info =
+-          (ReduceTaskAttemptInfo) getSuccessfulAttemptInfo(TaskType.REDUCE, 
+-                                                           i + j * maps);
+-        // Include only merge/reduce time
+-        redDurations[j] = Math.min(reduceMaxSleepTime, info.getMergeRuntime()
+-            + info.getReduceRuntime());
+-        if (LOG.isDebugEnabled()) {
+-          LOG.debug(
+-            String.format(
+-              "SPEC(%d) %d -> %d %d/%d", id(), i, i + j * maps, redDurations[j],
+-              info.getRuntime()));
+-        }
+-      }
+-      final TaskAttemptInfo info = getSuccessfulAttemptInfo(TaskType.MAP, i);
+-      ArrayList<String> locations = new ArrayList<String>(fakeLocations);
+-      if (fakeLocations > 0) {
+-        selector.reset();
+-      }
+-      for (int k=0; k<fakeLocations; ++k) {
+-        int index = selector.next();
+-        if (index < 0) break;
+-        locations.add(hosts[index]);
+-      }
+-
+-      splits.add(new SleepSplit(i,
+-          Math.min(info.getRuntime(), mapMaxSleepTime), redDurations, maps,
+-          locations.toArray(new String[locations.size()])));    }
+-    pushDescription(id(), splits);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java
+deleted file mode 100644
+index 2a0f74fa0ff..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StatListener.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.mapred.gridmix;
+-
+-/**
+- * Stat listener.
+- * @param <T>
+- */
+-interface StatListener<T>{
+-
+-  /**
+-   * 
+-   * @param item
+-   */
+-  void update(T item);
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java
+deleted file mode 100644
+index bf73f2a1faa..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Statistics.java
++++ /dev/null
+@@ -1,405 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.ClusterStatus;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.gridmix.Gridmix.Component;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobStatus;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Collection;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.CopyOnWriteArrayList;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.locks.Condition;
+-import java.util.concurrent.locks.ReentrantLock;
+-
+-/**
+- * Component collecting the stats required by other components
+- * to make decisions.
+- * Single thread collector tries to collect the stats (currently cluster stats)
+- * and caches it internally.
+- * Components interested in these stats need to register themselves and will get
+- * notified either on every job completion event or some fixed time interval.
+- */
+-public class Statistics implements Component<Statistics.JobStats> {
+-  public static final Logger LOG = LoggerFactory.getLogger(Statistics.class);
+-
+-  private final StatCollector statistics = new StatCollector();
+-  private JobClient cluster;
+-
+-  //List of cluster status listeners.
+-  private final List<StatListener<ClusterStats>> clusterStatlisteners =
+-    new CopyOnWriteArrayList<StatListener<ClusterStats>>();
+-
+-  //List of job status listeners.
+-  private final List<StatListener<JobStats>> jobStatListeners =
+-    new CopyOnWriteArrayList<StatListener<JobStats>>();
+-
+-  // A map of job-sequence-id to job-stats of submitted jobs
+-  private static final Map<Integer, JobStats> submittedJobsMap =
+-    new ConcurrentHashMap<Integer, JobStats>();
+-  
+-  // total number of map tasks submitted
+-  private static volatile int numMapsSubmitted = 0;
+-
+-  // total number of reduce tasks submitted
+-  private static volatile int numReducesSubmitted = 0;
+-  
+-  private int completedJobsInCurrentInterval = 0;
+-  private final int jtPollingInterval;
+-  private volatile boolean shutdown = false;
+-  private final int maxJobCompletedInInterval;
+-  private static final String MAX_JOBS_COMPLETED_IN_POLL_INTERVAL_KEY =
+-    "gridmix.max-jobs-completed-in-poll-interval";
+-  private final ReentrantLock lock = new ReentrantLock();
+-  private final Condition jobCompleted = lock.newCondition();
+-  private final CountDownLatch startFlag;
+-
+-  public Statistics(
+-    final Configuration conf, int pollingInterval, CountDownLatch startFlag)
+-    throws IOException, InterruptedException {
+-      UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-      this.cluster = ugi.doAs(new PrivilegedExceptionAction<JobClient>() {
+-        public JobClient run() throws IOException {
+-          return new JobClient(new JobConf(conf));
+-        }
+-      });
+-
+-    this.jtPollingInterval = pollingInterval;
+-    maxJobCompletedInInterval = conf.getInt(
+-      MAX_JOBS_COMPLETED_IN_POLL_INTERVAL_KEY, 1);
+-    this.startFlag = startFlag;
+-  }
+-
+-  /**
+-   * Generates a job stats.
+-   */
+-  public static JobStats generateJobStats(Job job, JobStory jobdesc) {
+-    int seq = GridmixJob.getJobSeqId(job);
+-    // bail out if job description is missing for a job to be simulated
+-    if (seq >= 0 && jobdesc == null) {
+-      throw new IllegalArgumentException("JobStory not available for job " 
+-                                         + job.getJobID());
+-    }
+-    
+-    int maps = -1;
+-    int reds = -1;
+-    if (jobdesc != null) {
+-      // Note that the ZombieJob will return a >= 0 value
+-      maps = jobdesc.getNumberMaps();
+-      reds = jobdesc.getNumberReduces();
+-    }
+-    return new JobStats(maps, reds, job);
+-  }
+-
+-  private static void addToNumMapsSubmitted(int numMaps) {
+-    numMapsSubmitted += numMaps;
+-  }
+-
+-  private static void addToNumReducesSubmitted(int numReduces) {
+-    numReducesSubmitted += numReduces;
+-  }
+-
+-  private static void subtractFromNumMapsSubmitted(int numMaps) {
+-    numMapsSubmitted -= numMaps;
+-  }
+-
+-  private static void subtractFromNumReducesSubmitted(int numReduces) {
+-    numReducesSubmitted -= numReduces;
+-  }
+-
+-  /**
+-   * Add a submitted job for monitoring.
+-   */
+-  public void addJobStats(JobStats stats) {
+-    int seq = GridmixJob.getJobSeqId(stats.getJob());
+-    if (seq < 0) {
+-      LOG.info("Not tracking job " + stats.getJob().getJobName()
+-               + " as seq id is less than zero: " + seq);
+-      return;
+-    }
+-    submittedJobsMap.put(seq, stats);
+-    addToNumMapsSubmitted(stats.getNoOfMaps());
+-    addToNumReducesSubmitted(stats.getNoOfReds());
+-  }
+-
+-  /**
+-   * Used by JobMonitor to add the completed job.
+-   */
+-  @Override
+-  public void add(Statistics.JobStats job) {
+-    //This thread will be notified initially by job-monitor incase of
+-    //data generation. Ignore that as we are getting once the input is
+-    //generated.
+-    if (!statistics.isAlive()) {
+-      return;
+-    }
+-    JobStats stat = submittedJobsMap.remove(GridmixJob.getJobSeqId(job.getJob()));
+-    
+-    // stat cannot be null
+-    if (stat == null) {
+-      LOG.error("[Statistics] Missing entry for job " 
+-                + job.getJob().getJobID());
+-      return;
+-    }
+-    
+-    // update the total number of submitted map/reduce task count
+-    subtractFromNumMapsSubmitted(stat.getNoOfMaps());
+-    subtractFromNumReducesSubmitted(stat.getNoOfReds());
+-    
+-    completedJobsInCurrentInterval++;
+-    //check if we have reached the maximum level of job completions.
+-    if (completedJobsInCurrentInterval >= maxJobCompletedInInterval) {
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug(
+-          " Reached maximum limit of jobs in a polling interval " +
+-            completedJobsInCurrentInterval);
+-      }
+-      completedJobsInCurrentInterval = 0;
+-      lock.lock();
+-      try {
+-        //Job is completed notify all the listeners.
+-        for (StatListener<JobStats> l : jobStatListeners) {
+-          l.update(stat);
+-        }
+-        this.jobCompleted.signalAll();
+-      } finally {
+-        lock.unlock();
+-      }
+-    }
+-  }
+-
+-  //TODO: We have just 2 types of listeners as of now . If no of listeners
+-  //increase then we should move to map kind of model.
+-
+-  public void addClusterStatsObservers(StatListener<ClusterStats> listener) {
+-    clusterStatlisteners.add(listener);
+-  }
+-
+-  public void addJobStatsListeners(StatListener<JobStats> listener) {
+-    this.jobStatListeners.add(listener);
+-  }
+-
+-  /**
+-   * Attempt to start the service.
+-   */
+-  @Override
+-  public void start() {
+-    statistics.start();
+-  }
+-
+-  private class StatCollector extends Thread {
+-
+-    StatCollector() {
+-      super("StatsCollectorThread");
+-    }
+-
+-    public void run() {
+-      try {
+-        startFlag.await();
+-        if (Thread.currentThread().isInterrupted()) {
+-          return;
+-        }
+-      } catch (InterruptedException ie) {
+-        LOG.error(
+-          "Statistics Error while waiting for other threads to get ready ", ie);
+-        return;
+-      }
+-      while (!shutdown) {
+-        lock.lock();
+-        try {
+-          jobCompleted.await(jtPollingInterval, TimeUnit.MILLISECONDS);
+-        } catch (InterruptedException ie) {
+-          if (!shutdown) {
+-            LOG.error("Statistics interrupt while waiting for completion of "
+-                + "a job.", ie);
+-          }
+-          return;
+-        } finally {
+-          lock.unlock();
+-        }
+-
+-        //Fetch cluster data only if required.i.e .
+-        // only if there are clusterStats listener.
+-        if (clusterStatlisteners.size() > 0) {
+-          try {
+-            ClusterStatus clusterStatus = cluster.getClusterStatus();
+-            updateAndNotifyClusterStatsListeners(clusterStatus);
+-          } catch (IOException e) {
+-            LOG.error(
+-              "Statistics io exception while polling JT ", e);
+-            return;
+-          }
+-        }
+-      }
+-    }
+-
+-    private void updateAndNotifyClusterStatsListeners(
+-      ClusterStatus clusterStatus) {
+-      ClusterStats stats = ClusterStats.getClusterStats();
+-      stats.setClusterMetric(clusterStatus);
+-      for (StatListener<ClusterStats> listener : clusterStatlisteners) {
+-        listener.update(stats);
+-      }
+-    }
+-
+-  }
+-
+-  /**
+-   * Wait until the service completes. It is assumed that either a
+-   * {@link #shutdown} or {@link #abort} has been requested.
+-   */
+-  @Override
+-  public void join(long millis) throws InterruptedException {
+-    statistics.join(millis);
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    shutdown = true;
+-    submittedJobsMap.clear();
+-    clusterStatlisteners.clear();
+-    jobStatListeners.clear();
+-    statistics.interrupt();
+-  }
+-
+-  @Override
+-  public void abort() {
+-    shutdown = true;
+-    submittedJobsMap.clear();
+-    clusterStatlisteners.clear();
+-    jobStatListeners.clear();
+-    statistics.interrupt();
+-  }
+-
+-  /**
+-   * Class to encapsulate the JobStats information.
+-   * Current we just need information about completedJob.
+-   * TODO: In future we need to extend this to send more information.
+-   */
+-  static class JobStats {
+-    private final int noOfMaps;
+-    private final int noOfReds;
+-    private JobStatus currentStatus;
+-    private final Job job;
+-
+-    public JobStats(int noOfMaps,int numOfReds, Job job){
+-      this.job = job;
+-      this.noOfMaps = noOfMaps;
+-      this.noOfReds = numOfReds;
+-    }
+-    public int getNoOfMaps() {
+-      return noOfMaps;
+-    }
+-    public int getNoOfReds() {
+-      return noOfReds;
+-    }
+-
+-    /**
+-     * Returns the job ,
+-     * We should not use job.getJobID it returns null in 20.1xx.
+-     * Use (GridmixJob.getJobSeqId(job)) instead
+-     * @return job
+-     */
+-    public Job getJob() {
+-      return job;
+-    }
+-    
+-    /**
+-     * Update the job statistics.
+-     */
+-    public synchronized void updateJobStatus(JobStatus status) {
+-      this.currentStatus = status;
+-    }
+-    
+-    /**
+-     * Get the current job status.
+-     */
+-    public synchronized JobStatus getJobStatus() {
+-      return currentStatus;
+-    }
+-  }
+-
+-  static class ClusterStats {
+-    private ClusterStatus status = null;
+-    private static ClusterStats stats = new ClusterStats();
+-
+-    private ClusterStats() {
+-
+-    }
+-
+-    /**
+-     * @return stats
+-     */
+-    static ClusterStats getClusterStats() {
+-      return stats;
+-    }
+-
+-    /**
+-     * @param metrics
+-     */
+-    void setClusterMetric(ClusterStatus metrics) {
+-      this.status = metrics;
+-    }
+-
+-    /**
+-     * @return metrics
+-     */
+-    public ClusterStatus getStatus() {
+-      return status;
+-    }
+-
+-    int getNumRunningJob() {
+-      return submittedJobsMap.size();
+-    }
+-
+-    /**
+-     * @return runningWatitingJobs
+-     */
+-    static Collection<JobStats> getRunningJobStats() {
+-      return submittedJobsMap.values();
+-    }
+-
+-    /**
+-     * Returns the total number of submitted map tasks
+-     */
+-    static int getSubmittedMapTasks() {
+-      return numMapsSubmitted;
+-    }
+-    
+-    /**
+-     * Returns the total number of submitted reduce tasks
+-     */
+-    static int getSubmittedReduceTasks() {
+-      return numReducesSubmitted;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
+deleted file mode 100644
+index 4e7fc9c2bbd..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
++++ /dev/null
+@@ -1,610 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapred.ClusterStatus;
+-import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.JobStatus;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-
+-import java.io.IOException;
+-import java.util.HashSet;
+-import java.util.Set;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-public class StressJobFactory extends JobFactory<Statistics.ClusterStats> {
+-  public static final Logger LOG = LoggerFactory.getLogger(StressJobFactory.class);
+-
+-  private final LoadStatus loadStatus = new LoadStatus();
+-  /**
+-   * The minimum ratio between pending+running map tasks (aka. incomplete map
+-   * tasks) and cluster map slot capacity for us to consider the cluster is
+-   * overloaded. For running maps, we only count them partially. Namely, a 40%
+-   * completed map is counted as 0.6 map tasks in our calculation.
+-   */
+-  private static final float OVERLOAD_MAPTASK_MAPSLOT_RATIO = 2.0f;
+-  public static final String CONF_OVERLOAD_MAPTASK_MAPSLOT_RATIO=
+-      "gridmix.throttle.maps.task-to-slot-ratio";
+-  final float overloadMapTaskMapSlotRatio;
+-
+-  /**
+-   * The minimum ratio between pending+running reduce tasks (aka. incomplete
+-   * reduce tasks) and cluster reduce slot capacity for us to consider the
+-   * cluster is overloaded. For running reduces, we only count them partially.
+-   * Namely, a 40% completed reduce is counted as 0.6 reduce tasks in our
+-   * calculation.
+-   */
+-  private static final float OVERLOAD_REDUCETASK_REDUCESLOT_RATIO = 2.5f;
+-  public static final String CONF_OVERLOAD_REDUCETASK_REDUCESLOT_RATIO=
+-    "gridmix.throttle.reduces.task-to-slot-ratio";
+-  final float overloadReduceTaskReduceSlotRatio;
+-
+-  /**
+-   * The maximum share of the cluster's mapslot capacity that can be counted
+-   * toward a job's incomplete map tasks in overload calculation.
+-   */
+-  private static final float MAX_MAPSLOT_SHARE_PER_JOB=0.1f;
+-  public static final String CONF_MAX_MAPSLOT_SHARE_PER_JOB=
+-    "gridmix.throttle.maps.max-slot-share-per-job";  
+-  final float maxMapSlotSharePerJob;
+-  
+-  /**
+-   * The maximum share of the cluster's reduceslot capacity that can be counted
+-   * toward a job's incomplete reduce tasks in overload calculation.
+-   */
+-  private static final float MAX_REDUCESLOT_SHARE_PER_JOB=0.1f;
+-  public static final String CONF_MAX_REDUCESLOT_SHARE_PER_JOB=
+-    "gridmix.throttle.reducess.max-slot-share-per-job";  
+-  final float maxReduceSlotSharePerJob;
+-
+-  /**
+-   * The ratio of the maximum number of pending+running jobs over the number of
+-   * task trackers.
+-   */
+-  private static final float MAX_JOB_TRACKER_RATIO=1.0f;
+-  public static final String CONF_MAX_JOB_TRACKER_RATIO=
+-    "gridmix.throttle.jobs-to-tracker-ratio";  
+-  final float maxJobTrackerRatio;
+-
+-  /**
+-   * Represents a list of blacklisted jobs. Jobs are blacklisted when either 
+-   * they are complete or their status cannot be obtained. Stress mode will 
+-   * ignore blacklisted jobs from its overload computation.
+-   */
+-  private Set<JobID> blacklistedJobs = new HashSet<JobID>();
+-  
+-  /**
+-   * Creating a new instance does not start the thread.
+-   *
+-   * @param submitter   Component to which deserialized jobs are passed
+-   * @param jobProducer Stream of job traces with which to construct a
+-   *                    {@link org.apache.hadoop.tools.rumen.ZombieJobProducer}
+-   * @param scratch     Directory into which to write output from simulated jobs
+-   * @param conf        Config passed to all jobs to be submitted
+-   * @param startFlag   Latch released from main to start pipeline
+-   * @throws java.io.IOException
+-   */
+-  public StressJobFactory(
+-    JobSubmitter submitter, JobStoryProducer jobProducer, Path scratch,
+-    Configuration conf, CountDownLatch startFlag, UserResolver resolver)
+-    throws IOException {
+-    super(
+-      submitter, jobProducer, scratch, conf, startFlag, resolver);
+-    overloadMapTaskMapSlotRatio = conf.getFloat(
+-        CONF_OVERLOAD_MAPTASK_MAPSLOT_RATIO, OVERLOAD_MAPTASK_MAPSLOT_RATIO);
+-    overloadReduceTaskReduceSlotRatio = conf.getFloat(
+-        CONF_OVERLOAD_REDUCETASK_REDUCESLOT_RATIO, 
+-        OVERLOAD_REDUCETASK_REDUCESLOT_RATIO);
+-    maxMapSlotSharePerJob = conf.getFloat(
+-        CONF_MAX_MAPSLOT_SHARE_PER_JOB, MAX_MAPSLOT_SHARE_PER_JOB);
+-    maxReduceSlotSharePerJob = conf.getFloat(
+-        CONF_MAX_REDUCESLOT_SHARE_PER_JOB, MAX_REDUCESLOT_SHARE_PER_JOB);
+-    maxJobTrackerRatio = conf.getFloat(
+-        CONF_MAX_JOB_TRACKER_RATIO, MAX_JOB_TRACKER_RATIO);
+-  }
+-
+-  public Thread createReaderThread() {
+-    return new StressReaderThread("StressJobFactory");
+-  }
+-
+-  /*
+-  * Worker thread responsible for reading descriptions, assigning sequence
+-  * numbers, and normalizing time.
+-  */
+-  private class StressReaderThread extends Thread {
+-
+-    public StressReaderThread(String name) {
+-      super(name);
+-    }
+-
+-    /**
+-     * STRESS: Submits the job in STRESS mode.
+-     * while(JT is overloaded) {
+-     * wait();
+-     * }
+-     * If not overloaded , get number of slots available.
+-     * Keep submitting the jobs till ,total jobs  is sufficient to
+-     * load the JT.
+-     * That is submit  (Sigma(no of maps/Job)) > (2 * no of slots available)
+-     */
+-    public void run() {
+-      try {
+-        startFlag.await();
+-        if (Thread.currentThread().isInterrupted()) {
+-          LOG.warn("[STRESS] Interrupted before start!. Exiting..");
+-          return;
+-        }
+-        LOG.info("START STRESS @ " + System.currentTimeMillis());
+-        while (!Thread.currentThread().isInterrupted()) {
+-          try {
+-            while (loadStatus.overloaded()) {
+-              // update the overload status
+-              if (LOG.isDebugEnabled()) {
+-                LOG.debug("Updating the overload status.");
+-              }
+-              try {
+-                checkLoadAndGetSlotsToBackfill();
+-              } catch (IOException ioe) {
+-                LOG.warn("[STRESS] Check failed!", ioe);
+-                return;
+-              }
+-              
+-              // if the cluster is still overloaded, then sleep
+-              if (loadStatus.overloaded()) {
+-                if (LOG.isDebugEnabled()) {
+-                  LOG.debug("[STRESS] Cluster overloaded in run! Sleeping...");
+-                }
+-
+-                // sleep 
+-                try {
+-                  Thread.sleep(1000);
+-                } catch (InterruptedException ie) {
+-                  LOG.warn("[STRESS] Interrupted while sleeping! Exiting.", ie);
+-                  return;
+-                }
+-              }
+-            }
+-
+-            while (!loadStatus.overloaded()) {
+-              if (LOG.isDebugEnabled()) {
+-                LOG.debug("[STRESS] Cluster underloaded in run! Stressing...");
+-              }
+-              try {
+-                //TODO This in-line read can block submission for large jobs.
+-                final JobStory job = getNextJobFiltered();
+-                if (null == job) {
+-                  LOG.warn("[STRESS] Finished consuming the input trace. " 
+-                           + "Exiting..");
+-                  return;
+-                }
+-                if (LOG.isDebugEnabled()) {
+-                  LOG.debug("Job Selected: " + job.getJobID());
+-                }
+-                
+-                UserGroupInformation ugi = 
+-                  UserGroupInformation.createRemoteUser(job.getUser());
+-                UserGroupInformation tgtUgi = userResolver.getTargetUgi(ugi);
+-                GridmixJob tJob = 
+-                  jobCreator.createGridmixJob(conf, 0L, job, scratch, 
+-                               tgtUgi, sequence.getAndIncrement());
+-                
+-                // submit the job
+-                submitter.add(tJob);
+-                
+-                // TODO: We need to take care of scenario when one map/reduce
+-                // takes more than 1 slot.
+-                
+-                // Lock the loadjob as we are making updates
+-                int incompleteMapTasks = (int) calcEffectiveIncompleteMapTasks(
+-                                                 loadStatus.getMapCapacity(), 
+-                                                 job.getNumberMaps(), 0.0f);
+-                loadStatus.decrementMapLoad(incompleteMapTasks);
+-                
+-                int incompleteReduceTasks = 
+-                  (int) calcEffectiveIncompleteReduceTasks(
+-                          loadStatus.getReduceCapacity(), 
+-                          job.getNumberReduces(), 0.0f);
+-                loadStatus.decrementReduceLoad(incompleteReduceTasks);
+-                  
+-                loadStatus.decrementJobLoad(1);
+-              } catch (IOException e) {
+-                LOG.error("[STRESS] Error while submitting the job ", e);
+-                error = e;
+-                return;
+-              }
+-
+-            }
+-          } finally {
+-            // do nothing
+-          }
+-        }
+-      } catch (InterruptedException e) {
+-        LOG.error("[STRESS] Interrupted in the main block!", e);
+-        return;
+-      } finally {
+-        IOUtils.cleanupWithLogger(null, jobProducer);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * STRESS Once you get the notification from StatsCollector.Collect the
+-   * clustermetrics. Update current loadStatus with new load status of JT.
+-   *
+-   * @param item
+-   */
+-  @Override
+-  public void update(Statistics.ClusterStats item) {
+-    ClusterStatus clusterStatus = item.getStatus();
+-    try {
+-      // update the max cluster map/reduce task capacity
+-      loadStatus.updateMapCapacity(clusterStatus.getMaxMapTasks());
+-      
+-      loadStatus.updateReduceCapacity(clusterStatus.getMaxReduceTasks());
+-      
+-      int numTrackers = clusterStatus.getTaskTrackers();
+-      int jobLoad = 
+-        (int) (maxJobTrackerRatio * numTrackers) - item.getNumRunningJob();
+-      loadStatus.updateJobLoad(jobLoad);
+-    } catch (Exception e) {
+-      LOG.error("Couldn't get the new Status",e);
+-    }
+-  }
+-
+-  float calcEffectiveIncompleteMapTasks(int mapSlotCapacity,
+-      int numMaps, float mapProgress) {
+-    float maxEffIncompleteMapTasks = Math.max(1.0f, mapSlotCapacity
+-        * maxMapSlotSharePerJob);
+-    float mapProgressAdjusted = Math.max(Math.min(mapProgress, 1.0f), 0.0f);
+-    return Math.min(maxEffIncompleteMapTasks, 
+-                    numMaps * (1.0f - mapProgressAdjusted));
+-  }
+-
+-  float calcEffectiveIncompleteReduceTasks(int reduceSlotCapacity,
+-      int numReduces, float reduceProgress) {
+-    float maxEffIncompleteReduceTasks = Math.max(1.0f, reduceSlotCapacity
+-        * maxReduceSlotSharePerJob);
+-    float reduceProgressAdjusted = 
+-      Math.max(Math.min(reduceProgress, 1.0f), 0.0f);
+-    return Math.min(maxEffIncompleteReduceTasks, 
+-                    numReduces * (1.0f - reduceProgressAdjusted));
+-  }
+-
+-  /**
+-   * We try to use some light-weight mechanism to determine cluster load.
+-   *
+-   * @throws java.io.IOException
+-   */
+-  protected void checkLoadAndGetSlotsToBackfill() 
+-  throws IOException, InterruptedException {
+-    if (loadStatus.getJobLoad() <= 0) {
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug(System.currentTimeMillis() + " [JobLoad] Overloaded is "
+-                  + Boolean.TRUE.toString() + " NumJobsBackfill is "
+-                  + loadStatus.getJobLoad());
+-      }
+-      return; // stop calculation because we know it is overloaded.
+-    }
+-
+-    int mapCapacity = loadStatus.getMapCapacity();
+-    int reduceCapacity = loadStatus.getReduceCapacity();
+-    
+-    // return if the cluster status is not set
+-    if (mapCapacity < 0 || reduceCapacity < 0) {
+-      // note that, by default, the overload status is true
+-      // missing cluster status will result into blocking of job submission
+-      return;
+-    }
+-    
+-    // Determine the max permissible map & reduce task load
+-    int maxMapLoad = (int) (overloadMapTaskMapSlotRatio * mapCapacity);
+-    int maxReduceLoad = 
+-      (int) (overloadReduceTaskReduceSlotRatio * reduceCapacity);
+-    
+-    // compute the total number of map & reduce tasks submitted
+-    int totalMapTasks = ClusterStats.getSubmittedMapTasks();
+-    int totalReduceTasks = ClusterStats.getSubmittedReduceTasks();
+-    
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Total submitted map tasks: " + totalMapTasks);
+-      LOG.debug("Total submitted reduce tasks: " + totalReduceTasks);
+-      LOG.debug("Max map load: " + maxMapLoad);
+-      LOG.debug("Max reduce load: " + maxReduceLoad);
+-    }
+-    
+-    // generate a pessimistic bound on the max running+pending map tasks
+-    // this check is to avoid the heavy-duty actual map load calculation
+-    int mapSlotsBackFill = (int) (maxMapLoad - totalMapTasks);
+-    
+-    // generate a pessimistic bound on the max running+pending reduce tasks
+-    // this check is to avoid the heavy-duty actual reduce load calculation
+-    int reduceSlotsBackFill = (int) (maxReduceLoad - totalReduceTasks);
+-    
+-    // maintain a list of seen job ids
+-    Set<JobID> seenJobIDs = new HashSet<JobID>();
+-    
+-    // check if the total number of submitted map/reduce tasks exceeds the 
+-    // permissible limit
+-    if (totalMapTasks > maxMapLoad || totalReduceTasks > maxReduceLoad) {
+-      // if yes, calculate the real load
+-      float incompleteMapTasks = 0; // include pending & running map tasks.
+-      float incompleteReduceTasks = 0; // include pending & running reduce tasks
+-      
+-      for (JobStats job : ClusterStats.getRunningJobStats()) {
+-        JobID id = job.getJob().getJobID();
+-        seenJobIDs.add(id);
+-        
+-        // Note that this is a hack! Ideally, ClusterStats.getRunningJobStats()
+-        // should be smart enough to take care of completed jobs.
+-        if (blacklistedJobs.contains(id)) {
+-          LOG.warn("Ignoring blacklisted job: " + id);
+-          continue;
+-        }
+-        
+-        int noOfMaps = job.getNoOfMaps();
+-        int noOfReduces = job.getNoOfReds();
+-        
+-        // consider polling for jobs where maps>0 and reds>0
+-        // TODO: What about setup/cleanup tasks for cases where m=0 and r=0
+-        //       What otherwise?
+-        if (noOfMaps > 0 || noOfReduces > 0) {
+-          // get the job's status
+-          JobStatus status = job.getJobStatus();
+-          
+-          // blacklist completed jobs and continue
+-          if (status != null && status.isJobComplete()) {
+-            LOG.warn("Blacklisting completed job: " + id);
+-            blacklistedJobs.add(id);
+-            continue;
+-          }
+-          
+-          // get the map and reduce tasks' progress
+-          float mapProgress = 0f;
+-          float reduceProgress = 0f;
+-          
+-          // check if the status is missing (this can happen for unpolled jobs)
+-          if (status != null) {
+-            mapProgress = status.getMapProgress();
+-            reduceProgress = status.getReduceProgress();
+-          }
+-          
+-          incompleteMapTasks += 
+-            calcEffectiveIncompleteMapTasks(mapCapacity, noOfMaps, mapProgress);
+-
+-          // bail out early
+-          int currentMapSlotsBackFill = (int) (maxMapLoad - incompleteMapTasks);
+-          if (currentMapSlotsBackFill <= 0) {
+-            // reset the reduce task load since we are bailing out
+-            incompleteReduceTasks = totalReduceTasks;
+-            if (LOG.isDebugEnabled()) {
+-              LOG.debug("Terminating overload check due to high map load.");
+-            }
+-            break;
+-          }
+-
+-          // compute the real reduce load
+-          if (noOfReduces > 0) {
+-            incompleteReduceTasks += 
+-              calcEffectiveIncompleteReduceTasks(reduceCapacity, noOfReduces, 
+-                  reduceProgress);
+-          }
+-
+-          // bail out early
+-          int currentReduceSlotsBackFill = 
+-            (int) (maxReduceLoad - incompleteReduceTasks);
+-          if (currentReduceSlotsBackFill <= 0) {
+-            // reset the map task load since we are bailing out
+-            incompleteMapTasks = totalMapTasks;
+-            if (LOG.isDebugEnabled()) {
+-              LOG.debug("Terminating overload check due to high reduce load.");
+-            }
+-            break;
+-          }
+-        } else {
+-          LOG.warn("Blacklisting empty job: " + id);
+-          blacklistedJobs.add(id);
+-        }
+-      }
+-
+-      // calculate the real map load on the cluster
+-      mapSlotsBackFill = (int) (maxMapLoad - incompleteMapTasks);
+-      
+-      // calculate the real reduce load on the cluster
+-      reduceSlotsBackFill = (int)(maxReduceLoad - incompleteReduceTasks);
+-      
+-      // clean up the backlisted set to keep the memory footprint minimal
+-      // retain only the jobs that are seen in this cycle
+-      blacklistedJobs.retainAll(seenJobIDs);
+-      if (LOG.isDebugEnabled() && blacklistedJobs.size() > 0) {
+-        LOG.debug("Blacklisted jobs count: " + blacklistedJobs.size());
+-      }
+-    }
+-    
+-    // update
+-    loadStatus.updateMapLoad(mapSlotsBackFill); 
+-    loadStatus.updateReduceLoad(reduceSlotsBackFill);
+-    
+-    if (loadStatus.getMapLoad() <= 0) {
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug(System.currentTimeMillis() + " [MAP-LOAD] Overloaded is "
+-                  + Boolean.TRUE.toString() + " MapSlotsBackfill is "
+-                  + loadStatus.getMapLoad());
+-      }
+-      return; // stop calculation because we know it is overloaded.
+-    }
+-    
+-    if (loadStatus.getReduceLoad() <= 0) {
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug(System.currentTimeMillis() + " [REDUCE-LOAD] Overloaded is "
+-                  + Boolean.TRUE.toString() + " ReduceSlotsBackfill is "
+-                  + loadStatus.getReduceLoad());
+-      }
+-      return; // stop calculation because we know it is overloaded.
+-    }
+-
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug(System.currentTimeMillis() + " [OVERALL] Overloaded is "
+-                + Boolean.FALSE.toString() + "Current load Status is " 
+-                + loadStatus);
+-    }
+-  }
+-
+-  static class LoadStatus {
+-    /**
+-     * Additional number of map slots that can be requested before
+-     * declaring (by Gridmix STRESS mode) the cluster as overloaded. 
+-     */
+-    private volatile int mapSlotsBackfill;
+-    
+-    /**
+-     * Determines the total map slot capacity of the cluster.
+-     */
+-    private volatile int mapSlotCapacity;
+-    
+-    /**
+-     * Additional number of reduce slots that can be requested before
+-     * declaring (by Gridmix STRESS mode) the cluster as overloaded.
+-     */
+-    private volatile int reduceSlotsBackfill;
+-    
+-    /**
+-     * Determines the total reduce slot capacity of the cluster.
+-     */
+-    private volatile int reduceSlotCapacity;
+-
+-    /**
+-     * Determines the max count of running jobs in the cluster.
+-     */
+-    private volatile int numJobsBackfill;
+-    
+-    // set the default to true
+-    private AtomicBoolean overloaded = new AtomicBoolean(true);
+-
+-    /**
+-     * Construct the LoadStatus in an unknown state - assuming the cluster is
+-     * overloaded by setting numSlotsBackfill=0.
+-     */
+-    LoadStatus() {
+-      mapSlotsBackfill = 0;
+-      reduceSlotsBackfill = 0;
+-      numJobsBackfill = 0;
+-      
+-      mapSlotCapacity = -1;
+-      reduceSlotCapacity = -1;
+-    }
+-    
+-    public synchronized int getMapLoad() {
+-      return mapSlotsBackfill;
+-    }
+-    
+-    public synchronized int getMapCapacity() {
+-      return mapSlotCapacity;
+-    }
+-    
+-    public synchronized int getReduceLoad() {
+-      return reduceSlotsBackfill;
+-    }
+-    
+-    public synchronized int getReduceCapacity() {
+-      return reduceSlotCapacity;
+-    }
+-    
+-    public synchronized int getJobLoad() {
+-      return numJobsBackfill;
+-    }
+-    
+-    public synchronized void decrementMapLoad(int mapSlotsConsumed) {
+-      this.mapSlotsBackfill -= mapSlotsConsumed;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void decrementReduceLoad(int reduceSlotsConsumed) {
+-      this.reduceSlotsBackfill -= reduceSlotsConsumed;
+-      updateOverloadStatus();
+-    }
+-
+-    public synchronized void decrementJobLoad(int numJobsConsumed) {
+-      this.numJobsBackfill -= numJobsConsumed;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void updateMapCapacity(int mapSlotsCapacity) {
+-      this.mapSlotCapacity = mapSlotsCapacity;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void updateReduceCapacity(int reduceSlotsCapacity) {
+-      this.reduceSlotCapacity = reduceSlotsCapacity;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void updateMapLoad(int mapSlotsBackfill) {
+-      this.mapSlotsBackfill = mapSlotsBackfill;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void updateReduceLoad(int reduceSlotsBackfill) {
+-      this.reduceSlotsBackfill = reduceSlotsBackfill;
+-      updateOverloadStatus();
+-    }
+-    
+-    public synchronized void updateJobLoad(int numJobsBackfill) {
+-      this.numJobsBackfill = numJobsBackfill;
+-      updateOverloadStatus();
+-    }
+-    
+-    private synchronized void updateOverloadStatus() {
+-      overloaded.set((mapSlotsBackfill <= 0) || (reduceSlotsBackfill <= 0)
+-                     || (numJobsBackfill <= 0));
+-    }
+-    
+-    public boolean overloaded() {
+-      return overloaded.get();
+-    }
+-    
+-    public synchronized String toString() {
+-    // TODO Use StringBuilder instead
+-      return " Overloaded = " + overloaded()
+-             + ", MapSlotBackfill = " + mapSlotsBackfill 
+-             + ", MapSlotCapacity = " + mapSlotCapacity
+-             + ", ReduceSlotBackfill = " + reduceSlotsBackfill 
+-             + ", ReduceSlotCapacity = " + reduceSlotCapacity
+-             + ", NumJobsBackfill = " + numJobsBackfill;
+-    }
+-  }
+-
+-  /**
+-   * Start the reader thread, wait for latch if necessary.
+-   */
+-  @Override
+-  public void start() {
+-    LOG.info(" Starting Stress submission ");
+-    this.rThread.start();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java
+deleted file mode 100644
+index 32ddad9913a..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Resolves all UGIs to the submitting user.
+- */
+-public class SubmitterUserResolver implements UserResolver {
+-  public static final Logger LOG = LoggerFactory.getLogger(SubmitterUserResolver.class);
+-  
+-  private UserGroupInformation ugi = null;
+-
+-  public SubmitterUserResolver() throws IOException {
+-    LOG.info(" Current user resolver is SubmitterUserResolver ");
+-    ugi = UserGroupInformation.getLoginUser();
+-  }
+-
+-  public synchronized boolean setTargetUsers(URI userdesc, Configuration conf)
+-      throws IOException {
+-    return false;
+-  }
+-
+-  public synchronized UserGroupInformation getTargetUgi(
+-      UserGroupInformation ugi) {
+-    return this.ugi;
+-  }
+-
+-  /**
+-   * {@inheritDoc}
+-   * <p>
+-   * Since {@link SubmitterUserResolver} returns the user name who is running
+-   * gridmix, it doesn't need a target list of users.
+-   */
+-  public boolean needsTargetUsersList() {
+-    return false;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java
+deleted file mode 100644
+index 16026f22d63..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Summarizer.java
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.DataStatistics;
+-
+-/**
+- * Summarizes various aspects of a {@link Gridmix} run.
+- */
+-class Summarizer {
+-  private ExecutionSummarizer executionSummarizer;
+-  private ClusterSummarizer clusterSummarizer;
+-  protected static final String NA = "N/A";
+-  
+-  Summarizer() {
+-    this(new String[]{NA});
+-  }
+-  
+-  Summarizer(String[] args) {
+-    executionSummarizer = new ExecutionSummarizer(args);
+-    clusterSummarizer = new ClusterSummarizer();
+-  }
+-  
+-  ExecutionSummarizer getExecutionSummarizer() {
+-    return executionSummarizer;
+-  }
+-  
+-  ClusterSummarizer getClusterSummarizer() {
+-    return clusterSummarizer;
+-  }
+-  
+-  void start(Configuration conf) {
+-    executionSummarizer.start(conf);
+-    clusterSummarizer.start(conf);
+-  }
+-  
+-  /**
+-   * This finalizes the summarizer.
+-   */
+-  @SuppressWarnings("unchecked")
+-  void finalize(JobFactory factory, String path, long size, 
+-                UserResolver resolver, DataStatistics stats, Configuration conf)
+-  throws IOException {
+-    executionSummarizer.finalize(factory, path, size, resolver, stats, conf);
+-  }
+-  
+-  /**
+-   * Summarizes the current {@link Gridmix} run and the cluster used. 
+-   */
+-  @Override
+-  public String toString() {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append(executionSummarizer.toString());
+-    builder.append(clusterSummarizer.toString());
+-    return builder.toString();
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java
+deleted file mode 100644
+index ca8c98b98da..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/UserResolver.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Maps users in the trace to a set of valid target users on the test cluster.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Evolving
+-public interface UserResolver {
+-
+-  /**
+-   * Configure the user map given the URI and configuration. The resolver's
+-   * contract will define how the resource will be interpreted, but the default
+-   * will typically interpret the URI as a {@link org.apache.hadoop.fs.Path}
+-   * listing target users.
+-   * This method should be called only if {@link #needsTargetUsersList()}
+-   * returns true.
+-   * @param userdesc URI from which user information may be loaded per the
+-   * subclass contract.
+-   * @param conf The tool configuration.
+-   * @return true if the resource provided was used in building the list of
+-   * target users
+-   */
+-  public boolean setTargetUsers(URI userdesc, Configuration conf)
+-    throws IOException;
+-
+-  /**
+-   * Map the given UGI to another per the subclass contract.
+-   * @param ugi User information from the trace.
+-   */
+-  public UserGroupInformation getTargetUgi(UserGroupInformation ugi);
+-
+-  /**
+-   * Indicates whether this user resolver needs a list of target users to be
+-   * provided.
+-   *
+-   * @return true if a list of target users is to be provided for this
+-   * user resolver
+-   */
+-  public boolean needsTargetUsersList();
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java
+deleted file mode 100644
+index 9f038073366..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/CumulativeCpuUsageEmulatorPlugin.java
++++ /dev/null
+@@ -1,324 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix.emulators.resourceusage;
+-
+-import java.io.IOException;
+-import java.util.Random;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.gridmix.Progressive;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * <p>A {@link ResourceUsageEmulatorPlugin} that emulates the cumulative CPU 
+- * usage by performing certain CPU intensive operations. Performing such CPU 
+- * intensive operations essentially uses up some CPU. Every 
+- * {@link ResourceUsageEmulatorPlugin} is configured with a feedback module i.e 
+- * a {@link ResourceCalculatorPlugin}, to monitor the resource usage.</p>
+- * 
+- * <p>{@link CumulativeCpuUsageEmulatorPlugin} emulates the CPU usage in steps. 
+- * The frequency of emulation can be configured via 
+- * {@link #CPU_EMULATION_PROGRESS_INTERVAL}.
+- * CPU usage values are matched via emulation only on the interval boundaries.
+- * </p>
+- *  
+- * {@link CumulativeCpuUsageEmulatorPlugin} is a wrapper program for managing 
+- * the CPU usage emulation feature. It internally uses an emulation algorithm 
+- * (called as core and described using {@link CpuUsageEmulatorCore}) for 
+- * performing the actual emulation. Multiple calls to this core engine should 
+- * use up some amount of CPU.<br>
+- * 
+- * <p>{@link CumulativeCpuUsageEmulatorPlugin} provides a calibration feature 
+- * via {@link #initialize(Configuration, ResourceUsageMetrics, 
+- *                        ResourceCalculatorPlugin, Progressive)} to calibrate 
+- *  the plugin and its core for the underlying hardware. As a result of 
+- *  calibration, every call to the emulation engine's core should roughly use up
+- *  1% of the total usage value to be emulated. This makes sure that the 
+- *  underlying hardware is profiled before use and that the plugin doesn't 
+- *  accidently overuse the CPU. With 1% as the unit emulation target value for 
+- *  the core engine, there will be roughly 100 calls to the engine resulting in 
+- *  roughly 100 calls to the feedback (resource usage monitor) module. 
+- *  Excessive usage of the feedback module is discouraged as 
+- *  it might result into excess CPU usage resulting into no real CPU emulation.
+- *  </p>
+- */
+-public class CumulativeCpuUsageEmulatorPlugin 
+-implements ResourceUsageEmulatorPlugin {
+-  protected CpuUsageEmulatorCore emulatorCore;
+-  private ResourceCalculatorPlugin monitor;
+-  private Progressive progress;
+-  private boolean enabled = true;
+-  private float emulationInterval; // emulation interval
+-  private long targetCpuUsage = 0;
+-  private float lastSeenProgress = 0;
+-  private long lastSeenCpuUsage = 0;
+-  
+-  // Configuration parameters
+-  public static final String CPU_EMULATION_PROGRESS_INTERVAL = 
+-    "gridmix.emulators.resource-usage.cpu.emulation-interval";
+-  private static final float DEFAULT_EMULATION_FREQUENCY = 0.1F; // 10 times
+-
+-  /**
+-   * This is the core CPU usage emulation algorithm. This is the core engine
+-   * which actually performs some CPU intensive operations to consume some
+-   * amount of CPU. Multiple calls of {@link #compute()} should help the 
+-   * plugin emulate the desired level of CPU usage. This core engine can be
+-   * calibrated using the {@link #calibrate(ResourceCalculatorPlugin, long)}
+-   * API to suit the underlying hardware better. It also can be used to optimize
+-   * the emulation cycle.
+-   */
+-  public interface CpuUsageEmulatorCore {
+-    /**
+-     * Performs some computation to use up some CPU.
+-     */
+-    public void compute();
+-    
+-    /**
+-     * Allows the core to calibrate itself.
+-     */
+-    public void calibrate(ResourceCalculatorPlugin monitor, 
+-                          long totalCpuUsage);
+-  }
+-  
+-  /**
+-   * This is the core engine to emulate the CPU usage. The only responsibility 
+-   * of this class is to perform certain math intensive operations to make sure 
+-   * that some desired value of CPU is used.
+-   */
+-  public static class DefaultCpuUsageEmulator implements CpuUsageEmulatorCore {
+-    // number of times to loop for performing the basic unit computation
+-    private int numIterations;
+-    private final Random random;
+-    
+-    /**
+-     * This is to fool the JVM and make it think that we need the value 
+-     * stored in the unit computation i.e {@link #compute()}. This will prevent
+-     * the JVM from optimizing the code.
+-     */
+-    protected double returnValue;
+-    
+-    /**
+-     * Initialized the {@link DefaultCpuUsageEmulator} with default values. 
+-     * Note that the {@link DefaultCpuUsageEmulator} should be calibrated 
+-     * (see {@link #calibrate(ResourceCalculatorPlugin, long)}) when initialized
+-     * using this constructor.
+-     */
+-    public DefaultCpuUsageEmulator() {
+-      this(-1);
+-    }
+-    
+-    DefaultCpuUsageEmulator(int numIterations) {
+-      this.numIterations = numIterations;
+-      random = new Random();
+-    }
+-    
+-    /**
+-     * This will consume some desired level of CPU. This API will try to use up
+-     * 'X' percent of the target cumulative CPU usage. Currently X is set to 
+-     * 10%.
+-     */
+-    public void compute() {
+-      for (int i = 0; i < numIterations; ++i) {
+-        performUnitComputation();
+-      }
+-    }
+-    
+-    // Perform unit computation. The complete CPU emulation will be based on 
+-    // multiple invocations to this unit computation module.
+-    protected void performUnitComputation() {
+-      //TODO can this be configurable too. Users/emulators should be able to 
+-      // pick and choose what MATH operations to run.
+-      // Example :
+-      //           BASIC : ADD, SUB, MUL, DIV
+-      //           ADV   : SQRT, SIN, COSIN..
+-      //           COMPO : (BASIC/ADV)*
+-      // Also define input generator. For now we can use the random number 
+-      // generator. Later this can be changed to accept multiple sources.
+-      
+-      int randomData = random.nextInt();
+-      int randomDataCube = randomData * randomData * randomData;
+-      double randomDataCubeRoot = Math.cbrt(randomData);
+-      returnValue = Math.log(Math.tan(randomDataCubeRoot 
+-                                      * Math.exp(randomDataCube)) 
+-                             * Math.sqrt(randomData));
+-    }
+-    
+-    /**
+-     * This will calibrate the algorithm such that a single invocation of
+-     * {@link #compute()} emulates roughly 1% of the total desired resource 
+-     * usage value.
+-     */
+-    public void calibrate(ResourceCalculatorPlugin monitor, 
+-                          long totalCpuUsage) {
+-      long initTime = monitor.getCumulativeCpuTime();
+-      
+-      long defaultLoopSize = 0;
+-      long finalTime = initTime;
+-      
+-      //TODO Make this configurable
+-      while (finalTime - initTime < 100) { // 100 ms
+-        ++defaultLoopSize;
+-        performUnitComputation(); //perform unit computation
+-        finalTime = monitor.getCumulativeCpuTime();
+-      }
+-      
+-      long referenceRuntime = finalTime - initTime;
+-      
+-      // time for one loop = (final-time - init-time) / total-loops
+-      float timePerLoop = ((float)referenceRuntime) / defaultLoopSize;
+-      
+-      // compute the 1% of the total CPU usage desired
+-      //TODO Make this configurable
+-      long onePercent = totalCpuUsage / 100;
+-      
+-      // num-iterations for 1% = (total-desired-usage / 100) / time-for-one-loop
+-      numIterations = Math.max(1, (int)((float)onePercent/timePerLoop));
+-      
+-      System.out.println("Calibration done. Basic computation runtime : " 
+-          + timePerLoop + " milliseconds. Optimal number of iterations (1%): " 
+-          + numIterations);
+-    }
+-  }
+-  
+-  public CumulativeCpuUsageEmulatorPlugin() {
+-    this(new DefaultCpuUsageEmulator());
+-  }
+-  
+-  /**
+-   * For testing.
+-   */
+-  public CumulativeCpuUsageEmulatorPlugin(CpuUsageEmulatorCore core) {
+-    emulatorCore = core;
+-  }
+-  
+-  // Note that this weighing function uses only the current progress. In future,
+-  // this might depend on progress, emulation-interval and expected target.
+-  private float getWeightForProgressInterval(float progress) {
+-    // we want some kind of exponential growth function that gives less weight
+-    // on lower progress boundaries but high (exact emulation) near progress 
+-    // value of 1.
+-    // so here is how the current growth function looks like
+-    //    progress    weight
+-    //      0.1       0.0001
+-    //      0.2       0.0016
+-    //      0.3       0.0081
+-    //      0.4       0.0256
+-    //      0.5       0.0625
+-    //      0.6       0.1296
+-    //      0.7       0.2401
+-    //      0.8       0.4096
+-    //      0.9       0.6561
+-    //      1.0       1.000
+-    
+-    return progress * progress * progress * progress;
+-  }
+-  
+-  private synchronized long getCurrentCPUUsage() {
+-    return monitor.getCumulativeCpuTime();
+-  }
+-  
+-  @Override
+-  public float getProgress() {
+-    return enabled 
+-           ? Math.min(1f, ((float)getCurrentCPUUsage())/targetCpuUsage)
+-           : 1.0f;
+-  }
+-  
+-  @Override
+-  //TODO Multi-threading for speedup?
+-  public void emulate() throws IOException, InterruptedException {
+-    if (enabled) {
+-      float currentProgress = progress.getProgress();
+-      if (lastSeenProgress < currentProgress 
+-          && ((currentProgress - lastSeenProgress) >= emulationInterval
+-              || currentProgress == 1)) {
+-        // Estimate the final cpu usage
+-        //
+-        //   Consider the following
+-        //     Cl/Cc/Cp : Last/Current/Projected Cpu usage
+-        //     Pl/Pc/Pp : Last/Current/Projected progress
+-        //   Then
+-        //     (Cp-Cc)/(Pp-Pc) = (Cc-Cl)/(Pc-Pl)
+-        //   Solving this for Cp, we get
+-        //     Cp = Cc + (1-Pc)*(Cc-Cl)/Pc-Pl)
+-        //   Note that (Cc-Cl)/(Pc-Pl) is termed as 'rate' in the following 
+-        //   section
+-        
+-        long currentCpuUsage = getCurrentCPUUsage();
+-        // estimate the cpu usage rate
+-        float rate = (currentCpuUsage - lastSeenCpuUsage)
+-                     / (currentProgress - lastSeenProgress);
+-        long projectedUsage = 
+-          currentCpuUsage + (long)((1 - currentProgress) * rate);
+-        
+-        if (projectedUsage < targetCpuUsage) {
+-          // determine the correction factor between the current usage and the
+-          // expected usage and add some weight to the target
+-          long currentWeighedTarget = 
+-            (long)(targetCpuUsage 
+-                   * getWeightForProgressInterval(currentProgress));
+-          
+-          while (getCurrentCPUUsage() < currentWeighedTarget) {
+-            emulatorCore.compute();
+-            // sleep for 100ms
+-            try {
+-              Thread.sleep(100);
+-            } catch (InterruptedException ie) {
+-              String message = 
+-                "CumulativeCpuUsageEmulatorPlugin got interrupted. Exiting.";
+-              throw new RuntimeException(message);
+-            }
+-          }
+-        }
+-        
+-        // set the last seen progress
+-        lastSeenProgress = progress.getProgress();
+-        // set the last seen usage
+-        lastSeenCpuUsage = getCurrentCPUUsage();
+-      }
+-    }
+-  }
+-
+-  @Override
+-  public void initialize(Configuration conf, ResourceUsageMetrics metrics,
+-                         ResourceCalculatorPlugin monitor,
+-                         Progressive progress) {
+-    this.monitor = monitor;
+-    this.progress = progress;
+-    
+-    // get the target CPU usage
+-    targetCpuUsage = metrics.getCumulativeCpuUsage();
+-    if (targetCpuUsage <= 0 ) {
+-      enabled = false;
+-      return;
+-    } else {
+-      enabled = true;
+-    }
+-    
+-    emulationInterval =  conf.getFloat(CPU_EMULATION_PROGRESS_INTERVAL, 
+-                                       DEFAULT_EMULATION_FREQUENCY);
+-    
+-    // calibrate the core cpu-usage utility
+-    emulatorCore.calibrate(monitor, targetCpuUsage);
+-    
+-    // initialize the states
+-    lastSeenProgress = 0;
+-    lastSeenCpuUsage = 0;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java
+deleted file mode 100644
+index 7a80e8df6c8..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageEmulatorPlugin.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix.emulators.resourceusage;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.mapred.gridmix.Progressive;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * <p>Each resource to be emulated should have a corresponding implementation 
+- * class that implements {@link ResourceUsageEmulatorPlugin}.</p>
+- * <br><br>
+- * {@link ResourceUsageEmulatorPlugin} will be configured using the 
+- * {@link #initialize(Configuration, ResourceUsageMetrics, 
+- *                    ResourceCalculatorPlugin, Progressive)} call.
+- * Every 
+- * {@link ResourceUsageEmulatorPlugin} is also configured with a feedback module
+- * i.e a {@link ResourceCalculatorPlugin}, to monitor the current resource 
+- * usage. {@link ResourceUsageMetrics} decides the final resource usage value to
+- * emulate. {@link Progressive} keeps track of the task's progress.
+- * 
+- * <br><br>
+- * 
+- * For configuring GridMix to load and and use a resource usage emulator, 
+- * see {@link ResourceUsageMatcher}. 
+- */
+-public interface ResourceUsageEmulatorPlugin extends Progressive {
+-  /**
+-   * Initialize the plugin. This might involve
+-   *   - initializing the variables
+-   *   - calibrating the plugin
+-   */
+-  void initialize(Configuration conf, ResourceUsageMetrics metrics, 
+-                  ResourceCalculatorPlugin monitor,
+-                  Progressive progress);
+-
+-  /**
+-   * Emulate the resource usage to match the usage target. The plugin can use
+-   * the given {@link ResourceCalculatorPlugin} to query for the current 
+-   * resource usage.
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  void emulate() throws IOException, InterruptedException;
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java
+deleted file mode 100644
+index 38095800111..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/ResourceUsageMatcher.java
++++ /dev/null
+@@ -1,111 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix.emulators.resourceusage;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.gridmix.Progressive;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * <p>This is the driver class for managing all the resource usage emulators.
+- * {@link ResourceUsageMatcher} expects a comma separated list of 
+- * {@link ResourceUsageEmulatorPlugin} implementations specified using 
+- * {@link #RESOURCE_USAGE_EMULATION_PLUGINS} as the configuration parameter.</p>
+- * 
+- * <p>Note that the order in which the emulators are invoked is same as the 
+- * order in which they are configured.
+- */
+-public class ResourceUsageMatcher implements Progressive {
+-  /**
+-   * Configuration key to set resource usage emulators.
+-   */
+-  public static final String RESOURCE_USAGE_EMULATION_PLUGINS =
+-    "gridmix.emulators.resource-usage.plugins";
+-  
+-  private List<ResourceUsageEmulatorPlugin> emulationPlugins = 
+-    new ArrayList<ResourceUsageEmulatorPlugin>();
+-  
+-  /**
+-   * Configure the {@link ResourceUsageMatcher} to load the configured plugins
+-   * and initialize them.
+-   */
+-  @SuppressWarnings("unchecked")
+-  public void configure(Configuration conf, ResourceCalculatorPlugin monitor, 
+-                        ResourceUsageMetrics metrics, Progressive progress) {
+-    Class[] plugins = conf.getClasses(RESOURCE_USAGE_EMULATION_PLUGINS);
+-    if (plugins == null) {
+-      System.out.println("No resource usage emulator plugins configured.");
+-    } else {
+-      for (Class clazz : plugins) {
+-        if (clazz != null) {
+-          if (ResourceUsageEmulatorPlugin.class.isAssignableFrom(clazz)) {
+-            ResourceUsageEmulatorPlugin plugin = 
+-              (ResourceUsageEmulatorPlugin) ReflectionUtils.newInstance(clazz, 
+-                                                                        conf);
+-            emulationPlugins.add(plugin);
+-          } else {
+-            throw new RuntimeException("Misconfigured resource usage plugins. " 
+-                + "Class " + clazz.getClass().getName() + " is not a resource "
+-                + "usage plugin as it does not extend "
+-                + ResourceUsageEmulatorPlugin.class.getName());
+-          }
+-        }
+-      }
+-    }
+-
+-    // initialize the emulators once all the configured emulator plugins are
+-    // loaded
+-    for (ResourceUsageEmulatorPlugin emulator : emulationPlugins) {
+-      emulator.initialize(conf, metrics, monitor, progress);
+-    }
+-  }
+-  
+-  public void matchResourceUsage() throws IOException, InterruptedException {
+-    for (ResourceUsageEmulatorPlugin emulator : emulationPlugins) {
+-      // match the resource usage
+-      emulator.emulate();
+-    }
+-  }
+-  
+-  /**
+-   * Returns the average progress.
+-   */
+-  @Override
+-  public float getProgress() {
+-    if (emulationPlugins.size() > 0) {
+-      // return the average progress
+-      float progress = 0f;
+-      for (ResourceUsageEmulatorPlugin emulator : emulationPlugins) {
+-        // consider weighted progress of each emulator
+-        progress += emulator.getProgress();
+-      }
+-
+-      return progress / emulationPlugins.size();
+-    }
+-    
+-    // if no emulators are configured then return 1
+-    return 1f;
+-    
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
+deleted file mode 100644
+index 16a26729640..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/emulators/resourceusage/TotalHeapUsageEmulatorPlugin.java
++++ /dev/null
+@@ -1,279 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix.emulators.resourceusage;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.gridmix.Progressive;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * <p>A {@link ResourceUsageEmulatorPlugin} that emulates the total heap 
+- * usage by loading the JVM heap memory. Adding smaller chunks of data to the 
+- * heap will essentially use up some heap space thus forcing the JVM to expand 
+- * its heap and thus resulting into increase in the heap usage.</p>
+- * 
+- * <p>{@link TotalHeapUsageEmulatorPlugin} emulates the heap usage in steps. 
+- * The frequency of emulation can be configured via 
+- * {@link #HEAP_EMULATION_PROGRESS_INTERVAL}.
+- * Heap usage values are matched via emulation only at specific interval 
+- * boundaries.
+- * </p>
+- *  
+- * {@link TotalHeapUsageEmulatorPlugin} is a wrapper program for managing 
+- * the heap usage emulation feature. It internally uses an emulation algorithm 
+- * (called as core and described using {@link HeapUsageEmulatorCore}) for 
+- * performing the actual emulation. Multiple calls to this core engine should 
+- * use up some amount of heap.
+- */
+-public class TotalHeapUsageEmulatorPlugin 
+-implements ResourceUsageEmulatorPlugin {
+-  // Configuration parameters
+-  //  the core engine to emulate heap usage
+-  protected HeapUsageEmulatorCore emulatorCore;
+-  //  the progress bar
+-  private Progressive progress;
+-  //  decides if this plugin can emulate heap usage or not
+-  private boolean enabled = true;
+-  //  the progress boundaries/interval where emulation should be done
+-  private float emulationInterval;
+-  //  target heap usage to emulate
+-  private long targetHeapUsageInMB = 0;
+-  
+-  /**
+-   * The frequency (based on task progress) with which memory-emulation code is
+-   * run. If the value is set to 0.1 then the emulation will happen at 10% of 
+-   * the task's progress. The default value of this parameter is 
+-   * {@link #DEFAULT_EMULATION_PROGRESS_INTERVAL}.
+-   */
+-  public static final String HEAP_EMULATION_PROGRESS_INTERVAL = 
+-    "gridmix.emulators.resource-usage.heap.emulation-interval";
+-  
+-  // Default value for emulation interval
+-  private static final float DEFAULT_EMULATION_PROGRESS_INTERVAL = 0.1F; // 10 %
+-
+-  private float prevEmulationProgress = 0F;
+-  
+-  /**
+-   * The minimum buffer reserved for other non-emulation activities.
+-   */
+-  public static final String MIN_HEAP_FREE_RATIO = 
+-    "gridmix.emulators.resource-usage.heap.min-free-ratio";
+-  
+-  private float minFreeHeapRatio;
+-  
+-  private static final float DEFAULT_MIN_FREE_HEAP_RATIO = 0.3F;
+-  
+-  /**
+-   * Determines the unit increase per call to the core engine's load API. This
+-   * is expressed as a percentage of the difference between the expected total 
+-   * heap usage and the current usage. 
+-   */
+-  public static final String HEAP_LOAD_RATIO = 
+-    "gridmix.emulators.resource-usage.heap.load-ratio";
+-  
+-  private float heapLoadRatio;
+-  
+-  private static final float DEFAULT_HEAP_LOAD_RATIO = 0.1F;
+-  
+-  public static final int ONE_MB = 1024 * 1024;
+-  
+-  /**
+-   * Defines the core heap usage emulation algorithm. This engine is expected
+-   * to perform certain memory intensive operations to consume some
+-   * amount of heap. {@link #load(long)} should load the current heap and 
+-   * increase the heap usage by the specified value. This core engine can be 
+-   * initialized using the {@link #initialize(ResourceCalculatorPlugin, long)} 
+-   * API to suit the underlying hardware better.
+-   */
+-  public interface HeapUsageEmulatorCore {
+-    /**
+-     * Performs some memory intensive operations to use up some heap.
+-     */
+-    public void load(long sizeInMB);
+-    
+-    /**
+-     * Initialize the core.
+-     */
+-    public void initialize(ResourceCalculatorPlugin monitor, 
+-                           long totalHeapUsageInMB);
+-    
+-    /**
+-     * Reset the resource usage
+-     */
+-    public void reset();
+-  }
+-  
+-  /**
+-   * This is the core engine to emulate the heap usage. The only responsibility 
+-   * of this class is to perform certain memory intensive operations to make 
+-   * sure that some desired value of heap is used.
+-   */
+-  public static class DefaultHeapUsageEmulator 
+-  implements HeapUsageEmulatorCore {
+-    // store the unit loads in a list
+-    private static final ArrayList<Object> heapSpace =
+-        new ArrayList<Object>();
+-    
+-    /**
+-     * Increase heap usage by current process by the given amount.
+-     * This is done by creating objects each of size 1MB.
+-     */
+-    public void load(long sizeInMB) {
+-      for (long i = 0; i < sizeInMB; ++i) {
+-        // Create another String object of size 1MB
+-        heapSpace.add((Object)new byte[ONE_MB]);
+-      }
+-    }
+-
+-    /**
+-     * Gets the total number of 1mb objects stored in the emulator.
+-     *
+-     * @return total number of 1mb objects.
+-     */
+-    @VisibleForTesting
+-    public int getHeapSpaceSize() {
+-      return heapSpace.size();
+-    }
+-
+-    /**
+-     * This will initialize the core and check if the core can emulate the 
+-     * desired target on the underlying hardware.
+-     */
+-    public void initialize(ResourceCalculatorPlugin monitor, 
+-                           long totalHeapUsageInMB) {
+-      long maxPhysicalMemoryInMB = monitor.getPhysicalMemorySize() / ONE_MB ;
+-      if(maxPhysicalMemoryInMB < totalHeapUsageInMB) {
+-        throw new RuntimeException("Total heap the can be used is " 
+-            + maxPhysicalMemoryInMB 
+-            + " bytes while the emulator is configured to emulate a total of " 
+-            + totalHeapUsageInMB + " bytes");
+-      }
+-    }
+-    
+-    /**
+-     * Clear references to all the GridMix-allocated special objects so that 
+-     * heap usage is reduced.
+-     */
+-    @Override
+-    public void reset() {
+-      heapSpace.clear();
+-    }
+-  }
+-  
+-  public TotalHeapUsageEmulatorPlugin() {
+-    this(new DefaultHeapUsageEmulator());
+-  }
+-  
+-  /**
+-   * For testing.
+-   */
+-  public TotalHeapUsageEmulatorPlugin(HeapUsageEmulatorCore core) {
+-    emulatorCore = core;
+-  }
+-  
+-  protected long getTotalHeapUsageInMB() {
+-    return Runtime.getRuntime().totalMemory() / ONE_MB;
+-  }
+-  
+-  protected long getMaxHeapUsageInMB() {
+-    return Runtime.getRuntime().maxMemory() / ONE_MB;
+-  }
+-  
+-  @Override
+-  public float getProgress() {
+-    return enabled 
+-           ? Math.min(1f, ((float)getTotalHeapUsageInMB())/targetHeapUsageInMB)
+-           : 1.0f;
+-  }
+-  
+-  @Override
+-  public void emulate() throws IOException, InterruptedException {
+-    if (enabled) {
+-      float currentProgress = progress.getProgress();
+-      if (prevEmulationProgress < currentProgress 
+-          && ((currentProgress - prevEmulationProgress) >= emulationInterval
+-              || currentProgress == 1)) {
+-
+-        long maxHeapSizeInMB = getMaxHeapUsageInMB();
+-        long committedHeapSizeInMB = getTotalHeapUsageInMB();
+-        
+-        // Increase committed heap usage, if needed
+-        // Using a linear weighing function for computing the expected usage
+-        long expectedHeapUsageInMB = 
+-          Math.min(maxHeapSizeInMB,
+-                   (long) (targetHeapUsageInMB * currentProgress));
+-        if (expectedHeapUsageInMB < maxHeapSizeInMB
+-            && committedHeapSizeInMB < expectedHeapUsageInMB) {
+-          long bufferInMB = (long)(minFreeHeapRatio * expectedHeapUsageInMB);
+-          long currentDifferenceInMB = 
+-            expectedHeapUsageInMB - committedHeapSizeInMB;
+-          long currentIncrementLoadSizeInMB = 
+-                (long)(currentDifferenceInMB * heapLoadRatio);
+-          // Make sure that at least 1 MB is incremented.
+-          currentIncrementLoadSizeInMB = 
+-            Math.max(1, currentIncrementLoadSizeInMB);
+-          while (committedHeapSizeInMB + bufferInMB < expectedHeapUsageInMB) {
+-            // add blocks in order of X% of the difference, X = 10% by default
+-            emulatorCore.load(currentIncrementLoadSizeInMB);
+-            committedHeapSizeInMB = getTotalHeapUsageInMB();
+-          }
+-        }
+-        
+-        // store the emulation progress boundary
+-        prevEmulationProgress = currentProgress;
+-      }
+-      
+-      // reset the core so that the garbage is reclaimed
+-      emulatorCore.reset();
+-    }
+-  }
+-
+-  @Override
+-  public void initialize(Configuration conf, ResourceUsageMetrics metrics,
+-                         ResourceCalculatorPlugin monitor,
+-                         Progressive progress) {
+-    this.progress = progress;
+-    
+-    // get the target heap usage
+-    targetHeapUsageInMB = metrics.getHeapUsage() / ONE_MB;
+-    if (targetHeapUsageInMB <= 0 ) {
+-      enabled = false;
+-      return;
+-    } else {
+-      // calibrate the core heap-usage utility
+-      emulatorCore.initialize(monitor, targetHeapUsageInMB);
+-      enabled = true;
+-    }
+-    
+-    emulationInterval = 
+-      conf.getFloat(HEAP_EMULATION_PROGRESS_INTERVAL, 
+-                    DEFAULT_EMULATION_PROGRESS_INTERVAL);
+-    
+-    minFreeHeapRatio = conf.getFloat(MIN_HEAP_FREE_RATIO, 
+-                                     DEFAULT_MIN_FREE_HEAP_RATIO);
+-    
+-    heapLoadRatio = conf.getFloat(HEAP_LOAD_RATIO, DEFAULT_HEAP_LOAD_RATIO);
+-    
+-    prevEmulationProgress = 0;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-gridmix/src/main/shellprofile.d/hadoop-gridmix.sh b/hadoop-tools/hadoop-gridmix/src/main/shellprofile.d/hadoop-gridmix.sh
+deleted file mode 100755
+index 55997d04e3a..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/main/shellprofile.d/hadoop-gridmix.sh
++++ /dev/null
+@@ -1,36 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f hadoop_subcommand_gridmix >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = hadoop ]]; then
+-    hadoop_add_subcommand "gridmix" client "submit a mix of synthetic job, modeling a profiled from production load"
+-  fi
+-
+-## @description  gridmix command for hadoop
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function hadoop_subcommand_gridmix
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.mapred.gridmix.Gridmix
+-  hadoop_add_to_classpath_tools hadoop-rumen
+-  hadoop_add_to_classpath_tools hadoop-gridmix
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-gridmix/src/site/markdown/GridMix.md.vm b/hadoop-tools/hadoop-gridmix/src/site/markdown/GridMix.md.vm
+deleted file mode 100644
+index 0b18d4f8e9a..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/site/markdown/GridMix.md.vm
++++ /dev/null
+@@ -1,807 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-Gridmix
+-=======
+-
+----
+-
+-- [Overview](#Overview)
+-- [Usage](#Usage)
+-- [General Configuration Parameters](#General_Configuration_Parameters)
+-- [Job Types](#Job_Types)
+-- [Job Submission Policies](#Job_Submission_Policies)
+-- [Emulating Users and Queues](#Emulating_Users_and_Queues)
+-- [Emulating Distributed Cache Load](#Emulating_Distributed_Cache_Load)
+-- [Configuration of Simulated Jobs](#Configuration_of_Simulated_Jobs)
+-- [Emulating Compression/Decompression](#Emulating_CompressionDecompression)
+-- [Emulating High-Ram jobs](#Emulating_High-Ram_jobs)
+-- [Emulating resource usages](#Emulating_resource_usages)
+-- [Simplifying Assumptions](#Simplifying_Assumptions)
+-- [Appendix](#Appendix)
+-
+----
+-
+-Overview
+---------
+-
+-GridMix is a benchmark for Hadoop clusters. It submits a mix of
+-synthetic jobs, modeling a profile mined from production loads.
+-This version of the tool will attempt to model
+-the resource profiles of production jobs to identify bottlenecks, guide
+-development.
+-
+-To run GridMix, you need a MapReduce job trace describing the job mix
+-for a given cluster. Such traces are typically generated by
+-[Rumen](../hadoop-rumen/Rumen.html).
+-GridMix also requires input data from which the
+-synthetic jobs will be reading bytes. The input data need not be in any
+-particular format, as the synthetic jobs are currently binary readers.
+-If you are running on a new cluster, an optional step generating input
+-data may precede the run.
+-In order to emulate the load of production jobs from a given cluster
+-on the same or another cluster, follow these steps:
+-
+-1.  Locate the job history files on the production cluster. This
+-    location is specified by the
+-    `mapreduce.jobhistory.done-dir` or 
+-    `mapreduce.jobhistory.intermediate-done-dir`
+-    configuration property of the cluster.
+-    ([MapReduce historyserver](../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapredCommands.html#historyserver)
+-    moves job history files from `mapreduce.jobhistory.done-dir`
+-    to `mapreduce.jobhistory.intermediate-done-dir`.)
+-    
+-2.  Run [Rumen](../hadoop-rumen/Rumen.html)
+-    to build a job trace in JSON format for all or select jobs.
+-
+-3.  Use GridMix with the job trace on the benchmark cluster.
+-
+-Jobs submitted by GridMix have names of the form
+-"`GRIDMIXnnnnnn`", where
+-"`nnnnnn`" is a sequence number padded with leading zeroes.
+-
+-
+-Usage
+------
+-
+-Gridmix is provided as hadoop subcommand. Basic command-line usage without configuration parameters:
+-
+-```
+-$ hadoop gridmix [-generate <size>] [-users <users-list>] <iopath> <trace>
+-```
+-
+-Basic command-line usage with configuration parameters:
+-
+-```
+-$ hadoop gridmix \
+-  -Dgridmix.client.submit.threads=10 -Dgridmix.output.directory=foo \
+-  [-generate <size>] [-users <users-list>] <iopath> <trace>
+-```
+-
+-> Configuration parameters like
+-> `-Dgridmix.client.submit.threads=10` and
+-> `-Dgridmix.output.directory=foo` as given above should
+-> be used  *before*  other GridMix parameters.
+-
+-The `<iopath>` parameter is the working directory for
+-GridMix. Note that this can either be on the local file-system
+-or on HDFS, but it is highly recommended that it be the same as that for
+-the original job mix so that GridMix puts the same load on the local
+-file-system and HDFS respectively.
+-
+-The `-generate` option is used to generate input data and
+-Distributed Cache files for the synthetic jobs. It accepts standard units
+-of size suffixes, e.g. `100g` will generate
+-100 * 2<sup>30</sup> bytes as input data.
+-The minimum size of input data in compressed format (128MB by default)
+-is defined by `gridmix.min.file.size`.
+-`<iopath>/input` is the destination directory for
+-generated input data and/or the directory from which input data will be
+-read. HDFS-based Distributed Cache files are generated under the
+-distributed cache directory `<iopath>/distributedCache`.
+-If some of the needed Distributed Cache files are already existing in the
+-distributed cache directory, then only the remaining non-existing
+-Distributed Cache files are generated when `-generate` option
+-is specified.
+-
+-The `-users` option is used to point to a users-list
+-file (see <a href="#usersqueues">Emulating Users and Queues</a>).
+-
+-The `<trace>` parameter is a path to a job trace
+-generated by Rumen. This trace can be compressed (it must be readable
+-using one of the compression codecs supported by the cluster) or
+-uncompressed. Use "-" as the value of this parameter if you
+-want to pass an  *uncompressed*  trace via the standard
+-input-stream of GridMix.
+-
+-The supported configuration parameters are explained in the
+-following sections.
+-
+-
+-General Configuration Parameters
+---------------------------------
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.output.directory</code>
+-    </td>
+-    <td>The directory into which output will be written. If specified,
+-    <code>iopath</code> will be relative to this parameter. The
+-    submitting user must have read/write access to this directory. The
+-    user should also be mindful of any quota issues that may arise
+-    during a run. The default is "<code>gridmix</code>".</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.client.submit.threads</code>
+-    </td>
+-    <td>The number of threads submitting jobs to the cluster. This
+-    also controls how many splits will be loaded into memory at a given
+-    time, pending the submit time in the trace. Splits are pre-generated
+-    to hit submission deadlines, so particularly dense traces may want
+-    more submitting threads. However, storing splits in memory is
+-    reasonably expensive, so you should raise this cautiously. The
+-    default is 1 for the SERIAL job-submission policy (see
+-    <a href="#policies">Job Submission Policies</a>) and one more than
+-    the number of processors on the client machine for the other
+-    policies.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.submit.multiplier</code>
+-    </td>
+-    <td>The multiplier to accelerate or decelerate the submission of
+-    jobs. The time separating two jobs is multiplied by this factor.
+-    The default value is 1.0. This is a crude mechanism to size
+-    a job trace to a cluster.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.client.pending.queue.depth</code>
+-    </td>
+-    <td>The depth of the queue of job descriptions awaiting split
+-    generation. The jobs read from the trace occupy a queue of this
+-    depth before being processed by the submission threads. It is
+-    unusual to configure this. The default is 5.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.gen.blocksize</code>
+-    </td>
+-    <td>The block-size of generated data. The default value is 256
+-    MiB.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.gen.bytes.per.file</code>
+-    </td>
+-    <td>The maximum bytes written per file. The default value is 1
+-    GiB.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.min.file.size</code>
+-    </td>
+-    <td>The minimum size of the input files. The default limit is 128
+-    MiB. Tweak this parameter if you see an error-message like
+-    "Found no satisfactory file" while testing GridMix with
+-    a relatively-small input data-set.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.max.total.scan</code>
+-    </td>
+-    <td>The maximum size of the input files. The default limit is 100
+-    TiB.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.task.jvm-options.enable</code>
+-    </td>
+-    <td>Enables Gridmix to configure the simulated task's max heap 
+-        options using the values obtained from the original task (i.e via
+-        trace).
+-    </td>
+-  </tr>
+-</table>
+-
+-
+-Job Types
+----------
+-
+-GridMix takes as input a job trace, essentially a stream of
+-JSON-encoded job descriptions. For each job description, the submission
+-client obtains the original job submission time and for each task in
+-that job, the byte and record counts read and written. Given this data,
+-it constructs a synthetic job with the same byte and record patterns as
+-recorded in the trace. It constructs jobs of two types:
+-
+-<table>
+-  <tr>
+-    <th>Job Type</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>LOADJOB</code>
+-    </td>
+-    <td>A synthetic job that emulates the workload mentioned in Rumen
+-    trace. In the current version we are supporting I/O. It reproduces
+-    the I/O workload on the benchmark cluster. It does so by embedding
+-    the detailed I/O information for every map and reduce task, such as
+-    the number of bytes and records read and written, into each
+-    job's input splits. The map tasks further relay the I/O patterns of
+-    reduce tasks through the intermediate map output data.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>SLEEPJOB</code>
+-    </td>
+-    <td>A synthetic job where each task does  *nothing*  but sleep
+-    for a certain duration as observed in the production trace. The
+-    scalability of the ResourceManager is often limited by how many
+-    heartbeats it can handle every second. (Heartbeats are periodic
+-    messages sent from NodeManagers to update their status and grab new
+-    tasks from the ResourceManager.) Since a benchmark cluster is typically
+-    a fraction in size of a production cluster, the heartbeat traffic
+-    generated by the slave nodes is well below the level of the
+-    production cluster. One possible solution is to run multiple
+-    NodeManagers on each slave node. This leads to the obvious problem that
+-    the I/O workload generated by the synthetic jobs would thrash the
+-    slave nodes. Hence the need for such a job.</td>
+-  </tr>
+-</table>
+-
+-The following configuration parameters affect the job type:
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job.type</code>
+-    </td>
+-    <td>The value for this key can be one of LOADJOB or SLEEPJOB. The
+-    default value is LOADJOB.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.key.fraction</code>
+-    </td>
+-    <td>For a LOADJOB type of job, the fraction of a record used for
+-    the data for the key. The default value is 0.1.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.sleep.maptask-only</code>
+-    </td>
+-    <td>For a SLEEPJOB type of job, whether to ignore the reduce
+-    tasks for the job. The default is <code>false</code>.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.sleep.fake-locations</code>
+-    </td>
+-    <td>For a SLEEPJOB type of job, the number of fake locations
+-    for map tasks for the job. The default is 0.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.sleep.max-map-time</code>
+-    </td>
+-    <td>For a SLEEPJOB type of job, the maximum runtime for map
+-    tasks for the job in milliseconds. The default is unlimited.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.sleep.max-reduce-time</code>
+-    </td>
+-    <td>For a SLEEPJOB type of job, the maximum runtime for reduce
+-    tasks for the job in milliseconds. The default is unlimited.</td>
+-  </tr>
+-</table>
+-
+-
+-<a name="policies"></a>
+-
+-Job Submission Policies
+------------------------
+-
+-GridMix controls the rate of job submission. This control can be
+-based on the trace information or can be based on statistics it gathers
+-from the ResourceManager. Based on the submission policies users define,
+-GridMix uses the respective algorithm to control the job submission.
+-There are currently three types of policies:
+-
+-<table>
+-  <tr>
+-    <th>Job Submission Policy</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>STRESS</code>
+-    </td>
+-    <td>Keep submitting jobs so that the cluster remains under stress.
+-    In this mode we control the rate of job submission by monitoring
+-    the real-time load of the cluster so that we can maintain a stable
+-    stress level of workload on the cluster. Based on the statistics we
+-    gather we define if a cluster is  *underloaded*  or
+-     *overloaded* . We consider a cluster  *underloaded*  if
+-    and only if the following three conditions are true:
+-    <ol>
+-      <li>the number of pending and running jobs are under a threshold
+-      TJ</li>
+-      <li>the number of pending and running maps are under threshold
+-      TM</li>
+-      <li>the number of pending and running reduces are under threshold
+-      TR</li>
+-    </ol>
+-    The thresholds TJ, TM and TR are proportional to the size of the
+-    cluster and map, reduce slots capacities respectively. In case of a
+-    cluster being  *overloaded* , we throttle the job submission.
+-    In the actual calculation we also weigh each running task with its
+-    remaining work - namely, a 90% complete task is only counted as 0.1
+-    in calculation. Finally, to avoid a very large job blocking other
+-    jobs, we limit the number of pending/waiting tasks each job can
+-    contribute.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>REPLAY</code>
+-    </td>
+-    <td>In this mode we replay the job traces faithfully. This mode
+-    exactly follows the time-intervals given in the actual job
+-    trace.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>SERIAL</code>
+-    </td>
+-    <td>In this mode we submit the next job only once the job submitted
+-    earlier is completed.</td>
+-  </tr>
+-</table>
+-
+-The following configuration parameters affect the job submission policy:
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job-submission.policy</code>
+-    </td>
+-    <td>The value for this key would be one of the three: STRESS, REPLAY
+-    or SERIAL. In most of the cases the value of key would be STRESS or
+-    REPLAY. The default value is STRESS.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.throttle.jobs-to-tracker-ratio</code>
+-    </td>
+-    <td>In STRESS mode, the minimum ratio of running jobs to
+-    NodeManagers in a cluster for the cluster to be considered
+-    *overloaded* . This is the threshold TJ referred to earlier.
+-    The default is 1.0.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.throttle.maps.task-to-slot-ratio</code>
+-    </td>
+-    <td>In STRESS mode, the minimum ratio of pending and running map
+-    tasks (i.e. incomplete map tasks) to the number of map slots for
+-    a cluster for the cluster to be considered  *overloaded* .
+-    This is the threshold TM referred to earlier. Running map tasks are
+-    counted partially. For example, a 40% complete map task is counted
+-    as 0.6 map tasks. The default is 2.0.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.throttle.reduces.task-to-slot-ratio</code>
+-    </td>
+-    <td>In STRESS mode, the minimum ratio of pending and running reduce
+-    tasks (i.e. incomplete reduce tasks) to the number of reduce slots
+-    for a cluster for the cluster to be considered  *overloaded* .
+-    This is the threshold TR referred to earlier. Running reduce tasks
+-    are counted partially. For example, a 30% complete reduce task is
+-    counted as 0.7 reduce tasks. The default is 2.5.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.throttle.maps.max-slot-share-per-job</code>
+-    </td>
+-    <td>In STRESS mode, the maximum share of a cluster's map-slots
+-    capacity that can be counted toward a job's incomplete map tasks in
+-    overload calculation. The default is 0.1.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.throttle.reducess.max-slot-share-per-job</code>
+-    </td>
+-    <td>In STRESS mode, the maximum share of a cluster's reduce-slots
+-    capacity that can be counted toward a job's incomplete reduce tasks
+-    in overload calculation. The default is 0.1.</td>
+-  </tr>
+-</table>
+-
+-
+-<a name="usersqueues"></a>
+-
+-Emulating Users and Queues
+---------------------------
+-
+-Typical production clusters are often shared with different users and
+-the cluster capacity is divided among different departments through job
+-queues. Ensuring fairness among jobs from all users, honoring queue
+-capacity allocation policies and avoiding an ill-behaving job from
+-taking over the cluster adds significant complexity in Hadoop software.
+-To be able to sufficiently test and discover bugs in these areas,
+-GridMix must emulate the contentions of jobs from different users and/or
+-submitted to different queues.
+-
+-Emulating multiple queues is easy - we simply set up the benchmark
+-cluster with the same queue configuration as the production cluster and
+-we configure synthetic jobs so that they get submitted to the same queue
+-as recorded in the trace. However, not all users shown in the trace have
+-accounts on the benchmark cluster. Instead, we set up a number of testing
+-user accounts and associate each unique user in the trace to testing
+-users in a round-robin fashion.
+-
+-The following configuration parameters affect the emulation of users
+-and queues:
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job-submission.use-queue-in-trace</code>
+-    </td>
+-    <td>When set to <code>true</code> it uses exactly the same set of
+-    queues as those mentioned in the trace. The default value is
+-    <code>false</code>.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job-submission.default-queue</code>
+-    </td>
+-    <td>Specifies the default queue to which all the jobs would be
+-    submitted. If this parameter is not specified, GridMix uses the
+-    default queue defined for the submitting user on the cluster.</td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.user.resolve.class</code>
+-    </td>
+-    <td>Specifies which <code>UserResolver</code> implementation to use.
+-    We currently have three implementations:
+-    <ol>
+-      <li><code>org.apache.hadoop.mapred.gridmix.EchoUserResolver</code>
+-      - submits a job as the user who submitted the original job. All
+-      the users of the production cluster identified in the job trace
+-      must also have accounts on the benchmark cluster in this case.</li>
+-      <li><code>org.apache.hadoop.mapred.gridmix.SubmitterUserResolver</code>
+-      - submits all the jobs as current GridMix user. In this case we
+-      simply map all the users in the trace to the current GridMix user
+-      and submit the job.</li>
+-      <li><code>org.apache.hadoop.mapred.gridmix.RoundRobinUserResolver</code>
+-      - maps trace users to test users in a round-robin fashion. In
+-      this case we set up a number of testing user accounts and
+-      associate each unique user in the trace to testing users in a
+-      round-robin fashion.</li>
+-    </ol>
+-    The default is
+-    <code>org.apache.hadoop.mapred.gridmix.SubmitterUserResolver</code>.</td>
+-  </tr>
+-</table>
+-
+-If the parameter `gridmix.user.resolve.class` is set to
+-`org.apache.hadoop.mapred.gridmix.RoundRobinUserResolver`,
+-we need to define a users-list file with a list of test users.
+-This is specified using the `-users` option to GridMix.
+-
+-<note>
+-Specifying a users-list file using the `-users` option is
+-mandatory when using the round-robin user-resolver. Other user-resolvers
+-ignore this option.
+-</note>
+-
+-A users-list file has one user per line, each line of the format:
+-
+-    <username>
+-
+-For example:
+-
+-    user1
+-    user2
+-    user3
+-
+-In the above example we have defined three users `user1`, `user2` and `user3`.
+-Now we would associate each unique user in the trace to the above users
+-defined in round-robin fashion. For example, if trace's users are
+-`tuser1`, `tuser2`, `tuser3`, `tuser4` and `tuser5`, then the mappings would be:
+-
+-    tuser1 -> user1
+-    tuser2 -> user2
+-    tuser3 -> user3
+-    tuser4 -> user1
+-    tuser5 -> user2
+-
+-For backward compatibility reasons, each line of users-list file can
+-contain username followed by groupnames in the form username[,group]*.
+-The groupnames will be ignored by Gridmix.
+-
+-
+-Emulating Distributed Cache Load
+---------------------------------
+-
+-Gridmix emulates Distributed Cache load by default for LOADJOB type of
+-jobs. This is done by precreating the needed Distributed Cache files for all
+-the simulated jobs as part of a separate MapReduce job.
+-
+-Emulation of Distributed Cache load in gridmix simulated jobs can be
+-disabled by configuring the property
+-`gridmix.distributed-cache-emulation.enable` to
+-`false`.
+-But generation of Distributed Cache data by gridmix is driven by
+-`-generate` option and is independent of this configuration
+-property.
+-
+-Both generation of Distributed Cache files and emulation of
+-Distributed Cache load are disabled if:
+-
+-* input trace comes from the standard input-stream instead of file, or
+-* `<iopath>` specified is on local file-system, or
+-* any of the ascendant directories of the distributed cache directory
+-  i.e. `<iopath>/distributedCache` (including the distributed
+-  cache directory) doesn't have execute permission for others.
+-
+-
+-Configuration of Simulated Jobs
+--------------------------------
+-
+-Gridmix3 sets some configuration properties in the simulated Jobs
+-submitted by it so that they can be mapped back to the corresponding Job
+-in the input Job trace. These configuration parameters include:
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job.original-job-id</code>
+-    </td>
+-    <td> The job id of the original cluster's job corresponding to this
+-    simulated job.
+-    </td>
+-  </tr>
+-  <tr>
+-    <td>
+-      <code>gridmix.job.original-job-name</code>
+-    </td>
+-    <td> The job name of the original cluster's job corresponding to this
+-    simulated job.
+-    </td>
+-  </tr>
+-</table>
+-
+-
+-Emulating Compression/Decompression
+------------------------------------
+-
+-MapReduce supports data compression and decompression. 
+-Input to a MapReduce job can be compressed. Similarly, output of Map
+-and Reduce tasks can also be compressed. Compression/Decompression 
+-emulation in GridMix is important because emulating 
+-compression/decompression will effect the CPU and Memory usage of the 
+-task. A task emulating compression/decompression will affect other 
+-tasks and daemons running on the same node.
+-
+-Compression emulation is enabled if 
+-`gridmix.compression-emulation.enable` is set to
+-`true`. By default compression emulation is enabled for 
+-jobs of type  *LOADJOB* . With compression emulation enabled, 
+-GridMix will now generate compressed text data with a constant 
+-compression ratio. Hence a simulated GridMix job will now emulate 
+-compression/decompression using compressible text data (having a 
+-constant compression ratio), irrespective of the compression ratio 
+-observed in the actual job.
+-
+-A typical MapReduce Job deals with data compression/decompression in 
+-the following phases
+-
+-* `Job input data decompression: ` GridMix generates 
+-  compressible input data when compression emulation is enabled. 
+-  Based on the original job's configuration, a simulated GridMix job 
+-  will use a decompressor to read the compressed input data. 
+-  Currently, GridMix uses
+-  `mapreduce.input.fileinputformat.inputdir` to determine 
+-  if the original job used compressed input data or 
+-  not. If the original job's input files are uncompressed then the 
+-  simulated job will read the compressed input file without using a 
+-  decompressor. 
+-
+-* `Intermediate data compression and decompression: `
+-  If the original job has map output compression enabled then GridMix 
+-  too will enable map output compression for the simulated job. 
+-  Accordingly, the reducers will use a decompressor to read the map 
+-  output data.
+-
+-* `Job output data compression: `
+-  If the original job's output is compressed then GridMix 
+-  too will enable job output compression for the simulated job. 
+-       
+-The following configuration parameters affect compression emulation
+-
+-<table>
+-  <tr>
+-    <th>Parameter</th>
+-    <th>Description</th>
+-  </tr>
+-  <tr>
+-    <td>gridmix.compression-emulation.enable</td>
+-    <td>Enables compression emulation in simulated GridMix jobs. 
+-        Default is true.</td>
+-  </tr>
+-</table>
+-      
+-With compression emulation turned on, GridMix will generate compressed
+-input data. Hence the total size of the input 
+-data will be lesser than the expected size. Set 
+-`gridmix.min.file.size` to a smaller value (roughly 10% of
+-`gridmix.gen.bytes.per.file`) for enabling GridMix to 
+-correctly emulate compression.
+-
+-
+-Emulating High-Ram jobs
+------------------------
+-
+-MapReduce allows users to define a job as a High-Ram job. Tasks from a
+-High-Ram job can occupy larger fraction of memory in task processes.
+-Emulating this behavior is important because of the following reasons.
+-
+-* Impact on scheduler:  Scheduling of tasks from High-Ram jobs 
+-  impacts the scheduling behavior as it might result into
+-  resource reservation and utilization.
+-
+-* Impact on the node : Since High-Ram tasks occupy larger memory,
+-  NodeManagers do some bookkeeping for allocating extra resources for 
+-  these tasks. Thus this becomes a precursor for memory emulation
+-  where tasks with high memory requirements needs to be considered
+-  as a High-Ram task.
+-
+-High-Ram feature emulation can be disabled by setting  
+-`gridmix.highram-emulation.enable` to `false`.
+-    
+-
+-Emulating resource usages
+--------------------------
+-
+-Usages of resources like CPU, physical memory, virtual memory, JVM heap
+-etc are recorded by MapReduce using its task counters. This information
+-is used by GridMix to emulate the resource usages in the simulated 
+-tasks. Emulating resource usages will help GridMix exert similar load 
+-on the test cluster as seen in the actual cluster.
+-
+-MapReduce tasks use up resources during its entire lifetime. GridMix
+-also tries to mimic this behavior by spanning resource usage emulation
+-across the entire lifetime of the simulated task. Each resource to be
+-emulated should have an  *emulator*  associated with it.
+-Each such  *emulator*  should implement the 
+-`org.apache.hadoop.mapred.gridmix.emulators.resourceusage
+-.ResourceUsageEmulatorPlugin` interface. Resource 
+- *emulators*  in GridMix are  *plugins*  that can be 
+-configured (plugged in or out) before every run. GridMix users can 
+-configure multiple emulator  *plugins*  by passing a comma 
+-separated list of  *emulators*  as a value for the 
+-`gridmix.emulators.resource-usage.plugins` parameter. 
+-
+-List of  *emulators*  shipped with GridMix:
+-
+-* Cumulative CPU usage  *emulator* : 
+-  GridMix uses the cumulative CPU usage value published by Rumen 
+-  and makes sure that the total cumulative CPU usage of the simulated 
+-  task is close to the value published by Rumen. GridMix can be 
+-  configured to emulate cumulative CPU usage by adding 
+-  `org.apache.hadoop.mapred.gridmix.emulators.resourceusage
+-  .CumulativeCpuUsageEmulatorPlugin` to the list of emulator 
+-   *plugins*  configured for the 
+-  `gridmix.emulators.resource-usage.plugins` parameter.
+-  CPU usage emulator is designed in such a way that
+-  it only emulates at specific progress boundaries of the task. This 
+-  interval can be configured using 
+-  `gridmix.emulators.resource-usage.cpu.emulation-interval`.
+-  The default value for this parameter is `0.1` i.e 
+-  `10%`.
+-
+-* Total heap usage  *emulator* : 
+-  GridMix uses the total heap usage value published by Rumen 
+-  and makes sure that the total heap usage of the simulated 
+-  task is close to the value published by Rumen. GridMix can be 
+-  configured to emulate total heap usage by adding 
+-  `org.apache.hadoop.mapred.gridmix.emulators.resourceusage
+-  .TotalHeapUsageEmulatorPlugin` to the list of emulator 
+-   *plugins*  configured for the 
+-  `gridmix.emulators.resource-usage.plugins` parameter.
+-  Heap usage emulator is designed in such a way that
+-  it only emulates at specific progress boundaries of the task. This 
+-  interval can be configured using 
+-  `gridmix.emulators.resource-usage.heap.emulation-interval
+-  `. The default value for this parameter is `0.1` 
+-  i.e `10%` progress interval.
+-
+-Note that GridMix will emulate resource usages only for jobs of type *LOADJOB* .
+-
+-
+-Simplifying Assumptions
+------------------------
+-
+-GridMix will be developed in stages, incorporating feedback and
+-patches from the community. Currently its intent is to evaluate
+-MapReduce and HDFS performance and not the layers on top of them (i.e.
+-the extensive lib and sub-project space). Given these two limitations,
+-the following characteristics of job load are not currently captured in
+-job traces and cannot be accurately reproduced in GridMix:
+-
+-* *Filesystem Properties*  - No attempt is made to match block
+-  sizes, namespace hierarchies, or any property of input, intermediate
+-  or output data other than the bytes/records consumed and emitted from
+-  a given task. This implies that some of the most heavily-used parts of
+-  the system - text processing, streaming, etc. - cannot be meaningfully tested 
+-  with the current implementation.
+-  
+-* *I/O Rates*  - The rate at which records are
+-  consumed/emitted is assumed to be limited only by the speed of the
+-  reader/writer and constant throughout the task.
+-  
+-* *Memory Profile*  - No data on tasks' memory usage over time
+-  is available, though the max heap-size is retained.
+-  
+-* *Skew*  - The records consumed and emitted to/from a given
+-  task are assumed to follow observed averages, i.e. records will be
+-  more regular than may be seen in the wild. Each map also generates
+-  a proportional percentage of data for each reduce, so a job with
+-  unbalanced input will be flattened.
+-  
+-* *Job Failure*  - User code is assumed to be correct.
+-  
+-* *Job Independence*  - The output or outcome of one job does
+-  not affect when or whether a subsequent job will run.
+-
+-
+-Appendix
+---------
+-
+-There exist older versions of the GridMix tool.
+-Issues tracking the original implementations of
+-[GridMix1](https://issues.apache.org/jira/browse/HADOOP-2369),
+-[GridMix2](https://issues.apache.org/jira/browse/HADOOP-3770),
+-and [GridMix3](https://issues.apache.org/jira/browse/MAPREDUCE-776)
+-can be found on the Apache Hadoop MapReduce JIRA. Other issues tracking
+-the current development of GridMix can be found by searching
+-[the Apache Hadoop MapReduce JIRA](https://issues.apache.org/jira/browse/MAPREDUCE/component/12313086).
+diff --git a/hadoop-tools/hadoop-gridmix/src/site/resources/css/site.css b/hadoop-tools/hadoop-gridmix/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/CommonJobTest.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/CommonJobTest.java
+deleted file mode 100644
+index 73c03fd948a..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/CommonJobTest.java
++++ /dev/null
+@@ -1,385 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertTrue;
+-import static org.junit.Assert.fail;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.text.DecimalFormat;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.concurrent.BlockingQueue;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.LinkedBlockingQueue;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.ContentSummary;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.LocatedFileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.mapred.Counters;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobID;
+-import org.apache.hadoop.mapred.TaskReport;
+-import org.apache.hadoop.mapreduce.Counter;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.TaskCounter;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.tools.rumen.TaskInfo;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-public class CommonJobTest {
+-  public static final Logger LOG = LoggerFactory.getLogger(Gridmix.class);
+-
+-  protected static int NJOBS = 2;
+-  protected static final long GENDATA = 1; // in megabytes
+-  protected static GridmixJobSubmissionPolicy policy = GridmixJobSubmissionPolicy.REPLAY;
+-  private static File workspace = new File("target" + File.separator
+-          + TestGridmixSubmission.class.getName() + "-test");
+-
+-  static class DebugGridmix extends Gridmix {
+-
+-    private JobFactory<?> factory;
+-    private TestMonitor monitor;
+-
+-    @Override
+-    protected JobMonitor createJobMonitor(Statistics stats, Configuration conf)
+-            throws IOException {
+-      monitor = new TestMonitor(3, stats);
+-      return monitor;
+-    }
+-
+-    @Override
+-    protected JobFactory<?> createJobFactory(JobSubmitter submitter,
+-                                             String traceIn, Path scratchDir, Configuration conf,
+-                                             CountDownLatch startFlag, UserResolver userResolver) throws IOException {
+-      factory = DebugJobFactory.getFactory(submitter, scratchDir, NJOBS, conf,
+-              startFlag, userResolver);
+-      return factory;
+-    }
+-
+-    public void checkMonitor() throws Exception {
+-      monitor.verify(((DebugJobFactory.Debuggable) factory).getSubmitted());
+-    }
+-  }
+-
+-  static class TestMonitor extends JobMonitor {
+-    private final BlockingQueue<Job> retiredJobs;
+-    private final int expected;
+-    static final long SLOPBYTES = 1024;
+-
+-    public TestMonitor(int expected, Statistics stats) {
+-      super(3, TimeUnit.SECONDS, stats, 1);
+-      this.expected = expected;
+-      retiredJobs = new LinkedBlockingQueue<Job>();
+-    }
+-
+-    @Override
+-    protected void onSuccess(Job job) {
+-      LOG.info(" Job Success " + job);
+-      retiredJobs.add(job);
+-    }
+-
+-    @Override
+-    protected void onFailure(Job job) {
+-      fail("Job failure: " + job);
+-    }
+-
+-    public void verify(ArrayList<JobStory> submitted) throws Exception {
+-      assertEquals("Bad job count", expected, retiredJobs.size());
+-
+-      final ArrayList<Job> succeeded = new ArrayList<Job>();
+-      assertEquals("Bad job count", expected, retiredJobs.drainTo(succeeded));
+-      final HashMap<String, JobStory> sub = new HashMap<String, JobStory>();
+-      for (JobStory spec : submitted) {
+-        sub.put(spec.getJobID().toString(), spec);
+-      }
+-      for (Job job : succeeded) {
+-        final String jobName = job.getJobName();
+-        Configuration configuration = job.getConfiguration();
+-        if (GenerateData.JOB_NAME.equals(jobName)) {
+-          RemoteIterator<LocatedFileStatus> rit = GridmixTestUtils.dfs
+-                  .listFiles(new Path("/"), true);
+-          while (rit.hasNext()) {
+-            System.out.println(rit.next().toString());
+-          }
+-          final Path in = new Path("foo").makeQualified(
+-                  GridmixTestUtils.dfs.getUri(),
+-                  GridmixTestUtils.dfs.getWorkingDirectory());
+-          // data was compressed. All files = compressed test size+ logs= 1000000/2 + logs
+-          final ContentSummary generated = GridmixTestUtils.dfs
+-                  .getContentSummary(in);
+-          assertEquals(550000, generated.getLength(), 10000);
+-
+-          Counter counter = job.getCounters()
+-                  .getGroup("org.apache.hadoop.mapreduce.FileSystemCounter")
+-                  .findCounter("HDFS_BYTES_WRITTEN");
+-
+-          assertEquals(generated.getLength(), counter.getValue());
+-
+-          continue;
+-        } else if (GenerateDistCacheData.JOB_NAME.equals(jobName)) {
+-          continue;
+-        }
+-
+-        final String originalJobId = configuration.get(Gridmix.ORIGINAL_JOB_ID);
+-        final JobStory spec = sub.get(originalJobId);
+-        assertNotNull("No spec for " + jobName, spec);
+-        assertNotNull("No counters for " + jobName, job.getCounters());
+-        final String originalJobName = spec.getName();
+-        System.out.println("originalJobName=" + originalJobName
+-                + ";GridmixJobName=" + jobName + ";originalJobID=" + originalJobId);
+-        assertTrue("Original job name is wrong.",
+-                originalJobName.equals(configuration.get(Gridmix.ORIGINAL_JOB_NAME)));
+-
+-        // Gridmix job seqNum contains 6 digits
+-        int seqNumLength = 6;
+-        String jobSeqNum = new DecimalFormat("000000").format(configuration.getInt(
+-                GridmixJob.GRIDMIX_JOB_SEQ, -1));
+-        // Original job name is of the format MOCKJOB<6 digit sequence number>
+-        // because MockJob jobNames are of this format.
+-        assertTrue(originalJobName.substring(
+-                originalJobName.length() - seqNumLength).equals(jobSeqNum));
+-
+-        assertTrue("Gridmix job name is not in the expected format.",
+-                jobName.equals(GridmixJob.JOB_NAME_PREFIX + jobSeqNum));
+-        final FileStatus stat = GridmixTestUtils.dfs.getFileStatus(new Path(
+-                GridmixTestUtils.DEST, "" + Integer.parseInt(jobSeqNum)));
+-        assertEquals("Wrong owner for " + jobName, spec.getUser(),
+-                stat.getOwner());
+-        final int nMaps = spec.getNumberMaps();
+-        final int nReds = spec.getNumberReduces();
+-
+-        final JobClient client = new JobClient(
+-                GridmixTestUtils.mrvl.getConfig());
+-        final TaskReport[] mReports = client.getMapTaskReports(JobID
+-                .downgrade(job.getJobID()));
+-        assertEquals("Mismatched map count", nMaps, mReports.length);
+-        check(TaskType.MAP, spec, mReports, 0, 0, SLOPBYTES, nReds);
+-
+-        final TaskReport[] rReports = client.getReduceTaskReports(JobID
+-                .downgrade(job.getJobID()));
+-        assertEquals("Mismatched reduce count", nReds, rReports.length);
+-        check(TaskType.REDUCE, spec, rReports, nMaps * SLOPBYTES, 2 * nMaps, 0,
+-                0);
+-
+-      }
+-
+-    }
+-    // Verify if correct job queue is used
+-    private void check(final TaskType type, JobStory spec,
+-                       final TaskReport[] runTasks, long extraInputBytes,
+-                       int extraInputRecords, long extraOutputBytes, int extraOutputRecords)
+-            throws Exception {
+-
+-      long[] runInputRecords = new long[runTasks.length];
+-      long[] runInputBytes = new long[runTasks.length];
+-      long[] runOutputRecords = new long[runTasks.length];
+-      long[] runOutputBytes = new long[runTasks.length];
+-      long[] specInputRecords = new long[runTasks.length];
+-      long[] specInputBytes = new long[runTasks.length];
+-      long[] specOutputRecords = new long[runTasks.length];
+-      long[] specOutputBytes = new long[runTasks.length];
+-
+-      for (int i = 0; i < runTasks.length; ++i) {
+-        final TaskInfo specInfo;
+-        final Counters counters = runTasks[i].getCounters();
+-        switch (type) {
+-          case MAP:
+-            runInputBytes[i] = counters.findCounter("FileSystemCounters",
+-                    "HDFS_BYTES_READ").getValue()
+-                    - counters.findCounter(TaskCounter.SPLIT_RAW_BYTES).getValue();
+-            runInputRecords[i] = (int) counters.findCounter(
+-                    TaskCounter.MAP_INPUT_RECORDS).getValue();
+-            runOutputBytes[i] = counters
+-                    .findCounter(TaskCounter.MAP_OUTPUT_BYTES).getValue();
+-            runOutputRecords[i] = (int) counters.findCounter(
+-                    TaskCounter.MAP_OUTPUT_RECORDS).getValue();
+-
+-            specInfo = spec.getTaskInfo(TaskType.MAP, i);
+-            specInputRecords[i] = specInfo.getInputRecords();
+-            specInputBytes[i] = specInfo.getInputBytes();
+-            specOutputRecords[i] = specInfo.getOutputRecords();
+-            specOutputBytes[i] = specInfo.getOutputBytes();
+-
+-            LOG.info(String.format(type + " SPEC: %9d -> %9d :: %5d -> %5d\n",
+-                    specInputBytes[i], specOutputBytes[i], specInputRecords[i],
+-                    specOutputRecords[i]));
+-            LOG.info(String.format(type + " RUN:  %9d -> %9d :: %5d -> %5d\n",
+-                    runInputBytes[i], runOutputBytes[i], runInputRecords[i],
+-                    runOutputRecords[i]));
+-            break;
+-          case REDUCE:
+-            runInputBytes[i] = 0;
+-            runInputRecords[i] = (int) counters.findCounter(
+-                    TaskCounter.REDUCE_INPUT_RECORDS).getValue();
+-            runOutputBytes[i] = counters.findCounter("FileSystemCounters",
+-                    "HDFS_BYTES_WRITTEN").getValue();
+-            runOutputRecords[i] = (int) counters.findCounter(
+-                    TaskCounter.REDUCE_OUTPUT_RECORDS).getValue();
+-
+-            specInfo = spec.getTaskInfo(TaskType.REDUCE, i);
+-            // There is no reliable counter for reduce input bytes. The
+-            // variable-length encoding of intermediate records and other noise
+-            // make this quantity difficult to estimate. The shuffle and spec
+-            // input bytes are included in debug output for reference, but are
+-            // not checked
+-            specInputBytes[i] = 0;
+-            specInputRecords[i] = specInfo.getInputRecords();
+-            specOutputRecords[i] = specInfo.getOutputRecords();
+-            specOutputBytes[i] = specInfo.getOutputBytes();
+-            LOG.info(String.format(type + " SPEC: (%9d) -> %9d :: %5d -> %5d\n",
+-                    specInfo.getInputBytes(), specOutputBytes[i],
+-                    specInputRecords[i], specOutputRecords[i]));
+-            LOG.info(String
+-                    .format(type + " RUN:  (%9d) -> %9d :: %5d -> %5d\n", counters
+-                            .findCounter(TaskCounter.REDUCE_SHUFFLE_BYTES).getValue(),
+-                            runOutputBytes[i], runInputRecords[i], runOutputRecords[i]));
+-            break;
+-          default:
+-            fail("Unexpected type: " + type);
+-        }
+-      }
+-
+-      // Check input bytes
+-      Arrays.sort(specInputBytes);
+-      Arrays.sort(runInputBytes);
+-      for (int i = 0; i < runTasks.length; ++i) {
+-        assertTrue("Mismatched " + type + " input bytes " + specInputBytes[i]
+-                + "/" + runInputBytes[i],
+-                eqPlusMinus(runInputBytes[i], specInputBytes[i], extraInputBytes));
+-      }
+-
+-      // Check input records
+-      Arrays.sort(specInputRecords);
+-      Arrays.sort(runInputRecords);
+-      for (int i = 0; i < runTasks.length; ++i) {
+-        assertTrue(
+-                "Mismatched " + type + " input records " + specInputRecords[i]
+-                        + "/" + runInputRecords[i],
+-                eqPlusMinus(runInputRecords[i], specInputRecords[i],
+-                        extraInputRecords));
+-      }
+-
+-      // Check output bytes
+-      Arrays.sort(specOutputBytes);
+-      Arrays.sort(runOutputBytes);
+-      for (int i = 0; i < runTasks.length; ++i) {
+-        assertTrue(
+-                "Mismatched " + type + " output bytes " + specOutputBytes[i] + "/"
+-                        + runOutputBytes[i],
+-                eqPlusMinus(runOutputBytes[i], specOutputBytes[i], extraOutputBytes));
+-      }
+-
+-      // Check output records
+-      Arrays.sort(specOutputRecords);
+-      Arrays.sort(runOutputRecords);
+-      for (int i = 0; i < runTasks.length; ++i) {
+-        assertTrue(
+-                "Mismatched " + type + " output records " + specOutputRecords[i]
+-                        + "/" + runOutputRecords[i],
+-                eqPlusMinus(runOutputRecords[i], specOutputRecords[i],
+-                        extraOutputRecords));
+-      }
+-
+-    }
+-
+-    private static boolean eqPlusMinus(long a, long b, long x) {
+-      final long diff = Math.abs(a - b);
+-      return diff <= x;
+-    }
+-
+-  }
+-
+-  protected void doSubmission(String jobCreatorName, boolean defaultOutputPath)
+-          throws Exception {
+-    final Path in = new Path("foo").makeQualified(
+-            GridmixTestUtils.dfs.getUri(),
+-            GridmixTestUtils.dfs.getWorkingDirectory());
+-    final Path out = GridmixTestUtils.DEST.makeQualified(
+-            GridmixTestUtils.dfs.getUri(),
+-            GridmixTestUtils.dfs.getWorkingDirectory());
+-    final Path root = new Path(workspace.getName()).makeQualified(
+-        GridmixTestUtils.dfs.getUri(), GridmixTestUtils.dfs.getWorkingDirectory());
+-    if (!workspace.exists()) {
+-      assertTrue(workspace.mkdirs());
+-    }
+-    Configuration conf = null;
+-
+-    try {
+-      ArrayList<String> argsList = new ArrayList<String>();
+-
+-      argsList.add("-D" + FilePool.GRIDMIX_MIN_FILE + "=0");
+-      argsList.add("-D" + Gridmix.GRIDMIX_USR_RSV + "="
+-              + EchoUserResolver.class.getName());
+-      if (jobCreatorName != null) {
+-        argsList.add("-D" + JobCreator.GRIDMIX_JOB_TYPE + "=" + jobCreatorName);
+-      }
+-
+-      // Set the config property gridmix.output.directory only if
+-      // defaultOutputPath is false. If defaultOutputPath is true, then
+-      // let us allow gridmix to use the path foo/gridmix/ as output dir.
+-      if (!defaultOutputPath) {
+-        argsList.add("-D" + Gridmix.GRIDMIX_OUT_DIR + "=" + out);
+-      }
+-      argsList.add("-generate");
+-      argsList.add(String.valueOf(GENDATA) + "m");
+-      argsList.add(in.toString());
+-      argsList.add("-"); // ignored by DebugGridmix
+-
+-      String[] argv = argsList.toArray(new String[argsList.size()]);
+-
+-      DebugGridmix client = new DebugGridmix();
+-      conf = GridmixTestUtils.mrvl.getConfig();
+-
+-      CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-      conf.setEnum(GridmixJobSubmissionPolicy.JOB_SUBMISSION_POLICY, policy);
+-
+-      conf.setBoolean(GridmixJob.GRIDMIX_USE_QUEUE_IN_TRACE, true);
+-      UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-      conf.set(MRJobConfig.USER_NAME, ugi.getUserName());
+-
+-      // allow synthetic users to create home directories
+-      GridmixTestUtils.dfs.mkdirs(root, new FsPermission((short) 777));
+-      GridmixTestUtils.dfs.setPermission(root, new FsPermission((short) 777));
+-
+-      int res = ToolRunner.run(conf, client, argv);
+-      assertEquals("Client exited with nonzero status", 0, res);
+-      client.checkMonitor();
+-    } catch (Exception e) {
+-      e.printStackTrace();
+-    } finally {
+-      in.getFileSystem(conf).delete(in, true);
+-      out.getFileSystem(conf).delete(out, true);
+-      root.getFileSystem(conf).delete(root, true);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
+deleted file mode 100644
+index 99b4571b7e0..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java
++++ /dev/null
+@@ -1,106 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.concurrent.CountDownLatch;
+-
+-
+-/**
+- * Component generating random job traces for testing on a single node.
+- */
+-public class DebugJobFactory {
+-
+-  interface Debuggable {
+-    ArrayList<JobStory> getSubmitted();
+-  }
+-
+-  public static JobFactory<?> getFactory(
+-    JobSubmitter submitter, Path scratch, int numJobs, Configuration conf,
+-    CountDownLatch startFlag, UserResolver resolver) throws IOException {
+-    GridmixJobSubmissionPolicy policy = GridmixJobSubmissionPolicy.getPolicy(
+-      conf, GridmixJobSubmissionPolicy.STRESS);
+-    if (policy == GridmixJobSubmissionPolicy.REPLAY) {
+-      return new DebugReplayJobFactory(
+-        submitter, scratch, numJobs, conf, startFlag, resolver);
+-    } else if (policy == GridmixJobSubmissionPolicy.STRESS) {
+-      return new DebugStressJobFactory(
+-        submitter, scratch, numJobs, conf, startFlag, resolver);
+-    } else if (policy == GridmixJobSubmissionPolicy.SERIAL) {
+-      return new DebugSerialJobFactory(
+-        submitter, scratch, numJobs, conf, startFlag, resolver);
+-
+-    }
+-    return null;
+-  }
+-
+-  static class DebugReplayJobFactory extends ReplayJobFactory
+-    implements Debuggable {
+-    public DebugReplayJobFactory(
+-      JobSubmitter submitter, Path scratch, int numJobs, Configuration conf,
+-      CountDownLatch startFlag, UserResolver resolver) throws IOException {
+-      super(
+-        submitter, new DebugJobProducer(numJobs, conf), scratch, conf,
+-        startFlag, resolver);
+-    }
+-
+-    @Override
+-    public ArrayList<JobStory> getSubmitted() {
+-      return ((DebugJobProducer) jobProducer).submitted;
+-    }
+-
+-  }
+-
+-  static class DebugSerialJobFactory extends SerialJobFactory
+-    implements Debuggable {
+-    public DebugSerialJobFactory(
+-      JobSubmitter submitter, Path scratch, int numJobs, Configuration conf,
+-      CountDownLatch startFlag, UserResolver resolver) throws IOException {
+-      super(
+-        submitter, new DebugJobProducer(numJobs, conf), scratch, conf,
+-        startFlag, resolver);
+-    }
+-
+-    @Override
+-    public ArrayList<JobStory> getSubmitted() {
+-      return ((DebugJobProducer) jobProducer).submitted;
+-    }
+-  }
+-
+-  static class DebugStressJobFactory extends StressJobFactory
+-    implements Debuggable {
+-    public DebugStressJobFactory(
+-      JobSubmitter submitter, Path scratch, int numJobs, Configuration conf,
+-      CountDownLatch startFlag, UserResolver resolver) throws IOException {
+-      super(
+-        submitter, new DebugJobProducer(numJobs, conf), scratch, conf,
+-        startFlag, resolver);
+-    }
+-
+-    @Override
+-    public ArrayList<JobStory> getSubmitted() {
+-      return ((DebugJobProducer) jobProducer).submitted;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
+deleted file mode 100644
+index 8c109fff254..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java
++++ /dev/null
+@@ -1,311 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.MapTaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.ReduceTaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.TaskInfo;
+-import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-
+-import java.util.ArrayList;
+-import java.util.Random;
+-import java.util.Arrays;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.concurrent.atomic.AtomicLong;
+-import java.util.concurrent.TimeUnit;
+-import java.io.IOException;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-public class DebugJobProducer implements JobStoryProducer {
+-  public static final Logger LOG = LoggerFactory.getLogger(DebugJobProducer.class);
+-  final ArrayList<JobStory> submitted;
+-  private final Configuration conf;
+-  private final AtomicInteger numJobs;
+-
+-  public DebugJobProducer(int numJobs, Configuration conf) {
+-    super();
+-    MockJob.reset();
+-    this.conf = conf;
+-    this.numJobs = new AtomicInteger(numJobs);
+-    this.submitted = new ArrayList<JobStory>();
+-  }
+-
+-  @Override
+-  public JobStory getNextJob() throws IOException {
+-    if (numJobs.getAndDecrement() > 0) {
+-      final MockJob ret = new MockJob(conf);
+-      submitted.add(ret);
+-      return ret;
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public void close() {
+-  }
+-
+-
+-  static double[] getDistr(Random r, double mindist, int size) {
+-    assert 0.0 <= mindist && mindist <= 1.0;
+-    final double min = mindist / size;
+-    final double rem = 1.0 - min * size;
+-    final double[] tmp = new double[size];
+-    for (int i = 0; i < tmp.length - 1; ++i) {
+-      tmp[i] = r.nextDouble() * rem;
+-    }
+-    tmp[tmp.length - 1] = rem;
+-    Arrays.sort(tmp);
+-
+-    final double[] ret = new double[size];
+-    ret[0] = tmp[0] + min;
+-    for (int i = 1; i < size; ++i) {
+-      ret[i] = tmp[i] - tmp[i - 1] + min;
+-    }
+-    return ret;
+-  }
+-
+-
+-  /**
+-   * Generate random task data for a synthetic job.
+-   */
+-  static class MockJob implements JobStory {
+-
+-    static final int MIN_REC = 1 << 14;
+-    static final int MIN_BYTES = 1 << 20;
+-    static final int VAR_REC = 1 << 14;
+-    static final int VAR_BYTES = 4 << 20;
+-    static final int MAX_MAP = 5;
+-    static final int MAX_RED = 3;
+-    final Configuration conf;
+-
+-    static void initDist(
+-      Random r, double min, int[] recs, long[] bytes, long tot_recs,
+-      long tot_bytes) {
+-      final double[] recs_dist = getDistr(r, min, recs.length);
+-      final double[] bytes_dist = getDistr(r, min, recs.length);
+-      long totalbytes = 0L;
+-      int totalrecs = 0;
+-      for (int i = 0; i < recs.length; ++i) {
+-        recs[i] = (int) Math.round(tot_recs * recs_dist[i]);
+-        bytes[i] = Math.round(tot_bytes * bytes_dist[i]);
+-        totalrecs += recs[i];
+-        totalbytes += bytes[i];
+-      }
+-      // Add/remove excess
+-      recs[0] += totalrecs - tot_recs;
+-      bytes[0] += totalbytes - tot_bytes;
+-      LOG.info(
+-        "DIST: " + Arrays.toString(recs) + " " + tot_recs + "/" + totalrecs +
+-          " " + Arrays.toString(bytes) + " " + tot_bytes + "/" + totalbytes);
+-    }
+-
+-    private static final AtomicInteger seq = new AtomicInteger(0);
+-    // set timestamp in the past
+-    private static final AtomicLong timestamp = new AtomicLong(
+-      System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(
+-        60, TimeUnit.DAYS));
+-
+-    private final int id;
+-    private final String name;
+-    private final int[] m_recsIn, m_recsOut, r_recsIn, r_recsOut;
+-    private final long[] m_bytesIn, m_bytesOut, r_bytesIn, r_bytesOut;
+-    private final long submitTime;
+-
+-    public MockJob(Configuration conf) {
+-      final Random r = new Random();
+-      final long seed = r.nextLong();
+-      r.setSeed(seed);
+-      id = seq.getAndIncrement();
+-      name = String.format("MOCKJOB%06d", id);
+-
+-      this.conf = conf;
+-      LOG.info(name + " (" + seed + ")");
+-      submitTime = timestamp.addAndGet(
+-        TimeUnit.MILLISECONDS.convert(
+-          r.nextInt(10), TimeUnit.SECONDS));
+-
+-      m_recsIn = new int[r.nextInt(MAX_MAP) + 1];
+-      m_bytesIn = new long[m_recsIn.length];
+-      m_recsOut = new int[m_recsIn.length];
+-      m_bytesOut = new long[m_recsIn.length];
+-
+-      r_recsIn = new int[r.nextInt(MAX_RED) + 1];
+-      r_bytesIn = new long[r_recsIn.length];
+-      r_recsOut = new int[r_recsIn.length];
+-      r_bytesOut = new long[r_recsIn.length];
+-
+-      // map input
+-      final long map_recs = r.nextInt(VAR_REC) + MIN_REC;
+-      final long map_bytes = r.nextInt(VAR_BYTES) + MIN_BYTES;
+-      initDist(r, 0.5, m_recsIn, m_bytesIn, map_recs, map_bytes);
+-
+-      // shuffle
+-      final long shuffle_recs = r.nextInt(VAR_REC) + MIN_REC;
+-      final long shuffle_bytes = r.nextInt(VAR_BYTES) + MIN_BYTES;
+-      initDist(r, 0.5, m_recsOut, m_bytesOut, shuffle_recs, shuffle_bytes);
+-      initDist(r, 0.8, r_recsIn, r_bytesIn, shuffle_recs, shuffle_bytes);
+-
+-      // reduce output
+-      final long red_recs = r.nextInt(VAR_REC) + MIN_REC;
+-      final long red_bytes = r.nextInt(VAR_BYTES) + MIN_BYTES;
+-      initDist(r, 0.5, r_recsOut, r_bytesOut, red_recs, red_bytes);
+-
+-      if (LOG.isDebugEnabled()) {
+-        int iMapBTotal = 0, oMapBTotal = 0, iRedBTotal = 0, oRedBTotal = 0;
+-        int iMapRTotal = 0, oMapRTotal = 0, iRedRTotal = 0, oRedRTotal = 0;
+-        for (int i = 0; i < m_recsIn.length; ++i) {
+-          iMapRTotal += m_recsIn[i];
+-          iMapBTotal += m_bytesIn[i];
+-          oMapRTotal += m_recsOut[i];
+-          oMapBTotal += m_bytesOut[i];
+-        }
+-        for (int i = 0; i < r_recsIn.length; ++i) {
+-          iRedRTotal += r_recsIn[i];
+-          iRedBTotal += r_bytesIn[i];
+-          oRedRTotal += r_recsOut[i];
+-          oRedBTotal += r_bytesOut[i];
+-        }
+-        LOG.debug(
+-          String.format(
+-            "%s: M (%03d) %6d/%10d -> %6d/%10d" +
+-              " R (%03d) %6d/%10d -> %6d/%10d @%d", name, m_bytesIn.length,
+-            iMapRTotal, iMapBTotal, oMapRTotal, oMapBTotal, r_bytesIn.length,
+-            iRedRTotal, iRedBTotal, oRedRTotal, oRedBTotal, submitTime));
+-      }
+-    }
+-    @Override
+-   public String getName() {
+-     return name;
+-    }
+-
+-   @Override
+-   public String getUser() {
+-     // Obtain user name from job configuration, if available.
+-     // Otherwise use dummy user names.
+-     String user = conf.get(MRJobConfig.USER_NAME);
+-     if (user == null) {
+-       user = String.format("foobar%d", id);
+-     }
+-     GridmixTestUtils.createHomeAndStagingDirectory(user, conf);
+-     return user;
+-   }
+-
+-   @Override
+-   public JobID getJobID() {
+-     return new JobID("job_mock_" + name, id);
+-    }
+-
+-    @Override
+-   public Values getOutcome() {
+-     return Values.SUCCESS;
+-    }
+-
+-   @Override
+-   public long getSubmissionTime() {
+-     return submitTime;
+-   }
+-
+-   @Override
+-   public int getNumberMaps() {
+-     return m_bytesIn.length;
+-   }
+-
+-   @Override
+-   public int getNumberReduces() {
+-     return r_bytesIn.length;
+-   }
+-    
+-    @Override
+-    public TaskInfo getTaskInfo(TaskType taskType, int taskNumber) {
+-      switch (taskType) {
+-        case MAP:
+-          return new TaskInfo(m_bytesIn[taskNumber], m_recsIn[taskNumber],
+-              m_bytesOut[taskNumber], m_recsOut[taskNumber], -1);
+-        case REDUCE:
+-          return new TaskInfo(r_bytesIn[taskNumber], r_recsIn[taskNumber],
+-              r_bytesOut[taskNumber], r_recsOut[taskNumber], -1);
+-        default:
+-          throw new IllegalArgumentException("Not interested");
+-      }
+-    }
+-
+-    @Override
+-    public InputSplit[] getInputSplits() {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public TaskAttemptInfo getTaskAttemptInfo(
+-      TaskType taskType, int taskNumber, int taskAttemptNumber) {
+-      switch (taskType) {
+-        case MAP:
+-          return new MapTaskAttemptInfo(
+-            State.SUCCEEDED, 
+-            new TaskInfo(
+-              m_bytesIn[taskNumber], m_recsIn[taskNumber],
+-              m_bytesOut[taskNumber], m_recsOut[taskNumber], -1),
+-            100);
+-
+-        case REDUCE:
+-          return new ReduceTaskAttemptInfo(
+-            State.SUCCEEDED, 
+-            new TaskInfo(
+-              r_bytesIn[taskNumber], r_recsIn[taskNumber],
+-              r_bytesOut[taskNumber], r_recsOut[taskNumber], -1),
+-            100, 100, 100);
+-      }
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public TaskAttemptInfo getMapTaskAttemptInfoAdjusted(
+-      int taskNumber, int taskAttemptNumber, int locality) {
+-      throw new UnsupportedOperationException();
+-    }
+-
+-    @Override
+-    public org.apache.hadoop.mapred.JobConf getJobConf() {
+-      return new JobConf(conf);
+-    }
+-
+-    @Override
+-    public String getQueueName() {
+-      String qName = "default";
+-      return qName;
+-    }
+-    
+-    public static void reset() {
+-      seq.set(0);
+-      timestamp.set(System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(
+-        60, TimeUnit.DAYS));
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java
+deleted file mode 100644
+index 528202fd7f4..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java
++++ /dev/null
+@@ -1,154 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * Plugin class to test resource information reported by NM. Use configuration
+- * items {@link #MAXVMEM_TESTING_PROPERTY} and {@link #MAXPMEM_TESTING_PROPERTY}
+- * to tell NM the total vmem and the total pmem. Use configuration items
+- * {@link #NUM_PROCESSORS}, {@link #CPU_FREQUENCY}, {@link #CUMULATIVE_CPU_TIME}
+- * and {@link #CPU_USAGE} to tell TT the CPU information.
+- */
+-@InterfaceAudience.Private
+-public class DummyResourceCalculatorPlugin extends ResourceCalculatorPlugin {
+-
+-  DummyResourceCalculatorPlugin() {
+-    super(null);
+-  }
+-
+-  /** max vmem on the TT */
+-  public static final String MAXVMEM_TESTING_PROPERTY =
+-      "mapred.tasktracker.maxvmem.testing";
+-  /** max pmem on the TT */
+-  public static final String MAXPMEM_TESTING_PROPERTY =
+-      "mapred.tasktracker.maxpmem.testing";
+-  /** number of processors for testing */
+-  public static final String NUM_PROCESSORS =
+-      "mapred.tasktracker.numprocessors.testing";
+-  /** CPU frequency for testing */
+-  public static final String CPU_FREQUENCY =
+-      "mapred.tasktracker.cpufrequency.testing";
+-  /** cumulative CPU usage time for testing */
+-  public static final String CUMULATIVE_CPU_TIME =
+-      "mapred.tasktracker.cumulativecputime.testing";
+-  /** CPU usage percentage for testing */
+-  public static final String CPU_USAGE = "mapred.tasktracker.cpuusage.testing";
+-  /** cumulative number of bytes read over the network */
+-  public static final String NETWORK_BYTES_READ =
+-      "mapred.tasktracker.networkread.testing";
+-  /** cumulative number of bytes written over the network */
+-  public static final String NETWORK_BYTES_WRITTEN =
+-      "mapred.tasktracker.networkwritten.testing";
+-  /** cumulative number of bytes read from disks */
+-  public static final String STORAGE_BYTES_READ =
+-      "mapred.tasktracker.storageread.testing";
+-  /** cumulative number of bytes written to disks */
+-  public static final String STORAGE_BYTES_WRITTEN =
+-      "mapred.tasktracker.storagewritten.testing";
+-  /** process cumulative CPU usage time for testing */
+-  public static final String PROC_CUMULATIVE_CPU_TIME =
+-      "mapred.tasktracker.proccumulativecputime.testing";
+-  /** process pmem for testing */
+-  public static final String PROC_PMEM_TESTING_PROPERTY =
+-      "mapred.tasktracker.procpmem.testing";
+-  /** process vmem for testing */
+-  public static final String PROC_VMEM_TESTING_PROPERTY =
+-      "mapred.tasktracker.procvmem.testing";
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getVirtualMemorySize() {
+-    return getConf().getLong(MAXVMEM_TESTING_PROPERTY, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getPhysicalMemorySize() {
+-    return getConf().getLong(MAXPMEM_TESTING_PROPERTY, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getAvailableVirtualMemorySize() {
+-    return getConf().getLong(MAXVMEM_TESTING_PROPERTY, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getAvailablePhysicalMemorySize() {
+-    return getConf().getLong(MAXPMEM_TESTING_PROPERTY, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public int getNumProcessors() {
+-    return getConf().getInt(NUM_PROCESSORS, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public int getNumCores() {
+-    return getNumProcessors();
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getCpuFrequency() {
+-    return getConf().getLong(CPU_FREQUENCY, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getCumulativeCpuTime() {
+-    return getConf().getLong(CUMULATIVE_CPU_TIME, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public float getCpuUsagePercentage() {
+-    return getConf().getFloat(CPU_USAGE, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getNetworkBytesRead() {
+-    return getConf().getLong(NETWORK_BYTES_READ, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getNetworkBytesWritten() {
+-    return getConf().getLong(NETWORK_BYTES_WRITTEN, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getStorageBytesRead() {
+-    return getConf().getLong(STORAGE_BYTES_READ, -1);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public long getStorageBytesWritten() {
+-    return getConf().getLong(STORAGE_BYTES_WRITTEN, -1);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
+deleted file mode 100644
+index b3dbd545710..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java
++++ /dev/null
+@@ -1,120 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements. See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership. The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.mapred.MiniMRClientCluster;
+-import org.apache.hadoop.mapred.MiniMRClientClusterFactory;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.apache.hadoop.conf.Configuration;
+-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
+-
+-import java.io.IOException;
+-
+-/**
+- * This is a test class.
+- */
+-public class GridmixTestUtils {
+-  private static final Logger LOG = LoggerFactory.getLogger(GridmixTestUtils.class);
+-  static final Path DEST = new Path("/gridmix");
+-  static FileSystem dfs = null;
+-  static MiniDFSCluster dfsCluster = null;
+-  static MiniMRClientCluster mrvl = null;
+-  protected static final String GRIDMIX_USE_QUEUE_IN_TRACE = 
+-      "gridmix.job-submission.use-queue-in-trace";
+-  protected static final String GRIDMIX_DEFAULT_QUEUE = 
+-      "gridmix.job-submission.default-queue";
+-
+-  public static void initCluster(Class<?> caller) throws IOException {
+-    Configuration conf = new Configuration();
+-//    conf.set("mapred.queue.names", "default,q1,q2");
+-  conf.set("mapred.queue.names", "default");
+-    conf.set(PREFIX + "root.queues", "default");
+-    conf.set(PREFIX + "root.default.capacity", "100.0");
+-    
+-    
+-    conf.setBoolean(GRIDMIX_USE_QUEUE_IN_TRACE, false);
+-    conf.set(GRIDMIX_DEFAULT_QUEUE, "default");
+-    
+-
+-    dfsCluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).format(true)
+-        .build();// MiniDFSCluster(conf, 3, true, null);
+-    dfs = dfsCluster.getFileSystem();
+-    conf.set(JTConfig.JT_RETIREJOBS, "false");
+-    mrvl = MiniMRClientClusterFactory.create(caller, 2, conf);
+-    
+-    conf = mrvl.getConfig();
+-    String[] files = conf.getStrings(MRJobConfig.CACHE_FILES);
+-    if (files != null) {
+-      String[] timestamps = new String[files.length];
+-      for (int i = 0; i < files.length; i++) {
+-        timestamps[i] = Long.toString(System.currentTimeMillis());
+-      }
+-      conf.setStrings(MRJobConfig.CACHE_FILE_TIMESTAMPS, timestamps);
+-    }
+-    
+-  }
+-
+-  public static void shutdownCluster() throws IOException {
+-    if (mrvl != null) {
+-      mrvl.stop();
+-    }
+-    if (dfsCluster != null) {
+-      dfsCluster.shutdown();
+-    }
+-  }
+-
+-  /**
+-   * Methods to generate the home directory for dummy users.
+-   * 
+-   * @param conf
+-   */
+-  public static void createHomeAndStagingDirectory(String user,
+-      Configuration conf) {
+-    try {
+-      FileSystem fs = dfsCluster.getFileSystem();
+-      String path = "/user/" + user;
+-      Path homeDirectory = new Path(path);
+-      if (!fs.exists(homeDirectory)) {
+-        LOG.info("Creating Home directory : " + homeDirectory);
+-        fs.mkdirs(homeDirectory);
+-        changePermission(user, homeDirectory, fs);
+-
+-      }    
+-      changePermission(user, homeDirectory, fs);
+-      Path stagingArea = new Path(
+-          conf.get("mapreduce.jobtracker.staging.root.dir",
+-              "/tmp/hadoop/mapred/staging"));
+-      LOG.info("Creating Staging root directory : " + stagingArea);
+-      fs.mkdirs(stagingArea);
+-      fs.setPermission(stagingArea, new FsPermission((short) 0777));
+-    } catch (IOException ioe) {
+-      ioe.printStackTrace();
+-    }
+-  }
+-
+-  static void changePermission(String user, Path homeDirectory, FileSystem fs)
+-      throws IOException {
+-    fs.setOwner(homeDirectory, user, "");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java
+deleted file mode 100644
+index 152a8ee8c13..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestCompressionEmulationUtils.java
++++ /dev/null
+@@ -1,586 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.BufferedReader;
+-import java.io.BufferedWriter;
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.OutputStream;
+-import java.io.OutputStreamWriter;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.GzipCodec;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Utils;
+-import org.apache.hadoop.mapred.gridmix.CompressionEmulationUtil.RandomTextDataMapper;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.GenSplit;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-
+-import static org.junit.Assert.*;
+-import org.junit.Test;
+-
+-/**
+- * Test {@link CompressionEmulationUtil}
+- */
+-public class TestCompressionEmulationUtils {
+-  //TODO Remove this once LocalJobRunner can run Gridmix.
+-  static class CustomInputFormat extends GenerateData.GenDataFormat {
+-    @Override
+-    public List<InputSplit> getSplits(JobContext jobCtxt) throws IOException {
+-      // get the total data to be generated
+-      long toGen =
+-        jobCtxt.getConfiguration().getLong(GenerateData.GRIDMIX_GEN_BYTES, -1);
+-      if (toGen < 0) {
+-        throw new IOException("Invalid/missing generation bytes: " + toGen);
+-      }
+-      // get the total number of mappers configured
+-      int totalMappersConfigured =
+-        jobCtxt.getConfiguration().getInt(MRJobConfig.NUM_MAPS, -1);
+-      if (totalMappersConfigured < 0) {
+-        throw new IOException("Invalid/missing num mappers: " 
+-                              + totalMappersConfigured);
+-      }
+-      
+-      final long bytesPerTracker = toGen / totalMappersConfigured;
+-      final ArrayList<InputSplit> splits = 
+-        new ArrayList<InputSplit>(totalMappersConfigured);
+-      for (int i = 0; i < totalMappersConfigured; ++i) {
+-        splits.add(new GenSplit(bytesPerTracker, 
+-                   new String[] { "tracker_local" }));
+-      }
+-      return splits;
+-    }
+-  }
+-  
+-  /**
+-   * Test {@link RandomTextDataMapper} via {@link CompressionEmulationUtil}.
+-   */
+-  @Test
+-  public void testRandomCompressedTextDataGenerator() throws Exception {
+-    int wordSize = 10;
+-    int listSize = 20;
+-    long dataSize = 10*1024*1024;
+-    
+-    Configuration conf = new Configuration();
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    
+-    // configure the RandomTextDataGenerator to generate desired sized data
+-    conf.setInt(RandomTextDataGenerator.GRIDMIX_DATAGEN_RANDOMTEXT_LISTSIZE, 
+-                listSize);
+-    conf.setInt(RandomTextDataGenerator.GRIDMIX_DATAGEN_RANDOMTEXT_WORDSIZE, 
+-                wordSize);
+-    conf.setLong(GenerateData.GRIDMIX_GEN_BYTES, dataSize);
+-    conf.set("mapreduce.job.hdfs-servers", "");
+-    
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    
+-    // define the test's root temp directory
+-    Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp")).makeQualified(
+-            lfs.getUri(), lfs.getWorkingDirectory());
+-
+-    Path tempDir = new Path(rootTempDir, "TestRandomCompressedTextDataGenr");
+-    lfs.delete(tempDir, true);
+-    
+-    runDataGenJob(conf, tempDir);
+-    
+-    // validate the output data
+-    FileStatus[] files = 
+-      lfs.listStatus(tempDir, new Utils.OutputFileUtils.OutputFilesFilter());
+-    long size = 0;
+-    long maxLineSize = 0;
+-    
+-    for (FileStatus status : files) {
+-      InputStream in = 
+-        CompressionEmulationUtil
+-          .getPossiblyDecompressedInputStream(status.getPath(), conf, 0);
+-      BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+-      String line = reader.readLine();
+-      if (line != null) {
+-        long lineSize = line.getBytes().length;
+-        if (lineSize > maxLineSize) {
+-          maxLineSize = lineSize;
+-        }
+-        while (line != null) {
+-          for (String word : line.split("\\s")) {
+-            size += word.getBytes().length;
+-          }
+-          line = reader.readLine();
+-        }
+-      }
+-      reader.close();
+-    }
+-
+-    assertTrue(size >= dataSize);
+-    assertTrue(size <= dataSize + maxLineSize);
+-  }
+-  
+-  /**
+-   * Runs a GridMix data-generation job.
+-   */
+-  private static void runDataGenJob(Configuration conf, Path tempDir) 
+-  throws IOException, ClassNotFoundException, InterruptedException {
+-    JobClient client = new JobClient(conf);
+-    
+-    // get the local job runner
+-    conf.setInt(MRJobConfig.NUM_MAPS, 1);
+-    
+-    Job job = Job.getInstance(conf);
+-    
+-    CompressionEmulationUtil.configure(job);
+-    job.setInputFormatClass(CustomInputFormat.class);
+-    
+-    // set the output path
+-    FileOutputFormat.setOutputPath(job, tempDir);
+-    
+-    // submit and wait for completion
+-    job.submit();
+-    int ret = job.waitForCompletion(true) ? 0 : 1;
+-
+-    assertEquals("Job Failed", 0, ret);
+-  }
+-  
+-  /**
+-   * Test if {@link RandomTextDataGenerator} can generate random text data 
+-   * with the desired compression ratio. This involves
+-   *   - using {@link CompressionEmulationUtil} to configure the MR job for 
+-   *     generating the random text data with the desired compression ratio
+-   *   - running the MR job
+-   *   - test {@link RandomTextDataGenerator}'s output and match the output size
+-   *     (compressed) with the expected compression ratio.
+-   */
+-  private void testCompressionRatioConfigure(float ratio)
+-  throws Exception {
+-    long dataSize = 10*1024*1024;
+-    
+-    Configuration conf = new Configuration();
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    
+-    conf.setLong(GenerateData.GRIDMIX_GEN_BYTES, dataSize);
+-    conf.set("mapreduce.job.hdfs-servers", "");
+-    
+-    float expectedRatio = CompressionEmulationUtil.DEFAULT_COMPRESSION_RATIO;
+-    if (ratio > 0) {
+-      // set the compression ratio in the conf
+-      CompressionEmulationUtil.setMapInputCompressionEmulationRatio(conf, ratio);
+-      expectedRatio = 
+-        CompressionEmulationUtil.standardizeCompressionRatio(ratio);
+-    }
+-    
+-    // invoke the utility to map from ratio to word-size
+-    CompressionEmulationUtil.setupDataGeneratorConfig(conf);
+-    
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    
+-    // define the test's root temp directory
+-    Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp")).makeQualified(
+-            lfs.getUri(), lfs.getWorkingDirectory());
+-
+-    Path tempDir = 
+-      new Path(rootTempDir, "TestCustomRandomCompressedTextDataGenr");
+-    lfs.delete(tempDir, true);
+-    
+-    runDataGenJob(conf, tempDir);
+-    
+-    // validate the output data
+-    FileStatus[] files = 
+-      lfs.listStatus(tempDir, new Utils.OutputFileUtils.OutputFilesFilter());
+-    long size = 0;
+-    
+-    for (FileStatus status : files) {
+-      size += status.getLen();
+-    }
+-
+-    float compressionRatio = ((float)size)/dataSize;
+-    float stdRatio = 
+-      CompressionEmulationUtil.standardizeCompressionRatio(compressionRatio);
+-    
+-    assertEquals(expectedRatio, stdRatio, 0.0D);
+-  }
+-  
+-  /**
+-   * Test compression ratio with multiple compression ratios.
+-   */
+-  @Test
+-  public void testCompressionRatios() throws Exception {
+-    // test default compression ratio i.e 0.5
+-    testCompressionRatioConfigure(0F);
+-    // test for a sample compression ratio of 0.2
+-    testCompressionRatioConfigure(0.2F);
+-    // test for a sample compression ratio of 0.4
+-    testCompressionRatioConfigure(0.4F);
+-    // test for a sample compression ratio of 0.65
+-    testCompressionRatioConfigure(0.65F);
+-    // test for a compression ratio of 0.682 which should be standardized
+-    // to round(0.682) i.e 0.68
+-    testCompressionRatioConfigure(0.682F);
+-    // test for a compression ratio of 0.567 which should be standardized
+-    // to round(0.567) i.e 0.57
+-    testCompressionRatioConfigure(0.567F);
+-    
+-    // test with a compression ratio of 0.01 which less than the min supported
+-    // value of 0.07
+-    boolean failed = false;
+-    try {
+-      testCompressionRatioConfigure(0.01F);
+-    } catch (RuntimeException re) {
+-      failed = true;
+-    }
+-    assertTrue("Compression ratio min value (0.07) check failed!", failed);
+-    
+-    // test with a compression ratio of 0.01 which less than the max supported
+-    // value of 0.68
+-    failed = false;
+-    try {
+-      testCompressionRatioConfigure(0.7F);
+-    } catch (RuntimeException re) {
+-      failed = true;
+-    }
+-    assertTrue("Compression ratio max value (0.68) check failed!", failed);
+-  }
+-  
+-  /**
+-   * Test compression ratio standardization.
+-   */
+-  @Test
+-  public void testCompressionRatioStandardization() throws Exception {
+-    assertEquals(0.55F, 
+-        CompressionEmulationUtil.standardizeCompressionRatio(0.55F), 0.0D);
+-    assertEquals(0.65F, 
+-        CompressionEmulationUtil.standardizeCompressionRatio(0.652F), 0.0D);
+-    assertEquals(0.78F, 
+-        CompressionEmulationUtil.standardizeCompressionRatio(0.777F), 0.0D);
+-    assertEquals(0.86F, 
+-        CompressionEmulationUtil.standardizeCompressionRatio(0.855F), 0.0D);
+-  }
+-  
+-  /**
+-   * Test map input compression ratio configuration utilities.
+-   */
+-  @Test
+-  public void testInputCompressionRatioConfiguration() throws Exception {
+-    Configuration conf = new Configuration();
+-    float ratio = 0.567F;
+-    CompressionEmulationUtil.setMapInputCompressionEmulationRatio(conf, ratio);
+-    assertEquals(ratio, 
+-        CompressionEmulationUtil.getMapInputCompressionEmulationRatio(conf), 
+-        0.0D);
+-  }
+-  
+-  /**
+-   * Test map output compression ratio configuration utilities.
+-   */
+-  @Test
+-  public void testIntermediateCompressionRatioConfiguration() 
+-  throws Exception {
+-    Configuration conf = new Configuration();
+-    float ratio = 0.567F;
+-    CompressionEmulationUtil.setMapOutputCompressionEmulationRatio(conf, ratio);
+-    assertEquals(ratio, 
+-        CompressionEmulationUtil.getMapOutputCompressionEmulationRatio(conf), 
+-        0.0D);
+-  }
+-  
+-  /**
+-   * Test reduce output compression ratio configuration utilities.
+-   */
+-  @Test
+-  public void testOutputCompressionRatioConfiguration() throws Exception {
+-    Configuration conf = new Configuration();
+-    float ratio = 0.567F;
+-    CompressionEmulationUtil.setJobOutputCompressionEmulationRatio(conf, ratio);
+-    assertEquals(ratio, 
+-        CompressionEmulationUtil.getJobOutputCompressionEmulationRatio(conf),
+-        0.0D);
+-  }
+-  
+-  /**
+-   * Test compressible {@link GridmixRecord}.
+-   */
+-  @Test
+-  public void testCompressibleGridmixRecord() throws IOException {
+-    JobConf conf = new JobConf();
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    int dataSize = 1024 * 1024 * 10; // 10 MB
+-    float ratio = 0.357F;
+-    
+-    // define the test's root temp directory
+-    Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp")).makeQualified(
+-            lfs.getUri(), lfs.getWorkingDirectory());
+-
+-    Path tempDir = new Path(rootTempDir, 
+-                            "TestPossiblyCompressibleGridmixRecord");
+-    lfs.delete(tempDir, true);
+-    
+-    // define a compressible GridmixRecord
+-    GridmixRecord record = new GridmixRecord(dataSize, 0);
+-    record.setCompressibility(true, ratio); // enable compression
+-    
+-    conf.setClass(FileOutputFormat.COMPRESS_CODEC, GzipCodec.class, 
+-                  CompressionCodec.class);
+-    org.apache.hadoop.mapred.FileOutputFormat.setCompressOutput(conf, true);
+-    
+-    // write the record to a file
+-    Path recordFile = new Path(tempDir, "record");
+-    OutputStream outStream = CompressionEmulationUtil
+-                               .getPossiblyCompressedOutputStream(recordFile, 
+-                                                                  conf);    
+-    DataOutputStream out = new DataOutputStream(outStream);
+-    record.write(out);
+-    out.close();
+-    outStream.close();
+-    
+-    // open the compressed stream for reading
+-    Path actualRecordFile = recordFile.suffix(".gz");
+-    InputStream in = 
+-      CompressionEmulationUtil
+-        .getPossiblyDecompressedInputStream(actualRecordFile, conf, 0);
+-    
+-    // get the compressed file size
+-    long compressedFileSize = lfs.listStatus(actualRecordFile)[0].getLen();
+-    
+-    GridmixRecord recordRead = new GridmixRecord();
+-    recordRead.readFields(new DataInputStream(in));
+-    
+-    assertEquals("Record size mismatch in a compressible GridmixRecord",
+-                 dataSize, recordRead.getSize());
+-    assertTrue("Failed to generate a compressible GridmixRecord",
+-               recordRead.getSize() > compressedFileSize);
+-    
+-    // check if the record can generate data with the desired compression ratio
+-    float seenRatio = ((float)compressedFileSize)/dataSize;
+-    assertEquals(CompressionEmulationUtil.standardizeCompressionRatio(ratio), 
+-        CompressionEmulationUtil.standardizeCompressionRatio(seenRatio), 1.0D);
+-  }
+-  
+-  /**
+-   * Test 
+-   * {@link CompressionEmulationUtil#isCompressionEmulationEnabled(
+-   *          org.apache.hadoop.conf.Configuration)}.
+-   */
+-  @Test
+-  public void testIsCompressionEmulationEnabled() {
+-    Configuration conf = new Configuration();
+-    // Check default values
+-    assertTrue(CompressionEmulationUtil.isCompressionEmulationEnabled(conf));
+-    
+-    // Check disabled
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, false);
+-    assertFalse(CompressionEmulationUtil.isCompressionEmulationEnabled(conf));
+-    
+-    // Check enabled
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    assertTrue(CompressionEmulationUtil.isCompressionEmulationEnabled(conf));
+-  }
+-  
+-  /**
+-   * Test 
+-   * {@link CompressionEmulationUtil#getPossiblyDecompressedInputStream(Path, 
+-   *                                   Configuration, long)}
+-   *  and
+-   *  {@link CompressionEmulationUtil#getPossiblyCompressedOutputStream(Path, 
+-   *                                    Configuration)}.
+-   */
+-  @Test
+-  public void testPossiblyCompressedDecompressedStreams() throws IOException {
+-    JobConf conf = new JobConf();
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    String inputLine = "Hi Hello!";
+-
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(FileOutputFormat.COMPRESS, true);
+-    conf.setClass(FileOutputFormat.COMPRESS_CODEC, GzipCodec.class, 
+-                  CompressionCodec.class);
+-
+-    // define the test's root temp directory
+-    Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp")).makeQualified(
+-            lfs.getUri(), lfs.getWorkingDirectory());
+-
+-    Path tempDir =
+-      new Path(rootTempDir, "TestPossiblyCompressedDecompressedStreams");
+-    lfs.delete(tempDir, true);
+-
+-    // create a compressed file
+-    Path compressedFile = new Path(tempDir, "test");
+-    OutputStream out = 
+-      CompressionEmulationUtil.getPossiblyCompressedOutputStream(compressedFile, 
+-                                                                 conf);
+-    BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+-    writer.write(inputLine);
+-    writer.close();
+-    
+-    // now read back the data from the compressed stream
+-    compressedFile = compressedFile.suffix(".gz");
+-    InputStream in = 
+-      CompressionEmulationUtil
+-        .getPossiblyDecompressedInputStream(compressedFile, conf, 0);
+-    BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+-    String readLine = reader.readLine();
+-    assertEquals("Compression/Decompression error", inputLine, readLine);
+-    reader.close();
+-  }
+-  
+-  /**
+-   * Test if 
+-   * {@link CompressionEmulationUtil#configureCompressionEmulation(
+-   *        org.apache.hadoop.mapred.JobConf, org.apache.hadoop.mapred.JobConf)}
+-   *  can extract compression related configuration parameters.
+-   */
+-  @Test
+-  public void testExtractCompressionConfigs() {
+-    JobConf source = new JobConf();
+-    JobConf target = new JobConf();
+-    
+-    // set the default values
+-    source.setBoolean(FileOutputFormat.COMPRESS, false);
+-    source.set(FileOutputFormat.COMPRESS_CODEC, "MyDefaultCodec");
+-    source.set(FileOutputFormat.COMPRESS_TYPE, "MyDefaultType");
+-    source.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, false); 
+-    source.set(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC, "MyDefaultCodec2");
+-    
+-    CompressionEmulationUtil.configureCompressionEmulation(source, target);
+-    
+-    // check default values
+-    assertFalse(target.getBoolean(FileOutputFormat.COMPRESS, true));
+-    assertEquals("MyDefaultCodec", target.get(FileOutputFormat.COMPRESS_CODEC));
+-    assertEquals("MyDefaultType", target.get(FileOutputFormat.COMPRESS_TYPE));
+-    assertFalse(target.getBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true));
+-    assertEquals("MyDefaultCodec2", 
+-                 target.get(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC));
+-    assertFalse(CompressionEmulationUtil
+-                .isInputCompressionEmulationEnabled(target));
+-    
+-    // set new values
+-    source.setBoolean(FileOutputFormat.COMPRESS, true);
+-    source.set(FileOutputFormat.COMPRESS_CODEC, "MyCodec");
+-    source.set(FileOutputFormat.COMPRESS_TYPE, "MyType");
+-    source.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true); 
+-    source.set(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC, "MyCodec2");
+-    org.apache.hadoop.mapred.FileInputFormat.setInputPaths(source, "file.gz");
+-    
+-    target = new JobConf(); // reset
+-    CompressionEmulationUtil.configureCompressionEmulation(source, target);
+-    
+-    // check new values
+-    assertTrue(target.getBoolean(FileOutputFormat.COMPRESS, false));
+-    assertEquals("MyCodec", target.get(FileOutputFormat.COMPRESS_CODEC));
+-    assertEquals("MyType", target.get(FileOutputFormat.COMPRESS_TYPE));
+-    assertTrue(target.getBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, false));
+-    assertEquals("MyCodec2", 
+-                 target.get(MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC));
+-    assertTrue(CompressionEmulationUtil
+-               .isInputCompressionEmulationEnabled(target));
+-  }
+-  
+-  /**
+-   * Test of {@link FileQueue} can identify compressed file and provide
+-   * readers to extract uncompressed data only if input-compression is enabled.
+-   */
+-  @Test
+-  public void testFileQueueDecompression() throws IOException {
+-    JobConf conf = new JobConf();
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    String inputLine = "Hi Hello!";
+-    
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    org.apache.hadoop.mapred.FileOutputFormat.setCompressOutput(conf, true);
+-    org.apache.hadoop.mapred.FileOutputFormat.setOutputCompressorClass(conf, 
+-                                                GzipCodec.class);
+-
+-    // define the test's root temp directory
+-    Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp")).makeQualified(
+-            lfs.getUri(), lfs.getWorkingDirectory());
+-
+-    Path tempDir = new Path(rootTempDir, "TestFileQueueDecompression");
+-    lfs.delete(tempDir, true);
+-
+-    // create a compressed file
+-    Path compressedFile = new Path(tempDir, "test");
+-    OutputStream out = 
+-      CompressionEmulationUtil.getPossiblyCompressedOutputStream(compressedFile, 
+-                                                                 conf);
+-    BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+-    writer.write(inputLine);
+-    writer.close();
+-    
+-    compressedFile = compressedFile.suffix(".gz");
+-    // now read back the data from the compressed stream using FileQueue
+-    long fileSize = lfs.listStatus(compressedFile)[0].getLen();
+-    CombineFileSplit split = 
+-      new CombineFileSplit(new Path[] {compressedFile}, new long[] {fileSize});
+-    FileQueue queue = new FileQueue(split, conf);
+-    byte[] bytes = new byte[inputLine.getBytes().length];
+-    queue.read(bytes);
+-    queue.close();
+-    String readLine = new String(bytes);
+-    assertEquals("Compression/Decompression error", inputLine, readLine);
+-  }
+-
+-  /**
+-   * Tests the computation logic of uncompressed input bytes by
+-   * {@link LoadJob#getUncompressedInputBytes(long, Configuration)}
+-   */
+-  @Test
+-  public void testComputeUncompressedInputBytes() {
+-    long possiblyCompressedInputBytes = 100000;
+-    float compressionRatio = 0.45F;
+-    Configuration conf = new Configuration();
+-    CompressionEmulationUtil.setMapInputCompressionEmulationRatio(conf,
+-        compressionRatio);
+-
+-    // By default, input compression emulation is diabled. Verify the
+-    // computation of uncompressed input bytes.
+-    long result = CompressionEmulationUtil.getUncompressedInputBytes(
+-        possiblyCompressedInputBytes, conf);
+-    assertEquals(possiblyCompressedInputBytes, result);
+-
+-    // Enable input compression emulation and verify uncompressed
+-    // input bytes computation logic
+-    CompressionEmulationUtil.setInputCompressionEmulationEnabled(conf, true);
+-    result = CompressionEmulationUtil.getUncompressedInputBytes(
+-        possiblyCompressedInputBytes, conf);
+-    assertEquals((long)(possiblyCompressedInputBytes/compressionRatio), result);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestDistCacheEmulation.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestDistCacheEmulation.java
+deleted file mode 100644
+index caf05647b4e..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestDistCacheEmulation.java
++++ /dev/null
+@@ -1,430 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.*;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.JobContext;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.MapContext;
+-import org.apache.hadoop.mapreduce.MapReduceTestUtil;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.mapreduce.task.MapContextImpl;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-
+-/**
+- * Validate emulation of distributed cache load in gridmix simulated jobs.
+- * 
+- */
+-public class TestDistCacheEmulation {
+-
+-  private DistributedCacheEmulator dce = null;
+-
+-  @BeforeClass
+-  public static void init() throws IOException {
+-    GridmixTestUtils.initCluster(TestDistCacheEmulation.class);
+-    File target=new File("target"+File.separator+TestDistCacheEmulation.class.getName());
+-    if(!target.exists()){
+-      assertTrue(target.mkdirs());
+-    }
+-    
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws IOException {
+-    GridmixTestUtils.shutdownCluster();
+-  }
+-
+-  /**
+-   * Validate the dist cache files generated by GenerateDistCacheData job.
+-   * 
+-   * @param jobConf
+-   *          configuration of GenerateDistCacheData job.
+-   * @param sortedFileSizes
+-   *          array of sorted distributed cache file sizes
+-   * @throws IOException
+-   * @throws FileNotFoundException
+-   */
+-  private void validateDistCacheData(Configuration jobConf,
+-      long[] sortedFileSizes) throws FileNotFoundException, IOException {
+-    Path distCachePath = dce.getDistributedCacheDir();
+-    String filesListFile = jobConf
+-        .get(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_LIST);
+-    FileSystem fs = FileSystem.get(jobConf);
+-
+-    // Validate the existence of Distributed Cache files list file directly
+-    // under distributed cache directory
+-    Path listFile = new Path(filesListFile);
+-    assertTrue("Path of Distributed Cache files list file is wrong.",
+-        distCachePath.equals(listFile.getParent().makeQualified(fs.getUri(), fs.getWorkingDirectory())));
+-
+-    // Delete the dist cache files list file
+-    assertTrue(
+-        "Failed to delete distributed Cache files list file " + listFile,
+-        fs.delete(listFile,true));
+-
+-    List<Long> fileSizes = new ArrayList<Long>();
+-    for (long size : sortedFileSizes) {
+-      fileSizes.add(size);
+-    }
+-    // validate dist cache files after deleting the 'files list file'
+-    validateDistCacheFiles(fileSizes, distCachePath);
+-  }
+-
+-  /**
+-   * Validate private/public distributed cache files.
+-   * 
+-   * @param filesSizesExpected
+-   *          list of sizes of expected dist cache files
+-   * @param distCacheDir
+-   *          the distributed cache dir to be validated
+-   * @throws IOException
+-   * @throws FileNotFoundException
+-   */
+-  private void validateDistCacheFiles(List<Long> filesSizesExpected, Path distCacheDir)
+-      throws FileNotFoundException, IOException {
+-    // RemoteIterator<LocatedFileStatus> iter =
+-    FileStatus[] statuses = GridmixTestUtils.dfs.listStatus(distCacheDir);
+-    int numFiles = filesSizesExpected.size();
+-    assertEquals("Number of files under distributed cache dir is wrong.",
+-        numFiles, statuses.length);
+-    for (int i = 0; i < numFiles; i++) {
+-      FileStatus stat = statuses[i];
+-      assertTrue("File size of distributed cache file "
+-          + stat.getPath().toUri().getPath() + " is wrong.",
+-          filesSizesExpected.remove(stat.getLen()));
+-
+-      FsPermission perm = stat.getPermission();
+-      assertEquals("Wrong permissions for distributed cache file "
+-          + stat.getPath().toUri().getPath(), new FsPermission(
+-          GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_PERM), perm);
+-    }
+-  }
+-
+-  /**
+-   * Configures 5 HDFS-based dist cache files and 1 local-FS-based dist cache
+-   * file in the given Configuration object <code>conf</code>.
+-   * 
+-   * @param conf
+-   *          configuration where dist cache config properties are to be set
+-   * @return array of sorted HDFS-based distributed cache file sizes
+-   * @throws IOException
+-   */
+-  private long[] configureDummyDistCacheFiles(Configuration conf)
+-      throws IOException {
+-    String user = UserGroupInformation.getCurrentUser().getShortUserName();
+-    conf.set("user.name", user);
+-    
+-    // Set some dummy dist cache files in gridmix configuration so that they go
+-    // into the configuration of JobStory objects.
+-    String[] distCacheFiles = { "hdfs:///tmp/file1.txt",
+-        "/tmp/" + user + "/.staging/job_1/file2.txt",
+-        "hdfs:///user/user1/file3.txt", "/home/user2/file4.txt",
+-        "subdir1/file5.txt", "subdir2/file6.gz" };
+-
+-    String[] fileSizes = { "400", "2500", "700", "1200", "1500", "500" };
+-
+-    String[] visibilities = { "true", "false", "false", "true", "true", "false" };
+-    String[] timeStamps = { "1234", "2345", "34567", "5434", "125", "134" };
+-
+-    // DistributedCache.setCacheFiles(fileCaches, conf);
+-    conf.setStrings(MRJobConfig.CACHE_FILES, distCacheFiles);
+-    conf.setStrings(MRJobConfig.CACHE_FILES_SIZES, fileSizes);
+-    conf.setStrings(JobContext.CACHE_FILE_VISIBILITIES, visibilities);
+-    conf.setStrings(MRJobConfig.CACHE_FILE_TIMESTAMPS, timeStamps);
+-
+-    // local FS based dist cache file whose path contains <user>/.staging is
+-    // not created on HDFS. So file size 2500 is not added to sortedFileSizes.
+-    long[] sortedFileSizes = new long[] { 1500, 1200, 700, 500, 400 };
+-    return sortedFileSizes;
+-  }
+-
+-  /**
+-   * Runs setupGenerateDistCacheData() on a new DistrbutedCacheEmulator and and
+-   * returns the jobConf. Fills the array <code>sortedFileSizes</code> that can
+-   * be used for validation. Validation of exit code from
+-   * setupGenerateDistCacheData() is done.
+-   * 
+-   * @param generate
+-   *          true if -generate option is specified
+-   * @param sortedFileSizes
+-   *          sorted HDFS-based distributed cache file sizes
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  private Configuration runSetupGenerateDistCacheData(boolean generate,
+-      long[] sortedFileSizes) throws IOException, InterruptedException {
+-    Configuration conf = new Configuration();
+-    long[] fileSizes = configureDummyDistCacheFiles(conf);
+-    System.arraycopy(fileSizes, 0, sortedFileSizes, 0, fileSizes.length);
+-
+-    // Job stories of all 3 jobs will have same dist cache files in their
+-    // configurations
+-    final int numJobs = 3;
+-    DebugJobProducer jobProducer = new DebugJobProducer(numJobs, conf);
+-
+-    Configuration jobConf = GridmixTestUtils.mrvl.getConfig();
+-    Path ioPath = new Path("testSetupGenerateDistCacheData")
+-        .makeQualified(GridmixTestUtils.dfs.getUri(),GridmixTestUtils.dfs.getWorkingDirectory());
+-    FileSystem fs = FileSystem.get(jobConf);
+-    if (fs.exists(ioPath)) {
+-      fs.delete(ioPath, true);
+-    }
+-    FileSystem.mkdirs(fs, ioPath, new FsPermission((short) 0777));
+-
+-    dce = createDistributedCacheEmulator(jobConf, ioPath, generate);
+-    int exitCode = dce.setupGenerateDistCacheData(jobProducer);
+-    int expectedExitCode = generate ? 0
+-        : Gridmix.MISSING_DIST_CACHE_FILES_ERROR;
+-    assertEquals("setupGenerateDistCacheData failed.", expectedExitCode,
+-        exitCode);
+-
+-    // reset back
+-    resetDistCacheConfigProperties(jobConf);
+-    return jobConf;
+-  }
+-
+-  /**
+-   * Reset the config properties related to Distributed Cache in the given job
+-   * configuration <code>jobConf</code>.
+-   * 
+-   * @param jobConf
+-   *          job configuration
+-   */
+-  private void resetDistCacheConfigProperties(Configuration jobConf) {
+-    // reset current/latest property names
+-    jobConf.setStrings(MRJobConfig.CACHE_FILES, "");
+-    jobConf.setStrings(MRJobConfig.CACHE_FILES_SIZES, "");
+-    jobConf.setStrings(MRJobConfig.CACHE_FILE_TIMESTAMPS, "");
+-    jobConf.setStrings(JobContext.CACHE_FILE_VISIBILITIES, "");
+-    // reset old property names
+-    jobConf.setStrings("mapred.cache.files", "");
+-    jobConf.setStrings("mapred.cache.files.filesizes", "");
+-    jobConf.setStrings("mapred.cache.files.visibilities", "");
+-    jobConf.setStrings("mapred.cache.files.timestamps", "");
+-  }
+-
+-  /**
+-   * Validate GenerateDistCacheData job if it creates dist cache files properly.
+-   * 
+-   * @throws Exception
+-   */
+-  @Test (timeout=200000)
+-  public void testGenerateDistCacheData() throws Exception {
+-    long[] sortedFileSizes = new long[5];
+-    Configuration jobConf = runSetupGenerateDistCacheData(true, sortedFileSizes);
+-    GridmixJob gridmixJob = new GenerateDistCacheData(jobConf);
+-    Job job = gridmixJob.call();
+-    assertEquals("Number of reduce tasks in GenerateDistCacheData is not 0.",
+-        0, job.getNumReduceTasks());
+-    assertTrue("GenerateDistCacheData job failed.",
+-        job.waitForCompletion(false));
+-    validateDistCacheData(jobConf, sortedFileSizes);
+-  }
+-
+-  /**
+-   * Validate setupGenerateDistCacheData by validating <li>permissions of the
+-   * distributed cache directories and <li>content of the generated sequence
+-   * file. This includes validation of dist cache file paths and their file
+-   * sizes.
+-   */
+-  private void validateSetupGenDC(Configuration jobConf, long[] sortedFileSizes)
+-      throws IOException, InterruptedException {
+-    // build things needed for validation
+-    long sumOfFileSizes = 0;
+-    for (int i = 0; i < sortedFileSizes.length; i++) {
+-      sumOfFileSizes += sortedFileSizes[i];
+-    }
+-
+-    FileSystem fs = FileSystem.get(jobConf);
+-    assertEquals("Number of distributed cache files to be generated is wrong.",
+-        sortedFileSizes.length,
+-        jobConf.getInt(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_COUNT, -1));
+-    assertEquals("Total size of dist cache files to be generated is wrong.",
+-        sumOfFileSizes,
+-        jobConf.getLong(GenerateDistCacheData.GRIDMIX_DISTCACHE_BYTE_COUNT, -1));
+-    Path filesListFile = new Path(
+-        jobConf.get(GenerateDistCacheData.GRIDMIX_DISTCACHE_FILE_LIST));
+-    FileStatus stat = fs.getFileStatus(filesListFile);
+-    assertEquals("Wrong permissions of dist Cache files list file "
+-        + filesListFile, new FsPermission((short) 0644), stat.getPermission());
+-
+-    InputSplit split = new FileSplit(filesListFile, 0, stat.getLen(),
+-        (String[]) null);
+-    TaskAttemptContext taskContext = MapReduceTestUtil
+-        .createDummyMapTaskAttemptContext(jobConf);
+-    RecordReader<LongWritable, BytesWritable> reader = new GenerateDistCacheData.GenDCDataFormat()
+-        .createRecordReader(split, taskContext);
+-    MapContext<LongWritable, BytesWritable, NullWritable, BytesWritable> mapContext = new MapContextImpl<LongWritable, BytesWritable, NullWritable, BytesWritable>(
+-        jobConf, taskContext.getTaskAttemptID(), reader, null, null,
+-        MapReduceTestUtil.createDummyReporter(), split);
+-    reader.initialize(split, mapContext);
+-
+-    // start validating setupGenerateDistCacheData
+-    doValidateSetupGenDC(reader, fs, sortedFileSizes);
+-  }
+-
+-  /**
+-   * Validate setupGenerateDistCacheData by validating <li>permissions of the
+-   * distributed cache directory and <li>content of the generated sequence file.
+-   * This includes validation of dist cache file paths and their file sizes.
+-   */
+-  private void doValidateSetupGenDC(
+-      RecordReader<LongWritable, BytesWritable> reader, FileSystem fs,
+-      long[] sortedFileSizes) throws IOException, InterruptedException {
+-
+-    // Validate permissions of dist cache directory
+-    Path distCacheDir = dce.getDistributedCacheDir();
+-    assertEquals(
+-        "Wrong permissions for distributed cache dir " + distCacheDir,
+-        fs.getFileStatus(distCacheDir).getPermission().getOtherAction()
+-            .and(FsAction.EXECUTE), FsAction.EXECUTE);
+-
+-    // Validate the content of the sequence file generated by
+-    // dce.setupGenerateDistCacheData().
+-    LongWritable key = new LongWritable();
+-    BytesWritable val = new BytesWritable();
+-    for (int i = 0; i < sortedFileSizes.length; i++) {
+-      assertTrue("Number of files written to the sequence file by "
+-          + "setupGenerateDistCacheData is less than the expected.",
+-          reader.nextKeyValue());
+-      key = reader.getCurrentKey();
+-      val = reader.getCurrentValue();
+-      long fileSize = key.get();
+-      String file = new String(val.getBytes(), 0, val.getLength());
+-
+-      // Dist Cache files should be sorted based on file size.
+-      assertEquals("Dist cache file size is wrong.", sortedFileSizes[i],
+-          fileSize);
+-
+-      // Validate dist cache file path.
+-
+-      // parent dir of dist cache file
+-      Path parent = new Path(file).getParent().makeQualified(fs.getUri(),fs.getWorkingDirectory());
+-      // should exist in dist cache dir
+-      assertTrue("Public dist cache file path is wrong.",
+-          distCacheDir.equals(parent));
+-    }
+-  }
+-
+-  /**
+-   * Test if DistributedCacheEmulator's setup of GenerateDistCacheData is
+-   * working as expected.
+-   * 
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  @Test  (timeout=20000)
+-  public void testSetupGenerateDistCacheData() throws IOException,
+-      InterruptedException {
+-    long[] sortedFileSizes = new long[5];
+-    Configuration jobConf = runSetupGenerateDistCacheData(true, sortedFileSizes);
+-    validateSetupGenDC(jobConf, sortedFileSizes);
+-
+-    // Verify if correct exit code is seen when -generate option is missing and
+-    // distributed cache files are missing in the expected path.
+-    runSetupGenerateDistCacheData(false, sortedFileSizes);
+-  }
+-
+-  /**
+-   * Create DistributedCacheEmulator object and do the initialization by calling
+-   * init() on it with dummy trace. Also configure the pseudo local FS.
+-   */
+-  private DistributedCacheEmulator createDistributedCacheEmulator(
+-      Configuration conf, Path ioPath, boolean generate) throws IOException {
+-    DistributedCacheEmulator dce = new DistributedCacheEmulator(conf, ioPath);
+-    JobCreator jobCreator = JobCreator.getPolicy(conf, JobCreator.LOADJOB);
+-    jobCreator.setDistCacheEmulator(dce);
+-    dce.init("dummytrace", jobCreator, generate);
+-    return dce;
+-  }
+-
+-  /**
+-   * Test the configuration property for disabling/enabling emulation of
+-   * distributed cache load.
+-   */
+-  @Test  (timeout=2000)
+-  public void testDistCacheEmulationConfigurability() throws IOException {
+-    Configuration jobConf = GridmixTestUtils.mrvl.getConfig();
+-    Path ioPath = new Path("testDistCacheEmulationConfigurability")
+-        .makeQualified(GridmixTestUtils.dfs.getUri(),GridmixTestUtils.dfs.getWorkingDirectory());
+-    FileSystem fs = FileSystem.get(jobConf);
+-    FileSystem.mkdirs(fs, ioPath, new FsPermission((short) 0777));
+-
+-    // default config
+-    dce = createDistributedCacheEmulator(jobConf, ioPath, false);
+-    assertTrue("Default configuration of "
+-        + DistributedCacheEmulator.GRIDMIX_EMULATE_DISTRIBUTEDCACHE
+-        + " is wrong.", dce.shouldEmulateDistCacheLoad());
+-
+-    // config property set to false
+-    jobConf.setBoolean(
+-        DistributedCacheEmulator.GRIDMIX_EMULATE_DISTRIBUTEDCACHE, false);
+-    dce = createDistributedCacheEmulator(jobConf, ioPath, false);
+-    assertFalse("Disabling of emulation of distributed cache load by setting "
+-        + DistributedCacheEmulator.GRIDMIX_EMULATE_DISTRIBUTEDCACHE
+-        + " to false is not working.", dce.shouldEmulateDistCacheLoad());
+-  }
+-/** 
+- * test method configureDistCacheFiles
+- * 
+- */
+-  @Test  (timeout=2000)
+-  public void testDistCacheEmulator() throws Exception {
+-
+-    Configuration conf = new Configuration();
+-    configureDummyDistCacheFiles(conf);
+-    File ws = new File("target" + File.separator + this.getClass().getName());
+-    Path ioPath = new Path(ws.getAbsolutePath());
+-
+-    DistributedCacheEmulator dce = new DistributedCacheEmulator(conf, ioPath);
+-    JobConf jobConf = new JobConf(conf);
+-    jobConf.setUser(UserGroupInformation.getCurrentUser().getShortUserName());
+-    File fin=new File("src"+File.separator+"test"+File.separator+"resources"+File.separator+"data"+File.separator+"wordcount.json");
+-    dce.init(fin.getAbsolutePath(), JobCreator.LOADJOB, true);
+-    dce.configureDistCacheFiles(conf, jobConf);
+-    
+-    String[] caches=conf.getStrings(MRJobConfig.CACHE_FILES);
+-    String[] tmpfiles=conf.getStrings("tmpfiles");
+-    // this method should fill caches AND tmpfiles  from MRJobConfig.CACHE_FILES property 
+-    assertEquals(6, ((caches==null?0:caches.length)+(tmpfiles==null?0:tmpfiles.length)));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java
+deleted file mode 100644
+index f4a4ee60647..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFilePool.java
++++ /dev/null
+@@ -1,189 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.HashSet;
+-import java.util.Random;
+-
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.BlockLocation;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-
+-public class TestFilePool {
+-
+-  static final Logger LOG = LoggerFactory.getLogger(TestFileQueue.class);
+-  static final int NFILES = 26;
+-  static final Path base = getBaseDir();
+-
+-  static Path getBaseDir() {
+-    try {
+-      final Configuration conf = new Configuration();
+-      final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-      return fs.makeQualified(new Path(
+-          System.getProperty("test.build.data", "/tmp"), "testFilePool"));
+-    } catch (IOException e) {
+-      fail();
+-    }
+-    return null;
+-  }
+-
+-  @BeforeClass
+-  public static void setup() throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-    fs.delete(base, true);
+-    final Random r = new Random();
+-    final long seed = r.nextLong();
+-    r.setSeed(seed);
+-    LOG.info("seed: " + seed);
+-    fs.mkdirs(base);
+-    for (int i = 0; i < NFILES; ++i) {
+-      Path file = base;
+-      for (double d = 0.6; d > 0.0; d *= 0.8) {
+-        if (r.nextDouble() < d) {
+-          file = new Path(base, Integer.toString(r.nextInt(3)));
+-          continue;
+-        }
+-        break;
+-      }
+-      OutputStream out = null;
+-      try {
+-        out = fs.create(new Path(file, "" + (char)('A' + i)));
+-        final byte[] b = new byte[1024];
+-        Arrays.fill(b, (byte)('A' + i));
+-        for (int len = ((i % 13) + 1) * 1024; len > 0; len -= 1024) {
+-          out.write(b);
+-        }
+-      } finally {
+-        if (out != null) {
+-          out.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  @AfterClass
+-  public static void cleanup() throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-    fs.delete(base, true);
+-  }
+-
+-  @Test
+-  public void testUnsuitable() throws Exception {
+-    try {
+-      final Configuration conf = new Configuration();
+-      // all files 13k or less
+-      conf.setLong(FilePool.GRIDMIX_MIN_FILE, 14 * 1024);
+-      final FilePool pool = new FilePool(conf, base);
+-      pool.refresh();
+-    } catch (IOException e) {
+-      return;
+-    }
+-    fail();
+-  }
+-
+-  @Test
+-  public void testPool() throws Exception {
+-    final Random r = new Random();
+-    final Configuration conf = new Configuration();
+-    conf.setLong(FilePool.GRIDMIX_MIN_FILE, 3 * 1024);
+-    final FilePool pool = new FilePool(conf, base);
+-    pool.refresh();
+-    final ArrayList<FileStatus> files = new ArrayList<FileStatus>();
+-
+-    // ensure 1k, 2k files excluded
+-    final int expectedPoolSize = (NFILES / 2 * (NFILES / 2 + 1) - 6) * 1024;
+-    assertEquals(expectedPoolSize, pool.getInputFiles(Long.MAX_VALUE, files));
+-    assertEquals(NFILES - 4, files.size());
+-
+-    // exact match
+-    files.clear();
+-    assertEquals(expectedPoolSize, pool.getInputFiles(expectedPoolSize, files));
+-
+-    // match random within 12k
+-    files.clear();
+-    final long rand = r.nextInt(expectedPoolSize);
+-    assertTrue("Missed: " + rand,
+-        (NFILES / 2) * 1024 > rand - pool.getInputFiles(rand, files));
+-
+-    // all files
+-    conf.setLong(FilePool.GRIDMIX_MIN_FILE, 0);
+-    pool.refresh();
+-    files.clear();
+-    assertEquals((NFILES / 2 * (NFILES / 2 + 1)) * 1024,
+-        pool.getInputFiles(Long.MAX_VALUE, files));
+-  }
+-
+-  void checkSplitEq(FileSystem fs, CombineFileSplit split, long bytes)
+-      throws Exception {
+-    long splitBytes = 0L;
+-    HashSet<Path> uniq = new HashSet<Path>();
+-    for (int i = 0; i < split.getNumPaths(); ++i) {
+-      splitBytes += split.getLength(i);
+-      assertTrue(
+-          split.getLength(i) <= fs.getFileStatus(split.getPath(i)).getLen());
+-      assertFalse(uniq.contains(split.getPath(i)));
+-      uniq.add(split.getPath(i));
+-    }
+-    assertEquals(bytes, splitBytes);
+-  }
+-
+-  @Test
+-  public void testStriper() throws Exception {
+-    final Random r = new Random();
+-    final Configuration conf = new Configuration();
+-    final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-    conf.setLong(FilePool.GRIDMIX_MIN_FILE, 3 * 1024);
+-    final FilePool pool = new FilePool(conf, base) {
+-      @Override
+-      public BlockLocation[] locationsFor(FileStatus stat, long start, long len)
+-          throws IOException {
+-        return new BlockLocation[] { new BlockLocation() };
+-      }
+-    };
+-    pool.refresh();
+-
+-    final int expectedPoolSize = (NFILES / 2 * (NFILES / 2 + 1) - 6) * 1024;
+-    final InputStriper striper = new InputStriper(pool, expectedPoolSize);
+-    int last = 0;
+-    for (int i = 0; i < expectedPoolSize;
+-        last = Math.min(expectedPoolSize - i, r.nextInt(expectedPoolSize))) {
+-      checkSplitEq(fs, striper.splitFor(pool, last, 0), last);
+-      i += last;
+-    }
+-    final InputStriper striper2 = new InputStriper(pool, expectedPoolSize);
+-    checkSplitEq(fs, striper2.splitFor(pool, expectedPoolSize, 0),
+-        expectedPoolSize);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
+deleted file mode 100644
+index 41925655d13..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestFileQueue.java
++++ /dev/null
+@@ -1,143 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.util.Arrays;
+-
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-
+-public class TestFileQueue {
+-
+-  static final Logger LOG = LoggerFactory.getLogger(TestFileQueue.class);
+-  static final int NFILES = 4;
+-  static final int BLOCK = 256;
+-  static final Path[] paths = new Path[NFILES];
+-  static final String[] loc = new String[NFILES];
+-  static final long[] start = new long[NFILES];
+-  static final long[] len = new long[NFILES];
+-
+-  @BeforeClass
+-  public static void setup() throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-    final Path p = fs.makeQualified(new Path(
+-        System.getProperty("test.build.data", "/tmp"), "testFileQueue"));
+-    fs.delete(p, true);
+-    final byte[] b = new byte[BLOCK];
+-    for (int i = 0; i < NFILES; ++i) {
+-      Arrays.fill(b, (byte)('A' + i));
+-      paths[i] = new Path(p, "" + (char)('A' + i));
+-      OutputStream f = null;
+-      try {
+-        f = fs.create(paths[i]);
+-        f.write(b);
+-      } finally {
+-        if (f != null) {
+-          f.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  @AfterClass
+-  public static void cleanup() throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem fs = FileSystem.getLocal(conf).getRaw();
+-    final Path p = fs.makeQualified(new Path(
+-        System.getProperty("test.build.data", "/tmp"), "testFileQueue"));
+-    fs.delete(p, true);
+-  }
+-
+-  static ByteArrayOutputStream fillVerif() throws IOException {
+-    final byte[] b = new byte[BLOCK];
+-    final ByteArrayOutputStream out = new ByteArrayOutputStream();
+-    for (int i = 0; i < NFILES; ++i) {
+-      Arrays.fill(b, (byte)('A' + i));
+-      out.write(b, 0, (int)len[i]);
+-    }
+-    return out;
+-  }
+-
+-  @Test
+-  public void testRepeat() throws Exception {
+-    final Configuration conf = new Configuration();
+-    Arrays.fill(loc, "");
+-    Arrays.fill(start, 0L);
+-    Arrays.fill(len, BLOCK);
+-
+-    final ByteArrayOutputStream out = fillVerif();
+-    final FileQueue q =
+-      new FileQueue(new CombineFileSplit(paths, start, len, loc), conf);
+-    final byte[] verif = out.toByteArray();
+-    final byte[] check = new byte[2 * NFILES * BLOCK];
+-    q.read(check, 0, NFILES * BLOCK);
+-    assertArrayEquals(verif, Arrays.copyOf(check, NFILES * BLOCK));
+-
+-    final byte[] verif2 = new byte[2 * NFILES * BLOCK];
+-    System.arraycopy(verif, 0, verif2, 0, verif.length);
+-    System.arraycopy(verif, 0, verif2, verif.length, verif.length);
+-    q.read(check, 0, 2 * NFILES * BLOCK);
+-    assertArrayEquals(verif2, check);
+-
+-  }
+-
+-  @Test
+-  public void testUneven() throws Exception {
+-    final Configuration conf = new Configuration();
+-    Arrays.fill(loc, "");
+-    Arrays.fill(start, 0L);
+-    Arrays.fill(len, BLOCK);
+-
+-    final int B2 = BLOCK / 2;
+-    for (int i = 0; i < NFILES; i += 2) {
+-      start[i] += B2;
+-      len[i] -= B2;
+-    }
+-    final FileQueue q =
+-      new FileQueue(new CombineFileSplit(paths, start, len, loc), conf);
+-    final ByteArrayOutputStream out = fillVerif();
+-    final byte[] verif = out.toByteArray();
+-    final byte[] check = new byte[NFILES / 2 * BLOCK + NFILES / 2 * B2];
+-    q.read(check, 0, verif.length);
+-    assertArrayEquals(verif, Arrays.copyOf(check, verif.length));
+-    q.read(check, 0, verif.length);
+-    assertArrayEquals(verif, Arrays.copyOf(check, verif.length));
+-  }
+-
+-  @Test
+-  public void testEmpty() throws Exception {
+-    final Configuration conf = new Configuration();
+-    // verify OK if unused
+-    final FileQueue q = new FileQueue(new CombineFileSplit(
+-          new Path[0], new long[0], new long[0], new String[0]), conf);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
+deleted file mode 100644
+index 372b2cab388..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridMixClasses.java
++++ /dev/null
+@@ -1,989 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.CountDownLatch;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.CustomOutputCommitter;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.PositionedReadable;
+-import org.apache.hadoop.fs.Seekable;
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.RawComparator;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.JobContext;
+-import org.apache.hadoop.mapred.RawKeyValueIterator;
+-import org.apache.hadoop.mapred.gridmix.GridmixKey.Spec;
+-import org.apache.hadoop.mapred.gridmix.SleepJob.SleepReducer;
+-import org.apache.hadoop.mapred.gridmix.SleepJob.SleepSplit;
+-import org.apache.hadoop.mapreduce.Counter;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.MapContext;
+-import org.apache.hadoop.mapreduce.OutputCommitter;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.RecordWriter;
+-import org.apache.hadoop.mapreduce.ReduceContext;
+-import org.apache.hadoop.mapreduce.StatusReporter;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.Mapper.Context;
+-import org.apache.hadoop.mapreduce.counters.GenericCounter;
+-import org.apache.hadoop.mapreduce.lib.input.CombineFileSplit;
+-import org.apache.hadoop.mapreduce.lib.map.WrappedMapper;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.apache.hadoop.mapreduce.lib.reduce.WrappedReducer;
+-import org.apache.hadoop.mapreduce.task.MapContextImpl;
+-import org.apache.hadoop.mapreduce.task.ReduceContextImpl;
+-import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
+-import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl.DummyReporter;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.tools.rumen.ZombieJobProducer;
+-import org.apache.hadoop.util.Progress;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import static org.mockito.Mockito.*;
+-
+-import static org.junit.Assert.*;
+-
+-public class TestGridMixClasses {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestGridMixClasses.class);
+-
+-  /*
+-   * simple test LoadSplit (getters,copy, write, read...)
+-   */
+-  @Test (timeout=1000)
+-  public void testLoadSplit() throws Exception {
+-
+-    LoadSplit test = getLoadSplit();
+-
+-    ByteArrayOutputStream data = new ByteArrayOutputStream();
+-    DataOutputStream out = new DataOutputStream(data);
+-    test.write(out);
+-    LoadSplit copy = new LoadSplit();
+-    copy.readFields(new DataInputStream(new ByteArrayInputStream(data
+-            .toByteArray())));
+-
+-    // data should be the same
+-    assertEquals(test.getId(), copy.getId());
+-    assertEquals(test.getMapCount(), copy.getMapCount());
+-    assertEquals(test.getInputRecords(), copy.getInputRecords());
+-
+-    assertEquals(test.getOutputBytes()[0], copy.getOutputBytes()[0]);
+-    assertEquals(test.getOutputRecords()[0], copy.getOutputRecords()[0]);
+-    assertEquals(test.getReduceBytes(0), copy.getReduceBytes(0));
+-    assertEquals(test.getReduceRecords(0), copy.getReduceRecords(0));
+-    assertEquals(test.getMapResourceUsageMetrics().getCumulativeCpuUsage(),
+-            copy.getMapResourceUsageMetrics().getCumulativeCpuUsage());
+-    assertEquals(test.getReduceResourceUsageMetrics(0).getCumulativeCpuUsage(),
+-            copy.getReduceResourceUsageMetrics(0).getCumulativeCpuUsage());
+-
+-  }
+-
+-  /*
+-   * simple test GridmixSplit (copy, getters, write, read..)
+-   */
+-  @Test (timeout=1000)
+-  public void testGridmixSplit() throws Exception {
+-    Path[] files = {new Path("one"), new Path("two")};
+-    long[] start = {1, 2};
+-    long[] lengths = {100, 200};
+-    String[] locations = {"locOne", "loctwo"};
+-
+-    CombineFileSplit cfSplit = new CombineFileSplit(files, start, lengths,
+-            locations);
+-    ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-    metrics.setCumulativeCpuUsage(200);
+-
+-    double[] reduceBytes = {8.1d, 8.2d};
+-    double[] reduceRecords = {9.1d, 9.2d};
+-    long[] reduceOutputBytes = {101L, 102L};
+-    long[] reduceOutputRecords = {111L, 112L};
+-
+-    GridmixSplit test = new GridmixSplit(cfSplit, 2, 3, 4L, 5L, 6L, 7L,
+-            reduceBytes, reduceRecords, reduceOutputBytes, reduceOutputRecords);
+-
+-    ByteArrayOutputStream data = new ByteArrayOutputStream();
+-    DataOutputStream out = new DataOutputStream(data);
+-    test.write(out);
+-    GridmixSplit copy = new GridmixSplit();
+-    copy.readFields(new DataInputStream(new ByteArrayInputStream(data
+-            .toByteArray())));
+-
+-    // data should be the same
+-    assertEquals(test.getId(), copy.getId());
+-    assertEquals(test.getMapCount(), copy.getMapCount());
+-    assertEquals(test.getInputRecords(), copy.getInputRecords());
+-
+-    assertEquals(test.getOutputBytes()[0], copy.getOutputBytes()[0]);
+-    assertEquals(test.getOutputRecords()[0], copy.getOutputRecords()[0]);
+-    assertEquals(test.getReduceBytes(0), copy.getReduceBytes(0));
+-    assertEquals(test.getReduceRecords(0), copy.getReduceRecords(0));
+-
+-  }
+-
+-  /*
+-   * test LoadMapper loadMapper should write to writer record for each reduce
+-   */
+-  @SuppressWarnings({"rawtypes", "unchecked"})
+-  @Test (timeout=10000)
+-  public void testLoadMapper() throws Exception {
+-
+-    Configuration conf = new Configuration();
+-    conf.setInt(JobContext.NUM_REDUCES, 2);
+-
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true);
+-
+-    TaskAttemptID taskId = new TaskAttemptID();
+-    RecordReader<NullWritable, GridmixRecord> reader = new FakeRecordReader();
+-
+-    LoadRecordGkGrWriter writer = new LoadRecordGkGrWriter();
+-
+-    OutputCommitter committer = new CustomOutputCommitter();
+-    StatusReporter reporter = new TaskAttemptContextImpl.DummyReporter();
+-    LoadSplit split = getLoadSplit();
+-
+-    MapContext<NullWritable, GridmixRecord, GridmixKey, GridmixRecord> mapContext = new MapContextImpl<NullWritable, GridmixRecord, GridmixKey, GridmixRecord>(
+-            conf, taskId, reader, writer, committer, reporter, split);
+-    // context
+-    Context ctx = new WrappedMapper<NullWritable, GridmixRecord, GridmixKey, GridmixRecord>()
+-            .getMapContext(mapContext);
+-
+-    reader.initialize(split, ctx);
+-    ctx.getConfiguration().setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true);
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(
+-            ctx.getConfiguration(), true);
+-
+-    LoadJob.LoadMapper mapper = new LoadJob.LoadMapper();
+-    // setup, map, clean
+-    mapper.run(ctx);
+-
+-    Map<GridmixKey, GridmixRecord> data = writer.getData();
+-    // check result
+-    assertEquals(2, data.size());
+-
+-  }
+-
+-  private LoadSplit getLoadSplit() throws Exception {
+-
+-    Path[] files = {new Path("one"), new Path("two")};
+-    long[] start = {1, 2};
+-    long[] lengths = {100, 200};
+-    String[] locations = {"locOne", "loctwo"};
+-
+-    CombineFileSplit cfSplit = new CombineFileSplit(files, start, lengths,
+-            locations);
+-    ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-    metrics.setCumulativeCpuUsage(200);
+-    ResourceUsageMetrics[] rMetrics = {metrics};
+-
+-    double[] reduceBytes = {8.1d, 8.2d};
+-    double[] reduceRecords = {9.1d, 9.2d};
+-    long[] reduceOutputBytes = {101L, 102L};
+-    long[] reduceOutputRecords = {111L, 112L};
+-
+-    return new LoadSplit(cfSplit, 2, 1, 4L, 5L, 6L, 7L,
+-            reduceBytes, reduceRecords, reduceOutputBytes, reduceOutputRecords,
+-            metrics, rMetrics);
+-  }
+-
+-  private class FakeRecordLLReader extends
+-          RecordReader<LongWritable, LongWritable> {
+-
+-    int counter = 10;
+-
+-    @Override
+-    public void initialize(InputSplit split, TaskAttemptContext context)
+-            throws IOException, InterruptedException {
+-
+-    }
+-
+-    @Override
+-    public boolean nextKeyValue() throws IOException, InterruptedException {
+-      counter--;
+-      return counter > 0;
+-    }
+-
+-    @Override
+-    public LongWritable getCurrentKey() throws IOException,
+-            InterruptedException {
+-
+-      return new LongWritable(counter);
+-    }
+-
+-    @Override
+-    public LongWritable getCurrentValue() throws IOException,
+-            InterruptedException {
+-      return new LongWritable(counter * 10);
+-    }
+-
+-    @Override
+-    public float getProgress() throws IOException, InterruptedException {
+-      return counter / 10.0f;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-      // restore data
+-      counter = 10;
+-    }
+-  }
+-
+-  private class FakeRecordReader extends
+-          RecordReader<NullWritable, GridmixRecord> {
+-
+-    int counter = 10;
+-
+-    @Override
+-    public void initialize(InputSplit split, TaskAttemptContext context)
+-            throws IOException, InterruptedException {
+-
+-    }
+-
+-    @Override
+-    public boolean nextKeyValue() throws IOException, InterruptedException {
+-      counter--;
+-      return counter > 0;
+-    }
+-
+-    @Override
+-    public NullWritable getCurrentKey() throws IOException,
+-            InterruptedException {
+-
+-      return NullWritable.get();
+-    }
+-
+-    @Override
+-    public GridmixRecord getCurrentValue() throws IOException,
+-            InterruptedException {
+-      return new GridmixRecord(100, 100L);
+-    }
+-
+-    @Override
+-    public float getProgress() throws IOException, InterruptedException {
+-      return counter / 10.0f;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-      // restore data
+-      counter = 10;
+-    }
+-  }
+-
+-  private class LoadRecordGkGrWriter extends
+-          RecordWriter<GridmixKey, GridmixRecord> {
+-    private Map<GridmixKey, GridmixRecord> data = new HashMap<GridmixKey, GridmixRecord>();
+-
+-    @Override
+-    public void write(GridmixKey key, GridmixRecord value) throws IOException,
+-            InterruptedException {
+-      data.put(key, value);
+-    }
+-
+-    @Override
+-    public void close(TaskAttemptContext context) throws IOException,
+-            InterruptedException {
+-    }
+-
+-    public Map<GridmixKey, GridmixRecord> getData() {
+-      return data;
+-    }
+-
+-  }
+-
+-  private class LoadRecordGkNullWriter extends
+-          RecordWriter<GridmixKey, NullWritable> {
+-    private Map<GridmixKey, NullWritable> data = new HashMap<GridmixKey, NullWritable>();
+-
+-    @Override
+-    public void write(GridmixKey key, NullWritable value) throws IOException,
+-            InterruptedException {
+-      data.put(key, value);
+-    }
+-
+-    @Override
+-    public void close(TaskAttemptContext context) throws IOException,
+-            InterruptedException {
+-    }
+-
+-    public Map<GridmixKey, NullWritable> getData() {
+-      return data;
+-    }
+-
+-  }
+-
+-  private class LoadRecordWriter extends
+-          RecordWriter<NullWritable, GridmixRecord> {
+-    private Map<NullWritable, GridmixRecord> data = new HashMap<NullWritable, GridmixRecord>();
+-
+-    @Override
+-    public void write(NullWritable key, GridmixRecord value)
+-            throws IOException, InterruptedException {
+-      data.put(key, value);
+-    }
+-
+-    @Override
+-    public void close(TaskAttemptContext context) throws IOException,
+-            InterruptedException {
+-    }
+-
+-    public Map<NullWritable, GridmixRecord> getData() {
+-      return data;
+-    }
+-
+-  }
+-
+-  /*
+-   * test LoadSortComparator
+-   */
+-  @Test (timeout=3000)
+-  public void testLoadJobLoadSortComparator() throws Exception {
+-    LoadJob.LoadSortComparator test = new LoadJob.LoadSortComparator();
+-
+-    ByteArrayOutputStream data = new ByteArrayOutputStream();
+-    DataOutputStream dos = new DataOutputStream(data);
+-    WritableUtils.writeVInt(dos, 2);
+-    WritableUtils.writeVInt(dos, 1);
+-    WritableUtils.writeVInt(dos, 4);
+-    WritableUtils.writeVInt(dos, 7);
+-    WritableUtils.writeVInt(dos, 4);
+-
+-    byte[] b1 = data.toByteArray();
+-
+-    byte[] b2 = data.toByteArray();
+-
+-    // the same data should be equals
+-    assertEquals(0, test.compare(b1, 0, 1, b2, 0, 1));
+-    b2[2] = 5;
+-    // compare like GridMixKey first byte: shift count -1=4-5
+-    assertEquals(-1, test.compare(b1, 0, 1, b2, 0, 1));
+-    b2[2] = 2;
+-    // compare like GridMixKey first byte: shift count 2=4-2
+-    assertEquals(2, test.compare(b1, 0, 1, b2, 0, 1));
+-    // compare arrays by first byte witch offset (2-1) because 4==4
+-    b2[2] = 4;
+-    assertEquals(1, test.compare(b1, 0, 1, b2, 1, 1));
+-
+-  }
+-
+-  /*
+-   * test SpecGroupingComparator
+-   */
+-  @Test (timeout=3000)
+-  public void testGridmixJobSpecGroupingComparator() throws Exception {
+-    GridmixJob.SpecGroupingComparator test = new GridmixJob.SpecGroupingComparator();
+-
+-    ByteArrayOutputStream data = new ByteArrayOutputStream();
+-    DataOutputStream dos = new DataOutputStream(data);
+-    WritableUtils.writeVInt(dos, 2);
+-    WritableUtils.writeVInt(dos, 1);
+-    // 0: REDUCE SPEC
+-    WritableUtils.writeVInt(dos, 0);
+-    WritableUtils.writeVInt(dos, 7);
+-    WritableUtils.writeVInt(dos, 4);
+-
+-    byte[] b1 = data.toByteArray();
+-
+-    byte[] b2 = data.toByteArray();
+-
+-    // the same object should be equals
+-    assertEquals(0, test.compare(b1, 0, 1, b2, 0, 1));
+-    b2[2] = 1;
+-    // for Reduce
+-    assertEquals(-1, test.compare(b1, 0, 1, b2, 0, 1));
+-    // by Reduce spec
+-    b2[2] = 1; // 1: DATA SPEC
+-    assertEquals(-1, test.compare(b1, 0, 1, b2, 0, 1));
+-    // compare GridmixKey the same objects should be equals
+-    assertEquals(0, test.compare(new GridmixKey(GridmixKey.DATA, 100, 2),
+-            new GridmixKey(GridmixKey.DATA, 100, 2)));
+-    // REDUSE SPEC
+-    assertEquals(-1, test.compare(
+-            new GridmixKey(GridmixKey.REDUCE_SPEC, 100, 2), new GridmixKey(
+-            GridmixKey.DATA, 100, 2)));
+-    assertEquals(1, test.compare(new GridmixKey(GridmixKey.DATA, 100, 2),
+-            new GridmixKey(GridmixKey.REDUCE_SPEC, 100, 2)));
+-    // only DATA
+-    assertEquals(2, test.compare(new GridmixKey(GridmixKey.DATA, 102, 2),
+-            new GridmixKey(GridmixKey.DATA, 100, 2)));
+-
+-  }
+-
+-  /*
+-   * test CompareGridmixJob only equals and compare
+-   */
+-  @Test (timeout=30000)
+-  public void testCompareGridmixJob() throws Exception {
+-    Configuration conf = new Configuration();
+-    Path outRoot = new Path("target");
+-    JobStory jobDesc = mock(JobStory.class);
+-    when(jobDesc.getName()).thenReturn("JobName");
+-    when(jobDesc.getJobConf()).thenReturn(new JobConf(conf));
+-    UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+-    GridmixJob j1 = new LoadJob(conf, 1000L, jobDesc, outRoot, ugi, 0);
+-    GridmixJob j2 = new LoadJob(conf, 1000L, jobDesc, outRoot, ugi, 0);
+-    GridmixJob j3 = new LoadJob(conf, 1000L, jobDesc, outRoot, ugi, 1);
+-    GridmixJob j4 = new LoadJob(conf, 1000L, jobDesc, outRoot, ugi, 1);
+-
+-    assertTrue(j1.equals(j2));
+-    assertEquals(0, j1.compareTo(j2));
+-    // Only one parameter matters
+-    assertFalse(j1.equals(j3));
+-    // compare id and submissionMillis
+-    assertEquals(-1, j1.compareTo(j3));
+-    assertEquals(-1, j1.compareTo(j4));
+-
+-  }
+-
+-  /*
+-   * test ReadRecordFactory. should read all data from inputstream
+-   */
+-  @Test (timeout=3000)
+-  public void testReadRecordFactory() throws Exception {
+-
+-    // RecordFactory factory, InputStream src, Configuration conf
+-    RecordFactory rf = new FakeRecordFactory();
+-    FakeInputStream input = new FakeInputStream();
+-    ReadRecordFactory test = new ReadRecordFactory(rf, input,
+-            new Configuration());
+-    GridmixKey key = new GridmixKey(GridmixKey.DATA, 100, 2);
+-    GridmixRecord val = new GridmixRecord(200, 2);
+-    while (test.next(key, val)) {
+-
+-    }
+-    // should be read 10* (GridmixKey.size +GridmixRecord.value)
+-    assertEquals(3000, input.getCounter());
+-    // should be -1 because all data readed;
+-    assertEquals(-1, rf.getProgress(), 0.01);
+-
+-    test.close();
+-  }
+-
+-  private class FakeRecordFactory extends RecordFactory {
+-
+-    private int counter = 10;
+-
+-    @Override
+-    public void close() throws IOException {
+-
+-    }
+-
+-    @Override
+-    public boolean next(GridmixKey key, GridmixRecord val) throws IOException {
+-      counter--;
+-      return counter >= 0;
+-    }
+-
+-    @Override
+-    public float getProgress() throws IOException {
+-      return counter;
+-    }
+-
+-  }
+-
+-  private class FakeInputStream extends InputStream implements Seekable,
+-          PositionedReadable {
+-    private long counter;
+-
+-    @Override
+-    public int read() throws IOException {
+-      return 0;
+-    }
+-
+-    @Override
+-    public int read(byte[] b, int off, int len) throws IOException {
+-      int realLen = len - off;
+-      counter += realLen;
+-      for (int i = 0; i < b.length; i++) {
+-        b[i] = 0;
+-      }
+-      return realLen;
+-    }
+-
+-    public long getCounter() {
+-      return counter;
+-    }
+-
+-    @Override
+-    public void seek(long pos) throws IOException {
+-
+-    }
+-
+-    @Override
+-    public long getPos() throws IOException {
+-      return counter;
+-    }
+-
+-    @Override
+-    public boolean seekToNewSource(long targetPos) throws IOException {
+-      return false;
+-    }
+-
+-    @Override
+-    public int read(long position, byte[] buffer, int offset, int length)
+-            throws IOException {
+-      return 0;
+-    }
+-
+-    @Override
+-    public void readFully(long position, byte[] buffer, int offset, int length)
+-            throws IOException {
+-
+-    }
+-
+-    @Override
+-    public void readFully(long position, byte[] buffer) throws IOException {
+-
+-    }
+-  }
+-
+-  private class FakeFSDataInputStream extends FSDataInputStream {
+-
+-    public FakeFSDataInputStream(InputStream in) throws IOException {
+-      super(in);
+-
+-    }
+-
+-  }
+-
+-  /*
+-   * test LoadRecordReader. It class reads data from some files.
+-   */
+-  @Test (timeout=3000)
+-  public void testLoadJobLoadRecordReader() throws Exception {
+-    LoadJob.LoadRecordReader test = new LoadJob.LoadRecordReader();
+-    Configuration conf = new Configuration();
+-
+-    FileSystem fs1 = mock(FileSystem.class);
+-    when(fs1.open(any(Path.class))).thenReturn(
+-            new FakeFSDataInputStream(new FakeInputStream()));
+-    Path p1 = mock(Path.class);
+-    when(p1.getFileSystem(any())).thenReturn(fs1);
+-
+-    FileSystem fs2 = mock(FileSystem.class);
+-    when(fs2.open(any(Path.class))).thenReturn(
+-            new FakeFSDataInputStream(new FakeInputStream()));
+-    Path p2 = mock(Path.class);
+-    when(p2.getFileSystem(any())).thenReturn(fs2);
+-
+-    Path[] paths = {p1, p2};
+-
+-    long[] start = {0, 0};
+-    long[] lengths = {1000, 1000};
+-    String[] locations = {"temp1", "temp2"};
+-    CombineFileSplit cfsplit = new CombineFileSplit(paths, start, lengths,
+-            locations);
+-    double[] reduceBytes = {100, 100};
+-    double[] reduceRecords = {2, 2};
+-    long[] reduceOutputBytes = {500, 500};
+-    long[] reduceOutputRecords = {2, 2};
+-    ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-    ResourceUsageMetrics[] rMetrics = {new ResourceUsageMetrics(),
+-            new ResourceUsageMetrics()};
+-    LoadSplit input = new LoadSplit(cfsplit, 2, 3, 1500L, 2L, 3000L, 2L,
+-            reduceBytes, reduceRecords, reduceOutputBytes, reduceOutputRecords,
+-            metrics, rMetrics);
+-    TaskAttemptID taskId = new TaskAttemptID();
+-    TaskAttemptContext ctx = new TaskAttemptContextImpl(conf, taskId);
+-    test.initialize(input, ctx);
+-    GridmixRecord gr = test.getCurrentValue();
+-    int counter = 0;
+-    while (test.nextKeyValue()) {
+-      gr = test.getCurrentValue();
+-      if (counter == 0) {
+-        // read first file
+-        assertEquals(0.5, test.getProgress(), 0.001);
+-      } else if (counter == 1) {
+-        // read second file
+-        assertEquals(1.0, test.getProgress(), 0.001);
+-      }
+-      //
+-      assertEquals(1000, gr.getSize());
+-      counter++;
+-    }
+-    assertEquals(1000, gr.getSize());
+-    // Two files have been read
+-    assertEquals(2, counter);
+-
+-    test.close();
+-  }
+-
+-  /*
+-   * test LoadReducer
+-   */
+-
+-  @Test (timeout=3000)
+-  public void testLoadJobLoadReducer() throws Exception {
+-    LoadJob.LoadReducer test = new LoadJob.LoadReducer();
+-
+-    Configuration conf = new Configuration();
+-    conf.setInt(JobContext.NUM_REDUCES, 2);
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(FileOutputFormat.COMPRESS, true);
+-
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true);
+-    TaskAttemptID taskid = new TaskAttemptID();
+-
+-    RawKeyValueIterator input = new FakeRawKeyValueIterator();
+-
+-    Counter counter = new GenericCounter();
+-    Counter inputValueCounter = new GenericCounter();
+-    LoadRecordWriter output = new LoadRecordWriter();
+-
+-    OutputCommitter committer = new CustomOutputCommitter();
+-
+-    StatusReporter reporter = new DummyReporter();
+-    RawComparator<GridmixKey> comparator = new FakeRawComparator();
+-
+-    ReduceContext<GridmixKey, GridmixRecord, NullWritable, GridmixRecord> reduceContext = new ReduceContextImpl<GridmixKey, GridmixRecord, NullWritable, GridmixRecord>(
+-            conf, taskid, input, counter, inputValueCounter, output, committer,
+-            reporter, comparator, GridmixKey.class, GridmixRecord.class);
+-    // read for previous data
+-    reduceContext.nextKeyValue();
+-    org.apache.hadoop.mapreduce.Reducer<GridmixKey, GridmixRecord, NullWritable, GridmixRecord>.Context context = new WrappedReducer<GridmixKey, GridmixRecord, NullWritable, GridmixRecord>()
+-            .getReducerContext(reduceContext);
+-
+-    // test.setup(context);
+-    test.run(context);
+-    // have been readed 9 records (-1 for previous)
+-    assertEquals(9, counter.getValue());
+-    assertEquals(10, inputValueCounter.getValue());
+-    assertEquals(1, output.getData().size());
+-    GridmixRecord record = output.getData().values().iterator()
+-            .next();
+-
+-    assertEquals(1593, record.getSize());
+-  }
+-
+-  protected class FakeRawKeyValueIterator implements RawKeyValueIterator {
+-
+-    int counter = 10;
+-
+-    @Override
+-    public DataInputBuffer getKey() throws IOException {
+-      ByteArrayOutputStream dt = new ByteArrayOutputStream();
+-      GridmixKey key = new GridmixKey(GridmixKey.REDUCE_SPEC, 10 * counter, 1L);
+-      Spec spec = new Spec();
+-      spec.rec_in = counter;
+-      spec.rec_out = counter;
+-      spec.bytes_out = counter * 100;
+-
+-      key.setSpec(spec);
+-      key.write(new DataOutputStream(dt));
+-      DataInputBuffer result = new DataInputBuffer();
+-      byte[] b = dt.toByteArray();
+-      result.reset(b, 0, b.length);
+-      return result;
+-    }
+-
+-    @Override
+-    public DataInputBuffer getValue() throws IOException {
+-      ByteArrayOutputStream dt = new ByteArrayOutputStream();
+-      GridmixRecord key = new GridmixRecord(100, 1);
+-      key.write(new DataOutputStream(dt));
+-      DataInputBuffer result = new DataInputBuffer();
+-      byte[] b = dt.toByteArray();
+-      result.reset(b, 0, b.length);
+-      return result;
+-    }
+-
+-    @Override
+-    public boolean next() throws IOException {
+-      counter--;
+-      return counter >= 0;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-
+-    }
+-
+-    @Override
+-    public Progress getProgress() {
+-      return null;
+-    }
+-
+-  }
+-
+-  private class FakeRawComparator implements RawComparator<GridmixKey> {
+-
+-    @Override
+-    public int compare(GridmixKey o1, GridmixKey o2) {
+-      return o1.compareTo(o2);
+-    }
+-
+-    @Override
+-    public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
+-      if ((l1 - s1) != (l2 - s2)) {
+-        return (l1 - s1) - (l2 - s2);
+-      }
+-      int len = l1 - s1;
+-      for (int i = 0; i < len; i++) {
+-        if (b1[s1 + i] != b2[s2 + i]) {
+-          return b1[s1 + i] - b2[s2 + i];
+-        }
+-      }
+-      return 0;
+-    }
+-
+-  }
+-
+-  /*
+-   * test SerialJobFactory
+-   */
+-  @Test (timeout=120000)
+-  public void testSerialReaderThread() throws Exception {
+-
+-    Configuration conf = new Configuration();
+-    File fin = new File("src" + File.separator + "test" + File.separator
+-            + "resources" + File.separator + "data" + File.separator
+-            + "wordcount2.json");
+-    // read couple jobs from wordcount2.json
+-    JobStoryProducer jobProducer = new ZombieJobProducer(new Path(
+-            fin.getAbsolutePath()), null, conf);
+-    CountDownLatch startFlag = new CountDownLatch(1);
+-    UserResolver resolver = new SubmitterUserResolver();
+-    FakeJobSubmitter submitter = new FakeJobSubmitter();
+-    File ws = new File("target" + File.separator + this.getClass().getName());
+-    if (!ws.exists()) {
+-      Assert.assertTrue(ws.mkdirs());
+-    }
+-
+-    SerialJobFactory jobFactory = new SerialJobFactory(submitter, jobProducer,
+-            new Path(ws.getAbsolutePath()), conf, startFlag, resolver);
+-
+-    Path ioPath = new Path(ws.getAbsolutePath());
+-    jobFactory.setDistCacheEmulator(new DistributedCacheEmulator(conf, ioPath));
+-    Thread test = jobFactory.createReaderThread();
+-    test.start();
+-    Thread.sleep(1000);
+-    // SerialReaderThread waits startFlag
+-    assertEquals(0, submitter.getJobs().size());
+-    // start!
+-    startFlag.countDown();
+-    while (test.isAlive()) {
+-      Thread.sleep(1000);
+-      jobFactory.update(null);
+-    }
+-    // submitter was called twice
+-    assertEquals(2, submitter.getJobs().size());
+-  }
+-
+-  private class FakeJobSubmitter extends JobSubmitter {
+-    // counter for submitted jobs
+-    private List<GridmixJob> jobs = new ArrayList<GridmixJob>();
+-
+-    public FakeJobSubmitter() {
+-      super(null, 1, 1, null, null);
+-
+-    }
+-
+-    @Override
+-    public void add(GridmixJob job) throws InterruptedException {
+-      jobs.add(job);
+-    }
+-
+-    public List<GridmixJob> getJobs() {
+-      return jobs;
+-    }
+-  }
+-
+-  /*
+-   * test SleepMapper
+-   */
+-  @SuppressWarnings({"unchecked", "rawtypes"})
+-  @Test (timeout=30000)
+-  public void testSleepMapper() throws Exception {
+-    SleepJob.SleepMapper test = new SleepJob.SleepMapper();
+-
+-    Configuration conf = new Configuration();
+-    conf.setInt(JobContext.NUM_REDUCES, 2);
+-
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true);
+-    TaskAttemptID taskId = new TaskAttemptID();
+-    FakeRecordLLReader reader = new FakeRecordLLReader();
+-    LoadRecordGkNullWriter writer = new LoadRecordGkNullWriter();
+-    OutputCommitter committer = new CustomOutputCommitter();
+-    StatusReporter reporter = new TaskAttemptContextImpl.DummyReporter();
+-    SleepSplit split = getSleepSplit();
+-    MapContext<LongWritable, LongWritable, GridmixKey, NullWritable> mapcontext = new MapContextImpl<LongWritable, LongWritable, GridmixKey, NullWritable>(
+-            conf, taskId, reader, writer, committer, reporter, split);
+-    Context context = new WrappedMapper<LongWritable, LongWritable, GridmixKey, NullWritable>()
+-            .getMapContext(mapcontext);
+-
+-    long start = System.currentTimeMillis();
+-    LOG.info("start:" + start);
+-    LongWritable key = new LongWritable(start + 2000);
+-    LongWritable value = new LongWritable(start + 2000);
+-    // should slip 2 sec
+-    test.map(key, value, context);
+-    LOG.info("finish:" + System.currentTimeMillis());
+-    assertTrue(System.currentTimeMillis() >= (start + 2000));
+-
+-    test.cleanup(context);
+-    assertEquals(1, writer.getData().size());
+-  }
+-
+-  private SleepSplit getSleepSplit() throws Exception {
+-
+-    String[] locations = {"locOne", "loctwo"};
+-
+-    long[] reduceDurations = {101L, 102L};
+-
+-    return new SleepSplit(0, 2000L, reduceDurations, 2, locations);
+-  }
+-
+-  /*
+-   * test SleepReducer
+-   */
+-  @Test (timeout=3000)
+-  public void testSleepReducer() throws Exception {
+-    Configuration conf = new Configuration();
+-    conf.setInt(JobContext.NUM_REDUCES, 2);
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(FileOutputFormat.COMPRESS, true);
+-
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    conf.setBoolean(MRJobConfig.MAP_OUTPUT_COMPRESS, true);
+-    TaskAttemptID taskId = new TaskAttemptID();
+-
+-    RawKeyValueIterator input = new FakeRawKeyValueReducerIterator();
+-
+-    Counter counter = new GenericCounter();
+-    Counter inputValueCounter = new GenericCounter();
+-    RecordWriter<NullWritable, NullWritable> output = new LoadRecordReduceWriter();
+-
+-    OutputCommitter committer = new CustomOutputCommitter();
+-
+-    StatusReporter reporter = new DummyReporter();
+-    RawComparator<GridmixKey> comparator = new FakeRawComparator();
+-
+-    ReduceContext<GridmixKey, NullWritable, NullWritable, NullWritable> reducecontext = new ReduceContextImpl<GridmixKey, NullWritable, NullWritable, NullWritable>(
+-            conf, taskId, input, counter, inputValueCounter, output, committer,
+-            reporter, comparator, GridmixKey.class, NullWritable.class);
+-    org.apache.hadoop.mapreduce.Reducer<GridmixKey, NullWritable, NullWritable, NullWritable>.Context context = new WrappedReducer<GridmixKey, NullWritable, NullWritable, NullWritable>()
+-            .getReducerContext(reducecontext);
+-
+-    SleepReducer test = new SleepReducer();
+-    long start = System.currentTimeMillis();
+-    test.setup(context);
+-    long sleeper = context.getCurrentKey().getReduceOutputBytes();
+-    // status has been changed
+-    assertEquals("Sleeping... " + sleeper + " ms left", context.getStatus());
+-    // should sleep 0.9 sec
+-
+-    assertTrue(System.currentTimeMillis() >= (start + sleeper));
+-    test.cleanup(context);
+-    // status has been changed again
+-
+-    assertEquals("Slept for " + sleeper, context.getStatus());
+-
+-  }
+-
+-  private class LoadRecordReduceWriter extends
+-          RecordWriter<NullWritable, NullWritable> {
+-
+-    @Override
+-    public void write(NullWritable key, NullWritable value) throws IOException,
+-            InterruptedException {
+-    }
+-
+-    @Override
+-    public void close(TaskAttemptContext context) throws IOException,
+-            InterruptedException {
+-    }
+-
+-  }
+-
+-  protected class FakeRawKeyValueReducerIterator implements RawKeyValueIterator {
+-
+-    int counter = 10;
+-
+-    @Override
+-    public DataInputBuffer getKey() throws IOException {
+-      ByteArrayOutputStream dt = new ByteArrayOutputStream();
+-      GridmixKey key = new GridmixKey(GridmixKey.REDUCE_SPEC, 10 * counter, 1L);
+-      Spec spec = new Spec();
+-      spec.rec_in = counter;
+-      spec.rec_out = counter;
+-      spec.bytes_out = counter * 100;
+-
+-      key.setSpec(spec);
+-      key.write(new DataOutputStream(dt));
+-      DataInputBuffer result = new DataInputBuffer();
+-      byte[] b = dt.toByteArray();
+-      result.reset(b, 0, b.length);
+-      return result;
+-    }
+-
+-    @Override
+-    public DataInputBuffer getValue() throws IOException {
+-      ByteArrayOutputStream dt = new ByteArrayOutputStream();
+-      NullWritable key = NullWritable.get();
+-      key.write(new DataOutputStream(dt));
+-      DataInputBuffer result = new DataInputBuffer();
+-      byte[] b = dt.toByteArray();
+-      result.reset(b, 0, b.length);
+-      return result;
+-    }
+-
+-    @Override
+-    public boolean next() throws IOException {
+-      counter--;
+-      return counter >= 0;
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-
+-    }
+-
+-    @Override
+-    public Progress getProgress() {
+-      return null;
+-    }
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java
+deleted file mode 100644
+index d79c0101041..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixMemoryEmulation.java
++++ /dev/null
+@@ -1,457 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.gridmix.DebugJobProducer.MockJob;
+-import org.apache.hadoop.mapred.gridmix.TestHighRamJob.DummyGridmixJob;
+-import org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators.FakeProgressive;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.TotalHeapUsageEmulatorPlugin;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.TotalHeapUsageEmulatorPlugin.DefaultHeapUsageEmulator;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * Test Gridmix memory emulation.
+- */
+-public class TestGridmixMemoryEmulation {
+-  /**
+-   * This is a dummy class that fakes heap usage.
+-   */
+-  private static class FakeHeapUsageEmulatorCore 
+-  extends DefaultHeapUsageEmulator {
+-    private int numCalls = 0;
+-    
+-    @Override
+-    public void load(long sizeInMB) {
+-      ++numCalls;
+-      super.load(sizeInMB);
+-    }
+-    
+-    // Get the total number of times load() was invoked
+-    int getNumCalls() {
+-      return numCalls;
+-    }
+-    
+-    // Get the total number of 1mb objects stored within
+-    long getHeapUsageInMB() {
+-      return getHeapSpaceSize();
+-    }
+-    
+-    @Override
+-    public void reset() {
+-      // no op to stop emulate() from resetting
+-    }
+-    
+-    /**
+-     * For re-testing purpose.
+-     */
+-    void resetFake() {
+-      numCalls = 0;
+-      super.reset();
+-    }
+-  }
+-
+-  /**
+-   * This is a dummy class that fakes the heap usage emulator plugin.
+-   */
+-  private static class FakeHeapUsageEmulatorPlugin 
+-  extends TotalHeapUsageEmulatorPlugin {
+-    private FakeHeapUsageEmulatorCore core;
+-    
+-    public FakeHeapUsageEmulatorPlugin(FakeHeapUsageEmulatorCore core) {
+-      super(core);
+-      this.core = core;
+-    }
+-    
+-    @Override
+-    protected long getMaxHeapUsageInMB() {
+-      return Long.MAX_VALUE / ONE_MB;
+-    }
+-    
+-    @Override
+-    protected long getTotalHeapUsageInMB() {
+-      return core.getHeapUsageInMB();
+-    }
+-  }
+-  
+-  /**
+-   * Test {@link TotalHeapUsageEmulatorPlugin}'s core heap usage emulation 
+-   * engine.
+-   */
+-  @Test
+-  public void testHeapUsageEmulator() throws IOException {
+-    FakeHeapUsageEmulatorCore heapEmulator = new FakeHeapUsageEmulatorCore();
+-    
+-    long testSizeInMB = 10; // 10 mb
+-    long previousHeap = heapEmulator.getHeapUsageInMB();
+-    heapEmulator.load(testSizeInMB);
+-    long currentHeap = heapEmulator.getHeapUsageInMB();
+-    
+-    // check if the heap has increased by expected value
+-    assertEquals("Default heap emulator failed to load 10mb", 
+-                 previousHeap + testSizeInMB, currentHeap);
+-    
+-    // test reset
+-    heapEmulator.resetFake();
+-    assertEquals("Default heap emulator failed to reset", 
+-                 0, heapEmulator.getHeapUsageInMB());
+-  }
+-
+-  /**
+-   * Test {@link TotalHeapUsageEmulatorPlugin}.
+-   */
+-  @Test
+-  public void testTotalHeapUsageEmulatorPlugin() throws Exception {
+-    Configuration conf = new Configuration();
+-    // set the dummy resource calculator for testing
+-    ResourceCalculatorPlugin monitor = new DummyResourceCalculatorPlugin();
+-    long maxHeapUsage = 1024 * TotalHeapUsageEmulatorPlugin.ONE_MB; // 1GB
+-    conf.setLong(DummyResourceCalculatorPlugin.MAXPMEM_TESTING_PROPERTY, 
+-                 maxHeapUsage);
+-    monitor.setConf(conf);
+-    
+-    // no buffer to be reserved
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.MIN_HEAP_FREE_RATIO, 0F);
+-    // only 1 call to be made per cycle
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_LOAD_RATIO, 1F);
+-    long targetHeapUsageInMB = 200; // 200mb
+-    
+-    // fake progress indicator
+-    FakeProgressive fakeProgress = new FakeProgressive();
+-    
+-    // fake heap usage generator
+-    FakeHeapUsageEmulatorCore fakeCore = new FakeHeapUsageEmulatorCore();
+-    
+-    // a heap usage emulator with fake core
+-    FakeHeapUsageEmulatorPlugin heapPlugin = 
+-      new FakeHeapUsageEmulatorPlugin(fakeCore);
+-    
+-    // test with invalid or missing resource usage value
+-    ResourceUsageMetrics invalidUsage = 
+-      TestResourceUsageEmulators.createMetrics(0);
+-    heapPlugin.initialize(conf, invalidUsage, null, null);
+-    
+-    // test if disabled heap emulation plugin's emulate() call is a no-operation
+-    // this will test if the emulation plugin is disabled or not
+-    int numCallsPre = fakeCore.getNumCalls();
+-    long heapUsagePre = fakeCore.getHeapUsageInMB();
+-    heapPlugin.emulate();
+-    int numCallsPost = fakeCore.getNumCalls();
+-    long heapUsagePost = fakeCore.getHeapUsageInMB();
+-    
+-    //  test if no calls are made heap usage emulator core
+-    assertEquals("Disabled heap usage emulation plugin works!", 
+-                 numCallsPre, numCallsPost);
+-    //  test if no calls are made heap usage emulator core
+-    assertEquals("Disabled heap usage emulation plugin works!", 
+-                 heapUsagePre, heapUsagePost);
+-    
+-    // test with get progress
+-    float progress = heapPlugin.getProgress();
+-    assertEquals("Invalid progress of disabled cumulative heap usage emulation "
+-                 + "plugin!", 1.0f, progress, 0f);
+-    
+-    // test with wrong/invalid configuration
+-    Boolean failed = null;
+-    invalidUsage = 
+-      TestResourceUsageEmulators.createMetrics(maxHeapUsage 
+-                                   + TotalHeapUsageEmulatorPlugin.ONE_MB);
+-    try {
+-      heapPlugin.initialize(conf, invalidUsage, monitor, null);
+-      failed = false;
+-    } catch (Exception e) {
+-      failed = true;
+-    }
+-    assertNotNull("Fail case failure!", failed);
+-    assertTrue("Expected failure!", failed); 
+-    
+-    // test with valid resource usage value
+-    ResourceUsageMetrics metrics = 
+-      TestResourceUsageEmulators.createMetrics(targetHeapUsageInMB 
+-                                   * TotalHeapUsageEmulatorPlugin.ONE_MB);
+-    
+-    // test with default emulation interval
+-    // in every interval, the emulator will add 100% of the expected usage 
+-    // (since gridmix.emulators.resource-usage.heap.load-ratio=1)
+-    // so at 10%, emulator will add 10% (difference), at 20% it will add 10% ...
+-    // So to emulate 200MB, it will add
+-    //   20mb + 20mb + 20mb + 20mb + .. = 200mb 
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, heapPlugin, 200, 
+-                          10);
+-    
+-    // test with custom value for emulation interval of 20%
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_EMULATION_PROGRESS_INTERVAL,
+-                  0.2F);
+-    //  40mb + 40mb + 40mb + 40mb + 40mb = 200mb
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, heapPlugin, 200, 5);
+-    
+-    // test with custom value of free heap ratio and load ratio = 1
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_LOAD_RATIO, 1F);
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.MIN_HEAP_FREE_RATIO, 0.5F);
+-    //  40mb + 0mb + 80mb + 0mb + 0mb = 120mb
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, heapPlugin, 120, 2);
+-    
+-    // test with custom value of heap load ratio and min free heap ratio = 0
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_LOAD_RATIO, 0.5F);
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.MIN_HEAP_FREE_RATIO, 0F);
+-    // 20mb (call#1) + 20mb (call#1) + 20mb (call#2) + 20mb (call#2) +.. = 200mb
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, heapPlugin, 200, 
+-                          10);
+-    
+-    // test with custom value of free heap ratio = 0.3 and load ratio = 0.5
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.MIN_HEAP_FREE_RATIO, 0.25F);
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_LOAD_RATIO, 0.5F);
+-    // 20mb (call#1) + 20mb (call#1) + 30mb (call#2) + 0mb (call#2) 
+-    // + 30mb (call#3) + 0mb (call#3) + 35mb (call#4) + 0mb (call#4)
+-    // + 37mb (call#5) + 0mb (call#5) = 162mb
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, heapPlugin, 162, 6);
+-    
+-    // test if emulation interval boundary is respected
+-    fakeProgress = new FakeProgressive(); // initialize
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.MIN_HEAP_FREE_RATIO, 0F);
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_LOAD_RATIO, 1F);
+-    conf.setFloat(TotalHeapUsageEmulatorPlugin.HEAP_EMULATION_PROGRESS_INTERVAL,
+-                  0.25F);
+-    heapPlugin.initialize(conf, metrics, monitor, fakeProgress);
+-    fakeCore.resetFake();
+-    // take a snapshot after the initialization
+-    long initHeapUsage = fakeCore.getHeapUsageInMB();
+-    long initNumCallsUsage = fakeCore.getNumCalls();
+-    // test with 0 progress
+-    testEmulationBoundary(0F, fakeCore, fakeProgress, heapPlugin, initHeapUsage, 
+-                          initNumCallsUsage, "[no-op, 0 progress]");
+-    // test with 24% progress
+-    testEmulationBoundary(0.24F, fakeCore, fakeProgress, heapPlugin, 
+-                          initHeapUsage, initNumCallsUsage, 
+-                          "[no-op, 24% progress]");
+-    // test with 25% progress
+-    testEmulationBoundary(0.25F, fakeCore, fakeProgress, heapPlugin, 
+-        targetHeapUsageInMB / 4, 1, "[op, 25% progress]");
+-    // test with 80% progress
+-    testEmulationBoundary(0.80F, fakeCore, fakeProgress, heapPlugin, 
+-        (targetHeapUsageInMB * 4) / 5, 2, "[op, 80% progress]");
+-    
+-    // now test if the final call with 100% progress ramps up the heap usage
+-    testEmulationBoundary(1F, fakeCore, fakeProgress, heapPlugin, 
+-        targetHeapUsageInMB, 3, "[op, 100% progress]");
+-  }
+-
+-  // test whether the heap usage emulator achieves the desired target using
+-  // desired calls to the underling core engine.
+-  private static void testEmulationAccuracy(Configuration conf, 
+-                        FakeHeapUsageEmulatorCore fakeCore,
+-                        ResourceCalculatorPlugin monitor,
+-                        ResourceUsageMetrics metrics,
+-                        TotalHeapUsageEmulatorPlugin heapPlugin,
+-                        long expectedTotalHeapUsageInMB,
+-                        long expectedTotalNumCalls)
+-  throws Exception {
+-    FakeProgressive fakeProgress = new FakeProgressive();
+-    fakeCore.resetFake();
+-    heapPlugin.initialize(conf, metrics, monitor, fakeProgress);
+-    int numLoops = 0;
+-    while (fakeProgress.getProgress() < 1) {
+-      ++numLoops;
+-      float progress = numLoops / 100.0F;
+-      fakeProgress.setProgress(progress);
+-      heapPlugin.emulate();
+-    }
+-    
+-    // test if the resource plugin shows the expected usage
+-    assertEquals("Cumulative heap usage emulator plugin failed (total usage)!", 
+-                 expectedTotalHeapUsageInMB, fakeCore.getHeapUsageInMB(), 1L);
+-    // test if the resource plugin shows the expected num calls
+-    assertEquals("Cumulative heap usage emulator plugin failed (num calls)!", 
+-                 expectedTotalNumCalls, fakeCore.getNumCalls(), 0L);
+-  }
+-
+-  // tests if the heap usage emulation plugin emulates only at the expected
+-  // progress gaps
+-  private static void testEmulationBoundary(float progress, 
+-      FakeHeapUsageEmulatorCore fakeCore, FakeProgressive fakeProgress, 
+-      TotalHeapUsageEmulatorPlugin heapPlugin, long expectedTotalHeapUsageInMB, 
+-      long expectedTotalNumCalls, String info) throws Exception {
+-    fakeProgress.setProgress(progress);
+-    heapPlugin.emulate();
+-    // test heap usage
+-    assertEquals("Emulation interval test for heap usage failed " + info + "!", 
+-                 expectedTotalHeapUsageInMB, fakeCore.getHeapUsageInMB(), 0L);
+-    // test num calls
+-    assertEquals("Emulation interval test for heap usage failed " + info + "!", 
+-                 expectedTotalNumCalls, fakeCore.getNumCalls(), 0L);
+-  }
+-  
+-  /**
+-   * Test the specified task java heap options.
+-   */
+-  @SuppressWarnings("deprecation")
+-  private void testJavaHeapOptions(String mapOptions, 
+-      String reduceOptions, String taskOptions, String defaultMapOptions, 
+-      String defaultReduceOptions, String defaultTaskOptions, 
+-      String expectedMapOptions, String expectedReduceOptions, 
+-      String expectedTaskOptions) throws Exception {
+-    Configuration simulatedConf = new Configuration();
+-    // reset the configuration parameters
+-    simulatedConf.unset(MRJobConfig.MAP_JAVA_OPTS);
+-    simulatedConf.unset(MRJobConfig.REDUCE_JAVA_OPTS);
+-    simulatedConf.unset(JobConf.MAPRED_TASK_JAVA_OPTS);
+-    
+-    // set the default map task options
+-    if (defaultMapOptions != null) {
+-      simulatedConf.set(MRJobConfig.MAP_JAVA_OPTS, defaultMapOptions);
+-    }
+-    // set the default reduce task options
+-    if (defaultReduceOptions != null) {
+-      simulatedConf.set(MRJobConfig.REDUCE_JAVA_OPTS, defaultReduceOptions);
+-    }
+-    // set the default task options
+-    if (defaultTaskOptions != null) {
+-      simulatedConf.set(JobConf.MAPRED_TASK_JAVA_OPTS, defaultTaskOptions);
+-    }
+-    
+-    Configuration originalConf = new Configuration();
+-    // reset the configuration parameters
+-    originalConf.unset(MRJobConfig.MAP_JAVA_OPTS);
+-    originalConf.unset(MRJobConfig.REDUCE_JAVA_OPTS);
+-    originalConf.unset(JobConf.MAPRED_TASK_JAVA_OPTS);
+-    
+-    // set the map task options
+-    if (mapOptions != null) {
+-      originalConf.set(MRJobConfig.MAP_JAVA_OPTS, mapOptions);
+-    }
+-    // set the reduce task options
+-    if (reduceOptions != null) {
+-      originalConf.set(MRJobConfig.REDUCE_JAVA_OPTS, reduceOptions);
+-    }
+-    // set the task options
+-    if (taskOptions != null) {
+-      originalConf.set(JobConf.MAPRED_TASK_JAVA_OPTS, taskOptions);
+-    }
+-    
+-    // configure the task jvm's heap options
+-    GridmixJob.configureTaskJVMOptions(originalConf, simulatedConf);
+-    
+-    assertEquals("Map heap options mismatch!", expectedMapOptions, 
+-                 simulatedConf.get(MRJobConfig.MAP_JAVA_OPTS));
+-    assertEquals("Reduce heap options mismatch!", expectedReduceOptions, 
+-                 simulatedConf.get(MRJobConfig.REDUCE_JAVA_OPTS));
+-    assertEquals("Task heap options mismatch!", expectedTaskOptions, 
+-                 simulatedConf.get(JobConf.MAPRED_TASK_JAVA_OPTS));
+-  }
+-  
+-  /**
+-   * Test task-level java heap options configuration in {@link GridmixJob}.
+-   */
+-  @Test
+-  public void testJavaHeapOptions() throws Exception {
+-    // test missing opts
+-    testJavaHeapOptions(null, null, null, null, null, null, null, null, 
+-                        null);
+-    
+-    // test original heap opts and missing default opts
+-    testJavaHeapOptions("-Xms10m", "-Xms20m", "-Xms30m", null, null, null,
+-                        null, null, null);
+-    
+-    // test missing opts with default opts
+-    testJavaHeapOptions(null, null, null, "-Xms10m", "-Xms20m", "-Xms30m",
+-                        "-Xms10m", "-Xms20m", "-Xms30m");
+-    
+-    // test empty option
+-    testJavaHeapOptions("", "", "", null, null, null, null, null, null);
+-    
+-    // test empty default option and no original heap options
+-    testJavaHeapOptions(null, null, null, "", "", "", "", "", "");
+-    
+-    // test empty opts and default opts
+-    testJavaHeapOptions("", "", "", "-Xmx10m -Xms1m", "-Xmx50m -Xms2m", 
+-                        "-Xms2m -Xmx100m", "-Xmx10m -Xms1m", "-Xmx50m -Xms2m", 
+-                        "-Xms2m -Xmx100m");
+-    
+-    // test custom heap opts with no default opts
+-    testJavaHeapOptions("-Xmx10m", "-Xmx20m", "-Xmx30m", null, null, null,
+-                        "-Xmx10m", "-Xmx20m", "-Xmx30m");
+-    
+-    // test heap opts with default opts (multiple value)
+-    testJavaHeapOptions("-Xms5m -Xmx200m", "-Xms15m -Xmx300m", 
+-                        "-Xms25m -Xmx50m", "-XXabc", "-XXxyz", "-XXdef", 
+-                        "-XXabc -Xmx200m", "-XXxyz -Xmx300m", "-XXdef -Xmx50m");
+-    
+-    // test heap opts with default opts (duplication of -Xmx)
+-    testJavaHeapOptions("-Xms5m -Xmx200m", "-Xms15m -Xmx300m", 
+-                        "-Xms25m -Xmx50m", "-XXabc -Xmx500m", "-XXxyz -Xmx600m",
+-                        "-XXdef -Xmx700m", "-XXabc -Xmx200m", "-XXxyz -Xmx300m",
+-                        "-XXdef -Xmx50m");
+-    
+-    // test heap opts with default opts (single value)
+-    testJavaHeapOptions("-Xmx10m", "-Xmx20m", "-Xmx50m", "-Xms2m", 
+-                        "-Xms3m", "-Xms5m", "-Xms2m -Xmx10m", "-Xms3m -Xmx20m",
+-                        "-Xms5m -Xmx50m");
+-    
+-    // test heap opts with default opts (duplication of -Xmx)
+-    testJavaHeapOptions("-Xmx10m", "-Xmx20m", "-Xmx50m", "-Xmx2m", 
+-                        "-Xmx3m", "-Xmx5m", "-Xmx10m", "-Xmx20m", "-Xmx50m");
+-  }
+-  
+-  /**
+-   * Test disabled task heap options configuration in {@link GridmixJob}.
+-   */
+-  @Test
+-  @SuppressWarnings("deprecation")
+-  public void testJavaHeapOptionsDisabled() throws Exception {
+-    Configuration gridmixConf = new Configuration();
+-    gridmixConf.setBoolean(GridmixJob.GRIDMIX_TASK_JVM_OPTIONS_ENABLE, false);
+-    
+-    // set the default values of simulated job
+-    gridmixConf.set(MRJobConfig.MAP_JAVA_OPTS, "-Xmx1m");
+-    gridmixConf.set(MRJobConfig.REDUCE_JAVA_OPTS, "-Xmx2m");
+-    gridmixConf.set(JobConf.MAPRED_TASK_JAVA_OPTS, "-Xmx3m");
+-    
+-    // set the default map and reduce task options for original job
+-    final JobConf originalConf = new JobConf();
+-    originalConf.set(MRJobConfig.MAP_JAVA_OPTS, "-Xmx10m");
+-    originalConf.set(MRJobConfig.REDUCE_JAVA_OPTS, "-Xmx20m");
+-    originalConf.set(JobConf.MAPRED_TASK_JAVA_OPTS, "-Xmx30m");
+-    
+-    // define a mock job
+-    MockJob story = new MockJob(originalConf) {
+-      public JobConf getJobConf() {
+-        return originalConf;
+-      }
+-    };
+-    
+-    GridmixJob job = new DummyGridmixJob(gridmixConf, story);
+-    Job simulatedJob = job.getJob();
+-    Configuration simulatedConf = simulatedJob.getConfiguration();
+-    
+-    assertEquals("Map heap options works when disabled!", "-Xmx1m", 
+-                 simulatedConf.get(MRJobConfig.MAP_JAVA_OPTS));
+-    assertEquals("Reduce heap options works when disabled!", "-Xmx2m", 
+-                 simulatedConf.get(MRJobConfig.REDUCE_JAVA_OPTS));
+-    assertEquals("Task heap options works when disabled!", "-Xmx3m", 
+-                 simulatedConf.get(JobConf.MAPRED_TASK_JAVA_OPTS));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
+deleted file mode 100644
+index ddd98df94cc..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java
++++ /dev/null
+@@ -1,278 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.util.Arrays;
+-import java.util.Random;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.WritableComparator;
+-import org.apache.hadoop.io.WritableUtils;
+-
+-public class TestGridmixRecord {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestGridmixRecord.class);
+-
+-  static void lengthTest(GridmixRecord x, GridmixRecord y, int min,
+-      int max) throws Exception {
+-    final Random r = new Random();
+-    final long seed = r.nextLong();
+-    r.setSeed(seed);
+-    LOG.info("length: " + seed);
+-    final DataInputBuffer in = new DataInputBuffer();
+-    final DataOutputBuffer out1 = new DataOutputBuffer();
+-    final DataOutputBuffer out2 = new DataOutputBuffer();
+-    for (int i = min; i < max; ++i) {
+-      setSerialize(x, r.nextLong(), i, out1);
+-      // check write
+-      assertEquals(i, out1.getLength());
+-      // write to stream
+-      x.write(out2);
+-      // check read
+-      in.reset(out1.getData(), 0, out1.getLength());
+-      y.readFields(in);
+-      assertEquals(i, x.getSize());
+-      assertEquals(i, y.getSize());
+-    }
+-    // check stream read
+-    in.reset(out2.getData(), 0, out2.getLength());
+-    for (int i = min; i < max; ++i) {
+-      y.readFields(in);
+-      assertEquals(i, y.getSize());
+-    }
+-  }
+-
+-  static void randomReplayTest(GridmixRecord x, GridmixRecord y, int min,
+-      int max) throws Exception {
+-    final Random r = new Random();
+-    final long seed = r.nextLong();
+-    r.setSeed(seed);
+-    LOG.info("randReplay: " + seed);
+-    final DataOutputBuffer out1 = new DataOutputBuffer();
+-    for (int i = min; i < max; ++i) {
+-      final int s = out1.getLength();
+-      x.setSeed(r.nextLong());
+-      x.setSize(i);
+-      x.write(out1);
+-      assertEquals(i, out1.getLength() - s);
+-    }
+-    final DataInputBuffer in = new DataInputBuffer();
+-    in.reset(out1.getData(), 0, out1.getLength());
+-    final DataOutputBuffer out2 = new DataOutputBuffer();
+-    // deserialize written records, write to separate buffer
+-    for (int i = min; i < max; ++i) {
+-      final int s = in.getPosition();
+-      y.readFields(in);
+-      assertEquals(i, in.getPosition() - s);
+-      y.write(out2);
+-    }
+-    // verify written contents match
+-    assertEquals(out1.getLength(), out2.getLength());
+-    // assumes that writes will grow buffer deterministically
+-    assertEquals("Bad test", out1.getData().length, out2.getData().length);
+-    assertArrayEquals(out1.getData(), out2.getData());
+-  }
+-
+-  static void eqSeedTest(GridmixRecord x, GridmixRecord y, int max)
+-      throws Exception {
+-    final Random r = new Random();
+-    final long s = r.nextLong();
+-    r.setSeed(s);
+-    LOG.info("eqSeed: " + s);
+-    assertEquals(x.fixedBytes(), y.fixedBytes());
+-    final int min = x.fixedBytes() + 1;
+-    final DataOutputBuffer out1 = new DataOutputBuffer();
+-    final DataOutputBuffer out2 = new DataOutputBuffer();
+-    for (int i = min; i < max; ++i) {
+-      final long seed = r.nextLong();
+-      setSerialize(x, seed, i, out1);
+-      setSerialize(y, seed, i, out2);
+-      assertEquals(x, y);
+-      assertEquals(x.hashCode(), y.hashCode());
+-
+-      // verify written contents match
+-      assertEquals(out1.getLength(), out2.getLength());
+-      // assumes that writes will grow buffer deterministically
+-      assertEquals("Bad test", out1.getData().length, out2.getData().length);
+-      assertArrayEquals(out1.getData(), out2.getData());
+-    }
+-  }
+-
+-  static void binSortTest(GridmixRecord x, GridmixRecord y, int min,
+-      int max, WritableComparator cmp) throws Exception {
+-    final Random r = new Random();
+-    final long s = r.nextLong();
+-    r.setSeed(s);
+-    LOG.info("sort: " + s);
+-    final DataOutputBuffer out1 = new DataOutputBuffer();
+-    final DataOutputBuffer out2 = new DataOutputBuffer();
+-    for (int i = min; i < max; ++i) {
+-      final long seed1 = r.nextLong();
+-      setSerialize(x, seed1, i, out1);
+-      assertEquals(0, x.compareSeed(seed1, Math.max(0, i - x.fixedBytes())));
+-
+-      final long seed2 = r.nextLong();
+-      setSerialize(y, seed2, i, out2);
+-      assertEquals(0, y.compareSeed(seed2, Math.max(0, i - x.fixedBytes())));
+-
+-      // for eq sized records, ensure byte cmp where req
+-      final int chk = WritableComparator.compareBytes(
+-          out1.getData(), 0, out1.getLength(),
+-          out2.getData(), 0, out2.getLength());
+-      assertEquals(Integer.signum(chk), Integer.signum(x.compareTo(y)));
+-      assertEquals(Integer.signum(chk), Integer.signum(cmp.compare(
+-            out1.getData(), 0, out1.getLength(),
+-            out2.getData(), 0, out2.getLength())));
+-      // write second copy, compare eq
+-      final int s1 = out1.getLength();
+-      x.write(out1);
+-      assertEquals(0, cmp.compare(out1.getData(), 0, s1,
+-            out1.getData(), s1, out1.getLength() - s1));
+-      final int s2 = out2.getLength();
+-      y.write(out2);
+-      assertEquals(0, cmp.compare(out2.getData(), 0, s2,
+-            out2.getData(), s2, out2.getLength() - s2));
+-      assertEquals(Integer.signum(chk), Integer.signum(cmp.compare(out1.getData(), 0, s1,
+-            out2.getData(), s2, out2.getLength() - s2)));
+-    }
+-  }
+-
+-  static void checkSpec(GridmixKey a, GridmixKey b) throws Exception {
+-    final Random r = new Random();
+-    final long s = r.nextLong();
+-    r.setSeed(s);
+-    LOG.info("spec: " + s);
+-    final DataInputBuffer in = new DataInputBuffer();
+-    final DataOutputBuffer out = new DataOutputBuffer();
+-    a.setType(GridmixKey.REDUCE_SPEC);
+-    b.setType(GridmixKey.REDUCE_SPEC);
+-    for (int i = 0; i < 100; ++i) {
+-      final int in_rec = r.nextInt(Integer.MAX_VALUE);
+-      a.setReduceInputRecords(in_rec);
+-      final int out_rec = r.nextInt(Integer.MAX_VALUE);
+-      a.setReduceOutputRecords(out_rec);
+-      final int out_bytes = r.nextInt(Integer.MAX_VALUE);
+-      a.setReduceOutputBytes(out_bytes);
+-      final int min = WritableUtils.getVIntSize(in_rec)
+-                    + WritableUtils.getVIntSize(out_rec)
+-                    + WritableUtils.getVIntSize(out_bytes)
+-                    + WritableUtils.getVIntSize(0);
+-      assertEquals(min + 2, a.fixedBytes()); // meta + vint min
+-      final int size = r.nextInt(1024) + a.fixedBytes() + 1;
+-      setSerialize(a, r.nextLong(), size, out);
+-      assertEquals(size, out.getLength());
+-      assertTrue(a.equals(a));
+-      assertEquals(0, a.compareTo(a));
+-
+-      in.reset(out.getData(), 0, out.getLength());
+-
+-      b.readFields(in);
+-      assertEquals(size, b.getSize());
+-      assertEquals(in_rec, b.getReduceInputRecords());
+-      assertEquals(out_rec, b.getReduceOutputRecords());
+-      assertEquals(out_bytes, b.getReduceOutputBytes());
+-      assertTrue(a.equals(b));
+-      assertEquals(0, a.compareTo(b));
+-      assertEquals(a.hashCode(), b.hashCode());
+-    }
+-  }
+-
+-  static void setSerialize(GridmixRecord x, long seed, int size,
+-      DataOutputBuffer out) throws IOException {
+-    x.setSeed(seed);
+-    x.setSize(size);
+-    out.reset();
+-    x.write(out);
+-  }
+-
+-  @Test
+-  public void testKeySpec() throws Exception {
+-    final int min = 6;
+-    final int max = 300;
+-    final GridmixKey a = new GridmixKey(GridmixKey.REDUCE_SPEC, 1, 0L);
+-    final GridmixKey b = new GridmixKey(GridmixKey.REDUCE_SPEC, 1, 0L);
+-    lengthTest(a, b, min, max);
+-    randomReplayTest(a, b, min, max);
+-    binSortTest(a, b, min, max, new GridmixKey.Comparator());
+-    // 2 fixed GR bytes, 1 type, 3 spec
+-    eqSeedTest(a, b, max);
+-    checkSpec(a, b);
+-  }
+-
+-  @Test
+-  public void testKeyData() throws Exception {
+-    final int min = 2;
+-    final int max = 300;
+-    final GridmixKey a = new GridmixKey(GridmixKey.DATA, 1, 0L);
+-    final GridmixKey b = new GridmixKey(GridmixKey.DATA, 1, 0L);
+-    lengthTest(a, b, min, max);
+-    randomReplayTest(a, b, min, max);
+-    binSortTest(a, b, min, max, new GridmixKey.Comparator());
+-    // 2 fixed GR bytes, 1 type
+-    eqSeedTest(a, b, 300);
+-  }
+-
+-  @Test
+-  public void testBaseRecord() throws Exception {
+-    final int min = 1;
+-    final int max = 300;
+-    final GridmixRecord a = new GridmixRecord();
+-    final GridmixRecord b = new GridmixRecord();
+-    lengthTest(a, b, min, max);
+-    randomReplayTest(a, b, min, max);
+-    binSortTest(a, b, min, max, new GridmixRecord.Comparator());
+-    // 2 fixed GR bytes
+-    eqSeedTest(a, b, 300);
+-  }
+-
+-  public static void main(String[] argv) throws Exception {
+-    boolean fail = false;
+-    final TestGridmixRecord test = new TestGridmixRecord();
+-    try { test.testKeySpec(); } catch (Exception e) {
+-      fail = true;
+-      e.printStackTrace();
+-    }
+-    try {test.testKeyData(); } catch (Exception e) {
+-      fail = true;
+-      e.printStackTrace();
+-    }
+-    try {test.testBaseRecord(); } catch (Exception e) {
+-      fail = true;
+-      e.printStackTrace();
+-    }
+-    System.exit(fail ? -1 : 0);
+-  }
+-
+-  static void printDebug(GridmixRecord a, GridmixRecord b) throws IOException {
+-    DataOutputBuffer out = new DataOutputBuffer();
+-    a.write(out);
+-    System.out.println("A " +
+-        Arrays.toString(Arrays.copyOf(out.getData(), out.getLength())));
+-    out.reset();
+-    b.write(out);
+-    System.out.println("B " +
+-        Arrays.toString(Arrays.copyOf(out.getData(), out.getLength())));
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
+deleted file mode 100644
+index f84984346ea..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java
++++ /dev/null
+@@ -1,203 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.slf4j.event.Level;
+-
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.InputStream;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.util.zip.GZIPInputStream;
+-
+-import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains;
+-import static org.junit.Assert.*;
+-import static org.slf4j.LoggerFactory.getLogger;
+-
+-public class TestGridmixSubmission extends CommonJobTest {
+-  private static File inSpace = new File("src" + File.separator + "test"
+-          + File.separator + "resources" + File.separator + "data");
+-
+-
+-  static {
+-    GenericTestUtils.setLogLevel(
+-        getLogger("org.apache.hadoop.mapred.gridmix"), Level.DEBUG);
+-  }
+-
+-
+-  @BeforeClass
+-  public static void init() throws IOException {
+-    GridmixTestUtils.initCluster(TestGridmixSubmission.class);
+-
+-    System.setProperty("src.test.data", inSpace.getAbsolutePath());
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws IOException {
+-    GridmixTestUtils.shutdownCluster();
+-  }
+-
+-  /**
+-   * Verifies that the given {@code JobStory} corresponds to the checked-in
+-   * WordCount {@code JobStory}. The verification is effected via JUnit
+-   * assertions.
+-   *
+-   * @param js the candidate JobStory.
+-   */
+-  private void verifyWordCountJobStory(JobStory js) {
+-    assertNotNull("Null JobStory", js);
+-    String expectedJobStory = "WordCount:johndoe:default:1285322645148:3:1";
+-    String actualJobStory = js.getName() + ":" + js.getUser() + ":"
+-            + js.getQueueName() + ":" + js.getSubmissionTime() + ":"
+-            + js.getNumberMaps() + ":" + js.getNumberReduces();
+-    assertEquals("Unexpected JobStory", expectedJobStory, actualJobStory);
+-  }
+-
+-  /**
+-   * Expands a file compressed using {@code gzip}.
+-   *
+-   * @param fs  the {@code FileSystem} corresponding to the given file.
+-   * @param in  the path to the compressed file.
+-   * @param out the path to the uncompressed output.
+-   * @throws Exception if there was an error during the operation.
+-   */
+-  private void expandGzippedTrace(FileSystem fs, Path in, Path out)
+-          throws Exception {
+-    byte[] buff = new byte[4096];
+-    GZIPInputStream gis = new GZIPInputStream(fs.open(in));
+-    FSDataOutputStream fsdOs = fs.create(out);
+-    int numRead;
+-    while ((numRead = gis.read(buff, 0, buff.length)) != -1) {
+-      fsdOs.write(buff, 0, numRead);
+-    }
+-    gis.close();
+-    fsdOs.close();
+-  }
+-
+-  /**
+-   * Tests the reading of traces in GridMix3. These traces are generated by
+-   * Rumen and are in the JSON format. The traces can optionally be compressed
+-   * and uncompressed traces can also be passed to GridMix3 via its standard
+-   * input stream. The testing is effected via JUnit assertions.
+-   *
+-   * @throws Exception if there was an error.
+-   */
+-  @Test (timeout=20000)
+-  public void testTraceReader() throws Exception {
+-    Configuration conf = new Configuration();
+-    FileSystem lfs = FileSystem.getLocal(conf);
+-    Path rootInputDir = new Path(System.getProperty("src.test.data"));
+-    rootInputDir = rootInputDir.makeQualified(lfs.getUri(),
+-            lfs.getWorkingDirectory());
+-    Path rootTempDir = new Path(System.getProperty("test.build.data",
+-            System.getProperty("java.io.tmpdir")), "testTraceReader");
+-    rootTempDir = rootTempDir.makeQualified(lfs.getUri(),
+-            lfs.getWorkingDirectory());
+-    Path inputFile = new Path(rootInputDir, "wordcount.json.gz");
+-    Path tempFile = new Path(rootTempDir, "gridmix3-wc.json");
+-
+-    InputStream origStdIn = System.in;
+-    InputStream tmpIs = null;
+-    try {
+-      DebugGridmix dgm = new DebugGridmix();
+-      JobStoryProducer jsp = dgm.createJobStoryProducer(inputFile.toString(),
+-              conf);
+-
+-      LOG.info("Verifying JobStory from compressed trace...");
+-      verifyWordCountJobStory(jsp.getNextJob());
+-
+-      expandGzippedTrace(lfs, inputFile, tempFile);
+-      jsp = dgm.createJobStoryProducer(tempFile.toString(), conf);
+-      LOG.info("Verifying JobStory from uncompressed trace...");
+-      verifyWordCountJobStory(jsp.getNextJob());
+-
+-      tmpIs = lfs.open(tempFile);
+-      System.setIn(tmpIs);
+-      LOG.info("Verifying JobStory from trace in standard input...");
+-      jsp = dgm.createJobStoryProducer("-", conf);
+-      verifyWordCountJobStory(jsp.getNextJob());
+-    } finally {
+-      System.setIn(origStdIn);
+-      if (tmpIs != null) {
+-        tmpIs.close();
+-      }
+-      lfs.delete(rootTempDir, true);
+-    }
+-  }
+-
+-  @Test (timeout=500000)
+-  public void testReplaySubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.REPLAY;
+-    LOG.info(" Replay started at " + System.currentTimeMillis());
+-    doSubmission(null, false);
+-    LOG.info(" Replay ended at " + System.currentTimeMillis());
+-
+-  }
+-
+-  @Test (timeout=500000)
+-  public void testStressSubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.STRESS;
+-    LOG.info(" Stress started at " + System.currentTimeMillis());
+-    doSubmission(null, false);
+-    LOG.info(" Stress ended at " + System.currentTimeMillis());
+-  }
+-
+-  // test empty request should be hint message
+-  @Test (timeout=100000)
+-  public void testMain() throws Exception {
+-
+-    SecurityManager securityManager = System.getSecurityManager();
+-
+-    final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+-    final PrintStream out = new PrintStream(bytes);
+-    final PrintStream oldOut = System.out;
+-    System.setErr(out);
+-    ExitUtil.disableSystemExit();
+-    try {
+-      String[] argv = new String[0];
+-      DebugGridmix.main(argv);
+-
+-    } catch (ExitUtil.ExitException e) {
+-      assertExceptionContains(ExitUtil.EXIT_EXCEPTION_MESSAGE, e);
+-      ExitUtil.resetFirstExitException();
+-    } finally {
+-      System.setErr(oldOut);
+-      System.setSecurityManager(securityManager);
+-    }
+-    String print = bytes.toString();
+-    // should be printed tip in std error stream
+-    assertTrue(print
+-            .contains("Usage: gridmix [-generate <MiB>] [-users URI] [-Dname=value ...] <iopath> <trace>"));
+-    assertTrue(print.contains("e.g. gridmix -generate 100m foo -"));
+-  }
+-
+- 
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
+deleted file mode 100644
+index f8884625cbd..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestGridmixSummary.java
++++ /dev/null
+@@ -1,391 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.*;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.UtilsForTests;
+-import org.apache.hadoop.mapred.gridmix.GenerateData.DataStatistics;
+-import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats;
+-import org.apache.hadoop.mapred.gridmix.Statistics.JobStats;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.junit.Test;
+-
+-/**
+- * Test {@link ExecutionSummarizer} and {@link ClusterSummarizer}.
+- */
+-public class TestGridmixSummary {
+-  
+-  /**
+-   * Test {@link DataStatistics}.
+-   */
+-  @Test
+-  public void testDataStatistics() throws Exception {
+-    // test data-statistics getters with compression enabled
+-    DataStatistics stats = new DataStatistics(10, 2, true);
+-    assertEquals("Data size mismatch", 10, stats.getDataSize());
+-    assertEquals("Num files mismatch", 2, stats.getNumFiles());
+-    assertTrue("Compression configuration mismatch", stats.isDataCompressed());
+-    
+-    // test data-statistics getters with compression disabled
+-    stats = new DataStatistics(100, 5, false);
+-    assertEquals("Data size mismatch", 100, stats.getDataSize());
+-    assertEquals("Num files mismatch", 5, stats.getNumFiles());
+-    assertFalse("Compression configuration mismatch", stats.isDataCompressed());
+-    
+-    // test publish data stats
+-    Configuration conf = new Configuration();
+-    Path rootTempDir = new Path(System.getProperty("test.build.data", "/tmp"));
+-    Path testDir = new Path(rootTempDir, "testDataStatistics");
+-    FileSystem fs = testDir.getFileSystem(conf);
+-    fs.delete(testDir, true);
+-    Path testInputDir = new Path(testDir, "test");
+-    fs.mkdirs(testInputDir);
+-    
+-    // test empty folder (compression = true)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    Boolean failed = null;
+-    try {
+-      GenerateData.publishDataStatistics(testInputDir, 1024L, conf);
+-      failed = false;
+-    } catch (RuntimeException e) {
+-      failed = true;
+-    }
+-    assertNotNull("Expected failure!", failed);
+-    assertTrue("Compression data publishing error", failed);
+-    
+-    // test with empty folder (compression = off)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, false);
+-    stats = GenerateData.publishDataStatistics(testInputDir, 1024L, conf);
+-    assertEquals("Data size mismatch", 0, stats.getDataSize());
+-    assertEquals("Num files mismatch", 0, stats.getNumFiles());
+-    assertFalse("Compression configuration mismatch", stats.isDataCompressed());
+-    
+-    // test with some plain input data (compression = off)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, false);
+-    Path inputDataFile = new Path(testInputDir, "test");
+-    long size = 
+-      UtilsForTests.createTmpFileDFS(fs, inputDataFile, 
+-          FsPermission.createImmutable((short)777), "hi hello bye").size();
+-    stats = GenerateData.publishDataStatistics(testInputDir, -1, conf);
+-    assertEquals("Data size mismatch", size, stats.getDataSize());
+-    assertEquals("Num files mismatch", 1, stats.getNumFiles());
+-    assertFalse("Compression configuration mismatch", stats.isDataCompressed());
+-    
+-    // test with some plain input data (compression = on)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    failed = null;
+-    try {
+-      GenerateData.publishDataStatistics(testInputDir, 1234L, conf);
+-      failed = false;
+-    } catch (RuntimeException e) {
+-      failed = true;
+-    }
+-    assertNotNull("Expected failure!", failed);
+-    assertTrue("Compression data publishing error", failed);
+-    
+-    // test with some compressed input data (compression = off)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, false);
+-    fs.delete(inputDataFile, false);
+-    inputDataFile = new Path(testInputDir, "test.gz");
+-    size = 
+-      UtilsForTests.createTmpFileDFS(fs, inputDataFile, 
+-          FsPermission.createImmutable((short)777), "hi hello").size();
+-    stats =  GenerateData.publishDataStatistics(testInputDir, 1234L, conf);
+-    assertEquals("Data size mismatch", size, stats.getDataSize());
+-    assertEquals("Num files mismatch", 1, stats.getNumFiles());
+-    assertFalse("Compression configuration mismatch", stats.isDataCompressed());
+-    
+-    // test with some compressed input data (compression = on)
+-    CompressionEmulationUtil.setCompressionEmulationEnabled(conf, true);
+-    stats = GenerateData.publishDataStatistics(testInputDir, 1234L, conf);
+-    assertEquals("Data size mismatch", size, stats.getDataSize());
+-    assertEquals("Num files mismatch", 1, stats.getNumFiles());
+-    assertTrue("Compression configuration mismatch", stats.isDataCompressed());
+-  }
+-  
+-  /**
+-   * A fake {@link JobFactory}.
+-   */
+-  @SuppressWarnings("rawtypes")
+-  private static class FakeJobFactory extends JobFactory {
+-    /**
+-     * A fake {@link JobStoryProducer} for {@link FakeJobFactory}.
+-     */
+-    private static class FakeJobStoryProducer implements JobStoryProducer {
+-      @Override
+-      public void close() throws IOException {
+-      }
+-
+-      @Override
+-      public JobStory getNextJob() throws IOException {
+-        return null;
+-      }
+-    }
+-    
+-    FakeJobFactory(Configuration conf) {
+-      super(null, new FakeJobStoryProducer(), null, conf, null, null);
+-    }
+-    
+-    @Override
+-    public void update(Object item) {
+-    }
+-    
+-    @Override
+-    protected Thread createReaderThread() {
+-      return new Thread();
+-    }
+-  }
+-  
+-  /**
+-   * Test {@link ExecutionSummarizer}.
+-   */
+-  @Test
+-  @SuppressWarnings({ "unchecked", "rawtypes" })
+-  public void testExecutionSummarizer() throws IOException {
+-    Configuration conf = new Configuration();
+-    
+-    ExecutionSummarizer es = new ExecutionSummarizer();
+-    assertEquals("ExecutionSummarizer init failed", 
+-                 Summarizer.NA, es.getCommandLineArgsString());
+-    
+-    long startTime = System.currentTimeMillis();
+-    // test configuration parameters
+-    String[] initArgs = new String[] {"-Xmx20m", "-Dtest.args='test'"};
+-    es = new ExecutionSummarizer(initArgs);
+-    
+-    assertEquals("ExecutionSummarizer init failed", 
+-                 "-Xmx20m -Dtest.args='test'", 
+-                 es.getCommandLineArgsString());
+-    
+-    // test start time
+-    assertTrue("Start time mismatch", es.getStartTime() >= startTime);
+-    assertTrue("Start time mismatch", 
+-               es.getStartTime() <= System.currentTimeMillis());
+-    
+-    // test start() of ExecutionSummarizer
+-    es.update(null);
+-    assertEquals("ExecutionSummarizer init failed", 0, 
+-                 es.getSimulationStartTime());
+-    testExecutionSummarizer(0, 0, 0, 0, 0, 0, 0, es);
+-    
+-    long simStartTime = System.currentTimeMillis();
+-    es.start(null);
+-    assertTrue("Simulation start time mismatch", 
+-               es.getSimulationStartTime() >= simStartTime);
+-    assertTrue("Simulation start time mismatch", 
+-               es.getSimulationStartTime() <= System.currentTimeMillis());
+-    
+-    // test with job stats
+-    JobStats stats = generateFakeJobStats(1, 10, true, false);
+-    es.update(stats);
+-    testExecutionSummarizer(1, 10, 0, 1, 1, 0, 0, es);
+-    
+-    // test with failed job 
+-    stats = generateFakeJobStats(5, 1, false, false);
+-    es.update(stats);
+-    testExecutionSummarizer(6, 11, 0, 2, 1, 1, 0, es);
+-    
+-    // test with successful but lost job 
+-    stats = generateFakeJobStats(1, 1, true, true);
+-    es.update(stats);
+-    testExecutionSummarizer(7, 12, 0, 3, 1, 1, 1, es);
+-    
+-    // test with failed but lost job 
+-    stats = generateFakeJobStats(2, 2, false, true);
+-    es.update(stats);
+-    testExecutionSummarizer(9, 14, 0, 4, 1, 1, 2, es);
+-    
+-    // test finalize
+-    //  define a fake job factory
+-    JobFactory factory = new FakeJobFactory(conf);
+-    
+-    // fake the num jobs in trace
+-    factory.numJobsInTrace = 3;
+-    
+-    Path rootTempDir = new Path(System.getProperty("test.build.data", "/tmp"));
+-    Path testDir = new Path(rootTempDir, "testGridmixSummary");
+-    Path testTraceFile = new Path(testDir, "test-trace.json");
+-    FileSystem fs = FileSystem.getLocal(conf);
+-    fs.create(testTraceFile).close();
+-    
+-    // finalize the summarizer
+-    UserResolver resolver = new RoundRobinUserResolver();
+-    DataStatistics dataStats = new DataStatistics(100, 2, true);
+-    String policy = GridmixJobSubmissionPolicy.REPLAY.name();
+-    conf.set(GridmixJobSubmissionPolicy.JOB_SUBMISSION_POLICY, policy);
+-    es.finalize(factory, testTraceFile.toString(), 1024L, resolver, dataStats, 
+-                conf);
+-    
+-    // test num jobs in trace
+-    assertEquals("Mismtach in num jobs in trace", 3, es.getNumJobsInTrace());
+-    
+-    // test trace signature
+-    String tid = 
+-      ExecutionSummarizer.getTraceSignature(testTraceFile.toString());
+-    assertEquals("Mismatch in trace signature", 
+-                 tid, es.getInputTraceSignature());
+-    // test trace location
+-    Path qPath = fs.makeQualified(testTraceFile);
+-    assertEquals("Mismatch in trace filename", 
+-                 qPath.toString(), es.getInputTraceLocation());
+-    // test expected data size
+-    assertEquals("Mismatch in expected data size", 
+-                 "1 K", es.getExpectedDataSize());
+-    // test input data statistics
+-    assertEquals("Mismatch in input data statistics", 
+-                 ExecutionSummarizer.stringifyDataStatistics(dataStats), 
+-                 es.getInputDataStatistics());
+-    // test user resolver
+-    assertEquals("Mismatch in user resolver", 
+-                 resolver.getClass().getName(), es.getUserResolver());
+-    // test policy
+-    assertEquals("Mismatch in policy", policy, es.getJobSubmissionPolicy());
+-    
+-    // test data stringification using large data
+-    es.finalize(factory, testTraceFile.toString(), 1024*1024*1024*10L, resolver,
+-                dataStats, conf);
+-    assertEquals("Mismatch in expected data size", 
+-                 "10 G", es.getExpectedDataSize());
+-    
+-    // test trace signature uniqueness
+-    //  touch the trace file
+-    fs.delete(testTraceFile, false);
+-    //  sleep for 1 sec
+-    try {
+-      Thread.sleep(1000);
+-    } catch (InterruptedException ie) {}
+-    fs.create(testTraceFile).close();
+-    es.finalize(factory, testTraceFile.toString(), 0L, resolver, dataStats, 
+-                conf);
+-    // test missing expected data size
+-    assertEquals("Mismatch in trace data size", 
+-                 Summarizer.NA, es.getExpectedDataSize());
+-    assertFalse("Mismatch in trace signature", 
+-                tid.equals(es.getInputTraceSignature()));
+-    // get the new identifier
+-    tid = ExecutionSummarizer.getTraceSignature(testTraceFile.toString());
+-    assertEquals("Mismatch in trace signature", 
+-                 tid, es.getInputTraceSignature());
+-    
+-    testTraceFile = new Path(testDir, "test-trace2.json");
+-    fs.create(testTraceFile).close();
+-    es.finalize(factory, testTraceFile.toString(), 0L, resolver, dataStats, 
+-                conf);
+-    assertFalse("Mismatch in trace signature", 
+-                tid.equals(es.getInputTraceSignature()));
+-    // get the new identifier
+-    tid = ExecutionSummarizer.getTraceSignature(testTraceFile.toString());
+-    assertEquals("Mismatch in trace signature", 
+-                 tid, es.getInputTraceSignature());
+-    
+-    // finalize trace identifier '-' input
+-    es.finalize(factory, "-", 0L, resolver, dataStats, conf);
+-    assertEquals("Mismatch in trace signature",
+-                 Summarizer.NA, es.getInputTraceSignature());
+-    assertEquals("Mismatch in trace file location", 
+-                 Summarizer.NA, es.getInputTraceLocation());
+-  }
+-  
+-  // test the ExecutionSummarizer
+-  private static void testExecutionSummarizer(int numMaps, int numReds,
+-      int totalJobsInTrace, int totalJobSubmitted, int numSuccessfulJob, 
+-      int numFailedJobs, int numLostJobs, ExecutionSummarizer es) {
+-    assertEquals("ExecutionSummarizer test failed [num-maps]", 
+-                 numMaps, es.getNumMapTasksLaunched());
+-    assertEquals("ExecutionSummarizer test failed [num-reducers]", 
+-                 numReds, es.getNumReduceTasksLaunched());
+-    assertEquals("ExecutionSummarizer test failed [num-jobs-in-trace]", 
+-                 totalJobsInTrace, es.getNumJobsInTrace());
+-    assertEquals("ExecutionSummarizer test failed [num-submitted jobs]", 
+-                 totalJobSubmitted, es.getNumSubmittedJobs());
+-    assertEquals("ExecutionSummarizer test failed [num-successful-jobs]", 
+-                 numSuccessfulJob, es.getNumSuccessfulJobs());
+-    assertEquals("ExecutionSummarizer test failed [num-failed jobs]", 
+-                 numFailedJobs, es.getNumFailedJobs());
+-    assertEquals("ExecutionSummarizer test failed [num-lost jobs]", 
+-                 numLostJobs, es.getNumLostJobs());
+-  }
+-  
+-  // generate fake job stats
+-  @SuppressWarnings("deprecation")
+-  private static JobStats generateFakeJobStats(final int numMaps, 
+-      final int numReds, final boolean isSuccessful, final boolean lost) 
+-  throws IOException {
+-    // A fake job 
+-    Job fakeJob = new Job() {
+-      @Override
+-      public int getNumReduceTasks() {
+-        return numReds;
+-      };
+-      
+-      @Override
+-      public boolean isSuccessful() throws IOException {
+-        if (lost) {
+-          throw new IOException("Test failure!");
+-        }
+-        return isSuccessful;
+-      };
+-    };
+-    return new JobStats(numMaps, numReds, fakeJob);
+-  }
+-  
+-  /**
+-   * Test {@link ClusterSummarizer}.
+-   */
+-  @Test
+-  public void testClusterSummarizer() throws IOException {
+-    ClusterSummarizer cs = new ClusterSummarizer();
+-    Configuration conf = new Configuration();
+-    
+-    String jt = "test-jt:1234";
+-    String nn = "test-nn:5678";
+-    conf.set(JTConfig.JT_IPC_ADDRESS, jt);
+-    conf.set(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY, nn);
+-    cs.start(conf);
+-    
+-    assertEquals("JT name mismatch", jt, cs.getJobTrackerInfo());
+-    assertEquals("NN name mismatch", nn, cs.getNamenodeInfo());
+-    
+-    ClusterStats cStats = ClusterStats.getClusterStats();
+-    conf.set(JTConfig.JT_IPC_ADDRESS, "local");
+-    conf.set(CommonConfigurationKeys.FS_DEFAULT_NAME_KEY, "local");
+-    JobClient jc = new JobClient(conf);
+-    cStats.setClusterMetric(jc.getClusterStatus());
+-    
+-    cs.update(cStats);
+-    
+-    // test
+-    assertEquals("Cluster summary test failed!", 1, cs.getMaxMapTasks());
+-    assertEquals("Cluster summary test failed!", 1, cs.getMaxReduceTasks());
+-    assertEquals("Cluster summary test failed!", 1, cs.getNumActiveTrackers());
+-    assertEquals("Cluster summary test failed!", 0, 
+-                 cs.getNumBlacklistedTrackers());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
+deleted file mode 100644
+index 179c94112d3..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestHighRamJob.java
++++ /dev/null
+@@ -1,194 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.*;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.gridmix.DebugJobProducer.MockJob;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRConfig;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.junit.Test;
+-
+-/**
+- * Test if Gridmix correctly configures the simulated job's configuration for
+- * high ram job properties.
+- */
+-public class TestHighRamJob {
+-  /**
+-   * A dummy {@link GridmixJob} that opens up the simulated job for testing.
+-   */
+-  protected static class DummyGridmixJob extends GridmixJob {
+-    public DummyGridmixJob(Configuration conf, JobStory desc) 
+-    throws IOException {
+-      super(conf, System.currentTimeMillis(), desc, new Path("test"), 
+-            UserGroupInformation.getCurrentUser(), -1);
+-    }
+-    
+-    /**
+-     * Do nothing since this is a dummy gridmix job.
+-     */
+-    @Override
+-    public Job call() throws Exception {
+-      return null;
+-    }
+-    
+-    @Override
+-    protected boolean canEmulateCompression() {
+-      // return false as we don't need compression
+-      return false;
+-    }
+-    
+-    protected Job getJob() {
+-      // open the simulated job for testing
+-      return job;
+-    }
+-  }
+-  
+-  private static void testHighRamConfig(long jobMapMB, long jobReduceMB, 
+-      long clusterMapMB, long clusterReduceMB, long simulatedClusterMapMB, 
+-      long simulatedClusterReduceMB, long expectedMapMB, long expectedReduceMB, 
+-      Configuration gConf) 
+-  throws IOException {
+-    Configuration simulatedJobConf = new Configuration(gConf);
+-    simulatedJobConf.setLong(MRConfig.MAPMEMORY_MB, simulatedClusterMapMB);
+-    simulatedJobConf.setLong(MRConfig.REDUCEMEMORY_MB, 
+-                             simulatedClusterReduceMB);
+-    
+-    // define a source conf
+-    Configuration sourceConf = new Configuration();
+-    
+-    // configure the original job
+-    sourceConf.setLong(MRJobConfig.MAP_MEMORY_MB, jobMapMB);
+-    sourceConf.setLong(MRConfig.MAPMEMORY_MB, clusterMapMB);
+-    sourceConf.setLong(MRJobConfig.REDUCE_MEMORY_MB, jobReduceMB);
+-    sourceConf.setLong(MRConfig.REDUCEMEMORY_MB, clusterReduceMB);
+-    
+-    // define a mock job
+-    MockJob story = new MockJob(sourceConf);
+-    
+-    GridmixJob job = new DummyGridmixJob(simulatedJobConf, story);
+-    Job simulatedJob = job.getJob();
+-    JobConf simulatedConf = (JobConf)simulatedJob.getConfiguration();
+-    
+-    // check if the high ram properties are not set
+-    assertEquals(expectedMapMB, 
+-                 simulatedConf.getMemoryRequired(TaskType.MAP));
+-    assertEquals(expectedReduceMB, 
+-                 simulatedConf.getMemoryRequired(TaskType.REDUCE));
+-  }
+-  
+-  /**
+-   * Tests high ram job properties configuration.
+-   */
+-  @SuppressWarnings("deprecation")
+-  @Test
+-  public void testHighRamFeatureEmulation() throws IOException {
+-    // define the gridmix conf
+-    Configuration gridmixConf = new Configuration();
+-    
+-    // test : check high ram emulation disabled
+-    gridmixConf.setBoolean(GridmixJob.GRIDMIX_HIGHRAM_EMULATION_ENABLE, false);
+-    testHighRamConfig(10, 20, 5, 10, MRJobConfig.DEFAULT_MAP_MEMORY_MB, 
+-                      MRJobConfig.DEFAULT_REDUCE_MEMORY_MB, 
+-                      MRJobConfig.DEFAULT_MAP_MEMORY_MB, 
+-                      MRJobConfig.DEFAULT_REDUCE_MEMORY_MB, gridmixConf);
+-    
+-    // test : check with high ram enabled (default) and no scaling
+-    gridmixConf = new Configuration();
+-    // set the deprecated max memory limit
+-    gridmixConf.setLong(JobConf.UPPER_LIMIT_ON_TASK_VMEM_PROPERTY, 
+-                        20*1024*1024);
+-    testHighRamConfig(10, 20, 5, 10, 5, 10, 10, 20, gridmixConf);
+-    
+-    // test : check with high ram enabled and scaling
+-    gridmixConf = new Configuration();
+-    // set the new max map/reduce memory limits
+-    gridmixConf.setLong(JTConfig.JT_MAX_MAPMEMORY_MB, 100);
+-    gridmixConf.setLong(JTConfig.JT_MAX_REDUCEMEMORY_MB, 300);
+-    testHighRamConfig(10, 45, 5, 15, 50, 100, 100, 300, gridmixConf);
+-    
+-    // test : check with high ram enabled and map memory scaling mismatch 
+-    //        (deprecated)
+-    gridmixConf = new Configuration();
+-    gridmixConf.setLong(JobConf.UPPER_LIMIT_ON_TASK_VMEM_PROPERTY, 
+-                        70*1024*1024);
+-    Boolean failed = null;
+-    try {
+-      testHighRamConfig(10, 45, 5, 15, 50, 100, 100, 300, gridmixConf);
+-      failed = false;
+-    } catch (Exception e) {
+-      failed = true;
+-    }
+-    assertNotNull(failed);
+-    assertTrue("Exception expected for exceeding map memory limit "
+-               + "(deprecation)!", failed);
+-    
+-    // test : check with high ram enabled and reduce memory scaling mismatch 
+-    //        (deprecated)
+-    gridmixConf = new Configuration();
+-    gridmixConf.setLong(JobConf.UPPER_LIMIT_ON_TASK_VMEM_PROPERTY, 
+-                        150*1024*1024);
+-    failed = null;
+-    try {
+-      testHighRamConfig(10, 45, 5, 15, 50, 100, 100, 300, gridmixConf);
+-      failed = false;
+-    } catch (Exception e) {
+-      failed = true;
+-    }
+-    assertNotNull(failed);
+-    assertTrue("Exception expected for exceeding reduce memory limit "
+-               + "(deprecation)!", failed);
+-    
+-    // test : check with high ram enabled and scaling mismatch on map limits
+-    gridmixConf = new Configuration();
+-    gridmixConf.setLong(JTConfig.JT_MAX_MAPMEMORY_MB, 70);
+-    failed = null;
+-    try {
+-      testHighRamConfig(10, 45, 5, 15, 50, 100, 100, 300, gridmixConf);
+-      failed = false;
+-    } catch (Exception e) {
+-      failed = true;
+-    }
+-    assertNotNull(failed);
+-    assertTrue("Exception expected for exceeding map memory limit!", failed);
+-    
+-    // test : check with high ram enabled and scaling mismatch on reduce 
+-    //        limits
+-    gridmixConf = new Configuration();
+-    gridmixConf.setLong(JTConfig.JT_MAX_REDUCEMEMORY_MB, 200);
+-    failed = null;
+-    try {
+-      testHighRamConfig(10, 45, 5, 15, 50, 100, 100, 300, gridmixConf);
+-      failed = false;
+-    } catch (Exception e) {
+-      failed = true;
+-    }
+-    assertNotNull(failed);
+-    assertTrue("Exception expected for exceeding reduce memory limit!", failed);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestLoadJob.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestLoadJob.java
+deleted file mode 100644
+index 3ed3d4e85ad..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestLoadJob.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.event.Level;
+-
+-import java.io.IOException;
+-
+-import static org.slf4j.LoggerFactory.getLogger;
+-
+-/*
+- Test LoadJob Gridmix sends data to job and after that
+- */
+-public class TestLoadJob extends CommonJobTest {
+-
+-  public static final Logger LOG = getLogger(Gridmix.class);
+-
+-  static {
+-    GenericTestUtils.setLogLevel(
+-        getLogger("org.apache.hadoop.mapred.gridmix"), Level.DEBUG);
+-    GenericTestUtils.setLogLevel(
+-        getLogger(StressJobFactory.class), Level.DEBUG);
+-  }
+-
+-
+-  @BeforeClass
+-  public static void init() throws IOException {
+-    GridmixTestUtils.initCluster(TestLoadJob.class);
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws IOException {
+-    GridmixTestUtils.shutdownCluster();
+-  }
+-
+-
+-  /*
+-  * test serial policy  with LoadJob. Task should execute without exceptions
+-  */
+-  @Test (timeout=500000)
+-  public void testSerialSubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.SERIAL;
+-    LOG.info("Serial started at " + System.currentTimeMillis());
+-    doSubmission(JobCreator.LOADJOB.name(), false);
+-
+-    LOG.info("Serial ended at " + System.currentTimeMillis());
+-  }
+-
+-  /*
+-   * test reply policy with LoadJob
+-   */
+-  @Test  (timeout=500000)
+-  public void testReplaySubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.REPLAY;
+-    LOG.info(" Replay started at " + System.currentTimeMillis());
+-    doSubmission(JobCreator.LOADJOB.name(), false);
+-
+-    LOG.info(" Replay ended at " + System.currentTimeMillis());
+-  }
+-
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java
+deleted file mode 100644
+index 7179c5d0dda..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestPseudoLocalFs.java
++++ /dev/null
+@@ -1,233 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.*;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.junit.Test;
+-
+-/**
+- * Test the basic functionality of PseudoLocalFs
+- */
+-public class TestPseudoLocalFs {
+-
+-  /**
+-   * Test if a file on PseudoLocalFs of a specific size can be opened and read.
+-   * Validate the size of the data read.
+-   * Test the read methods of {@link PseudoLocalFs.RandomInputStream}.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testPseudoLocalFsFileSize() throws Exception {
+-    long fileSize = 10000;
+-    Path path = PseudoLocalFs.generateFilePath("myPsedoFile", fileSize);
+-    PseudoLocalFs pfs = new PseudoLocalFs();
+-    pfs.create(path);
+-
+-    // Read 1 byte at a time and validate file size.
+-    InputStream in = pfs.open(path, 0);
+-    long totalSize = 0;
+-
+-    while (in.read() >= 0) {
+-      ++totalSize;
+-    }
+-    in.close();
+-    assertEquals("File size mismatch with read().", fileSize, totalSize);
+-
+-    // Read data from PseudoLocalFs-based file into buffer to
+-    // validate read(byte[]) and file size.
+-    in = pfs.open(path, 0);
+-    totalSize = 0;
+-    byte[] b = new byte[1024];
+-    int bytesRead = in.read(b);
+-    while (bytesRead >= 0) {
+-      totalSize += bytesRead;
+-      bytesRead = in.read(b);
+-    }
+-    assertEquals("File size mismatch with read(byte[]).", fileSize, totalSize);
+-  }
+-
+-  /**
+-   * Validate if file status is obtained for correctly formed file paths on
+-   * PseudoLocalFs and also verify if appropriate exception is thrown for
+-   * invalid file paths.
+-   * @param pfs Pseudo Local File System
+-   * @param path file path for which getFileStatus() is to be called
+-   * @param shouldSucceed <code>true</code> if getFileStatus() should succeed
+-   * @throws IOException
+-   */
+-  private void validateGetFileStatus(FileSystem pfs, Path path,
+-      boolean shouldSucceed) throws IOException {
+-    boolean expectedExceptionSeen = false;
+-    FileStatus stat = null;
+-    try {
+-      stat = pfs.getFileStatus(path);
+-    } catch(FileNotFoundException e) {
+-      expectedExceptionSeen = true;
+-    }
+-    if (shouldSucceed) {
+-      assertFalse("getFileStatus() has thrown Exception for valid file name "
+-                  + path, expectedExceptionSeen);
+-      assertNotNull("Missing file status for a valid file.", stat);
+-
+-      // validate fileSize
+-      String[] parts = path.toUri().getPath().split("\\.");
+-      long expectedFileSize = Long.parseLong(parts[parts.length - 1]);
+-      assertEquals("Invalid file size.", expectedFileSize, stat.getLen());
+-    } else {
+-      assertTrue("getFileStatus() did not throw Exception for invalid file "
+-                 + " name " + path, expectedExceptionSeen);
+-    }
+-  }
+-
+-  /**
+-   * Validate if file creation succeeds for correctly formed file paths on
+-   * PseudoLocalFs and also verify if appropriate exception is thrown for
+-   * invalid file paths.
+-   * @param pfs Pseudo Local File System
+-   * @param path file path for which create() is to be called
+-   * @param shouldSucceed <code>true</code> if create() should succeed
+-   * @throws IOException
+-   */
+-  private void validateCreate(FileSystem pfs, Path path,
+-      boolean shouldSucceed) throws IOException {
+-    boolean expectedExceptionSeen = false;
+-    try {
+-      pfs.create(path);
+-    } catch(IOException e) {
+-      expectedExceptionSeen = true;
+-    }
+-    if (shouldSucceed) {
+-      assertFalse("create() has thrown Exception for valid file name "
+-                  + path, expectedExceptionSeen);
+-    } else {
+-      assertTrue("create() did not throw Exception for invalid file name "
+-                 + path, expectedExceptionSeen);
+-    }
+-  }
+-
+-  /**
+-   * Validate if opening of file succeeds for correctly formed file paths on
+-   * PseudoLocalFs and also verify if appropriate exception is thrown for
+-   * invalid file paths.
+-   * @param pfs Pseudo Local File System
+-   * @param path file path for which open() is to be called
+-   * @param shouldSucceed <code>true</code> if open() should succeed
+-   * @throws IOException
+-   */
+-  private void validateOpen(FileSystem pfs, Path path,
+-      boolean shouldSucceed) throws IOException {
+-    boolean expectedExceptionSeen = false;
+-    try {
+-      pfs.open(path);
+-    } catch(IOException e) {
+-      expectedExceptionSeen = true;
+-    }
+-    if (shouldSucceed) {
+-      assertFalse("open() has thrown Exception for valid file name "
+-                  + path, expectedExceptionSeen);
+-    } else {
+-      assertTrue("open() did not throw Exception for invalid file name "
+-                 + path, expectedExceptionSeen);
+-    }
+-  }
+-
+-  /**
+-   * Validate if exists() returns <code>true</code> for correctly formed file
+-   * paths on PseudoLocalFs and returns <code>false</code> for improperly
+-   * formed file paths.
+-   * @param pfs Pseudo Local File System
+-   * @param path file path for which exists() is to be called
+-   * @param shouldSucceed expected return value of exists(&lt;path&gt;)
+-   * @throws IOException
+-   */
+-  private void validateExists(FileSystem pfs, Path path,
+-      boolean shouldSucceed) throws IOException {
+-    boolean ret = pfs.exists(path);
+-    if (shouldSucceed) {
+-      assertTrue("exists() returned false for valid file name " + path, ret);
+-    } else {
+-      assertFalse("exists() returned true for invalid file name " + path, ret);
+-    }
+-  }
+-
+-  /**
+-   *  Test Pseudo Local File System methods like getFileStatus(), create(),
+-   *  open(), exists() for <li> valid file paths and <li> invalid file paths.
+-   * @throws IOException
+-   */
+-  @Test
+-  public void testPseudoLocalFsFileNames() throws IOException {
+-    PseudoLocalFs pfs = new PseudoLocalFs();
+-    Configuration conf = new Configuration();
+-    conf.setClass("fs.pseudo.impl", PseudoLocalFs.class, FileSystem.class);
+-
+-    Path path = new Path("pseudo:///myPsedoFile.1234");
+-    FileSystem testFs = path.getFileSystem(conf);
+-    assertEquals("Failed to obtain a pseudo local file system object from path",
+-                 pfs.getUri().getScheme(), testFs.getUri().getScheme());
+-
+-    // Validate PseudoLocalFS operations on URI of some other file system
+-    path = new Path("file:///myPsedoFile.12345");
+-    validateGetFileStatus(pfs, path, false);
+-    validateCreate(pfs, path, false);
+-    validateOpen(pfs, path, false);
+-    validateExists(pfs, path, false);
+-
+-    path = new Path("pseudo:///myPsedoFile");//.<fileSize> missing
+-    validateGetFileStatus(pfs, path, false);
+-    validateCreate(pfs, path, false);
+-    validateOpen(pfs, path, false);
+-    validateExists(pfs, path, false);
+-
+-    // thing after final '.' is not a number
+-    path = new Path("pseudo:///myPsedoFile.txt");
+-    validateGetFileStatus(pfs, path, false);
+-    validateCreate(pfs, path, false);
+-    validateOpen(pfs, path, false);
+-    validateExists(pfs, path, false);
+-
+-    // Generate valid file name(relative path) and validate operations on it
+-    long fileSize = 231456;
+-    path = PseudoLocalFs.generateFilePath("my.Psedo.File", fileSize);
+-    // Validate the above generateFilePath()
+-    assertEquals("generateFilePath() failed.", fileSize,
+-                 pfs.validateFileNameFormat(path));
+-
+-    validateGetFileStatus(pfs, path, true);
+-    validateCreate(pfs, path, true);
+-    validateOpen(pfs, path, true);
+-    validateExists(pfs, path, true);
+-
+-    // Validate operations on valid qualified path
+-    path = new Path("myPsedoFile.1237");
+-    path = pfs.makeQualified(path);
+-    validateGetFileStatus(pfs, path, true);
+-    validateCreate(pfs, path, true);
+-    validateOpen(pfs, path, true);
+-    validateExists(pfs, path, true);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java
+deleted file mode 100644
+index 4e85ce28922..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java
++++ /dev/null
+@@ -1,132 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import static org.junit.Assert.*;
+-
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.Set;
+-
+-import org.junit.Test;
+-
+-public class TestRandomAlgorithm {
+-  private static final int[][] parameters = new int[][] {
+-    {5, 1, 1}, 
+-    {10, 1, 2},
+-    {10, 2, 2},
+-    {20, 1, 3},
+-    {20, 2, 3},
+-    {20, 3, 3},
+-    {100, 3, 10},
+-    {100, 3, 100},
+-    {100, 3, 1000},
+-    {100, 3, 10000},
+-    {100, 3, 100000},
+-    {100, 3, 1000000}
+-  };
+-  
+-  private List<Integer> convertIntArray(int[] from) {
+-    List<Integer> ret = new ArrayList<Integer>(from.length);
+-    for (int v : from) {
+-      ret.add(v);
+-    }
+-    return ret;
+-  }
+-  
+-  private void testRandomSelectSelector(int niter, int m, int n) {
+-    RandomAlgorithms.Selector selector = new RandomAlgorithms.Selector(n,
+-        (double) m / n, new Random());
+-    Map<List<Integer>, Integer> results = new HashMap<List<Integer>, Integer>(
+-        niter);
+-    for (int i = 0; i < niter; ++i, selector.reset()) {
+-      int[] result = new int[m];
+-      for (int j = 0; j < m; ++j) {
+-        int v = selector.next();
+-        if (v < 0)
+-          break;
+-        result[j]=v;
+-      }
+-      Arrays.sort(result);
+-      List<Integer> resultAsList = convertIntArray(result);
+-      Integer count = results.get(resultAsList);
+-      if (count == null) {
+-        results.put(resultAsList, 1);
+-      } else {
+-        results.put(resultAsList, ++count);
+-      }
+-    }
+-
+-    verifyResults(results, m, n);
+-  }
+-
+-  private void testRandomSelect(int niter, int m, int n) {
+-    Random random = new Random();
+-    Map<List<Integer>, Integer> results = new HashMap<List<Integer>, Integer>(
+-        niter);
+-    for (int i = 0; i < niter; ++i) {
+-      int[] result = RandomAlgorithms.select(m, n, random);
+-      Arrays.sort(result);
+-      List<Integer> resultAsList = convertIntArray(result);
+-      Integer count = results.get(resultAsList);
+-      if (count == null) {
+-        results.put(resultAsList, 1);
+-      } else {
+-        results.put(resultAsList, ++count);
+-      }
+-    }
+-
+-    verifyResults(results, m, n);
+-  }
+-
+-  private void verifyResults(Map<List<Integer>, Integer> results, int m, int n) {
+-    if (n>=10) {
+-      assertTrue(results.size() >= Math.min(m, 2));
+-    }
+-    for (List<Integer> result : results.keySet()) {
+-      assertEquals(m, result.size());
+-      Set<Integer> seen = new HashSet<Integer>();
+-      for (int v : result) {
+-        System.out.printf("%d ", v);
+-        assertTrue((v >= 0) && (v < n));
+-        assertTrue(seen.add(v));
+-      }
+-      System.out.printf(" ==> %d\n", results.get(result));
+-    }
+-    System.out.println("====");
+-  }
+-  
+-  @Test
+-  public void testRandomSelect() {
+-    for (int[] param : parameters) {
+-    testRandomSelect(param[0], param[1], param[2]);
+-    }
+-  }
+-  
+-  @Test
+-  public void testRandomSelectSelector() {
+-    for (int[] param : parameters) {
+-      testRandomSelectSelector(param[0], param[1], param[2]);
+-      }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java
+deleted file mode 100644
+index e302db5b69f..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRandomTextDataGenerator.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import org.apache.hadoop.mapred.gridmix.RandomTextDataGenerator;
+-
+-import static org.junit.Assert.*;
+-import org.junit.Test;
+-
+-/**
+- * Test {@link RandomTextDataGenerator}.
+- */
+-public class TestRandomTextDataGenerator {
+-  /**
+-   * Test if {@link RandomTextDataGenerator} can generate random words of 
+-   * desired size.
+-   */
+-  @Test
+-  public void testRandomTextDataGenerator() {
+-    RandomTextDataGenerator rtdg = new RandomTextDataGenerator(10, 0L, 5);
+-    List<String> words = rtdg.getRandomWords();
+-
+-    // check the size
+-    assertEquals("List size mismatch", 10, words.size());
+-
+-    // check the words
+-    Set<String> wordsSet = new HashSet<String>(words);
+-    assertEquals("List size mismatch due to duplicates", 10, wordsSet.size());
+-
+-    // check the word lengths
+-    for (String word : wordsSet) {
+-      assertEquals("Word size mismatch", 5, word.length());
+-    }
+-  }
+-  
+-  /**
+-   * Test if {@link RandomTextDataGenerator} can generate same words given the
+-   * same list-size, word-length and seed.
+-   */
+-  @Test
+-  public void testRandomTextDataGeneratorRepeatability() {
+-    RandomTextDataGenerator rtdg1 = new RandomTextDataGenerator(10, 0L, 5);
+-    List<String> words1 = rtdg1.getRandomWords();
+-
+-    RandomTextDataGenerator rtdg2 = new RandomTextDataGenerator(10, 0L, 5);
+-    List<String> words2 = rtdg2.getRandomWords();
+-    
+-    assertTrue("List mismatch", words1.equals(words2));
+-  }
+-  
+-  /**
+-   * Test if {@link RandomTextDataGenerator} can generate different words given 
+-   * different seeds.
+-   */
+-  @Test
+-  public void testRandomTextDataGeneratorUniqueness() {
+-    RandomTextDataGenerator rtdg1 = new RandomTextDataGenerator(10, 1L, 5);
+-    Set<String> words1 = new HashSet(rtdg1.getRandomWords());
+-
+-    RandomTextDataGenerator rtdg2 = new RandomTextDataGenerator(10, 0L, 5);
+-    Set<String> words2 = new HashSet(rtdg2.getRandomWords());
+-    
+-    assertFalse("List size mismatch across lists", words1.equals(words2));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
+deleted file mode 100644
+index 5050e133c07..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.util.Random;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-
+-public class TestRecordFactory {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestRecordFactory.class);
+-
+-  public static void testFactory(long targetBytes, long targetRecs)
+-      throws Exception {
+-    final Configuration conf = new Configuration();
+-    final GridmixKey key = new GridmixKey();
+-    final GridmixRecord val = new GridmixRecord();
+-    LOG.info("Target bytes/records: " + targetBytes + "/" + targetRecs);
+-    final RecordFactory f = new AvgRecordFactory(targetBytes, targetRecs, conf);
+-    targetRecs = targetRecs <= 0 && targetBytes >= 0
+-      ? Math.max(1,
+-                 targetBytes 
+-                 / conf.getInt(AvgRecordFactory.GRIDMIX_MISSING_REC_SIZE, 
+-                               64 * 1024))
+-      : targetRecs;
+-
+-    long records = 0L;
+-    final DataOutputBuffer out = new DataOutputBuffer();
+-    while (f.next(key, val)) {
+-      ++records;
+-      key.write(out);
+-      val.write(out);
+-    }
+-    assertEquals(targetRecs, records);
+-    assertEquals(targetBytes, out.getLength());
+-  }
+-
+-  @Test
+-  public void testRandom() throws Exception {
+-    final Random r = new Random();
+-    final long targetBytes = r.nextInt(1 << 20) + 3 * (1 << 14);
+-    final long targetRecs = r.nextInt(1 << 14);
+-    testFactory(targetBytes, targetRecs);
+-  }
+-
+-  @Test
+-  public void testAvg() throws Exception {
+-    final Random r = new Random();
+-    final long avgsize = r.nextInt(1 << 10) + 1;
+-    final long targetRecs = r.nextInt(1 << 14);
+-    testFactory(targetRecs * avgsize, targetRecs);
+-  }
+-
+-  @Test
+-  public void testZero() throws Exception {
+-    final Random r = new Random();
+-    final long targetBytes = r.nextInt(1 << 20);
+-    testFactory(targetBytes, 0);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
+deleted file mode 100644
+index f14087bf3af..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestResourceUsageEmulators.java
++++ /dev/null
+@@ -1,614 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.StatusReporter;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.TaskInputOutputContext;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig;
+-import org.apache.hadoop.mapreduce.task.MapContextImpl;
+-import org.apache.hadoop.tools.rumen.ResourceUsageMetrics;
+-import org.apache.hadoop.mapred.gridmix.LoadJob.ResourceUsageMatcherRunner;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.CumulativeCpuUsageEmulatorPlugin;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.ResourceUsageEmulatorPlugin;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.ResourceUsageMatcher;
+-import org.apache.hadoop.mapred.gridmix.emulators.resourceusage.CumulativeCpuUsageEmulatorPlugin.DefaultCpuUsageEmulator;
+-import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
+-
+-/**
+- * Test Gridmix's resource emulator framework and supported plugins.
+- */
+-public class TestResourceUsageEmulators {
+-  /**
+-   * A {@link ResourceUsageEmulatorPlugin} implementation for testing purpose.
+-   * It essentially creates a file named 'test' in the test directory.
+-   */
+-  static class TestResourceUsageEmulatorPlugin 
+-  implements ResourceUsageEmulatorPlugin {
+-    static final Path rootTempDir =
+-        new Path(System.getProperty("test.build.data", "/tmp"));
+-    static final Path tempDir = 
+-      new Path(rootTempDir, "TestResourceUsageEmulatorPlugin");
+-    static final String DEFAULT_IDENTIFIER = "test";
+-    
+-    private Path touchPath = null;
+-    private FileSystem fs = null;
+-    
+-    @Override
+-    public void emulate() throws IOException, InterruptedException {
+-      // add some time between 2 calls to emulate()
+-      try {
+-        Thread.sleep(1000); // sleep for 1s
+-      } catch (Exception e){}
+-      
+-      try {
+-        fs.delete(touchPath, false); // delete the touch file
+-        //TODO Search for a better touch utility
+-        fs.create(touchPath).close(); // recreate it
+-      } catch (Exception e) {
+-        throw new RuntimeException(e);
+-      }
+-    }
+-    
+-    protected String getIdentifier() {
+-      return DEFAULT_IDENTIFIER;
+-    }
+-    
+-    private static Path getFilePath(String id) {
+-      return new Path(tempDir, id);
+-    }
+-    
+-    private static Path getInitFilePath(String id) {
+-      return new Path(tempDir, id + ".init");
+-    }
+-    
+-    @Override
+-    public void initialize(Configuration conf, ResourceUsageMetrics metrics,
+-        ResourceCalculatorPlugin monitor, Progressive progress) {
+-      // add some time between 2 calls to initialize()
+-      try {
+-        Thread.sleep(1000); // sleep for 1s
+-      } catch (Exception e){}
+-      
+-      try {
+-        fs = FileSystem.getLocal(conf);
+-        
+-        Path initPath = getInitFilePath(getIdentifier());
+-        fs.delete(initPath, false); // delete the old file
+-        fs.create(initPath).close(); // create a new one
+-        
+-        touchPath = getFilePath(getIdentifier());
+-        fs.delete(touchPath, false);
+-      } catch (Exception e) {
+-        
+-      } finally {
+-        if (fs != null) {
+-          try {
+-            fs.deleteOnExit(tempDir);
+-          } catch (IOException ioe){}
+-        }
+-      }
+-    }
+-    
+-    // test if the emulation framework successfully loaded this plugin
+-    static long testInitialization(String id, Configuration conf) 
+-    throws IOException {
+-      Path testPath = getInitFilePath(id);
+-      FileSystem fs = FileSystem.getLocal(conf);
+-      return fs.exists(testPath) 
+-             ? fs.getFileStatus(testPath).getModificationTime() 
+-             : 0;
+-    }
+-    
+-    // test if the emulation framework successfully loaded this plugin
+-    static long testEmulation(String id, Configuration conf) 
+-    throws IOException {
+-      Path testPath = getFilePath(id);
+-      FileSystem fs = FileSystem.getLocal(conf);
+-      return fs.exists(testPath) 
+-             ? fs.getFileStatus(testPath).getModificationTime() 
+-             : 0;
+-    }
+-    
+-    @Override
+-    public float getProgress() {
+-      try {
+-        return fs.exists(touchPath) ? 1.0f : 0f;
+-      } catch (IOException ioe) {}
+-      return 0f;
+-    }
+-  }
+-  
+-  /**
+-   * Test implementation of {@link ResourceUsageEmulatorPlugin} which creates
+-   * a file named 'others' in the test directory.
+-   */
+-  static class TestOthers extends TestResourceUsageEmulatorPlugin {
+-    static final String ID = "others";
+-    
+-    @Override
+-    protected String getIdentifier() {
+-      return ID;
+-    }
+-  }
+-  
+-  /**
+-   * Test implementation of {@link ResourceUsageEmulatorPlugin} which creates
+-   * a file named 'cpu' in the test directory.
+-   */
+-  static class TestCpu extends TestResourceUsageEmulatorPlugin {
+-    static final String ID = "cpu";
+-    
+-    @Override
+-    protected String getIdentifier() {
+-      return ID;
+-    }
+-  }
+-  
+-  /**
+-   * Test {@link ResourceUsageMatcher}.
+-   */
+-  @Test
+-  public void testResourceUsageMatcher() throws Exception {
+-    ResourceUsageMatcher matcher = new ResourceUsageMatcher();
+-    Configuration conf = new Configuration();
+-    conf.setClass(ResourceUsageMatcher.RESOURCE_USAGE_EMULATION_PLUGINS, 
+-                  TestResourceUsageEmulatorPlugin.class, 
+-                  ResourceUsageEmulatorPlugin.class);
+-    long currentTime = System.currentTimeMillis();
+-    
+-    matcher.configure(conf, null, null, null);
+-    
+-    matcher.matchResourceUsage();
+-    
+-    String id = TestResourceUsageEmulatorPlugin.DEFAULT_IDENTIFIER;
+-    long result = 
+-      TestResourceUsageEmulatorPlugin.testInitialization(id, conf);
+-    assertTrue("Resource usage matcher failed to initialize the configured"
+-               + " plugin", result > currentTime);
+-    result = TestResourceUsageEmulatorPlugin.testEmulation(id, conf);
+-    assertTrue("Resource usage matcher failed to load and emulate the"
+-               + " configured plugin", result > currentTime);
+-    
+-    // test plugin order to first emulate cpu and then others
+-    conf.setStrings(ResourceUsageMatcher.RESOURCE_USAGE_EMULATION_PLUGINS, 
+-                    TestCpu.class.getName() + "," + TestOthers.class.getName());
+-    
+-    matcher.configure(conf, null, null, null);
+-
+-    // test the initialization order
+-    long time1 = 
+-           TestResourceUsageEmulatorPlugin.testInitialization(TestCpu.ID, conf);
+-    long time2 = 
+-           TestResourceUsageEmulatorPlugin.testInitialization(TestOthers.ID, 
+-                                                              conf);
+-    assertTrue("Resource usage matcher failed to initialize the configured"
+-               + " plugins in order", time1 < time2);
+-    
+-    matcher.matchResourceUsage();
+-
+-    // Note that the cpu usage emulator plugin is configured 1st and then the
+-    // others plugin.
+-    time1 = 
+-      TestResourceUsageEmulatorPlugin.testInitialization(TestCpu.ID, conf);
+-    time2 = 
+-      TestResourceUsageEmulatorPlugin.testInitialization(TestOthers.ID, 
+-                                                         conf);
+-    assertTrue("Resource usage matcher failed to load the configured plugins", 
+-               time1 < time2);
+-  }
+-  
+-  /**
+-   * Fakes the cumulative usage using {@link FakeCpuUsageEmulatorCore}.
+-   */
+-  static class FakeResourceUsageMonitor extends DummyResourceCalculatorPlugin {
+-    private FakeCpuUsageEmulatorCore core;
+-    
+-    public FakeResourceUsageMonitor(FakeCpuUsageEmulatorCore core) {
+-      this.core = core;
+-    }
+-    
+-    /**
+-     * A dummy CPU usage monitor. Every call to 
+-     * {@link ResourceCalculatorPlugin#getCumulativeCpuTime()} will return the 
+-     * value of {@link FakeCpuUsageEmulatorCore#getNumCalls()}.
+-     */
+-    @Override
+-    public long getCumulativeCpuTime() {
+-      return core.getCpuUsage();
+-    }
+-  }
+-  
+-  /**
+-   * A dummy {@link Progressive} implementation that allows users to set the
+-   * progress for testing. The {@link Progressive#getProgress()} call will 
+-   * return the last progress value set using 
+-   * {@link FakeProgressive#setProgress(float)}.
+-   */
+-  static class FakeProgressive implements Progressive {
+-    private float progress = 0F;
+-    @Override
+-    public float getProgress() {
+-      return progress;
+-    }
+-    
+-    void setProgress(float progress) {
+-      this.progress = progress;
+-    }
+-  }
+-  
+-  /**
+-   * A dummy reporter for {@link LoadJob.ResourceUsageMatcherRunner}.
+-   */
+-  private static class DummyReporter extends StatusReporter {
+-    private Progressive progress;
+-    
+-    DummyReporter(Progressive progress) {
+-      this.progress = progress;
+-    }
+-    
+-    @Override
+-    public org.apache.hadoop.mapreduce.Counter getCounter(Enum<?> name) {
+-      return null;
+-    }
+-    
+-    @Override
+-    public org.apache.hadoop.mapreduce.Counter getCounter(String group,
+-                                                          String name) {
+-      return null;
+-    }
+-    
+-    @Override
+-    public void progress() {
+-    }
+-    
+-    @Override
+-    public float getProgress() {
+-      return progress.getProgress();
+-    }
+-    
+-    @Override
+-    public void setStatus(String status) {
+-    }
+-  }
+-  
+-  // Extends ResourceUsageMatcherRunner for testing.
+-  @SuppressWarnings("unchecked")
+-  private static class FakeResourceUsageMatcherRunner 
+-  extends ResourceUsageMatcherRunner {
+-    FakeResourceUsageMatcherRunner(TaskInputOutputContext context, 
+-                                   ResourceUsageMetrics metrics) {
+-      super(context, metrics);
+-    }
+-    
+-    // test ResourceUsageMatcherRunner
+-    void test() throws Exception {
+-      super.match();
+-    }
+-  }
+-  
+-  /**
+-   * Test {@link LoadJob.ResourceUsageMatcherRunner}.
+-   */
+-  @Test
+-  @SuppressWarnings("unchecked")
+-  public void testResourceUsageMatcherRunner() throws Exception {
+-    Configuration conf = new Configuration();
+-    FakeProgressive progress = new FakeProgressive();
+-    
+-    // set the resource calculator plugin
+-    conf.setClass(TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN,
+-                  DummyResourceCalculatorPlugin.class, 
+-                  ResourceCalculatorPlugin.class);
+-    // set the resources
+-    // set the resource implementation class
+-    conf.setClass(ResourceUsageMatcher.RESOURCE_USAGE_EMULATION_PLUGINS, 
+-                  TestResourceUsageEmulatorPlugin.class, 
+-                  ResourceUsageEmulatorPlugin.class);
+-    
+-    long currentTime = System.currentTimeMillis();
+-    
+-    // initialize the matcher class
+-    TaskAttemptID id = new TaskAttemptID("test", 1, TaskType.MAP, 1, 1);
+-    StatusReporter reporter = new DummyReporter(progress);
+-    TaskInputOutputContext context = 
+-      new MapContextImpl(conf, id, null, null, null, reporter, null);
+-    FakeResourceUsageMatcherRunner matcher = 
+-      new FakeResourceUsageMatcherRunner(context, null);
+-    
+-    // check if the matcher initialized the plugin
+-    String identifier = TestResourceUsageEmulatorPlugin.DEFAULT_IDENTIFIER;
+-    long initTime = 
+-      TestResourceUsageEmulatorPlugin.testInitialization(identifier, conf);
+-    assertTrue("ResourceUsageMatcherRunner failed to initialize the"
+-               + " configured plugin", initTime > currentTime);
+-    
+-    // check the progress
+-    assertEquals("Progress mismatch in ResourceUsageMatcherRunner", 
+-                 0, progress.getProgress(), 0D);
+-    
+-    // call match() and check progress
+-    progress.setProgress(0.01f);
+-    currentTime = System.currentTimeMillis();
+-    matcher.test();
+-    long emulateTime = 
+-      TestResourceUsageEmulatorPlugin.testEmulation(identifier, conf);
+-    assertTrue("ProgressBasedResourceUsageMatcher failed to load and emulate"
+-               + " the configured plugin", emulateTime > currentTime);
+-  }
+-  
+-  /**
+-   * Test {@link CumulativeCpuUsageEmulatorPlugin}'s core CPU usage emulation 
+-   * engine.
+-   */
+-  @Test
+-  public void testCpuUsageEmulator() throws IOException {
+-    // test CpuUsageEmulator calibration with fake resource calculator plugin
+-    long target = 100000L; // 100 secs
+-    int unitUsage = 50;
+-    FakeCpuUsageEmulatorCore fakeCpuEmulator = new FakeCpuUsageEmulatorCore();
+-    fakeCpuEmulator.setUnitUsage(unitUsage);
+-    FakeResourceUsageMonitor fakeMonitor = 
+-      new FakeResourceUsageMonitor(fakeCpuEmulator);
+-    
+-    // calibrate for 100ms
+-    fakeCpuEmulator.calibrate(fakeMonitor, target);
+-    
+-    // by default, CpuUsageEmulator.calibrate() will consume 100ms of CPU usage
+-    assertEquals("Fake calibration failed", 
+-                 100, fakeMonitor.getCumulativeCpuTime());
+-    assertEquals("Fake calibration failed", 
+-                 100, fakeCpuEmulator.getCpuUsage());
+-    // by default, CpuUsageEmulator.performUnitComputation() will be called 
+-    // twice
+-    assertEquals("Fake calibration failed", 
+-                 2, fakeCpuEmulator.getNumCalls());
+-  }
+-  
+-  /**
+-   * This is a dummy class that fakes CPU usage.
+-   */
+-  private static class FakeCpuUsageEmulatorCore 
+-  extends DefaultCpuUsageEmulator {
+-    private int numCalls = 0;
+-    private int unitUsage = 1;
+-    private int cpuUsage = 0;
+-    
+-    @Override
+-    protected void performUnitComputation() {
+-      ++numCalls;
+-      cpuUsage += unitUsage;
+-    }
+-    
+-    int getNumCalls() {
+-      return numCalls;
+-    }
+-    
+-    int getCpuUsage() {
+-      return cpuUsage;
+-    }
+-    
+-    void reset() {
+-      numCalls = 0;
+-      cpuUsage = 0;
+-    }
+-    
+-    void setUnitUsage(int unitUsage) {
+-      this.unitUsage = unitUsage;
+-    }
+-  }
+-  
+-  // Creates a ResourceUsageMetrics object from the target usage
+-  static ResourceUsageMetrics createMetrics(long target) {
+-    ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-    metrics.setCumulativeCpuUsage(target);
+-    metrics.setVirtualMemoryUsage(target);
+-    metrics.setPhysicalMemoryUsage(target);
+-    metrics.setHeapUsage(target);
+-    return metrics;
+-  }
+-  
+-  /**
+-   * Test {@link CumulativeCpuUsageEmulatorPlugin}.
+-   */
+-  @Test
+-  public void testCumulativeCpuUsageEmulatorPlugin() throws Exception {
+-    Configuration conf = new Configuration();
+-    long targetCpuUsage = 1000L;
+-    int unitCpuUsage = 50;
+-    
+-    // fake progress indicator
+-    FakeProgressive fakeProgress = new FakeProgressive();
+-    
+-    // fake cpu usage generator
+-    FakeCpuUsageEmulatorCore fakeCore = new FakeCpuUsageEmulatorCore();
+-    fakeCore.setUnitUsage(unitCpuUsage);
+-    
+-    // a cumulative cpu usage emulator with fake core
+-    CumulativeCpuUsageEmulatorPlugin cpuPlugin = 
+-      new CumulativeCpuUsageEmulatorPlugin(fakeCore);
+-    
+-    // test with invalid or missing resource usage value
+-    ResourceUsageMetrics invalidUsage = createMetrics(0);
+-    cpuPlugin.initialize(conf, invalidUsage, null, null);
+-    
+-    // test if disabled cpu emulation plugin's emulate() call is a no-operation
+-    // this will test if the emulation plugin is disabled or not
+-    int numCallsPre = fakeCore.getNumCalls();
+-    long cpuUsagePre = fakeCore.getCpuUsage();
+-    cpuPlugin.emulate();
+-    int numCallsPost = fakeCore.getNumCalls();
+-    long cpuUsagePost = fakeCore.getCpuUsage();
+-    
+-    //  test if no calls are made cpu usage emulator core
+-    assertEquals("Disabled cumulative CPU usage emulation plugin works!", 
+-                 numCallsPre, numCallsPost);
+-    
+-    //  test if no calls are made cpu usage emulator core
+-    assertEquals("Disabled cumulative CPU usage emulation plugin works!", 
+-                 cpuUsagePre, cpuUsagePost);
+-    
+-    // test with get progress
+-    float progress = cpuPlugin.getProgress();
+-    assertEquals("Invalid progress of disabled cumulative CPU usage emulation " 
+-                 + "plugin!", 1.0f, progress, 0f);
+-    
+-    // test with valid resource usage value
+-    ResourceUsageMetrics metrics = createMetrics(targetCpuUsage);
+-    
+-    // fake monitor
+-    ResourceCalculatorPlugin monitor = new FakeResourceUsageMonitor(fakeCore);
+-    
+-    // test with default emulation interval
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, cpuPlugin, 
+-                          targetCpuUsage, targetCpuUsage / unitCpuUsage);
+-    
+-    // test with custom value for emulation interval of 20%
+-    conf.setFloat(CumulativeCpuUsageEmulatorPlugin.CPU_EMULATION_PROGRESS_INTERVAL,
+-                  0.2F);
+-    testEmulationAccuracy(conf, fakeCore, monitor, metrics, cpuPlugin, 
+-                          targetCpuUsage, targetCpuUsage / unitCpuUsage);
+-    
+-    // test if emulation interval boundary is respected (unit usage = 1)
+-    //  test the case where the current progress is less than threshold
+-    fakeProgress = new FakeProgressive(); // initialize
+-    fakeCore.reset();
+-    fakeCore.setUnitUsage(1);
+-    conf.setFloat(CumulativeCpuUsageEmulatorPlugin.CPU_EMULATION_PROGRESS_INTERVAL,
+-                  0.25F);
+-    cpuPlugin.initialize(conf, metrics, monitor, fakeProgress);
+-    // take a snapshot after the initialization
+-    long initCpuUsage = monitor.getCumulativeCpuTime();
+-    long initNumCalls = fakeCore.getNumCalls();
+-    // test with 0 progress
+-    testEmulationBoundary(0F, fakeCore, fakeProgress, cpuPlugin, initCpuUsage, 
+-                          initNumCalls, "[no-op, 0 progress]");
+-    // test with 24% progress
+-    testEmulationBoundary(0.24F, fakeCore, fakeProgress, cpuPlugin, 
+-                          initCpuUsage, initNumCalls, "[no-op, 24% progress]");
+-    // test with 25% progress
+-    //  target = 1000ms, target emulation at 25% = 250ms, 
+-    //  weighed target = 1000 * 0.25^4 (we are using progress^4 as the weight)
+-    //                 ~ 4
+-    //  but current usage = init-usage = 100, hence expected = 100
+-    testEmulationBoundary(0.25F, fakeCore, fakeProgress, cpuPlugin, 
+-                          initCpuUsage, initNumCalls, "[op, 25% progress]");
+-    
+-    // test with 80% progress
+-    //  target = 1000ms, target emulation at 80% = 800ms, 
+-    //  weighed target = 1000 * 0.25^4 (we are using progress^4 as the weight)
+-    //                 ~ 410
+-    //  current-usage = init-usage = 100, hence expected-usage = 410
+-    testEmulationBoundary(0.80F, fakeCore, fakeProgress, cpuPlugin, 410, 410, 
+-                          "[op, 80% progress]");
+-    
+-    // now test if the final call with 100% progress ramps up the CPU usage
+-    testEmulationBoundary(1F, fakeCore, fakeProgress, cpuPlugin, targetCpuUsage,
+-                          targetCpuUsage, "[op, 100% progress]");
+-    
+-    // test if emulation interval boundary is respected (unit usage = 50)
+-    //  test the case where the current progress is less than threshold
+-    fakeProgress = new FakeProgressive(); // initialize
+-    fakeCore.reset();
+-    fakeCore.setUnitUsage(unitCpuUsage);
+-    conf.setFloat(CumulativeCpuUsageEmulatorPlugin.CPU_EMULATION_PROGRESS_INTERVAL,
+-                  0.40F);
+-    cpuPlugin.initialize(conf, metrics, monitor, fakeProgress);
+-    // take a snapshot after the initialization
+-    initCpuUsage = monitor.getCumulativeCpuTime();
+-    initNumCalls = fakeCore.getNumCalls();
+-    // test with 0 progress
+-    testEmulationBoundary(0F, fakeCore, fakeProgress, cpuPlugin, initCpuUsage, 
+-                          initNumCalls, "[no-op, 0 progress]");
+-    // test with 39% progress
+-    testEmulationBoundary(0.39F, fakeCore, fakeProgress, cpuPlugin, 
+-                          initCpuUsage, initNumCalls, "[no-op, 39% progress]");
+-    // test with 40% progress
+-    //  target = 1000ms, target emulation at 40% = 4000ms, 
+-    //  weighed target = 1000 * 0.40^4 (we are using progress^4 as the weight)
+-    //                 ~ 26
+-    // current-usage = init-usage = 100, hence expected-usage = 100
+-    testEmulationBoundary(0.40F, fakeCore, fakeProgress, cpuPlugin, 
+-                          initCpuUsage, initNumCalls, "[op, 40% progress]");
+-    
+-    // test with 90% progress
+-    //  target = 1000ms, target emulation at 90% = 900ms, 
+-    //  weighed target = 1000 * 0.90^4 (we are using progress^4 as the weight)
+-    //                 ~ 657
+-    //  current-usage = init-usage = 100, hence expected-usage = 657 but 
+-    //  the fake-core increases in steps of 50, hence final target = 700
+-    testEmulationBoundary(0.90F, fakeCore, fakeProgress, cpuPlugin, 700, 
+-                          700 / unitCpuUsage, "[op, 90% progress]");
+-    
+-    // now test if the final call with 100% progress ramps up the CPU usage
+-    testEmulationBoundary(1F, fakeCore, fakeProgress, cpuPlugin, targetCpuUsage,
+-                          targetCpuUsage / unitCpuUsage, "[op, 100% progress]");
+-  }
+-  
+-  // test whether the CPU usage emulator achieves the desired target using
+-  // desired calls to the underling core engine.
+-  private static void testEmulationAccuracy(Configuration conf, 
+-                        FakeCpuUsageEmulatorCore fakeCore,
+-                        ResourceCalculatorPlugin monitor,
+-                        ResourceUsageMetrics metrics,
+-                        CumulativeCpuUsageEmulatorPlugin cpuPlugin,
+-                        long expectedTotalCpuUsage, long expectedTotalNumCalls) 
+-  throws Exception {
+-    FakeProgressive fakeProgress = new FakeProgressive();
+-    fakeCore.reset();
+-    cpuPlugin.initialize(conf, metrics, monitor, fakeProgress);
+-    int numLoops = 0;
+-    while (fakeProgress.getProgress() < 1) {
+-      ++numLoops;
+-      float progress = (float)numLoops / 100;
+-      fakeProgress.setProgress(progress);
+-      cpuPlugin.emulate();
+-    }
+-    
+-    // test if the resource plugin shows the expected invocations
+-    assertEquals("Cumulative cpu usage emulator plugin failed (num calls)!", 
+-                 expectedTotalNumCalls, fakeCore.getNumCalls(), 0L);
+-    // test if the resource plugin shows the expected usage
+-    assertEquals("Cumulative cpu usage emulator plugin failed (total usage)!", 
+-                 expectedTotalCpuUsage, fakeCore.getCpuUsage(), 0L);
+-  }
+-  
+-  // tests if the CPU usage emulation plugin emulates only at the expected
+-  // progress gaps
+-  private static void testEmulationBoundary(float progress, 
+-      FakeCpuUsageEmulatorCore fakeCore, FakeProgressive fakeProgress, 
+-      CumulativeCpuUsageEmulatorPlugin cpuPlugin, long expectedTotalCpuUsage, 
+-      long expectedTotalNumCalls, String info) throws Exception {
+-    fakeProgress.setProgress(progress);
+-    cpuPlugin.emulate();
+-    
+-    assertEquals("Emulation interval test for cpu usage failed " + info + "!", 
+-                 expectedTotalCpuUsage, fakeCore.getCpuUsage(), 0L);
+-    assertEquals("Emulation interval test for num calls failed " + info + "!", 
+-                 expectedTotalNumCalls, fakeCore.getNumCalls(), 0L);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
+deleted file mode 100644
+index 5a648de5679..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
++++ /dev/null
+@@ -1,142 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.event.Level;
+-
+-import java.io.IOException;
+-import java.util.List;
+-
+-import static org.junit.Assert.*;
+-import static org.slf4j.LoggerFactory.getLogger;
+-
+-public class TestSleepJob extends CommonJobTest {
+-
+-  public static final Logger LOG = getLogger(Gridmix.class);
+-
+-  static {
+-    GenericTestUtils.setLogLevel(
+-        getLogger("org.apache.hadoop.mapred.gridmix"), Level.DEBUG);
+-  }
+-
+-  static GridmixJobSubmissionPolicy policy = GridmixJobSubmissionPolicy.REPLAY;
+-
+-  @BeforeClass
+-  public static void init() throws IOException {
+-    GridmixTestUtils.initCluster(TestSleepJob.class);
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws IOException {
+-    GridmixTestUtils.shutdownCluster();
+-  }
+-
+-
+-  @Test
+-  public void testMapTasksOnlySleepJobs() throws Exception {
+-    Configuration configuration = GridmixTestUtils.mrvl.getConfig();
+-
+-    DebugJobProducer jobProducer = new DebugJobProducer(5, configuration);
+-    configuration.setBoolean(SleepJob.SLEEPJOB_MAPTASK_ONLY, true);
+-
+-    UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-    JobStory story;
+-    int seq = 1;
+-    while ((story = jobProducer.getNextJob()) != null) {
+-      GridmixJob gridmixJob = JobCreator.SLEEPJOB.createGridmixJob(configuration, 0,
+-              story, new Path("ignored"), ugi, seq++);
+-      gridmixJob.buildSplits(null);
+-      Job job = gridmixJob.call();
+-      assertEquals(0, job.getNumReduceTasks());
+-    }
+-    jobProducer.close();
+-    assertEquals(6, seq);
+-  }
+-
+-  /*
+-  * test RandomLocation
+-  */
+-  @Test
+-  public void testRandomLocation() throws Exception {
+-    UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+-
+-    testRandomLocation(1, 10, ugi);
+-    testRandomLocation(2, 10, ugi);
+-  }
+-
+-  // test Serial submit
+-  @Test
+-  public void testSerialSubmit() throws Exception {
+-    // set policy
+-    policy = GridmixJobSubmissionPolicy.SERIAL;
+-    LOG.info("Serial started at " + System.currentTimeMillis());
+-    doSubmission(JobCreator.SLEEPJOB.name(), false);
+-    LOG.info("Serial ended at " + System.currentTimeMillis());
+-  }
+-
+-  @Test
+-  public void testReplaySubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.REPLAY;
+-    LOG.info(" Replay started at " + System.currentTimeMillis());
+-    doSubmission(JobCreator.SLEEPJOB.name(), false);
+-    LOG.info(" Replay ended at " + System.currentTimeMillis());
+-  }
+-
+-  @Test
+-  public void testStressSubmit() throws Exception {
+-    policy = GridmixJobSubmissionPolicy.STRESS;
+-    LOG.info(" Replay started at " + System.currentTimeMillis());
+-    doSubmission(JobCreator.SLEEPJOB.name(), false);
+-    LOG.info(" Replay ended at " + System.currentTimeMillis());
+-  }
+-
+-  private void testRandomLocation(int locations, int njobs,
+-                                  UserGroupInformation ugi) throws Exception {
+-    Configuration configuration = new Configuration();
+-
+-    DebugJobProducer jobProducer = new DebugJobProducer(njobs, configuration);
+-    Configuration jconf = GridmixTestUtils.mrvl.getConfig();
+-    jconf.setInt(JobCreator.SLEEPJOB_RANDOM_LOCATIONS, locations);
+-
+-    JobStory story;
+-    int seq = 1;
+-    while ((story = jobProducer.getNextJob()) != null) {
+-      GridmixJob gridmixJob = JobCreator.SLEEPJOB.createGridmixJob(jconf, 0,
+-              story, new Path("ignored"), ugi, seq++);
+-      gridmixJob.buildSplits(null);
+-      List<InputSplit> splits = new SleepJob.SleepInputFormat()
+-              .getSplits(gridmixJob.getJob());
+-      for (InputSplit split : splits) {
+-        assertEquals(locations, split.getLocations().length);
+-      }
+-    }
+-    jobProducer.close();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
+deleted file mode 100644
+index 44075157f5c..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestUserResolve.java
++++ /dev/null
+@@ -1,172 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.mapred.gridmix;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.security.UserGroupInformation;
+-
+-public class TestUserResolve {
+-
+-  private static Path rootDir = null;
+-  private static Configuration conf = null;
+-  private static FileSystem fs = null;
+-
+-  @BeforeClass
+-  public static void createRootDir() throws IOException {
+-    conf = new Configuration();
+-    fs = FileSystem.getLocal(conf);
+-    rootDir = new Path(fs.makeQualified(new Path(
+-        System.getProperty("test.build.data", "/tmp"))), "gridmixUserResolve");
+-  }
+-
+-  /**
+-   * Creates users file with the content as the String usersFileContent.
+-   * @param usersFilePath    the path to the file that is to be created
+-   * @param usersFileContent Content of users file
+-   * @throws IOException
+-   */
+-  private static void writeUserList(Path usersFilePath, String usersFileContent)
+-      throws IOException {
+-
+-    FSDataOutputStream out = null;
+-    try {
+-      out = fs.create(usersFilePath, true);
+-      out.writeBytes(usersFileContent);
+-    } finally {
+-      if (out != null) {
+-        out.close();
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Validate RoundRobinUserResolver's behavior for bad user resource file.
+-   * RoundRobinUserResolver.setTargetUsers() should throw proper Exception for
+-   * the cases like
+-   * <li> non existent user resource file and
+-   * <li> empty user resource file
+-   * 
+-   * @param rslv              The RoundRobinUserResolver object
+-   * @param userRsrc          users file
+-   * @param expectedErrorMsg  expected error message
+-   */
+-  private void validateBadUsersFile(UserResolver rslv, URI userRsrc,
+-      String expectedErrorMsg) {
+-    boolean fail = false;
+-    try {
+-      rslv.setTargetUsers(userRsrc, conf);
+-    } catch (IOException e) {
+-      assertTrue("Exception message from RoundRobinUserResolver is wrong",
+-          e.getMessage().equals(expectedErrorMsg));
+-      fail = true;
+-    }
+-    assertTrue("User list required for RoundRobinUserResolver", fail);
+-  }
+-
+-  /**
+-   * Validate the behavior of {@link RoundRobinUserResolver} for different
+-   * user resource files like
+-   * <li> Empty user resource file
+-   * <li> Non existent user resource file
+-   * <li> User resource file with valid content
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testRoundRobinResolver() throws Exception {
+-
+-    final UserResolver rslv = new RoundRobinUserResolver();
+-    Path usersFilePath = new Path(rootDir, "users");
+-    URI userRsrc = new URI(usersFilePath.toString());
+-
+-    // Check if the error message is as expected for non existent
+-    // user resource file.
+-    fs.delete(usersFilePath, false);
+-    String expectedErrorMsg = "File " + userRsrc + " does not exist";
+-    validateBadUsersFile(rslv, userRsrc, expectedErrorMsg);
+-
+-    // Check if the error message is as expected for empty user resource file
+-    writeUserList(usersFilePath, "");// creates empty users file
+-    expectedErrorMsg =
+-        RoundRobinUserResolver.buildEmptyUsersErrorMsg(userRsrc);
+-    validateBadUsersFile(rslv, userRsrc, expectedErrorMsg);
+-
+-    // Create user resource file with valid content like older users list file
+-    // with usernames and groups
+-    writeUserList(usersFilePath,
+-        "user0,groupA,groupB,groupC\nuser1,groupA,groupC\n");
+-    validateValidUsersFile(rslv, userRsrc);
+-
+-    // Create user resource file with valid content with
+-    // usernames with groups and without groups
+-    writeUserList(usersFilePath, "user0,groupA,groupB\nuser1,");
+-    validateValidUsersFile(rslv, userRsrc);
+-
+-    // Create user resource file with valid content with
+-    // usernames without groups
+-    writeUserList(usersFilePath, "user0\nuser1");
+-    validateValidUsersFile(rslv, userRsrc);
+-  }
+-
+-  // Validate RoundRobinUserResolver for the case of
+-  // user resource file with valid content.
+-  private void validateValidUsersFile(UserResolver rslv, URI userRsrc)
+-      throws IOException {
+-    assertTrue(rslv.setTargetUsers(userRsrc, conf));
+-    UserGroupInformation ugi1 = UserGroupInformation.createRemoteUser("hfre0");
+-    assertEquals("user0", rslv.getTargetUgi(ugi1).getUserName());
+-    assertEquals("user1", 
+-        rslv.getTargetUgi(UserGroupInformation.createRemoteUser("hfre1"))
+-            .getUserName());
+-    assertEquals("user0",
+-        rslv.getTargetUgi(UserGroupInformation.createRemoteUser("hfre2"))
+-            .getUserName());
+-    assertEquals("user0", rslv.getTargetUgi(ugi1).getUserName());
+-    assertEquals("user1",
+-        rslv.getTargetUgi(UserGroupInformation.createRemoteUser("hfre3"))
+-            .getUserName());
+-
+-    // Verify if same user comes again, its mapped user name should be
+-    // correct even though UGI is constructed again.
+-    assertEquals("user0", rslv.getTargetUgi(
+-        UserGroupInformation.createRemoteUser("hfre0")).getUserName());
+-    assertEquals("user0",
+-        rslv.getTargetUgi(UserGroupInformation.createRemoteUser("hfre5"))
+-            .getUserName());
+-    assertEquals("user0",
+-        rslv.getTargetUgi(UserGroupInformation.createRemoteUser("hfre0"))
+-            .getUserName());
+-  }
+-
+-  @Test
+-  public void testSubmitterResolver() throws Exception {
+-    final UserResolver rslv = new SubmitterUserResolver();
+-    assertFalse(rslv.needsTargetUsersList());
+-    UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+-    assertEquals(ugi, rslv.getTargetUgi((UserGroupInformation)null));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json b/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json
+deleted file mode 100644
+index 1b7ccf860b6..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json
++++ /dev/null
+@@ -1,414 +0,0 @@
+-{
+-  "priority" : "NORMAL",
+-  "jobID" : "job_201009241532_0001",
+-  "user" : "johndoe",
+-  "jobName" : "WordCount",
+-  "mapTasks" : [ {
+-    "startTime" : 1285322651360,
+-    "taskID" : "task_201009241532_0001_m_000000",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651366,
+-      "finishTime" : 1285322658262,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000000_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 704270,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 48266,
+-      "mapInputRecords" : 13427,
+-      "mapOutputBytes" : 1182333,
+-      "mapOutputRecords" : 126063,
+-      "combineInputRecords" : 126063,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 6612,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660778,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 704270,
+-    "inputRecords" : 13427,
+-    "outputBytes" : 48266,
+-    "outputRecords" : 126063
+-  }, {
+-    "startTime" : 1285322651361,
+-    "taskID" : "task_201009241532_0001_m_000001",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651378,
+-      "finishTime" : 1285322657906,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000001_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 577214,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 58143,
+-      "mapInputRecords" : 13015,
+-      "mapOutputBytes" : 985534,
+-      "mapOutputRecords" : 108400,
+-      "combineInputRecords" : 108400,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 8214,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660781,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 577214,
+-    "inputRecords" : 13015,
+-    "outputBytes" : 58143,
+-    "outputRecords" : 108400
+-  }, {
+-    "startTime" : 1285322660789,
+-    "taskID" : "task_201009241532_0001_m_000002",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322664865,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000002_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 163907,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 21510,
+-      "mapInputRecords" : 3736,
+-      "mapOutputBytes" : 275796,
+-      "mapOutputRecords" : 30528,
+-      "combineInputRecords" : 30528,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 3040,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322666805,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 163907,
+-    "inputRecords" : 3736,
+-    "outputBytes" : 21510,
+-    "outputRecords" : 30528
+-  } ],
+-  "finishTime" : 1285322675837,
+-  "reduceTasks" : [ {
+-    "startTime" : 1285322660790,
+-    "taskID" : "task_201009241532_0001_r_000000",
+-    "taskType" : "REDUCE",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322670759,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_r_000000_0",
+-      "shuffleFinished" : 1285322667962,
+-      "sortFinished" : 1285322668146,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : 122793,
+-      "fileBytesRead" : 111026,
+-      "fileBytesWritten" : 111026,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : 0,
+-      "reduceInputGroups" : 11713,
+-      "reduceInputRecords" : 17866,
+-      "reduceShuffleBytes" : 127823,
+-      "reduceOutputRecords" : 11713,
+-      "spilledRecords" : 17866,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322672821,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 127823,
+-    "inputRecords" : 17866,
+-    "outputBytes" : 122793,
+-    "outputRecords" : 11713
+-  } ],
+-  "submitTime" : 1285322645148,
+-  "launchTime" : 1285322645614,
+-  "totalMaps" : 3,
+-  "totalReduces" : 1,
+-  "otherTasks" : [ {
+-    "startTime" : 1285322648294,
+-    "taskID" : "task_201009241532_0001_m_000004",
+-    "taskType" : "SETUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322648482,
+-      "finishTime" : 1285322649588,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000004_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322651351,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  }, {
+-    "startTime" : 1285322672829,
+-    "taskID" : "task_201009241532_0001_m_000003",
+-    "taskType" : "CLEANUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322672838,
+-      "finishTime" : 1285322673971,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000003_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322675835,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  } ],
+-  "computonsPerMapInputByte" : -1,
+-  "computonsPerMapOutputByte" : -1,
+-  "computonsPerReduceInputByte" : -1,
+-  "computonsPerReduceOutputByte" : -1,
+-  "heapMegabytes" : 1024,
+-  "outcome" : "SUCCESS",
+-  "jobtype" : "JAVA",
+-  "directDependantJobs" : [ ],
+-  "successfulMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 6896,
+-    "minimum" : 4058,
+-    "rankings" : [ {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 3
+-  } ],
+-  "failedMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  } ],
+-  "successfulReduceAttemptCDF" : {
+-    "maximum" : 9952,
+-    "minimum" : 9952,
+-    "rankings" : [ {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 1
+-  },
+-  "failedReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "mapperTriesToSucceed" : [ 1.0 ],
+-  "failedMapperFraction" : 0.0,
+-  "relativeTime" : 0,
+-  "queue" : "default",
+-  "clusterMapMB" : -1,
+-  "clusterReduceMB" : -1,
+-  "jobMapMB" : 1024,
+-  "jobReduceMB" : 1024
+-}
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz b/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount.json.gz
+deleted file mode 100644
+index c5cc40e7618a5ec775ccd0a827e1d46ea120e0b2..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 1452
+zcmV;d1ylMTiwFq8l%-4p19xw7WMgl2Zgehcb8l_{?V3w(+c*$_@A(ym&rZsRL`i#d
+zon+A>NekO)4@D8kHeG9@*Gkl)L6QGnN|Yr^l&vJJyDpGi;&5g-Lvr|WNax4NU@(jm
+zFG@W2FdY0f7~XuCUXQPaqg?P$w0L)3wDM1P2tWWFWIz+6I{*L_N?A&iQfCvcB3hZ=
+zxB)E$pQB_oiL#IhQQ*dNH@#1D*_Xi&-ozVI<|b_J2@8m9?gJ4MVgg1&fpL>EnEay}
+z&0UcH;y**lV*U_|7_P@3x9u)tG>BQlKX3M<rOUi1%$vi^_eWd7CQ4Z~mNzT9b~B%y
+zChqe7%{q$C=yx}WeR{Txf?;K|b2y|@S$m<EZWJ9G5mf0UH08bu$FtkX<YG3fU6jKp
+z=cN2=&$QeDDZEX#Ui<X22!XEh9!_B`jS{v)v{|jww-1b_Q|cBn3mC`(s{AugC`QAU
+z`P%bo!@Nr-nHqdH>KWsS^Dc}tHl<6RQN{W}%-zchA2P-@ihc??v=PQw)sXu@1dv*V
+zuj9fCsp6@rmC#kT6iR<5Q5L7I(MWQs6GdSr7NUw*QBb0l*D3aVpROb!ArL9kC3Rki
+z9tU5`ozR_v1Xz|`YQza$(}ag|RqhUD*SHTfDI16K-WZN}|E=vY_}U5}-=Z_-vMlY$
+z@uAm<Ud}Wj>du2<)Jy>>hf0yMs$BRu>Ln3;E{WhVlW4odyGdj@fE<EE@GvAYEek>8
+zP$V*KXyE-M0?^z;BF8pOZ0rXSunhouLDbYbP7vAhQfPq4hQ|jYIng>mRHZ>1L{bWM
+zfT&p2eh}qz;yf2b=x9MifDNo35D~*B<{?0Y4g(@cup<rX7lQ~v6M}sp!WJfbID{+?
+zcCwd47?{ZJ!%$P{I4OjI0rV+EY+xQAh2$(#C{*V_8$we0s1PdF^rVVt$Anm>jSI)+
+znmq9`$I0b9{W6#AyUa~5&Tl6de+0ZNV42P@g;(;l`&<<y-|c88$0{v;Hj&*(>%yJH
+zB#4mZ;N3`r5CTN@Vy&gp!8Iucm1<qWZrdF=>nW%pv>@)G8MJIddVmIz#V@3NP-}Wq
+zxz_abQm|QwS7|+9dl8wWF{<@Z9eNv0au#(INco&dY)Z35;3-?uFriVLN}R-5xZJ36
+zB1*R*i<s+QyJC59-83zhM7S(kBetQ*6B)<vnvU_@>dfe5-0Wh0`~TNxhRui6gE+%6
+zZTk@QnQ@r<tOsTqwONxwzZYQL#nurOWBQet39)$yU~R)zU{wjC?!{6mRg9$P3YT;D
+z*;hE+35m(o#rWn3Fu{j}``(i*>{##+n82@?c*R8Peq#O!m?$e5zEWJuL;FaRYiZ1N
+z7j2a~DR$^g>!s_}>g;So-T0b*a~D-{29T(m_*i%!RGF^)8$Y(?();nJv1na+30<;t
+z8q;v)hU|T`kXL|LaZ6rorRyv&#l~W%PtGr!rB>j6_kt`aUQrRk*g^mk+cYe`($y6>
+z;JHvLovK>f?=uoNy!XOytt<$$U_p~luAhm)Hs9f1-IqNRd;4%C`!j&q-G6odtoZ(F
+zsTOeX`HuXLPK8n7`3#t1i;rGp4YiE5Tq7-GE!SAfSj)AcWvt~|&sfWvXc_NuO`1=t
+z9oCkXv6gFF%UH{`qh)Nis)jc2<X45Y%j>n(>sj>bzILyaDxz+xGbGpSh|n>S8j{r7
+zcUsn}FF7syt)Z5&mTRPCtmPVO8Ed&Vw2ZY}>ltfV6D?yc*Or#CmTOzfSj)AeW!!gK
+ziU+Rxtb8I2f8%LU{*P%)lX>FNbRNxea*GF_F9Uc6+Gjo2yiDBX_KA#hwfuHd%+L0H
+zLA3sx(M()&%l9&I&t3Xi%8JYR^;`M6Et<t7H6;AHTq#$VYu+fU=ItksCqDrWrmn)J
+GD*ynGGs_|X
+
+diff --git a/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount2.json b/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount2.json
+deleted file mode 100644
+index 87fcfb92ee9..00000000000
+--- a/hadoop-tools/hadoop-gridmix/src/test/resources/data/wordcount2.json
++++ /dev/null
+@@ -1,828 +0,0 @@
+-{
+-  "priority" : "NORMAL",
+-  "jobID" : "job_201009241532_0001",
+-  "user" : "johndoe",
+-  "jobName" : "WordCount",
+-  "mapTasks" : [ {
+-    "startTime" : 1285322651360,
+-    "taskID" : "task_201009241532_0001_m_000000",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651366,
+-      "finishTime" : 1285322658262,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000000_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 704270,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 48266,
+-      "mapInputRecords" : 13427,
+-      "mapOutputBytes" : 1182333,
+-      "mapOutputRecords" : 126063,
+-      "combineInputRecords" : 126063,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 6612,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660778,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 704270,
+-    "inputRecords" : 13427,
+-    "outputBytes" : 48266,
+-    "outputRecords" : 126063
+-  }, {
+-    "startTime" : 1285322651361,
+-    "taskID" : "task_201009241532_0001_m_000001",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651378,
+-      "finishTime" : 1285322657906,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000001_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 577214,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 58143,
+-      "mapInputRecords" : 13015,
+-      "mapOutputBytes" : 985534,
+-      "mapOutputRecords" : 108400,
+-      "combineInputRecords" : 108400,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 8214,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660781,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 577214,
+-    "inputRecords" : 13015,
+-    "outputBytes" : 58143,
+-    "outputRecords" : 108400
+-  }, {
+-    "startTime" : 1285322660789,
+-    "taskID" : "task_201009241532_0001_m_000002",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322664865,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000002_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 163907,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 21510,
+-      "mapInputRecords" : 3736,
+-      "mapOutputBytes" : 275796,
+-      "mapOutputRecords" : 30528,
+-      "combineInputRecords" : 30528,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 3040,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322666805,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 163907,
+-    "inputRecords" : 3736,
+-    "outputBytes" : 21510,
+-    "outputRecords" : 30528
+-  } ],
+-  "finishTime" : 1285322675837,
+-  "reduceTasks" : [ {
+-    "startTime" : 1285322660790,
+-    "taskID" : "task_201009241532_0001_r_000000",
+-    "taskType" : "REDUCE",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322670759,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_r_000000_0",
+-      "shuffleFinished" : 1285322667962,
+-      "sortFinished" : 1285322668146,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : 122793,
+-      "fileBytesRead" : 111026,
+-      "fileBytesWritten" : 111026,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : 0,
+-      "reduceInputGroups" : 11713,
+-      "reduceInputRecords" : 17866,
+-      "reduceShuffleBytes" : 127823,
+-      "reduceOutputRecords" : 11713,
+-      "spilledRecords" : 17866,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322672821,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 127823,
+-    "inputRecords" : 17866,
+-    "outputBytes" : 122793,
+-    "outputRecords" : 11713
+-  } ],
+-  "submitTime" : 1285322645148,
+-  "launchTime" : 1285322645614,
+-  "totalMaps" : 3,
+-  "totalReduces" : 1,
+-  "otherTasks" : [ {
+-    "startTime" : 1285322648294,
+-    "taskID" : "task_201009241532_0001_m_000004",
+-    "taskType" : "SETUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322648482,
+-      "finishTime" : 1285322649588,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000004_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322651351,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  }, {
+-    "startTime" : 1285322672829,
+-    "taskID" : "task_201009241532_0001_m_000003",
+-    "taskType" : "CLEANUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322672838,
+-      "finishTime" : 1285322673971,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000003_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322675835,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  } ],
+-  "computonsPerMapInputByte" : -1,
+-  "computonsPerMapOutputByte" : -1,
+-  "computonsPerReduceInputByte" : -1,
+-  "computonsPerReduceOutputByte" : -1,
+-  "heapMegabytes" : 1024,
+-  "outcome" : "SUCCESS",
+-  "jobtype" : "JAVA",
+-  "directDependantJobs" : [ ],
+-  "successfulMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 6896,
+-    "minimum" : 4058,
+-    "rankings" : [ {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 3
+-  } ],
+-  "failedMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  } ],
+-  "successfulReduceAttemptCDF" : {
+-    "maximum" : 9952,
+-    "minimum" : 9952,
+-    "rankings" : [ {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 1
+-  },
+-  "failedReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "mapperTriesToSucceed" : [ 1.0 ],
+-  "failedMapperFraction" : 0.0,
+-  "relativeTime" : 0,
+-  "queue" : "default",
+-  "clusterMapMB" : -1,
+-  "clusterReduceMB" : -1,
+-  "jobMapMB" : 1024,
+-  "jobReduceMB" : 1024
+-}
+-{
+-  "priority" : "NORMAL",
+-  "jobID" : "job_201009241532_0001",
+-  "user" : "johndoe",
+-  "jobName" : "WordCount",
+-  "mapTasks" : [ {
+-    "startTime" : 1285322651360,
+-    "taskID" : "task_201009241532_0001_m_000000",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651366,
+-      "finishTime" : 1285322658262,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000000_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 704270,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 48266,
+-      "mapInputRecords" : 13427,
+-      "mapOutputBytes" : 1182333,
+-      "mapOutputRecords" : 126063,
+-      "combineInputRecords" : 126063,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 6612,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660778,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 704270,
+-    "inputRecords" : 13427,
+-    "outputBytes" : 48266,
+-    "outputRecords" : 126063
+-  }, {
+-    "startTime" : 1285322651361,
+-    "taskID" : "task_201009241532_0001_m_000001",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322651378,
+-      "finishTime" : 1285322657906,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000001_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 577214,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 58143,
+-      "mapInputRecords" : 13015,
+-      "mapOutputBytes" : 985534,
+-      "mapOutputRecords" : 108400,
+-      "combineInputRecords" : 108400,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 8214,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322660781,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 577214,
+-    "inputRecords" : 13015,
+-    "outputBytes" : 58143,
+-    "outputRecords" : 108400
+-  }, {
+-    "startTime" : 1285322660789,
+-    "taskID" : "task_201009241532_0001_m_000002",
+-    "taskType" : "MAP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322664865,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000002_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 163907,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : 21510,
+-      "mapInputRecords" : 3736,
+-      "mapOutputBytes" : 275796,
+-      "mapOutputRecords" : 30528,
+-      "combineInputRecords" : 30528,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 3040,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322666805,
+-    "preferredLocations" : [ {
+-      "layers" : [ "default-rack", "foo.example.com" ]
+-    } ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 163907,
+-    "inputRecords" : 3736,
+-    "outputBytes" : 21510,
+-    "outputRecords" : 30528
+-  } ],
+-  "finishTime" : 1285322675837,
+-  "reduceTasks" : [ {
+-    "startTime" : 1285322660790,
+-    "taskID" : "task_201009241532_0001_r_000000",
+-    "taskType" : "REDUCE",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322660807,
+-      "finishTime" : 1285322670759,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_r_000000_0",
+-      "shuffleFinished" : 1285322667962,
+-      "sortFinished" : 1285322668146,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : 122793,
+-      "fileBytesRead" : 111026,
+-      "fileBytesWritten" : 111026,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : 0,
+-      "reduceInputGroups" : 11713,
+-      "reduceInputRecords" : 17866,
+-      "reduceShuffleBytes" : 127823,
+-      "reduceOutputRecords" : 11713,
+-      "spilledRecords" : 17866,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322672821,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 127823,
+-    "inputRecords" : 17866,
+-    "outputBytes" : 122793,
+-    "outputRecords" : 11713
+-  } ],
+-  "submitTime" : 1285322645148,
+-  "launchTime" : 1285322645614,
+-  "totalMaps" : 3,
+-  "totalReduces" : 1,
+-  "otherTasks" : [ {
+-    "startTime" : 1285322648294,
+-    "taskID" : "task_201009241532_0001_m_000004",
+-    "taskType" : "SETUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322648482,
+-      "finishTime" : 1285322649588,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000004_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322651351,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  }, {
+-    "startTime" : 1285322672829,
+-    "taskID" : "task_201009241532_0001_m_000003",
+-    "taskType" : "CLEANUP",
+-    "attempts" : [ {
+-      "location" : null,
+-      "hostName" : "/default-rack/foo.example.com",
+-      "startTime" : 1285322672838,
+-      "finishTime" : 1285322673971,
+-      "result" : "SUCCESS",
+-      "attemptID" : "attempt_201009241532_0001_m_000003_0",
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : -1,
+-      "hdfsBytesWritten" : -1,
+-      "fileBytesRead" : -1,
+-      "fileBytesWritten" : -1,
+-      "mapInputRecords" : -1,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : -1,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1
+-    } ],
+-    "finishTime" : 1285322675835,
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : -1,
+-    "inputRecords" : -1,
+-    "outputBytes" : -1,
+-    "outputRecords" : -1
+-  } ],
+-  "computonsPerMapInputByte" : -1,
+-  "computonsPerMapOutputByte" : -1,
+-  "computonsPerReduceInputByte" : -1,
+-  "computonsPerReduceOutputByte" : -1,
+-  "heapMegabytes" : 1024,
+-  "outcome" : "SUCCESS",
+-  "jobtype" : "JAVA",
+-  "directDependantJobs" : [ ],
+-  "successfulMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 6896,
+-    "minimum" : 4058,
+-    "rankings" : [ {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 4058,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 6528,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 3
+-  } ],
+-  "failedMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  } ],
+-  "successfulReduceAttemptCDF" : {
+-    "maximum" : 9952,
+-    "minimum" : 9952,
+-    "rankings" : [ {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 9952,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 1
+-  },
+-  "failedReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "mapperTriesToSucceed" : [ 1.0 ],
+-  "failedMapperFraction" : 0.0,
+-  "relativeTime" : 0,
+-  "queue" : "default",
+-  "clusterMapMB" : -1,
+-  "clusterReduceMB" : -1,
+-  "jobMapMB" : 1024,
+-  "jobReduceMB" : 1024
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 1a78cc5cc0f..7c37aa1ff01 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-gridmix</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-pipes</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index eab1d560d97..7ffed40425b 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -34,7 +34,6 @@
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+-    <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-pipes</module>
+     <module>hadoop-openstack</module>
diff --git a/hadoop/stackable/patches/3.4.0/08-remove-hadoop-kafka.patch b/hadoop/stackable/patches/3.4.0/08-remove-hadoop-kafka.patch
new file mode 100644
index 000000000..cc87ef617
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/08-remove-hadoop-kafka.patch
@@ -0,0 +1,572 @@
+Entirely remove hadoop-kafka
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-tools/hadoop-kafka/pom.xml                  |  123 ------------
+ .../org/apache/hadoop/metrics2/sink/KafkaSink.java |  200 --------------------
+ .../hadoop/metrics2/impl/TestKafkaMetrics.java     |  186 -------------------
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    6 -
+ hadoop-tools/pom.xml                               |    1 
+ 5 files changed, 516 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-kafka/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-kafka/src/main/java/org/apache/hadoop/metrics2/sink/KafkaSink.java
+ delete mode 100644 hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
+
+diff --git a/hadoop-tools/hadoop-kafka/pom.xml b/hadoop-tools/hadoop-kafka/pom.xml
+deleted file mode 100644
+index 1396f71882d..00000000000
+--- a/hadoop-tools/hadoop-kafka/pom.xml
++++ /dev/null
+@@ -1,123 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-kafka</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop Kafka Library support</name>
+-  <description>
+-    This module contains code to support integration with Kafka.
+-    It also declares the dependencies needed to work with Kafka.
+-  </description>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <file.encoding>UTF-8</file.encoding>
+-    <downloadSources>true</downloadSources>
+-  </properties>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
+-        </configuration>
+-      </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- build a shellprofile -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-optional.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-
+-    <!-- see ../../hadoop-project/pom.xml for versions -->
+-    <dependency>
+-      <groupId>org.apache.kafka</groupId>
+-      <artifactId>kafka-clients</artifactId>
+-      <version>${kafka.version}</version>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.xerial.snappy</groupId>
+-          <artifactId>snappy-java</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>net.jpountz.lz4</groupId>
+-          <artifactId>lz4</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.assertj</groupId>
+-      <artifactId>assertj-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-</project>
+diff --git a/hadoop-tools/hadoop-kafka/src/main/java/org/apache/hadoop/metrics2/sink/KafkaSink.java b/hadoop-tools/hadoop-kafka/src/main/java/org/apache/hadoop/metrics2/sink/KafkaSink.java
+deleted file mode 100644
+index 9cb6b93c4e0..00000000000
+--- a/hadoop-tools/hadoop-kafka/src/main/java/org/apache/hadoop/metrics2/sink/KafkaSink.java
++++ /dev/null
+@@ -1,200 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.metrics2.sink;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
+-import org.apache.kafka.clients.producer.Producer;
+-import org.apache.kafka.clients.producer.KafkaProducer;
+-import org.apache.commons.configuration2.SubsetConfiguration;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.metrics2.AbstractMetric;
+-import org.apache.hadoop.metrics2.MetricsException;
+-import org.apache.hadoop.metrics2.MetricsRecord;
+-import org.apache.hadoop.metrics2.MetricsSink;
+-import org.apache.hadoop.metrics2.MetricsTag;
+-import org.apache.kafka.clients.producer.ProducerRecord;
+-import org.apache.kafka.clients.producer.RecordMetadata;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.nio.charset.StandardCharsets;
+-import java.time.Instant;
+-import java.time.LocalDateTime;
+-import java.time.ZoneId;
+-import java.time.format.DateTimeFormatter;
+-import java.util.Properties;
+-import java.util.concurrent.ExecutionException;
+-import java.util.concurrent.Future;
+-
+-/**
+- * A metrics sink that writes to a Kafka broker. This requires you to configure
+- * a broker_list and a topic in the metrics2 configuration file. The broker_list
+- * must contain a comma-separated list of kafka broker host and ports. The topic
+- * will contain only one topic.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Evolving
+-public class KafkaSink implements MetricsSink, Closeable {
+-  private static final Logger LOG = LoggerFactory.getLogger(KafkaSink.class);
+-  public static final String BROKER_LIST = "broker_list";
+-  public static final String TOPIC = "topic";
+-
+-  private String hostname = null;
+-  private String brokerList = null;
+-  private String topic = null;
+-  private Producer<Integer, byte[]> producer = null;
+-
+-  private final DateTimeFormatter dateFormat =
+-      DateTimeFormatter.ofPattern("yyyy-MM-dd");
+-  private final DateTimeFormatter timeFormat =
+-      DateTimeFormatter.ofPattern("HH:mm:ss");
+-  private final ZoneId zoneId = ZoneId.systemDefault();
+-
+-  public void setProducer(Producer<Integer, byte[]> p) {
+-    this.producer = p;
+-  }
+-
+-  @Override
+-  public void init(SubsetConfiguration conf) {
+-    // Get Kafka broker configuration.
+-    Properties props = new Properties();
+-    brokerList = conf.getString(BROKER_LIST);
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Broker list " + brokerList);
+-    }
+-    props.put("bootstrap.servers", brokerList);
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Kafka brokers: " + brokerList);
+-    }
+-
+-    // Get Kafka topic configuration.
+-    topic = conf.getString(TOPIC);
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Kafka topic " + topic);
+-    }
+-    if (Strings.isNullOrEmpty(topic)) {
+-      throw new MetricsException("Kafka topic can not be null");
+-    }
+-
+-    // Set the rest of Kafka configuration.
+-    props.put("key.serializer",
+-        "org.apache.kafka.common.serialization.ByteArraySerializer");
+-    props.put("value.serializer",
+-        "org.apache.kafka.common.serialization.ByteArraySerializer");
+-    props.put("request.required.acks", "0");
+-
+-    // Set the hostname once and use it in every message.
+-    hostname = "null";
+-    try {
+-      hostname = InetAddress.getLocalHost().getHostName();
+-    } catch (Exception e) {
+-      LOG.warn("Error getting Hostname, going to continue");
+-    }
+-
+-    try {
+-      // Create the producer object.
+-      producer = new KafkaProducer<Integer, byte[]>(props);
+-    } catch (Exception e) {
+-      throw new MetricsException("Error creating Producer, " + brokerList, e);
+-    }
+-  }
+-
+-  @Override
+-  public void putMetrics(MetricsRecord record) {
+-
+-    if (producer == null) {
+-      throw new MetricsException("Producer in KafkaSink is null!");
+-    }
+-
+-    // Create the json object.
+-    StringBuilder jsonLines = new StringBuilder();
+-
+-    long timestamp = record.timestamp();
+-    Instant instant = Instant.ofEpochMilli(timestamp);
+-    LocalDateTime ldt = LocalDateTime.ofInstant(instant, zoneId);
+-    String date = ldt.format(dateFormat);
+-    String time = ldt.format(timeFormat);
+-
+-    // Collect datapoints and populate the json object.
+-    jsonLines.append("{\"hostname\": \"" + hostname);
+-    jsonLines.append("\", \"timestamp\": " + timestamp);
+-    jsonLines.append(", \"date\": \"" + date);
+-    jsonLines.append("\",\"time\": \"" + time);
+-    jsonLines.append("\",\"name\": \"" + record.name() + "\" ");
+-    for (MetricsTag tag : record.tags()) {
+-      jsonLines.append(
+-          ", \"" + tag.name().toString().replaceAll("[\\p{Cc}]", "") + "\": ");
+-      jsonLines.append(" \"" + tag.value().toString() + "\"");
+-    }
+-    for (AbstractMetric metric : record.metrics()) {
+-      jsonLines.append(", \""
+-          + metric.name().toString().replaceAll("[\\p{Cc}]", "") + "\": ");
+-      jsonLines.append(" \"" + metric.value().toString() + "\"");
+-    }
+-    jsonLines.append("}");
+-    LOG.debug("kafka message: " + jsonLines.toString());
+-
+-    // Create the record to be sent from the json.
+-    ProducerRecord<Integer, byte[]> data = new ProducerRecord<Integer, byte[]>(
+-        topic, jsonLines.toString().getBytes(StandardCharsets.UTF_8));
+-
+-    // Send the data to the Kafka broker. Here is an example of this data:
+-    // {"hostname": "...", "timestamp": 1436913651516,
+-    // "date": "2015-6-14","time": "22:40:51","context": "yarn","name":
+-    // "QueueMetrics, "running_0": "1", "running_60": "0", "running_300": "0",
+-    // "running_1440": "0", "AppsSubmitted": "1", "AppsRunning": "1",
+-    // "AppsPending": "0", "AppsCompleted": "0", "AppsKilled": "0",
+-    // "AppsFailed": "0", "AllocatedMB": "134656", "AllocatedVCores": "132",
+-    // "AllocatedContainers": "132", "AggregateContainersAllocated": "132",
+-    // "AggregateContainersReleased": "0", "AvailableMB": "0",
+-    // "AvailableVCores": "0", "PendingMB": "275456", "PendingVCores": "269",
+-    // "PendingContainers": "269", "ReservedMB": "0", "ReservedVCores": "0",
+-    // "ReservedContainers": "0", "ActiveUsers": "1", "ActiveApplications": "1"}
+-    Future<RecordMetadata> future = producer.send(data);
+-    jsonLines.setLength(0);
+-    try {
+-      future.get();
+-    } catch (InterruptedException e) {
+-      throw new MetricsException("Error sending data", e);
+-    } catch (ExecutionException e) {
+-      throw new MetricsException("Error sending data", e);
+-    }
+-  }
+-
+-  @Override
+-  public void flush() {
+-    LOG.debug("Kafka seems not to have any flush() mechanism!");
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    // Close the producer and set it to null.
+-    try {
+-      producer.close();
+-    } catch (RuntimeException e) {
+-      throw new MetricsException("Error closing producer", e);
+-    } finally {
+-      producer = null;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
+deleted file mode 100644
+index 665dbddd9a5..00000000000
+--- a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java
++++ /dev/null
+@@ -1,186 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.metrics2.impl;
+-
+-import org.apache.hadoop.util.Lists;
+-import org.apache.commons.configuration2.SubsetConfiguration;
+-import org.apache.hadoop.metrics2.AbstractMetric;
+-import org.apache.hadoop.metrics2.MetricType;
+-import org.apache.hadoop.metrics2.MetricsInfo;
+-import org.apache.hadoop.metrics2.MetricsRecord;
+-import org.apache.hadoop.metrics2.MetricsTag;
+-import org.apache.hadoop.metrics2.MetricsVisitor;
+-import org.apache.hadoop.metrics2.sink.KafkaSink;
+-import org.apache.kafka.clients.producer.KafkaProducer;
+-import org.apache.kafka.clients.producer.Producer;
+-import org.apache.kafka.clients.producer.ProducerRecord;
+-import org.apache.kafka.clients.producer.RecordMetadata;
+-import org.junit.Test;
+-import org.mockito.ArgumentCaptor;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.net.InetAddress;
+-import java.text.SimpleDateFormat;
+-import java.util.Date;
+-import java.util.StringJoiner;
+-import java.util.concurrent.Future;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-import static org.assertj.core.api.Assertions.assertThat;
+-
+-/**
+- * This tests that the KafkaSink properly formats the Kafka message.
+- */
+-public class TestKafkaMetrics {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestKafkaMetrics.class);
+-  private KafkaSink kafkaSink;
+-
+-  enum KafkaMetricsInfo implements MetricsInfo {
+-    KafkaMetrics("Kafka related metrics etc."), KafkaCounter(
+-        "Kafka counter."), KafkaTag("Kafka tag.");
+-    // metrics
+-
+-    private final String desc;
+-
+-    KafkaMetricsInfo(String desc) {
+-      this.desc = desc;
+-    }
+-
+-    @Override
+-    public String description() {
+-      return desc;
+-    }
+-
+-    @Override
+-    public String toString() {
+-      return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}")
+-          .add("name=" + name())
+-          .add("description=" + desc)
+-          .toString();
+-    }
+-  }
+-
+-  @Test
+-  @SuppressWarnings({ "unchecked", "rawtypes" })
+-  public void testPutMetrics() throws Exception {
+-    // Create a record by mocking MetricsRecord class.
+-    MetricsRecord record = mock(MetricsRecord.class);
+-    when(record.tags()).thenReturn(Lists
+-        .newArrayList(new MetricsTag(KafkaMetricsInfo.KafkaTag, "test_tag")));
+-    when(record.timestamp()).thenReturn(System.currentTimeMillis());
+-
+-    // Create a metric using AbstractMetric class.
+-    AbstractMetric metric = new AbstractMetric(KafkaMetricsInfo.KafkaCounter) {
+-      @Override
+-      public Number value() {
+-        return new Integer(123);
+-      }
+-
+-      @Override
+-      public MetricType type() {
+-        return null;
+-      }
+-
+-      @Override
+-      public void visit(MetricsVisitor visitor) {
+-
+-      }
+-    };
+-
+-    // Create a list of metrics.
+-    Iterable<AbstractMetric> metrics = Lists.newArrayList(metric);
+-    when(record.name()).thenReturn("Kafka record name");
+-    when(record.metrics()).thenReturn(metrics);
+-    SubsetConfiguration conf = mock(SubsetConfiguration.class);
+-    when(conf.getString(KafkaSink.BROKER_LIST)).thenReturn("localhost:9092");
+-    String topic = "myTestKafkaTopic";
+-    when(conf.getString(KafkaSink.TOPIC)).thenReturn(topic);
+-
+-    // Create the KafkaSink object and initialize it.
+-    kafkaSink = new KafkaSink();
+-    kafkaSink.init(conf);
+-
+-    // Create a mock KafkaProducer as a producer for KafkaSink.
+-    Producer<Integer, byte[]> mockProducer = mock(KafkaProducer.class);
+-    kafkaSink.setProducer(mockProducer);
+-
+-    // Create the json object from the record.
+-    StringBuilder jsonLines = recordToJson(record);
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("kafka message: " + jsonLines.toString());
+-    }
+-
+-    // Send the record and store the result in a mock Future.
+-    Future<RecordMetadata> f = mock(Future.class);
+-    when(mockProducer.send(any())).thenReturn(f);
+-    kafkaSink.putMetrics(record);
+-
+-    // Get the argument and verity it.
+-    ArgumentCaptor<ProducerRecord> argument =
+-        ArgumentCaptor.forClass(ProducerRecord.class);
+-    verify(mockProducer).send(argument.capture());
+-
+-    // Compare the received data with the original one.
+-    ProducerRecord<Integer, byte[]> data = (argument.getValue());
+-    String jsonResult = new String(data.value());
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("kafka result: " + jsonResult);
+-    }
+-    assertThat(jsonLines.toString()).isEqualTo(jsonResult);
+-  }
+-
+-  StringBuilder recordToJson(MetricsRecord record) {
+-    // Create a json object from a metrics record.
+-    StringBuilder jsonLines = new StringBuilder();
+-    Long timestamp = record.timestamp();
+-    Date currDate = new Date(timestamp);
+-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+-    String date = dateFormat.format(currDate);
+-    SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+-    String time = timeFormat.format(currDate);
+-    String hostname = "null";
+-    try {
+-      hostname = InetAddress.getLocalHost().getHostName();
+-    } catch (Exception e) {
+-      LOG.warn("Error getting Hostname, going to continue");
+-    }
+-    jsonLines.append("{\"hostname\": \"" + hostname);
+-    jsonLines.append("\", \"timestamp\": " + timestamp);
+-    jsonLines.append(", \"date\": \"" + date);
+-    jsonLines.append("\",\"time\": \"" + time);
+-    jsonLines.append("\",\"name\": \"" + record.name() + "\" ");
+-    for (MetricsTag tag : record.tags()) {
+-      jsonLines.append(
+-          ", \"" + tag.name().toString().replaceAll("[\\p{Cc}]", "") + "\": ");
+-      jsonLines.append(" \"" + tag.value().toString() + "\"");
+-    }
+-    for (AbstractMetric m : record.metrics()) {
+-      jsonLines.append(
+-          ", \"" + m.name().toString().replaceAll("[\\p{Cc}]", "") + "\": ");
+-      jsonLines.append(" \"" + m.value().toString() + "\"");
+-    }
+-    jsonLines.append("}");
+-    return jsonLines;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 7c37aa1ff01..a8b1f23deb9 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -73,12 +73,6 @@
+       <scope>compile</scope>
+       <version>${project.version}</version>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-kafka</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 7ffed40425b..cdc305ecfd6 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -41,7 +41,6 @@
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+-    <module>hadoop-kafka</module>
+     <module>hadoop-azure-datalake</module>
+     <module>hadoop-aliyun</module>
+     <module>hadoop-fs2img</module>
diff --git a/hadoop/stackable/patches/3.4.0/09-remove-hadoop-openstack.patch b/hadoop/stackable/patches/3.4.0/09-remove-hadoop-openstack.patch
new file mode 100644
index 000000000..2dd19ec5f
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/09-remove-hadoop-openstack.patch
@@ -0,0 +1,103 @@
+Entirely remove hadoop-openstack
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-project/pom.xml                |    7 ----
+ hadoop-tools/hadoop-openstack/pom.xml |   55 ---------------------------------
+ hadoop-tools/pom.xml                  |    1 -
+ 3 files changed, 63 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-openstack/pom.xml
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 6015bb3ef10..1776a9499bd 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -682,13 +682,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <!-- This is empty; retained only for downstream app build compatibility. -->
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-openstack</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-azure</artifactId>
+diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml
+deleted file mode 100644
+index 932ba7bdef0..00000000000
+--- a/hadoop-tools/hadoop-openstack/pom.xml
++++ /dev/null
+@@ -1,55 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-openstack</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop OpenStack support</name>
+-  <description>
+-    This module used to contain code to support integration with OpenStack.
+-    It has been deleted as unsupported; the JAR is still published so as to
+-    not break applications which declare an explicit maven/ivy/SBT dependency
+-    on the module.
+-  </description>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <file.encoding>UTF-8</file.encoding>
+-    <downloadSources>true</downloadSources>
+-  </properties>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-
+-</project>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index cdc305ecfd6..400a80cb803 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-pipes</module>
+-    <module>hadoop-openstack</module>
+     <module>hadoop-sls</module>
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
diff --git a/hadoop/stackable/patches/3.4.0/10-remove-hadoop-pipes.patch b/hadoop/stackable/patches/3.4.0/10-remove-hadoop-pipes.patch
new file mode 100644
index 000000000..7944a3e58
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/10-remove-hadoop-pipes.patch
@@ -0,0 +1,3191 @@
+Entirely remove hadoop-pipes
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   28 
+ hadoop-tools/hadoop-pipes/pom.xml                  |   69 -
+ hadoop-tools/hadoop-pipes/src/CMakeLists.txt       |   99 --
+ .../src/main/native/examples/README.txt            |   16 
+ .../src/main/native/examples/conf/word-part.xml    |   41 -
+ .../src/main/native/examples/conf/word.xml         |   45 -
+ .../src/main/native/examples/impl/sort.cc          |   96 --
+ .../main/native/examples/impl/wordcount-nopipe.cc  |  148 --
+ .../main/native/examples/impl/wordcount-part.cc    |   76 -
+ .../main/native/examples/impl/wordcount-simple.cc  |   67 -
+ .../src/main/native/pipes/api/hadoop/Pipes.hh      |  260 ----
+ .../native/pipes/api/hadoop/TemplateFactory.hh     |   96 --
+ .../pipes/debug/pipes-default-gdb-commands.txt     |   14 
+ .../main/native/pipes/debug/pipes-default-script   |   15 
+ .../src/main/native/pipes/impl/HadoopPipes.cc      | 1192 --------------------
+ .../main/native/utils/api/hadoop/SerialUtils.hh    |  171 ---
+ .../main/native/utils/api/hadoop/StringUtils.hh    |   81 -
+ .../src/main/native/utils/impl/SerialUtils.cc      |  301 -----
+ .../src/main/native/utils/impl/StringUtils.cc      |  180 ---
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    7 
+ hadoop-tools/pom.xml                               |    1 
+ 21 files changed, 3003 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-pipes/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/CMakeLists.txt
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
+ delete mode 100644 hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index f99ebc66e8a..a63fabd7429 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -39,34 +39,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/src/main/native/pipes/api/hadoop</directory>
+-      <includes>
+-        <include>*.hh</include>
+-      </includes>
+-      <outputDirectory>/include</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/src/main/native/utils/api/hadoop</directory>
+-      <includes>
+-        <include>*.hh</include>
+-      </includes>
+-      <outputDirectory>/include</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/target/native</directory>
+-      <includes>
+-        <include>*.a</include>
+-      </includes>
+-      <outputDirectory>lib/native</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/target/native/examples</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>lib/native/examples</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-tools/hadoop-pipes/pom.xml b/hadoop-tools/hadoop-pipes/pom.xml
+deleted file mode 100644
+index 20143862dd7..00000000000
+--- a/hadoop-tools/hadoop-pipes/pom.xml
++++ /dev/null
+@@ -1,69 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-pipes</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Pipes</description>
+-  <name>Apache Hadoop Pipes</name>
+-  <packaging>pom</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <profiles>
+-    <profile>
+-      <id>native</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <properties>
+-        <openssl.prefix></openssl.prefix>
+-      </properties>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-maven-plugins</artifactId>
+-            <executions>
+-              <execution>
+-                <id>cmake-compile</id>
+-                <phase>compile</phase>
+-                <goals><goal>cmake-compile</goal></goals>
+-                <configuration>
+-                  <source>${basedir}/src</source>
+-                  <vars>
+-                    <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
+-                    <OPENSSL_ROOT_DIR>${openssl.prefix} </OPENSSL_ROOT_DIR>
+-                  </vars>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles> 
+-</project>
+diff --git a/hadoop-tools/hadoop-pipes/src/CMakeLists.txt b/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
+deleted file mode 100644
+index ce6ee317936..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
++++ /dev/null
+@@ -1,99 +0,0 @@
+-#
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-#
+-
+-cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+-
+-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../../hadoop-common-project/hadoop-common)
+-include(HadoopCommon)
+-
+-find_package(OpenSSL REQUIRED)
+-find_package(PkgConfig QUIET)
+-pkg_check_modules(LIBTIRPC libtirpc)
+-
+-find_path(RPC_INCLUDE_DIRS NAMES rpc/rpc.h)
+-
+-if (NOT RPC_INCLUDE_DIRS)
+-    find_path(TIRPC_INCLUDE_DIRS
+-        NAMES netconfig.h
+-        PATH_SUFFIXES tirpc
+-        HINTS ${LIBTIRPC_INCLUDE_DIRS}
+-    )
+-
+-    find_library(TIRPC_LIBRARIES
+-        NAMES tirpc
+-        HINTS ${LIBTIRPC_LIBRARY_DIRS}
+-    )
+-
+-    include_directories(${TIRPC_INCLUDE_DIRS})
+-endif()
+-
+-include_directories(
+-    main/native/utils/api
+-    main/native/pipes/api
+-    ${CMAKE_CURRENT_SOURCE_DIR}
+-    ${OPENSSL_INCLUDE_DIR}
+-)
+-
+-# Example programs
+-add_executable(wordcount-simple main/native/examples/impl/wordcount-simple.cc)
+-target_link_libraries(wordcount-simple hadooppipes hadooputils)
+-hadoop_output_directory(wordcount-simple examples)
+-
+-add_executable(wordcount-part main/native/examples/impl/wordcount-part.cc)
+-target_link_libraries(wordcount-part hadooppipes hadooputils)
+-hadoop_output_directory(wordcount-part examples)
+-
+-add_executable(wordcount-nopipe main/native/examples/impl/wordcount-nopipe.cc)
+-target_link_libraries(wordcount-nopipe hadooppipes hadooputils)
+-hadoop_output_directory(wordcount-nopipe examples)
+-
+-add_executable(pipes-sort main/native/examples/impl/sort.cc)
+-target_link_libraries(pipes-sort hadooppipes hadooputils)
+-hadoop_output_directory(pipes-sort examples)
+-
+-add_library(hadooputils STATIC
+-    main/native/utils/impl/StringUtils.cc
+-    main/native/utils/impl/SerialUtils.cc
+-)
+-if (NOT RPC_INCLUDE_DIRS AND LIBTIRPC_FOUND)
+-    target_link_libraries(hadooputils tirpc)
+-endif()
+-
+-add_library(hadooppipes STATIC
+-    main/native/pipes/impl/HadoopPipes.cc
+-)
+-
+-include(CheckLibraryExists)
+-check_library_exists(dl dlopen "" NEED_LINK_DL)
+-
+-if(NEED_LINK_DL)
+-    set(LIB_DL "dl")
+-endif()
+-
+-if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+-    exec_program("uname" ARGS "-r" OUTPUT_VARIABLE OS_VERSION)
+-    if(OS_VERSION VERSION_LESS "5.12")
+-        set(LIB_NET "socket" "nsl")
+-    endif()
+-endif()
+-
+-target_link_libraries(hadooppipes
+-    ${OPENSSL_LIBRARIES}
+-    ${LIB_DL}
+-    ${LIB_NET}
+-)
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt b/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
+deleted file mode 100644
+index 6ea8ca11a71..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
++++ /dev/null
+@@ -1,16 +0,0 @@
+-To run the examples, first compile them:
+-
+-% mvn install -Pdist,native
+-
+-and then copy the binaries to dfs:
+-
+-% hdfs dfs -put target/native/examples/wordcount-simple /examples/bin/
+-
+-create an input directory with text files:
+-
+-% hdfs dfs -put my-data in-dir
+-
+-and run the word count example:
+-
+-% mapred pipes -conf src/main/native/examples/conf/word.xml \
+-                   -input in-dir -output out-dir
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml b/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
+deleted file mode 100644
+index 5425de205bb..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
++++ /dev/null
+@@ -1,41 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<configuration>
+-
+-<property>
+-  <name>mapreduce.job.reduces</name>
+-  <value>2</value>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.executable</name>
+-  <value>hdfs:/examples/bin/wordcount-part</value>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.isjavarecordreader</name>
+-  <value>true</value>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.isjavarecordwriter</name>
+-  <value>true</value>
+-</property>
+-
+-</configuration>
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml b/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
+deleted file mode 100644
+index 9d1cd572dc3..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
++++ /dev/null
+@@ -1,45 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<configuration>
+-
+-<property>
+-  <name>mapreduce.job.reduces</name>
+-  <value>2</value>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.executable</name>
+-  <value>/examples/bin/wordcount-simple#wordcount-simple</value>
+-  <description> Executable path is given as "path#executable-name"
+-                sothat the executable will have a symlink in working directory.
+-                This can be used for gdb debugging etc.
+-  </description>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.isjavarecordreader</name>
+-  <value>true</value>
+-</property>
+-
+-<property>
+-  <name>mapreduce.pipes.isjavarecordwriter</name>
+-  <value>true</value>
+-</property>
+-
+-</configuration>
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc b/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
+deleted file mode 100644
+index 529d6fb4cdc..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#include "hadoop/Pipes.hh"
+-#include "hadoop/TemplateFactory.hh"
+-
+-class SortMap: public HadoopPipes::Mapper {
+-private:
+-  /* the fraction 0.0 to 1.0 of records to keep */
+-  float keepFraction;
+-  /* the number of records kept so far */
+-  long long keptRecords;
+-  /* the total number of records */
+-  long long totalRecords;
+-  static const std::string MAP_KEEP_PERCENT;
+-public:
+-  /*
+-   * Look in the config to find the fraction of records to keep.
+-   */
+-  SortMap(HadoopPipes::TaskContext& context){
+-    const HadoopPipes::JobConf* conf = context.getJobConf();
+-    if (conf->hasKey(MAP_KEEP_PERCENT)) {
+-      keepFraction = conf->getFloat(MAP_KEEP_PERCENT) / 100.0;
+-    } else {
+-      keepFraction = 1.0;
+-    }
+-    keptRecords = 0;
+-    totalRecords = 0;
+-  }
+-
+-  void map(HadoopPipes::MapContext& context) {
+-    totalRecords += 1;
+-    while ((float) keptRecords / totalRecords < keepFraction) {
+-      keptRecords += 1;
+-      context.emit(context.getInputKey(), context.getInputValue());
+-    }
+-  }
+-};
+-
+-const std::string SortMap::MAP_KEEP_PERCENT("mapreduce.loadgen.sort.map.preserve.percent");
+-
+-class SortReduce: public HadoopPipes::Reducer {
+-private:
+-  /* the fraction 0.0 to 1.0 of records to keep */
+-  float keepFraction;
+-  /* the number of records kept so far */
+-  long long keptRecords;
+-  /* the total number of records */
+-  long long totalRecords;
+-  static const std::string REDUCE_KEEP_PERCENT;
+-public:
+-  SortReduce(HadoopPipes::TaskContext& context){
+-    const HadoopPipes::JobConf* conf = context.getJobConf();
+-    if (conf->hasKey(REDUCE_KEEP_PERCENT)) {
+-      keepFraction = conf->getFloat(REDUCE_KEEP_PERCENT) / 100.0;
+-    } else {
+-      keepFraction = 1.0;
+-    }
+-    keptRecords = 0;
+-    totalRecords = 0;
+-  }
+-
+-  void reduce(HadoopPipes::ReduceContext& context) {
+-    while (context.nextValue()) {
+-      totalRecords += 1;
+-      while ((float) keptRecords / totalRecords < keepFraction) {
+-        keptRecords += 1;
+-        context.emit(context.getInputKey(), context.getInputValue());
+-      }
+-    }
+-  }
+-};
+-
+-const std::string 
+-  SortReduce::REDUCE_KEEP_PERCENT("mapreduce.loadgen.sort.reduce.preserve.percent");
+-
+-int main(int argc, char *argv[]) {
+-  return HadoopPipes::runTask(HadoopPipes::TemplateFactory<SortMap,
+-                                                           SortReduce>());
+-}
+-
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc b/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
+deleted file mode 100644
+index a5fe7311a0c..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#include "hadoop/Pipes.hh"
+-#include "hadoop/TemplateFactory.hh"
+-#include "hadoop/StringUtils.hh"
+-#include "hadoop/SerialUtils.hh"
+-
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-
+-const std::string WORDCOUNT = "WORDCOUNT";
+-const std::string INPUT_WORDS = "INPUT_WORDS";
+-const std::string OUTPUT_WORDS = "OUTPUT_WORDS";
+-
+-class WordCountMap: public HadoopPipes::Mapper {
+-public:
+-  HadoopPipes::TaskContext::Counter* inputWords;
+-  
+-  WordCountMap(HadoopPipes::TaskContext& context) {
+-    inputWords = context.getCounter(WORDCOUNT, INPUT_WORDS);
+-  }
+-  
+-  void map(HadoopPipes::MapContext& context) {
+-    std::vector<std::string> words = 
+-      HadoopUtils::splitString(context.getInputValue(), " ");
+-    for(unsigned int i=0; i < words.size(); ++i) {
+-      context.emit(words[i], "1");
+-    }
+-    context.incrementCounter(inputWords, words.size());
+-  }
+-};
+-
+-class WordCountReduce: public HadoopPipes::Reducer {
+-public:
+-  HadoopPipes::TaskContext::Counter* outputWords;
+-
+-  WordCountReduce(HadoopPipes::TaskContext& context) {
+-    outputWords = context.getCounter(WORDCOUNT, OUTPUT_WORDS);
+-  }
+-
+-  void reduce(HadoopPipes::ReduceContext& context) {
+-    int sum = 0;
+-    while (context.nextValue()) {
+-      sum += HadoopUtils::toInt(context.getInputValue());
+-    }
+-    context.emit(context.getInputKey(), HadoopUtils::toString(sum));
+-    context.incrementCounter(outputWords, 1); 
+-  }
+-};
+-
+-class WordCountReader: public HadoopPipes::RecordReader {
+-private:
+-  int64_t bytesTotal;
+-  int64_t bytesRead;
+-  FILE* file;
+-public:
+-  WordCountReader(HadoopPipes::MapContext& context) {
+-    std::string filename;
+-    HadoopUtils::StringInStream stream(context.getInputSplit());
+-    HadoopUtils::deserializeString(filename, stream);
+-    struct stat statResult;
+-    stat(filename.c_str(), &statResult);
+-    bytesTotal = statResult.st_size;
+-    bytesRead = 0;
+-    file = fopen(filename.c_str(), "rt");
+-    HADOOP_ASSERT(file != NULL, "failed to open " + filename);
+-  }
+-
+-  ~WordCountReader() {
+-    fclose(file);
+-  }
+-
+-  virtual bool next(std::string& key, std::string& value) {
+-    key = HadoopUtils::toString(ftell(file));
+-    int ch = getc(file);
+-    bytesRead += 1;
+-    value.clear();
+-    while (ch != -1 && ch != '\n') {
+-      value += ch;
+-      ch = getc(file);
+-      bytesRead += 1;
+-    }
+-    return ch != -1;
+-  }
+-
+-  /**
+-   * The progress of the record reader through the split as a value between
+-   * 0.0 and 1.0.
+-   */
+-  virtual float getProgress() {
+-    if (bytesTotal > 0) {
+-      return (float)bytesRead / bytesTotal;
+-    } else {
+-      return 1.0f;
+-    }
+-  }
+-};
+-
+-class WordCountWriter: public HadoopPipes::RecordWriter {
+-private:
+-  FILE* file;
+-public:
+-  WordCountWriter(HadoopPipes::ReduceContext& context) {
+-    const HadoopPipes::JobConf* job = context.getJobConf();
+-    int part = job->getInt("mapreduce.task.partition");
+-    std::string outDir = job->get("mapreduce.task.output.dir");
+-    // remove the file: schema substring
+-    std::string::size_type posn = outDir.find(":");
+-    HADOOP_ASSERT(posn != std::string::npos, 
+-                  "no schema found in output dir: " + outDir);
+-    outDir.erase(0, posn+1);
+-    mkdir(outDir.c_str(), 0777);
+-    std::string outFile = outDir + "/part-" + HadoopUtils::toString(part);
+-    file = fopen(outFile.c_str(), "wt");
+-    HADOOP_ASSERT(file != NULL, "can't open file for writing: " + outFile);
+-  }
+-
+-  ~WordCountWriter() {
+-    fclose(file);
+-  }
+-
+-  void emit(const std::string& key, const std::string& value) {
+-    fprintf(file, "%s -> %s\n", key.c_str(), value.c_str());
+-  }
+-};
+-
+-int main(int argc, char *argv[]) {
+-  return HadoopPipes::runTask(HadoopPipes::TemplateFactory<WordCountMap, 
+-                              WordCountReduce, void, void, WordCountReader,
+-                              WordCountWriter>());
+-}
+-
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc b/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
+deleted file mode 100644
+index 37dc1993c18..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#include "hadoop/Pipes.hh"
+-#include "hadoop/TemplateFactory.hh"
+-#include "hadoop/StringUtils.hh"
+-
+-const std::string WORDCOUNT = "WORDCOUNT";
+-const std::string INPUT_WORDS = "INPUT_WORDS";
+-const std::string OUTPUT_WORDS = "OUTPUT_WORDS";
+-
+-class WordCountMap: public HadoopPipes::Mapper {
+-public:
+-  HadoopPipes::TaskContext::Counter* inputWords;
+-  
+-  WordCountMap(HadoopPipes::TaskContext& context) {
+-    inputWords = context.getCounter(WORDCOUNT, INPUT_WORDS);
+-  }
+-  
+-  void map(HadoopPipes::MapContext& context) {
+-    std::vector<std::string> words = 
+-      HadoopUtils::splitString(context.getInputValue(), " ");
+-    for(unsigned int i=0; i < words.size(); ++i) {
+-      context.emit(words[i], "1");
+-    }
+-    context.incrementCounter(inputWords, words.size());
+-  }
+-};
+-
+-class WordCountReduce: public HadoopPipes::Reducer {
+-public:
+-  HadoopPipes::TaskContext::Counter* outputWords;
+-
+-  WordCountReduce(HadoopPipes::TaskContext& context) {
+-    outputWords = context.getCounter(WORDCOUNT, OUTPUT_WORDS);
+-  }
+-
+-  void reduce(HadoopPipes::ReduceContext& context) {
+-    int sum = 0;
+-    while (context.nextValue()) {
+-      sum += HadoopUtils::toInt(context.getInputValue());
+-    }
+-    context.emit(context.getInputKey(), HadoopUtils::toString(sum));
+-    context.incrementCounter(outputWords, 1); 
+-  }
+-};
+-
+-class WordCountPartitioner: public HadoopPipes::Partitioner {
+-public:
+-  WordCountPartitioner(HadoopPipes::TaskContext& context){}
+-  virtual int partition(const std::string& key, int numOfReduces) {
+-    return 0;
+-  }
+-};
+-
+-int main(int argc, char *argv[]) {
+-  return HadoopPipes::runTask(HadoopPipes::TemplateFactory<WordCountMap, 
+-                              WordCountReduce,WordCountPartitioner,
+-                              WordCountReduce>());
+-}
+-
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc b/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
+deleted file mode 100644
+index 64dd80183fa..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
++++ /dev/null
+@@ -1,67 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#include "hadoop/Pipes.hh"
+-#include "hadoop/TemplateFactory.hh"
+-#include "hadoop/StringUtils.hh"
+-
+-const std::string WORDCOUNT = "WORDCOUNT";
+-const std::string INPUT_WORDS = "INPUT_WORDS";
+-const std::string OUTPUT_WORDS = "OUTPUT_WORDS";
+-
+-class WordCountMap: public HadoopPipes::Mapper {
+-public:
+-  HadoopPipes::TaskContext::Counter* inputWords;
+-  
+-  WordCountMap(HadoopPipes::TaskContext& context) {
+-    inputWords = context.getCounter(WORDCOUNT, INPUT_WORDS);
+-  }
+-  
+-  void map(HadoopPipes::MapContext& context) {
+-    std::vector<std::string> words = 
+-      HadoopUtils::splitString(context.getInputValue(), " ");
+-    for(unsigned int i=0; i < words.size(); ++i) {
+-      context.emit(words[i], "1");
+-    }
+-    context.incrementCounter(inputWords, words.size());
+-  }
+-};
+-
+-class WordCountReduce: public HadoopPipes::Reducer {
+-public:
+-  HadoopPipes::TaskContext::Counter* outputWords;
+-
+-  WordCountReduce(HadoopPipes::TaskContext& context) {
+-    outputWords = context.getCounter(WORDCOUNT, OUTPUT_WORDS);
+-  }
+-
+-  void reduce(HadoopPipes::ReduceContext& context) {
+-    int sum = 0;
+-    while (context.nextValue()) {
+-      sum += HadoopUtils::toInt(context.getInputValue());
+-    }
+-    context.emit(context.getInputKey(), HadoopUtils::toString(sum));
+-    context.incrementCounter(outputWords, 1); 
+-  }
+-};
+-
+-int main(int argc, char *argv[]) {
+-  return HadoopPipes::runTask(HadoopPipes::TemplateFactory<WordCountMap, 
+-                              WordCountReduce>());
+-}
+-
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh b/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
+deleted file mode 100644
+index b5d0ddd1726..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
++++ /dev/null
+@@ -1,260 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#ifndef HADOOP_PIPES_HH
+-#define HADOOP_PIPES_HH
+-
+-#ifdef SWIG
+-%module (directors="1") HadoopPipes
+-%include "std_string.i"
+-%feature("director") Mapper;
+-%feature("director") Reducer;
+-%feature("director") Partitioner;
+-%feature("director") RecordReader;
+-%feature("director") RecordWriter;
+-%feature("director") Factory;
+-#else
+-#include <string>
+-#endif
+-
+-#include <stdint.h>
+-
+-namespace HadoopPipes {
+-
+-/**
+- * This interface defines the interface between application code and the 
+- * foreign code interface to Hadoop Map/Reduce.
+- */
+-
+-/**
+- * A JobConf defines the properties for a job.
+- */
+-class JobConf {
+-public:
+-  virtual bool hasKey(const std::string& key) const = 0;
+-  virtual const std::string& get(const std::string& key) const = 0;
+-  virtual int getInt(const std::string& key) const = 0;
+-  virtual float getFloat(const std::string& key) const = 0;
+-  virtual bool getBoolean(const std::string&key) const = 0;
+-  virtual ~JobConf() {}
+-};
+-
+-/**
+- * Task context provides the information about the task and job.
+- */
+-class TaskContext {
+-public:
+-  /**
+-   * Counter to keep track of a property and its value.
+-   */
+-  class Counter {
+-  private:
+-    int id;
+-  public:
+-    Counter(int counterId) : id(counterId) {}
+-    Counter(const Counter& counter) : id(counter.id) {}
+-
+-    int getId() const { return id; }
+-  };
+-  
+-  /**
+-   * Get the JobConf for the current task.
+-   */
+-  virtual const JobConf* getJobConf() = 0;
+-
+-  /**
+-   * Get the current key. 
+-   * @return the current key
+-   */
+-  virtual const std::string& getInputKey() = 0;
+-
+-  /**
+-   * Get the current value. 
+-   * @return the current value
+-   */
+-  virtual const std::string& getInputValue() = 0;
+-
+-  /**
+-   * Generate an output record
+-   */
+-  virtual void emit(const std::string& key, const std::string& value) = 0;
+-
+-  /**
+-   * Mark your task as having made progress without changing the status 
+-   * message.
+-   */
+-  virtual void progress() = 0;
+-
+-  /**
+-   * Set the status message and call progress.
+-   */
+-  virtual void setStatus(const std::string& status) = 0;
+-
+-  /**
+-   * Register a counter with the given group and name.
+-   */
+-  virtual Counter* 
+-    getCounter(const std::string& group, const std::string& name) = 0;
+-
+-  /**
+-   * Increment the value of the counter with the given amount.
+-   */
+-  virtual void incrementCounter(const Counter* counter, uint64_t amount) = 0;
+-  
+-  virtual ~TaskContext() {}
+-};
+-
+-class MapContext: public TaskContext {
+-public:
+-
+-  /**
+-   * Access the InputSplit of the mapper.
+-   */
+-  virtual const std::string& getInputSplit() = 0;
+-
+-  /**
+-   * Get the name of the key class of the input to this task.
+-   */
+-  virtual const std::string& getInputKeyClass() = 0;
+-
+-  /**
+-   * Get the name of the value class of the input to this task.
+-   */
+-  virtual const std::string& getInputValueClass() = 0;
+-
+-};
+-
+-class ReduceContext: public TaskContext {
+-public:
+-  /**
+-   * Advance to the next value.
+-   */
+-  virtual bool nextValue() = 0;
+-};
+-
+-class Closable {
+-public:
+-  virtual void close() {}
+-  virtual ~Closable() {}
+-};
+-
+-/**
+- * The application's mapper class to do map.
+- */
+-class Mapper: public Closable {
+-public:
+-  virtual void map(MapContext& context) = 0;
+-};
+-
+-/**
+- * The application's reducer class to do reduce.
+- */
+-class Reducer: public Closable {
+-public:
+-  virtual void reduce(ReduceContext& context) = 0;
+-};
+-
+-/**
+- * User code to decide where each key should be sent.
+- */
+-class Partitioner {
+-public:
+-  virtual int partition(const std::string& key, int numOfReduces) = 0;
+-  virtual ~Partitioner() {}
+-};
+-
+-/**
+- * For applications that want to read the input directly for the map function
+- * they can define RecordReaders in C++.
+- */
+-class RecordReader: public Closable {
+-public:
+-  virtual bool next(std::string& key, std::string& value) = 0;
+-
+-  /**
+-   * The progress of the record reader through the split as a value between
+-   * 0.0 and 1.0.
+-   */
+-  virtual float getProgress() = 0;
+-};
+-
+-/**
+- * An object to write key/value pairs as they are emited from the reduce.
+- */
+-class RecordWriter: public Closable {
+-public:
+-  virtual void emit(const std::string& key,
+-                    const std::string& value) = 0;
+-};
+-
+-/**
+- * A factory to create the necessary application objects.
+- */
+-class Factory {
+-public:
+-  virtual Mapper* createMapper(MapContext& context) const = 0;
+-  virtual Reducer* createReducer(ReduceContext& context) const = 0;
+-
+-  /**
+-   * Create a combiner, if this application has one.
+-   * @return the new combiner or NULL, if one is not needed
+-   */
+-  virtual Reducer* createCombiner(MapContext& context) const {
+-    return NULL; 
+-  }
+-
+-  /**
+-   * Create an application partitioner object.
+-   * @return the new partitioner or NULL, if the default partitioner should be 
+-   *     used.
+-   */
+-  virtual Partitioner* createPartitioner(MapContext& context) const {
+-    return NULL;
+-  }
+-
+-  /**
+-   * Create an application record reader.
+-   * @return the new RecordReader or NULL, if the Java RecordReader should be
+-   *    used.
+-   */
+-  virtual RecordReader* createRecordReader(MapContext& context) const {
+-    return NULL; 
+-  }
+-
+-  /**
+-   * Create an application record writer.
+-   * @return the new RecordWriter or NULL, if the Java RecordWriter should be
+-   *    used.
+-   */
+-  virtual RecordWriter* createRecordWriter(ReduceContext& context) const {
+-    return NULL;
+-  }
+-
+-  virtual ~Factory() {}
+-};
+-
+-/**
+- * Run the assigned task in the framework.
+- * The user's main function should set the various functions using the 
+- * set* functions above and then call this.
+- * @return true, if the task succeeded.
+- */
+-bool runTask(const Factory& factory);
+-
+-}
+-
+-#endif
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh b/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
+deleted file mode 100644
+index 22e10ae56fb..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#ifndef HADOOP_PIPES_TEMPLATE_FACTORY_HH
+-#define HADOOP_PIPES_TEMPLATE_FACTORY_HH
+-
+-namespace HadoopPipes {
+-
+-  template <class mapper, class reducer>
+-  class TemplateFactory2: public Factory {
+-  public:
+-    Mapper* createMapper(MapContext& context) const {
+-      return new mapper(context);
+-    }
+-    Reducer* createReducer(ReduceContext& context) const {
+-      return new reducer(context);
+-    }
+-  };
+-
+-  template <class mapper, class reducer, class partitioner>
+-  class TemplateFactory3: public TemplateFactory2<mapper,reducer> {
+-  public:
+-    Partitioner* createPartitioner(MapContext& context) const {
+-      return new partitioner(context);
+-    }
+-  };
+-
+-  template <class mapper, class reducer>
+-  class TemplateFactory3<mapper, reducer, void>
+-      : public TemplateFactory2<mapper,reducer> {
+-  };
+-
+-  template <class mapper, class reducer, class partitioner, class combiner>
+-  class TemplateFactory4
+-   : public TemplateFactory3<mapper,reducer,partitioner>{
+-  public:
+-    Reducer* createCombiner(MapContext& context) const {
+-      return new combiner(context);
+-    }
+-  };
+-
+-  template <class mapper, class reducer, class partitioner>
+-  class TemplateFactory4<mapper,reducer,partitioner,void>
+-   : public TemplateFactory3<mapper,reducer,partitioner>{
+-  };
+-
+-  template <class mapper, class reducer, class partitioner, 
+-            class combiner, class recordReader>
+-  class TemplateFactory5
+-   : public TemplateFactory4<mapper,reducer,partitioner,combiner>{
+-  public:
+-    RecordReader* createRecordReader(MapContext& context) const {
+-      return new recordReader(context);
+-    }
+-  };
+-
+-  template <class mapper, class reducer, class partitioner,class combiner>
+-  class TemplateFactory5<mapper,reducer,partitioner,combiner,void>
+-   : public TemplateFactory4<mapper,reducer,partitioner,combiner>{
+-  };
+-
+-  template <class mapper, class reducer, class partitioner=void, 
+-            class combiner=void, class recordReader=void, 
+-            class recordWriter=void> 
+-  class TemplateFactory
+-   : public TemplateFactory5<mapper,reducer,partitioner,combiner,recordReader>{
+-  public:
+-    RecordWriter* createRecordWriter(ReduceContext& context) const {
+-      return new recordWriter(context);
+-    }
+-  };
+-
+-  template <class mapper, class reducer, class partitioner, 
+-            class combiner, class recordReader>
+-  class TemplateFactory<mapper, reducer, partitioner, combiner, recordReader, 
+-                        void>
+-   : public TemplateFactory5<mapper,reducer,partitioner,combiner,recordReader>{
+-  };
+-
+-}
+-
+-#endif
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt b/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
+deleted file mode 100644
+index 906522c73c3..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-info threads
+-backtrace
+-quit
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script b/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
+deleted file mode 100644
+index 7b74fb67a1f..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#!/usr/bin/env bash
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-core=$(find . -name 'core*')
+-#Only pipes programs have 5th argument as program name.
+-gdb -quiet "${5}" -c "${core}" -x "${HADOOP_HOME}/src/c++/pipes/debug/pipes-default-gdb-commands.txt"
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc b/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
+deleted file mode 100644
+index 45cb8c20240..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
++++ /dev/null
+@@ -1,1192 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-#include "hadoop/Pipes.hh"
+-#include "hadoop/SerialUtils.hh"
+-#include "hadoop/StringUtils.hh"
+-
+-#include <map>
+-#include <vector>
+-
+-#include <errno.h>
+-#include <netinet/in.h>
+-#include <stdint.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <strings.h>
+-#include <unistd.h>
+-#include <sys/socket.h>
+-#include <pthread.h>
+-#include <iostream>
+-#include <fstream>
+-
+-#include <openssl/hmac.h>
+-#include <openssl/buffer.h>
+-
+-using std::map;
+-using std::string;
+-using std::vector;
+-
+-using namespace HadoopUtils;
+-
+-namespace HadoopPipes {
+-
+-  class JobConfImpl: public JobConf {
+-  private:
+-    map<string, string> values;
+-  public:
+-    void set(const string& key, const string& value) {
+-      values[key] = value;
+-    }
+-
+-    virtual bool hasKey(const string& key) const {
+-      return values.find(key) != values.end();
+-    }
+-
+-    virtual const string& get(const string& key) const {
+-      map<string,string>::const_iterator itr = values.find(key);
+-      if (itr == values.end()) {
+-        throw Error("Key " + key + " not found in JobConf");
+-      }
+-      return itr->second;
+-    }
+-
+-    virtual int getInt(const string& key) const {
+-      const string& val = get(key);
+-      return toInt(val);
+-    }
+-
+-    virtual float getFloat(const string& key) const {
+-      const string& val = get(key);
+-      return toFloat(val);
+-    }
+-
+-    virtual bool getBoolean(const string&key) const {
+-      const string& val = get(key);
+-      return toBool(val);
+-    }
+-  };
+-
+-  class DownwardProtocol {
+-  public:
+-    virtual void start(int protocol) = 0;
+-    virtual void setJobConf(vector<string> values) = 0;
+-    virtual void setInputTypes(string keyType, string valueType) = 0;
+-    virtual void runMap(string inputSplit, int numReduces, bool pipedInput)= 0;
+-    virtual void mapItem(const string& key, const string& value) = 0;
+-    virtual void runReduce(int reduce, bool pipedOutput) = 0;
+-    virtual void reduceKey(const string& key) = 0;
+-    virtual void reduceValue(const string& value) = 0;
+-    virtual void close() = 0;
+-    virtual void abort() = 0;
+-    virtual ~DownwardProtocol() {}
+-  };
+-
+-  class UpwardProtocol {
+-  public:
+-    virtual void output(const string& key, const string& value) = 0;
+-    virtual void partitionedOutput(int reduce, const string& key,
+-                                   const string& value) = 0;
+-    virtual void status(const string& message) = 0;
+-    virtual void progress(float progress) = 0;
+-    virtual void done() = 0;
+-    virtual void registerCounter(int id, const string& group, 
+-                                 const string& name) = 0;
+-    virtual void 
+-      incrementCounter(const TaskContext::Counter* counter, uint64_t amount) = 0;
+-    virtual ~UpwardProtocol() {}
+-  };
+-
+-  class Protocol {
+-  public:
+-    virtual void nextEvent() = 0;
+-    virtual UpwardProtocol* getUplink() = 0;
+-    virtual ~Protocol() {}
+-  };
+-
+-  class TextUpwardProtocol: public UpwardProtocol {
+-  private:
+-    FILE* stream;
+-    static const char fieldSeparator = '\t';
+-    static const char lineSeparator = '\n';
+-
+-    void writeBuffer(const string& buffer) {
+-      fputs(quoteString(buffer, "\t\n").c_str(), stream);
+-    }
+-
+-  public:
+-    TextUpwardProtocol(FILE* _stream): stream(_stream) {}
+-    
+-    virtual void output(const string& key, const string& value) {
+-      fprintf(stream, "output%c", fieldSeparator);
+-      writeBuffer(key);
+-      fprintf(stream, "%c", fieldSeparator);
+-      writeBuffer(value);
+-      fprintf(stream, "%c", lineSeparator);
+-    }
+-
+-    virtual void partitionedOutput(int reduce, const string& key,
+-                                   const string& value) {
+-      fprintf(stream, "parititionedOutput%c%d%c", fieldSeparator, reduce, 
+-              fieldSeparator);
+-      writeBuffer(key);
+-      fprintf(stream, "%c", fieldSeparator);
+-      writeBuffer(value);
+-      fprintf(stream, "%c", lineSeparator);
+-    }
+-
+-    virtual void status(const string& message) {
+-      fprintf(stream, "status%c%s%c", fieldSeparator, message.c_str(), 
+-              lineSeparator);
+-    }
+-
+-    virtual void progress(float progress) {
+-      fprintf(stream, "progress%c%f%c", fieldSeparator, progress, 
+-              lineSeparator);
+-    }
+-
+-    virtual void registerCounter(int id, const string& group, 
+-                                 const string& name) {
+-      fprintf(stream, "registerCounter%c%d%c%s%c%s%c", fieldSeparator, id,
+-              fieldSeparator, group.c_str(), fieldSeparator, name.c_str(), 
+-              lineSeparator);
+-    }
+-
+-    virtual void incrementCounter(const TaskContext::Counter* counter, 
+-                                  uint64_t amount) {
+-      fprintf(stream, "incrCounter%c%d%c%ld%c", fieldSeparator, counter->getId(), 
+-              fieldSeparator, (long)amount, lineSeparator);
+-    }
+-    
+-    virtual void done() {
+-      fprintf(stream, "done%c", lineSeparator);
+-    }
+-  };
+-
+-  class TextProtocol: public Protocol {
+-  private:
+-    FILE* downStream;
+-    DownwardProtocol* handler;
+-    UpwardProtocol* uplink;
+-    string key;
+-    string value;
+-
+-    int readUpto(string& buffer, const char* limit) {
+-      int ch;
+-      buffer.clear();
+-      while ((ch = getc(downStream)) != -1) {
+-        if (strchr(limit, ch) != NULL) {
+-          return ch;
+-        }
+-        buffer += ch;
+-      }
+-      return -1;
+-    }
+-
+-    static const char* delim;
+-  public:
+-
+-    TextProtocol(FILE* down, DownwardProtocol* _handler, FILE* up) {
+-      downStream = down;
+-      uplink = new TextUpwardProtocol(up);
+-      handler = _handler;
+-    }
+-
+-    UpwardProtocol* getUplink() {
+-      return uplink;
+-    }
+-
+-    virtual void nextEvent() {
+-      string command;
+-      string arg;
+-      int sep;
+-      sep = readUpto(command, delim);
+-      if (command == "mapItem") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(key, delim);
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(value, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->mapItem(key, value);
+-      } else if (command == "reduceValue") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(value, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->reduceValue(value);
+-      } else if (command == "reduceKey") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(key, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->reduceKey(key);
+-      } else if (command == "start") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(arg, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->start(toInt(arg));
+-      } else if (command == "setJobConf") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(arg, delim);
+-        int len = toInt(arg);
+-        vector<string> values(len);
+-        for(int i=0; i < len; ++i) {
+-          HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-          sep = readUpto(arg, delim);
+-          values.push_back(arg);
+-        }
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->setJobConf(values);
+-      } else if (command == "setInputTypes") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(key, delim);
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(value, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->setInputTypes(key, value);
+-      } else if (command == "runMap") {
+-        string split;
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(split, delim);
+-        string reduces;
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(reduces, delim);
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(arg, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->runMap(split, toInt(reduces), toBool(arg));
+-      } else if (command == "runReduce") {
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        sep = readUpto(arg, delim);
+-        HADOOP_ASSERT(sep == '\t', "Short text protocol command " + command);
+-        string piped;
+-        sep = readUpto(piped, delim);
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->runReduce(toInt(arg), toBool(piped));
+-      } else if (command == "abort") { 
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->abort();
+-      } else if (command == "close") {
+-        HADOOP_ASSERT(sep == '\n', "Long text protocol command " + command);
+-        handler->close();
+-      } else {
+-        throw Error("Illegal text protocol command " + command);
+-      }
+-    }
+-
+-    ~TextProtocol() {
+-      delete uplink;
+-    }
+-  };
+-  const char* TextProtocol::delim = "\t\n";
+-
+-  enum MESSAGE_TYPE {START_MESSAGE, SET_JOB_CONF, SET_INPUT_TYPES, RUN_MAP, 
+-                     MAP_ITEM, RUN_REDUCE, REDUCE_KEY, REDUCE_VALUE, 
+-                     CLOSE, ABORT, AUTHENTICATION_REQ,
+-                     OUTPUT=50, PARTITIONED_OUTPUT, STATUS, PROGRESS, DONE,
+-                     REGISTER_COUNTER, INCREMENT_COUNTER, AUTHENTICATION_RESP};
+-
+-  class BinaryUpwardProtocol: public UpwardProtocol {
+-  private:
+-    FileOutStream* stream;
+-  public:
+-    BinaryUpwardProtocol(FILE* _stream) {
+-      stream = new FileOutStream();
+-      HADOOP_ASSERT(stream->open(_stream), "problem opening stream");
+-    }
+-
+-    virtual void authenticate(const string &responseDigest) {
+-      serializeInt(AUTHENTICATION_RESP, *stream);
+-      serializeString(responseDigest, *stream);
+-      stream->flush();
+-    }
+-
+-    virtual void output(const string& key, const string& value) {
+-      serializeInt(OUTPUT, *stream);
+-      serializeString(key, *stream);
+-      serializeString(value, *stream);
+-    }
+-
+-    virtual void partitionedOutput(int reduce, const string& key,
+-                                   const string& value) {
+-      serializeInt(PARTITIONED_OUTPUT, *stream);
+-      serializeInt(reduce, *stream);
+-      serializeString(key, *stream);
+-      serializeString(value, *stream);
+-    }
+-
+-    virtual void status(const string& message) {
+-      serializeInt(STATUS, *stream);
+-      serializeString(message, *stream);
+-    }
+-
+-    virtual void progress(float progress) {
+-      serializeInt(PROGRESS, *stream);
+-      serializeFloat(progress, *stream);
+-      stream->flush();
+-    }
+-
+-    virtual void done() {
+-      serializeInt(DONE, *stream);
+-    }
+-
+-    virtual void registerCounter(int id, const string& group, 
+-                                 const string& name) {
+-      serializeInt(REGISTER_COUNTER, *stream);
+-      serializeInt(id, *stream);
+-      serializeString(group, *stream);
+-      serializeString(name, *stream);
+-    }
+-
+-    virtual void incrementCounter(const TaskContext::Counter* counter, 
+-                                  uint64_t amount) {
+-      serializeInt(INCREMENT_COUNTER, *stream);
+-      serializeInt(counter->getId(), *stream);
+-      serializeLong(amount, *stream);
+-    }
+-    
+-    ~BinaryUpwardProtocol() {
+-      delete stream;
+-    }
+-  };
+-
+-  class BinaryProtocol: public Protocol {
+-  private:
+-    FileInStream* downStream;
+-    DownwardProtocol* handler;
+-    BinaryUpwardProtocol * uplink;
+-    string key;
+-    string value;
+-    string password;
+-    bool authDone;
+-    void getPassword(string &password) {
+-      const char *passwordFile = getenv("hadoop.pipes.shared.secret.location");
+-      if (passwordFile == NULL) {
+-        return;
+-      }
+-      std::ifstream fstr(passwordFile, std::fstream::binary);
+-      if (fstr.fail()) {
+-        std::cerr << "Could not open the password file" << std::endl;
+-        return;
+-      } 
+-      unsigned char * passBuff = new unsigned char [512];
+-      fstr.read((char *)passBuff, 512);
+-      int passwordLength = fstr.gcount();
+-      fstr.close();
+-      passBuff[passwordLength] = 0;
+-      password.replace(0, passwordLength, (const char *) passBuff, passwordLength);
+-      delete [] passBuff;
+-      return; 
+-    }
+-
+-    void verifyDigestAndRespond(string& digest, string& challenge) {
+-      if (password.empty()) {
+-        //password can be empty if process is running in debug mode from
+-        //command file.
+-        authDone = true;
+-        return;
+-      }
+-
+-      if (!verifyDigest(password, digest, challenge)) {
+-        std::cerr << "Server failed to authenticate. Exiting" << std::endl;
+-        exit(-1);
+-      }
+-      authDone = true;
+-      string responseDigest = createDigest(password, digest);
+-      uplink->authenticate(responseDigest);
+-    }
+-
+-    bool verifyDigest(string &password, string& digest, string& challenge) {
+-      string expectedDigest = createDigest(password, challenge);
+-      if (digest == expectedDigest) {
+-        return true;
+-      } else {
+-        return false;
+-      }
+-    }
+-
+-    string createDigest(string &password, string& msg) {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-      HMAC_CTX ctx;
+-      unsigned char digest[EVP_MAX_MD_SIZE];
+-      HMAC_Init(&ctx, (const unsigned char *)password.c_str(), 
+-          password.length(), EVP_sha1());
+-      HMAC_Update(&ctx, (const unsigned char *)msg.c_str(), msg.length());
+-      unsigned int digestLen;
+-      HMAC_Final(&ctx, digest, &digestLen);
+-      HMAC_cleanup(&ctx);
+-#else
+-      HMAC_CTX *ctx = HMAC_CTX_new();
+-      unsigned char digest[EVP_MAX_MD_SIZE];
+-      HMAC_Init_ex(ctx, (const unsigned char *)password.c_str(),
+-          password.length(), EVP_sha1(), NULL);
+-      HMAC_Update(ctx, (const unsigned char *)msg.c_str(), msg.length());
+-      unsigned int digestLen;
+-      HMAC_Final(ctx, digest, &digestLen);
+-      HMAC_CTX_free(ctx);
+-#endif
+-      //now apply base64 encoding
+-      BIO *bmem, *b64;
+-      BUF_MEM *bptr;
+-
+-      b64 = BIO_new(BIO_f_base64());
+-      bmem = BIO_new(BIO_s_mem());
+-      b64 = BIO_push(b64, bmem);
+-      BIO_write(b64, digest, digestLen);
+-      BIO_flush(b64);
+-      BIO_get_mem_ptr(b64, &bptr);
+-
+-      char digestBuffer[bptr->length];
+-      memcpy(digestBuffer, bptr->data, bptr->length-1);
+-      digestBuffer[bptr->length-1] = 0;
+-      BIO_free_all(b64);
+-
+-      return string(digestBuffer);
+-    }
+-
+-  public:
+-    BinaryProtocol(FILE* down, DownwardProtocol* _handler, FILE* up) {
+-      downStream = new FileInStream();
+-      downStream->open(down);
+-      uplink = new BinaryUpwardProtocol(up);
+-      handler = _handler;
+-      authDone = false;
+-      getPassword(password);
+-    }
+-
+-    UpwardProtocol* getUplink() {
+-      return uplink;
+-    }
+-
+-    virtual void nextEvent() {
+-      int32_t cmd;
+-      cmd = deserializeInt(*downStream);
+-      if (!authDone && cmd != AUTHENTICATION_REQ) {
+-        //Authentication request must be the first message if
+-        //authentication is not complete
+-        std::cerr << "Command:" << cmd << "received before authentication. " 
+-            << "Exiting.." << std::endl;
+-        exit(-1);
+-      }
+-      switch (cmd) {
+-      case AUTHENTICATION_REQ: {
+-        string digest;
+-        string challenge;
+-        deserializeString(digest, *downStream);
+-        deserializeString(challenge, *downStream);
+-        verifyDigestAndRespond(digest, challenge);
+-        break;
+-      }
+-      case START_MESSAGE: {
+-        int32_t prot;
+-        prot = deserializeInt(*downStream);
+-        handler->start(prot);
+-        break;
+-      }
+-      case SET_JOB_CONF: {
+-        int32_t entries;
+-        entries = deserializeInt(*downStream);
+-        vector<string> result(entries);
+-        for(int i=0; i < entries; ++i) {
+-          string item;
+-          deserializeString(item, *downStream);
+-          result.push_back(item);
+-        }
+-        handler->setJobConf(result);
+-        break;
+-      }
+-      case SET_INPUT_TYPES: {
+-        string keyType;
+-        string valueType;
+-        deserializeString(keyType, *downStream);
+-        deserializeString(valueType, *downStream);
+-        handler->setInputTypes(keyType, valueType);
+-        break;
+-      }
+-      case RUN_MAP: {
+-        string split;
+-        int32_t numReduces;
+-        int32_t piped;
+-        deserializeString(split, *downStream);
+-        numReduces = deserializeInt(*downStream);
+-        piped = deserializeInt(*downStream);
+-        handler->runMap(split, numReduces, piped);
+-        break;
+-      }
+-      case MAP_ITEM: {
+-        deserializeString(key, *downStream);
+-        deserializeString(value, *downStream);
+-        handler->mapItem(key, value);
+-        break;
+-      }
+-      case RUN_REDUCE: {
+-        int32_t reduce;
+-        int32_t piped;
+-        reduce = deserializeInt(*downStream);
+-        piped = deserializeInt(*downStream);
+-        handler->runReduce(reduce, piped);
+-        break;
+-      }
+-      case REDUCE_KEY: {
+-        deserializeString(key, *downStream);
+-        handler->reduceKey(key);
+-        break;
+-      }
+-      case REDUCE_VALUE: {
+-        deserializeString(value, *downStream);
+-        handler->reduceValue(value);
+-        break;
+-      }
+-      case CLOSE:
+-        handler->close();
+-        break;
+-      case ABORT:
+-        handler->abort();
+-        break;
+-      default:
+-        HADOOP_ASSERT(false, "Unknown binary command " + toString(cmd));
+-      }
+-    }
+-
+-    virtual ~BinaryProtocol() {
+-      delete downStream;
+-      delete uplink;
+-    }
+-  };
+-
+-  /**
+-   * Define a context object to give to combiners that will let them
+-   * go through the values and emit their results correctly.
+-   */
+-  class CombineContext: public ReduceContext {
+-  private:
+-    ReduceContext* baseContext;
+-    Partitioner* partitioner;
+-    int numReduces;
+-    UpwardProtocol* uplink;
+-    bool firstKey;
+-    bool firstValue;
+-    map<string, vector<string> >::iterator keyItr;
+-    map<string, vector<string> >::iterator endKeyItr;
+-    vector<string>::iterator valueItr;
+-    vector<string>::iterator endValueItr;
+-
+-  public:
+-    CombineContext(ReduceContext* _baseContext,
+-                   Partitioner* _partitioner,
+-                   int _numReduces,
+-                   UpwardProtocol* _uplink,
+-                   map<string, vector<string> >& data) {
+-      baseContext = _baseContext;
+-      partitioner = _partitioner;
+-      numReduces = _numReduces;
+-      uplink = _uplink;
+-      keyItr = data.begin();
+-      endKeyItr = data.end();
+-      firstKey = true;
+-      firstValue = true;
+-    }
+-
+-    virtual const JobConf* getJobConf() {
+-      return baseContext->getJobConf();
+-    }
+-
+-    virtual const std::string& getInputKey() {
+-      return keyItr->first;
+-    }
+-
+-    virtual const std::string& getInputValue() {
+-      return *valueItr;
+-    }
+-
+-    virtual void emit(const std::string& key, const std::string& value) {
+-      if (partitioner != NULL) {
+-        uplink->partitionedOutput(partitioner->partition(key, numReduces),
+-                                  key, value);
+-      } else {
+-        uplink->output(key, value);
+-      }
+-    }
+-
+-    virtual void progress() {
+-      baseContext->progress();
+-    }
+-
+-    virtual void setStatus(const std::string& status) {
+-      baseContext->setStatus(status);
+-    }
+-
+-    bool nextKey() {
+-      if (firstKey) {
+-        firstKey = false;
+-      } else {
+-        ++keyItr;
+-      }
+-      if (keyItr != endKeyItr) {
+-        valueItr = keyItr->second.begin();
+-        endValueItr = keyItr->second.end();
+-        firstValue = true;
+-        return true;
+-      }
+-      return false;
+-    }
+-
+-    virtual bool nextValue() {
+-      if (firstValue) {
+-        firstValue = false;
+-      } else {
+-        ++valueItr;
+-      }
+-      return valueItr != endValueItr;
+-    }
+-    
+-    virtual Counter* getCounter(const std::string& group, 
+-                               const std::string& name) {
+-      return baseContext->getCounter(group, name);
+-    }
+-
+-    virtual void incrementCounter(const Counter* counter, uint64_t amount) {
+-      baseContext->incrementCounter(counter, amount);
+-    }
+-  };
+-
+-  /**
+-   * A RecordWriter that will take the map outputs, buffer them up and then
+-   * combine then when the buffer is full.
+-   */
+-  class CombineRunner: public RecordWriter {
+-  private:
+-    map<string, vector<string> > data;
+-    int64_t spillSize;
+-    int64_t numBytes;
+-    ReduceContext* baseContext;
+-    Partitioner* partitioner;
+-    int numReduces;
+-    UpwardProtocol* uplink;
+-    Reducer* combiner;
+-  public:
+-    CombineRunner(int64_t _spillSize, ReduceContext* _baseContext, 
+-                  Reducer* _combiner, UpwardProtocol* _uplink, 
+-                  Partitioner* _partitioner, int _numReduces) {
+-      numBytes = 0;
+-      spillSize = _spillSize;
+-      baseContext = _baseContext;
+-      partitioner = _partitioner;
+-      numReduces = _numReduces;
+-      uplink = _uplink;
+-      combiner = _combiner;
+-    }
+-
+-    virtual void emit(const std::string& key,
+-                      const std::string& value) {
+-      numBytes += key.length() + value.length();
+-      data[key].push_back(value);
+-      if (numBytes >= spillSize) {
+-        spillAll();
+-      }
+-    }
+-
+-    virtual void close() {
+-      spillAll();
+-    }
+-
+-  private:
+-    void spillAll() {
+-      CombineContext context(baseContext, partitioner, numReduces, 
+-                             uplink, data);
+-      while (context.nextKey()) {
+-        combiner->reduce(context);
+-      }
+-      data.clear();
+-      numBytes = 0;
+-    }
+-  };
+-
+-  class TaskContextImpl: public MapContext, public ReduceContext, 
+-                         public DownwardProtocol {
+-  private:
+-    bool done;
+-    JobConf* jobConf;
+-    string key;
+-    const string* newKey;
+-    const string* value;
+-    bool hasTask;
+-    bool isNewKey;
+-    bool isNewValue;
+-    string* inputKeyClass;
+-    string* inputValueClass;
+-    string status;
+-    float progressFloat;
+-    uint64_t lastProgress;
+-    bool statusSet;
+-    Protocol* protocol;
+-    UpwardProtocol *uplink;
+-    string* inputSplit;
+-    RecordReader* reader;
+-    Mapper* mapper;
+-    Reducer* reducer;
+-    RecordWriter* writer;
+-    Partitioner* partitioner;
+-    int numReduces;
+-    const Factory* factory;
+-    pthread_mutex_t mutexDone;
+-    std::vector<int> registeredCounterIds;
+-
+-  public:
+-
+-    TaskContextImpl(const Factory& _factory) {
+-      statusSet = false;
+-      done = false;
+-      newKey = NULL;
+-      factory = &_factory;
+-      jobConf = NULL;
+-      inputKeyClass = NULL;
+-      inputValueClass = NULL;
+-      inputSplit = NULL;
+-      mapper = NULL;
+-      reducer = NULL;
+-      reader = NULL;
+-      writer = NULL;
+-      partitioner = NULL;
+-      protocol = NULL;
+-      isNewKey = false;
+-      isNewValue = false;
+-      lastProgress = 0;
+-      progressFloat = 0.0f;
+-      hasTask = false;
+-      pthread_mutex_init(&mutexDone, NULL);
+-    }
+-
+-    void setProtocol(Protocol* _protocol, UpwardProtocol* _uplink) {
+-
+-      protocol = _protocol;
+-      uplink = _uplink;
+-    }
+-
+-    virtual void start(int protocol) {
+-      if (protocol != 0) {
+-        throw Error("Protocol version " + toString(protocol) + 
+-                    " not supported");
+-      }
+-    }
+-
+-    virtual void setJobConf(vector<string> values) {
+-      int len = values.size();
+-      JobConfImpl* result = new JobConfImpl();
+-      HADOOP_ASSERT(len % 2 == 0, "Odd length of job conf values");
+-      for(int i=0; i < len; i += 2) {
+-        result->set(values[i], values[i+1]);
+-      }
+-      jobConf = result;
+-    }
+-
+-    virtual void setInputTypes(string keyType, string valueType) {
+-      inputKeyClass = new string(keyType);
+-      inputValueClass = new string(valueType);
+-    }
+-
+-    virtual void runMap(string _inputSplit, int _numReduces, bool pipedInput) {
+-      inputSplit = new string(_inputSplit);
+-      reader = factory->createRecordReader(*this);
+-      HADOOP_ASSERT((reader == NULL) == pipedInput,
+-                    pipedInput ? "RecordReader defined when not needed.":
+-                    "RecordReader not defined");
+-      if (reader != NULL) {
+-        value = new string();
+-      }
+-      mapper = factory->createMapper(*this);
+-      numReduces = _numReduces;
+-      if (numReduces != 0) { 
+-        reducer = factory->createCombiner(*this);
+-        partitioner = factory->createPartitioner(*this);
+-      }
+-      if (reducer != NULL) {
+-        int64_t spillSize = 100;
+-        if (jobConf->hasKey("mapreduce.task.io.sort.mb")) {
+-          spillSize = jobConf->getInt("mapreduce.task.io.sort.mb");
+-        }
+-        writer = new CombineRunner(spillSize * 1024 * 1024, this, reducer, 
+-                                   uplink, partitioner, numReduces);
+-      }
+-      hasTask = true;
+-    }
+-
+-    virtual void mapItem(const string& _key, const string& _value) {
+-      newKey = &_key;
+-      value = &_value;
+-      isNewKey = true;
+-    }
+-
+-    virtual void runReduce(int reduce, bool pipedOutput) {
+-      reducer = factory->createReducer(*this);
+-      writer = factory->createRecordWriter(*this);
+-      HADOOP_ASSERT((writer == NULL) == pipedOutput,
+-                    pipedOutput ? "RecordWriter defined when not needed.":
+-                    "RecordWriter not defined");
+-      hasTask = true;
+-    }
+-
+-    virtual void reduceKey(const string& _key) {
+-      isNewKey = true;
+-      newKey = &_key;
+-    }
+-
+-    virtual void reduceValue(const string& _value) {
+-      isNewValue = true;
+-      value = &_value;
+-    }
+-    
+-    virtual bool isDone() {
+-      pthread_mutex_lock(&mutexDone);
+-      bool doneCopy = done;
+-      pthread_mutex_unlock(&mutexDone);
+-      return doneCopy;
+-    }
+-
+-    virtual void close() {
+-      pthread_mutex_lock(&mutexDone);
+-      done = true;
+-      pthread_mutex_unlock(&mutexDone);
+-    }
+-
+-    virtual void abort() {
+-      throw Error("Aborted by driver");
+-    }
+-
+-    void waitForTask() {
+-      while (!done && !hasTask) {
+-        protocol->nextEvent();
+-      }
+-    }
+-
+-    bool nextKey() {
+-      if (reader == NULL) {
+-        while (!isNewKey) {
+-          nextValue();
+-          if (done) {
+-            return false;
+-          }
+-        }
+-        key = *newKey;
+-      } else {
+-        if (!reader->next(key, const_cast<string&>(*value))) {
+-          pthread_mutex_lock(&mutexDone);
+-          done = true;
+-          pthread_mutex_unlock(&mutexDone);
+-          return false;
+-        }
+-        progressFloat = reader->getProgress();
+-      }
+-      isNewKey = false;
+-      if (mapper != NULL) {
+-        mapper->map(*this);
+-      } else {
+-        reducer->reduce(*this);
+-      }
+-      return true;
+-    }
+-
+-    /**
+-     * Advance to the next value.
+-     */
+-    virtual bool nextValue() {
+-      if (isNewKey || done) {
+-        return false;
+-      }
+-      isNewValue = false;
+-      progress();
+-      protocol->nextEvent();
+-      return isNewValue;
+-    }
+-
+-    /**
+-     * Get the JobConf for the current task.
+-     */
+-    virtual JobConf* getJobConf() {
+-      return jobConf;
+-    }
+-
+-    /**
+-     * Get the current key. 
+-     * @return the current key or NULL if called before the first map or reduce
+-     */
+-    virtual const string& getInputKey() {
+-      return key;
+-    }
+-
+-    /**
+-     * Get the current value. 
+-     * @return the current value or NULL if called before the first map or 
+-     *    reduce
+-     */
+-    virtual const string& getInputValue() {
+-      return *value;
+-    }
+-
+-    /**
+-     * Mark your task as having made progress without changing the status 
+-     * message.
+-     */
+-    virtual void progress() {
+-      if (uplink != 0) {
+-        uint64_t now = getCurrentMillis();
+-        if (now - lastProgress > 1000) {
+-          lastProgress = now;
+-          if (statusSet) {
+-            uplink->status(status);
+-            statusSet = false;
+-          }
+-          uplink->progress(progressFloat);
+-        }
+-      }
+-    }
+-
+-    /**
+-     * Set the status message and call progress.
+-     */
+-    virtual void setStatus(const string& status) {
+-      this->status = status;
+-      statusSet = true;
+-      progress();
+-    }
+-
+-    /**
+-     * Get the name of the key class of the input to this task.
+-     */
+-    virtual const string& getInputKeyClass() {
+-      return *inputKeyClass;
+-    }
+-
+-    /**
+-     * Get the name of the value class of the input to this task.
+-     */
+-    virtual const string& getInputValueClass() {
+-      return *inputValueClass;
+-    }
+-
+-    /**
+-     * Access the InputSplit of the mapper.
+-     */
+-    virtual const std::string& getInputSplit() {
+-      return *inputSplit;
+-    }
+-
+-    virtual void emit(const string& key, const string& value) {
+-      progress();
+-      if (writer != NULL) {
+-        writer->emit(key, value);
+-      } else if (partitioner != NULL) {
+-        int part = partitioner->partition(key, numReduces);
+-        uplink->partitionedOutput(part, key, value);
+-      } else {
+-        uplink->output(key, value);
+-      }
+-    }
+-
+-    /**
+-     * Register a counter with the given group and name.
+-     */
+-    virtual Counter* getCounter(const std::string& group, 
+-                               const std::string& name) {
+-      int id = registeredCounterIds.size();
+-      registeredCounterIds.push_back(id);
+-      uplink->registerCounter(id, group, name);
+-      return new Counter(id);
+-    }
+-
+-    /**
+-     * Increment the value of the counter with the given amount.
+-     */
+-    virtual void incrementCounter(const Counter* counter, uint64_t amount) {
+-      uplink->incrementCounter(counter, amount); 
+-    }
+-
+-    void closeAll() {
+-      if (reader) {
+-        reader->close();
+-      }
+-      if (mapper) {
+-        mapper->close();
+-      }
+-      if (reducer) {
+-        reducer->close();
+-      }
+-      if (writer) {
+-        writer->close();
+-      }
+-    }
+-
+-    virtual ~TaskContextImpl() {
+-      delete jobConf;
+-      delete inputKeyClass;
+-      delete inputValueClass;
+-      delete inputSplit;
+-      if (reader) {
+-        delete value;
+-      }
+-      delete reader;
+-      delete mapper;
+-      delete reducer;
+-      delete writer;
+-      delete partitioner;
+-      pthread_mutex_destroy(&mutexDone);
+-    }
+-  };
+-
+-  /**
+-   * Ping the parent every 5 seconds to know if it is alive 
+-   */
+-  void* ping(void* ptr) {
+-    TaskContextImpl* context = (TaskContextImpl*) ptr;
+-    char* portStr = getenv("mapreduce.pipes.command.port");
+-    int MAX_RETRIES = 3;
+-    int remaining_retries = MAX_RETRIES;
+-    while (!context->isDone()) {
+-      try{
+-        sleep(5);
+-        int sock = -1;
+-        if (portStr) {
+-          sock = socket(PF_INET, SOCK_STREAM, 0);
+-          HADOOP_ASSERT(sock != - 1,
+-                        string("problem creating socket: ") + strerror(errno));
+-          sockaddr_in addr;
+-          addr.sin_family = AF_INET;
+-          addr.sin_port = htons(toInt(portStr));
+-          addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+-          HADOOP_ASSERT(connect(sock, (sockaddr*) &addr, sizeof(addr)) == 0,
+-                        string("problem connecting command socket: ") +
+-                        strerror(errno));
+-
+-        }
+-        if (sock != -1) {
+-          int result = shutdown(sock, SHUT_RDWR);
+-          HADOOP_ASSERT(result == 0, "problem shutting socket");
+-          result = close(sock);
+-          HADOOP_ASSERT(result == 0, "problem closing socket");
+-        }
+-        remaining_retries = MAX_RETRIES;
+-      } catch (Error& err) {
+-        if (!context->isDone()) {
+-          fprintf(stderr, "Hadoop Pipes Exception: in ping %s\n", 
+-                err.getMessage().c_str());
+-          remaining_retries -= 1;
+-          if (remaining_retries == 0) {
+-            exit(1);
+-          }
+-        } else {
+-          return NULL;
+-        }
+-      }
+-    }
+-    return NULL;
+-  }
+-
+-  /**
+-   * Run the assigned task in the framework.
+-   * The user's main function should set the various functions using the 
+-   * set* functions above and then call this.
+-   * @return true, if the task succeeded.
+-   */
+-  bool runTask(const Factory& factory) {
+-    try {
+-      TaskContextImpl* context = new TaskContextImpl(factory);
+-      Protocol* connection;
+-      char* portStr = getenv("mapreduce.pipes.command.port");
+-      int sock = -1;
+-      FILE* stream = NULL;
+-      FILE* outStream = NULL;
+-      char *bufin = NULL;
+-      char *bufout = NULL;
+-      if (portStr) {
+-        sock = socket(PF_INET, SOCK_STREAM, 0);
+-        HADOOP_ASSERT(sock != - 1,
+-                      string("problem creating socket: ") + strerror(errno));
+-        sockaddr_in addr;
+-        addr.sin_family = AF_INET;
+-        addr.sin_port = htons(toInt(portStr));
+-        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+-        HADOOP_ASSERT(connect(sock, (sockaddr*) &addr, sizeof(addr)) == 0,
+-                      string("problem connecting command socket: ") +
+-                      strerror(errno));
+-
+-        stream = fdopen(sock, "r");
+-        outStream = fdopen(sock, "w");
+-
+-        // increase buffer size
+-        int bufsize = 128*1024;
+-        int setbuf;
+-        bufin = new char[bufsize];
+-        bufout = new char[bufsize];
+-        setbuf = setvbuf(stream, bufin, _IOFBF, bufsize);
+-        HADOOP_ASSERT(setbuf == 0, string("problem with setvbuf for inStream: ")
+-                                     + strerror(errno));
+-        setbuf = setvbuf(outStream, bufout, _IOFBF, bufsize);
+-        HADOOP_ASSERT(setbuf == 0, string("problem with setvbuf for outStream: ")
+-                                     + strerror(errno));
+-        connection = new BinaryProtocol(stream, context, outStream);
+-      } else if (getenv("mapreduce.pipes.commandfile")) {
+-        char* filename = getenv("mapreduce.pipes.commandfile");
+-        string outFilename = filename;
+-        outFilename += ".out";
+-        stream = fopen(filename, "r");
+-        outStream = fopen(outFilename.c_str(), "w");
+-        connection = new BinaryProtocol(stream, context, outStream);
+-      } else {
+-        connection = new TextProtocol(stdin, context, stdout);
+-      }
+-      context->setProtocol(connection, connection->getUplink());
+-      pthread_t pingThread;
+-      pthread_create(&pingThread, NULL, ping, (void*)(context));
+-      context->waitForTask();
+-      while (!context->isDone()) {
+-        context->nextKey();
+-      }
+-      context->closeAll();
+-      connection->getUplink()->done();
+-      pthread_join(pingThread,NULL);
+-      delete context;
+-      delete connection;
+-      if (stream != NULL) {
+-        fflush(stream);
+-      }
+-      if (outStream != NULL) {
+-        fflush(outStream);
+-      }
+-      fflush(stdout);
+-      if (sock != -1) {
+-        int result = shutdown(sock, SHUT_RDWR);
+-        HADOOP_ASSERT(result == 0, "problem shutting socket");
+-        result = close(sock);
+-        HADOOP_ASSERT(result == 0, "problem closing socket");
+-      }
+-      if (stream != NULL) {
+-        //fclose(stream);
+-      }
+-      if (outStream != NULL) {
+-        //fclose(outStream);
+-      } 
+-      delete[] bufin;
+-      delete[] bufout;
+-      return true;
+-    } catch (Error& err) {
+-      fprintf(stderr, "Hadoop Pipes Exception: %s\n", 
+-              err.getMessage().c_str());
+-      return false;
+-    }
+-  }
+-}
+-
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh b/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
+deleted file mode 100644
+index ec1838b51d7..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
++++ /dev/null
+@@ -1,171 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#ifndef HADOOP_SERIAL_UTILS_HH
+-#define HADOOP_SERIAL_UTILS_HH
+-
+-#include <string>
+-#include <stdint.h>
+-
+-namespace HadoopUtils {
+-
+-  /**
+-   * A simple exception class that records a message for the user.
+-   */
+-  class Error {
+-  private:
+-    std::string error;
+-  public:
+-
+-    /**
+-     * Create an error object with the given message.
+-     */
+-    Error(const std::string& msg);
+-
+-    /**
+-     * Construct an error object with the given message that was created on
+-     * the given file, line, and functino.
+-     */
+-    Error(const std::string& msg, 
+-          const std::string& file, int line, const std::string& function);
+-
+-    /**
+-     * Get the error message.
+-     */
+-    const std::string& getMessage() const;
+-  };
+-
+-  /**
+-   * Check to make sure that the condition is true, and throw an exception
+-   * if it is not. The exception will contain the message and a description
+-   * of the source location.
+-   */
+-  #define HADOOP_ASSERT(CONDITION, MESSAGE) \
+-    { \
+-      if (!(CONDITION)) { \
+-        throw HadoopUtils::Error((MESSAGE), __FILE__, __LINE__, \
+-                                    __func__); \
+-      } \
+-    }
+-
+-  /**
+-   * An interface for an input stream.
+-   */
+-  class InStream {
+-  public:
+-    /**
+-     * Reads len bytes from the stream into the buffer.
+-     * @param buf the buffer to read into
+-     * @param buflen the length of the buffer
+-     * @throws Error if there are problems reading
+-     */
+-    virtual void read(void *buf, size_t len) = 0;
+-    virtual ~InStream() {}
+-  };
+-
+-  /**
+-   * An interface for an output stream.
+-   */
+-  class OutStream {
+-  public:
+-    /**
+-     * Write the given buffer to the stream.
+-     * @param buf the data to write
+-     * @param len the number of bytes to write
+-     * @throws Error if there are problems writing
+-     */
+-    virtual void write(const void *buf, size_t len) = 0;
+-    /**
+-     * Flush the data to the underlying store.
+-     */
+-    virtual void flush() = 0;
+-    virtual ~OutStream() {}
+-  };
+-
+-  /**
+-   * A class to read a file as a stream.
+-   */
+-  class FileInStream : public InStream {
+-  public:
+-    FileInStream();
+-    bool open(const std::string& name);
+-    bool open(FILE* file);
+-    void read(void *buf, size_t buflen);
+-    bool skip(size_t nbytes);
+-    bool close();
+-    virtual ~FileInStream();
+-  private:
+-    /**
+-     * The file to write to.
+-     */
+-    FILE *mFile;
+-    /**
+-     * Does is this class responsible for closing the FILE*?
+-     */
+-    bool isOwned;
+-  };
+-
+-  /**
+-   * A class to write a stream to a file.
+-   */
+-  class FileOutStream: public OutStream {
+-  public:
+-
+-    /**
+-     * Create a stream that isn't bound to anything.
+-     */
+-    FileOutStream();
+-
+-    /**
+-     * Create the given file, potentially overwriting an existing file.
+-     */
+-    bool open(const std::string& name, bool overwrite);
+-    bool open(FILE* file);
+-    void write(const void* buf, size_t len);
+-    bool advance(size_t nbytes);
+-    void flush();
+-    bool close();
+-    virtual ~FileOutStream();
+-  private:
+-    FILE *mFile;
+-    bool isOwned;
+-  };
+-
+-  /**
+-   * A stream that reads from a string.
+-   */
+-  class StringInStream: public InStream {
+-  public:
+-    StringInStream(const std::string& str);
+-    virtual void read(void *buf, size_t buflen);
+-  private:
+-    const std::string& buffer;
+-    std::string::const_iterator itr;
+-  };
+-
+-  void serializeInt(int32_t t, OutStream& stream);
+-  int32_t deserializeInt(InStream& stream);
+-  void serializeLong(int64_t t, OutStream& stream);
+-  int64_t deserializeLong(InStream& stream);
+-  void serializeFloat(float t, OutStream& stream);
+-  void deserializeFloat(float& t, InStream& stream);
+-  float deserializeFloat(InStream& stream);
+-  void serializeString(const std::string& t, OutStream& stream);
+-  void deserializeString(std::string& t, InStream& stream);
+-}
+-
+-#endif
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh b/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
+deleted file mode 100644
+index 47201727250..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#ifndef HADOOP_STRING_UTILS_HH
+-#define HADOOP_STRING_UTILS_HH
+-
+-#include <stdint.h>
+-#include <string>
+-#include <vector>
+-
+-namespace HadoopUtils {
+-
+-  /**
+-   * Convert an integer to a string.
+-   */
+-  std::string toString(int32_t x);
+-
+-  /**
+-   * Convert a string to an integer.
+-   * @throws Error if the string is not a valid integer
+-   */
+-  int32_t toInt(const std::string& val);
+-
+-  /**
+-   * Convert the string to a float.
+-   * @throws Error if the string is not a valid float
+-   */
+-  float toFloat(const std::string& val);
+-
+-  /**
+-   * Convert the string to a boolean.
+-   * @throws Error if the string is not a valid boolean value
+-   */
+-  bool toBool(const std::string& val);
+-
+-  /**
+-   * Get the current time in the number of milliseconds since 1970.
+-   */
+-  uint64_t getCurrentMillis();
+-
+-  /**
+-   * Split a string into "words". Multiple deliminators are treated as a single
+-   * word break, so no zero-length words are returned.
+-   * @param str the string to split
+-   * @param separator a list of characters that divide words
+-   */
+-  std::vector<std::string> splitString(const std::string& str,
+-                                       const char* separator);
+-
+-  /**
+-   * Quote a string to avoid "\", non-printable characters, and the 
+-   * deliminators.
+-   * @param str the string to quote
+-   * @param deliminators the set of characters to always quote
+-   */
+-  std::string quoteString(const std::string& str,
+-                          const char* deliminators);
+-
+-  /**
+-   * Unquote the given string to return the original string.
+-   * @param str the string to unquote
+-   */
+-  std::string unquoteString(const std::string& str);
+-
+-}
+-
+-#endif
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc b/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
+deleted file mode 100644
+index 401dfee80c2..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
++++ /dev/null
+@@ -1,301 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#include "hadoop/SerialUtils.hh"
+-#include "hadoop/StringUtils.hh"
+-
+-#include <errno.h>
+-#include <rpc/types.h>
+-#include <rpc/xdr.h>
+-#include <string>
+-#include <string.h>
+-
+-using std::string;
+-
+-namespace HadoopUtils {
+-
+-  Error::Error(const std::string& msg): error(msg) {
+-  }
+-
+-  Error::Error(const std::string& msg, 
+-               const std::string& file, int line, 
+-               const std::string& function) {
+-    error = msg + " at " + file + ":" + toString(line) + 
+-            " in " + function;
+-  }
+-
+-  const std::string& Error::getMessage() const {
+-    return error;
+-  }
+-
+-  FileInStream::FileInStream()
+-  {
+-    mFile = NULL;
+-    isOwned = false;
+-  }
+-
+-  bool FileInStream::open(const std::string& name)
+-  {
+-    mFile = fopen(name.c_str(), "rb");
+-    isOwned = true;
+-    return (mFile != NULL);
+-  }
+-
+-  bool FileInStream::open(FILE* file)
+-  {
+-    mFile = file;
+-    isOwned = false;
+-    return (mFile != NULL);
+-  }
+-
+-  void FileInStream::read(void *buf, size_t len)
+-  {
+-    size_t result = fread(buf, len, 1, mFile);
+-    if (result == 0) {
+-      if (feof(mFile)) {
+-        HADOOP_ASSERT(false, "end of file");
+-      } else {
+-        HADOOP_ASSERT(false, string("read error on file: ") + strerror(errno));
+-      }
+-    }
+-  }
+-
+-  bool FileInStream::skip(size_t nbytes)
+-  {
+-    return (0==fseek(mFile, nbytes, SEEK_CUR));
+-  }
+-
+-  bool FileInStream::close()
+-  {
+-    int ret = 0;
+-    if (mFile != NULL && isOwned) {
+-      ret = fclose(mFile);
+-    }
+-    mFile = NULL;
+-    return (ret==0);
+-  }
+-
+-  FileInStream::~FileInStream()
+-  {
+-    if (mFile != NULL) {
+-      close();
+-    }
+-  }
+-
+-  FileOutStream::FileOutStream()
+-  {
+-    mFile = NULL;
+-    isOwned = false;
+-  }
+-
+-  bool FileOutStream::open(const std::string& name, bool overwrite)
+-  {
+-    if (!overwrite) {
+-      mFile = fopen(name.c_str(), "rb");
+-      if (mFile != NULL) {
+-        fclose(mFile);
+-        return false;
+-      }
+-    }
+-    mFile = fopen(name.c_str(), "wb");
+-    isOwned = true;
+-    return (mFile != NULL);
+-  }
+-
+-  bool FileOutStream::open(FILE* file)
+-  {
+-    mFile = file;
+-    isOwned = false;
+-    return (mFile != NULL);
+-  }
+-
+-  void FileOutStream::write(const void* buf, size_t len)
+-  {
+-    size_t result = fwrite(buf, len, 1, mFile);
+-    HADOOP_ASSERT(result == 1,
+-                  string("write error to file: ") + strerror(errno));
+-  }
+-
+-  bool FileOutStream::advance(size_t nbytes)
+-  {
+-    return (0==fseek(mFile, nbytes, SEEK_CUR));
+-  }
+-
+-  bool FileOutStream::close()
+-  {
+-    int ret = 0;
+-    if (mFile != NULL && isOwned) {
+-      ret = fclose(mFile);
+-    }
+-    mFile = NULL;
+-    return (ret == 0);
+-  }
+-
+-  void FileOutStream::flush()
+-  {
+-    fflush(mFile);
+-  }
+-
+-  FileOutStream::~FileOutStream()
+-  {
+-    if (mFile != NULL) {
+-      close();
+-    }
+-  }
+-
+-  StringInStream::StringInStream(const std::string& str): buffer(str) {
+-    itr = buffer.begin();
+-  }
+-
+-  void StringInStream::read(void *buf, size_t buflen) {
+-    size_t bytes = 0;
+-    char* output = (char*) buf;
+-    std::string::const_iterator end = buffer.end();
+-    while (bytes < buflen) {
+-      output[bytes++] = *itr;
+-      ++itr;
+-      if (itr == end) {
+-        break;
+-      }
+-    }
+-    HADOOP_ASSERT(bytes == buflen, "unexpected end of string reached");
+-  }
+-
+-  void serializeInt(int32_t t, OutStream& stream) {
+-    serializeLong(t,stream);
+-  }
+-
+-  void serializeLong(int64_t t, OutStream& stream)
+-  {
+-    if (t >= -112 && t <= 127) {
+-      int8_t b = t;
+-      stream.write(&b, 1);
+-      return;
+-    }
+-        
+-    int8_t len = -112;
+-    if (t < 0) {
+-      t ^= -1ll; // reset the sign bit
+-      len = -120;
+-    }
+-        
+-    uint64_t tmp = t;
+-    while (tmp != 0) {
+-      tmp = tmp >> 8;
+-      len--;
+-    }
+-  
+-    stream.write(&len, 1);      
+-    len = (len < -120) ? -(len + 120) : -(len + 112);
+-        
+-    for (uint32_t idx = len; idx != 0; idx--) {
+-      uint32_t shiftbits = (idx - 1) * 8;
+-      uint64_t mask = 0xFFll << shiftbits;
+-      uint8_t b = (t & mask) >> shiftbits;
+-      stream.write(&b, 1);
+-    }
+-  }
+-
+-  int32_t deserializeInt(InStream& stream) {
+-    return deserializeLong(stream);
+-  }
+-
+-  int64_t deserializeLong(InStream& stream)
+-  {
+-    int8_t b;
+-    stream.read(&b, 1);
+-    if (b >= -112) {
+-      return b;
+-    }
+-    bool negative;
+-    int len;
+-    if (b < -120) {
+-      negative = true;
+-      len = -120 - b;
+-    } else {
+-      negative = false;
+-      len = -112 - b;
+-    }
+-    uint8_t barr[len];
+-    stream.read(barr, len);
+-    int64_t t = 0;
+-    for (int idx = 0; idx < len; idx++) {
+-      t = t << 8;
+-      t |= (barr[idx] & 0xFF);
+-    }
+-    if (negative) {
+-      t ^= -1ll;
+-    }
+-    return t;
+-  }
+-
+-  void serializeFloat(float t, OutStream& stream)
+-  {
+-    char buf[sizeof(float)];
+-    XDR xdrs;
+-    xdrmem_create(&xdrs, buf, sizeof(float), XDR_ENCODE);
+-    xdr_float(&xdrs, &t);
+-    stream.write(buf, sizeof(float));
+-  }
+-
+-  float deserializeFloat(InStream& stream)
+-  {
+-    float f;
+-    deserializeFloat(f, stream);
+-    return f;
+-  }
+-
+-  void deserializeFloat(float& t, InStream& stream)
+-  {
+-    char buf[sizeof(float)];
+-    stream.read(buf, sizeof(float));
+-    XDR xdrs;
+-    xdrmem_create(&xdrs, buf, sizeof(float), XDR_DECODE);
+-    xdr_float(&xdrs, &t);
+-  }
+-
+-  void serializeString(const std::string& t, OutStream& stream)
+-  {
+-    serializeInt(t.length(), stream);
+-    if (t.length() > 0) {
+-      stream.write(t.data(), t.length());
+-    }
+-  }
+-
+-  void deserializeString(std::string& t, InStream& stream)
+-  {
+-    int32_t len = deserializeInt(stream);
+-    if (len > 0) {
+-      // resize the string to the right length
+-      t.resize(len);
+-      // read into the string in 64k chunks
+-      const int bufSize = 65536;
+-      int offset = 0;
+-      char buf[bufSize];
+-      while (len > 0) {
+-        int chunkLength = len > bufSize ? bufSize : len;
+-        stream.read(buf, chunkLength);
+-        t.replace(offset, chunkLength, buf, chunkLength);
+-        offset += chunkLength;
+-        len -= chunkLength;
+-      }
+-    } else {
+-      t.clear();
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc b/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
+deleted file mode 100644
+index 0d2a878ab30..00000000000
+--- a/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
++++ /dev/null
+@@ -1,180 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-#include "hadoop/StringUtils.hh"
+-#include "hadoop/SerialUtils.hh"
+-
+-#include <errno.h>
+-#include <stdint.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <strings.h>
+-#include <sys/time.h>
+-
+-using std::string;
+-using std::vector;
+-
+-namespace HadoopUtils {
+-
+-  string toString(int32_t x) {
+-    char str[100];
+-    sprintf(str, "%d", x);
+-    return str;
+-  }
+-
+-  int toInt(const string& val) {
+-    int result;
+-    char trash;
+-    int num = sscanf(val.c_str(), "%d%c", &result, &trash);
+-    HADOOP_ASSERT(num == 1,
+-                  "Problem converting " + val + " to integer.");
+-    return result;
+-  }
+-
+-  float toFloat(const string& val) {
+-    float result;
+-    char trash;
+-    int num = sscanf(val.c_str(), "%f%c", &result, &trash);
+-    HADOOP_ASSERT(num == 1,
+-                  "Problem converting " + val + " to float.");
+-    return result;
+-  }
+-
+-  bool toBool(const string& val) {
+-    if (val == "true") {
+-      return true;
+-    } else if (val == "false") {
+-      return false;
+-    } else {
+-      HADOOP_ASSERT(false,
+-                    "Problem converting " + val + " to boolean.");
+-    }
+-  }
+-
+-  /**
+-   * Get the current time in the number of milliseconds since 1970.
+-   */
+-  uint64_t getCurrentMillis() {
+-    struct timeval tv;
+-    struct timezone tz;
+-    int sys = gettimeofday(&tv, &tz);
+-    HADOOP_ASSERT(sys != -1, strerror(errno));
+-    return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+-  }
+-
+-  vector<string> splitString(const std::string& str,
+-			     const char* separator) {
+-    vector<string> result;
+-    string::size_type prev_pos=0;
+-    string::size_type pos=0;
+-    while ((pos = str.find_first_of(separator, prev_pos)) != string::npos) {
+-      if (prev_pos < pos) {
+-	result.push_back(str.substr(prev_pos, pos-prev_pos));
+-      }
+-      prev_pos = pos + 1;
+-    }
+-    if (prev_pos < str.size()) {
+-      result.push_back(str.substr(prev_pos));
+-    }
+-    return result;
+-  }
+-
+-  string quoteString(const string& str,
+-                     const char* deliminators) {
+-    
+-    string result(str);
+-    for(int i=result.length() -1; i >= 0; --i) {
+-      char ch = result[i];
+-      if (!isprint(ch) ||
+-          ch == '\\' || 
+-          strchr(deliminators, ch)) {
+-        switch (ch) {
+-        case '\\':
+-          result.replace(i, 1, "\\\\");
+-          break;
+-        case '\t':
+-          result.replace(i, 1, "\\t");
+-          break;
+-        case '\n':
+-          result.replace(i, 1, "\\n");
+-          break;
+-        case ' ':
+-          result.replace(i, 1, "\\s");
+-          break;
+-        default:
+-          char buff[4];
+-          sprintf(buff, "\\%02x", static_cast<unsigned char>(result[i]));
+-          result.replace(i, 1, buff);
+-        }
+-      }
+-    }
+-    return result;
+-  }
+-
+-  string unquoteString(const string& str) {
+-    string result(str);
+-    string::size_type current = result.find('\\');
+-    while (current != string::npos) {
+-      if (current + 1 < result.size()) {
+-        char new_ch;
+-        int num_chars;
+-        if (isxdigit(result[current+1])) {
+-          num_chars = 2;
+-          HADOOP_ASSERT(current + num_chars < result.size(),
+-                     "escape pattern \\<hex><hex> is missing second digit in '"
+-                     + str + "'");
+-          char sub_str[3];
+-          sub_str[0] = result[current+1];
+-          sub_str[1] = result[current+2];
+-          sub_str[2] = '\0';
+-          char* end_ptr = NULL;
+-          long int int_val = strtol(sub_str, &end_ptr, 16);
+-          HADOOP_ASSERT(*end_ptr == '\0' && int_val >= 0,
+-                     "escape pattern \\<hex><hex> is broken in '" + str + "'");
+-          new_ch = static_cast<char>(int_val);
+-        } else {
+-          num_chars = 1;
+-          switch(result[current+1]) {
+-          case '\\':
+-            new_ch = '\\';
+-            break;
+-          case 't':
+-            new_ch = '\t';
+-            break;
+-          case 'n':
+-            new_ch = '\n';
+-            break;
+-          case 's':
+-            new_ch = ' ';
+-            break;
+-          default:
+-            string msg("unknow n escape character '");
+-            msg += result[current+1];
+-            HADOOP_ASSERT(false, msg + "' found in '" + str + "'");
+-          }
+-        }
+-        result.replace(current, 1 + num_chars, 1, new_ch);
+-        current = result.find('\\', current+1);
+-      } else {
+-        HADOOP_ASSERT(false, "trailing \\ in '" + str + "'");
+-      }
+-    }
+-    return result;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index a8b1f23deb9..fe2dcb4ea6f 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,13 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-pipes</artifactId>
+-      <scope>compile</scope>
+-      <type>pom</type>
+-      <version>${project.version}</version>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-aws</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 400a80cb803..0508c62b89b 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-pipes</module>
+     <module>hadoop-sls</module>
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
diff --git a/hadoop/stackable/patches/3.4.0/11-remove-hadoop-resourceestimator.patch b/hadoop/stackable/patches/3.4.0/11-remove-hadoop-resourceestimator.patch
new file mode 100644
index 000000000..0d1735bda
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/11-remove-hadoop-resourceestimator.patch
@@ -0,0 +1,10758 @@
+Entirely remove hadoop-resourceestimator
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../assemblies/hadoop-resourceestimator.xml        |   42 --
+ .../src/main/resources/assemblies/hadoop-tools.xml |   11
+ hadoop-project/src/site/site.xml                   |    1
+ hadoop-tools/hadoop-resourceestimator/README.md    |   19 -
+ hadoop-tools/hadoop-resourceestimator/pom.xml      |  192 --------
+ .../src/config/checkstyle.xml                      |   50 --
+ .../src/main/bin/estimator.cmd                     |   52 --
+ .../src/main/bin/estimator.sh                      |   71 ---
+ .../src/main/bin/start-estimator.cmd               |   37 --
+ .../src/main/bin/start-estimator.sh                |   42 --
+ .../src/main/bin/stop-estimator.cmd                |   37 --
+ .../src/main/bin/stop-estimator.sh                 |   42 --
+ .../src/main/conf/resourceestimator-config.xml     |   85 ----
+ .../src/main/data/resourceEstimatorService.txt     |    2
+ .../resourceestimator/common/api/RecurrenceId.java |   95 ----
+ .../common/api/ResourceSkyline.java                |  211 ---------
+ .../resourceestimator/common/api/package-info.java |   23 -
+ .../config/ResourceEstimatorConfiguration.java     |  125 -----
+ .../common/config/ResourceEstimatorUtil.java       |   81 ---
+ .../common/config/package-info.java                |   23 -
+ .../exception/ResourceEstimatorException.java      |   35 --
+ .../common/exception/package-info.java             |   23 -
+ .../RLESparseResourceAllocationSerDe.java          |   77 ---
+ .../common/serialization/ResourceSerDe.java        |   61 ---
+ .../common/serialization/package-info.java         |   24 -
+ .../service/ResourceEstimatorServer.java           |  146 ------
+ .../service/ResourceEstimatorService.java          |  234 ----------
+ .../resourceestimator/service/ShutdownHook.java    |   45 --
+ .../resourceestimator/service/package-info.java    |   23 -
+ .../skylinestore/api/HistorySkylineStore.java      |   99 ----
+ .../skylinestore/api/PredictionSkylineStore.java   |   60 ---
+ .../skylinestore/api/SkylineStore.java             |   30 -
+ .../skylinestore/api/package-info.java             |   23 -
+ .../exceptions/DuplicateRecurrenceIdException.java |   33 -
+ .../exceptions/EmptyResourceSkylineException.java  |   33 -
+ .../exceptions/NullPipelineIdException.java        |   32 -
+ .../NullRLESparseResourceAllocationException.java  |   33 -
+ .../exceptions/NullRecurrenceIdException.java      |   32 -
+ .../exceptions/NullResourceSkylineException.java   |   32 -
+ .../exceptions/RecurrenceIdNotFoundException.java  |   33 -
+ .../exceptions/SkylineStoreException.java          |   33 -
+ .../skylinestore/exceptions/package-info.java      |   24 -
+ .../skylinestore/impl/InMemoryStore.java           |  256 -----------
+ .../skylinestore/impl/package-info.java            |   23 -
+ .../validator/SkylineStoreValidator.java           |  118 -----
+ .../skylinestore/validator/package-info.java       |   23 -
+ .../resourceestimator/solver/api/Solver.java       |   76 ---
+ .../resourceestimator/solver/api/package-info.java |   23 -
+ .../solver/exceptions/InvalidInputException.java   |   34 -
+ .../solver/exceptions/InvalidSolverException.java  |   34 -
+ .../solver/exceptions/SolverException.java         |   34 -
+ .../solver/exceptions/package-info.java            |   24 -
+ .../resourceestimator/solver/impl/BaseSolver.java  |   94 ----
+ .../resourceestimator/solver/impl/LpSolver.java    |  340 ---------------
+ .../solver/impl/package-info.java                  |   23 -
+ .../solver/preprocess/SolverPreprocessor.java      |  219 ---------
+ .../solver/preprocess/package-info.java            |   23 -
+ .../translator/api/JobMetaData.java                |  163 -------
+ .../translator/api/LogParser.java                  |   65 ---
+ .../translator/api/SingleLineParser.java           |   52 --
+ .../translator/api/package-info.java               |   23 -
+ .../exceptions/DataFieldNotFoundException.java     |   32 -
+ .../translator/exceptions/package-info.java        |   23 -
+ .../translator/impl/BaseLogParser.java             |  127 -----
+ .../translator/impl/LogParserUtil.java             |  104 ----
+ .../translator/impl/NativeSingleLineParser.java    |  120 -----
+ .../translator/impl/RmSingleLineParser.java        |  203 ---------
+ .../translator/impl/package-info.java              |   23 -
+ .../translator/validator/ParserValidator.java      |   41 --
+ .../translator/validator/package-info.java         |   23 -
+ .../webapps/ResourceEstimatorServer/.gitignore     |   14 -
+ .../src/site/markdown/ResourceEstimator.md         |  181 --------
+ .../src/site/resources/css/site.css                |   29 -
+ .../resources/images/resourceestimator_arch.png    |  Bin
+ .../src/site/resources/images/tpch_history.png     |  Bin
+ .../src/site/resources/images/tpch_predict.png     |  Bin
+ .../common/api/TestResourceSkyline.java            |  128 ------
+ .../serialization/TestHistorySkylineSerDe.java     |  134 ------
+ .../common/serialization/TestResourceSerDe.java    |   64 ---
+ .../serialization/TestResourceSkylineSerDe.java    |  112 -----
+ .../common/serialization/package-info.java         |   24 -
+ .../service/GuiceServletConfig.java                |   42 --
+ .../service/TestResourceEstimatorService.java      |  257 -----------
+ .../skylinestore/impl/TestInMemoryStore.java       |   32 -
+ .../skylinestore/impl/TestSkylineStore.java        |  464 --------------------
+ .../solver/impl/TestLpSolver.java                  |  112 -----
+ .../resourceestimator/solver/impl/TestSolver.java  |   73 ---
+ .../translator/api/TestJobMetaData.java            |  163 -------
+ .../translator/impl/TestNativeParser.java          |  115 -----
+ .../translator/impl/TestRmParser.java              |  239 ----------
+ .../src/test/resources/log4j.properties            |   25 -
+ .../src/test/resources/lp/answer.txt               |    7
+ .../src/test/resources/lp/tinySample.txt           |    2
+ .../src/test/resources/lp/tpch_q12.txt             |   13 -
+ .../test/resources/resourceEstimatorService.txt    |    2
+ .../test/resources/resourceestimator-config.xml    |   85 ----
+ .../src/test/resources/trace/invalidLog1.txt       |    4
+ .../src/test/resources/trace/invalidLog2.txt       |    3
+ .../src/test/resources/trace/invalidLog3.txt       |    5
+ .../src/test/resources/trace/invalidLog4.txt       |    5
+ .../src/test/resources/trace/invalidLog5.txt       |    7
+ .../src/test/resources/trace/invalidLog6.txt       |    5
+ .../src/test/resources/trace/invalidLog7.txt       |    5
+ .../src/test/resources/trace/invalidLog8.txt       |    6
+ .../src/test/resources/trace/invalidLog9.txt       |    6
+ .../src/test/resources/trace/nativeLog.txt         |    1
+ .../src/test/resources/trace/rmLog.txt             |   30 -
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    6
+ hadoop-tools/pom.xml                               |    1
+ 109 files changed, 7150 deletions(-)
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-resourceestimator.xml
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/README.md
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.cmd
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.sh
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.cmd
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.sh
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.cmd
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.sh
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/conf/resourceestimator-config.xml
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/data/resourceEstimatorService.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/RecurrenceId.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/ResourceSkyline.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorConfiguration.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorUtil.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/ResourceEstimatorException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/RLESparseResourceAllocationSerDe.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/ResourceSerDe.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorServer.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorService.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ShutdownHook.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/HistorySkylineStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/PredictionSkylineStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/SkylineStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/DuplicateRecurrenceIdException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/EmptyResourceSkylineException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullPipelineIdException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRLESparseResourceAllocationException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRecurrenceIdException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullResourceSkylineException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/RecurrenceIdNotFoundException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/SkylineStoreException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/InMemoryStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/SkylineStoreValidator.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/Solver.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidInputException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidSolverException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/SolverException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/BaseSolver.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/LpSolver.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/SolverPreprocessor.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/JobMetaData.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/LogParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/SingleLineParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/DataFieldNotFoundException.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/BaseLogParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/LogParserUtil.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/NativeSingleLineParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/RmSingleLineParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/ParserValidator.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/main/resources/webapps/ResourceEstimatorServer/.gitignore
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/site/markdown/ResourceEstimator.md
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/site/resources/images/resourceestimator_arch.png
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_history.png
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_predict.png
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/GuiceServletConfig.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/TestResourceEstimatorService.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestInMemoryStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestSkylineStore.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestLpSolver.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestSolver.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/api/TestJobMetaData.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestNativeParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestRmParser.java
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/answer.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tinySample.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tpch_q12.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceEstimatorService.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceestimator-config.xml
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog1.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog2.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog3.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog4.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog5.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog6.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog7.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog8.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog9.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/nativeLog.txt
+ delete mode 100644 hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/rmLog.txt
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-resourceestimator.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-resourceestimator.xml
+deleted file mode 100644
+index d1d941d60ad..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-resourceestimator.xml
++++ /dev/null
+@@ -1,42 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-resourceestimator</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bin</directory>
+-      <outputDirectory>resourceestimator/bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-    <fileSet>
+-        <directory>${basedir}/src/main/conf</directory>
+-        <outputDirectory>resourceestimator/conf</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-        <directory>${basedir}/src/main/data</directory>
+-        <outputDirectory>resourceestimator/data</outputDirectory>
+-    </fileSet>
+-  </fileSets>
+- </assembly>
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index a63fabd7429..013f47479ef 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -94,17 +94,6 @@
+       <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-resourceestimator/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-resourceestimator/target/hadoop-resourceestimator-${project.version}/resourceestimator</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/resourceestimator</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-aws/src/main/bin</directory>
+       <outputDirectory>/bin</outputDirectory>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 05c8f152a4d..55ae67136f2 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -194,7 +194,6 @@
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+-      <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+diff --git a/hadoop-tools/hadoop-resourceestimator/README.md b/hadoop-tools/hadoop-resourceestimator/README.md
+deleted file mode 100644
+index 1cb8cb54ea3..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/README.md
++++ /dev/null
+@@ -1,19 +0,0 @@
+-Resource Estimator Service
+-==========================
+-
+-Resource Estimator Service can parse the history logs of production jobs, extract their resource consumption skylines in the past runs and predict their resource requirements for the new run.
+-
+-## Current Status
+-
+-  * Support [Hadoop YARN ResourceManager](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html) logs.
+-  * In-memory store for parsed history resource skyline and estimation.
+-  * A [Linear Programming](https://github.com/optimatika/ojAlgo) based estimator.
+-  * Provides REST interface to parse logs, query history store and estimations.
+-
+-## Upcoming features
+-
+-  * UI to query history and edit and save estimations.
+-  * Persisent store implementation for store (either DB based or distributed key-value like HBase).
+-  * Integrate directly with the [Hadoop YARN Reservation System](http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/ReservationSystem.html) to make a recurring reservation based on the estimated resources.
+-
+-Refer to the [design document](https://issues.apache.org/jira/secure/attachment/12886714/ResourceEstimator-design-v1.pdf) for more details.
+diff --git a/hadoop-tools/hadoop-resourceestimator/pom.xml b/hadoop-tools/hadoop-resourceestimator/pom.xml
+deleted file mode 100644
+index 8f6d83e276e..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/pom.xml
++++ /dev/null
+@@ -1,192 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  ~
+-  ~ Licensed to the Apache Software Foundation (ASF) under one
+-  ~ or more contributor license agreements.  See the NOTICE file
+-  ~ distributed with this work for additional information
+-  ~ regarding copyright ownership.  The ASF licenses this file
+-  ~ to you under the Apache License, Version 2.0 (the
+-  ~ "License"); you may not use this file except in compliance
+-  ~ with the License.  You may obtain a copy of the License at
+-  ~
+-  ~     http://www.apache.org/licenses/LICENSE-2.0
+-  ~
+-  ~ Unless required by applicable law or agreed to in writing, software
+-  ~ distributed under the License is distributed on an "AS IS" BASIS,
+-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  ~ See the License for the specific language governing permissions and
+-  ~ limitations under the License.
+-  ~
+-  -->
+-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xmlns="http://maven.apache.org/POM/4.0.0"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-    <modelVersion>4.0.0</modelVersion>
+-    <parent>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-project</artifactId>
+-        <version>3.4.0</version>
+-        <relativePath>../../hadoop-project</relativePath>
+-    </parent>
+-    <artifactId>hadoop-resourceestimator</artifactId>
+-    <name>Apache Hadoop Resource Estimator Service</name>
+-    <packaging>jar</packaging>
+-    <dependencies>
+-        <dependency>
+-            <groupId>com.google.code.gson</groupId>
+-            <artifactId>gson</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.ojalgo</groupId>
+-            <artifactId>ojalgo</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-common</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-common</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-api</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>javax.inject</groupId>
+-            <artifactId>javax.inject</artifactId>
+-            <version>1</version>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.sun.jersey.jersey-test-framework</groupId>
+-            <artifactId>jersey-test-framework-grizzly2</artifactId>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>javax.servlet</groupId>
+-            <artifactId>javax.servlet-api</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.sun.jersey</groupId>
+-            <artifactId>jersey-server</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.github.pjfanning</groupId>
+-            <artifactId>jersey-json</artifactId>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.core</groupId>
+-                    <artifactId>jackson-core</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.core</groupId>
+-                    <artifactId>jackson-databind</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-                    <artifactId>jackson-jaxrs-json-provider</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.codehaus.jettison</groupId>
+-                    <artifactId>jettison</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>junit</groupId>
+-            <artifactId>junit</artifactId>
+-            <scope>test</scope>
+-        </dependency>
+-    </dependencies>
+-    <build>
+-        <plugins>
+-            <plugin>
+-                <groupId>org.apache.rat</groupId>
+-                <artifactId>apache-rat-plugin</artifactId>
+-                <configuration>
+-                    <excludes>
+-                        <exclude>README.md</exclude>
+-                        <exclude>**/*.txt</exclude>
+-                    </excludes>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-checkstyle-plugin</artifactId>
+-                <configuration>
+-                    <configLocation>src/config/checkstyle.xml</configLocation>
+-                </configuration>
+-            </plugin>
+-        </plugins>
+-    </build>
+-
+-    <profiles>
+-        <profile>
+-            <id>dist</id>
+-            <activation>
+-                <activeByDefault>false</activeByDefault>
+-            </activation>
+-            <build>
+-                <plugins>
+-                    <plugin>
+-                        <groupId>org.apache.maven.plugins</groupId>
+-                        <artifactId>maven-assembly-plugin</artifactId>
+-                        <configuration>
+-                            <appendAssemblyId>false</appendAssemblyId>
+-                            <attach>false</attach>
+-                            <finalName>
+-                                ${project.artifactId}-${project.version}
+-                            </finalName>
+-                            <descriptorRefs>
+-                                <descriptorRef>hadoop-resourceestimator
+-                                </descriptorRef>
+-                            </descriptorRefs>
+-                        </configuration>
+-                        <dependencies>
+-                            <dependency>
+-                                <groupId>org.apache.hadoop</groupId>
+-                                <artifactId>hadoop-assemblies</artifactId>
+-                                <version>${project.version}</version>
+-                            </dependency>
+-                        </dependencies>
+-                        <executions>
+-                            <execution>
+-                                <id>dist</id>
+-                                <phase>prepare-package</phase>
+-                                <goals>
+-                                    <goal>single</goal>
+-                                </goals>
+-                            </execution>
+-                        </executions>
+-                    </plugin>
+-                    <plugin>
+-                        <groupId>org.apache.maven.plugins</groupId>
+-                        <artifactId>maven-dependency-plugin</artifactId>
+-                        <executions>
+-                            <execution>
+-                                <id>deplist</id>
+-                                <phase>compile</phase>
+-                                <goals>
+-                                    <goal>list</goal>
+-                                </goals>
+-                                <configuration>
+-                                    <outputFile>
+-                                        ${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt
+-                                    </outputFile>
+-                                </configuration>
+-                            </execution>
+-                        </executions>
+-                    </plugin>
+-                </plugins>
+-            </build>
+-        </profile>
+-    </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml b/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
+deleted file mode 100644
+index 646c7190f39..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/config/checkstyle.xml
++++ /dev/null
+@@ -1,50 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE module PUBLIC
+-    "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN"
+-    "https://checkstyle.org/dtds/configuration_1_2.dtd">
+-
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-  http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-
+-<!--
+-  Checkstyle configuration that checks the sun coding conventions from:
+-
+-    - the Java Language Specification at
+-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+-
+-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+-
+-    - the Javadoc guidelines at
+-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+-
+-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+-
+-    - some best practices
+-
+-  Checkstyle is very configurable. Be sure to read the documentation at
+-  http://checkstyle.sf.net (or in your downloaded distribution).
+-
+-  Most Checks are configurable, be sure to consult the documentation.
+-  To completely disable a check, just comment it out or delete it from the file.
+-  Finally, it is worth reading the documentation.
+--->
+-
+-<module name="Checker">
+-    <module name="TreeWalker">
+-        <module name="AvoidNestedBlocks">
+-            <property name="id" value="checkstyle:avoidnestedblocks"/>
+-            <property name="allowInSwitchCase" value="true"/>
+-        </module>
+-    </module>
+-</module>
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.cmd b/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.cmd
+deleted file mode 100644
+index 317025cda97..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.cmd
++++ /dev/null
+@@ -1,52 +0,0 @@
+-@echo off
+-@rem Licensed to the Apache Software Foundation (ASF) under one or more
+-@rem contributor license agreements.  See the NOTICE file distributed with
+-@rem this work for additional information regarding copyright ownership.
+-@rem The ASF licenses this file to You under the Apache License, Version 2.0
+-@rem (the "License"); you may not use this file except in compliance with
+-@rem the License.  You may obtain a copy of the License at
+-@rem
+-@rem     http://www.apache.org/licenses/LICENSE-2.0
+-@rem
+-@rem Unless required by applicable law or agreed to in writing, software
+-@rem distributed under the License is distributed on an "AS IS" BASIS,
+-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-@rem See the License for the specific language governing permissions and
+-@rem limitations under the License.
+-@rem
+-
+-setlocal enabledelayedexpansion
+-
+-if not defined HADOOP_BIN_PATH (
+-  set HADOOP_BIN_PATH=%~dp0
+-)
+-
+-if "%HADOOP_BIN_PATH:~-1%" == "\" (
+-  set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
+-)
+-
+-set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
+-if not defined HADOOP_LIBEXEC_DIR (
+-  set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
+-)
+-
+-:main
+-  @rem CLASSPATH initially contains HADOOP_CONF_DIR
+-    if not defined HADOOP_CONF_DIR (
+-      echo No HADOOP_CONF_DIR set.
+-      echo Please specify it.
+-      goto :eof
+-    )
+-
+-  set CLASSPATH=%HADOOP_CONF_DIR%;%CLASSPATH%
+-goto :eof
+-
+-:classpath
+-  set CLASS=org.apache.hadoop.util.Classpath
+-  goto :eof
+-
+-:resourceestimator
+-  set CLASS=org.apache.hadoop.resourceestimator.service.ResourceEstimatorServer
+-  goto :eof
+-
+-endlocal
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.sh b/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.sh
+deleted file mode 100644
+index 3e1ec278a9d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/estimator.sh
++++ /dev/null
+@@ -1,71 +0,0 @@
+-#!/usr/bin/env bash
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#    http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License. See accompanying LICENSE file.
+-#
+-
+-## @audience     public
+-## @stability    stable
+-function hadoop_usage()
+-{
+-  echo "Usage: estimator.sh"
+- #hadoop-daemon.sh. need both start and stop, status (query the status). run as background process.
+-}
+-
+-## @audience     public
+-## @stability    stable
+-function calculate_classpath
+-{
+-  hadoop_add_client_opts
+-  hadoop_add_to_classpath_tools hadoop-resourceestimator
+-}
+-
+-## @audience     public
+-## @stability    stable
+-function resourceestimatorcmd_case
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME='org.apache.hadoop.resourceestimator.service.ResourceEstimatorServer'
+-}
+-
+-# let's locate libexec...
+-if [[ -n "${HADOOP_HOME}" ]]; then
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
+-else
+-  this="${BASH_SOURCE-$0}"
+-  bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P)
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../../../../../libexec"
+-fi
+-
+-HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
+-# shellcheck disable=SC2034
+-HADOOP_NEW_CONFIG=true
+-if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+-  # shellcheck source=./hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+-  . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+-else
+-  echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
+-  exit 1
+-fi
+-
+-# get arguments
+-HADOOP_SUBCMD=$1
+-shift
+-
+-HADOOP_SUBCMD_ARGS=("$@")
+-
+-resourceestimatorcmd_case "${HADOOP_SUBCMD}" "${HADOOP_SUBCMD_ARGS[@]}"
+-
+-calculate_classpath
+-hadoop_generic_java_subcmd_handler
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.cmd b/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.cmd
+deleted file mode 100644
+index 463e91c70ff..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.cmd
++++ /dev/null
+@@ -1,37 +0,0 @@
+-@echo off
+-@rem Licensed to the Apache Software Foundation (ASF) under one or more
+-@rem contributor license agreements.  See the NOTICE file distributed with
+-@rem this work for additional information regarding copyright ownership.
+-@rem The ASF licenses this file to You under the Apache License, Version 2.0
+-@rem (the "License"); you may not use this file except in compliance with
+-@rem the License.  You may obtain a copy of the License at
+-@rem
+-@rem     http://www.apache.org/licenses/LICENSE-2.0
+-@rem
+-@rem Unless required by applicable law or agreed to in writing, software
+-@rem distributed under the License is distributed on an "AS IS" BASIS,
+-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-@rem See the License for the specific language governing permissions and
+-@rem limitations under the License.
+-@rem
+-setlocal enabledelayedexpansion
+-
+-echo starting resource estimator daemons
+-
+-if not defined HADOOP_BIN_PATH (
+-  set HADOOP_BIN_PATH=%~dp0
+-)
+-
+-if "%HADOOP_BIN_PATH:~-1%" == "\" (
+-  set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
+-)
+-
+-set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
+-if not defined HADOOP_LIBEXEC_DIR (
+-  set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
+-)
+-
+-@rem start resource estimator
+-start "Resource Estimator Service" estimator resourceestimator
+-
+-endlocal
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.sh b/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.sh
+deleted file mode 100644
+index bf4328adae2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/start-estimator.sh
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#!/usr/bin/env bash
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#    http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License. See accompanying LICENSE file.
+-#
+-
+-# let's locate libexec...
+-if [[ -n "${HADOOP_HOME}" ]]; then
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
+-else
+-  this="${BASH_SOURCE-$0}"
+-  bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P)
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../../../../../libexec"
+-fi
+-
+-HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
+-# shellcheck disable=SC2034
+-HADOOP_NEW_CONFIG=true
+-if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+-  # shellcheck source=./hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+-  . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+-else
+-  echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
+-  exit 1
+-fi
+-
+-# start resource estimator
+-echo "Starting resource estimator"
+-hadoop_uservar_su estimator resourceestimator "bin/estimator.sh" \
+-    --config "${HADOOP_CONF_DIR}" \
+-    --daemon start \
+-    resourceestimator
+-(( HADOOP_JUMBO_RETCOUNTER=HADOOP_JUMBO_RETCOUNTER + $? ))
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.cmd b/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.cmd
+deleted file mode 100644
+index e08c7e02382..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.cmd
++++ /dev/null
+@@ -1,37 +0,0 @@
+-@echo off
+-@rem Licensed to the Apache Software Foundation (ASF) under one or more
+-@rem contributor license agreements.  See the NOTICE file distributed with
+-@rem this work for additional information regarding copyright ownership.
+-@rem The ASF licenses this file to You under the Apache License, Version 2.0
+-@rem (the "License"); you may not use this file except in compliance with
+-@rem the License.  You may obtain a copy of the License at
+-@rem
+-@rem     http://www.apache.org/licenses/LICENSE-2.0
+-@rem
+-@rem Unless required by applicable law or agreed to in writing, software
+-@rem distributed under the License is distributed on an "AS IS" BASIS,
+-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-@rem See the License for the specific language governing permissions and
+-@rem limitations under the License.
+-@rem
+-setlocal enabledelayedexpansion
+-
+-echo stopping resource estimator daemons
+-
+-if not defined HADOOP_BIN_PATH (
+-  set HADOOP_BIN_PATH=%~dp0
+-)
+-
+-if "%HADOOP_BIN_PATH:~-1%" == "\" (
+-  set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
+-)
+-
+-set DEFAULT_LIBEXEC_DIR=%HADOOP_BIN_PATH%\..\libexec
+-if not defined HADOOP_LIBEXEC_DIR (
+-  set HADOOP_LIBEXEC_DIR=%DEFAULT_LIBEXEC_DIR%
+-)
+-
+-@rem start resource estimator
+-stop "Resource Estimator Service" estimator resourceestimator
+-
+-endlocal
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.sh b/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.sh
+deleted file mode 100644
+index e78c7983332..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/bin/stop-estimator.sh
++++ /dev/null
+@@ -1,42 +0,0 @@
+-#!/usr/bin/env bash
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#    http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License. See accompanying LICENSE file.
+-#
+-
+-# let's locate libexec...
+-if [[ -n "${HADOOP_HOME}" ]]; then
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
+-else
+-  this="${BASH_SOURCE-$0}"
+-  bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P)
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../../../../../libexec"
+-fi
+-
+-HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
+-# shellcheck disable=SC2034
+-HADOOP_NEW_CONFIG=true
+-if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+-  # shellcheck source=./hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
+-  . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+-else
+-  echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
+-  exit 1
+-fi
+-
+-# stop resource estimator
+-echo "Stopping resource estimator"
+-hadoop_uservar_su estimator resourceestimator "bin/estimator.sh" \
+-    --config "${HADOOP_CONF_DIR}" \
+-    --daemon stop \
+-    resourceestimator
+-(( HADOOP_JUMBO_RETCOUNTER=HADOOP_JUMBO_RETCOUNTER + $? ))
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/conf/resourceestimator-config.xml b/hadoop-tools/hadoop-resourceestimator/src/main/conf/resourceestimator-config.xml
+deleted file mode 100644
+index f78085a0abc..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/conf/resourceestimator-config.xml
++++ /dev/null
+@@ -1,85 +0,0 @@
+-<?xml version="1.0"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-    Licensed to the Apache Software Foundation (ASF) under one
+-    or more contributor license agreements.  See the NOTICE file
+-    distributed with this work for additional information
+-    regarding copyright ownership.  The ASF licenses this file
+-    to you under the Apache License, Version 2.0 (the
+-    "License"); you may not use this file except in compliance
+-    with the License.  You may obtain a copy of the License at
+-        http://www.apache.org/licenses/LICENSE-2.0
+-    Unless required by applicable law or agreed to in writing, software
+-    distributed under the License is distributed on an "AS IS" BASIS,
+-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-    See the License for the specific language governing permissions and
+-    limitations under the License.
+--->
+-<configuration>
+-    <property>
+-        <name>resourceestimator.solver.lp.alpha</name>
+-        <value>0.1</value>
+-        <description>
+-            The resource estimator has an integrated Linear Programming solver to make the prediction, and this parameter tunes the tradeoff between resource over-allocation and under-allocation in the Linear Programming model. This parameter varies from 0 to 1, and a larger alpha value means the model minimizes over-allocation better. Default value is 0.1.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.solver.lp.beta</name>
+-        <value>0.1</value>
+-        <description>
+-            This parameter controls the generalization of the Linear Programming model. This parameter varies from 0 to 1. Deafult value is 0.1.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.solver.lp.minJobRuns</name>
+-        <value>2</value>
+-        <description>
+-            The minimum number of job runs required in order to make the prediction. Default value is 2.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.timeInterval</name>
+-        <value>5</value>
+-        <description>
+-            The time length which is used to discretize job execution into intervals. Note that the estimator makes resource allocation prediction for each interval. A smaller time interval has more fine-grained granularity for prediction, but it also takes longer time and more space for prediction. Default value is 5 (seconds).
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.translator.line-parser</name>
+-        <value>org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser</value>
+-        <description>
+-            The class name of the translator single-line parser, which parses a single line in the log. Default value is org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser, which can parse one line in the sample log. Note that if users want to parse Hadoop Resource Manager logs, they need to set the value to be org.apache.hadoop.resourceestimator.translator.impl.RmSingleLineParser. If they want to implement single-line parser to parse their customized log file, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <!-- Optional configuration parameters -->
+-    <!--
+-    <property>
+-        <name>resourceestimator.solver.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.solver.impl.LpSolver</value>
+-        <description>
+-            The class name of the solver provider. Default value is org.apache.hadoop.resourceestimator.solver.impl.LpSolver, which incorporates a Linear Programming model to make the prediction. If users want to implement their own models, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.skylinestore.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore</value>
+-        <description>
+-            The class name of the skylinestore provider. Default value is org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore, which is an in-memory implementation of skylinestore. If users want to use their own skylinestore implementation, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.translator.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser</value>
+-        <description>
+-            The class name of the translator provider. Default value is org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser, which extracts resourceskylines from log streams. If users want to use their own translator implementation, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.service-port</name>
+-        <value>9998</value>
+-        <description>
+-            The port which ResourceEstimatorService listens to. The default value is 9998.
+-        </description>
+-    </property>
+-    -->
+-</configuration>
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/data/resourceEstimatorService.txt b/hadoop-tools/hadoop-resourceestimator/src/main/data/resourceEstimatorService.txt
+deleted file mode 100644
+index 15fb84e98c2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/data/resourceEstimatorService.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-tpch_q12 50 1462148517000 1462148527345 1462148952345 tpch_q12_0 8192:0| 1:0|1:5|1074:10|2538:15|2468:20|
+-tpch_q12 50 1462148949000 1462148960455 1462149205455 tpch_q12_1 8192:0| 1:0|1:5|794:10|2517:15|2484:20|
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/RecurrenceId.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/RecurrenceId.java
+deleted file mode 100644
+index 01ef97725d8..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/RecurrenceId.java
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.api;
+-
+-/**
+- * RecurrenceId is the id for the recurring pipeline jobs.
+- * <p> We assume that the pipeline job can be uniquely identified with
+- * {pipelineId, runId}.
+- */
+-public class RecurrenceId {
+-  /**
+-   * pipelineId is the unique id for the pipeline jobs.
+-   */
+-  private String pipelineId;
+-  /**
+-   * runId is the unique instance id for the pipeline job in one run, and it
+-   * will change across runs.
+-   */
+-  private String runId;
+-  // TODO: we may addHistory more ids of the pipeline jobs to identify them.
+-
+-  /**
+-   * Constructor.
+-   *
+-   * @param pipelineIdConfig the unique id for the pipeline jobs.
+-   * @param runIdConfig the unique instance id for the pipeline job in one run.
+-   */
+-  public RecurrenceId(final String pipelineIdConfig, final String runIdConfig) {
+-    this.pipelineId = pipelineIdConfig;
+-    this.runId = runIdConfig;
+-  }
+-
+-  /**
+-   * Return the pipelineId for the pipeline jobs.
+-   *
+-   * @return the pipelineId.
+-   */
+-  public final String getPipelineId() {
+-    return pipelineId;
+-  }
+-
+-  public void setPipelineId(String pipelineId) {
+-    this.pipelineId = pipelineId;
+-  }
+-
+-  /**
+-   * Return the runId for the pipeline job in one run.
+-   *
+-   * @return the runId.
+-   */
+-  public final String getRunId() {
+-    return runId;
+-  }
+-
+-  public void setRunId(String runId) {
+-    this.runId = runId;
+-  }
+-
+-  @Override public final String toString() {
+-    return String.format("{pipelineId: %s, runId: %s}", pipelineId, runId);
+-  }
+-
+-  @Override public final int hashCode() {
+-    return getPipelineId().hashCode() ^ getRunId().hashCode();
+-  }
+-
+-  @Override public final boolean equals(final Object obj) {
+-    if (this == obj) {
+-      return true;
+-    }
+-    if ((obj == null) || (getClass() != obj.getClass())) {
+-      return false;
+-    }
+-    final RecurrenceId other = (RecurrenceId) obj;
+-    return pipelineId.equals(other.pipelineId) && runId.equals(other.runId);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/ResourceSkyline.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/ResourceSkyline.java
+deleted file mode 100644
+index a4bc69f3584..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/ResourceSkyline.java
++++ /dev/null
+@@ -1,211 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.api;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-
+-/**
+- * ResourceSkyline records the job identification information as well as job's
+- * requested {@code
+- * container}s information during its lifespan.
+- */
+-public class ResourceSkyline {
+-  /**
+-   * The auto-generated {@code ApplicationId} in job's one run.
+-   * <p>
+-   * <p>
+-   * For a pipeline job, we assume the {@code jobId} changes each time we run
+-   * the pipeline job.
+-   */
+-  private String jobId;
+-  /**
+-   * The input data size of the job.
+-   */
+-  private double jobInputDataSize;
+-  /**
+-   * Job submission time. Different logs could have different time format, so we
+-   * store the original string directly extracted from logs.
+-   */
+-  private long jobSubmissionTime;
+-  /**
+-   * Job finish time. Different logs could have different time format, so we
+-   * store the original string directly extracted from logs.
+-   */
+-  private long jobFinishTime;
+-  /**
+-   * The resource spec of containers allocated to the job.
+-   */
+-  private Resource containerSpec;
+-  /**
+-   * The list of {@link Resource} allocated to the job in its lifespan.
+-   */
+-  private RLESparseResourceAllocation skylineList;
+-  // TODO
+-  // We plan to record pipeline job's actual resource consumptions in one run
+-  // here.
+-  // TODO
+-  // We might need to addHistory more features to the ResourceSkyline, such as
+-  // users, VC, etc.
+-
+-  /**
+-   * Constructor.
+-   *
+-   * @param jobIdConfig             the id of the job.
+-   * @param jobInputDataSizeConfig  the input data size of the job.
+-   * @param jobSubmissionTimeConfig the submission time of the job.
+-   * @param jobFinishTimeConfig     the finish time of the job.
+-   * @param containerSpecConfig     the resource spec of containers allocated
+-   *                                to the job.
+-   * @param skylineListConfig       the list of {@link Resource} allocated in
+-   *                                one run.
+-   */
+-  public ResourceSkyline(final String jobIdConfig,
+-      final double jobInputDataSizeConfig, final long jobSubmissionTimeConfig,
+-      final long jobFinishTimeConfig, final Resource containerSpecConfig,
+-      final RLESparseResourceAllocation skylineListConfig) {
+-    this.jobId = jobIdConfig;
+-    this.jobInputDataSize = jobInputDataSizeConfig;
+-    this.jobSubmissionTime = jobSubmissionTimeConfig;
+-    this.jobFinishTime = jobFinishTimeConfig;
+-    this.containerSpec = containerSpecConfig;
+-    this.skylineList = skylineListConfig;
+-  }
+-
+-  /**
+-   * Empty constructor.
+-   */
+-  public ResourceSkyline() {
+-  }
+-
+-  /**
+-   * Get the id of the job.
+-   *
+-   * @return the id of this job.
+-   */
+-  public final String getJobId() {
+-    return jobId;
+-  }
+-
+-  /**
+-   * Set jobId.
+-   *
+-   * @param jobIdConfig jobId.
+-   */
+-  public final void setJobId(final String jobIdConfig) {
+-    this.jobId = jobIdConfig;
+-  }
+-
+-  /**
+-   * Get the job's input data size.
+-   *
+-   * @return job's input data size.
+-   */
+-  public final double getJobInputDataSize() {
+-    return jobInputDataSize;
+-  }
+-
+-  /**
+-   * Set jobInputDataSize.
+-   *
+-   * @param jobInputDataSizeConfig jobInputDataSize.
+-   */
+-  public final void setJobInputDataSize(final double jobInputDataSizeConfig) {
+-    this.jobInputDataSize = jobInputDataSizeConfig;
+-  }
+-
+-  /**
+-   * Get the job's submission time.
+-   *
+-   * @return job's submission time.
+-   */
+-  public final long getJobSubmissionTime() {
+-    return jobSubmissionTime;
+-  }
+-
+-  /**
+-   * Set jobSubmissionTime.
+-   *
+-   * @param jobSubmissionTimeConfig jobSubmissionTime.
+-   */
+-  public final void setJobSubmissionTime(final long jobSubmissionTimeConfig) {
+-    this.jobSubmissionTime = jobSubmissionTimeConfig;
+-  }
+-
+-  /**
+-   * Get the job's finish time.
+-   *
+-   * @return job's finish time.
+-   */
+-  public final long getJobFinishTime() {
+-    return jobFinishTime;
+-  }
+-
+-  /**
+-   * Set jobFinishTime.
+-   *
+-   * @param jobFinishTimeConfig jobFinishTime.
+-   */
+-  public final void setJobFinishTime(final long jobFinishTimeConfig) {
+-    this.jobFinishTime = jobFinishTimeConfig;
+-  }
+-
+-  /**
+-   * Get the resource spec of the job's allocated {@code container}s.
+-   * <p> Key assumption: during job's lifespan, its allocated {@code container}s
+-   * have the same {@link Resource} spec.
+-   *
+-   * @return the {@link Resource} spec of the job's allocated
+-   * {@code container}s.
+-   */
+-  public final Resource getContainerSpec() {
+-    return containerSpec;
+-  }
+-
+-  /**
+-   * Set containerSpec.
+-   *
+-   * @param containerSpecConfig containerSpec.
+-   */
+-  public final void setContainerSpec(final Resource containerSpecConfig) {
+-    this.containerSpec = containerSpecConfig;
+-  }
+-
+-  /**
+-   * Get the list of {@link Resource}s allocated to the job.
+-   *
+-   * @return the {@link RLESparseResourceAllocation} which contains the list of
+-   * {@link Resource}s allocated to the job.
+-   */
+-  public final RLESparseResourceAllocation getSkylineList() {
+-    return skylineList;
+-  }
+-
+-  /**
+-   * Set skylineList.
+-   *
+-   * @param skylineListConfig skylineList.
+-   */
+-  public final void setSkylineList(
+-      final RLESparseResourceAllocation skylineListConfig) {
+-    this.skylineList = skylineListConfig;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/package-info.java
+deleted file mode 100644
+index a7c752752c7..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/api/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * The common APIs for the resource estimator.
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.api;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorConfiguration.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorConfiguration.java
+deleted file mode 100644
+index bb041b6745a..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorConfiguration.java
++++ /dev/null
+@@ -1,125 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.config;
+-
+-import org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore;
+-import org.apache.hadoop.resourceestimator.solver.impl.LpSolver;
+-import org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser;
+-import org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser;
+-
+-/**
+- * Defines configuration keys for ResourceEstimatorServer.
+- */
+-public final class ResourceEstimatorConfiguration {
+-
+-  /**
+-   * The location of the configuration file for ResourceEstimatorService.
+-   */
+-  public static final String CONFIG_FILE = "resourceestimator-config.xml";
+-
+-  /**
+-   * The URI for ResourceEstimatorService.
+-   */
+-  public static final String SERVICE_URI = "http://0.0.0.0/";
+-
+-  /**
+-   * The port which ResourceEstimatorService listens to.
+-   */
+-  public static final String SERVICE_PORT = "resourceestimator.service-port";
+-
+-  /**
+-   * Default port number of ResourceEstimatorService.
+-   */
+-  public static final int DEFAULT_SERVICE_PORT = 9998;
+-
+-  /**
+-   * The class name of the skylinestore provider.
+-   */
+-  public static final String SKYLINESTORE_PROVIDER =
+-      "resourceestimator.skylinestore.provider";
+-
+-  /**
+-   * Default value for skylinestore provider, which is an in-memory implementation of skylinestore.
+-   */
+-  public static final String DEFAULT_SKYLINESTORE_PROVIDER =
+-      InMemoryStore.class.getName();
+-
+-  /**
+-   * The class name of the translator provider.
+-   */
+-  public static final String TRANSLATOR_PROVIDER =
+-      "resourceestimator.translator.provider";
+-
+-  /**
+-   * Default value for translator provider, which extracts resourceskylines from log streams.
+-   */
+-  public static final String DEFAULT_TRANSLATOR_PROVIDER =
+-      BaseLogParser.class.getName();
+-
+-  /**
+-   * The class name of the translator single-line parser, which parses a single line in the log.
+-   */
+-  public static final String TRANSLATOR_LINE_PARSER =
+-      "resourceestimator.translator.line-parser";
+-
+-  /**
+-   * Default value for translator single-line parser, which can parse one line in the sample log.
+-   */
+-  public static final String DEFAULT_TRANSLATOR_LINE_PARSER =
+-      NativeSingleLineParser.class.getName();
+-
+-  /**
+-   * The class name of the solver provider.
+-   */
+-  public static final String SOLVER_PROVIDER =
+-      "resourceestimator.solver.provider";
+-
+-  /**
+-   * Default value for solver provider, which incorporates a Linear Programming model to make the prediction.
+-   */
+-  public static final String DEFAULT_SOLVER_PROVIDER = LpSolver.class.getName();
+-
+-  /**
+-   * The time length which is used to discretize job execution into intervals.
+-   */
+-  public static final String TIME_INTERVAL_KEY =
+-      "resourceestimator.timeInterval";
+-
+-  /**
+-   * The parameter which tunes the tradeoff between resource over-allocation and under-allocation in the Linear Programming model.
+-   */
+-  public static final String SOLVER_ALPHA_KEY =
+-      "resourceestimator.solver.lp.alpha";
+-
+-  /**
+-   * This parameter which controls the generalization of the Linear Programming model.
+-   */
+-  public static final String SOLVER_BETA_KEY =
+-      "resourceestimator.solver.lp.beta";
+-
+-  /**
+-   * The minimum number of job runs required in order to make the prediction.
+-   */
+-  public static final String SOLVER_MIN_JOB_RUN_KEY =
+-      "resourceestimator.solver.lp.minJobRuns";
+-
+-  private ResourceEstimatorConfiguration() {}
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorUtil.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorUtil.java
+deleted file mode 100644
+index c00dd006898..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/ResourceEstimatorUtil.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.config;
+-
+-import java.lang.reflect.Constructor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-
+-/**
+- * General resourceestimator utils.
+- */
+-public final class ResourceEstimatorUtil {
+-
+-  private static final Class<?>[] EMPTY_ARRAY = new Class[0];
+-
+-  private ResourceEstimatorUtil() {}
+-
+-  /**
+-   * Helper method to create instances of Object using the class name specified
+-   * in the configuration object.
+-   *
+-   * @param conf                the yarn configuration
+-   * @param configuredClassName the configuration provider key
+-   * @param defaultValue        the default implementation class
+-   * @param type                the required interface/base class
+-   * @param <T>                 The type of the instance to create
+-   * @return the instances created
+-   * @throws ResourceEstimatorException if the provider initialization fails.
+-   */
+-  @SuppressWarnings("unchecked") public static <T> T createProviderInstance(
+-      Configuration conf, String configuredClassName, String defaultValue,
+-      Class<T> type) throws ResourceEstimatorException {
+-    String className = conf.get(configuredClassName);
+-    if (className == null) {
+-      className = defaultValue;
+-    }
+-    try {
+-      Class<?> concreteClass = Class.forName(className);
+-      if (type.isAssignableFrom(concreteClass)) {
+-        Constructor<T> meth =
+-            (Constructor<T>) concreteClass.getDeclaredConstructor(EMPTY_ARRAY);
+-        meth.setAccessible(true);
+-        return meth.newInstance();
+-      } else {
+-        StringBuilder errMsg = new StringBuilder();
+-        errMsg.append("Class: ").append(className).append(" not instance of ")
+-            .append(type.getCanonicalName());
+-        throw new ResourceEstimatorException(errMsg.toString());
+-      }
+-    } catch (ClassNotFoundException e) {
+-      StringBuilder errMsg = new StringBuilder();
+-      errMsg.append("Could not instantiate : ").append(className)
+-          .append(" due to exception: ").append(e.getCause());
+-      throw new ResourceEstimatorException(errMsg.toString());
+-    } catch (ReflectiveOperationException e) {
+-      StringBuilder errMsg = new StringBuilder();
+-      errMsg.append("Could not instantiate : ").append(className)
+-          .append(" due to exception: ").append(e.getCause());
+-      throw new ResourceEstimatorException(errMsg.toString());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/package-info.java
+deleted file mode 100644
+index ecf140a4834..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/config/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * The common configuration for the resource estimator.
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.config;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/ResourceEstimatorException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/ResourceEstimatorException.java
+deleted file mode 100644
+index ba5666d8b8d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/ResourceEstimatorException.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.exception;
+-
+-/**
+- * Exception thrown by ResourceEstimatorServer utility classes.
+- */
+-public class ResourceEstimatorException extends Exception {
+-
+-  public ResourceEstimatorException(String message) {
+-    super(message);
+-  }
+-
+-  public ResourceEstimatorException(String message, Exception ex) {
+-    super(message, ex);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/package-info.java
+deleted file mode 100644
+index 6ebecb6d0d7..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/exception/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * The common exception for the resource estimator.
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.exception;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/RLESparseResourceAllocationSerDe.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/RLESparseResourceAllocationSerDe.java
+deleted file mode 100644
+index 379dc3a71d5..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/RLESparseResourceAllocationSerDe.java
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.serialization;
+-
+-import java.lang.reflect.Type;
+-import java.util.NavigableMap;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.apache.hadoop.yarn.util.resource.ResourceCalculator;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.JsonDeserializationContext;
+-import com.google.gson.JsonDeserializer;
+-import com.google.gson.JsonElement;
+-import com.google.gson.JsonObject;
+-import com.google.gson.JsonParseException;
+-import com.google.gson.JsonSerializationContext;
+-import com.google.gson.JsonSerializer;
+-import com.google.gson.reflect.TypeToken;
+-
+-/**
+- * Serialize/deserialize RLESparseResourceAllocation object to/from JSON.
+- */
+-public class RLESparseResourceAllocationSerDe
+-    implements JsonSerializer<RLESparseResourceAllocation>,
+-    JsonDeserializer<RLESparseResourceAllocation> {
+-  private static final String KEY = "resourceAllocation";
+-  private final Gson gson =
+-      new GsonBuilder().registerTypeAdapter(Resource.class, new ResourceSerDe())
+-          .create();
+-  private final Type type = new TypeToken<NavigableMap<Long, Resource>>() {
+-  }.getType();
+-  private final ResourceCalculator resourceCalculator =
+-      new DefaultResourceCalculator();
+-
+-  @Override public final JsonElement serialize(
+-      final RLESparseResourceAllocation resourceAllocation,
+-      final Type typeOfSrc, final JsonSerializationContext context) {
+-    NavigableMap<Long, Resource> myMap = resourceAllocation.getCumulative();
+-    JsonObject jo = new JsonObject();
+-    JsonElement element = gson.toJsonTree(myMap, type);
+-    jo.add(KEY, element);
+-
+-    return jo;
+-  }
+-
+-  @Override public final RLESparseResourceAllocation deserialize(
+-      final JsonElement json, final Type typeOfT,
+-      final JsonDeserializationContext context) throws JsonParseException {
+-    NavigableMap<Long, Resource> resAllocation =
+-        gson.fromJson(json.getAsJsonObject().get(KEY), type);
+-    RLESparseResourceAllocation rleSparseResourceAllocation =
+-        new RLESparseResourceAllocation(resAllocation, resourceCalculator);
+-    return rleSparseResourceAllocation;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/ResourceSerDe.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/ResourceSerDe.java
+deleted file mode 100644
+index 22b079c971d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/ResourceSerDe.java
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.serialization;
+-
+-import java.lang.reflect.Type;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-
+-import com.google.gson.JsonDeserializationContext;
+-import com.google.gson.JsonDeserializer;
+-import com.google.gson.JsonElement;
+-import com.google.gson.JsonObject;
+-import com.google.gson.JsonParseException;
+-import com.google.gson.JsonSerializationContext;
+-import com.google.gson.JsonSerializer;
+-
+-/**
+- * Serialize/deserialize Resource object to/from JSON.
+- */
+-public class ResourceSerDe
+-    implements JsonSerializer<Resource>, JsonDeserializer<Resource> {
+-  private static final String KEY1 = "memory";
+-  private static final String KEY2 = "vcores";
+-
+-  @Override public final JsonElement serialize(final Resource resource,
+-      final Type type, final JsonSerializationContext context) {
+-    JsonObject jo = new JsonObject();
+-    jo.addProperty(KEY1, resource.getMemorySize());
+-    jo.addProperty(KEY2, resource.getVirtualCores());
+-    return jo;
+-  }
+-
+-  @Override public final Resource deserialize(final JsonElement json,
+-      final Type type, final JsonDeserializationContext context)
+-      throws JsonParseException {
+-    JsonObject jo = json.getAsJsonObject();
+-    long mem = jo.getAsJsonPrimitive(KEY1).getAsLong();
+-    int vcore = jo.getAsJsonPrimitive(KEY2).getAsInt();
+-    Resource resource = Resource.newInstance(mem, vcore);
+-
+-    return resource;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
+deleted file mode 100644
+index 06957b39a7e..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-/**
+- * SkylineStore serialization module.
+- */
+-package org.apache.hadoop.resourceestimator.common.serialization;
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorServer.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorServer.java
+deleted file mode 100644
+index 27a5864afdc..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorServer.java
++++ /dev/null
+@@ -1,146 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.service;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-
+-import javax.ws.rs.core.UriBuilder;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.http.HttpServer2;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.ShutdownHookManager;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+-import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * A simple embedded Hadoop HTTP server.
+- */
+-public final class ResourceEstimatorServer extends CompositeService {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(ResourceEstimatorServer.class.getName());
+-  private HttpServer2 webServer;
+-  private static URI baseURI;
+-
+-  public ResourceEstimatorServer() {
+-    super(ResourceEstimatorServer.class.getName());
+-  }
+-
+-  private static URI getBaseURI(Configuration config) {
+-    baseURI = UriBuilder.fromUri(ResourceEstimatorConfiguration.SERVICE_URI)
+-        .port(getPort(config)).build();
+-    return baseURI;
+-  }
+-
+-  private static int getPort(Configuration config) {
+-    return config.getInt(ResourceEstimatorConfiguration.SERVICE_PORT,
+-        ResourceEstimatorConfiguration.DEFAULT_SERVICE_PORT);
+-  }
+-
+-  @Override protected void serviceInit(Configuration conf) throws Exception {
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override protected void serviceStart() throws Exception {
+-    super.serviceStart();
+-    startResourceEstimatorApp();
+-  }
+-
+-  private void join() {
+-    // keep the main thread that started the server up until it receives a stop
+-    // signal
+-    if (webServer != null) {
+-      try {
+-        webServer.join();
+-      } catch (InterruptedException ignore) {
+-      }
+-    }
+-  }
+-
+-  @Override protected void serviceStop() throws Exception {
+-    if (webServer != null) {
+-      webServer.stop();
+-    }
+-    super.serviceStop();
+-  }
+-
+-  private void startResourceEstimatorApp() throws IOException {
+-    Configuration config = new YarnConfiguration();
+-    config.addResource(ResourceEstimatorConfiguration.CONFIG_FILE);
+-    HttpServer2.Builder builder =
+-        new HttpServer2.Builder().setName("ResourceEstimatorServer")
+-            .setConf(config)
+-            //.setFindPort(true)
+-            .addEndpoint(getBaseURI(config));
+-    webServer = builder.build();
+-    webServer.addJerseyResourcePackage(
+-        ResourceEstimatorService.class.getPackage().getName() + ";"
+-            + GenericExceptionHandler.class.getPackage().getName() + ";"
+-            + YarnJacksonJaxbJsonProvider.class.getPackage().getName(), "/*");
+-    webServer.start();
+-  }
+-
+-  /**
+-   * Start embedded Hadoop HTTP server.
+-   *
+-   * @return an instance of the started HTTP server.
+-   * @throws IOException in case there is an error while starting server.
+-   */
+-  static ResourceEstimatorServer startResourceEstimatorServer()
+-      throws IOException, InterruptedException {
+-    Configuration config = new YarnConfiguration();
+-    config.addResource(ResourceEstimatorConfiguration.CONFIG_FILE);
+-    ResourceEstimatorServer resourceEstimatorServer = null;
+-    try {
+-      resourceEstimatorServer = new ResourceEstimatorServer();
+-      ShutdownHookManager.get().addShutdownHook(
+-          new CompositeServiceShutdownHook(resourceEstimatorServer), 30);
+-      resourceEstimatorServer.init(config);
+-      resourceEstimatorServer.start();
+-    } catch (Throwable t) {
+-      LOGGER.error("Error starting ResourceEstimatorServer", t);
+-    }
+-
+-    return resourceEstimatorServer;
+-  }
+-
+-  public static void main(String[] args)
+-      throws InterruptedException, IOException {
+-    ResourceEstimatorServer server = startResourceEstimatorServer();
+-    server.join();
+-  }
+-
+-  /**
+-   * Stop embedded Hadoop HTTP server.
+-   *
+-   * @throws Exception in case the HTTP server fails to shut down.
+-   */
+-  public void shutdown() throws Exception {
+-    LOGGER.info("Stopping resourceestimator service at: {}.",
+-        baseURI.toString());
+-    webServer.stop();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorService.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorService.java
+deleted file mode 100644
+index 5d3aea4fdc5..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ResourceEstimatorService.java
++++ /dev/null
+@@ -1,234 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.service;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.lang.reflect.Type;
+-import java.util.List;
+-import java.util.Map;
+-
+-import javax.ws.rs.DELETE;
+-import javax.ws.rs.GET;
+-import javax.ws.rs.POST;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.PathParam;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.core.MediaType;
+-
+-import com.sun.jersey.spi.resource.Singleton;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorUtil;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.common.serialization.RLESparseResourceAllocationSerDe;
+-import org.apache.hadoop.resourceestimator.common.serialization.ResourceSerDe;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.solver.api.Solver;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.SolverException;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.apache.hadoop.resourceestimator.translator.impl.LogParserUtil;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.reflect.TypeToken;
+-
+-/**
+- * Resource Estimator Service which provides a set of REST APIs for users to
+- * use the estimation service.
+- */
+-@Singleton
+-@Path("/resourceestimator") public class ResourceEstimatorService {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(ResourceEstimatorService.class);
+-  private final SkylineStore skylineStore;
+-  private final Solver solver;
+-  private final LogParser logParser;
+-  private final LogParserUtil logParserUtil = new LogParserUtil();
+-  private final Configuration config;
+-  private final Gson gson;
+-  private final Type rleType;
+-  private final Type skylineStoreType;
+-
+-  public ResourceEstimatorService() throws ResourceEstimatorException {
+-    try {
+-      config = new Configuration();
+-      config.addResource(ResourceEstimatorConfiguration.CONFIG_FILE);
+-      skylineStore = ResourceEstimatorUtil.createProviderInstance(config,
+-          ResourceEstimatorConfiguration.SKYLINESTORE_PROVIDER,
+-          ResourceEstimatorConfiguration.DEFAULT_SKYLINESTORE_PROVIDER,
+-          SkylineStore.class);
+-      logParser = ResourceEstimatorUtil.createProviderInstance(config,
+-          ResourceEstimatorConfiguration.TRANSLATOR_PROVIDER,
+-          ResourceEstimatorConfiguration.DEFAULT_TRANSLATOR_PROVIDER,
+-          LogParser.class);
+-      logParser.init(config, skylineStore);
+-      logParserUtil.setLogParser(logParser);
+-      solver = ResourceEstimatorUtil.createProviderInstance(config,
+-          ResourceEstimatorConfiguration.SOLVER_PROVIDER,
+-          ResourceEstimatorConfiguration.DEFAULT_SOLVER_PROVIDER,
+-          Solver.class);
+-      solver.init(config, skylineStore);
+-    } catch (Exception ex) {
+-      LOGGER
+-          .error("Server initialization failed due to: {}", ex.getMessage());
+-      throw new ResourceEstimatorException(ex.getMessage(), ex);
+-    }
+-    gson = new GsonBuilder()
+-        .registerTypeAdapter(Resource.class, new ResourceSerDe())
+-        .registerTypeAdapter(RLESparseResourceAllocation.class,
+-            new RLESparseResourceAllocationSerDe())
+-        .enableComplexMapKeySerialization().create();
+-    rleType = new TypeToken<RLESparseResourceAllocation>() {
+-    }.getType();
+-    skylineStoreType =
+-        new TypeToken<Map<RecurrenceId, List<ResourceSkyline>>>() {
+-        }.getType();
+-  }
+-
+-  /**
+-   * Parse the log file. See also {@link LogParser#parseStream(InputStream)}.
+-   *
+-   * @param logFile file/directory of the log to be parsed.
+-   * @throws IOException                if fails to parse the log.
+-   * @throws SkylineStoreException      if fails to addHistory to
+-   *                                    {@link SkylineStore}.
+-   * @throws ResourceEstimatorException if the {@link LogParser}
+-   *     is not initialized.
+-   */
+-  @POST @Path("/translator/{logFile : .+}") public void parseFile(
+-      @PathParam("logFile") String logFile)
+-      throws IOException, SkylineStoreException, ResourceEstimatorException {
+-    logParserUtil.parseLog(logFile);
+-    LOGGER.debug("Parse logFile: {}.", logFile);
+-  }
+-
+-  /**
+-   * Get predicted {code Resource} allocation for the pipeline. If the
+-   * prediction for the pipeline already exists in the {@link SkylineStore}, it
+-   * will directly get the prediction from {@link SkylineStore}, otherwise it
+-   * will call the {@link Solver} to make prediction, and store the predicted
+-   * {code Resource} allocation to the {@link SkylineStore}. Note that invoking
+-   * {@link Solver} could be a time-consuming operation.
+-   *
+-   * @param pipelineId the id of the pipeline.
+-   * @return Json format of {@link RLESparseResourceAllocation}.
+-   * @throws SolverException       if {@link Solver} fails;
+-   * @throws SkylineStoreException if fails to get history
+-   *     {@link ResourceSkyline} or predicted {code Resource} allocation
+-   *     from {@link SkylineStore}.
+-   */
+-  @GET @Path("/estimator/{pipelineId}") @Produces(MediaType.APPLICATION_JSON)
+-  public String getPrediction(
+-      @PathParam(value = "pipelineId") String pipelineId)
+-      throws SolverException, SkylineStoreException {
+-    // first, try to grab the predicted resource allocation from the skyline
+-    // store
+-    RLESparseResourceAllocation result = skylineStore.getEstimation(pipelineId);
+-    // if received resource allocation is null, then run the solver
+-    if (result == null) {
+-      RecurrenceId recurrenceId = new RecurrenceId(pipelineId, "*");
+-      Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-          skylineStore.getHistory(recurrenceId);
+-      result = solver.solve(jobHistory);
+-    }
+-    final String prediction = gson.toJson(result, rleType);
+-    LOGGER.debug("Predict resource requests for pipelineId: {}." + pipelineId);
+-
+-    return prediction;
+-  }
+-
+-  /**
+-   * Get history {@link ResourceSkyline} from {@link SkylineStore}. This
+-   * function supports the following special wildcard operations regarding
+-   * {@link RecurrenceId}: If the {@code pipelineId} is "*", it will return all
+-   * entries in the store; else, if the {@code runId} is "*", it will return all
+-   * {@link ResourceSkyline}s belonging to the {@code pipelineId}; else, it will
+-   * return all {@link ResourceSkyline}s belonging to the {{@code pipelineId},
+-   * {@code runId}}. If the {@link RecurrenceId} does not exist, it will not do
+-   * anything.
+-   *
+-   * @param pipelineId pipelineId of the history run.
+-   * @param runId      runId of the history run.
+-   * @return Json format of history {@link ResourceSkyline}s.
+-   * @throws SkylineStoreException if fails to getHistory
+-   *     {@link ResourceSkyline} from {@link SkylineStore}.
+-   */
+-  @GET @Path("/skylinestore/history/{pipelineId}/{runId}")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public String getHistoryResourceSkyline(
+-      @PathParam("pipelineId") String pipelineId,
+-      @PathParam("runId") String runId) throws SkylineStoreException {
+-    RecurrenceId recurrenceId = new RecurrenceId(pipelineId, runId);
+-    Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        skylineStore.getHistory(recurrenceId);
+-    final String skyline = gson.toJson(jobHistory, skylineStoreType);
+-    LOGGER
+-        .debug("Query the skyline store for recurrenceId: {}." + recurrenceId);
+-
+-    return skyline;
+-  }
+-
+-  /**
+-   * Get estimated {code Resource} allocation for the pipeline.
+-   *
+-   * @param pipelineId id of the pipeline.
+-   * @return Json format of {@link RLESparseResourceAllocation}.
+-   * @throws SkylineStoreException if fails to get estimated {code Resource}
+-   *                               allocation from {@link SkylineStore}.
+-   */
+-  @GET @Path("/skylinestore/estimation/{pipelineId}")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public String getEstimatedResourceAllocation(
+-      @PathParam("pipelineId") String pipelineId) throws SkylineStoreException {
+-    RLESparseResourceAllocation result = skylineStore.getEstimation(pipelineId);
+-    final String skyline = gson.toJson(result, rleType);
+-    LOGGER.debug("Query the skyline store for pipelineId: {}." + pipelineId);
+-
+-    return skyline;
+-  }
+-
+-  /**
+-   * Delete history {@link ResourceSkyline}s from {@link SkylineStore}.
+-   * <p> Note that for safety considerations, we only allow users to delete
+-   * history {@link ResourceSkyline}s of one job run.
+-   *
+-   * @param pipelineId pipelineId of the history run.
+-   * @param runId      runId runId of the history run.
+-   * @throws SkylineStoreException if fails to deleteHistory
+-   *                               {@link ResourceSkyline}s.
+-   */
+-  @DELETE @Path("/skylinestore/history/{pipelineId}/{runId}")
+-  public void deleteHistoryResourceSkyline(
+-      @PathParam("pipelineId") String pipelineId,
+-      @PathParam("runId") String runId) throws SkylineStoreException {
+-    RecurrenceId recurrenceId = new RecurrenceId(pipelineId, runId);
+-    skylineStore.deleteHistory(recurrenceId);
+-    LOGGER.info("Delete ResourceSkyline for recurrenceId: {}.", recurrenceId);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ShutdownHook.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ShutdownHook.java
+deleted file mode 100644
+index 23e1413fcad..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/ShutdownHook.java
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.service;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Simple shutdown hook for {@link ResourceEstimatorServer}.
+- */
+-public class ShutdownHook extends Thread {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(ShutdownHook.class);
+-  private final ResourceEstimatorServer server;
+-
+-  ShutdownHook(ResourceEstimatorServer server) {
+-    this.server = server;
+-  }
+-
+-  public void run() {
+-    try {
+-      server.shutdown();
+-    } catch (Exception e) {
+-      LOGGER.error("HttpServer fails to shut down!");
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/package-info.java
+deleted file mode 100644
+index 3571736c50f..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/service/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Resource estimator service.
+- */
+-
+-package org.apache.hadoop.resourceestimator.service;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/HistorySkylineStore.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/HistorySkylineStore.java
+deleted file mode 100644
+index 8fe461937ae..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/HistorySkylineStore.java
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.api;
+-
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-
+-/**
+- * HistorySkylineStore stores pipeline job's {@link ResourceSkyline}s in all
+- * runs. {@code Estimator} will query the {@link ResourceSkyline}s for pipeline
+- * jobs. {@code Parser} will parse various types of job logs, construct
+- * {@link ResourceSkyline}s out of the logs and store them in the SkylineStore.
+- */
+-public interface HistorySkylineStore {
+-  /**
+-   * Add job's resource skyline to the <em>store</em> indexed by the job's
+-   * {@link RecurrenceId}. {@link RecurrenceId} is used to identify recurring
+-   * pipeline jobs, and we assume that {@code
+-   * ResourceEstimatorServer} users will provide the correct
+-   * {@link RecurrenceId}. <p> If {@link ResourceSkyline}s to be added contain
+-   * <em>null</em> elements, the function will skip them.
+-   *
+-   * @param recurrenceId     the unique id of user's recurring pipeline jobs.
+-   * @param resourceSkylines the list of {@link ResourceSkyline}s in one run.
+-   * @throws SkylineStoreException if: (1) input parameters are invalid; (2)
+-   *     {@link ResourceSkyline}s to be added contain some duplicate
+-   *     {@link RecurrenceId}s which already exist in the
+-   *     {@link HistorySkylineStore}.
+-   */
+-  void addHistory(RecurrenceId recurrenceId,
+-      List<ResourceSkyline> resourceSkylines) throws SkylineStoreException;
+-
+-  /**
+-   * Delete all {@link ResourceSkyline}s belonging to given
+-   * {@link RecurrenceId}.
+-   * <p> Note that for safety considerations, we only allow users to
+-   * deleteHistory {@link ResourceSkyline}s of one job run.
+-   *
+-   * @param recurrenceId the unique id of user's recurring pipeline jobs.
+-   * @throws SkylineStoreException if: (1) input parameters are invalid; (2)
+-   *     recurrenceId does not exist in the {@link HistorySkylineStore}.
+-   */
+-  void deleteHistory(RecurrenceId recurrenceId) throws SkylineStoreException;
+-
+-  /**
+-   * Update {@link RecurrenceId} with given {@link ResourceSkyline}s. This
+-   * function will deleteHistory all the {@link ResourceSkyline}s belonging to
+-   * the {@link RecurrenceId}, and re-insert the given {@link ResourceSkyline}s
+-   * to the SkylineStore.
+-   * <p> If {@link ResourceSkyline}s contain <em>null</em> elements,
+-   * the function will skip them.
+-   *
+-   * @param recurrenceId     the unique id of the pipeline job.
+-   * @param resourceSkylines the list of {@link ResourceSkyline}s in one run.
+-   * @throws SkylineStoreException if: (1) input parameters are invalid; (2)
+-   *     recurrenceId does not exist in the SkylineStore.
+-   */
+-  void updateHistory(RecurrenceId recurrenceId,
+-      List<ResourceSkyline> resourceSkylines) throws SkylineStoreException;
+-
+-  /**
+-   * Return all {@link ResourceSkyline}s belonging to {@link RecurrenceId}.
+-   * <p> This function supports the following special wildcard operations
+-   * regarding {@link RecurrenceId}: If the {@code pipelineId} is "*", it will
+-   * return all entries in the store; else, if the {@code runId} is "*", it
+-   * will return all {@link ResourceSkyline}s belonging to the
+-   * {@code pipelineId}; else, it will return all {@link ResourceSkyline}s
+-   * belonging to the {{@code pipelineId}, {@code runId}}. If the
+-   * {@link RecurrenceId} does not exist, it will return <em>null</em>.
+-   *
+-   * @param recurrenceId the unique id of the pipeline job.
+-   * @return all {@link ResourceSkyline}s belonging to the recurrenceId.
+-   * @throws SkylineStoreException if recurrenceId is <em>null</em>.
+-   */
+-  Map<RecurrenceId, List<ResourceSkyline>> getHistory(RecurrenceId recurrenceId)
+-      throws SkylineStoreException;
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/PredictionSkylineStore.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/PredictionSkylineStore.java
+deleted file mode 100644
+index c3fedce47bc..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/PredictionSkylineStore.java
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.api;
+-
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-
+-/**
+- * PredictionSkylineStore stores the predicted
+- * {@code RLESparseResourceAllocation} of a job as computed by the
+- * {@code Estimator} based on the {@code ResourceSkyline}s of past executions in
+- * the {@code HistorySkylineStore}.
+- */
+-public interface PredictionSkylineStore {
+-
+-  /**
+-   * Add job's predicted {@code Resource} allocation to the <em>store</em>
+-   * indexed by the {@code
+-   * pipelineId}.
+-   * <p> Note that right now we only keep the latest copy of predicted
+-   * {@code Resource} allocation for the recurring pipeline.
+-   *
+-   * @param pipelineId       the id of the recurring pipeline.
+-   * @param resourceOverTime the predicted {@code Resource} allocation for the
+-   *                         pipeline.
+-   * @throws SkylineStoreException if input parameters are invalid.
+-   */
+-  void addEstimation(String pipelineId,
+-      RLESparseResourceAllocation resourceOverTime)
+-      throws SkylineStoreException;
+-
+-  /**
+-   * Return the predicted {@code Resource} allocation for the pipeline.
+-   * <p> If the pipelineId does not exist, it will return <em>null</em>.
+-   *
+-   * @param pipelineId the unique id of the pipeline.
+-   * @return the predicted {@code Resource} allocation for the pipeline.
+-   * @throws SkylineStoreException if pipelineId is <em>null</em>.
+-   */
+-  RLESparseResourceAllocation getEstimation(String pipelineId)
+-      throws SkylineStoreException;
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/SkylineStore.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/SkylineStore.java
+deleted file mode 100644
+index f352ed4aa35..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/SkylineStore.java
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.api;
+-
+-/**
+- * SkylineStore is composable interface for storing the history
+- * {@code ResourceSkyline}s of past job runs and the predicted
+- * {@code RLESparseResourceAllocation} for future execution.
+- */
+-public interface SkylineStore
+-    extends HistorySkylineStore, PredictionSkylineStore {
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/package-info.java
+deleted file mode 100644
+index e8334860757..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/api/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * APIs for the {@code SkylineStore}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.api;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/DuplicateRecurrenceIdException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/DuplicateRecurrenceIdException.java
+deleted file mode 100644
+index 7c924809d04..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/DuplicateRecurrenceIdException.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown the {@code RecurrenceId} already exists in the
+- * {@code SkylineStore}.
+- */
+-public class DuplicateRecurrenceIdException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public DuplicateRecurrenceIdException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/EmptyResourceSkylineException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/EmptyResourceSkylineException.java
+deleted file mode 100644
+index 55a8fa7eb34..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/EmptyResourceSkylineException.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown if the @link{ResourceSkyline}s to be added to the
+- * {@code SkylineStore} is empty.
+- */
+-public class EmptyResourceSkylineException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public EmptyResourceSkylineException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullPipelineIdException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullPipelineIdException.java
+deleted file mode 100644
+index d48be7d61f4..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullPipelineIdException.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown when pipelineId to be added is <em>null</em>.
+- */
+-public class NullPipelineIdException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public NullPipelineIdException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRLESparseResourceAllocationException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRLESparseResourceAllocationException.java
+deleted file mode 100644
+index 9aee0b69a1d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRLESparseResourceAllocationException.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown if the {@code ResourceSkyline} to be added is <em>null</em>.
+- */
+-public class NullRLESparseResourceAllocationException
+-    extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public NullRLESparseResourceAllocationException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRecurrenceIdException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRecurrenceIdException.java
+deleted file mode 100644
+index 518c0650b5d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullRecurrenceIdException.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown the {@code RecurrenceId} to be added is <em>null</em>.
+- */
+-public class NullRecurrenceIdException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public NullRecurrenceIdException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullResourceSkylineException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullResourceSkylineException.java
+deleted file mode 100644
+index b70c7646a31..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/NullResourceSkylineException.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown if the {@code ResourceSkyline} to be added is <em>null</em>.
+- */
+-public class NullResourceSkylineException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public NullResourceSkylineException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/RecurrenceIdNotFoundException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/RecurrenceIdNotFoundException.java
+deleted file mode 100644
+index b5e734dc49a..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/RecurrenceIdNotFoundException.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown if {@code RecurrenceId} is not found in the
+- * {@code SkylineStore}.
+- */
+-public class RecurrenceIdNotFoundException extends SkylineStoreException {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public RecurrenceIdNotFoundException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/SkylineStoreException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/SkylineStoreException.java
+deleted file mode 100644
+index 751b5dd3111..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/SkylineStoreException.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+-
+-/**
+- * Exception thrown the @link{SkylineStore} or the {@code Estimator} tries to
+- * addHistory or query pipeline job's resource skylines.
+- */
+-public abstract class SkylineStoreException extends Exception {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public SkylineStoreException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/package-info.java
+deleted file mode 100644
+index 716e090c683..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/exceptions/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-/**
+- * SkylineStore exception module.
+- */
+-package org.apache.hadoop.resourceestimator.skylinestore.exceptions;
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/InMemoryStore.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/InMemoryStore.java
+deleted file mode 100644
+index e00f3a061e1..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/InMemoryStore.java
++++ /dev/null
+@@ -1,256 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.impl;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.locks.Lock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.DuplicateRecurrenceIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.EmptyResourceSkylineException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.RecurrenceIdNotFoundException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.skylinestore.validator.SkylineStoreValidator;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * An in-memory implementation of {@link SkylineStore}.
+- */
+-public class InMemoryStore implements SkylineStore {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(InMemoryStore.class);
+-  private final ReentrantReadWriteLock readWriteLock =
+-      new ReentrantReadWriteLock();
+-  private final Lock readLock = readWriteLock.readLock();
+-  private final Lock writeLock = readWriteLock.writeLock();
+-  private final SkylineStoreValidator inputValidator =
+-      new SkylineStoreValidator();
+-  /**
+-   * A pipeline job's history {@link ResourceSkyline}s. TODO: we may flatten it
+-   * out for quick access.
+-   */
+-  private final Map<RecurrenceId, List<ResourceSkyline>> skylineStore =
+-      new HashMap<>(); // pipelineId, resource skyline
+-  // Recurring pipeline's predicted {@link ResourceSkyline}s.
+-  private final Map<String, RLESparseResourceAllocation> estimationStore =
+-      new HashMap<>(); // pipelineId, ResourceSkyline
+-
+-  private List<ResourceSkyline> eliminateNull(
+-      final List<ResourceSkyline> resourceSkylines) {
+-    final List<ResourceSkyline> result = new ArrayList<>();
+-    for (final ResourceSkyline resourceSkyline : resourceSkylines) {
+-      if (resourceSkyline != null) {
+-        result.add(resourceSkyline);
+-      }
+-    }
+-    return result;
+-  }
+-
+-  @Override public final void addHistory(final RecurrenceId recurrenceId,
+-      final List<ResourceSkyline> resourceSkylines)
+-      throws SkylineStoreException {
+-    inputValidator.validate(recurrenceId, resourceSkylines);
+-    writeLock.lock();
+-    try {
+-      // remove the null elements in the resourceSkylines
+-      final List<ResourceSkyline> filteredInput =
+-          eliminateNull(resourceSkylines);
+-      if (filteredInput.size() > 0) {
+-        if (skylineStore.containsKey(recurrenceId)) {
+-          // if filteredInput has duplicate jobIds with existing skylines in the
+-          // store,
+-          // throw out an exception
+-          final List<ResourceSkyline> jobHistory =
+-              skylineStore.get(recurrenceId);
+-          final List<String> oldJobIds = new ArrayList<>();
+-          for (final ResourceSkyline resourceSkyline : jobHistory) {
+-            oldJobIds.add(resourceSkyline.getJobId());
+-          }
+-          if (!oldJobIds.isEmpty()) {
+-            for (ResourceSkyline elem : filteredInput) {
+-              if (oldJobIds.contains(elem.getJobId())) {
+-                StringBuilder errMsg = new StringBuilder();
+-                errMsg.append(
+-                    "Trying to addHistory duplicate resource skylines for "
+-                        + recurrenceId
+-                        + ". Use updateHistory function instead.");
+-                LOGGER.error(errMsg.toString());
+-                throw new DuplicateRecurrenceIdException(errMsg.toString());
+-              }
+-            }
+-          }
+-          skylineStore.get(recurrenceId).addAll(filteredInput);
+-          LOGGER.info("Successfully addHistory new resource skylines for {}.",
+-              recurrenceId);
+-        } else {
+-          skylineStore.put(recurrenceId, filteredInput);
+-          LOGGER.info("Successfully addHistory new resource skylines for {}.",
+-              recurrenceId);
+-        }
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  @Override public void addEstimation(String pipelineId,
+-      RLESparseResourceAllocation resourceSkyline)
+-      throws SkylineStoreException {
+-    inputValidator.validate(pipelineId, resourceSkyline);
+-    writeLock.lock();
+-    try {
+-      estimationStore.put(pipelineId, resourceSkyline);
+-      LOGGER.info("Successfully add estimated resource allocation for {}.",
+-          pipelineId);
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  @Override public final void deleteHistory(final RecurrenceId recurrenceId)
+-      throws SkylineStoreException {
+-    inputValidator.validate(recurrenceId);
+-    writeLock.lock();
+-    try {
+-      if (skylineStore.containsKey(recurrenceId)) {
+-        skylineStore.remove(recurrenceId);
+-        LOGGER.warn("Delete resource skylines for {}.", recurrenceId);
+-      } else {
+-        StringBuilder errMsg = new StringBuilder();
+-        errMsg.append(
+-            "Trying to deleteHistory non-existing recurring pipeline  "
+-                + recurrenceId + "\'s resource skylines");
+-        LOGGER.error(errMsg.toString());
+-        throw new RecurrenceIdNotFoundException(errMsg.toString());
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  @Override public final void updateHistory(final RecurrenceId recurrenceId,
+-      final List<ResourceSkyline> resourceSkylines)
+-      throws SkylineStoreException {
+-    inputValidator.validate(recurrenceId, resourceSkylines);
+-    writeLock.lock();
+-    try {
+-      if (skylineStore.containsKey(recurrenceId)) {
+-        // remove the null elements in the resourceSkylines
+-        List<ResourceSkyline> filteredInput = eliminateNull(resourceSkylines);
+-        if (filteredInput.size() > 0) {
+-          skylineStore.put(recurrenceId, filteredInput);
+-          LOGGER.info("Successfully updateHistory resource skylines for {}.",
+-              recurrenceId);
+-        } else {
+-          StringBuilder errMsg = new StringBuilder();
+-          errMsg.append("Trying to updateHistory " + recurrenceId
+-              + " with empty resource skyline");
+-          LOGGER.error(errMsg.toString());
+-          throw new EmptyResourceSkylineException(errMsg.toString());
+-        }
+-      } else {
+-        StringBuilder errMsg = new StringBuilder();
+-        errMsg.append(
+-            "Trying to updateHistory non-existing resource skylines for "
+-                + recurrenceId);
+-        LOGGER.error(errMsg.toString());
+-        throw new RecurrenceIdNotFoundException(errMsg.toString());
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  @Override public final Map<RecurrenceId, List<ResourceSkyline>> getHistory(
+-      final RecurrenceId recurrenceId) throws SkylineStoreException {
+-    inputValidator.validate(recurrenceId);
+-    readLock.lock();
+-    try {
+-      String pipelineId = recurrenceId.getPipelineId();
+-      // User tries to getHistory all resource skylines in the skylineStore
+-      if (pipelineId.equals("*")) {
+-        LOGGER
+-            .info("Successfully query resource skylines for {}.", recurrenceId);
+-        return Collections.unmodifiableMap(skylineStore);
+-      }
+-      String runId = recurrenceId.getRunId();
+-      Map<RecurrenceId, List<ResourceSkyline>> result =
+-          new HashMap<RecurrenceId, List<ResourceSkyline>>();
+-      // User tries to getHistory pipelineId's all resource skylines in the
+-      // skylineStore
+-      if (runId.equals("*")) {
+-        // TODO: this for loop is expensive, so we may change the type of
+-        // skylineStore to
+-        // speed up this loop.
+-        for (Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : skylineStore
+-            .entrySet()) {
+-          RecurrenceId index = entry.getKey();
+-          if (index.getPipelineId().equals(pipelineId)) {
+-            result.put(index, entry.getValue());
+-          }
+-        }
+-        if (result.size() > 0) {
+-          LOGGER.info("Successfully query resource skylines for {}.",
+-              recurrenceId);
+-          return Collections.unmodifiableMap(result);
+-        } else {
+-          LOGGER.warn(
+-              "Trying to getHistory non-existing resource skylines for {}.",
+-              recurrenceId);
+-          return null;
+-        }
+-      }
+-      // User tries to getHistory {pipelineId, runId}'s resource skylines
+-      if (skylineStore.containsKey(recurrenceId)) {
+-        result.put(recurrenceId, skylineStore.get(recurrenceId));
+-      } else {
+-        LOGGER
+-            .warn("Trying to getHistory non-existing resource skylines for {}.",
+-                recurrenceId);
+-        return null;
+-      }
+-      LOGGER.info("Successfully query resource skylines for {}.", recurrenceId);
+-      return Collections.unmodifiableMap(result);
+-    } finally {
+-      readLock.unlock();
+-    }
+-  }
+-
+-  @Override public final RLESparseResourceAllocation getEstimation(
+-      String pipelineId) throws SkylineStoreException {
+-    inputValidator.validate(pipelineId);
+-    readLock.lock();
+-    try {
+-      return estimationStore.get(pipelineId);
+-    } finally {
+-      readLock.unlock();
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/package-info.java
+deleted file mode 100644
+index ffccd5de16a..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/impl/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Implementation for {@code SkylineStore}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.impl;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/SkylineStoreValidator.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/SkylineStoreValidator.java
+deleted file mode 100644
+index f5f50f5eaf8..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/SkylineStoreValidator.java
++++ /dev/null
+@@ -1,118 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.validator;
+-
+-import java.util.List;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullPipelineIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullRLESparseResourceAllocationException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullRecurrenceIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullResourceSkylineException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * SkylineStoreValidator validates input parameters for {@link SkylineStore}.
+- */
+-public class SkylineStoreValidator {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(SkylineStoreValidator.class);
+-
+-  /**
+-   * Check if recurrenceId is <em>null</em>.
+-   *
+-   * @param recurrenceId the id of the recurring pipeline job.
+-   * @throws SkylineStoreException if input parameters are invalid.
+-   */
+-  public final void validate(final RecurrenceId recurrenceId)
+-      throws SkylineStoreException {
+-    if (recurrenceId == null) {
+-      StringBuilder sb = new StringBuilder();
+-      sb.append("Recurrence id is null, please try again by specifying"
+-          + " a valid Recurrence id.");
+-      LOGGER.error(sb.toString());
+-      throw new NullRecurrenceIdException(sb.toString());
+-    }
+-  }
+-
+-  /**
+-   * Check if pipelineId is <em>null</em>.
+-   *
+-   * @param pipelineId the id of the recurring pipeline job.
+-   * @throws SkylineStoreException if input parameters are invalid.
+-   */
+-  public final void validate(final String pipelineId)
+-      throws SkylineStoreException {
+-    if (pipelineId == null) {
+-      StringBuilder sb = new StringBuilder();
+-      sb.append("pipelineId is null, please try again by specifying"
+-          + " a valid pipelineId.");
+-      LOGGER.error(sb.toString());
+-      throw new NullPipelineIdException(sb.toString());
+-    }
+-  }
+-
+-  /**
+-   * Check if recurrenceId is <em>null</em> or resourceSkylines is
+-   * <em>null</em>.
+-   *
+-   * @param recurrenceId     the id of the recurring pipeline job.
+-   * @param resourceSkylines the list of {@link ResourceSkyline}s to be added.
+-   * @throws SkylineStoreException if input parameters are invalid.
+-   */
+-  public final void validate(final RecurrenceId recurrenceId,
+-      final List<ResourceSkyline> resourceSkylines)
+-      throws SkylineStoreException {
+-    validate(recurrenceId);
+-    if (resourceSkylines == null) {
+-      StringBuilder sb = new StringBuilder();
+-      sb.append("ResourceSkylines for " + recurrenceId
+-          + " is null, please try again by "
+-          + "specifying valid ResourceSkylines.");
+-      LOGGER.error(sb.toString());
+-      throw new NullResourceSkylineException(sb.toString());
+-    }
+-  }
+-
+-  /**
+-   * Check if pipelineId is <em>null</em> or resourceOverTime is <em>null</em>.
+-   *
+-   * @param pipelineId       the id of the recurring pipeline.
+-   * @param resourceOverTime predicted {@code Resource} allocation to be added.
+-   * @throws SkylineStoreException if input parameters are invalid.
+-   */
+-  public final void validate(final String pipelineId,
+-      final RLESparseResourceAllocation resourceOverTime)
+-      throws SkylineStoreException {
+-    validate(pipelineId);
+-    if (resourceOverTime == null) {
+-      StringBuilder sb = new StringBuilder();
+-      sb.append("Resource allocation for " + pipelineId + " is null.");
+-      LOGGER.error(sb.toString());
+-      throw new NullRLESparseResourceAllocationException(sb.toString());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/package-info.java
+deleted file mode 100644
+index 23d67c50bc1..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/skylinestore/validator/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Validator for {@code SkylineStore}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.validator;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/Solver.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/Solver.java
+deleted file mode 100644
+index 7958a6f29cd..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/Solver.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.api;
+-
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.PredictionSkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.SolverException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-
+-/**
+- * Solver takes recurring pipeline's {@link ResourceSkyline} history as input,
+- * predicts its {@link Resource} requirement at each time t for the next run,
+- * and translate them into {@link ResourceSkyline} which will be used to make
+- * recurring resource reservations.
+- */
+-public interface Solver {
+-  /**
+-   * Initializing the Solver, including loading solver parameters from
+-   * configuration file.
+-   *
+-   * @param config       {@link Configuration} for the Solver.
+-   * @param skylineStore the {@link PredictionSkylineStore} which stores
+-   *                     predicted {@code Resource} allocations.
+-   */
+-  void init(Configuration config, PredictionSkylineStore skylineStore);
+-
+-  /**
+-   * The Solver reads recurring pipeline's {@link ResourceSkyline} history, and
+-   * precits its {@link ResourceSkyline} requirements for the next run.
+-   *
+-   * @param jobHistory the {@link ResourceSkyline}s of the recurring pipeline in
+-   *     previous runs. The {@link RecurrenceId} identifies one run of the
+-   *     recurring pipeline, and the list of {@link ResourceSkyline}s
+-   *     records the {@link ResourceSkyline} of each job within the pipeline.
+-   * @return the amount of {@link Resource} requested by the pipeline for the
+-   * next run (discretized by timeInterval).
+-   * @throws SolverException       if: (1) input is invalid; (2) the number of
+-   *     instances in the jobHistory is smaller than the minimum
+-   *     requirement; (3) solver runtime has unexpected behaviors;
+-   * @throws SkylineStoreException if it fails to add predicted {@code Resource}
+-   *     allocation to the {@link PredictionSkylineStore}.
+-   */
+-  RLESparseResourceAllocation solve(
+-      Map<RecurrenceId, List<ResourceSkyline>> jobHistory)
+-      throws SolverException, SkylineStoreException;
+-
+-  /**
+-   * Release the resource used by the Solver.
+-   */
+-  void close();
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/package-info.java
+deleted file mode 100644
+index fc8363d8510..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/api/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * API for {@code Solver}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.api;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidInputException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidInputException.java
+deleted file mode 100644
+index ff51f5fd53b..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidInputException.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.exceptions;
+-
+-/**
+- * Exception thrown the {@code SkylineStore} or the {@code Estimator} tries to
+- * addHistory or query pipeline job's resource skylines.
+- */
+-public class InvalidInputException extends SolverException {
+-
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public InvalidInputException(final String entity, final String reason) {
+-    super(entity + " is " + reason + ", please try again with valid " + entity);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidSolverException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidSolverException.java
+deleted file mode 100644
+index 9b614b6fa0c..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/InvalidSolverException.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.exceptions;
+-
+-/**
+- * Exception thrown the @link{SkylineStore} or the {@code Estimator} tries to
+- * addHistory or query pipeline job's resource skylines.
+- */
+-public class InvalidSolverException extends SolverException {
+-
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public InvalidSolverException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/SolverException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/SolverException.java
+deleted file mode 100644
+index 57507eaac07..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/SolverException.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.exceptions;
+-
+-/**
+- * Exception thrown the @link{SkylineStore} or the {@code Estimator} tries to
+- * addHistory or query pipeline job's resource skylines.
+- */
+-public abstract class SolverException extends Exception {
+-
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public SolverException(final String message) {
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/package-info.java
+deleted file mode 100644
+index bd4532428cd..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/exceptions/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-/**
+- * Exception module.
+- */
+-package org.apache.hadoop.resourceestimator.solver.exceptions;
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/BaseSolver.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/BaseSolver.java
+deleted file mode 100644
+index 55abb1c9081..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/BaseSolver.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.impl;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-
+-/**
+- * Common functions shared by {@code Solver} (translate predicted resource
+- * allocation into Hadoop's {@link ReservationSubmissionRequest}.
+- */
+-public abstract class BaseSolver {
+-  /**
+-   * Used to generate {@link ReservationId}.
+-   */
+-  private static final Random RAND = new Random();
+-
+-  /**
+-   * Translate the estimated {@link Resource} requirements of the pipeline to
+-   * Hadoop's {@link ReservationSubmissionRequest}.
+-   *
+-   * @param containerSpec     the {@link Resource} to be allocated to each
+-   *                          container;
+-   * @param containerRequests the predicted {@link Resource} to be allocated to
+-   *                          the job in each discrete time intervals;
+-   * @param config            configuration file for BaseSolver.
+-   * @return {@link ReservationSubmissionRequest} to be submitted to Hadoop to
+-   * make recurring resource reservation for the pipeline.
+-   */
+-  public final ReservationSubmissionRequest toRecurringRDL(
+-      final Resource containerSpec,
+-      final RLESparseResourceAllocation containerRequests,
+-      final Configuration config) {
+-    final int timeInterval =
+-        config.getInt(ResourceEstimatorConfiguration.TIME_INTERVAL_KEY, 5);
+-    long pipelineSubmissionTime = containerRequests.getEarliestStartTime();
+-    long pipelineFinishTime = containerRequests.getLatestNonNullTime();
+-    final long containerMemAlloc = containerSpec.getMemorySize();
+-    final long jobLen =
+-        (pipelineFinishTime - pipelineSubmissionTime) / timeInterval;
+-    List<ReservationRequest> reservationRequestList = new ArrayList<>();
+-    for (int i = 0; i < jobLen; i++) {
+-      // container spec, # of containers, concurrency, duration
+-      ReservationRequest reservationRequest = ReservationRequest
+-          .newInstance(containerSpec, (int) (
+-              containerRequests.getCapacityAtTime(i * timeInterval)
+-                  .getMemorySize() / containerMemAlloc), 1, timeInterval);
+-      reservationRequestList.add(reservationRequest);
+-    }
+-    ReservationRequests reservationRequests = ReservationRequests
+-        .newInstance(reservationRequestList,
+-            ReservationRequestInterpreter.R_ALL);
+-    ReservationDefinition reservationDefinition = ReservationDefinition
+-        .newInstance(pipelineSubmissionTime, pipelineFinishTime,
+-            reservationRequests, "LpSolver#toRecurringRDL");
+-    ReservationId reservationId =
+-        ReservationId.newInstance(RAND.nextLong(), RAND.nextLong());
+-    ReservationSubmissionRequest reservationSubmissionRequest =
+-        ReservationSubmissionRequest
+-            .newInstance(reservationDefinition, "resourceestimator",
+-                reservationId);
+-    return reservationSubmissionRequest;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/LpSolver.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/LpSolver.java
+deleted file mode 100644
+index c944d20ae9b..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/LpSolver.java
++++ /dev/null
+@@ -1,340 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.impl;
+-
+-import java.math.BigDecimal;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.PredictionSkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.solver.api.Solver;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.SolverException;
+-import org.apache.hadoop.resourceestimator.solver.preprocess.SolverPreprocessor;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.ojalgo.optimisation.Expression;
+-import org.ojalgo.optimisation.ExpressionsBasedModel;
+-import org.ojalgo.optimisation.Optimisation.Result;
+-import org.ojalgo.optimisation.Variable;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * A LP(Linear Programming) solution to predict recurring pipeline's
+- * {@link Resource} requirements, and generate Hadoop {@code RDL} requests which
+- * will be used to make recurring resource reservation.
+- */
+-public class LpSolver extends BaseSolver implements Solver {
+-  private static final Logger LOGGER = LoggerFactory.getLogger(LpSolver.class);
+-  private final SolverPreprocessor preprocessor = new SolverPreprocessor();
+-  /**
+-   * Controls the balance between over-allocation and under-allocation.
+-   */
+-  private double alpha;
+-  /**
+-   * Controls the generalization of the solver.
+-   */
+-  private double beta;
+-  /**
+-   * The minimum number of job runs required to run the solver.
+-   */
+-  private int minJobRuns;
+-  /**
+-   * The time interval which is used to discretize job execution.
+-   */
+-  private int timeInterval;
+-  /**
+-   * The PredictionSkylineStore to store the predicted ResourceSkyline for new
+-   * run.
+-   */
+-  private PredictionSkylineStore predictionSkylineStore;
+-
+-  @Override public final void init(final Configuration config,
+-      PredictionSkylineStore skylineStore) {
+-    this.alpha =
+-        config.getDouble(ResourceEstimatorConfiguration.SOLVER_ALPHA_KEY, 0.1);
+-    this.beta =
+-        config.getDouble(ResourceEstimatorConfiguration.SOLVER_BETA_KEY, 0.1);
+-    this.minJobRuns =
+-        config.getInt(ResourceEstimatorConfiguration.SOLVER_MIN_JOB_RUN_KEY, 1);
+-    this.timeInterval =
+-        config.getInt(ResourceEstimatorConfiguration.TIME_INTERVAL_KEY, 5);
+-    this.predictionSkylineStore = skylineStore;
+-  }
+-
+-  /**
+-   * Generate over-allocation constraints.
+-   *
+-   * @param lpModel            the LP model.
+-   * @param cJobITimeK         actual container allocation for job i in time
+-   *                           interval k.
+-   * @param oa                 container over-allocation.
+-   * @param x                  predicted container allocation.
+-   * @param indexJobITimeK     index for job i at time interval k.
+-   * @param timeK              index for time interval k.
+-   */
+-  private void generateOverAllocationConstraints(
+-      final ExpressionsBasedModel lpModel, final double cJobITimeK,
+-      final Variable[] oa, final Variable[] x, final int indexJobITimeK,
+-      final int timeK) {
+-    // oa_job_i_timeK >= x_timeK - cJobITimeK
+-    Expression overAllocExpression =
+-        lpModel.addExpression("over_alloc_" + indexJobITimeK);
+-    overAllocExpression.set(oa[indexJobITimeK], 1);
+-    overAllocExpression.set(x[timeK], -1);
+-    overAllocExpression.lower(-cJobITimeK); // >=
+-  }
+-
+-  /**
+-   * Generate under-allocation constraints.
+-   *
+-   * @param lpModel            the LP model.
+-   * @param cJobITimeK     actual container allocation for job i in time
+-   *                           interval k.
+-   * @param uaPredict          absolute container under-allocation.
+-   * @param ua                 recursive container under-allocation.
+-   * @param x                  predicted container allocation.
+-   * @param indexJobITimeK index for job i at time interval k.
+-   * @param timeK             index for time interval k.
+-   */
+-  private void generateUnderAllocationConstraints(
+-      final ExpressionsBasedModel lpModel, final double cJobITimeK,
+-      final Variable[] uaPredict, final Variable[] ua, final Variable[] x,
+-      final int indexJobITimeK, final int timeK) {
+-    // uaPredict_job_i_timeK + x_timeK >= cJobITimeK
+-    Expression underAllocPredictExpression =
+-        lpModel.addExpression("under_alloc_predict_" + indexJobITimeK);
+-    underAllocPredictExpression.set(uaPredict[indexJobITimeK], 1);
+-    underAllocPredictExpression.set(x[timeK], 1);
+-    underAllocPredictExpression.lower(cJobITimeK); // >=
+-    if (timeK >= 1) {
+-      /** Recursively calculate container under-allocation. */
+-      // ua_job_i_timeK >= ua_job_i_time_(k-1) + cJobITimeK - x_timeK
+-      Expression underAllocExpression =
+-          lpModel.addExpression("under_alloc_" + indexJobITimeK);
+-      underAllocExpression.set(ua[indexJobITimeK], 1);
+-      underAllocExpression.set(ua[indexJobITimeK - 1], -1);
+-      underAllocExpression.set(x[timeK], 1);
+-      underAllocExpression.lower(cJobITimeK); // >=
+-    } else {
+-      /** Initial value for container under-allocation. */
+-      // ua_job_i_time_0 >= cJobI_time_0 - x_time_0
+-      Expression underAllocExpression =
+-          lpModel.addExpression("under_alloc_" + indexJobITimeK);
+-      underAllocExpression.set(ua[indexJobITimeK], 1);
+-      underAllocExpression.set(x[timeK], 1);
+-      underAllocExpression.lower(cJobITimeK); // >=
+-    }
+-  }
+-
+-  /**
+-   * Generate solver objective.
+-   *
+-   * @param objective LP solver objective.
+-   * @param numJobs   number of history runs of the recurring pipeline.
+-   * @param jobLen    (maximum) job lenght of the recurring pipeline.
+-   * @param oa        container over-allocation.
+-   * @param ua        recursive container under-allocation.
+-   * @param eps       regularization parameter.
+-   */
+-  private void generateObjective(final Expression objective, final int numJobs,
+-      final int jobLen, final Variable[] oa, final Variable[] ua,
+-      final Variable eps) {
+-    int indexJobITimeK;
+-    // sum Over_Allocation
+-    for (int indexJobI = 0; indexJobI < numJobs; indexJobI++) {
+-      for (int timeK = 0; timeK < jobLen; timeK++) {
+-        indexJobITimeK = indexJobI * jobLen + timeK;
+-        objective.set(oa[indexJobITimeK], alpha / numJobs);
+-      }
+-    }
+-    // sum Under_Allocation
+-    int indexJobITimeN;
+-    for (int indexJobI = 0; indexJobI < numJobs; indexJobI++) {
+-      indexJobITimeN = indexJobI * jobLen + jobLen - 1;
+-      objective.set(ua[indexJobITimeN], (1 - alpha) / numJobs);
+-    }
+-    objective.set(eps, beta);
+-    objective.weight(BigDecimal.valueOf(1));
+-  }
+-
+-  /**
+-   * Get the job length of recurring pipeline.
+-   *
+-   * @param resourceSkylines the history ResourceSkylines allocated to the
+-   *                         recurring pipeline.
+-   * @param numJobs          number of history runs of the recurring pipeline.
+-   * @return length of (discretized time intervals of) the recurring pipeline.
+-   */
+-  private int getJobLen(final List<ResourceSkyline> resourceSkylines,
+-      final int numJobs) {
+-    int curLen = 0;
+-    int jobLen = 0;
+-    for (int indexJobI = 0; indexJobI < numJobs; indexJobI++) {
+-      curLen = (int) (resourceSkylines.get(indexJobI).getSkylineList()
+-          .getLatestNonNullTime() - resourceSkylines.get(indexJobI)
+-          .getSkylineList().getEarliestStartTime() + timeInterval - 1)
+-          / timeInterval; // for round up
+-      if (jobLen < curLen) {
+-        jobLen = curLen;
+-      }
+-    }
+-    return jobLen;
+-  }
+-
+-  @Override public final RLESparseResourceAllocation solve(
+-      final Map<RecurrenceId, List<ResourceSkyline>> jobHistory)
+-      throws SolverException, SkylineStoreException {
+-    // TODO: addHistory timeout support for this function, and ideally we should
+-    // return the confidence
+-    // level associated with the predicted resource.
+-    preprocessor.validate(jobHistory, timeInterval);
+-    final List<ResourceSkyline> resourceSkylines =
+-        preprocessor.aggregateSkylines(jobHistory, minJobRuns);
+-    final int numJobs = resourceSkylines.size();
+-    final int jobLen = getJobLen(resourceSkylines, numJobs);
+-
+-    /** Create variables. */
+-    final ExpressionsBasedModel lpModel = new ExpressionsBasedModel();
+-
+-    Variable[] oa = new Variable[jobLen * numJobs];
+-    Variable[] ua = new Variable[jobLen * numJobs];
+-    Variable[] uaPredict = new Variable[jobLen * numJobs];
+-    Variable[] x = new Variable[jobLen];
+-    for (int i = 0; i < jobLen * numJobs; i++) {
+-      oa[i] = new Variable("oa" + i).lower(BigDecimal.valueOf(0));
+-      ua[i] = new Variable("ua" + i).lower(BigDecimal.valueOf(0));
+-      uaPredict[i] = new Variable("uaPredict" + i).lower(BigDecimal.valueOf(0));
+-    }
+-    for (int i = 0; i < jobLen; i++) {
+-      x[i] = new Variable("x").lower(BigDecimal.valueOf(0));
+-    }
+-    lpModel.addVariables(x);
+-    lpModel.addVariables(oa);
+-    lpModel.addVariables(ua);
+-    lpModel.addVariables(uaPredict);
+-    Variable eps = new Variable("epsilon").lower(BigDecimal.valueOf(0));
+-    lpModel.addVariable(eps);
+-
+-    /** Set constraints. */
+-    int indexJobITimeK = 0;
+-    double cJobI = 0;
+-    double cJobITimeK = 0;
+-    ResourceSkyline resourceSkyline;
+-    int[] containerNums;
+-    // 1. sum(job_i){sum(timeK){1/cJobI * uaPredict_job_i_timeK}} <= numJobs
+-    // * eps
+-    Expression regularizationConstraint =
+-        lpModel.addExpression("regularization");
+-    regularizationConstraint.set(eps, -numJobs);
+-    regularizationConstraint.upper(BigDecimal.valueOf(0)); // <= 0
+-    for (int indexJobI = 0;
+-         indexJobI < resourceSkylines.size(); indexJobI++) {
+-      resourceSkyline = resourceSkylines.get(indexJobI);
+-      // the # of containers consumed by job i in discretized time intervals
+-      containerNums = preprocessor
+-          .getDiscreteSkyline(resourceSkyline.getSkylineList(), timeInterval,
+-              resourceSkyline.getContainerSpec().getMemorySize(), jobLen);
+-      // the aggregated # of containers consumed by job i during its lifespan
+-      cJobI = 0;
+-      for (int i = 0; i < containerNums.length; i++) {
+-        cJobI = cJobI + containerNums[i];
+-      }
+-      for (int timeK = 0; timeK < jobLen; timeK++) {
+-        indexJobITimeK = indexJobI * jobLen + timeK;
+-        // the # of containers consumed by job i in the k-th time interval
+-        cJobITimeK = containerNums[timeK];
+-        regularizationConstraint
+-            .set(uaPredict[indexJobITimeK], 1 / cJobI);
+-        generateOverAllocationConstraints(lpModel, cJobITimeK, oa, x,
+-            indexJobITimeK, timeK);
+-        generateUnderAllocationConstraints(lpModel, cJobITimeK, uaPredict,
+-            ua, x, indexJobITimeK, timeK);
+-      }
+-    }
+-
+-    /** Set objective. */
+-    Expression objective = lpModel.addExpression("objective");
+-    generateObjective(objective, numJobs, jobLen, oa, ua, eps);
+-
+-    /** Solve the model. */
+-    final Result lpResult = lpModel.minimise();
+-    final TreeMap<Long, Resource> treeMap = new TreeMap<>();
+-    RLESparseResourceAllocation result =
+-        new RLESparseResourceAllocation(treeMap,
+-            new DefaultResourceCalculator());
+-    ReservationInterval riAdd;
+-    Resource containerSpec = resourceSkylines.get(0).getContainerSpec();
+-    String pipelineId =
+-        ((RecurrenceId) jobHistory.keySet().toArray()[0]).getPipelineId();
+-    Resource resource;
+-    for (int indexTimeK = 0; indexTimeK < jobLen; indexTimeK++) {
+-      riAdd = new ReservationInterval(indexTimeK * timeInterval,
+-          (indexTimeK + 1) * timeInterval);
+-      resource = Resource.newInstance(
+-          containerSpec.getMemorySize() * (int) lpResult
+-              .doubleValue(indexTimeK),
+-          containerSpec.getVirtualCores() * (int) lpResult
+-              .doubleValue(indexTimeK));
+-      result.addInterval(riAdd, resource);
+-      LOGGER.debug("time interval: {}, container: {}.", indexTimeK,
+-          lpResult.doubleValue(indexTimeK));
+-    }
+-
+-    predictionSkylineStore.addEstimation(pipelineId, result);
+-
+-    /**
+-     * TODO: 1. We can calculate the estimated error (over-allocation,
+-     * under-allocation) of our prediction which could be used to generate
+-     * confidence level for our prediction; 2. Also, we can modify our model to
+-     * take job input data size (and maybe stage info) into consideration; 3. We
+-     * can also try to generate such conclusion: our prediction under-allocates
+-     * X amount of resources from time 0 to time 100 compared with 95% of
+-     * history runs; 4. We can build framework-specific versions of estimator
+-     * (such as scope/spark/hive, etc.) and provides more specific suggestions.
+-     * For example, we may say: for spark job i, its task size is X GB while the
+-     * container memory allocation is Y GB; as a result, its shuffling stage is
+-     * 20% slower than ideal case due to the disk spilling operations, etc. 5.
+-     * If we have more information of jobs (other than ResourceSkyline), we may
+-     * have such conclusion: job i is 20% slower than 90% of history runs, and
+-     * it is because part of its tasks are running together with job j's tasks.
+-     * In this case, we not only predict the amount of resource needed for job
+-     * i, but also how to place the resource requirements to clusters; 6. We may
+-     * monitor job progress, and dynamically increase/decrease container
+-     * allocations to satisfy job deadline while minimizing the cost; 7. We may
+-     * allow users to specify a budget (say $100 per job run), and optimize the
+-     * resource allocation under the budget constraints. 8. ...
+-     */
+-    return result;
+-  }
+-
+-  @Override public final void close() {
+-    // TODO: currently place holder
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/package-info.java
+deleted file mode 100644
+index 3344f60ae03..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/impl/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Implementation for {@code Solver}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.impl;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/SolverPreprocessor.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/SolverPreprocessor.java
+deleted file mode 100644
+index af613346e47..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/SolverPreprocessor.java
++++ /dev/null
+@@ -1,219 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.preprocess;
+-
+-import static java.lang.Math.toIntExact;
+-
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.solver.api.Solver;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.InvalidInputException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Common preprocessing functions for {@link Solver}.
+- */
+-public class SolverPreprocessor {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(SolverPreprocessor.class);
+-
+-  /**
+-   * Check if Solver's input parameters are valid.
+-   *
+-   * @param jobHistory   the history {@link ResourceSkyline}s of the recurring
+-   *                     pipeline job.
+-   * @param timeInterval the time interval which is used to discretize the
+-   *                     history {@link ResourceSkyline}s.
+-   * @throws InvalidInputException if: (1) jobHistory is <em>null</em>;
+-   *     (2) jobHistory is empty; (3) timeout is non-positive;
+-   *     (4) timeInterval is non-positive;
+-   */
+-  public final void validate(
+-      final Map<RecurrenceId, List<ResourceSkyline>> jobHistory,
+-      final int timeInterval) throws InvalidInputException {
+-    if ((jobHistory == null) || (jobHistory.size() == 0)) {
+-      LOGGER.error(
+-          "Job resource skyline history is invalid, please try again with"
+-              + " valid resource skyline history.");
+-      throw new InvalidInputException("Job ResourceSkyline history", "invalid");
+-    }
+-
+-    if (timeInterval <= 0) {
+-      LOGGER.error(
+-          "Solver timeInterval {} is invalid, please specify a positive value.",
+-          timeInterval);
+-      throw new InvalidInputException("Solver timeInterval", "non-positive");
+-    }
+-  }
+-
+-  /**
+-   * Return the multi-dimension resource vector consumed by the job at specified
+-   * time.
+-   *
+-   * @param skyList           the list of {@link Resource}s used by the job.
+-   * @param index             the discretized time index.
+-   * @param containerMemAlloc the multi-dimension resource vector allocated to
+-   *                          one container.
+-   * @return the multi-dimension resource vector consumed by the job.
+-   */
+-  public final long getResourceVector(final RLESparseResourceAllocation skyList,
+-      final int index, final long containerMemAlloc) {
+-    return skyList.getCapacityAtTime(index).getMemorySize() / containerMemAlloc;
+-  }
+-
+-  /**
+-   * Discretize job's lifespan into intervals, and return the number of
+-   * containers used by the job within each interval.
+-   * <p> Note that here we assume all containers allocated to the job have the
+-   * same {@link Resource}. This is due to the limit of
+-   * {@link RLESparseResourceAllocation}.
+-   *
+-   * @param skyList           the list of {@link Resource}s used by the job.
+-   * @param timeInterval      the time interval used to discretize the job's
+-   *                          lifespan.
+-   * @param containerMemAlloc the amount of memory allocated to each container.
+-   * @param jobLen            the duration of the job.
+-   * @return the number of containers allocated to the job within discretized
+-   * time intervals.
+-   */
+-  public final int[] getDiscreteSkyline(
+-      final RLESparseResourceAllocation skyList, final int timeInterval,
+-      final long containerMemAlloc, final int jobLen) {
+-    long jobLifeSpan =
+-        skyList.getLatestNonNullTime() - skyList.getEarliestStartTime();
+-    int[] result = new int[jobLen];
+-    Arrays.fill(result, 0);
+-
+-    int index = 0;
+-    long numContainerAt = 0;
+-    for (int i = 0; i < jobLifeSpan; i++) {
+-      index = (int) Math.floor((double) i / timeInterval);
+-      numContainerAt = getResourceVector(skyList, i, containerMemAlloc);
+-      if (result[index] < numContainerAt) {
+-        result[index] = (int) numContainerAt;
+-      }
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Merge different jobs' resource skylines into one within the same pipeline.
+-   *
+-   * @param resourceSkylines different jobs' resource skylines within the same
+-   *                         pipeline.
+-   * @return an aggregated resource skyline for the pipeline.
+-   */
+-  public final ResourceSkyline mergeSkyline(
+-      final List<ResourceSkyline> resourceSkylines) {
+-    // TODO:
+-    // rewrite this function with shift and merge once YARN-5328 is committed
+-    /** First, getHistory the pipeline submission time. */
+-    long pipelineSubmission = Long.MAX_VALUE;
+-    for (int i = 0; i < resourceSkylines.size(); i++) {
+-      long jobSubmission = resourceSkylines.get(i).getJobSubmissionTime();
+-      if (pipelineSubmission > jobSubmission) {
+-        pipelineSubmission = jobSubmission;
+-      }
+-    }
+-    final TreeMap<Long, Resource> resourceOverTime = new TreeMap<>();
+-    final RLESparseResourceAllocation skylineListAgg =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    /**
+-     * Second, adjust different jobs' ResourceSkyline starting time based on
+-     * pipeline submission time, and merge them into one ResourceSkyline.
+-     */
+-    for (int i = 0; i < resourceSkylines.size(); i++) {
+-      long jobSubmission = resourceSkylines.get(i).getJobSubmissionTime();
+-      long diff = (jobSubmission - pipelineSubmission) / 1000;
+-      RLESparseResourceAllocation tmp =
+-          resourceSkylines.get(i).getSkylineList();
+-      Object[] timePoints = tmp.getCumulative().keySet().toArray();
+-      for (int j = 0; j < timePoints.length - 2; j++) {
+-        ReservationInterval riAdd =
+-            new ReservationInterval(toIntExact((long) timePoints[j]) + diff,
+-                toIntExact((long) timePoints[j + 1] + diff));
+-        skylineListAgg.addInterval(riAdd,
+-            tmp.getCapacityAtTime(toIntExact((long) timePoints[j])));
+-      }
+-    }
+-    ResourceSkyline skylineAgg =
+-        new ResourceSkyline(resourceSkylines.get(0).getJobId(),
+-            resourceSkylines.get(0).getJobInputDataSize(),
+-            resourceSkylines.get(0).getJobSubmissionTime(),
+-            resourceSkylines.get(0).getJobFinishTime(),
+-            resourceSkylines.get(0).getContainerSpec(), skylineListAgg);
+-
+-    return skylineAgg;
+-  }
+-
+-  /**
+-   * Aggregate all job's {@link ResourceSkyline}s in the one run of recurring
+-   * pipeline, and return the aggregated {@link ResourceSkyline}s in different
+-   * runs.
+-   *
+-   * @param jobHistory the history {@link ResourceSkyline} of the recurring
+-   *                   pipeline job.
+-   * @param minJobRuns the minimum number of job runs required to run the
+-   *                   solver.
+-   * @return the aggregated {@link ResourceSkyline}s in different runs.
+-   * @throws InvalidInputException if: (1) job submission time parsing fails;
+-   *     (2) jobHistory has less job runs than the minimum requirement;
+-   */
+-  public final List<ResourceSkyline> aggregateSkylines(
+-      final Map<RecurrenceId, List<ResourceSkyline>> jobHistory,
+-      final int minJobRuns) throws InvalidInputException {
+-    List<ResourceSkyline> resourceSkylines = new ArrayList<ResourceSkyline>();
+-    for (Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      // TODO: identify different jobs within the same pipeline
+-      // right now, we do prediction at the granularity of pipeline, i.e., we
+-      // will merge the
+-      // resource skylines of jobs within the same pipeline into one aggregated
+-      // resource skyline
+-      ResourceSkyline skylineAgg = null;
+-      skylineAgg = mergeSkyline(entry.getValue());
+-      resourceSkylines.add(skylineAgg);
+-    }
+-    int numJobs = resourceSkylines.size();
+-    if (numJobs < minJobRuns) {
+-      LOGGER.error(
+-          "Solver requires job resource skyline history for at least {} runs,"
+-              + " but it only receives history info for {}  runs.",
+-          minJobRuns, numJobs);
+-      throw new InvalidInputException("Job ResourceSkyline history",
+-          "containing less job runs" + " than " + minJobRuns);
+-    }
+-
+-    return resourceSkylines;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/package-info.java
+deleted file mode 100644
+index b58cef96def..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/solver/preprocess/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Preprocessor for {@code Solver}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.preprocess;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/JobMetaData.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/JobMetaData.java
+deleted file mode 100644
+index 2bfab3ebf8a..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/JobMetaData.java
++++ /dev/null
+@@ -1,163 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.api;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Job metadata collected when parsing the log file.
+- */
+-public class JobMetaData {
+-  // containerId, releaseTime
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(JobMetaData.class);
+-  private final ResourceSkyline resourceSkyline = new ResourceSkyline();
+-  private final Map<String, Long> rawStart = new HashMap<String, Long>();
+-  // containerId, startTime
+-  private final Map<String, Long> rawEnd = new HashMap<String, Long>();
+-  private RecurrenceId recurrenceId;
+-
+-  /**
+-   * Constructor.
+-   *
+-   * @param jobSubmissionTimeConfig job submission time.
+-   */
+-  public JobMetaData(final long jobSubmissionTimeConfig) {
+-    resourceSkyline.setJobSubmissionTime(jobSubmissionTimeConfig);
+-  }
+-
+-  /**
+-   * Set job finish time.
+-   *
+-   * @param jobFinishTimeConfig job finish time.
+-   * @return the reference to current {@link JobMetaData}.
+-   */
+-  public final JobMetaData setJobFinishTime(final long jobFinishTimeConfig) {
+-    resourceSkyline.setJobFinishTime(jobFinishTimeConfig);
+-    return this;
+-  }
+-
+-  /**
+-   * Add container launch time.
+-   *
+-   * @param containerId id of the container.
+-   * @param time        container launch time.
+-   * @return the reference to current {@link JobMetaData}.
+-   */
+-  public final JobMetaData setContainerStart(final String containerId,
+-      final long time) {
+-    if (rawStart.put(containerId, time) != null) {
+-      LOGGER.warn("find duplicate container launch time for {}, so we replace"
+-              + " it with {}.", containerId, time);
+-    }
+-    return this;
+-  }
+-
+-  /**
+-   * Add container release time.
+-   *
+-   * @param containerId id of the container.
+-   * @param time        container release time.
+-   * @return the reference to current {@link JobMetaData}.
+-   */
+-  public final JobMetaData setContainerEnd(final String containerId,
+-      final long time) {
+-    if (rawEnd.put(containerId, time) != null) {
+-      LOGGER.warn("find duplicate container release time for {}, so we replace"
+-          + " it with {}.", containerId, time);
+-    }
+-    return this;
+-  }
+-
+-  /**
+-   * Get {@link RecurrenceId}.
+-   *
+-   * @return {@link RecurrenceId}.
+-   */
+-  public final RecurrenceId getRecurrenceId() {
+-    return recurrenceId;
+-  }
+-
+-  /**
+-   * Set {@link RecurrenceId}.
+-   *
+-   * @param recurrenceIdConfig the {@link RecurrenceId}.
+-   * @return the reference to current {@link JobMetaData}.
+-   */
+-  public final JobMetaData setRecurrenceId(
+-      final RecurrenceId recurrenceIdConfig) {
+-    this.recurrenceId = recurrenceIdConfig;
+-    return this;
+-  }
+-
+-  /**
+-   * Get {@link ResourceSkyline}.
+-   *
+-   * @return {@link ResourceSkyline}.
+-   */
+-  public final ResourceSkyline getResourceSkyline() {
+-    return resourceSkyline;
+-  }
+-
+-  /**
+-   * Normalized container launch/release time, and generate the
+-   * {@link ResourceSkyline}.
+-   */
+-  public final void createSkyline() {
+-    final long jobSubmissionTime = resourceSkyline.getJobSubmissionTime();
+-    Resource containerSpec = resourceSkyline.getContainerSpec();
+-    final TreeMap<Long, Resource> resourceOverTime = new TreeMap<>();
+-    final RLESparseResourceAllocation skylineList =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    resourceSkyline.setSkylineList(skylineList);
+-    if (containerSpec == null) {
+-      // if RmParser fails to extract container resource spec from logs, we will
+-      // statically set
+-      // it to be <1core, 1GB>
+-      containerSpec = Resource.newInstance(1024, 1);
+-    }
+-    resourceSkyline.setContainerSpec(containerSpec);
+-    for (final Map.Entry<String, Long> entry : rawStart.entrySet()) {
+-      final long timeStart = entry.getValue();
+-      final Long timeEnd = rawEnd.get(entry.getKey());
+-      if (timeEnd == null) {
+-        LOGGER.warn("container release time not found for {}.", entry.getKey());
+-      } else {
+-        final ReservationInterval riAdd =
+-            new ReservationInterval((timeStart - jobSubmissionTime) / 1000,
+-                (timeEnd - jobSubmissionTime) / 1000);
+-        resourceSkyline.getSkylineList().addInterval(riAdd, containerSpec);
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/LogParser.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/LogParser.java
+deleted file mode 100644
+index b7efe5adf99..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/LogParser.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.api;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.HistorySkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-
+-/**
+- * LogParser iterates over a stream of logs, uses {@link SingleLineParser} to
+- * parse each line, and adds extracted {@code ResourceSkyline}s to the
+- * {@code SkylineStore}.
+- */
+-public interface LogParser extends AutoCloseable {
+-
+-  /**
+-   * Initializing the LogParser, including loading solver parameters from
+-   * configuration file.
+-   *
+-   * @param config       {@link Configuration} for the LogParser.
+-   * @param skylineStore the {@link HistorySkylineStore} which stores recurring
+-   *                     pipeline's {@code
+-   *                     ResourceSkyline}s.
+-   * @throws ResourceEstimatorException if initialization of a
+-   *     {@code SingleLineParser} fails.
+-   */
+-  void init(Configuration config, HistorySkylineStore skylineStore)
+-      throws ResourceEstimatorException;
+-
+-  /**
+-   * Parses each line in the log stream, and adds extracted
+-   * {@code ResourceSkyline}s to the {@code
+-   * SkylineStore}.
+-   *
+-   * @param logs the stream of input logs.
+-   * @throws SkylineStoreException if it fails to addHistory extracted
+-   *     {@code ResourceSkyline}s to the {@code SkylineStore}.
+-   * @throws IOException if it fails to read from the {@link InputStream}.
+-   */
+-  void parseStream(InputStream logs) throws SkylineStoreException, IOException;
+-
+-  @Override void close();
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/SingleLineParser.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/SingleLineParser.java
+deleted file mode 100644
+index b9607fe2c31..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/SingleLineParser.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.api;
+-
+-import java.text.ParseException;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-
+-/**
+- * SingleLineParser parses one line in the log file, extracts the
+- * {@link ResourceSkyline}s and stores them.
+- */
+-public interface SingleLineParser {
+-  /**
+-   * Parse one line in the log file, extract the {@link ResourceSkyline}s and
+-   * store them.
+-   *
+-   * @param logLine        one line in the log file.
+-   * @param jobMetas       the job metadata collected during parsing.
+-   * @param skylineRecords the valid {@link ResourceSkyline}s extracted from the
+-   *                       log.
+-   * @throws DataFieldNotFoundException if certain data fields are not found in
+-   *                                    the log.
+-   * @throws ParseException if it fails to convert date string to
+-   *     unix timestamp successfully.
+-   */
+-  void parseLine(String logLine, Map<String, JobMetaData> jobMetas,
+-      Map<RecurrenceId, List<ResourceSkyline>> skylineRecords)
+-      throws DataFieldNotFoundException, ParseException;
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/package-info.java
+deleted file mode 100644
+index a1b79c0b064..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/api/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * API for {@code Translator}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.api;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/DataFieldNotFoundException.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/DataFieldNotFoundException.java
+deleted file mode 100644
+index 6eae614b9b0..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/DataFieldNotFoundException.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.exceptions;
+-
+-/**
+- * Exception thrown when job attributes are not found.
+- */
+-public class DataFieldNotFoundException extends Exception {
+-  private static final long serialVersionUID = -684069387367879218L;
+-
+-  public DataFieldNotFoundException(final String log) {
+-    super("Fail to extract data fields properly from " + log);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/package-info.java
+deleted file mode 100644
+index 104388ddfd7..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/exceptions/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Exception for {@code Translator}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.exceptions;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/BaseLogParser.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/BaseLogParser.java
+deleted file mode 100644
+index 2accbac784d..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/BaseLogParser.java
++++ /dev/null
+@@ -1,127 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.nio.charset.StandardCharsets;
+-import java.text.ParseException;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorUtil;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.HistorySkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.translator.api.JobMetaData;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.apache.hadoop.resourceestimator.translator.api.SingleLineParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.resourceestimator.translator.validator.ParserValidator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Base class to implement {@link LogParser}. It wraps a
+- * {@link SingleLineParser} from the {@link Configuration} to parse a log
+- * dir/file.
+- */
+-public class BaseLogParser implements LogParser {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(BaseLogParser.class);
+-  private static final ParserValidator INPUT_VALIDATOR = new ParserValidator();
+-  private SingleLineParser singleLineParser;
+-  private HistorySkylineStore historySkylineStore;
+-
+-  @Override public void init(Configuration config,
+-      HistorySkylineStore skylineStore) throws ResourceEstimatorException {
+-    singleLineParser = ResourceEstimatorUtil.createProviderInstance(config,
+-        ResourceEstimatorConfiguration.TRANSLATOR_LINE_PARSER,
+-        ResourceEstimatorConfiguration.DEFAULT_TRANSLATOR_LINE_PARSER,
+-        SingleLineParser.class);
+-    this.historySkylineStore = skylineStore;
+-  }
+-
+-  /**
+-   * Add job's {@link ResourceSkyline}s to the {@link HistorySkylineStore}.
+-   *
+-   * @param skylineRecords the {@link Map} which records the completed recurring
+-   *                       pipeline's {@link ResourceSkyline}s.
+-   * @throws SkylineStoreException if it failes to addHistory job's
+-   *     {@link ResourceSkyline}s to the {@link HistorySkylineStore}.
+-   */
+-  private void addToSkylineStore(
+-      final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords)
+-      throws SkylineStoreException {
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry :
+-        skylineRecords.entrySet()) {
+-      historySkylineStore.addHistory(entry.getKey(), entry.getValue());
+-    }
+-  }
+-
+-  public void parseLine(final String logLine,
+-      final Map<String, JobMetaData> jobMetas,
+-      final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords)
+-      throws DataFieldNotFoundException, ParseException {
+-    singleLineParser.parseLine(logLine, jobMetas, skylineRecords);
+-  }
+-
+-  @Override public final void parseStream(final InputStream logs)
+-      throws SkylineStoreException, IOException {
+-    if (!INPUT_VALIDATOR.validate(logs)) {
+-      LOGGER.error("Input validation fails, please specify with"
+-          + " valid input parameters.");
+-      return;
+-    }
+-    final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords =
+-        new HashMap<>();
+-    final Map<String, JobMetaData> jobMetas =
+-        new HashMap<String, JobMetaData>();
+-    final BufferedReader bf = new BufferedReader(
+-        new InputStreamReader(logs, StandardCharsets.UTF_8));
+-    String line = null;
+-    while ((line = bf.readLine()) != null) {
+-      try {
+-        parseLine(line, jobMetas, skylineRecords);
+-      } catch (DataFieldNotFoundException e) {
+-        LOGGER.debug("Data field not found", e);
+-      } catch (ParseException e) {
+-        LOGGER.debug("Date conversion error", e);
+-      }
+-    }
+-
+-    addToSkylineStore(skylineRecords);
+-  }
+-
+-  /**
+-   * Release the resource used by the ParserUtil.
+-   */
+-  @Override public final void close() {
+-    historySkylineStore = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/LogParserUtil.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/LogParserUtil.java
+deleted file mode 100644
+index 4ca1fffd2d9..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/LogParserUtil.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.text.DateFormat;
+-import java.text.ParseException;
+-import java.text.SimpleDateFormat;
+-
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Common utility functions for {@link LogParser}.
+- */
+-public class LogParserUtil {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(LogParserUtil.class);
+-  private LogParser logParser;
+-  private DateFormat format = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
+-
+-  /**
+-   * Set the {@link LogParser} to use.
+-   *
+-   * @param logParser the {@link LogParser} to use.
+-   */
+-  public void setLogParser(final LogParser logParser) {
+-    this.logParser = logParser;
+-  }
+-
+-  /**
+-   * Set date format for the {@link LogParser}.
+-   *
+-   * @param datePattern the date pattern in the log.
+-   */
+-  public void setDateFormat(final String datePattern) {
+-    this.format = new SimpleDateFormat(datePattern);
+-  }
+-
+-  /**
+-   * Converts String date to unix timestamp. Note that we assume the time in the
+-   * logs has the same time zone with the machine which runs the
+-   * {@link RmSingleLineParser}.
+-   *
+-   * @param date The String date.
+-   * @return Unix time stamp.
+-   * @throws ParseException if data conversion from String to unix timestamp
+-   *                        fails.
+-   */
+-  public long stringToUnixTimestamp(final String date) throws ParseException {
+-    return format.parse(date).getTime();
+-  }
+-
+-  /**
+-   * Parse the log file/directory.
+-   *
+-   * @param logFile the file/directory of the log.
+-   * @throws SkylineStoreException      if fails to addHistory to
+-   *                                    {@link SkylineStore}.
+-   * @throws IOException                if fails to parse the log.
+-   * @throws ResourceEstimatorException if the {@link LogParser}
+-   *     is not initialized.
+-   */
+-  public final void parseLog(final String logFile)
+-      throws SkylineStoreException, IOException, ResourceEstimatorException {
+-    if (logParser == null) {
+-      throw new ResourceEstimatorException("The log parser is not initialized,"
+-          + " please try again after initializing.");
+-    }
+-    InputStream inputStream = null;
+-    try {
+-      inputStream = new FileInputStream(logFile);
+-      logParser.parseStream(inputStream);
+-    } finally {
+-      if (inputStream != null) {
+-        inputStream.close();
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/NativeSingleLineParser.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/NativeSingleLineParser.java
+deleted file mode 100644
+index 83557d32fe2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/NativeSingleLineParser.java
++++ /dev/null
+@@ -1,120 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.text.ParseException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.translator.api.JobMetaData;
+-import org.apache.hadoop.resourceestimator.translator.api.SingleLineParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This sample parser will parse the sample log and extract the resource
+- * skyline.
+- * <p> The expected log format is: NormalizedJobName NumInstances SubmitTime
+- * StartTime EndTime JobInstanceName memUsage coreUsage
+- */
+-public class NativeSingleLineParser implements SingleLineParser {
+-  private static final Logger LOGGER =
+-      LoggerFactory.getLogger(NativeSingleLineParser.class);
+-
+-  /**
+-   * Aggregates different jobs' {@link ResourceSkyline}s within the same
+-   * pipeline together.
+-   *
+-   * @param resourceSkyline newly extracted {@link ResourceSkyline}.
+-   * @param recurrenceId    the {@link RecurrenceId} which the resourceSkyline
+-   *                        belongs to.
+-   * @param skylineRecords  a {@link Map} which stores the
+-   *     {@link ResourceSkyline}s for all pipelines during this parsing.
+-   */
+-  private void aggregateSkyline(final ResourceSkyline resourceSkyline,
+-      final RecurrenceId recurrenceId,
+-      final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords) {
+-    List<ResourceSkyline> resourceSkylines = skylineRecords.get(recurrenceId);
+-    if (resourceSkylines == null) {
+-      resourceSkylines = new ArrayList<ResourceSkyline>();
+-      skylineRecords.put(recurrenceId, resourceSkylines);
+-    }
+-    resourceSkylines.add(resourceSkyline);
+-  }
+-
+-  @Override public void parseLine(String logLine,
+-      Map<String, JobMetaData> jobMetas,
+-      Map<RecurrenceId, List<ResourceSkyline>> skylineRecords)
+-      throws DataFieldNotFoundException, ParseException {
+-    Configuration config = new Configuration();
+-    config.addResource(new org.apache.hadoop.fs.Path(
+-        ResourceEstimatorConfiguration.CONFIG_FILE));
+-    int timeInterval =
+-        config.getInt(ResourceEstimatorConfiguration.TIME_INTERVAL_KEY, 5);
+-    // note that for native log, we assume each container is allocated <1 core,
+-    // 1GB RAM>
+-    long containerMemAlloc = 1024;
+-    int containerCpuAlloc = 1;
+-    String[] splitString = logLine.split("\\s+");
+-    String pipelineId = splitString[0];
+-    String jobId = splitString[5];
+-    String[] skylineUnits = splitString[7].split("\\|");
+-
+-    JobMetaData appMeta = new JobMetaData(0);
+-    RecurrenceId recurrenceId = new RecurrenceId(pipelineId, jobId);
+-    appMeta.setRecurrenceId(recurrenceId);
+-    Resource containerAlloc;
+-    int numContainers;
+-    ResourceSkyline resourceSkyline = appMeta.getResourceSkyline();
+-    final TreeMap<Long, Resource> resourceOverTime = new TreeMap<>();
+-    final RLESparseResourceAllocation skylineList =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    resourceSkyline.setSkylineList(skylineList);
+-    for (String elem : skylineUnits) {
+-      numContainers = Integer.parseInt(elem.split("\\:")[0]);
+-      containerAlloc = Resource.newInstance(containerMemAlloc * numContainers,
+-          containerCpuAlloc * numContainers);
+-      final ReservationInterval riAdd =
+-          new ReservationInterval(Long.parseLong(elem.split("\\:")[1]),
+-              Long.parseLong(elem.split("\\:")[1]) + timeInterval);
+-      resourceSkyline.getSkylineList().addInterval(riAdd, containerAlloc);
+-    }
+-    resourceSkyline.setContainerSpec(
+-        Resource.newInstance(containerMemAlloc, containerCpuAlloc));
+-    appMeta.setJobFinishTime(
+-        appMeta.getResourceSkyline().getSkylineList().getLatestNonNullTime());
+-    resourceSkyline.setJobInputDataSize(0);
+-    resourceSkyline.setJobId(jobId);
+-    aggregateSkyline(resourceSkyline, recurrenceId, skylineRecords);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/RmSingleLineParser.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/RmSingleLineParser.java
+deleted file mode 100644
+index 19049348a84..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/RmSingleLineParser.java
++++ /dev/null
+@@ -1,203 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.text.ParseException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.translator.api.JobMetaData;
+-import org.apache.hadoop.resourceestimator.translator.api.SingleLineParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-
+-/**
+- * {@link SingleLineParser} for Hadoop Resource Manager logs.
+- */
+-public class RmSingleLineParser implements SingleLineParser {
+-  private static final LogParserUtil PARSERUTIL = new LogParserUtil();
+-  private static final Pattern FILTER_PATTERN = Pattern.compile(
+-      "(Submit Application Request|AM Allocated Container|"
+-          + "AM Released Container|finalState=FAILED|"
+-          + "ApplicationSummary|, Resource:)");
+-  private static final Pattern SUBMISSION_PATTERN =
+-      Pattern.compile("APPID=(\\w+)");
+-  private static final Pattern FAIL_PATTERN =
+-      Pattern.compile("appattempt_(\\d+_\\d+)_\\d+");
+-  private static final Pattern FINISH_PATTERN =
+-      Pattern.compile("appId=(\\w+).*?name=(\\w+)\\-(\\w+)");
+-  private static final Pattern CONTAINER_EVENT_PATTERN =
+-      Pattern.compile("APPID=(\\w+).*?CONTAINERID=(\\w+)");
+-  private static final Pattern CONTAINER_SPEC_PATTERN = Pattern.compile(
+-      "(container_[^_]+|appattempt)_(\\d+_\\d+).*?memory:(\\d+),"
+-          + "\\svCores:(\\d+)");
+-
+-  /**
+-   * Aggregates different jobs' {@link ResourceSkyline}s within the same
+-   * pipeline together.
+-   *
+-   * @param resourceSkyline newly extracted {@link ResourceSkyline}.
+-   * @param recurrenceId    the {@link RecurrenceId} which the resourceSkyline
+-   *                        belongs to.
+-   * @param skylineRecords  a {@link Map} which stores the
+-   *     {@link ResourceSkyline}s for all pipelines during this parsing.
+-   */
+-  private void aggregateSkyline(final ResourceSkyline resourceSkyline,
+-      final RecurrenceId recurrenceId,
+-      final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords) {
+-    List<ResourceSkyline> resourceSkylines = skylineRecords.get(recurrenceId);
+-    if (resourceSkylines == null) {
+-      resourceSkylines = new ArrayList<ResourceSkyline>();
+-      skylineRecords.put(recurrenceId, resourceSkylines);
+-    }
+-    resourceSkylines.add(resourceSkyline);
+-  }
+-
+-  @Override public final void parseLine(final String logLine,
+-      final Map<String, JobMetaData> jobMetas,
+-      final Map<RecurrenceId, List<ResourceSkyline>> skylineRecords)
+-      throws DataFieldNotFoundException, ParseException {
+-    final String[] splits = logLine.split(",", 5); // Limit the max number of 5
+-    // splits
+-    if (splits.length < 5) {
+-      return;
+-    }
+-    final Matcher jobEventMatcher = FILTER_PATTERN.matcher(splits[4]); // search
+-    // only
+-    // the
+-    // tail
+-    if (!jobEventMatcher.find()) { // this line of log does not contain targeted
+-      // events
+-      return;
+-    }
+-
+-    // now we have the match, let's do some parsing
+-    final long date = PARSERUTIL.stringToUnixTimestamp(splits[1]);
+-    final String tail = splits[4].split("\\s+", 4)[3]; // use the tail of the
+-    // tail only
+-    switch (jobEventMatcher.group(1)) {
+-    case "Submit Application Request": {
+-      /** Submit job. */
+-      final Matcher appIdMatch = SUBMISSION_PATTERN.matcher(tail);
+-      if (appIdMatch.find()) {
+-        final String appId = appIdMatch.group(1);
+-        jobMetas.put(appId, new JobMetaData(date));
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    case "AM Allocated Container": {
+-      /** Allocate container. */
+-      final Matcher containerEventMatcher =
+-          CONTAINER_EVENT_PATTERN.matcher(tail);
+-      if (containerEventMatcher.find()) {
+-        final String appId = containerEventMatcher.group(1);
+-        final String containerId = containerEventMatcher.group(2);
+-        final JobMetaData appMeta = jobMetas.get(appId);
+-        if (appMeta != null) {
+-          appMeta.setContainerStart(containerId, date);
+-        }
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    case ", Resource:": {
+-      final Matcher containerSpecMatcher = CONTAINER_SPEC_PATTERN.matcher(tail);
+-      if (containerSpecMatcher.find()) {
+-        final String appId = "application_" + containerSpecMatcher.group(2);
+-        final JobMetaData appMeta = jobMetas.get(appId);
+-        if (appMeta != null) {
+-          final long memAlloc = Long.parseLong(containerSpecMatcher.group(3));
+-          final int cpuAlloc = Integer.parseInt(containerSpecMatcher.group(4));
+-          final Resource containerAlloc =
+-              Resource.newInstance(memAlloc, cpuAlloc);
+-          appMeta.getResourceSkyline().setContainerSpec(containerAlloc);
+-        }
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    case "AM Released Container": {
+-      final Matcher containerEventMatcher =
+-          CONTAINER_EVENT_PATTERN.matcher(tail);
+-      if (containerEventMatcher.find()) {
+-        final String appId = containerEventMatcher.group(1);
+-        final JobMetaData appMeta = jobMetas.get(appId);
+-        if (appMeta != null) {
+-          final String containerId = containerEventMatcher.group(2);
+-          appMeta.setContainerEnd(containerId, date);
+-        }
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    case "finalState=FAILED": {
+-      /** In case of appAttempt failed: discard previous records. */
+-      final Matcher failMatcher = FAIL_PATTERN.matcher(tail);
+-      if (failMatcher.find()) {
+-        final String appId = "application_" + failMatcher.group(1);
+-        if (jobMetas.containsKey(appId)) {
+-          jobMetas.put(appId, new JobMetaData(date));
+-        }
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    case "ApplicationSummary": {
+-      /** Finish a job. */
+-      final Matcher finishMatcher = FINISH_PATTERN.matcher(tail);
+-      if (finishMatcher.find()) {
+-        final String appId = finishMatcher.group(1);
+-        final String pipelineId = finishMatcher.group(2);
+-        final String runId = finishMatcher.group(3);
+-        final RecurrenceId recurrenceId = new RecurrenceId(pipelineId, runId);
+-        final JobMetaData appMeta = jobMetas.remove(appId);
+-        if (appMeta != null) {
+-          appMeta.setRecurrenceId(recurrenceId).setJobFinishTime(date)
+-              .getResourceSkyline().setJobInputDataSize(0); // TODO: need to
+-          // read job input
+-          // data size from
+-          // logs
+-          appMeta.createSkyline();
+-          final ResourceSkyline resourceSkyline = appMeta.getResourceSkyline();
+-          resourceSkyline.setJobId(appId);
+-          aggregateSkyline(resourceSkyline, recurrenceId, skylineRecords);
+-        }
+-      } else {
+-        throw new DataFieldNotFoundException(tail);
+-      }
+-      break;
+-    }
+-    default:
+-      break;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/package-info.java
+deleted file mode 100644
+index 13b5138a26a..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/impl/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Implementation for {@code Translator}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/ParserValidator.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/ParserValidator.java
+deleted file mode 100644
+index ebf50ba8bcd..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/ParserValidator.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.validator;
+-
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-
+-/**
+- * Validates the input parameters for the {@link LogParser}.
+- */
+-public class ParserValidator {
+-  /**
+-   * Validates the input parameters for the {@link LogParser}.
+-   *
+-   * @param logs input log streams to the {@link LogParser}.
+-   * @return whether the input parameters are valid or not.
+-   */
+-  public final boolean validate(final InputStream logs) {
+-    // TODO
+-    return true;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/package-info.java
+deleted file mode 100644
+index c48b262265b..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/main/java/org/apache/hadoop/resourceestimator/translator/validator/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Validator for {@code Translator}.
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.validator;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/site/markdown/ResourceEstimator.md b/hadoop-tools/hadoop-resourceestimator/src/site/markdown/ResourceEstimator.md
+deleted file mode 100644
+index 12f8dd5ef28..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/site/markdown/ResourceEstimator.md
++++ /dev/null
+@@ -1,181 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-Resource Estimator Service
+-==========================
+-
+-* [Resource Estimator Service](#Resource_Estimator_Service)
+-    * [Overview](#Overview)
+-        * [Motivation](#Motivation)
+-        * [Goals](#Goals)
+-        * [Architecture](#Architecture)
+-    * [Usage](#Usage)
+-    * [Example](#Example)
+-    * [Advanced Configuration](#AdvancedConfig)
+-    * [Future work](#Future)
+-
+-Overview
+---------
+-
+-### Motivation
+-Estimating job resource requirements remains an important and challenging problem for enterprise clusters. This is amplified by the ever-increasing complexity of workloads, i.e. from traditional batch jobs to interactive queries to streaming and recently machine learning jobs. This results in jobs relying on multiple computation frameworks such as Tez, MapReduce, Spark, etc., and the problem is further compounded by sharing nature of the clusters. Current state-of-art solution relies on user expertise to make resource requirement estimations for the jobs (for e.g.: number of reducers or container memory size, etc.), which is both tedious and inefficient.
+-
+-Based on the analysis of our cluster workloads, we observe that a large portion of jobs (more than 60%) are recurring jobs, giving us the opportunity to automatically estimate job resource requirements based on job's history runs. It is worth noting that jobs usually come from different computation frameworks, and the version may change across runs as well. Therefore, we want to come up with a framework agnostic black-box solution to automatically make resource requirement estimation for the recurring jobs.
+-
+-### Goals
+-
+-*   For a periodic job, analyze its history logs and predict its resource requirement for the new run.
+-*   Support various types of job logs.
+-*   Scale to terabytes of job logs.
+-
+-### Architecture
+-
+-The following figure illustrates the implementation architecture of the resource estimator.
+-
+-![The architecture of the resource estimator](images/resourceestimator_arch.png)
+-
+-Hadoop-resourceestimator mainly consists of three modules: Translator, SkylineStore and Estimator.
+-
+-1. `ResourceSkyline` is used to characterize job's resource utilizations during its lifespan. More specifically, it uses `RLESparseResourceAllocation` (<https://github.com/apache/hadoop/blob/b6e7d1369690eaf50ce9ea7968f91a72ecb74de0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java>) to record the container allocation information. `RecurrenceId` is used to identify a specific run of a recurring pipeline. A pipeline could consist of multiple jobs, each has a `ResourceSkyline` to characterize its resource utilization.
+-2. `Translator` parses the job logs, extracts their `ResourceSkylines` and stores them to the SkylineStore. `SingleLineParser` parses one line in the log stream and extract the `ResourceSkyline`. `LogParser` recursively parses each line in the log stream using `SingleLineParser`. Note that logs could have different storage formats, so `LogParser` takes a stream of strings as input, instead of File or other formats. Since job logs may have various formats thus require different `SingleLineParser` implementations, `LogParser` initiates the `SingleLineParser` based on user configuration. Currently Hadoop-resourceestimator provides two implementations for `SingleLineParser`: `NativeSingleLineParser` supports an optimized native format, and `RMSingleLineParser` parses the YARN ResourceManager logs generated in Hadoop systems since RM logs are widely available (in production deployments).
+-3. `SkylineStore` serves as the storage layer for Hadoop-resourceestimator and consists of 2 parts. `HistorySkylineStore` stores the `ResourceSkylines` extracted by the `Translator`. It supports four actions: addHistory, deleteHistory, updateHistory and getHistory. addHistory appends new `ResourceSkylines` to the recurring pipelines, while updateHistory deletes all the `ResourceSkylines` of a specific recurring pipeline, and re-insert new `ResourceSkylines`. `PredictionSkylineStore` stores the predicted `RLESparseResourceAllocation` generated by the Estimator. It supports two actions: addEstimation and getEstimation.
+-
+-    Currently Hadoop-resourceestimator provides in-memory implementation for the SkylineStore.
+-4. `Estimator` predicts recurring pipeline's resource requirements based on its history runs, stores the prediction to the `SkylineStore` and makes recurring resource reservations to YARN (YARN-5326). `Solver` reads all the history `ResourceSkylines` of a specific recurring pipeline, and predicts its new resource requirements wrapped in `RLESparseResourceAllocation`. Currently Hadoop-resourceestimator provides a `LPSOLVER` to make the prediction (the details of the Linear Programming model can be find in the paper). There is also a `BaseSolver` to translate predicted resource requirements into `ReservationSubmissionRequest` which is used by different solver implementations to make recurring resource reservations on YARN.
+-5. `ResourceEstimationService` wraps Hadoop-resourceestimator as a micro-service, which can be easily deployed in clusters. It provides a set of REST APIs to allow users to parse specified job logs, query pipeline's history `ResourceSkylines`, query pipeline's predicted resource requirements and run the `SOLVER` if the prediction does not exist, delete the `ResourceSkylines` in the `SkylineStore`.
+-
+-Usage
+------
+-
+-This section will guide you through the usage of resource estimator service.
+-
+-Here let `$HADOOP_ROOT` represent the Hadoop install directory. If you build Hadoop yourself, `$HADOOP_ROOT` is `hadoop-dist/target/hadoop-$VERSION`. The location of the resource estimator service, `$ResourceEstimatorServiceHome`, is `$HADOOP_ROOT/share/hadoop/tools/resourceestimator`. It contains 3 folders: `bin`, `conf` and `data`. Please note that users can use resource estimator service with the default configurations.
+-
+-* `bin` contains the running scripts for the resource estimator service.
+-
+-* `conf`: contains the configuration files for the resource estimator service.
+-
+-* `data` contains the sample log that is used to run the example of resource estimator service.
+-
+-### Step 1: Start the estimator
+-
+-First of all, copy the configuration file (located in `$ResourceEstimatorServiceHome/conf/`) to `$HADOOP_ROOT/etc/hadoop`.
+-
+-The script to start the estimator is `start-estimator.sh`.
+-
+-    $ cd $ResourceEstimatorServiceHome
+-    $ bin/start-estimator.sh
+-
+-A web server is started, and users can use the resource estimation service through REST APIs.
+-
+-### Step 2: Run the estimator
+-
+-The URI for the resource estimator sercive is `http://0.0.0.0`, and the default service port is `9998` (configured in `$ResourceEstimatorServiceHome/conf/resourceestimator-config.xml`). In `$ResourceEstimatorServiceHome/data`, there is a sample log file `resourceEstimatorService.txt` which contains the logs of tpch_q12 query job for 2 runs.
+-
+-* `parse job logs: POST http://URI:port/resourceestimator/translator/LOG_FILE_DIRECTORY`
+-
+-  Send `POST http://0.0.0.0:9998/resourceestimator/translator/data/resourceEstimatorService.txt`. The underlying estimator will extract the ResourceSkylines from the log file and store them in the jobHistory SkylineStore.
+-
+-* `query job's history ResourceSkylines: GET http://URI:port/resourceestimator/skylinestore/history/{pipelineId}/{runId}`
+-
+-  Send `GET http://0.0.0.0:9998/resourceestimator/skylinestore/history/*/*`, and the underlying estimator will return all the records in history SkylineStore. You should be able to see ResourceSkylines for two runs of tpch_q12: tpch_q12_0 and tpch_q12_1. Note that both `pipelineId` and `runId` fields support wildcard operations.
+-
+-* `predict job's resource skyline requirement: GET http://URI:port/resourceestimator/estimator/{pipelineId}`
+-
+-  Send `http://0.0.0.0:9998/resourceestimator/estimator/tpch_q12`, and the underlying estimator will predict job's resource requirements for the new run based on its history ResourceSkylines, and store the predicted resource requirements to jobEstimation SkylineStore.
+-
+-* `query job's estimated resource skylines: GET http://URI:port/resourceestimator/skylinestore/estimation/{pipelineId}`
+-
+-  Send `http://0.0.0.0:9998/resourceestimator/skylinestore/estimation/tpch_q12`, and the underlying estimator will return the history resource requirement estimation for tpch_q12 job. Note that for jobEstimation SkylineStore, it does not support wildcard operations.
+-
+-*   `delete job's history resource skylines: DELETE http://URI:port/resourceestimator/skylinestore/history/{pipelineId}/{runId}`
+-
+-  Send `http://0.0.0.0:9998/resourceestimator/skylinestore/history/tpch_q12/tpch_q12_0`, and the underlying estimator will delete the ResourceSkyline record for tpch_q12_0. Re-send `GET http://0.0.0.0:9998/resourceestimator/skylinestore/history/*/*`, and the underlying estimator will only return the ResourceSkyline for tpch_q12_1.
+-
+-### Step 3: Run the estimator
+-The script to stop the estimator is `stop-estimator.sh`.
+-
+-    $ cd $ResourceEstimatorServiceHome
+-    $ bin/stop-estimator.sh
+-
+-Example
+--------
+-
+-Here we present an example for using Resource Estimator Service.
+-
+-First, we run a tpch_q12 job for 9 times, and collect job's resource skylines in each run (note that in this example, we only collect "# of allocated containers" information).
+-
+-Then, we run the log parser in Resource Estimator Service to extract the ResourceSkylines from logs and store them in the SkylineStore. The job's ResourceSkylines are plotted below for demonstration.
+-
+-![Tpch job history runs](images/tpch_history.png)
+-
+-Finally, we run the estimator in Resource Estimator Service to predict the resource requirements for the new run, which is wrapped in RLESparseResourceAllocation (<https://github.com/apache/hadoop/blob/b6e7d1369690eaf50ce9ea7968f91a72ecb74de0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java>). The predicted resource requirement is plotted below for demonstration.
+-
+-![Tpch job history prediction](images/tpch_predict.png)
+-
+-Advanced Configuration
+-----------------------
+-
+-This section will guide you through the configuration for Resource Estimator Service. The configuration file is located at `$ResourceEstimatorServiceHome/conf/resourceestimator-config.xml`.
+-
+-* `resourceestimator.solver.lp.alpha`
+-
+-  The resource estimator has an integrated Linear Programming solver to make the prediction (refer to <https://www.microsoft.com/en-us/research/wp-content/uploads/2016/10/osdi16-final107.pdf> for more details), and this parameter tunes the tradeoff between resource over-allocation and under-allocation in the Linear Programming model. This parameter varies from 0 to 1, and a larger alpha value means the model minimizes over-allocation better. Default value is 0.1.
+-
+-* `resourceestimator.solver.lp.beta`
+-
+-  This parameter controls the generalization of the Linear Programming model. This parameter varies from 0 to 1. Deafult value is 0.1.
+-
+-* `resourceestimator.solver.lp.minJobRuns`
+-
+-  The minimum number of job runs required in order to make the prediction. Default value is 2.
+-
+-* `resourceestimator.timeInterval`
+-
+-  The time length which is used to discretize job execution into intervals. Note that the estimator makes resource allocation prediction for each interval. A smaller time interval has more fine-grained granularity for prediction, but it also takes longer time and more space for prediction. Default value is 5 (seconds).
+-
+-* `resourceestimator.skylinestore.provider`
+-
+-  The class name of the skylinestore provider. Default value is `org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore`, which is an in-memory implementation of skylinestore. If users want to use their own skylinestore implementation, they need to change this value accordingly.
+-
+-* `resourceestimator.translator.provider`
+-
+-  The class name of the translator provider. Default value is `org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser`, which extracts resourceskylines from log streams. If users want to use their own translator implementation, they need to change this value accordingly.
+-
+-* `resourceestimator.translator.line-parser`
+-
+-  The class name of the translator single-line parser, which parses a single line in the log. Default value is `org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser`, which can parse one line in the sample log. Note that if users want to parse Hadoop Resource Manager (<https://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html>) logs, they need to set the value to be `org.apache.hadoop.resourceestimator.translator.impl.RmSingleLineParser`. If they want to implement single-line parser to parse their customized log file, they need to change this value accordingly.
+-
+-* `resourceestimator.solver.provider`
+-
+-  The class name of the solver provider. Default value is `org.apache.hadoop.resourceestimator.solver.impl.LpSolver`, which incorporates a Linear Programming model to make the prediction. If users want to implement their own models, they need to change this value accordingly.
+-
+-* `resourceestimator.service-port`
+-
+-  The port which ResourceEstimatorService listens to. The default value is 9998.
+-
+-Future work
+------------
+-
+-1. For SkylineStore, we plan to provide a persistent store implementation. We are considering HBase to future proof our scale requirements.
+-
+-2. For Translator module, we want to support Timeline Service v2 as the primary source as we want to rely on a stable API and logs are flaky at best.
+-
+-3. Job resource requirements could vary across runs due to skewness, contention, input data or code changes, etc. We want to design a Reprovisioner module, which dynamically monitors job progress at runtime, identifies the performance bottlenecks if the progress is slower than expectation, and dynamically adjusts job's resource allocations accordingly using ReservationUpdateRequest.
+-
+-4. When Estimator predicts job's resource requirements, we want to provide the confidence level associated with the prediction according to the estimation error (combination of over-allocation and under-allocation), etc.
+-
+-5. For Estimator module, we can integrate machine learning tools such as reinforcement learning to make better prediction. We can also integrate with domain-specific solvers such as PerfOrator to improve prediction quality.
+-
+-6. For Estimator module, we want to design incremental solver, which can incrementally update job's resource requirements only based on the new logs.
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/site/resources/css/site.css b/hadoop-tools/hadoop-resourceestimator/src/site/resources/css/site.css
+deleted file mode 100644
+index 7315db31e53..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/resourceestimator_arch.png b/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/resourceestimator_arch.png
+deleted file mode 100644
+index 0a6b507a5fb77daabc72ed04fdc4136594b0d621..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 41981
+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
+
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_history.png b/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_history.png
+deleted file mode 100644
+index 46e79a602b057c67d304399ba481cdfe726ca32b..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 53335
+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
+
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_predict.png b/hadoop-tools/hadoop-resourceestimator/src/site/resources/images/tpch_predict.png
+deleted file mode 100644
+index 6a0498d113cbca7f0bc225fda87f85ecb1b37af0..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 56581
+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
+R?t91p1fH&bF6*2UngB!FYp?(S
+
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java
+deleted file mode 100644
+index 65e1c34adc9..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/api/TestResourceSkyline.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.api;
+-
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Test {@link ResourceSkyline} class.
+- */
+-public class TestResourceSkyline {
+-  /**
+-   * Testing variables.
+-   */
+-  private ResourceSkyline resourceSkyline;
+-
+-  private Resource resource1;
+-  private Resource resource2;
+-  private TreeMap<Long, Resource> resourceOverTime;
+-  private RLESparseResourceAllocation skylineList;
+-
+-  @Before public final void setup() {
+-    resourceOverTime = new TreeMap<>();
+-    skylineList = new RLESparseResourceAllocation(resourceOverTime,
+-        new DefaultResourceCalculator());
+-    resource1 = Resource.newInstance(1024 * 100, 100);
+-    resource2 = Resource.newInstance(1024 * 200, 200);
+-  }
+-
+-  @Test public final void testGetJobId() {
+-    Assert.assertNull(resourceSkyline);
+-    ReservationInterval riAdd = new ReservationInterval(0, 10);
+-    skylineList.addInterval(riAdd, resource1);
+-    riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource1);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
+-    Assert.assertEquals("1", resourceSkyline.getJobId());
+-  }
+-
+-  @Test public final void testGetJobSubmissionTime() {
+-    Assert.assertNull(resourceSkyline);
+-    ReservationInterval riAdd = new ReservationInterval(0, 10);
+-    skylineList.addInterval(riAdd, resource1);
+-    riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource1);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
+-    Assert.assertEquals(0, resourceSkyline.getJobSubmissionTime());
+-  }
+-
+-  @Test public final void testGetJobFinishTime() {
+-    Assert.assertNull(resourceSkyline);
+-    ReservationInterval riAdd = new ReservationInterval(0, 10);
+-    skylineList.addInterval(riAdd, resource1);
+-    riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource1);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
+-    Assert.assertEquals(20, resourceSkyline.getJobFinishTime());
+-  }
+-
+-  @Test public final void testGetKthResource() {
+-    Assert.assertNull(resourceSkyline);
+-    ReservationInterval riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource1);
+-    riAdd = new ReservationInterval(20, 30);
+-    skylineList.addInterval(riAdd, resource2);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource1, skylineList);
+-    final RLESparseResourceAllocation skylineList2 =
+-        resourceSkyline.getSkylineList();
+-    for (int i = 10; i < 20; i++) {
+-      Assert.assertEquals(resource1.getMemorySize(),
+-          skylineList2.getCapacityAtTime(i).getMemorySize());
+-      Assert.assertEquals(resource1.getVirtualCores(),
+-          skylineList2.getCapacityAtTime(i).getVirtualCores());
+-    }
+-    for (int i = 20; i < 30; i++) {
+-      Assert.assertEquals(resource2.getMemorySize(),
+-          skylineList2.getCapacityAtTime(i).getMemorySize());
+-      Assert.assertEquals(resource2.getVirtualCores(),
+-          skylineList2.getCapacityAtTime(i).getVirtualCores());
+-    }
+-    // test if resourceSkyline automatically extends the skyline with
+-    // zero-resource at both ends
+-    Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getMemorySize());
+-    Assert.assertEquals(0, skylineList2.getCapacityAtTime(9).getVirtualCores());
+-    Assert.assertEquals(0, skylineList2.getCapacityAtTime(30).getMemorySize());
+-    Assert
+-        .assertEquals(0, skylineList2.getCapacityAtTime(30).getVirtualCores());
+-  }
+-
+-  @After public final void cleanUp() {
+-    resourceSkyline = null;
+-    resource1 = null;
+-    resource2 = null;
+-    resourceOverTime.clear();
+-    resourceOverTime = null;
+-    skylineList = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java
+deleted file mode 100644
+index 62743aad914..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestHistorySkylineSerDe.java
++++ /dev/null
+@@ -1,134 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.serialization;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.reflect.TypeToken;
+-
+-/**
+- * Test HistorySkylineSerDe.
+- */
+-public class TestHistorySkylineSerDe {
+-  /**
+-   * Testing variables.
+-   */
+-  private Gson gson;
+-
+-  private ResourceSkyline resourceSkyline;
+-  private Resource resource;
+-  private Resource resource2;
+-  private TreeMap<Long, Resource> resourceOverTime;
+-  private RLESparseResourceAllocation skylineList;
+-
+-  @Before public final void setup() {
+-    resourceOverTime = new TreeMap<>();
+-    skylineList = new RLESparseResourceAllocation(resourceOverTime,
+-        new DefaultResourceCalculator());
+-    resource = Resource.newInstance(1024 * 100, 100);
+-    resource2 = Resource.newInstance(1024 * 200, 200);
+-    gson = new GsonBuilder()
+-        .registerTypeAdapter(Resource.class, new ResourceSerDe())
+-        .registerTypeAdapter(RLESparseResourceAllocation.class,
+-            new RLESparseResourceAllocationSerDe())
+-        .enableComplexMapKeySerialization().create();
+-  }
+-
+-  @Test public final void testSerialization() {
+-    ReservationInterval riAdd = new ReservationInterval(0, 10);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource2);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource, skylineList);
+-    RecurrenceId recurrenceId = new RecurrenceId("FraudDetection", "1");
+-    List<ResourceSkyline> listSkyline = new ArrayList<>();
+-    listSkyline.add(resourceSkyline);
+-    Map<RecurrenceId, List<ResourceSkyline>> historySkyline =
+-        new HashMap<RecurrenceId, List<ResourceSkyline>>();
+-    historySkyline.put(recurrenceId, listSkyline);
+-
+-    final String json = gson.toJson(historySkyline,
+-        new TypeToken<Map<RecurrenceId, List<ResourceSkyline>>>() {
+-        }.getType());
+-    final Map<RecurrenceId, List<ResourceSkyline>> historySkylineDe =
+-        gson.fromJson(json,
+-            new TypeToken<Map<RecurrenceId, List<ResourceSkyline>>>() {
+-            }.getType());
+-    // check if the recurrenceId is correct
+-    List<ResourceSkyline> resourceSkylineList =
+-        historySkylineDe.get(recurrenceId);
+-    Assert.assertNotNull(resourceSkylineList);
+-    Assert.assertEquals(1, resourceSkylineList.size());
+-
+-    // check if the resourceSkyline is correct
+-    ResourceSkyline resourceSkylineDe = resourceSkylineList.get(0);
+-    Assert
+-        .assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
+-    Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
+-        resourceSkyline.getJobInputDataSize(), 0);
+-    Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
+-        resourceSkyline.getJobSubmissionTime());
+-    Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
+-        resourceSkyline.getJobFinishTime());
+-    Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
+-        resourceSkyline.getContainerSpec().getMemorySize());
+-    Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
+-        resourceSkyline.getContainerSpec().getVirtualCores());
+-    final RLESparseResourceAllocation skylineList2 =
+-        resourceSkyline.getSkylineList();
+-    final RLESparseResourceAllocation skylineListDe =
+-        resourceSkylineDe.getSkylineList();
+-    for (int i = 0; i < 20; i++) {
+-      Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
+-          skylineListDe.getCapacityAtTime(i).getMemorySize());
+-      Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
+-          skylineListDe.getCapacityAtTime(i).getVirtualCores());
+-    }
+-  }
+-
+-  @After public final void cleanUp() {
+-    gson = null;
+-    resourceSkyline = null;
+-    resourceOverTime.clear();
+-    resourceOverTime = null;
+-    resource = null;
+-    resource2 = null;
+-    skylineList = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java
+deleted file mode 100644
+index 8749e598f79..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSerDe.java
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.serialization;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.reflect.TypeToken;
+-
+-/**
+- * Test ResourceSerDe.
+- */
+-public class TestResourceSerDe {
+-  /**
+-   * Testing variables.
+-   */
+-  private Gson gson;
+-
+-  private Resource resource;
+-
+-  @Before public final void setup() {
+-    resource = Resource.newInstance(1024 * 100, 100);
+-    gson = new GsonBuilder()
+-        .registerTypeAdapter(Resource.class, new ResourceSerDe()).create();
+-  }
+-
+-  @Test public final void testSerialization() {
+-    final String json = gson.toJson(resource, new TypeToken<Resource>() {
+-    }.getType());
+-    final Resource resourceDe = gson.fromJson(json, new TypeToken<Resource>() {
+-    }.getType());
+-    Assert.assertEquals(resource.getMemorySize(), resourceDe.getMemorySize());
+-    Assert
+-        .assertEquals(resource.getVirtualCores(), resourceDe.getVirtualCores());
+-  }
+-
+-  @After public final void cleanUp() {
+-    resource = null;
+-    gson = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java
+deleted file mode 100644
+index 859ea1e06f0..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/TestResourceSkylineSerDe.java
++++ /dev/null
+@@ -1,112 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.common.serialization;
+-
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.reflect.TypeToken;
+-
+-/**
+- * Test ResourceSkylineSerDe.
+- */
+-public class TestResourceSkylineSerDe {
+-  /**
+-   * Testing variables.
+-   */
+-  private Gson gson;
+-
+-  private ResourceSkyline resourceSkyline;
+-  private Resource resource;
+-  private Resource resource2;
+-  private TreeMap<Long, Resource> resourceOverTime;
+-  private RLESparseResourceAllocation skylineList;
+-
+-  @Before public final void setup() {
+-    resourceOverTime = new TreeMap<>();
+-    skylineList = new RLESparseResourceAllocation(resourceOverTime,
+-        new DefaultResourceCalculator());
+-    resource = Resource.newInstance(1024 * 100, 100);
+-    resource2 = Resource.newInstance(1024 * 200, 200);
+-    gson = new GsonBuilder()
+-        .registerTypeAdapter(Resource.class, new ResourceSerDe())
+-        .registerTypeAdapter(RLESparseResourceAllocation.class,
+-            new RLESparseResourceAllocationSerDe()).create();
+-  }
+-
+-  @Test public final void testSerialization() {
+-    ReservationInterval riAdd = new ReservationInterval(0, 10);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(10, 20);
+-    skylineList.addInterval(riAdd, resource2);
+-    resourceSkyline =
+-        new ResourceSkyline("1", 1024.5, 0, 20, resource, skylineList);
+-    final String json =
+-        gson.toJson(resourceSkyline, new TypeToken<ResourceSkyline>() {
+-        }.getType());
+-    final ResourceSkyline resourceSkylineDe =
+-        gson.fromJson(json, new TypeToken<ResourceSkyline>() {
+-        }.getType());
+-    Assert
+-        .assertEquals(resourceSkylineDe.getJobId(), resourceSkyline.getJobId());
+-    Assert.assertEquals(resourceSkylineDe.getJobInputDataSize(),
+-        resourceSkyline.getJobInputDataSize(), 0);
+-    Assert.assertEquals(resourceSkylineDe.getJobSubmissionTime(),
+-        resourceSkyline.getJobSubmissionTime());
+-    Assert.assertEquals(resourceSkylineDe.getJobFinishTime(),
+-        resourceSkyline.getJobFinishTime());
+-    Assert.assertEquals(resourceSkylineDe.getContainerSpec().getMemorySize(),
+-        resourceSkyline.getContainerSpec().getMemorySize());
+-    Assert.assertEquals(resourceSkylineDe.getContainerSpec().getVirtualCores(),
+-        resourceSkyline.getContainerSpec().getVirtualCores());
+-    final RLESparseResourceAllocation skylineList2 =
+-        resourceSkyline.getSkylineList();
+-    final RLESparseResourceAllocation skylineListDe =
+-        resourceSkylineDe.getSkylineList();
+-    for (int i = 0; i < 20; i++) {
+-      Assert.assertEquals(skylineList2.getCapacityAtTime(i).getMemorySize(),
+-          skylineListDe.getCapacityAtTime(i).getMemorySize());
+-      Assert.assertEquals(skylineList2.getCapacityAtTime(i).getVirtualCores(),
+-          skylineListDe.getCapacityAtTime(i).getVirtualCores());
+-    }
+-  }
+-
+-  @After public final void cleanUp() {
+-    gson = null;
+-    resourceSkyline = null;
+-    resourceOverTime.clear();
+-    resourceOverTime = null;
+-    resource = null;
+-    resource2 = null;
+-    skylineList = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
+deleted file mode 100644
+index 06957b39a7e..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/common/serialization/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-/**
+- * SkylineStore serialization module.
+- */
+-package org.apache.hadoop.resourceestimator.common.serialization;
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/GuiceServletConfig.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/GuiceServletConfig.java
+deleted file mode 100644
+index b72d3174028..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/GuiceServletConfig.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.resourceestimator.service;
+-
+-import com.google.inject.Injector;
+-import com.google.inject.servlet.GuiceServletContextListener;
+-
+-/**
+- * GuiceServletConfig is a wrapper class to have a static Injector instance
+- * instead of having the instance inside test classes. This allow us to use
+- * Jersey test framework after 1.13.
+- * Please check test cases to know how to use this class:
+- * e.g. TestRMWithCSRFFilter.java
+- */
+-public class GuiceServletConfig extends GuiceServletContextListener {
+-
+-  private static Injector internalInjector = null;
+-
+-  @Override protected Injector getInjector() {
+-    return internalInjector;
+-  }
+-
+-  public static Injector setInjector(Injector in) {
+-    internalInjector = in;
+-    return internalInjector;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/TestResourceEstimatorService.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/TestResourceEstimatorService.java
+deleted file mode 100644
+index 785641cd60e..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/service/TestResourceEstimatorService.java
++++ /dev/null
+@@ -1,257 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.service;
+-
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import javax.ws.rs.core.MediaType;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.serialization.RLESparseResourceAllocationSerDe;
+-import org.apache.hadoop.resourceestimator.common.serialization.ResourceSerDe;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import com.google.gson.Gson;
+-import com.google.gson.GsonBuilder;
+-import com.google.gson.reflect.TypeToken;
+-import com.sun.jersey.api.client.WebResource;
+-import com.sun.jersey.test.framework.JerseyTest;
+-
+-/**
+- * Test ResourceEstimatorService.
+- */
+-public class TestResourceEstimatorService extends JerseyTest {
+-  private final String parseLogCommand = "resourceestimator/translator/"
+-      + "src/test/resources/resourceEstimatorService.txt";
+-  private final String getHistorySkylineCommand =
+-      "resourceestimator/skylinestore/history/tpch_q12/*";
+-  private final String getEstimatedSkylineCommand =
+-      "resourceestimator/skylinestore/estimation/tpch_q12";
+-  private final String makeEstimationCommand =
+-      "resourceestimator/estimator/tpch_q12";
+-  private final String deleteHistoryCommand =
+-      "resourceestimator/skylinestore/history/tpch_q12/tpch_q12_1";
+-  private static boolean setUpDone = false;
+-  private Resource containerSpec;
+-  private Gson gson;
+-  private long containerMemAlloc;
+-  private int containerCPUAlloc;
+-
+-  public TestResourceEstimatorService() {
+-    super("org.apache.hadoop.resourceestimator.service");
+-  }
+-
+-  @Before @Override public void setUp() throws Exception {
+-    super.setUp();
+-    containerMemAlloc = 1024;
+-    containerCPUAlloc = 1;
+-    containerSpec = Resource.newInstance(containerMemAlloc, containerCPUAlloc);
+-    gson = new GsonBuilder()
+-        .registerTypeAdapter(Resource.class, new ResourceSerDe())
+-        .registerTypeAdapter(RLESparseResourceAllocation.class,
+-            new RLESparseResourceAllocationSerDe())
+-        .enableComplexMapKeySerialization().create();
+-  }
+-
+-  private void compareResourceSkyline(final ResourceSkyline skyline1,
+-      final ResourceSkyline skyline2) {
+-    Assert.assertEquals(skyline1.getJobId(), skyline2.getJobId());
+-    Assert.assertEquals(skyline1.getJobInputDataSize(),
+-        skyline2.getJobInputDataSize(), 0);
+-    Assert.assertEquals(skyline1.getJobSubmissionTime(),
+-        skyline2.getJobSubmissionTime());
+-    Assert
+-        .assertEquals(skyline1.getJobFinishTime(), skyline2.getJobFinishTime());
+-    Assert.assertEquals(skyline1.getContainerSpec().getMemorySize(),
+-        skyline2.getContainerSpec().getMemorySize());
+-    Assert.assertEquals(skyline1.getContainerSpec().getVirtualCores(),
+-        skyline2.getContainerSpec().getVirtualCores());
+-    final RLESparseResourceAllocation skylineList1 = skyline1.getSkylineList();
+-    final RLESparseResourceAllocation skylineList2 = skyline2.getSkylineList();
+-    for (int i = (int) skylineList1.getEarliestStartTime();
+-         i < skylineList1.getLatestNonNullTime(); i++) {
+-      Assert.assertEquals(skylineList1.getCapacityAtTime(i).getMemorySize(),
+-          skylineList2.getCapacityAtTime(i).getMemorySize());
+-      Assert.assertEquals(skylineList1.getCapacityAtTime(i).getVirtualCores(),
+-          skylineList2.getCapacityAtTime(i).getVirtualCores());
+-    }
+-  }
+-
+-  private ResourceSkyline getSkyline1() {
+-    final TreeMap<Long, Resource> resourceOverTime = new TreeMap<>();
+-    ReservationInterval riAdd;
+-    final RLESparseResourceAllocation skylineList =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    riAdd = new ReservationInterval(0, 10);
+-    Resource resource =
+-        Resource.newInstance(containerMemAlloc, containerCPUAlloc);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(10, 15);
+-    resource = Resource
+-        .newInstance(containerMemAlloc * 1074, containerCPUAlloc * 1074);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(15, 20);
+-    resource = Resource
+-        .newInstance(containerMemAlloc * 2538, containerCPUAlloc * 2538);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(20, 25);
+-    resource = Resource
+-        .newInstance(containerMemAlloc * 2468, containerCPUAlloc * 2468);
+-    skylineList.addInterval(riAdd, resource);
+-    final ResourceSkyline resourceSkyline1 =
+-        new ResourceSkyline("tpch_q12_0", 0, 0, 25, containerSpec, skylineList);
+-
+-    return resourceSkyline1;
+-  }
+-
+-  private ResourceSkyline getSkyline2() {
+-    final TreeMap<Long, Resource> resourceOverTime = new TreeMap<>();
+-    ReservationInterval riAdd;
+-    final RLESparseResourceAllocation skylineList =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    riAdd = new ReservationInterval(0, 10);
+-    Resource resource =
+-        Resource.newInstance(containerMemAlloc, containerCPUAlloc);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(10, 15);
+-    resource =
+-        Resource.newInstance(containerMemAlloc * 794, containerCPUAlloc * 794);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(15, 20);
+-    resource = Resource
+-        .newInstance(containerMemAlloc * 2517, containerCPUAlloc * 2517);
+-    skylineList.addInterval(riAdd, resource);
+-    riAdd = new ReservationInterval(20, 25);
+-    resource = Resource
+-        .newInstance(containerMemAlloc * 2484, containerCPUAlloc * 2484);
+-    skylineList.addInterval(riAdd, resource);
+-    final ResourceSkyline resourceSkyline2 =
+-        new ResourceSkyline("tpch_q12_1", 0, 0, 25, containerSpec, skylineList);
+-
+-    return resourceSkyline2;
+-  }
+-
+-  private void checkResult(final String jobId,
+-      final Map<RecurrenceId, List<ResourceSkyline>> jobHistory) {
+-    switch (jobId) {
+-    case "tpch_q12_0": {
+-      final RecurrenceId recurrenceId =
+-          new RecurrenceId("tpch_q12", "tpch_q12_0");
+-      Assert.assertEquals(1, jobHistory.get(recurrenceId).size());
+-      ResourceSkyline skylineReceive = jobHistory.get(recurrenceId).get(0);
+-      compareResourceSkyline(skylineReceive, getSkyline1());
+-      break;
+-    }
+-    case "tpch_q12_1": {
+-      final RecurrenceId recurrenceId =
+-          new RecurrenceId("tpch_q12", "tpch_q12_1");
+-      Assert.assertEquals(1, jobHistory.get(recurrenceId).size());
+-      ResourceSkyline skylineReceive = jobHistory.get(recurrenceId).get(0);
+-      compareResourceSkyline(skylineReceive, getSkyline2());
+-      break;
+-    }
+-    default:
+-      break;
+-    }
+-  }
+-
+-  private void compareRLESparseResourceAllocation(
+-      final RLESparseResourceAllocation rle1,
+-      final RLESparseResourceAllocation rle2) {
+-    for (int i = (int) rle1.getEarliestStartTime();
+-         i < rle1.getLatestNonNullTime(); i++) {
+-      Assert.assertEquals(rle1.getCapacityAtTime(i), rle2.getCapacityAtTime(i));
+-    }
+-  }
+-
+-  @Test public void testGetPrediction() {
+-    // first, parse the log
+-    final String logFile = "resourceEstimatorService.txt";
+-    WebResource webResource = resource();
+-    webResource.path(parseLogCommand).type(MediaType.APPLICATION_XML_TYPE)
+-        .post(logFile);
+-    webResource = resource().path(getHistorySkylineCommand);
+-    String response = webResource.get(String.class);
+-    Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        gson.fromJson(response,
+-            new TypeToken<Map<RecurrenceId, List<ResourceSkyline>>>() {
+-            }.getType());
+-    checkResult("tpch_q12_0", jobHistory);
+-    checkResult("tpch_q12_1", jobHistory);
+-    // then, try to get estimated resource allocation from skyline store
+-    webResource = resource().path(getEstimatedSkylineCommand);
+-    response = webResource.get(String.class);
+-    Assert.assertEquals("null", response);
+-    // then, we call estimator module to make the prediction
+-    webResource = resource().path(makeEstimationCommand);
+-    response = webResource.get(String.class);
+-    RLESparseResourceAllocation skylineList =
+-        gson.fromJson(response, new TypeToken<RLESparseResourceAllocation>() {
+-        }.getType());
+-    Assert.assertEquals(1,
+-        skylineList.getCapacityAtTime(0).getMemorySize() / containerMemAlloc);
+-    Assert.assertEquals(1058,
+-        skylineList.getCapacityAtTime(10).getMemorySize() / containerMemAlloc);
+-    Assert.assertEquals(2538,
+-        skylineList.getCapacityAtTime(15).getMemorySize() / containerMemAlloc);
+-    Assert.assertEquals(2484,
+-        skylineList.getCapacityAtTime(20).getMemorySize() / containerMemAlloc);
+-    // then, we get estimated resource allocation for tpch_q12
+-    webResource = resource().path(getEstimatedSkylineCommand);
+-    response = webResource.get(String.class);
+-    final RLESparseResourceAllocation skylineList2 =
+-        gson.fromJson(response, new TypeToken<RLESparseResourceAllocation>() {
+-        }.getType());
+-    compareRLESparseResourceAllocation(skylineList, skylineList2);
+-    // then, we call estimator module again to directly get estimated resource
+-    // allocation from skyline store
+-    webResource = resource().path(makeEstimationCommand);
+-    response = webResource.get(String.class);
+-    final RLESparseResourceAllocation skylineList3 =
+-        gson.fromJson(response, new TypeToken<RLESparseResourceAllocation>() {
+-        }.getType());
+-    compareRLESparseResourceAllocation(skylineList, skylineList3);
+-    // finally, test delete
+-    webResource = resource().path(deleteHistoryCommand);
+-    webResource.delete();
+-    webResource = resource().path(getHistorySkylineCommand);
+-    response = webResource.get(String.class);
+-    jobHistory = gson.fromJson(response,
+-        new TypeToken<Map<RecurrenceId, List<ResourceSkyline>>>() {
+-        }.getType());
+-    // jobHistory should only have info for tpch_q12_0
+-    Assert.assertEquals(1, jobHistory.size());
+-    final String pipelineId =
+-        ((RecurrenceId) jobHistory.keySet().toArray()[0]).getRunId();
+-    Assert.assertEquals("tpch_q12_0", pipelineId);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestInMemoryStore.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestInMemoryStore.java
+deleted file mode 100644
+index 4aefab4f268..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestInMemoryStore.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.impl;
+-
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-
+-/**
+- * Test {@link InMemoryStore} class.
+- */
+-public class TestInMemoryStore extends TestSkylineStore {
+-  @Override public final SkylineStore createSkylineStore() {
+-    return new InMemoryStore();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestSkylineStore.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestSkylineStore.java
+deleted file mode 100644
+index e333e3ff263..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/skylinestore/impl/TestSkylineStore.java
++++ /dev/null
+@@ -1,464 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.skylinestore.impl;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.DuplicateRecurrenceIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.EmptyResourceSkylineException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullPipelineIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullRLESparseResourceAllocationException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullRecurrenceIdException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.NullResourceSkylineException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.RecurrenceIdNotFoundException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationInterval;
+-import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Test {@link SkylineStore} class.
+- */
+-public abstract class TestSkylineStore {
+-  /**
+-   * Testing variables.
+-   */
+-  private SkylineStore skylineStore;
+-
+-  private TreeMap<Long, Resource> resourceOverTime;
+-  private RLESparseResourceAllocation skylineList;
+-  private ReservationInterval riAdd;
+-  private Resource resource;
+-
+-  protected abstract SkylineStore createSkylineStore();
+-
+-  @Before public final void setup() {
+-    skylineStore = createSkylineStore();
+-    resourceOverTime = new TreeMap<>();
+-    resource = Resource.newInstance(1024 * 100, 100);
+-  }
+-
+-  private void compare(final ResourceSkyline skyline1,
+-      final ResourceSkyline skyline2) {
+-    Assert.assertEquals(skyline1.getJobId(), skyline2.getJobId());
+-    Assert.assertEquals(skyline1.getJobInputDataSize(),
+-        skyline2.getJobInputDataSize(), 0);
+-    Assert.assertEquals(skyline1.getJobSubmissionTime(),
+-        skyline2.getJobSubmissionTime());
+-    Assert
+-        .assertEquals(skyline1.getJobFinishTime(), skyline2.getJobFinishTime());
+-    Assert.assertEquals(skyline1.getContainerSpec().getMemorySize(),
+-        skyline2.getContainerSpec().getMemorySize());
+-    Assert.assertEquals(skyline1.getContainerSpec().getVirtualCores(),
+-        skyline2.getContainerSpec().getVirtualCores());
+-    Assert.assertEquals(true,
+-        skyline2.getSkylineList().equals(skyline1.getSkylineList()));
+-  }
+-
+-  private void addToStore(final RecurrenceId recurrenceId,
+-      final ResourceSkyline resourceSkyline) throws SkylineStoreException {
+-    final List<ResourceSkyline> resourceSkylines = new ArrayList<>();
+-    resourceSkylines.add(resourceSkyline);
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-    final List<ResourceSkyline> resourceSkylinesGet =
+-        skylineStore.getHistory(recurrenceId).get(recurrenceId);
+-    Assert.assertTrue(resourceSkylinesGet.contains(resourceSkyline));
+-  }
+-
+-  private ResourceSkyline getSkyline(final int n) {
+-    skylineList = new RLESparseResourceAllocation(resourceOverTime,
+-        new DefaultResourceCalculator());
+-    for (int i = 0; i < n; i++) {
+-      riAdd = new ReservationInterval(i * 10, (i + 1) * 10);
+-      skylineList.addInterval(riAdd, resource);
+-    }
+-    final ResourceSkyline resourceSkyline =
+-        new ResourceSkyline(Integer.toString(n), 1024.5, 0, 20, resource,
+-            skylineList);
+-
+-    return resourceSkyline;
+-  }
+-
+-  @Test public final void testGetHistory() throws SkylineStoreException {
+-    // addHistory first recurring pipeline
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    final ResourceSkyline resourceSkyline2 = getSkyline(2);
+-    addToStore(recurrenceId1, resourceSkyline2);
+-    final RecurrenceId recurrenceId2 =
+-        new RecurrenceId("FraudDetection", "17/06/21 00:00:00");
+-    final ResourceSkyline resourceSkyline3 = getSkyline(3);
+-    addToStore(recurrenceId2, resourceSkyline3);
+-    final ResourceSkyline resourceSkyline4 = getSkyline(4);
+-    addToStore(recurrenceId2, resourceSkyline4);
+-    // addHistory second recurring pipeline
+-    final RecurrenceId recurrenceId3 =
+-        new RecurrenceId("Random", "17/06/20 00:00:00");
+-    addToStore(recurrenceId3, resourceSkyline1);
+-    addToStore(recurrenceId3, resourceSkyline2);
+-    // test getHistory {pipelineId, runId}
+-    Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        skylineStore.getHistory(recurrenceId1);
+-    Assert.assertEquals(1, jobHistory.size());
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      Assert.assertEquals(recurrenceId1, entry.getKey());
+-      final List<ResourceSkyline> getSkylines = entry.getValue();
+-      Assert.assertEquals(2, getSkylines.size());
+-      compare(resourceSkyline1, getSkylines.get(0));
+-      compare(resourceSkyline2, getSkylines.get(1));
+-    }
+-    // test getHistory {pipelineId, *}
+-    RecurrenceId recurrenceIdTest = new RecurrenceId("FraudDetection", "*");
+-    jobHistory = skylineStore.getHistory(recurrenceIdTest);
+-    Assert.assertEquals(2, jobHistory.size());
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      Assert.assertEquals(recurrenceId1.getPipelineId(),
+-          entry.getKey().getPipelineId());
+-      final List<ResourceSkyline> getSkylines = entry.getValue();
+-      if (entry.getKey().getRunId().equals("17/06/20 00:00:00")) {
+-        Assert.assertEquals(2, getSkylines.size());
+-        compare(resourceSkyline1, getSkylines.get(0));
+-        compare(resourceSkyline2, getSkylines.get(1));
+-      } else {
+-        Assert.assertEquals(entry.getKey().getRunId(), "17/06/21 00:00:00");
+-        Assert.assertEquals(2, getSkylines.size());
+-        compare(resourceSkyline3, getSkylines.get(0));
+-        compare(resourceSkyline4, getSkylines.get(1));
+-      }
+-    }
+-    // test getHistory {*, runId}
+-    recurrenceIdTest = new RecurrenceId("*", "some random runId");
+-    jobHistory = skylineStore.getHistory(recurrenceIdTest);
+-    Assert.assertEquals(3, jobHistory.size());
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      if (entry.getKey().getPipelineId().equals("FraudDetection")) {
+-        final List<ResourceSkyline> getSkylines = entry.getValue();
+-        if (entry.getKey().getRunId().equals("17/06/20 00:00:00")) {
+-          Assert.assertEquals(2, getSkylines.size());
+-          compare(resourceSkyline1, getSkylines.get(0));
+-          compare(resourceSkyline2, getSkylines.get(1));
+-        } else {
+-          Assert.assertEquals(entry.getKey().getRunId(), "17/06/21 00:00:00");
+-          Assert.assertEquals(2, getSkylines.size());
+-          compare(resourceSkyline3, getSkylines.get(0));
+-          compare(resourceSkyline4, getSkylines.get(1));
+-        }
+-      } else {
+-        Assert.assertEquals("Random", entry.getKey().getPipelineId());
+-        Assert.assertEquals(entry.getKey().getRunId(), "17/06/20 00:00:00");
+-        final List<ResourceSkyline> getSkylines = entry.getValue();
+-        Assert.assertEquals(2, getSkylines.size());
+-        compare(resourceSkyline1, getSkylines.get(0));
+-        compare(resourceSkyline2, getSkylines.get(1));
+-      }
+-    }
+-    // test getHistory with wrong RecurrenceId
+-    recurrenceIdTest =
+-        new RecurrenceId("some random pipelineId", "some random runId");
+-    Assert.assertNull(skylineStore.getHistory(recurrenceIdTest));
+-  }
+-
+-  @Test public final void testGetEstimation() throws SkylineStoreException {
+-    // first, add estimation to the skyline store
+-    final RLESparseResourceAllocation skylineList2 =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    for (int i = 0; i < 5; i++) {
+-      riAdd = new ReservationInterval(i * 10, (i + 1) * 10);
+-      skylineList2.addInterval(riAdd, resource);
+-    }
+-    skylineStore.addEstimation("FraudDetection", skylineList2);
+-    // then, try to get the estimation
+-    final RLESparseResourceAllocation estimation =
+-        skylineStore.getEstimation("FraudDetection");
+-    for (int i = 0; i < 50; i++) {
+-      Assert.assertEquals(skylineList2.getCapacityAtTime(i),
+-          estimation.getCapacityAtTime(i));
+-    }
+-  }
+-
+-  @Test(expected = NullRecurrenceIdException.class)
+-  public final void testGetNullRecurrenceId()
+-      throws SkylineStoreException {
+-    // addHistory first recurring pipeline
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    final ResourceSkyline resourceSkyline2 = getSkyline(2);
+-    addToStore(recurrenceId1, resourceSkyline2);
+-    final RecurrenceId recurrenceId2 =
+-        new RecurrenceId("FraudDetection", "17/06/21 00:00:00");
+-    final ResourceSkyline resourceSkyline3 = getSkyline(3);
+-    addToStore(recurrenceId2, resourceSkyline3);
+-    final ResourceSkyline resourceSkyline4 = getSkyline(4);
+-    addToStore(recurrenceId2, resourceSkyline4);
+-    // addHistory second recurring pipeline
+-    final RecurrenceId recurrenceId3 =
+-        new RecurrenceId("Random", "17/06/20 00:00:00");
+-    addToStore(recurrenceId3, resourceSkyline1);
+-    addToStore(recurrenceId3, resourceSkyline2);
+-    // try to getHistory with null recurringId
+-    skylineStore.getHistory(null);
+-  }
+-
+-  @Test(expected = NullPipelineIdException.class)
+-  public final void testGetNullPipelineIdException()
+-      throws SkylineStoreException {
+-    skylineStore.getEstimation(null);
+-  }
+-
+-  @Test public final void testAddNormal() throws SkylineStoreException {
+-    // addHistory resource skylines to the in-memory store
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId, resourceSkyline1);
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    // the resource skylines to be added contain null
+-    resourceSkylines.add(null);
+-    final ResourceSkyline resourceSkyline2 = getSkyline(2);
+-    resourceSkylines.add(resourceSkyline2);
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-    // query the in-memory store
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(1, jobHistory.size());
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      Assert.assertEquals(recurrenceId, entry.getKey());
+-      final List<ResourceSkyline> getSkylines = entry.getValue();
+-      Assert.assertEquals(2, getSkylines.size());
+-      compare(resourceSkyline1, getSkylines.get(0));
+-      compare(resourceSkyline2, getSkylines.get(1));
+-    }
+-  }
+-
+-  @Test(expected = NullRecurrenceIdException.class)
+-  public final void testAddNullRecurrenceId()
+-      throws SkylineStoreException {
+-    // recurrenceId is null
+-    final RecurrenceId recurrenceIdNull = null;
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    skylineStore.addHistory(recurrenceIdNull, resourceSkylines);
+-  }
+-
+-  @Test(expected = NullResourceSkylineException.class)
+-  public final void testAddNullResourceSkyline()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    // resourceSkylines is null
+-    skylineStore.addHistory(recurrenceId, null);
+-  }
+-
+-  @Test(expected = DuplicateRecurrenceIdException.class)
+-  public final void testAddDuplicateRecurrenceId()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    // trying to addHistory duplicate resource skylines
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-  }
+-
+-  @Test(expected = NullPipelineIdException.class)
+-  public final void testAddNullPipelineIdException()
+-      throws SkylineStoreException {
+-    final RLESparseResourceAllocation skylineList2 =
+-        new RLESparseResourceAllocation(resourceOverTime,
+-            new DefaultResourceCalculator());
+-    for (int i = 0; i < 5; i++) {
+-      riAdd = new ReservationInterval(i * 10, (i + 1) * 10);
+-      skylineList2.addInterval(riAdd, resource);
+-    }
+-    skylineStore.addEstimation(null, skylineList2);
+-  }
+-
+-  @Test(expected = NullRLESparseResourceAllocationException.class)
+-  public final void testAddNullRLESparseResourceAllocationExceptionException()
+-      throws SkylineStoreException {
+-    skylineStore.addEstimation("FraudDetection", null);
+-  }
+-
+-  @Test public final void testDeleteNormal() throws SkylineStoreException {
+-    // addHistory first recurring pipeline
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    final ResourceSkyline resourceSkyline2 = getSkyline(2);
+-    addToStore(recurrenceId1, resourceSkyline2);
+-    // test deleteHistory function of the in-memory store
+-    skylineStore.deleteHistory(recurrenceId1);
+-  }
+-
+-  @Test(expected = NullRecurrenceIdException.class)
+-  public final void testDeleteNullRecurrenceId()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    // try to deleteHistory with null recurringId
+-    skylineStore.deleteHistory(null);
+-  }
+-
+-  @Test(expected = RecurrenceIdNotFoundException.class)
+-  public final void testDeleteRecurrenceIdNotFound()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    final RecurrenceId recurrenceIdInvalid =
+-        new RecurrenceId("Some random pipelineId", "Some random runId");
+-    // try to deleteHistory non-existing recurringId
+-    skylineStore.deleteHistory(recurrenceIdInvalid);
+-  }
+-
+-  @Test public final void testUpdateNormal() throws SkylineStoreException {
+-    // addHistory first recurring pipeline
+-    final RecurrenceId recurrenceId1 =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    addToStore(recurrenceId1, resourceSkyline1);
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline2 = getSkyline(2);
+-    resourceSkylines.add(resourceSkyline1);
+-    resourceSkylines.add(resourceSkyline2);
+-    skylineStore.updateHistory(recurrenceId1, resourceSkylines);
+-    // query the in-memory store
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        skylineStore.getHistory(recurrenceId1);
+-    Assert.assertEquals(1, jobHistory.size());
+-    for (final Map.Entry<RecurrenceId, List<ResourceSkyline>> entry : jobHistory
+-        .entrySet()) {
+-      Assert.assertEquals(recurrenceId1, entry.getKey());
+-      final List<ResourceSkyline> getSkylines = entry.getValue();
+-      Assert.assertEquals(2, getSkylines.size());
+-      compare(resourceSkyline1, getSkylines.get(0));
+-      compare(resourceSkyline2, getSkylines.get(1));
+-    }
+-  }
+-
+-  @Test(expected = NullRecurrenceIdException.class)
+-  public final void testUpdateNullRecurrenceId()
+-      throws SkylineStoreException {
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    final ArrayList<ResourceSkyline> resourceSkylinesInvalid =
+-        new ArrayList<ResourceSkyline>();
+-    resourceSkylinesInvalid.add(null);
+-    // try to updateHistory with null recurringId
+-    skylineStore.updateHistory(null, resourceSkylines);
+-  }
+-
+-  @Test(expected = NullResourceSkylineException.class)
+-  public final void testUpdateNullResourceSkyline()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    final ArrayList<ResourceSkyline> resourceSkylinesInvalid =
+-        new ArrayList<ResourceSkyline>();
+-    resourceSkylinesInvalid.add(null);
+-    // try to updateHistory with null resourceSkylines
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-    skylineStore.updateHistory(recurrenceId, null);
+-  }
+-
+-  @Test(expected = EmptyResourceSkylineException.class)
+-  public final void testUpdateEmptyRecurrenceId()
+-      throws SkylineStoreException {
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("FraudDetection", "17/06/20 00:00:00");
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    final ArrayList<ResourceSkyline> resourceSkylinesInvalid =
+-        new ArrayList<ResourceSkyline>();
+-    resourceSkylinesInvalid.add(null);
+-    skylineStore.addHistory(recurrenceId, resourceSkylines);
+-    // try to updateHistory with empty resourceSkyline
+-    skylineStore.updateHistory(recurrenceId, resourceSkylinesInvalid);
+-  }
+-
+-  @Test(expected = RecurrenceIdNotFoundException.class)
+-  public final void testUpdateRecurrenceIdNotFound()
+-      throws SkylineStoreException {
+-    final ArrayList<ResourceSkyline> resourceSkylines =
+-        new ArrayList<ResourceSkyline>();
+-    final ResourceSkyline resourceSkyline1 = getSkyline(1);
+-    resourceSkylines.add(resourceSkyline1);
+-    final RecurrenceId recurrenceIdInvalid =
+-        new RecurrenceId("Some random pipelineId", "Some random runId");
+-    final ArrayList<ResourceSkyline> resourceSkylinesInvalid =
+-        new ArrayList<ResourceSkyline>();
+-    resourceSkylinesInvalid.add(null);
+-    // try to updateHistory with non-existing recurringId
+-    skylineStore.updateHistory(recurrenceIdInvalid, resourceSkylines);
+-  }
+-
+-  @After public final void cleanUp() {
+-    skylineStore = null;
+-    resourceOverTime.clear();
+-    resourceOverTime = null;
+-    skylineList = null;
+-    riAdd = null;
+-    resource = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestLpSolver.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestLpSolver.java
+deleted file mode 100644
+index 1bce63466a5..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestLpSolver.java
++++ /dev/null
+@@ -1,112 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.impl;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore;
+-import org.apache.hadoop.resourceestimator.solver.api.Solver;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.SolverException;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.junit.Test;
+-
+-import java.io.BufferedReader;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.Reader;
+-import java.nio.charset.StandardCharsets;
+-import java.text.ParseException;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-/**
+- * This LPSolver class will make resource estimation using Linear Programming
+- * model. We use ojAlgo solver to solve the model.
+- */
+-public class TestLpSolver extends TestSolver {
+-  private static final LogParser SAMPLEPARSER = new BaseLogParser();
+-  private Solver solver;
+-  private InMemoryStore skylineStore = new InMemoryStore();
+-
+-  private void parseLog(final String inputLog)
+-      throws SolverException, IOException, SkylineStoreException,
+-      DataFieldNotFoundException, ParseException {
+-    final InputStream logs = new FileInputStream(inputLog);
+-    SAMPLEPARSER.parseStream(logs);
+-  }
+-
+-  @Override protected Solver createSolver() throws ResourceEstimatorException {
+-    solver = new LpSolver();
+-    Configuration config = new Configuration();
+-    config.addResource(ResourceEstimatorConfiguration.CONFIG_FILE);
+-    solver.init(config, skylineStore);
+-    SAMPLEPARSER.init(config, skylineStore);
+-    return solver;
+-  }
+-
+-  @Test public void testSolve()
+-      throws IOException, SkylineStoreException, SolverException,
+-      ResourceEstimatorException, DataFieldNotFoundException, ParseException {
+-    parseLog("src/test/resources/lp/tpch_q12.txt");
+-    RecurrenceId recurrenceId = new RecurrenceId("tpch_q12", "*");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobHistory =
+-        skylineStore.getHistory(recurrenceId);
+-    solver = createSolver();
+-    RLESparseResourceAllocation result = solver.solve(jobHistory);
+-    String file = "src/test/resources/lp/answer.txt";
+-    Reader fileReader = new InputStreamReader(new FileInputStream(file),
+-        StandardCharsets.UTF_8);
+-    BufferedReader bufferedReader = new BufferedReader(fileReader);
+-    String line = bufferedReader.readLine();
+-    Configuration config = new Configuration();
+-    config.addResource(new org.apache.hadoop.fs.Path(
+-        ResourceEstimatorConfiguration.CONFIG_FILE));
+-    int timeInterval =
+-        config.getInt(ResourceEstimatorConfiguration.TIME_INTERVAL_KEY, 5);
+-    final long containerMemAlloc =
+-        jobHistory.entrySet().iterator().next().getValue().get(0)
+-            .getContainerSpec().getMemorySize();
+-    int count = 0;
+-    int numContainer = 0;
+-    while (line != null) {
+-      numContainer =
+-          (int) (result.getCapacityAtTime(count * timeInterval).getMemorySize()
+-              / containerMemAlloc);
+-      assertEquals(Integer.parseInt(line), numContainer,
+-          0.1 * Integer.parseInt(line));
+-      line = bufferedReader.readLine();
+-      count++;
+-    }
+-    fileReader.close();
+-    bufferedReader.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestSolver.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestSolver.java
+deleted file mode 100644
+index 11df6cde4c9..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/solver/impl/TestSolver.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.solver.impl;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.solver.api.Solver;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.InvalidInputException;
+-import org.apache.hadoop.resourceestimator.solver.exceptions.SolverException;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * This LPSolver class will make resource estimation using Linear Programming
+- * model. We use Google Or Tool to solve the model.
+- */
+-public abstract class TestSolver {
+-  private Solver solver;
+-
+-  protected abstract Solver createSolver() throws ResourceEstimatorException;
+-
+-  @Before public void setup()
+-      throws SolverException, IOException, SkylineStoreException,
+-      ResourceEstimatorException {
+-    solver = createSolver();
+-  }
+-
+-  @Test(expected = InvalidInputException.class) public void testNullJobHistory()
+-      throws SolverException, SkylineStoreException {
+-    // try to solve with null jobHistory
+-    solver.solve(null);
+-  }
+-
+-  @Test(expected = InvalidInputException.class)
+-  public void testEmptyJobHistory()
+-      throws SolverException, SkylineStoreException {
+-    Map<RecurrenceId, List<ResourceSkyline>> jobHistoryInvalid =
+-        new HashMap<RecurrenceId, List<ResourceSkyline>>();
+-    // try to solve with emty jobHistory
+-    solver.solve(jobHistoryInvalid);
+-  }
+-
+-  @After public final void cleanUp() {
+-    solver.close();
+-    solver = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/api/TestJobMetaData.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/api/TestJobMetaData.java
+deleted file mode 100644
+index 69ba48058a1..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/api/TestJobMetaData.java
++++ /dev/null
+@@ -1,163 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.api;
+-
+-import java.text.ParseException;
+-
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.translator.impl.LogParserUtil;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Test JobMetaData.
+- */
+-public class TestJobMetaData {
+-  /**
+-   * TODO: parametrize this test.
+-   */
+-  private LogParserUtil logParserUtil = new LogParserUtil();
+-
+-  private JobMetaData jobMetaData;
+-  private RecurrenceId recurrenceId;
+-
+-  @Before public final void setup() throws ParseException {
+-    recurrenceId = new RecurrenceId("Fraud Detection", "17/07/16 16:27:25");
+-    jobMetaData = new JobMetaData(
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:25"));
+-    jobMetaData.setRecurrenceId(recurrenceId);
+-    jobMetaData.setContainerStart("C1",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:30"));
+-    jobMetaData.setContainerEnd("C1",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:37:30"));
+-    jobMetaData.setContainerStart("C2",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:40"));
+-    jobMetaData.setContainerEnd("C2",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:37:40"));
+-    jobMetaData.setJobFinishTime(
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:37:45"));
+-    final Resource containerAlloc = Resource.newInstance(1, 1);
+-    jobMetaData.getResourceSkyline().setContainerSpec(containerAlloc);
+-    jobMetaData.getResourceSkyline().setJobInputDataSize(1024.5);
+-    jobMetaData.createSkyline();
+-  }
+-
+-  @Test public final void testGetContainerSpec() {
+-    final Resource containerAlloc =
+-        jobMetaData.getResourceSkyline().getContainerSpec();
+-    final Resource containerAlloc2 = Resource.newInstance(1, 1);
+-    Assert.assertEquals(containerAlloc.getMemorySize(),
+-        containerAlloc2.getMemorySize());
+-    Assert.assertEquals(containerAlloc.getVirtualCores(),
+-        containerAlloc2.getVirtualCores());
+-  }
+-
+-  @Test public final void testGetJobSize() {
+-    Assert.assertEquals(jobMetaData.getResourceSkyline().getJobInputDataSize(),
+-        1024.5, 0);
+-  }
+-
+-  @Test public final void testGetRecurrenceeId() {
+-    final RecurrenceId recurrenceIdTest =
+-        new RecurrenceId("Fraud Detection", "17/07/16 16:27:25");
+-    Assert.assertEquals(recurrenceIdTest, jobMetaData.getRecurrenceId());
+-  }
+-
+-  @Test public final void testStringToUnixTimestamp() throws ParseException {
+-    final long submissionTime =
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:25");
+-    Assert.assertEquals(jobMetaData.getResourceSkyline().getJobSubmissionTime(),
+-        submissionTime);
+-  }
+-
+-  @Test public final void testResourceSkyline() {
+-    final RLESparseResourceAllocation skylineList =
+-        jobMetaData.getResourceSkyline().getSkylineList();
+-    final int containerCPU =
+-        jobMetaData.getResourceSkyline().getContainerSpec().getVirtualCores();
+-    int k;
+-    for (k = 0; k < 5; k++) {
+-      Assert.assertEquals(0,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    for (k = 5; k < 15; k++) {
+-      Assert.assertEquals(1,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    for (k = 15; k < 605; k++) {
+-      Assert.assertEquals(2,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    for (k = 605; k < 615; k++) {
+-      Assert.assertEquals(1,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    Assert.assertEquals(0,
+-        skylineList.getCapacityAtTime(615).getVirtualCores() / containerCPU);
+-  }
+-
+-  @Test public final void testContainerReleaseTimeMissing()
+-      throws ParseException {
+-    // create an invalid JobMetaData
+-    recurrenceId = new RecurrenceId("Fraud Detection", "17/07/16 16:27:25");
+-    jobMetaData = new JobMetaData(
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:25"));
+-    jobMetaData.setRecurrenceId(recurrenceId);
+-    jobMetaData.setContainerStart("C1",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:30"));
+-    jobMetaData.setContainerEnd("C1",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:37:30"));
+-    jobMetaData.setContainerStart("C2",
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:27:40"));
+-    jobMetaData.setJobFinishTime(
+-        logParserUtil.stringToUnixTimestamp("17/07/16 16:37:45"));
+-    final Resource containerAlloc = Resource.newInstance(1, 1);
+-    jobMetaData.getResourceSkyline().setContainerSpec(containerAlloc);
+-    jobMetaData.getResourceSkyline().setJobInputDataSize(1024.5);
+-    jobMetaData.createSkyline();
+-    // test the generated ResourceSkyline
+-    final RLESparseResourceAllocation skylineList =
+-        jobMetaData.getResourceSkyline().getSkylineList();
+-    final int containerCPU =
+-        jobMetaData.getResourceSkyline().getContainerSpec().getVirtualCores();
+-    int k;
+-    for (k = 0; k < 5; k++) {
+-      Assert.assertEquals(0,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    for (k = 5; k < 605; k++) {
+-      Assert.assertEquals(1,
+-          skylineList.getCapacityAtTime(k).getVirtualCores() / containerCPU);
+-    }
+-    Assert.assertEquals(0,
+-        skylineList.getCapacityAtTime(605).getVirtualCores() / containerCPU);
+-  }
+-
+-  @After public final void cleanUp() {
+-    jobMetaData = null;
+-    recurrenceId = null;
+-    logParserUtil = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestNativeParser.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestNativeParser.java
+deleted file mode 100644
+index f399bf944b6..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestNativeParser.java
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.io.IOException;
+-import java.text.ParseException;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * This sample parser will parse the sample log and extract the resource
+- * skyline.
+- */
+-public class TestNativeParser {
+-  private LogParserUtil logParserUtil = new LogParserUtil();
+-  private SkylineStore skylineStore;
+-
+-  @Before public final void setup() throws ResourceEstimatorException {
+-    skylineStore = new InMemoryStore();
+-    final LogParser nativeParser = new BaseLogParser();
+-    Configuration config = new Configuration();
+-    config.addResource(ResourceEstimatorConfiguration.CONFIG_FILE);
+-    nativeParser.init(config, skylineStore);
+-    logParserUtil.setLogParser(nativeParser);
+-  }
+-
+-  private void parseFile(final String logFile)
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    logParserUtil.parseLog(logFile);
+-  }
+-
+-  @Test public final void testParse()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/nativeLog.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId =
+-        new RecurrenceId("tpch_q12", "tpch_q12_0");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(1, jobSkylineLists.size());
+-    final List<ResourceSkyline> jobHistory = jobSkylineLists.get(recurrenceId);
+-    Assert.assertEquals(1, jobHistory.size());
+-    final ResourceSkyline resourceSkyline = jobHistory.get(0);
+-    Assert.assertEquals(0, resourceSkyline.getJobInputDataSize(), 0);
+-    Assert.assertEquals("tpch_q12_0", resourceSkyline.getJobId());
+-    Assert.assertEquals(0, resourceSkyline.getJobSubmissionTime());
+-    Assert.assertEquals(25, resourceSkyline.getJobFinishTime());
+-    Assert
+-        .assertEquals(1024, resourceSkyline.getContainerSpec().getMemorySize());
+-    Assert
+-        .assertEquals(1, resourceSkyline.getContainerSpec().getVirtualCores());
+-    final RLESparseResourceAllocation skylineLists =
+-        resourceSkyline.getSkylineList();
+-    int k;
+-    for (k = 0; k < 10; k++) {
+-      Assert.assertEquals(1,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / 1024);
+-    }
+-    for (k = 10; k < 15; k++) {
+-      Assert.assertEquals(1074,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / 1024);
+-    }
+-    for (k = 15; k < 20; k++) {
+-      Assert.assertEquals(2538,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / 1024);
+-    }
+-    for (k = 20; k < 25; k++) {
+-      Assert.assertEquals(2468,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / 1024);
+-    }
+-    Assert.assertEquals(0,
+-        skylineLists.getCapacityAtTime(25).getMemorySize() / 1024);
+-  }
+-
+-  @After public final void cleanUp() {
+-    skylineStore = null;
+-    logParserUtil = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestRmParser.java b/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestRmParser.java
+deleted file mode 100644
+index 4a39ed7cf40..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/java/org/apache/hadoop/resourceestimator/translator/impl/TestRmParser.java
++++ /dev/null
+@@ -1,239 +0,0 @@
+-/*
+- *
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- *
+- */
+-
+-package org.apache.hadoop.resourceestimator.translator.impl;
+-
+-import java.io.IOException;
+-import java.text.ParseException;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.resourceestimator.common.api.RecurrenceId;
+-import org.apache.hadoop.resourceestimator.common.api.ResourceSkyline;
+-import org.apache.hadoop.resourceestimator.common.config.ResourceEstimatorConfiguration;
+-import org.apache.hadoop.resourceestimator.common.exception.ResourceEstimatorException;
+-import org.apache.hadoop.resourceestimator.skylinestore.api.SkylineStore;
+-import org.apache.hadoop.resourceestimator.skylinestore.exceptions.SkylineStoreException;
+-import org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore;
+-import org.apache.hadoop.resourceestimator.translator.api.LogParser;
+-import org.apache.hadoop.resourceestimator.translator.exceptions.DataFieldNotFoundException;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.RLESparseResourceAllocation;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * This sample parser will parse the sample log and extract the resource
+- * skyline.
+- */
+-public class TestRmParser {
+-  private LogParserUtil logParserUtil = new LogParserUtil();
+-  private SkylineStore skylineStore;
+-
+-  @Before public final void setup() throws ResourceEstimatorException {
+-    skylineStore = new InMemoryStore();
+-    final LogParser rmParser = new BaseLogParser();
+-    Configuration config = new Configuration();
+-    config.addResource(new org.apache.hadoop.fs.Path(
+-        ResourceEstimatorConfiguration.CONFIG_FILE));
+-    config.set(ResourceEstimatorConfiguration.TRANSLATOR_LINE_PARSER,
+-        RmSingleLineParser.class.getName());
+-    rmParser.init(config, skylineStore);
+-    logParserUtil.setLogParser(rmParser);
+-  }
+-
+-  private void parseFile(final String logFile)
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    logParserUtil.parseLog(logFile);
+-  }
+-
+-  @Test public final void testParse()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/rmLog.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("FraudDetection", "1");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(1, jobSkylineLists.size());
+-    final List<ResourceSkyline> jobHistory = jobSkylineLists.get(recurrenceId);
+-    Assert.assertEquals(1, jobHistory.size());
+-    final ResourceSkyline resourceSkyline = jobHistory.get(0);
+-    Assert.assertEquals(0, resourceSkyline.getJobInputDataSize(), 0);
+-    Assert.assertEquals("application_1497832133857_0330",
+-        resourceSkyline.getJobId());
+-    Assert.assertEquals(
+-        logParserUtil.stringToUnixTimestamp("06/21/2017 16:10:13"),
+-        resourceSkyline.getJobSubmissionTime());
+-    Assert.assertEquals(
+-        logParserUtil.stringToUnixTimestamp("06/21/2017 16:18:35"),
+-        resourceSkyline.getJobFinishTime());
+-    final Resource resource = Resource.newInstance(1800, 1);
+-    Assert.assertEquals(resource.getMemorySize(),
+-        resourceSkyline.getContainerSpec().getMemorySize());
+-    Assert.assertEquals(resource.getVirtualCores(),
+-        resourceSkyline.getContainerSpec().getVirtualCores());
+-    final RLESparseResourceAllocation skylineLists =
+-        resourceSkyline.getSkylineList();
+-
+-    int k;
+-    for (k = 0; k < 142; k++) {
+-      Assert.assertEquals(1,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / resource
+-              .getMemorySize());
+-    }
+-    for (k = 142; k < 345; k++) {
+-      Assert.assertEquals(2,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / resource
+-              .getMemorySize());
+-    }
+-    for (k = 345; k < 502; k++) {
+-      Assert.assertEquals(1,
+-          skylineLists.getCapacityAtTime(k).getMemorySize() / resource
+-              .getMemorySize());
+-    }
+-  }
+-
+-  @Test(expected = ParseException.class)
+-  public final void testInvalidDateFormat()
+-      throws ParseException {
+-    logParserUtil.stringToUnixTimestamp("2017.07.16 16:37:45");
+-  }
+-
+-  @Test public final void testDuplicateJobSubmissionTime()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog1.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "1");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(
+-        logParserUtil.stringToUnixTimestamp("06/21/2017 16:10:23"),
+-        jobSkylineLists.get(recurrenceId).get(0).getJobSubmissionTime());
+-  }
+-
+-  @Test public final void testJobIdNotFoundInJobSubmission()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog2.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "2");
+-    Assert.assertNull(skylineStore.getHistory(recurrenceId));
+-  }
+-
+-  @Test public final void testJobIdNotFoundInContainerAlloc()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog3.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "3");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(0,
+-        jobSkylineLists.get(recurrenceId).get(0).getSkylineList()
+-            .getCumulative().size());
+-  }
+-
+-  @Test public final void testContainerIdNotFoundInContainerAlloc()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog4.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "4");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(0,
+-        jobSkylineLists.get(recurrenceId).get(0).getSkylineList()
+-            .getCumulative().size());
+-  }
+-
+-  @Test public final void testJobIdNotFoundInJobFailure()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog5.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "5");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(
+-        logParserUtil.stringToUnixTimestamp("06/21/2017 16:10:13"),
+-        jobSkylineLists.get(recurrenceId).get(0).getJobSubmissionTime());
+-  }
+-
+-  @Test public final void testJobIdNotFoundInJobFinish()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog6.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "6");
+-    Assert.assertNull(skylineStore.getHistory(recurrenceId));
+-  }
+-
+-  @Test public final void testRecurrenceIdNotFoundInJobFinish()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog7.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "7");
+-    Assert.assertNull(skylineStore.getHistory(recurrenceId));
+-  }
+-
+-  @Test public final void testJobIdNotFoundInResourceSpec()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog8.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "8");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(1024,
+-        jobSkylineLists.get(recurrenceId).get(0).getContainerSpec()
+-            .getMemorySize());
+-    Assert.assertEquals(1,
+-        jobSkylineLists.get(recurrenceId).get(0).getContainerSpec()
+-            .getVirtualCores());
+-  }
+-
+-  @Test public final void testResourceSpecNotFoundInResourceSpec()
+-      throws SkylineStoreException, IOException, ParseException,
+-      ResourceEstimatorException, DataFieldNotFoundException {
+-    final String logFile = "src/test/resources/trace/invalidLog9.txt";
+-    parseFile(logFile);
+-    final RecurrenceId recurrenceId = new RecurrenceId("Test", "9");
+-    final Map<RecurrenceId, List<ResourceSkyline>> jobSkylineLists =
+-        skylineStore.getHistory(recurrenceId);
+-    Assert.assertEquals(1024,
+-        jobSkylineLists.get(recurrenceId).get(0).getContainerSpec()
+-            .getMemorySize());
+-    Assert.assertEquals(1,
+-        jobSkylineLists.get(recurrenceId).get(0).getContainerSpec()
+-            .getVirtualCores());
+-  }
+-
+-  @After public final void cleanUp() {
+-    skylineStore = null;
+-    logParserUtil = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/log4j.properties b/hadoop-tools/hadoop-resourceestimator/src/test/resources/log4j.properties
+deleted file mode 100644
+index 60b8fbed16c..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,25 +0,0 @@
+-#
+-#
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-#
+-#
+-log4j.rootLogger=INFO, stdout
+-# Redirect log messages to console
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.Target=System.out
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/answer.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/answer.txt
+deleted file mode 100644
+index 94565dee5ca..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/answer.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-1
+-1
+-1738
+-2535
+-2484
+-2478
+-2468
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tinySample.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tinySample.txt
+deleted file mode 100644
+index 15fb84e98c2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tinySample.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-tpch_q12 50 1462148517000 1462148527345 1462148952345 tpch_q12_0 8192:0| 1:0|1:5|1074:10|2538:15|2468:20|
+-tpch_q12 50 1462148949000 1462148960455 1462149205455 tpch_q12_1 8192:0| 1:0|1:5|794:10|2517:15|2484:20|
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tpch_q12.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tpch_q12.txt
+deleted file mode 100644
+index ee196250779..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/lp/tpch_q12.txt
++++ /dev/null
+@@ -1,13 +0,0 @@
+-tpch_q12 50 1462148517000 1462148527345 1462148952345 tpch_q12_0 8192:0|8192:5|8798208:10|20791296:15|20348928:20|20275200:25|20217856:30|20160512:35|20045824:40|18554880:45|15736832:50|15302656:55|14991360:60|14737408:65|14508032:70|14360576:75|14196736:80|14049280:85|13901824:90|13795328:95|13721600:100|13664256:105|13565952:110|12877824:115|12148736:120|11476992:125|10829824:130|10444800:135|10059776:140|9633792:145|9355264:150|9125888:155|9027584:160|8937472:165|8839168:170|8757248:175|8642560:180|8527872:185|8421376:190|8396800:195|8355840:200|8323072:205|8298496:210|8282112:215|8282112:220|8273920:225|8273920:230|8273920:235|8273920:240|8273920:245|8273920:250|8273920:255|7700480:260|5160960:265|4087808:270|3907584:275|3702784:280|3407872:285|2965504:290|2686976:295|2473984:300|2244608:305|2056192:310|1933312:315|1810432:320|1613824:325|1417216:330|1277952:335|1130496:340|843776:345|679936:350|647168:355|630784:360|630784:365|630784:370|614400:375|581632:380|548864:385|540672:390|540672:395|540672:400|507904:405|491520:410|278528:415|16384:420|0:425| 1:0|1:5|1074:10|2538:15|2484:20|2475:25|2468:30|
+-tpch_q12 50 1462148949000 1462148960455 1462149205455 tpch_q12_1 8192:0|8192:5|6504448:10|20619264:15|20348928:20|20299776:25|20201472:30|20127744:35|20021248:40|18366464:45|15392768:50|15605760:55|15400960:60|16064512:65|13664256:70|15753216:75|15843328:80|15843328:85|13615104:90|11943936:95|11501568:100|10895360:105|10223616:110|9822208:115|9478144:120|9142272:125|8855552:130|8683520:135|8544256:140|8413184:145|8331264:150|8290304:155|8282112:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|8273920:190|8265728:195|4890624:200|1089536:205|671744:210|565248:215|516096:220|483328:225|360448:230|16384:235|16384:240|8192:245|0:250| 1:0|1:5|794:10|2517:15|2484:20|2478:25|2466:30|
+-tpch_q12 50 1462150611000 1462150620642 1462150895642 tpch_q12_7 8192:0|8192:5|11362304:10|20365312:15|20348928:20|20242432:25|20176896:30|20029440:35|19783680:40|16703488:45|15286272:50|14589952:55|14172160:60|13770752:65|13598720:70|12992512:75|12468224:80|12025856:85|11640832:90|11460608:95|11272192:100|10510336:105|9789440:110|9207808:115|8781824:120|8585216:125|8478720:130|8396800:135|8314880:140|8290304:145|8273920:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|7077888:185|4407296:190|3735552:195|3260416:200|2736128:205|2228224:210|1777664:215|1433600:220|1155072:225|983040:230|843776:235|720896:240|647168:245|630784:250|622592:255|565248:260|303104:265|16384:270|8192:275|0:280| 1:0|1:5|1387:10|2486:15|2484:20|2471:25|2463:30|
+-tpch_q12 50 1462150893000 1462150904200 1462151134200 tpch_q12_8 8192:0|8192:5|7946240:10|20389888:15|20348928:20|20267008:25|20160512:30|20054016:35|19824640:40|17866752:45|14041088:50|14114816:55|12615680:60|14336000:65|12771328:70|12189696:75|11796480:80|11599872:85|11517952:90|11460608:95|11403264:100|11116544:105|10010624:110|9306112:115|8847360:120|8593408:125|8404992:130|8331264:135|8298496:140|8290304:145|8282112:150|8282112:155|8282112:160|8282112:165|8282112:170|8282112:175|8273920:180|8273920:185|8273920:190|8273920:195|8273920:200|8273920:205|8118272:210|2883584:215|376832:220|16384:225|8192:230|0:235| 1:0|1:5|970:10|2489:15|2484:20|2474:25|2461:30|
+-tpch_q12 50 1462151132000 1462151141241 1462151421241 tpch_q12_9 8192:0|16384:5|16031744:10|20348928:15|20348928:20|20201472:25|20152320:30|20004864:35|19562496:40|16121856:45|15319040:50|14589952:55|14139392:60|13770752:65|13131776:70|12378112:75|11878400:80|11649024:85|11534336:90|11444224:95|11157504:100|10362880:105|9650176:110|9134080:115|8749056:120|8519680:125|8372224:130|8306688:135|8290304:140|8282112:145|8282112:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|7569408:190|4505600:195|3522560:200|3072000:205|2801664:210|2523136:215|2080768:220|1679360:225|1343488:230|1007616:235|892928:240|819200:245|688128:250|573440:255|540672:260|524288:265|491520:270|24576:275|8192:280|0:285| 1:0|2:5|1957:10|2484:15|2484:20|2466:25|2460:30|
+-tpch_q12 50 1462151420000 1462151429196 1462151739196 tpch_q12_10 8192:0|8192:5|10543104:10|20357120:15|20348928:20|20234240:25|20168704:30|20045824:35|19750912:40|17293312:45|15327232:50|14770176:55|14336000:60|13926400:65|13410304:70|12517376:75|12034048:80|11714560:85|11526144:90|11427840:95|11247616:100|10616832:105|9928704:110|9412608:115|8962048:120|8585216:125|8380416:130|8323072:135|8290304:140|8282112:145|8282112:150|8282112:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|8273920:190|6889472:195|4120576:200|3465216:205|3153920:210|2924544:215|2514944:220|2056192:225|1794048:230|1646592:235|1417216:240|1122304:245|1048576:250|1007616:255|892928:260|778240:265|647168:270|557056:275|532480:280|524288:285|507904:290|475136:295|229376:300|16384:305|8192:310|0:315| 1:0|1:5|1287:10|2485:15|2484:20|2470:25|2462:30|
+-tpch_q12 50 1462151735000 1462151744905 1462152069905 tpch_q12_11 8192:0|8192:5|9494528:10|20389888:15|20348928:20|20267008:25|20168704:30|20086784:35|19652608:40|17334272:45|15351808:50|15040512:55|14639104:60|14295040:65|13967360:70|13672448:75|12853248:80|12181504:85|11730944:90|11493376:95|11255808:100|10592256:105|10002432:110|9633792:115|9224192:120|8896512:125|8634368:130|8462336:135|8355840:140|8298496:145|8282112:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8142848:185|5718016:190|4440064:195|3989504:200|3604480:205|3334144:210|2981888:215|2572288:220|2269184:225|1966080:230|1744896:235|1507328:240|1310720:245|1089536:250|942080:255|851968:260|794624:265|745472:270|655360:275|598016:280|565248:285|548864:290|532480:295|532480:300|532480:305|491520:310|270336:315|16384:320|8192:325|0:330| 1:0|1:5|1159:10|2489:15|2484:20|2474:25|2462:30|
+-tpch_q12 50 1462152067000 1462152075862 1462152365862 tpch_q12_12 8192:0|8192:5|11583488:10|20357120:15|20348928:20|20234240:25|20168704:30|20037632:35|19734528:40|16744448:45|15351808:50|14704640:55|14229504:60|13901824:65|13631488:70|13107200:75|12500992:80|12140544:85|11804672:90|11558912:95|11386880:100|10723328:105|9928704:110|9355264:115|8937472:120|8691712:125|8519680:130|8421376:135|8372224:140|8339456:145|8306688:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|7577600:190|4898816:195|3719168:200|3104768:205|2613248:210|2252800:215|2064384:220|1835008:225|1515520:230|1171456:235|974848:240|892928:245|802816:250|729088:255|712704:260|663552:265|557056:270|483328:275|368640:280|16384:285|8192:290|0:295| 1:0|1:5|1414:10|2485:15|2484:20|2470:25|2462:30|
+-tpch_q12 50 1462161466000 1462161474815 1462161689815 tpch_q12_45 8192:0|8192:5|13836288:10|20365312:15|20348928:20|20209664:25|20160512:30|20029440:35|19906560:40|18333696:45|15794176:50|16015360:55|13451264:60|15269888:65|12730368:70|11862016:75|11657216:80|11509760:85|11460608:90|11403264:95|11296768:100|10698752:105|9814016:110|9175040:115|8757248:120|8486912:125|8339456:130|8290304:135|8282112:140|8273920:145|8273920:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|5447680:180|1245184:185|737280:190|589824:195|483328:200|147456:205|16384:210|8192:215|0:220| 1:0|1:5|1689:10|2486:15|2484:20|2467:25|2461:30|
+-tpch_q12 50 1462161685000 1462161693550 1462161903550 tpch_q12_46 8192:0|8192:5|13500416:10|20348928:15|20348928:20|20201472:25|20152320:30|20037632:35|19734528:40|17047552:45|14548992:50|13778944:55|14696448:60|16064512:65|14540800:70|12468224:75|11935744:80|11640832:85|11517952:90|11436032:95|11190272:100|10379264:105|9740288:110|9199616:115|8863744:120|8585216:125|8429568:130|8331264:135|8290304:140|8282112:145|8282112:150|8282112:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|8257536:190|3710976:195|393216:200|16384:205|8192:210|0:215| 1:0|1:5|1648:10|2484:15|2484:20|2466:25|2460:30|
+-tpch_q12 50 1462161901000 1462161909461 1462162219461 tpch_q12_47 8192:0|8192:5|14802944:10|20348928:15|20348928:20|20217856:25|20152320:30|20013056:35|19734528:40|16285696:45|15310848:50|14573568:55|14090240:60|13639680:65|13025280:70|12271616:75|11911168:80|11673600:85|11501568:90|11411456:95|11206656:100|10493952:105|9797632:110|9175040:115|8749056:120|8503296:125|8396800:130|8347648:135|8331264:140|8290304:145|8273920:150|8273920:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|6823936:185|4120576:190|3342336:195|2711552:200|2170880:205|1712128:210|1466368:215|1294336:220|1187840:225|1089536:230|917504:235|770048:240|663552:245|589824:250|548864:255|540672:260|540672:265|540672:270|540672:275|540672:280|540672:285|540672:290|516096:295|409600:300|16384:305|8192:310|0:315| 1:0|1:5|1807:10|2484:15|2484:20|2468:25|2460:30|
+-tpch_q12 50 1462162218000 1462162226670 1462162536670 tpch_q12_48 8192:0|8192:5|13295616:10|20348928:15|20348928:20|20234240:25|20160512:30|20070400:35|19898368:40|15876096:45|15138816:50|14344192:55|14024704:60|13787136:65|13623296:70|13312000:75|12607488:80|12042240:85|11780096:90|11640832:95|11493376:100|10649600:105|9732096:110|9232384:115|8953856:120|8749056:125|8577024:130|8429568:135|8347648:140|8298496:145|8290304:150|8290304:155|8290304:160|8282112:165|8282112:170|8282112:175|8282112:180|8273920:185|8273920:190|8273920:195|8273920:200|8273920:205|8273920:210|8273920:215|7798784:220|7307264:225|4808704:230|3891200:235|3530752:240|3162112:245|2596864:250|2195456:255|1835008:260|1589248:265|1425408:270|1204224:275|974848:280|745472:285|581632:290|483328:295|237568:300|16384:305|8192:310|0:315| 1:0|1:5|1623:10|2484:15|2484:20|2470:25|2461:30|
+-tpch_q12 50 1462162533000 1462162541572 1462162766572 tpch_q12_49 8192:0|8192:5|13320192:10|20348928:15|20348928:20|20217856:25|20152320:30|20004864:35|19750912:40|18366464:45|18063360:50|17530880:55|12361728:60|14123008:65|12713984:70|12181504:75|11943936:80|11730944:85|11624448:90|11493376:95|11329536:100|10723328:105|9887744:110|9322496:115|8921088:120|8634368:125|8429568:130|8339456:135|8314880:140|8306688:145|8298496:150|8282112:155|8273920:160|8273920:165|8273920:170|8273920:175|8273920:180|8273920:185|8232960:190|3375104:195|696320:200|581632:205|507904:210|335872:215|16384:220|8192:225|0:230| 1:0|1:5|1626:10|2484:15|2484:20|2468:25|2460:30|
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceEstimatorService.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceEstimatorService.txt
+deleted file mode 100644
+index 15fb84e98c2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceEstimatorService.txt
++++ /dev/null
+@@ -1,2 +0,0 @@
+-tpch_q12 50 1462148517000 1462148527345 1462148952345 tpch_q12_0 8192:0| 1:0|1:5|1074:10|2538:15|2468:20|
+-tpch_q12 50 1462148949000 1462148960455 1462149205455 tpch_q12_1 8192:0| 1:0|1:5|794:10|2517:15|2484:20|
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceestimator-config.xml b/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceestimator-config.xml
+deleted file mode 100644
+index f78085a0abc..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/resourceestimator-config.xml
++++ /dev/null
+@@ -1,85 +0,0 @@
+-<?xml version="1.0"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-    Licensed to the Apache Software Foundation (ASF) under one
+-    or more contributor license agreements.  See the NOTICE file
+-    distributed with this work for additional information
+-    regarding copyright ownership.  The ASF licenses this file
+-    to you under the Apache License, Version 2.0 (the
+-    "License"); you may not use this file except in compliance
+-    with the License.  You may obtain a copy of the License at
+-        http://www.apache.org/licenses/LICENSE-2.0
+-    Unless required by applicable law or agreed to in writing, software
+-    distributed under the License is distributed on an "AS IS" BASIS,
+-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-    See the License for the specific language governing permissions and
+-    limitations under the License.
+--->
+-<configuration>
+-    <property>
+-        <name>resourceestimator.solver.lp.alpha</name>
+-        <value>0.1</value>
+-        <description>
+-            The resource estimator has an integrated Linear Programming solver to make the prediction, and this parameter tunes the tradeoff between resource over-allocation and under-allocation in the Linear Programming model. This parameter varies from 0 to 1, and a larger alpha value means the model minimizes over-allocation better. Default value is 0.1.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.solver.lp.beta</name>
+-        <value>0.1</value>
+-        <description>
+-            This parameter controls the generalization of the Linear Programming model. This parameter varies from 0 to 1. Deafult value is 0.1.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.solver.lp.minJobRuns</name>
+-        <value>2</value>
+-        <description>
+-            The minimum number of job runs required in order to make the prediction. Default value is 2.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.timeInterval</name>
+-        <value>5</value>
+-        <description>
+-            The time length which is used to discretize job execution into intervals. Note that the estimator makes resource allocation prediction for each interval. A smaller time interval has more fine-grained granularity for prediction, but it also takes longer time and more space for prediction. Default value is 5 (seconds).
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.translator.line-parser</name>
+-        <value>org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser</value>
+-        <description>
+-            The class name of the translator single-line parser, which parses a single line in the log. Default value is org.apache.hadoop.resourceestimator.translator.impl.NativeSingleLineParser, which can parse one line in the sample log. Note that if users want to parse Hadoop Resource Manager logs, they need to set the value to be org.apache.hadoop.resourceestimator.translator.impl.RmSingleLineParser. If they want to implement single-line parser to parse their customized log file, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <!-- Optional configuration parameters -->
+-    <!--
+-    <property>
+-        <name>resourceestimator.solver.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.solver.impl.LpSolver</value>
+-        <description>
+-            The class name of the solver provider. Default value is org.apache.hadoop.resourceestimator.solver.impl.LpSolver, which incorporates a Linear Programming model to make the prediction. If users want to implement their own models, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.skylinestore.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore</value>
+-        <description>
+-            The class name of the skylinestore provider. Default value is org.apache.hadoop.resourceestimator.skylinestore.impl.InMemoryStore, which is an in-memory implementation of skylinestore. If users want to use their own skylinestore implementation, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.translator.provider</name>
+-        <value>org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser</value>
+-        <description>
+-            The class name of the translator provider. Default value is org.apache.hadoop.resourceestimator.translator.impl.BaseLogParser, which extracts resourceskylines from log streams. If users want to use their own translator implementation, they need to change this value accordingly.
+-        </description>
+-    </property>
+-    <property>
+-        <name>resourceestimator.service-port</name>
+-        <value>9998</value>
+-        <description>
+-            The port which ResourceEstimatorService listens to. The default value is 9998.
+-        </description>
+-    </property>
+-    -->
+-</configuration>
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog1.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog1.txt
+deleted file mode 100644
+index ba05a8903eb..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog1.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-// Test case 1: duplicate job submission time
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_1 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252823:e,06/21/2017 16:10:23,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_1 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_1,name=Test-1,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog2.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog2.txt
+deleted file mode 100644
+index fe249439873..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog2.txt
++++ /dev/null
+@@ -1,3 +0,0 @@
+-// Test case 2: no jobId found in job submission log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPIDs=2  CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_2,name=Test-2,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog3.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog3.txt
+deleted file mode 100644
+index 63d9c2c3a81..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog3.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-// Test case 3: no jobId found in container allocation log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_3 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPIDs=3  CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_3 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_3,name=Test-3,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog4.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog4.txt
+deleted file mode 100644
+index d787319cd1b..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog4.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-// Test case 4: no containerId found in container allocation log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_4 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_4 CONTAINERIDs=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_4 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_4,name=Test-4,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog5.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog5.txt
+deleted file mode 100644
+index 2bafa674769..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog5.txt
++++ /dev/null
+@@ -1,7 +0,0 @@
+-// Test case 5: jobId not found in app failure log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_5 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_5 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_5 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-e,06/20/2017 22:30:21,yarn resourcemanager,DefaultTag,Pid="5156" Tid="9896" TS="0x01D2EA14CDBCF8F1" String1="17/06/20 22:30:21 INFO capacity.CapacityScheduler: Application Attempt appattempt_5 is done. finalState=FAILED"
+-252844:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO attempt.RMAppAttemptImpl: Storing attempt: AppId: application_5 AttemptId: appattempt_5_000001 MasterContainer: Container: [ContainerId: container_e26_1497832133857_0330_01_000001, NodeId: by2pr08mb1799.namprd08.prod.outlook.com:10131, NodeHttpAddress: by2pr08mb1799.namprd08.prod.outlook.com:8042, Resource: <memory:1800, vCores:1>, Priority: 0, Token: Token { kind: ContainerToken, service: by2pr08mb1799.namprd08.prod.outlook.com:10131 }, ]"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_5,name=Test-5,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog6.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog6.txt
+deleted file mode 100644
+index bcb5112510c..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog6.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-// Test case 6: no jobId found in job finish log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_6 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_6 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_6 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appIds=application_6,name=Test-6,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog7.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog7.txt
+deleted file mode 100644
+index 46676be7e93..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog7.txt
++++ /dev/null
+@@ -1,5 +0,0 @@
+-// Test case 7: no recurrenceId found in job finish log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_7 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_7 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_7 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_7,name=Test:7,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog8.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog8.txt
+deleted file mode 100644
+index b8a8e204fce..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog8.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-// Test case 8: no jobId found in resource spec log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_8 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_8 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_8 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-252844:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO attempt.RMAppAttemptImpl: Storing attempt: AppId: application_8 AttemptIds: appattempt_8_000001 MasterContainer: Container: [ContainerId: container_e26_1497832133857_0330_01_000001, NodeId: by2pr08mb1799.namprd08.prod.outlook.com:10131, NodeHttpAddress: by2pr08mb1799.namprd08.prod.outlook.com:8042, Resource: <memory:1800, vCores:1>, Priority: 0, Token: Token { kind: ContainerToken, service: by2pr08mb1799.namprd08.prod.outlook.com:10131 }, ]"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_8,name=Test-8,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog9.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog9.txt
+deleted file mode 100644
+index 598f935bec2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/invalidLog9.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-// Test case 9: no resource spec found in resource spec log
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_9 CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_9 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_9 CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-252844:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO attempt.RMAppAttemptImpl: Storing attempt: AppId: application_9 AttemptId: appattempt_9_000001 MasterContainer: Container: [ContainerId: container_e26_1497832133857_0330_01_000001, NodeId: by2pr08mb1799.namprd08.prod.outlook.com:10131, NodeHttpAddress: by2pr08mb1799.namprd08.prod.outlook.com:8042, Resource: <memory:1800, CPU:1>, Priority: 0, Token: Token { kind: ContainerToken, service: by2pr08mb1799.namprd08.prod.outlook.com:10131 }, ]"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_9,name=Test-9,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/1,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/nativeLog.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/nativeLog.txt
+deleted file mode 100644
+index fd03ea364b2..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/nativeLog.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-tpch_q12 50 1462148517000 1462148527345 1462148952345 tpch_q12_0 8192:0| 1:0|1:5|1074:10|2538:15|2468:20|
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/rmLog.txt b/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/rmLog.txt
+deleted file mode 100644
+index 7532a73dfa3..00000000000
+--- a/hadoop-tools/hadoop-resourceestimator/src/test/resources/trace/rmLog.txt
++++ /dev/null
+@@ -1,30 +0,0 @@
+-252823:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.150  OPERATION=Submit Application Request  TARGET=ClientRMService  RESULT=SUCCESS  APPID=application_1497832133857_0330  CALLERCONTEXT=HIVE_QUERY_ID:ExoAdmin_20170621160339_7fed8f3c-3558-4abe-a0db-029eaa44d70e"
+-252825:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO rmapp.RMAppImpl: Storing application with id application_1497832133857_0330"
+-252826:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from NEW to NEW_SAVING"
+-252827:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD060D14" String1="17/06/21 16:10:13 INFO recovery.RMStateStore: Storing info for app: application_1497832133857_0330"
+-252828:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from NEW_SAVING to SUBMITTED"
+-252829:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO capacity.ParentQueue: Application added - appId: application_1497832133857_0330 user: hadoop leaf-queue of parent: root #applications: 3"
+-252830:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO capacity.CapacityScheduler: Accepted application application_1497832133857_0330 from user: hadoop, in queue: PROD"
+-252831:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from SUBMITTED to ACCEPTED"
+-252834:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO capacity.LeafQueue: Application application_1497832133857_0330 from user: hadoop activated in queue: PROD"
+-252835:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO capacity.LeafQueue: Application added - appId: application_1497832133857_0330 user: org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue$User@7e2d171f, leaf-queue: PROD #user-pending-applications: 0 #user-active-applications: 1 #queue-pending-applications: 0 #queue-active-applications: 1"
+-252839:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_1497832133857_0330  CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-252844:e,06/21/2017 16:10:13,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA8DD11F8F0" String1="17/06/21 16:10:13 INFO attempt.RMAppAttemptImpl: Storing attempt: AppId: application_1497832133857_0330 AttemptId: appattempt_1497832133857_0330_000001 MasterContainer: Container: [ContainerId: container_e26_1497832133857_0330_01_000001, NodeId: by2pr08mb1799.namprd08.prod.outlook.com:10131, NodeHttpAddress: by2pr08mb1799.namprd08.prod.outlook.com:8042, Resource: <memory:1800, vCores:1>, Priority: 0, Token: Token { kind: ContainerToken, service: by2pr08mb1799.namprd08.prod.outlook.com:10131 }, ]"
+-252897:e,06/21/2017 16:12:34,yarn resourcemanager,DefaultTag,Pid="5156" Tid="41712" TS="0x01D2EAA931905154" String1="17/06/21 16:12:34 INFO resourcemanager.RMAuditLogger: USER=hadoop  IP=25.163.46.25 OPERATION=Register App Master TARGET=ApplicationMasterService RESULT=SUCCESS  APPID=application_1497832133857_0330  APPATTEMPTID=appattempt_1497832133857_0330_000001"
+-252900:e,06/21/2017 16:12:34,yarn resourcemanager,DefaultTag,Pid="5156" Tid="41712" TS="0x01D2EAA931905154" String1="17/06/21 16:12:34 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from ACCEPTED to RUNNING"
+-252906:e,06/21/2017 16:12:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="41712" TS="0x01D2EAA93234D4E8" String1="17/06/21 16:12:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Allocated Container  TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_1497832133857_0330  CONTAINERID=container_e26_1497832133857_0330_01_000002"
+-252910:e,06/21/2017 16:12:38,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39272" TS="0x01D2EAA933A6643E" String1="17/06/21 16:12:38 INFO scheduler.AppSchedulingInfo: checking for deactivate of application :application_1497832133857_0330"
+-253016:e,06/21/2017 16:15:58,yarn resourcemanager,DefaultTag,Pid="5156" Tid="39188" TS="0x01D2EAA9AB29C5EE" String1="17/06/21 16:15:58 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_1497832133857_0330  CONTAINERID=container_e26_1497832133857_0330_01_000002"
+-253086:e,06/21/2017 16:18:25,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA02A6A418" String1="17/06/21 16:18:25 INFO rmapp.RMAppImpl: Updating application application_1497832133857_0330 with final state: FINISHING"
+-253087:e,06/21/2017 16:18:25,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA02A6A418" String1="17/06/21 16:18:25 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from RUNNING to FINAL_SAVING"
+-253089:e,06/21/2017 16:18:25,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA02B28FF0" String1="17/06/21 16:18:25 INFO recovery.RMStateStore: Updating info for app: application_1497832133857_0330"
+-253090:e,06/21/2017 16:18:25,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA02B28FF0" String1="17/06/21 16:18:25 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from FINAL_SAVING to FINISHING"
+-253091:e,06/21/2017 16:18:26,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA033F3BC8" String1="17/06/21 16:18:26 INFO resourcemanager.ApplicationMasterService: application_1497832133857_0330 unregistered successfully. "
+-253100:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=AM Released Container TARGET=SchedulerApp RESULT=SUCCESS  APPID=application_1497832133857_0330  CONTAINERID=container_e26_1497832133857_0330_01_000001"
+-253105:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO rmapp.RMAppImpl: application_1497832133857_0330 State change from FINISHING to FINISHED"
+-253110:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO scheduler.AppSchedulingInfo: Application application_1497832133857_0330 requests cleared"
+-253111:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO capacity.LeafQueue: Application removed - appId: application_1497832133857_0330 user: hadoop queue: PROD #user-pending-applications: 0 #user-active-applications: 0 #queue-pending-applications: 0 #queue-active-applications: 0"
+-253112:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO capacity.ParentQueue: Application removed - appId: application_1497832133857_0330 user: hadoop leaf-queue of parent: root #applications: 2"
+-253113:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAuditLogger: USER=hadoop  OPERATION=Application Finished - Succeeded  TARGET=RMAppManager RESULT=SUCCESS  APPID=application_1497832133857_0330"
+-253114:e,06/21/2017 16:18:35,yarn resourcemanager,DefaultTag,Pid="5156" Tid="19824" TS="0x01D2EAAA089569FD" String1="17/06/21 16:18:35 INFO resourcemanager.RMAppManager$ApplicationSummary: appId=application_1497832133857_0330,name=FraudDetection-1,user=hadoop, queue=PROD,state=FINISHED,trackingUrl=http://BY1PR00OC0019.namprd00.prod.outlook.com:8088/proxy/application_1497832133857_0330/,appMasterHost=by2pr08mb1799.namprd08.prod.outlook.com,startTime=1498061413073,finishTime=1498061905698,finalStatus=SUCCEEDED,memorySeconds=1330655,vcoreSeconds=704,preemptedAMContainers=0,preemptedNonAMContainers=0,preemptedResources=<memory:0\, vCores:0>,applicationType=MAPREDUCE"
+-e,06/20/2017 22:30:21,yarn resourcemanager,DefaultTag,Pid="5156" Tid="9896" TS="0x01D2EA14CDBCF8F1" String1="17/06/20 22:30:21 INFO capacity.CapacityScheduler: Application Attempt appattempt_1497832133857_0194_000001 is done. finalState=FAILED"
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index fe2dcb4ea6f..b07155fb74c 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -83,12 +83,6 @@
+       <artifactId>hadoop-sls</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-resourceestimator</artifactId>
+-        <version>${project.version}</version>
+-        <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure-datalake</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 0508c62b89b..54bdd157715 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-sls</module>
+-    <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+     <module>hadoop-azure-datalake</module>
diff --git a/hadoop/stackable/patches/3.4.0/12-remove-hadoop-sls.patch b/hadoop/stackable/patches/3.4.0/12-remove-hadoop-sls.patch
new file mode 100644
index 000000000..664bdd1d2
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/12-remove-hadoop-sls.patch
@@ -0,0 +1,59834 @@
+Entirely remove hadoop-sls
+
+From: Lars Francke <git@lars-francke.de>
+
+This needs to be removed before hadoop-rumen as hadoop-sls has a dependency
+on hadoop-rumen
+---
+ .../src/main/resources/assemblies/hadoop-sls.xml   |   47 
+ .../src/main/resources/assemblies/hadoop-tools.xml |   11 
+ hadoop-project/pom.xml                             |    5 
+ hadoop-project/src/site/site.xml                   |    1 
+ hadoop-tools/hadoop-sls/README                     |   32 
+ .../hadoop-sls/dev-support/findbugs-exclude.xml    |   26 
+ hadoop-tools/hadoop-sls/pom.xml                    |  210 
+ .../hadoop-sls/src/main/assemblies/sls.xml         |   57 
+ hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh  |  107 
+ hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh     |  146 
+ .../src/main/data/2jobs2min-rumen-jh.json          |10132 -------------------
+ .../src/main/html/css/bootstrap-responsive.min.css |   19 
+ .../hadoop-sls/src/main/html/css/bootstrap.min.css |   37 
+ .../src/main/html/js/thirdparty/bootstrap.min.js   |    6 
+ .../src/main/html/js/thirdparty/d3.v3.js           | 8823 ----------------
+ .../src/main/html/js/thirdparty/jquery.js          |10872 --------------------
+ .../src/main/html/showSimulationTrace.html         |  376 -
+ .../src/main/html/simulate.html.template           |  306 -
+ .../src/main/html/simulate.info.html.template      |   50 
+ .../hadoop-sls/src/main/html/track.html.template   |  193 
+ .../org/apache/hadoop/yarn/sls/AMDefinition.java   |  105 
+ .../hadoop/yarn/sls/AMDefinitionFactory.java       |  133 
+ .../apache/hadoop/yarn/sls/AMDefinitionRumen.java  |  167 
+ .../apache/hadoop/yarn/sls/AMDefinitionSLS.java    |  185 
+ .../apache/hadoop/yarn/sls/AMDefinitionSynth.java  |  146 
+ .../java/org/apache/hadoop/yarn/sls/AMRunner.java  |  299 -
+ .../org/apache/hadoop/yarn/sls/JobDefinition.java  |   87 
+ .../java/org/apache/hadoop/yarn/sls/NMRunner.java  |  238 
+ .../java/org/apache/hadoop/yarn/sls/RMRunner.java  |  137 
+ .../hadoop/yarn/sls/ReservationClientUtil.java     |   76 
+ .../hadoop/yarn/sls/RumenToSLSConverter.java       |  235 
+ .../java/org/apache/hadoop/yarn/sls/SLSRunner.java |  519 -
+ .../hadoop/yarn/sls/TaskContainerDefinition.java   |  247 
+ .../hadoop/yarn/sls/appmaster/AMSimulator.java     |  524 -
+ .../hadoop/yarn/sls/appmaster/DAGAMSimulator.java  |  285 -
+ .../hadoop/yarn/sls/appmaster/MRAMSimulator.java   |  415 -
+ .../yarn/sls/appmaster/StreamAMSimulator.java      |  269 
+ .../hadoop/yarn/sls/appmaster/package-info.java    |   21 
+ .../hadoop/yarn/sls/conf/SLSConfiguration.java     |  134 
+ .../hadoop/yarn/sls/nodemanager/NMSimulator.java   |  318 -
+ .../hadoop/yarn/sls/nodemanager/NodeInfo.java      |  271 
+ .../yarn/sls/resourcemanager/MockAMLauncher.java   |  117 
+ .../sls/scheduler/CapacitySchedulerMetrics.java    |   31 
+ .../yarn/sls/scheduler/ContainerSimulator.java     |  147 
+ .../yarn/sls/scheduler/FairSchedulerMetrics.java   |  213 
+ .../yarn/sls/scheduler/FifoSchedulerMetrics.java   |   63 
+ .../scheduler/NodeUpdateSchedulerEventWrapper.java |   34 
+ .../hadoop/yarn/sls/scheduler/RMNodeWrapper.java   |  245 
+ .../yarn/sls/scheduler/SLSCapacityScheduler.java   |  162 
+ .../yarn/sls/scheduler/SLSFairScheduler.java       |  123 
+ .../yarn/sls/scheduler/SLSSchedulerCommons.java    |  343 -
+ .../yarn/sls/scheduler/SchedulerMetrics.java       |  736 -
+ .../yarn/sls/scheduler/SchedulerWrapper.java       |   56 
+ .../hadoop/yarn/sls/scheduler/TaskRunner.java      |  188 
+ .../apache/hadoop/yarn/sls/scheduler/Tracker.java  |   46 
+ .../apache/hadoop/yarn/sls/synthetic/SynthJob.java |  377 -
+ .../yarn/sls/synthetic/SynthTraceJobProducer.java  |  665 -
+ .../hadoop/yarn/sls/synthetic/SynthUtils.java      |  101 
+ .../hadoop/yarn/sls/synthetic/package-info.java    |   22 
+ .../hadoop/yarn/sls/utils/NodeUsageRanges.java     |   68 
+ .../org/apache/hadoop/yarn/sls/utils/SLSUtils.java |  253 
+ .../apache/hadoop/yarn/sls/utils/package-info.java |   21 
+ .../org/apache/hadoop/yarn/sls/web/SLSWebApp.java  |  651 -
+ .../src/main/sample-conf/capacity-scheduler.xml    |   60 
+ .../src/main/sample-conf/fair-scheduler.xml        |   50 
+ .../src/main/sample-conf/log4j.properties          |   19 
+ .../hadoop-sls/src/main/sample-conf/sls-runner.xml |   81 
+ .../hadoop-sls/src/main/sample-conf/yarn-site.xml  |   80 
+ .../src/site/markdown/SchedulerLoadSimulator.md    |  524 -
+ .../hadoop-sls/src/site/resources/css/site.css     |   30 
+ .../src/site/resources/images/sls_JVM.png          |  Bin
+ .../src/site/resources/images/sls_arch.png         |  Bin
+ .../site/resources/images/sls_cluster_memory.png   |  Bin
+ .../site/resources/images/sls_cluster_vcores.png   |  Bin
+ .../images/sls_queue_allocated_memory.png          |  Bin
+ .../images/sls_queue_allocated_vcores.png          |  Bin
+ .../images/sls_running_apps_containers.png         |  Bin
+ .../images/sls_scheduler_operation_timecost.png    |  Bin
+ .../src/site/resources/images/sls_track_job.png    |  Bin
+ .../src/site/resources/images/sls_track_queue.png  |  Bin
+ .../apache/hadoop/yarn/sls/BaseSLSRunnerTest.java  |  153 
+ .../apache/hadoop/yarn/sls/TestDagAMSimulator.java |   92 
+ .../yarn/sls/TestReservationSystemInvariants.java  |   77 
+ .../hadoop/yarn/sls/TestSLSDagAMSimulator.java     |   76 
+ .../hadoop/yarn/sls/TestSLSGenericSynth.java       |   76 
+ .../org/apache/hadoop/yarn/sls/TestSLSRunner.java  |  128 
+ .../hadoop/yarn/sls/TestSLSStreamAMSynth.java      |   76 
+ .../hadoop/yarn/sls/TestSynthJobGeneration.java    |  266 
+ .../hadoop/yarn/sls/appmaster/TestAMSimulator.java |  386 -
+ .../yarn/sls/nodemanager/TestNMSimulator.java      |  234 
+ .../hadoop/yarn/sls/scheduler/TestTaskRunner.java  |  247 
+ .../apache/hadoop/yarn/sls/utils/TestSLSUtils.java |  144 
+ .../apache/hadoop/yarn/sls/web/TestSLSWebApp.java  |  122 
+ .../src/test/resources/capacity-scheduler.xml      |   70 
+ .../src/test/resources/exit-invariants.txt         |    8 
+ .../src/test/resources/fair-scheduler.xml          |   52 
+ .../hadoop-sls/src/test/resources/inputsls.json    |   63 
+ .../hadoop-sls/src/test/resources/log4j.properties |   19 
+ .../src/test/resources/nodes-with-resources.json   |   23 
+ .../hadoop-sls/src/test/resources/nodes.json       |   84 
+ .../src/test/resources/ongoing-invariants.txt      |   54 
+ .../src/test/resources/simulate.html.template      |  278 -
+ .../src/test/resources/simulate.info.html.template |   50 
+ .../hadoop-sls/src/test/resources/sls-runner.xml   |   89 
+ .../hadoop-sls/src/test/resources/sls_dag.json     |   62 
+ .../hadoop-sls/src/test/resources/syn.json         |   55 
+ .../hadoop-sls/src/test/resources/syn_generic.json |   56 
+ .../hadoop-sls/src/test/resources/syn_stream.json  |   47 
+ .../src/test/resources/track.html.template         |  193 
+ .../hadoop-sls/src/test/resources/yarn-site.xml    |   80 
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 112 files changed, 45139 deletions(-)
+ delete mode 100644 hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/README
+ delete mode 100644 hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/html/track.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinition.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionFactory.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionRumen.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSLS.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSynth.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/JobDefinition.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/NMRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RMRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/ReservationClientUtil.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/TaskContainerDefinition.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/DAGAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/StreamAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSSchedulerCommons.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/Tracker.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthJob.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthTraceJobProducer.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthUtils.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/NodeUsageRanges.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/markdown/SchedulerLoadSimulator.md
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestDagAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSDagAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSGenericSynth.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSStreamAMSynth.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSynthJobGeneration.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/nodemanager/TestNMSimulator.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/exit-invariants.txt
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/inputsls.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/nodes-with-resources.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/nodes.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/ongoing-invariants.txt
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/sls_dag.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/syn.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/syn_generic.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/syn_stream.json
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/track.html.template
+ delete mode 100644 hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
+deleted file mode 100644
+index 95b263ab9dc..00000000000
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-sls.xml
++++ /dev/null
+@@ -1,47 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-  
+-       http://www.apache.org/licenses/LICENSE-2.0
+-  
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>hadoop-sls</id>
+-  <formats>
+-    <format>dir</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bin</directory>
+-      <outputDirectory>sls/bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/html</directory>
+-      <outputDirectory>sls/html</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/sample-conf</directory>
+-      <outputDirectory>sls/sample-conf</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/data</directory>
+-      <outputDirectory>sls/sample-data</outputDirectory>
+-    </fileSet>
+-  </fileSets>
+-
+-</assembly>
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 013f47479ef..8270d72e496 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -83,17 +83,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-sls/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-aws/src/main/bin</directory>
+       <outputDirectory>/bin</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 1776a9499bd..87f23a3ddbc 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -1511,11 +1511,6 @@
+         <artifactId>metrics-core</artifactId>
+         <version>${metrics.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-sls</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-cloud-storage</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 55ae67136f2..65a03b815b9 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -194,7 +194,6 @@
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+-      <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+ 
+diff --git a/hadoop-tools/hadoop-sls/README b/hadoop-tools/hadoop-sls/README
+deleted file mode 100644
+index b76079e27b3..00000000000
+--- a/hadoop-tools/hadoop-sls/README
++++ /dev/null
+@@ -1,32 +0,0 @@
+-Yarn Scheduler Load Simulator (SLS)
+-
+-SLS is a stress and performance harness for the Yarn Resource Manager Scheduler
+-that exercises the scheduler implementation simulating the cluster size and the
+-applications load without having to have a cluster nor applications.
+-
+-SLS runs a regular RM without RPC endpoints and uses a NodeManager and
+-Application Manager simulators to send and receive events simulating cluster
+-and application load behavior.
+-
+-==== Quick Start ====
+-
+-Let $HADOOP_ROOT represent the Hadoop install directory. If you build Hadoop
+-yourself, $HADOOP_ROOT is hadoop-dist/target/hadoop-$VERSION. The simulator 
+-is located at $HADOOP_ROOT/share/hadoop/tools/sls. The folder sls contains 
+-four directories: bin (running scripts), html (web portal to view progress),
+-sample-conf (some example configurations), and sample-data (an example rumen
+-trace).
+-
+-STEP 1: Copy all configuration files (under sample-conf) to $HADOOP_ROOT/etc/hadoop.
+-STEP 2: Go to the $HADOOP_ROOT/share/hadoop/tools/sls directory, and run the simulator 
+-using the sample rumen trace (under sample-data).
+-
+-bin/slsrun.sh --input-rumen=sample-data/2jobs2min-rumen-jh.json --output-dir=sample-output
+-
+-The simulator will start to run, and you can track the running progress 
+-using its web portal (http://$HOST:10001/simulate, where $HOST is the place 
+-where you run the simulator.). All collected scheduler metrics are stored 
+-under the output-dir during running. This trace takes about 3 mins to finish.
+-
+-For more detailed setup, you can check out the document 
+-(http://issues.apache.org/jira/secure/attachment/12604817/YARN-1021.pdf) 
+diff --git a/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 9f63ff252b3..00000000000
+--- a/hadoop-tools/hadoop-sls/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,26 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-
+- <!-- Ignore comparedTo, equals warnings -->
+-  <Match>
+-    <Class name="org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator" />
+-    <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
+-  </Match>
+-
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml
+deleted file mode 100644
+index 8c779e975a7..00000000000
+--- a/hadoop-tools/hadoop-sls/pom.xml
++++ /dev/null
+@@ -1,210 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-sls</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Scheduler Load Simulator</description>
+-  <name>Apache Hadoop Scheduler Load Simulator</name>
+-  <packaging>jar</packaging>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-rumen</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>io.dropwizard.metrics</groupId>
+-      <artifactId>metrics-core</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-server</artifactId>
+-      <scope>provided</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.eclipse.jetty</groupId>
+-          <artifactId>javax.servlet-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-util</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.fasterxml.jackson.core</groupId>
+-      <artifactId>jackson-databind</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <resources>
+-      <resource>
+-      <directory>src/main/</directory>
+-      <includes>
+-        <include>html/simulate.html.template</include>
+-        <include>html/simulate.info.html.template</include>
+-        <include>html/track.html.template</include>
+-        <include>html/css/bootstrap-responsive.min.css</include>
+-        <include>html/css/bootstrap.min.css</include>
+-        <include>html/js/thirdparty/bootstrap.min.js</include>
+-        <include>html/js/thirdparty/d3.v3.js</include>
+-        <include>html/js/thirdparty/d3-LICENSE</include>
+-        <include>html/js/thirdparty/jquery.js</include>
+-      </includes>
+-      </resource>
+-    </resources>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-source-plugin</artifactId>
+-        <configuration>
+-          <attach>true</attach>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-        <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/main/data/2jobs2min-rumen-jh.json</exclude>
+-            <exclude>src/main/html/js/thirdparty/jquery.js</exclude>
+-            <exclude>src/main/html/js/thirdparty/d3.v3.js</exclude>
+-            <exclude>src/main/html/simulate.html.template</exclude>
+-            <exclude>src/main/html/simulate.info.html.template</exclude>
+-            <exclude>src/main/html/track.html.template</exclude>
+-            <exclude>src/test/resources/simulate.html.template</exclude>
+-            <exclude>src/test/resources/simulate.info.html.template</exclude>
+-            <exclude>src/test/resources/track.html.template</exclude>
+-            <exclude>src/test/resources/syn.json</exclude>
+-            <exclude>src/test/resources/syn_generic.json</exclude>
+-            <exclude>src/test/resources/syn_stream.json</exclude>
+-            <exclude>src/test/resources/inputsls.json</exclude>
+-            <exclude>src/test/resources/nodes.json</exclude>
+-            <exclude>src/test/resources/nodes-with-resources.json</exclude>
+-            <exclude>src/test/resources/exit-invariants.txt</exclude>
+-            <exclude>src/test/resources/ongoing-invariants.txt</exclude>
+-            <exclude>src/test/resources/sls_dag.json</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>dist</id>
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-assembly-plugin</artifactId>
+-            <dependencies>
+-              <dependency>
+-                <groupId>org.apache.hadoop</groupId>
+-                <artifactId>hadoop-assemblies</artifactId>
+-                <version>${project.version}</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <id>dist</id>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>single</goal>
+-                </goals>
+-                <configuration>
+-                  <appendAssemblyId>false</appendAssemblyId>
+-                  <attach>false</attach>
+-                  <finalName>${project.artifactId}-${project.version}</finalName>
+-                  <descriptorRefs>
+-                    <descriptorRef>hadoop-sls</descriptorRef>
+-                  </descriptorRefs>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml b/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
+deleted file mode 100644
+index 085a5d86d6d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/assemblies/sls.xml
++++ /dev/null
+@@ -1,57 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-  
+-       http://www.apache.org/licenses/LICENSE-2.0
+-  
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+-  <id>sls</id>
+-  <formats>
+-    <format>dir</format>
+-    <format>tar.gz</format>
+-  </formats>
+-  <includeBaseDirectory>false</includeBaseDirectory>
+-
+-  <fileSets>
+-    <fileSet>
+-      <directory>${basedir}/src/main/bin</directory>
+-      <outputDirectory>bin</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/data</directory>
+-      <outputDirectory>sample-data</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/html</directory>
+-      <outputDirectory>html</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>${basedir}/src/main/sample-conf</directory>
+-      <outputDirectory>sample-conf</outputDirectory>
+-    </fileSet>
+-  </fileSets>
+-
+-  <dependencySets>
+-    <dependencySet>
+-      <outputDirectory>/lib</outputDirectory>
+-      <unpack>false</unpack>
+-      <scope>compile</scope>
+-      <useProjectArtifact>true</useProjectArtifact>
+-    </dependencySet>
+-  </dependencySets>
+-
+-</assembly>
+diff --git a/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh b/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
+deleted file mode 100644
+index cda4e73f4ab..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh
++++ /dev/null
+@@ -1,107 +0,0 @@
+-#!/usr/bin/env bash
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#    http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License. See accompanying LICENSE file.
+-#
+-
+-function hadoop_usage()
+-{
+-  echo "Usage: rumen2sls.sh <OPTIONS>"
+-  echo "                 --rumen-file=<RUMEN_FILE>"
+-  echo "                 --output-dir=<SLS_OUTPUT_DIR>"
+-  echo "                 [--output-prefix=<PREFIX>] (default is sls)"
+-  echo
+-}
+-
+-function parse_args()
+-{
+-  for i in "$@"; do
+-    case $i in
+-      --rumen-file=*)
+-        rumenfile=${i#*=}
+-      ;;
+-      --output-dir=*)
+-        outputdir=${i#*=}
+-      ;;
+-      --output-prefix=*)
+-        outputprefix=${i#*=}
+-      ;;
+-      *)
+-        hadoop_error "ERROR: Invalid option ${i}"
+-        hadoop_exit_with_usage 1
+-      ;;
+-    esac
+-  done
+-
+-  if [[ -z "${rumenfile}" ]] ; then
+-    hadoop_error "ERROR: --rumen-file must be specified."
+-    hadoop_exit_with_usage 1
+-  fi
+-
+-  if [[ -z "${outputdir}" ]] ; then
+-    hadoop_error "ERROR: --output-dir must be specified."
+-    hadoop_exit_with_usage 1
+-  fi
+-}
+-
+-function calculate_classpath()
+-{
+-  hadoop_add_to_classpath_tools hadoop-rumen
+-}
+-
+-function run_sls_generator()
+-{
+-  local args
+-
+-  if [[ -z "${outputprefix}" ]] ; then
+-    outputprefix="sls"
+-  fi
+-
+-  hadoop_add_param args -input "-input ${rumenfile}"
+-  hadoop_add_param args -outputJobs "-outputJobs ${outputdir}/${outputprefix}-jobs.json"
+-  hadoop_add_param args -outputNodes "-outputNodes ${outputdir}/${outputprefix}-nodes.json"
+-
+-  hadoop_add_client_opts
+-
+-  hadoop_finalize
+-  # shellcheck disable=SC2086
+-  hadoop_java_exec rumen2sls org.apache.hadoop.yarn.sls.RumenToSLSConverter ${args}
+-}
+-
+-# let's locate libexec...
+-if [[ -n "${HADOOP_HOME}" ]]; then
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
+-else
+-  this="${BASH_SOURCE-$0}"
+-  bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P)
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../../../../../libexec"
+-fi
+-
+-HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
+-# shellcheck disable=SC2034
+-HADOOP_NEW_CONFIG=true
+-if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+-  # shellcheck disable=SC1090
+-  . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+-else
+-  echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
+-  exit 1
+-fi
+-
+-if [ $# = 0 ]; then
+-  hadoop_exit_with_usage 1
+-fi
+-
+-parse_args "${@}"
+-calculate_classpath
+-run_sls_generator
+-
+diff --git a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh b/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
+deleted file mode 100644
+index 5a9de89ae69..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh
++++ /dev/null
+@@ -1,146 +0,0 @@
+-#!/usr/bin/env bash
+-#
+-#  Licensed under the Apache License, Version 2.0 (the "License");
+-#  you may not use this file except in compliance with the License.
+-#  You may obtain a copy of the License at
+-#
+-#    http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License. See accompanying LICENSE file.
+-#
+-
+-function hadoop_usage()
+-{
+-  echo "Usage: slsrun.sh <OPTIONS> "
+-  echo "                 --tracetype=<SYNTH | SLS | RUMEN>"
+-  echo "                 --tracelocation=<FILE1,FILE2,...>"
+-  echo "                 (deprecated --input-rumen=<FILE1,FILE2,...>  | --input-sls=<FILE1,FILE2,...>)"
+-  echo "                 --output-dir=<SLS_SIMULATION_OUTPUT_DIRECTORY>"
+-  echo "                 [--nodes=<SLS_NODES_FILE>]"
+-  echo "                 [--track-jobs=<JOBID1,JOBID2,...>]"
+-  echo "                 [--print-simulation]"
+-}
+-
+-function parse_args()
+-{
+-  for i in "$@"; do
+-    case $i in
+-      --input-rumen=*)
+-        inputrumen=${i#*=}
+-      ;;
+-      --input-sls=*)
+-        inputsls=${i#*=}
+-      ;;
+-      --tracetype=*)
+-        tracetype=${i#*=}
+-      ;;
+-      --tracelocation=*)
+-        tracelocation=${i#*=}
+-      ;;
+-      --output-dir=*)
+-        outputdir=${i#*=}
+-      ;;
+-      --nodes=*)
+-        nodes=${i#*=}
+-      ;;
+-      --track-jobs=*)
+-        trackjobs=${i#*=}
+-      ;;
+-      --print-simulation)
+-        printsimulation="true"
+-      ;;
+-      *)
+-        hadoop_error "ERROR: Invalid option ${i}"
+-        hadoop_exit_with_usage 1
+-      ;;
+-    esac
+-  done
+-
+-  if [[ -z "${inputrumen}" && -z "${inputsls}" && -z "${tracetype}" ]] ; then
+-    hadoop_error "ERROR: Either --input-rumen, --input-sls, or --tracetype (with --tracelocation) must be specified."
+-  fi
+-
+-  if [[ -n "${inputrumen}" && -n "${inputsls}" && -n "${tracetype}" ]] ; then
+-    hadoop_error "ERROR: Only specify one of --input-rumen, --input-sls, or --tracetype (with --tracelocation)"
+-  fi
+-
+-  if [[ -z "${outputdir}" ]] ; then
+-    hadoop_error "ERROR: The output directory --output-dir must be specified."
+-    hadoop_exit_with_usage 1
+-  fi
+-}
+-
+-function calculate_classpath
+-{
+-  hadoop_add_to_classpath_tools hadoop-sls
+-
+-  hadoop_add_classpath "${HADOOP_YARN_HOME}/${YARN_DIR}/timelineservice"'/*'
+-}
+-
+-function run_simulation() {
+-
+-  local args
+-
+-   if [[ "${inputsls}" != "" ]] ; then
+-        hadoop_add_param args -inputsls "-inputsls ${inputsls}"
+-   fi
+-   if [[ "${inputrumen}" != "" ]] ; then
+-        hadoop_add_param args -inputrumen "-inputrumen ${inputrumen}"
+-   fi
+-   if [[ "${tracetype}" != "" ]] ; then
+-        hadoop_add_param args -tracetype "-tracetype ${tracetype}"
+-        hadoop_add_param args -tracelocation "-tracelocation ${tracelocation}"
+-   fi
+-
+-  hadoop_add_param args -output "-output ${outputdir}"
+-
+-  if [[ -n "${nodes}" ]] ; then
+-    hadoop_add_param args -nodes "-nodes ${nodes}"
+-  fi
+-
+-  if [[ -n "${trackjobs}" ]] ; then
+-    hadoop_add_param args -trackjobs "-trackjobs ${trackjobs}"
+-  fi
+-
+-  if [[ "${printsimulation}" == "true" ]] ; then
+-    hadoop_add_param args -printsimulation "-printsimulation"
+-  fi
+-
+-  hadoop_add_client_opts
+-
+-  hadoop_finalize
+-  # shellcheck disable=SC2086
+-  hadoop_java_exec sls org.apache.hadoop.yarn.sls.SLSRunner ${args}
+-}
+-
+-# let's locate libexec...
+-if [[ -n "${HADOOP_HOME}" ]]; then
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${HADOOP_HOME}/libexec"
+-else
+-  this="${BASH_SOURCE-$0}"
+-  bin=$(cd -P -- "$(dirname -- "${this}")" >/dev/null && pwd -P)
+-  HADOOP_DEFAULT_LIBEXEC_DIR="${bin}/../../../../../libexec"
+-fi
+-
+-HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}"
+-# shellcheck disable=SC2034
+-HADOOP_NEW_CONFIG=true
+-if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then
+-  # shellcheck disable=SC1090
+-  . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+-else
+-  echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1
+-  exit 1
+-fi
+-
+-if [[ $# = 0 ]]; then
+-  hadoop_exit_with_usage 1
+-fi
+-
+-parse_args "${@}"
+-calculate_classpath
+-run_simulation
+diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
+deleted file mode 100644
+index 8e9af7549cd..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
++++ /dev/null
+@@ -1,10132 +0,0 @@
+-{
+-  "priority" : "NORMAL",
+-  "jobID" : "job_1369942127770_1205",
+-  "user" : "jenkins",
+-  "jobName" : "TeraGen",
+-  "submitTime" : 1371222054499,
+-  "finishTime" : 1371222153874,
+-  "queue" : "sls_queue_1",
+-  "mapTasks" : [ {
+-    "startTime" : 1371222059053,
+-    "taskID" : "task_1369942127770_1205_m_000000",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222078206,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061163,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222078206,
+-      "attemptID" : "attempt_1369942127770_1205_m_000000_0",
+-      "clockSplits" : [ 1481, 1481, 1481, 1481, 1481, 1481, 1169, 1064, 1064, 1173, 1197, 2485 ],
+-      "cpuUsages" : [ 1253, 1254, 1254, 1254, 1254, 1254, 1198, 1180, 1179, 984, 942, 1294 ],
+-      "vmemKbytes" : [ 113886, 341661, 569436, 797210, 1024985, 1252759, 1416845, 1424087, 1424088, 1424088, 1424087, 1424088 ],
+-      "physMemKbytes" : [ 24766, 74299, 123833, 173366, 222900, 272433, 308230, 310197, 310604, 309580, 305826, 302119 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 82,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14300,
+-        "virtualMemoryUsage" : 1458266112,
+-        "physicalMemoryUsage" : 308215808,
+-        "heapUsage" : 745406464
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 82,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059055,
+-    "taskID" : "task_1369942127770_1205_m_000001",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222076092,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061164,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222076092,
+-      "attemptID" : "attempt_1369942127770_1205_m_000001_0",
+-      "clockSplits" : [ 1621, 1621, 1622, 1621, 1622, 1457, 908, 908, 908, 2328, 150, 151 ],
+-      "cpuUsages" : [ 1306, 1307, 1307, 1306, 1307, 1264, 1119, 1119, 1119, 1020, 993, 993 ],
+-      "vmemKbytes" : [ 122129, 366389, 610648, 854907, 1099167, 1336974, 1409412, 1409411, 1409412, 1409412, 1409411, 1409412 ],
+-      "physMemKbytes" : [ 27010, 81032, 135053, 189074, 243096, 295613, 309560, 306611, 303663, 300925, 298639, 296368 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14160,
+-        "virtualMemoryUsage" : 1443237888,
+-        "physicalMemoryUsage" : 302317568,
+-        "heapUsage" : 745209856
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059055,
+-    "taskID" : "task_1369942127770_1205_m_000002",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222076916,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061159,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222076916,
+-      "attemptID" : "attempt_1369942127770_1205_m_000002_0",
+-      "clockSplits" : [ 1529, 1530, 1530, 1530, 1529, 1530, 1072, 975, 975, 2938, 269, 269 ],
+-      "cpuUsages" : [ 1266, 1266, 1267, 1266, 1267, 1266, 1172, 1152, 1151, 1056, 995, 996 ],
+-      "vmemKbytes" : [ 115166, 345498, 575831, 806163, 1036496, 1266828, 1418750, 1422271, 1422272, 1422272, 1422271, 1422272 ],
+-      "physMemKbytes" : [ 25182, 75547, 125913, 176278, 226644, 277009, 311047, 314183, 316587, 318060, 315880, 313328 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14260,
+-        "virtualMemoryUsage" : 1456406528,
+-        "physicalMemoryUsage" : 319447040,
+-        "heapUsage" : 740294656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059055,
+-    "taskID" : "task_1369942127770_1205_m_000003",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222078156,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061160,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222078156,
+-      "attemptID" : "attempt_1369942127770_1205_m_000003_0",
+-      "clockSplits" : [ 1473, 1473, 1473, 1473, 1474, 1473, 1250, 1064, 1065, 2986, 293, 294 ],
+-      "cpuUsages" : [ 1227, 1227, 1227, 1227, 1227, 1228, 1214, 1202, 1203, 1076, 966, 966 ],
+-      "vmemKbytes" : [ 111579, 334737, 557896, 781055, 1004214, 1227373, 1417243, 1440219, 1440220, 1440220, 1440219, 1440220 ],
+-      "physMemKbytes" : [ 24240, 72721, 121202, 169683, 218165, 266646, 308296, 315697, 318384, 320500, 319654, 318383 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14300,
+-        "virtualMemoryUsage" : 1474785280,
+-        "physicalMemoryUsage" : 325296128,
+-        "heapUsage" : 744161280
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059056,
+-    "taskID" : "task_1369942127770_1205_m_000004",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222077984,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061161,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222077984,
+-      "attemptID" : "attempt_1369942127770_1205_m_000004_0",
+-      "clockSplits" : [ 1441, 1441, 1441, 1441, 1441, 1441, 1297, 1139, 1139, 3202, 106, 107 ],
+-      "cpuUsages" : [ 1231, 1231, 1231, 1231, 1231, 1231, 1241, 1253, 1252, 1018, 920, 920 ],
+-      "vmemKbytes" : [ 110202, 330607, 551012, 771417, 991823, 1212228, 1407542, 1437667, 1437668, 1437668, 1437667, 1437668 ],
+-      "physMemKbytes" : [ 23865, 71596, 119328, 167059, 214790, 262521, 305059, 313396, 315497, 316328, 313564, 310583 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14350,
+-        "virtualMemoryUsage" : 1472172032,
+-        "physicalMemoryUsage" : 316485632,
+-        "heapUsage" : 740163584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059056,
+-    "taskID" : "task_1369942127770_1205_m_000005",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222078263,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222061161,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222078263,
+-      "attemptID" : "attempt_1369942127770_1205_m_000005_0",
+-      "clockSplits" : [ 1467, 1467, 1467, 1467, 1468, 1467, 1222, 1044, 1043, 3239, 138, 138 ],
+-      "cpuUsages" : [ 1228, 1229, 1228, 1229, 1229, 1228, 1187, 1157, 1157, 1036, 951, 951 ],
+-      "vmemKbytes" : [ 109716, 329150, 548584, 768017, 987451, 1206884, 1389627, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 24267, 72802, 121338, 169873, 218408, 266943, 307379, 311778, 311871, 311950, 311973, 311991 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14290,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 319471616,
+-        "heapUsage" : 732299264
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059056,
+-    "taskID" : "task_1369942127770_1205_m_000006",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080381,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061165,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080381,
+-      "attemptID" : "attempt_1369942127770_1205_m_000006_0",
+-      "clockSplits" : [ 2346, 2347, 2347, 2347, 1888, 1412, 1285, 962, 962, 962, 1936, 416 ],
+-      "cpuUsages" : [ 1386, 1386, 1386, 1386, 1216, 1041, 1052, 1082, 1082, 1081, 1185, 1217 ],
+-      "vmemKbytes" : [ 157018, 471054, 785090, 1099125, 1375327, 1416027, 1416046, 1416396, 1416871, 1417345, 1417679, 1417692 ],
+-      "physMemKbytes" : [ 32211, 96633, 161055, 225476, 282302, 291840, 293174, 293917, 294444, 294970, 293975, 289481 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14500,
+-        "virtualMemoryUsage" : 1451716608,
+-        "physicalMemoryUsage" : 294055936,
+-        "heapUsage" : 740032512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059057,
+-    "taskID" : "task_1369942127770_1205_m_000007",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080174,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061168,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080174,
+-      "attemptID" : "attempt_1369942127770_1205_m_000007_0",
+-      "clockSplits" : [ 1912, 1913, 1913, 1913, 1913, 1395, 1079, 1080, 1110, 1121, 1122, 2528 ],
+-      "cpuUsages" : [ 1309, 1309, 1309, 1309, 1309, 1145, 1046, 1045, 1004, 988, 989, 1278 ],
+-      "vmemKbytes" : [ 133705, 401116, 668527, 935938, 1203349, 1418939, 1437988, 1437987, 1437988, 1437988, 1437987, 1437988 ],
+-      "physMemKbytes" : [ 29116, 87350, 145583, 203816, 262051, 309017, 313251, 313344, 312660, 309967, 307170, 305234 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14040,
+-        "virtualMemoryUsage" : 1472499712,
+-        "physicalMemoryUsage" : 312479744,
+-        "heapUsage" : 723451904
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059057,
+-    "taskID" : "task_1369942127770_1205_m_000008",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080738,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061150,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080738,
+-      "attemptID" : "attempt_1369942127770_1205_m_000008_0",
+-      "clockSplits" : [ 2192, 2193, 2192, 2193, 2192, 1226, 1140, 1210, 1721, 2853, 235, 236 ],
+-      "cpuUsages" : [ 1340, 1340, 1340, 1341, 1340, 1169, 1153, 1147, 1096, 1086, 1059, 1059 ],
+-      "vmemKbytes" : [ 140265, 420795, 701325, 981854, 1262385, 1424418, 1425336, 1425335, 1425336, 1425336, 1425335, 1425336 ],
+-      "physMemKbytes" : [ 29311, 87935, 146559, 205182, 263807, 298779, 301592, 304203, 305246, 305221, 304062, 302477 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14470,
+-        "virtualMemoryUsage" : 1459544064,
+-        "physicalMemoryUsage" : 308924416,
+-        "heapUsage" : 742719488
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059057,
+-    "taskID" : "task_1369942127770_1205_m_000009",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080294,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061167,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080294,
+-      "attemptID" : "attempt_1369942127770_1205_m_000009_0",
+-      "clockSplits" : [ 2681, 2682, 2682, 2682, 931, 900, 900, 1034, 1187, 1187, 1891, 364 ],
+-      "cpuUsages" : [ 1476, 1476, 1476, 1476, 1162, 1156, 1157, 1127, 1092, 1093, 1116, 1123 ],
+-      "vmemKbytes" : [ 176827, 530481, 884136, 1237790, 1420639, 1420691, 1420692, 1420691, 1420692, 1420692, 1420691, 1420692 ],
+-      "physMemKbytes" : [ 38211, 114635, 191059, 267482, 307826, 309555, 311274, 312396, 309356, 305514, 301727, 298067 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14930,
+-        "virtualMemoryUsage" : 1454788608,
+-        "physicalMemoryUsage" : 303349760,
+-        "heapUsage" : 740229120
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059058,
+-    "taskID" : "task_1369942127770_1205_m_000010",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222079719,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061175,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222079719,
+-      "attemptID" : "attempt_1369942127770_1205_m_000010_0",
+-      "clockSplits" : [ 3057, 3058, 3057, 1958, 885, 884, 885, 835, 833, 832, 1597, 655 ],
+-      "cpuUsages" : [ 1654, 1654, 1654, 1336, 1024, 1025, 1024, 1025, 1025, 1025, 1040, 1124 ],
+-      "vmemKbytes" : [ 201676, 605031, 1008386, 1360094, 1409336, 1409383, 1409432, 1409459, 1409460, 1409460, 1409459, 1409460 ],
+-      "physMemKbytes" : [ 44104, 132313, 220523, 297458, 308371, 308546, 308722, 308946, 309231, 309516, 309798, 309880 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14610,
+-        "virtualMemoryUsage" : 1443287040,
+-        "physicalMemoryUsage" : 317300736,
+-        "heapUsage" : 740556800
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059058,
+-    "taskID" : "task_1369942127770_1205_m_000011",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080741,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061174,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080741,
+-      "attemptID" : "attempt_1369942127770_1205_m_000011_0",
+-      "clockSplits" : [ 2091, 2091, 2092, 2091, 2092, 1144, 1117, 1175, 1617, 3521, 265, 266 ],
+-      "cpuUsages" : [ 1356, 1356, 1356, 1356, 1356, 1094, 1087, 1096, 1172, 1157, 1062, 1062 ],
+-      "vmemKbytes" : [ 141112, 423336, 705560, 987783, 1270008, 1419228, 1419348, 1419347, 1419348, 1419348, 1419347, 1419348 ],
+-      "physMemKbytes" : [ 30717, 92154, 153590, 215025, 276462, 309084, 309404, 309697, 309866, 309922, 307623, 303864 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14510,
+-        "virtualMemoryUsage" : 1453412352,
+-        "physicalMemoryUsage" : 309231616,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059058,
+-    "taskID" : "task_1369942127770_1205_m_000012",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080631,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061173,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080631,
+-      "attemptID" : "attempt_1369942127770_1205_m_000012_0",
+-      "clockSplits" : [ 2152, 2152, 2152, 2152, 2152, 1134, 1107, 1143, 1402, 1403, 2199, 298 ],
+-      "cpuUsages" : [ 1365, 1365, 1365, 1365, 1366, 1024, 1015, 1026, 1101, 1102, 1136, 1140 ],
+-      "vmemKbytes" : [ 140246, 420739, 701232, 981725, 1262218, 1409325, 1409412, 1409411, 1409412, 1409412, 1409411, 1409412 ],
+-      "physMemKbytes" : [ 29429, 88287, 147145, 206002, 264861, 296705, 298774, 300812, 301651, 301721, 300159, 296175 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14370,
+-        "virtualMemoryUsage" : 1443237888,
+-        "physicalMemoryUsage" : 301232128,
+-        "heapUsage" : 745209856
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059059,
+-    "taskID" : "task_1369942127770_1205_m_000013",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080047,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222061177,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080047,
+-      "attemptID" : "attempt_1369942127770_1205_m_000013_0",
+-      "clockSplits" : [ 2415, 2415, 2416, 2415, 1669, 929, 929, 927, 906, 905, 906, 2031 ],
+-      "cpuUsages" : [ 1582, 1583, 1583, 1583, 1323, 1064, 1064, 1052, 899, 899, 899, 1289 ],
+-      "vmemKbytes" : [ 156678, 470034, 783390, 1096746, 1370593, 1409423, 1409424, 1409423, 1409424, 1409424, 1409423, 1409424 ],
+-      "physMemKbytes" : [ 33111, 99335, 165559, 231782, 289734, 298476, 299089, 299699, 299882, 299738, 299593, 299448 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14820,
+-        "virtualMemoryUsage" : 1443250176,
+-        "physicalMemoryUsage" : 306561024,
+-        "heapUsage" : 740622336
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059060,
+-    "taskID" : "task_1369942127770_1205_m_000014",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080403,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061182,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080403,
+-      "attemptID" : "attempt_1369942127770_1205_m_000014_0",
+-      "clockSplits" : [ 2246, 2247, 2247, 2246, 1771, 975, 975, 1058, 1672, 3290, 244, 244 ],
+-      "cpuUsages" : [ 1482, 1483, 1483, 1483, 1333, 1082, 1081, 1076, 1036, 1050, 1095, 1096 ],
+-      "vmemKbytes" : [ 153262, 459788, 766314, 1072839, 1357907, 1417931, 1417932, 1417931, 1417932, 1417932, 1417931, 1417932 ],
+-      "physMemKbytes" : [ 32426, 97279, 162133, 226986, 287711, 305142, 311027, 316866, 318854, 318343, 317108, 315553 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14780,
+-        "virtualMemoryUsage" : 1451962368,
+-        "physicalMemoryUsage" : 322330624,
+-        "heapUsage" : 668336128
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059060,
+-    "taskID" : "task_1369942127770_1205_m_000015",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080385,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061182,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080385,
+-      "attemptID" : "attempt_1369942127770_1205_m_000015_0",
+-      "clockSplits" : [ 2112, 2113, 2112, 2113, 2112, 1311, 1311, 1686, 1973, 1973, 191, 191 ],
+-      "cpuUsages" : [ 1520, 1520, 1521, 1520, 1520, 1067, 1068, 1204, 1311, 863, 843, 843 ],
+-      "vmemKbytes" : [ 142431, 427293, 712156, 997018, 1281881, 1423875, 1423876, 1423875, 1423876, 1423876, 1423875, 1423876 ],
+-      "physMemKbytes" : [ 31512, 94536, 157561, 220586, 283611, 315540, 316563, 317494, 317993, 317677, 316454, 315229 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14800,
+-        "virtualMemoryUsage" : 1458049024,
+-        "physicalMemoryUsage" : 322166784,
+-        "heapUsage" : 663617536
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059060,
+-    "taskID" : "task_1369942127770_1205_m_000016",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080314,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061183,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080314,
+-      "attemptID" : "attempt_1369942127770_1205_m_000016_0",
+-      "clockSplits" : [ 2331, 2332, 2332, 2332, 1845, 1142, 1143, 1145, 1148, 1148, 1817, 406 ],
+-      "cpuUsages" : [ 1376, 1377, 1377, 1377, 1290, 1165, 1165, 1121, 1081, 1082, 1000, 979 ],
+-      "vmemKbytes" : [ 154918, 464754, 774590, 1084425, 1368248, 1422215, 1422216, 1422215, 1422216, 1422216, 1422215, 1422216 ],
+-      "physMemKbytes" : [ 31161, 93486, 155811, 218135, 275753, 291774, 298030, 303393, 303746, 303320, 303009, 302957 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14390,
+-        "virtualMemoryUsage" : 1456349184,
+-        "physicalMemoryUsage" : 310206464,
+-        "heapUsage" : 663683072
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059061,
+-    "taskID" : "task_1369942127770_1205_m_000017",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222079863,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061183,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222079863,
+-      "attemptID" : "attempt_1369942127770_1205_m_000017_0",
+-      "clockSplits" : [ 2120, 2120, 2121, 2120, 2120, 1291, 1115, 1115, 847, 837, 837, 2031 ],
+-      "cpuUsages" : [ 1314, 1314, 1314, 1314, 1314, 1108, 1065, 1065, 889, 882, 882, 1289 ],
+-      "vmemKbytes" : [ 136175, 408526, 680878, 953229, 1225581, 1405242, 1409412, 1409411, 1409412, 1409412, 1409411, 1409412 ],
+-      "physMemKbytes" : [ 25452, 76356, 127261, 178166, 229071, 262663, 263476, 263509, 263661, 263953, 264244, 264609 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13750,
+-        "virtualMemoryUsage" : 1443237888,
+-        "physicalMemoryUsage" : 271626240,
+-        "heapUsage" : 592183296
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059061,
+-    "taskID" : "task_1369942127770_1205_m_000018",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080024,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061180,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080024,
+-      "attemptID" : "attempt_1369942127770_1205_m_000018_0",
+-      "clockSplits" : [ 2373, 2374, 2374, 2373, 1909, 925, 926, 925, 890, 882, 882, 2005 ],
+-      "cpuUsages" : [ 1613, 1614, 1613, 1614, 1458, 1128, 1127, 1128, 917, 876, 876, 1256 ],
+-      "vmemKbytes" : [ 151697, 455092, 758487, 1061882, 1349627, 1419523, 1419524, 1419523, 1419524, 1419524, 1419523, 1419524 ],
+-      "physMemKbytes" : [ 30652, 91958, 153263, 214568, 272912, 290016, 293889, 297762, 300019, 299336, 298590, 297860 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 15220,
+-        "virtualMemoryUsage" : 1453592576,
+-        "physicalMemoryUsage" : 304734208,
+-        "heapUsage" : 665190400
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059061,
+-    "taskID" : "task_1369942127770_1205_m_000019",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222081077,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061181,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222081077,
+-      "attemptID" : "attempt_1369942127770_1205_m_000019_0",
+-      "clockSplits" : [ 2353, 2354, 2353, 2354, 1929, 1071, 1072, 1395, 2209, 2348, 224, 224 ],
+-      "cpuUsages" : [ 1428, 1429, 1429, 1428, 1376, 1271, 1270, 1203, 1037, 908, 890, 891 ],
+-      "vmemKbytes" : [ 152162, 456488, 760814, 1065139, 1352750, 1420763, 1420764, 1420763, 1420764, 1420764, 1420763, 1420764 ],
+-      "physMemKbytes" : [ 32961, 98884, 164808, 230731, 293309, 311938, 316956, 321727, 322219, 321123, 319983, 318842 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14560,
+-        "virtualMemoryUsage" : 1454862336,
+-        "physicalMemoryUsage" : 325910528,
+-        "heapUsage" : 663552000
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059062,
+-    "taskID" : "task_1369942127770_1205_m_000020",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080321,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061184,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080321,
+-      "attemptID" : "attempt_1369942127770_1205_m_000020_0",
+-      "clockSplits" : [ 2427, 2428, 2428, 2428, 2102, 1517, 1285, 748, 748, 747, 1610, 664 ],
+-      "cpuUsages" : [ 1443, 1443, 1443, 1443, 1389, 1289, 1200, 994, 995, 995, 1024, 1202 ],
+-      "vmemKbytes" : [ 153064, 459194, 765324, 1071453, 1357999, 1421147, 1421148, 1421147, 1421148, 1421148, 1421147, 1421148 ],
+-      "physMemKbytes" : [ 29737, 89213, 148688, 208163, 263841, 276188, 276277, 276205, 276076, 275947, 275853, 277999 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14860,
+-        "virtualMemoryUsage" : 1455255552,
+-        "physicalMemoryUsage" : 286453760,
+-        "heapUsage" : 616431616
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059062,
+-    "taskID" : "task_1369942127770_1205_m_000021",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222081794,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222061178,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222081794,
+-      "attemptID" : "attempt_1369942127770_1205_m_000021_0",
+-      "clockSplits" : [ 2597, 2597, 2597, 2597, 1562, 1164, 1163, 5456, 198, 197, 197, 198 ],
+-      "cpuUsages" : [ 1446, 1447, 1447, 1447, 1261, 1190, 1189, 983, 897, 898, 897, 898 ],
+-      "vmemKbytes" : [ 164696, 494089, 823482, 1152875, 1396412, 1409139, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 32676, 98028, 163380, 228731, 280650, 296453, 310265, 319456, 319884, 318033, 316181, 314330 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14060,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 320843776,
+-        "heapUsage" : 656801792
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059062,
+-    "taskID" : "task_1369942127770_1205_m_000022",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080729,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061185,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080729,
+-      "attemptID" : "attempt_1369942127770_1205_m_000022_0",
+-      "clockSplits" : [ 2144, 2145, 2144, 2145, 2144, 1183, 1111, 1280, 2538, 2355, 174, 175 ],
+-      "cpuUsages" : [ 1386, 1387, 1386, 1387, 1386, 1209, 1196, 1179, 1059, 978, 968, 969 ],
+-      "vmemKbytes" : [ 140664, 421992, 703320, 984647, 1265976, 1425650, 1426340, 1426339, 1426340, 1426340, 1426339, 1426340 ],
+-      "physMemKbytes" : [ 29534, 88604, 147673, 206742, 265812, 300766, 304205, 307483, 308781, 307931, 305761, 303579 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14490,
+-        "virtualMemoryUsage" : 1460572160,
+-        "physicalMemoryUsage" : 309747712,
+-        "heapUsage" : 742064128
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059063,
+-    "taskID" : "task_1369942127770_1205_m_000023",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080052,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061186,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080052,
+-      "attemptID" : "attempt_1369942127770_1205_m_000023_0",
+-      "clockSplits" : [ 1873, 1874, 1874, 1874, 1874, 1622, 923, 924, 924, 1161, 1185, 2750 ],
+-      "cpuUsages" : [ 1302, 1303, 1302, 1303, 1303, 1229, 1028, 1027, 1027, 755, 727, 1274 ],
+-      "vmemKbytes" : [ 124166, 372498, 620831, 869164, 1117497, 1357087, 1424104, 1424103, 1424104, 1424104, 1424103, 1424104 ],
+-      "physMemKbytes" : [ 26868, 80607, 134345, 188083, 241822, 293671, 308210, 308261, 308313, 307095, 304076, 301141 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13580,
+-        "virtualMemoryUsage" : 1458282496,
+-        "physicalMemoryUsage" : 307507200,
+-        "heapUsage" : 736362496
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059063,
+-    "taskID" : "task_1369942127770_1205_m_000024",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080302,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061188,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080302,
+-      "attemptID" : "attempt_1369942127770_1205_m_000024_0",
+-      "clockSplits" : [ 2106, 2107, 2107, 2106, 2107, 1429, 1184, 1182, 1159, 1159, 1920, 542 ],
+-      "cpuUsages" : [ 1331, 1331, 1332, 1331, 1331, 1174, 1116, 1098, 957, 957, 1087, 1445 ],
+-      "vmemKbytes" : [ 134890, 404670, 674451, 944231, 1214012, 1410949, 1420432, 1420431, 1420432, 1420432, 1420431, 1420432 ],
+-      "physMemKbytes" : [ 28316, 84948, 141580, 198211, 254844, 296319, 298789, 299283, 299498, 299534, 299556, 299285 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14490,
+-        "virtualMemoryUsage" : 1454522368,
+-        "physicalMemoryUsage" : 306270208,
+-        "heapUsage" : 742981632
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059063,
+-    "taskID" : "task_1369942127770_1205_m_000025",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080632,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061188,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080632,
+-      "attemptID" : "attempt_1369942127770_1205_m_000025_0",
+-      "clockSplits" : [ 1860, 1860, 1860, 1861, 1860, 1610, 1421, 3187, 3528, 128, 128, 129 ],
+-      "cpuUsages" : [ 1300, 1300, 1300, 1300, 1301, 1224, 1167, 1370, 1043, 928, 928, 929 ],
+-      "vmemKbytes" : [ 130800, 392403, 654005, 915607, 1177210, 1396290, 1420456, 1420455, 1420456, 1420456, 1420455, 1420456 ],
+-      "physMemKbytes" : [ 29090, 87270, 145451, 203632, 261813, 309693, 310356, 306542, 311703, 310079, 308271, 306464 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14090,
+-        "virtualMemoryUsage" : 1454546944,
+-        "physicalMemoryUsage" : 312893440,
+-        "heapUsage" : 737214464
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059063,
+-    "taskID" : "task_1369942127770_1205_m_000026",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080672,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061191,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080672,
+-      "attemptID" : "attempt_1369942127770_1205_m_000026_0",
+-      "clockSplits" : [ 2007, 2007, 2008, 2007, 2007, 1238, 1132, 1218, 1845, 3515, 225, 225 ],
+-      "cpuUsages" : [ 1331, 1332, 1332, 1332, 1332, 1209, 1192, 1188, 1165, 1134, 1096, 1097 ],
+-      "vmemKbytes" : [ 137621, 412863, 688106, 963348, 1238591, 1407402, 1409404, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 30191, 90575, 150959, 211342, 271726, 307874, 306038, 303761, 302896, 302808, 301704, 300384 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14740,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 306917376,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059064,
+-    "taskID" : "task_1369942127770_1205_m_000027",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222081541,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061193,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222081541,
+-      "attemptID" : "attempt_1369942127770_1205_m_000027_0",
+-      "clockSplits" : [ 1920, 1921, 1921, 1920, 1921, 1430, 1280, 3682, 1168, 780, 780, 1620 ],
+-      "cpuUsages" : [ 1362, 1362, 1362, 1362, 1363, 1239, 1201, 1547, 995, 930, 929, 1238 ],
+-      "vmemKbytes" : [ 137700, 413102, 688504, 963905, 1239308, 1433933, 1441480, 1441479, 1441480, 1441480, 1441479, 1441480 ],
+-      "physMemKbytes" : [ 29565, 88698, 147830, 206962, 266095, 308482, 312089, 314493, 316975, 315186, 313383, 311581 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14890,
+-        "virtualMemoryUsage" : 1476075520,
+-        "physicalMemoryUsage" : 318078976,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059064,
+-    "taskID" : "task_1369942127770_1205_m_000028",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080630,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061190,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080630,
+-      "attemptID" : "attempt_1369942127770_1205_m_000028_0",
+-      "clockSplits" : [ 2031, 2031, 2032, 2031, 2032, 1270, 1145, 1198, 1543, 3690, 212, 213 ],
+-      "cpuUsages" : [ 1318, 1318, 1319, 1318, 1318, 1074, 1032, 1028, 997, 1001, 1033, 1034 ],
+-      "vmemKbytes" : [ 138260, 414780, 691301, 967821, 1244342, 1419237, 1422052, 1422051, 1422052, 1422052, 1422051, 1422052 ],
+-      "physMemKbytes" : [ 29586, 88758, 147930, 207102, 266275, 304866, 308604, 311744, 312930, 312923, 312015, 310530 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13790,
+-        "virtualMemoryUsage" : 1456181248,
+-        "physicalMemoryUsage" : 317222912,
+-        "heapUsage" : 744620032
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059064,
+-    "taskID" : "task_1369942127770_1205_m_000029",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222080196,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222061192,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222080196,
+-      "attemptID" : "attempt_1369942127770_1205_m_000029_0",
+-      "clockSplits" : [ 2041, 2041, 2042, 2041, 2041, 1432, 1199, 1193, 1146, 1147, 2130, 545 ],
+-      "cpuUsages" : [ 1372, 1372, 1372, 1373, 1372, 1165, 1087, 1080, 1032, 1033, 1054, 1088 ],
+-      "vmemKbytes" : [ 135224, 405672, 676121, 946570, 1217019, 1416578, 1426876, 1426875, 1426876, 1426876, 1426875, 1426876 ],
+-      "physMemKbytes" : [ 28101, 84303, 140506, 196709, 252912, 295457, 301536, 305584, 305557, 302915, 300478, 299963 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14400,
+-        "virtualMemoryUsage" : 1461121024,
+-        "physicalMemoryUsage" : 307138560,
+-        "heapUsage" : 740556800
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059065,
+-    "taskID" : "task_1369942127770_1205_m_000030",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222095399,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222077057,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222095399,
+-      "attemptID" : "attempt_1369942127770_1205_m_000030_0",
+-      "clockSplits" : [ 2140, 2140, 2140, 2140, 1862, 1004, 1003, 984, 822, 822, 822, 2455 ],
+-      "cpuUsages" : [ 1207, 1207, 1207, 1207, 1120, 851, 851, 857, 906, 905, 906, 1366 ],
+-      "vmemKbytes" : [ 149343, 448029, 746716, 1045403, 1335142, 1420323, 1420324, 1420323, 1420324, 1420324, 1420323, 1420324 ],
+-      "physMemKbytes" : [ 31929, 95787, 159645, 223502, 285438, 303417, 303091, 302749, 300865, 297952, 295038, 292244 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12590,
+-        "virtualMemoryUsage" : 1454411776,
+-        "physicalMemoryUsage" : 298463232,
+-        "heapUsage" : 728760320
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059065,
+-    "taskID" : "task_1369942127770_1205_m_000031",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222101752,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222078069,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222101752,
+-      "attemptID" : "attempt_1369942127770_1205_m_000031_0",
+-      "clockSplits" : [ 2274, 2274, 2274, 2274, 3454, 978, 978, 1034, 1463, 1462, 2573, 529 ],
+-      "cpuUsages" : [ 1334, 1334, 1334, 1335, 1214, 1033, 1033, 1023, 944, 943, 1021, 1022 ],
+-      "vmemKbytes" : [ 179277, 537833, 896388, 1254943, 1440327, 1440379, 1440380, 1440379, 1440380, 1440380, 1440379, 1440380 ],
+-      "physMemKbytes" : [ 38140, 114421, 190703, 266984, 306533, 307559, 308886, 310183, 308915, 305992, 304523, 304521 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13810,
+-        "virtualMemoryUsage" : 1474949120,
+-        "physicalMemoryUsage" : 315183104,
+-        "heapUsage" : 728956928
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059065,
+-    "taskID" : "task_1369942127770_1205_m_000032",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102468,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222080073,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102468,
+-      "attemptID" : "attempt_1369942127770_1205_m_000032_0",
+-      "clockSplits" : [ 2030, 2030, 2031, 2030, 1666, 982, 982, 1072, 1743, 1650, 1476, 4204 ],
+-      "cpuUsages" : [ 1109, 1109, 1109, 1110, 1120, 1139, 1140, 1119, 972, 937, 873, 1313 ],
+-      "vmemKbytes" : [ 153120, 459362, 765604, 1071845, 1359504, 1424519, 1424520, 1424519, 1424520, 1424520, 1424519, 1424520 ],
+-      "physMemKbytes" : [ 32822, 98466, 164110, 229754, 291374, 304780, 304107, 303437, 303182, 302954, 299856, 296038 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13420,
+-        "virtualMemoryUsage" : 1458708480,
+-        "physicalMemoryUsage" : 307167232,
+-        "heapUsage" : 728825856
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059065,
+-    "taskID" : "task_1369942127770_1205_m_000033",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222101998,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222080074,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222101998,
+-      "attemptID" : "attempt_1369942127770_1205_m_000033_0",
+-      "clockSplits" : [ 2253, 2254, 2254, 2254, 1075, 1055, 1055, 1607, 1658, 1287, 1210, 3957 ],
+-      "cpuUsages" : [ 1286, 1287, 1287, 1287, 1060, 1056, 1056, 1356, 1385, 1130, 1076, 1364 ],
+-      "vmemKbytes" : [ 176727, 530182, 883638, 1237093, 1419839, 1419891, 1419892, 1419891, 1419892, 1419892, 1419891, 1419892 ],
+-      "physMemKbytes" : [ 34968, 104906, 174844, 244781, 281486, 282625, 283754, 284431, 284483, 285884, 289832, 293683 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14630,
+-        "virtualMemoryUsage" : 1453969408,
+-        "physicalMemoryUsage" : 301670400,
+-        "heapUsage" : 677380096
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059066,
+-    "taskID" : "task_1369942127770_1205_m_000034",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102416,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222080074,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102416,
+-      "attemptID" : "attempt_1369942127770_1205_m_000034_0",
+-      "clockSplits" : [ 2608, 2609, 2608, 2609, 1753, 770, 771, 770, 856, 994, 994, 3824 ],
+-      "cpuUsages" : [ 1296, 1297, 1296, 1297, 1205, 1099, 1098, 1099, 1020, 889, 890, 1044 ],
+-      "vmemKbytes" : [ 158696, 476089, 793483, 1110876, 1393919, 1439299, 1439300, 1439299, 1439300, 1439300, 1439299, 1439300 ],
+-      "physMemKbytes" : [ 34127, 102381, 170635, 238889, 299969, 311412, 313378, 315343, 317033, 315889, 314000, 312155 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13820,
+-        "virtualMemoryUsage" : 1473843200,
+-        "physicalMemoryUsage" : 319066112,
+-        "heapUsage" : 740556800
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059066,
+-    "taskID" : "task_1369942127770_1205_m_000035",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102415,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222081100,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102415,
+-      "attemptID" : "attempt_1369942127770_1205_m_000035_0",
+-      "clockSplits" : [ 4636, 4637, 1169, 1033, 1033, 670, 655, 655, 655, 3321, 143, 143 ],
+-      "cpuUsages" : [ 1717, 1718, 1013, 985, 986, 885, 881, 881, 881, 908, 1012, 1013 ],
+-      "vmemKbytes" : [ 348902, 1046707, 1421400, 1421895, 1421896, 1421895, 1421896, 1421895, 1421896, 1421896, 1421895, 1421896 ],
+-      "physMemKbytes" : [ 71074, 213222, 292772, 299823, 306780, 310573, 310648, 310717, 310786, 310854, 310865, 310851 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13200,
+-        "virtualMemoryUsage" : 1456021504,
+-        "physicalMemoryUsage" : 318390272,
+-        "heapUsage" : 731447296
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059066,
+-    "taskID" : "task_1369942127770_1205_m_000036",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222125169,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222081101,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222125169,
+-      "attemptID" : "attempt_1369942127770_1205_m_000036_0",
+-      "clockSplits" : [ 6230, 3745, 1243, 1242, 1250, 1249, 1335, 1441, 1332, 1024, 1024, 22949 ],
+-      "cpuUsages" : [ 2117, 1566, 1010, 1011, 961, 960, 1002, 1055, 988, 801, 801, 1438 ],
+-      "vmemKbytes" : [ 474617, 1306098, 1425656, 1425655, 1425656, 1425655, 1425656, 1425655, 1425656, 1425656, 1425655, 1425656 ],
+-      "physMemKbytes" : [ 88814, 246089, 280314, 293875, 300976, 301213, 301436, 301555, 301570, 299938, 297659, 295692 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13710,
+-        "virtualMemoryUsage" : 1459871744,
+-        "physicalMemoryUsage" : 303833088,
+-        "heapUsage" : 727973888
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059067,
+-    "taskID" : "task_1369942127770_1205_m_000037",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103766,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222081107,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103766,
+-      "attemptID" : "attempt_1369942127770_1205_m_000037_0",
+-      "clockSplits" : [ 5242, 4571, 1409, 1409, 1234, 1232, 1096, 946, 945, 2922, 485, 485 ],
+-      "cpuUsages" : [ 1863, 1705, 964, 963, 1018, 1018, 961, 896, 896, 892, 877, 877 ],
+-      "vmemKbytes" : [ 390265, 1158821, 1424332, 1424331, 1424332, 1424331, 1424332, 1424331, 1424332, 1424332, 1424331, 1424332 ],
+-      "physMemKbytes" : [ 77364, 229859, 288579, 297802, 302713, 303041, 303341, 303445, 303514, 303521, 301077, 297356 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13440,
+-        "virtualMemoryUsage" : 1458515968,
+-        "physicalMemoryUsage" : 303296512,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059067,
+-    "taskID" : "task_1369942127770_1205_m_000038",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102985,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222081108,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102985,
+-      "attemptID" : "attempt_1369942127770_1205_m_000038_0",
+-      "clockSplits" : [ 3604, 3605, 2556, 894, 894, 894, 1661, 1683, 801, 800, 800, 3680 ],
+-      "cpuUsages" : [ 1519, 1519, 1354, 1093, 1093, 1093, 1206, 1172, 767, 766, 766, 1152 ],
+-      "vmemKbytes" : [ 269653, 808959, 1307904, 1409271, 1409272, 1409271, 1409272, 1409271, 1409272, 1409272, 1409271, 1409272 ],
+-      "physMemKbytes" : [ 56075, 168226, 272040, 293728, 294479, 295228, 297304, 301666, 302286, 300462, 298637, 296864 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13500,
+-        "virtualMemoryUsage" : 1443094528,
+-        "physicalMemoryUsage" : 303415296,
+-        "heapUsage" : 734986240
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059067,
+-    "taskID" : "task_1369942127770_1205_m_000039",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102412,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222081122,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102412,
+-      "attemptID" : "attempt_1369942127770_1205_m_000039_0",
+-      "clockSplits" : [ 2243, 2243, 2243, 2243, 1297, 1281, 1209, 1149, 1148, 1142, 1139, 1139 ],
+-      "cpuUsages" : [ 1346, 1347, 1347, 1346, 1136, 1131, 1212, 1279, 1278, 996, 906, 906 ],
+-      "vmemKbytes" : [ 176693, 530079, 883466, 1236853, 1419563, 1419615, 1419616, 1419615, 1419616, 1419616, 1419615, 1419616 ],
+-      "physMemKbytes" : [ 38075, 114226, 190377, 266528, 305978, 306151, 306399, 307073, 307808, 308344, 308411, 308460 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14520,
+-        "virtualMemoryUsage" : 1453686784,
+-        "physicalMemoryUsage" : 315822080,
+-        "heapUsage" : 732823552
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059068,
+-    "taskID" : "task_1369942127770_1205_m_000040",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103554,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222081118,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103554,
+-      "attemptID" : "attempt_1369942127770_1205_m_000040_0",
+-      "clockSplits" : [ 4372, 4372, 2703, 1678, 1229, 1040, 1041, 902, 737, 738, 738, 2881 ],
+-      "cpuUsages" : [ 1756, 1756, 1411, 1200, 1199, 1198, 1199, 1027, 823, 823, 823, 1025 ],
+-      "vmemKbytes" : [ 298429, 895288, 1377502, 1420639, 1420640, 1420639, 1420640, 1420639, 1420640, 1420640, 1420639, 1420640 ],
+-      "physMemKbytes" : [ 58537, 175611, 270284, 279159, 280291, 283392, 286616, 290044, 294932, 300108, 305284, 310287 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14240,
+-        "virtualMemoryUsage" : 1454735360,
+-        "physicalMemoryUsage" : 319156224,
+-        "heapUsage" : 678690816
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059068,
+-    "taskID" : "task_1369942127770_1205_m_000041",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222101748,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222081109,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222101748,
+-      "attemptID" : "attempt_1369942127770_1205_m_000041_0",
+-      "clockSplits" : [ 3312, 3313, 3219, 801, 802, 802, 802, 889, 889, 889, 2693, 837 ],
+-      "cpuUsages" : [ 1508, 1509, 1490, 985, 985, 985, 986, 1108, 1109, 1108, 971, 846 ],
+-      "vmemKbytes" : [ 242835, 728505, 1213832, 1438767, 1438768, 1438767, 1438768, 1438767, 1438768, 1438768, 1438767, 1438768 ],
+-      "physMemKbytes" : [ 52179, 156537, 260822, 309253, 309436, 309618, 309801, 308717, 306403, 304088, 302092, 301832 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13690,
+-        "virtualMemoryUsage" : 1473298432,
+-        "physicalMemoryUsage" : 309014528,
+-        "heapUsage" : 723976192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059068,
+-    "taskID" : "task_1369942127770_1205_m_000042",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103767,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222081119,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103767,
+-      "attemptID" : "attempt_1369942127770_1205_m_000042_0",
+-      "clockSplits" : [ 3561, 3561, 3262, 2606, 888, 859, 859, 1003, 1314, 1315, 3006, 196 ],
+-      "cpuUsages" : [ 1552, 1552, 1459, 1255, 1134, 1133, 1132, 1045, 857, 857, 789, 785 ],
+-      "vmemKbytes" : [ 267994, 803983, 1313613, 1439867, 1439868, 1439867, 1439868, 1439867, 1439868, 1439868, 1439867, 1439868 ],
+-      "physMemKbytes" : [ 57155, 171467, 280300, 309448, 311589, 312912, 314235, 315324, 313077, 309747, 307880, 307877 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13740,
+-        "virtualMemoryUsage" : 1474424832,
+-        "physicalMemoryUsage" : 318595072,
+-        "heapUsage" : 723779584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059068,
+-    "taskID" : "task_1369942127770_1205_m_000043",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103881,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222081121,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103881,
+-      "attemptID" : "attempt_1369942127770_1205_m_000043_0",
+-      "clockSplits" : [ 3716, 3716, 2909, 1143, 1144, 1262, 1372, 1465, 1825, 3631, 197, 197 ],
+-      "cpuUsages" : [ 1623, 1623, 1461, 1106, 1107, 1215, 1316, 1250, 988, 939, 886, 886 ],
+-      "vmemKbytes" : [ 262336, 787009, 1285817, 1409271, 1409272, 1409271, 1409272, 1409271, 1409272, 1409272, 1409271, 1409272 ],
+-      "physMemKbytes" : [ 54165, 162495, 265672, 294053, 297834, 301158, 301963, 302374, 302514, 302198, 299793, 297016 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14500,
+-        "virtualMemoryUsage" : 1443094528,
+-        "physicalMemoryUsage" : 302665728,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059069,
+-    "taskID" : "task_1369942127770_1205_m_000044",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102868,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222081121,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102868,
+-      "attemptID" : "attempt_1369942127770_1205_m_000044_0",
+-      "clockSplits" : [ 3420, 3421, 2683, 1617, 1400, 1158, 1158, 3301, 2885, 154, 154, 155 ],
+-      "cpuUsages" : [ 1443, 1443, 1405, 1350, 1224, 1085, 1085, 1191, 924, 903, 903, 904 ],
+-      "vmemKbytes" : [ 271947, 815841, 1314315, 1409403, 1409404, 1409403, 1409404, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 56476, 169428, 273297, 296495, 300225, 300941, 301104, 302318, 304696, 304473, 304240, 304008 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13940,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 311136256,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059069,
+-    "taskID" : "task_1369942127770_1205_m_000045",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222127471,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222081121,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222127471,
+-      "attemptID" : "attempt_1369942127770_1205_m_000045_0",
+-      "clockSplits" : [ 4495, 4496, 1624, 1019, 1020, 1151, 1211, 1978, 28975, 125, 125, 125 ],
+-      "cpuUsages" : [ 1757, 1757, 1255, 1150, 1150, 1108, 1090, 1085, 1209, 816, 816, 817 ],
+-      "vmemKbytes" : [ 326114, 978343, 1408153, 1418043, 1418044, 1418043, 1418044, 1418043, 1418044, 1418044, 1418043, 1418044 ],
+-      "physMemKbytes" : [ 67381, 202144, 292944, 300742, 306585, 311066, 311413, 311477, 311272, 310097, 308858, 307619 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14010,
+-        "virtualMemoryUsage" : 1452077056,
+-        "physicalMemoryUsage" : 314368000,
+-        "heapUsage" : 721223680
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059069,
+-    "taskID" : "task_1369942127770_1205_m_000046",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222124895,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222082113,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222124895,
+-      "attemptID" : "attempt_1369942127770_1205_m_000046_0",
+-      "clockSplits" : [ 3256, 3257, 3256, 3257, 1592, 889, 889, 867, 781, 782, 781, 23168 ],
+-      "cpuUsages" : [ 1366, 1366, 1366, 1366, 1331, 1318, 1318, 1230, 906, 907, 906, 1320 ],
+-      "vmemKbytes" : [ 165057, 495172, 825288, 1155403, 1403989, 1418567, 1418568, 1418567, 1418568, 1418568, 1418567, 1418568 ],
+-      "physMemKbytes" : [ 30439, 91319, 152199, 213078, 259370, 263787, 265596, 267636, 276563, 288702, 300841, 312600 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14700,
+-        "virtualMemoryUsage" : 1452613632,
+-        "physicalMemoryUsage" : 323588096,
+-        "heapUsage" : 675282944
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059070,
+-    "taskID" : "task_1369942127770_1205_m_000047",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102985,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222082114,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102985,
+-      "attemptID" : "attempt_1369942127770_1205_m_000047_0",
+-      "clockSplits" : [ 4299, 4300, 2006, 1431, 1084, 884, 883, 874, 802, 802, 802, 2699 ],
+-      "cpuUsages" : [ 1763, 1763, 1335, 1228, 1182, 1155, 1156, 1116, 822, 822, 822, 1126 ],
+-      "vmemKbytes" : [ 320229, 960687, 1396409, 1409271, 1409272, 1409271, 1409272, 1409271, 1409272, 1409272, 1409271, 1409272 ],
+-      "physMemKbytes" : [ 63258, 189774, 277972, 287030, 292846, 295605, 298083, 300529, 300299, 298352, 296405, 294521 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14290,
+-        "virtualMemoryUsage" : 1443094528,
+-        "physicalMemoryUsage" : 301035520,
+-        "heapUsage" : 724041728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059070,
+-    "taskID" : "task_1369942127770_1205_m_000048",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222102897,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222082113,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222102897,
+-      "attemptID" : "attempt_1369942127770_1205_m_000048_0",
+-      "clockSplits" : [ 2803, 2803, 2804, 1930, 902, 901, 902, 3220, 799, 798, 799, 2118 ],
+-      "cpuUsages" : [ 1423, 1423, 1424, 1233, 1010, 1009, 1009, 1396, 817, 818, 817, 1261 ],
+-      "vmemKbytes" : [ 199009, 597028, 995047, 1351087, 1409272, 1409271, 1409272, 1409271, 1409272, 1409272, 1409271, 1409272 ],
+-      "physMemKbytes" : [ 43013, 129039, 215066, 291871, 303240, 301826, 300413, 299727, 299138, 298063, 296988, 296589 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13640,
+-        "virtualMemoryUsage" : 1443094528,
+-        "physicalMemoryUsage" : 307924992,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059070,
+-    "taskID" : "task_1369942127770_1205_m_000049",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222129137,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222082116,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222129137,
+-      "attemptID" : "attempt_1369942127770_1205_m_000049_0",
+-      "clockSplits" : [ 2860, 2861, 2861, 2861, 1894, 1005, 1005, 7694, 5464, 5464, 5464, 7263 ],
+-      "cpuUsages" : [ 1406, 1406, 1407, 1406, 1267, 1138, 1137, 1367, 736, 735, 736, 1109 ],
+-      "vmemKbytes" : [ 160162, 480486, 800810, 1121133, 1398054, 1434867, 1434868, 1434867, 1434868, 1434868, 1434867, 1434868 ],
+-      "physMemKbytes" : [ 30785, 92356, 153927, 215498, 269221, 279523, 283170, 286860, 294606, 304983, 315359, 325403 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13910,
+-        "virtualMemoryUsage" : 1469304832,
+-        "physicalMemoryUsage" : 336125952,
+-        "heapUsage" : 675872768
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059071,
+-    "taskID" : "task_1369942127770_1205_m_000050",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103702,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222082115,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103702,
+-      "attemptID" : "attempt_1369942127770_1205_m_000050_0",
+-      "clockSplits" : [ 3070, 3071, 3071, 3030, 1063, 1064, 1063, 981, 981, 980, 2531, 678 ],
+-      "cpuUsages" : [ 1472, 1472, 1473, 1465, 1137, 1137, 1136, 1360, 1362, 1361, 920, 815 ],
+-      "vmemKbytes" : [ 177976, 533928, 889881, 1245762, 1416656, 1416655, 1416656, 1416913, 1417437, 1417960, 1418314, 1418324 ],
+-      "physMemKbytes" : [ 34783, 104349, 173916, 243470, 282136, 292267, 302399, 307271, 306752, 306233, 305870, 305826 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 15110,
+-        "virtualMemoryUsage" : 1452363776,
+-        "physicalMemoryUsage" : 313147392,
+-        "heapUsage" : 663683072
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059071,
+-    "taskID" : "task_1369942127770_1205_m_000051",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222114762,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222082116,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222114762,
+-      "attemptID" : "attempt_1369942127770_1205_m_000051_0",
+-      "clockSplits" : [ 2776, 2776, 2776, 2776, 2052, 1135, 1135, 15865, 337, 337, 337, 337 ],
+-      "cpuUsages" : [ 1381, 1382, 1382, 1382, 1259, 1102, 1103, 1505, 806, 806, 806, 806 ],
+-      "vmemKbytes" : [ 157661, 472983, 788305, 1103627, 1388243, 1437451, 1437452, 1437451, 1437452, 1437452, 1437451, 1437452 ],
+-      "physMemKbytes" : [ 32208, 96626, 161044, 225461, 284440, 301714, 310271, 317790, 318550, 317867, 317184, 316501 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13720,
+-        "virtualMemoryUsage" : 1471950848,
+-        "physicalMemoryUsage" : 323747840,
+-        "heapUsage" : 657391616
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059071,
+-    "taskID" : "task_1369942127770_1205_m_000052",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222116084,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222082115,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222116084,
+-      "attemptID" : "attempt_1369942127770_1205_m_000052_0",
+-      "clockSplits" : [ 3007, 3008, 3007, 3008, 1568, 1223, 1222, 15532, 596, 597, 597, 597 ],
+-      "cpuUsages" : [ 1507, 1507, 1507, 1507, 1238, 1175, 1174, 1321, 776, 776, 776, 776 ],
+-      "vmemKbytes" : [ 169124, 507373, 845623, 1183872, 1412160, 1418503, 1418504, 1418503, 1418504, 1418504, 1418503, 1418504 ],
+-      "physMemKbytes" : [ 32359, 97079, 161798, 226517, 275030, 290830, 305697, 313100, 310842, 308599, 306356, 304113 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14040,
+-        "virtualMemoryUsage" : 1452548096,
+-        "physicalMemoryUsage" : 310263808,
+-        "heapUsage" : 656736256
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059071,
+-    "taskID" : "task_1369942127770_1205_m_000053",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103694,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222083110,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103694,
+-      "attemptID" : "attempt_1369942127770_1205_m_000053_0",
+-      "clockSplits" : [ 2723, 2724, 2723, 2724, 1401, 1380, 987, 720, 719, 720, 2336, 1346 ],
+-      "cpuUsages" : [ 1461, 1462, 1462, 1462, 1176, 1172, 1031, 936, 935, 935, 957, 1051 ],
+-      "vmemKbytes" : [ 176884, 530654, 884423, 1238192, 1420450, 1420491, 1420492, 1420491, 1420492, 1420492, 1420491, 1420492 ],
+-      "physMemKbytes" : [ 38706, 116120, 193534, 270947, 310895, 311037, 311316, 312193, 313137, 314081, 315011, 315367 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14100,
+-        "virtualMemoryUsage" : 1454583808,
+-        "physicalMemoryUsage" : 322899968,
+-        "heapUsage" : 742457344
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059072,
+-    "taskID" : "task_1369942127770_1205_m_000054",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222127757,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222083125,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222127757,
+-      "attemptID" : "attempt_1369942127770_1205_m_000054_0",
+-      "clockSplits" : [ 3770, 3770, 3350, 1454, 1455, 1119, 1113, 4738, 5863, 5864, 5864, 5864 ],
+-      "cpuUsages" : [ 1933, 1934, 1782, 1099, 1099, 1086, 1086, 1152, 789, 790, 790, 790 ],
+-      "vmemKbytes" : [ 255816, 767448, 1270616, 1440657, 1438670, 1437636, 1437636, 1437623, 1436443, 1434504, 1432565, 1430626 ],
+-      "physMemKbytes" : [ 53820, 161460, 267313, 302807, 301966, 303414, 307344, 311222, 310193, 305969, 301744, 297520 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14690,
+-        "virtualMemoryUsage" : 1463967744,
+-        "physicalMemoryUsage" : 302465024,
+-        "heapUsage" : 742260736
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059072,
+-    "taskID" : "task_1369942127770_1205_m_000055",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103714,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222083112,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103714,
+-      "attemptID" : "attempt_1369942127770_1205_m_000055_0",
+-      "clockSplits" : [ 2702, 2702, 2702, 2702, 1233, 1210, 1258, 1338, 3529, 268, 268, 268 ],
+-      "cpuUsages" : [ 1441, 1442, 1442, 1442, 1145, 1140, 1151, 1168, 1147, 810, 811, 811 ],
+-      "vmemKbytes" : [ 178795, 536385, 893975, 1251564, 1434355, 1431439, 1428693, 1428123, 1428124, 1428124, 1428123, 1428124 ],
+-      "physMemKbytes" : [ 38002, 114007, 190012, 266017, 303836, 301085, 298665, 299727, 301696, 301927, 300774, 299621 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14200,
+-        "virtualMemoryUsage" : 1462398976,
+-        "physicalMemoryUsage" : 306319360,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059072,
+-    "taskID" : "task_1369942127770_1205_m_000056",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103849,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222083165,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103849,
+-      "attemptID" : "attempt_1369942127770_1205_m_000056_0",
+-      "clockSplits" : [ 1942, 1942, 1942, 1943, 1942, 1815, 1471, 1602, 2567, 3041, 158, 159 ],
+-      "cpuUsages" : [ 1364, 1365, 1365, 1365, 1365, 1347, 1296, 1278, 1135, 891, 864, 865 ],
+-      "vmemKbytes" : [ 125438, 376316, 627194, 878071, 1128949, 1370541, 1435402, 1432859, 1428772, 1425767, 1425743, 1425744 ],
+-      "physMemKbytes" : [ 26942, 80826, 134711, 188595, 242480, 294459, 310173, 312011, 309654, 305607, 303001, 300406 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14590,
+-        "virtualMemoryUsage" : 1459961856,
+-        "physicalMemoryUsage" : 306216960,
+-        "heapUsage" : 742785024
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059073,
+-    "taskID" : "task_1369942127770_1205_m_000057",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222103712,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222083127,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222103712,
+-      "attemptID" : "attempt_1369942127770_1205_m_000057_0",
+-      "clockSplits" : [ 2428, 2429, 2428, 2429, 2428, 1847, 997, 998, 1005, 1021, 1022, 1546 ],
+-      "cpuUsages" : [ 1364, 1364, 1364, 1364, 1364, 1191, 938, 938, 886, 752, 753, 1142 ],
+-      "vmemKbytes" : [ 128472, 385419, 642365, 899311, 1156258, 1391627, 1433817, 1430184, 1426697, 1425764, 1425763, 1425764 ],
+-      "physMemKbytes" : [ 27860, 83580, 139301, 195021, 250742, 301700, 310016, 308217, 306366, 303606, 300513, 297518 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13420,
+-        "virtualMemoryUsage" : 1459982336,
+-        "physicalMemoryUsage" : 303755264,
+-        "heapUsage" : 744357888
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059073,
+-    "taskID" : "task_1369942127770_1205_m_000058",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222122471,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222083128,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222122471,
+-      "attemptID" : "attempt_1369942127770_1205_m_000058_0",
+-      "clockSplits" : [ 2490, 2490, 2491, 2338, 1678, 1612, 1441, 24272, 130, 131, 130, 131 ],
+-      "cpuUsages" : [ 1390, 1390, 1390, 1352, 1192, 1144, 1016, 1333, 848, 848, 848, 849 ],
+-      "vmemKbytes" : [ 184824, 554474, 924124, 1287306, 1409448, 1409447, 1409448, 1409447, 1409448, 1409448, 1409447, 1409448 ],
+-      "physMemKbytes" : [ 39675, 119026, 198377, 276344, 302719, 302849, 301090, 298636, 297427, 296963, 296499, 296036 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13600,
+-        "virtualMemoryUsage" : 1443274752,
+-        "physicalMemoryUsage" : 302903296,
+-        "heapUsage" : 718929920
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059073,
+-    "taskID" : "task_1369942127770_1205_m_000059",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222124673,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222083120,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222124673,
+-      "attemptID" : "attempt_1369942127770_1205_m_000059_0",
+-      "clockSplits" : [ 2762, 2762, 2763, 2762, 1265, 1242, 1113, 964, 964, 1098, 1562, 22290 ],
+-      "cpuUsages" : [ 1534, 1534, 1534, 1534, 1104, 1098, 1078, 1053, 1054, 977, 714, 1136 ],
+-      "vmemKbytes" : [ 178607, 535821, 893035, 1250249, 1432998, 1430391, 1428024, 1427639, 1427640, 1427640, 1427639, 1427640 ],
+-      "physMemKbytes" : [ 34082, 102247, 170412, 238577, 281383, 297244, 311441, 313974, 314247, 314480, 313649, 312382 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14350,
+-        "virtualMemoryUsage" : 1461903360,
+-        "physicalMemoryUsage" : 319496192,
+-        "heapUsage" : 663027712
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059073,
+-    "taskID" : "task_1369942127770_1205_m_000060",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222116128,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222097139,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222116128,
+-      "attemptID" : "attempt_1369942127770_1205_m_000060_0",
+-      "clockSplits" : [ 1500, 1501, 1500, 1501, 1500, 1501, 1487, 1433, 1426, 1113, 1114, 3407 ],
+-      "cpuUsages" : [ 1038, 1039, 1038, 1039, 1038, 1039, 1025, 968, 966, 874, 873, 1403 ],
+-      "vmemKbytes" : [ 105321, 315966, 526611, 737256, 947901, 1158545, 1365245, 1432246, 1429737, 1428540, 1428539, 1428540 ],
+-      "physMemKbytes" : [ 22420, 67262, 112104, 156945, 201787, 246628, 290619, 304477, 303341, 301354, 298591, 295908 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12340,
+-        "virtualMemoryUsage" : 1462824960,
+-        "physicalMemoryUsage" : 302157824,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059074,
+-    "taskID" : "task_1369942127770_1205_m_000061",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222116509,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222103155,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222116509,
+-      "attemptID" : "attempt_1369942127770_1205_m_000061_0",
+-      "clockSplits" : [ 1102, 1103, 1103, 1103, 1102, 1103, 1103, 1103, 1105, 1105, 2090, 227 ],
+-      "cpuUsages" : [ 1023, 1024, 1023, 1024, 1024, 1023, 1024, 998, 914, 913, 1030, 1230 ],
+-      "vmemKbytes" : [ 91613, 274839, 458066, 641293, 824520, 1007746, 1190973, 1369212, 1423060, 1423060, 1423059, 1423060 ],
+-      "physMemKbytes" : [ 19978, 59934, 99891, 139848, 179805, 219762, 259719, 298545, 309145, 307525, 306010, 305645 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12250,
+-        "virtualMemoryUsage" : 1457213440,
+-        "physicalMemoryUsage" : 312954880,
+-        "heapUsage" : 724041728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059074,
+-    "taskID" : "task_1369942127770_1205_m_000062",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222120045,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222103156,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222120045,
+-      "attemptID" : "attempt_1369942127770_1205_m_000062_0",
+-      "clockSplits" : [ 1830, 1830, 1831, 1830, 1519, 770, 770, 769, 812, 1065, 1065, 2792 ],
+-      "cpuUsages" : [ 1251, 1252, 1251, 1252, 1189, 1038, 1037, 1038, 1015, 876, 875, 1306 ],
+-      "vmemKbytes" : [ 149737, 449211, 748686, 1048161, 1334683, 1409291, 1409292, 1409291, 1409292, 1409292, 1409291, 1409292 ],
+-      "physMemKbytes" : [ 32142, 96428, 160713, 224998, 286484, 302152, 301689, 301225, 300738, 298783, 295954, 293214 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13380,
+-        "virtualMemoryUsage" : 1443115008,
+-        "physicalMemoryUsage" : 299433984,
+-        "heapUsage" : 723779584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059074,
+-    "taskID" : "task_1369942127770_1205_m_000063",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222117644,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222103154,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222117644,
+-      "attemptID" : "attempt_1369942127770_1205_m_000063_0",
+-      "clockSplits" : [ 1249, 1250, 1250, 1249, 1250, 1250, 1298, 1478, 4009, 67, 67, 67 ],
+-      "cpuUsages" : [ 1103, 1103, 1103, 1104, 1103, 1103, 1096, 1068, 1060, 989, 989, 989 ],
+-      "vmemKbytes" : [ 104541, 313625, 522708, 731791, 940876, 1149959, 1354370, 1419379, 1419380, 1419380, 1419379, 1419380 ],
+-      "physMemKbytes" : [ 22813, 68439, 114065, 159690, 205317, 250942, 295600, 311369, 313657, 314573, 314492, 314412 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12810,
+-        "virtualMemoryUsage" : 1453445120,
+-        "physicalMemoryUsage" : 321916928,
+-        "heapUsage" : 728825856
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059075,
+-    "taskID" : "task_1369942127770_1205_m_000064",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222117257,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222103156,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222117257,
+-      "attemptID" : "attempt_1369942127770_1205_m_000064_0",
+-      "clockSplits" : [ 1141, 1141, 1142, 1141, 1142, 1141, 1142, 1624, 2159, 1884, 219, 220 ],
+-      "cpuUsages" : [ 1100, 1100, 1101, 1100, 1100, 1101, 1100, 1111, 1123, 880, 877, 877 ],
+-      "vmemKbytes" : [ 95516, 286549, 477582, 668615, 859648, 1050681, 1241715, 1411172, 1437472, 1437472, 1437471, 1437472 ],
+-      "physMemKbytes" : [ 20537, 61611, 102686, 143760, 184835, 225910, 266985, 303753, 311949, 312235, 309723, 307212 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12570,
+-        "virtualMemoryUsage" : 1471971328,
+-        "physicalMemoryUsage" : 313298944,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059075,
+-    "taskID" : "task_1369942127770_1205_m_000065",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222142884,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222103154,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222142884,
+-      "attemptID" : "attempt_1369942127770_1205_m_000065_0",
+-      "clockSplits" : [ 6846, 6847, 6846, 6847, 6846, 1331, 720, 720, 720, 1574, 213, 214 ],
+-      "cpuUsages" : [ 1068, 1069, 1069, 1068, 1069, 823, 795, 795, 796, 814, 827, 827 ],
+-      "vmemKbytes" : [ 138171, 414514, 690857, 967200, 1243543, 1407908, 1409284, 1409283, 1409284, 1409284, 1409283, 1409284 ],
+-      "physMemKbytes" : [ 27592, 82777, 137962, 193147, 248333, 280961, 280755, 280271, 279788, 279136, 277800, 276389 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11020,
+-        "virtualMemoryUsage" : 1443106816,
+-        "physicalMemoryUsage" : 282300416,
+-        "heapUsage" : 606863360
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059075,
+-    "taskID" : "task_1369942127770_1205_m_000066",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222118279,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222104206,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222118279,
+-      "attemptID" : "attempt_1369942127770_1205_m_000066_0",
+-      "clockSplits" : [ 1309, 1310, 1310, 1310, 1309, 1310, 1093, 740, 741, 741, 2689, 206 ],
+-      "cpuUsages" : [ 1116, 1117, 1117, 1116, 1117, 1117, 1046, 933, 933, 933, 942, 1113 ],
+-      "vmemKbytes" : [ 107292, 321876, 536460, 751043, 965628, 1180211, 1379124, 1420075, 1420076, 1420076, 1420075, 1420076 ],
+-      "physMemKbytes" : [ 23107, 69321, 115536, 161750, 207965, 254180, 296965, 305182, 304437, 303692, 302947, 302581 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12600,
+-        "virtualMemoryUsage" : 1454157824,
+-        "physicalMemoryUsage" : 309813248,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059076,
+-    "taskID" : "task_1369942127770_1205_m_000067",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222122382,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222104212,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222122382,
+-      "attemptID" : "attempt_1369942127770_1205_m_000067_0",
+-      "clockSplits" : [ 2306, 2306, 2307, 2306, 969, 948, 949, 1054, 1108, 1109, 2584, 218 ],
+-      "cpuUsages" : [ 1454, 1454, 1455, 1454, 1273, 1269, 1270, 991, 848, 848, 1001, 1033 ],
+-      "vmemKbytes" : [ 179001, 537003, 895005, 1253007, 1437446, 1437487, 1437488, 1437487, 1437488, 1437488, 1437487, 1437488 ],
+-      "physMemKbytes" : [ 37869, 113607, 189345, 265083, 304399, 305018, 305630, 306131, 306267, 306373, 305816, 304030 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14350,
+-        "virtualMemoryUsage" : 1471987712,
+-        "physicalMemoryUsage" : 310398976,
+-        "heapUsage" : 723779584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059076,
+-    "taskID" : "task_1369942127770_1205_m_000068",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222139789,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222104213,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222139789,
+-      "attemptID" : "attempt_1369942127770_1205_m_000068_0",
+-      "clockSplits" : [ 7214, 7215, 7214, 7215, 722, 608, 609, 609, 608, 2851, 158, 158 ],
+-      "cpuUsages" : [ 1219, 1220, 1220, 1220, 895, 890, 890, 890, 890, 861, 857, 858 ],
+-      "vmemKbytes" : [ 178706, 536118, 893530, 1250942, 1435030, 1433622, 1432162, 1430701, 1429241, 1428318, 1428303, 1428304 ],
+-      "physMemKbytes" : [ 33878, 101634, 169390, 237145, 275703, 283011, 290312, 297612, 304913, 309538, 309654, 309698 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12160,
+-        "virtualMemoryUsage" : 1462583296,
+-        "physicalMemoryUsage" : 317272064,
+-        "heapUsage" : 661913600
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059076,
+-    "taskID" : "task_1369942127770_1205_m_000069",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222117823,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222104211,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222117823,
+-      "attemptID" : "attempt_1369942127770_1205_m_000069_0",
+-      "clockSplits" : [ 1345, 1346, 1346, 1346, 1345, 1346, 1251, 1080, 1080, 1943, 89, 90 ],
+-      "cpuUsages" : [ 1283, 1284, 1284, 1284, 1284, 1284, 1262, 1222, 1222, 1068, 886, 887 ],
+-      "vmemKbytes" : [ 107219, 321657, 536096, 750535, 964974, 1179413, 1380249, 1424691, 1424692, 1424692, 1424691, 1424692 ],
+-      "physMemKbytes" : [ 23184, 69554, 115924, 162293, 208663, 255032, 298478, 308303, 308574, 308817, 308869, 308884 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14250,
+-        "virtualMemoryUsage" : 1458884608,
+-        "physicalMemoryUsage" : 316305408,
+-        "heapUsage" : 728498176
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059076,
+-    "taskID" : "task_1369942127770_1205_m_000070",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222120103,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222104209,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222120103,
+-      "attemptID" : "attempt_1369942127770_1205_m_000070_0",
+-      "clockSplits" : [ 2413, 2414, 2414, 2414, 829, 801, 801, 3485, 79, 80, 79, 80 ],
+-      "cpuUsages" : [ 1351, 1352, 1352, 1351, 1086, 1082, 1081, 1047, 792, 792, 792, 792 ],
+-      "vmemKbytes" : [ 178427, 535281, 892136, 1248991, 1432584, 1430750, 1428865, 1426991, 1426256, 1426256, 1426255, 1426256 ],
+-      "physMemKbytes" : [ 37393, 112181, 186969, 261756, 300169, 299652, 299123, 298584, 297156, 295154, 293151, 291149 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12870,
+-        "virtualMemoryUsage" : 1460486144,
+-        "physicalMemoryUsage" : 297111552,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059077,
+-    "taskID" : "task_1369942127770_1205_m_000071",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222116746,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222104212,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222116746,
+-      "attemptID" : "attempt_1369942127770_1205_m_000071_0",
+-      "clockSplits" : [ 1399, 1400, 1400, 1400, 1400, 1400, 842, 615, 615, 614, 615, 829 ],
+-      "cpuUsages" : [ 1079, 1080, 1079, 1080, 1079, 1080, 919, 855, 854, 854, 854, 1127 ],
+-      "vmemKbytes" : [ 114375, 343125, 571876, 800626, 1029377, 1258128, 1429156, 1438747, 1438748, 1438748, 1438747, 1438748 ],
+-      "physMemKbytes" : [ 24578, 73734, 122891, 172048, 221205, 270361, 306966, 308465, 307878, 307290, 306702, 306207 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11940,
+-        "virtualMemoryUsage" : 1473277952,
+-        "physicalMemoryUsage" : 313466880,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059077,
+-    "taskID" : "task_1369942127770_1205_m_000072",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222119279,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222104210,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222119279,
+-      "attemptID" : "attempt_1369942127770_1205_m_000072_0",
+-      "clockSplits" : [ 1218, 1219, 1219, 1219, 1218, 1219, 1219, 990, 787, 787, 786, 3182 ],
+-      "cpuUsages" : [ 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1067, 964, 965, 965, 1145 ],
+-      "vmemKbytes" : [ 96309, 288929, 481549, 674168, 866788, 1059407, 1252028, 1417169, 1435861, 1432977, 1430092, 1427627 ],
+-      "physMemKbytes" : [ 20607, 61821, 103035, 144249, 185464, 226678, 267893, 302818, 304217, 300676, 297135, 294096 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13380,
+-        "virtualMemoryUsage" : 1461575680,
+-        "physicalMemoryUsage" : 300732416,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059077,
+-    "taskID" : "task_1369942127770_1205_m_000073",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222116354,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222105211,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222116354,
+-      "attemptID" : "attempt_1369942127770_1205_m_000073_0",
+-      "clockSplits" : [ 1066, 1066, 1066, 1066, 1066, 1066, 1066, 3425, 62, 62, 62, 62 ],
+-      "cpuUsages" : [ 983, 983, 983, 983, 983, 984, 983, 964, 826, 826, 826, 826 ],
+-      "vmemKbytes" : [ 91186, 273558, 455931, 638304, 820677, 1003049, 1185422, 1366539, 1437580, 1437580, 1437579, 1437580 ],
+-      "physMemKbytes" : [ 18730, 56190, 93651, 131111, 168572, 206032, 243493, 280753, 300503, 308951, 317398, 325847 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11150,
+-        "virtualMemoryUsage" : 1472081920,
+-        "physicalMemoryUsage" : 337993728,
+-        "heapUsage" : 679804928
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059078,
+-    "taskID" : "task_1369942127770_1205_m_000074",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222117482,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222105212,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222117482,
+-      "attemptID" : "attempt_1369942127770_1205_m_000074_0",
+-      "clockSplits" : [ 1130, 1131, 1131, 1131, 1131, 1131, 1130, 1087, 760, 760, 760, 983 ],
+-      "cpuUsages" : [ 1122, 1123, 1123, 1123, 1123, 1123, 1123, 1103, 953, 952, 952, 1210 ],
+-      "vmemKbytes" : [ 89422, 268266, 447110, 625954, 804799, 983643, 1162488, 1340061, 1409432, 1409432, 1409431, 1409432 ],
+-      "physMemKbytes" : [ 19797, 59392, 98988, 138583, 178180, 217775, 257371, 296665, 310308, 307505, 304701, 301898 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13030,
+-        "virtualMemoryUsage" : 1443258368,
+-        "physicalMemoryUsage" : 307699712,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059078,
+-    "taskID" : "task_1369942127770_1205_m_000075",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222122401,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222105213,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222122401,
+-      "attemptID" : "attempt_1369942127770_1205_m_000075_0",
+-      "clockSplits" : [ 1858, 1858, 1858, 1858, 1859, 1408, 1202, 1156, 804, 803, 804, 1715 ],
+-      "cpuUsages" : [ 1273, 1274, 1274, 1274, 1274, 1159, 1106, 1069, 800, 799, 799, 1319 ],
+-      "vmemKbytes" : [ 133405, 400215, 667026, 933837, 1200648, 1404711, 1417880, 1417879, 1417880, 1417880, 1417879, 1417880 ],
+-      "physMemKbytes" : [ 28701, 86104, 143508, 200911, 258315, 302557, 306759, 308178, 307670, 305916, 304161, 302442 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13420,
+-        "virtualMemoryUsage" : 1451909120,
+-        "physicalMemoryUsage" : 309051392,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059078,
+-    "taskID" : "task_1369942127770_1205_m_000076",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222122853,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222106215,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222122853,
+-      "attemptID" : "attempt_1369942127770_1205_m_000076_0",
+-      "clockSplits" : [ 1403, 1403, 1403, 1403, 1403, 1403, 1403, 1741, 4606, 154, 155, 155 ],
+-      "cpuUsages" : [ 1148, 1149, 1149, 1149, 1149, 1149, 1149, 1159, 1170, 996, 996, 997 ],
+-      "vmemKbytes" : [ 91602, 274808, 458014, 641219, 824426, 1007631, 1190838, 1369307, 1423984, 1423984, 1423983, 1423984 ],
+-      "physMemKbytes" : [ 19851, 59554, 99258, 138961, 178666, 218369, 258073, 296821, 310558, 310242, 307937, 305632 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13360,
+-        "virtualMemoryUsage" : 1458159616,
+-        "physicalMemoryUsage" : 311787520,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059079,
+-    "taskID" : "task_1369942127770_1205_m_000077",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222123218,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222106215,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222123218,
+-      "attemptID" : "attempt_1369942127770_1205_m_000077_0",
+-      "clockSplits" : [ 2676, 2677, 2676, 2677, 821, 793, 794, 3489, 97, 97, 97, 97 ],
+-      "cpuUsages" : [ 1339, 1340, 1340, 1340, 957, 951, 951, 951, 975, 975, 975, 976 ],
+-      "vmemKbytes" : [ 176938, 530815, 884692, 1238569, 1420882, 1420923, 1420924, 1420923, 1420924, 1420924, 1420923, 1420924 ],
+-      "physMemKbytes" : [ 38335, 115005, 191676, 268346, 307977, 308255, 308526, 308795, 308516, 307709, 306902, 306095 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13070,
+-        "virtualMemoryUsage" : 1455026176,
+-        "physicalMemoryUsage" : 313028608,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059079,
+-    "taskID" : "task_1369942127770_1205_m_000078",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222127755,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222107218,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222127755,
+-      "attemptID" : "attempt_1369942127770_1205_m_000078_0",
+-      "clockSplits" : [ 2466, 2467, 2466, 2467, 3087, 638, 583, 582, 583, 583, 1609, 3001 ],
+-      "cpuUsages" : [ 1319, 1319, 1320, 1319, 1177, 909, 903, 903, 902, 903, 786, 1120 ],
+-      "vmemKbytes" : [ 176823, 530469, 884116, 1237762, 1420607, 1420659, 1420660, 1420659, 1420660, 1420660, 1420659, 1420660 ],
+-      "physMemKbytes" : [ 37490, 112471, 187452, 262433, 299476, 297339, 296741, 296144, 295547, 294950, 294467, 294436 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12880,
+-        "virtualMemoryUsage" : 1454755840,
+-        "physicalMemoryUsage" : 301457408,
+-        "heapUsage" : 723779584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059079,
+-    "taskID" : "task_1369942127770_1205_m_000079",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222127589,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222107220,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222127589,
+-      "attemptID" : "attempt_1369942127770_1205_m_000079_0",
+-      "clockSplits" : [ 2808, 2809, 2809, 2808, 850, 816, 816, 814, 796, 797, 797, 3445 ],
+-      "cpuUsages" : [ 1306, 1307, 1307, 1307, 1048, 1043, 1043, 1018, 839, 838, 838, 1256 ],
+-      "vmemKbytes" : [ 179463, 538389, 897316, 1256243, 1441819, 1441871, 1441872, 1441871, 1441872, 1441872, 1441871, 1441872 ],
+-      "physMemKbytes" : [ 38683, 116049, 193416, 270783, 311546, 313136, 314715, 316267, 315488, 313213, 310938, 308727 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13150,
+-        "virtualMemoryUsage" : 1476476928,
+-        "physicalMemoryUsage" : 315416576,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059080,
+-    "taskID" : "task_1369942127770_1205_m_000080",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222123105,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222107219,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222123105,
+-      "attemptID" : "attempt_1369942127770_1205_m_000080_0",
+-      "clockSplits" : [ 2261, 2262, 2262, 2262, 2198, 591, 591, 591, 591, 592, 1475, 205 ],
+-      "cpuUsages" : [ 1233, 1233, 1234, 1233, 1223, 948, 949, 948, 949, 948, 1055, 1087 ],
+-      "vmemKbytes" : [ 142013, 426040, 710068, 994095, 1277915, 1409291, 1409292, 1409291, 1409292, 1409292, 1409291, 1409292 ],
+-      "physMemKbytes" : [ 30773, 92321, 153868, 215415, 276919, 305910, 306883, 307856, 308829, 309802, 309923, 308075 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13040,
+-        "virtualMemoryUsage" : 1443115008,
+-        "physicalMemoryUsage" : 314482688,
+-        "heapUsage" : 742129664
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059080,
+-    "taskID" : "task_1369942127770_1205_m_000081",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222132159,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222116240,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222132159,
+-      "attemptID" : "attempt_1369942127770_1205_m_000081_0",
+-      "clockSplits" : [ 1059, 1060, 1060, 1060, 1059, 1060, 1060, 1410, 4727, 335, 334, 335 ],
+-      "cpuUsages" : [ 1089, 1090, 1090, 1090, 1090, 1090, 1090, 1091, 1008, 847, 847, 848 ],
+-      "vmemKbytes" : [ 91426, 274280, 457134, 639987, 822841, 1005694, 1188548, 1370102, 1441028, 1441028, 1441027, 1441028 ],
+-      "physMemKbytes" : [ 20740, 62221, 103704, 145185, 186667, 228148, 269631, 310818, 326794, 325251, 323278, 321306 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12430,
+-        "virtualMemoryUsage" : 1475612672,
+-        "physicalMemoryUsage" : 327917568,
+-        "heapUsage" : 657260544
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059080,
+-    "taskID" : "task_1369942127770_1205_m_000082",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222132250,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222117244,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222132250,
+-      "attemptID" : "attempt_1369942127770_1205_m_000082_0",
+-      "clockSplits" : [ 1229, 1230, 1230, 1230, 1229, 1230, 1230, 3866, 83, 84, 83, 84 ],
+-      "cpuUsages" : [ 1028, 1028, 1028, 1028, 1028, 1028, 1028, 1009, 919, 918, 919, 919 ],
+-      "vmemKbytes" : [ 92019, 276058, 460097, 644136, 828175, 1012214, 1196253, 1377655, 1441156, 1441156, 1441155, 1441156 ],
+-      "physMemKbytes" : [ 18161, 54484, 90809, 127132, 163456, 199779, 236103, 271895, 283917, 283136, 282355, 281574 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11980,
+-        "virtualMemoryUsage" : 1475743744,
+-        "physicalMemoryUsage" : 287850496,
+-        "heapUsage" : 608370688
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059080,
+-    "taskID" : "task_1369942127770_1205_m_000083",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222134319,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222117244,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222134319,
+-      "attemptID" : "attempt_1369942127770_1205_m_000083_0",
+-      "clockSplits" : [ 2126, 2126, 2126, 2126, 842, 820, 819, 813, 783, 783, 783, 2923 ],
+-      "cpuUsages" : [ 1199, 1200, 1200, 1200, 934, 930, 930, 909, 816, 816, 816, 1250 ],
+-      "vmemKbytes" : [ 178727, 536181, 893635, 1251088, 1434711, 1432295, 1429826, 1427400, 1426584, 1426584, 1426583, 1426584 ],
+-      "physMemKbytes" : [ 38394, 115182, 191970, 268758, 307779, 306378, 304967, 303565, 302585, 301819, 301052, 300280 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12200,
+-        "virtualMemoryUsage" : 1460822016,
+-        "physicalMemoryUsage" : 307064832,
+-        "heapUsage" : 734920704
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059081,
+-    "taskID" : "task_1369942127770_1205_m_000084",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222133861,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222118252,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222133861,
+-      "attemptID" : "attempt_1369942127770_1205_m_000084_0",
+-      "clockSplits" : [ 2230, 2231, 2231, 2231, 750, 709, 709, 709, 803, 871, 871, 872 ],
+-      "cpuUsages" : [ 1179, 1179, 1180, 1179, 1004, 999, 998, 999, 861, 761, 760, 761 ],
+-      "vmemKbytes" : [ 178623, 535870, 893117, 1250364, 1438606, 1438739, 1438740, 1438739, 1438740, 1438740, 1438739, 1438740 ],
+-      "physMemKbytes" : [ 34739, 104219, 173699, 243178, 279472, 278825, 278153, 277480, 277015, 277474, 278043, 278614 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12480,
+-        "virtualMemoryUsage" : 1473269760,
+-        "physicalMemoryUsage" : 284733440,
+-        "heapUsage" : 601817088
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059081,
+-    "taskID" : "task_1369942127770_1205_m_000085",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222139704,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222118252,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222139704,
+-      "attemptID" : "attempt_1369942127770_1205_m_000085_0",
+-      "clockSplits" : [ 3454, 3455, 3455, 3454, 1009, 966, 966, 746, 682, 681, 682, 1895 ],
+-      "cpuUsages" : [ 1451, 1451, 1451, 1452, 1056, 1049, 1050, 858, 801, 801, 802, 1128 ],
+-      "vmemKbytes" : [ 177565, 532695, 887825, 1242955, 1426567, 1426619, 1426620, 1426619, 1426620, 1426620, 1426619, 1426620 ],
+-      "physMemKbytes" : [ 36583, 109749, 182916, 256083, 293999, 294187, 294366, 294292, 293645, 292976, 292306, 291648 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13350,
+-        "virtualMemoryUsage" : 1460858880,
+-        "physicalMemoryUsage" : 298389504,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059081,
+-    "taskID" : "task_1369942127770_1205_m_000086",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222136354,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222118251,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222136354,
+-      "attemptID" : "attempt_1369942127770_1205_m_000086_0",
+-      "clockSplits" : [ 3475, 3475, 3476, 711, 642, 643, 642, 677, 933, 934, 933, 1558 ],
+-      "cpuUsages" : [ 1468, 1468, 1468, 1016, 1005, 1005, 1004, 979, 787, 786, 786, 1068 ],
+-      "vmemKbytes" : [ 238103, 714311, 1190519, 1438076, 1434027, 1429835, 1425644, 1421481, 1419856, 1419856, 1419855, 1419856 ],
+-      "physMemKbytes" : [ 50419, 151257, 252095, 303534, 300615, 297664, 294714, 291769, 289364, 287302, 285239, 283851 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12840,
+-        "virtualMemoryUsage" : 1453932544,
+-        "physicalMemoryUsage" : 290590720,
+-        "heapUsage" : 723451904
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059082,
+-    "taskID" : "task_1369942127770_1205_m_000087",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222139789,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222118251,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222139789,
+-      "attemptID" : "attempt_1369942127770_1205_m_000087_0",
+-      "clockSplits" : [ 3491, 3492, 3492, 3492, 853, 807, 807, 806, 796, 796, 796, 1904 ],
+-      "cpuUsages" : [ 1371, 1372, 1371, 1372, 1005, 999, 1000, 981, 848, 849, 848, 1114 ],
+-      "vmemKbytes" : [ 176529, 529588, 882647, 1235706, 1418247, 1418299, 1418300, 1418299, 1418300, 1418300, 1418299, 1418300 ],
+-      "physMemKbytes" : [ 37865, 113597, 189329, 265060, 304618, 305460, 306291, 307107, 306593, 305225, 303856, 302522 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13130,
+-        "virtualMemoryUsage" : 1452339200,
+-        "physicalMemoryUsage" : 309321728,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059082,
+-    "taskID" : "task_1369942127770_1205_m_000088",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222136362,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222119253,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222136362,
+-      "attemptID" : "attempt_1369942127770_1205_m_000088_0",
+-      "clockSplits" : [ 2893, 2894, 2894, 1311, 689, 690, 689, 743, 930, 931, 930, 1511 ],
+-      "cpuUsages" : [ 1313, 1313, 1313, 1052, 949, 949, 949, 909, 770, 769, 770, 1204 ],
+-      "vmemKbytes" : [ 214687, 644062, 1073437, 1392086, 1409140, 1409139, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 46097, 138291, 230486, 299182, 303872, 304943, 306014, 307012, 305925, 303888, 301850, 300616 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12260,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 307785728,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059082,
+-    "taskID" : "task_1369942127770_1205_m_000089",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222132666,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222119254,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222132666,
+-      "attemptID" : "attempt_1369942127770_1205_m_000089_0",
+-      "clockSplits" : [ 1524, 1525, 1525, 1525, 1525, 1525, 596, 541, 542, 541, 541, 1496 ],
+-      "cpuUsages" : [ 1088, 1088, 1088, 1089, 1088, 1088, 829, 814, 813, 814, 813, 1188 ],
+-      "vmemKbytes" : [ 118410, 355230, 592051, 828872, 1065693, 1302514, 1433707, 1434071, 1434072, 1434072, 1434071, 1434072 ],
+-      "physMemKbytes" : [ 25455, 76367, 127278, 178189, 229102, 280013, 307852, 307113, 306294, 305475, 304656, 303834 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11800,
+-        "virtualMemoryUsage" : 1468489728,
+-        "physicalMemoryUsage" : 310685696,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059082,
+-    "taskID" : "task_1369942127770_1205_m_000090",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222141107,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222119254,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222141107,
+-      "attemptID" : "attempt_1369942127770_1205_m_000090_0",
+-      "clockSplits" : [ 3299, 3300, 3300, 3300, 1010, 971, 971, 735, 677, 677, 677, 2932 ],
+-      "cpuUsages" : [ 1468, 1469, 1469, 1468, 1113, 1106, 1106, 896, 845, 845, 844, 1181 ],
+-      "vmemKbytes" : [ 177790, 533371, 888953, 1244534, 1428379, 1428431, 1428432, 1428431, 1428432, 1428432, 1428431, 1428432 ],
+-      "physMemKbytes" : [ 36477, 109431, 182386, 255341, 293743, 295167, 296582, 297326, 296690, 296012, 295333, 294667 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13810,
+-        "virtualMemoryUsage" : 1462714368,
+-        "physicalMemoryUsage" : 301477888,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059083,
+-    "taskID" : "task_1369942127770_1205_m_000091",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222135965,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222120259,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222135965,
+-      "attemptID" : "attempt_1369942127770_1205_m_000091_0",
+-      "clockSplits" : [ 1451, 1451, 1451, 1451, 1451, 1451, 1451, 1451, 2873, 208, 208, 208 ],
+-      "cpuUsages" : [ 1031, 1032, 1031, 1032, 1031, 1032, 1031, 1032, 875, 811, 811, 811 ],
+-      "vmemKbytes" : [ 86236, 258709, 431183, 603656, 776130, 948603, 1121077, 1293550, 1422372, 1429552, 1429551, 1429552 ],
+-      "physMemKbytes" : [ 17759, 53278, 88799, 124318, 159839, 195358, 230879, 266398, 292713, 293373, 292518, 291663 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11660,
+-        "virtualMemoryUsage" : 1463861248,
+-        "physicalMemoryUsage" : 298164224,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059083,
+-    "taskID" : "task_1369942127770_1205_m_000092",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222141263,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222120260,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222141263,
+-      "attemptID" : "attempt_1369942127770_1205_m_000092_0",
+-      "clockSplits" : [ 2790, 2790, 2790, 2790, 1207, 1183, 1013, 663, 663, 664, 663, 3419 ],
+-      "cpuUsages" : [ 1414, 1415, 1414, 1415, 1063, 1057, 992, 858, 858, 858, 858, 1138 ],
+-      "vmemKbytes" : [ 175507, 526522, 877537, 1228552, 1409390, 1409431, 1409432, 1409431, 1409432, 1409432, 1409431, 1409432 ],
+-      "physMemKbytes" : [ 37701, 113103, 188506, 263908, 302825, 302979, 303086, 302647, 302037, 301427, 300816, 300337 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13470,
+-        "virtualMemoryUsage" : 1443258368,
+-        "physicalMemoryUsage" : 307466240,
+-        "heapUsage" : 723910656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222059083,
+-    "taskID" : "task_1369942127770_1205_m_000093",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222140945,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222121262,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222140945,
+-      "attemptID" : "attempt_1369942127770_1205_m_000093_0",
+-      "clockSplits" : [ 2364, 2365, 2365, 2365, 2596, 1091, 628, 629, 628, 629, 2831, 383 ],
+-      "cpuUsages" : [ 1300, 1300, 1300, 1300, 1207, 990, 924, 925, 924, 925, 887, 878 ],
+-      "vmemKbytes" : [ 179076, 537228, 895381, 1253534, 1438050, 1437355, 1434909, 1432392, 1429877, 1427361, 1425627, 1425572 ],
+-      "physMemKbytes" : [ 38409, 115228, 192047, 268866, 308684, 308141, 305153, 302065, 298978, 295891, 293745, 293615 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13140,
+-        "virtualMemoryUsage" : 1459785728,
+-        "physicalMemoryUsage" : 300752896,
+-        "heapUsage" : 727515136
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059084,
+-    "taskID" : "task_1369942127770_1205_m_000094",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222136213,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222122266,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222136213,
+-      "attemptID" : "attempt_1369942127770_1205_m_000094_0",
+-      "clockSplits" : [ 1233, 1233, 1234, 1233, 1234, 1233, 1233, 762, 671, 672, 672, 2532 ],
+-      "cpuUsages" : [ 980, 981, 980, 981, 980, 981, 981, 746, 702, 702, 702, 1204 ],
+-      "vmemKbytes" : [ 98416, 295249, 492083, 688916, 885750, 1082583, 1279417, 1406650, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 21848, 65544, 109240, 152936, 196633, 240328, 284025, 311912, 311463, 310448, 309433, 308423 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 10920,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 315342848,
+-        "heapUsage" : 723451904
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222059084,
+-    "taskID" : "task_1369942127770_1205_m_000095",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222141112,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222123269,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222141112,
+-      "attemptID" : "attempt_1369942127770_1205_m_000095_0",
+-      "clockSplits" : [ 2087, 2088, 2087, 2088, 2088, 1195, 746, 746, 746, 2974, 245, 246 ],
+-      "cpuUsages" : [ 1246, 1246, 1247, 1246, 1247, 1130, 1071, 1071, 1071, 975, 875, 875 ],
+-      "vmemKbytes" : [ 132085, 396256, 660427, 924598, 1188769, 1394563, 1409404, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 28569, 85709, 142849, 199988, 257129, 301711, 305219, 305534, 305849, 305967, 304859, 303540 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13560,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 310263808,
+-        "heapUsage" : 734920704
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  } ],
+-  "reduceTasks" : [ ],
+-  "launchTime" : 1371222058937,
+-  "totalMaps" : 96,
+-  "totalReduces" : 0,
+-  "otherTasks" : [ ],
+-  "jobProperties" : {
+-    "mapreduce.job.ubertask.enable" : "false",
+-    "yarn.resourcemanager.max-completed-applications" : "10000",
+-    "yarn.resourcemanager.delayed.delegation-token.removal-interval-ms" : "30000",
+-    "mapreduce.client.submit.file.replication" : "2",
+-    "yarn.nodemanager.container-manager.thread-count" : "20",
+-    "mapred.queue.default.acl-administer-jobs" : "*",
+-    "dfs.image.transfer.bandwidthPerSec" : "0",
+-    "mapreduce.jobtracker.staging.root.dir" : "/user",
+-    "yarn.resourcemanager.recovery.enabled" : "false",
+-    "yarn.resourcemanager.am.max-retries" : "1",
+-    "dfs.block.access.token.lifetime" : "600",
+-    "fs.AbstractFileSystem.file.impl" : "org.apache.hadoop.fs.local.LocalFs",
+-    "mapreduce.client.completion.pollinterval" : "5000",
+-    "mapreduce.job.ubertask.maxreduces" : "1",
+-    "mapreduce.reduce.shuffle.memory.limit.percent" : "0.25",
+-    "dfs.domain.socket.path" : "/var/run/hdfs-sockets/dn",
+-    "hadoop.ssl.keystores.factory.class" : "org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory",
+-    "hadoop.http.authentication.kerberos.keytab" : "${user.home}/hadoop.keytab",
+-    "yarn.nodemanager.keytab" : "/etc/krb5.keytab",
+-    "mapreduce.task.io.sort.factor" : "10",
+-    "yarn.nodemanager.disk-health-checker.interval-ms" : "120000",
+-    "mapreduce.job.working.dir" : "hdfs://a2115.smile.com:8020/user/jenkins",
+-    "yarn.admin.acl" : "*",
+-    "mapreduce.job.speculative.speculativecap" : "0.1",
+-    "dfs.namenode.num.checkpoints.retained" : "2",
+-    "dfs.namenode.delegation.token.renew-interval" : "86400000",
+-    "yarn.nodemanager.resource.memory-mb" : "8192",
+-    "io.map.index.interval" : "128",
+-    "mapreduce.task.files.preserve.failedtasks" : "false",
+-    "dfs.namenode.http-address" : "a2115.smile.com:20101",
+-    "ha.zookeeper.session-timeout.ms" : "5000",
+-    "hadoop.hdfs.configuration.version" : "1",
+-    "dfs.datanode.balance.bandwidthPerSec" : "1048576",
+-    "mapreduce.reduce.shuffle.connect.timeout" : "180000",
+-    "dfs.journalnode.rpc-address" : "0.0.0.0:8485",
+-    "yarn.nodemanager.aux-services" : "mapreduce.shuffle",
+-    "mapreduce.job.counters.max" : "120",
+-    "dfs.datanode.readahead.bytes" : "4193404",
+-    "ipc.client.connect.max.retries.on.timeouts" : "45",
+-    "mapreduce.job.complete.cancel.delegation.tokens" : "true",
+-    "dfs.client.failover.max.attempts" : "15",
+-    "dfs.namenode.checkpoint.dir" : "file://${hadoop.tmp.dir}/dfs/namesecondary",
+-    "dfs.namenode.replication.work.multiplier.per.iteration" : "2",
+-    "fs.trash.interval" : "1",
+-    "yarn.resourcemanager.admin.address" : "a2115.smile.com:8033",
+-    "ha.health-monitor.check-interval.ms" : "1000",
+-    "mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
+-    "hadoop.jetty.logs.serve.aliases" : "true",
+-    "hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST",
+-    "mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
+-    "s3native.blocksize" : "67108864",
+-    "dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",
+-    "ha.health-monitor.sleep-after-disconnect.ms" : "1000",
+-    "dfs.encrypt.data.transfer" : "false",
+-    "dfs.datanode.http.address" : "0.0.0.0:9864",
+-    "mapreduce.terasort.num-rows" : "400000000",
+-    "mapreduce.job.map.class" : "org.apache.hadoop.examples.terasort.TeraGen$SortGenMapper",
+-    "dfs.namenode.write.stale.datanode.ratio" : "0.5f",
+-    "dfs.client.use.datanode.hostname" : "false",
+-    "yarn.acl.enable" : "true",
+-    "hadoop.security.instrumentation.requires.admin" : "false",
+-    "yarn.nodemanager.localizer.fetch.thread-count" : "4",
+-    "hadoop.security.authorization" : "false",
+-    "user.name" : "jenkins",
+-    "dfs.namenode.fs-limits.min-block-size" : "1048576",
+-    "dfs.client.failover.connection.retries.on.timeouts" : "0",
+-    "hadoop.security.group.mapping.ldap.search.filter.group" : "(objectClass=group)",
+-    "mapreduce.output.fileoutputformat.compress.codec" : "org.apache.hadoop.io.compress.DefaultCodec",
+-    "dfs.namenode.safemode.extension" : "30000",
+-    "mapreduce.shuffle.port" : "8080",
+-    "mapreduce.reduce.log.level" : "INFO",
+-    "yarn.log-aggregation-enable" : "false",
+-    "dfs.datanode.sync.behind.writes" : "false",
+-    "dfs.https.server.keystore.resource" : "ssl-server.xml",
+-    "hadoop.security.group.mapping.ldap.search.attr.group.name" : "cn",
+-    "dfs.namenode.replication.min" : "1",
+-    "mapreduce.map.java.opts" : " -Xmx825955249",
+-    "yarn.scheduler.fair.allocation.file" : "/etc/yarn/fair-scheduler.xml",
+-    "s3native.bytes-per-checksum" : "512",
+-    "tfile.fs.output.buffer.size" : "262144",
+-    "yarn.nodemanager.local-dirs" : "${hadoop.tmp.dir}/nm-local-dir",
+-    "mapreduce.jobtracker.persist.jobstatus.active" : "false",
+-    "fs.AbstractFileSystem.hdfs.impl" : "org.apache.hadoop.fs.Hdfs",
+-    "mapreduce.job.map.output.collector.class" : "org.apache.hadoop.mapred.MapTask$MapOutputBuffer",
+-    "dfs.namenode.safemode.min.datanodes" : "0",
+-    "hadoop.security.uid.cache.secs" : "14400",
+-    "dfs.client.https.need-auth" : "false",
+-    "dfs.client.write.exclude.nodes.cache.expiry.interval.millis" : "600000",
+-    "dfs.client.https.keystore.resource" : "ssl-client.xml",
+-    "dfs.namenode.max.objects" : "0",
+-    "hadoop.ssl.client.conf" : "ssl-client.xml",
+-    "dfs.namenode.safemode.threshold-pct" : "0.999f",
+-    "dfs.blocksize" : "134217728",
+-    "yarn.resourcemanager.scheduler.class" : "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler",
+-    "mapreduce.job.reduce.slowstart.completedmaps" : "0.8",
+-    "mapreduce.job.end-notification.retry.attempts" : "5",
+-    "mapreduce.job.inputformat.class" : "org.apache.hadoop.examples.terasort.TeraGen$RangeInputFormat",
+-    "mapreduce.map.memory.mb" : "1024",
+-    "mapreduce.job.user.name" : "jenkins",
+-    "io.native.lib.available" : "true",
+-    "dfs.client-write-packet-size" : "65536",
+-    "mapreduce.client.progressmonitor.pollinterval" : "1000",
+-    "dfs.namenode.name.dir" : "file://${hadoop.tmp.dir}/dfs/name",
+-    "dfs.ha.log-roll.period" : "120",
+-    "mapreduce.reduce.input.buffer.percent" : "0.0",
+-    "mapreduce.map.output.compress.codec" : "org.apache.hadoop.io.compress.SnappyCodec",
+-    "dfs.client.failover.sleep.base.millis" : "500",
+-    "dfs.datanode.directoryscan.threads" : "1",
+-    "mapreduce.jobtracker.address" : "neededForHive:999999",
+-    "mapreduce.cluster.local.dir" : "${hadoop.tmp.dir}/mapred/local",
+-    "yarn.scheduler.fair.user-as-default-queue" : "true",
+-    "mapreduce.job.application.attempt.id" : "1",
+-    "dfs.permissions.enabled" : "true",
+-    "yarn.scheduler.fair.preemption" : "true",
+-    "mapreduce.reduce.shuffle.parallelcopies" : "5",
+-    "yarn.nodemanager.env-whitelist" : "JAVA_HOME,HADOOP_COMMON_HOME,HADOOP_HDFS_HOME,HADOOP_CONF_DIR,YARN_HOME",
+-    "mapreduce.job.maxtaskfailures.per.tracker" : "3",
+-    "ipc.client.connection.maxidletime" : "10000",
+-    "mapreduce.shuffle.ssl.enabled" : "false",
+-    "dfs.namenode.invalidate.work.pct.per.iteration" : "0.32f",
+-    "dfs.blockreport.intervalMsec" : "21600000",
+-    "fs.s3n.sleepTimeSeconds" : "10",
+-    "dfs.namenode.replication.considerLoad" : "true",
+-    "dfs.client.block.write.retries" : "3",
+-    "hadoop.ssl.server.conf" : "ssl-server.xml",
+-    "dfs.namenode.name.dir.restore" : "false",
+-    "rpc.engine.org.apache.hadoop.mapreduce.v2.api.MRClientProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "dfs.datanode.hdfs-blocks-metadata.enabled" : "true",
+-    "ha.zookeeper.parent-znode" : "/hadoop-ha",
+-    "mapreduce.reduce.merge.inmem.threshold" : "1000",
+-    "mapreduce.input.fileinputformat.split.minsize" : "0",
+-    "dfs.replication" : "3",
+-    "ipc.client.tcpnodelay" : "false",
+-    "dfs.namenode.accesstime.precision" : "3600000",
+-    "dfs.client.read.shortcircuit.skip.checksum" : "false",
+-    "mapreduce.job.jvm.numtasks" : "1",
+-    "mapreduce.task.io.sort.mb" : "100",
+-    "io.file.buffer.size" : "65536",
+-    "dfs.namenode.audit.loggers" : "default",
+-    "dfs.namenode.checkpoint.txns" : "1000000",
+-    "yarn.nodemanager.admin-env" : "MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX",
+-    "mapreduce.job.jar" : "/user/jenkins/.staging/job_1369942127770_1205/job.jar",
+-    "mapreduce.job.split.metainfo.maxsize" : "10000000",
+-    "kfs.replication" : "3",
+-    "rpc.engine.org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "yarn.app.mapreduce.am.scheduler.heartbeat.interval-ms" : "1000",
+-    "mapreduce.reduce.maxattempts" : "4",
+-    "kfs.stream-buffer-size" : "4096",
+-    "dfs.ha.tail-edits.period" : "60",
+-    "hadoop.security.authentication" : "simple",
+-    "fs.s3n.buffer.dir" : "${hadoop.tmp.dir}/s3n",
+-    "rpc.engine.org.apache.hadoop.yarn.api.AMRMProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "yarn.app.mapreduce.am.job.task.listener.thread-count" : "30",
+-    "dfs.namenode.avoid.read.stale.datanode" : "false",
+-    "mapreduce.job.reduces" : "0",
+-    "mapreduce.map.sort.spill.percent" : "0.8",
+-    "dfs.datanode.drop.cache.behind.writes" : "false",
+-    "mapreduce.job.end-notification.retry.interval" : "1",
+-    "mapreduce.job.maps" : "96",
+-    "mapreduce.job.speculative.slownodethreshold" : "1.0",
+-    "tfile.fs.input.buffer.size" : "262144",
+-    "mapreduce.map.speculative" : "false",
+-    "dfs.block.access.token.enable" : "false",
+-    "dfs.journalnode.http-address" : "0.0.0.0:8480",
+-    "mapreduce.job.acl-view-job" : " ",
+-    "mapreduce.reduce.shuffle.retry-delay.max.ms" : "60000",
+-    "mapreduce.job.end-notification.max.retry.interval" : "5",
+-    "ftp.blocksize" : "67108864",
+-    "mapreduce.reduce.java.opts" : " -Xmx825955249",
+-    "dfs.datanode.data.dir" : "file://${hadoop.tmp.dir}/dfs/data",
+-    "ha.failover-controller.cli-check.rpc-timeout.ms" : "20000",
+-    "dfs.namenode.max.extra.edits.segments.retained" : "10000",
+-    "dfs.https.port" : "20102",
+-    "dfs.namenode.replication.interval" : "3",
+-    "mapreduce.task.skip.start.attempts" : "2",
+-    "dfs.namenode.https-address" : "a2115.smile.com:20102",
+-    "ipc.client.kill.max" : "10",
+-    "dfs.ha.automatic-failover.enabled" : "false",
+-    "mapreduce.jobhistory.keytab" : "/etc/security/keytab/jhs.service.keytab",
+-    "dfs.image.transfer.timeout" : "600000",
+-    "dfs.client.failover.sleep.max.millis" : "15000",
+-    "mapreduce.job.end-notification.max.attempts" : "5",
+-    "mapreduce.task.tmp.dir" : "./tmp",
+-    "dfs.default.chunk.view.size" : "32768",
+-    "kfs.bytes-per-checksum" : "512",
+-    "mapreduce.reduce.memory.mb" : "1024",
+-    "hadoop.http.filter.initializers" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
+-    "dfs.datanode.failed.volumes.tolerated" : "0",
+-    "hadoop.http.authentication.type" : "simple",
+-    "dfs.datanode.data.dir.perm" : "700",
+-    "yarn.resourcemanager.client.thread-count" : "50",
+-    "ipc.server.listen.queue.size" : "128",
+-    "mapreduce.reduce.skip.maxgroups" : "0",
+-    "file.stream-buffer-size" : "4096",
+-    "dfs.namenode.fs-limits.max-directory-items" : "0",
+-    "io.mapfile.bloom.size" : "1048576",
+-    "yarn.nodemanager.container-executor.class" : "org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor",
+-    "mapreduce.map.maxattempts" : "4",
+-    "yarn.log-aggregation.retain-seconds" : "-1",
+-    "yarn.app.mapreduce.am.job.committer.cancel-timeout" : "60000",
+-    "ftp.replication" : "3",
+-    "yarn.nodemanager.health-checker.script.timeout-ms" : "1200000",
+-    "mapreduce.jobhistory.address" : "a2115.smile.com:10020",
+-    "mapreduce.jobtracker.taskcache.levels" : "2",
+-    "dfs.datanode.dns.nameserver" : "default",
+-    "mapreduce.application.classpath" : "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+-    "yarn.nodemanager.log.retain-seconds" : "10800",
+-    "mapred.child.java.opts" : "-Xmx200m",
+-    "dfs.replication.max" : "512",
+-    "map.sort.class" : "org.apache.hadoop.util.QuickSort",
+-    "dfs.stream-buffer-size" : "4096",
+-    "dfs.namenode.backup.address" : "0.0.0.0:50100",
+-    "hadoop.util.hash.type" : "murmur",
+-    "dfs.block.access.key.update.interval" : "600",
+-    "dfs.datanode.dns.interface" : "default",
+-    "dfs.datanode.use.datanode.hostname" : "false",
+-    "mapreduce.job.output.key.class" : "org.apache.hadoop.io.Text",
+-    "dfs.client.read.shortcircuit" : "false",
+-    "dfs.namenode.backup.http-address" : "0.0.0.0:50105",
+-    "yarn.nodemanager.container-monitor.interval-ms" : "3000",
+-    "yarn.nodemanager.disk-health-checker.min-healthy-disks" : "0.25",
+-    "kfs.client-write-packet-size" : "65536",
+-    "ha.zookeeper.acl" : "world:anyone:rwcda",
+-    "yarn.nodemanager.sleep-delay-before-sigkill.ms" : "250",
+-    "mapreduce.job.dir" : "/user/jenkins/.staging/job_1369942127770_1205",
+-    "io.map.index.skip" : "0",
+-    "net.topology.node.switch.mapping.impl" : "org.apache.hadoop.net.ScriptBasedMapping",
+-    "fs.s3n.maxRetries" : "4",
+-    "ha.failover-controller.new-active.rpc-timeout.ms" : "60000",
+-    "s3native.client-write-packet-size" : "65536",
+-    "yarn.resourcemanager.amliveliness-monitor.interval-ms" : "1000",
+-    "hadoop.http.staticuser.user" : "dr.who",
+-    "mapreduce.reduce.speculative" : "false",
+-    "mapreduce.client.output.filter" : "FAILED",
+-    "mapreduce.ifile.readahead.bytes" : "4194304",
+-    "mapreduce.task.userlog.limit.kb" : "0",
+-    "mapreduce.tasktracker.map.tasks.maximum" : "2",
+-    "hadoop.http.authentication.simple.anonymous.allowed" : "true",
+-    "hadoop.fuse.timer.period" : "5",
+-    "dfs.namenode.num.extra.edits.retained" : "1000000",
+-    "hadoop.rpc.socket.factory.class.default" : "org.apache.hadoop.net.StandardSocketFactory",
+-    "mapreduce.job.submithostname" : "a2115.smile.com",
+-    "dfs.namenode.handler.count" : "10",
+-    "fs.automatic.close" : "false",
+-    "mapreduce.job.submithostaddress" : "10.20.206.115",
+-    "dfs.datanode.directoryscan.interval" : "21600",
+-    "yarn.resourcemanager.address" : "a2115.smile.com:8032",
+-    "yarn.nodemanager.health-checker.interval-ms" : "600000",
+-    "yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs" : "86400",
+-    "mapreduce.reduce.markreset.buffer.percent" : "0.0",
+-    "hadoop.security.group.mapping.ldap.directory.search.timeout" : "10000",
+-    "mapreduce.map.log.level" : "INFO",
+-    "dfs.bytes-per-checksum" : "512",
+-    "yarn.nodemanager.localizer.address" : "0.0.0.0:8040",
+-    "dfs.namenode.checkpoint.max-retries" : "3",
+-    "ha.health-monitor.rpc-timeout.ms" : "45000",
+-    "yarn.resourcemanager.keytab" : "/etc/krb5.keytab",
+-    "ftp.stream-buffer-size" : "4096",
+-    "dfs.namenode.avoid.write.stale.datanode" : "false",
+-    "hadoop.security.group.mapping.ldap.search.attr.member" : "member",
+-    "mapreduce.output.fileoutputformat.outputdir" : "hdfs://a2115.smile.com:8020/user/jenkins/tera-gen-1",
+-    "dfs.blockreport.initialDelay" : "0",
+-    "yarn.nm.liveness-monitor.expiry-interval-ms" : "600000",
+-    "hadoop.http.authentication.token.validity" : "36000",
+-    "dfs.namenode.delegation.token.max-lifetime" : "604800000",
+-    "mapreduce.job.hdfs-servers" : "${fs.defaultFS}",
+-    "s3native.replication" : "3",
+-    "yarn.nodemanager.localizer.client.thread-count" : "5",
+-    "dfs.heartbeat.interval" : "3",
+-    "rpc.engine.org.apache.hadoop.ipc.ProtocolMetaInfoPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "dfs.ha.fencing.ssh.connect-timeout" : "30000",
+-    "yarn.resourcemanager.container.liveness-monitor.interval-ms" : "600000",
+-    "yarn.am.liveness-monitor.expiry-interval-ms" : "600000",
+-    "mapreduce.task.profile" : "false",
+-    "mapreduce.jobhistory.webapp.address" : "a2115.smile.com:19888",
+-    "ha.failover-controller.graceful-fence.rpc-timeout.ms" : "5000",
+-    "yarn.ipc.rpc.class" : "org.apache.hadoop.yarn.ipc.HadoopYarnProtoRPC",
+-    "mapreduce.job.name" : "TeraGen",
+-    "kfs.blocksize" : "67108864",
+-    "yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs" : "86400",
+-    "mapreduce.job.ubertask.maxmaps" : "9",
+-    "yarn.scheduler.maximum-allocation-mb" : "8192",
+-    "yarn.nodemanager.heartbeat.interval-ms" : "1000",
+-    "dfs.namenode.secondary.http-address" : "0.0.0.0:9868",
+-    "mapreduce.task.timeout" : "600000",
+-    "mapreduce.framework.name" : "yarn",
+-    "ipc.client.idlethreshold" : "4000",
+-    "ftp.bytes-per-checksum" : "512",
+-    "ipc.server.tcpnodelay" : "false",
+-    "dfs.namenode.stale.datanode.interval" : "30000",
+-    "mapreduce.job.speculative.slowtaskthreshold" : "1.0",
+-    "yarn.nodemanager.localizer.cache.target-size-mb" : "10240",
+-    "yarn.nodemanager.remote-app-log-dir" : "/tmp/logs",
+-    "mapreduce.job.queuename" : "sls_queue_1",
+-    "dfs.client.failover.connection.retries" : "0",
+-    "hadoop.rpc.protection" : "authentication",
+-    "yarn.scheduler.minimum-allocation-mb" : "1024",
+-    "yarn.app.mapreduce.client-am.ipc.max-retries" : "1",
+-    "hadoop.security.auth_to_local" : "DEFAULT",
+-    "dfs.secondary.namenode.kerberos.internal.spnego.principal" : "${dfs.web.authentication.kerberos.principal}",
+-    "ftp.client-write-packet-size" : "65536",
+-    "fs.defaultFS" : "hdfs://a2115.smile.com:8020",
+-    "yarn.nodemanager.address" : "0.0.0.0:0",
+-    "yarn.scheduler.fair.assignmultiple" : "true",
+-    "yarn.resourcemanager.scheduler.client.thread-count" : "50",
+-    "mapreduce.task.merge.progress.records" : "10000",
+-    "file.client-write-packet-size" : "65536",
+-    "yarn.nodemanager.delete.thread-count" : "4",
+-    "yarn.resourcemanager.scheduler.address" : "a2115.smile.com:8030",
+-    "fs.trash.checkpoint.interval" : "0",
+-    "hadoop.http.authentication.signature.secret.file" : "${user.home}/hadoop-http-auth-signature-secret",
+-    "s3native.stream-buffer-size" : "4096",
+-    "mapreduce.reduce.shuffle.read.timeout" : "180000",
+-    "mapreduce.admin.user.env" : "LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native",
+-    "yarn.app.mapreduce.am.command-opts" : " -Xmx1238932873",
+-    "dfs.namenode.checkpoint.edits.dir" : "${dfs.namenode.checkpoint.dir}",
+-    "fs.permissions.umask-mode" : "022",
+-    "dfs.client.domain.socket.data.traffic" : "false",
+-    "hadoop.common.configuration.version" : "0.23.0",
+-    "mapreduce.output.fileoutputformat.compress.type" : "BLOCK",
+-    "mapreduce.ifile.readahead" : "true",
+-    "hadoop.security.group.mapping.ldap.ssl" : "false",
+-    "io.serializations" : "org.apache.hadoop.io.serializer.WritableSerialization,org.apache.hadoop.io.serializer.avro.AvroSpecificSerialization,org.apache.hadoop.io.serializer.avro.AvroReflectSerialization",
+-    "yarn.nodemanager.aux-services.mapreduce.shuffle.class" : "org.apache.hadoop.mapred.ShuffleHandler",
+-    "fs.df.interval" : "60000",
+-    "mapreduce.reduce.shuffle.input.buffer.percent" : "0.70",
+-    "io.seqfile.compress.blocksize" : "1000000",
+-    "hadoop.security.groups.cache.secs" : "300",
+-    "ipc.client.connect.max.retries" : "10",
+-    "dfs.namenode.delegation.key.update-interval" : "86400000",
+-    "yarn.nodemanager.process-kill-wait.ms" : "5000",
+-    "yarn.application.classpath" : "$HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*,$HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*,$HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*,$YARN_HOME/*,$YARN_HOME/lib/*",
+-    "yarn.app.mapreduce.client.max-retries" : "3",
+-    "dfs.datanode.available-space-volume-choosing-policy.balanced-space-preference-fraction" : "0.75f",
+-    "yarn.nodemanager.log-aggregation.compression-type" : "none",
+-    "hadoop.security.group.mapping.ldap.search.filter.user" : "(&(objectClass=user)(sAMAccountName={0}))",
+-    "yarn.nodemanager.localizer.cache.cleanup.interval-ms" : "600000",
+-    "dfs.image.compress" : "false",
+-    "mapred.mapper.new-api" : "true",
+-    "yarn.nodemanager.log-dirs" : "${yarn.log.dir}/userlogs",
+-    "dfs.namenode.kerberos.internal.spnego.principal" : "${dfs.web.authentication.kerberos.principal}",
+-    "fs.s3n.block.size" : "67108864",
+-    "fs.ftp.host" : "0.0.0.0",
+-    "hadoop.security.group.mapping" : "org.apache.hadoop.security.JniBasedUnixGroupsMappingWithFallback",
+-    "dfs.datanode.address" : "0.0.0.0:9866",
+-    "mapreduce.map.skip.maxrecords" : "0",
+-    "dfs.datanode.https.address" : "0.0.0.0:9865",
+-    "file.replication" : "1",
+-    "yarn.resourcemanager.resource-tracker.address" : "a2115.smile.com:8031",
+-    "dfs.datanode.drop.cache.behind.reads" : "false",
+-    "hadoop.fuse.connection.timeout" : "300",
+-    "hadoop.work.around.non.threadsafe.getpwuid" : "false",
+-    "hadoop.tmp.dir" : "/tmp/hadoop-${user.name}",
+-    "mapreduce.output.fileoutputformat.compress" : "false",
+-    "mapreduce.tasktracker.indexcache.mb" : "10",
+-    "mapreduce.client.genericoptionsparser.used" : "true",
+-    "dfs.client.block.write.replace-datanode-on-failure.policy" : "DEFAULT",
+-    "mapreduce.job.committer.setup.cleanup.needed" : "true",
+-    "hadoop.kerberos.kinit.command" : "kinit",
+-    "dfs.datanode.du.reserved" : "0",
+-    "dfs.namenode.fs-limits.max-blocks-per-file" : "1048576",
+-    "file.bytes-per-checksum" : "512",
+-    "mapreduce.task.profile.reduces" : "0-2",
+-    "dfs.client.block.write.replace-datanode-on-failure.enable" : "true",
+-    "mapreduce.job.output.value.class" : "org.apache.hadoop.io.Text",
+-    "yarn.dispatcher.exit-on-error" : "true",
+-    "net.topology.script.number.args" : "100",
+-    "mapreduce.task.profile.maps" : "0-2",
+-    "dfs.namenode.decommission.interval" : "30",
+-    "dfs.image.compression.codec" : "org.apache.hadoop.io.compress.DefaultCodec",
+-    "yarn.resourcemanager.webapp.address" : "a2115.smile.com:8088",
+-    "mapreduce.jobtracker.system.dir" : "${hadoop.tmp.dir}/mapred/system",
+-    "hadoop.ssl.hostname.verifier" : "DEFAULT",
+-    "yarn.nodemanager.vmem-pmem-ratio" : "2.1",
+-    "dfs.namenode.support.allow.format" : "true",
+-    "mapreduce.jobhistory.principal" : "jhs/_HOST@REALM.TLD",
+-    "io.mapfile.bloom.error.rate" : "0.005",
+-    "mapreduce.shuffle.ssl.file.buffer.size" : "65536",
+-    "dfs.permissions.superusergroup" : "supergroup",
+-    "dfs.datanode.available-space-volume-choosing-policy.balanced-space-threshold" : "10737418240",
+-    "mapreduce.cluster.acls.enabled" : "false",
+-    "yarn.nodemanager.remote-app-log-dir-suffix" : "logs",
+-    "ha.failover-controller.graceful-fence.connection.retries" : "1",
+-    "ha.health-monitor.connect-retry-interval.ms" : "1000",
+-    "mapreduce.reduce.shuffle.merge.percent" : "0.66",
+-    "yarn.app.mapreduce.am.resource.mb" : "1536",
+-    "io.seqfile.local.dir" : "${hadoop.tmp.dir}/io/local",
+-    "dfs.namenode.checkpoint.check.period" : "60",
+-    "yarn.resourcemanager.nm.liveness-monitor.interval-ms" : "1000",
+-    "file.blocksize" : "67108864",
+-    "tfile.io.chunk.size" : "1048576",
+-    "mapreduce.job.acl-modify-job" : " ",
+-    "yarn.nodemanager.webapp.address" : "0.0.0.0:8042",
+-    "mapreduce.tasktracker.reduce.tasks.maximum" : "2",
+-    "io.skip.checksum.errors" : "false",
+-    "mapreduce.cluster.temp.dir" : "${hadoop.tmp.dir}/mapred/temp",
+-    "yarn.app.mapreduce.am.staging-dir" : "/user",
+-    "dfs.namenode.edits.journal-plugin.qjournal" : "org.apache.hadoop.hdfs.qjournal.client.QuorumJournalManager",
+-    "dfs.datanode.handler.count" : "10",
+-    "fs.ftp.host.port" : "21",
+-    "dfs.namenode.decommission.nodes.per.interval" : "5",
+-    "yarn.resourcemanager.admin.client.thread-count" : "1",
+-    "dfs.namenode.fs-limits.max-component-length" : "0",
+-    "dfs.namenode.checkpoint.period" : "3600",
+-    "fs.AbstractFileSystem.viewfs.impl" : "org.apache.hadoop.fs.viewfs.ViewFs",
+-    "yarn.resourcemanager.resource-tracker.client.thread-count" : "50",
+-    "mapreduce.map.output.compress" : "true",
+-    "dfs.datanode.ipc.address" : "0.0.0.0:9867",
+-    "hadoop.ssl.require.client.cert" : "false",
+-    "yarn.nodemanager.delete.debug-delay-sec" : "0",
+-    "dfs.datanode.max.transfer.threads" : "4096"
+-  },
+-  "computonsPerMapInputByte" : -1,
+-  "computonsPerMapOutputByte" : -1,
+-  "computonsPerReduceInputByte" : -1,
+-  "computonsPerReduceOutputByte" : -1,
+-  "heapMegabytes" : 200,
+-  "outcome" : "SUCCESS",
+-  "jobtype" : "JAVA",
+-  "directDependantJobs" : [ ],
+-  "successfulMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 47021,
+-    "minimum" : 11143,
+-    "rankings" : [ {
+-      "datum" : 13354,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 14101,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 15609,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 15919,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 17003,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 17109,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 18342,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 18870,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 19127,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 19221,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 19481,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 19896,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 20585,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 20784,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 21452,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 21853,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 22436,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 32646,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 41553,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 96
+-  } ],
+-  "failedMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  } ],
+-  "successfulReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "failedReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "mapperTriesToSucceed" : [ 1.0 ],
+-  "failedMapperFraction" : 0.0,
+-  "relativeTime" : 0,
+-  "clusterMapMB" : -1,
+-  "clusterReduceMB" : -1,
+-  "jobMapMB" : 200,
+-  "jobReduceMB" : 200
+-}
+-{
+-  "priority" : "NORMAL",
+-  "jobID" : "job_1369942127770_1206",
+-  "user" : "jenkins",
+-  "jobName" : "TeraGen",
+-  "submitTime" : 1371222159703,
+-  "finishTime" : 1371222251755,
+-  "queue" : "sls_queue_1",
+-  "mapTasks" : [ {
+-    "startTime" : 1371222164113,
+-    "taskID" : "task_1369942127770_1206_m_000000",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222188484,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166321,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222188484,
+-      "attemptID" : "attempt_1369942127770_1206_m_000000_0",
+-      "clockSplits" : [ 2278, 2279, 2279, 2279, 1641, 1090, 1090, 3620, 943, 943, 943, 2773 ],
+-      "cpuUsages" : [ 1480, 1481, 1481, 1481, 1298, 1141, 1141, 1312, 814, 815, 814, 1062 ],
+-      "vmemKbytes" : [ 161561, 484683, 807806, 1130929, 1407572, 1442299, 1442300, 1442299, 1442300, 1442300, 1442299, 1442300 ],
+-      "physMemKbytes" : [ 34370, 103111, 171853, 240594, 299471, 307004, 307167, 309072, 310772, 308485, 306197, 304712 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 82,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14320,
+-        "virtualMemoryUsage" : 1476915200,
+-        "physicalMemoryUsage" : 311963648,
+-        "heapUsage" : 735051776
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 82,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164115,
+-    "taskID" : "task_1369942127770_1206_m_000001",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185876,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166287,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185876,
+-      "attemptID" : "attempt_1369942127770_1206_m_000001_0",
+-      "clockSplits" : [ 1967, 1967, 1967, 1967, 1968, 1160, 1022, 1021, 922, 887, 887, 3761 ],
+-      "cpuUsages" : [ 1290, 1290, 1290, 1291, 1290, 1137, 1110, 1111, 890, 812, 812, 1247 ],
+-      "vmemKbytes" : [ 136908, 410726, 684543, 958360, 1232179, 1406210, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 29838, 89517, 149196, 208875, 268554, 307143, 309569, 311375, 312131, 310214, 308165, 306185 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13650,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 312889344,
+-        "heapUsage" : 734986240
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164115,
+-    "taskID" : "task_1369942127770_1206_m_000002",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222187434,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166324,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222187434,
+-      "attemptID" : "attempt_1369942127770_1206_m_000002_0",
+-      "clockSplits" : [ 2525, 2525, 2525, 2526, 1158, 1048, 1049, 3067, 3187, 40, 40, 40 ],
+-      "cpuUsages" : [ 1475, 1475, 1475, 1475, 1136, 1109, 1109, 1564, 795, 739, 739, 739 ],
+-      "vmemKbytes" : [ 174639, 523917, 873196, 1222474, 1422137, 1423103, 1423104, 1423103, 1423104, 1423104, 1423103, 1423104 ],
+-      "physMemKbytes" : [ 38111, 114334, 190557, 266780, 310216, 310109, 309790, 309622, 308756, 306687, 304614, 302541 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14130,
+-        "virtualMemoryUsage" : 1457258496,
+-        "physicalMemoryUsage" : 308678656,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164115,
+-    "taskID" : "task_1369942127770_1206_m_000003",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186091,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166325,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186091,
+-      "attemptID" : "attempt_1369942127770_1206_m_000003_0",
+-      "clockSplits" : [ 2228, 2229, 2229, 2228, 1992, 1092, 1093, 1296, 4777, 199, 199, 199 ],
+-      "cpuUsages" : [ 1387, 1388, 1388, 1388, 1346, 1185, 1184, 1169, 1046, 879, 880, 880 ],
+-      "vmemKbytes" : [ 148980, 446940, 744901, 1042862, 1334323, 1427567, 1427568, 1427567, 1427568, 1427568, 1427567, 1427568 ],
+-      "physMemKbytes" : [ 31982, 95948, 159914, 223879, 286454, 306599, 306786, 306971, 307048, 307043, 307026, 307009 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14120,
+-        "virtualMemoryUsage" : 1461829632,
+-        "physicalMemoryUsage" : 314368000,
+-        "heapUsage" : 728760320
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164116,
+-    "taskID" : "task_1369942127770_1206_m_000004",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222189053,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166287,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222189053,
+-      "attemptID" : "attempt_1369942127770_1206_m_000004_0",
+-      "clockSplits" : [ 2506, 2507, 2507, 2507, 1358, 1134, 1277, 3003, 1031, 1032, 3177, 718 ],
+-      "cpuUsages" : [ 1424, 1424, 1425, 1424, 1199, 1156, 1162, 1212, 826, 825, 851, 1032 ],
+-      "vmemKbytes" : [ 170607, 511823, 853038, 1194253, 1416017, 1420563, 1420564, 1420563, 1420564, 1420564, 1420563, 1420564 ],
+-      "physMemKbytes" : [ 36772, 110318, 183863, 257408, 305224, 306250, 306299, 306447, 304928, 302270, 299633, 298578 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 85,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13960,
+-        "virtualMemoryUsage" : 1454657536,
+-        "physicalMemoryUsage" : 305713152,
+-        "heapUsage" : 728367104
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 85,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164116,
+-    "taskID" : "task_1369942127770_1206_m_000005",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222184979,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166323,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222184979,
+-      "attemptID" : "attempt_1369942127770_1206_m_000005_0",
+-      "clockSplits" : [ 1921, 1921, 1921, 1921, 1922, 1602, 1010, 1010, 1013, 1026, 1026, 2353 ],
+-      "cpuUsages" : [ 1306, 1306, 1306, 1306, 1306, 1250, 1146, 1146, 1053, 788, 788, 1199 ],
+-      "vmemKbytes" : [ 126096, 378289, 630482, 882675, 1134868, 1371662, 1425028, 1425027, 1425028, 1425028, 1425027, 1425028 ],
+-      "physMemKbytes" : [ 28145, 84436, 140727, 197018, 253310, 306166, 318110, 318149, 318111, 316467, 314188, 311974 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13900,
+-        "virtualMemoryUsage" : 1459228672,
+-        "physicalMemoryUsage" : 318754816,
+-        "heapUsage" : 734986240
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164116,
+-    "taskID" : "task_1369942127770_1206_m_000006",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185246,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166324,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185246,
+-      "attemptID" : "attempt_1369942127770_1206_m_000006_0",
+-      "clockSplits" : [ 2131, 2131, 2132, 2131, 2083, 1125, 1125, 1164, 1326, 1326, 1702, 541 ],
+-      "cpuUsages" : [ 1351, 1351, 1351, 1351, 1344, 1220, 1220, 1130, 761, 760, 931, 960 ],
+-      "vmemKbytes" : [ 145579, 436739, 727899, 1019058, 1309880, 1441771, 1441772, 1441771, 1441772, 1441772, 1441771, 1441772 ],
+-      "physMemKbytes" : [ 31512, 94536, 157560, 220583, 283538, 313578, 316306, 318981, 319869, 319878, 318776, 315776 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13730,
+-        "virtualMemoryUsage" : 1476374528,
+-        "physicalMemoryUsage" : 321802240,
+-        "heapUsage" : 740491264
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164117,
+-    "taskID" : "task_1369942127770_1206_m_000007",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185092,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222166325,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185092,
+-      "attemptID" : "attempt_1369942127770_1206_m_000007_0",
+-      "clockSplits" : [ 1853, 1853, 1853, 1854, 1853, 1487, 971, 970, 986, 1064, 1064, 2953 ],
+-      "cpuUsages" : [ 1287, 1287, 1288, 1287, 1287, 1189, 1049, 1049, 1004, 776, 776, 1151 ],
+-      "vmemKbytes" : [ 126150, 378452, 630754, 883055, 1135357, 1365947, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 27651, 82956, 138261, 193565, 248870, 299639, 311257, 313850, 316375, 315596, 313007, 310500 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13430,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 317206528,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164117,
+-    "taskID" : "task_1369942127770_1206_m_000008",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222188434,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166282,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222188434,
+-      "attemptID" : "attempt_1369942127770_1206_m_000008_0",
+-      "clockSplits" : [ 2257, 2258, 2258, 2257, 1845, 1172, 1171, 3581, 845, 845, 845, 2798 ],
+-      "cpuUsages" : [ 1359, 1359, 1359, 1360, 1314, 1240, 1241, 1179, 860, 861, 861, 1097 ],
+-      "vmemKbytes" : [ 153669, 461007, 768346, 1075685, 1360846, 1419935, 1419936, 1419935, 1419936, 1419936, 1419935, 1419936 ],
+-      "physMemKbytes" : [ 34010, 102032, 170054, 238075, 301205, 314458, 314675, 315015, 314035, 311954, 309873, 308002 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14090,
+-        "virtualMemoryUsage" : 1454014464,
+-        "physicalMemoryUsage" : 315056128,
+-        "heapUsage" : 735051776
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164117,
+-    "taskID" : "task_1369942127770_1206_m_000009",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186078,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166289,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186078,
+-      "attemptID" : "attempt_1369942127770_1206_m_000009_0",
+-      "clockSplits" : [ 2038, 2039, 2038, 2039, 2038, 1268, 1144, 1104, 802, 803, 803, 3666 ],
+-      "cpuUsages" : [ 1317, 1317, 1318, 1317, 1317, 1417, 1432, 1349, 722, 722, 723, 1209 ],
+-      "vmemKbytes" : [ 139866, 419600, 699334, 979067, 1258801, 1434828, 1437528, 1437527, 1437528, 1437528, 1437527, 1437528 ],
+-      "physMemKbytes" : [ 30358, 91075, 151792, 212509, 273226, 312566, 316176, 319207, 320182, 319829, 319476, 319130 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72234,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14160,
+-        "virtualMemoryUsage" : 1472028672,
+-        "physicalMemoryUsage" : 326660096,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72234,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164118,
+-    "taskID" : "task_1369942127770_1206_m_000010",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185273,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166293,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185273,
+-      "attemptID" : "attempt_1369942127770_1206_m_000010_0",
+-      "clockSplits" : [ 1550, 1551, 1551, 1551, 1551, 1551, 1348, 982, 983, 1069, 1644, 3642 ],
+-      "cpuUsages" : [ 1196, 1197, 1197, 1197, 1197, 1197, 1161, 1097, 1097, 1062, 830, 1372 ],
+-      "vmemKbytes" : [ 106103, 318309, 530515, 742720, 954927, 1167133, 1365716, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 23450, 70351, 117253, 164154, 211056, 257957, 301852, 311562, 311632, 311701, 311734, 311749 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13800,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 319262720,
+-        "heapUsage" : 728629248
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164118,
+-    "taskID" : "task_1369942127770_1206_m_000011",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222188434,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166290,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222188434,
+-      "attemptID" : "attempt_1369942127770_1206_m_000011_0",
+-      "clockSplits" : [ 2018, 2018, 2019, 2018, 2019, 1684, 1356, 6988, 74, 73, 74, 74 ],
+-      "cpuUsages" : [ 1424, 1425, 1425, 1424, 1425, 1364, 1305, 1424, 818, 819, 818, 819 ],
+-      "vmemKbytes" : [ 128226, 384681, 641136, 897591, 1154046, 1377893, 1409404, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 28599, 85797, 142996, 200194, 257393, 307333, 314455, 314599, 314625, 314232, 313838, 313445 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14790,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 320749568,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164118,
+-    "taskID" : "task_1369942127770_1206_m_000012",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185278,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166295,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185278,
+-      "attemptID" : "attempt_1369942127770_1206_m_000012_0",
+-      "clockSplits" : [ 1913, 1914, 1914, 1914, 1914, 1611, 911, 910, 911, 1149, 1191, 2725 ],
+-      "cpuUsages" : [ 1375, 1376, 1376, 1376, 1376, 1301, 1127, 1127, 1128, 891, 850, 1257 ],
+-      "vmemKbytes" : [ 124608, 373827, 623045, 872262, 1121481, 1359363, 1420140, 1420139, 1420140, 1420140, 1420139, 1420140 ],
+-      "physMemKbytes" : [ 26214, 78645, 131075, 183505, 235936, 285986, 298857, 298969, 299082, 298216, 295652, 293146 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14560,
+-        "virtualMemoryUsage" : 1454223360,
+-        "physicalMemoryUsage" : 299470848,
+-        "heapUsage" : 740491264
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164119,
+-    "taskID" : "task_1369942127770_1206_m_000013",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185273,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166291,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185273,
+-      "attemptID" : "attempt_1369942127770_1206_m_000013_0",
+-      "clockSplits" : [ 1713, 1714, 1713, 1714, 1713, 1714, 1293, 1179, 1176, 1125, 1125, 2795 ],
+-      "cpuUsages" : [ 1221, 1221, 1221, 1221, 1221, 1221, 1236, 1241, 1229, 807, 807, 1234 ],
+-      "vmemKbytes" : [ 115735, 347206, 578677, 810148, 1041619, 1273090, 1433402, 1438795, 1438796, 1438796, 1438795, 1438796 ],
+-      "physMemKbytes" : [ 25299, 75897, 126496, 177095, 227694, 278292, 314180, 318040, 320785, 321923, 321617, 321326 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13880,
+-        "virtualMemoryUsage" : 1473327104,
+-        "physicalMemoryUsage" : 328986624,
+-        "heapUsage" : 740556800
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164120,
+-    "taskID" : "task_1369942127770_1206_m_000014",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185953,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166297,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185953,
+-      "attemptID" : "attempt_1369942127770_1206_m_000014_0",
+-      "clockSplits" : [ 1818, 1819, 1819, 1819, 1819, 1797, 1598, 1781, 4888, 164, 164, 164 ],
+-      "cpuUsages" : [ 1243, 1244, 1244, 1244, 1244, 1251, 1319, 1273, 930, 856, 856, 856 ],
+-      "vmemKbytes" : [ 121322, 363966, 606611, 849256, 1091901, 1333349, 1431760, 1431686, 1425453, 1421556, 1421555, 1421556 ],
+-      "physMemKbytes" : [ 26145, 78435, 130726, 183016, 235307, 287356, 310547, 313799, 309838, 305300, 303271, 301242 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13560,
+-        "virtualMemoryUsage" : 1455673344,
+-        "physicalMemoryUsage" : 307433472,
+-        "heapUsage" : 723845120
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164120,
+-    "taskID" : "task_1369942127770_1206_m_000015",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222189058,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222166333,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222189058,
+-      "attemptID" : "attempt_1369942127770_1206_m_000015_0",
+-      "clockSplits" : [ 2170, 2171, 2171, 2171, 2028, 1094, 1095, 4145, 798, 798, 798, 3281 ],
+-      "cpuUsages" : [ 1358, 1358, 1358, 1358, 1333, 1171, 1172, 1237, 815, 816, 815, 1259 ],
+-      "vmemKbytes" : [ 146393, 439180, 731967, 1024754, 1314962, 1425067, 1425068, 1425067, 1425068, 1425068, 1425067, 1425068 ],
+-      "physMemKbytes" : [ 32691, 98075, 163459, 228842, 293658, 318728, 319501, 320253, 319820, 318699, 317577, 316047 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14050,
+-        "virtualMemoryUsage" : 1459269632,
+-        "physicalMemoryUsage" : 320176128,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164121,
+-    "taskID" : "task_1369942127770_1206_m_000016",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185112,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166298,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185112,
+-      "attemptID" : "attempt_1369942127770_1206_m_000016_0",
+-      "clockSplits" : [ 2147, 2147, 2148, 2147, 2054, 874, 874, 874, 919, 985, 986, 2651 ],
+-      "cpuUsages" : [ 1392, 1392, 1393, 1392, 1371, 1101, 1100, 1100, 1008, 870, 870, 1241 ],
+-      "vmemKbytes" : [ 144202, 432606, 721011, 1009416, 1297041, 1420819, 1420820, 1420819, 1420820, 1420820, 1420819, 1420820 ],
+-      "physMemKbytes" : [ 30336, 91008, 151680, 212351, 272862, 299357, 300156, 300954, 301511, 299852, 297656, 295530 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14230,
+-        "virtualMemoryUsage" : 1454919680,
+-        "physicalMemoryUsage" : 301989888,
+-        "heapUsage" : 734920704
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164121,
+-    "taskID" : "task_1369942127770_1206_m_000017",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185125,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166299,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185125,
+-      "attemptID" : "attempt_1369942127770_1206_m_000017_0",
+-      "clockSplits" : [ 2056, 2056, 2056, 2057, 2056, 1240, 1157, 1132, 945, 946, 945, 2174 ],
+-      "cpuUsages" : [ 1376, 1377, 1376, 1377, 1377, 1106, 1080, 1060, 914, 915, 915, 1267 ],
+-      "vmemKbytes" : [ 141624, 424872, 708121, 991370, 1274619, 1441166, 1442372, 1442371, 1442372, 1442372, 1442371, 1442372 ],
+-      "physMemKbytes" : [ 30671, 92015, 153358, 214701, 276045, 312210, 312702, 312916, 311552, 309174, 306795, 305251 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14140,
+-        "virtualMemoryUsage" : 1476988928,
+-        "physicalMemoryUsage" : 312541184,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164121,
+-    "taskID" : "task_1369942127770_1206_m_000018",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185117,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166301,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185117,
+-      "attemptID" : "attempt_1369942127770_1206_m_000018_0",
+-      "clockSplits" : [ 1934, 1934, 1934, 1934, 1934, 1203, 1012, 1012, 930, 897, 896, 3188 ],
+-      "cpuUsages" : [ 1359, 1360, 1359, 1360, 1359, 1168, 1117, 1117, 949, 878, 878, 1216 ],
+-      "vmemKbytes" : [ 138262, 414786, 691311, 967835, 1244360, 1434031, 1439980, 1439979, 1439980, 1439980, 1439979, 1439980 ],
+-      "physMemKbytes" : [ 30204, 90615, 151026, 211436, 271847, 313905, 317141, 319119, 320017, 317820, 315430, 313109 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14120,
+-        "virtualMemoryUsage" : 1474539520,
+-        "physicalMemoryUsage" : 319881216,
+-        "heapUsage" : 740294656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164121,
+-    "taskID" : "task_1369942127770_1206_m_000019",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186145,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166303,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186145,
+-      "attemptID" : "attempt_1369942127770_1206_m_000019_0",
+-      "clockSplits" : [ 3008, 3009, 3009, 1882, 895, 895, 893, 819, 819, 819, 2062, 1653 ],
+-      "cpuUsages" : [ 1646, 1647, 1647, 1320, 1034, 1034, 1032, 934, 934, 935, 941, 966 ],
+-      "vmemKbytes" : [ 203217, 609652, 1016088, 1364807, 1409140, 1409139, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 42475, 127426, 212377, 285272, 294585, 294637, 294690, 295048, 295688, 296328, 296949, 297136 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14150,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 304185344,
+-        "heapUsage" : 740294656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164122,
+-    "taskID" : "task_1369942127770_1206_m_000020",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222188294,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166304,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222188294,
+-      "attemptID" : "attempt_1369942127770_1206_m_000020_0",
+-      "clockSplits" : [ 2521, 2522, 2521, 2522, 1166, 875, 875, 3843, 796, 796, 796, 2750 ],
+-      "cpuUsages" : [ 1465, 1465, 1465, 1465, 1165, 1100, 1100, 1152, 745, 746, 745, 1157 ],
+-      "vmemKbytes" : [ 169996, 509988, 849980, 1189972, 1414887, 1420227, 1420228, 1420227, 1420228, 1420228, 1420227, 1420228 ],
+-      "physMemKbytes" : [ 37258, 111774, 186290, 260806, 310285, 311992, 312537, 313043, 312040, 310217, 308394, 306622 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13770,
+-        "virtualMemoryUsage" : 1454313472,
+-        "physicalMemoryUsage" : 313397248,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164122,
+-    "taskID" : "task_1369942127770_1206_m_000021",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185112,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166306,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185112,
+-      "attemptID" : "attempt_1369942127770_1206_m_000021_0",
+-      "clockSplits" : [ 1800, 1801, 1800, 1801, 1801, 1639, 1110, 1109, 1053, 976, 977, 2929 ],
+-      "cpuUsages" : [ 1297, 1297, 1297, 1297, 1297, 1248, 1084, 1085, 966, 809, 809, 1224 ],
+-      "vmemKbytes" : [ 125011, 375035, 625059, 875082, 1125106, 1368301, 1441708, 1441707, 1441708, 1441708, 1441707, 1441708 ],
+-      "physMemKbytes" : [ 27270, 81812, 136354, 190895, 245438, 298570, 316659, 319596, 322165, 321755, 320696, 319661 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13710,
+-        "virtualMemoryUsage" : 1476308992,
+-        "physicalMemoryUsage" : 326963200,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164122,
+-    "taskID" : "task_1369942127770_1206_m_000022",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186222,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166307,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186222,
+-      "attemptID" : "attempt_1369942127770_1206_m_000022_0",
+-      "clockSplits" : [ 1673, 1674, 1674, 1674, 1674, 1674, 1281, 1231, 1150, 1000, 1000, 3869 ],
+-      "cpuUsages" : [ 1270, 1271, 1271, 1270, 1271, 1271, 1189, 1180, 1050, 811, 810, 1176 ],
+-      "vmemKbytes" : [ 116283, 348851, 581419, 813986, 1046555, 1279122, 1420532, 1422059, 1422060, 1422060, 1422059, 1422060 ],
+-      "physMemKbytes" : [ 24619, 73859, 123098, 172337, 221577, 270816, 300537, 300304, 299627, 297553, 295072, 292670 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13920,
+-        "virtualMemoryUsage" : 1456189440,
+-        "physicalMemoryUsage" : 298930176,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164123,
+-    "taskID" : "task_1369942127770_1206_m_000023",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186145,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222166345,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186145,
+-      "attemptID" : "attempt_1369942127770_1206_m_000023_0",
+-      "clockSplits" : [ 1890, 1890, 1890, 1890, 1890, 1603, 1310, 1285, 1093, 1093, 2285, 1599 ],
+-      "cpuUsages" : [ 1300, 1301, 1300, 1301, 1301, 1183, 1064, 1042, 878, 877, 908, 985 ],
+-      "vmemKbytes" : [ 130897, 392693, 654489, 916284, 1178080, 1407818, 1441216, 1441215, 1441216, 1441216, 1441215, 1441216 ],
+-      "physMemKbytes" : [ 28778, 86335, 143893, 201450, 259007, 309525, 316931, 316984, 315303, 312502, 309811, 309093 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13500,
+-        "virtualMemoryUsage" : 1475805184,
+-        "physicalMemoryUsage" : 316432384,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164123,
+-    "taskID" : "task_1369942127770_1206_m_000024",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222189046,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166312,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222189046,
+-      "attemptID" : "attempt_1369942127770_1206_m_000024_0",
+-      "clockSplits" : [ 2253, 2253, 2253, 2254, 1847, 969, 969, 7872, 514, 515, 514, 515 ],
+-      "cpuUsages" : [ 1355, 1356, 1356, 1355, 1273, 1091, 1092, 1191, 1000, 1000, 1000, 1001 ],
+-      "vmemKbytes" : [ 153860, 461581, 769302, 1077023, 1369366, 1441319, 1441320, 1441319, 1441320, 1441320, 1441319, 1441320 ],
+-      "physMemKbytes" : [ 30297, 90891, 151486, 212080, 269690, 284519, 285383, 286252, 287524, 289042, 290561, 292080 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14070,
+-        "virtualMemoryUsage" : 1475911680,
+-        "physicalMemoryUsage" : 299868160,
+-        "heapUsage" : 677838848
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164123,
+-    "taskID" : "task_1369942127770_1206_m_000025",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185135,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166313,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185135,
+-      "attemptID" : "attempt_1369942127770_1206_m_000025_0",
+-      "clockSplits" : [ 2136, 2136, 2136, 2137, 2130, 1075, 1075, 1048, 844, 844, 844, 2412 ],
+-      "cpuUsages" : [ 1387, 1387, 1388, 1387, 1386, 1053, 1052, 1035, 894, 895, 895, 1351 ],
+-      "vmemKbytes" : [ 142390, 427170, 711951, 996731, 1281508, 1422399, 1422400, 1422399, 1422400, 1422400, 1422399, 1422400 ],
+-      "physMemKbytes" : [ 26260, 78782, 131304, 183825, 236347, 262453, 262696, 262931, 262484, 261596, 260708, 259812 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14110,
+-        "virtualMemoryUsage" : 1456537600,
+-        "physicalMemoryUsage" : 265564160,
+-        "heapUsage" : 610598912
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164124,
+-    "taskID" : "task_1369942127770_1206_m_000026",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185121,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166319,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185121,
+-      "attemptID" : "attempt_1369942127770_1206_m_000026_0",
+-      "clockSplits" : [ 2178, 2179, 2178, 2179, 1980, 1194, 1194, 904, 713, 713, 713, 2671 ],
+-      "cpuUsages" : [ 1365, 1365, 1365, 1365, 1309, 1089, 1089, 917, 805, 805, 805, 1301 ],
+-      "vmemKbytes" : [ 147880, 443640, 739400, 1035160, 1324892, 1419083, 1419084, 1419083, 1419084, 1419084, 1419083, 1419084 ],
+-      "physMemKbytes" : [ 29159, 87477, 145795, 204112, 261297, 281682, 284343, 286121, 284301, 282096, 279891, 278128 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13580,
+-        "virtualMemoryUsage" : 1453142016,
+-        "physicalMemoryUsage" : 286785536,
+-        "heapUsage" : 609091584
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164124,
+-    "taskID" : "task_1369942127770_1206_m_000027",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186069,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166318,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186069,
+-      "attemptID" : "attempt_1369942127770_1206_m_000027_0",
+-      "clockSplits" : [ 2248, 2249, 2249, 2248, 1776, 1068, 1067, 993, 918, 918, 2288, 1622 ],
+-      "cpuUsages" : [ 1367, 1368, 1367, 1368, 1258, 1097, 1096, 966, 836, 836, 879, 1172 ],
+-      "vmemKbytes" : [ 154759, 464278, 773798, 1083317, 1368023, 1423659, 1423660, 1423659, 1423660, 1423660, 1423659, 1423660 ],
+-      "physMemKbytes" : [ 30750, 92253, 153756, 215259, 271847, 283056, 283244, 283187, 281664, 279894, 278154, 278631 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13680,
+-        "virtualMemoryUsage" : 1457827840,
+-        "physicalMemoryUsage" : 286220288,
+-        "heapUsage" : 592445440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164124,
+-    "taskID" : "task_1369942127770_1206_m_000028",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222185115,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166327,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222185115,
+-      "attemptID" : "attempt_1369942127770_1206_m_000028_0",
+-      "clockSplits" : [ 2169, 2170, 2170, 2170, 2072, 953, 954, 953, 890, 876, 876, 2529 ],
+-      "cpuUsages" : [ 1402, 1402, 1403, 1402, 1374, 1043, 1042, 1043, 920, 896, 895, 1618 ],
+-      "vmemKbytes" : [ 146031, 438093, 730155, 1022217, 1313341, 1436891, 1436892, 1436891, 1436892, 1436892, 1436891, 1436892 ],
+-      "physMemKbytes" : [ 28835, 86506, 144177, 201848, 259347, 285982, 289861, 293740, 300259, 311707, 323267, 334513 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14440,
+-        "virtualMemoryUsage" : 1471377408,
+-        "physicalMemoryUsage" : 346238976,
+-        "heapUsage" : 679346176
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164124,
+-    "taskID" : "task_1369942127770_1206_m_000029",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222186085,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222166330,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222186085,
+-      "attemptID" : "attempt_1369942127770_1206_m_000029_0",
+-      "clockSplits" : [ 2131, 2132, 2132, 2132, 2131, 1196, 1106, 1107, 1114, 1115, 2070, 1384 ],
+-      "cpuUsages" : [ 1316, 1317, 1317, 1317, 1317, 1079, 1056, 1048, 986, 985, 1017, 1075 ],
+-      "vmemKbytes" : [ 141371, 424113, 706855, 989597, 1272340, 1437442, 1438532, 1438531, 1438532, 1438532, 1438531, 1438532 ],
+-      "physMemKbytes" : [ 27222, 81669, 136115, 190561, 245008, 277502, 279390, 281042, 280013, 277262, 274876, 276619 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13830,
+-        "virtualMemoryUsage" : 1473056768,
+-        "physicalMemoryUsage" : 284745728,
+-        "heapUsage" : 608043008
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164125,
+-    "taskID" : "task_1369942127770_1206_m_000030",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209777,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222186223,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209777,
+-      "attemptID" : "attempt_1369942127770_1206_m_000030_0",
+-      "clockSplits" : [ 3325, 3325, 3326, 1633, 1137, 1137, 1676, 1628, 916, 916, 917, 3460 ],
+-      "cpuUsages" : [ 1614, 1615, 1615, 1232, 1121, 1121, 1189, 1174, 1017, 1017, 1017, 1238 ],
+-      "vmemKbytes" : [ 220995, 662987, 1104979, 1414799, 1426152, 1426151, 1426152, 1426151, 1426152, 1426152, 1426151, 1426152 ],
+-      "physMemKbytes" : [ 46111, 138333, 230555, 295761, 299962, 301841, 304098, 306831, 306453, 304076, 301699, 299750 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 15080,
+-        "virtualMemoryUsage" : 1460379648,
+-        "physicalMemoryUsage" : 306688000,
+-        "heapUsage" : 745209856
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164125,
+-    "taskID" : "task_1369942127770_1206_m_000031",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209814,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222186224,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209814,
+-      "attemptID" : "attempt_1369942127770_1206_m_000031_0",
+-      "clockSplits" : [ 2788, 2789, 2789, 2665, 1430, 1431, 1710, 1647, 900, 899, 900, 3438 ],
+-      "cpuUsages" : [ 1386, 1387, 1387, 1361, 1109, 1109, 1131, 1115, 964, 965, 964, 1252 ],
+-      "vmemKbytes" : [ 182198, 546594, 910990, 1273865, 1424288, 1424287, 1424288, 1424287, 1424288, 1424288, 1424287, 1424288 ],
+-      "physMemKbytes" : [ 38354, 115062, 191770, 268152, 298904, 297349, 296494, 296717, 296215, 295239, 294262, 293471 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14390,
+-        "virtualMemoryUsage" : 1458470912,
+-        "physicalMemoryUsage" : 302673920,
+-        "heapUsage" : 724500480
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164125,
+-    "taskID" : "task_1369942127770_1206_m_000032",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209796,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222186230,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209796,
+-      "attemptID" : "attempt_1369942127770_1206_m_000032_0",
+-      "clockSplits" : [ 3446, 3446, 3447, 1666, 1610, 1052, 1052, 1212, 2392, 1340, 1113, 1783 ],
+-      "cpuUsages" : [ 1574, 1575, 1575, 1192, 1179, 1036, 1036, 1060, 1242, 897, 823, 1161 ],
+-      "vmemKbytes" : [ 236125, 708377, 1180629, 1421325, 1421348, 1421347, 1421348, 1421347, 1421348, 1421348, 1421347, 1421348 ],
+-      "physMemKbytes" : [ 51196, 153591, 255986, 308231, 308353, 309496, 311445, 313379, 314141, 313513, 311665, 309787 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14350,
+-        "virtualMemoryUsage" : 1455460352,
+-        "physicalMemoryUsage" : 316284928,
+-        "heapUsage" : 741015552
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164126,
+-    "taskID" : "task_1369942127770_1206_m_000033",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209114,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222186269,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209114,
+-      "attemptID" : "attempt_1369942127770_1206_m_000033_0",
+-      "clockSplits" : [ 2867, 2868, 2867, 2868, 1157, 1130, 1219, 2051, 1397, 925, 924, 2567 ],
+-      "cpuUsages" : [ 1397, 1397, 1397, 1397, 1133, 1129, 1138, 1227, 1043, 911, 911, 1420 ],
+-      "vmemKbytes" : [ 177507, 532523, 887539, 1242554, 1425454, 1425495, 1425496, 1425495, 1425496, 1425496, 1425495, 1425496 ],
+-      "physMemKbytes" : [ 35271, 105813, 176355, 246896, 284278, 286428, 288564, 289767, 290547, 292311, 294191, 296014 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14500,
+-        "virtualMemoryUsage" : 1459707904,
+-        "physicalMemoryUsage" : 303673344,
+-        "heapUsage" : 669974528
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164126,
+-    "taskID" : "task_1369942127770_1206_m_000034",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222205072,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222186230,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222205072,
+-      "attemptID" : "attempt_1369942127770_1206_m_000034_0",
+-      "clockSplits" : [ 1942, 1943, 1943, 1942, 1943, 1831, 787, 788, 788, 889, 1494, 2545 ],
+-      "cpuUsages" : [ 1226, 1226, 1227, 1226, 1227, 1208, 1040, 1039, 1040, 1009, 828, 1724 ],
+-      "vmemKbytes" : [ 121272, 363818, 606363, 848908, 1091454, 1332855, 1430977, 1429650, 1428324, 1427011, 1426523, 1426524 ],
+-      "physMemKbytes" : [ 27249, 81750, 136250, 190750, 245251, 299492, 321349, 320728, 320107, 319489, 319062, 318747 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14020,
+-        "virtualMemoryUsage" : 1460760576,
+-        "physicalMemoryUsage" : 326189056,
+-        "heapUsage" : 668139520
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164126,
+-    "taskID" : "task_1369942127770_1206_m_000035",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209265,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222186231,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209265,
+-      "attemptID" : "attempt_1369942127770_1206_m_000035_0",
+-      "clockSplits" : [ 2312, 2313, 2313, 2313, 2313, 2097, 1450, 1407, 1083, 1084, 3675, 312 ],
+-      "cpuUsages" : [ 1166, 1167, 1167, 1166, 1167, 1149, 1093, 1075, 945, 945, 1023, 1307 ],
+-      "vmemKbytes" : [ 123562, 370687, 617812, 864937, 1112063, 1351529, 1421224, 1421223, 1421224, 1421224, 1421223, 1421224 ],
+-      "physMemKbytes" : [ 23849, 71548, 119247, 166946, 214646, 260983, 277134, 280864, 282024, 281525, 281038, 280933 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13460,
+-        "virtualMemoryUsage" : 1455333376,
+-        "physicalMemoryUsage" : 293855232,
+-        "heapUsage" : 645595136
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164127,
+-    "taskID" : "task_1369942127770_1206_m_000036",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222205027,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222186270,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222205027,
+-      "attemptID" : "attempt_1369942127770_1206_m_000036_0",
+-      "clockSplits" : [ 1457, 1458, 1457, 1458, 1458, 1457, 1588, 1594, 1020, 1007, 1007, 3788 ],
+-      "cpuUsages" : [ 1146, 1146, 1146, 1146, 1147, 1146, 1350, 1361, 1032, 1024, 1024, 1372 ],
+-      "vmemKbytes" : [ 117533, 352601, 587669, 822736, 1057804, 1292871, 1420975, 1421223, 1421224, 1421224, 1421223, 1421224 ],
+-      "physMemKbytes" : [ 25662, 76986, 128310, 179634, 230959, 282283, 311405, 313987, 314079, 311498, 308915, 307356 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14040,
+-        "virtualMemoryUsage" : 1455333376,
+-        "physicalMemoryUsage" : 314486784,
+-        "heapUsage" : 725483520
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164127,
+-    "taskID" : "task_1369942127770_1206_m_000037",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222204802,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222186229,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222204802,
+-      "attemptID" : "attempt_1369942127770_1206_m_000037_0",
+-      "clockSplits" : [ 2817, 2817, 2817, 1469, 1026, 1027, 1211, 1334, 3276, 257, 257, 258 ],
+-      "cpuUsages" : [ 1465, 1466, 1466, 1237, 1161, 1162, 1220, 1260, 1163, 850, 850, 850 ],
+-      "vmemKbytes" : [ 221437, 664313, 1107189, 1424591, 1438128, 1438127, 1438128, 1438127, 1438128, 1438128, 1438127, 1438128 ],
+-      "physMemKbytes" : [ 47520, 142560, 237600, 305733, 308702, 308767, 308909, 309355, 309754, 308145, 305672, 303200 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14150,
+-        "virtualMemoryUsage" : 1472643072,
+-        "physicalMemoryUsage" : 309211136,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164127,
+-    "taskID" : "task_1369942127770_1206_m_000038",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222205071,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222186231,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222205071,
+-      "attemptID" : "attempt_1369942127770_1206_m_000038_0",
+-      "clockSplits" : [ 2279, 2280, 2280, 2280, 869, 832, 833, 833, 889, 890, 889, 3531 ],
+-      "cpuUsages" : [ 1331, 1332, 1332, 1332, 1164, 1161, 1160, 1159, 1012, 1011, 1012, 1254 ],
+-      "vmemKbytes" : [ 176677, 530031, 883386, 1236740, 1422008, 1422115, 1422116, 1422115, 1422116, 1422116, 1422115, 1422116 ],
+-      "physMemKbytes" : [ 37600, 112801, 188002, 263203, 303425, 305112, 306777, 308442, 309142, 308918, 308694, 308464 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14390,
+-        "virtualMemoryUsage" : 1456246784,
+-        "physicalMemoryUsage" : 315645952,
+-        "heapUsage" : 745013248
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164127,
+-    "taskID" : "task_1369942127770_1206_m_000039",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222204844,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222186270,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222204844,
+-      "attemptID" : "attempt_1369942127770_1206_m_000039_0",
+-      "clockSplits" : [ 1520, 1521, 1521, 1520, 1521, 1502, 1411, 1412, 1054, 1023, 1024, 3236 ],
+-      "cpuUsages" : [ 1201, 1201, 1201, 1201, 1201, 1219, 1301, 1301, 1078, 1060, 1059, 997 ],
+-      "vmemKbytes" : [ 123345, 370038, 616730, 863421, 1110114, 1353144, 1437648, 1437647, 1437648, 1437648, 1437647, 1437648 ],
+-      "physMemKbytes" : [ 26607, 79823, 133038, 186253, 239469, 291949, 312598, 316277, 317760, 316265, 314752, 313761 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14310,
+-        "virtualMemoryUsage" : 1472151552,
+-        "physicalMemoryUsage" : 321114112,
+-        "heapUsage" : 738000896
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164128,
+-    "taskID" : "task_1369942127770_1206_m_000040",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222208051,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222187226,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222208051,
+-      "attemptID" : "attempt_1369942127770_1206_m_000040_0",
+-      "clockSplits" : [ 2708, 2709, 2709, 2708, 1324, 1241, 1170, 983, 983, 3572, 201, 201 ],
+-      "cpuUsages" : [ 1449, 1450, 1449, 1450, 1163, 1146, 1099, 972, 971, 970, 945, 946 ],
+-      "vmemKbytes" : [ 173689, 521067, 868445, 1215823, 1408585, 1409139, 1409140, 1409139, 1409140, 1409140, 1409139, 1409140 ],
+-      "physMemKbytes" : [ 37436, 112308, 187180, 262052, 304948, 308090, 311012, 311933, 312102, 312258, 310764, 308111 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14260,
+-        "virtualMemoryUsage" : 1442959360,
+-        "physicalMemoryUsage" : 314261504,
+-        "heapUsage" : 739639296
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164128,
+-    "taskID" : "task_1369942127770_1206_m_000041",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209764,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222187225,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209764,
+-      "attemptID" : "attempt_1369942127770_1206_m_000041_0",
+-      "clockSplits" : [ 2460, 2461, 2461, 2366, 1711, 1637, 1437, 1554, 2430, 3338, 136, 137 ],
+-      "cpuUsages" : [ 1422, 1423, 1423, 1400, 1245, 1214, 1134, 1139, 1181, 1020, 984, 985 ],
+-      "vmemKbytes" : [ 183430, 550292, 917154, 1281033, 1420664, 1420663, 1420664, 1420663, 1420664, 1420664, 1420663, 1420664 ],
+-      "physMemKbytes" : [ 38854, 116562, 194270, 271356, 301598, 302728, 304891, 307428, 308423, 307956, 306560, 305139 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14710,
+-        "virtualMemoryUsage" : 1454759936,
+-        "physicalMemoryUsage" : 311668736,
+-        "heapUsage" : 734986240
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164129,
+-    "taskID" : "task_1369942127770_1206_m_000042",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222210013,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222188236,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222210013,
+-      "attemptID" : "attempt_1369942127770_1206_m_000042_0",
+-      "clockSplits" : [ 2345, 2345, 2346, 2345, 2345, 1441, 1165, 1139, 942, 942, 942, 3297 ],
+-      "cpuUsages" : [ 1329, 1330, 1330, 1330, 1330, 1110, 1042, 1028, 918, 919, 918, 1176 ],
+-      "vmemKbytes" : [ 135997, 407991, 679985, 951978, 1223973, 1416016, 1423416, 1423415, 1423416, 1423416, 1423415, 1423416 ],
+-      "physMemKbytes" : [ 29954, 89862, 149770, 209678, 269587, 312158, 314689, 315603, 315555, 314887, 314219, 313779 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13870,
+-        "virtualMemoryUsage" : 1457577984,
+-        "physicalMemoryUsage" : 321241088,
+-        "heapUsage" : 745275392
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164129,
+-    "taskID" : "task_1369942127770_1206_m_000043",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209829,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222188247,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209829,
+-      "attemptID" : "attempt_1369942127770_1206_m_000043_0",
+-      "clockSplits" : [ 2418, 2419, 2419, 2159, 1443, 1453, 1585, 1514, 988, 987, 988, 3120 ],
+-      "cpuUsages" : [ 1496, 1497, 1497, 1419, 1200, 1197, 1139, 1120, 984, 983, 984, 1064 ],
+-      "vmemKbytes" : [ 192713, 578139, 963566, 1335372, 1439240, 1439239, 1439240, 1439239, 1439240, 1439240, 1439239, 1439240 ],
+-      "physMemKbytes" : [ 41062, 123187, 205312, 284536, 306688, 306724, 308963, 312869, 313477, 311955, 310433, 309628 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14730,
+-        "virtualMemoryUsage" : 1473781760,
+-        "physicalMemoryUsage" : 316993536,
+-        "heapUsage" : 742588416
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164129,
+-    "taskID" : "task_1369942127770_1206_m_000044",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222205147,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222188243,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222205147,
+-      "attemptID" : "attempt_1369942127770_1206_m_000044_0",
+-      "clockSplits" : [ 1997, 1998, 1998, 1998, 1656, 1015, 1015, 992, 821, 821, 821, 1763 ],
+-      "cpuUsages" : [ 1362, 1363, 1363, 1363, 1290, 1156, 1155, 1116, 828, 828, 828, 1418 ],
+-      "vmemKbytes" : [ 154789, 464368, 773947, 1083526, 1374102, 1436109, 1431198, 1426321, 1424416, 1424416, 1424415, 1424416 ],
+-      "physMemKbytes" : [ 33320, 99960, 166601, 233241, 295602, 306484, 302294, 298121, 295429, 293687, 291944, 290254 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14070,
+-        "virtualMemoryUsage" : 1458601984,
+-        "physicalMemoryUsage" : 296701952,
+-        "heapUsage" : 740294656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164130,
+-    "taskID" : "task_1369942127770_1206_m_000045",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222208888,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222188284,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222208888,
+-      "attemptID" : "attempt_1369942127770_1206_m_000045_0",
+-      "clockSplits" : [ 2408, 2408, 2409, 2408, 1248, 994, 993, 1546, 1811, 1173, 1142, 2044 ],
+-      "cpuUsages" : [ 1442, 1443, 1443, 1443, 1216, 1167, 1167, 1242, 1278, 871, 851, 1187 ],
+-      "vmemKbytes" : [ 170497, 511493, 852489, 1193484, 1419688, 1425179, 1425180, 1425179, 1425180, 1425180, 1425179, 1425180 ],
+-      "physMemKbytes" : [ 36659, 109977, 183295, 256613, 305816, 308651, 310334, 311695, 312050, 312197, 312184, 312178 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14750,
+-        "virtualMemoryUsage" : 1459384320,
+-        "physicalMemoryUsage" : 319713280,
+-        "heapUsage" : 733020160
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164130,
+-    "taskID" : "task_1369942127770_1206_m_000046",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209764,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222188246,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209764,
+-      "attemptID" : "attempt_1369942127770_1206_m_000046_0",
+-      "clockSplits" : [ 2411, 2412, 2411, 2412, 1354, 1182, 1201, 1287, 1288, 1246, 1233, 3075 ],
+-      "cpuUsages" : [ 1429, 1430, 1430, 1430, 1204, 1167, 1149, 1069, 1069, 932, 888, 1233 ],
+-      "vmemKbytes" : [ 170204, 510614, 851024, 1191433, 1405939, 1409271, 1409272, 1409271, 1409272, 1409272, 1409271, 1409272 ],
+-      "physMemKbytes" : [ 36770, 110311, 183853, 257394, 302847, 301188, 298826, 298087, 298200, 297470, 294709, 291944 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14430,
+-        "virtualMemoryUsage" : 1443094528,
+-        "physicalMemoryUsage" : 298102784,
+-        "heapUsage" : 740622336
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164130,
+-    "taskID" : "task_1369942127770_1206_m_000047",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209770,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222188244,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209770,
+-      "attemptID" : "attempt_1369942127770_1206_m_000047_0",
+-      "clockSplits" : [ 2359, 2360, 2360, 2360, 991, 967, 967, 1864, 1869, 1009, 1009, 3406 ],
+-      "cpuUsages" : [ 1381, 1382, 1381, 1382, 1111, 1107, 1107, 1332, 1274, 926, 926, 1181 ],
+-      "vmemKbytes" : [ 175422, 526266, 877111, 1227955, 1409352, 1409403, 1409404, 1409403, 1409404, 1409404, 1409403, 1409404 ],
+-      "physMemKbytes" : [ 38481, 115443, 192406, 269368, 308485, 307099, 305702, 305330, 307856, 308596, 308675, 308751 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14490,
+-        "virtualMemoryUsage" : 1443229696,
+-        "physicalMemoryUsage" : 316166144,
+-        "heapUsage" : 743505920
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164130,
+-    "taskID" : "task_1369942127770_1206_m_000048",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209758,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222188248,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209758,
+-      "attemptID" : "attempt_1369942127770_1206_m_000048_0",
+-      "clockSplits" : [ 2073, 2074, 2074, 2074, 2073, 1639, 1272, 1276, 1301, 1301, 1674, 1842 ],
+-      "cpuUsages" : [ 1234, 1235, 1235, 1235, 1235, 1183, 1139, 1135, 1103, 1104, 909, 823 ],
+-      "vmemKbytes" : [ 129783, 389349, 648915, 908480, 1168047, 1389454, 1416722, 1416815, 1416852, 1416852, 1416851, 1416852 ],
+-      "physMemKbytes" : [ 25359, 76080, 126801, 177521, 228242, 271580, 277354, 277862, 277694, 277090, 276628, 276597 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13990,
+-        "virtualMemoryUsage" : 1450856448,
+-        "physicalMemoryUsage" : 287096832,
+-        "heapUsage" : 598081536
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164131,
+-    "taskID" : "task_1369942127770_1206_m_000049",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209877,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222188245,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209877,
+-      "attemptID" : "attempt_1369942127770_1206_m_000049_0",
+-      "clockSplits" : [ 2394, 2395, 2394, 2395, 2395, 1860, 1150, 1150, 985, 905, 904, 2700 ],
+-      "cpuUsages" : [ 1252, 1253, 1253, 1253, 1253, 1165, 1047, 1048, 897, 822, 823, 1324 ],
+-      "vmemKbytes" : [ 126489, 379468, 632447, 885426, 1138405, 1368134, 1409448, 1409495, 1409533, 1409536, 1409535, 1409536 ],
+-      "physMemKbytes" : [ 26096, 78289, 130482, 182675, 234868, 282278, 290926, 291083, 290759, 288885, 286894, 284958 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13390,
+-        "virtualMemoryUsage" : 1443364864,
+-        "physicalMemoryUsage" : 291172352,
+-        "heapUsage" : 728629248
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164131,
+-    "taskID" : "task_1369942127770_1206_m_000050",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209871,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222188246,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209871,
+-      "attemptID" : "attempt_1369942127770_1206_m_000050_0",
+-      "clockSplits" : [ 2330, 2330, 2331, 2330, 2331, 1760, 1284, 1228, 809, 809, 809, 3269 ],
+-      "cpuUsages" : [ 1299, 1300, 1300, 1299, 1300, 1110, 952, 941, 864, 865, 864, 1296 ],
+-      "vmemKbytes" : [ 129180, 387540, 645900, 904260, 1162621, 1382642, 1409412, 1409411, 1409412, 1409412, 1409411, 1409412 ],
+-      "physMemKbytes" : [ 27390, 82173, 136956, 191739, 246522, 293591, 301780, 304563, 305591, 305485, 305379, 305268 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13390,
+-        "virtualMemoryUsage" : 1443237888,
+-        "physicalMemoryUsage" : 312508416,
+-        "heapUsage" : 745275392
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164131,
+-    "taskID" : "task_1369942127770_1206_m_000051",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209798,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222189249,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209798,
+-      "attemptID" : "attempt_1369942127770_1206_m_000051_0",
+-      "clockSplits" : [ 2459, 2460, 2460, 2460, 2460, 1450, 922, 923, 947, 1056, 1056, 1891 ],
+-      "cpuUsages" : [ 1238, 1239, 1239, 1239, 1239, 1071, 982, 982, 962, 870, 869, 1390 ],
+-      "vmemKbytes" : [ 133415, 400246, 667077, 933908, 1200739, 1410001, 1425708, 1425707, 1425708, 1425708, 1425707, 1425708 ],
+-      "physMemKbytes" : [ 29016, 87050, 145083, 203116, 261151, 306685, 310195, 310295, 310356, 308899, 306668, 304504 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13320,
+-        "virtualMemoryUsage" : 1459924992,
+-        "physicalMemoryUsage" : 311140352,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164132,
+-    "taskID" : "task_1369942127770_1206_m_000052",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209546,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222189252,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209546,
+-      "attemptID" : "attempt_1369942127770_1206_m_000052_0",
+-      "clockSplits" : [ 2113, 2113, 2113, 2113, 1296, 902, 902, 1007, 1429, 1434, 1749, 3118 ],
+-      "cpuUsages" : [ 1343, 1343, 1343, 1343, 1163, 1076, 1077, 1044, 916, 918, 1010, 1614 ],
+-      "vmemKbytes" : [ 165998, 497994, 829990, 1161986, 1418463, 1436051, 1436052, 1435986, 1433726, 1430398, 1428787, 1428788 ],
+-      "physMemKbytes" : [ 31862, 95586, 159310, 223034, 272810, 278461, 280865, 283418, 290959, 300928, 308895, 314795 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14190,
+-        "virtualMemoryUsage" : 1463078912,
+-        "physicalMemoryUsage" : 324112384,
+-        "heapUsage" : 672333824
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164132,
+-    "taskID" : "task_1369942127770_1206_m_000053",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222211732,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222189248,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222211732,
+-      "attemptID" : "attempt_1369942127770_1206_m_000053_0",
+-      "clockSplits" : [ 3379, 3380, 3379, 3380, 1214, 1180, 1480, 2139, 2348, 200, 200, 200 ],
+-      "cpuUsages" : [ 1382, 1382, 1382, 1382, 1146, 1141, 1199, 1326, 847, 768, 767, 768 ],
+-      "vmemKbytes" : [ 176837, 530511, 884186, 1237861, 1420070, 1420111, 1420112, 1420111, 1420112, 1420112, 1420111, 1420112 ],
+-      "physMemKbytes" : [ 37701, 113105, 188508, 263911, 302843, 303027, 303274, 304566, 304973, 303294, 301579, 299865 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13490,
+-        "virtualMemoryUsage" : 1454194688,
+-        "physicalMemoryUsage" : 306184192,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164132,
+-    "taskID" : "task_1369942127770_1206_m_000054",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209794,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222189250,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209794,
+-      "attemptID" : "attempt_1369942127770_1206_m_000054_0",
+-      "clockSplits" : [ 1915, 1915, 1915, 1915, 1915, 1152, 1100, 1150, 1523, 1535, 1698, 2805 ],
+-      "cpuUsages" : [ 1363, 1363, 1363, 1363, 1363, 1198, 1188, 1163, 976, 977, 997, 1316 ],
+-      "vmemKbytes" : [ 140637, 421911, 703185, 984458, 1265733, 1423312, 1423856, 1423855, 1423856, 1423856, 1423855, 1423856 ],
+-      "physMemKbytes" : [ 30869, 92607, 154346, 216085, 277824, 313467, 315980, 318362, 319339, 319401, 317453, 314073 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14630,
+-        "virtualMemoryUsage" : 1458028544,
+-        "physicalMemoryUsage" : 320655360,
+-        "heapUsage" : 740294656
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164133,
+-    "taskID" : "task_1369942127770_1206_m_000055",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209829,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222190266,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209829,
+-      "attemptID" : "attempt_1369942127770_1206_m_000055_0",
+-      "clockSplits" : [ 2156, 2157, 2157, 2157, 1560, 923, 923, 951, 1166, 1165, 3553, 294 ],
+-      "cpuUsages" : [ 1567, 1568, 1568, 1568, 1331, 1078, 1079, 1081, 1094, 1094, 1067, 1035 ],
+-      "vmemKbytes" : [ 159573, 478720, 797867, 1117014, 1398782, 1441271, 1441272, 1441271, 1441272, 1441272, 1441271, 1441272 ],
+-      "physMemKbytes" : [ 34072, 102218, 170364, 238509, 298798, 308785, 309842, 310878, 310220, 308476, 306900, 306628 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 15280,
+-        "virtualMemoryUsage" : 1475862528,
+-        "physicalMemoryUsage" : 313933824,
+-        "heapUsage" : 740491264
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164133,
+-    "taskID" : "task_1369942127770_1206_m_000056",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209766,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222190265,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209766,
+-      "attemptID" : "attempt_1369942127770_1206_m_000056_0",
+-      "clockSplits" : [ 1671, 1672, 1672, 1672, 1671, 1485, 1304, 1382, 1955, 1637, 1335, 2040 ],
+-      "cpuUsages" : [ 1307, 1307, 1308, 1307, 1307, 1228, 1152, 1137, 1033, 976, 924, 1214 ],
+-      "vmemKbytes" : [ 129345, 388038, 646731, 905424, 1164117, 1389407, 1420696, 1420695, 1420696, 1420696, 1420695, 1420696 ],
+-      "physMemKbytes" : [ 29283, 87851, 146419, 204986, 263554, 314885, 324186, 326689, 327672, 327261, 324457, 321292 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14200,
+-        "virtualMemoryUsage" : 1454792704,
+-        "physicalMemoryUsage" : 327684096,
+-        "heapUsage" : 659947520
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164133,
+-    "taskID" : "task_1369942127770_1206_m_000057",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209780,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222190273,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209780,
+-      "attemptID" : "attempt_1369942127770_1206_m_000057_0",
+-      "clockSplits" : [ 1937, 1937, 1937, 1937, 1937, 1808, 921, 921, 920, 1160, 1247, 2840 ],
+-      "cpuUsages" : [ 1261, 1262, 1262, 1261, 1262, 1229, 1008, 1008, 1007, 884, 839, 1247 ],
+-      "vmemKbytes" : [ 120936, 362811, 604686, 846560, 1088435, 1328359, 1420532, 1420531, 1420532, 1420532, 1420531, 1420532 ],
+-      "physMemKbytes" : [ 26360, 79080, 131800, 184520, 237241, 289556, 311113, 313482, 315853, 316764, 313891, 310918 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13530,
+-        "virtualMemoryUsage" : 1454624768,
+-        "physicalMemoryUsage" : 317476864,
+-        "heapUsage" : 728170496
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164133,
+-    "taskID" : "task_1369942127770_1206_m_000058",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222209289,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222190266,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222209289,
+-      "attemptID" : "attempt_1369942127770_1206_m_000058_0",
+-      "clockSplits" : [ 1567, 1568, 1568, 1568, 1568, 1568, 1852, 2691, 800, 800, 799, 2669 ],
+-      "cpuUsages" : [ 1236, 1236, 1237, 1236, 1237, 1236, 1292, 1435, 895, 895, 895, 1280 ],
+-      "vmemKbytes" : [ 104429, 313288, 522147, 731006, 939866, 1148725, 1353137, 1418911, 1418912, 1418912, 1418911, 1418912 ],
+-      "physMemKbytes" : [ 22528, 67586, 112643, 157700, 202758, 247815, 292006, 309112, 309629, 307720, 305811, 303966 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14110,
+-        "virtualMemoryUsage" : 1452965888,
+-        "physicalMemoryUsage" : 310743040,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164134,
+-    "taskID" : "task_1369942127770_1206_m_000059",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222211562,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222192248,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222211562,
+-      "attemptID" : "attempt_1369942127770_1206_m_000059_0",
+-      "clockSplits" : [ 2767, 2767, 2768, 2767, 849, 819, 819, 967, 2079, 2282, 212, 213 ],
+-      "cpuUsages" : [ 1464, 1464, 1465, 1464, 1054, 1047, 1047, 1043, 1010, 905, 843, 844 ],
+-      "vmemKbytes" : [ 177532, 532598, 887664, 1242729, 1425654, 1425695, 1425696, 1425695, 1425696, 1425696, 1425695, 1425696 ],
+-      "physMemKbytes" : [ 35793, 107380, 178967, 250554, 288480, 290645, 292802, 294945, 295913, 295599, 293360, 290944 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13650,
+-        "virtualMemoryUsage" : 1459912704,
+-        "physicalMemoryUsage" : 296689664,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164134,
+-    "taskID" : "task_1369942127770_1206_m_000060",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222225441,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222206294,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222225441,
+-      "attemptID" : "attempt_1369942127770_1206_m_000060_0",
+-      "clockSplits" : [ 1420, 1420, 1421, 1420, 1420, 1421, 1382, 1130, 1130, 1252, 1448, 4180 ],
+-      "cpuUsages" : [ 1221, 1222, 1222, 1222, 1221, 1222, 1208, 1119, 1120, 1000, 808, 1165 ],
+-      "vmemKbytes" : [ 104942, 314826, 524711, 734595, 944480, 1154364, 1362397, 1441311, 1441312, 1441312, 1441311, 1441312 ],
+-      "physMemKbytes" : [ 22576, 67728, 112881, 158034, 203187, 248339, 293119, 311828, 314605, 317000, 315530, 313123 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13850,
+-        "virtualMemoryUsage" : 1475903488,
+-        "physicalMemoryUsage" : 319762432,
+-        "heapUsage" : 742326272
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164134,
+-    "taskID" : "task_1369942127770_1206_m_000061",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222221672,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222206296,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222221672,
+-      "attemptID" : "attempt_1369942127770_1206_m_000061_0",
+-      "clockSplits" : [ 1217, 1218, 1218, 1218, 1218, 1217, 1218, 1218, 1106, 972, 972, 2580 ],
+-      "cpuUsages" : [ 1102, 1102, 1103, 1102, 1103, 1102, 1102, 1103, 1008, 896, 896, 1281 ],
+-      "vmemKbytes" : [ 84070, 252211, 420352, 588493, 756634, 924775, 1092916, 1261057, 1411777, 1436728, 1436727, 1436728 ],
+-      "physMemKbytes" : [ 16339, 49018, 81697, 114376, 147055, 179734, 212413, 245092, 274523, 280502, 281827, 283091 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12900,
+-        "virtualMemoryUsage" : 1471209472,
+-        "physicalMemoryUsage" : 290119680,
+-        "heapUsage" : 674496512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164135,
+-    "taskID" : "task_1369942127770_1206_m_000062",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222221958,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222206298,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222221958,
+-      "attemptID" : "attempt_1369942127770_1206_m_000062_0",
+-      "clockSplits" : [ 1276, 1276, 1277, 1276, 1276, 1277, 1253, 882, 881, 882, 3492, 94 ],
+-      "cpuUsages" : [ 1156, 1157, 1157, 1157, 1157, 1156, 1148, 990, 990, 990, 1022, 1060 ],
+-      "vmemKbytes" : [ 101522, 304566, 507610, 710654, 913699, 1116743, 1319439, 1409411, 1409412, 1409412, 1409411, 1409412 ],
+-      "physMemKbytes" : [ 21852, 65556, 109261, 152965, 196670, 240375, 284000, 301612, 298461, 295309, 292461, 291917 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13490,
+-        "virtualMemoryUsage" : 1443237888,
+-        "physicalMemoryUsage" : 299003904,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164135,
+-    "taskID" : "task_1369942127770_1206_m_000063",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222227163,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222207290,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222227163,
+-      "attemptID" : "attempt_1369942127770_1206_m_000063_0",
+-      "clockSplits" : [ 1693, 1694, 1694, 1694, 1694, 1694, 1713, 2362, 4563, 269, 269, 270 ],
+-      "cpuUsages" : [ 1238, 1239, 1238, 1239, 1238, 1239, 1171, 1204, 1078, 895, 895, 896 ],
+-      "vmemKbytes" : [ 117528, 352587, 587645, 822702, 1057761, 1292818, 1424850, 1425327, 1425328, 1425328, 1425327, 1425328 ],
+-      "physMemKbytes" : [ 25760, 77280, 128800, 180319, 231840, 283359, 312333, 312567, 315051, 313807, 312106, 310406 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13690,
+-        "virtualMemoryUsage" : 1459535872,
+-        "physicalMemoryUsage" : 316899328,
+-        "heapUsage" : 735051776
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164135,
+-    "taskID" : "task_1369942127770_1206_m_000064",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222227254,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222207289,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222227254,
+-      "attemptID" : "attempt_1369942127770_1206_m_000064_0",
+-      "clockSplits" : [ 1705, 1705, 1705, 1705, 1705, 1702, 1632, 1534, 805, 806, 806, 3859 ],
+-      "cpuUsages" : [ 1228, 1228, 1228, 1228, 1228, 1225, 1140, 1106, 851, 851, 851, 1326 ],
+-      "vmemKbytes" : [ 119109, 357327, 595545, 833763, 1071982, 1310012, 1419836, 1419835, 1419836, 1419836, 1419835, 1419836 ],
+-      "physMemKbytes" : [ 25719, 77160, 128601, 180042, 231483, 282884, 306601, 306586, 305168, 302849, 300530, 298267 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13590,
+-        "virtualMemoryUsage" : 1453912064,
+-        "physicalMemoryUsage" : 304549888,
+-        "heapUsage" : 734855168
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164135,
+-    "taskID" : "task_1369942127770_1206_m_000065",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230890,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222207289,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230890,
+-      "attemptID" : "attempt_1369942127770_1206_m_000065_0",
+-      "clockSplits" : [ 2510, 2511, 2511, 2511, 881, 855, 855, 3817, 956, 957, 957, 4275 ],
+-      "cpuUsages" : [ 1419, 1420, 1419, 1420, 975, 968, 969, 1185, 898, 899, 898, 1340 ],
+-      "vmemKbytes" : [ 175498, 526495, 877492, 1228489, 1409318, 1409359, 1409360, 1409359, 1409360, 1409360, 1409359, 1409360 ],
+-      "physMemKbytes" : [ 37886, 113658, 189430, 265201, 304989, 306545, 308094, 310685, 313574, 311030, 308486, 306866 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13810,
+-        "virtualMemoryUsage" : 1443184640,
+-        "physicalMemoryUsage" : 314040320,
+-        "heapUsage" : 734920704
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164136,
+-    "taskID" : "task_1369942127770_1206_m_000066",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222241231,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222209293,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222241231,
+-      "attemptID" : "attempt_1369942127770_1206_m_000066_0",
+-      "clockSplits" : [ 1787, 1787, 1788, 1787, 1787, 1088, 1085, 4240, 1584, 1583, 1583, 11834 ],
+-      "cpuUsages" : [ 1420, 1421, 1421, 1421, 1421, 1182, 1181, 1242, 848, 848, 848, 1147 ],
+-      "vmemKbytes" : [ 141716, 425148, 708581, 992014, 1275447, 1418363, 1418476, 1418585, 1418628, 1418628, 1418627, 1418628 ],
+-      "physMemKbytes" : [ 30409, 91229, 152048, 212867, 273687, 305868, 308943, 311994, 312816, 312180, 311543, 310922 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14400,
+-        "virtualMemoryUsage" : 1452675072,
+-        "physicalMemoryUsage" : 318169088,
+-        "heapUsage" : 745537536
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164136,
+-    "taskID" : "task_1369942127770_1206_m_000067",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222225138,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222209294,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222225138,
+-      "attemptID" : "attempt_1369942127770_1206_m_000067_0",
+-      "clockSplits" : [ 1165, 1166, 1165, 1166, 1166, 1165, 1166, 928, 723, 722, 722, 3621 ],
+-      "cpuUsages" : [ 1214, 1215, 1215, 1215, 1215, 1215, 1215, 1030, 869, 869, 869, 1129 ],
+-      "vmemKbytes" : [ 95135, 285405, 475675, 665945, 856216, 1046485, 1236756, 1399842, 1420452, 1420452, 1420451, 1420452 ],
+-      "physMemKbytes" : [ 18348, 55044, 91740, 128435, 165132, 201827, 238524, 271054, 281752, 289291, 296830, 304922 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13660,
+-        "virtualMemoryUsage" : 1454542848,
+-        "physicalMemoryUsage" : 319750144,
+-        "heapUsage" : 673841152
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164136,
+-    "taskID" : "task_1369942127770_1206_m_000068",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230905,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222210298,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230905,
+-      "attemptID" : "attempt_1369942127770_1206_m_000068_0",
+-      "clockSplits" : [ 2408, 2408, 2408, 2409, 1930, 1718, 1379, 1310, 798, 798, 797, 2239 ],
+-      "cpuUsages" : [ 1541, 1542, 1541, 1542, 1162, 1109, 1032, 997, 741, 740, 740, 1213 ],
+-      "vmemKbytes" : [ 178979, 536937, 894896, 1252854, 1437270, 1437311, 1437312, 1437311, 1437312, 1437312, 1437311, 1437312 ],
+-      "physMemKbytes" : [ 38258, 114775, 191292, 267809, 307294, 307439, 307617, 307800, 307382, 306576, 305769, 304983 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13900,
+-        "virtualMemoryUsage" : 1471807488,
+-        "physicalMemoryUsage" : 312037376,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164137,
+-    "taskID" : "task_1369942127770_1206_m_000069",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222225328,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222210302,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222225328,
+-      "attemptID" : "attempt_1369942127770_1206_m_000069_0",
+-      "clockSplits" : [ 1091, 1092, 1091, 1092, 1092, 1091, 1092, 1058, 803, 804, 804, 3736 ],
+-      "cpuUsages" : [ 1107, 1107, 1108, 1107, 1108, 1107, 1108, 1073, 810, 810, 810, 1305 ],
+-      "vmemKbytes" : [ 89984, 269954, 449923, 629892, 809862, 989831, 1169801, 1348531, 1418636, 1418636, 1418635, 1418636 ],
+-      "physMemKbytes" : [ 17538, 52614, 87690, 122765, 157842, 192917, 227994, 262894, 282408, 291993, 301578, 311953 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12740,
+-        "virtualMemoryUsage" : 1452683264,
+-        "physicalMemoryUsage" : 329846784,
+-        "heapUsage" : 655818752
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164137,
+-    "taskID" : "task_1369942127770_1206_m_000070",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230923,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222210301,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230923,
+-      "attemptID" : "attempt_1369942127770_1206_m_000070_0",
+-      "clockSplits" : [ 1667, 1667, 1667, 1667, 1667, 1451, 1272, 1327, 1731, 1653, 1491, 3356 ],
+-      "cpuUsages" : [ 1331, 1331, 1331, 1331, 1332, 1146, 993, 987, 942, 944, 946, 1406 ],
+-      "vmemKbytes" : [ 130716, 392148, 653580, 915011, 1176444, 1398858, 1425760, 1425759, 1425760, 1425760, 1425759, 1425760 ],
+-      "physMemKbytes" : [ 25209, 75627, 126045, 176463, 226882, 269981, 276408, 277936, 291940, 312986, 321089, 324970 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 14020,
+-        "virtualMemoryUsage" : 1459978240,
+-        "physicalMemoryUsage" : 333864960,
+-        "heapUsage" : 675282944
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164137,
+-    "taskID" : "task_1369942127770_1206_m_000071",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222243147,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222210300,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222243147,
+-      "attemptID" : "attempt_1369942127770_1206_m_000071_0",
+-      "clockSplits" : [ 2317, 2317, 2317, 2318, 830, 804, 803, 20720, 104, 104, 104, 104 ],
+-      "cpuUsages" : [ 1476, 1476, 1476, 1476, 1068, 1062, 1061, 1367, 764, 765, 764, 765 ],
+-      "vmemKbytes" : [ 179124, 537372, 895621, 1253870, 1439095, 1439147, 1439148, 1439147, 1439148, 1439148, 1439147, 1439148 ],
+-      "physMemKbytes" : [ 38656, 115968, 193280, 270591, 311557, 313623, 315680, 317727, 317803, 316372, 314939, 313508 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13520,
+-        "virtualMemoryUsage" : 1473687552,
+-        "physicalMemoryUsage" : 320299008,
+-        "heapUsage" : 740425728
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164138,
+-    "taskID" : "task_1369942127770_1206_m_000072",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230925,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222210302,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230925,
+-      "attemptID" : "attempt_1369942127770_1206_m_000072_0",
+-      "clockSplits" : [ 2052, 2053, 2052, 2053, 2052, 1753, 1343, 1286, 863, 863, 863, 3385 ],
+-      "cpuUsages" : [ 1301, 1302, 1301, 1302, 1301, 1214, 1093, 1070, 887, 887, 887, 1265 ],
+-      "vmemKbytes" : [ 129050, 387150, 645250, 903350, 1161451, 1396549, 1439636, 1439635, 1439636, 1439636, 1439635, 1439636 ],
+-      "physMemKbytes" : [ 27936, 83809, 139683, 195556, 251430, 302570, 314193, 316918, 316967, 315288, 313608, 312145 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13810,
+-        "virtualMemoryUsage" : 1474187264,
+-        "physicalMemoryUsage" : 319389696,
+-        "heapUsage" : 725942272
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164138,
+-    "taskID" : "task_1369942127770_1206_m_000073",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222233643,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222211323,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222233643,
+-      "attemptID" : "attempt_1369942127770_1206_m_000073_0",
+-      "clockSplits" : [ 2850, 2850, 2851, 2850, 3634, 922, 921, 915, 864, 864, 863, 1931 ],
+-      "cpuUsages" : [ 1422, 1422, 1422, 1422, 1195, 974, 974, 956, 814, 813, 814, 1162 ],
+-      "vmemKbytes" : [ 178725, 536177, 893628, 1251079, 1430284, 1428495, 1428496, 1428495, 1428496, 1428496, 1428495, 1428496 ],
+-      "physMemKbytes" : [ 33814, 101442, 169070, 236698, 286736, 296978, 302601, 308176, 309819, 308938, 308057, 307285 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13390,
+-        "virtualMemoryUsage" : 1462779904,
+-        "physicalMemoryUsage" : 314519552,
+-        "heapUsage" : 656801792
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164138,
+-    "taskID" : "task_1369942127770_1206_m_000074",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222231021,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222211318,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222231021,
+-      "attemptID" : "attempt_1369942127770_1206_m_000074_0",
+-      "clockSplits" : [ 2026, 2027, 2026, 2027, 1805, 998, 998, 1150, 2266, 1405, 1124, 1124 ],
+-      "cpuUsages" : [ 1354, 1354, 1355, 1354, 1264, 933, 933, 931, 908, 776, 734, 734 ],
+-      "vmemKbytes" : [ 148613, 445839, 743066, 1040292, 1330604, 1422019, 1422020, 1422019, 1422020, 1422020, 1422019, 1422020 ],
+-      "physMemKbytes" : [ 32329, 96989, 161649, 226308, 289469, 309488, 309679, 309869, 309968, 309242, 306663, 304002 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13210,
+-        "virtualMemoryUsage" : 1456148480,
+-        "physicalMemoryUsage" : 313556992,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164139,
+-    "taskID" : "task_1369942127770_1206_m_000075",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230806,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222211320,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230806,
+-      "attemptID" : "attempt_1369942127770_1206_m_000075_0",
+-      "clockSplits" : [ 1609, 1609, 1610, 1609, 1609, 1610, 1609, 1437, 800, 800, 800, 3712 ],
+-      "cpuUsages" : [ 1126, 1126, 1126, 1126, 1127, 1126, 1126, 1078, 896, 897, 896, 1050 ],
+-      "vmemKbytes" : [ 91606, 274818, 458031, 641244, 824457, 1007670, 1190883, 1369937, 1426664, 1426664, 1426663, 1426664 ],
+-      "physMemKbytes" : [ 18989, 56967, 94945, 132922, 170901, 208878, 246857, 284002, 296666, 297978, 299289, 300540 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13070,
+-        "virtualMemoryUsage" : 1460903936,
+-        "physicalMemoryUsage" : 308080640,
+-        "heapUsage" : 728367104
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164139,
+-    "taskID" : "task_1369942127770_1206_m_000076",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222231013,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222211322,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222231013,
+-      "attemptID" : "attempt_1369942127770_1206_m_000076_0",
+-      "clockSplits" : [ 1510, 1510, 1510, 1510, 1511, 1510, 1543, 3155, 989, 989, 3170, 779 ],
+-      "cpuUsages" : [ 1182, 1183, 1183, 1183, 1183, 1183, 1182, 1138, 1003, 1002, 1004, 1174 ],
+-      "vmemKbytes" : [ 103292, 309877, 516463, 723048, 929633, 1136218, 1342774, 1442573, 1441656, 1440154, 1438651, 1437908 ],
+-      "physMemKbytes" : [ 22609, 67829, 113048, 158267, 203487, 248706, 293920, 315760, 313552, 309910, 306268, 304426 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13600,
+-        "virtualMemoryUsage" : 1472417792,
+-        "physicalMemoryUsage" : 311689216,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164139,
+-    "taskID" : "task_1369942127770_1206_m_000077",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230986,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222211321,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230986,
+-      "attemptID" : "attempt_1369942127770_1206_m_000077_0",
+-      "clockSplits" : [ 2453, 2454, 2454, 2454, 983, 819, 818, 834, 953, 953, 952, 3225 ],
+-      "cpuUsages" : [ 1358, 1358, 1358, 1358, 1081, 1050, 1050, 1036, 929, 930, 930, 882 ],
+-      "vmemKbytes" : [ 173221, 519663, 866105, 1212547, 1419007, 1420775, 1420776, 1420775, 1420776, 1420776, 1420775, 1420776 ],
+-      "physMemKbytes" : [ 37672, 113016, 188361, 263705, 309197, 311033, 312493, 313926, 312972, 310477, 307981, 306375 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13630,
+-        "virtualMemoryUsage" : 1454874624,
+-        "physicalMemoryUsage" : 313704448,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164139,
+-    "taskID" : "task_1369942127770_1206_m_000078",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230909,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222211322,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230909,
+-      "attemptID" : "attempt_1369942127770_1206_m_000078_0",
+-      "clockSplits" : [ 1544, 1545, 1545, 1545, 1545, 1544, 1888, 2074, 1066, 1066, 3565, 400 ],
+-      "cpuUsages" : [ 1237, 1237, 1238, 1237, 1237, 1238, 1206, 1153, 966, 966, 971, 994 ],
+-      "vmemKbytes" : [ 109547, 328642, 547738, 766833, 985929, 1205024, 1394686, 1420099, 1420100, 1420100, 1420099, 1420100 ],
+-      "physMemKbytes" : [ 23842, 71526, 119211, 166896, 214581, 262265, 303541, 309043, 308442, 307473, 306523, 306207 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13790,
+-        "virtualMemoryUsage" : 1454182400,
+-        "physicalMemoryUsage" : 313499648,
+-        "heapUsage" : 734789632
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164140,
+-    "taskID" : "task_1369942127770_1206_m_000079",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222241634,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212318,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222241634,
+-      "attemptID" : "attempt_1369942127770_1206_m_000079_0",
+-      "clockSplits" : [ 1728, 1728, 1728, 1728, 1729, 1728, 1984, 16602, 89, 88, 89, 89 ],
+-      "cpuUsages" : [ 1174, 1174, 1175, 1174, 1175, 1174, 1167, 1241, 766, 767, 766, 767 ],
+-      "vmemKbytes" : [ 109233, 327701, 546169, 764636, 983104, 1201571, 1396830, 1428571, 1428572, 1428572, 1428571, 1428572 ],
+-      "physMemKbytes" : [ 23542, 70627, 117712, 164797, 211882, 258967, 301447, 311452, 311774, 309734, 307693, 305652 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12520,
+-        "virtualMemoryUsage" : 1462857728,
+-        "physicalMemoryUsage" : 311943168,
+-        "heapUsage" : 723714048
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164140,
+-    "taskID" : "task_1369942127770_1206_m_000080",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222234375,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212320,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222234375,
+-      "attemptID" : "attempt_1369942127770_1206_m_000080_0",
+-      "clockSplits" : [ 2667, 2668, 2668, 2668, 1137, 1111, 1291, 2903, 866, 867, 866, 2337 ],
+-      "cpuUsages" : [ 1361, 1362, 1361, 1362, 1011, 1005, 1020, 1148, 925, 926, 925, 1094 ],
+-      "vmemKbytes" : [ 179085, 537255, 895425, 1253594, 1438779, 1438831, 1438832, 1438831, 1438832, 1438832, 1438831, 1438832 ],
+-      "physMemKbytes" : [ 38347, 115043, 191739, 268434, 308300, 308750, 309191, 309763, 309488, 308604, 307719, 306908 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13500,
+-        "virtualMemoryUsage" : 1473363968,
+-        "physicalMemoryUsage" : 314023936,
+-        "heapUsage" : 723714048
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164140,
+-    "taskID" : "task_1369942127770_1206_m_000081",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222233436,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212365,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222233436,
+-      "attemptID" : "attempt_1369942127770_1206_m_000081_0",
+-      "clockSplits" : [ 2872, 2872, 2872, 2872, 1498, 1478, 1590, 1608, 2713, 183, 183, 184 ],
+-      "cpuUsages" : [ 1372, 1372, 1372, 1373, 1091, 1087, 955, 934, 919, 918, 918, 919 ],
+-      "vmemKbytes" : [ 177378, 532136, 886894, 1241651, 1424418, 1424459, 1424460, 1424459, 1424460, 1424460, 1424459, 1424460 ],
+-      "physMemKbytes" : [ 36488, 109466, 182444, 255421, 293123, 293347, 293592, 293884, 293699, 292787, 291867, 290948 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13300,
+-        "virtualMemoryUsage" : 1458647040,
+-        "physicalMemoryUsage" : 297373696,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164141,
+-    "taskID" : "task_1369942127770_1206_m_000082",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222234234,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212323,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222234234,
+-      "attemptID" : "attempt_1369942127770_1206_m_000082_0",
+-      "clockSplits" : [ 2757, 2758, 2757, 2758, 2290, 984, 985, 1009, 1193, 1192, 2624, 600 ],
+-      "cpuUsages" : [ 1283, 1284, 1284, 1283, 1212, 1011, 1012, 1009, 997, 997, 992, 986 ],
+-      "vmemKbytes" : [ 150595, 451787, 752979, 1054170, 1344891, 1426535, 1426536, 1426535, 1426536, 1426536, 1426535, 1426536 ],
+-      "physMemKbytes" : [ 30285, 90858, 151430, 212001, 270566, 289039, 291857, 294632, 293797, 290645, 287899, 287491 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13350,
+-        "virtualMemoryUsage" : 1460772864,
+-        "physicalMemoryUsage" : 294371328,
+-        "heapUsage" : 723714048
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164141,
+-    "taskID" : "task_1369942127770_1206_m_000083",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222234374,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212325,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222234374,
+-      "attemptID" : "attempt_1369942127770_1206_m_000083_0",
+-      "clockSplits" : [ 2632, 2633, 2633, 2632, 2063, 1726, 1324, 1287, 1007, 1006, 1668, 1433 ],
+-      "cpuUsages" : [ 1382, 1382, 1382, 1382, 1210, 1095, 961, 964, 990, 990, 989, 963 ],
+-      "vmemKbytes" : [ 179482, 538446, 897411, 1256376, 1441309, 1441351, 1441352, 1441351, 1441352, 1441352, 1441351, 1441352 ],
+-      "physMemKbytes" : [ 38229, 114688, 191148, 267607, 307615, 309001, 311141, 313407, 313352, 311808, 310265, 309532 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13690,
+-        "virtualMemoryUsage" : 1475944448,
+-        "physicalMemoryUsage" : 316928000,
+-        "heapUsage" : 744685568
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164141,
+-    "taskID" : "task_1369942127770_1206_m_000084",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222233257,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222212365,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222233257,
+-      "attemptID" : "attempt_1369942127770_1206_m_000084_0",
+-      "clockSplits" : [ 3170, 3170, 3170, 3170, 841, 800, 800, 873, 1410, 1411, 1720, 353 ],
+-      "cpuUsages" : [ 1398, 1399, 1399, 1399, 938, 929, 929, 934, 971, 970, 919, 915 ],
+-      "vmemKbytes" : [ 176295, 528885, 881475, 1234064, 1416363, 1416415, 1416416, 1416415, 1416416, 1416416, 1416415, 1416416 ],
+-      "physMemKbytes" : [ 35965, 107895, 179825, 251754, 289004, 289138, 289261, 289383, 289436, 289443, 288025, 284629 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13100,
+-        "virtualMemoryUsage" : 1450409984,
+-        "physicalMemoryUsage" : 289714176,
+-        "heapUsage" : 723582976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164142,
+-    "taskID" : "task_1369942127770_1206_m_000085",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222240854,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222212327,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222240854,
+-      "attemptID" : "attempt_1369942127770_1206_m_000085_0",
+-      "clockSplits" : [ 2049, 2050, 2049, 2050, 2046, 1082, 1082, 15663, 112, 113, 113, 113 ],
+-      "cpuUsages" : [ 1282, 1283, 1283, 1283, 1282, 865, 866, 1015, 778, 777, 778, 778 ],
+-      "vmemKbytes" : [ 143872, 431618, 719364, 1007109, 1294853, 1437631, 1437632, 1437631, 1437632, 1437632, 1437631, 1437632 ],
+-      "physMemKbytes" : [ 31953, 95859, 159765, 223671, 287577, 319740, 320639, 321522, 320713, 318771, 316828, 314887 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12270,
+-        "virtualMemoryUsage" : 1472135168,
+-        "physicalMemoryUsage" : 321449984,
+-        "heapUsage" : 656867328
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164142,
+-    "taskID" : "task_1369942127770_1206_m_000086",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222230895,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222212325,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222230895,
+-      "attemptID" : "attempt_1369942127770_1206_m_000086_0",
+-      "clockSplits" : [ 1916, 1917, 1917, 1917, 1917, 1310, 628, 629, 629, 628, 1548, 3609 ],
+-      "cpuUsages" : [ 1298, 1299, 1299, 1298, 1299, 1114, 906, 906, 907, 906, 944, 1414 ],
+-      "vmemKbytes" : [ 129021, 387064, 645107, 903150, 1161194, 1390573, 1426632, 1426631, 1426632, 1426632, 1426631, 1426632 ],
+-      "physMemKbytes" : [ 27206, 81618, 136031, 190443, 244856, 293234, 300915, 301006, 301097, 301188, 300855, 298031 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13590,
+-        "virtualMemoryUsage" : 1460871168,
+-        "physicalMemoryUsage" : 304197632,
+-        "heapUsage" : 738656256
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164142,
+-    "taskID" : "task_1369942127770_1206_m_000087",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222243205,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222212324,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222243205,
+-      "attemptID" : "attempt_1369942127770_1206_m_000087_0",
+-      "clockSplits" : [ 2494, 2494, 2494, 2494, 1979, 18502, 69, 70, 70, 70, 70, 70 ],
+-      "cpuUsages" : [ 1501, 1501, 1501, 1501, 1135, 1230, 804, 803, 803, 804, 803, 804 ],
+-      "vmemKbytes" : [ 178670, 536012, 893354, 1250695, 1435451, 1432834, 1425524, 1425523, 1425524, 1425524, 1425523, 1425524 ],
+-      "physMemKbytes" : [ 38239, 114717, 191196, 267674, 307284, 303356, 292389, 292664, 292939, 293215, 293490, 293766 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13190,
+-        "virtualMemoryUsage" : 1459736576,
+-        "physicalMemoryUsage" : 300957696,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164142,
+-    "taskID" : "task_1369942127770_1206_m_000088",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222232772,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222212326,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222232772,
+-      "attemptID" : "attempt_1369942127770_1206_m_000088_0",
+-      "clockSplits" : [ 2652, 2652, 2653, 2652, 1643, 1624, 1581, 4351, 35, 35, 35, 35 ],
+-      "cpuUsages" : [ 1349, 1350, 1350, 1350, 1074, 1054, 836, 832, 804, 803, 804, 804 ],
+-      "vmemKbytes" : [ 177435, 532306, 887178, 1242049, 1424874, 1424915, 1424916, 1424915, 1424916, 1424916, 1424915, 1424916 ],
+-      "physMemKbytes" : [ 36160, 108480, 180800, 253120, 290481, 290705, 291974, 294028, 293783, 292064, 290343, 288624 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 12710,
+-        "virtualMemoryUsage" : 1459113984,
+-        "physicalMemoryUsage" : 294797312,
+-        "heapUsage" : 723648512
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164143,
+-    "taskID" : "task_1369942127770_1206_m_000089",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222232612,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2117.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2117.smile.com",
+-      "startTime" : 1371222213322,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222232612,
+-      "attemptID" : "attempt_1369942127770_1206_m_000089_0",
+-      "clockSplits" : [ 2150, 2150, 2150, 2150, 2150, 1793, 1344, 1294, 925, 926, 926, 1328 ],
+-      "cpuUsages" : [ 1229, 1229, 1229, 1229, 1229, 1163, 1080, 1055, 866, 865, 866, 1240 ],
+-      "vmemKbytes" : [ 129366, 388101, 646836, 905570, 1164305, 1397662, 1437812, 1437790, 1435927, 1432883, 1429838, 1427696 ],
+-      "physMemKbytes" : [ 27669, 83009, 138349, 193688, 249028, 299294, 310933, 314481, 312611, 307268, 301925, 298134 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 13280,
+-        "virtualMemoryUsage" : 1461878784,
+-        "physicalMemoryUsage" : 305094656,
+-        "heapUsage" : 740360192
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164143,
+-    "taskID" : "task_1369942127770_1206_m_000090",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222235284,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222223387,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222235284,
+-      "attemptID" : "attempt_1369942127770_1206_m_000090_0",
+-      "clockSplits" : [ 1105, 1106, 1106, 1106, 1105, 1106, 1106, 3584, 142, 142, 142, 143 ],
+-      "cpuUsages" : [ 1039, 1040, 1040, 1039, 1040, 1040, 1039, 1034, 799, 800, 800, 800 ],
+-      "vmemKbytes" : [ 89336, 268010, 446684, 625357, 804032, 982705, 1161380, 1339992, 1424680, 1424680, 1424679, 1424680 ],
+-      "physMemKbytes" : [ 18972, 56916, 94861, 132805, 170750, 208694, 246639, 284573, 305523, 311161, 316798, 322437 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11510,
+-        "virtualMemoryUsage" : 1458872320,
+-        "physicalMemoryUsage" : 333062144,
+-        "heapUsage" : 662962176
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164143,
+-    "taskID" : "task_1369942127770_1206_m_000091",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222237538,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2115.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2115.smile.com",
+-      "startTime" : 1371222223387,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222237538,
+-      "attemptID" : "attempt_1369942127770_1206_m_000091_0",
+-      "clockSplits" : [ 1479, 1479, 1479, 1479, 1479, 1479, 1300, 625, 625, 625, 625, 1471 ],
+-      "cpuUsages" : [ 955, 956, 956, 955, 956, 956, 901, 694, 694, 694, 694, 1249 ],
+-      "vmemKbytes" : [ 104472, 313416, 522360, 731303, 940248, 1149191, 1353575, 1418951, 1418952, 1418952, 1418951, 1418952 ],
+-      "physMemKbytes" : [ 22666, 67999, 113332, 158665, 203998, 249331, 293651, 307068, 305951, 304834, 303716, 302630 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 10660,
+-        "virtualMemoryUsage" : 1453006848,
+-        "physicalMemoryUsage" : 309538816,
+-        "heapUsage" : 723517440
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164144,
+-    "taskID" : "task_1369942127770_1206_m_000092",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222239274,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222225390,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222239274,
+-      "attemptID" : "attempt_1369942127770_1206_m_000092_0",
+-      "clockSplits" : [ 1029, 1029, 1030, 1029, 1030, 1029, 1030, 1029, 1030, 2434, 717, 718 ],
+-      "cpuUsages" : [ 945, 945, 945, 945, 945, 945, 945, 945, 945, 895, 730, 730 ],
+-      "vmemKbytes" : [ 72549, 217647, 362746, 507844, 652943, 798041, 943140, 1088238, 1233337, 1374501, 1417191, 1417192 ],
+-      "physMemKbytes" : [ 14112, 42336, 70560, 98783, 127008, 155231, 183456, 211680, 239905, 267439, 277716, 280513 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11280,
+-        "virtualMemoryUsage" : 1451204608,
+-        "physicalMemoryUsage" : 288616448,
+-        "heapUsage" : 674430976
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  }, {
+-    "startTime" : 1371222164144,
+-    "taskID" : "task_1369942127770_1206_m_000093",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222249913,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2116.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2116.smile.com",
+-      "startTime" : 1371222226395,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222249913,
+-      "attemptID" : "attempt_1369942127770_1206_m_000093_0",
+-      "clockSplits" : [ 1998, 1998, 1998, 1999, 1998, 1998, 1999, 1998, 1998, 1998, 1999, 1533 ],
+-      "cpuUsages" : [ 852, 852, 853, 852, 853, 852, 853, 852, 852, 853, 852, 1494 ],
+-      "vmemKbytes" : [ 62260, 186780, 311301, 435821, 560342, 684863, 809384, 933904, 1058425, 1182946, 1307467, 1419006 ],
+-      "physMemKbytes" : [ 12360, 37081, 61802, 86523, 111244, 135965, 160686, 185407, 210128, 234849, 259570, 281661 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 10870,
+-        "virtualMemoryUsage" : 1471885312,
+-        "physicalMemoryUsage" : 291975168,
+-        "heapUsage" : 674562048
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164144,
+-    "taskID" : "task_1369942127770_1206_m_000094",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222241825,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222227397,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222241825,
+-      "attemptID" : "attempt_1369942127770_1206_m_000094_0",
+-      "clockSplits" : [ 1436, 1437, 1437, 1437, 1437, 1436, 1437, 3845, 130, 129, 129, 130 ],
+-      "cpuUsages" : [ 1038, 1039, 1039, 1039, 1039, 1039, 1039, 1031, 891, 892, 892, 892 ],
+-      "vmemKbytes" : [ 90707, 272123, 453538, 634953, 816370, 997785, 1179201, 1360296, 1440536, 1440536, 1440535, 1440536 ],
+-      "physMemKbytes" : [ 19774, 59323, 98872, 138421, 177970, 217519, 257068, 296545, 313357, 312135, 310912, 309691 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666700,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166667,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166667,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11870,
+-        "virtualMemoryUsage" : 1475108864,
+-        "physicalMemoryUsage" : 316497920,
+-        "heapUsage" : 723451904
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166667,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166667
+-  }, {
+-    "startTime" : 1371222164145,
+-    "taskID" : "task_1369942127770_1206_m_000095",
+-    "taskType" : "MAP",
+-    "finishTime" : 1371222241726,
+-    "attempts" : [ {
+-      "location" : {
+-        "layers" : [ "default-rack", "a2118.smile.com" ]
+-      },
+-      "hostName" : "/default-rack/a2118.smile.com",
+-      "startTime" : 1371222228399,
+-      "result" : "SUCCESS",
+-      "finishTime" : 1371222241726,
+-      "attemptID" : "attempt_1369942127770_1206_m_000095_0",
+-      "clockSplits" : [ 1288, 1289, 1289, 1289, 1288, 1289, 1289, 1289, 2675, 112, 112, 112 ],
+-      "cpuUsages" : [ 992, 993, 993, 992, 993, 993, 992, 993, 853, 832, 832, 832 ],
+-      "vmemKbytes" : [ 88547, 265642, 442738, 619833, 796929, 974024, 1151119, 1328214, 1437170, 1435904, 1433127, 1430352 ],
+-      "physMemKbytes" : [ 19692, 59077, 98462, 137847, 177232, 216617, 256003, 295388, 318265, 314440, 310247, 306056 ],
+-      "shuffleFinished" : -1,
+-      "sortFinished" : -1,
+-      "hdfsBytesRead" : 86,
+-      "hdfsBytesWritten" : 416666600,
+-      "fileBytesRead" : 0,
+-      "fileBytesWritten" : 72236,
+-      "mapInputRecords" : 4166666,
+-      "mapOutputBytes" : -1,
+-      "mapOutputRecords" : 4166666,
+-      "combineInputRecords" : -1,
+-      "reduceInputGroups" : -1,
+-      "reduceInputRecords" : -1,
+-      "reduceShuffleBytes" : -1,
+-      "reduceOutputRecords" : -1,
+-      "spilledRecords" : 0,
+-      "mapInputBytes" : -1,
+-      "resourceUsageMetrics" : {
+-        "cumulativeCpuUsage" : 11290,
+-        "virtualMemoryUsage" : 1463259136,
+-        "physicalMemoryUsage" : 311255040,
+-        "heapUsage" : 740229120
+-      }
+-    } ],
+-    "preferredLocations" : [ ],
+-    "taskStatus" : "SUCCESS",
+-    "inputBytes" : 86,
+-    "inputRecords" : 4166666,
+-    "outputBytes" : 72236,
+-    "outputRecords" : 4166666
+-  } ],
+-  "reduceTasks" : [ ],
+-  "launchTime" : 1371222164048,
+-  "totalMaps" : 96,
+-  "totalReduces" : 0,
+-  "otherTasks" : [ ],
+-  "jobProperties" : {
+-    "mapreduce.job.ubertask.enable" : "false",
+-    "yarn.resourcemanager.max-completed-applications" : "10000",
+-    "yarn.resourcemanager.delayed.delegation-token.removal-interval-ms" : "30000",
+-    "mapreduce.client.submit.file.replication" : "2",
+-    "yarn.nodemanager.container-manager.thread-count" : "20",
+-    "mapred.queue.default.acl-administer-jobs" : "*",
+-    "dfs.image.transfer.bandwidthPerSec" : "0",
+-    "mapreduce.jobtracker.staging.root.dir" : "/user",
+-    "yarn.resourcemanager.recovery.enabled" : "false",
+-    "yarn.resourcemanager.am.max-retries" : "1",
+-    "dfs.block.access.token.lifetime" : "600",
+-    "fs.AbstractFileSystem.file.impl" : "org.apache.hadoop.fs.local.LocalFs",
+-    "mapreduce.client.completion.pollinterval" : "5000",
+-    "mapreduce.job.ubertask.maxreduces" : "1",
+-    "mapreduce.reduce.shuffle.memory.limit.percent" : "0.25",
+-    "dfs.domain.socket.path" : "/var/run/hdfs-sockets/dn",
+-    "hadoop.ssl.keystores.factory.class" : "org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory",
+-    "hadoop.http.authentication.kerberos.keytab" : "${user.home}/hadoop.keytab",
+-    "yarn.nodemanager.keytab" : "/etc/krb5.keytab",
+-    "mapreduce.task.io.sort.factor" : "10",
+-    "yarn.nodemanager.disk-health-checker.interval-ms" : "120000",
+-    "mapreduce.job.working.dir" : "hdfs://a2115.smile.com:8020/user/jenkins",
+-    "yarn.admin.acl" : "*",
+-    "mapreduce.job.speculative.speculativecap" : "0.1",
+-    "dfs.namenode.num.checkpoints.retained" : "2",
+-    "dfs.namenode.delegation.token.renew-interval" : "86400000",
+-    "yarn.nodemanager.resource.memory-mb" : "8192",
+-    "io.map.index.interval" : "128",
+-    "mapreduce.task.files.preserve.failedtasks" : "false",
+-    "dfs.namenode.http-address" : "a2115.smile.com:20101",
+-    "ha.zookeeper.session-timeout.ms" : "5000",
+-    "hadoop.hdfs.configuration.version" : "1",
+-    "dfs.datanode.balance.bandwidthPerSec" : "1048576",
+-    "mapreduce.reduce.shuffle.connect.timeout" : "180000",
+-    "dfs.journalnode.rpc-address" : "0.0.0.0:8485",
+-    "yarn.nodemanager.aux-services" : "mapreduce.shuffle",
+-    "mapreduce.job.counters.max" : "120",
+-    "dfs.datanode.readahead.bytes" : "4193404",
+-    "ipc.client.connect.max.retries.on.timeouts" : "45",
+-    "mapreduce.job.complete.cancel.delegation.tokens" : "true",
+-    "dfs.client.failover.max.attempts" : "15",
+-    "dfs.namenode.checkpoint.dir" : "file://${hadoop.tmp.dir}/dfs/namesecondary",
+-    "dfs.namenode.replication.work.multiplier.per.iteration" : "2",
+-    "fs.trash.interval" : "1",
+-    "yarn.resourcemanager.admin.address" : "a2115.smile.com:8033",
+-    "ha.health-monitor.check-interval.ms" : "1000",
+-    "mapreduce.job.outputformat.class" : "org.apache.hadoop.examples.terasort.TeraOutputFormat",
+-    "hadoop.jetty.logs.serve.aliases" : "true",
+-    "hadoop.http.authentication.kerberos.principal" : "HTTP/_HOST@LOCALHOST",
+-    "mapreduce.job.reduce.shuffle.consumer.plugin.class" : "org.apache.hadoop.mapreduce.task.reduce.Shuffle",
+-    "s3native.blocksize" : "67108864",
+-    "dfs.namenode.edits.dir" : "${dfs.namenode.name.dir}",
+-    "ha.health-monitor.sleep-after-disconnect.ms" : "1000",
+-    "dfs.encrypt.data.transfer" : "false",
+-    "dfs.datanode.http.address" : "0.0.0.0:9864",
+-    "mapreduce.terasort.num-rows" : "400000000",
+-    "mapreduce.job.map.class" : "org.apache.hadoop.examples.terasort.TeraGen$SortGenMapper",
+-    "dfs.namenode.write.stale.datanode.ratio" : "0.5f",
+-    "dfs.client.use.datanode.hostname" : "false",
+-    "yarn.acl.enable" : "true",
+-    "hadoop.security.instrumentation.requires.admin" : "false",
+-    "yarn.nodemanager.localizer.fetch.thread-count" : "4",
+-    "hadoop.security.authorization" : "false",
+-    "user.name" : "jenkins",
+-    "dfs.namenode.fs-limits.min-block-size" : "1048576",
+-    "dfs.client.failover.connection.retries.on.timeouts" : "0",
+-    "hadoop.security.group.mapping.ldap.search.filter.group" : "(objectClass=group)",
+-    "mapreduce.output.fileoutputformat.compress.codec" : "org.apache.hadoop.io.compress.DefaultCodec",
+-    "dfs.namenode.safemode.extension" : "30000",
+-    "mapreduce.shuffle.port" : "8080",
+-    "mapreduce.reduce.log.level" : "INFO",
+-    "yarn.log-aggregation-enable" : "false",
+-    "dfs.datanode.sync.behind.writes" : "false",
+-    "dfs.https.server.keystore.resource" : "ssl-server.xml",
+-    "hadoop.security.group.mapping.ldap.search.attr.group.name" : "cn",
+-    "dfs.namenode.replication.min" : "1",
+-    "mapreduce.map.java.opts" : " -Xmx825955249",
+-    "yarn.scheduler.fair.allocation.file" : "/etc/yarn/fair-scheduler.xml",
+-    "s3native.bytes-per-checksum" : "512",
+-    "tfile.fs.output.buffer.size" : "262144",
+-    "yarn.nodemanager.local-dirs" : "${hadoop.tmp.dir}/nm-local-dir",
+-    "mapreduce.jobtracker.persist.jobstatus.active" : "false",
+-    "fs.AbstractFileSystem.hdfs.impl" : "org.apache.hadoop.fs.Hdfs",
+-    "mapreduce.job.map.output.collector.class" : "org.apache.hadoop.mapred.MapTask$MapOutputBuffer",
+-    "dfs.namenode.safemode.min.datanodes" : "0",
+-    "hadoop.security.uid.cache.secs" : "14400",
+-    "dfs.client.https.need-auth" : "false",
+-    "dfs.client.write.exclude.nodes.cache.expiry.interval.millis" : "600000",
+-    "dfs.client.https.keystore.resource" : "ssl-client.xml",
+-    "dfs.namenode.max.objects" : "0",
+-    "hadoop.ssl.client.conf" : "ssl-client.xml",
+-    "dfs.namenode.safemode.threshold-pct" : "0.999f",
+-    "dfs.blocksize" : "134217728",
+-    "yarn.resourcemanager.scheduler.class" : "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler",
+-    "mapreduce.job.reduce.slowstart.completedmaps" : "0.8",
+-    "mapreduce.job.end-notification.retry.attempts" : "5",
+-    "mapreduce.job.inputformat.class" : "org.apache.hadoop.examples.terasort.TeraGen$RangeInputFormat",
+-    "mapreduce.map.memory.mb" : "1024",
+-    "mapreduce.job.user.name" : "jenkins",
+-    "io.native.lib.available" : "true",
+-    "dfs.client-write-packet-size" : "65536",
+-    "mapreduce.client.progressmonitor.pollinterval" : "1000",
+-    "dfs.namenode.name.dir" : "file://${hadoop.tmp.dir}/dfs/name",
+-    "dfs.ha.log-roll.period" : "120",
+-    "mapreduce.reduce.input.buffer.percent" : "0.0",
+-    "mapreduce.map.output.compress.codec" : "org.apache.hadoop.io.compress.SnappyCodec",
+-    "dfs.client.failover.sleep.base.millis" : "500",
+-    "dfs.datanode.directoryscan.threads" : "1",
+-    "mapreduce.jobtracker.address" : "neededForHive:999999",
+-    "mapreduce.cluster.local.dir" : "${hadoop.tmp.dir}/mapred/local",
+-    "yarn.scheduler.fair.user-as-default-queue" : "true",
+-    "mapreduce.job.application.attempt.id" : "1",
+-    "dfs.permissions.enabled" : "true",
+-    "yarn.scheduler.fair.preemption" : "true",
+-    "mapreduce.reduce.shuffle.parallelcopies" : "5",
+-    "yarn.nodemanager.env-whitelist" : "JAVA_HOME,HADOOP_COMMON_HOME,HADOOP_HDFS_HOME,HADOOP_CONF_DIR,YARN_HOME",
+-    "mapreduce.job.maxtaskfailures.per.tracker" : "3",
+-    "ipc.client.connection.maxidletime" : "10000",
+-    "mapreduce.shuffle.ssl.enabled" : "false",
+-    "dfs.namenode.invalidate.work.pct.per.iteration" : "0.32f",
+-    "dfs.blockreport.intervalMsec" : "21600000",
+-    "fs.s3n.sleepTimeSeconds" : "10",
+-    "dfs.namenode.replication.considerLoad" : "true",
+-    "dfs.client.block.write.retries" : "3",
+-    "hadoop.ssl.server.conf" : "ssl-server.xml",
+-    "dfs.namenode.name.dir.restore" : "false",
+-    "rpc.engine.org.apache.hadoop.mapreduce.v2.api.MRClientProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "dfs.datanode.hdfs-blocks-metadata.enabled" : "true",
+-    "ha.zookeeper.parent-znode" : "/hadoop-ha",
+-    "mapreduce.reduce.merge.inmem.threshold" : "1000",
+-    "mapreduce.input.fileinputformat.split.minsize" : "0",
+-    "dfs.replication" : "3",
+-    "ipc.client.tcpnodelay" : "false",
+-    "dfs.namenode.accesstime.precision" : "3600000",
+-    "dfs.client.read.shortcircuit.skip.checksum" : "false",
+-    "mapreduce.job.jvm.numtasks" : "1",
+-    "mapreduce.task.io.sort.mb" : "100",
+-    "io.file.buffer.size" : "65536",
+-    "dfs.namenode.audit.loggers" : "default",
+-    "dfs.namenode.checkpoint.txns" : "1000000",
+-    "yarn.nodemanager.admin-env" : "MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX",
+-    "mapreduce.job.jar" : "/user/jenkins/.staging/job_1369942127770_1206/job.jar",
+-    "mapreduce.job.split.metainfo.maxsize" : "10000000",
+-    "kfs.replication" : "3",
+-    "rpc.engine.org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "yarn.app.mapreduce.am.scheduler.heartbeat.interval-ms" : "1000",
+-    "mapreduce.reduce.maxattempts" : "4",
+-    "kfs.stream-buffer-size" : "4096",
+-    "dfs.ha.tail-edits.period" : "60",
+-    "hadoop.security.authentication" : "simple",
+-    "fs.s3n.buffer.dir" : "${hadoop.tmp.dir}/s3",
+-    "rpc.engine.org.apache.hadoop.yarn.api.AMRMProtocolPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "yarn.app.mapreduce.am.job.task.listener.thread-count" : "30",
+-    "dfs.namenode.avoid.read.stale.datanode" : "false",
+-    "mapreduce.job.reduces" : "0",
+-    "mapreduce.map.sort.spill.percent" : "0.8",
+-    "dfs.datanode.drop.cache.behind.writes" : "false",
+-    "mapreduce.job.end-notification.retry.interval" : "1",
+-    "mapreduce.job.maps" : "96",
+-    "mapreduce.job.speculative.slownodethreshold" : "1.0",
+-    "tfile.fs.input.buffer.size" : "262144",
+-    "mapreduce.map.speculative" : "false",
+-    "dfs.block.access.token.enable" : "false",
+-    "dfs.journalnode.http-address" : "0.0.0.0:8480",
+-    "mapreduce.job.acl-view-job" : " ",
+-    "mapreduce.reduce.shuffle.retry-delay.max.ms" : "60000",
+-    "mapreduce.job.end-notification.max.retry.interval" : "5",
+-    "ftp.blocksize" : "67108864",
+-    "mapreduce.reduce.java.opts" : " -Xmx825955249",
+-    "dfs.datanode.data.dir" : "file://${hadoop.tmp.dir}/dfs/data",
+-    "ha.failover-controller.cli-check.rpc-timeout.ms" : "20000",
+-    "dfs.namenode.max.extra.edits.segments.retained" : "10000",
+-    "dfs.https.port" : "20102",
+-    "dfs.namenode.replication.interval" : "3",
+-    "mapreduce.task.skip.start.attempts" : "2",
+-    "dfs.namenode.https-address" : "a2115.smile.com:20102",
+-    "ipc.client.kill.max" : "10",
+-    "dfs.ha.automatic-failover.enabled" : "false",
+-    "mapreduce.jobhistory.keytab" : "/etc/security/keytab/jhs.service.keytab",
+-    "dfs.image.transfer.timeout" : "600000",
+-    "dfs.client.failover.sleep.max.millis" : "15000",
+-    "mapreduce.job.end-notification.max.attempts" : "5",
+-    "mapreduce.task.tmp.dir" : "./tmp",
+-    "dfs.default.chunk.view.size" : "32768",
+-    "kfs.bytes-per-checksum" : "512",
+-    "mapreduce.reduce.memory.mb" : "1024",
+-    "hadoop.http.filter.initializers" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer",
+-    "dfs.datanode.failed.volumes.tolerated" : "0",
+-    "hadoop.http.authentication.type" : "simple",
+-    "dfs.datanode.data.dir.perm" : "700",
+-    "yarn.resourcemanager.client.thread-count" : "50",
+-    "ipc.server.listen.queue.size" : "128",
+-    "mapreduce.reduce.skip.maxgroups" : "0",
+-    "file.stream-buffer-size" : "4096",
+-    "dfs.namenode.fs-limits.max-directory-items" : "0",
+-    "io.mapfile.bloom.size" : "1048576",
+-    "yarn.nodemanager.container-executor.class" : "org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor",
+-    "mapreduce.map.maxattempts" : "4",
+-    "yarn.log-aggregation.retain-seconds" : "-1",
+-    "yarn.app.mapreduce.am.job.committer.cancel-timeout" : "60000",
+-    "ftp.replication" : "3",
+-    "yarn.nodemanager.health-checker.script.timeout-ms" : "1200000",
+-    "mapreduce.jobhistory.address" : "a2115.smile.com:10020",
+-    "mapreduce.jobtracker.taskcache.levels" : "2",
+-    "dfs.datanode.dns.nameserver" : "default",
+-    "mapreduce.application.classpath" : "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+-    "yarn.nodemanager.log.retain-seconds" : "10800",
+-    "mapred.child.java.opts" : "-Xmx200m",
+-    "dfs.replication.max" : "512",
+-    "map.sort.class" : "org.apache.hadoop.util.QuickSort",
+-    "dfs.stream-buffer-size" : "4096",
+-    "dfs.namenode.backup.address" : "0.0.0.0:50100",
+-    "hadoop.util.hash.type" : "murmur",
+-    "dfs.block.access.key.update.interval" : "600",
+-    "dfs.datanode.dns.interface" : "default",
+-    "dfs.datanode.use.datanode.hostname" : "false",
+-    "mapreduce.job.output.key.class" : "org.apache.hadoop.io.Text",
+-    "dfs.client.read.shortcircuit" : "false",
+-    "dfs.namenode.backup.http-address" : "0.0.0.0:50105",
+-    "yarn.nodemanager.container-monitor.interval-ms" : "3000",
+-    "yarn.nodemanager.disk-health-checker.min-healthy-disks" : "0.25",
+-    "kfs.client-write-packet-size" : "65536",
+-    "ha.zookeeper.acl" : "world:anyone:rwcda",
+-    "yarn.nodemanager.sleep-delay-before-sigkill.ms" : "250",
+-    "mapreduce.job.dir" : "/user/jenkins/.staging/job_1369942127770_1206",
+-    "io.map.index.skip" : "0",
+-    "net.topology.node.switch.mapping.impl" : "org.apache.hadoop.net.ScriptBasedMapping",
+-    "fs.s3n.maxRetries" : "4",
+-    "ha.failover-controller.new-active.rpc-timeout.ms" : "60000",
+-    "s3native.client-write-packet-size" : "65536",
+-    "yarn.resourcemanager.amliveliness-monitor.interval-ms" : "1000",
+-    "hadoop.http.staticuser.user" : "dr.who",
+-    "mapreduce.reduce.speculative" : "false",
+-    "mapreduce.client.output.filter" : "FAILED",
+-    "mapreduce.ifile.readahead.bytes" : "4194304",
+-    "mapreduce.task.userlog.limit.kb" : "0",
+-    "mapreduce.tasktracker.map.tasks.maximum" : "2",
+-    "hadoop.http.authentication.simple.anonymous.allowed" : "true",
+-    "hadoop.fuse.timer.period" : "5",
+-    "dfs.namenode.num.extra.edits.retained" : "1000000",
+-    "hadoop.rpc.socket.factory.class.default" : "org.apache.hadoop.net.StandardSocketFactory",
+-    "mapreduce.job.submithostname" : "a2115.smile.com",
+-    "dfs.namenode.handler.count" : "10",
+-    "fs.automatic.close" : "false",
+-    "mapreduce.job.submithostaddress" : "10.20.206.115",
+-    "dfs.datanode.directoryscan.interval" : "21600",
+-    "yarn.resourcemanager.address" : "a2115.smile.com:8032",
+-    "yarn.nodemanager.health-checker.interval-ms" : "600000",
+-    "yarn.resourcemanager.container-tokens.master-key-rolling-interval-secs" : "86400",
+-    "mapreduce.reduce.markreset.buffer.percent" : "0.0",
+-    "hadoop.security.group.mapping.ldap.directory.search.timeout" : "10000",
+-    "mapreduce.map.log.level" : "INFO",
+-    "dfs.bytes-per-checksum" : "512",
+-    "yarn.nodemanager.localizer.address" : "0.0.0.0:8040",
+-    "dfs.namenode.checkpoint.max-retries" : "3",
+-    "ha.health-monitor.rpc-timeout.ms" : "45000",
+-    "yarn.resourcemanager.keytab" : "/etc/krb5.keytab",
+-    "ftp.stream-buffer-size" : "4096",
+-    "dfs.namenode.avoid.write.stale.datanode" : "false",
+-    "hadoop.security.group.mapping.ldap.search.attr.member" : "member",
+-    "mapreduce.output.fileoutputformat.outputdir" : "hdfs://a2115.smile.com:8020/user/jenkins/tera-gen-2",
+-    "dfs.blockreport.initialDelay" : "0",
+-    "yarn.nm.liveness-monitor.expiry-interval-ms" : "600000",
+-    "hadoop.http.authentication.token.validity" : "36000",
+-    "dfs.namenode.delegation.token.max-lifetime" : "604800000",
+-    "mapreduce.job.hdfs-servers" : "${fs.defaultFS}",
+-    "s3native.replication" : "3",
+-    "yarn.nodemanager.localizer.client.thread-count" : "5",
+-    "dfs.heartbeat.interval" : "3",
+-    "rpc.engine.org.apache.hadoop.ipc.ProtocolMetaInfoPB" : "org.apache.hadoop.ipc.ProtobufRpcEngine",
+-    "dfs.ha.fencing.ssh.connect-timeout" : "30000",
+-    "yarn.resourcemanager.container.liveness-monitor.interval-ms" : "600000",
+-    "yarn.am.liveness-monitor.expiry-interval-ms" : "600000",
+-    "mapreduce.task.profile" : "false",
+-    "mapreduce.jobhistory.webapp.address" : "a2115.smile.com:19888",
+-    "ha.failover-controller.graceful-fence.rpc-timeout.ms" : "5000",
+-    "yarn.ipc.rpc.class" : "org.apache.hadoop.yarn.ipc.HadoopYarnProtoRPC",
+-    "mapreduce.job.name" : "TeraGen",
+-    "kfs.blocksize" : "67108864",
+-    "yarn.resourcemanager.am-rm-tokens.master-key-rolling-interval-secs" : "86400",
+-    "mapreduce.job.ubertask.maxmaps" : "9",
+-    "yarn.scheduler.maximum-allocation-mb" : "8192",
+-    "yarn.nodemanager.heartbeat.interval-ms" : "1000",
+-    "dfs.namenode.secondary.http-address" : "0.0.0.0:9868",
+-    "mapreduce.task.timeout" : "600000",
+-    "mapreduce.framework.name" : "yarn",
+-    "ipc.client.idlethreshold" : "4000",
+-    "ftp.bytes-per-checksum" : "512",
+-    "ipc.server.tcpnodelay" : "false",
+-    "dfs.namenode.stale.datanode.interval" : "30000",
+-    "mapreduce.job.speculative.slowtaskthreshold" : "1.0",
+-    "yarn.nodemanager.localizer.cache.target-size-mb" : "10240",
+-    "yarn.nodemanager.remote-app-log-dir" : "/tmp/logs",
+-    "mapreduce.job.queuename" : "sls_queue_1",
+-    "dfs.client.failover.connection.retries" : "0",
+-    "hadoop.rpc.protection" : "authentication",
+-    "yarn.scheduler.minimum-allocation-mb" : "1024",
+-    "yarn.app.mapreduce.client-am.ipc.max-retries" : "1",
+-    "hadoop.security.auth_to_local" : "DEFAULT",
+-    "dfs.secondary.namenode.kerberos.internal.spnego.principal" : "${dfs.web.authentication.kerberos.principal}",
+-    "ftp.client-write-packet-size" : "65536",
+-    "fs.defaultFS" : "hdfs://a2115.smile.com:8020",
+-    "yarn.nodemanager.address" : "0.0.0.0:0",
+-    "yarn.scheduler.fair.assignmultiple" : "true",
+-    "yarn.resourcemanager.scheduler.client.thread-count" : "50",
+-    "mapreduce.task.merge.progress.records" : "10000",
+-    "file.client-write-packet-size" : "65536",
+-    "yarn.nodemanager.delete.thread-count" : "4",
+-    "yarn.resourcemanager.scheduler.address" : "a2115.smile.com:8030",
+-    "fs.trash.checkpoint.interval" : "0",
+-    "hadoop.http.authentication.signature.secret.file" : "${user.home}/hadoop-http-auth-signature-secret",
+-    "s3native.stream-buffer-size" : "4096",
+-    "mapreduce.reduce.shuffle.read.timeout" : "180000",
+-    "mapreduce.admin.user.env" : "LD_LIBRARY_PATH=$HADOOP_COMMON_HOME/lib/native",
+-    "yarn.app.mapreduce.am.command-opts" : " -Xmx1238932873",
+-    "dfs.namenode.checkpoint.edits.dir" : "${dfs.namenode.checkpoint.dir}",
+-    "fs.permissions.umask-mode" : "022",
+-    "dfs.client.domain.socket.data.traffic" : "false",
+-    "hadoop.common.configuration.version" : "0.23.0",
+-    "mapreduce.output.fileoutputformat.compress.type" : "BLOCK",
+-    "mapreduce.ifile.readahead" : "true",
+-    "hadoop.security.group.mapping.ldap.ssl" : "false",
+-    "io.serializations" : "org.apache.hadoop.io.serializer.WritableSerialization,org.apache.hadoop.io.serializer.avro.AvroSpecificSerialization,org.apache.hadoop.io.serializer.avro.AvroReflectSerialization",
+-    "yarn.nodemanager.aux-services.mapreduce.shuffle.class" : "org.apache.hadoop.mapred.ShuffleHandler",
+-    "fs.df.interval" : "60000",
+-    "mapreduce.reduce.shuffle.input.buffer.percent" : "0.70",
+-    "io.seqfile.compress.blocksize" : "1000000",
+-    "hadoop.security.groups.cache.secs" : "300",
+-    "ipc.client.connect.max.retries" : "10",
+-    "dfs.namenode.delegation.key.update-interval" : "86400000",
+-    "yarn.nodemanager.process-kill-wait.ms" : "5000",
+-    "yarn.application.classpath" : "$HADOOP_CONF_DIR,$HADOOP_COMMON_HOME/*,$HADOOP_COMMON_HOME/lib/*,$HADOOP_HDFS_HOME/*,$HADOOP_HDFS_HOME/lib/*,$HADOOP_MAPRED_HOME/*,$HADOOP_MAPRED_HOME/lib/*,$YARN_HOME/*,$YARN_HOME/lib/*",
+-    "yarn.app.mapreduce.client.max-retries" : "3",
+-    "dfs.datanode.available-space-volume-choosing-policy.balanced-space-preference-fraction" : "0.75f",
+-    "yarn.nodemanager.log-aggregation.compression-type" : "none",
+-    "hadoop.security.group.mapping.ldap.search.filter.user" : "(&(objectClass=user)(sAMAccountName={0}))",
+-    "yarn.nodemanager.localizer.cache.cleanup.interval-ms" : "600000",
+-    "dfs.image.compress" : "false",
+-    "mapred.mapper.new-api" : "true",
+-    "yarn.nodemanager.log-dirs" : "${yarn.log.dir}/userlogs",
+-    "dfs.namenode.kerberos.internal.spnego.principal" : "${dfs.web.authentication.kerberos.principal}",
+-    "fs.s3n.block.size" : "67108864",
+-    "fs.ftp.host" : "0.0.0.0",
+-    "hadoop.security.group.mapping" : "org.apache.hadoop.security.JniBasedUnixGroupsMappingWithFallback",
+-    "dfs.datanode.address" : "0.0.0.0:9866",
+-    "mapreduce.map.skip.maxrecords" : "0",
+-    "dfs.datanode.https.address" : "0.0.0.0:9865",
+-    "file.replication" : "1",
+-    "yarn.resourcemanager.resource-tracker.address" : "a2115.smile.com:8031",
+-    "dfs.datanode.drop.cache.behind.reads" : "false",
+-    "hadoop.fuse.connection.timeout" : "300",
+-    "hadoop.work.around.non.threadsafe.getpwuid" : "false",
+-    "hadoop.tmp.dir" : "/tmp/hadoop-${user.name}",
+-    "mapreduce.output.fileoutputformat.compress" : "false",
+-    "mapreduce.tasktracker.indexcache.mb" : "10",
+-    "mapreduce.client.genericoptionsparser.used" : "true",
+-    "dfs.client.block.write.replace-datanode-on-failure.policy" : "DEFAULT",
+-    "mapreduce.job.committer.setup.cleanup.needed" : "true",
+-    "hadoop.kerberos.kinit.command" : "kinit",
+-    "dfs.datanode.du.reserved" : "0",
+-    "dfs.namenode.fs-limits.max-blocks-per-file" : "1048576",
+-    "file.bytes-per-checksum" : "512",
+-    "mapreduce.task.profile.reduces" : "0-2",
+-    "dfs.client.block.write.replace-datanode-on-failure.enable" : "true",
+-    "mapreduce.job.output.value.class" : "org.apache.hadoop.io.Text",
+-    "yarn.dispatcher.exit-on-error" : "true",
+-    "net.topology.script.number.args" : "100",
+-    "mapreduce.task.profile.maps" : "0-2",
+-    "dfs.namenode.decommission.interval" : "30",
+-    "dfs.image.compression.codec" : "org.apache.hadoop.io.compress.DefaultCodec",
+-    "yarn.resourcemanager.webapp.address" : "a2115.smile.com:8088",
+-    "mapreduce.jobtracker.system.dir" : "${hadoop.tmp.dir}/mapred/system",
+-    "hadoop.ssl.hostname.verifier" : "DEFAULT",
+-    "yarn.nodemanager.vmem-pmem-ratio" : "2.1",
+-    "dfs.namenode.support.allow.format" : "true",
+-    "mapreduce.jobhistory.principal" : "jhs/_HOST@REALM.TLD",
+-    "io.mapfile.bloom.error.rate" : "0.005",
+-    "mapreduce.shuffle.ssl.file.buffer.size" : "65536",
+-    "dfs.permissions.superusergroup" : "supergroup",
+-    "dfs.datanode.available-space-volume-choosing-policy.balanced-space-threshold" : "10737418240",
+-    "mapreduce.cluster.acls.enabled" : "false",
+-    "yarn.nodemanager.remote-app-log-dir-suffix" : "logs",
+-    "ha.failover-controller.graceful-fence.connection.retries" : "1",
+-    "ha.health-monitor.connect-retry-interval.ms" : "1000",
+-    "mapreduce.reduce.shuffle.merge.percent" : "0.66",
+-    "yarn.app.mapreduce.am.resource.mb" : "1536",
+-    "io.seqfile.local.dir" : "${hadoop.tmp.dir}/io/local",
+-    "dfs.namenode.checkpoint.check.period" : "60",
+-    "yarn.resourcemanager.nm.liveness-monitor.interval-ms" : "1000",
+-    "file.blocksize" : "67108864",
+-    "tfile.io.chunk.size" : "1048576",
+-    "mapreduce.job.acl-modify-job" : " ",
+-    "yarn.nodemanager.webapp.address" : "0.0.0.0:8042",
+-    "mapreduce.tasktracker.reduce.tasks.maximum" : "2",
+-    "io.skip.checksum.errors" : "false",
+-    "mapreduce.cluster.temp.dir" : "${hadoop.tmp.dir}/mapred/temp",
+-    "yarn.app.mapreduce.am.staging-dir" : "/user",
+-    "dfs.namenode.edits.journal-plugin.qjournal" : "org.apache.hadoop.hdfs.qjournal.client.QuorumJournalManager",
+-    "dfs.datanode.handler.count" : "10",
+-    "fs.ftp.host.port" : "21",
+-    "dfs.namenode.decommission.nodes.per.interval" : "5",
+-    "yarn.resourcemanager.admin.client.thread-count" : "1",
+-    "dfs.namenode.fs-limits.max-component-length" : "0",
+-    "dfs.namenode.checkpoint.period" : "3600",
+-    "fs.AbstractFileSystem.viewfs.impl" : "org.apache.hadoop.fs.viewfs.ViewFs",
+-    "yarn.resourcemanager.resource-tracker.client.thread-count" : "50",
+-    "mapreduce.map.output.compress" : "true",
+-    "dfs.datanode.ipc.address" : "0.0.0.0:9867",
+-    "hadoop.ssl.require.client.cert" : "false",
+-    "yarn.nodemanager.delete.debug-delay-sec" : "0",
+-    "dfs.datanode.max.transfer.threads" : "4096"
+-  },
+-  "computonsPerMapInputByte" : -1,
+-  "computonsPerMapOutputByte" : -1,
+-  "computonsPerReduceInputByte" : -1,
+-  "computonsPerReduceOutputByte" : -1,
+-  "heapMegabytes" : 200,
+-  "outcome" : "SUCCESS",
+-  "jobtype" : "JAVA",
+-  "directDependantJobs" : [ ],
+-  "successfulMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 32847,
+-    "minimum" : 11897,
+-    "rankings" : [ {
+-      "datum" : 14151,
+-      "relativeRanking" : 0.05
+-    }, {
+-      "datum" : 15844,
+-      "relativeRanking" : 0.1
+-    }, {
+-      "datum" : 18656,
+-      "relativeRanking" : 0.15
+-    }, {
+-      "datum" : 18806,
+-      "relativeRanking" : 0.2
+-    }, {
+-      "datum" : 18840,
+-      "relativeRanking" : 0.25
+-    }, {
+-      "datum" : 18982,
+-      "relativeRanking" : 0.3
+-    }, {
+-      "datum" : 19314,
+-      "relativeRanking" : 0.35
+-    }, {
+-      "datum" : 19587,
+-      "relativeRanking" : 0.4
+-    }, {
+-      "datum" : 19703,
+-      "relativeRanking" : 0.45
+-    }, {
+-      "datum" : 19800,
+-      "relativeRanking" : 0.5
+-    }, {
+-      "datum" : 19965,
+-      "relativeRanking" : 0.55
+-    }, {
+-      "datum" : 20604,
+-      "relativeRanking" : 0.6
+-    }, {
+-      "datum" : 20892,
+-      "relativeRanking" : 0.65
+-    }, {
+-      "datum" : 21526,
+-      "relativeRanking" : 0.7
+-    }, {
+-      "datum" : 21911,
+-      "relativeRanking" : 0.75
+-    }, {
+-      "datum" : 22144,
+-      "relativeRanking" : 0.8
+-    }, {
+-      "datum" : 22539,
+-      "relativeRanking" : 0.85
+-    }, {
+-      "datum" : 23034,
+-      "relativeRanking" : 0.9
+-    }, {
+-      "datum" : 23601,
+-      "relativeRanking" : 0.95
+-    } ],
+-    "numberValues" : 96
+-  } ],
+-  "failedMapAttemptCDFs" : [ {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  }, {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  } ],
+-  "successfulReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "failedReduceAttemptCDF" : {
+-    "maximum" : 9223372036854775807,
+-    "minimum" : -9223372036854775808,
+-    "rankings" : [ ],
+-    "numberValues" : 0
+-  },
+-  "mapperTriesToSucceed" : [ 1.0 ],
+-  "failedMapperFraction" : 0.0,
+-  "relativeTime" : 0,
+-  "clusterMapMB" : -1,
+-  "clusterReduceMB" : -1,
+-  "jobMapMB" : 200,
+-  "jobReduceMB" : 200
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css b/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
+deleted file mode 100644
+index 2d3ebfd9d54..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/*!
+- * Bootstrap Responsive v2.1.1
+- *
+- * Copyright 2012 Twitter, Inc
+- * Licensed under the Apache License v2.0
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Designed and built with all the love in the world @twitter by @mdo and @fat.
+- */
+-.clearfix{*zoom:1}
+-.clearfix:before,
+-.clearfix:after{display:table;line-height:0;content:""}
+-.clearfix:after{clear:both}
+-.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
+-.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
+-.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}
+-.visible-tablet{display:none!important}.hidden-desktop{display:none!important}
+-.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}
+-.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade.in{top:auto}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:block;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css b/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
+deleted file mode 100644
+index fd129b2cc69..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/*!
+- * Bootstrap v2.1.1
+- *
+- * Copyright 2012 Twitter, Inc
+- * Licensed under the Apache License v2.0
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Designed and built with all the love in the world @twitter by @mdo and @fat.
+- */
+-article,
+-aside,
+-details,
+-figcaption,
+-figure,
+-footer,
+-header,
+-hgroup,
+-nav,
+-section{display:block}
+-audio,
+-canvas,
+-video{display:inline-block;*display:inline;*zoom:1}
+-audio:not([controls]){display:none}
+-html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}
+-a:focus{
+-  outline:thin dotted #333;
+-  outline:5px auto -webkit-focus-ring-color;
+-  outline-offset:-2px
+-}
+-a:hover,
+-a:active{outline:0}
+-sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}
+-sup{top:-0.5em}sub{bottom:-0.25em}
+-img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}
+-#map_canvas img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}
+-button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}
+-button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}.text-warning{color:#c09853}.text-error{color:#b94a48}.text-info{color:#3a87ad}.text-success{color:#468847}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:1;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1{font-size:36px;line-height:40px}h2{font-size:30px;line-height:40px}h3{font-size:24px;line-height:40px}h4{font-size:18px;line-height:20px}h5{font-size:14px;line-height:20px}h6{font-size:12px;line-height:20px}h1 small{font-size:24px}h2 small{font-size:18px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal;cursor:pointer}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:18px;padding-left:18px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"]{float:left}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;font-size:14px;vertical-align:top;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append .add-on,.input-append .btn{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child,.table-bordered tfoot:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child,.table-bordered tfoot:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topleft:4px}.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5}table [class*=span],.row-fluid table [class*=span]{display:table-cell;float:none;margin-left:0}.table .span1{float:none;width:44px;margin-left:0}.table .span2{float:none;width:124px;margin-left:0}.table .span3{float:none;width:204px;margin-left:0}.table .span4{float:none;width:284px;margin-left:0}.table .span5{float:none;width:364px;margin-left:0}.table .span6{float:none;width:444px;margin-left:0}.table .span7{float:none;width:524px;margin-left:0}.table .span8{float:none;width:604px;margin-left:0}.table .span9{float:none;width:684px;margin-left:0}.table .span10{float:none;width:764px;margin-left:0}.table .span11{float:none;width:844px;margin-left:0}.table .span12{float:none;width:924px;margin-left:0}.table .span13{float:none;width:1004px;margin-left:0}.table .span14{float:none;width:1084px;margin-left:0}.table .span15{float:none;width:1164px;margin-left:0}.table .span16{float:none;width:1244px;margin-left:0}.table .span17{float:none;width:1324px;margin-left:0}.table .span18{float:none;width:1404px;margin-left:0}.table .span19{float:none;width:1484px;margin-left:0}.table .span20{float:none;width:1564px;margin-left:0}.table .span21{float:none;width:1644px;margin-left:0}.table .span22{float:none;width:1724px;margin-left:0}.table .span23{float:none;width:1804px;margin-left:0}.table .span24{float:none;width:1884px;margin-left:0}.table tbody tr.success td{background-color:#dff0d8}.table tbody tr.error td{background-color:#f2dede}.table tbody tr.warning td{background-color:#fcf8e3}.table tbody tr.info td{background-color:#d9edf7}.table-hover tbody tr.success:hover td{background-color:#d0e9c6}.table-hover tbody tr.error:hover td{background-color:#ebcccc}.table-hover tbody tr.warning:hover td{background-color:#faf2cc}.table-hover tbody tr.info:hover td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{color:#fff;text-decoration:none;background-color:#08c;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#08c;background-color:#0081c2;background-image:linear-gradient(to bottom,#08c,#0077b3);background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999}.dropdown-menu .disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 14px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;*line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbb;*border:0;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.btn-large [class^="icon-"]{margin-top:2px}.btn-small{padding:3px 9px;font-size:12px;line-height:18px}.btn-small [class^="icon-"]{margin-top:0}.btn-mini{padding:2px 6px;font-size:11px;line-height:17px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#c5c5c5;border-color:rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-image:-moz-linear-gradient(top,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-image:-moz-linear-gradient(top,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-image:-moz-linear-gradient(top,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover{color:#333;text-decoration:none}.btn-group{position:relative;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1}.btn-toolbar .btn+.btn,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu{font-size:14px}.btn-group>.btn-mini{font-size:11px}.btn-group>.btn-small{font-size:12px}.btn-group>.btn-large{font-size:16px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-top:0;border-bottom:5px solid #000}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical .btn{display:block;float:none;width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical .btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical .btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;color:#c09853;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible;color:#777}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px}.navbar-link{color:#777}.navbar-link:hover{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;width:100%;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.1),0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.1),0 1px 10px rgba(0,0,0,0.1);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.1),0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,0.1),0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 0 rgba(0,0,0,0.1),0 -1px 10px rgba(0,0,0,0.1);box-shadow:inset 0 1px 0 rgba(0,0,0,0.1),0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse{color:#999}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#fff}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-image:-moz-linear-gradient(top,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb .divider{padding:0 5px;color:#ccc}.breadcrumb .active{color:#999}.pagination{height:40px;margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:0 14px;line-height:38px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager a,.pager span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next a,.pager .next span{float:right}.pager .previous a{float:left}.pager .disabled a,.pager .disabled a:hover,.pager .disabled span{color:#999;cursor:default;background-color:#fff}.modal-open .modal .dropdown-menu{z-index:2050}.modal-open .modal .dropdown.open{*z-index:2050}.modal-open .modal .popover{z-index:2060}.modal-open .modal .tooltip{z-index:2080}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:50%;left:50%;z-index:1050;width:560px;margin:-250px 0 0 -280px;overflow:auto;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:50%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.tooltip{position:absolute;z-index:1030;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-3px}.tooltip.right{margin-left:3px}.tooltip.bottom{margin-top:3px}.tooltip.left{margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-bottom:10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-right:10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0}.popover .arrow,.popover .arrow:after{position:absolute;display:inline-block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow:after{z-index:-1;content:""}.popover.top .arrow{bottom:-10px;left:50%;margin-left:-10px;border-top-color:#fff;border-width:10px 10px 0}.popover.top .arrow:after{bottom:-1px;left:-11px;border-top-color:rgba(0,0,0,0.25);border-width:11px 11px 0}.popover.right .arrow{top:50%;left:-10px;margin-top:-10px;border-right-color:#fff;border-width:10px 10px 10px 0}.popover.right .arrow:after{bottom:-11px;left:-1px;border-right-color:rgba(0,0,0,0.25);border-width:11px 11px 11px 0}.popover.bottom .arrow{top:-10px;left:50%;margin-left:-10px;border-bottom-color:#fff;border-width:0 10px 10px}.popover.bottom .arrow:after{top:-1px;left:-11px;border-bottom-color:rgba(0,0,0,0.25);border-width:0 11px 11px}.popover.left .arrow{top:50%;right:-10px;margin-top:-10px;border-left-color:#fff;border-width:10px 0 10px 10px}.popover.left .arrow:after{right:-1px;bottom:-11px;border-left-color:rgba(0,0,0,0.25);border-width:11px 0 11px 11px}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.label,.badge{font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel .item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel .item>img{display:block;line-height:1}.carousel .active,.carousel .next,.carousel .prev{display:block}.carousel .active{left:0}.carousel .next,.carousel .prev{position:absolute;top:0;width:100%}.carousel .next{left:100%}.carousel .prev{left:-100%}.carousel .next.left,.carousel .prev.right{left:0}.carousel .active.left{left:-100%}.carousel .active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js b/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
+deleted file mode 100644
+index 16fab531833..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
++++ /dev/null
+@@ -1,6 +0,0 @@
+-/*!
+-* Bootstrap.js by @fat & @mdo
+-* Copyright 2012 Twitter, Inc.
+-* http://www.apache.org/licenses/LICENSE-2.0.txt
+-*/
+-!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(function(){e("html").on("click.dropdown.data-api touchstart.dropdown.data-api",r),e("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;e("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1).focus(),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.trigger("shown")}):t.$element.trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,e("body").removeClass("modal-open"),this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js b/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
+deleted file mode 100644
+index 80640aded91..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
++++ /dev/null
+@@ -1,8823 +0,0 @@
+-/*!
+-* Copyright (c) 2013, Michael Bostock
+-  All rights reserved.
+-
+-  Redistribution and use in source and binary forms, with or without
+-  modification, are permitted provided that the following conditions are met:
+-
+-  * Redistributions of source code must retain the above copyright notice, this
+-    list of conditions and the following disclaimer.
+-
+-  * Redistributions in binary form must reproduce the above copyright notice,
+-    this list of conditions and the following disclaimer in the documentation
+-    and/or other materials provided with the distribution.
+-
+-  * The name Michael Bostock may not be used to endorse or promote products
+-    derived from this software without specific prior written permission.
+-
+-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-  DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
+-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+-  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+-  OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+-  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-*/
+-d3 = function() {
+-  var d3 = {
+-    version: "3.2.7"
+-  };
+-  if (!Date.now) Date.now = function() {
+-    return +new Date();
+-  };
+-  var d3_document = document, d3_documentElement = d3_document.documentElement, d3_window = window;
+-  try {
+-    d3_document.createElement("div").style.setProperty("opacity", 0, "");
+-  } catch (error) {
+-    var d3_element_prototype = d3_window.Element.prototype, d3_element_setAttribute = d3_element_prototype.setAttribute, d3_element_setAttributeNS = d3_element_prototype.setAttributeNS, d3_style_prototype = d3_window.CSSStyleDeclaration.prototype, d3_style_setProperty = d3_style_prototype.setProperty;
+-    d3_element_prototype.setAttribute = function(name, value) {
+-      d3_element_setAttribute.call(this, name, value + "");
+-    };
+-    d3_element_prototype.setAttributeNS = function(space, local, value) {
+-      d3_element_setAttributeNS.call(this, space, local, value + "");
+-    };
+-    d3_style_prototype.setProperty = function(name, value, priority) {
+-      d3_style_setProperty.call(this, name, value + "", priority);
+-    };
+-  }
+-  d3.ascending = function(a, b) {
+-    return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
+-  };
+-  d3.descending = function(a, b) {
+-    return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+-  };
+-  d3.min = function(array, f) {
+-    var i = -1, n = array.length, a, b;
+-    if (arguments.length === 1) {
+-      while (++i < n && !((a = array[i]) != null && a <= a)) a = undefined;
+-      while (++i < n) if ((b = array[i]) != null && a > b) a = b;
+-    } else {
+-      while (++i < n && !((a = f.call(array, array[i], i)) != null && a <= a)) a = undefined;
+-      while (++i < n) if ((b = f.call(array, array[i], i)) != null && a > b) a = b;
+-    }
+-    return a;
+-  };
+-  d3.max = function(array, f) {
+-    var i = -1, n = array.length, a, b;
+-    if (arguments.length === 1) {
+-      while (++i < n && !((a = array[i]) != null && a <= a)) a = undefined;
+-      while (++i < n) if ((b = array[i]) != null && b > a) a = b;
+-    } else {
+-      while (++i < n && !((a = f.call(array, array[i], i)) != null && a <= a)) a = undefined;
+-      while (++i < n) if ((b = f.call(array, array[i], i)) != null && b > a) a = b;
+-    }
+-    return a;
+-  };
+-  d3.extent = function(array, f) {
+-    var i = -1, n = array.length, a, b, c;
+-    if (arguments.length === 1) {
+-      while (++i < n && !((a = c = array[i]) != null && a <= a)) a = c = undefined;
+-      while (++i < n) if ((b = array[i]) != null) {
+-        if (a > b) a = b;
+-        if (c < b) c = b;
+-      }
+-    } else {
+-      while (++i < n && !((a = c = f.call(array, array[i], i)) != null && a <= a)) a = undefined;
+-      while (++i < n) if ((b = f.call(array, array[i], i)) != null) {
+-        if (a > b) a = b;
+-        if (c < b) c = b;
+-      }
+-    }
+-    return [ a, c ];
+-  };
+-  d3.sum = function(array, f) {
+-    var s = 0, n = array.length, a, i = -1;
+-    if (arguments.length === 1) {
+-      while (++i < n) if (!isNaN(a = +array[i])) s += a;
+-    } else {
+-      while (++i < n) if (!isNaN(a = +f.call(array, array[i], i))) s += a;
+-    }
+-    return s;
+-  };
+-  function d3_number(x) {
+-    return x != null && !isNaN(x);
+-  }
+-  d3.mean = function(array, f) {
+-    var n = array.length, a, m = 0, i = -1, j = 0;
+-    if (arguments.length === 1) {
+-      while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+-    } else {
+-      while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+-    }
+-    return j ? m : undefined;
+-  };
+-  d3.quantile = function(values, p) {
+-    var H = (values.length - 1) * p + 1, h = Math.floor(H), v = +values[h - 1], e = H - h;
+-    return e ? v + e * (values[h] - v) : v;
+-  };
+-  d3.median = function(array, f) {
+-    if (arguments.length > 1) array = array.map(f);
+-    array = array.filter(d3_number);
+-    return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
+-  };
+-  d3.bisector = function(f) {
+-    return {
+-      left: function(a, x, lo, hi) {
+-        if (arguments.length < 3) lo = 0;
+-        if (arguments.length < 4) hi = a.length;
+-        while (lo < hi) {
+-          var mid = lo + hi >>> 1;
+-          if (f.call(a, a[mid], mid) < x) lo = mid + 1; else hi = mid;
+-        }
+-        return lo;
+-      },
+-      right: function(a, x, lo, hi) {
+-        if (arguments.length < 3) lo = 0;
+-        if (arguments.length < 4) hi = a.length;
+-        while (lo < hi) {
+-          var mid = lo + hi >>> 1;
+-          if (x < f.call(a, a[mid], mid)) hi = mid; else lo = mid + 1;
+-        }
+-        return lo;
+-      }
+-    };
+-  };
+-  var d3_bisector = d3.bisector(function(d) {
+-    return d;
+-  });
+-  d3.bisectLeft = d3_bisector.left;
+-  d3.bisect = d3.bisectRight = d3_bisector.right;
+-  d3.shuffle = function(array) {
+-    var m = array.length, t, i;
+-    while (m) {
+-      i = Math.random() * m-- | 0;
+-      t = array[m], array[m] = array[i], array[i] = t;
+-    }
+-    return array;
+-  };
+-  d3.permute = function(array, indexes) {
+-    var permutes = [], i = -1, n = indexes.length;
+-    while (++i < n) permutes[i] = array[indexes[i]];
+-    return permutes;
+-  };
+-  d3.zip = function() {
+-    if (!(n = arguments.length)) return [];
+-    for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m; ) {
+-      for (var j = -1, n, zip = zips[i] = new Array(n); ++j < n; ) {
+-        zip[j] = arguments[j][i];
+-      }
+-    }
+-    return zips;
+-  };
+-  function d3_zipLength(d) {
+-    return d.length;
+-  }
+-  d3.transpose = function(matrix) {
+-    return d3.zip.apply(d3, matrix);
+-  };
+-  d3.keys = function(map) {
+-    var keys = [];
+-    for (var key in map) keys.push(key);
+-    return keys;
+-  };
+-  d3.values = function(map) {
+-    var values = [];
+-    for (var key in map) values.push(map[key]);
+-    return values;
+-  };
+-  d3.entries = function(map) {
+-    var entries = [];
+-    for (var key in map) entries.push({
+-      key: key,
+-      value: map[key]
+-    });
+-    return entries;
+-  };
+-  d3.merge = function(arrays) {
+-    return Array.prototype.concat.apply([], arrays);
+-  };
+-  d3.range = function(start, stop, step) {
+-    if (arguments.length < 3) {
+-      step = 1;
+-      if (arguments.length < 2) {
+-        stop = start;
+-        start = 0;
+-      }
+-    }
+-    if ((stop - start) / step === Infinity) throw new Error("infinite range");
+-    var range = [], k = d3_range_integerScale(Math.abs(step)), i = -1, j;
+-    start *= k, stop *= k, step *= k;
+-    if (step < 0) while ((j = start + step * ++i) > stop) range.push(j / k); else while ((j = start + step * ++i) < stop) range.push(j / k);
+-    return range;
+-  };
+-  function d3_range_integerScale(x) {
+-    var k = 1;
+-    while (x * k % 1) k *= 10;
+-    return k;
+-  }
+-  function d3_class(ctor, properties) {
+-    try {
+-      for (var key in properties) {
+-        Object.defineProperty(ctor.prototype, key, {
+-          value: properties[key],
+-          enumerable: false
+-        });
+-      }
+-    } catch (e) {
+-      ctor.prototype = properties;
+-    }
+-  }
+-  d3.map = function(object) {
+-    var map = new d3_Map();
+-    for (var key in object) map.set(key, object[key]);
+-    return map;
+-  };
+-  function d3_Map() {}
+-  d3_class(d3_Map, {
+-    has: function(key) {
+-      return d3_map_prefix + key in this;
+-    },
+-    get: function(key) {
+-      return this[d3_map_prefix + key];
+-    },
+-    set: function(key, value) {
+-      return this[d3_map_prefix + key] = value;
+-    },
+-    remove: function(key) {
+-      key = d3_map_prefix + key;
+-      return key in this && delete this[key];
+-    },
+-    keys: function() {
+-      var keys = [];
+-      this.forEach(function(key) {
+-        keys.push(key);
+-      });
+-      return keys;
+-    },
+-    values: function() {
+-      var values = [];
+-      this.forEach(function(key, value) {
+-        values.push(value);
+-      });
+-      return values;
+-    },
+-    entries: function() {
+-      var entries = [];
+-      this.forEach(function(key, value) {
+-        entries.push({
+-          key: key,
+-          value: value
+-        });
+-      });
+-      return entries;
+-    },
+-    forEach: function(f) {
+-      for (var key in this) {
+-        if (key.charCodeAt(0) === d3_map_prefixCode) {
+-          f.call(this, key.substring(1), this[key]);
+-        }
+-      }
+-    }
+-  });
+-  var d3_map_prefix = "\0", d3_map_prefixCode = d3_map_prefix.charCodeAt(0);
+-  d3.nest = function() {
+-    var nest = {}, keys = [], sortKeys = [], sortValues, rollup;
+-    function map(mapType, array, depth) {
+-      if (depth >= keys.length) return rollup ? rollup.call(nest, array) : sortValues ? array.sort(sortValues) : array;
+-      var i = -1, n = array.length, key = keys[depth++], keyValue, object, setter, valuesByKey = new d3_Map(), values;
+-      while (++i < n) {
+-        if (values = valuesByKey.get(keyValue = key(object = array[i]))) {
+-          values.push(object);
+-        } else {
+-          valuesByKey.set(keyValue, [ object ]);
+-        }
+-      }
+-      if (mapType) {
+-        object = mapType();
+-        setter = function(keyValue, values) {
+-          object.set(keyValue, map(mapType, values, depth));
+-        };
+-      } else {
+-        object = {};
+-        setter = function(keyValue, values) {
+-          object[keyValue] = map(mapType, values, depth);
+-        };
+-      }
+-      valuesByKey.forEach(setter);
+-      return object;
+-    }
+-    function entries(map, depth) {
+-      if (depth >= keys.length) return map;
+-      var array = [], sortKey = sortKeys[depth++];
+-      map.forEach(function(key, keyMap) {
+-        array.push({
+-          key: key,
+-          values: entries(keyMap, depth)
+-        });
+-      });
+-      return sortKey ? array.sort(function(a, b) {
+-        return sortKey(a.key, b.key);
+-      }) : array;
+-    }
+-    nest.map = function(array, mapType) {
+-      return map(mapType, array, 0);
+-    };
+-    nest.entries = function(array) {
+-      return entries(map(d3.map, array, 0), 0);
+-    };
+-    nest.key = function(d) {
+-      keys.push(d);
+-      return nest;
+-    };
+-    nest.sortKeys = function(order) {
+-      sortKeys[keys.length - 1] = order;
+-      return nest;
+-    };
+-    nest.sortValues = function(order) {
+-      sortValues = order;
+-      return nest;
+-    };
+-    nest.rollup = function(f) {
+-      rollup = f;
+-      return nest;
+-    };
+-    return nest;
+-  };
+-  d3.set = function(array) {
+-    var set = new d3_Set();
+-    if (array) for (var i = 0; i < array.length; i++) set.add(array[i]);
+-    return set;
+-  };
+-  function d3_Set() {}
+-  d3_class(d3_Set, {
+-    has: function(value) {
+-      return d3_map_prefix + value in this;
+-    },
+-    add: function(value) {
+-      this[d3_map_prefix + value] = true;
+-      return value;
+-    },
+-    remove: function(value) {
+-      value = d3_map_prefix + value;
+-      return value in this && delete this[value];
+-    },
+-    values: function() {
+-      var values = [];
+-      this.forEach(function(value) {
+-        values.push(value);
+-      });
+-      return values;
+-    },
+-    forEach: function(f) {
+-      for (var value in this) {
+-        if (value.charCodeAt(0) === d3_map_prefixCode) {
+-          f.call(this, value.substring(1));
+-        }
+-      }
+-    }
+-  });
+-  d3.behavior = {};
+-  d3.rebind = function(target, source) {
+-    var i = 1, n = arguments.length, method;
+-    while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+-    return target;
+-  };
+-  function d3_rebind(target, source, method) {
+-    return function() {
+-      var value = method.apply(source, arguments);
+-      return value === source ? target : value;
+-    };
+-  }
+-  function d3_vendorSymbol(object, name) {
+-    if (name in object) return name;
+-    name = name.charAt(0).toUpperCase() + name.substring(1);
+-    for (var i = 0, n = d3_vendorPrefixes.length; i < n; ++i) {
+-      var prefixName = d3_vendorPrefixes[i] + name;
+-      if (prefixName in object) return prefixName;
+-    }
+-  }
+-  var d3_vendorPrefixes = [ "webkit", "ms", "moz", "Moz", "o", "O" ];
+-  var d3_array = d3_arraySlice;
+-  function d3_arrayCopy(pseudoarray) {
+-    var i = -1, n = pseudoarray.length, array = [];
+-    while (++i < n) array.push(pseudoarray[i]);
+-    return array;
+-  }
+-  function d3_arraySlice(pseudoarray) {
+-    return Array.prototype.slice.call(pseudoarray);
+-  }
+-  try {
+-    d3_array(d3_documentElement.childNodes)[0].nodeType;
+-  } catch (e) {
+-    d3_array = d3_arrayCopy;
+-  }
+-  function d3_noop() {}
+-  d3.dispatch = function() {
+-    var dispatch = new d3_dispatch(), i = -1, n = arguments.length;
+-    while (++i < n) dispatch[arguments[i]] = d3_dispatch_event(dispatch);
+-    return dispatch;
+-  };
+-  function d3_dispatch() {}
+-  d3_dispatch.prototype.on = function(type, listener) {
+-    var i = type.indexOf("."), name = "";
+-    if (i >= 0) {
+-      name = type.substring(i + 1);
+-      type = type.substring(0, i);
+-    }
+-    if (type) return arguments.length < 2 ? this[type].on(name) : this[type].on(name, listener);
+-    if (arguments.length === 2) {
+-      if (listener == null) for (type in this) {
+-        if (this.hasOwnProperty(type)) this[type].on(name, null);
+-      }
+-      return this;
+-    }
+-  };
+-  function d3_dispatch_event(dispatch) {
+-    var listeners = [], listenerByName = new d3_Map();
+-    function event() {
+-      var z = listeners, i = -1, n = z.length, l;
+-      while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+-      return dispatch;
+-    }
+-    event.on = function(name, listener) {
+-      var l = listenerByName.get(name), i;
+-      if (arguments.length < 2) return l && l.on;
+-      if (l) {
+-        l.on = null;
+-        listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
+-        listenerByName.remove(name);
+-      }
+-      if (listener) listeners.push(listenerByName.set(name, {
+-        on: listener
+-      }));
+-      return dispatch;
+-    };
+-    return event;
+-  }
+-  d3.event = null;
+-  function d3_eventPreventDefault() {
+-    d3.event.preventDefault();
+-  }
+-  function d3_eventSource() {
+-    var e = d3.event, s;
+-    while (s = e.sourceEvent) e = s;
+-    return e;
+-  }
+-  function d3_eventDispatch(target) {
+-    var dispatch = new d3_dispatch(), i = 0, n = arguments.length;
+-    while (++i < n) dispatch[arguments[i]] = d3_dispatch_event(dispatch);
+-    dispatch.of = function(thiz, argumentz) {
+-      return function(e1) {
+-        try {
+-          var e0 = e1.sourceEvent = d3.event;
+-          e1.target = target;
+-          d3.event = e1;
+-          dispatch[e1.type].apply(thiz, argumentz);
+-        } finally {
+-          d3.event = e0;
+-        }
+-      };
+-    };
+-    return dispatch;
+-  }
+-  d3.requote = function(s) {
+-    return s.replace(d3_requote_re, "\\$&");
+-  };
+-  var d3_requote_re = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+-  var d3_subclass = {}.__proto__ ? function(object, prototype) {
+-    object.__proto__ = prototype;
+-  } : function(object, prototype) {
+-    for (var property in prototype) object[property] = prototype[property];
+-  };
+-  function d3_selection(groups) {
+-    d3_subclass(groups, d3_selectionPrototype);
+-    return groups;
+-  }
+-  var d3_select = function(s, n) {
+-    return n.querySelector(s);
+-  }, d3_selectAll = function(s, n) {
+-    return n.querySelectorAll(s);
+-  }, d3_selectMatcher = d3_documentElement[d3_vendorSymbol(d3_documentElement, "matchesSelector")], d3_selectMatches = function(n, s) {
+-    return d3_selectMatcher.call(n, s);
+-  };
+-  if (typeof Sizzle === "function") {
+-    d3_select = function(s, n) {
+-      return Sizzle(s, n)[0] || null;
+-    };
+-    d3_selectAll = function(s, n) {
+-      return Sizzle.uniqueSort(Sizzle(s, n));
+-    };
+-    d3_selectMatches = Sizzle.matchesSelector;
+-  }
+-  d3.selection = function() {
+-    return d3_selectionRoot;
+-  };
+-  var d3_selectionPrototype = d3.selection.prototype = [];
+-  d3_selectionPrototype.select = function(selector) {
+-    var subgroups = [], subgroup, subnode, group, node;
+-    selector = d3_selection_selector(selector);
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      subgroups.push(subgroup = []);
+-      subgroup.parentNode = (group = this[j]).parentNode;
+-      for (var i = -1, n = group.length; ++i < n; ) {
+-        if (node = group[i]) {
+-          subgroup.push(subnode = selector.call(node, node.__data__, i, j));
+-          if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
+-        } else {
+-          subgroup.push(null);
+-        }
+-      }
+-    }
+-    return d3_selection(subgroups);
+-  };
+-  function d3_selection_selector(selector) {
+-    return typeof selector === "function" ? selector : function() {
+-      return d3_select(selector, this);
+-    };
+-  }
+-  d3_selectionPrototype.selectAll = function(selector) {
+-    var subgroups = [], subgroup, node;
+-    selector = d3_selection_selectorAll(selector);
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
+-        if (node = group[i]) {
+-          subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i, j)));
+-          subgroup.parentNode = node;
+-        }
+-      }
+-    }
+-    return d3_selection(subgroups);
+-  };
+-  function d3_selection_selectorAll(selector) {
+-    return typeof selector === "function" ? selector : function() {
+-      return d3_selectAll(selector, this);
+-    };
+-  }
+-  var d3_nsPrefix = {
+-    svg: "http://www.w3.org/2000/svg",
+-    xhtml: "http://www.w3.org/1999/xhtml",
+-    xlink: "http://www.w3.org/1999/xlink",
+-    xml: "http://www.w3.org/XML/1998/namespace",
+-    xmlns: "http://www.w3.org/2000/xmlns/"
+-  };
+-  d3.ns = {
+-    prefix: d3_nsPrefix,
+-    qualify: function(name) {
+-      var i = name.indexOf(":"), prefix = name;
+-      if (i >= 0) {
+-        prefix = name.substring(0, i);
+-        name = name.substring(i + 1);
+-      }
+-      return d3_nsPrefix.hasOwnProperty(prefix) ? {
+-        space: d3_nsPrefix[prefix],
+-        local: name
+-      } : name;
+-    }
+-  };
+-  d3_selectionPrototype.attr = function(name, value) {
+-    if (arguments.length < 2) {
+-      if (typeof name === "string") {
+-        var node = this.node();
+-        name = d3.ns.qualify(name);
+-        return name.local ? node.getAttributeNS(name.space, name.local) : node.getAttribute(name);
+-      }
+-      for (value in name) this.each(d3_selection_attr(value, name[value]));
+-      return this;
+-    }
+-    return this.each(d3_selection_attr(name, value));
+-  };
+-  function d3_selection_attr(name, value) {
+-    name = d3.ns.qualify(name);
+-    function attrNull() {
+-      this.removeAttribute(name);
+-    }
+-    function attrNullNS() {
+-      this.removeAttributeNS(name.space, name.local);
+-    }
+-    function attrConstant() {
+-      this.setAttribute(name, value);
+-    }
+-    function attrConstantNS() {
+-      this.setAttributeNS(name.space, name.local, value);
+-    }
+-    function attrFunction() {
+-      var x = value.apply(this, arguments);
+-      if (x == null) this.removeAttribute(name); else this.setAttribute(name, x);
+-    }
+-    function attrFunctionNS() {
+-      var x = value.apply(this, arguments);
+-      if (x == null) this.removeAttributeNS(name.space, name.local); else this.setAttributeNS(name.space, name.local, x);
+-    }
+-    return value == null ? name.local ? attrNullNS : attrNull : typeof value === "function" ? name.local ? attrFunctionNS : attrFunction : name.local ? attrConstantNS : attrConstant;
+-  }
+-  function d3_collapse(s) {
+-    return s.trim().replace(/\s+/g, " ");
+-  }
+-  d3_selectionPrototype.classed = function(name, value) {
+-    if (arguments.length < 2) {
+-      if (typeof name === "string") {
+-        var node = this.node(), n = (name = name.trim().split(/^|\s+/g)).length, i = -1;
+-        if (value = node.classList) {
+-          while (++i < n) if (!value.contains(name[i])) return false;
+-        } else {
+-          value = node.getAttribute("class");
+-          while (++i < n) if (!d3_selection_classedRe(name[i]).test(value)) return false;
+-        }
+-        return true;
+-      }
+-      for (value in name) this.each(d3_selection_classed(value, name[value]));
+-      return this;
+-    }
+-    return this.each(d3_selection_classed(name, value));
+-  };
+-  function d3_selection_classedRe(name) {
+-    return new RegExp("(?:^|\\s+)" + d3.requote(name) + "(?:\\s+|$)", "g");
+-  }
+-  function d3_selection_classed(name, value) {
+-    name = name.trim().split(/\s+/).map(d3_selection_classedName);
+-    var n = name.length;
+-    function classedConstant() {
+-      var i = -1;
+-      while (++i < n) name[i](this, value);
+-    }
+-    function classedFunction() {
+-      var i = -1, x = value.apply(this, arguments);
+-      while (++i < n) name[i](this, x);
+-    }
+-    return typeof value === "function" ? classedFunction : classedConstant;
+-  }
+-  function d3_selection_classedName(name) {
+-    var re = d3_selection_classedRe(name);
+-    return function(node, value) {
+-      if (c = node.classList) return value ? c.add(name) : c.remove(name);
+-      var c = node.getAttribute("class") || "";
+-      if (value) {
+-        re.lastIndex = 0;
+-        if (!re.test(c)) node.setAttribute("class", d3_collapse(c + " " + name));
+-      } else {
+-        node.setAttribute("class", d3_collapse(c.replace(re, " ")));
+-      }
+-    };
+-  }
+-  d3_selectionPrototype.style = function(name, value, priority) {
+-    var n = arguments.length;
+-    if (n < 3) {
+-      if (typeof name !== "string") {
+-        if (n < 2) value = "";
+-        for (priority in name) this.each(d3_selection_style(priority, name[priority], value));
+-        return this;
+-      }
+-      if (n < 2) return d3_window.getComputedStyle(this.node(), null).getPropertyValue(name);
+-      priority = "";
+-    }
+-    return this.each(d3_selection_style(name, value, priority));
+-  };
+-  function d3_selection_style(name, value, priority) {
+-    function styleNull() {
+-      this.style.removeProperty(name);
+-    }
+-    function styleConstant() {
+-      this.style.setProperty(name, value, priority);
+-    }
+-    function styleFunction() {
+-      var x = value.apply(this, arguments);
+-      if (x == null) this.style.removeProperty(name); else this.style.setProperty(name, x, priority);
+-    }
+-    return value == null ? styleNull : typeof value === "function" ? styleFunction : styleConstant;
+-  }
+-  d3_selectionPrototype.property = function(name, value) {
+-    if (arguments.length < 2) {
+-      if (typeof name === "string") return this.node()[name];
+-      for (value in name) this.each(d3_selection_property(value, name[value]));
+-      return this;
+-    }
+-    return this.each(d3_selection_property(name, value));
+-  };
+-  function d3_selection_property(name, value) {
+-    function propertyNull() {
+-      delete this[name];
+-    }
+-    function propertyConstant() {
+-      this[name] = value;
+-    }
+-    function propertyFunction() {
+-      var x = value.apply(this, arguments);
+-      if (x == null) delete this[name]; else this[name] = x;
+-    }
+-    return value == null ? propertyNull : typeof value === "function" ? propertyFunction : propertyConstant;
+-  }
+-  d3_selectionPrototype.text = function(value) {
+-    return arguments.length ? this.each(typeof value === "function" ? function() {
+-      var v = value.apply(this, arguments);
+-      this.textContent = v == null ? "" : v;
+-    } : value == null ? function() {
+-      this.textContent = "";
+-    } : function() {
+-      this.textContent = value;
+-    }) : this.node().textContent;
+-  };
+-  d3_selectionPrototype.html = function(value) {
+-    return arguments.length ? this.each(typeof value === "function" ? function() {
+-      var v = value.apply(this, arguments);
+-      this.innerHTML = v == null ? "" : v;
+-    } : value == null ? function() {
+-      this.innerHTML = "";
+-    } : function() {
+-      this.innerHTML = value;
+-    }) : this.node().innerHTML;
+-  };
+-  d3_selectionPrototype.append = function(name) {
+-    name = d3_selection_creator(name);
+-    return this.select(function() {
+-      return this.appendChild(name.apply(this, arguments));
+-    });
+-  };
+-  function d3_selection_creator(name) {
+-    return typeof name === "function" ? name : (name = d3.ns.qualify(name)).local ? function() {
+-      return d3_document.createElementNS(name.space, name.local);
+-    } : function() {
+-      return d3_document.createElementNS(this.namespaceURI, name);
+-    };
+-  }
+-  d3_selectionPrototype.insert = function(name, before) {
+-    name = d3_selection_creator(name);
+-    before = d3_selection_selector(before);
+-    return this.select(function() {
+-      return this.insertBefore(name.apply(this, arguments), before.apply(this, arguments));
+-    });
+-  };
+-  d3_selectionPrototype.remove = function() {
+-    return this.each(function() {
+-      var parent = this.parentNode;
+-      if (parent) parent.removeChild(this);
+-    });
+-  };
+-  d3_selectionPrototype.data = function(value, key) {
+-    var i = -1, n = this.length, group, node;
+-    if (!arguments.length) {
+-      value = new Array(n = (group = this[0]).length);
+-      while (++i < n) {
+-        if (node = group[i]) {
+-          value[i] = node.__data__;
+-        }
+-      }
+-      return value;
+-    }
+-    function bind(group, groupData) {
+-      var i, n = group.length, m = groupData.length, n0 = Math.min(n, m), updateNodes = new Array(m), enterNodes = new Array(m), exitNodes = new Array(n), node, nodeData;
+-      if (key) {
+-        var nodeByKeyValue = new d3_Map(), dataByKeyValue = new d3_Map(), keyValues = [], keyValue;
+-        for (i = -1; ++i < n; ) {
+-          keyValue = key.call(node = group[i], node.__data__, i);
+-          if (nodeByKeyValue.has(keyValue)) {
+-            exitNodes[i] = node;
+-          } else {
+-            nodeByKeyValue.set(keyValue, node);
+-          }
+-          keyValues.push(keyValue);
+-        }
+-        for (i = -1; ++i < m; ) {
+-          keyValue = key.call(groupData, nodeData = groupData[i], i);
+-          if (node = nodeByKeyValue.get(keyValue)) {
+-            updateNodes[i] = node;
+-            node.__data__ = nodeData;
+-          } else if (!dataByKeyValue.has(keyValue)) {
+-            enterNodes[i] = d3_selection_dataNode(nodeData);
+-          }
+-          dataByKeyValue.set(keyValue, nodeData);
+-          nodeByKeyValue.remove(keyValue);
+-        }
+-        for (i = -1; ++i < n; ) {
+-          if (nodeByKeyValue.has(keyValues[i])) {
+-            exitNodes[i] = group[i];
+-          }
+-        }
+-      } else {
+-        for (i = -1; ++i < n0; ) {
+-          node = group[i];
+-          nodeData = groupData[i];
+-          if (node) {
+-            node.__data__ = nodeData;
+-            updateNodes[i] = node;
+-          } else {
+-            enterNodes[i] = d3_selection_dataNode(nodeData);
+-          }
+-        }
+-        for (;i < m; ++i) {
+-          enterNodes[i] = d3_selection_dataNode(groupData[i]);
+-        }
+-        for (;i < n; ++i) {
+-          exitNodes[i] = group[i];
+-        }
+-      }
+-      enterNodes.update = updateNodes;
+-      enterNodes.parentNode = updateNodes.parentNode = exitNodes.parentNode = group.parentNode;
+-      enter.push(enterNodes);
+-      update.push(updateNodes);
+-      exit.push(exitNodes);
+-    }
+-    var enter = d3_selection_enter([]), update = d3_selection([]), exit = d3_selection([]);
+-    if (typeof value === "function") {
+-      while (++i < n) {
+-        bind(group = this[i], value.call(group, group.parentNode.__data__, i));
+-      }
+-    } else {
+-      while (++i < n) {
+-        bind(group = this[i], value);
+-      }
+-    }
+-    update.enter = function() {
+-      return enter;
+-    };
+-    update.exit = function() {
+-      return exit;
+-    };
+-    return update;
+-  };
+-  function d3_selection_dataNode(data) {
+-    return {
+-      __data__: data
+-    };
+-  }
+-  d3_selectionPrototype.datum = function(value) {
+-    return arguments.length ? this.property("__data__", value) : this.property("__data__");
+-  };
+-  d3_selectionPrototype.filter = function(filter) {
+-    var subgroups = [], subgroup, group, node;
+-    if (typeof filter !== "function") filter = d3_selection_filter(filter);
+-    for (var j = 0, m = this.length; j < m; j++) {
+-      subgroups.push(subgroup = []);
+-      subgroup.parentNode = (group = this[j]).parentNode;
+-      for (var i = 0, n = group.length; i < n; i++) {
+-        if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+-          subgroup.push(node);
+-        }
+-      }
+-    }
+-    return d3_selection(subgroups);
+-  };
+-  function d3_selection_filter(selector) {
+-    return function() {
+-      return d3_selectMatches(this, selector);
+-    };
+-  }
+-  d3_selectionPrototype.order = function() {
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0; ) {
+-        if (node = group[i]) {
+-          if (next && next !== node.nextSibling) next.parentNode.insertBefore(node, next);
+-          next = node;
+-        }
+-      }
+-    }
+-    return this;
+-  };
+-  d3_selectionPrototype.sort = function(comparator) {
+-    comparator = d3_selection_sortComparator.apply(this, arguments);
+-    for (var j = -1, m = this.length; ++j < m; ) this[j].sort(comparator);
+-    return this.order();
+-  };
+-  function d3_selection_sortComparator(comparator) {
+-    if (!arguments.length) comparator = d3.ascending;
+-    return function(a, b) {
+-      return !a - !b || comparator(a.__data__, b.__data__);
+-    };
+-  }
+-  d3_selectionPrototype.each = function(callback) {
+-    return d3_selection_each(this, function(node, i, j) {
+-      callback.call(node, node.__data__, i, j);
+-    });
+-  };
+-  function d3_selection_each(groups, callback) {
+-    for (var j = 0, m = groups.length; j < m; j++) {
+-      for (var group = groups[j], i = 0, n = group.length, node; i < n; i++) {
+-        if (node = group[i]) callback(node, i, j);
+-      }
+-    }
+-    return groups;
+-  }
+-  d3_selectionPrototype.call = function(callback) {
+-    var args = d3_array(arguments);
+-    callback.apply(args[0] = this, args);
+-    return this;
+-  };
+-  d3_selectionPrototype.empty = function() {
+-    return !this.node();
+-  };
+-  d3_selectionPrototype.node = function() {
+-    for (var j = 0, m = this.length; j < m; j++) {
+-      for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+-        var node = group[i];
+-        if (node) return node;
+-      }
+-    }
+-    return null;
+-  };
+-  d3_selectionPrototype.size = function() {
+-    var n = 0;
+-    this.each(function() {
+-      ++n;
+-    });
+-    return n;
+-  };
+-  function d3_selection_enter(selection) {
+-    d3_subclass(selection, d3_selection_enterPrototype);
+-    return selection;
+-  }
+-  var d3_selection_enterPrototype = [];
+-  d3.selection.enter = d3_selection_enter;
+-  d3.selection.enter.prototype = d3_selection_enterPrototype;
+-  d3_selection_enterPrototype.append = d3_selectionPrototype.append;
+-  d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
+-  d3_selection_enterPrototype.node = d3_selectionPrototype.node;
+-  d3_selection_enterPrototype.call = d3_selectionPrototype.call;
+-  d3_selection_enterPrototype.size = d3_selectionPrototype.size;
+-  d3_selection_enterPrototype.select = function(selector) {
+-    var subgroups = [], subgroup, subnode, upgroup, group, node;
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      upgroup = (group = this[j]).update;
+-      subgroups.push(subgroup = []);
+-      subgroup.parentNode = group.parentNode;
+-      for (var i = -1, n = group.length; ++i < n; ) {
+-        if (node = group[i]) {
+-          subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i, j));
+-          subnode.__data__ = node.__data__;
+-        } else {
+-          subgroup.push(null);
+-        }
+-      }
+-    }
+-    return d3_selection(subgroups);
+-  };
+-  d3_selection_enterPrototype.insert = function(name, before) {
+-    if (arguments.length < 2) before = d3_selection_enterInsertBefore(this);
+-    return d3_selectionPrototype.insert.call(this, name, before);
+-  };
+-  function d3_selection_enterInsertBefore(enter) {
+-    var i0, j0;
+-    return function(d, i, j) {
+-      var group = enter[j].update, n = group.length, node;
+-      if (j != j0) j0 = j, i0 = 0;
+-      if (i >= i0) i0 = i + 1;
+-      while (!(node = group[i0]) && ++i0 < n) ;
+-      return node;
+-    };
+-  }
+-  d3_selectionPrototype.transition = function() {
+-    var id = d3_transitionInheritId || ++d3_transitionId, subgroups = [], subgroup, node, transition = d3_transitionInherit || {
+-      time: Date.now(),
+-      ease: d3_ease_cubicInOut,
+-      delay: 0,
+-      duration: 250
+-    };
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      subgroups.push(subgroup = []);
+-      for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
+-        if (node = group[i]) d3_transitionNode(node, i, id, transition);
+-        subgroup.push(node);
+-      }
+-    }
+-    return d3_transition(subgroups, id);
+-  };
+-  d3.select = function(node) {
+-    var group = [ typeof node === "string" ? d3_select(node, d3_document) : node ];
+-    group.parentNode = d3_documentElement;
+-    return d3_selection([ group ]);
+-  };
+-  d3.selectAll = function(nodes) {
+-    var group = d3_array(typeof nodes === "string" ? d3_selectAll(nodes, d3_document) : nodes);
+-    group.parentNode = d3_documentElement;
+-    return d3_selection([ group ]);
+-  };
+-  var d3_selectionRoot = d3.select(d3_documentElement);
+-  d3_selectionPrototype.on = function(type, listener, capture) {
+-    var n = arguments.length;
+-    if (n < 3) {
+-      if (typeof type !== "string") {
+-        if (n < 2) listener = false;
+-        for (capture in type) this.each(d3_selection_on(capture, type[capture], listener));
+-        return this;
+-      }
+-      if (n < 2) return (n = this.node()["__on" + type]) && n._;
+-      capture = false;
+-    }
+-    return this.each(d3_selection_on(type, listener, capture));
+-  };
+-  function d3_selection_on(type, listener, capture) {
+-    var name = "__on" + type, i = type.indexOf("."), wrap = d3_selection_onListener;
+-    if (i > 0) type = type.substring(0, i);
+-    var filter = d3_selection_onFilters.get(type);
+-    if (filter) type = filter, wrap = d3_selection_onFilter;
+-    function onRemove() {
+-      var l = this[name];
+-      if (l) {
+-        this.removeEventListener(type, l, l.$);
+-        delete this[name];
+-      }
+-    }
+-    function onAdd() {
+-      var l = wrap(listener, d3_array(arguments));
+-      onRemove.call(this);
+-      this.addEventListener(type, this[name] = l, l.$ = capture);
+-      l._ = listener;
+-    }
+-    function removeAll() {
+-      var re = new RegExp("^__on([^.]+)" + d3.requote(type) + "$"), match;
+-      for (var name in this) {
+-        if (match = name.match(re)) {
+-          var l = this[name];
+-          this.removeEventListener(match[1], l, l.$);
+-          delete this[name];
+-        }
+-      }
+-    }
+-    return i ? listener ? onAdd : onRemove : listener ? d3_noop : removeAll;
+-  }
+-  var d3_selection_onFilters = d3.map({
+-    mouseenter: "mouseover",
+-    mouseleave: "mouseout"
+-  });
+-  d3_selection_onFilters.forEach(function(k) {
+-    if ("on" + k in d3_document) d3_selection_onFilters.remove(k);
+-  });
+-  function d3_selection_onListener(listener, argumentz) {
+-    return function(e) {
+-      var o = d3.event;
+-      d3.event = e;
+-      argumentz[0] = this.__data__;
+-      try {
+-        listener.apply(this, argumentz);
+-      } finally {
+-        d3.event = o;
+-      }
+-    };
+-  }
+-  function d3_selection_onFilter(listener, argumentz) {
+-    var l = d3_selection_onListener(listener, argumentz);
+-    return function(e) {
+-      var target = this, related = e.relatedTarget;
+-      if (!related || related !== target && !(related.compareDocumentPosition(target) & 8)) {
+-        l.call(target, e);
+-      }
+-    };
+-  }
+-  var d3_event_dragSelect = d3_vendorSymbol(d3_documentElement.style, "userSelect"), d3_event_dragId = 0;
+-  function d3_event_dragSuppress() {
+-    var name = ".dragsuppress-" + ++d3_event_dragId, touchmove = "touchmove" + name, selectstart = "selectstart" + name, dragstart = "dragstart" + name, click = "click" + name, w = d3.select(d3_window).on(touchmove, d3_eventPreventDefault).on(selectstart, d3_eventPreventDefault).on(dragstart, d3_eventPreventDefault), style = d3_documentElement.style, select = style[d3_event_dragSelect];
+-    style[d3_event_dragSelect] = "none";
+-    return function(suppressClick) {
+-      w.on(name, null);
+-      style[d3_event_dragSelect] = select;
+-      if (suppressClick) {
+-        function off() {
+-          w.on(click, null);
+-        }
+-        w.on(click, function() {
+-          d3_eventPreventDefault();
+-          off();
+-        }, true);
+-        setTimeout(off, 0);
+-      }
+-    };
+-  }
+-  d3.mouse = function(container) {
+-    return d3_mousePoint(container, d3_eventSource());
+-  };
+-  var d3_mouse_bug44083 = /WebKit/.test(d3_window.navigator.userAgent) ? -1 : 0;
+-  function d3_mousePoint(container, e) {
+-    var svg = container.ownerSVGElement || container;
+-    if (svg.createSVGPoint) {
+-      var point = svg.createSVGPoint();
+-      if (d3_mouse_bug44083 < 0 && (d3_window.scrollX || d3_window.scrollY)) {
+-        svg = d3.select("body").append("svg").style({
+-          position: "absolute",
+-          top: 0,
+-          left: 0,
+-          margin: 0,
+-          padding: 0,
+-          border: "none"
+-        }, "important");
+-        var ctm = svg[0][0].getScreenCTM();
+-        d3_mouse_bug44083 = !(ctm.f || ctm.e);
+-        svg.remove();
+-      }
+-      if (d3_mouse_bug44083) {
+-        point.x = e.pageX;
+-        point.y = e.pageY;
+-      } else {
+-        point.x = e.clientX;
+-        point.y = e.clientY;
+-      }
+-      point = point.matrixTransform(container.getScreenCTM().inverse());
+-      return [ point.x, point.y ];
+-    }
+-    var rect = container.getBoundingClientRect();
+-    return [ e.clientX - rect.left - container.clientLeft, e.clientY - rect.top - container.clientTop ];
+-  }
+-  d3.touches = function(container, touches) {
+-    if (arguments.length < 2) touches = d3_eventSource().touches;
+-    return touches ? d3_array(touches).map(function(touch) {
+-      var point = d3_mousePoint(container, touch);
+-      point.identifier = touch.identifier;
+-      return point;
+-    }) : [];
+-  };
+-  d3.behavior.drag = function() {
+-    var event = d3_eventDispatch(drag, "drag", "dragstart", "dragend"), origin = null, mousedown = dragstart(d3_noop, d3.mouse, "mousemove", "mouseup"), touchstart = dragstart(touchid, touchposition, "touchmove", "touchend");
+-    function drag() {
+-      this.on("mousedown.drag", mousedown).on("touchstart.drag", touchstart);
+-    }
+-    function touchid() {
+-      return d3.event.changedTouches[0].identifier;
+-    }
+-    function touchposition(parent, id) {
+-      return d3.touches(parent).filter(function(p) {
+-        return p.identifier === id;
+-      })[0];
+-    }
+-    function dragstart(id, position, move, end) {
+-      return function() {
+-        var target = this, parent = target.parentNode, event_ = event.of(target, arguments), eventTarget = d3.event.target, eventId = id(), drag = eventId == null ? "drag" : "drag-" + eventId, origin_ = position(parent, eventId), dragged = 0, offset, w = d3.select(d3_window).on(move + "." + drag, moved).on(end + "." + drag, ended), dragRestore = d3_event_dragSuppress();
+-        if (origin) {
+-          offset = origin.apply(target, arguments);
+-          offset = [ offset.x - origin_[0], offset.y - origin_[1] ];
+-        } else {
+-          offset = [ 0, 0 ];
+-        }
+-        event_({
+-          type: "dragstart"
+-        });
+-        function moved() {
+-          if (!parent) return ended();
+-          var p = position(parent, eventId), dx = p[0] - origin_[0], dy = p[1] - origin_[1];
+-          dragged |= dx | dy;
+-          origin_ = p;
+-          event_({
+-            type: "drag",
+-            x: p[0] + offset[0],
+-            y: p[1] + offset[1],
+-            dx: dx,
+-            dy: dy
+-          });
+-        }
+-        function ended() {
+-          w.on(move + "." + drag, null).on(end + "." + drag, null);
+-          dragRestore(dragged && d3.event.target === eventTarget);
+-          event_({
+-            type: "dragend"
+-          });
+-        }
+-      };
+-    }
+-    drag.origin = function(x) {
+-      if (!arguments.length) return origin;
+-      origin = x;
+-      return drag;
+-    };
+-    return d3.rebind(drag, event, "on");
+-  };
+-  d3.behavior.zoom = function() {
+-    var translate = [ 0, 0 ], translate0, scale = 1, scaleExtent = d3_behavior_zoomInfinity, mousedown = "mousedown.zoom", mousemove = "mousemove.zoom", mouseup = "mouseup.zoom", event = d3_eventDispatch(zoom, "zoom"), x0, x1, y0, y1, touchtime;
+-    function zoom() {
+-      this.on(mousedown, mousedowned).on(d3_behavior_zoomWheel + ".zoom", mousewheeled).on(mousemove, mousewheelreset).on("dblclick.zoom", dblclicked).on("touchstart.zoom", touchstarted);
+-    }
+-    zoom.translate = function(x) {
+-      if (!arguments.length) return translate;
+-      translate = x.map(Number);
+-      rescale();
+-      return zoom;
+-    };
+-    zoom.scale = function(x) {
+-      if (!arguments.length) return scale;
+-      scale = +x;
+-      rescale();
+-      return zoom;
+-    };
+-    zoom.scaleExtent = function(x) {
+-      if (!arguments.length) return scaleExtent;
+-      scaleExtent = x == null ? d3_behavior_zoomInfinity : x.map(Number);
+-      return zoom;
+-    };
+-    zoom.x = function(z) {
+-      if (!arguments.length) return x1;
+-      x1 = z;
+-      x0 = z.copy();
+-      translate = [ 0, 0 ];
+-      scale = 1;
+-      return zoom;
+-    };
+-    zoom.y = function(z) {
+-      if (!arguments.length) return y1;
+-      y1 = z;
+-      y0 = z.copy();
+-      translate = [ 0, 0 ];
+-      scale = 1;
+-      return zoom;
+-    };
+-    function location(p) {
+-      return [ (p[0] - translate[0]) / scale, (p[1] - translate[1]) / scale ];
+-    }
+-    function point(l) {
+-      return [ l[0] * scale + translate[0], l[1] * scale + translate[1] ];
+-    }
+-    function scaleTo(s) {
+-      scale = Math.max(scaleExtent[0], Math.min(scaleExtent[1], s));
+-    }
+-    function translateTo(p, l) {
+-      l = point(l);
+-      translate[0] += p[0] - l[0];
+-      translate[1] += p[1] - l[1];
+-    }
+-    function rescale() {
+-      if (x1) x1.domain(x0.range().map(function(x) {
+-        return (x - translate[0]) / scale;
+-      }).map(x0.invert));
+-      if (y1) y1.domain(y0.range().map(function(y) {
+-        return (y - translate[1]) / scale;
+-      }).map(y0.invert));
+-    }
+-    function dispatch(event) {
+-      rescale();
+-      event({
+-        type: "zoom",
+-        scale: scale,
+-        translate: translate
+-      });
+-    }
+-    function mousedowned() {
+-      var target = this, event_ = event.of(target, arguments), eventTarget = d3.event.target, dragged = 0, w = d3.select(d3_window).on(mousemove, moved).on(mouseup, ended), l = location(d3.mouse(target)), dragRestore = d3_event_dragSuppress();
+-      function moved() {
+-        dragged = 1;
+-        translateTo(d3.mouse(target), l);
+-        dispatch(event_);
+-      }
+-      function ended() {
+-        w.on(mousemove, d3_window === target ? mousewheelreset : null).on(mouseup, null);
+-        dragRestore(dragged && d3.event.target === eventTarget);
+-      }
+-    }
+-    function touchstarted() {
+-      var target = this, event_ = event.of(target, arguments), touches = d3.touches(target), locations = {}, distance0 = 0, scale0 = scale, now = Date.now(), name = "zoom-" + d3.event.changedTouches[0].identifier, touchmove = "touchmove." + name, touchend = "touchend." + name, w = d3.select(d3_window).on(touchmove, moved).on(touchend, ended), t = d3.select(target).on(mousedown, null), dragRestore = d3_event_dragSuppress();
+-      touches.forEach(function(t) {
+-        locations[t.identifier] = location(t);
+-      });
+-      if (touches.length === 1) {
+-        if (now - touchtime < 500) {
+-          var p = touches[0], l = location(touches[0]);
+-          scaleTo(scale * 2);
+-          translateTo(p, l);
+-          d3_eventPreventDefault();
+-          dispatch(event_);
+-        }
+-        touchtime = now;
+-      } else if (touches.length > 1) {
+-        var p = touches[0], q = touches[1], dx = p[0] - q[0], dy = p[1] - q[1];
+-        distance0 = dx * dx + dy * dy;
+-      }
+-      function moved() {
+-        var touches = d3.touches(target), p0 = touches[0], l0 = locations[p0.identifier];
+-        if (p1 = touches[1]) {
+-          var p1, l1 = locations[p1.identifier], scale1 = d3.event.scale;
+-          if (scale1 == null) {
+-            var distance1 = (distance1 = p1[0] - p0[0]) * distance1 + (distance1 = p1[1] - p0[1]) * distance1;
+-            scale1 = distance0 && Math.sqrt(distance1 / distance0);
+-          }
+-          p0 = [ (p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2 ];
+-          l0 = [ (l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2 ];
+-          scaleTo(scale1 * scale0);
+-        }
+-        touchtime = null;
+-        translateTo(p0, l0);
+-        dispatch(event_);
+-      }
+-      function ended() {
+-        w.on(touchmove, null).on(touchend, null);
+-        t.on(mousedown, mousedowned);
+-        dragRestore();
+-      }
+-    }
+-    function mousewheeled() {
+-      d3_eventPreventDefault();
+-      if (!translate0) translate0 = location(d3.mouse(this));
+-      scaleTo(Math.pow(2, d3_behavior_zoomDelta() * .002) * scale);
+-      translateTo(d3.mouse(this), translate0);
+-      dispatch(event.of(this, arguments));
+-    }
+-    function mousewheelreset() {
+-      translate0 = null;
+-    }
+-    function dblclicked() {
+-      var p = d3.mouse(this), l = location(p), k = Math.log(scale) / Math.LN2;
+-      scaleTo(Math.pow(2, d3.event.shiftKey ? Math.ceil(k) - 1 : Math.floor(k) + 1));
+-      translateTo(p, l);
+-      dispatch(event.of(this, arguments));
+-    }
+-    return d3.rebind(zoom, event, "on");
+-  };
+-  var d3_behavior_zoomInfinity = [ 0, Infinity ];
+-  var d3_behavior_zoomDelta, d3_behavior_zoomWheel = "onwheel" in d3_document ? (d3_behavior_zoomDelta = function() {
+-    return -d3.event.deltaY * (d3.event.deltaMode ? 120 : 1);
+-  }, "wheel") : "onmousewheel" in d3_document ? (d3_behavior_zoomDelta = function() {
+-    return d3.event.wheelDelta;
+-  }, "mousewheel") : (d3_behavior_zoomDelta = function() {
+-    return -d3.event.detail;
+-  }, "MozMousePixelScroll");
+-  function d3_Color() {}
+-  d3_Color.prototype.toString = function() {
+-    return this.rgb() + "";
+-  };
+-  d3.hsl = function(h, s, l) {
+-    return arguments.length === 1 ? h instanceof d3_Hsl ? d3_hsl(h.h, h.s, h.l) : d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl) : d3_hsl(+h, +s, +l);
+-  };
+-  function d3_hsl(h, s, l) {
+-    return new d3_Hsl(h, s, l);
+-  }
+-  function d3_Hsl(h, s, l) {
+-    this.h = h;
+-    this.s = s;
+-    this.l = l;
+-  }
+-  var d3_hslPrototype = d3_Hsl.prototype = new d3_Color();
+-  d3_hslPrototype.brighter = function(k) {
+-    k = Math.pow(.7, arguments.length ? k : 1);
+-    return d3_hsl(this.h, this.s, this.l / k);
+-  };
+-  d3_hslPrototype.darker = function(k) {
+-    k = Math.pow(.7, arguments.length ? k : 1);
+-    return d3_hsl(this.h, this.s, k * this.l);
+-  };
+-  d3_hslPrototype.rgb = function() {
+-    return d3_hsl_rgb(this.h, this.s, this.l);
+-  };
+-  function d3_hsl_rgb(h, s, l) {
+-    var m1, m2;
+-    h = isNaN(h) ? 0 : (h %= 360) < 0 ? h + 360 : h;
+-    s = isNaN(s) ? 0 : s < 0 ? 0 : s > 1 ? 1 : s;
+-    l = l < 0 ? 0 : l > 1 ? 1 : l;
+-    m2 = l <= .5 ? l * (1 + s) : l + s - l * s;
+-    m1 = 2 * l - m2;
+-    function v(h) {
+-      if (h > 360) h -= 360; else if (h < 0) h += 360;
+-      if (h < 60) return m1 + (m2 - m1) * h / 60;
+-      if (h < 180) return m2;
+-      if (h < 240) return m1 + (m2 - m1) * (240 - h) / 60;
+-      return m1;
+-    }
+-    function vv(h) {
+-      return Math.round(v(h) * 255);
+-    }
+-    return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
+-  }
+-  var π = Math.PI, ε = 1e-6, ε2 = ε * ε, d3_radians = π / 180, d3_degrees = 180 / π;
+-  function d3_sgn(x) {
+-    return x > 0 ? 1 : x < 0 ? -1 : 0;
+-  }
+-  function d3_acos(x) {
+-    return x > 1 ? 0 : x < -1 ? π : Math.acos(x);
+-  }
+-  function d3_asin(x) {
+-    return x > 1 ? π / 2 : x < -1 ? -π / 2 : Math.asin(x);
+-  }
+-  function d3_sinh(x) {
+-    return (Math.exp(x) - Math.exp(-x)) / 2;
+-  }
+-  function d3_cosh(x) {
+-    return (Math.exp(x) + Math.exp(-x)) / 2;
+-  }
+-  function d3_haversin(x) {
+-    return (x = Math.sin(x / 2)) * x;
+-  }
+-  d3.hcl = function(h, c, l) {
+-    return arguments.length === 1 ? h instanceof d3_Hcl ? d3_hcl(h.h, h.c, h.l) : h instanceof d3_Lab ? d3_lab_hcl(h.l, h.a, h.b) : d3_lab_hcl((h = d3_rgb_lab((h = d3.rgb(h)).r, h.g, h.b)).l, h.a, h.b) : d3_hcl(+h, +c, +l);
+-  };
+-  function d3_hcl(h, c, l) {
+-    return new d3_Hcl(h, c, l);
+-  }
+-  function d3_Hcl(h, c, l) {
+-    this.h = h;
+-    this.c = c;
+-    this.l = l;
+-  }
+-  var d3_hclPrototype = d3_Hcl.prototype = new d3_Color();
+-  d3_hclPrototype.brighter = function(k) {
+-    return d3_hcl(this.h, this.c, Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)));
+-  };
+-  d3_hclPrototype.darker = function(k) {
+-    return d3_hcl(this.h, this.c, Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)));
+-  };
+-  d3_hclPrototype.rgb = function() {
+-    return d3_hcl_lab(this.h, this.c, this.l).rgb();
+-  };
+-  function d3_hcl_lab(h, c, l) {
+-    if (isNaN(h)) h = 0;
+-    if (isNaN(c)) c = 0;
+-    return d3_lab(l, Math.cos(h *= d3_radians) * c, Math.sin(h) * c);
+-  }
+-  d3.lab = function(l, a, b) {
+-    return arguments.length === 1 ? l instanceof d3_Lab ? d3_lab(l.l, l.a, l.b) : l instanceof d3_Hcl ? d3_hcl_lab(l.l, l.c, l.h) : d3_rgb_lab((l = d3.rgb(l)).r, l.g, l.b) : d3_lab(+l, +a, +b);
+-  };
+-  function d3_lab(l, a, b) {
+-    return new d3_Lab(l, a, b);
+-  }
+-  function d3_Lab(l, a, b) {
+-    this.l = l;
+-    this.a = a;
+-    this.b = b;
+-  }
+-  var d3_lab_K = 18;
+-  var d3_lab_X = .95047, d3_lab_Y = 1, d3_lab_Z = 1.08883;
+-  var d3_labPrototype = d3_Lab.prototype = new d3_Color();
+-  d3_labPrototype.brighter = function(k) {
+-    return d3_lab(Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
+-  };
+-  d3_labPrototype.darker = function(k) {
+-    return d3_lab(Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
+-  };
+-  d3_labPrototype.rgb = function() {
+-    return d3_lab_rgb(this.l, this.a, this.b);
+-  };
+-  function d3_lab_rgb(l, a, b) {
+-    var y = (l + 16) / 116, x = y + a / 500, z = y - b / 200;
+-    x = d3_lab_xyz(x) * d3_lab_X;
+-    y = d3_lab_xyz(y) * d3_lab_Y;
+-    z = d3_lab_xyz(z) * d3_lab_Z;
+-    return d3_rgb(d3_xyz_rgb(3.2404542 * x - 1.5371385 * y - .4985314 * z), d3_xyz_rgb(-.969266 * x + 1.8760108 * y + .041556 * z), d3_xyz_rgb(.0556434 * x - .2040259 * y + 1.0572252 * z));
+-  }
+-  function d3_lab_hcl(l, a, b) {
+-    return l > 0 ? d3_hcl(Math.atan2(b, a) * d3_degrees, Math.sqrt(a * a + b * b), l) : d3_hcl(NaN, NaN, l);
+-  }
+-  function d3_lab_xyz(x) {
+-    return x > .206893034 ? x * x * x : (x - 4 / 29) / 7.787037;
+-  }
+-  function d3_xyz_lab(x) {
+-    return x > .008856 ? Math.pow(x, 1 / 3) : 7.787037 * x + 4 / 29;
+-  }
+-  function d3_xyz_rgb(r) {
+-    return Math.round(255 * (r <= .00304 ? 12.92 * r : 1.055 * Math.pow(r, 1 / 2.4) - .055));
+-  }
+-  d3.rgb = function(r, g, b) {
+-    return arguments.length === 1 ? r instanceof d3_Rgb ? d3_rgb(r.r, r.g, r.b) : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb) : d3_rgb(~~r, ~~g, ~~b);
+-  };
+-  function d3_rgbNumber(value) {
+-    return d3_rgb(value >> 16, value >> 8 & 255, value & 255);
+-  }
+-  function d3_rgbString(value) {
+-    return d3_rgbNumber(value) + "";
+-  }
+-  function d3_rgb(r, g, b) {
+-    return new d3_Rgb(r, g, b);
+-  }
+-  function d3_Rgb(r, g, b) {
+-    this.r = r;
+-    this.g = g;
+-    this.b = b;
+-  }
+-  var d3_rgbPrototype = d3_Rgb.prototype = new d3_Color();
+-  d3_rgbPrototype.brighter = function(k) {
+-    k = Math.pow(.7, arguments.length ? k : 1);
+-    var r = this.r, g = this.g, b = this.b, i = 30;
+-    if (!r && !g && !b) return d3_rgb(i, i, i);
+-    if (r && r < i) r = i;
+-    if (g && g < i) g = i;
+-    if (b && b < i) b = i;
+-    return d3_rgb(Math.min(255, ~~(r / k)), Math.min(255, ~~(g / k)), Math.min(255, ~~(b / k)));
+-  };
+-  d3_rgbPrototype.darker = function(k) {
+-    k = Math.pow(.7, arguments.length ? k : 1);
+-    return d3_rgb(~~(k * this.r), ~~(k * this.g), ~~(k * this.b));
+-  };
+-  d3_rgbPrototype.hsl = function() {
+-    return d3_rgb_hsl(this.r, this.g, this.b);
+-  };
+-  d3_rgbPrototype.toString = function() {
+-    return "#" + d3_rgb_hex(this.r) + d3_rgb_hex(this.g) + d3_rgb_hex(this.b);
+-  };
+-  function d3_rgb_hex(v) {
+-    return v < 16 ? "0" + Math.max(0, v).toString(16) : Math.min(255, v).toString(16);
+-  }
+-  function d3_rgb_parse(format, rgb, hsl) {
+-    var r = 0, g = 0, b = 0, m1, m2, name;
+-    m1 = /([a-z]+)\((.*)\)/i.exec(format);
+-    if (m1) {
+-      m2 = m1[2].split(",");
+-      switch (m1[1]) {
+-       case "hsl":
+-        {
+-          return hsl(parseFloat(m2[0]), parseFloat(m2[1]) / 100, parseFloat(m2[2]) / 100);
+-        }
+-
+-       case "rgb":
+-        {
+-          return rgb(d3_rgb_parseNumber(m2[0]), d3_rgb_parseNumber(m2[1]), d3_rgb_parseNumber(m2[2]));
+-        }
+-      }
+-    }
+-    if (name = d3_rgb_names.get(format)) return rgb(name.r, name.g, name.b);
+-    if (format != null && format.charAt(0) === "#") {
+-      if (format.length === 4) {
+-        r = format.charAt(1);
+-        r += r;
+-        g = format.charAt(2);
+-        g += g;
+-        b = format.charAt(3);
+-        b += b;
+-      } else if (format.length === 7) {
+-        r = format.substring(1, 3);
+-        g = format.substring(3, 5);
+-        b = format.substring(5, 7);
+-      }
+-      r = parseInt(r, 16);
+-      g = parseInt(g, 16);
+-      b = parseInt(b, 16);
+-    }
+-    return rgb(r, g, b);
+-  }
+-  function d3_rgb_hsl(r, g, b) {
+-    var min = Math.min(r /= 255, g /= 255, b /= 255), max = Math.max(r, g, b), d = max - min, h, s, l = (max + min) / 2;
+-    if (d) {
+-      s = l < .5 ? d / (max + min) : d / (2 - max - min);
+-      if (r == max) h = (g - b) / d + (g < b ? 6 : 0); else if (g == max) h = (b - r) / d + 2; else h = (r - g) / d + 4;
+-      h *= 60;
+-    } else {
+-      h = NaN;
+-      s = l > 0 && l < 1 ? 0 : h;
+-    }
+-    return d3_hsl(h, s, l);
+-  }
+-  function d3_rgb_lab(r, g, b) {
+-    r = d3_rgb_xyz(r);
+-    g = d3_rgb_xyz(g);
+-    b = d3_rgb_xyz(b);
+-    var x = d3_xyz_lab((.4124564 * r + .3575761 * g + .1804375 * b) / d3_lab_X), y = d3_xyz_lab((.2126729 * r + .7151522 * g + .072175 * b) / d3_lab_Y), z = d3_xyz_lab((.0193339 * r + .119192 * g + .9503041 * b) / d3_lab_Z);
+-    return d3_lab(116 * y - 16, 500 * (x - y), 200 * (y - z));
+-  }
+-  function d3_rgb_xyz(r) {
+-    return (r /= 255) <= .04045 ? r / 12.92 : Math.pow((r + .055) / 1.055, 2.4);
+-  }
+-  function d3_rgb_parseNumber(c) {
+-    var f = parseFloat(c);
+-    return c.charAt(c.length - 1) === "%" ? Math.round(f * 2.55) : f;
+-  }
+-  var d3_rgb_names = d3.map({
+-    aliceblue: 15792383,
+-    antiquewhite: 16444375,
+-    aqua: 65535,
+-    aquamarine: 8388564,
+-    azure: 15794175,
+-    beige: 16119260,
+-    bisque: 16770244,
+-    black: 0,
+-    blanchedalmond: 16772045,
+-    blue: 255,
+-    blueviolet: 9055202,
+-    brown: 10824234,
+-    burlywood: 14596231,
+-    cadetblue: 6266528,
+-    chartreuse: 8388352,
+-    chocolate: 13789470,
+-    coral: 16744272,
+-    cornflowerblue: 6591981,
+-    cornsilk: 16775388,
+-    crimson: 14423100,
+-    cyan: 65535,
+-    darkblue: 139,
+-    darkcyan: 35723,
+-    darkgoldenrod: 12092939,
+-    darkgray: 11119017,
+-    darkgreen: 25600,
+-    darkgrey: 11119017,
+-    darkkhaki: 12433259,
+-    darkmagenta: 9109643,
+-    darkolivegreen: 5597999,
+-    darkorange: 16747520,
+-    darkorchid: 10040012,
+-    darkred: 9109504,
+-    darksalmon: 15308410,
+-    darkseagreen: 9419919,
+-    darkslateblue: 4734347,
+-    darkslategray: 3100495,
+-    darkslategrey: 3100495,
+-    darkturquoise: 52945,
+-    darkviolet: 9699539,
+-    deeppink: 16716947,
+-    deepskyblue: 49151,
+-    dimgray: 6908265,
+-    dimgrey: 6908265,
+-    dodgerblue: 2003199,
+-    firebrick: 11674146,
+-    floralwhite: 16775920,
+-    forestgreen: 2263842,
+-    fuchsia: 16711935,
+-    gainsboro: 14474460,
+-    ghostwhite: 16316671,
+-    gold: 16766720,
+-    goldenrod: 14329120,
+-    gray: 8421504,
+-    green: 32768,
+-    greenyellow: 11403055,
+-    grey: 8421504,
+-    honeydew: 15794160,
+-    hotpink: 16738740,
+-    indianred: 13458524,
+-    indigo: 4915330,
+-    ivory: 16777200,
+-    khaki: 15787660,
+-    lavender: 15132410,
+-    lavenderblush: 16773365,
+-    lawngreen: 8190976,
+-    lemonchiffon: 16775885,
+-    lightblue: 11393254,
+-    lightcoral: 15761536,
+-    lightcyan: 14745599,
+-    lightgoldenrodyellow: 16448210,
+-    lightgray: 13882323,
+-    lightgreen: 9498256,
+-    lightgrey: 13882323,
+-    lightpink: 16758465,
+-    lightsalmon: 16752762,
+-    lightseagreen: 2142890,
+-    lightskyblue: 8900346,
+-    lightslategray: 7833753,
+-    lightslategrey: 7833753,
+-    lightsteelblue: 11584734,
+-    lightyellow: 16777184,
+-    lime: 65280,
+-    limegreen: 3329330,
+-    linen: 16445670,
+-    magenta: 16711935,
+-    maroon: 8388608,
+-    mediumaquamarine: 6737322,
+-    mediumblue: 205,
+-    mediumorchid: 12211667,
+-    mediumpurple: 9662683,
+-    mediumseagreen: 3978097,
+-    mediumslateblue: 8087790,
+-    mediumspringgreen: 64154,
+-    mediumturquoise: 4772300,
+-    mediumvioletred: 13047173,
+-    midnightblue: 1644912,
+-    mintcream: 16121850,
+-    mistyrose: 16770273,
+-    moccasin: 16770229,
+-    navajowhite: 16768685,
+-    navy: 128,
+-    oldlace: 16643558,
+-    olive: 8421376,
+-    olivedrab: 7048739,
+-    orange: 16753920,
+-    orangered: 16729344,
+-    orchid: 14315734,
+-    palegoldenrod: 15657130,
+-    palegreen: 10025880,
+-    paleturquoise: 11529966,
+-    palevioletred: 14381203,
+-    papayawhip: 16773077,
+-    peachpuff: 16767673,
+-    peru: 13468991,
+-    pink: 16761035,
+-    plum: 14524637,
+-    powderblue: 11591910,
+-    purple: 8388736,
+-    red: 16711680,
+-    rosybrown: 12357519,
+-    royalblue: 4286945,
+-    saddlebrown: 9127187,
+-    salmon: 16416882,
+-    sandybrown: 16032864,
+-    seagreen: 3050327,
+-    seashell: 16774638,
+-    sienna: 10506797,
+-    silver: 12632256,
+-    skyblue: 8900331,
+-    slateblue: 6970061,
+-    slategray: 7372944,
+-    slategrey: 7372944,
+-    snow: 16775930,
+-    springgreen: 65407,
+-    steelblue: 4620980,
+-    tan: 13808780,
+-    teal: 32896,
+-    thistle: 14204888,
+-    tomato: 16737095,
+-    turquoise: 4251856,
+-    violet: 15631086,
+-    wheat: 16113331,
+-    white: 16777215,
+-    whitesmoke: 16119285,
+-    yellow: 16776960,
+-    yellowgreen: 10145074
+-  });
+-  d3_rgb_names.forEach(function(key, value) {
+-    d3_rgb_names.set(key, d3_rgbNumber(value));
+-  });
+-  function d3_functor(v) {
+-    return typeof v === "function" ? v : function() {
+-      return v;
+-    };
+-  }
+-  d3.functor = d3_functor;
+-  function d3_identity(d) {
+-    return d;
+-  }
+-  d3.xhr = d3_xhrType(d3_identity);
+-  function d3_xhrType(response) {
+-    return function(url, mimeType, callback) {
+-      if (arguments.length === 2 && typeof mimeType === "function") callback = mimeType,
+-      mimeType = null;
+-      return d3_xhr(url, mimeType, response, callback);
+-    };
+-  }
+-  function d3_xhr(url, mimeType, response, callback) {
+-    var xhr = {}, dispatch = d3.dispatch("progress", "load", "error"), headers = {}, request = new XMLHttpRequest(), responseType = null;
+-    if (d3_window.XDomainRequest && !("withCredentials" in request) && /^(http(s)?:)?\/\//.test(url)) request = new XDomainRequest();
+-    "onload" in request ? request.onload = request.onerror = respond : request.onreadystatechange = function() {
+-      request.readyState > 3 && respond();
+-    };
+-    function respond() {
+-      var status = request.status, result;
+-      if (!status && request.responseText || status >= 200 && status < 300 || status === 304) {
+-        try {
+-          result = response.call(xhr, request);
+-        } catch (e) {
+-          dispatch.error.call(xhr, e);
+-          return;
+-        }
+-        dispatch.load.call(xhr, result);
+-      } else {
+-        dispatch.error.call(xhr, request);
+-      }
+-    }
+-    request.onprogress = function(event) {
+-      var o = d3.event;
+-      d3.event = event;
+-      try {
+-        dispatch.progress.call(xhr, request);
+-      } finally {
+-        d3.event = o;
+-      }
+-    };
+-    xhr.header = function(name, value) {
+-      name = (name + "").toLowerCase();
+-      if (arguments.length < 2) return headers[name];
+-      if (value == null) delete headers[name]; else headers[name] = value + "";
+-      return xhr;
+-    };
+-    xhr.mimeType = function(value) {
+-      if (!arguments.length) return mimeType;
+-      mimeType = value == null ? null : value + "";
+-      return xhr;
+-    };
+-    xhr.responseType = function(value) {
+-      if (!arguments.length) return responseType;
+-      responseType = value;
+-      return xhr;
+-    };
+-    xhr.response = function(value) {
+-      response = value;
+-      return xhr;
+-    };
+-    [ "get", "post" ].forEach(function(method) {
+-      xhr[method] = function() {
+-        return xhr.send.apply(xhr, [ method ].concat(d3_array(arguments)));
+-      };
+-    });
+-    xhr.send = function(method, data, callback) {
+-      if (arguments.length === 2 && typeof data === "function") callback = data, data = null;
+-      request.open(method, url, true);
+-      if (mimeType != null && !("accept" in headers)) headers["accept"] = mimeType + ",*/*";
+-      if (request.setRequestHeader) for (var name in headers) request.setRequestHeader(name, headers[name]);
+-      if (mimeType != null && request.overrideMimeType) request.overrideMimeType(mimeType);
+-      if (responseType != null) request.responseType = responseType;
+-      if (callback != null) xhr.on("error", callback).on("load", function(request) {
+-        callback(null, request);
+-      });
+-      request.send(data == null ? null : data);
+-      return xhr;
+-    };
+-    xhr.abort = function() {
+-      request.abort();
+-      return xhr;
+-    };
+-    d3.rebind(xhr, dispatch, "on");
+-    return callback == null ? xhr : xhr.get(d3_xhr_fixCallback(callback));
+-  }
+-  function d3_xhr_fixCallback(callback) {
+-    return callback.length === 1 ? function(error, request) {
+-      callback(error == null ? request : null);
+-    } : callback;
+-  }
+-  d3.dsv = function(delimiter, mimeType) {
+-    var reFormat = new RegExp('["' + delimiter + "\n]"), delimiterCode = delimiter.charCodeAt(0);
+-    function dsv(url, row, callback) {
+-      if (arguments.length < 3) callback = row, row = null;
+-      var xhr = d3.xhr(url, mimeType, callback);
+-      xhr.row = function(_) {
+-        return arguments.length ? xhr.response((row = _) == null ? response : typedResponse(_)) : row;
+-      };
+-      return xhr.row(row);
+-    }
+-    function response(request) {
+-      return dsv.parse(request.responseText);
+-    }
+-    function typedResponse(f) {
+-      return function(request) {
+-        return dsv.parse(request.responseText, f);
+-      };
+-    }
+-    dsv.parse = function(text, f) {
+-      var o;
+-      return dsv.parseRows(text, function(row, i) {
+-        if (o) return o(row, i - 1);
+-        var a = new Function("d", "return {" + row.map(function(name, i) {
+-          return JSON.stringify(name) + ": d[" + i + "]";
+-        }).join(",") + "}");
+-        o = f ? function(row, i) {
+-          return f(a(row), i);
+-        } : a;
+-      });
+-    };
+-    dsv.parseRows = function(text, f) {
+-      var EOL = {}, EOF = {}, rows = [], N = text.length, I = 0, n = 0, t, eol;
+-      function token() {
+-        if (I >= N) return EOF;
+-        if (eol) return eol = false, EOL;
+-        var j = I;
+-        if (text.charCodeAt(j) === 34) {
+-          var i = j;
+-          while (i++ < N) {
+-            if (text.charCodeAt(i) === 34) {
+-              if (text.charCodeAt(i + 1) !== 34) break;
+-              ++i;
+-            }
+-          }
+-          I = i + 2;
+-          var c = text.charCodeAt(i + 1);
+-          if (c === 13) {
+-            eol = true;
+-            if (text.charCodeAt(i + 2) === 10) ++I;
+-          } else if (c === 10) {
+-            eol = true;
+-          }
+-          return text.substring(j + 1, i).replace(/""/g, '"');
+-        }
+-        while (I < N) {
+-          var c = text.charCodeAt(I++), k = 1;
+-          if (c === 10) eol = true; else if (c === 13) {
+-            eol = true;
+-            if (text.charCodeAt(I) === 10) ++I, ++k;
+-          } else if (c !== delimiterCode) continue;
+-          return text.substring(j, I - k);
+-        }
+-        return text.substring(j);
+-      }
+-      while ((t = token()) !== EOF) {
+-        var a = [];
+-        while (t !== EOL && t !== EOF) {
+-          a.push(t);
+-          t = token();
+-        }
+-        if (f && !(a = f(a, n++))) continue;
+-        rows.push(a);
+-      }
+-      return rows;
+-    };
+-    dsv.format = function(rows) {
+-      if (Array.isArray(rows[0])) return dsv.formatRows(rows);
+-      var fieldSet = new d3_Set(), fields = [];
+-      rows.forEach(function(row) {
+-        for (var field in row) {
+-          if (!fieldSet.has(field)) {
+-            fields.push(fieldSet.add(field));
+-          }
+-        }
+-      });
+-      return [ fields.map(formatValue).join(delimiter) ].concat(rows.map(function(row) {
+-        return fields.map(function(field) {
+-          return formatValue(row[field]);
+-        }).join(delimiter);
+-      })).join("\n");
+-    };
+-    dsv.formatRows = function(rows) {
+-      return rows.map(formatRow).join("\n");
+-    };
+-    function formatRow(row) {
+-      return row.map(formatValue).join(delimiter);
+-    }
+-    function formatValue(text) {
+-      return reFormat.test(text) ? '"' + text.replace(/\"/g, '""') + '"' : text;
+-    }
+-    return dsv;
+-  };
+-  d3.csv = d3.dsv(",", "text/csv");
+-  d3.tsv = d3.dsv("	", "text/tab-separated-values");
+-  var d3_timer_queueHead, d3_timer_queueTail, d3_timer_interval, d3_timer_timeout, d3_timer_active, d3_timer_frame = d3_window[d3_vendorSymbol(d3_window, "requestAnimationFrame")] || function(callback) {
+-    setTimeout(callback, 17);
+-  };
+-  d3.timer = function(callback, delay, then) {
+-    var n = arguments.length;
+-    if (n < 2) delay = 0;
+-    if (n < 3) then = Date.now();
+-    var time = then + delay, timer = {
+-      callback: callback,
+-      time: time,
+-      next: null
+-    };
+-    if (d3_timer_queueTail) d3_timer_queueTail.next = timer; else d3_timer_queueHead = timer;
+-    d3_timer_queueTail = timer;
+-    if (!d3_timer_interval) {
+-      d3_timer_timeout = clearTimeout(d3_timer_timeout);
+-      d3_timer_interval = 1;
+-      d3_timer_frame(d3_timer_step);
+-    }
+-  };
+-  function d3_timer_step() {
+-    var now = d3_timer_mark(), delay = d3_timer_sweep() - now;
+-    if (delay > 24) {
+-      if (isFinite(delay)) {
+-        clearTimeout(d3_timer_timeout);
+-        d3_timer_timeout = setTimeout(d3_timer_step, delay);
+-      }
+-      d3_timer_interval = 0;
+-    } else {
+-      d3_timer_interval = 1;
+-      d3_timer_frame(d3_timer_step);
+-    }
+-  }
+-  d3.timer.flush = function() {
+-    d3_timer_mark();
+-    d3_timer_sweep();
+-  };
+-  function d3_timer_replace(callback, delay, then) {
+-    var n = arguments.length;
+-    if (n < 2) delay = 0;
+-    if (n < 3) then = Date.now();
+-    d3_timer_active.callback = callback;
+-    d3_timer_active.time = then + delay;
+-  }
+-  function d3_timer_mark() {
+-    var now = Date.now();
+-    d3_timer_active = d3_timer_queueHead;
+-    while (d3_timer_active) {
+-      if (now >= d3_timer_active.time) d3_timer_active.flush = d3_timer_active.callback(now - d3_timer_active.time);
+-      d3_timer_active = d3_timer_active.next;
+-    }
+-    return now;
+-  }
+-  function d3_timer_sweep() {
+-    var t0, t1 = d3_timer_queueHead, time = Infinity;
+-    while (t1) {
+-      if (t1.flush) {
+-        t1 = t0 ? t0.next = t1.next : d3_timer_queueHead = t1.next;
+-      } else {
+-        if (t1.time < time) time = t1.time;
+-        t1 = (t0 = t1).next;
+-      }
+-    }
+-    d3_timer_queueTail = t0;
+-    return time;
+-  }
+-  var d3_format_decimalPoint = ".", d3_format_thousandsSeparator = ",", d3_format_grouping = [ 3, 3 ], d3_format_currencySymbol = "$";
+-  var d3_formatPrefixes = [ "y", "z", "a", "f", "p", "n", "µ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y" ].map(d3_formatPrefix);
+-  d3.formatPrefix = function(value, precision) {
+-    var i = 0;
+-    if (value) {
+-      if (value < 0) value *= -1;
+-      if (precision) value = d3.round(value, d3_format_precision(value, precision));
+-      i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
+-      i = Math.max(-24, Math.min(24, Math.floor((i <= 0 ? i + 1 : i - 1) / 3) * 3));
+-    }
+-    return d3_formatPrefixes[8 + i / 3];
+-  };
+-  function d3_formatPrefix(d, i) {
+-    var k = Math.pow(10, Math.abs(8 - i) * 3);
+-    return {
+-      scale: i > 8 ? function(d) {
+-        return d / k;
+-      } : function(d) {
+-        return d * k;
+-      },
+-      symbol: d
+-    };
+-  }
+-  d3.round = function(x, n) {
+-    return n ? Math.round(x * (n = Math.pow(10, n))) / n : Math.round(x);
+-  };
+-  d3.format = function(specifier) {
+-    var match = d3_format_re.exec(specifier), fill = match[1] || " ", align = match[2] || ">", sign = match[3] || "", symbol = match[4] || "", zfill = match[5], width = +match[6], comma = match[7], precision = match[8], type = match[9], scale = 1, suffix = "", integer = false;
+-    if (precision) precision = +precision.substring(1);
+-    if (zfill || fill === "0" && align === "=") {
+-      zfill = fill = "0";
+-      align = "=";
+-      if (comma) width -= Math.floor((width - 1) / 4);
+-    }
+-    switch (type) {
+-     case "n":
+-      comma = true;
+-      type = "g";
+-      break;
+-
+-     case "%":
+-      scale = 100;
+-      suffix = "%";
+-      type = "f";
+-      break;
+-
+-     case "p":
+-      scale = 100;
+-      suffix = "%";
+-      type = "r";
+-      break;
+-
+-     case "b":
+-     case "o":
+-     case "x":
+-     case "X":
+-      if (symbol === "#") symbol = "0" + type.toLowerCase();
+-
+-     case "c":
+-     case "d":
+-      integer = true;
+-      precision = 0;
+-      break;
+-
+-     case "s":
+-      scale = -1;
+-      type = "r";
+-      break;
+-    }
+-    if (symbol === "#") symbol = ""; else if (symbol === "$") symbol = d3_format_currencySymbol;
+-    if (type == "r" && !precision) type = "g";
+-    if (precision != null) {
+-      if (type == "g") precision = Math.max(1, Math.min(21, precision)); else if (type == "e" || type == "f") precision = Math.max(0, Math.min(20, precision));
+-    }
+-    type = d3_format_types.get(type) || d3_format_typeDefault;
+-    var zcomma = zfill && comma;
+-    return function(value) {
+-      if (integer && value % 1) return "";
+-      var negative = value < 0 || value === 0 && 1 / value < 0 ? (value = -value, "-") : sign;
+-      if (scale < 0) {
+-        var prefix = d3.formatPrefix(value, precision);
+-        value = prefix.scale(value);
+-        suffix = prefix.symbol;
+-      } else {
+-        value *= scale;
+-      }
+-      value = type(value, precision);
+-      var i = value.lastIndexOf("."), before = i < 0 ? value : value.substring(0, i), after = i < 0 ? "" : d3_format_decimalPoint + value.substring(i + 1);
+-      if (!zfill && comma) before = d3_format_group(before);
+-      var length = symbol.length + before.length + after.length + (zcomma ? 0 : negative.length), padding = length < width ? new Array(length = width - length + 1).join(fill) : "";
+-      if (zcomma) before = d3_format_group(padding + before);
+-      negative += symbol;
+-      value = before + after;
+-      return (align === "<" ? negative + value + padding : align === ">" ? padding + negative + value : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length) : negative + (zcomma ? value : padding + value)) + suffix;
+-    };
+-  };
+-  var d3_format_re = /(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i;
+-  var d3_format_types = d3.map({
+-    b: function(x) {
+-      return x.toString(2);
+-    },
+-    c: function(x) {
+-      return String.fromCharCode(x);
+-    },
+-    o: function(x) {
+-      return x.toString(8);
+-    },
+-    x: function(x) {
+-      return x.toString(16);
+-    },
+-    X: function(x) {
+-      return x.toString(16).toUpperCase();
+-    },
+-    g: function(x, p) {
+-      return x.toPrecision(p);
+-    },
+-    e: function(x, p) {
+-      return x.toExponential(p);
+-    },
+-    f: function(x, p) {
+-      return x.toFixed(p);
+-    },
+-    r: function(x, p) {
+-      return (x = d3.round(x, d3_format_precision(x, p))).toFixed(Math.max(0, Math.min(20, d3_format_precision(x * (1 + 1e-15), p))));
+-    }
+-  });
+-  function d3_format_precision(x, p) {
+-    return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
+-  }
+-  function d3_format_typeDefault(x) {
+-    return x + "";
+-  }
+-  var d3_format_group = d3_identity;
+-  if (d3_format_grouping) {
+-    var d3_format_groupingLength = d3_format_grouping.length;
+-    d3_format_group = function(value) {
+-      var i = value.length, t = [], j = 0, g = d3_format_grouping[0];
+-      while (i > 0 && g > 0) {
+-        t.push(value.substring(i -= g, i + g));
+-        g = d3_format_grouping[j = (j + 1) % d3_format_groupingLength];
+-      }
+-      return t.reverse().join(d3_format_thousandsSeparator);
+-    };
+-  }
+-  d3.geo = {};
+-  function d3_adder() {}
+-  d3_adder.prototype = {
+-    s: 0,
+-    t: 0,
+-    add: function(y) {
+-      d3_adderSum(y, this.t, d3_adderTemp);
+-      d3_adderSum(d3_adderTemp.s, this.s, this);
+-      if (this.s) this.t += d3_adderTemp.t; else this.s = d3_adderTemp.t;
+-    },
+-    reset: function() {
+-      this.s = this.t = 0;
+-    },
+-    valueOf: function() {
+-      return this.s;
+-    }
+-  };
+-  var d3_adderTemp = new d3_adder();
+-  function d3_adderSum(a, b, o) {
+-    var x = o.s = a + b, bv = x - a, av = x - bv;
+-    o.t = a - av + (b - bv);
+-  }
+-  d3.geo.stream = function(object, listener) {
+-    if (object && d3_geo_streamObjectType.hasOwnProperty(object.type)) {
+-      d3_geo_streamObjectType[object.type](object, listener);
+-    } else {
+-      d3_geo_streamGeometry(object, listener);
+-    }
+-  };
+-  function d3_geo_streamGeometry(geometry, listener) {
+-    if (geometry && d3_geo_streamGeometryType.hasOwnProperty(geometry.type)) {
+-      d3_geo_streamGeometryType[geometry.type](geometry, listener);
+-    }
+-  }
+-  var d3_geo_streamObjectType = {
+-    Feature: function(feature, listener) {
+-      d3_geo_streamGeometry(feature.geometry, listener);
+-    },
+-    FeatureCollection: function(object, listener) {
+-      var features = object.features, i = -1, n = features.length;
+-      while (++i < n) d3_geo_streamGeometry(features[i].geometry, listener);
+-    }
+-  };
+-  var d3_geo_streamGeometryType = {
+-    Sphere: function(object, listener) {
+-      listener.sphere();
+-    },
+-    Point: function(object, listener) {
+-      var coordinate = object.coordinates;
+-      listener.point(coordinate[0], coordinate[1]);
+-    },
+-    MultiPoint: function(object, listener) {
+-      var coordinates = object.coordinates, i = -1, n = coordinates.length, coordinate;
+-      while (++i < n) coordinate = coordinates[i], listener.point(coordinate[0], coordinate[1]);
+-    },
+-    LineString: function(object, listener) {
+-      d3_geo_streamLine(object.coordinates, listener, 0);
+-    },
+-    MultiLineString: function(object, listener) {
+-      var coordinates = object.coordinates, i = -1, n = coordinates.length;
+-      while (++i < n) d3_geo_streamLine(coordinates[i], listener, 0);
+-    },
+-    Polygon: function(object, listener) {
+-      d3_geo_streamPolygon(object.coordinates, listener);
+-    },
+-    MultiPolygon: function(object, listener) {
+-      var coordinates = object.coordinates, i = -1, n = coordinates.length;
+-      while (++i < n) d3_geo_streamPolygon(coordinates[i], listener);
+-    },
+-    GeometryCollection: function(object, listener) {
+-      var geometries = object.geometries, i = -1, n = geometries.length;
+-      while (++i < n) d3_geo_streamGeometry(geometries[i], listener);
+-    }
+-  };
+-  function d3_geo_streamLine(coordinates, listener, closed) {
+-    var i = -1, n = coordinates.length - closed, coordinate;
+-    listener.lineStart();
+-    while (++i < n) coordinate = coordinates[i], listener.point(coordinate[0], coordinate[1]);
+-    listener.lineEnd();
+-  }
+-  function d3_geo_streamPolygon(coordinates, listener) {
+-    var i = -1, n = coordinates.length;
+-    listener.polygonStart();
+-    while (++i < n) d3_geo_streamLine(coordinates[i], listener, 1);
+-    listener.polygonEnd();
+-  }
+-  d3.geo.area = function(object) {
+-    d3_geo_areaSum = 0;
+-    d3.geo.stream(object, d3_geo_area);
+-    return d3_geo_areaSum;
+-  };
+-  var d3_geo_areaSum, d3_geo_areaRingSum = new d3_adder();
+-  var d3_geo_area = {
+-    sphere: function() {
+-      d3_geo_areaSum += 4 * π;
+-    },
+-    point: d3_noop,
+-    lineStart: d3_noop,
+-    lineEnd: d3_noop,
+-    polygonStart: function() {
+-      d3_geo_areaRingSum.reset();
+-      d3_geo_area.lineStart = d3_geo_areaRingStart;
+-    },
+-    polygonEnd: function() {
+-      var area = 2 * d3_geo_areaRingSum;
+-      d3_geo_areaSum += area < 0 ? 4 * π + area : area;
+-      d3_geo_area.lineStart = d3_geo_area.lineEnd = d3_geo_area.point = d3_noop;
+-    }
+-  };
+-  function d3_geo_areaRingStart() {
+-    var λ00, φ00, λ0, cosφ0, sinφ0;
+-    d3_geo_area.point = function(λ, φ) {
+-      d3_geo_area.point = nextPoint;
+-      λ0 = (λ00 = λ) * d3_radians, cosφ0 = Math.cos(φ = (φ00 = φ) * d3_radians / 2 + π / 4),
+-      sinφ0 = Math.sin(φ);
+-    };
+-    function nextPoint(λ, φ) {
+-      λ *= d3_radians;
+-      φ = φ * d3_radians / 2 + π / 4;
+-      var dλ = λ - λ0, cosφ = Math.cos(φ), sinφ = Math.sin(φ), k = sinφ0 * sinφ, u = cosφ0 * cosφ + k * Math.cos(dλ), v = k * Math.sin(dλ);
+-      d3_geo_areaRingSum.add(Math.atan2(v, u));
+-      λ0 = λ, cosφ0 = cosφ, sinφ0 = sinφ;
+-    }
+-    d3_geo_area.lineEnd = function() {
+-      nextPoint(λ00, φ00);
+-    };
+-  }
+-  function d3_geo_cartesian(spherical) {
+-    var λ = spherical[0], φ = spherical[1], cosφ = Math.cos(φ);
+-    return [ cosφ * Math.cos(λ), cosφ * Math.sin(λ), Math.sin(φ) ];
+-  }
+-  function d3_geo_cartesianDot(a, b) {
+-    return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
+-  }
+-  function d3_geo_cartesianCross(a, b) {
+-    return [ a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0] ];
+-  }
+-  function d3_geo_cartesianAdd(a, b) {
+-    a[0] += b[0];
+-    a[1] += b[1];
+-    a[2] += b[2];
+-  }
+-  function d3_geo_cartesianScale(vector, k) {
+-    return [ vector[0] * k, vector[1] * k, vector[2] * k ];
+-  }
+-  function d3_geo_cartesianNormalize(d) {
+-    var l = Math.sqrt(d[0] * d[0] + d[1] * d[1] + d[2] * d[2]);
+-    d[0] /= l;
+-    d[1] /= l;
+-    d[2] /= l;
+-  }
+-  function d3_geo_spherical(cartesian) {
+-    return [ Math.atan2(cartesian[1], cartesian[0]), d3_asin(cartesian[2]) ];
+-  }
+-  function d3_geo_sphericalEqual(a, b) {
+-    return Math.abs(a[0] - b[0]) < ε && Math.abs(a[1] - b[1]) < ε;
+-  }
+-  d3.geo.bounds = function() {
+-    var λ0, φ0, λ1, φ1, λ_, λ__, φ__, p0, dλSum, ranges, range;
+-    var bound = {
+-      point: point,
+-      lineStart: lineStart,
+-      lineEnd: lineEnd,
+-      polygonStart: function() {
+-        bound.point = ringPoint;
+-        bound.lineStart = ringStart;
+-        bound.lineEnd = ringEnd;
+-        dλSum = 0;
+-        d3_geo_area.polygonStart();
+-      },
+-      polygonEnd: function() {
+-        d3_geo_area.polygonEnd();
+-        bound.point = point;
+-        bound.lineStart = lineStart;
+-        bound.lineEnd = lineEnd;
+-        if (d3_geo_areaRingSum < 0) λ0 = -(λ1 = 180), φ0 = -(φ1 = 90); else if (dλSum > ε) φ1 = 90; else if (dλSum < -ε) φ0 = -90;
+-        range[0] = λ0, range[1] = λ1;
+-      }
+-    };
+-    function point(λ, φ) {
+-      ranges.push(range = [ λ0 = λ, λ1 = λ ]);
+-      if (φ < φ0) φ0 = φ;
+-      if (φ > φ1) φ1 = φ;
+-    }
+-    function linePoint(λ, φ) {
+-      var p = d3_geo_cartesian([ λ * d3_radians, φ * d3_radians ]);
+-      if (p0) {
+-        var normal = d3_geo_cartesianCross(p0, p), equatorial = [ normal[1], -normal[0], 0 ], inflection = d3_geo_cartesianCross(equatorial, normal);
+-        d3_geo_cartesianNormalize(inflection);
+-        inflection = d3_geo_spherical(inflection);
+-        var dλ = λ - λ_, s = dλ > 0 ? 1 : -1, λi = inflection[0] * d3_degrees * s, antimeridian = Math.abs(dλ) > 180;
+-        if (antimeridian ^ (s * λ_ < λi && λi < s * λ)) {
+-          var φi = inflection[1] * d3_degrees;
+-          if (φi > φ1) φ1 = φi;
+-        } else if (λi = (λi + 360) % 360 - 180, antimeridian ^ (s * λ_ < λi && λi < s * λ)) {
+-          var φi = -inflection[1] * d3_degrees;
+-          if (φi < φ0) φ0 = φi;
+-        } else {
+-          if (φ < φ0) φ0 = φ;
+-          if (φ > φ1) φ1 = φ;
+-        }
+-        if (antimeridian) {
+-          if (λ < λ_) {
+-            if (angle(λ0, λ) > angle(λ0, λ1)) λ1 = λ;
+-          } else {
+-            if (angle(λ, λ1) > angle(λ0, λ1)) λ0 = λ;
+-          }
+-        } else {
+-          if (λ1 >= λ0) {
+-            if (λ < λ0) λ0 = λ;
+-            if (λ > λ1) λ1 = λ;
+-          } else {
+-            if (λ > λ_) {
+-              if (angle(λ0, λ) > angle(λ0, λ1)) λ1 = λ;
+-            } else {
+-              if (angle(λ, λ1) > angle(λ0, λ1)) λ0 = λ;
+-            }
+-          }
+-        }
+-      } else {
+-        point(λ, φ);
+-      }
+-      p0 = p, λ_ = λ;
+-    }
+-    function lineStart() {
+-      bound.point = linePoint;
+-    }
+-    function lineEnd() {
+-      range[0] = λ0, range[1] = λ1;
+-      bound.point = point;
+-      p0 = null;
+-    }
+-    function ringPoint(λ, φ) {
+-      if (p0) {
+-        var dλ = λ - λ_;
+-        dλSum += Math.abs(dλ) > 180 ? dλ + (dλ > 0 ? 360 : -360) : dλ;
+-      } else λ__ = λ, φ__ = φ;
+-      d3_geo_area.point(λ, φ);
+-      linePoint(λ, φ);
+-    }
+-    function ringStart() {
+-      d3_geo_area.lineStart();
+-    }
+-    function ringEnd() {
+-      ringPoint(λ__, φ__);
+-      d3_geo_area.lineEnd();
+-      if (Math.abs(dλSum) > ε) λ0 = -(λ1 = 180);
+-      range[0] = λ0, range[1] = λ1;
+-      p0 = null;
+-    }
+-    function angle(λ0, λ1) {
+-      return (λ1 -= λ0) < 0 ? λ1 + 360 : λ1;
+-    }
+-    function compareRanges(a, b) {
+-      return a[0] - b[0];
+-    }
+-    function withinRange(x, range) {
+-      return range[0] <= range[1] ? range[0] <= x && x <= range[1] : x < range[0] || range[1] < x;
+-    }
+-    return function(feature) {
+-      φ1 = λ1 = -(λ0 = φ0 = Infinity);
+-      ranges = [];
+-      d3.geo.stream(feature, bound);
+-      var n = ranges.length;
+-      if (n) {
+-        ranges.sort(compareRanges);
+-        for (var i = 1, a = ranges[0], b, merged = [ a ]; i < n; ++i) {
+-          b = ranges[i];
+-          if (withinRange(b[0], a) || withinRange(b[1], a)) {
+-            if (angle(a[0], b[1]) > angle(a[0], a[1])) a[1] = b[1];
+-            if (angle(b[0], a[1]) > angle(a[0], a[1])) a[0] = b[0];
+-          } else {
+-            merged.push(a = b);
+-          }
+-        }
+-        var best = -Infinity, dλ;
+-        for (var n = merged.length - 1, i = 0, a = merged[n], b; i <= n; a = b, ++i) {
+-          b = merged[i];
+-          if ((dλ = angle(a[1], b[0])) > best) best = dλ, λ0 = b[0], λ1 = a[1];
+-        }
+-      }
+-      ranges = range = null;
+-      return λ0 === Infinity || φ0 === Infinity ? [ [ NaN, NaN ], [ NaN, NaN ] ] : [ [ λ0, φ0 ], [ λ1, φ1 ] ];
+-    };
+-  }();
+-  d3.geo.centroid = function(object) {
+-    d3_geo_centroidW0 = d3_geo_centroidW1 = d3_geo_centroidX0 = d3_geo_centroidY0 = d3_geo_centroidZ0 = d3_geo_centroidX1 = d3_geo_centroidY1 = d3_geo_centroidZ1 = d3_geo_centroidX2 = d3_geo_centroidY2 = d3_geo_centroidZ2 = 0;
+-    d3.geo.stream(object, d3_geo_centroid);
+-    var x = d3_geo_centroidX2, y = d3_geo_centroidY2, z = d3_geo_centroidZ2, m = x * x + y * y + z * z;
+-    if (m < ε2) {
+-      x = d3_geo_centroidX1, y = d3_geo_centroidY1, z = d3_geo_centroidZ1;
+-      if (d3_geo_centroidW1 < ε) x = d3_geo_centroidX0, y = d3_geo_centroidY0, z = d3_geo_centroidZ0;
+-      m = x * x + y * y + z * z;
+-      if (m < ε2) return [ NaN, NaN ];
+-    }
+-    return [ Math.atan2(y, x) * d3_degrees, d3_asin(z / Math.sqrt(m)) * d3_degrees ];
+-  };
+-  var d3_geo_centroidW0, d3_geo_centroidW1, d3_geo_centroidX0, d3_geo_centroidY0, d3_geo_centroidZ0, d3_geo_centroidX1, d3_geo_centroidY1, d3_geo_centroidZ1, d3_geo_centroidX2, d3_geo_centroidY2, d3_geo_centroidZ2;
+-  var d3_geo_centroid = {
+-    sphere: d3_noop,
+-    point: d3_geo_centroidPoint,
+-    lineStart: d3_geo_centroidLineStart,
+-    lineEnd: d3_geo_centroidLineEnd,
+-    polygonStart: function() {
+-      d3_geo_centroid.lineStart = d3_geo_centroidRingStart;
+-    },
+-    polygonEnd: function() {
+-      d3_geo_centroid.lineStart = d3_geo_centroidLineStart;
+-    }
+-  };
+-  function d3_geo_centroidPoint(λ, φ) {
+-    λ *= d3_radians;
+-    var cosφ = Math.cos(φ *= d3_radians);
+-    d3_geo_centroidPointXYZ(cosφ * Math.cos(λ), cosφ * Math.sin(λ), Math.sin(φ));
+-  }
+-  function d3_geo_centroidPointXYZ(x, y, z) {
+-    ++d3_geo_centroidW0;
+-    d3_geo_centroidX0 += (x - d3_geo_centroidX0) / d3_geo_centroidW0;
+-    d3_geo_centroidY0 += (y - d3_geo_centroidY0) / d3_geo_centroidW0;
+-    d3_geo_centroidZ0 += (z - d3_geo_centroidZ0) / d3_geo_centroidW0;
+-  }
+-  function d3_geo_centroidLineStart() {
+-    var x0, y0, z0;
+-    d3_geo_centroid.point = function(λ, φ) {
+-      λ *= d3_radians;
+-      var cosφ = Math.cos(φ *= d3_radians);
+-      x0 = cosφ * Math.cos(λ);
+-      y0 = cosφ * Math.sin(λ);
+-      z0 = Math.sin(φ);
+-      d3_geo_centroid.point = nextPoint;
+-      d3_geo_centroidPointXYZ(x0, y0, z0);
+-    };
+-    function nextPoint(λ, φ) {
+-      λ *= d3_radians;
+-      var cosφ = Math.cos(φ *= d3_radians), x = cosφ * Math.cos(λ), y = cosφ * Math.sin(λ), z = Math.sin(φ), w = Math.atan2(Math.sqrt((w = y0 * z - z0 * y) * w + (w = z0 * x - x0 * z) * w + (w = x0 * y - y0 * x) * w), x0 * x + y0 * y + z0 * z);
+-      d3_geo_centroidW1 += w;
+-      d3_geo_centroidX1 += w * (x0 + (x0 = x));
+-      d3_geo_centroidY1 += w * (y0 + (y0 = y));
+-      d3_geo_centroidZ1 += w * (z0 + (z0 = z));
+-      d3_geo_centroidPointXYZ(x0, y0, z0);
+-    }
+-  }
+-  function d3_geo_centroidLineEnd() {
+-    d3_geo_centroid.point = d3_geo_centroidPoint;
+-  }
+-  function d3_geo_centroidRingStart() {
+-    var λ00, φ00, x0, y0, z0;
+-    d3_geo_centroid.point = function(λ, φ) {
+-      λ00 = λ, φ00 = φ;
+-      d3_geo_centroid.point = nextPoint;
+-      λ *= d3_radians;
+-      var cosφ = Math.cos(φ *= d3_radians);
+-      x0 = cosφ * Math.cos(λ);
+-      y0 = cosφ * Math.sin(λ);
+-      z0 = Math.sin(φ);
+-      d3_geo_centroidPointXYZ(x0, y0, z0);
+-    };
+-    d3_geo_centroid.lineEnd = function() {
+-      nextPoint(λ00, φ00);
+-      d3_geo_centroid.lineEnd = d3_geo_centroidLineEnd;
+-      d3_geo_centroid.point = d3_geo_centroidPoint;
+-    };
+-    function nextPoint(λ, φ) {
+-      λ *= d3_radians;
+-      var cosφ = Math.cos(φ *= d3_radians), x = cosφ * Math.cos(λ), y = cosφ * Math.sin(λ), z = Math.sin(φ), cx = y0 * z - z0 * y, cy = z0 * x - x0 * z, cz = x0 * y - y0 * x, m = Math.sqrt(cx * cx + cy * cy + cz * cz), u = x0 * x + y0 * y + z0 * z, v = m && -d3_acos(u) / m, w = Math.atan2(m, u);
+-      d3_geo_centroidX2 += v * cx;
+-      d3_geo_centroidY2 += v * cy;
+-      d3_geo_centroidZ2 += v * cz;
+-      d3_geo_centroidW1 += w;
+-      d3_geo_centroidX1 += w * (x0 + (x0 = x));
+-      d3_geo_centroidY1 += w * (y0 + (y0 = y));
+-      d3_geo_centroidZ1 += w * (z0 + (z0 = z));
+-      d3_geo_centroidPointXYZ(x0, y0, z0);
+-    }
+-  }
+-  function d3_true() {
+-    return true;
+-  }
+-  function d3_geo_clipPolygon(segments, compare, inside, interpolate, listener) {
+-    var subject = [], clip = [];
+-    segments.forEach(function(segment) {
+-      if ((n = segment.length - 1) <= 0) return;
+-      var n, p0 = segment[0], p1 = segment[n];
+-      if (d3_geo_sphericalEqual(p0, p1)) {
+-        listener.lineStart();
+-        for (var i = 0; i < n; ++i) listener.point((p0 = segment[i])[0], p0[1]);
+-        listener.lineEnd();
+-        return;
+-      }
+-      var a = {
+-        point: p0,
+-        points: segment,
+-        other: null,
+-        visited: false,
+-        entry: true,
+-        subject: true
+-      }, b = {
+-        point: p0,
+-        points: [ p0 ],
+-        other: a,
+-        visited: false,
+-        entry: false,
+-        subject: false
+-      };
+-      a.other = b;
+-      subject.push(a);
+-      clip.push(b);
+-      a = {
+-        point: p1,
+-        points: [ p1 ],
+-        other: null,
+-        visited: false,
+-        entry: false,
+-        subject: true
+-      };
+-      b = {
+-        point: p1,
+-        points: [ p1 ],
+-        other: a,
+-        visited: false,
+-        entry: true,
+-        subject: false
+-      };
+-      a.other = b;
+-      subject.push(a);
+-      clip.push(b);
+-    });
+-    clip.sort(compare);
+-    d3_geo_clipPolygonLinkCircular(subject);
+-    d3_geo_clipPolygonLinkCircular(clip);
+-    if (!subject.length) return;
+-    if (inside) for (var i = 1, e = !inside(clip[0].point), n = clip.length; i < n; ++i) {
+-      clip[i].entry = e = !e;
+-    }
+-    var start = subject[0], current, points, point;
+-    while (1) {
+-      current = start;
+-      while (current.visited) if ((current = current.next) === start) return;
+-      points = current.points;
+-      listener.lineStart();
+-      do {
+-        current.visited = current.other.visited = true;
+-        if (current.entry) {
+-          if (current.subject) {
+-            for (var i = 0; i < points.length; i++) listener.point((point = points[i])[0], point[1]);
+-          } else {
+-            interpolate(current.point, current.next.point, 1, listener);
+-          }
+-          current = current.next;
+-        } else {
+-          if (current.subject) {
+-            points = current.prev.points;
+-            for (var i = points.length; --i >= 0; ) listener.point((point = points[i])[0], point[1]);
+-          } else {
+-            interpolate(current.point, current.prev.point, -1, listener);
+-          }
+-          current = current.prev;
+-        }
+-        current = current.other;
+-        points = current.points;
+-      } while (!current.visited);
+-      listener.lineEnd();
+-    }
+-  }
+-  function d3_geo_clipPolygonLinkCircular(array) {
+-    if (!(n = array.length)) return;
+-    var n, i = 0, a = array[0], b;
+-    while (++i < n) {
+-      a.next = b = array[i];
+-      b.prev = a;
+-      a = b;
+-    }
+-    a.next = b = array[0];
+-    b.prev = a;
+-  }
+-  function d3_geo_clip(pointVisible, clipLine, interpolate, polygonContains) {
+-    return function(listener) {
+-      var line = clipLine(listener);
+-      var clip = {
+-        point: point,
+-        lineStart: lineStart,
+-        lineEnd: lineEnd,
+-        polygonStart: function() {
+-          clip.point = pointRing;
+-          clip.lineStart = ringStart;
+-          clip.lineEnd = ringEnd;
+-          segments = [];
+-          polygon = [];
+-          listener.polygonStart();
+-        },
+-        polygonEnd: function() {
+-          clip.point = point;
+-          clip.lineStart = lineStart;
+-          clip.lineEnd = lineEnd;
+-          segments = d3.merge(segments);
+-          if (segments.length) {
+-            d3_geo_clipPolygon(segments, d3_geo_clipSort, null, interpolate, listener);
+-          } else if (polygonContains(polygon)) {
+-            listener.lineStart();
+-            interpolate(null, null, 1, listener);
+-            listener.lineEnd();
+-          }
+-          listener.polygonEnd();
+-          segments = polygon = null;
+-        },
+-        sphere: function() {
+-          listener.polygonStart();
+-          listener.lineStart();
+-          interpolate(null, null, 1, listener);
+-          listener.lineEnd();
+-          listener.polygonEnd();
+-        }
+-      };
+-      function point(λ, φ) {
+-        if (pointVisible(λ, φ)) listener.point(λ, φ);
+-      }
+-      function pointLine(λ, φ) {
+-        line.point(λ, φ);
+-      }
+-      function lineStart() {
+-        clip.point = pointLine;
+-        line.lineStart();
+-      }
+-      function lineEnd() {
+-        clip.point = point;
+-        line.lineEnd();
+-      }
+-      var segments;
+-      var buffer = d3_geo_clipBufferListener(), ringListener = clipLine(buffer), polygon, ring;
+-      function pointRing(λ, φ) {
+-        ringListener.point(λ, φ);
+-        ring.push([ λ, φ ]);
+-      }
+-      function ringStart() {
+-        ringListener.lineStart();
+-        ring = [];
+-      }
+-      function ringEnd() {
+-        pointRing(ring[0][0], ring[0][1]);
+-        ringListener.lineEnd();
+-        var clean = ringListener.clean(), ringSegments = buffer.buffer(), segment, n = ringSegments.length;
+-        ring.pop();
+-        polygon.push(ring);
+-        ring = null;
+-        if (!n) return;
+-        if (clean & 1) {
+-          segment = ringSegments[0];
+-          var n = segment.length - 1, i = -1, point;
+-          listener.lineStart();
+-          while (++i < n) listener.point((point = segment[i])[0], point[1]);
+-          listener.lineEnd();
+-          return;
+-        }
+-        if (n > 1 && clean & 2) ringSegments.push(ringSegments.pop().concat(ringSegments.shift()));
+-        segments.push(ringSegments.filter(d3_geo_clipSegmentLength1));
+-      }
+-      return clip;
+-    };
+-  }
+-  function d3_geo_clipSegmentLength1(segment) {
+-    return segment.length > 1;
+-  }
+-  function d3_geo_clipBufferListener() {
+-    var lines = [], line;
+-    return {
+-      lineStart: function() {
+-        lines.push(line = []);
+-      },
+-      point: function(λ, φ) {
+-        line.push([ λ, φ ]);
+-      },
+-      lineEnd: d3_noop,
+-      buffer: function() {
+-        var buffer = lines;
+-        lines = [];
+-        line = null;
+-        return buffer;
+-      },
+-      rejoin: function() {
+-        if (lines.length > 1) lines.push(lines.pop().concat(lines.shift()));
+-      }
+-    };
+-  }
+-  function d3_geo_clipSort(a, b) {
+-    return ((a = a.point)[0] < 0 ? a[1] - π / 2 - ε : π / 2 - a[1]) - ((b = b.point)[0] < 0 ? b[1] - π / 2 - ε : π / 2 - b[1]);
+-  }
+-  function d3_geo_pointInPolygon(point, polygon) {
+-    var meridian = point[0], parallel = point[1], meridianNormal = [ Math.sin(meridian), -Math.cos(meridian), 0 ], polarAngle = 0, polar = false, southPole = false, winding = 0;
+-    d3_geo_areaRingSum.reset();
+-    for (var i = 0, n = polygon.length; i < n; ++i) {
+-      var ring = polygon[i], m = ring.length;
+-      if (!m) continue;
+-      var point0 = ring[0], λ0 = point0[0], φ0 = point0[1] / 2 + π / 4, sinφ0 = Math.sin(φ0), cosφ0 = Math.cos(φ0), j = 1;
+-      while (true) {
+-        if (j === m) j = 0;
+-        point = ring[j];
+-        var λ = point[0], φ = point[1] / 2 + π / 4, sinφ = Math.sin(φ), cosφ = Math.cos(φ), dλ = λ - λ0, antimeridian = Math.abs(dλ) > π, k = sinφ0 * sinφ;
+-        d3_geo_areaRingSum.add(Math.atan2(k * Math.sin(dλ), cosφ0 * cosφ + k * Math.cos(dλ)));
+-        if (Math.abs(φ) < ε) southPole = true;
+-        polarAngle += antimeridian ? dλ + (dλ >= 0 ? 2 : -2) * π : dλ;
+-        if (antimeridian ^ λ0 >= meridian ^ λ >= meridian) {
+-          var arc = d3_geo_cartesianCross(d3_geo_cartesian(point0), d3_geo_cartesian(point));
+-          d3_geo_cartesianNormalize(arc);
+-          var intersection = d3_geo_cartesianCross(meridianNormal, arc);
+-          d3_geo_cartesianNormalize(intersection);
+-          var φarc = (antimeridian ^ dλ >= 0 ? -1 : 1) * d3_asin(intersection[2]);
+-          if (parallel > φarc) {
+-            winding += antimeridian ^ dλ >= 0 ? 1 : -1;
+-          }
+-        }
+-        if (!j++) break;
+-        λ0 = λ, sinφ0 = sinφ, cosφ0 = cosφ, point0 = point;
+-      }
+-      if (Math.abs(polarAngle) > ε) polar = true;
+-    }
+-    return (!southPole && !polar && d3_geo_areaRingSum < 0 || polarAngle < -ε) ^ winding & 1;
+-  }
+-  var d3_geo_clipAntimeridian = d3_geo_clip(d3_true, d3_geo_clipAntimeridianLine, d3_geo_clipAntimeridianInterpolate, d3_geo_clipAntimeridianPolygonContains);
+-  function d3_geo_clipAntimeridianLine(listener) {
+-    var λ0 = NaN, φ0 = NaN, sλ0 = NaN, clean;
+-    return {
+-      lineStart: function() {
+-        listener.lineStart();
+-        clean = 1;
+-      },
+-      point: function(λ1, φ1) {
+-        var sλ1 = λ1 > 0 ? π : -π, dλ = Math.abs(λ1 - λ0);
+-        if (Math.abs(dλ - π) < ε) {
+-          listener.point(λ0, φ0 = (φ0 + φ1) / 2 > 0 ? π / 2 : -π / 2);
+-          listener.point(sλ0, φ0);
+-          listener.lineEnd();
+-          listener.lineStart();
+-          listener.point(sλ1, φ0);
+-          listener.point(λ1, φ0);
+-          clean = 0;
+-        } else if (sλ0 !== sλ1 && dλ >= π) {
+-          if (Math.abs(λ0 - sλ0) < ε) λ0 -= sλ0 * ε;
+-          if (Math.abs(λ1 - sλ1) < ε) λ1 -= sλ1 * ε;
+-          φ0 = d3_geo_clipAntimeridianIntersect(λ0, φ0, λ1, φ1);
+-          listener.point(sλ0, φ0);
+-          listener.lineEnd();
+-          listener.lineStart();
+-          listener.point(sλ1, φ0);
+-          clean = 0;
+-        }
+-        listener.point(λ0 = λ1, φ0 = φ1);
+-        sλ0 = sλ1;
+-      },
+-      lineEnd: function() {
+-        listener.lineEnd();
+-        λ0 = φ0 = NaN;
+-      },
+-      clean: function() {
+-        return 2 - clean;
+-      }
+-    };
+-  }
+-  function d3_geo_clipAntimeridianIntersect(λ0, φ0, λ1, φ1) {
+-    var cosφ0, cosφ1, sinλ0_λ1 = Math.sin(λ0 - λ1);
+-    return Math.abs(sinλ0_λ1) > ε ? Math.atan((Math.sin(φ0) * (cosφ1 = Math.cos(φ1)) * Math.sin(λ1) - Math.sin(φ1) * (cosφ0 = Math.cos(φ0)) * Math.sin(λ0)) / (cosφ0 * cosφ1 * sinλ0_λ1)) : (φ0 + φ1) / 2;
+-  }
+-  function d3_geo_clipAntimeridianInterpolate(from, to, direction, listener) {
+-    var φ;
+-    if (from == null) {
+-      φ = direction * π / 2;
+-      listener.point(-π, φ);
+-      listener.point(0, φ);
+-      listener.point(π, φ);
+-      listener.point(π, 0);
+-      listener.point(π, -φ);
+-      listener.point(0, -φ);
+-      listener.point(-π, -φ);
+-      listener.point(-π, 0);
+-      listener.point(-π, φ);
+-    } else if (Math.abs(from[0] - to[0]) > ε) {
+-      var s = (from[0] < to[0] ? 1 : -1) * π;
+-      φ = direction * s / 2;
+-      listener.point(-s, φ);
+-      listener.point(0, φ);
+-      listener.point(s, φ);
+-    } else {
+-      listener.point(to[0], to[1]);
+-    }
+-  }
+-  var d3_geo_clipAntimeridianPoint = [ -π, 0 ];
+-  function d3_geo_clipAntimeridianPolygonContains(polygon) {
+-    return d3_geo_pointInPolygon(d3_geo_clipAntimeridianPoint, polygon);
+-  }
+-  function d3_geo_clipCircle(radius) {
+-    var cr = Math.cos(radius), smallRadius = cr > 0, point = [ radius, 0 ], notHemisphere = Math.abs(cr) > ε, interpolate = d3_geo_circleInterpolate(radius, 6 * d3_radians);
+-    return d3_geo_clip(visible, clipLine, interpolate, polygonContains);
+-    function visible(λ, φ) {
+-      return Math.cos(λ) * Math.cos(φ) > cr;
+-    }
+-    function clipLine(listener) {
+-      var point0, c0, v0, v00, clean;
+-      return {
+-        lineStart: function() {
+-          v00 = v0 = false;
+-          clean = 1;
+-        },
+-        point: function(λ, φ) {
+-          var point1 = [ λ, φ ], point2, v = visible(λ, φ), c = smallRadius ? v ? 0 : code(λ, φ) : v ? code(λ + (λ < 0 ? π : -π), φ) : 0;
+-          if (!point0 && (v00 = v0 = v)) listener.lineStart();
+-          if (v !== v0) {
+-            point2 = intersect(point0, point1);
+-            if (d3_geo_sphericalEqual(point0, point2) || d3_geo_sphericalEqual(point1, point2)) {
+-              point1[0] += ε;
+-              point1[1] += ε;
+-              v = visible(point1[0], point1[1]);
+-            }
+-          }
+-          if (v !== v0) {
+-            clean = 0;
+-            if (v) {
+-              listener.lineStart();
+-              point2 = intersect(point1, point0);
+-              listener.point(point2[0], point2[1]);
+-            } else {
+-              point2 = intersect(point0, point1);
+-              listener.point(point2[0], point2[1]);
+-              listener.lineEnd();
+-            }
+-            point0 = point2;
+-          } else if (notHemisphere && point0 && smallRadius ^ v) {
+-            var t;
+-            if (!(c & c0) && (t = intersect(point1, point0, true))) {
+-              clean = 0;
+-              if (smallRadius) {
+-                listener.lineStart();
+-                listener.point(t[0][0], t[0][1]);
+-                listener.point(t[1][0], t[1][1]);
+-                listener.lineEnd();
+-              } else {
+-                listener.point(t[1][0], t[1][1]);
+-                listener.lineEnd();
+-                listener.lineStart();
+-                listener.point(t[0][0], t[0][1]);
+-              }
+-            }
+-          }
+-          if (v && (!point0 || !d3_geo_sphericalEqual(point0, point1))) {
+-            listener.point(point1[0], point1[1]);
+-          }
+-          point0 = point1, v0 = v, c0 = c;
+-        },
+-        lineEnd: function() {
+-          if (v0) listener.lineEnd();
+-          point0 = null;
+-        },
+-        clean: function() {
+-          return clean | (v00 && v0) << 1;
+-        }
+-      };
+-    }
+-    function intersect(a, b, two) {
+-      var pa = d3_geo_cartesian(a), pb = d3_geo_cartesian(b);
+-      var n1 = [ 1, 0, 0 ], n2 = d3_geo_cartesianCross(pa, pb), n2n2 = d3_geo_cartesianDot(n2, n2), n1n2 = n2[0], determinant = n2n2 - n1n2 * n1n2;
+-      if (!determinant) return !two && a;
+-      var c1 = cr * n2n2 / determinant, c2 = -cr * n1n2 / determinant, n1xn2 = d3_geo_cartesianCross(n1, n2), A = d3_geo_cartesianScale(n1, c1), B = d3_geo_cartesianScale(n2, c2);
+-      d3_geo_cartesianAdd(A, B);
+-      var u = n1xn2, w = d3_geo_cartesianDot(A, u), uu = d3_geo_cartesianDot(u, u), t2 = w * w - uu * (d3_geo_cartesianDot(A, A) - 1);
+-      if (t2 < 0) return;
+-      var t = Math.sqrt(t2), q = d3_geo_cartesianScale(u, (-w - t) / uu);
+-      d3_geo_cartesianAdd(q, A);
+-      q = d3_geo_spherical(q);
+-      if (!two) return q;
+-      var λ0 = a[0], λ1 = b[0], φ0 = a[1], φ1 = b[1], z;
+-      if (λ1 < λ0) z = λ0, λ0 = λ1, λ1 = z;
+-      var δλ = λ1 - λ0, polar = Math.abs(δλ - π) < ε, meridian = polar || δλ < ε;
+-      if (!polar && φ1 < φ0) z = φ0, φ0 = φ1, φ1 = z;
+-      if (meridian ? polar ? φ0 + φ1 > 0 ^ q[1] < (Math.abs(q[0] - λ0) < ε ? φ0 : φ1) : φ0 <= q[1] && q[1] <= φ1 : δλ > π ^ (λ0 <= q[0] && q[0] <= λ1)) {
+-        var q1 = d3_geo_cartesianScale(u, (-w + t) / uu);
+-        d3_geo_cartesianAdd(q1, A);
+-        return [ q, d3_geo_spherical(q1) ];
+-      }
+-    }
+-    function code(λ, φ) {
+-      var r = smallRadius ? radius : π - radius, code = 0;
+-      if (λ < -r) code |= 1; else if (λ > r) code |= 2;
+-      if (φ < -r) code |= 4; else if (φ > r) code |= 8;
+-      return code;
+-    }
+-    function polygonContains(polygon) {
+-      return d3_geo_pointInPolygon(point, polygon);
+-    }
+-  }
+-  var d3_geo_clipViewMAX = 1e9;
+-  function d3_geo_clipView(x0, y0, x1, y1) {
+-    return function(listener) {
+-      var listener_ = listener, bufferListener = d3_geo_clipBufferListener(), segments, polygon, ring;
+-      var clip = {
+-        point: point,
+-        lineStart: lineStart,
+-        lineEnd: lineEnd,
+-        polygonStart: function() {
+-          listener = bufferListener;
+-          segments = [];
+-          polygon = [];
+-        },
+-        polygonEnd: function() {
+-          listener = listener_;
+-          if ((segments = d3.merge(segments)).length) {
+-            listener.polygonStart();
+-            d3_geo_clipPolygon(segments, compare, inside, interpolate, listener);
+-            listener.polygonEnd();
+-          } else if (insidePolygon([ x0, y0 ])) {
+-            listener.polygonStart(), listener.lineStart();
+-            interpolate(null, null, 1, listener);
+-            listener.lineEnd(), listener.polygonEnd();
+-          }
+-          segments = polygon = ring = null;
+-        }
+-      };
+-      function inside(point) {
+-        var a = corner(point, -1), i = insidePolygon([ a === 0 || a === 3 ? x0 : x1, a > 1 ? y1 : y0 ]);
+-        return i;
+-      }
+-      function insidePolygon(p) {
+-        var wn = 0, n = polygon.length, y = p[1];
+-        for (var i = 0; i < n; ++i) {
+-          for (var j = 1, v = polygon[i], m = v.length, a = v[0], b; j < m; ++j) {
+-            b = v[j];
+-            if (a[1] <= y) {
+-              if (b[1] > y && isLeft(a, b, p) > 0) ++wn;
+-            } else {
+-              if (b[1] <= y && isLeft(a, b, p) < 0) --wn;
+-            }
+-            a = b;
+-          }
+-        }
+-        return wn !== 0;
+-      }
+-      function isLeft(a, b, c) {
+-        return (b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1]);
+-      }
+-      function interpolate(from, to, direction, listener) {
+-        var a = 0, a1 = 0;
+-        if (from == null || (a = corner(from, direction)) !== (a1 = corner(to, direction)) || comparePoints(from, to) < 0 ^ direction > 0) {
+-          do {
+-            listener.point(a === 0 || a === 3 ? x0 : x1, a > 1 ? y1 : y0);
+-          } while ((a = (a + direction + 4) % 4) !== a1);
+-        } else {
+-          listener.point(to[0], to[1]);
+-        }
+-      }
+-      function visible(x, y) {
+-        return x0 <= x && x <= x1 && y0 <= y && y <= y1;
+-      }
+-      function point(x, y) {
+-        if (visible(x, y)) listener.point(x, y);
+-      }
+-      var x__, y__, v__, x_, y_, v_, first;
+-      function lineStart() {
+-        clip.point = linePoint;
+-        if (polygon) polygon.push(ring = []);
+-        first = true;
+-        v_ = false;
+-        x_ = y_ = NaN;
+-      }
+-      function lineEnd() {
+-        if (segments) {
+-          linePoint(x__, y__);
+-          if (v__ && v_) bufferListener.rejoin();
+-          segments.push(bufferListener.buffer());
+-        }
+-        clip.point = point;
+-        if (v_) listener.lineEnd();
+-      }
+-      function linePoint(x, y) {
+-        x = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, x));
+-        y = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, y));
+-        var v = visible(x, y);
+-        if (polygon) ring.push([ x, y ]);
+-        if (first) {
+-          x__ = x, y__ = y, v__ = v;
+-          first = false;
+-          if (v) {
+-            listener.lineStart();
+-            listener.point(x, y);
+-          }
+-        } else {
+-          if (v && v_) listener.point(x, y); else {
+-            var a = [ x_, y_ ], b = [ x, y ];
+-            if (clipLine(a, b)) {
+-              if (!v_) {
+-                listener.lineStart();
+-                listener.point(a[0], a[1]);
+-              }
+-              listener.point(b[0], b[1]);
+-              if (!v) listener.lineEnd();
+-            } else if (v) {
+-              listener.lineStart();
+-              listener.point(x, y);
+-            }
+-          }
+-        }
+-        x_ = x, y_ = y, v_ = v;
+-      }
+-      return clip;
+-    };
+-    function corner(p, direction) {
+-      return Math.abs(p[0] - x0) < ε ? direction > 0 ? 0 : 3 : Math.abs(p[0] - x1) < ε ? direction > 0 ? 2 : 1 : Math.abs(p[1] - y0) < ε ? direction > 0 ? 1 : 0 : direction > 0 ? 3 : 2;
+-    }
+-    function compare(a, b) {
+-      return comparePoints(a.point, b.point);
+-    }
+-    function comparePoints(a, b) {
+-      var ca = corner(a, 1), cb = corner(b, 1);
+-      return ca !== cb ? ca - cb : ca === 0 ? b[1] - a[1] : ca === 1 ? a[0] - b[0] : ca === 2 ? a[1] - b[1] : b[0] - a[0];
+-    }
+-    function clipLine(a, b) {
+-      var dx = b[0] - a[0], dy = b[1] - a[1], t = [ 0, 1 ];
+-      if (Math.abs(dx) < ε && Math.abs(dy) < ε) return x0 <= a[0] && a[0] <= x1 && y0 <= a[1] && a[1] <= y1;
+-      if (d3_geo_clipViewT(x0 - a[0], dx, t) && d3_geo_clipViewT(a[0] - x1, -dx, t) && d3_geo_clipViewT(y0 - a[1], dy, t) && d3_geo_clipViewT(a[1] - y1, -dy, t)) {
+-        if (t[1] < 1) {
+-          b[0] = a[0] + t[1] * dx;
+-          b[1] = a[1] + t[1] * dy;
+-        }
+-        if (t[0] > 0) {
+-          a[0] += t[0] * dx;
+-          a[1] += t[0] * dy;
+-        }
+-        return true;
+-      }
+-      return false;
+-    }
+-  }
+-  function d3_geo_clipViewT(num, denominator, t) {
+-    if (Math.abs(denominator) < ε) return num <= 0;
+-    var u = num / denominator;
+-    if (denominator > 0) {
+-      if (u > t[1]) return false;
+-      if (u > t[0]) t[0] = u;
+-    } else {
+-      if (u < t[0]) return false;
+-      if (u < t[1]) t[1] = u;
+-    }
+-    return true;
+-  }
+-  function d3_geo_compose(a, b) {
+-    function compose(x, y) {
+-      return x = a(x, y), b(x[0], x[1]);
+-    }
+-    if (a.invert && b.invert) compose.invert = function(x, y) {
+-      return x = b.invert(x, y), x && a.invert(x[0], x[1]);
+-    };
+-    return compose;
+-  }
+-  function d3_geo_conic(projectAt) {
+-    var φ0 = 0, φ1 = π / 3, m = d3_geo_projectionMutator(projectAt), p = m(φ0, φ1);
+-    p.parallels = function(_) {
+-      if (!arguments.length) return [ φ0 / π * 180, φ1 / π * 180 ];
+-      return m(φ0 = _[0] * π / 180, φ1 = _[1] * π / 180);
+-    };
+-    return p;
+-  }
+-  function d3_geo_conicEqualArea(φ0, φ1) {
+-    var sinφ0 = Math.sin(φ0), n = (sinφ0 + Math.sin(φ1)) / 2, C = 1 + sinφ0 * (2 * n - sinφ0), ρ0 = Math.sqrt(C) / n;
+-    function forward(λ, φ) {
+-      var ρ = Math.sqrt(C - 2 * n * Math.sin(φ)) / n;
+-      return [ ρ * Math.sin(λ *= n), ρ0 - ρ * Math.cos(λ) ];
+-    }
+-    forward.invert = function(x, y) {
+-      var ρ0_y = ρ0 - y;
+-      return [ Math.atan2(x, ρ0_y) / n, d3_asin((C - (x * x + ρ0_y * ρ0_y) * n * n) / (2 * n)) ];
+-    };
+-    return forward;
+-  }
+-  (d3.geo.conicEqualArea = function() {
+-    return d3_geo_conic(d3_geo_conicEqualArea);
+-  }).raw = d3_geo_conicEqualArea;
+-  d3.geo.albers = function() {
+-    return d3.geo.conicEqualArea().rotate([ 96, 0 ]).center([ -.6, 38.7 ]).parallels([ 29.5, 45.5 ]).scale(1070);
+-  };
+-  d3.geo.albersUsa = function() {
+-    var lower48 = d3.geo.albers();
+-    var alaska = d3.geo.conicEqualArea().rotate([ 154, 0 ]).center([ -2, 58.5 ]).parallels([ 55, 65 ]);
+-    var hawaii = d3.geo.conicEqualArea().rotate([ 157, 0 ]).center([ -3, 19.9 ]).parallels([ 8, 18 ]);
+-    var point, pointStream = {
+-      point: function(x, y) {
+-        point = [ x, y ];
+-      }
+-    }, lower48Point, alaskaPoint, hawaiiPoint;
+-    function albersUsa(coordinates) {
+-      var x = coordinates[0], y = coordinates[1];
+-      point = null;
+-      (lower48Point(x, y), point) || (alaskaPoint(x, y), point) || hawaiiPoint(x, y);
+-      return point;
+-    }
+-    albersUsa.invert = function(coordinates) {
+-      var k = lower48.scale(), t = lower48.translate(), x = (coordinates[0] - t[0]) / k, y = (coordinates[1] - t[1]) / k;
+-      return (y >= .12 && y < .234 && x >= -.425 && x < -.214 ? alaska : y >= .166 && y < .234 && x >= -.214 && x < -.115 ? hawaii : lower48).invert(coordinates);
+-    };
+-    albersUsa.stream = function(stream) {
+-      var lower48Stream = lower48.stream(stream), alaskaStream = alaska.stream(stream), hawaiiStream = hawaii.stream(stream);
+-      return {
+-        point: function(x, y) {
+-          lower48Stream.point(x, y);
+-          alaskaStream.point(x, y);
+-          hawaiiStream.point(x, y);
+-        },
+-        sphere: function() {
+-          lower48Stream.sphere();
+-          alaskaStream.sphere();
+-          hawaiiStream.sphere();
+-        },
+-        lineStart: function() {
+-          lower48Stream.lineStart();
+-          alaskaStream.lineStart();
+-          hawaiiStream.lineStart();
+-        },
+-        lineEnd: function() {
+-          lower48Stream.lineEnd();
+-          alaskaStream.lineEnd();
+-          hawaiiStream.lineEnd();
+-        },
+-        polygonStart: function() {
+-          lower48Stream.polygonStart();
+-          alaskaStream.polygonStart();
+-          hawaiiStream.polygonStart();
+-        },
+-        polygonEnd: function() {
+-          lower48Stream.polygonEnd();
+-          alaskaStream.polygonEnd();
+-          hawaiiStream.polygonEnd();
+-        }
+-      };
+-    };
+-    albersUsa.precision = function(_) {
+-      if (!arguments.length) return lower48.precision();
+-      lower48.precision(_);
+-      alaska.precision(_);
+-      hawaii.precision(_);
+-      return albersUsa;
+-    };
+-    albersUsa.scale = function(_) {
+-      if (!arguments.length) return lower48.scale();
+-      lower48.scale(_);
+-      alaska.scale(_ * .35);
+-      hawaii.scale(_);
+-      return albersUsa.translate(lower48.translate());
+-    };
+-    albersUsa.translate = function(_) {
+-      if (!arguments.length) return lower48.translate();
+-      var k = lower48.scale(), x = +_[0], y = +_[1];
+-      lower48Point = lower48.translate(_).clipExtent([ [ x - .455 * k, y - .238 * k ], [ x + .455 * k, y + .238 * k ] ]).stream(pointStream).point;
+-      alaskaPoint = alaska.translate([ x - .307 * k, y + .201 * k ]).clipExtent([ [ x - .425 * k + ε, y + .12 * k + ε ], [ x - .214 * k - ε, y + .234 * k - ε ] ]).stream(pointStream).point;
+-      hawaiiPoint = hawaii.translate([ x - .205 * k, y + .212 * k ]).clipExtent([ [ x - .214 * k + ε, y + .166 * k + ε ], [ x - .115 * k - ε, y + .234 * k - ε ] ]).stream(pointStream).point;
+-      return albersUsa;
+-    };
+-    return albersUsa.scale(1070);
+-  };
+-  var d3_geo_pathAreaSum, d3_geo_pathAreaPolygon, d3_geo_pathArea = {
+-    point: d3_noop,
+-    lineStart: d3_noop,
+-    lineEnd: d3_noop,
+-    polygonStart: function() {
+-      d3_geo_pathAreaPolygon = 0;
+-      d3_geo_pathArea.lineStart = d3_geo_pathAreaRingStart;
+-    },
+-    polygonEnd: function() {
+-      d3_geo_pathArea.lineStart = d3_geo_pathArea.lineEnd = d3_geo_pathArea.point = d3_noop;
+-      d3_geo_pathAreaSum += Math.abs(d3_geo_pathAreaPolygon / 2);
+-    }
+-  };
+-  function d3_geo_pathAreaRingStart() {
+-    var x00, y00, x0, y0;
+-    d3_geo_pathArea.point = function(x, y) {
+-      d3_geo_pathArea.point = nextPoint;
+-      x00 = x0 = x, y00 = y0 = y;
+-    };
+-    function nextPoint(x, y) {
+-      d3_geo_pathAreaPolygon += y0 * x - x0 * y;
+-      x0 = x, y0 = y;
+-    }
+-    d3_geo_pathArea.lineEnd = function() {
+-      nextPoint(x00, y00);
+-    };
+-  }
+-  var d3_geo_pathBoundsX0, d3_geo_pathBoundsY0, d3_geo_pathBoundsX1, d3_geo_pathBoundsY1;
+-  var d3_geo_pathBounds = {
+-    point: d3_geo_pathBoundsPoint,
+-    lineStart: d3_noop,
+-    lineEnd: d3_noop,
+-    polygonStart: d3_noop,
+-    polygonEnd: d3_noop
+-  };
+-  function d3_geo_pathBoundsPoint(x, y) {
+-    if (x < d3_geo_pathBoundsX0) d3_geo_pathBoundsX0 = x;
+-    if (x > d3_geo_pathBoundsX1) d3_geo_pathBoundsX1 = x;
+-    if (y < d3_geo_pathBoundsY0) d3_geo_pathBoundsY0 = y;
+-    if (y > d3_geo_pathBoundsY1) d3_geo_pathBoundsY1 = y;
+-  }
+-  function d3_geo_pathBuffer() {
+-    var pointCircle = d3_geo_pathBufferCircle(4.5), buffer = [];
+-    var stream = {
+-      point: point,
+-      lineStart: function() {
+-        stream.point = pointLineStart;
+-      },
+-      lineEnd: lineEnd,
+-      polygonStart: function() {
+-        stream.lineEnd = lineEndPolygon;
+-      },
+-      polygonEnd: function() {
+-        stream.lineEnd = lineEnd;
+-        stream.point = point;
+-      },
+-      pointRadius: function(_) {
+-        pointCircle = d3_geo_pathBufferCircle(_);
+-        return stream;
+-      },
+-      result: function() {
+-        if (buffer.length) {
+-          var result = buffer.join("");
+-          buffer = [];
+-          return result;
+-        }
+-      }
+-    };
+-    function point(x, y) {
+-      buffer.push("M", x, ",", y, pointCircle);
+-    }
+-    function pointLineStart(x, y) {
+-      buffer.push("M", x, ",", y);
+-      stream.point = pointLine;
+-    }
+-    function pointLine(x, y) {
+-      buffer.push("L", x, ",", y);
+-    }
+-    function lineEnd() {
+-      stream.point = point;
+-    }
+-    function lineEndPolygon() {
+-      buffer.push("Z");
+-    }
+-    return stream;
+-  }
+-  function d3_geo_pathBufferCircle(radius) {
+-    return "m0," + radius + "a" + radius + "," + radius + " 0 1,1 0," + -2 * radius + "a" + radius + "," + radius + " 0 1,1 0," + 2 * radius + "z";
+-  }
+-  var d3_geo_pathCentroid = {
+-    point: d3_geo_pathCentroidPoint,
+-    lineStart: d3_geo_pathCentroidLineStart,
+-    lineEnd: d3_geo_pathCentroidLineEnd,
+-    polygonStart: function() {
+-      d3_geo_pathCentroid.lineStart = d3_geo_pathCentroidRingStart;
+-    },
+-    polygonEnd: function() {
+-      d3_geo_pathCentroid.point = d3_geo_pathCentroidPoint;
+-      d3_geo_pathCentroid.lineStart = d3_geo_pathCentroidLineStart;
+-      d3_geo_pathCentroid.lineEnd = d3_geo_pathCentroidLineEnd;
+-    }
+-  };
+-  function d3_geo_pathCentroidPoint(x, y) {
+-    d3_geo_centroidX0 += x;
+-    d3_geo_centroidY0 += y;
+-    ++d3_geo_centroidZ0;
+-  }
+-  function d3_geo_pathCentroidLineStart() {
+-    var x0, y0;
+-    d3_geo_pathCentroid.point = function(x, y) {
+-      d3_geo_pathCentroid.point = nextPoint;
+-      d3_geo_pathCentroidPoint(x0 = x, y0 = y);
+-    };
+-    function nextPoint(x, y) {
+-      var dx = x - x0, dy = y - y0, z = Math.sqrt(dx * dx + dy * dy);
+-      d3_geo_centroidX1 += z * (x0 + x) / 2;
+-      d3_geo_centroidY1 += z * (y0 + y) / 2;
+-      d3_geo_centroidZ1 += z;
+-      d3_geo_pathCentroidPoint(x0 = x, y0 = y);
+-    }
+-  }
+-  function d3_geo_pathCentroidLineEnd() {
+-    d3_geo_pathCentroid.point = d3_geo_pathCentroidPoint;
+-  }
+-  function d3_geo_pathCentroidRingStart() {
+-    var x00, y00, x0, y0;
+-    d3_geo_pathCentroid.point = function(x, y) {
+-      d3_geo_pathCentroid.point = nextPoint;
+-      d3_geo_pathCentroidPoint(x00 = x0 = x, y00 = y0 = y);
+-    };
+-    function nextPoint(x, y) {
+-      var dx = x - x0, dy = y - y0, z = Math.sqrt(dx * dx + dy * dy);
+-      d3_geo_centroidX1 += z * (x0 + x) / 2;
+-      d3_geo_centroidY1 += z * (y0 + y) / 2;
+-      d3_geo_centroidZ1 += z;
+-      z = y0 * x - x0 * y;
+-      d3_geo_centroidX2 += z * (x0 + x);
+-      d3_geo_centroidY2 += z * (y0 + y);
+-      d3_geo_centroidZ2 += z * 3;
+-      d3_geo_pathCentroidPoint(x0 = x, y0 = y);
+-    }
+-    d3_geo_pathCentroid.lineEnd = function() {
+-      nextPoint(x00, y00);
+-    };
+-  }
+-  function d3_geo_pathContext(context) {
+-    var pointRadius = 4.5;
+-    var stream = {
+-      point: point,
+-      lineStart: function() {
+-        stream.point = pointLineStart;
+-      },
+-      lineEnd: lineEnd,
+-      polygonStart: function() {
+-        stream.lineEnd = lineEndPolygon;
+-      },
+-      polygonEnd: function() {
+-        stream.lineEnd = lineEnd;
+-        stream.point = point;
+-      },
+-      pointRadius: function(_) {
+-        pointRadius = _;
+-        return stream;
+-      },
+-      result: d3_noop
+-    };
+-    function point(x, y) {
+-      context.moveTo(x, y);
+-      context.arc(x, y, pointRadius, 0, 2 * π);
+-    }
+-    function pointLineStart(x, y) {
+-      context.moveTo(x, y);
+-      stream.point = pointLine;
+-    }
+-    function pointLine(x, y) {
+-      context.lineTo(x, y);
+-    }
+-    function lineEnd() {
+-      stream.point = point;
+-    }
+-    function lineEndPolygon() {
+-      context.closePath();
+-    }
+-    return stream;
+-  }
+-  function d3_geo_resample(project) {
+-    var δ2 = .5, cosMinDistance = Math.cos(30 * d3_radians), maxDepth = 16;
+-    function resample(stream) {
+-      var λ00, φ00, x00, y00, a00, b00, c00, λ0, x0, y0, a0, b0, c0;
+-      var resample = {
+-        point: point,
+-        lineStart: lineStart,
+-        lineEnd: lineEnd,
+-        polygonStart: function() {
+-          stream.polygonStart();
+-          resample.lineStart = ringStart;
+-        },
+-        polygonEnd: function() {
+-          stream.polygonEnd();
+-          resample.lineStart = lineStart;
+-        }
+-      };
+-      function point(x, y) {
+-        x = project(x, y);
+-        stream.point(x[0], x[1]);
+-      }
+-      function lineStart() {
+-        x0 = NaN;
+-        resample.point = linePoint;
+-        stream.lineStart();
+-      }
+-      function linePoint(λ, φ) {
+-        var c = d3_geo_cartesian([ λ, φ ]), p = project(λ, φ);
+-        resampleLineTo(x0, y0, λ0, a0, b0, c0, x0 = p[0], y0 = p[1], λ0 = λ, a0 = c[0], b0 = c[1], c0 = c[2], maxDepth, stream);
+-        stream.point(x0, y0);
+-      }
+-      function lineEnd() {
+-        resample.point = point;
+-        stream.lineEnd();
+-      }
+-      function ringStart() {
+-        lineStart();
+-        resample.point = ringPoint;
+-        resample.lineEnd = ringEnd;
+-      }
+-      function ringPoint(λ, φ) {
+-        linePoint(λ00 = λ, φ00 = φ), x00 = x0, y00 = y0, a00 = a0, b00 = b0, c00 = c0;
+-        resample.point = linePoint;
+-      }
+-      function ringEnd() {
+-        resampleLineTo(x0, y0, λ0, a0, b0, c0, x00, y00, λ00, a00, b00, c00, maxDepth, stream);
+-        resample.lineEnd = lineEnd;
+-        lineEnd();
+-      }
+-      return resample;
+-    }
+-    function resampleLineTo(x0, y0, λ0, a0, b0, c0, x1, y1, λ1, a1, b1, c1, depth, stream) {
+-      var dx = x1 - x0, dy = y1 - y0, d2 = dx * dx + dy * dy;
+-      if (d2 > 4 * δ2 && depth--) {
+-        var a = a0 + a1, b = b0 + b1, c = c0 + c1, m = Math.sqrt(a * a + b * b + c * c), φ2 = Math.asin(c /= m), λ2 = Math.abs(Math.abs(c) - 1) < ε ? (λ0 + λ1) / 2 : Math.atan2(b, a), p = project(λ2, φ2), x2 = p[0], y2 = p[1], dx2 = x2 - x0, dy2 = y2 - y0, dz = dy * dx2 - dx * dy2;
+-        if (dz * dz / d2 > δ2 || Math.abs((dx * dx2 + dy * dy2) / d2 - .5) > .3 || a0 * a1 + b0 * b1 + c0 * c1 < cosMinDistance) {
+-          resampleLineTo(x0, y0, λ0, a0, b0, c0, x2, y2, λ2, a /= m, b /= m, c, depth, stream);
+-          stream.point(x2, y2);
+-          resampleLineTo(x2, y2, λ2, a, b, c, x1, y1, λ1, a1, b1, c1, depth, stream);
+-        }
+-      }
+-    }
+-    resample.precision = function(_) {
+-      if (!arguments.length) return Math.sqrt(δ2);
+-      maxDepth = (δ2 = _ * _) > 0 && 16;
+-      return resample;
+-    };
+-    return resample;
+-  }
+-  d3.geo.path = function() {
+-    var pointRadius = 4.5, projection, context, projectStream, contextStream, cacheStream;
+-    function path(object) {
+-      if (object) {
+-        if (typeof pointRadius === "function") contextStream.pointRadius(+pointRadius.apply(this, arguments));
+-        if (!cacheStream || !cacheStream.valid) cacheStream = projectStream(contextStream);
+-        d3.geo.stream(object, cacheStream);
+-      }
+-      return contextStream.result();
+-    }
+-    path.area = function(object) {
+-      d3_geo_pathAreaSum = 0;
+-      d3.geo.stream(object, projectStream(d3_geo_pathArea));
+-      return d3_geo_pathAreaSum;
+-    };
+-    path.centroid = function(object) {
+-      d3_geo_centroidX0 = d3_geo_centroidY0 = d3_geo_centroidZ0 = d3_geo_centroidX1 = d3_geo_centroidY1 = d3_geo_centroidZ1 = d3_geo_centroidX2 = d3_geo_centroidY2 = d3_geo_centroidZ2 = 0;
+-      d3.geo.stream(object, projectStream(d3_geo_pathCentroid));
+-      return d3_geo_centroidZ2 ? [ d3_geo_centroidX2 / d3_geo_centroidZ2, d3_geo_centroidY2 / d3_geo_centroidZ2 ] : d3_geo_centroidZ1 ? [ d3_geo_centroidX1 / d3_geo_centroidZ1, d3_geo_centroidY1 / d3_geo_centroidZ1 ] : d3_geo_centroidZ0 ? [ d3_geo_centroidX0 / d3_geo_centroidZ0, d3_geo_centroidY0 / d3_geo_centroidZ0 ] : [ NaN, NaN ];
+-    };
+-    path.bounds = function(object) {
+-      d3_geo_pathBoundsX1 = d3_geo_pathBoundsY1 = -(d3_geo_pathBoundsX0 = d3_geo_pathBoundsY0 = Infinity);
+-      d3.geo.stream(object, projectStream(d3_geo_pathBounds));
+-      return [ [ d3_geo_pathBoundsX0, d3_geo_pathBoundsY0 ], [ d3_geo_pathBoundsX1, d3_geo_pathBoundsY1 ] ];
+-    };
+-    path.projection = function(_) {
+-      if (!arguments.length) return projection;
+-      projectStream = (projection = _) ? _.stream || d3_geo_pathProjectStream(_) : d3_identity;
+-      return reset();
+-    };
+-    path.context = function(_) {
+-      if (!arguments.length) return context;
+-      contextStream = (context = _) == null ? new d3_geo_pathBuffer() : new d3_geo_pathContext(_);
+-      if (typeof pointRadius !== "function") contextStream.pointRadius(pointRadius);
+-      return reset();
+-    };
+-    path.pointRadius = function(_) {
+-      if (!arguments.length) return pointRadius;
+-      pointRadius = typeof _ === "function" ? _ : (contextStream.pointRadius(+_), +_);
+-      return path;
+-    };
+-    function reset() {
+-      cacheStream = null;
+-      return path;
+-    }
+-    return path.projection(d3.geo.albersUsa()).context(null);
+-  };
+-  function d3_geo_pathProjectStream(project) {
+-    var resample = d3_geo_resample(function(λ, φ) {
+-      return project([ λ * d3_degrees, φ * d3_degrees ]);
+-    });
+-    return function(stream) {
+-      stream = resample(stream);
+-      return {
+-        point: function(λ, φ) {
+-          stream.point(λ * d3_radians, φ * d3_radians);
+-        },
+-        sphere: function() {
+-          stream.sphere();
+-        },
+-        lineStart: function() {
+-          stream.lineStart();
+-        },
+-        lineEnd: function() {
+-          stream.lineEnd();
+-        },
+-        polygonStart: function() {
+-          stream.polygonStart();
+-        },
+-        polygonEnd: function() {
+-          stream.polygonEnd();
+-        }
+-      };
+-    };
+-  }
+-  d3.geo.projection = d3_geo_projection;
+-  d3.geo.projectionMutator = d3_geo_projectionMutator;
+-  function d3_geo_projection(project) {
+-    return d3_geo_projectionMutator(function() {
+-      return project;
+-    })();
+-  }
+-  function d3_geo_projectionMutator(projectAt) {
+-    var project, rotate, projectRotate, projectResample = d3_geo_resample(function(x, y) {
+-      x = project(x, y);
+-      return [ x[0] * k + δx, δy - x[1] * k ];
+-    }), k = 150, x = 480, y = 250, λ = 0, φ = 0, δλ = 0, δφ = 0, δγ = 0, δx, δy, preclip = d3_geo_clipAntimeridian, postclip = d3_identity, clipAngle = null, clipExtent = null, stream;
+-    function projection(point) {
+-      point = projectRotate(point[0] * d3_radians, point[1] * d3_radians);
+-      return [ point[0] * k + δx, δy - point[1] * k ];
+-    }
+-    function invert(point) {
+-      point = projectRotate.invert((point[0] - δx) / k, (δy - point[1]) / k);
+-      return point && [ point[0] * d3_degrees, point[1] * d3_degrees ];
+-    }
+-    projection.stream = function(output) {
+-      if (stream) stream.valid = false;
+-      stream = d3_geo_projectionRadiansRotate(rotate, preclip(projectResample(postclip(output))));
+-      stream.valid = true;
+-      return stream;
+-    };
+-    projection.clipAngle = function(_) {
+-      if (!arguments.length) return clipAngle;
+-      preclip = _ == null ? (clipAngle = _, d3_geo_clipAntimeridian) : d3_geo_clipCircle((clipAngle = +_) * d3_radians);
+-      return invalidate();
+-    };
+-    projection.clipExtent = function(_) {
+-      if (!arguments.length) return clipExtent;
+-      clipExtent = _;
+-      postclip = _ == null ? d3_identity : d3_geo_clipView(_[0][0], _[0][1], _[1][0], _[1][1]);
+-      return invalidate();
+-    };
+-    projection.scale = function(_) {
+-      if (!arguments.length) return k;
+-      k = +_;
+-      return reset();
+-    };
+-    projection.translate = function(_) {
+-      if (!arguments.length) return [ x, y ];
+-      x = +_[0];
+-      y = +_[1];
+-      return reset();
+-    };
+-    projection.center = function(_) {
+-      if (!arguments.length) return [ λ * d3_degrees, φ * d3_degrees ];
+-      λ = _[0] % 360 * d3_radians;
+-      φ = _[1] % 360 * d3_radians;
+-      return reset();
+-    };
+-    projection.rotate = function(_) {
+-      if (!arguments.length) return [ δλ * d3_degrees, δφ * d3_degrees, δγ * d3_degrees ];
+-      δλ = _[0] % 360 * d3_radians;
+-      δφ = _[1] % 360 * d3_radians;
+-      δγ = _.length > 2 ? _[2] % 360 * d3_radians : 0;
+-      return reset();
+-    };
+-    d3.rebind(projection, projectResample, "precision");
+-    function reset() {
+-      projectRotate = d3_geo_compose(rotate = d3_geo_rotation(δλ, δφ, δγ), project);
+-      var center = project(λ, φ);
+-      δx = x - center[0] * k;
+-      δy = y + center[1] * k;
+-      return invalidate();
+-    }
+-    function invalidate() {
+-      if (stream) {
+-        stream.valid = false;
+-        stream = null;
+-      }
+-      return projection;
+-    }
+-    return function() {
+-      project = projectAt.apply(this, arguments);
+-      projection.invert = project.invert && invert;
+-      return reset();
+-    };
+-  }
+-  function d3_geo_projectionRadiansRotate(rotate, stream) {
+-    return {
+-      point: function(x, y) {
+-        y = rotate(x * d3_radians, y * d3_radians), x = y[0];
+-        stream.point(x > π ? x - 2 * π : x < -π ? x + 2 * π : x, y[1]);
+-      },
+-      sphere: function() {
+-        stream.sphere();
+-      },
+-      lineStart: function() {
+-        stream.lineStart();
+-      },
+-      lineEnd: function() {
+-        stream.lineEnd();
+-      },
+-      polygonStart: function() {
+-        stream.polygonStart();
+-      },
+-      polygonEnd: function() {
+-        stream.polygonEnd();
+-      }
+-    };
+-  }
+-  function d3_geo_equirectangular(λ, φ) {
+-    return [ λ, φ ];
+-  }
+-  (d3.geo.equirectangular = function() {
+-    return d3_geo_projection(d3_geo_equirectangular);
+-  }).raw = d3_geo_equirectangular.invert = d3_geo_equirectangular;
+-  d3.geo.rotation = function(rotate) {
+-    rotate = d3_geo_rotation(rotate[0] % 360 * d3_radians, rotate[1] * d3_radians, rotate.length > 2 ? rotate[2] * d3_radians : 0);
+-    function forward(coordinates) {
+-      coordinates = rotate(coordinates[0] * d3_radians, coordinates[1] * d3_radians);
+-      return coordinates[0] *= d3_degrees, coordinates[1] *= d3_degrees, coordinates;
+-    }
+-    forward.invert = function(coordinates) {
+-      coordinates = rotate.invert(coordinates[0] * d3_radians, coordinates[1] * d3_radians);
+-      return coordinates[0] *= d3_degrees, coordinates[1] *= d3_degrees, coordinates;
+-    };
+-    return forward;
+-  };
+-  function d3_geo_rotation(δλ, δφ, δγ) {
+-    return δλ ? δφ || δγ ? d3_geo_compose(d3_geo_rotationλ(δλ), d3_geo_rotationφγ(δφ, δγ)) : d3_geo_rotationλ(δλ) : δφ || δγ ? d3_geo_rotationφγ(δφ, δγ) : d3_geo_equirectangular;
+-  }
+-  function d3_geo_forwardRotationλ(δλ) {
+-    return function(λ, φ) {
+-      return λ += δλ, [ λ > π ? λ - 2 * π : λ < -π ? λ + 2 * π : λ, φ ];
+-    };
+-  }
+-  function d3_geo_rotationλ(δλ) {
+-    var rotation = d3_geo_forwardRotationλ(δλ);
+-    rotation.invert = d3_geo_forwardRotationλ(-δλ);
+-    return rotation;
+-  }
+-  function d3_geo_rotationφγ(δφ, δγ) {
+-    var cosδφ = Math.cos(δφ), sinδφ = Math.sin(δφ), cosδγ = Math.cos(δγ), sinδγ = Math.sin(δγ);
+-    function rotation(λ, φ) {
+-      var cosφ = Math.cos(φ), x = Math.cos(λ) * cosφ, y = Math.sin(λ) * cosφ, z = Math.sin(φ), k = z * cosδφ + x * sinδφ;
+-      return [ Math.atan2(y * cosδγ - k * sinδγ, x * cosδφ - z * sinδφ), d3_asin(k * cosδγ + y * sinδγ) ];
+-    }
+-    rotation.invert = function(λ, φ) {
+-      var cosφ = Math.cos(φ), x = Math.cos(λ) * cosφ, y = Math.sin(λ) * cosφ, z = Math.sin(φ), k = z * cosδγ - y * sinδγ;
+-      return [ Math.atan2(y * cosδγ + z * sinδγ, x * cosδφ + k * sinδφ), d3_asin(k * cosδφ - x * sinδφ) ];
+-    };
+-    return rotation;
+-  }
+-  d3.geo.circle = function() {
+-    var origin = [ 0, 0 ], angle, precision = 6, interpolate;
+-    function circle() {
+-      var center = typeof origin === "function" ? origin.apply(this, arguments) : origin, rotate = d3_geo_rotation(-center[0] * d3_radians, -center[1] * d3_radians, 0).invert, ring = [];
+-      interpolate(null, null, 1, {
+-        point: function(x, y) {
+-          ring.push(x = rotate(x, y));
+-          x[0] *= d3_degrees, x[1] *= d3_degrees;
+-        }
+-      });
+-      return {
+-        type: "Polygon",
+-        coordinates: [ ring ]
+-      };
+-    }
+-    circle.origin = function(x) {
+-      if (!arguments.length) return origin;
+-      origin = x;
+-      return circle;
+-    };
+-    circle.angle = function(x) {
+-      if (!arguments.length) return angle;
+-      interpolate = d3_geo_circleInterpolate((angle = +x) * d3_radians, precision * d3_radians);
+-      return circle;
+-    };
+-    circle.precision = function(_) {
+-      if (!arguments.length) return precision;
+-      interpolate = d3_geo_circleInterpolate(angle * d3_radians, (precision = +_) * d3_radians);
+-      return circle;
+-    };
+-    return circle.angle(90);
+-  };
+-  function d3_geo_circleInterpolate(radius, precision) {
+-    var cr = Math.cos(radius), sr = Math.sin(radius);
+-    return function(from, to, direction, listener) {
+-      if (from != null) {
+-        from = d3_geo_circleAngle(cr, from);
+-        to = d3_geo_circleAngle(cr, to);
+-        if (direction > 0 ? from < to : from > to) from += direction * 2 * π;
+-      } else {
+-        from = radius + direction * 2 * π;
+-        to = radius;
+-      }
+-      var point;
+-      for (var step = direction * precision, t = from; direction > 0 ? t > to : t < to; t -= step) {
+-        listener.point((point = d3_geo_spherical([ cr, -sr * Math.cos(t), -sr * Math.sin(t) ]))[0], point[1]);
+-      }
+-    };
+-  }
+-  function d3_geo_circleAngle(cr, point) {
+-    var a = d3_geo_cartesian(point);
+-    a[0] -= cr;
+-    d3_geo_cartesianNormalize(a);
+-    var angle = d3_acos(-a[1]);
+-    return ((-a[2] < 0 ? -angle : angle) + 2 * Math.PI - ε) % (2 * Math.PI);
+-  }
+-  d3.geo.distance = function(a, b) {
+-    var Δλ = (b[0] - a[0]) * d3_radians, φ0 = a[1] * d3_radians, φ1 = b[1] * d3_radians, sinΔλ = Math.sin(Δλ), cosΔλ = Math.cos(Δλ), sinφ0 = Math.sin(φ0), cosφ0 = Math.cos(φ0), sinφ1 = Math.sin(φ1), cosφ1 = Math.cos(φ1), t;
+-    return Math.atan2(Math.sqrt((t = cosφ1 * sinΔλ) * t + (t = cosφ0 * sinφ1 - sinφ0 * cosφ1 * cosΔλ) * t), sinφ0 * sinφ1 + cosφ0 * cosφ1 * cosΔλ);
+-  };
+-  d3.geo.graticule = function() {
+-    var x1, x0, X1, X0, y1, y0, Y1, Y0, dx = 10, dy = dx, DX = 90, DY = 360, x, y, X, Y, precision = 2.5;
+-    function graticule() {
+-      return {
+-        type: "MultiLineString",
+-        coordinates: lines()
+-      };
+-    }
+-    function lines() {
+-      return d3.range(Math.ceil(X0 / DX) * DX, X1, DX).map(X).concat(d3.range(Math.ceil(Y0 / DY) * DY, Y1, DY).map(Y)).concat(d3.range(Math.ceil(x0 / dx) * dx, x1, dx).filter(function(x) {
+-        return Math.abs(x % DX) > ε;
+-      }).map(x)).concat(d3.range(Math.ceil(y0 / dy) * dy, y1, dy).filter(function(y) {
+-        return Math.abs(y % DY) > ε;
+-      }).map(y));
+-    }
+-    graticule.lines = function() {
+-      return lines().map(function(coordinates) {
+-        return {
+-          type: "LineString",
+-          coordinates: coordinates
+-        };
+-      });
+-    };
+-    graticule.outline = function() {
+-      return {
+-        type: "Polygon",
+-        coordinates: [ X(X0).concat(Y(Y1).slice(1), X(X1).reverse().slice(1), Y(Y0).reverse().slice(1)) ]
+-      };
+-    };
+-    graticule.extent = function(_) {
+-      if (!arguments.length) return graticule.minorExtent();
+-      return graticule.majorExtent(_).minorExtent(_);
+-    };
+-    graticule.majorExtent = function(_) {
+-      if (!arguments.length) return [ [ X0, Y0 ], [ X1, Y1 ] ];
+-      X0 = +_[0][0], X1 = +_[1][0];
+-      Y0 = +_[0][1], Y1 = +_[1][1];
+-      if (X0 > X1) _ = X0, X0 = X1, X1 = _;
+-      if (Y0 > Y1) _ = Y0, Y0 = Y1, Y1 = _;
+-      return graticule.precision(precision);
+-    };
+-    graticule.minorExtent = function(_) {
+-      if (!arguments.length) return [ [ x0, y0 ], [ x1, y1 ] ];
+-      x0 = +_[0][0], x1 = +_[1][0];
+-      y0 = +_[0][1], y1 = +_[1][1];
+-      if (x0 > x1) _ = x0, x0 = x1, x1 = _;
+-      if (y0 > y1) _ = y0, y0 = y1, y1 = _;
+-      return graticule.precision(precision);
+-    };
+-    graticule.step = function(_) {
+-      if (!arguments.length) return graticule.minorStep();
+-      return graticule.majorStep(_).minorStep(_);
+-    };
+-    graticule.majorStep = function(_) {
+-      if (!arguments.length) return [ DX, DY ];
+-      DX = +_[0], DY = +_[1];
+-      return graticule;
+-    };
+-    graticule.minorStep = function(_) {
+-      if (!arguments.length) return [ dx, dy ];
+-      dx = +_[0], dy = +_[1];
+-      return graticule;
+-    };
+-    graticule.precision = function(_) {
+-      if (!arguments.length) return precision;
+-      precision = +_;
+-      x = d3_geo_graticuleX(y0, y1, 90);
+-      y = d3_geo_graticuleY(x0, x1, precision);
+-      X = d3_geo_graticuleX(Y0, Y1, 90);
+-      Y = d3_geo_graticuleY(X0, X1, precision);
+-      return graticule;
+-    };
+-    return graticule.majorExtent([ [ -180, -90 + ε ], [ 180, 90 - ε ] ]).minorExtent([ [ -180, -80 - ε ], [ 180, 80 + ε ] ]);
+-  };
+-  function d3_geo_graticuleX(y0, y1, dy) {
+-    var y = d3.range(y0, y1 - ε, dy).concat(y1);
+-    return function(x) {
+-      return y.map(function(y) {
+-        return [ x, y ];
+-      });
+-    };
+-  }
+-  function d3_geo_graticuleY(x0, x1, dx) {
+-    var x = d3.range(x0, x1 - ε, dx).concat(x1);
+-    return function(y) {
+-      return x.map(function(x) {
+-        return [ x, y ];
+-      });
+-    };
+-  }
+-  function d3_source(d) {
+-    return d.source;
+-  }
+-  function d3_target(d) {
+-    return d.target;
+-  }
+-  d3.geo.greatArc = function() {
+-    var source = d3_source, source_, target = d3_target, target_;
+-    function greatArc() {
+-      return {
+-        type: "LineString",
+-        coordinates: [ source_ || source.apply(this, arguments), target_ || target.apply(this, arguments) ]
+-      };
+-    }
+-    greatArc.distance = function() {
+-      return d3.geo.distance(source_ || source.apply(this, arguments), target_ || target.apply(this, arguments));
+-    };
+-    greatArc.source = function(_) {
+-      if (!arguments.length) return source;
+-      source = _, source_ = typeof _ === "function" ? null : _;
+-      return greatArc;
+-    };
+-    greatArc.target = function(_) {
+-      if (!arguments.length) return target;
+-      target = _, target_ = typeof _ === "function" ? null : _;
+-      return greatArc;
+-    };
+-    greatArc.precision = function() {
+-      return arguments.length ? greatArc : 0;
+-    };
+-    return greatArc;
+-  };
+-  d3.geo.interpolate = function(source, target) {
+-    return d3_geo_interpolate(source[0] * d3_radians, source[1] * d3_radians, target[0] * d3_radians, target[1] * d3_radians);
+-  };
+-  function d3_geo_interpolate(x0, y0, x1, y1) {
+-    var cy0 = Math.cos(y0), sy0 = Math.sin(y0), cy1 = Math.cos(y1), sy1 = Math.sin(y1), kx0 = cy0 * Math.cos(x0), ky0 = cy0 * Math.sin(x0), kx1 = cy1 * Math.cos(x1), ky1 = cy1 * Math.sin(x1), d = 2 * Math.asin(Math.sqrt(d3_haversin(y1 - y0) + cy0 * cy1 * d3_haversin(x1 - x0))), k = 1 / Math.sin(d);
+-    var interpolate = d ? function(t) {
+-      var B = Math.sin(t *= d) * k, A = Math.sin(d - t) * k, x = A * kx0 + B * kx1, y = A * ky0 + B * ky1, z = A * sy0 + B * sy1;
+-      return [ Math.atan2(y, x) * d3_degrees, Math.atan2(z, Math.sqrt(x * x + y * y)) * d3_degrees ];
+-    } : function() {
+-      return [ x0 * d3_degrees, y0 * d3_degrees ];
+-    };
+-    interpolate.distance = d;
+-    return interpolate;
+-  }
+-  d3.geo.length = function(object) {
+-    d3_geo_lengthSum = 0;
+-    d3.geo.stream(object, d3_geo_length);
+-    return d3_geo_lengthSum;
+-  };
+-  var d3_geo_lengthSum;
+-  var d3_geo_length = {
+-    sphere: d3_noop,
+-    point: d3_noop,
+-    lineStart: d3_geo_lengthLineStart,
+-    lineEnd: d3_noop,
+-    polygonStart: d3_noop,
+-    polygonEnd: d3_noop
+-  };
+-  function d3_geo_lengthLineStart() {
+-    var λ0, sinφ0, cosφ0;
+-    d3_geo_length.point = function(λ, φ) {
+-      λ0 = λ * d3_radians, sinφ0 = Math.sin(φ *= d3_radians), cosφ0 = Math.cos(φ);
+-      d3_geo_length.point = nextPoint;
+-    };
+-    d3_geo_length.lineEnd = function() {
+-      d3_geo_length.point = d3_geo_length.lineEnd = d3_noop;
+-    };
+-    function nextPoint(λ, φ) {
+-      var sinφ = Math.sin(φ *= d3_radians), cosφ = Math.cos(φ), t = Math.abs((λ *= d3_radians) - λ0), cosΔλ = Math.cos(t);
+-      d3_geo_lengthSum += Math.atan2(Math.sqrt((t = cosφ * Math.sin(t)) * t + (t = cosφ0 * sinφ - sinφ0 * cosφ * cosΔλ) * t), sinφ0 * sinφ + cosφ0 * cosφ * cosΔλ);
+-      λ0 = λ, sinφ0 = sinφ, cosφ0 = cosφ;
+-    }
+-  }
+-  function d3_geo_azimuthal(scale, angle) {
+-    function azimuthal(λ, φ) {
+-      var cosλ = Math.cos(λ), cosφ = Math.cos(φ), k = scale(cosλ * cosφ);
+-      return [ k * cosφ * Math.sin(λ), k * Math.sin(φ) ];
+-    }
+-    azimuthal.invert = function(x, y) {
+-      var ρ = Math.sqrt(x * x + y * y), c = angle(ρ), sinc = Math.sin(c), cosc = Math.cos(c);
+-      return [ Math.atan2(x * sinc, ρ * cosc), Math.asin(ρ && y * sinc / ρ) ];
+-    };
+-    return azimuthal;
+-  }
+-  var d3_geo_azimuthalEqualArea = d3_geo_azimuthal(function(cosλcosφ) {
+-    return Math.sqrt(2 / (1 + cosλcosφ));
+-  }, function(ρ) {
+-    return 2 * Math.asin(ρ / 2);
+-  });
+-  (d3.geo.azimuthalEqualArea = function() {
+-    return d3_geo_projection(d3_geo_azimuthalEqualArea);
+-  }).raw = d3_geo_azimuthalEqualArea;
+-  var d3_geo_azimuthalEquidistant = d3_geo_azimuthal(function(cosλcosφ) {
+-    var c = Math.acos(cosλcosφ);
+-    return c && c / Math.sin(c);
+-  }, d3_identity);
+-  (d3.geo.azimuthalEquidistant = function() {
+-    return d3_geo_projection(d3_geo_azimuthalEquidistant);
+-  }).raw = d3_geo_azimuthalEquidistant;
+-  function d3_geo_conicConformal(φ0, φ1) {
+-    var cosφ0 = Math.cos(φ0), t = function(φ) {
+-      return Math.tan(π / 4 + φ / 2);
+-    }, n = φ0 === φ1 ? Math.sin(φ0) : Math.log(cosφ0 / Math.cos(φ1)) / Math.log(t(φ1) / t(φ0)), F = cosφ0 * Math.pow(t(φ0), n) / n;
+-    if (!n) return d3_geo_mercator;
+-    function forward(λ, φ) {
+-      var ρ = Math.abs(Math.abs(φ) - π / 2) < ε ? 0 : F / Math.pow(t(φ), n);
+-      return [ ρ * Math.sin(n * λ), F - ρ * Math.cos(n * λ) ];
+-    }
+-    forward.invert = function(x, y) {
+-      var ρ0_y = F - y, ρ = d3_sgn(n) * Math.sqrt(x * x + ρ0_y * ρ0_y);
+-      return [ Math.atan2(x, ρ0_y) / n, 2 * Math.atan(Math.pow(F / ρ, 1 / n)) - π / 2 ];
+-    };
+-    return forward;
+-  }
+-  (d3.geo.conicConformal = function() {
+-    return d3_geo_conic(d3_geo_conicConformal);
+-  }).raw = d3_geo_conicConformal;
+-  function d3_geo_conicEquidistant(φ0, φ1) {
+-    var cosφ0 = Math.cos(φ0), n = φ0 === φ1 ? Math.sin(φ0) : (cosφ0 - Math.cos(φ1)) / (φ1 - φ0), G = cosφ0 / n + φ0;
+-    if (Math.abs(n) < ε) return d3_geo_equirectangular;
+-    function forward(λ, φ) {
+-      var ρ = G - φ;
+-      return [ ρ * Math.sin(n * λ), G - ρ * Math.cos(n * λ) ];
+-    }
+-    forward.invert = function(x, y) {
+-      var ρ0_y = G - y;
+-      return [ Math.atan2(x, ρ0_y) / n, G - d3_sgn(n) * Math.sqrt(x * x + ρ0_y * ρ0_y) ];
+-    };
+-    return forward;
+-  }
+-  (d3.geo.conicEquidistant = function() {
+-    return d3_geo_conic(d3_geo_conicEquidistant);
+-  }).raw = d3_geo_conicEquidistant;
+-  var d3_geo_gnomonic = d3_geo_azimuthal(function(cosλcosφ) {
+-    return 1 / cosλcosφ;
+-  }, Math.atan);
+-  (d3.geo.gnomonic = function() {
+-    return d3_geo_projection(d3_geo_gnomonic);
+-  }).raw = d3_geo_gnomonic;
+-  function d3_geo_mercator(λ, φ) {
+-    return [ λ, Math.log(Math.tan(π / 4 + φ / 2)) ];
+-  }
+-  d3_geo_mercator.invert = function(x, y) {
+-    return [ x, 2 * Math.atan(Math.exp(y)) - π / 2 ];
+-  };
+-  function d3_geo_mercatorProjection(project) {
+-    var m = d3_geo_projection(project), scale = m.scale, translate = m.translate, clipExtent = m.clipExtent, clipAuto;
+-    m.scale = function() {
+-      var v = scale.apply(m, arguments);
+-      return v === m ? clipAuto ? m.clipExtent(null) : m : v;
+-    };
+-    m.translate = function() {
+-      var v = translate.apply(m, arguments);
+-      return v === m ? clipAuto ? m.clipExtent(null) : m : v;
+-    };
+-    m.clipExtent = function(_) {
+-      var v = clipExtent.apply(m, arguments);
+-      if (v === m) {
+-        if (clipAuto = _ == null) {
+-          var k = π * scale(), t = translate();
+-          clipExtent([ [ t[0] - k, t[1] - k ], [ t[0] + k, t[1] + k ] ]);
+-        }
+-      } else if (clipAuto) {
+-        v = null;
+-      }
+-      return v;
+-    };
+-    return m.clipExtent(null);
+-  }
+-  (d3.geo.mercator = function() {
+-    return d3_geo_mercatorProjection(d3_geo_mercator);
+-  }).raw = d3_geo_mercator;
+-  var d3_geo_orthographic = d3_geo_azimuthal(function() {
+-    return 1;
+-  }, Math.asin);
+-  (d3.geo.orthographic = function() {
+-    return d3_geo_projection(d3_geo_orthographic);
+-  }).raw = d3_geo_orthographic;
+-  var d3_geo_stereographic = d3_geo_azimuthal(function(cosλcosφ) {
+-    return 1 / (1 + cosλcosφ);
+-  }, function(ρ) {
+-    return 2 * Math.atan(ρ);
+-  });
+-  (d3.geo.stereographic = function() {
+-    return d3_geo_projection(d3_geo_stereographic);
+-  }).raw = d3_geo_stereographic;
+-  function d3_geo_transverseMercator(λ, φ) {
+-    var B = Math.cos(φ) * Math.sin(λ);
+-    return [ Math.log((1 + B) / (1 - B)) / 2, Math.atan2(Math.tan(φ), Math.cos(λ)) ];
+-  }
+-  d3_geo_transverseMercator.invert = function(x, y) {
+-    return [ Math.atan2(d3_sinh(x), Math.cos(y)), d3_asin(Math.sin(y) / d3_cosh(x)) ];
+-  };
+-  (d3.geo.transverseMercator = function() {
+-    return d3_geo_mercatorProjection(d3_geo_transverseMercator);
+-  }).raw = d3_geo_transverseMercator;
+-  d3.geom = {};
+-  d3.svg = {};
+-  function d3_svg_line(projection) {
+-    var x = d3_svg_lineX, y = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineLinear, interpolateKey = interpolate.key, tension = .7;
+-    function line(data) {
+-      var segments = [], points = [], i = -1, n = data.length, d, fx = d3_functor(x), fy = d3_functor(y);
+-      function segment() {
+-        segments.push("M", interpolate(projection(points), tension));
+-      }
+-      while (++i < n) {
+-        if (defined.call(this, d = data[i], i)) {
+-          points.push([ +fx.call(this, d, i), +fy.call(this, d, i) ]);
+-        } else if (points.length) {
+-          segment();
+-          points = [];
+-        }
+-      }
+-      if (points.length) segment();
+-      return segments.length ? segments.join("") : null;
+-    }
+-    line.x = function(_) {
+-      if (!arguments.length) return x;
+-      x = _;
+-      return line;
+-    };
+-    line.y = function(_) {
+-      if (!arguments.length) return y;
+-      y = _;
+-      return line;
+-    };
+-    line.defined = function(_) {
+-      if (!arguments.length) return defined;
+-      defined = _;
+-      return line;
+-    };
+-    line.interpolate = function(_) {
+-      if (!arguments.length) return interpolateKey;
+-      if (typeof _ === "function") interpolateKey = interpolate = _; else interpolateKey = (interpolate = d3_svg_lineInterpolators.get(_) || d3_svg_lineLinear).key;
+-      return line;
+-    };
+-    line.tension = function(_) {
+-      if (!arguments.length) return tension;
+-      tension = _;
+-      return line;
+-    };
+-    return line;
+-  }
+-  d3.svg.line = function() {
+-    return d3_svg_line(d3_identity);
+-  };
+-  function d3_svg_lineX(d) {
+-    return d[0];
+-  }
+-  function d3_svg_lineY(d) {
+-    return d[1];
+-  }
+-  var d3_svg_lineInterpolators = d3.map({
+-    linear: d3_svg_lineLinear,
+-    "linear-closed": d3_svg_lineLinearClosed,
+-    step: d3_svg_lineStep,
+-    "step-before": d3_svg_lineStepBefore,
+-    "step-after": d3_svg_lineStepAfter,
+-    basis: d3_svg_lineBasis,
+-    "basis-open": d3_svg_lineBasisOpen,
+-    "basis-closed": d3_svg_lineBasisClosed,
+-    bundle: d3_svg_lineBundle,
+-    cardinal: d3_svg_lineCardinal,
+-    "cardinal-open": d3_svg_lineCardinalOpen,
+-    "cardinal-closed": d3_svg_lineCardinalClosed,
+-    monotone: d3_svg_lineMonotone
+-  });
+-  d3_svg_lineInterpolators.forEach(function(key, value) {
+-    value.key = key;
+-    value.closed = /-closed$/.test(key);
+-  });
+-  function d3_svg_lineLinear(points) {
+-    return points.join("L");
+-  }
+-  function d3_svg_lineLinearClosed(points) {
+-    return d3_svg_lineLinear(points) + "Z";
+-  }
+-  function d3_svg_lineStep(points) {
+-    var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
+-    while (++i < n) path.push("H", (p[0] + (p = points[i])[0]) / 2, "V", p[1]);
+-    if (n > 1) path.push("H", p[0]);
+-    return path.join("");
+-  }
+-  function d3_svg_lineStepBefore(points) {
+-    var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
+-    while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
+-    return path.join("");
+-  }
+-  function d3_svg_lineStepAfter(points) {
+-    var i = 0, n = points.length, p = points[0], path = [ p[0], ",", p[1] ];
+-    while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
+-    return path.join("");
+-  }
+-  function d3_svg_lineCardinalOpen(points, tension) {
+-    return points.length < 4 ? d3_svg_lineLinear(points) : points[1] + d3_svg_lineHermite(points.slice(1, points.length - 1), d3_svg_lineCardinalTangents(points, tension));
+-  }
+-  function d3_svg_lineCardinalClosed(points, tension) {
+-    return points.length < 3 ? d3_svg_lineLinear(points) : points[0] + d3_svg_lineHermite((points.push(points[0]),
+-    points), d3_svg_lineCardinalTangents([ points[points.length - 2] ].concat(points, [ points[1] ]), tension));
+-  }
+-  function d3_svg_lineCardinal(points, tension) {
+-    return points.length < 3 ? d3_svg_lineLinear(points) : points[0] + d3_svg_lineHermite(points, d3_svg_lineCardinalTangents(points, tension));
+-  }
+-  function d3_svg_lineHermite(points, tangents) {
+-    if (tangents.length < 1 || points.length != tangents.length && points.length != tangents.length + 2) {
+-      return d3_svg_lineLinear(points);
+-    }
+-    var quad = points.length != tangents.length, path = "", p0 = points[0], p = points[1], t0 = tangents[0], t = t0, pi = 1;
+-    if (quad) {
+-      path += "Q" + (p[0] - t0[0] * 2 / 3) + "," + (p[1] - t0[1] * 2 / 3) + "," + p[0] + "," + p[1];
+-      p0 = points[1];
+-      pi = 2;
+-    }
+-    if (tangents.length > 1) {
+-      t = tangents[1];
+-      p = points[pi];
+-      pi++;
+-      path += "C" + (p0[0] + t0[0]) + "," + (p0[1] + t0[1]) + "," + (p[0] - t[0]) + "," + (p[1] - t[1]) + "," + p[0] + "," + p[1];
+-      for (var i = 2; i < tangents.length; i++, pi++) {
+-        p = points[pi];
+-        t = tangents[i];
+-        path += "S" + (p[0] - t[0]) + "," + (p[1] - t[1]) + "," + p[0] + "," + p[1];
+-      }
+-    }
+-    if (quad) {
+-      var lp = points[pi];
+-      path += "Q" + (p[0] + t[0] * 2 / 3) + "," + (p[1] + t[1] * 2 / 3) + "," + lp[0] + "," + lp[1];
+-    }
+-    return path;
+-  }
+-  function d3_svg_lineCardinalTangents(points, tension) {
+-    var tangents = [], a = (1 - tension) / 2, p0, p1 = points[0], p2 = points[1], i = 1, n = points.length;
+-    while (++i < n) {
+-      p0 = p1;
+-      p1 = p2;
+-      p2 = points[i];
+-      tangents.push([ a * (p2[0] - p0[0]), a * (p2[1] - p0[1]) ]);
+-    }
+-    return tangents;
+-  }
+-  function d3_svg_lineBasis(points) {
+-    if (points.length < 3) return d3_svg_lineLinear(points);
+-    var i = 1, n = points.length, pi = points[0], x0 = pi[0], y0 = pi[1], px = [ x0, x0, x0, (pi = points[1])[0] ], py = [ y0, y0, y0, pi[1] ], path = [ x0, ",", y0, "L", d3_svg_lineDot4(d3_svg_lineBasisBezier3, px), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, py) ];
+-    points.push(points[n - 1]);
+-    while (++i <= n) {
+-      pi = points[i];
+-      px.shift();
+-      px.push(pi[0]);
+-      py.shift();
+-      py.push(pi[1]);
+-      d3_svg_lineBasisBezier(path, px, py);
+-    }
+-    points.pop();
+-    path.push("L", pi);
+-    return path.join("");
+-  }
+-  function d3_svg_lineBasisOpen(points) {
+-    if (points.length < 4) return d3_svg_lineLinear(points);
+-    var path = [], i = -1, n = points.length, pi, px = [ 0 ], py = [ 0 ];
+-    while (++i < 3) {
+-      pi = points[i];
+-      px.push(pi[0]);
+-      py.push(pi[1]);
+-    }
+-    path.push(d3_svg_lineDot4(d3_svg_lineBasisBezier3, px) + "," + d3_svg_lineDot4(d3_svg_lineBasisBezier3, py));
+-    --i;
+-    while (++i < n) {
+-      pi = points[i];
+-      px.shift();
+-      px.push(pi[0]);
+-      py.shift();
+-      py.push(pi[1]);
+-      d3_svg_lineBasisBezier(path, px, py);
+-    }
+-    return path.join("");
+-  }
+-  function d3_svg_lineBasisClosed(points) {
+-    var path, i = -1, n = points.length, m = n + 4, pi, px = [], py = [];
+-    while (++i < 4) {
+-      pi = points[i % n];
+-      px.push(pi[0]);
+-      py.push(pi[1]);
+-    }
+-    path = [ d3_svg_lineDot4(d3_svg_lineBasisBezier3, px), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, py) ];
+-    --i;
+-    while (++i < m) {
+-      pi = points[i % n];
+-      px.shift();
+-      px.push(pi[0]);
+-      py.shift();
+-      py.push(pi[1]);
+-      d3_svg_lineBasisBezier(path, px, py);
+-    }
+-    return path.join("");
+-  }
+-  function d3_svg_lineBundle(points, tension) {
+-    var n = points.length - 1;
+-    if (n) {
+-      var x0 = points[0][0], y0 = points[0][1], dx = points[n][0] - x0, dy = points[n][1] - y0, i = -1, p, t;
+-      while (++i <= n) {
+-        p = points[i];
+-        t = i / n;
+-        p[0] = tension * p[0] + (1 - tension) * (x0 + t * dx);
+-        p[1] = tension * p[1] + (1 - tension) * (y0 + t * dy);
+-      }
+-    }
+-    return d3_svg_lineBasis(points);
+-  }
+-  function d3_svg_lineDot4(a, b) {
+-    return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3];
+-  }
+-  var d3_svg_lineBasisBezier1 = [ 0, 2 / 3, 1 / 3, 0 ], d3_svg_lineBasisBezier2 = [ 0, 1 / 3, 2 / 3, 0 ], d3_svg_lineBasisBezier3 = [ 0, 1 / 6, 2 / 3, 1 / 6 ];
+-  function d3_svg_lineBasisBezier(path, x, y) {
+-    path.push("C", d3_svg_lineDot4(d3_svg_lineBasisBezier1, x), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier1, y), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier2, x), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier2, y), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, x), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, y));
+-  }
+-  function d3_svg_lineSlope(p0, p1) {
+-    return (p1[1] - p0[1]) / (p1[0] - p0[0]);
+-  }
+-  function d3_svg_lineFiniteDifferences(points) {
+-    var i = 0, j = points.length - 1, m = [], p0 = points[0], p1 = points[1], d = m[0] = d3_svg_lineSlope(p0, p1);
+-    while (++i < j) {
+-      m[i] = (d + (d = d3_svg_lineSlope(p0 = p1, p1 = points[i + 1]))) / 2;
+-    }
+-    m[i] = d;
+-    return m;
+-  }
+-  function d3_svg_lineMonotoneTangents(points) {
+-    var tangents = [], d, a, b, s, m = d3_svg_lineFiniteDifferences(points), i = -1, j = points.length - 1;
+-    while (++i < j) {
+-      d = d3_svg_lineSlope(points[i], points[i + 1]);
+-      if (Math.abs(d) < 1e-6) {
+-        m[i] = m[i + 1] = 0;
+-      } else {
+-        a = m[i] / d;
+-        b = m[i + 1] / d;
+-        s = a * a + b * b;
+-        if (s > 9) {
+-          s = d * 3 / Math.sqrt(s);
+-          m[i] = s * a;
+-          m[i + 1] = s * b;
+-        }
+-      }
+-    }
+-    i = -1;
+-    while (++i <= j) {
+-      s = (points[Math.min(j, i + 1)][0] - points[Math.max(0, i - 1)][0]) / (6 * (1 + m[i] * m[i]));
+-      tangents.push([ s || 0, m[i] * s || 0 ]);
+-    }
+-    return tangents;
+-  }
+-  function d3_svg_lineMonotone(points) {
+-    return points.length < 3 ? d3_svg_lineLinear(points) : points[0] + d3_svg_lineHermite(points, d3_svg_lineMonotoneTangents(points));
+-  }
+-  d3.geom.hull = function(vertices) {
+-    var x = d3_svg_lineX, y = d3_svg_lineY;
+-    if (arguments.length) return hull(vertices);
+-    function hull(data) {
+-      if (data.length < 3) return [];
+-      var fx = d3_functor(x), fy = d3_functor(y), n = data.length, vertices, plen = n - 1, points = [], stack = [], d, i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+-      if (fx === d3_svg_lineX && y === d3_svg_lineY) vertices = data; else for (i = 0,
+-      vertices = []; i < n; ++i) {
+-        vertices.push([ +fx.call(this, d = data[i], i), +fy.call(this, d, i) ]);
+-      }
+-      for (i = 1; i < n; ++i) {
+-        if (vertices[i][1] < vertices[h][1] || vertices[i][1] == vertices[h][1] && vertices[i][0] < vertices[h][0]) h = i;
+-      }
+-      for (i = 0; i < n; ++i) {
+-        if (i === h) continue;
+-        y1 = vertices[i][1] - vertices[h][1];
+-        x1 = vertices[i][0] - vertices[h][0];
+-        points.push({
+-          angle: Math.atan2(y1, x1),
+-          index: i
+-        });
+-      }
+-      points.sort(function(a, b) {
+-        return a.angle - b.angle;
+-      });
+-      a = points[0].angle;
+-      v = points[0].index;
+-      u = 0;
+-      for (i = 1; i < plen; ++i) {
+-        j = points[i].index;
+-        if (a == points[i].angle) {
+-          x1 = vertices[v][0] - vertices[h][0];
+-          y1 = vertices[v][1] - vertices[h][1];
+-          x2 = vertices[j][0] - vertices[h][0];
+-          y2 = vertices[j][1] - vertices[h][1];
+-          if (x1 * x1 + y1 * y1 >= x2 * x2 + y2 * y2) {
+-            points[i].index = -1;
+-            continue;
+-          } else {
+-            points[u].index = -1;
+-          }
+-        }
+-        a = points[i].angle;
+-        u = i;
+-        v = j;
+-      }
+-      stack.push(h);
+-      for (i = 0, j = 0; i < 2; ++j) {
+-        if (points[j].index > -1) {
+-          stack.push(points[j].index);
+-          i++;
+-        }
+-      }
+-      sp = stack.length;
+-      for (;j < plen; ++j) {
+-        if (points[j].index < 0) continue;
+-        while (!d3_geom_hullCCW(stack[sp - 2], stack[sp - 1], points[j].index, vertices)) {
+-          --sp;
+-        }
+-        stack[sp++] = points[j].index;
+-      }
+-      var poly = [];
+-      for (i = sp - 1; i >= 0; --i) poly.push(data[stack[i]]);
+-      return poly;
+-    }
+-    hull.x = function(_) {
+-      return arguments.length ? (x = _, hull) : x;
+-    };
+-    hull.y = function(_) {
+-      return arguments.length ? (y = _, hull) : y;
+-    };
+-    return hull;
+-  };
+-  function d3_geom_hullCCW(i1, i2, i3, v) {
+-    var t, a, b, c, d, e, f;
+-    t = v[i1];
+-    a = t[0];
+-    b = t[1];
+-    t = v[i2];
+-    c = t[0];
+-    d = t[1];
+-    t = v[i3];
+-    e = t[0];
+-    f = t[1];
+-    return (f - b) * (c - a) - (d - b) * (e - a) > 0;
+-  }
+-  d3.geom.polygon = function(coordinates) {
+-    d3_subclass(coordinates, d3_geom_polygonPrototype);
+-    return coordinates;
+-  };
+-  var d3_geom_polygonPrototype = d3.geom.polygon.prototype = [];
+-  d3_geom_polygonPrototype.area = function() {
+-    var i = -1, n = this.length, a, b = this[n - 1], area = 0;
+-    while (++i < n) {
+-      a = b;
+-      b = this[i];
+-      area += a[1] * b[0] - a[0] * b[1];
+-    }
+-    return area * .5;
+-  };
+-  d3_geom_polygonPrototype.centroid = function(k) {
+-    var i = -1, n = this.length, x = 0, y = 0, a, b = this[n - 1], c;
+-    if (!arguments.length) k = -1 / (6 * this.area());
+-    while (++i < n) {
+-      a = b;
+-      b = this[i];
+-      c = a[0] * b[1] - b[0] * a[1];
+-      x += (a[0] + b[0]) * c;
+-      y += (a[1] + b[1]) * c;
+-    }
+-    return [ x * k, y * k ];
+-  };
+-  d3_geom_polygonPrototype.clip = function(subject) {
+-    var input, closed = d3_geom_polygonClosed(subject), i = -1, n = this.length - d3_geom_polygonClosed(this), j, m, a = this[n - 1], b, c, d;
+-    while (++i < n) {
+-      input = subject.slice();
+-      subject.length = 0;
+-      b = this[i];
+-      c = input[(m = input.length - closed) - 1];
+-      j = -1;
+-      while (++j < m) {
+-        d = input[j];
+-        if (d3_geom_polygonInside(d, a, b)) {
+-          if (!d3_geom_polygonInside(c, a, b)) {
+-            subject.push(d3_geom_polygonIntersect(c, d, a, b));
+-          }
+-          subject.push(d);
+-        } else if (d3_geom_polygonInside(c, a, b)) {
+-          subject.push(d3_geom_polygonIntersect(c, d, a, b));
+-        }
+-        c = d;
+-      }
+-      if (closed) subject.push(subject[0]);
+-      a = b;
+-    }
+-    return subject;
+-  };
+-  function d3_geom_polygonInside(p, a, b) {
+-    return (b[0] - a[0]) * (p[1] - a[1]) < (b[1] - a[1]) * (p[0] - a[0]);
+-  }
+-  function d3_geom_polygonIntersect(c, d, a, b) {
+-    var x1 = c[0], x3 = a[0], x21 = d[0] - x1, x43 = b[0] - x3, y1 = c[1], y3 = a[1], y21 = d[1] - y1, y43 = b[1] - y3, ua = (x43 * (y1 - y3) - y43 * (x1 - x3)) / (y43 * x21 - x43 * y21);
+-    return [ x1 + ua * x21, y1 + ua * y21 ];
+-  }
+-  function d3_geom_polygonClosed(coordinates) {
+-    var a = coordinates[0], b = coordinates[coordinates.length - 1];
+-    return !(a[0] - b[0] || a[1] - b[1]);
+-  }
+-  d3.geom.delaunay = function(vertices) {
+-    var edges = vertices.map(function() {
+-      return [];
+-    }), triangles = [];
+-    d3_geom_voronoiTessellate(vertices, function(e) {
+-      edges[e.region.l.index].push(vertices[e.region.r.index]);
+-    });
+-    edges.forEach(function(edge, i) {
+-      var v = vertices[i], cx = v[0], cy = v[1];
+-      edge.forEach(function(v) {
+-        v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+-      });
+-      edge.sort(function(a, b) {
+-        return a.angle - b.angle;
+-      });
+-      for (var j = 0, m = edge.length - 1; j < m; j++) {
+-        triangles.push([ v, edge[j], edge[j + 1] ]);
+-      }
+-    });
+-    return triangles;
+-  };
+-  d3.geom.voronoi = function(points) {
+-    var x = d3_svg_lineX, y = d3_svg_lineY, clipPolygon = null;
+-    if (arguments.length) return voronoi(points);
+-    function voronoi(data) {
+-      var points, polygons = data.map(function() {
+-        return [];
+-      }), fx = d3_functor(x), fy = d3_functor(y), d, i, n = data.length, Z = 1e6;
+-      if (fx === d3_svg_lineX && fy === d3_svg_lineY) points = data; else for (points = new Array(n),
+-      i = 0; i < n; ++i) {
+-        points[i] = [ +fx.call(this, d = data[i], i), +fy.call(this, d, i) ];
+-      }
+-      d3_geom_voronoiTessellate(points, function(e) {
+-        var s1, s2, x1, x2, y1, y2;
+-        if (e.a === 1 && e.b >= 0) {
+-          s1 = e.ep.r;
+-          s2 = e.ep.l;
+-        } else {
+-          s1 = e.ep.l;
+-          s2 = e.ep.r;
+-        }
+-        if (e.a === 1) {
+-          y1 = s1 ? s1.y : -Z;
+-          x1 = e.c - e.b * y1;
+-          y2 = s2 ? s2.y : Z;
+-          x2 = e.c - e.b * y2;
+-        } else {
+-          x1 = s1 ? s1.x : -Z;
+-          y1 = e.c - e.a * x1;
+-          x2 = s2 ? s2.x : Z;
+-          y2 = e.c - e.a * x2;
+-        }
+-        var v1 = [ x1, y1 ], v2 = [ x2, y2 ];
+-        polygons[e.region.l.index].push(v1, v2);
+-        polygons[e.region.r.index].push(v1, v2);
+-      });
+-      polygons = polygons.map(function(polygon, i) {
+-        var cx = points[i][0], cy = points[i][1], angle = polygon.map(function(v) {
+-          return Math.atan2(v[0] - cx, v[1] - cy);
+-        }), order = d3.range(polygon.length).sort(function(a, b) {
+-          return angle[a] - angle[b];
+-        });
+-        return order.filter(function(d, i) {
+-          return !i || angle[d] - angle[order[i - 1]] > ε;
+-        }).map(function(d) {
+-          return polygon[d];
+-        });
+-      });
+-      polygons.forEach(function(polygon, i) {
+-        var n = polygon.length;
+-        if (!n) return polygon.push([ -Z, -Z ], [ -Z, Z ], [ Z, Z ], [ Z, -Z ]);
+-        if (n > 2) return;
+-        var p0 = points[i], p1 = polygon[0], p2 = polygon[1], x0 = p0[0], y0 = p0[1], x1 = p1[0], y1 = p1[1], x2 = p2[0], y2 = p2[1], dx = Math.abs(x2 - x1), dy = y2 - y1;
+-        if (Math.abs(dy) < ε) {
+-          var y = y0 < y1 ? -Z : Z;
+-          polygon.push([ -Z, y ], [ Z, y ]);
+-        } else if (dx < ε) {
+-          var x = x0 < x1 ? -Z : Z;
+-          polygon.push([ x, -Z ], [ x, Z ]);
+-        } else {
+-          var y = (x2 - x1) * (y1 - y0) < (x1 - x0) * (y2 - y1) ? Z : -Z, z = Math.abs(dy) - dx;
+-          if (Math.abs(z) < ε) {
+-            polygon.push([ dy < 0 ? y : -y, y ]);
+-          } else {
+-            if (z > 0) y *= -1;
+-            polygon.push([ -Z, y ], [ Z, y ]);
+-          }
+-        }
+-      });
+-      if (clipPolygon) for (i = 0; i < n; ++i) clipPolygon.clip(polygons[i]);
+-      for (i = 0; i < n; ++i) polygons[i].point = data[i];
+-      return polygons;
+-    }
+-    voronoi.x = function(_) {
+-      return arguments.length ? (x = _, voronoi) : x;
+-    };
+-    voronoi.y = function(_) {
+-      return arguments.length ? (y = _, voronoi) : y;
+-    };
+-    voronoi.clipExtent = function(_) {
+-      if (!arguments.length) return clipPolygon && [ clipPolygon[0], clipPolygon[2] ];
+-      if (_ == null) clipPolygon = null; else {
+-        var x1 = +_[0][0], y1 = +_[0][1], x2 = +_[1][0], y2 = +_[1][1];
+-        clipPolygon = d3.geom.polygon([ [ x1, y1 ], [ x1, y2 ], [ x2, y2 ], [ x2, y1 ] ]);
+-      }
+-      return voronoi;
+-    };
+-    voronoi.size = function(_) {
+-      if (!arguments.length) return clipPolygon && clipPolygon[2];
+-      return voronoi.clipExtent(_ && [ [ 0, 0 ], _ ]);
+-    };
+-    voronoi.links = function(data) {
+-      var points, graph = data.map(function() {
+-        return [];
+-      }), links = [], fx = d3_functor(x), fy = d3_functor(y), d, i, n = data.length;
+-      if (fx === d3_svg_lineX && fy === d3_svg_lineY) points = data; else for (points = new Array(n),
+-      i = 0; i < n; ++i) {
+-        points[i] = [ +fx.call(this, d = data[i], i), +fy.call(this, d, i) ];
+-      }
+-      d3_geom_voronoiTessellate(points, function(e) {
+-        var l = e.region.l.index, r = e.region.r.index;
+-        if (graph[l][r]) return;
+-        graph[l][r] = graph[r][l] = true;
+-        links.push({
+-          source: data[l],
+-          target: data[r]
+-        });
+-      });
+-      return links;
+-    };
+-    voronoi.triangles = function(data) {
+-      if (x === d3_svg_lineX && y === d3_svg_lineY) return d3.geom.delaunay(data);
+-      var points = new Array(n), fx = d3_functor(x), fy = d3_functor(y), d, i = -1, n = data.length;
+-      while (++i < n) {
+-        (points[i] = [ +fx.call(this, d = data[i], i), +fy.call(this, d, i) ]).data = d;
+-      }
+-      return d3.geom.delaunay(points).map(function(triangle) {
+-        return triangle.map(function(point) {
+-          return point.data;
+-        });
+-      });
+-    };
+-    return voronoi;
+-  };
+-  var d3_geom_voronoiOpposite = {
+-    l: "r",
+-    r: "l"
+-  };
+-  function d3_geom_voronoiTessellate(points, callback) {
+-    var Sites = {
+-      list: points.map(function(v, i) {
+-        return {
+-          index: i,
+-          x: v[0],
+-          y: v[1]
+-        };
+-      }).sort(function(a, b) {
+-        return a.y < b.y ? -1 : a.y > b.y ? 1 : a.x < b.x ? -1 : a.x > b.x ? 1 : 0;
+-      }),
+-      bottomSite: null
+-    };
+-    var EdgeList = {
+-      list: [],
+-      leftEnd: null,
+-      rightEnd: null,
+-      init: function() {
+-        EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l");
+-        EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l");
+-        EdgeList.leftEnd.r = EdgeList.rightEnd;
+-        EdgeList.rightEnd.l = EdgeList.leftEnd;
+-        EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd);
+-      },
+-      createHalfEdge: function(edge, side) {
+-        return {
+-          edge: edge,
+-          side: side,
+-          vertex: null,
+-          l: null,
+-          r: null
+-        };
+-      },
+-      insert: function(lb, he) {
+-        he.l = lb;
+-        he.r = lb.r;
+-        lb.r.l = he;
+-        lb.r = he;
+-      },
+-      leftBound: function(p) {
+-        var he = EdgeList.leftEnd;
+-        do {
+-          he = he.r;
+-        } while (he != EdgeList.rightEnd && Geom.rightOf(he, p));
+-        he = he.l;
+-        return he;
+-      },
+-      del: function(he) {
+-        he.l.r = he.r;
+-        he.r.l = he.l;
+-        he.edge = null;
+-      },
+-      right: function(he) {
+-        return he.r;
+-      },
+-      left: function(he) {
+-        return he.l;
+-      },
+-      leftRegion: function(he) {
+-        return he.edge == null ? Sites.bottomSite : he.edge.region[he.side];
+-      },
+-      rightRegion: function(he) {
+-        return he.edge == null ? Sites.bottomSite : he.edge.region[d3_geom_voronoiOpposite[he.side]];
+-      }
+-    };
+-    var Geom = {
+-      bisect: function(s1, s2) {
+-        var newEdge = {
+-          region: {
+-            l: s1,
+-            r: s2
+-          },
+-          ep: {
+-            l: null,
+-            r: null
+-          }
+-        };
+-        var dx = s2.x - s1.x, dy = s2.y - s1.y, adx = dx > 0 ? dx : -dx, ady = dy > 0 ? dy : -dy;
+-        newEdge.c = s1.x * dx + s1.y * dy + (dx * dx + dy * dy) * .5;
+-        if (adx > ady) {
+-          newEdge.a = 1;
+-          newEdge.b = dy / dx;
+-          newEdge.c /= dx;
+-        } else {
+-          newEdge.b = 1;
+-          newEdge.a = dx / dy;
+-          newEdge.c /= dy;
+-        }
+-        return newEdge;
+-      },
+-      intersect: function(el1, el2) {
+-        var e1 = el1.edge, e2 = el2.edge;
+-        if (!e1 || !e2 || e1.region.r == e2.region.r) {
+-          return null;
+-        }
+-        var d = e1.a * e2.b - e1.b * e2.a;
+-        if (Math.abs(d) < 1e-10) {
+-          return null;
+-        }
+-        var xint = (e1.c * e2.b - e2.c * e1.b) / d, yint = (e2.c * e1.a - e1.c * e2.a) / d, e1r = e1.region.r, e2r = e2.region.r, el, e;
+-        if (e1r.y < e2r.y || e1r.y == e2r.y && e1r.x < e2r.x) {
+-          el = el1;
+-          e = e1;
+-        } else {
+-          el = el2;
+-          e = e2;
+-        }
+-        var rightOfSite = xint >= e.region.r.x;
+-        if (rightOfSite && el.side === "l" || !rightOfSite && el.side === "r") {
+-          return null;
+-        }
+-        return {
+-          x: xint,
+-          y: yint
+-        };
+-      },
+-      rightOf: function(he, p) {
+-        var e = he.edge, topsite = e.region.r, rightOfSite = p.x > topsite.x;
+-        if (rightOfSite && he.side === "l") {
+-          return 1;
+-        }
+-        if (!rightOfSite && he.side === "r") {
+-          return 0;
+-        }
+-        if (e.a === 1) {
+-          var dyp = p.y - topsite.y, dxp = p.x - topsite.x, fast = 0, above = 0;
+-          if (!rightOfSite && e.b < 0 || rightOfSite && e.b >= 0) {
+-            above = fast = dyp >= e.b * dxp;
+-          } else {
+-            above = p.x + p.y * e.b > e.c;
+-            if (e.b < 0) {
+-              above = !above;
+-            }
+-            if (!above) {
+-              fast = 1;
+-            }
+-          }
+-          if (!fast) {
+-            var dxs = topsite.x - e.region.l.x;
+-            above = e.b * (dxp * dxp - dyp * dyp) < dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b);
+-            if (e.b < 0) {
+-              above = !above;
+-            }
+-          }
+-        } else {
+-          var yl = e.c - e.a * p.x, t1 = p.y - yl, t2 = p.x - topsite.x, t3 = yl - topsite.y;
+-          above = t1 * t1 > t2 * t2 + t3 * t3;
+-        }
+-        return he.side === "l" ? above : !above;
+-      },
+-      endPoint: function(edge, side, site) {
+-        edge.ep[side] = site;
+-        if (!edge.ep[d3_geom_voronoiOpposite[side]]) return;
+-        callback(edge);
+-      },
+-      distance: function(s, t) {
+-        var dx = s.x - t.x, dy = s.y - t.y;
+-        return Math.sqrt(dx * dx + dy * dy);
+-      }
+-    };
+-    var EventQueue = {
+-      list: [],
+-      insert: function(he, site, offset) {
+-        he.vertex = site;
+-        he.ystar = site.y + offset;
+-        for (var i = 0, list = EventQueue.list, l = list.length; i < l; i++) {
+-          var next = list[i];
+-          if (he.ystar > next.ystar || he.ystar == next.ystar && site.x > next.vertex.x) {
+-            continue;
+-          } else {
+-            break;
+-          }
+-        }
+-        list.splice(i, 0, he);
+-      },
+-      del: function(he) {
+-        for (var i = 0, ls = EventQueue.list, l = ls.length; i < l && ls[i] != he; ++i) {}
+-        ls.splice(i, 1);
+-      },
+-      empty: function() {
+-        return EventQueue.list.length === 0;
+-      },
+-      nextEvent: function(he) {
+-        for (var i = 0, ls = EventQueue.list, l = ls.length; i < l; ++i) {
+-          if (ls[i] == he) return ls[i + 1];
+-        }
+-        return null;
+-      },
+-      min: function() {
+-        var elem = EventQueue.list[0];
+-        return {
+-          x: elem.vertex.x,
+-          y: elem.ystar
+-        };
+-      },
+-      extractMin: function() {
+-        return EventQueue.list.shift();
+-      }
+-    };
+-    EdgeList.init();
+-    Sites.bottomSite = Sites.list.shift();
+-    var newSite = Sites.list.shift(), newIntStar;
+-    var lbnd, rbnd, llbnd, rrbnd, bisector;
+-    var bot, top, temp, p, v;
+-    var e, pm;
+-    while (true) {
+-      if (!EventQueue.empty()) {
+-        newIntStar = EventQueue.min();
+-      }
+-      if (newSite && (EventQueue.empty() || newSite.y < newIntStar.y || newSite.y == newIntStar.y && newSite.x < newIntStar.x)) {
+-        lbnd = EdgeList.leftBound(newSite);
+-        rbnd = EdgeList.right(lbnd);
+-        bot = EdgeList.rightRegion(lbnd);
+-        e = Geom.bisect(bot, newSite);
+-        bisector = EdgeList.createHalfEdge(e, "l");
+-        EdgeList.insert(lbnd, bisector);
+-        p = Geom.intersect(lbnd, bisector);
+-        if (p) {
+-          EventQueue.del(lbnd);
+-          EventQueue.insert(lbnd, p, Geom.distance(p, newSite));
+-        }
+-        lbnd = bisector;
+-        bisector = EdgeList.createHalfEdge(e, "r");
+-        EdgeList.insert(lbnd, bisector);
+-        p = Geom.intersect(bisector, rbnd);
+-        if (p) {
+-          EventQueue.insert(bisector, p, Geom.distance(p, newSite));
+-        }
+-        newSite = Sites.list.shift();
+-      } else if (!EventQueue.empty()) {
+-        lbnd = EventQueue.extractMin();
+-        llbnd = EdgeList.left(lbnd);
+-        rbnd = EdgeList.right(lbnd);
+-        rrbnd = EdgeList.right(rbnd);
+-        bot = EdgeList.leftRegion(lbnd);
+-        top = EdgeList.rightRegion(rbnd);
+-        v = lbnd.vertex;
+-        Geom.endPoint(lbnd.edge, lbnd.side, v);
+-        Geom.endPoint(rbnd.edge, rbnd.side, v);
+-        EdgeList.del(lbnd);
+-        EventQueue.del(rbnd);
+-        EdgeList.del(rbnd);
+-        pm = "l";
+-        if (bot.y > top.y) {
+-          temp = bot;
+-          bot = top;
+-          top = temp;
+-          pm = "r";
+-        }
+-        e = Geom.bisect(bot, top);
+-        bisector = EdgeList.createHalfEdge(e, pm);
+-        EdgeList.insert(llbnd, bisector);
+-        Geom.endPoint(e, d3_geom_voronoiOpposite[pm], v);
+-        p = Geom.intersect(llbnd, bisector);
+-        if (p) {
+-          EventQueue.del(llbnd);
+-          EventQueue.insert(llbnd, p, Geom.distance(p, bot));
+-        }
+-        p = Geom.intersect(bisector, rrbnd);
+-        if (p) {
+-          EventQueue.insert(bisector, p, Geom.distance(p, bot));
+-        }
+-      } else {
+-        break;
+-      }
+-    }
+-    for (lbnd = EdgeList.right(EdgeList.leftEnd); lbnd != EdgeList.rightEnd; lbnd = EdgeList.right(lbnd)) {
+-      callback(lbnd.edge);
+-    }
+-  }
+-  d3.geom.quadtree = function(points, x1, y1, x2, y2) {
+-    var x = d3_svg_lineX, y = d3_svg_lineY, compat;
+-    if (compat = arguments.length) {
+-      x = d3_geom_quadtreeCompatX;
+-      y = d3_geom_quadtreeCompatY;
+-      if (compat === 3) {
+-        y2 = y1;
+-        x2 = x1;
+-        y1 = x1 = 0;
+-      }
+-      return quadtree(points);
+-    }
+-    function quadtree(data) {
+-      var d, fx = d3_functor(x), fy = d3_functor(y), xs, ys, i, n, x1_, y1_, x2_, y2_;
+-      if (x1 != null) {
+-        x1_ = x1, y1_ = y1, x2_ = x2, y2_ = y2;
+-      } else {
+-        x2_ = y2_ = -(x1_ = y1_ = Infinity);
+-        xs = [], ys = [];
+-        n = data.length;
+-        if (compat) for (i = 0; i < n; ++i) {
+-          d = data[i];
+-          if (d.x < x1_) x1_ = d.x;
+-          if (d.y < y1_) y1_ = d.y;
+-          if (d.x > x2_) x2_ = d.x;
+-          if (d.y > y2_) y2_ = d.y;
+-          xs.push(d.x);
+-          ys.push(d.y);
+-        } else for (i = 0; i < n; ++i) {
+-          var x_ = +fx(d = data[i], i), y_ = +fy(d, i);
+-          if (x_ < x1_) x1_ = x_;
+-          if (y_ < y1_) y1_ = y_;
+-          if (x_ > x2_) x2_ = x_;
+-          if (y_ > y2_) y2_ = y_;
+-          xs.push(x_);
+-          ys.push(y_);
+-        }
+-      }
+-      var dx = x2_ - x1_, dy = y2_ - y1_;
+-      if (dx > dy) y2_ = y1_ + dx; else x2_ = x1_ + dy;
+-      function insert(n, d, x, y, x1, y1, x2, y2) {
+-        if (isNaN(x) || isNaN(y)) return;
+-        if (n.leaf) {
+-          var nx = n.x, ny = n.y;
+-          if (nx != null) {
+-            if (Math.abs(nx - x) + Math.abs(ny - y) < .01) {
+-              insertChild(n, d, x, y, x1, y1, x2, y2);
+-            } else {
+-              var nPoint = n.point;
+-              n.x = n.y = n.point = null;
+-              insertChild(n, nPoint, nx, ny, x1, y1, x2, y2);
+-              insertChild(n, d, x, y, x1, y1, x2, y2);
+-            }
+-          } else {
+-            n.x = x, n.y = y, n.point = d;
+-          }
+-        } else {
+-          insertChild(n, d, x, y, x1, y1, x2, y2);
+-        }
+-      }
+-      function insertChild(n, d, x, y, x1, y1, x2, y2) {
+-        var sx = (x1 + x2) * .5, sy = (y1 + y2) * .5, right = x >= sx, bottom = y >= sy, i = (bottom << 1) + right;
+-        n.leaf = false;
+-        n = n.nodes[i] || (n.nodes[i] = d3_geom_quadtreeNode());
+-        if (right) x1 = sx; else x2 = sx;
+-        if (bottom) y1 = sy; else y2 = sy;
+-        insert(n, d, x, y, x1, y1, x2, y2);
+-      }
+-      var root = d3_geom_quadtreeNode();
+-      root.add = function(d) {
+-        insert(root, d, +fx(d, ++i), +fy(d, i), x1_, y1_, x2_, y2_);
+-      };
+-      root.visit = function(f) {
+-        d3_geom_quadtreeVisit(f, root, x1_, y1_, x2_, y2_);
+-      };
+-      i = -1;
+-      if (x1 == null) {
+-        while (++i < n) {
+-          insert(root, data[i], xs[i], ys[i], x1_, y1_, x2_, y2_);
+-        }
+-        --i;
+-      } else data.forEach(root.add);
+-      xs = ys = data = d = null;
+-      return root;
+-    }
+-    quadtree.x = function(_) {
+-      return arguments.length ? (x = _, quadtree) : x;
+-    };
+-    quadtree.y = function(_) {
+-      return arguments.length ? (y = _, quadtree) : y;
+-    };
+-    quadtree.extent = function(_) {
+-      if (!arguments.length) return x1 == null ? null : [ [ x1, y1 ], [ x2, y2 ] ];
+-      if (_ == null) x1 = y1 = x2 = y2 = null; else x1 = +_[0][0], y1 = +_[0][1], x2 = +_[1][0],
+-      y2 = +_[1][1];
+-      return quadtree;
+-    };
+-    quadtree.size = function(_) {
+-      if (!arguments.length) return x1 == null ? null : [ x2 - x1, y2 - y1 ];
+-      if (_ == null) x1 = y1 = x2 = y2 = null; else x1 = y1 = 0, x2 = +_[0], y2 = +_[1];
+-      return quadtree;
+-    };
+-    return quadtree;
+-  };
+-  function d3_geom_quadtreeCompatX(d) {
+-    return d.x;
+-  }
+-  function d3_geom_quadtreeCompatY(d) {
+-    return d.y;
+-  }
+-  function d3_geom_quadtreeNode() {
+-    return {
+-      leaf: true,
+-      nodes: [],
+-      point: null,
+-      x: null,
+-      y: null
+-    };
+-  }
+-  function d3_geom_quadtreeVisit(f, node, x1, y1, x2, y2) {
+-    if (!f(node, x1, y1, x2, y2)) {
+-      var sx = (x1 + x2) * .5, sy = (y1 + y2) * .5, children = node.nodes;
+-      if (children[0]) d3_geom_quadtreeVisit(f, children[0], x1, y1, sx, sy);
+-      if (children[1]) d3_geom_quadtreeVisit(f, children[1], sx, y1, x2, sy);
+-      if (children[2]) d3_geom_quadtreeVisit(f, children[2], x1, sy, sx, y2);
+-      if (children[3]) d3_geom_quadtreeVisit(f, children[3], sx, sy, x2, y2);
+-    }
+-  }
+-  d3.interpolateRgb = d3_interpolateRgb;
+-  function d3_interpolateRgb(a, b) {
+-    a = d3.rgb(a);
+-    b = d3.rgb(b);
+-    var ar = a.r, ag = a.g, ab = a.b, br = b.r - ar, bg = b.g - ag, bb = b.b - ab;
+-    return function(t) {
+-      return "#" + d3_rgb_hex(Math.round(ar + br * t)) + d3_rgb_hex(Math.round(ag + bg * t)) + d3_rgb_hex(Math.round(ab + bb * t));
+-    };
+-  }
+-  d3.interpolateObject = d3_interpolateObject;
+-  function d3_interpolateObject(a, b) {
+-    var i = {}, c = {}, k;
+-    for (k in a) {
+-      if (k in b) {
+-        i[k] = d3_interpolate(a[k], b[k]);
+-      } else {
+-        c[k] = a[k];
+-      }
+-    }
+-    for (k in b) {
+-      if (!(k in a)) {
+-        c[k] = b[k];
+-      }
+-    }
+-    return function(t) {
+-      for (k in i) c[k] = i[k](t);
+-      return c;
+-    };
+-  }
+-  d3.interpolateNumber = d3_interpolateNumber;
+-  function d3_interpolateNumber(a, b) {
+-    b -= a = +a;
+-    return function(t) {
+-      return a + b * t;
+-    };
+-  }
+-  d3.interpolateString = d3_interpolateString;
+-  function d3_interpolateString(a, b) {
+-    var m, i, j, s0 = 0, s1 = 0, s = [], q = [], n, o;
+-    a = a + "", b = b + "";
+-    d3_interpolate_number.lastIndex = 0;
+-    for (i = 0; m = d3_interpolate_number.exec(b); ++i) {
+-      if (m.index) s.push(b.substring(s0, s1 = m.index));
+-      q.push({
+-        i: s.length,
+-        x: m[0]
+-      });
+-      s.push(null);
+-      s0 = d3_interpolate_number.lastIndex;
+-    }
+-    if (s0 < b.length) s.push(b.substring(s0));
+-    for (i = 0, n = q.length; (m = d3_interpolate_number.exec(a)) && i < n; ++i) {
+-      o = q[i];
+-      if (o.x == m[0]) {
+-        if (o.i) {
+-          if (s[o.i + 1] == null) {
+-            s[o.i - 1] += o.x;
+-            s.splice(o.i, 1);
+-            for (j = i + 1; j < n; ++j) q[j].i--;
+-          } else {
+-            s[o.i - 1] += o.x + s[o.i + 1];
+-            s.splice(o.i, 2);
+-            for (j = i + 1; j < n; ++j) q[j].i -= 2;
+-          }
+-        } else {
+-          if (s[o.i + 1] == null) {
+-            s[o.i] = o.x;
+-          } else {
+-            s[o.i] = o.x + s[o.i + 1];
+-            s.splice(o.i + 1, 1);
+-            for (j = i + 1; j < n; ++j) q[j].i--;
+-          }
+-        }
+-        q.splice(i, 1);
+-        n--;
+-        i--;
+-      } else {
+-        o.x = d3_interpolateNumber(parseFloat(m[0]), parseFloat(o.x));
+-      }
+-    }
+-    while (i < n) {
+-      o = q.pop();
+-      if (s[o.i + 1] == null) {
+-        s[o.i] = o.x;
+-      } else {
+-        s[o.i] = o.x + s[o.i + 1];
+-        s.splice(o.i + 1, 1);
+-      }
+-      n--;
+-    }
+-    if (s.length === 1) {
+-      return s[0] == null ? (o = q[0].x, function(t) {
+-        return o(t) + "";
+-      }) : function() {
+-        return b;
+-      };
+-    }
+-    return function(t) {
+-      for (i = 0; i < n; ++i) s[(o = q[i]).i] = o.x(t);
+-      return s.join("");
+-    };
+-  }
+-  var d3_interpolate_number = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;
+-  d3.interpolate = d3_interpolate;
+-  function d3_interpolate(a, b) {
+-    var i = d3.interpolators.length, f;
+-    while (--i >= 0 && !(f = d3.interpolators[i](a, b))) ;
+-    return f;
+-  }
+-  d3.interpolators = [ function(a, b) {
+-    var t = typeof b;
+-    return (t === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) ? d3_interpolateRgb : d3_interpolateString : b instanceof d3_Color ? d3_interpolateRgb : t === "object" ? Array.isArray(b) ? d3_interpolateArray : d3_interpolateObject : d3_interpolateNumber)(a, b);
+-  } ];
+-  d3.interpolateArray = d3_interpolateArray;
+-  function d3_interpolateArray(a, b) {
+-    var x = [], c = [], na = a.length, nb = b.length, n0 = Math.min(a.length, b.length), i;
+-    for (i = 0; i < n0; ++i) x.push(d3_interpolate(a[i], b[i]));
+-    for (;i < na; ++i) c[i] = a[i];
+-    for (;i < nb; ++i) c[i] = b[i];
+-    return function(t) {
+-      for (i = 0; i < n0; ++i) c[i] = x[i](t);
+-      return c;
+-    };
+-  }
+-  var d3_ease_default = function() {
+-    return d3_identity;
+-  };
+-  var d3_ease = d3.map({
+-    linear: d3_ease_default,
+-    poly: d3_ease_poly,
+-    quad: function() {
+-      return d3_ease_quad;
+-    },
+-    cubic: function() {
+-      return d3_ease_cubic;
+-    },
+-    sin: function() {
+-      return d3_ease_sin;
+-    },
+-    exp: function() {
+-      return d3_ease_exp;
+-    },
+-    circle: function() {
+-      return d3_ease_circle;
+-    },
+-    elastic: d3_ease_elastic,
+-    back: d3_ease_back,
+-    bounce: function() {
+-      return d3_ease_bounce;
+-    }
+-  });
+-  var d3_ease_mode = d3.map({
+-    "in": d3_identity,
+-    out: d3_ease_reverse,
+-    "in-out": d3_ease_reflect,
+-    "out-in": function(f) {
+-      return d3_ease_reflect(d3_ease_reverse(f));
+-    }
+-  });
+-  d3.ease = function(name) {
+-    var i = name.indexOf("-"), t = i >= 0 ? name.substring(0, i) : name, m = i >= 0 ? name.substring(i + 1) : "in";
+-    t = d3_ease.get(t) || d3_ease_default;
+-    m = d3_ease_mode.get(m) || d3_identity;
+-    return d3_ease_clamp(m(t.apply(null, Array.prototype.slice.call(arguments, 1))));
+-  };
+-  function d3_ease_clamp(f) {
+-    return function(t) {
+-      return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+-    };
+-  }
+-  function d3_ease_reverse(f) {
+-    return function(t) {
+-      return 1 - f(1 - t);
+-    };
+-  }
+-  function d3_ease_reflect(f) {
+-    return function(t) {
+-      return .5 * (t < .5 ? f(2 * t) : 2 - f(2 - 2 * t));
+-    };
+-  }
+-  function d3_ease_quad(t) {
+-    return t * t;
+-  }
+-  function d3_ease_cubic(t) {
+-    return t * t * t;
+-  }
+-  function d3_ease_cubicInOut(t) {
+-    if (t <= 0) return 0;
+-    if (t >= 1) return 1;
+-    var t2 = t * t, t3 = t2 * t;
+-    return 4 * (t < .5 ? t3 : 3 * (t - t2) + t3 - .75);
+-  }
+-  function d3_ease_poly(e) {
+-    return function(t) {
+-      return Math.pow(t, e);
+-    };
+-  }
+-  function d3_ease_sin(t) {
+-    return 1 - Math.cos(t * π / 2);
+-  }
+-  function d3_ease_exp(t) {
+-    return Math.pow(2, 10 * (t - 1));
+-  }
+-  function d3_ease_circle(t) {
+-    return 1 - Math.sqrt(1 - t * t);
+-  }
+-  function d3_ease_elastic(a, p) {
+-    var s;
+-    if (arguments.length < 2) p = .45;
+-    if (arguments.length) s = p / (2 * π) * Math.asin(1 / a); else a = 1, s = p / 4;
+-    return function(t) {
+-      return 1 + a * Math.pow(2, 10 * -t) * Math.sin((t - s) * 2 * π / p);
+-    };
+-  }
+-  function d3_ease_back(s) {
+-    if (!s) s = 1.70158;
+-    return function(t) {
+-      return t * t * ((s + 1) * t - s);
+-    };
+-  }
+-  function d3_ease_bounce(t) {
+-    return t < 1 / 2.75 ? 7.5625 * t * t : t < 2 / 2.75 ? 7.5625 * (t -= 1.5 / 2.75) * t + .75 : t < 2.5 / 2.75 ? 7.5625 * (t -= 2.25 / 2.75) * t + .9375 : 7.5625 * (t -= 2.625 / 2.75) * t + .984375;
+-  }
+-  d3.interpolateHcl = d3_interpolateHcl;
+-  function d3_interpolateHcl(a, b) {
+-    a = d3.hcl(a);
+-    b = d3.hcl(b);
+-    var ah = a.h, ac = a.c, al = a.l, bh = b.h - ah, bc = b.c - ac, bl = b.l - al;
+-    if (isNaN(bc)) bc = 0, ac = isNaN(ac) ? b.c : ac;
+-    if (isNaN(bh)) bh = 0, ah = isNaN(ah) ? b.h : ah; else if (bh > 180) bh -= 360; else if (bh < -180) bh += 360;
+-    return function(t) {
+-      return d3_hcl_lab(ah + bh * t, ac + bc * t, al + bl * t) + "";
+-    };
+-  }
+-  d3.interpolateHsl = d3_interpolateHsl;
+-  function d3_interpolateHsl(a, b) {
+-    a = d3.hsl(a);
+-    b = d3.hsl(b);
+-    var ah = a.h, as = a.s, al = a.l, bh = b.h - ah, bs = b.s - as, bl = b.l - al;
+-    if (isNaN(bs)) bs = 0, as = isNaN(as) ? b.s : as;
+-    if (isNaN(bh)) bh = 0, ah = isNaN(ah) ? b.h : ah; else if (bh > 180) bh -= 360; else if (bh < -180) bh += 360;
+-    return function(t) {
+-      return d3_hsl_rgb(ah + bh * t, as + bs * t, al + bl * t) + "";
+-    };
+-  }
+-  d3.interpolateLab = d3_interpolateLab;
+-  function d3_interpolateLab(a, b) {
+-    a = d3.lab(a);
+-    b = d3.lab(b);
+-    var al = a.l, aa = a.a, ab = a.b, bl = b.l - al, ba = b.a - aa, bb = b.b - ab;
+-    return function(t) {
+-      return d3_lab_rgb(al + bl * t, aa + ba * t, ab + bb * t) + "";
+-    };
+-  }
+-  d3.interpolateRound = d3_interpolateRound;
+-  function d3_interpolateRound(a, b) {
+-    b -= a;
+-    return function(t) {
+-      return Math.round(a + b * t);
+-    };
+-  }
+-  d3.transform = function(string) {
+-    var g = d3_document.createElementNS(d3.ns.prefix.svg, "g");
+-    return (d3.transform = function(string) {
+-      if (string != null) {
+-        g.setAttribute("transform", string);
+-        var t = g.transform.baseVal.consolidate();
+-      }
+-      return new d3_transform(t ? t.matrix : d3_transformIdentity);
+-    })(string);
+-  };
+-  function d3_transform(m) {
+-    var r0 = [ m.a, m.b ], r1 = [ m.c, m.d ], kx = d3_transformNormalize(r0), kz = d3_transformDot(r0, r1), ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
+-    if (r0[0] * r1[1] < r1[0] * r0[1]) {
+-      r0[0] *= -1;
+-      r0[1] *= -1;
+-      kx *= -1;
+-      kz *= -1;
+-    }
+-    this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_degrees;
+-    this.translate = [ m.e, m.f ];
+-    this.scale = [ kx, ky ];
+-    this.skew = ky ? Math.atan2(kz, ky) * d3_degrees : 0;
+-  }
+-  d3_transform.prototype.toString = function() {
+-    return "translate(" + this.translate + ")rotate(" + this.rotate + ")skewX(" + this.skew + ")scale(" + this.scale + ")";
+-  };
+-  function d3_transformDot(a, b) {
+-    return a[0] * b[0] + a[1] * b[1];
+-  }
+-  function d3_transformNormalize(a) {
+-    var k = Math.sqrt(d3_transformDot(a, a));
+-    if (k) {
+-      a[0] /= k;
+-      a[1] /= k;
+-    }
+-    return k;
+-  }
+-  function d3_transformCombine(a, b, k) {
+-    a[0] += k * b[0];
+-    a[1] += k * b[1];
+-    return a;
+-  }
+-  var d3_transformIdentity = {
+-    a: 1,
+-    b: 0,
+-    c: 0,
+-    d: 1,
+-    e: 0,
+-    f: 0
+-  };
+-  d3.interpolateTransform = d3_interpolateTransform;
+-  function d3_interpolateTransform(a, b) {
+-    var s = [], q = [], n, A = d3.transform(a), B = d3.transform(b), ta = A.translate, tb = B.translate, ra = A.rotate, rb = B.rotate, wa = A.skew, wb = B.skew, ka = A.scale, kb = B.scale;
+-    if (ta[0] != tb[0] || ta[1] != tb[1]) {
+-      s.push("translate(", null, ",", null, ")");
+-      q.push({
+-        i: 1,
+-        x: d3_interpolateNumber(ta[0], tb[0])
+-      }, {
+-        i: 3,
+-        x: d3_interpolateNumber(ta[1], tb[1])
+-      });
+-    } else if (tb[0] || tb[1]) {
+-      s.push("translate(" + tb + ")");
+-    } else {
+-      s.push("");
+-    }
+-    if (ra != rb) {
+-      if (ra - rb > 180) rb += 360; else if (rb - ra > 180) ra += 360;
+-      q.push({
+-        i: s.push(s.pop() + "rotate(", null, ")") - 2,
+-        x: d3_interpolateNumber(ra, rb)
+-      });
+-    } else if (rb) {
+-      s.push(s.pop() + "rotate(" + rb + ")");
+-    }
+-    if (wa != wb) {
+-      q.push({
+-        i: s.push(s.pop() + "skewX(", null, ")") - 2,
+-        x: d3_interpolateNumber(wa, wb)
+-      });
+-    } else if (wb) {
+-      s.push(s.pop() + "skewX(" + wb + ")");
+-    }
+-    if (ka[0] != kb[0] || ka[1] != kb[1]) {
+-      n = s.push(s.pop() + "scale(", null, ",", null, ")");
+-      q.push({
+-        i: n - 4,
+-        x: d3_interpolateNumber(ka[0], kb[0])
+-      }, {
+-        i: n - 2,
+-        x: d3_interpolateNumber(ka[1], kb[1])
+-      });
+-    } else if (kb[0] != 1 || kb[1] != 1) {
+-      s.push(s.pop() + "scale(" + kb + ")");
+-    }
+-    n = q.length;
+-    return function(t) {
+-      var i = -1, o;
+-      while (++i < n) s[(o = q[i]).i] = o.x(t);
+-      return s.join("");
+-    };
+-  }
+-  function d3_uninterpolateNumber(a, b) {
+-    b = b - (a = +a) ? 1 / (b - a) : 0;
+-    return function(x) {
+-      return (x - a) * b;
+-    };
+-  }
+-  function d3_uninterpolateClamp(a, b) {
+-    b = b - (a = +a) ? 1 / (b - a) : 0;
+-    return function(x) {
+-      return Math.max(0, Math.min(1, (x - a) * b));
+-    };
+-  }
+-  d3.layout = {};
+-  d3.layout.bundle = function() {
+-    return function(links) {
+-      var paths = [], i = -1, n = links.length;
+-      while (++i < n) paths.push(d3_layout_bundlePath(links[i]));
+-      return paths;
+-    };
+-  };
+-  function d3_layout_bundlePath(link) {
+-    var start = link.source, end = link.target, lca = d3_layout_bundleLeastCommonAncestor(start, end), points = [ start ];
+-    while (start !== lca) {
+-      start = start.parent;
+-      points.push(start);
+-    }
+-    var k = points.length;
+-    while (end !== lca) {
+-      points.splice(k, 0, end);
+-      end = end.parent;
+-    }
+-    return points;
+-  }
+-  function d3_layout_bundleAncestors(node) {
+-    var ancestors = [], parent = node.parent;
+-    while (parent != null) {
+-      ancestors.push(node);
+-      node = parent;
+-      parent = parent.parent;
+-    }
+-    ancestors.push(node);
+-    return ancestors;
+-  }
+-  function d3_layout_bundleLeastCommonAncestor(a, b) {
+-    if (a === b) return a;
+-    var aNodes = d3_layout_bundleAncestors(a), bNodes = d3_layout_bundleAncestors(b), aNode = aNodes.pop(), bNode = bNodes.pop(), sharedNode = null;
+-    while (aNode === bNode) {
+-      sharedNode = aNode;
+-      aNode = aNodes.pop();
+-      bNode = bNodes.pop();
+-    }
+-    return sharedNode;
+-  }
+-  d3.layout.chord = function() {
+-    var chord = {}, chords, groups, matrix, n, padding = 0, sortGroups, sortSubgroups, sortChords;
+-    function relayout() {
+-      var subgroups = {}, groupSums = [], groupIndex = d3.range(n), subgroupIndex = [], k, x, x0, i, j;
+-      chords = [];
+-      groups = [];
+-      k = 0, i = -1;
+-      while (++i < n) {
+-        x = 0, j = -1;
+-        while (++j < n) {
+-          x += matrix[i][j];
+-        }
+-        groupSums.push(x);
+-        subgroupIndex.push(d3.range(n));
+-        k += x;
+-      }
+-      if (sortGroups) {
+-        groupIndex.sort(function(a, b) {
+-          return sortGroups(groupSums[a], groupSums[b]);
+-        });
+-      }
+-      if (sortSubgroups) {
+-        subgroupIndex.forEach(function(d, i) {
+-          d.sort(function(a, b) {
+-            return sortSubgroups(matrix[i][a], matrix[i][b]);
+-          });
+-        });
+-      }
+-      k = (2 * π - padding * n) / k;
+-      x = 0, i = -1;
+-      while (++i < n) {
+-        x0 = x, j = -1;
+-        while (++j < n) {
+-          var di = groupIndex[i], dj = subgroupIndex[di][j], v = matrix[di][dj], a0 = x, a1 = x += v * k;
+-          subgroups[di + "-" + dj] = {
+-            index: di,
+-            subindex: dj,
+-            startAngle: a0,
+-            endAngle: a1,
+-            value: v
+-          };
+-        }
+-        groups[di] = {
+-          index: di,
+-          startAngle: x0,
+-          endAngle: x,
+-          value: (x - x0) / k
+-        };
+-        x += padding;
+-      }
+-      i = -1;
+-      while (++i < n) {
+-        j = i - 1;
+-        while (++j < n) {
+-          var source = subgroups[i + "-" + j], target = subgroups[j + "-" + i];
+-          if (source.value || target.value) {
+-            chords.push(source.value < target.value ? {
+-              source: target,
+-              target: source
+-            } : {
+-              source: source,
+-              target: target
+-            });
+-          }
+-        }
+-      }
+-      if (sortChords) resort();
+-    }
+-    function resort() {
+-      chords.sort(function(a, b) {
+-        return sortChords((a.source.value + a.target.value) / 2, (b.source.value + b.target.value) / 2);
+-      });
+-    }
+-    chord.matrix = function(x) {
+-      if (!arguments.length) return matrix;
+-      n = (matrix = x) && matrix.length;
+-      chords = groups = null;
+-      return chord;
+-    };
+-    chord.padding = function(x) {
+-      if (!arguments.length) return padding;
+-      padding = x;
+-      chords = groups = null;
+-      return chord;
+-    };
+-    chord.sortGroups = function(x) {
+-      if (!arguments.length) return sortGroups;
+-      sortGroups = x;
+-      chords = groups = null;
+-      return chord;
+-    };
+-    chord.sortSubgroups = function(x) {
+-      if (!arguments.length) return sortSubgroups;
+-      sortSubgroups = x;
+-      chords = null;
+-      return chord;
+-    };
+-    chord.sortChords = function(x) {
+-      if (!arguments.length) return sortChords;
+-      sortChords = x;
+-      if (chords) resort();
+-      return chord;
+-    };
+-    chord.chords = function() {
+-      if (!chords) relayout();
+-      return chords;
+-    };
+-    chord.groups = function() {
+-      if (!groups) relayout();
+-      return groups;
+-    };
+-    return chord;
+-  };
+-  d3.layout.force = function() {
+-    var force = {}, event = d3.dispatch("start", "tick", "end"), size = [ 1, 1 ], drag, alpha, friction = .9, linkDistance = d3_layout_forceLinkDistance, linkStrength = d3_layout_forceLinkStrength, charge = -30, gravity = .1, theta = .8, nodes = [], links = [], distances, strengths, charges;
+-    function repulse(node) {
+-      return function(quad, x1, _, x2) {
+-        if (quad.point !== node) {
+-          var dx = quad.cx - node.x, dy = quad.cy - node.y, dn = 1 / Math.sqrt(dx * dx + dy * dy);
+-          if ((x2 - x1) * dn < theta) {
+-            var k = quad.charge * dn * dn;
+-            node.px -= dx * k;
+-            node.py -= dy * k;
+-            return true;
+-          }
+-          if (quad.point && isFinite(dn)) {
+-            var k = quad.pointCharge * dn * dn;
+-            node.px -= dx * k;
+-            node.py -= dy * k;
+-          }
+-        }
+-        return !quad.charge;
+-      };
+-    }
+-    force.tick = function() {
+-      if ((alpha *= .99) < .005) {
+-        event.end({
+-          type: "end",
+-          alpha: alpha = 0
+-        });
+-        return true;
+-      }
+-      var n = nodes.length, m = links.length, q, i, o, s, t, l, k, x, y;
+-      for (i = 0; i < m; ++i) {
+-        o = links[i];
+-        s = o.source;
+-        t = o.target;
+-        x = t.x - s.x;
+-        y = t.y - s.y;
+-        if (l = x * x + y * y) {
+-          l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
+-          x *= l;
+-          y *= l;
+-          t.x -= x * (k = s.weight / (t.weight + s.weight));
+-          t.y -= y * k;
+-          s.x += x * (k = 1 - k);
+-          s.y += y * k;
+-        }
+-      }
+-      if (k = alpha * gravity) {
+-        x = size[0] / 2;
+-        y = size[1] / 2;
+-        i = -1;
+-        if (k) while (++i < n) {
+-          o = nodes[i];
+-          o.x += (x - o.x) * k;
+-          o.y += (y - o.y) * k;
+-        }
+-      }
+-      if (charge) {
+-        d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
+-        i = -1;
+-        while (++i < n) {
+-          if (!(o = nodes[i]).fixed) {
+-            q.visit(repulse(o));
+-          }
+-        }
+-      }
+-      i = -1;
+-      while (++i < n) {
+-        o = nodes[i];
+-        if (o.fixed) {
+-          o.x = o.px;
+-          o.y = o.py;
+-        } else {
+-          o.x -= (o.px - (o.px = o.x)) * friction;
+-          o.y -= (o.py - (o.py = o.y)) * friction;
+-        }
+-      }
+-      event.tick({
+-        type: "tick",
+-        alpha: alpha
+-      });
+-    };
+-    force.nodes = function(x) {
+-      if (!arguments.length) return nodes;
+-      nodes = x;
+-      return force;
+-    };
+-    force.links = function(x) {
+-      if (!arguments.length) return links;
+-      links = x;
+-      return force;
+-    };
+-    force.size = function(x) {
+-      if (!arguments.length) return size;
+-      size = x;
+-      return force;
+-    };
+-    force.linkDistance = function(x) {
+-      if (!arguments.length) return linkDistance;
+-      linkDistance = typeof x === "function" ? x : +x;
+-      return force;
+-    };
+-    force.distance = force.linkDistance;
+-    force.linkStrength = function(x) {
+-      if (!arguments.length) return linkStrength;
+-      linkStrength = typeof x === "function" ? x : +x;
+-      return force;
+-    };
+-    force.friction = function(x) {
+-      if (!arguments.length) return friction;
+-      friction = +x;
+-      return force;
+-    };
+-    force.charge = function(x) {
+-      if (!arguments.length) return charge;
+-      charge = typeof x === "function" ? x : +x;
+-      return force;
+-    };
+-    force.gravity = function(x) {
+-      if (!arguments.length) return gravity;
+-      gravity = +x;
+-      return force;
+-    };
+-    force.theta = function(x) {
+-      if (!arguments.length) return theta;
+-      theta = +x;
+-      return force;
+-    };
+-    force.alpha = function(x) {
+-      if (!arguments.length) return alpha;
+-      x = +x;
+-      if (alpha) {
+-        if (x > 0) alpha = x; else alpha = 0;
+-      } else if (x > 0) {
+-        event.start({
+-          type: "start",
+-          alpha: alpha = x
+-        });
+-        d3.timer(force.tick);
+-      }
+-      return force;
+-    };
+-    force.start = function() {
+-      var i, j, n = nodes.length, m = links.length, w = size[0], h = size[1], neighbors, o;
+-      for (i = 0; i < n; ++i) {
+-        (o = nodes[i]).index = i;
+-        o.weight = 0;
+-      }
+-      for (i = 0; i < m; ++i) {
+-        o = links[i];
+-        if (typeof o.source == "number") o.source = nodes[o.source];
+-        if (typeof o.target == "number") o.target = nodes[o.target];
+-        ++o.source.weight;
+-        ++o.target.weight;
+-      }
+-      for (i = 0; i < n; ++i) {
+-        o = nodes[i];
+-        if (isNaN(o.x)) o.x = position("x", w);
+-        if (isNaN(o.y)) o.y = position("y", h);
+-        if (isNaN(o.px)) o.px = o.x;
+-        if (isNaN(o.py)) o.py = o.y;
+-      }
+-      distances = [];
+-      if (typeof linkDistance === "function") for (i = 0; i < m; ++i) distances[i] = +linkDistance.call(this, links[i], i); else for (i = 0; i < m; ++i) distances[i] = linkDistance;
+-      strengths = [];
+-      if (typeof linkStrength === "function") for (i = 0; i < m; ++i) strengths[i] = +linkStrength.call(this, links[i], i); else for (i = 0; i < m; ++i) strengths[i] = linkStrength;
+-      charges = [];
+-      if (typeof charge === "function") for (i = 0; i < n; ++i) charges[i] = +charge.call(this, nodes[i], i); else for (i = 0; i < n; ++i) charges[i] = charge;
+-      function position(dimension, size) {
+-        var neighbors = neighbor(i), j = -1, m = neighbors.length, x;
+-        while (++j < m) if (!isNaN(x = neighbors[j][dimension])) return x;
+-        return Math.random() * size;
+-      }
+-      function neighbor() {
+-        if (!neighbors) {
+-          neighbors = [];
+-          for (j = 0; j < n; ++j) {
+-            neighbors[j] = [];
+-          }
+-          for (j = 0; j < m; ++j) {
+-            var o = links[j];
+-            neighbors[o.source.index].push(o.target);
+-            neighbors[o.target.index].push(o.source);
+-          }
+-        }
+-        return neighbors[i];
+-      }
+-      return force.resume();
+-    };
+-    force.resume = function() {
+-      return force.alpha(.1);
+-    };
+-    force.stop = function() {
+-      return force.alpha(0);
+-    };
+-    force.drag = function() {
+-      if (!drag) drag = d3.behavior.drag().origin(d3_identity).on("dragstart.force", d3_layout_forceDragstart).on("drag.force", dragmove).on("dragend.force", d3_layout_forceDragend);
+-      if (!arguments.length) return drag;
+-      this.on("mouseover.force", d3_layout_forceMouseover).on("mouseout.force", d3_layout_forceMouseout).call(drag);
+-    };
+-    function dragmove(d) {
+-      d.px = d3.event.x, d.py = d3.event.y;
+-      force.resume();
+-    }
+-    return d3.rebind(force, event, "on");
+-  };
+-  function d3_layout_forceDragstart(d) {
+-    d.fixed |= 2;
+-  }
+-  function d3_layout_forceDragend(d) {
+-    d.fixed &= ~6;
+-  }
+-  function d3_layout_forceMouseover(d) {
+-    d.fixed |= 4;
+-    d.px = d.x, d.py = d.y;
+-  }
+-  function d3_layout_forceMouseout(d) {
+-    d.fixed &= ~4;
+-  }
+-  function d3_layout_forceAccumulate(quad, alpha, charges) {
+-    var cx = 0, cy = 0;
+-    quad.charge = 0;
+-    if (!quad.leaf) {
+-      var nodes = quad.nodes, n = nodes.length, i = -1, c;
+-      while (++i < n) {
+-        c = nodes[i];
+-        if (c == null) continue;
+-        d3_layout_forceAccumulate(c, alpha, charges);
+-        quad.charge += c.charge;
+-        cx += c.charge * c.cx;
+-        cy += c.charge * c.cy;
+-      }
+-    }
+-    if (quad.point) {
+-      if (!quad.leaf) {
+-        quad.point.x += Math.random() - .5;
+-        quad.point.y += Math.random() - .5;
+-      }
+-      var k = alpha * charges[quad.point.index];
+-      quad.charge += quad.pointCharge = k;
+-      cx += k * quad.point.x;
+-      cy += k * quad.point.y;
+-    }
+-    quad.cx = cx / quad.charge;
+-    quad.cy = cy / quad.charge;
+-  }
+-  var d3_layout_forceLinkDistance = 20, d3_layout_forceLinkStrength = 1;
+-  d3.layout.hierarchy = function() {
+-    var sort = d3_layout_hierarchySort, children = d3_layout_hierarchyChildren, value = d3_layout_hierarchyValue;
+-    function recurse(node, depth, nodes) {
+-      var childs = children.call(hierarchy, node, depth);
+-      node.depth = depth;
+-      nodes.push(node);
+-      if (childs && (n = childs.length)) {
+-        var i = -1, n, c = node.children = [], v = 0, j = depth + 1, d;
+-        while (++i < n) {
+-          d = recurse(childs[i], j, nodes);
+-          d.parent = node;
+-          c.push(d);
+-          v += d.value;
+-        }
+-        if (sort) c.sort(sort);
+-        if (value) node.value = v;
+-      } else if (value) {
+-        node.value = +value.call(hierarchy, node, depth) || 0;
+-      }
+-      return node;
+-    }
+-    function revalue(node, depth) {
+-      var children = node.children, v = 0;
+-      if (children && (n = children.length)) {
+-        var i = -1, n, j = depth + 1;
+-        while (++i < n) v += revalue(children[i], j);
+-      } else if (value) {
+-        v = +value.call(hierarchy, node, depth) || 0;
+-      }
+-      if (value) node.value = v;
+-      return v;
+-    }
+-    function hierarchy(d) {
+-      var nodes = [];
+-      recurse(d, 0, nodes);
+-      return nodes;
+-    }
+-    hierarchy.sort = function(x) {
+-      if (!arguments.length) return sort;
+-      sort = x;
+-      return hierarchy;
+-    };
+-    hierarchy.children = function(x) {
+-      if (!arguments.length) return children;
+-      children = x;
+-      return hierarchy;
+-    };
+-    hierarchy.value = function(x) {
+-      if (!arguments.length) return value;
+-      value = x;
+-      return hierarchy;
+-    };
+-    hierarchy.revalue = function(root) {
+-      revalue(root, 0);
+-      return root;
+-    };
+-    return hierarchy;
+-  };
+-  function d3_layout_hierarchyRebind(object, hierarchy) {
+-    d3.rebind(object, hierarchy, "sort", "children", "value");
+-    object.nodes = object;
+-    object.links = d3_layout_hierarchyLinks;
+-    return object;
+-  }
+-  function d3_layout_hierarchyChildren(d) {
+-    return d.children;
+-  }
+-  function d3_layout_hierarchyValue(d) {
+-    return d.value;
+-  }
+-  function d3_layout_hierarchySort(a, b) {
+-    return b.value - a.value;
+-  }
+-  function d3_layout_hierarchyLinks(nodes) {
+-    return d3.merge(nodes.map(function(parent) {
+-      return (parent.children || []).map(function(child) {
+-        return {
+-          source: parent,
+-          target: child
+-        };
+-      });
+-    }));
+-  }
+-  d3.layout.partition = function() {
+-    var hierarchy = d3.layout.hierarchy(), size = [ 1, 1 ];
+-    function position(node, x, dx, dy) {
+-      var children = node.children;
+-      node.x = x;
+-      node.y = node.depth * dy;
+-      node.dx = dx;
+-      node.dy = dy;
+-      if (children && (n = children.length)) {
+-        var i = -1, n, c, d;
+-        dx = node.value ? dx / node.value : 0;
+-        while (++i < n) {
+-          position(c = children[i], x, d = c.value * dx, dy);
+-          x += d;
+-        }
+-      }
+-    }
+-    function depth(node) {
+-      var children = node.children, d = 0;
+-      if (children && (n = children.length)) {
+-        var i = -1, n;
+-        while (++i < n) d = Math.max(d, depth(children[i]));
+-      }
+-      return 1 + d;
+-    }
+-    function partition(d, i) {
+-      var nodes = hierarchy.call(this, d, i);
+-      position(nodes[0], 0, size[0], size[1] / depth(nodes[0]));
+-      return nodes;
+-    }
+-    partition.size = function(x) {
+-      if (!arguments.length) return size;
+-      size = x;
+-      return partition;
+-    };
+-    return d3_layout_hierarchyRebind(partition, hierarchy);
+-  };
+-  d3.layout.pie = function() {
+-    var value = Number, sort = d3_layout_pieSortByValue, startAngle = 0, endAngle = 2 * π;
+-    function pie(data) {
+-      var values = data.map(function(d, i) {
+-        return +value.call(pie, d, i);
+-      });
+-      var a = +(typeof startAngle === "function" ? startAngle.apply(this, arguments) : startAngle);
+-      var k = ((typeof endAngle === "function" ? endAngle.apply(this, arguments) : endAngle) - a) / d3.sum(values);
+-      var index = d3.range(data.length);
+-      if (sort != null) index.sort(sort === d3_layout_pieSortByValue ? function(i, j) {
+-        return values[j] - values[i];
+-      } : function(i, j) {
+-        return sort(data[i], data[j]);
+-      });
+-      var arcs = [];
+-      index.forEach(function(i) {
+-        var d;
+-        arcs[i] = {
+-          data: data[i],
+-          value: d = values[i],
+-          startAngle: a,
+-          endAngle: a += d * k
+-        };
+-      });
+-      return arcs;
+-    }
+-    pie.value = function(x) {
+-      if (!arguments.length) return value;
+-      value = x;
+-      return pie;
+-    };
+-    pie.sort = function(x) {
+-      if (!arguments.length) return sort;
+-      sort = x;
+-      return pie;
+-    };
+-    pie.startAngle = function(x) {
+-      if (!arguments.length) return startAngle;
+-      startAngle = x;
+-      return pie;
+-    };
+-    pie.endAngle = function(x) {
+-      if (!arguments.length) return endAngle;
+-      endAngle = x;
+-      return pie;
+-    };
+-    return pie;
+-  };
+-  var d3_layout_pieSortByValue = {};
+-  d3.layout.stack = function() {
+-    var values = d3_identity, order = d3_layout_stackOrderDefault, offset = d3_layout_stackOffsetZero, out = d3_layout_stackOut, x = d3_layout_stackX, y = d3_layout_stackY;
+-    function stack(data, index) {
+-      var series = data.map(function(d, i) {
+-        return values.call(stack, d, i);
+-      });
+-      var points = series.map(function(d) {
+-        return d.map(function(v, i) {
+-          return [ x.call(stack, v, i), y.call(stack, v, i) ];
+-        });
+-      });
+-      var orders = order.call(stack, points, index);
+-      series = d3.permute(series, orders);
+-      points = d3.permute(points, orders);
+-      var offsets = offset.call(stack, points, index);
+-      var n = series.length, m = series[0].length, i, j, o;
+-      for (j = 0; j < m; ++j) {
+-        out.call(stack, series[0][j], o = offsets[j], points[0][j][1]);
+-        for (i = 1; i < n; ++i) {
+-          out.call(stack, series[i][j], o += points[i - 1][j][1], points[i][j][1]);
+-        }
+-      }
+-      return data;
+-    }
+-    stack.values = function(x) {
+-      if (!arguments.length) return values;
+-      values = x;
+-      return stack;
+-    };
+-    stack.order = function(x) {
+-      if (!arguments.length) return order;
+-      order = typeof x === "function" ? x : d3_layout_stackOrders.get(x) || d3_layout_stackOrderDefault;
+-      return stack;
+-    };
+-    stack.offset = function(x) {
+-      if (!arguments.length) return offset;
+-      offset = typeof x === "function" ? x : d3_layout_stackOffsets.get(x) || d3_layout_stackOffsetZero;
+-      return stack;
+-    };
+-    stack.x = function(z) {
+-      if (!arguments.length) return x;
+-      x = z;
+-      return stack;
+-    };
+-    stack.y = function(z) {
+-      if (!arguments.length) return y;
+-      y = z;
+-      return stack;
+-    };
+-    stack.out = function(z) {
+-      if (!arguments.length) return out;
+-      out = z;
+-      return stack;
+-    };
+-    return stack;
+-  };
+-  function d3_layout_stackX(d) {
+-    return d.x;
+-  }
+-  function d3_layout_stackY(d) {
+-    return d.y;
+-  }
+-  function d3_layout_stackOut(d, y0, y) {
+-    d.y0 = y0;
+-    d.y = y;
+-  }
+-  var d3_layout_stackOrders = d3.map({
+-    "inside-out": function(data) {
+-      var n = data.length, i, j, max = data.map(d3_layout_stackMaxIndex), sums = data.map(d3_layout_stackReduceSum), index = d3.range(n).sort(function(a, b) {
+-        return max[a] - max[b];
+-      }), top = 0, bottom = 0, tops = [], bottoms = [];
+-      for (i = 0; i < n; ++i) {
+-        j = index[i];
+-        if (top < bottom) {
+-          top += sums[j];
+-          tops.push(j);
+-        } else {
+-          bottom += sums[j];
+-          bottoms.push(j);
+-        }
+-      }
+-      return bottoms.reverse().concat(tops);
+-    },
+-    reverse: function(data) {
+-      return d3.range(data.length).reverse();
+-    },
+-    "default": d3_layout_stackOrderDefault
+-  });
+-  var d3_layout_stackOffsets = d3.map({
+-    silhouette: function(data) {
+-      var n = data.length, m = data[0].length, sums = [], max = 0, i, j, o, y0 = [];
+-      for (j = 0; j < m; ++j) {
+-        for (i = 0, o = 0; i < n; i++) o += data[i][j][1];
+-        if (o > max) max = o;
+-        sums.push(o);
+-      }
+-      for (j = 0; j < m; ++j) {
+-        y0[j] = (max - sums[j]) / 2;
+-      }
+-      return y0;
+-    },
+-    wiggle: function(data) {
+-      var n = data.length, x = data[0], m = x.length, i, j, k, s1, s2, s3, dx, o, o0, y0 = [];
+-      y0[0] = o = o0 = 0;
+-      for (j = 1; j < m; ++j) {
+-        for (i = 0, s1 = 0; i < n; ++i) s1 += data[i][j][1];
+-        for (i = 0, s2 = 0, dx = x[j][0] - x[j - 1][0]; i < n; ++i) {
+-          for (k = 0, s3 = (data[i][j][1] - data[i][j - 1][1]) / (2 * dx); k < i; ++k) {
+-            s3 += (data[k][j][1] - data[k][j - 1][1]) / dx;
+-          }
+-          s2 += s3 * data[i][j][1];
+-        }
+-        y0[j] = o -= s1 ? s2 / s1 * dx : 0;
+-        if (o < o0) o0 = o;
+-      }
+-      for (j = 0; j < m; ++j) y0[j] -= o0;
+-      return y0;
+-    },
+-    expand: function(data) {
+-      var n = data.length, m = data[0].length, k = 1 / n, i, j, o, y0 = [];
+-      for (j = 0; j < m; ++j) {
+-        for (i = 0, o = 0; i < n; i++) o += data[i][j][1];
+-        if (o) for (i = 0; i < n; i++) data[i][j][1] /= o; else for (i = 0; i < n; i++) data[i][j][1] = k;
+-      }
+-      for (j = 0; j < m; ++j) y0[j] = 0;
+-      return y0;
+-    },
+-    zero: d3_layout_stackOffsetZero
+-  });
+-  function d3_layout_stackOrderDefault(data) {
+-    return d3.range(data.length);
+-  }
+-  function d3_layout_stackOffsetZero(data) {
+-    var j = -1, m = data[0].length, y0 = [];
+-    while (++j < m) y0[j] = 0;
+-    return y0;
+-  }
+-  function d3_layout_stackMaxIndex(array) {
+-    var i = 1, j = 0, v = array[0][1], k, n = array.length;
+-    for (;i < n; ++i) {
+-      if ((k = array[i][1]) > v) {
+-        j = i;
+-        v = k;
+-      }
+-    }
+-    return j;
+-  }
+-  function d3_layout_stackReduceSum(d) {
+-    return d.reduce(d3_layout_stackSum, 0);
+-  }
+-  function d3_layout_stackSum(p, d) {
+-    return p + d[1];
+-  }
+-  d3.layout.histogram = function() {
+-    var frequency = true, valuer = Number, ranger = d3_layout_histogramRange, binner = d3_layout_histogramBinSturges;
+-    function histogram(data, i) {
+-      var bins = [], values = data.map(valuer, this), range = ranger.call(this, values, i), thresholds = binner.call(this, range, values, i), bin, i = -1, n = values.length, m = thresholds.length - 1, k = frequency ? 1 : 1 / n, x;
+-      while (++i < m) {
+-        bin = bins[i] = [];
+-        bin.dx = thresholds[i + 1] - (bin.x = thresholds[i]);
+-        bin.y = 0;
+-      }
+-      if (m > 0) {
+-        i = -1;
+-        while (++i < n) {
+-          x = values[i];
+-          if (x >= range[0] && x <= range[1]) {
+-            bin = bins[d3.bisect(thresholds, x, 1, m) - 1];
+-            bin.y += k;
+-            bin.push(data[i]);
+-          }
+-        }
+-      }
+-      return bins;
+-    }
+-    histogram.value = function(x) {
+-      if (!arguments.length) return valuer;
+-      valuer = x;
+-      return histogram;
+-    };
+-    histogram.range = function(x) {
+-      if (!arguments.length) return ranger;
+-      ranger = d3_functor(x);
+-      return histogram;
+-    };
+-    histogram.bins = function(x) {
+-      if (!arguments.length) return binner;
+-      binner = typeof x === "number" ? function(range) {
+-        return d3_layout_histogramBinFixed(range, x);
+-      } : d3_functor(x);
+-      return histogram;
+-    };
+-    histogram.frequency = function(x) {
+-      if (!arguments.length) return frequency;
+-      frequency = !!x;
+-      return histogram;
+-    };
+-    return histogram;
+-  };
+-  function d3_layout_histogramBinSturges(range, values) {
+-    return d3_layout_histogramBinFixed(range, Math.ceil(Math.log(values.length) / Math.LN2 + 1));
+-  }
+-  function d3_layout_histogramBinFixed(range, n) {
+-    var x = -1, b = +range[0], m = (range[1] - b) / n, f = [];
+-    while (++x <= n) f[x] = m * x + b;
+-    return f;
+-  }
+-  function d3_layout_histogramRange(values) {
+-    return [ d3.min(values), d3.max(values) ];
+-  }
+-  d3.layout.tree = function() {
+-    var hierarchy = d3.layout.hierarchy().sort(null).value(null), separation = d3_layout_treeSeparation, size = [ 1, 1 ], nodeSize = false;
+-    function tree(d, i) {
+-      var nodes = hierarchy.call(this, d, i), root = nodes[0];
+-      function firstWalk(node, previousSibling) {
+-        var children = node.children, layout = node._tree;
+-        if (children && (n = children.length)) {
+-          var n, firstChild = children[0], previousChild, ancestor = firstChild, child, i = -1;
+-          while (++i < n) {
+-            child = children[i];
+-            firstWalk(child, previousChild);
+-            ancestor = apportion(child, previousChild, ancestor);
+-            previousChild = child;
+-          }
+-          d3_layout_treeShift(node);
+-          var midpoint = .5 * (firstChild._tree.prelim + child._tree.prelim);
+-          if (previousSibling) {
+-            layout.prelim = previousSibling._tree.prelim + separation(node, previousSibling);
+-            layout.mod = layout.prelim - midpoint;
+-          } else {
+-            layout.prelim = midpoint;
+-          }
+-        } else {
+-          if (previousSibling) {
+-            layout.prelim = previousSibling._tree.prelim + separation(node, previousSibling);
+-          }
+-        }
+-      }
+-      function secondWalk(node, x) {
+-        node.x = node._tree.prelim + x;
+-        var children = node.children;
+-        if (children && (n = children.length)) {
+-          var i = -1, n;
+-          x += node._tree.mod;
+-          while (++i < n) {
+-            secondWalk(children[i], x);
+-          }
+-        }
+-      }
+-      function apportion(node, previousSibling, ancestor) {
+-        if (previousSibling) {
+-          var vip = node, vop = node, vim = previousSibling, vom = node.parent.children[0], sip = vip._tree.mod, sop = vop._tree.mod, sim = vim._tree.mod, som = vom._tree.mod, shift;
+-          while (vim = d3_layout_treeRight(vim), vip = d3_layout_treeLeft(vip), vim && vip) {
+-            vom = d3_layout_treeLeft(vom);
+-            vop = d3_layout_treeRight(vop);
+-            vop._tree.ancestor = node;
+-            shift = vim._tree.prelim + sim - vip._tree.prelim - sip + separation(vim, vip);
+-            if (shift > 0) {
+-              d3_layout_treeMove(d3_layout_treeAncestor(vim, node, ancestor), node, shift);
+-              sip += shift;
+-              sop += shift;
+-            }
+-            sim += vim._tree.mod;
+-            sip += vip._tree.mod;
+-            som += vom._tree.mod;
+-            sop += vop._tree.mod;
+-          }
+-          if (vim && !d3_layout_treeRight(vop)) {
+-            vop._tree.thread = vim;
+-            vop._tree.mod += sim - sop;
+-          }
+-          if (vip && !d3_layout_treeLeft(vom)) {
+-            vom._tree.thread = vip;
+-            vom._tree.mod += sip - som;
+-            ancestor = node;
+-          }
+-        }
+-        return ancestor;
+-      }
+-      d3_layout_treeVisitAfter(root, function(node, previousSibling) {
+-        node._tree = {
+-          ancestor: node,
+-          prelim: 0,
+-          mod: 0,
+-          change: 0,
+-          shift: 0,
+-          number: previousSibling ? previousSibling._tree.number + 1 : 0
+-        };
+-      });
+-      firstWalk(root);
+-      secondWalk(root, -root._tree.prelim);
+-      var left = d3_layout_treeSearch(root, d3_layout_treeLeftmost), right = d3_layout_treeSearch(root, d3_layout_treeRightmost), deep = d3_layout_treeSearch(root, d3_layout_treeDeepest), x0 = left.x - separation(left, right) / 2, x1 = right.x + separation(right, left) / 2, y1 = deep.depth || 1;
+-      d3_layout_treeVisitAfter(root, nodeSize ? function(node) {
+-        node.x *= size[0];
+-        node.y = node.depth * size[1];
+-        delete node._tree;
+-      } : function(node) {
+-        node.x = (node.x - x0) / (x1 - x0) * size[0];
+-        node.y = node.depth / y1 * size[1];
+-        delete node._tree;
+-      });
+-      return nodes;
+-    }
+-    tree.separation = function(x) {
+-      if (!arguments.length) return separation;
+-      separation = x;
+-      return tree;
+-    };
+-    tree.size = function(x) {
+-      if (!arguments.length) return nodeSize ? null : size;
+-      nodeSize = (size = x) == null;
+-      return tree;
+-    };
+-    tree.nodeSize = function(x) {
+-      if (!arguments.length) return nodeSize ? size : null;
+-      nodeSize = (size = x) != null;
+-      return tree;
+-    };
+-    return d3_layout_hierarchyRebind(tree, hierarchy);
+-  };
+-  function d3_layout_treeSeparation(a, b) {
+-    return a.parent == b.parent ? 1 : 2;
+-  }
+-  function d3_layout_treeLeft(node) {
+-    var children = node.children;
+-    return children && children.length ? children[0] : node._tree.thread;
+-  }
+-  function d3_layout_treeRight(node) {
+-    var children = node.children, n;
+-    return children && (n = children.length) ? children[n - 1] : node._tree.thread;
+-  }
+-  function d3_layout_treeSearch(node, compare) {
+-    var children = node.children;
+-    if (children && (n = children.length)) {
+-      var child, n, i = -1;
+-      while (++i < n) {
+-        if (compare(child = d3_layout_treeSearch(children[i], compare), node) > 0) {
+-          node = child;
+-        }
+-      }
+-    }
+-    return node;
+-  }
+-  function d3_layout_treeRightmost(a, b) {
+-    return a.x - b.x;
+-  }
+-  function d3_layout_treeLeftmost(a, b) {
+-    return b.x - a.x;
+-  }
+-  function d3_layout_treeDeepest(a, b) {
+-    return a.depth - b.depth;
+-  }
+-  function d3_layout_treeVisitAfter(node, callback) {
+-    function visit(node, previousSibling) {
+-      var children = node.children;
+-      if (children && (n = children.length)) {
+-        var child, previousChild = null, i = -1, n;
+-        while (++i < n) {
+-          child = children[i];
+-          visit(child, previousChild);
+-          previousChild = child;
+-        }
+-      }
+-      callback(node, previousSibling);
+-    }
+-    visit(node, null);
+-  }
+-  function d3_layout_treeShift(node) {
+-    var shift = 0, change = 0, children = node.children, i = children.length, child;
+-    while (--i >= 0) {
+-      child = children[i]._tree;
+-      child.prelim += shift;
+-      child.mod += shift;
+-      shift += child.shift + (change += child.change);
+-    }
+-  }
+-  function d3_layout_treeMove(ancestor, node, shift) {
+-    ancestor = ancestor._tree;
+-    node = node._tree;
+-    var change = shift / (node.number - ancestor.number);
+-    ancestor.change += change;
+-    node.change -= change;
+-    node.shift += shift;
+-    node.prelim += shift;
+-    node.mod += shift;
+-  }
+-  function d3_layout_treeAncestor(vim, node, ancestor) {
+-    return vim._tree.ancestor.parent == node.parent ? vim._tree.ancestor : ancestor;
+-  }
+-  d3.layout.pack = function() {
+-    var hierarchy = d3.layout.hierarchy().sort(d3_layout_packSort), padding = 0, size = [ 1, 1 ], radius;
+-    function pack(d, i) {
+-      var nodes = hierarchy.call(this, d, i), root = nodes[0], w = size[0], h = size[1], r = radius == null ? Math.sqrt : typeof radius === "function" ? radius : function() {
+-        return radius;
+-      };
+-      root.x = root.y = 0;
+-      d3_layout_treeVisitAfter(root, function(d) {
+-        d.r = +r(d.value);
+-      });
+-      d3_layout_treeVisitAfter(root, d3_layout_packSiblings);
+-      if (padding) {
+-        var dr = padding * (radius ? 1 : Math.max(2 * root.r / w, 2 * root.r / h)) / 2;
+-        d3_layout_treeVisitAfter(root, function(d) {
+-          d.r += dr;
+-        });
+-        d3_layout_treeVisitAfter(root, d3_layout_packSiblings);
+-        d3_layout_treeVisitAfter(root, function(d) {
+-          d.r -= dr;
+-        });
+-      }
+-      d3_layout_packTransform(root, w / 2, h / 2, radius ? 1 : 1 / Math.max(2 * root.r / w, 2 * root.r / h));
+-      return nodes;
+-    }
+-    pack.size = function(_) {
+-      if (!arguments.length) return size;
+-      size = _;
+-      return pack;
+-    };
+-    pack.radius = function(_) {
+-      if (!arguments.length) return radius;
+-      radius = _ == null || typeof _ === "function" ? _ : +_;
+-      return pack;
+-    };
+-    pack.padding = function(_) {
+-      if (!arguments.length) return padding;
+-      padding = +_;
+-      return pack;
+-    };
+-    return d3_layout_hierarchyRebind(pack, hierarchy);
+-  };
+-  function d3_layout_packSort(a, b) {
+-    return a.value - b.value;
+-  }
+-  function d3_layout_packInsert(a, b) {
+-    var c = a._pack_next;
+-    a._pack_next = b;
+-    b._pack_prev = a;
+-    b._pack_next = c;
+-    c._pack_prev = b;
+-  }
+-  function d3_layout_packSplice(a, b) {
+-    a._pack_next = b;
+-    b._pack_prev = a;
+-  }
+-  function d3_layout_packIntersects(a, b) {
+-    var dx = b.x - a.x, dy = b.y - a.y, dr = a.r + b.r;
+-    return .999 * dr * dr > dx * dx + dy * dy;
+-  }
+-  function d3_layout_packSiblings(node) {
+-    if (!(nodes = node.children) || !(n = nodes.length)) return;
+-    var nodes, xMin = Infinity, xMax = -Infinity, yMin = Infinity, yMax = -Infinity, a, b, c, i, j, k, n;
+-    function bound(node) {
+-      xMin = Math.min(node.x - node.r, xMin);
+-      xMax = Math.max(node.x + node.r, xMax);
+-      yMin = Math.min(node.y - node.r, yMin);
+-      yMax = Math.max(node.y + node.r, yMax);
+-    }
+-    nodes.forEach(d3_layout_packLink);
+-    a = nodes[0];
+-    a.x = -a.r;
+-    a.y = 0;
+-    bound(a);
+-    if (n > 1) {
+-      b = nodes[1];
+-      b.x = b.r;
+-      b.y = 0;
+-      bound(b);
+-      if (n > 2) {
+-        c = nodes[2];
+-        d3_layout_packPlace(a, b, c);
+-        bound(c);
+-        d3_layout_packInsert(a, c);
+-        a._pack_prev = c;
+-        d3_layout_packInsert(c, b);
+-        b = a._pack_next;
+-        for (i = 3; i < n; i++) {
+-          d3_layout_packPlace(a, b, c = nodes[i]);
+-          var isect = 0, s1 = 1, s2 = 1;
+-          for (j = b._pack_next; j !== b; j = j._pack_next, s1++) {
+-            if (d3_layout_packIntersects(j, c)) {
+-              isect = 1;
+-              break;
+-            }
+-          }
+-          if (isect == 1) {
+-            for (k = a._pack_prev; k !== j._pack_prev; k = k._pack_prev, s2++) {
+-              if (d3_layout_packIntersects(k, c)) {
+-                break;
+-              }
+-            }
+-          }
+-          if (isect) {
+-            if (s1 < s2 || s1 == s2 && b.r < a.r) d3_layout_packSplice(a, b = j); else d3_layout_packSplice(a = k, b);
+-            i--;
+-          } else {
+-            d3_layout_packInsert(a, c);
+-            b = c;
+-            bound(c);
+-          }
+-        }
+-      }
+-    }
+-    var cx = (xMin + xMax) / 2, cy = (yMin + yMax) / 2, cr = 0;
+-    for (i = 0; i < n; i++) {
+-      c = nodes[i];
+-      c.x -= cx;
+-      c.y -= cy;
+-      cr = Math.max(cr, c.r + Math.sqrt(c.x * c.x + c.y * c.y));
+-    }
+-    node.r = cr;
+-    nodes.forEach(d3_layout_packUnlink);
+-  }
+-  function d3_layout_packLink(node) {
+-    node._pack_next = node._pack_prev = node;
+-  }
+-  function d3_layout_packUnlink(node) {
+-    delete node._pack_next;
+-    delete node._pack_prev;
+-  }
+-  function d3_layout_packTransform(node, x, y, k) {
+-    var children = node.children;
+-    node.x = x += k * node.x;
+-    node.y = y += k * node.y;
+-    node.r *= k;
+-    if (children) {
+-      var i = -1, n = children.length;
+-      while (++i < n) d3_layout_packTransform(children[i], x, y, k);
+-    }
+-  }
+-  function d3_layout_packPlace(a, b, c) {
+-    var db = a.r + c.r, dx = b.x - a.x, dy = b.y - a.y;
+-    if (db && (dx || dy)) {
+-      var da = b.r + c.r, dc = dx * dx + dy * dy;
+-      da *= da;
+-      db *= db;
+-      var x = .5 + (db - da) / (2 * dc), y = Math.sqrt(Math.max(0, 2 * da * (db + dc) - (db -= dc) * db - da * da)) / (2 * dc);
+-      c.x = a.x + x * dx + y * dy;
+-      c.y = a.y + x * dy - y * dx;
+-    } else {
+-      c.x = a.x + db;
+-      c.y = a.y;
+-    }
+-  }
+-  d3.layout.cluster = function() {
+-    var hierarchy = d3.layout.hierarchy().sort(null).value(null), separation = d3_layout_treeSeparation, size = [ 1, 1 ], nodeSize = false;
+-    function cluster(d, i) {
+-      var nodes = hierarchy.call(this, d, i), root = nodes[0], previousNode, x = 0;
+-      d3_layout_treeVisitAfter(root, function(node) {
+-        var children = node.children;
+-        if (children && children.length) {
+-          node.x = d3_layout_clusterX(children);
+-          node.y = d3_layout_clusterY(children);
+-        } else {
+-          node.x = previousNode ? x += separation(node, previousNode) : 0;
+-          node.y = 0;
+-          previousNode = node;
+-        }
+-      });
+-      var left = d3_layout_clusterLeft(root), right = d3_layout_clusterRight(root), x0 = left.x - separation(left, right) / 2, x1 = right.x + separation(right, left) / 2;
+-      d3_layout_treeVisitAfter(root, nodeSize ? function(node) {
+-        node.x = (node.x - root.x) * size[0];
+-        node.y = (root.y - node.y) * size[1];
+-      } : function(node) {
+-        node.x = (node.x - x0) / (x1 - x0) * size[0];
+-        node.y = (1 - (root.y ? node.y / root.y : 1)) * size[1];
+-      });
+-      return nodes;
+-    }
+-    cluster.separation = function(x) {
+-      if (!arguments.length) return separation;
+-      separation = x;
+-      return cluster;
+-    };
+-    cluster.size = function(x) {
+-      if (!arguments.length) return nodeSize ? null : size;
+-      nodeSize = (size = x) == null;
+-      return cluster;
+-    };
+-    cluster.nodeSize = function(x) {
+-      if (!arguments.length) return nodeSize ? size : null;
+-      nodeSize = (size = x) != null;
+-      return cluster;
+-    };
+-    return d3_layout_hierarchyRebind(cluster, hierarchy);
+-  };
+-  function d3_layout_clusterY(children) {
+-    return 1 + d3.max(children, function(child) {
+-      return child.y;
+-    });
+-  }
+-  function d3_layout_clusterX(children) {
+-    return children.reduce(function(x, child) {
+-      return x + child.x;
+-    }, 0) / children.length;
+-  }
+-  function d3_layout_clusterLeft(node) {
+-    var children = node.children;
+-    return children && children.length ? d3_layout_clusterLeft(children[0]) : node;
+-  }
+-  function d3_layout_clusterRight(node) {
+-    var children = node.children, n;
+-    return children && (n = children.length) ? d3_layout_clusterRight(children[n - 1]) : node;
+-  }
+-  d3.layout.treemap = function() {
+-    var hierarchy = d3.layout.hierarchy(), round = Math.round, size = [ 1, 1 ], padding = null, pad = d3_layout_treemapPadNull, sticky = false, stickies, mode = "squarify", ratio = .5 * (1 + Math.sqrt(5));
+-    function scale(children, k) {
+-      var i = -1, n = children.length, child, area;
+-      while (++i < n) {
+-        area = (child = children[i]).value * (k < 0 ? 0 : k);
+-        child.area = isNaN(area) || area <= 0 ? 0 : area;
+-      }
+-    }
+-    function squarify(node) {
+-      var children = node.children;
+-      if (children && children.length) {
+-        var rect = pad(node), row = [], remaining = children.slice(), child, best = Infinity, score, u = mode === "slice" ? rect.dx : mode === "dice" ? rect.dy : mode === "slice-dice" ? node.depth & 1 ? rect.dy : rect.dx : Math.min(rect.dx, rect.dy), n;
+-        scale(remaining, rect.dx * rect.dy / node.value);
+-        row.area = 0;
+-        while ((n = remaining.length) > 0) {
+-          row.push(child = remaining[n - 1]);
+-          row.area += child.area;
+-          if (mode !== "squarify" || (score = worst(row, u)) <= best) {
+-            remaining.pop();
+-            best = score;
+-          } else {
+-            row.area -= row.pop().area;
+-            position(row, u, rect, false);
+-            u = Math.min(rect.dx, rect.dy);
+-            row.length = row.area = 0;
+-            best = Infinity;
+-          }
+-        }
+-        if (row.length) {
+-          position(row, u, rect, true);
+-          row.length = row.area = 0;
+-        }
+-        children.forEach(squarify);
+-      }
+-    }
+-    function stickify(node) {
+-      var children = node.children;
+-      if (children && children.length) {
+-        var rect = pad(node), remaining = children.slice(), child, row = [];
+-        scale(remaining, rect.dx * rect.dy / node.value);
+-        row.area = 0;
+-        while (child = remaining.pop()) {
+-          row.push(child);
+-          row.area += child.area;
+-          if (child.z != null) {
+-            position(row, child.z ? rect.dx : rect.dy, rect, !remaining.length);
+-            row.length = row.area = 0;
+-          }
+-        }
+-        children.forEach(stickify);
+-      }
+-    }
+-    function worst(row, u) {
+-      var s = row.area, r, rmax = 0, rmin = Infinity, i = -1, n = row.length;
+-      while (++i < n) {
+-        if (!(r = row[i].area)) continue;
+-        if (r < rmin) rmin = r;
+-        if (r > rmax) rmax = r;
+-      }
+-      s *= s;
+-      u *= u;
+-      return s ? Math.max(u * rmax * ratio / s, s / (u * rmin * ratio)) : Infinity;
+-    }
+-    function position(row, u, rect, flush) {
+-      var i = -1, n = row.length, x = rect.x, y = rect.y, v = u ? round(row.area / u) : 0, o;
+-      if (u == rect.dx) {
+-        if (flush || v > rect.dy) v = rect.dy;
+-        while (++i < n) {
+-          o = row[i];
+-          o.x = x;
+-          o.y = y;
+-          o.dy = v;
+-          x += o.dx = Math.min(rect.x + rect.dx - x, v ? round(o.area / v) : 0);
+-        }
+-        o.z = true;
+-        o.dx += rect.x + rect.dx - x;
+-        rect.y += v;
+-        rect.dy -= v;
+-      } else {
+-        if (flush || v > rect.dx) v = rect.dx;
+-        while (++i < n) {
+-          o = row[i];
+-          o.x = x;
+-          o.y = y;
+-          o.dx = v;
+-          y += o.dy = Math.min(rect.y + rect.dy - y, v ? round(o.area / v) : 0);
+-        }
+-        o.z = false;
+-        o.dy += rect.y + rect.dy - y;
+-        rect.x += v;
+-        rect.dx -= v;
+-      }
+-    }
+-    function treemap(d) {
+-      var nodes = stickies || hierarchy(d), root = nodes[0];
+-      root.x = 0;
+-      root.y = 0;
+-      root.dx = size[0];
+-      root.dy = size[1];
+-      if (stickies) hierarchy.revalue(root);
+-      scale([ root ], root.dx * root.dy / root.value);
+-      (stickies ? stickify : squarify)(root);
+-      if (sticky) stickies = nodes;
+-      return nodes;
+-    }
+-    treemap.size = function(x) {
+-      if (!arguments.length) return size;
+-      size = x;
+-      return treemap;
+-    };
+-    treemap.padding = function(x) {
+-      if (!arguments.length) return padding;
+-      function padFunction(node) {
+-        var p = x.call(treemap, node, node.depth);
+-        return p == null ? d3_layout_treemapPadNull(node) : d3_layout_treemapPad(node, typeof p === "number" ? [ p, p, p, p ] : p);
+-      }
+-      function padConstant(node) {
+-        return d3_layout_treemapPad(node, x);
+-      }
+-      var type;
+-      pad = (padding = x) == null ? d3_layout_treemapPadNull : (type = typeof x) === "function" ? padFunction : type === "number" ? (x = [ x, x, x, x ],
+-      padConstant) : padConstant;
+-      return treemap;
+-    };
+-    treemap.round = function(x) {
+-      if (!arguments.length) return round != Number;
+-      round = x ? Math.round : Number;
+-      return treemap;
+-    };
+-    treemap.sticky = function(x) {
+-      if (!arguments.length) return sticky;
+-      sticky = x;
+-      stickies = null;
+-      return treemap;
+-    };
+-    treemap.ratio = function(x) {
+-      if (!arguments.length) return ratio;
+-      ratio = x;
+-      return treemap;
+-    };
+-    treemap.mode = function(x) {
+-      if (!arguments.length) return mode;
+-      mode = x + "";
+-      return treemap;
+-    };
+-    return d3_layout_hierarchyRebind(treemap, hierarchy);
+-  };
+-  function d3_layout_treemapPadNull(node) {
+-    return {
+-      x: node.x,
+-      y: node.y,
+-      dx: node.dx,
+-      dy: node.dy
+-    };
+-  }
+-  function d3_layout_treemapPad(node, padding) {
+-    var x = node.x + padding[3], y = node.y + padding[0], dx = node.dx - padding[1] - padding[3], dy = node.dy - padding[0] - padding[2];
+-    if (dx < 0) {
+-      x += dx / 2;
+-      dx = 0;
+-    }
+-    if (dy < 0) {
+-      y += dy / 2;
+-      dy = 0;
+-    }
+-    return {
+-      x: x,
+-      y: y,
+-      dx: dx,
+-      dy: dy
+-    };
+-  }
+-  d3.random = {
+-    normal: function(µ, σ) {
+-      var n = arguments.length;
+-      if (n < 2) σ = 1;
+-      if (n < 1) µ = 0;
+-      return function() {
+-        var x, y, r;
+-        do {
+-          x = Math.random() * 2 - 1;
+-          y = Math.random() * 2 - 1;
+-          r = x * x + y * y;
+-        } while (!r || r > 1);
+-        return µ + σ * x * Math.sqrt(-2 * Math.log(r) / r);
+-      };
+-    },
+-    logNormal: function() {
+-      var random = d3.random.normal.apply(d3, arguments);
+-      return function() {
+-        return Math.exp(random());
+-      };
+-    },
+-    irwinHall: function(m) {
+-      return function() {
+-        for (var s = 0, j = 0; j < m; j++) s += Math.random();
+-        return s / m;
+-      };
+-    }
+-  };
+-  d3.scale = {};
+-  function d3_scaleExtent(domain) {
+-    var start = domain[0], stop = domain[domain.length - 1];
+-    return start < stop ? [ start, stop ] : [ stop, start ];
+-  }
+-  function d3_scaleRange(scale) {
+-    return scale.rangeExtent ? scale.rangeExtent() : d3_scaleExtent(scale.range());
+-  }
+-  function d3_scale_bilinear(domain, range, uninterpolate, interpolate) {
+-    var u = uninterpolate(domain[0], domain[1]), i = interpolate(range[0], range[1]);
+-    return function(x) {
+-      return i(u(x));
+-    };
+-  }
+-  function d3_scale_nice(domain, nice) {
+-    var i0 = 0, i1 = domain.length - 1, x0 = domain[i0], x1 = domain[i1], dx;
+-    if (x1 < x0) {
+-      dx = i0, i0 = i1, i1 = dx;
+-      dx = x0, x0 = x1, x1 = dx;
+-    }
+-    domain[i0] = nice.floor(x0);
+-    domain[i1] = nice.ceil(x1);
+-    return domain;
+-  }
+-  function d3_scale_niceStep(step) {
+-    return step ? {
+-      floor: function(x) {
+-        return Math.floor(x / step) * step;
+-      },
+-      ceil: function(x) {
+-        return Math.ceil(x / step) * step;
+-      }
+-    } : d3_scale_niceIdentity;
+-  }
+-  var d3_scale_niceIdentity = {
+-    floor: d3_identity,
+-    ceil: d3_identity
+-  };
+-  function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
+-    var u = [], i = [], j = 0, k = Math.min(domain.length, range.length) - 1;
+-    if (domain[k] < domain[0]) {
+-      domain = domain.slice().reverse();
+-      range = range.slice().reverse();
+-    }
+-    while (++j <= k) {
+-      u.push(uninterpolate(domain[j - 1], domain[j]));
+-      i.push(interpolate(range[j - 1], range[j]));
+-    }
+-    return function(x) {
+-      var j = d3.bisect(domain, x, 1, k) - 1;
+-      return i[j](u[j](x));
+-    };
+-  }
+-  d3.scale.linear = function() {
+-    return d3_scale_linear([ 0, 1 ], [ 0, 1 ], d3_interpolate, false);
+-  };
+-  function d3_scale_linear(domain, range, interpolate, clamp) {
+-    var output, input;
+-    function rescale() {
+-      var linear = Math.min(domain.length, range.length) > 2 ? d3_scale_polylinear : d3_scale_bilinear, uninterpolate = clamp ? d3_uninterpolateClamp : d3_uninterpolateNumber;
+-      output = linear(domain, range, uninterpolate, interpolate);
+-      input = linear(range, domain, uninterpolate, d3_interpolate);
+-      return scale;
+-    }
+-    function scale(x) {
+-      return output(x);
+-    }
+-    scale.invert = function(y) {
+-      return input(y);
+-    };
+-    scale.domain = function(x) {
+-      if (!arguments.length) return domain;
+-      domain = x.map(Number);
+-      return rescale();
+-    };
+-    scale.range = function(x) {
+-      if (!arguments.length) return range;
+-      range = x;
+-      return rescale();
+-    };
+-    scale.rangeRound = function(x) {
+-      return scale.range(x).interpolate(d3_interpolateRound);
+-    };
+-    scale.clamp = function(x) {
+-      if (!arguments.length) return clamp;
+-      clamp = x;
+-      return rescale();
+-    };
+-    scale.interpolate = function(x) {
+-      if (!arguments.length) return interpolate;
+-      interpolate = x;
+-      return rescale();
+-    };
+-    scale.ticks = function(m) {
+-      return d3_scale_linearTicks(domain, m);
+-    };
+-    scale.tickFormat = function(m, format) {
+-      return d3_scale_linearTickFormat(domain, m, format);
+-    };
+-    scale.nice = function(m) {
+-      d3_scale_linearNice(domain, m);
+-      return rescale();
+-    };
+-    scale.copy = function() {
+-      return d3_scale_linear(domain, range, interpolate, clamp);
+-    };
+-    return rescale();
+-  }
+-  function d3_scale_linearRebind(scale, linear) {
+-    return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
+-  }
+-  function d3_scale_linearNice(domain, m) {
+-    return d3_scale_nice(domain, d3_scale_niceStep(m ? d3_scale_linearTickRange(domain, m)[2] : d3_scale_linearNiceStep(domain)));
+-  }
+-  function d3_scale_linearNiceStep(domain) {
+-    var extent = d3_scaleExtent(domain), span = extent[1] - extent[0];
+-    return Math.pow(10, Math.round(Math.log(span) / Math.LN10) - 1);
+-  }
+-  function d3_scale_linearTickRange(domain, m) {
+-    var extent = d3_scaleExtent(domain), span = extent[1] - extent[0], step = Math.pow(10, Math.floor(Math.log(span / m) / Math.LN10)), err = m / span * step;
+-    if (err <= .15) step *= 10; else if (err <= .35) step *= 5; else if (err <= .75) step *= 2;
+-    extent[0] = Math.ceil(extent[0] / step) * step;
+-    extent[1] = Math.floor(extent[1] / step) * step + step * .5;
+-    extent[2] = step;
+-    return extent;
+-  }
+-  function d3_scale_linearTicks(domain, m) {
+-    return d3.range.apply(d3, d3_scale_linearTickRange(domain, m));
+-  }
+-  function d3_scale_linearTickFormat(domain, m, format) {
+-    var precision = -Math.floor(Math.log(d3_scale_linearTickRange(domain, m)[2]) / Math.LN10 + .01);
+-    return d3.format(format ? format.replace(d3_format_re, function(a, b, c, d, e, f, g, h, i, j) {
+-      return [ b, c, d, e, f, g, h, i || "." + (precision - (j === "%") * 2), j ].join("");
+-    }) : ",." + precision + "f");
+-  }
+-  d3.scale.log = function() {
+-    return d3_scale_log(d3.scale.linear().domain([ 0, 1 ]), 10, true, [ 1, 10 ]);
+-  };
+-  function d3_scale_log(linear, base, positive, domain) {
+-    function log(x) {
+-      return (positive ? Math.log(x < 0 ? 0 : x) : -Math.log(x > 0 ? 0 : -x)) / Math.log(base);
+-    }
+-    function pow(x) {
+-      return positive ? Math.pow(base, x) : -Math.pow(base, -x);
+-    }
+-    function scale(x) {
+-      return linear(log(x));
+-    }
+-    scale.invert = function(x) {
+-      return pow(linear.invert(x));
+-    };
+-    scale.domain = function(x) {
+-      if (!arguments.length) return domain;
+-      positive = x[0] >= 0;
+-      linear.domain((domain = x.map(Number)).map(log));
+-      return scale;
+-    };
+-    scale.base = function(_) {
+-      if (!arguments.length) return base;
+-      base = +_;
+-      linear.domain(domain.map(log));
+-      return scale;
+-    };
+-    scale.nice = function() {
+-      var niced = d3_scale_nice(domain.map(log), positive ? Math : d3_scale_logNiceNegative);
+-      linear.domain(niced);
+-      domain = niced.map(pow);
+-      return scale;
+-    };
+-    scale.ticks = function() {
+-      var extent = d3_scaleExtent(domain), ticks = [];
+-      if (extent.every(isFinite)) {
+-        var u = extent[0], v = extent[1], i = Math.floor(log(u)), j = Math.ceil(log(v)), n = base % 1 ? 2 : base;
+-        if (positive) {
+-          for (;i < j; i++) for (var k = 1; k < n; k++) ticks.push(pow(i) * k);
+-          ticks.push(pow(i));
+-        } else {
+-          ticks.push(pow(i));
+-          for (;i++ < j; ) for (var k = n - 1; k > 0; k--) ticks.push(pow(i) * k);
+-        }
+-        for (i = 0; ticks[i] < u; i++) {}
+-        for (j = ticks.length; ticks[j - 1] > v; j--) {}
+-        ticks = ticks.slice(i, j);
+-      }
+-      return ticks;
+-    };
+-    scale.tickFormat = function(n, format) {
+-      if (!arguments.length) return d3_scale_logFormat;
+-      if (arguments.length < 2) format = d3_scale_logFormat; else if (typeof format !== "function") format = d3.format(format);
+-      var k = Math.max(.1, n / scale.ticks().length), f = positive ? (e = 1e-12, Math.ceil) : (e = -1e-12,
+-      Math.floor), e;
+-      return function(d) {
+-        return d / pow(f(log(d) + e)) <= k ? format(d) : "";
+-      };
+-    };
+-    scale.copy = function() {
+-      return d3_scale_log(linear.copy(), base, positive, domain);
+-    };
+-    return d3_scale_linearRebind(scale, linear);
+-  }
+-  var d3_scale_logFormat = d3.format(".0e"), d3_scale_logNiceNegative = {
+-    floor: function(x) {
+-      return -Math.ceil(-x);
+-    },
+-    ceil: function(x) {
+-      return -Math.floor(-x);
+-    }
+-  };
+-  d3.scale.pow = function() {
+-    return d3_scale_pow(d3.scale.linear(), 1, [ 0, 1 ]);
+-  };
+-  function d3_scale_pow(linear, exponent, domain) {
+-    var powp = d3_scale_powPow(exponent), powb = d3_scale_powPow(1 / exponent);
+-    function scale(x) {
+-      return linear(powp(x));
+-    }
+-    scale.invert = function(x) {
+-      return powb(linear.invert(x));
+-    };
+-    scale.domain = function(x) {
+-      if (!arguments.length) return domain;
+-      linear.domain((domain = x.map(Number)).map(powp));
+-      return scale;
+-    };
+-    scale.ticks = function(m) {
+-      return d3_scale_linearTicks(domain, m);
+-    };
+-    scale.tickFormat = function(m, format) {
+-      return d3_scale_linearTickFormat(domain, m, format);
+-    };
+-    scale.nice = function(m) {
+-      return scale.domain(d3_scale_linearNice(domain, m));
+-    };
+-    scale.exponent = function(x) {
+-      if (!arguments.length) return exponent;
+-      powp = d3_scale_powPow(exponent = x);
+-      powb = d3_scale_powPow(1 / exponent);
+-      linear.domain(domain.map(powp));
+-      return scale;
+-    };
+-    scale.copy = function() {
+-      return d3_scale_pow(linear.copy(), exponent, domain);
+-    };
+-    return d3_scale_linearRebind(scale, linear);
+-  }
+-  function d3_scale_powPow(e) {
+-    return function(x) {
+-      return x < 0 ? -Math.pow(-x, e) : Math.pow(x, e);
+-    };
+-  }
+-  d3.scale.sqrt = function() {
+-    return d3.scale.pow().exponent(.5);
+-  };
+-  d3.scale.ordinal = function() {
+-    return d3_scale_ordinal([], {
+-      t: "range",
+-      a: [ [] ]
+-    });
+-  };
+-  function d3_scale_ordinal(domain, ranger) {
+-    var index, range, rangeBand;
+-    function scale(x) {
+-      return range[((index.get(x) || index.set(x, domain.push(x))) - 1) % range.length];
+-    }
+-    function steps(start, step) {
+-      return d3.range(domain.length).map(function(i) {
+-        return start + step * i;
+-      });
+-    }
+-    scale.domain = function(x) {
+-      if (!arguments.length) return domain;
+-      domain = [];
+-      index = new d3_Map();
+-      var i = -1, n = x.length, xi;
+-      while (++i < n) if (!index.has(xi = x[i])) index.set(xi, domain.push(xi));
+-      return scale[ranger.t].apply(scale, ranger.a);
+-    };
+-    scale.range = function(x) {
+-      if (!arguments.length) return range;
+-      range = x;
+-      rangeBand = 0;
+-      ranger = {
+-        t: "range",
+-        a: arguments
+-      };
+-      return scale;
+-    };
+-    scale.rangePoints = function(x, padding) {
+-      if (arguments.length < 2) padding = 0;
+-      var start = x[0], stop = x[1], step = (stop - start) / (Math.max(1, domain.length - 1) + padding);
+-      range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
+-      rangeBand = 0;
+-      ranger = {
+-        t: "rangePoints",
+-        a: arguments
+-      };
+-      return scale;
+-    };
+-    scale.rangeBands = function(x, padding, outerPadding) {
+-      if (arguments.length < 2) padding = 0;
+-      if (arguments.length < 3) outerPadding = padding;
+-      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = (stop - start) / (domain.length - padding + 2 * outerPadding);
+-      range = steps(start + step * outerPadding, step);
+-      if (reverse) range.reverse();
+-      rangeBand = step * (1 - padding);
+-      ranger = {
+-        t: "rangeBands",
+-        a: arguments
+-      };
+-      return scale;
+-    };
+-    scale.rangeRoundBands = function(x, padding, outerPadding) {
+-      if (arguments.length < 2) padding = 0;
+-      if (arguments.length < 3) outerPadding = padding;
+-      var reverse = x[1] < x[0], start = x[reverse - 0], stop = x[1 - reverse], step = Math.floor((stop - start) / (domain.length - padding + 2 * outerPadding)), error = stop - start - (domain.length - padding) * step;
+-      range = steps(start + Math.round(error / 2), step);
+-      if (reverse) range.reverse();
+-      rangeBand = Math.round(step * (1 - padding));
+-      ranger = {
+-        t: "rangeRoundBands",
+-        a: arguments
+-      };
+-      return scale;
+-    };
+-    scale.rangeBand = function() {
+-      return rangeBand;
+-    };
+-    scale.rangeExtent = function() {
+-      return d3_scaleExtent(ranger.a[0]);
+-    };
+-    scale.copy = function() {
+-      return d3_scale_ordinal(domain, ranger);
+-    };
+-    return scale.domain(domain);
+-  }
+-  d3.scale.category10 = function() {
+-    return d3.scale.ordinal().range(d3_category10);
+-  };
+-  d3.scale.category20 = function() {
+-    return d3.scale.ordinal().range(d3_category20);
+-  };
+-  d3.scale.category20b = function() {
+-    return d3.scale.ordinal().range(d3_category20b);
+-  };
+-  d3.scale.category20c = function() {
+-    return d3.scale.ordinal().range(d3_category20c);
+-  };
+-  var d3_category10 = [ 2062260, 16744206, 2924588, 14034728, 9725885, 9197131, 14907330, 8355711, 12369186, 1556175 ].map(d3_rgbString);
+-  var d3_category20 = [ 2062260, 11454440, 16744206, 16759672, 2924588, 10018698, 14034728, 16750742, 9725885, 12955861, 9197131, 12885140, 14907330, 16234194, 8355711, 13092807, 12369186, 14408589, 1556175, 10410725 ].map(d3_rgbString);
+-  var d3_category20b = [ 3750777, 5395619, 7040719, 10264286, 6519097, 9216594, 11915115, 13556636, 9202993, 12426809, 15186514, 15190932, 8666169, 11356490, 14049643, 15177372, 8077683, 10834324, 13528509, 14589654 ].map(d3_rgbString);
+-  var d3_category20c = [ 3244733, 7057110, 10406625, 13032431, 15095053, 16616764, 16625259, 16634018, 3253076, 7652470, 10607003, 13101504, 7695281, 10394312, 12369372, 14342891, 6513507, 9868950, 12434877, 14277081 ].map(d3_rgbString);
+-  d3.scale.quantile = function() {
+-    return d3_scale_quantile([], []);
+-  };
+-  function d3_scale_quantile(domain, range) {
+-    var thresholds;
+-    function rescale() {
+-      var k = 0, q = range.length;
+-      thresholds = [];
+-      while (++k < q) thresholds[k - 1] = d3.quantile(domain, k / q);
+-      return scale;
+-    }
+-    function scale(x) {
+-      if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];
+-    }
+-    scale.domain = function(x) {
+-      if (!arguments.length) return domain;
+-      domain = x.filter(function(d) {
+-        return !isNaN(d);
+-      }).sort(d3.ascending);
+-      return rescale();
+-    };
+-    scale.range = function(x) {
+-      if (!arguments.length) return range;
+-      range = x;
+-      return rescale();
+-    };
+-    scale.quantiles = function() {
+-      return thresholds;
+-    };
+-    scale.invertExtent = function(y) {
+-      y = range.indexOf(y);
+-      return y < 0 ? [ NaN, NaN ] : [ y > 0 ? thresholds[y - 1] : domain[0], y < thresholds.length ? thresholds[y] : domain[domain.length - 1] ];
+-    };
+-    scale.copy = function() {
+-      return d3_scale_quantile(domain, range);
+-    };
+-    return rescale();
+-  }
+-  d3.scale.quantize = function() {
+-    return d3_scale_quantize(0, 1, [ 0, 1 ]);
+-  };
+-  function d3_scale_quantize(x0, x1, range) {
+-    var kx, i;
+-    function scale(x) {
+-      return range[Math.max(0, Math.min(i, Math.floor(kx * (x - x0))))];
+-    }
+-    function rescale() {
+-      kx = range.length / (x1 - x0);
+-      i = range.length - 1;
+-      return scale;
+-    }
+-    scale.domain = function(x) {
+-      if (!arguments.length) return [ x0, x1 ];
+-      x0 = +x[0];
+-      x1 = +x[x.length - 1];
+-      return rescale();
+-    };
+-    scale.range = function(x) {
+-      if (!arguments.length) return range;
+-      range = x;
+-      return rescale();
+-    };
+-    scale.invertExtent = function(y) {
+-      y = range.indexOf(y);
+-      y = y < 0 ? NaN : y / kx + x0;
+-      return [ y, y + 1 / kx ];
+-    };
+-    scale.copy = function() {
+-      return d3_scale_quantize(x0, x1, range);
+-    };
+-    return rescale();
+-  }
+-  d3.scale.threshold = function() {
+-    return d3_scale_threshold([ .5 ], [ 0, 1 ]);
+-  };
+-  function d3_scale_threshold(domain, range) {
+-    function scale(x) {
+-      if (x <= x) return range[d3.bisect(domain, x)];
+-    }
+-    scale.domain = function(_) {
+-      if (!arguments.length) return domain;
+-      domain = _;
+-      return scale;
+-    };
+-    scale.range = function(_) {
+-      if (!arguments.length) return range;
+-      range = _;
+-      return scale;
+-    };
+-    scale.invertExtent = function(y) {
+-      y = range.indexOf(y);
+-      return [ domain[y - 1], domain[y] ];
+-    };
+-    scale.copy = function() {
+-      return d3_scale_threshold(domain, range);
+-    };
+-    return scale;
+-  }
+-  d3.scale.identity = function() {
+-    return d3_scale_identity([ 0, 1 ]);
+-  };
+-  function d3_scale_identity(domain) {
+-    function identity(x) {
+-      return +x;
+-    }
+-    identity.invert = identity;
+-    identity.domain = identity.range = function(x) {
+-      if (!arguments.length) return domain;
+-      domain = x.map(identity);
+-      return identity;
+-    };
+-    identity.ticks = function(m) {
+-      return d3_scale_linearTicks(domain, m);
+-    };
+-    identity.tickFormat = function(m, format) {
+-      return d3_scale_linearTickFormat(domain, m, format);
+-    };
+-    identity.copy = function() {
+-      return d3_scale_identity(domain);
+-    };
+-    return identity;
+-  }
+-  d3.svg.arc = function() {
+-    var innerRadius = d3_svg_arcInnerRadius, outerRadius = d3_svg_arcOuterRadius, startAngle = d3_svg_arcStartAngle, endAngle = d3_svg_arcEndAngle;
+-    function arc() {
+-      var r0 = innerRadius.apply(this, arguments), r1 = outerRadius.apply(this, arguments), a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset, a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset, da = (a1 < a0 && (da = a0,
+-      a0 = a1, a1 = da), a1 - a0), df = da < π ? "0" : "1", c0 = Math.cos(a0), s0 = Math.sin(a0), c1 = Math.cos(a1), s1 = Math.sin(a1);
+-      return da >= d3_svg_arcMax ? r0 ? "M0," + r1 + "A" + r1 + "," + r1 + " 0 1,1 0," + -r1 + "A" + r1 + "," + r1 + " 0 1,1 0," + r1 + "M0," + r0 + "A" + r0 + "," + r0 + " 0 1,0 0," + -r0 + "A" + r0 + "," + r0 + " 0 1,0 0," + r0 + "Z" : "M0," + r1 + "A" + r1 + "," + r1 + " 0 1,1 0," + -r1 + "A" + r1 + "," + r1 + " 0 1,1 0," + r1 + "Z" : r0 ? "M" + r1 * c0 + "," + r1 * s0 + "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1 + "L" + r0 * c1 + "," + r0 * s1 + "A" + r0 + "," + r0 + " 0 " + df + ",0 " + r0 * c0 + "," + r0 * s0 + "Z" : "M" + r1 * c0 + "," + r1 * s0 + "A" + r1 + "," + r1 + " 0 " + df + ",1 " + r1 * c1 + "," + r1 * s1 + "L0,0" + "Z";
+-    }
+-    arc.innerRadius = function(v) {
+-      if (!arguments.length) return innerRadius;
+-      innerRadius = d3_functor(v);
+-      return arc;
+-    };
+-    arc.outerRadius = function(v) {
+-      if (!arguments.length) return outerRadius;
+-      outerRadius = d3_functor(v);
+-      return arc;
+-    };
+-    arc.startAngle = function(v) {
+-      if (!arguments.length) return startAngle;
+-      startAngle = d3_functor(v);
+-      return arc;
+-    };
+-    arc.endAngle = function(v) {
+-      if (!arguments.length) return endAngle;
+-      endAngle = d3_functor(v);
+-      return arc;
+-    };
+-    arc.centroid = function() {
+-      var r = (innerRadius.apply(this, arguments) + outerRadius.apply(this, arguments)) / 2, a = (startAngle.apply(this, arguments) + endAngle.apply(this, arguments)) / 2 + d3_svg_arcOffset;
+-      return [ Math.cos(a) * r, Math.sin(a) * r ];
+-    };
+-    return arc;
+-  };
+-  var d3_svg_arcOffset = -π / 2, d3_svg_arcMax = 2 * π - 1e-6;
+-  function d3_svg_arcInnerRadius(d) {
+-    return d.innerRadius;
+-  }
+-  function d3_svg_arcOuterRadius(d) {
+-    return d.outerRadius;
+-  }
+-  function d3_svg_arcStartAngle(d) {
+-    return d.startAngle;
+-  }
+-  function d3_svg_arcEndAngle(d) {
+-    return d.endAngle;
+-  }
+-  d3.svg.line.radial = function() {
+-    var line = d3_svg_line(d3_svg_lineRadial);
+-    line.radius = line.x, delete line.x;
+-    line.angle = line.y, delete line.y;
+-    return line;
+-  };
+-  function d3_svg_lineRadial(points) {
+-    var point, i = -1, n = points.length, r, a;
+-    while (++i < n) {
+-      point = points[i];
+-      r = point[0];
+-      a = point[1] + d3_svg_arcOffset;
+-      point[0] = r * Math.cos(a);
+-      point[1] = r * Math.sin(a);
+-    }
+-    return points;
+-  }
+-  function d3_svg_area(projection) {
+-    var x0 = d3_svg_lineX, x1 = d3_svg_lineX, y0 = 0, y1 = d3_svg_lineY, defined = d3_true, interpolate = d3_svg_lineLinear, interpolateKey = interpolate.key, interpolateReverse = interpolate, L = "L", tension = .7;
+-    function area(data) {
+-      var segments = [], points0 = [], points1 = [], i = -1, n = data.length, d, fx0 = d3_functor(x0), fy0 = d3_functor(y0), fx1 = x0 === x1 ? function() {
+-        return x;
+-      } : d3_functor(x1), fy1 = y0 === y1 ? function() {
+-        return y;
+-      } : d3_functor(y1), x, y;
+-      function segment() {
+-        segments.push("M", interpolate(projection(points1), tension), L, interpolateReverse(projection(points0.reverse()), tension), "Z");
+-      }
+-      while (++i < n) {
+-        if (defined.call(this, d = data[i], i)) {
+-          points0.push([ x = +fx0.call(this, d, i), y = +fy0.call(this, d, i) ]);
+-          points1.push([ +fx1.call(this, d, i), +fy1.call(this, d, i) ]);
+-        } else if (points0.length) {
+-          segment();
+-          points0 = [];
+-          points1 = [];
+-        }
+-      }
+-      if (points0.length) segment();
+-      return segments.length ? segments.join("") : null;
+-    }
+-    area.x = function(_) {
+-      if (!arguments.length) return x1;
+-      x0 = x1 = _;
+-      return area;
+-    };
+-    area.x0 = function(_) {
+-      if (!arguments.length) return x0;
+-      x0 = _;
+-      return area;
+-    };
+-    area.x1 = function(_) {
+-      if (!arguments.length) return x1;
+-      x1 = _;
+-      return area;
+-    };
+-    area.y = function(_) {
+-      if (!arguments.length) return y1;
+-      y0 = y1 = _;
+-      return area;
+-    };
+-    area.y0 = function(_) {
+-      if (!arguments.length) return y0;
+-      y0 = _;
+-      return area;
+-    };
+-    area.y1 = function(_) {
+-      if (!arguments.length) return y1;
+-      y1 = _;
+-      return area;
+-    };
+-    area.defined = function(_) {
+-      if (!arguments.length) return defined;
+-      defined = _;
+-      return area;
+-    };
+-    area.interpolate = function(_) {
+-      if (!arguments.length) return interpolateKey;
+-      if (typeof _ === "function") interpolateKey = interpolate = _; else interpolateKey = (interpolate = d3_svg_lineInterpolators.get(_) || d3_svg_lineLinear).key;
+-      interpolateReverse = interpolate.reverse || interpolate;
+-      L = interpolate.closed ? "M" : "L";
+-      return area;
+-    };
+-    area.tension = function(_) {
+-      if (!arguments.length) return tension;
+-      tension = _;
+-      return area;
+-    };
+-    return area;
+-  }
+-  d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
+-  d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
+-  d3.svg.area = function() {
+-    return d3_svg_area(d3_identity);
+-  };
+-  d3.svg.area.radial = function() {
+-    var area = d3_svg_area(d3_svg_lineRadial);
+-    area.radius = area.x, delete area.x;
+-    area.innerRadius = area.x0, delete area.x0;
+-    area.outerRadius = area.x1, delete area.x1;
+-    area.angle = area.y, delete area.y;
+-    area.startAngle = area.y0, delete area.y0;
+-    area.endAngle = area.y1, delete area.y1;
+-    return area;
+-  };
+-  d3.svg.chord = function() {
+-    var source = d3_source, target = d3_target, radius = d3_svg_chordRadius, startAngle = d3_svg_arcStartAngle, endAngle = d3_svg_arcEndAngle;
+-    function chord(d, i) {
+-      var s = subgroup(this, source, d, i), t = subgroup(this, target, d, i);
+-      return "M" + s.p0 + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t) ? curve(s.r, s.p1, s.r, s.p0) : curve(s.r, s.p1, t.r, t.p0) + arc(t.r, t.p1, t.a1 - t.a0) + curve(t.r, t.p1, s.r, s.p0)) + "Z";
+-    }
+-    function subgroup(self, f, d, i) {
+-      var subgroup = f.call(self, d, i), r = radius.call(self, subgroup, i), a0 = startAngle.call(self, subgroup, i) + d3_svg_arcOffset, a1 = endAngle.call(self, subgroup, i) + d3_svg_arcOffset;
+-      return {
+-        r: r,
+-        a0: a0,
+-        a1: a1,
+-        p0: [ r * Math.cos(a0), r * Math.sin(a0) ],
+-        p1: [ r * Math.cos(a1), r * Math.sin(a1) ]
+-      };
+-    }
+-    function equals(a, b) {
+-      return a.a0 == b.a0 && a.a1 == b.a1;
+-    }
+-    function arc(r, p, a) {
+-      return "A" + r + "," + r + " 0 " + +(a > π) + ",1 " + p;
+-    }
+-    function curve(r0, p0, r1, p1) {
+-      return "Q 0,0 " + p1;
+-    }
+-    chord.radius = function(v) {
+-      if (!arguments.length) return radius;
+-      radius = d3_functor(v);
+-      return chord;
+-    };
+-    chord.source = function(v) {
+-      if (!arguments.length) return source;
+-      source = d3_functor(v);
+-      return chord;
+-    };
+-    chord.target = function(v) {
+-      if (!arguments.length) return target;
+-      target = d3_functor(v);
+-      return chord;
+-    };
+-    chord.startAngle = function(v) {
+-      if (!arguments.length) return startAngle;
+-      startAngle = d3_functor(v);
+-      return chord;
+-    };
+-    chord.endAngle = function(v) {
+-      if (!arguments.length) return endAngle;
+-      endAngle = d3_functor(v);
+-      return chord;
+-    };
+-    return chord;
+-  };
+-  function d3_svg_chordRadius(d) {
+-    return d.radius;
+-  }
+-  d3.svg.diagonal = function() {
+-    var source = d3_source, target = d3_target, projection = d3_svg_diagonalProjection;
+-    function diagonal(d, i) {
+-      var p0 = source.call(this, d, i), p3 = target.call(this, d, i), m = (p0.y + p3.y) / 2, p = [ p0, {
+-        x: p0.x,
+-        y: m
+-      }, {
+-        x: p3.x,
+-        y: m
+-      }, p3 ];
+-      p = p.map(projection);
+-      return "M" + p[0] + "C" + p[1] + " " + p[2] + " " + p[3];
+-    }
+-    diagonal.source = function(x) {
+-      if (!arguments.length) return source;
+-      source = d3_functor(x);
+-      return diagonal;
+-    };
+-    diagonal.target = function(x) {
+-      if (!arguments.length) return target;
+-      target = d3_functor(x);
+-      return diagonal;
+-    };
+-    diagonal.projection = function(x) {
+-      if (!arguments.length) return projection;
+-      projection = x;
+-      return diagonal;
+-    };
+-    return diagonal;
+-  };
+-  function d3_svg_diagonalProjection(d) {
+-    return [ d.x, d.y ];
+-  }
+-  d3.svg.diagonal.radial = function() {
+-    var diagonal = d3.svg.diagonal(), projection = d3_svg_diagonalProjection, projection_ = diagonal.projection;
+-    diagonal.projection = function(x) {
+-      return arguments.length ? projection_(d3_svg_diagonalRadialProjection(projection = x)) : projection;
+-    };
+-    return diagonal;
+-  };
+-  function d3_svg_diagonalRadialProjection(projection) {
+-    return function() {
+-      var d = projection.apply(this, arguments), r = d[0], a = d[1] + d3_svg_arcOffset;
+-      return [ r * Math.cos(a), r * Math.sin(a) ];
+-    };
+-  }
+-  d3.svg.symbol = function() {
+-    var type = d3_svg_symbolType, size = d3_svg_symbolSize;
+-    function symbol(d, i) {
+-      return (d3_svg_symbols.get(type.call(this, d, i)) || d3_svg_symbolCircle)(size.call(this, d, i));
+-    }
+-    symbol.type = function(x) {
+-      if (!arguments.length) return type;
+-      type = d3_functor(x);
+-      return symbol;
+-    };
+-    symbol.size = function(x) {
+-      if (!arguments.length) return size;
+-      size = d3_functor(x);
+-      return symbol;
+-    };
+-    return symbol;
+-  };
+-  function d3_svg_symbolSize() {
+-    return 64;
+-  }
+-  function d3_svg_symbolType() {
+-    return "circle";
+-  }
+-  function d3_svg_symbolCircle(size) {
+-    var r = Math.sqrt(size / π);
+-    return "M0," + r + "A" + r + "," + r + " 0 1,1 0," + -r + "A" + r + "," + r + " 0 1,1 0," + r + "Z";
+-  }
+-  var d3_svg_symbols = d3.map({
+-    circle: d3_svg_symbolCircle,
+-    cross: function(size) {
+-      var r = Math.sqrt(size / 5) / 2;
+-      return "M" + -3 * r + "," + -r + "H" + -r + "V" + -3 * r + "H" + r + "V" + -r + "H" + 3 * r + "V" + r + "H" + r + "V" + 3 * r + "H" + -r + "V" + r + "H" + -3 * r + "Z";
+-    },
+-    diamond: function(size) {
+-      var ry = Math.sqrt(size / (2 * d3_svg_symbolTan30)), rx = ry * d3_svg_symbolTan30;
+-      return "M0," + -ry + "L" + rx + ",0" + " 0," + ry + " " + -rx + ",0" + "Z";
+-    },
+-    square: function(size) {
+-      var r = Math.sqrt(size) / 2;
+-      return "M" + -r + "," + -r + "L" + r + "," + -r + " " + r + "," + r + " " + -r + "," + r + "Z";
+-    },
+-    "triangle-down": function(size) {
+-      var rx = Math.sqrt(size / d3_svg_symbolSqrt3), ry = rx * d3_svg_symbolSqrt3 / 2;
+-      return "M0," + ry + "L" + rx + "," + -ry + " " + -rx + "," + -ry + "Z";
+-    },
+-    "triangle-up": function(size) {
+-      var rx = Math.sqrt(size / d3_svg_symbolSqrt3), ry = rx * d3_svg_symbolSqrt3 / 2;
+-      return "M0," + -ry + "L" + rx + "," + ry + " " + -rx + "," + ry + "Z";
+-    }
+-  });
+-  d3.svg.symbolTypes = d3_svg_symbols.keys();
+-  var d3_svg_symbolSqrt3 = Math.sqrt(3), d3_svg_symbolTan30 = Math.tan(30 * d3_radians);
+-  function d3_transition(groups, id) {
+-    d3_subclass(groups, d3_transitionPrototype);
+-    groups.id = id;
+-    return groups;
+-  }
+-  var d3_transitionPrototype = [], d3_transitionId = 0, d3_transitionInheritId, d3_transitionInherit;
+-  d3_transitionPrototype.call = d3_selectionPrototype.call;
+-  d3_transitionPrototype.empty = d3_selectionPrototype.empty;
+-  d3_transitionPrototype.node = d3_selectionPrototype.node;
+-  d3_transitionPrototype.size = d3_selectionPrototype.size;
+-  d3.transition = function(selection) {
+-    return arguments.length ? d3_transitionInheritId ? selection.transition() : selection : d3_selectionRoot.transition();
+-  };
+-  d3.transition.prototype = d3_transitionPrototype;
+-  d3_transitionPrototype.select = function(selector) {
+-    var id = this.id, subgroups = [], subgroup, subnode, node;
+-    selector = d3_selection_selector(selector);
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      subgroups.push(subgroup = []);
+-      for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
+-        if ((node = group[i]) && (subnode = selector.call(node, node.__data__, i, j))) {
+-          if ("__data__" in node) subnode.__data__ = node.__data__;
+-          d3_transitionNode(subnode, i, id, node.__transition__[id]);
+-          subgroup.push(subnode);
+-        } else {
+-          subgroup.push(null);
+-        }
+-      }
+-    }
+-    return d3_transition(subgroups, id);
+-  };
+-  d3_transitionPrototype.selectAll = function(selector) {
+-    var id = this.id, subgroups = [], subgroup, subnodes, node, subnode, transition;
+-    selector = d3_selection_selectorAll(selector);
+-    for (var j = -1, m = this.length; ++j < m; ) {
+-      for (var group = this[j], i = -1, n = group.length; ++i < n; ) {
+-        if (node = group[i]) {
+-          transition = node.__transition__[id];
+-          subnodes = selector.call(node, node.__data__, i, j);
+-          subgroups.push(subgroup = []);
+-          for (var k = -1, o = subnodes.length; ++k < o; ) {
+-            if (subnode = subnodes[k]) d3_transitionNode(subnode, k, id, transition);
+-            subgroup.push(subnode);
+-          }
+-        }
+-      }
+-    }
+-    return d3_transition(subgroups, id);
+-  };
+-  d3_transitionPrototype.filter = function(filter) {
+-    var subgroups = [], subgroup, group, node;
+-    if (typeof filter !== "function") filter = d3_selection_filter(filter);
+-    for (var j = 0, m = this.length; j < m; j++) {
+-      subgroups.push(subgroup = []);
+-      for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+-        if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+-          subgroup.push(node);
+-        }
+-      }
+-    }
+-    return d3_transition(subgroups, this.id);
+-  };
+-  d3_transitionPrototype.tween = function(name, tween) {
+-    var id = this.id;
+-    if (arguments.length < 2) return this.node().__transition__[id].tween.get(name);
+-    return d3_selection_each(this, tween == null ? function(node) {
+-      node.__transition__[id].tween.remove(name);
+-    } : function(node) {
+-      node.__transition__[id].tween.set(name, tween);
+-    });
+-  };
+-  function d3_transition_tween(groups, name, value, tween) {
+-    var id = groups.id;
+-    return d3_selection_each(groups, typeof value === "function" ? function(node, i, j) {
+-      node.__transition__[id].tween.set(name, tween(value.call(node, node.__data__, i, j)));
+-    } : (value = tween(value), function(node) {
+-      node.__transition__[id].tween.set(name, value);
+-    }));
+-  }
+-  d3_transitionPrototype.attr = function(nameNS, value) {
+-    if (arguments.length < 2) {
+-      for (value in nameNS) this.attr(value, nameNS[value]);
+-      return this;
+-    }
+-    var interpolate = nameNS == "transform" ? d3_interpolateTransform : d3_interpolate, name = d3.ns.qualify(nameNS);
+-    function attrNull() {
+-      this.removeAttribute(name);
+-    }
+-    function attrNullNS() {
+-      this.removeAttributeNS(name.space, name.local);
+-    }
+-    function attrTween(b) {
+-      return b == null ? attrNull : (b += "", function() {
+-        var a = this.getAttribute(name), i;
+-        return a !== b && (i = interpolate(a, b), function(t) {
+-          this.setAttribute(name, i(t));
+-        });
+-      });
+-    }
+-    function attrTweenNS(b) {
+-      return b == null ? attrNullNS : (b += "", function() {
+-        var a = this.getAttributeNS(name.space, name.local), i;
+-        return a !== b && (i = interpolate(a, b), function(t) {
+-          this.setAttributeNS(name.space, name.local, i(t));
+-        });
+-      });
+-    }
+-    return d3_transition_tween(this, "attr." + nameNS, value, name.local ? attrTweenNS : attrTween);
+-  };
+-  d3_transitionPrototype.attrTween = function(nameNS, tween) {
+-    var name = d3.ns.qualify(nameNS);
+-    function attrTween(d, i) {
+-      var f = tween.call(this, d, i, this.getAttribute(name));
+-      return f && function(t) {
+-        this.setAttribute(name, f(t));
+-      };
+-    }
+-    function attrTweenNS(d, i) {
+-      var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
+-      return f && function(t) {
+-        this.setAttributeNS(name.space, name.local, f(t));
+-      };
+-    }
+-    return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
+-  };
+-  d3_transitionPrototype.style = function(name, value, priority) {
+-    var n = arguments.length;
+-    if (n < 3) {
+-      if (typeof name !== "string") {
+-        if (n < 2) value = "";
+-        for (priority in name) this.style(priority, name[priority], value);
+-        return this;
+-      }
+-      priority = "";
+-    }
+-    function styleNull() {
+-      this.style.removeProperty(name);
+-    }
+-    function styleString(b) {
+-      return b == null ? styleNull : (b += "", function() {
+-        var a = d3_window.getComputedStyle(this, null).getPropertyValue(name), i;
+-        return a !== b && (i = d3_interpolate(a, b), function(t) {
+-          this.style.setProperty(name, i(t), priority);
+-        });
+-      });
+-    }
+-    return d3_transition_tween(this, "style." + name, value, styleString);
+-  };
+-  d3_transitionPrototype.styleTween = function(name, tween, priority) {
+-    if (arguments.length < 3) priority = "";
+-    function styleTween(d, i) {
+-      var f = tween.call(this, d, i, d3_window.getComputedStyle(this, null).getPropertyValue(name));
+-      return f && function(t) {
+-        this.style.setProperty(name, f(t), priority);
+-      };
+-    }
+-    return this.tween("style." + name, styleTween);
+-  };
+-  d3_transitionPrototype.text = function(value) {
+-    return d3_transition_tween(this, "text", value, d3_transition_text);
+-  };
+-  function d3_transition_text(b) {
+-    if (b == null) b = "";
+-    return function() {
+-      this.textContent = b;
+-    };
+-  }
+-  d3_transitionPrototype.remove = function() {
+-    return this.each("end.transition", function() {
+-      var p;
+-      if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this);
+-    });
+-  };
+-  d3_transitionPrototype.ease = function(value) {
+-    var id = this.id;
+-    if (arguments.length < 1) return this.node().__transition__[id].ease;
+-    if (typeof value !== "function") value = d3.ease.apply(d3, arguments);
+-    return d3_selection_each(this, function(node) {
+-      node.__transition__[id].ease = value;
+-    });
+-  };
+-  d3_transitionPrototype.delay = function(value) {
+-    var id = this.id;
+-    return d3_selection_each(this, typeof value === "function" ? function(node, i, j) {
+-      node.__transition__[id].delay = value.call(node, node.__data__, i, j) | 0;
+-    } : (value |= 0, function(node) {
+-      node.__transition__[id].delay = value;
+-    }));
+-  };
+-  d3_transitionPrototype.duration = function(value) {
+-    var id = this.id;
+-    return d3_selection_each(this, typeof value === "function" ? function(node, i, j) {
+-      node.__transition__[id].duration = Math.max(1, value.call(node, node.__data__, i, j) | 0);
+-    } : (value = Math.max(1, value | 0), function(node) {
+-      node.__transition__[id].duration = value;
+-    }));
+-  };
+-  d3_transitionPrototype.each = function(type, listener) {
+-    var id = this.id;
+-    if (arguments.length < 2) {
+-      var inherit = d3_transitionInherit, inheritId = d3_transitionInheritId;
+-      d3_transitionInheritId = id;
+-      d3_selection_each(this, function(node, i, j) {
+-        d3_transitionInherit = node.__transition__[id];
+-        type.call(node, node.__data__, i, j);
+-      });
+-      d3_transitionInherit = inherit;
+-      d3_transitionInheritId = inheritId;
+-    } else {
+-      d3_selection_each(this, function(node) {
+-        var transition = node.__transition__[id];
+-        (transition.event || (transition.event = d3.dispatch("start", "end"))).on(type, listener);
+-      });
+-    }
+-    return this;
+-  };
+-  d3_transitionPrototype.transition = function() {
+-    var id0 = this.id, id1 = ++d3_transitionId, subgroups = [], subgroup, group, node, transition;
+-    for (var j = 0, m = this.length; j < m; j++) {
+-      subgroups.push(subgroup = []);
+-      for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+-        if (node = group[i]) {
+-          transition = Object.create(node.__transition__[id0]);
+-          transition.delay += transition.duration;
+-          d3_transitionNode(node, i, id1, transition);
+-        }
+-        subgroup.push(node);
+-      }
+-    }
+-    return d3_transition(subgroups, id1);
+-  };
+-  function d3_transitionNode(node, i, id, inherit) {
+-    var lock = node.__transition__ || (node.__transition__ = {
+-      active: 0,
+-      count: 0
+-    }), transition = lock[id];
+-    if (!transition) {
+-      var time = inherit.time;
+-      transition = lock[id] = {
+-        tween: new d3_Map(),
+-        time: time,
+-        ease: inherit.ease,
+-        delay: inherit.delay,
+-        duration: inherit.duration
+-      };
+-      ++lock.count;
+-      d3.timer(function(elapsed) {
+-        var d = node.__data__, ease = transition.ease, delay = transition.delay, duration = transition.duration, tweened = [];
+-        if (delay <= elapsed) return start(elapsed);
+-        d3_timer_replace(start, delay, time);
+-        function start(elapsed) {
+-          if (lock.active > id) return stop();
+-          lock.active = id;
+-          transition.event && transition.event.start.call(node, d, i);
+-          transition.tween.forEach(function(key, value) {
+-            if (value = value.call(node, d, i)) {
+-              tweened.push(value);
+-            }
+-          });
+-          if (tick(elapsed)) return 1;
+-          d3_timer_replace(tick, 0, time);
+-        }
+-        function tick(elapsed) {
+-          if (lock.active !== id) return stop();
+-          var t = (elapsed - delay) / duration, e = ease(t), n = tweened.length;
+-          while (n > 0) {
+-            tweened[--n].call(node, e);
+-          }
+-          if (t >= 1) {
+-            stop();
+-            transition.event && transition.event.end.call(node, d, i);
+-            return 1;
+-          }
+-        }
+-        function stop() {
+-          if (--lock.count) delete lock[id]; else delete node.__transition__;
+-          return 1;
+-        }
+-      }, 0, time);
+-    }
+-  }
+-  d3.svg.axis = function() {
+-    var scale = d3.scale.linear(), orient = d3_svg_axisDefaultOrient, tickMajorSize = 6, tickMinorSize = 6, tickEndSize = 6, tickPadding = 3, tickArguments_ = [ 10 ], tickValues = null, tickFormat_, tickSubdivide = 0;
+-    function axis(g) {
+-      g.each(function() {
+-        var g = d3.select(this);
+-        var ticks = tickValues == null ? scale.ticks ? scale.ticks.apply(scale, tickArguments_) : scale.domain() : tickValues, tickFormat = tickFormat_ == null ? scale.tickFormat ? scale.tickFormat.apply(scale, tickArguments_) : String : tickFormat_;
+-        var subticks = d3_svg_axisSubdivide(scale, ticks, tickSubdivide), subtick = g.selectAll(".tick.minor").data(subticks, String), subtickEnter = subtick.enter().insert("line", ".tick").attr("class", "tick minor").style("opacity", 1e-6), subtickExit = d3.transition(subtick.exit()).style("opacity", 1e-6).remove(), subtickUpdate = d3.transition(subtick).style("opacity", 1);
+-        var tick = g.selectAll(".tick.major").data(ticks, String), tickEnter = tick.enter().insert("g", ".domain").attr("class", "tick major").style("opacity", 1e-6), tickExit = d3.transition(tick.exit()).style("opacity", 1e-6).remove(), tickUpdate = d3.transition(tick).style("opacity", 1), tickTransform;
+-        var range = d3_scaleRange(scale), path = g.selectAll(".domain").data([ 0 ]), pathUpdate = (path.enter().append("path").attr("class", "domain"), 
+-        d3.transition(path));
+-        var scale1 = scale.copy(), scale0 = this.__chart__ || scale1;
+-        this.__chart__ = scale1;
+-        tickEnter.append("line");
+-        tickEnter.append("text");
+-        var lineEnter = tickEnter.select("line"), lineUpdate = tickUpdate.select("line"), text = tick.select("text").text(tickFormat), textEnter = tickEnter.select("text"), textUpdate = tickUpdate.select("text");
+-        switch (orient) {
+-         case "bottom":
+-          {
+-            tickTransform = d3_svg_axisX;
+-            subtickEnter.attr("y2", tickMinorSize);
+-            subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
+-            lineEnter.attr("y2", tickMajorSize);
+-            textEnter.attr("y", Math.max(tickMajorSize, 0) + tickPadding);
+-            lineUpdate.attr("x2", 0).attr("y2", tickMajorSize);
+-            textUpdate.attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding);
+-            text.attr("dy", ".71em").style("text-anchor", "middle");
+-            pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
+-            break;
+-          }
+-
+-         case "top":
+-          {
+-            tickTransform = d3_svg_axisX;
+-            subtickEnter.attr("y2", -tickMinorSize);
+-            subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
+-            lineEnter.attr("y2", -tickMajorSize);
+-            textEnter.attr("y", -(Math.max(tickMajorSize, 0) + tickPadding));
+-            lineUpdate.attr("x2", 0).attr("y2", -tickMajorSize);
+-            textUpdate.attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding));
+-            text.attr("dy", "0em").style("text-anchor", "middle");
+-            pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
+-            break;
+-          }
+-
+-         case "left":
+-          {
+-            tickTransform = d3_svg_axisY;
+-            subtickEnter.attr("x2", -tickMinorSize);
+-            subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
+-            lineEnter.attr("x2", -tickMajorSize);
+-            textEnter.attr("x", -(Math.max(tickMajorSize, 0) + tickPadding));
+-            lineUpdate.attr("x2", -tickMajorSize).attr("y2", 0);
+-            textUpdate.attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0);
+-            text.attr("dy", ".32em").style("text-anchor", "end");
+-            pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
+-            break;
+-          }
+-
+-         case "right":
+-          {
+-            tickTransform = d3_svg_axisY;
+-            subtickEnter.attr("x2", tickMinorSize);
+-            subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
+-            lineEnter.attr("x2", tickMajorSize);
+-            textEnter.attr("x", Math.max(tickMajorSize, 0) + tickPadding);
+-            lineUpdate.attr("x2", tickMajorSize).attr("y2", 0);
+-            textUpdate.attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0);
+-            text.attr("dy", ".32em").style("text-anchor", "start");
+-            pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);
+-            break;
+-          }
+-        }
+-        if (scale.rangeBand) {
+-          var dx = scale1.rangeBand() / 2, x = function(d) {
+-            return scale1(d) + dx;
+-          };
+-          tickEnter.call(tickTransform, x);
+-          tickUpdate.call(tickTransform, x);
+-        } else {
+-          tickEnter.call(tickTransform, scale0);
+-          tickUpdate.call(tickTransform, scale1);
+-          tickExit.call(tickTransform, scale1);
+-          subtickEnter.call(tickTransform, scale0);
+-          subtickUpdate.call(tickTransform, scale1);
+-          subtickExit.call(tickTransform, scale1);
+-        }
+-      });
+-    }
+-    axis.scale = function(x) {
+-      if (!arguments.length) return scale;
+-      scale = x;
+-      return axis;
+-    };
+-    axis.orient = function(x) {
+-      if (!arguments.length) return orient;
+-      orient = x in d3_svg_axisOrients ? x + "" : d3_svg_axisDefaultOrient;
+-      return axis;
+-    };
+-    axis.ticks = function() {
+-      if (!arguments.length) return tickArguments_;
+-      tickArguments_ = arguments;
+-      return axis;
+-    };
+-    axis.tickValues = function(x) {
+-      if (!arguments.length) return tickValues;
+-      tickValues = x;
+-      return axis;
+-    };
+-    axis.tickFormat = function(x) {
+-      if (!arguments.length) return tickFormat_;
+-      tickFormat_ = x;
+-      return axis;
+-    };
+-    axis.tickSize = function(x, y) {
+-      if (!arguments.length) return tickMajorSize;
+-      var n = arguments.length - 1;
+-      tickMajorSize = +x;
+-      tickMinorSize = n > 1 ? +y : tickMajorSize;
+-      tickEndSize = n > 0 ? +arguments[n] : tickMajorSize;
+-      return axis;
+-    };
+-    axis.tickPadding = function(x) {
+-      if (!arguments.length) return tickPadding;
+-      tickPadding = +x;
+-      return axis;
+-    };
+-    axis.tickSubdivide = function(x) {
+-      if (!arguments.length) return tickSubdivide;
+-      tickSubdivide = +x;
+-      return axis;
+-    };
+-    return axis;
+-  };
+-  var d3_svg_axisDefaultOrient = "bottom", d3_svg_axisOrients = {
+-    top: 1,
+-    right: 1,
+-    bottom: 1,
+-    left: 1
+-  };
+-  function d3_svg_axisX(selection, x) {
+-    selection.attr("transform", function(d) {
+-      return "translate(" + x(d) + ",0)";
+-    });
+-  }
+-  function d3_svg_axisY(selection, y) {
+-    selection.attr("transform", function(d) {
+-      return "translate(0," + y(d) + ")";
+-    });
+-  }
+-  function d3_svg_axisSubdivide(scale, ticks, m) {
+-    subticks = [];
+-    if (m && ticks.length > 1) {
+-      var extent = d3_scaleExtent(scale.domain()), subticks, i = -1, n = ticks.length, d = (ticks[1] - ticks[0]) / ++m, j, v;
+-      while (++i < n) {
+-        for (j = m; --j > 0; ) {
+-          if ((v = +ticks[i] - j * d) >= extent[0]) {
+-            subticks.push(v);
+-          }
+-        }
+-      }
+-      for (--i, j = 0; ++j < m && (v = +ticks[i] + j * d) < extent[1]; ) {
+-        subticks.push(v);
+-      }
+-    }
+-    return subticks;
+-  }
+-  d3.svg.brush = function() {
+-    var event = d3_eventDispatch(brush, "brushstart", "brush", "brushend"), x = null, y = null, resizes = d3_svg_brushResizes[0], extent = [ [ 0, 0 ], [ 0, 0 ] ], clamp = [ true, true ], extentDomain;
+-    function brush(g) {
+-      g.each(function() {
+-        var g = d3.select(this), bg = g.selectAll(".background").data([ 0 ]), fg = g.selectAll(".extent").data([ 0 ]), tz = g.selectAll(".resize").data(resizes, String), e;
+-        g.style("pointer-events", "all").on("mousedown.brush", brushstart).on("touchstart.brush", brushstart);
+-        bg.enter().append("rect").attr("class", "background").style("visibility", "hidden").style("cursor", "crosshair");
+-        fg.enter().append("rect").attr("class", "extent").style("cursor", "move");
+-        tz.enter().append("g").attr("class", function(d) {
+-          return "resize " + d;
+-        }).style("cursor", function(d) {
+-          return d3_svg_brushCursor[d];
+-        }).append("rect").attr("x", function(d) {
+-          return /[ew]$/.test(d) ? -3 : null;
+-        }).attr("y", function(d) {
+-          return /^[ns]/.test(d) ? -3 : null;
+-        }).attr("width", 6).attr("height", 6).style("visibility", "hidden");
+-        tz.style("display", brush.empty() ? "none" : null);
+-        tz.exit().remove();
+-        if (x) {
+-          e = d3_scaleRange(x);
+-          bg.attr("x", e[0]).attr("width", e[1] - e[0]);
+-          redrawX(g);
+-        }
+-        if (y) {
+-          e = d3_scaleRange(y);
+-          bg.attr("y", e[0]).attr("height", e[1] - e[0]);
+-          redrawY(g);
+-        }
+-        redraw(g);
+-      });
+-    }
+-    function redraw(g) {
+-      g.selectAll(".resize").attr("transform", function(d) {
+-        return "translate(" + extent[+/e$/.test(d)][0] + "," + extent[+/^s/.test(d)][1] + ")";
+-      });
+-    }
+-    function redrawX(g) {
+-      g.select(".extent").attr("x", extent[0][0]);
+-      g.selectAll(".extent,.n>rect,.s>rect").attr("width", extent[1][0] - extent[0][0]);
+-    }
+-    function redrawY(g) {
+-      g.select(".extent").attr("y", extent[0][1]);
+-      g.selectAll(".extent,.e>rect,.w>rect").attr("height", extent[1][1] - extent[0][1]);
+-    }
+-    function brushstart() {
+-      var target = this, eventTarget = d3.select(d3.event.target), event_ = event.of(target, arguments), g = d3.select(target), resizing = eventTarget.datum(), resizingX = !/^(n|s)$/.test(resizing) && x, resizingY = !/^(e|w)$/.test(resizing) && y, dragging = eventTarget.classed("extent"), dragRestore = d3_event_dragSuppress(), center, origin = mouse(), offset;
+-      var w = d3.select(d3_window).on("keydown.brush", keydown).on("keyup.brush", keyup);
+-      if (d3.event.changedTouches) {
+-        w.on("touchmove.brush", brushmove).on("touchend.brush", brushend);
+-      } else {
+-        w.on("mousemove.brush", brushmove).on("mouseup.brush", brushend);
+-      }
+-      if (dragging) {
+-        origin[0] = extent[0][0] - origin[0];
+-        origin[1] = extent[0][1] - origin[1];
+-      } else if (resizing) {
+-        var ex = +/w$/.test(resizing), ey = +/^n/.test(resizing);
+-        offset = [ extent[1 - ex][0] - origin[0], extent[1 - ey][1] - origin[1] ];
+-        origin[0] = extent[ex][0];
+-        origin[1] = extent[ey][1];
+-      } else if (d3.event.altKey) center = origin.slice();
+-      g.style("pointer-events", "none").selectAll(".resize").style("display", null);
+-      d3.select("body").style("cursor", eventTarget.style("cursor"));
+-      event_({
+-        type: "brushstart"
+-      });
+-      brushmove();
+-      function mouse() {
+-        var touches = d3.event.changedTouches;
+-        return touches ? d3.touches(target, touches)[0] : d3.mouse(target);
+-      }
+-      function keydown() {
+-        if (d3.event.keyCode == 32) {
+-          if (!dragging) {
+-            center = null;
+-            origin[0] -= extent[1][0];
+-            origin[1] -= extent[1][1];
+-            dragging = 2;
+-          }
+-          d3_eventPreventDefault();
+-        }
+-      }
+-      function keyup() {
+-        if (d3.event.keyCode == 32 && dragging == 2) {
+-          origin[0] += extent[1][0];
+-          origin[1] += extent[1][1];
+-          dragging = 0;
+-          d3_eventPreventDefault();
+-        }
+-      }
+-      function brushmove() {
+-        var point = mouse(), moved = false;
+-        if (offset) {
+-          point[0] += offset[0];
+-          point[1] += offset[1];
+-        }
+-        if (!dragging) {
+-          if (d3.event.altKey) {
+-            if (!center) center = [ (extent[0][0] + extent[1][0]) / 2, (extent[0][1] + extent[1][1]) / 2 ];
+-            origin[0] = extent[+(point[0] < center[0])][0];
+-            origin[1] = extent[+(point[1] < center[1])][1];
+-          } else center = null;
+-        }
+-        if (resizingX && move1(point, x, 0)) {
+-          redrawX(g);
+-          moved = true;
+-        }
+-        if (resizingY && move1(point, y, 1)) {
+-          redrawY(g);
+-          moved = true;
+-        }
+-        if (moved) {
+-          redraw(g);
+-          event_({
+-            type: "brush",
+-            mode: dragging ? "move" : "resize"
+-          });
+-        }
+-      }
+-      function move1(point, scale, i) {
+-        var range = d3_scaleRange(scale), r0 = range[0], r1 = range[1], position = origin[i], size = extent[1][i] - extent[0][i], min, max;
+-        if (dragging) {
+-          r0 -= position;
+-          r1 -= size + position;
+-        }
+-        min = clamp[i] ? Math.max(r0, Math.min(r1, point[i])) : point[i];
+-        if (dragging) {
+-          max = (min += position) + size;
+-        } else {
+-          if (center) position = Math.max(r0, Math.min(r1, 2 * center[i] - min));
+-          if (position < min) {
+-            max = min;
+-            min = position;
+-          } else {
+-            max = position;
+-          }
+-        }
+-        if (extent[0][i] !== min || extent[1][i] !== max) {
+-          extentDomain = null;
+-          extent[0][i] = min;
+-          extent[1][i] = max;
+-          return true;
+-        }
+-      }
+-      function brushend() {
+-        brushmove();
+-        g.style("pointer-events", "all").selectAll(".resize").style("display", brush.empty() ? "none" : null);
+-        d3.select("body").style("cursor", null);
+-        w.on("mousemove.brush", null).on("mouseup.brush", null).on("touchmove.brush", null).on("touchend.brush", null).on("keydown.brush", null).on("keyup.brush", null);
+-        dragRestore();
+-        event_({
+-          type: "brushend"
+-        });
+-      }
+-    }
+-    brush.x = function(z) {
+-      if (!arguments.length) return x;
+-      x = z;
+-      resizes = d3_svg_brushResizes[!x << 1 | !y];
+-      return brush;
+-    };
+-    brush.y = function(z) {
+-      if (!arguments.length) return y;
+-      y = z;
+-      resizes = d3_svg_brushResizes[!x << 1 | !y];
+-      return brush;
+-    };
+-    brush.clamp = function(z) {
+-      if (!arguments.length) return x && y ? clamp : x || y ? clamp[+!x] : null;
+-      if (x && y) clamp = [ !!z[0], !!z[1] ]; else if (x || y) clamp[+!x] = !!z;
+-      return brush;
+-    };
+-    brush.extent = function(z) {
+-      var x0, x1, y0, y1, t;
+-      if (!arguments.length) {
+-        z = extentDomain || extent;
+-        if (x) {
+-          x0 = z[0][0], x1 = z[1][0];
+-          if (!extentDomain) {
+-            x0 = extent[0][0], x1 = extent[1][0];
+-            if (x.invert) x0 = x.invert(x0), x1 = x.invert(x1);
+-            if (x1 < x0) t = x0, x0 = x1, x1 = t;
+-          }
+-        }
+-        if (y) {
+-          y0 = z[0][1], y1 = z[1][1];
+-          if (!extentDomain) {
+-            y0 = extent[0][1], y1 = extent[1][1];
+-            if (y.invert) y0 = y.invert(y0), y1 = y.invert(y1);
+-            if (y1 < y0) t = y0, y0 = y1, y1 = t;
+-          }
+-        }
+-        return x && y ? [ [ x0, y0 ], [ x1, y1 ] ] : x ? [ x0, x1 ] : y && [ y0, y1 ];
+-      }
+-      extentDomain = [ [ 0, 0 ], [ 0, 0 ] ];
+-      if (x) {
+-        x0 = z[0], x1 = z[1];
+-        if (y) x0 = x0[0], x1 = x1[0];
+-        extentDomain[0][0] = x0, extentDomain[1][0] = x1;
+-        if (x.invert) x0 = x(x0), x1 = x(x1);
+-        if (x1 < x0) t = x0, x0 = x1, x1 = t;
+-        extent[0][0] = x0 | 0, extent[1][0] = x1 | 0;
+-      }
+-      if (y) {
+-        y0 = z[0], y1 = z[1];
+-        if (x) y0 = y0[1], y1 = y1[1];
+-        extentDomain[0][1] = y0, extentDomain[1][1] = y1;
+-        if (y.invert) y0 = y(y0), y1 = y(y1);
+-        if (y1 < y0) t = y0, y0 = y1, y1 = t;
+-        extent[0][1] = y0 | 0, extent[1][1] = y1 | 0;
+-      }
+-      return brush;
+-    };
+-    brush.clear = function() {
+-      extentDomain = null;
+-      extent[0][0] = extent[0][1] = extent[1][0] = extent[1][1] = 0;
+-      return brush;
+-    };
+-    brush.empty = function() {
+-      return x && extent[0][0] === extent[1][0] || y && extent[0][1] === extent[1][1];
+-    };
+-    return d3.rebind(brush, event, "on");
+-  };
+-  var d3_svg_brushCursor = {
+-    n: "ns-resize",
+-    e: "ew-resize",
+-    s: "ns-resize",
+-    w: "ew-resize",
+-    nw: "nwse-resize",
+-    ne: "nesw-resize",
+-    se: "nwse-resize",
+-    sw: "nesw-resize"
+-  };
+-  var d3_svg_brushResizes = [ [ "n", "e", "s", "w", "nw", "ne", "se", "sw" ], [ "e", "w" ], [ "n", "s" ], [] ];
+-  d3.time = {};
+-  var d3_time = Date, d3_time_daySymbols = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ];
+-  function d3_time_utc() {
+-    this._ = new Date(arguments.length > 1 ? Date.UTC.apply(this, arguments) : arguments[0]);
+-  }
+-  d3_time_utc.prototype = {
+-    getDate: function() {
+-      return this._.getUTCDate();
+-    },
+-    getDay: function() {
+-      return this._.getUTCDay();
+-    },
+-    getFullYear: function() {
+-      return this._.getUTCFullYear();
+-    },
+-    getHours: function() {
+-      return this._.getUTCHours();
+-    },
+-    getMilliseconds: function() {
+-      return this._.getUTCMilliseconds();
+-    },
+-    getMinutes: function() {
+-      return this._.getUTCMinutes();
+-    },
+-    getMonth: function() {
+-      return this._.getUTCMonth();
+-    },
+-    getSeconds: function() {
+-      return this._.getUTCSeconds();
+-    },
+-    getTime: function() {
+-      return this._.getTime();
+-    },
+-    getTimezoneOffset: function() {
+-      return 0;
+-    },
+-    valueOf: function() {
+-      return this._.valueOf();
+-    },
+-    setDate: function() {
+-      d3_time_prototype.setUTCDate.apply(this._, arguments);
+-    },
+-    setDay: function() {
+-      d3_time_prototype.setUTCDay.apply(this._, arguments);
+-    },
+-    setFullYear: function() {
+-      d3_time_prototype.setUTCFullYear.apply(this._, arguments);
+-    },
+-    setHours: function() {
+-      d3_time_prototype.setUTCHours.apply(this._, arguments);
+-    },
+-    setMilliseconds: function() {
+-      d3_time_prototype.setUTCMilliseconds.apply(this._, arguments);
+-    },
+-    setMinutes: function() {
+-      d3_time_prototype.setUTCMinutes.apply(this._, arguments);
+-    },
+-    setMonth: function() {
+-      d3_time_prototype.setUTCMonth.apply(this._, arguments);
+-    },
+-    setSeconds: function() {
+-      d3_time_prototype.setUTCSeconds.apply(this._, arguments);
+-    },
+-    setTime: function() {
+-      d3_time_prototype.setTime.apply(this._, arguments);
+-    }
+-  };
+-  var d3_time_prototype = Date.prototype;
+-  var d3_time_formatDateTime = "%a %b %e %X %Y", d3_time_formatDate = "%m/%d/%Y", d3_time_formatTime = "%H:%M:%S";
+-  var d3_time_days = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], d3_time_dayAbbreviations = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], d3_time_months = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ], d3_time_monthAbbreviations = [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ];
+-  function d3_time_interval(local, step, number) {
+-    function round(date) {
+-      var d0 = local(date), d1 = offset(d0, 1);
+-      return date - d0 < d1 - date ? d0 : d1;
+-    }
+-    function ceil(date) {
+-      step(date = local(new d3_time(date - 1)), 1);
+-      return date;
+-    }
+-    function offset(date, k) {
+-      step(date = new d3_time(+date), k);
+-      return date;
+-    }
+-    function range(t0, t1, dt) {
+-      var time = ceil(t0), times = [];
+-      if (dt > 1) {
+-        while (time < t1) {
+-          if (!(number(time) % dt)) times.push(new Date(+time));
+-          step(time, 1);
+-        }
+-      } else {
+-        while (time < t1) times.push(new Date(+time)), step(time, 1);
+-      }
+-      return times;
+-    }
+-    function range_utc(t0, t1, dt) {
+-      try {
+-        d3_time = d3_time_utc;
+-        var utc = new d3_time_utc();
+-        utc._ = t0;
+-        return range(utc, t1, dt);
+-      } finally {
+-        d3_time = Date;
+-      }
+-    }
+-    local.floor = local;
+-    local.round = round;
+-    local.ceil = ceil;
+-    local.offset = offset;
+-    local.range = range;
+-    var utc = local.utc = d3_time_interval_utc(local);
+-    utc.floor = utc;
+-    utc.round = d3_time_interval_utc(round);
+-    utc.ceil = d3_time_interval_utc(ceil);
+-    utc.offset = d3_time_interval_utc(offset);
+-    utc.range = range_utc;
+-    return local;
+-  }
+-  function d3_time_interval_utc(method) {
+-    return function(date, k) {
+-      try {
+-        d3_time = d3_time_utc;
+-        var utc = new d3_time_utc();
+-        utc._ = date;
+-        return method(utc, k)._;
+-      } finally {
+-        d3_time = Date;
+-      }
+-    };
+-  }
+-  d3.time.year = d3_time_interval(function(date) {
+-    date = d3.time.day(date);
+-    date.setMonth(0, 1);
+-    return date;
+-  }, function(date, offset) {
+-    date.setFullYear(date.getFullYear() + offset);
+-  }, function(date) {
+-    return date.getFullYear();
+-  });
+-  d3.time.years = d3.time.year.range;
+-  d3.time.years.utc = d3.time.year.utc.range;
+-  d3.time.day = d3_time_interval(function(date) {
+-    var day = new d3_time(2e3, 0);
+-    day.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
+-    return day;
+-  }, function(date, offset) {
+-    date.setDate(date.getDate() + offset);
+-  }, function(date) {
+-    return date.getDate() - 1;
+-  });
+-  d3.time.days = d3.time.day.range;
+-  d3.time.days.utc = d3.time.day.utc.range;
+-  d3.time.dayOfYear = function(date) {
+-    var year = d3.time.year(date);
+-    return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
+-  };
+-  d3_time_daySymbols.forEach(function(day, i) {
+-    day = day.toLowerCase();
+-    i = 7 - i;
+-    var interval = d3.time[day] = d3_time_interval(function(date) {
+-      (date = d3.time.day(date)).setDate(date.getDate() - (date.getDay() + i) % 7);
+-      return date;
+-    }, function(date, offset) {
+-      date.setDate(date.getDate() + Math.floor(offset) * 7);
+-    }, function(date) {
+-      var day = d3.time.year(date).getDay();
+-      return Math.floor((d3.time.dayOfYear(date) + (day + i) % 7) / 7) - (day !== i);
+-    });
+-    d3.time[day + "s"] = interval.range;
+-    d3.time[day + "s"].utc = interval.utc.range;
+-    d3.time[day + "OfYear"] = function(date) {
+-      var day = d3.time.year(date).getDay();
+-      return Math.floor((d3.time.dayOfYear(date) + (day + i) % 7) / 7);
+-    };
+-  });
+-  d3.time.week = d3.time.sunday;
+-  d3.time.weeks = d3.time.sunday.range;
+-  d3.time.weeks.utc = d3.time.sunday.utc.range;
+-  d3.time.weekOfYear = d3.time.sundayOfYear;
+-  d3.time.format = function(template) {
+-    var n = template.length;
+-    function format(date) {
+-      var string = [], i = -1, j = 0, c, p, f;
+-      while (++i < n) {
+-        if (template.charCodeAt(i) === 37) {
+-          string.push(template.substring(j, i));
+-          if ((p = d3_time_formatPads[c = template.charAt(++i)]) != null) c = template.charAt(++i);
+-          if (f = d3_time_formats[c]) c = f(date, p == null ? c === "e" ? " " : "0" : p);
+-          string.push(c);
+-          j = i + 1;
+-        }
+-      }
+-      string.push(template.substring(j, i));
+-      return string.join("");
+-    }
+-    format.parse = function(string) {
+-      var d = {
+-        y: 1900,
+-        m: 0,
+-        d: 1,
+-        H: 0,
+-        M: 0,
+-        S: 0,
+-        L: 0
+-      }, i = d3_time_parse(d, template, string, 0);
+-      if (i != string.length) return null;
+-      if ("p" in d) d.H = d.H % 12 + d.p * 12;
+-      var date = new d3_time();
+-      if ("j" in d) date.setFullYear(d.y, 0, d.j); else if ("w" in d && ("W" in d || "U" in d)) {
+-        date.setFullYear(d.y, 0, 1);
+-        date.setFullYear(d.y, 0, "W" in d ? (d.w + 6) % 7 + d.W * 7 - (date.getDay() + 5) % 7 : d.w + d.U * 7 - (date.getDay() + 6) % 7);
+-      } else date.setFullYear(d.y, d.m, d.d);
+-      date.setHours(d.H, d.M, d.S, d.L);
+-      return date;
+-    };
+-    format.toString = function() {
+-      return template;
+-    };
+-    return format;
+-  };
+-  function d3_time_parse(date, template, string, j) {
+-    var c, p, i = 0, n = template.length, m = string.length;
+-    while (i < n) {
+-      if (j >= m) return -1;
+-      c = template.charCodeAt(i++);
+-      if (c === 37) {
+-        p = d3_time_parsers[template.charAt(i++)];
+-        if (!p || (j = p(date, string, j)) < 0) return -1;
+-      } else if (c != string.charCodeAt(j++)) {
+-        return -1;
+-      }
+-    }
+-    return j;
+-  }
+-  function d3_time_formatRe(names) {
+-    return new RegExp("^(?:" + names.map(d3.requote).join("|") + ")", "i");
+-  }
+-  function d3_time_formatLookup(names) {
+-    var map = new d3_Map(), i = -1, n = names.length;
+-    while (++i < n) map.set(names[i].toLowerCase(), i);
+-    return map;
+-  }
+-  function d3_time_formatPad(value, fill, width) {
+-    var sign = value < 0 ? "-" : "", string = (sign ? -value : value) + "", length = string.length;
+-    return sign + (length < width ? new Array(width - length + 1).join(fill) + string : string);
+-  }
+-  var d3_time_dayRe = d3_time_formatRe(d3_time_days), d3_time_dayLookup = d3_time_formatLookup(d3_time_days), d3_time_dayAbbrevRe = d3_time_formatRe(d3_time_dayAbbreviations), d3_time_dayAbbrevLookup = d3_time_formatLookup(d3_time_dayAbbreviations), d3_time_monthRe = d3_time_formatRe(d3_time_months), d3_time_monthLookup = d3_time_formatLookup(d3_time_months), d3_time_monthAbbrevRe = d3_time_formatRe(d3_time_monthAbbreviations), d3_time_monthAbbrevLookup = d3_time_formatLookup(d3_time_monthAbbreviations), d3_time_percentRe = /^%/;
+-  var d3_time_formatPads = {
+-    "-": "",
+-    _: " ",
+-    "0": "0"
+-  };
+-  var d3_time_formats = {
+-    a: function(d) {
+-      return d3_time_dayAbbreviations[d.getDay()];
+-    },
+-    A: function(d) {
+-      return d3_time_days[d.getDay()];
+-    },
+-    b: function(d) {
+-      return d3_time_monthAbbreviations[d.getMonth()];
+-    },
+-    B: function(d) {
+-      return d3_time_months[d.getMonth()];
+-    },
+-    c: d3.time.format(d3_time_formatDateTime),
+-    d: function(d, p) {
+-      return d3_time_formatPad(d.getDate(), p, 2);
+-    },
+-    e: function(d, p) {
+-      return d3_time_formatPad(d.getDate(), p, 2);
+-    },
+-    H: function(d, p) {
+-      return d3_time_formatPad(d.getHours(), p, 2);
+-    },
+-    I: function(d, p) {
+-      return d3_time_formatPad(d.getHours() % 12 || 12, p, 2);
+-    },
+-    j: function(d, p) {
+-      return d3_time_formatPad(1 + d3.time.dayOfYear(d), p, 3);
+-    },
+-    L: function(d, p) {
+-      return d3_time_formatPad(d.getMilliseconds(), p, 3);
+-    },
+-    m: function(d, p) {
+-      return d3_time_formatPad(d.getMonth() + 1, p, 2);
+-    },
+-    M: function(d, p) {
+-      return d3_time_formatPad(d.getMinutes(), p, 2);
+-    },
+-    p: function(d) {
+-      return d.getHours() >= 12 ? "PM" : "AM";
+-    },
+-    S: function(d, p) {
+-      return d3_time_formatPad(d.getSeconds(), p, 2);
+-    },
+-    U: function(d, p) {
+-      return d3_time_formatPad(d3.time.sundayOfYear(d), p, 2);
+-    },
+-    w: function(d) {
+-      return d.getDay();
+-    },
+-    W: function(d, p) {
+-      return d3_time_formatPad(d3.time.mondayOfYear(d), p, 2);
+-    },
+-    x: d3.time.format(d3_time_formatDate),
+-    X: d3.time.format(d3_time_formatTime),
+-    y: function(d, p) {
+-      return d3_time_formatPad(d.getFullYear() % 100, p, 2);
+-    },
+-    Y: function(d, p) {
+-      return d3_time_formatPad(d.getFullYear() % 1e4, p, 4);
+-    },
+-    Z: d3_time_zone,
+-    "%": function() {
+-      return "%";
+-    }
+-  };
+-  var d3_time_parsers = {
+-    a: d3_time_parseWeekdayAbbrev,
+-    A: d3_time_parseWeekday,
+-    b: d3_time_parseMonthAbbrev,
+-    B: d3_time_parseMonth,
+-    c: d3_time_parseLocaleFull,
+-    d: d3_time_parseDay,
+-    e: d3_time_parseDay,
+-    H: d3_time_parseHour24,
+-    I: d3_time_parseHour24,
+-    j: d3_time_parseDayOfYear,
+-    L: d3_time_parseMilliseconds,
+-    m: d3_time_parseMonthNumber,
+-    M: d3_time_parseMinutes,
+-    p: d3_time_parseAmPm,
+-    S: d3_time_parseSeconds,
+-    U: d3_time_parseWeekNumberSunday,
+-    w: d3_time_parseWeekdayNumber,
+-    W: d3_time_parseWeekNumberMonday,
+-    x: d3_time_parseLocaleDate,
+-    X: d3_time_parseLocaleTime,
+-    y: d3_time_parseYear,
+-    Y: d3_time_parseFullYear,
+-    "%": d3_time_parseLiteralPercent
+-  };
+-  function d3_time_parseWeekdayAbbrev(date, string, i) {
+-    d3_time_dayAbbrevRe.lastIndex = 0;
+-    var n = d3_time_dayAbbrevRe.exec(string.substring(i));
+-    return n ? (date.w = d3_time_dayAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
+-  }
+-  function d3_time_parseWeekday(date, string, i) {
+-    d3_time_dayRe.lastIndex = 0;
+-    var n = d3_time_dayRe.exec(string.substring(i));
+-    return n ? (date.w = d3_time_dayLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
+-  }
+-  function d3_time_parseWeekdayNumber(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 1));
+-    return n ? (date.w = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseWeekNumberSunday(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i));
+-    return n ? (date.U = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseWeekNumberMonday(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i));
+-    return n ? (date.W = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseMonthAbbrev(date, string, i) {
+-    d3_time_monthAbbrevRe.lastIndex = 0;
+-    var n = d3_time_monthAbbrevRe.exec(string.substring(i));
+-    return n ? (date.m = d3_time_monthAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
+-  }
+-  function d3_time_parseMonth(date, string, i) {
+-    d3_time_monthRe.lastIndex = 0;
+-    var n = d3_time_monthRe.exec(string.substring(i));
+-    return n ? (date.m = d3_time_monthLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
+-  }
+-  function d3_time_parseLocaleFull(date, string, i) {
+-    return d3_time_parse(date, d3_time_formats.c.toString(), string, i);
+-  }
+-  function d3_time_parseLocaleDate(date, string, i) {
+-    return d3_time_parse(date, d3_time_formats.x.toString(), string, i);
+-  }
+-  function d3_time_parseLocaleTime(date, string, i) {
+-    return d3_time_parse(date, d3_time_formats.X.toString(), string, i);
+-  }
+-  function d3_time_parseFullYear(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 4));
+-    return n ? (date.y = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseYear(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.y = d3_time_expandYear(+n[0]), i + n[0].length) : -1;
+-  }
+-  function d3_time_expandYear(d) {
+-    return d + (d > 68 ? 1900 : 2e3);
+-  }
+-  function d3_time_parseMonthNumber(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.m = n[0] - 1, i + n[0].length) : -1;
+-  }
+-  function d3_time_parseDay(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.d = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseDayOfYear(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+-    return n ? (date.j = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseHour24(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.H = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseMinutes(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.M = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseSeconds(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 2));
+-    return n ? (date.S = +n[0], i + n[0].length) : -1;
+-  }
+-  function d3_time_parseMilliseconds(date, string, i) {
+-    d3_time_numberRe.lastIndex = 0;
+-    var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+-    return n ? (date.L = +n[0], i + n[0].length) : -1;
+-  }
+-  var d3_time_numberRe = /^\s*\d+/;
+-  function d3_time_parseAmPm(date, string, i) {
+-    var n = d3_time_amPmLookup.get(string.substring(i, i += 2).toLowerCase());
+-    return n == null ? -1 : (date.p = n, i);
+-  }
+-  var d3_time_amPmLookup = d3.map({
+-    am: 0,
+-    pm: 1
+-  });
+-  function d3_time_zone(d) {
+-    var z = d.getTimezoneOffset(), zs = z > 0 ? "-" : "+", zh = ~~(Math.abs(z) / 60), zm = Math.abs(z) % 60;
+-    return zs + d3_time_formatPad(zh, "0", 2) + d3_time_formatPad(zm, "0", 2);
+-  }
+-  function d3_time_parseLiteralPercent(date, string, i) {
+-    d3_time_percentRe.lastIndex = 0;
+-    var n = d3_time_percentRe.exec(string.substring(i, i + 1));
+-    return n ? i + n[0].length : -1;
+-  }
+-  d3.time.format.utc = function(template) {
+-    var local = d3.time.format(template);
+-    function format(date) {
+-      try {
+-        d3_time = d3_time_utc;
+-        var utc = new d3_time();
+-        utc._ = date;
+-        return local(utc);
+-      } finally {
+-        d3_time = Date;
+-      }
+-    }
+-    format.parse = function(string) {
+-      try {
+-        d3_time = d3_time_utc;
+-        var date = local.parse(string);
+-        return date && date._;
+-      } finally {
+-        d3_time = Date;
+-      }
+-    };
+-    format.toString = local.toString;
+-    return format;
+-  };
+-  var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");
+-  d3.time.format.iso = Date.prototype.toISOString && +new Date("2000-01-01T00:00:00.000Z") ? d3_time_formatIsoNative : d3_time_formatIso;
+-  function d3_time_formatIsoNative(date) {
+-    return date.toISOString();
+-  }
+-  d3_time_formatIsoNative.parse = function(string) {
+-    var date = new Date(string);
+-    return isNaN(date) ? null : date;
+-  };
+-  d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
+-  d3.time.second = d3_time_interval(function(date) {
+-    return new d3_time(Math.floor(date / 1e3) * 1e3);
+-  }, function(date, offset) {
+-    date.setTime(date.getTime() + Math.floor(offset) * 1e3);
+-  }, function(date) {
+-    return date.getSeconds();
+-  });
+-  d3.time.seconds = d3.time.second.range;
+-  d3.time.seconds.utc = d3.time.second.utc.range;
+-  d3.time.minute = d3_time_interval(function(date) {
+-    return new d3_time(Math.floor(date / 6e4) * 6e4);
+-  }, function(date, offset) {
+-    date.setTime(date.getTime() + Math.floor(offset) * 6e4);
+-  }, function(date) {
+-    return date.getMinutes();
+-  });
+-  d3.time.minutes = d3.time.minute.range;
+-  d3.time.minutes.utc = d3.time.minute.utc.range;
+-  d3.time.hour = d3_time_interval(function(date) {
+-    var timezone = date.getTimezoneOffset() / 60;
+-    return new d3_time((Math.floor(date / 36e5 - timezone) + timezone) * 36e5);
+-  }, function(date, offset) {
+-    date.setTime(date.getTime() + Math.floor(offset) * 36e5);
+-  }, function(date) {
+-    return date.getHours();
+-  });
+-  d3.time.hours = d3.time.hour.range;
+-  d3.time.hours.utc = d3.time.hour.utc.range;
+-  d3.time.month = d3_time_interval(function(date) {
+-    date = d3.time.day(date);
+-    date.setDate(1);
+-    return date;
+-  }, function(date, offset) {
+-    date.setMonth(date.getMonth() + offset);
+-  }, function(date) {
+-    return date.getMonth();
+-  });
+-  d3.time.months = d3.time.month.range;
+-  d3.time.months.utc = d3.time.month.utc.range;
+-  function d3_time_scale(linear, methods, format) {
+-    function scale(x) {
+-      return linear(x);
+-    }
+-    scale.invert = function(x) {
+-      return d3_time_scaleDate(linear.invert(x));
+-    };
+-    scale.domain = function(x) {
+-      if (!arguments.length) return linear.domain().map(d3_time_scaleDate);
+-      linear.domain(x);
+-      return scale;
+-    };
+-    scale.nice = function(m) {
+-      return scale.domain(d3_scale_nice(scale.domain(), m));
+-    };
+-    scale.ticks = function(m, k) {
+-      var extent = d3_scaleExtent(scale.domain());
+-      if (typeof m !== "function") {
+-        var span = extent[1] - extent[0], target = span / m, i = d3.bisect(d3_time_scaleSteps, target);
+-        if (i == d3_time_scaleSteps.length) return methods.year(extent, m);
+-        if (!i) return linear.ticks(m).map(d3_time_scaleDate);
+-        if (target / d3_time_scaleSteps[i - 1] < d3_time_scaleSteps[i] / target) --i;
+-        m = methods[i];
+-        k = m[1];
+-        m = m[0].range;
+-      }
+-      return m(extent[0], new Date(+extent[1] + 1), k);
+-    };
+-    scale.tickFormat = function() {
+-      return format;
+-    };
+-    scale.copy = function() {
+-      return d3_time_scale(linear.copy(), methods, format);
+-    };
+-    return d3_scale_linearRebind(scale, linear);
+-  }
+-  function d3_time_scaleDate(t) {
+-    return new Date(t);
+-  }
+-  function d3_time_scaleFormat(formats) {
+-    return function(date) {
+-      var i = formats.length - 1, f = formats[i];
+-      while (!f[1](date)) f = formats[--i];
+-      return f[0](date);
+-    };
+-  }
+-  function d3_time_scaleSetYear(y) {
+-    var d = new Date(y, 0, 1);
+-    d.setFullYear(y);
+-    return d;
+-  }
+-  function d3_time_scaleGetYear(d) {
+-    var y = d.getFullYear(), d0 = d3_time_scaleSetYear(y), d1 = d3_time_scaleSetYear(y + 1);
+-    return y + (d - d0) / (d1 - d0);
+-  }
+-  var d3_time_scaleSteps = [ 1e3, 5e3, 15e3, 3e4, 6e4, 3e5, 9e5, 18e5, 36e5, 108e5, 216e5, 432e5, 864e5, 1728e5, 6048e5, 2592e6, 7776e6, 31536e6 ];
+-  var d3_time_scaleLocalMethods = [ [ d3.time.second, 1 ], [ d3.time.second, 5 ], [ d3.time.second, 15 ], [ d3.time.second, 30 ], [ d3.time.minute, 1 ], [ d3.time.minute, 5 ], [ d3.time.minute, 15 ], [ d3.time.minute, 30 ], [ d3.time.hour, 1 ], [ d3.time.hour, 3 ], [ d3.time.hour, 6 ], [ d3.time.hour, 12 ], [ d3.time.day, 1 ], [ d3.time.day, 2 ], [ d3.time.week, 1 ], [ d3.time.month, 1 ], [ d3.time.month, 3 ], [ d3.time.year, 1 ] ];
+-  var d3_time_scaleLocalFormats = [ [ d3.time.format("%Y"), d3_true ], [ d3.time.format("%B"), function(d) {
+-    return d.getMonth();
+-  } ], [ d3.time.format("%b %d"), function(d) {
+-    return d.getDate() != 1;
+-  } ], [ d3.time.format("%a %d"), function(d) {
+-    return d.getDay() && d.getDate() != 1;
+-  } ], [ d3.time.format("%I %p"), function(d) {
+-    return d.getHours();
+-  } ], [ d3.time.format("%I:%M"), function(d) {
+-    return d.getMinutes();
+-  } ], [ d3.time.format(":%S"), function(d) {
+-    return d.getSeconds();
+-  } ], [ d3.time.format(".%L"), function(d) {
+-    return d.getMilliseconds();
+-  } ] ];
+-  var d3_time_scaleLinear = d3.scale.linear(), d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
+-  d3_time_scaleLocalMethods.year = function(extent, m) {
+-    return d3_time_scaleLinear.domain(extent.map(d3_time_scaleGetYear)).ticks(m).map(d3_time_scaleSetYear);
+-  };
+-  d3.time.scale = function() {
+-    return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
+-  };
+-  var d3_time_scaleUTCMethods = d3_time_scaleLocalMethods.map(function(m) {
+-    return [ m[0].utc, m[1] ];
+-  });
+-  var d3_time_scaleUTCFormats = [ [ d3.time.format.utc("%Y"), d3_true ], [ d3.time.format.utc("%B"), function(d) {
+-    return d.getUTCMonth();
+-  } ], [ d3.time.format.utc("%b %d"), function(d) {
+-    return d.getUTCDate() != 1;
+-  } ], [ d3.time.format.utc("%a %d"), function(d) {
+-    return d.getUTCDay() && d.getUTCDate() != 1;
+-  } ], [ d3.time.format.utc("%I %p"), function(d) {
+-    return d.getUTCHours();
+-  } ], [ d3.time.format.utc("%I:%M"), function(d) {
+-    return d.getUTCMinutes();
+-  } ], [ d3.time.format.utc(":%S"), function(d) {
+-    return d.getUTCSeconds();
+-  } ], [ d3.time.format.utc(".%L"), function(d) {
+-    return d.getUTCMilliseconds();
+-  } ] ];
+-  var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
+-  function d3_time_scaleUTCSetYear(y) {
+-    var d = new Date(Date.UTC(y, 0, 1));
+-    d.setUTCFullYear(y);
+-    return d;
+-  }
+-  function d3_time_scaleUTCGetYear(d) {
+-    var y = d.getUTCFullYear(), d0 = d3_time_scaleUTCSetYear(y), d1 = d3_time_scaleUTCSetYear(y + 1);
+-    return y + (d - d0) / (d1 - d0);
+-  }
+-  d3_time_scaleUTCMethods.year = function(extent, m) {
+-    return d3_time_scaleLinear.domain(extent.map(d3_time_scaleUTCGetYear)).ticks(m).map(d3_time_scaleUTCSetYear);
+-  };
+-  d3.time.scale.utc = function() {
+-    return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
+-  };
+-  d3.text = d3_xhrType(function(request) {
+-    return request.responseText;
+-  });
+-  d3.json = function(url, callback) {
+-    return d3_xhr(url, "application/json", d3_json, callback);
+-  };
+-  function d3_json(request) {
+-    return JSON.parse(request.responseText);
+-  }
+-  d3.html = function(url, callback) {
+-    return d3_xhr(url, "text/html", d3_html, callback);
+-  };
+-  function d3_html(request) {
+-    var range = d3_document.createRange();
+-    range.selectNode(d3_document.body);
+-    return range.createContextualFragment(request.responseText);
+-  }
+-  d3.xml = d3_xhrType(function(request) {
+-    return request.responseXML;
+-  });
+-  return d3;
+-}();
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js b/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
+deleted file mode 100644
+index 50937333b99..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
++++ /dev/null
+@@ -1,10872 +0,0 @@
+-/*!
+- * jQuery JavaScript Library v3.5.1
+- * https://jquery.com/
+- *
+- * Includes Sizzle.js
+- * https://sizzlejs.com/
+- *
+- * Copyright JS Foundation and other contributors
+- * Released under the MIT license
+- * https://jquery.org/license
+- *
+- * Date: 2020-05-04T22:49Z
+- */
+-( function( global, factory ) {
+-
+-	"use strict";
+-
+-	if ( typeof module === "object" && typeof module.exports === "object" ) {
+-
+-		// For CommonJS and CommonJS-like environments where a proper `window`
+-		// is present, execute the factory and get jQuery.
+-		// For environments that do not have a `window` with a `document`
+-		// (such as Node.js), expose a factory as module.exports.
+-		// This accentuates the need for the creation of a real `window`.
+-		// e.g. var jQuery = require("jquery")(window);
+-		// See ticket #14549 for more info.
+-		module.exports = global.document ?
+-			factory( global, true ) :
+-			function( w ) {
+-				if ( !w.document ) {
+-					throw new Error( "jQuery requires a window with a document" );
+-				}
+-				return factory( w );
+-			};
+-	} else {
+-		factory( global );
+-	}
+-
+-// Pass this if window is not defined yet
+-} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+-
+-// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
+-// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
+-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+-// enough that all such attempts are guarded in a try block.
+-"use strict";
+-
+-var arr = [];
+-
+-var getProto = Object.getPrototypeOf;
+-
+-var slice = arr.slice;
+-
+-var flat = arr.flat ? function( array ) {
+-	return arr.flat.call( array );
+-} : function( array ) {
+-	return arr.concat.apply( [], array );
+-};
+-
+-
+-var push = arr.push;
+-
+-var indexOf = arr.indexOf;
+-
+-var class2type = {};
+-
+-var toString = class2type.toString;
+-
+-var hasOwn = class2type.hasOwnProperty;
+-
+-var fnToString = hasOwn.toString;
+-
+-var ObjectFunctionString = fnToString.call( Object );
+-
+-var support = {};
+-
+-var isFunction = function isFunction( obj ) {
+-
+-      // Support: Chrome <=57, Firefox <=52
+-      // In some browsers, typeof returns "function" for HTML <object> elements
+-      // (i.e., `typeof document.createElement( "object" ) === "function"`).
+-      // We don't want to classify *any* DOM node as a function.
+-      return typeof obj === "function" && typeof obj.nodeType !== "number";
+-  };
+-
+-
+-var isWindow = function isWindow( obj ) {
+-		return obj != null && obj === obj.window;
+-	};
+-
+-
+-var document = window.document;
+-
+-
+-
+-	var preservedScriptAttributes = {
+-		type: true,
+-		src: true,
+-		nonce: true,
+-		noModule: true
+-	};
+-
+-	function DOMEval( code, node, doc ) {
+-		doc = doc || document;
+-
+-		var i, val,
+-			script = doc.createElement( "script" );
+-
+-		script.text = code;
+-		if ( node ) {
+-			for ( i in preservedScriptAttributes ) {
+-
+-				// Support: Firefox 64+, Edge 18+
+-				// Some browsers don't support the "nonce" property on scripts.
+-				// On the other hand, just using `getAttribute` is not enough as
+-				// the `nonce` attribute is reset to an empty string whenever it
+-				// becomes browsing-context connected.
+-				// See https://github.com/whatwg/html/issues/2369
+-				// See https://html.spec.whatwg.org/#nonce-attributes
+-				// The `node.getAttribute` check was added for the sake of
+-				// `jQuery.globalEval` so that it can fake a nonce-containing node
+-				// via an object.
+-				val = node[ i ] || node.getAttribute && node.getAttribute( i );
+-				if ( val ) {
+-					script.setAttribute( i, val );
+-				}
+-			}
+-		}
+-		doc.head.appendChild( script ).parentNode.removeChild( script );
+-	}
+-
+-
+-function toType( obj ) {
+-	if ( obj == null ) {
+-		return obj + "";
+-	}
+-
+-	// Support: Android <=2.3 only (functionish RegExp)
+-	return typeof obj === "object" || typeof obj === "function" ?
+-		class2type[ toString.call( obj ) ] || "object" :
+-		typeof obj;
+-}
+-/* global Symbol */
+-// Defining this global in .eslintrc.json would create a danger of using the global
+-// unguarded in another place, it seems safer to define global only for this module
+-
+-
+-
+-var
+-	version = "3.5.1",
+-
+-	// Define a local copy of jQuery
+-	jQuery = function( selector, context ) {
+-
+-		// The jQuery object is actually just the init constructor 'enhanced'
+-		// Need init if jQuery is called (just allow error to be thrown if not included)
+-		return new jQuery.fn.init( selector, context );
+-	};
+-
+-jQuery.fn = jQuery.prototype = {
+-
+-	// The current version of jQuery being used
+-	jquery: version,
+-
+-	constructor: jQuery,
+-
+-	// The default length of a jQuery object is 0
+-	length: 0,
+-
+-	toArray: function() {
+-		return slice.call( this );
+-	},
+-
+-	// Get the Nth element in the matched element set OR
+-	// Get the whole matched element set as a clean array
+-	get: function( num ) {
+-
+-		// Return all the elements in a clean array
+-		if ( num == null ) {
+-			return slice.call( this );
+-		}
+-
+-		// Return just the one element from the set
+-		return num < 0 ? this[ num + this.length ] : this[ num ];
+-	},
+-
+-	// Take an array of elements and push it onto the stack
+-	// (returning the new matched element set)
+-	pushStack: function( elems ) {
+-
+-		// Build a new jQuery matched element set
+-		var ret = jQuery.merge( this.constructor(), elems );
+-
+-		// Add the old object onto the stack (as a reference)
+-		ret.prevObject = this;
+-
+-		// Return the newly-formed element set
+-		return ret;
+-	},
+-
+-	// Execute a callback for every element in the matched set.
+-	each: function( callback ) {
+-		return jQuery.each( this, callback );
+-	},
+-
+-	map: function( callback ) {
+-		return this.pushStack( jQuery.map( this, function( elem, i ) {
+-			return callback.call( elem, i, elem );
+-		} ) );
+-	},
+-
+-	slice: function() {
+-		return this.pushStack( slice.apply( this, arguments ) );
+-	},
+-
+-	first: function() {
+-		return this.eq( 0 );
+-	},
+-
+-	last: function() {
+-		return this.eq( -1 );
+-	},
+-
+-	even: function() {
+-		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+-			return ( i + 1 ) % 2;
+-		} ) );
+-	},
+-
+-	odd: function() {
+-		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+-			return i % 2;
+-		} ) );
+-	},
+-
+-	eq: function( i ) {
+-		var len = this.length,
+-			j = +i + ( i < 0 ? len : 0 );
+-		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
+-	},
+-
+-	end: function() {
+-		return this.prevObject || this.constructor();
+-	},
+-
+-	// For internal use only.
+-	// Behaves like an Array's method, not like a jQuery method.
+-	push: push,
+-	sort: arr.sort,
+-	splice: arr.splice
+-};
+-
+-jQuery.extend = jQuery.fn.extend = function() {
+-	var options, name, src, copy, copyIsArray, clone,
+-		target = arguments[ 0 ] || {},
+-		i = 1,
+-		length = arguments.length,
+-		deep = false;
+-
+-	// Handle a deep copy situation
+-	if ( typeof target === "boolean" ) {
+-		deep = target;
+-
+-		// Skip the boolean and the target
+-		target = arguments[ i ] || {};
+-		i++;
+-	}
+-
+-	// Handle case when target is a string or something (possible in deep copy)
+-	if ( typeof target !== "object" && !isFunction( target ) ) {
+-		target = {};
+-	}
+-
+-	// Extend jQuery itself if only one argument is passed
+-	if ( i === length ) {
+-		target = this;
+-		i--;
+-	}
+-
+-	for ( ; i < length; i++ ) {
+-
+-		// Only deal with non-null/undefined values
+-		if ( ( options = arguments[ i ] ) != null ) {
+-
+-			// Extend the base object
+-			for ( name in options ) {
+-				copy = options[ name ];
+-
+-				// Prevent Object.prototype pollution
+-				// Prevent never-ending loop
+-				if ( name === "__proto__" || target === copy ) {
+-					continue;
+-				}
+-
+-				// Recurse if we're merging plain objects or arrays
+-				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+-					( copyIsArray = Array.isArray( copy ) ) ) ) {
+-					src = target[ name ];
+-
+-					// Ensure proper type for the source value
+-					if ( copyIsArray && !Array.isArray( src ) ) {
+-						clone = [];
+-					} else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) {
+-						clone = {};
+-					} else {
+-						clone = src;
+-					}
+-					copyIsArray = false;
+-
+-					// Never move original objects, clone them
+-					target[ name ] = jQuery.extend( deep, clone, copy );
+-
+-				// Don't bring in undefined values
+-				} else if ( copy !== undefined ) {
+-					target[ name ] = copy;
+-				}
+-			}
+-		}
+-	}
+-
+-	// Return the modified object
+-	return target;
+-};
+-
+-jQuery.extend( {
+-
+-	// Unique for each copy of jQuery on the page
+-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+-
+-	// Assume jQuery is ready without the ready module
+-	isReady: true,
+-
+-	error: function( msg ) {
+-		throw new Error( msg );
+-	},
+-
+-	noop: function() {},
+-
+-	isPlainObject: function( obj ) {
+-		var proto, Ctor;
+-
+-		// Detect obvious negatives
+-		// Use toString instead of jQuery.type to catch host objects
+-		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
+-			return false;
+-		}
+-
+-		proto = getProto( obj );
+-
+-		// Objects with no prototype (e.g., `Object.create( null )`) are plain
+-		if ( !proto ) {
+-			return true;
+-		}
+-
+-		// Objects with prototype are plain iff they were constructed by a global Object function
+-		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
+-		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
+-	},
+-
+-	isEmptyObject: function( obj ) {
+-		var name;
+-
+-		for ( name in obj ) {
+-			return false;
+-		}
+-		return true;
+-	},
+-
+-	// Evaluates a script in a provided context; falls back to the global one
+-	// if not specified.
+-	globalEval: function( code, options, doc ) {
+-		DOMEval( code, { nonce: options && options.nonce }, doc );
+-	},
+-
+-	each: function( obj, callback ) {
+-		var length, i = 0;
+-
+-		if ( isArrayLike( obj ) ) {
+-			length = obj.length;
+-			for ( ; i < length; i++ ) {
+-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+-					break;
+-				}
+-			}
+-		} else {
+-			for ( i in obj ) {
+-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+-					break;
+-				}
+-			}
+-		}
+-
+-		return obj;
+-	},
+-
+-	// results is for internal usage only
+-	makeArray: function( arr, results ) {
+-		var ret = results || [];
+-
+-		if ( arr != null ) {
+-			if ( isArrayLike( Object( arr ) ) ) {
+-				jQuery.merge( ret,
+-					typeof arr === "string" ?
+-					[ arr ] : arr
+-				);
+-			} else {
+-				push.call( ret, arr );
+-			}
+-		}
+-
+-		return ret;
+-	},
+-
+-	inArray: function( elem, arr, i ) {
+-		return arr == null ? -1 : indexOf.call( arr, elem, i );
+-	},
+-
+-	// Support: Android <=4.0 only, PhantomJS 1 only
+-	// push.apply(_, arraylike) throws on ancient WebKit
+-	merge: function( first, second ) {
+-		var len = +second.length,
+-			j = 0,
+-			i = first.length;
+-
+-		for ( ; j < len; j++ ) {
+-			first[ i++ ] = second[ j ];
+-		}
+-
+-		first.length = i;
+-
+-		return first;
+-	},
+-
+-	grep: function( elems, callback, invert ) {
+-		var callbackInverse,
+-			matches = [],
+-			i = 0,
+-			length = elems.length,
+-			callbackExpect = !invert;
+-
+-		// Go through the array, only saving the items
+-		// that pass the validator function
+-		for ( ; i < length; i++ ) {
+-			callbackInverse = !callback( elems[ i ], i );
+-			if ( callbackInverse !== callbackExpect ) {
+-				matches.push( elems[ i ] );
+-			}
+-		}
+-
+-		return matches;
+-	},
+-
+-	// arg is for internal usage only
+-	map: function( elems, callback, arg ) {
+-		var length, value,
+-			i = 0,
+-			ret = [];
+-
+-		// Go through the array, translating each of the items to their new values
+-		if ( isArrayLike( elems ) ) {
+-			length = elems.length;
+-			for ( ; i < length; i++ ) {
+-				value = callback( elems[ i ], i, arg );
+-
+-				if ( value != null ) {
+-					ret.push( value );
+-				}
+-			}
+-
+-		// Go through every key on the object,
+-		} else {
+-			for ( i in elems ) {
+-				value = callback( elems[ i ], i, arg );
+-
+-				if ( value != null ) {
+-					ret.push( value );
+-				}
+-			}
+-		}
+-
+-		// Flatten any nested arrays
+-		return flat( ret );
+-	},
+-
+-	// A global GUID counter for objects
+-	guid: 1,
+-
+-	// jQuery.support is not used in Core but other projects attach their
+-	// properties to it so it needs to exist.
+-	support: support
+-} );
+-
+-if ( typeof Symbol === "function" ) {
+-	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
+-}
+-
+-// Populate the class2type map
+-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+-function( _i, name ) {
+-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+-} );
+-
+-function isArrayLike( obj ) {
+-
+-	// Support: real iOS 8.2 only (not reproducible in simulator)
+-	// `in` check used to prevent JIT error (gh-2145)
+-	// hasOwn isn't used here due to false negatives
+-	// regarding Nodelist length in IE
+-	var length = !!obj && "length" in obj && obj.length,
+-		type = toType( obj );
+-
+-	if ( isFunction( obj ) || isWindow( obj ) ) {
+-		return false;
+-	}
+-
+-	return type === "array" || length === 0 ||
+-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+-}
+-var Sizzle =
+-/*!
+- * Sizzle CSS Selector Engine v2.3.5
+- * https://sizzlejs.com/
+- *
+- * Copyright JS Foundation and other contributors
+- * Released under the MIT license
+- * https://js.foundation/
+- *
+- * Date: 2020-03-14
+- */
+-( function( window ) {
+-var i,
+-	support,
+-	Expr,
+-	getText,
+-	isXML,
+-	tokenize,
+-	compile,
+-	select,
+-	outermostContext,
+-	sortInput,
+-	hasDuplicate,
+-
+-	// Local document vars
+-	setDocument,
+-	document,
+-	docElem,
+-	documentIsHTML,
+-	rbuggyQSA,
+-	rbuggyMatches,
+-	matches,
+-	contains,
+-
+-	// Instance-specific data
+-	expando = "sizzle" + 1 * new Date(),
+-	preferredDoc = window.document,
+-	dirruns = 0,
+-	done = 0,
+-	classCache = createCache(),
+-	tokenCache = createCache(),
+-	compilerCache = createCache(),
+-	nonnativeSelectorCache = createCache(),
+-	sortOrder = function( a, b ) {
+-		if ( a === b ) {
+-			hasDuplicate = true;
+-		}
+-		return 0;
+-	},
+-
+-	// Instance methods
+-	hasOwn = ( {} ).hasOwnProperty,
+-	arr = [],
+-	pop = arr.pop,
+-	pushNative = arr.push,
+-	push = arr.push,
+-	slice = arr.slice,
+-
+-	// Use a stripped-down indexOf as it's faster than native
+-	// https://jsperf.com/thor-indexof-vs-for/5
+-	indexOf = function( list, elem ) {
+-		var i = 0,
+-			len = list.length;
+-		for ( ; i < len; i++ ) {
+-			if ( list[ i ] === elem ) {
+-				return i;
+-			}
+-		}
+-		return -1;
+-	},
+-
+-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
+-		"ismap|loop|multiple|open|readonly|required|scoped",
+-
+-	// Regular expressions
+-
+-	// http://www.w3.org/TR/css3-selectors/#whitespace
+-	whitespace = "[\\x20\\t\\r\\n\\f]",
+-
+-	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
+-	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
+-		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
+-
+-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+-	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+-
+-		// Operator (capture 2)
+-		"*([*^$|!~]?=)" + whitespace +
+-
+-		// "Attribute values must be CSS identifiers [capture 5]
+-		// or strings [capture 3 or capture 4]"
+-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
+-		whitespace + "*\\]",
+-
+-	pseudos = ":(" + identifier + ")(?:\\((" +
+-
+-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+-		// 1. quoted (capture 3; capture 4 or capture 5)
+-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+-
+-		// 2. simple (capture 6)
+-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+-
+-		// 3. anything else (capture 2)
+-		".*" +
+-		")\\)|)",
+-
+-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+-	rwhitespace = new RegExp( whitespace + "+", "g" ),
+-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
+-		whitespace + "+$", "g" ),
+-
+-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
+-		"*" ),
+-	rdescend = new RegExp( whitespace + "|>" ),
+-
+-	rpseudo = new RegExp( pseudos ),
+-	ridentifier = new RegExp( "^" + identifier + "$" ),
+-
+-	matchExpr = {
+-		"ID": new RegExp( "^#(" + identifier + ")" ),
+-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
+-		"ATTR": new RegExp( "^" + attributes ),
+-		"PSEUDO": new RegExp( "^" + pseudos ),
+-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+-			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+-			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+-
+-		// For use in libraries implementing .is()
+-		// We use this for POS matching in `select`
+-		"needsContext": new RegExp( "^" + whitespace +
+-			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+-			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+-	},
+-
+-	rhtml = /HTML$/i,
+-	rinputs = /^(?:input|select|textarea|button)$/i,
+-	rheader = /^h\d$/i,
+-
+-	rnative = /^[^{]+\{\s*\[native \w/,
+-
+-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+-
+-	rsibling = /[+~]/,
+-
+-	// CSS escapes
+-	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+-	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+-	funescape = function( escape, nonHex ) {
+-		var high = "0x" + escape.slice( 1 ) - 0x10000;
+-
+-		return nonHex ?
+-
+-			// Strip the backslash prefix from a non-hex escape sequence
+-			nonHex :
+-
+-			// Replace a hexadecimal escape sequence with the encoded Unicode code point
+-			// Support: IE <=11+
+-			// For values outside the Basic Multilingual Plane (BMP), manually construct a
+-			// surrogate pair
+-			high < 0 ?
+-				String.fromCharCode( high + 0x10000 ) :
+-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+-	},
+-
+-	// CSS string/identifier serialization
+-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+-	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+-	fcssescape = function( ch, asCodePoint ) {
+-		if ( asCodePoint ) {
+-
+-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+-			if ( ch === "\0" ) {
+-				return "\uFFFD";
+-			}
+-
+-			// Control characters and (dependent upon position) numbers get escaped as code points
+-			return ch.slice( 0, -1 ) + "\\" +
+-				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+-		}
+-
+-		// Other potentially-special ASCII characters get backslash-escaped
+-		return "\\" + ch;
+-	},
+-
+-	// Used for iframes
+-	// See setDocument()
+-	// Removing the function wrapper causes a "Permission Denied"
+-	// error in IE
+-	unloadHandler = function() {
+-		setDocument();
+-	},
+-
+-	inDisabledFieldset = addCombinator(
+-		function( elem ) {
+-			return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset";
+-		},
+-		{ dir: "parentNode", next: "legend" }
+-	);
+-
+-// Optimize for push.apply( _, NodeList )
+-try {
+-	push.apply(
+-		( arr = slice.call( preferredDoc.childNodes ) ),
+-		preferredDoc.childNodes
+-	);
+-
+-	// Support: Android<4.0
+-	// Detect silently failing push.apply
+-	// eslint-disable-next-line no-unused-expressions
+-	arr[ preferredDoc.childNodes.length ].nodeType;
+-} catch ( e ) {
+-	push = { apply: arr.length ?
+-
+-		// Leverage slice if possible
+-		function( target, els ) {
+-			pushNative.apply( target, slice.call( els ) );
+-		} :
+-
+-		// Support: IE<9
+-		// Otherwise append directly
+-		function( target, els ) {
+-			var j = target.length,
+-				i = 0;
+-
+-			// Can't trust NodeList.length
+-			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
+-			target.length = j - 1;
+-		}
+-	};
+-}
+-
+-function Sizzle( selector, context, results, seed ) {
+-	var m, i, elem, nid, match, groups, newSelector,
+-		newContext = context && context.ownerDocument,
+-
+-		// nodeType defaults to 9, since context defaults to document
+-		nodeType = context ? context.nodeType : 9;
+-
+-	results = results || [];
+-
+-	// Return early from calls with invalid selector or context
+-	if ( typeof selector !== "string" || !selector ||
+-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+-
+-		return results;
+-	}
+-
+-	// Try to shortcut find operations (as opposed to filters) in HTML documents
+-	if ( !seed ) {
+-		setDocument( context );
+-		context = context || document;
+-
+-		if ( documentIsHTML ) {
+-
+-			// If the selector is sufficiently simple, try using a "get*By*" DOM method
+-			// (excepting DocumentFragment context, where the methods don't exist)
+-			if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
+-
+-				// ID selector
+-				if ( ( m = match[ 1 ] ) ) {
+-
+-					// Document context
+-					if ( nodeType === 9 ) {
+-						if ( ( elem = context.getElementById( m ) ) ) {
+-
+-							// Support: IE, Opera, Webkit
+-							// TODO: identify versions
+-							// getElementById can match elements by name instead of ID
+-							if ( elem.id === m ) {
+-								results.push( elem );
+-								return results;
+-							}
+-						} else {
+-							return results;
+-						}
+-
+-					// Element context
+-					} else {
+-
+-						// Support: IE, Opera, Webkit
+-						// TODO: identify versions
+-						// getElementById can match elements by name instead of ID
+-						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
+-							contains( context, elem ) &&
+-							elem.id === m ) {
+-
+-							results.push( elem );
+-							return results;
+-						}
+-					}
+-
+-				// Type selector
+-				} else if ( match[ 2 ] ) {
+-					push.apply( results, context.getElementsByTagName( selector ) );
+-					return results;
+-
+-				// Class selector
+-				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
+-					context.getElementsByClassName ) {
+-
+-					push.apply( results, context.getElementsByClassName( m ) );
+-					return results;
+-				}
+-			}
+-
+-			// Take advantage of querySelectorAll
+-			if ( support.qsa &&
+-				!nonnativeSelectorCache[ selector + " " ] &&
+-				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
+-
+-				// Support: IE 8 only
+-				// Exclude object elements
+-				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
+-
+-				newSelector = selector;
+-				newContext = context;
+-
+-				// qSA considers elements outside a scoping root when evaluating child or
+-				// descendant combinators, which is not what we want.
+-				// In such cases, we work around the behavior by prefixing every selector in the
+-				// list with an ID selector referencing the scope context.
+-				// The technique has to be used as well when a leading combinator is used
+-				// as such selectors are not recognized by querySelectorAll.
+-				// Thanks to Andrew Dupont for this technique.
+-				if ( nodeType === 1 &&
+-					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
+-
+-					// Expand context for sibling selectors
+-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+-						context;
+-
+-					// We can use :scope instead of the ID hack if the browser
+-					// supports it & if we're not changing the context.
+-					if ( newContext !== context || !support.scope ) {
+-
+-						// Capture the context ID, setting it first if necessary
+-						if ( ( nid = context.getAttribute( "id" ) ) ) {
+-							nid = nid.replace( rcssescape, fcssescape );
+-						} else {
+-							context.setAttribute( "id", ( nid = expando ) );
+-						}
+-					}
+-
+-					// Prefix every selector in the list
+-					groups = tokenize( selector );
+-					i = groups.length;
+-					while ( i-- ) {
+-						groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
+-							toSelector( groups[ i ] );
+-					}
+-					newSelector = groups.join( "," );
+-				}
+-
+-				try {
+-					push.apply( results,
+-						newContext.querySelectorAll( newSelector )
+-					);
+-					return results;
+-				} catch ( qsaError ) {
+-					nonnativeSelectorCache( selector, true );
+-				} finally {
+-					if ( nid === expando ) {
+-						context.removeAttribute( "id" );
+-					}
+-				}
+-			}
+-		}
+-	}
+-
+-	// All others
+-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+-}
+-
+-/**
+- * Create key-value caches of limited size
+- * @returns {function(string, object)} Returns the Object data after storing it on itself with
+- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+- *	deleting the oldest entry
+- */
+-function createCache() {
+-	var keys = [];
+-
+-	function cache( key, value ) {
+-
+-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+-
+-			// Only keep the most recent entries
+-			delete cache[ keys.shift() ];
+-		}
+-		return ( cache[ key + " " ] = value );
+-	}
+-	return cache;
+-}
+-
+-/**
+- * Mark a function for special use by Sizzle
+- * @param {Function} fn The function to mark
+- */
+-function markFunction( fn ) {
+-	fn[ expando ] = true;
+-	return fn;
+-}
+-
+-/**
+- * Support testing using an element
+- * @param {Function} fn Passed the created element and returns a boolean result
+- */
+-function assert( fn ) {
+-	var el = document.createElement( "fieldset" );
+-
+-	try {
+-		return !!fn( el );
+-	} catch ( e ) {
+-		return false;
+-	} finally {
+-
+-		// Remove from its parent by default
+-		if ( el.parentNode ) {
+-			el.parentNode.removeChild( el );
+-		}
+-
+-		// release memory in IE
+-		el = null;
+-	}
+-}
+-
+-/**
+- * Adds the same handler for all of the specified attrs
+- * @param {String} attrs Pipe-separated list of attributes
+- * @param {Function} handler The method that will be applied
+- */
+-function addHandle( attrs, handler ) {
+-	var arr = attrs.split( "|" ),
+-		i = arr.length;
+-
+-	while ( i-- ) {
+-		Expr.attrHandle[ arr[ i ] ] = handler;
+-	}
+-}
+-
+-/**
+- * Checks document order of two siblings
+- * @param {Element} a
+- * @param {Element} b
+- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+- */
+-function siblingCheck( a, b ) {
+-	var cur = b && a,
+-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+-			a.sourceIndex - b.sourceIndex;
+-
+-	// Use IE sourceIndex if available on both nodes
+-	if ( diff ) {
+-		return diff;
+-	}
+-
+-	// Check if b follows a
+-	if ( cur ) {
+-		while ( ( cur = cur.nextSibling ) ) {
+-			if ( cur === b ) {
+-				return -1;
+-			}
+-		}
+-	}
+-
+-	return a ? 1 : -1;
+-}
+-
+-/**
+- * Returns a function to use in pseudos for input types
+- * @param {String} type
+- */
+-function createInputPseudo( type ) {
+-	return function( elem ) {
+-		var name = elem.nodeName.toLowerCase();
+-		return name === "input" && elem.type === type;
+-	};
+-}
+-
+-/**
+- * Returns a function to use in pseudos for buttons
+- * @param {String} type
+- */
+-function createButtonPseudo( type ) {
+-	return function( elem ) {
+-		var name = elem.nodeName.toLowerCase();
+-		return ( name === "input" || name === "button" ) && elem.type === type;
+-	};
+-}
+-
+-/**
+- * Returns a function to use in pseudos for :enabled/:disabled
+- * @param {Boolean} disabled true for :disabled; false for :enabled
+- */
+-function createDisabledPseudo( disabled ) {
+-
+-	// Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
+-	return function( elem ) {
+-
+-		// Only certain elements can match :enabled or :disabled
+-		// https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
+-		// https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
+-		if ( "form" in elem ) {
+-
+-			// Check for inherited disabledness on relevant non-disabled elements:
+-			// * listed form-associated elements in a disabled fieldset
+-			//   https://html.spec.whatwg.org/multipage/forms.html#category-listed
+-			//   https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
+-			// * option elements in a disabled optgroup
+-			//   https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
+-			// All such elements have a "form" property.
+-			if ( elem.parentNode && elem.disabled === false ) {
+-
+-				// Option elements defer to a parent optgroup if present
+-				if ( "label" in elem ) {
+-					if ( "label" in elem.parentNode ) {
+-						return elem.parentNode.disabled === disabled;
+-					} else {
+-						return elem.disabled === disabled;
+-					}
+-				}
+-
+-				// Support: IE 6 - 11
+-				// Use the isDisabled shortcut property to check for disabled fieldset ancestors
+-				return elem.isDisabled === disabled ||
+-
+-					// Where there is no isDisabled, check manually
+-					/* jshint -W018 */
+-					elem.isDisabled !== !disabled &&
+-					inDisabledFieldset( elem ) === disabled;
+-			}
+-
+-			return elem.disabled === disabled;
+-
+-		// Try to winnow out elements that can't be disabled before trusting the disabled property.
+-		// Some victims get caught in our net (label, legend, menu, track), but it shouldn't
+-		// even exist on them, let alone have a boolean value.
+-		} else if ( "label" in elem ) {
+-			return elem.disabled === disabled;
+-		}
+-
+-		// Remaining elements are neither :enabled nor :disabled
+-		return false;
+-	};
+-}
+-
+-/**
+- * Returns a function to use in pseudos for positionals
+- * @param {Function} fn
+- */
+-function createPositionalPseudo( fn ) {
+-	return markFunction( function( argument ) {
+-		argument = +argument;
+-		return markFunction( function( seed, matches ) {
+-			var j,
+-				matchIndexes = fn( [], seed.length, argument ),
+-				i = matchIndexes.length;
+-
+-			// Match elements found at the specified indexes
+-			while ( i-- ) {
+-				if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
+-					seed[ j ] = !( matches[ j ] = seed[ j ] );
+-				}
+-			}
+-		} );
+-	} );
+-}
+-
+-/**
+- * Checks a node for validity as a Sizzle context
+- * @param {Element|Object=} context
+- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+- */
+-function testContext( context ) {
+-	return context && typeof context.getElementsByTagName !== "undefined" && context;
+-}
+-
+-// Expose support vars for convenience
+-support = Sizzle.support = {};
+-
+-/**
+- * Detects XML nodes
+- * @param {Element|Object} elem An element or a document
+- * @returns {Boolean} True iff elem is a non-HTML XML node
+- */
+-isXML = Sizzle.isXML = function( elem ) {
+-	var namespace = elem.namespaceURI,
+-		docElem = ( elem.ownerDocument || elem ).documentElement;
+-
+-	// Support: IE <=8
+-	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
+-	// https://bugs.jquery.com/ticket/4833
+-	return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" );
+-};
+-
+-/**
+- * Sets document-related variables once based on the current document
+- * @param {Element|Object} [doc] An element or document object to use to set the document
+- * @returns {Object} Returns the current document
+- */
+-setDocument = Sizzle.setDocument = function( node ) {
+-	var hasCompare, subWindow,
+-		doc = node ? node.ownerDocument || node : preferredDoc;
+-
+-	// Return early if doc is invalid or already selected
+-	// Support: IE 11+, Edge 17 - 18+
+-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-	// two documents; shallow comparisons work.
+-	// eslint-disable-next-line eqeqeq
+-	if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
+-		return document;
+-	}
+-
+-	// Update global variables
+-	document = doc;
+-	docElem = document.documentElement;
+-	documentIsHTML = !isXML( document );
+-
+-	// Support: IE 9 - 11+, Edge 12 - 18+
+-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+-	// Support: IE 11+, Edge 17 - 18+
+-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-	// two documents; shallow comparisons work.
+-	// eslint-disable-next-line eqeqeq
+-	if ( preferredDoc != document &&
+-		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
+-
+-		// Support: IE 11, Edge
+-		if ( subWindow.addEventListener ) {
+-			subWindow.addEventListener( "unload", unloadHandler, false );
+-
+-		// Support: IE 9 - 10 only
+-		} else if ( subWindow.attachEvent ) {
+-			subWindow.attachEvent( "onunload", unloadHandler );
+-		}
+-	}
+-
+-	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
+-	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
+-	// IE/Edge & older browsers don't support the :scope pseudo-class.
+-	// Support: Safari 6.0 only
+-	// Safari 6.0 supports :scope but it's an alias of :root there.
+-	support.scope = assert( function( el ) {
+-		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
+-		return typeof el.querySelectorAll !== "undefined" &&
+-			!el.querySelectorAll( ":scope fieldset div" ).length;
+-	} );
+-
+-	/* Attributes
+-	---------------------------------------------------------------------- */
+-
+-	// Support: IE<8
+-	// Verify that getAttribute really returns attributes and not properties
+-	// (excepting IE8 booleans)
+-	support.attributes = assert( function( el ) {
+-		el.className = "i";
+-		return !el.getAttribute( "className" );
+-	} );
+-
+-	/* getElement(s)By*
+-	---------------------------------------------------------------------- */
+-
+-	// Check if getElementsByTagName("*") returns only elements
+-	support.getElementsByTagName = assert( function( el ) {
+-		el.appendChild( document.createComment( "" ) );
+-		return !el.getElementsByTagName( "*" ).length;
+-	} );
+-
+-	// Support: IE<9
+-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
+-
+-	// Support: IE<10
+-	// Check if getElementById returns elements by name
+-	// The broken getElementById methods don't pick up programmatically-set names,
+-	// so use a roundabout getElementsByName test
+-	support.getById = assert( function( el ) {
+-		docElem.appendChild( el ).id = expando;
+-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
+-	} );
+-
+-	// ID filter and find
+-	if ( support.getById ) {
+-		Expr.filter[ "ID" ] = function( id ) {
+-			var attrId = id.replace( runescape, funescape );
+-			return function( elem ) {
+-				return elem.getAttribute( "id" ) === attrId;
+-			};
+-		};
+-		Expr.find[ "ID" ] = function( id, context ) {
+-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+-				var elem = context.getElementById( id );
+-				return elem ? [ elem ] : [];
+-			}
+-		};
+-	} else {
+-		Expr.filter[ "ID" ] =  function( id ) {
+-			var attrId = id.replace( runescape, funescape );
+-			return function( elem ) {
+-				var node = typeof elem.getAttributeNode !== "undefined" &&
+-					elem.getAttributeNode( "id" );
+-				return node && node.value === attrId;
+-			};
+-		};
+-
+-		// Support: IE 6 - 7 only
+-		// getElementById is not reliable as a find shortcut
+-		Expr.find[ "ID" ] = function( id, context ) {
+-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+-				var node, i, elems,
+-					elem = context.getElementById( id );
+-
+-				if ( elem ) {
+-
+-					// Verify the id attribute
+-					node = elem.getAttributeNode( "id" );
+-					if ( node && node.value === id ) {
+-						return [ elem ];
+-					}
+-
+-					// Fall back on getElementsByName
+-					elems = context.getElementsByName( id );
+-					i = 0;
+-					while ( ( elem = elems[ i++ ] ) ) {
+-						node = elem.getAttributeNode( "id" );
+-						if ( node && node.value === id ) {
+-							return [ elem ];
+-						}
+-					}
+-				}
+-
+-				return [];
+-			}
+-		};
+-	}
+-
+-	// Tag
+-	Expr.find[ "TAG" ] = support.getElementsByTagName ?
+-		function( tag, context ) {
+-			if ( typeof context.getElementsByTagName !== "undefined" ) {
+-				return context.getElementsByTagName( tag );
+-
+-			// DocumentFragment nodes don't have gEBTN
+-			} else if ( support.qsa ) {
+-				return context.querySelectorAll( tag );
+-			}
+-		} :
+-
+-		function( tag, context ) {
+-			var elem,
+-				tmp = [],
+-				i = 0,
+-
+-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+-				results = context.getElementsByTagName( tag );
+-
+-			// Filter out possible comments
+-			if ( tag === "*" ) {
+-				while ( ( elem = results[ i++ ] ) ) {
+-					if ( elem.nodeType === 1 ) {
+-						tmp.push( elem );
+-					}
+-				}
+-
+-				return tmp;
+-			}
+-			return results;
+-		};
+-
+-	// Class
+-	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
+-		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
+-			return context.getElementsByClassName( className );
+-		}
+-	};
+-
+-	/* QSA/matchesSelector
+-	---------------------------------------------------------------------- */
+-
+-	// QSA and matchesSelector support
+-
+-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+-	rbuggyMatches = [];
+-
+-	// qSa(:focus) reports false when true (Chrome 21)
+-	// We allow this because of a bug in IE8/9 that throws an error
+-	// whenever `document.activeElement` is accessed on an iframe
+-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+-	// See https://bugs.jquery.com/ticket/13378
+-	rbuggyQSA = [];
+-
+-	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+-
+-		// Build QSA regex
+-		// Regex strategy adopted from Diego Perini
+-		assert( function( el ) {
+-
+-			var input;
+-
+-			// Select is set to empty string on purpose
+-			// This is to test IE's treatment of not explicitly
+-			// setting a boolean content attribute,
+-			// since its presence should be enough
+-			// https://bugs.jquery.com/ticket/12359
+-			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
+-				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
+-				"<option selected=''></option></select>";
+-
+-			// Support: IE8, Opera 11-12.16
+-			// Nothing should be selected when empty strings follow ^= or $= or *=
+-			// The test attribute must be unknown in Opera but "safe" for WinRT
+-			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+-			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
+-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+-			}
+-
+-			// Support: IE8
+-			// Boolean attributes and "value" are not treated correctly
+-			if ( !el.querySelectorAll( "[selected]" ).length ) {
+-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+-			}
+-
+-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+-			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+-				rbuggyQSA.push( "~=" );
+-			}
+-
+-			// Support: IE 11+, Edge 15 - 18+
+-			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
+-			// Adding a temporary attribute to the document before the selection works
+-			// around the issue.
+-			// Interestingly, IE 10 & older don't seem to have the issue.
+-			input = document.createElement( "input" );
+-			input.setAttribute( "name", "" );
+-			el.appendChild( input );
+-			if ( !el.querySelectorAll( "[name='']" ).length ) {
+-				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+-					whitespace + "*(?:''|\"\")" );
+-			}
+-
+-			// Webkit/Opera - :checked should return selected option elements
+-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+-			// IE8 throws error here and will not see later tests
+-			if ( !el.querySelectorAll( ":checked" ).length ) {
+-				rbuggyQSA.push( ":checked" );
+-			}
+-
+-			// Support: Safari 8+, iOS 8+
+-			// https://bugs.webkit.org/show_bug.cgi?id=136851
+-			// In-page `selector#id sibling-combinator selector` fails
+-			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
+-				rbuggyQSA.push( ".#.+[+~]" );
+-			}
+-
+-			// Support: Firefox <=3.6 - 5 only
+-			// Old Firefox doesn't throw on a badly-escaped identifier.
+-			el.querySelectorAll( "\\\f" );
+-			rbuggyQSA.push( "[\\r\\n\\f]" );
+-		} );
+-
+-		assert( function( el ) {
+-			el.innerHTML = "<a href='' disabled='disabled'></a>" +
+-				"<select disabled='disabled'><option/></select>";
+-
+-			// Support: Windows 8 Native Apps
+-			// The type and name attributes are restricted during .innerHTML assignment
+-			var input = document.createElement( "input" );
+-			input.setAttribute( "type", "hidden" );
+-			el.appendChild( input ).setAttribute( "name", "D" );
+-
+-			// Support: IE8
+-			// Enforce case-sensitivity of name attribute
+-			if ( el.querySelectorAll( "[name=d]" ).length ) {
+-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+-			}
+-
+-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+-			// IE8 throws error here and will not see later tests
+-			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
+-				rbuggyQSA.push( ":enabled", ":disabled" );
+-			}
+-
+-			// Support: IE9-11+
+-			// IE's :disabled selector does not pick up the children of disabled fieldsets
+-			docElem.appendChild( el ).disabled = true;
+-			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
+-				rbuggyQSA.push( ":enabled", ":disabled" );
+-			}
+-
+-			// Support: Opera 10 - 11 only
+-			// Opera 10-11 does not throw on post-comma invalid pseudos
+-			el.querySelectorAll( "*,:x" );
+-			rbuggyQSA.push( ",.*:" );
+-		} );
+-	}
+-
+-	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
+-		docElem.webkitMatchesSelector ||
+-		docElem.mozMatchesSelector ||
+-		docElem.oMatchesSelector ||
+-		docElem.msMatchesSelector ) ) ) ) {
+-
+-		assert( function( el ) {
+-
+-			// Check to see if it's possible to do matchesSelector
+-			// on a disconnected node (IE 9)
+-			support.disconnectedMatch = matches.call( el, "*" );
+-
+-			// This should fail with an exception
+-			// Gecko does not error, returns false instead
+-			matches.call( el, "[s!='']:x" );
+-			rbuggyMatches.push( "!=", pseudos );
+-		} );
+-	}
+-
+-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
+-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
+-
+-	/* Contains
+-	---------------------------------------------------------------------- */
+-	hasCompare = rnative.test( docElem.compareDocumentPosition );
+-
+-	// Element contains another
+-	// Purposefully self-exclusive
+-	// As in, an element does not contain itself
+-	contains = hasCompare || rnative.test( docElem.contains ) ?
+-		function( a, b ) {
+-			var adown = a.nodeType === 9 ? a.documentElement : a,
+-				bup = b && b.parentNode;
+-			return a === bup || !!( bup && bup.nodeType === 1 && (
+-				adown.contains ?
+-					adown.contains( bup ) :
+-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+-			) );
+-		} :
+-		function( a, b ) {
+-			if ( b ) {
+-				while ( ( b = b.parentNode ) ) {
+-					if ( b === a ) {
+-						return true;
+-					}
+-				}
+-			}
+-			return false;
+-		};
+-
+-	/* Sorting
+-	---------------------------------------------------------------------- */
+-
+-	// Document order sorting
+-	sortOrder = hasCompare ?
+-	function( a, b ) {
+-
+-		// Flag for duplicate removal
+-		if ( a === b ) {
+-			hasDuplicate = true;
+-			return 0;
+-		}
+-
+-		// Sort on method existence if only one input has compareDocumentPosition
+-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+-		if ( compare ) {
+-			return compare;
+-		}
+-
+-		// Calculate position if both inputs belong to the same document
+-		// Support: IE 11+, Edge 17 - 18+
+-		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-		// two documents; shallow comparisons work.
+-		// eslint-disable-next-line eqeqeq
+-		compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
+-			a.compareDocumentPosition( b ) :
+-
+-			// Otherwise we know they are disconnected
+-			1;
+-
+-		// Disconnected nodes
+-		if ( compare & 1 ||
+-			( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
+-
+-			// Choose the first element that is related to our preferred document
+-			// Support: IE 11+, Edge 17 - 18+
+-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-			// two documents; shallow comparisons work.
+-			// eslint-disable-next-line eqeqeq
+-			if ( a == document || a.ownerDocument == preferredDoc &&
+-				contains( preferredDoc, a ) ) {
+-				return -1;
+-			}
+-
+-			// Support: IE 11+, Edge 17 - 18+
+-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-			// two documents; shallow comparisons work.
+-			// eslint-disable-next-line eqeqeq
+-			if ( b == document || b.ownerDocument == preferredDoc &&
+-				contains( preferredDoc, b ) ) {
+-				return 1;
+-			}
+-
+-			// Maintain original order
+-			return sortInput ?
+-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+-				0;
+-		}
+-
+-		return compare & 4 ? -1 : 1;
+-	} :
+-	function( a, b ) {
+-
+-		// Exit early if the nodes are identical
+-		if ( a === b ) {
+-			hasDuplicate = true;
+-			return 0;
+-		}
+-
+-		var cur,
+-			i = 0,
+-			aup = a.parentNode,
+-			bup = b.parentNode,
+-			ap = [ a ],
+-			bp = [ b ];
+-
+-		// Parentless nodes are either documents or disconnected
+-		if ( !aup || !bup ) {
+-
+-			// Support: IE 11+, Edge 17 - 18+
+-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-			// two documents; shallow comparisons work.
+-			/* eslint-disable eqeqeq */
+-			return a == document ? -1 :
+-				b == document ? 1 :
+-				/* eslint-enable eqeqeq */
+-				aup ? -1 :
+-				bup ? 1 :
+-				sortInput ?
+-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+-				0;
+-
+-		// If the nodes are siblings, we can do a quick check
+-		} else if ( aup === bup ) {
+-			return siblingCheck( a, b );
+-		}
+-
+-		// Otherwise we need full lists of their ancestors for comparison
+-		cur = a;
+-		while ( ( cur = cur.parentNode ) ) {
+-			ap.unshift( cur );
+-		}
+-		cur = b;
+-		while ( ( cur = cur.parentNode ) ) {
+-			bp.unshift( cur );
+-		}
+-
+-		// Walk down the tree looking for a discrepancy
+-		while ( ap[ i ] === bp[ i ] ) {
+-			i++;
+-		}
+-
+-		return i ?
+-
+-			// Do a sibling check if the nodes have a common ancestor
+-			siblingCheck( ap[ i ], bp[ i ] ) :
+-
+-			// Otherwise nodes in our document sort first
+-			// Support: IE 11+, Edge 17 - 18+
+-			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-			// two documents; shallow comparisons work.
+-			/* eslint-disable eqeqeq */
+-			ap[ i ] == preferredDoc ? -1 :
+-			bp[ i ] == preferredDoc ? 1 :
+-			/* eslint-enable eqeqeq */
+-			0;
+-	};
+-
+-	return document;
+-};
+-
+-Sizzle.matches = function( expr, elements ) {
+-	return Sizzle( expr, null, null, elements );
+-};
+-
+-Sizzle.matchesSelector = function( elem, expr ) {
+-	setDocument( elem );
+-
+-	if ( support.matchesSelector && documentIsHTML &&
+-		!nonnativeSelectorCache[ expr + " " ] &&
+-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+-
+-		try {
+-			var ret = matches.call( elem, expr );
+-
+-			// IE 9's matchesSelector returns false on disconnected nodes
+-			if ( ret || support.disconnectedMatch ||
+-
+-				// As well, disconnected nodes are said to be in a document
+-				// fragment in IE 9
+-				elem.document && elem.document.nodeType !== 11 ) {
+-				return ret;
+-			}
+-		} catch ( e ) {
+-			nonnativeSelectorCache( expr, true );
+-		}
+-	}
+-
+-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+-};
+-
+-Sizzle.contains = function( context, elem ) {
+-
+-	// Set document vars if needed
+-	// Support: IE 11+, Edge 17 - 18+
+-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-	// two documents; shallow comparisons work.
+-	// eslint-disable-next-line eqeqeq
+-	if ( ( context.ownerDocument || context ) != document ) {
+-		setDocument( context );
+-	}
+-	return contains( context, elem );
+-};
+-
+-Sizzle.attr = function( elem, name ) {
+-
+-	// Set document vars if needed
+-	// Support: IE 11+, Edge 17 - 18+
+-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-	// two documents; shallow comparisons work.
+-	// eslint-disable-next-line eqeqeq
+-	if ( ( elem.ownerDocument || elem ) != document ) {
+-		setDocument( elem );
+-	}
+-
+-	var fn = Expr.attrHandle[ name.toLowerCase() ],
+-
+-		// Don't get fooled by Object.prototype properties (jQuery #13807)
+-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+-			fn( elem, name, !documentIsHTML ) :
+-			undefined;
+-
+-	return val !== undefined ?
+-		val :
+-		support.attributes || !documentIsHTML ?
+-			elem.getAttribute( name ) :
+-			( val = elem.getAttributeNode( name ) ) && val.specified ?
+-				val.value :
+-				null;
+-};
+-
+-Sizzle.escape = function( sel ) {
+-	return ( sel + "" ).replace( rcssescape, fcssescape );
+-};
+-
+-Sizzle.error = function( msg ) {
+-	throw new Error( "Syntax error, unrecognized expression: " + msg );
+-};
+-
+-/**
+- * Document sorting and removing duplicates
+- * @param {ArrayLike} results
+- */
+-Sizzle.uniqueSort = function( results ) {
+-	var elem,
+-		duplicates = [],
+-		j = 0,
+-		i = 0;
+-
+-	// Unless we *know* we can detect duplicates, assume their presence
+-	hasDuplicate = !support.detectDuplicates;
+-	sortInput = !support.sortStable && results.slice( 0 );
+-	results.sort( sortOrder );
+-
+-	if ( hasDuplicate ) {
+-		while ( ( elem = results[ i++ ] ) ) {
+-			if ( elem === results[ i ] ) {
+-				j = duplicates.push( i );
+-			}
+-		}
+-		while ( j-- ) {
+-			results.splice( duplicates[ j ], 1 );
+-		}
+-	}
+-
+-	// Clear input after sorting to release objects
+-	// See https://github.com/jquery/sizzle/pull/225
+-	sortInput = null;
+-
+-	return results;
+-};
+-
+-/**
+- * Utility function for retrieving the text value of an array of DOM nodes
+- * @param {Array|Element} elem
+- */
+-getText = Sizzle.getText = function( elem ) {
+-	var node,
+-		ret = "",
+-		i = 0,
+-		nodeType = elem.nodeType;
+-
+-	if ( !nodeType ) {
+-
+-		// If no nodeType, this is expected to be an array
+-		while ( ( node = elem[ i++ ] ) ) {
+-
+-			// Do not traverse comment nodes
+-			ret += getText( node );
+-		}
+-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+-
+-		// Use textContent for elements
+-		// innerText usage removed for consistency of new lines (jQuery #11153)
+-		if ( typeof elem.textContent === "string" ) {
+-			return elem.textContent;
+-		} else {
+-
+-			// Traverse its children
+-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+-				ret += getText( elem );
+-			}
+-		}
+-	} else if ( nodeType === 3 || nodeType === 4 ) {
+-		return elem.nodeValue;
+-	}
+-
+-	// Do not include comment or processing instruction nodes
+-
+-	return ret;
+-};
+-
+-Expr = Sizzle.selectors = {
+-
+-	// Can be adjusted by the user
+-	cacheLength: 50,
+-
+-	createPseudo: markFunction,
+-
+-	match: matchExpr,
+-
+-	attrHandle: {},
+-
+-	find: {},
+-
+-	relative: {
+-		">": { dir: "parentNode", first: true },
+-		" ": { dir: "parentNode" },
+-		"+": { dir: "previousSibling", first: true },
+-		"~": { dir: "previousSibling" }
+-	},
+-
+-	preFilter: {
+-		"ATTR": function( match ) {
+-			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
+-
+-			// Move the given value to match[3] whether quoted or unquoted
+-			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
+-				match[ 5 ] || "" ).replace( runescape, funescape );
+-
+-			if ( match[ 2 ] === "~=" ) {
+-				match[ 3 ] = " " + match[ 3 ] + " ";
+-			}
+-
+-			return match.slice( 0, 4 );
+-		},
+-
+-		"CHILD": function( match ) {
+-
+-			/* matches from matchExpr["CHILD"]
+-				1 type (only|nth|...)
+-				2 what (child|of-type)
+-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+-				4 xn-component of xn+y argument ([+-]?\d*n|)
+-				5 sign of xn-component
+-				6 x of xn-component
+-				7 sign of y-component
+-				8 y of y-component
+-			*/
+-			match[ 1 ] = match[ 1 ].toLowerCase();
+-
+-			if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
+-
+-				// nth-* requires argument
+-				if ( !match[ 3 ] ) {
+-					Sizzle.error( match[ 0 ] );
+-				}
+-
+-				// numeric x and y parameters for Expr.filter.CHILD
+-				// remember that false/true cast respectively to 0/1
+-				match[ 4 ] = +( match[ 4 ] ?
+-					match[ 5 ] + ( match[ 6 ] || 1 ) :
+-					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+-				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
+-
+-				// other types prohibit arguments
+-			} else if ( match[ 3 ] ) {
+-				Sizzle.error( match[ 0 ] );
+-			}
+-
+-			return match;
+-		},
+-
+-		"PSEUDO": function( match ) {
+-			var excess,
+-				unquoted = !match[ 6 ] && match[ 2 ];
+-
+-			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
+-				return null;
+-			}
+-
+-			// Accept quoted arguments as-is
+-			if ( match[ 3 ] ) {
+-				match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
+-
+-			// Strip excess characters from unquoted arguments
+-			} else if ( unquoted && rpseudo.test( unquoted ) &&
+-
+-				// Get excess from tokenize (recursively)
+-				( excess = tokenize( unquoted, true ) ) &&
+-
+-				// advance to the next closing parenthesis
+-				( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
+-
+-				// excess is a negative index
+-				match[ 0 ] = match[ 0 ].slice( 0, excess );
+-				match[ 2 ] = unquoted.slice( 0, excess );
+-			}
+-
+-			// Return only captures needed by the pseudo filter method (type and argument)
+-			return match.slice( 0, 3 );
+-		}
+-	},
+-
+-	filter: {
+-
+-		"TAG": function( nodeNameSelector ) {
+-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+-			return nodeNameSelector === "*" ?
+-				function() {
+-					return true;
+-				} :
+-				function( elem ) {
+-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+-				};
+-		},
+-
+-		"CLASS": function( className ) {
+-			var pattern = classCache[ className + " " ];
+-
+-			return pattern ||
+-				( pattern = new RegExp( "(^|" + whitespace +
+-					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
+-						className, function( elem ) {
+-							return pattern.test(
+-								typeof elem.className === "string" && elem.className ||
+-								typeof elem.getAttribute !== "undefined" &&
+-									elem.getAttribute( "class" ) ||
+-								""
+-							);
+-				} );
+-		},
+-
+-		"ATTR": function( name, operator, check ) {
+-			return function( elem ) {
+-				var result = Sizzle.attr( elem, name );
+-
+-				if ( result == null ) {
+-					return operator === "!=";
+-				}
+-				if ( !operator ) {
+-					return true;
+-				}
+-
+-				result += "";
+-
+-				/* eslint-disable max-len */
+-
+-				return operator === "=" ? result === check :
+-					operator === "!=" ? result !== check :
+-					operator === "^=" ? check && result.indexOf( check ) === 0 :
+-					operator === "*=" ? check && result.indexOf( check ) > -1 :
+-					operator === "$=" ? check && result.slice( -check.length ) === check :
+-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+-					false;
+-				/* eslint-enable max-len */
+-
+-			};
+-		},
+-
+-		"CHILD": function( type, what, _argument, first, last ) {
+-			var simple = type.slice( 0, 3 ) !== "nth",
+-				forward = type.slice( -4 ) !== "last",
+-				ofType = what === "of-type";
+-
+-			return first === 1 && last === 0 ?
+-
+-				// Shortcut for :nth-*(n)
+-				function( elem ) {
+-					return !!elem.parentNode;
+-				} :
+-
+-				function( elem, _context, xml ) {
+-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
+-						dir = simple !== forward ? "nextSibling" : "previousSibling",
+-						parent = elem.parentNode,
+-						name = ofType && elem.nodeName.toLowerCase(),
+-						useCache = !xml && !ofType,
+-						diff = false;
+-
+-					if ( parent ) {
+-
+-						// :(first|last|only)-(child|of-type)
+-						if ( simple ) {
+-							while ( dir ) {
+-								node = elem;
+-								while ( ( node = node[ dir ] ) ) {
+-									if ( ofType ?
+-										node.nodeName.toLowerCase() === name :
+-										node.nodeType === 1 ) {
+-
+-										return false;
+-									}
+-								}
+-
+-								// Reverse direction for :only-* (if we haven't yet done so)
+-								start = dir = type === "only" && !start && "nextSibling";
+-							}
+-							return true;
+-						}
+-
+-						start = [ forward ? parent.firstChild : parent.lastChild ];
+-
+-						// non-xml :nth-child(...) stores cache data on `parent`
+-						if ( forward && useCache ) {
+-
+-							// Seek `elem` from a previously-cached index
+-
+-							// ...in a gzip-friendly way
+-							node = parent;
+-							outerCache = node[ expando ] || ( node[ expando ] = {} );
+-
+-							// Support: IE <9 only
+-							// Defend against cloned attroperties (jQuery gh-1709)
+-							uniqueCache = outerCache[ node.uniqueID ] ||
+-								( outerCache[ node.uniqueID ] = {} );
+-
+-							cache = uniqueCache[ type ] || [];
+-							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+-							diff = nodeIndex && cache[ 2 ];
+-							node = nodeIndex && parent.childNodes[ nodeIndex ];
+-
+-							while ( ( node = ++nodeIndex && node && node[ dir ] ||
+-
+-								// Fallback to seeking `elem` from the start
+-								( diff = nodeIndex = 0 ) || start.pop() ) ) {
+-
+-								// When found, cache indexes on `parent` and break
+-								if ( node.nodeType === 1 && ++diff && node === elem ) {
+-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
+-									break;
+-								}
+-							}
+-
+-						} else {
+-
+-							// Use previously-cached element index if available
+-							if ( useCache ) {
+-
+-								// ...in a gzip-friendly way
+-								node = elem;
+-								outerCache = node[ expando ] || ( node[ expando ] = {} );
+-
+-								// Support: IE <9 only
+-								// Defend against cloned attroperties (jQuery gh-1709)
+-								uniqueCache = outerCache[ node.uniqueID ] ||
+-									( outerCache[ node.uniqueID ] = {} );
+-
+-								cache = uniqueCache[ type ] || [];
+-								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+-								diff = nodeIndex;
+-							}
+-
+-							// xml :nth-child(...)
+-							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
+-							if ( diff === false ) {
+-
+-								// Use the same loop as above to seek `elem` from the start
+-								while ( ( node = ++nodeIndex && node && node[ dir ] ||
+-									( diff = nodeIndex = 0 ) || start.pop() ) ) {
+-
+-									if ( ( ofType ?
+-										node.nodeName.toLowerCase() === name :
+-										node.nodeType === 1 ) &&
+-										++diff ) {
+-
+-										// Cache the index of each encountered element
+-										if ( useCache ) {
+-											outerCache = node[ expando ] ||
+-												( node[ expando ] = {} );
+-
+-											// Support: IE <9 only
+-											// Defend against cloned attroperties (jQuery gh-1709)
+-											uniqueCache = outerCache[ node.uniqueID ] ||
+-												( outerCache[ node.uniqueID ] = {} );
+-
+-											uniqueCache[ type ] = [ dirruns, diff ];
+-										}
+-
+-										if ( node === elem ) {
+-											break;
+-										}
+-									}
+-								}
+-							}
+-						}
+-
+-						// Incorporate the offset, then check against cycle size
+-						diff -= last;
+-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+-					}
+-				};
+-		},
+-
+-		"PSEUDO": function( pseudo, argument ) {
+-
+-			// pseudo-class names are case-insensitive
+-			// http://www.w3.org/TR/selectors/#pseudo-classes
+-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+-			// Remember that setFilters inherits from pseudos
+-			var args,
+-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+-					Sizzle.error( "unsupported pseudo: " + pseudo );
+-
+-			// The user may use createPseudo to indicate that
+-			// arguments are needed to create the filter function
+-			// just as Sizzle does
+-			if ( fn[ expando ] ) {
+-				return fn( argument );
+-			}
+-
+-			// But maintain support for old signatures
+-			if ( fn.length > 1 ) {
+-				args = [ pseudo, pseudo, "", argument ];
+-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+-					markFunction( function( seed, matches ) {
+-						var idx,
+-							matched = fn( seed, argument ),
+-							i = matched.length;
+-						while ( i-- ) {
+-							idx = indexOf( seed, matched[ i ] );
+-							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
+-						}
+-					} ) :
+-					function( elem ) {
+-						return fn( elem, 0, args );
+-					};
+-			}
+-
+-			return fn;
+-		}
+-	},
+-
+-	pseudos: {
+-
+-		// Potentially complex pseudos
+-		"not": markFunction( function( selector ) {
+-
+-			// Trim the selector passed to compile
+-			// to avoid treating leading and trailing
+-			// spaces as combinators
+-			var input = [],
+-				results = [],
+-				matcher = compile( selector.replace( rtrim, "$1" ) );
+-
+-			return matcher[ expando ] ?
+-				markFunction( function( seed, matches, _context, xml ) {
+-					var elem,
+-						unmatched = matcher( seed, null, xml, [] ),
+-						i = seed.length;
+-
+-					// Match elements unmatched by `matcher`
+-					while ( i-- ) {
+-						if ( ( elem = unmatched[ i ] ) ) {
+-							seed[ i ] = !( matches[ i ] = elem );
+-						}
+-					}
+-				} ) :
+-				function( elem, _context, xml ) {
+-					input[ 0 ] = elem;
+-					matcher( input, null, xml, results );
+-
+-					// Don't keep the element (issue #299)
+-					input[ 0 ] = null;
+-					return !results.pop();
+-				};
+-		} ),
+-
+-		"has": markFunction( function( selector ) {
+-			return function( elem ) {
+-				return Sizzle( selector, elem ).length > 0;
+-			};
+-		} ),
+-
+-		"contains": markFunction( function( text ) {
+-			text = text.replace( runescape, funescape );
+-			return function( elem ) {
+-				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
+-			};
+-		} ),
+-
+-		// "Whether an element is represented by a :lang() selector
+-		// is based solely on the element's language value
+-		// being equal to the identifier C,
+-		// or beginning with the identifier C immediately followed by "-".
+-		// The matching of C against the element's language value is performed case-insensitively.
+-		// The identifier C does not have to be a valid language name."
+-		// http://www.w3.org/TR/selectors/#lang-pseudo
+-		"lang": markFunction( function( lang ) {
+-
+-			// lang value must be a valid identifier
+-			if ( !ridentifier.test( lang || "" ) ) {
+-				Sizzle.error( "unsupported lang: " + lang );
+-			}
+-			lang = lang.replace( runescape, funescape ).toLowerCase();
+-			return function( elem ) {
+-				var elemLang;
+-				do {
+-					if ( ( elemLang = documentIsHTML ?
+-						elem.lang :
+-						elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
+-
+-						elemLang = elemLang.toLowerCase();
+-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+-					}
+-				} while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
+-				return false;
+-			};
+-		} ),
+-
+-		// Miscellaneous
+-		"target": function( elem ) {
+-			var hash = window.location && window.location.hash;
+-			return hash && hash.slice( 1 ) === elem.id;
+-		},
+-
+-		"root": function( elem ) {
+-			return elem === docElem;
+-		},
+-
+-		"focus": function( elem ) {
+-			return elem === document.activeElement &&
+-				( !document.hasFocus || document.hasFocus() ) &&
+-				!!( elem.type || elem.href || ~elem.tabIndex );
+-		},
+-
+-		// Boolean properties
+-		"enabled": createDisabledPseudo( false ),
+-		"disabled": createDisabledPseudo( true ),
+-
+-		"checked": function( elem ) {
+-
+-			// In CSS3, :checked should return both checked and selected elements
+-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+-			var nodeName = elem.nodeName.toLowerCase();
+-			return ( nodeName === "input" && !!elem.checked ) ||
+-				( nodeName === "option" && !!elem.selected );
+-		},
+-
+-		"selected": function( elem ) {
+-
+-			// Accessing this property makes selected-by-default
+-			// options in Safari work properly
+-			if ( elem.parentNode ) {
+-				// eslint-disable-next-line no-unused-expressions
+-				elem.parentNode.selectedIndex;
+-			}
+-
+-			return elem.selected === true;
+-		},
+-
+-		// Contents
+-		"empty": function( elem ) {
+-
+-			// http://www.w3.org/TR/selectors/#empty-pseudo
+-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+-			//   but not by others (comment: 8; processing instruction: 7; etc.)
+-			// nodeType < 6 works because attributes (2) do not appear as children
+-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+-				if ( elem.nodeType < 6 ) {
+-					return false;
+-				}
+-			}
+-			return true;
+-		},
+-
+-		"parent": function( elem ) {
+-			return !Expr.pseudos[ "empty" ]( elem );
+-		},
+-
+-		// Element/input types
+-		"header": function( elem ) {
+-			return rheader.test( elem.nodeName );
+-		},
+-
+-		"input": function( elem ) {
+-			return rinputs.test( elem.nodeName );
+-		},
+-
+-		"button": function( elem ) {
+-			var name = elem.nodeName.toLowerCase();
+-			return name === "input" && elem.type === "button" || name === "button";
+-		},
+-
+-		"text": function( elem ) {
+-			var attr;
+-			return elem.nodeName.toLowerCase() === "input" &&
+-				elem.type === "text" &&
+-
+-				// Support: IE<8
+-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+-				( ( attr = elem.getAttribute( "type" ) ) == null ||
+-					attr.toLowerCase() === "text" );
+-		},
+-
+-		// Position-in-collection
+-		"first": createPositionalPseudo( function() {
+-			return [ 0 ];
+-		} ),
+-
+-		"last": createPositionalPseudo( function( _matchIndexes, length ) {
+-			return [ length - 1 ];
+-		} ),
+-
+-		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
+-			return [ argument < 0 ? argument + length : argument ];
+-		} ),
+-
+-		"even": createPositionalPseudo( function( matchIndexes, length ) {
+-			var i = 0;
+-			for ( ; i < length; i += 2 ) {
+-				matchIndexes.push( i );
+-			}
+-			return matchIndexes;
+-		} ),
+-
+-		"odd": createPositionalPseudo( function( matchIndexes, length ) {
+-			var i = 1;
+-			for ( ; i < length; i += 2 ) {
+-				matchIndexes.push( i );
+-			}
+-			return matchIndexes;
+-		} ),
+-
+-		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
+-			var i = argument < 0 ?
+-				argument + length :
+-				argument > length ?
+-					length :
+-					argument;
+-			for ( ; --i >= 0; ) {
+-				matchIndexes.push( i );
+-			}
+-			return matchIndexes;
+-		} ),
+-
+-		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
+-			var i = argument < 0 ? argument + length : argument;
+-			for ( ; ++i < length; ) {
+-				matchIndexes.push( i );
+-			}
+-			return matchIndexes;
+-		} )
+-	}
+-};
+-
+-Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
+-
+-// Add button/input type pseudos
+-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+-	Expr.pseudos[ i ] = createInputPseudo( i );
+-}
+-for ( i in { submit: true, reset: true } ) {
+-	Expr.pseudos[ i ] = createButtonPseudo( i );
+-}
+-
+-// Easy API for creating new setFilters
+-function setFilters() {}
+-setFilters.prototype = Expr.filters = Expr.pseudos;
+-Expr.setFilters = new setFilters();
+-
+-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+-	var matched, match, tokens, type,
+-		soFar, groups, preFilters,
+-		cached = tokenCache[ selector + " " ];
+-
+-	if ( cached ) {
+-		return parseOnly ? 0 : cached.slice( 0 );
+-	}
+-
+-	soFar = selector;
+-	groups = [];
+-	preFilters = Expr.preFilter;
+-
+-	while ( soFar ) {
+-
+-		// Comma and first run
+-		if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
+-			if ( match ) {
+-
+-				// Don't consume trailing commas as valid
+-				soFar = soFar.slice( match[ 0 ].length ) || soFar;
+-			}
+-			groups.push( ( tokens = [] ) );
+-		}
+-
+-		matched = false;
+-
+-		// Combinators
+-		if ( ( match = rcombinators.exec( soFar ) ) ) {
+-			matched = match.shift();
+-			tokens.push( {
+-				value: matched,
+-
+-				// Cast descendant combinators to space
+-				type: match[ 0 ].replace( rtrim, " " )
+-			} );
+-			soFar = soFar.slice( matched.length );
+-		}
+-
+-		// Filters
+-		for ( type in Expr.filter ) {
+-			if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
+-				( match = preFilters[ type ]( match ) ) ) ) {
+-				matched = match.shift();
+-				tokens.push( {
+-					value: matched,
+-					type: type,
+-					matches: match
+-				} );
+-				soFar = soFar.slice( matched.length );
+-			}
+-		}
+-
+-		if ( !matched ) {
+-			break;
+-		}
+-	}
+-
+-	// Return the length of the invalid excess
+-	// if we're just parsing
+-	// Otherwise, throw an error or return tokens
+-	return parseOnly ?
+-		soFar.length :
+-		soFar ?
+-			Sizzle.error( selector ) :
+-
+-			// Cache the tokens
+-			tokenCache( selector, groups ).slice( 0 );
+-};
+-
+-function toSelector( tokens ) {
+-	var i = 0,
+-		len = tokens.length,
+-		selector = "";
+-	for ( ; i < len; i++ ) {
+-		selector += tokens[ i ].value;
+-	}
+-	return selector;
+-}
+-
+-function addCombinator( matcher, combinator, base ) {
+-	var dir = combinator.dir,
+-		skip = combinator.next,
+-		key = skip || dir,
+-		checkNonElements = base && key === "parentNode",
+-		doneName = done++;
+-
+-	return combinator.first ?
+-
+-		// Check against closest ancestor/preceding element
+-		function( elem, context, xml ) {
+-			while ( ( elem = elem[ dir ] ) ) {
+-				if ( elem.nodeType === 1 || checkNonElements ) {
+-					return matcher( elem, context, xml );
+-				}
+-			}
+-			return false;
+-		} :
+-
+-		// Check against all ancestor/preceding elements
+-		function( elem, context, xml ) {
+-			var oldCache, uniqueCache, outerCache,
+-				newCache = [ dirruns, doneName ];
+-
+-			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
+-			if ( xml ) {
+-				while ( ( elem = elem[ dir ] ) ) {
+-					if ( elem.nodeType === 1 || checkNonElements ) {
+-						if ( matcher( elem, context, xml ) ) {
+-							return true;
+-						}
+-					}
+-				}
+-			} else {
+-				while ( ( elem = elem[ dir ] ) ) {
+-					if ( elem.nodeType === 1 || checkNonElements ) {
+-						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
+-
+-						// Support: IE <9 only
+-						// Defend against cloned attroperties (jQuery gh-1709)
+-						uniqueCache = outerCache[ elem.uniqueID ] ||
+-							( outerCache[ elem.uniqueID ] = {} );
+-
+-						if ( skip && skip === elem.nodeName.toLowerCase() ) {
+-							elem = elem[ dir ] || elem;
+-						} else if ( ( oldCache = uniqueCache[ key ] ) &&
+-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+-
+-							// Assign to newCache so results back-propagate to previous elements
+-							return ( newCache[ 2 ] = oldCache[ 2 ] );
+-						} else {
+-
+-							// Reuse newcache so results back-propagate to previous elements
+-							uniqueCache[ key ] = newCache;
+-
+-							// A match means we're done; a fail means we have to keep checking
+-							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
+-								return true;
+-							}
+-						}
+-					}
+-				}
+-			}
+-			return false;
+-		};
+-}
+-
+-function elementMatcher( matchers ) {
+-	return matchers.length > 1 ?
+-		function( elem, context, xml ) {
+-			var i = matchers.length;
+-			while ( i-- ) {
+-				if ( !matchers[ i ]( elem, context, xml ) ) {
+-					return false;
+-				}
+-			}
+-			return true;
+-		} :
+-		matchers[ 0 ];
+-}
+-
+-function multipleContexts( selector, contexts, results ) {
+-	var i = 0,
+-		len = contexts.length;
+-	for ( ; i < len; i++ ) {
+-		Sizzle( selector, contexts[ i ], results );
+-	}
+-	return results;
+-}
+-
+-function condense( unmatched, map, filter, context, xml ) {
+-	var elem,
+-		newUnmatched = [],
+-		i = 0,
+-		len = unmatched.length,
+-		mapped = map != null;
+-
+-	for ( ; i < len; i++ ) {
+-		if ( ( elem = unmatched[ i ] ) ) {
+-			if ( !filter || filter( elem, context, xml ) ) {
+-				newUnmatched.push( elem );
+-				if ( mapped ) {
+-					map.push( i );
+-				}
+-			}
+-		}
+-	}
+-
+-	return newUnmatched;
+-}
+-
+-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+-	if ( postFilter && !postFilter[ expando ] ) {
+-		postFilter = setMatcher( postFilter );
+-	}
+-	if ( postFinder && !postFinder[ expando ] ) {
+-		postFinder = setMatcher( postFinder, postSelector );
+-	}
+-	return markFunction( function( seed, results, context, xml ) {
+-		var temp, i, elem,
+-			preMap = [],
+-			postMap = [],
+-			preexisting = results.length,
+-
+-			// Get initial elements from seed or context
+-			elems = seed || multipleContexts(
+-				selector || "*",
+-				context.nodeType ? [ context ] : context,
+-				[]
+-			),
+-
+-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+-			matcherIn = preFilter && ( seed || !selector ) ?
+-				condense( elems, preMap, preFilter, context, xml ) :
+-				elems,
+-
+-			matcherOut = matcher ?
+-
+-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+-
+-					// ...intermediate processing is necessary
+-					[] :
+-
+-					// ...otherwise use results directly
+-					results :
+-				matcherIn;
+-
+-		// Find primary matches
+-		if ( matcher ) {
+-			matcher( matcherIn, matcherOut, context, xml );
+-		}
+-
+-		// Apply postFilter
+-		if ( postFilter ) {
+-			temp = condense( matcherOut, postMap );
+-			postFilter( temp, [], context, xml );
+-
+-			// Un-match failing elements by moving them back to matcherIn
+-			i = temp.length;
+-			while ( i-- ) {
+-				if ( ( elem = temp[ i ] ) ) {
+-					matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
+-				}
+-			}
+-		}
+-
+-		if ( seed ) {
+-			if ( postFinder || preFilter ) {
+-				if ( postFinder ) {
+-
+-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+-					temp = [];
+-					i = matcherOut.length;
+-					while ( i-- ) {
+-						if ( ( elem = matcherOut[ i ] ) ) {
+-
+-							// Restore matcherIn since elem is not yet a final match
+-							temp.push( ( matcherIn[ i ] = elem ) );
+-						}
+-					}
+-					postFinder( null, ( matcherOut = [] ), temp, xml );
+-				}
+-
+-				// Move matched elements from seed to results to keep them synchronized
+-				i = matcherOut.length;
+-				while ( i-- ) {
+-					if ( ( elem = matcherOut[ i ] ) &&
+-						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
+-
+-						seed[ temp ] = !( results[ temp ] = elem );
+-					}
+-				}
+-			}
+-
+-		// Add elements to results, through postFinder if defined
+-		} else {
+-			matcherOut = condense(
+-				matcherOut === results ?
+-					matcherOut.splice( preexisting, matcherOut.length ) :
+-					matcherOut
+-			);
+-			if ( postFinder ) {
+-				postFinder( null, results, matcherOut, xml );
+-			} else {
+-				push.apply( results, matcherOut );
+-			}
+-		}
+-	} );
+-}
+-
+-function matcherFromTokens( tokens ) {
+-	var checkContext, matcher, j,
+-		len = tokens.length,
+-		leadingRelative = Expr.relative[ tokens[ 0 ].type ],
+-		implicitRelative = leadingRelative || Expr.relative[ " " ],
+-		i = leadingRelative ? 1 : 0,
+-
+-		// The foundational matcher ensures that elements are reachable from top-level context(s)
+-		matchContext = addCombinator( function( elem ) {
+-			return elem === checkContext;
+-		}, implicitRelative, true ),
+-		matchAnyContext = addCombinator( function( elem ) {
+-			return indexOf( checkContext, elem ) > -1;
+-		}, implicitRelative, true ),
+-		matchers = [ function( elem, context, xml ) {
+-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+-				( checkContext = context ).nodeType ?
+-					matchContext( elem, context, xml ) :
+-					matchAnyContext( elem, context, xml ) );
+-
+-			// Avoid hanging onto element (issue #299)
+-			checkContext = null;
+-			return ret;
+-		} ];
+-
+-	for ( ; i < len; i++ ) {
+-		if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
+-			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
+-		} else {
+-			matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
+-
+-			// Return special upon seeing a positional matcher
+-			if ( matcher[ expando ] ) {
+-
+-				// Find the next relative operator (if any) for proper handling
+-				j = ++i;
+-				for ( ; j < len; j++ ) {
+-					if ( Expr.relative[ tokens[ j ].type ] ) {
+-						break;
+-					}
+-				}
+-				return setMatcher(
+-					i > 1 && elementMatcher( matchers ),
+-					i > 1 && toSelector(
+-
+-					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+-					tokens
+-						.slice( 0, i - 1 )
+-						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
+-					).replace( rtrim, "$1" ),
+-					matcher,
+-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+-					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
+-					j < len && toSelector( tokens )
+-				);
+-			}
+-			matchers.push( matcher );
+-		}
+-	}
+-
+-	return elementMatcher( matchers );
+-}
+-
+-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+-	var bySet = setMatchers.length > 0,
+-		byElement = elementMatchers.length > 0,
+-		superMatcher = function( seed, context, xml, results, outermost ) {
+-			var elem, j, matcher,
+-				matchedCount = 0,
+-				i = "0",
+-				unmatched = seed && [],
+-				setMatched = [],
+-				contextBackup = outermostContext,
+-
+-				// We must always have either seed elements or outermost context
+-				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+-
+-				// Use integer dirruns iff this is the outermost matcher
+-				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
+-				len = elems.length;
+-
+-			if ( outermost ) {
+-
+-				// Support: IE 11+, Edge 17 - 18+
+-				// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-				// two documents; shallow comparisons work.
+-				// eslint-disable-next-line eqeqeq
+-				outermostContext = context == document || context || outermost;
+-			}
+-
+-			// Add elements passing elementMatchers directly to results
+-			// Support: IE<9, Safari
+-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+-			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
+-				if ( byElement && elem ) {
+-					j = 0;
+-
+-					// Support: IE 11+, Edge 17 - 18+
+-					// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+-					// two documents; shallow comparisons work.
+-					// eslint-disable-next-line eqeqeq
+-					if ( !context && elem.ownerDocument != document ) {
+-						setDocument( elem );
+-						xml = !documentIsHTML;
+-					}
+-					while ( ( matcher = elementMatchers[ j++ ] ) ) {
+-						if ( matcher( elem, context || document, xml ) ) {
+-							results.push( elem );
+-							break;
+-						}
+-					}
+-					if ( outermost ) {
+-						dirruns = dirrunsUnique;
+-					}
+-				}
+-
+-				// Track unmatched elements for set filters
+-				if ( bySet ) {
+-
+-					// They will have gone through all possible matchers
+-					if ( ( elem = !matcher && elem ) ) {
+-						matchedCount--;
+-					}
+-
+-					// Lengthen the array for every element, matched or not
+-					if ( seed ) {
+-						unmatched.push( elem );
+-					}
+-				}
+-			}
+-
+-			// `i` is now the count of elements visited above, and adding it to `matchedCount`
+-			// makes the latter nonnegative.
+-			matchedCount += i;
+-
+-			// Apply set filters to unmatched elements
+-			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+-			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+-			// no element matchers and no seed.
+-			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+-			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
+-			// numerically zero.
+-			if ( bySet && i !== matchedCount ) {
+-				j = 0;
+-				while ( ( matcher = setMatchers[ j++ ] ) ) {
+-					matcher( unmatched, setMatched, context, xml );
+-				}
+-
+-				if ( seed ) {
+-
+-					// Reintegrate element matches to eliminate the need for sorting
+-					if ( matchedCount > 0 ) {
+-						while ( i-- ) {
+-							if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
+-								setMatched[ i ] = pop.call( results );
+-							}
+-						}
+-					}
+-
+-					// Discard index placeholder values to get only actual matches
+-					setMatched = condense( setMatched );
+-				}
+-
+-				// Add matches to results
+-				push.apply( results, setMatched );
+-
+-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+-				if ( outermost && !seed && setMatched.length > 0 &&
+-					( matchedCount + setMatchers.length ) > 1 ) {
+-
+-					Sizzle.uniqueSort( results );
+-				}
+-			}
+-
+-			// Override manipulation of globals by nested matchers
+-			if ( outermost ) {
+-				dirruns = dirrunsUnique;
+-				outermostContext = contextBackup;
+-			}
+-
+-			return unmatched;
+-		};
+-
+-	return bySet ?
+-		markFunction( superMatcher ) :
+-		superMatcher;
+-}
+-
+-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+-	var i,
+-		setMatchers = [],
+-		elementMatchers = [],
+-		cached = compilerCache[ selector + " " ];
+-
+-	if ( !cached ) {
+-
+-		// Generate a function of recursive functions that can be used to check each element
+-		if ( !match ) {
+-			match = tokenize( selector );
+-		}
+-		i = match.length;
+-		while ( i-- ) {
+-			cached = matcherFromTokens( match[ i ] );
+-			if ( cached[ expando ] ) {
+-				setMatchers.push( cached );
+-			} else {
+-				elementMatchers.push( cached );
+-			}
+-		}
+-
+-		// Cache the compiled function
+-		cached = compilerCache(
+-			selector,
+-			matcherFromGroupMatchers( elementMatchers, setMatchers )
+-		);
+-
+-		// Save selector and tokenization
+-		cached.selector = selector;
+-	}
+-	return cached;
+-};
+-
+-/**
+- * A low-level selection function that works with Sizzle's compiled
+- *  selector functions
+- * @param {String|Function} selector A selector or a pre-compiled
+- *  selector function built with Sizzle.compile
+- * @param {Element} context
+- * @param {Array} [results]
+- * @param {Array} [seed] A set of elements to match against
+- */
+-select = Sizzle.select = function( selector, context, results, seed ) {
+-	var i, tokens, token, type, find,
+-		compiled = typeof selector === "function" && selector,
+-		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
+-
+-	results = results || [];
+-
+-	// Try to minimize operations if there is only one selector in the list and no seed
+-	// (the latter of which guarantees us context)
+-	if ( match.length === 1 ) {
+-
+-		// Reduce context if the leading compound selector is an ID
+-		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
+-		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
+-			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
+-
+-			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
+-				.replace( runescape, funescape ), context ) || [] )[ 0 ];
+-			if ( !context ) {
+-				return results;
+-
+-			// Precompiled matchers will still verify ancestry, so step up a level
+-			} else if ( compiled ) {
+-				context = context.parentNode;
+-			}
+-
+-			selector = selector.slice( tokens.shift().value.length );
+-		}
+-
+-		// Fetch a seed set for right-to-left matching
+-		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
+-		while ( i-- ) {
+-			token = tokens[ i ];
+-
+-			// Abort if we hit a combinator
+-			if ( Expr.relative[ ( type = token.type ) ] ) {
+-				break;
+-			}
+-			if ( ( find = Expr.find[ type ] ) ) {
+-
+-				// Search, expanding context for leading sibling combinators
+-				if ( ( seed = find(
+-					token.matches[ 0 ].replace( runescape, funescape ),
+-					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
+-						context
+-				) ) ) {
+-
+-					// If seed is empty or no tokens remain, we can return early
+-					tokens.splice( i, 1 );
+-					selector = seed.length && toSelector( tokens );
+-					if ( !selector ) {
+-						push.apply( results, seed );
+-						return results;
+-					}
+-
+-					break;
+-				}
+-			}
+-		}
+-	}
+-
+-	// Compile and execute a filtering function if one is not provided
+-	// Provide `match` to avoid retokenization if we modified the selector above
+-	( compiled || compile( selector, match ) )(
+-		seed,
+-		context,
+-		!documentIsHTML,
+-		results,
+-		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
+-	);
+-	return results;
+-};
+-
+-// One-time assignments
+-
+-// Sort stability
+-support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
+-
+-// Support: Chrome 14-35+
+-// Always assume duplicates if they aren't passed to the comparison function
+-support.detectDuplicates = !!hasDuplicate;
+-
+-// Initialize against the default document
+-setDocument();
+-
+-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+-// Detached nodes confoundingly follow *each other*
+-support.sortDetached = assert( function( el ) {
+-
+-	// Should return 1, but returns 4 (following)
+-	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
+-} );
+-
+-// Support: IE<8
+-// Prevent attribute/property "interpolation"
+-// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+-if ( !assert( function( el ) {
+-	el.innerHTML = "<a href='#'></a>";
+-	return el.firstChild.getAttribute( "href" ) === "#";
+-} ) ) {
+-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+-		if ( !isXML ) {
+-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+-		}
+-	} );
+-}
+-
+-// Support: IE<9
+-// Use defaultValue in place of getAttribute("value")
+-if ( !support.attributes || !assert( function( el ) {
+-	el.innerHTML = "<input/>";
+-	el.firstChild.setAttribute( "value", "" );
+-	return el.firstChild.getAttribute( "value" ) === "";
+-} ) ) {
+-	addHandle( "value", function( elem, _name, isXML ) {
+-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+-			return elem.defaultValue;
+-		}
+-	} );
+-}
+-
+-// Support: IE<9
+-// Use getAttributeNode to fetch booleans when getAttribute lies
+-if ( !assert( function( el ) {
+-	return el.getAttribute( "disabled" ) == null;
+-} ) ) {
+-	addHandle( booleans, function( elem, name, isXML ) {
+-		var val;
+-		if ( !isXML ) {
+-			return elem[ name ] === true ? name.toLowerCase() :
+-				( val = elem.getAttributeNode( name ) ) && val.specified ?
+-					val.value :
+-					null;
+-		}
+-	} );
+-}
+-
+-return Sizzle;
+-
+-} )( window );
+-
+-
+-
+-jQuery.find = Sizzle;
+-jQuery.expr = Sizzle.selectors;
+-
+-// Deprecated
+-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
+-jQuery.text = Sizzle.getText;
+-jQuery.isXMLDoc = Sizzle.isXML;
+-jQuery.contains = Sizzle.contains;
+-jQuery.escapeSelector = Sizzle.escape;
+-
+-
+-
+-
+-var dir = function( elem, dir, until ) {
+-	var matched = [],
+-		truncate = until !== undefined;
+-
+-	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+-		if ( elem.nodeType === 1 ) {
+-			if ( truncate && jQuery( elem ).is( until ) ) {
+-				break;
+-			}
+-			matched.push( elem );
+-		}
+-	}
+-	return matched;
+-};
+-
+-
+-var siblings = function( n, elem ) {
+-	var matched = [];
+-
+-	for ( ; n; n = n.nextSibling ) {
+-		if ( n.nodeType === 1 && n !== elem ) {
+-			matched.push( n );
+-		}
+-	}
+-
+-	return matched;
+-};
+-
+-
+-var rneedsContext = jQuery.expr.match.needsContext;
+-
+-
+-
+-function nodeName( elem, name ) {
+-
+-  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+-
+-};
+-var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
+-
+-
+-
+-// Implement the identical functionality for filter and not
+-function winnow( elements, qualifier, not ) {
+-	if ( isFunction( qualifier ) ) {
+-		return jQuery.grep( elements, function( elem, i ) {
+-			return !!qualifier.call( elem, i, elem ) !== not;
+-		} );
+-	}
+-
+-	// Single element
+-	if ( qualifier.nodeType ) {
+-		return jQuery.grep( elements, function( elem ) {
+-			return ( elem === qualifier ) !== not;
+-		} );
+-	}
+-
+-	// Arraylike of elements (jQuery, arguments, Array)
+-	if ( typeof qualifier !== "string" ) {
+-		return jQuery.grep( elements, function( elem ) {
+-			return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
+-		} );
+-	}
+-
+-	// Filtered directly for both simple and complex selectors
+-	return jQuery.filter( qualifier, elements, not );
+-}
+-
+-jQuery.filter = function( expr, elems, not ) {
+-	var elem = elems[ 0 ];
+-
+-	if ( not ) {
+-		expr = ":not(" + expr + ")";
+-	}
+-
+-	if ( elems.length === 1 && elem.nodeType === 1 ) {
+-		return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
+-	}
+-
+-	return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+-		return elem.nodeType === 1;
+-	} ) );
+-};
+-
+-jQuery.fn.extend( {
+-	find: function( selector ) {
+-		var i, ret,
+-			len = this.length,
+-			self = this;
+-
+-		if ( typeof selector !== "string" ) {
+-			return this.pushStack( jQuery( selector ).filter( function() {
+-				for ( i = 0; i < len; i++ ) {
+-					if ( jQuery.contains( self[ i ], this ) ) {
+-						return true;
+-					}
+-				}
+-			} ) );
+-		}
+-
+-		ret = this.pushStack( [] );
+-
+-		for ( i = 0; i < len; i++ ) {
+-			jQuery.find( selector, self[ i ], ret );
+-		}
+-
+-		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
+-	},
+-	filter: function( selector ) {
+-		return this.pushStack( winnow( this, selector || [], false ) );
+-	},
+-	not: function( selector ) {
+-		return this.pushStack( winnow( this, selector || [], true ) );
+-	},
+-	is: function( selector ) {
+-		return !!winnow(
+-			this,
+-
+-			// If this is a positional/relative selector, check membership in the returned set
+-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+-			typeof selector === "string" && rneedsContext.test( selector ) ?
+-				jQuery( selector ) :
+-				selector || [],
+-			false
+-		).length;
+-	}
+-} );
+-
+-
+-// Initialize a jQuery object
+-
+-
+-// A central reference to the root jQuery(document)
+-var rootjQuery,
+-
+-	// A simple way to check for HTML strings
+-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+-	// Strict HTML recognition (#11290: must start with <)
+-	// Shortcut simple #id case for speed
+-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
+-
+-	init = jQuery.fn.init = function( selector, context, root ) {
+-		var match, elem;
+-
+-		// HANDLE: $(""), $(null), $(undefined), $(false)
+-		if ( !selector ) {
+-			return this;
+-		}
+-
+-		// Method init() accepts an alternate rootjQuery
+-		// so migrate can support jQuery.sub (gh-2101)
+-		root = root || rootjQuery;
+-
+-		// Handle HTML strings
+-		if ( typeof selector === "string" ) {
+-			if ( selector[ 0 ] === "<" &&
+-				selector[ selector.length - 1 ] === ">" &&
+-				selector.length >= 3 ) {
+-
+-				// Assume that strings that start and end with <> are HTML and skip the regex check
+-				match = [ null, selector, null ];
+-
+-			} else {
+-				match = rquickExpr.exec( selector );
+-			}
+-
+-			// Match html or make sure no context is specified for #id
+-			if ( match && ( match[ 1 ] || !context ) ) {
+-
+-				// HANDLE: $(html) -> $(array)
+-				if ( match[ 1 ] ) {
+-					context = context instanceof jQuery ? context[ 0 ] : context;
+-
+-					// Option to run scripts is true for back-compat
+-					// Intentionally let the error be thrown if parseHTML is not present
+-					jQuery.merge( this, jQuery.parseHTML(
+-						match[ 1 ],
+-						context && context.nodeType ? context.ownerDocument || context : document,
+-						true
+-					) );
+-
+-					// HANDLE: $(html, props)
+-					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+-						for ( match in context ) {
+-
+-							// Properties of context are called as methods if possible
+-							if ( isFunction( this[ match ] ) ) {
+-								this[ match ]( context[ match ] );
+-
+-							// ...and otherwise set as attributes
+-							} else {
+-								this.attr( match, context[ match ] );
+-							}
+-						}
+-					}
+-
+-					return this;
+-
+-				// HANDLE: $(#id)
+-				} else {
+-					elem = document.getElementById( match[ 2 ] );
+-
+-					if ( elem ) {
+-
+-						// Inject the element directly into the jQuery object
+-						this[ 0 ] = elem;
+-						this.length = 1;
+-					}
+-					return this;
+-				}
+-
+-			// HANDLE: $(expr, $(...))
+-			} else if ( !context || context.jquery ) {
+-				return ( context || root ).find( selector );
+-
+-			// HANDLE: $(expr, context)
+-			// (which is just equivalent to: $(context).find(expr)
+-			} else {
+-				return this.constructor( context ).find( selector );
+-			}
+-
+-		// HANDLE: $(DOMElement)
+-		} else if ( selector.nodeType ) {
+-			this[ 0 ] = selector;
+-			this.length = 1;
+-			return this;
+-
+-		// HANDLE: $(function)
+-		// Shortcut for document ready
+-		} else if ( isFunction( selector ) ) {
+-			return root.ready !== undefined ?
+-				root.ready( selector ) :
+-
+-				// Execute immediately if ready is not present
+-				selector( jQuery );
+-		}
+-
+-		return jQuery.makeArray( selector, this );
+-	};
+-
+-// Give the init function the jQuery prototype for later instantiation
+-init.prototype = jQuery.fn;
+-
+-// Initialize central reference
+-rootjQuery = jQuery( document );
+-
+-
+-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+-
+-	// Methods guaranteed to produce a unique set when starting from a unique set
+-	guaranteedUnique = {
+-		children: true,
+-		contents: true,
+-		next: true,
+-		prev: true
+-	};
+-
+-jQuery.fn.extend( {
+-	has: function( target ) {
+-		var targets = jQuery( target, this ),
+-			l = targets.length;
+-
+-		return this.filter( function() {
+-			var i = 0;
+-			for ( ; i < l; i++ ) {
+-				if ( jQuery.contains( this, targets[ i ] ) ) {
+-					return true;
+-				}
+-			}
+-		} );
+-	},
+-
+-	closest: function( selectors, context ) {
+-		var cur,
+-			i = 0,
+-			l = this.length,
+-			matched = [],
+-			targets = typeof selectors !== "string" && jQuery( selectors );
+-
+-		// Positional selectors never match, since there's no _selection_ context
+-		if ( !rneedsContext.test( selectors ) ) {
+-			for ( ; i < l; i++ ) {
+-				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+-
+-					// Always skip document fragments
+-					if ( cur.nodeType < 11 && ( targets ?
+-						targets.index( cur ) > -1 :
+-
+-						// Don't pass non-elements to Sizzle
+-						cur.nodeType === 1 &&
+-							jQuery.find.matchesSelector( cur, selectors ) ) ) {
+-
+-						matched.push( cur );
+-						break;
+-					}
+-				}
+-			}
+-		}
+-
+-		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+-	},
+-
+-	// Determine the position of an element within the set
+-	index: function( elem ) {
+-
+-		// No argument, return index in parent
+-		if ( !elem ) {
+-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+-		}
+-
+-		// Index in selector
+-		if ( typeof elem === "string" ) {
+-			return indexOf.call( jQuery( elem ), this[ 0 ] );
+-		}
+-
+-		// Locate the position of the desired element
+-		return indexOf.call( this,
+-
+-			// If it receives a jQuery object, the first element is used
+-			elem.jquery ? elem[ 0 ] : elem
+-		);
+-	},
+-
+-	add: function( selector, context ) {
+-		return this.pushStack(
+-			jQuery.uniqueSort(
+-				jQuery.merge( this.get(), jQuery( selector, context ) )
+-			)
+-		);
+-	},
+-
+-	addBack: function( selector ) {
+-		return this.add( selector == null ?
+-			this.prevObject : this.prevObject.filter( selector )
+-		);
+-	}
+-} );
+-
+-function sibling( cur, dir ) {
+-	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
+-	return cur;
+-}
+-
+-jQuery.each( {
+-	parent: function( elem ) {
+-		var parent = elem.parentNode;
+-		return parent && parent.nodeType !== 11 ? parent : null;
+-	},
+-	parents: function( elem ) {
+-		return dir( elem, "parentNode" );
+-	},
+-	parentsUntil: function( elem, _i, until ) {
+-		return dir( elem, "parentNode", until );
+-	},
+-	next: function( elem ) {
+-		return sibling( elem, "nextSibling" );
+-	},
+-	prev: function( elem ) {
+-		return sibling( elem, "previousSibling" );
+-	},
+-	nextAll: function( elem ) {
+-		return dir( elem, "nextSibling" );
+-	},
+-	prevAll: function( elem ) {
+-		return dir( elem, "previousSibling" );
+-	},
+-	nextUntil: function( elem, _i, until ) {
+-		return dir( elem, "nextSibling", until );
+-	},
+-	prevUntil: function( elem, _i, until ) {
+-		return dir( elem, "previousSibling", until );
+-	},
+-	siblings: function( elem ) {
+-		return siblings( ( elem.parentNode || {} ).firstChild, elem );
+-	},
+-	children: function( elem ) {
+-		return siblings( elem.firstChild );
+-	},
+-	contents: function( elem ) {
+-		if ( elem.contentDocument != null &&
+-
+-			// Support: IE 11+
+-			// <object> elements with no `data` attribute has an object
+-			// `contentDocument` with a `null` prototype.
+-			getProto( elem.contentDocument ) ) {
+-
+-			return elem.contentDocument;
+-		}
+-
+-		// Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
+-		// Treat the template element as a regular one in browsers that
+-		// don't support it.
+-		if ( nodeName( elem, "template" ) ) {
+-			elem = elem.content || elem;
+-		}
+-
+-		return jQuery.merge( [], elem.childNodes );
+-	}
+-}, function( name, fn ) {
+-	jQuery.fn[ name ] = function( until, selector ) {
+-		var matched = jQuery.map( this, fn, until );
+-
+-		if ( name.slice( -5 ) !== "Until" ) {
+-			selector = until;
+-		}
+-
+-		if ( selector && typeof selector === "string" ) {
+-			matched = jQuery.filter( selector, matched );
+-		}
+-
+-		if ( this.length > 1 ) {
+-
+-			// Remove duplicates
+-			if ( !guaranteedUnique[ name ] ) {
+-				jQuery.uniqueSort( matched );
+-			}
+-
+-			// Reverse order for parents* and prev-derivatives
+-			if ( rparentsprev.test( name ) ) {
+-				matched.reverse();
+-			}
+-		}
+-
+-		return this.pushStack( matched );
+-	};
+-} );
+-var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
+-
+-
+-
+-// Convert String-formatted options into Object-formatted ones
+-function createOptions( options ) {
+-	var object = {};
+-	jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
+-		object[ flag ] = true;
+-	} );
+-	return object;
+-}
+-
+-/*
+- * Create a callback list using the following parameters:
+- *
+- *	options: an optional list of space-separated options that will change how
+- *			the callback list behaves or a more traditional option object
+- *
+- * By default a callback list will act like an event callback list and can be
+- * "fired" multiple times.
+- *
+- * Possible options:
+- *
+- *	once:			will ensure the callback list can only be fired once (like a Deferred)
+- *
+- *	memory:			will keep track of previous values and will call any callback added
+- *					after the list has been fired right away with the latest "memorized"
+- *					values (like a Deferred)
+- *
+- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+- *
+- *	stopOnFalse:	interrupt callings when a callback returns false
+- *
+- */
+-jQuery.Callbacks = function( options ) {
+-
+-	// Convert options from String-formatted to Object-formatted if needed
+-	// (we check in cache first)
+-	options = typeof options === "string" ?
+-		createOptions( options ) :
+-		jQuery.extend( {}, options );
+-
+-	var // Flag to know if list is currently firing
+-		firing,
+-
+-		// Last fire value for non-forgettable lists
+-		memory,
+-
+-		// Flag to know if list was already fired
+-		fired,
+-
+-		// Flag to prevent firing
+-		locked,
+-
+-		// Actual callback list
+-		list = [],
+-
+-		// Queue of execution data for repeatable lists
+-		queue = [],
+-
+-		// Index of currently firing callback (modified by add/remove as needed)
+-		firingIndex = -1,
+-
+-		// Fire callbacks
+-		fire = function() {
+-
+-			// Enforce single-firing
+-			locked = locked || options.once;
+-
+-			// Execute callbacks for all pending executions,
+-			// respecting firingIndex overrides and runtime changes
+-			fired = firing = true;
+-			for ( ; queue.length; firingIndex = -1 ) {
+-				memory = queue.shift();
+-				while ( ++firingIndex < list.length ) {
+-
+-					// Run callback and check for early termination
+-					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+-						options.stopOnFalse ) {
+-
+-						// Jump to end and forget the data so .add doesn't re-fire
+-						firingIndex = list.length;
+-						memory = false;
+-					}
+-				}
+-			}
+-
+-			// Forget the data if we're done with it
+-			if ( !options.memory ) {
+-				memory = false;
+-			}
+-
+-			firing = false;
+-
+-			// Clean up if we're done firing for good
+-			if ( locked ) {
+-
+-				// Keep an empty list if we have data for future add calls
+-				if ( memory ) {
+-					list = [];
+-
+-				// Otherwise, this object is spent
+-				} else {
+-					list = "";
+-				}
+-			}
+-		},
+-
+-		// Actual Callbacks object
+-		self = {
+-
+-			// Add a callback or a collection of callbacks to the list
+-			add: function() {
+-				if ( list ) {
+-
+-					// If we have memory from a past run, we should fire after adding
+-					if ( memory && !firing ) {
+-						firingIndex = list.length - 1;
+-						queue.push( memory );
+-					}
+-
+-					( function add( args ) {
+-						jQuery.each( args, function( _, arg ) {
+-							if ( isFunction( arg ) ) {
+-								if ( !options.unique || !self.has( arg ) ) {
+-									list.push( arg );
+-								}
+-							} else if ( arg && arg.length && toType( arg ) !== "string" ) {
+-
+-								// Inspect recursively
+-								add( arg );
+-							}
+-						} );
+-					} )( arguments );
+-
+-					if ( memory && !firing ) {
+-						fire();
+-					}
+-				}
+-				return this;
+-			},
+-
+-			// Remove a callback from the list
+-			remove: function() {
+-				jQuery.each( arguments, function( _, arg ) {
+-					var index;
+-					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+-						list.splice( index, 1 );
+-
+-						// Handle firing indexes
+-						if ( index <= firingIndex ) {
+-							firingIndex--;
+-						}
+-					}
+-				} );
+-				return this;
+-			},
+-
+-			// Check if a given callback is in the list.
+-			// If no argument is given, return whether or not list has callbacks attached.
+-			has: function( fn ) {
+-				return fn ?
+-					jQuery.inArray( fn, list ) > -1 :
+-					list.length > 0;
+-			},
+-
+-			// Remove all callbacks from the list
+-			empty: function() {
+-				if ( list ) {
+-					list = [];
+-				}
+-				return this;
+-			},
+-
+-			// Disable .fire and .add
+-			// Abort any current/pending executions
+-			// Clear all callbacks and values
+-			disable: function() {
+-				locked = queue = [];
+-				list = memory = "";
+-				return this;
+-			},
+-			disabled: function() {
+-				return !list;
+-			},
+-
+-			// Disable .fire
+-			// Also disable .add unless we have memory (since it would have no effect)
+-			// Abort any pending executions
+-			lock: function() {
+-				locked = queue = [];
+-				if ( !memory && !firing ) {
+-					list = memory = "";
+-				}
+-				return this;
+-			},
+-			locked: function() {
+-				return !!locked;
+-			},
+-
+-			// Call all callbacks with the given context and arguments
+-			fireWith: function( context, args ) {
+-				if ( !locked ) {
+-					args = args || [];
+-					args = [ context, args.slice ? args.slice() : args ];
+-					queue.push( args );
+-					if ( !firing ) {
+-						fire();
+-					}
+-				}
+-				return this;
+-			},
+-
+-			// Call all the callbacks with the given arguments
+-			fire: function() {
+-				self.fireWith( this, arguments );
+-				return this;
+-			},
+-
+-			// To know if the callbacks have already been called at least once
+-			fired: function() {
+-				return !!fired;
+-			}
+-		};
+-
+-	return self;
+-};
+-
+-
+-function Identity( v ) {
+-	return v;
+-}
+-function Thrower( ex ) {
+-	throw ex;
+-}
+-
+-function adoptValue( value, resolve, reject, noValue ) {
+-	var method;
+-
+-	try {
+-
+-		// Check for promise aspect first to privilege synchronous behavior
+-		if ( value && isFunction( ( method = value.promise ) ) ) {
+-			method.call( value ).done( resolve ).fail( reject );
+-
+-		// Other thenables
+-		} else if ( value && isFunction( ( method = value.then ) ) ) {
+-			method.call( value, resolve, reject );
+-
+-		// Other non-thenables
+-		} else {
+-
+-			// Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
+-			// * false: [ value ].slice( 0 ) => resolve( value )
+-			// * true: [ value ].slice( 1 ) => resolve()
+-			resolve.apply( undefined, [ value ].slice( noValue ) );
+-		}
+-
+-	// For Promises/A+, convert exceptions into rejections
+-	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
+-	// Deferred#then to conditionally suppress rejection.
+-	} catch ( value ) {
+-
+-		// Support: Android 4.0 only
+-		// Strict mode functions invoked without .call/.apply get global-object context
+-		reject.apply( undefined, [ value ] );
+-	}
+-}
+-
+-jQuery.extend( {
+-
+-	Deferred: function( func ) {
+-		var tuples = [
+-
+-				// action, add listener, callbacks,
+-				// ... .then handlers, argument index, [final state]
+-				[ "notify", "progress", jQuery.Callbacks( "memory" ),
+-					jQuery.Callbacks( "memory" ), 2 ],
+-				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
+-					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
+-				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
+-					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
+-			],
+-			state = "pending",
+-			promise = {
+-				state: function() {
+-					return state;
+-				},
+-				always: function() {
+-					deferred.done( arguments ).fail( arguments );
+-					return this;
+-				},
+-				"catch": function( fn ) {
+-					return promise.then( null, fn );
+-				},
+-
+-				// Keep pipe for back-compat
+-				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
+-					var fns = arguments;
+-
+-					return jQuery.Deferred( function( newDefer ) {
+-						jQuery.each( tuples, function( _i, tuple ) {
+-
+-							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
+-							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
+-
+-							// deferred.progress(function() { bind to newDefer or newDefer.notify })
+-							// deferred.done(function() { bind to newDefer or newDefer.resolve })
+-							// deferred.fail(function() { bind to newDefer or newDefer.reject })
+-							deferred[ tuple[ 1 ] ]( function() {
+-								var returned = fn && fn.apply( this, arguments );
+-								if ( returned && isFunction( returned.promise ) ) {
+-									returned.promise()
+-										.progress( newDefer.notify )
+-										.done( newDefer.resolve )
+-										.fail( newDefer.reject );
+-								} else {
+-									newDefer[ tuple[ 0 ] + "With" ](
+-										this,
+-										fn ? [ returned ] : arguments
+-									);
+-								}
+-							} );
+-						} );
+-						fns = null;
+-					} ).promise();
+-				},
+-				then: function( onFulfilled, onRejected, onProgress ) {
+-					var maxDepth = 0;
+-					function resolve( depth, deferred, handler, special ) {
+-						return function() {
+-							var that = this,
+-								args = arguments,
+-								mightThrow = function() {
+-									var returned, then;
+-
+-									// Support: Promises/A+ section 2.3.3.3.3
+-									// https://promisesaplus.com/#point-59
+-									// Ignore double-resolution attempts
+-									if ( depth < maxDepth ) {
+-										return;
+-									}
+-
+-									returned = handler.apply( that, args );
+-
+-									// Support: Promises/A+ section 2.3.1
+-									// https://promisesaplus.com/#point-48
+-									if ( returned === deferred.promise() ) {
+-										throw new TypeError( "Thenable self-resolution" );
+-									}
+-
+-									// Support: Promises/A+ sections 2.3.3.1, 3.5
+-									// https://promisesaplus.com/#point-54
+-									// https://promisesaplus.com/#point-75
+-									// Retrieve `then` only once
+-									then = returned &&
+-
+-										// Support: Promises/A+ section 2.3.4
+-										// https://promisesaplus.com/#point-64
+-										// Only check objects and functions for thenability
+-										( typeof returned === "object" ||
+-											typeof returned === "function" ) &&
+-										returned.then;
+-
+-									// Handle a returned thenable
+-									if ( isFunction( then ) ) {
+-
+-										// Special processors (notify) just wait for resolution
+-										if ( special ) {
+-											then.call(
+-												returned,
+-												resolve( maxDepth, deferred, Identity, special ),
+-												resolve( maxDepth, deferred, Thrower, special )
+-											);
+-
+-										// Normal processors (resolve) also hook into progress
+-										} else {
+-
+-											// ...and disregard older resolution values
+-											maxDepth++;
+-
+-											then.call(
+-												returned,
+-												resolve( maxDepth, deferred, Identity, special ),
+-												resolve( maxDepth, deferred, Thrower, special ),
+-												resolve( maxDepth, deferred, Identity,
+-													deferred.notifyWith )
+-											);
+-										}
+-
+-									// Handle all other returned values
+-									} else {
+-
+-										// Only substitute handlers pass on context
+-										// and multiple values (non-spec behavior)
+-										if ( handler !== Identity ) {
+-											that = undefined;
+-											args = [ returned ];
+-										}
+-
+-										// Process the value(s)
+-										// Default process is resolve
+-										( special || deferred.resolveWith )( that, args );
+-									}
+-								},
+-
+-								// Only normal processors (resolve) catch and reject exceptions
+-								process = special ?
+-									mightThrow :
+-									function() {
+-										try {
+-											mightThrow();
+-										} catch ( e ) {
+-
+-											if ( jQuery.Deferred.exceptionHook ) {
+-												jQuery.Deferred.exceptionHook( e,
+-													process.stackTrace );
+-											}
+-
+-											// Support: Promises/A+ section 2.3.3.3.4.1
+-											// https://promisesaplus.com/#point-61
+-											// Ignore post-resolution exceptions
+-											if ( depth + 1 >= maxDepth ) {
+-
+-												// Only substitute handlers pass on context
+-												// and multiple values (non-spec behavior)
+-												if ( handler !== Thrower ) {
+-													that = undefined;
+-													args = [ e ];
+-												}
+-
+-												deferred.rejectWith( that, args );
+-											}
+-										}
+-									};
+-
+-							// Support: Promises/A+ section 2.3.3.3.1
+-							// https://promisesaplus.com/#point-57
+-							// Re-resolve promises immediately to dodge false rejection from
+-							// subsequent errors
+-							if ( depth ) {
+-								process();
+-							} else {
+-
+-								// Call an optional hook to record the stack, in case of exception
+-								// since it's otherwise lost when execution goes async
+-								if ( jQuery.Deferred.getStackHook ) {
+-									process.stackTrace = jQuery.Deferred.getStackHook();
+-								}
+-								window.setTimeout( process );
+-							}
+-						};
+-					}
+-
+-					return jQuery.Deferred( function( newDefer ) {
+-
+-						// progress_handlers.add( ... )
+-						tuples[ 0 ][ 3 ].add(
+-							resolve(
+-								0,
+-								newDefer,
+-								isFunction( onProgress ) ?
+-									onProgress :
+-									Identity,
+-								newDefer.notifyWith
+-							)
+-						);
+-
+-						// fulfilled_handlers.add( ... )
+-						tuples[ 1 ][ 3 ].add(
+-							resolve(
+-								0,
+-								newDefer,
+-								isFunction( onFulfilled ) ?
+-									onFulfilled :
+-									Identity
+-							)
+-						);
+-
+-						// rejected_handlers.add( ... )
+-						tuples[ 2 ][ 3 ].add(
+-							resolve(
+-								0,
+-								newDefer,
+-								isFunction( onRejected ) ?
+-									onRejected :
+-									Thrower
+-							)
+-						);
+-					} ).promise();
+-				},
+-
+-				// Get a promise for this deferred
+-				// If obj is provided, the promise aspect is added to the object
+-				promise: function( obj ) {
+-					return obj != null ? jQuery.extend( obj, promise ) : promise;
+-				}
+-			},
+-			deferred = {};
+-
+-		// Add list-specific methods
+-		jQuery.each( tuples, function( i, tuple ) {
+-			var list = tuple[ 2 ],
+-				stateString = tuple[ 5 ];
+-
+-			// promise.progress = list.add
+-			// promise.done = list.add
+-			// promise.fail = list.add
+-			promise[ tuple[ 1 ] ] = list.add;
+-
+-			// Handle state
+-			if ( stateString ) {
+-				list.add(
+-					function() {
+-
+-						// state = "resolved" (i.e., fulfilled)
+-						// state = "rejected"
+-						state = stateString;
+-					},
+-
+-					// rejected_callbacks.disable
+-					// fulfilled_callbacks.disable
+-					tuples[ 3 - i ][ 2 ].disable,
+-
+-					// rejected_handlers.disable
+-					// fulfilled_handlers.disable
+-					tuples[ 3 - i ][ 3 ].disable,
+-
+-					// progress_callbacks.lock
+-					tuples[ 0 ][ 2 ].lock,
+-
+-					// progress_handlers.lock
+-					tuples[ 0 ][ 3 ].lock
+-				);
+-			}
+-
+-			// progress_handlers.fire
+-			// fulfilled_handlers.fire
+-			// rejected_handlers.fire
+-			list.add( tuple[ 3 ].fire );
+-
+-			// deferred.notify = function() { deferred.notifyWith(...) }
+-			// deferred.resolve = function() { deferred.resolveWith(...) }
+-			// deferred.reject = function() { deferred.rejectWith(...) }
+-			deferred[ tuple[ 0 ] ] = function() {
+-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
+-				return this;
+-			};
+-
+-			// deferred.notifyWith = list.fireWith
+-			// deferred.resolveWith = list.fireWith
+-			// deferred.rejectWith = list.fireWith
+-			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+-		} );
+-
+-		// Make the deferred a promise
+-		promise.promise( deferred );
+-
+-		// Call given func if any
+-		if ( func ) {
+-			func.call( deferred, deferred );
+-		}
+-
+-		// All done!
+-		return deferred;
+-	},
+-
+-	// Deferred helper
+-	when: function( singleValue ) {
+-		var
+-
+-			// count of uncompleted subordinates
+-			remaining = arguments.length,
+-
+-			// count of unprocessed arguments
+-			i = remaining,
+-
+-			// subordinate fulfillment data
+-			resolveContexts = Array( i ),
+-			resolveValues = slice.call( arguments ),
+-
+-			// the master Deferred
+-			master = jQuery.Deferred(),
+-
+-			// subordinate callback factory
+-			updateFunc = function( i ) {
+-				return function( value ) {
+-					resolveContexts[ i ] = this;
+-					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+-					if ( !( --remaining ) ) {
+-						master.resolveWith( resolveContexts, resolveValues );
+-					}
+-				};
+-			};
+-
+-		// Single- and empty arguments are adopted like Promise.resolve
+-		if ( remaining <= 1 ) {
+-			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+-				!remaining );
+-
+-			// Use .then() to unwrap secondary thenables (cf. gh-3000)
+-			if ( master.state() === "pending" ||
+-				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
+-
+-				return master.then();
+-			}
+-		}
+-
+-		// Multiple arguments are aggregated like Promise.all array elements
+-		while ( i-- ) {
+-			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+-		}
+-
+-		return master.promise();
+-	}
+-} );
+-
+-
+-// These usually indicate a programmer mistake during development,
+-// warn about them ASAP rather than swallowing them by default.
+-var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+-
+-jQuery.Deferred.exceptionHook = function( error, stack ) {
+-
+-	// Support: IE 8 - 9 only
+-	// Console exists when dev tools are open, which can happen at any time
+-	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
+-		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
+-	}
+-};
+-
+-
+-
+-
+-jQuery.readyException = function( error ) {
+-	window.setTimeout( function() {
+-		throw error;
+-	} );
+-};
+-
+-
+-
+-
+-// The deferred used on DOM ready
+-var readyList = jQuery.Deferred();
+-
+-jQuery.fn.ready = function( fn ) {
+-
+-	readyList
+-		.then( fn )
+-
+-		// Wrap jQuery.readyException in a function so that the lookup
+-		// happens at the time of error handling instead of callback
+-		// registration.
+-		.catch( function( error ) {
+-			jQuery.readyException( error );
+-		} );
+-
+-	return this;
+-};
+-
+-jQuery.extend( {
+-
+-	// Is the DOM ready to be used? Set to true once it occurs.
+-	isReady: false,
+-
+-	// A counter to track how many items to wait for before
+-	// the ready event fires. See #6781
+-	readyWait: 1,
+-
+-	// Handle when the DOM is ready
+-	ready: function( wait ) {
+-
+-		// Abort if there are pending holds or we're already ready
+-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+-			return;
+-		}
+-
+-		// Remember that the DOM is ready
+-		jQuery.isReady = true;
+-
+-		// If a normal DOM Ready event fired, decrement, and wait if need be
+-		if ( wait !== true && --jQuery.readyWait > 0 ) {
+-			return;
+-		}
+-
+-		// If there are functions bound, to execute
+-		readyList.resolveWith( document, [ jQuery ] );
+-	}
+-} );
+-
+-jQuery.ready.then = readyList.then;
+-
+-// The ready event handler and self cleanup method
+-function completed() {
+-	document.removeEventListener( "DOMContentLoaded", completed );
+-	window.removeEventListener( "load", completed );
+-	jQuery.ready();
+-}
+-
+-// Catch cases where $(document).ready() is called
+-// after the browser event has already occurred.
+-// Support: IE <=9 - 10 only
+-// Older IE sometimes signals "interactive" too soon
+-if ( document.readyState === "complete" ||
+-	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+-
+-	// Handle it asynchronously to allow scripts the opportunity to delay ready
+-	window.setTimeout( jQuery.ready );
+-
+-} else {
+-
+-	// Use the handy event callback
+-	document.addEventListener( "DOMContentLoaded", completed );
+-
+-	// A fallback to window.onload, that will always work
+-	window.addEventListener( "load", completed );
+-}
+-
+-
+-
+-
+-// Multifunctional method to get and set values of a collection
+-// The value/s can optionally be executed if it's a function
+-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+-	var i = 0,
+-		len = elems.length,
+-		bulk = key == null;
+-
+-	// Sets many values
+-	if ( toType( key ) === "object" ) {
+-		chainable = true;
+-		for ( i in key ) {
+-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+-		}
+-
+-	// Sets one value
+-	} else if ( value !== undefined ) {
+-		chainable = true;
+-
+-		if ( !isFunction( value ) ) {
+-			raw = true;
+-		}
+-
+-		if ( bulk ) {
+-
+-			// Bulk operations run against the entire set
+-			if ( raw ) {
+-				fn.call( elems, value );
+-				fn = null;
+-
+-			// ...except when executing function values
+-			} else {
+-				bulk = fn;
+-				fn = function( elem, _key, value ) {
+-					return bulk.call( jQuery( elem ), value );
+-				};
+-			}
+-		}
+-
+-		if ( fn ) {
+-			for ( ; i < len; i++ ) {
+-				fn(
+-					elems[ i ], key, raw ?
+-					value :
+-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
+-				);
+-			}
+-		}
+-	}
+-
+-	if ( chainable ) {
+-		return elems;
+-	}
+-
+-	// Gets
+-	if ( bulk ) {
+-		return fn.call( elems );
+-	}
+-
+-	return len ? fn( elems[ 0 ], key ) : emptyGet;
+-};
+-
+-
+-// Matches dashed string for camelizing
+-var rmsPrefix = /^-ms-/,
+-	rdashAlpha = /-([a-z])/g;
+-
+-// Used by camelCase as callback to replace()
+-function fcamelCase( _all, letter ) {
+-	return letter.toUpperCase();
+-}
+-
+-// Convert dashed to camelCase; used by the css and data modules
+-// Support: IE <=9 - 11, Edge 12 - 15
+-// Microsoft forgot to hump their vendor prefix (#9572)
+-function camelCase( string ) {
+-	return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+-}
+-var acceptData = function( owner ) {
+-
+-	// Accepts only:
+-	//  - Node
+-	//    - Node.ELEMENT_NODE
+-	//    - Node.DOCUMENT_NODE
+-	//  - Object
+-	//    - Any
+-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
+-};
+-
+-
+-
+-
+-function Data() {
+-	this.expando = jQuery.expando + Data.uid++;
+-}
+-
+-Data.uid = 1;
+-
+-Data.prototype = {
+-
+-	cache: function( owner ) {
+-
+-		// Check if the owner object already has a cache
+-		var value = owner[ this.expando ];
+-
+-		// If not, create one
+-		if ( !value ) {
+-			value = {};
+-
+-			// We can accept data for non-element nodes in modern browsers,
+-			// but we should not, see #8335.
+-			// Always return an empty object.
+-			if ( acceptData( owner ) ) {
+-
+-				// If it is a node unlikely to be stringify-ed or looped over
+-				// use plain assignment
+-				if ( owner.nodeType ) {
+-					owner[ this.expando ] = value;
+-
+-				// Otherwise secure it in a non-enumerable property
+-				// configurable must be true to allow the property to be
+-				// deleted when data is removed
+-				} else {
+-					Object.defineProperty( owner, this.expando, {
+-						value: value,
+-						configurable: true
+-					} );
+-				}
+-			}
+-		}
+-
+-		return value;
+-	},
+-	set: function( owner, data, value ) {
+-		var prop,
+-			cache = this.cache( owner );
+-
+-		// Handle: [ owner, key, value ] args
+-		// Always use camelCase key (gh-2257)
+-		if ( typeof data === "string" ) {
+-			cache[ camelCase( data ) ] = value;
+-
+-		// Handle: [ owner, { properties } ] args
+-		} else {
+-
+-			// Copy the properties one-by-one to the cache object
+-			for ( prop in data ) {
+-				cache[ camelCase( prop ) ] = data[ prop ];
+-			}
+-		}
+-		return cache;
+-	},
+-	get: function( owner, key ) {
+-		return key === undefined ?
+-			this.cache( owner ) :
+-
+-			// Always use camelCase key (gh-2257)
+-			owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ];
+-	},
+-	access: function( owner, key, value ) {
+-
+-		// In cases where either:
+-		//
+-		//   1. No key was specified
+-		//   2. A string key was specified, but no value provided
+-		//
+-		// Take the "read" path and allow the get method to determine
+-		// which value to return, respectively either:
+-		//
+-		//   1. The entire cache object
+-		//   2. The data stored at the key
+-		//
+-		if ( key === undefined ||
+-				( ( key && typeof key === "string" ) && value === undefined ) ) {
+-
+-			return this.get( owner, key );
+-		}
+-
+-		// When the key is not a string, or both a key and value
+-		// are specified, set or extend (existing objects) with either:
+-		//
+-		//   1. An object of properties
+-		//   2. A key and value
+-		//
+-		this.set( owner, key, value );
+-
+-		// Since the "set" path can have two possible entry points
+-		// return the expected data based on which path was taken[*]
+-		return value !== undefined ? value : key;
+-	},
+-	remove: function( owner, key ) {
+-		var i,
+-			cache = owner[ this.expando ];
+-
+-		if ( cache === undefined ) {
+-			return;
+-		}
+-
+-		if ( key !== undefined ) {
+-
+-			// Support array or space separated string of keys
+-			if ( Array.isArray( key ) ) {
+-
+-				// If key is an array of keys...
+-				// We always set camelCase keys, so remove that.
+-				key = key.map( camelCase );
+-			} else {
+-				key = camelCase( key );
+-
+-				// If a key with the spaces exists, use it.
+-				// Otherwise, create an array by matching non-whitespace
+-				key = key in cache ?
+-					[ key ] :
+-					( key.match( rnothtmlwhite ) || [] );
+-			}
+-
+-			i = key.length;
+-
+-			while ( i-- ) {
+-				delete cache[ key[ i ] ];
+-			}
+-		}
+-
+-		// Remove the expando if there's no more data
+-		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
+-
+-			// Support: Chrome <=35 - 45
+-			// Webkit & Blink performance suffers when deleting properties
+-			// from DOM nodes, so set to undefined instead
+-			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
+-			if ( owner.nodeType ) {
+-				owner[ this.expando ] = undefined;
+-			} else {
+-				delete owner[ this.expando ];
+-			}
+-		}
+-	},
+-	hasData: function( owner ) {
+-		var cache = owner[ this.expando ];
+-		return cache !== undefined && !jQuery.isEmptyObject( cache );
+-	}
+-};
+-var dataPriv = new Data();
+-
+-var dataUser = new Data();
+-
+-
+-
+-//	Implementation Summary
+-//
+-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
+-//	2. Improve the module's maintainability by reducing the storage
+-//		paths to a single mechanism.
+-//	3. Use the same single mechanism to support "private" and "user" data.
+-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
+-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
+-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
+-
+-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+-	rmultiDash = /[A-Z]/g;
+-
+-function getData( data ) {
+-	if ( data === "true" ) {
+-		return true;
+-	}
+-
+-	if ( data === "false" ) {
+-		return false;
+-	}
+-
+-	if ( data === "null" ) {
+-		return null;
+-	}
+-
+-	// Only convert to a number if it doesn't change the string
+-	if ( data === +data + "" ) {
+-		return +data;
+-	}
+-
+-	if ( rbrace.test( data ) ) {
+-		return JSON.parse( data );
+-	}
+-
+-	return data;
+-}
+-
+-function dataAttr( elem, key, data ) {
+-	var name;
+-
+-	// If nothing was found internally, try to fetch any
+-	// data from the HTML5 data-* attribute
+-	if ( data === undefined && elem.nodeType === 1 ) {
+-		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
+-		data = elem.getAttribute( name );
+-
+-		if ( typeof data === "string" ) {
+-			try {
+-				data = getData( data );
+-			} catch ( e ) {}
+-
+-			// Make sure we set the data so it isn't changed later
+-			dataUser.set( elem, key, data );
+-		} else {
+-			data = undefined;
+-		}
+-	}
+-	return data;
+-}
+-
+-jQuery.extend( {
+-	hasData: function( elem ) {
+-		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
+-	},
+-
+-	data: function( elem, name, data ) {
+-		return dataUser.access( elem, name, data );
+-	},
+-
+-	removeData: function( elem, name ) {
+-		dataUser.remove( elem, name );
+-	},
+-
+-	// TODO: Now that all calls to _data and _removeData have been replaced
+-	// with direct calls to dataPriv methods, these can be deprecated.
+-	_data: function( elem, name, data ) {
+-		return dataPriv.access( elem, name, data );
+-	},
+-
+-	_removeData: function( elem, name ) {
+-		dataPriv.remove( elem, name );
+-	}
+-} );
+-
+-jQuery.fn.extend( {
+-	data: function( key, value ) {
+-		var i, name, data,
+-			elem = this[ 0 ],
+-			attrs = elem && elem.attributes;
+-
+-		// Gets all values
+-		if ( key === undefined ) {
+-			if ( this.length ) {
+-				data = dataUser.get( elem );
+-
+-				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
+-					i = attrs.length;
+-					while ( i-- ) {
+-
+-						// Support: IE 11 only
+-						// The attrs elements can be null (#14894)
+-						if ( attrs[ i ] ) {
+-							name = attrs[ i ].name;
+-							if ( name.indexOf( "data-" ) === 0 ) {
+-								name = camelCase( name.slice( 5 ) );
+-								dataAttr( elem, name, data[ name ] );
+-							}
+-						}
+-					}
+-					dataPriv.set( elem, "hasDataAttrs", true );
+-				}
+-			}
+-
+-			return data;
+-		}
+-
+-		// Sets multiple values
+-		if ( typeof key === "object" ) {
+-			return this.each( function() {
+-				dataUser.set( this, key );
+-			} );
+-		}
+-
+-		return access( this, function( value ) {
+-			var data;
+-
+-			// The calling jQuery object (element matches) is not empty
+-			// (and therefore has an element appears at this[ 0 ]) and the
+-			// `value` parameter was not undefined. An empty jQuery object
+-			// will result in `undefined` for elem = this[ 0 ] which will
+-			// throw an exception if an attempt to read a data cache is made.
+-			if ( elem && value === undefined ) {
+-
+-				// Attempt to get data from the cache
+-				// The key will always be camelCased in Data
+-				data = dataUser.get( elem, key );
+-				if ( data !== undefined ) {
+-					return data;
+-				}
+-
+-				// Attempt to "discover" the data in
+-				// HTML5 custom data-* attrs
+-				data = dataAttr( elem, key );
+-				if ( data !== undefined ) {
+-					return data;
+-				}
+-
+-				// We tried really hard, but the data doesn't exist.
+-				return;
+-			}
+-
+-			// Set the data...
+-			this.each( function() {
+-
+-				// We always store the camelCased key
+-				dataUser.set( this, key, value );
+-			} );
+-		}, null, value, arguments.length > 1, null, true );
+-	},
+-
+-	removeData: function( key ) {
+-		return this.each( function() {
+-			dataUser.remove( this, key );
+-		} );
+-	}
+-} );
+-
+-
+-jQuery.extend( {
+-	queue: function( elem, type, data ) {
+-		var queue;
+-
+-		if ( elem ) {
+-			type = ( type || "fx" ) + "queue";
+-			queue = dataPriv.get( elem, type );
+-
+-			// Speed up dequeue by getting out quickly if this is just a lookup
+-			if ( data ) {
+-				if ( !queue || Array.isArray( data ) ) {
+-					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
+-				} else {
+-					queue.push( data );
+-				}
+-			}
+-			return queue || [];
+-		}
+-	},
+-
+-	dequeue: function( elem, type ) {
+-		type = type || "fx";
+-
+-		var queue = jQuery.queue( elem, type ),
+-			startLength = queue.length,
+-			fn = queue.shift(),
+-			hooks = jQuery._queueHooks( elem, type ),
+-			next = function() {
+-				jQuery.dequeue( elem, type );
+-			};
+-
+-		// If the fx queue is dequeued, always remove the progress sentinel
+-		if ( fn === "inprogress" ) {
+-			fn = queue.shift();
+-			startLength--;
+-		}
+-
+-		if ( fn ) {
+-
+-			// Add a progress sentinel to prevent the fx queue from being
+-			// automatically dequeued
+-			if ( type === "fx" ) {
+-				queue.unshift( "inprogress" );
+-			}
+-
+-			// Clear up the last queue stop function
+-			delete hooks.stop;
+-			fn.call( elem, next, hooks );
+-		}
+-
+-		if ( !startLength && hooks ) {
+-			hooks.empty.fire();
+-		}
+-	},
+-
+-	// Not public - generate a queueHooks object, or return the current one
+-	_queueHooks: function( elem, type ) {
+-		var key = type + "queueHooks";
+-		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
+-			empty: jQuery.Callbacks( "once memory" ).add( function() {
+-				dataPriv.remove( elem, [ type + "queue", key ] );
+-			} )
+-		} );
+-	}
+-} );
+-
+-jQuery.fn.extend( {
+-	queue: function( type, data ) {
+-		var setter = 2;
+-
+-		if ( typeof type !== "string" ) {
+-			data = type;
+-			type = "fx";
+-			setter--;
+-		}
+-
+-		if ( arguments.length < setter ) {
+-			return jQuery.queue( this[ 0 ], type );
+-		}
+-
+-		return data === undefined ?
+-			this :
+-			this.each( function() {
+-				var queue = jQuery.queue( this, type, data );
+-
+-				// Ensure a hooks for this queue
+-				jQuery._queueHooks( this, type );
+-
+-				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
+-					jQuery.dequeue( this, type );
+-				}
+-			} );
+-	},
+-	dequeue: function( type ) {
+-		return this.each( function() {
+-			jQuery.dequeue( this, type );
+-		} );
+-	},
+-	clearQueue: function( type ) {
+-		return this.queue( type || "fx", [] );
+-	},
+-
+-	// Get a promise resolved when queues of a certain type
+-	// are emptied (fx is the type by default)
+-	promise: function( type, obj ) {
+-		var tmp,
+-			count = 1,
+-			defer = jQuery.Deferred(),
+-			elements = this,
+-			i = this.length,
+-			resolve = function() {
+-				if ( !( --count ) ) {
+-					defer.resolveWith( elements, [ elements ] );
+-				}
+-			};
+-
+-		if ( typeof type !== "string" ) {
+-			obj = type;
+-			type = undefined;
+-		}
+-		type = type || "fx";
+-
+-		while ( i-- ) {
+-			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
+-			if ( tmp && tmp.empty ) {
+-				count++;
+-				tmp.empty.add( resolve );
+-			}
+-		}
+-		resolve();
+-		return defer.promise( obj );
+-	}
+-} );
+-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+-
+-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+-
+-
+-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+-
+-var documentElement = document.documentElement;
+-
+-
+-
+-	var isAttached = function( elem ) {
+-			return jQuery.contains( elem.ownerDocument, elem );
+-		},
+-		composed = { composed: true };
+-
+-	// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
+-	// Check attachment across shadow DOM boundaries when possible (gh-3504)
+-	// Support: iOS 10.0-10.2 only
+-	// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
+-	// leading to errors. We need to check for `getRootNode`.
+-	if ( documentElement.getRootNode ) {
+-		isAttached = function( elem ) {
+-			return jQuery.contains( elem.ownerDocument, elem ) ||
+-				elem.getRootNode( composed ) === elem.ownerDocument;
+-		};
+-	}
+-var isHiddenWithinTree = function( elem, el ) {
+-
+-		// isHiddenWithinTree might be called from jQuery#filter function;
+-		// in that case, element will be second argument
+-		elem = el || elem;
+-
+-		// Inline style trumps all
+-		return elem.style.display === "none" ||
+-			elem.style.display === "" &&
+-
+-			// Otherwise, check computed style
+-			// Support: Firefox <=43 - 45
+-			// Disconnected elements can have computed display: none, so first confirm that elem is
+-			// in the document.
+-			isAttached( elem ) &&
+-
+-			jQuery.css( elem, "display" ) === "none";
+-	};
+-
+-
+-
+-function adjustCSS( elem, prop, valueParts, tween ) {
+-	var adjusted, scale,
+-		maxIterations = 20,
+-		currentValue = tween ?
+-			function() {
+-				return tween.cur();
+-			} :
+-			function() {
+-				return jQuery.css( elem, prop, "" );
+-			},
+-		initial = currentValue(),
+-		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+-
+-		// Starting value computation is required for potential unit mismatches
+-		initialInUnit = elem.nodeType &&
+-			( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+-			rcssNum.exec( jQuery.css( elem, prop ) );
+-
+-	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+-
+-		// Support: Firefox <=54
+-		// Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144)
+-		initial = initial / 2;
+-
+-		// Trust units reported by jQuery.css
+-		unit = unit || initialInUnit[ 3 ];
+-
+-		// Iteratively approximate from a nonzero starting point
+-		initialInUnit = +initial || 1;
+-
+-		while ( maxIterations-- ) {
+-
+-			// Evaluate and update our best guess (doubling guesses that zero out).
+-			// Finish if the scale equals or crosses 1 (making the old*new product non-positive).
+-			jQuery.style( elem, prop, initialInUnit + unit );
+-			if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
+-				maxIterations = 0;
+-			}
+-			initialInUnit = initialInUnit / scale;
+-
+-		}
+-
+-		initialInUnit = initialInUnit * 2;
+-		jQuery.style( elem, prop, initialInUnit + unit );
+-
+-		// Make sure we update the tween properties later on
+-		valueParts = valueParts || [];
+-	}
+-
+-	if ( valueParts ) {
+-		initialInUnit = +initialInUnit || +initial || 0;
+-
+-		// Apply relative offset (+=/-=) if specified
+-		adjusted = valueParts[ 1 ] ?
+-			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+-			+valueParts[ 2 ];
+-		if ( tween ) {
+-			tween.unit = unit;
+-			tween.start = initialInUnit;
+-			tween.end = adjusted;
+-		}
+-	}
+-	return adjusted;
+-}
+-
+-
+-var defaultDisplayMap = {};
+-
+-function getDefaultDisplay( elem ) {
+-	var temp,
+-		doc = elem.ownerDocument,
+-		nodeName = elem.nodeName,
+-		display = defaultDisplayMap[ nodeName ];
+-
+-	if ( display ) {
+-		return display;
+-	}
+-
+-	temp = doc.body.appendChild( doc.createElement( nodeName ) );
+-	display = jQuery.css( temp, "display" );
+-
+-	temp.parentNode.removeChild( temp );
+-
+-	if ( display === "none" ) {
+-		display = "block";
+-	}
+-	defaultDisplayMap[ nodeName ] = display;
+-
+-	return display;
+-}
+-
+-function showHide( elements, show ) {
+-	var display, elem,
+-		values = [],
+-		index = 0,
+-		length = elements.length;
+-
+-	// Determine new display value for elements that need to change
+-	for ( ; index < length; index++ ) {
+-		elem = elements[ index ];
+-		if ( !elem.style ) {
+-			continue;
+-		}
+-
+-		display = elem.style.display;
+-		if ( show ) {
+-
+-			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
+-			// check is required in this first loop unless we have a nonempty display value (either
+-			// inline or about-to-be-restored)
+-			if ( display === "none" ) {
+-				values[ index ] = dataPriv.get( elem, "display" ) || null;
+-				if ( !values[ index ] ) {
+-					elem.style.display = "";
+-				}
+-			}
+-			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
+-				values[ index ] = getDefaultDisplay( elem );
+-			}
+-		} else {
+-			if ( display !== "none" ) {
+-				values[ index ] = "none";
+-
+-				// Remember what we're overwriting
+-				dataPriv.set( elem, "display", display );
+-			}
+-		}
+-	}
+-
+-	// Set the display of the elements in a second loop to avoid constant reflow
+-	for ( index = 0; index < length; index++ ) {
+-		if ( values[ index ] != null ) {
+-			elements[ index ].style.display = values[ index ];
+-		}
+-	}
+-
+-	return elements;
+-}
+-
+-jQuery.fn.extend( {
+-	show: function() {
+-		return showHide( this, true );
+-	},
+-	hide: function() {
+-		return showHide( this );
+-	},
+-	toggle: function( state ) {
+-		if ( typeof state === "boolean" ) {
+-			return state ? this.show() : this.hide();
+-		}
+-
+-		return this.each( function() {
+-			if ( isHiddenWithinTree( this ) ) {
+-				jQuery( this ).show();
+-			} else {
+-				jQuery( this ).hide();
+-			}
+-		} );
+-	}
+-} );
+-var rcheckableType = ( /^(?:checkbox|radio)$/i );
+-
+-var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i );
+-
+-var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
+-
+-
+-
+-( function() {
+-	var fragment = document.createDocumentFragment(),
+-		div = fragment.appendChild( document.createElement( "div" ) ),
+-		input = document.createElement( "input" );
+-
+-	// Support: Android 4.0 - 4.3 only
+-	// Check state lost if the name is set (#11217)
+-	// Support: Windows Web Apps (WWA)
+-	// `name` and `type` must use .setAttribute for WWA (#14901)
+-	input.setAttribute( "type", "radio" );
+-	input.setAttribute( "checked", "checked" );
+-	input.setAttribute( "name", "t" );
+-
+-	div.appendChild( input );
+-
+-	// Support: Android <=4.1 only
+-	// Older WebKit doesn't clone checked state correctly in fragments
+-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+-
+-	// Support: IE <=11 only
+-	// Make sure textarea (and checkbox) defaultValue is properly cloned
+-	div.innerHTML = "<textarea>x</textarea>";
+-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+-
+-	// Support: IE <=9 only
+-	// IE <=9 replaces <option> tags with their contents when inserted outside of
+-	// the select element.
+-	div.innerHTML = "<option></option>";
+-	support.option = !!div.lastChild;
+-} )();
+-
+-
+-// We have to close these tags to support XHTML (#13200)
+-var wrapMap = {
+-
+-	// XHTML parsers do not magically insert elements in the
+-	// same way that tag soup parsers do. So we cannot shorten
+-	// this by omitting <tbody> or other required elements.
+-	thead: [ 1, "<table>", "</table>" ],
+-	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
+-	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+-	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+-
+-	_default: [ 0, "", "" ]
+-};
+-
+-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+-wrapMap.th = wrapMap.td;
+-
+-// Support: IE <=9 only
+-if ( !support.option ) {
+-	wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
+-}
+-
+-
+-function getAll( context, tag ) {
+-
+-	// Support: IE <=9 - 11 only
+-	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
+-	var ret;
+-
+-	if ( typeof context.getElementsByTagName !== "undefined" ) {
+-		ret = context.getElementsByTagName( tag || "*" );
+-
+-	} else if ( typeof context.querySelectorAll !== "undefined" ) {
+-		ret = context.querySelectorAll( tag || "*" );
+-
+-	} else {
+-		ret = [];
+-	}
+-
+-	if ( tag === undefined || tag && nodeName( context, tag ) ) {
+-		return jQuery.merge( [ context ], ret );
+-	}
+-
+-	return ret;
+-}
+-
+-
+-// Mark scripts as having already been evaluated
+-function setGlobalEval( elems, refElements ) {
+-	var i = 0,
+-		l = elems.length;
+-
+-	for ( ; i < l; i++ ) {
+-		dataPriv.set(
+-			elems[ i ],
+-			"globalEval",
+-			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
+-		);
+-	}
+-}
+-
+-
+-var rhtml = /<|&#?\w+;/;
+-
+-function buildFragment( elems, context, scripts, selection, ignored ) {
+-	var elem, tmp, tag, wrap, attached, j,
+-		fragment = context.createDocumentFragment(),
+-		nodes = [],
+-		i = 0,
+-		l = elems.length;
+-
+-	for ( ; i < l; i++ ) {
+-		elem = elems[ i ];
+-
+-		if ( elem || elem === 0 ) {
+-
+-			// Add nodes directly
+-			if ( toType( elem ) === "object" ) {
+-
+-				// Support: Android <=4.0 only, PhantomJS 1 only
+-				// push.apply(_, arraylike) throws on ancient WebKit
+-				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+-
+-			// Convert non-html into a text node
+-			} else if ( !rhtml.test( elem ) ) {
+-				nodes.push( context.createTextNode( elem ) );
+-
+-			// Convert html into DOM nodes
+-			} else {
+-				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
+-
+-				// Deserialize a standard representation
+-				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+-				wrap = wrapMap[ tag ] || wrapMap._default;
+-				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+-
+-				// Descend through wrappers to the right content
+-				j = wrap[ 0 ];
+-				while ( j-- ) {
+-					tmp = tmp.lastChild;
+-				}
+-
+-				// Support: Android <=4.0 only, PhantomJS 1 only
+-				// push.apply(_, arraylike) throws on ancient WebKit
+-				jQuery.merge( nodes, tmp.childNodes );
+-
+-				// Remember the top-level container
+-				tmp = fragment.firstChild;
+-
+-				// Ensure the created nodes are orphaned (#12392)
+-				tmp.textContent = "";
+-			}
+-		}
+-	}
+-
+-	// Remove wrapper from fragment
+-	fragment.textContent = "";
+-
+-	i = 0;
+-	while ( ( elem = nodes[ i++ ] ) ) {
+-
+-		// Skip elements already in the context collection (trac-4087)
+-		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+-			if ( ignored ) {
+-				ignored.push( elem );
+-			}
+-			continue;
+-		}
+-
+-		attached = isAttached( elem );
+-
+-		// Append to fragment
+-		tmp = getAll( fragment.appendChild( elem ), "script" );
+-
+-		// Preserve script evaluation history
+-		if ( attached ) {
+-			setGlobalEval( tmp );
+-		}
+-
+-		// Capture executables
+-		if ( scripts ) {
+-			j = 0;
+-			while ( ( elem = tmp[ j++ ] ) ) {
+-				if ( rscriptType.test( elem.type || "" ) ) {
+-					scripts.push( elem );
+-				}
+-			}
+-		}
+-	}
+-
+-	return fragment;
+-}
+-
+-
+-var
+-	rkeyEvent = /^key/,
+-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+-
+-function returnTrue() {
+-	return true;
+-}
+-
+-function returnFalse() {
+-	return false;
+-}
+-
+-// Support: IE <=9 - 11+
+-// focus() and blur() are asynchronous, except when they are no-op.
+-// So expect focus to be synchronous when the element is already active,
+-// and blur to be synchronous when the element is not already active.
+-// (focus and blur are always synchronous in other supported browsers,
+-// this just defines when we can count on it).
+-function expectSync( elem, type ) {
+-	return ( elem === safeActiveElement() ) === ( type === "focus" );
+-}
+-
+-// Support: IE <=9 only
+-// Accessing document.activeElement can throw unexpectedly
+-// https://bugs.jquery.com/ticket/13393
+-function safeActiveElement() {
+-	try {
+-		return document.activeElement;
+-	} catch ( err ) { }
+-}
+-
+-function on( elem, types, selector, data, fn, one ) {
+-	var origFn, type;
+-
+-	// Types can be a map of types/handlers
+-	if ( typeof types === "object" ) {
+-
+-		// ( types-Object, selector, data )
+-		if ( typeof selector !== "string" ) {
+-
+-			// ( types-Object, data )
+-			data = data || selector;
+-			selector = undefined;
+-		}
+-		for ( type in types ) {
+-			on( elem, type, selector, data, types[ type ], one );
+-		}
+-		return elem;
+-	}
+-
+-	if ( data == null && fn == null ) {
+-
+-		// ( types, fn )
+-		fn = selector;
+-		data = selector = undefined;
+-	} else if ( fn == null ) {
+-		if ( typeof selector === "string" ) {
+-
+-			// ( types, selector, fn )
+-			fn = data;
+-			data = undefined;
+-		} else {
+-
+-			// ( types, data, fn )
+-			fn = data;
+-			data = selector;
+-			selector = undefined;
+-		}
+-	}
+-	if ( fn === false ) {
+-		fn = returnFalse;
+-	} else if ( !fn ) {
+-		return elem;
+-	}
+-
+-	if ( one === 1 ) {
+-		origFn = fn;
+-		fn = function( event ) {
+-
+-			// Can use an empty set, since event contains the info
+-			jQuery().off( event );
+-			return origFn.apply( this, arguments );
+-		};
+-
+-		// Use same guid so caller can remove using origFn
+-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+-	}
+-	return elem.each( function() {
+-		jQuery.event.add( this, types, fn, data, selector );
+-	} );
+-}
+-
+-/*
+- * Helper functions for managing events -- not part of the public interface.
+- * Props to Dean Edwards' addEvent library for many of the ideas.
+- */
+-jQuery.event = {
+-
+-	global: {},
+-
+-	add: function( elem, types, handler, data, selector ) {
+-
+-		var handleObjIn, eventHandle, tmp,
+-			events, t, handleObj,
+-			special, handlers, type, namespaces, origType,
+-			elemData = dataPriv.get( elem );
+-
+-		// Only attach events to objects that accept data
+-		if ( !acceptData( elem ) ) {
+-			return;
+-		}
+-
+-		// Caller can pass in an object of custom data in lieu of the handler
+-		if ( handler.handler ) {
+-			handleObjIn = handler;
+-			handler = handleObjIn.handler;
+-			selector = handleObjIn.selector;
+-		}
+-
+-		// Ensure that invalid selectors throw exceptions at attach time
+-		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
+-		if ( selector ) {
+-			jQuery.find.matchesSelector( documentElement, selector );
+-		}
+-
+-		// Make sure that the handler has a unique ID, used to find/remove it later
+-		if ( !handler.guid ) {
+-			handler.guid = jQuery.guid++;
+-		}
+-
+-		// Init the element's event structure and main handler, if this is the first
+-		if ( !( events = elemData.events ) ) {
+-			events = elemData.events = Object.create( null );
+-		}
+-		if ( !( eventHandle = elemData.handle ) ) {
+-			eventHandle = elemData.handle = function( e ) {
+-
+-				// Discard the second event of a jQuery.event.trigger() and
+-				// when an event is called after a page has unloaded
+-				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
+-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
+-			};
+-		}
+-
+-		// Handle multiple events separated by a space
+-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+-		t = types.length;
+-		while ( t-- ) {
+-			tmp = rtypenamespace.exec( types[ t ] ) || [];
+-			type = origType = tmp[ 1 ];
+-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+-
+-			// There *must* be a type, no attaching namespace-only handlers
+-			if ( !type ) {
+-				continue;
+-			}
+-
+-			// If event changes its type, use the special event handlers for the changed type
+-			special = jQuery.event.special[ type ] || {};
+-
+-			// If selector defined, determine special event api type, otherwise given type
+-			type = ( selector ? special.delegateType : special.bindType ) || type;
+-
+-			// Update special based on newly reset type
+-			special = jQuery.event.special[ type ] || {};
+-
+-			// handleObj is passed to all event handlers
+-			handleObj = jQuery.extend( {
+-				type: type,
+-				origType: origType,
+-				data: data,
+-				handler: handler,
+-				guid: handler.guid,
+-				selector: selector,
+-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+-				namespace: namespaces.join( "." )
+-			}, handleObjIn );
+-
+-			// Init the event handler queue if we're the first
+-			if ( !( handlers = events[ type ] ) ) {
+-				handlers = events[ type ] = [];
+-				handlers.delegateCount = 0;
+-
+-				// Only use addEventListener if the special events handler returns false
+-				if ( !special.setup ||
+-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+-
+-					if ( elem.addEventListener ) {
+-						elem.addEventListener( type, eventHandle );
+-					}
+-				}
+-			}
+-
+-			if ( special.add ) {
+-				special.add.call( elem, handleObj );
+-
+-				if ( !handleObj.handler.guid ) {
+-					handleObj.handler.guid = handler.guid;
+-				}
+-			}
+-
+-			// Add to the element's handler list, delegates in front
+-			if ( selector ) {
+-				handlers.splice( handlers.delegateCount++, 0, handleObj );
+-			} else {
+-				handlers.push( handleObj );
+-			}
+-
+-			// Keep track of which events have ever been used, for event optimization
+-			jQuery.event.global[ type ] = true;
+-		}
+-
+-	},
+-
+-	// Detach an event or set of events from an element
+-	remove: function( elem, types, handler, selector, mappedTypes ) {
+-
+-		var j, origCount, tmp,
+-			events, t, handleObj,
+-			special, handlers, type, namespaces, origType,
+-			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
+-
+-		if ( !elemData || !( events = elemData.events ) ) {
+-			return;
+-		}
+-
+-		// Once for each type.namespace in types; type may be omitted
+-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+-		t = types.length;
+-		while ( t-- ) {
+-			tmp = rtypenamespace.exec( types[ t ] ) || [];
+-			type = origType = tmp[ 1 ];
+-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+-
+-			// Unbind all events (on this namespace, if provided) for the element
+-			if ( !type ) {
+-				for ( type in events ) {
+-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+-				}
+-				continue;
+-			}
+-
+-			special = jQuery.event.special[ type ] || {};
+-			type = ( selector ? special.delegateType : special.bindType ) || type;
+-			handlers = events[ type ] || [];
+-			tmp = tmp[ 2 ] &&
+-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
+-
+-			// Remove matching events
+-			origCount = j = handlers.length;
+-			while ( j-- ) {
+-				handleObj = handlers[ j ];
+-
+-				if ( ( mappedTypes || origType === handleObj.origType ) &&
+-					( !handler || handler.guid === handleObj.guid ) &&
+-					( !tmp || tmp.test( handleObj.namespace ) ) &&
+-					( !selector || selector === handleObj.selector ||
+-						selector === "**" && handleObj.selector ) ) {
+-					handlers.splice( j, 1 );
+-
+-					if ( handleObj.selector ) {
+-						handlers.delegateCount--;
+-					}
+-					if ( special.remove ) {
+-						special.remove.call( elem, handleObj );
+-					}
+-				}
+-			}
+-
+-			// Remove generic event handler if we removed something and no more handlers exist
+-			// (avoids potential for endless recursion during removal of special event handlers)
+-			if ( origCount && !handlers.length ) {
+-				if ( !special.teardown ||
+-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+-
+-					jQuery.removeEvent( elem, type, elemData.handle );
+-				}
+-
+-				delete events[ type ];
+-			}
+-		}
+-
+-		// Remove data and the expando if it's no longer used
+-		if ( jQuery.isEmptyObject( events ) ) {
+-			dataPriv.remove( elem, "handle events" );
+-		}
+-	},
+-
+-	dispatch: function( nativeEvent ) {
+-
+-		var i, j, ret, matched, handleObj, handlerQueue,
+-			args = new Array( arguments.length ),
+-
+-			// Make a writable jQuery.Event from the native event object
+-			event = jQuery.event.fix( nativeEvent ),
+-
+-			handlers = (
+-					dataPriv.get( this, "events" ) || Object.create( null )
+-				)[ event.type ] || [],
+-			special = jQuery.event.special[ event.type ] || {};
+-
+-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+-		args[ 0 ] = event;
+-
+-		for ( i = 1; i < arguments.length; i++ ) {
+-			args[ i ] = arguments[ i ];
+-		}
+-
+-		event.delegateTarget = this;
+-
+-		// Call the preDispatch hook for the mapped type, and let it bail if desired
+-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+-			return;
+-		}
+-
+-		// Determine handlers
+-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+-
+-		// Run delegates first; they may want to stop propagation beneath us
+-		i = 0;
+-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+-			event.currentTarget = matched.elem;
+-
+-			j = 0;
+-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+-				!event.isImmediatePropagationStopped() ) {
+-
+-				// If the event is namespaced, then each handler is only invoked if it is
+-				// specially universal or its namespaces are a superset of the event's.
+-				if ( !event.rnamespace || handleObj.namespace === false ||
+-					event.rnamespace.test( handleObj.namespace ) ) {
+-
+-					event.handleObj = handleObj;
+-					event.data = handleObj.data;
+-
+-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+-						handleObj.handler ).apply( matched.elem, args );
+-
+-					if ( ret !== undefined ) {
+-						if ( ( event.result = ret ) === false ) {
+-							event.preventDefault();
+-							event.stopPropagation();
+-						}
+-					}
+-				}
+-			}
+-		}
+-
+-		// Call the postDispatch hook for the mapped type
+-		if ( special.postDispatch ) {
+-			special.postDispatch.call( this, event );
+-		}
+-
+-		return event.result;
+-	},
+-
+-	handlers: function( event, handlers ) {
+-		var i, handleObj, sel, matchedHandlers, matchedSelectors,
+-			handlerQueue = [],
+-			delegateCount = handlers.delegateCount,
+-			cur = event.target;
+-
+-		// Find delegate handlers
+-		if ( delegateCount &&
+-
+-			// Support: IE <=9
+-			// Black-hole SVG <use> instance trees (trac-13180)
+-			cur.nodeType &&
+-
+-			// Support: Firefox <=42
+-			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
+-			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+-			// Support: IE 11 only
+-			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
+-			!( event.type === "click" && event.button >= 1 ) ) {
+-
+-			for ( ; cur !== this; cur = cur.parentNode || this ) {
+-
+-				// Don't check non-elements (#13208)
+-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+-				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+-					matchedHandlers = [];
+-					matchedSelectors = {};
+-					for ( i = 0; i < delegateCount; i++ ) {
+-						handleObj = handlers[ i ];
+-
+-						// Don't conflict with Object.prototype properties (#13203)
+-						sel = handleObj.selector + " ";
+-
+-						if ( matchedSelectors[ sel ] === undefined ) {
+-							matchedSelectors[ sel ] = handleObj.needsContext ?
+-								jQuery( sel, this ).index( cur ) > -1 :
+-								jQuery.find( sel, this, null, [ cur ] ).length;
+-						}
+-						if ( matchedSelectors[ sel ] ) {
+-							matchedHandlers.push( handleObj );
+-						}
+-					}
+-					if ( matchedHandlers.length ) {
+-						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
+-					}
+-				}
+-			}
+-		}
+-
+-		// Add the remaining (directly-bound) handlers
+-		cur = this;
+-		if ( delegateCount < handlers.length ) {
+-			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
+-		}
+-
+-		return handlerQueue;
+-	},
+-
+-	addProp: function( name, hook ) {
+-		Object.defineProperty( jQuery.Event.prototype, name, {
+-			enumerable: true,
+-			configurable: true,
+-
+-			get: isFunction( hook ) ?
+-				function() {
+-					if ( this.originalEvent ) {
+-							return hook( this.originalEvent );
+-					}
+-				} :
+-				function() {
+-					if ( this.originalEvent ) {
+-							return this.originalEvent[ name ];
+-					}
+-				},
+-
+-			set: function( value ) {
+-				Object.defineProperty( this, name, {
+-					enumerable: true,
+-					configurable: true,
+-					writable: true,
+-					value: value
+-				} );
+-			}
+-		} );
+-	},
+-
+-	fix: function( originalEvent ) {
+-		return originalEvent[ jQuery.expando ] ?
+-			originalEvent :
+-			new jQuery.Event( originalEvent );
+-	},
+-
+-	special: {
+-		load: {
+-
+-			// Prevent triggered image.load events from bubbling to window.load
+-			noBubble: true
+-		},
+-		click: {
+-
+-			// Utilize native event to ensure correct state for checkable inputs
+-			setup: function( data ) {
+-
+-				// For mutual compressibility with _default, replace `this` access with a local var.
+-				// `|| data` is dead code meant only to preserve the variable through minification.
+-				var el = this || data;
+-
+-				// Claim the first handler
+-				if ( rcheckableType.test( el.type ) &&
+-					el.click && nodeName( el, "input" ) ) {
+-
+-					// dataPriv.set( el, "click", ... )
+-					leverageNative( el, "click", returnTrue );
+-				}
+-
+-				// Return false to allow normal processing in the caller
+-				return false;
+-			},
+-			trigger: function( data ) {
+-
+-				// For mutual compressibility with _default, replace `this` access with a local var.
+-				// `|| data` is dead code meant only to preserve the variable through minification.
+-				var el = this || data;
+-
+-				// Force setup before triggering a click
+-				if ( rcheckableType.test( el.type ) &&
+-					el.click && nodeName( el, "input" ) ) {
+-
+-					leverageNative( el, "click" );
+-				}
+-
+-				// Return non-false to allow normal event-path propagation
+-				return true;
+-			},
+-
+-			// For cross-browser consistency, suppress native .click() on links
+-			// Also prevent it if we're currently inside a leveraged native-event stack
+-			_default: function( event ) {
+-				var target = event.target;
+-				return rcheckableType.test( target.type ) &&
+-					target.click && nodeName( target, "input" ) &&
+-					dataPriv.get( target, "click" ) ||
+-					nodeName( target, "a" );
+-			}
+-		},
+-
+-		beforeunload: {
+-			postDispatch: function( event ) {
+-
+-				// Support: Firefox 20+
+-				// Firefox doesn't alert if the returnValue field is not set.
+-				if ( event.result !== undefined && event.originalEvent ) {
+-					event.originalEvent.returnValue = event.result;
+-				}
+-			}
+-		}
+-	}
+-};
+-
+-// Ensure the presence of an event listener that handles manually-triggered
+-// synthetic events by interrupting progress until reinvoked in response to
+-// *native* events that it fires directly, ensuring that state changes have
+-// already occurred before other listeners are invoked.
+-function leverageNative( el, type, expectSync ) {
+-
+-	// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
+-	if ( !expectSync ) {
+-		if ( dataPriv.get( el, type ) === undefined ) {
+-			jQuery.event.add( el, type, returnTrue );
+-		}
+-		return;
+-	}
+-
+-	// Register the controller as a special universal handler for all event namespaces
+-	dataPriv.set( el, type, false );
+-	jQuery.event.add( el, type, {
+-		namespace: false,
+-		handler: function( event ) {
+-			var notAsync, result,
+-				saved = dataPriv.get( this, type );
+-
+-			if ( ( event.isTrigger & 1 ) && this[ type ] ) {
+-
+-				// Interrupt processing of the outer synthetic .trigger()ed event
+-				// Saved data should be false in such cases, but might be a leftover capture object
+-				// from an async native handler (gh-4350)
+-				if ( !saved.length ) {
+-
+-					// Store arguments for use when handling the inner native event
+-					// There will always be at least one argument (an event object), so this array
+-					// will not be confused with a leftover capture object.
+-					saved = slice.call( arguments );
+-					dataPriv.set( this, type, saved );
+-
+-					// Trigger the native event and capture its result
+-					// Support: IE <=9 - 11+
+-					// focus() and blur() are asynchronous
+-					notAsync = expectSync( this, type );
+-					this[ type ]();
+-					result = dataPriv.get( this, type );
+-					if ( saved !== result || notAsync ) {
+-						dataPriv.set( this, type, false );
+-					} else {
+-						result = {};
+-					}
+-					if ( saved !== result ) {
+-
+-						// Cancel the outer synthetic event
+-						event.stopImmediatePropagation();
+-						event.preventDefault();
+-						return result.value;
+-					}
+-
+-				// If this is an inner synthetic event for an event with a bubbling surrogate
+-				// (focus or blur), assume that the surrogate already propagated from triggering the
+-				// native event and prevent that from happening again here.
+-				// This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the
+-				// bubbling surrogate propagates *after* the non-bubbling base), but that seems
+-				// less bad than duplication.
+-				} else if ( ( jQuery.event.special[ type ] || {} ).delegateType ) {
+-					event.stopPropagation();
+-				}
+-
+-			// If this is a native event triggered above, everything is now in order
+-			// Fire an inner synthetic event with the original arguments
+-			} else if ( saved.length ) {
+-
+-				// ...and capture the result
+-				dataPriv.set( this, type, {
+-					value: jQuery.event.trigger(
+-
+-						// Support: IE <=9 - 11+
+-						// Extend with the prototype to reset the above stopImmediatePropagation()
+-						jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
+-						saved.slice( 1 ),
+-						this
+-					)
+-				} );
+-
+-				// Abort handling of the native event
+-				event.stopImmediatePropagation();
+-			}
+-		}
+-	} );
+-}
+-
+-jQuery.removeEvent = function( elem, type, handle ) {
+-
+-	// This "if" is needed for plain objects
+-	if ( elem.removeEventListener ) {
+-		elem.removeEventListener( type, handle );
+-	}
+-};
+-
+-jQuery.Event = function( src, props ) {
+-
+-	// Allow instantiation without the 'new' keyword
+-	if ( !( this instanceof jQuery.Event ) ) {
+-		return new jQuery.Event( src, props );
+-	}
+-
+-	// Event object
+-	if ( src && src.type ) {
+-		this.originalEvent = src;
+-		this.type = src.type;
+-
+-		// Events bubbling up the document may have been marked as prevented
+-		// by a handler lower down the tree; reflect the correct value.
+-		this.isDefaultPrevented = src.defaultPrevented ||
+-				src.defaultPrevented === undefined &&
+-
+-				// Support: Android <=2.3 only
+-				src.returnValue === false ?
+-			returnTrue :
+-			returnFalse;
+-
+-		// Create target properties
+-		// Support: Safari <=6 - 7 only
+-		// Target should not be a text node (#504, #13143)
+-		this.target = ( src.target && src.target.nodeType === 3 ) ?
+-			src.target.parentNode :
+-			src.target;
+-
+-		this.currentTarget = src.currentTarget;
+-		this.relatedTarget = src.relatedTarget;
+-
+-	// Event type
+-	} else {
+-		this.type = src;
+-	}
+-
+-	// Put explicitly provided properties onto the event object
+-	if ( props ) {
+-		jQuery.extend( this, props );
+-	}
+-
+-	// Create a timestamp if incoming event doesn't have one
+-	this.timeStamp = src && src.timeStamp || Date.now();
+-
+-	// Mark it as fixed
+-	this[ jQuery.expando ] = true;
+-};
+-
+-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+-// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+-jQuery.Event.prototype = {
+-	constructor: jQuery.Event,
+-	isDefaultPrevented: returnFalse,
+-	isPropagationStopped: returnFalse,
+-	isImmediatePropagationStopped: returnFalse,
+-	isSimulated: false,
+-
+-	preventDefault: function() {
+-		var e = this.originalEvent;
+-
+-		this.isDefaultPrevented = returnTrue;
+-
+-		if ( e && !this.isSimulated ) {
+-			e.preventDefault();
+-		}
+-	},
+-	stopPropagation: function() {
+-		var e = this.originalEvent;
+-
+-		this.isPropagationStopped = returnTrue;
+-
+-		if ( e && !this.isSimulated ) {
+-			e.stopPropagation();
+-		}
+-	},
+-	stopImmediatePropagation: function() {
+-		var e = this.originalEvent;
+-
+-		this.isImmediatePropagationStopped = returnTrue;
+-
+-		if ( e && !this.isSimulated ) {
+-			e.stopImmediatePropagation();
+-		}
+-
+-		this.stopPropagation();
+-	}
+-};
+-
+-// Includes all common event props including KeyEvent and MouseEvent specific props
+-jQuery.each( {
+-	altKey: true,
+-	bubbles: true,
+-	cancelable: true,
+-	changedTouches: true,
+-	ctrlKey: true,
+-	detail: true,
+-	eventPhase: true,
+-	metaKey: true,
+-	pageX: true,
+-	pageY: true,
+-	shiftKey: true,
+-	view: true,
+-	"char": true,
+-	code: true,
+-	charCode: true,
+-	key: true,
+-	keyCode: true,
+-	button: true,
+-	buttons: true,
+-	clientX: true,
+-	clientY: true,
+-	offsetX: true,
+-	offsetY: true,
+-	pointerId: true,
+-	pointerType: true,
+-	screenX: true,
+-	screenY: true,
+-	targetTouches: true,
+-	toElement: true,
+-	touches: true,
+-
+-	which: function( event ) {
+-		var button = event.button;
+-
+-		// Add which for key events
+-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
+-			return event.charCode != null ? event.charCode : event.keyCode;
+-		}
+-
+-		// Add which for click: 1 === left; 2 === middle; 3 === right
+-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
+-			if ( button & 1 ) {
+-				return 1;
+-			}
+-
+-			if ( button & 2 ) {
+-				return 3;
+-			}
+-
+-			if ( button & 4 ) {
+-				return 2;
+-			}
+-
+-			return 0;
+-		}
+-
+-		return event.which;
+-	}
+-}, jQuery.event.addProp );
+-
+-jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
+-	jQuery.event.special[ type ] = {
+-
+-		// Utilize native event if possible so blur/focus sequence is correct
+-		setup: function() {
+-
+-			// Claim the first handler
+-			// dataPriv.set( this, "focus", ... )
+-			// dataPriv.set( this, "blur", ... )
+-			leverageNative( this, type, expectSync );
+-
+-			// Return false to allow normal processing in the caller
+-			return false;
+-		},
+-		trigger: function() {
+-
+-			// Force setup before trigger
+-			leverageNative( this, type );
+-
+-			// Return non-false to allow normal event-path propagation
+-			return true;
+-		},
+-
+-		delegateType: delegateType
+-	};
+-} );
+-
+-// Create mouseenter/leave events using mouseover/out and event-time checks
+-// so that event delegation works in jQuery.
+-// Do the same for pointerenter/pointerleave and pointerover/pointerout
+-//
+-// Support: Safari 7 only
+-// Safari sends mouseenter too often; see:
+-// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
+-// for the description of the bug (it existed in older Chrome versions as well).
+-jQuery.each( {
+-	mouseenter: "mouseover",
+-	mouseleave: "mouseout",
+-	pointerenter: "pointerover",
+-	pointerleave: "pointerout"
+-}, function( orig, fix ) {
+-	jQuery.event.special[ orig ] = {
+-		delegateType: fix,
+-		bindType: fix,
+-
+-		handle: function( event ) {
+-			var ret,
+-				target = this,
+-				related = event.relatedTarget,
+-				handleObj = event.handleObj;
+-
+-			// For mouseenter/leave call the handler if related is outside the target.
+-			// NB: No relatedTarget if the mouse left/entered the browser window
+-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+-				event.type = handleObj.origType;
+-				ret = handleObj.handler.apply( this, arguments );
+-				event.type = fix;
+-			}
+-			return ret;
+-		}
+-	};
+-} );
+-
+-jQuery.fn.extend( {
+-
+-	on: function( types, selector, data, fn ) {
+-		return on( this, types, selector, data, fn );
+-	},
+-	one: function( types, selector, data, fn ) {
+-		return on( this, types, selector, data, fn, 1 );
+-	},
+-	off: function( types, selector, fn ) {
+-		var handleObj, type;
+-		if ( types && types.preventDefault && types.handleObj ) {
+-
+-			// ( event )  dispatched jQuery.Event
+-			handleObj = types.handleObj;
+-			jQuery( types.delegateTarget ).off(
+-				handleObj.namespace ?
+-					handleObj.origType + "." + handleObj.namespace :
+-					handleObj.origType,
+-				handleObj.selector,
+-				handleObj.handler
+-			);
+-			return this;
+-		}
+-		if ( typeof types === "object" ) {
+-
+-			// ( types-object [, selector] )
+-			for ( type in types ) {
+-				this.off( type, selector, types[ type ] );
+-			}
+-			return this;
+-		}
+-		if ( selector === false || typeof selector === "function" ) {
+-
+-			// ( types [, fn] )
+-			fn = selector;
+-			selector = undefined;
+-		}
+-		if ( fn === false ) {
+-			fn = returnFalse;
+-		}
+-		return this.each( function() {
+-			jQuery.event.remove( this, types, fn, selector );
+-		} );
+-	}
+-} );
+-
+-
+-var
+-
+-	// Support: IE <=10 - 11, Edge 12 - 13 only
+-	// In IE/Edge using regex groups here causes severe slowdowns.
+-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+-	rnoInnerhtml = /<script|<style|<link/i,
+-
+-	// checked="checked" or checked
+-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+-
+-// Prefer a tbody over its parent table for containing new rows
+-function manipulationTarget( elem, content ) {
+-	if ( nodeName( elem, "table" ) &&
+-		nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
+-
+-		return jQuery( elem ).children( "tbody" )[ 0 ] || elem;
+-	}
+-
+-	return elem;
+-}
+-
+-// Replace/restore the type attribute of script elements for safe DOM manipulation
+-function disableScript( elem ) {
+-	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
+-	return elem;
+-}
+-function restoreScript( elem ) {
+-	if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) {
+-		elem.type = elem.type.slice( 5 );
+-	} else {
+-		elem.removeAttribute( "type" );
+-	}
+-
+-	return elem;
+-}
+-
+-function cloneCopyEvent( src, dest ) {
+-	var i, l, type, pdataOld, udataOld, udataCur, events;
+-
+-	if ( dest.nodeType !== 1 ) {
+-		return;
+-	}
+-
+-	// 1. Copy private data: events, handlers, etc.
+-	if ( dataPriv.hasData( src ) ) {
+-		pdataOld = dataPriv.get( src );
+-		events = pdataOld.events;
+-
+-		if ( events ) {
+-			dataPriv.remove( dest, "handle events" );
+-
+-			for ( type in events ) {
+-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+-					jQuery.event.add( dest, type, events[ type ][ i ] );
+-				}
+-			}
+-		}
+-	}
+-
+-	// 2. Copy user data
+-	if ( dataUser.hasData( src ) ) {
+-		udataOld = dataUser.access( src );
+-		udataCur = jQuery.extend( {}, udataOld );
+-
+-		dataUser.set( dest, udataCur );
+-	}
+-}
+-
+-// Fix IE bugs, see support tests
+-function fixInput( src, dest ) {
+-	var nodeName = dest.nodeName.toLowerCase();
+-
+-	// Fails to persist the checked state of a cloned checkbox or radio button.
+-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+-		dest.checked = src.checked;
+-
+-	// Fails to return the selected option to the default selected state when cloning options
+-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+-		dest.defaultValue = src.defaultValue;
+-	}
+-}
+-
+-function domManip( collection, args, callback, ignored ) {
+-
+-	// Flatten any nested arrays
+-	args = flat( args );
+-
+-	var fragment, first, scripts, hasScripts, node, doc,
+-		i = 0,
+-		l = collection.length,
+-		iNoClone = l - 1,
+-		value = args[ 0 ],
+-		valueIsFunction = isFunction( value );
+-
+-	// We can't cloneNode fragments that contain checked, in WebKit
+-	if ( valueIsFunction ||
+-			( l > 1 && typeof value === "string" &&
+-				!support.checkClone && rchecked.test( value ) ) ) {
+-		return collection.each( function( index ) {
+-			var self = collection.eq( index );
+-			if ( valueIsFunction ) {
+-				args[ 0 ] = value.call( this, index, self.html() );
+-			}
+-			domManip( self, args, callback, ignored );
+-		} );
+-	}
+-
+-	if ( l ) {
+-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+-		first = fragment.firstChild;
+-
+-		if ( fragment.childNodes.length === 1 ) {
+-			fragment = first;
+-		}
+-
+-		// Require either new content or an interest in ignored elements to invoke the callback
+-		if ( first || ignored ) {
+-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+-			hasScripts = scripts.length;
+-
+-			// Use the original fragment for the last item
+-			// instead of the first because it can end up
+-			// being emptied incorrectly in certain situations (#8070).
+-			for ( ; i < l; i++ ) {
+-				node = fragment;
+-
+-				if ( i !== iNoClone ) {
+-					node = jQuery.clone( node, true, true );
+-
+-					// Keep references to cloned scripts for later restoration
+-					if ( hasScripts ) {
+-
+-						// Support: Android <=4.0 only, PhantomJS 1 only
+-						// push.apply(_, arraylike) throws on ancient WebKit
+-						jQuery.merge( scripts, getAll( node, "script" ) );
+-					}
+-				}
+-
+-				callback.call( collection[ i ], node, i );
+-			}
+-
+-			if ( hasScripts ) {
+-				doc = scripts[ scripts.length - 1 ].ownerDocument;
+-
+-				// Reenable scripts
+-				jQuery.map( scripts, restoreScript );
+-
+-				// Evaluate executable scripts on first document insertion
+-				for ( i = 0; i < hasScripts; i++ ) {
+-					node = scripts[ i ];
+-					if ( rscriptType.test( node.type || "" ) &&
+-						!dataPriv.access( node, "globalEval" ) &&
+-						jQuery.contains( doc, node ) ) {
+-
+-						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
+-
+-							// Optional AJAX dependency, but won't run scripts if not present
+-							if ( jQuery._evalUrl && !node.noModule ) {
+-								jQuery._evalUrl( node.src, {
+-									nonce: node.nonce || node.getAttribute( "nonce" )
+-								}, doc );
+-							}
+-						} else {
+-							DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
+-						}
+-					}
+-				}
+-			}
+-		}
+-	}
+-
+-	return collection;
+-}
+-
+-function remove( elem, selector, keepData ) {
+-	var node,
+-		nodes = selector ? jQuery.filter( selector, elem ) : elem,
+-		i = 0;
+-
+-	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
+-		if ( !keepData && node.nodeType === 1 ) {
+-			jQuery.cleanData( getAll( node ) );
+-		}
+-
+-		if ( node.parentNode ) {
+-			if ( keepData && isAttached( node ) ) {
+-				setGlobalEval( getAll( node, "script" ) );
+-			}
+-			node.parentNode.removeChild( node );
+-		}
+-	}
+-
+-	return elem;
+-}
+-
+-jQuery.extend( {
+-	htmlPrefilter: function( html ) {
+-		return html;
+-	},
+-
+-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+-		var i, l, srcElements, destElements,
+-			clone = elem.cloneNode( true ),
+-			inPage = isAttached( elem );
+-
+-		// Fix IE cloning issues
+-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
+-				!jQuery.isXMLDoc( elem ) ) {
+-
+-			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
+-			destElements = getAll( clone );
+-			srcElements = getAll( elem );
+-
+-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
+-				fixInput( srcElements[ i ], destElements[ i ] );
+-			}
+-		}
+-
+-		// Copy the events from the original to the clone
+-		if ( dataAndEvents ) {
+-			if ( deepDataAndEvents ) {
+-				srcElements = srcElements || getAll( elem );
+-				destElements = destElements || getAll( clone );
+-
+-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
+-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
+-				}
+-			} else {
+-				cloneCopyEvent( elem, clone );
+-			}
+-		}
+-
+-		// Preserve script evaluation history
+-		destElements = getAll( clone, "script" );
+-		if ( destElements.length > 0 ) {
+-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+-		}
+-
+-		// Return the cloned set
+-		return clone;
+-	},
+-
+-	cleanData: function( elems ) {
+-		var data, elem, type,
+-			special = jQuery.event.special,
+-			i = 0;
+-
+-		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
+-			if ( acceptData( elem ) ) {
+-				if ( ( data = elem[ dataPriv.expando ] ) ) {
+-					if ( data.events ) {
+-						for ( type in data.events ) {
+-							if ( special[ type ] ) {
+-								jQuery.event.remove( elem, type );
+-
+-							// This is a shortcut to avoid jQuery.event.remove's overhead
+-							} else {
+-								jQuery.removeEvent( elem, type, data.handle );
+-							}
+-						}
+-					}
+-
+-					// Support: Chrome <=35 - 45+
+-					// Assign undefined instead of using delete, see Data#remove
+-					elem[ dataPriv.expando ] = undefined;
+-				}
+-				if ( elem[ dataUser.expando ] ) {
+-
+-					// Support: Chrome <=35 - 45+
+-					// Assign undefined instead of using delete, see Data#remove
+-					elem[ dataUser.expando ] = undefined;
+-				}
+-			}
+-		}
+-	}
+-} );
+-
+-jQuery.fn.extend( {
+-	detach: function( selector ) {
+-		return remove( this, selector, true );
+-	},
+-
+-	remove: function( selector ) {
+-		return remove( this, selector );
+-	},
+-
+-	text: function( value ) {
+-		return access( this, function( value ) {
+-			return value === undefined ?
+-				jQuery.text( this ) :
+-				this.empty().each( function() {
+-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+-						this.textContent = value;
+-					}
+-				} );
+-		}, null, value, arguments.length );
+-	},
+-
+-	append: function() {
+-		return domManip( this, arguments, function( elem ) {
+-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+-				var target = manipulationTarget( this, elem );
+-				target.appendChild( elem );
+-			}
+-		} );
+-	},
+-
+-	prepend: function() {
+-		return domManip( this, arguments, function( elem ) {
+-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+-				var target = manipulationTarget( this, elem );
+-				target.insertBefore( elem, target.firstChild );
+-			}
+-		} );
+-	},
+-
+-	before: function() {
+-		return domManip( this, arguments, function( elem ) {
+-			if ( this.parentNode ) {
+-				this.parentNode.insertBefore( elem, this );
+-			}
+-		} );
+-	},
+-
+-	after: function() {
+-		return domManip( this, arguments, function( elem ) {
+-			if ( this.parentNode ) {
+-				this.parentNode.insertBefore( elem, this.nextSibling );
+-			}
+-		} );
+-	},
+-
+-	empty: function() {
+-		var elem,
+-			i = 0;
+-
+-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+-			if ( elem.nodeType === 1 ) {
+-
+-				// Prevent memory leaks
+-				jQuery.cleanData( getAll( elem, false ) );
+-
+-				// Remove any remaining nodes
+-				elem.textContent = "";
+-			}
+-		}
+-
+-		return this;
+-	},
+-
+-	clone: function( dataAndEvents, deepDataAndEvents ) {
+-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+-
+-		return this.map( function() {
+-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+-		} );
+-	},
+-
+-	html: function( value ) {
+-		return access( this, function( value ) {
+-			var elem = this[ 0 ] || {},
+-				i = 0,
+-				l = this.length;
+-
+-			if ( value === undefined && elem.nodeType === 1 ) {
+-				return elem.innerHTML;
+-			}
+-
+-			// See if we can take a shortcut and just use innerHTML
+-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+-
+-				value = jQuery.htmlPrefilter( value );
+-
+-				try {
+-					for ( ; i < l; i++ ) {
+-						elem = this[ i ] || {};
+-
+-						// Remove element nodes and prevent memory leaks
+-						if ( elem.nodeType === 1 ) {
+-							jQuery.cleanData( getAll( elem, false ) );
+-							elem.innerHTML = value;
+-						}
+-					}
+-
+-					elem = 0;
+-
+-				// If using innerHTML throws an exception, use the fallback method
+-				} catch ( e ) {}
+-			}
+-
+-			if ( elem ) {
+-				this.empty().append( value );
+-			}
+-		}, null, value, arguments.length );
+-	},
+-
+-	replaceWith: function() {
+-		var ignored = [];
+-
+-		// Make the changes, replacing each non-ignored context element with the new content
+-		return domManip( this, arguments, function( elem ) {
+-			var parent = this.parentNode;
+-
+-			if ( jQuery.inArray( this, ignored ) < 0 ) {
+-				jQuery.cleanData( getAll( this ) );
+-				if ( parent ) {
+-					parent.replaceChild( elem, this );
+-				}
+-			}
+-
+-		// Force callback invocation
+-		}, ignored );
+-	}
+-} );
+-
+-jQuery.each( {
+-	appendTo: "append",
+-	prependTo: "prepend",
+-	insertBefore: "before",
+-	insertAfter: "after",
+-	replaceAll: "replaceWith"
+-}, function( name, original ) {
+-	jQuery.fn[ name ] = function( selector ) {
+-		var elems,
+-			ret = [],
+-			insert = jQuery( selector ),
+-			last = insert.length - 1,
+-			i = 0;
+-
+-		for ( ; i <= last; i++ ) {
+-			elems = i === last ? this : this.clone( true );
+-			jQuery( insert[ i ] )[ original ]( elems );
+-
+-			// Support: Android <=4.0 only, PhantomJS 1 only
+-			// .get() because push.apply(_, arraylike) throws on ancient WebKit
+-			push.apply( ret, elems.get() );
+-		}
+-
+-		return this.pushStack( ret );
+-	};
+-} );
+-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+-
+-var getStyles = function( elem ) {
+-
+-		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
+-		// IE throws on elements created in popups
+-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+-		var view = elem.ownerDocument.defaultView;
+-
+-		if ( !view || !view.opener ) {
+-			view = window;
+-		}
+-
+-		return view.getComputedStyle( elem );
+-	};
+-
+-var swap = function( elem, options, callback ) {
+-	var ret, name,
+-		old = {};
+-
+-	// Remember the old values, and insert the new ones
+-	for ( name in options ) {
+-		old[ name ] = elem.style[ name ];
+-		elem.style[ name ] = options[ name ];
+-	}
+-
+-	ret = callback.call( elem );
+-
+-	// Revert the old values
+-	for ( name in options ) {
+-		elem.style[ name ] = old[ name ];
+-	}
+-
+-	return ret;
+-};
+-
+-
+-var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
+-
+-
+-
+-( function() {
+-
+-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
+-	// so they're executed at the same time to save the second computation.
+-	function computeStyleTests() {
+-
+-		// This is a singleton, we need to execute it only once
+-		if ( !div ) {
+-			return;
+-		}
+-
+-		container.style.cssText = "position:absolute;left:-11111px;width:60px;" +
+-			"margin-top:1px;padding:0;border:0";
+-		div.style.cssText =
+-			"position:relative;display:block;box-sizing:border-box;overflow:scroll;" +
+-			"margin:auto;border:1px;padding:1px;" +
+-			"width:60%;top:1%";
+-		documentElement.appendChild( container ).appendChild( div );
+-
+-		var divStyle = window.getComputedStyle( div );
+-		pixelPositionVal = divStyle.top !== "1%";
+-
+-		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
+-		reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12;
+-
+-		// Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3
+-		// Some styles come back with percentage values, even though they shouldn't
+-		div.style.right = "60%";
+-		pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36;
+-
+-		// Support: IE 9 - 11 only
+-		// Detect misreporting of content dimensions for box-sizing:border-box elements
+-		boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36;
+-
+-		// Support: IE 9 only
+-		// Detect overflow:scroll screwiness (gh-3699)
+-		// Support: Chrome <=64
+-		// Don't get tricked when zoom affects offsetWidth (gh-4029)
+-		div.style.position = "absolute";
+-		scrollboxSizeVal = roundPixelMeasures( div.offsetWidth / 3 ) === 12;
+-
+-		documentElement.removeChild( container );
+-
+-		// Nullify the div so it wouldn't be stored in the memory and
+-		// it will also be a sign that checks already performed
+-		div = null;
+-	}
+-
+-	function roundPixelMeasures( measure ) {
+-		return Math.round( parseFloat( measure ) );
+-	}
+-
+-	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
+-		reliableTrDimensionsVal, reliableMarginLeftVal,
+-		container = document.createElement( "div" ),
+-		div = document.createElement( "div" );
+-
+-	// Finish early in limited (non-browser) environments
+-	if ( !div.style ) {
+-		return;
+-	}
+-
+-	// Support: IE <=9 - 11 only
+-	// Style of cloned element affects source element cloned (#8908)
+-	div.style.backgroundClip = "content-box";
+-	div.cloneNode( true ).style.backgroundClip = "";
+-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+-
+-	jQuery.extend( support, {
+-		boxSizingReliable: function() {
+-			computeStyleTests();
+-			return boxSizingReliableVal;
+-		},
+-		pixelBoxStyles: function() {
+-			computeStyleTests();
+-			return pixelBoxStylesVal;
+-		},
+-		pixelPosition: function() {
+-			computeStyleTests();
+-			return pixelPositionVal;
+-		},
+-		reliableMarginLeft: function() {
+-			computeStyleTests();
+-			return reliableMarginLeftVal;
+-		},
+-		scrollboxSize: function() {
+-			computeStyleTests();
+-			return scrollboxSizeVal;
+-		},
+-
+-		// Support: IE 9 - 11+, Edge 15 - 18+
+-		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+-		// set in CSS while `offset*` properties report correct values.
+-		// Behavior in IE 9 is more subtle than in newer versions & it passes
+-		// some versions of this test; make sure not to make it pass there!
+-		reliableTrDimensions: function() {
+-			var table, tr, trChild, trStyle;
+-			if ( reliableTrDimensionsVal == null ) {
+-				table = document.createElement( "table" );
+-				tr = document.createElement( "tr" );
+-				trChild = document.createElement( "div" );
+-
+-				table.style.cssText = "position:absolute;left:-11111px";
+-				tr.style.height = "1px";
+-				trChild.style.height = "9px";
+-
+-				documentElement
+-					.appendChild( table )
+-					.appendChild( tr )
+-					.appendChild( trChild );
+-
+-				trStyle = window.getComputedStyle( tr );
+-				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+-
+-				documentElement.removeChild( table );
+-			}
+-			return reliableTrDimensionsVal;
+-		}
+-	} );
+-} )();
+-
+-
+-function curCSS( elem, name, computed ) {
+-	var width, minWidth, maxWidth, ret,
+-
+-		// Support: Firefox 51+
+-		// Retrieving style before computed somehow
+-		// fixes an issue with getting wrong values
+-		// on detached elements
+-		style = elem.style;
+-
+-	computed = computed || getStyles( elem );
+-
+-	// getPropertyValue is needed for:
+-	//   .css('filter') (IE 9 only, #12537)
+-	//   .css('--customProperty) (#3144)
+-	if ( computed ) {
+-		ret = computed.getPropertyValue( name ) || computed[ name ];
+-
+-		if ( ret === "" && !isAttached( elem ) ) {
+-			ret = jQuery.style( elem, name );
+-		}
+-
+-		// A tribute to the "awesome hack by Dean Edwards"
+-		// Android Browser returns percentage for some values,
+-		// but width seems to be reliably pixels.
+-		// This is against the CSSOM draft spec:
+-		// https://drafts.csswg.org/cssom/#resolved-values
+-		if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) {
+-
+-			// Remember the original values
+-			width = style.width;
+-			minWidth = style.minWidth;
+-			maxWidth = style.maxWidth;
+-
+-			// Put in the new values to get a computed value out
+-			style.minWidth = style.maxWidth = style.width = ret;
+-			ret = computed.width;
+-
+-			// Revert the changed values
+-			style.width = width;
+-			style.minWidth = minWidth;
+-			style.maxWidth = maxWidth;
+-		}
+-	}
+-
+-	return ret !== undefined ?
+-
+-		// Support: IE <=9 - 11 only
+-		// IE returns zIndex value as an integer.
+-		ret + "" :
+-		ret;
+-}
+-
+-
+-function addGetHookIf( conditionFn, hookFn ) {
+-
+-	// Define the hook, we'll check on the first run if it's really needed.
+-	return {
+-		get: function() {
+-			if ( conditionFn() ) {
+-
+-				// Hook not needed (or it's not possible to use it due
+-				// to missing dependency), remove it.
+-				delete this.get;
+-				return;
+-			}
+-
+-			// Hook needed; redefine it so that the support test is not executed again.
+-			return ( this.get = hookFn ).apply( this, arguments );
+-		}
+-	};
+-}
+-
+-
+-var cssPrefixes = [ "Webkit", "Moz", "ms" ],
+-	emptyStyle = document.createElement( "div" ).style,
+-	vendorProps = {};
+-
+-// Return a vendor-prefixed property or undefined
+-function vendorPropName( name ) {
+-
+-	// Check for vendor prefixed names
+-	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
+-		i = cssPrefixes.length;
+-
+-	while ( i-- ) {
+-		name = cssPrefixes[ i ] + capName;
+-		if ( name in emptyStyle ) {
+-			return name;
+-		}
+-	}
+-}
+-
+-// Return a potentially-mapped jQuery.cssProps or vendor prefixed property
+-function finalPropName( name ) {
+-	var final = jQuery.cssProps[ name ] || vendorProps[ name ];
+-
+-	if ( final ) {
+-		return final;
+-	}
+-	if ( name in emptyStyle ) {
+-		return name;
+-	}
+-	return vendorProps[ name ] = vendorPropName( name ) || name;
+-}
+-
+-
+-var
+-
+-	// Swappable if display is none or starts with table
+-	// except "table", "table-cell", or "table-caption"
+-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+-	rcustomProp = /^--/,
+-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+-	cssNormalTransform = {
+-		letterSpacing: "0",
+-		fontWeight: "400"
+-	};
+-
+-function setPositiveNumber( _elem, value, subtract ) {
+-
+-	// Any relative (+/-) values have already been
+-	// normalized at this point
+-	var matches = rcssNum.exec( value );
+-	return matches ?
+-
+-		// Guard against undefined "subtract", e.g., when used as in cssHooks
+-		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
+-		value;
+-}
+-
+-function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) {
+-	var i = dimension === "width" ? 1 : 0,
+-		extra = 0,
+-		delta = 0;
+-
+-	// Adjustment may not be necessary
+-	if ( box === ( isBorderBox ? "border" : "content" ) ) {
+-		return 0;
+-	}
+-
+-	for ( ; i < 4; i += 2 ) {
+-
+-		// Both box models exclude margin
+-		if ( box === "margin" ) {
+-			delta += jQuery.css( elem, box + cssExpand[ i ], true, styles );
+-		}
+-
+-		// If we get here with a content-box, we're seeking "padding" or "border" or "margin"
+-		if ( !isBorderBox ) {
+-
+-			// Add padding
+-			delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+-
+-			// For "border" or "margin", add border
+-			if ( box !== "padding" ) {
+-				delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+-
+-			// But still keep track of it otherwise
+-			} else {
+-				extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+-			}
+-
+-		// If we get here with a border-box (content + padding + border), we're seeking "content" or
+-		// "padding" or "margin"
+-		} else {
+-
+-			// For "content", subtract padding
+-			if ( box === "content" ) {
+-				delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+-			}
+-
+-			// For "content" or "padding", subtract border
+-			if ( box !== "margin" ) {
+-				delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+-			}
+-		}
+-	}
+-
+-	// Account for positive content-box scroll gutter when requested by providing computedVal
+-	if ( !isBorderBox && computedVal >= 0 ) {
+-
+-		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
+-		// Assuming integer scroll gutter, subtract the rest and round down
+-		delta += Math.max( 0, Math.ceil(
+-			elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+-			computedVal -
+-			delta -
+-			extra -
+-			0.5
+-
+-		// If offsetWidth/offsetHeight is unknown, then we can't determine content-box scroll gutter
+-		// Use an explicit zero to avoid NaN (gh-3964)
+-		) ) || 0;
+-	}
+-
+-	return delta;
+-}
+-
+-function getWidthOrHeight( elem, dimension, extra ) {
+-
+-	// Start with computed style
+-	var styles = getStyles( elem ),
+-
+-		// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322).
+-		// Fake content-box until we know it's needed to know the true value.
+-		boxSizingNeeded = !support.boxSizingReliable() || extra,
+-		isBorderBox = boxSizingNeeded &&
+-			jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+-		valueIsBorderBox = isBorderBox,
+-
+-		val = curCSS( elem, dimension, styles ),
+-		offsetProp = "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 );
+-
+-	// Support: Firefox <=54
+-	// Return a confounding non-pixel value or feign ignorance, as appropriate.
+-	if ( rnumnonpx.test( val ) ) {
+-		if ( !extra ) {
+-			return val;
+-		}
+-		val = "auto";
+-	}
+-
+-
+-	// Support: IE 9 - 11 only
+-	// Use offsetWidth/offsetHeight for when box sizing is unreliable.
+-	// In those cases, the computed value can be trusted to be border-box.
+-	if ( ( !support.boxSizingReliable() && isBorderBox ||
+-
+-		// Support: IE 10 - 11+, Edge 15 - 18+
+-		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+-		// set in CSS while `offset*` properties report correct values.
+-		// Interestingly, in some cases IE 9 doesn't suffer from this issue.
+-		!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
+-
+-		// Fall back to offsetWidth/offsetHeight when value is "auto"
+-		// This happens for inline elements with no explicit setting (gh-3571)
+-		val === "auto" ||
+-
+-		// Support: Android <=4.1 - 4.3 only
+-		// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
+-		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
+-
+-		// Make sure the element is visible & connected
+-		elem.getClientRects().length ) {
+-
+-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+-
+-		// Where available, offsetWidth/offsetHeight approximate border box dimensions.
+-		// Where not available (e.g., SVG), assume unreliable box-sizing and interpret the
+-		// retrieved value as a content box dimension.
+-		valueIsBorderBox = offsetProp in elem;
+-		if ( valueIsBorderBox ) {
+-			val = elem[ offsetProp ];
+-		}
+-	}
+-
+-	// Normalize "" and auto
+-	val = parseFloat( val ) || 0;
+-
+-	// Adjust for the element's box model
+-	return ( val +
+-		boxModelAdjustment(
+-			elem,
+-			dimension,
+-			extra || ( isBorderBox ? "border" : "content" ),
+-			valueIsBorderBox,
+-			styles,
+-
+-			// Provide the current computed size to request scroll gutter calculation (gh-3589)
+-			val
+-		)
+-	) + "px";
+-}
+-
+-jQuery.extend( {
+-
+-	// Add in style property hooks for overriding the default
+-	// behavior of getting and setting a style property
+-	cssHooks: {
+-		opacity: {
+-			get: function( elem, computed ) {
+-				if ( computed ) {
+-
+-					// We should always get a number back from opacity
+-					var ret = curCSS( elem, "opacity" );
+-					return ret === "" ? "1" : ret;
+-				}
+-			}
+-		}
+-	},
+-
+-	// Don't automatically add "px" to these possibly-unitless properties
+-	cssNumber: {
+-		"animationIterationCount": true,
+-		"columnCount": true,
+-		"fillOpacity": true,
+-		"flexGrow": true,
+-		"flexShrink": true,
+-		"fontWeight": true,
+-		"gridArea": true,
+-		"gridColumn": true,
+-		"gridColumnEnd": true,
+-		"gridColumnStart": true,
+-		"gridRow": true,
+-		"gridRowEnd": true,
+-		"gridRowStart": true,
+-		"lineHeight": true,
+-		"opacity": true,
+-		"order": true,
+-		"orphans": true,
+-		"widows": true,
+-		"zIndex": true,
+-		"zoom": true
+-	},
+-
+-	// Add in properties whose names you wish to fix before
+-	// setting or getting the value
+-	cssProps: {},
+-
+-	// Get and set the style property on a DOM Node
+-	style: function( elem, name, value, extra ) {
+-
+-		// Don't set styles on text and comment nodes
+-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+-			return;
+-		}
+-
+-		// Make sure that we're working with the right name
+-		var ret, type, hooks,
+-			origName = camelCase( name ),
+-			isCustomProp = rcustomProp.test( name ),
+-			style = elem.style;
+-
+-		// Make sure that we're working with the right name. We don't
+-		// want to query the value if it is a CSS custom property
+-		// since they are user-defined.
+-		if ( !isCustomProp ) {
+-			name = finalPropName( origName );
+-		}
+-
+-		// Gets hook for the prefixed version, then unprefixed version
+-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+-
+-		// Check if we're setting a value
+-		if ( value !== undefined ) {
+-			type = typeof value;
+-
+-			// Convert "+=" or "-=" to relative numbers (#7345)
+-			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+-				value = adjustCSS( elem, name, ret );
+-
+-				// Fixes bug #9237
+-				type = "number";
+-			}
+-
+-			// Make sure that null and NaN values aren't set (#7116)
+-			if ( value == null || value !== value ) {
+-				return;
+-			}
+-
+-			// If a number was passed in, add the unit (except for certain CSS properties)
+-			// The isCustomProp check can be removed in jQuery 4.0 when we only auto-append
+-			// "px" to a few hardcoded values.
+-			if ( type === "number" && !isCustomProp ) {
+-				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+-			}
+-
+-			// background-* props affect original clone's values
+-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+-				style[ name ] = "inherit";
+-			}
+-
+-			// If a hook was provided, use that value, otherwise just set the specified value
+-			if ( !hooks || !( "set" in hooks ) ||
+-				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+-
+-				if ( isCustomProp ) {
+-					style.setProperty( name, value );
+-				} else {
+-					style[ name ] = value;
+-				}
+-			}
+-
+-		} else {
+-
+-			// If a hook was provided get the non-computed value from there
+-			if ( hooks && "get" in hooks &&
+-				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+-
+-				return ret;
+-			}
+-
+-			// Otherwise just get the value from the style object
+-			return style[ name ];
+-		}
+-	},
+-
+-	css: function( elem, name, extra, styles ) {
+-		var val, num, hooks,
+-			origName = camelCase( name ),
+-			isCustomProp = rcustomProp.test( name );
+-
+-		// Make sure that we're working with the right name. We don't
+-		// want to modify the value if it is a CSS custom property
+-		// since they are user-defined.
+-		if ( !isCustomProp ) {
+-			name = finalPropName( origName );
+-		}
+-
+-		// Try prefixed name followed by the unprefixed name
+-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+-
+-		// If a hook was provided get the computed value from there
+-		if ( hooks && "get" in hooks ) {
+-			val = hooks.get( elem, true, extra );
+-		}
+-
+-		// Otherwise, if a way to get the computed value exists, use that
+-		if ( val === undefined ) {
+-			val = curCSS( elem, name, styles );
+-		}
+-
+-		// Convert "normal" to computed value
+-		if ( val === "normal" && name in cssNormalTransform ) {
+-			val = cssNormalTransform[ name ];
+-		}
+-
+-		// Make numeric if forced or a qualifier was provided and val looks numeric
+-		if ( extra === "" || extra ) {
+-			num = parseFloat( val );
+-			return extra === true || isFinite( num ) ? num || 0 : val;
+-		}
+-
+-		return val;
+-	}
+-} );
+-
+-jQuery.each( [ "height", "width" ], function( _i, dimension ) {
+-	jQuery.cssHooks[ dimension ] = {
+-		get: function( elem, computed, extra ) {
+-			if ( computed ) {
+-
+-				// Certain elements can have dimension info if we invisibly show them
+-				// but it must have a current display style that would benefit
+-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+-
+-					// Support: Safari 8+
+-					// Table columns in Safari have non-zero offsetWidth & zero
+-					// getBoundingClientRect().width unless display is changed.
+-					// Support: IE <=11 only
+-					// Running getBoundingClientRect on a disconnected node
+-					// in IE throws an error.
+-					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
+-						swap( elem, cssShow, function() {
+-							return getWidthOrHeight( elem, dimension, extra );
+-						} ) :
+-						getWidthOrHeight( elem, dimension, extra );
+-			}
+-		},
+-
+-		set: function( elem, value, extra ) {
+-			var matches,
+-				styles = getStyles( elem ),
+-
+-				// Only read styles.position if the test has a chance to fail
+-				// to avoid forcing a reflow.
+-				scrollboxSizeBuggy = !support.scrollboxSize() &&
+-					styles.position === "absolute",
+-
+-				// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-3991)
+-				boxSizingNeeded = scrollboxSizeBuggy || extra,
+-				isBorderBox = boxSizingNeeded &&
+-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+-				subtract = extra ?
+-					boxModelAdjustment(
+-						elem,
+-						dimension,
+-						extra,
+-						isBorderBox,
+-						styles
+-					) :
+-					0;
+-
+-			// Account for unreliable border-box dimensions by comparing offset* to computed and
+-			// faking a content-box to get border and padding (gh-3699)
+-			if ( isBorderBox && scrollboxSizeBuggy ) {
+-				subtract -= Math.ceil(
+-					elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+-					parseFloat( styles[ dimension ] ) -
+-					boxModelAdjustment( elem, dimension, "border", false, styles ) -
+-					0.5
+-				);
+-			}
+-
+-			// Convert to pixels if value adjustment is needed
+-			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
+-				( matches[ 3 ] || "px" ) !== "px" ) {
+-
+-				elem.style[ dimension ] = value;
+-				value = jQuery.css( elem, dimension );
+-			}
+-
+-			return setPositiveNumber( elem, value, subtract );
+-		}
+-	};
+-} );
+-
+-jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+-	function( elem, computed ) {
+-		if ( computed ) {
+-			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
+-				elem.getBoundingClientRect().left -
+-					swap( elem, { marginLeft: 0 }, function() {
+-						return elem.getBoundingClientRect().left;
+-					} )
+-				) + "px";
+-		}
+-	}
+-);
+-
+-// These hooks are used by animate to expand properties
+-jQuery.each( {
+-	margin: "",
+-	padding: "",
+-	border: "Width"
+-}, function( prefix, suffix ) {
+-	jQuery.cssHooks[ prefix + suffix ] = {
+-		expand: function( value ) {
+-			var i = 0,
+-				expanded = {},
+-
+-				// Assumes a single number if not a string
+-				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+-
+-			for ( ; i < 4; i++ ) {
+-				expanded[ prefix + cssExpand[ i ] + suffix ] =
+-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+-			}
+-
+-			return expanded;
+-		}
+-	};
+-
+-	if ( prefix !== "margin" ) {
+-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+-	}
+-} );
+-
+-jQuery.fn.extend( {
+-	css: function( name, value ) {
+-		return access( this, function( elem, name, value ) {
+-			var styles, len,
+-				map = {},
+-				i = 0;
+-
+-			if ( Array.isArray( name ) ) {
+-				styles = getStyles( elem );
+-				len = name.length;
+-
+-				for ( ; i < len; i++ ) {
+-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+-				}
+-
+-				return map;
+-			}
+-
+-			return value !== undefined ?
+-				jQuery.style( elem, name, value ) :
+-				jQuery.css( elem, name );
+-		}, name, value, arguments.length > 1 );
+-	}
+-} );
+-
+-
+-function Tween( elem, options, prop, end, easing ) {
+-	return new Tween.prototype.init( elem, options, prop, end, easing );
+-}
+-jQuery.Tween = Tween;
+-
+-Tween.prototype = {
+-	constructor: Tween,
+-	init: function( elem, options, prop, end, easing, unit ) {
+-		this.elem = elem;
+-		this.prop = prop;
+-		this.easing = easing || jQuery.easing._default;
+-		this.options = options;
+-		this.start = this.now = this.cur();
+-		this.end = end;
+-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+-	},
+-	cur: function() {
+-		var hooks = Tween.propHooks[ this.prop ];
+-
+-		return hooks && hooks.get ?
+-			hooks.get( this ) :
+-			Tween.propHooks._default.get( this );
+-	},
+-	run: function( percent ) {
+-		var eased,
+-			hooks = Tween.propHooks[ this.prop ];
+-
+-		if ( this.options.duration ) {
+-			this.pos = eased = jQuery.easing[ this.easing ](
+-				percent, this.options.duration * percent, 0, 1, this.options.duration
+-			);
+-		} else {
+-			this.pos = eased = percent;
+-		}
+-		this.now = ( this.end - this.start ) * eased + this.start;
+-
+-		if ( this.options.step ) {
+-			this.options.step.call( this.elem, this.now, this );
+-		}
+-
+-		if ( hooks && hooks.set ) {
+-			hooks.set( this );
+-		} else {
+-			Tween.propHooks._default.set( this );
+-		}
+-		return this;
+-	}
+-};
+-
+-Tween.prototype.init.prototype = Tween.prototype;
+-
+-Tween.propHooks = {
+-	_default: {
+-		get: function( tween ) {
+-			var result;
+-
+-			// Use a property on the element directly when it is not a DOM element,
+-			// or when there is no matching style property that exists.
+-			if ( tween.elem.nodeType !== 1 ||
+-				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+-				return tween.elem[ tween.prop ];
+-			}
+-
+-			// Passing an empty string as a 3rd parameter to .css will automatically
+-			// attempt a parseFloat and fallback to a string if the parse fails.
+-			// Simple values such as "10px" are parsed to Float;
+-			// complex values such as "rotate(1rad)" are returned as-is.
+-			result = jQuery.css( tween.elem, tween.prop, "" );
+-
+-			// Empty strings, null, undefined and "auto" are converted to 0.
+-			return !result || result === "auto" ? 0 : result;
+-		},
+-		set: function( tween ) {
+-
+-			// Use step hook for back compat.
+-			// Use cssHook if its there.
+-			// Use .style if available and use plain properties where available.
+-			if ( jQuery.fx.step[ tween.prop ] ) {
+-				jQuery.fx.step[ tween.prop ]( tween );
+-			} else if ( tween.elem.nodeType === 1 && (
+-					jQuery.cssHooks[ tween.prop ] ||
+-					tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
+-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+-			} else {
+-				tween.elem[ tween.prop ] = tween.now;
+-			}
+-		}
+-	}
+-};
+-
+-// Support: IE <=9 only
+-// Panic based approach to setting things on disconnected nodes
+-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+-	set: function( tween ) {
+-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+-			tween.elem[ tween.prop ] = tween.now;
+-		}
+-	}
+-};
+-
+-jQuery.easing = {
+-	linear: function( p ) {
+-		return p;
+-	},
+-	swing: function( p ) {
+-		return 0.5 - Math.cos( p * Math.PI ) / 2;
+-	},
+-	_default: "swing"
+-};
+-
+-jQuery.fx = Tween.prototype.init;
+-
+-// Back compat <1.8 extension point
+-jQuery.fx.step = {};
+-
+-
+-
+-
+-var
+-	fxNow, inProgress,
+-	rfxtypes = /^(?:toggle|show|hide)$/,
+-	rrun = /queueHooks$/;
+-
+-function schedule() {
+-	if ( inProgress ) {
+-		if ( document.hidden === false && window.requestAnimationFrame ) {
+-			window.requestAnimationFrame( schedule );
+-		} else {
+-			window.setTimeout( schedule, jQuery.fx.interval );
+-		}
+-
+-		jQuery.fx.tick();
+-	}
+-}
+-
+-// Animations created synchronously will run synchronously
+-function createFxNow() {
+-	window.setTimeout( function() {
+-		fxNow = undefined;
+-	} );
+-	return ( fxNow = Date.now() );
+-}
+-
+-// Generate parameters to create a standard animation
+-function genFx( type, includeWidth ) {
+-	var which,
+-		i = 0,
+-		attrs = { height: type };
+-
+-	// If we include width, step value is 1 to do all cssExpand values,
+-	// otherwise step value is 2 to skip over Left and Right
+-	includeWidth = includeWidth ? 1 : 0;
+-	for ( ; i < 4; i += 2 - includeWidth ) {
+-		which = cssExpand[ i ];
+-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+-	}
+-
+-	if ( includeWidth ) {
+-		attrs.opacity = attrs.width = type;
+-	}
+-
+-	return attrs;
+-}
+-
+-function createTween( value, prop, animation ) {
+-	var tween,
+-		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+-		index = 0,
+-		length = collection.length;
+-	for ( ; index < length; index++ ) {
+-		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+-
+-			// We're done with this property
+-			return tween;
+-		}
+-	}
+-}
+-
+-function defaultPrefilter( elem, props, opts ) {
+-	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
+-		isBox = "width" in props || "height" in props,
+-		anim = this,
+-		orig = {},
+-		style = elem.style,
+-		hidden = elem.nodeType && isHiddenWithinTree( elem ),
+-		dataShow = dataPriv.get( elem, "fxshow" );
+-
+-	// Queue-skipping animations hijack the fx hooks
+-	if ( !opts.queue ) {
+-		hooks = jQuery._queueHooks( elem, "fx" );
+-		if ( hooks.unqueued == null ) {
+-			hooks.unqueued = 0;
+-			oldfire = hooks.empty.fire;
+-			hooks.empty.fire = function() {
+-				if ( !hooks.unqueued ) {
+-					oldfire();
+-				}
+-			};
+-		}
+-		hooks.unqueued++;
+-
+-		anim.always( function() {
+-
+-			// Ensure the complete handler is called before this completes
+-			anim.always( function() {
+-				hooks.unqueued--;
+-				if ( !jQuery.queue( elem, "fx" ).length ) {
+-					hooks.empty.fire();
+-				}
+-			} );
+-		} );
+-	}
+-
+-	// Detect show/hide animations
+-	for ( prop in props ) {
+-		value = props[ prop ];
+-		if ( rfxtypes.test( value ) ) {
+-			delete props[ prop ];
+-			toggle = toggle || value === "toggle";
+-			if ( value === ( hidden ? "hide" : "show" ) ) {
+-
+-				// Pretend to be hidden if this is a "show" and
+-				// there is still data from a stopped show/hide
+-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+-					hidden = true;
+-
+-				// Ignore all other no-op show/hide data
+-				} else {
+-					continue;
+-				}
+-			}
+-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+-		}
+-	}
+-
+-	// Bail out if this is a no-op like .hide().hide()
+-	propTween = !jQuery.isEmptyObject( props );
+-	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
+-		return;
+-	}
+-
+-	// Restrict "overflow" and "display" styles during box animations
+-	if ( isBox && elem.nodeType === 1 ) {
+-
+-		// Support: IE <=9 - 11, Edge 12 - 15
+-		// Record all 3 overflow attributes because IE does not infer the shorthand
+-		// from identically-valued overflowX and overflowY and Edge just mirrors
+-		// the overflowX value there.
+-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+-
+-		// Identify a display type, preferring old show/hide data over the CSS cascade
+-		restoreDisplay = dataShow && dataShow.display;
+-		if ( restoreDisplay == null ) {
+-			restoreDisplay = dataPriv.get( elem, "display" );
+-		}
+-		display = jQuery.css( elem, "display" );
+-		if ( display === "none" ) {
+-			if ( restoreDisplay ) {
+-				display = restoreDisplay;
+-			} else {
+-
+-				// Get nonempty value(s) by temporarily forcing visibility
+-				showHide( [ elem ], true );
+-				restoreDisplay = elem.style.display || restoreDisplay;
+-				display = jQuery.css( elem, "display" );
+-				showHide( [ elem ] );
+-			}
+-		}
+-
+-		// Animate inline elements as inline-block
+-		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
+-			if ( jQuery.css( elem, "float" ) === "none" ) {
+-
+-				// Restore the original display value at the end of pure show/hide animations
+-				if ( !propTween ) {
+-					anim.done( function() {
+-						style.display = restoreDisplay;
+-					} );
+-					if ( restoreDisplay == null ) {
+-						display = style.display;
+-						restoreDisplay = display === "none" ? "" : display;
+-					}
+-				}
+-				style.display = "inline-block";
+-			}
+-		}
+-	}
+-
+-	if ( opts.overflow ) {
+-		style.overflow = "hidden";
+-		anim.always( function() {
+-			style.overflow = opts.overflow[ 0 ];
+-			style.overflowX = opts.overflow[ 1 ];
+-			style.overflowY = opts.overflow[ 2 ];
+-		} );
+-	}
+-
+-	// Implement show/hide animations
+-	propTween = false;
+-	for ( prop in orig ) {
+-
+-		// General show/hide setup for this element animation
+-		if ( !propTween ) {
+-			if ( dataShow ) {
+-				if ( "hidden" in dataShow ) {
+-					hidden = dataShow.hidden;
+-				}
+-			} else {
+-				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
+-			}
+-
+-			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
+-			if ( toggle ) {
+-				dataShow.hidden = !hidden;
+-			}
+-
+-			// Show elements before animating them
+-			if ( hidden ) {
+-				showHide( [ elem ], true );
+-			}
+-
+-			/* eslint-disable no-loop-func */
+-
+-			anim.done( function() {
+-
+-			/* eslint-enable no-loop-func */
+-
+-				// The final step of a "hide" animation is actually hiding the element
+-				if ( !hidden ) {
+-					showHide( [ elem ] );
+-				}
+-				dataPriv.remove( elem, "fxshow" );
+-				for ( prop in orig ) {
+-					jQuery.style( elem, prop, orig[ prop ] );
+-				}
+-			} );
+-		}
+-
+-		// Per-property setup
+-		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+-		if ( !( prop in dataShow ) ) {
+-			dataShow[ prop ] = propTween.start;
+-			if ( hidden ) {
+-				propTween.end = propTween.start;
+-				propTween.start = 0;
+-			}
+-		}
+-	}
+-}
+-
+-function propFilter( props, specialEasing ) {
+-	var index, name, easing, value, hooks;
+-
+-	// camelCase, specialEasing and expand cssHook pass
+-	for ( index in props ) {
+-		name = camelCase( index );
+-		easing = specialEasing[ name ];
+-		value = props[ index ];
+-		if ( Array.isArray( value ) ) {
+-			easing = value[ 1 ];
+-			value = props[ index ] = value[ 0 ];
+-		}
+-
+-		if ( index !== name ) {
+-			props[ name ] = value;
+-			delete props[ index ];
+-		}
+-
+-		hooks = jQuery.cssHooks[ name ];
+-		if ( hooks && "expand" in hooks ) {
+-			value = hooks.expand( value );
+-			delete props[ name ];
+-
+-			// Not quite $.extend, this won't overwrite existing keys.
+-			// Reusing 'index' because we have the correct "name"
+-			for ( index in value ) {
+-				if ( !( index in props ) ) {
+-					props[ index ] = value[ index ];
+-					specialEasing[ index ] = easing;
+-				}
+-			}
+-		} else {
+-			specialEasing[ name ] = easing;
+-		}
+-	}
+-}
+-
+-function Animation( elem, properties, options ) {
+-	var result,
+-		stopped,
+-		index = 0,
+-		length = Animation.prefilters.length,
+-		deferred = jQuery.Deferred().always( function() {
+-
+-			// Don't match elem in the :animated selector
+-			delete tick.elem;
+-		} ),
+-		tick = function() {
+-			if ( stopped ) {
+-				return false;
+-			}
+-			var currentTime = fxNow || createFxNow(),
+-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+-
+-				// Support: Android 2.3 only
+-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+-				temp = remaining / animation.duration || 0,
+-				percent = 1 - temp,
+-				index = 0,
+-				length = animation.tweens.length;
+-
+-			for ( ; index < length; index++ ) {
+-				animation.tweens[ index ].run( percent );
+-			}
+-
+-			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+-
+-			// If there's more to do, yield
+-			if ( percent < 1 && length ) {
+-				return remaining;
+-			}
+-
+-			// If this was an empty animation, synthesize a final progress notification
+-			if ( !length ) {
+-				deferred.notifyWith( elem, [ animation, 1, 0 ] );
+-			}
+-
+-			// Resolve the animation and report its conclusion
+-			deferred.resolveWith( elem, [ animation ] );
+-			return false;
+-		},
+-		animation = deferred.promise( {
+-			elem: elem,
+-			props: jQuery.extend( {}, properties ),
+-			opts: jQuery.extend( true, {
+-				specialEasing: {},
+-				easing: jQuery.easing._default
+-			}, options ),
+-			originalProperties: properties,
+-			originalOptions: options,
+-			startTime: fxNow || createFxNow(),
+-			duration: options.duration,
+-			tweens: [],
+-			createTween: function( prop, end ) {
+-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+-				animation.tweens.push( tween );
+-				return tween;
+-			},
+-			stop: function( gotoEnd ) {
+-				var index = 0,
+-
+-					// If we are going to the end, we want to run all the tweens
+-					// otherwise we skip this part
+-					length = gotoEnd ? animation.tweens.length : 0;
+-				if ( stopped ) {
+-					return this;
+-				}
+-				stopped = true;
+-				for ( ; index < length; index++ ) {
+-					animation.tweens[ index ].run( 1 );
+-				}
+-
+-				// Resolve when we played the last frame; otherwise, reject
+-				if ( gotoEnd ) {
+-					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+-				} else {
+-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+-				}
+-				return this;
+-			}
+-		} ),
+-		props = animation.props;
+-
+-	propFilter( props, animation.opts.specialEasing );
+-
+-	for ( ; index < length; index++ ) {
+-		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+-		if ( result ) {
+-			if ( isFunction( result.stop ) ) {
+-				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+-					result.stop.bind( result );
+-			}
+-			return result;
+-		}
+-	}
+-
+-	jQuery.map( props, createTween, animation );
+-
+-	if ( isFunction( animation.opts.start ) ) {
+-		animation.opts.start.call( elem, animation );
+-	}
+-
+-	// Attach callbacks from options
+-	animation
+-		.progress( animation.opts.progress )
+-		.done( animation.opts.done, animation.opts.complete )
+-		.fail( animation.opts.fail )
+-		.always( animation.opts.always );
+-
+-	jQuery.fx.timer(
+-		jQuery.extend( tick, {
+-			elem: elem,
+-			anim: animation,
+-			queue: animation.opts.queue
+-		} )
+-	);
+-
+-	return animation;
+-}
+-
+-jQuery.Animation = jQuery.extend( Animation, {
+-
+-	tweeners: {
+-		"*": [ function( prop, value ) {
+-			var tween = this.createTween( prop, value );
+-			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+-			return tween;
+-		} ]
+-	},
+-
+-	tweener: function( props, callback ) {
+-		if ( isFunction( props ) ) {
+-			callback = props;
+-			props = [ "*" ];
+-		} else {
+-			props = props.match( rnothtmlwhite );
+-		}
+-
+-		var prop,
+-			index = 0,
+-			length = props.length;
+-
+-		for ( ; index < length; index++ ) {
+-			prop = props[ index ];
+-			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+-			Animation.tweeners[ prop ].unshift( callback );
+-		}
+-	},
+-
+-	prefilters: [ defaultPrefilter ],
+-
+-	prefilter: function( callback, prepend ) {
+-		if ( prepend ) {
+-			Animation.prefilters.unshift( callback );
+-		} else {
+-			Animation.prefilters.push( callback );
+-		}
+-	}
+-} );
+-
+-jQuery.speed = function( speed, easing, fn ) {
+-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+-		complete: fn || !fn && easing ||
+-			isFunction( speed ) && speed,
+-		duration: speed,
+-		easing: fn && easing || easing && !isFunction( easing ) && easing
+-	};
+-
+-	// Go to the end state if fx are off
+-	if ( jQuery.fx.off ) {
+-		opt.duration = 0;
+-
+-	} else {
+-		if ( typeof opt.duration !== "number" ) {
+-			if ( opt.duration in jQuery.fx.speeds ) {
+-				opt.duration = jQuery.fx.speeds[ opt.duration ];
+-
+-			} else {
+-				opt.duration = jQuery.fx.speeds._default;
+-			}
+-		}
+-	}
+-
+-	// Normalize opt.queue - true/undefined/null -> "fx"
+-	if ( opt.queue == null || opt.queue === true ) {
+-		opt.queue = "fx";
+-	}
+-
+-	// Queueing
+-	opt.old = opt.complete;
+-
+-	opt.complete = function() {
+-		if ( isFunction( opt.old ) ) {
+-			opt.old.call( this );
+-		}
+-
+-		if ( opt.queue ) {
+-			jQuery.dequeue( this, opt.queue );
+-		}
+-	};
+-
+-	return opt;
+-};
+-
+-jQuery.fn.extend( {
+-	fadeTo: function( speed, to, easing, callback ) {
+-
+-		// Show any hidden elements after setting opacity to 0
+-		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
+-
+-			// Animate to the value specified
+-			.end().animate( { opacity: to }, speed, easing, callback );
+-	},
+-	animate: function( prop, speed, easing, callback ) {
+-		var empty = jQuery.isEmptyObject( prop ),
+-			optall = jQuery.speed( speed, easing, callback ),
+-			doAnimation = function() {
+-
+-				// Operate on a copy of prop so per-property easing won't be lost
+-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+-
+-				// Empty animations, or finishing resolves immediately
+-				if ( empty || dataPriv.get( this, "finish" ) ) {
+-					anim.stop( true );
+-				}
+-			};
+-			doAnimation.finish = doAnimation;
+-
+-		return empty || optall.queue === false ?
+-			this.each( doAnimation ) :
+-			this.queue( optall.queue, doAnimation );
+-	},
+-	stop: function( type, clearQueue, gotoEnd ) {
+-		var stopQueue = function( hooks ) {
+-			var stop = hooks.stop;
+-			delete hooks.stop;
+-			stop( gotoEnd );
+-		};
+-
+-		if ( typeof type !== "string" ) {
+-			gotoEnd = clearQueue;
+-			clearQueue = type;
+-			type = undefined;
+-		}
+-		if ( clearQueue ) {
+-			this.queue( type || "fx", [] );
+-		}
+-
+-		return this.each( function() {
+-			var dequeue = true,
+-				index = type != null && type + "queueHooks",
+-				timers = jQuery.timers,
+-				data = dataPriv.get( this );
+-
+-			if ( index ) {
+-				if ( data[ index ] && data[ index ].stop ) {
+-					stopQueue( data[ index ] );
+-				}
+-			} else {
+-				for ( index in data ) {
+-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+-						stopQueue( data[ index ] );
+-					}
+-				}
+-			}
+-
+-			for ( index = timers.length; index--; ) {
+-				if ( timers[ index ].elem === this &&
+-					( type == null || timers[ index ].queue === type ) ) {
+-
+-					timers[ index ].anim.stop( gotoEnd );
+-					dequeue = false;
+-					timers.splice( index, 1 );
+-				}
+-			}
+-
+-			// Start the next in the queue if the last step wasn't forced.
+-			// Timers currently will call their complete callbacks, which
+-			// will dequeue but only if they were gotoEnd.
+-			if ( dequeue || !gotoEnd ) {
+-				jQuery.dequeue( this, type );
+-			}
+-		} );
+-	},
+-	finish: function( type ) {
+-		if ( type !== false ) {
+-			type = type || "fx";
+-		}
+-		return this.each( function() {
+-			var index,
+-				data = dataPriv.get( this ),
+-				queue = data[ type + "queue" ],
+-				hooks = data[ type + "queueHooks" ],
+-				timers = jQuery.timers,
+-				length = queue ? queue.length : 0;
+-
+-			// Enable finishing flag on private data
+-			data.finish = true;
+-
+-			// Empty the queue first
+-			jQuery.queue( this, type, [] );
+-
+-			if ( hooks && hooks.stop ) {
+-				hooks.stop.call( this, true );
+-			}
+-
+-			// Look for any active animations, and finish them
+-			for ( index = timers.length; index--; ) {
+-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+-					timers[ index ].anim.stop( true );
+-					timers.splice( index, 1 );
+-				}
+-			}
+-
+-			// Look for any animations in the old queue and finish them
+-			for ( index = 0; index < length; index++ ) {
+-				if ( queue[ index ] && queue[ index ].finish ) {
+-					queue[ index ].finish.call( this );
+-				}
+-			}
+-
+-			// Turn off finishing flag
+-			delete data.finish;
+-		} );
+-	}
+-} );
+-
+-jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
+-	var cssFn = jQuery.fn[ name ];
+-	jQuery.fn[ name ] = function( speed, easing, callback ) {
+-		return speed == null || typeof speed === "boolean" ?
+-			cssFn.apply( this, arguments ) :
+-			this.animate( genFx( name, true ), speed, easing, callback );
+-	};
+-} );
+-
+-// Generate shortcuts for custom animations
+-jQuery.each( {
+-	slideDown: genFx( "show" ),
+-	slideUp: genFx( "hide" ),
+-	slideToggle: genFx( "toggle" ),
+-	fadeIn: { opacity: "show" },
+-	fadeOut: { opacity: "hide" },
+-	fadeToggle: { opacity: "toggle" }
+-}, function( name, props ) {
+-	jQuery.fn[ name ] = function( speed, easing, callback ) {
+-		return this.animate( props, speed, easing, callback );
+-	};
+-} );
+-
+-jQuery.timers = [];
+-jQuery.fx.tick = function() {
+-	var timer,
+-		i = 0,
+-		timers = jQuery.timers;
+-
+-	fxNow = Date.now();
+-
+-	for ( ; i < timers.length; i++ ) {
+-		timer = timers[ i ];
+-
+-		// Run the timer and safely remove it when done (allowing for external removal)
+-		if ( !timer() && timers[ i ] === timer ) {
+-			timers.splice( i--, 1 );
+-		}
+-	}
+-
+-	if ( !timers.length ) {
+-		jQuery.fx.stop();
+-	}
+-	fxNow = undefined;
+-};
+-
+-jQuery.fx.timer = function( timer ) {
+-	jQuery.timers.push( timer );
+-	jQuery.fx.start();
+-};
+-
+-jQuery.fx.interval = 13;
+-jQuery.fx.start = function() {
+-	if ( inProgress ) {
+-		return;
+-	}
+-
+-	inProgress = true;
+-	schedule();
+-};
+-
+-jQuery.fx.stop = function() {
+-	inProgress = null;
+-};
+-
+-jQuery.fx.speeds = {
+-	slow: 600,
+-	fast: 200,
+-
+-	// Default speed
+-	_default: 400
+-};
+-
+-
+-// Based off of the plugin by Clint Helfers, with permission.
+-// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+-jQuery.fn.delay = function( time, type ) {
+-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+-	type = type || "fx";
+-
+-	return this.queue( type, function( next, hooks ) {
+-		var timeout = window.setTimeout( next, time );
+-		hooks.stop = function() {
+-			window.clearTimeout( timeout );
+-		};
+-	} );
+-};
+-
+-
+-( function() {
+-	var input = document.createElement( "input" ),
+-		select = document.createElement( "select" ),
+-		opt = select.appendChild( document.createElement( "option" ) );
+-
+-	input.type = "checkbox";
+-
+-	// Support: Android <=4.3 only
+-	// Default value for a checkbox should be "on"
+-	support.checkOn = input.value !== "";
+-
+-	// Support: IE <=11 only
+-	// Must access selectedIndex to make default options select
+-	support.optSelected = opt.selected;
+-
+-	// Support: IE <=11 only
+-	// An input loses its value after becoming a radio
+-	input = document.createElement( "input" );
+-	input.value = "t";
+-	input.type = "radio";
+-	support.radioValue = input.value === "t";
+-} )();
+-
+-
+-var boolHook,
+-	attrHandle = jQuery.expr.attrHandle;
+-
+-jQuery.fn.extend( {
+-	attr: function( name, value ) {
+-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+-	},
+-
+-	removeAttr: function( name ) {
+-		return this.each( function() {
+-			jQuery.removeAttr( this, name );
+-		} );
+-	}
+-} );
+-
+-jQuery.extend( {
+-	attr: function( elem, name, value ) {
+-		var ret, hooks,
+-			nType = elem.nodeType;
+-
+-		// Don't get/set attributes on text, comment and attribute nodes
+-		if ( nType === 3 || nType === 8 || nType === 2 ) {
+-			return;
+-		}
+-
+-		// Fallback to prop when attributes are not supported
+-		if ( typeof elem.getAttribute === "undefined" ) {
+-			return jQuery.prop( elem, name, value );
+-		}
+-
+-		// Attribute hooks are determined by the lowercase version
+-		// Grab necessary hook if one is defined
+-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+-			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
+-				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
+-		}
+-
+-		if ( value !== undefined ) {
+-			if ( value === null ) {
+-				jQuery.removeAttr( elem, name );
+-				return;
+-			}
+-
+-			if ( hooks && "set" in hooks &&
+-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+-				return ret;
+-			}
+-
+-			elem.setAttribute( name, value + "" );
+-			return value;
+-		}
+-
+-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+-			return ret;
+-		}
+-
+-		ret = jQuery.find.attr( elem, name );
+-
+-		// Non-existent attributes return null, we normalize to undefined
+-		return ret == null ? undefined : ret;
+-	},
+-
+-	attrHooks: {
+-		type: {
+-			set: function( elem, value ) {
+-				if ( !support.radioValue && value === "radio" &&
+-					nodeName( elem, "input" ) ) {
+-					var val = elem.value;
+-					elem.setAttribute( "type", value );
+-					if ( val ) {
+-						elem.value = val;
+-					}
+-					return value;
+-				}
+-			}
+-		}
+-	},
+-
+-	removeAttr: function( elem, value ) {
+-		var name,
+-			i = 0,
+-
+-			// Attribute names can contain non-HTML whitespace characters
+-			// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+-			attrNames = value && value.match( rnothtmlwhite );
+-
+-		if ( attrNames && elem.nodeType === 1 ) {
+-			while ( ( name = attrNames[ i++ ] ) ) {
+-				elem.removeAttribute( name );
+-			}
+-		}
+-	}
+-} );
+-
+-// Hooks for boolean attributes
+-boolHook = {
+-	set: function( elem, value, name ) {
+-		if ( value === false ) {
+-
+-			// Remove boolean attributes when set to false
+-			jQuery.removeAttr( elem, name );
+-		} else {
+-			elem.setAttribute( name, name );
+-		}
+-		return name;
+-	}
+-};
+-
+-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
+-	var getter = attrHandle[ name ] || jQuery.find.attr;
+-
+-	attrHandle[ name ] = function( elem, name, isXML ) {
+-		var ret, handle,
+-			lowercaseName = name.toLowerCase();
+-
+-		if ( !isXML ) {
+-
+-			// Avoid an infinite loop by temporarily removing this function from the getter
+-			handle = attrHandle[ lowercaseName ];
+-			attrHandle[ lowercaseName ] = ret;
+-			ret = getter( elem, name, isXML ) != null ?
+-				lowercaseName :
+-				null;
+-			attrHandle[ lowercaseName ] = handle;
+-		}
+-		return ret;
+-	};
+-} );
+-
+-
+-
+-
+-var rfocusable = /^(?:input|select|textarea|button)$/i,
+-	rclickable = /^(?:a|area)$/i;
+-
+-jQuery.fn.extend( {
+-	prop: function( name, value ) {
+-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+-	},
+-
+-	removeProp: function( name ) {
+-		return this.each( function() {
+-			delete this[ jQuery.propFix[ name ] || name ];
+-		} );
+-	}
+-} );
+-
+-jQuery.extend( {
+-	prop: function( elem, name, value ) {
+-		var ret, hooks,
+-			nType = elem.nodeType;
+-
+-		// Don't get/set properties on text, comment and attribute nodes
+-		if ( nType === 3 || nType === 8 || nType === 2 ) {
+-			return;
+-		}
+-
+-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+-
+-			// Fix name and attach hooks
+-			name = jQuery.propFix[ name ] || name;
+-			hooks = jQuery.propHooks[ name ];
+-		}
+-
+-		if ( value !== undefined ) {
+-			if ( hooks && "set" in hooks &&
+-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+-				return ret;
+-			}
+-
+-			return ( elem[ name ] = value );
+-		}
+-
+-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+-			return ret;
+-		}
+-
+-		return elem[ name ];
+-	},
+-
+-	propHooks: {
+-		tabIndex: {
+-			get: function( elem ) {
+-
+-				// Support: IE <=9 - 11 only
+-				// elem.tabIndex doesn't always return the
+-				// correct value when it hasn't been explicitly set
+-				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+-				// Use proper attribute retrieval(#12072)
+-				var tabindex = jQuery.find.attr( elem, "tabindex" );
+-
+-				if ( tabindex ) {
+-					return parseInt( tabindex, 10 );
+-				}
+-
+-				if (
+-					rfocusable.test( elem.nodeName ) ||
+-					rclickable.test( elem.nodeName ) &&
+-					elem.href
+-				) {
+-					return 0;
+-				}
+-
+-				return -1;
+-			}
+-		}
+-	},
+-
+-	propFix: {
+-		"for": "htmlFor",
+-		"class": "className"
+-	}
+-} );
+-
+-// Support: IE <=11 only
+-// Accessing the selectedIndex property
+-// forces the browser to respect setting selected
+-// on the option
+-// The getter ensures a default option is selected
+-// when in an optgroup
+-// eslint rule "no-unused-expressions" is disabled for this code
+-// since it considers such accessions noop
+-if ( !support.optSelected ) {
+-	jQuery.propHooks.selected = {
+-		get: function( elem ) {
+-
+-			/* eslint no-unused-expressions: "off" */
+-
+-			var parent = elem.parentNode;
+-			if ( parent && parent.parentNode ) {
+-				parent.parentNode.selectedIndex;
+-			}
+-			return null;
+-		},
+-		set: function( elem ) {
+-
+-			/* eslint no-unused-expressions: "off" */
+-
+-			var parent = elem.parentNode;
+-			if ( parent ) {
+-				parent.selectedIndex;
+-
+-				if ( parent.parentNode ) {
+-					parent.parentNode.selectedIndex;
+-				}
+-			}
+-		}
+-	};
+-}
+-
+-jQuery.each( [
+-	"tabIndex",
+-	"readOnly",
+-	"maxLength",
+-	"cellSpacing",
+-	"cellPadding",
+-	"rowSpan",
+-	"colSpan",
+-	"useMap",
+-	"frameBorder",
+-	"contentEditable"
+-], function() {
+-	jQuery.propFix[ this.toLowerCase() ] = this;
+-} );
+-
+-
+-
+-
+-	// Strip and collapse whitespace according to HTML spec
+-	// https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace
+-	function stripAndCollapse( value ) {
+-		var tokens = value.match( rnothtmlwhite ) || [];
+-		return tokens.join( " " );
+-	}
+-
+-
+-function getClass( elem ) {
+-	return elem.getAttribute && elem.getAttribute( "class" ) || "";
+-}
+-
+-function classesToArray( value ) {
+-	if ( Array.isArray( value ) ) {
+-		return value;
+-	}
+-	if ( typeof value === "string" ) {
+-		return value.match( rnothtmlwhite ) || [];
+-	}
+-	return [];
+-}
+-
+-jQuery.fn.extend( {
+-	addClass: function( value ) {
+-		var classes, elem, cur, curValue, clazz, j, finalValue,
+-			i = 0;
+-
+-		if ( isFunction( value ) ) {
+-			return this.each( function( j ) {
+-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+-			} );
+-		}
+-
+-		classes = classesToArray( value );
+-
+-		if ( classes.length ) {
+-			while ( ( elem = this[ i++ ] ) ) {
+-				curValue = getClass( elem );
+-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+-
+-				if ( cur ) {
+-					j = 0;
+-					while ( ( clazz = classes[ j++ ] ) ) {
+-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+-							cur += clazz + " ";
+-						}
+-					}
+-
+-					// Only assign if different to avoid unneeded rendering.
+-					finalValue = stripAndCollapse( cur );
+-					if ( curValue !== finalValue ) {
+-						elem.setAttribute( "class", finalValue );
+-					}
+-				}
+-			}
+-		}
+-
+-		return this;
+-	},
+-
+-	removeClass: function( value ) {
+-		var classes, elem, cur, curValue, clazz, j, finalValue,
+-			i = 0;
+-
+-		if ( isFunction( value ) ) {
+-			return this.each( function( j ) {
+-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+-			} );
+-		}
+-
+-		if ( !arguments.length ) {
+-			return this.attr( "class", "" );
+-		}
+-
+-		classes = classesToArray( value );
+-
+-		if ( classes.length ) {
+-			while ( ( elem = this[ i++ ] ) ) {
+-				curValue = getClass( elem );
+-
+-				// This expression is here for better compressibility (see addClass)
+-				cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " );
+-
+-				if ( cur ) {
+-					j = 0;
+-					while ( ( clazz = classes[ j++ ] ) ) {
+-
+-						// Remove *all* instances
+-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+-							cur = cur.replace( " " + clazz + " ", " " );
+-						}
+-					}
+-
+-					// Only assign if different to avoid unneeded rendering.
+-					finalValue = stripAndCollapse( cur );
+-					if ( curValue !== finalValue ) {
+-						elem.setAttribute( "class", finalValue );
+-					}
+-				}
+-			}
+-		}
+-
+-		return this;
+-	},
+-
+-	toggleClass: function( value, stateVal ) {
+-		var type = typeof value,
+-			isValidValue = type === "string" || Array.isArray( value );
+-
+-		if ( typeof stateVal === "boolean" && isValidValue ) {
+-			return stateVal ? this.addClass( value ) : this.removeClass( value );
+-		}
+-
+-		if ( isFunction( value ) ) {
+-			return this.each( function( i ) {
+-				jQuery( this ).toggleClass(
+-					value.call( this, i, getClass( this ), stateVal ),
+-					stateVal
+-				);
+-			} );
+-		}
+-
+-		return this.each( function() {
+-			var className, i, self, classNames;
+-
+-			if ( isValidValue ) {
+-
+-				// Toggle individual class names
+-				i = 0;
+-				self = jQuery( this );
+-				classNames = classesToArray( value );
+-
+-				while ( ( className = classNames[ i++ ] ) ) {
+-
+-					// Check each className given, space separated list
+-					if ( self.hasClass( className ) ) {
+-						self.removeClass( className );
+-					} else {
+-						self.addClass( className );
+-					}
+-				}
+-
+-			// Toggle whole class name
+-			} else if ( value === undefined || type === "boolean" ) {
+-				className = getClass( this );
+-				if ( className ) {
+-
+-					// Store className if set
+-					dataPriv.set( this, "__className__", className );
+-				}
+-
+-				// If the element has a class name or if we're passed `false`,
+-				// then remove the whole classname (if there was one, the above saved it).
+-				// Otherwise bring back whatever was previously saved (if anything),
+-				// falling back to the empty string if nothing was stored.
+-				if ( this.setAttribute ) {
+-					this.setAttribute( "class",
+-						className || value === false ?
+-						"" :
+-						dataPriv.get( this, "__className__" ) || ""
+-					);
+-				}
+-			}
+-		} );
+-	},
+-
+-	hasClass: function( selector ) {
+-		var className, elem,
+-			i = 0;
+-
+-		className = " " + selector + " ";
+-		while ( ( elem = this[ i++ ] ) ) {
+-			if ( elem.nodeType === 1 &&
+-				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
+-					return true;
+-			}
+-		}
+-
+-		return false;
+-	}
+-} );
+-
+-
+-
+-
+-var rreturn = /\r/g;
+-
+-jQuery.fn.extend( {
+-	val: function( value ) {
+-		var hooks, ret, valueIsFunction,
+-			elem = this[ 0 ];
+-
+-		if ( !arguments.length ) {
+-			if ( elem ) {
+-				hooks = jQuery.valHooks[ elem.type ] ||
+-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+-
+-				if ( hooks &&
+-					"get" in hooks &&
+-					( ret = hooks.get( elem, "value" ) ) !== undefined
+-				) {
+-					return ret;
+-				}
+-
+-				ret = elem.value;
+-
+-				// Handle most common string cases
+-				if ( typeof ret === "string" ) {
+-					return ret.replace( rreturn, "" );
+-				}
+-
+-				// Handle cases where value is null/undef or number
+-				return ret == null ? "" : ret;
+-			}
+-
+-			return;
+-		}
+-
+-		valueIsFunction = isFunction( value );
+-
+-		return this.each( function( i ) {
+-			var val;
+-
+-			if ( this.nodeType !== 1 ) {
+-				return;
+-			}
+-
+-			if ( valueIsFunction ) {
+-				val = value.call( this, i, jQuery( this ).val() );
+-			} else {
+-				val = value;
+-			}
+-
+-			// Treat null/undefined as ""; convert numbers to string
+-			if ( val == null ) {
+-				val = "";
+-
+-			} else if ( typeof val === "number" ) {
+-				val += "";
+-
+-			} else if ( Array.isArray( val ) ) {
+-				val = jQuery.map( val, function( value ) {
+-					return value == null ? "" : value + "";
+-				} );
+-			}
+-
+-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+-
+-			// If set returns undefined, fall back to normal setting
+-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+-				this.value = val;
+-			}
+-		} );
+-	}
+-} );
+-
+-jQuery.extend( {
+-	valHooks: {
+-		option: {
+-			get: function( elem ) {
+-
+-				var val = jQuery.find.attr( elem, "value" );
+-				return val != null ?
+-					val :
+-
+-					// Support: IE <=10 - 11 only
+-					// option.text throws exceptions (#14686, #14858)
+-					// Strip and collapse whitespace
+-					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+-					stripAndCollapse( jQuery.text( elem ) );
+-			}
+-		},
+-		select: {
+-			get: function( elem ) {
+-				var value, option, i,
+-					options = elem.options,
+-					index = elem.selectedIndex,
+-					one = elem.type === "select-one",
+-					values = one ? null : [],
+-					max = one ? index + 1 : options.length;
+-
+-				if ( index < 0 ) {
+-					i = max;
+-
+-				} else {
+-					i = one ? index : 0;
+-				}
+-
+-				// Loop through all the selected options
+-				for ( ; i < max; i++ ) {
+-					option = options[ i ];
+-
+-					// Support: IE <=9 only
+-					// IE8-9 doesn't update selected after form reset (#2551)
+-					if ( ( option.selected || i === index ) &&
+-
+-							// Don't return options that are disabled or in a disabled optgroup
+-							!option.disabled &&
+-							( !option.parentNode.disabled ||
+-								!nodeName( option.parentNode, "optgroup" ) ) ) {
+-
+-						// Get the specific value for the option
+-						value = jQuery( option ).val();
+-
+-						// We don't need an array for one selects
+-						if ( one ) {
+-							return value;
+-						}
+-
+-						// Multi-Selects return an array
+-						values.push( value );
+-					}
+-				}
+-
+-				return values;
+-			},
+-
+-			set: function( elem, value ) {
+-				var optionSet, option,
+-					options = elem.options,
+-					values = jQuery.makeArray( value ),
+-					i = options.length;
+-
+-				while ( i-- ) {
+-					option = options[ i ];
+-
+-					/* eslint-disable no-cond-assign */
+-
+-					if ( option.selected =
+-						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
+-					) {
+-						optionSet = true;
+-					}
+-
+-					/* eslint-enable no-cond-assign */
+-				}
+-
+-				// Force browsers to behave consistently when non-matching value is set
+-				if ( !optionSet ) {
+-					elem.selectedIndex = -1;
+-				}
+-				return values;
+-			}
+-		}
+-	}
+-} );
+-
+-// Radios and checkboxes getter/setter
+-jQuery.each( [ "radio", "checkbox" ], function() {
+-	jQuery.valHooks[ this ] = {
+-		set: function( elem, value ) {
+-			if ( Array.isArray( value ) ) {
+-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+-			}
+-		}
+-	};
+-	if ( !support.checkOn ) {
+-		jQuery.valHooks[ this ].get = function( elem ) {
+-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+-		};
+-	}
+-} );
+-
+-
+-
+-
+-// Return jQuery for attributes-only inclusion
+-
+-
+-support.focusin = "onfocusin" in window;
+-
+-
+-var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+-	stopPropagationCallback = function( e ) {
+-		e.stopPropagation();
+-	};
+-
+-jQuery.extend( jQuery.event, {
+-
+-	trigger: function( event, data, elem, onlyHandlers ) {
+-
+-		var i, cur, tmp, bubbleType, ontype, handle, special, lastElement,
+-			eventPath = [ elem || document ],
+-			type = hasOwn.call( event, "type" ) ? event.type : event,
+-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
+-
+-		cur = lastElement = tmp = elem = elem || document;
+-
+-		// Don't do events on text and comment nodes
+-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+-			return;
+-		}
+-
+-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+-			return;
+-		}
+-
+-		if ( type.indexOf( "." ) > -1 ) {
+-
+-			// Namespaced trigger; create a regexp to match event type in handle()
+-			namespaces = type.split( "." );
+-			type = namespaces.shift();
+-			namespaces.sort();
+-		}
+-		ontype = type.indexOf( ":" ) < 0 && "on" + type;
+-
+-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+-		event = event[ jQuery.expando ] ?
+-			event :
+-			new jQuery.Event( type, typeof event === "object" && event );
+-
+-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+-		event.isTrigger = onlyHandlers ? 2 : 3;
+-		event.namespace = namespaces.join( "." );
+-		event.rnamespace = event.namespace ?
+-			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
+-			null;
+-
+-		// Clean up the event in case it is being reused
+-		event.result = undefined;
+-		if ( !event.target ) {
+-			event.target = elem;
+-		}
+-
+-		// Clone any incoming data and prepend the event, creating the handler arg list
+-		data = data == null ?
+-			[ event ] :
+-			jQuery.makeArray( data, [ event ] );
+-
+-		// Allow special events to draw outside the lines
+-		special = jQuery.event.special[ type ] || {};
+-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+-			return;
+-		}
+-
+-		// Determine event propagation path in advance, per W3C events spec (#9951)
+-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+-		if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) {
+-
+-			bubbleType = special.delegateType || type;
+-			if ( !rfocusMorph.test( bubbleType + type ) ) {
+-				cur = cur.parentNode;
+-			}
+-			for ( ; cur; cur = cur.parentNode ) {
+-				eventPath.push( cur );
+-				tmp = cur;
+-			}
+-
+-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+-			if ( tmp === ( elem.ownerDocument || document ) ) {
+-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+-			}
+-		}
+-
+-		// Fire handlers on the event path
+-		i = 0;
+-		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
+-			lastElement = cur;
+-			event.type = i > 1 ?
+-				bubbleType :
+-				special.bindType || type;
+-
+-			// jQuery handler
+-			handle = (
+-					dataPriv.get( cur, "events" ) || Object.create( null )
+-				)[ event.type ] &&
+-				dataPriv.get( cur, "handle" );
+-			if ( handle ) {
+-				handle.apply( cur, data );
+-			}
+-
+-			// Native handler
+-			handle = ontype && cur[ ontype ];
+-			if ( handle && handle.apply && acceptData( cur ) ) {
+-				event.result = handle.apply( cur, data );
+-				if ( event.result === false ) {
+-					event.preventDefault();
+-				}
+-			}
+-		}
+-		event.type = type;
+-
+-		// If nobody prevented the default action, do it now
+-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+-
+-			if ( ( !special._default ||
+-				special._default.apply( eventPath.pop(), data ) === false ) &&
+-				acceptData( elem ) ) {
+-
+-				// Call a native DOM method on the target with the same name as the event.
+-				// Don't do default actions on window, that's where global variables be (#6170)
+-				if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) {
+-
+-					// Don't re-trigger an onFOO event when we call its FOO() method
+-					tmp = elem[ ontype ];
+-
+-					if ( tmp ) {
+-						elem[ ontype ] = null;
+-					}
+-
+-					// Prevent re-triggering of the same event, since we already bubbled it above
+-					jQuery.event.triggered = type;
+-
+-					if ( event.isPropagationStopped() ) {
+-						lastElement.addEventListener( type, stopPropagationCallback );
+-					}
+-
+-					elem[ type ]();
+-
+-					if ( event.isPropagationStopped() ) {
+-						lastElement.removeEventListener( type, stopPropagationCallback );
+-					}
+-
+-					jQuery.event.triggered = undefined;
+-
+-					if ( tmp ) {
+-						elem[ ontype ] = tmp;
+-					}
+-				}
+-			}
+-		}
+-
+-		return event.result;
+-	},
+-
+-	// Piggyback on a donor event to simulate a different one
+-	// Used only for `focus(in | out)` events
+-	simulate: function( type, elem, event ) {
+-		var e = jQuery.extend(
+-			new jQuery.Event(),
+-			event,
+-			{
+-				type: type,
+-				isSimulated: true
+-			}
+-		);
+-
+-		jQuery.event.trigger( e, null, elem );
+-	}
+-
+-} );
+-
+-jQuery.fn.extend( {
+-
+-	trigger: function( type, data ) {
+-		return this.each( function() {
+-			jQuery.event.trigger( type, data, this );
+-		} );
+-	},
+-	triggerHandler: function( type, data ) {
+-		var elem = this[ 0 ];
+-		if ( elem ) {
+-			return jQuery.event.trigger( type, data, elem, true );
+-		}
+-	}
+-} );
+-
+-
+-// Support: Firefox <=44
+-// Firefox doesn't have focus(in | out) events
+-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+-//
+-// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
+-// focus(in | out) events fire after focus & blur events,
+-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+-// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
+-if ( !support.focusin ) {
+-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+-
+-		// Attach a single capturing handler on the document while someone wants focusin/focusout
+-		var handler = function( event ) {
+-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+-		};
+-
+-		jQuery.event.special[ fix ] = {
+-			setup: function() {
+-
+-				// Handle: regular nodes (via `this.ownerDocument`), window
+-				// (via `this.document`) & document (via `this`).
+-				var doc = this.ownerDocument || this.document || this,
+-					attaches = dataPriv.access( doc, fix );
+-
+-				if ( !attaches ) {
+-					doc.addEventListener( orig, handler, true );
+-				}
+-				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
+-			},
+-			teardown: function() {
+-				var doc = this.ownerDocument || this.document || this,
+-					attaches = dataPriv.access( doc, fix ) - 1;
+-
+-				if ( !attaches ) {
+-					doc.removeEventListener( orig, handler, true );
+-					dataPriv.remove( doc, fix );
+-
+-				} else {
+-					dataPriv.access( doc, fix, attaches );
+-				}
+-			}
+-		};
+-	} );
+-}
+-var location = window.location;
+-
+-var nonce = { guid: Date.now() };
+-
+-var rquery = ( /\?/ );
+-
+-
+-
+-// Cross-browser xml parsing
+-jQuery.parseXML = function( data ) {
+-	var xml;
+-	if ( !data || typeof data !== "string" ) {
+-		return null;
+-	}
+-
+-	// Support: IE 9 - 11 only
+-	// IE throws on parseFromString with invalid input.
+-	try {
+-		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
+-	} catch ( e ) {
+-		xml = undefined;
+-	}
+-
+-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
+-		jQuery.error( "Invalid XML: " + data );
+-	}
+-	return xml;
+-};
+-
+-
+-var
+-	rbracket = /\[\]$/,
+-	rCRLF = /\r?\n/g,
+-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+-
+-function buildParams( prefix, obj, traditional, add ) {
+-	var name;
+-
+-	if ( Array.isArray( obj ) ) {
+-
+-		// Serialize array item.
+-		jQuery.each( obj, function( i, v ) {
+-			if ( traditional || rbracket.test( prefix ) ) {
+-
+-				// Treat each array item as a scalar.
+-				add( prefix, v );
+-
+-			} else {
+-
+-				// Item is non-scalar (array or object), encode its numeric index.
+-				buildParams(
+-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+-					v,
+-					traditional,
+-					add
+-				);
+-			}
+-		} );
+-
+-	} else if ( !traditional && toType( obj ) === "object" ) {
+-
+-		// Serialize object item.
+-		for ( name in obj ) {
+-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+-		}
+-
+-	} else {
+-
+-		// Serialize scalar item.
+-		add( prefix, obj );
+-	}
+-}
+-
+-// Serialize an array of form elements or a set of
+-// key/values into a query string
+-jQuery.param = function( a, traditional ) {
+-	var prefix,
+-		s = [],
+-		add = function( key, valueOrFunction ) {
+-
+-			// If value is a function, invoke it and use its return value
+-			var value = isFunction( valueOrFunction ) ?
+-				valueOrFunction() :
+-				valueOrFunction;
+-
+-			s[ s.length ] = encodeURIComponent( key ) + "=" +
+-				encodeURIComponent( value == null ? "" : value );
+-		};
+-
+-	if ( a == null ) {
+-		return "";
+-	}
+-
+-	// If an array was passed in, assume that it is an array of form elements.
+-	if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+-
+-		// Serialize the form elements
+-		jQuery.each( a, function() {
+-			add( this.name, this.value );
+-		} );
+-
+-	} else {
+-
+-		// If traditional, encode the "old" way (the way 1.3.2 or older
+-		// did it), otherwise encode params recursively.
+-		for ( prefix in a ) {
+-			buildParams( prefix, a[ prefix ], traditional, add );
+-		}
+-	}
+-
+-	// Return the resulting serialization
+-	return s.join( "&" );
+-};
+-
+-jQuery.fn.extend( {
+-	serialize: function() {
+-		return jQuery.param( this.serializeArray() );
+-	},
+-	serializeArray: function() {
+-		return this.map( function() {
+-
+-			// Can add propHook for "elements" to filter or add form elements
+-			var elements = jQuery.prop( this, "elements" );
+-			return elements ? jQuery.makeArray( elements ) : this;
+-		} )
+-		.filter( function() {
+-			var type = this.type;
+-
+-			// Use .is( ":disabled" ) so that fieldset[disabled] works
+-			return this.name && !jQuery( this ).is( ":disabled" ) &&
+-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+-				( this.checked || !rcheckableType.test( type ) );
+-		} )
+-		.map( function( _i, elem ) {
+-			var val = jQuery( this ).val();
+-
+-			if ( val == null ) {
+-				return null;
+-			}
+-
+-			if ( Array.isArray( val ) ) {
+-				return jQuery.map( val, function( val ) {
+-					return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+-				} );
+-			}
+-
+-			return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+-		} ).get();
+-	}
+-} );
+-
+-
+-var
+-	r20 = /%20/g,
+-	rhash = /#.*$/,
+-	rantiCache = /([?&])_=[^&]*/,
+-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
+-
+-	// #7653, #8125, #8152: local protocol detection
+-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+-	rnoContent = /^(?:GET|HEAD)$/,
+-	rprotocol = /^\/\//,
+-
+-	/* Prefilters
+-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+-	 * 2) These are called:
+-	 *    - BEFORE asking for a transport
+-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+-	 * 3) key is the dataType
+-	 * 4) the catchall symbol "*" can be used
+-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+-	 */
+-	prefilters = {},
+-
+-	/* Transports bindings
+-	 * 1) key is the dataType
+-	 * 2) the catchall symbol "*" can be used
+-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+-	 */
+-	transports = {},
+-
+-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+-	allTypes = "*/".concat( "*" ),
+-
+-	// Anchor tag for parsing the document origin
+-	originAnchor = document.createElement( "a" );
+-	originAnchor.href = location.href;
+-
+-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+-function addToPrefiltersOrTransports( structure ) {
+-
+-	// dataTypeExpression is optional and defaults to "*"
+-	return function( dataTypeExpression, func ) {
+-
+-		if ( typeof dataTypeExpression !== "string" ) {
+-			func = dataTypeExpression;
+-			dataTypeExpression = "*";
+-		}
+-
+-		var dataType,
+-			i = 0,
+-			dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || [];
+-
+-		if ( isFunction( func ) ) {
+-
+-			// For each dataType in the dataTypeExpression
+-			while ( ( dataType = dataTypes[ i++ ] ) ) {
+-
+-				// Prepend if requested
+-				if ( dataType[ 0 ] === "+" ) {
+-					dataType = dataType.slice( 1 ) || "*";
+-					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
+-
+-				// Otherwise append
+-				} else {
+-					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
+-				}
+-			}
+-		}
+-	};
+-}
+-
+-// Base inspection function for prefilters and transports
+-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+-
+-	var inspected = {},
+-		seekingTransport = ( structure === transports );
+-
+-	function inspect( dataType ) {
+-		var selected;
+-		inspected[ dataType ] = true;
+-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+-			if ( typeof dataTypeOrTransport === "string" &&
+-				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+-
+-				options.dataTypes.unshift( dataTypeOrTransport );
+-				inspect( dataTypeOrTransport );
+-				return false;
+-			} else if ( seekingTransport ) {
+-				return !( selected = dataTypeOrTransport );
+-			}
+-		} );
+-		return selected;
+-	}
+-
+-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+-}
+-
+-// A special extend for ajax options
+-// that takes "flat" options (not to be deep extended)
+-// Fixes #9887
+-function ajaxExtend( target, src ) {
+-	var key, deep,
+-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+-
+-	for ( key in src ) {
+-		if ( src[ key ] !== undefined ) {
+-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+-		}
+-	}
+-	if ( deep ) {
+-		jQuery.extend( true, target, deep );
+-	}
+-
+-	return target;
+-}
+-
+-/* Handles responses to an ajax request:
+- * - finds the right dataType (mediates between content-type and expected dataType)
+- * - returns the corresponding response
+- */
+-function ajaxHandleResponses( s, jqXHR, responses ) {
+-
+-	var ct, type, finalDataType, firstDataType,
+-		contents = s.contents,
+-		dataTypes = s.dataTypes;
+-
+-	// Remove auto dataType and get content-type in the process
+-	while ( dataTypes[ 0 ] === "*" ) {
+-		dataTypes.shift();
+-		if ( ct === undefined ) {
+-			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+-		}
+-	}
+-
+-	// Check if we're dealing with a known content-type
+-	if ( ct ) {
+-		for ( type in contents ) {
+-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+-				dataTypes.unshift( type );
+-				break;
+-			}
+-		}
+-	}
+-
+-	// Check to see if we have a response for the expected dataType
+-	if ( dataTypes[ 0 ] in responses ) {
+-		finalDataType = dataTypes[ 0 ];
+-	} else {
+-
+-		// Try convertible dataTypes
+-		for ( type in responses ) {
+-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+-				finalDataType = type;
+-				break;
+-			}
+-			if ( !firstDataType ) {
+-				firstDataType = type;
+-			}
+-		}
+-
+-		// Or just use first one
+-		finalDataType = finalDataType || firstDataType;
+-	}
+-
+-	// If we found a dataType
+-	// We add the dataType to the list if needed
+-	// and return the corresponding response
+-	if ( finalDataType ) {
+-		if ( finalDataType !== dataTypes[ 0 ] ) {
+-			dataTypes.unshift( finalDataType );
+-		}
+-		return responses[ finalDataType ];
+-	}
+-}
+-
+-/* Chain conversions given the request and the original response
+- * Also sets the responseXXX fields on the jqXHR instance
+- */
+-function ajaxConvert( s, response, jqXHR, isSuccess ) {
+-	var conv2, current, conv, tmp, prev,
+-		converters = {},
+-
+-		// Work with a copy of dataTypes in case we need to modify it for conversion
+-		dataTypes = s.dataTypes.slice();
+-
+-	// Create converters map with lowercased keys
+-	if ( dataTypes[ 1 ] ) {
+-		for ( conv in s.converters ) {
+-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+-		}
+-	}
+-
+-	current = dataTypes.shift();
+-
+-	// Convert to each sequential dataType
+-	while ( current ) {
+-
+-		if ( s.responseFields[ current ] ) {
+-			jqXHR[ s.responseFields[ current ] ] = response;
+-		}
+-
+-		// Apply the dataFilter if provided
+-		if ( !prev && isSuccess && s.dataFilter ) {
+-			response = s.dataFilter( response, s.dataType );
+-		}
+-
+-		prev = current;
+-		current = dataTypes.shift();
+-
+-		if ( current ) {
+-
+-			// There's only work to do if current dataType is non-auto
+-			if ( current === "*" ) {
+-
+-				current = prev;
+-
+-			// Convert response if prev dataType is non-auto and differs from current
+-			} else if ( prev !== "*" && prev !== current ) {
+-
+-				// Seek a direct converter
+-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+-
+-				// If none found, seek a pair
+-				if ( !conv ) {
+-					for ( conv2 in converters ) {
+-
+-						// If conv2 outputs current
+-						tmp = conv2.split( " " );
+-						if ( tmp[ 1 ] === current ) {
+-
+-							// If prev can be converted to accepted input
+-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+-								converters[ "* " + tmp[ 0 ] ];
+-							if ( conv ) {
+-
+-								// Condense equivalence converters
+-								if ( conv === true ) {
+-									conv = converters[ conv2 ];
+-
+-								// Otherwise, insert the intermediate dataType
+-								} else if ( converters[ conv2 ] !== true ) {
+-									current = tmp[ 0 ];
+-									dataTypes.unshift( tmp[ 1 ] );
+-								}
+-								break;
+-							}
+-						}
+-					}
+-				}
+-
+-				// Apply converter (if not an equivalence)
+-				if ( conv !== true ) {
+-
+-					// Unless errors are allowed to bubble, catch and return them
+-					if ( conv && s.throws ) {
+-						response = conv( response );
+-					} else {
+-						try {
+-							response = conv( response );
+-						} catch ( e ) {
+-							return {
+-								state: "parsererror",
+-								error: conv ? e : "No conversion from " + prev + " to " + current
+-							};
+-						}
+-					}
+-				}
+-			}
+-		}
+-	}
+-
+-	return { state: "success", data: response };
+-}
+-
+-jQuery.extend( {
+-
+-	// Counter for holding the number of active queries
+-	active: 0,
+-
+-	// Last-Modified header cache for next request
+-	lastModified: {},
+-	etag: {},
+-
+-	ajaxSettings: {
+-		url: location.href,
+-		type: "GET",
+-		isLocal: rlocalProtocol.test( location.protocol ),
+-		global: true,
+-		processData: true,
+-		async: true,
+-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+-
+-		/*
+-		timeout: 0,
+-		data: null,
+-		dataType: null,
+-		username: null,
+-		password: null,
+-		cache: null,
+-		throws: false,
+-		traditional: false,
+-		headers: {},
+-		*/
+-
+-		accepts: {
+-			"*": allTypes,
+-			text: "text/plain",
+-			html: "text/html",
+-			xml: "application/xml, text/xml",
+-			json: "application/json, text/javascript"
+-		},
+-
+-		contents: {
+-			xml: /\bxml\b/,
+-			html: /\bhtml/,
+-			json: /\bjson\b/
+-		},
+-
+-		responseFields: {
+-			xml: "responseXML",
+-			text: "responseText",
+-			json: "responseJSON"
+-		},
+-
+-		// Data converters
+-		// Keys separate source (or catchall "*") and destination types with a single space
+-		converters: {
+-
+-			// Convert anything to text
+-			"* text": String,
+-
+-			// Text to html (true = no transformation)
+-			"text html": true,
+-
+-			// Evaluate text as a json expression
+-			"text json": JSON.parse,
+-
+-			// Parse text as xml
+-			"text xml": jQuery.parseXML
+-		},
+-
+-		// For options that shouldn't be deep extended:
+-		// you can add your own custom options here if
+-		// and when you create one that shouldn't be
+-		// deep extended (see ajaxExtend)
+-		flatOptions: {
+-			url: true,
+-			context: true
+-		}
+-	},
+-
+-	// Creates a full fledged settings object into target
+-	// with both ajaxSettings and settings fields.
+-	// If target is omitted, writes into ajaxSettings.
+-	ajaxSetup: function( target, settings ) {
+-		return settings ?
+-
+-			// Building a settings object
+-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+-
+-			// Extending ajaxSettings
+-			ajaxExtend( jQuery.ajaxSettings, target );
+-	},
+-
+-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+-	ajaxTransport: addToPrefiltersOrTransports( transports ),
+-
+-	// Main method
+-	ajax: function( url, options ) {
+-
+-		// If url is an object, simulate pre-1.5 signature
+-		if ( typeof url === "object" ) {
+-			options = url;
+-			url = undefined;
+-		}
+-
+-		// Force options to be an object
+-		options = options || {};
+-
+-		var transport,
+-
+-			// URL without anti-cache param
+-			cacheURL,
+-
+-			// Response headers
+-			responseHeadersString,
+-			responseHeaders,
+-
+-			// timeout handle
+-			timeoutTimer,
+-
+-			// Url cleanup var
+-			urlAnchor,
+-
+-			// Request state (becomes false upon send and true upon completion)
+-			completed,
+-
+-			// To know if global events are to be dispatched
+-			fireGlobals,
+-
+-			// Loop variable
+-			i,
+-
+-			// uncached part of the url
+-			uncached,
+-
+-			// Create the final options object
+-			s = jQuery.ajaxSetup( {}, options ),
+-
+-			// Callbacks context
+-			callbackContext = s.context || s,
+-
+-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+-			globalEventContext = s.context &&
+-				( callbackContext.nodeType || callbackContext.jquery ) ?
+-					jQuery( callbackContext ) :
+-					jQuery.event,
+-
+-			// Deferreds
+-			deferred = jQuery.Deferred(),
+-			completeDeferred = jQuery.Callbacks( "once memory" ),
+-
+-			// Status-dependent callbacks
+-			statusCode = s.statusCode || {},
+-
+-			// Headers (they are sent all at once)
+-			requestHeaders = {},
+-			requestHeadersNames = {},
+-
+-			// Default abort message
+-			strAbort = "canceled",
+-
+-			// Fake xhr
+-			jqXHR = {
+-				readyState: 0,
+-
+-				// Builds headers hashtable if needed
+-				getResponseHeader: function( key ) {
+-					var match;
+-					if ( completed ) {
+-						if ( !responseHeaders ) {
+-							responseHeaders = {};
+-							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+-								responseHeaders[ match[ 1 ].toLowerCase() + " " ] =
+-									( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] )
+-										.concat( match[ 2 ] );
+-							}
+-						}
+-						match = responseHeaders[ key.toLowerCase() + " " ];
+-					}
+-					return match == null ? null : match.join( ", " );
+-				},
+-
+-				// Raw string
+-				getAllResponseHeaders: function() {
+-					return completed ? responseHeadersString : null;
+-				},
+-
+-				// Caches the header
+-				setRequestHeader: function( name, value ) {
+-					if ( completed == null ) {
+-						name = requestHeadersNames[ name.toLowerCase() ] =
+-							requestHeadersNames[ name.toLowerCase() ] || name;
+-						requestHeaders[ name ] = value;
+-					}
+-					return this;
+-				},
+-
+-				// Overrides response content-type header
+-				overrideMimeType: function( type ) {
+-					if ( completed == null ) {
+-						s.mimeType = type;
+-					}
+-					return this;
+-				},
+-
+-				// Status-dependent callbacks
+-				statusCode: function( map ) {
+-					var code;
+-					if ( map ) {
+-						if ( completed ) {
+-
+-							// Execute the appropriate callbacks
+-							jqXHR.always( map[ jqXHR.status ] );
+-						} else {
+-
+-							// Lazy-add the new callbacks in a way that preserves old ones
+-							for ( code in map ) {
+-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+-							}
+-						}
+-					}
+-					return this;
+-				},
+-
+-				// Cancel the request
+-				abort: function( statusText ) {
+-					var finalText = statusText || strAbort;
+-					if ( transport ) {
+-						transport.abort( finalText );
+-					}
+-					done( 0, finalText );
+-					return this;
+-				}
+-			};
+-
+-		// Attach deferreds
+-		deferred.promise( jqXHR );
+-
+-		// Add protocol if not provided (prefilters might expect it)
+-		// Handle falsy url in the settings object (#10093: consistency with old signature)
+-		// We also use the url parameter if available
+-		s.url = ( ( url || s.url || location.href ) + "" )
+-			.replace( rprotocol, location.protocol + "//" );
+-
+-		// Alias method option to type as per ticket #12004
+-		s.type = options.method || options.type || s.method || s.type;
+-
+-		// Extract dataTypes list
+-		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ];
+-
+-		// A cross-domain request is in order when the origin doesn't match the current origin.
+-		if ( s.crossDomain == null ) {
+-			urlAnchor = document.createElement( "a" );
+-
+-			// Support: IE <=8 - 11, Edge 12 - 15
+-			// IE throws exception on accessing the href property if url is malformed,
+-			// e.g. http://example.com:80x/
+-			try {
+-				urlAnchor.href = s.url;
+-
+-				// Support: IE <=8 - 11 only
+-				// Anchor's host property isn't correctly set when s.url is relative
+-				urlAnchor.href = urlAnchor.href;
+-				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
+-					urlAnchor.protocol + "//" + urlAnchor.host;
+-			} catch ( e ) {
+-
+-				// If there is an error parsing the URL, assume it is crossDomain,
+-				// it can be rejected by the transport if it is invalid
+-				s.crossDomain = true;
+-			}
+-		}
+-
+-		// Convert data if not already a string
+-		if ( s.data && s.processData && typeof s.data !== "string" ) {
+-			s.data = jQuery.param( s.data, s.traditional );
+-		}
+-
+-		// Apply prefilters
+-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+-
+-		// If request was aborted inside a prefilter, stop there
+-		if ( completed ) {
+-			return jqXHR;
+-		}
+-
+-		// We can fire global events as of now if asked to
+-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+-		fireGlobals = jQuery.event && s.global;
+-
+-		// Watch for a new set of requests
+-		if ( fireGlobals && jQuery.active++ === 0 ) {
+-			jQuery.event.trigger( "ajaxStart" );
+-		}
+-
+-		// Uppercase the type
+-		s.type = s.type.toUpperCase();
+-
+-		// Determine if request has content
+-		s.hasContent = !rnoContent.test( s.type );
+-
+-		// Save the URL in case we're toying with the If-Modified-Since
+-		// and/or If-None-Match header later on
+-		// Remove hash to simplify url manipulation
+-		cacheURL = s.url.replace( rhash, "" );
+-
+-		// More options handling for requests with no content
+-		if ( !s.hasContent ) {
+-
+-			// Remember the hash so we can put it back
+-			uncached = s.url.slice( cacheURL.length );
+-
+-			// If data is available and should be processed, append data to url
+-			if ( s.data && ( s.processData || typeof s.data === "string" ) ) {
+-				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
+-
+-				// #9682: remove data so that it's not used in an eventual retry
+-				delete s.data;
+-			}
+-
+-			// Add or update anti-cache param if needed
+-			if ( s.cache === false ) {
+-				cacheURL = cacheURL.replace( rantiCache, "$1" );
+-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+-					uncached;
+-			}
+-
+-			// Put hash and anti-cache on the URL that will be requested (gh-1732)
+-			s.url = cacheURL + uncached;
+-
+-		// Change '%20' to '+' if this is encoded form body content (gh-2658)
+-		} else if ( s.data && s.processData &&
+-			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
+-			s.data = s.data.replace( r20, "+" );
+-		}
+-
+-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+-		if ( s.ifModified ) {
+-			if ( jQuery.lastModified[ cacheURL ] ) {
+-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+-			}
+-			if ( jQuery.etag[ cacheURL ] ) {
+-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+-			}
+-		}
+-
+-		// Set the correct header, if data is being sent
+-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+-		}
+-
+-		// Set the Accepts header for the server, depending on the dataType
+-		jqXHR.setRequestHeader(
+-			"Accept",
+-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+-				s.accepts[ s.dataTypes[ 0 ] ] +
+-					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+-				s.accepts[ "*" ]
+-		);
+-
+-		// Check for headers option
+-		for ( i in s.headers ) {
+-			jqXHR.setRequestHeader( i, s.headers[ i ] );
+-		}
+-
+-		// Allow custom headers/mimetypes and early abort
+-		if ( s.beforeSend &&
+-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
+-
+-			// Abort if not done already and return
+-			return jqXHR.abort();
+-		}
+-
+-		// Aborting is no longer a cancellation
+-		strAbort = "abort";
+-
+-		// Install callbacks on deferreds
+-		completeDeferred.add( s.complete );
+-		jqXHR.done( s.success );
+-		jqXHR.fail( s.error );
+-
+-		// Get transport
+-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+-
+-		// If no transport, we auto-abort
+-		if ( !transport ) {
+-			done( -1, "No Transport" );
+-		} else {
+-			jqXHR.readyState = 1;
+-
+-			// Send global event
+-			if ( fireGlobals ) {
+-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+-			}
+-
+-			// If request was aborted inside ajaxSend, stop there
+-			if ( completed ) {
+-				return jqXHR;
+-			}
+-
+-			// Timeout
+-			if ( s.async && s.timeout > 0 ) {
+-				timeoutTimer = window.setTimeout( function() {
+-					jqXHR.abort( "timeout" );
+-				}, s.timeout );
+-			}
+-
+-			try {
+-				completed = false;
+-				transport.send( requestHeaders, done );
+-			} catch ( e ) {
+-
+-				// Rethrow post-completion exceptions
+-				if ( completed ) {
+-					throw e;
+-				}
+-
+-				// Propagate others as results
+-				done( -1, e );
+-			}
+-		}
+-
+-		// Callback for when everything is done
+-		function done( status, nativeStatusText, responses, headers ) {
+-			var isSuccess, success, error, response, modified,
+-				statusText = nativeStatusText;
+-
+-			// Ignore repeat invocations
+-			if ( completed ) {
+-				return;
+-			}
+-
+-			completed = true;
+-
+-			// Clear timeout if it exists
+-			if ( timeoutTimer ) {
+-				window.clearTimeout( timeoutTimer );
+-			}
+-
+-			// Dereference transport for early garbage collection
+-			// (no matter how long the jqXHR object will be used)
+-			transport = undefined;
+-
+-			// Cache response headers
+-			responseHeadersString = headers || "";
+-
+-			// Set readyState
+-			jqXHR.readyState = status > 0 ? 4 : 0;
+-
+-			// Determine if successful
+-			isSuccess = status >= 200 && status < 300 || status === 304;
+-
+-			// Get response data
+-			if ( responses ) {
+-				response = ajaxHandleResponses( s, jqXHR, responses );
+-			}
+-
+-			// Use a noop converter for missing script
+-			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+-				s.converters[ "text script" ] = function() {};
+-			}
+-
+-			// Convert no matter what (that way responseXXX fields are always set)
+-			response = ajaxConvert( s, response, jqXHR, isSuccess );
+-
+-			// If successful, handle type chaining
+-			if ( isSuccess ) {
+-
+-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+-				if ( s.ifModified ) {
+-					modified = jqXHR.getResponseHeader( "Last-Modified" );
+-					if ( modified ) {
+-						jQuery.lastModified[ cacheURL ] = modified;
+-					}
+-					modified = jqXHR.getResponseHeader( "etag" );
+-					if ( modified ) {
+-						jQuery.etag[ cacheURL ] = modified;
+-					}
+-				}
+-
+-				// if no content
+-				if ( status === 204 || s.type === "HEAD" ) {
+-					statusText = "nocontent";
+-
+-				// if not modified
+-				} else if ( status === 304 ) {
+-					statusText = "notmodified";
+-
+-				// If we have data, let's convert it
+-				} else {
+-					statusText = response.state;
+-					success = response.data;
+-					error = response.error;
+-					isSuccess = !error;
+-				}
+-			} else {
+-
+-				// Extract error from statusText and normalize for non-aborts
+-				error = statusText;
+-				if ( status || !statusText ) {
+-					statusText = "error";
+-					if ( status < 0 ) {
+-						status = 0;
+-					}
+-				}
+-			}
+-
+-			// Set data for the fake xhr object
+-			jqXHR.status = status;
+-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+-
+-			// Success/Error
+-			if ( isSuccess ) {
+-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+-			} else {
+-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+-			}
+-
+-			// Status-dependent callbacks
+-			jqXHR.statusCode( statusCode );
+-			statusCode = undefined;
+-
+-			if ( fireGlobals ) {
+-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+-					[ jqXHR, s, isSuccess ? success : error ] );
+-			}
+-
+-			// Complete
+-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+-
+-			if ( fireGlobals ) {
+-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+-
+-				// Handle the global AJAX counter
+-				if ( !( --jQuery.active ) ) {
+-					jQuery.event.trigger( "ajaxStop" );
+-				}
+-			}
+-		}
+-
+-		return jqXHR;
+-	},
+-
+-	getJSON: function( url, data, callback ) {
+-		return jQuery.get( url, data, callback, "json" );
+-	},
+-
+-	getScript: function( url, callback ) {
+-		return jQuery.get( url, undefined, callback, "script" );
+-	}
+-} );
+-
+-jQuery.each( [ "get", "post" ], function( _i, method ) {
+-	jQuery[ method ] = function( url, data, callback, type ) {
+-
+-		// Shift arguments if data argument was omitted
+-		if ( isFunction( data ) ) {
+-			type = type || callback;
+-			callback = data;
+-			data = undefined;
+-		}
+-
+-		// The url can be an options object (which then must have .url)
+-		return jQuery.ajax( jQuery.extend( {
+-			url: url,
+-			type: method,
+-			dataType: type,
+-			data: data,
+-			success: callback
+-		}, jQuery.isPlainObject( url ) && url ) );
+-	};
+-} );
+-
+-jQuery.ajaxPrefilter( function( s ) {
+-	var i;
+-	for ( i in s.headers ) {
+-		if ( i.toLowerCase() === "content-type" ) {
+-			s.contentType = s.headers[ i ] || "";
+-		}
+-	}
+-} );
+-
+-
+-jQuery._evalUrl = function( url, options, doc ) {
+-	return jQuery.ajax( {
+-		url: url,
+-
+-		// Make this explicit, since user can override this through ajaxSetup (#11264)
+-		type: "GET",
+-		dataType: "script",
+-		cache: true,
+-		async: false,
+-		global: false,
+-
+-		// Only evaluate the response if it is successful (gh-4126)
+-		// dataFilter is not invoked for failure responses, so using it instead
+-		// of the default converter is kludgy but it works.
+-		converters: {
+-			"text script": function() {}
+-		},
+-		dataFilter: function( response ) {
+-			jQuery.globalEval( response, options, doc );
+-		}
+-	} );
+-};
+-
+-
+-jQuery.fn.extend( {
+-	wrapAll: function( html ) {
+-		var wrap;
+-
+-		if ( this[ 0 ] ) {
+-			if ( isFunction( html ) ) {
+-				html = html.call( this[ 0 ] );
+-			}
+-
+-			// The elements to wrap the target around
+-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+-
+-			if ( this[ 0 ].parentNode ) {
+-				wrap.insertBefore( this[ 0 ] );
+-			}
+-
+-			wrap.map( function() {
+-				var elem = this;
+-
+-				while ( elem.firstElementChild ) {
+-					elem = elem.firstElementChild;
+-				}
+-
+-				return elem;
+-			} ).append( this );
+-		}
+-
+-		return this;
+-	},
+-
+-	wrapInner: function( html ) {
+-		if ( isFunction( html ) ) {
+-			return this.each( function( i ) {
+-				jQuery( this ).wrapInner( html.call( this, i ) );
+-			} );
+-		}
+-
+-		return this.each( function() {
+-			var self = jQuery( this ),
+-				contents = self.contents();
+-
+-			if ( contents.length ) {
+-				contents.wrapAll( html );
+-
+-			} else {
+-				self.append( html );
+-			}
+-		} );
+-	},
+-
+-	wrap: function( html ) {
+-		var htmlIsFunction = isFunction( html );
+-
+-		return this.each( function( i ) {
+-			jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html );
+-		} );
+-	},
+-
+-	unwrap: function( selector ) {
+-		this.parent( selector ).not( "body" ).each( function() {
+-			jQuery( this ).replaceWith( this.childNodes );
+-		} );
+-		return this;
+-	}
+-} );
+-
+-
+-jQuery.expr.pseudos.hidden = function( elem ) {
+-	return !jQuery.expr.pseudos.visible( elem );
+-};
+-jQuery.expr.pseudos.visible = function( elem ) {
+-	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
+-};
+-
+-
+-
+-
+-jQuery.ajaxSettings.xhr = function() {
+-	try {
+-		return new window.XMLHttpRequest();
+-	} catch ( e ) {}
+-};
+-
+-var xhrSuccessStatus = {
+-
+-		// File protocol always yields status code 0, assume 200
+-		0: 200,
+-
+-		// Support: IE <=9 only
+-		// #1450: sometimes IE returns 1223 when it should be 204
+-		1223: 204
+-	},
+-	xhrSupported = jQuery.ajaxSettings.xhr();
+-
+-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+-support.ajax = xhrSupported = !!xhrSupported;
+-
+-jQuery.ajaxTransport( function( options ) {
+-	var callback, errorCallback;
+-
+-	// Cross domain only allowed if supported through XMLHttpRequest
+-	if ( support.cors || xhrSupported && !options.crossDomain ) {
+-		return {
+-			send: function( headers, complete ) {
+-				var i,
+-					xhr = options.xhr();
+-
+-				xhr.open(
+-					options.type,
+-					options.url,
+-					options.async,
+-					options.username,
+-					options.password
+-				);
+-
+-				// Apply custom fields if provided
+-				if ( options.xhrFields ) {
+-					for ( i in options.xhrFields ) {
+-						xhr[ i ] = options.xhrFields[ i ];
+-					}
+-				}
+-
+-				// Override mime type if needed
+-				if ( options.mimeType && xhr.overrideMimeType ) {
+-					xhr.overrideMimeType( options.mimeType );
+-				}
+-
+-				// X-Requested-With header
+-				// For cross-domain requests, seeing as conditions for a preflight are
+-				// akin to a jigsaw puzzle, we simply never set it to be sure.
+-				// (it can always be set on a per-request basis or even using ajaxSetup)
+-				// For same-domain requests, won't change header if already provided.
+-				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+-					headers[ "X-Requested-With" ] = "XMLHttpRequest";
+-				}
+-
+-				// Set headers
+-				for ( i in headers ) {
+-					xhr.setRequestHeader( i, headers[ i ] );
+-				}
+-
+-				// Callback
+-				callback = function( type ) {
+-					return function() {
+-						if ( callback ) {
+-							callback = errorCallback = xhr.onload =
+-								xhr.onerror = xhr.onabort = xhr.ontimeout =
+-									xhr.onreadystatechange = null;
+-
+-							if ( type === "abort" ) {
+-								xhr.abort();
+-							} else if ( type === "error" ) {
+-
+-								// Support: IE <=9 only
+-								// On a manual native abort, IE9 throws
+-								// errors on any property access that is not readyState
+-								if ( typeof xhr.status !== "number" ) {
+-									complete( 0, "error" );
+-								} else {
+-									complete(
+-
+-										// File: protocol always yields status 0; see #8605, #14207
+-										xhr.status,
+-										xhr.statusText
+-									);
+-								}
+-							} else {
+-								complete(
+-									xhrSuccessStatus[ xhr.status ] || xhr.status,
+-									xhr.statusText,
+-
+-									// Support: IE <=9 only
+-									// IE9 has no XHR2 but throws on binary (trac-11426)
+-									// For XHR2 non-text, let the caller handle it (gh-2498)
+-									( xhr.responseType || "text" ) !== "text"  ||
+-									typeof xhr.responseText !== "string" ?
+-										{ binary: xhr.response } :
+-										{ text: xhr.responseText },
+-									xhr.getAllResponseHeaders()
+-								);
+-							}
+-						}
+-					};
+-				};
+-
+-				// Listen to events
+-				xhr.onload = callback();
+-				errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" );
+-
+-				// Support: IE 9 only
+-				// Use onreadystatechange to replace onabort
+-				// to handle uncaught aborts
+-				if ( xhr.onabort !== undefined ) {
+-					xhr.onabort = errorCallback;
+-				} else {
+-					xhr.onreadystatechange = function() {
+-
+-						// Check readyState before timeout as it changes
+-						if ( xhr.readyState === 4 ) {
+-
+-							// Allow onerror to be called first,
+-							// but that will not handle a native abort
+-							// Also, save errorCallback to a variable
+-							// as xhr.onerror cannot be accessed
+-							window.setTimeout( function() {
+-								if ( callback ) {
+-									errorCallback();
+-								}
+-							} );
+-						}
+-					};
+-				}
+-
+-				// Create the abort callback
+-				callback = callback( "abort" );
+-
+-				try {
+-
+-					// Do send the request (this may raise an exception)
+-					xhr.send( options.hasContent && options.data || null );
+-				} catch ( e ) {
+-
+-					// #14683: Only rethrow if this hasn't been notified as an error yet
+-					if ( callback ) {
+-						throw e;
+-					}
+-				}
+-			},
+-
+-			abort: function() {
+-				if ( callback ) {
+-					callback();
+-				}
+-			}
+-		};
+-	}
+-} );
+-
+-
+-
+-
+-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
+-jQuery.ajaxPrefilter( function( s ) {
+-	if ( s.crossDomain ) {
+-		s.contents.script = false;
+-	}
+-} );
+-
+-// Install script dataType
+-jQuery.ajaxSetup( {
+-	accepts: {
+-		script: "text/javascript, application/javascript, " +
+-			"application/ecmascript, application/x-ecmascript"
+-	},
+-	contents: {
+-		script: /\b(?:java|ecma)script\b/
+-	},
+-	converters: {
+-		"text script": function( text ) {
+-			jQuery.globalEval( text );
+-			return text;
+-		}
+-	}
+-} );
+-
+-// Handle cache's special case and crossDomain
+-jQuery.ajaxPrefilter( "script", function( s ) {
+-	if ( s.cache === undefined ) {
+-		s.cache = false;
+-	}
+-	if ( s.crossDomain ) {
+-		s.type = "GET";
+-	}
+-} );
+-
+-// Bind script tag hack transport
+-jQuery.ajaxTransport( "script", function( s ) {
+-
+-	// This transport only deals with cross domain or forced-by-attrs requests
+-	if ( s.crossDomain || s.scriptAttrs ) {
+-		var script, callback;
+-		return {
+-			send: function( _, complete ) {
+-				script = jQuery( "<script>" )
+-					.attr( s.scriptAttrs || {} )
+-					.prop( { charset: s.scriptCharset, src: s.url } )
+-					.on( "load error", callback = function( evt ) {
+-						script.remove();
+-						callback = null;
+-						if ( evt ) {
+-							complete( evt.type === "error" ? 404 : 200, evt.type );
+-						}
+-					} );
+-
+-				// Use native DOM manipulation to avoid our domManip AJAX trickery
+-				document.head.appendChild( script[ 0 ] );
+-			},
+-			abort: function() {
+-				if ( callback ) {
+-					callback();
+-				}
+-			}
+-		};
+-	}
+-} );
+-
+-
+-
+-
+-var oldCallbacks = [],
+-	rjsonp = /(=)\?(?=&|$)|\?\?/;
+-
+-// Default jsonp settings
+-jQuery.ajaxSetup( {
+-	jsonp: "callback",
+-	jsonpCallback: function() {
+-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
+-		this[ callback ] = true;
+-		return callback;
+-	}
+-} );
+-
+-// Detect, normalize options and install callbacks for jsonp requests
+-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+-
+-	var callbackName, overwritten, responseContainer,
+-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+-			"url" :
+-			typeof s.data === "string" &&
+-				( s.contentType || "" )
+-					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+-				rjsonp.test( s.data ) && "data"
+-		);
+-
+-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+-
+-		// Get callback name, remembering preexisting value associated with it
+-		callbackName = s.jsonpCallback = isFunction( s.jsonpCallback ) ?
+-			s.jsonpCallback() :
+-			s.jsonpCallback;
+-
+-		// Insert callback into url or form data
+-		if ( jsonProp ) {
+-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+-		} else if ( s.jsonp !== false ) {
+-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+-		}
+-
+-		// Use data converter to retrieve json after script execution
+-		s.converters[ "script json" ] = function() {
+-			if ( !responseContainer ) {
+-				jQuery.error( callbackName + " was not called" );
+-			}
+-			return responseContainer[ 0 ];
+-		};
+-
+-		// Force json dataType
+-		s.dataTypes[ 0 ] = "json";
+-
+-		// Install callback
+-		overwritten = window[ callbackName ];
+-		window[ callbackName ] = function() {
+-			responseContainer = arguments;
+-		};
+-
+-		// Clean-up function (fires after converters)
+-		jqXHR.always( function() {
+-
+-			// If previous value didn't exist - remove it
+-			if ( overwritten === undefined ) {
+-				jQuery( window ).removeProp( callbackName );
+-
+-			// Otherwise restore preexisting value
+-			} else {
+-				window[ callbackName ] = overwritten;
+-			}
+-
+-			// Save back as free
+-			if ( s[ callbackName ] ) {
+-
+-				// Make sure that re-using the options doesn't screw things around
+-				s.jsonpCallback = originalSettings.jsonpCallback;
+-
+-				// Save the callback name for future use
+-				oldCallbacks.push( callbackName );
+-			}
+-
+-			// Call if it was a function and we have a response
+-			if ( responseContainer && isFunction( overwritten ) ) {
+-				overwritten( responseContainer[ 0 ] );
+-			}
+-
+-			responseContainer = overwritten = undefined;
+-		} );
+-
+-		// Delegate to script
+-		return "script";
+-	}
+-} );
+-
+-
+-
+-
+-// Support: Safari 8 only
+-// In Safari 8 documents created via document.implementation.createHTMLDocument
+-// collapse sibling forms: the second one becomes a child of the first one.
+-// Because of that, this security measure has to be disabled in Safari 8.
+-// https://bugs.webkit.org/show_bug.cgi?id=137337
+-support.createHTMLDocument = ( function() {
+-	var body = document.implementation.createHTMLDocument( "" ).body;
+-	body.innerHTML = "<form></form><form></form>";
+-	return body.childNodes.length === 2;
+-} )();
+-
+-
+-// Argument "data" should be string of html
+-// context (optional): If specified, the fragment will be created in this context,
+-// defaults to document
+-// keepScripts (optional): If true, will include scripts passed in the html string
+-jQuery.parseHTML = function( data, context, keepScripts ) {
+-	if ( typeof data !== "string" ) {
+-		return [];
+-	}
+-	if ( typeof context === "boolean" ) {
+-		keepScripts = context;
+-		context = false;
+-	}
+-
+-	var base, parsed, scripts;
+-
+-	if ( !context ) {
+-
+-		// Stop scripts or inline event handlers from being executed immediately
+-		// by using document.implementation
+-		if ( support.createHTMLDocument ) {
+-			context = document.implementation.createHTMLDocument( "" );
+-
+-			// Set the base href for the created document
+-			// so any parsed elements with URLs
+-			// are based on the document's URL (gh-2965)
+-			base = context.createElement( "base" );
+-			base.href = document.location.href;
+-			context.head.appendChild( base );
+-		} else {
+-			context = document;
+-		}
+-	}
+-
+-	parsed = rsingleTag.exec( data );
+-	scripts = !keepScripts && [];
+-
+-	// Single tag
+-	if ( parsed ) {
+-		return [ context.createElement( parsed[ 1 ] ) ];
+-	}
+-
+-	parsed = buildFragment( [ data ], context, scripts );
+-
+-	if ( scripts && scripts.length ) {
+-		jQuery( scripts ).remove();
+-	}
+-
+-	return jQuery.merge( [], parsed.childNodes );
+-};
+-
+-
+-/**
+- * Load a url into a page
+- */
+-jQuery.fn.load = function( url, params, callback ) {
+-	var selector, type, response,
+-		self = this,
+-		off = url.indexOf( " " );
+-
+-	if ( off > -1 ) {
+-		selector = stripAndCollapse( url.slice( off ) );
+-		url = url.slice( 0, off );
+-	}
+-
+-	// If it's a function
+-	if ( isFunction( params ) ) {
+-
+-		// We assume that it's the callback
+-		callback = params;
+-		params = undefined;
+-
+-	// Otherwise, build a param string
+-	} else if ( params && typeof params === "object" ) {
+-		type = "POST";
+-	}
+-
+-	// If we have elements to modify, make the request
+-	if ( self.length > 0 ) {
+-		jQuery.ajax( {
+-			url: url,
+-
+-			// If "type" variable is undefined, then "GET" method will be used.
+-			// Make value of this field explicit since
+-			// user can override it through ajaxSetup method
+-			type: type || "GET",
+-			dataType: "html",
+-			data: params
+-		} ).done( function( responseText ) {
+-
+-			// Save response for use in complete callback
+-			response = arguments;
+-
+-			self.html( selector ?
+-
+-				// If a selector was specified, locate the right elements in a dummy div
+-				// Exclude scripts to avoid IE 'Permission Denied' errors
+-				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+-
+-				// Otherwise use the full result
+-				responseText );
+-
+-		// If the request succeeds, this function gets "data", "status", "jqXHR"
+-		// but they are ignored because response was set above.
+-		// If it fails, this function gets "jqXHR", "status", "error"
+-		} ).always( callback && function( jqXHR, status ) {
+-			self.each( function() {
+-				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+-			} );
+-		} );
+-	}
+-
+-	return this;
+-};
+-
+-
+-
+-
+-jQuery.expr.pseudos.animated = function( elem ) {
+-	return jQuery.grep( jQuery.timers, function( fn ) {
+-		return elem === fn.elem;
+-	} ).length;
+-};
+-
+-
+-
+-
+-jQuery.offset = {
+-	setOffset: function( elem, options, i ) {
+-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+-			position = jQuery.css( elem, "position" ),
+-			curElem = jQuery( elem ),
+-			props = {};
+-
+-		// Set position first, in-case top/left are set even on static elem
+-		if ( position === "static" ) {
+-			elem.style.position = "relative";
+-		}
+-
+-		curOffset = curElem.offset();
+-		curCSSTop = jQuery.css( elem, "top" );
+-		curCSSLeft = jQuery.css( elem, "left" );
+-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+-			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
+-
+-		// Need to be able to calculate position if either
+-		// top or left is auto and position is either absolute or fixed
+-		if ( calculatePosition ) {
+-			curPosition = curElem.position();
+-			curTop = curPosition.top;
+-			curLeft = curPosition.left;
+-
+-		} else {
+-			curTop = parseFloat( curCSSTop ) || 0;
+-			curLeft = parseFloat( curCSSLeft ) || 0;
+-		}
+-
+-		if ( isFunction( options ) ) {
+-
+-			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+-			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
+-		}
+-
+-		if ( options.top != null ) {
+-			props.top = ( options.top - curOffset.top ) + curTop;
+-		}
+-		if ( options.left != null ) {
+-			props.left = ( options.left - curOffset.left ) + curLeft;
+-		}
+-
+-		if ( "using" in options ) {
+-			options.using.call( elem, props );
+-
+-		} else {
+-			if ( typeof props.top === "number" ) {
+-				props.top += "px";
+-			}
+-			if ( typeof props.left === "number" ) {
+-				props.left += "px";
+-			}
+-			curElem.css( props );
+-		}
+-	}
+-};
+-
+-jQuery.fn.extend( {
+-
+-	// offset() relates an element's border box to the document origin
+-	offset: function( options ) {
+-
+-		// Preserve chaining for setter
+-		if ( arguments.length ) {
+-			return options === undefined ?
+-				this :
+-				this.each( function( i ) {
+-					jQuery.offset.setOffset( this, options, i );
+-				} );
+-		}
+-
+-		var rect, win,
+-			elem = this[ 0 ];
+-
+-		if ( !elem ) {
+-			return;
+-		}
+-
+-		// Return zeros for disconnected and hidden (display: none) elements (gh-2310)
+-		// Support: IE <=11 only
+-		// Running getBoundingClientRect on a
+-		// disconnected node in IE throws an error
+-		if ( !elem.getClientRects().length ) {
+-			return { top: 0, left: 0 };
+-		}
+-
+-		// Get document-relative position by adding viewport scroll to viewport-relative gBCR
+-		rect = elem.getBoundingClientRect();
+-		win = elem.ownerDocument.defaultView;
+-		return {
+-			top: rect.top + win.pageYOffset,
+-			left: rect.left + win.pageXOffset
+-		};
+-	},
+-
+-	// position() relates an element's margin box to its offset parent's padding box
+-	// This corresponds to the behavior of CSS absolute positioning
+-	position: function() {
+-		if ( !this[ 0 ] ) {
+-			return;
+-		}
+-
+-		var offsetParent, offset, doc,
+-			elem = this[ 0 ],
+-			parentOffset = { top: 0, left: 0 };
+-
+-		// position:fixed elements are offset from the viewport, which itself always has zero offset
+-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+-
+-			// Assume position:fixed implies availability of getBoundingClientRect
+-			offset = elem.getBoundingClientRect();
+-
+-		} else {
+-			offset = this.offset();
+-
+-			// Account for the *real* offset parent, which can be the document or its root element
+-			// when a statically positioned element is identified
+-			doc = elem.ownerDocument;
+-			offsetParent = elem.offsetParent || doc.documentElement;
+-			while ( offsetParent &&
+-				( offsetParent === doc.body || offsetParent === doc.documentElement ) &&
+-				jQuery.css( offsetParent, "position" ) === "static" ) {
+-
+-				offsetParent = offsetParent.parentNode;
+-			}
+-			if ( offsetParent && offsetParent !== elem && offsetParent.nodeType === 1 ) {
+-
+-				// Incorporate borders into its offset, since they are outside its content origin
+-				parentOffset = jQuery( offsetParent ).offset();
+-				parentOffset.top += jQuery.css( offsetParent, "borderTopWidth", true );
+-				parentOffset.left += jQuery.css( offsetParent, "borderLeftWidth", true );
+-			}
+-		}
+-
+-		// Subtract parent offsets and element margins
+-		return {
+-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
+-		};
+-	},
+-
+-	// This method will return documentElement in the following cases:
+-	// 1) For the element inside the iframe without offsetParent, this method will return
+-	//    documentElement of the parent window
+-	// 2) For the hidden or detached element
+-	// 3) For body or html element, i.e. in case of the html node - it will return itself
+-	//
+-	// but those exceptions were never presented as a real life use-cases
+-	// and might be considered as more preferable results.
+-	//
+-	// This logic, however, is not guaranteed and can change at any point in the future
+-	offsetParent: function() {
+-		return this.map( function() {
+-			var offsetParent = this.offsetParent;
+-
+-			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
+-				offsetParent = offsetParent.offsetParent;
+-			}
+-
+-			return offsetParent || documentElement;
+-		} );
+-	}
+-} );
+-
+-// Create scrollLeft and scrollTop methods
+-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+-	var top = "pageYOffset" === prop;
+-
+-	jQuery.fn[ method ] = function( val ) {
+-		return access( this, function( elem, method, val ) {
+-
+-			// Coalesce documents and windows
+-			var win;
+-			if ( isWindow( elem ) ) {
+-				win = elem;
+-			} else if ( elem.nodeType === 9 ) {
+-				win = elem.defaultView;
+-			}
+-
+-			if ( val === undefined ) {
+-				return win ? win[ prop ] : elem[ method ];
+-			}
+-
+-			if ( win ) {
+-				win.scrollTo(
+-					!top ? val : win.pageXOffset,
+-					top ? val : win.pageYOffset
+-				);
+-
+-			} else {
+-				elem[ method ] = val;
+-			}
+-		}, method, val, arguments.length );
+-	};
+-} );
+-
+-// Support: Safari <=7 - 9.1, Chrome <=37 - 49
+-// Add the top/left cssHooks using jQuery.fn.position
+-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+-// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
+-// getComputedStyle returns percent when specified for top/left/bottom/right;
+-// rather than make the css module depend on the offset module, just check for it here
+-jQuery.each( [ "top", "left" ], function( _i, prop ) {
+-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+-		function( elem, computed ) {
+-			if ( computed ) {
+-				computed = curCSS( elem, prop );
+-
+-				// If curCSS returns percentage, fallback to offset
+-				return rnumnonpx.test( computed ) ?
+-					jQuery( elem ).position()[ prop ] + "px" :
+-					computed;
+-			}
+-		}
+-	);
+-} );
+-
+-
+-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+-		function( defaultExtra, funcName ) {
+-
+-		// Margin is only for outerHeight, outerWidth
+-		jQuery.fn[ funcName ] = function( margin, value ) {
+-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+-
+-			return access( this, function( elem, type, value ) {
+-				var doc;
+-
+-				if ( isWindow( elem ) ) {
+-
+-					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
+-					return funcName.indexOf( "outer" ) === 0 ?
+-						elem[ "inner" + name ] :
+-						elem.document.documentElement[ "client" + name ];
+-				}
+-
+-				// Get document width or height
+-				if ( elem.nodeType === 9 ) {
+-					doc = elem.documentElement;
+-
+-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+-					// whichever is greatest
+-					return Math.max(
+-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+-						elem.body[ "offset" + name ], doc[ "offset" + name ],
+-						doc[ "client" + name ]
+-					);
+-				}
+-
+-				return value === undefined ?
+-
+-					// Get width or height on the element, requesting but not forcing parseFloat
+-					jQuery.css( elem, type, extra ) :
+-
+-					// Set width or height on the element
+-					jQuery.style( elem, type, value, extra );
+-			}, type, chainable ? margin : undefined, chainable );
+-		};
+-	} );
+-} );
+-
+-
+-jQuery.each( [
+-	"ajaxStart",
+-	"ajaxStop",
+-	"ajaxComplete",
+-	"ajaxError",
+-	"ajaxSuccess",
+-	"ajaxSend"
+-], function( _i, type ) {
+-	jQuery.fn[ type ] = function( fn ) {
+-		return this.on( type, fn );
+-	};
+-} );
+-
+-
+-
+-
+-jQuery.fn.extend( {
+-
+-	bind: function( types, data, fn ) {
+-		return this.on( types, null, data, fn );
+-	},
+-	unbind: function( types, fn ) {
+-		return this.off( types, null, fn );
+-	},
+-
+-	delegate: function( selector, types, data, fn ) {
+-		return this.on( types, selector, data, fn );
+-	},
+-	undelegate: function( selector, types, fn ) {
+-
+-		// ( namespace ) or ( selector, types [, fn] )
+-		return arguments.length === 1 ?
+-			this.off( selector, "**" ) :
+-			this.off( types, selector || "**", fn );
+-	},
+-
+-	hover: function( fnOver, fnOut ) {
+-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+-	}
+-} );
+-
+-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+-	function( _i, name ) {
+-
+-		// Handle event binding
+-		jQuery.fn[ name ] = function( data, fn ) {
+-			return arguments.length > 0 ?
+-				this.on( name, null, data, fn ) :
+-				this.trigger( name );
+-		};
+-	} );
+-
+-
+-
+-
+-// Support: Android <=4.0 only
+-// Make sure we trim BOM and NBSP
+-var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+-
+-// Bind a function to a context, optionally partially applying any
+-// arguments.
+-// jQuery.proxy is deprecated to promote standards (specifically Function#bind)
+-// However, it is not slated for removal any time soon
+-jQuery.proxy = function( fn, context ) {
+-	var tmp, args, proxy;
+-
+-	if ( typeof context === "string" ) {
+-		tmp = fn[ context ];
+-		context = fn;
+-		fn = tmp;
+-	}
+-
+-	// Quick check to determine if target is callable, in the spec
+-	// this throws a TypeError, but we will just return undefined.
+-	if ( !isFunction( fn ) ) {
+-		return undefined;
+-	}
+-
+-	// Simulated bind
+-	args = slice.call( arguments, 2 );
+-	proxy = function() {
+-		return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+-	};
+-
+-	// Set the guid of unique handler to the same of original handler, so it can be removed
+-	proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+-
+-	return proxy;
+-};
+-
+-jQuery.holdReady = function( hold ) {
+-	if ( hold ) {
+-		jQuery.readyWait++;
+-	} else {
+-		jQuery.ready( true );
+-	}
+-};
+-jQuery.isArray = Array.isArray;
+-jQuery.parseJSON = JSON.parse;
+-jQuery.nodeName = nodeName;
+-jQuery.isFunction = isFunction;
+-jQuery.isWindow = isWindow;
+-jQuery.camelCase = camelCase;
+-jQuery.type = toType;
+-
+-jQuery.now = Date.now;
+-
+-jQuery.isNumeric = function( obj ) {
+-
+-	// As of jQuery 3.0, isNumeric is limited to
+-	// strings and numbers (primitives or objects)
+-	// that can be coerced to finite numbers (gh-2662)
+-	var type = jQuery.type( obj );
+-	return ( type === "number" || type === "string" ) &&
+-
+-		// parseFloat NaNs numeric-cast false positives ("")
+-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+-		// subtraction forces infinities to NaN
+-		!isNaN( obj - parseFloat( obj ) );
+-};
+-
+-jQuery.trim = function( text ) {
+-	return text == null ?
+-		"" :
+-		( text + "" ).replace( rtrim, "" );
+-};
+-
+-
+-
+-// Register as a named AMD module, since jQuery can be concatenated with other
+-// files that may use define, but not via a proper concatenation script that
+-// understands anonymous AMD modules. A named AMD is safest and most robust
+-// way to register. Lowercase jquery is used because AMD module names are
+-// derived from file names, and jQuery is normally delivered in a lowercase
+-// file name. Do this after creating the global so that if an AMD module wants
+-// to call noConflict to hide this version of jQuery, it will work.
+-
+-// Note that for maximum portability, libraries that are not jQuery should
+-// declare themselves as anonymous modules, and avoid setting a global if an
+-// AMD loader is present. jQuery is a special case. For more information, see
+-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+-
+-if ( typeof define === "function" && define.amd ) {
+-	define( "jquery", [], function() {
+-		return jQuery;
+-	} );
+-}
+-
+-
+-
+-
+-var
+-
+-	// Map over jQuery in case of overwrite
+-	_jQuery = window.jQuery,
+-
+-	// Map over the $ in case of overwrite
+-	_$ = window.$;
+-
+-jQuery.noConflict = function( deep ) {
+-	if ( window.$ === jQuery ) {
+-		window.$ = _$;
+-	}
+-
+-	if ( deep && window.jQuery === jQuery ) {
+-		window.jQuery = _jQuery;
+-	}
+-
+-	return jQuery;
+-};
+-
+-// Expose jQuery and $ identifiers, even in AMD
+-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+-// and CommonJS for browser emulators (#13566)
+-if ( typeof noGlobal === "undefined" ) {
+-	window.jQuery = window.$ = jQuery;
+-}
+-
+-
+-
+-
+-return jQuery;
+-} );
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html b/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
+deleted file mode 100644
+index e5dbc037505..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/showSimulationTrace.html
++++ /dev/null
+@@ -1,376 +0,0 @@
+-<!--
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License. See accompanying LICENSE file.
+--->
+-<!doctype>
+-<html>
+-<head>
+-  <meta charset="utf-8">
+-  <link rel="stylesheet" href="css/bootstrap.min.css" media="screen">
+-  <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+-  <style type="text/css">
+-    body {
+-    font: 20px sans-serif;
+-    }
+-
+-    .axis path,
+-    .axis line {
+-    fill: none;
+-    stroke: #000;
+-    shape-rendering: crispEdges;
+-    }
+-    .axis text {
+-    font-family: sans-serif;
+-    font-size: 20px;
+-    }
+-
+-    .line {
+-    fill: none;
+-    stroke: steelblue;
+-    stroke-width: 3px;
+-    }
+-
+-    .legend {
+-    padding: 1px;
+-    font: 18px sans-serif;
+-    background: yellow;
+-    box-shadow: 2px 2px 1px #888;
+-    }
+-
+-    .title {
+-    font: 24px sans-serif;
+-    }
+-    .divborder {
+-    border-width: 1px;
+-    border-style: solid;
+-    border-color: black;
+-    margin-top:10px
+-    }
+-  </style>
+-  <script src="js/thirdparty/d3.v3.js"></script>
+-  <script src="js/thirdparty/jquery.js"></script>
+-  <script src="js/thirdparty/bootstrap.min.js"></script>
+-
+-</head>
+-
+-<body>
+-<div class="row">
+-  <div class="offset5" style="margin-top:20px; margin-bottom:20px">
+-    Select the generated metrics log file (realtimetrack.json): <input type='file' id='jsonfile' /> <input type='button' value='Generate !' onClick='draw()' /><br>
+-  </div>
+-</div>
+-
+-<div>
+-  <div id="error-div" style="display:none">
+-    <div class="alert alert-danger" role="alert" style="margin-left:20%; margin-right:20%">
+-      <span id="error-message"></span>
+-      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+-        <span aria-hidden="true">&times;</span>
+-      </button>
+-    </div>
+-  </div>
+-</div>
+-
+-<div id="data" style="display:none;">
+-  <div class="row">
+-    <div class="divborder span8 chart-area" style="margin-left:50px" id="area1"></div>
+-    <div class="divborder span8 chart-area" id="area2"></div>
+-  </div>
+-
+-  <div class="row">
+-    <div class="divborder span8 chart-area" style="margin-left:50px" id="area3"></div>
+-    <div class="divborder span8 chart-area" id="area4"></div>
+-  </div>
+-
+-  <div class="row">
+-    <div class="divborder span8 chart-area" style="margin-left:50px" id="area5"></div>
+-    <div class="divborder span8 chart-area" id="area6"></div>
+-  </div>
+-
+-  <div class="row">
+-    <div class="divborder span8 " style="margin-left:50px" id="area7"></div>
+-    <div class="span7 chart-area" id="area8"></div>
+-  </div>
+-  <div class="row">
+-    <div class="divborder span8 chart-area" style="margin-left:50px" id="area9"></div>
+-    <div class="divborder span8 chart-area" id="area10"></div>
+-  </div>
+-</div>
+-<p>&nbsp;</p>
+-<script>
+-// select file and draw
+-function draw() {
+-  $("#error-div").css("display", "none");
+-  var filepath = document.getElementById('jsonfile').value;
+-  if (filepath) {
+-    $(".chart-area").empty();
+-    filepath = filepath.replace("C:\\fakepath\\", "");
+-    drawCharts(filepath);
+-  } else {
+-    $("#error-message").html("Please choose file.");
+-    $("#error-div").css("display", "block");
+-    $("#data").css("display", "none");
+-  }
+-}
+-
+-function drawCharts(filepath) {
+-  $.getJSON(filepath, function(data) {
+-    var numQueues = 0;
+-    var queueNames = new Array();
+-    for (var j in data[0]) {
+-      if (j.substring(0, 'queue'.length) === 'queue') {
+-        queueNames[numQueues] = j;
+-        numQueues ++;
+-      }
+-    }
+-    numQueues /= 2;
+-
+-    // create graph
+-    $.getJSON(filepath, function(data) {
+-      var basetime = data[0].time;
+-      data.forEach(function(d) {
+-        d.time = (d.time - basetime) / 1000;
+-      });
+-
+-      var legends = ["running.applications", "running.containers"];
+-      drawEachChart("#area1", data, legends, "Cluster running applications & containers", "Number", 0, 0);
+-      legends = ["jvm.free.memory", "jvm.max.memory", "jvm.total.memory"];
+-      drawEachChart("#area2", data, legends, "JVM memory", "Memory (GB)", 0, 0);
+-      legends = ["cluster.allocated.memory", "cluster.available.memory"];
+-      drawEachChart("#area3", data, legends, "Cluster allocated & available memory", "Memory (GB)", 0, 0);
+-      legends = ["cluster.allocated.vcores", "cluster.available.vcores"];
+-      drawEachChart("#area4", data, legends, "Cluster allocated & available vcores", "Number", 0, 0);
+-
+-      for (var i = 0; i < numQueues; i ++) {
+-        legends[i] = queueNames[i * 2];
+-      }
+-      drawEachChart("#area5", data, legends, "Queue allocated memory", "Memory (GB)", 1, 100);
+-      for (var i = 0; i < numQueues; i ++) {
+-        legends[i] = queueNames[i * 2 + 1];
+-      }
+-      drawEachChart("#area6", data, legends, "Queue allocated vcores", "VCores", 1, 90);
+-
+-      legends = [
+-        "scheduler.allocate.timecost",
+-        "scheduler.handle-NODE_ADDED.timecost", "scheduler.handle-NODE_REMOVED.timecost",
+-        "scheduler.handle-NODE_UPDATE.timecost", "scheduler.handle-APP_ADDED.timecost",
+-        "scheduler.handle-APP_REMOVED.timecost", "scheduler.handle-CONTAINER_EXPIRED.timecost"
+-      ];
+-      drawEachChart("#area7", data, legends, "Scheduler allocate & handle operations timecost", "Timecost (ms)", 0, 210);
+-
+-      // Node usage stats
+-      legends = [
+-        "nodes.memory.unused", "nodes.memory.1to19pctUsed",
+-        "nodes.memory.20to39pctUsed", "nodes.memory.40to59pctUsed",
+-        "nodes.memory.60to79pctUsed","nodes.memory.80to99pctUsed",
+-        "nodes.memory.full"
+-      ];
+-      drawEachChart("#area9", data, legends, "Cluster nodes memory usage", "Node count", 1, 0);
+-
+-      legends = [
+-        "nodes.vcores.unused", "nodes.vcores.1to19pctUsed",
+-        "nodes.vcores.20to39pctUsed", "nodes.vcores.40to59pctUsed",
+-        "nodes.vcores.60to79pctUsed", "nodes.vcores.80to99pctUsed",
+-        "nodes.vcores.full"
+-      ];
+-      drawEachChart("#area10", data, legends, "Cluster nodes vcores usage", "Node count", 1, 0);
+-    });
+-  }).done(function() {
+-    $("#data").css("display", "block");
+-  }).fail(function(jqxhr, textStatus, error) {
+-    $("#error-message").html(String(error));
+-    $("#error-div").css("display", "block");
+-    $("#data").css("display", "none");
+-  });
+-}
+-
+-// draw different chart
+-function drawEachChart(chartArea, data, legends, title, yLabelTitle, isArea, pl) {
+-  // drawchart
+-  var margin = {top: 50, right: 250, bottom: 50, left: 70};
+-  var width = 800 - margin.left - margin.right;
+-  var height = 420 - margin.top - margin.bottom;
+-
+-  var x = d3.scale.linear().range([0, width]);
+-  var y = d3.scale.linear().range([height, 0]);
+-  var xAxis = d3.svg.axis().scale(x).orient("bottom");
+-  var yAxis = d3.svg.axis().scale(y).orient("left");
+-
+-  var color = d3.scale.category10();
+-
+-  if (isArea == 1) {
+-    var area = d3.svg.area()
+-      .x(function(d) { return x(d.time); })
+-      .y0(function(d) { return y(d.y0); })
+-      .y1(function(d) { return y(d.y0 + d.y); });
+-
+-    var stack = d3.layout.stack()
+-      .values(function(d) { return d.values; });
+-
+-    // create chart
+-    var svg = d3.select(chartArea).append("svg")
+-      .attr("width", width + margin.left + margin.right)
+-      .attr("height", height + margin.top + margin.bottom)
+-      .append("g")
+-      .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+-
+-    color.domain(d3.keys(data[0])
+-      .filter(function(key) {return $.inArray(key, legends) !== -1; }));
+-
+-    var points = stack(color.domain().map(function(name) {
+-      return {
+-        name: name,
+-        values: data.map(function(d) {
+-          return {time: d.time, y: d[name]};
+-        })
+-      };
+-    }));
+-
+-    // x & y
+-    x.domain(d3.extent(data, function(d) { return d.time; }));
+-    y.domain([
+-      d3.min(points, function(c) {
+-      return 0.9 * d3.min(c.values, function(v) { return v.y; }); }),
+-      d3.max(points, function(c) {
+-        return 1.1 * d3.max(c.values, function(v) { return v.y + v.y0; }); })
+-      ]);
+-
+-    svg.append("g").attr("class", "x axis")
+-      .attr("transform", "translate(0," + height + ")")
+-      .call(xAxis)
+-      .append("text")
+-      .attr("transform", "translate(" + (width / 2) + ", 45)")
+-      .style("text-anchor", "middle")
+-      .text("Time (s)");
+-
+-    svg.append("g")
+-      .attr("class", "y axis")
+-      .call(yAxis)
+-      .append("text")
+-      .attr("transform", "rotate(-90)")
+-      .attr("y", 0 - margin.left)
+-      .attr("x",0 - (height / 2))
+-      .attr("dy", "1em")
+-      .style("text-anchor", "middle")
+-      .text(yLabelTitle);
+-
+-    var point = svg.selectAll(".point")
+-      .data(points)
+-      .enter().append("g");
+-
+-    point.append("path")
+-      .attr("class", "area")
+-      .attr("d", function(d) { return area(d.values); })
+-      .style("fill", function(d) { return color(d.name); });
+-  } else {
+-    // lines
+-    var line = d3.svg.line()
+-      .interpolate("basis")
+-      .x(function(d) { return x(d.time); })
+-      .y(function(d) { return y(d.value); });
+-
+-    // create chart
+-    var svg = d3.select(chartArea).append("svg")
+-      .attr("id", title)
+-      .attr("width", width + margin.left + margin.right)
+-      .attr("height", height + margin.top + margin.bottom)
+-      .append("g")
+-      .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+-
+-    color.domain(d3.keys(data[0])
+-      .filter(function(key) {return $.inArray(key, legends) !== -1; }));
+-
+-    var values = color.domain().map(function(name) {
+-      return {
+-        name: name,
+-        values: data.map(function(d) {
+-          return {time: d.time, value: +d[name]};
+-        })
+-      };
+-    });
+-
+-    // x & y
+-    x.domain(d3.extent(data, function(d) { return d.time; }));
+-    y.domain([
+-      d3.min(values, function(c) { return 0.9 * d3.min(c.values, function(v) { return v.value; }); }),
+-      d3.max(values, function(c) { return 1.1 * d3.max(c.values, function(v) { return v.value; }); })
+-    ]);
+-
+-    svg.append("g").attr("class", "x axis")
+-      .attr("transform", "translate(0," + height + ")")
+-      .call(xAxis)
+-      .append("text")
+-      .attr("transform", "translate(" + (width / 2) + ", 45)")
+-      .style("text-anchor", "middle")
+-      .text("Time (s)");
+-
+-    svg.append("g")
+-      .attr("class", "y axis")
+-      .call(yAxis)
+-      .append("text")
+-      .attr("transform", "rotate(-90)")
+-      .attr("y", 0 - margin.left)
+-      .attr("x",0 - (height / 2))
+-      .attr("dy", "1em")
+-      .style("text-anchor", "middle")
+-      .text(yLabelTitle);
+-
+-    var value = svg.selectAll(".city")
+-      .data(values)
+-      .enter().append("g")
+-      .attr("class", "city");
+-
+-    value.append("path")
+-      .attr("class", "line")
+-      .attr("d", function(d) { return line(d.values); })
+-      .style("stroke", function(d) { return color(d.name); });
+-  }
+-
+-  // title
+-  svg.append("text")
+-    .attr("x", (width / 2))
+-    .attr("y", 10 - (margin.top / 2))
+-    .attr("text-anchor", "middle")
+-    .text(title);
+-
+-  // legend
+-  var legend = svg.append("g")
+-    .attr("class", "legend")
+-    .attr("x", width - 50)
+-    .attr("y", 25)
+-    .attr("height", 120)
+-    .attr("width", 140);
+-
+-  legend.selectAll('g').data(legends)
+-    .enter()
+-    .append('g')
+-    .each(function(d, i) {
+-      var g = d3.select(this);
+-      g.append("rect")
+-        .attr("x", width - 5 - pl)
+-        .attr("y", i*20 + 0)
+-        .attr("width", 10)
+-        .attr("height", 10)
+-        .style("fill", color(d));
+-
+-      g.append("text")
+-        .attr("x", width + 15 - pl)
+-        .attr("y", i * 20 + 8)
+-        .attr("height",30)
+-        .attr("width",250)
+-        .style("fill", color(d))
+-        .text(d);
+-    });
+-}
+-</script>
+-</body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template b/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
+deleted file mode 100644
+index 5e78fb20118..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/simulate.html.template
++++ /dev/null
+@@ -1,306 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-      <link rel="stylesheet" href="css/bootstrap.min.css" media="screen">
+-      <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+-      <style type="text/css">
+-        body '{' font: 15px sans-serif; '}'
+-        .axis path,
+-        .axis line '{' fill: none; stroke: #000; shape-rendering: crispEdges; '}'
+-        .axis text '{' font-family: sans-serif; font-size: 12px; '}'
+-        .line '{' fill: none; stroke: steelblue; stroke-width: 2px; '}'
+-        .legend '{'
+-          padding: 3px;
+-          font: 10px sans-serif;
+-          background: yellow;
+-          box-shadow: 2px 2px 1px #888;
+-        '}'
+-        .title '{' font: 20px sans-serif; '}'
+-        .divborder '{'
+-          border-width: 1px;
+-          border-style: solid;
+-          border-color: black;
+-          margin-top:10px
+-        '}'
+-      </style>
+-      <script src="js/thirdparty/d3.v3.js"></script>
+-      <script src="js/thirdparty/jquery.js"></script>
+-      <script src="js/thirdparty/bootstrap.min.js"></script>
+-    </head>
+-  <body>
+-    <div class="row">
+-      <div class="span10 offset2"><br>
+-        <input type="button" style="float: right;" value="Stop"
+-               onClick="stop()" />
+-      </div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area1"></div>
+-      <div class="divborder span8" style="margin-left:50px" id="area2"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area3"></div>
+-      <div class="divborder span8" style="margin-left:50px" id="area4"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area5"></div>
+-      <div class="divborder span8" style="margin-left:50px" id="area6"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area7"></div>
+-      <div class="divborder span8" style="margin-left:50px" id="area8"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area9"></div>
+-      <div class="divborder span8" style="margin-left:50px" id="area10"></div>
+-    </div><br/><br/>
+-
+-    <script>
+-      var basetime = 0;
+-      var running = 1;
+-      var data = [];
+-      var width, height;
+-      var legends = [];
+-      var titles = [];
+-      var yLabels = [];
+-      var isAreas = [];
+-      var svgs = [];
+-      var xs = [];
+-      var ys = [];
+-      var xAxiss = [];
+-      var yAxiss = [];
+-      var lineAreas = [];
+-      var stacks = [];
+-
+-      // legends
+-      legends[0] = [''running.applications'', ''running.containers''];
+-      legends[1] = [''jvm.free.memory'', ''jvm.max.memory'', ''jvm.total.memory''];
+-      legends[2] = [''cluster.allocated.memory'', ''cluster.available.memory''];
+-      legends[3] = [''cluster.allocated.vcores'', ''cluster.available.vcores''];
+-      legends[4] = [];
+-      legends[5] = [];
+-      {0}
+-      legends[6] = [''scheduler.allocate.timecost'',
+-                    ''scheduler.handle-NODE_ADDED.timecost'',
+-                    ''scheduler.handle-NODE_REMOVED.timecost'',
+-                    ''scheduler.handle-NODE_UPDATE.timecost'',
+-                    ''scheduler.handle-APP_ADDED.timecost'',
+-                    ''scheduler.handle-APP_REMOVED.timecost'',
+-                    ''scheduler.handle-CONTAINER_EXPIRED.timecost'',
+-                    ''scheduler.commit.success.timecost'',
+-                    ''scheduler.commit.failure.timecost''];
+-      legends[7] = [''scheduler.commit.success.throughput'',
+-                    ''scheduler.commit.failure.throughput''];
+-      legends[8] = [''nodes.memory.unused'',
+-                    ''nodes.memory.1to19pctUsed'',
+-                    ''nodes.memory.20to39pctUsed'',
+-                    ''nodes.memory.40to59pctUsed'',
+-                    ''nodes.memory.60to79pctUsed'',
+-                    ''nodes.memory.80to99pctUsed'',
+-                    ''nodes.memory.full''];
+-      legends[9] = [''nodes.vcores.unused'',
+-                    ''nodes.vcores.1to19pctUsed'',
+-                    ''nodes.vcores.20to39pctUsed'',
+-                    ''nodes.vcores.40to59pctUsed'',
+-                    ''nodes.vcores.60to79pctUsed'',
+-                    ''nodes.vcores.80to99pctUsed'',
+-                    ''nodes.vcores.full''];
+-
+-      // title
+-      titles[0] = ''Cluster running applications & containers'';
+-      titles[1] = ''JVM memory'';
+-      titles[2] = ''Cluster allocated & available memory'';
+-      titles[3] = ''Cluster allocated & available vcores'';
+-      titles[4] = ''Queue allocated memory'';
+-      titles[5] = ''Queue allocated vcores'';
+-      titles[6] = ''Scheduler allocate & handle & commit operation timecost'';
+-      titles[7] = ''Scheduler commit success/failure operation throughput'';
+-      titles[8] = ''Cluster nodes memory usage'';
+-      titles[9] = ''Cluster nodes vcores usage'';
+-
+-      // ylabels
+-      yLabels[0] = ''Number'';
+-      yLabels[1] = ''Memory (GB)'';
+-      yLabels[2] = ''Memory (GB)'';
+-      yLabels[3] = ''Number'';
+-      yLabels[4] = ''Memory (GB)'';
+-      yLabels[5] = ''Number'';
+-      yLabels[6] = ''Timecost (ms)'';
+-      yLabels[7] = ''Number'';
+-      yLabels[8] = ''Number'';
+-      yLabels[9] = ''Number'';
+-
+-      // is area?
+-      isAreas = [0, 0, 0, 0, 1, 1, 0, 0, 1, 1];
+-
+-      // draw all charts
+-      for (var i = 0; i < 10; i ++) '{'
+-        drawEachChart(i);
+-      '}'
+-
+-      // draw each chart
+-      function drawEachChart(index) '{'
+-        var margin = '{'top: 50, right: 225, bottom: 50, left: 85'}';
+-        width = 770 - margin.left - margin.right;
+-        height = 420 - margin.top - margin.bottom;
+-
+-      xs[index] = d3.scale.linear().range([0, width]);
+-      ys[index] = d3.scale.linear().range([height, 0]);
+-      xAxiss[index] = d3.svg.axis().scale(xs[index]).orient(''bottom'');
+-      yAxiss[index] = d3.svg.axis().scale(ys[index]).orient(''left'');
+-
+-      if (isAreas[index] == 1)'{'
+-        lineAreas[index] = d3.svg.area()
+-                            .x(function(d) '{' return xs[index](d.time); '}')
+-                            .y0(function(d) '{' return ys[index](d.y0); '}')
+-                            .y1(function(d) '{' return ys[index](d.y0 + d.y); '}');
+-
+-        stacks[index] = d3.layout.stack()
+-                          .values(function(d) '{' return d.values; '}');
+-      '}' else '{'
+-        lineAreas[index] = d3.svg.line()
+-                            .interpolate(''basis'')
+-                            .x(function(d) '{' return xs[index](d.time); '}')
+-                            .y(function(d) '{' return ys[index](d.value); '}');
+-      '}'
+-
+-      svgs[index] = d3.select(''#area'' + (index + 1)).append(''svg'')
+-        .attr(''width'', width + margin.left + margin.right)
+-        .attr(''height'', height + margin.top + margin.bottom)
+-        .append(''g'')
+-        .attr(''transform'', ''translate('' + margin.left + '','' + margin.top + '')'');
+-
+-      // x, y and title
+-      svgs[index].append(''text'')
+-        .attr(''transform'', ''translate('' + (width / 2) + '' ,'' +
+-              (height + margin.bottom - 10 ) + '')'')
+-        .style(''text-anchor'', ''middle'')
+-        .text(''Time ({1})'');
+-
+-      svgs[index].append(''text'')
+-        .attr(''transform'', ''rotate(-90)'')
+-        .attr(''y'', 0 - margin.left)
+-        .attr(''x'',0 - (height / 2))
+-        .attr(''dy'', ''1em'')
+-        .style(''text-anchor'', ''middle'')
+-        .text(yLabels[index]);
+-
+-      svgs[index].append(''text'')
+-        .attr(''x'', (width / 2))
+-        .attr(''y'', 10 - (margin.top / 2))
+-        .attr(''text-anchor'', ''middle'')
+-        .text(titles[index]);
+-    '}'
+-
+-    // request data
+-    function requestData() '{'
+-      $.ajax('{'url: ''simulateMetrics'',
+-        success: function(point) '{'
+-          // update data
+-          if (basetime == 0)  basetime = point.time;
+-          point.time = (point.time - basetime) / {2};
+-          data.push(point);
+-
+-          // clear old
+-          for (var i = 0; i < 10; i ++) '{'
+-            svgs[i].selectAll(''g.tick'').remove();
+-            svgs[i].selectAll(''g'').remove();
+-            var color = d3.scale.category10();
+-            color.domain(d3.keys(data[0]).filter(function(key) '{'
+-              return $.inArray(key, legends[i]) !== -1;
+-            '}'));
+-
+-            var values;
+-            if (isAreas[i] == 1) '{'
+-              values = stacks[i](color.domain().map(function(name) '{'
+-                return '{'
+-                  name: name,
+-                  values: data.map(function(d) '{'
+-                    return '{'time: d.time, y: d[name]'}';
+-                  '}')
+-                '}'
+-              '}'));
+-              xs[i].domain(d3.extent(data, function(d) '{' return d.time;'}'));
+-              ys[i].domain([
+-                d3.min(values, function(c) '{' return 0; '}'),
+-                d3.max(values, function(c) '{' return 1.1 * d3.max(c.values,
+-                                        function(v) '{' return v.y + v.y0; '}'); '}')
+-              ]);
+-            '}' else '{'
+-              values = color.domain().map(function(name) '{'
+-                return '{'
+-                  name: name,
+-                  values: data.map(function(d) '{'
+-                    return '{'time: d.time, value: d[name]'}';
+-                  '}')
+-                '}'
+-              '}');
+-              xs[i].domain(d3.extent(data, function(d) '{' return d.time;'}'));
+-              ys[i].domain([
+-                d3.min(values, function(c) '{' return 0; '}'),
+-                d3.max(values, function(c) '{' return 1.1 * d3.max(c.values,
+-                                        function(v) '{' return v.value; '}'); '}')
+-              ]);
+-            '}'
+-
+-            svgs[i].append(''g'').attr(''class'', ''x axis'')
+-              .attr(''transform'', ''translate(0,'' + height + '')'').call(xAxiss[i]);
+-
+-            svgs[i].append(''g'').attr(''class'', ''y axis'').call(yAxiss[i]);
+-
+-            var value = svgs[i].selectAll(''.path'')
+-              .data(values).enter().append(''g'').attr(''class'', ''line'');
+-
+-            if(isAreas[i] == 1) '{'
+-              value.append(''path'').attr(''class'', ''area'')
+-                    .attr(''d'', function(d) '{'return lineAreas[i](d.values); '}')
+-                    .style(''fill'', function(d) '{'return color(d.name); '}');
+-            '}' else '{'
+-              value.append(''path'').attr(''class'', ''line'')
+-                    .attr(''d'', function(d) '{'return lineAreas[i](d.values); '}')
+-                    .style(''stroke'', function(d) '{'return color(d.name); '}');
+-            '}'
+-
+-            // legend
+-            var legend = svgs[i].append(''g'')
+-              .attr(''class'', ''legend'')
+-              .attr(''x'', width + 5)
+-              .attr(''y'', 25)
+-              .attr(''height'', 120)
+-              .attr(''width'', 140);
+-            legend.selectAll(''g'').data(legends[i])
+-              .enter()
+-              .append(''g'')
+-              .each(function(d, i) '{'
+-                var g = d3.select(this);
+-                g.append(''rect'')
+-                  .attr(''x'', width + 5)
+-                  .attr(''y'', i*20)
+-                  .attr(''width'', 10)
+-                  .attr(''height'', 10)
+-                  .style(''fill'', color(d));
+-                g.append(''text'')
+-                  .attr(''x'', width + 25)
+-                  .attr(''y'', i * 20 + 8)
+-                  .attr(''height'',30)
+-                  .attr(''width'',250)
+-                  .style(''fill'', color(d))
+-                  .text(d);
+-              '}');
+-            '}'
+-
+-            if(running == 1)
+-              setTimeout(requestData, {3});
+-          '}',
+-          cache: false
+-        '}');
+-      '}'
+-
+-      // stop
+-      function stop() '{'
+-        running = 0;
+-      '}'
+-      requestData();
+-    </script>
+-  </body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template b/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
+deleted file mode 100644
+index ead508fed9a..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/simulate.info.html.template
++++ /dev/null
+@@ -1,50 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <style type="text/css">
+-      .td1 '{'
+-        border-width: 1px;
+-        padding: 8px;
+-        border-style: solid;
+-        border-color: #666666;
+-        background-color: #dedede;
+-        width: 50%;
+-      '}'
+-      table.gridtable '{'
+-        font-family: verdana,arial,sans-serif;
+-        font-size:11px;
+-        color:#333333;
+-        border-width: 1px;
+-        border-color: #666666;
+-        border-collapse: collapse;
+-        margin-top: 80px;
+-      '}'
+-      .td2 '{'
+-        border-width: 1px;
+-        padding: 8px;
+-        border-style: solid;
+-        border-color: #666666;
+-        background-color: #ffffff;
+-        width: 50%;
+-      '}'
+-    </style>
+-  </head>
+-  <body>
+-    <table class="gridtable" align="center" width="400px">
+-      <tr>
+-        <td colspan="2" class="td2" align="center">
+-          <b>SLS Simulate Information</b>
+-        </td>
+-      </tr>
+-      {0}
+-      <tr>
+-        <td align="center" height="80px">
+-          <a href="simulate">Simulation Charts</a>
+-        </td>
+-        <td align="center">
+-          <a href="track">Tracked Jobs & Queues</a>
+-        </td>
+-      </tr>
+-    </table>
+-  </body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/main/html/track.html.template b/hadoop-tools/hadoop-sls/src/main/html/track.html.template
+deleted file mode 100644
+index 5522b9f7796..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/html/track.html.template
++++ /dev/null
+@@ -1,193 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <link rel="stylesheet" href="css/bootstrap.min.css" media="screen">
+-    <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+-    <style type="text/css">
+-      body '{' font: 20px sans-serif;'}'
+-      .axis path,
+-      .axis line '{' fill: none; stroke: #000; shape-rendering: crispEdges;'}'
+-      .axis text '{' font-family: sans-serif; font-size: 20px; '}'
+-      .line '{' fill: none; stroke: steelblue; stroke-width: 3px; '}'
+-      .legend '{' padding: 5px; font: 18px sans-serif; background: yellow;
+-                box-shadow: 2px 2px 1px #888;'}'
+-      .title '{' font: 24px sans-serif; '}'
+-      .divborder '{' border-width: 1px; border-style: solid; border-color: black;
+-                    margin-top:10px '}'
+-    </style>
+-    <script src="js/thirdparty/d3.v3.js"></script>
+-    <script src="js/thirdparty/jquery.js"></script>
+-    <script src="js/thirdparty/bootstrap.min.js"></script>
+-  </head>
+-  <body>
+-    <div class="row">
+-      <div class="offset4 span8"><br/><br/><br/>
+-        Select Tracked Job/Queue:
+-        <select id="trackedSelect" onchange="redrawChart()">
+-          <option>----Queue----</option>
+-          {0}
+-          <option>----Job----</option>
+-          {1}
+-        </select>
+-        <input type="button" style="float: right;" value="Stop"
+-               onClick="stop()" />
+-      </div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span9 offset4" id="area1"></div>
+-    </div>
+-    <script>
+-      // global variables
+-      var basetime = 0;
+-      var running = 1;
+-      var para = '''';
+-      var data = [];
+-      var path, line, svg;
+-      var x, y;
+-      var width, height;
+-      var xAxis, yAxis;
+-      var legends = [''usage.memory'', ''demand.memory'', ''maxshare.memory'',
+-                      ''minshare.memory'', ''fairshare.memory''];
+-
+-      // stop function
+-      function stop() '{'
+-        running = 0;
+-      '}'
+-
+-      // select changed event
+-      function redrawChart() '{'
+-        var value = $(''#trackedSelect'').val();
+-        if (value.substring(0, ''Job ''.length) === ''Job ''
+-                      || value.substring(0, ''Queue ''.length) === ''Queue '') '{'
+-          para = value;
+-          running = 0;
+-          basetime = 0;
+-          data = [];
+-          $(''#area1'').empty();
+-          drawChart(''Tracking '' + value);
+-          running = 1;
+-          requestData();
+-        }
+-      }
+-
+-      // draw chart
+-      function drawChart(title) '{'
+-        // location
+-        var margin = '{'top: 50, right: 150, bottom: 50, left: 80'}';
+-        width = 800 - margin.left - margin.right;
+-        height = 420 - margin.top - margin.bottom;
+-        x = d3.scale.linear().range([0, width]);
+-        y = d3.scale.linear().range([height, 0]);
+-        xAxis = d3.svg.axis().scale(x).orient(''bottom'');
+-        yAxis = d3.svg.axis().scale(y).orient(''left'');
+-        // lines
+-        line = d3.svg.line().interpolate(''basis'')
+-                .x(function(d) '{' return x(d.time); })
+-                .y(function(d) '{' return y(d.value); });
+-        // create chart
+-        svg = d3.select(''#area1'').append(''svg'')
+-                .attr(''width'', width + margin.left + margin.right)
+-                .attr(''height'', height + margin.top + margin.bottom)
+-                .append(''g'')
+-                .attr(''transform'', ''translate('' + margin.left + '','' + margin.top + '')'');
+-        // axis labels
+-        svg.append(''text'')
+-                .attr(''transform'', ''translate('' + (width / 2) + '','' + (height + margin.bottom - 5 ) + '')'')
+-                .style(''text-anchor'', ''middle'')
+-                .text(''Time ({2})'');
+-        svg.append(''text'')
+-                .attr(''transform'', ''rotate(-90)'')
+-                .attr(''y'', 0 - margin.left)
+-                .attr(''x'',0 - (height / 2))
+-                .attr(''dy'', ''1em'')
+-                .style(''text-anchor'', ''middle'')
+-                .text(''Memory (GB)'');
+-        // title
+-        svg.append(''text'')
+-                .attr(''x'', (width / 2))
+-                .attr(''y'', 10 - (margin.top / 2))
+-                .attr(''text-anchor'', ''middle'')
+-                .text(title);
+-      '}'
+-
+-      // request data
+-      function requestData() '{'
+-        $.ajax('{'url: ''trackMetrics?t='' + para,
+-          success: function(point) '{'
+-            // clear old
+-            svg.selectAll(''g.tick'').remove();
+-            svg.selectAll(''g'').remove();
+-
+-          if(basetime == 0)  basetime = point.time;
+-          point.time = (point.time - basetime)/{3};
+-          data.push(point);
+-
+-          var color = d3.scale.category10();
+-          color.domain(d3.keys(data[0]).filter(function(key) '{'
+-            return $.inArray(key, legends) !== -1;
+-          '}'));
+-
+-          var values = color.domain().map(function(name) '{'
+-            return '{'
+-              name: name,
+-              values: data.map(function(d) '{'
+-                return '{' time: d.time, value: d[name]'}';
+-              '}')
+-            '}';
+-          '}');
+-
+-          // set x/y range
+-          x.domain(d3.extent(data, function(d) '{' return d.time; '}'));
+-          y.domain([
+-            d3.min(values, function(c) '{' return 0 '}'),
+-            d3.max(values, function(c) '{' return 1.1 * d3.max(c.values, function(v) '{' return v.value; '}'); '}')
+-          ]);
+-
+-          svg.append(''g'').attr(''class'', ''x axis'')
+-            .attr(''transform'', ''translate(0,'' + height + '')'').call(xAxis);
+-          svg.append(''g'').attr(''class'', ''y axis'').call(yAxis);
+-          var value = svg.selectAll(''.path'')
+-            .data(values).enter().append(''g'').attr(''class'', ''line'');
+-
+-          value.append(''path'').attr(''class'', ''line'')
+-            .attr(''d'', function(d) '{'return line(d.values); '}')
+-            .style(''stroke'', function(d) '{'return color(d.name); '}');
+-
+-          // legend
+-          var legend = svg.append(''g'')
+-            .attr(''class'', ''legend'')
+-            .attr(''x'', width + 5)
+-            .attr(''y'', 25)
+-            .attr(''height'', 120)
+-            .attr(''width'', 180);
+-
+-          legend.selectAll(''g'').data(legends)
+-            .enter()
+-            .append(''g'')
+-            .each(function(d, i) '{'
+-              var g = d3.select(this);
+-              g.append(''rect'')
+-                .attr(''x'', width + 5)
+-                .attr(''y'', i * 20)
+-                .attr(''width'', 10)
+-                .attr(''height'', 10)
+-                .style(''fill'', color(d));
+-
+-              g.append(''text'')
+-                .attr(''x'', width + 25)
+-                .attr(''y'', i * 20 + 8)
+-                .attr(''height'',30)
+-                .attr(''width'',250)
+-                .style(''fill'', color(d))
+-                .text(d);
+-            '}');
+-
+-          if(running == 1)
+-            setTimeout(requestData, {4});
+-        '}',
+-        cache: false
+-      '}');
+-    '}'
+-  </script>
+-</body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinition.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinition.java
+deleted file mode 100644
+index 1f9e351c429..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinition.java
++++ /dev/null
+@@ -1,105 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-
+-import java.util.List;
+-
+-public abstract class AMDefinition {
+-  protected int jobCount;
+-  protected String amType;
+-  protected String user;
+-  protected String queue;
+-  protected long jobStartTime;
+-  protected long jobFinishTime;
+-  protected List<ContainerSimulator> taskContainers;
+-  protected Resource amResource;
+-  protected String labelExpression;
+-  protected String oldAppId;
+-
+-  public AMDefinition(AmDefinitionBuilder builder) {
+-    this.jobStartTime = builder.jobStartTime;
+-    this.jobFinishTime = builder.jobFinishTime;
+-    this.amType = builder.amType;
+-    this.taskContainers = builder.taskContainers;
+-    this.labelExpression = builder.labelExpression;
+-    this.user = builder.user;
+-    this.amResource = builder.amResource;
+-    this.queue = builder.queue;
+-    this.jobCount = builder.jobCount;
+-    this.oldAppId = builder.jobId;
+-  }
+-
+-  public String getAmType() {
+-    return amType;
+-  }
+-
+-  public String getUser() {
+-    return user;
+-  }
+-
+-  public String getOldAppId() {
+-    return oldAppId;
+-  }
+-
+-  public long getJobStartTime() {
+-    return jobStartTime;
+-  }
+-
+-  public long getJobFinishTime() {
+-    return jobFinishTime;
+-  }
+-
+-  public List<ContainerSimulator> getTaskContainers() {
+-    return taskContainers;
+-  }
+-
+-  public Resource getAmResource() {
+-    return amResource;
+-  }
+-
+-  public String getLabelExpression() {
+-    return labelExpression;
+-  }
+-
+-  public String getQueue() {
+-    return queue;
+-  }
+-
+-  public int getJobCount() {
+-    return jobCount;
+-  }
+-
+-
+-  public abstract static class AmDefinitionBuilder {
+-    private static final String DEFAULT_USER = "default";
+-
+-    protected int jobCount = 1;
+-    protected String amType = AMDefinitionFactory.DEFAULT_JOB_TYPE;
+-    protected String user = DEFAULT_USER;
+-    protected String queue;
+-    protected String jobId;
+-    protected long jobStartTime;
+-    protected long jobFinishTime;
+-    protected List<ContainerSimulator> taskContainers;
+-    protected Resource amResource;
+-    protected String labelExpression = null;
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionFactory.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionFactory.java
+deleted file mode 100644
+index 61975f04a37..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionFactory.java
++++ /dev/null
+@@ -1,133 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.tools.rumen.LoggedJob;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthJob;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-public final class AMDefinitionFactory {
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      AMDefinitionFactory.class);
+-  public final static String DEFAULT_JOB_TYPE = "mapreduce";
+-
+-  private AMDefinitionFactory() {}
+-
+-  public static AMDefinitionSLS createFromSlsTrace(Map<String, String> jsonJob,
+-      SLSRunner slsRunner) throws YarnException {
+-    AMDefinitionSLS amDefinition = AMDefinitionSLS.Builder.create(jsonJob)
+-        .withAmType(SLSConfiguration.AM_TYPE)
+-        .withAmResource(getAMContainerResourceSLS(jsonJob, slsRunner))
+-        .withTaskContainers(
+-            AMDefinitionSLS.getTaskContainers(jsonJob, slsRunner))
+-        .withJobStartTime(SLSConfiguration.JOB_START_MS)
+-        .withJobFinishTime(SLSConfiguration.JOB_END_MS)
+-        .withLabelExpression(SLSConfiguration.JOB_LABEL_EXPR)
+-        .withUser(SLSConfiguration.JOB_USER)
+-        .withQueue(SLSConfiguration.JOB_QUEUE_NAME)
+-        .withJobId(SLSConfiguration.JOB_ID)
+-        .withJobCount(SLSConfiguration.JOB_COUNT)
+-        .build();
+-    slsRunner.increaseQueueAppNum(amDefinition.getQueue());
+-    return amDefinition;
+-  }
+-
+-  public static AMDefinitionRumen createFromRumenTrace(LoggedJob job,
+-      long baselineTimeMs, SLSRunner slsRunner) throws YarnException {
+-    AMDefinitionRumen amDefinition = AMDefinitionRumen.Builder.create()
+-        .withAmType(DEFAULT_JOB_TYPE)
+-        .withAmResource(getAMContainerResourceSynthAndRumen(slsRunner))
+-        .withTaskContainers(
+-            AMDefinitionRumen.getTaskContainers(job, slsRunner))
+-        .withJobStartTime(job.getSubmitTime())
+-        .withJobFinishTime(job.getFinishTime())
+-        .withBaseLineTimeMs(baselineTimeMs)
+-        .withUser(job.getUser())
+-        .withQueue(job.getQueue().getValue())
+-        .withJobId(job.getJobID().toString())
+-        .build();
+-    slsRunner.increaseQueueAppNum(amDefinition.getQueue());
+-    return amDefinition;
+-  }
+-
+-  public static AMDefinitionSynth createFromSynth(SynthJob job,
+-      SLSRunner slsRunner) throws YarnException {
+-    AMDefinitionSynth amDefinition =
+-        AMDefinitionSynth.Builder.create()
+-            .withAmType(job.getType())
+-            .withAmResource(getAMContainerResourceSynthAndRumen(slsRunner))
+-            .withTaskContainers(
+-                AMDefinitionSynth.getTaskContainers(job, slsRunner))
+-            .withUser(job.getUser())
+-            .withQueue(job.getQueueName())
+-            .withJobId(job.getJobID().toString())
+-            .withJobStartTime(job.getSubmissionTime())
+-            .withJobFinishTime(job.getSubmissionTime() + job.getDuration())
+-            .withBaseLineTimeMs(0)
+-            .build();
+-
+-    slsRunner.increaseQueueAppNum(amDefinition.getQueue());
+-    return amDefinition;
+-  }
+-
+-  private static Resource getAMContainerResourceSLS(Map<String, String> jsonJob,
+-      Configured configured) {
+-    Resource amContainerResource =
+-        SLSConfiguration.getAMContainerResource(configured.getConf());
+-    if (jsonJob == null) {
+-      return amContainerResource;
+-    }
+-
+-    ResourceInformation[] infors = ResourceUtils.getResourceTypesArray();
+-    for (ResourceInformation info : infors) {
+-      String key = SLSConfiguration.JOB_AM_PREFIX + info.getName();
+-      if (jsonJob.containsKey(key)) {
+-        long value = Long.parseLong(jsonJob.get(key));
+-        amContainerResource.setResourceValue(info.getName(), value);
+-      }
+-    }
+-
+-    return amContainerResource;
+-  }
+-
+-  private static Resource getAMContainerResourceSynthAndRumen(
+-      Configured configured) {
+-    return SLSConfiguration.getAMContainerResource(configured.getConf());
+-  }
+-
+-  static void adjustTimeValuesToBaselineTime(AMDefinition amDef,
+-      AMDefinition.AmDefinitionBuilder builder, long baselineTimeMs) {
+-    builder.jobStartTime -= baselineTimeMs;
+-    builder.jobFinishTime -= baselineTimeMs;
+-    if (builder.jobStartTime < 0) {
+-      LOG.warn("Warning: reset job {} start time to 0.", amDef.getOldAppId());
+-      builder.jobFinishTime = builder.jobFinishTime - builder.jobStartTime;
+-      builder.jobStartTime = 0;
+-    }
+-    amDef.jobStartTime = builder.jobStartTime;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionRumen.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionRumen.java
+deleted file mode 100644
+index cc97a90ec00..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionRumen.java
++++ /dev/null
+@@ -1,167 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.tools.rumen.LoggedJob;
+-import org.apache.hadoop.tools.rumen.LoggedTask;
+-import org.apache.hadoop.tools.rumen.LoggedTaskAttempt;
+-import org.apache.hadoop.tools.rumen.datatypes.UserName;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.apache.hadoop.yarn.sls.AMDefinitionFactory.adjustTimeValuesToBaselineTime;
+-
+-public class AMDefinitionRumen extends AMDefinition {
+-  public final static int DEFAULT_MAPPER_PRIORITY = 20;
+-  private final static int DEFAULT_REDUCER_PRIORITY = 10;
+-
+-  public AMDefinitionRumen(AmDefinitionBuilder builder) {
+-    super(builder);
+-  }
+-
+-  public static List<ContainerSimulator> getTaskContainers(LoggedJob job,
+-      SLSRunner slsRunner) throws YarnException {
+-    List<ContainerSimulator> containerList = new ArrayList<>();
+-
+-    TaskContainerDefinition.Builder builder =
+-        TaskContainerDefinition.Builder.create()
+-            .withCount(1)
+-            .withResource(slsRunner.getDefaultContainerResource())
+-            .withExecutionType(ExecutionType.GUARANTEED)
+-            .withAllocationId(-1)
+-            .withRequestDelay(0);
+-
+-    // mapper
+-    for (LoggedTask mapTask : job.getMapTasks()) {
+-      if (mapTask.getAttempts().size() == 0) {
+-        throw new YarnException("Invalid map task, no attempt for a mapper!");
+-      }
+-      LoggedTaskAttempt taskAttempt =
+-          mapTask.getAttempts().get(mapTask.getAttempts().size() - 1);
+-      TaskContainerDefinition containerDef = builder
+-          .withHostname(taskAttempt.getHostName().getValue())
+-          .withDuration(taskAttempt.getFinishTime() -
+-              taskAttempt.getStartTime())
+-          .withPriority(DEFAULT_MAPPER_PRIORITY)
+-          .withType("map")
+-          .build();
+-      containerList.add(
+-          ContainerSimulator.createFromTaskContainerDefinition(containerDef));
+-    }
+-
+-    // reducer
+-    for (LoggedTask reduceTask : job.getReduceTasks()) {
+-      if (reduceTask.getAttempts().size() == 0) {
+-        throw new YarnException(
+-            "Invalid reduce task, no attempt for a reducer!");
+-      }
+-      LoggedTaskAttempt taskAttempt =
+-          reduceTask.getAttempts().get(reduceTask.getAttempts().size() - 1);
+-      TaskContainerDefinition containerDef = builder
+-          .withHostname(taskAttempt.getHostName().getValue())
+-          .withDuration(taskAttempt.getFinishTime() -
+-              taskAttempt.getStartTime())
+-          .withPriority(DEFAULT_REDUCER_PRIORITY)
+-          .withType("reduce")
+-          .build();
+-      containerList.add(
+-          ContainerSimulator.createFromTaskContainerDefinition(containerDef));
+-    }
+-
+-    return containerList;
+-  }
+-
+-
+-  public static final class Builder extends AmDefinitionBuilder {
+-    private long baselineTimeMs;
+-
+-    private Builder() {
+-    }
+-
+-    public static Builder create() {
+-      return new Builder();
+-    }
+-
+-    public Builder withAmType(String amType) {
+-      this.amType = amType;
+-      return this;
+-    }
+-
+-    public Builder withUser(UserName user) {
+-      if (user != null) {
+-        this.user = user.getValue();
+-      }
+-      return this;
+-    }
+-
+-    public Builder withQueue(String queue) {
+-      this.queue = queue;
+-      return this;
+-    }
+-
+-    public Builder withJobId(String oldJobId) {
+-      this.jobId = oldJobId;
+-      return this;
+-    }
+-
+-    public Builder withJobStartTime(long time) {
+-      this.jobStartTime = time;
+-      return this;
+-    }
+-
+-    public Builder withJobFinishTime(long time) {
+-      this.jobFinishTime = time;
+-      return this;
+-    }
+-
+-    public Builder withBaseLineTimeMs(long baselineTimeMs) {
+-      this.baselineTimeMs = baselineTimeMs;
+-      return this;
+-    }
+-
+-    public Builder withLabelExpression(String expr) {
+-      this.labelExpression = expr;
+-      return this;
+-    }
+-
+-    public AMDefinitionRumen.Builder withTaskContainers(
+-        List<ContainerSimulator> taskContainers) {
+-      this.taskContainers = taskContainers;
+-      return this;
+-    }
+-
+-    public AMDefinitionRumen.Builder withAmResource(Resource amResource) {
+-      this.amResource = amResource;
+-      return this;
+-    }
+-
+-    public AMDefinitionRumen build() {
+-      AMDefinitionRumen amDef = new AMDefinitionRumen(this);
+-
+-      if (baselineTimeMs == 0) {
+-        baselineTimeMs = jobStartTime;
+-      }
+-      adjustTimeValuesToBaselineTime(amDef, this, baselineTimeMs);
+-      return amDef;
+-    }
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSLS.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSLS.java
+deleted file mode 100644
+index a84c9240cb6..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSLS.java
++++ /dev/null
+@@ -1,185 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-
+-public class AMDefinitionSLS extends AMDefinition {
+-  public AMDefinitionSLS(AmDefinitionBuilder builder) {
+-    super(builder);
+-  }
+-
+-  public String getQueue() {
+-    return queue;
+-  }
+-
+-  public static List<ContainerSimulator> getTaskContainers(Map<String, ?> jsonJob,
+-      SLSRunner slsRunner) throws YarnException {
+-    List<Map<String, String>> tasks = (List) jsonJob.get(SLSConfiguration.JOB_TASKS);
+-    if (tasks == null || tasks.size() == 0) {
+-      throw new YarnException("No task for the job!");
+-    }
+-
+-    List<ContainerSimulator> containers = new ArrayList<>();
+-    for (Map<String, String> jsonTask : tasks) {
+-      TaskContainerDefinition containerDef =
+-          TaskContainerDefinition.Builder.create()
+-              .withCount(jsonTask, SLSConfiguration.COUNT)
+-              .withHostname(jsonTask.get(SLSConfiguration.TASK_HOST))
+-              .withDuration(jsonTask, SLSConfiguration.TASK_DURATION_MS)
+-              .withDurationLegacy(jsonTask, SLSConfiguration.DURATION_MS)
+-              .withTaskStart(jsonTask, SLSConfiguration.TASK_START_MS)
+-              .withTaskFinish(jsonTask, SLSConfiguration.TASK_END_MS)
+-              .withResource(getResourceForContainer(jsonTask, slsRunner))
+-              .withPriority(jsonTask, SLSConfiguration.TASK_PRIORITY)
+-              .withType(jsonTask, SLSConfiguration.TASK_TYPE)
+-              .withExecutionType(jsonTask, SLSConfiguration.TASK_EXECUTION_TYPE)
+-              .withAllocationId(jsonTask, SLSConfiguration.TASK_ALLOCATION_ID)
+-              .withRequestDelay(jsonTask, SLSConfiguration.TASK_REQUEST_DELAY)
+-              .build();
+-
+-      for (int i = 0; i < containerDef.getCount(); i++) {
+-        containers.add(ContainerSimulator.
+-            createFromTaskContainerDefinition(containerDef));
+-      }
+-    }
+-    return containers;
+-  }
+-
+-  private static Resource getResourceForContainer(Map<String, String> jsonTask,
+-      SLSRunner slsRunner) {
+-    Resource res = slsRunner.getDefaultContainerResource();
+-    ResourceInformation[] infors = ResourceUtils.getResourceTypesArray();
+-    for (ResourceInformation info : infors) {
+-      if (jsonTask.containsKey(SLSConfiguration.TASK_PREFIX + info.getName())) {
+-        long value = Long.parseLong(
+-            jsonTask.get(SLSConfiguration.TASK_PREFIX + info.getName()));
+-        res.setResourceValue(info.getName(), value);
+-      }
+-    }
+-    return res;
+-  }
+-
+-  public static final class Builder extends AmDefinitionBuilder {
+-    private final Map<String, String> jsonJob;
+-
+-    private Builder(Map<String, String> jsonJob) {
+-      this.jsonJob = jsonJob;
+-    }
+-
+-    public static Builder create(Map<String, String> jsonJob) {
+-      return new Builder(jsonJob);
+-    }
+-
+-    public Builder withAmType(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        String amType = jsonJob.get(key);
+-        if (amType != null) {
+-          this.amType = amType;
+-        }
+-      }
+-      return this;
+-    }
+-
+-    public Builder withUser(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        String user = jsonJob.get(key);
+-        if (user != null) {
+-          this.user = user;
+-        }
+-      }
+-      return this;
+-    }
+-
+-    public Builder withQueue(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        this.queue = jsonJob.get(key);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withJobId(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        this.jobId = jsonJob.get(key);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withJobCount(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        jobCount = Integer.parseInt(jsonJob.get(key));
+-        jobCount = Math.max(jobCount, 1);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withJobStartTime(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        this.jobStartTime = Long.parseLong(jsonJob.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withJobFinishTime(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        this.jobFinishTime = Long.parseLong(jsonJob.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withLabelExpression(String key) {
+-      if (jsonJob.containsKey(key)) {
+-        this.labelExpression = jsonJob.get(key);
+-      }
+-      return this;
+-    }
+-
+-    public AMDefinitionSLS.Builder withTaskContainers(
+-        List<ContainerSimulator> taskContainers) {
+-      this.taskContainers = taskContainers;
+-      return this;
+-    }
+-
+-    public AMDefinitionSLS.Builder withAmResource(Resource amResource) {
+-      this.amResource = amResource;
+-      return this;
+-    }
+-
+-    public AMDefinitionSLS build() {
+-      AMDefinitionSLS amDef = new AMDefinitionSLS(this);
+-      // Job id is generated automatically if this job configuration allows
+-      // multiple job instances
+-      if (jobCount > 1) {
+-        amDef.oldAppId = null;
+-      } else {
+-        amDef.oldAppId = jobId;
+-      }
+-      amDef.jobCount = jobCount;
+-      return amDef;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSynth.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSynth.java
+deleted file mode 100644
+index db736f06f72..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMDefinitionSynth.java
++++ /dev/null
+@@ -1,146 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import static org.apache.hadoop.yarn.sls.AMDefinitionFactory.adjustTimeValuesToBaselineTime;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Random;
+-
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthJob;
+-
+-public class AMDefinitionSynth extends AMDefinition {
+-  public AMDefinitionSynth(AmDefinitionBuilder builder) {
+-    super(builder);
+-  }
+-
+-  public static List<ContainerSimulator> getTaskContainers(
+-      SynthJob job, SLSRunner slsRunner) throws YarnException {
+-    List<ContainerSimulator> containerList = new ArrayList<>();
+-    ArrayList<NodeId> keyAsArray = new ArrayList<>(
+-        slsRunner.getNmMap().keySet());
+-    Random rand = new Random(slsRunner.getStjp().getSeed());
+-
+-    for (SynthJob.SynthTask task : job.getTasks()) {
+-      RMNode node = getRandomNode(slsRunner, keyAsArray, rand);
+-      TaskContainerDefinition containerDef =
+-          TaskContainerDefinition.Builder.create()
+-              .withCount(1)
+-              .withHostname("/" + node.getRackName() + "/" + node.getHostName())
+-              .withDuration(task.getTime())
+-              .withResource(Resource
+-                  .newInstance((int) task.getMemory(), (int) task.getVcores()))
+-              .withPriority(task.getPriority())
+-              .withType(task.getType())
+-              .withExecutionType(task.getExecutionType())
+-              .withAllocationId(-1)
+-              .withRequestDelay(0)
+-              .build();
+-      containerList.add(
+-          ContainerSimulator.createFromTaskContainerDefinition(containerDef));
+-    }
+-
+-    return containerList;
+-  }
+-
+-  private static RMNode getRandomNode(SLSRunner slsRunner,
+-      ArrayList<NodeId> keyAsArray, Random rand) {
+-    int randomIndex = rand.nextInt(keyAsArray.size());
+-    return slsRunner.getNmMap().get(keyAsArray.get(randomIndex)).getNode();
+-  }
+-
+-  public static final class Builder extends AmDefinitionBuilder {
+-    private long baselineTimeMs;
+-
+-    private Builder() {
+-    }
+-
+-    public static Builder create() {
+-      return new Builder();
+-    }
+-
+-    public Builder withAmType(String amType) {
+-      this.amType = amType;
+-      return this;
+-    }
+-
+-    public Builder withUser(String user) {
+-      if (user != null) {
+-        this.user = user;
+-      }
+-      return this;
+-    }
+-
+-    public Builder withQueue(String queue) {
+-      this.queue = queue;
+-      return this;
+-    }
+-
+-    public Builder withJobId(String oldJobId) {
+-      this.jobId = oldJobId;
+-      return this;
+-    }
+-
+-    public Builder withJobStartTime(long time) {
+-      this.jobStartTime = time;
+-      return this;
+-    }
+-
+-    public Builder withJobFinishTime(long time) {
+-      this.jobFinishTime = time;
+-      return this;
+-    }
+-
+-    public Builder withBaseLineTimeMs(long baselineTimeMs) {
+-      this.baselineTimeMs = baselineTimeMs;
+-      return this;
+-    }
+-
+-    public AMDefinitionSynth.Builder withLabelExpression(String expr) {
+-      this.labelExpression = expr;
+-      return this;
+-    }
+-
+-    public AMDefinitionSynth.Builder withTaskContainers(
+-        List<ContainerSimulator> taskContainers) {
+-      this.taskContainers = taskContainers;
+-      return this;
+-    }
+-
+-    public AMDefinitionSynth.Builder withAmResource(Resource amResource) {
+-      this.amResource = amResource;
+-      return this;
+-    }
+-
+-    public AMDefinitionSynth build() {
+-      AMDefinitionSynth amDef = new AMDefinitionSynth(this);
+-
+-      if (baselineTimeMs == 0) {
+-        baselineTimeMs = jobStartTime;
+-      }
+-      adjustTimeValuesToBaselineTime(amDef, this, baselineTimeMs);
+-      return amDef;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMRunner.java
+deleted file mode 100644
+index 2dc09de6653..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/AMRunner.java
++++ /dev/null
+@@ -1,299 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.databind.JavaType;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.tools.rumen.JobTraceReader;
+-import org.apache.hadoop.tools.rumen.LoggedJob;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.sls.SLSRunner.TraceType;
+-import org.apache.hadoop.yarn.sls.appmaster.AMSimulator;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthJob;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthTraceJobProducer;
+-import org.apache.hadoop.yarn.util.UTCClock;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.io.Reader;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-
+-public class AMRunner {
+-  private static final Logger LOG = LoggerFactory.getLogger(AMRunner.class);
+-  int remainingApps = 0;
+-
+-  private final Configuration conf;
+-  private int AM_ID;
+-  private Map<String, AMSimulator> amMap;
+-  private Map<ApplicationId, AMSimulator> appIdAMSim;
+-  private Set<String> trackedApps;
+-  private Map<String, Class> amClassMap;
+-  private TraceType inputType;
+-  private String[] inputTraces;
+-  private final TaskRunner runner;
+-  private final SLSRunner slsRunner;
+-  private int numAMs, numTasks;
+-  private long maxRuntime;
+-  private ResourceManager rm;
+-
+-  public AMRunner(TaskRunner runner, SLSRunner slsRunner) {
+-    this.runner = runner;
+-    this.slsRunner = slsRunner;
+-    this.conf = slsRunner.getConf();
+-  }
+-
+-
+-  public void init(Configuration conf) throws ClassNotFoundException {
+-    amMap = new ConcurrentHashMap<>();
+-    amClassMap = new HashMap<>();
+-    appIdAMSim = new ConcurrentHashMap<>();
+-    // <AMType, Class> map
+-    for (Map.Entry<String, String> e : conf) {
+-      String key = e.getKey();
+-      if (key.startsWith(SLSConfiguration.AM_TYPE_PREFIX)) {
+-        String amType = key.substring(SLSConfiguration.AM_TYPE_PREFIX.length());
+-        amClassMap.put(amType, Class.forName(conf.get(key)));
+-      }
+-    }
+-  }
+-
+-  public void startAM() throws YarnException, IOException {
+-    switch (inputType) {
+-      case SLS:
+-        for (String inputTrace : inputTraces) {
+-          startAMFromSLSTrace(inputTrace);
+-        }
+-        break;
+-      case RUMEN:
+-        long baselineTimeMS = 0;
+-        for (String inputTrace : inputTraces) {
+-          startAMFromRumenTrace(inputTrace, baselineTimeMS);
+-        }
+-        break;
+-      case SYNTH:
+-        startAMFromSynthGenerator();
+-        break;
+-      default:
+-        throw new YarnException("Input configuration not recognized, "
+-            + "trace type should be SLS, RUMEN, or SYNTH");
+-    }
+-
+-    numAMs = amMap.size();
+-    remainingApps = numAMs;
+-  }
+-
+-  /**
+-   * Parse workload from a SLS trace file.
+-   */
+-  private void startAMFromSLSTrace(String inputTrace) throws IOException {
+-    JsonFactory jsonF = new JsonFactory();
+-    ObjectMapper mapper = new ObjectMapper();
+-
+-    try (Reader input = new InputStreamReader(
+-        new FileInputStream(inputTrace), StandardCharsets.UTF_8)) {
+-      JavaType type = mapper.getTypeFactory().
+-          constructMapType(Map.class, String.class, String.class);
+-      Iterator<Map<String, String>> jobIter = mapper.readValues(
+-          jsonF.createParser(input), type);
+-
+-      while (jobIter.hasNext()) {
+-        try {
+-          Map<String, String> jsonJob = jobIter.next();
+-          AMDefinitionSLS amDef = AMDefinitionFactory.createFromSlsTrace(jsonJob, slsRunner);
+-          startAMs(amDef);
+-        } catch (Exception e) {
+-          LOG.error("Failed to create an AM: {}", e.getMessage());
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * parse workload information from synth-generator trace files.
+-   */
+-  private void startAMFromSynthGenerator() throws YarnException, IOException {
+-    Configuration localConf = new Configuration();
+-    localConf.set("fs.defaultFS", "file:///");
+-    //if we use the nodeFile this could have been not initialized yet.
+-    if (slsRunner.getStjp() == null) {
+-      slsRunner.setStjp(new SynthTraceJobProducer(conf, new Path(inputTraces[0])));
+-    }
+-
+-    SynthJob job;
+-    // we use stjp, a reference to the job producer instantiated during node
+-    // creation
+-    while ((job = (SynthJob) slsRunner.getStjp().getNextJob()) != null) {
+-      ReservationId reservationId = null;
+-      if (job.hasDeadline()) {
+-        reservationId = ReservationId
+-            .newInstance(rm.getStartTime(), AM_ID);
+-      }
+-      AMDefinitionSynth amDef = AMDefinitionFactory.createFromSynth(job, slsRunner);
+-      startAMs(amDef, reservationId, job.getParams(), job.getDeadline());
+-    }
+-  }
+-
+-  /**
+-   * Parse workload from a rumen trace file.
+-   */
+-  private void startAMFromRumenTrace(String inputTrace, long baselineTimeMS)
+-      throws IOException {
+-    Configuration conf = new Configuration();
+-    conf.set("fs.defaultFS", "file:///");
+-    File fin = new File(inputTrace);
+-
+-    try (JobTraceReader reader = new JobTraceReader(
+-        new Path(fin.getAbsolutePath()), conf)) {
+-      LoggedJob job = reader.getNext();
+-
+-      while (job != null) {
+-        try {
+-          AMDefinitionRumen amDef =
+-              AMDefinitionFactory.createFromRumenTrace(job, baselineTimeMS,
+-                  slsRunner);
+-          startAMs(amDef);
+-        } catch (Exception e) {
+-          LOG.error("Failed to create an AM", e);
+-        }
+-        job = reader.getNext();
+-      }
+-    }
+-  }
+-
+-  private void startAMs(AMDefinition amDef) {
+-    for (int i = 0; i < amDef.getJobCount(); i++) {
+-      JobDefinition jobDef = JobDefinition.Builder.create()
+-          .withAmDefinition(amDef)
+-          .withDeadline(-1)
+-          .withReservationId(null)
+-          .withParams(null)
+-          .build();
+-      runNewAM(jobDef);
+-    }
+-  }
+-
+-  private void startAMs(AMDefinition amDef,
+-      ReservationId reservationId,
+-      Map<String, String> params, long deadline) {
+-    for (int i = 0; i < amDef.getJobCount(); i++) {
+-      JobDefinition jobDef = JobDefinition.Builder.create()
+-          .withAmDefinition(amDef)
+-          .withReservationId(reservationId)
+-          .withParams(params)
+-          .withDeadline(deadline)
+-          .build();
+-      runNewAM(jobDef);
+-    }
+-  }
+-
+-  private void runNewAM(JobDefinition jobDef) {
+-    AMDefinition amDef = jobDef.getAmDefinition();
+-    String oldJobId = amDef.getOldAppId();
+-    AMSimulator amSim =
+-        createAmSimulator(amDef.getAmType());
+-
+-    if (amSim != null) {
+-      int heartbeatInterval = conf.getInt(
+-          SLSConfiguration.AM_HEARTBEAT_INTERVAL_MS,
+-          SLSConfiguration.AM_HEARTBEAT_INTERVAL_MS_DEFAULT);
+-      boolean isTracked = trackedApps.contains(oldJobId);
+-
+-      if (oldJobId == null) {
+-        oldJobId = Integer.toString(AM_ID);
+-      }
+-      AM_ID++;
+-      amSim.init(amDef, rm, slsRunner, isTracked, runner.getStartTimeMS(), heartbeatInterval, appIdAMSim);
+-      if (jobDef.getReservationId() != null) {
+-        // if we have a ReservationId, delegate reservation creation to
+-        // AMSim (reservation shape is impl specific)
+-        UTCClock clock = new UTCClock();
+-        amSim.initReservation(jobDef.getReservationId(), jobDef.getDeadline(), clock.getTime());
+-      }
+-      runner.schedule(amSim);
+-      maxRuntime = Math.max(maxRuntime, amDef.getJobFinishTime());
+-      numTasks += amDef.getTaskContainers().size();
+-      amMap.put(oldJobId, amSim);
+-    }
+-  }
+-
+-  private AMSimulator createAmSimulator(String jobType) {
+-    return (AMSimulator) ReflectionUtils.newInstance(
+-        amClassMap.get(jobType), new Configuration());
+-  }
+-
+-  public AMSimulator getAMSimulator(ApplicationId appId) {
+-    return appIdAMSim.get(appId);
+-  }
+-
+-  public void setInputType(TraceType inputType) {
+-    this.inputType = inputType;
+-  }
+-
+-  public void setInputTraces(String[] inputTraces) {
+-    this.inputTraces = inputTraces.clone();
+-  }
+-
+-  public void setResourceManager(ResourceManager rm) {
+-    this.rm = rm;
+-  }
+-
+-  public Set<String> getTrackedApps() {
+-    return trackedApps;
+-  }
+-
+-  public void setTrackedApps(Set<String> trackApps) {
+-    this.trackedApps = trackApps;
+-  }
+-
+-  public int getNumAMs() {
+-    return numAMs;
+-  }
+-
+-  public int getNumTasks() {
+-    return numTasks;
+-  }
+-
+-  public long getMaxRuntime() {
+-    return maxRuntime;
+-  }
+-
+-  public Map<String, AMSimulator> getAmMap() {
+-    return amMap;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/JobDefinition.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/JobDefinition.java
+deleted file mode 100644
+index 4a39d3710c9..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/JobDefinition.java
++++ /dev/null
+@@ -1,87 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import java.util.Map;
+-
+-public class JobDefinition {
+-  private AMDefinition amDefinition;
+-  private ReservationId reservationId;
+-  private long deadline;
+-  private Map<String, String> params;
+-
+-  public AMDefinition getAmDefinition() {
+-    return amDefinition;
+-  }
+-
+-  public ReservationId getReservationId() {
+-    return reservationId;
+-  }
+-
+-  public long getDeadline() {
+-    return deadline;
+-  }
+-
+-  //Currently unused
+-  public Map<String, String> getParams() {
+-    return params;
+-  }
+-
+-  public static final class Builder {
+-    private AMDefinition amDefinition;
+-    private ReservationId reservationId;
+-    private long deadline;
+-    private Map<String, String> params;
+-
+-    private Builder() {
+-    }
+-
+-    public static Builder create() {
+-      return new Builder();
+-    }
+-
+-    public Builder withAmDefinition(AMDefinition amDefinition) {
+-      this.amDefinition = amDefinition;
+-      return this;
+-    }
+-
+-    public Builder withReservationId(ReservationId reservationId) {
+-      this.reservationId = reservationId;
+-      return this;
+-    }
+-
+-    public Builder withDeadline(long deadline) {
+-      this.deadline = deadline;
+-      return this;
+-    }
+-
+-    public Builder withParams(Map<String, String> params) {
+-      this.params = params;
+-      return this;
+-    }
+-
+-    public JobDefinition build() {
+-      JobDefinition jobDef = new JobDefinition();
+-      jobDef.params = this.params;
+-      jobDef.amDefinition = this.amDefinition;
+-      jobDef.reservationId = this.reservationId;
+-      jobDef.deadline = this.deadline;
+-      return jobDef;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/NMRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/NMRunner.java
+deleted file mode 100644
+index 14524a4e04a..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/NMRunner.java
++++ /dev/null
+@@ -1,238 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.NodeState;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+-import org.apache.hadoop.yarn.sls.SLSRunner.TraceType;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthTraceJobProducer;
+-import org.apache.hadoop.yarn.sls.utils.SLSUtils;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.TimeUnit;
+-
+-public class NMRunner {
+-  private static final Logger LOG = LoggerFactory.getLogger(NMRunner.class);
+-  
+-  // other simulation information
+-  private int numNMs, numRacks;
+-
+-  // NM simulator
+-  private Map<NodeId, NMSimulator> nmMap;
+-  private Resource nodeManagerResource;
+-  private String nodeFile;
+-  private TaskRunner taskRunner;
+-  private Configuration conf;
+-  private ResourceManager rm;
+-  private String tableMapping;
+-  private int threadPoolSize;
+-  private TraceType inputType;
+-  private String[] inputTraces;
+-  private SynthTraceJobProducer stjp;
+-
+-  public NMRunner(TaskRunner taskRunner, Configuration conf, ResourceManager rm, String tableMapping, int threadPoolSize) {
+-    this.taskRunner = taskRunner;
+-    this.conf = conf;
+-    this.rm = rm;
+-    this.tableMapping = tableMapping;
+-    this.threadPoolSize = threadPoolSize;
+-    this.nmMap = new ConcurrentHashMap<>();
+-    this.nodeManagerResource = getNodeManagerResourceFromConf();
+-  }
+-
+-  public void startNM() throws YarnException, IOException,
+-      InterruptedException {
+-    // nm configuration
+-    int heartbeatInterval = conf.getInt(
+-        SLSConfiguration.NM_HEARTBEAT_INTERVAL_MS,
+-        SLSConfiguration.NM_HEARTBEAT_INTERVAL_MS_DEFAULT);
+-    float resourceUtilizationRatio = conf.getFloat(
+-        SLSConfiguration.NM_RESOURCE_UTILIZATION_RATIO,
+-        SLSConfiguration.NM_RESOURCE_UTILIZATION_RATIO_DEFAULT);
+-    // nm information (fetch from topology file, or from sls/rumen json file)
+-    Set<SLSRunner.NodeDetails> nodeSet = null;
+-    if (nodeFile.isEmpty()) {
+-      for (String inputTrace : inputTraces) {
+-        switch (inputType) {
+-          case SLS:
+-            nodeSet = SLSUtils.parseNodesFromSLSTrace(inputTrace);
+-            break;
+-          case RUMEN:
+-            nodeSet = SLSUtils.parseNodesFromRumenTrace(inputTrace);
+-            break;
+-          case SYNTH:
+-            stjp = new SynthTraceJobProducer(conf, new Path(inputTraces[0]));
+-            nodeSet = SLSUtils.generateNodes(stjp.getNumNodes(),
+-                stjp.getNumNodes()/stjp.getNodesPerRack());
+-            break;
+-          default:
+-            throw new YarnException("Input configuration not recognized, "
+-                + "trace type should be SLS, RUMEN, or SYNTH");
+-        }
+-      }
+-    } else {
+-      nodeSet = SLSUtils.parseNodesFromNodeFile(nodeFile,
+-          nodeManagerResource);
+-    }
+-
+-    if (nodeSet == null || nodeSet.isEmpty()) {
+-      throw new YarnException("No node! Please configure nodes.");
+-    }
+-
+-    SLSUtils.generateNodeTableMapping(nodeSet, tableMapping);
+-
+-    // create NM simulators
+-    Random random = new Random();
+-    Set<String> rackSet = ConcurrentHashMap.newKeySet();
+-    int threadPoolSize = Math.max(this.threadPoolSize,
+-        SLSConfiguration.RUNNER_POOL_SIZE_DEFAULT);
+-    ExecutorService executorService = Executors.
+-        newFixedThreadPool(threadPoolSize);
+-    for (SLSRunner.NodeDetails nodeDetails : nodeSet) {
+-      executorService.submit(new Runnable() {
+-        @Override public void run() {
+-          try {
+-            // we randomize the heartbeat start time from zero to 1 interval
+-            NMSimulator nm = new NMSimulator();
+-            Resource nmResource = nodeManagerResource;
+-            String hostName = nodeDetails.getHostname();
+-            if (nodeDetails.getNodeResource() != null) {
+-              nmResource = nodeDetails.getNodeResource();
+-            }
+-            Set<NodeLabel> nodeLabels = nodeDetails.getLabels();
+-            nm.init(hostName, nmResource,
+-                random.nextInt(heartbeatInterval),
+-                heartbeatInterval, rm, resourceUtilizationRatio, nodeLabels);
+-            nmMap.put(nm.getNode().getNodeID(), nm);
+-            taskRunner.schedule(nm);
+-            rackSet.add(nm.getNode().getRackName());
+-          } catch (IOException | YarnException e) {
+-            LOG.error("Got an error while adding node", e);
+-          }
+-        }
+-      });
+-    }
+-    executorService.shutdown();
+-    executorService.awaitTermination(10, TimeUnit.MINUTES);
+-    numRacks = rackSet.size();
+-    numNMs = nmMap.size();
+-  }
+-
+-  void waitForNodesRunning() throws InterruptedException {
+-    long startTimeMS = System.currentTimeMillis();
+-    while (true) {
+-      int numRunningNodes = 0;
+-      for (RMNode node : rm.getRMContext().getRMNodes().values()) {
+-        if (node.getState() == NodeState.RUNNING) {
+-          numRunningNodes++;
+-        }
+-      }
+-      if (numRunningNodes == numNMs) {
+-        break;
+-      }
+-      LOG.info("SLSRunner is waiting for all nodes RUNNING."
+-          + " {} of {} NMs initialized.", numRunningNodes, numNMs);
+-      Thread.sleep(1000);
+-    }
+-    LOG.info("SLSRunner takes {} ms to launch all nodes.",
+-        System.currentTimeMillis() - startTimeMS);
+-  }
+-
+-  private Resource getNodeManagerResourceFromConf() {
+-    Resource resource = Resources.createResource(0);
+-    ResourceInformation[] infors = ResourceUtils.getResourceTypesArray();
+-    for (ResourceInformation info : infors) {
+-      long value;
+-      if (info.getName().equals(ResourceInformation.MEMORY_URI)) {
+-        value = conf.getInt(SLSConfiguration.NM_MEMORY_MB,
+-            SLSConfiguration.NM_MEMORY_MB_DEFAULT);
+-      } else if (info.getName().equals(ResourceInformation.VCORES_URI)) {
+-        value = conf.getInt(SLSConfiguration.NM_VCORES,
+-            SLSConfiguration.NM_VCORES_DEFAULT);
+-      } else {
+-        value = conf.getLong(SLSConfiguration.NM_PREFIX +
+-            info.getName(), SLSConfiguration.NM_RESOURCE_DEFAULT);
+-      }
+-
+-      resource.setResourceValue(info.getName(), value);
+-    }
+-
+-    return resource;
+-  }
+-
+-  public void setNodeFile(String nodeFile) {
+-    this.nodeFile = nodeFile;
+-  }
+-
+-
+-  public void setInputType(TraceType inputType) {
+-    this.inputType = inputType;
+-  }
+-
+-  public void setInputTraces(String[] inputTraces) {
+-    this.inputTraces = inputTraces.clone();
+-  }
+-
+-  public int getNumNMs() {
+-    return numNMs;
+-  }
+-
+-  public int getNumRacks() {
+-    return numRacks;
+-  }
+-
+-  public Resource getNodeManagerResource() {
+-    return nodeManagerResource;
+-  }
+-
+-  public Map<NodeId, NMSimulator> getNmMap() {
+-    return nmMap;
+-  }
+-
+-  public SynthTraceJobProducer getStjp() {
+-    return stjp;
+-  }
+-
+-  public void setTableMapping(String tableMapping) {
+-    this.tableMapping = tableMapping;
+-  }
+-
+-  public void setRm(ResourceManager rm) {
+-    this.rm = rm;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RMRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RMRunner.java
+deleted file mode 100644
+index dbded4b306e..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RMRunner.java
++++ /dev/null
+@@ -1,137 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.metrics2.source.JvmMetrics;
+-import org.apache.hadoop.net.DNSToSwitchMapping;
+-import org.apache.hadoop.net.TableMapping;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.ApplicationMasterLauncher;
+-import org.apache.hadoop.yarn.server.resourcemanager.monitor.capacity.ProportionalCapacityPreemptionPolicy;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.resourcemanager.MockAMLauncher;
+-import org.apache.hadoop.yarn.sls.scheduler.SLSCapacityScheduler;
+-import org.apache.hadoop.yarn.sls.scheduler.SLSFairScheduler;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-public class RMRunner {
+-  private ResourceManager rm;
+-  private String metricsOutputDir;
+-  private Configuration conf;
+-  private SLSRunner slsRunner;
+-  private String tableMapping;
+-  private Map<String, Integer> queueAppNumMap;
+-
+-  public RMRunner(Configuration conf, SLSRunner slsRunner) {
+-    this.conf = conf;
+-    this.slsRunner = slsRunner;
+-    this.queueAppNumMap = new HashMap<>();
+-  }
+-
+-  public void startRM() throws ClassNotFoundException, YarnException {
+-    Configuration rmConf = new YarnConfiguration(conf);
+-    String schedulerClass = rmConf.get(YarnConfiguration.RM_SCHEDULER);
+-
+-    if (Class.forName(schedulerClass) == CapacityScheduler.class) {
+-      rmConf.set(YarnConfiguration.RM_SCHEDULER,
+-          SLSCapacityScheduler.class.getName());
+-      rmConf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true);
+-      rmConf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES,
+-          ProportionalCapacityPreemptionPolicy.class.getName());
+-    } else if (Class.forName(schedulerClass) == FairScheduler.class) {
+-      rmConf.set(YarnConfiguration.RM_SCHEDULER,
+-          SLSFairScheduler.class.getName());
+-    } else if (Class.forName(schedulerClass) == FifoScheduler.class) {
+-      // TODO add support for FifoScheduler
+-      throw new YarnException("Fifo Scheduler is not supported yet.");
+-    }
+-    rmConf.setClass(
+-        CommonConfigurationKeysPublic.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
+-        TableMapping.class, DNSToSwitchMapping.class);
+-    rmConf.set(
+-        CommonConfigurationKeysPublic.NET_TOPOLOGY_TABLE_MAPPING_FILE_KEY,
+-        tableMapping);
+-    rmConf.set(SLSConfiguration.METRICS_OUTPUT_DIR, metricsOutputDir);
+-
+-    rm = new ResourceManager() {
+-      @Override
+-      protected ApplicationMasterLauncher createAMLauncher() {
+-        return new MockAMLauncher(slsRunner, this.rmContext);
+-      }
+-    };
+-
+-    // Across runs of parametrized tests, the JvmMetrics objects is retained,
+-    // but is not registered correctly
+-    JvmMetrics jvmMetrics = JvmMetrics.initSingleton("ResourceManager", null);
+-    jvmMetrics.registerIfNeeded();
+-
+-    // Init and start the actual ResourceManager
+-    rm.init(rmConf);
+-    rm.start();
+-  }
+-
+-  public void increaseQueueAppNum(String queue) throws YarnException {
+-    SchedulerWrapper wrapper = (SchedulerWrapper)rm.getResourceScheduler();
+-    String queueName = wrapper.getRealQueueName(queue);
+-    Integer appNum = queueAppNumMap.get(queueName);
+-    if (appNum == null) {
+-      appNum = 1;
+-    } else {
+-      appNum = appNum + 1;
+-    }
+-
+-    queueAppNumMap.put(queueName, appNum);
+-    SchedulerMetrics metrics = wrapper.getSchedulerMetrics();
+-    if (metrics != null) {
+-      metrics.trackQueue(queueName);
+-    }
+-  }
+-
+-  public void setMetricsOutputDir(String metricsOutputDir) {
+-    this.metricsOutputDir = metricsOutputDir;
+-  }
+-
+-  public String getTableMapping() {
+-    return tableMapping;
+-  }
+-
+-  public void setTableMapping(String tableMapping) {
+-    this.tableMapping = tableMapping;
+-  }
+-
+-  public void stop() {
+-    rm.stop();
+-  }
+-
+-  public ResourceManager getRm() {
+-    return rm;
+-  }
+-
+-  public Map<String, Integer> getQueueAppNumMap() {
+-    return queueAppNumMap;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/ReservationClientUtil.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/ReservationClientUtil.java
+deleted file mode 100644
+index 2d04bb240c1..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/ReservationClientUtil.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.records.*;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Simple support class, used to create reservation requests.
+- */
+-public final class ReservationClientUtil {
+-
+-  private ReservationClientUtil(){
+-    //avoid instantiation
+-  }
+-
+-  /**
+-   * Creates a request that envelopes a MR jobs, picking max number of maps and
+-   * reducers, max durations, and max resources per container.
+-   *
+-   * @param reservationId the id of the reservation
+-   * @param name the name of a reservation
+-   * @param maxMapRes maximum resources used by any mapper
+-   * @param numberMaps number of mappers
+-   * @param maxMapDur maximum duration of any mapper
+-   * @param maxRedRes maximum resources used by any reducer
+-   * @param numberReduces number of reducers
+-   * @param maxRedDur maximum duration of any reducer
+-   * @param arrival start time of valid range for reservation
+-   * @param deadline deadline for this reservation
+-   * @param queueName queue to submit to
+-   * @return a submission request
+-   */
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  public static ReservationSubmissionRequest createMRReservation(
+-      ReservationId reservationId, String name, Resource maxMapRes,
+-      int numberMaps, long maxMapDur, Resource maxRedRes, int numberReduces,
+-      long maxRedDur, long arrival, long deadline, String queueName) {
+-
+-    ReservationRequest mapRR = ReservationRequest.newInstance(maxMapRes,
+-        numberMaps, numberMaps, maxMapDur);
+-    ReservationRequest redRR = ReservationRequest.newInstance(maxRedRes,
+-        numberReduces, numberReduces, maxRedDur);
+-
+-    List<ReservationRequest> listResReq = new ArrayList<ReservationRequest>();
+-    listResReq.add(mapRR);
+-    listResReq.add(redRR);
+-
+-    ReservationRequests reservationRequests = ReservationRequests
+-        .newInstance(listResReq, ReservationRequestInterpreter.R_ORDER_NO_GAP);
+-    ReservationDefinition resDef = ReservationDefinition.newInstance(arrival,
+-        deadline, reservationRequests, name);
+-
+-    // outermost request
+-    return ReservationSubmissionRequest
+-        .newInstance(resDef, queueName, reservationId);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
+deleted file mode 100644
+index 2cdfe236c41..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java
++++ /dev/null
+@@ -1,235 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.io.OutputStreamWriter;
+-import java.io.Reader;
+-import java.io.Writer;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.Iterator;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.TreeMap;
+-import java.util.TreeSet;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.ObjectWriter;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.Options;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.sls.utils.SLSUtils;
+-
+-@Private
+-@Unstable
+-public class RumenToSLSConverter {
+-  private static final String EOL = System.getProperty("line.separator");
+-
+-  private static long baseline = 0;
+-  private static Map<String, Set<String>> rackNodeMap =
+-          new TreeMap<String, Set<String>>();
+-
+-  public static void main(String[] args) throws Exception {
+-    Options options = new Options();
+-    options.addOption("input", true, "input rumen json file");
+-    options.addOption("outputJobs", true, "output jobs file");
+-    options.addOption("outputNodes", true, "output nodes file");
+-
+-    CommandLineParser parser = new GnuParser();
+-    CommandLine cmd = parser.parse(options, args);
+-
+-    if (! cmd.hasOption("input") ||
+-            ! cmd.hasOption("outputJobs") ||
+-            ! cmd.hasOption("outputNodes")) {
+-      System.err.println();
+-      System.err.println("ERROR: Missing input or output file");
+-      System.err.println();
+-      System.err.println("LoadGenerator creates a SLS script " +
+-              "from a Hadoop Rumen output");
+-      System.err.println();
+-      System.err.println("Options: -input FILE -outputJobs FILE " +
+-              "-outputNodes FILE");
+-      System.err.println();
+-      System.exit(1);
+-    }
+-
+-    String inputFile = cmd.getOptionValue("input");
+-    String outputJsonFile = cmd.getOptionValue("outputJobs");
+-    String outputNodeFile = cmd.getOptionValue("outputNodes");
+-
+-    // check existing
+-    if (! new File(inputFile).exists()) {
+-      System.err.println();
+-      System.err.println("ERROR: input does not exist");
+-      System.exit(1);
+-    }
+-    if (new File(outputJsonFile).exists()) {
+-      System.err.println();
+-      System.err.println("ERROR: output job file is existing");
+-      System.exit(1);
+-    }
+-    if (new File(outputNodeFile).exists()) {
+-      System.err.println();
+-      System.err.println("ERROR: output node file is existing");
+-      System.exit(1);
+-    }
+-
+-    File jsonFile = new File(outputJsonFile);
+-    if (! jsonFile.getParentFile().exists()
+-            && ! jsonFile.getParentFile().mkdirs()) {
+-      System.err.println("ERROR: Cannot create output directory in path: "
+-              + jsonFile.getParentFile().getAbsoluteFile());
+-      System.exit(1);
+-    }
+-    File nodeFile = new File(outputNodeFile);
+-    if (! nodeFile.getParentFile().exists()
+-            && ! nodeFile.getParentFile().mkdirs()) {
+-      System.err.println("ERROR: Cannot create output directory in path: "
+-              + nodeFile.getParentFile().getAbsoluteFile());
+-      System.exit(1);
+-    }
+-
+-    generateSLSLoadFile(inputFile, outputJsonFile);
+-    generateSLSNodeFile(outputNodeFile);
+-  }
+-
+-  private static void generateSLSLoadFile(String inputFile, String outputFile)
+-          throws IOException {
+-    try (Reader input =
+-        new InputStreamReader(new FileInputStream(inputFile),
+-            StandardCharsets.UTF_8)) {
+-      try (Writer output =
+-          new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8)) {
+-        ObjectMapper mapper = new ObjectMapper();
+-        ObjectWriter writer = mapper.writerWithDefaultPrettyPrinter();
+-        Iterator<Map> i = mapper.readValues(
+-            new JsonFactory().createParser(input), Map.class);
+-        while (i.hasNext()) {
+-          Map m = i.next();
+-          output.write(writer.writeValueAsString(createSLSJob(m)) + EOL);
+-        }
+-      }
+-    }
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  private static void generateSLSNodeFile(String outputFile)
+-          throws IOException {
+-    try (Writer output =
+-        new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8)) {
+-      ObjectMapper mapper = new ObjectMapper();
+-      ObjectWriter writer = mapper.writerWithDefaultPrettyPrinter();
+-      for (Map.Entry<String, Set<String>> entry : rackNodeMap.entrySet()) {
+-        Map rack = new LinkedHashMap();
+-        rack.put("rack", entry.getKey());
+-        List nodes = new ArrayList();
+-        for (String name : entry.getValue()) {
+-          Map node = new LinkedHashMap();
+-          node.put("node", name);
+-          nodes.add(node);
+-        }
+-        rack.put("nodes", nodes);
+-        output.write(writer.writeValueAsString(rack) + EOL);
+-      }
+-    }
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  private static Map createSLSJob(Map rumenJob) {
+-    Map json = new LinkedHashMap();
+-    long jobStart = (Long) rumenJob.get("submitTime");
+-    long jobFinish = (Long) rumenJob.get("finishTime");
+-    String jobId = rumenJob.get("jobID").toString();
+-    String queue = rumenJob.get("queue").toString();
+-    String user = rumenJob.get("user").toString();
+-    if (baseline == 0) {
+-      baseline = jobStart;
+-    }
+-    jobStart -= baseline;
+-    jobFinish -= baseline;
+-    long offset = 0;
+-    if (jobStart < 0) {
+-      System.out.println("Warning: reset job " + jobId + " start time to 0.");
+-      offset = -jobStart;
+-      jobFinish = jobFinish - jobStart;
+-      jobStart = 0;
+-    }
+-
+-    json.put("am.type", "mapreduce");
+-    json.put("job.start.ms", jobStart);
+-    json.put("job.end.ms", jobFinish);
+-    json.put("job.queue.name", queue);
+-    json.put("job.id", jobId);
+-    json.put("job.user", user);
+-
+-    List maps = createSLSTasks("map",
+-            (List) rumenJob.get("mapTasks"), offset);
+-    List reduces = createSLSTasks("reduce",
+-            (List) rumenJob.get("reduceTasks"), offset);
+-    List tasks = new ArrayList();
+-    tasks.addAll(maps);
+-    tasks.addAll(reduces);
+-    json.put("job.tasks", tasks);
+-    return json;
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  private static List createSLSTasks(String taskType,
+-                                     List rumenTasks, long offset) {
+-    int priority = taskType.equals("reduce") ? 10 : 20;
+-    List array = new ArrayList();
+-    for (Object e : rumenTasks) {
+-      Map rumenTask = (Map) e;
+-      for (Object ee : (List) rumenTask.get("attempts"))  {
+-        Map rumenAttempt = (Map) ee;
+-        long taskStart = (Long) rumenAttempt.get("startTime");
+-        long taskFinish = (Long) rumenAttempt.get("finishTime");
+-        String hostname = (String) rumenAttempt.get("hostName");
+-        taskStart = taskStart - baseline + offset;
+-        taskFinish = taskFinish - baseline + offset;
+-        Map task = new LinkedHashMap();
+-        task.put("container.host", hostname);
+-        task.put("container.start.ms", taskStart);
+-        task.put("container.end.ms", taskFinish);
+-        task.put("container.priority", priority);
+-        task.put("container.type", taskType);
+-        array.add(task);
+-        String[] rackHost = SLSUtils.getRackHostName(hostname);
+-        if (rackNodeMap.containsKey(rackHost[0])) {
+-          rackNodeMap.get(rackHost[0]).add(rackHost[1]);
+-        } else {
+-          Set<String> hosts = new TreeSet<String>();
+-          hosts.add(rackHost[1]);
+-          rackNodeMap.put(rackHost[0], hosts);
+-        }
+-      }
+-    }
+-    return array;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
+deleted file mode 100644
+index c14d5685b7d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java
++++ /dev/null
+@@ -1,519 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.security.Security;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Objects;
+-import java.util.Random;
+-import java.util.Set;
+-import java.util.Collections;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.commons.collections.SetUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.sls.appmaster.AMSimulator;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+-import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+-import org.apache.hadoop.yarn.sls.scheduler.Tracker;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthTraceJobProducer;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class SLSRunner extends Configured implements Tool {
+-  private static final TaskRunner runner = new TaskRunner();
+-  private String[] inputTraces;
+-
+-  // metrics
+-  private boolean printSimulation;
+-
+-  private final static Map<String, Object> simulateInfoMap =
+-      new HashMap<>();
+-
+-  // logger
+-  public final static Logger LOG = LoggerFactory.getLogger(SLSRunner.class);
+-
+-  private static boolean exitAtTheFinish = false;
+-  private AMRunner amRunner;
+-  private RMRunner rmRunner;
+-  private NMRunner nmRunner;
+-
+-  private TraceType inputType;
+-  private SynthTraceJobProducer stjp;
+-
+-  /**
+-   * The type of trace in input.
+-   */
+-  public enum TraceType {
+-    SLS, RUMEN, SYNTH
+-  }
+-
+-  public static final String NETWORK_CACHE_TTL = "networkaddress.cache.ttl";
+-  public static final String NETWORK_NEGATIVE_CACHE_TTL =
+-      "networkaddress.cache.negative.ttl";
+-
+-  public int getRemainingApps() {
+-    return amRunner.remainingApps;
+-  }
+-
+-  public SLSRunner() throws ClassNotFoundException, YarnException {
+-    Configuration tempConf = new Configuration(false);
+-    init(tempConf);
+-  }
+-
+-  public SLSRunner(Configuration tempConf) throws ClassNotFoundException, YarnException {
+-    init(tempConf);
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    if (null != conf) {
+-      // Override setConf to make sure all conf added load sls-runner.xml, see
+-      // YARN-6560
+-      conf.addResource("sls-runner.xml");
+-    }
+-    super.setConf(conf);
+-  }
+-
+-  private void init(Configuration tempConf) throws ClassNotFoundException, YarnException {
+-    // runner configuration
+-    setConf(tempConf);
+-    
+-    int poolSize = tempConf.getInt(SLSConfiguration.RUNNER_POOL_SIZE,
+-        SLSConfiguration.RUNNER_POOL_SIZE_DEFAULT);
+-    SLSRunner.runner.setQueueSize(poolSize);
+-
+-    rmRunner = new RMRunner(getConf(), this);
+-    nmRunner = new NMRunner(runner, getConf(), rmRunner.getRm(), rmRunner.getTableMapping(), poolSize);
+-    amRunner = new AMRunner(runner, this);
+-    amRunner.init(tempConf);
+-  }
+-
+-  private SynthTraceJobProducer getSynthJobTraceProducer() throws YarnException {
+-    // if we use the nodeFile this could have been not initialized yet.
+-    if (nmRunner.getStjp() != null) {
+-      return nmRunner.getStjp();
+-    } else {
+-      try {
+-        return new SynthTraceJobProducer(getConf(), new Path(inputTraces[0]));
+-      } catch (IOException e) {
+-        throw new YarnException("Failed to initialize SynthTraceJobProducer", e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * @return an unmodifiable view of the simulated info map.
+-   */
+-  public static Map<String, Object> getSimulateInfoMap() {
+-    return Collections.unmodifiableMap(simulateInfoMap);
+-  }
+-
+-  /**
+-   * This is invoked before start.
+-   * @param inputType The trace type
+-   * @param inTraces Input traces
+-   * @param nodes The node file
+-   * @param metricsOutputDir Output dir for metrics
+-   * @param trackApps Track these applications
+-   * @param printSimulation Whether to print the simulation
+-   */
+-  public void setSimulationParams(TraceType inputType, String[] inTraces,
+-      String nodes, String metricsOutputDir, Set<String> trackApps,
+-      boolean printSimulation) throws YarnException {
+-    this.inputType = inputType;
+-    this.inputTraces = inTraces.clone();
+-    this.amRunner.setInputType(inputType);
+-    this.amRunner.setInputTraces(this.inputTraces);
+-    this.amRunner.setTrackedApps(trackApps);
+-    this.nmRunner.setNodeFile(nodes);
+-    this.nmRunner.setInputType(inputType);
+-    this.nmRunner.setInputTraces(this.inputTraces);
+-    this.printSimulation = printSimulation;
+-    this.rmRunner.setMetricsOutputDir(metricsOutputDir);
+-    String tableMapping = metricsOutputDir + "/tableMapping.csv";
+-    this.rmRunner.setTableMapping(tableMapping);
+-    this.nmRunner.setTableMapping(tableMapping);
+-    
+-    //We need this.inputTraces to set before creating SynthTraceJobProducer
+-    if (inputType == TraceType.SYNTH) {
+-      this.stjp = getSynthJobTraceProducer();
+-    }
+-  }
+-
+-  public void start() throws IOException, ClassNotFoundException, YarnException,
+-      InterruptedException {
+-    enableDNSCaching(getConf());
+-
+-    // start resource manager
+-    rmRunner.startRM();
+-    nmRunner.setRm(rmRunner.getRm());
+-    amRunner.setResourceManager(rmRunner.getRm());
+-    
+-    // start node managers
+-    nmRunner.startNM();
+-    // start application masters
+-    amRunner.startAM();
+-
+-    // set queue & tracked apps information
+-    SchedulerWrapper resourceScheduler =
+-        (SchedulerWrapper) rmRunner.getRm().getResourceScheduler();
+-    resourceScheduler.setSLSRunner(this);
+-    Tracker tracker = resourceScheduler.getTracker();
+-    tracker.setQueueSet(rmRunner.getQueueAppNumMap().keySet());
+-    tracker.setTrackedAppSet(amRunner.getTrackedApps());
+-    // print out simulation info
+-    printSimulationInfo();
+-    // blocked until all nodes RUNNING
+-    nmRunner.waitForNodesRunning();
+-    // starting the runner once everything is ready to go,
+-    runner.start();
+-  }
+-
+-  /**
+-   * Enables DNS Caching based on config. If DNS caching is enabled, then set
+-   * the DNS cache to infinite time. Since in SLS random nodes are added, DNS
+-   * resolution can take significant time which can cause erroneous results.
+-   * For more details, check <a href=
+-   * "https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html">
+-   * Java Networking Properties</a>
+-   * @param conf Configuration object.
+-   */
+-  static void enableDNSCaching(Configuration conf) {
+-    if (conf.getBoolean(SLSConfiguration.DNS_CACHING_ENABLED,
+-        SLSConfiguration.DNS_CACHING_ENABLED_DEFAULT)) {
+-      Security.setProperty(NETWORK_CACHE_TTL, "-1");
+-      Security.setProperty(NETWORK_NEGATIVE_CACHE_TTL, "-1");
+-    }
+-  }
+-
+-  Resource getDefaultContainerResource() {
+-    int containerMemory = getConf().getInt(SLSConfiguration.CONTAINER_MEMORY_MB,
+-        SLSConfiguration.CONTAINER_MEMORY_MB_DEFAULT);
+-    int containerVCores = getConf().getInt(SLSConfiguration.CONTAINER_VCORES,
+-        SLSConfiguration.CONTAINER_VCORES_DEFAULT);
+-    return Resources.createResource(containerMemory, containerVCores);
+-  }
+-
+-  public void increaseQueueAppNum(String queue) throws YarnException {
+-    rmRunner.increaseQueueAppNum(queue);
+-  }
+-
+-  private void printSimulationInfo() {
+-    final int numAMs = amRunner.getNumAMs();
+-    final int numTasks = amRunner.getNumTasks();
+-    final long maxRuntime = amRunner.getMaxRuntime();
+-    Map<String, AMSimulator> amMap = amRunner.getAmMap();
+-    Map<String, Integer> queueAppNumMap = rmRunner.getQueueAppNumMap();
+-
+-    if (printSimulation) {
+-      // node
+-      LOG.info("------------------------------------");
+-      LOG.info("# nodes = {}, # racks = {}, capacity " +
+-              "of each node {}.",
+-              nmRunner.getNumNMs(), nmRunner.getNumRacks(), nmRunner.getNodeManagerResource());
+-      LOG.info("------------------------------------");
+-      // job
+-      LOG.info("# applications = {}, # total " +
+-              "tasks = {}, average # tasks per application = {}",
+-              numAMs, numTasks, (int)(Math.ceil((numTasks + 0.0) / numAMs)));
+-      LOG.info("JobId\tQueue\tAMType\tDuration\t#Tasks");
+-      for (Map.Entry<String, AMSimulator> entry : amMap.entrySet()) {
+-        AMSimulator am = entry.getValue();
+-        LOG.info(entry.getKey() + "\t" + am.getQueue() + "\t" + am.getAMType()
+-            + "\t" + am.getDuration() + "\t" + am.getNumTasks());
+-      }
+-      LOG.info("------------------------------------");
+-      // queue
+-      LOG.info("number of queues = {}  average number of apps = {}",
+-          queueAppNumMap.size(),
+-          (int)(Math.ceil((numAMs + 0.0) / queueAppNumMap.size())));
+-      LOG.info("------------------------------------");
+-      // runtime
+-      LOG.info("estimated simulation time is {} seconds",
+-          (long)(Math.ceil(maxRuntime / 1000.0)));
+-      LOG.info("------------------------------------");
+-    }
+-    // package these information in the simulateInfoMap used by other places
+-    simulateInfoMap.put("Number of racks", nmRunner.getNumRacks());
+-    simulateInfoMap.put("Number of nodes", nmRunner.getNumNMs());
+-    simulateInfoMap.put("Node memory (MB)",
+-        nmRunner.getNodeManagerResource().getResourceValue(ResourceInformation.MEMORY_URI));
+-    simulateInfoMap.put("Node VCores",
+-        nmRunner.getNodeManagerResource().getResourceValue(ResourceInformation.VCORES_URI));
+-    simulateInfoMap.put("Number of applications", numAMs);
+-    simulateInfoMap.put("Number of tasks", numTasks);
+-    simulateInfoMap.put("Average tasks per applicaion",
+-            (int)(Math.ceil((numTasks + 0.0) / numAMs)));
+-    simulateInfoMap.put("Number of queues", queueAppNumMap.size());
+-    simulateInfoMap.put("Average applications per queue",
+-            (int)(Math.ceil((numAMs + 0.0) / queueAppNumMap.size())));
+-    simulateInfoMap.put("Estimated simulate time (s)",
+-            (long)(Math.ceil(maxRuntime / 1000.0)));
+-  }
+-
+-  public Map<NodeId, NMSimulator> getNmMap() {
+-    return nmRunner.getNmMap();
+-  }
+-
+-  public void decreaseRemainingApps() {
+-    amRunner.remainingApps--;
+-    if (amRunner.remainingApps == 0) {
+-      exitSLSRunner();
+-    }
+-  }
+-
+-  public static void exitSLSRunner() {
+-    LOG.info("SLSRunner tears down.");
+-    if (exitAtTheFinish) {
+-      System.exit(0);
+-    }
+-  }
+-
+-  public void stop() throws InterruptedException {
+-    rmRunner.stop();
+-    runner.stop();
+-  }
+-
+-  public int run(final String[] argv) throws IOException, InterruptedException,
+-      ParseException, ClassNotFoundException, YarnException {
+-    Options options = new Options();
+-
+-    // Left for compatibility
+-    options.addOption("inputrumen", true, "input rumen files");
+-    options.addOption("inputsls", true, "input sls files");
+-
+-    // New more general format
+-    options.addOption("tracetype", true, "the type of trace");
+-    options.addOption("tracelocation", true, "input trace files");
+-
+-    options.addOption("nodes", true, "input topology");
+-    options.addOption("output", true, "output directory");
+-    options.addOption("trackjobs", true,
+-        "jobs to be tracked during simulating");
+-    options.addOption("printsimulation", false,
+-        "print out simulation information");
+-
+-    CommandLineParser parser = new GnuParser();
+-    CommandLine cmd = parser.parse(options, argv);
+-
+-    // compatibility with old commandline
+-    boolean hasInputRumenOption = cmd.hasOption("inputrumen");
+-    boolean hasInputSlsOption = cmd.hasOption("inputsls");
+-    boolean hasTraceTypeOption = cmd.hasOption("tracetype");
+-    TraceType traceType = determineTraceType(cmd, hasInputRumenOption,
+-        hasInputSlsOption, hasTraceTypeOption);
+-    String traceLocation = determineTraceLocation(cmd, hasInputRumenOption,
+-        hasInputSlsOption, hasTraceTypeOption);
+-    
+-    String output = cmd.getOptionValue("output");
+-
+-    File outputFile = new File(output);
+-    if (!outputFile.exists() && !outputFile.mkdirs()) {
+-      System.err.println("ERROR: Cannot create output directory "
+-          + outputFile.getAbsolutePath());
+-      throw new YarnException("Cannot create output directory");
+-    }
+-
+-    Set<String> trackedJobSet = new HashSet<>();
+-    if (cmd.hasOption("trackjobs")) {
+-      String trackjobs = cmd.getOptionValue("trackjobs");
+-      String[] jobIds = trackjobs.split(",");
+-      trackedJobSet.addAll(Arrays.asList(jobIds));
+-    }
+-
+-    String tempNodeFile =
+-        cmd.hasOption("nodes") ? cmd.getOptionValue("nodes") : "";
+-
+-    String[] inputFiles = traceLocation.split(",");
+-
+-    setSimulationParams(traceType, inputFiles, tempNodeFile, output,
+-        trackedJobSet, cmd.hasOption("printsimulation"));
+-    
+-    start();
+-
+-    return 0;
+-  }
+-
+-  private TraceType determineTraceType(CommandLine cmd, boolean hasInputRumenOption,
+-      boolean hasInputSlsOption, boolean hasTraceTypeOption) throws YarnException {
+-    String traceType = null;
+-    if (hasInputRumenOption) {
+-      traceType = "RUMEN";
+-    }
+-    if (hasInputSlsOption) {
+-      traceType = "SLS";
+-    }
+-    if (hasTraceTypeOption) {
+-      traceType = cmd.getOptionValue("tracetype");
+-    }
+-    if (traceType == null) {
+-      throw new YarnException("Misconfigured input");
+-    }
+-    switch (traceType) {
+-    case "SLS":
+-      return TraceType.SLS;
+-    case "RUMEN":
+-      return TraceType.RUMEN;
+-    case "SYNTH":
+-      return TraceType.SYNTH;
+-    default:
+-      printUsage();
+-      throw new YarnException("Misconfigured input");
+-    }
+-  }
+-
+-  private String determineTraceLocation(CommandLine cmd, boolean hasInputRumenOption,
+-      boolean hasInputSlsOption, boolean hasTraceTypeOption) throws YarnException {
+-    if (hasInputRumenOption) {
+-      return cmd.getOptionValue("inputrumen");
+-    }
+-    if (hasInputSlsOption) {
+-      return cmd.getOptionValue("inputsls");
+-    }
+-    if (hasTraceTypeOption) {
+-      return cmd.getOptionValue("tracelocation");
+-    }
+-    throw new YarnException("Misconfigured input! ");
+-  }
+-
+-  public static void main(String[] argv) throws Exception {
+-    exitAtTheFinish = true;
+-    ToolRunner.run(new Configuration(), new SLSRunner(), argv);
+-  }
+-
+-  static void printUsage() {
+-    System.err.println();
+-    System.err.println("ERROR: Wrong tracetype");
+-    System.err.println();
+-    System.err.println(
+-        "Options: -tracetype " + "SLS|RUMEN|SYNTH -tracelocation FILE,FILE... "
+-            + "(deprecated alternative options --inputsls FILE, FILE,... "
+-            + " | --inputrumen FILE,FILE,...)"
+-            + "-output FILE [-nodes FILE] [-trackjobs JobId,JobId...] "
+-            + "[-printsimulation]");
+-    System.err.println();
+-  }
+-
+-  /**
+-   * Class to encapsulate all details about the node.
+-   */
+-  @Private
+-  @Unstable
+-  public static class NodeDetails {
+-    private String hostname;
+-    private Resource nodeResource;
+-    private Set<NodeLabel> labels;
+-
+-    public NodeDetails(String nodeHostname) {
+-      this.hostname = nodeHostname;
+-    }
+-
+-    public String getHostname() {
+-      return hostname;
+-    }
+-
+-    public void setHostname(String hostname) {
+-      this.hostname = hostname;
+-    }
+-
+-    public Resource getNodeResource() {
+-      return nodeResource;
+-    }
+-
+-    public void setNodeResource(Resource nodeResource) {
+-      this.nodeResource = nodeResource;
+-    }
+-
+-    public Set<NodeLabel> getLabels() {
+-      return labels;
+-    }
+-
+-    public void setLabels(Set<NodeLabel> labels) {
+-      this.labels = labels;
+-    }
+-
+-    @Override
+-    public boolean equals(Object o) {
+-      if (this == o) {
+-        return true;
+-      }
+-      if (!(o instanceof NodeDetails)) {
+-        return false;
+-      }
+-
+-      NodeDetails that = (NodeDetails) o;
+-
+-      return StringUtils.equals(hostname, that.hostname) && (
+-          Objects.equals(nodeResource, that.nodeResource)) && SetUtils
+-          .isEqualSet(labels, that.labels);
+-    }
+-
+-    @Override
+-    public int hashCode() {
+-      int result = hostname == null ? 0 : hostname.hashCode();
+-      result =
+-          31 * result + (nodeResource == null ? 0 : nodeResource.hashCode());
+-      result = 31 * result + (labels == null ? 0 : labels.hashCode());
+-      return result;
+-    }
+-  }
+-
+-  public SynthTraceJobProducer getStjp() {
+-    return stjp;
+-  }
+-
+-  public void setStjp(SynthTraceJobProducer stjp) {
+-    this.stjp = stjp;
+-  }
+-
+-  public AMSimulator getAMSimulatorByAppId(ApplicationId appId) {
+-    return amRunner.getAMSimulator(appId);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/TaskContainerDefinition.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/TaskContainerDefinition.java
+deleted file mode 100644
+index 04bea3ab2cd..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/TaskContainerDefinition.java
++++ /dev/null
+@@ -1,247 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import java.util.Map;
+-
+-import static org.apache.hadoop.yarn.sls.AMDefinitionRumen.DEFAULT_MAPPER_PRIORITY;
+-
+-public class TaskContainerDefinition {
+-  private long duration;
+-  private Resource resource;
+-  private int priority;
+-  private String type;
+-  private int count;
+-  private ExecutionType executionType;
+-  private long allocationId = -1;
+-  private long requestDelay = 0;
+-  private String hostname;
+-
+-  public long getDuration() {
+-    return duration;
+-  }
+-
+-  public Resource getResource() {
+-    return resource;
+-  }
+-
+-  public int getPriority() {
+-    return priority;
+-  }
+-
+-  public String getType() {
+-    return type;
+-  }
+-
+-  public int getCount() {
+-    return count;
+-  }
+-
+-  public ExecutionType getExecutionType() {
+-    return executionType;
+-  }
+-
+-  public long getAllocationId() {
+-    return allocationId;
+-  }
+-
+-  public long getRequestDelay() {
+-    return requestDelay;
+-  }
+-
+-  public String getHostname() {
+-    return hostname;
+-  }
+-
+-  public static final class Builder {
+-    private long duration = -1;
+-    private long durationLegacy = -1;
+-    private long taskStart = -1;
+-    private long taskFinish = -1;
+-    private Resource resource;
+-    private int priority = DEFAULT_MAPPER_PRIORITY;
+-    private String type = "map";
+-    private int count = 1;
+-    private ExecutionType executionType = ExecutionType.GUARANTEED;
+-    private long allocationId = -1;
+-    private long requestDelay = 0;
+-    private String hostname;
+-
+-    public static Builder create() {
+-      return new Builder();
+-    }
+-
+-    public Builder withDuration(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.duration = Integer.parseInt(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withDuration(long duration) {
+-      this.duration = duration;
+-      return this;
+-    }
+-
+-    /**
+-     * Also support "duration.ms" for backward compatibility.
+-     * @param jsonTask the json representation of the task.
+-     * @param key The json key.
+-     * @return the builder
+-     */
+-    public Builder withDurationLegacy(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.durationLegacy = Integer.parseInt(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withTaskStart(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.taskStart = Long.parseLong(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withTaskFinish(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.taskFinish = Long.parseLong(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withResource(Resource resource) {
+-      this.resource = resource;
+-      return this;
+-    }
+-
+-    public Builder withPriority(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.priority = Integer.parseInt(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withPriority(int priority) {
+-      this.priority = priority;
+-      return this;
+-    }
+-
+-    public Builder withType(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.type = jsonTask.get(key);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withType(String type) {
+-      this.type = type;
+-      return this;
+-    }
+-
+-    public Builder withCount(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        count = Integer.parseInt(jsonTask.get(key));
+-        count = Math.max(count, 1);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withCount(int count) {
+-      this.count = count;
+-      return this;
+-    }
+-
+-    public Builder withExecutionType(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.executionType = ExecutionType.valueOf(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withExecutionType(ExecutionType executionType) {
+-      this.executionType = executionType;
+-      return this;
+-    }
+-
+-    public Builder withAllocationId(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        this.allocationId = Long.parseLong(jsonTask.get(key));
+-      }
+-      return this;
+-    }
+-
+-    public Builder withAllocationId(long allocationId) {
+-      this.allocationId = allocationId;
+-      return this;
+-    }
+-
+-    public Builder withRequestDelay(Map<String, String> jsonTask, String key) {
+-      if (jsonTask.containsKey(key)) {
+-        requestDelay = Long.parseLong(jsonTask.get(key));
+-        requestDelay = Math.max(requestDelay, 0);
+-      }
+-      return this;
+-    }
+-
+-    public Builder withRequestDelay(long requestDelay) {
+-      this.requestDelay = requestDelay;
+-      return this;
+-    }
+-
+-    public Builder withHostname(String hostname) {
+-      this.hostname = hostname;
+-      return this;
+-    }
+-
+-    public TaskContainerDefinition build() throws YarnException {
+-      TaskContainerDefinition taskContainerDef =
+-          new TaskContainerDefinition();
+-      taskContainerDef.duration = validateAndGetDuration(this);
+-      taskContainerDef.resource = this.resource;
+-      taskContainerDef.type = this.type;
+-      taskContainerDef.requestDelay = this.requestDelay;
+-      taskContainerDef.priority = this.priority;
+-      taskContainerDef.count = this.count;
+-      taskContainerDef.allocationId = this.allocationId;
+-      taskContainerDef.executionType = this.executionType;
+-      taskContainerDef.hostname = this.hostname;
+-      return taskContainerDef;
+-    }
+-
+-    private long validateAndGetDuration(Builder builder) throws YarnException {
+-      long duration = 0;
+-
+-      if (builder.duration != -1) {
+-        duration = builder.duration;
+-      } else if (builder.durationLegacy != -1) {
+-        duration = builder.durationLegacy;
+-      } else if (builder.taskStart != -1 && builder.taskFinish != -1) {
+-        duration = builder.taskFinish - builder.taskStart;
+-      }
+-
+-      if (duration <= 0) {
+-        throw new YarnException("Duration of a task shouldn't be less or equal"
+-            + " to 0!");
+-      }
+-      return duration;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
+deleted file mode 100644
+index 0a87a6c2070..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/AMSimulator.java
++++ /dev/null
+@@ -1,524 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.appmaster;
+-
+-import java.io.IOException;
+-import java.lang.reflect.UndeclaredThrowableException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.BlockingQueue;
+-import java.util.concurrent.ConcurrentSkipListSet;
+-import java.util.concurrent.LinkedBlockingQueue;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.sls.AMDefinition;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+-import org.apache.hadoop.yarn.sls.utils.SLSUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public abstract class AMSimulator extends TaskRunner.Task {
+-  private static final long FINISH_TIME_NOT_INITIALIZED = Long.MIN_VALUE;
+-  // resource manager
+-  protected ResourceManager rm;
+-  // main
+-  protected SLSRunner se;
+-  // application
+-  protected ApplicationId appId;
+-  protected ApplicationAttemptId appAttemptId;
+-  protected String oldAppId;    // jobId from the jobhistory file
+-  // record factory
+-  protected final static RecordFactory recordFactory =
+-          RecordFactoryProvider.getRecordFactory(null);
+-  // response queue
+-  protected final BlockingQueue<AllocateResponse> responseQueue;
+-  private int responseId = 0;
+-  // user name
+-  private String user;
+-  // nodelabel expression
+-  private String nodeLabelExpression;
+-  // queue name
+-  protected String queue;
+-  // am type
+-  protected String amtype;
+-  // job start/end time
+-  private long baselineTimeMS;
+-  protected long traceStartTimeMS;
+-  protected long traceFinishTimeMS;
+-  protected long simulateStartTimeMS;
+-  protected long simulateFinishTimeMS = FINISH_TIME_NOT_INITIALIZED;
+-  // whether tracked in Metrics
+-  protected boolean isTracked;
+-  // progress
+-  protected int totalContainers;
+-  protected int finishedContainers;
+-
+-  // waiting for AM container
+-  volatile boolean isAMContainerRunning = false;
+-  volatile Container amContainer;
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(AMSimulator.class);
+-
+-  private Resource amContainerResource;
+-
+-  private ReservationSubmissionRequest reservationRequest;
+-
+-  private Map<ApplicationId, AMSimulator> appIdToAMSim;
+-
+-  private Set<NodeId> ranNodes = new ConcurrentSkipListSet<NodeId>();
+-
+-  public AMSimulator() {
+-    this.responseQueue = new LinkedBlockingQueue<>();
+-  }
+-
+-  public void init(AMDefinition amDef, ResourceManager rm, SLSRunner slsRunner,
+-      boolean tracked, long baselineTimeMS, long heartbeatInterval,
+-      Map<ApplicationId, AMSimulator> appIdToAMSim) {
+-    long startTime = amDef.getJobStartTime();
+-    long endTime = startTime + 1000000L * heartbeatInterval;
+-    super.init(startTime, endTime, heartbeatInterval);
+-
+-    this.user = amDef.getUser();
+-    this.queue = amDef.getQueue();
+-    this.oldAppId = amDef.getOldAppId();
+-    this.amContainerResource = amDef.getAmResource();
+-    this.nodeLabelExpression = amDef.getLabelExpression();
+-    this.traceStartTimeMS = amDef.getJobStartTime();
+-    this.traceFinishTimeMS = amDef.getJobFinishTime();
+-    this.rm = rm;
+-    this.se = slsRunner;
+-    this.isTracked = tracked;
+-    this.baselineTimeMS = baselineTimeMS;
+-    this.appIdToAMSim = appIdToAMSim;
+-  }
+-
+-  /**
+-   * register with RM
+-   */
+-  @Override
+-  public void firstStep() throws Exception {
+-    simulateStartTimeMS = System.currentTimeMillis() - baselineTimeMS;
+-
+-    ReservationId reservationId = null;
+-
+-    // submit a reservation if one is required, exceptions naturally happen
+-    // when the reservation does not fit, catch, log, and move on running job
+-    // without reservation.
+-    try {
+-      reservationId = submitReservationWhenSpecified();
+-    } catch (UndeclaredThrowableException y) {
+-      LOG.warn("Unable to place reservation: " + y.getMessage());
+-    }
+-
+-    // submit application, waiting until ACCEPTED
+-    submitApp(reservationId);
+-
+-    // add submitted app to mapping
+-    appIdToAMSim.put(appId, this);
+-
+-    // track app metrics
+-    trackApp();
+-  }
+-
+-  public synchronized void notifyAMContainerLaunched(Container masterContainer)
+-      throws Exception {
+-    this.amContainer = masterContainer;
+-    this.appAttemptId = masterContainer.getId().getApplicationAttemptId();
+-    registerAM();
+-    isAMContainerRunning = true;
+-  }
+-
+-  protected void setReservationRequest(ReservationSubmissionRequest rr){
+-    this.reservationRequest = rr;
+-  }
+-
+-  private ReservationId submitReservationWhenSpecified()
+-      throws IOException, InterruptedException {
+-    if (reservationRequest != null) {
+-      UserGroupInformation ugi = UserGroupInformation.createRemoteUser(user);
+-      ugi.doAs(new PrivilegedExceptionAction<Object>() {
+-        @Override
+-        public Object run() throws YarnException, IOException {
+-          rm.getClientRMService().submitReservation(reservationRequest);
+-          LOG.info("RESERVATION SUCCESSFULLY SUBMITTED "
+-              + reservationRequest.getReservationId());
+-          return null;
+-
+-        }
+-      });
+-      return reservationRequest.getReservationId();
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  public void middleStep() throws Exception {
+-    if (isAMContainerRunning) {
+-      // process responses in the queue
+-      processResponseQueue();
+-
+-      // send out request
+-      sendContainerRequest();
+-
+-      // check whether finish
+-      checkStop();
+-    }
+-  }
+-
+-  @Override
+-  public void lastStep() throws Exception {
+-    if (simulateFinishTimeMS != FINISH_TIME_NOT_INITIALIZED) {
+-      // The finish time is already recorded.
+-      // Different value from zero means lastStep was called before.
+-      // We want to prevent lastStep to be called more than once.
+-      // See YARN-10427 for more details.
+-      LOG.warn("Method AMSimulator#lastStep was already called. " +
+-          "Skipping execution of method for application: {}", appId);
+-      return;
+-    }
+-
+-    LOG.info("Application {} is shutting down.", appId);
+-    // unregister tracking
+-    if (isTracked) {
+-      untrackApp();
+-    }
+-
+-    // Finish AM container
+-    if (amContainer != null) {
+-      LOG.info("AM container = {} reported to finish", amContainer.getId());
+-      se.getNmMap().get(amContainer.getNodeId()).cleanupContainer(
+-          amContainer.getId());
+-    } else {
+-      LOG.info("AM container is null");
+-    }
+-
+-    // Clear runningApps for ranNodes of this app
+-    for (NodeId nodeId : ranNodes) {
+-      se.getNmMap().get(nodeId).finishApplication(getApplicationId());
+-    }
+-
+-    if (null == appAttemptId) {
+-      // If appAttemptId == null, AM is not launched from RM's perspective, so
+-      // it's unnecessary to finish am as well
+-      return;
+-    }
+-
+-    // unregister application master
+-    final FinishApplicationMasterRequest finishAMRequest = recordFactory
+-                  .newRecordInstance(FinishApplicationMasterRequest.class);
+-    finishAMRequest.setFinalApplicationStatus(FinalApplicationStatus.SUCCEEDED);
+-
+-    UserGroupInformation ugi =
+-        UserGroupInformation.createRemoteUser(appAttemptId.toString());
+-    Token<AMRMTokenIdentifier> token = rm.getRMContext().getRMApps().get(appId)
+-        .getRMAppAttempt(appAttemptId).getAMRMToken();
+-    ugi.addTokenIdentifier(token.decodeIdentifier());
+-    ugi.doAs(new PrivilegedExceptionAction<Object>() {
+-      @Override
+-      public Object run() throws Exception {
+-        rm.getApplicationMasterService()
+-            .finishApplicationMaster(finishAMRequest);
+-        return null;
+-      }
+-    });
+-
+-    simulateFinishTimeMS = System.currentTimeMillis() - baselineTimeMS;
+-    // record job running information
+-    SchedulerMetrics schedulerMetrics =
+-            ((SchedulerWrapper)rm.getResourceScheduler()).getSchedulerMetrics();
+-    if (schedulerMetrics != null) {
+-      schedulerMetrics.addAMRuntime(appId, traceStartTimeMS, traceFinishTimeMS,
+-              simulateStartTimeMS, simulateFinishTimeMS);
+-    }
+-  }
+-
+-  protected ResourceRequest createResourceRequest(Resource resource,
+-      ExecutionType executionType, String host, int priority, long
+-      allocationId, int numContainers) {
+-    ResourceRequest request = recordFactory
+-        .newRecordInstance(ResourceRequest.class);
+-    request.setCapability(resource);
+-    request.setResourceName(host);
+-    request.setNumContainers(numContainers);
+-    request.setExecutionTypeRequest(
+-        ExecutionTypeRequest.newInstance(executionType));
+-    Priority prio = recordFactory.newRecordInstance(Priority.class);
+-    prio.setPriority(priority);
+-    request.setPriority(prio);
+-    request.setAllocationRequestId(allocationId);
+-    return request;
+-  }
+-
+-  protected AllocateRequest createAllocateRequest(List<ResourceRequest> ask,
+-      List<ContainerId> toRelease) {
+-    AllocateRequest allocateRequest =
+-            recordFactory.newRecordInstance(AllocateRequest.class);
+-    allocateRequest.setResponseId(responseId++);
+-    allocateRequest.setAskList(ask);
+-    allocateRequest.setReleaseList(toRelease);
+-    return allocateRequest;
+-  }
+-
+-  protected AllocateRequest createAllocateRequest(List<ResourceRequest> ask) {
+-    return createAllocateRequest(ask, new ArrayList<ContainerId>());
+-  }
+-
+-  protected abstract void processResponseQueue() throws Exception;
+-
+-  protected abstract void sendContainerRequest() throws Exception;
+-
+-  public abstract void initReservation(
+-      ReservationId reservationId, long deadline, long now);
+-
+-  protected abstract void checkStop();
+-
+-  private void submitApp(ReservationId reservationId)
+-          throws YarnException, InterruptedException, IOException {
+-    // ask for new application
+-    GetNewApplicationRequest newAppRequest =
+-        Records.newRecord(GetNewApplicationRequest.class);
+-    GetNewApplicationResponse newAppResponse =
+-        rm.getClientRMService().getNewApplication(newAppRequest);
+-    appId = newAppResponse.getApplicationId();
+-
+-    // submit the application
+-    final SubmitApplicationRequest subAppRequest =
+-        Records.newRecord(SubmitApplicationRequest.class);
+-    ApplicationSubmissionContext appSubContext =
+-        Records.newRecord(ApplicationSubmissionContext.class);
+-    appSubContext.setApplicationId(appId);
+-    appSubContext.setMaxAppAttempts(1);
+-    appSubContext.setQueue(queue);
+-    appSubContext.setPriority(Priority.newInstance(0));
+-    ContainerLaunchContext conLauContext =
+-        Records.newRecord(ContainerLaunchContext.class);
+-    conLauContext.setApplicationACLs(new HashMap<>());
+-    conLauContext.setCommands(new ArrayList<>());
+-    conLauContext.setEnvironment(new HashMap<>());
+-    conLauContext.setLocalResources(new HashMap<>());
+-    conLauContext.setServiceData(new HashMap<>());
+-    appSubContext.setAMContainerSpec(conLauContext);
+-    appSubContext.setResource(amContainerResource);
+-    if (nodeLabelExpression != null) {
+-      appSubContext.setNodeLabelExpression(nodeLabelExpression);
+-    }
+-
+-    if(reservationId != null) {
+-      appSubContext.setReservationID(reservationId);
+-    }
+-
+-    subAppRequest.setApplicationSubmissionContext(appSubContext);
+-    UserGroupInformation ugi = UserGroupInformation.createRemoteUser(user);
+-    ugi.doAs(new PrivilegedExceptionAction<Object>() {
+-      @Override
+-      public Object run() throws YarnException, IOException {
+-        rm.getClientRMService().submitApplication(subAppRequest);
+-        return null;
+-      }
+-    });
+-    LOG.info("Submit a new application {}", appId);
+-  }
+-
+-  private void registerAM()
+-          throws YarnException, IOException, InterruptedException {
+-    // register application master
+-    final RegisterApplicationMasterRequest amRegisterRequest =
+-            Records.newRecord(RegisterApplicationMasterRequest.class);
+-    amRegisterRequest.setHost("localhost");
+-    amRegisterRequest.setRpcPort(1000);
+-    amRegisterRequest.setTrackingUrl("localhost:1000");
+-
+-    UserGroupInformation ugi =
+-        UserGroupInformation.createRemoteUser(appAttemptId.toString());
+-    Token<AMRMTokenIdentifier> token = rm.getRMContext().getRMApps().get(appId)
+-        .getRMAppAttempt(appAttemptId).getAMRMToken();
+-    ugi.addTokenIdentifier(token.decodeIdentifier());
+-
+-    ugi.doAs(
+-            new PrivilegedExceptionAction<RegisterApplicationMasterResponse>() {
+-      @Override
+-      public RegisterApplicationMasterResponse run() throws Exception {
+-        return rm.getApplicationMasterService()
+-                .registerApplicationMaster(amRegisterRequest);
+-      }
+-    });
+-
+-    LOG.info("Register the application master for application {}", appId);
+-  }
+-
+-  private void trackApp() {
+-    if (isTracked) {
+-      SchedulerMetrics schedulerMetrics =
+-          ((SchedulerWrapper)rm.getResourceScheduler()).getSchedulerMetrics();
+-      if (schedulerMetrics != null) {
+-        schedulerMetrics.addTrackedApp(appId, oldAppId);
+-      }
+-    }
+-  }
+-  public void untrackApp() {
+-    if (isTracked) {
+-      SchedulerMetrics schedulerMetrics =
+-          ((SchedulerWrapper)rm.getResourceScheduler()).getSchedulerMetrics();
+-      if (schedulerMetrics != null) {
+-        schedulerMetrics.removeTrackedApp(oldAppId);
+-      }
+-    }
+-  }
+-
+-  protected List<ResourceRequest> packageRequests(
+-          List<ContainerSimulator> csList, int priority) {
+-    // create requests
+-    Map<Long, Map<String, ResourceRequest>> rackLocalRequests =
+-        new HashMap<>();
+-    Map<Long, Map<String, ResourceRequest>> nodeLocalRequests =
+-        new HashMap<>();
+-    Map<Long, ResourceRequest> anyRequests = new HashMap<>();
+-    for (ContainerSimulator cs : csList) {
+-      long allocationId = cs.getAllocationId();
+-      ResourceRequest anyRequest = anyRequests.get(allocationId);
+-      if (cs.getHostname() != null) {
+-        Map<String, ResourceRequest> rackLocalRequestMap;
+-        if (rackLocalRequests.containsKey(allocationId)) {
+-          rackLocalRequestMap = rackLocalRequests.get(allocationId);
+-        } else {
+-          rackLocalRequestMap = new HashMap<>();
+-          rackLocalRequests.put(allocationId, rackLocalRequestMap);
+-        }
+-        String[] rackHostNames = SLSUtils.getRackHostName(cs.getHostname());
+-        // check rack local
+-        String rackname = "/" + rackHostNames[0];
+-        if (rackLocalRequestMap.containsKey(rackname)) {
+-          rackLocalRequestMap.get(rackname).setNumContainers(
+-              rackLocalRequestMap.get(rackname).getNumContainers() + 1);
+-        } else {
+-          ResourceRequest request = createResourceRequest(cs.getResource(),
+-              cs.getExecutionType(), rackname, priority,
+-              cs.getAllocationId(), 1);
+-          rackLocalRequestMap.put(rackname, request);
+-        }
+-        // check node local
+-        Map<String, ResourceRequest> nodeLocalRequestMap;
+-        if (nodeLocalRequests.containsKey(allocationId)) {
+-          nodeLocalRequestMap = nodeLocalRequests.get(allocationId);
+-        } else {
+-          nodeLocalRequestMap = new HashMap<>();
+-          nodeLocalRequests.put(allocationId, nodeLocalRequestMap);
+-        }
+-        String hostname = rackHostNames[1];
+-        if (nodeLocalRequestMap.containsKey(hostname)) {
+-          nodeLocalRequestMap.get(hostname).setNumContainers(
+-              nodeLocalRequestMap.get(hostname).getNumContainers() + 1);
+-        } else {
+-          ResourceRequest request = createResourceRequest(cs.getResource(),
+-              cs.getExecutionType(), hostname, priority,
+-              cs.getAllocationId(), 1);
+-          nodeLocalRequestMap.put(hostname, request);
+-        }
+-      }
+-      // any
+-      if (anyRequest == null) {
+-        anyRequest = createResourceRequest(cs.getResource(),
+-            cs.getExecutionType(), ResourceRequest.ANY, priority,
+-            cs.getAllocationId(), 1);
+-        anyRequests.put(allocationId, anyRequest);
+-      } else {
+-        anyRequest.setNumContainers(anyRequest.getNumContainers() + 1);
+-      }
+-    }
+-    List<ResourceRequest> ask = new ArrayList<ResourceRequest>();
+-    for (Map<String, ResourceRequest> nodeLocalRequestMap :
+-        nodeLocalRequests.values()) {
+-      ask.addAll(nodeLocalRequestMap.values());
+-    }
+-    for (Map<String, ResourceRequest> rackLocalRequestMap :
+-        rackLocalRequests.values()) {
+-      ask.addAll(rackLocalRequestMap.values());
+-    }
+-    ask.addAll(anyRequests.values());
+-    return ask;
+-  }
+-
+-  public String getQueue() {
+-    return queue;
+-  }
+-  public String getAMType() {
+-    return amtype;
+-  }
+-  public long getDuration() {
+-    return simulateFinishTimeMS - simulateStartTimeMS;
+-  }
+-  public int getNumTasks() {
+-    return totalContainers;
+-  }
+-
+-  public ApplicationId getApplicationId() {
+-    return appId;
+-  }
+-
+-  public ApplicationAttemptId getApplicationAttemptId() {
+-    return appAttemptId;
+-  }
+-
+-  public Set<NodeId> getRanNodes() {
+-    return this.ranNodes;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/DAGAMSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/DAGAMSimulator.java
+deleted file mode 100644
+index 418408db9fb..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/DAGAMSimulator.java
++++ /dev/null
+@@ -1,285 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-package org.apache.hadoop.yarn.sls.appmaster;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.sls.AMDefinition;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * AMSimulator that simulates DAG - it requests for containers
+- * based on the delay specified. It finishes when all the tasks
+- * are completed.
+- * Vocabulary Used:
+- * <dl>
+- * <dt>Pending</dt><dd>requests which are NOT yet sent to RM.</dd>
+- * <dt>Scheduled</dt>
+- * <dd>requests which are sent to RM but not yet assigned.</dd>
+- * <dt>Assigned</dt><dd>requests which are assigned to a container.</dd>
+- * <dt>Completed</dt>
+- * <dd>request corresponding to which container has completed.</dd>
+- * </dl>
+- * Containers are requested based on the request delay.
+- */
+-
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-public class DAGAMSimulator extends AMSimulator {
+-
+-  private static final int PRIORITY = 20;
+-
+-  private List<ContainerSimulator> pendingContainers =
+-      new LinkedList<>();
+-
+-  private List<ContainerSimulator> scheduledContainers =
+-      new LinkedList<>();
+-
+-  private Map<ContainerId, ContainerSimulator> assignedContainers =
+-      new HashMap<>();
+-
+-  private List<ContainerSimulator> completedContainers =
+-      new LinkedList<>();
+-
+-  private List<ContainerSimulator> allContainers =
+-      new LinkedList<>();
+-
+-  private boolean isFinished = false;
+-
+-  private long amStartTime;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DAGAMSimulator.class);
+-
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  public void init(AMDefinition amDef, ResourceManager rm, SLSRunner slsRunner,
+-      boolean tracked, long baselineTimeMS, long heartbeatInterval,
+-      Map<ApplicationId, AMSimulator> appIdToAMSim) {
+-    super.init(amDef, rm, slsRunner, tracked, baselineTimeMS, heartbeatInterval,
+-        appIdToAMSim);
+-    super.amtype = "dag";
+-
+-    allContainers.addAll(amDef.getTaskContainers());
+-    pendingContainers.addAll(amDef.getTaskContainers());
+-    totalContainers = allContainers.size();
+-
+-    LOG.info("Added new job with {} containers", allContainers.size());
+-  }
+-
+-  @Override
+-  public void firstStep() throws Exception {
+-    super.firstStep();
+-    amStartTime = System.currentTimeMillis();
+-  }
+-
+-  @Override
+-  public void initReservation(ReservationId reservationId,
+-      long deadline, long now) {
+-    // DAG AM doesn't support reservation
+-    setReservationRequest(null);
+-  }
+-
+-  @Override
+-  public synchronized void notifyAMContainerLaunched(Container masterContainer)
+-      throws Exception {
+-    if (null != masterContainer) {
+-      restart();
+-      super.notifyAMContainerLaunched(masterContainer);
+-    }
+-  }
+-
+-  protected void processResponseQueue() throws Exception {
+-    while (!responseQueue.isEmpty()) {
+-      AllocateResponse response = responseQueue.take();
+-
+-      // check completed containers
+-      if (!response.getCompletedContainersStatuses().isEmpty()) {
+-        for (ContainerStatus cs : response.getCompletedContainersStatuses()) {
+-          ContainerId containerId = cs.getContainerId();
+-          if (cs.getExitStatus() == ContainerExitStatus.SUCCESS) {
+-            if (assignedContainers.containsKey(containerId)) {
+-              LOG.debug("Application {} has one container finished ({}).",
+-                  appId, containerId);
+-              ContainerSimulator containerSimulator =
+-                  assignedContainers.remove(containerId);
+-              finishedContainers++;
+-              completedContainers.add(containerSimulator);
+-            } else if (amContainer.getId().equals(containerId)) {
+-              // am container released event
+-              isFinished = true;
+-              LOG.info("Application {} goes to finish.", appId);
+-            }
+-            if (finishedContainers >= totalContainers) {
+-              lastStep();
+-            }
+-          } else {
+-            // container to be killed
+-            if (assignedContainers.containsKey(containerId)) {
+-              LOG.error("Application {} has one container killed ({}).", appId,
+-                  containerId);
+-              pendingContainers.add(assignedContainers.remove(containerId));
+-            } else if (amContainer.getId().equals(containerId)) {
+-              LOG.error("Application {}'s AM is "
+-                  + "going to be killed. Waiting for rescheduling...", appId);
+-            }
+-          }
+-        }
+-      }
+-
+-      // check finished
+-      if (isAMContainerRunning &&
+-          (finishedContainers >= totalContainers)) {
+-        isAMContainerRunning = false;
+-        LOG.info("Application {} sends out event to clean up"
+-            + " its AM container.", appId);
+-        isFinished = true;
+-        break;
+-      }
+-
+-      // check allocated containers
+-      for (Container container : response.getAllocatedContainers()) {
+-        if (!scheduledContainers.isEmpty()) {
+-          ContainerSimulator cs = scheduledContainers.remove(0);
+-          LOG.debug("Application {} starts to launch a container ({}).",
+-              appId, container.getId());
+-          assignedContainers.put(container.getId(), cs);
+-          se.getNmMap().get(container.getNodeId())
+-              .addNewContainer(container, cs.getLifeTime(), appId);
+-          getRanNodes().add(container.getNodeId());
+-        }
+-      }
+-    }
+-  }
+-
+-  @Override
+-  protected void sendContainerRequest() throws Exception {
+-    if (isFinished) {
+-      return;
+-    }
+-    // send out request
+-    List<ResourceRequest> ask = null;
+-    if (finishedContainers != totalContainers) {
+-      if (!pendingContainers.isEmpty()) {
+-        List<ContainerSimulator> toBeScheduled =
+-            getToBeScheduledContainers(pendingContainers, amStartTime);
+-        if (toBeScheduled.size() > 0) {
+-          ask = packageRequests(toBeScheduled, PRIORITY);
+-          LOG.info("Application {} sends out request for {} containers.",
+-              appId, toBeScheduled.size());
+-          scheduledContainers.addAll(toBeScheduled);
+-          pendingContainers.removeAll(toBeScheduled);
+-          toBeScheduled.clear();
+-        }
+-      }
+-    }
+-
+-    if (ask == null) {
+-      ask = new ArrayList<>();
+-    }
+-
+-    final AllocateRequest request = createAllocateRequest(ask);
+-    if (totalContainers == 0) {
+-      request.setProgress(1.0f);
+-    } else {
+-      request.setProgress((float) finishedContainers / totalContainers);
+-    }
+-
+-    UserGroupInformation ugi =
+-        UserGroupInformation.createRemoteUser(appAttemptId.toString());
+-    Token<AMRMTokenIdentifier> token = rm.getRMContext().getRMApps()
+-        .get(appAttemptId.getApplicationId())
+-        .getRMAppAttempt(appAttemptId).getAMRMToken();
+-    ugi.addTokenIdentifier(token.decodeIdentifier());
+-    AllocateResponse response = ugi.doAs(
+-        (PrivilegedExceptionAction<AllocateResponse>) () -> rm
+-            .getApplicationMasterService().allocate(request));
+-    if (response != null) {
+-      responseQueue.put(response);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  public List<ContainerSimulator> getToBeScheduledContainers(
+-      List<ContainerSimulator> containers, long startTime) {
+-    List<ContainerSimulator> toBeScheduled = new LinkedList<>();
+-    for (ContainerSimulator cs : containers) {
+-      // only request for the container if it is time to request
+-      if (cs.getRequestDelay() + startTime <=
+-          System.currentTimeMillis()) {
+-        toBeScheduled.add(cs);
+-      }
+-    }
+-    return toBeScheduled;
+-  }
+-
+-  @Override
+-  protected void checkStop() {
+-    if (isFinished) {
+-      super.setEndTime(System.currentTimeMillis());
+-    }
+-  }
+-
+-  @Override
+-  public void lastStep() throws Exception {
+-    super.lastStep();
+-
+-    //clear data structures.
+-    allContainers.clear();
+-    pendingContainers.clear();
+-    scheduledContainers.clear();
+-    assignedContainers.clear();
+-    completedContainers.clear();
+-  }
+-
+-  /**
+-   * restart running because of the am container killed.
+-   */
+-  private void restart() {
+-    isFinished = false;
+-    pendingContainers.clear();
+-    pendingContainers.addAll(allContainers);
+-    pendingContainers.removeAll(completedContainers);
+-    amContainer = null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
+deleted file mode 100644
+index 976c0229b86..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/MRAMSimulator.java
++++ /dev/null
+@@ -1,415 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.appmaster;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.sls.AMDefinition;
+-import org.apache.hadoop.yarn.sls.ReservationClientUtil;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class MRAMSimulator extends AMSimulator {
+-  /*
+-  Vocabulary Used:
+-  pending -> requests which are NOT yet sent to RM
+-  scheduled -> requests which are sent to RM but not yet assigned
+-  assigned -> requests which are assigned to a container
+-  completed -> request corresponding to which container has completed
+-
+-  Maps are scheduled as soon as their requests are received. Reduces are
+-  scheduled when all maps have finished (not support slow-start currently).
+-  */
+-
+-  public static final String MAP_TYPE = "map";
+-  public static final String REDUCE_TYPE = "reduce";
+-
+-  private static final int PRIORITY_REDUCE = 10;
+-  private static final int PRIORITY_MAP = 20;
+-
+-  // pending maps
+-  private LinkedList<ContainerSimulator> pendingMaps =
+-          new LinkedList<>();
+-
+-  // pending failed maps
+-  private LinkedList<ContainerSimulator> pendingFailedMaps =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // scheduled maps
+-  private LinkedList<ContainerSimulator> scheduledMaps =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // assigned maps
+-  private Map<ContainerId, ContainerSimulator> assignedMaps =
+-          new HashMap<ContainerId, ContainerSimulator>();
+-
+-  // reduces which are not yet scheduled
+-  private LinkedList<ContainerSimulator> pendingReduces =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // pending failed reduces
+-  private LinkedList<ContainerSimulator> pendingFailedReduces =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // scheduled reduces
+-  private LinkedList<ContainerSimulator> scheduledReduces =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // assigned reduces
+-  private Map<ContainerId, ContainerSimulator> assignedReduces =
+-          new HashMap<ContainerId, ContainerSimulator>();
+-
+-  // all maps & reduces
+-  private LinkedList<ContainerSimulator> allMaps =
+-          new LinkedList<ContainerSimulator>();
+-  private LinkedList<ContainerSimulator> allReduces =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // counters
+-  private int mapFinished = 0;
+-  private int mapTotal = 0;
+-  private int reduceFinished = 0;
+-  private int reduceTotal = 0;
+-
+-  // finished
+-  private boolean isFinished = false;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(MRAMSimulator.class);
+-
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  public void init(AMDefinition amDef, ResourceManager rm, SLSRunner slsRunner,
+-      boolean tracked, long baselineTimeMS, long heartbeatInterval,
+-      Map<ApplicationId, AMSimulator> appIdToAMSim) {
+-    super.init(amDef, rm, slsRunner, tracked, baselineTimeMS,
+-        heartbeatInterval, appIdToAMSim);
+-    amtype = "mapreduce";
+-
+-    // get map/reduce tasks
+-    for (ContainerSimulator cs : amDef.getTaskContainers()) {
+-      if (cs.getType().equals("map")) {
+-        cs.setPriority(PRIORITY_MAP);
+-        allMaps.add(cs);
+-      } else if (cs.getType().equals("reduce")) {
+-        cs.setPriority(PRIORITY_REDUCE);
+-        allReduces.add(cs);
+-      }
+-    }
+-
+-    LOG.info("Added new job with {} mapper and {} reducers",
+-        allMaps.size(), allReduces.size());
+-
+-    mapTotal = allMaps.size();
+-    reduceTotal = allReduces.size();
+-    totalContainers = mapTotal + reduceTotal;
+-  }
+-
+-  @Override
+-  public synchronized void notifyAMContainerLaunched(Container masterContainer)
+-      throws Exception {
+-    if (null != masterContainer) {
+-      restart();
+-      super.notifyAMContainerLaunched(masterContainer);
+-    }
+-  }
+-
+-  @Override
+-  @SuppressWarnings("unchecked")
+-  protected void processResponseQueue() throws Exception {
+-    while (! responseQueue.isEmpty()) {
+-      AllocateResponse response = responseQueue.take();
+-
+-      // check completed containers
+-      if (! response.getCompletedContainersStatuses().isEmpty()) {
+-        for (ContainerStatus cs : response.getCompletedContainersStatuses()) {
+-          ContainerId containerId = cs.getContainerId();
+-          if (cs.getExitStatus() == ContainerExitStatus.SUCCESS) {
+-            if (assignedMaps.containsKey(containerId)) {
+-              LOG.debug("Application {} has one mapper finished ({}).",
+-                  appId, containerId);
+-              assignedMaps.remove(containerId);
+-              mapFinished ++;
+-              finishedContainers ++;
+-            } else if (assignedReduces.containsKey(containerId)) {
+-              LOG.debug("Application {} has one reducer finished ({}).",
+-                  appId, containerId);
+-              assignedReduces.remove(containerId);
+-              reduceFinished ++;
+-              finishedContainers ++;
+-            } else if (amContainer.getId().equals(containerId)){
+-              // am container released event
+-              isFinished = true;
+-              LOG.info("Application {} goes to finish.", appId);
+-            }
+-
+-            if (mapFinished >= mapTotal && reduceFinished >= reduceTotal) {
+-              lastStep();
+-            }
+-          } else {
+-            // container to be killed
+-            if (assignedMaps.containsKey(containerId)) {
+-              LOG.debug("Application {} has one mapper killed ({}).",
+-                  appId, containerId);
+-              pendingFailedMaps.add(assignedMaps.remove(containerId));
+-            } else if (assignedReduces.containsKey(containerId)) {
+-              LOG.debug("Application {} has one reducer killed ({}).",
+-                  appId, containerId);
+-              pendingFailedReduces.add(assignedReduces.remove(containerId));
+-            } else if (amContainer.getId().equals(containerId)){
+-              LOG.info("Application {}'s AM is " +
+-                  "going to be killed. Waiting for rescheduling...", appId);
+-            }
+-          }
+-        }
+-      }
+-
+-      // check finished
+-      if (isAMContainerRunning &&
+-              (mapFinished >= mapTotal) &&
+-              (reduceFinished >= reduceTotal)) {
+-        isAMContainerRunning = false;
+-        LOG.debug("Application {} sends out event to clean up"
+-            + " its AM container.", appId);
+-        isFinished = true;
+-        break;
+-      }
+-
+-      // check allocated containers
+-      for (Container container : response.getAllocatedContainers()) {
+-        if (! scheduledMaps.isEmpty()) {
+-          ContainerSimulator cs = scheduledMaps.remove();
+-          LOG.debug("Application {} starts to launch a mapper ({}).",
+-              appId, container.getId());
+-          assignedMaps.put(container.getId(), cs);
+-          se.getNmMap().get(container.getNodeId())
+-              .addNewContainer(container, cs.getLifeTime(), appId);
+-          getRanNodes().add(container.getNodeId());
+-        } else if (! this.scheduledReduces.isEmpty()) {
+-          ContainerSimulator cs = scheduledReduces.remove();
+-          LOG.debug("Application {} starts to launch a reducer ({}).",
+-              appId, container.getId());
+-          assignedReduces.put(container.getId(), cs);
+-          se.getNmMap().get(container.getNodeId())
+-              .addNewContainer(container, cs.getLifeTime(), appId);
+-          getRanNodes().add(container.getNodeId());
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * restart running because of the am container killed
+-   */
+-  private void restart()
+-          throws YarnException, IOException, InterruptedException {
+-    // clear
+-    isFinished = false;
+-    pendingFailedMaps.clear();
+-    pendingMaps.clear();
+-    pendingReduces.clear();
+-    pendingFailedReduces.clear();
+-
+-    // Only add totalMaps - finishedMaps
+-    int added = 0;
+-    for (ContainerSimulator cs : allMaps) {
+-      if (added >= mapTotal - mapFinished) {
+-        break;
+-      }
+-      pendingMaps.add(cs);
+-    }
+-
+-    // And same, only add totalReduces - finishedReduces
+-    added = 0;
+-    for (ContainerSimulator cs : allReduces) {
+-      if (added >= reduceTotal - reduceFinished) {
+-        break;
+-      }
+-      pendingReduces.add(cs);
+-    }
+-    amContainer = null;
+-  }
+-
+-  private List<ContainerSimulator> mergeLists(List<ContainerSimulator> left, List<ContainerSimulator> right) {
+-    List<ContainerSimulator> list = new ArrayList<>();
+-    list.addAll(left);
+-    list.addAll(right);
+-    return list;
+-  }
+-
+-  @Override
+-  protected void sendContainerRequest()
+-          throws YarnException, IOException, InterruptedException {
+-    if (isFinished) {
+-      return;
+-    }
+-
+-    // send out request
+-    List<ResourceRequest> ask = null;
+-    if (mapFinished != mapTotal) {
+-      // map phase
+-      if (!pendingMaps.isEmpty()) {
+-        ask = packageRequests(mergeLists(pendingMaps, scheduledMaps),
+-            PRIORITY_MAP);
+-        LOG.debug("Application {} sends out request for {} mappers.",
+-            appId, pendingMaps.size());
+-        scheduledMaps.addAll(pendingMaps);
+-        pendingMaps.clear();
+-      } else if (!pendingFailedMaps.isEmpty()) {
+-        ask = packageRequests(mergeLists(pendingFailedMaps, scheduledMaps),
+-            PRIORITY_MAP);
+-        LOG.debug("Application {} sends out requests for {} failed mappers.",
+-            appId, pendingFailedMaps.size());
+-        scheduledMaps.addAll(pendingFailedMaps);
+-        pendingFailedMaps.clear();
+-      }
+-    } else if (reduceFinished != reduceTotal) {
+-      // reduce phase
+-      if (!pendingReduces.isEmpty()) {
+-        ask = packageRequests(mergeLists(pendingReduces, scheduledReduces),
+-            PRIORITY_REDUCE);
+-        LOG.debug("Application {} sends out requests for {} reducers.",
+-                appId, pendingReduces.size());
+-        scheduledReduces.addAll(pendingReduces);
+-        pendingReduces.clear();
+-      } else if (!pendingFailedReduces.isEmpty()) {
+-        ask = packageRequests(mergeLists(pendingFailedReduces, scheduledReduces),
+-            PRIORITY_REDUCE);
+-        LOG.debug("Application {} sends out request for {} failed reducers.",
+-            appId, pendingFailedReduces.size());
+-        scheduledReduces.addAll(pendingFailedReduces);
+-        pendingFailedReduces.clear();
+-      }
+-    }
+-
+-    if (ask == null) {
+-      ask = new ArrayList<>();
+-    }
+-
+-    final AllocateRequest request = createAllocateRequest(ask);
+-    if (totalContainers == 0) {
+-      request.setProgress(1.0f);
+-    } else {
+-      request.setProgress((float) finishedContainers / totalContainers);
+-    }
+-
+-    UserGroupInformation ugi =
+-            UserGroupInformation.createRemoteUser(appAttemptId.toString());
+-    Token<AMRMTokenIdentifier> token = rm.getRMContext().getRMApps()
+-            .get(appAttemptId.getApplicationId())
+-            .getRMAppAttempt(appAttemptId).getAMRMToken();
+-    ugi.addTokenIdentifier(token.decodeIdentifier());
+-    AllocateResponse response = ugi.doAs(
+-            new PrivilegedExceptionAction<AllocateResponse>() {
+-      @Override
+-      public AllocateResponse run() throws Exception {
+-        return rm.getApplicationMasterService().allocate(request);
+-      }
+-    });
+-    if (response != null) {
+-      responseQueue.put(response);
+-    }
+-  }
+-
+-  @Override
+-  public void initReservation(ReservationId reservationId, long deadline,
+-      long now) {
+-
+-    Resource mapRes = getMaxResource(allMaps);
+-    long mapDur = getMaxDuration(allMaps);
+-    Resource redRes = getMaxResource(allReduces);
+-    long redDur = getMaxDuration(allReduces);
+-
+-    ReservationSubmissionRequest rr = ReservationClientUtil.
+-        createMRReservation(reservationId,
+-            "reservation_" + reservationId.getId(), mapRes, allMaps.size(),
+-            mapDur, redRes, allReduces.size(), redDur, now + traceStartTimeMS,
+-            now + deadline, queue);
+-
+-    setReservationRequest(rr);
+-  }
+-
+-  // Helper to compute the component-wise maximum resource used by any container
+-  private Resource getMaxResource(Collection<ContainerSimulator> containers) {
+-    return containers.parallelStream()
+-        .map(ContainerSimulator::getResource)
+-        .reduce(Resource.newInstance(0, 0), Resources::componentwiseMax);
+-  }
+-
+-  // Helper to compute the maximum resource used by any map container
+-  private long getMaxDuration(Collection<ContainerSimulator> containers) {
+-    return containers.parallelStream()
+-        .mapToLong(ContainerSimulator::getLifeTime)
+-        .reduce(0L, Long::max);
+-  }
+-
+-  @Override
+-  protected void checkStop() {
+-    if (isFinished) {
+-      super.setEndTime(System.currentTimeMillis());
+-    }
+-  }
+-
+-  @Override
+-  public void lastStep() throws Exception {
+-    super.lastStep();
+-
+-    // clear data structures
+-    allMaps.clear();
+-    allReduces.clear();
+-    assignedMaps.clear();
+-    assignedReduces.clear();
+-    pendingFailedMaps.clear();
+-    pendingFailedReduces.clear();
+-    pendingMaps.clear();
+-    pendingReduces.clear();
+-    scheduledMaps.clear();
+-    scheduledReduces.clear();
+-    responseQueue.clear();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/StreamAMSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/StreamAMSimulator.java
+deleted file mode 100644
+index 09297afd4d0..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/StreamAMSimulator.java
++++ /dev/null
+@@ -1,269 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.appmaster;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.sls.AMDefinition;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * AMSimulator that simulates streaming services - it keeps tasks
+- * running and resubmits them whenever they fail or complete. It finishes
+- * when the specified duration expires.
+- */
+-
+-@Private
+-@Unstable
+-public class StreamAMSimulator extends AMSimulator {
+-  /*
+-  Vocabulary Used:
+-  pending -> requests which are NOT yet sent to RM
+-  scheduled -> requests which are sent to RM but not yet assigned
+-  assigned -> requests which are assigned to a container
+-  completed -> request corresponding to which container has completed
+-
+-  streams are constantly scheduled. If a streaming job is killed, we restart it
+-  */
+-
+-  private static final int PRIORITY_MAP = 20;
+-
+-  // pending streams
+-  private LinkedList<ContainerSimulator> pendingStreams =
+-          new LinkedList<>();
+-
+-  // scheduled streams
+-  private LinkedList<ContainerSimulator> scheduledStreams =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // assigned streams
+-  private Map<ContainerId, ContainerSimulator> assignedStreams =
+-          new HashMap<ContainerId, ContainerSimulator>();
+-
+-  // all streams
+-  private LinkedList<ContainerSimulator> allStreams =
+-          new LinkedList<ContainerSimulator>();
+-
+-  // finished
+-  private boolean isFinished = false;
+-  private long duration = 0;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(StreamAMSimulator.class);
+-
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  public void init(AMDefinition amDef, ResourceManager rm, SLSRunner slsRunner,
+-      boolean tracked, long baselineTimeMS, long heartbeatInterval,
+-      Map<ApplicationId, AMSimulator> appIdToAMSim) {
+-    super.init(amDef, rm, slsRunner, tracked, baselineTimeMS,
+-        heartbeatInterval, appIdToAMSim);
+-    amtype = "stream";
+-    allStreams.addAll(amDef.getTaskContainers());
+-    duration = amDef.getJobFinishTime() - amDef.getJobStartTime();
+-    LOG.info("Added new job with {} streams, running for {}",
+-        allStreams.size(), duration);
+-  }
+-
+-  @Override
+-  public synchronized void notifyAMContainerLaunched(Container masterContainer)
+-      throws Exception {
+-    if (null != masterContainer) {
+-      restart();
+-      super.notifyAMContainerLaunched(masterContainer);
+-    }
+-  }
+-
+-  @Override
+-  @SuppressWarnings("unchecked")
+-  protected void processResponseQueue() throws Exception {
+-    while (!responseQueue.isEmpty()) {
+-      AllocateResponse response = responseQueue.take();
+-
+-      // check completed containers
+-      if (!response.getCompletedContainersStatuses().isEmpty()) {
+-        for (ContainerStatus cs : response.getCompletedContainersStatuses()) {
+-          ContainerId containerId = cs.getContainerId();
+-          if(assignedStreams.containsKey(containerId)){
+-            // One of our containers completed. Regardless of reason,
+-            // we want to maintain our streaming process
+-            LOG.debug("Application {} has one streamer finished ({}).", appId,
+-                containerId);
+-            pendingStreams.add(assignedStreams.remove(containerId));
+-          } else if (amContainer.getId().equals(containerId)){
+-            // Our am container completed
+-            if(cs.getExitStatus() == ContainerExitStatus.SUCCESS){
+-              // am container released event (am container completed on success)
+-              isAMContainerRunning = false;
+-              isFinished = true;
+-              LOG.info("Application {} goes to finish.", appId);
+-            } else {
+-              // am container killed - wait for re allocation
+-              LOG.info("Application {}'s AM is "
+-                  + "going to be killed. Waiting for rescheduling...", appId);
+-              isAMContainerRunning = false;
+-            }
+-          }
+-        }
+-      }
+-
+-      // check finished
+-      if (isAMContainerRunning &&
+-          (System.currentTimeMillis() - simulateStartTimeMS >= duration)) {
+-        LOG.debug("Application {} sends out event to clean up"
+-                + " its AM container.", appId);
+-        isAMContainerRunning = false;
+-        isFinished = true;
+-        break;
+-      }
+-
+-      // check allocated containers
+-      for (Container container : response.getAllocatedContainers()) {
+-        if (!scheduledStreams.isEmpty()) {
+-          ContainerSimulator cs = scheduledStreams.remove();
+-          LOG.debug("Application {} starts to launch a stream ({}).", appId,
+-              container.getId());
+-          assignedStreams.put(container.getId(), cs);
+-          se.getNmMap().get(container.getNodeId()).addNewContainer(container,
+-              cs.getLifeTime(), appId);
+-          getRanNodes().add(container.getNodeId());
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * restart running because of the am container killed.
+-   */
+-  private void restart()
+-          throws YarnException, IOException, InterruptedException {
+-    // clear
+-    isFinished = false;
+-    pendingStreams.clear();
+-    pendingStreams.addAll(allStreams);
+-
+-    amContainer = null;
+-  }
+-
+-  private List<ContainerSimulator> mergeLists(List<ContainerSimulator> left,
+-      List<ContainerSimulator> right) {
+-    List<ContainerSimulator> list = new ArrayList<>();
+-    list.addAll(left);
+-    list.addAll(right);
+-    return list;
+-  }
+-
+-  @Override
+-  protected void sendContainerRequest()
+-          throws YarnException, IOException, InterruptedException {
+-
+-    // send out request
+-    List<ResourceRequest> ask = new ArrayList<>();
+-    List<ContainerId> release = new ArrayList<>();
+-    if (!isFinished) {
+-      if (!pendingStreams.isEmpty()) {
+-        ask = packageRequests(mergeLists(pendingStreams, scheduledStreams),
+-            PRIORITY_MAP);
+-        LOG.debug("Application {} sends out request for {} streams.",
+-            appId, pendingStreams.size());
+-        scheduledStreams.addAll(pendingStreams);
+-        pendingStreams.clear();
+-      }
+-    }
+-
+-    if(isFinished){
+-      release.addAll(assignedStreams.keySet());
+-      ask.clear();
+-    }
+-
+-    final AllocateRequest request = createAllocateRequest(ask, release);
+-    if (totalContainers == 0) {
+-      request.setProgress(1.0f);
+-    } else {
+-      request.setProgress((float) finishedContainers / totalContainers);
+-    }
+-
+-    UserGroupInformation ugi =
+-        UserGroupInformation.createRemoteUser(appAttemptId.toString());
+-    Token<AMRMTokenIdentifier> token = rm.getRMContext().getRMApps()
+-        .get(appAttemptId.getApplicationId())
+-        .getRMAppAttempt(appAttemptId).getAMRMToken();
+-    ugi.addTokenIdentifier(token.decodeIdentifier());
+-    AllocateResponse response = ugi.doAs(
+-        new PrivilegedExceptionAction<AllocateResponse>() {
+-          @Override
+-          public AllocateResponse run() throws Exception {
+-            return rm.getApplicationMasterService().allocate(request);
+-          }
+-        });
+-    if (response != null) {
+-      responseQueue.put(response);
+-    }
+-  }
+-
+-  @Override
+-  public void initReservation(
+-      ReservationId reservationId, long deadline, long now){
+-    // Streaming AM currently doesn't do reservations
+-    setReservationRequest(null);
+-  }
+-
+-  @Override
+-  protected void checkStop() {
+-    if (isFinished) {
+-      super.setEndTime(System.currentTimeMillis());
+-    }
+-  }
+-
+-  @Override
+-  public void lastStep() throws Exception {
+-    super.lastStep();
+-
+-    // clear data structures
+-    allStreams.clear();
+-    assignedStreams.clear();
+-    pendingStreams.clear();
+-    scheduledStreams.clear();
+-    responseQueue.clear();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/package-info.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/package-info.java
+deleted file mode 100644
+index ead315be5bd..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/appmaster/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * Application Master simulators for the SLS.
+- */
+-package org.apache.hadoop.yarn.sls.appmaster;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
+deleted file mode 100644
+index 119960c92a4..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/conf/SLSConfiguration.java
++++ /dev/null
+@@ -1,134 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.conf;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-
+-@Private
+-@Unstable
+-public class SLSConfiguration {
+-  // sls
+-  public static final String PREFIX = "yarn.sls.";
+-  public static final String DNS_CACHING_ENABLED = PREFIX
+-      + "dns.caching.enabled";
+-  public static final boolean DNS_CACHING_ENABLED_DEFAULT = false;
+-  // runner
+-  public static final String RUNNER_PREFIX = PREFIX + "runner.";
+-  public static final String RUNNER_POOL_SIZE = RUNNER_PREFIX + "pool.size";
+-  public static final int RUNNER_POOL_SIZE_DEFAULT = 10;
+-  // scheduler
+-  public static final String SCHEDULER_PREFIX = PREFIX + "scheduler.";
+-  public static final String RM_SCHEDULER = SCHEDULER_PREFIX + "class";
+-  // metrics
+-  public static final String METRICS_PREFIX = PREFIX + "metrics.";
+-  public static final String METRICS_SWITCH = METRICS_PREFIX + "switch"; 
+-  public static final String METRICS_WEB_ADDRESS_PORT = METRICS_PREFIX
+-                                                  + "web.address.port";
+-  public static final String METRICS_OUTPUT_DIR = METRICS_PREFIX + "output";
+-  public static final int METRICS_WEB_ADDRESS_PORT_DEFAULT = 10001;
+-  public static final String METRICS_TIMER_WINDOW_SIZE = METRICS_PREFIX
+-                                                  + "timer.window.size";
+-  public static final int METRICS_TIMER_WINDOW_SIZE_DEFAULT = 100;
+-  public static final String METRICS_RECORD_INTERVAL_MS = METRICS_PREFIX
+-                                                  + "record.interval.ms";
+-  public static final int METRICS_RECORD_INTERVAL_MS_DEFAULT = 1000;
+-  // nm
+-  public static final String NM_PREFIX = PREFIX + "nm.";
+-  public static final String NM_MEMORY_MB = NM_PREFIX + "memory.mb";
+-  public static final int NM_MEMORY_MB_DEFAULT = 10240;
+-  public static final String NM_VCORES = NM_PREFIX + "vcores";
+-  public static final int NM_VCORES_DEFAULT = 10;
+-  public static final int NM_RESOURCE_DEFAULT = 0;
+-  public static final String NM_HEARTBEAT_INTERVAL_MS = NM_PREFIX
+-                                                  + "heartbeat.interval.ms";
+-  public static final int NM_HEARTBEAT_INTERVAL_MS_DEFAULT = 1000;
+-  // am
+-  public static final String AM_PREFIX = PREFIX + "am.";
+-  public static final String AM_HEARTBEAT_INTERVAL_MS = AM_PREFIX
+-                                                  + "heartbeat.interval.ms";
+-  public static final String NM_RESOURCE_UTILIZATION_RATIO = NM_PREFIX
+-      + "resource.utilization.ratio";
+-  public static final int AM_HEARTBEAT_INTERVAL_MS_DEFAULT = 1000;
+-  public static final String AM_TYPE = AM_PREFIX + "type";
+-  public static final String AM_TYPE_PREFIX = AM_TYPE + ".";
+-
+-  public static final String AM_CONTAINER_MEMORY = AM_PREFIX +
+-      "container.memory";
+-  public static final int AM_CONTAINER_MEMORY_DEFAULT = 1024;
+-
+-  public static final String AM_CONTAINER_VCORES = AM_PREFIX +
+-      "container.vcores";
+-  public static final int AM_CONTAINER_VCORES_DEFAULT = 1;
+-
+-  public static final float NM_RESOURCE_UTILIZATION_RATIO_DEFAULT = -1F;
+-
+-  // container
+-  public static final String CONTAINER_PREFIX = PREFIX + "container.";
+-  public static final String CONTAINER_MEMORY_MB = CONTAINER_PREFIX
+-          + "memory.mb";
+-  public static final int CONTAINER_MEMORY_MB_DEFAULT = 1024;
+-  public static final String CONTAINER_VCORES = CONTAINER_PREFIX + "vcores";
+-  public static final int CONTAINER_VCORES_DEFAULT = 1;
+-
+-  public static Resource getAMContainerResource(Configuration conf) {
+-    return Resource.newInstance(
+-        conf.getLong(AM_CONTAINER_MEMORY, AM_CONTAINER_MEMORY_DEFAULT),
+-        conf.getInt(AM_CONTAINER_VCORES, AM_CONTAINER_VCORES_DEFAULT));
+-  }
+-
+-  // input file
+-
+-  // nodes
+-  public static final String NUM_NODES = "num.nodes";
+-  public static final String NUM_RACKS = "num.racks";
+-
+-  // job
+-  public static final String JOB_PREFIX = "job.";
+-  public static final String JOB_ID = JOB_PREFIX + "id";
+-  public static final String JOB_START_MS = JOB_PREFIX + "start.ms";
+-  public static final String JOB_END_MS = JOB_PREFIX + "end.ms";
+-  public static final String JOB_QUEUE_NAME = JOB_PREFIX + "queue.name";
+-  public static final String JOB_LABEL_EXPR = JOB_PREFIX + "label.expression";
+-  public static final String JOB_USER = JOB_PREFIX + "user";
+-  public static final String JOB_COUNT = JOB_PREFIX + "count";
+-  public static final String JOB_TASKS = JOB_PREFIX + "tasks";
+-  public static final String JOB_AM_PREFIX = "am.";
+-
+-  // task
+-  public static final String TASK_PREFIX = "container.";
+-  public static final String COUNT = "count";
+-  public static final String TASK_CONTAINER = "container.";
+-  public static final String TASK_HOST = TASK_CONTAINER + "host";
+-  public static final String TASK_START_MS = TASK_CONTAINER + "start.ms";
+-  public static final String TASK_END_MS = TASK_CONTAINER + "end.ms";
+-  public static final String DURATION_MS = "duration.ms";
+-  public static final String TASK_DURATION_MS = TASK_CONTAINER + DURATION_MS;
+-  public static final String TASK_PRIORITY = TASK_CONTAINER + "priority";
+-  public static final String TASK_TYPE = TASK_CONTAINER + "type";
+-  public static final String TASK_EXECUTION_TYPE = TASK_CONTAINER
+-      + "execution.type";
+-  public static final String TASK_ALLOCATION_ID = TASK_CONTAINER
+-      + "allocation.id";
+-  public static final String TASK_REQUEST_DELAY = TASK_CONTAINER
+-      + "request.delay";
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
+deleted file mode 100644
+index 4898ea736f9..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NMSimulator.java
++++ /dev/null
+@@ -1,318 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.nodemanager;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.DelayQueue;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceUtilization;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerResponse;
+-import org.apache.hadoop.yarn.server.api.records.MasterKey;
+-import org.apache.hadoop.yarn.server.api.records.NodeAction;
+-import org.apache.hadoop.yarn.server.api.records.NodeHealthStatus;
+-import org.apache.hadoop.yarn.server.api.records.NodeStatus;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.TaskRunner;
+-import org.apache.hadoop.yarn.sls.utils.SLSUtils;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class NMSimulator extends TaskRunner.Task {
+-  // node resource
+-  private RMNode node;
+-  // master key
+-  private MasterKey masterKey;
+-  // containers with various STATE
+-  private List<ContainerId> completedContainerList;
+-  private List<ContainerId> releasedContainerList;
+-  private DelayQueue<ContainerSimulator> containerQueue;
+-  private Map<ContainerId, ContainerSimulator> runningContainers;
+-  private List<ContainerId> amContainerList;
+-  // resource manager
+-  private ResourceManager rm;
+-  // heart beat response id
+-  private int responseId = 0;
+-  private float resourceUtilizationRatio;
+-  private final static Logger LOG = LoggerFactory.getLogger(NMSimulator.class);
+-  
+-  public void init(String nodeIdStr, Resource nodeResource, int dispatchTime,
+-      int heartBeatInterval, ResourceManager pRm,
+-      float pResourceUtilizationRatio, Set<NodeLabel> labels)
+-      throws IOException, YarnException {
+-    super.init(dispatchTime, dispatchTime + 1000000L * heartBeatInterval,
+-        heartBeatInterval);
+-    // create resource
+-    String[] rackHostName = SLSUtils.getRackHostName(nodeIdStr);
+-    this.node = NodeInfo.newNodeInfo(rackHostName[0], rackHostName[1],
+-        Resources.clone(nodeResource));
+-    this.rm = pRm;
+-    // init data structures
+-    completedContainerList =
+-            Collections.synchronizedList(new ArrayList<ContainerId>());
+-    releasedContainerList =
+-            Collections.synchronizedList(new ArrayList<ContainerId>());
+-    containerQueue = new DelayQueue<ContainerSimulator>();
+-    amContainerList =
+-            Collections.synchronizedList(new ArrayList<ContainerId>());
+-    runningContainers =
+-            new ConcurrentHashMap<ContainerId, ContainerSimulator>();
+-    // register NM with RM
+-    RegisterNodeManagerRequest req =
+-            Records.newRecord(RegisterNodeManagerRequest.class);
+-    req.setNodeId(node.getNodeID());
+-    req.setResource(node.getTotalCapability());
+-    req.setNodeLabels(labels);
+-    req.setHttpPort(80);
+-    RegisterNodeManagerResponse response = this.rm.getResourceTrackerService()
+-            .registerNodeManager(req);
+-    masterKey = response.getNMTokenMasterKey();
+-    this.resourceUtilizationRatio = pResourceUtilizationRatio;
+-  }
+-
+-  public void init(String nodeIdStr, Resource nodeResource, int dispatchTime,
+-      int heartBeatInterval, ResourceManager pRm,
+-      float pResourceUtilizationRatio)
+-      throws IOException, YarnException {
+-    init(nodeIdStr, nodeResource, dispatchTime, heartBeatInterval, pRm,
+-        pResourceUtilizationRatio, null);
+-  }
+-
+-  @Override
+-  public void firstStep() {
+-    // do nothing
+-  }
+-
+-  @Override
+-  public void middleStep() throws Exception {
+-    // we check the lifetime for each running containers
+-    ContainerSimulator cs;
+-    synchronized(completedContainerList) {
+-      while ((cs = containerQueue.poll()) != null) {
+-        runningContainers.remove(cs.getId());
+-        completedContainerList.add(cs.getId());
+-        LOG.debug("Container {} has completed", cs.getId());
+-      }
+-    }
+-    
+-    // send heart beat
+-    NodeHeartbeatRequest beatRequest =
+-            Records.newRecord(NodeHeartbeatRequest.class);
+-    beatRequest.setLastKnownNMTokenMasterKey(masterKey);
+-    NodeStatus ns = Records.newRecord(NodeStatus.class);
+-    
+-    ns.setContainersStatuses(generateContainerStatusList());
+-    ns.setNodeId(node.getNodeID());
+-    ns.setKeepAliveApplications(new ArrayList<ApplicationId>());
+-    ns.setResponseId(responseId++);
+-    ns.setNodeHealthStatus(NodeHealthStatus.newInstance(true, "", 0));
+-
+-    //set node & containers utilization
+-    if (resourceUtilizationRatio > 0 && resourceUtilizationRatio <=1) {
+-      int pMemUsed = Math.round(node.getTotalCapability().getMemorySize()
+-          * resourceUtilizationRatio);
+-      float cpuUsed = node.getTotalCapability().getVirtualCores()
+-          * resourceUtilizationRatio;
+-      ResourceUtilization resourceUtilization = ResourceUtilization.newInstance(
+-          pMemUsed, pMemUsed, cpuUsed);
+-      ns.setContainersUtilization(resourceUtilization);
+-      ns.setNodeUtilization(resourceUtilization);
+-    }
+-    beatRequest.setNodeStatus(ns);
+-    NodeHeartbeatResponse beatResponse =
+-        rm.getResourceTrackerService().nodeHeartbeat(beatRequest);
+-    if (! beatResponse.getContainersToCleanup().isEmpty()) {
+-      // remove from queue
+-      synchronized(releasedContainerList) {
+-        for (ContainerId containerId : beatResponse.getContainersToCleanup()){
+-          if (amContainerList.contains(containerId)) {
+-            // AM container (not killed?, only release)
+-            synchronized(amContainerList) {
+-              amContainerList.remove(containerId);
+-            }
+-            LOG.debug("NodeManager {} releases an AM ({}).",
+-                node.getNodeID(), containerId);
+-          } else {
+-            cs = runningContainers.remove(containerId);
+-            containerQueue.remove(cs);
+-            releasedContainerList.add(containerId);
+-            LOG.debug("NodeManager {} releases a container ({}).",
+-                node.getNodeID(), containerId);
+-          }
+-        }
+-      }
+-    }
+-    if (beatResponse.getNodeAction() == NodeAction.SHUTDOWN) {
+-      lastStep();
+-    }
+-  }
+-
+-  @Override
+-  public void lastStep() {
+-    // do nothing
+-  }
+-
+-  /**
+-   * catch status of all containers located on current node
+-   */
+-  private ArrayList<ContainerStatus> generateContainerStatusList() {
+-    ArrayList<ContainerStatus> csList = new ArrayList<ContainerStatus>();
+-    // add running containers
+-    for (ContainerSimulator container : runningContainers.values()) {
+-      csList.add(newContainerStatus(container.getId(),
+-        ContainerState.RUNNING, ContainerExitStatus.SUCCESS));
+-    }
+-    synchronized(amContainerList) {
+-      for (ContainerId cId : amContainerList) {
+-        csList.add(newContainerStatus(cId,
+-            ContainerState.RUNNING, ContainerExitStatus.SUCCESS));
+-      }
+-    }
+-    // add complete containers
+-    synchronized(completedContainerList) {
+-      for (ContainerId cId : completedContainerList) {
+-        LOG.debug("NodeManager {} completed container ({}).",
+-            node.getNodeID(), cId);
+-        csList.add(newContainerStatus(
+-                cId, ContainerState.COMPLETE, ContainerExitStatus.SUCCESS));
+-      }
+-      completedContainerList.clear();
+-    }
+-    // released containers
+-    synchronized(releasedContainerList) {
+-      for (ContainerId cId : releasedContainerList) {
+-        LOG.debug("NodeManager {} released container ({}).",
+-            node.getNodeID(), cId);
+-        csList.add(newContainerStatus(
+-                cId, ContainerState.COMPLETE, ContainerExitStatus.ABORTED));
+-      }
+-      releasedContainerList.clear();
+-    }
+-    return csList;
+-  }
+-
+-  private ContainerStatus newContainerStatus(ContainerId cId, 
+-                                             ContainerState state,
+-                                             int exitState) {
+-    ContainerStatus cs = Records.newRecord(ContainerStatus.class);
+-    cs.setContainerId(cId);
+-    cs.setState(state);
+-    cs.setExitStatus(exitState);
+-    return cs;
+-  }
+-
+-  public RMNode getNode() {
+-    return node;
+-  }
+-
+-  /**
+-   * launch a new container with the given life time
+-   */
+-  public void addNewContainer(Container container, long lifeTimeMS,
+-      ApplicationId applicationId) {
+-    LOG.debug("NodeManager {} launches a new container ({}).",
+-        node.getNodeID(), container.getId());
+-    if (lifeTimeMS != -1) {
+-      // normal container
+-      ContainerSimulator cs = new ContainerSimulator(container.getId(),
+-              container.getResource(), lifeTimeMS + System.currentTimeMillis(),
+-              lifeTimeMS, container.getAllocationRequestId());
+-      containerQueue.add(cs);
+-      runningContainers.put(cs.getId(), cs);
+-    } else {
+-      // AM container
+-      // -1 means AMContainer
+-      synchronized(amContainerList) {
+-        amContainerList.add(container.getId());
+-      }
+-    }
+-
+-    // update runningApplications on the node
+-    if (applicationId != null
+-        && !getNode().getRunningApps().contains(applicationId)) {
+-      getNode().getRunningApps().add(applicationId);
+-    }
+-    LOG.debug("Adding running app: {} on node: {}. " +
+-            "Updated runningApps on this node are: {}",
+-        applicationId, getNode().getNodeID(), getNode().getRunningApps());
+-  }
+-
+-  /**
+-   * clean up an AM container and add to completed list
+-   * @param containerId id of the container to be cleaned
+-   */
+-  public void cleanupContainer(ContainerId containerId) {
+-    synchronized(amContainerList) {
+-      amContainerList.remove(containerId);
+-    }
+-    synchronized(completedContainerList) {
+-      completedContainerList.add(containerId);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  Map<ContainerId, ContainerSimulator> getRunningContainers() {
+-    return runningContainers;
+-  }
+-
+-  @VisibleForTesting
+-  List<ContainerId> getAMContainers() {
+-    return amContainerList;
+-  }
+-
+-  @VisibleForTesting
+-  List<ContainerId> getCompletedContainers() {
+-    return completedContainerList;
+-  }
+-
+-  public void finishApplication(ApplicationId applicationId) {
+-    if (getNode().getRunningApps().contains(applicationId)) {
+-      getNode().getRunningApps().remove(applicationId);
+-      LOG.debug("Removed running app: {} from node: {}. " +
+-              "Updated runningApps on this node are: {}",
+-          applicationId, getNode().getNodeID(), getNode().getRunningApps());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
+deleted file mode 100644
+index 5d1069a5ca2..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java
++++ /dev/null
+@@ -1,271 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.nodemanager;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.net.Node;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeState;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceUtilization;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
+-import org.apache.hadoop.yarn.server.api.records.OpportunisticContainersStatus;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode
+-        .UpdatedContainerInfo;
+-
+-@Private
+-@Unstable
+-public class NodeInfo {
+-  private static int NODE_ID = 0;
+-
+-  public static NodeId newNodeID(String host, int port) {
+-    return NodeId.newInstance(host, port);
+-  }
+-
+-  @Private
+-  @Unstable
+-  private static class FakeRMNodeImpl implements RMNode {
+-    private NodeId nodeId;
+-    private String hostName;
+-    private String nodeAddr;
+-    private String httpAddress;
+-    private int cmdPort;
+-    private volatile Resource perNode;
+-    private String rackName;
+-    private String healthReport;
+-    private NodeState state;
+-    private List<ContainerId> toCleanUpContainers;
+-    private List<ApplicationId> toCleanUpApplications;
+-    private List<ApplicationId> runningApplications;
+-
+-    public FakeRMNodeImpl(NodeId nodeId, String nodeAddr, String httpAddress,
+-        Resource perNode, String rackName, String healthReport,
+-        int cmdPort, String hostName, NodeState state) {
+-      this.nodeId = nodeId;
+-      this.nodeAddr = nodeAddr;
+-      this.httpAddress = httpAddress;
+-      this.perNode = perNode;
+-      this.rackName = rackName;
+-      this.healthReport = healthReport;
+-      this.cmdPort = cmdPort;
+-      this.hostName = hostName;
+-      this.state = state;
+-      toCleanUpApplications = new ArrayList<ApplicationId>();
+-      toCleanUpContainers = new ArrayList<ContainerId>();
+-      runningApplications = new ArrayList<ApplicationId>();
+-    }
+-
+-    public NodeId getNodeID() {
+-      return nodeId;
+-    }
+-    
+-    public String getHostName() {
+-      return hostName;
+-    }
+-    
+-    public int getCommandPort() {
+-      return cmdPort;
+-    }
+-    
+-    public int getHttpPort() {
+-      return 0;
+-    }
+-
+-    public String getNodeAddress() {
+-      return nodeAddr;
+-    }
+-
+-    public String getHttpAddress() {
+-      return httpAddress;
+-    }
+-
+-    public String getHealthReport() {
+-      return healthReport;
+-    }
+-
+-    public long getLastHealthReportTime() {
+-      return 0; 
+-    }
+-
+-    public Resource getTotalCapability() {
+-      return perNode;
+-    }
+-
+-    public String getRackName() {
+-      return rackName;
+-    }
+-
+-    public Node getNode() {
+-      throw new UnsupportedOperationException("Not supported yet.");
+-    }
+-
+-    public NodeState getState() {
+-      return state;
+-    }
+-
+-    public List<ContainerId> getContainersToCleanUp() {
+-      return toCleanUpContainers;
+-    }
+-
+-    public List<ApplicationId> getAppsToCleanup() {
+-      return toCleanUpApplications;
+-    }
+-
+-    public List<ApplicationId> getRunningApps() {
+-      return runningApplications;
+-    }
+-
+-    public void setAndUpdateNodeHeartbeatResponse(
+-        NodeHeartbeatResponse response) {
+-    }
+-
+-    public NodeHeartbeatResponse getLastNodeHeartBeatResponse() {
+-      return null;
+-    }
+-
+-    public void resetLastNodeHeartBeatResponse() {
+-    }
+-
+-    public List<UpdatedContainerInfo> pullContainerUpdates() {
+-      ArrayList<UpdatedContainerInfo> list = new ArrayList<UpdatedContainerInfo>();
+-      
+-      ArrayList<ContainerStatus> list2 = new ArrayList<ContainerStatus>();
+-      for(ContainerId cId : this.toCleanUpContainers) {
+-        list2.add(ContainerStatus.newInstance(cId, ContainerState.RUNNING, "", 
+-          ContainerExitStatus.SUCCESS));
+-      }
+-      List<Map.Entry<ApplicationId, ContainerStatus>> needUpdateContainers =
+-          new ArrayList<Map.Entry<ApplicationId, ContainerStatus>>();
+-      list.add(new UpdatedContainerInfo(new ArrayList<ContainerStatus>(),
+-          list2, needUpdateContainers));
+-      return list;
+-    }
+-
+-    @Override
+-    public String getNodeManagerVersion() {
+-      return null;
+-    }
+-
+-    @Override
+-    public Set<String> getNodeLabels() {
+-      return RMNodeLabelsManager.EMPTY_STRING_SET;
+-    }
+-
+-    @Override
+-    public List<Container> pullNewlyIncreasedContainers() {
+-      return null;
+-    }
+-
+-    public OpportunisticContainersStatus getOpportunisticContainersStatus() {
+-      return null;
+-    }
+-
+-    @Override
+-    public ResourceUtilization getAggregatedContainersUtilization() {
+-      return null;
+-    }
+-
+-    @Override
+-    public ResourceUtilization getNodeUtilization() {
+-      return null;
+-    }
+-
+-    @Override
+-    public long getUntrackedTimeStamp() {
+-      return 0;
+-    }
+-
+-    @Override
+-    public void setUntrackedTimeStamp(long timeStamp) {
+-    }
+-
+-    @Override
+-    public Integer getDecommissioningTimeout() {
+-      return null;
+-    }
+-
+-    @Override
+-    public Map<String, Long> getAllocationTagsWithCount() {
+-      return null;
+-    }
+-
+-    @Override
+-    public Set<NodeAttribute> getAllNodeAttributes() {
+-      return Collections.emptySet();
+-    }
+-
+-    @Override
+-    public RMContext getRMContext() {
+-      return null;
+-    }
+-
+-    @Override
+-    public Resource getPhysicalResource() {
+-      return null;
+-    }
+-
+-    @Override
+-    public boolean isUpdatedCapability() {
+-      return false;
+-    }
+-
+-    @Override
+-    public void resetUpdatedCapability() {
+-    }
+-
+-    @Override
+-    public long calculateHeartBeatInterval(
+-        long defaultInterval, long minInterval, long maxInterval,
+-        float speedupFactor, float slowdownFactor) {
+-      return defaultInterval;
+-    }
+-  }
+-
+-  public static RMNode newNodeInfo(String rackName, String hostName,
+-                              final Resource resource, int port) {
+-    final NodeId nodeId = newNodeID(hostName, port);
+-    final String nodeAddr = hostName + ":" + port;
+-
+-    return new FakeRMNodeImpl(nodeId, nodeAddr, hostName,
+-        resource, rackName, "Me good",
+-        port, hostName, null);
+-  }
+-  
+-  public static RMNode newNodeInfo(String rackName, String hostName,
+-                              final Resource resource) {
+-    return newNodeInfo(rackName, hostName, resource, NODE_ID++);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
+deleted file mode 100644
+index aec9f0f105b..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/resourcemanager/MockAMLauncher.java
++++ /dev/null
+@@ -1,117 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.resourcemanager;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.AMLauncherEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.amlauncher.ApplicationMasterLauncher;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEventType;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptImpl;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.appmaster.AMSimulator;
+-
+-
+-public class MockAMLauncher extends ApplicationMasterLauncher
+-    implements EventHandler<AMLauncherEvent> {
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      MockAMLauncher.class);
+-
+-  private SLSRunner slsRunner;
+-
+-  public MockAMLauncher(SLSRunner slsRunner, RMContext rmContext) {
+-    super(rmContext);
+-    this.slsRunner = slsRunner;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    // Do nothing
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    // Do nothing
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    // Do nothing
+-  }
+-
+-  private void setupAMRMToken(RMAppAttempt appAttempt) {
+-    // Setup AMRMToken
+-    Token<AMRMTokenIdentifier> amrmToken =
+-        super.context.getAMRMTokenSecretManager().createAndGetAMRMToken(
+-            appAttempt.getAppAttemptId());
+-    ((RMAppAttemptImpl) appAttempt).setAMRMToken(amrmToken);
+-  }
+-
+-  @Override
+-  public void handle(AMLauncherEvent event) {
+-    ApplicationId appId =
+-        event.getAppAttempt().getAppAttemptId().getApplicationId();
+-    // find AMSimulator
+-    AMSimulator ams = slsRunner.getAMSimulatorByAppId(appId);
+-    if (ams == null) {
+-      throw new YarnRuntimeException(
+-          "Didn't find any AMSimulator for applicationId=" + appId);
+-    }
+-    Container amContainer = event.getAppAttempt().getMasterContainer();
+-    switch (event.getType()) {
+-    case LAUNCH:
+-      try {
+-        setupAMRMToken(event.getAppAttempt());
+-        // Notify RMAppAttempt to change state
+-        super.context.getDispatcher().getEventHandler().handle(
+-            new RMAppAttemptEvent(event.getAppAttempt().getAppAttemptId(),
+-                RMAppAttemptEventType.LAUNCHED));
+-
+-        ams.notifyAMContainerLaunched(
+-            event.getAppAttempt().getMasterContainer());
+-        LOG.info("Notify AM launcher launched:" + amContainer.getId());
+-
+-        slsRunner.getNmMap().get(amContainer.getNodeId())
+-            .addNewContainer(amContainer, -1, appId);
+-        ams.getRanNodes().add(amContainer.getNodeId());
+-        return;
+-      } catch (Exception e) {
+-        throw new YarnRuntimeException(e);
+-      }
+-    case CLEANUP:
+-      slsRunner.getNmMap().get(amContainer.getNodeId())
+-          .cleanupContainer(amContainer.getId());
+-      break;
+-    default:
+-      throw new YarnRuntimeException(
+-          "Didn't find any AMSimulator for applicationId=" + appId);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
+deleted file mode 100644
+index 89b44c68d61..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/CapacitySchedulerMetrics.java
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-
+-@Private
+-@Unstable
+-public class CapacitySchedulerMetrics extends SchedulerMetrics {
+-
+-  public CapacitySchedulerMetrics() {
+-    super();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
+deleted file mode 100644
+index 8f119943570..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ContainerSimulator.java
++++ /dev/null
+@@ -1,147 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import java.util.concurrent.Delayed;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.sls.TaskContainerDefinition;
+-
+-@Private
+-@Unstable
+-public class ContainerSimulator implements Delayed {
+-  private ContainerId id;
+-  private Resource resource;
+-  private long endTime;
+-  // life time (ms)
+-  private long lifeTime;
+-  // time(ms) after which container would be requested by AM
+-  private long requestDelay;
+-  private String hostname;
+-  private int priority;
+-  private String type;
+-  private ExecutionType executionType = ExecutionType.GUARANTEED;
+-  private long allocationId;
+-
+-  /**
+-   * Invoked when AM schedules containers to allocate.
+-   * @param def The task's definition object.
+-   * @return ContainerSimulator object
+-   */
+-  public static ContainerSimulator createFromTaskContainerDefinition(
+-      TaskContainerDefinition def) {
+-    return new ContainerSimulator(def.getResource(), def.getDuration(),
+-        def.getHostname(), def.getPriority(), def.getType(),
+-        def.getExecutionType(), def.getAllocationId(), def.getRequestDelay());
+-  }
+-
+-  /**
+-   * Invoked when AM schedules containers to allocate.
+-   */
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  private ContainerSimulator(Resource resource, long lifeTime,
+-      String hostname, int priority, String type, ExecutionType executionType,
+-      long allocationId, long requestDelay) {
+-    this.resource = resource;
+-    this.lifeTime = lifeTime;
+-    this.hostname = hostname;
+-    this.priority = priority;
+-    this.type = type;
+-    this.executionType = executionType;
+-    this.requestDelay = requestDelay;
+-    this.allocationId = allocationId;
+-  }
+-
+-  /**
+-   * Invoked when NM schedules containers to run.
+-   */
+-  public ContainerSimulator(ContainerId id, Resource resource, long endTime,
+-      long lifeTime, long allocationId) {
+-    this.id = id;
+-    this.resource = resource;
+-    this.endTime = endTime;
+-    this.lifeTime = lifeTime;
+-    this.allocationId = allocationId;
+-  }
+-  
+-  public Resource getResource() {
+-    return resource;
+-  }
+-  
+-  public ContainerId getId() {
+-    return id;
+-  }
+-
+-  @Override
+-  public int compareTo(Delayed o) {
+-    if (!(o instanceof ContainerSimulator)) {
+-      throw new IllegalArgumentException(
+-              "Parameter must be a ContainerSimulator instance");
+-    }
+-    ContainerSimulator other = (ContainerSimulator) o;
+-    return (int) Math.signum(endTime - other.endTime);
+-  }
+-
+-  @Override
+-  public long getDelay(TimeUnit unit) {
+-    return unit.convert(endTime - System.currentTimeMillis(),
+-          TimeUnit.MILLISECONDS);
+-  }
+-  
+-  public long getLifeTime() {
+-    return lifeTime;
+-  }
+-  
+-  public String getHostname() {
+-    return hostname;
+-  }
+-  
+-  public long getEndTime() {
+-    return endTime;
+-  }
+-  
+-  public int getPriority() {
+-    return priority;
+-  }
+-  
+-  public String getType() {
+-    return type;
+-  }
+-  
+-  public void setPriority(int p) {
+-    priority = p;
+-  }
+-
+-  public ExecutionType getExecutionType() {
+-    return executionType;
+-  }
+-
+-  public long getAllocationId() {
+-    return allocationId;
+-  }
+-
+-  public long getRequestDelay() {
+-    return requestDelay;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
+deleted file mode 100644
+index 23f79bf53ab..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FairSchedulerMetrics.java
++++ /dev/null
+@@ -1,213 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSAppAttempt;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FSQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.Schedulable;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-
+-import com.codahale.metrics.Gauge;
+-
+-@Private
+-@Unstable
+-public class FairSchedulerMetrics extends SchedulerMetrics {
+-
+-  private int totalMemoryMB = Integer.MAX_VALUE;
+-  private int totalVCores = Integer.MAX_VALUE;
+-  private boolean maxReset = false;
+-
+-  @VisibleForTesting
+-  public enum Metric {
+-    DEMAND("demand"),
+-    USAGE("usage"),
+-    MINSHARE("minshare"),
+-    MAXSHARE("maxshare"),
+-    FAIRSHARE("fairshare");
+-
+-    private String value;
+-
+-    Metric(String value) {
+-      this.value = value;
+-    }
+-
+-    @VisibleForTesting
+-    public String getValue() {
+-      return value;
+-    }
+-  }
+-
+-  public FairSchedulerMetrics() {
+-    super();
+-
+-    for (Metric metric: Metric.values()) {
+-      appTrackedMetrics.add(metric.value + ".memory");
+-      appTrackedMetrics.add(metric.value + ".vcores");
+-      queueTrackedMetrics.add(metric.value + ".memory");
+-      queueTrackedMetrics.add(metric.value + ".vcores");
+-    }
+-  }
+-
+-  private long getMemorySize(Schedulable schedulable, Metric metric) {
+-    if (schedulable != null) {
+-      switch (metric) {
+-      case DEMAND:
+-        return schedulable.getDemand().getMemorySize();
+-      case USAGE:
+-        return schedulable.getResourceUsage().getMemorySize();
+-      case MINSHARE:
+-        return schedulable.getMinShare().getMemorySize();
+-      case MAXSHARE:
+-        return schedulable.getMaxShare().getMemorySize();
+-      case FAIRSHARE:
+-        return schedulable.getFairShare().getMemorySize();
+-      default:
+-        return 0L;
+-      }
+-    }
+-
+-    return 0L;
+-  }
+-
+-  private int getVirtualCores(Schedulable schedulable, Metric metric) {
+-    if (schedulable != null) {
+-      switch (metric) {
+-      case DEMAND:
+-        return schedulable.getDemand().getVirtualCores();
+-      case USAGE:
+-        return schedulable.getResourceUsage().getVirtualCores();
+-      case MINSHARE:
+-        return schedulable.getMinShare().getVirtualCores();
+-      case MAXSHARE:
+-        return schedulable.getMaxShare().getVirtualCores();
+-      case FAIRSHARE:
+-        return schedulable.getFairShare().getVirtualCores();
+-      default:
+-        return 0;
+-      }
+-    }
+-
+-    return 0;
+-  }
+-
+-  private void registerAppMetrics(ApplicationId appId, String oldAppId,
+-      Metric metric) {
+-    metrics.register(
+-        "variable.app." + oldAppId + "." + metric.value + ".memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            return getMemorySize((FSAppAttempt)getSchedulerAppAttempt(appId),
+-                metric);
+-          }
+-        }
+-    );
+-
+-    metrics.register(
+-        "variable.app." + oldAppId + "." + metric.value + ".vcores",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            return getVirtualCores((FSAppAttempt)getSchedulerAppAttempt(appId),
+-                metric);
+-          }
+-        }
+-    );
+-  }
+-
+-  @Override
+-  public void trackApp(ApplicationId appId, String oldAppId) {
+-    super.trackApp(appId, oldAppId);
+-
+-    for (Metric metric: Metric.values()) {
+-      registerAppMetrics(appId, oldAppId, metric);
+-    }
+-  }
+-
+-  private void registerQueueMetrics(FSQueue queue, Metric metric) {
+-    metrics.register(
+-        "variable.queue." + queue.getName() + "." + metric.value + ".memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            return getMemorySize(queue, metric);
+-          }
+-        }
+-    );
+-    metrics.register(
+-        "variable.queue." + queue.getName() + "." + metric.value + ".vcores",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            return getVirtualCores(queue, metric);
+-          }
+-        }
+-    );
+-  }
+-
+-  @Override
+-  protected void registerQueueMetrics(String queueName) {
+-    super.registerQueueMetrics(queueName);
+-
+-    FairScheduler fair = (FairScheduler) scheduler;
+-    final FSQueue queue = fair.getQueueManager().getQueue(queueName);
+-    registerQueueMetrics(queue, Metric.DEMAND);
+-    registerQueueMetrics(queue, Metric.USAGE);
+-    registerQueueMetrics(queue, Metric.MINSHARE);
+-    registerQueueMetrics(queue, Metric.FAIRSHARE);
+-
+-    metrics.register("variable.queue." + queueName + ".maxshare.memory",
+-      new Gauge<Long>() {
+-        @Override
+-        public Long getValue() {
+-          if (! maxReset
+-              && SLSRunner.getSimulateInfoMap().containsKey("Number of nodes")
+-              && SLSRunner.getSimulateInfoMap().containsKey("Node memory (MB)")
+-              && SLSRunner.getSimulateInfoMap().containsKey("Node VCores")) {
+-            int numNMs = Integer.parseInt(SLSRunner.getSimulateInfoMap()
+-                .get("Number of nodes").toString());
+-            int numMemoryMB = Integer.parseInt(SLSRunner.getSimulateInfoMap()
+-                .get("Node memory (MB)").toString());
+-            int numVCores = Integer.parseInt(SLSRunner.getSimulateInfoMap()
+-                .get("Node VCores").toString());
+-
+-            totalMemoryMB = numNMs * numMemoryMB;
+-            totalVCores = numNMs * numVCores;
+-            maxReset = false;
+-          }
+-
+-          return Math.min(queue.getMaxShare().getMemorySize(), totalMemoryMB);
+-        }
+-      }
+-    );
+-    metrics.register("variable.queue." + queueName + ".maxshare.vcores",
+-      new Gauge<Integer>() {
+-        @Override
+-        public Integer getValue() {
+-          return Math.min(queue.getMaxShare().getVirtualCores(), totalVCores);
+-        }
+-      }
+-    );
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
+deleted file mode 100644
+index 427b5972699..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/FifoSchedulerMetrics.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.api.records.QueueInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo
+-        .FifoScheduler;
+-
+-import com.codahale.metrics.Gauge;
+-
+-@Private
+-@Unstable
+-public class FifoSchedulerMetrics extends SchedulerMetrics {
+-  
+-  public FifoSchedulerMetrics() {
+-    super();
+-  }
+-
+-  @Override
+-  protected void registerQueueMetrics(String queueName) {
+-    super.registerQueueMetrics(queueName);
+-
+-    FifoScheduler fifo = (FifoScheduler) scheduler;
+-    // for FifoScheduler, only DEFAULT_QUEUE
+-    // here the three parameters doesn't affect results
+-    final QueueInfo queue = fifo.getQueueInfo(queueName, false, false);
+-    // track currentCapacity, maximumCapacity (always 1.0f)
+-    metrics.register("variable.queue." + queueName + ".currentcapacity",
+-      new Gauge<Float>() {
+-        @Override
+-        public Float getValue() {
+-          return queue.getCurrentCapacity();
+-        }
+-      }
+-    );
+-    metrics.register("variable.queue." + queueName + ".",
+-      new Gauge<Float>() {
+-        @Override
+-        public Float getValue() {
+-          return queue.getCurrentCapacity();
+-        }
+-      }
+-    );
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
+deleted file mode 100644
+index 12dfe8baa16..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/NodeUpdateSchedulerEventWrapper.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event
+-        .NodeUpdateSchedulerEvent;
+-
+-@Private
+-@Unstable
+-public class NodeUpdateSchedulerEventWrapper extends NodeUpdateSchedulerEvent {
+-  
+-  public NodeUpdateSchedulerEventWrapper(NodeUpdateSchedulerEvent event) {
+-    super(new RMNodeWrapper(event.getRMNode()));
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
+deleted file mode 100644
+index dbbc88fb52d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java
++++ /dev/null
+@@ -1,245 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.net.Node;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeState;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceUtilization;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse;
+-import org.apache.hadoop.yarn.server.api.records.OpportunisticContainersStatus;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode
+-        .UpdatedContainerInfo;
+-
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-@Private
+-@Unstable
+-public class RMNodeWrapper implements RMNode {
+-  private RMNode node;
+-  private List<UpdatedContainerInfo> updates;
+-  private boolean pulled = false;
+-  
+-  public RMNodeWrapper(RMNode node) {
+-    this.node = node;
+-    updates = node.pullContainerUpdates();
+-  }
+-  
+-  @Override
+-  public NodeId getNodeID() {
+-    return node.getNodeID();
+-  }
+-
+-  @Override
+-  public String getHostName() {
+-    return node.getHostName();
+-  }
+-
+-  @Override
+-  public int getCommandPort() {
+-    return node.getCommandPort();
+-  }
+-
+-  @Override
+-  public int getHttpPort() {
+-    return node.getHttpPort();
+-  }
+-
+-  @Override
+-  public String getNodeAddress() {
+-    return node.getNodeAddress();
+-  }
+-
+-  @Override
+-  public String getHttpAddress() {
+-    return node.getHttpAddress();
+-  }
+-
+-  @Override
+-  public String getHealthReport() {
+-    return node.getHealthReport();
+-  }
+-
+-  @Override
+-  public long getLastHealthReportTime() {
+-    return node.getLastHealthReportTime();
+-  }
+-
+-  @Override
+-  public Resource getTotalCapability() {
+-    return node.getTotalCapability();
+-  }
+-
+-  @Override
+-  public Resource getAllocatedContainerResource() {
+-    return node.getAllocatedContainerResource();
+-  }
+-
+-  @Override
+-  public String getRackName() {
+-    return node.getRackName();
+-  }
+-
+-  @Override
+-  public Node getNode() {
+-    return node.getNode();
+-  }
+-
+-  @Override
+-  public NodeState getState() {
+-    return node.getState();
+-  }
+-
+-  @Override
+-  public List<ContainerId> getContainersToCleanUp() {
+-    return node.getContainersToCleanUp();
+-  }
+-
+-  @Override
+-  public List<ApplicationId> getAppsToCleanup() {
+-    return node.getAppsToCleanup();
+-  }
+-
+-  @Override
+-  public List<ApplicationId> getRunningApps() {
+-    return node.getRunningApps();
+-  }
+-
+-  @Override
+-  public void setAndUpdateNodeHeartbeatResponse(
+-      NodeHeartbeatResponse nodeHeartbeatResponse) {
+-    node.setAndUpdateNodeHeartbeatResponse(nodeHeartbeatResponse);
+-  }
+-
+-  @Override
+-  public NodeHeartbeatResponse getLastNodeHeartBeatResponse() {
+-    return node.getLastNodeHeartBeatResponse();
+-  }
+-
+-  @Override
+-  public void resetLastNodeHeartBeatResponse() {
+-    node.getLastNodeHeartBeatResponse().setResponseId(0);
+-  }
+-
+-  @Override
+-  public List<UpdatedContainerInfo> pullContainerUpdates() {
+-    List<UpdatedContainerInfo> list = Collections.emptyList();
+-    if (! pulled) {
+-      list = updates;
+-      pulled = true;
+-    }
+-    return list;    
+-  }
+-  
+-  List<UpdatedContainerInfo> getContainerUpdates() {
+-    return updates;
+-  }
+-
+-  @Override
+-  public String getNodeManagerVersion() {
+-    return node.getNodeManagerVersion();
+-  }
+-
+-  @Override
+-  public Set<String> getNodeLabels() {
+-    return RMNodeLabelsManager.EMPTY_STRING_SET;
+-  }
+-
+-  @Override
+-  public List<Container> pullNewlyIncreasedContainers() {
+-    return Collections.emptyList();
+-  }
+-
+-  public OpportunisticContainersStatus getOpportunisticContainersStatus() {
+-    return null;
+-  }
+-
+-  @Override
+-  public ResourceUtilization getAggregatedContainersUtilization() {
+-    return node.getAggregatedContainersUtilization();
+-  }
+-
+-  @Override
+-  public ResourceUtilization getNodeUtilization() {
+-    return node.getNodeUtilization();
+-  }
+-
+-  @Override
+-  public long getUntrackedTimeStamp() {
+-    return 0;
+-  }
+-
+-  @Override
+-  public void setUntrackedTimeStamp(long timeStamp) {
+-  }
+-
+-  @Override
+-  public Integer getDecommissioningTimeout() {
+-    return null;
+-  }
+-
+-  @Override
+-  public Map<String, Long> getAllocationTagsWithCount() {
+-    return node.getAllocationTagsWithCount();
+-  }
+-
+-  @Override
+-  public Set<NodeAttribute> getAllNodeAttributes() {
+-    return node.getAllNodeAttributes();
+-  }
+-
+-  @Override
+-  public RMContext getRMContext() {
+-    return node.getRMContext();
+-  }
+-
+-  @Override
+-  public Resource getPhysicalResource() {
+-    return null;
+-  }
+-
+-  @Override
+-  public boolean isUpdatedCapability() {
+-    return false;
+-  }
+-
+-  @Override
+-  public void resetUpdatedCapability() {
+-  }
+-
+-  @Override
+-  public long calculateHeartBeatInterval(
+-      long defaultInterval, long minInterval, long maxInterval,
+-      float speedupFactor, float slowdownFactor) {
+-    return defaultInterval;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
+deleted file mode 100644
+index 6cc4cf7597e..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
++++ /dev/null
+@@ -1,162 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import java.util.List;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.ResourceCommitRequest;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class SLSCapacityScheduler extends CapacityScheduler implements
+-        SchedulerWrapper, Configurable {
+-
+-  private final SLSSchedulerCommons schedulerCommons;
+-  private Configuration conf;
+-  private SLSRunner runner;
+-  private static final Logger LOG = LoggerFactory.getLogger(SLSCapacityScheduler.class);
+-
+-  public SLSCapacityScheduler() {
+-    schedulerCommons = new SLSSchedulerCommons(this);
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-    super.setConf(conf);
+-    schedulerCommons.initMetrics(CapacityScheduler.class, conf);
+-  }
+-
+-  @Override
+-  public Allocation allocate(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests, List<ContainerId> containerIds,
+-      List<String> blacklistAdditions, List<String> blacklistRemovals,
+-      ContainerUpdates updateRequests) {
+-    return schedulerCommons.allocate(attemptId, resourceRequests, schedulingRequests,
+-        containerIds, blacklistAdditions, blacklistRemovals, updateRequests);
+-  }
+-
+-  @Override
+-  public Allocation allocatePropagated(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests,
+-      List<ContainerId> containerIds, List<String> blacklistAdditions,
+-      List<String> blacklistRemovals, ContainerUpdates updateRequests) {
+-    return super.allocate(attemptId, resourceRequests, schedulingRequests,
+-        containerIds, blacklistAdditions, blacklistRemovals, updateRequests);
+-  }
+-
+-  @Override
+-  public boolean tryCommit(Resource cluster, ResourceCommitRequest r,
+-      boolean updatePending) {
+-    if (schedulerCommons.isMetricsON()) {
+-      boolean isSuccess = false;
+-      long startTimeNs = System.nanoTime();
+-      try {
+-        isSuccess = super.tryCommit(cluster, r, updatePending);
+-        return isSuccess;
+-      } finally {
+-        long elapsedNs = System.nanoTime() - startTimeNs;
+-        if (isSuccess) {
+-          getSchedulerMetrics().getSchedulerCommitSuccessTimer()
+-              .update(elapsedNs, TimeUnit.NANOSECONDS);
+-          getSchedulerMetrics().increaseSchedulerCommitSuccessCounter();
+-        } else {
+-          getSchedulerMetrics().getSchedulerCommitFailureTimer()
+-              .update(elapsedNs, TimeUnit.NANOSECONDS);
+-          getSchedulerMetrics().increaseSchedulerCommitFailureCounter();
+-        }
+-      }
+-    } else {
+-      return super.tryCommit(cluster, r, updatePending);
+-    }
+-  }
+-
+-  @Override
+-  public void handle(SchedulerEvent schedulerEvent) {
+-    try {
+-      schedulerCommons.handle(schedulerEvent);
+-    } catch(Exception e) {
+-      LOG.error("Caught exception while handling scheduler event", e);
+-      throw e;
+-    }
+-  }
+-
+-  @Override
+-  public void propagatedHandle(SchedulerEvent schedulerEvent) {
+-    super.handle(schedulerEvent);
+-  }
+-
+-  @Override
+-  public void serviceStop() throws Exception {
+-    schedulerCommons.stopMetrics();
+-    super.serviceStop();
+-  }
+-
+-
+-  public String getRealQueueName(String queue) throws YarnException {
+-    if (getQueue(queue) == null) {
+-      throw new YarnException("Can't find the queue by the given name: " + queue
+-          + "! Please check if queue " + queue + " is in the allocation file.");
+-    }
+-    return getQueue(queue).getQueuePath();
+-  }
+-
+-  public SchedulerMetrics getSchedulerMetrics() {
+-    return schedulerCommons.getSchedulerMetrics();
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return conf;
+-  }
+-
+-  public Tracker getTracker() {
+-    return schedulerCommons.getTracker();
+-  }
+-
+-  @Override
+-  public void setSLSRunner(SLSRunner runner) {
+-    this.runner = runner;
+-  }
+-
+-  @Override
+-  public SLSRunner getSLSRunner() {
+-    return this.runner;
+-  }
+-}
+-
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
+deleted file mode 100644
+index beb411025f8..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.List;
+-
+-@Private
+-@Unstable
+-public class SLSFairScheduler extends FairScheduler
+-    implements SchedulerWrapper, Configurable {
+-  private final SLSSchedulerCommons schedulerCommons;
+-  private SLSRunner runner;
+-  private static final Logger LOG = LoggerFactory.getLogger(SLSFairScheduler.class);
+-
+-  public SLSFairScheduler() {
+-    schedulerCommons = new SLSSchedulerCommons(this);
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    super.setConfig(conf);
+-    schedulerCommons.initMetrics(FairScheduler.class, conf);
+-  }
+-
+-  @Override
+-  public Allocation allocate(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests, List<ContainerId> containerIds,
+-      List<String> blacklistAdditions, List<String> blacklistRemovals,
+-      ContainerUpdates updateRequests) {
+-    return schedulerCommons.allocate(attemptId, resourceRequests, schedulingRequests,
+-        containerIds, blacklistAdditions, blacklistRemovals, updateRequests);
+-  }
+-
+-  @Override
+-  public void handle(SchedulerEvent schedulerEvent) {
+-    try {
+-      schedulerCommons.handle(schedulerEvent);
+-    } catch (Exception e){
+-      LOG.error("Caught exception while handling scheduler event", e);
+-      throw e;
+-    }
+-  }
+-
+-  @Override
+-  public void propagatedHandle(SchedulerEvent schedulerEvent) {
+-    super.handle(schedulerEvent);
+-  }
+-
+-  @Override
+-  public Allocation allocatePropagated(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests,
+-      List<ContainerId> containerIds, List<String> blacklistAdditions,
+-      List<String> blacklistRemovals, ContainerUpdates updateRequests) {
+-    return super.allocate(attemptId, resourceRequests, schedulingRequests,
+-        containerIds, blacklistAdditions, blacklistRemovals, updateRequests);
+-  }
+-
+-  @Override
+-  public void serviceStop() throws Exception {
+-    schedulerCommons.stopMetrics();
+-    super.serviceStop();
+-  }
+-
+-  public String getRealQueueName(String queue) throws YarnException {
+-    if (!getQueueManager().exists(queue)) {
+-      throw new YarnException("Can't find the queue by the given name: " + queue
+-          + "! Please check if queue " + queue + " is in the allocation file.");
+-    }
+-    return getQueueManager().getQueue(queue).getQueueName();
+-  }
+-
+-  public SchedulerMetrics getSchedulerMetrics() {
+-    return schedulerCommons.getSchedulerMetrics();
+-  }
+-
+-  public Tracker getTracker() {
+-    return schedulerCommons.getTracker();
+-  }
+-
+-  @Override
+-  public void setSLSRunner(SLSRunner runner) {
+-    this.runner = runner;
+-  }
+-
+-  @Override
+-  public SLSRunner getSLSRunner() {
+-    return this.runner;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSSchedulerCommons.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSSchedulerCommons.java
+deleted file mode 100644
+index a99fe53eff9..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSSchedulerCommons.java
++++ /dev/null
+@@ -1,343 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import com.codahale.metrics.Timer;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.UpdatedContainerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppReport;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptAddedSchedulerEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-public class SLSSchedulerCommons {
+-  private static final Logger LOG = LoggerFactory.getLogger(SLSSchedulerCommons.class);
+-
+-  private final AbstractYarnScheduler<?, ?> scheduler;
+-  private boolean metricsON;
+-  private SchedulerMetrics schedulerMetrics;
+-  private final Map<ContainerId, Resource> preemptionContainerMap = new ConcurrentHashMap<>();
+-  private final Map<ApplicationAttemptId, String> appQueueMap = new ConcurrentHashMap<>();
+-  private final Tracker tracker;
+-  
+-  public SLSSchedulerCommons(AbstractYarnScheduler<?, ?> scheduler) {
+-    this.scheduler = scheduler;
+-    this.tracker = new Tracker();
+-  }
+-
+-  public void initMetrics(Class<? extends AbstractYarnScheduler<?, ?>> schedulerClass, Configuration conf) {
+-    metricsON = conf.getBoolean(SLSConfiguration.METRICS_SWITCH, true);
+-    if (metricsON) {
+-      try {
+-        schedulerMetrics = SchedulerMetrics.getInstance(conf, schedulerClass);
+-        schedulerMetrics.init(scheduler, conf);
+-      } catch (Exception e) {
+-        LOG.error("Caught exception while initializing schedulerMetrics", e);
+-      }
+-    }
+-  }
+-
+-  void stopMetrics() {
+-    try {
+-      if (metricsON) {
+-        schedulerMetrics.tearDown();
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Caught exception while stopping service", e);
+-    }
+-  }
+-  
+-  public Allocation allocate(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests,
+-      List<ContainerId> containerIds,
+-      List<String> blacklistAdditions,
+-      List<String> blacklistRemovals,
+-      ContainerUpdates updateRequests) {
+-    if (metricsON) {
+-      final Timer.Context context = schedulerMetrics.getSchedulerAllocateTimer()
+-          .time();
+-      Allocation allocation = null;
+-      try {
+-        allocation = ((SchedulerWrapper)scheduler).allocatePropagated(
+-            attemptId, resourceRequests,
+-            schedulingRequests, containerIds,
+-            blacklistAdditions, blacklistRemovals, updateRequests);
+-        return allocation;
+-      } catch (Exception e) {
+-        LOG.error("Caught exception from allocate", e);
+-        throw e;
+-      } finally {
+-        context.stop();
+-        schedulerMetrics.increaseSchedulerAllocationCounter();
+-        try {
+-          updateQueueWithAllocateRequest(allocation, attemptId,
+-              resourceRequests, containerIds);
+-        } catch (IOException e) {
+-          LOG.error("Caught exception while executing finally block", e);
+-        }
+-      }
+-    } else {
+-      return ((SchedulerWrapper)scheduler).allocatePropagated(
+-          attemptId, resourceRequests, schedulingRequests,
+-          containerIds,
+-          blacklistAdditions, blacklistRemovals, updateRequests);
+-    }
+-  }
+-
+-  private void updateQueueWithAllocateRequest(Allocation allocation,
+-      ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<ContainerId> containerIds) throws IOException {
+-    // update queue information
+-    Resource pendingResource = Resources.createResource(0, 0);
+-    Resource allocatedResource = Resources.createResource(0, 0);
+-    String queueName = appQueueMap.get(attemptId);
+-    // container requested
+-    for (ResourceRequest request : resourceRequests) {
+-      if (request.getResourceName().equals(ResourceRequest.ANY)) {
+-        Resources.addTo(pendingResource,
+-            Resources.multiply(request.getCapability(),
+-                request.getNumContainers()));
+-      }
+-    }
+-    // container allocated
+-    for (Container container : allocation.getContainers()) {
+-      Resources.addTo(allocatedResource, container.getResource());
+-      Resources.subtractFrom(pendingResource, container.getResource());
+-    }
+-    // container released from AM
+-    SchedulerAppReport report = scheduler.getSchedulerAppInfo(attemptId);
+-    for (ContainerId containerId : containerIds) {
+-      Container container = null;
+-      for (RMContainer c : report.getLiveContainers()) {
+-        if (c.getContainerId().equals(containerId)) {
+-          container = c.getContainer();
+-          break;
+-        }
+-      }
+-      if (container != null) {
+-        // released allocated containers
+-        Resources.subtractFrom(allocatedResource, container.getResource());
+-      } else {
+-        for (RMContainer c : report.getReservedContainers()) {
+-          if (c.getContainerId().equals(containerId)) {
+-            container = c.getContainer();
+-            break;
+-          }
+-        }
+-        if (container != null) {
+-          // released reserved containers
+-          Resources.subtractFrom(pendingResource, container.getResource());
+-        }
+-      }
+-    }
+-    // containers released/preemption from scheduler
+-    Set<ContainerId> preemptionContainers = new HashSet<>();
+-    if (allocation.getContainerPreemptions() != null) {
+-      preemptionContainers.addAll(allocation.getContainerPreemptions());
+-    }
+-    if (allocation.getStrictContainerPreemptions() != null) {
+-      preemptionContainers.addAll(allocation.getStrictContainerPreemptions());
+-    }
+-    if (!preemptionContainers.isEmpty()) {
+-      for (ContainerId containerId : preemptionContainers) {
+-        if (!preemptionContainerMap.containsKey(containerId)) {
+-          Container container = null;
+-          for (RMContainer c : report.getLiveContainers()) {
+-            if (c.getContainerId().equals(containerId)) {
+-              container = c.getContainer();
+-              break;
+-            }
+-          }
+-          if (container != null) {
+-            preemptionContainerMap.put(containerId, container.getResource());
+-          }
+-        }
+-
+-      }
+-    }
+-
+-    // update metrics
+-    schedulerMetrics.updateQueueMetrics(pendingResource, allocatedResource,
+-        queueName);
+-  }
+-
+-  public void handle(SchedulerEvent schedulerEvent) {
+-    SchedulerWrapper wrapper = (SchedulerWrapper) scheduler;
+-    if (!metricsON) {
+-      ((SchedulerWrapper)scheduler).propagatedHandle(schedulerEvent);
+-      return;
+-    }
+-
+-    if (!schedulerMetrics.isRunning()) {
+-      schedulerMetrics.setRunning(true);
+-    }
+-
+-    Timer.Context handlerTimer = null;
+-    Timer.Context operationTimer = null;
+-
+-    NodeUpdateSchedulerEventWrapper eventWrapper;
+-    try {
+-      if (schedulerEvent.getType() == SchedulerEventType.NODE_UPDATE
+-          && schedulerEvent instanceof NodeUpdateSchedulerEvent) {
+-        eventWrapper = new NodeUpdateSchedulerEventWrapper(
+-            (NodeUpdateSchedulerEvent) schedulerEvent);
+-        schedulerEvent = eventWrapper;
+-        updateQueueWithNodeUpdate(eventWrapper);
+-      } else if (
+-          schedulerEvent.getType() == SchedulerEventType.APP_ATTEMPT_REMOVED
+-              && schedulerEvent instanceof AppAttemptRemovedSchedulerEvent) {
+-        // check if having AM Container, update resource usage information
+-        AppAttemptRemovedSchedulerEvent appRemoveEvent =
+-            (AppAttemptRemovedSchedulerEvent) schedulerEvent;
+-        ApplicationAttemptId appAttemptId =
+-            appRemoveEvent.getApplicationAttemptID();
+-        String queue = appQueueMap.get(appAttemptId);
+-        SchedulerAppReport app = scheduler.getSchedulerAppInfo(appAttemptId);
+-        if (!app.getLiveContainers().isEmpty()) {  // have 0 or 1
+-          // should have one container which is AM container
+-          RMContainer rmc = app.getLiveContainers().iterator().next();
+-          schedulerMetrics.updateQueueMetricsByRelease(
+-              rmc.getContainer().getResource(), queue);
+-        }
+-      }
+-
+-      handlerTimer = schedulerMetrics.getSchedulerHandleTimer().time();
+-      operationTimer = schedulerMetrics.getSchedulerHandleTimer(
+-          schedulerEvent.getType()).time();
+-
+-      ((SchedulerWrapper)scheduler).propagatedHandle(schedulerEvent);
+-    } finally {
+-      if (handlerTimer != null) {
+-        handlerTimer.stop();
+-      }
+-      if (operationTimer != null) {
+-        operationTimer.stop();
+-      }
+-      schedulerMetrics.increaseSchedulerHandleCounter(schedulerEvent.getType());
+-
+-      if (schedulerEvent.getType() == SchedulerEventType.APP_ATTEMPT_REMOVED
+-          && schedulerEvent instanceof AppAttemptRemovedSchedulerEvent) {
+-        wrapper.getSLSRunner().decreaseRemainingApps();
+-        AppAttemptRemovedSchedulerEvent appRemoveEvent =
+-            (AppAttemptRemovedSchedulerEvent) schedulerEvent;
+-        appQueueMap.remove(appRemoveEvent.getApplicationAttemptID());
+-        if (wrapper.getSLSRunner().getRemainingApps() == 0) {
+-          try {
+-            schedulerMetrics.tearDown();
+-            SLSRunner.exitSLSRunner();
+-          } catch (Exception e) {
+-            LOG.error("Scheduler Metrics failed to tear down.", e);
+-          }
+-        }
+-      } else if (schedulerEvent.getType() ==
+-          SchedulerEventType.APP_ATTEMPT_ADDED
+-          && schedulerEvent instanceof AppAttemptAddedSchedulerEvent) {
+-        AppAttemptAddedSchedulerEvent appAddEvent =
+-            (AppAttemptAddedSchedulerEvent) schedulerEvent;
+-        SchedulerApplication app =
+-            scheduler.getSchedulerApplications()
+-                .get(appAddEvent.getApplicationAttemptId().getApplicationId());
+-        appQueueMap.put(appAddEvent.getApplicationAttemptId(), app.getQueue()
+-            .getQueueName());
+-      }
+-    }
+-  }
+-
+-  private void updateQueueWithNodeUpdate(
+-      NodeUpdateSchedulerEventWrapper eventWrapper) {
+-    RMNodeWrapper node = (RMNodeWrapper) eventWrapper.getRMNode();
+-    List<UpdatedContainerInfo> containerList = node.getContainerUpdates();
+-    for (UpdatedContainerInfo info : containerList) {
+-      for (ContainerStatus status : info.getCompletedContainers()) {
+-        ContainerId containerId = status.getContainerId();
+-        SchedulerAppReport app = scheduler.getSchedulerAppInfo(
+-            containerId.getApplicationAttemptId());
+-
+-        if (app == null) {
+-          // this happens for the AM container
+-          // The app have already removed when the NM sends the release
+-          // information.
+-          continue;
+-        }
+-
+-        int releasedMemory = 0, releasedVCores = 0;
+-        if (status.getExitStatus() == ContainerExitStatus.SUCCESS) {
+-          for (RMContainer rmc : app.getLiveContainers()) {
+-            if (rmc.getContainerId() == containerId) {
+-              Resource resource = rmc.getContainer().getResource();
+-              releasedMemory += resource.getMemorySize();
+-              releasedVCores += resource.getVirtualCores();
+-              break;
+-            }
+-          }
+-        } else if (status.getExitStatus() == ContainerExitStatus.ABORTED) {
+-          if (preemptionContainerMap.containsKey(containerId)) {
+-            Resource preResource = preemptionContainerMap.get(containerId);
+-            releasedMemory += preResource.getMemorySize();
+-            releasedVCores += preResource.getVirtualCores();
+-            preemptionContainerMap.remove(containerId);
+-          }
+-        }
+-        // update queue counters
+-        String queue = appQueueMap.get(containerId.getApplicationAttemptId());
+-        schedulerMetrics.updateQueueMetricsByRelease(
+-            Resource.newInstance(releasedMemory, releasedVCores), queue);
+-      }
+-    }
+-  }
+-  
+-  public SchedulerMetrics getSchedulerMetrics() {
+-    return schedulerMetrics;
+-  }
+-
+-  public boolean isMetricsON() {
+-    return metricsON;
+-  }
+-
+-  public Tracker getTracker() {
+-    return tracker;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
+deleted file mode 100644
+index f66cf4384d9..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
++++ /dev/null
+@@ -1,736 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import java.io.BufferedWriter;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.OutputStreamWriter;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.SortedMap;
+-import java.util.Locale;
+-import java.util.concurrent.ScheduledExecutorService;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.locks.ReentrantLock;
+-import java.util.concurrent.locks.Lock;
+-
+-import com.codahale.metrics.Counter;
+-import com.codahale.metrics.CsvReporter;
+-import com.codahale.metrics.Gauge;
+-import com.codahale.metrics.Histogram;
+-import com.codahale.metrics.MetricRegistry;
+-import com.codahale.metrics.SlidingWindowReservoir;
+-import com.codahale.metrics.Timer;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.concurrent.HadoopScheduledThreadPoolExecutor;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.utils.NodeUsageRanges;
+-import org.apache.hadoop.yarn.sls.web.SLSWebApp;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public abstract class SchedulerMetrics {
+-  private static final String EOL = System.getProperty("line.separator");
+-  private static final int SAMPLING_SIZE = 60;
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SchedulerMetrics.class);
+-
+-  protected ResourceScheduler scheduler;
+-  protected Set<String> trackedQueues;
+-  protected MetricRegistry metrics;
+-  protected Set<String> appTrackedMetrics;
+-  protected Set<String> queueTrackedMetrics;
+-
+-  private Configuration conf;
+-  private ScheduledExecutorService pool;
+-  private SLSWebApp web;
+-
+-  // metrics
+-  private String metricsOutputDir;
+-  private BufferedWriter metricsLogBW;
+-  private BufferedWriter jobRuntimeLogBW;
+-  private boolean running = false;
+-
+-  // counters for scheduler allocate/handle operations
+-  private Counter schedulerAllocateCounter;
+-  private Counter schedulerCommitSuccessCounter;
+-  private Counter schedulerCommitFailureCounter;
+-  private Counter schedulerHandleCounter;
+-  private Map<SchedulerEventType, Counter> schedulerHandleCounterMap;
+-
+-  // Timers for scheduler allocate/handle operations
+-  private Timer schedulerAllocateTimer;
+-  private Timer schedulerCommitSuccessTimer;
+-  private Timer schedulerCommitFailureTimer;
+-  private Timer schedulerHandleTimer;
+-  private Map<SchedulerEventType, Timer> schedulerHandleTimerMap;
+-  private List<Histogram> schedulerHistogramList;
+-  private Map<Histogram, Timer> histogramTimerMap;
+-  private Lock samplerLock;
+-  private Lock queueLock;
+-
+-  static Class getSchedulerMetricsClass(Configuration conf,
+-      Class schedulerClass) throws ClassNotFoundException {
+-    Class metricClass = null;
+-    String schedulerMetricsType = conf.get(schedulerClass.getName());
+-    if (schedulerMetricsType != null) {
+-      metricClass = Class.forName(schedulerMetricsType);
+-    }
+-
+-    if (schedulerClass.equals(FairScheduler.class)) {
+-      metricClass = FairSchedulerMetrics.class;
+-    } else if (schedulerClass.equals(CapacityScheduler.class)) {
+-      metricClass = CapacitySchedulerMetrics.class;
+-    } else if (schedulerClass.equals(FifoScheduler.class)) {
+-      metricClass = FifoSchedulerMetrics.class;
+-    }
+-
+-    return metricClass;
+-  }
+-
+-  static SchedulerMetrics getInstance(Configuration conf, Class schedulerClass)
+-      throws ClassNotFoundException {
+-    Class schedulerMetricClass = getSchedulerMetricsClass(conf, schedulerClass);
+-    return (SchedulerMetrics) ReflectionUtils
+-        .newInstance(schedulerMetricClass, new Configuration());
+-  }
+-
+-  public SchedulerMetrics() {
+-    metrics = new MetricRegistry();
+-
+-    appTrackedMetrics = new HashSet<>();
+-    appTrackedMetrics.add("live.containers");
+-    appTrackedMetrics.add("reserved.containers");
+-
+-    queueTrackedMetrics = new HashSet<>();
+-    trackedQueues = new HashSet<>();
+-
+-    samplerLock = new ReentrantLock();
+-    queueLock = new ReentrantLock();
+-  }
+-
+-  void init(ResourceScheduler resourceScheduler, Configuration config)
+-      throws Exception {
+-    this.scheduler = resourceScheduler;
+-    this.conf = config;
+-
+-    metricsOutputDir = conf.get(SLSConfiguration.METRICS_OUTPUT_DIR);
+-
+-    // register various metrics
+-    registerJvmMetrics();
+-    registerClusterResourceMetrics();
+-    registerContainerAppNumMetrics();
+-    registerSchedulerMetrics();
+-    registerNodesUsageMetrics("memory");
+-    registerNodesUsageMetrics("vcores");
+-
+-    // .csv output
+-    initMetricsCSVOutput();
+-
+-    // start web app to provide real-time tracking
+-    int metricsWebAddressPort = conf.getInt(
+-        SLSConfiguration.METRICS_WEB_ADDRESS_PORT,
+-        SLSConfiguration.METRICS_WEB_ADDRESS_PORT_DEFAULT);
+-    web = new SLSWebApp((SchedulerWrapper)scheduler, metricsWebAddressPort);
+-    web.start();
+-
+-    // a thread to update histogram timer
+-    pool = new HadoopScheduledThreadPoolExecutor(2);
+-    pool.scheduleAtFixedRate(new HistogramsRunnable(), 0, 1000,
+-        TimeUnit.MILLISECONDS);
+-
+-    // a thread to output metrics for real-time tracking
+-    pool.scheduleAtFixedRate(new MetricsLogRunnable(), 0, 1000,
+-        TimeUnit.MILLISECONDS);
+-
+-    // application running information
+-    jobRuntimeLogBW =
+-        new BufferedWriter(new OutputStreamWriter(new FileOutputStream(
+-            metricsOutputDir + "/jobruntime.csv"), StandardCharsets.UTF_8));
+-    jobRuntimeLogBW.write("JobID,real_start_time,real_end_time," +
+-        "simulate_start_time,simulate_end_time" + EOL);
+-    jobRuntimeLogBW.flush();
+-  }
+-
+-  public MetricRegistry getMetrics() {
+-    return metrics;
+-  }
+-
+-  protected SchedulerApplicationAttempt getSchedulerAppAttempt(
+-      ApplicationId appId) {
+-    AbstractYarnScheduler yarnScheduler = (AbstractYarnScheduler)scheduler;
+-    SchedulerApplication app = (SchedulerApplication)yarnScheduler
+-        .getSchedulerApplications().get(appId);
+-    if (app == null) {
+-      return null;
+-    }
+-    return app.getCurrentAppAttempt();
+-  }
+-
+-  public void trackApp(final ApplicationId appId, String oldAppId) {
+-    metrics.register("variable.app." + oldAppId + ".live.containers",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            SchedulerApplicationAttempt appAttempt =
+-                getSchedulerAppAttempt(appId);
+-            if (appAttempt != null) {
+-              return appAttempt.getLiveContainers().size();
+-            } else {
+-              return 0;
+-            }
+-          }
+-        }
+-    );
+-    metrics.register("variable.app." + oldAppId + ".reserved.containers",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            SchedulerApplicationAttempt appAttempt =
+-                getSchedulerAppAttempt(appId);
+-            if (appAttempt != null) {
+-              return appAttempt.getReservedContainers().size();
+-            } else {
+-              return 0;
+-            }
+-          }
+-        }
+-    );
+-  }
+-
+-  public void untrackApp(String oldAppId) {
+-    for (String m : appTrackedMetrics) {
+-      metrics.remove("variable.app." + oldAppId + "." + m);
+-    }
+-  }
+-
+-  /**
+-   * Track a queue by registering its metrics.
+-   *
+-   * @param queue queue name
+-   */
+-  public void trackQueue(String queue) {
+-    queueLock.lock();
+-    try {
+-      if (!isTracked(queue)) {
+-        trackedQueues.add(queue);
+-        registerQueueMetrics(queue);
+-      }
+-    } finally {
+-      queueLock.unlock();
+-    }
+-  }
+-
+-  protected void registerQueueMetrics(String queueName) {
+-    SortedMap<String, Counter> counterMap = metrics.getCounters();
+-
+-    for (QueueMetric queueMetric : QueueMetric.values()) {
+-      String metricName = getQueueMetricName(queueName, queueMetric);
+-      if (!counterMap.containsKey(metricName)) {
+-        metrics.counter(metricName);
+-        queueTrackedMetrics.add(metricName);
+-      }
+-    }
+-  }
+-
+-  public boolean isTracked(String queueName) {
+-    return trackedQueues.contains(queueName);
+-  }
+-  
+-  public Set<String> getAppTrackedMetrics() {
+-    return appTrackedMetrics;
+-  }
+-
+-  public Set<String> getQueueTrackedMetrics() {
+-    return queueTrackedMetrics;
+-  }
+-
+-  private void registerJvmMetrics() {
+-    // add JVM gauges
+-    metrics.register("variable.jvm.free.memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            return Runtime.getRuntime().freeMemory();
+-          }
+-        }
+-    );
+-    metrics.register("variable.jvm.max.memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            return Runtime.getRuntime().maxMemory();
+-          }
+-        }
+-    );
+-    metrics.register("variable.jvm.total.memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            return Runtime.getRuntime().totalMemory();
+-          }
+-        }
+-    );
+-  }
+-
+-  private void registerClusterResourceMetrics() {
+-    metrics.register("variable.cluster.allocated.memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            if (isMetricsAvailable()) {
+-              return 0L;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAllocatedMB();
+-            }
+-          }
+-        }
+-    );
+-    metrics.register("variable.cluster.allocated.vcores",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            if (isMetricsAvailable()) {
+-              return 0;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAllocatedVirtualCores();
+-            }
+-          }
+-        }
+-    );
+-    metrics.register("variable.cluster.available.memory",
+-        new Gauge<Long>() {
+-          @Override
+-          public Long getValue() {
+-            if (isMetricsAvailable()) {
+-              return 0L;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAvailableMB();
+-            }
+-          }
+-        }
+-    );
+-    metrics.register("variable.cluster.available.vcores",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            if (isMetricsAvailable()) {
+-              return 0;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAvailableVirtualCores();
+-            }
+-          }
+-        }
+-    );
+-  }
+-
+-  private boolean isMetricsAvailable() {
+-    return scheduler.getRootQueueMetrics() == null;
+-  }
+-
+-  private void registerContainerAppNumMetrics() {
+-    metrics.register("variable.running.application",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            if (scheduler.getRootQueueMetrics() == null) {
+-              return 0;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAppsRunning();
+-            }
+-          }
+-        }
+-    );
+-    metrics.register("variable.running.container",
+-        new Gauge<Integer>() {
+-          @Override
+-          public Integer getValue() {
+-            if (scheduler.getRootQueueMetrics() == null) {
+-              return 0;
+-            } else {
+-              return scheduler.getRootQueueMetrics().getAllocatedContainers();
+-            }
+-          }
+-        }
+-    );
+-  }
+-
+-  private void registerSchedulerMetrics() {
+-    samplerLock.lock();
+-    try {
+-      // counters for scheduler operations
+-      schedulerAllocateCounter = metrics.counter(
+-          "counter.scheduler.operation.allocate");
+-      schedulerCommitSuccessCounter = metrics.counter(
+-          "counter.scheduler.operation.commit.success");
+-      schedulerCommitFailureCounter = metrics.counter(
+-          "counter.scheduler.operation.commit.failure");
+-      schedulerHandleCounter = metrics.counter(
+-          "counter.scheduler.operation.handle");
+-      schedulerHandleCounterMap = new HashMap<>();
+-      for (SchedulerEventType e : SchedulerEventType.values()) {
+-        Counter counter = metrics.counter(
+-            "counter.scheduler.operation.handle." + e);
+-        schedulerHandleCounterMap.put(e, counter);
+-      }
+-      // timers for scheduler operations
+-      int timeWindowSize = conf.getInt(
+-          SLSConfiguration.METRICS_TIMER_WINDOW_SIZE,
+-          SLSConfiguration.METRICS_TIMER_WINDOW_SIZE_DEFAULT);
+-      schedulerAllocateTimer = new Timer(
+-          new SlidingWindowReservoir(timeWindowSize));
+-      schedulerCommitSuccessTimer = new Timer(
+-          new SlidingWindowReservoir(timeWindowSize));
+-      schedulerCommitFailureTimer = new Timer(
+-          new SlidingWindowReservoir(timeWindowSize));
+-      schedulerHandleTimer = new Timer(
+-          new SlidingWindowReservoir(timeWindowSize));
+-      schedulerHandleTimerMap = new HashMap<>();
+-      for (SchedulerEventType e : SchedulerEventType.values()) {
+-        Timer timer = new Timer(new SlidingWindowReservoir(timeWindowSize));
+-        schedulerHandleTimerMap.put(e, timer);
+-      }
+-      // histogram for scheduler operations (Samplers)
+-      schedulerHistogramList = new ArrayList<>();
+-      histogramTimerMap = new HashMap<>();
+-      Histogram schedulerAllocateHistogram = new Histogram(
+-          new SlidingWindowReservoir(SAMPLING_SIZE));
+-      metrics.register("sampler.scheduler.operation.allocate.timecost",
+-          schedulerAllocateHistogram);
+-      schedulerHistogramList.add(schedulerAllocateHistogram);
+-      histogramTimerMap.put(schedulerAllocateHistogram, schedulerAllocateTimer);
+-      Histogram schedulerCommitHistogram = new Histogram(
+-          new SlidingWindowReservoir(SAMPLING_SIZE));
+-      metrics.register("sampler.scheduler.operation.commit.success.timecost",
+-          schedulerCommitHistogram);
+-      schedulerHistogramList.add(schedulerCommitHistogram);
+-      histogramTimerMap
+-          .put(schedulerCommitHistogram, schedulerCommitSuccessTimer);
+-      Histogram schedulerCommitFailureHistogram =
+-          new Histogram(new SlidingWindowReservoir(SAMPLING_SIZE));
+-      metrics.register("sampler.scheduler.operation.commit.failure.timecost",
+-          schedulerCommitFailureHistogram);
+-      schedulerHistogramList.add(schedulerCommitFailureHistogram);
+-      histogramTimerMap
+-          .put(schedulerCommitFailureHistogram, schedulerCommitFailureTimer);
+-      Histogram schedulerHandleHistogram = new Histogram(
+-          new SlidingWindowReservoir(SAMPLING_SIZE));
+-      metrics.register("sampler.scheduler.operation.handle.timecost",
+-          schedulerHandleHistogram);
+-      schedulerHistogramList.add(schedulerHandleHistogram);
+-      histogramTimerMap.put(schedulerHandleHistogram, schedulerHandleTimer);
+-      for (SchedulerEventType e : SchedulerEventType.values()) {
+-        Histogram histogram = new Histogram(
+-            new SlidingWindowReservoir(SAMPLING_SIZE));
+-        metrics.register(
+-            "sampler.scheduler.operation.handle." + e + ".timecost",
+-            histogram);
+-        schedulerHistogramList.add(histogram);
+-        histogramTimerMap.put(histogram, schedulerHandleTimerMap.get(e));
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Caught exception while registering scheduler metrics", e);
+-      throw e;
+-    } finally {
+-      samplerLock.unlock();
+-    }
+-  }
+-
+-  private void registerNodesUsageMetrics(String resourceType) {
+-    samplerLock.lock();
+-    try {
+-      for (NodeUsageRanges.Range range : NodeUsageRanges.getRanges()) {
+-        String metricName = "nodes." + resourceType + "." + range.getKeyword();
+-        metrics.register(metricName,
+-            new Gauge<Integer>() {
+-              @Override
+-              public Integer getValue() {
+-                if (!(scheduler instanceof AbstractYarnScheduler)) {
+-                  return 0;
+-                } else {
+-                  int count = 0;
+-                  AbstractYarnScheduler sch = (AbstractYarnScheduler) scheduler;
+-                  for (Object node : sch.getNodeTracker().getAllNodes()) {
+-                    SchedulerNode sNode = (SchedulerNode) node;
+-                    long allocated = 0, total = 0;
+-                    if (resourceType.equals("memory")) {
+-                      allocated = sNode.getAllocatedResource().getMemorySize();
+-                      total = sNode.getTotalResource().getMemorySize();
+-                    } else if (resourceType.equals("vcores")) {
+-                      allocated =
+-                          sNode.getAllocatedResource().getVirtualCores();
+-                      total =
+-                          sNode.getTotalResource().getVirtualCores();
+-                    }
+-                    float usedPct = allocated * 100f / total;
+-                    if (range.getLowerLimit() <= usedPct
+-                        && usedPct <= range.getUpperLimit()) {
+-                      count++;
+-                    }
+-                  }
+-                  return count;
+-                }
+-              }
+-            }
+-        );
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Caught exception while registering nodes usage metrics", e);
+-      throw e;
+-    } finally {
+-      samplerLock.unlock();
+-    }
+-  }
+-
+-  private void initMetricsCSVOutput() {
+-    int timeIntervalMS = conf.getInt(
+-        SLSConfiguration.METRICS_RECORD_INTERVAL_MS,
+-        SLSConfiguration.METRICS_RECORD_INTERVAL_MS_DEFAULT);
+-    File dir = new File(metricsOutputDir + "/metrics");
+-    if(!dir.exists() && !dir.mkdirs()) {
+-      LOG.error("Cannot create directory {}", dir.getAbsoluteFile());
+-    }
+-    final CsvReporter reporter = CsvReporter.forRegistry(metrics)
+-        .formatFor(Locale.US)
+-        .convertRatesTo(TimeUnit.SECONDS)
+-        .convertDurationsTo(TimeUnit.MILLISECONDS)
+-        .build(new File(metricsOutputDir + "/metrics"));
+-    reporter.start(timeIntervalMS, TimeUnit.MILLISECONDS);
+-  }
+-
+-  boolean isRunning() {
+-    return running;
+-  }
+-
+-  void setRunning(boolean running) {
+-    this.running = running;
+-  }
+-
+-  class HistogramsRunnable implements Runnable {
+-    @Override
+-    public void run() {
+-      samplerLock.lock();
+-      try {
+-        for (Histogram histogram : schedulerHistogramList) {
+-          Timer timer = histogramTimerMap.get(histogram);
+-          histogram.update((int) timer.getSnapshot().getMean());
+-        }
+-      } finally {
+-        samplerLock.unlock();
+-      }
+-    }
+-  }
+-
+-  class MetricsLogRunnable implements Runnable {
+-    private boolean firstLine = true;
+-
+-    MetricsLogRunnable() {
+-      try {
+-        metricsLogBW =
+-            new BufferedWriter(new OutputStreamWriter(new FileOutputStream(
+-                metricsOutputDir + "/realtimetrack.json"), StandardCharsets.UTF_8));
+-        metricsLogBW.write("[");
+-      } catch (IOException e) {
+-        LOG.info(e.getMessage());
+-      }
+-    }
+-
+-    @Override
+-    public void run() {
+-      SchedulerWrapper wrapper = (SchedulerWrapper) scheduler;
+-      if(running && wrapper.getTracker().getQueueSet() != null) {
+-        // all WebApp to get real tracking json
+-        String trackingMetrics = web.generateRealTimeTrackingMetrics();
+-        // output
+-        try {
+-          if(firstLine) {
+-            metricsLogBW.write(trackingMetrics + EOL);
+-            firstLine = false;
+-          } else {
+-            metricsLogBW.write("," + trackingMetrics + EOL);
+-          }
+-          metricsLogBW.flush();
+-        } catch (IOException e) {
+-          LOG.info(e.getMessage());
+-        }
+-      }
+-    }
+-  }
+-
+-  void tearDown() throws Exception {
+-    setRunning(false);
+-    LOG.info("Scheduler Metrics tears down");
+-    if (metricsLogBW != null)  {
+-      metricsLogBW.write("]");
+-      metricsLogBW.close();
+-      //metricsLogBW is nullified to prevent the usage after closing
+-      metricsLogBW = null;
+-    }
+-
+-    if (web != null) {
+-      web.stop();
+-    }
+-
+-    if (jobRuntimeLogBW != null) {
+-      jobRuntimeLogBW.close();
+-    }
+-
+-    if (pool != null) {
+-      pool.shutdown();
+-    }
+-  }
+-
+-  void increaseSchedulerAllocationCounter() {
+-    schedulerAllocateCounter.inc();
+-  }
+-
+-  void increaseSchedulerCommitSuccessCounter() {
+-    schedulerCommitSuccessCounter.inc();
+-  }
+-
+-  void increaseSchedulerCommitFailureCounter() {
+-    schedulerCommitFailureCounter.inc();
+-  }
+-
+-  void increaseSchedulerHandleCounter(SchedulerEventType schedulerEventType) {
+-    schedulerHandleCounter.inc();
+-    schedulerHandleCounterMap.get(schedulerEventType).inc();
+-  }
+-
+-  Timer getSchedulerAllocateTimer() {
+-    return schedulerAllocateTimer;
+-  }
+-
+-  Timer getSchedulerCommitSuccessTimer() {
+-    return schedulerCommitSuccessTimer;
+-  }
+-
+-  Timer getSchedulerCommitFailureTimer() {
+-    return schedulerCommitFailureTimer;
+-  }
+-
+-  Timer getSchedulerHandleTimer() {
+-    return schedulerHandleTimer;
+-  }
+-
+-  Timer getSchedulerHandleTimer(SchedulerEventType schedulerEventType) {
+-    return schedulerHandleTimerMap.get(schedulerEventType);
+-  }
+-
+-  private enum QueueMetric {
+-    PENDING_MEMORY("pending.memory"),
+-    PENDING_VCORES("pending.cores"),
+-    ALLOCATED_MEMORY("allocated.memory"),
+-    ALLOCATED_VCORES("allocated.cores");
+-
+-    private String value;
+-
+-    QueueMetric(String value) {
+-      this.value = value;
+-    }
+-  }
+-
+-  private String getQueueMetricName(String queue, QueueMetric metric) {
+-    return "counter.queue." + queue + "." + metric.value;
+-  }
+-
+-  void updateQueueMetrics(Resource pendingResource, Resource allocatedResource,
+-      String queueName) {
+-    trackQueue(queueName);
+-
+-    SortedMap<String, Counter> counterMap = metrics.getCounters();
+-    for(QueueMetric metric : QueueMetric.values()) {
+-      String metricName = getQueueMetricName(queueName, metric);
+-
+-      if (metric == QueueMetric.PENDING_MEMORY) {
+-        counterMap.get(metricName).inc(pendingResource.getMemorySize());
+-      } else if (metric == QueueMetric.PENDING_VCORES) {
+-        counterMap.get(metricName).inc(pendingResource.getVirtualCores());
+-      } else if (metric == QueueMetric.ALLOCATED_MEMORY) {
+-        counterMap.get(metricName).inc(allocatedResource.getMemorySize());
+-      } else if (metric == QueueMetric.ALLOCATED_VCORES){
+-        counterMap.get(metricName).inc(allocatedResource.getVirtualCores());
+-      }
+-    }
+-  }
+-
+-  void updateQueueMetricsByRelease(Resource releaseResource, String queue) {
+-    SortedMap<String, Counter> counterMap = metrics.getCounters();
+-    String name = getQueueMetricName(queue, QueueMetric.ALLOCATED_MEMORY);
+-    if (!counterMap.containsKey(name)) {
+-      metrics.counter(name);
+-      counterMap = metrics.getCounters();
+-    }
+-    counterMap.get(name).inc(-releaseResource.getMemorySize());
+-
+-    String vcoreMetric =
+-        getQueueMetricName(queue, QueueMetric.ALLOCATED_VCORES);
+-    if (!counterMap.containsKey(vcoreMetric)) {
+-      metrics.counter(vcoreMetric);
+-      counterMap = metrics.getCounters();
+-    }
+-    counterMap.get(vcoreMetric).inc(-releaseResource.getVirtualCores());
+-  }
+-
+-  public void addTrackedApp(ApplicationId appId,
+-      String oldAppId) {
+-    trackApp(appId, oldAppId);
+-  }
+-
+-  public void removeTrackedApp(String oldAppId) {
+-    untrackApp(oldAppId);
+-  }
+-
+-  public void addAMRuntime(ApplicationId appId, long traceStartTimeMS,
+-      long traceEndTimeMS, long simulateStartTimeMS, long simulateEndTimeMS) {
+-    try {
+-      // write job runtime information
+-      String runtimeInfo = appId + "," + traceStartTimeMS + "," +
+-          traceEndTimeMS + "," + simulateStartTimeMS +
+-          "," + simulateEndTimeMS;
+-      jobRuntimeLogBW.write(runtimeInfo + EOL);
+-      jobRuntimeLogBW.flush();
+-    } catch (IOException e) {
+-      LOG.info(e.getMessage());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java
+deleted file mode 100644
+index cc9844a8f2a..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerWrapper.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-
+-import java.util.List;
+-
+-@Private
+-@Unstable
+-public interface SchedulerWrapper {
+-  SchedulerMetrics getSchedulerMetrics();
+-
+-  Tracker getTracker();
+-
+-  String getRealQueueName(String queue) throws YarnException;
+-
+-  void propagatedHandle(SchedulerEvent schedulerEvent);
+-
+-  Allocation allocatePropagated(ApplicationAttemptId attemptId,
+-      List<ResourceRequest> resourceRequests,
+-      List<SchedulingRequest> schedulingRequests,
+-      List<ContainerId> containerIds,
+-      List<String> blacklistAdditions,
+-      List<String> blacklistRemovals,
+-      ContainerUpdates updateRequests);
+-
+-  void setSLSRunner(SLSRunner runner);
+-
+-  SLSRunner getSLSRunner();
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
+deleted file mode 100644
+index 167845522b0..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
++++ /dev/null
+@@ -1,188 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import java.text.MessageFormat;
+-import java.util.Queue;
+-import java.util.concurrent.DelayQueue;
+-import java.util.concurrent.Delayed;
+-import java.util.concurrent.ThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class TaskRunner {
+-  private static final Logger LOG = LoggerFactory.getLogger(TaskRunner.class);
+-
+-  @Private
+-  @Unstable
+-  public abstract static class Task implements Runnable, Delayed {
+-    private long start;
+-    private long end;
+-    private long nextRun;
+-    private long startTime;
+-    private long endTime;
+-    private long repeatInterval;
+-    private Queue<Task> queue;
+-
+-    public Task(){}
+-    
+-    //values in milliseconds, start/end are milliseconds from now
+-    public void init(long startTime, long endTime, long repeatInterval) {
+-      if (endTime - startTime < 0) {
+-        throw new IllegalArgumentException(MessageFormat.format(
+-          "endTime[{0}] cannot be smaller than startTime[{1}]", endTime, 
+-          startTime));
+-      }
+-      if (repeatInterval < 0) {
+-        throw new IllegalArgumentException(MessageFormat.format(
+-          "repeatInterval[{0}] cannot be less than 1", repeatInterval));
+-      }
+-      if ((endTime - startTime) % repeatInterval != 0) {
+-        throw new IllegalArgumentException(MessageFormat.format(
+-          "Invalid parameters: (endTime[{0}] - startTime[{1}]) " +
+-                  "% repeatInterval[{2}] != 0",
+-          endTime, startTime, repeatInterval));        
+-      }
+-      start = startTime;
+-      end = endTime;
+-      this.repeatInterval = repeatInterval;
+-    }
+-
+-    private void timeRebase(long now) {
+-      startTime = now + start;
+-      endTime = now + end;
+-      this.nextRun = startTime;
+-    }
+-    
+-    //values in milliseconds, start is milliseconds from now
+-    //it only executes firstStep()
+-    public void init(long startTime) {
+-      init(startTime, startTime, 1);
+-    }
+-
+-    private void setQueue(Queue<Task> queue) {
+-      this.queue = queue;
+-    }
+-
+-    @Override
+-    public final void run() {
+-      try {
+-        if (nextRun == startTime) {
+-          firstStep();
+-          nextRun += repeatInterval;
+-          if (nextRun <= endTime) {
+-            queue.add(this);          
+-          }
+-        } else if (nextRun < endTime) {
+-          middleStep();
+-          nextRun += repeatInterval;
+-          queue.add(this);
+-        } else {
+-          lastStep();
+-        }
+-      } catch (Exception e) {
+-        LOG.error("Caught exception while executing Taskrunner", e);
+-        Thread.getDefaultUncaughtExceptionHandler()
+-            .uncaughtException(Thread.currentThread(), e);
+-      }
+-    }
+-
+-    @Override
+-    public long getDelay(TimeUnit unit) {
+-      return unit.convert(nextRun - System.currentTimeMillis(),
+-        TimeUnit.MILLISECONDS);
+-    }
+-
+-    @Override
+-    public int compareTo(Delayed o) {
+-      if (!(o instanceof Task)) {
+-        throw new IllegalArgumentException("Parameter must be a Task instance");
+-      }
+-      Task other = (Task) o;
+-      return (int) Math.signum(nextRun - other.nextRun);
+-    }
+-
+-
+-    public abstract void firstStep() throws Exception;
+-
+-    public abstract void middleStep() throws Exception;
+-
+-    public abstract void lastStep() throws Exception;
+-
+-    public void setEndTime(long et) {
+-      endTime = et;
+-    }
+-  }
+-
+-  private DelayQueue queue;
+-  private int threadPoolSize;
+-  private ThreadPoolExecutor executor;
+-  private long startTimeMS = 0;
+-  
+-  public TaskRunner() {
+-    queue = new DelayQueue();
+-  }
+-
+-  public void setQueueSize(int threadPoolSize) {
+-    this.threadPoolSize = threadPoolSize;
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  public void start() {
+-    if (executor != null && !executor.isTerminated()) {
+-      throw new IllegalStateException("Executor already running");
+-    }
+-    DelayQueue preStartQueue = queue;
+-
+-    queue = new DelayQueue();
+-    executor = new ThreadPoolExecutor(threadPoolSize, threadPoolSize, 0,
+-      TimeUnit.MILLISECONDS, queue);
+-    executor.prestartAllCoreThreads();
+-
+-    startTimeMS = System.currentTimeMillis();
+-    for (Object d : preStartQueue) {
+-      schedule((Task) d, startTimeMS);
+-    }
+-  }
+-  
+-  public void stop() throws InterruptedException {
+-    executor.shutdownNow();
+-    executor.awaitTermination(20, TimeUnit.SECONDS);
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  private void schedule(Task task, long timeNow) {
+-    task.timeRebase(timeNow);
+-    task.setQueue(queue);
+-    queue.add(task);
+-  }
+-
+-  public void schedule(Task task) {
+-    schedule(task, System.currentTimeMillis());
+-  }
+-
+-  public long getStartTimeMS() {
+-    return this.startTimeMS;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/Tracker.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/Tracker.java
+deleted file mode 100644
+index 42a5c3c894d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/Tracker.java
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-
+-import java.util.Set;
+-
+-@Private
+-@Unstable
+-public class Tracker {
+-  private Set<String> queueSet;
+-  private Set<String> trackedAppSet;
+-
+-  public void setQueueSet(Set<String> queues) {
+-    queueSet = queues;
+-  }
+-
+-  public Set<String> getQueueSet() {
+-    return queueSet;
+-  }
+-
+-  public void setTrackedAppSet(Set<String> apps) {
+-    trackedAppSet = apps;
+-  }
+-
+-  public Set<String> getTrackedAppSet() {
+-    return trackedAppSet;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthJob.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthJob.java
+deleted file mode 100644
+index eea0a8b6426..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthJob.java
++++ /dev/null
+@@ -1,377 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.synthetic;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.commons.math3.random.JDKRandomGenerator;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.MapTaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.ReduceTaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.TaskAttemptInfo;
+-import org.apache.hadoop.tools.rumen.TaskInfo;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.sls.appmaster.MRAMSimulator;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.atomic.AtomicInteger;
+-
+-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+-import static java.util.concurrent.TimeUnit.SECONDS;
+-import static org.apache.hadoop.mapreduce.MRJobConfig.QUEUE_NAME;
+-
+-/**
+- * Generates random task data for a synthetic job.
+- */
+-public class SynthJob implements JobStory {
+-
+-  @SuppressWarnings("StaticVariableName")
+-  private static Logger LOG = LoggerFactory.getLogger(SynthJob.class);
+-
+-  private static final long MIN_MEMORY = 1024;
+-  private static final long MIN_VCORES = 1;
+-
+-  private final Configuration conf;
+-  private final int id;
+-
+-  @SuppressWarnings("ConstantName")
+-  private static final AtomicInteger sequence = new AtomicInteger(0);
+-  private final String name;
+-  private final String queueName;
+-  private final SynthTraceJobProducer.JobDefinition jobDef;
+-
+-  private String type;
+-
+-  // job timing
+-  private final long submitTime;
+-  private final long duration;
+-  private final long deadline;
+-
+-  private Map<String, String> params;
+-
+-  private long totalSlotTime = 0;
+-
+-  // task information
+-  private List<SynthTask> tasks = new ArrayList<>();
+-  private Map<String, List<SynthTask>> taskByType = new HashMap<>();
+-  private Map<String, Integer> taskCounts = new HashMap<>();
+-  private Map<String, Long> taskMemory = new HashMap<>();
+-  private Map<String, Long> taskVcores = new HashMap<>();
+-
+-  /**
+-   * Nested class used to represent a task instance in a job. Each task
+-   * corresponds to one container allocation for the job.
+-   */
+-  public static final class SynthTask{
+-    private String type;
+-    private long time;
+-    private long maxMemory;
+-    private long maxVcores;
+-    private int priority;
+-    private ExecutionType executionType;
+-
+-    private SynthTask(String type, long time, long maxMemory, long maxVcores,
+-        int priority, ExecutionType executionType){
+-      this.type = type;
+-      this.time = time;
+-      this.maxMemory = maxMemory;
+-      this.maxVcores = maxVcores;
+-      this.priority = priority;
+-      this.executionType = executionType;
+-    }
+-
+-    public String getType(){
+-      return type;
+-    }
+-
+-    public long getTime(){
+-      return time;
+-    }
+-
+-    public long getMemory(){
+-      return maxMemory;
+-    }
+-
+-    public long getVcores(){
+-      return maxVcores;
+-    }
+-
+-    public int getPriority(){
+-      return priority;
+-    }
+-
+-    public ExecutionType getExecutionType() {
+-      return executionType;
+-    }
+-
+-    @Override
+-    public String toString(){
+-      return String.format("[task]\ttype: %1$-10s\ttime: %2$3s\tmemory: "
+-              + "%3$4s\tvcores: %4$2s\texecution_type: %5$-10s%n", getType(),
+-          getTime(), getMemory(), getVcores(), getExecutionType().toString());
+-    }
+-  }
+-
+-
+-  protected SynthJob(JDKRandomGenerator rand, Configuration conf,
+-      SynthTraceJobProducer.JobDefinition jobDef,
+-      String queue, long actualSubmissionTime) {
+-
+-    this.conf = conf;
+-    this.jobDef = jobDef;
+-
+-    this.queueName = queue;
+-
+-    this.duration = MILLISECONDS.convert(jobDef.duration.getInt(),
+-        SECONDS);
+-
+-    boolean hasDeadline =
+-        (rand.nextDouble() <= jobDef.reservation.getDouble());
+-
+-    double deadlineFactorSample = jobDef.deadline_factor.getDouble();
+-
+-    this.type = jobDef.type;
+-
+-    this.submitTime = MILLISECONDS.convert(actualSubmissionTime, SECONDS);
+-
+-    this.deadline =
+-        hasDeadline ? MILLISECONDS.convert(actualSubmissionTime, SECONDS)
+-            + (long) Math.ceil(deadlineFactorSample * duration) : -1;
+-
+-    this.params = jobDef.params;
+-
+-    conf.set(QUEUE_NAME, queueName);
+-
+-    // name and initialize job randomness
+-    final long seed = rand.nextLong();
+-    rand.setSeed(seed);
+-    id = sequence.getAndIncrement();
+-
+-    name = String.format(jobDef.class_name + "_%06d", id);
+-    LOG.debug(name + " (" + seed + ")");
+-
+-    LOG.info("JOB TIMING`: job: " + name + " submission:" + submitTime
+-        + " deadline:" + deadline + " duration:" + duration
+-        + " deadline-submission: " + (deadline - submitTime));
+-
+-    // Expand tasks
+-    for(SynthTraceJobProducer.TaskDefinition task : jobDef.tasks){
+-      int num = task.count.getInt();
+-      String taskType = task.type;
+-      long memory = task.max_memory.getLong();
+-      memory = Math.max(memory, MIN_MEMORY);
+-      long vcores = task.max_vcores.getLong();
+-      vcores = Math.max(vcores, MIN_VCORES);
+-      int priority = task.priority;
+-      ExecutionType executionType = task.executionType == null
+-          ? ExecutionType.GUARANTEED
+-          : ExecutionType.valueOf(task.executionType);
+-
+-      // Save task information by type
+-      taskByType.put(taskType, new ArrayList<>());
+-      taskCounts.put(taskType, num);
+-      taskMemory.put(taskType, memory);
+-      taskVcores.put(taskType, vcores);
+-
+-      for(int i = 0; i < num; ++i){
+-        long time = task.time.getLong();
+-        totalSlotTime += time;
+-        SynthTask t = new SynthTask(taskType, time, memory, vcores,
+-            priority, executionType);
+-        tasks.add(t);
+-        taskByType.get(taskType).add(t);
+-      }
+-    }
+-
+-  }
+-
+-  public String getType(){
+-    return type;
+-  }
+-
+-  public List<SynthTask> getTasks(){
+-    return tasks;
+-  }
+-
+-  public boolean hasDeadline() {
+-    return deadline > 0;
+-  }
+-
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public String getUser() {
+-    return jobDef.user_name;
+-  }
+-
+-  public JobID getJobID() {
+-    return new JobID("job_mock_" + name, id);
+-  }
+-
+-  public long getSubmissionTime() {
+-    return submitTime;
+-  }
+-
+-  public String getQueueName() {
+-    return queueName;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    String res = "\nSynthJob [" + jobDef.class_name + "]: \n"
+-        + "\tname: " + getName() + "\n"
+-        + "\ttype: " + getType() + "\n"
+-        + "\tid: " + id + "\n"
+-        + "\tqueue: " + getQueueName() + "\n"
+-        + "\tsubmission: " + getSubmissionTime() + "\n"
+-        + "\tduration: " + getDuration() + "\n"
+-        + "\tdeadline: " + getDeadline() + "\n";
+-    sb.append(res);
+-    int taskno = 0;
+-    for(SynthJob.SynthTask t : getTasks()){
+-      sb.append("\t");
+-      sb.append(taskno);
+-      sb.append(": \t");
+-      sb.append(t.toString());
+-      taskno++;
+-    }
+-    return sb.toString();
+-  }
+-
+-  public long getTotalSlotTime() {
+-    return totalSlotTime;
+-  }
+-
+-  public long getDuration() {
+-    return duration;
+-  }
+-
+-  public long getDeadline() {
+-    return deadline;
+-  }
+-
+-  public Map<String, String> getParams() {
+-    return params;
+-  }
+-
+-  @Override
+-  public boolean equals(Object other) {
+-    if (!(other instanceof SynthJob)) {
+-      return false;
+-    }
+-    SynthJob o = (SynthJob) other;
+-    return tasks.equals(o.tasks)
+-        && submitTime == o.submitTime
+-        && type.equals(o.type)
+-        && queueName.equals(o.queueName)
+-        && jobDef.class_name.equals(o.jobDef.class_name);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return jobDef.class_name.hashCode()
+-        * (int) submitTime * (int) duration;
+-  }
+-
+-
+-  @Override
+-  public JobConf getJobConf() {
+-    return new JobConf(conf);
+-  }
+-
+-  @Override
+-  public int getNumberMaps() {
+-    return taskCounts.get(MRAMSimulator.MAP_TYPE);
+-  }
+-
+-  @Override
+-  public int getNumberReduces() {
+-    return taskCounts.get(MRAMSimulator.REDUCE_TYPE);
+-  }
+-
+-  @Override
+-  public InputSplit[] getInputSplits() {
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  @Override
+-  public TaskInfo getTaskInfo(TaskType taskType, int taskNumber) {
+-    switch(taskType){
+-    case MAP:
+-      return new TaskInfo(-1, -1, -1, -1,
+-          taskMemory.get(MRAMSimulator.MAP_TYPE),
+-          taskVcores.get(MRAMSimulator.MAP_TYPE));
+-    case REDUCE:
+-      return new TaskInfo(-1, -1, -1, -1,
+-          taskMemory.get(MRAMSimulator.REDUCE_TYPE),
+-          taskVcores.get(MRAMSimulator.REDUCE_TYPE));
+-    default:
+-      break;
+-    }
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  @Override
+-  public TaskAttemptInfo getTaskAttemptInfo(TaskType taskType, int taskNumber,
+-      int taskAttemptNumber) {
+-    switch (taskType) {
+-    case MAP:
+-      return new MapTaskAttemptInfo(State.SUCCEEDED,
+-          getTaskInfo(taskType, taskNumber),
+-          taskByType.get(MRAMSimulator.MAP_TYPE).get(taskNumber).time,
+-          null);
+-    case REDUCE:
+-      // We assume uniform split between pull/sort/reduce
+-      // aligned with naive progress reporting assumptions
+-      return new ReduceTaskAttemptInfo(State.SUCCEEDED,
+-          getTaskInfo(taskType, taskNumber),
+-          taskByType.get(MRAMSimulator.MAP_TYPE)
+-              .get(taskNumber).time / 3,
+-          taskByType.get(MRAMSimulator.MAP_TYPE)
+-              .get(taskNumber).time / 3,
+-          taskByType.get(MRAMSimulator.MAP_TYPE)
+-              .get(taskNumber).time / 3, null);
+-    default:
+-      break;
+-    }
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  @Override
+-  public TaskAttemptInfo getMapTaskAttemptInfoAdjusted(int taskNumber,
+-      int taskAttemptNumber, int locality) {
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  @Override
+-  public Values getOutcome() {
+-    return Values.SUCCESS;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthTraceJobProducer.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthTraceJobProducer.java
+deleted file mode 100644
+index 18b1c034bdf..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthTraceJobProducer.java
++++ /dev/null
+@@ -1,665 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.synthetic;
+-
+-import com.fasterxml.jackson.annotation.JsonCreator;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonFactoryBuilder;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.JsonMappingException;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.commons.math3.distribution.AbstractRealDistribution;
+-import org.apache.commons.math3.random.JDKRandomGenerator;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.tools.rumen.JobStory;
+-import org.apache.hadoop.tools.rumen.JobStoryProducer;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.sls.appmaster.MRAMSimulator;
+-
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.io.IOException;
+-import java.util.*;
+-import java.util.concurrent.atomic.AtomicInteger;
+-
+-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+-
+-/**
+- * This is a JobStoryProducer that operates from distribution of different
+- * workloads. The .json input file is used to determine how many weight, which
+- * size, number of maps/reducers and their duration, as well as the temporal
+- * distributed of submissions. For each parameter we control avg and stdev, and
+- * generate values via normal or log-normal distributions.
+- */
+-public class SynthTraceJobProducer implements JobStoryProducer {
+-
+-  @SuppressWarnings("StaticVariableName")
+-  private static final Logger LOG = LoggerFactory.getLogger(SynthTraceJobProducer.class);
+-
+-  private final Configuration conf;
+-  private final AtomicInteger numJobs;
+-  private final Trace trace;
+-  private final long seed;
+-
+-  private int totalWeight;
+-
+-  private final Queue<StoryParams> listStoryParams;
+-
+-  private final JDKRandomGenerator rand;
+-
+-  public static final String SLS_SYNTHETIC_TRACE_FILE =
+-      "sls.synthetic" + ".trace_file";
+-
+-  private final static int DEFAULT_MAPPER_PRIORITY = 20;
+-  private final static int DEFAULT_REDUCER_PRIORITY = 10;
+-
+-  public SynthTraceJobProducer(Configuration conf) throws IOException {
+-    this(conf, new Path(conf.get(SLS_SYNTHETIC_TRACE_FILE)));
+-  }
+-
+-  public SynthTraceJobProducer(Configuration conf, Path path)
+-      throws IOException {
+-
+-    LOG.info("SynthTraceJobProducer");
+-
+-    this.conf = conf;
+-    this.rand = new JDKRandomGenerator();
+-
+-    JsonFactoryBuilder jsonFactoryBuilder = new JsonFactoryBuilder();
+-    jsonFactoryBuilder.configure(JsonFactory.Feature.INTERN_FIELD_NAMES, true);
+-    ObjectMapper mapper = new ObjectMapper(jsonFactoryBuilder.build());
+-    mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+-
+-    FileSystem ifs = path.getFileSystem(conf);
+-    FSDataInputStream fileIn = ifs.open(path);
+-
+-    // Initialize the random generator and the seed
+-    this.trace = mapper.readValue(fileIn.getWrappedStream(), Trace.class);
+-    this.seed = trace.rand_seed;
+-    this.rand.setSeed(seed);
+-    // Initialize the trace
+-    this.trace.init(rand);
+-
+-    this.numJobs = new AtomicInteger(trace.num_jobs);
+-
+-    for (Double w : trace.workload_weights) {
+-      totalWeight += w;
+-    }
+-
+-    // Initialize our story parameters
+-    listStoryParams = createStory();
+-
+-    LOG.info("Generated " + listStoryParams.size() + " deadlines for "
+-        + this.numJobs.get() + " jobs");
+-  }
+-
+-  // StoryParams hold the minimum amount of information needed to completely
+-  // specify a job run: job definition, start time, and queue.
+-  // This allows us to create "jobs" and then order them according to start time
+-  static class StoryParams {
+-    // Time the job gets submitted to
+-    private long actualSubmissionTime;
+-    // The queue the job gets submitted to
+-    private String queue;
+-    // Definition to construct the job from
+-    private JobDefinition jobDef;
+-
+-    StoryParams(long actualSubmissionTime, String queue, JobDefinition jobDef) {
+-      this.actualSubmissionTime = actualSubmissionTime;
+-      this.queue = queue;
+-      this.jobDef = jobDef;
+-    }
+-  }
+-
+-
+-  private Queue<StoryParams> createStory() {
+-    // create priority queue to keep start-time sorted
+-    Queue<StoryParams> storyQueue =
+-        new PriorityQueue<>(this.numJobs.get(), new Comparator<StoryParams>() {
+-          @Override
+-          public int compare(StoryParams o1, StoryParams o2) {
+-            return Math
+-                .toIntExact(o1.actualSubmissionTime - o2.actualSubmissionTime);
+-          }
+-        });
+-    for (int i = 0; i < numJobs.get(); i++) {
+-      // Generate a workload
+-      Workload wl = trace.generateWorkload();
+-      // Save all the parameters needed to completely define a job
+-      long actualSubmissionTime = wl.generateSubmissionTime();
+-      String queue = wl.queue_name;
+-      JobDefinition job = wl.generateJobDefinition();
+-      storyQueue.add(new StoryParams(actualSubmissionTime, queue, job));
+-    }
+-    return storyQueue;
+-  }
+-
+-  @Override
+-  public JobStory getNextJob() throws IOException {
+-    if (numJobs.decrementAndGet() < 0) {
+-      return null;
+-    }
+-    StoryParams storyParams = listStoryParams.poll();
+-    return new SynthJob(rand, conf, storyParams.jobDef, storyParams.queue,
+-        storyParams.actualSubmissionTime);
+-  }
+-
+-  @Override
+-  public void close(){
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return "SynthTraceJobProducer [ conf=" + conf + ", numJobs=" + numJobs
+-        + ", r=" + rand + ", totalWeight="
+-        + totalWeight + ", workloads=" + trace.workloads + "]";
+-  }
+-
+-  public int getNumJobs() {
+-    return trace.num_jobs;
+-  }
+-
+-  // Helper to parse and maintain backwards compatibility with
+-  // syn json formats
+-  private static void validateJobDef(JobDefinition jobDef){
+-    if(jobDef.tasks == null) {
+-      LOG.info("Detected old JobDefinition format. Converting.");
+-      try {
+-        jobDef.tasks = new ArrayList<>();
+-        jobDef.type = "mapreduce";
+-        jobDef.deadline_factor = new Sample(jobDef.deadline_factor_avg,
+-            jobDef.deadline_factor_stddev);
+-        jobDef.duration = new Sample(jobDef.dur_avg,
+-            jobDef.dur_stddev);
+-        jobDef.reservation = new Sample(jobDef.chance_of_reservation);
+-
+-        TaskDefinition map = new TaskDefinition();
+-        map.type = MRAMSimulator.MAP_TYPE;
+-        map.count = new Sample(jobDef.mtasks_avg, jobDef.mtasks_stddev);
+-        map.time = new Sample(jobDef.mtime_avg, jobDef.mtime_stddev);
+-        map.max_memory = new Sample((double) jobDef.map_max_memory_avg,
+-            jobDef.map_max_memory_stddev);
+-        map.max_vcores = new Sample((double) jobDef.map_max_vcores_avg,
+-            jobDef.map_max_vcores_stddev);
+-        map.priority = DEFAULT_MAPPER_PRIORITY;
+-        map.executionType = jobDef.map_execution_type;
+-
+-        jobDef.tasks.add(map);
+-        TaskDefinition reduce = new TaskDefinition();
+-        reduce.type = MRAMSimulator.REDUCE_TYPE;
+-        reduce.count = new Sample(jobDef.rtasks_avg, jobDef.rtasks_stddev);
+-        reduce.time = new Sample(jobDef.rtime_avg, jobDef.rtime_stddev);
+-        reduce.max_memory = new Sample((double) jobDef.reduce_max_memory_avg,
+-            jobDef.reduce_max_memory_stddev);
+-        reduce.max_vcores = new Sample((double) jobDef.reduce_max_vcores_avg,
+-            jobDef.reduce_max_vcores_stddev);
+-        reduce.priority = DEFAULT_REDUCER_PRIORITY;
+-        reduce.executionType = jobDef.reduce_execution_type;
+-
+-        jobDef.tasks.add(reduce);
+-      } catch (JsonMappingException e) {
+-        LOG.warn("Error converting old JobDefinition format", e);
+-      }
+-    }
+-  }
+-
+-  public long getSeed() {
+-    return seed;
+-  }
+-
+-  public int getNodesPerRack() {
+-    return trace.nodes_per_rack < 1 ? 1: trace.nodes_per_rack;
+-  }
+-
+-  public int getNumNodes() {
+-    return trace.num_nodes;
+-  }
+-
+-  /**
+-   * Class used to parse a trace configuration file.
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  @XmlRootElement
+-  public static class Trace {
+-    @JsonProperty("description")
+-    String description;
+-    @JsonProperty("num_nodes")
+-    int num_nodes;
+-    @JsonProperty("nodes_per_rack")
+-    int nodes_per_rack;
+-    @JsonProperty("num_jobs")
+-    int num_jobs;
+-
+-    // in sec (selects a portion of time_distribution
+-    @JsonProperty("rand_seed")
+-    long rand_seed;
+-    @JsonProperty("workloads")
+-    List<Workload> workloads;
+-
+-    List<Double> workload_weights;
+-    JDKRandomGenerator rand;
+-
+-    public void init(JDKRandomGenerator random){
+-      this.rand = random;
+-      // Pass rand forward
+-      for(Workload w : workloads){
+-        w.init(rand);
+-      }
+-      // Initialize workload weights
+-      workload_weights = new ArrayList<>();
+-      for(Workload w : workloads){
+-        workload_weights.add(w.workload_weight);
+-      }
+-    }
+-
+-    Workload generateWorkload(){
+-      return workloads.get(SynthUtils.getWeighted(workload_weights, rand));
+-    }
+-  }
+-
+-  /**
+-   * Class used to parse a workload from file.
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  public static class Workload {
+-    @JsonProperty("workload_name")
+-    String workload_name;
+-    // used to change probability this workload is picked for each job
+-    @JsonProperty("workload_weight")
+-    double workload_weight;
+-    @JsonProperty("queue_name")
+-    String queue_name;
+-    @JsonProperty("job_classes")
+-    List<JobDefinition> job_classes;
+-    @JsonProperty("time_distribution")
+-    List<TimeSample> time_distribution;
+-
+-    JDKRandomGenerator rand;
+-
+-    List<Double> job_weights;
+-    List<Double> time_weights;
+-
+-    public void init(JDKRandomGenerator random){
+-      this.rand = random;
+-      // Validate and pass rand forward
+-      for(JobDefinition def : job_classes){
+-        validateJobDef(def);
+-        def.init(rand);
+-      }
+-
+-      // Initialize job weights
+-      job_weights = new ArrayList<>();
+-      for(JobDefinition j : job_classes){
+-        job_weights.add(j.class_weight);
+-      }
+-
+-      // Initialize time weights
+-      time_weights = new ArrayList<>();
+-      for(TimeSample ts : time_distribution){
+-        time_weights.add(ts.weight);
+-      }
+-    }
+-
+-    public long generateSubmissionTime(){
+-      int index = SynthUtils.getWeighted(time_weights, rand);
+-      // Retrieve the lower and upper bounds for this time "bucket"
+-      int start = time_distribution.get(index).time;
+-      // Get the beginning of the next time sample (if it exists)
+-      index = (index+1)<time_distribution.size() ? index+1 : index;
+-      int end = time_distribution.get(index).time;
+-      int range = end-start;
+-      // Within this time "bucket", uniformly pick a time if our
+-      // range is non-zero, otherwise just use the start time of the bucket
+-      return start + (range>0 ? rand.nextInt(range) : 0);
+-    }
+-
+-    public JobDefinition generateJobDefinition(){
+-      return job_classes.get(SynthUtils.getWeighted(job_weights, rand));
+-    }
+-
+-    @Override
+-    public String toString(){
+-      return "\nWorkload " + workload_name + ", weight: " + workload_weight
+-          + ", queue: " + queue_name + " "
+-          + job_classes.toString().replace("\n", "\n\t");
+-    }
+-  }
+-
+-  /**
+-   * Class used to parse a job class from file.
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  public static class JobDefinition {
+-
+-    @JsonProperty("class_name")
+-    String class_name;
+-    @JsonProperty("user_name")
+-    String user_name;
+-
+-    // used to change probability this class is chosen
+-    @JsonProperty("class_weight")
+-    double class_weight;
+-
+-    // am type to launch
+-    @JsonProperty("type")
+-    String type;
+-    @JsonProperty("deadline_factor")
+-    Sample deadline_factor;
+-    @JsonProperty("duration")
+-    Sample duration;
+-    @JsonProperty("reservation")
+-    Sample reservation;
+-
+-    @JsonProperty("tasks")
+-    List<TaskDefinition> tasks;
+-
+-    @JsonProperty("params")
+-    Map<String, String> params;
+-
+-    // Old JSON fields for backwards compatibility
+-    // reservation related params
+-    @JsonProperty("chance_of_reservation")
+-    double chance_of_reservation;
+-    @JsonProperty("deadline_factor_avg")
+-    double deadline_factor_avg;
+-    @JsonProperty("deadline_factor_stddev")
+-    double deadline_factor_stddev;
+-
+-    // durations in sec
+-    @JsonProperty("dur_avg")
+-    double dur_avg;
+-    @JsonProperty("dur_stddev")
+-    double dur_stddev;
+-    @JsonProperty("mtime_avg")
+-    double mtime_avg;
+-    @JsonProperty("mtime_stddev")
+-    double mtime_stddev;
+-    @JsonProperty("rtime_avg")
+-    double rtime_avg;
+-    @JsonProperty("rtime_stddev")
+-    double rtime_stddev;
+-
+-    // number of tasks
+-    @JsonProperty("mtasks_avg")
+-    double mtasks_avg;
+-    @JsonProperty("mtasks_stddev")
+-    double mtasks_stddev;
+-    @JsonProperty("rtasks_avg")
+-    double rtasks_avg;
+-    @JsonProperty("rtasks_stddev")
+-    double rtasks_stddev;
+-
+-    // memory in MB
+-    @JsonProperty("map_max_memory_avg")
+-    long map_max_memory_avg;
+-    @JsonProperty("map_max_memory_stddev")
+-    double map_max_memory_stddev;
+-    @JsonProperty("reduce_max_memory_avg")
+-    long reduce_max_memory_avg;
+-    @JsonProperty("reduce_max_memory_stddev")
+-    double reduce_max_memory_stddev;
+-
+-    // vcores
+-    @JsonProperty("map_max_vcores_avg")
+-    long map_max_vcores_avg;
+-    @JsonProperty("map_max_vcores_stddev")
+-    double map_max_vcores_stddev;
+-    @JsonProperty("reduce_max_vcores_avg")
+-    long reduce_max_vcores_avg;
+-    @JsonProperty("reduce_max_vcores_stddev")
+-    double reduce_max_vcores_stddev;
+-
+-    //container execution type
+-    @JsonProperty("map_execution_type")
+-    String map_execution_type = ExecutionType.GUARANTEED.name();
+-    @JsonProperty("reduce_execution_type")
+-    String reduce_execution_type = ExecutionType.GUARANTEED.name();
+-
+-    public void init(JDKRandomGenerator rand){
+-      deadline_factor.init(rand);
+-      duration.init(rand);
+-      reservation.init(rand);
+-
+-      for(TaskDefinition t : tasks){
+-        t.count.init(rand);
+-        t.time.init(rand);
+-        t.max_memory.init(rand);
+-        t.max_vcores.init(rand);
+-      }
+-    }
+-
+-    @Override
+-    public String toString(){
+-      return "\nJobDefinition " + class_name + ", weight: " + class_weight
+-          + ", type: " + type + " "
+-          + tasks.toString().replace("\n", "\n\t");
+-    }
+-  }
+-
+-  /**
+-   * A task representing a type of container - e.g. "map" in mapreduce
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  public static class TaskDefinition {
+-
+-    @JsonProperty("type")
+-    String type;
+-    @JsonProperty("count")
+-    Sample count;
+-    @JsonProperty("time")
+-    Sample time;
+-    @JsonProperty("max_memory")
+-    Sample max_memory;
+-    @JsonProperty("max_vcores")
+-    Sample max_vcores;
+-    @JsonProperty("priority")
+-    int priority;
+-    @JsonProperty("execution_type")
+-    String executionType = ExecutionType.GUARANTEED.name();
+-
+-    @Override
+-    public String toString(){
+-      return "\nTaskDefinition " + type
+-          + " Count[" + count + "] Time[" + time + "] Memory[" + max_memory
+-          + "] Vcores[" + max_vcores + "] Priority[" + priority
+-          + "] ExecutionType[" + executionType + "]";
+-    }
+-  }
+-
+-  /**
+-   * Class used to parse value sample information.
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  public static class Sample {
+-    private static final Dist DEFAULT_DIST = Dist.LOGNORM;
+-
+-    private final double val;
+-    private final double std;
+-    private final Dist dist;
+-    private AbstractRealDistribution dist_instance;
+-    private final List<String> discrete;
+-    private final List<Double> weights;
+-    private final Mode mode;
+-
+-    private JDKRandomGenerator rand;
+-
+-    private enum Mode{
+-      CONST,
+-      DIST,
+-      DISC
+-    }
+-
+-    private enum Dist{
+-      LOGNORM,
+-      NORM
+-    }
+-
+-    public Sample(Double val) throws JsonMappingException{
+-      this(val, null);
+-    }
+-
+-    public Sample(Double val, Double std) throws JsonMappingException{
+-      this(val, std, null, null, null);
+-    }
+-
+-    @JsonCreator
+-    public Sample(@JsonProperty("val") Double val,
+-        @JsonProperty("std") Double std, @JsonProperty("dist") String dist,
+-        @JsonProperty("discrete") List<String> discrete,
+-        @JsonProperty("weights") List<Double> weights)
+-        throws JsonMappingException{
+-      // Different Modes
+-      // - Constant: val must be specified, all else null. Sampling will
+-      // return val.
+-      // - Distribution: val, std specified, dist optional (defaults to
+-      // LogNormal). Sampling will sample from the appropriate distribution
+-      // - Discrete: discrete must be set to a list of strings or numbers,
+-      // weights optional (defaults to uniform)
+-
+-      if(val!=null){
+-        if(std==null){
+-          // Constant
+-          if (dist != null || discrete != null || weights != null) {
+-            throw JsonMappingException
+-                .from((JsonParser) null, "Instantiation of " + Sample.class + " failed");
+-          }
+-          mode = Mode.CONST;
+-          this.val = val;
+-          this.std = 0;
+-          this.dist = null;
+-          this.discrete = null;
+-          this.weights = null;
+-        } else {
+-          // Distribution
+-          if (discrete != null || weights != null) {
+-            throw JsonMappingException
+-                .from((JsonParser) null, "Instantiation of " + Sample.class + " failed");
+-          }
+-          mode = Mode.DIST;
+-          this.val = val;
+-          this.std = std;
+-          this.dist = dist!=null ? Dist.valueOf(dist) : DEFAULT_DIST;
+-          this.discrete = null;
+-          this.weights = null;
+-        }
+-      } else {
+-        // Discrete
+-        if (discrete == null) {
+-          throw JsonMappingException
+-              .from((JsonParser) null, "Instantiation of " + Sample.class + " failed");
+-        }
+-        mode = Mode.DISC;
+-        this.val = 0;
+-        this.std = 0;
+-        this.dist = null;
+-        this.discrete = discrete;
+-        if(weights == null){
+-          weights = new ArrayList<>(Collections.nCopies(
+-              discrete.size(), 1.0));
+-        }
+-        if (weights.size() != discrete.size()) {
+-          throw JsonMappingException
+-              .from((JsonParser) null, "Instantiation of " + Sample.class + " failed");
+-        }
+-        this.weights = weights;
+-      }
+-    }
+-
+-    public void init(JDKRandomGenerator random){
+-      if(this.rand != null){
+-        throw new YarnRuntimeException("init called twice");
+-      }
+-      this.rand = random;
+-      if(mode == Mode.DIST){
+-        switch(this.dist){
+-        case LOGNORM:
+-          this.dist_instance = SynthUtils.getLogNormalDist(rand, val, std);
+-          return;
+-        case NORM:
+-          this.dist_instance = SynthUtils.getNormalDist(rand, val, std);
+-          return;
+-        default:
+-          throw new YarnRuntimeException("Unknown distribution " + dist.name());
+-        }
+-      }
+-    }
+-
+-    public int getInt(){
+-      return Math.toIntExact(getLong());
+-    }
+-
+-    public long getLong(){
+-      return Math.round(getDouble());
+-    }
+-
+-    public double getDouble(){
+-      return Double.parseDouble(getString());
+-    }
+-
+-    public String getString(){
+-      if(this.rand == null){
+-        throw new YarnRuntimeException("getValue called without init");
+-      }
+-      switch(mode){
+-      case CONST:
+-        return Double.toString(val);
+-      case DIST:
+-        return Double.toString(dist_instance.sample());
+-      case DISC:
+-        return this.discrete.get(SynthUtils.getWeighted(this.weights, rand));
+-      default:
+-        throw new YarnRuntimeException("Unknown sampling mode " + mode.name());
+-      }
+-    }
+-
+-    @Override
+-    public String toString(){
+-      switch(mode){
+-      case CONST:
+-        return "value: " + val;
+-      case DIST:
+-        return "value: " + this.val + " std: " + this.std + " dist: "
+-            + this.dist.name();
+-      case DISC:
+-        return "discrete: " + this.discrete + ", weights: " + this.weights;
+-      default:
+-        throw new YarnRuntimeException("Unknown sampling mode " + mode.name());
+-      }
+-    }
+-
+-  }
+-
+-  /**
+-   * This is used to define time-varying probability of a job start-time (e.g.,
+-   * to simulate daily patterns).
+-   */
+-  @SuppressWarnings({ "membername", "checkstyle:visibilitymodifier" })
+-  public static class TimeSample {
+-    // in sec
+-    @JsonProperty("time")
+-    int time;
+-    @JsonProperty("weight")
+-    double weight;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthUtils.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthUtils.java
+deleted file mode 100644
+index a7f8c7f1933..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/SynthUtils.java
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.synthetic;
+-
+-import org.apache.commons.math3.distribution.LogNormalDistribution;
+-import org.apache.commons.math3.distribution.NormalDistribution;
+-import org.apache.commons.math3.random.JDKRandomGenerator;
+-
+-import java.util.Collection;
+-import java.util.Random;
+-
+-/**
+- * Utils for the Synthetic generator.
+- */
+-public final class SynthUtils {
+-
+-  private SynthUtils(){
+-    //class is not meant to be instantiated
+-  }
+-
+-  public static int getWeighted(Collection<Double> weights, Random rr) {
+-
+-    double totalWeight = 0;
+-    for (Double i : weights) {
+-      totalWeight += i;
+-    }
+-
+-    double rand = rr.nextDouble() * totalWeight;
+-
+-    double cur = 0;
+-    int ind = 0;
+-    for (Double i : weights) {
+-      cur += i;
+-      if (cur > rand) {
+-        break;
+-      }
+-      ind++;
+-    }
+-
+-    return ind;
+-  }
+-
+-  public static NormalDistribution getNormalDist(JDKRandomGenerator rand,
+-      double average, double stdDev) {
+-
+-    if (average <= 0) {
+-      return null;
+-    }
+-
+-    // set default for missing param
+-    if (stdDev == 0) {
+-      stdDev = average / 6;
+-    }
+-
+-    NormalDistribution ret = new NormalDistribution(average, stdDev,
+-        NormalDistribution.DEFAULT_INVERSE_ABSOLUTE_ACCURACY);
+-    ret.reseedRandomGenerator(rand.nextLong());
+-    return ret;
+-  }
+-
+-  public static LogNormalDistribution getLogNormalDist(JDKRandomGenerator rand,
+-      double mean, double stdDev) {
+-
+-    if (mean <= 0) {
+-      return null;
+-    }
+-
+-    // set default for missing param
+-    if (stdDev == 0) {
+-      stdDev = mean / 6;
+-    }
+-
+-    // derive lognormal parameters for X = LogNormal(mu, sigma)
+-    // sigma^2 = ln (1+Var[X]/(E[X])^2)
+-    // mu = ln(E[X]) - 1/2 * sigma^2
+-    double var = stdDev * stdDev;
+-    double sigmasq = Math.log1p(var / (mean * mean));
+-    double sigma = Math.sqrt(sigmasq);
+-    double mu = Math.log(mean) - 0.5 * sigmasq;
+-
+-    LogNormalDistribution ret = new LogNormalDistribution(mu, sigma,
+-        LogNormalDistribution.DEFAULT_INVERSE_ABSOLUTE_ACCURACY);
+-    ret.reseedRandomGenerator(rand.nextLong());
+-    return ret;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/package-info.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/package-info.java
+deleted file mode 100644
+index e06961069df..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/synthetic/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Classes comprising the synthetic load generator for SLS.
+- */
+-package org.apache.hadoop.yarn.sls.synthetic;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/NodeUsageRanges.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/NodeUsageRanges.java
+deleted file mode 100644
+index e7add944f46..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/NodeUsageRanges.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.utils;
+-
+-import java.util.LinkedHashSet;
+-import java.util.Set;
+-
+-public final class NodeUsageRanges {
+-  private NodeUsageRanges() {}
+-
+-  /**
+-   * Class to store the keyword, lower-limit and upper-limit of a resource
+-   * within the specified lower-limit (inclusive) and upper-limit (inclusive).
+-   */
+-  public static class Range {
+-    private String keyword;
+-    private float lowerLimit, upperLimit;
+-    public Range(String keyword, float lowerLimit, float upperLimit) {
+-      this.keyword = keyword;
+-      this.lowerLimit = lowerLimit;
+-      this.upperLimit = upperLimit;
+-    }
+-
+-    public String getKeyword() {
+-      return keyword;
+-    }
+-
+-    public float getLowerLimit() {
+-      return lowerLimit;
+-    }
+-
+-    public float getUpperLimit() {
+-      return upperLimit;
+-    }
+-  }
+-
+-  private static final Set<Range> RANGES;
+-  static {
+-    RANGES = new LinkedHashSet<>();
+-    RANGES.add(new Range("unused", 0, 0));
+-    RANGES.add(new Range("1to19pctUsed", 1, 19));
+-    RANGES.add(new Range("20to39pctUsed", 20, 39));
+-    RANGES.add(new Range("40to59pctUsed", 40, 59));
+-    RANGES.add(new Range("60to79pctUsed", 60, 79));
+-    RANGES.add(new Range("80to99pctUsed", 80, 99));
+-    RANGES.add(new Range("full", 100, 100));
+-  }
+-
+-  public static Set<Range> getRanges() {
+-    return RANGES;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
+deleted file mode 100644
+index af0b4f6caf3..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/SLSUtils.java
++++ /dev/null
+@@ -1,253 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.utils;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.io.Reader;
+-
+-import java.nio.charset.StandardCharsets;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.nio.file.StandardOpenOption;
+-import java.util.ArrayList;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.net.NodeBase;
+-import org.apache.hadoop.tools.rumen.JobTraceReader;
+-import org.apache.hadoop.tools.rumen.LoggedJob;
+-import org.apache.hadoop.tools.rumen.LoggedTask;
+-import org.apache.hadoop.tools.rumen.LoggedTaskAttempt;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
+-import org.apache.hadoop.yarn.sls.SLSRunner.NodeDetails;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-
+-@Private
+-@Unstable
+-public class SLSUtils {
+-  private static final String LABEL_FORMAT_ERR_MSG =
+-      "Input format for adding node-labels is not correct, it should be "
+-          + "labelName1[(exclusive=true/false)],labelName2[] ..";
+-
+-  // hostname includes the network path and the host name. for example
+-  // "/default-rack/hostFoo" or "/coreSwitchA/TORSwitchB/hostBar".
+-  // the function returns two Strings, the first element is the network
+-  // location without "/", the second element is the host name. for example,
+-  // {"default-rack", "hostFoo"} or "coreSwitchA/TORSwitchB", "hostBar"
+-  public static String[] getRackHostName(String hostname) {
+-    NodeBase node = new NodeBase(hostname);
+-    return new String[] {node.getNetworkLocation().substring(1),
+-        node.getName()};
+-  }
+-
+-  /**
+-   * parse the rumen trace file, return each host name
+-   */
+-  public static Set<NodeDetails> parseNodesFromRumenTrace(
+-      String jobTrace) throws IOException {
+-    Set<NodeDetails> nodeSet = new HashSet<>();
+-
+-    File fin = new File(jobTrace);
+-    Configuration conf = new Configuration();
+-    conf.set("fs.defaultFS", "file:///");
+-    JobTraceReader reader = new JobTraceReader(
+-            new Path(fin.getAbsolutePath()), conf);
+-    try {
+-      LoggedJob job;
+-      while ((job = reader.getNext()) != null) {
+-        for(LoggedTask mapTask : job.getMapTasks()) {
+-          // select the last attempt
+-          if (mapTask.getAttempts().size() == 0) {
+-            continue;
+-          }
+-          LoggedTaskAttempt taskAttempt = mapTask.getAttempts()
+-                  .get(mapTask.getAttempts().size() - 1);
+-          nodeSet.add(new NodeDetails(
+-              taskAttempt.getHostName().getValue()));
+-        }
+-        for(LoggedTask reduceTask : job.getReduceTasks()) {
+-          if (reduceTask.getAttempts().size() == 0) {
+-            continue;
+-          }
+-          LoggedTaskAttempt taskAttempt = reduceTask.getAttempts()
+-                  .get(reduceTask.getAttempts().size() - 1);
+-          nodeSet.add(new NodeDetails(
+-              taskAttempt.getHostName().getValue()));
+-        }
+-      }
+-    } finally {
+-      reader.close();
+-    }
+-
+-    return nodeSet;
+-  }
+-
+-  /**
+-   * parse the sls trace file, return each host name
+-   */
+-  public static Set<NodeDetails> parseNodesFromSLSTrace(
+-      String jobTrace) throws IOException {
+-    Set<NodeDetails> nodeSet = new HashSet<>();
+-    JsonFactory jsonF = new JsonFactory();
+-    ObjectMapper mapper = new ObjectMapper();
+-    Reader input =
+-        new InputStreamReader(new FileInputStream(jobTrace), StandardCharsets.UTF_8);
+-    try {
+-      Iterator<Map> i = mapper.readValues(jsonF.createParser(input), Map.class);
+-      while (i.hasNext()) {
+-        addNodes(nodeSet, i.next());
+-      }
+-    } finally {
+-      input.close();
+-    }
+-    return nodeSet;
+-  }
+-
+-  private static void addNodes(Set<NodeDetails> nodeSet,
+-      Map jsonEntry) {
+-    if (jsonEntry.containsKey(SLSConfiguration.NUM_NODES)) {
+-      int numNodes = Integer.parseInt(
+-          jsonEntry.get(SLSConfiguration.NUM_NODES).toString());
+-      int numRacks = 1;
+-      if (jsonEntry.containsKey(SLSConfiguration.NUM_RACKS)) {
+-        numRacks = Integer.parseInt(
+-            jsonEntry.get(SLSConfiguration.NUM_RACKS).toString());
+-      }
+-      nodeSet.addAll(generateNodes(numNodes, numRacks));
+-    }
+-
+-    if (jsonEntry.containsKey(SLSConfiguration.JOB_TASKS)) {
+-      List tasks = (List) jsonEntry.get(SLSConfiguration.JOB_TASKS);
+-      for (Object o : tasks) {
+-        Map jsonTask = (Map) o;
+-        String hostname = (String) jsonTask.get(SLSConfiguration.TASK_HOST);
+-        if (hostname != null) {
+-          nodeSet.add(new NodeDetails(hostname));
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * parse the input node file, return each host name
+-   * sample input: label1(exclusive=true),label2(exclusive=false),label3
+-   */
+-  public static Set<NodeDetails> parseNodesFromNodeFile(
+-      String nodeFile, Resource nmDefaultResource) throws IOException {
+-    Set<NodeDetails> nodeSet = new HashSet<>();
+-    JsonFactory jsonF = new JsonFactory();
+-    ObjectMapper mapper = new ObjectMapper();
+-    Reader input =
+-        new InputStreamReader(new FileInputStream(nodeFile), StandardCharsets.UTF_8);
+-    try {
+-      Iterator<Map> i = mapper.readValues(jsonF.createParser(input), Map.class);
+-      while (i.hasNext()) {
+-        Map jsonE = i.next();
+-        String rack = "/" + jsonE.get("rack");
+-        List tasks = (List) jsonE.get("nodes");
+-        for (Object o : tasks) {
+-          Map jsonNode = (Map) o;
+-          NodeDetails nodeDetails = new NodeDetails(
+-              rack + "/" + jsonNode.get("node"));
+-          Resource nodeResource = Resources.clone(nmDefaultResource);
+-          ResourceInformation[] infors = ResourceUtils.getResourceTypesArray();
+-          for (ResourceInformation info : infors) {
+-            if (jsonNode.get(info.getName()) != null) {
+-              nodeResource.setResourceValue(info.getName(),
+-                  Integer.parseInt(jsonNode.get(info.getName()).toString()));
+-            }
+-          }
+-          nodeDetails.setNodeResource(nodeResource);
+-          if (jsonNode.get("labels") != null) {
+-            Set<NodeLabel> nodeLabels =  new HashSet<>(
+-                YarnClientUtils.buildNodeLabelsFromStr(
+-                    jsonNode.get("labels").toString()));
+-            nodeDetails.setLabels(nodeLabels);
+-          }
+-          nodeSet.add(nodeDetails);
+-        }
+-      }
+-    } finally {
+-      input.close();
+-    }
+-    return nodeSet;
+-  }
+-
+-  public static Set<NodeDetails> generateNodes(int numNodes,
+-      int numRacks){
+-    Set<NodeDetails> nodeSet = new HashSet<>();
+-    if (numRacks < 1) {
+-      numRacks = 1;
+-    }
+-
+-    if (numRacks > numNodes) {
+-      numRacks = numNodes;
+-    }
+-
+-    for (int i = 0; i < numNodes; i++) {
+-      nodeSet.add(new NodeDetails(
+-          "/rack" + i % numRacks + "/node" + i));
+-    }
+-    return nodeSet;
+-  }
+-
+-  /**
+-   * Generates a node to rack mapping file based on node details.
+-   * This file is then being used by TableMapping to resolve rack names.
+-   * The format required by TableMapping is a two column text file
+-   * where first column specifies node name
+-   * and second column specifies rack name.
+-   * @param nodeDetails Set of node details.
+-   * @param filePath File path where to write table mapping.
+-   * @throws IOException
+-   */
+-  public static void generateNodeTableMapping(Set<NodeDetails> nodeDetails,
+-      String filePath) throws IOException {
+-    List<String> entries = new ArrayList<>();
+-    for (NodeDetails nodeDetail : nodeDetails) {
+-      if (nodeDetail.getHostname().contains("/")) {
+-        String hostname = nodeDetail.getHostname();
+-        int lIndex = hostname.lastIndexOf("/");
+-        String node = hostname.substring(lIndex + 1);
+-        String rack = hostname.substring(0, lIndex);
+-        entries.add(node + " " + rack);
+-      }
+-    }
+-    Files.write(Paths.get(filePath),
+-        entries,
+-        StandardCharsets.UTF_8,
+-        StandardOpenOption.CREATE);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/package-info.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/package-info.java
+deleted file mode 100644
+index f6ccf720250..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/utils/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * Utility classes for SLS.
+- */
+-package org.apache.hadoop.yarn.sls.utils;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
+deleted file mode 100644
+index ce36854bca2..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
++++ /dev/null
+@@ -1,651 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.web;
+-
+-import java.io.IOException;
+-import java.io.ObjectInputStream;
+-import java.nio.charset.StandardCharsets;
+-import java.text.MessageFormat;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import javax.servlet.ServletException;
+-import javax.servlet.http.HttpServlet;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-
+-import org.apache.commons.io.IOUtils;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerMetrics;
+-import org.apache.hadoop.yarn.sls.scheduler.SchedulerWrapper;
+-
+-import org.apache.hadoop.yarn.sls.utils.NodeUsageRanges;
+-import org.eclipse.jetty.http.MimeTypes;
+-import org.eclipse.jetty.server.Handler;
+-import org.eclipse.jetty.server.Request;
+-import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.handler.AbstractHandler;
+-import org.eclipse.jetty.server.handler.ResourceHandler;
+-import com.codahale.metrics.Counter;
+-import com.codahale.metrics.Gauge;
+-import com.codahale.metrics.Histogram;
+-import com.codahale.metrics.MetricRegistry;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-@Private
+-@Unstable
+-public class SLSWebApp extends HttpServlet {
+-  private static final Logger LOG = LoggerFactory.getLogger(SLSWebApp.class);
+-
+-  private static final long serialVersionUID = 1905162041950251407L;
+-  private transient Server server;
+-  private transient SchedulerWrapper wrapper;
+-  private transient MetricRegistry metrics;
+-  private transient SchedulerMetrics schedulerMetrics;
+-  // metrics objects
+-  private transient Gauge jvmFreeMemoryGauge;
+-  private transient Gauge jvmMaxMemoryGauge;
+-  private transient Gauge jvmTotalMemoryGauge;
+-  private transient Gauge numRunningAppsGauge;
+-  private transient Gauge numRunningContainersGauge;
+-  private transient Gauge allocatedMemoryGauge;
+-  private transient Gauge allocatedVCoresGauge;
+-  private transient Gauge availableMemoryGauge;
+-  private transient Gauge availableVCoresGauge;
+-  private transient Map<String, Gauge> perNodeUsageGaugeMap;
+-  private transient Histogram allocateTimecostHistogram;
+-  private transient Histogram commitSuccessTimecostHistogram;
+-  private transient Histogram commitFailureTimecostHistogram;
+-  private transient Histogram handleTimecostHistogram;
+-  private transient Map<SchedulerEventType, Histogram>
+-     handleOperTimecostHistogramMap;
+-  private transient Map<String, Counter> queueAllocatedMemoryCounterMap;
+-  private transient Map<String, Counter> queueAllocatedVCoresCounterMap;
+-  private int port;
+-  private int ajaxUpdateTimeMS = 1000;
+-  // html page templates
+-  private String simulateInfoTemplate;
+-  private String simulateTemplate;
+-  private String trackTemplate;
+-
+-  private transient Counter schedulerCommitSuccessCounter;
+-  private transient Counter schedulerCommitFailureCounter;
+-  private Long lastTrackingTime;
+-  private Long lastSchedulerCommitSuccessCount;
+-  private Long lastSchedulerCommitFailureCount;
+-
+-  {
+-    // load templates
+-    ClassLoader cl = Thread.currentThread().getContextClassLoader();
+-    try {
+-      simulateInfoTemplate = IOUtils.toString(
+-          cl.getResourceAsStream("html/simulate.info.html.template"), StandardCharsets.UTF_8);
+-      simulateTemplate = IOUtils.toString(
+-          cl.getResourceAsStream("html/simulate.html.template"), StandardCharsets.UTF_8);
+-      trackTemplate = IOUtils.toString(
+-          cl.getResourceAsStream("html/track.html.template"), StandardCharsets.UTF_8);
+-    } catch (IOException e) {
+-      LOG.error("Caught exception while initializing templates", e);
+-    }
+-  }
+-
+-  private void readObject(ObjectInputStream in) throws IOException,
+-      ClassNotFoundException {
+-    in.defaultReadObject();
+-    handleOperTimecostHistogramMap = new HashMap<>();
+-    queueAllocatedMemoryCounterMap = new HashMap<>();
+-    queueAllocatedVCoresCounterMap = new HashMap<>();
+-  }
+-
+-  public SLSWebApp(SchedulerWrapper wrapper, int metricsAddressPort) {
+-    this.wrapper = wrapper;
+-    handleOperTimecostHistogramMap = new HashMap<>();
+-    queueAllocatedMemoryCounterMap = new HashMap<>();
+-    queueAllocatedVCoresCounterMap = new HashMap<>();
+-    perNodeUsageGaugeMap = new HashMap<>();
+-    schedulerMetrics = wrapper.getSchedulerMetrics();
+-    metrics = schedulerMetrics.getMetrics();
+-    port = metricsAddressPort;
+-  }
+-
+-  public void start() throws Exception {
+-    final ResourceHandler staticHandler = new ResourceHandler();
+-    staticHandler.setMimeTypes(new MimeTypes());
+-    String webRootDir = getClass().getClassLoader().getResource("html").
+-        toExternalForm();
+-    staticHandler.setResourceBase(webRootDir);
+-    staticHandler.start();
+-
+-    Handler handler = new AbstractHandler() {
+-      @Override
+-      public void handle(String target, Request baseRequest,
+-                         HttpServletRequest request,
+-                         HttpServletResponse response)
+-          throws IOException, ServletException {
+-        try{
+-          // timeunit
+-          int timeunit = 1000;   // second, divide millionsecond / 1000
+-          String timeunitLabel = "second";
+-          if (request.getParameter("u")!= null &&
+-                  request.getParameter("u").equalsIgnoreCase("m")) {
+-            timeunit = 1000 * 60;
+-            timeunitLabel = "minute";
+-          }
+-
+-          // http request
+-          if (target.equals("/")) {
+-            printPageIndex(request, response);
+-          } else if (target.equals("/simulate")) {
+-            printPageSimulate(request, response, timeunit, timeunitLabel);
+-          } else if (target.equals("/track")) {
+-            printPageTrack(request, response, timeunit, timeunitLabel);
+-          } else
+-            // js/css request
+-            if (target.startsWith("/js") || target.startsWith("/css")) {
+-              response.setCharacterEncoding("utf-8");
+-              staticHandler.handle(target, baseRequest, request, response);
+-            } else
+-              // json request
+-              if (target.equals("/simulateMetrics")) {
+-                printJsonMetrics(request, response);
+-              } else if (target.equals("/trackMetrics")) {
+-                printJsonTrack(request, response);
+-              }
+-        } catch (Exception e) {
+-          LOG.error("Caught exception while starting SLSWebApp", e);
+-        }
+-      }
+-    };
+-
+-    server = new Server(port);
+-    server.setHandler(handler);
+-
+-    server.start();
+-  }
+-
+-  public void stop() throws Exception {
+-    if (server != null) {
+-      server.stop();
+-    }
+-  }
+-
+-  /**
+-   * index html page, show simulation info
+-   * path ""
+-   * @param request http request
+-   * @param response http response
+-   * @throws java.io.IOException
+-   */
+-  private void printPageIndex(HttpServletRequest request,
+-                              HttpServletResponse response) throws IOException {
+-    response.setContentType("text/html");
+-    response.setStatus(HttpServletResponse.SC_OK);
+-
+-    String simulateInfo;
+-    if (SLSRunner.getSimulateInfoMap().isEmpty()) {
+-      String empty = "<tr><td colspan='2' align='center'>" +
+-              "No information available</td></tr>";
+-      simulateInfo = MessageFormat.format(simulateInfoTemplate, empty);
+-    } else {
+-      StringBuilder info = new StringBuilder();
+-      for (Map.Entry<String, Object> entry :
+-              SLSRunner.getSimulateInfoMap().entrySet()) {
+-        info.append("<tr>");
+-        info.append("<td class='td1'>").append(entry.getKey()).append("</td>");
+-        info.append("<td class='td2'>").append(entry.getValue())
+-                .append("</td>");
+-        info.append("</tr>");
+-      }
+-      simulateInfo =
+-              MessageFormat.format(simulateInfoTemplate, info.toString());
+-    }
+-    response.getWriter().println(simulateInfo);
+-
+-    ((Request) request).setHandled(true);
+-  }
+-
+-  /**
+-   * simulate html page, show several real-runtime chart
+-   * path "/simulate"
+-   * use d3.js
+-   * @param request http request
+-   * @param response http response
+-   * @throws java.io.IOException
+-   */
+-  private void printPageSimulate(HttpServletRequest request,
+-                                 HttpServletResponse response, int timeunit,
+-                                 String timeunitLabel)
+-          throws IOException {
+-    response.setContentType("text/html");
+-    response.setStatus(HttpServletResponse.SC_OK);
+-
+-    // queues {0}
+-    Set<String> queues = wrapper.getTracker().getQueueSet();
+-    StringBuilder queueInfo = new StringBuilder();
+-
+-    int i = 0;
+-    for (String queue : queues) {
+-      queueInfo.append("legends[4][").append(i).append("] = 'queue.")
+-              .append(queue).append(".allocated.memory';");
+-      queueInfo.append("legends[5][").append(i).append("] = 'queue.")
+-              .append(queue).append(".allocated.vcores';");
+-      i ++;
+-    }
+-
+-    // time unit label {1}
+-    // time unit {2}
+-    // ajax update time interval {3}
+-    String simulateInfo = MessageFormat.format(simulateTemplate,
+-            queueInfo.toString(), timeunitLabel, "" + timeunit,
+-            "" + ajaxUpdateTimeMS);
+-    response.getWriter().println(simulateInfo);
+-
+-    ((Request) request).setHandled(true);
+-  }
+-
+-  /**
+-   * html page for tracking one queue or job
+-   * use d3.js
+-   * @param request http request
+-   * @param response http response
+-   * @throws java.io.IOException
+-   */
+-  private void printPageTrack(HttpServletRequest request,
+-                               HttpServletResponse response, int timeunit,
+-                               String timeunitLabel)
+-          throws IOException {
+-    response.setContentType("text/html");
+-    response.setStatus(HttpServletResponse.SC_OK);
+-
+-    // tracked queues {0}
+-    StringBuilder trackedQueueInfo = new StringBuilder();
+-    Set<String> trackedQueues = wrapper.getTracker().getQueueSet();
+-    for(String queue : trackedQueues) {
+-      trackedQueueInfo.append("<option value='Queue ").append(queue)
+-              .append("'>").append(queue).append("</option>");
+-    }
+-
+-    // tracked apps {1}
+-    StringBuilder trackedAppInfo = new StringBuilder();
+-    Set<String> trackedApps = wrapper.getTracker().getTrackedAppSet();
+-    for(String job : trackedApps) {
+-      trackedAppInfo.append("<option value='Job ").append(job)
+-              .append("'>").append(job).append("</option>");
+-    }
+-
+-    // timeunit label {2}
+-    // time unit {3}
+-    // ajax update time {4}
+-    // final html
+-    String trackInfo = MessageFormat.format(trackTemplate,
+-            trackedQueueInfo.toString(), trackedAppInfo.toString(),
+-            timeunitLabel, "" + timeunit, "" + ajaxUpdateTimeMS);
+-    response.getWriter().println(trackInfo);
+-
+-    ((Request) request).setHandled(true);
+-  }
+-
+-  /**
+-   * package metrics information in a json and return
+-   * @param request http request
+-   * @param response http response
+-   * @throws java.io.IOException
+-   */
+-  private void printJsonMetrics(HttpServletRequest request,
+-                                HttpServletResponse response)
+-          throws IOException {
+-    response.setContentType("text/json");
+-    response.setStatus(HttpServletResponse.SC_OK);
+-
+-    response.getWriter().println(generateRealTimeTrackingMetrics());
+-    ((Request) request).setHandled(true);
+-  }
+-
+-  public String generateRealTimeTrackingMetrics() {
+-    // JVM
+-    double jvmFreeMemoryGB, jvmMaxMemoryGB, jvmTotalMemoryGB;
+-    if (jvmFreeMemoryGauge == null &&
+-            metrics.getGauges().containsKey("variable.jvm.free.memory")) {
+-      jvmFreeMemoryGauge = metrics.getGauges().get("variable.jvm.free.memory");
+-    }
+-    if (jvmMaxMemoryGauge == null &&
+-            metrics.getGauges().containsKey("variable.jvm.max.memory")) {
+-      jvmMaxMemoryGauge = metrics.getGauges().get("variable.jvm.max.memory");
+-    }
+-    if (jvmTotalMemoryGauge == null &&
+-            metrics.getGauges().containsKey("variable.jvm.total.memory")) {
+-      jvmTotalMemoryGauge = metrics.getGauges()
+-              .get("variable.jvm.total.memory");
+-    }
+-    jvmFreeMemoryGB = jvmFreeMemoryGauge == null ? 0 :
+-            Double.parseDouble(jvmFreeMemoryGauge.getValue().toString())
+-                    /1024/1024/1024;
+-    jvmMaxMemoryGB = jvmMaxMemoryGauge == null ? 0 :
+-            Double.parseDouble(jvmMaxMemoryGauge.getValue().toString())
+-                    /1024/1024/1024;
+-    jvmTotalMemoryGB = jvmTotalMemoryGauge == null ? 0 :
+-            Double.parseDouble(jvmTotalMemoryGauge.getValue().toString())
+-                    /1024/1024/1024;
+-
+-    // number of running applications/containers
+-    String numRunningApps, numRunningContainers;
+-    if (numRunningAppsGauge == null &&
+-            metrics.getGauges().containsKey("variable.running.application")) {
+-      numRunningAppsGauge =
+-              metrics.getGauges().get("variable.running.application");
+-    }
+-    if (numRunningContainersGauge == null &&
+-            metrics.getGauges().containsKey("variable.running.container")) {
+-      numRunningContainersGauge =
+-              metrics.getGauges().get("variable.running.container");
+-    }
+-    numRunningApps = numRunningAppsGauge == null ? "0" :
+-            numRunningAppsGauge.getValue().toString();
+-    numRunningContainers = numRunningContainersGauge == null ? "0" :
+-            numRunningContainersGauge.getValue().toString();
+-
+-    // cluster available/allocate resource
+-    double allocatedMemoryGB, allocatedVCoresGB,
+-            availableMemoryGB, availableVCoresGB;
+-    if (allocatedMemoryGauge == null &&
+-            metrics.getGauges()
+-                    .containsKey("variable.cluster.allocated.memory")) {
+-      allocatedMemoryGauge = metrics.getGauges()
+-              .get("variable.cluster.allocated.memory");
+-    }
+-    if (allocatedVCoresGauge == null &&
+-            metrics.getGauges()
+-                    .containsKey("variable.cluster.allocated.vcores")) {
+-      allocatedVCoresGauge = metrics.getGauges()
+-              .get("variable.cluster.allocated.vcores");
+-    }
+-    if (availableMemoryGauge == null &&
+-            metrics.getGauges()
+-                    .containsKey("variable.cluster.available.memory")) {
+-      availableMemoryGauge = metrics.getGauges()
+-              .get("variable.cluster.available.memory");
+-    }
+-    if (availableVCoresGauge == null &&
+-            metrics.getGauges()
+-                    .containsKey("variable.cluster.available.vcores")) {
+-      availableVCoresGauge = metrics.getGauges()
+-              .get("variable.cluster.available.vcores");
+-    }
+-    allocatedMemoryGB = allocatedMemoryGauge == null ? 0 :
+-            Double.parseDouble(allocatedMemoryGauge.getValue().toString())/1024;
+-    allocatedVCoresGB = allocatedVCoresGauge == null ? 0 :
+-            Double.parseDouble(allocatedVCoresGauge.getValue().toString());
+-    availableMemoryGB = availableMemoryGauge == null ? 0 :
+-            Double.parseDouble(availableMemoryGauge.getValue().toString())/1024;
+-    availableVCoresGB = availableVCoresGauge == null ? 0 :
+-            Double.parseDouble(availableVCoresGauge.getValue().toString());
+-
+-    // scheduler operation
+-    double allocateTimecost, commitSuccessTimecost, commitFailureTimecost,
+-        handleTimecost;
+-    if (allocateTimecostHistogram == null &&
+-            metrics.getHistograms().containsKey(
+-                    "sampler.scheduler.operation.allocate.timecost")) {
+-      allocateTimecostHistogram = metrics.getHistograms()
+-              .get("sampler.scheduler.operation.allocate.timecost");
+-    }
+-    if (commitSuccessTimecostHistogram == null &&
+-        metrics.getHistograms().containsKey(
+-            "sampler.scheduler.operation.commit.success.timecost")) {
+-      commitSuccessTimecostHistogram = metrics.getHistograms()
+-          .get("sampler.scheduler.operation.commit.success.timecost");
+-    }
+-    if (commitFailureTimecostHistogram == null &&
+-        metrics.getHistograms().containsKey(
+-            "sampler.scheduler.operation.commit.failure.timecost")) {
+-      commitFailureTimecostHistogram = metrics.getHistograms()
+-          .get("sampler.scheduler.operation.commit.failure.timecost");
+-    }
+-    if (handleTimecostHistogram == null &&
+-            metrics.getHistograms().containsKey(
+-                    "sampler.scheduler.operation.handle.timecost")) {
+-      handleTimecostHistogram = metrics.getHistograms()
+-              .get("sampler.scheduler.operation.handle.timecost");
+-    }
+-    allocateTimecost = allocateTimecostHistogram == null ? 0.0 :
+-            allocateTimecostHistogram.getSnapshot().getMean()/1000000;
+-    commitSuccessTimecost = commitSuccessTimecostHistogram == null ? 0.0 :
+-            commitSuccessTimecostHistogram.getSnapshot().getMean()/1000000;
+-    commitFailureTimecost = commitFailureTimecostHistogram == null ? 0.0 :
+-            commitFailureTimecostHistogram.getSnapshot().getMean()/1000000;
+-    handleTimecost = handleTimecostHistogram == null ? 0.0 :
+-            handleTimecostHistogram.getSnapshot().getMean()/1000000;
+-    // various handle operation
+-    Map<SchedulerEventType, Double> handleOperTimecostMap =
+-            new HashMap<SchedulerEventType, Double>();
+-    for (SchedulerEventType e : SchedulerEventType.values()) {
+-      String key = "sampler.scheduler.operation.handle." + e + ".timecost";
+-      if (! handleOperTimecostHistogramMap.containsKey(e) &&
+-              metrics.getHistograms().containsKey(key)) {
+-        handleOperTimecostHistogramMap.put(e, metrics.getHistograms().get(key));
+-      }
+-      double timecost = handleOperTimecostHistogramMap.containsKey(e) ?
+-          handleOperTimecostHistogramMap.get(e).getSnapshot().getMean()/1000000
+-              : 0;
+-      handleOperTimecostMap.put(e, timecost);
+-    }
+-
+-    // allocated resource for each queue
+-    Map<String, Double> queueAllocatedMemoryMap = new HashMap<String, Double>();
+-    Map<String, Long> queueAllocatedVCoresMap = new HashMap<String, Long>();
+-    for (String queue : wrapper.getTracker().getQueueSet()) {
+-      // memory
+-      String key = "counter.queue." + queue + ".allocated.memory";
+-      if (! queueAllocatedMemoryCounterMap.containsKey(queue) &&
+-              metrics.getCounters().containsKey(key)) {
+-        queueAllocatedMemoryCounterMap.put(queue,
+-                metrics.getCounters().get(key));
+-      }
+-      double queueAllocatedMemoryGB =
+-              queueAllocatedMemoryCounterMap.containsKey(queue) ?
+-                  queueAllocatedMemoryCounterMap.get(queue).getCount()/1024.0
+-                      : 0;
+-      queueAllocatedMemoryMap.put(queue, queueAllocatedMemoryGB);
+-      // vCores
+-      key = "counter.queue." + queue + ".allocated.cores";
+-      if (! queueAllocatedVCoresCounterMap.containsKey(queue) &&
+-              metrics.getCounters().containsKey(key)) {
+-        queueAllocatedVCoresCounterMap.put(
+-                queue, metrics.getCounters().get(key));
+-      }
+-      long queueAllocatedVCores =
+-              queueAllocatedVCoresCounterMap.containsKey(queue) ?
+-                      queueAllocatedVCoresCounterMap.get(queue).getCount(): 0;
+-      queueAllocatedVCoresMap.put(queue, queueAllocatedVCores);
+-    }
+-
+-    // calculate commit throughput, unit is number/second
+-    if (schedulerCommitSuccessCounter == null && metrics.getCounters()
+-        .containsKey("counter.scheduler.operation.commit.success")) {
+-      schedulerCommitSuccessCounter = metrics.getCounters()
+-          .get("counter.scheduler.operation.commit.success");
+-    }
+-    if (schedulerCommitFailureCounter == null && metrics.getCounters()
+-        .containsKey("counter.scheduler.operation.commit.failure")) {
+-      schedulerCommitFailureCounter = metrics.getCounters()
+-          .get("counter.scheduler.operation.commit.failure");
+-    }
+-    long schedulerCommitSuccessThroughput = 0;
+-    long schedulerCommitFailureThroughput = 0;
+-    if (schedulerCommitSuccessCounter != null
+-        && schedulerCommitFailureCounter != null) {
+-      long currentTrackingTime = System.currentTimeMillis();
+-      long currentSchedulerCommitSucessCount =
+-          schedulerCommitSuccessCounter.getCount();
+-      long currentSchedulerCommitFailureCount =
+-          schedulerCommitFailureCounter.getCount();
+-      if (lastTrackingTime != null) {
+-        double intervalSeconds =
+-            (double) (currentTrackingTime - lastTrackingTime) / 1000;
+-        schedulerCommitSuccessThroughput = Math.round(
+-            (currentSchedulerCommitSucessCount
+-                - lastSchedulerCommitSuccessCount) / intervalSeconds);
+-        schedulerCommitFailureThroughput = Math.round(
+-            (currentSchedulerCommitFailureCount
+-                - lastSchedulerCommitFailureCount) / intervalSeconds);
+-      }
+-      lastTrackingTime = currentTrackingTime;
+-      lastSchedulerCommitSuccessCount = currentSchedulerCommitSucessCount;
+-      lastSchedulerCommitFailureCount = currentSchedulerCommitFailureCount;
+-    }
+-
+-    // package results
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("{");
+-    sb.append("\"time\":" ).append(System.currentTimeMillis())
+-            .append(",\"jvm.free.memory\":").append(jvmFreeMemoryGB)
+-            .append(",\"jvm.max.memory\":").append(jvmMaxMemoryGB)
+-            .append(",\"jvm.total.memory\":").append(jvmTotalMemoryGB)
+-            .append(",\"running.applications\":").append(numRunningApps)
+-            .append(",\"running.containers\":").append(numRunningContainers)
+-            .append(",\"cluster.allocated.memory\":").append(allocatedMemoryGB)
+-            .append(",\"cluster.allocated.vcores\":").append(allocatedVCoresGB)
+-            .append(",\"cluster.available.memory\":").append(availableMemoryGB)
+-            .append(",\"cluster.available.vcores\":").append(availableVCoresGB);
+-
+-    for (String queue : wrapper.getTracker().getQueueSet()) {
+-      sb.append(",\"queue.").append(queue).append(".allocated.memory\":")
+-              .append(queueAllocatedMemoryMap.get(queue));
+-      sb.append(",\"queue.").append(queue).append(".allocated.vcores\":")
+-              .append(queueAllocatedVCoresMap.get(queue));
+-    }
+-    // scheduler allocate & handle
+-    sb.append(",\"scheduler.allocate.timecost\":").append(allocateTimecost);
+-    sb.append(",\"scheduler.commit.success.timecost\":")
+-        .append(commitSuccessTimecost);
+-    sb.append(",\"scheduler.commit.failure.timecost\":")
+-        .append(commitFailureTimecost);
+-    sb.append(",\"scheduler.commit.success.throughput\":")
+-        .append(schedulerCommitSuccessThroughput);
+-    sb.append(",\"scheduler.commit.failure.throughput\":")
+-        .append(schedulerCommitFailureThroughput);
+-    sb.append(",\"scheduler.handle.timecost\":").append(handleTimecost);
+-    for (SchedulerEventType e : SchedulerEventType.values()) {
+-      sb.append(",\"scheduler.handle-").append(e).append(".timecost\":")
+-              .append(handleOperTimecostMap.get(e));
+-    }
+-    sb.append(generateNodeUsageMetrics("memory"));
+-    sb.append(generateNodeUsageMetrics("vcores"));
+-    sb.append("}");
+-    return sb.toString();
+-  }
+-
+-  private String generateNodeUsageMetrics(String resourceType) {
+-    StringBuilder sb = new StringBuilder();
+-    Map<String, Integer> perNodeUsageMap = new HashMap<>();
+-    for (NodeUsageRanges.Range range : NodeUsageRanges.getRanges()) {
+-      String metricName = "nodes." + resourceType + "." + range.getKeyword();
+-      if (!perNodeUsageGaugeMap.containsKey(metricName) &&
+-          metrics.getGauges().containsKey(metricName)) {
+-        perNodeUsageGaugeMap.put(metricName,
+-            metrics.getGauges().get(metricName));
+-      }
+-
+-      int perNodeUsageCount =
+-          perNodeUsageGaugeMap.containsKey(metricName) ?
+-              Integer.parseInt(
+-                  perNodeUsageGaugeMap.get(metricName).getValue().toString()) : 0;
+-
+-      perNodeUsageMap.put(metricName, perNodeUsageCount);
+-    }
+-
+-    // per node memory and vcores used
+-    for (NodeUsageRanges.Range range : NodeUsageRanges.getRanges()) {
+-      String metricName = "nodes." + resourceType + "." + range.getKeyword();
+-      sb.append(",\"").append(metricName).append("\":")
+-          .append(perNodeUsageMap.get(metricName));
+-    }
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * package metrics information for one tracked queue/app
+-   * only support FairScheduler currently
+-   * @throws java.io.IOException
+-   */
+-  private void printJsonTrack(HttpServletRequest request,
+-                              HttpServletResponse response) throws IOException {
+-    response.setContentType("text/json");
+-    response.setStatus(HttpServletResponse.SC_OK);
+-
+-    StringBuilder sb = new StringBuilder();
+-    if(schedulerMetrics instanceof FairSchedulerMetrics) {
+-      String para = request.getParameter("t");
+-      if (para.startsWith("Job ")) {
+-        String appId = para.substring("Job ".length());
+-
+-        sb.append("{");
+-        sb.append("\"time\": ").append(System.currentTimeMillis()).append(",");
+-        sb.append("\"appId\": \"").append(appId).append("\"");
+-        for(String metric : this.schedulerMetrics.getAppTrackedMetrics()) {
+-          String key = "variable.app." + appId + "." + metric;
+-          sb.append(",\"").append(metric).append("\": ");
+-          if (metrics.getGauges().containsKey(key)) {
+-            double memoryGB =
+-                    Double.parseDouble(
+-                            metrics.getGauges().get(key).getValue().toString())
+-                            / 1024;
+-            sb.append(memoryGB);
+-          } else {
+-            sb.append(-1);
+-          }
+-        }
+-        sb.append("}");
+-
+-      } else if(para.startsWith("Queue ")) {
+-        String queueName = para.substring("Queue ".length());
+-        sb.append("{");
+-        sb.append("\"time\": ").append(System.currentTimeMillis()).append(",");
+-        sb.append("\"queueName\": \"").append(queueName).append("\"");
+-        for(String metric : this.schedulerMetrics.getQueueTrackedMetrics()) {
+-          String key = "variable.queue." + queueName + "." + metric;
+-          sb.append(",\"").append(metric).append("\": ");
+-          if (metrics.getGauges().containsKey(key)) {
+-            double memoryGB =
+-                    Double.parseDouble(
+-                            metrics.getGauges().get(key).getValue().toString())
+-                            / 1024;
+-            sb.append(memoryGB);
+-          } else {
+-            sb.append(-1);
+-          }
+-        }
+-        sb.append("}");
+-      }
+-    }
+-    String output = sb.toString();
+-    if (output.isEmpty()) {
+-      output = "[]";
+-    }
+-    response.getWriter().println(output);
+-    // package result
+-    ((Request) request).setHandled(true);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml b/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
+deleted file mode 100644
+index d9ae8ec78c5..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/sample-conf/capacity-scheduler.xml
++++ /dev/null
+@@ -1,60 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<!--
+-  This file contains queue allocations for the Capacity Scheduler.
+-  Its format is explained in the Capacity Scheduler documentation at
+-  http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html.
+-  The documentation also includes a sample config file.
+--->
+-
+-<configuration>
+-  <property>
+-    <name>yarn.scheduler.capacity.root.queues</name>
+-    <value>sls_queue_1,sls_queue_2,sls_queue_3</value>
+-    <description>The queues at the this level (root is the root queue).
+-    </description>
+-  </property>
+-  
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.capacity</name>
+-    <value>25</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-  
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_2.capacity</name>
+-    <value>25</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_2.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-  
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_3.capacity</name>
+-    <value>50</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_3.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml b/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
+deleted file mode 100644
+index fa10359c501..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/sample-conf/fair-scheduler.xml
++++ /dev/null
+@@ -1,50 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<!--
+-  This file contains pool and user allocations for the Fair Scheduler.
+-  Its format is explained in the Fair Scheduler documentation at
+-  http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html.
+-  The documentation also includes a sample config file.
+--->
+-
+-<allocations>
+-  <user name="jenkins">
+-    <!-- Limit on running jobs for the user across all pools. If more
+-      jobs than this are submitted, only the first <maxRunningJobs> will
+-      be scheduled at any given time. Defaults to infinity or the
+-      userMaxJobsDefault value set below. -->
+-    <maxRunningJobs>1000</maxRunningJobs>
+-  </user>
+-  <userMaxAppsDefault>1000</userMaxAppsDefault>
+-  <queue name="sls_queue_1">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <schedulingMode>fair</schedulingMode>
+-    <weight>0.25</weight>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-  </queue>
+-  <queue name="sls_queue_2">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <schedulingMode>fair</schedulingMode>
+-    <weight>0.25</weight>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-  </queue>
+-  <queue name="sls_queue_3">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <weight>0.5</weight>
+-    <schedulingMode>fair</schedulingMode>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-  </queue>
+-</allocations>
+diff --git a/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties b/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
+deleted file mode 100644
+index b2a63bc0a96..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#
+-# Licensed under the Apache License, Version 2.0 (the "License");
+-# you may not use this file except in compliance with the License.
+-# You may obtain a copy of the License at
+-#
+-#   http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License. See accompanying LICENSE file.
+-#
+-log4j.appender.test=org.apache.log4j.ConsoleAppender
+-log4j.appender.test.Target=System.out
+-log4j.appender.test.layout=org.apache.log4j.PatternLayout
+-log4j.appender.test.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+-
+-log4j.rootLogger=WARN, test
+diff --git a/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml b/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
+deleted file mode 100644
+index d7acc98ffc3..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/sample-conf/sls-runner.xml
++++ /dev/null
+@@ -1,81 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-
+-  <!-- SLSRunner configuration -->
+-  <property>
+-    <name>yarn.sls.runner.pool.size</name>
+-    <value>100</value>
+-  </property>
+-  
+-  <!-- Nodes configuration -->
+-  <property>
+-    <name>yarn.sls.nm.memory.mb</name>
+-    <value>10240</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.nm.vcores</name>
+-    <value>10</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.nm.heartbeat.interval.ms</name>
+-    <value>1000</value>
+-  </property>
+-  
+-  <!-- Apps configuration -->
+-  <property>
+-    <name>yarn.sls.am.heartbeat.interval.ms</name>
+-    <value>1000</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.am.type.mapreduce</name>
+-    <value>org.apache.hadoop.yarn.sls.appmaster.MRAMSimulator</value>
+-  </property>
+-
+-  <!-- Containers configuration -->
+-  <property>
+-    <name>yarn.sls.container.memory.mb</name>
+-    <value>1024</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.container.vcores</name>
+-    <value>1</value>
+-  </property>
+-
+-  <!--  metrics  -->
+-  <property>
+-    <name>yarn.sls.metrics.switch</name>
+-    <value>ON</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.metrics.web.address.port</name>
+-    <value>10001</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.FifoSchedulerMetrics</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.CapacitySchedulerMetrics</value>
+-  </property>
+-  
+-</configuration>
+diff --git a/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml b/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
+deleted file mode 100644
+index 6ab11573499..00000000000
+--- a/hadoop-tools/hadoop-sls/src/main/sample-conf/yarn-site.xml
++++ /dev/null
+@@ -1,80 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <property>
+-    <name>yarn.resourcemanager.scheduler.class</name>
+-    <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</value>
+-    <!-- <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler</value> -->
+-    <!-- <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> -->
+-  </property>
+-
+-  <property>
+-    <description>The address of the RM web application.</description>
+-    <name>yarn.resourcemanager.webapp.address</name>
+-    <value>localhost:18088</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.resourcemanager.resource-tracker.address</name>
+-    <value>localhost:18031</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the scheduler interface.</description>
+-    <name>yarn.resourcemanager.scheduler.address</name>
+-    <value>localhost:18030</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the applications manager interface in the RM.</description>
+-    <name>yarn.resourcemanager.address</name>
+-    <value>localhost:18032</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the RM admin interface.</description>
+-    <name>yarn.resourcemanager.admin.address</name>
+-    <value>localhost:18033</value>
+-  </property>
+-
+-  <property>
+-    <description>Set to false, to avoid ip check</description>
+-    <name>hadoop.security.token.service.use_ip</name>
+-    <value>false</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.maximum-applications</name>
+-    <value>1000</value>
+-    <description>Maximum number of applications in the system which
+-      can be concurrently active both running and pending</description>
+-  </property>
+-
+-  <property>
+-    <description>Whether to use preemption. Note that preemption is experimental
+-      in the current version. Defaults to false.</description>
+-    <name>yarn.scheduler.fair.preemption</name>
+-    <value>true</value>
+-  </property>
+-
+-  <property>
+-    <description>Whether to allow multiple container assignments in one
+-      heartbeat. Defaults to false.</description>
+-    <name>yarn.scheduler.fair.assignmultiple</name>
+-    <value>true</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-tools/hadoop-sls/src/site/markdown/SchedulerLoadSimulator.md b/hadoop-tools/hadoop-sls/src/site/markdown/SchedulerLoadSimulator.md
+deleted file mode 100644
+index e487267e02e..00000000000
+--- a/hadoop-tools/hadoop-sls/src/site/markdown/SchedulerLoadSimulator.md
++++ /dev/null
+@@ -1,524 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-YARN Scheduler Load Simulator (SLS)
+-===================================
+-
+-* [YARN Scheduler Load Simulator (SLS)](#Yarn_Scheduler_Load_Simulator_SLS)
+-    * [Overview](#Overview)
+-        * [Overview](#Overview)
+-        * [Goals](#Goals)
+-        * [Architecture](#Architecture)
+-        * [Usecases](#Usecases)
+-    * [Usage](#Usage)
+-        * [Step 1: Configure Hadoop and the simulator](#Step_1:_Configure_Hadoop_and_the_simulator)
+-        * [Step 2: Run the simulator](#Step_2:_Run_the_simulator)
+-    * [Metrics](#Metrics)
+-        * [Real-time Tracking](#Real-time_Tracking)
+-        * [Offline Analysis](#Offline_Analysis)
+-    * [Synthetic Load Generator](#Synthetic_Load_Generator)
+-    * [Appendix](#Appendix)
+-        * [Resources](#Resources)
+-        * [SLS JSON input file format](#SLS_JSON_input_file_format)
+-        * [SYNTH JSON input file format](#SYNTH_JSON_input_file_format)
+-        * [Simulator input topology file format](#Simulator_input_topology_file_format)
+-
+-Overview
+---------
+-
+-### Overview
+-
+-The YARN scheduler is a fertile area of interest with different implementations, e.g., Fifo, Capacity and Fair schedulers. Meanwhile, several optimizations are also made to improve scheduler performance for different scenarios and workload. Each scheduler algorithm has its own set of features, and drives scheduling decisions by many factors, such as fairness, capacity guarantee, resource availability, etc. It is very important to evaluate a scheduler algorithm very well before we deploy in a production cluster. Unfortunately, currently it is non-trivial to evaluate a scheduler algorithm. Evaluating in a real cluster is always time and cost consuming, and it is also very hard to find a large-enough cluster. Hence, a simulator which can predict how well a scheduler algorithm for some specific workload would be quite useful.
+-
+-The YARN Scheduler Load Simulator (SLS) is such a tool, which can simulate large-scale YARN clusters and application loads in a single machine.This simulator would be invaluable in furthering YARN by providing a tool for researchers and developers to prototype new scheduler features and predict their behavior and performance with reasonable amount of confidence, thereby aiding rapid innovation.
+-o
+-The simulator will exercise the real YARN `ResourceManager` removing the network factor by simulating `NodeManagers` and `ApplicationMasters` via handling and dispatching `NM`/`AMs` heartbeat events from within the same JVM. To keep tracking of scheduler behavior and performance, a scheduler wrapper will wrap the real scheduler.
+-
+-The size of the cluster and the application load can be loaded from configuration files, which are generated from job history files directly by adopting [Apache Rumen](../hadoop-rumen/Rumen.html).
+-
+-The simulator will produce real time metrics while executing, including:
+-
+-*   Resource usages for whole cluster and each queue, which can be utilized to
+-    configure cluster and queue's capacity.
+-
+-*   The detailed application execution trace (recorded in relation to simulated
+-    time), which can be analyzed to understand/validate the scheduler behavior
+-    (individual jobs turn around time, throughput, fairness, capacity guarantee,
+-    etc.).
+-
+-*   Several key metrics of scheduler algorithm, such as time cost of each
+-    scheduler operation (allocate, handle, etc.), which can be utilized by Hadoop
+-    developers to find the code spots and scalability limits.
+-
+-### Goals
+-
+-*   Exercise the scheduler at scale without a real cluster using real job
+-    traces.
+-
+-*   Being able to simulate real workloads.
+-
+-### Architecture
+-
+-The following figure illustrates the implementation architecture of the simulator.
+-
+-![The architecture of the simulator](images/sls_arch.png)
+-
+-The simulator takes input of workload traces, or synthetic load distributions and generaters the cluster and applications information. For each NM and AM, the simulator builds a simulator to simulate their running. All NM/AM simulators run in a thread pool. The simulator reuses YARN Resource Manager, and builds a wrapper out of the scheduler. The Scheduler Wrapper can track the scheduler behaviors and generates several logs, which are the outputs of the simulator and can be further analyzed.
+-
+-### Usecases
+-
+-*   Engineering
+-    *   Verify correctness of scheduler algorithm under load
+-    *   Cheap/practical way for finding code hotspots/critical-path.
+-    *   Validate the impact of changes and new features.
+-    *   Determine what drives the scheduler scalability limits.
+-
+-*   QA
+-    *   Validate scheduler behavior for "large" clusters and several workload profiles.
+-
+-*   Solutions/Sales.
+-    *   Sizing model for predefined/typical workloads.
+-    *   Cluster sizing tool using real customer data (job traces).
+-    *   Determine minimum SLAs under a particular workload.
+-
+-Usage
+------
+-
+-This section will show how to use the simulator. Here let `$HADOOP_ROOT` represent the Hadoop install directory. If you build Hadoop yourself, `$HADOOP_ROOT` is `hadoop-dist/target/hadoop-$VERSION`. The simulator is located at `$HADOOP_ROOT/share/hadoop/tools/sls`. The fold `sls` containers four directories: `bin`, `html`, `sample-conf`, and `sample-data`
+-
+-*   `bin`: contains running scripts for the simulator.
+-
+-*   `html`: Users can also reproduce those real-time tracking charts in offline mode. Just upload the `realtimetrack.json` to `$HADOOP_ROOT/share/hadoop/tools/sls/html/showSimulationTrace.html`. For browser security problem, need to put files `realtimetrack.json` and `showSimulationTrace.html` in the same directory.
+-
+-*   `sample-conf`: specifies the simulator configurations.
+-
+-*   `sample-data`: provides an example rumen trace, which can be used to
+-    generate inputs of the simulator.
+-
+-The following sections will describe how to use the simulator step by step. Before start, make sure that command `hadoop` is included in your `$PATH` environment parameter.
+-
+-### Step 1: Configure Hadoop and the simulator
+-
+-Before we start, make sure Hadoop and the simulator are configured well. All configuration files for Hadoop and the simulator should be placed in directory `$HADOOP_ROOT/etc/hadoop`, where the `ResourceManager` and YARN scheduler load their configurations. Directory `$HADOOP_ROOT/share/hadoop/tools/sls/sample-conf/` provides several example configurations, that can be used to start a demo.
+-
+-For configuration of Hadoop and YARN scheduler, users can refer to Yarn’s website (<http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/>).
+-
+-For the simulator, it loads configuration information from file `$HADOOP_ROOT/etc/hadoop/sls-runner.xml`.
+-
+-Here we illustrate each configuration parameter in `sls-runner.xml`. Note that `$HADOOP_ROOT/share/hadoop/tools/sls/sample-conf/sls-runner.xml` contains all the default values for these configuration parameters.
+-
+-*   `yarn.sls.runner.pool.size`
+-
+-    The simulator uses a thread pool to simulate the `NM` and `AM` running,
+-    and this parameter specifies the number of threads in the pool.
+-
+-*   `yarn.sls.nm.memory.mb`
+-
+-    The total memory for each `NMSimulator`.
+-
+-*   `yarn.sls.nm.vcores`
+-
+-    The total vCores for each `NMSimulator`.
+-
+-*   `yarn.sls.nm.heartbeat.interval.ms`
+-
+-    The heartbeat interval for each `NMSimulator`.
+-
+-*   `yarn.sls.am.heartbeat.interval.ms`
+-
+-    The heartbeat interval for each `AMSimulator`.
+-
+-*   `yarn.sls.am.type.mapreduce`
+-
+-    The `AMSimulator` implementation for MapReduce-like applications.
+-    Users can specify implementations for other type of applications.
+-
+-*   `yarn.sls.container.memory.mb`
+-
+-    The memory required for each container simulator.
+-
+-*   `yarn.sls.container.vcores`
+-
+-    The vCores required for each container simulator.
+-
+-*   `yarn.sls.runner.metrics.switch`
+-
+-    The simulator introduces [Metrics](http://metrics.codahale.com/) to measure
+-    the behaviors of critical components and operations. This field specifies
+-    whether we open (`ON`) or close (`OFF`) the Metrics running.
+-
+-*   `yarn.sls.metrics.web.address.port`
+-
+-    The port used by simulator to provide real-time tracking. The default value is
+-    10001.
+-
+-*   `org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler`
+-
+-    The implementation of scheduler metrics of Fifo Scheduler.
+-
+-*   `org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler`
+-
+-    The implementation of scheduler metrics of Fair Scheduler.
+-
+-*   `org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler`
+-
+-    The implementation of scheduler metrics of Capacity Scheduler.
+-
+-### Step 2: Run the simulator
+-
+-The simulator supports two types of input files: the rumen traces and its own input traces. The script to start the simulator is `slsrun.sh`.
+-
+-    $ cd $HADOOP_ROOT/share/hadoop/tools/sls
+-    $ bin/slsrun.sh
+-      Usage: slsrun.sh <OPTIONS>
+-                 --tracetype=<SYNTH | SLS | RUMEN>
+-                 --tracelocation=<FILE1,FILE2,...>
+-                 (deprecated --input-rumen=<FILE1,FILE2,...>  | --input-sls=<FILE1,FILE2,...>)
+-                 --output-dir=<SLS_SIMULATION_OUTPUT_DIRECTORY>
+-                 [--nodes=<SLS_NODES_FILE>]
+-                 [--track-jobs=<JOBID1,JOBID2,...>]
+-                 [--print-simulation]
+-
+-
+-*   `--input-rumen`: The input rumen trace files. Users can input multiple
+-    files, separated by comma. One example trace is provided in
+-    `$HADOOP_ROOT/share/hadoop/tools/sls/sample-data/2jobs2min-rumen-jh.json`.
+-    This is equivalent to `--tracetype=RUMEN --tracelocation=<path_to_trace>`.
+-
+-*   `--input-sls`: Simulator its own file format. The simulator also
+-    provides a tool to convert rumen traces to sls traces (`rumen2sls.sh`).
+-    Refer to appendix for an example of sls input json file.
+-    This is equivalent to `--tracetype=SLS --tracelocation=<path_to_trace>`.
+-
+-*   `--tracetype`: This is the new way to configure the trace generation and
+-    takes values RUMEN, SLS, or SYNTH, to trigger the three type of load generation
+-
+-*   `--tracelocation`: Path to the input file, matching the tracetype above.
+-
+-*   `--output-dir`: The output directory for generated running logs and
+-    metrics.
+-
+-*   `--nodes`: The cluster topology. By default, the simulator will use the
+-    topology fetched from the input json files. Users can specifies a new topology
+-    by setting this parameter. Refer to the appendix for the topology file format.
+-
+-*   `--track-jobs`: The particular jobs that will be tracked during
+-    simulator running, spearated by comma.
+-
+-*   `--print-simulation`: Whether to print out simulation information
+-    before simulator running, including number of nodes, applications, tasks,
+-    and information for each application.
+-
+-    In comparison to rumen format, here the sls format is much simpler and users
+-    can easily generate various workload. The simulator also provides a tool to
+-    convert rumen traces to sls traces.
+-
+-        $ bin/rumen2sls.sh
+-          --rumen-file=<RUMEN_FILE>
+-          --output-dir=<SLS_OUTPUT_DIRECTORY>
+-            [--output-prefix=<SLS_FILE_PREFIX>]
+-
+-*   `--rumen-file`: The rumen format file. One example trace is provided
+-    in directory `sample-data`.
+-
+-*   `--output-dir`: The output directory of generated simulation traces.
+-    Two files will be generated in this output directory, including one trace
+-    file including all job and task information, and another file showing the
+-    topology information.
+-
+-*   `--output-prefix`: The prefix of the generated files. The default value
+-    is "sls", and the two generated files are `sls-jobs.json` and
+-    `sls-nodes.json`.
+-
+-Metrics
+--------
+-
+-The YARN Scheduler Load Simulator has integrated [Metrics](http://metrics.codahale.com/) to measure the behaviors of critical components and operations, including running applications and containers, cluster available resources, scheduler operation timecost, et al. If the switch `yarn.sls.runner.metrics.switch` is set `ON`, `Metrics` will run and output it logs in `--output-dir` directory specified by users. Users can track these information during simulator running, and can also analyze these logs after running to evaluate the scheduler performance.
+-
+-### Real-time Tracking
+-
+-The simulator provides an interface for tracking its running in real-time. Users can go to `http://host:port/simulate` to track whole running, and `http://host:port/track` to track a particular job or queue. Here the `host` is the place when we run the simulator, and `port` is the value configured by `yarn.sls.metrics.web.address.port` (default value is 10001).
+-
+-Here we'll illustrate each chart shown in the webpage.
+-
+-The first figure describes the number of running applications and containers.
+-
+-![Number of running applications/containers](images/sls_running_apps_containers.png)
+-
+-The second figure describes the allocated and available resources (memory) in the cluster.
+-
+-![Cluster Resource (Memory)](images/sls_cluster_memory.png)
+-
+-The third figure describes the allocated resource for each queue. Here we have three queues: sls\_queue\_1, sls\_queue\_2, and sls\_queue\_3.The first two queues are configured with 25% share, while the last one has 50% share.
+-
+-![Queue Allocated Resource (Memory)](images/sls_queue_allocated_memory.png)
+-
+-The fourth figure describes the timecost for each scheduler operation.
+-
+-![Scheduler Opertion Timecost](images/sls_scheduler_operation_timecost.png)
+-
+-Finally, we measure the memory used by the simulator.
+-
+-![JVM Memory](images/sls_JVM.png)
+-
+-The simulator also provides an interface for tracking some particular jobs and queues. Go to `http://<Host>:<Port>/track` to get these information.
+-
+-Here the first figure illustrates the resource usage information for queue `SLS_Queue_1`.
+-
+-![Tracking Queue `sls_queue_3`](images/sls_track_queue.png)
+-
+-The second figure illustrates the resource usage information for job `job_1369942127770_0653`.
+-
+-![Tracking Job `job_1369942127770_0653`](images/sls_track_job.png)
+-
+-### Offline Analysis
+-
+-After the simulator finishes, all logs are saved in the output directory specified by `--output-dir` in `$HADOOP_ROOT/share/hadoop/tools/sls/bin/slsrun.sh`.
+-
+-*   File `realtimetrack.json`: records all real-time tracking logs every 1
+-    second.
+-
+-*   File `jobruntime.csv`: records all jobs’ start and end time in the
+-    simulator.
+-
+-*   Folder `metrics`: logs generated by the Metrics.
+-
+-Users can also reproduce those real-time tracking charts in offline mode. Just upload the `realtimetrack.json` to `$HADOOP_ROOT/share/hadoop/tools/sls/html/showSimulationTrace.html`. For browser security problem, need to put files `realtimetrack.json` and `showSimulationTrace.html` in the same directory.
+-
+-
+-Synthetic Load Generator
+-------------------------
+-The Synthetic Load Generator complements the extensive nature of SLS-native and RUMEN traces, by providing a
+-distribution-driven generation of load. The load generator is organized as a JobStoryProducer
+-(compatible with rumen, and thus gridmix for later integration). We seed the Random number generator so
+-that results randomized but deterministic---hence reproducible.
+-We organize the jobs being generated around */workloads/job_class* hierarchy, which allow to easily
+-group jobs with similar behaviors and categorize them (e.g., jobs with long running containers, or maponly
+-computations, etc..). The user can control average and standard deviations for many of the
+-important parameters, such as number of mappers/reducers, duration of mapper/reducers, size
+-(mem/cpu) of containers, chance of reservation, etc. We use weighted-random sampling (whenever we
+-pick among a small number of options) or LogNormal distributions (to avoid negative values) when we
+-pick from wide ranges of values---see appendix on LogNormal distributions.
+-
+-The SYNTH mode of SLS is very convenient to generate very large loads without the need for extensive input
+-files. This allows to easily explore wide range of use cases (e.g., imagine simulating 100k jobs, and in different
+-runs simply tune the average number of mappers, or average task duration), in an efficient and compact way.
+-
+-Resource Type in SLS
+-------------------------
+-This section talks about how to use resource type in SLS.
+-
+-## Configure Resource Manager
+-This is the same to how to configure resource type for a real cluster. Configure
+-item `yarn.resource-types` in yarn-site.xml as the following example does.
+-
+-     <property>
+-       <name>yarn.resource-types</name>
+-       <value>resource-type1, resource-type2</value>
+-     </property>
+-
+-## Configure Node Manager
+-Specify the size of resource in each node by adding relevant items into
+-sls-runner.xml like the following example does. The values apply for every node
+-in SLS. The default values for resources other than memory and vcores are 0.
+-
+-     <property>
+-       <name>yarn.sls.nm.resource-type1</name>
+-       <value>10</value>
+-     </property>
+-     <property>
+-       <name>yarn.sls.nm.resource-type2</name>
+-       <value>10</value>
+-     </property>
+-
+-## Specify Resource in SLS JSON input
+-Resource Type is supported in SLS JSON input format, but not in other two
+-formats(SYNTH and RUMEN). To make it work in SLS JSON input format, you can
+-specify resource sizes for both task containers and the AM container. Here is an
+-example.
+-
+-    {
+-      "job.start.ms" : 0,
+-      "am.memory-mb": 2048,
+-      "am.vcores": 2,
+-      "am.resource-type1": 2,
+-      "am.resource-type2": 2,
+-      "job.tasks" : [ {
+-        "container.duration.ms":  5000
+-        "container.memory-mb": 1024,
+-        "container.vcores": 1,
+-        "container.resource-type1": 1,
+-        "container.resource-type2": 1
+-      }
+-    }
+-
+-Appendix
+---------
+-
+-### Resources
+-
+-[YARN-1021](https://issues.apache.org/jira/browse/YARN-1021) is the main JIRA that introduces YARN Scheduler Load Simulator to Hadoop YARN project.
+-[YARN-6363](https://issues.apache.org/jira/browse/YARN-6363) is the main JIRA that introduces the Synthetic Load Generator to SLS.
+-
+-### SLS JSON input file format
+-
+-Here we provide an example format of the sls json file, which contains 2 jobs. The first job has 3 map tasks and the second one has 2 map tasks.
+-
+-    {
+-      "num.nodes": 3,  // total number of nodes in the cluster
+-      "num.racks": 1   // total number of racks in the cluster, it divides num.nodes into the racks evenly, optional, the default value is 1
+-    }
+-    {
+-      "am.type" : "mapreduce", // type of AM, optional, the default value is "mapreduce"
+-      "job.start.ms" : 0,      // job start time
+-      "job.end.ms" : 95375,    // job finish time, optional, the default value is 0
+-      "job.queue.name" : "sls_queue_1", // the queue job will be submitted to
+-      "job.id" : "job_1",      // the job id used to track the job, optional. The default value, an zero-based integer increasing with number of jobs, is used if this is not specified or job.count > 1
+-      "job.user" : "default",  // user, optional, the default value is "default"
+-      "job.count" : 1,         // number of jobs, optional, the default value is 1
+-      "job.tasks" : [ {
+-        "count": 1,    // number of tasks, optional, the default value is 1
+-        "container.host" : "/default-rack/node1",  // host the container asks for
+-        "container.start.ms" : 6664,  // container start time, optional
+-        "container.end.ms" : 23707,   // container finish time, optional
+-        "container.duration.ms":  50000, // duration of the container, optional if start and end time is specified
+-        "container.priority" : 20,    // priority of the container, optional, the default value is 20
+-        "container.type" : "map"      // type of the container, could be "map" or "reduce", optional, the default value is "map"
+-      }, {
+-        "container.host" : "/default-rack/node3",
+-        "container.start.ms" : 6665,
+-        "container.end.ms" : 21593,
+-        "container.priority" : 20,
+-        "container.type" : "map"
+-      }, {
+-        "container.host" : "/default-rack/node2",
+-        "container.start.ms" : 68770,
+-        "container.end.ms" : 86613,
+-        "container.priority" : 20,
+-        "container.type" : "map"
+-      } ]
+-    }
+-    {
+-      "am.type" : "mapreduce",
+-      "job.start.ms" : 105204,
+-      "job.end.ms" : 197256,
+-      "job.queue.name" : "sls_queue_2",
+-      "job.id" : "job_2",
+-      "job.user" : "default",
+-      "job.tasks" : [ {
+-        "container.host" : "/default-rack/node1",
+-        "container.start.ms" : 111822,
+-        "container.end.ms" : 133985,
+-        "container.priority" : 20,
+-        "container.type" : "map"
+-      }, {
+-        "container.host" : "/default-rack/node2",
+-        "container.start.ms" : 111788,
+-        "container.end.ms" : 131377,
+-        "container.priority" : 20,
+-        "container.type" : "map"
+-      } ]
+-    }
+-
+-
+-### SYNTH JSON input file format
+-Here we provide an example format of the synthetic generator json file. We use *(json-non-conforming)* inline comments to explain the use of each parameter.
+-
+-    {
+-      "description" : "tiny jobs workload",    //description of the meaning of this collection of workloads
+-      "num_nodes" : 10,  //total nodes in the simulated cluster
+-      "nodes_per_rack" : 4, //number of nodes in each simulated rack
+-      "num_jobs" : 10, // total number of jobs being simulated
+-      "rand_seed" : 2, //the random seed used for deterministic randomized runs
+-
+-      // a list of “workloads”, each of which has job classes, and temporal properties
+-      "workloads" : [
+-        {
+-          "workload_name" : "tiny-test", // name of the workload
+-          "workload_weight": 0.5,  // used for weighted random selection of which workload to sample from
+-          "queue_name" : "sls_queue_1", //queue the job will be submitted to
+-
+-        //different classes of jobs for this workload
+-           "job_classes" : [
+-            {
+-              "class_name" : "class_1", //name of the class
+-              "class_weight" : 1.0, //used for weighted random selection of class within workload
+-
+-              //nextr group controls average and standard deviation of a LogNormal distribution that
+-              //determines the number of mappers and reducers for thejob.
+-              "mtasks_avg" : 5,
+-              "mtasks_stddev" : 1,
+-              "rtasks_avg" : 5,
+-              "rtasks_stddev" : 1,
+-
+-              //averge and stdev input param of LogNormal distribution controlling job duration
+-              "dur_avg" : 60,
+-              "dur_stddev" : 5,
+-
+-              //averge and stdev input param of LogNormal distribution controlling mappers and reducers durations
+-              "mtime_avg" : 10,
+-              "mtime_stddev" : 2,
+-              "rtime_avg" : 20,
+-              "rtime_stddev" : 4,
+-
+-              //averge and stdev input param of LogNormal distribution controlling memory and cores for map and reduce
+-              "map_max_memory_avg" : 1024,
+-              "map_max_memory_stddev" : 0.001,
+-              "reduce_max_memory_avg" : 2048,
+-              "reduce_max_memory_stddev" : 0.001,
+-              "map_max_vcores_avg" : 1,
+-              "map_max_vcores_stddev" : 0.001,
+-              "reduce_max_vcores_avg" : 2,
+-              "reduce_max_vcores_stddev" : 0.001,
+-
+-              //probability of running this job with a reservation
+-              "chance_of_reservation" : 0.5,
+-              //input parameters of LogNormal distribution that determines the deadline slack (as a multiplier of job duration)
+-              "deadline_factor_avg" : 10.0,
+-              "deadline_factor_stddev" : 0.001,
+-            }
+-           ],
+-        // for each workload determines with what probability each time bucket is picked to choose the job starttime.
+-        // In the example below the jobs have twice as much chance to start in the first minute than in the second minute
+-        // of simulation, and then zero chance thereafter.
+-          "time_distribution" : [
+-            { "time" : 1, "weight" : 66 },
+-            { "time" : 60, "weight" : 33 },
+-            { "time" : 120, "jobs" : 0 }
+-         ]
+-        }
+-     ]
+-    }
+-
+-
+-### Simulator input topology file format
+-
+-Here is an example input topology file which has 3 nodes organized in 1 rack.
+-
+-    {
+-      "rack" : "default-rack",
+-      "nodes" : [ {
+-        "node" : "node1"
+-      }, {
+-        "node" : "node2"
+-      }, {
+-        "node" : "node3"
+-      }]
+-    }
+-
+-### Notes on LogNormal distribution:
+-LogNormal distributions represent well many of the parameters we see in practice (e.g., most jobs have
+-a small number of mappers, but few might be very large, and few very small, but greater than zero. It is
+-however worth noticing that it might be tricky to use, as the average is typically on the right side of the
+-peak (most common value) of the distribution, because the distribution has a one-side tail.
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/css/site.css b/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-sls/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_JVM.png
+deleted file mode 100644
+index 22c8aead355a0d52f67de87ddc53f60f729498a4..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 50386
+zcmYg%Wk8f&^EWK)0!w#yEl4RTxhx&hC0)|p-Q6W2-6+y1Al(Qm-QC?O`J(rI|DX56
+ze!2FVIdkSZXXZB*siYu<4kiJ^!NH-+NQ<k$!2y79aPSn!pywwf@5~0^;1KC7#l)0k
+z#KfqSob1gkZQjAb@nMImFWb+n;R#3Ds}vE4P-#hpNA*^ztLik7l2r78WRi;yWeJLR
+zXPD_W_<18gk|NFTe*L8A9mos1hlkE0U`h*8ql1jSXRkWyWmLnNKgmdY@AP0&GaLfd
+zSDW388C839FK>rlFTdUv*w&vH7c#K?@_|@ABDK6SdzkKhaw$Pd&YP&Qx(PXiiSk_q
+z*2JNoIBcEx*T42x$)k{m4ik?a6|QL8y`mRJBWV;n?C{BbiEq%9e@s|^mBVXCy1TJ#
+z04<!8os9D!0?GktzF9aPqy3CR3e+MfaU;z8_!Y=4Ai<UyGxi1}0|cUh<W+S$(r+|o
+ziFFl8Moz=4?D38bFP|{kGF>kY^n$hSvWlBb8Zjf6UR<fQMT$&+xga}{t2U@=k}>iJ
+z-o)RI`2aj9l`lRf`MNA^OBonc;4OicfZn4HrKoT2tXyAulM&U7UefQU576>WyPD(F
+z6%hs;Yuwb&nCv8$4X9eK7_D^5`hLnV_~59q6|y)~r=9TwKpSt`Uixz*04YGEzM`cJ
+z_;ZY(m$QK2Oit6<uJWVkT;+$i%BT;oG6eMF2bgS|-*=@@4q<$A%O@TpknJ1YW$>>s
+z^D@Vtn*lcG5Y8p!E{+|zfQUS2L|XXSw?Jg`dJ`(fUkf{=cErVL6$n_3CqK#x6e;Dr
+zO6h5p<PoHQH4qZoJ!JHfMsW<sX3_I?{Ca;#Of6w6Yk_jHK!24(`}Z0x5!G4vdrITF
+z0}fJi+@fmUnal%ZxlaC03?SIamLH#a+!u0r-lFKLM!>J2baoH*g+wU-nms1D{Tcrl
+z_Muwt#RaY6$V)DrLtH8(Tnks;G2v2cYmoyC!9h^-&9B2YYipN#$Me|5Xxo0CYP-I#
+zT{kmTHLUlxDgXgPuc*}g!4tPG6c1W*Azk=!dh~t!mA4~vDswf3#e2U4M`#&3MFxa_
+zj5V!}e0nT+{AgEZP)0bhEMOHvEKow{%k2B&0piQ(%l;rA<?{9$%>$j@`?f?j;Opk&
+z)?E4-?<xZ$+{Gw8i%IKTZbnswLGKO1&6N9=`&vQLYP==`isaIb){_I2tDk5O<gG+5
+z;5w@}U%XjQ5sA1k=|S0`={~jIka8D-xAVElB`Q1veKQxdrEa=eo2gMA{5esK(vio}
+ziaq^noPdU$mK*&WhUyZ8%g1C~4u1X>TNZix0nW8-en$<73$RP($WJ{#&@x7WOu5?>
+z&mg|$Y}KbKCKR8+##efiQsMYNx$uWKAw2GltzFTDbZx;jaXX?*cWn}Gi)gk-I^y9^
+zT>|?W7CL3PzK2+s?Id$yCkj4WoCVQHm)}~~whN^<K#8jS)ysF}yK-xbE)Am|0oUro
+zjN$^6yd+PRyd(k!G*1Mh@6JWu!Z~`_kiNiuHXA4o(r=yN;0SU4{NT-V$DXYU6i!B5
+zRLukapcTnyLjBv*Q-(fgGS6=7H4G(R7Tc1U2Ty6jRdagsi%s)V>-BZ>wZFmjQEU6*
+zbVa4L9x5b?N=3~JGaFHw8l~u(U#4XE`pJh81*Hf}*APXpf7;Zn&AF|##e73>`?X>s
+zau6JI%^D?}d;kguJVOU!dWWrCo*oPq7*lfGVvBv!lL3co2>APNVn@}c^>n3#i3u$l
+z2!Yn<pQq0>cANmGCbAbApHF^hGlPNlt(Q}_VF9H>i0S{*&K$aZep|OigWPl@TcKex
+z`AMCS{S5WbYJXo?nPMDST#Q90<<ZS5Q}dxulxEXkA^e|2hhk9X%LqUY3TDeU->qTJ
+zcmKC?7<C7%lSAnS=U*8E=M&*jfeq^oznsnfeTf4No&X#c*p>F5Fbi>rT98KacGn!v
+z|EP?RtCcv=@Y;I*6UdG3neX9E#d+3$+eZ@%2n{mIJE8wi>IT|pzIOfg+1o$<r7|P}
+zu;8H~gtEW<t4KK9MsgGnC(4C5-0j!#B7nFf0x}^lJZ?R!o=~sCEf_VTFWuH+B0?<e
+z2b@ChWH9aB*ZdW-g!jZTV`p_c2Wl&Ezt6GBje=Sf(Y|Kx*Le5arSR}42-pj&&>-aR
+zSr;@=KmOHl<HNJ`4tKuW>u!B<zxWRpS_qn%eNP9vSh5zsko3kO7MT}Ozv>v`WS1NA
+z{Oo%kKjSKlvaEw0_QhJbWA_!I{wR`hu_b|z3s|xB+nU(T(6N7P_jbjNr8G`Kw-$t`
+zK?IG0?^#pRG0&=<Mx*C-X+=S{WBi;lT3)P<UQA7dZNzXeryKC;RwE=)iOTNc#V}b{
+zqUt7crXxF`#cO1IDQa#GWV7rKMm1BQ%I^rbdhKw~L4k*tEmkf8U%m(u#oD=r8gn!Z
+z#a(SlB0J&REM{9A*TVKUqv1r@U3hr&iwjY$f<?N5-Y7A7Kk+)v@+<3&2gKQ-PH2mS
+zgo2>u8XZP23oGhyUo`=;D{Oaany|45z}Y`S!@@u=I=UR8k{!c3iXYG%(E!@}<;wFT
+zXw6i?RsI|>fN#E<w2@u0wH>|TJ~VR@{fjOjQUzT^#GvebLC1PnQ!CJR(J2Ixm^$qg
+zg<5pA>-lyNp*$ZINhRGwGb$)*Nl2=nb_aJDR*~5V&6B!t9KHrMt1#M<71Ej8v6OE-
+z`1<D?sp?8Nr%-^Ouod1Gxwz+{Py`x%eqK4qI}X2-T3xhU84U*r+S)nz)SWtMpI7u9
+z>?}pPm-%z#E}WWa4D<c=3#I89a5fX#i<}#R5=H62aouR!Op*RLA*s>X^#JkJcqZqq
+zwKnf9sERk@v41Twxf}e?H-{FSI#`)W@b+&pf4$cny`!Krd($8F{zaLueaiOs>UjKg
+zesv3wEfN>>B+c^e$>>K$Qqa1AZ&0iG2SdwpiMk0S$2I^7s}+l06F7O?n5u!-Xutn>
+z#lxD#?`#3*hJ*_tc}?@r1r2<GWthJL4!Bv*Obmb%Es#`kV#YD?t+5|=WXVYdRkUH;
+z#l43fWk&qiG2GDxQ>lMSc<BlFR6e{a{RlLrm&k8EfygooB&KG^41OY!E}F<GgAl3d
+zrV?x%&P2radnX7vGu)fH9W0+<w<YZ*re+4ieIX5R@B>IF;ouaADK)yX`d!ay@4(g*
+zi75k}`>)pyMF_gsLl9BSsd=iN@VKYoe$d?^<rgDbFU?_wvJt&jtqX{I<#Y9@gZ$=u
+zVD3TychwU%DaJIdwF+B7%UrehHb}Q@UlKZ^sN`hKxMa|Z34XHJ`0*Alavi`^C4lJb
+z0*a-@OS%R4oUM}Z)wZFQ-qp&Wf1qqP{bO&?q@JzBYT3ybM<^6(s75oEgmaqq(|dHJ
+zo(Limll0B4M^Ptk1P*uMXZ_50KI}ea)*-WDW#CAx(cg_kfl@d|!yN8t2qUPtl{jgY
+zKoRBRW+Y5}i$(BqAzGR~aDACMS{X9b=bqzBJln~0KP>V9hyVU3N5iDycxsi><X)e<
+z25ZNU1COlphIQU5zo2f@QzEk60Qvl`l-c;TyJc^<EwSUZ{&o)pBhKS)Id+zC2Rl^1
+zv*oH)*c*YUh47kvC2R&34-mWWooEQDO!*4^ioeKA@H#za_n`yq<9XM^@-0RxyB=D_
+zYf351oSs!Npw?GI(1)|DHJ>_C#o=7URt;{9HYp04XM4em`^P|**a!DJp}?1_*Hc=A
+z=8cSHG%fcIBRZP1W9N+^Q3-LPS5Dq3YrA3;o1c#uaj$j0PBwf+JOXuZ{Ei{InH=*y
+z^7qVJ55!G+)r2&6lD?VU2ozTnOxA}qYm{37oa@=s*<I<VXlR6PKvg{WqYQ3h5>~LZ
+z$cwJ;nfZgv!C#6&>a48Qb1VZQ)#Q`rXNHHL!!zR;4ouruT$=JGATN!!#KpzK3Y*6I
+zO++}}O{s}XNQp8>1~ydj>SFNjv8Uwg81<0XIb-2sBeQ0pY{<)o4{v)b>rI19;>ni+
+zjnaiUkx(w0dOpPNCMTaxVSLcp^dXz|#$og2b5fznJGvg&$;A@k{NoNPp#c>Mm2eRv
+zkNwy?p9R7zte3mOs;=`tmQJH7$pQkk>BFNa0?1I9b|bhNPcOsbPiMa_o<wHI1E54`
+zpW1T2n)gndTnReqxNxnGbC=g_dk8To4neEi1LuhJdf6CpK`55!3wFGdMQz+p1Exh{
+zSoVecD!0QDK}Z#MBUZr{iSc4EV=|RjuU^{DxfJz@Cp8!8ewMvPp*ReNen1)Jf{EG6
+zNOZ$wj<tIIR!XLg=O^@^W^CM$E-}j{UVUPw7C>RzP)oBC`*hV=zpJ_uN@BBAiy;91
+zgq_NbK;7nr!_&jl_!mL+DLmhSn!2?Qyy*cIb@2U|haGe5ZLp>9uq+{+n5Zai58`?b
+zuYJM7(?ZVstj`=|vrWKe1ukmqEz=OB-(xDQsrowbyeOcTxMtKZ)#9=ZY{lQJMjsSO
+z6LHrM#4+HGn6nLU`@Y}#I4zfdEOfcz)|_{S0V`|3^rYTNNaQ3OqR<Ze{xKhpbqk!4
+z6cX4rI?{FYcIPhh9GN9YvKMo}9u65fK4feuuC*C+#pW&j9`i5b;Xo6Mh8x<z1qN=q
+zgNq!u2%0D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
+M07*qoM6N<$g7Y7xEdT%j
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_arch.png
+deleted file mode 100644
+index 4ff58556bce710e888e980eb074e07bc51d76623..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 45943
+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
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_memory.png
+deleted file mode 100644
+index 9d40a5a14f877fac13f22843db643a9229823edd..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 82526
+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
+G;Qs?4w2H<6
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_cluster_vcores.png
+deleted file mode 100644
+index e5c4b376d3b48bf036580d299aa028819f5921a3..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 84663
+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
+Tc$z`v00000NkvXXu0mjf%R|}k
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_memory.png
+deleted file mode 100644
+index aee7165fffc61843dbaf7df41eb530e0e209ebe5..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 79779
+zcmYhi1CS@p(mg!3ZSL5%ZQJ&aZCg8@9nb98wryL#v2FhMdG7b!_jX1{bXQbIXH-{a
+zpL4P*Qc+$49tH;n2nYyXN>WrA2nYlU2nd(}3gU0e_3uj$ARw?GRw5#bQX(Qmica?C
+zR<>q9K%B^-YCHBDs%ZR?_R2*V0z{e;;ZZ|1YAQNyxHwhA5K>8hE~PR4oUT&;IN;`p
+zEW?G|IBhOh@DAjF_y87M14WeNC5DGE_FjAHZIn_8r!JS0^gbCxBqqNER|9mo8B?eX
+z>OQ_raP4p%^Bn7Mi1Ha&HDzL}MWj|#XV3gdNh-le&XJ3nZ&;K8U932jr%RleLZR<N
+zf1W-E;737CTqa(9$v=_yctvl{MUp7={zS+3#eRWPnq0JLmO<-*e1EZOf!MsqyIEid
+z1E~N>^UXr>m>Z$slP4B{j+>=EN3VkFgy8L5HD_osG62OIO#-O>#BC=rPi(0AW#lvi
+zV2F2YVfsd-|Lyv4p%<+Ap7p2Aq!lr8o90QiJ5pe!=>hLXrq-aQP0Gk0{3ZTv-Uq~k
+zQ0bxUm#@qAv4nv^71}n$Hn{hkLkX<hyR|EmHy&2q+#}g}`Y0*qimL@mLlI`cwfalr
+zs>w-W>8Og;uF-Cvv~PKaL8hbnQOMRrgLcLw2x+`&Ps!9l0AzqbV^wD<_|!Z%2TK9Q
+zos5Rf&+0Ov_3BJ5CD>2q3?BXXQ7XHRl>TJG350gHeC!Df>EXFka{nrGFAL=LRq&1+
+z%=Luat@#TV2rSQ4flh9QBM7_=y+vi?=E7cy6H!r8c?>$^r7~%rBE=l$<iRd+c3v{(
+z(U8!A2_q&Fg?SX)El;la{gIHEddx1m0;NAZBQ*{^V|AJWDr>+WgvJdQjJOu4MYSBO
+zzb~L<`ndZLz+s&1xY4N>d?_FAI~812F}URw?>+>5DI=7o*RFBirsBWCGHYdM9!M2t
+znOJo$QHdZ?EnPY0`AckU1TGMG$00girZ2l~Y+ODZ?_;;3?MB#Ze-1bIzpU2O(S6t{
+zgYX!7MWyDC-?;TddywMu=>jj1!JpgjYR#@Iuh$j+IeQJ9B_;0@80DXwZv)Jhe-(U{
+z{VX*o#a!Isu@1rJDgNP0?Mw4X=}Y0u@F^SRqSa3F`9m+IJCPootK+&Wmu%I$#=r=5
+zD@xCD$tIVLLPdVu`vCJW`J?lro)@<kt<8WSspO#R<^uX@3hooX3(Ezj!CJ1#o9-42
+zixrU!A{%05Sam3*!UaQXBR8p7nSFG4^?|g+O*iW>HOhlKCyGKc@;X{!aAc1Kq$Q{G
+zMgN7owixvBD+!g6n|s%eR+em(WiOlCQC;i-#^v|yl%5~N4nl!ch1)XwIJ(AKO?eF!
+zw9j}ev)+<KIQkST`ph9EyL)R_e{|uG?qHI*6QS+*ZZWqlIJ+wy(eUqno^y3eol;ca
+zOQgphob|99d7mSef@sLc_O89-LdgS&L>2DZop=0GnY}HSmN}1rXSEp$Q654LobPH5
+z93BIbZ;Uy!djTyVM-N+E8q~jO1KL4S%NYm=6Xl;1*dllSZ&ncmk`fhC^#H!`g)~$<
+zeEo91l6PYH`SgQ_m^ir0Y!pcm&2h2IPS39DpF_K)YPpIts$p44Ofc-C3z`(E{&{<U
+zJBH_b#{Cy8G+1cQqsHR>>EU)m_r2eYyVLfwcZsT!5}*$;xtJ*Lzjm`AZrC3J{S&C2
+zl}4lbf)xwy3V*yMDB!==tAGUDv4xN=AFfm=9yurTYs}PX%lo=ZK!`G#m<EdSzt)OO
+zNkt{3sfm^2b0<|NGp{JvD}u;(z+dh2zr8-dkXJiBS=4LveSHq7OBOtRL|*g%>rEcf
+z&4OrNLxXc~uNr7`GCVl&{~Adi6x6uM|M{Lr<NyN_72p8#V;tds`-urE=KSx2fhtIf
+zU?D0*N^bw>?cXbqpgXw#ZO94=AR)>EiL4h968t|yMoPB$pIf0_G%z$^0GebnJ`BkJ
+z84frIc%Z#-@1av(^jcFTI}eR}Y2Ff!;mxcFneT$y@iJ4|1UO`Lg5aO9Op>~66D6z0
+z58o^J{-McY_W6=!%RG!hYPo-3y6YeE*Nu<(0D))wbK#aYZ19n|J;f&`)@CN~5^31)
+zJV`kG)VRSH$@G{vXMe1s+J-LRwzW0I*AbF&gV4<^<B&gb;y$G_{@H%vTM*6?xLMW;
+z={~$O_5P6SnbeLR?!-aLVWedIyR<bL@)}5rf9>U(`0vPm^U?Z?^0gT@u^LUJ5dzjU
+zb_VC1U_U@XcAZ=XHqC`R_B?dmkGEQHe?{KR=bl&SQdmzo-7d5Ehxlzywb~{l%m_4K
+zVe-~O-8#>IpF1xvtHwT7q!#ixuvT|jerOd_Hx;m2VCJ-cv&nv6qM{*@f3KXXaI607
+z0jJ78gDRW&2AzG}_?&k!i^Kbx){{TZ1LOV)@RP+&gSOCMd8&K`y8g0Z`+5?^-BZCZ
+zd8#FHX=LrC#zxw`hJ>bnaB<6P8=!_o_lgB8sX}#ieLT5v6s}<Doe@Cd*XQQERBvSE
+z5I#Sgu>;kmr=UGjcX6peMmdl<Iuo{#fX&QYH#C!DLR2t#CGgrJ5{9n1tWTd?-4u0>
+zK()>$;OF;ae04&<cImbHlQFm^r4o$e77or{0#AQ+&D>I$Uxv*NnRkC<{0)3_H#^>7
+zcYZ4B>kHcMWjkxRnri^`@yUC5&P{h|X=@v}bs8idGj@Pjs2@B2fk*p#g6~4+Vlq8w
+z`ttspNU36Wc|BtJNuMreZX=`@$lh3NKFbY8ugdZ#TSId>zTFW$CnrY9g4aB%M1Iu-
+zNW&Tl;q}#7kc>${&77o9$K19NFmzz)^qJkm#pUn&)%E#)lWYg2_x<zpnRp6SdLHie
+z$g+WHE{B4K3P>*n1}r{44@8!Aso>=SDE}lvUU=?|xSw$?f7-w?0z;QU$^EA@S|ITT
+zN9Wh3{B&z?{XPm##o@ccDPp#_XQ7f1>g?^W_g>(#P#M-Ho#%Ix<^G0YpfeJ%m>?%4
+z#i75PvW5hUdiOVhQwOiZH>$!O$BL{#Hwpm@Hz<Ign)jw3#;4X6vUpH-q+P*4sL2TH
+zXV0s(<!EJ8{LjG-nsLX8>=x4L5?rl~mEDOyG)gw9c`Lse{oaOJ9i}-wG%IdjH|&WV
+z=GinkT{$bavRAvmoNcMt0f7c|A&csvY6gB`k30y4Bl#i@nkYxQ%!K>m<b5hDJN~`U
+z&dzM?H9C>#xK9cBJY#t=lDHh;m<GJz4${8gj~IkXk#uiljms&<_!{r$>}L5Be}W7Q
+zv5Kel15S@)1JcHWKs(s?lV&vX17q~A0pUs}7W?%RB_b;-@oWZkBkS4WM7p@VvE5iK
+zX6)pM3cYbDGLE&SIKRwD`E~HaZ7`-qMEo$+eILmX4p!#E2XGzBP#sVEwIm}R#C)v?
+z)GIaPF121SMj*8{FxO9?^ZDaEt`~Oe-3!U>5mPJI1LT<>Go!3m`GOL2a1gz9@DT{<
+zLPUkmKRoZ5EZ$5#Y-}mVx1-ezYWn7aa5$T~vDl4Cj;6EYBn!bema7HbjOe^ht`+sQ
+zV0$7siv~jr>*}FKU}yli81b+S`T=7m3xG4*{_0qpTJujg)fVkt0Deea()38y+Og0^
+zW;7kHTVeTj(35<o`a@0@E;@(_3*&o`R>Z?fVfzh`di5G)ZhBohhd15_FC_BK*9u~n
+zlm9=H;{Qv*uVvS}QS~M8Hi&AyXgLv~X<0}JV9XHJdnI~abjti%@rB;evuj)szxh8Y
+z5Hij8Az+|Tu(js$n>?OBZDkES=oH(5pTDk%8?9uqQqY3mHXm1O9ci@j8TQL>-Dp1z
+znMl|M%z*PtMuPCq`A6P)3LRH28yrm6csy>(5Rp)RM^M_+v0rY4`Es>+T$GhCF|pme
+zh_>14QF1n7&wPJ!Em|2fQFGy?tnt)(uJ|?LhV7Q;Q!xD)$7r6$uzj}%C-8jZ^AIZ{
+z<(rNm<w-T%s2*Sxc+rS~D<9Y)^hMKxhls($4nG^%sIz|;>Yc$IaOLv2dQAhs;e<U<
+z3ZPx;hgU&5&3cS<)wV1T7@r1}H=)BX$(5GzMh!9W$CB|(FtKtGgiTXlY}Ub(Jx+P-
+z#;vX104h9uZmq$@DM<P|P+r61^JQ?Q{l^1YVS)48Pl)vW0j?*c;UvtG@pt{PFM9(7
+zU?YRXqdTCFW;#mBD}i}8Sc7HbH+QfMh64cVAA`dnM<|^wHn`U7+z$KTx2sKV*xUME
+zSW0D9jHm6jW}hoBv&AB!ws1ahZmRYhAzlrj#EAgQsW%h`-fs-*j!!09Dm1k=otwLD
+z+D2`?bR2o3yZx2AI|m+;U*Sf3>0pZ(riDLk2!aZekonos-Z^RpB?zkr8gWS&HO?4T
+z@pFX_!~bH7UapAV-j-P|$voltZz$jth@5o~Fpq2(e{tp$ULVt?u7*NT_3B}GZv3W=
+zE^ANErfDePNNP_fnM#8@do<NHhu4~%!NT}Y^dA4+<JqQEqcw`$0@Rp@U8{Z*1J=4}
+z4I9@^bx0c-@a^|w2}bdlUf+1$@Nfc8pcOrKh!jY7qy0Ev&<H1PJk|G##B_dW_pNUt
+zf{*<ghyBYm5wr8&d{8o8_gxeEzQE#jVV^E1eBOfM-D`W={sOU@U54i!Xgy#0RNp7y
+zW;?B5P&4h#o8J^SfIW`ec^3cTUF490dF%3dHZ1-xpG^s&Jz#z3%O=dciYja}_?(wD
+zzGsuCR-<$mK<vxsR$4x>H%qs+HyAccb>IFBZ}iUhtG=u>qv6bo%*|u7o@TobPr*FH
+zunnP4)R28=)CT=;IJ!cbtVIVnThZ`$(84f4yZ2X=`?e2!Pr3j!abRNWUh~fWJ|gD+
+zw#{+h_IBL(IQ7MLGy29ehVf=)E+9T$AXotT88GK{vC{<Uc^IpB$`&F2JH+7omGI>_
+zT48T5k_swH_7B%7w$I(uM61^m7V9!cKIb)(o9$MFwhr3W>%ED`eOJrvBx#RWdoFfI
+z^R=*)3CALYv49cG*UjM0&A~pR$ycSLLt`pY4<(_TYv?FfDx{nwh<L1IU~V`G5nPsr
+znT*ixrkLOyQC5fZy+F~Vm_HEa<*wdIJ`BFELSz!VO~=3(qtJSGhuthV?p8R&EHxG%
+z7rX5d#zAUIUihc#g;reJ6ZfpiB}nX+;wg^dm186eB&%c9s)bdVkh};@JABIO%i6~3
+z!Abs94?J}thPpST7B6^oH;o!x7hIgo(23F^<?1Uq!FK`5Q0S|rtywG4C$hZNg8(DP
+zQhxPBSj_#Av9)xmkF?JnXH3)_Q3Wqzo9Qq=Q)D`i9W8HTjwFsdFu|)g_2f;EgaUk6
+z8td-v_>iXBl=snLpY3hH`WewBPW9Ik9CV7McS~M#J&<eTsYJ3F;B%#P{`yQbBV*(-
+z+w{Q9a@oW1Veu6U*Nz09+uDMDuztxN>0RjL2wRB?dURB_s3rtL|4UzTRPyMF5eyQX
+z*i@49!)N`}P&zj(m7DcWKV`%Xu-{?>sMk`Q6BnXhjr%zrC@K(mkT`~wnFwX?&He$x
+z%Q)#ysl1?qjI}B~C4}{W&)uk|wjfY|9%)iyd=bIwQQj1xP%uo!hH+kjtE6%a%lD_#
+zv2er?=2O*&R}U+L3uLb1nTUdiu!HwJ;kQO$`eLZ0RE&UGw?YQ4*?)pL_#foVqT*PM
+zB#coqzc3>hUP#u)=}`&6vM_K0wGuqP*+pr+E8Sy-IBwmZz)gps&5aV(RBd=}oK24h
+z@14#OD6m_*HY;*e8kh*T0Ng$(q->MG<i;CjItwW@#CIp$rXh>8;^ywY5Q$J*k7$8t
+zck6}tq%b_(-4*kN#lepj$s__1ur%Z_dC4lr`?=SHoXU!aeM=ls@}Rh+JiGE8u;876
+z#zu@|E#=~6ms=|o7=fm2BM-sggrrDckhvo!6d0V}X;Mg9m_nXHFHY4N?%&x(0G&~o
+zh=Ls{`lRSxn{)h_Lo<yD66BzGlCP34Jum2F?STOf#cdZRHblBUfoMbyquHMyPvgME
+zA8FVs*(>NfBDn5}qHwS_7^Mv6qJ311^o8Y%1DROSFSeQO!kdh@cy`mx>_?4WP_U1j
+zoE3<a!~o;L_lWipQRjHksXyY^cu~_5S?8d>mMi+!M8W`Sg+3)jd*M>8>PTztMSO=w
+zaNKtH2PF(nPDEN6s`=1v;Fr2VvWv(5Ua~42G}Gt`&G$d-=7aGc@<TYx`$?!w)fYYe
+zGi@3>6kWkLQjB3P@}^~_U&m}H&7LnxLt}+_u>^98y1W@PChZiZv#en&Ci9HDbX~g6
+zYy$Y|IV?^IY))iv*S83DW!sfdJjA20tR3i@!7JK!jL<0rlntdyF1EC~LP*4u9l;cR
+zZZZL;CJ#y!0!&zJq<QD#iK8*veSh?ePP5*Hkk@5<qzN(z2>CT3%{e_2x_tE7AC5)2
+zakcxF=3?WwOsoVV8-g(#y{3b`^R0DPNg@OSg_FDO&|JME)V)JNEfJ(A8%hB=83}hg
+z{^bTtoxeZ3aVLqAj|2R+&pzKO%5iTr4#Z5YqsML?MZ(cSU@Xm7D1Nv)6Lqh2j$B~a
+z9CGTko6D~?NO&p1h#e)_bWgIYPIHtj3~rTbt-!6pAF~`l<<$sy`7k}Z%5iNSfm}!@
+zHxij@U7O2t^&fQcf*+)?pdZBFJMWkLN|pqRIs7qb&_a1sC@SXqVH?%Cz#1Ch>hxN1
+z<pc~^rH+Y|rV-Vm26ru+!2T1y&re4O$oTjad|1fJnZ97*2>4=o{3uH!PKuhFA-(Cc
+zAu7=>F=u$hHLW~%&{0Cv&SsUXcf<%+=fkzon8vF&E?6Ox`K<pyDnhuw<o6~xqx_pk
+z*fnPx%l{QWy`=;1T)ijEo2DT#5hFHC8P<9ncJ?G+#88>}<KqF&)0xOc63d#Muz!J}
+z6Xd(vhjvQ|9MOc^B_}YQ%NK)x=Yg5Pe^+W!fC2eXqI<Y}tEu%YZUU>>Qj{?X-A?-z
+zI!8sLfXbesUfLTeS^m+}khMCU4S2@4DMvmM0uKJPKTghO))FhK4Q}jw#|4fB4hAl)
+za36@>@0ALMgTrKF_!7?3Rzzn@DVYOIWB^Gt5(g9$yC&*5T$GI1aUSa8)d8NsPc^oV
+z$;)(Mt(J!f-1$f^zOk3rr^$(s-{<_gbWBR@_DhcPXHk4#XdP=TSb>EBQ}+E=C|xy-
+zt#$)AADoJ9C1(Kn1X`FBcdhe|IPDf%yi{2dBe@@&x?eL?^AU)pw^QxUPyWI94!AL@
+z0W5x;ctj3{fq@xrq(9Au6Z7bcEMUsP0QS6x*yKsI0t`V*Hr0CdU>f&WEK~vC7>yUo
+z(#1u6OJ7E26V5QPp95#;xqb8MAQ}tEwrlQiqztXV1Q76Sn7W_Q{GN3mfKOGFca)Z-
+z=Q2uhE+e?ekx{0?6QVclZSQAv?%?5qk6HFif0tG-fTk!UYu{n<m>lGF?ysyMPJjHk
+zWUa(>UOX#kqt6oA*Q&n~$qlHW;N|i0^Jv%e_B$w%8u9Hn95Ay|Fca4Ph`I2wt(cV(
+zHjE6-?Ec;0ETE8yngw{uRgDpM&*3&14NM|k(LgIGXw%8X<&4RB_%C)4Gwi>>mXs;%
+z(mfX34*cX)*9}S~06o%oWV!18WDe^%MMlaKQqo73mN_deAqbK&mnXWH@10yrO5o;2
+z$7d7c%<_dIQ)9b<kt@CjWT$hG#ll^I;c!<w@O5@7YN!Pi^y@A*>6|JFKqQ$2@6KBx
+zVf+U1kCz7<iSM5!{<5?=7e6|9O=l&CpPq(TA4e=qpAN^##nSaXpK&|{0eoPF+z=sJ
+zlgH(i7DYY9GSaplxotX(v4Xu~D{3c3?|p!<y0<4V8pDV~u<QhFM?5H*AQv?K+UB-a
+z1YtTafX%p}ghJPKwKzV?Yn}@_m^<E&^S&A!Js^&V!w;%XwZ`N7HL!_{A&NL9>UF^g
+zm&+Qtk{z*Vm`Z&VVkyi+3O^qnFC0-5_eyNJoQIT}!vq5W&at$s7UAGc$Yc*HPM3Wn
+z^C)coK`7xISJ2!AnUQp~_h!Q&;S@rFgNp;ePmP#_dxKBd4jUH73f^PP3JUG%8@q%E
+zlY=mR8Fj=;LYANlO3`9-PWY`8A)iKgq~}Rj-DykS`3Hg3H61yF6U9m-JZKrE&C_b#
+z;bN6|@d0eNo~EX^2)Ql~UD)a$-RYPSBs4UXl7?nrGJ^#?#XrT^*jSg0jO>_k494nP
+z1}sbUH;2;a&gczi>^7!QzK|l%l;-ymb7^?Y$VX&ZeP(+_Qk>&dc1+^42{SRn8{uq+
+z(rVQhTF7`;Ra=gHFowq~1T*xn9Y>yyQoh;YS;2O^UaZ~&o<;f9j3&vdOTDS}bkmZ$
+zd<4B1JjM)=jP6wv2hLGJ@6u&^OY89Af!~o4A6OHsu?XBGUdkRP=#;JfN8@W!ULnVS
+zG6&aABv%zRM((q2{wN~tU2k+m9buD1Dp^3Ha=5NzZ(D`rGWb%p_Hgu}pmHkN7~Zfd
+zjoyX@OT}<oDkF^rF4orhf%{TnjS;U@5!r1Wu`jYWG3u~c!NLVlu;FyYLMOCOl~&n=
+z6tO5XLKB&*zNtu}K0Mm@OAJW)0|PLLh5;nL@)|X{g4fL|@&!L8QK_wQIYH7lq%53y
+ze7QCw<3$^xyHHLXs0(;h>mh>pp*AtL5rs+ns?B0Tn)-YhAnR<ctn-i-;1vk{!_?+Q
+zi^$-E$i)*CU4;n29Tgz8&#V($EWo#Yj&~T}bHW999T-RjKRjjs^VOI^D%7hAB0XSp
+zyw0eEii@D2j_+)#8mXW@W|174O}2V=h9(%gBb_W5f10lzSFOy1rs)v8<;P0oYY6R9
+zg!GPq1nmXipl14*mBN7R2!K#y1(PN+S&<i)#0_j}?V|&B-y!wdf`fXWgL<`Kpe9@7
+zm+HhPL^&-4<C3^evQ_!4O_xl1U_-c9$M5=hix+aFgQnI=E970h$fr)-GwxLWijcc_
+z5`t!fFIupNGhFgz!a4u&wH6`=YWJ@&*!IlvI+_X~5ej*U)s{0jyV30?=;>Xw7|AH!
+zZ5v4EBg})t!uoD_oM7ZS=rKw2Q$wS!MxCj<y7?&TVJ(~VN;9ai`P;FP%U739%zv5S
+z|F1OnK1cRqLql!3ELt1Etb9)Bn<VBi+#KA2wsMYfQtFXd_^6n$tZT#E&hoVo-IP<@
+zK7p=GWCE2m!A}T$Koa=7g8PUJ0Bjk;sXP(Bo-RxzVef^%a@1a?a&v^$Fe}cmCmA<B
+zZ#R1Q<0mZ44QoOCf>H7={-Zv=0F&(IHIz7{q8pWRCwiPga)z;xt&LX};&79|hOe^N
+z)4OPvrkG1sb0m2+-M8e(PlY*y(L@iyV6yEE6CyXDz&_hs$>Xin!_9nNGJPC|K08(x
+z#GSf}sVDd8XnZntzV-{;l<a&1Pavoj#0G`FW0&$ZW5f$QLg4k0-b8!*N8@6|3<n<C
+z@6BPV_iri%w|K;ZE}_tOe#vk8P6&HwIo%AJ%oLVpoO-7GN4viv70=5k8%(oj7)j(-
+z%KRANQB-R7xvuj{Zdt{0b!OjhG@AHH{=q#ParA`X(^ePrA)NeEphCX;F-$Hdq}<Ys
+z>!smrIa1GCx~?owjvn~CisLmf%K-uh3=#$g(d0WH#5_)IKm={i(fLCNVr@++vda6Z
+zZ!)=!gh*~nL3Fe8Cw9~so5yQXiQ_^taj#g0W{WLmGs8RB(2DnN^yQy)r~L(w4~-Q;
+z<8BW*8K$4U9;i=vHiF}xyaxY<0St&mG>`}r-4;T|DNeeywrJuwRROj!%`!K)-nI1d
+zPj|*__64m6JDyfMBPJ9InZOQ>M-nqr!~w0LNA0lu@v<SiP4jxnIyzy=j&`l<{wrf;
+z8n#YLg3D(ZUir3@jmhpyd1wOKtV5ypv$M?GYc?^>(WrcA;+)DD>MMmHtmd;rp{jl<
+zqnZ((^XI~n5eV4R1xMFvbgqfeT+Ad3*9NfmR4yUW)|#yOER??$RXwf`jopPI*8R>D
+z&Jh`fm{p5-%0c08ro?IQTDyuAK<CBCkhh1*xe!!$UE76vvB0(Y&qQY4j&6b#I;`MO
+ze(k$t6$aG&2J=12n>i<1@jc46$`@-HV(ZVKL}cUsa2jW(kriBQqnt|PJz*Y^Os=Ux
+z6<GVYzO9Rg-!|vQ?QZfREhPw7BE~%#m=Q44#(sQU^0>bH>Q!7Zq{GB71CvncyjXsu
+z!gbhZw5IIALbKjMz-|rXa+t@tWtz2~D!`e_YUzmwGP>{CB6wo1>d4(&B9WsDA~IfU
+z6ik?r8$Ml)6#d;?S8i9BQnN#zUQEZys_id$5v(VBYbXymd>IG&vooL6VM*^W-0zur
+zWx@9({c*mlEkqionwLk;eG+oR!n_qA8n@3xnVj20>zu|hpBqFf3*WUbRYUze1Or0?
+z?uMsH?)%j}zSCu#zOaVW>+wBVaXIT%oD7}>ko!OBSr=7%&-fq~77D%Gtw|Ya*x<a=
+z=bMXaq0C(wlWuA=@#EV?r~SSV*gqi2nq&)ti7iXmg?~6XaKH!NTJXA=9zYX9J~JKa
+z{FA>%f&(<CB8z5&tIk9bB2a7glZGd=Fqa<O*Ig^Yo3ar^!Mtk4LkIhnz9u`Zgv@xN
+zWyoFzc1ne`#8{$q+OjQ;m8dE1q;VWu`(xz8VdfIMM`M`!it3Er<!Sm!Kaf!SV{-WP
+zR(&hc`;5p3A<yP!=L0J{$yMtW)8lI(nNdL!Mt^9NRJC?!c~_3oSs6FYx;46XAR!+`
+zGZl>txp(F;*!H1LUS@NuZU&gR>Y>@P%4VVmATxE}JYP(>onBS$xO;bid&e#BYX+xy
+z3i28j81CZQ3QIHAvUI?gjS)w%o@$<L2FZo%Bu-vh8n97Y|E^=GL3hQVaQ5;raxo?{
+z25lUjt_T&o40V+9GySpn19P!J&u%aT%)rIn6`&}@cURsa)d*oF3z152DDwDrdfdM*
+z1wYp8<kM7w<2hw*T>yFfLwy-}jLuF}Jp=pFR2x_pggvft7~)qMvV@TzGOPkIm=#oN
+zbdai}8B6m~b3yk;B%}X)I>w}Ij+cvegoz)Yn}#;!iB&=l(&+7r$cX2}xV@-+EVy3Q
+z4(0Um-~mvh>ayWRojBePkzBm}U@fT}$}-EroDYP|PA%Hl!z~F%`hFi)OACVJO9^YG
+z^*uqX^BC3*DZ&~arUhds+tpk>k?mq3cU;(}CY}U5+yEd~j(X|I6D2DqE*88DBLdlt
+z`B)QLkd~TsZR9Ap+qo|+Z2O>^VqBeP4(8iTh@~bB#oHi&RA6mOBk^xGM>u}{gE9bK
+z4F;Xhmm6W#K%zK}9D^5}0(9?*rhulFgWZ4<OOUVHs>X7tgBR3G2$+$0c`mIW>msY6
+z3G#iZV#0;OH#QVhmOsX1egIffi4c9!!gU7kVaXuyyE1j7R+kxk&`aT!9fAw8;>+MT
+z>P0srt@5a!ym_CEc>xwiD1b1<lH{`@yatokm7bN&WdcQ>pyFuDbw%&aF_A^z2ZLTW
+z0+P^2al7QB@E<0yFDh6`9(~T8UK{O7El-Ouw1>cyFAfL&aHi9Ti06;HV8@{Eh{iKs
+zI(INWzq}P(u1?|SszQEY#-?ddVC+Q8@K;u^k5k_h;F9OXG8E*&B(winePErXC5G+V
+zWU7FEBri1>>L~wVBL__`FDJ~H!N|RSQ?n$7HDRY5;I4iQ5Hv&V9PQ+$<x}Mf-_y89
+zNsxxv)!$D^S>F9a7HVmH$DmM5U9+PT+YWm&c{z~Avg56t5?j_DeS2-!B<nCFNgobR
+zgUGR0J)z7<I+xZj^R3}=?IFh0w4`%)^K>O{4fLScVM|%TX0rFdy2&LSz0yNFXvgtJ
+zl#I>Eqy78vQs?JG7)5A`g}{uEC(Uk2+U%mdc`{1007Haf`HiruXQ+v0BL_Gbq>T+)
+zz9fEBBNYC!?esuTL*^+gk$OF!W_=4mPd6?60;+H889pcE6<w@$d`P;XuI;J#fPO<|
+zB!TR11#RW<{RHe>-@R`sc$wwtAU!#Y?}PCI&=HxUVY8#UY}L?C8d_d~jBr3Wj7_FY
+zZ6Pl(B14SO@|6#7Pj{H?B53<hn$*kkLEjd6K~X#CoUis@ksG{#A+`6B4H?HFu>qzK
+zbW7Nc0QJTsrQgW0<R7k{Ot~!c1&)CGY%|W>H4}d>HYk~u!`<9>ZB3OSAiHLKt|q;7
+z`uh&Q`~9;%iVEktLhuOqrGe$;P{fwx-W?rSf#9emMV=S9^_#CM=uv*nsFIcBfnL>{
+zoW(Pr_69tS$%(;7DmU6U65OU7f{6Tt*-@LXrax%F;%vF#c?rS?N-(<dQ_#H@74f?Z
+zg&1Hjr+LioCQ|Bb1l^u+{X94~gYP5hvCFXJUBGkY>KCqVL~Q0@1)W(hUR%hW>I4C}
+zNn*@g&oPmz))sT}RZ9ME(PG0bNxw@|A<b<Imrp#-&s>-R1o%8JE#&oQV_It-s!$jR
+z>H`fdDp|Q@8kRTasqJ%x5)-+Tld{FWQ({6weYf4og#WM|0eLWKTv`vmQ>M+kez(o1
+z`Re`L-#I&R3@`Kc*9Z0132u}vC_K`3=`3{U3|o9S95Jwa{h{_G7|;z$TQsaMKj}(>
+zY1RoSmReKYXt(qOF~T9MGt#2o>7_(N$|27i%10%uSP32UMxT}K_t`p|2HiE(<;gU1
+zF_!zVg5Ld7!(^D{Mg_D(yHd<GOT+#Ka`JKuQO{avq)CAzVYG{0`WY-D+vRN#5)2e|
+z`BlUC@3~#p-Cw6tFONfGScGC-)K*8|!R*ey`26c?(SylYoes|)A7*~6Y*0li=|Bgy
+zPE6DMnPVwbm^X*lgHND;R@DrLD#vbLKG{xnnY>L_u8d7N>KA!VPXXnvX-=4G2drwd
+zo5nwX_DcLN2aKSf)YQn1=wS{PbQELI#Ix25X5db#jH!A%it&>~?LQVu1&RDs7CjYg
+zAe$I`R(5zfz<b)5(Xj#67n4Rix?4~7dtPiJryN%deTfKkS8Yyc`rn6~AI8Q+ZYsU&
+zYO4Y6&8osMFar%O3jOCTC4q|jnkk`Vla~<)i2ZzN#enWmTFMb)mx=~$Cf{+zNvTB=
+zJ{F8;S<-<m&7cBt_@7z1Q3CoYK|cynCz?}9YFbeUk*?v2v;9wVB0UWCe|(gEo}znf
+zI?I7r&72jC8{FOW`mV$b@6gAGCS}s}+(3Qo$3eHcIsr-FpDArD$2~7&C|N%A<HIi8
+zzK2FaIl2I%tISG|ovltANhoQd{JZRUud+>rNslf1S5-ToChF3$r0o>^P|K+$QNai6
+zP=DP(SiQZ|4eYMWMJUvt5qG|<PZiKh!{zjN!&U!g0*e(}LhJN0Y-!vTfLv!{=EG9*
+zLwk8k^cTko`ATxSv!}R}&Tg#3f)e!am>4^b93f_;#44YbR%IsitxP=Q(&4EueFK$)
+zRjN~(-JmP2sW>v>NiI9iF3sc0uNsMnKr)bKqvkreeOxg}>%ce)TdL5Qcvt93tC#o}
+zyMzRk(pv3DD|__7Rt0vfS+1Z*C;DBpJ`?*nyXtQM_b~craV!!d`w?*3i$bMd+ofvU
+zv-cUjII>U!bjU86@gH53O{A^*7FX;U4$ib<*<pZ5z?%&-DXNjJs?AsgRHAtl^|!*@
+z=&fO*&u(h8nOVCRPwT~am<(L^xW6!LxuUGU0r^#{tqmc<p#%dV>zS@BaI!OWHsYta
+zjJ(_l<=@&qjr?iU&I+c(;D%7qg^w9AViKU*GO^fOv=e+bsy`~K&XD<dK}<-b4UbS1
+z2@Jmf<Y7@XAt9`{!&<5%Pm)rU;E?IsWQ=8XX}UGUmU}5_>CzG(o)67*pP!BEC`#yb
+zrBYwTFS{s<$q9g4TeO#*380pU1P<-qlZ71w8I*D;2Ti_Y;=r;{bacjfI(pc1;P274
+zA^Y&;hFe=p8)MN6xJ6)gT1Dq(BZs-WvlI1<%I*L|lFLVnvSR1z;|J~NPgz$i);_Ri
+zAWba-2>o2))DcwEHTpUA`RblY*uCN;B&H;d8Zx3)N!c%G2hHOemgN1BthJ@3xeXW2
+z>I_kC*{zY8cp*@QqfKcc<6?u*?IZ?Jf)lYXfW6}(J7c-wqG9tPdIK1(Cm-oE-Crir
+zo3xB9rjibE?<1OE)HBH%so%n(c7UYfVTVO$e-w#OG=b{NzVnAQX{Rp{5I?Am?u)3a
+zO+z7K)c@w;jVS|8&*aY}|M1{bUtW+!KQHhUkEbygCruSw?Ee*JsA)*t&Al2iX`Z=k
+ztG$^@0CkP>#rKHYs|5|Uhp1$U{H7N_{Hsf|t%5+sVn)bT@><$JHYY)N@ZPn+rxJ&B
+zBs)F;ldvE6+6Vf(LcCwO8CAwAH!|IeXQD4oqPPe2yypdqhXTBJ)?`?MkRh1G7DPO|
+z7-ciE`*1|;_1_6A5fflI%$#;ILiP5E=X1c@Cl&W2>ojC+LpW@XG!?K%HXIK{ho*ni
+zFH{#R|C3Lb7#6>x*3sMJR10?i>Q0BdnJbUOb3pWniZy%dAY{*XbxbW|ja>ayUSE8J
+z({=mH^aPo;LEGDFw~w*2RgkXHR5<&A0|~*OoO@Z1nF|8Eks^&lr#8D{tJ94FgS^bF
+z-ZoiR*{Y=bR}5|1*?#7mx=%AZBAXljRgSq}$a5LDPd)}YgHVZs!+xvR%a$DQh}f)V
+zmxxDxVjwKj#E`LBkye&ypadfc-~&UHr-!iXxjkb?{P<8vyl6=O$*PcDWRzXK{8*<o
+z$lW7Cn+PQognL}cju2b+k$dMsKCFm>QB}{a9M^}u+p(rKK4sPWEL*dy0qfer)mT@Y
+zNId$h&B3;C{riBtSW(i_$xM0LDjo}UWMy554zZ3=`Mdha@#@zzPbqs@<#j;GSlD+Z
+zRqqo7{B&U|MW2SSm0ZQe;Hoz{1Aq;L?$!qyKoK+(*czWU90|273(Yuxnuw^1JD@z&
+zw#;uKb{i07!ySnUJ3bpS2+!?kZN-ixftLlDA)TSl@8798nUF5<n!$2{glwApsmMyt
+z<5CGPVgqJJ)z78;!V#g(+~p6^U#IwSb{RZF@JXn;h@tgfq!gaw>M}{6i5_AgbM33<
+zBQM4>tFYgR=I`T^2X?K#c6tm@$c4p!!W=amJC5+5mKIbz=QVmL7?2ad)f}6Scl;)7
+z*$Zuj1_cAtp3i%}&1a?V#PrfxUzB0;pSGs;-6v+fQV_B;BCypjYklWef4aXNi0x^G
+z@%Q+N?dNJi9J5ZKisrg^_g?*H%H}2u_R25C{@<m4fhx#~#GI?Rm+xnFOdUBf!;tS!
+z8ilPHG<4mXT~@R$b?Hlf+;Hob!8>ZJLFPJ0ouDxh1^$6iG$W2w`B3-GMyKK|?X4(_
+z3lzON^$pBa_-myD4E);Bzs##0+SYM}C58h)AW;fH7`e7bsY{nAZHf(r;6vI1;{sB$
+zv2ajBewmoP)JFg|3;UVq_<+`**zw3jS{$etUc!<xOf?+mmWpl%#1_HQX$e%RervHU
+zcxjLD+rJrNjVUf)QAu=Ka8~508)1q7vFu^V<s-A|oJOn$cx1zGv}oin3(t7Xqf1C|
+z60WbSpkQGmRf;?%Ivud<jIEvkO>4MgkkTMva0u-z$B3lhKeW0NbB>Erbm4$y`Y`b&
+zJv=w=KcZlen0yEv#<EzVseox*u8hlA*Y>DIYgu)dUR?#Pk6@<7Muy}rMqUiKtx|Tf
+zDaM-YyMmB9wjs^_fZ<T0#qKe;M`tH^>??JESHG+fPaDS_*!N9rGKkLho^T|}S`SNw
+z__&-fp3KRJk=`Ca!;7XF30VlNNyN(${y`zg=#x)vWp}m9MLrn%npY_ueTxl%TI8zr
+z0gbMn8)J)k?^2xhq!y_p$FfsnHCu8usU(WY#n&P`d4e9uQr%8-i3&h*M}6q{&8e5(
+z9z*+rfqO7Uz{eE&%<Po&)l><NQSQJy_UDpUB8!H@kMMg69|Y2oH-Obsv!d2k0z61f
+zsFronL?i{ZVdQPrs7{Sv0&1*FE?Pz+6mSnJaVr&!lSYpP=|7%L5%-+qstzLjadO)F
+zB@T}=l(euSi_E0j=R1WI6{rw4OoO7a<pA10{HH_V4_Hn}Nscehu*Hrj>BLN!d{(HH
+zv;B~(3F(0|eb>H%s-CCucOtXbgO}m>McK>YC9GvG&vxjY$Unb$iiiM@nz1wYuaj$7
+zG8@*zltsfl$x$qvNbFY(+c9dhqGX6E+DAI!sdPqy!hH}X)*kqZmJ~zWt_M1HbdplP
+zNA}l!80HeO^NHJO9B%c70;>|ac-Ye^LMd@xyL9MWg7Tq_%3dmJ?>Chp!y+YLQBAbs
+zH0|1-62wpV>J959=yQ>(_9}Fn`s$%IPt8i;7r`fr{;Q*c+gclehTYQV>x=2aIxaqW
+zpnyewu=G}_LOL%(zI%)nb|DFhA^Kp<qx)`tReN_86Q(?5)S3t+U5;+>?@hgEu?p@|
+zp%c?p?Q7|U@aFHeQ*v4^)i4d|iWC3c1aKm{ss8<W6RcQ=Wa8ivq+yWK6nHmNI0eDd
+z5(;xOu>IXL>CPz!VNfw@L~D%xQmq?!gg!dd-?bhb?>3eJZBuY*eS~Fw;z}uaXlVy(
+zPX0JU!ukv&s`K;0Rnnq)6jQ*uw^4`eI>`8_-zsNfHNFBd#YnCZuWs94-0_=9Pu|;n
+zf@b+Z7Gb$96s+W+Y)slA%p^k_BLVj$sE$P+Q2bgV7J~lJVomIm**QUpi~X&|gS%qf
+zUtO)6AT;1WJF|w9({Mq}O~5i-;WhO3fU{gBC{}?b&2>f5SUJm9=p#G$mzh2wT{dC_
+zHiNl2$1$aJN+MO|)O404B?4%_R##!z?M;<1%*@}W@X;Lj1i?O!F4UL9Z=Z*jMIyT~
+zrUKl3UcwWU*nxpjaW6_fVL_$fC?d}XAlyOyrEzKw{`_<>Gu7q20;$@D4%$?MRt}GY
+zK&d7zbq~C^dz;ZVjX7T2hd3uA#LYim7BU245V8SviLIWxu-gKvQ5x$wr<*&0z3Gy)
+zc}V5<c>`t<9N88MH>az~4segtBB2Wr;DsQoD`j#~k&%um$;nw>2XN157n(5@1p09$
+z`X4|IDl;yB81Oi}@;Df&jT7EiD`T`1N(1vkyxYlrkVJ8gxSWp+Z})~uc;wb<{!u7M
+z1&KO3W96f`R()zSY4%X<;b}4s`C#WA7GCRA-_IcMt#B_#Ay0~TW)Fi9v)B1G^+Lv+
+z!yO;7VwSn9w{2SG3%LarWd_um5F%qLF!c^o*vCe^um~_Q&%zri89W?QY|S~1)S=%C
+zgIzfXK*YdIERhW6(a>mP7RRY=#O1<K`BnSki?0Q1TOhJ8&DR_3cxP~heCjaO8?KpQ
+z*QNX&@)(8_0UnHZc>zW?eZ>55C5@yVjo9G2DKHorNMh)I0T6#=3rx*rdkopH$X6XX
+zYos1joSSxn_Q+|b@E~ko_K;|A=R8b>cv)$GcSlS4thc?zLO&Hq^@b87Z$lL$bT-xD
+zcgSSUiNcHLMK-ZwL7d1SdPfG$^?jJ5H9z#G4PObSJ}=KE`B_qaPL1|Hp|g_o)P;Ng
+zc#w>Ll+X=`YHeJ27RDlzXB}s_Daz*OTL&XOuKq3Wwe~<0QBWgPI||%e$2#lS&=?KK
+zis@mgZG6co5D!D-21xiU$l_pQ8lc{mSXvx^qJS)olKBZO5`@fUEhw%8@%^c?+{+4q
+zcsHV+i1z-a4+#Gy!;Oe4!It4n9@^gu#MeG1(2VYcFvW@;@=m-x5IF$1CVS{;k1nDi
+zb0R6JGW)`5ud2ar#E~n2;V^>q#24sH_EH($=GDydqdvqaj@a}qhB<_R4fyuMF~<4W
+zbnVs1g=muIXYj;HWIk&eXIUGk=91J@DnkKQ;_SMyxPBMB)y2Z->^exCw?H<fSo7$M
+zgFlSSw(j!tu3{p1J~AFnE*Y$^Kpg9WN_>8XpUV^Ne#6$N;_4*vw$oQ$wr5e~Oh8os
+zNNW+1@zC+SZC{^qT)c2~q$mFcYZV()!Cu|*av?W4`1N+yASL|nfpy%Dmf+~dJ(+rH
+z_-<O7T*9}aJTJ!1HG`Poi{Gu9mj)7N8dB-c)Bd*$ZM+KGG<@i-MlMV5oJ8!P+ejf7
+z0-n#He&6o4W?+B6W2pIJgdwv+k=Oc*5vwhV?7|&2Ru!MR5)62kA839+SLBSNco<R9
+z%GmjiKA|W5G7NU2o|-=hIw|9z|3V|Ji>tTF?kYZf4;$Y<vbmKY*Q83T<8q5px*T+=
+z{m2^g7E2XQch7->A|j|?Z6t&Sc&EMBKQjYp7APZXvuTNZj!VcrFF=08fAWXrJ(T^8
+zx;&!UXhBYq?3!GZ_boskVjmRq0v0*Lp70su5($W0s|^BaJ49io{?E@)2pr>tWVC)=
+zcz(R&JPo+z3HSAq1#gxErbzc<>d&H_lYS}*`K(5rwGTq#*#S`vu_kp|UIFa;uqPPE
+z;KaLZ@Q^-kwI`~7cYkC>LwUTu?w)x*pp?M0<kmcL2~(%s3KQ-q@Gu52USYcAYN?nU
+zP3B+7kXhjJHrRB(YyIkVP5241!7*yJ(=Ag<zWD+b|G{z}_3`BQjcbu*^WZa(PD0Xu
+zv)7gHq<PH2r~G%J3p^2Z_}{%3V1Bw#5o*oyMLRs0IvRAku51Y)`=_p>G5kA9m^EB0
+z!()`NVH&+dqsU$?4l(37ml=?mMgbPfnjLv}j6c}As6an<%f~HHiqM8x-m;KzrYj5W
+z`71giS(!|8mAoysPoS0SAb%Yr&0{?6{5hVC<lJWoC8DTj^wZ(dLVd71rWry1>%?C-
+z0-z%PynZXZ6V#y6O#9thSC_Ln_<caOMme46P@p~9`Z}I>;aa@d_wdi$M0GEG2@HD;
+zKO67FLIO5#I5^V;Kt}3&dfVR6^BNOO@J|*!g3R?<^1j(QQ@=3cTnRy@cy>Lm30j>H
+zA3OB3cEUFz<-PpJ-XXDfsNTm;;y+=lgFYMQA4+6&c}5?du8jrm#b`g#v%HrR2w;Ru
+z>^|R5zB|6bOEws$xn5VtHhe#`5FlS~tg25t8o$#Dgihka?*1*6NQ41li(7!|#-jU#
+zv%CWjz#Tp?6f6E@d6(x%JM|Na!7qgMl2F@mBWhT_X>5jR#X^8AHc0hpqkcGKqc-QU
+zwGA*mV9ROT;>LzpQ=M6=T{TD3;1D7FO#>W;Ee-b>?Ehl|)~QE_j(*k*OwfLZ?Lm=3
+zZX52NUCdEnAEoMYb7a36fw@n*HJuuhe%a)v<U5q%`d04E5ZB6z{s^WE{}<-Kvgi{&
+zqW-{v1RN?6ortIr{?m*%>*8(BrnxbJW@#G|D@$Aa!BE}1#PgLsC9$e*)w|OlhSXoN
+zo9appfDuP7?7P`XhX;1^{-yf6qP(5(cZG_(>mc8i=mdlVp-cz(Q_C=$0mvUiU{g)*
+zim<Z`Ao9Dj>T(xcga=K(D6C*2h~=_mDncETvp9I7MO~fo_H-EU+^oqn$0Kn~_&Yf@
+zgm`o35M(i>xT9Aw9Zid+#zgTx2i{K@C_ew<UAiBHSFk?_?7$steIp;H0?3JStYFFj
+zmdCuT>Jyz>#y>%^CGxY4$PHOh>{*W2C9~SW__D#u1wfC0&Z0f-iy5y9%!Ox<M_yB3
+z@YtLYRN<oG<S+3BD%1)>StCDvfXGmD@n3bHv~+|rHCsw!M|3-f1wu5D1`zgYOk$%F
+zOkX)G2gPSit;}}BC4mQpcz5{l{8d<HjQGKqDU42_M`&|+2vB3O<1(P5J&^bP<dBix
+z0`ouqsf%+;AlKfC*&j`0NqIuB-qJrE$>=h&M>1R{>1goby<>nvuH0yMe~g;y>2a4H
+zZ$esZY3Bur*_rE4VA^8gtq}stvQ=dE*-3!ob!-P#u%<ynQW1g023Yq`nIc>|RKKCk
+z-<;>;utza0<8i8Y&0PM@i-HZlKN)er*ObtHMPXOW8|}n7OT>IA@7ro*BMdZIz;#Gb
+z(xVRn?nzXX>xgFXo0squGhK2_sSb9=)TozJD+;~67CE}h(iyECW!)SD-TaKS#{hRi
+zuMRMo*htWvLqxL_MJ987V<7s2WB9#?YI(#DHYl0|eYOAOtvKVIJQ<0O?bZXnl4xhz
+zYO1Y|tQh~vHNpb%G&O@Ve>!N*4-S9VJ@vi&BwEVQ8qruo#!o0zUh@a34<^HrB|p=H
+z2Ac(2-rs0cjug9TQ6!A-EKM=?_fQuaR#dZ~H3cbdt@3gH8|`WfeUPe_Y}j~AC_%oW
+z!V7-UWb1af*f$91>u=i1La1r{=-u(-@?1a`eY{60`3^LC1#qDg=mjoi`mBusM(^M0
+z;0qw_H0QZEk5r>MwP2G-yH>O`|3Z#);s<RCDyDP5;{{_=aprOFM$k~Ae|GfyP|3^r
+zpdlg-T#sgmeAY>rEFw#oAsRrWqPry}pWEU#H2B1v7b6}Q4-6m6?7iq^Ovtf@(Vc9j
+ziuHymw`vH?+;Xt>|GT9)6nHL3T$t~Y|7q%ngbYCuk(8~Dr<??2QAnAC>k%pq3<EXl
+zVna@Nat_dO;>_;m7qC^q?qCljl_P)dwZY%$gNRcQ2pp`HQO$VeFfsbp5bnAm$S_^`
+zItGj%5vuGy=<9k@aSp9D+CT3a$QKJ#Q_@{(c$nVYw@+13(ohNO`vJ?8sw0km9h%Bo
+z*r{>d-QO!|>PBHOA-V4pO3J9vMZv-<Dr!zLSIIdo(>@#hrxsii8Bo!be0`x|`2CDu
+z>%V?IV0WDOr>kO2D9<sa%CKtR%mF+$*!s=Y)VwNT+$}NCS!}64&5l$fds3IO<%!vx
+zZf~NkBC28(bC;T)IJgxK%a>pG&|skZ9<^G0hz%SK?j`8(eerO&yfSAa6@mE?-NCLX
+zU^i*pdutG#ZO87nL4jR+!el7LMC@cw`hz)P05yQ5w0KJtVo1$sN{Ja323Gg5e+|ZB
+zS)#GUU6AdAThfGK7sicH_p#{O<;-J(iF27>Bry2#r@7K<1Z(}|jy?<)Su*~rzbkzY
+zm%LCztZX^8g1LP4W_;<>cd~0t$!)ui=Q|Dz?+g;I{z9*_Hf8cyWa))&pi@??sqGOj
+zr#i3DkvzbfI~3%o(D8}{bt*r>Xdes0hMKUn_#-aH8zL)3$H?FrO;HvClVF+)kp9jl
+zaS9>%hfFcH2#Nijd^u#d+;2l8E6uO-FA_2>bhuY&eX;|dw+}em6L4lTfIJ=_89li-
+zGPq|f(l%$#5`*A*M9DLx%6biTz|)fk^ujH9qG=ZE%JQlwa@mJcdvS-7SC599I{6uM
+z9?vKStRq+rHYv)zV;@`LUsULmW4r@2UpYfZI7{hUlO|JRT10lwb1XOlH#NF2mHX(K
+zZz_ml@#KN;b}quT(2Ktzlv@#V&k@b&(tNiDXrq)Qh0e+S=!-J;RaQB=CytYXB-RM@
+z7l4+EHn>`3e|CkwyHX7vub}aUFut?pPHj0<dqm-+!Id5ffW+jAufO71+<Ug%dCrsw
+zZc1Jbz)k<9b8T)aSk?uMR`$EA0{KYia&%bHJP!*2a9P*{+<MMTR^ou|B@aM0dMjXV
+zg^9nP@uZAh22{Nvr(Xm2NrllcQz=(b*Kf;?(_a|IMfN$P!Jm)+Wkp$)y<rq`!8306
+zK-c?~7mO)U9F%Y`e&-v>+ll%RZ@sV1s`cv#H*pvx|I@5q$iDL5#Y-=@Bt(nj=xx1o
+zw9LtV1C4j?duYt^-4O~_w7e?q+3TTTmcu*4OU@*!vcL8#{bFepb7-^nLzerx_R!B9
+zmGsIUk+8+7G(5+A)Rg5aN<^|eJe$o1mhi`(DWFd}!W_Xb!Z#3Lb;&w0o6vqSCCH{T
+zXy;m9?EqQGkS>x4bn7F@<F+vJdE9+UJvK+<z*EJ>&@g8UBh+Aii21Z?C$rN1KdRn=
+zvC^j58lKp;ZQHgnv2E;3Z0^|B#I|i)lT0So#I}<!_j8_ef9L%JyZfqLUA3yZ*6IdW
+zJ=n-#_Q+h~%~y6>A4>=v^2T2k2kWybZjg&ONk+4isR|TTNGrCP07JTwDPEAeR@Kuw
+zgLQdMhBhzhB<21z$HHh*wZ&atzrQ0~b$wAduX-F^C4sjIsDn<4JJ{d17ivNpNuX@L
+zGFkOyXUSHY*7QrgBSX^meo7+G_iy>zI}Q6NWV*d*JVSZ&07^V9si5?F_9lKRhDCfB
+z1i4SjgS;@9h#Ri&eHlpiLzU(VF|uo*qf-7rvN(^13Gxv^8F>rjSsWK6<{ymZ29Mc_
+z!^6xorE{29Bn2?v?9mCyC{^T)OoR%@yJ*Z91o{q%V_h1@l7g3CfTA{&L3`53)}~hn
+z5=bJl5y8Cnpl2(uG6dEaqelB%iVr{e!!na>w=2wZ*Ep3M@1z#kQ-k^uE&lGZZFr=M
+z3X|w<Ch^GcmLl%m?!iU$U>@<rZ7|<IirWN-&h9%m#4Njra)kPlC;sk^l92<+mWPJG
+zOF~l2XHFKbj$%iM&1Tvz60R}{r%(T>#gQwjU_yU52lWSl(agAl&MfQUFW8D@AYz<$
+zOPbT$Lz(l((VB4)-E0qA&e!+ugzX7nk67|{F#HP|TG7nW1IhjK!pWm}W<Y}Mz3w>5
+zz3$wIMeyT|jNJP6dhY$v#IznH&43f{=d<BXJ=E`k6AYl?Y~1J<tso){t6Gc_7^-H9
+zA?SOno!nG${qn0<GB45bS@%GOr;7N>R8p9kjupJe777~LWUN6yXB5)bL}HSciBX9a
+z!U^`gnckM_$;Hw1VPKPs)bMPeU4CJ{I)F(BYN@Uo!bPjlTFlJBB|ZX@;-)pWw6mR?
+zX@5XwhDpA&y|NO>WW{=K(z9qgrWG=`izfG-*>FUZg0Y4Sr6Rl>5N+bMJD}eu$O<L0
+zXO)QpIu0*UW3u`+_J*l^To*d!g|xJG>S4&#K`OrRfWIjxM)W+|>m^OaHY@Ar*BwoO
+zE*gSh;Nbh{=BN@iS<G}PmjwC??hC6*ij+`{SeMce6Q_ux)MCJE&yi(@3j<K;C{2E}
+zBt^`H#&&?IIj3FuO`Taq7bs+bMkA9#+6pW}9$tpfTG1~S%ItQo|F0H+KNx%`YHV%!
+zF?T~W_m)zqe20YTPdGKS-ZzHi!SH5x>I|YwI?GvnyI3B?e07u(gvV}#v#22WTcSxV
+z>47cr93Qa7ar6=DtCiO8atYJV=AmLF(e-0s*C(c7yDP{#Ns9e|2q||2Jt@tIpX`qS
+zMzMnDEEiNmnJ3fmo~1X;*_1x@rk?f#q>I8jEBx7?{4?xZ<dKKpvC*oPj+|U0yj_2>
+z3zO_XH&f8pkbjZSoIx-yiw~Sn(PrO=G?QD@u8~AIIU)|znpD$&%=dy!<xqQikLf27
+z!xpmJkKK+5l9P?filiyP;zQ7ofX2R0^2B{*hC!0yV&vC}9$W9;7i65e%OV6QPTvpQ
+z91njsTpMeoUv(Y7t#d%~alLP!C73HsuU99T_6pF2s+2$(+i%h6*WzP%a_H*)Y#|u^
+zAK1EXD%+W{X8YE)HTS0dyW%QG^ns6<wc=+-r`IR8N@O~^amaeX{ysM-Zd+~wjPi%%
+z|I5R-LpCA+{hO@(syy~sEdCut)04pL!^D-|;B2F~+X9ThaL!efAXhqU$ZF+S8CEE_
+z<?`9bv!U%5Nl%ljO4D%Cvot1aGiik-SsU+~Vv0B0>z>>SI>-}mdtx`3stdm_e%UUQ
+zpePYo&$@MsFyB&p381aw(WxJIeCea`Z?C!<oRIiIds=zGIPw_3-o_%mi&_$j0?=#m
+ztK_XI9{sEYp#K#`6Uvkih`#+xiA}EnJu^UGrnQQ#|H{p{fI*WElTjQTBy1{(6Px+C
+zI^g6CkINbzAkCTsC@cL;eXta&_-yUdRuhMRgGQPrv9KY@lzXN*@My<HDrQDbmo^?I
+zN>o0!j5gU?QgiYLp^1Kiwx1xLUXlr$ZAKa(ymz*uMEfp)lbQOs4AURrJfAEUs>s{E
+z;EIvdlOtS)^_KIe@wFKV@Ik#;w_7*`koXLmg{7p&rZ~lJn?Q8>kZpf?EVc2Y%c#aW
+zKQ9V9fU|^wKr3Ml<$!u9o^=}br;G2*80e>%)AK`{tq$mR!#d2Fg=pR^aMo@lW~bXc
+zQ}QNczr7&7phtIoawgpKD@k#4byvk}$o(!9EefAYmq~ww+;>WI#e$C(iXAJ3Ji&vU
+zN$HN}617nfv8BlB=m_hdEvDHg(Y1_G)Co7!{aGSpLh2uNI^161I6pKj8hLE{gD4xz
+z(WYj~LJ$lp!y;p<C+wCXQYt!X|NNOg{IyL%e^r>+p11DCbcP|yVA%Ns$X5C4VYnPT
+zTk<+`(;BklTsv%NQfhLUIPBrPa<ONM2gv-hEmqfD1;!%gANqWpZ?ej=H<3$r+~Xdf
+z)tL*FX_&9Ui{z`#m`={K@gSca$e!|eWAlc(xlv89eHc1-#v)GnB3(Q%PxYFSY<|4S
+z;L}vAe92n$Y5Ygl!iNpih8J;$)Y(5U*5Xo?dt0vFj_#Q+qgeS>)m6z7Y}Fd;R$^Vg
+z(;dXHVO*~&CWy?K=^gwiyfur?H)1MNP+b)gr$7omqk`$YgQ%W&8<CZQ7q<bmP+XD<
+zI7@!(OEB~9Q?L15t886n6B*7LUG7f92X^@**yUSSZgg=Vr!#Mxx?*uep#1y{F0$C4
+zS}dI2@b2XwhUY3T$n;?XffY`c7&r|?izsJFIcLEf>VM(eNYk!2nOORaaDU#6k!OwL
+zgWt{#&(%2m)iT(DO^7ZtgVIh7^nDgfVI`U|tsR)j<gKC|N_pjFrLA8r?n6`bd8h{Z
+z!gYW0A*pUCtPez3|9J)s`$1SfnAjZBP^%y?s>kzC8cbh5urwxxCr6v9UXziSGlXu8
+zs8?hr5Tkn_D;oEQH4*s4iwdI?P+d|cQJL0G1;1bYm{~%(p!(RLH`UixgoCT!Aywyu
+zfv$qTYnRrSE_tFnJ2lwDPY)0~C85v*Q(r*mmK_!2ow_cUv7D6T1*n!l$CVgyf!A~d
+z*Im9M)vu1cx~OQ8B{@3m^Vh|7#h@okuQ9)n+ZibNP)}jg$0OPoS?^Q6(9Wr_MSj5Z
+z5rs9L`$*sGKH)0|%)i`Z6hxTrT~gz(L*1X%lc(H8sy7FOg2tE;w}`G0XGWUm@oXhV
+zzzf*J7ro0JJ@)x2%OH#j8j14OlYY=+`Ra}2xrr}C+4mc-(7dL#DPeSetGQCYQ}Rd#
+zJ<vOd&>BC^ixa<r7c~9c@o|QCU_+}_vowGkeR(`8MHPqAv(bRGwj?GlOGxx26v}SB
+zseU><<Wr&}{-fQbyQujXBa;RMa}sK1!7mrXx3aSm$*RclPmX{_Pf`9WNfbhE!NIp0
+zUV&;u1uyv&b`uw%AORyp%?|&OqrqOcSZ;+G1yNjFeB;PQL7}oS{nKDkQQf#XV+L0g
+z;dkx0vuJZZ(Yc=>uVT)^f4XgX(BZuYjkXK%aDgjkc2e%Q5St+2&dsA9K3H4dPx95A
+z;YPb}OnQn;ttt=XW|*@p+mXwtHXy<t$X-a3RU{_UUdz_<2pa=%zoFT8aSeI`7+&{i
+z`6J#(uYDykTG7Xs?w-}|i6{n*{}6ymiE+GedR31msU)q0-WcdnRFFF4O@e9$V94M7
+z5{4x76+9nLQ!U;Ehc6Y=|3l49RzQtDciNSaiIhWYzB!h{WX+ZK9jzb3=93aLDf+MS
+zbayWNDVvS-g!HVH4Vy;|GYa;xH_I#ILRUtmY!6XbQbN>~BC7?>745Frh<o%@SurLy
+zYw*<WGXKa2<!5518`J8++RB#rg3<v#cXERmyc*U=#O6)zl@^QPO@3dMt+XNTD>0ei
+zc&V@jcGFHJ<<?~Qy!%*@Cy|D-I4&7K<@${GbG!ztC|>Wq-g8`AM6b|3H!U~grsJv^
+zEb*}3PSU|*JN_)RUjem;zP#5Hf#UjcA?f_}ParWjRT?1nA{nRK>$eyH+aO?3dUG$O
+z-?J-o0Bq@W+xM}SynBe&j2D;&(*;GKP+qKDY&aSa#=zdIg<XF|<%RJiOnc}F+KAFB
+z%<y7yFSRs`l!)U$^-K&Yf=114G1s1OR}roaolCLuwhdyYH?%j;>YUp3j33>RJS+Qc
+z*3>_L$d$dB8`rRGwsb4R4W)>e#gTu+Q(0+GFYrCigvjS1gr69w5M;~#ej{E?xwDwb
+z9=AueRRpNixssA}@ewfug{@gsHNKc$v{12C=Yn4tqO(3H7PvUzN!CG!#p}Tmj>O&F
+z<lBCQ2M<9z)U{7emf1eejB>+M$y(*uCTAgqWmcTwA<~dxzV{<&gGR;Rs#9qm6v7}p
+zbyvgRD~U=O4PjPRR|mFkddc;y+L+tBd^o|01X<QaY6=*vd@^V9Wm#3Azj|dM=XFzK
+zM<eEjwmYQ_Y#|>B7X3#S=}j4V4(FLwp&%xej{oL#FGlA(52PXY2EuPOcx!w&G=cNl
+zJzLRf>?;MpZ+_8|NjQNro!lGCp7bZ(p=Klx$LC2VyWa{2QQ6Vg9w_8Fsde8@v}zcE
+z6U)^f=bf#*DUUK8iSmg|gd>@quWAxZMZ|z0;rk}2aR9Xuv^Q(zDr{1i$8Gsx{Cr(G
+zvRHpmbllQs9|YoE6BU=G%J~})jw;#Xc<KGepm(_{Q&6%O$l&ji1a0MjJh7r~H$1-G
+zKOw<JC-=%!2`gW;9wMQKJVH;d_)Ri6Qsf>eUj<f#u$RQNG8RiBhu5xGtvOG25P3@9
+zjiG=$IQ*&<0KP|@s2JNUs^e|Xh`SJIX#C0t>dEt&Qnc=$z2WYck$ghG+*iAs<y)SI
+z^6nEq95F)Fjq$@7ZoizD#3r=f(N7#~nJVxL!kp1ZI1n)bM-*!^%BscVo?O~zOLSPq
+z{pYjfKNIIq0uFgs9)s6{i@yjdN`7{wE<X;6z-B?*?-!}33-X7H^p^B&5AW%otoZYP
+z;DP?~L>GO{Oa|~Q!dz5?moa&?U=d-A0=nX{n|0CvKE4VV-Vn&Ao4aocB`pQDG6`5B
+zzQcMpw-LZOY-Ef1qB$I8Ltjun7na$OvrmygyP19V{W}Hm%j40{^Uk-Y2ltnq0<wry
+zH#$BsT56(++5DgIoi!4`I%YKf)uy{2_F>u{cMpUT6q9K-?DVhWKQd@Fxp=iv<k_(Z
+z=y-K>sI5+r2}K+gKdvPuC3kB&FB0S65C#${<ji7#>C2p<L3Rw!xC*2(RG$uUT!d=Z
+ztNP}r+P}InG>bn#H+6FN!czV-O?xN^s`||r?BGg*4*yKiVOOGTzv4U#cd6;e_gj7&
+z7K+xryg$bpj}JL4SBAd57@D7CTgi3O+{-`5vzD$H*x|z16U@qMVK};JgQFF=3-A4N
+zZ}n;BLlvk(H`&bDz>^3e$eqmz8R3X-0+R+{Hr^+;2CAGoe#g-u@&m=8UE4dY%k*VB
+zBb~)xUbyOIlMc(`oc!0?hMPgRKCmB&96x(rKY!mB7JvF(>q6sFwI&@NXI<o9Qn}n+
+zO3giOx#bC=`MmrB+&EsZd;IipP!yzZ(PyvZ*6c-~v0yB^D-ZrjddZhG`t&p$gp#}7
+zp;Muv_bXy79lK;HR>~%v$c^9$mS<m+c-2g}f28=&)=}6Ng$401^=}&mk98JnDB=on
+zVwT?-Q_rgd1-DJ$@i<V8RjCl|4C6Ajo#y7sE%sgztW<}Mt<>s#bd{8pG^phg{iA-&
+zI@|^!GZ8ErK#K@ZrOmCw+c7q|a_x1$Gm&QJOWjfjBFw45^J}lD{?l4tMn=X3Mf$vy
+zPZ`1}w)uTIt}HelFmrPM`1A7pCtu!d0J>iZwpF>s;e;xdD2Ube$phanrw+t2owR{+
+z9nDpqxBzr+lnS|W9GHCT;W+tQ_Vcq3(XvY{(E*qdd7(`E%e{-VhU;x-roEtOfS&s?
+zyxrT{5B|5O$~Gf;=pLU7`=_GV;U=2GgiZ62t2U+Ufx)=JMhDKw76vJ|n2_A}121vl
+z==N?ojaJj0=^L3=Fte|Kpoc#ctHnleLVY*rfb|IRufM3q+*@<t`_rkCK0bFC(J(wn
+z{W->4fR-Q9|4g|^MFhk?m{FGUU}Y_BhL+TDdf)^Zp>w`oij$`a=a+Alhh6S{iCD6?
+z0-`xH3lP}fUw)YTO?X{2ak(uF=Vc>?2|^d87H#T5F=a;hl=E=k3M#HWUxTq*-9D}`
+zl8hVjMjneHhYN#oY>s;KN%?z7ipm!LKGt2;76>l65|74V!|f-e`U^|9$Av_&9x*|g
+zuaU_7m=?GFfM;2dZp`G^b<KFv{p)%Zig0L%#OsMdX*3vVD^6M+1he}ZvPW<|Agbn-
+zfw0Gd-DL{LZ;~v|cvTur!@mdn(!U3Uq>!nf?9ni;&hdBZ*aHpUJ6=fc02fEZb%zvP
+zoRR*@f+Md2&wr_U{;|Tor;7BOkE9Q*X?~9~I~JdZLq14cO{<v+-@74m@eM*A8!(M!
+zK2-m<vJNQ^9p|bv8m;VDUW?4oE^0T_r=x)Do<?S5$);C*dRLcFz)2KMJ~O<TZ4(e^
+zIbS)^Gi@mB9A;rvg4Oc1wkTrSDFR;D@|>qITK6`zHA#r?LMCX<j=0H39D~EMDWY*1
+zOu-4gPbl<qe!{U$14)dXq)jwR4P?Z_JcT-;WN^MKYi}VsroPBqWGWWsr&awa8b_zy
+z6g5D(m23Pat>yw+AnH3C(C|6B>H1Aly?BF7AR}4kk|1%;yOuPF+Rfaly0WIG=H2kr
+z#C`apqXV{OILJgq1VzL;2v+toBrzl;ezWxPa~%hi1VR}sV#gre?4X<La>IMm?4sR}
+zhiKymdW})|U#Ga{?`S^eAEJ7j=aL<yI$YKGkK#AqA_By>kpcs<{BJqv3(Sm*nhfwr
+zWeKicX+uChFbzFJks*aEXc|n-@snZ<Nu&&x^L~#kF$SZEfsx^Kl8am7t1WV{*pY;k
+zuhQoX;zCQ}8M2iMDOVR>#QeN0H_J|m8O27%!A7(X4p1U%s*1&ZD9>Deyzydzk3^FE
+z$w8D=W|E%n0RlPNrs7yFNdPC?E?^^mvWIQw`$c`zFHcon<Ys`L3n7WWHi8||16TRX
+zpD`&iCk5qwF%lred$kJ5VT=k8tF4^cuVV(2FNKj}f2C(HkLHZTQwb*yal#(3w>9$@
+zkdK4Ue~Nt)<YLutOl2{Jl^|}MF5vMix#Gaxn^)@o<9+4K-+16ktwl$|s2s7RE7<oE
+zDYVzK^GHH*b)??<Q=+oM!w>2*CAJ=c#jC_~Aha4vvyhY;`mofhKJ_FapGGs$$gE!?
+zu=GdlhHL|JQG|#*a-#&|{fHf%7!cX!29lVR8pJqEkCAe-6qoNiYI!tHRn%@bY#?y0
+zN5>tj1tL4fI@m#szxLF`sS?&1;}F}A(`p08k{{@wO^;y2DA_#;Az*6sfd2;LdSa{)
+z4*Vj}S|wSBGmi9Sqzj-`#8FhZJ+vlz*r1F)q5Nd}lT#nhUlQcxJykD)ec2x9dw;{G
+zX<J^JSCl%C_%;PFbWz6V=%`Q;%TA`x!%(WH3N2^|`w&!bj8Bf_MV#-yhBi5i$db+F
+zpdTq-_VCmvyX?%w%!Upjh^%*Nk11<edDa&4N_ek?4&wY104|8z8oBVp1;?3U<N=1S
+zOIyKkr;kK_%c{P7uG!mPQ0LG1(Lnf<3;f~UGRFw<73K2+Vcesn4(<<a`r=d~_>6e~
+zf8Afd2;ouTzQJDI&b1LcYCi?89H0*x^zd4`^<1LLA2HN;-48I#bKPjsEVN@|9Q4!g
+zrd9{-=qW4F8yq&#v-om!=G+gd^rNY`NF(k9VaO>Mz34tM9K%`VWtEZ^Q&!Om0$?nw
+zHuRg#u-4am^IViaPh5dM-Js>@>L&y!VTmWrS~;HtKeV-Ilda86e^KT8%X9h35Wyri
+z@=nw-I)d~tJ>#UPy-q?C#WXgiYtCK@5%f-RWYgPdT^jjrYDRCZN-UrTfY2No>(RcJ
+zb2aUHT@^I=VfC!MlW?l15y##Wla`NQ5jazZ4wqlw|4zY9^@V5{EHrAo9PVP6WGTWk
+z3}aTTy7Tr)>qUpsj$!645~8$Fl&lT+sM>tQu}SuI@;e|_>@avs<io-^iiK+kWtA30
+zntb#PoL2XQe~BE5Uvy^X^~5IS*<tSykP;L?q&KgQw2?sKXZPWS3<d5E=GG2{LFDG;
+zeOyZCY3J~dELWkYym)?cX$|8-y3$)<$k5#tP0<{oVF(8mUMJu~u)yY(1cVOAJ1ADH
+zAu<kX`Y6Fv(ojOhjQl0UDscCpjZWqF={*#qXV9H2XUoO`rqzEQ3ZHWKefY;VCx^9o
+zs!2!T2g7yf2iz<`JQe#0x$W`!VEJN}6qOpw&707#^g>E%@XE*G1k31Cl8~_{+WcC(
+zTAF!GFs+heb%mcukH8`&&x*6btorj#XoC#XXpVQIz;Tqp40C<L`UU_nR2hKHocr;O
+zP*|{#{QWli&Y^*6pSPHZxpHl3Z1Ms=bi?+z^qWV|XLRS=DMPY~vW@tQ2X}N<U5^h|
+z6Ntby73Tg49?Ez~z_eD|tymS;MX*6eY{H^sdb}W{+b_tel^((fNDM#v88NSbPzY(N
+zy$XjtX~nV*<rfY?Mt0KQA~e<`Hylld63Doli%;&437RGcWkw;VYmOX@+;Lf-ibJXt
+zi~V-=Gpc>->N3c<TQbjjq;pOvW#;Xx3dOy7WrCk&#Af;7Yg~TN9a0Z_L-YKR-3@L8
+zo2yUwh=16_%_9z)pBw8+R~2112mu<5gO9}^M@frYQpgX<{&5mO!kk(@&NSa>q;hU-
+z-1Kl_AO>8EP=razp?)H25JtP9iIy;CheWXowUv<J?5Of@`*1bP-RYRwydjhTZeQ*P
+zj9CdqS40QA2PODu6M=BCt<H9e+bhmrAnGDG;Uz2&qwA0P7BYK*BqlKxCZHh*bPrvT
+zOzw`Nq?J%7%AuZXmZTwc6OCof$mFE;S?p<z_|9Acp%N6s(lC<)fsvl+qpKKXFF@ib
+z96ZCzk02oNtjKa5bxorC-f4DwxP`1<-5yrg)npQ&@_Pbu(P&GMdtH)56`?ss|I+iV
+zlk(|sNOTW5G+`A@cASr*{@yRutCbR|x}qjjefZ<5vMvb6H+dG4CHa~&sHZAag$^mM
+zIyf1YL4e{AGHN-t*3Xotzh&0?#*|^qn(Q_ZP=`D344-1cT14W2o{hRsg|lX>tKBj=
+zTmp(5TA%a_Cf)GE<<Bge#crzz=>AwRM`J7@Dy0}-WFZG{{Kf|d5x4bkM;W2d^P%1-
+z$g6ne&1_fwu^3ItNaEqGkhd)Yp|awp;zkhF$nYMP%`#|oVh%JuNWYe+DM7Hq0WoM>
+z4&LCNBfR|FUm|=>7r9z`8c`19k?j<QMhtSYY#CQaf?hJn4_z@Flvt2d2*qxajGH=*
+z-;DEDj`|m8gE6*t%}t>p<^8@1UHU=PI_QR0rGr4<r0)HSdCZ^s;CHyd6eGPMO1AyQ
+z%-us*L7Td>5)_w!$pTH&FQS$9N?9Rb?P2i;`t9=2yS`*5n2=>-hvm>{1h*s=(l5dx
+za{9?=uMj%wEXo1po!b5y>;N6VFMTm#Y_YQ*FnOzWfE_vMG_L}F=Z+TgE%Qe#H-7BM
+zfm+Xx`O7^`Rqh9Mhz!6Syq0or+?3x~JyNPS1t@ADVql-hcR|6`2S|;5KX<i<tg)xp
+z*D>#esZ6M8m>?|Os2<TC?I=1(!AKeF_d1G4PyXHmxDHtH-$?+Og^M|6AsXOEcjy8X
+zk5*!9(2r*UCzVGblEBKtl~baT-@COe^j<+st_EiE5ycIc-Ea98>iyFaaP>(x!H0KU
+zkYu~wB#(Vz>D{MvcIC9f8Xk}XzW3nk@Z$7h9M#yC%AQW_dmRsH)so@J$~UP`E{5Ce
+z1%LDqsG6U`N)-=ig`oK+T8M+pQ*>?b)hFx!_Hn|WUNf!#e&zoYJqeiQa<7kaVVf&0
+z*w)g97<hE6msSN-;VK$bKF*3bbVIem_ksuv?$vv4ReHEDr~T3P#&{Lo$dtT5(J<b&
+zC6K?btYda0YxwmMDr6Z`h(UqGRPzL-LGT8$ht`=y+=R?N;su`e;1Pg|ute^eRcEtB
+zmF`}LYz>1&rl5qSG$>$%Brw735=RhctUqJ<tpL?oTmEQtLQf|?8}vpp<}r4~LFg<i
+zhF5_|p6Hp>3pi{vSQEx_p0@H-ZbaU*-ik^C^GU4ThC@=L*L5{mSXSsdS}EJN{TJ>_
+z-F;=wYqGA=gsdg?U^h_4y?*uP@QLS&^sU(2k-z=v)98-eRJOL4j8hmmTlHFZ(r0HE
+zb#HVXc#bV(M0s&0fO79D2N-?JIx;{euT>$taF|i3Pap$)9%Vq+yyK_&J2Q0@uSb-I
+z8bq6~ea0Sg+6hO{VC7z9Div^}`d_%hiE5t?G@S6hwSDUAC4V4w0MU=O_Idd^@4Wun
+zz4JL3w&EY&dt&-uB*v6t#ts~GOjFY{4lgW#$`gEm)Xd^a?zTW7`MGjpV$_9*&_=)s
+z-C92QVY|Bs;hCE|n#{k2U5O3*6^W}Gi8!Im<e5{IYlW>#I)rX1AmfV6*C+`L+>Ie!
+zMX*Cf6{6$ZD*aXVj20IrodZEePRfczV_}$-f`xA|Y(ix76PCx5QX=?Z{4NJvG9PR&
+zm@!Ep6M*|`CV5}_>0R#Fn$GI0P=)(vhzSB15?#W7Qn5I9*@ctqSX&IEA?M$QB@&8E
+z*k`R8jz{3fv^D(cPzsZx_R;u*qL=fM?M(2A;eGrL$(Gtup6w~&n+?VSS(u5L9wX=9
+z>7foE0aa2+6TP-8+uN>PmuMnve4)^Vk1gYmSj!{2SSgJ~X|wY89{>5}l4&bii)vDW
+zmr+Ctl?4)V6L<zF732z56FmdNT%_(OJbwJJEEcR{j#r**jd^$>I3X42v7HJ@X0Va>
+zFrxD&C$=aBnNtahQ%bG$7-g+?{KjbAHU*F{-pC>0^kv-+q>t0pGl?gPPiLQwSLft4
+zP-g0PSjA8-5|;Q3im(pKo<R)W4wWvAsm;5f*-OLWdXc5td6qDw65ACKB7X){QYH~p
+zISe>care}R*tr==YkL?fyGW*yoCx7fFpO$`e`9m0T3UFh3HL!+oWo^*&jG0$*>ekW
+zWHf)%J5V7_M$~p$R1Q8@f}THbkxEJhIjLpgdC-fC7~kD#z{wINuW!ptU?QB3`iC1L
+z{+=F5KDKJkCVyUsTV&^m<y&Tl<<yYU;@yz)j#QUv?YE7jN9lw`)YI`@??^_{UpE>Y
+zvnYe4-?LyJ?rO~06Y&M@8AX6%UMw^mX_+Wj#NEKGr!b;b{GnpllYJR^u*glGgLD-m
+z(y{H?-wK!{ka;s<W;X|~7D1ni=7;Mp%;{_Jt(<H0qdMs_#!g~}WgPKfClo0qfgT6~
+zkTOC#-Rj+8q+}fPB`J^+qZ}<lTVZosns_-wn5S0flQLH&2l|WJjSErmw1YM?htG>*
+zN%91b+vRBaT|<566^aiu6m!xT(W+S&7_;Ot2&2SE&^dTvldsCD^ueQh$5D{DOZsje
+zXSmKw3kwNZWMcH<c{H=swxSc@OAkm^s3(nC4zc-dHy8B+0#AsSD2NfvS_Ln-7Uk&v
+zhD5~7dy~jMaoNzGZ2^AV$Xu_>D^`1|qIVB=aM%@Sli7zB#3W?{N6Jn6vNvp|ZAKr+
+zKndx#=J!%DJ$Jok5KqTMwa%M}-3fhA$rKR5qAQD<D_nvD3GOyrR+C1Y0~^w;H-1rF
+zErO-P&RN$`Fswez3e5>gu2C>y09U#?DI>j&7BbZqfi1VyKJk6@EQEVV@{v3Pl{~-r
+zV5sB`$HQrQG+cojitD}?5zKVKhXre(z}Rxdf=nNAr%Jod>e2S;Bo9yXu{VgEig5Db
+z15ZffIbue|@_<1t9^VEBV42TqR6RJ6C&<8n&coa(VPr{NEpD*LTGD@UGLhl~)3f%@
+z66K9J+(0l(HoAi4fBuOzbemcGF@-Jx$sIYa!p{#+c}MFqcjME4@{vAg3L7MYi>PKV
+z3gpYoMKBTRf|C|~`R=x2I!m^x(E$lQjvN?Kd{s7xEQu8pmTr|oe>LP!sHjTH7qr^n
+zLkF`<{b8-eEjJh;IKhm1`0#aU08aH|64mIJg_C?2^JR)8iQWB&^Ht~#KdE<c_x;ac
+zZszc%!C4bv0!T`}S7Nv7-(^iQdXh|&kdIRj@p~0cS0mUNX~O8%N8bSLt}Um8J(h5C
+zSBlY%HV);Ik+qM2SqM4P^G7rp1kxM_P@5fC5%z><Wswr<WIXdEXlZa>G*DV{$sZi%
+zlY@!ATRUOzTRW%vaLUr8+xf-BvRI1RYtv8V0GQN^pFmd$JZl~Rak_}pO2YA5L7nJ6
+zf*E`OLMPoaD`bAM;a?PZTxS#A>sJ0P(Wx~aEQtZLYH0IsYsBK#>~*TRg5eZdw$VI)
+z^wS2LxbSRj{083iiAYK-ush{2w+FM4xbw>rjE`pXcoXus<3z9mBMlq{{Kj611SfST
+zQcT%lB#Cqc2CQ+Aot{lzY&PLheB;H{2i4n&=I!h7x6VA0YGP0g)jBl#%lxWQY#(Mv
+z<Jh@oHw3YkrUb8kfSzJ<W#@ZOO#x_)jVvU!HzYf-+?*HY0p>(OnXAK3flu_SAGmI6
+z`_A+Z6`Qf*nvkx)orfz+`Gj|9M<F%D*jd9Dg}ON}iKN+kW^_Y;C^2`0lqx4#5MchA
+zzMAgwq;A!zyWF;XBDX{#JFW&ihs&|=!KiXy9~5?75T_(Ysc0EW43Jau76{vhrdwew
+ziXY)}VK13aUMXClLZ&i~W^cez6YwVseu}u9lbcR{Jk~|Zc5JDD9h&YM%tWk{Rndb)
+zNdF$rFY$xhW3`b%g**O0ndtdC&#N)|lt^A94?&?6T>{Xe)LV^}XWoA^Zmn6cgUG8P
+zw_qpbKuk4TdIMudY}z11ZoUS$!pJQ@Id}J|3VJ-(p`wg9-jv`1t$ON_e{Ijv-^I@4
+zDO+I_VvFLCpAKUhoDxS=LT}z}-HSbLKKeN!ZqfYVGDtiOFWx8D*x#{y^MBg!i_=PE
+z1G81&h0ot75$4`TI>vt9Dz>m2H-`q;k5n}Lh#u=PNIv9sA^1euwJfb8hW-OCVkOAW
+zGDN8mAgf`G(LAtXGp^UW`bblAcCDE?rt^6HjF>7!{sk`GMEY7kc8EH*uMxJ|3&?tw
+zv#E7n*De#-A+R*DjOGI+o|+^@PDy?twX3?`lKbK`rD<lwO#^T1f-AYY1%F!XqC--;
+z_2+gNg50LA^lUSyje`0bDd}bUps)@kGS^Rf_;guP^sLtZqzTAp|9mW2;lcMUU>X6s
+zn!~$f%V7nFRcdgAnr(*X7#}mIz6&STgG8|G%`;q!7Nvfstst@0XZ!h$^z6MwH_j^<
+zhE0W&8bXR@&H#h?ghniNow?cZK*e5n*BAZXVjI}>r+@#AT9>2P3v8?TRQIqvU4Akf
+zHPC^=-k)VDf6})!+G0BKV-%dx4^*=CH_An`3PmKRfib@N+uW8{0YCXTHRLrTu929^
+z<}K9M_N`>pTwyrprM2E@nGfAzfmFbTco#th8WuOY_r4d^(NQ;CJImifPlRB%V0QRV
+z8;M?X=5a%r;}1S9x&eb3wHflF5d5K+_gvGTZE0^4h_JCD7H2DE)mwoC7?9YVbF>LQ
+zh-}k>!`b#sLGBRO@EY>&>PF7iEVWw%p?QpF-sByUkCN!GJhaCa=*vRD+=rf+X+3*g
+zz5ce6Pl2)Mvp~Gpt=Q$?y%9<+-J)Fa5WWkwBM|gc$wxd`jn1hoWiEW6(#epl;ZB+x
+z27i~9h&kNI+4(d~t#=6Dst?ayzIR8?atcY=h9!m2p?vp#M>wuOZu9J0O7D+MB63)f
+zl>=gG&%a}{r%QXsfO*q$=KUTn(4}8UA)E)xM4nJi!YNz1wDU7a#MUG=2!kqN{j(JD
+zZ8NF&p%bCDItz%@!Y@W)j5!B;6imljE1KSsZhAZekD_7!mr9=~S&>T?p&Ct|t~iU7
+zrHQHo(u{e=7}Vjs6~ggcFUXzC(Tv%T<Hfa|5Q`ispqdj(VDE)(_%^)AP3_F=&H`c{
+z^&UApX;t@)hr>3qsfpdu&(E)spw|}cvMWJ#Oc8Tn4k~OeOcG6|@PIU!O*?&hd@(m~
+z`%7E312&qHEzn#<HFLqGr!Pm+QSeSpn!&v=bf8Ek>FR(FzHRIi6v^KmOen8qaH`_D
+z^G%oEMGsMdD6o}^ssE)R_v#?@@cN}l=?Q8na?{P0Dsk<f^6Yz1-^Gc7hvi^pbdlkH
+zW#uA31*OR2d>hY6`|&g*mvE!*xok@j_AdM^OsD3I<3Vpq?;ZE$@#mLXi?-~FQ@q8q
+z>IkfIV*qWGZ0Z&Q8jZUPjv5<tLp+9w{#0%p((#1e8^A%6xpX}oRD*?mVHJ72%L^gx
+zhu2F8P%$v90|MgSTgAFD-in-fI$pHg@8zMrTd@tXtcmIl?S%fdzLyf|UjAp4F|fC3
+zj=bjgQPjbN!K{q<Y)0N<7t&Y0(c^$(jTFqPbY<gAeHZ=CONT|MBM=#QLx*Oq5<H)q
+zf=QS0Q(Y8J2D_2zz}KIGwt#6AEci1Lxf#!M$s31H*dF&_gU)j!UibmH)vu^X?%CwB
+z$h*GCCVibi+zc2<>PTKXKX^Xzu;UlCCQzXk%Xr5)n<S^H*@zW2<*{Xy_>sL~1>4G+
+z;>1$TOb*=xO#kGBM#U1{@<38Kk3Y0O>fCmv)qx{j(YzvL(Lmh+NtpA%|LTe*Ge2(i
+z$;XlV5(hs;`qpE6r38bsr1wYRc39Hpo3<Y!D|)%<xIZkNNpiqZ4dXV%<D{Nt1xO&-
+zoVc3`xe|)=OM6+lYup#7gbKd;a_}h+dt*y2pcGoj1IrOv`t>set@}lOiF9D0N?VZ{
+z)z6)L?}T!zjZJdGOcV<dGK8Ot7^tY`HmZ@5w}NC~9+)B;?m4z1F^+Ih=O!)3Q88uQ
+z5hmm26wt@QR8!ScCW`O#9`M1)H}BikQR#QFM@i=$={+l-v?QoAA_uyO`5>D^91+rT
+zsjG0X#$F)$$y&YFkgh~*^SHowlofgpkIa@m`OspMYb$rBn38aw$#Jr9)gc1ETk$A=
+z5(h1%fIZ>3wb?watcD$8{e)6jP4e&?Qiyi^hRL84qF$-7b6lE>IX6G^dt`dAOk(EX
+zUaQ*=3yg8hp~K9W`INqBSn5i)sza-T2yeNj&?>a89r6yB9UaWe?fQL(=c#|Q#R;tC
+z?_bt3(Ws%S3v5BFZ=|BJbvc-wlSr9Sl$g2W<-=f^4n?z35{C5TXguod1gO*$pW~D$
+z@z5^v;JeuIt}?Zi%&hj&;b{Ep;+cigPVfuN0d*-QC}?6uPano4L%eYCAm~iHMGQT=
+zgLmaUVUCtbL@4yJ<b(=YvKT?p;XMjmuLf`h^AtajJJ?q$_aCeTadpxK5#FD;JFHQr
+z!#_eXl^DRTt*q1!He6zKxXZPCeI5T?6xc3ZwA`+#$Ar`w_=F2EX3mir7nn6NTUM$=
+z)&QV5y7tSqbYKr$(Dt*lI54Qz2z}VscGlvNf4|N(zr6zg#Kt%wYD9{2xB<g2%`rBx
+zAbnXi2dn7^q%ROH2U*hDGs->2KXecHJT(*JOBi^`pRY;+0=VxYEq!A!b-2I74i`Fo
+zpF7NzN%FBMjM)Iiof$Ry9ZrUYv_NI@jc7V6wBHZx*{X*sF|{ld6D4`^>Pt7wt7MIE
+zg=#2rH%{8D4>>!q-v@t*TAV^!UknW-^4f=;Jvctg!9zq&l2*vST;b(Q>Y@R09wp-X
+z=B3%gdTH-Z?OC9;cG~lp$RG{wr-NzG_Q1mu(N0Zgu4pmuPdoW>)zfEe&u0OTi}^K_
+z{Ia35Pr;zW&DRW3nGAsXK_4L}GE>hBt)wLzwZ+P4+j)PQF%|YT$bB@s>uze;XH*s=
+zo<s@VN4BmlDP*8*WKbgEX`PrORbWBxT%^fw4MW{KfoU5_RCugjb{)Rnb;d6bXrcmz
+ztPu_y&VBCe%$qMU5??M4kCQ%>tw8zpv|%auOcf44F(R=drQ}j=n8Jt-DQcmNM;u^w
+zq{iM%i;HEp<w46xQG3mYf(#Pp)DOnoF<Oj`;u`|bAz;6T3a-SF<8cOIR}(u5$0P&<
+zk&*Rz9x3!Vj!9$w*rmZP{6J*t;>D7&+yWkdcHxdxU+#_Y8H|w4M)$v^&Gtu^=1N4+
+z;>8Kwfxkc=?zLP0y4wBDWb}6o1Up$?B*v7T%h{~Ehdaa+f6*!}MgHwDc(T6bN(x-X
+zZE4_0Nnl^~f3Q6hXkegq`Z`_pE#lSHm>Tx)^UT58zi1J{rr;)nqq_+(rg)Av*PdUy
+zm4a}?ZzA)(T59_+`5bO6_?*EGw7s4@X`TYtk?GapHh4M|Vs0=*pSuK!_B16-{d~fB
+z*q1OpW+bEB^uln+mQR4P6neYQ<k0e)<+oecl?|F(v~oA&Z^E1F8VSd`{tHeIO}afU
+zOEfbv;AmaL_Uh6Ub9X8MLD*^YH-YYpO$zdLH7Wd0VZ09A)E=WCr5TWP@Cy6#VkeKo
+zqopS0hz-VuEu$xbqpW%K?Er?0TY3Osp@H80IZQo97Z5ChvC#nagsjObO-<KG^vm1k
+z*v6<HjuXq--PYFDH?E_DR|h_wd^gJD`UaO2BouKR&5HE$w|MJ7&4R0-;*LpQY=q}@
+zgADi=>inOLY)j?YGeECe!Cz*Cw^wcro;D_BMD7d^WH1$EFRMDywk+vpER&Lk#L?f9
+z?Q%pD016wb5Z6Tn?EQrc(w|&O)P5H9i77NMNkP)m(bb!cqZ-aKU`E9;v#(2&SRTWL
+z^87dn)o1u{oBLrDc04Btt2-A&ob?|A#D5iK<e+}wtEt4)h1YSNj*{ia`cpseVSg#5
+zACC(Yb9_Q5*UJ?F=iG_2LBg`;$F_w_%0nQXE!@BOF(eGOJCFbt2#I8!n23i_NUdrO
+z_9C-YamFiSxS%nU?RI|&v_nTL(TxdtZMBtuzm^!~ifpb09K_<R7IBbbc_XUk+Ux6i
+z9V6pw%{Gs7zOj?l+==h>O(v_s-NVgeM!$oiTx&HQs|yM=aTgjoglF;R3xfE6f4c<1
+zpdfj?_%rOYAWc4^QXPc}yt{MZzZoOz$$=vXdED~Pg;n)y4JsQZzOnb0YblUUV2@bW
+z|9|#DGB*O=AO0!m$<#s%x$}$bbDXuD(dTB%9QtIHz;xtJd}zigT+=6b`GXHnWjRLp
+z{$gLNsS-5<YcnjT8`4y{08#E>W@MqCh1rAddh_gg&OB}?o)Ly&vj*}9aTN%mAt4|t
+zjKIAR-~=rp@&Bw$_O&tztmgZ%JU^?m;6+<w&?>|Lh0#cI7E#}}cn3Bq<52Er6Z)m^
+z8@<D3eDuk#33g)W?q(-bo{uH6L)R<h`o~dc+v!2Cs(o}|2&I5S`U93rln{OX{E4q~
+z{q9mkvWe9(IAaGV?Nk*u<^TP&1;JO-iLC%D1WJ7bsBs*f;(>4+Gw-)ndj8WA@Tz8o
+zn2&|OawVnT=#!VV@(5fpM}B%EP~Klza%8(c|MVCrA6-3%h}MS|_F86nnpC%Zj#S6L
+z^lSJ10PYbi-S{O8E1L_>-6*!Je;u#?@vc%5P<wgg@H|e$@1GCcB`u&9$}U{|Z$pg?
+z7Z~@=wQW0}0EsB?xcY?tNJi8UGUKpO?iQf_fP{*auN_KNnO)W1>OlREq<{TY5ej@&
+z4{Ap(_<$*sq=JW6Nt~=a<syMt8LD5}9{m4W`ALE0lK_d+m<Pb(d(+BE0Zf{zD$ua3
+zeXlN!zx<~k@gJWQE*0HIaul&@!(+4{&CZil9n?kq#N^14=VTjBG@~3eR{jcN{}V5`
+zt5Kfz(7=i4jNn1pQ2cDaQ+LxB+Jw#<-0LclY*GF9gHZz&fqg`|#P}Tq1$wuREF^QC
+z!az%eGey2V<Php6yMM#a7c77c+MYCcim{Fr&1VraHKLG4nvgHPK_mI!p8|>ahQb{I
+z9ylI6(C#0Z`PhmK?xs|^Xo7w!Vg)WzCmjTcbV%#^r>Xppxm^I@s|HYkH_{yY!_+jD
+zAt@T4d3ng<BUB{3Lx#ok=3Mz@W!SEgaO@qz;zN|gjHE+QNofv2H;JTb%edvXd7=O-
+z?8HP=@q{m)_m-#x|D8;T?bmZML5YeevdQU4swjaJMgCE>yKMr=Q2({w*NjJ8uy7Vy
+zNJrvN5BCvxdi^vwpe#r+C3rB?2i?WfFK}!Zw<=v8B(}{DP<1!qbJzUkbU3F|1Wi&w
+z`KZM8nDpxxdAmQF!>qG}*t;Ejj;$LJ`Sc{dp!hqQg^HJ;qGR+Xc_Q(OF~QBxfQF-_
+zI@+;+@YH`+5B!A_$eH6Vpmp7Q>~XX7NK^I)p)m9zsNISq$7`FUYJ#O-tpx{Z<MkV6
+zEt6PWpjZO7T5N{WM%<^*4Vzu6jnCVv>C>!~Twc^=;HJLl^<<Fy)fk&&-jK^1JaDU|
+z@JOO;I*>XH%{bYOu~w*09<m$=;QbUCtC#z4>?R82Y$0x|_dE6~L(sn(`!$>I*o0d6
+zT>;y71M5$kF09xL)|0s{fy2iZoJY<QK0~pk$!W(ev*kfp+jSM)b$>R;k@rEh$9alB
+z2`opro5JuQ(bOoD_eZQ8<PgDO4h$98Pp|>{IdK>5Gn8v&hGTN<Gq;e1Oyg}4AR`{^
+z$?ezti*vT^_{P5;^-n^phY<NH`>g@#Hg#6>txwmlDNhc=jNnqCBy0@e-p(z91*bsU
+zS)yGrbs{e0!v_Umr32W**=C@qJM|3z9zJ=UN1+Z{h!Yx<aC#+jCtMs6f0>F^d=b1T
+z?-1EjnN$O5xbEV#37i@&LV;)3#IZ=%G;G*fpsy>>&)3+=`G3>eHaN1CDO?aL7*%Z0
+zdAGU8as6vOI|=qFm!qVXq|lu#g$Q+d04py62?#=(dcN*5F*RpO;a_2xWOyC;*z4L&
+ziTR?dGU^bhMs(-maW3?v@sO^ruEALW!nn(JXj*u6;2v)jB8>w>mx4S5C8XkoDqWrE
+z<q!xk_&50HD|;0SP9<XKgi0)<D`s0E#vjAZS8$`Guz#I4&zWqF`Fra)b$5-d&qIIf
+z9I({%B$sJ8{>)>@_nxLly9F(mY5iNA4n*tM14`4M%FdluFIWyB9p8Mk69_*Qb9DpI
+zI>*?R>C^?WL}X-OET%K}y-R=AfRz4%Ntw`;#ucF@2u)ckj7mAQ7DXPyqhy7y*G<O!
+z+%Ft6|Et|CZ?8r?KPW6KxUdc~*B=As%GV}k!HVA@aFh1mqnup=-9#e-P`?})h*?Wm
+zKSbpJoJyKQTa2Q7=nwZRtoJ(fiiRy}?$ZwD#e<^*TD2_)u7g=9-sFeJa0u_W44Bp2
+zZoo1{h^uQu$j^Kurwn<P7MGNS{O7gTt&f)%uc=%iB8SI(TzE4q2Z{_3^CVqaPh}qc
+zbS)6IlOPs4={TD>9Gen#%6Z!SqC$${;VPIkJdEG8Uw6#l<r0_wL45y-o_)s=!dWB4
+z9{RLa8LLMud@4Fxv6&ULY8h3`Rw>Z%oL|$C3DD&RaZH%C5}pzeH_l(JSOf`ZS^VIh
+z;4o4N%l^!LxCABl!G17Lt+#2?#iNdVOP#9A3us#r0N`pzYEPFkJvN-xs@W-Rb$_53
+zN+I0_CPcPe@|%n_=sh-gc{t|^4*IbKMI+5bdD#C!HHwzttBXN-G3TK&g)b%#k#WrD
+zh9KDU6xg<!GsA-RO7iDhL||U`BXb|QyD?ORkT<i!A53!fTiBsl4(+h@D%a^hHktV!
+zhf6)!#|Hic*!a9ZV@7Ab5Wf^l;6D-)1mog+G9kf|%Cwa&MtiQ1ED8hIg8NS@ck<l4
+z5(1I`W>%;uw?Z9<PLW+E&Hf900GT9nC79r41y|d9p936Nu><`CbS(bYqUf2yfYa`{
+zor*?CVt#w#oUf7&?3aL6iy6$#G)UV^Y8YS(*qw(E-p7F?0HjIsBKDt*(`uw3@}<%b
+z^WX5rC`exdbd{K#1zj=Xw<eH-v%wc+eFs8AQqxMjfn{Z0o=eS!{W9*aIZ+rDh~fXA
+zWbw~g`1ut;n~9<GNIPOj8fy_not$W*(TNwJq)2#b`a$ys>R>eY3O_6h+9pDf#mG_j
+z3J`f9(@8VtplYW);GhsSevBXr+xdWEAij%)k9NYqo7&Ob<vp)SgS#}5nyJjRQ`7!_
+zB<!bCqd(=&D?l{12GMc{AUGWD#YaX?&nM~r*D%}cB6(jI_()u?#HgwZy1+T)6lgKE
+z$xe>Iov|a_&6^ohJ9TF1Yw>9kSg!c9MOI1?Gc|k`z9H`9qkVN#(_zZLYW5PjM<Szb
+z1?v?5CWo1*zKH4aY;oX0z@aj%iByQ#xts!jeNKePC~eb`MGHvG2su3*nGHQ)e)>vg
+zMjrd;M|30_UnRfnztH6;RN!w0Xf=$giW*USeSwqH=(<$`e2zwFQS5ar+@Px~=@6h>
+zw3@IXItUn|QuO(g32K5_qnJ5QM^JDiBydL(qXqBo$?1}mK1K-b(ES;0G4i+Z2|p18
+z59)srMLaaVNFFd_Hfr?-^lW@3^s?6wsIc}>P}Km5Ne2T;HL<M>hMI`RVl{??&DKS<
+z0g?fYV7J3ARpTU^Qx1&U32)s_Ushw@B>ru8c<mD`BsuTi6|O1I!Uxdofr}NV5Zrhn
+zf{!K$Opb3d%~85Y{ulIEish|L`57%!`aG{>rN7_v8s-^EE7N=3;YE+l5qr?ktLcc}
+z)LFv);H(`j&867M#Jd<O#>(jjm7?nK6XHRpJqA@-m<ALmoIC7mC5A$G;(cm@PA#C5
+zl$vytLsP+4@GJh;jJyb-3eZ7VlUqIrM2Cx}Pk$>}_7iXCOXW~O!CaL+vH=k?DU)`U
+z<@mkypP0E!IzigCZ+IEOVa9rC53XF$w!*q9=*DW{&23I{`3QU!KSTom56A=Pkj#Y;
+ze+!;z2i4|s6A9V`OOt}3(mW`mGuJ*qpk`S`K}m{s*l1wBUN~jBP88Z1CHhTFaWkZf
+zqD0tWP{!|27BZPvjjJ7$+DsTk`%otu9NrWE&z<Riu`AL)dk57ngfhCuy4<V2^s`U^
+zWeANELV}#6<mY$?`%^|)v?#fKlXcM-+-ewB*Jl)s%eDip1CQRMZEt1KeK=IDY@3fX
+z_Y&Kjd17P+8K_zq+;0>RdNYMEEnz<BRhV$7tdhe6-XHk!$bRN{-O6m|q3_ew_Q>T3
+z5AZ-%Z^5FB1B2X$x!dD1l<86VcVh%_ft27N+-<HT7ai}$9;R%_j>^XSk8<e`hoY->
+zG;J5_^z^y6m>;iqjo5-aK6;B=hGhB1(hklnnEu`9>J}>b^S$cHCYZCqiLcwJ6*Q?>
+ze~p%IF#hPP!RY6KyobdNmXUPlEmIrS&<)Pg^^S%Tyl#hJmTPyj_^n$FNr7|e6)bHP
+zTqPpQ*-TQ>3gVv744)abThj_m{2z1%5oiH!eAoe`mc%yjJSNavWrB9scLfn#s~RR#
+z5(3_O19!Sa^0oLL4E~;(p&OzFZC6YWuCW;m^sw4seob7%{^qPJcub}OY+iYE3BEIS
+zar!esA|69ojze}m_a8nzW?h=z1YlPgTv0lB9Vvv6KT66PVQl)DQo3zD!V<PQu?9&K
+z>)4vag(p~<`t>y?0=U6Nn7_IOxKBSi{}(dLf@h+HtS-=kkD3|3g$IT+fBQaiKg1=$
+zF%}JX3lg6!@J)ae9l*w(Z~aU1(Uc+dP{kJ0z}xttb!Y8UVRVg-*6Dbto?7dX0;c~5
+zeA|t6*UMb4O0O^ChtD~g$L=u?_QwcB`t=*U$8PA(HCB$;Y#u28ZQR=RLsYHN0*@&(
+zt3cE7K4LfKo$wIxT+mz#B)HIy5q?k{anq0c*tQipetJbRQ)#^_j{b@iwU$L{2~Yd~
+zzs3QWK(muU%R(UB8$d;2!t9G<GMQWvtuy|ARDA_kT-(xZfQH~S?$EfqJB_=C0KwfQ
+zxI^Ra?k)-L1b2c2f?KfQ9^4-}_n!NW_Yc+{Yger~XI0JOrISB)O2TWsYflLm3YiQ@
+zuu$N4F=L73_78dFN#6Wg!Lu350Jpt;pj@<?67GHW4Pi}<Z?o)$*y1`TgoTHt@3iyc
+zuC6DD?$#hAD$Km^M4{JpK|k8TJ|kqpTP_X^d`eUIvh{mgM2&(%6DqS^G|(0d+bfIP
+zPg;&o?5dUdid|`&0<Qr}P9aE`fi8qj?9nK{kH$&4^x<D7HTd`7#!4>Q)^#^!q$*fj
+zy{R1-t+tw9KXqbIfvss{R#c2`9NC3$KCjs`4mhJJi^sH}l?wTYK&RNxCQmV;|030{
+zLz#akG-N7mxcMSSG{O}8ku)^<DpwdjS&m9gz1>-jqoBNUsAXc)F~2@BBzrL$+4PG0
+zyN*gEBb?Ek<y*C)iMOU=BluC;s?STstZG0YD^FZso4HYk3j=wywS1WC&L+=WJGm0u
+z?N%B;|G4a5WQOtf#{hiOp`a!wJpOcjvIIMFh}Mw=auQHW)m#4S1t9piQB|wM39m6*
+zpoEPoeqKjSz|zd@N9@2tHxQ#N5=Iumj~c284<|s+N#J-YvU*iOuS4BY{-vRJ%u;Hu
+z;4lX9LQoV2dj~zHX;qqCMO8J>^K$q8mraw-rtwK||4yc4o5d*~w;i9)5~g3F<Mg0m
+zjqv97%A+Wo9}fq=E{VXHf(m-#d>*7yka78vj``S&YYT$0@-6Dm!++Vr`FqiPeDDZ~
+zFWqVF?Y3C<n3K{^<3gOM&#L9JGFVZvt4H%jj&bRlVSBD~hBr2O6ui|U)%P=Z{llKJ
+z7|Hqq+qeUq)RTvjidC2dRj8YAhoGMpr=Ok0aJ*&Ui4-zi*w@&|dJWc8#Xr9-P&`>-
+zfrnTY`uD}>Q;q_003^TMV)SOG=Zx7uB5^J&gjbyKFZN}?hxUkbifx~9jD1X9z&24F
+zMbw?WMkHSkFStib5qYaI{YNiz#DboH7n_f#yW0bzyKQXHYe3~lg)CPhYUN0);dZW)
+zU`%^0=UKh#Fiz4*&uiZn=Kb&jRac1VEZEXo^BDH$8W*D}1XS(5OSNMRW3OeY_qvuy
+zABL>zeKM?f51KUT8*)8TIS7~3u}zPI9~c-gJe;lQf|^}eFj;Q2qGa}S4-*^T*qTlS
+z1eU2gug<rB&eQryYNq4rog)m{fjOK)OIiz;^xiY{`3?&|$KC2dKuVVPFJ+Y2fPXtY
+zL~Cy0BaYG9LyRLVrAc2nr_X)&$Jz#+^z$~(oyysx>CFxshrV(W1nJ4y{iWTMFDlyG
+zJ#!xwY&i`WSUv72iw|%&Lk?;vPG2X%o0*<k?JWfT4s8S(8J$j2%~0z;SIkn^k>Kol
+zc!%z$cj(VQhBuB=Yi58!Ae?b)FshOi=Ary<WRlZvlABUX8dOQg$3Do^l&%X8)&h3n
+zqM8I`s>rC}iRph(3J2X%3TQiI?DH_x&3du}i|2hH#Ou6o>cf4BeT;Mp)%gY4`;S}!
+zlJZb^#X_@(7?|~s^%r0UKjPk%$nyG{*#K<ofy0-J-E1_cmA4991qYdTPe{7kr3c{9
+zwRJP_TkT1~!uhO-Lzw17z(|1Ys_$ddKEd?YtcmI>7pEjcM7ve2K29TyzywI3iw_|L
+zUhRtg{hWNFqXxw^+md2ATN;#6B8Vs?#^+z%WCCc(eR-;NAxz?P15+H+fw-X0hfl9W
+z&#Z&Y+`dVcz1D>2Ao$9ziS;=a;bs_?Q-Fden(xdj*t~q2qCG;ejvx9~AuBeTq+dnD
+zC|H;hu74;y<`<n`$v}aHLEI~QxPAYPkH;K%WQ0JBYEZw+G9<N{q8UL6g!A3*SQ}V&
+z!<CoPr-d349-|UrI2OCE>k=NGo=`-nN0nSx-FUJ4Pf6%M62>;@4ZnC?Y(vmCe_CuG
+zSmYK+fdRTZ-SGGTi851@)!&RRipc%Nmo>fKc~yPsR=AChUa&tK!v0M6G25#Fq&9yt
+zR6978$(8iR*X><QZ=GuL<SIZw5H9RpIbL0y@>dX`mx7#H3%AJ1S<S9~WWYu3)bh8l
+zrB}Mo|K0B{_hlqZO8A&upJ5`*TfexWsoPl?UXZ_>?5O~%$+!1L@{?UjM$@l~Ed$cP
+zOy+d|nG78dOvOv<c7@O1=X-k#6^T3Vb&(ZJEX_p?hu4l@yDEud`+rS`kv;w^ik(D@
+zVwSZ-LqS2+W>l3|-71G>o+~J1@nP<v$zQn68C4e~*N=TPtD~qA%Ssnp#?rK_!e4jr
+z!Oj|6U_Vg<2)G<my8r>Ima7AupMwAepJ@(lKg76??)^{tunZN&guHuOR{QR{?HjB2
+zBq9-QRdCFo?@k8?Qw&1obRyxT-MK*}0?{LfnXAX9Cv9LVmjY!qq|%P7o+=TOrNgq?
+zmd}K`OzCIJKTG_dtwxbnkMmkWgd=+fb>y-C9NxS<Tz+@|uYk~F6(ZUYa@$(rZhQs#
+zbn&P08=b!o)ldvxaBKKGt;+AUCfnBIxm@ob1~$|Aog~7bE34#%cu0tvNZ301ko$LC
+z7YjXc&`t8dx|TZI;`~$2-QI!is!ZHrW3kV!kF1P-wo#8eQvc%!@P9E%c(n=ZbBh1w
+zQkX$sWShfA){kG}GVyTS>cmwDI+P``y+yabLfM|5B14H`r6hxVHe?Uurvmm>?WE2#
+z&1jWh5ZRtjElGNu604tWl#aGxHHvKyje&c>N22i|Ud!=EuCnA|x&H`TJyzkO9FUDh
+zfq0=i@~7L*F0H2HPmEf1I5?`}fp6B4K|cm0_Y}n9u15M*+K9d;<<Hk;J3dNL!V488
+ztqlOxwK)nMA2AlapRoh2pGUiXJMeeYUcMO&;;b_if0d7Z^ffK;J=2O>OCtPlPR|bl
+zO+|x#f7K1FjQ4OciS7lYTIKreOfb2m@LiXBX|Pk1(O96dhvr5xCn$2F@q+oXDRJbu
+zI1kMWP+!F4<*<=>xbjLR5@?NpDiwY)?Y(q{@X!eJT=1hS(aS$$;1vkwpt(;vBbeco
+zUc<)pI1ggOmCIW`)JC_!=$IvW&;QoCSNkuvRx$u&0s%bp6R!XcZY-mxdrVgAeMia$
+zREXvm>3IGASufmib0iu+%o}_Cs1ILKjV#&-;;zy?u)yWaA_0)+M^#NTQ^_Hf;!^WM
+z8>z29C>^S5db*yVH8cqe=3&Xm_)zdi*}6J>;>JRsR()ydYPJAn5)v*%?CmZg`YYKI
+zoZV(+p`dWc2Qsef^2G+=egFWRKb46J5mik-Xl_5L<z<>Wqy$^O@Fo7spGE)XkaEYD
+z#z&)^XJO%-*Ef)VfpGO;7#v39l*rR#$42Jx3WayS0&Wqv{b{*+y%B?#>NPNX%9*zP
+zjIX@e*>;3ZfF6CANpE`9f%R7Sd`Fceq{V%P@^qBKl8<ZzMJ-R22&WfZM$(C^R|u2P
+zZ3au?b*%kcqt$4NcLPPPPbf|>$~n|M<iUezlX4iu`O;dR(@2h0ZNeQC^=u7ov<<Uz
+z&{m6a$6(HV77(uJSPM*x=~JEx;Sv$GPxzOTzC*V(e~eQ)4*hiIk3rgT$zPhyK_Kh2
+z=_pVc|BVM1b`X2&P<*;+SakK}e9Yr^4cGCd{MQt5Zb#>c_613<=LP25vf2TrmbK7}
+ze)d|gi*I+<bAB3FRYOH_oxwpeJyaicqZ-1fjF#TN4qfr2^_$WUfAtp$bl}l2-WZ@u
+z_u7O{|Km4+`RaxL{*XVlHZIXrLj40Op*oy^J_W4dYeyBp3?3;cDFYdY2LbYbBEBVT
+zpk`_}eQ~XRUt?KlucEq(q#5=&j(`TT6fz2uba1bMK*2p<Rr>Sy_vd)*7mE$I<P@{9
+z=r9<(+P>jecxZk)yto2Lt9J`WEL)^|ru`=PAzTbUdW>-#=sUDR_|{K*M(E-;c4$rm
+zChfuHMR+a3mrR;x9i#^ou~pw3(~CIIW@Q(}NW0rmBOiP~v^SL5ukP82$UQX4zZrto
+zo&@_Kh8FpSKOj>+Evw}JzUWY-&{e=-iv4m<uYo~QCo-a?nLZA8J|w<5(VDToWe1Cm
+z24AWGVMG`y<)Ou2daM?`!izx<CV!@?yLcF`^&Gk7r5yAcklG$^3g-z!3WA2fQ)o3h
+zL4o6$;qyL0f;!CaM8LedTWuBc1qVks?F*V&1Bbe1oc*72kOt6fzRWa_dit=zyRbD<
+zHZd}T!jt={5X7<qn3Vr>Kz=spVJi4;>tp@*8U$$H5&ed;e{kXn^P&qZj1Ok>Ar;Ja
+zqkS8NHq*j@=8~?*RGWd`d~PG5dQYDZKSd4_oOPEC5etlWgn_u~Cx1xySvfp9s&lU~
+zfSt1C?muyJ7AO;BV|ehtixoH!@sQ0)fyy%DJHNS7Zl`(9r161b*+v5}GnMfnLUxRq
+z;IdY{`Ye*)|C<;O!g|==0NlQAD1FLAAC``^Yyl(|!!IyljqSOKhpo$j^2RPb3W>%b
+z>_-}NKW(nEg8nb5mv`Uhw&g95ryMCJwsOT2NBgi&ogzGZV8z6tef+NL>)Cy-rlq@%
+zR!-auDvRaj9N9_bEju0TI>WxWm>t;PL{(%HGpbB8INA;tlGn3JJXB2V(CFErL<#2o
+z%VJRhIyCS~3~qM!ux@&S7~3XB@Ce|5>g#@A$9SSy4s3REZXA=)Qc%3J`<c=96pLB}
+zbSc+i5{k<5cNI+saUI8ZIXgJE>z{t8jKWhE4~h+buv2v9Q%+ILAw~OZ)M>MD`7rL0
+zFG<G1fyvT!S9qq@mw7&jYcLhLVL<naNHD|gt^_t#Z^K1=PqU1gjIu$Y*+}A1E<P=q
+zLx83=MO(Jg%Q@UWl(pmhzekNIMD&QGs|=2`>oZU4sd7(n!;q2aTXkhTT-wDJ+L%Io
+z8q$THk0QPv&C9r`8Hjz<Y$U47YJKT1p;SQ-<b6F5pW6%Xoq~_yoC?}1B&k)iwR~wd
+z9=OVj6n+lP_YNm!!1aq|qA<yKAz*vGtl5kv3g|kZ0m9R2jx$Y!OQW=)7}R>C)K_EZ
+zV*n)IlfxSa+pAb>)6z8uzc<22B_q5@`9B?~ifoD>tP-{vE$c6JN`q9pG2_m9w(X9d
+zFbiAsBRe|61dg1F4T?=w_3O-(mMsn9tNRhx-TlqN`Nq2apf&}2oz=u`tt(;3*pHlm
+zKr1s|n=9Nmzk^4WIx7&W{d$0P@y6yi7HJ6&tm-y%_R`K9Z2N8wG&tfaB%3Iw)2fzy
+zgUEuW7oKImN<CywpLAkQh=%G6S%s>|@*|xcd?5}D0%i;|6Zd9oh0|<vtFrz7WWE5=
+zd{;<5V&4G6X@5RKn#p>#-rerlZLP-v+?$}{-SOzfD5c!-4s$rR{~Y|BkdiZ^gX|~j
+zo#!o}U#+pV#`3YC^((<Nevs1)%B`{3t4t)K<W|LAUchM^kIIKnQ6pD=t>?Q(PBV)x
+z<@<zrpC5}B9lTJp+;Lc=$dLE+eQ{5}U8@0Fe#yT|t{jvln&q!?-HY0;yB&hZ(p+b}
+zK)NVQe_-sf)aK1fG4d!I>UWBCgzHx6{}ta*poi1FGFTi+j0@M0>>L3PD7={1_a%$!
+zDsW5<z#BW=*s3ucvg)xV58ug#eRSWE#QfRK<L)QYAp<7{M(($bgAm}93|yT}cf-ZY
+zqlwA~hY(>}tiZ5s0*QICH;1}Y?AZl;{E_kyGS2-0hhWx<yhCbe<}bH7hhIo8z4|`)
+z(Bn0dPZfTq)c$?$4X`?=)n#1N82=uN3Mh98yLC;aQ8J%d#1qFX6ha?Ux4>^A3i~G<
+zEkFGYMt#D0=2s#loSK2}T!gANjTF?}uoijlD3knWM93#e;jYg5y}qw6@5Wkw1(9rH
+z#vNwp$g5Hb>)0NON=N~kTjlY%#85V?js@m-)sKyVdPV`oh32ny{Bz8Yf{r8{N9wJ3
+z^p;?tv20EZh*c1?q%>&pLle}tI!mcpC2Z;}v%93e#y^nesSaqF1LC!2z0FChb;M=0
+z<kdqEe>9%mzt~@)xUMxIe>~&a9u~wDlZ-U}#+?}Cw(*{vNnO=os+z*V&xs$`=b(Uz
+z0O%9uZFOJXq|tL+DV=`W5?{Cb@r3qM@MG~}dRz+Zx}oJ$MzmSPKCNET^M9mMe_DVJ
+z6+B6nBh<j=vj1w#Cl(P*^xlaosKb5X^p`CL_?T#`1@Pm(tTzylz-MHdSsItq$Rqn_
+z9U3a=6M&Wk6Rn12u5MB@Xdr*qt<&Ak*9qO%$n3+EH4Zcb8)-72pb9E=?{5)bi4dTZ
+zg67yZvDj?H<@akGoBg91bK22JkeGm2xODF_a-CD1hSV`$(l%YU&48#?L+{bC)?l#&
+zQ|LBVL6YHTq|Y;LnKEaM>dHkwb)_IGi*0Z;(iH#vgGyx3RXRXUxKxkR+=yF|2hv}s
+z#E?MkQO0LlN*_tA4#bSkM+z$H-&k(fi)q$8kz(>ltr%g{FN?&2X5MrqKIDMF;vcqW
+zKGu<t*5zz&yo@1jGd_>+DrvZh|Dc{6lt4`cNZ%I;7Y$D22R)CYodd1xWcU>2zBDq&
+zn|Dvo75+&eQ+FakUbgH%)YVokeKubp<i#dHz%&()S$^Dt1Z&>t-2FhJ1Zr3kV01EZ
+z9y?Xdc=Kbjiz=bm7wfM}PJ+R21Mq*F7aYAPrs%=%5c(En)5r?TP`K5F)NzPa$~obY
+zXF1pf-|1oU>o|TADCR?y?w)`S$@nuhO}rCC8OfFaA{s6xhun|5IZGe7WL=BLQ-rN3
+zK@7#~Sk(I`y~y=7J~1TVW&bo^NTB)eR}lx!BS5IJD5!NKrzVch`zxEuO_9ZbGnm^m
+z-t0*QJYFt#Osvyyf{jjQ8zHz%qu-EKlme0A0;!|4664yOP$Sw1zKp<R%7_WT!Z^e~
+zJ3Hr`s7{`K7QvaFPgo@M*4zc@KLE+n+Hfx3_|hBRIyU)qP($N0jT`UVDh_D!YE`Ml
+z2g|9`ebLM;_-!EzU>tf+rApp0SDQ5n7eW;GPmtc}!8a-a@2DOxTh6vq9}OUDm?41g
+z#NU{jXgw|9jMbTYKamOs{<3=cIUeI}XkoZ0?eGIUvB?+7g#>MKQD##uokk0b=sa(H
+zin|VKX(h-EFhnMCXP(Ss#VFv%KBPxgsk?Cgx|TWyl0m`vcHKWa#w=#7@E)h5&MANQ
+za0u9V>D&!lz$Ri-A>IX&l-_e@<9uTsQK54g3>DXg!8-T>pBY9WQ5k%h24r1x7>=L+
+z)5F872((NA@y0w}3|)TB#uLGCf3pLRCQd??KOpgGxwGlGotO5wjB>s>d{wlCQ@88&
+z5`4IG33fk<X$6)_{rr;;uh4^^rXL4zWzO}yv-dd{#~#Y#LvDtNVs(EZZ~b+L^)Xth
+zr(XFr$Y0?VFG47cT&Nbq;EfBxa?vYv?;)0cA@<%WvqVFJ;B~U5Ou^2mX6E5}pcl@H
+zDkp$6%>rVCJ!yO|QH;@r8DKsxYpO=nCvh3z1dVNeF}HHcP_?TO3ucDnipH$4fR&d8
+z@-LyJ_5URRN(9hV7yxfOvOn$_tY$;~ttXNCFQ_g@p#>Jv;!8IvS}m@GEnGD4*!L@&
+z5u-i*Ke}TA5$Ma4<t%Bli1NyZnrlS*hmp9Aw?uvojX$!0pHJ^wHz3`cO9y8reaG@_
+zm+NO_f{%h7g4>d&a6|(Q?)p);=92?dX^KO4$J+yfL=K}q^&nFsNK4n92lH!^>ov~g
+zmjG0q>>X~<S``)FxpB?+;1eCRN=thOOJi~_J^|D^tNn$u=aU9dt6kU3Vn|l6S}0Jl
+zH4c;>JSg$%T?1NY`A-T#1L)|beo6KM?5EKFScxvIr%z|X(HfV++Sy~<7>hK7V`!d@
+zblZsswp!VZ3=SF0n+)f|urj#hzlX}=d5tD0-k!{25pN{J(+gGT)qeg~NbL@LbG#HD
+zGe?jubk81rj1f`3Xsd94Su!<$*4w<An94k7`bmHd09)c29SuHL`PCZ4NgTzht7g=z
+z=uPkVNuR0|+uNy2D1ER#b_5j(V(2{Q8c))q$0Oku8pTB|(OwiTUS4Qi9Ccfo3XYVL
+z-XnBaA*1<0`OoLXO67k*5)*a78B#utSTOJpH;aj4<rRp%cXqSYx_@geSKF8*MAgQQ
+z<<G-~ZIfjEh_ikDF;|=uVd&+_M*^)C`t|XLh*8zocjVp_d>w(h`>gC^0d3y&P621?
+z06bvYmU529)Svj|_*j`vY%1)Rp99>H7%8c#57n0Ju2`3EmMv1T@?UkV<{i$cBe~kp
+zs`5kR!IT^lS+>00;}JFLoaK&>>Yz0R?Iu?_BuJK+tRHUB+vaYaF<HFqa${t%s+?O{
+z?tg0#WPe|%$N<Y#$2}9;hF4q>#_Slg%K=1f1Y)N5xb-^QDSN06o6z=_MP3`x7Ztqj
+z-!+hBQ2Y9n%{N3GCVIv>LMbvn5Md$0{`g#6f&Xd4Y?>l!?f{cflSJn?{lIJ~4l|<E
+z$|o(Z1WW^MZG7ST-<a!Ju-cCNISNKLynl0TWNxiN{?{6i@>I6r&|t!5%RL7f*Rdm?
+zl{jzWUit4Cye!=QoWMJseoH`V1&+?R8{8j+oOd5+B9C!XVQ9`m?mBqW54Ftb3SfH!
+z3EBxNWid?u+twC{DW3lU0{TU=ZbL-kPlnR{RF6=S;+ia_Lcz?2?ORc6Y4~K+Foa<7
+zJI{Ww)+TAX(<a&Bb_xnX>*8MUc(o1YLe8AC=MBtLfw?Wyq&=I6393jEjC6gybGleu
+zFQhJD9g0$VPSq&b=*FcP`}+D=eOmL<(<c-RDENTG_c{Wec<JK9AW0owUVPVJYSYvl
+zT`-c`RO>;Ge)gxM!OA<321lpr4h4prRt^rpCWw&qA<Xae`T!K}y-9=EG|!GfCa}$9
+zjTfi#y{fPBCm>toD%@=EAGN4w6uf~4=na8nquf1wE1_jB!<#B#nd?|3@_C$t);&-2
+zH+<>|F7nzbZ9MTl>w;4J9@2VLV<A?fnP2%8Uh^Bq#U|T`!omBUuQeAlLxRQ8GJz%Z
+zXi*C(V%Y2iYme8`$$Kcrt5+PAG-hJk)q|ONeqv2L_<CCuJ`3nNh$chP7eX~PHDNkc
+z_7cG52(s|DAq6Ht^|F8%CfJJv49rx3(Dz|lxKpeifVmzSspV8>N4B`h(qH-IF}K~l
+zh`TNjrYVa$bE`w>7xD77`q-y%Vzu`@|JT(v{1#!5jm_^zbHnz--Xe444f5o(PxaS4
+zXsgUjaC#u<u2^b##7Qv$zXzNzyI-X|?l5K0K5PxM<cW7t6EDQ!#h_a`?c-d~<$7Lu
+z2Cw>}-n{ani5#~W{t>B>OuMqpR_wdD$kz4{;0mWp7)-z4CC7;9HngPPCe^VFt9rj$
+zwvjx=tf)KRe=x6xBB|x|&86T%GGt6NeLm}#R$yH3VL&g~J%)9D>fFd8fvzDa10~0@
+z%jIW|p=+k^w)0H8x<!q6NYj7?-I978(xZ*@6i21M$;j`2d7mXzVCm(^rg(Of<YJ>W
+zv6n(->_?JpXkv=qXLVK@@fyUsQM#}=JCDLy_d)U7)ret>$=>m_mk`6;HCy$qKUrse
+zRNLPul=7li&h8oXeIMloU+#2xZIvpy^n=2xNfGP<2o^-HKyHF}<mR0ZSeyh*kQwRC
+z7l9h7$W56m-~Oh|7keIJz%)ACQ?J%I4NR8XQF7PK8mS!Zqb{-{Bm7oLrhO<t8N^Me
+zB?4iCN7W%1ua3nyzJDzE{D(tFX>g!$S@1g~2_pe^?$aS{o9=#8)5w?A5Qjg)U~5a<
+z_79m+KF=>CBOL!x_a}oyzW~4mC}59ZsK5%RaClT>ogyvsNV@PH#}34OS0>ype3vD?
+z^d$$P=CfaDNpmRTy8Ke8CqELWpc@TWJ@zQ}xi*loQVG#92;Lf|Ldn>El1@!oEK+%x
+zND(xjF#op232u!3wZFij+HrxWxOlfjV2u7$qjaK-0boJsE6B}Wwjp)pGG}G2?(g4!
+zPJJlc_B}d7>`_yROs_*kH3B=jkw8GEDYtXSqDFK206NavsZ5n0m9di7-lLl`ILBOf
+zbPfoil(~U*5lOLP)f^o_y4=1>>fgnLx{w?r-OtEx`n%{O=nYy<g;Eu~ZghEA&HDpQ
+zS7Yq0B2*%=_=a$niRGf(4CzD72b&j<2C99@NSL?}8IVZ@5MEUJi{eyRLki^Mdb@_F
+zy_L>C$Tw^ubX~g>52aLs;E4;ke!qTs-pws)FWv#Lmp7B3lR?o2Mz|s#=g1-Tiu0sT
+zm<0yr&Dh4Fewp)8bQcHPF}H9u1a7l%;~4o~&_~Oq_Z-J;e=3cIt_|u2@}qGzTL&NX
+z-JcJixSTVOo&IfAB*y!Tz!&VmO{4Ii?D#Zmv_f;hflrX@Pe9#M(Shr%w=d(p-Ztyj
+zNe3!xi=>xEJiwG4e;#g+A2D`xVz<rSU3BaiA&jW~5?_D_u3Lepfnk_PCOu_T1kkq2
+zco}Ehv-edF?3Ta7fMGz@z&&r7NaHand-`nu0rk+fDI7lfm{I&TrYKvRK!jK~w%TZo
+zjom4`k=&*78^e1Fblz+DMmZo+6YOHU(|b6@I~tNMXL88EF*$+nf_)l>l~CeyjllR1
+zH&gg7yx<^WXaplUcV~9niS$CUj00ot&G)}N4Zsxdxrq2>F->sEW%*O7;!M-c@t6?b
+zr}H1xJ%%&`XvHuKimTz@E41arf?Bl)Ia(ss_67_cS7o-Q)R;fhv@Lzcd%NQvS?Ra5
+zlwY{7EF(jU{QRvzT9X@@Q=aGUzVpiL2>QMqhKruO(Zs>>6I&$z`$DuT#R-~jZ($@f
+zvueF)u;qkDb%Bf;e+qU=0zKSmo2t>N;333b$}n7X@Lf$}p9-qPat^I6BEa{msTuM3
+z>uPY<w7AlXB45ZyAUds-Hy0|aOv8|7L~H)`;8}Lx<f#1LyYuJ$`+i%CL#ufgZ}q$9
+zf{S<F!QChoK<ACH;A;C4AQN#w38@Q2=FQYJF52%SseE<okqsnKeB4EDw<2?#j;<z;
+zu&IbRZ-Q?@g+eB9<=Cm~(?#XsAk{#@NM-6gK&w~O0!qMzrPjg1RoY5@<5aQqbf(>)
+zngX`Sa#E<1x_`90NkCA1A3uC^dwBbbbxM`cu5(aPcq1M|3Exes<_Q<kV-@q300L31
+zC4$4qbiIM{T`vF||0#|ZU74%TBrb=JpTzP|C4e4igk8@oJ8plru3Y<dBq8y$%tDr}
+zv}H1rVVZer#{JDh-3Mfa$AO6aa!i@Dv>H})VL|4%qGpd6Swp^0RX-%Ly78hiRiF41
+zBEQUw7nw%G2H~W*2!xX>6)vqs%a>1toiEYAxpRJ8av<&;X)eK_8@BwcmENg(xuQ(D
+zPWKP83l}{C1X_jS>N}%(<!Ymu=vA?pvC)&^*du)`gEGRK66%71TC6_qi3^Hhh64k|
+zR^mY6SUkA0+3|$-OMV;f0s9DPN&_E$QtFv8Uw#lmJ_Z~@gs~-+;u{I$K`QjCJAqQ+
+zTGMhsu{7<JtlO}OvbdhsU}GGzBMkr;Q2tX#O`0c276b6QUh?$!Ku_iX0x`6#JW=fM
+z#&La>Z}hdE&(>cbjEKqE*;U3Mvfu>#S>}CFF%DtBsaVQD*plF=UK{&$4QccsLz9~b
+zpgl$tj*fMqlsG6NIQEM*%QkkjMu3aQU9Qs9+vFX*SaBbZ3z0u$5RprdSw{zpT>JCt
+zN9yQDKmz*`Qx{@fj^Sch*v8gfPDc&SH}q5`t%}QY(Vf3@02|4mH!Uz9-|Zso$L7$t
+zJd=~)Dy{k_o3A?Em`Hn_G2I5f44QT#fukz4D=An-nzQu0s~xNh3;D&ZcxKoi7>5Q*
+zY>RelGgVYIA&Eaf&t_OQi)^}Gc`Du6*|~yzyYoleg|gD`j>&@pS4ACDQ!`bvkxji!
+z-qEP7Uyu;06H5l{kapiQ!b3peAe}T^RcZkkoX)~fTI5D@OAS9K7B+h%8xEJ|!&qi>
+zwkHwqb*K$X?W*TunwiJ(8~sJZv3jfuNO?fO{@l^E@$>X6J?PGvX}=Sva^pjFWO;Z%
+zJ~>DxrJWIpk#Xg5@>J=JiQ_=%KJU_uJu73hSh3V}B5;Y)z;n!VjPI-hTqnLk<oKW~
+zcQtZMI;V^F8E?eMu#%OPI%vb4bNh$C2bTQgGyCbcv-joIv;q9DrmJpa{wArf@BAKr
+z6Cx~+UyX<T>h~4tCS*C=$MfM1Z+__XcuIJGK4$QYc>BET*YPy3v<s7O2czusrrPU!
+zzsRmW9(i9JJ^IBA=XoO7bv6U8N9+nhO;iRbe@%{1kg(Gx&N(51-~7FXL{-!$@=Gm+
+zQgZ{BnvMQE#1D(~YQ_K1p|B57U%XM!s2Tw0lU2nECH>Y2%@2*p_=6oZL9WkLfzqf3
+zI?oM*D@i=KkbpJ<Cfnwkj#G)1;@R$k!UBolKI6&Y!kDnbLmke%e}KN*7#0q6rC|xu
+z`LeldJutebAJH(G6Brtb8qyQ}p)RP`%FlVY#c6M?yD#gpkFaidIXLfipRn~px_f9c
+zNcv*lxqIl^;FbTSt}1X8n6vnF>wV$h?a7h5)JW+4%OAgG-3P|+Vq~n=GbtVwz9~x%
+zz7}e}HrBf`6J3*SDv3Nc5<FF0Iy*!=N;AqB{-sE(BM%;kkX*dyVzhwe5Q<UxJ^d21
+z#56rxuDsZ>`#Cz!@b)L7c)ey02=t2<0|~4vq^FN7;*8vfz~0zq|C^PS3J)&{Jhd;+
+zYGN+TE%b`#c2-@qC-$yWaPw^CLD22gVQ|Z{!I)SjMG25@eA_1NAG+S*@{UYM^4p;!
+zSJ*E<3^b7!)X9e{9y*~`G!Y7zf}^#tPY#br59ts0U3t$Wp?rH=^9C=7-5q<(J|3=Q
+zBoBkWi))#|SVooj0BpPcDhx)eL-^S6$xd=`{)Lg?sUoIIk&In%WV@#%#1XRp1se{m
+zfouxLIS}H(n+m7FsexQLyA39ZurSRGr}Ya+#6+WD$)yGTgxQHpgej8&j?n)8|L#qv
+zl=)?W#Sc;FOgP%c;SRye`~CTHo<HQM%Z+3Ciox+Z#Uf7C;$2f#ULTs@gP_vu#xUy_
+zH5QU2MBDWnR4<sz^H=*PXq;IM!;=t$zCjzDf};)ja-nwOPge8i(+n@zY1J8Vd{NvR
+zhd=aTQ#?i7h!Iu<!t=h3?GQX*Lh#_I%QM9KzBUFTi;c`rQ1B_As{<kdWWUvHfp~CM
+z<C@{Ieg*CELq0k?06PIA4dkmWP|%yPVIetq!>8ihYlIb`a@w39ziu`(B1Be<(}K<H
+zq$~s_`mkdnf-kLZgq+>TZ~?1Kw7UnuE7Zk(3rK$C=#$-Y_Rabq>(K%2aB)H}{8wL;
+zsW<C-SRZ|!&X;R8iY&&XmX^9weOoVw-Fq6JOj;jrl(#w3Iu!cpmb%1hf5JeU+0@40
+zARDo69`8_jlop^>xlX|2%d^?^%6@0UE<ttPWt1!#jfl;4><V~!@v~iNR%|<S;XnAL
+zL{2N`3RPiD4}P#Lse<*LGWwpCm`aNQ$R+t8NcUwMo*lW-Sa-}a((8dgGW=Ph0n8eI
+z_l1uHuKno)+t)^Jk#Ke|&SV0<k5|7VDvZ%bBLE7Y84jw;<a=ta%3@f<x&qMr63A=U
+znFryF4%6qZyc4}S{sw6&5}Xtpd~BeS%N2j<{%IzfABN3j7nabo0+ND2aAG2R`&7k-
+z<9V?rtKhu%l+94y*%OPP_ejLIm#Yt0umo+Y(<k4J0++T-y^N$9P4Ks@aiPS8?Fh@e
+zTXa0zw_Rhn8E4~Nnyiab(O)b(EVqU1@A^O;_q$o&zmP;mhk&POLlStEo0zqA-`h5V
+z)B7;324qwvzrD>XBw)dMlKUC-T+q@k^n*K=GGNao-i^-hmn9UY1}9=lMO>?FnyJuI
+zW6)hysHEhfRb?L1r=%$`?3FwYIK5B4Mvw2nH1#nh;q~Qi9oXS|&xib*HNIao6Ay0?
+zbi95g{q#F-r64T{Cn7o(Amk&6rtXT+x9ya5e(&H<N-E&HS!>;?=Y4+eTvL$m0p*3(
+z6}#S559<qqYP)j9o2ylAB1+=aeaSkXM|4}#0UCd9<X<4fZ%R-snAE7hKo|+#D@g9a
+z{As*<%+Ah8&#2#l=f3I`_Icg9X{*NnnIQwfM=$TGj=c4e);`09C5v9gQK}F`f^0k}
+zf&;(%Hao3V$pD#iFi{AoxbDLHl2f6Z=6O&e0UB}n;gy?j=9hpi86g)3&7J_O&$2s3
+z(kt@~37^dAHhFgHIrsR7WPuEtrT1p3MJV7qMs4Cj($x>X5u<-%`{!T}EnGp>jZnwk
+zQ$r)6VL(O)G^4&3hBZBdA*Usss3E0)Zu0XL+wHy7Sgm*?p2*(T*p#*EO!|f1T{`rV
+zA_Andh~$ybyUy=kuKeWzr<vHY7cyhsJGUPE(cJ}{;!coSr5%!(4<mhZ2Dz@^5q#FJ
+zH930Rzn$oT9B!pQV?xT$@jD334UC1k`EWx(kF6h8mh$RLlGOLYb%IsG6AI7eIU~Z6
+z*w0HE&uS=)n(oJ)@+LyFpwjRwQ<>6D8psTWAkN}jq{-(EoaK<w?P2RLNKv#Y%gWSX
+zN+o^vBHzhl3!tv4i}fSw#$t~VJG`)@7|#YbhmrbCoDKJQr!Jv09<M4JYb02!`IMsd
+zsUL^4sagGYJ?dv=2JdBubFI&X*x!Mlxt$W$3<X+xCgKoGlR5sUg`Dn!@+7ICMzZrJ
+z+X2`#e|#H}Yo^tU6z8di;TTES9~-Bi`~o8#{IFuq1Y=@cHM9Nu=d|iQsF-!M11(<u
+z0J*a@Lh%o|pH6vx6n%cCsWY-F{OVE+uU=&gw2fa3^+FTpy3JN?&4@-q4C?8TrjG~&
+zF{%?)%l;OV<lMqcXbiHC4RTPB;-D!;ML~FeT3$GJu;VVr1JVs(Hihb{MbHGWBVxHE
+zhceaOIkruQH>*)R;0vk!;Z9e6hx@}XRMW3y(_wM;oN<j%G6Y&{gcaqS<=>cS{~Hru
+zJNC!!wlneudWjvjN@56|&J8K_eV<x9ls*RTFf16Jj2=17;~&-aX#_*dBH+Q&SG_rf
+z?udUBdkN8M^uX6-Opk#0U?NVoBELEj2hluVSovI*F5s(92Xa~XVywS@zh@=5zT293
+zjd))F7FLI0U)U&y=DTFQ>hio-SL<Rr`Ky4wbOG0?$Yu@d>o;?`<&ttdnJYYS#yH|@
+zTt6rr-GJ|eS8P@?+){@U4erD-E0OL%qCKTv1orfuW~P-vJ{pI#F;3#}J5A^3=#c!2
+z>8Rc~j<@cx(FJ3Q5+e+mk<ZZC^)QWXc!nd#)q$FW0^*@-yM%`8Uf4yF7n-ABRG5D<
+z1U;P88IeMY4I^!T`=xO8(~{RGN5eB_TfglOg7+<D=eOO$k(HSxt=BF7y>p~;AUPK8
+z;McBe`{ao{Qv0-ay!E?zCawBI7|Vm^!u)bX!pR3vD(f#uj}@*DPWQtg<MHyk1XUXX
+z5^mM-k_A;cg>HSJI>{5iE2+j<Fh3e?B7nq%rjyvXcrQg|tPez~!e&X!N9()<EEJE(
+zI$M0wWQR{l`n9X@fp+|zr3t7KI|fii0N`getoRt>Q;8q!nA-NVxG`mjWT#IVAAc=j
+z2;^Pddc!Z2AsoNEh1q?DVwDEPOUAX>!edsY|NF^;a8exbL1&TEX=CP+ac!i_eR6Ve
+z^mQID3XRtlSTIt#>X`F|>{v-qybgEH$UQEjDX;ub%Ns0BQc+3D-QoUh4m7PE*|d}%
+zj$8JZSW!>}Pi=S^tPY6WX7elssVNEQE(7@FTrmP;R==z1HQ0`8!*Y?iHSikJz`!h+
+z_I_l-Phha{-UWFUvFCBk6Z3{M1F@e5uFbR}T<_Mw2Y8!wU%VTy`KNfxbPRKC6%Z)5
+z8{<RW%u*~#XwoDbyiv#Rmx;g0ZI<;dsL$KK?jN2?e*7e4eS6k_RP#(M5T{M%gg{Tf
+zyMeTzALCk9)vs+aDPL8J;F~G1y|K$%Fh}{OWjoFg&klu0s`r3K5PnMY$Wy5%$pE+D
+z*#=PRdCT9{61JwNkL8|BV}<a`=|)?E3TD+ZRknztX9w2_mMt{e#I>+lw>~rl$!0M|
+zR)T9r^{*on2h}cCd6~H};0jjeC!<rMh1A;F2^iYW{`(NA{SCTV2Y=Mp#|>u>?@I<t
+zQ^Ow5C|skVRWsgKank-liz;v+Se(2#Fg6!?2C+0Kq0o^|Zg~%t<kx}{zZVu<;Pj<}
+z6Xp8^scBMJPXbv(EG1o2i^z>*I3pk&ejtFD?&i^{axg^kgO`+=OMhQBa!ToOO0LXH
+zh-i2-Znl3yLD@4M-0FDv;i;;}-pDnee6(`qyHDA3NNS=q*X!6n5n+l0Q-l}n>mVE&
+z_VOpQei|=QPKCn;F0u*A*7tzLV=qLc?gnI=D&}+YMj9-bb<>yTi}jX44eWE@@{d(H
+zpMr|GPI9C7B-zxi*k(WbVPuu;A4kzjvN{#(MWb(=TX-@8Bq5@3WD$IZ$n0`u>j8)a
+zbCH3ifXMIWaAYIzWDAW|T#yr9E@!|^2_bc45}ElQ!Uko(JDcJ+D){G|fZBMLk0+wz
+zwIj)W>DC0C6~vn3tg4@9kp7;UkAZumUY^z-TatPq>zKz+gaXIf6*-f#TWl)jz%V)4
+za|W)MDM+DDqeYfoS*MixOA#L31Eor$F^ErWRT!EDBcMJ&EnjS?VZS(}dn|1S?22cM
+z_a_ZtIYNw`V42EMUl!#Ck4m-r8G}V>Mw${*Xj+CvBAZ$j;1hmPF(B@!9-@(t8phMY
+zx?BOAXJ5{;EbWQcw9<upwW^;}ht`PPF=H^ARZtASM0TV3sDTPIgZTH<u4${`kCO!j
+zpD2T!qIV-XMY?(2&I|G4l>4Y6HOmnEL3Kcgp0uUx4~=gwbJ>jXcu!(vlo%z{VpLli
+z)zso2HZJ=lLa9ZY5`yfVmXL^iMEV($_GzG<o|9#gLhM<->j`r@XA_Noik|>tVZ%tC
+z^noNqOGVSc`$YsHMoq3pa9{`xLcdBmOX0Ju8>U7AUZXbQRGH0iM<Fa992xsv+Ycf*
+z_TWHOWXLZqQJWhX_7dbdcDg}{lh`D+b-a{vOGUpsyZl#pl{)L_Fm`Y4)oaw-6LqBo
+zeK~IpYyA1UGOOOyT$+9IpBmG80v)mA+}7;!6vG6`vqKaySi{yZ0uK4Vi&rsYDG$!g
+zd4e`*)ai4Prx`@?0Hl{{$gK|}v|14n^st19o%O?Wf%G%Tc$f8AVBn7=KU_V&s?J3f
+zXJ$DRY($dcA{vN`1b*$R2p_Tn8635O)!ywr9-%?v*1%y-uytw&Qr#RDR4$w^rT!=k
+zLxiv})vNJt9+s+<G7lu|HQ~N~m{!&J^ws{hs?~kPu9o*fMQpp@RJ0!;#gTraU1B69
+zy=yw66JLi*+<`|IX)A;<#fB@1&yo7J=WZ=;?GRg5j|rVk+D)(e`kNOk5S!^|zf9KJ
+zmF-(QQDoK*=u;GBtMF83no-H)2#BqYa6v4r2sW2a;al#G<ph^VSRfg4bRr0OP4-eg
+z+;jg3mBb8GY|o4T+Er`~w>z#E(8fh27lA5|8%y#<nns;Bs?qocBB{mh5L({`>!UPF
+zECgweCCT;YD*u`rF({w<)0rGWSjsKx02=ES4y_aUI&$p5Vpv^gQvsuzS2%3jwneM1
+zMJIO4@Q96Zl%=<VncRf3DO@!yR*L%4u=pr11q1NyGqmDX6CRb~HC1K0#9(|e3Zzj}
+z8IbaaMTRR1@6wDT9KEp6IC2_+qlhk3uT$KeGG4Q#6DD=*4UYXjCzDFcnb%y_xuX3U
+zMB-&{YquWlY@rvuBzei(x5QTz2FG|y6&6T0AR3Av49slq3_jC+HJPPA3n>LXyw~M@
+z{&RGml+~@!Py1f~<*2iD=c9jEMI$64hF`Ve#-w$7{>(^Qk>t>=GxYW8CC8G$P{%3=
+zN#73TWgYEoXlE}MpttHenIncwQHmr(+rO-LF5-<Te#;ba)5!9UL&@l9%Z>bG9?5|c
+z)jpaeIx-*5;woW-s#o30^Fe3d1#D7mfw)HWOj*xQP-IRV4glBn%Gd@053*v<lD$SW
+zRDPdcneo(Nk<%$`jT}%}hx%Etn2=4)B|N7@my@u=3nAy5MkUfqI41h$VSpmxnn?tf
+zPweE@gU8l>-JtH`GK(tqD(ufDS-em7y&G%d4GX-(lYvAJuoy0`#lv)e+m`ldnvaYU
+ze$m#wP5Dx19!iL|ek-!5VIys@ZT=J=kvU#Ecz4WY(EkCKY4DTs6GqF^gW2L&J&%o3
+z(#;bJw`}j7z4QAYKH)=tD~@AvXW$~fY-lenJqkYs<O5<=*?N%>V{g1t#}%6%1~jtT
+z3(X!rr(6`jWzgNh9Wy{wc~ri>j2gv#hEG#qhT;nz?Wj_P;vWFFwuZu_vngtYgYrBa
+zI8=J93ulJv!-<=^blw^_d>@g-PeHVP9^AoqRPZRfI;Bmh^5`8{omo~vhDAK$%|YiO
+z`ft#@GD62L#_@qT@_WJXFNnCWx1~?!T4I4MX`b$511U^K3JBn>a>m^Ap818yzWd$=
+z-b-lwmj{;r{pt+s?Mkid%DPh{Q*fT33s0BdCOO9ROzr)g^TiNmT)}}loZ!WfYW8Ku
+zCtAB!IQ|+;PX*lPxfO%{`F=gEKY?u~hM$_f#cWN&&O0j}J{omf>UHhe1<$iL4^%Fa
+zl@8AcPJi>V$}Y<WX~#2L-GCTPM~aBWNVcJP@fc}Ap?(^Cro<AI@S_BDiH_Ez>R9Xv
+zN!ctp$>b7Bi`onB+`OU(8Rhs=?4y5HHr+Nl=NIbyb~AY0PfL8}rG=i~y^a9?<jD90
+z+a9+p#>w<mft>SQSiLI3wrNR-G3<S8R;aT@&eY_{#~SKv+PL>vS(#Ylwc)^e5jFmM
+z-YVENQa=hh7ZtrBd#_KZ9DF#27tuaMzMW9Hkn6jV_K?j<!rjfSBy+>PRGrxc;vmTn
+z5h!K3V;e%rcr#P>YY&$yW*%^^jk51{``+gL3JSoU3-)D`y72u|&AcPDwC-g~B3Rq+
+z-9%7NzWW<FbJ#?II&av#j0a>UShf7>7pH!H_$p(k1|N|(eOHgU_{oVuG4;)L<PSDn
+zrWBdv6wE19`%9bA&+p@7%)r6Sj~d7(9#!x#OGY+Qm}^kJjWOs_KV^4&#IVI(e1ebP
+zhMJnbua^CmLB^(HDD$|K5rh}n6SKP|Y1AP+czM(H%}0iMCz?EU3_%UZkji&^x*ioj
+z>-?Y2^;fT#rH+4j17XKsw6w7Xlp0VD6FtWXJf6OCcvqtrFf|I=pM-qR59;DQHm2M9
+z)A3X6_mSBCi5va6sJFKOiN^+1i4WRf|DQ6FXrQ!ngH_<vVod&i*EPtQ(}mq<^Xp<<
+zv3H6>Vq8|CZ6f4@5Eb2UT~@0Kg4!oJ>VhN;fK%F-90*km<CE5Mp4i^CX({5;tFT2J
+z1`-(|K7biH)c^bsh1)t+b_8BNViG7935q>QiNFk%wIDr<=JfB?6S*7tNkD-4JjrVd
+z(h>08m&%{juLQ<<7aL$~D(4x%1@(3Q|J?l?-Uw|FuozcNUYrBboN*vi*#~1GuMuKZ
+zm^TO$*AX3-=R>?hfQ`%X+*HKv)WR^Lbx81AwwlQP4|r)Gq5dvN_~K0S&9^Oof5GBM
+zZp=|lw|*N7MsQi4AAbkipQUp0l*gGv($U;m2XMI!jRw9s5TNY0iv#RHL~Z;^kF6Vy
+zQyfgb>~-kyytGe1Jruz?puWU!85U0vL~$5m+%CmEB|NapQA9rWhfOBYB5F8V|6>ce
+zW*pb4arypD+Z3-O)*3PtGd&!xiM|$gMZ`c?`ELWa02$;?ml@N1G`v|jD)M3(BvX`D
+zD+drgI~7exq4~M-$6@bQkLeFVON=H)Gy)IARwWWWSi91wl5MM)=wE*e(_p~hbE#dq
+zkPhXnx1sy{UBjDK38Rp{UhQ3oxIg2jW|b4{+k>67sb)Fjt;;NepgB=joYRH(GZDu#
+zM1nGIb@z`Bet)J35|t_lISlr55H|l9rbnqrjfumkmH#x6#iMLQ&}tEEv_H0Sc5p>z
+zSDXoz<IVAleg_Nt4>AFr8bnmExE|ZObyLGbx40_z7@2Q8$#J763EtK-o*s@JiEi9d
+zXiqC*45e%ZnqzId9!1x5goj%sY%lH!*4zSjp&w6Z<LL_rX&>38{_>Zp^0(bc6C6F~
+z%NU|`-lDVbAHCf-*KT62#^WzA5Z>?z9NulfPZ*4;S}ZaNa>V1Z1n1`-^k4F}zq3)a
+z9NEctbE|LbicF#~j=<*$K}2xW7%+6UWf55gsLOR`M=Pyofnkmt=c==FB)#9V*82j)
+z<9`03|GMG`^<CHdVuRE`^dx~|@p-<%!`y(-T2ntXg(ffJ!yrk=#j(j^-5KcSWG#k<
+z)E_mla>ns{Vdh;519L3864^_Ux?9=+?W_~;SB4*^6pMCszj3x1p<tX6<QA<^A|x|r
+zs%@(^mEF*hOZpY0u&h@RIeCCB6%`p*rnKL6m8gnL%7QS$8DZ*{Yfjd}ii93Fjeb_t
+z1-!R+(ax$XI<ceXu~s8#z;Mun!~RYUe2lowG#LER>_hm2=$>LGIjlrKF=#;k6QG4v
+z#7Byfp}tOg?HLg~(d-w?MGcdTv)27+|JLR5WBc}-zub=)>XI50p}cRo{XHIR@v7KC
+z1zt?T&b@7|?lb*&L;lT1&6Dzk!M8viXJ%oqNj|NHfgm)4JFMK7!HNB)CY%#a)5as*
+z?NSFn#FD|1yVbPnKKC<E*aiKMamGP}(l_Z&gD5<PbH{~%=Va$AP7C0GT)wZ!?AECk
+zF9p~?v76}`)zP__SO6b}`lp;~Vjn27Jl~OGV7rWqP;Xu0mc;b^5WmncxFokG)x#1&
+zd3!vU(G*D8@mZ@$VtAhSIqj1^ySTSNOJRMjjy3~^FUJa=7}=A)9OB`(xQ&VpaV@>h
+z-0lpXP-p$>D4N(XXRyQtG+4ie>rAzSn_hA5dz0;pG{h((&?>EjSoy>s7$x^H-&hv=
+zL<Zv|ZfW&McctttoXmihM&X41pJ`@qUyxT~mp3-}^*nb6?*?!k26hN{r_G64pQ~5m
+z-ESSHO|A`l4;#+g;(QPc_`R8LZ-K&2Cumcr>_)>cQUF)%yWeRqC_GQYG%E2L3}t*l
+zpybxFoXXJVXm)sV^Xt#sz>7*CbWr$`CzE!(d*s2gW&Rfv7nxtC>v@0n2HtqBfcpL)
+zm87`=EpYe+rPbcg?P4ga)WBdZoWcY~=T&*GV4mL^(U?@=56zPC$VVHJF<4^G{xH9a
+zIeW>qW%wd|UF@*nddmu>m4jt>*)2~*<XBRK0albbCkOe1DIaWs`2`ap3n915zj~G$
+zSiZBtYd70BRJ6$^{L<hzO>ZJtZ+`~!665H6oVlwlH%!;@IE}nK|Mva|WbhC|*A4$b
+zRwIJ_2g!UxK;(gMy@_JP=Ngu}PFDf0+&S77aa2$k`v?4l+h>lmil9iEJcU5udlsgd
+z!NgCJYmh*=s0yGwSz-vM7klWeDX?Dt_ty=TAtCJBA=-hl*|D;$q6C^5{jkNZ@aNE4
+zg(WDta5MJcp!d72F*puzG(~2Sy@lb2osGBX*pj~+nSAq35n_wi3dMlH?E&{p1F5(w
+zJ$#<`Czfxdc!Y;FHVkCyi1(;x-tNI|tbMOD^f(e1RdnFTA(I8uP4o`#wtYD_r*UxK
+zSmpqhuW0Z<*h71{D|#6uu?=GB#)G9u58A$UrDcvZM~z)iaPW-IiWhWdeOj}6mcJ@G
+z`NqC1@iy`a0ACpAM+VyKS2)76Lq$T9{but_{Y)@sc|={nYSb~{2^LldkYx@wqR`#2
+zACW0%pkj>MLh~t>l7m%p%VhM8%{`>%aX$X*1z>r;TbfW*PWRC1tHGl9>as4pye#t-
+z21>PJ_LfBR7+K<h79;rC#pd{PqZ9u~aDIN^k40TnqN8<pF^LaYaI$!SgPQF22jWgS
+zA0*kMoWHpc8U}L+q#$83%$$T|-YyR;zF18c&+#5QmC|u<<$D-N6!>a9B|ox>RbG<$
+z1BcxxVf3U}i62RPCbC@{HHD5He#`oc(RjGn{{y8!TE8*}WiC4jq>aQSy9^aYt)v*I
+zrZM-u3WH!L!S$epC+rS;Yg)5!GG9`HAc+KFu)hIH5mcm<N^o)RWJh}Tpp6j~B|k$1
+zgs2|mN!vmOFxw#rN(w1O5O+`6xSd`%-B*v$$Tqt}g=hP?oXG7zK^O#~5-C!MsTft+
+z*vuqCvdLu#L^Mo+v0{TD8>gPqfK*T+SkrlZ$aDK)3uGaKARS0k#UOYxc<JWp4pDmG
+zLN}8bWfO=Ef_SjV97qM^^eqXVT*4%<-<^z)Abk%<CQYTJ$$eHrLkqzl0=j1u8fU;j
+zBR#P%=pl2^!8{D2eu#j?QLF9QM<%F2QN=~BXXB?ZKEe=2Mq6A~>&*Me*k^aLv1}ZR
+zf0j0%FbskscAM^_CJcgu7Wa;>jI~sVgAzh_Fi?^~4o{ICB*|LTe%gQV9Ok5vSM~v!
+zL&Y#Ny_OqjCsP9h-Q=7klr$jCA`oH`CK$pXrv@QPPb9*k*dbV$D!GeHf``(C=?oGG
+zDPn^VX{Sj&o0(p#DM`>O;j&x$jw$Ys5w8x};4F?F?CN}%gmn6=Q6l|{^(lQ1aNHv6
+zoAKpvh|EtHGg(G#Nn*X1yOzU1x)?Y?7zB1-h;KFkjj2Kd%^7Q{1Zm7?-^Kh&$>x}b
+zxLvIHi!??u8d)f+lyMi!?leGVjERPwbC|R#<g(G#u{pB$rcv7DzY_LhNL_*;EfvO6
+zY%bhnjI1=|Yq8W%djhJc7(~QAh-zU1yv|biofS|Abqcf8M^6p^2%WqL)!y&eOesl+
+z((lP1sm#<U_7@5xz<vwJ=G|#)p`oJmD|IGODJ1t#4g+y8aDp%hLL|6A1{Y48{!Z;J
+ziD2ZRK@m@DnF1aAeX`ww54laKQ5h9)gjCBGPlgiaB?!`fAysj8s&!@jc^P+#p3@q8
+z&KD!SKW5rJFfu)N8yN)gtIrk)D#ocKm}$@k8D~4~E*vyebTagEi=~dyB&WBlrx@sk
+z)dyh~L17Tw^jdH)V)W$#WeSAE&L_qIHk*&2*?KIiqbkbW9LWesf5ojc>(*_IG0I(<
+zei%3*7z8CzQ><NKy5U<G80!0x!LYvK-Z|4|!}aZce94)QSwZcvTo=ipK-~R`DY^_&
+zr|HTf0x9QUMZLgwrwhWf6$RCp!FUMG{f+3QxIJ4y5)+AKe>ziNa-Q_FuYGRDMxf5V
+zdEgitn6E)>6Q(PO$Hqt%1Jk}D<X%dnieff9_6b242@54ehiJs;khlq13KC8_r%K4u
+z!OPNSXFLvq;KAeQM_0F*;a{0=-jIj#ifR<)>l74)xS{p+^uTI&L9H{QtfCS{d6G6q
+zAOu@~AIugj7lH=)MJ1>#FCJsrhu;YQ%Og}e$EfHcChNP%JKY)7^^1tz??a{CkIR||
+zb*!=X$uWB<Tw(<o7r&R8{un?fkLrf30694cbC9l);$SC>$Q&(pxUt#Rg)V0kX64V$
+zitdX$pAtAH4Gux3O&<*tyBK=eN5b1YP=_7u?_gcc2T+|ib6WOan4xG71%)9{X<;8I
+zg~pV}Ol30hM<YY7ik(i2<)|{h%Z=3vQ>4{MF4OEeBZ>4x8SiO1I=M!jh#1H?gWw!!
+z#cR(!iRa(gMPF+_)cP`<dCtf2i7U@Rd9eydcE5$kpL`CDy$)I*8*s|Gm*T3+K8W%>
+zE&4i-;qOm8iERg)l+eF37p=jkKm92zn^Td1Nsvup^u{nP2TTrV&f`|r<8Gtu^b&_Z
+zMW!ISUJaS6a*Ei4idB0y`Bby-;ukNc-UR&*(J5Xf23|2BpN#Axn+F@2&9aHQ_;r;Z
+zi1F0)yA+@lK!PQu1A+-rF?7<vO+G!0BXEF;kdF2rK&7c>T1FjILQ9jGQI>jSylG_W
+z^O|7NR3e}<FfIg*fMWm?$)dy6P6+~oL$QEX230CC6!WiqTJ|+Y7nFol5^g#NISfn|
+z1~SY(hw%PW|BGvH`Y|@w+fiCkf}?w0z)ja(ho?5x!9fw`kG^#se)`}m@K9ggdH5yV
+ze8X4q=qm@|p%4BG58a7x-TF%$=wvV#TOA(w*^hARuO6c)G>JtKd+(ntJf=_&Prc4e
+zx+SsWbX6M<NI;n~JM9k`Pr=CqI9UUV{Q)Hi35aBn=H6~2PnctXjz*d@Y2+qqmImtL
+zvjxQEPYe~)0U2{i@YKZ!l2)(GM-`gPwM>z`g%LHUXUqVR9*7ELXsL7Df*dzB)kFGV
+z4f_x$@+$k=V`E>L<~qcAbF}{;vs><?t7rDicVAA$kj_-ky)zCBWLSdW#<RbB77q1t
+z{Pvz-;KCJUsD1wwTypU>c=pXVa8k&E7s)7G_QOYT?>8@p?bvy^?4zH@y+8jGK6&cD
+z;1BmdgITA13isT57Z&N-QFY_hxbKla;d7t+H(b23EPgkKc8&OtP5E6>dNW0_VtG%)
+zz;S~jL7-tBH^6j3UM=*h7~)+`w>M|H#Z3Nt(sw2F?AWJh>6@1-6LWqIs(dZbF(_0t
+z$h4sr8`T~^=G&+m<H=G^s?$B}u=GJWQ72%IqWe1XyJSG@bM`2~l7wLxaGJ5H;YFNO
+zu?FYQ{TQ_B3~vu38<65}VGc&xNQ45kxuH7J?<q#eNHyjdM;@_5=x1Loo*sp%>R=|s
+z4yu!8<j=%{;$>VuGE=5Ecq3j6)4Q3u)}25Y7-Ko5+rt2g=B&iU7yk=Ba`G(b^*Yqd
+zUW#h2Juf8$d-iUFMY9ywfAMk@=NT}2&E@#$+9j|zZ^EIYyRmP;h)XWH3a8F0L{ZrS
+zT=g%XK)(Gb_B4e3)BRLgn9XM8ufIQX3ZMQ9dpI@+B?yd(pBbQZg`)BCfM8Gp%^1}t
+zhTqL5S4UwGNbnQHLGVD2Ce18#Xv?T(ATK3cK?J1p{9W$$;ru=a^vt$t&XT}0LM)ZQ
+zL1`=jA(*1m?sxSnDh34|L`=Q;AYQM37W;d5!0yYStxN>p<M<56K{#%Zs_=(YF$8I3
+z>TwwrMq#Yt1w|gJ7g}u1N^mH<--3-tpJjZ6_hL#B+8J=E)5+Kn<6K)~wI`kHKE=x@
+z32ACNh3DSMVIT$uGJHfZ;o6`7FVzQya9Mj$SHB-m{q7#r8E4~)(^tW}{aISWEkkut
+zL=>pQx@CoUq_!6w4Xscc3sF9Mp3+Pek2KXab5NS^K~JxZi$A0=2Cu*Vx^my;axuiP
+zZz#>J!~+nBw^v5fh49l;@GmJ;h$l5gEub$Le*+W=!e|CzEIf>b135(-`~eIo;^y%;
+zYf?%O6@!S_sf&*XPKuxpcx%wfKtQE>JG4A?=LH34VQfg)<va=@R@qeOwb7W3hI^I9
+zig-m%i+dtLAd8T8TZF-o5X2gF_?#ef#>*H2|2Xml6CbtW-`9Q}XV1ErNsh)=&!k;>
+z8ZRm;m0`@FiuS3Txj_wFE*%VH6htUD)*P2Tq=DWV4xdfwr^RK(me!5fF!Ma*6%JpE
+zPu4!D<mWhl?j=}1;{(LO@cU^rf84Kl88KDVBRR-nV6rffVFp2iirKT!T3?H2XsCGa
+z1COGuSB=a6&$sdUD=x(2@BBdNS2Xcb>6i_Gx?dMV{mR0YU_Szi$d8sqvUhpC;YA@5
+z1iL+a!W9NVd5(`u4nDWW1c%<l_eXCJ8g7K9pp!8IV*5xd1x?yNY@dxfUge}-IsRIO
+zL7;(IG-o6Rc@}j({3`Jd342HjRt+SO1<c|XYYP=+ho0FSyX}qqHXVWe^l<E*y=<J!
+z2lj}O0AX%q|Bs(4W3@a$)k%x59Pb7fz?oN#QojxJJdKR~;AFaI2l8mxW}qiT5v2%A
+zJKE95;4`Q=HC9nmbB*&CF3uV0|KR%YlTZXK?Htb_$}|Qr2rt}<S3_z9#Nsw1Pi;UE
+z|I~~|C?GVbxpOC8GCYb3V--%WI%84|`MmxhgE#qU%X{3uLj3=`EFLCh(z7iF&T1i+
+zAqtN~f<UwcOiKHO*^5jMr880gh>dE~KrI;rJ6wZVEf02Y3ui<uoFCqE2A>ZNG+<}#
+zGpOs>3hi09;Z%Be7}Qha-6Nh0J<QtJWA9SjTBVCQ$YEeIFpyye0qCvUi`&2d9lWr$
+z2@963!}ZsF5nuY33sGzecSjXu9(u(sO-Pa-o!xF|d6KRyH&XQLfs5Ak0<!oW77N9H
+zdd!|hS4VD)GiT1kHP>9D+_ze-xa+RFxH)i>psUmSrd8M-T0?#EXkuXu*|FH$fU{AH
+zLh9JLPfQ(%sKZY62#HiifRW`86**2e52x0I7folO#XpOiCQq2e9k)@;LKi;bejCLx
+za3D#WiUxxP3GO3|T1MKKi9*=NP|H>Xw*N7#QjkHU^*y=|(`}SYk4&dQ5FA90v3wu!
+z7vRl-wRq3I3VM|rHM(xBFm+?GssT#^4OpjYL@{$w6xywnBD65<u#W^G?3x=XcgjAg
+zI}hxB6ruW^>}Ob8?qK`MJl(k5;e^>=iZ+cGJG4%;s3h1`a!i8o8g4RKi)m}H!CQtB
+z=A}>wEIaBZQ!;RL8`?`YVoAvg6dFn<t@|AVlw#~`$NpwZgdd`Jf(Lyb2h6Th8CsdM
+z+Hja{wNZ)~W)O5L6LdTz_;_#3{&OO9IhtUj3dyY)Ck9|9ZriNQSk83NM!p|`D{U^E
+zI-tfDS3Ncs{(;Pc8f&Xhrwj1pOH-T-X7$A3KhW^|A7q+1=W`rFWSDZF6O4h(G6*3z
+z{`{lw;QnWK;4|0$5a0ffPhduo9s!qyhKog5cJg`{9{wBNc&`@o&z%pa`6!;<-VR;y
+zN3d%BdQ{_=*t_*j^n7$7bbc!~Z`uSi=3(iqs+eeyU@t-n{2>E2c~;}0wo72(MmZcL
+zOG60d1_ypn`Y^5tye-_v@JA-|msIWKM$8O?8CmB%K`Ii2s6IF-4t>OWF7^y8hfW=4
+zm?YO@mCi<7_u=y3E{fU3+3Pq+X2W8p#yw2p=w`4alXhxOOUGL@;u{%+V8?#o-KWSH
+zkm-q7&j=DnAd=3t@bFZfr$|f4Pf&v35<|8it=>H}#6%t~^%vr>eIZ{y12c_%_*DKY
+zxKh0pdX9^y>0R_J`4ncGsz)?pihjCid4K2?U>oNyc@`Nr39Wsy{IT!S{eFWMkJRY!
+zSRo@MrV#8(BJnLEgZ0TS7iz4OL`Cq*GVPS^b(QRZb?#y0&p4g8Mj)EcOaydW+}O0Y
+z18?o=WQ|dEs`4m3I1k3c)ySLm8iGYHBR~d07+MWX41*w&6zRYi3=)g7a4!=30vq!(
+zh|8dx@jv9ZB&~`t2!h{IhTpE~^<otdF^~CQz^iT>)a!4+$u(zjkD1)HAtA93bnQTg
+zrBR6kF(^cu2-N4w%wb>{1~SVac$)C%E!$wsFTiZl^p~IbBZ;@r;}Djg^D&%u=4Cjk
+z@^ARr5AQ_rH$IB`x1Yw2W)H6X@xNovtVQ_9h6Q-|$w%<3d5j3C>%i|G+=RvFU4wNC
+zV>1ZRJ&|oh&BaWuWb|d_yWHz{=iv{|i*dew4@wxQC~{I7_3&g|5TeeYJQ)E|n~-=O
+z-$sQYl2ep~fH{s2IbiquO?cFO8CK_aVu>?s_!((~nhZm+i*9ceTe~RTn05?;$h{T9
+z$DSsbwcYw+9MaCm`R=_;>CA9K9BfxW7se4)P+?phpC=veQas?l9Eb83;N!kmP}I{x
+zLee#T7zCkM0k&Ei9!0<-V<)#u7|UUUU56dC<ln8Kx{mWA8BmHOjuaanDLafD<<&x}
+z_Pn+4!!`R=xJwqpWJ(l|B$*l$KO@US)B!3*S`yVDzAF84*~%#jpk07zzhZw7l7m7>
+z)M*AbfB5s!wFzN$P)gR!SQj==FUw+NM%vw2=+^0%cp8JCL~Ep)L$s9zz7Rg!;m20*
+zyV%cb`5!P~Y1L`atEIll0kJhv(t5M~WA|=y+LEi~p9=#Cw%XK?5n!gmc_*!euib%{
+z|NMtxFQ0Fik1KAt3g7tlS8>n%PvfUQJ-`4bew=sN|H1dKJ{@|a24DEz_i*sLcjJi%
+z?}3gd*wT|Oz>U{^7PE^IEekcz0#P#NVKoo_PzO=(oQqBQYj7pS?8-4LQL(Yg$;34w
+zb{R?7#2rk^8sWM}Cq3dr#N$Fbjzf@y@{ns0o;I9?|I|DQ6}h(vqon5Py1)}4Bh?KX
+z4He6b8L*EyUiJ9DDg8WdSQxWFK?jLkSFjk*xz}NZj&5uob6A2vcet^E5j_2Q*l1g?
+zJo^pjM)=H!5G-30iyn_%%!J+H7!Nbfi%}6N>I$nD=b9KYx>$$4BpC#mBRZ-Rv>gAD
+zAakQ+fCjaUW#X(p3Hl|MLQD14M1!9M-!EK3ERbfhZ$4WMH14$|;!2t_aui0!%c5<9
+z_-l^tic*qX_R(JFh<Ptn6+K)dB7F=nHiEc%9%m3F=Yg8ck!n!VXrfB={7yUe2Df5=
+z{vTl4P=fiT%O}khRxw5;Gb0DB9ON)CnHY$-Yo^=|b<tAX`SbhX5)tqSD65{uD>{7s
+z+W*4Z(?5*XZVL*FtFda$$tW)hH)G{#AH)6kFT%kiEePrIFmJ(1EL&JHqNG?qB^yHm
+z27$Yso%RgRxKG80_1j=#Sm7yKZX|X=OIxBA$Li?tYqDWTie@oV90WNZbGxS;B^EwH
+z)Ge#9$G-ppBSo^*ZALazIXs#|TE#P@+17}89Ls41LhzDsIg?YOmo_Q&{u=C4S7L_B
+zOd=o>g!ofkW{_gc=%0yWwhAoiu0?3^G{Jz3voHu_5I&`qyjP@15wzHmuff|AIxtCs
+zq9ZZZ(F0%<un3VX6w({XyZvtnlr4d_dhMvkGJQdq1HXt6_<zhk^Jwq)so@(~Pl`|b
+zBsS9LVK!1X6E<l%&a}fA3uJ!mr?}q1btCE(siU7vWOS0Q5Say);9KgC0MWCm*9q_Y
+zFXCv)LKLt4GRhfolEqCpNH8pkm>G&;fIZ=r=PLN8#z6dCGey*>NYocBUY6i3Jx)ID
+zY(;-M@<A01jAkudrTmS&7yq}2)e|jMu|x>rplc=S3d*Qk?1*3FMBbH+n-T2B4fJCV
+zbRP(NL=1Lc_B1+wlHA1}T2VbXRb}X>7Q2$#_y~w-)<D9_Az;?KdeEYAdVz?M=?6Z1
+z*B;(PK|zodASm(qd7|vqlDP~WA#D}rFc!l!{C%NGP403$N5XTRL(J0T6dQwZ4u5Up
+zf608IQDQPMn_;{cx^;NJKo2hs`w{|+)>3_;k*>yCLcFGvoGOjGp=#TOP~{5F5s^+!
+z9Qc^8#4kBZ;sJ@Jy>})Fr!-mxubZ|A?uAen?&PSAZHO!ahAvwhnFBKEWYmRWFw@o3
+zE#b-|APl#7j*MWiWIn9yvEbcZPoRf38AWr-CPmdC%z<ARgc0qDG&lE|!@xvgU>fXx
+zndq9>>I(sgzo`ft(dWs-VZ*|y-S<UYo(TqlhE@LNw-NG$T|Oh2^ePer68p%7s82bB
+zn7xH)3D6ol>H+y`B6lD<`!;d&n{J>;5V&zC*d#-g76dgUjx=cN*34HtTtqV9_Qz(J
+zqPr>c!yVM4*0u;uwi&!7RC5}D%oib8NkD!;jhc`N`83juzZ$}Y34zqIc=;O>xU^K}
+z7N{GxLS>tH##*EYzOhsckw$VN`zS>SMpPq0?A=Rv@-OBSQ4>4zeAH)vjJ2f77El-l
+zYdd<Wa*$+D0wIM#7%c^rdnV4mRdsdn)xX8e?U7(@a%bWoNKYk6bsbT8Ok7R5l5-ds
+zj)4<|L68%3{7oU;ZIK}WdjqSI+B}D&DwDt14#)W8-G{i*g*s`d73Jn9^wURX$v+0e
+zB>nIAn9vrW?luZ#@>S0Z;>{pwfTtah0EjVWA_$Sm@vC(7#4zEQs~Qe6OLSm}VY)hY
+zNe&t`9&=PF834zAYO?Nd#DtiUaf=?Wv1%91LJ?2j1)K;n)`>tQM;a1Y#Yi#U!&Dmv
+zkG_py-9}1shBKt`UQ6d*Kv6No<5&hujhesG0f(i8cC2EPko>kLaaKg4u($g?Mvfdz
+z1uc>n!FepCu+AzciS?0<%sksbwNz|IBAtGZ^^OuCimN)A@f@p+-1Qs=(!oITD=D4Q
+zC+QtoIO6D(3<x9fzI_h-8ai!F)rymPT|BMG$#5K?qL@_6SP={?F;t4ET0A^O2N+#0
+z7D17!J-k=1Ta19<VCYRSkQ7gnG<dYoP;uIU5J(XNCz2qLI0R^6?q&4EdUpj{4W;22
+z3G8TeU*q-9!{~g?7A;SRg9Ibq!;^830mA6dm#`)dJBfXe@eJI^Pr}AV=7NUm7)g7a
+z5IeF{wATR#UL}WFpRg_Cc|g<)BTWDjmd6OCK97MS|C#JlYHo-Ua{A4te<<#b!d8Vu
+zl_e4kK~O9pE-D-L!`k>J+>;QNo4yvrhwK+@P_mOaR=ac8au`Sv11AK7ASZ@E(kn-W
+zeu~(8^XV!z)&`Iw5>tPi6^kJ!^HYoqr2X7X75(vGL2}8<c(cA>Y>~Q%(M7uOmg_WF
+zB{JL~4&<<8;;w8AdBX-=<78gO)vs7DOM8;=?-vHpN1_*`*q}F5itQ>I)oH1pPGMt}
+zcnKDl7{2i&In^MN011Yr1Q$!9F?_zj?O{MLG8LjfNC1+QN<%42;wM><_$+smIWRZy
+z$Kb?CP<}eM1C(Nk6d_emF|%Wkb_lAVND&ChHj$mL>p6gfJ-gtP2&Xd722~K@f=2wy
+z=ZlygJilcpRE$wE(GaB3WPo!ZIhoKzw<cHqKNAK{00u#}Hj+IOgrqh(E;AR3a1e{8
+zZk%P~64yi~${81kYZm>uqd|)HP!H{=-d&i1SRijSyGqf`u){--P@Iy_jE02_H|*x-
+z=$c?La;$d6y{6b8(5Ny2-4G*8FO?<25cJV?@lEGSbQ-FO3r_Xe=onS4f<yYh+mlH%
+zKI-jEUl7JfR18A!lPH^y=TSwHA2Kq>LTn~6x)ilA2!pv8qOZsN&iaFWjR<xfPKsHJ
+zSw<2U6)y&bK}d4I2FsLJ9No*H4$P))0SzgW!580^P0-FT*00w8jX5Zq1|<lxO2)2V
+zPbS9HeiS}32*X2;4K^l&AHp02#AtKu=47z8Tv0g;9LK;3z#xQIO)^G`(rtO#Nq5I>
+z)G;eN!*N_p?l+2zLyWDSKCmZ>Q56YC6bNAy6@p(9*F;?(`PD};>@mz8wu$QL`#p!g
+z<bE;;Hb%0XRv;%jKTmfFKqLs_<|rzs08f;AX}I=;`&>#*Bt$MLNCFU?i6mFje^|t6
+zVyZzJBg{dPMvBs0gIYr)MLk9B@n!%YWYHShY-qU<;sqEQLV@fS4xX61>%zGqhHhl`
+zix9&hH^)?prkcTHuSRI#EV^yZW}lK%J1SLBgtn{wJ?!t>1CNJupA0};AZpdjsiJbw
+zUMEQplep!@x#{Iz5twcgy*Ta7-8ykFFrf^BpL$RqqmPY*5GTCT>7@QH)(#wE>Q*Q3
+zyA(Cx$ahEo4sU`X@#9XgA1d!En?H5T45q`_tW#r$Ao6_C5j)4B>lebISX&RrZ-_)e
+zBnUpSK^P0jMYySg*y*ephBF<npTv;095e<?8mIbWth&>^E)oRM4JX*Q6%_;R4-~8r
+zM?IbbZ0=h{12ksiOVa2>Q0rn<7MGkNrx>Ka5eY()O)*eKVxj~oK8qMGOrB9>Z^^73
+zd4(tmbst5j_h^!>N&T?^?I=XekTP(51C;z&TF;`L#D}2|%_9yHOHrgA*$C~7u)4kD
+z9mNJmB{nbdnm~MM9LyCV-bl1zm`D%?A(zE*A~BpRdn^njw|d5UJKl9#0`GkDB?M=!
+z#ThH+4?Q{1(~JXq51_ec0D40KmaJHf6-(y}t)>l{1&0pq$Fcf0MNeKedl61vy%Ht)
+ziTti5z;g1uj`%z{HB~fJ)I&=`ofKm+)PoFsk&TC`szK}N^nrya##AFD2)yj#sW6~O
+z5QZ}k(RF#Kl4<l5$#Ii$Whf*i{)MbAvof`|s{noOUMw!2M!}K<XT!T1-JPNDO5O$W
+zTo^h%l4!`gDS+sDz4ZOJh#~2e0~;^W6Cqehf;c$lQ{Jv2rz4~*9_^QPrz2At@0nrM
+zN^`o7(R=0~RC7N-%9?0x4tqPPAHtxKM~L6>u}UKI?el2S-*i4o0$ksvuOpys;LLUr
+zE5|2-BzBUp%>kbNqp#QXAB5dR^`jycIR5;o>bTwLXzSq~XeIyVA{xkmP7wGQAWUL5
+zBtJ+K)R0`U|8yA0ID-&mbiS_6URW5a_U3D^!OYLziPQi4OUm31FtzNH_ur1&e)lSB
+z7BHHh`55$b&ci*w_!-vCE5!bHp2l_G`U(0_j%uTg=}k?z@s?lU>dQ6=9g7J<>;)u@
+zaB{%yfX|vkGhm^wd^x7T5KWp&1|j5VPOizZo|0WujHyN#ugR9?@lni9OMI<rECR=;
+z_`h3Q3ct<>tz^(-n`AP~v@wbt-6oIq@56@bv!>6UB*QEWf^;wrNT4J)BSI?kA=xQ0
+zqCBZWqJf(2;#MiY(ky61xoQ1Wj5A5*MT(Fl7|9&u^VBH}LOhVW8Zy@EM5>69g;=R(
+z=sZGQ9mVSfGe_PX*KcK7E7F7bZI4?C!>aqeG&F5F3nu3b7^~i7<j`$&f9>aJhB=Qy
+z-9nlHF^L!IIjtN+#dTU6(Oyu8g_O>T+i$!Hr{|FLbRB`(*~e_PlBZ%~=80F_nW;X>
+zK@J0xje#-9Zu-q|cJ0T#cix7ZzWH5jJkrDT&90$k)3*O5-0`zVP_XoaxasEq#@9c0
+z5$ZPm6+ir+XJNH;;QqUQf}@TS{M)tP#<y?y0%mHPao274;AqeBh<~wKCR<5Rg77B^
+z@?@8%7#%()T$z|Powy|wg~G--_u~N(ZN~7!_He@&W4(AFp{X4xBQrMq<YOQnYxwTI
+z?)RyOp91D7UZcedEdkw75;IYKq8KH{D=W@DVIUo@AUXyl9QRmER-6JddW#(v34$<!
+zNz7H@ll8P$Fp&Y(j9?yPHA|QXZ33JQdrzhnC08MHGv{ynuv?k<A*ux*|0Iq3xIiQc
+zjG$@lTmnbar=fOSz<!nzh5U~=3VCP2-+c*Go@I(#q>{pc*Ue5dwsyP=n{PltcU+Vc
+z7oNs<(AD?`)urQH%W*pE6)8u~1|bfHa<?W50~wbfxXDc)Y-}Z0Zcs>1^y%cSH(o$%
+ze<6N<>n-@i2I{{*v;r?a{suO``~>R0RDfsSZ^uPnxe4F@;>W1gb0OG$1pofs=kea*
+zPOPe4I0g=6wR8WJXgJ9Nb(I5dBYO17TRJCObkfhsQOOpc@rhp+-xnJMIax;SVhW!m
+zzh!@ox<0ZjiOSYTch6RB9;&0B)A9NOrw#A)9)y)X-j$3uKP^D;l?0I#2Epmq4ce~=
+z5>f|2hY*)OCO`6#(CT$$B&Q5yoXMmlt72f|b#zBGQEeoIU*^M@rWbrxR!vF_g5W`P
+zHvKfPm5ih_GK&~L$5~t)GZI!<I<BI8V4#2ph|5qg-vW*49Y)ury1}P|rF%IUDfYjD
+z`+&ZK%cY;ev0P}dHN)Xc%#6zVn$y~W-p%*HTfPj2x#vJV0V)?C8FfX)kXcmcO3Ps&
+zAqFzeAXF^<2p)UpVt6{=#D+N+Mn$j-ps%A9-l9`*<}$k1DNuonPO8D%Z#JQ+z8-FU
+z6;`d<pwKl9gSRYSaT;ojkD{ehq7E*E-EK!cpA(SpK`JUE(or!^lZ`!DkUh?6WDp%^
+zYnYfO`(mb^6N2ZYs8+1gW4WUxIx+BlNh%}3mXv-+I!}Tygp@dKm6PUxHxJFGBAhBz
+zVo-vqB~E8q?C34&M2DkkS}_PJIY~=DBYln0zW^tMiw2ru2}<&M`(Z_~e6g*yI(@KH
+z)limsHT$sY;{K5FrJGyAz6(8z;DuAm#Pr7|5=fe?vUpw);D?4D4m#SXi2mKjvh~Cl
+zokGL%rpWu@r<FM|RA%IweDb-Fy&J)ScBsdiztPX9@LePa5@vb40)$~zYM3J0QUn8Y
+zY^aU3Y`&~{T56E#vb3*5k$WC=`EC3=#QO~>V1h4IkP-o9a|vg88N}eQV&#X9H!2!w
+z<IuPjq3Sh6JoA5~3$o@Fd<s`5i!$t}?4blfTqz?hQHDtxG;+MstvB~x4g+IgAma>z
+z%vwDI)2NJk$`E8viY%=VoHmANEv$x4<avWoF;h(A0_g5w)H)qEul#TnG!+-8u`mxt
+zuE5@2a{MHS9UUEb=%I&{H$4nuBd0rgPO9)x@0==__4BE0-lx2u>bv89o+8kYn+$@F
+z`cH$zkB<UT9WZbUC`F063rL^!^fvG~s9_L;OC1K7C`%EI(^#rIFoUBIpEwGC;^pzO
+zPInSd+Xr}(WHK1mCP9}fy&My6R{MH(V@<{BQ4O2AuhP~&bw0e>5@zg+-3|?jo`ti{
+zO$H%(o0M2((Xxdcq}lF*h2At}`9-lFnxt#gr_<JCfJ~%QKU^IYZUD&!2h+flase4e
+zgD_DX$U=<~MH+sIO4uahTc|C-Y;`$;o*>W50h9)ejJ)Ybo0ddL9vB1_$KOO77AaG5
+zgAM~(z7i_j%DfDcVN)HeUBli;>W6qdwe-2r*6UWJ2&u9B393;0;4v>pe(6kv@;X_*
+zNQK0hm(s+pN-|efFc{asXkt!=qJ20JU<ONlFRBCGDE3RhZY~T$6pEDJLZo%{`ti2!
+zr|k~iBgexaFfK}{gGsT3E6Xe68ZUsGH3}nELZjoLigTMPFAs-Gk~ifbhk=R4z!+QY
+z_^XYnLlnzk8c&6nTDT5}-A{%>k3tE4#?veFmMJ%cu?TSCNx+}VN~UooQCzriA#S_v
+zHs!w6YQ@t}Kdnd+q(JfePae4FxCmQ=HKP}N@`a4^Np3ZEo>IJIj7BmDE~Y5{$M?u2
+zv~drU-FO7>1c<UZ(9BsyY=y8_GXqbBKFGbw4||{j2V4tD@QLd<AZHUF)iPUMt6|Z;
+zfHH|Oz^cUUt%N~l3>=FCy*uKRFnPBW<}gr%zxppiN2r;7i=|E?L&?)}IjranlAuRV
+zvJ{&t7#9gsui1yjz8);7j7YpvEGQF?lTZ(ER9+0O#4hF_l`I=0fhMV_qD9F%+U%@F
+zBZ_G#T*?lVP}QIuL?bWA_=XB$G@k-p|2zbB2H08ti;U>GDddph9|V$SG7a<8y*OV}
+zi>3ZHz88g1d640pVeJhwxEZqG?`Cwur{8PF>$}_NMRHs^7-`kGJ}FIcJM&2F7m$%Y
+z%)Nzj6YecapDAHby5u1yJ=J*4Qi<)RGqBLujq^0yaEa<&%=7gqOoC`FVo6ohqHakd
+zS4g}*ggSO1_|$jl{!HepWEQ!(N*Wt`vBc4if2ZNFjZ96KUd!;|Y8+L&(M6_k_--1n
+z^xVB122#hsgfR%Co1#MHEXGN9G@_x~h6RO%42wE|_YVv(na(WCTf6{9a_XIJP22)c
+zQu49a9X`xdti_mB9X`QnG#Z#pJUJ6YdJq92_VFSIMxKlQlz0KhoaM@?J1oeHzB?J;
+zg+XAf0bvkEf_N1)?x&?Vt;A!|LV3Qe4gqHiHwZO$d1m8}&QDU@$xWLqmRco$Q5*Wm
+z@&|v57`K5qI9fFqr+W`7S1Ei(8THpSj8V}va0CvzaOG>mI3J^!3BSx{qLW6Ye;c>}
+z^?f#I<g^<DH0l6~^frpjWp0cnq%mF@^OA^j&GsPb+WT<+a#7>Nu5-)+GIoO}T-sFp
+z!*(iOaa=+5fJl{wg9wy#By!744fsUfW?X{p9K(K;a~xG1I>BEAd{jN`b}UCv`>AB2
+z<c_f75{g<Om66BDEUHkfcfefu8oo#da;C3uSUJK$g@i$H@J}LgW&rxB(y48=prgkD
+zHS>hTl%9>F9)$_8&8Gw*pA3RdVGxEDC)A(oM^=uR%tW_+5e}H<pf9fwSLnB3sjr>k
+zwrF(C$A&QpQm_O)6Puv%fUJ9Z5uu0iQ98phQu0~XsYC@wOSpHsY-(ZAsj<1th=+^F
+zz*44=gB%7X3Ih|i>xl?kgkZ;wjWjrQ!$qhH9LBxB{wwzE-HW$hd=$^^@4);suEL7d
+zXJB0o@X8a9;?4JWV*B=Y@TWih9h!L`z-fzS#_hk<<4?s%QA%U`>YT;!Q75bH3vp|h
+zfSZDO7p>$OY-KnI;<(YsefbjxA=aO$AzJIW$x}7J4rq9a)bdoJr6@HS<{(n1J(P#%
+z{Aa+bH7KVj+3PBt9-MDuc088_&9;Wfqf_=Nb16iLhK9ykI*pqus@Q)F4@H{+6Vq9X
+z$|f;`l&C{4cK~&r4(6sv9KkVBS?S*=Ar?YT-Sk-f)~YCorgZM0eI9;eyAsc;&SJP>
+z11h{SFNU81gwc^G5jxHjjYj_bOjSX=j>IV$5j#~)uejD?vuZV5oF5}WB7u%C8tCv6
+zC4!>#RV67YCjbPE4oU|!!4i1A`uLs_TvJ-&#^u%G;en6hPVc{Avwkfc8mjWxyit3G
+zs9eS=K~MrNk-1may$qZDiTz7t{j**TjgrfpUR=`S!YOQ<fe*7=ImlsPLNG9V_sC!s
+zDwQ4uW#uR|9nY+`;=C(y)fKPcu|M5{Yj-Y0Z%ZQ#73*>14OgP5umE5F+81!c9gpD~
+zU;PS9I_gMyfWG=$SL37^5+-+S5VdQn41z3jS1^x3QE0qmrKo>m_N1{JEqBBc&eA&i
+z86p0{^~7tF&_6q$qy0e|<`+YCdgv1P%D}0(u;2|`5NJ@Y8%dEbFuU<arJW4I5u8-I
+zV(9s)_#zv-mjqIYN1w0(vR#gU%M{eR8Be0N#f|2^HmsNtmSQEWKGP2fcSOb~nI4Jc
+zsMk}7jha<hl~;>ubqn$+S+LLxVrVLfDo#<y$(8t}N_owm8a%H(8*>c3*bqDntr*b>
+z$g6T{cJMDlAXyxh5X%`VZ&WeFr8-avZJ>sPpLRBkIGGs2nHIL#R>Ki0fWZ{RnV~%}
+zMY{kKrD``5D!J`s9H_1srq@Ya!_X7LV2}|`2&_*}A=#;J4Yts3D+f6YOcVwtj6u*A
+z%*E%vat*4^K4qxw`oaac?XJ5}bkF_h8E`|t>NH$%=@;<vlfxp)OTKgydi@31zORwo
+zvk~)_oQMDW#Y<s`vj${|b6=rAIhn;i)D-1udW)l7KZAN}G6+)v62l-?>Rg|QDuqKx
+z46;whi>jQc1R=f_h9Pd!&1OLjRPBThFl8<(dYl0?kwFk4bVd!v5;bb%eQxYDM@bSR
+zBVSJcw|G_d4g_$l!$Af?FrC^QOTXr*H%0d^aR=h8fvBey`qD-s*sZETnYxX}ZGPG?
+z9B;WKHA}iMz9;l*t8+PKsn5b3Z5QTv$+ZgzI-CqV<me|>GJ_i>NmGo_>`Hx^_=m@S
+zuiFH#V<r#lg)A}o@e~Q&KKoqUr?~`$dJ9hW9HUAvY}l(bjfu{J=6bqMo(`2hO=eOK
+z2GO=2@%qd)vE1TD1*6O=hT8F-&E3mkAWaNR7=xh6n}Pqh<Bn0yDxSF-x8L;(T4o0*
+z!W+Kp>GY-e^0nW^mu2CR3r}|Wip9NOg5!*m`;Dr8=z?r%E@r&j@2$pa6+H%~0@&_g
+z_hChXI8;3sK26L?4U=OK1W5rc<&fjqqgh6mW+8?0?^0kHJ|UXOb)DI3$5v|#b31rp
+z)QlD}54CxMzsQ-&Pr?zTIwjdTk%=ZL5jUx7sqOHP38grmQn5(~&Jo3(RZgWzjIl%(
+z^^oy(1`AL_Ca*-tQ>lol2SE(;l)NQURuUk@-|g36mv0dc>gLk}qK~KW@TnRkig3`5
+zMs)9F=*J5RgCHD968%i8F76MKt0BY;pPB%zqLbyi1}hWX?yxPvQ>AC4THBA=zHS<C
+zvKX0^UYZLwz6C6~hz7*zF$f{SqZ}HNgvx*xGw9MI&MG;`VPGOKAX@GzfsxF?utuc7
+z9LRf;cfgmFxG<^~E-DwZI_`B=gmrvVvB-oGQj*?`s9f17MqG<(`mnF!(~d$C&Lp27
+z_OhIzDApy>IP9KF^Q+?wn{bXxX*8zkYGB%AIfG6e2+zdxS<*aHCR^&HWqU)H16KEV
+zf?AEEMbh~IomR!#Fv&4?(si-dn-2q<T*i>wD%#mZK$ruOBBU}~G=r*!ZQf<*)f9#a
+zq7*2SF0tNs_eY8!*Qcl#CRD{Btz#HwXa8(?on^#Bs_do&aZ=+S_Oq}@wUF+H#~DUp
+znzVJ>pfWd-!9Q+5oeDw}27&WDDPYqJ$dt@xz7Wa~IG(BYC8=6+5B-y4V9FSTOyXT!
+zD*arzsV)(DuS;EpfKHa!6o73078)s1cX=GdP>Z6*Wc-}jXxSJ7Y9Ss;ZY;+u8u}(S
+z`VEd!SfdDuOpFp5L(S=IMu)YDrKey1P(^8e5kpr$UG^l)-(;#fM06{54;^L?I;~U3
+zAc)~!kkX4}m_Rj8$u7SZojxPyh7qNd{AdSt;xfk-20>w_Q=9QFo>t!ptil$}3b<+a
+zBA&Jq;W1?G<ou<9UIsuU2tLslP9zXN9+!?@P$H2@4F}RJ6`7?zcOEu}){t2$2^S$v
+zW^t<SHiR19pz4L59qE9m7?QC;7%W@u4`4A370Z}YW-`}BI$g`XlbsmIdImw(rjRaQ
+z%8OmzWVm6>fsFxprUax3Ol^(6L&K|=ERDiEBn6b7s71V+?DL}wl{cLM9r`6WOH?sN
+z5~fqT`mp1`!>G3&qnLeam;`B(1knj3jg!%RO!rEFr}ysO0BV_lY)XKA4zcg_J7D!u
+zgA=DQ95&h@lrb4s8A`b>Br`?i%^;-*K{C^+f|PLBIUg^%PD7)bQa6H%1RZuV2d)fB
+z5Xc+|lQ7|sf+{jrTSWfyrgJThsOQ1U(8@z>2BU5Uw?B<g`yNVtC|yYv6v-j`KU83X
+z0{Gl&cM$W*D5NG6N>Fa@b`ArB7)X7mm~N=!&gUoL5;1wIAT|r_?lLs{Nnn#*l&Mw{
+z?|D&RIvoghynp;DA%YT}P9z9PbV-8b`WRs?S>kcLqUdib+Q}Qyq+S$#kvjJfX7}}@
+zaQjnucE?X~Y@n8gf|Ia;4{HT`CSy$E5hU>#>8?NG(ais3g=V`Cdz-r8W}N;>2gL?~
+z9vlo_mHZf!m<Q&g!8acTwC>bL*|UTwJxGT^kbX<l!Mf0F)T`&x5rUJG<07#TLKdnS
+zGB7U`6~jbJ5TqmH1+I%eUm4yFEyI8+>Tn^Noc2Zp55GX$j6q}0r0bG(F9(AZ)))7z
+zIgCzQ;*i)3d_M;{3}hGsNsyon*EkWyDFj4}8dF~+10EAPR0UJRAP6oPb0E~YdpK4U
+zQRDDSWBn2pgOA?O$rFzlB@t~N`bzG0G7yE#h$u9gxba-pHh`I1pTx%P|AQ6=Px8{Q
+zH0qHU1!ne=s2C)7j)Xs+Y!JSYLF}-r)`3Hv?ff;#Z4d^*7a)TmRw2pNEkoGnFG8ok
+zn#_S7#wfA1=+J|dilhT#i_q$+!U5krO5Lb`mx}tEIDhxkNRP&f;{?UcaSFyb^=4B|
+zL6yq^cLl5}9xjN7A)$mwd+OdH<CN-L;n*sY!xR_<HeBMNrLJ5}y~nvX{y8xqOFXMV
+zPL!0e@lRH1>Rpk&v)42?t#?zeEyf#cK&Y#Y)Q_hJ1qL^YWNZ-lyhsqdgPH3G3rOoj
+z@)sQCh8NU{Kzcaj(OCV8PB+$XeF6L4{TbTZ-=}1m?vIXew720;Xa1Ln%*E?Pp&cU|
+zm-*^OmFOcuJ=W~U3p?5--B?iqL<Rf|IX)ub(WpiayFgKWNQY)$4V+B3SjM~zB6^Xv
+z5@KKc;uo77uQ9At`5~Dy_Xii?n07X$2rSUSd?4*d8Fra-c$^?v97V;DX4A%5dup$%
+zxIX)}jHf`O&0(qLWq#5Y0X@VCLtZBhA^{M!L@E-5qzlhIn8QGN7|41CLAot!OMl8X
+z2=b<Q_ye`UW&E5XGaoqu^tKKUIFqCoLzq@dzCN+09?!N)@jbPeX8O+eGZ|7W(2+W?
+z=^Vhi&40td(>KEY{I?O<`Wv>rHoURLdMQKKWR%2MFr42b-0KV#om4S0Gb}tHzrJk%
+zZys(R7p9Y{F!~`9j({*n9G_GqWIkc|yd|*vOHs~5Ptpfr5Q3Bx1$b{fvt_4y5#I2v
+z#eg<nIXQ>AkJ20GSahq?`YuMOqQ)5CTu!U%lwYD8hMpo7=n586#TPXvMa^KhQi|{f
+z*K`UDw891RkRT_P9ON)CO)xO67z9Z{+uPZSBZm*+(BWD%w{`KflNeKevC2-1LEw7i
+z#<|lvlZ%|F7|*VmxS6q^5GUpV>MQMJ5)|O?5M|oQoFw=tvo26QAo}U?foyTDj0y1u
+znI%6{ZAWc+Lj_9&+-jQ>s}Af%<$Esy&;Jkn&)<a5(N}q5I!rx<b?Dhlev!kK7%5JL
+ziXqYunT9Q$0le^j4+iMnF<B7eJn%E`h{X9w3HY8lRLW2Vl}z45BYP4cVG=^LWeAA`
+zAx#h_#pWx*7T+4|S1(Z3kILLaDcBKm>EpA}5F3Q#qGhJp_zb?LqPwKoosV`u11~8$
+zhN!|R(G2eU2SUy7r65J%45I`=SoIv_Ffd&(km9a0am|*Eu)Apw9=QJx*nYT^vEhNz
+zxhrtZSHFf+me$A;j0vP2bO9UdZp>GPT@>cO!&8Eeq6*Bjb{!{-QZOM+z9al{GXF|F
+zBsihAeNfFfGt8ujF`ROeN?d?!`(An=j2A@DZ>I13Bks$v*3^O}uIAW93g-}+H9iu`
+z9j_zMNE?b-YoT8ENvN4S17-867#)9`A`MX7963KiqGO1a-7@mv1bzx}_0SOFK)oIB
+z9PY!V>m;T2#Dl09yuu(1Aw9V|HIz&Z_)5`ltHfM}JFhNuG8mSMatIlh$N(l+)~Kh*
+z$RF{}!A|`$oT5F7LM9yx9eoR-dF!E?!#SL0P%Uv~RlFEvO-u%IM|CW<3le*!U0V%j
+z$b^EyaMsGUA^exwjKI4OLc{dWs<|7Ou~mX6CFqpIl}I5_QfjTuJ)Ofq>KI6$vZh{F
+z+&8>Tar(r4x8bhe{T<GNIhb1=!t0Oy5<j^659ndY-?2cJTwol@2t<7C3>M?r;CW~=
+z&P1oK7`-$+va1c@lQb(31EgVpV>Kq->$E=z?0<%*4T*=q$^z6~Cb>z9YQ>cS34%0T
+zc#>L24PI2OPoXD#sfR9ryEY>D<agnJ;k(R4xrI7u8fm#G84-2KI6+WBHGJ63GQl1@
+z&Z^?RE{sZNza4Mv?S!3C3MT^;2?B{vK=INMOe7C(60m+xC6>A>aR%ce7-(3i7PmZw
+zp-!!==vu}5$Hww@`xl~~nOH+&FLQ7+f?NK;xp0V&rdPJ$S5Yxc;TT8vGtqZZ)V$_7
+z16vsz!p>w?((55(Mfq{)Jp^944Z&T1Azlu0J#d{wa#@TjoH$h0eNKWf3N^V4Q-*<Y
+z9wjo@ZhOyeJn+ctSbpAD@!NZE#|%v$s)L`#EssBr_pbdvxMFQp%*q1fxNSa1%zH^)
+z<U)2c+T8E^KZHZYb5Rv+K|yc;v-NH)(Db8-;Z&I%7A9tPGceq)Dd<o_n~uz(mfn^)
+z*g~F;aby=l4V$1^^dVA1UKgGy!RSbxq9SoinCUb(<-ryVeRz4s-0hfwpk4ztt>>d*
+z%swh?ChuAqadG=g@b?^pddUThw8Ya>^=hapmM|qSedmp|Z%9M3ASwnCJ<I1*f=HV@
+zo)C7`_2ISsT{wAO393tsFfw6|+?xoxCJcg)41$+xfmF+vIZ+>+iC*_ytaEn4YE<Dc
+zB?yiT;c=g5KHk!<!CY-GN|?4>b>MY`N@}1wh4Z;&4#%5uH3ow;B{Ob84seE=mP~cy
+ze}-NiM;&u<Pw3--$&U-v`?z;_!s8@^6`*eC;8p}%4j{DhJg8=`gL>}iK=Ev5TVimt
+z{OaM-7I|Lwf>c3VPE(#8saBGE{+|&82}sc7p~TvH5cSSNTz}zZm{-7HF8&f+eCd_=
+z)t`QdLronDgW&agDY*+LR<hY>HO56~w|ArN*i$4tTy$xQpJh|BFbm#u-5aP<I8!O6
+zkeSs=8E?HT)QWj}C*~WiC|6k-+VmKTLSD?!T43@GK+mwMCNd7XH0xF{EXNLtX@gsS
+zi$M7bsJx!AN+khBkamj%!4agDx)=zIL)8)<X(1^L45XTcI@1DF_*$T6-<TK|Iw?Lu
+zd&pZ5$W%1c(nzb81cGc7nFP#P0@Z@^IYbn-RxV-&`+T-r(X1raq_EO{2bn+@eZ3`j
+zhq4)lTRRp13X{^%X~$2VIEWSVOYzZlGcms^kJ(4HD9YEe%iQ3((TBtpRIF#mAu?8`
+zl(`3PkB2rgG(=5tjD>78d#muG<23v`LxO$9(}-u70-CZNxFpSaqVbG_V0qO{1IXum
+z=OE7%!1<aTD0Z4ru=$VBH@pkY%1fYHdJ#}KLy_<?1p?Ivl9e<3IZA`Zxof3Qzrq9x
+zQ!$?P6sO&pz9q(rb?ybYPkjYE#yqT3)uYgFfstxL6Qu=Oc17i&WRM;}p<OQ{P(h|(
+z)>5cS=0m;Wa`-D&FcPYsX8}PDQ_e|jloaK<4z7(nG8QSmmT6Sv$~yruFl`tFdv`Zf
+zraTnYZ~+n2Bm`wuRVXd+qqp16jU$AnrY8LU_rF)}d$?&j9Zs|#-HXQOEC|}K=7z`J
+zXB;4#US!X-^4kE#y7eTMyGX#r2VBb6gib?+(TNRthcU~!ALSIIF9lCfJe`ee!)4jQ
+z?OV}h`8o1>cA?0@mP8sevQLB8#c%u=W$%3|2CAWcT>cv`aC<_XOM~0JXJftN4OF>%
+zXa(;=xww1F4kQmK5H_cZ>x1p&!@X299P5GV?JWou7bCFnd~`6-&HyzJb>#J!?jbIy
+zSgD7hq>osOm}JL5dy~Ni@I$_h2j_7sj&qYV7LDd0n(Nefd#fI$MFx}>8nK|<fNGNy
+zer7p@+s3#zF6P~$x+qPc5Qi>`{TS$IhJ&e<LxH@ZF&09aOy7lp+~zEW-?0{_QZ!Z1
+z6xLpUFAYAuoL=LbFVcpCHZ^`_SdVvU=djYd3rpOsnAx-)+I@#;kMbgdlpxtch3I$F
+z7MFiLM8|-Ow2<_02&5xS_H@Kn#3;oK5zRIZjq}h$BfiMs3yif!!gnX^U#VW1ii7p<
+zW7}^veh3@#Ycbb<81o!;m=m(1M9Ulv97hF&S?nQucDOCf1Z;l`*6I(yqAq4qEk6p5
+zG(t7N0;6#=`0B_HaR!yJ+7i>^$g6MSvQ<~1pomOl4ssaCAO@xlgP`ahWz|LRS^Ta1
+z<OU)PLSJ7W-g)O8rTgOg<s#?YF;I-%T{Spavz>cIWY@?LhPYP4B@TWWEI!B$?yy~t
+zXAT)~()=};ZSta!_Il$z^n@5TwXbOx^vn%WWT3HM91!35=C)3FG<ld+eH1g*O&ROI
+zY&zZjD!ddt75M=x@<TlHvwtE*h=AAQ#j#^`Sh4b?$ffw7e%^Nez_#uH05bJSL_t*2
+z;I6rY%s~q?1d7y#BKrgkf=ER)dIL=PC0J)F=759;!NCZW?d@%tHD?a;j1<>SCJ+y9
+zw+G$bU2In#O3TV==}Lx&C&nWlG6l5e4^oN{plUz~ev@X~G-SvMO&S>Ti?Lk0kJ7E<
+zu8y5uot&E?)Kt@0GHP5#RV7oG1jp{sVpDK6^D_9b7>7vRgleU~Ub?#&S&~Mo)nwvz
+zwApF(7||6v89Ol-C3L*iS=hSWjJp}w4+oi77uz6XE`Q7~q(~E@+p1zlQbT?jmgN;e
+zEgg^3G#}@F7yDmYT#EdH{ODpP?fbF1|KHwq07P|k-9z1F*<E_?y$GVxMC=8PEoz!Z
+z(=<JrVq&`Am!ACT%_Jr!wy3dd?7d^5D1t~65JBm^!@_@Nk!TVXOl-;bCP9_~(J?O0
+zePw3un>Tak-gD2*fVH&^)GCoSx~;S@u~%+`E^=G_kkD#PIaKrAp@JaB{-vH#S_>+V
+zCsQUZFyc&XEOVq1?sDmK+bcQ$J1a8_CZ?t+E-ppx;XUZ{a19lNONS``;Zo^ONdldg
+zz%8R7=*tP9YN<zUeOsuUNa0-0-Dho+3=a0DT8lzxXec&s-mL9hWo0EoLP8MHt1o7K
+z{S_w^@fO~=Qd3)tsZUPD%dgFZySJY<eEAA<TBjSPe|~Nh*6Ax1(f<YW=fcUs4)=_^
+zos-J7sQvdfYP0@v2QN4hwAS*A4j0nmGxN1q@XD+o_^mK4bgqbbQg{l)@+1^0tyQ9<
+zO9_G#G4dCi>ywjDV&Q@Xc>M9l;Nt4q(H*Y&@!Z@ztX;br9`2qPcH6M?_oo#}t0lH=
+z8MPlTN`UoO8X?T`BK%iZWC*-yky*0j7p+1#e*AcTf6;*}RiX{a;kkd)(k7}{wQ?o$
+z3kq?^9phkQW20?aE0wus0)_=~kQl!0t<pYcQ7wNi{(Ny$1=d1<9Yxf}6}1B%EiW&}
+zie)Ph(YqJA`1@acn;Z6d=IgKHp1bcxm%y%n7C&FbR&q~hhz%0PfGfS3LKhNmk8rt&
+zpDUevap&HD?``zz)f+puZ$s9eo!Sl5#mA-3k_4`W1a27x!OlMv&IYq^WcOC&3~+$~
+zfr8t%Y)84FH~gI10E&8CS(HlBBD1t`A`w6OwBHF$`bHOhLxL5#vsI~-urzIJ(~WF{
+zTu%eF!VoHBBbbOC?2Rr2h8h{_!p2;LZ{7H!;_gvj#_%!|bC{SB=Wv5dWpy27Mk*L7
+z)i<SnBjdK6tD1cmStoCFksGTaSJXmnYH`E+FCsc*#!9HvW;eX<b~)?Ih&xf4vVM!3
+zB7dda0Oo3re<MbvP`Q$dB!TN8fm=pFP}+vzuBh(#bi)$7YuXH3gF>uW5{uxm&m-9V
+z&kKOSD7d=1(#+SUJX{aqT<M;oez9{hpgZ7Z6rn7c(5K(7Fx}`ji26nUh3n^LEKr7q
+zhOn}-qJnsHhOnqt$lu852D>-TKWG(A+d}p?Oa5Zqsnu#)gW9YmH*);7k9{!)ZdS3d
+zuz;xlW{iE&XEQT1$mMdFo14RlZnm5C9^5SXOZDCu3Fw)cn!fSuv(Mg`+OANGp1uN}
+zLB7b%NJQe%SaRQ&z_nWx{`2aS@V5K&4qYtJo}QkFjEuY~N`k20+1Xk9a^8%IN=%YM
+zITCHS8A^hfkVM@=Nw^tBCX;FFx3{;yDN34n=C-!B+UIX<eB=G#d~f0C=tv8e>ZUAG
+zLOBu&x}~M%4ObGx*cbJR@qaVkJu%+JxEBkv7>75bh`x*Z-Q3&|92^V}4-ZL6xET-P
+zUsh*EMus*RVDR9<qGxaF@Fj1}%F4P$y4i}l$|9U%SYs;{21f^HEkgXyjbqqbMJ4JQ
+zHJl*i+{r0_^LPIF+`s=#Q)9iB>i4%hap$JbIA%jZ_sG)B<5gAF^f&54LDR2-=D%xE
+zTFI<dRo9?3W1p`|d)roKeXC%Yr=Te?QW!(2V2Hu_B6gJZHI*dtVdy1YAWAME0@v_Y
+zN-IHk)zvjHFj8t`{k8X?IkUc@{&$q|Vi%>)=U^bh@aRQtsH-I?j&OB7L#^^6BTvB9
+z6ycAqsVGAY5sZ2Ua;TIl$ONQc6dr3J5U{$s9y(M~6zsp;@PZXVLv(&kWwjP1FIOmF
+zOxcK5T}=_b@LD0m8j|RWI`~YDjoNmrEyMye);H3}-hNl2$;s^?7AoqDlncSL3|SRp
+z(?BMNlFEbdGha;+e)zh&YPNx}f67n*@r+~_#*`S3HPy8oZ#vrNZ$$h~dus$ZQbhOE
+zi!{%4!6+DApnp{jXl4KEwD)f!W<kOBE95fvO#p?-$v|LYGeLE2g&uQ)9rbBNGt@%$
+z&tF?hkS0+k3ej%E3+=ud8HjT=9RIbv7kx>5jz(=DVD0m-WsWF@0vpi9r&LhB7X;i`
+zSHrQ-a7hLZDmiWpId0lzbG7xilH{whs)hj;?1zv6aXyU<LDsPU7h?tV4Gdwxal+St
+zkt>`Fh)>cG5+$eX+OF$-&CQgr0AcbqZY%sC`Y97h)Oi0EzWd_YH?RVkT*-0S_H5ct
+z=6h3F#RRd99D7Do9y#{JMN*L@&`Akw+O!FK_wL2}@4qju(B_cs<fS*_G){PGYXk&d
+z-fhsLsYgcgQFh`8ikKHbZElNR{Rbh?%b5u6Yu`pqb1jbS-G)r2Jl3uNd~tONJag+l
+z2)(*kqqd>|hY##SeDW!Rj11xE6NrI*BT1m6_*;z;6Tz93BiJ3Ai9X}*g}aHEXu0?@
+zgzk9kAsmW3K{U7yY+St1uTO8d*jsS&Xh2RzG9x_>;!IH$)Mi!)j_8Z-T|6MuF5aDQ
+zl2{~5&!%D1mT344yd9x#R@(aO>k6=I%N`U}GpvDAuMoL`T#c>~gW+c{M@fDbqWA5^
+z$?O7tZwlXTA?O{}4Ql#IJ5w~oHe{wA$L?MGkyl&|xyllO-6Ij!y$dW&bWvQ8gP4N{
+zaWXRxx}>l54(N^u-rrm)<HB5uq=Z<+#3iAsQ3v+Uo&>S>gqwr4mO`L2^*1-w(Ta5f
+z`}ZHfsk{;@D8}$2KBiY#2psHW$Ul>g1N-AiPIZ2;ae*|qbw<yK2&nYykeQN*Lr3Cp
+zuCxy3HVz00?}b2b7Z`R@{$ha<^&dJM!!cI^UAYRL{z2#&+70$rCa7RyuY~wmB%VA)
+z^t(RXd;<^`(gXI^X3#LSGUH?dj>ILPpsbelJ0UnM9DW|oT&O!%(u6`-nwN$6xHu%G
+zXESr79vs}f5fU5%4_7;;2q{Kl!ZBoI=WCS{Apw0Ob9Ct%1b+`ZRF>o+F6J<jQ?toJ
+zY6MTet_Tedf}MrQRWH)5RK(7bJZ#T_<1q8+j=sG^p)_b>qQor39*IF}Rvrvh)(DH}
+zg#aHnC}esZd$~LojT5JG***jK28JR$q^lMqbU}sa%qS4&XmI943^wnMfoIR*2<zqr
+zrK|yoG0{k8Bu*oVJlaNp9$W(=(B01&dQGJ`7JCHoiK(crZ-s-qFM36U!`aS)O8WWn
+za>eSKkb3+GPNtvcyM0~>BXZH&D+E1*JYmFe;}nkXL&r{_yrLc!j_w31M!>_#j^j&%
+z?DQm#+e64Js^mOsiO^ns(9Pe29334$`ztm}I`}^;feTx&e}V|OXceR##A`1+hv+Ol
+zboI7EVP+zhZ;i$0pS(|IyK4=Y<AO{cfY0ChFZN_r!BM>E)aZ4HP98qp7vbK<IIwOG
+z9-sL=j2-;pC@)6Jca@m@@)wx?&@d?eg2tjvSe17gr?RuL>E}<ebpIJx_q|K2AT%?s
+zK5_4AOnvEnW?i(02iNSZj9eU;@B-d>c`|g0PvDccp2v#l0tEQEq9#8Li`VSL2cLY5
+zKK{0ydcs06s4h8&^sLi}-}wtZn!O&6*@U$z2qaA^%}c=RFU&xpt_n70Dx&LKpfGX3
+z6uX{qR+M7Jk00WlAGX2K%MZp4+4yOJ1zvvtYfOj=(nc;^sS&N*{hmvW#fPs=$Hv4)
+z`1`w{A~y#M=WoK)7ynC)iZ#~E{~RCA-2ziPXBamZp?aw$9-HwlCJyzdY}Vq{cRs`E
+zIu%^abWubK=+Kdm;=ePVgp>INE6Ziu!2T6vC1B3yZ(`AoEG~|&(5)`Q`~|Bp=H3~2
+z>Dj(Gx^E4pKR*i!TYIPo($wWb<P$OkZUH?|d@dRvy!|$IB~@@iwL(pC9@hKOP4?zY
+zgn9}EtE0kXWjRTh``+tVv@Zh=Uan|iM!=GVMi~3>YnU;4Ft)Cqi_d;off}e`W<V>0
+z#t0+seHxEU9EpmIUHIhFudqL*jEk}ns>({>6*dOXKKm5H{2V%rHK{9OWX9ZYFnbaC
+z3(Tz<YTJPP!YXtd@&Kkk{Rm8}6EWwT&#?LMDOhmPH{e(?vh=~EM^$jLXvO-)-{C7>
+z+eEr@rKXHzOs2SJ%5+Q_KLQrY&MAm(5^6<7(J8E2@B_a4Wgns*ei1zw!PHWE3QK<c
+z5<jgu03(7_>k3Hxw0#&}pZO9(-Hot%;V1ZV{thTCY++b`4ht78!=ul?fqO^w)hdu3
+zN&n*GRmE9Y@YN^yetirc_>UjD_<2C7Q-ZnQevS<XQwfk%LnhvDjV_`dv4pFW88Y|&
+zf|>vKBg*wmVJ)jc?zw7=p8PVVJ~R$aR&)hjT)`zj*J0JdIas)1KlBx}TG49MN-J9M
+zxaZ;RZikw*&3N^#&yiVf2zyfv@=oWY*Vrd9W7<Qo!)bgt^LeaKtbn(R6^c(KV)42`
+z_~gU)5zc3?-$@1alFgF7{GXM;KT1JpYOKY^d0$}bkvvR(?<YJl#0xQNKg5&&U5Z&j
+z!|?sgQJr`RujW~k8@{#(XJ|5vxP2O?-qD@Q0Zj-r;W>11Lv3jWzWHz#nyn-7pAX+f
+zfFc`jPk$QUeEcP%hW0_2^PjO39o4R34*AWCzQotdcOol02ZmNI=NHyiRF~&r(X20V
+zhTQtEe*6&zy3}LdN3US<&p%>7RDW3Ktih`7$rw2KUA+2GBvN+%fEjNs#h0@;qURTr
+z+4hc0Gi7{~iowiJmLQ9YN_7)i-UK@!ODoNqRr%SdR+wY#eXrv7P#bOA^jf)#@-jkB
+z%682CX&qd9O~U)HJq*2^?RfR&_wm`M3oxkP$FP%Kd5UbRuSMdnb=VM{k5SLPkLM=z
+zA;tf4y#L;}Si5E(+-wG6`H~H=2^xi&FFgvwb9?d8yI*0^yu}D`xepr_EkIVe3QxZA
+z4hFe2WBKe4uzcN0Y>te=!y^Ma92=VYYNW>>z=lmJ2)}b0o_}l<>at?+*+(B^+tx*h
+z8q*b(#b;sZ7mBBzeg+<9IuOKnN)szskg0I%j<wixv=GA|c^!|B^2MQFzsJWvZO8n@
+zz0vJIcXup*O)YYn_-gZ^QwSgVAf9_-9BQ%;;_ENIz>clEF=nt2wr|>s2DLAyPJ0r8
+z%3RF;@@uSLxgK6F7N|(rg!t5IjJ)q@Oc>;WeJf{U{@R_`*d+x1USpx|Kw-_#K7oVr
+zN1^iWg(seV6kaB!nE%69*c5XFaS2ffF)yNGB16<&4`EzX1ljw@6liD+XZpXhk8Z=d
+z)f-`G+e52N*wrO4{P<gJ+^`uvx(8!$uv5o_@BA4JRVCQ9aWz(M*@l7!n%0F2f&2{#
+z(L1nd!yecL4#Tv^??v(6+4$gxt=O<@5agvzShivdj6DY7<>^yk+Zc~GW`2a9=B`B;
+zu}z`=P8~k~_69c7618>Je5{F%MG@Ue+Uj|*v7(4XPxa^)H3@e{g>jK4sS{mE_Fe%{
+z)MsJIyd@~pbHtM`&OmRcI?Vp?Ev#Iy1Q8LTupvXLtOGMfE9t7wRhGgzWEAclGYD?h
+zO0<%1!_w6cR*Fi@pEn<A1^T#u`b!ucYJoM(T{C~xGDP<41$FW~{JP^L22Xnz&)v;;
+zf6Hfh{{2;0w01Q7Tt>rOb#t&1?J|{q|1%}f!H~U`I@L<wTq)KZOorMz3^S&Tg14tP
+zZhznz_?hb>C1xAwt-Q8{yW{%8vuLiahNF`s<RZG8rc(<yA2`}7QFi7K_GGkR<k*S0
+zvzH&dx(vXS`^Q3)pMdy`tH=d^ajWSwl#~3%$2SnZPBx@+K7WvtaZPC^wj`CHYmXs#
+zWOO)uyM*Gw$&+AITY%V@7(~a$qgCmLY18hf+0_sI$3BW+CpEH<Z%1)wX(AZQu4iHa
+zcVB-5(R3@Om3C{ohW^p~%nV`;07rXktu;lT<VCg~KCn=ea`wbQWYwAAz6T#fpFkf3
+zMc$3k142-ez8`6YjN|X12>gV|OzG#>2ai885x#D&=pGn>Kucp{60(t$cobRn=D2<I
+zI1CNxg5dCB7&RmWRk`svkU;ZlS`mD^_QsSu2BLdN1jbFA05eTFQcoVI!MNih@B{St
+z!nI2TCXT-wp+24nq-CIA7gy*slp}}0*^;~*QYtH8%@8w@8&PFt3tMMbn)fRZNA^Gy
+zhi-Uy@?8iD<aNW@2Mb+fr$nQ?6Y>|>0}(#gZNNB;zheTtC}T5gN4UAzYDuapX^}Wp
+zpuvCvQ5bt$KST^1iGF<tK(~^ziQC38cLr8IVLUbjA#}?O8hksvt#px-m4<?<PBegi
+zYZt#r+%;}I`h?P@W9tHQdpEi#=>KPLt4fNYsjH{SUJV6t4F(MJv~hBwH9?M(Ij50c
+zs)s=X24M7{2=pH|8iV`wgQh44XY#T;C4cdRTIk|Av41O8tlEnP0}CoX=3JnK)vg>T
+za<Y-vV1e5P^vAHsVBGV-{qQG8N_NT#L?7Ib(`7Q;IpHq!4G%*2kcsFQ+5?SeVsW;#
+z1cLptQ-v6olY7?U`-OX9Whaux2@V!s$+20<xuA*o8XGHf7!&uROKgO>lRNC~%xGCV
+zhGRLE=s9={M)c}|z~EsRJ7PH0_1Sbu6rj4H{YAcfE1F6RQD0H21z@U)W6~kLw%Xnm
+z4vyAnDNjXoY5}}MqHx!MFm$C`<L<l0!Cp~?^wb2bJ&=SJwGXD<Ka$o%U)=NPG<2s`
+zBQ@~|s_C}sZ1*qUI_b#&q6Gd?7KGM@YSfdPS79FkTP<cxmjEJ1^mNq4o(3|zaTQQp
+zLwB11Wfh;xL1|$bwk&uT$s5(EVnQN)rnG(SKQrJ#Hn$eWLc6*LYR8Tio8aaPOTM&c
+zi^wAk_p2UL`UXne_25fXI!dtgooRSyRYKe3%EhapvJ6dnN|-X?i*`St$5?24UwE66
+zQ8GUdIwkZyT6BX4DSt(g>zksdyMmU0B2<$0*iL=r9lW^4KxT}{VGkj^|6Mq;=1WX^
+z`fDxejX2g!;M>{EOcb7>+5gj*vBB5?RRjyVgpa|C&)i9qdNFjA4)Abn+bs%4$N+CA
+zD7Pk~poE}Brz?l084wH>#zpltzdE?7gzQgq;@^Q|C5><nbA)kACG^#{oG{zuYD8*o
+zHy8TX5r@3ob7<BvhT0|wX4)~JAU}o+e9g&LS5pcxKX(My)F+mr3;oT{(<0>I!Bok`
+z#5)|>gYEHIP%@phgM}V;pUOeXu`;~(-#qAP8qjQDhQW6{f;)TLp{}MG#+H6?=FU<S
+zQ?defbCe;D=Jv|ER#>U7EPovX6?{WR;!W>?OoG{f9ZTn9{oY;J8<UA%BL>67K*Rd1
+zU}-_{u2z&PxLBCML0yOPqFhu~YhYpT#09*K7sS@mocIePoNcN^RSgw1vn$(>oV~;G
+z#Pb29impX^^mc66uo|0p?S`q(aJagtP?=DUyz~SlWSm9xdL;pb8n|>Hh{;pNX~C>I
+z3I~`{=Eh<{HME2iBMmI&$5BnzOObn{Ln}84p$f8&W98}%bYVH*-h2BY_2>aDI8Udk
+z7ELvEFklV?6LU9h9y4A3_O&s@iP}OG<@5Q=TxrU;f<lY8FhVzHGi)$A&auy27MvSo
+z9nN+fbEgyW-4Bb=Xx5cGad*sFxSZfbc8H35X<<GwASF1y>{}%5G(!V(EEw2z#}m_^
+zf_v3DG;sVmIl2-U+7|li=IlsUPb*VyS2ATc8(<^^bNNzHT0qxI1>%p*!|Aw9v`!F=
+zXzYpyraprx`?F{u#>vIm2XcajMX_~og(EjdCB;m{MKGn@W(ceaN^Kkd?g-_x-&$8f
+zJcCet1!71lk_4_!0v*0GS9iPXc{YbQ0Xri9fDRGmzrAWY2K0gJaq?&umVds4*RBoX
+zrD`JHz}+ht4n2Be*nn`HirI+oe_nyN-!aDj-D}KwLm>FiPrQ5s4P?S3Pa0uCJpVU~
+z*ip8>)ZD-jgxIzV)K#=k^xVVh8xqaT-A#D|tZ44k;m)HS4<+U`nOYxBr<u~4G{;b1
+zjrK(M3TgZ<zC!G-HF{QLj|)Y&$bJa-x5L4$Yp{IP_xOw`{-IWEEg9tW+D+MPh>YMw
+zkt3o?@G5subV;{s=hcPy0%AFi?xlHpDORuB1+#$u7=7p6kY}u<%a>;T^W^rz^lZSL
+zoY?tSu>azD5l(-;79kr0Dv*qf;X)=D2`>zq^QZjbmkuKatX;jKwyHqti8$=uNtX@H
+z=H&_>S`;3Hzm*&ZOxzF_7J$A3`oW~72y0ib!m9biBp6KO@MPOK7PLD~Q5~BiGuA;v
+z6)jP9l)vg?Y5t*d?Vlt7GE&2a==6e9DaeRVU_=isSX5LSYKu|CRMRbdsJb-aw2goE
+zUrv-h|EQq?(7@+!%n(4G^HB?WTqq4_*RE@5X8j#o5cCZdv<4WVw(&Ib($a7;HH(R|
+znqXX8NyVJXpG*a3*B}J>hN8QV1JdI6VBOAjSjs*+shE&RkGtyM0C9RS<X9v~g;6h*
+zKf6yH;T20=`B`jUy8?R>b1`tjV+i(c#PR(#(4p(8ih$%s_D}nAoqzr!dPL5;>$qvC
+z(`SM#K0iUz-2TqUnDk9#$*!a9TR3lYgko+Y-ecuY-{4SAH733=4z8BzXkvo6S}HhI
+zbS>018^F=o8+K+c=+`S4<=JugdGR{T`bvc<eRZ@cx%Jq#c5Vbixp)`&?lBtXLgdHg
+zMbJnc&c@yg!L*7D7}OUnC23f+WEsBw;#*ie;IFlUh_T<s*2(Vhozo}(c{SfH4KLPV
+z$Yp!ooQWV;>!QAh&%V><lgqbFI`Y3Mf%e(-pV50xlmcB0QZkEAVv=lSX2tT#Rw&Jk
+z81i#%yP?Aw-p02tUU@eNA$=oY!d+Yah=Hg~iN&&%UC1gK!o`@AU+ekBk8_X+!E0t}
+zUV8_#zug$o#|wow*J1b*_`_(0w!*)fIB}8x-PW3b!OCVXQk;y=&ya#?vYMu4BPvv8
+zRHCl7hy_>tv=;;BJO~~&8SX<=jE<mBl}}+1O}*K1Lvbp3KgvP{aSZEcy`r>Ip{r$>
+zrXEeDHg=ui3J_tgh1j}w0lxTr9?mt((C4<t@zA6@5oE8y%49xwx?04KD58H2^wA1M
+zz=~$>Wbu7V<N4iE3n%3UE}D!oFg0SBnD&wm{$Yq{WeK8pticyw%t1Q+GX7z=<JtS}
+z#<0FUps6at?T@~U36`$(=`%}VLj`<Y)p+sMFOZa)0wd-JY1M7~&73Y4g<4t;jLCSZ
+z?u2qCqEJfDongYRCOEiy;^7ZIz(7VNESdK$fpI%<$d9av1X8vz+MsRxbMa+zgBH>o
+zE2%WrRfwIUI3~0qD!0rI*ueZADk?TACY0)^R2JnClvn|kr7cEI;Q~Eu2v+<&2a8wj
+z!@)ywxO-$2X81=DbKp*wk_?4uLC~pt1IN##K*xg5mu(Y~5Ms>epowi`LMUb`G@<{y
+z6G0RN93RD@1G`bBF+^SQDeTBjV?;tW^crHZ*~J98r8T@a`*{BOx6*=B&D_-{<_ss~
+zLa7TOd!desLd;Gzvm?^hU}j21v0Z7^9=r5E<(d1iVOumbhE}L#!l_^5Vv(J97Ik|!
+z!`aai{r$S*F<MwW{k_{FBbx3&{TYHOlj3l;(3Ru9nM#6?zi5G;w*Sq|x>UN9<V)yy
+zs#V%|!NjRA!kGYHdutQEH?)>kpTk#cVsJXolvW5ndm&@3g!z0aU!hc3n-h>Kb_Gll
+zBPi<I3PUt2TVSGAaBN&qnl9aQ>03zxmzF@=M&#1RZn1AU0VvGiXu*tcc}H=om?mqQ
+zBun#>aO9K*Dl<=}CBC+$g%eO(;sL~^oJAvjuVT{CPysMxbf^Kb2zDO6+(j}hkD+a~
+z%x9}<tj4jpV<>4Pi3%6&Ygu%-J5yLV!h+f1inHQT%AK8vYRKeHH?!1)rgoYeogL6n
+zbdu?@%d``9Sz!(irPRPs;R;o!7RW2LScF)XAU6Imk}`|9@Q8_8#Dy~+n~Id&$P^A9
+zUNERBM(U|dT3)CeR1_nI=J`fF2iUjS#IIC=HikU;@MgUJ_LnF&@y7G7e}Mmc{V4?d
+zFd-575UlK-A)~t>CtHO0(JE0^gcB#Sn6SzLUY<0qa{yH2CF2}-R894jIFosTi6rTU
+zF|*a0q_0>x54KR*N{io%&pw`ov_^A0^vo*+D87ynkxX(#6L%?5^GA*)BIjHi2ZdM&
+zTi8!I7eP}36>V(HP+gdgQ@Q1|_SB<*$)t{DHqk0TLZeQ|zmdw({x#oV`iz-4kWvg2
+z3ws0xb;E$Lt}u}|ar~=@q_4rbv)L%Dr1HZIk7?O?D5z1x-o*#DmMWCzpWz~3LdCIx
+zgeN&TmD5O*w<S!Niu%e$gTw>t@y>r{68(MvEru$%dj=rF-xnU{T<j|HaPnjlP7vo%
+z#T_wwPA!1eJi!5>FoCr&?Q2R<n132&waut4%Vj9y8I(1ckPh6WBjb&>X}WYVxiK`-
+z*~Wt7`WT|)Q*e$UdwH4ZNXjmRMxT5fHTiTsWuu1Hg#64ToXl>7vD$$kS%v{N7clzg
+z3~I;$(ok8z_m-};W)Y2H#B}Ue?tNPWjHnQX!IjT3k(pHw#HBJBQWf1Qi8y*P4aXUR
+zcswNsB@AH|%CA_kxu2&|LjhYC511Qja5^g!733*sZmhwHqzs0e8pBFW9*>UvTU2fG
+zGLIu6@f3>7nEIW`PejP807dKR$YAO0L7<`m3aB)dmh(8npwm;67|yH@YeyHj*jk{e
+zFbUa|S2NpIb|xON8Fd8EI%wa|cB@J!q#&IlN#HjLbTn)HcH+(dz!#DJ-r+riv32$~
+zeE!{P+|$<)hku!cY>hdFMU5ed@Y<FZqV|)bH{!!@Vi>ZegTX!QQFwAERv$eJ*YL;D
+zy?bBu@lX;yKNr0NtYNKl26KK`2h(n&5$<XKw;I#F_-GT@h&xd!QJQ;UaG*UF99)Z^
+zRuHIUQ-@!^T7p*BKt%S6gv=xzibb>V#V2#2J3a`<xBP;*5*>_r;0~Dog(oc(0I?qt
+zzlCyCUsr*ROTK5wCux3V?;yZNmnPt)I8tJWVWS43M~Dr)R7)5N_7gnSV^MM95LWL@
+zhI`Zug7rF9-vl|(?oBI^!<@ilCq}`+xE_0UY~~`Q4+}dR*m?%T-DoA&E?xvLOYWYt
+z4`bc7B-r(P0KJ2{qQKV{3u1O+&d*`!VOx*2KdweCebzxef;*)k)K?cHA$A)Mrxl|2
+z_|XK3$`QA32W78I3xJXvv>eR;`UA+^V$kyZ6zJ7tVZ+Kbs8li@J-jy*xfNKmb1lC6
+zb`fd^J7fQ^zc9O_3KM%pp)&>?J(`RaB(^%kc=n|W=R(~y2$fWLR;=4e_mDGueY&97
+z#sK@bZ^2?aYq;y@VCUXg$X$D(N8gbs&?`su;ux%4z6uS!oUm)<24vN$&@V6uw#FS<
+zkmwE~u}^hrHnwhFL(T;wI4NqdVaHx%SIN+g7K399vE8sY7ikk8L{x-3PEetUK9P@r
+zVZ#`uV1eS}(b&I-yKN^+sEdy=s^b_`fg|AV?(sWUl^D*KDz+XGc=)*hOcE&{2~0d4
+zvld^^Sp=EiSWKJz5K3cLBj<25c5YqIES56lZk&sBrkm~)9EM2ua%@_&8*7%Vgrkxc
+z#nR*07MlXA9+Tim)<YT?IxJ?M{W1Nu5RyUB3PRUmQT#8M{=r-Xj+%-m#`i_^FK^?s
+zANLWE`6NaXd|RJ)0Gkq+RncVxx-!%?Y~NvQ-1sZj5x){((SSuuw?kv!gB%gW;dBte
+zBN}%mEe>-&TZAJi4`AG={!rAUV&$F$=$Zz?KX3rb0%NdX#}=$z?~dXCQ>>n|5~W6N
+z2<#e+kcK2|iC&C3^H!s7R4|g3&%%k~R!r{ImmDP5*tFWAB&8GnEfV+(%f`*?x&hJD
+z!ykDP8&mSJan65mV2wGd=<6Rc=3Y!08+6SZrf*<`p<^cFK<qip|8gdNWl|(fNj|It
+z`r(P^rof6j)5$MRL(&`H<L#H8B%2y1VVM`6oi+(>e`Q6!s0RWVr82W7o1`t2jJFp?
+zTVoR&+%s(|4!!y*zJ2#OElXi@vl<f~oPeGrZECU{L*#TkR&V<XPaiSo4zr15DWmY%
+z_+GsFDhum3Qdq#=)deOBVV-7tOq?)f(gYOES&k3icpm0tx2rF&KycI@c;LZ1NC?w_
+z`yRaqA5wXH;pyGn0ky)0i`TTrM}St&4vR1yH_$|CO_cbNWnba&QlXd#A|?VSqef!J
+z3y(3bejGmL{b$ZNq*WYjT!Zl-<Ltd$oiO5o2XQdxODrIOa=DuL5OM|Fe$P1c@8Qs4
+z-Qt91re|(oq=t#9F_O10!%O@TEzlt`mTxda|DJsYlgIYQkDH@0<N4z-BAHK%z6!V9
+zdl#bmhob(hF8W8Gz|J+F;pjFMEfV_ZGjJU49o?f-@;6XgpbH~2#swe7uUqG1Iv3#9
+zx=OV2xsSeo3I>J-Lsl>vC%##TA3uMM?i?yEW^R}?Hi|?_K`1h=#L?6<*uH8ucCKbL
+z3Y6$SY61q+0%F+V0MLb(UpR&j?90%|E%@M#1jvNRoOSdVdN+oSz6UscfNp@<ShMg8
+ztXphIZ%#8@gZg9CZ3EFi&=ggrIr!@P<@oZQ85EiUBQU%$e#8KDaX0Uj{0-y^f*LOn
+zjI|cI!`;Ih#%|7Zp;^GC-#`q{&cu(4H!zGgn$OFCuD?+j+S41p&T@?9vz|R~IX-&l
+z2%75}p(bE-%7mdL5$l}0PhX~lHKUW-i*dO(vvqpG+rx!p(hfszyAz42`Pjbt2khCn
+zh>-<lP&@kK-pTjCuS-|l`M^Y^emVzpK7C7=mI!&U#Kh-rhrcU{y4r7g+248y?L87>
+zhNNNj?qxW3a3g^wl`vG>VEki~;O89xYesD(=6{W4<QiGd=c&;sF#3V92=R1*mFI&P
+zbut$lew~Gc-D-wJ*P&bgF}ORbD_yVusA>MP5|R$wcnRpZ-cnS{9ScAkS&(}YYu4{X
+zCH<@B^al?bIuy><*V=y2))qlrluzI2wq0>3V+KD%r8&YQhoFa_o%RF`{l<s(Y(#8Q
+zHaGbScrb=MYDi$mG4CC8wS|k-+0;ZNpDsf1fWfdZYMWw&={PO%5OyCpMlUa!8(q3#
+zFk{k9MEBX&vcl6?zhMha(2ewcGQy+JAo|I#KHH_RT$G(9Yh7FlytxZ;wNh(aEHDqL
+z3G_+FrlW>CJrgTu0`>;M-Cnp<h#{a0VEe`mG_#iyBxOz$d0#|^xN5KM=pSL0J$d{v
+zQnE@ozY5z$TM-xoI~O;E^yscN9Ut7gi|6D+t`vaDaP$oG)LICd8ftJV<tTQM>9Dbd
+zxf<L8(YsG5th6kY?RUHU?<VpfWTg?MpL({<m)oYFaIw>YxwXBPmC&%M7_rg&kepFK
+zz@Q9Ho`Gbt41+0m=&cNq%g;&2<{f)bUZWx4%oE`ek&NnSlilTOzUT-s6vb!Lv1|7}
+z<kFI2Nae_bA+Nn7Bd916@JRU{jTgKG>1d&8+n<2Z9^L$4ruAVov;W757l=g(pTD)E
+z519mMb#d<80xeomRdSjkvxjgZHIG;p130<)Xqg(F?3gf3Q;Q7VKQ=ZIMP%|*nA#zf
+zOpRT9oU{=NwWLXpr)mD!iBo(R%+Mt$gl+R-*3pia$BQKJ+sB$R5_V<gKu>84A1;Cd
+z$52it$r!RVrljS<*whVu2K0rSqp23VsHrQ(&Yc_^nYq+YROlMq2f+bue|dpytT@Ne
+z)pS@o`NGA)iuhL@oMV*5p(DqTmtUr3^6b&GAG-RvXqg-tc7T}Z-8gzYjS*G4bbExM
+zPtPvI|8#x_UtW+wCe#>WABqUNl)*PB65-vwp(2h&;IER89m3&QMrPD$U~M0W{sV$x
+zYu-jRFRtCNc{d75tEtSppzq)T@T6?cV^)8YtMoyVz~v<HN2=w2oPuz<j!EB35|AVy
+zNkEc-BmqeRe_aB9R1i90`2FjZNmoh|kR%{UK$3tY0Z9V?ObJNNsek5klUm&g2{bXv
+zqo^Q{=2($ikcF-S@t<&05r5A##c~q+C{WMriwX-nm@(ng^(-RmXK6tJ8g&#Td$M8+
+z{#--`!_v|s2J9(dZ)1MRbN+ml^o=9|Ndl4tuDt{#1>xGuRJ!9WA%RwuoXfz^-+Y9<
+zr|Pu)SuKpl5dVqvz%3-eGPCf+zyZEUr{BE$UC&{3Pq*vWa={XqnT(}B%?Dft<LReH
+zT{5zwwxSSwH!Q@_VmnNIaw2S%9Y=p$zeY=UmLwoa;D1>Hl8fPg`RV`L`%avr4(Tfl
+zX)&m+DrY9f9oW4u8YN^E6a-g>hV?|k3zohb#?_11{<b2*I-42e-lU~p<agq4f<{I7
+z+aHTKw~3Jtzn%NX6VCrF5)d8Tw;8`4%z(L@$8Wp<0*u-~TIKfZWhA3glH>p28nQ_4
+zI<BQCzRWG9uO$gc5|AWtT_qq{5U#6urJLV83FyGar3<Eh@ExAwA}%6AKAt`m$Cw!R
+zjjtCVlpGF%qPeQ{EF2laX76H#;@k|J$uFf=(Tc*tVxrWU#@NY@$-2srlV3>2Mq`Eo
+z`VrA?%LSe+mCWvUij>58%+;aG92$<!Zg6vRgi=rp|E_3oE+>^S@>^l%HxwfV_>gq4
+z0R?%PNKVT_1w-<TRpxMI@-cyy_Y3O-ztwB8aq&Ei=o<v*PDWw;u1e_-Ndl4tBnkXY
+z2}laU-xQ#9`K>Dfk*h%@bP`1_lQUP2E<@#*yTe$??}<fdszOFuG#1WYgz)=cf$f=f
+zc=KBlUD-OIvb2IpZkplZ?GOE$0;E%M&>@F)pV5;r^VR7v)f8gmiUlO5`2|IFdXSS|
+zTjdzUWJk|nWWTPzqZZaQRN{1M3}Wf(xci=7uws6Q{H!GW`00CCz9$(<CReJhZG>0E
+zIK2MiRCqC)=YRoS@!rp=I2d;p&I4U;T_H;?lO!NX;9n~N$;I%meY8@?ekTEP8VF_u
+zEj#3Sjs@|#k?DJjOUg(OTt^OvN)!||z|1KUPfvRS;Z90K@7;$ci|%;t>8H@o#|nqZ
+zVt6oxl)edjFzf4isJ4y33$MI}CmtGwrgPEw=Ce7-skq>-5N)WhEJfDIqi8a9L;yJr
+zTAOQ-o_r8<S08|9*buz@(o2{yDw1ijk0YLZ8gdhJxCDekRa=ha#6)eof7ci34@m-&
+z1SARE00~GIgc~4asft@$0zykBvo9GFb>U1G!lb8P#Beu8Hk8KUc)1J{9-V>v!sXa&
+zL>$BHohV{zX?e+EWR$dG?6@E@_1U4ypb37iwq$ZlL`Go^Jk2kF3+rmCP;fc}N|hTd
+z%t=$-TEqHupfoZ@Ey=gaDs>SQF^p8wRp{np!^X&AVq(iw&Na-Yc$S1%B<Q@gMJTmS
+zl7J+Ef1v~<1>s-#P^B*YMF}wOP|2tP8(Y#Ow^nL11DdFrlfcc2-26;CY$zk0wmuV7
+zF%+>NAJxqKcyRMF<_uU*5F?XERoBDb&FfETjYX>AMkcosnW*J*k*-+<&wxlw8hse6
+zm`mY<w_~AD8k5dB0xm&4X)$18GP*)o9qVn+-S-#!BwZ#+K$3tYfxjpLNkRCFf|D-$
+zcS=CG9W)owJPZ2hwx72Ciof*8T`MC6vZ<*HZey;F;eFg`38>I!9V}yR3@5V-`2@sO
+zdQ>Wmh<m7`#i5#tf`-_J`ucjf_a1{cM@&I!E)(tix()}ouY$RIAi@GB5<uBZMMMWi
+zTJDCnx}|?52}lx<Byb}oAYl-0q_m~FZkhzN%RCo;k)HWN;b;CYzN22ikK(u>QEDq%
+zyaGccFDM91!OJwf`Z6`s5{HnZfGK(l3%S!bCg8Cg`?mkeJP;>oefT{El28t8-P}=A
+z-GIX43Z@LNMAD%Rc<-&R5Sv^J{~nPTIXViCDnn?R*_M`ihF%sRuT%~*h0P`T5-#*X
+z`Xos}l7J+E>mvclf^dE0D&6%KlYpLq0Zgo|VWVU5TZDnghG<}<f+Z6%nJA64p@!Dh
+zjWA+vU>!YuCL=O~l}#<=di+~NK=52!vKy*ROyKS|0Cx^Qf~DIQ<C#NSq0lQrtpT%b
+zPL6_$`R~IVWolD6d3S|u{xYN|reai3Fg*Rk;bXcB%f5db2Y1?{^2`|+*oI+HL@0D>
+z%8`?tfD(NxczJZ`L?*ynOxRL$Bne0o_*Y0kQV{+Xk5TGGM-nh+=;9rZK7&53a=574
+zvJ2|y5ntdRfyqx<z{V>8vU(MaeXHPUsz<zlIl2!V50zI1ya+hdG0=lYxBhra;RR1W
+z3s~DY;?Wo1gkSgVIGI-rLt|6;b?t$^kzs$rAm|y=;^5T-;hrmT=-^%y-5CLopaFQ}
+zV->dTKZ3HlCKwMK4*#G&=pX5Y!jw4d-+B~IK0%0#bm^#T(s4-wk_03PTo(yQ3c_^}
+zt8~*_O#*W6;=2tR`uk?->chg`8-4iGRv0<Z{*k#5oSClI*{l5$Jy<jC?-2g97gHNo
+zjGFW?Mzw!&+27(?FAN?v1m7%;!|vE@+|$nkULpOoKNnxtTwg)*rK3nFkz?57cfr;4
+z_tuDu&y_w)5|AVyN#I&aK!=#8i;KQSqhWFwvd2k9l7J+E>nH(zcn0@H*s)~9lUreM
+zpxGr8F;$i1AR|2$E?s-!w!Xe7litni_)Mf*OA?SIaIpkxYiqSQtoHBpP3TYEwryMc
+z-_mbM0+Ix-lLT5cjc^MHLser9w(_036hgR}6wHlEXLReTLgK-#NE8@JsYnu#Bp^xP
+z21p<|IT_~W=D*dXGiT16R$)buiX;I^0@qstg5Q89JZ<E}<yU@P0wP5b5fxIABp^vZ
+zlE96UfN(MN?Aa56fq|k*9UX>p4ZBg5OZ7++kR%{UK$3tY0Z9V?2nlTdf7crgvMZUc
+QMgRZ+07*qoM6N<$f|4jfbN~PV
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_queue_allocated_vcores.png
+deleted file mode 100644
+index a311cc39acb0d8cad58b4f5676fd80a28a0d2a3a..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 78569
+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
+DCI&#i
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_running_apps_containers.png
+deleted file mode 100644
+index eacd23a4d66d8da64ef969324b355748dcec0a31..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 68920
+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
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_scheduler_operation_timecost.png
+deleted file mode 100644
+index fdb1a1c639b38bf8533eb1e998b33e3a7b5fb9a9..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 112727
+zcmYIOV{m0bw~cdS+qP}nn%J34jEQb++sTACnAo;8!NkeLws|Lf^SyfYy;{{(UFXN?
+zeY*Or-Fxj7t*$DEf=Gx60Re%cATO;60RaVofPf?g!2Nr2opT9<fPkU4m6B3dkdh)-
+z|L$yU>+lr<f*&JXXWMyQ8(TEmS+fLJj9gDHGG?SsN6WB-h_Gf9P9e4QQW3ZGbd{0%
+zK#(uGf(U;7w6#*rH<%CZ4O09MG@86H1qz&n@1LjsW(BQC#!3Zw-;-f93ffCpo!u@^
+z3p%Y~qsNy?fo*|fp<|PEX%SP~mLCK<Q5jXWdB3UCQ_FDE@>OEyn--Oz7pqQHS&}EG
+zF<A$2o@dT?Nn!w#m&sQjs!vpXKCv5f(UfZaPB<j~1Yl&1sYUx%CG0-<SFmjx+{Qie
+z%>pkBR25XFe=a6)Zj4Sul|l?5VV3b6rv}gsC)~Yi&DLga3XMOWx~t<v)JbWb+*Ffd
+z{{8nZTcT?l$0r(Vj>p4=aj4#FZfS>QJ6iM>)01{@wAf0^1M!Vgy=h&Cf_We;IPqoP
+z4+==8@lcWC@4j^`XKGr5y#==g>pSOChNSXp=fUAijNdT#NOPVwPQ}0C@eQ-71TX0N
+z3%GgJ@+7%@T+4RHd}lz>zcSnOhwGQ4u+7OPgX}3Nszj^4vgv~$_#m<7n(lJg>3Kmu
+zt|Ht!C0%=`+6sxa+8_EFNbj84LMDmh431stgK1=wsGXi5f=OJ((YaIFz#40xZy0N<
+zuwD6hYe@y0^B3-L_};5x-GXdKaK!7zi<%a##r<+8($Z9_xGWY+6^cS7>iL{$!#%RR
+z!Ze)YVc|oQ<{Xr2^Oz2s-U5mHV_|WPcs(pd8l^&GbuN7q4SHf)e<0t;ESfIZiN0Z#
+z)bp+8TmX~?1P4%I5x+YM;xI1w(?8yKt9fYS3aYB#y@~tNM`_Ibxh8y>PW*`YQLn`G
+zK&3Xz!EJbnMGlW;<H0vCT4rxAc7ZDV3$6=1bJ=Te@BZd`AHNyvIL2G=G}<}{Uaf0j
+zd2`f+5;F6N$pHPj@f<_|Qjv%lK`zjsoICI6&#q~%H58Yg{SBU_q8$($7oD2#*qyEX
+zDEg>yDmN|1Tih113nLKvN$t<*&-703Pv_6}t{mg8-%0sSZJgel%nB>eb=^}yv+7%C
+zYL2xTV{EfzU%*4BrTWYF0PisEt^2J}n5Z7R!<00&?4al70^w;I`JJQ(-yN~ZPNl_{
+z<rW5?8;u4o4{l{tdnByN9an$7AoZsv@A&BI167%)QSM<z3{WsXhE6{EI#z9XY>x}7
+zEx#LV0;aA13H|tyip4G{xZ}vIOf$~4mnZ1@Mdks~J!f{>H~?-NwMe1LbD8%Sj_#kj
+z$~p!FzhCW~#!GUMIMduXzYpnoz1n*QV~eSKLn#wZB(`3AWjr^L9j^?fBR>a)&cE0g
+zmSg!}qCfT#u0`Ca`W<l<#lk;!_Us)O%OAicYYEnGzml9P?QOcZ%>jd+b$-)H3z6{=
+ze%A643Yk)V;?8}&7t@Du1v(HhVf~{G1Q&UIHwXwk%>N9?Zw2%JSVbH{L0Uo^2zlWT
+zYi6Xg_QaKuJw=_}?mI8PUZS$OSvaCJH#j(0)HS(xb%h;Z6x%Egy4qUgaa_>bzsjFd
+z9{o7ppmx+;8ytgw#c7A1&+hnsAn=_3EK<jqt6DZ$Yuu%s6dM=xU-X;e2G`fKhebqq
+zCT^G1*3`Un3kkgvmTDq|OV0UAexzX}{TJX^a&dFWn3x!s0a(0#GxjJA`y~Pb0`Scc
+z8i(yXb$fgJn@nL+Bm))se=&;{j6%d~_6EM)M21?lZX)o1eHs};6GQGX*}gaU+x6c#
+zg5vs3VS+a{i~x?3Ub|j2)nDwNo&RddivJfoY!N}~9Q?!yCdHx?j1Pj$pZ_0O5(b!w
+ziku4&c=#uCjP<{(yTHL%!R;dVk4JumvHCxJ`~r+451M*E9X3n?#{UnwkdWCD{Lt)o
+z<^+)chu}U=D9+Fu-F$!Vi+{8K!#8npYxEh2I6uArkE<>&Xo~zT{hKN2|9?(D0eTWa
+z7#9Q;S;qfw-~WbKHq|?_5iuI!v$(QSTv3XGddz^A`&0&vt3_1(w53t5>U+w@Z}Syw
+z-}L9HNq4OV*JLHwbaAAh=5h*;-+_cZn^{w68I_Bf<cZ7FFCq7|9$iXl?Dx~C6VH%z
+zcc3%!F81#z0+KKAxvE0U4hz<wn}+XyZa;bP_~*<U`t4r(yjgRHm)FcC<i>vYarI3D
+z4-KqfJ_rHjpM*niG{x>k4UG`%nqK5}?J2{gvqb(JK(PFST2yeCs@tgIMTVe*aSNuX
+z!U8)#D>!cDy%CF-Sg(oDgLN*;`y;4nOVizoY5vz@mg@lZNnn|Du4*JnseV_|7qfxY
+ziv6TMH<TZnnC#|yPyw&BdF(CRMW9W%KrylMK-kx_=4=f=VJx{OL^G{+irP<zVHx<`
+zR@TVPh>#(oWPMm=L1$XzzM`Hc)!FD&)vR^<2Dc?A{8v<2i!3ZdJ`!>8j_V2Dk;h)8
+z*e^V~p$1;QCD2escwHO3pmO|bp9hl>6`Z-c1^8MNnZwzUMTK2R`{wB`tfK>R4D}*-
+zgoT(Y@^P%Avpm{sVq+@=Hx)X6%fv<F{mFUu8nt($-xM);+fm`I7-VD5GN$V+7SnYV
+zh+Qyc8U%}kyYqNVHssj09Zt4fy6eygX)i@;()|kO*C6oDhu;cICiXy18hB**wh`bk
+ziKn*rA(t<CdEM@cDRi;9-4_u_=8Zj~!UBHz+jTQ~tYrQdMb^g-2Q>#rpew^{YYb`b
+z;Xdb6%Nf3%t8QjHGV{6%K2hYBIN$pXL-^t3_2T)|Ek3Hj@$a6k@Y_REA5+ARGVc=E
+z*rb<Oh;s(9w92W3@cYiDUN7BsnI#ySxFO4+-tmv$lxb@$m0M9y2jX_mGv}9UWwCSL
+zJ42M|MeWc$`@WGCrIq45HfyP`2pRrQsJ({0w_e_?fmH$PQ!3-DO>m}uZTRWa-wZVZ
+zs&Ef|{+%8#KyKC4)2EYm-`>^TyVy>L7oPd*1-$DuOXg50RH&tI#%`~i$?yW2U$7D@
+zF(TEuV|A6Jqd%4o8sdpjJOJ@FG9|?VXZsm7W_wcUZqBYzqSQ^w#)iGwm|0KG5c*fu
+z8TCY%?0G^Vd7uqXo)93X6sPoX30nXfj*q0eND{CV4BdiLs^0N;aI%MM!P?M`<ZKNa
+zfOHp;3NwR><zQ^DqT~--d0v6LyS1fr9d2e)Y=!mnr(JUvk4rEC3N6!H=#ZJqX^*d~
+zphJ0WrMNxO$R#3;QFAQ-fE*Gdq9K3T3>x|wv@rUVdx=Sb-t`#6xh2IDDS0?(oXqyt
+zy-D*RvxgR}V=Tor1`7LPhI0Uq!sLF_dv~W;2_fH}&e%>EC0EF{Mr7CEdkN*&+ep&H
+z+6N<LAz8Tpc$5LBz0BRO=%2VeLINpLpGtWCB3CYX_ryAkXL#o_hUHAr;K4u|a4vGe
+z+DS5J5+K5M`NnG2>ZV-X*3e7*^u?k~ePD<U@IhKDd>R%m)cfnqpc3vvy@JPu&qt}t
+zI#^dr1tphIca>Si#;HZJbZLN%9N=VtvjjkG)*{q2UKba}VdrUUVxY4>=>C3;1b^#}
+zI68um(}AO-!((&pBEG+eNM;(?PNd4#@O@QC-B=?b!?V#w5k)voG_4hXg6Pkz-t@83
+zfbQB>#L*M#a%pIw8TrH7%*uwjqm<59p5sY4p5NZSe}_&$hkouZwP$*H`IxzItA8)T
+zUVL0GrpwFC^X6BLcXm%<$%-L)Mqu^shmKc6PuuspCD=QCEI0mU4p1?~3}IBJeGygS
+zVb{PZU2Y(876W!-(Nzu`5EAaH+nVw4-HS8~jVwWsDaInRGUgxO>+32l<wyTcC4@s`
+z1HS+zH}^Gg=0ks^?61~8*k9Nw^)H@c?HupMVl1$RO|-EQA9*hFE)PxcGCS4`>%sDQ
+zQ5j`V^!B!r@`}b@jn4RtR52Viv~*y!c*Of<rujJw?;cNX_5k?=GFq3dwcS3#U(~DI
+zjyJ&lD%VhRiMXP5E%7Y%Lg3yG0`CGocjCw)CmA>B?S;|h8Lzn=ilskav|>bv0)_{T
+zrwWDcguw(*t8BLs6Ed<p8`A%>OXpE3_dfdCg-=}8cZ!!$*}-X@$b$o*HqN2>kcLP!
+zrMhlLD6DB<^kw8-`^oz5Rd!V0=8G3HlBTN!^xad<h+&74hV~x-P<FRd=xX%u!~nJ5
+z;cES!A+vs0B2s(IFds6WsV~jX1eJ*8<+#i9%)KVqs!|yier`-yBl7euyOh7YexEZ7
+zvk5OkPPqb_XQv;INVkWoBu65jUNM?D^MN4<<t!ozrAVTqKbtXG%N6mVHC;AUbj@5W
+z=sEcUqDNlS0gKvZf$^B1eqaV<#HD;7W%x-GwJ)FOi#z09l>z7{K>r#mZnCZmw)hqP
+zMsO|x+;*P$m|D3ze#HYmi>0A=q@f@eQIgM&VY2=$sa#H1iO5-hvktrJ#!sf|IlC@~
+zu(AbYiFkgL8{P5%pG?w}J0JUd3cVG*?5^cFhjCg`1#J94(dvOBn|Xx@P!kPCPqTc#
+zyKe9sf?RDs={g&7ozrn+H@6BrQ8WK8E?G@Eu-w@(AjFLSv9!ewJ^|_ENvMxPGW=;<
+z9yMSFKC@_J;|^_rq(2FC_gg2+hDhR9TRl0vey*ESP=WR~Mo>uO1sud?OK~Q}{E^as
+zsO#CyC+jZ*TI|uSr+Nr7;}wD`D$%PlKBLkNQInGwQ)f>#emBHiROI!T?_W5}*^{(7
+z8zmev@q$LBTQauL_J10Ooi50x+$2{%(tBcpr$Q_A*aI={?5Af>7Neqw;_Z)2;?&XT
+zGJ0QG6AV3OJ<=$;iXaUzXYSd$P#4C^#E)%8gY(XB_R*Ns2R5s|oJX7Qv-QI^jSg<=
+zhhK{U(X1`8D-%hAtifN~y`IQRYE9y<R~+ape-_2a#`j9m?ad>VkvsnNT20moCwx@(
+zdwaClaDSI!Z_^Q%63TrVWxQBxM^wsmmhg|nf-9zrNXQP>Ul@~eWE`r5-7X}|x2c(s
+zb&}!Qc(dd<uRQ0V5de&w3N?Vo4#(*$_Jz+de()1#n)qO7TD+BfQxi9LsvX<SGi<n2
+z=U~jkWqz|}sBO2R%+6M9=6MA%UIV@`g9%w`d&}vXOq53XX+<HEMF}qyH)Fq)!9`1r
+z?sT5likEA|o)tM%>vzDcKUod_bf>xBz{8vA1q{JS4``Z(c-ZsvoqH7xsg4eE;cHC*
+zrn7|6r$-3%THQH3iA%7@M__wDII?(NHRA|Z;Z+W^^*)B4R|BZY5L=MCL-#o>kGx%~
+z1cK6Y=G8S$hxeR&#lgmHR1De<LI;#oE>4vHZk@*WnAk*U&NW!3eYg0;hj<hejD*P=
+zpe*mp_jd7PST#AUE&s;=VctNo2-TcufE3p<8xUGQotF6{P*+j~&U~zrM?H=x1icNl
+z+W3V7bqUVm<=M-8a<I+iUdxn%*BbyA2BdNvgL3%Og=fm5A6DPl0$%C6k}9@G9xV+s
+z`~5P)-%p~{hcEH5-mq7tR_K9xZh@Z5pVWz6;CGaeIYI7@i|H(f)C;_n=zbW|Kqe9e
+zP}ni?viiWjHcr-GMCvBDxgnSYo&zNJElNfj4EJW=<qd=kZia*s_xC+`@VR`1g{zlV
+zd-t@6tLM!B(mg+~4J7|mC~ds~kaoWY9B{vw-Gynmv=R@>)d`19&GUBOf)BxGkC8Wn
+zUZ?n+-i%O7k9zM*MB`PqLvOmy!;x&FF*JXjviR-j(|E>i_wk&I)G=awwSIJ1HihJH
+zajPpX$QJibPi_s6{AQ6>)<k@P!*_LG=aUz4M<?_9pc$q0@j{b$(N2njm2rD(^}1cd
+z;u|V!K}b#=@0aoEpCKtc<Bkh4D3vt+O7Nv_D>7`@Y!UCGpGob2Le!OglyKo@kBhBv
+zqZDoQ=P-!j8e(g^7v-^e0C*xSR&DwK`6Z*B(tAf7>}}^l|7du@rbBVq1fMkKhSv9n
+z6PN6tjDC_JWw-)b9TWwqYL1)2By99pU+BjNZhayziq7G$(c#m`@$ODI3e6q(k+qqM
+z-oTi<3szfoqVAQ-k&Y&4;>8h&5*ygV^?n|BALz8~{_(XoTjC?Llqn^VibRuj4<c&x
+zWE-1lHfrzrgrszQb^R@(RyZ(%HiSi`;p>NHvek{_vE1gmuPyRrDv(I%hhNgHGsGxu
+z8z=;MABn9yO0bPOPBlhcY9^q&$se9@9EPTOX~AX*F6SqSM@vmJeEG-^*n)utV(8z?
+z#lXAlO!N5>GrjNpI-*@1&aWogZKA<Sk*5vc2ZZEnJmmTgsN1WAT+CJi4tP5$PqywG
+zfLls>?ZpsOw5lP+Er{DQpD;Q#2Ho$AMkk%tYcrc2(JAqsiZz17)`Zw?g{_^$Ik?ku
+z9*fG-gpuaEWn{%uJfsW`eHGP!DqMfG#3aD*aKw<NZo)f!!k|bsTP+z$kW9hM&^eM8
+zM(Qk{gdkTd>nGq8_Al@yx@*qm##i|9O-}vq^GFaq8nJ?L!b3G>J8&a%@2m6fqYQj9
+zzZneWhVp99E>g+i!R~J4wd{L7+wIFb61spp@?bn|^u*Lu-I&Kh$lNk*90QIG$Q`t)
+zoD4Fuf|)V@S1N++zYmTX#pgIP3{<vMfbV*Av+#1ddUqhCWl;w&Iszm61o5t?w?hg8
+zR`&PNwk5+N5w2}(2Qq1R%I$xyW?lO%&Q9Lmmi_*&VKd~ft2PRsgI1U?ROPkxmsr(b
+zm=t)V^Kh?2;h2ug_i>I?z14^$K~O+ZwoK;C@=4qlcO7~WUtm6p^9fqjj4H;#uF&$Q
+zXiuyyns=$XDiV?44~yyr*^r5Xt!SX=HWKIx`mnYtQNwy%i1OdTOc%@nKlU_vntNr9
+zynl1GpH~vxxQpl)XtT&vsK4%o2xRW%6a7>u3dqFcy!``WzUl|c@afJj!An#>Ip{_C
+zdn<0-Kb-?l&M<7MrU!f6SO@N83e1m3FtR@1Nu|p+f)Yi6(J8TlelE|`dXl4MopZ`M
+z(%eU?pF|&`ETk<hf6F`0c`w$JLm?A|qXK`{j6hEc-pm^g>*a;YZGRHl)djR)S7aui
+z9QOC7JMYxW1rAr%z>kwFU!Em{3k3^HQ6rlaLG0z`b-$$2DKOEt+;J|xM%It*#qL5E
+z(WEOR=0r6?JDCiCk5jLAMhQ6hTX$9Ba_(6X-5A+@3NbmNrCfKvdRfR8!7F~pbUEnF
+ztPeDWbP0fPH$b6$K^vRA?v4z=ZuWb4xCA=73L@UQHSDb8%)-TucK_ZUi-MrZ=y}G!
+z^8PAt0cDTN$V-n}H&RK1q`rO>(Paw6Y<l&j5_9CaYQKc72H*O=<snP*nK$dNjT5ts
+zW<2n2+)Ob6FOH(wb-wK{b$tfIR`m`f+mDIYxq+l9P}O?=GK>zNH`t#NwO?*uTl`r=
+zk>_<5SB*yD>wDpMB9!V-enNeF%^0iyJ|{Vq?M_rm%nCpti^V(Y3DUR?reAGB^nXd{
+z*U|lePqpx%pNSgXg+HcX>A^q~e&gqCda{gsvFHYG7_;kIC;j~n@+m^BAmW-Ui5{}7
+z>y8m99!hR;<01X{4ZYfGjW9}UjM6g@bRfELd#Ci9LeDtftH2k)#M!8!Ees=vSh+)h
+z9o-Swheg`@g}T;ILE%TtXjD+G65!y9C`2K1Mn?4up=a~sSSZ>DeCwdGdSy$Rg~zYO
+z4H171rxzCB`y7*c^C8p5-)lT{-dn=%_r03(Ev1%SsXB^dAcNu%;muG=JRpuF@ipHM
+z5L`a|!+HB(!Ruv7!@*VR7`!9`tJd=*$QtD(b2k4M=r!VWA-@?lM1%(VTonNNl3r^q
+znIEpy?S}K|nm<Np19>v~caK72>v~b7291(kU5LKh8F2vjkm;*X_ct#|+Rq2**o9l$
+z!pe``7y>gf`0@VfF)+5cx#jj6`)h`zqZdqy$vK8W#kTMb&;1k*`hQtluYV88sg)G|
+z=<3T}I8G8k=j+&WX6ubl{%Q?#W=|ghD{IV6u$vF1Nd+e}Ce>D*`!XqPwcH|cxE8i_
+ze{7x}FU001;*KrQ#+?qj1-rta^%C+W3!u{k+<nF0{S^LgQ%|RTP=-6gFl-=`?BTIR
+zk(QNvvXT<}dmET8ojAsb<8lvj>RE!J(g8p&%9whLC<76eUKnJUuNW40d9UP$s(y>c
+zR>oiw3w)WNcuM!Yr|U?bA)-0|tafi7iSJK0u0*Txg_$AC3`!S(Z}_%O;bY#u7c!Aa
+zZZ!Cdh_9O+ZGUpQIq#-_r(&U=&ygwL`^8W@4R^;S7$E`}SyHEyw2L7FDmgdMB5e#)
+z3Aac268IPOi+)WrR9$3j87i&4*0*n+A2>eS7kRO_vzB#(EatdQQK$VWWNns@A!zk2
+zo<xk$9}y$h8>1wCiR*y+P~;FbGYDFhQ>EKJlHFSdz_AgcGvZ32D88s2c_Tdm@TdzB
+zTVqpu!Ah<?oDy|SPy93_%p8k@nibtsiz@}5dg$?7r<|2ZCi_oFz&`5`7@y*>-r^!X
+zlj7`Br5VlaFeN3p^JUop8y9cEv6*CS**|u$<%`}pfZhhLaG6H|&TA7nq@@^|W~`|Y
+zC3dW|X;f-R5Zh@WOE>_gce4wS?Ttd56Wn#6fuBd*fA9G~5+M2#9uO5*y|2E0XR|+>
+z5JDohlfHR@@%T>Sql@p6ww46NGyz2Y!Hu;4DyRAA6sc=PDI2FOyL`k}|9*~$jeC%S
+z(Mpl;iKz*C4>kKWK9*1aGs8NKZ;||azqT?70b9l9o0KI7BLn*6WTm>sx~g#xybexr
+z680s$QYh@L|6cu*xTvFNH@mG3qNs5%&hz#Q8#N7`<!bo=KJRyQ!5U{(?jg3cA08rf
+z7KExSa6SNJ;ykFpN_0kH5p?3Cc*tTo^3??t$7T!!MAtHuFai}76?zA|aFf(nG6n?*
+zM{2uDgF;SvbyM9CxV0W>TIJC=(5?&UeY||qS#o$*fxpp9r1eyo!*X6(+8aqHkL(2{
+zJILkvYq_1x*lL)>jeZlJv#2NA9u|K>awvz>AUn{FGcQD@^gSi@o(hj3*p1|$h?-<Q
+z9!zt;J+dW?V&c88F-(UtHl<X1P-GfER@(#NT)Q1iCF5_SEx*s@u>v*mYH)7f-o7v%
+z8=EHWl}opYVAQeG>9S(U(Gq%uI7{DCVTuc9zH!+8Vz#mBDxVNP2$~+G4IWNfQp9v2
+zj1$l^FY|z0!EAuYH$yyula~?<-z(YDG_tjGqU@Nh54@WFKIfGLfDM<mxX?3|2A^q6
+zzGy!XlyttAg$u16ow*C&Pc@C(-VZ%+Fhr4|L%@&q)`a*xb5&d`kT2S`NGq?pEuTvp
+z!e<kj)9w7EZLqNXp;{egXe1Qh%KU}rj+1wPj?N^6i=6-qZp1=dz0hh(Z-`JZ2h)sE
+zzP>%Ib>1u`sngx^n~rPQ`J`*S#AnvHiDg6b?OJkYG*SS0um2;9GJ<_D=#;nnWdyz+
+zbC`$}6ntPiy6qh`6@9`ONME6bE1WiD4w?zz$Pf4n9Y&kjKidufYmR6bbYw@wZQ@|~
+zd#X=$_Gc6yF-Iw;r7#YJTcR%^=4eGmI}yBLFEGR;q5Z)x8`!cw1Pkw2y96(Tewu^e
+zq~z4ZFM=eh&#jWH#mgl%w0@K%2~G<BEr^yjZLa2W$0R)!tiWhhQAkYrk{=TGXKnhT
+z7~bo~r#<EG{3;K=umv_0R>W<`F0>*PeThzydy>MR-T;bxpTBO>XoRs84RebPzJ<-S
+z>6X{svV;h(CsxOTi3~P5MF(!612>9%bI9_%RYM#9Dzm;N!kPL-z8q=NiM`oY2?U-*
+zTaj*#0N!nZI(6*X>2~sK@-6?b1e#?=;hCm>s2pk3xy;?c?>GzO;IM)ugVu^9>u|5x
+zE2-6fn~_O+LORzB05^yG?5vjU@oU*rkVM_SZ*h?zGq&geM^q`w<cCyuI8zDsmc)eU
+zf^Tt6PrU2^F;ct)&t{59uT%mm)*o@Y?oE+7XKhTU!Ukt+6B<Rt`<u<NoCfn(8{yjn
+zf4>5Lsf&<3WwzxBiC^3QbkE-y|1|zuhH|y-;JQAMkhFW+-4OFzbWI@WoSX9_I93+v
+zvs@1!hnIN084h-ZhW$#MNHp+F(9a+%giN%%$xV%(B_Izcrj8fW?s>;13<xY-ZbNhG
+zc^3r(>DBYPa1zCCX&$VwLu`{xJ6)i8iF+}mq(ta7R^y-_JzSo#Cg~7pJ_&6xOf>Zs
+zLi9sOgqqsf!xiEIM*{<}?DPTbe)J~sg#0*On;wu}(zL`IZzx-DC-lNL`leK@2b8p;
+z0h;ARwsneQ!Bf^oE@PI!-78z0YKFmeef#>BDM`3;uBaq(8;jud%AKMsGU5c;QMuJ5
+zAAG!c<j4*Xw&4?YYLJ}yY9Y{1$~n@~aJl#<Mz4H|2fSB7R9|jKe$~AS?|sN9teAXN
+z!&RhVk{0|BFIG4|Q>eCR&(waiUQN3=FV)XRj%ohj=KQGC@94FG#1;x&`p58gk4bFy
+zrE9^k=oqMsjaF{sS0;soLhg~}wvGd~oAgXu?wW53Y5<IfpTZ`eX_R0j+sHpC3$oTz
+zx*moEzMY8vh?d<!T>~gbFOYLNLZhtls#ngdT9;uZV(CP$!w4F^g@5f8B51VCS>BW1
+z#RoI6@Hd-t-N{cyHYV<=ax@9X3{p`Q?U)n|<9vegUNpM3^nXO7ZNDWkGF_V>hmdy$
+z1P^d0tOu(YJ`Dxhk!77DHrT7-F0Qdt%Xw48Z_&umyf%F5al8Q6Y^T~FPrW^J`MSuU
+zChvC|+F<ZZ1L0-EI*NNK(eAec3-$}c`%Y51b5$c$VX}V-`$6D(Fkb~+=*J;@kh@(o
+zR_isu@`|F73`T`tOTr^qTRKvW!#D8Ta-SliagxixKbx-%7$L{H$^|^R5>MGie0y*S
+zb3t;Xnl(1SMSyoD+jO-tO-}IOUVc#MMotvv0vwKc?uY7<${BbH-c?Rpp(E23;^N<5
+zS_D;ja?jdmto(6Yrk?JP{#{FO`m*Vt%&pFe`yhXdBvn{O2DKl#KNGkK)l&&;+r>MZ
+z1;&pX758yCsc0<nVeCPVCS_UexpS+;pGOz-W8`*J;cs>oxuc8dU($$t7<yIz%4-G@
+zFT=-d8n*vX5B?4P8I;F58!H+>vhBdMW5i7rq*;k7x*Z=M??>tn+W#rV$_aJM_^<y)
+zJ{^acX(9$MR)Vt|5C0imjAs%Dm@n9SQ+8O@i2-vQn=|$hDgHJM^WyW1r8_=V;6<zt
+zlJ$SLrcRD>T`6$|A#E${6&K#-AO%*POuH;xQ~*Pi`=!+2&6NXDc;CP@jq9PVzAogL
+zY(0eA)q#kKqF{bj;)19+52e#ld0pww$bnNy5+HW3MGo65_kea%1avqrs{^aiL%Xb-
+zD}`xLf0jm;kQ=%G#rAM)f`PPm`tGYUt^|fK)`t(xUHgJYa=-lfS%n&98<*fSx%BIK
+za*GFw=riLUYan0EFwyQFz4%$HQJ6+s4QM^P9*h_EOQ(43W@3N#)85BX_>*6e4Ij;y
+z0YMi;fc5Q@q&PBexKs;nr^<LEe5UwWT8=beLo-r>>!sL~Oe7>;wS?6KCKHkGYTk>Y
+zYy&ap8RJ5}F2XB`jd>~Zc7Uj0cVNtE%%l1>oGf}%tC=Fo%VIL-I@vjKFy8noZF5Ki
+z<2rbPftz$QM(#QQN-JV)Ho=UIdsJQed|K~*pDv5nmH(%fkzWxyx&*!UL&Qmi&#d}k
+z(Xt)Jfy7)R3rbbr2c|cOWwqrin(<z>O(lO&_dG?~n~j2W*HJD%qF-25u@K8Wo2WB)
+z{;LBQso$9nGGNy1xsfJ?TSCeUjV?M&v$(i~24G32HWagYy+7ewFw~5(J1*1=C&Zc8
+zZd;_r1~(uhxA~rh#D3DH?I-y=<E$HD@f%q`C+7Pu7nyWOVleeW%wBaU@acAi;b_?c
+zx`0OI4KRhzN4Rz97<YV&Xi{?Z`sV7dk=+A%j<&cLW5{;QKiqAnCfsND#KF&x{UhO0
+z?`Z^&|7<--du>wB#%x8e6|c0VcvmXKxYdbB^re&RXoeISWd!Z2cK}~x6_4n-J8{JX
+zh`O&esGi?J5{?>ZByvj$)=UE(2v>By;g;rcmr@RrXh}_|`0BH^Is}sNE-0TE{8HB|
+zmc))Hpn~qgVaekv1G&$b&4S#|DSU8h4t%kYP)uR)L~{m}q=&pT@JkTk47(%kZVkC<
+z1Ma&uyEBQMU0jG~$Veh#eRcOL@EoEZ9EP823_*xQ(M*>6I|5%RHIMz3q?W!VW7doX
+zaOQN@W3;=h*?=>zleC4@dS!7njUzYLwJ?&n;Zkj=b2~igmi?bO2+Hk-U)Pf|B&_+^
+zgCoX7ZK~#qS)KU;z;>d8wqo;a2PND$!~bfjWDI^ebamr@StXNH;5)VVa<#r+gAXFl
+z?_|=C%+6gb9&`l_$Z{4o5Q?N|{LdJTNeH2#(dp6m#I4v~iU54!?-0r;IO9bcI$u4o
+z;FLR{&^F!RFHr@P3UtH5=9=1*U=&51YJZ|G5JnMXs*Kii3>AVPH|H!PHS{zG&EP@p
+z_n<P@k8yq&jTNE;r*C-#^sEe#LLRNfSgGjif!se;38QZ4z0wZwG(U|M_^RoRe0PCB
+z_|cv2`-r)8R(NZF>KQ62E^BvA!n^ND`FYWpquMvo1R-=LeuVF#n<r!i@J+19sdQ?P
+zrJp@WBZGt@@4LopuHEcNBVP|sToMNk@uq|FeFCZsDP^BLByt85eO_$Yb&mSEoUpA`
+za$?%ebPq_%x(IJ8?OHA0!uj?F;A?{tx1gaTA7y+U1sb^$7j!q`1{P`uMZDgj5gN>~
+z+g8Zg*pLp>TU_EvgC|cTzO`@<p>slMMas<{HsZ7JBFU<D!KBinhF6xtof1Tr_S$wA
+zxvYzzSuU@FS<|JDUDDEcA|sxIGneBo_B*P(5OK@kSwCMz+U*pfLa}rfK1ES2^*^Hr
+zYaFCdsQ%GvLBFj0Dapnr4so5-U0OE&h)uG`608-rn}*cp_woLTELC4<A_af#ZIDA1
+z>Bns`J2QhS=4;N6GmZ7VnA;|6v&AT@c0Hox^z`V?PFiUc{E*;egvIzoIm&1iZ+&RE
+z<Xhs&Z$m5Lw?v!?93kHr1Q$)R{P!>0PtR;m5KYNFbWb)m{X@~o4&%G4kq>57f7Xtu
+z4z)4e?nt?r*Yj8`;cbI9nc_T25f5;22hi~obFSLqkK-?q`s(S!<`yWgPc#lP&`rCD
+zW(xeFueuK{Y%VX$>Dh`kPNk7!5)0)L2zvwk@GAe3Mm2CnNG&FvW?}BD;YtS&OJK=^
+zx#^3HgF~nGvRt_}OAWt0?3`u^d-D4kIr7iA;@x<++P}Nr>hSGFbfgwGbHoWyu}3@-
+zg$LhiV1IJKL3+*8&SD*foZ=H-hF0!5lpG%vRmZH#CJyif7UL;~sMU4gdh#iDVJ*?<
+zG_SCe+un$mPkSV7?SfsJwRqC`t%&zdIIN1&ilh7XwMHo@HsDF(1m?zrOeqkgz|0SF
+zRu;_F4-Vr~Gvct86fmR6gDP!X2?#@{OX$R-KziJRJA%4W5)FCEo@l2|tOYq5%1Slr
+zsW_pO^oduy9~k3adq?Ze1H-!rH_s@AyVjx!ht@^q&4`Sa$gCZA)>G6}Qn+wD;a}@D
+z($mCc1#{!_{-b%~z~Hi(#GNjb4aL{)G5=;<t~32y$}|n|p7y=&kt6x5HXS^Zp77cB
+zLJ_i@rmH<Kt}MY(%=Xr!wtJI@%t!@A<C=MTYJ1V*lGl@{y10_Y#gB}SMUL)738kJm
+zuWcGln}5GAu%ZR#*0QHEIQclf+Mjmoxjxr`#WO-8z~jVx=)XaFDE<trYx?#nLEvU-
+z$+K4a@mFfhIKQJNy8)g)U(7Pg7DJ|vl*fZ*(SxX*_4d3p)l)NZTbhrX&Z|UrU!gj8
+zaeZY)TLI+r4(;cih*eX=jq1iBA8aX|fRKD8QMI55jwzHvX+a*h(&(Rzln66YJN)j0
+z9KUZviNUD_TgZpMJ5$KJIil(jm&E;cC#e&v?zPCL8F>XKMurwMCNw*k*PL)2Gx>Y*
+zaHqwCay(%W_T!_sXG6yKNdmD_n)n<H(XMg1!vbr2<}H(WO<a&I(N<}fW4rpTkTBxD
+z+DyErk$HpT7BNe!cFb#g<CmvlskoGEXubFe<8VV>aMIZi8|IUlAhrB&RI1I8AjOi_
+z+9ncHHV#iXLAxf8guD<eq<b=c+x9A&hI59z6e!qaeLII%@oRG{vx-!=?alOs0L{&>
+zv=VicQl&?)U#)g(xI}%4W7B1;xa+L&L$)ppTCbXju_1E_&j^rXIWW7s{qXh94!HIT
+zne2oLRFaP*@b#XM9js_XJ+#C1hy6u+Z_wwmN(No@pt{x!dSmU{y@B6VyBcU~zw8!O
+znDvEQ?K6|4s!agi@G#H^E{|sNVpmLjQ6M4RC-*S@GSZ*=R-4?)8F;A3BNn!H;=*Hl
+z%6{7x-R0dzTwx*O9^i#+<-cwopFHo7$Ztn3;OX+Iv8tAdt(=!D#`YJI3LTix1s=i6
+z)aRQ(z6p8fC1C8#m|#;wh(4U%2wZ+eEX~k+Bv&`qWw6;f+$WpgC-pIMxxHj%T=RRd
+zN(sAN|5Jb7tM+ohA4lC-Hgp#_N*uLD?{kd$M{I|Bzq;@^B+{3U;$-PgEr8y;rk)7g
+zK{@)3oJ%p_=oo3N%<cZ?wf{Ap0<f(;1;B8ER<6;JtS>YTJ>)s;7u{FDrk$B&js!TP
+zb&w9dKiv)ZF5049mRk#Gi7(?TDBUs^-Yo4&O#U;=kzx+>8PE!tz}xf>j4e94Kf;^6
+z_ZHT#N?}CjlXVw1o@+nB7zZPYv4ntA%~3_8Hz(|)s(`&}q)B}ffZV44n9~G=c)pKW
+z!2~csQ7*C-)6Vq3E$<wd`lR~h{jXiFU;jUKXVV~6K^g{_ikzHUARz1hI`9KSkm*_D
+zpDk?%Eu>$e=~YZV^3ds@+3ml0`}ohxuM-<KLgM-bf`i88G?a!Unx_9&y-Equj>4ac
+zLmRvP)<aUuB5-W1EtNuqc&Z{28j7dvm8Uv)GG~R3O^2&{a{}oOb!dkTWcC-D9N-GH
+zb$YT6P(L3M%l*d~cZ-nHMMrg$LryL%K}d-2Rtz(Ct|t5TR<P_?D)716jLE!ds*pLh
+zfVXR$lx-L;Q&C!OW_P;X%FZk(VwvH@G`zh3=-yI2RK!9<U#N8FtS>kYOj~JYpIB7e
+z<IZm&z!+$*Xh4x^p|yr>+0!$@$+)bOIsXiy5VExVjKyMcFJ-La1BFiv{iij{3u8qT
+z)&!y|NX6hE!>H%V5SOZoni7|i5v1wx>i8W);^0;Vd+A=bz>$?2S*2-#9<XW<v@;A5
+z#`#uAUNOj{wt^FC&~C`v=GnPpdwO;};6A@OV$o2PEkNWjh2RQSN8oKGa+zpXKjN;R
+z%L$T*IjN(=G}X_l0)<kPa3yB$kM&&QvvXtbx<fUj?C|EuJDfV2oAn6FHe-9U4?j|>
+zdPM4!AnOj1hf7~M=){3SkrkNMadvBr|IqOXvM$a~>#+kGLP^x&^>2q-?ZVhuyhGZM
+zs;Q^qm8q@@Geccyc-=dgV>;KAzeGTLHIl%(T7+po=@UC2-+FeA#E9z_IUA6&(d^%D
+z9{J(#zwShUwo=yX%m{y|xK|%|pLSl6>l>4|aMleS<#nu%Ag6t15lTF7f3d=2FeBKd
+zqshgb6TF;qqtJ{b;@7q7EaSz%s)>!MO{WwVV8VO{9f0!M%L!%`nv0WF0mzqWKiG+J
+z%@^<6UB<A>9O7U%2kA>F1xom7N2`zYhF6uXnKnc9@j^=pq9S81uZ6Uu@{m<|zuPd6
+z%C$F={8?#y7049xrE>WWd*c7b_e$fpWtfxg5{XuY4bX{NKbf&I1Mg}TZF#mb;8y&E
+zdl|_ov2n{cF`2!EJ!2iq-jKft>x^|VR<gFp?E9Wn=EQvPTZ|TJFFk1xui)n^rDvbs
+zg_<t2a%5gWZbgTip*(RK;45Wy!}~k>Uace~!bS!a550pIc^F0L7<+JPK8(r@)StiU
+z<ueo%herV}7U;5L9Kt+Obl>on%+zF|&$1KvqZlgX=w7G>C&O<!*6M|dF$r);;>^k=
+z1Q?Pdu1m(b8XeV8ULGtFZ36LnGpAR*x^XbfoiwkY@mk9ce7C0-M<egDY@6zF5Uu;;
+z5^t=<In>IlFOe;$z|hE0OX3=SWN;utl0T>U40m3OORYN)p<lkTmv*LJds~$!XVdnS
+z%10T<_F;z^Nh@PdMMRa(O$Crn)edg$dBWjnQBh1`Q4v^86kyc<VkBx1sv;!t_yX+g
+z;5=**OF4;H)msk}(Ql!*xd=j{ilCK!q2v&c9U{I?AdV1j>$C($F;R*TBNI#q8JE)9
+zjB7u}-<j_)QKc4m)T;1uqK)97tbT7Mv?Zz46bXeEW{)6kP~_Bk^=6Btpoy-uc!`TL
+z^TJR6LQF~9yC)djq7hFx+P0dhmH0-;wIVN)YT#Y$TrRXo$pbV&@jT`$1W84gi&M$c
+zzOZZLVs^lKtWH=N^W>hp98KX9ABW<blKc=L^KG(EHg*hVa#Nw^NGWb>gno@0YSkp-
+zn)0EX;X*gJs{YT<E(jCg1vfCS8AG$pEGN=okt`{L_)_~kB$GKKTT)P~8-#PWLO&rA
+zw^X&V4^$wrT<fx&)w7Nu;>r@rn>mpn3jk9r*BUd$%TS+SbR{h=YJ>m2|5$}73zZh7
+zrMlUc3VKLQMr2u)p<GHuLm!jLD9aK@dq5H*pepM6MhPDo)%|xv_fNe~$3TJ5`Lrz#
+zy^YtN^Mqh`(+N8&FFnEG0<0V=wk2Bhk)tI+!k_ts(ykbSAAiF4ZoX72IS(T7p-2bS
+zp#EkXm*m1<oX`obiJYu&D<?^uLLOOObm(r$>v9+4JKAofENjM@bKSB!Ai6zWGcp?8
+zAwUQqWO&(KA^PRATg~5&cobCE6|RrfR*J(p;>shuY1|RoVgdasV6RDL&C;?LIx?mX
+zB46l_i`^QagQm;EkF)#T3)S70!%#@DtgisoeQQG#v;Jb?W5b7-SAfmxVuX94Ts7Q{
+zQtHCfInW<JQEPdqUG^}LYX#kFm>I0oK?}q2T2xaC<@=q;b>RU&jr7+*$kdlG@QK;a
+z2P+bSj96Kj!tiXmDuRl6Nd|Er4Xnl=Ot*jY1z~`kA&>|kFI4I6b_S+Xqz6>6@J+6w
+zj0BEc1<3M9eBuH!k0<1E^~FgTqM_P)%@jEkzjLEdJi_Cnb7S}ncP~pr;kk5{$gF<>
+zn=tXXgr8DayjL}6;r^*OHOe@BJYA@6bTR{GcEfKhGW0wegu_;bT?yKS%?!j0y@=JT
+z`Z0sNuy6d%uUt$GZPWl=lzW+{ISXc?4H&OhOQ-YxtwA_sWUj*YxnE}bB*@vD5kGi^
+z2*S32zxu3TIx)bT1Yw;;o4~z>GLV%xM&K`a9PH>yWDI=azm#FAla~yeoJ+_1)8DR!
+zj*YA$P}D*?EW~g>>Y;vjKN7GOWRZ`=s3|Cb(o&e9l$@McrESJhd+Wa^|4ZeR<SBTi
+zczk;aUS7Ax{I;0XC61CI{+HgaKtbkHIw`C;R~<*_gf<AinW(`Nbi9~^NqU28aX~i&
+z2PW5@f)&(}rFZ1jhIjnlU-h%%8cZ!5)HIlC`FII;xkejzt{9w5Kk#uo@W(21+rK$M
+zrS#zFbqVA!hDer-p4K0T(@^dg-C|-n>sMCZjF&~0N?V0=wP_eRVQu2pQFjmu1uFe;
+z{J`Co&N@wht-_yK$7(Yr4o!%l_3P%uGepav@D$GWQAESsmvq^#){Af!B>+yS8WG2-
+z^Ovik|4cxXGL#bO)hkFG>QKp&rChJNS&MkVwJOmaz{ia^u8Rvb{O3>7OAcOy4!_ZO
+zO+9I~M3(xtEyjc1p<fENW7Be6arri#i@XmH+<Ob|<u_4}=Ht^YEYXiXACpVnX&cDG
+zj;09a6>e#W8R!hT`JJt-`9&l4`OBfj{w|_2*$%WCB8Ge1ivTkRj4pfFQ-n21Z4P#X
+zly4)&;+y26vzO)|)?P4tovO5)0s*N>S}f4w<##eG*v4Cwkum!^B&w9NL8m~p`kOYy
+zP+jI;mq^R1OnO2J!r+;CKS@(|#QJ)~*NSj@^P=j<5!%HH<aS3@VcM`xv%f!?{nR2X
+zBfC&|c;d1q=ri1CWyI$;LN)}sB1T^+2KsqcZAP2t%<+MY89hPifp1Iyd$`sluU!17
+zZpO8o&E)xIz8WcKW#K0uSow0oTTmvHendHEUXNuFnGV}~nMOS2lDS@bpzWj3DrbwH
+znU8{3_Rgy6GCqbMCo|bH@xz=VB#2XE<NC=kAu%!Fx%55p6e#FQX|F`*U$v--5m6q-
+z#&2k=H&endkt=eQ=iZ|rpwAYR%pbTc{K%+=beOWPDe?v2rs}y&gHtr#XrCT4Q-Ims
+z#@V37grB%v9#_-cKi$lZ^Mx-8S-a9Z?TaPi88PQjBe?PfxkD<EP~5(QErfLdhAb(A
+z^;{keCkDDJGMTV-<T0s7uha3gSMJj`?yY9KYs6X1p4Q{qltGLko{S5dMhbebu!W}T
+z&P8=aYyFceI5CZOex2MT)6FvFcAiDfW?q+hj_$nDJtAJ?7o0Cmwe-ai71@vY7?<Ij
+zU(*EB+J^c)HRXxpk$X1lOzA&JPN0eS2*+w_`CY0Z>(u?WEw0Q8%3F5;B_1&XWW$6@
+zqqB=&r>)B`P_p{gq<ciQ{J0ECqQqzF^8U>HrEtIxGY(C8MC|F^$q9p!lvkDEKM@T!
+z!I!3`?@=6@ofHhyP}!;ZHmYkeCm*fgod^B+)?CkK%FPQ3KP}I@kcSsz8D{y>L9@r-
+zCu)LdH2g++2)hIho-YI_X7537;4_*=2TTFFg!-}#jQ;IYw|YQ192v7n47#ZoC;JD0
+z^K91SUkA{tOWpJ_&7h&`A61-$_g~MDryU*Kl!6d+3`tUVv<Lc=1~HUv79H_D8u?T&
+z)Yc>6d;wQ)W5m+1TJCt?Sw^2<@tGQVi|75wOlcL#Rkz5MP<_lO0^h4B$m5>e+kukU
+zmD$KlnMF6ywy>)@iy^Tg3aj$Dh6>sj)IW66RrocnBud&+cT<fEX>M^IjL=;g*73a2
+zTDVc&X)xmBEylmCQ8jZ8XpqFe4_4seX(qhLB8eGSNVOFOYtJ#101x28&P$@Bxg4xm
+zhj|>UwX8HQSP?N5@mh~huOdDgOtfM3vb!f?*u>D<llxQfk}-{=&qq|(r|zdb6x714
+znUz`k8*uS*#iqz=Rgqdrs*)YDJMFKn%cOOs+wFcFa-3$eFJlRCUzC>`L#v?e$__G|
+zU73kpa-UQ=+l(}X&=R7q-EJ;hG!qGPl=k6Ov()G*CJSQ~$C@An1Ntzy5+szQl+}**
+z<P$u~)`kZUjB#n*zDH)*kz=92Tw2izj*<JzKYIk6zholkX>L}W<7FxF>K6s@?v+q5
+zv|y&xL`N9Op*t$1*!;0AVl3Lakj74Rz|rKK8|+0g#6enTVsw^7pn<`iiD%cmFk^H>
+zg;%jk3#0gHCjTObZ(c$og;0=a*|7w6!g5oruVJ6b328O42(pNS66+WT<e~;|XG^#g
+zRu>XaFUbI}YchAIH<bkhUS=^?cH+N%h6iv11SbaO*D@wl(nJ*i&)+WvuOcw~D0K0b
+z<~x7Xu}BrIEG-q))Tj_DX=yDWcnqDw(UGNMfSV}I%2Y-7fe2gM-v(-qwOG(MQNMbK
+zcyfZ$y@D{Fnl+g>wPIS?d3YUv4_ti_`4AY<r392Pgxp1cD&)53Slw0W5pELP|G>b!
+zh=%zoxb0mJu&q%hJ+e1DbES#LxaU|C%he}3uLqTonCxzGb6Q6z5cXV(eF^_y{YN>5
+z(Sot;c-YG?)j4c!WtpTJA8^|0#!1+d+FL5qdOB+`rQgbuDNgf-siV9xVQ$sGz*g#9
+zMLmC4&s2k+6n9nzfy@I;VAt@k#ckOac!P3biFRw|%gi_*rV=S0o?cP0&9&&=1ldm)
+zUUK2^{d+jr2SYVO>>NseQRl|W`+Ol-K5jJ!rie{hnd}YubMUSOiO9)|tB}}~N{>iO
+zNikg_R@$x24*F4Q1o-GZ5|#}AEdtf%^J=o(pr7HSDl~f7c-;@^S+D>Cpi`X=b(%xE
+z5eXpYWCmbvv>>D`nBOxJls4(USXJ`F2Xj9lbGFXSNF+))lm$7ZcsFB3S<5bquc=xc
+z@>tj#2q<PXxIYFX+Qh>#5a^3ulJIKuED{!t9yt(l2zt0!c6RW%H*lZ!xD520!Pq<K
+z`PB!zQjM!8RoL1$6oxIQpbQ8CwKS>!IWQI|ZiK`L7CpR2Ef(p;l(Re#;3B##ri*^x
+zOsrh*?PEyY&a)iPN$pzU!O$_gr{r}5zj^T-e2lP;NPf)+_B~zv37wi!K0VO*S^Hi<
+zw<AD;e8)i${3!%8>~@JRT~rnmyf{37CxM>3fI~rviu4?Md_~;d#!Rxy{ZVJLv@_TM
+z%Hr>be$=VaYY-w6AYkmIW6ZYWM{Wq%5P?&#5$EFvWw`Ao@a8Jyy$Nry(=rpoHzt~k
+zo+Gj|s>_MIfjRu!kse2Riid8VMmf7%s!4oGNv^JZq?61DH$~XF{@|HfCuvm7&5a}t
+z^A4+gPh2E4!cfEtO@eTqA|;MfBf$FS0cCl}*vZe&9ve-C@Ht;YKdOrK()Coul6kWz
+z^Udu#J#ZDp$GwV9=jQhFw}tk&@dUf@UDP*IRB0x<_~?T<T+@P|BVgN=;-m{CJP+!o
+z$08@Wb}A?+tl(xQ$7Ic=%YS%6PwTnYL*2I{U<~`HYvNl|6V3f<o`-KjWUrfoMODPN
+zu&G{E-JgbwWm;d*G*UARF9aCzP@@-I(T`1T^KpJ{%KO7!!CI&r6rWEG-^e&8xikR$
+zS@m>BOO-qqr2>D>K3jkfL}EkYfeHiB=#Yg-&1z_3siun;!f#?Q<lWqJ7EbRZ3^Z)1
+zySDXl79-bj^>pRkVo44`B@yExt2G5*<^5f47D6M61_fhgPew>ns><2U96>p(DV-)~
+zV3IJp$e|z)gnc-z=6neou_BI%t=uV*9+Afxn-$Gh=i=$wvmu#pv`fM~qvZmW`3@Xd
+zVnWeX++RZi5MKWog+`(}DC94&$WKpX(NG7r9#fO@(q#t4dgQ7?N^yOIJ<o)@Vo5xj
+z+dW)&Clxiy(8I$cBNxirn%1YMr@tAAciAV2eTA9vfC($;lAqkrT4eIfmPFf14ZadU
+zr6D*y8CMtf>LE(N<x{#v4LRM*Ahr%8@>mP(a)5xt;V#Z#(@IJteYYVmYxdgts5-e7
+zPlWzyZ3QP4DD2)Nq=j?7TlL%zy@EU%yhpo6S&n{TS(ueW>Hg%nxXKTcLNHO=(x2D0
+ztj@=YPiW1v)V0^Bl!DHc^n}Dch-4{385hj=xbe$OH%#UahNKXDrg;MZ;a<ktLuhfT
+zA73SeR7rNkieqO+KzTyNznflGjn9a`lx*#vK)+i$;<134JYPqkVkIm&E<bw<RceIR
+zeS*S4^(QeR(O{Mt>hl)O?1#JVNhs9~%;U=#<2rqhy4E*mX$x{LqsA+wvaw=Q3-*`_
+z&l`*7Ntml&B2ikiBNP0ZTZlqjakA|8WeF+SzdT_rLLLE+BvGy?ynDwH=trG^_!~LZ
+z8Ui0(U7yT$s(D?dxn5k|Y2^s1;?Q8sh~1%=ex`ZK5qH4Pu2Vo2X0QpPk#7Lmsx7)g
+z0>p0e2l#&gR6wi0*Cn2CcO#RfbK<foaj?^k)8CVliYa~3zi%Uo8TiTFphvur9vFpc
+zLWkSvt&&~d#uZXQ2F(KzH1gJ|oVb+?MrL`lq>c#YaWOU{V;%&N!RZ^*gu;3Yv|26t
+zgfdg6w~ne79q#n;qI!a3_Ulx82>j(DBXBALzbk`aZ!N=*KYRz5kjYF#JQhZB`$9Zt
+zwJG337e@LEp{%45N}VSHDawrQlL*E4so0lZgs4$5ur`ugPOE{+Z7@8wLdOUsB_&CJ
+zVj%79?PM|pQy~`_fj=e!!cZ)fg!OOd$MN|VPk3h$f&(Q*!9yvQKT{D#abZDT(%-4q
+zxa##7-tT0ZYU#Yn1#w{~34#k_62ygzU2SJEdb?v1|4uDx8sx=A`}6PAGZgKU$c;)m
+zr5))qHTB=!*Q*c}?j!wm9}%CfS{I7XPxeOy^9iIeU3YOO!!U|}Jxhp`roQJ9kdTt_
+zc9qC59~waaG@Z4M_8R^A@UQ#Au1`N2b57=8&l1u7!_5U@{@p)-_$WXAo%}7nxllR~
+zO2(|a7|DDL<=?4APxV1}5w;#N{Oc~k{ymmqVQk9H)K7DAlA-gV)P#S%i-HWFhxFI`
+zIN(MpPD&jAPC4P?s-tA+q{ql9r{$kA0w)mY@noJj_S=1-vD1OgOR%$aGu?n5LbRV2
+zJC?kTJZBItr;0&sDxqz{TTn;M!GkxC$FPx;(Z_Q&-g@a>xZO4l<-3<+XHhez{QD~S
+zGKk5^<+HPkBBZNaWCZ@m2nZXTXo{O3xG3?DJPf(-G6FIJe?kO)R|Y}l5s&-txCPID
+z@-6<~o6pgUm+nXu7hd$YTXE^sB&bXWk)Cmk@eS%E9c<)?nYih;BlvLsGCcicD$KN)
+zP8l@^_g+6%vLgNy;x7+LM&Q4Q0L2oFLqcCi$yn}JH_Tv1!uLVg3!SkDbs_C4p!&5-
+z4DV&E2dSK`oilde7o1=)CCSo};(f^lKpGRr^-GI1Mvjvzksj98RF#T)$@z(TrNVL8
+z%pz)3=T9|v?;5&w3hq!?R(03Yd6xh3I8`1LA$1)QSg=lEJkhI&>)6IG#YgmuRY~`B
+z>$4>5NpW19=qjRZQLpHpC{q7;&56PjRN)9URc8_XW8Xymy^82x*K=}e|HW~sjqW;n
+z-Pq$tSKZ>sFCAx(yXCL{I|P31+xv@K9dYHq@%F%RI6_09R=Q0Y1EMi{)L^O`XzlEB
+zEUy~?06+jqL_t*AA5TC3290+jp`+mx6h_?k?}yQE;8+w_HPR5rA1T8|Qa9+<OF#RI
+z8<#JX5s(q+LVydnsT|INJSf74Q~vxbMa*^!P_~z}zz9Y3PX*ypV|EkWjq>1Zq_#Y2
+z5Q*WhSY|BEKxGC!DgD{snBRUD?TmL^dmK)#Ns54QILk7iFoXlak-w}hJBfV*@2@PS
+z(M3Nf0(q~Xbyh~Ms>y_t_7#e7Dl{0l3Jv*i79W7Ku97sK_8V>-QwRgT1xAyJ;Q4A^
+zUt2;V+tsv^>InBxDEv8Y+J>N`j=rkIqM@eqnr^~PgG6}6LJ`zQ=sM2cZwu=Xcy?$w
+zUP`Mxy3{Jog`LMuoY(H6p^C<j_0lCBjN0g|qfvNO9+{kOCW7{02I_kJ<JeESmO0wt
+z<d{)gOa`?38dgRtTZLy7>k5Lixq#=(IvEtvj*?MyjbS`T3~01^f*BF#1Vhrn`KMhA
+zV|ugwd?@%x!9P~$rNkBIM(JoGCS;bWB9|DZbE8+kX)k`ooBKa)UxkQ-A=2NecPd=m
+zkUVfm@534ojGHpE_c8gGjDU>5nGtZ1$cS}W5SA0fgTI|zyu{8<>~IC4s@e|wf{&oO
+z{u?Nw$&ia(BkdA;6=|o(<3Euy@R+doF*U%R`ZSzviBSJzUT6I$cDkZXwr8n@<M5|&
+z9w>wIA0Lv?2x7$hg`>XcV9%YPxL)jLrGAnibnk4N3Sry$GP^zvs=2pxw%xrO?e1{*
+z&b!wxn(gp^2?x=h_})v3(bbRkYWDFnI2lw(IsG~~Ry+<wUIo=9w{_Mo)y-?AHrcOJ
+zOGiB%N9Oasg;4aL%ljT6vF142O5xb~8l2T}P~G?#nS(>H?|ct9x`%{>gqOyQj`kW7
+zPTHJ|xeLljFP?uJ*te0ykM<^lnIa}mLl~4P*FrgP2At+&aBO`M$RZKek|1|?$H_oa
+z1Fiu)!=N}TgFutl@-6J^3naE)P|kc9%E1$*dYt)dU|;hR6fJC5FXqWkri{cpaw3!?
+zt|cQA0B72lZ2v1l!T!_OQIck8>7vr_Vkn2q=6z%k_I&`yzI7CQuzxgcm5QCrP~yc<
+z3>*gM!H?lMv=a(F$0)3C#e93jKrw`4OrA<cqlc}DwF%DLHDnTKxEnnL&g^w?R<XNd
+zXb_@fyP|sWoOVA;(p<4VNvhG+w&+0j9E#^t%wx|&gI%f6zNWLnu9G5gh<IqE=l|5Y
+z*rp`e;k(0YoMju~EG>t!?<IgwNLK}au8;o$gYf49OdgGlz&V3}*u~c6k{IQ3!Q`v#
+zO`_u$$=xIuu+~x%g>({YE_nJ7?p8zDZ7!nXp89O=a9g;>(JV4xAQ!h_E__`4nu@q1
+z&gU+e*BK*tE`kJsk_NGxug!v!SrmoX+bKllLY!=)7g1RO6h85kNRV)ts!4$A>C-P5
+z6`p5sBZ&}*U3D#Y(RJk{fO=jZO`;aWzOdfv64uF}M5Z<}5`8!Z5|Hj9R2i%j1v}wv
+zsqfrX2XR*}q>ZhW+^Mt9mPQg*A1HidNN{+sS@fZr>o^zirV0`(?&Je_kCDX9*2;S*
+z*=S&$4)(2$zeO8@NfEf9Yg}#I>5CmRT^PZgvV^G{cZod<X^2$FC?J0oiQhmd$IkAo
+zOVrIgF=#D@egFGF`e9(mtxyh_!10qHm2HK6+vmW>H{rbOKfH%Eg^z|})LdfY$$l3D
+z2N%Jy_fyWDCltZFhs>X1z(r7`T*~?7_3SbS*NF*@5zkueB)G*#L=YJck#ksj0Ein!
+zOgLxs+E8dI4eHOjlcusSW=fg1!*PIP+RorkldmT>?4VzND2B3sp;5$zuA)bm!g=^h
+zMtY=lchE@AHwkd;WPZN_3U@v;Voc)sGEjQppyWf?i$zU<Vl<f!CJ%E8smi_|;N1Bs
+z96B;BgT}KCL68~Tsy>H!eoqOMo-{w0k`z9pMvhfW=A|Z=j~4sb!Z~!3f$;X{v%_(<
+z)$+OHa~u%Q=fS{n)=?_MIc(-R4KWnYhbNx_0bFwl-<d2v*BzARMDQLycS17JObJ_c
+zHm%<&t}ukM-B{vF367cL6~~)v3Asn71V+QaRL2&>nV!y}heI)#b?Z3pKUt9(gg@DY
+z%ES4iA;6VX5Nj@c($1(y_eB&yg*%C!M`(|uU0;QCpmsm(D_-Qi6(k^9X6K85YSMjB
+z(2C!Y%3bVX?n)J0ECq2Hb{&+AX#hKSxO-k@n<TJpEpSF(3H7Y|cwHVGo9DrKoV!#}
+z+=56DZYEJ1&h(FqVcYrv6zyE3=^cSaF3y2mP@Cwgy!bV!rgI0%JOs|FU2tqz$DQ5{
+zk~^QY;M+-rb9cbL>udIt#8gBR3>XCEXkMeKfMf9sY>W%5(jAI%+)?*p5Qt0Z8t!~a
+zu$rofMI;mxnAau7kHqsmIFD@Mc*tCc9dE=Ws7B8vQQ-9}zv|r0lR*%CjH2I7P))po
+z%+CfmwtPfF$#K&~6P5-jJO+u;vVB3ESXzpS&nF~+siakQ5(+=we+iVs=J5L|gqXJ|
+z+}+`190?p)0B86>5_nOG*sTf%r4Yy=a}YWcstNxhrd@6L5L>}KttJCdTf|F=tAR{h
+z&?qu;zS3jhqzb^k;w>^CX&eg)BqK30G7@*-B!Xhq?w0--_<Zz|knr58rGd;{C7-Vl
+zG6f8v<S5So%JZP~=*!>iC*3a<e(}U`90$bzgOi~!GXw9jLkzAlw6lMd7$^dVbgE56
+z{oW+}tuMn_au~`!@seAqLc=-Kkyv)cwUC$wJpnP1DG~MZIaY*>AyFq&5k3wMJ+0DK
+zzfA^kKafZ!gKn#En7Aw72NWOUT=4htZE(_M)9Iv}uAXz9xfu46JSaGKbYr6rZxkgB
+zd`=q5h(jop(;kB&J`s-eZz;iA$!D~Y$2q>(>3rs{=G4?v0`?Z4a}xFrGJsmT-%q%Q
+zjE_I;`#zzRhVy0RaWWN1xelr!)8IHxW@XP}zAt1Ph`XZCB~UOLF!GN>!FSJobT`zo
+z#7P$<koi*;nL+qdO{YAVKO6!=3|_|MM+<N5q$@oKpr8nO#3fLTf28Np&hOOoJ4@Db
+z2a^retcR(erRaM1w{R3}VwhzH6xz8OisAo(G9j9x-`C+hw1SaHujJ0QjXTglD5u^I
+zN7*W1-7+`_UqY$EH@rU;imCTP8Nj->zX!*<R~Xs!aoD!K!NoKV%2_v&xNd`EbtczI
+zuJ}R%P|w}2lq`*mj@X?xRFDRdd69O5+^sbohi%7)P}DOv!sNTStImLZ2m48eMmZ#f
+z5`--7?8t;n;O;asuJ<^_PMo4-XA&1`4-@bE1~{~q%*pw17NwIo45tWwG#7h{pbxEw
+z-G3C6Znb1YO1L8*Lq_FVF5ZiPj8$;Pu<m1DvVUYyrrr&eh0G1b=8`d?)GEirgh<Z9
+zjd1Q-3iQ1k%D5=lk1PkalVJ!<A^|0%W+qV*svHtpsZhtR8h!)p2j&s;cgdh#!?BZ?
+z3(mwuhKNxO;Y|YH%^ZlEs76)#^(BF{bHmR0AWV`tT-?)D6vDQ^H-NiiGGk1u%_vly
+zTaL4ucx$?@*OA~R&xSI7a3|ByeRI!GGLp{9bnd(vY$~4Dx>UiwX9)@aK_Dif>q^d@
+zkP`5Ji8~?Dgl`y$XDU@moKMj|@sAMMcNM9BevxpLRKd~O$kSvr3byc(s34QT4hj_l
+zr3=b_m(s4ov$I}F<<qkc5_c~~_cSq(6C+Y81cM-$y|5ubR1&2G{2rIgdN=Vo<FghO
+z!ucbkV`s|miC0ra^d9GQ51b=!hH3<v#&w^;nMcBJpaf{^H*k6;Lp6=+qY5$^yZL;3
+zlX>ab4P<6f67vr-%wC+ckKoAM31vkk>pBJuz5&YUC^*tSrrPIYIK4f{Xz<-J`#?FK
+zV=+<smVcO17h)bm28+@*RmuoTI5@^XVUZbxKjEaxL;3?DAoR^<?tqH(dou{qV$B_E
+zJc-@uiqN}rH>vP+hogvu-AaOzIEU(jK-jbY9|=-Clp}B9j@Hg-rreEYk)UcwxHV)B
+zxS%THxp;cC!M1iC7hMv3*1;5i%(luPLsca7hG5z(9D}{^Fn4miZ`_02Npn$bP2#S2
+zt3*sCLMZGBx@`)C)xIE((jPlb+X!bv9+?0VHQiwDs0AUQSXYQ*O$DT}$x=It5tMEW
+znf23ADmng$0Z@&dOYv?dlzAkO!VpgA;bYGu^Fb9y;XaC@DMl6^6CEU^0vD=Ulw&x?
+z5KpLV%-@jzE&D({egm%?_%H4XXLC&4LD%O|^lt8Imka`p&YWeO2ZoClV{lU9p-_8s
+ze3U9wai`q66Als}Aze}SnMi^uu5*PmcqB7(AAxiG9@-^DurE9=cIJY)q1}dvZ`ixA
+zuYws6OqTc)rR$^f2mcl48ECHa1W%ITQV7vG=MozJ7N@j6{3B64TagS?$qdvt5<7~}
+z)x@uzOjOx%8V+)vPh0p*iszD^7)pV|seKdo2pa(LCt<)j7lrex5QI`N2$F=ugZ<NY
+zo|CwbuCFIP#QnrZJTKivL1~vUl7yKmE;5nuiy|{4#>i_#KU7pZ48019zLP0^*~CA8
+zsFLPD5$z7_C9`WKb5ML#QXeUNU8ruN<jFxIueQNalS4)|jm+L8s8jg71@K*91WQLH
+zz37f?<?)G758!cs9#=QQQTh@bLWSkQ_pG@HDBQtkE0OO3)h$6Od?vS01wqClD3W95
+zv-&42GK26ZoK$&8e=r1ucw4NIg06HI(hzAu6oyx)D_lGk0o*Z<X&{5ZT~uZvi7p9T
+z%v91y*2iEt3K7;&6ju_o2<rYVN7#lhe~0oQ8xSs!;*-S4+0GprEwY`IX7CHovH2jX
+z0%-gu5)mofxB!bHEz<0$MDzGV=<lVSA?uNB6GX?mir7VxXbYV&T1lKrD6+OuOskI~
+zBa^_oct3ZH(71Kq!MX(H>nc<`KpT4!7qQEwZG*EZhkE^mBmyMP-ahQUgJWi&#JEMB
+z8b3-&I8HG(!DNUXH@}PMiVA&qTf|1iw$Un1b{6io9hOEiTmPTE^8k#ixYqx-yV9zz
+zdT*9wS=GJw1_n&;5K3q%57Hh<UXp)0$$NRJ<fTDK0*_AUm}0OE1{?R@i)6W}_p<8J
+z?*4ysCE2o&6X4mV!~<*X-g|fM%-q>IXTI~Db2wH7EZ@x78>J&Y7kC?C*LnnH3TWFy
+zoo46Ht*n7SP}@h{uAUNv?uN$^DA=h3Gx<)GyiWSlw71u;ZOj^`bRl$VcorQ9J{JPj
+zJSHQB`voPu2p>EVHDLmYnSv69kcG`}%LgW(^A*O#s^xwBL;tI{^GtVR(&(b?C<;7V
+zn}3MBwR_k#AF#S$b;Ck@`l{@x;9B~sMDER8X)orzxvFnI8KK_5GpH-2pCb^m^wTsy
+z{XE&{eG3zU8Q0^*hbhcbXsrHOcVpN<VCsyL!dNGRgb<yw7op%D7AM3^FkS;t3+ufD
+zK7k=~8l}`sHA6tOG#HdvYwi%D+$h|>7L?ONRKZxA*t{qmj)*vvMCP(lv@91?<_$zi
+zhoa=!%kRmU&-z_cE!S0^zbyik>MD7|P$0_ba|wO1!J!CEr&`kh>M(!ItFLRk`_vRh
+z;A}ZN0%u3y6E^||4le;#hkfpM{=Eq21L}G0OR^nC2;^kJ6WAs%P^dkQozsp7fL_~C
+zCeH0$<Bu(5tZHUqgUF}EJcJ3E3(xsB3Iqf!;B4>FqX=?b@>sCFyO+tH$Z~;j_El5^
+z4Ub|$G*EIqu=fVpD%{v=m$PV^9XU5JJ9;CKU5P-u=`6$-%5lMU2w6A~dtPUOjYH6J
+zo!KQD1;Z5M+E%lV?;+sLs%yP^Pg(6WyHdk4Z#aqo?SvS1mmFh901>~yF7O@f<_HE;
+zpSiAABK3aR2oQv#r92dEkVar`a03;WAcQ?>T!ZpJA8qVTZANj4YQ;SBCD~0x#`1OY
+z6z>Km$1b0IIcP>-dpg*uu79)lHs(-xru-&;Mm>jqh;6z`8a10^)SZNo#RTHrI2x11
+zNXr!9tK7inmrxEcTL62LH3A{bI9BdNeuEISgL-UP#8^@9_yXW;Z19HkXvlSC2q<IW
+zFkLhy2yQ?)_dtPoPl5m8J+hg4=-WI@M`IT-1}Go<pT!RUjAYJ57?cB4r}0p4-He;B
+z^j&x-n;8q{OF~ZXP95dbiz}m@L{UP4^6h~{S%sI%xXV$9P;v}f0&&z=ffCqiX=GM&
+zYzFNyN+EN?2Xf)7L@{bdfxvX(g9z#C43-1#23jBYKgyKi*@qzfdG<aMZjo!7`_Xr!
+zJzI~JfBO4w-dNAN?|}85OAR40q)fJg8$cH(VkX&-$>2@-Vw0G^@d$YkGvn6U6N1_5
+zf0%cfz4e#uqVGnT;+Y&=LpxE*{F@m=xCXIvLAkz&x#J0VHjl|uR?a!vg?Y^f5z=Pn
+zrQh*>Q{ktg@QXiNPW1?MwR_ak(1}+VgqBlXxv7sz{csfu3iAiSJNpPv#}I!cbsk&z
+zxck8OLp8?i#>_gp;|cZDA3+!)jN93TWzAsGo{w<fB;T9gQBNE@t|NO8SXUyfd2gUl
+zv+FXG2>ZA#5P=j7q#AV*#IE1V^XiY;mAg<hHbEqVjFm7Bg=4I2TOUx52it8syG|px
+zk`eH58ElD=^fvsDJmm=8quYR55rVjg8DZ<QybBO;nR&R%y{w)$@ObF1LEs=TW=vqi
+zj8F><Wit0|iCYfKv*A|=y9+P_Oa=i#sP_v#)87EDrM<RLh<u?4vI9@bQyXEKLTttx
+zp&H>7ia-itCuorlf#t1xa7|3E9K)x{v+7m)$avWhJQcMN2<e-FwVf`6N}?R;dGHS4
+zS*-dm1WF3m(5LXJw1e};e8K-#F{p|k2!?6DArSg;K5afMeXf7&b&k;|SGxSB+#yfH
+zZ{%J16BHSgk08dTW*66IV79r14Jv4Zsi$hWe9I6}#?6tWQQTBE1D$72;4{LEd-(Rj
+znm_Uub@xpUFPA}>vrqei#aHNU*nodqk78N?4G5n|Kj}kQv~|*!HUS-MCGdL*bwL<3
+z2-21(<SSgnoZ#MM1XUF1(Zq!?`J;MCjF@<|;-?@YJTrqlc^I>F&KJzanSl1-E^9NK
+znCi9k!OSm?QI#$294U7?bA|pCu?v5FD^>~48=()Q(?0e_*+z_kZveq{!(%+x1-M|I
+z&vVB6q#APSzBTX$xYU}rj175tYz94`iDKLo1R_F+Zp+jWz;{pt?a4gnWaj*izsOVb
+zHp(Qtgq|c&o)q~CE`>LNOXiB-^XwX#i}iBMya<Ii6T$zGyzl-=z8J;{@}({LQk2Ae
+zc)iQu`n-!SiL%jF#P20Vj-&+8Ca&wi6tQ)c9LBpQhTp`etellDr}%+-Q3{GS)M)3*
+z3N}+Fv;Ao({5S$gZ<}5asjP`HicH{#a<+VeM}P;~C-9GT!pHz4kOo4($4>IbxR;H%
+zO*#ibRRZ+MdaKblu&ai5Kt@6PW&e+bYdH%ebxg(mY|^#VRVq!t5`lpLHU8Y;IS8rG
+z0HLQNVA#!GgwWl;5t}XNCf<&KxSfSFK#p^MAW!gLk*NsbNCZt5JJE=-2vk_(3xC9J
+zcL@R+fjDO-?Lt7u!P0ll<sS7Q5Lqn1-<Buz?*!y2M@Z#KW9G^+dOo{D+CBLiSo4{^
+zJu^1-jB}|gi$$27<j6}9JR^F~5ktV1eJOkm1aT5Vea0>9fOjLfBc#k32%KtOK+gpD
+z(ZqDVk03KjLM%dg!sQ?&C@Lu^G{*0p433tWCG#BGGmJi^a?SPp9mjR>7cTrZJI<xl
+z$3w`!8X<`59`@=JiZP3%O{c%6uZ*WDAqjF!Kp}8Mp{OuUC`n2~*|{P~o~_SY!pLe<
+zHtop=jmR2<Fs_v?cOJqDMa`fDrkF7_Z2#d?5SXFtfKw2%2r(DqWbqPuFSGuQ1*K@O
+z1nJ;4xU``hB;@nFMxw~k$NmzTE8D~y;BK%>HvzL;+_%1gvqs~vTl2!O{%wir2ws%A
+zO!{f~1|6n-j0t8NTO0~p_8b%(`iiTkFKZ6{WgY73yM`;R>f-Xz12W_r$($i2_A!Kq
+zXKhR2`<at?R%ZR;Ib_U3QKOF`^gok%KvF52E1C1m0psO@!sg3G>xgD<@Vl_3pCg}X
+zdj!{;`8WDf6bYVx^f=k(e+5qz6t%{B?t{{t%RJ9u4md~Au1@K|4iKkADSMi1W6x(E
+z7)6g}9N3By%sj_)#WDT{<}&7w>389&vKZuwXJt$-Bk$nZ<jLLvnb+`hOg)y;&G$cL
+z#kOqOvd15L?6Di~zyE$bnEEFAY3rm9Gi3)Gi~zzbGZBX<L#MZ8GVog;T%LL68C`eX
+zbt)?>Q&LjW;L{(;=jPf@J^I~^xOX=rxY1~bX!ogTSUVHbgY7kUT7u5`Y!>%A-Ouh+
+zwEAov?->CD&6aJI_mz8CWCoqJvFMFC2Zr`tgH8<kXaX4VzZL&r&?yUv_@Hyp)MXaS
+z!No+<^ZTHc4XDI$2+Y=RsJaJS_JQ8^Rr!IwbF%&oti;r7%p``_a4L$a&+NR73^pji
+zDXLZ-W%BKQS>EDpC)R1kIx-y;;u11zA{75s%gLU#c^*SO11tF-6V&_`2cI{nhv6vn
+zyTpFV#?;8(n{U2ZzxmB?6dxaNdKbV<J#)ofeMGC*ZBu;SOpPX&y2)gBV)5w6{ynP1
+zrNzsR%AED`BaI!Fr>x}2PsDSnEN)hHshdq%xaM9z9Jg<v!4o_AfB(dTtSfKR&UebR
+z<LxqQ9M8QiTdrsX%GvVC8UbUcPnjsk7uaDARSb&o&x%FRJIO_Ze_|)O?1aN7yXF5y
+zIWRXkRl;^)V^3xO2G@Hk+iTj{m!^K;ZT`>iop2Cxu97|dLIm1?!7z&sXo-zLOaId4
+zWOI4IP@OP7{UpT`4)%TcFd@T-s^=4Q?2IW09&9ylJp5~Y|Bo;0vL8ODy!5Cc6oeMt
+z|KC5<qD@5#f`#qJg!chiE&TeQ_5B+rDZsLAeY{7v>TruXTYHq66QP1RgJ8*1-1K-{
+zdzSoVkG7*EgoOKp7H477J!6mb6!+#|xH_}2_uJwBg@@tO-gPf5dq92UxZ~7qb_~bD
+z<aPid|2P#dq))>cv@y5s0~ME#QzOr|<)4ngnUN;A*z9=sIsNi4Pv}rZClM~eeTLXp
+z`#Nj1>A*e(Cr;4$v$7$xI$&wHY66kd-itQ;)4rYY3w*$OwI!{PSsjWQcKUy@S>t2W
+zd40BC|Jz=zf3-vrm>DK4OeL_|$<*UBJ|t&v_^}xQALijEmAmT{MR?h;54juiL1=4$
+z{MP0TR1*H-gRLT_yFT0nn+Z?b*ww8#SBio@gnhQh+o3v`?mf0JC1JZh)ic_(v8AI%
+z%>=rMz~<cy1K;K!sRUdT-%l~)(Art8s<uW22PP@8Z>R3TzFm)pLu*ffQd|jaa=hvw
+zzCu~^VKv}N+QWzi1cWIbLS$SBKK!`gHNq9BAvADL9}C}xcSs1xKrHTjK``UJ#HOf&
+zXHeIPCqdsey>0Z9i=akvM0*S{#JwR(S9c?v&<dUfT!Q{Zm-<6V$P{DhhXmTjx?9sm
+zn_=SjkF!~x{Rt}^Yj_m|#H#CPAfaA@^&Jz2!IUmSZJY0Pcmos*(KXB&0Qay(b#3LU
+zYN=H_;g$U{Cr4379C0;*nJkTj!fx*IC^E43daELyMI*tI8sT8L;C6U=8dcAj84J(x
+z;!lFVL`4#+x*AWIcE;HZg}KB@{Ej%niMs-V-ZLM4*xo!SW_FM|Fa0QY*UA+buW-nv
+zL(Sde_dB!iJceWoYVLSHh~XJ*+8I$0>IkLzgP+_l4+%=5T5uUTNe8=XD%C|+v1wP`
+zsB7jY%gKZbC)RdSJONLJ&_eAWV&OT-txw6}&bA&^9dRqr<wxuc*D0y<pH-4OD_%`?
+zom&3be!ct5K_!g{S4u8~r?chk2n-kjA4+<)d!6oG^^C5c`fE*(eSd;*Ko!>8P7>*?
+z+x>HG?9S7-X5Ou#=&_wW_1bdeDZNgVz1wH}Sh@ZF|AQ<02cL}+^5V|>)Z#Z&cTc|h
+zl+qT=ZM(W^wf)eOdbh4c3-d40vh9C@LwA|JK)!>aMeT`=?Lmm`I{K9Ux^uBc47*kT
+zHu_pcuwJ!vmTSrWKWke{s=hnzE(La%Y5k!^db;Q-)pU9lh@k3W0nCoOKv(8}ma*|_
+zW#N5#fuu<-5J&wnYuJ6EN{yJI^M+rk$q5h)+Y0si-uv}N`3Ao0uy*A}H2QqunlkKW
+zU7L5EQjO=v5T&|)gPz=dpVrqO#=_CN+}nLFC5KPaIhj{!dSbqc%U;n_`yN&?u^s%a
+zH5IXn<c)Pr)ipUc5g=-np4q=hsmZtLGX*y(-9$WuOi@<9UQg`2Ux&Mf>!vYxX$Es@
+zf8}y5+W(ZcHyj2za8ggFV#CMlf~?y#Ga*GA4n3~7Dl2u)h&yy%+9*p%cM^AD`ToCZ
+z9X!d|WVx)Ve@(BONRKEzV933_@<nS-*5@@751U7~{<n_cYH4JG4R^=@N4Dk>GJO89
+zIZ7ho)IeF$)n2N7#6yUS7^491KK*_Bvl^3et7avSRPaf7a6=5^X+Gpr8A-jGc<vby
+znF=-Oz&|GCv?~bhP33y@mp@lgbDVzqlN<G$?|+|3)A!H^4MIb8Dei&I+VtulRJqb$
+z1YJ|wm|42*wwp9DE8ap8j^dl$)YN2svyzEsAgqr|X>IOSeOZfwL!F9E$3^Q56bB2+
+zq>EEjb*M?3-z?SY7mnzPuNTNk{PMHq(>?-TwX##MBr~D$mkD*oDIOO<yykI9Y*mH(
+zh}`VTf}PQd5012iVi8Ga%1K6a$gh$et6fpSsfsc#WqhZLq)Jt-<?IN3>|kTqJ;o5U
+zk2AQwHMEtngKc9M)~?dV{Ro8sb+Y)oTj~`O7^4t&cHQ{hHxi22ZfjF*>p>OQl(SnT
+zM6l1_+O5};2@<D%MFhpOgAAdK9cpfGv`AmA-R;y9r)XT&Oz9#Wb6I1d>WQyk-F%Q>
+zj%|eMk7B2oC=>sw2jBWycGYfn#tys%qNp>R#8RCIj^>UQBU|Jq=n*1WG3;K$oPidy
+z;by$*@agaFX;4LTv5wZavg2=5aosLOJI6DQ1lr-=b&Qdl@Ww&T2u0&j5i}^@ftM(e
+zjqWn-DO;yQ?OtU?=jpQaiHt#;DjA<6jds?rdhJGu_{-M+#RM=$^YBWD!<1A=xa##s
+zpH(SIfqq0($LhusHMBdFo;)5wPais(Ramo3j}ly}%XYUW1~#j<iTDwUP;T5P5SczK
+zz!$9autb!OlkbJwK}pIQ_^v%p`Q%#&Fk?r&iM>^C=}B@6ggCz@58<5a+d2^B1xhC=
+zm06ul%%O<j9GqC3I#N-g{ls55(w(7k2{Sc}<367CfvVM7cjz6tiJaI#nC-&^e|mEJ
+zAGNo=N8=JNRAy)b&$m$PN>}TV?f21!I~9ZyR93rII}q5D@hpkLY+Ti{SDP5eM*k_C
+z_o}9;gteZ&k|4@F>t1Pr(&UO$cjr+Zu0N=VxT(qrOOTW6D@ZN=)VBXpE#~N(b1xw3
+zc<&tYFjtS1y{ZRxKB`H%Ki0g&C<Xh+pcwdDXj)sRL9&^{<Z`g#?it10YbD1+3%M9V
+zm`|}JkunNX4}Gm|t>Jh(o7M=B9p-}-^S~=NV^_@>cN0A`BFG>t5teDZg?Uy3Dq?OC
+z#_`x7Q<sBz2kO#Vr51vR`Qw2TPckqsO84?zztD!RB;7Ll%Nid$qEAt?ehMGyKc`he
+z@bP0=`TPU=(;GW=&37Nxc_X{@Yiv^{K0r4xQ=obJ14>gv1GLF#7A1#r$BZYK*;>8$
+zmtUy3+M_3be>V%3Q!7@i(3UM|my`ns4zM_Ud<0=#X**%ldlZ)uhCB9|BMkZzNM+g;
+z={mHd9v90>9o?0P`y;MEXUivI1iFDsn>um58(e@KgK!-SA$I?Ji&rh}C0f4s5iMcy
+z?%+3*7CA##5F92qG(<a(yrRDsJ+4wR)+L6H(}g+LYZzt)Km7kU9C}Qv+V>#5eVUwp
+zyROT<1SFtFYY#8dl7q|D!13hp3A!-%8jX!X`6N8;%j__>)mI}ll8BSzmLI#wmX1Su
+zam&-1ly|45#zi9-x9jzyO&XIvSAisD@?&we1I1T0?$BGsFKT@Sfp+kRADOg3=VuV^
+zwx?7t?|fEm_|Vq_pHCTnyDmu^ZFQBsA&aC(6-}G;;O6}*Cc|M8E|yp2|C>fe1Zi*i
+zQY|iiLx)@I5aP)ipLUVXOP{9Z#&xvyZ4_ju4%P2eha+0E(r?uz#6W0k-K!;qPijMT
+zF>pB%^4RU$9I4#L22AZ>=V?btYS6y2H}yvGVgz`bV#0DXH{()GLwFmL=fL8}4m6lG
+z%;TxnYkMD6Ui5G!P?rNC=*QotwgXyRNOGaz$@<pxUua@%FDI#`<5Io8<Cl75|5EL0
+znhLV)P)7V*-8lC9njA?~Lh@y7I{c^}*#4B(99^UIj2t=1f;oYh0@vn$LD8(*7MB5~
+z&`G=ne=BA2z?Pl(-svBuX-PNg^J8u{;WCIdRiP)g{aUXbtyDchnIb?n;z$TJBl|AR
+zjnC>6$UgeOGxWJtdc-K7VJLqGbg*HYT9UGf40%w6_50L7vaCoGo4`|}4W)0XsMSxG
+zkNK{y%9_Vc*lsCX6XG7%1EhOiU%Fmbrxz$MY$*y^p^l<lMn#08r0r5UF5zQS$14kW
+z!yUvjn8bKopLe@lMntfoG`x)fl&d49M^O}Ax~$-vIyc2A6vRGi+Ns~J{<_{NdO<Uj
+z$0!<CNAslGyGr$T$yyaQl&HSwO{E2%r%>jD3$sUg-5R}vn{2nQUWdsSBL5VPjZIg1
+z!yX-Qmn$v$0$o?|8D%1Kc2~TqrDm>SHVF#?tswTq^u#ghL0Ngb=t(UrUyI4juKc)#
+zx}4ukti4UE4?fHB)hL-hWk%1^!Vy=gATm}(Wv}a%;@5SA43xpRbe^Amy@I>;X=Bv^
+z?I2?1^01jo$F(#5Sj5j0pXHhUbXpaJ?#6xk!@UoxlX&JMQ`+?IyX(=qTUE4Yt=8|1
+z*W8IjALB>XUtFnUbo*DorKuNRrjh9}>L%Q${n`uk>WZgysNqYB=3!lN#TB~fB7A}=
+zFTeb<UVZh|{;z-Je=CZJcg|!^%p7V#KfTRM7#^mPbCR^;=^|}jQl?>}P_)c;;cWR>
+zkARomd8zxbp56E038ps#viSkgj!T}Tc`28@rw<;o-W{%bS%294poXVksT>gIon?#k
+zA_Dj`sVVyHhM%e@bi78#CaM&H_qQ!Ix^wI$*mp~`wQ8egrsl}6X}|uy^>@mOouIhx
+zH}soz_bMrFj)q4#5t7g7e-O&|%=)U9Z2vDkS5~U&=`-;8KBD!cZO#bsS4T&wRvccc
+zsMMQK5F$Vs4r<kr6^dea7leQ`;9eWoEG_<{o;kEfV^gNf(Os(7cl{bPqE#0pg=^`7
+zhg5G*)r|Cu6ccz{sW!Nvu|=0P7Aq!Vu96Azv#(-_p0=kef#`V4_dckd9sU{<m&@*Y
+z2hcHzl1L4lDWl9hqNw<38b{!o(%Rj6ZudjVWN|Jlc~DOku2g>VR5AzGY8#OOqhr!R
+zJk0PKq@+tn+1)<0`8R5Eq-i8s7mwDxs|OqQ;sX9VO`?t-6dseGpr0=gM;wLxVHa!9
+z(WQEB?<=~Mpi)+ST-V%Er6V0uM&dcglmm08Q0(vH)6UmBhu#7Osb=?yAO(@|nsCSz
+zyI+X%5~gb8k>xtrb_CNzD$$2MDyrP7HyqC?!YByL8wY|vhi8{d-hx4UEvp`@E*^px
+zK1W&O0c|VWpm3*$b`@%ObrHMdY|xchdAhu6B8%mQ!;970n9SFViNS|*l&?`S$siX_
+zl+Q8bn{ujz+#2O@DY`&hO4{6*Lh|TOD5yuN%3G=x6+T7d6DC;7fpve-o!po)8XXz0
+z;x>?szzdZfJ4*YA-BH|lP&w?Z3#<3a>z}FuVpfFM%h<7ZshEh2i}jqa*3ud;ysjt}
+z#N+ML*RxKPSc{{;vkMO&rKzA1yZ5hD6^Inwu}~I633U=G+=*$$MV^Q*PqE%Q^ol}=
+z`4Qet{ru+qh-Ntw(@0UtBCSIa8k;&@@qsq2D0)QcG2`WR)#-sv_o8SfYXng*ORHDt
+z!7U{UoANasEO|uF6>m~{`~;=g8nxlTUs!Wv71_R8i%YgBHD;1Vg?Y5;=)<aL@6a9j
+z<Mr5<`&6k|jf@|qikeM&71Pt~#7xixe+7H|*fjg~&Bwlue#C!HtAfx)2+F{e6eWQy
+zKK{o)kqf0n)pgBkdh1y|l#rl_V^ZWK_=XLeOAx}WmG{Z{V>K+k*QGIlNi{MlMoSMj
+zTd0FkZ9@qh(q9I???3iY{;fDf8d+v-BEtHkDB~6+Y1fK!9oSf-(!Gt!82jPu%pXPD
+z|5fklVWB_VSfszK{p|@0L$87mtj|okZb${e#H;UMx7%Y6Q#wJ5X2d5d+m*%27@>Vf
+zpI2#5qJBL2_nI9Otm5)KJy~1?YS+eYGgk9QeM{fWpRJ=cFY4bG{Y*!Ql6R!~Wsrjy
+zeLnL>rJ!uMAauQWaH&?6PSsj6E>0Qo6a9GVHEMD1QBTWfRc^xPA}9??&~NiKg3&?^
+z_-n~r$Y(Xc$16zR8xcBF7iD}#9qoJ7*m$pss+VeF%vG2bVsUx?g8qH%9oX>umwzJ^
+zO!ZD>$IsKhPydr*eFyaDrXOgZd#~CZ^OYVwR}ub6Dj+%4UZmr;T4Im5D^YG7AdT6&
+zYWzLAmbGWyfd_Tp);Cp1K7gX?Ey_u~ML(Q=w|Y8u>Pg4<wY9ku@nddg!#vQaeO2#h
+zzuTuP$6TXnB<<PDZua@2#oAoCPT^hAIsnuk0L+{emS(<$;EGmW@?}c&?A7AKk84$U
+zDDCz`fP1O0)w1RLn<$GX6nF;oEsz20LC~4L4laHMIRb_8cDAbn@}LRFTm}-;4be1!
+z?-{b9Utl_ce-f1$adHL0qzw1aj-3?<|Ms00B;SajE^#+#dNzueD;g!p$GK8fRJ^6?
+z1|nnfAL<8!&#OdWee*OTT<J<=jjnDl(!RQ#q?0(LdS4<!Fq3)chiRu3*uInbWssxe
+z&(ZYDkS_gsc}>g@dlaUQ(OOlqL;LG?E0cg<#Z3p55V=s9;TZ(aD(AXxP=)Q(S#Oy{
+zeAqku0<(!4o2n5fsL{tqEu69P_q74(_gG_Y&Y0c)rRfW_z4n0S<X);Vt|~2J?96}0
+z`8+r%NtcfOf4VF!TTgjz(bA?Q-7)^V$_gyfw_d#m^5|i$YkWsX@k+ZW|3Xbk$Wsv}
+zk*5lmXlvO@Z7tod__!<em5Fy~cyOnlCURo~<G2PzEH?HUeQCn&AR-ZZ+5b*GRl0)T
+zxl1i1t%%@vIyQc$rbOqciJ)Y&($AB#c?*HLQgk6mS8UL68F##gAI-bdsvrc$j?=e)
+z_$%x*#Dhn0b^^KF{k{Luu=$_Szg;p-L0xrPvTOyBwkBxdtPHJu;rIH^{Ri~3`~ING
+zc|hdEeSdi~?EJ)8N(jSW+*);x50r5m`nZ&y4ln!zH(EUlRN9&09}Mn$Y+9%aW+mv|
+zXAf%Q;!>sNV-Gvo)?)CN&wl>MM!=wG#;Jg{>sYZA1OOmEJCXl}D0U*prNqqD`NMW=
+z$H6~q;~}4tT%$D^7}|+FI0F7ax+@l2ypJ91HTqmwJ@(+$2(NhMVr#a95`xSh!DAGS
+zmZl>x@0;}6p8E;C>tVOms@PD%&$93X?y{quBK9^w-7(4ujZ!UyJ5$Uqt-qLeAkN2%
+z$!6HmTB{~w_wU%K$F^eo$1dFFjZzAWvk`Iuj!1T)*(WFm{S`RyV2BAS&~P|C?iL#m
+zGo&@lF`Yp0O+-#yQ?gpii#_bX-9W_%Ciple<Zf_ansUN{nHj%ucnz`kF14DZQC@$g
+zVb{hZSnZxLWw<i5zZnihUl+QuJvV~pv~*Qy?ZGE8)0kani$X$%5#6{&8%kE_m4jOp
+z8Jea!Bd%9GrUbLDg#-=L#N5woXWh@VXzx=>4K#w%>;_%fsu8}ORcgbm8f@A}F+2Ju
+zvMkmS<<bSY5V`_uTd&~i?|Tz$|4Ks|^v}WLglLvL?<pDA>Z*d<6o(su6;KW(BbX4-
+z|2Wz@!qx2JW2b0g#(8o%df->=)-ra|mF`-VwX|5>k7EtKB<pjU9Z%Fklp8Z7{s`}2
+zdxwfaFC4rd9-l7v(e>JT=vB-^<%)OZDk;Pd2)=}!dKi#-FecVU#?Q^S`;{UeHvUEs
+zqZT<a4TQo4NsJnaQWL47`i**{GgOsbewu->Ooq(rCU1lvA(UriU9YS2Z&noZ*ZdX?
+zcO``HSCo@SfsX@SCw+!%0KcWp7LWNL2$K;P^p$P`ACXDK3g8GG;8-!qr2+%;P^zO9
+zLX8f73&D6d1X&5Z9L#kuT#Y6*U~cFjL*yz<20M?2TJs?wAW43f?C~izJQq(8HiXR0
+z^K$QkL$_6hAbYXldGI^TMiKK-STd%NLe}DJEy$Rs)upTS@TNEEPqId(oUe(P+k2Qt
+z1{E@G{Wz7=sv!75n3^<w*0KJ2N(1!kKV!3;GDnj~XApXIjsEmMzmWg<?`ZziOiiDE
+zxhB2#pZfU^|6Rj}r>mWu@70Qdq<ANGRAPM}tLfwSrm?1jMYdbv1S<-SIu4bd>6VU}
+zpF&&&P=u}3Dl2T#u#tozJzG9?BVbGu?Ig1qk#vpb<;Jk+@6sz<f2GHEmg<W5Sax5P
+zs%YicWB2M{`64YkTCQ1XWEjL=-LG^Q=+@*hGQuYmg(3ol;L34dR+L}2DjRmGkTA8w
+z!XgpCT`H>Guja&9P`)bc{!QvJ(ia55=WW9!t(r|hh{~}^8&c%4-zfsr5(>fbBsg5C
+zn+q0VHmFfi)eaIVrXcu8gv`R|K>(TJMff-4?$>Q2+aQa!&oK6}J6nqsQo)KN0I963
+zVKdO~+saP+tnMI=|IzAodT7sbV1Fovkk%j;9Dm+)(EMk30p>oXb?kf*R-Ns&*ucxw
+zX#^P!HbTgZO$da<h>$GJ&HbFlM24!a`GAV+D}lc!C_8AnCJb{UI2kW?toshH<UV|n
+z`z1z9(iJ%u=vV9R*9uRF3P=YW2GMOeA)mL_fy7kI)+9m&J7L||HSfSi{j%zmq_mJ^
+zxos#pWH)SL!&D35u?Gcc!_l`?-0aqv;rU9y#&3k8QGgtbJHt*fqufKE$@zlfV;{6@
+zH&>WqC7~iTa(eVA&CEOxH$e_|kF#7fUn_Sr-pvX|IWgb2!?6Gm;$FQ$>U<=2GF}Mg
+zS$KVZC<G&w9<*6+9C;p7L9Q+>$Wx-NOuJDioaE(54UN~@$}L)7z7k=7j>15OyFdXp
+zmcOGycRS{w93=qthbt4a!zgXsvsi_dJ<5!mtL&Hw0@;^QEll4`UrihwqcxkJ(rDV!
+zWtnyip|-ud7XCzq+L_-C4coQ0Y^Q=<bCrtgsHdw&RUk8AkPNND9P36YGwzON98C|+
+ze>j|Sk6up+OW{JHHRntW2Xm!S!h;Bb9UPRabMWRE6`i7H_de~0i!&lBRlCY<{O-z7
+zfFbI7jdJ}Aif6D|aqqOZ9Km(7LE#`Lg?LeP!t$|sTNEBTN>`7a&75x5>ivJzl6`+w
+zM&x+QEaJs1)x+<{x_4i%t>%7&|D09@VQ{~Eu!*m_8sbMmG>a4u9?j~4i%m@OEHrMr
+z@@8GHpZ>zG$6k0Bf={O$ap&mP1=s1OE2j`7X~2(uaK%G>ZpXj5n^44IL1(6m^%bos
+z2%SpLk0fXj!Am}(V!S7Er^IR9D@U~B&2n5GaS=Tm7vUp%8mI5JMwpg1zOBD)U!zO&
+zzoA?bBSo^9#pA1<l{{OK<@W-4KA^IgaIGqSNDYDGHP5erMbUt(z00J@(QCoK1}0CO
+ztEFYHX$Q9H(P0jl=dY;TlcMu-E>ccJyfzm9Nv{NA(rDSJ)%8_MNpg{lF;Yp+Hmy1E
+zH$``j)r$Qu;h&zt(q^O#cVdB!bY-gm+wJy7JRh1y%L}W0HJpgysaL3gRJumE_U{H;
+zJIb}H=uws0CTKx&YOm0uHmkKr3B)7q^+QNH*|mp2pzBdhLy>k>u7urQr<&$NY6|e8
+z@El(&jBqjSaJhylJu*#;%U{yp_XH@oyGYB)+!qo#-)gUEbD%RynX%bQEZz=@ZnqM#
+zJMXSouHDT(6@VBdf=VQY_de532#))$HX%$AWC6r27@2yd7F2H3<NFDnjTCo<Wa#|N
+zOSFH>V|r-I4^*6bzTzETp!K&Aq@|jad8@L3@b{vfRI~G3vj2YVVi(<t2SpLj!4)x0
+z)8S=>+bb<Wy&LmKkFUW>c4&<W|D;Au)%4`^lxosZ4^eEi!?e#_Z|%g*HO4H2GT?)N
+z*h$=iAg*ad@GWPa9I7HYllhM?1QTOn0(O57;tUbXn5Scx&rwhDGS*|}SyX|#8pz6s
+zNV7ZQG&XrI+=eY$zV88)po7YbNL0Oh3y}L3xuRyFpw3hzd;n;T%844I6z9v@*VwFi
+z(FMwm>?LrT_L{l9lX35XClY8O2v%>E88b%-#&m;s$*Mz7tF&PybD&#Cs<x`6D@a!s
+zEKo8rGY*yhuU@a}U`Kzg;!yfb+jo?2RVs*-NnLK#9~<-2QgHjm%nDw`yfO2|XwBAV
+zzc7t}7@JV}66DN-AUA>>`=)la3a-KoNU7O+r{WbYE9y~b&mJu+*{ta~Ur|oX2(2l9
+zQA_Y7%Lwjb&J`&#>Qcoz8ubK9L}>WAnr{?HOjR)<HeymZ)q~R6P=5e^P%%nlg5{CZ
+z*R+rH&zX^)eO>g6%+Qy=@x9|6#^!YQx9>UrnRgTB-(bCZ(83%LH>?MC!WIAgLkqqo
+zZ*8wst-C|>M<*yf*0^z<-cnEK<4%%%M3H~N8FYMsI=y#&Z|%nIaol;S+Pk(&yVq7~
+z!iA|y${u?0c<;B*9{DInpnpL=wt&+J^WH3rCxaY~T{{nZ`kcxttu2PIXR;nTN9y{5
+zJ2f+LI1K$F{k?dV-fRVWXXks%=sPqbq+O#D$Ky%}8i!yu?EkSz({LY4(RkO5y0)=~
+zMeb=GL;%}ibzeLByAbtK<Qn@Wb-+S@^T1PhR0L^U(mW-T9Wg3+n64gqy&f)HrR9g~
+z6c#>J(*n|QMT}(O&gEXwN&|w;$RmN#uBWtY|HBp&JvHt!T{_~k3d3$cGGQ`{x)t}G
+z9bPv(L(CnHW=t6_4UZn9X1ol{Z`X+%S~^L1JSalLB1Y-l#8FyR{ic?*Mqx(C)a;Z9
+z1V<Gnju9Fehj8xOP=sL07!f~-UD`+`xNZYI_!C|nEYi5NrNz!rD#xR61I>+_B3EQS
+zO!NZXn0G+W7q8R{4H#E&MO%<_D+I-?6Q+hyI-)~IXmnDKVu^oX)R*Xx;dqe%GkYG9
+zJ$yLuKm3Y}TXm-`P)`@Wu9Zd4U~)h(Ib1qF|Es!u#FYwn)G0Y?l#-jORf|$m10TR2
+zQg>d;Ra%gBsYXSOP!F4>WXwXYmQ9fNHXmz;0i)Y7*9@cGe!dg!)@J_r8Se(*@9a2)
+zQFs#QMc-HLjAcZQ^4)M!)CPesLn)z&DuP$A1LB}5Y`PUn@SzkGyy)<3WjQ+$XpxGG
+zo<w{GVnu|_R#rG3E?vpWi^Fq^_yg&2^L70=p!)sKXb0IT4^|l=?5FgEi*zw;{c*AB
+z$JXK0=+T;$Nj(vGuOu-i`}ikL+-p-K@>N*AO@$R3dw&F0i%@dxnUH8REV5#8OR4s>
+zkp3D1Wn}0`eRkxvaCIiaOTl{urN@oSZWnxn;LsdMkz=*Hi9l7c6Rr1g@N`1(AQ%}N
+zNuMCxV5&)u9;-39ak?;pIBl`YXI>`YO)w^D2HC3H;Fqk|s|~A}Um;qM{Uwcth&w9S
+zC=?HBd*xE@<yAr2wYo6td<c-k6|nOm?W|m^U7!--5I3*Pzf$9)VhF5Nuce39>xHJZ
+zm=$_7J@YdVi8EE=nWEUnWja`2DtBtf$3{Uo!^xVgCw<EPIa#u%r8}$i)%(}0wXIth
+z&q&kHZyZYkJA<vAo`O=VSO2hEYhOO33%-!A+1F*Bo*TW-TFv6{(!IOzW;lXJNQM^P
+zNvhj{hPn4y&)LgP{|NLT6gO9`(T|pW388)be&!k4?18|z7wOJ%_Z&ZQ!aJyIJ#M1(
+zl@hxE0Tr5zCqS<<XvHpQt$-8-!3-jxi34CD=}sU_KV0K_iG{tN9mec{!r%o?uA#0L
+zSoP7E1tJ3agYWdlTc~PlvPgwdM65Fat&{H=Q%61b>BJ8_IyeS2px2&j(gqtQyaNt}
+zgJT`IF;=ya4G&v(Y)~A6((GUjf53PJ7`H&9RMQ`e&2Q=^ppf<6VZAr!x-GIE?vLgi
+z+=v=XC_YDsVuGVBzx*~V6`_y{*&g=Y7ooxqvm0pHfe>(DerTf|wJg&9{^5)j06;*$
+zzdrw5>qmVa>PDneH_=<UZxir!Lst)D7ekB%QWc*t?&bsgX4-DN8XP>QexjyP>ALZ8
+z_W~`O@iE^s{cH!}sC3r=HQPWniC2M1rx)16!~$!-n|gTURx!$(@nA88&)#APk6nzX
+ziPCUl>GafVd(}Gat=n(V_+!Ng_%M{C2?^7&foJfvaO1?z-hYXgap^IA=9t-08)D$#
+z+6}5=lnfis(ZKEoxv`raJZ-hciuM_^jZtFl^tXQuI=YFxhzCb=7r=TzBwUtQi*R|Y
+zaeZ&h^EJ@ERc~L*%vgD>XEu;A(EA04xd-#aM5{a=OULvKS5FkL{=S*#X97K$wwn<&
+zu`$}=A_Vy{pUv|&ydLX5CR$|gm>ACqgZlXQojYM(@|^357}*3zCDeE+1i5%Vz0bzP
+z4yk88`5=`>5rs2=@ie82*ap?aJ81XV=|AQ)Vsu#Fz)VsDuc4k;9l<EO@pzFq`HpFG
+zJFz}|^f4Hh*8Z`yDmz2}m}l{kCTluF{nYbo38vKC4hh9yi`SOuvMFi0V07;;<#e>6
+zvjdy$5uiGF5{c;_{cha|n(^l)Ywwy$?ORu6p$Lgt{iLDOF#>1n{IDZn7VTViu|HaH
+z?+{fuAc3U~alHQ!c3NQ2VNv=02af$ULMDoZ=|n#kKX&i~LBkV2+aZF*v-5rLFU4*J
+zG0KGSH@MijPYm~YPhkN)j-%Q5Ek<e>uYtw1(ZnA(Ug!@y^ZqjMJu5ql`Ek>oKOuRO
+zA_nZ59T9{?dT%i%l;h435EuiZl*Vgtv7<Eg7o$u>K}?MLhg@UCC&C2oeE-+_{u;t*
+zzhc#U$n-Oqu^VdqOurmPVMEBByih0Pxxsfb*Auyc-DWf)qCr~t;r9zkqeui{G6}|I
+z(w{NyKi+>2BhZ~zu%EsoMlhbN@a1DqiN2UPHT}iR-{YTpj|PHTBuDb<zvv`?O`L_n
+zrB^vZLF(6y24BEu6Bz3s6-yZ$a6tfQ6r$k7a>D#H%EW;2A3QJV<9mNgz110{D<S;7
+zYpW9lG$o?X9yRdJD1NbF>AVIWG&~?D%Ex=h<HW1Z{HKAd#hJhRX}Dtx0XMc5VY?!_
+z*SHa}TD!ACuWT&Sd86V_(6CSCQCfab002M$Nkl<Zt=pPl1`|Osh(t+o=>rz6Q+bmQ
+zSXVM;g%J~Cwe{^1?OF-rID<U*m><rTkJkv8B|SVaTGJBG`*=0%Y->IdBM{&hiObx4
+zUZ05Oo^9kOYy>`a3PMp8kPl?R_~;PbbZ(|L?W@-IViL!+b+IEjJsMhLMVs2VXG%_#
+z!eRz!q95U8@FTk7SWtw*&DErYuC#awF~-6DZ28w60sPc^nmaIoyGTs*54LFkXoL*h
+z+}e!y0z1dBlWehpp?w{|>~MkXF5&`w7{wGw*h3^k8Y)NVP}smfYUKMkM;pC_g*LH?
+z93g@7w8A`tb?*pypTA$zM`9Fs2~kY)6*=%$u!@1)JK908K~O^Zy&0Xn2ROe8f@dqP
+zmJr|s-0T+)c{qrBnR?oZmp~vLkb15+dw*d6;9%JZyKI@AfVe$vt&Ay+HK#2--@Jiv
+zhZ)Eg0z-bFeStH_N;hzPCx#7NCG7$IeS`Hv-$Au|?_oR@2)pcq)NR#G)i#s($h3iH
+z=Ox6pkGAvZ`|gig8yL*_!S`iu@Z8O_x6v-U>7Oyh;I7&G{Q(;ks~^;3?t?3~x82--
+zfLXzu2mZGcQP9q2Z>ZukVZ2*9xCV~dahPbROV1wrkR$M^QxJBQG-2=SR%UX7#-&9l
+zF*cM?v274$S{0RfdK84pVmCHCDSp_8Tns<t!~17n%N!f2;iF@;YfS|Klqxj)`pmN^
+z!ap0dPwRQ?#@$s1RrkVXg<WyEf>S;m(&a-~w7mPWI$IJIea*SOcGW>+<|9gC>(-5G
+z-R)N7wF~9^5MDh!jdf~%XC=aSxFRna*DDhT-RJ-E(bwTt`}Xx}KiZ{`>7&)UY^Cg}
+zqZD!Om?8T#_+CEZDzxujt)>;b6fknW!sm^J=Yue9ZIpY%yXtI=RMaJNtoRA-d$+4`
+z*;{HatHo9g7l3>RArogQV(LWshxEw3Zlzi_?!*NY0cvC@Ht2xNe7Po$S3q(MzJC>R
+zui=`Vhm7gG_Zrh6Z?J;KPFC3LNpgnu3x9Lsc<C-LlzYb>`K6DNYgB&kI1=Ncb(`sX
+zw?ZdQl&zysjqj{ccU?O|*)#y<CN52(6DBJpD^VT$H>mkt5=9x3hjp63M=8S<GGUTJ
+zGLjMCy<)_~Bk0(%PR*P4$yqR2;Zw%T;p|rD-nD8Xif*^te3@dDB%=sn(h3?mQ9;Q8
+zYTLd+9mJ72X0Kp9b%Z9#HFvf`$7UUS{ytn(yQ*sC7Z)#I;}O-rxnCiZCn<P%;)hd2
+zds}ph|AjA81%VPmqkmKcyqm#Bm{WYa(^%c7PC+QHY*jaAh77z3QX&b;K_s~&rA>qg
+zZP!HHYfeWgFK)85>!gn;g5t^g<X~cszaT}0gxTG*x<X^-kuEjqEQ)Zl@%ls_H{`Wu
+zg54O`EOt^3au8U>?2ucU*(DN}0LH$9p!GfF+g0)Br{tV4R{^1r;#h?3VPWvp`p^Up
+zc-)`^L_4wt1s$)8U7(L$u?Mb=mlz1muRW^fsxgYVdOo3-dv~WcQwKX;b3d=UQLU?&
+zsPegT1)et#1%VwPu4z5&QcaXW8#`0$o@Te*P5am;d(AEve}8*G?~>%HBZ1Hh&&d-t
+zUt#mJq3idacZBxkk3=Ik2!NMewb>op*v;BaYzByT-foYzqxP^XHExmi5O$cB;6o@u
+zob!+c&eKf7oVBm3er>btX)e_~{D}OgUZZdn1f%U+yIzxN$B@f{*~t%@96sU)w60&K
+z(w{%3fT;)NNcn-n^Ao7IT8(c!r{=>s3O{F(Itl+<@y9=^rLaSRBZkWnh2Ox&l_(bL
+z)PCh1O1vUZP0L<X)l2K;AD=0Ik|h`f!qc@_&9g63!e?)g(|cHri=U&dCGsb9w((T5
+zJYVp+_YrF$bjmndH?)G#b#SNZUU^<YbNv*8f?!0IkAy+ZYu{4ciVk=jxRW-mQ}x4-
+zLwJo;U?RqG#<07kO-<`|DgO4W)xG&mRX+3_Zs|m9WIgrrEIqBSD{$=$#oc;~BF2xf
+z#@ADORP~FVP}#%F<+|`Tl$#6`h#+;9mB_t*gSu)ud0#5{rJPHaUnC?^5{!9k8dUrA
+zQ|hP>R6sm-djnPA72t@<kTWM=A^i#h^Rv5zybXVSLgCkZ9+DsFy5HR*ztn66CX*7}
+zn#as*ljRRmt^*f$4|9%=F+V^e2xHt^K&M)IkK=O2b^K;5sD@jU{L2e+<uh)&A^bM_
+zkO^NGh?qH!5@&aD9E8>?hU`eNDZ)s~2dd%+>f?hr-0=K;YWL+R?y`$ffC&0Gcmnmc
+z<m3LQf5blS?R?+uE2~36U~;8K1w$5sKov%IG#*}cBM{zcC>{cG)RvNZl#z_hcrRJy
+zG~Dt7RcQhxWsHha@wQs+U00)Nmk(p{{6JNlz4%Ow0Fe5S#VlOM*z5zZKt$kG(7JPr
+z+?#f@C=rw>8&|lA;}j4TsE&iX)wF6gG4sh9my)HhX=7PH5zhWSYTL73UAu4zY;!1N
+z#vFx>$>A0x8r#2H%^S7@2g5AS<U13_Dj+Ugp4u`sZ(dKG^|%Rykdoa9PCOXeSfE#I
+zQ}Ae_qJl_t*Bn*Lt`Y^NC0UTKogFoykmPM3Gvdx|YTJ3#f`bDHryi1@DH{o@nm6sR
+zl!l&~CIyb2E>}SxwT*t;%#NHyI}NYDqOQX=@=qI~@VPTlIQ-Ogq)6_q+tppsBwKh4
+zJL&NX%}P;EEs+qnA4I{isq@fbwxQt)nL10MIVtkNtZ&)6S*=ATNs~jJ)hGu}Tt4x&
+zw-d_J;^_g&cOKp^_m*w+2Xjnv3Ong>2%tn1kb&cG+6Tkmi6_YZO{#t7B?W!`c1zho
+zg2Q)$ZBJY3pLkR)M;wa(?mdb*k7$%cGVCbYs`5YmPW8_}sj%^1Hz5lZI_Esa-}McJ
+z4UeG@?2Mm%ST#%DQhh?EVrE5Kid^Ikx1ccGDkr}4mLDR`vEkNdBj3PDi)o9w#wbq%
+zij4)!VFaoXTnIzI?D2}d;ts`KFcu++nf8f4t9sGfYTKJ52SPDu++;=H@eM^y%0>ai
+zWc$W5s(NCH>RwLbd8a5SE`WaRQ5){A{&A7=)D@|vsF<DoB!!)SlS1cTCvVeHRX=pU
+z8jI|TyX`JTO-#1tq<hI@^3NHm=!G{a8Z^XsP0&GW-rEuM{j$}|d~e^i12kfdJYi$y
+ze=%;27fe@RMikF%r#dS@a#7rR%Bon5(-f2zrp|-K>Z*1taO4z)k1voPW7l~ERAm!$
+zr@B@4gjBhh=Rqm)%;$Qw?%2ru*^iD$l*+M_aPc)Msaw^)bF19j_M#*^sA~+zN6Q)I
+zq%P*lx~(Wb&GL&MCf6kLHxN3#dG#i>k?k`uHBZh+Qc#~J^Y(y8dRpFosuTnhm9380
+z>P{2xIK0<x83&4B$39otgvNLpikn5mT@Or2hPm+Ap|$waaNGA?WdNa2$DWg{!@KJ-
+zGn5gEIgWPr?ZV!7EoU!0Z6m;9*i%=hmK{5e?P8AIi*?d0zJXaIjvYGo2IQc9@4G7b
+z_Ak^8gWWF_cez&<tMk@>SM2NrmH+A<H5IuPz~a<h`@EXBU8?xYb6MOEsrIP{S+s)G
+z%|cqUa;Jv>>c8ad+NPsF`IS1{?Ba;I-}TC~YMyt4(!Q`zjW7ML${&40_Q({3N~<~w
+zD-<{`P(9TLxX)jd@VzW{Nhsn6wy5&HrHZ}t^9U{@d~jtX^lsxSf-XJ&8iLGt53qe)
+z{Dz`$`J!A&%_{rJJ-GRW%0H9cR$P`sQ4snCf(RMivi)^Xi#=q0Y9V_b38I>uO1NN{
+zY99H$>enBZKM9$<q<{Clvrb8OeOZq3w{+xtB;iR*lV1Q(Z*_y5n-44PTX(2?>q{!V
+z|L^h=-q|m(huv(M0<z}y4yh$50Xj<d(TCrud3OyND}&fAlfs&va?0IbQ*h!SvkaPc
+zKngqh+&s0u{hI2=O;FT$%#5Z7HtMft=e&=seG{%$+{Lqu-av6GC~v&tZn#<<-~X-J
+z%gd03e1pi0HiADnKsy{E`HH^$a&_!2;TadIYYYg1HBai*P6k^K%8&W%LwE)xBmrap
+zAJ-kzchDTebMQ1a$cK{TBMYI8m=`3Qpf5~B!v`QNw1b_vc|~1vnL73zR7-K8IxDLc
+z7#^bb9b1U77^~<TC#z%AHnncvqwbmG<#gd<YLt{7cJUxGM)9-v_0>`YxWCCc(OFWi
+z_M!vU^M|<rS0+-<M8X>P=|7&<29&!)C|=EKM_9L~cB}T4y-J8lRQI-5Rq@0!IU=Jm
+zYcTee_1uHCpX`{v<{I@Z-l}0g{FZ{_T2%GBKgfNsi8lFR_CU#<e5sP|xJsRyUsBcM
+zud2re8rA7m-D^t~|Bdg+zj2$YpXRs+v;n?G{o+Lmzxqzao|~%b-~LYSLN<tONPB8t
+z0V%qev1p|)B#mk$toY6nd8QPcRS<fAW&h+~d~NIN8qnehQ1K7q612ClFaQ&o(5GRL
+zdERdj#TJr1HMqMJNZm1g#HNG@+=E!Gsz4BoZ}7>uJpZKSL!S2HY+Je?n<I4(%fqGU
+zL)cn}toRfk%$XXi<kuo-E2(VP)@br2Y5j=WDZbO$>OSZQ_<%oKcaym0rdyDwW~J^e
+zCh3<QI6m?7pH<2a@995$?5_{PVb{^^YCY^z!jErP#K<5Z`9&xIN7S-rof=5kmGFaK
+zDQ<SUnx6Tss@EP>PeZ!wgyjvMdYRI`cA2_1KCPmEe_n0-_Nle-Id=JOCI5_FY%0m0
+zA0gx7Gmnt9E>U$aE|y=x#me}>7vw#(N=N_Wr@*$rxWrX3<Tmi`-oo$OM^GQL`9rGk
+z>Q)yv@P=n!AuQi;C4c*i@>T9s#qaM|!=jfIaLY^)xL?kR(-FX*Q%Lpz<$!OSjii5U
+zmg2wpBYs<rs`&N2YFoQWJ@Y^Vx&zpmUa6P`6V$r)4OKkGj&0jfg~rgXPR?C)tKu)t
+zm;0rMRQddN7V0f(eRBy!p-Ia8?w4hA?^4+>en&SzL#$ypW)1@EY<&lN`~gMW{%?w&
+zo~foc{tiU{rkX%n{Mqq#)w(URpN$|nR*6ei<W<+H{rTUh{;7xAN#BUDM=>&_Btl^u
+zbih9z#cCk>fZL%Tc{1>XW5-KO0W)6K81@gO0X{e%7mPww3*1kiy2vN7{!Mij?=ztb
+zdSUbEVT!!sI>pYLgqvJ%bB6ras`mKY>g#a-P5DSXgX+U-TKuAVj;upTs6;V2AV&fz
+zu1DlzV%TY!qpSzgcLO`I4FY1rK}X6_ELzlklmI_F4x#^KqvVZ|r*Mbb_b~3o=gK*@
+z&kfc*P}5PXJp)?G;CL$xYVw3y-eFL<z>Htu$eD`0_Bw^-^t#vj#o&6nV2&C#Y*qB<
+zN%R$7qME-OlNj@`4U!|sSNP}dP|WN^mEZF{s2ed#zWdv9`nK!vcb)?QJA{(BT8*1a
+z6#1E36*ZG&NiRI4+GVe)d0d>DURov(nIVUL^G+gTmZ<a(kAYZhP~)06<mGtU-CyMS
+zdR6hC-@z>OGW{PX_pV9>O}<32S4~yhI-U>nDeU5_<g48)M^~0&uAU|*Jh)G4IfDp-
+zPc?;`38TDJBj$cq3#SYNZW}mh%@8v9NB3#vJF9fyXbsuB!ZdoyEKQ#@iX<Nce_=xp
+zcQZe>78a;bNHdY7qctTyyw}uF)6jvLs7HbPU{6KqXz5W!akI88E5r2aQ*v%N?L9Sh
+zpNjSktiy>dZp^u){Y638@lKiYX2vND82W7ac#MEyk9$#wZ39gSC<tCmWj-Q`4pnT#
+z1n^H8iBMgox~G1l*7yVkPM8HmpRbNp@5nYRTTyeT$v@Jo=$pQ-fN_WUd6@+~K@sOH
+zP+$yvoM9Pq5Ok)is#Kl>m?_8y(7NIkwZbLnt^;;vt!_I)ie7>sg<o}(f|H4JA3Rg8
+z@#GJv?`@Z5_wTdc8pOboROV;R%LmHQQ&WnW19Jw!gleC8Tt0V;yhN|_3n0i4rV0n)
+zc*D<Kps-Qt@9CzUXpw>0z{oT5<SQux(sik;qE0@{96`XmO&j;B{9Yo`HPj*8xwm2P
+z!8!0x$x-Avb3irx)t#5iy>_Uxw44l%UWG2WP@#G0K;U+T&m61zb=Z%Mz@iU^xY$`-
+zO1s?Z*!HffiZ{qZ-S+SR`fyk^FD}8{u}yx7$qK*xYPyP4_TaOh%8vi)OI7;YmsI`y
+zG6a&h*NkT*IXiRXF<@k4|1e<>!ULiez6N$~)+5glyB06!J*~_M0`NG@+J`wKaNIaW
+z&Y4R}VFs7EAtF`=W)c73A1McP&BwJ~l56$FH|iZ{OITBnc~%q~bI=DL#0$aOP9Uf7
+zh2s@AbGBSr(W+a|xDG15u2x8k2xU9`4kA9aLWFGFSu79Smc}K`>Ns4kZag>IcJEc#
+zNQjKRQK1Ia()ST%z!pQkjuA6ZbTer%3IgM0hbS31K)Bkl@z??x56~97%ODY$%#7w`
+z^}!}5zlZRN1rTsq^P|F<FH;nh3cA)^jbcntE=*-zM=>9u2)1onq3#2l)l*N9qY#HW
+zD$3N|M#$ua3lxx=2J)7sq%X&*yL6|@)=D9>F2G~~2Ltm~__S=f7ZqY=OOR{Ka1^80
+zRDN)!{0oR!IfI-MF)?bz>|+OkvAkP`c)mjq#K-UG8Ix$OjYsw1Z+@g-KDkymMx3h!
+z6M+B+DF~gUgZ}d`zNH6VE>gkh9PEob^tUHo)Gz+<fG(Pn^`7eo52wi**+RJEVBBJ&
+zT)hfHKY~zC*k!njC<ueU^}#+HVpn5ToA$4-*1DIE%8iXTb4;{Gp|yUTOXj#3CBTuW
+zz~kb;#yZ>{*{$_04j<=s|Le5v_+oAKx&PUm>>(kH{Rz<;edjIe#?IP#=%|{X2RdC(
+z9)<#3+VJ1=K*%%jb$2z97V8>ex)W_Kj3{sjSW^soVHE_OkKdvpa``8xv6yxdp_g0-
+zi6aykO@=+AtQaDsk))8gdQgrnp=wrU6c{f=MMLcK)FZr&;4%W&6w`Lo4<JArG4cbk
+z=X(iT>j(p;PR{{4MzWE8@mS%<<?96L!_ChWAN&Bn2%<Cc-bDHH(HElxbQEn<6+|^9
+z=3?_51!__SoO_Uaac{QLhLq^wyH-I+I|4awgo~*Y!~<Dj_1(*waI9Eu2DLHc0F>?*
+zm#Tmmr+g%A@=Hv|)H6&0okVb)8Ah8T;dv0(znU+Z1%c>|A?zZf&fTMm$6t^=A{x`h
+z2$Y{F?hTMov{`Kx=O{QKk|Dtq)KCr=Vx2mhTyjQ7sl#qYmbwhY$v7J2p?%kOydK&h
+zlxE2Z3ThyTz&yMxF1$>526ErNmiLeGv5uVh#zq)uFKc4=(OP*hv-(Bj(uo<Nr@n#3
+zFodyUoEmUPO(S$RuzCDNV|y#0UgJ9HBY9Tut!SZ<+NOO(6ztd!dUc?J`X<Yt?3L~V
+zJLQGc7nGHZQ1n+&_HcRjkRf#U9(C5hQ5kHW8Q4tfbcDx2ww#SpYY3P9g(qg(09s{~
+z7ehup*75%SAG?%mNe<|T@?bJ-TJzA%2Q#wf8JUOAKbA7(#Jhm>=uQw2KR9ZRc=!fM
+zG2-zupFwN5-izyLcWo6)LpK%{6d05|YvRz>o+joE^VSg(jpBTz0t@%4^Kc1D$7`y<
+z8^!;g@ApzfEG5j`_mf-Bh=SnlY}V4h-=_y&0|sQ!tSntaj9KBDm-O({D>Uk=@9S6J
+zxK6G6pV8;O_%r?Tx6f<VBX<+Z@*msUjESKQB_SF<Kt!JjBMt_&9}83?riX6W&FXW>
+z8RGW;^iVfic+C;FRy}t}g&V3Z#9-u{1Wmnkm=d!LH1_c=VJr*<vy)Z+$X@MyyG%J#
+zV}R)X@pyiGdvmsB#?7v6!?UVc+`vxfPKD2DQ1zeosJQ{sUP6vku~ZGOzAf*lAT>Pw
+z2Q`(GSm};)8Myw%lD90fX47pC3R6hlXf<vs#dU3-f+D-r{N^IHL;4C#Odw6IpWM$s
+zFLx%w?FgjE9hLISnas`+TdlVilGX|Z#gfwbwPnEJEGfo~jfK?O&Bvxf)Pg+d$bi+q
+zK;Fv3K=!X#3%;G?03P6B(<D<o?s^0#h=AWPg~X!FuvT!#-jhZkSPMV9-1cU90z)BQ
+zUZ|+)5o&ttB?yRaP=N*@VpE@WG3_u42$d6)!0saM0GxuB<!`HLEJVnLeQMgUTOQ{q
+zDn<y=UK@1=j2J2Z=n4ef6h%x3SI1@$nze;+9TF8W7T3g!dYj{Is!-i-P!!WoZs!*R
+zs&MhOxFhaR{purf<`O;{#Uf&Mt}32=Tjlp9DDINk*u7b!cDxH3u~N=4^A$1-H^P;m
+zDePcd*R7GSEDUZ3UJFZJlLrXLH8mfvM-YfE%r*PSsQLDCnDS<PX@|Kl9E70ZnV4;d
+zMg;v6;jqMog0`$seR`5Y@w8~)@)qRK1M(ktshq>2A=(*@i3(9v29p_0Z#gP&U5#2d
+zZIpvVQr?ytH7$Q#?KNGBSvXQ6Ja_A^qYz%NQ1aJ4r@#n*l#zp~xc4_|gxuF!bQlGJ
+z>#WMmcp0?EJfpsXGU9EhQQOuHYVbAnp5wd?B`*N7tlew42c_~)FCak}&kB!%&O?x4
+zlZda-uaKJOfCAZHtEJ3X^M`wI&^%u|$;_N1vgN;v#9X5%DST9#+TML#U3=l1#3rB=
+zyVSN~g<3MgW$%HD^61M7oN)n)Nw8X$ys75&2<CaW8sEkI5;ht$!VcA}C{*aYOCXXi
+zP*V^I!^nZtO>71;2R+qQAXjw?jE7|UJ`nK!;rKZHJp&4YM}=!&(@%f*s`4k!k+!e0
+z(6RRpf=_EVuOZKTlJ5J;Z5lNqPLAv^YS!=nuBAJdsJinjibO%M6v4hP+Xq6j9Bb`_
+zAq+$ojH^^o-vfyQigL13abw5p#1!yhOIvfd4sEa3>gNv1xHTrEyEO5FRE?US^szN9
+z4D73Mjmn=HkBOmFCHopxys1v3&q*41$=UZG)d-ly-YjrtH`rf{Ff@DTfeUH>IsTg6
+zlymq**=z4p=`Vi)tmzL~EDW3UMT!C*_UzgT6a5crO(KVVWrrefK=3EV$RC04fP`p-
+zqRmMNT6XpRWYTkuxlmzieyj3d{Dfnq={?k}uxmc2;GA)az3g07JhDtBzdVeayj#Ao
+zI60G&<xi5Qi21pyS^BiP55-$MtAJs6L?DRGH32CeIn#jq7fyxozDkGxs}MIk14}0=
+z?ux090P9)gvCo5Om|vzBGFi*Jud3ZSQ^DAD{o~@)!%p24L*ny`iX+@GNJM-pgh8j=
+zOaG>ht>G3)(LV;SghP83h`@A`mfCW8W4maSAOEB@IWzJV6nw7Qaq}$wc{w{r%qX42
+z5g4At;!T3J#6$#oszSzPD`MOl%r?I#4g+=9G%9e)LIu&^6AC+eM>w(flafFQSVjqz
+z8#H{Z;y!;f^*+m(Mqr{zQq(oKfo?!_e0!0OY+1oEP>7m31?0|F-0iopizU1?<L|9{
+zTQ&Fn+S;`XLZ5#c=+L#-C<4e_jl1A1gsExGYIdmWdcz3N7{gNuKIdY^-}+gFrbVC7
+zJoCYrtQ_(5=lt`S8_%fb(Lbv`0z{z^f*$;WnDa2h#09A*1oJ3kW&%bHE<Ted1NdL<
+ztJLtwU)6}Iz<5B|W0Mql=?&QNC#rMHOYGiLP%bAZ0Oi0GhYMw7!WgxdY$PT?qoscs
+zHxWOO0z4ag$E@#W_OJ*@fvswM>TysogDCax`fVUFF}E`ZV>;FN<{Aaf3d2+u&b$jz
+z^WxQVUN9WNj+_XD(-BEdg9MZSlv#roIpY$s{zP(1kRwR2PRPEF$arEwEPz~DqQ)ox
+zSItp8i*nLk&%YL~#U%M%UaHDRUcsgFPasW=m^iW&x!`>HG6Hb}UBvkPji%ux(L)x-
+z>n>CH7-sYO-Ku;1VYMWZEUXkh!szJ=8J>VQM}~Sf!C!crG}IX>SR-70z5QhUIqeEU
+zeaUY9?&rUhEoH8L`ol}~rQ5eM!G{vm1PrOhRzzmA;n<x(mMGzxIU-EUOX}3v0?0^q
+z*hb*7cKn-7X~F;0_)zy3H&B`fTUszS_x@xT5kc7Qum?2)k-CA4$cfv3`TPFc+SsM7
+zOUktNCGvWMP~=Tbz+Et1X(MUSC#5h<Cd%WeImvnx6k*$2Wy*%U7}&?v_@s2>)7VbS
+z#m+>78)&CBJ17=nS(yTd=rvLQf<`aYu%E^Dxn<$fdu^sdCP9iK)J4Mgey-4U8-Pej
+zMVvH(<D(!=)hYEm2sM*0gvHvKI##Lw4T&o+9mqUK$^V%o_r`6OZ9D+M9y)0p_IsP6
+zZuzSG^Tw(DFoFfa5EuhfKOoLp?BgIT2F=<8`ifA?fYU&m15$>`mwp*O?5((urO2NA
+zRcz%m)mC@}_#V4?-WY}CVs2=vSJJnEg;Q~Pq>FwrsR+fp<h4hkfJ7<g*4sG<EYCSd
+zbiATIbBn?uAO_|nDEV9e5BT~3@ILirq|#=14h_M)kHc@i6WcYvbClx1yeUe!3%=9v
+z4Ec>sz)qd6wgap)t{8-342o75yXaW?-ThU#2JkpiVwChv#*W=`H=6?g1kj8z;~Ae5
+zJ%8+E1Po=z?986a`1X>}Y$WRmn|}@Cnh%>l-4a%glyTJeD*`E*z(nl6K{Nc~2|_e(
+zJPI3e07&c<dHKx*PCD1(GFeZW`2POGcqVW@j4PtgnWd=fJ}=iC?Bym4QU8+1Tf2$(
+z-+~+J>b)HAKS3=(Lk=MSfZ@aCns*iTjl{jR2=frGn-Ose&Ks$~bhrU_59X0`<(D-B
+z*geg<{lI_hm`_~uFPAeD_dOFA!Ytj)J-<Zw0cn^MoT#y*XOe?vq5{&gk2Q_$x?Hm_
+z<-SvJ(Zu{p(`-Rx-aP*b1)DjU0tdz_xKNIquEcM~gF3MD?(c%>CQ7h>MivMPIU5s+
+z;Sgm!Hi&KW<!`8~9+OK3Nucs)p!}suNd*6z=HppJK_X?&-tYy03g&vOi=oI@@_&5A
+za#;;Xj8f9q6D_ZyZerv3<C++3+<D3C5qR;<)Kvgsx0IWQ;=Vfp-T}&H0VvGyJhkjO
+zM2HC5TQEVPxtUh{gv77?hg{osz)^9_v5=S)6Q-b~#>lzwMwF6i%ri{su1_vfds-C)
+zFMiHX|KVp^w5v(qyYF@-1VR!a2uFJh+G0z);>m{6KOfA@>&DIm1E)8bSKssr40Djx
+z4ZCAIwl9ut+O$dg_wTpPZriqv1?jjAv!;b$D(o5}2ZT#CJLgCqP-T@{RfL(%Oa5S*
+zTyt%wHoaD&H7E!E?7YUGpQ@SHWFTxmxT4Y5rH|~784Kgluyq*>T?mT@x7L9wBz$D;
+zIeTN)A#CRU1dU0!<9ciE_K%5yNX=Y!5hd<q#rVJnvtu!@!NniOcjU#xPCQH|I@ff9
+zw)7Qy7@ub!{~S21K;|{L*vMNSHuDl*gU|4DCAd%2Wts0i5yh^Jb-TB?5P)-d^?&aD
+z>mYtX$Rr{K_7wy12WF4y|EQq+K3Liu!SEiKlQ-bpB+d^UoA<WcT<jN(n;fs+;-n1=
+z-qQ|q&L1JsU;N_J6?IX1|Hq;KLK1Z*XY)Gov>iKm@VGfA9CWy%6*d=y=7giYA8ZKQ
+zfZ;&ryiQhZK;uEVC=|Kxy~5+JWS9DuS~i`iAoz%@VeIVT;q16$V=<ZF>(A@G1(Ibv
+z$`c^LkOdBhGZ`KPuagz$Fns-oIO&K;!2Nr``r-%b1$p+wYe7(WKB32+(GV4J$S?Z%
+zK!;46sgS{!fiyV>=r=(*1N$1KkSWI#botYl$f5c}T5hAP1Pz#Wy|)Qc(5M;KYw&Fi
+zLKekqaPdzXu5ezT^m1AigpTU%dU6r0-rz(vA6lzN*KSZ1KCBzxeNiuyUGU~h`H|xi
+z)LXn@jIevvhI3SZ@v5n*8w4Ow5fLy}(I!GeNf*n6HzhJMvX?m1cX>mzNgXRigr2Ce
+zMPY0Avfx&dFX4j}cYUW;JyWbrZ{R+K<~r@tbQA>OB4P`CA`4>^l@O%-8A)3CbRjt!
+zDl~j7J1LS(oh={H2mpr$jToU}|M}k^Q3KB2_LDpU4p)Mr4b*>$>BaHw*1$dueRSXz
+zXWyS4fuTph7$Z+(acaVxb2YwTgtn}DSL?PEVjjSrba=Pc?>~xbZ-=TY%T?0=*~I6s
+zw9FB*HzBx+DhWzK4tiXR-q}_MG{r83-Mg9S)22=P|Lna7U|iRE=lcgRzyN~*2EBI>
+z1bc5{QSY)OTdr|Qb`vM--E3Z75-Xd!FK@FYZ?oQPoR@gBb`m?X9Y?lhnd*%aMN*{L
+zE5HJx_g)5N`u@HPfCNEM#VgyA$RmLm+_~l4bI(0r`+xsWpZ@fxou3^$b^vn1?KRVe
+ztZ)iDWq7YlRWLS1)Q@+?rszjG*#E<39elP`X($J`f4)Xr9tO$$K~)ZB#>gmcSKgAZ
+z?4ndPo$Oc3nW5R?yYc%v7y<O;|MSK<-pP61$v$t{nRj@dw>-z&e0iyl|EJfw#_@Lk
+z`9E{JH2=Fx{h7Pd+kAFtwy~bffSUU=d)VA-%x-gjzfIrFWjpuSxu4(B@mE}I-XGT(
+zuX%gj`19vH0zXyL(Os}!fB2_gh5Fb?U!b^bepwIx;+M7R6OZaY{>l!e1UvM#|M?9i
+zls%;X>kBt&<CZ&Ak@AAR`jxLM^WWU1o`X+mchiuze(@KS1IPS)O?Zl`Vb*51kBplK
+zAx;@i6|u`Bn`ebg0QB@&jO!gV<2cy=WQ+FiY*Gdwo?Ab=2p)keNnGB+Y2KH+*aDJW
+z?9sBVg=Awiz~j)SidDpXQ)WFm@5^rA=+t{K0-?z%^)v;PRh}kK>Q81HSPXo$)33=e
+zbh(wJ$t}<?Lza(G_{TpIajun2w!*t@VdC9GR7s72mB=l-Ot<@P&vUK)jeEl157Ql?
+z%k=zYjgnHBfafv0@ZDc4I39p*9q=Vw1-T^v9?gf2G!2Xe)CUbaWhQ3UC>R9c@XyHi
+zC=F7z2*y%3Sy4uHF+D<YO2oLy<a-ZZy?Geyt8WG4Xrzyt3BysP!H(+7gdczh5&^6|
+z(mk$`A&9FG#7@I7NF`k|18jynIi3{DDQA2q;D&G%0d`6N+&z097kHQnm;eX6Cls8T
+zJ&D~GG~AX(UPwI+GEj!PC+WWdYT1Xy#ZB6z4}z!Ew5$6cfkY_G{IT@bDHv}@hv6N7
+z(K9Xcrz(bK2H>6jvbh^1Tg||Yi7-B1@9n4hWD*jSmCMUF+ai%gs;*w7rHjgxl?fK0
+z=ZyC5eO(EFfPS5cQ?vB}{o*el(m#Cf2m0MdU(oo-m}=HMpx^%GTM09~eOE^)>1-=j
+z#yppKK536OvHRXZh{1T~PweW{fgiWX14ZbqpRLiFJ7;5<vv=~r{%u}_<u~W)B-G2z
+zr-#&DKcuR4mt(;n?7O=TdvDelw{6Pb{AL2ewp*IlFuCy0{ErUZ`dh12yM&@LZ*$B-
+z=d!%;Gf$pV^SDQk{N6HMe!DO49fI_!aZj6$?w{11zXt<d&dj^}7X7?@^z^537z+<Q
+z4k(yh^M`&NZiborn7`kw09@$a?FJXTM>d97E1LJUtNvU-YaS`oiEmyc)w4)<{}Q0G
+znTyPh-TZ6L{oA-Cdg{CN+&3B(h4<i|f4x+d<?ts^y14&bkDmQ{gGQl<PW1pbw9eoO
+zEm~QqE%z5H+S{k6|LTGQF_)6rZu$EOX(?K~qeyGPhGb+?>tXK2=6#+T@ay;!7j*PU
+zK+Eo{($@Py>2sa&?lHajc!TOsj#0OPa@k;y%!8U<;?qi4C>O8xsqaj`_B`GQ!)%o7
+z4j1DD=7m}vh0Ala`u1X#at~c6I<@adZ5kK@5QvRs-8T-2)cka9c(4SQ>>!2|`Tux-
+zlasjy{dd7&Te-17t9Ilow*ZCZ(hbBk(lMf*uAs6iGa%p^Qr*E(RctBL@=X9OXWHB`
+zpZj_Cd;5K@?bbo-<3e-cTF2OSYqQ6MMkjRs*s#*7U|}qUh4(tQn`YmI=~4P=|C_Z~
+zU;h377t5mz22w%>Im`5WfBdIP;J4e-66169TaW&U7B9a^EpVuNy?NTW{dO&*7{}#_
+zwm>ImCZR*m%q!(1b75}Fx6~ds42(f`@fOX}h8m!#ef^&<IHg;+K2pUC1p@a&*6d}-
+zDfVi~mOQ<=vjs(=OJ&QmK&&rh4}QpQ{zG&-X6=k)1^4%n)dTlHN~Q;o7ZxIxPXM&~
+z09LJ0zq$bJX6D-pA5{Rhu(5u>TIx9_3J4MfJ|i1qCFX=#jKe)Jj)tJQH7*g(WrE8r
+zzYz-CjA4<&7NCi7Sn13fL<shEPAD}eRUQPBDF&nLW8C=>XqTs`{%G}4BJ4LtA4diN
+z5hH{wWS7P@W8siSd#BCozyyLSCq<c5JG5pCcZeculdv)NHV$(?q)d{soK*x^5syT`
+zPd<7dghFGG>|oKRV;OtlJPFf>kpb8MDZn%_0=W(tr*yo4X{6u9;6WLqnA_+eyaV)q
+zlq?0ihAB@$#wCgG4XZRY9?}Tq;U}T)O@weQBiAhYX`-e1)5rSJSvRb~-jI?aV`@G-
+zs`4_jBj~?nRK;NXE8kS1wQH$@$hEr2xj(tTLuqAREe1E2h@n)ysR+Z#4Q26^>R<2F
+z1#;=LC>`&6D+Pgm_BD;Dy<tM*ghRV745_atQ)#5+MY%3RtL$aDS`G-AX`#{XQPuD5
+z){*C0!Gu-I&HYBfzf^54(9(4fIwAS{F7)Zl!5$sN&T>Ce3SvJ>^+vBl0#|NI5BFq0
+zNu+gVBK(`0dDa;oEx)Nmm0Z_6BF#s8bbb%C-Vk|hLkUW^!cvHB^QN>M?$XH<epT#<
+zS0%!?Y!!g=T$je7s-MF98woN$@#we+<J!EN<d_gy1F4X8Wn@#&0WEQIB&b0=OFUWT
+zkw@ulH%mVVKz*neZV={4f;&l>g(-M3m=7p|BRzPt#_%rlENm{M<7tT_%fsg6=n!n5
+zru2}d;=_~CcWyw3SQE20bKSIj<&X+Ft31qq_SeJTKT`!EffT20H{X7FT$3}j{g%5f
+z|IMd_)EqtZ$<JM}?VbKHP70!h7<}_8XXTK^V6>=1EC{Su*Hkw8TKwAePYv>q2DR<u
+zRoeKGQb+rKr`P`=?dQVPx$@Q`ojuT_a|iph_Re9IQ}yvi``M3xl_wu!5xZg`VxHQD
+zlyoZnq2ONCSgHNJBYN|no7C8B*qfM=L2_>({kEz+QS~o3>hRtHXMuHllC=1aQdO0)
+zSW}4S%quO_PzX4}HE&Ik?)VJUve8K$f3`(uk5eL=R6I9XI?L}U*NSzNLWXbtji=ky
+zKNzDw&=(H`oz%X`!4bXo_sv@V@mei|kZG`GK>MHV*OEI*9BN&Mrv#yEi|*kUI@R4a
+zMe16Dva7SS`Yw>`aelr2Sc|62W=DfxdT*67w_Hvgwne<Ru~)A=Hb@F|P$}7|TK~~%
+z)z-Mxu%|`G_6<5A0xP<cx4b~>?}Rsj0#vX6up7afC_jbNf+2*_O{Lm)Zys!h13LJ0
+zn>yM7KI3IHTH!=k9j%#b-o`&TI;o3$+I8}c0WzoHRio%z#g=J{-is1+MML2lC%vts
+z(XZTfWDLZ{)N*V{qf}pn?!ajYRK3h7^YLzZoifykaqy`e9^%|6COqRr)~39w48EuM
+z75y1&9f9@$pf(DOO@V8*2<(+kcp^1L6(}D8a9o`Y<0>H>W6eUkX$4-DuFX}x-C`tD
+zK5v}%Jk_oC^TR6kA&6N6a;nl*wVt#*?!97Jn&P4tb&7lFZp`HQ&_9f=v;vQEN-obq
+z3q>R+<8fdyO(J|-xFkc1mQRmkaYc$E-)>NE{eT8HP;-ZJ&!!*@wv4Fh%&59APLlf9
+zuY@r-N*>Av12xbvth)WfqRO}o`;~|nA|1gz**~FC6u^QN1=@UnvC>`4-Pb!D&x0wR
+zzVZyp*_W!MBtaM7=+N=k`yEhwJgK&eZm-aq%|7)*>UDfiFX0x(lZ>~*m3i8HFI*Yn
+zaUJ|ot2)|X1|>w2PTJ+_+cMSmW*>?MIJq~vR8yO#49JtN=TO7XR6($b`_pX3q-bxs
+zZ(cmz%iqapy_39v<NTy8z_&b(X1e=(jp~IUrgn2a3IesrlRv!vC8HcItWH<$hI}1-
+zp2ha1P8HWe?vgZb5&UUBup8$_7-I>xPUyM6t(zvvnH>|P2OKq8xxGjmP*mr)C}z*V
+z`EDKFGpyC0T%^(hsqU3-T|6<M6!e8XJG)eHQ<YY)PEpJ5W}SSci+uZRtmu#?B8g<=
+zl;Gy=(%$DfRI?fKp}roy@f>Nd_gAW{C|>oiG;8m78kLz-p_4ly2OCM%_J?6agyiSI
+zlf&e}BXcMq)ZapxXgmrg&4Sbp7(fXK5T-MlUgNc!f+XnN(=BT0jMsWn2jfOY3E_3=
+z2=~2idy0C_k0=bO(E108RaQNhYXEv@lnYC5&RJ5b6`R94{c5Mq>>f}-ZkF0k48v~d
+z)7A|>4V>%Ou>&3Q5xXyTPpRwNnDV!lXag?y&SM>F*x#j!+9dTJYFBd`*QFX{62v^m
+zxp!e*&njj%rakBT@v8Mu6QDq=m#3)hXqQer-K=zC?n`PQkRoPp!q)}YiVH8vz(p7=
+z2jjKollgLWN(Wx;S94Q|R@Y2>Ld=5gJ=>>q9zSvSApP#q6zP8Xcy1En!Ey{vsQpZj
+zTvKioKEE!Wf}qEnPSzG&{_`LDoWIA}x2I`R-r@{ZFG3;Y{q1TP(a`z~&5H6%l*4u=
+zgl0w&L|R!?4#nD@fGYrb49MGoXE6vU0|@4v0_t2)v2&bfnL=n{g7omZmz&jd%)$`U
+z9)!%QY%N(2KLw|?(5-QN&9>CMR27tY)K?#boQ{(_&6JgN6_dF(5+KCFI^&K`sHJfn
+z<q4vufeCfs2`L8`RaqNVJ)zI`K@TK!r2qC0tC0|B3;TJfuz3275tLncBsl)?vmH7~
+zpQB6SwEuZXic0fP1k*K0F{Xy2{YsNxr(f$)3OpBE@5$6;Tb~Z?YNv{5lDu$mG@O}I
+zEkt*@)GMjq)33fkAAQSGNAm<Mi#d+h&B8O+bNkRJ2sTG2acSDSkUlTO;6;m1g?f1s
+zOKkx6;d}+biY*;`5zTa8m+}B`87MLJeOj6Ey_~E@!m{GF0-fI1t%l?MFhq{2Z0Y5A
+z;Cp$k8|S*l2(apoBRDRe>~p+dvwN9!X>|dLs;==oY(YoqO~u17+Jy_%L+lrKaw?SC
+z17}(kq*U(Khs#uw7pKC4czF&_68;7(41#X;J>^=nEloqkK^=W+2v<D?l<KG&2pgb}
+zWc>g_&`a1L+CHkLvwkYDMzrL<O0B<*x&b3z_1BN6&s=ddE5c*_v}Ov8v!Gs*xDk!_
+z`0*S}5Szx0jhi407osOEfnrY+6jmd@91Fb^Zjmkb!tm&v<?=uAga?XhGqw3+rIg&I
+z9~TGJMu;GilCNSG@Dx8qf+)gf?=@s86gPr~8SrHqtaa;As+QFx@vh^3Z|riwf`i=w
+zm2RolP4^cl!1Y6e<GRp1BgD9c2z17M2rcMRROU-?z|~1)K)IsB>TMn6dP8cipTO!*
+zQpvgk6{d!8sY3(I{!_43Mh6MKK;qVNY*0(9^Bn;kn+mGubgzyNLO;wplK}D6Qal|s
+z%e?ZV$b<;%v>fTxa3dH5?3<*_bht^1R8;D5j=ww_b3PFc=)Ewa-u5Xh|5Q!%QK}hW
+z;&9_ARPYljS%`4K4!6f-6U(TuXa00PT>6LY&a(qgz&@58Vb}!o${Hs}yeR|DIrwM#
+z@n1S}?gzVsvl|<2H&aEtgpcw{JnHPHco^Z66hcu%IN$-XbHypIIzy{&D^_8WUqg5s
+z(&3X>adWXo>!t3d9&i<SRw(opCM;%!mtuqwQt<+f5MpaNL3!mwuWkZJUb{S1fl9(y
+zr|^(9cPZrdY71qVYnOTyTa}7J$9Z^G1_Gt-6ClqirKWmRvyIHInk;3<jpI>GQcg{V
+zd=Sf-XX$!w9})$Df;7D6PP`TE-ZPK)+NhV)plKe$eK?F}tZdANIjy@9P|s5>OxSpB
+z{{&@eYp<~=&pGD9@X;&)E8w&U7vl*u>$=@|5zz7ztccEy_A?s+dk$7F#4OWG%@$ey
+zHbCh@EuPgi9m{CrJrT7)oqci_(uIY%aAkpVSjAI_nY*nd@l5EUW&<wlu_5BHZpS(`
+zK@mn^nXHHrYo6l0unNwW`WlaQAH}rHsGv3hD}?pKW6Xqh1+)NfO1%1KknJW6W^@H&
+z>=whHz6bl)z6;^i3nIMyLBGx)233zcH-wUsS%Bc>)=cmu)6YxF0SDnbu`6+1DARGF
+zBaaC~AQa3B;QPtp2{j%aP!De76ha9G6h!o*oNyHPo`^x<BNSrRLK2t<bSFpnnnX&;
+z0yt;iAefR<pl^;3IQ=w97Nu|I1qtC9>9{bc!8TJGU}nw7s`kVoSO_Ov^eY8?Mp|V+
+zp79B_HcsLRaI5WPk8}Tq{_krX(!fX#+wn92I;^2=^p+i7hXv6EATW)1w+n5+&ow=T
+zKGoi40?fvjK5?^FHvSrqoqbs6P?kCxN94zIliZ6EHwxu1&n_@Au6{C1@{ApoAv9Tk
+zNms)=;^0WQXb#s%Ne)gwE8E98D>@cgVT1h$TSmxB{5}Cskhj>U#dlR}`SO`HlRg`J
+zZIq%$U5@8q&Ix!nQ$rIPK<JVxp)`cB4X!;;j^H={Ig^Ex%r^U;=i&ydkitBmPMGsN
+z91j$8*9t8eo+FGB7$z)ZxP->zy%c2vhl2F><q|%ofS84hl9-qF3MKixs#uw-w*EdD
+z(Vm-UXYZIPI?2?r7-z2JK;^%Jnh?!(BdTj2M0tzXV&SDIXYO;o7~!osy`1gsb@%&2
+zp&-}`Z&e%(VB}^+bIp6Z(g+oJ@gQ_zDGdTDn%e?c9S2}Zv<i)@Z!H1cpFj8O5B+DS
+z6f~N9!;wDKALye#L$QjWx4zNd-y>k|@R3&H-Q*E$`=t`6Skar0oz=PHLzH8NW1fY&
+z3oFxw_n_lola8E@(}p_{QYMLQ6}83!Z;PQ7lJON%k+8$1Ercr!)YenquO?C=bMg{(
+z0Y#z%fjm@3dfd<`G5mlc-~o*5KMp}LNQ&TKk<?i~3?=|g-4P0i1r}sCF={U<c;4&+
+z-ToQqbTQ9cVDJq4@E*8rF-CCA81WH6e4~INgLpC$>6oLun9!f@ts^)LP-q~_wvI`a
+z@2J-1n>}hj-mSgQ3^@SIh+TX306UKRGZ(lOhB8b;UmajR!Y-j9zq*<!>m0@*&;A_d
+zjDwdjg*P{fm!(>jSfYc?Luxt?>uZG%U|pV8-^V$*uP|lh>t1YA05f#QFD+AbnG5eh
+zNUd+SYTwJFYCS)$BEoeBk~Ft_Zpn0ve&$vjWyb`N3vZ_n1tbr*{5xuNv>(hvC%BVR
+zun`;Y0m}h4VhlR^13TM@@sFu6C!PBN7>H-eo=w~!3KkfJv-^8B5tm3E8LBSgVmA(%
+zNvhEfwE5*?|G}m~Z~`bmdDI#pT{DQ16n0W3C)MYrxAs5#Sqh+s?ppuNb1_CLWG_i+
+zG14B}k9MoAC7`_Zc_^ZIiVR2^FhJpS;3I-1H%S_K0*aT-KWnD=p$bo*(7A?vwEyf&
+zuE7qL{^_Fhbym4YJ3a-IZE{3s@q7w=ga=mM^XDhj*X*ZAANO&hMaR!cx$dYYyMyY!
+zFb2CWKt{X}o$X;*6yr43NkvQW1zW$s#HBXHzVBWjlrg4q0Fjo;8zekp#rZ7j<a%x&
+z3I)Ml@KH3(D5!1^FPv%abDIYclMkSlp{j=oF<fd)zVmPP6W8hi)$h@^PnKhS*a~|6
+zG}F|}mSw1FO|H)D>7deMr{h(4%lhrt&+xo|@02MXW<J;N>IPIbr2^up6QM+v5F)DF
+zoTkpx=XLP=7u8ml$md~Vst6J<f)}AR%}$QM<U<lU@rm9P6|X8#`k_Yc|9+DS3KG<M
+za!5(#xLu3WRk<`>#}78^bwGG=BPbq&A?24O@~)()AU|GbcQq@}kqVlh?{W2-*Tbwr
+z%PvSO1O!);rjwxC_dgj>LSRyzEn(H%LD^{+X>nNl30Q+B3<99p&%V;EJ}9AY+Dge~
+z7Ux6+>~!ONoHvnl=VSxUrN^u9V!w|1<8ikGtVG}pclnj$#cKdQ02%HGep6yB6yq&~
+z`+?Z^n=f|(M4pt#z=9V8%B-ZW1j5O%H*R<k@~O(2?;X~u7n;=%a(@6!QZPA9wFpJ4
+zYDvu~r%eIW?6p{RMXqXBri-DSmUI)jI(v}p0>THmOHq&*Uqj!|Z>BsM&9>FLxWaQZ
+zf5&-$o3~^TFF^pLLG_Ys6_rnOQFy6yP+l{ndSdx~-G*<7Q~#+xy}_867br-EK@c!#
+z%`L^?F;X>jd{}WPnHTpGemM;p9YT1@&mI}6T0@FrQE`%5n-VmI!glhhMl~|7j>txt
+zOQN355)7#r;}Ig{bMl#HHKisv*(#G0Vfn~9Te>Mn-o%j3?(I-hZ-Q3bUdp|qxWa$X
+zeriDZKAt_##XLFYu}mNn!2nA@w7<rI<OlX+Uh+Jq|7P47`;^R7<&?WojsP9L(k2(B
+z%-b5k5Zsrgs^$4AJk_ZB7hBYSCW%ngFtpS~D!D0>?2T3wxfYGJr^-*5Xv~$WwamwG
+zM>m)qyig536yk^i(L@yjs7xgj#uXn`>j7{p74TIortCTM^LlL`8U?`*v5Hwk$+qA)
+ztHb3->S7Z5&_E3tJP1H%w)p`j9(cM5%|ER5_bh(jmu#Nx_j~<2kwt6`o`ds;dUfv2
+zUah^i1dHZMi|4(*=8f~sjKIv=;|Pp7^VV66-@<sYl&#`*)CC!cQwzxO!G0_zg#0q%
+zt)+#Dy6p=Q(Axu4FpUF+56JH>LxE3f84J4)%g!Wd3a;3d7WXA3teCj{EuRjn{^%$v
+zVNsQ=FXoscJP1kJ_{nOri#pUh6jo9e@%{VKm6k_JUAjk`!0WhP!y|y0t+}<7bY<eV
+zq({cwSz3-qARFts@PSGyJa(xa&qFN5qg5>GD{skFY<Nsd0H)=ZOp_BOAQ&<UpvP06
+zAeq>IB}!|6N{co`Nq7KDR^%yd(uFlow#FS(x==q3ExU_Uy&^5blM%!lkV>q(b~6h-
+z0?WqKL#g9ximMf3!Fx-~utxEybc7T~++oEXKH|(+rKHO(x~Y(gd+D4TtMXG(jD`V#
+zdQoL9%5{z}BQ5W8!-__@=P%AtIp1S@OgH@4X+;@Ydrz^30UdhqzSNRNm|Zrz!{sxW
+z7sr#EswEq6cjwJth6$r!{rjPrH|zR}hJp}JxOCagUX|6NjLm#$sjQV7!9Dl@F6MZY
+zm6{9K(J!J$j-~EO^Qo9r=1PnKFX5*s<GgrlzWRH?ZQvC!4b79ALq<fdN~$1xLV5GC
+z&!Y7xBm)Nip1zQU2n?5zLZ(>CqD(Crg*a=BwU@6=8Otc=n6=r;FJcY^g7T6=k&pK#
+zmGD6_*&J1Cxv!w58@eH7ic>D0t1!3`cQ*T&au@ZeoIZq82<sSTwUBhs%`s)+!6~UQ
+z;AXt)jt(n~muUsKm6hAGpxjT?mXAm9fZ|ajoiT4!k(S+BsFF(3AX(YasQ>^#07*na
+zREf6K?H?eEAxtqapEd!?u3So{Oodxh!7g=zj~T+lQb0D(s++QvMRv!cP5EkXA!ud8
+z!q4^G;$C{`rEfp>*khmj+Sk5@+vpv-x!xxu_W0wEJCw_P-Ca6Ao~+OP=T}t@QunFf
+zzeQ<S5p&z4kDbup{rHR?{la?v{=>D-S4W>~*OOm81)ATd&;7}Ir`qA%W3H#qlVd^s
+z=r2y|EZ!8OmA?5GsvYhAdK!bD$Gut>Ll<u07rtJP#Wc4Es0aw0l{*Tx;epb*UtIM$
+zOq@T=!tF+gUTN!C0W{pRSYYq8S&<*)I-$CG$FNWa`62<U(QsvRo5gFRfXChn@olbY
+z%d3x>MgJaIWEN(LGDc<qShKZ!Ue}!MbN_MrVeW0b5wpk5{eJedg)%~fR$PQ%u6Qi7
+zJNz_%lO53nX!XJoN(%=qR5N`s>$_!7RBp&s)r!o^xQ(A?U*31;W=`|`9Pi836A|7G
+zLPh3@m@^TaISszVLTQP7cexQtz&MPtb0Xf2E55qC({=O7=GPa#@CAM4D_<eY#tF5X
+z^XY@%?2%8{gJ!W!u?M}tlg`C0W-ogWs9|g45M&&BuFctZJq4Jo6!P`lOt`Fq7oqX^
+zpp(_G;+8_?lwMUc?Rp-fpUS<Pi?y&SO~3H(*Ij*nB;GqAuQFHd!Y?ul-@8x_tOFKy
+zn6Dc+9pfcSy2f%5hhKO)Y;pB1%x*Dj-rm3WvRRhHT;V-;>A%)>oPI2LgI6A5)-cYH
+zpHBmvnO~79PbS<62)wz%&On{1M)dRZ>Dl|>s?6zY%_9bCp?P@CIn5|0&C7UuAKc*k
+zstXIREAMF+smR#Z3#xYv%LFnP57ij+sM*e<c6GyDg|E~P0LWZc(+$^CMvhaV@tQ9M
+ztHcD>jRBM_V*&5qRjmNzv9UMy!9i{$8+EXXbwJQjz9f^hqU#Hoc-7#r!30$`jB4e}
+zGj#D-zv}k%Xvb%&9Q5x(``_61-i?6aJyJl8-)J{RV0r`yKd@fe&-<#ezM7ZDek>#4
+zM*HxOz(P{`J-zF}mNR<%Ti?-}=i4<&oG>-3M7Q7f2|ak%Cin{GUp}DcAOA<~KikSA
+zoSA@l1=c_OZ}gel7Q>6Z@TA0{L@qLEDNJCu18%wc778f}l7z)EFa|X(l&>dW>vTL0
+ztBK8eGp}#&!R%<c(WcizPGa>LPVMQUKo#t8P?O$hABGXY#UGp?TW3_>yj&;S=O?+V
+z7&+*ZLwyQDw&cspo_$NNIF;=a@Q*;CL@}Pc9NyanH1;cwxcZMMIhW%@!-No$!3n(g
+zSvA(j;Mj<!z%Hd^q(N9j3Me`AUZ{^3US+QC<Lnk2*U^DN#lTLaXXOyOuy1gMPmV$D
+zY;2Y@<_;&0PXr&4nN2u1iL^aGdHnrO<yuGTa^*x%8U_(WLSU(`)nef(=!u6I-^ok(
+z0Sm4qB&R|*?IY9#?J+ck<3pC&0ghq%<j(2h$YSthWa3$}bkSk@Okt(WOeM{Dnqq`E
+zCY*DJ8JA4xhC%g{k~uXptPza2DTwCcAYF2&rpuR=O=_Z>)X)))kHN{{^?@UpT`w$U
+zbW{`2+b6g^gr$O-7#$;X0`+2cfJrxT?iV)8@RXl@jm2~Nt}Vqi3EYG?J^iYzG}|MJ
+zYsF#e1cfq6O^CQ8D-Z=H;~Fwz`m8_Oe=SARhTgnUAJjHqLN9n95s1Bmkcb$V#oUQW
+zkW{$d(MuoDlYjO9=s$dY4+TK()6yc3_PqQZJ-_FSiYmXYo0sQaY3)Y_^pD^9rjE8l
+zySlVgDGY3gT;sx<AaXGT;x!(=MHD6h?^qT?3gE3P9gowuR7@qaMA9AmLD8PaLhigU
+zto+J!)ojdN@Sd;7jrMX?tj<z#jZbZLgAhmcQR2Gnh8N+(Fd1T`5O&q+rGMD1Ex-7y
+zs<;*b)7#u@cnWf%=f9_p$pYQ+#m`(~?VEd8c#4_?hj!^SY<Amz<(E`Q-v7I8<AZ%V
+z{>)AV+)H))XK%eCl<;oPwb1_INm3CHzM_k8pe(y*tIq!DX(d-}(zb_hes{5b688t&
+zPHFEy|3KlirFh*w2h*d~nV?!?(^0+l`1dtD3aJ$+eWKuyEaj={raQHI!*ZyfkL#t!
+zzUQO?nrj@9r__Q)TDId3>d`EAvNaa!dtj(lXI^?rb;mDoPH-m<UjW%1nMJDFbhDOi
+zSPkRl86AG^X|+Iq?V9nsn*o)Ol&$4=KL8iPxK2FtltNi6wDExlRSu_ywcs!`)6ehJ
+zIno_h-utjtZ(B@18(}1T2>|P9yud8Baqur>6luw}yR>Z6DvdWD*3rGkmAm3LicGCj
+z66;7T22aAN*LD2B1qwi|lRMO+Q~M60U|1MnT0@Ayt(?Dfi&kx4tHHXx)TlVDa15Rb
+z(19@&!|bY6cz1Weuxa4eIie~u1%u~B3Mdp&^e?It&p)Nayp>wHZ4FAo`^VUu8fpgs
+zIVoRJ86eGf{|+ql?0?qV=8XFMOA{LC?^0W5KPc92_4W)xQ%v!WWFA~@o^rD?VEd|2
+z9;oJPdYi&Mdg<Ur6|Q<n|NX1~O*PPqzW8@v)TjP%zv{^0-nMj_Ol0=T5r4l%At|}*
+zU;an^!DrVig&?2@D61zeodPu1*23)ila|H6iIRygE`&iS0)vo@mOMN-rK6<DgaR=w
+zfl}EA=lqR!c?3M^Nm_MF5oucHMd;)O&4rBQgE_e`-_?io6AONDas*xgc<d1_$!Qss
+z&P{g=v{-10_qW#}4@+{a(liApy3};)jB2o2)00LB$q~NG%A@r2^rC8(@YvuW#sI~d
+zIF~nri~`;*vxKHbpy<W>W&}CCO?7G;BZB~IGl=v{O2uj=v=`x;lSV5T8K;!+MG8W7
+zY7G{wqDcy1O^y*}jH7&WijVkuDpoE+bjk{-nIS-Jfke)e3U#iv5Ef<E#j~2k`t<jA
+zYl^U=oBQx)!N|x`5Df>gkO!UZ38Y)vIaBa}g{LMoNlKsXGwFxyKf#EHuypy(@fzUS
+z7^CkI6omfv1_+0SRWi0jZS}`V%PV3Wk$?2d&$*2<I+2iQYKG4VPdXi&_fKeIRGlZ@
+z(23o96`wnxlC@ivpSy$(Ml?ac+s<83T=p8k(>|_GF{>WR$m1n-C4ULlz#&pTyX7rf
+zOwl6n2Gj@WId@P8;4Db;ex8b(rI(EDxtEPhz@pf6UVW5$E~u<=G6d}0!<}bzaOVKG
+z>{X$=S3S)Qcx^LTr)NT_rXaX^Rw-`!)}*%6N7Sn!<t<vlKDhw+qSQ>N*SUSK=v<Qr
+zw#e-o?`=j=`zIYge1VkJT2)n*phb)_UZ=G02~%#Qiu@RrLhCgUOjqg3r79weBJA%`
+z<FSKkhDfSl`C3YZw?d#aOwEHDhv^mu42(V)7JU#XgyB(WJWHj=eh7?K%15{@=pR<=
+zkr&n5-J|Uv|Fjk_Et|0q;Wp@N(Hr0WD}_t%(e``RInNA-2=j?K0mjTyB?JC(t^fxG
+zb2tL6_9SyRfy{_ByfZFy@c^uy7#VUr9C3JlQla~HCr@KL%=<EiN6CoylJJzI@%-%=
+zdq4cVAC@kklwxzyJTa!(L3%aJc8pnE8Dx=UJE@W#Z|>CVdmFX(kzdrZRV$HU?E3+0
+z3n&OwL4$FvrSY_0d+sUy==nYB8-iPlH;!lEH0Bx1RcX5OfzRr}d$ws&6-8DcKAF}F
+z=Zrwity@3wIo*|YyK=~(Zfs~*XCJ9jDPCn#nQcCnaICYP1p~JqWuSlj_yvVsX<E5{
+zi#D!b3G>%{gtpPTULNo%2so^|ohb+lDJ)ju(aS;@?x)B}&xmpWC9e7qR%)Cx`ajV}
+zi-*_VlnXOohT8G6oP#`R<45o!T=j5&qSN0vXn_$h)<R>!o8Qbbw36wG?uD!(tB^-p
+z>fV=h=Fn+{C>flC#kKD4JCzIFa_7l6bm*0rC|-k`zksTwcigQE7B5!<RrQX%q=uIv
+z`I(GU`Sy=!^Q{}@ij1oH_!~O4_mIXBj2RWnct7r-5Kb1PGL1U<>N9F4zdSV?PJ0$%
+z7ogUuu@0Sh@>Nyd@{p>a${p!Cr&Dj7Q`wp|0LkD<08AE-=VGj<N%i|*r_R7d(hCtH
+ztG8(B#?^|S>d}dp_VAu3QuJs<mD}#u%5{sJVK6YB@du3dHz0`m)!Wje%(CTLhqYUX
+zh2DMcs7~(LrvcvOBwwB?Hg40>)k`(eaat$#opgwGdK)itZt9KfxL>Q*FM;H#4Q$QJ
+zx>(=N_i2jyp|^&&!C^e4zn0Zt!lCEvQIz9-q>fG~t+*0P`4&~yP@Cl{BZakcxEn?2
+zyi!V5P$X^&%IuRA3BvlfyMPPAlU=6jkNleMzL)!oOsehJ%X<22|DdjpcIA?`=c`z!
+zjgR~btzB0P%jAfTeE%Cde7F(Ivme0+cfkBfF+DmU@>5YpZqluv{sk3LsWVD#f(yH!
+z)Se&hBa8%Pd>LzWW<KM2pEloii>4Dtraiz`+^Xr-3(h)h`LU)*42`T&ZW<gH%`F<l
+zh)VY6G9C~gojio+0B($R59+p$Kd3wu89EA))*IUOkB>pHwqJ!Gy%Pr3a@Cz{M5$|s
+zsHp~p;i7uldMWL^Nu_uITDudKzv?D!c<A#gBMsK^y(2NKuu^ESN#|K$3RZ8|_RsyA
+zsz`kdO$_V8>rZI+&OJK&<`ETD6v1V~Xv6|)IQRxtEZgMo*sJo2e3SqbK*CUw$xfZv
+zdkn=FzMGC#O;BdLf;kZyq$pEkt6WqQUVrz!Dyz)bL~kR{co%D2hhh{BtlGf*S-%<&
+zG-OxD@n-BhpkWlX^x`F2bJsm8F3ME*>HVDlO{#^CK_*qLrMKLwMN2C++1sE~uf3wS
+zCc@TGUsrGAy(xC9?$|lV${H2_>M?jF%9US`x!}`$KX1Hh{za!owfm{>>6_pArds@|
+z6mD6>i&w1`YpS4FCEkSl@LXNJTHBi0?;G0l`V0Ehr~j4y#b<Aq5fWX|67%(Izy3Q`
+zRaS5OufNvUUw&RMy}E~7<)x}AO}Wa_AMB;JI1AdLSDw%~6K)tQ<S+l{H}$1I`g1+{
+z`CA|(Nl;r`8;jnEbD5r=9t4*m5aQ5eEuWW{;u>0-2{>Cg)6T)AP63#zTXG<QxnUV!
+z@w{gKNX3g_`SDiu?IgrW%eLnco1M1o7TW*Dwx4_i%sL<L?O}m=iMf2)OJ;Fno7<(e
+z%isf8f7JzISWErqcI)}S`)6e=+oY_t7!~cFS2!V6n>T0a#c%$tMqTA9B`<%l?ltY|
+z8`13_T}Ks1Qi6{jSLI>^5)1R*?>$ESkqV_v9nrJj_?FyQiP>0iZEyaV8VY^-=&ycM
+zXLkO*-Z;<#q1JK*usoX@I+ee2y+UL3d)FR$Yj4G}Os9Gx0(kF1rIpseAjrM&&V>-d
+zr}zIz`}dqxe)VF-`FnNviEmMA`4d{U)TN_O|3DK7*{WQ>!66|sBV<+=jfVW{Z*GJW
+zVI5opQK}&Bf@LvBcig{3r=EFS4LvbOaEy1K)4m_HlS27LWd`eDM*Y6hs+X$>a-^}A
+zliJr09|N@|22VT*<KjVt78d?kr`pe6pxWS;OUkds+J~A?Y4^9krJ-=T3gCL^JF}Ns
+z4$VsZSHB69Vulm@wgci2{&5j79c^dT*)gS+ANhnl{cq~%(WC0<x<}QJO<9YEC@GAB
+zgqI$#<%n9jW>{bah_A=Tk01z#G}ulttPDzXk9Mi6y_>O1!{f1l!R4IM{$YfO!H*C1
+zP(S6IqEto<jSs37VH82(@q!I-#dRuzH>Kn3X`M1cDvmO%Jt-|0zL&*#GYDs-mns{9
+zIE;1Q+uSKn!G!uD5OQZ1;Y}!13|TNR-m3_exfU&5IjtNxmrqpgqLr#%TCHQ$nV5<s
+zsi1n1&Y#|;p4LW<uP&yLREvO+Xwl{>7!@fPhDT+L>s&anTO)?~qW>`z!|bxff`-C*
+z2FAo_ULI?So(z?)*r4Jgryv4r(<p3-K0HW9Okm84<}Eg$WF$DE3;Xu+4zRW(AI`k;
+zqy_^XmDQBV-+n?bAKb01swI?dj#uOU7a032r97}qr*@*;pzvnp7b-H)puOKE&Di}V
+z<+wWZ>i2%EU`j5>q^bMJ3))Y(V{NTR2cLNsUXB7l_Swvny?U*)TdrUHxLRL%T&ItB
+zFb06S1CVz;yHk<7ZX!*VUg8~#<DM*?dG6eHZt?^0&pe6FB<}Cft{=ayqD{Y`FJg^s
+z-?Uut=<o!&Q69@Ut{Za`dJ+RVa`>R0<z;+*&u)F}lQ&<bAlM6M`zPV1Gj~jR#Ud?V
+z)~Vz59ol!GUaL#99N^%kaY`xB&9^@cH~D?K|JDuaJG)nZ@aUuZhp+ybKK+r+S_<jP
+zYp=cLyo7d4Lqo%~7lHmc9t0*&vMo&4XjKryj09lW0vx$yOFq`wWe>zP4!JHj8x~>F
+zh8*R;2qPac+J-{|l;<tJw2)qxgYr|lY4dvZw>Im?fAg2DC70);6EEgD-13RfF03H%
+zZUqR*O~q0m5Zb6Ei*wc6a7Hnh;MxwqMD@jVJ^b$;)e2bS+7b5qV1^3<YD;jZs`j4G
+z=)Om`XrTTDee;hVb6o9xjk{nO_38fmKdNku#0#$lba>yZsykV!^YGS|?)Vjb;#cld
+zpu0{x|Li|$B8qPrIb}dGC!}XmomVfxlpGdr6Gz6*H`3RnvxiS8Id8Q#J^ZkOeHV53
+zhu>A(sr@Rh*hZY)tKw}B>F&=wL}}f*3OmawWH>q1>vh+^eN<V|UcLUUuc5TyHcwcM
+zWw%@_Yl=~HsMvV+fV!VPsgaI8`3fup01D!de^DDZ7wf{SKhUdB96^wtQa9n1tW^)_
+zk$?3W#f@Ino^O6l?Zc4&)6B?-ppbN)Jp_?bK<ht#uNFas)P8J_4!`n-8tP6dC6ulH
+zZd~{X?<`#9zQi%L9y_eDkQW6F>u?+^cI-`^J9<tP_b+n<SP(By!)xEyM3WED;siiF
+z=zy1Q(vlSj>8}06_s{F(3;(2!BdOEgQ)*mPZM~1O&6JvVdbYqn3~wCaoq_X*bp(Yg
+z1<QJBY>>Eot1@f1lb&3l_|a|@1Zqc|I*O&;%p;kmwe}P)r#?hJRMrs+Xr-Y<xpBYu
+zsITn;)e?gm8nR+a%Q%)=9RY}~qLk>ygJofyxh)QFR3hQ#IKmQ<FlChSBIoA5se$G;
+zD34pzXV*+Gf!4W(HJ;gkfE;bVpmU>OKP-cdxe;@DDUw7Xy;Zih*qphtxd<;MvsOm}
+z6AEAeIxXI#HFw^l)>CgPxabZrWQ*0d_Z4T#S!hAAMAh8<knVis9(BC%7kZv>^7@Z{
+zQENA)>FNLc=Njp0#rrX!b0->=x8^Rb-M&uY;Rfyb$8YOm-AVP1oRr^HqPy^9ECD0e
+z@Zvw~e0xNV2VT)=9NWL}t4`>r`_K=y^IK2gX+N)F!fXkiJcz2cqFl!@N844hY_p18
+zu$%^5TKCYc$}P&W*X0A(u2K+OIpzADKmUrdOH7LtrD)IVbhlqsOP0Z3enGG9Ijl&0
+zrdDp;ge&b%t>3VfqA7l5CSUCa4FPz0`iIY;Y&=5w<j-r>BcE2w$(?%ezF*QCCr|0u
+zKDK3!f<R5~;uZR}M^|b2iVChBubQd~J^a1@slV6<*aKEG^AOy9_ubmMb*nSb&p-dX
+zo__ji+?a8IU#2<TQ_v!>)fQ7pttrR?QceZAWgk3u&$aIBJ>SkuPS190`SwC}KXy(h
+zcT*dEa}G45S3l$T{My&!35m72u%;}Gcd4;}8e05{ZI`}8Ku|I`qij9z%0*p#^*d_V
+z?N$z9f$DW-3gBV$<iH+C>^VLurs7Qx>aKE>iQ!YQ6z1Xbt-->?g`Y&~FOKY~v0+Vi
+zTF7C_i8ovPJRG3P9oY^6{{#!UOQmZzLQBuP<)v0fezuw>%+j01$1`EfJhB&b&N3JS
+z+#DDoZ5jN+=<pf6{@s2kk%Q3Mrcg{NozU%cOgz5=EAtBFVERTA;!~8FUB&gh3iR|l
+zl*t0KU^O8TUurtIOZEFmTL$|OhANjO1A#?xCSQq)E6WH8Bq|*@yBA|-f=Yl!Je9{f
+z=A)QVAe>2A;&Szk4$O3$`U(^)8trb^#CX5X?|W7)hjD*H4ecT`A&UFIVgEiI*>g@Q
+z+4)*dc(o=cKuF;NWt@|s?cJ&91QjufclXpE(&%lq&QK%}3dpWltwn3F$YF8xWac3}
+zmMfcb&K(GzBwYFVHEVHuXK_!7lw__@$>M6I``(I!gmFe1dJC!nB_fnKSAae@AALjp
+zU_eHxRgs!t^$P$bZn#<Nw{F3M!1`!Uhb#&&*$M3({Kfyd2==kACdyo&QIJyI5&Bz*
+z_qOkB6XEnkB>_W?g^0&bFz)O>8x{@+z?8s*8AFM4Q}immxJJd*WjcAfQRk14E!IBF
+zeB4AeQt%J4UWbe*fB9zEIUiPW9xem(AaD<cb+J&BQ^d(p5-y9;sqta(B4AVSwxn>4
+z*%m>mw!WK3#2SH$>94>Q#3dRNWCcnSbki7s1`16hOTykS2)MZiJUS?OfzX(`>fXSs
+zaT-OIB2(0PFy%HlHU`#W4fD=IPsys<@v!oT2Xy4Shrmx%z}iSLJ1&=1RH`(T@lYgH
+zm8&)?jIn&^iNANMmKH5utx{eO=bq@NIYs#OfoxYP2$m{SP&Pd|1EU@K=70ZPegA+<
+zfBskhL2v%!@9A%zzbKLcl)L5=`o>rPK#Q^J^Z8k*1qaXTzx~;tD(Bt={jWd%lrlKb
+zm6$5y082{Zfuo%^USJ}o<f*(kO}l>h-}Tqe$LYU*<#)9hjVn6dr}Le}7?TU+!;N9{
+z#~7YwSe`EZwkZ_=gJ7>f@?5m*yiTPV{sCajcsAVZkd54E*B$}m$6vOi0Og=ltrWPq
+zczA$9P82q|(cT{;z-ny^W$7*VYB>n$(VhmKc=mC<hO2nZasYXglr5&Pk`F=ASHB0Z
+zTd%5D=U@$5JqA+fY~f--1xU_9nkcs~P088CT6gaw#9_e=bhWCR;%0fdscOJ_8*D*=
+zSm{HVpgi=TUlA)}!-5(MPin$Hih%O5@ODuA2vFkeYKX+PdJS%bKyLmf-E{8;MTjl;
+zx3(xQv%o3V<W$YW8)7XM2?6vX6)p~;WE;R3#jzeutNbV<rjxMR4iYvv^zt6%th$RT
+ziHkJQLRjJXQx2HY#05ngSnT<2C&74dA=MI4a?E`_+S#Lt2^0#jPQ!pTLlKlP+YKRM
+zH6+{sqCFWUTC)8C;>HG$Y^S!t2tsFx^3!TjFh(J-N_I$$dQZNfLF!+u_{hgpX_Udi
+zadn>AuM3Um)ZRFtO!}Wl+2V?u?$y@2tGUYM77GDrqj~bHReSRTU=ZHLyTyIQxW}yW
+zS}oskkBSORaS!4WPtfZ-Pta%57Yp#<aQ&22OWg#R=UmPHnI;qBcAfD`&a99(4sY<T
+zU22(1rSjw*Dk#p<Kpoy$>K0`9$TSNcr})$fIAe+skgW9pB75o&tMy{5+!<??3GgpI
+z3DElDTEYwsI{C`WU@uCvcJVT05Uz@m#bJ-dJOZBdY=DWg;Yy>dMhTmkR$ii^FrWR@
+zgaEgQqSbu-i2C|NgxMC!N2SKe(Luu1$)d)W)2uFq;di)`=?$jA062_~GgW}Cra#ym
+zpVlMTi!tG8CwZx_09dnZ&CRM=Q7u;(K;*dwWmcCH7CB1j422mWYjDD))<Z9=r5EQA
+zM0`QKG=5SwLlkrx>gomr8&e*WGllnN<^7*hBAFXK_4{=2)h873)o6*w=>Yv8)zk)j
+z0WZmP$KSvIUY<7#^s)Q+)B1-W>{Io9UsCeeX+8eK1FCuWcXU@tr~cdD{G(nt`YWou
+z3-HcN+RFS>q~um>RaL28eD*K&^|G)kym8w1;&;^OF4ZF|m&i5Iq(A$Ue=pavU(;8<
+zd^c!Z3cj59JN>6WbL-A+D>Qm;mtH(K2-WPbt0ZH(OzYfhST3wJ6mtcb1@;iGmF+M^
+z1+k&?P?z#R&nH;Q=4EYo?m2IKo*4n&Fw5|;jE0x-BAnROrNyL#COc(xZ;aB<djz79
+zfCew@(;jMxY<}eP%F8Qe@%Cvl(Wkt{xOETyNQa;Pu|}#>b^g^Ksy_(?I(+lfLUU$8
+z<;AfDGd?9l#Y@*I`Pd;14fvH@;GzQFarO8!wc@rd)C$N{Gp_m*StE+})agQNk1}f4
+z0b)y&FKGg6`#E{Ti%GrPgC`FqgmcCa%<))lskvn;C@oay0F?wGGmH5FK%c2o*2)aH
+z^*waQz|Xdv^A3;p>%#sQHJrGFkcqiu*=`H#OtXEXw#cHGB&MZOT#2GPa0&D`Hn5lv
+z!bQ-dsdN(<^BMxfosmzbK)y}^&^!b_AaSxqXHTA2T<#ino-P*U0-2tJ73@oGc6bf)
+z8HYha8tqh0tk_OP#)=Ytrq4Y_Xy8~~o!t5BwDsYSE1$B$Xg_KLFxYzbySjL~POB=X
+z&up>v1)Fo*W?nAP=LHX#*=WZxzD5T<8?(0un}E?3PZ6ph%3&DI&q53>$KC|@(TBo>
+zc(mn`a^HEitN4CeV7X8NiWXJr)ax&k{Sj798I=;Pa-(D6CsX`um8zDV0C4w`UJs3{
+zvbF-{vj=eE0hA-3)@|9Woct`iQDuQW$<ImCg`;(VFYz8!mpICu-MuMchSxZ=3v3G&
+zJ`H<gKc0L8?~&nwH({)!f#PFNtB;g)|6qq&>+6+Nu!7nSOO-IuL8$7WLMfG6xu(=v
+zyoY)2{T<Y8AlC2973&1;Qn-RY9bC`!X8XpOZ&?+~F=|^JE{PCwW2&zepeb1zHEUF`
+zc)2b<djtUEYZ_vn)a`mk@s+ozqI#*?UIWju`!xWLg=*RVx~5#r?c5|a?0HH<(K4;s
+zzFC=h`EX%aRu2GOl+wt=nA*=Ys=O4B7KN}rXzeW(gu%`hfE#7{<Nxwy1)lq3wZ!uD
+z@BZa4>tjnh^!SfnRZH6t^QgiCj|<*+g0EV?|K;CS>~H^CFFf&>5}0&BoL2wxH-Ar`
+zyJw5yCr$%!Ar@xRnumA$NB^~ct8Gl*CUfH3=MS)A1hnnJU)Asa{%0ufiPdwBW-c5f
+zBe99$z6J)Nt$s-U-boFR57P_@i=R}LbTS)mv}=!mc@b)F%G0rz+DLmGR3ijR%eLlS
+z`+ytYyz3FLnQxxbD3jRY#Iwz@XmS5Lg>+^&&iQTOfr2&nsN(oHb?lkPoO0%2Vx*hz
+z2g9?v6aZqE4uK6i)a=H+TA}R^KCHrmunKD`os>TlvhHL!FKU-61DAPa(S6!TrM%Ox
+z{6LM6-^3Eqwf3P;ssdNN`(q#1uE(Fy5fl!iTh6aph5NV^kXy0V-+Qa}?mn)gyV{hP
+zQLZvVlc`{R6e@u(*sZL>YGvMczk)x0RtJCdPbd`>>M35ORX5+M)ClPKs#*wlGMqb$
+zT6$q$y9SfM2dyXuz*a7Aa<=nb0<Q5a-0xwmznsDv)nLtDs3R`iLJBm7g@G=Efc8S=
+zrMSAw@lYbL5jyU)EV4Ulm0P};0zobf4}4E&Ufc=MPm+=g7c0M%@$mRa7pzrEQMF32
+zRyW?-tRru{s-6pOEL;jXk?B!URyb$$r$aDt2|fxQ5%W*uTGnt=XB02fvW+V=Ot>bN
+zOc-NPjk55<%x?~rGkq&y9K94jy0SsC1i&yr4x!D1D^^#$GOU=&Eae^(^Bh4meXI*K
+zKgG35^LTbx&F%~UcobtgPc=j0?oQ)eM${Bc^1)4!$(S&{JS$&uj;hyhSL#r*ick<d
+zDgDYSE=ACh>RPf~8y@}~Buvlg{Ha6gJ%7Ye9+I<5wfUnT(Ta_$@Y+tF-jh?LiVd68
+zH*ST*)+i?z#eo(_s;M`RVpwra>L635W9EjeMndMIwMw~V8%4URl-k^@4zh17`eCG1
+z`AfEI<*j$9vYKbxb5diyc&Gp`Dv{?|y+oaFf_K1E<0~jt21=}(QqKj<S0i^aTuf?C
+zDay|zAqF?^R+6$y@fJjK!H=NSJvgcT&+P>ydy%x>pz@a80_buT<)Yzzz(ZDl>J4?D
+z4C7f_tPQu{s?q{Lqx84#!~w>XaCe-C(%&CZ)vD!k2Zwavh21*xRI_41u2;EPtH{Pl
+zrAA6t?pgKXjTzgtfg)+sl{cM1`GEZMmc^RtpZPO=>i_<(e)})}KkfhP-_gt6mHOci
+zzN%Q`^ZMMs{U7?=e|%Dpery>+`HCrg)vb?^`+K386h@G<*?C2(;USvakHDS=$Ty91
+zr;+wJjoOWc{p8L9av2;0_>rMSHH#hh(p4vA!)&pp!M-m2#`jwE?Cy*D|9@+{KD)K-
+zirvi!dEtMZ)uA6X>wq_)j?zSZ|Mze&5!<}c-g*SAz|O0W0pg)_@Nx<VJ^Y(1SX|#y
+zuYBth-uU*45r|@4wwyYt@BWv6&!RRXXlxG?3<!hG_dlfDKL5*C9CPUpEU*9;c|V}2
+zKqOx2`M7{{vmJfiJPgBKozy4++mn;y@FM{E#)UrxLflH&CSbVoHw<_Q9*-kXBak5V
+zb+#)QqAFo_fiiMtI2BM{#s|8{h#SF!luPWD1s6p>8P>cgA%?-uPF(c~N~ap2RW^3O
+zYrNY5xJlfpEQ%28OcLuK?CnQD;dOvV#rO`QTt7HY3Ux9pr-TO08aBZgf$h(j1j7hf
+z%Vkear7|GKMHsMJnCm1X+yl6QNBT$w1hkfs3!aEv`l$(G{AQ(bo<wrqjgZIq5`vS|
+zd<0l%X_J#+A_mFFPsCf0hR4NxD2Zfe86jI7*0pg2L|Ej9dKo)^2%(!pf5{4%X9PvT
+zJp>3<SZ;lig=}UU-hklLq%6{6Wu_wl|Kb6LItt6|KF)6<=!VC@O`eFd=bCHS#HL6W
+zJcrx+BK@D^U0_ZmBqgh`mQ0hvBE}Vr006>S-j^sLn&8BwV~tzgiwFi**p8oFo=yM6
+zh_bMcv;4Auyrt0+s}IrV2;o=f*`b1jrh?#Hk~shLy%{UyNN+b-62HS*=*uJQ%lOTO
+z&Dd>)gHse!3eitD_dKmRSQyFh9U=NNV+%SXU~@d4YdC4V)_1<Qwc2UC3rQ(9FQ>0>
+z_h!e_DYo;x2y2a#+2AIGV&Hj82gYEBIg*mqjFFWEH~s^|HoCdr1Tr}S?9T`SnkNha
+zxN@|Q`xzMK8B+2Y%iow}ZKy2Ob+{L{P>xLnGvcLcsf}@%?L%E%^79TEmLwaN(AoEB
+z4DZ!Y?*JId6rN29N(xm-3B`=VKp6^yi-C{f3bLn}+k8L$GG+8#6>BP9xlN0!p3t9v
+z`FEUn<VQdn2kW2IZ~f8NS!8OpZFRv_FU~?Y?8A+;fuE}y*$~+|S6ZZTAX_VO^Hg57
+z^R+kdjyWkM#*2`|&-@l7ue;;i2y+Yk0j|I?ya)Zf{53a9Fw7sStNymQ>`M3|>fY#f
+zYBV&T8dU9;E1%g_2i@54jz_?hg4~J<ee5?Lop%f?C5w3umfSU)c>&V0RlIE4%AUJl
+zd;->cNhL{La~hUh3Ms6!%`CeVLU*$*A=!&Xzhw5$OTR6p&zoD~{9M{N^C8}qf?K+J
+z{$~DWQMAyw(`<pvcYbEK*zb6*pFFoeCKN1{ZKfrmT+B98mJ-Q$m=(pz#Io(@a`STj
+z%YV&&iU-V@JcnJ+1NOmw=C=eule5jdGdU#--P7zI^c{heaw(R6dAoTnjOT?@I4u!j
+zwQwT@gAh&OXQ37s<9nWO48dgXd28m9H(Y^bk=Z!SSJUGY61mse5kf(^=C!BKM^gCg
+z2S=g0d?fP<Am`j>3RO<I{mk8Z^=A{#_A|E``>rW$_H*rqqVN{q+r3#qx!Gp4&h|6E
+zrFiGeXB4x`a}Y(rJJ%pIg_aWN{LF6&crUU`=k7bbhl}mGWMxcqPF_CB-lOz9JTClP
+z(b(>Vi0p&h=FhP!?j^l!yZ+=4|4{$%tsiULU87(B@)s04``4;jeKX;JFKJs9aKl;c
+z^ok>Ywts}se8R+%tS<|dk{#-rRBxLfO9})p1QwGmed->D@$E)?+YvxUk<pT>r8gC7
+z-wzvf{M8Q9?y>=nUag3|?a6NJaP<f<z}}23xF&A7`nwxjuFnx5@4kRAj{V$dH%8#+
+zIRbB~AQ-A8AK=C>{YEk1BhsOIPb-$OO<(%bHne|IJTP)D>uW#1+c2O>2+)mr2oiCf
+z&TrifqflW^Y4OTzCk`8^@1&~Z<ow-k{C$lPNH8zLEdacBcc_VS(B_S)q-Mj7_5m9K
+z{JT-of#U#BVVwTNEd~Xx146V+hHEu|W0uAk&$TYOxUaSELfcteoa>-K#Z!Ror_u<Y
+zS&f%?T<kHjpv+?v_inFc{RDj<nZS(+Fwl;VLwSy$%erXePCPow8cOi`%6**U8BcI1
+zMlNM*nA0$NVz$8A;Kc#xb3V@-1?w;S&yrG^|31oo_G~Y0vqM-Ltxk=3VK{_+%o8!^
+zIChEgybKFtR+jZ3$}`3vf4SLbzO(zXYyeyQoix7LJ*+Q$cd7rg+voqLk9MsXb7OwH
+z)Mo=w&L4{)$1x`6(TqBMopU@Ljt3j#xLVjJ8nk<5j^l7}=Ft3WnOA0ZUOHpOjoUTn
+zwK&2Qag4o<>2z#lW(PaoFfMO5Ev+xSZ&sH4DtFJkYrS9pd`ksk3Z}Kc`|5wule>=N
+z!siyaVH*{A3z-P3^{r>Vp{2RRXMWCiXBEN>DD2_|SU^8e)5!rRhE%;eTLs}!Vsvrp
+z9J=8_c&Cre7L^=aZi_eO>EN?16mIDR+?IhC;phG2-{~FP*w0q`*yy<Y$HtYs27<E8
+z%kJ8DH982FKt1V!#8tiP7p~@rwyr?isDfQ#C9liIb^Pw<Npu1X!+Ai^0RK`~T@E|E
+ztG>R)&L%iQ*2h6`5;dvZ6Cp@a_)?d=i)*p&ga^kpaTcC{Hh2P15R8I43EJtD8mbVc
+zA{Y>6!4Bf(^@9ra1s$2|!tb3_#XgJ3sfVW`K-u{~4=LCb&`K`#Sd;=9XwpY7LceYN
+z7*GcXJFIe}iSC(ZYcZS;?h4XVtI64CB@g$FY4QR&f`n#LAjoogZQNNKp$496qdo;R
+z$u3e@C(n&SbOH&{;&jq5xtQT5T1Oa*n36bOJnWAX=Sepm=Nhw@M25!WzE4>UZi95b
+z$qOT*bi}3a9nfVym;sJY^wF8w<7WFi^E=|F{szYedu=S{?8G9IRK|S}nh7zM33*<n
+zRMD3tvN1+D<~+4SjB}wVS;3|ug-1~`?40&bBFC09o@G>xgo=6M^oSBNyo@E@;tSN&
+z=-^t;&eQwHgAH+4GH!TAV_+jDPJ<H|Hg1hM4Mi?_B~>oz&*a%*(qd8KObKF_IE0KF
+z=FlY4U=!xAfdCo9!yzce$ta1Zg5?R)V!^t(OTgI8Dt~h>^Yi*>V;YM=J78I9Z}ED*
+zrGn6QaHszE@BdllJAP3gSy#fWMXRLQV0+R^l{o|I_<7yr>~$@?5JE$6Ch0s3LU1Yy
+z-}Vr3v3Qj(C$*{-WGdQUJB3a{Xpf0#gE!jSk3a&}!OGhTbnZ}(>fh|8I%ko}R^IR;
+zy#2`il=t9ej4{Xg7mEq2Y0e@P!(w%;JQU}6vUh@j^ZFm}P)-4hI6~Xr<N4l%n3YYZ
+z%W<I3;#hbuH3Xe`1Y!to|K1LAz=^@5AS5`}C@ajgEJD`M7cf4PCptB>KY#}^V_HEl
+z%Mr`YWSlLqCIsz5wtpP&V2txPR-?rUX_1j}4Zqf=XmXBHmO`v!28vm*vlhM`3jmK&
+z4{V<~r}e?E!;fV&**Tr-*|^Luf(Ui9V54IQxf6Y)QcnVqF48avbl1`%rJx`f(9*GT
+z+1L8EpjUyxi}VBBd$C2M#}P=>qH%$53Y>$e=;(mbZ!cHojx2>*1~vRlv;0kfL&;`{
+zPl42}A9AK6?6ZTo^@ddW_jhP$&yYMfmn-KXDi`KLU)4XV(OsPgdt&X`6c)nBi9${l
+zrY=ql#UK&vNF2aR1Kqjdt#QgUAL&&8&Q8VU=PLKpP~$JNm_N_GZBRom4k`r_Ew>j?
+z=?^a`0$?Ni<JC%AM?o&Ybdx8$G<rI!jQh(K4@2kB)9n~tkPCSjIGYfRX?$)vf)~sL
+zd;mi~ZY6V!dK*4dF!<j*4uBHVc9hF^Gj$w1bLI|*&$cLIHuhSJ{EY#|i+h;e4e(*=
+zwgMP8V|?ERVN<%YK3b{NibPEu?a<(hy-HeE45MR6Lpv`5Duw7PeTMJAkcjYCWPO56
+zh`dP+KhLwQDN$l(rp9*jd`?1kWohy#8&1X$>6~$SaC3aBic;jvvlqx@7-9+ozMk!l
+z)dz^nWPFnY8u;-=Qbwn*hhsufK(BF-FZu4PQ2Hu3Al#RZQiKeM;g>p;xU^WFQpta)
+z4@Co9N-pEZBs5Ycqg}T7X&x764l{HPwq%aZ?sz_UB^<Ahy@#`x;C*pC8k{GN(gqCM
+zbOXd2#mi#P$=N>tT)ex^J8fP+&N2RGGoW6Q1MYxTGi~-Hvrp;r?`wa<K9l2qc_1qJ
+z;&1<<KC`9RVOG3+==<kWm_aeHuIUD|r9@|Y*VoL8MuDab*t;?)H(fSC{xt5T&H*ZX
+zF{uq{e51Yn2-pH!yf{OP*XQfd3oSa%;#Gtf!4$6>?dLQCz^sF<qnc>JlrvBp0?319
+z<4TQJxYw_7tga}Oxe27vxv^FqVF__k2$s8%ZiFWmuN$j11<TDSb3>heO*X-f$3hba
+zL4Ha#7AA{F)U3W{>IU>e_=1Z!j6!0HNDQ{c@jAZ}D?n&NJQf)tlc0S{u58fY_F6g0
+zw<#3?1zN_i<nTP=3QmL+EvX2L3aJ0&MJ!$fe`E{`x*Q7{3(;vTh&Hn#AjZd!_bNI>
+zy-LbPr!WUysUXTJq%_4jBUpZMSnY{r<etMp5QAxPvc)K+vCOg9fw#-eeI%2nMx0br
+zj90J=i;|NENBQ3RNP4Ncqo*%Owgl&%Y#K$0;6AMiEMw{j<T+D476@sgu1BNChUMN=
+zq3k>JrpFy(x8Y}7HF>-r4?&V9_q1!g9l`rht<pDUGR~whwnH}cOp8WdZ&z}8H3|p{
+z44TeVUBAY$Y+c)OrpLg#1cRXOHaHyaEa&+QYxu=Bh203lyG)TlKv+nFML*KTde$;w
+z5(Nc~6v@tUya-shv-gFBna!d#MKat26XM|>B|){EY&bd-ShM$soJp+6QpRRdFsl)g
+zrb*f^D2-+@j~~Dzi?Wcp0nUhxmg!>mG^l~6+BAi=or=(OVL>m{oKOk?$h14il7WcL
+zvI}NTPc{qQ5*MME(SU|tqO$LS9!2|;5VBkkf$pOwj0tqoE|h)`d<`484hmP`T(^4u
+zsm1ZQklo3Ba3fBa?b+g8SW>9mj}*zBXMLi;)`3R#?WFo5b2SmWS7gPcZ!cHcDzY+|
+zx6^ma)M0y&b6asM&z+Dpt)r?VrwCj`fkNpUh8xDsyh<sZnX{zNPvZ5O;MvFd@e)z@
+z!m}1{T`?IulaqKp%##5%wJCWvFB$tV<)A~<A97_wBE`FykjAql96s5E$7Be_hjC2i
+z{c;ox2*rZ!yhp8MoS^)gXCj5UnSk;i>cUIJypN#ZyQrp_%sfhjVKXv}hpPc%vmw%I
+zIG3ju&Iz)ECXZWn)(IuyMe(inG5=>ZkSm|sTS~|L>J{>mMzibrXSB$*9z-Y;(oy+L
+z8}X`o2|2U#^IWbx|Ig$v3o%%X&9WHWGZx6~g<I-Iuy#V!USKk!7*tZa*v&-j>L1rQ
+zgPDFqL6{w?xBYEcgw?#*b^E*2aF{A^EYQU@S0jnv_Cz;!xMBp%G7NSgD6eQNQ@m?t
+zu_Z24k{pX6)IOk|Z#6OZO-Qh?1zGs-X5n0sh}CnRg@IHxbMIsIyVsV;x1Ll&(!l($
+zwmELu7%7gFHC4f{EP|s1!lB0-@iHKYv9!!t7(hT|-Ik^CgK!hP)WbW^>d0ag?wi6b
+zPu+o`F%3T6tc*`Bg@_17JOtR#&R+TMFLTasR!@wSxACKW8hVArK1@GRM3f5E@?BW7
+zX;`!0ZB*D?oe1Ledl1Gm3W6<HW?fA-pd5^&=wS8X20^eu%e*#4BQH0}k8%>n`x~=3
+zZ$7DN_mwD)64$-o?oa}3cXks|umOpS5fC3MR=BBKgU?XJh%`>K`XXbbKSI)D{dE38
+zf`(ZaMxUkN&;>9`=IKCOBvR)hn~J7M8CW1QEsD|;Wd4%}sm!|(KCl>CODNA$<|C9V
+zHW#{u39yviq)TPooHs43*~e8w_Qf4Rg}zOCYCox*7MgHS^D&K^(8iFN$q;lD7`w*=
+zl)jiB#R~x)kARHF`c5$G-5U29K%j(1V)AUxBcwp#r{*z*5l#u&vr?b^>^{vCkVg6<
+zf;HSeBL9&gCEh{?hqJER$!P2sXO`-C2&M1xJv(l5OS*8zi{B>gk?syx19K+9OKPEE
+zBIaDuPIpy9Q#J2a*c3E7JySh~H62e%V;or>scQ=e$KZ*16HnC<!p0dM<`mwY@)U(T
+zP!LQ3Fwf3RpX2akCzxgIXd1Jfn|oERXV<WQcyCOhj3=}b?+8T{Yc@wvdLtv2n`-@G
+z1J9niXVZ=A*fB2Bdr1zGXMGV$%%u9B?o*(b=gXWm&q9P!=u>AQ;~T-VMHpqOIzi)y
+zP?)GUk>r`sz>^(79XM|S^K6t9Q)*~9-l@qT2Cf^A&LRq*C291f7LA=@ZreB!+fS^7
+zyWxQ%#fDA!Bn^3(mlIb=jFjKB2NuCj8PxDA9SRI`Z_HsLQcBrS%$&>6_^YiNKZ(+h
+zA{q7bKCQ}Aat`Ufg#RLxL!ab3?^2Xfl*WbHTPg@Xn6Yx0j8FXKAL{f=OO%~%BW8mg
+z!m?PVKmWV`s#;jD-fliDbm8}MTbPL&;>YHVYfgy4o^$s_G%;eLMJ#AG8B4H2QkhT#
+zLvV8A3WdJoz3j?|`ds$n=b@P{g0lDIo=%<F-K_#rpAv3(5q|RLj&eK2V&3@|Czzje
+z7dMn}7N*R*5z-&4y!!ks;K5F;ppK9-KT{)5iA(-{UBpVEs;vvie{xFcA6=r%Rmr$n
+z8#Q_nYkLvGke4E%3W0Zjz9Lj*?EZEi=kP1Oll<<pL1p~{3r=CYMqh+Y@D-?Z%Uv3K
+zy&H=$2e);pqFsaP`*stu!Gr@s#0hWEJ?lDQKJ!?RMnAoQ#VUfp_3uSFpr};VCo$JX
+zaKS#^rZLiHUAK4<LScj|LiWK@1i<Wy%&9qp{lvqM;(MT4?sQzsPqk?34DsS+cq`DS
+zl2;U>^!UI4^k{fDar}$f>_@*ymrq_!p8l3JP3&*i$Wbr?Egl7+n~vhT&i-tf5?~n|
+ze6o3(hSx4c|IMvy*5TMOJf}O#P_#U_Vmmp$N6EEhY*oXNFwV`PDBHdUmP??2iB7Da
+zb6DfMq+-GX`JC%QH=YW{n`(xRB|p6f&lw>B1|R`qpICs4^S`SEFGmS6bHWp2M|zdM
+z5@G3hU}g`R`E7l5M&|PND4v^1o^KRfNb;ggh2p}RXr1=hBxPS7Q|AbdkAvI5vl?#(
+z3f@#*pT?OxwpPwIn|I;vF?a%+HGv!7E@$5-)xZg{E#DE&rd*Dnpwi<Acn0F`!4_}@
+zoe_BfGrQ)bTF#zx_O}yGvJlkKZiP9<Q4maML)etQtw?DrSWm!$c$QFB{3O)IodJ0W
+zZ+n)dp`hAXcu)w<$y0ssA0tHL0ndXoh>&h;3PeH@4}Z@1m<|!?9@gj^SllQDQ557U
+zEc_@0SV`H09b8~LP*#HbS`|D^$isvgm<&P4mHkkKGp+5ajxywYuzyhKu+j}b62kLk
+z0@?1v(qq$aDWss;xLj1UOsR?2#2&a2%=Pc)T^Yqowi<8HZ8`EkcUEKd5Ji2Ix)CK|
+z^?kF2@xu!grLPC!8(EpJv`rZboMCS7>D4%%oNz-Iyd{aO2aB9g%<#@;1)F&v23QA1
+z*#1a`vkr_t(|~7-Ia@?%>MUaniB$GI1)QrFB_gQgwdIPjc8vK6liY3LpoNtKyVJK+
+z5IQK|d5%f6V&mP~%tLaS#z?cd<o1*+6^U%?!aHfknT_)55KFw1{UhveNYsVik@?4m
+zh_6KKWo75Nn1UddQ-Aw7akoU}0iLnu#S4<l3)|f@re<&mwFOt_yUsuVjlVCCKoZr}
+zR)Rmcz)M!o!oTv?LW;YfeBEe2@d#MFJHmo{MY(5IWLr!laCj`(_%0zk4Y&FTF5eD?
+zvhXyNQAeQC%K|t+v6M7iuvu7NQpSB%N+JfXcyrGZCx$XRr4UBF5Q`krJUmE|9$f17
+zUWYCYYNUb1EWo>$0Fh5S#6{-m+<^ec9T^3H=2_GWsm)BkYz3Ze&PV>4*%Xfw6TyWV
+z#-fcP6vvNHl*iEi4k?l;6LbldJI|&9d6!&0hs;&%F7?T~AyW{S;ANmF(LliQ8W_NC
+z0zls2izq$_NGCghHG@H9@ur;eP0)fDad*s3*9n9rVa71RJ$Yk+(!d!+M-$~;iJSer
+z36$v;C1ew7!%d6u4|R=DR^G2D?%xDF$RR?KW4%4{A4i$OC~|{ma-<2u#N^4P#v*4f
+z;y^#=fuzbARL0?o#<R6L0=Ar5Hi5HK4B@^6F9T#iWA(!tkAsBD4D6Y)yyEyP{ye>d
+zW1h|PJ>2+?@7T6&+qP{twr$&J(Ac)x*lN<)w%_#me1Gp>aLu(lyJyas*_m%9Gbb7a
+zPPjLO>0oWq+XHbx1Q^!hqlKWYjODWq=*%neg)-`hh65-S)O^$2%$^J?Ft>QA{l5Y*
+z^iYi`4TLK%TW7vd0lI4U9~|BGx#!&_j|mA0KxAa$a7EFCB1551O+h3yw9-gILkuyY
+zy&pjV-~h=>DpJyt$DY-^bGw&`i%%X0w?<!O_eQCU(DdBQ$Ib3X-^*_AX}*1)1w+ep
+zk^VH+wuKo-w-kcC&IuM~Ly2Q&(RD$hC~N1}BXGNYyiCQh-~?1AnTTg{)lnP58u13z
+zD3fB&kIds;r2eRB3l_E86r`aPGtxz8I126`oEb^J%2l=RS<N+)dHB}H14Z3C-DoP=
+z0IMCBF`j-H%P`D5N#}SVwG#zmaWQtNK-TifI?c)T4>`+0&&q?_`FdgW{&?rur~4yM
+zdgoX%#%%&CiRm0FdCx~lCj0`dsf2OwzR)VNP=pe7>vPQGogY*TvauPK4O!{4s6s~4
+z60sr))4p}wk{}6OvTc$qoi2B?m?OJB<^EM!+SJyXLqaK8v`p6?QB{!yz61?;S?xbB
+zT(eX-msc@;&CAs1reDipGb_-D0+cQ^R6+Vhj%TEAQa;_M!Jgh&xqZhb9T?Uik~=DI
+z)8qL5d`c@P`SN65>XzWH$r&GWCZ%P@%dXXR#L?kdcxF}ByBk1jJeex9t|sQCMtA)*
+z<#&H?MLozxws!)9N~z%o$g#;9Xder~5j=>l@$yI`@R=?<)DGB7k7N29qiDJ4&Ktg?
+ziP!UTQ=rRB52Tf%tvo3~P`MtjkTIlDON4zZoDT`6zf6zOQG(K;ca@#cAn?}5K2ORC
+z;Ua3sNbl205gj0`lxr4>PIY8mSh&q;Gc_weJW*0z(oPi073*})VPicMk{gzGWq>lN
+zqT87+xECw&rn=D>7-@P;v}iy;a@=!QI&??$jgD#lUdCxO&N4?0y*`&=#Skm&Y%7Cf
+z$^$9LJ45yVdI4y1De6dy=8-{rvm~%7xH(H(3S<PEm2zIG%_PQ>N8*;@l7kh=60U{N
+zz3;T4LbL4MBU9KRrwJL<q`*sOYx^Iwt~!64r%!$q5}s#0WI?zS{%tG0XU!tGW=$@{
+zJd?d8$>y7pEJSnOxuat=;SkSnd1aY}fy8S(RcHVT^+AY1;`cBuoL!f~-XQT}i41u5
+z^u;YWM*MLvArU5UcwBLpSfHIj&U;`I!lJ`d`sr^uaGlN+2s{*Hu{-mcO;<T${@zTT
+zRUv4`%fJ+5(JH-C*3JmRgpxh;<dm95I4;T4>!t&pkQYrkN@^~AMrAmYvz`17eW#R}
+z8T!ORe5P7hWc@;zVs$_<+kjcle_4A}p2~hmO6=wqW`29=hI`qYFKqq$hwB1$!by7o
+zKcv{brMA4BoG@hn?rc*pr}+Vqy%+B~(iJ6bG<tG6R+(A3P2#K7gj7)&buzm@3}M&)
+zW@)G5JLL5bsy<nF#PLi+tYldNuqBK{B?Q%N8vZM$IriQ#9goikMk4fQ>Ita<)A1k4
+z+Mv+s=VewieP`eKU+Jbczr&x~*qv)F$P#?lQ{LN7kxBB*p6-oXwkUj-YQi(_G0G6%
+z%PhSj&2oaCM+=k)i5RmxaDNc1ibFt&t8fvP-EmfwFLb53WFcV}RgB<8@;Pi4fBpRN
+z**WGscO!w)^^O1eip0E(J2$g^;;eUxl}v#AhA_U3tukUgY>tiK??<O!sGMBNrd+jU
+znX2zY>efJfk1M?LFiDGyl?lugqJb|A;^#A3$kSY_XSO1vFNohm@j4@MGIhOQjX3Ef
+zW8hpP19{Mz683}ljI0%R{2Nq#jhh7W1ubedNc<KVXb^RHY(V7PVaapmN_{1a&aoux
+zbC)dX{H$DRzlh+@gRc%vAFj2dUXC13B_ce7oe6pGH(V~C+7q0%wbDbL#nC)6?~L5U
+zpQVQ*xAn{B(sl_^aH>A}6>2Ppip`x2;G?YEB<tGSf0_s`h-=o8xImm!uKcv2{k^a?
+z%3KDh%`vex1c(<LUv^JY{rIm-Og?_*wdgKUd^TcX`N=}NEJ@cBO@xY{ow<Zqb=qlZ
+zVIhe(En*{H93_?eb6rJstkA}z_#f(5TZ-f@&|Gp;Xc{Rr&#U8c%z{2@SL(MaN*1*b
+z>=oFx+?I@a411XlB*CS8z%O1Q9Inh!5(UOK`AX#JR4fZ-H-&0p#Wo$Ujr@|1*JbcN
+zo@ieEEwnT>PMtYrd;Y!+GxvK>cG4#5xNbztlwZq?3hv2WV_sD7Wz&aQ;y{IF0Qf6x
+zKgQH!U3?OrZ<8w!DyqCxOC1c1Wl8(^5B<Sx94wpJ@E}ttYCm)P<zcg=v)(9Q|KC0c
+zW%Xk7!PazYJ99(Xt|WdVtcg5Hi;0)kM`g81+U&bzMxGLMuKMmv<_f?;)8jft>D+N_
+z%TfHP<pUw$e9*!Mwprp8vxwpWo9a6~g&+x=+8ohw5Wp958!TY}T6Tasv{~H)y$CIq
+zBgoq0^5KOZ6qLgAMXhOew$@XN>kS`ohk?k<DGwx8R&uGqNg(Su+epD;ka_8LmFcRT
+z%_WkMbEb@Sda&g8oRU#-%EEMm6jQ0x9XK0bj5u&Ic}5FL<_V5PY7s;QsK9>pl_XXY
+zL9Qee=g|r$GoG{5UIf3jbV6lQ;r!7HB0@C@v9MC_$0tW##ARc5a1T_jra1SV3$XdD
+zXpB!3*|R{|q6tpk?!WVPigO~CRS}#&A<wEf0_%4lZ>`G9#xs&g_yD|?Q<*BWYz7mG
+z#CPu~W(g(#73W``@UkL=_hOkuD--4pp_dGI$4b_rLkSnNRw|Kt`3rs|Vw7?eJ7uNP
+z;Zz`s1~k^Cs=FQ5e)^F=zsZZ$?s5dJvNhHWYUfLG-5Bm41j=pi;_HXFKufTueYM~~
+zFl19D<G46!Fq&eEr*H6tn&)%Y%6Xgf+-9pCmT`uVa)K9q{Tu2tfcaE(!{^*AM!*+B
+z;q5SfVww*r-se+!lGpL?UwQ)4C?Q-lvf-+V=ssmJv~1E&slqHV6};wrl?>^4dt%k5
+z-XA8K>C%g%en`MY_k%Iby;!*+gf-Vzx~d?WWFlR?y30q?=3)*|AN2ju*f*5bYWTjj
+z_-@2>1JPzGFijgXD(jEm{gJR-0#GHIVfbr5h6y$IgnoN_Zx>Uuh`Kh0BxEKNfAz;*
+z!^hKWiH*dSG;TvyIQ-UNg=n3>B{UBqhhsKi)Tf3qiO!^wG*g!`<<BrD+7FUb>`ZDK
+zbNzte^{e$Kb?I$JDi~Sr2Qn3>Bb!A*etc$J_(+N-C#J$?+fVexPqQAdk(u!Ky9t8P
+zz!}*ozd5v1Do5!=DJk;T0xIZ83ndydrnQ!_f*O--uLD!YxhZ>7$-=K{C4Y`oVoll6
+z32|<dhB!sENqFXj@6B6<zDUA2nG2?irgLOOS8in1d5=!b67w(&qe;_f1+qRn0pb>%
+zw~XHbrn7f~XB$!rz?nDWiNZ%-3<<sHgd<JyD7nq(5wyGC9%Y$95P1D77$(-BJ5z=3
+zDln(KG|5xJMMwoAJ4@D;nN)vgu;lY`B_!ms>~_nm3&RG+PUl(ix+vI{Ek+rON?gex
+znBsczU`gnr0^SqQJcjTYKtXR|o0QjCg2tnCai=`%rbd9Ol~=x<6<O&YGb6Tt_lgb;
+zh@6-i_on-LnZL&DqK{0JEET26+w5T_%<%AC;vE^Tz9BFrpw;qb;F`GZ(0U-Su+C*F
+z!s6KWIs`@Y%0Ry0A64khv8r!Jw1__7QQ9ibD_=ifITZ2v;538hls5~frn~wuzjI;w
+z3iprk6XoWhIx!9>S-FT~5At9U_1kul^E;DoDs=N==pDp?+0D>a>k;6QLy$O)v9{ba
+z0*cSYM$eSL*RFM;_B}Ob$h}ql+Sbu?`exIvzs?1RCRautIbG<0miuj4sV>#}={xp!
+zUARNp9q&<J8%(`{NRB+=I-=CaFisDSg}(HJ@;^F!^-H&&vjf~>G=1D5Dg%PanFo|q
+zanTDe5uO9W)p5xOf{!rPVD5@5#a6P@x+Lad<k?nHu-$U`S&vcAKqq|ik?TV;CcM^M
+zqn~%FMgvXgFpvEmz_S>}dicgUQ%RJ)Q8K{U&a0GMdZ=&=SFo@ZSttPv^5pMREBig-
+z0s?`Ma!}!fywt;df2zt*QQ<BUvxOvKw&X-aqQl4|GTqQ~crSB_PKe&FS8vA~@>sc=
+zzSk{JsMKas^liB#?eS59uBd7_i0AQJ#GNJBQI_>x+@Cs5RGWU=o^MY)hl4~)sJ=~@
+z$dR$id0LQVajlV~sh5R&!%{T4Lu7g~2vq5EcOBJb#YO2SN;(=;rKf=>&b<IltV&iR
+zee$T51r{}1u8JU)af8i4qROqt#W;JwSO5|AT!fzBdMPx(=a88F#9l(8$MN1AD>X6&
+z=jW9YW`ZQ-s}-C>k#l+`4c9I_$@b<%D)?e7<l3HHaRq<r?AAS(SKSZCD|4NZJr7df
+zz+f`F+5^p-GyljnNaQ`qr(z>=iqCqu&Yi#L?n3w)<=5D=@p&i}iPrAdmK@C6%5RH<
+zh8w~XY$xNfRJbTB3@Y4E`Kso)vP95G8e>abyaId(Juoj?jMTrRQ!7%f%EcD*+5*7L
+z#P`}~S#amMSR{1bGmx=<v2%nkexKVxJ6%n4Chs1_sxX==EpX(52qETR`__dY#&Hrd
+zIU}>qzBqOui~QkeoM^*p;oQ)ZFxn_*f^RqBvX<;8`BXp^N9`%!C!R;(??mrnD<V9N
+zT#GM%4p$7y8Hj1+-pVYxF!6Cm8^#$Hk*fiqDMt2Ty=8=n4dxG}i{of$NHLaG5S(LU
+zUy&*!tzvVNZoJevX0$G?5MvdZVqxa=yY5&kCJou6Ft^9QWU!mhNpZ!kDv8kE;-blp
+zRh)4a_hVu9BDvtT=EKY_#ZdToFvb%iik4~{B2t>JQzS`-fYt~Oq><q}Wu4RFX|OJV
+z@#aK9)RX&6BE-<V8(W6ZYjT)}68527i)MeAZ?T_pyunYt4UFu9!<FEP;vb2_e3%r^
+zhgTmuN~VuY-y^Junr@pl653eha!J~o>uB_nM(E<#vc1V{Js__mKm}*b2V)AI5p^V^
+z;H)_meL|^$6hVHSjgyfe*sI-?AML!o^<eO<MnyIrr<+|P2NgP0wHR~kcO`3<l!Y`a
+zD8O<T;`a?`8@ik$(9+Ce4wa0u`pH03uq3Ve?ObfEuH1=5CikpWD#s5Gn(_ON88s1%
+zp9}AX!Y#yj;sk4HcDc~}tZts+;UTNFA)w1w8r>7`$>*jW*;#WV^f^l)jw^Ng#O%2)
+zVS-weB{3uSOgBb~G&#-+G|7^FdDGo(bYe!ID11)G5@xUaN;!GqmjydJUziU*-1uGz
+zfjbj~R#+Y+XSh!Iuu6g{0t!qLq&QcbaYZTxBr)oP2Dg%pKv62zpD4HUUBaZem>8<I
+z+Y6@+lteECRpBdAhR)a|4cBA)h559!>}*(@>BuzXSB)NL9)qk%%T)>d&z)|MbN^E;
+zb4v+!wRAkKG2;6$MI~{nS$>ei{1KsW*JG1#lZ!D`TfJ`hMY`%SWPw2hBC%J@_Tuj>
+z!-zsTS=_R4!Y9g;8TMd<jPqe)3lVtl3I!n;7&am(c2cj$Ukc0D`<?Lc087{~IVsVL
+z43D#-!5wsN+B{Eqf}3FJ*zn~kDSy^260AF8^HS%(5pXYSY`3%Mu1%pd{U1?3M{J8#
+z+V1%W#z0u(ltBN$QdCCf26x2Ke1EmdE#q)T2!*xhi=G-7_q5iY&TqafB8oU%>U0G1
+z{oOP%>{M-6IP*)99cyvQJ%^PDN`2Pjj&fvmK~*Z&9!s84g3C#vL#FpgAf9q#w@)1K
+zn>ifg?|GCeo6S9tSAogxZo`wFWinmk&O%7^-3T6gzO(qNxtp^T>Ama~nk)$Uk~b_V
+zB;HaZrrxvkc98`~(#{Ywt`{HWvy@mp%U$%FZFXr>$rc%Otuz8iBrIo9II~cEKINOJ
+zpnBuNfU3R6JuxwJyeY{aE=SDj#uYN%7*}QfYMN!gx9Pg-S{L8&(z2&=#O-MKx!W8f
+zwI=R{Z#91DlgBO35fN7U+u4Hm%EtwF_PsVSL~1r_R&2ZRcd;ejh?IxsB}>fR=@BKl
+zc!x_=j+b>T_caEc?nF%9Wlhewd%*JiGMm;7%Conz#68qU)>s~u&b0A&rK615W$*R(
+zF@4aW-WE88O>Yiilj#Am!~DRmGuk2Ua<AeN`w~b(+6Qc}Ay$qhCXhM%uKSb5mFVrZ
+z%L@YHKdXZqeLlxuGromwuJ2#{f&{uA@%i;yv7A;-5~iLuE}Wsy^O|6>cN;Sdx(2I9
+z0&v$<bgb5G(;SiGlwPBv6g4z{ENTr+?{t+b(WwOY4Z{xNk_6ip56#Yf_Q?x`KP^n*
+zkWh3y-L!c$N=wo!DOZ7m!%vVrNig@wmHl!;WZ|_hKsS2py3^Mr5NiIhM1{IZ*Thry
+zhxcHi!``)-f&!FvXMH3Q$th-}XTdYJAq|BtkkQ5Mqmm!q3ET@Ba8RNOm(7n}+w}^w
+z>Hm%;%WuLSHjBlym?|3OK+>(Jqo|`2*}cwgc;At$s<F2-mu*g%r>sAXvxR+C(Df5E
+zuEaK``-pfWBRMz-(O`5yBi&^Cl!oc!Q%~5apb-{XhfZD<sap`7OJMhB=(llc2l)#B
+z<GE7JUcc@Z=j9qbQV&8MR5`S2UX5EJOO1K;*=zE#y2J@w={!{uH@bS&?h-}njh-rW
+zvwK!iH-)J6d&PS$7|<fIu`*w-=*p_3bJvyn25gmKqnge=j8e#E8KMFpXFD(f0K}?z
+z)zHb;UH1NNAorM=ylh=Jv`yo_5!`<0FYVk%+;wyCs(FvZM{xYh_8=Bxk&li<a*BHB
+zt*ZBH9%e7xZa9UL@)3MWtu@bw<7X}7TU7qe2&~0UM@6IKJ_JhrcJXapV-WA@of$y7
+z90|{bRL+_9+|;h;y}an8H^JIpqzy~Q-P^KQs^C3Lp3Uc?=V_S1I=iXGaa)*HyD8#X
+zaY#z3vanI96H*8l)z{QOrtExnVVIrbFq6{JwEpAUc^VlUqRRdllH*JqkC8mKv=mdv
+z_3rl=(qtW6yV*)ga8ytjkkG!!SV0Dm!rkvTqY9(dyFdOqFZ*JZl98=wXv-tOaNltm
+zkDDZfzP*8(&g!%VUo`A?)%d&iL;Bp!LOm7m6R6zS3lrnz{c5chk%<O@cG~kdHy_@o
+zS)So>BQ=+w7!HwQNxW*^+HJ=W5FH4*-h(xWU2aVw@tmWRyciTx8cQj$#0HNv{%i3I
+zpj|;mlX|7r*>DsxyV!!W8mqfzHqq35ZWPl1z!Yyjv6DEs`jB)PyJAsJkm3(v{{HD;
+zakP6}vUU!3Gg$RC>;$L?`1ezzXn}qZA(FK*V-t8acJuKC*-LlOnvBladD?HReqIXD
+z%o)}$gD+@TdkQ1Zjnjmgqx!r)pYcW+Pb6=Lg|xDHo!^|zyMsgh-?)AW;Dkq2<0vj?
+z#eKT}R&$&a`q5jINp5KjB!Di|PP5gDRg+y2wjxRlq4iBwx>IaUVl-!X2X0J2qEi&|
+zRpKInGQkyQIm(kmgn0e*H)sNo;vMg7`-rAiCjYni0m6UVh-bo${;u3hSh#L4y<Utg
+z*LHtvSu$Vf_%oKt2>ZD438c?eA5$#Wl+ED=OCC*Dil*_9SQFjw-O_9GxZr$2^ho5k
+zWww7GXK<W91I<{MgYvzXkN6WJrKF3q&q#oW9ZERf56&zf8F^70V@fFrXB8|{E@X-N
+zqM;Ut2~y96z!R(c-d;c9J1goY_I>l#ue|90){%l96l#_b_dRqNJtvOG{~qxsYkB@T
+zL0AxOkcWHW8M^qYk0jpJ#&l@!_Ihv2qB!q)jn0kyyufPPP%H!t+W(A^p(z2kBvW^j
+zJxpo%&IEDV9M_R|Fg_~dr6tA(z{Mx*kFZp>wuKj{sT?PtlO6e(w<%613@t7vBaD2z
+zQ1$=YK@K|02ADusHkjT+;=>4*HCR-X_%&)cjrSf5#7GbD_-;c0M0gQMi34XRB^|;`
+zawJ?FvsM$vyFbrMx)2xOl_j&Lm~K~DS$UxxXv@e(uX-l1r81eQp_T{@cp{GBp+S3|
+zm{t4@u0@l1*;5+$)BFEF8_<!0TcDs{J;$=L6*U^58F)Xb8}ZeP1KZ1Sa7c9Yj?H;L
+zCwl8*eb$7-Ji4M2NXPw!qex4g1gOL_n`zRt0}(#XdtNxz0n#2IIGM~Usl^h6VcH>B
+z>4(Bi&^B8%!_?+c&NM{ZM}cZ={~gD`-2lP-7w@l9CR(q1JyeGeaE0C`bnlbO1T2vc
+z8)yeJtIg3Z1Fg8%=??T=$(y-rZ_~@apE!oB!5))1>t9Z$TmduuotVm?IJJH+6Qeg&
+zZ-EeiW6~6pID4Y>N(_*U3ww*CpXg}#M(|;Qk=EM~{#Ys}bA~EYshC<N#7FgYAAGsw
+zkWhgFNWVri)->-s=|fsdaZ?dA?B_kIbD89YZIa;_>BRU#svG1@CegJAEEK4#U>B+u
+zH!|BI(`=;UN@qqUo%XoJngxz$^W$>6(jfwIq-sGWE*_|{b%vupdan53)84+X=FJX1
+zYl=71^@eQ5I?5%kJ#5m9=tXiW>Z<v8^Ax+P(tk%8CNNO!pDl@8@Q(s--m2%%;0nBr
+z$myF;XsD6{(B>poz<lrq$wLGl_+3(`Q6OejaETVWT)>_~g7PTq^nh=|Odfcd03ewP
+zNJ_D$w0tzYY2Atpd;vRQ^yf&<IJtv$rUGV^i%||7?5D1b`@m;~i7%%Xy#GZz%}AQu
+zG319oARWU+t1V59`@udiFk!(?4$piy@#%C$y@>SRVhIvC0swbZgqXP%8Q;CA8I4dI
+zyMGk%9}U;lTQEyJGk4V=fzjbr@%gr;5lWG)@P~v!-T(!l6NiQjw@qioErv(12^!g8
+zpoA^v;(FHHoy4+ojhBhB+~)Il?)Z_t?_Bd<&i?{1DM@9EmI&j5_REIR%IQdOC~~zc
+ze7JuSk3#tfooVYtSJPBtc32<yHj_Au@_rv>!6BNL<ry0^B!^C?{(p9!0gqG!kIFaa
+zH6tJMU*R|De+kQ*bL;!<$#*sBgsa*BYiU=*K6zg`%ML~e-06fPs8mWZEBqcfz?*U5
+z*p(z$+(ny=$t#rUZ*BeiZrzg+g$`=IpfYl4AH_O<&y+IfO!#5U!^3Kz&`$dG(~({n
+zJj9%QlX`P0Lb~j-rnsQq-vH&88=LWac<C5+V#F*<a^g7qPPrE2L%||{PRm05{~0<H
+zDY$^;vh|~O$4>cB|6@0wkg5sVp@woaRKN>YBc67U!`>U!p@w#J=qG2*M*L;d3CeST
+zUR_p<Wq~IVD!|EX95rWw824w)cvN_7h*b6?Ti<9Gko|yGV}FI%&>SCrHLgjLed^2!
+z8t^<=ZjM~@K8&AYU$xxAhf`S}eh|G;56yZ0Mr#@$8@?B=DE9S>|8OM^A+Q`YXnI|C
+z(T<$I_pj`k?=@68lf_Qu?V+*x5(4Q6&$j)Il9|uj@}I&wMxqnL?US#mdilrYg-Y+(
+za!~na6#K)2$92XQRw&pTATR*x*_l~BWia;^%ZRz~QLFVMEUE?aHnzsWyk=BnN=j99
+z4x?Y~tC;?7q~}dhS(t6!h1Tj{X2|=27r_AJHJDXMm$pj}KcW>r-kF$hr-jo>;VyY!
+zK~HRaB~4QL3PT`Y{=}BoREOuYw9f7Y&`@E?dzC(_ZN$P~L4xW%p}Ev??*eTu{naoF
+z>^cXb3VWik!4K3U$bySJ76^XE{E9Hzp@jXFkzCj|6?_LyMu-d7SXj3u94q?bNREJm
+z9?gV`zT~SINGC&6x7XXLB-C-3ng3ftTPWs64ikn$=3eMu5JiL(K~1=q=SDx3_e`Yk
+zf8xXnp>iF1S|hRBap?G&za_kRbj#@fy)2E8YAw|pTl)HXy>`1gewm3%Ip7%snbG$E
+zRM)K^%aKgmd*#jd>FEBj-pitNM5e&ZsAT^2>DIn4hy`ZMdB%6(at6`miZElmc|#T<
+z#IYRBDO@u5tN_bc)0{U-8oMseJnT3$a+Y4=9LE?CVMr-F&;`e%e1og`?#1Nxvqs#c
+znSiBsOl-46RFauW?f*gZ74Xaa43v=_j9w1_1MegA1N)le#RhBJW4q%qhW&_{hC#fO
+z6`XU-nm!G`_db))<He7_H>(T*dNiB#-l)*&p7<7u&q$oixzz<WSvuW#3j9wNbyO%O
+zUV&KXtUJJbOd&%T5JTbjB^jX$D;+rm6H~<7jIshzNMjgFp#!|wD3{)69{)t>V;Y9h
+z{uH;5iN4UX-pMU=P{6AF(B89_B+>KYkLU-(^-Alm>*eYUFC+Fc-Govxl?cYdC}F|>
+zJQo)mRO#zw8HA#ePVCx&v`>pE-lp#*#L$qb;mg@A@Zot@y4J-P5l`^Z{EN(1aLks_
+z44EME2i;PXnVeF5j$qXE;MLOWN1f7R%YhWmy8zvm3;0p{HctJ6cxrj@5E`+_nXiY*
+z&H6UN1p>>A41<y2K{J7p@0Z1`U6He}OMc%OT`mpw)`vDY>GJ$AngRS_vf8hfRkgPZ
+z4kBO0Wu=Qh6YC?MPbm3W+-#r9;qnv03$>b{H4eX`s$UF7mVa0lalSyw@Q4_wCU~W4
+zH~22_&X4W@YrOMxogwRRbJD=4`P3R-w>L=4d!66O$UKZBCJN|JWJA7%{jnP)<yp6W
+zH#SZX$|{cI!I!5mRlu8C3SedL2bTA*DWr>7G!+|8V8%$DE<m<rGII+OKv3b=YP{m?
+zmDIQr&p<jj1J$b%GjVw!5YG!JKljMix25X}qqOiI6Bw=F-jP+ggpdl-1PAaAHyGid
+z_Y9xzCW&ozl_BHT<5>hWzW6v@hAQPAw3oA5D;g+FV819~Wk8+#GcoNCzQ;0ef>An+
+zDPiR<2s+o-@y1UmpUZxW>+Q1IVnca+Igs~b``otu{_yQ(rbD5X*xdDuz2kZT6K@^j
+z9(Fsp3B5_!u9K5r#;l8-^-ra}MZ^L)@Tsqgi)nF}e{KQx?LO4Dx~sKXjgVquV%XwU
+z>eX|YDDQ=gEL;tUZ>NO;hD5>nBsD7KoR|gUPU?H5qdSdqul1?3aMFUDn8qUhy>(o9
+zZcgYs^R{17`EagJT(<Qa=PPXJ1m`g^kI90B|B*q#N#TD^hG__1)B$8wXYVhX?i0h1
+z7pnX%<s1-M)j*r$KiuwEnx&+)8q`vLj0-P0IT^;U8`^5%iSEAX$Mf-gfS&XIT)Vpl
+zYth(q5$uvph5th?JKm=E&UNFp53KE$hl7Z&4m$q*Wtq~(RFbT}+}wP;+xyX4$4(C~
+znHdXcN)IU~YQ!2mjS>+0U`b=;f!G{TymK|d`81wiSKrnn13p~1R1k*~1+WyAQ%Q3C
+zSQa-z%@nec=JPlt;Hf(<{$5t}fH+KF#ZUE*4h0eg3odA}5>X_NXGUG!+|~{{jb}P)
+z$5_HX*T3YpDs7?8g+Pw~#i(9Da~N^Bc*oNJ@PK6wmm8QA=t1Jp<0BZKKv?Z=BC2=9
+zzG%B-jlt6Z6z4VkzO!0s-E)028iqV`fM(%Bb=*(Yu+GkT?fvWyv&i>N8_&v^Ow@+s
+zlY`fH2S8^+YD)RJaPG5;Gw@E&{BG_%#j-;Zjk%v;1BTDXal1Jp0eeGazf<IV#wta4
+zIx#G%aC$r*=UP_Y?l!?TusMsO;;jC4Q*SQ&54XaAph_0A8&-$AIasyZsl9xX!ddeP
+zf}MUVD)IL??1W|m?VJ|ICxLKLzWOTJ7_k1YGQ7_xFcaN7I8WE-1|wH@oJT?UO;2}@
+zm?D%^)rQCrbJxto#{1sWJI`j^KA&;5gbZ}}MBH@hY#w6~8E`yY@LpbpuRcfw;7Gu}
+zOhE~P5Jf^bSgSNKL(UxLYDSPqR<^SO$ikw{_zagXTtV;?dC}yDxxSOg@P21p8S|{a
+z$VI00tpHqveJi6I6IWJ`krv}CaVR*+`EoW#-hX%UO0xKFPq;tGx`=<@4V_sG-E#k>
+zy?Fl~tkWppqmf4?-^otZq+W=BcWa8gky{M8#m7yn!4NXJN)og60U4*eDUILjOfVzD
+zC-TMT!>VNk)o|x@Z$Ll~+Tk>QaN7Ch?tXJACf_C0m{aB}d<9(6<2O4mOrNACsqhSv
+zf;GB=Ml*z4W}g;Mfh7zML(z^~j}64dgKxx!yUt9nl|GZ6PR9d(G;igpurm&g9@rpU
+z^ka$%u@`sP1Nc<bX#VrF!f-)VkV3kJ7(TMai5Sb#*w(F3E|f5neSd<%lM&k$5q$Yy
+zIcMJVr=7YcG{tZY5-}m8y5a75pS|?n0k?RAPHy__UoAfjWxvl~)Q-OW?ulb?s2IkP
+zF&J1<b0~;Kf-Sbt54?Ool8I=&>n&Pt;ELK10uhS31*`z!yW-|0$mf;nk!4!ccW>t#
+zn>rQ*C@?^i%)SqFxs*k-8$&b$yxA89=J$RiFv5B6qKvO$-KTQ4_bF-=|L0Oggg{qT
+zTWY<)%S|t+hsAZLS1t|`9v%!FpV*wU{9^IIwLl7gsorloz1rZuZ<232+oOLUtYyXj
+zbZkpc2PU6vhWkBoy2P2T9Bmm+=f-sU-D1*jHQ_C?$<6TWFqyxZnvy<jg{fj&P9Fdi
+zhA@Z@0N~&ihZBiZ9zlDur*2MjSFHmz1KZ$f$u$6sfpQjQ*3aP5>GP46MKzDx$ZF2h
+zUp_JXG;(C#+{YJf9fbcVjpRSKIeR}7NlAga-tY7e#$n*pgO%yJYU$i=ZrPUb*Oc@N
+zAt3Y)gMYt<InHn=>UA_-@Y~0LyKLFARWK(7a~8xEp9KfE1`5*+6iLDh?-V){y4abk
+zW`R-BLs8potf<e1%x8>Ar6!|*DEXKr6g}tE#s%>8$4ts(uDxyX%nmTFO5HNE=7;)`
+zZ6%{1yQ=*c?H1sGD#g}ZXmh_E?=tQFwAE~DNHdO=8s2!eAlbwcml6ZhE)L^zv$5&x
+z0YA#19NwDv8JF^vQsyHeMW{YTT`QM3AS)=Gjb0SH4|hxAJ{b}V5Dual41DH@?Th(+
+z!%7fB#&FgzF?}H}mkCvU{=rOf0a2OvKOZEK_yVH@HY3_bO7)$`-WQfl4+rQp27|y-
+zg5K!Sj~CnxFN_hU@Iaxov(a{N%uPvgbMUc1LZfsyWNtjEL{o)i806;A-AcUXt3(5#
+z)MNsXs`-#i4Ya?uFGQqeTJ?#jlLT+xP`}*Si6m8$|3^dqs(vA0B$3Up;kM(s;iuR2
+z&q2KWxA=i?@5qBjkZ?ncrf2IJEWC+65TgVwj%{e@@~1=&G`AcHq{oz+H|Fv311i^U
+zKR5M5-{JN5lI9KmeYIFBd|dW~)M`L1y3X#|FV@p(Y7t@#E4?7mA@_~4oJRFODwzxT
+z%EiN(W7vB>X++>WgX{acV`YIsmY9_gRvEI}zfQ49lGe{S(XH*s$E#zfoSUjHIQKJf
+zVZtfZQhUWy><^JpEJjXt+BDxyOAAKCEsr;8<Y0u$5gm&E%yil5tdB=Rxa98+wkn2Y
+z^wB2H#fX<>ab-3tsrknrI9-7eJs)2&%i$7Td5wdxO~9Uzm5I~)qQxL)<?w@@835n?
+z6HFSM8>`9HF@bWtPk}v&6#D%p5go@W-6Bq|)Ip49Q_rAcmWRMf@1zR_5#;M9!N2%D
+zJLs;3MM3>Y^p|uJ#^#V}jSX=xnB(!NdawEKv&{dvLeGod)BdzyfJB}T>@Zn&z3Kjs
+ziNHF%Pv4i;r+z&DA$zY^0s|U89Sid@_P7(_RZ>5I8xk;1IGB)e3NIU!1tN5jr)swE
+zZniSV7%)>!&NUy|=s-EN0GlZjk`+o;Vx|AEgKy44W)c2fpLZA^;MxuosDkoEmV{S3
+zTI*fxAbReC4gU75*9L`x9X@$(^?|kOMJLh0USF(HgU9b0R!}i!2uhD-{Up_%o82?~
+zfvxGD5{G2cU@Y~H8y!W>v6Q5yl&S&*;XkdH#qnKQ4CRcTie`cf)qPio-n77na?*!`
+zNV(midQvTyQ3vEG|J&!ROuAWP>5*X!St02tSR;fia~s?PT|b0l>q*LWh55n4EUd8(
+zO6ymVMb0K@nce;<+@c?mfswgCli~umhDr2f-hJwvi_hGLGnfizAUHhH_=&1^hzv|p
+zxEE_sP(YkKa((O}r+WOr=U_}S*gIe@`J3^)ITjM#a*Ue)CmsbRqXw4$dJ0*fJrJNA
+z?ftxmJZP^(x`I+{a%W+$ePYPcS!1N7`2Y^!t}7a-Mcw?uW~P2IY#CKq858xAw#}!V
+z1aUz5_3Mizo|)@*ph;C=Njfw2ql6}Jh9U>1F=u^1CEa9ZlcYsvz3{d?uD-t$H~n@V
+zE#0{{6Vn{nfO9=W5J3)wRFjtjCzTjnVNpRkZ7@Fee@w`0$9CXrhi74!9=@7aVLcE7
+zOOCAgpVB5z{?A=jlNkm|59tSFK7BCrxpZdhwqhkNUx+Fn&`pM7su&%Nv16ddvsM&)
+z(5BzsnYub$Fjxdy`cW24ZknpD{y6Bxp55UK3y;O75_E<1emEnYkktxP1~@g+4|4Q;
+z$Gdq!rKBXp<a9cPV+1E|9rlVL{|@awAsyS_(tW?8ITz4wqAXwbT2r&nh%}?}Z43(~
+z{Mi6M5Un;N<4+R|!J9M276gZQQVSQ?av?O#PHn;eXbvY9Fv8k+hNtl=8Okr3r^kou
+z=DWDjCKd|NrucS=to1KP{AOgAXq7nif&h@H>$Vl@Dq4V9q}T@hU|Il5D$VQdeD?Lq
+z|5FEyPR=<!`7}yndozD47?FL+XkvjSF?}ZHhu=HP+kU9R-}AB7nSBpBt&~~WSP(qa
+z%vmJ~u&{GXvUMqwlfz?Fn71CnO-+?Tw#8<v`{xA_LCH4d+nfydT|kbL6~2~Otmgd`
+z|J$WPc70A{zH}@5z&xhldSTWdc|O1*+P{05;wxTb1C)pf1LWss^rNK?y=Hcx`)%t7
+zq#Ju%D`7TMJUCxuh6)1z_RqDp64Rg4zFlt{7~7h|^>~bHPVk&!)9N+CY`yNtzHqvP
+zk<$A=qWxT73##S)_;%6l2075|Txa*b=<#guIb6*#8TiNc6ohUPhMQy%=blk1v%o^n
+z+{VI}4}t%z7DH~TZvfGKJDKiP>GFYOwqoZmBF<3qRY(Rnthq10!SDS#vvEIEyXwJT
+z98vW)uJ9uh(qcsIsL0CIi3#h)E*X5#+bZcLUlBtN;lDEpD!1=(aV)S?+A5i}K&&6o
+zMJ+#6ZHF%oBRjBV@C++Xw#v!(sNsUiXM>;9Qh_NSf7N1$a&p?m2nk=OIm|k9-=%)G
+z+KOU-tEtQ5Ks=Fic5kJ^=r7Bjr`ZX)xXH+DObPD7CB_ORZViNkb7pPuCU4lzJXd0<
+z_`M4C$;l;v-+t`0GCCxee^E0SiZYMrm&Co3A}IKVEH0}c{*d93Vr$<QHjGBOsTy7i
+z`)GLEARUvD71afOEh*_dV7q%Oh4S^btb{v@a40fOor(YBkAA>rn^Wt7qj$ofSAMzQ
+z{}fA!c)^9$CgVS!S4R$cf@fn~oOZ_4g8&k#L{aHFE|~VB!vKtCM5ea=L<uS-a3wXZ
+zD7sUDp)J2p4b|BV$K4I9F9Om04CEy>WhS@im!}gf(I<g%ZnrjA?xXc4YGN8Uagt)f
+z#wIQdCo3(T!5N+q5(>-?q$-|lsc{uQ-w<-|82jY`ISIG^xUka=|H|aAi~UYnWN<A+
+zqXw0u3IH%IN3bL%ihYLUR$14@_CW7<V%ML<65GDbgrvM_!a%b(uw)r-H(I$WbCQEq
+zNNwVYZ;8@C^4o~RbfK5waU`Y>_D$NR9p>b>*NUtF3*QBm;txS67oh$HSx3MK?re6|
+zG$%slo$SXq$mRUR;Z(2m#0ap&KwNMroOo>!eOs+gWY~OfnCY$#xQ8Lz4WH5THX}b$
+zUl)tV^^C(pHCQU!Q)FZOlp}C!7&z6h$I=A;Z%j)ydR4hCHluC`Y3i8mxGYL;Oe+;a
+ze+|8UMm4#EOu|K{p>CTrP^0H_;D%PjnW%MF9+C<R9%WK6%DHS?(W5$84PCG;uJpEI
+zeW^@JP4!t>-^ACx@=pAtKJj-q&xQ<$*GPww*@JKtEGg1yb8X->#>!tQwzynB<|z*r
+z2t=@$jR{oT|I?&LVg6y8@si|_rrb)85j^`S`@AX;`rc+2u7+hLQ6&LPX93L>=b`4~
+zo50(L-io@#@Y!uo0E5plO@;tlFW*bx1^^YNEoDx%f*ooStzVmUj!DrH=whdTMt48c
+z8c?ZiVJg`Dux8^l$+m2{{JG;i{WteDe~~gRmUpwyHl}EbFKr)=yaZb>BSL{g^>6T`
+z8Y=K6-t4}zCK&*dd6j#ofaz=wBR>14sJ9Um#YbmZ`OtR=pTtp!=Jx?Vr;C2abgYHp
+z*+~JnMvwoucq@JxC&0Uwz>G(mEr^_sD|1njm;wh`#m>=eJuwOA_hcb7N((1R%pE-P
+z59$9&V||JLv=~V|7U*$v*u1vabxkHG+$5AE@Pg{yK}JsT9Sr|AsKMQ0QRWbw>sIf}
+z!BHLStLjew*jioAOmhfBgIW9`(lX+4q>-2V?84~r(GVo748~&@&b&7seZO0k5?x+|
+z!Yo%0J6{Onus;E&GNL+0XU1tW>ZS|EirbZ3RM-_kY_k)Nw9&z?`pj&wRqX19vp<I0
+z+|1c?aC6j@0HPv->K_#lOlwO{x-$ggoPwiUiU6Z+%_w4`G5S?u-qAm(qRz1dldk-%
+zPPYrMvjdiq=pTPN+to=Nn6EQq3iB1vZzcEQ;=*Z0$G^bIISeq#+DD~TxXWJN`xUnL
+z5fKAj%c?e7K)tbf$FSHzv?g{|3j0c!0_4Ncx#7eKT-UUt>YBQc)vNHmHM--V_`UDH
+z(QN;m_Q&Cn=h!av_6Hvfx!fMlXXq=@!Z3MRc)Y5W@CVttz@pUa#@x^IxFPh>pEteh
+zA<rU!GnL=-7pEqMYnsOYO&J#VaG)UBZ$eMea#1muWY^s0sBAq-f3HF0I0neD1ZA`e
+zWK=Tf)W4s-FVjIn(Us{&WGmITrz@wkDQp>t?fA~Y&QLux690Sqmm{&W2kjh88+>#q
+z%M_eWjueXs<)knN=OV_}Q7#|=FN#yWM;p!wsD66z?HyHPX_(<FQnD?c@Saf^zHz3s
+z9Qe8FoG4vH<lqa>s~6|msZ+pWMncjF9Esta97<5+1QRIkySlpk2z1S_HZBomwtty|
+zf0_#2H9V%!m6fP8gLYy4zQD?S)9(Q{h|ANFooqOoxvO$L(8+T>_v4k(-zVz3`q?*$
+zcRUwx(p^(HEj+W|`56V*^sK6{iZVn-TT5Q57uLdd?NFxzwDaJQNN~)sScxqBfuJI|
+zJ4tjdX{^ec$G~T(FNrSr-<ClKd=YLUDichK4Z`D8_d?cib_Fj3o6t%Hyke-iGdFJf
+z2L|Gdq>&vBe-CbIxZZb}$9ENTgU}xoQ(|f+u)AX@3AkIqcJ(@Tw%PJ2q?RR+fpG>q
+z+jxr<MeF0?Z(=81dv~;5oekjm_BA8;%+hgtFmh<2eTssDtf0_$VhPob*2ui@ASw1X
+zf>;m`PANZ2(~Oq2#WjCc3M)hUhL4aFdb@xs-<p(b8M=f9Yqx=TID~<+S0etiJ&^>c
+zCph-2bUGl8AF$OQmf4t?jP+X*j9a4+4c&ss{&lr_EIPJEj5Dcbbw_t>-)&}~G^IvQ
+z5a>Kw{~&O*_Q9*npn#niGi)PWZ|O?qm%uN*>e>lf!jA|IE~@X&c)K@-MFrO@8`#M&
+zh!TQBwm_R=YuEQtWNuzcJ5m-;laO*gbVVgKhIc6JgB_WhaU}bM_kWjRkYGM&kf|~%
+z6jeR}=Wa~qSjGLVH_0!V>}Dw?6yTYBNSsNf#c>w^iaU%mYgL1ay(R>*60o~_I5pA#
+zOYZf0ElOE;bXqI&A<$ZWu?om(4c=59B^oCA{Wo6vHwBjD>grkvre@fE9&AOC{=%Rf
+z_-lgHV#n{uHzO3pWEA2kjI0KEAF06-e>l_vzvLmtJES8z!X^l%1{<0aA1BO27F-Rz
+zM>7vHC*{_D;T*7Is!8bf_32>WZm+`PV!G5n$#D^*4}xjVBc+CKju`3=)dRn)eqGt!
+z5R2B=!I^5P{(%V`6bZNtcVvs<qCqP*FPkZx4ff4Gt+$Ya|K$c#KhJNgtsD6>@fusi
+z6tbAe7^}gmuy$a!OhKS4uCn-_<Xadd=m0{r60rPvNkm(d8E)WT3!LVE#z0;6THTUY
+z5@ZFq9cu2$We0(Wfw)~@ZTy~75d_kK&a+wJP8iGJjU^4~!sTbDMlb4A)>(Q|)nq2d
+zrf8lDvR9m_18|+ehqef*)(h>DM!X(7xKZuOOU(=My*U<*A78LdQAY|5qhOy+P>|A%
+zP0FOhP~0Dt`48Te(Wt-TOcB_?&9CBo9TXP!j=3Gf26Dr<l!`H1qZv1yADA;?jG5~V
+zNZvV6a8e7T*;*z6OZ{uxqFe!(27Rc@3WpSir<>Sao%Jxw^9x@g_+L@6KIzJ%`UUEk
+zjI@|a-^rEk4s>shrMdQch*BP$x=ppPAStP=T4CuL6!yXx{;+3xdDRWoUNq1jprG9l
+z;9;;GIvJ+{O*K<ZPHp#bQX&{o)`(+b-hEL0J4e1;qaC+NkY4>Ux^Hd<V0q7$3{$xY
+zQ7M?I``4PgKTmLU!DUM*r%SYmOf+#vCglb%)S4-a*b9B!N!Ys#qN;z>B=RhU29493
+z#z)Pw!l+030b%Z@ng{>7Y5ymY!cl^DTP)NOWG^LZbKTR1=nS_BghZzy*Zz@8oLUZU
+zZfMW)q}qIH0>^Pv-6i9u_4D;3LajOn`pK&<BVd7SYf8#Cl58XMj7-RjJx`I77gh>G
+z<Kejbwd8Y=V^WVdoqO&X0GCEQ%9_)1fY>I*q*^Kr14Jg(2&w=$S8y*_K+|b99Go5;
+zM{#*M;K8pv`reCXu5sRoEAD!po4jilCj(Ex1FJ2no>67fFy*HxP7fmo!6UC)^kF(`
+zViXsc7IaI$rFL^65EB)A&-Z(RuM?*y8Vq^6Vtprcr@9&ok{Vwn*8A1hxK2$Gl;S7m
+zh+`p6w7HuKtq6{OX}P@2@nT}=iVRm}F?obvd@8YDnNGHUd(uLfiQ-=41>gI&uiij$
+zb8e4Fa%R~Tn+1_<g6Vg2l}j1H<ANWe$QZz$1umPj@=B8gkQS!xL?1t()Tu490)D+f
+zSje$k>svU@0D0M-n`gcnFveg%FDL6X#_D0_h^ISVd6ayRg3>y9Ibw=e5+ianCNd<%
+zkX{<&jO}Rm>y0N$f=k`lh&V|yU$}f!_OLX)VdFcC@sj-ILR_7|FRO)+#F$vG6asM&
+znZQd0nJiCYn)D*t#-X@Q$VJmc34Py?qlp-La!wWa?}`F|7rtnxq^wD%5as~*%x#5D
+z>PLuy+;AwORfsrg{vk_yOc}h)IyksqB)B7a)i_G}>tpQe5^ycKIUM*T&dA;s*Cf0E
+zFS^CX1v4Y%tbXbW(ufW}d!ma{hJjvzl~B?8QRN6|a1q92mhC$udN>6Y+ppk6K$Qn9
+zJ|F`Tc|KDpX?>-Uc}8{DENq-yHOZ$UER)8Dk}>5XMpQUpqD=h<7Sr`tg>8(fm>E4F
+zOg1V%A+}fMsU+9xXXwr9S;10LH1f4Y!f<3{yH3naE;bAaTS|u;U1`(SGPlv+THWR^
+zwTBJq$XPtqrD4!qFMjl*6VgrkgKtaPE)@=^0dvQlvA>t?NJvf%54*DUZ{DRJtW|z5
+zPH*qK_DV)>y}MPv0e%~7H2?Z!{~!X1MDUUz0AuTe^P<BD`zK#9d3kJtshqKKLR^Hl
+zGvjYF73R8-A*oA$^(d%(o!Sajk%by?Fr%-w5;(o>*G-$g_!9_~EvTSiApsfiq;E<s
+zvv8?*%$=rop%`jnvbbVGg^5`Z<HE;wMoZ)02~>1jiTm8Oz@hk98s?bGp+S(jskFhR
+z6zrO_w+Sm$Xz@z$P-$&r>gucxV6363ST*g0Vd*M<lB@w{r7^|8`khn%G755Nt9eV4
+z%!CIJHrmnTNL5f$QU=VM^HT?8(Xekv3h+m#o~CVA$G$r5i`mag-Dz25*J9gb!f@03
+zbJORsV9VDK3(MKd;-|ux5KJj}WeMD|vW$t11+Zz#N8#nhTWIdvrN@ON`(fYH`B@{l
+z03ZY7ms5?7!>Cmkyc6?xjyQGS)c`pufU!N>cn%w#ha=8&Y_J~2tnt3JfyqCp0rA;C
+z$N>2~F##Ol1Q1a9+5UV)Pkch)8B1%I*9CE&@&iK5)sBhCWsE|<3(0{I=)w_sq%@@f
+z#DU*`C7THOS0O1XO6hzsLf@5?b+V~sBbJ1acym+YvpdR#L<<l>`U9GBd|2C!*;1cp
+zABGQWM#6GCXK`ox`_uKt5MOBmv!ua!?Q@*=7d06<P|R7>QX;9wq!kvLpu49`GK%xG
+z!TC<v9Fy=PMCH2I&aMZaesc0UzKgQH1~JapoWO=Usfn>Xq$WQ0jMsvP;Cocm{(uB!
+z*6L(FUt7A35)raqeX9mM3uhSuVVbVJBi6zS$Q7FyS5sz$y(<ENAjD(4KKL-`Z@Ti0
+zVF1jceO5)3LTCuMS(lklBBseeQ*JqOQ%+8MO-wzZSg=>46xQ_#roxCkuTAKCJt839
+z7fJ<@foN>`P++@o)n#~J#_8)_c2gD8_svh|Ln(}ha~?L)cykfD@fF+qGiBi%5p^HA
+zQ|j4<EzgHdTsK}fJ8T3T53;cKLiBD;_Y0Yb7a@W}XS<YmmuYX=mX_^u9%Bs?DYe8U
+z{bKFvjM7#ThY$KERSUX<59JWzsD=D-zk4FDQLwvnM&9oG^H;>#7dYv<AbHi;Nd!>n
+zCV*daXZUJ(S59Tsf1t3&DbI-KmV_2rfiP)6tUtg$Z>#NP3q9JDbR_kbI@DA+!0a7R
+z(?bp3K{)dYzo^A%eRD=1j{8SKs?2nEZ&g|)G`3Q*=k`6VER6hxm$ZLKR57_sPUJp~
+zO!FyTqOO%Z<nYr6N?Fpi%j`FLN?Mw=tL=)`xNR~j9A{ESd@^KVZS=UTi*<vvQ|yo0
+zKPMdjNI4J)^fZtV8o;N>h8}OvrHH&D#D<vV_Q)2oB*yd6!wLltGh|n7pB3IN%#ls-
+zUQ(Nv2rQgI1q?|s2MUX52cl4UGDVaEw@a)<Cy=vDNaIzAGIKGj6kxtKX5gDqQ8grj
+zvb*e*sn30<!0?0&{qWdNk0y3sq-u@)c(MGhfTA!RqIRI$*-9Wh4!b4Wxs7$OSUw_S
+zRS75M0~U;D0y~tkyLysdbQ@*0I_QAl->MT;K*SXxLUhCM576U5V^+nra^1U`-oloJ
+zN!DdlZ0Zfmnuo%gUowUL;YsH)4J(?(TpFXLE6pj(Qd;b!7F?M(YY0#kCDpRtc4cKm
+z1G@!vU#f5i04^(FhGNJk`;R>$Uewsg2y{<HJ4DR}lH@Lot`G7(QzT|;QUHfL$NbMe
+z>^AGRgDjgSxf5@TcmAIpr*v7EeP{uqtaq!w3O+MLK!oTEN|yMJ?5ZHYA{b^+W=KGP
+zvMrYh3Tv`?fPBKm2;m^JFDfpkRX=5P)*L#kk|Pj)FfO$k2_CGN9Qn96fsGfvB9tjY
+zriJ-2MC{gCkst2Ijf(4u{_9_8K+Z-pR}ZYK@QPk!>&GMh-T05)B(A|a+gXFF_tBP}
+z{?U(!W0Sc8o0TYyCDi$2OZqtzGA5Nroc((!AuR(G+zA)q6Ox(2SLoooYC<t^Ts-Qp
+zYE=bWqL43$EdXNrfD>myLdSm%42$c6#--<k^u$zC68i{yAGTjeZ!SnXuEnYBru?HG
+z&NpF8)lL<n%pFUcSVQ~5Sh9{JA|W}enq`?(2Y5~<L#8Tx!-V|osYHi@3KT*CVjjyX
+z?22+?oysl~o}UQAdtWaLyknP13G{nfAdLQW76{k+|A=}Ewm7<AYc#mS;O_43J`C;}
+z+&v+<OK^90hYapPgA?3cf_rdxKJuP(?)?MZPw(Els`je2R-LcKNuR%o)Fahzv91Kd
+znh|umT{92mdloEmjT+k)75kLF0=eKb-Dfs8ahg(GP^nNu4d!{DRd-M+QmEMf!__6A
+zATBu_rtZn|ux9E*B<wOLftcffl;<_@+PsX>$L(9hYY0O}xhvRhP)dOJH#NI1MUjDZ
+ze&|P~6OsZMl<^#m?94;JPl8Y*(GFEyyrA__cN9{vSwjZW^WZM}9nlnzrGpk4!<oDB
+zvSMKJ+F?UqwpQ#Ztqfw|NO`u6SXm{DR^bc`AuPwb2o{;s%h{`LVKdgJFb2Abx6S+S
+z{baCcW%Jb%v%z57o^PQ-rN3K3L0uZO|ELA)@bI?{>6qrDr8*Q?W5tg>qYA0x;L_BB
+zfWRPYTwOeN^2!7YK?3x`jU<N#cwC9Erv1y)!yy5`;lxE@O`@<;WePGE@F+skKJY$r
+z911ZRnV(<lm9Jel<H0dT9O+FJa^AKI-uL>ig#bKlXjnxtwn2*>!uvmqr?$vg1f8$H
+z^4#QDbq@Z|3*g!AMJI2tZ*Aq!B_Fe`iB6K%aY`VQq>&C*?#yQ^6zHfToRM?Vy}s>r
+zvc3_RL7D8&hIJNo90c4{0RR;J(<#lrWTnXA$Xs#CXj@SBF;pB5s+>vsmPi+6-X+!)
+ze7L;capkA1p$a56Bb*1q69aLXx3X!R*tL&ttPAfn3h670Q*kgu__S9J0X7zi{FGf;
+zR4?iZCHi6!u)vA=!_r5cQ62HE-tH&<T^lMDAT+fIuEYTUvr4VzV7B(Z<LuB<OQgUT
+z|I};eQ?T+7I@Q|4HN-VKT|L-~D@41DAiBJDr@<&aV69!|`*976_OIL?=fb5KkqRLH
+z;!@mPMdf{!h)^FeT#;!zJS}z_2$J>4!t<i1Qbz8%k%y;|%@Lwf_+mpPYM0Jbe<Mp_
+zhm=D*Oe@bE{2(C{D4>|0A5XTmV#&f5Jr^#Q$haKrq|1e_I~VG}H$)Q{>L8$^jy{;Y
+zx}9A1aXZqcWHW~emS|NGmDT9)Ci8;YVJCAHNajJ?!^78bN<1Y3^qTvrL-rOJm&U5X
+zXUo73jTpY*nU8`_0;=JldI7^7nC79#@emw`)FE8&Pk+qgup(`~iKCOOe8(L*8aiO>
+z9owQnPTI!Y`hs9XgHon^j1d58#7rEMYeYy;NI!vs3F5@rHGNrgIU^+?n1eC~qtOaM
+z(l+{Un(c#__ma}_=p4~X64C8TXd4kUV?-Wgk-ngN@%{t*0+I+I5W<obuQo|49hPht
+z>EdlOTNyzr@$m}7X6W&gYd$VccU*8~F@OMx*e#<>p<Qj0bS&ra)Ji!7IJh9aQ&C80
+z)Hf_r@sc3d$h^d#36`+3ha7Xz!Hv+NlI)G;p|*pT)p$${i6*rqNb|A4&EOBfBt}<_
+z{z)mKD<B=?)0Zw^TxSrS3^Nor7Wp)j^)h<~T@+K&M=*ee48YVCySTDoSL2H}B>>XE
+z9w}Qw3TJ(AxI+nobwdSd=pn?7|BHHjKxitVSrDAeGR1&XFn8H37GzjxH$v4ts!Ajd
+zgm{PNz_UADipC1;&hVcp5JW-fgxvph@&2PjgMh}?<K<xy+2B>G`34+F5cVGx28`i&
+z1x^Y7H#q7h2HHNAHr{g9kE+4{A4SChI&`7Z>*CE#5O_5-3nflTFg-Kqw(9-T1&<r}
+zfQntFGPv`dQv>b)Xoj@_JPlH4cQayLMb!SKqUDK|&2P4#sKwEUjmV`3K5e{}+0O_e
+zhe6%M7-Yug<qHK`^#%!*u@<g!L2PqpF~@NqFa5_+1xXuEK?ldzkeqj1aIJ(+_LW#E
+z`j<`Cc4;M_u12G67)0lkXqr<+4J6|`JK!8;n8}dMG(h9=GBLsTg29w}YJ?$(IpYi0
+zwL5phIarm2KydjzNwWwz^aIBD-%q20zsYrtD^8_52wrnt>U1V$xbq2YKktMy>oo0y
+z;rx9^Pxe4?x225s@=5tu9U&%7oJ77U_uJzOh0sk{*H%5JbnjA--0~bjpvZ36`dP61
+zxE$BXHKp5|51y%DgnXfkUAMbM|0;dUr+Ji42zz<%|KZ;L+lXc#RQ$GQvn8O!rPIqx
+z`^N9)?-zid9IWDvH;AjLzoM;h`~qijd@#G7Ur8?yeVh9<exb*`oJn#$LjCgM=2-|*
+zk;q7mDtIazti6vVEj%hh^Couh@RKp23QEXK48;)*EY{ZiKeF#f8x9c?iiM1AkTX;<
+zBh=GMIVh^se~4>&(R?{n`7^7u9UD}$?_b#Hk;&d8TwfHcxKZi7{d*PhwwYWj3%(W+
+zG*#d8FXAn>qL2ggV7<ohu8>gZH&odfQ_enRU=l1x;s5qr|9u%IOaKHgJJsG;e~q6o
+z=GL*r!^wdA)H^T}f42NfzH+*MM{)SQ=w|;|uXcyJzB~``36JX2?XByD2Zhpi#c`7K
+z8y62`H5quAd|GzZo$@C5xw-D_RJXPBfM9{&92s)XQD`43mBh-S#MozHRpS2<$sh(u
+zNEmm+1jl~!cooO<I{GAVC-nx~dbOAleRynZ9Lvpi@5Pvu-Dqo7qu+|L+HAk5M7OFg
+zp;f1liRWRM&ghbhM^_PSb*h`r+EMGhH@KAr4}XaTI40=80{Gx%;X4y~6=ePo^Wq<b
+zxkdRe$GTMgh{*SLZ*AsQKncRl8F|o}n};*u)<Y*9l!4L3N=!^l2XbRz=U=Z(foPyr
+z_yAjdfWM%Y0+?I-Ul9-2lem!sXNt&Iyqpcy)cxA%$aAV<ho=(kLw{7q|D*5ycU<Gq
+z`8qkRm*PgQ)J|$Fa&LGjox)JUI&B0OzOjboF-44j@FhKbQC#j!WXxk-BH+^nTp6lc
+zwh`?FzuYY+3+&!&DT+BL5ugSAiTsV7M*(skxMZ=s;-wnU1&|p@Xci&53a#HuG}Zh^
+zh5862vE3h4n+70wnN`+tMKw^-`|@5?IP!;~Va%s_*jdXl>CPgOuJ5~!9rtg~50iP{
+z!{Y9EOlCqB$%kzhpo3$b_w3X8XHW!ear*na;|G^)W;gLTF*;A5r&=C%s>4XqCSl8k
+z5_c+f{qB!p-yM&FY&HHn?f>*5(t+Li8F<LBwDnTapisuxHSt2E{93WtVC=lAV0tlH
+zDKA!>i56(1UyqzZmt$WZhI7t~N(O@JW^p!SYsLyP3fw<S^0DEKSAumoIn$9s$#YFY
+zV&oU{&%VD)YzM+j=@i!SkRX_cxhrufB5$cM+8!2z|BqMvK}E-c_L^*insaXW!guC%
+z@!0{H5Q>u+y(B$xaNFu$1lo7oL3^xNZh>}FaH9*ZZ!j-n<~3$4E;o4AYHZ*l+k^Rs
+z_+&LcGEF9q!W7bn!7DOxNO=Efjo6;(TSVx9{MPbMl-LMN?_3`624?z>f%3sHY#asv
+z7TaS!{eL4K5jJEH4H+JjV>&RkuUc|&qjWs|&n@j?B|?is&-@?1zvofn_GFid5hk&T
+z^9hZkQkY*UrOEw%yPSOA;+_+F7dkN;wAC1UooAow8eCPZji+f_CZ6FC%zQ3RCpk0(
+zKmGra&jTJg7p-^e_HTSF&vBXfRK{TtpxD2AEcVnBPk+%6uIP^vXCL9kIlVw}8|-mD
+zbXW*vU<70!>A1*c@BgPE_&{Ar|0S(>^GUCqfcF{Mgal*(!X(PNeucc)r3R%icPn~Z
+zLmyPTo}IzUL#IsRX8fr`a`fb8PJib^QG)WY|BJ&6lny{7_^PpenL(H*Qitu5jiMfc
+z;a%(SD2WkVd;j4*&^+gRi2LaNj$51oI}TrEq4-6?@DJ$V9XCpizW;lQHhlIJBydQ1
+z5EKJNPC>>tx79r`XyCz)F~LvxR>+|tbY~Tum5F*nIEJ<zWNak@i{{K8jwAlj)^L>0
+zZ))=HxO6;^KmM2V*s##?xM&9gS{}%9FeRPyr<tyU5~8Ds2aKD@PW3iG*CX>_gByYE
+zgK^320}*KkD*<j)Q+D=1@{a`&pOIwb84!my<Ss#gs2bCoVHhjILe!NI=ZN9qfU>33
+zkv20P9tn&+(p)|4GIJ1!6TAkuS^NtsQy=954gl!#gee6hq2~=>(DVVFr{_>9$-U0p
+z()k@K(>>pwn+#8enT;f$siF{%DW0w&Lpge@VGy1CK;3KV3;-L>dzO<;T~?0VlAL(%
+z)sfRMe|g!2@^C+uO2?Pf%Qzfs|APB6FrZ+Win_R$CVo(>9v|;+!N8O;_5~Qw1L(^p
+zhpTwk=+QU$0o=rr+U&;x1QIQ~aB(_V6q`NdPps()#y`c_Tl>Isvvve*e^5$J^4^i}
+z9L+Kwrvr>7VFHOj7HnKUio1st2b1Rp+ss?P#vlIPUP(1GXezglN4LIyY{cdb6mJYU
+zda-4*o#qUy%GiE1Y0ipm;yEme_iS>!B?W(s<CI6zUFPY<iY$ZSq@w9f%$>L!CY_N^
+zF#EgVMJOrSj#h;-PK8W~NiRDP9Z|<d)j~&yRj|9*g@Z<d;TZyOf70Na%$DrR@#r7V
+zs6v=kvm;zJ`^oj_vL-wD)S_^k^zRS*!xKF(JA4vcZ8(nKFP6ClTLXpy@)vL2%GjuA
+z$gZVD=U|sDIhf8K*Y6X&u0NZQ@<YzEc6_?ebX_T@4_$#>O!*wIZ3B5z_)R#Jnm40@
+z>lbRt{F#|{MY*jC`X<%!p9aEpVnK)+Qt_w8@V51C>=xe_K0cbuR!5>0=h^++0?$)|
+zmc{BIyM8vQwXx7niDyZ5|H>D=R|v&Vjx`(pzungZ?9UB@b=Ry>*s5Cpz#cqY$~^Bg
+z*Y57Cb(Z+a1tZ&{^eV={YiLkt8^j!2<w>+mLoFV#_@@lwXV<YE>~{aIO3>K<h7l2=
+z*4yljMj&bsv(Noy`uCl|XC|@V&0UfvRM6iwxpn_2)J%MstBfJ1t5Mp_m2^><|EE;U
+z?)VR480n$G`nDs)g85hn!6kzdXlZKvr?(KyJo^k@;ju(^BK7!`^8JnT*zg^m`d;*t
+zI#9@m8oPG?!0`&z>|He1;w_YVsO3~JJWCL6|0deZGHJZXpR8A2r%IYIKIQIbToxDB
+z_w5t<yXS>{nupO5)vKYRi)y3E=%SNKR)4l4HITCf<Cx@rjwnbdqT6MRj3KEK>yfAw
+z&EFb~oUI~(f&$OY-ThfVa^~3&;{HjoHjX4DP?V;R-Lrn5cJl{W?R$n5puGHG<WJb|
+zxHJmw4TU5z3>YZdJZGdp%_gwdn?+Sl%d&I&*chzdH<GTfsm8DT$3~toJ)vF?BaHMH
+zvB0}HKjgpR=(>3VZ;ot7I<-Gz?SA(BGRaA8r_$dD{~d=@bT=RgkCj%yeJGvZp@6B;
+z53-yX12Q!snTE2>ekV`Wg_~}RfCX8dxd6_rB|dP~k4*Cw8dhA)T5`G5U`bD-@bVKM
+zraHUN13c*DO1KB9$m8B^j%%t;4%UR;<xGBz;KK-Gcnk1YwzCm$^nmtYr01V$n2Gx|
+zMdm`pm>JLkM@rSO-KBEBzj|>>2OQf)7;1UtIaIU^l@JMfau*e!HgKnWtd~!CDIqi_
+z=0V2b@NA^!oJQp=EB;H^>U0x^{^eAU*{AUod>uy)>GReblg+l_n^*DLbn$gLa38yZ
+zD_|x!uW!DAxU@wZF~h?8$pN2%^qrAbjxj@Q-1>S7i;OAHeCp<8sU)Lntd-xPM!Tnt
+zhfM#o{FZSP&$9RZi3HRubmimYO0dE0_xG?!QPDCRESF*`-jAN=ZD|y`pcxG^2flju
+zU8Rw<$zC(q?@V&;*AoH%XiP0Omi2j{)xkHV6R%8CwasiUgyGNnh)DOh3|NK=!?G)r
+zmj}5~EuPn4bQ`ffBNFM`E}TM(SDv2(cNu~M$%!(UVT8Fc?VHPOF`0;+;aJh8Ka|8@
+zBym-u5}>}g{j_|tM&YR9Z(<f83^7GSF)f^WAuu(g-~0e6|5XJJy<}{gkU;f4oR_yW
+z(LudD&8aM-uqQ88miH&+%N#;nvf*Xt`K{lWU2V8ERcjEKMSy61&n73}ufsdht%)y(
+zAdBN~K=_%)sY80RdfJsc{&eE8I=L~FqvrMUsvF&fsu1R`PZRi@jae31Y`L8X@4(w@
+z)`F{L+^G&Pl#t-R3Ei3nU`-1k-wcKX%|O2gW0LaYQP}41ma!$uD!Ck98Tdx8HEaE!
+z$daPJ2m@Z5*am+0iI^~Pbh;uDKTS-%phnky*!>x4_%dc{`Gs~9Z%7mRY6qvwLw}x#
+z&MY@l-kJhn4tkXr@H%ZrH_cM9qn1WvA(D|6UG~L2wBx_csLge~@*rQ<$+VrADvin3
+z#u5ZQI8T}pT*D8B>37<BKs3Q?g5Mq3qY)gf?VS3I)XEWvVk36&>o~*AO{}`{Mu&fq
+zy~n@Unq%<J)R5o)<?Rzsk_DG!91M0Rr;3yJl!PGg`re>JQd1){m8MwiXxS2L6*y8S
+zRbBq7M<eX{8#x^uUE7|4j=_&5mRQDaL*u5jM5`E_L;%+SkMa7Th&)rJIsUJ13=8k>
+zMugAq-gp|M^w<vBOLzTK)$&#e>bUAZzeqFs6BqGAu_y4zlg&*PsS)PO#V}2|!_IHB
+z-}oU8PAM4QE}eiD^`$I>uKHOUsu3lEx!s;mu!m}P8e~K(Bl-%c^{&kOja=sIj&LV0
+zzxG=X_^oR|!@gah*}<p;kE4=I`#}1P*y!s1AVdm-zbTViQ6xtZs9!5@P3=>x4iVu`
+z%N-pZz7$pIMV6W#SdC98a<?i_Ky3|`ar3CWPiX+Qg9(apyY8Yd+G7_@Cx#BO?^fgn
+z#lKG*J`tWsoL;|6`j@};BOQ>r?JF#$KQMlq$o}@L(Qz;DY204yy~c_^VrDSdq{>SG
+zdSrxOV^yKRG`ln~4QqEIVy9(Wgw*mg$Jiqm!o#bz&J}&8s7^$xD`5oVxV;xA28#%;
+zj_5OgH2aOsp&18vKQ-BocXOZX`1~9j6<JGHB;(ud%H=ki$?ydKiIqk>9pWyHEj<QH
+zd*v#(n~$RkCHbTzVUyQKmQ#5@rWl7<YOhF#oY6hSKbm6k_<6EWJ2inF(;J19;BZGo
+zwQ)l&B7uPQ6~jcX5H=_i`9CnGAmZPD3*ZoHa$v`B`mw#`ZQlo`5-hcPWdB>}eepJP
+z+hQ%p(~2a}4gi;n`A_IHR6j9v3W!G8dNOY7%gV?f3uc+=DR4&K)%bHS3<UV$!3`8a
+zXF!?v4&Z(%h;L#Qid$J+-$k^?&(!ik^frMooy<^<=@qgwW$$lLK5ZpMT`12%HPjhK
+ztz6L$5Pr_cBtVz03CiJ}dS30v%<J{%>x60XLQ#)l!u0RzAR;ec957oq(hXpv{Y>0M
+zW*OQuFd>|kd&W}r#q|4PBTxO4!e&0}KAtJq4(iW`6jxMVdHxYoIp6b=0}&Qy<+#T?
+zT?%D7jSdjI8=1%FQ2(u@xzqiRSF-3GE_8WCqh^Dz!iSSedkn){cxjnc!xeH1OBdwC
+zuzI)==Yb$%nQ7b)BZZba**?iaR38@yE+@&;bUym4Y&Dt7G%U)q6CLXZ5A2XI^f}|0
+z0$D~9gfzq62+=kh`RYDh6|k#xFb|<GK5S8VO+bgGX+5T*g#Tn{-iQ100qWr)RKboQ
+zV=2zKd%#4x*N>pgB!(v*pTNw|8)DaO+-$VeUor(3Es(e{a})OA#*=9$mA;1nBdlq3
+zh1Z8D_rnWjEk0mkbhng?Y0}JN_YXc9`4qn(>C9G`y9&63AVpupB3cA(*{z7Db~idJ
+z>Jq`dprbr}jk&P$gegX|#9@)!<aIS}r)N*<0SLRRoEgNr?to2$O*IQA9%lO6fw!rF
+zA~o$iETn7ryO)yjv=2Z)kN<&onx=STMAqa?XpY$jeLQa(_LnD`F3&r<t3E<RQEDZf
+zg;-jT4$YvJ5=YfIvgEZ?xJ|In@9cy!^clRC@-g{3N|5ugh%F%Yi%FOHHk#Jy0k>Vz
+zwL#fk>)9<YI=C`gAvIh4NNZ6ff!zm7Ba1V;k@-;KbhJk0G<!rmvlqhdgoFH;*^Tdq
+zGC55)h@b9n4!g^hLR|kW>0*?{PRGLje1+;||AyyxAQx_{2eAnkvk}Zj^&c5NcM-_<
+zykCDmMVF7P7+G>8Wl$xpV*=^OgQvXhXJDWSBbT1fRz}<IG(Xq<J#M>;jH;M{##V`p
+zVffVykU1BgReL*M<Aoxpq9T*L&qGSO|4_gFaXRz8&-P}BD9GG4Wgy|m$8q0|jTUl3
+zO4Ov9>Q<$cVY?GDVGS-arGW4(+?~A;Ij9<oOZPqtEO}>m81<1m>!(+sT83ZT1X<)Y
+zcoThj)Y`Se7r1G$Y`I0V9T}xJ)DB%k6Aj!^;km_AQyp&otP~>m(Z8Yf38Gap=TC?<
+zqsGA_>!Arw<!IOyAcy`!UBy)Sj0Uuys$j1}KCD46`WogFwvAlgmJf&x^pQL~rZ-LC
+zxTO-)NNoLH9<j40O9KD$J*XR>8enTpBH2dj#UOzYrJJ~p=O6AsRs=@;0M8Z+3n`qe
+zp;Q&eFSXVZ_D&6hbZUfSf3+(4JbZL(?>V=_Nd3BDSsoJaPB)Z^N@yW>1bPfsj@H>9
+zrjr%?7JQ#o>TIziJD*7w47?NWAzG1)d|@_FWowb~q2)J3!22vsk(Oq$5=XXHhXVt2
+zU!N?v*xP03tp-9In<aqcKhjHWPuwXnFz0`8-i4i_^R%bvUTwRzc|0Owu|5&Fa!6sY
+zWXV~Sx+Q;Bmp9bzh8_7C0zY+47hbtwA~EoU0$yv1YnOV8jUUj0jqeXm0vRAkvj5g<
+zu%OzM!0|e4l$YVU(X7ALr7&cVz?|q?UT~|S^lmr(qg%hl2=JS>c0#GvaJpJkwsKZz
+z&Nux_GO)53l|lAueTc_Px!da)-g%@<6-;3q9xGtR;Y`lt)9#|##mRGaP;1;=9l&RZ
+zn89Y~E3f2K&ftCyoDQrp7EF#9v1>0It&NP#(S#@B#nIGjE<DVljx@gh2@Uq7y&j}b
+zrGi6Mqm3Zm&gNt>l-vGB^@BWx8R~U7fvirfu+U=}QKM2v5jHj{GP4f8%K`CK5P1gv
+zvy(x`VKb0fQbR%O3+zGNcBBJStUMK;?J$f<h#b}4*`(v7Cx;N=fiy&n(rDo5uZ;mQ
+zab-L=m}sOW5?h@~4t-Nul6ia7Eb;qST>aM{?Nj#Kl84jeh(BL^TkKZMnRK4WQH5QE
+zfwE)@yGmwM+||_MA0{+{U2mBLvmJn+XZVFz;}H=W$nv0}WO_P1$%MW*(R|ZBoU_0?
+z%$~236MFU)e~`GxmjGww^zv>q=3`!)HY{q>@cD&i=JEJ`ol?8Ai3Po9#ngS5N;$>K
+zKbR5RLodMl-#)C3D`HpnV6MA>5a>nQPJmXzkUim!G~jljH#(PNqS{x?Fm-|Zz~Lfq
+zlgbRO;^ZsaR!S_?h}u01A3HepR!So{D<zWUo2I#`jiAWWxSkr$y)A^Ql<2kO`0lI0
+zzL|<<Q^CBSehZ8;{gkGjWT@ewuVkR;bo|sBJ!Key$co?5(o;*9krl?#@?w{~NSdNI
+zyB_ekGRn-}mjNaPeBw8lLPs~^VlQ0jE6wVnU2m_(<b%bwt2`QN#p-NUB&|q!`N<%U
+z`3VCqxT<`aD7l`SH#$&q8gHxiE<o4op6VbUPLXX^wb2D;TwIiLFeICa=8tsV1?#vP
+zzLvqcbQJA(PJ|WaUB2R(V3$@3*k}`Sxny!8>1paj_B6$i2tRTKtm&bLivDw{{g%@y
+z6YRsPSm%|w0%3$hH-aBP?~&_8sDO7*_-s{3ajs@&5ibqw(!$7a5LGDk@-uzdViBRJ
+z7V+`|PyOz%n-5#*<IT$1qFI0P!zCIude$dtntZFj4wXas*SJl3FoBP%qsnUV?!_|@
+zIutil00MRM<O8M882mOD4+!uyg>`3ZN)!PT79TpR95=i+F{COAU3G84RKX*@y=|W7
+z7@Z-{cVTE1{t8VnE98rBywO()zejv3fDB%EVongxMQ<scPG?}{no)AD_<Zi`RMzX}
+zVgqjUE(UZAX;l98L=m{VI6QcNlWP4L)aay7L4mqsdQ8Ve_9e}vYOz{sYx`WK)fa7K
+zLCuqe?-TW?)^zDRT>rXzvl=vZaKVp^{8%ES<@t!~JoW8Qb>DQxh+A8euSr46Pqz+<
+zC<f|sc~Dds$0u4Er^|5aM9Z7Mj=qRt=scu~L(M6VUc3lr0RXh}eg<WIVx!~;<194E
+zC8E_^_l-Gcxs*q>Ul9*v>bEK2FKKW<0#dfOHX9_CZznc3fa&1ZDe^-wl7=GWlG{Zs
+z1&zXG6@bf>??4|uGF2tan*HFt{1#l~Cu>)d0!<!)>h#;i5`)CjDTeR659SKlN#y8}
+zFh{_R@Bsxv@CdP>DhM@;uN-4QD=%0pyv0;t)vaI~p5d%-89MU^3mWtU1oQ-5fHAym
+z|7Jg)PlpLfY9&F;Syf=|-40q^mjL9V>k&jw10JKF_CQ<*q10VmU*x1wZ;*Y-R%`QH
+zgduTn>&1Cra~6j&0---0k|Y8OA8M01ceyX0=iSJ7{TE)x-&-;ZVHt&Rk0A<Kzui*H
+zU=*+x){w#yEDd3taTBS#(%K&&`$Iuw@s>G9{Cjjv%|$sLpM{`g-GswPJ&8&xKF?xp
+zWVIhL{2b2{J=-+hMrVHo1{--ZCludDq;x2i+7aPV^21yunHN}-AHK-az3zWmqDSMQ
+zZ7eA~uw6O%uDsY4=RAn>W4G5Yr@h4m`=!i04TSO}Lw!7@?!AFB_%sec3!VqP0A=R*
+zPvkVz`Xsw-pWUcg$~I#gC#0ao<UgtGQnkzL5;$$yM@=D^nH0XGC_f2{cgsJ15BGf#
+zhmO?FFUHz0rh1sMNq&PiB%m&pJ9)h?3MFFNa)~Ik<IWNBR9&Nk4vM4}2QJT1hddF#
+zs`j0$uSp6zJI@Ik?tT@xLb4gr84ws%5oecv3_^2G>fx6FY9=#PAQcNy@`s&b4^}t@
+zIUsI)#v$5|mAz5O5Mxnqq~Q6k47hC^fC`vJ2;h_>`y`(3ILoc=HOc64wcb9(LQdqp
+za3)rRuFh_2EO<D=yE$)_=U*@gg*R8h{e(;umfSkIJsfrp94vMN3yFoX@gP~gJks<#
+z-2d?xA(K$Wd!o4Aj}x3$UkP}VvObo@8mckjaQwVYERM;=(81r@-lQ@IP-5@vY^2yz
+zMYrQ-k?FhFbvkWaonsl&>t{#=htr;URvguco(G|ok=CVGuJK^mhX<yL0w+i(wJ|kb
+zHouK^NlzA4YMh?VzNdxj;An9+y=!i>Fk8RySuAKhUE6v+GFo-#6GhrCIO9qS!%;W~
+zg_|CFNT2M!T65Z;&8eaz)%PV)t^D2lvPl1qWh$&HZzZwaF(iu)bd9AeL0_htt&wcT
+zdP0>cEEQsA)~<G->&H?FZ*8c0&nGy0bT);L&!QAB^kHdx=%3{77`<PkfWZG;q=!EJ
+zN_3EqHUJVyGd!N)_ewsO#ERtqk-e;g<v3Qr(yz3RD~}NQgANM&761Lr03hU+?PQj7
+z&FW=h&;pIm+98$$=OiWT5v<&$A3=1pYfUgzXFZbicREto>Z5e3BXbBvfX*LnA-vGg
+zVcutX!pFu!ic9xm{?@jG(}-fSJ5W!DENsuzfvGn;-;UcBogMHa7gj{~0%?R^9{FSr
+zS6$jL^sg0iXhh~{40Xf?m=;wP!oG#>#W0cX34b`T*-jAJ+m9tU*qYF;Cv)6zDMd53
+zjCNTCPLe$(xn`ANB*8sAb4?#h&%Mx@)(J9M@u|0l-u{pDfykGZO{s!giTgfamhZC3
+zFr=GOk^^3g_Mq?`UN3m)h>5ARFGm7&A*k_*LeLerGV4%0$)xqKZ4OsjBbf&gF-$@?
+z`ehJ6%+y4c&z>Y@4t$?axe>lb`D+^OsaEXa_NWX?Qeq;no7hIsV#Gt~`ES|FJqiQ{
+z?nrcUX|d^<t>py|LL_yn%tW@nQ>k1EuI98VU|RyqfYQD-qW>pp`5mdsH!#vZi%P+6
+z%#Aian+E{M+8Vq)(85^?cl!(r{^9!m!QtP5hMeY|=(^F0&T>Ne+9dFhFz-tR)6};?
+z;(a$%A|$x^^7pYlwhe*jsfM?2D&9`z+=jn|D&hTDhD?R=(H%r4v#L;s9I4(65erq;
+zZB0fkB6G^&M#7S^N~_SMpG?HVSeab&d8WosiNKZj=U0#t12$w7-QR;Qk%JiN#P#5-
+z<vjWUF-q*3en;h{#wdV7h@9%hlQ4CJG}(mPG3}+m;U-IUVk)erP1t7q+q9#~8C;%I
+zUCH54)v&HSt;lp^Y`V`IdX}eZAeY0vO?0$IcG%ON*Mu;@njU&?ALwHG5a{v!Yx=I>
+zRZ$X?a~SH}=`fK0Rv!^eW@DvNiP$!VgD#0OKtx_NNN1nOLF(Fxe5sTWLhDI(AsyPS
+z(?{k-+4P`?OkW>GXtK)dlanRG=FjZ1O9r-fLrM7{>Nup<C?@|<TUA?L2upBXrq4tS
+zbReTF`t*}x<xkWvp7FY16hrxpwscXg=Zr05QMtn(WcLmP9Cs(6r*AAkYUD}@^YS7k
+z@o+lhX^qQ4R?)s5r_3<yRB|eQl7whPJT3=-kF}f5ut9ut?cxB1c=mmZI+Ag52hGCw
+z>bKVR>{*v&4=9m2iZr9}n>+zni_tXtzW@tnaiC0M|LDcvKhpg57^LrsYYW)Nz1M?K
+z0i4JX)9e`Xuv=K#cqb!L7Mqc`T@>d@%R`>e23S5KaHYW>dm{$G5qW6EOMD8N{@mSw
+zZc=nes~9mp%x?5K@)vkw1Q^GhiUJJFmfZ!b!im&WdYOf|&VvvG!zaw9r(u$~+F(=A
+zg6(0HZ~WVq_}ps?ksG5h<ILVyYIHN|R_eVfJ@UNm<ZYpm!?N}dn~gWnjpJHMu*Q<H
+zKzvlbDO~+=HXj~#p#IbKBr1yk@*-qcy->QJex!fZUjUYPMyE$5X4+5FopYy-eB7#E
+zmWhYZ;j2cDE0ni?%Wj$Fg0}Oe4kQy`QhIL8Ul}h$c9Sd^*9iBxBAy@$Z>!AKWohp=
+zvg9nuaSe<8j(zdxEL&t~4dM=9(4hUGpt+J1Glgdgd*l3=Ty98oo@V13OX*5_PreDb
+ztVo5dl0B5DM0k$CXvEq{m&kwjxF&S_tN0RnEL`J7=CD9^5k?Dm3BL#qB2&_g-Av$Y
+z*%8i2sB;)3<nUyY>ogP}4IB(VbV(QI6oW(IZ1_2yCtReOn$@AYofV3ash={V49O6M
+zT`}7q?$17<8$3;@&zIl?YJzaH{mV&2g`CO;ogQO7dKD$mC~2aEBX@M3A6OX9LE^0T
+zB^gdYk`3VlsG)=AJ8pv^zDRV3-ugT23-DzAWAYpiWzLr6!PO(i5|)7&M^mq=7~GB)
+zCxQi+0rvc+A^m-SdJ+bKkesAL_NxpQkX)!kk~VPdlW-g}1_Cku91hpobvPWP6+R>^
+z#cR5ty#%zGf(%*3Huk7$lP9BZesRIWbDquqsIivM@3o&Oy*4yuy%yJk7gT7_Z}5Nz
+z2~7AVkU7LjfSOvd;xD-_sIvg?&4CHgx2-UIL|zi=ZBBAZ;?|qnc=@`(w179raF41^
+znz_iYxzmtlhl}Jw>7p30>n{D~OYNkg`kB`Fz9xe4;zZ{m`DF)`Cs(6$XMcF9LpUZs
+zEip2xNI6Pk4<PnN&@m6G2Lml^*vr9Hr^UD+$FEdnsc&?d@}``I%u3bP3^Zr86=i7T
+zk-Az8GFo$3MKn=zL320NWo{~U6}sr86e9qj*tud|Xuloc5>|pV>y_z(8huN8!apwr
+z9o<HCbJPP0$1rNCTP6p~J_rp3btoa;y~P7jl|odQAAQ87sx!Q}^|$w#H<`mva<Olj
+zppN7`)>lD3e4f>xzHq`ozj44;*NlyBgwu(JVqJckXoNKb>nN|5G=5n)Gw57g8O~sE
+z*)i|b&*S)7EFS{;Z3;S&t&TZbv8IS3EBKe@k$bN&fLcO)NlU=8j6j$OhP_~DsSdkL
+zLz}6Tzi<K&d=U<y0u4|ELWA_xFt*j(`hdGOWE?eXjR=p|2lTArI4dDhP`F!S!3r62
+z8xSA!wy(&aIkLN+%0e^WXF_#hQOYs*U_Te?k>A_QN`DB)jdB2Rb1}8*5Tja}v9|nb
+zaJ{mD#Ur{9dY;sk$oZ5b$w~|<E0xi~G7S=0Rfwohv|y%6v4np2_@@xDtw5Qs%tCK4
+zj>Hzn!*oV!mj6YGR_k{$c%Q?}#k5y;M|SS#1PSpjcrPc;U_$b2xMpjKA1y>wH2Tt8
+zGU1p+&3g7RCA%i#T*6bif<K5Mvx8tUK7|%YY_2whIqg&V2{^5LrdhTT#=mVA-OO&r
+z5$IA!;HsJFe+*EM3;aHrD;J<MMtw`gCG^Do!`EC0CKvL*^<>pK_nTk)45y+w?G&r{
+z2=61Fj7lN1Jb=r|VX>n1<d{!yq{_mbXH#gM@07z&2mKfx%*}?1Ys85|oU}@w4g&V=
+z@&+Rz+f`A2O3tN8qRqnMpa#x2aw*-NCVgKYhEZlx&eo*DIQ%uG1OzH@Rsj`~XN8gy
+zP#A3zOqhRE!^H9I3l0p5M8pP;Ae&En^$Z)UaC32EQgn-*1@gMm`V56!lzQ~Z!0}jO
+zpmb8vjqS>W^Yw|HMa9Wt+T$s7B6fO-)D+<tPeo+bmw=5NVr4=PO;o5#WMB>DJE^ce
+z<i62EO6*yC9_QW-zQ!^P8ssLE`w8tC(98d-nJ*dHjwzaK&s80$z-@G^RaA=<)I*$I
+zSGBrI%$BM4lBzbaS`lVmyuNpbhuA`dPg71Npf<H#4{NaA)&myiZ5@?OQo1<Jj~E?_
+zJ2g-|4IGmjKd1yxLk@R;(zeZ()kZ2{r4V3c5JZ$7PZ9#~>HQZ4-t<2oRi>f()BXKM
+zBXpJl2`1wrhlfV6oJA9NI~FOn+XxN3;W}H#2S<|ns^Gn16uU@#eFkY`B(l9nechem
+z4OTW~#egf^Vv--Yl;wK4CFhFyy8U)(pWRLrR4X@dwaaHJC1FLe4e%H;r44WaeN~lg
+z(M-isb1#I(jxMEJ)U?=@i5FCroCwZg@u-loUh*`MVvH3yYYAqq*cPi5qSu*#2@AB0
+z$8c0@!Q7US#iEuRR)fjL2$92(mpf8BOBf}KObeU}dG01WrjtvT>ruNhxSww#vlvcF
+z|HSkeM7q78H?}dyk87tWp45g7o2m#YIar5Din{J2t&?z}Kj{SOnU#mftG)*IA9a9=
+zduhNNT)&V#rE{nGC}-ee<O`oDU*l2RSH{|f4!*+#7fBBk+g!Q;K5-CxJM6V`G%>;m
+zx-z(qM0Edlox9r8Z7;jp(-%8=qMiKG9JfCT#h~|#?9pjPhJS2<WLil>ShwW3#!X#N
+z_>MJCgOw!9yZH3%Yn8*|{4{Q?Wggk&txC~kq8Wh0l_AK<RovB!rq%jpOZ*q{)_w}p
+zW9-?~_reLFfPr|@kkV-WP7P7ItoG1LLOR7fRW(Y1%Uw$E63zBYG^jp!T5D?|4*6#K
+zXKVWozZcns9{EKW4S-2s1IE{D`g6NGyzs$mX+LYsP-wc8Ac;H6{Vu)~Yw^+_OJ_i9
+zN<JGSR9O};nIazyzKwZRTD;*jd9;V<PXnTDfs&6oYl6Xp)4RiIEWtWbdHGCVhndCR
+zw5qdRx73c`-JGfnPMB38B(AUM7HIvjP(ns)Lv$ac{Voyvo4DNsf@k`%wIX?l>K$ej
+z=CpK5Ux3>5qfH#jLUIE1kaY=2<ZS>YgawTqDhOcs2wNnVq@bomMFQ5~z9XGxD01^!
+zTAhkSjg!ImIpJK+`KwYPO7O^QrCuQAd71O#b-9A)kR;f;A1;7=D90BUC`n6%BH0)p
+zN0tmZ8N#Ouf`|wZFy$e~3g#ojE^zp<?ID9nwGs39P!0SLOu6S8E8w2MWT+7=S_>qO
+z|Fk`CTX#;Oyw}VTLTAL`-GZ^-^0huy*QBRVkXll78NQworC08kSW!h6nUUWATOxGS
+z&@J}VSF|gOz8>k6=)UB&o>UYV6Bx!7IeASRq1^gL#1BTk|FA$e&ff&*YJQd`)iR?>
+z(-kfky3KwuN$kALqvG`mIdsA8P6exL##K}udk)9njo8r_xmF%GSGe&FMhC~f39G~-
+zJ)il~t;jj{;~MpTd4v3z(MOPo?t)r+KyV-*Vs3<i0JIK=30eQF4v88b9YB5K@s2X1
+zrF<o}*(|ns0)W@>U`)#?7+S+C8Q-RTL(5XCH><2H%ya#P{>Fuw>{?RyaXnVzLhAr)
+zvQ94(C>DPGY_}I@qE~SgQuDiqG%lKfUIt`>KC-gcb~fZ20X=lkGD^K4@VSZ(i{HdT
+zquHq<_-nPKr4|C}*Y)7QF$tG(U4%RW#=_T=aKsu(9|z`bCQbN@aeonePL(0l%CdqX
+z)z#B=^?gw1K*S*_3i!{EQ4xx0lLAcn(}fdxg*xNu?z({5X+qM@hCAiP&N<O|0?bms
+z>q`HCfJ%H6l?e)bK3^CWtaJ_<dQ)7sya=u;iR7X<%VW6trF8L-QH+4C#Q0au=r#5G
+zlCPz@EEi|@bDUSGqh*fdFg?|}8Hs}jp2{Oy>S2qz#L>C*uGhN17|$yXJgSbt?<{%h
+zc5^E%2O6JEa%1;67og+L++=bam7hwlv{SReLW`}&v^GI<XGLDRqcd;0#>Nl+$;`6E
+z2DoP(l#fnM#d!Bia}|re<+)~AaUI}-&o-IaWi(f%ZsVQhK4p3Zx}7C^twxLMsf;vb
+z64*>bYpx8Q)x}DGP;ke5sBBIXh*}NaWA9}8h!&gv<|j}{BMMggQ$ioIyS6b1I`JXG
+z(aWNTM7Cf8{V9HG73?O<{x#pOMbzZo*n%!&oCx@)$<o2|0)#Qv1;&FfQEH8cEEe+@
+zA93Xz|J@vHLb~y30k#o*_up3i=cA85YnVtom<z$GcdoOD0PFPQP8FG*I8lxNl+Q0^
+zC7=b-fBN%`3e5W^%a-)I$_5h;gF7_27Ih*Z+_VFe(WeTrbfnj<CDpHp^hpoqSgt|k
+zb1sU;6njDpYFPPIqt(d^WC;9bwK^sIE?q@q<%ttZo)ACm1Ob+=>yrAn-t|PXUCqNI
+zY_+&glnEVmuyqh6;rGp#V2Rq`XzrOp;AB;uH@2yx{<(Qy5l+fbzCiLaLxMDWP#5U)
+z%^urO1FhWPTFrM=d-NoA78W;CYH~{k{1$M1IV=yH&hv4~(|HcK{^?$SZ*elw*;3wp
+z?ssZM`U?7J(@DRF#M05Wh@PJ%sXd<O&DPme7L!LxF@4}=raWZ(Q$)=u?5PYO_UV3C
+zpF8dQ+IT8u#nzRa`M6}dbVxL{vL>s0rtGorBIlVCVFv|LYd#NueU?+HTjsY1@SslY
+z9P{6<IcB?rqPBgg8BIwSItp<XeNbR_y^!SGg+6yWUP?{5&u}>!O^6S5gP&>pt|v41
+zG=gUS+71Fz@thQKiIB~YHMc&c`9XzwLwb$e1j?kfq_@!~udsVAVASX0>fmm*`v>XV
+z6poUb$nJuaxRIi|nvV_m#Bx9|rhhHHSFuV^S72H6SC{yK1x_L|wK%1uM-Nd=lf&q5
+zn48g_tnf#Knca^9cwc3=3kzw=GD>_Y%IZyE{CI8BQ`7g3eH1&tq1~zV1n;YjTQ;;~
+z=F^%F-!6mYV;%CqFJL03ONHZ>2o4U6>Rc`5f14`9|KFyncYF2sK5rpymxGGOGV5O_
+zZl7|#vh%pBTTKAaFx?jotEPtB8~VZ5e6PbNPQ=_A+laWgq&C}UtTA)3hZRkn|7m!&
+zGhv7~D`3*JJfkX&^W6Z|7iRZF((Vm4pDqOi(F%7pfLM_f6^ColIS1I*d%4tobi!E)
+z+D7zH4`q=i?xE0vq7o}VEb`rW)32PEqFlw7T2toize5j?L6FMIcj|u>I2sC%%X~Bx
+z<LiK2Eo1?6V@GDHFqz{L-RX|KI3S@~rfdbQ4<F{roQ3I98|0`XA!YS6fhJQ1vY4=r
+z+P{|GI=L`2%~TP*IbIo51VKY6{;0%8EymR%XKu!TyJB#xZ9{z2^0L`wD5Bk0d*=L@
+zR{ZKXFV|u%pZs-UuQQp|Y9*n0PuOs%iAkeymloPT7lj*~=VoUtj3L+uG9_D@3{Mv$
+z1%*9O@XSTC{oaIUBLobwZPIY(mM2mw@;zemjHH-nG^%%O8n2${b5&6#2e&w1SmByR
+z1goVOR97_Rh~y=?d+_!8T9<RLB;AI}l3<Co3<h6I!IM$m!Uf}TT&(mvV-6@vVaN!y
+zp0^!Hv^)R|MSNm)ZWG(x?(5c>@e_&+s=n_GwRTX?q}aNJ8|<$czn8?F6a%E4m=$pX
+zK~GiWVy=a5RhhAHgK4$u=NCP;7@50yHf9rPIWNOYqrUX=D^z`8zZXhD(*lUwlk_pD
+zoN#hJTu?Aswpd1xlZI&SXf{q=03ewo&pcEvL+u7Vc<jsD#~2d3gA%#Ozm%s5_!Hjq
+zUmI=|jmhjPwPIX|spB@_HBGR5pm~(okEo|wm^ZJfiXUUupT@o2?*0ttCF_hwY8U{S
+zWp>i_;ascxC1+gj#Gfd(F<1V8EkNT4y?tR0@pZh8EHb$P2OOV^?XPAN<0Y!8Hi{|)
+z>gd!!6bIGJ+?adqsBD`W)E#A&gaiaTetph2Vw;V?%`pskSIzX-kp}Ii28`wjADqu9
+z5x+aq&IcMA-eR_jXtzQU=#M2F@2xl5YA((O<r7@qggy4x<?+W3x>|1Ua4*Lgou}Xb
+zthNd+>Yudb)s$F#((KBwVFsRVcNKmUU4FE1F*z9+it__a(fIMztxZ2;UOr1hTAm%h
+z1|GUj14WP4_BfZ&2)pMasgEC{a~B2V2I*Jwf8yh+5%aKS$5||I6vgs9*|k#@UFY}6
+z7+Y_L<E2VFMtJF%mr~KJ9Sy;qO;|f5H?O#%4Acj$ULMzoAFAOE#l0Uo72)8s@Q5Vq
+zWQNNygV_9{jn0*S$oYM(QN=N!NGD(+&@v6gkm`|RtvCJdM(>13KS5<x*a3{!{50?^
+z0&i=lQBe9Co?arvde0&|U&dT4ZF>+whN)xsC#sUE^9r0UQZAVW-`}J8Qz{<L9>KdS
+zlUL^cqBB&#T(*|4VyRPz#rkVegezP^d=x5g0aBmey)|K=Rzc%2n{8AH0RQECZ@+6M
+z(uc4g=pmHGBPR%ru04#-KvyIF%?8^^?sSN?iK3=osxCgrZi*h*BWq4J)Swg*Q+%qM
+zk_iqxh(R^{HSH)|^NSi~n{mcX{LbeypqL^PS{#55zatL_%A>1*#RH&QOL_RC6$UB@
+zWf~VWjt?DRZAn8jO3QxZZ*J!gB!OO}-(`|Egm(m2KX!!nANR-MFnm?I)A5@>?wFD5
+z4G$ksGCy>%mQnp(92)fFclt%Xe~etQZicNs%pQl)W>G({T9*P;nO>9RN*@xW0-w}3
+zd32jj0{OeVcLXHyKu|1^RYT^eO9r!Z#=)D*-QK|nFUMhIg!5{5+S&p&;w+=_5Gk{4
+z%*=r;j})Li=M@0@w&T+v0Dh38m>MxE$)OP6M{uO`#Rjp8ZmEI&<nXgaU0v6Mb8ez8
+zHbcdejY}qb_tT!ah2-A9V6kzrgdYFo8WiU9F?41rCHI!xfuE+l2KI<O8-^HT6pDod
+z?au`yWgZ=7=uCUS=o+w{Wc?qln{)XHj=OKb-^1tC1jFD6SuL}(!KSUmZtKRG?w!ZK
+z|5X&Km2SFG^N1A<r6%huP~l1hA%dkS($MI)%<gXpq<((F3-;@QAMRtjY1_XMUA3F;
+zq<2?<m)i!sh3-G-Jls2>f;KXPEC{<Kt6#M!@L<i$7bgh3P_S@En>1bII|QIylShwC
+zpCL6?E+fwnf@z(lCzZn{ys;p<hfrP?bhG8~&HTpet8QRE-4M8wJSn$bgmVCRkIi8m
+zEL4%zt4C-vep5eg9avLxpjnaA=4{73oto0_sl^BDI>A#MHGd3kest;~B~@z|6Ce8;
+zsf~cw`YFV@d0luK?bMX{a7F-nIGVzSJaE6QD8BZuCQdh1RHylzyflv3e%XN9pQMq-
+zFlbdIaxy`7LR<r#Vq$#@7;(WvcX6Dr%VlZk><7t92`NSaV~~VSM{JgGP-`b^WrIQ#
+zp~e)WOAbcRb#|RE_^o_xDHChsj=bZF!P+|207;%@S#*e{!x*)Apk_+Y?I@}WAS-mt
+zw)GH+1HIxC=QycvYZe*+GK#!3gpzVd-<UpJLCfh))Y7kYl}vhFGc6GLk8BJS>yiZp
+zW(?=nZU`C0bhD$zbZfGDd^!}@nlUlcpriuWfQFF^0~OdZ478_#0J|-X-KX}J7$`&z
+zO!)Cb?}H+pDrpi*<Ei2x?cuh_`s2tj@wqZ^XWR!et#Y%!gxK6;rG@W}`j$zd(?wp)
+z@c~DmO2=@2N`w<h*47%>{$QOl&Q*a`E3aotc%+rds{J^`tDvzx^JnNX1olGXAr5%R
+zDxrOkGBJig_+|NplD3oMW?TCpQC-%DMQ$5S(s|D6PA8ED@nhQ9IcS{Y?!<_^d0r||
+z6qynEZU-MP6<K!f!Fr*~kh4AcQgmR;UUtDy2D2x}jqa*J%nZR!dCs+%aW`W|#g#Ck
+z>el8161%~89>97+ZUP}7>Ls1lS<_Ybi4vR5roZ5(2L^4wtaC`QOe`^)m9%au@Qa6F
+zgi{|%)JN07A(Pxe3IW>6hP?cvQ@|9!^IA>pCgx)05}U7(hmNo(A&`0KmJSi=BK{|V
+z2s>ZIlHHUj5igju;Yw9^cp#SsY1Ia(tvzJNp+25EeqoanI8zIqEcg)cs6yGZoK+aY
+z#sG`BzcXTxc3j@8nI<q-v*_Bs6)>P#yPjUpM+Kr%KdNPP(z2px=Lu4_J#R<vXa8fZ
+zt%SK~$&$PXH@^wMMOj85NlPzrW9j&TL&D->3z7QG@lsV5hjZDnj;RRE-B`c>MbQfc
+z7g1=A@?wj3{q{)__I|M-a*tbW)N!6CwZ}GAo<aF-C=Le6KFo*kRJXo_qiGXeCtfFM
+zyl$v;bks+Jn1RTp(43lLl3Cm?wnJ%9#iygb6}DWisjXPVvAQaAbA%ReXlSe2z|BJc
+zR`SF|Lmy8HojOKFNFi2|_}bd?x3_=+H?CRCICE5e$A-q$)r^+qefp^L3Xml{Ku{>8
+zQI_+HE?hT0a4OENsbQX;LT+ge^>~<X4L-2_QGifTQ4>D{a?s7F-RZzaQE)|!KWQE5
+zWX&$I$aEHI26G628hDK*Es^VXtGc5G-<B$r+7~OIn<?$I%ZHD*3DO}11XOqvsVq}R
+zdC1qz&U@EGEdo-eNIBx-9Nd=fZ5i078u-u)Vh^(6PMYtc0le88K!qWnR1Oa#M-X%^
+z0eDX#OX9XBgBp~16QZahjn6v|M*<Td-yU*^scr2$-%rrHhYqQ5=GhSE6gNB2q=yTf
+z=4L(2(l@3F4i-16;v=i~X&v4DTTNxP0*?Uc?!08q6jD^O4<mTEZ@7frlONF|vtjG7
+z<$Ftlz<@9B`8jf~tum$RIH@j4*TQG_kU;QPGco#}CmlV4G~ic~S0Wtb4@^j_WU)=$
+z?uZFlrG@(Eq8UeC<s2YZs=C?dtoQ0S2UY5*snNk=9B$?$h`7KG>=HZbc3qP12RZJw
+zK95eW?V6tW)wZq>Z7@m&(HVMPx_EPY;USPISl_>x20_Ut1WQHlN|#CB+LH4eGBg>s
+zQZ!)k6r<&&gVEa8f2C%-9hA@Z$@e2EQZ1tJ4{dKf)sSd4o2ybYYOWD@JCdgk7)le5
+z9}DSZ+rS=rbw$kRW&iPDrzoo0r(pQ`vXVHj5dhi1$MUtx^#*g(LPJK}e7RiW7DD&E
+zqpUZbHE#HCFEe153{T?Mh!Cq|w&ZRxW?;g*g=$*yKEe5ysM;6dNY`R&$W_cAW~A|q
+zTTAd$1Gs^6)SAP1;G#smVeVGl#2zXcjg_kPy$F5MvZdSTU9PlURq=A}U9IpiS=nP(
+zO_JyHOr*pg1*)eI?$~E{L*6J!3pAfAG(4sA`2Jr2)H5s0dZ{5Y@ns?7?;d_P>LS#&
+zmsp|HS-(C71G&q>)SQ-6SHVZimj_&ebbDU_05g$EL_t*P=rFl+sL{{y<k*v{;Le`D
+z0(eLI>F%F;&|SA&9CJh6b-})2-BOa)3PrTI=EyPQ#M|mA)-ChToA8%@$hf=HkyB>M
+zxi%-{Tw89H9u)KI!$k^J<+=-L;^>}VGWWz3Hls8f+wzye98!Z}Lx(o;mM7Z-fm4IP
+z86^;EXc{Qn-@01H0&umjmL`W4MC4%+fl6k3wAmy8XgNT}BzI%(+**{DQGQJX7!*i*
+zX?|^&Uw%0T3>csu_+|Y%y!X`_%$zt%?UvjhH$Odh0l)3Yok%TNcnZtZY74QuKxs=}
+zULN-B--qFYhHA*deY1r}8eTTGb~XO?kyYpD?aC@E*8aK?qxzr6#fr#^$qnbDPo0@F
+zsb}5V)ktjD9uf2<?_T7as!dwQ*>JSKjr6CfcN@(o`*r8;T?`myM%y-RgjzWEF&7}t
+z6g-4wemL{6ib>HiDVcLzga5IOIQHt8E+2Do>~k%-veD<muZ-8xzi(fKq?>%F2>>*a
+z-DEKhZ`jEi*g!MiE}gp~fQoX>jlcW-M!Vf;ru&VCN8w61k)4%^Qo1bf-non7tet4$
+z|JJ@XY=ICb`4n$v=jNbiw;t?!gSpr6g%)176b#az)U-6k0m<~v#h#)xbfp-}lROYO
+z-4HmV1cFa!ETSxCMi=~*igTAx)~d(ho$IkP+lVm{QKX=&QIJ=p6b3`6>E0@#9lT1n
+zVb{TYbO?)wvor(0Y%QR&VFzlxYr8}t4%`HSFHH*H`Pb_Ry@bw)B9Dzva9RK*U#t>b
+zHeOo6&p%_;mU+14iu<`fo$h6*@jC10W@Tn!#gaGi=NS(%`|Q?lC2{iVPah&>z#t?K
+z=wH8CXXV_^U{Oo|y$<12dQ86J?AI?I9(OLxKw)terp}Q1&o2D)a`W)U>Q8ayWq*Q+
+z5j4+s%Fipn+v{gz<d_T5wr!iUT74;%llLsiWn7a2TsC9CS^xGVP+9SsHQ2js3$D0Q
+zHY;a$?1j6rdG;a2fvE7)A&piIXSoSyb-X>5ojVAeQ365d-xiblcEnR(ev9|#jKJ6)
+z5t#qXzfojKz~H{UX_}agkKg|Y`nU<Wby^?v?l%IheU{?YS3W@KpT;0}{Q`WyzYu+{
+zo`wi2nKh)aB_NT3kpRUnzgeQ8o#kYf5Xg)fVDdTp3$%1q>NQZjVLk`-iynlLp`U#S
+zf3vdYIJ>~7B$;{!9DDZtT-2}nZ(#quP3HvuW{ExFZKQR8?>VYp=AMlG*@wTw$4RcD
+z>B#t>-I*s0MG1c{_0tOH9DIA~+h_ffe8^ojGRBK2m3oo~0;d}SXOut?Uw9Yab|;pl
+zJxO!NN3bx!AEm`Ln0ndu7}1kjx5ewRY{_DH_vnNhF7Az_A(JqD##($dXBO_f>udVv
+zFGcH4qj2X9BZ&x(Z)!q90;WxyMh$o|96b9eiUC!I4IOs&D|XdrX6%Deqeh*R`bG9T
+zc+en3GS>aMNU|VyWoTVL5{Ks^N&nl^-E9Tg+~*?6*bf;pgbc3JBu+cYPMBytG>GGG
+zVdTxTodhAaZA-Vq;*{(hBvFElj*dpJUcJsi?PL~^gCPAEMa@t~ess6zoHWK$>HjnY
+zyuSPHyIG%n^2rtd{`bGn*aw%kdo>m>TTkuvT7-pn!h}g95l)?gT5Azj{P+v>5nVB)
+zTf8zobCl;`?t(?g$SGyG-%tz~HUT}7!ub(2<R55CVpI=On#t#WltfFLPI9Su*ho`P
+zxp|s=lj4=*yU+R<<&6q*XA(A=vX&@RHPV0+^h!CMA?H<@j-BASrf(6RRP`3-t+zz7
+zYw)1JMKtCcFW)s5O~9r>QB7V-P$^MRYpnhzUvk|L1wwJorD@SO_jKd;YdF5D|Khak
+zxOC$ACfqgA_z<oAQ%Z!dSRF|GfRpWm_^J>K92Fqzlqx^^lJZYL5r4yRR(=TxoW^#}
+zGB?CBKnt{Ww5(G(Q}q*+D#%s~3lMQ*Ep=2h=SdA`ZVL-J!DC1JCw>-=EnmJ@v33%b
+zNFf|N$pe9wLO|xul~-Pg7hinQz42>gTi(*rPU5+QjstKDe+`q~9D-3}CmoY*v_w&^
+zc*8My4KM0yY)IX|pGrc7G$+#0(jW?niS23TckIW~@V!&Lc94+SyXUa-wx-IE#m^jw
+zq{Oy#W(1TLX5!$XOca+gCWBuf;;Bm!M<vYPo}AdnKv1<|?a;AR_>tnON^`OQ;9<(Y
+zD_}JFBPPBL+Qibdlc|m|CsGdxYznBkuSbZ2O(J1)<n<Pxh~nL$U0YD;8;MSB7-UAu
+z=i-xd=pb_G>eZcOCle5nfHu*z$Y89CjKir&&&;JspBF+xBhb1{djyI*=@uqORT1{>
+zJAj<LVk)glA7arap)EoJjjW&MlCJWtw3Q1C4n;znL<EaFOD@diML9TdC><qqmSi+r
+z5F4L>*3op3brPw@QI5TP_aTQ~r$~Y!C^Q<a3FC-R6MbS-Aa(CSn(w+4)7W=!viV!F
+zeSsz~RFoAUH8mYYj6EV_6CE3m)^QOnSDWSBvNPb<!F>YbQZ<I55fO-qYmM+Avr>jE
+zDagV>Mg=UR>vCVtx7gNg=ublC8{e%eWBsYfFQml{ErueaV~~&#PahL413)c_qP)Wg
+zk(rlI2V8a%>4AufjzxSt{gQAr$_jIEC?n6M-%k>RCJg4FNV-msqz6X&y2v_&%<Me+
+z$M7QDA`sUq9wFil>ZFsvp%@4E>_??{5K>Y)z(mtT2VIn>vwb<aoE!9b8Wuq(L99c}
+zdu!;hq%b!FhqH2NMqAA|E}`mPM98U$A05_mr0?I0LZ=TpbxL6!G#4%_LfXL$&_Y#9
+zBm&Kht{4~B3TB!_mJmK^^legB$+7VdLR@?+#Dq8DRrNTSRHG<AkMpiT`O#3fS$<Gx
+zBo}OYafKauRE*5vw^c<Y(SX1(w2F^IXb>I0aYV|C3z427>jFJ2QZFSsCZ4)k;mV`w
+zaaDOTJP>FB1X{jox1g}I^GF@ixBq|#A9@P=3hDU9yAlpl93Fo1WsL3L#%*AATAPx&
+zYXxq(;b}O0DRbt6SjXL&rFB2N`S#0b<z0j?-g^#jeD*W^7+A_lPmaAO{Rt1<c`f}B
+z2+}(FB-R`f+^V!_FaCbpwFsZ~G+w!Fsw$|?QHCX7{2R}_u@HuUK!%7dMEil$@Q;V@
+zL_D1irEOo1zdiUg_Lt}x=ty7_kB6Un5o7zcX*rUjt$uk~1p~~b;ibRb3VWaH@y|zY
+zqQFSpL|0+fYfoVI%I&luU=&T+sqi=O>L>A!>joiv-x@sq^h~VXUCv-tv;o%z;ih|@
+zz-8lm(Y<i<u&81DjCD&s#$zvhh@x5xd|{)9#!y^&!^61whJmO^-;Njm@pmlWoI|2R
+zM@K|PTy^{3am__TVYKIC;eTGkOYbeEOALx0*w!w?r{ke}Z>HDAma(HHlH`tG=Ha0y
+zUq?oz0sdU{?KF3tdg(p*%dNv<%iW9z{`>&a$qn;SJA1m5j!nW}|M3!fM_RFT&f9qP
+zods|h{M3TpuFpi=fA3$=k;GF=lG9#+jbG2g%ojgG4*l#KX|q{t491kJ@1ip5DAbmu
+zW7b<Q;KK!LVP=pr2_!af(v7(L=F1Uca$@7kFYv?*?;+pLKxaA|g4^`LUmtoD{gNUS
+zfp?-d2tinIcn98m^a*^m^AP;#*sPkS$8CCy!~GB5jpQ&d{IcW|{QafRNgy*o8YxB{
+zbuc=OxDwC*Z3c4ptjE7z|0jOflup^a9=?`vTy))CxMI=}72)(mbvL}{WIUBEtG>dE
+zPrL)~?i29x%!g>wScx6$mf+Rb-@%T<6|AEUL6J$g{<eECeqa&`5AVeLZ@!B8D|V1L
+zqke$dAEPe12{%lih%n2^eT%guv=40h8LvF~JaQs>Vdir)k;Lz5$FJYw;fG#BF~e~i
+zNgV3*CM5P6fqU-14-vJg`0Rr>@#$BqXs%8D7>YvrkDZRcTz@%Y=)A1iR9%AQ3uoc&
+z4;FyVP?fVRFK=HAoje2A&bS2L1sm|u`|soX)w>me<{uJ;371@rX%~#4Np=ywTks!z
+z_{9?Bmsk~NvCDvQxbE7k(X(T01B<a{TjF`Z0|5nr7A)DnFG$rmityIc58;~)dFV6#
+zGF)--FjO8`fd?LY5jhpjo0^?UZw~HUg$?PYXp_<n-MjaoX;likB*em(PJhzY&&A)L
+zdk@x-&X|7H4D?Sj<0I-@yt{B4_j9L~tOa}U*?aHd>Bk?%m%r>rPC@>Wf^zmO$D>cY
+zf;>Y!F23SwjOrbZMIX$>^Rs@T9|^+dsfV$6a{>B}y9}2TX_oI@h6f*i1-W!I)v`qI
+zgvDu?`_X%N@%hK_$@g23#rX7EqV2u27(f2H4n@vDq;&6&9)w5Njvdi1+@G$M3o!e&
+zr!Z^D4kQnsg6S8J0&+KE<`Yk1Z(a*z_2f>J<?O_Bk3EBZRUsIE*)^DP@mT08_u~1d
+zo~9SZd@TLoS-dxA4dVNZ#}(7gN08$HUU>2`Y&=|m!`r{dKc0IB<pFJQ@#Qlxu%j7s
+z-+cjZe7^3;j`zec;I6eS6R$n`7&he_Fyg{1F#Xc=VXjWcn=jL4_}(IvX6?e-{f7~f
+zkb-XPdylSN&^e(sf@lSMc;9Ng^uk+o3KfOPmtKa!U4pUv^EdGd36_@mq+tJx4&sd$
+zU&7|xI*h&G5=@&s7<yXvy#40e*ppj^U2Ep!rMEtZKB@~Yo^}yBML00)jpr52^K*9L
+zUoX6f9R=PvZ}O!WKQs}0ewv4wul)z*Vq@A&ax$>luS-A0dkcSJnDPO*a>g|DAq-b6
+z{19({{wu?2+pufvI;55YN!_}k2TlCCaqJUgLQrEX#?t@(8~<Ih1#Nqe#*~Re;Z?jH
+z@4oRm*6r0Cn>ADYk=wN-kPq+Kh!5X<9ZR<CLO~(91)LlChj-)CxBiLmw-uu2sL7Zx
+zq6cz!uEbk!yo3FjnOOJz7kKZB<p^xw4^yX(L%2Q%AHDrL7XEVJ<i15}pys9T!d#Bs
+zmp`vZ9_y#{5KiG<9N3PXx#fuM&_%5U-8v_uV_Xz`>dLWs^|yHY!}&l&XH1zo3GITd
+znDg;l`1IRN%HQgd4mNS(EYHW@{kxE5^Fq9<{O-xgXd4j*y(14x7tX~O->gMQVqZ*}
+zJOcjqgP8UHCs_8&RuWT7@zF=0;;=OkBPUHp?+!uu`Rm#Ea>2JKP;OtFsMM3~fxrnM
+z@Q33dRAjHl`wO>X&^6EEpO4;3?|szd<)V7S)AO<Rz~i{Eo5pHCL7z|hR`#Bqh)o`X
+zM<2Ks-rP}{$<_@g>&|Sj<Ab?hAm0{-mtKAumvjk%bzDa*{eA)#d^#KVUD-?Rx=*&k
+zvb<gR^z$!J!QHg5^$ka4&~;e;&6kXH3B3HtOZd~UHjM1n2R|(viLXEX5AM348XtYV
+z9fPia0k109&?8>qe%$=*Tx?8x9OtLBfYnJBcU92={CD15#xx)%U<)LsfV4wc*mY$8
+zTNy=ezy-J9fvdXH1uWw{goGk2*cWAozQYIee?@Z7X?XP?_aL~=idbDXuKeq__-SK0
+zx=ct`r8M<N<h^A%2N}f52Qy|qhNo{B#t7Y3gxE81#|z)!=e3)$=*u4vn=}NkKKBsf
+zeX7wtvI^s_dK)WNZbWR(H^?mY$4k$=gzE;zqGVzhtor35eDnE#@c?)K&F|sK@hH#4
+zj-6Dbz2`1G|JRFAQ&oz#z7@FTp--`P`(Xs>4<b0O4gP$`!{`|7U^os7g2TdyAS&?H
+zSBr6=z=*q^`aABwup1Ftf9%*W4L^M~2YL5ig4pIb?d*TGjrR4rcubmh3m*ULrKl*%
+zhM!{(9{RMHem8QlVd-Mn4GDPYx#w{~M}Hg~)COxN{TYin4|@ehV&(QST=d|xn0e=9
+zid!b4<nRo9x_BXWKYT0tM#<OGbgCv|&M7WNY?t%#^z$#FW0(`EgW|Aq-F-Br%O?xJ
+z8pXM}=rUk39=m4-Jp_8eLhpTHVL>QmV6_F`Z9<1`!|~KV9zk0}5t75baPL#!V%3_>
+z7|~_4YYsJCzjlYdPjXUKe->{nMJ(Nfi>qvSS&>Pky=2W{3>kMlW<GvDbe!7()dhHS
+z(I%`|wE_EoS`Gi0UU=}yr!c&=7glu$!>xC|il4q)hReq#xA0q}SI^>XtXwn?pDfyj
+z$k=dlia7uI0XV8EQIeO9_Fenn?z`_t6h#hZf5tmusQJqL{aCYd1*(19;?74N$21b|
+zn|im!&RZYFFH4u=#>)nA?wq*q74$A^Ew4bop<{5>71LF8SpUFadPodF{=OfuY2y}z
+zaqj=+j=M3sTPWs)S}^nFFR^v)G8{%GQc2Wab>|HH>AI;X*!C@~MbD6++rjUt1X1K5
+zd6EYLCkuf;9Dz`onTi}o2yX8`QV|Ez;Q@osLxlG{?9HUlgwswS)F3_eFzki-c;%UA
+zX<1PYf6CiOPM(Iz!&+0`nggG(VHii^K$1DS7lya;$9JVWAq)+QMo&70CXHvjihi(W
+z|BUkoUZLE!YK7DwGxHFfmVP+DPaBn`w<KXq$4I=jcNbFk>_TpJ7)B0s!^R7P1`;;<
+zg-E5$7A+wVDDw<#GZb%p^dD3eY{u1Nu2IT>sxlG}*5X|5a*I&D{&PH&{tacJdUWVL
+zlsmTZh%7jaT&F)qr;J7zchq%sF4e8?7_{;I4-U|=4H#tRL`me?zQJ)g|KjPG&_6}#
+z8x&;i!@)HA$}j}NQdf!$s{!#n#~{IvfF+A2vDa91^nVGdhxVYhAR7qki7`D|scOtY
+z9WkO^2<GPRVz_R4#%$IamHGsx5RAR(GV~eR8@k$R<maVfe`+4;$gU2i4n+30RFvl)
+z#%FIm4TH0aqKsG!95V@{I35MLtUoXXBYSpa{gh4nMPo>ZSRB~GIZK{#tf?7>9bq33
+zl7u@SycdzJdg37UPqyyaip4*rF$!jTgpo_0nP0@9p?xvDlcrY@6q$knaX#2wxD#my
+z>?9uIF{F1dg^W#fJwB*c56t`JTO7)%Y?eUqVGy%H6R$*YXX-9^F@oue%~;QO%Ngvc
+zV~1!G2o==-NJmcP4-_M%GyX+2;yQH4gbSyjO<);{9KMYI(H9+p#UwcdtvmKcJIh?;
+z7o{r>3d0*Tn`{*YSiS5k%v-P#!=_G0XwfR{qSB+T)`7~hLh2(#QRid;g1K_lP{$yp
+zOK*gJ{XPyHJiy>w)s(yUK;QO(6noVoDy9><hf3hGG*q?lTNEzAwpA-I`{Tt(?oS2j
+z@La4sM8cSJ&2F<I_wZq4?JLGRFFiwdrFMkGa*mCkNMgu|f|5$=;&jCTvh>CKYItZH
+z^lN3t&Z>hbqD$={zY_yMzN_NgEbO3;!8`e>oI&1*A$-S<AA^8O>V#D3(I&Ao5~=SY
+zLFL-Vv_i)S_Ah@oN;y}JA)OEx)d6&kK-2L=bZQ%qZ2FWbDx)uNcnE}MC!gnm;~?;d
+zBM{1qxvQn?W}gr`_;;nCkU%<NA~&0h;OS3gC@7*vw6y{yb}z(*81dbr_c3?z21Lz!
+zg~3;>FoZ|f+ntyZ-`X4Y{dQE^fG~=}Pc|8h{%DinPyK;d$m>T%6%15VQU-6vo;a#r
+zsz>VtA2@e&_jf3d0V-)5AAA%xfnk9(13fv|=qdM1XdRErz(NGb*2$GbL9x8FfYt>j
+z*o*UFOp1p!bp!r2b1ByDE5kEWom7mYe}XV=F%soPUz)*%SQvvLzsg-q(?=r6@D4*T
+z^UcAiVEJ1&{D^t8Uc|@C_8?`#bo7fi(d~9Ej8sfhiRBwjRH6&5qw-c6ebSe4kxV+G
+zkg1~*TdQ~j99h(<V3bE{ku_bnx<djbA_b4V{VXaOM`Y{9RrqGkzi4*55%EJV!0;}i
+z_-S!Dk%c!($|})5!i04{&%u)KSHbr56L4_Az5F9+lB>zPB}{j0EEOxaGR{buoojS+
+z6pASP#bM&)I8+uD;*$seg%8&Kiroh?&|_#<_<B<xf{{B7gs+<y;7uKXm>6%Y&bFa2
+zn}n1<^<?B@V3H8aAz|V#fyk>s;I9#}>SiN<^z>_x)MXgjcd*e3&_cZS!Yf$6XAjD2
+zEJ$fj{hHchjz87m?4@upVyaJVHa>s<Wvrym!L#>|Wb|~#!5}wDn=uS+tcWU#P1tww
+zj>@=HCrsjHb@%4gc<-Yx;n#HpZoJ}rta$4e24f>GmLORC)^yY@FmT5%Ni2pe7C-nJ
+zNyz1tsK7|xQK8iRP<QD-$_Jt0IvilAZ!5n=^)ab?jsFqdpNxH*F?;rZP#V<@_uhOp
+za+kiKEFvVRmBUtp;vyTby%-qGfgo=imd}45zpUGZKi_hp3N7v(5Tv4WN)0CN4#Fep
+zD!!PZ#w!Q_A!<*M%FAr1;5@A&F(E7qXGI3)e)uDHrDkDr|1c`ddNaJUa8$HqJAiKJ
+zgF<93ma8^;2gE_|uPrzR`bP+)^SQd}a@OtfvUmcpdv2Wo0)IFHp-$X4b4MZJSlvm?
+z3&k8QfFHzZPb{~`xU0}%dKX+Y^*ky?R%1!er*Olcp2fl+HZb5CcNb#Tb);fO*R$2a
+zz{P<Pet%QaOx2DpLiwO)e`QDGPBy7e5HnXsG4DDSHq|cJXv?PiofaLbj9IT5E?Puj
+zp>1*b^>?7_n5h`vs~yTRcjDd~FUQhv|BW33X3&X@1`l`nvar_(E1DsWTattb$<I81
+z#b3@M7v(EtRv9sv#KG<N-H+&sWeV2y-5S?%=Tyz|eQCu|SI*Yf8w+W>jf<_3D*UFF
+zXh=!}3D}~-bbRy0EX@9V0roTKSI?0b<7TpTJA|2$HE;^<rJl*;X%`^UT#a>0XW=im
+zKY?$^#_lg5X8UDMxQZgu5`X;++ub5F5^CvJmLiwd8-5{?7&PrN=sI`CcZ=ua*X<jy
+zWc609Y!XTC`6i}G4o1;5kYe<vPK=7$=pHoQlR!bTo3$|PcXO$hV^y4!0h`W($j;p`
+z<Axj1?$_0rH~(w=_k)jdUccKhnxc<OQifu}$ez?y$-)QE{}r#y{v1DU?EoG7t^#dn
+zy=Pk_ilYt|UxRW;+Fbn=g;`kr&3~{lwGfw%?SQhwyQo``hk}}1Y~H*Fg$&^><0Idj
+zR)xf)AmK-n#7rw08$~pAgpIrV5-UL>u^J^ZV++1TJA)o=TrmgV{J00huNVPS`9bVX
+z%jA5pVe9s-=t^!tzwuWiWojJ8o<9<1TOQ`mdL1vkwE!#E#KXX*NNg4tg`~bk@qlbJ
+zNTkkYxJT?oKumj#ntCm!w(5j|gL<NtB9ymY{0A0oT7yjiiLi0a)B3LUP({sTo$~F=
+zccx;45I&MrU^kAvH|zFk(cDw7dH#4Ha0~?ga0G&HNEl3YHYzUVvLkI(XVO#CP-^u<
+zd{pyN=3{!_f{W^kN+k3ij_B6O2<7ff(vaap5$pFH%BlDl92kI_-G`80S&KOG_UgE3
+z>_~OMH#!2!@~#DSwEPhr&H5OzttuP2We!A#6C+iZVf(%chNo?VxHi!+)>vucCQ5~^
+zRk4Q;98$1}i#*CzXnB1NpJXsBy)OonrJB;E1HHJ>1TeZChIed*m3#Ly^tM0Dbq?<S
+z)0I+|jtC;3W>?u2J~%I`1^N$M+O0I<{N(i~@ZzVd(PO|UJbd*vm^`{a0=fDY9i-Pl
+znz~twDDq*`e7G1F=cM6KkpaVFBM@Y@(5fSwN?A@s1RJP0SBkv{tTaPxjlgEuyY8Mk
+z?ZsI5{!4h|^+o8|a|G_aV+N*-8jNs%9e0qWh)C*=7&A==!v&tT=+tX4I+CkYW~E6W
+zxizpApn&GChzjD4k~?BX)2w4au8@G{F;p$FS>}$P@ZwuvVa$zBVDgCZNEtF5Lns=W
+ze%;@2sJMvXef{8|8C?<Qo-h04s3^p~jB5DCg(D&+6ngtMvf3$5BDcWFm<5N@Xl}}I
+znvt|{X)amG-e2&}vq<$Df=BL|j>*$IVCbmxP`PIne$L&7;z}L5jvPyq&Lnc|#G)r0
+zg9dcR2XlU+StE%sZ$?rn&juwD>KiTPJj^NaMgpyEB&2e4$!@oCH(X3)Z^HWTKEtnz
+z%5iZ2AzBPL@b*Vx=+G{Z^UFptUyhnzqMwqNor_Y3ANs^Zz`09@;);9}Gg4@jPYt<1
+z#W<W#)_%ueM)7Q}cFjVkq$CFhx`*Gpb}?qItwzSdog`8%`1pf&anUu`qJNJ8@C&93
+zd9jkANp{!XJrVoSd=;THh@8zDnqC)IIuK>{CO4o0X;}_<#{|IN+zbG?@i7L5pi`fL
+zG%Ia|@Bo(YpNN#CB&^-Wu=cc?@F4+crRiq{!>A+B3wZ?<$YuZH5~##TCCS?K64<I3
+zA(dUNV&Aj#%IU^Fgmb1j&Q<fU@jUVW69RuY0wJp7K=cT)<GZ<^VS4{yE<Dxvj5|$x
+z#6a|Hd-@d=t1?#M#w+hZ&kG*H-~Kd)qJ(N}SiA^_Z9%xUYgfb>dgBc$p?x@i9j5gQ
+zL&>&9_#vx?yWR=SaWtEsaoh~3{eWv%z`X)`^&SGhw_n4@pRIu3_;#o~yc&yk6(IJ!
+zKch?Uf#@7$!;*QQVOrlHKJCPRzgPrE)L?XpKlxCwQn%Ytk~Fr)X~(Jsui(y?_u<Lc
+zUc|u8;jk8DVDY9jm;#f~xz`YMi+B;ce)=5iw)Q{(7xwx8or8R1d-Q0ZAVr)o2{#~P
+z`*(Qb^?3*!G7Y!geG8&#%6Mq^R+`g!BRo10{o{kNY~7bwxp6pJQ%P*)XP@B^mHK-3
+z=*LBM8}y&f!Y5Q@ymnX|3U;r=;?xQxPaKEPmdteSKua<<;GZ);fKTVKxaqc=(1Ao)
+zcIpn~l3nkkFU1r0`~`WwBk=DRZh=|n#DNWqv7^`<BNJ25wNo^F-u)*&pSKt>R8q`h
+z43ecg^AOVgI>fZZ6rc51m1X0b#or*?(j7@*<Ds*bV)Lfm<dXOzBDOW6tCBJ2mml!i
+z!gZL`%^&+$FT&b<9nNDPyY;9;RPAhhz2GbKiylW^iBv3Hwh6{oLl{C`BW_PL0M#7d
+z-P_mUvwi6pF}xevgqV;=1eud*gHMD785`!{{s%t6g||G4D=+8<Cz0v$AJ)L`lR%CB
+zZYW-2z=my0@!jfSNH7**<u^-^?Ik`+Qd(qwY+>w{3DfUEn}H={L^x4O{f{Mc3$VX7
+z36m#IK%`Fzw#}W5ZL1ez{r0w~D>#6q-~9|5=U%^_J>hp?1=jz#67!dy59;q?^-s&N
+zyD9*eCibJbZ1c$+5QQO=Zh>F>Z0^8GU=(NK=Wj}}IwuTc$DD_t(#^Q%sdo_3<zhT^
+z*Hnrf^RaH#&&aI_!k|vw5LHx)r3@f9f6))n^$o|ywLfBg9(AOK3_wV8^kGdEe))Db
+zUj1MN2GIiPs!N8E*i9qnXa_2cVdzA~NMBnae%P`aD}U^U+LQpS{B;8kSc5UJ(?~=*
+zwqebRMcBM<1-iC1BV+vvtlOT6;GTUE8`cuyym|O|p7{R<ftD<rzbmL1gFEBK8!y6N
+zUtNGd-+hpp!4=rFDi;^sb1#x3Pd}w>N$7*oU1KqC-gC&wT7wv`Dn>C}h4#ZQ!05hR
+z5S4g2y3hUzuRnM*whr!$J*!tK+w*I0p4f7~15H4<jy~TFbR+Fkk3ZUH^u-u4WGOzL
+zc^5KPcgLa4zrtot#Eo}cL^g6LZn|*_{`$szBG&`dA1KGhH3hijzP}-n?D3OL^uq^l
+z%F|6`Q%Vw<Z^s@(5pP<CXCAo|UAuRJBW){o=Ib%>x|`9VRWh!+?n2!C{CwPT+g*sE
+zR^8Sg8SV1oTa_JtbM*_0G&5~8@+g0eNT+$^1Gg)=uE=8pLZb2Ds~_OHn=Zrh2j9ni
+zx7>#It%I@o$4wYG>M{)Ln+S9K6!h)393MV)7xsPM2?w`sf<CwtuDoRmiKXU~u*8cG
+zZ$%nevjKTK@Y<92QQtzd4-5>A!cBjBm>xgd;k5;GaqGRAXl3!j{;j_vFu6Z2AVJtA
+zECYjj&c%W^pF-BJw98N351XkCZoJ__`Xp$+ehGyh(Y`Ov>llsYi(bToIqPAf>FAc-
+zI}p-qBu4h8LSDOCwEb!=UVG#(Sk<i!6(F}DJh2Zhy=pw-f(zM>zIc1?o47lb8udjv
+zNY6E5#^aYF#`nbXZ)u&$9E71GCSb{i_i+C`cax<aiOjv5aL8%Fg_AEwO6O>Fj(iuN
+zzw<b@{MsGn;tXu3e0<=<TQQ7t!S{mk`1$3}@W|b_5h>BaVpke^j+=%d1KKy=d8ywo
+z2;Byb<xhJ&KW!UI4y=KfJ%t3qXy}V+;WA+mMH(w{&mC#-r*6gJ)Dn!p<|_1O{ei_}
+z@#T;I#48Wqfv>r%KD6fm+V>cP@skI&=vy?<u~vs3!}!zcFVEQr@4_9(+2xOkG#&IU
+z*@!i9W-MCy0dCLUgdpzP5A5HEw*4nz;;51E%4NX0Z`R}e=N`oB#3(vhI*7pdzPRAx
+z^XN0784!5;F)C>y5(2-*0{YU}ylFWD*JUDu%Ef~(xCz6CjX{i|6u<oX5#E0B@A!&}
+zpqYmX(0=d*=s#pA3C9quUA+<C&Y6X+>zC82A_q==6fPLj7p-W5>`5L7oC*Z=S6y}0
+zg<H37?K*MdL>2hwR0=t(?+|Hr>eG*`)f|+NVu!&WeMer2$M2{1b+bxnC*M*pLooXH
+zOQzGJLR3&eP-Mz&I*q`Ce}51?;sap{X^rHB5PCn$LKVHYg~zAh<~tw4#e-U(d}R&Z
+zsH0pl=WrgnpEm|QI>f8HMoTpPFtp;XE*<4GHw=nuk1KC}05_c9nW9gDO<&l!3w6V$
+z|9My9v3svLCD@3(vnZngi35kAZ|4q_BkK_w-5%}Zd@14)b4MGzNt8^u<W}7CmnpE2
+zm`Lc-1HQUS<mHpiO+~h@gQnvC`)@%)So1qr;g^)=Wue6BOV5BIjI&^&qE#RQ$)XOW
+zE%>03)G8;E3^v)RbXUk-rk*VRvAE~2x1kfw;Y<NBNa+woLXH~t_G(0MEUvuqE?hY#
+z*)0}s0O5w0V&ayI{3;!y!oyg<zg9on5EdSR{v#%0+<ARqW=Qfv_D@_9x9ZRjH{W(Q
+z#tcXx%bzUbWO6Rphe~Srhft<`=@oy*wNrX4H{uOzJMLO^JOoL0iboaM{rU8WSL0<s
+zQuqG&^PTr%P)a;3p{>v^E|Bvrn`~{+UcL`*xaD?C?niHlv_eSgoJ4PjSqzhIg?~sa
+zMo+p9w_iIJW-%3PCV5jyF|J(_LTT2SonKBTR1R3e<1uCWb-4AqX^0AmKo@H07g5wv
+zRYuK0qXqqjU4(n@yB@8A{Sg-5j+P>|DCFGmBEsuAXacUk@oIEC1@4tJRa{+5Nb|tx
+z4(QW8g(2Sq5YxT`47HVPLn)OpBQR|2G~9UY#fS|JL{J317IL2DGYoqT&2N*t55u+B
+z-GC8Yqnqh@<G1DetKu9t1jnOqPl}f45wSyZTh!XhP+CgM09q1s?lT6r+;RhYCC4C`
+zL}Wb2CO<C+c8XlucIu0(uDTwR1}C<_{ko1OmGoHIDuSZ1a+J|iskb>8Lq=ahlgA6t
+zsa*`cHO3-{qAG!ZHPuwRvhHiHoQ6SkQy&@=hluEKRMRZCtipycT5w!=`Bk`J+#m$|
+z{o(e3jSq+?_l!ee-n@AjJ9aGmwcv+Oot0P&XQo$mDC0-!#fWwmm)7=~spn{^w#o|F
+zDPOfP=v2eyw#HFKIkc1B=K`D6);?O|Z#bj7>Ed!b5sE)|_zic5^e0eSab{sdm&X;<
+z<flJl%2$sU@K#ooQen%R$X(N_{tZ2C^wp}$GAiIvCnNCq-I2KbEhX_Jun`;f)1D~u
+zaZvtkBZf9v0*>1q*4El+T1OuVK4vOMwuE<ad<(@VM7fx!(XzuoAfUl~qjDbQ^%Zs}
+z`)J{OJ9c|2io9hc5WK0$?q_aZIq|sK**_bdCfPaJ4Q5&iH0XnfovfARs3!3e(BRt>
+zE{u)lfTW%HEgb)y99P#VWC*9JidIDwu*1JW{nX-vld!R}0cN({&;T~4P~CB_2;pqE
+zRnam-lw<uGh))<JgL9*jo;D?*mhlwkpSZiW+wG_&$Ij$qqT+A;CeV=?;VV8Ud>Amx
+z*nseJI_$9VT?3;%x~*yIzwJ5qK%glIoU>RAO*QDZ<&*8qo!!|?CPBtcRH&yvescZJ
+zUZRWF;Gia3bLL?~PLBTx;4g&InM}TZO)Fh`F${B1U{kO;4Xsk<mA>4uH(r)bXCh(L
+z#LdQEIWE_Wgh2qE<TRcr{2}oX$X{d0i-<cg@YDzsRUZ3iBD>wxc=43@2x4p;{t_U`
+z?0Y=X)>u1FHBW*-`8PGc$b~UTDC|=$yan%hF$j{0eQbP$$;V^(^WS1nrSoP8cm5hr
+ztlQ+*MBQYlk|>m)CwU-nIw0WTJ)I6Hddm3SLZI4Vr86f9xpd4nOtn|+*<}}2NBjFa
+z5?tn^&Lz%Je`t1SwZiIPEDy%*IKD-!R&ggPl~q81e@j&B&QMc5#d;v%fx!QJ2zUsD
+z|Myeie-{8^*T0v+eSX-R&mEUG)n)f9tTe&SPKSXq<i4;TT8o;fKGY-Vct(LCu?{w`
+z{1yjFf+-&!?Q-aIY?U?i&Ua|nDy-RU!=xz_5JYo1Px3&(0|5^N&IJTKtIxTBx~I;w
+z0)ZMT*==4t2XB14gEsqKC@aWCc0mahN!uZW&U<R={4t$`L&n$tf@9zv7)=79(Ovy%
+zXl)(M_Ht4;VdgW>A!Oifn0k5Rg^H<XamFsZ_w47W32%?9M|C=5ZECy)o?H(EJP`0e
+zK!bpXK=90j|5*rlQ%PXN)%PKGbTPHaYq5&vf6u<X2$$UUIHoYzO?8bPF$vMwTsMVb
+zB2rLoEkkBTCf!wAP{yD|)pdFV(|W;7e-7C>g>-mC$53>u9UB><khX9rigFp7ppfpD
+zsj4Pc46RzzSydx?k#;(;S+(dh?5&E%%U4gP4!VdN7+WGeo3RcY)I~I~u4u$W1|g~M
+zc-pov#D{OaLsQ!48MMdqnf}jCQcuS`5cnNKz_arFjt9rnwBH5+Q6`H{?8=`wd9tB;
+z$6|V7q$y~>!5GjpTorD&W?}yB)u{9Dj>7OfJo(782x{92soS@sgn_8K4;;a$k;V9C
+z`8wEXR@r;hRNQy_jfkXQ{q%iX7=HK_e789R2AvUMu|09ioj1`YzYXYQ@@S&PM=7KI
+zeKva;I-Ykc1|$YEbZ{v)eE&J#_+SpQ=@n5&Pk9~sO~S1=%|HkGe3&qC7`}Y$GtB$p
+zFZj!(c1O$doOvMNfq(}BX9)uJm$9={rKcJX1kM2jsCH1p9ls>;7^o#N7p%nE@4m<C
+z?R)9#;xLviUV;D4UqvsvvGA_S!TYZ~gV$!QfPZu>%+)2B^X@BHwC<2{C;h=of5#h(
+zw$cVY9*Hp_*uQBG9{u~vNG+iGXT4NQ;v{eH&)8OGK)*i2;O9+`jXAsU%;Qht=k4j}
+z+O0c-fa$S#_D7h-D2CoNZEHubm;r3>&kI*7x5D*`^PGAh;DLY#0%rvR9s=R4fZ0>Y
+z?-v3L<YT1AN_vabQA}X+_ra*?58>T6-@vo?&0q`$BZgdb7e4#&UA*zsoit^2V*4IC
+zBFbEc|9rIu$pa?g!ABp$&3E06OaHIE^NVS-3d8u*KOdz)*~&WFY~3h~ZJh>?O|m~^
+z8RD1-p%)H_X2EzNI?YsM@j~3i5~GP1M6*O=X4DY97+x&#LZdFmM1t`GHYuAK!;NMF
+z3siJNShp6e&-oZq%8Vw1hClBYlG5{?@0{=Zm2lpk^PcA^%R}#vU!ncN;H<};2;V~B
+zd<RTSILzLZO$!IQ3yu!r;?NDavc0ISK7{9w9z$JCIn_W-T*{!qj%_0fGjC($dM9O>
+z<PZWvKnNtBfGja2p1Jh6SP3vgQ3VS-AKnf#lN!yb)Kjn}W5>Ro^kFa~)#0Q_RtiOO
+z=o4`57X;}cZ0qa5$+v%_I1lp?f}>dFN~1{7^bEz+gHF<6@W#k>8tz1qM%O_aOCa6l
+zMa{lqe15Kr(&3HBE7*p@q8-@cRf?I^IWSqVCWBJW(VJAwlS2py0U?lh0umr3p1Jh6
+zs0nb{VPa}X)~$6JG-#GPdmEIMwi>*nbWx-PugPGA!?BrzdNyr^BZzpM$nj3XyMDH5
+znA%#YnW;JyHFB`$S_iLBN?L`g`sa{Ezk*+{_MyA;EKa;}8l6{$@IiAEYbh&Zf?{H%
+zO!F=3KNz_=A+T%-$p4;Y`_amS#S@5iri?wO24h_tK^3a;JLaTbu5=Sr9le~dMgttV
+z`Lz6||3KDOR8~}@_OVB?Z9@tImq%E2wxp&>)8Nd?(WQBZgS3C1yp4gMzr*WqeS}cT
+zZaj13D4Je<33-`7fVSD8hze5ZhwwWMjEwd;Dc_izlV62^5D)?jNI+%~77(s9y~qfd
+zk|@KQ%pC_aak2jGo^F{&4&q8CIEm-YO8j2^a9P1(<$KNmr~<Vs!opkyjdktrB0OH1
+zkB`52AFuRZ!bbZ5+J5lE^I$FA^JXg`Do=zB_ZPqt`UX8+J&5kzgA_Y=Q4C#XUPB}L
+zdmq9rY99o~*P!HqVx((f3<NLXr(p}tkaqnqtKvmQT5d-O2!UllKmvqi@FB`0{5Jsu
+z_50W57Q$B*#3skIffSbuv=r<r_raLI8MaIf2P%EKGo*pr4(;x(*k4|OEo*K1RKIn#
+z6Qu_pf#*Ia((G<L{n~Mali$U;zN^$iFkyGuLDav{fSfqzN`uLQjI1J*W?5;Ie1^FT
+zdy(lW#<8X&IC<(z^j<ixJ7tzs9me7M8W=+3xY*u?$#nMT+oNI?IfQ@^5CRD&u!P+l
+z6V6IH6asSyMCl$lHa3dCq8bwzQ~xzzAVQ1a_R}Zu@|$PS@Xm*La(^xdel8_MZsLzI
+zy6<teBAu>{2D&(2yK)xCUu?jz`yg80Yef28gqP;rh!h9`As__qfq+_0t*fg;b8|DC
+zPN!<gqR+Mdv;KMyjmxD%U?mbTFp1D+Tdmt#&n#TbC7~s!p`fH1rQ2<2`}TW;^(txx
+zBNYyN2Crvuz%nK1G}zODfzVn!_3RT89Lz;2B|<<5ED(YCSisB!<KyG#?(Ww8%NM9$
+zX;uiVcmithFRLtvKM+Ef-+x!j-U-&}{}U+oRbag-2){qL;<*U`As_@6o`4Dt!r`f}
+zF4Mi4-EKErE*Dx`TXmoJ=@arQ1cbnR6QH&N6C91yL-?$v<<72%_&!+2tT87cic_C3
+zp)qz#MSN9xF9d{u5ST{-9*>7xuxEB*85lKu%JvV<V;|C#5D)@FKnMr{A+WRwSX6+J
+v&u3V-w4X!nUI+*QAs_^VfDo8R0$=|P`0?o$s*Xja00000NkvXXu0mjf<{CKo
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_job.png
+deleted file mode 100644
+index 5e6e9e724aa543759067efe1ad40418a13bd8512..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 59384
+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
+Xm+0b{AAIA100000NkvXXu0mjfizzeC
+
+diff --git a/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png b/hadoop-tools/hadoop-sls/src/site/resources/images/sls_track_queue.png
+deleted file mode 100644
+index f608f9f013162ee6c4ac8a0a5094927e8924dcfd..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 55261
+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
+N002ovPDHLkV1gVX(;)x=
+
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java
+deleted file mode 100644
+index 513dbe5a436..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/BaseSLSRunnerTest.java
++++ /dev/null
+@@ -1,153 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.apache.commons.lang3.ArrayUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.MetricsInvariantChecker;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameter;
+-
+-import java.io.File;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.UUID;
+-
+-/**
+- * This is a base class to ease the implementation of SLS-based tests.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-@SuppressWarnings("VisibilityModifier")
+-public abstract class BaseSLSRunnerTest {
+-
+-  @Parameter(value = 0)
+-  public String schedulerType;
+-
+-  @Parameter(value = 1)
+-  public String traceType;
+-
+-  @Parameter(value = 2)
+-  public String traceLocation;
+-
+-  @Parameter(value = 3)
+-  public String nodeFile;
+-
+-  protected SLSRunner sls;
+-  protected String ongoingInvariantFile;
+-  protected String exitInvariantFile;
+-
+-  @Before
+-  public abstract void setup();
+-
+-  @After
+-  public void tearDown() throws InterruptedException {
+-    if (sls != null) {
+-      sls.stop();
+-    }
+-  }
+-
+-  public void runSLS(Configuration conf, long timeout) throws Exception {
+-    File tempDir = new File("target", UUID.randomUUID().toString());
+-    final List<Throwable> exceptionList =
+-        Collections.synchronizedList(new ArrayList<Throwable>());
+-
+-    Thread.setDefaultUncaughtExceptionHandler(
+-        new Thread.UncaughtExceptionHandler() {
+-          @Override
+-          public void uncaughtException(Thread t, Throwable e) {
+-            e.printStackTrace();
+-            exceptionList.add(e);
+-          }
+-        });
+-
+-    // start the simulator
+-    File slsOutputDir = new File(tempDir.getAbsolutePath() + "/slsoutput/");
+-
+-    String[] args;
+-
+-    switch (traceType) {
+-    case "OLD_SLS":
+-      args = new String[] {"-inputsls", traceLocation, "-output",
+-          slsOutputDir.getAbsolutePath() };
+-      break;
+-    case "OLD_RUMEN":
+-      args = new String[] {"-inputrumen", traceLocation, "-output",
+-          slsOutputDir.getAbsolutePath() };
+-      break;
+-    default:
+-      args = new String[] {"-tracetype", traceType, "-tracelocation",
+-          traceLocation, "-output", slsOutputDir.getAbsolutePath() };
+-    }
+-
+-    if (nodeFile != null) {
+-      args = ArrayUtils.addAll(args, "-nodes", nodeFile);
+-    }
+-
+-    // enable continuous invariant checks
+-    conf.set(YarnConfiguration.RM_SCHEDULER, schedulerType);
+-    if (ongoingInvariantFile != null) {
+-      conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES,
+-          MetricsInvariantChecker.class.getCanonicalName());
+-      conf.set(MetricsInvariantChecker.INVARIANTS_FILE, ongoingInvariantFile);
+-      conf.setBoolean(MetricsInvariantChecker.THROW_ON_VIOLATION, true);
+-    }
+-
+-    sls = new SLSRunner(conf);
+-    sls.run(args);
+-
+-    // wait for timeout seconds before stop, unless there is an uncaught
+-    // exception in which
+-    // case fail fast.
+-    while (timeout >= 0) {
+-      Thread.sleep(1000);
+-
+-      if (!exceptionList.isEmpty()) {
+-        sls.stop();
+-        Assert.fail("TestSLSRunner caught exception from child thread "
+-            + "(TaskRunner.TaskDefinition): " + exceptionList);
+-        break;
+-      }
+-      timeout--;
+-    }
+-    shutdownHookInvariantCheck();
+-  }
+-
+-  /**
+-   * Checks exit invariants (e.g., number of apps submitted, completed, etc.).
+-   */
+-  private void shutdownHookInvariantCheck() {
+-
+-    if(exitInvariantFile!=null) {
+-      MetricsInvariantChecker ic = new MetricsInvariantChecker();
+-      Configuration conf = new Configuration();
+-      conf.set(MetricsInvariantChecker.INVARIANTS_FILE, exitInvariantFile);
+-      conf.setBoolean(MetricsInvariantChecker.THROW_ON_VIOLATION, true);
+-      ic.init(conf, null, null);
+-      ic.editSchedule();
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestDagAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestDagAMSimulator.java
+deleted file mode 100644
+index e458b860e4d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestDagAMSimulator.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.hadoop.yarn.sls.appmaster.DAGAMSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator;
+-import org.junit.Test;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for DagAMSimulator.
+- */
+-public class TestDagAMSimulator {
+-
+-  /**
+-   * Test to check whether containers are scheduled based on request delay.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testGetToBeScheduledContainers() throws Exception {
+-    DAGAMSimulator dagamSimulator = new DAGAMSimulator();
+-    List<ContainerSimulator> containerSimulators = new ArrayList<>();
+-
+-    // containers are requested with 0, 1000, 1500 and 4000ms delay.
+-    containerSimulators.add(createContainerSim(1, 0));
+-    containerSimulators.add(createContainerSim(2, 1000));
+-    containerSimulators.add(createContainerSim(3, 1500));
+-    containerSimulators.add(createContainerSim(4, 4000));
+-
+-    long startTime = System.currentTimeMillis();
+-    List<ContainerSimulator> res = dagamSimulator.getToBeScheduledContainers(
+-        containerSimulators, startTime);
+-    // we should get only one container with request delay set to 0
+-    assertEquals(1, res.size());
+-    assertEquals(1, res.get(0).getAllocationId());
+-
+-    startTime -= 1000;
+-    res = dagamSimulator.getToBeScheduledContainers(
+-        containerSimulators, startTime);
+-    // we should get containers with request delay set < 1000
+-    assertEquals(2, res.size());
+-    assertEquals(1, res.get(0).getAllocationId());
+-    assertEquals(2, res.get(1).getAllocationId());
+-
+-    startTime -= 2000;
+-    res = dagamSimulator.getToBeScheduledContainers(
+-        containerSimulators, startTime);
+-    // we should get containers with request delay set < 2000
+-    assertEquals(3, res.size());
+-    assertEquals(1, res.get(0).getAllocationId());
+-    assertEquals(2, res.get(1).getAllocationId());
+-    assertEquals(3, res.get(2).getAllocationId());
+-  }
+-
+-  private ContainerSimulator createContainerSim(long allocationId,
+-      long requestDelay) {
+-    TaskContainerDefinition taskContainerDef =
+-        mock(TaskContainerDefinition.class);
+-    when(taskContainerDef.getResource()).thenReturn(null);
+-    when(taskContainerDef.getDuration()).thenReturn(1000L);
+-    when(taskContainerDef.getHostname()).thenReturn("*");
+-    when(taskContainerDef.getPriority()).thenReturn(1);
+-    when(taskContainerDef.getType()).thenReturn("Map");
+-    when(taskContainerDef.getExecutionType()).thenReturn(null);
+-    when(taskContainerDef.getAllocationId()).thenReturn(allocationId);
+-    when(taskContainerDef.getRequestDelay()).thenReturn(requestDelay);
+-    return ContainerSimulator.createFromTaskContainerDefinition(
+-        taskContainerDef);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java
+deleted file mode 100644
+index 22e1e2e729e..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.InvariantsChecker;
+-import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.ReservationInvariantsChecker;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameters;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-
+-/**
+- * This test performs an SLS run enabling a
+- * {@code ReservationInvariantsChecker}.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-public class TestReservationSystemInvariants extends BaseSLSRunnerTest {
+-
+-  @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})")
+-  public static Collection<Object[]> data() {
+-    // Test with both schedulers, and all three trace types
+-    return Arrays.asList(new Object[][] {
+-        {CapacityScheduler.class.getCanonicalName(), "SYNTH",
+-            "src/test/resources/syn.json", null},
+-        {FairScheduler.class.getCanonicalName(), "SYNTH",
+-            "src/test/resources/syn.json", null}
+-    });
+-  }
+-
+-  @Test(timeout = 120000)
+-  @SuppressWarnings("all")
+-  public void testSimulatorRunning() throws Exception {
+-
+-    Configuration conf = new Configuration(false);
+-    conf.set(YarnConfiguration.RM_SCHEDULER, schedulerType);
+-    conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true);
+-    conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES,
+-        ReservationInvariantsChecker.class.getCanonicalName());
+-    conf.setBoolean(InvariantsChecker.THROW_ON_VIOLATION, true);
+-
+-
+-    long timeTillShutDownInSec = 90;
+-    runSLS(conf, timeTillShutDownInSec);
+-
+-  }
+-
+-  @Override
+-  public void setup() {
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSDagAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSDagAMSimulator.java
+deleted file mode 100644
+index 54158c0083c..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSDagAMSimulator.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameters;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-/**
+- * This test performs simple runs of the SLS with the generic syn json format.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-public class TestSLSDagAMSimulator extends BaseSLSRunnerTest {
+-
+-  @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})")
+-  public static Collection<Object[]> data() {
+-
+-    String capScheduler = CapacityScheduler.class.getCanonicalName();
+-    String fairScheduler = FairScheduler.class.getCanonicalName();
+-    String synthTraceFile = "src/test/resources/sls_dag.json";
+-    String nodeFile = "src/test/resources/nodes.json";
+-
+-    // Test with both schedulers
+-    return Arrays.asList(new Object[][] {
+-
+-        // covering the no nodeFile case
+-        {capScheduler, "SLS", synthTraceFile, null },
+-
+-        // covering new commandline and CapacityScheduler
+-        {capScheduler, "SLS", synthTraceFile, nodeFile },
+-
+-        // covering FairScheduler
+-        {fairScheduler, "SLS", synthTraceFile, nodeFile },
+-    });
+-  }
+-
+-  @Before
+-  public void setup() {
+-    ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
+-    exitInvariantFile = "src/test/resources/exit-invariants.txt";
+-  }
+-
+-  @Test(timeout = 90000)
+-  @SuppressWarnings("all")
+-  public void testSimulatorRunning() throws Exception {
+-    Configuration conf = new Configuration(false);
+-    long timeTillShutdownInsec = 20L;
+-    runSLS(conf, timeTillShutdownInsec);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSGenericSynth.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSGenericSynth.java
+deleted file mode 100644
+index 79ebe219bfc..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSGenericSynth.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameters;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-/**
+- * This test performs simple runs of the SLS with the generic syn json format.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-public class TestSLSGenericSynth extends BaseSLSRunnerTest {
+-
+-  @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})")
+-  public static Collection<Object[]> data() {
+-
+-    String capScheduler = CapacityScheduler.class.getCanonicalName();
+-    String fairScheduler = FairScheduler.class.getCanonicalName();
+-    String synthTraceFile = "src/test/resources/syn_generic.json";
+-    String nodeFile = "src/test/resources/nodes.json";
+-
+-    // Test with both schedulers
+-    return Arrays.asList(new Object[][] {
+-
+-        // covering the no nodeFile case
+-        {capScheduler, "SYNTH", synthTraceFile, null },
+-
+-        // covering new commandline and CapacityScheduler
+-        {capScheduler, "SYNTH", synthTraceFile, nodeFile },
+-
+-        // covering FairScheduler
+-        {fairScheduler, "SYNTH", synthTraceFile, nodeFile },
+-    });
+-  }
+-
+-  @Before
+-  public void setup() {
+-    ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
+-    exitInvariantFile = "src/test/resources/exit-invariants.txt";
+-  }
+-
+-  @Test(timeout = 90000)
+-  @SuppressWarnings("all")
+-  public void testSimulatorRunning() throws Exception {
+-    Configuration conf = new Configuration(false);
+-    long timeTillShutdownInsec = 20L;
+-    runSLS(conf, timeTillShutdownInsec);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
+deleted file mode 100644
+index 2463ccf06a9..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSRunner.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.*;
+-
+-import java.security.Security;
+-import java.util.*;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-/**
+- * This test performs simple runs of the SLS with different trace types and
+- * schedulers.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-public class TestSLSRunner extends BaseSLSRunnerTest {
+-
+-  @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})")
+-  public static Collection<Object[]> data() {
+-
+-    String capScheduler = CapacityScheduler.class.getCanonicalName();
+-    String fairScheduler = FairScheduler.class.getCanonicalName();
+-    String slsTraceFile = "src/test/resources/inputsls.json";
+-    String rumenTraceFile = "src/main/data/2jobs2min-rumen-jh.json";
+-    String synthTraceFile = "src/test/resources/syn.json";
+-    String nodeFile = "src/test/resources/nodes.json";
+-
+-    // Test with both schedulers, and all three load producers.
+-    return Arrays.asList(new Object[][] {
+-
+-        // covering old commandline in tests
+-        {capScheduler, "OLD_RUMEN", rumenTraceFile, nodeFile },
+-        {capScheduler, "OLD_SLS", slsTraceFile, nodeFile },
+-
+-        // covering the no nodeFile case
+-        {capScheduler, "SYNTH", synthTraceFile, null },
+-        {capScheduler, "RUMEN", rumenTraceFile, null },
+-        {capScheduler, "SLS", slsTraceFile, null },
+-
+-        // covering new commandline and CapacityScheduler
+-        {capScheduler, "SYNTH", synthTraceFile, nodeFile },
+-        {capScheduler, "RUMEN", rumenTraceFile, nodeFile },
+-        {capScheduler, "SLS", slsTraceFile, nodeFile },
+-
+-        // covering FairScheduler
+-        {fairScheduler, "SYNTH", synthTraceFile, nodeFile },
+-        {fairScheduler, "RUMEN", rumenTraceFile, nodeFile },
+-        {fairScheduler, "SLS", slsTraceFile, nodeFile }
+-    });
+-  }
+-
+-  @Before
+-  public void setup() {
+-    ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
+-    exitInvariantFile = "src/test/resources/exit-invariants.txt";
+-  }
+-
+-  @Test(timeout = 90000)
+-  @SuppressWarnings("all")
+-  public void testSimulatorRunning() throws Exception {
+-    Configuration conf = new Configuration(false);
+-    long timeTillShutdownInsec = 20L;
+-    runSLS(conf, timeTillShutdownInsec);
+-  }
+-
+-  /**
+-   * Test to check whether caching is enabled based on config.
+-   */
+-  @Test
+-  public void testEnableCaching() {
+-    String networkCacheDefault = Security.getProperty(
+-        SLSRunner.NETWORK_CACHE_TTL);
+-    String networkNegativeCacheDefault =
+-        Security.getProperty(SLSRunner.NETWORK_NEGATIVE_CACHE_TTL);
+-
+-    try {
+-      Configuration conf = new Configuration(false);
+-      // check when dns caching is disabled
+-      conf.setBoolean(SLSConfiguration.DNS_CACHING_ENABLED, false);
+-      SLSRunner.enableDNSCaching(conf);
+-      assertEquals(networkCacheDefault,
+-          Security.getProperty(SLSRunner.NETWORK_CACHE_TTL));
+-      assertEquals(networkNegativeCacheDefault,
+-          Security.getProperty(SLSRunner.NETWORK_NEGATIVE_CACHE_TTL));
+-
+-      // check when dns caching is enabled
+-      conf.setBoolean(SLSConfiguration.DNS_CACHING_ENABLED, true);
+-      SLSRunner.enableDNSCaching(conf);
+-      assertEquals("-1",
+-          Security.getProperty(SLSRunner.NETWORK_CACHE_TTL));
+-      assertEquals("-1",
+-          Security.getProperty(SLSRunner.NETWORK_NEGATIVE_CACHE_TTL));
+-    } finally {
+-      // set security settings back to default
+-      Security.setProperty(SLSRunner.NETWORK_CACHE_TTL,
+-          String.valueOf(networkCacheDefault));
+-      Security.setProperty(SLSRunner.NETWORK_NEGATIVE_CACHE_TTL,
+-          String.valueOf(networkNegativeCacheDefault));
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSStreamAMSynth.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSStreamAMSynth.java
+deleted file mode 100644
+index a5d30e02d85..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSLSStreamAMSynth.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameters;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-/**
+- * This test performs simple runs of the SLS with the generic syn json format.
+- */
+-@RunWith(value = Parameterized.class)
+-@NotThreadSafe
+-public class TestSLSStreamAMSynth extends BaseSLSRunnerTest {
+-
+-  @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})")
+-  public static Collection<Object[]> data() {
+-
+-    String capScheduler = CapacityScheduler.class.getCanonicalName();
+-    String fairScheduler = FairScheduler.class.getCanonicalName();
+-    String synthTraceFile = "src/test/resources/syn_stream.json";
+-    String nodeFile = "src/test/resources/nodes.json";
+-
+-    // Test with both schedulers
+-    return Arrays.asList(new Object[][] {
+-
+-        // covering the no nodeFile case
+-        {capScheduler, "SYNTH", synthTraceFile, null },
+-
+-        // covering new commandline and CapacityScheduler
+-        {capScheduler, "SYNTH", synthTraceFile, nodeFile },
+-
+-        // covering FairScheduler
+-        {fairScheduler, "SYNTH", synthTraceFile, nodeFile },
+-    });
+-  }
+-
+-  @Before
+-  public void setup() {
+-    ongoingInvariantFile = "src/test/resources/ongoing-invariants.txt";
+-    exitInvariantFile = "src/test/resources/exit-invariants.txt";
+-  }
+-
+-  @Test(timeout = 90000)
+-  @SuppressWarnings("all")
+-  public void testSimulatorRunning() throws Exception {
+-    Configuration conf = new Configuration(false);
+-    long timeTillShutdownInsec = 20L;
+-    runSLS(conf, timeTillShutdownInsec);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSynthJobGeneration.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSynthJobGeneration.java
+deleted file mode 100644
+index dd12a10f946..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestSynthJobGeneration.java
++++ /dev/null
+@@ -1,266 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls;
+-
+-import org.apache.commons.math3.random.JDKRandomGenerator;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthJob;
+-import org.apache.hadoop.yarn.sls.synthetic.SynthTraceJobProducer;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonFactoryBuilder;
+-import com.fasterxml.jackson.databind.JsonMappingException;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.Arrays;
+-
+-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertTrue;
+-
+-/**
+- * Simple test class driving the {@code SynthTraceJobProducer}, and validating
+- * jobs produce are within expected range.
+- */
+-public class TestSynthJobGeneration {
+-
+-  public final static Logger LOG =
+-      LoggerFactory.getLogger(TestSynthJobGeneration.class);
+-
+-  @Test
+-  public void testWorkloadGenerateTime()
+-      throws IllegalArgumentException, IOException {
+-
+-    String workloadJson = "{\"job_classes\": [], \"time_distribution\":["
+-        + "{\"time\": 0, \"weight\": 1}, " + "{\"time\": 30, \"weight\": 0},"
+-        + "{\"time\": 60, \"weight\": 2}," + "{\"time\": 90, \"weight\": 1}"
+-        + "]}";
+-
+-    JsonFactoryBuilder jsonFactoryBuilder = new JsonFactoryBuilder();
+-    jsonFactoryBuilder.configure(JsonFactory.Feature.INTERN_FIELD_NAMES, true);
+-    ObjectMapper mapper = new ObjectMapper(jsonFactoryBuilder.build());
+-    mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    SynthTraceJobProducer.Workload wl =
+-        mapper.readValue(workloadJson, SynthTraceJobProducer.Workload.class);
+-
+-    JDKRandomGenerator rand = new JDKRandomGenerator();
+-    rand.setSeed(0);
+-
+-    wl.init(rand);
+-
+-    int bucket0 = 0;
+-    int bucket1 = 0;
+-    int bucket2 = 0;
+-    int bucket3 = 0;
+-    for (int i = 0; i < 1000; ++i) {
+-      long time = wl.generateSubmissionTime();
+-      LOG.info("Generated time " + time);
+-      if (time < 30) {
+-        bucket0++;
+-      } else if (time < 60) {
+-        bucket1++;
+-      } else if (time < 90) {
+-        bucket2++;
+-      } else {
+-        bucket3++;
+-      }
+-    }
+-
+-    Assert.assertTrue(bucket0 > 0);
+-    assertEquals(0, bucket1);
+-    Assert.assertTrue(bucket2 > 0);
+-    Assert.assertTrue(bucket3 > 0);
+-    Assert.assertTrue(bucket2 > bucket0);
+-    Assert.assertTrue(bucket2 > bucket3);
+-
+-    LOG.info("bucket0 {}, bucket1 {}, bucket2 {}, bucket3 {}", bucket0, bucket1,
+-        bucket2, bucket3);
+-
+-  }
+-
+-  @Test
+-  public void testMapReduce() throws IllegalArgumentException, IOException {
+-
+-    Configuration conf = new Configuration();
+-
+-    conf.set(SynthTraceJobProducer.SLS_SYNTHETIC_TRACE_FILE,
+-        "src/test/resources/syn.json");
+-
+-    SynthTraceJobProducer stjp = new SynthTraceJobProducer(conf);
+-
+-    LOG.info(stjp.toString());
+-
+-    SynthJob js = (SynthJob) stjp.getNextJob();
+-
+-    int jobCount = 0;
+-
+-    while (js != null) {
+-      LOG.info(js.toString());
+-      validateJob(js);
+-      js = (SynthJob) stjp.getNextJob();
+-      jobCount++;
+-    }
+-
+-    Assert.assertEquals(stjp.getNumJobs(), jobCount);
+-  }
+-
+-  @Test
+-  public void testGeneric() throws IllegalArgumentException, IOException {
+-    Configuration conf = new Configuration();
+-
+-    conf.set(SynthTraceJobProducer.SLS_SYNTHETIC_TRACE_FILE,
+-        "src/test/resources/syn_generic.json");
+-
+-    SynthTraceJobProducer stjp = new SynthTraceJobProducer(conf);
+-
+-    LOG.info(stjp.toString());
+-
+-    SynthJob js = (SynthJob) stjp.getNextJob();
+-
+-    int jobCount = 0;
+-
+-    while (js != null) {
+-      LOG.info(js.toString());
+-      validateJob(js);
+-      js = (SynthJob) stjp.getNextJob();
+-      jobCount++;
+-    }
+-
+-    Assert.assertEquals(stjp.getNumJobs(), jobCount);
+-  }
+-
+-  @Test
+-  public void testStream() throws IllegalArgumentException, IOException {
+-    Configuration conf = new Configuration();
+-
+-    conf.set(SynthTraceJobProducer.SLS_SYNTHETIC_TRACE_FILE,
+-        "src/test/resources/syn_stream.json");
+-
+-    SynthTraceJobProducer stjp = new SynthTraceJobProducer(conf);
+-
+-    LOG.info(stjp.toString());
+-
+-    SynthJob js = (SynthJob) stjp.getNextJob();
+-
+-    int jobCount = 0;
+-
+-    while (js != null) {
+-      LOG.info(js.toString());
+-      validateJob(js);
+-      js = (SynthJob) stjp.getNextJob();
+-      jobCount++;
+-    }
+-
+-    Assert.assertEquals(stjp.getNumJobs(), jobCount);
+-  }
+-
+-  @Test
+-  public void testSample() throws IOException {
+-
+-    JsonFactoryBuilder jsonFactoryBuilder = new JsonFactoryBuilder();
+-    jsonFactoryBuilder.configure(JsonFactory.Feature.INTERN_FIELD_NAMES, true);
+-    ObjectMapper mapper = new ObjectMapper(jsonFactoryBuilder.build());
+-    mapper.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+-
+-    JDKRandomGenerator rand = new JDKRandomGenerator();
+-    rand.setSeed(0);
+-
+-    String valJson = "{\"val\" : 5 }";
+-    SynthTraceJobProducer.Sample valSample =
+-        mapper.readValue(valJson, SynthTraceJobProducer.Sample.class);
+-    valSample.init(rand);
+-    int val = valSample.getInt();
+-    Assert.assertEquals(5, val);
+-
+-    String distJson = "{\"val\" : 5, \"std\" : 1 }";
+-    SynthTraceJobProducer.Sample distSample =
+-        mapper.readValue(distJson, SynthTraceJobProducer.Sample.class);
+-    distSample.init(rand);
+-    double dist = distSample.getDouble();
+-    Assert.assertTrue(dist > 2 && dist < 8);
+-
+-    String normdistJson = "{\"val\" : 5, \"std\" : 1, \"dist\": \"NORM\" }";
+-    SynthTraceJobProducer.Sample normdistSample =
+-        mapper.readValue(normdistJson, SynthTraceJobProducer.Sample.class);
+-    normdistSample.init(rand);
+-    double normdist = normdistSample.getDouble();
+-    Assert.assertTrue(normdist > 2 && normdist < 8);
+-
+-    String discreteJson = "{\"discrete\" : [2, 4, 6, 8]}";
+-    SynthTraceJobProducer.Sample discreteSample =
+-        mapper.readValue(discreteJson, SynthTraceJobProducer.Sample.class);
+-    discreteSample.init(rand);
+-    int discrete = discreteSample.getInt();
+-    Assert.assertTrue(
+-        Arrays.asList(new Integer[] {2, 4, 6, 8}).contains(discrete));
+-
+-    String discreteWeightsJson =
+-        "{\"discrete\" : [2, 4, 6, 8], " + "\"weights\": [0, 0, 0, 1]}";
+-    SynthTraceJobProducer.Sample discreteWeightsSample = mapper
+-        .readValue(discreteWeightsJson, SynthTraceJobProducer.Sample.class);
+-    discreteWeightsSample.init(rand);
+-    int discreteWeights = discreteWeightsSample.getInt();
+-    Assert.assertEquals(8, discreteWeights);
+-
+-    String invalidJson = "{\"val\" : 5, \"discrete\" : [2, 4, 6, 8], "
+-        + "\"weights\": [0, 0, 0, 1]}";
+-    try {
+-      mapper.readValue(invalidJson, SynthTraceJobProducer.Sample.class);
+-      Assert.fail();
+-    } catch (JsonMappingException e) {
+-      Assert.assertTrue(e.getMessage().startsWith("Instantiation of"));
+-    }
+-
+-    String invalidDistJson =
+-        "{\"val\" : 5, \"std\" : 1, " + "\"dist\": \"INVALID\" }";
+-    try {
+-      mapper.readValue(invalidDistJson, SynthTraceJobProducer.Sample.class);
+-      Assert.fail();
+-    } catch (JsonMappingException e) {
+-      Assert.assertTrue(e.getMessage().startsWith("Cannot construct instance of"));
+-    }
+-  }
+-
+-  private void validateJob(SynthJob js) {
+-
+-    assertTrue(js.getSubmissionTime() > 0);
+-    assertTrue(js.getDuration() > 0);
+-    assertTrue(js.getTotalSlotTime() >= 0);
+-
+-    if (js.hasDeadline()) {
+-      assertTrue(js.getDeadline() > js.getSubmissionTime() + js.getDuration());
+-    }
+-
+-    assertTrue(js.getTasks().size() > 0);
+-
+-    for (SynthJob.SynthTask t : js.getTasks()) {
+-      assertNotNull(t.getType());
+-      assertTrue(t.getTime() > 0);
+-      assertTrue(t.getMemory() > 0);
+-      assertTrue(t.getVcores() > 0);
+-      assertEquals(ExecutionType.GUARANTEED, t.getExecutionType());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+deleted file mode 100644
+index f5db1684c71..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
++++ /dev/null
+@@ -1,386 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.appmaster;
+-
+-import com.codahale.metrics.MetricRegistry;
+-import java.util.HashMap;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.tools.rumen.datatypes.UserName;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.client.cli.RMAdminCLI;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.sls.AMDefinitionRumen;
+-import org.apache.hadoop.yarn.sls.TaskContainerDefinition;
+-import org.apache.hadoop.yarn.sls.SLSRunner;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.nodemanager.NMSimulator;
+-import org.apache.hadoop.yarn.sls.scheduler.*;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.mockito.Mockito;
+-
+-import java.io.IOException;
+-import java.nio.file.Files;
+-import java.nio.file.Path;
+-import java.nio.file.Paths;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentMap;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-@RunWith(Parameterized.class)
+-public class TestAMSimulator {
+-  private ResourceManager rm;
+-  private YarnConfiguration conf;
+-  private Path metricOutputDir;
+-
+-  private Class<?> slsScheduler;
+-  private Class<?> scheduler;
+-
+-  @Parameterized.Parameters
+-  public static Collection<Object[]> params() {
+-    return Arrays.asList(new Object[][] {
+-        {SLSFairScheduler.class, FairScheduler.class},
+-        {SLSCapacityScheduler.class, CapacityScheduler.class}
+-    });
+-  }
+-
+-  public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
+-    this.slsScheduler = slsScheduler;
+-    this.scheduler = scheduler;
+-  }
+-
+-  @Before
+-  public void setup() {
+-    createMetricOutputDir();
+-
+-    conf = new YarnConfiguration();
+-    conf.set(SLSConfiguration.METRICS_OUTPUT_DIR, metricOutputDir.toString());
+-    conf.set(YarnConfiguration.RM_SCHEDULER, slsScheduler.getName());
+-    conf.set(SLSConfiguration.RM_SCHEDULER, scheduler.getName());
+-    conf.set(YarnConfiguration.NODE_LABELS_ENABLED, "true");
+-    conf.setBoolean(SLSConfiguration.METRICS_SWITCH, true);
+-    rm = new ResourceManager();
+-    rm.init(conf);
+-    rm.start();
+-  }
+-
+-  class MockAMSimulator extends AMSimulator {
+-    @Override
+-    protected void processResponseQueue()
+-        throws InterruptedException, YarnException, IOException {
+-    }
+-
+-    @Override
+-    protected void sendContainerRequest()
+-        throws YarnException, IOException, InterruptedException {
+-    }
+-
+-    @Override
+-    public void initReservation(ReservationId id, long deadline, long now){
+-    }
+-
+-    @Override
+-    protected void checkStop() {
+-    }
+-  }
+-
+-  private void verifySchedulerMetrics(String appId) {
+-    if (scheduler.equals(FairScheduler.class)) {
+-      SchedulerMetrics schedulerMetrics = ((SchedulerWrapper)
+-          rm.getResourceScheduler()).getSchedulerMetrics();
+-      MetricRegistry metricRegistry = schedulerMetrics.getMetrics();
+-      for (FairSchedulerMetrics.Metric metric :
+-          FairSchedulerMetrics.Metric.values()) {
+-        String key = "variable.app." + appId + "." + metric.getValue() +
+-            ".memory";
+-        Assert.assertTrue(metricRegistry.getGauges().containsKey(key));
+-        Assert.assertNotNull(metricRegistry.getGauges().get(key).getValue());
+-      }
+-    }
+-  }
+-
+-  private void createMetricOutputDir() {
+-    Path testDir =
+-        Paths.get(System.getProperty("test.build.data", "target/test-dir"));
+-    try {
+-      metricOutputDir = Files.createTempDirectory(testDir, "output");
+-    } catch (IOException e) {
+-      Assert.fail(e.toString());
+-    }
+-  }
+-
+-  private void deleteMetricOutputDir() {
+-    try {
+-      FileUtils.deleteDirectory(metricOutputDir.toFile());
+-    } catch (IOException e) {
+-      Assert.fail(e.toString());
+-    }
+-  }
+-
+-  @Test
+-  public void testAMSimulator() throws Exception {
+-    // Register one app
+-    MockAMSimulator app = new MockAMSimulator();
+-    String appId = "app1";
+-    String queue = "default";
+-    List<ContainerSimulator> containers = new ArrayList<>();
+-    HashMap<ApplicationId, AMSimulator> map = new HashMap<>();
+-
+-    UserName mockUser = mock(UserName.class);
+-    when(mockUser.getValue()).thenReturn("user1");
+-    AMDefinitionRumen amDef =
+-        AMDefinitionRumen.Builder.create()
+-        .withUser(mockUser)
+-        .withQueue(queue)
+-        .withJobId(appId)
+-        .withJobStartTime(0)
+-        .withJobFinishTime(1000000L)
+-        .withAmResource(SLSConfiguration.getAMContainerResource(conf))
+-        .withTaskContainers(containers)
+-        .build();
+-    app.init(amDef, rm, null, true, 0, 1000, map);
+-    app.firstStep();
+-
+-    verifySchedulerMetrics(appId);
+-
+-    Assert.assertEquals(1, rm.getRMContext().getRMApps().size());
+-    Assert.assertNotNull(rm.getRMContext().getRMApps().get(app.appId));
+-
+-    // Finish this app
+-    app.lastStep();
+-  }
+-
+-  @Test
+-  public void testAMSimulatorWithNodeLabels() throws Exception {
+-    if (scheduler.equals(CapacityScheduler.class)) {
+-      // add label to the cluster
+-      RMAdminCLI rmAdminCLI = new RMAdminCLI(conf);
+-      String[] args = {"-addToClusterNodeLabels", "label1"};
+-      rmAdminCLI.run(args);
+-
+-      MockAMSimulator app = new MockAMSimulator();
+-      String appId = "app1";
+-      String queue = "default";
+-      List<ContainerSimulator> containers = new ArrayList<>();
+-      HashMap<ApplicationId, AMSimulator> map = new HashMap<>();
+-
+-      UserName mockUser = mock(UserName.class);
+-      when(mockUser.getValue()).thenReturn("user1");
+-      AMDefinitionRumen amDef =
+-          AMDefinitionRumen.Builder.create()
+-              .withUser(mockUser)
+-              .withQueue(queue)
+-              .withJobId(appId)
+-              .withJobStartTime(0)
+-              .withJobFinishTime(1000000L)
+-              .withAmResource(SLSConfiguration.getAMContainerResource(conf))
+-              .withTaskContainers(containers)
+-              .withLabelExpression("label1")
+-              .build();
+-      app.init(amDef, rm, null, true, 0, 1000, map);
+-      app.firstStep();
+-
+-      verifySchedulerMetrics(appId);
+-
+-      ConcurrentMap<ApplicationId, RMApp> rmApps =
+-          rm.getRMContext().getRMApps();
+-      Assert.assertEquals(1, rmApps.size());
+-      RMApp rmApp = rmApps.get(app.appId);
+-      Assert.assertNotNull(rmApp);
+-      Assert.assertEquals("label1", rmApp.getAmNodeLabelExpression());
+-    }
+-  }
+-
+-  @Test
+-  public void testPackageRequests() throws YarnException {
+-    MockAMSimulator app = new MockAMSimulator();
+-    List<ContainerSimulator> containerSimulators = new ArrayList<>();
+-    Resource resource = Resources.createResource(1024);
+-    int priority = 1;
+-    ExecutionType execType = ExecutionType.GUARANTEED;
+-    String type = "map";
+-
+-    TaskContainerDefinition.Builder builder =
+-        TaskContainerDefinition.Builder.create()
+-        .withResource(resource)
+-        .withDuration(100)
+-        .withPriority(1)
+-        .withType(type)
+-        .withExecutionType(execType)
+-        .withAllocationId(-1)
+-        .withRequestDelay(0);
+-
+-    ContainerSimulator s1 = ContainerSimulator
+-        .createFromTaskContainerDefinition(
+-            builder.withHostname("/default-rack/h1").build());
+-    ContainerSimulator s2 = ContainerSimulator
+-        .createFromTaskContainerDefinition(
+-            builder.withHostname("/default-rack/h1").build());
+-    ContainerSimulator s3 = ContainerSimulator
+-        .createFromTaskContainerDefinition(
+-            builder.withHostname("/default-rack/h2").build());
+-
+-    containerSimulators.add(s1);
+-    containerSimulators.add(s2);
+-    containerSimulators.add(s3);
+-
+-    List<ResourceRequest> res = app.packageRequests(containerSimulators,
+-        priority);
+-
+-    // total 4 resource requests: any -> 1, rack -> 1, node -> 2
+-    // All resource requests for any would be packaged into 1.
+-    // All resource requests for racks would be packaged into 1 as all of them
+-    // are for same rack.
+-    // All resource requests for nodes would be packaged into 2 as there are
+-    // two different nodes.
+-    Assert.assertEquals(4, res.size());
+-    int anyRequestCount = 0;
+-    int rackRequestCount = 0;
+-    int nodeRequestCount = 0;
+-
+-    for (ResourceRequest request : res) {
+-      String resourceName = request.getResourceName();
+-      if (resourceName.equals("*")) {
+-        anyRequestCount++;
+-      } else if (resourceName.equals("/default-rack")) {
+-        rackRequestCount++;
+-      } else {
+-        nodeRequestCount++;
+-      }
+-    }
+-
+-    Assert.assertEquals(1, anyRequestCount);
+-    Assert.assertEquals(1, rackRequestCount);
+-    Assert.assertEquals(2, nodeRequestCount);
+-
+-    containerSimulators.clear();
+-    s1 = ContainerSimulator.createFromTaskContainerDefinition(
+-        createDefaultTaskContainerDefMock(resource, priority, execType, type,
+-            "/default-rack/h1", 1));
+-    s2 = ContainerSimulator.createFromTaskContainerDefinition(
+-        createDefaultTaskContainerDefMock(resource, priority, execType, type,
+-            "/default-rack/h1", 2));
+-    s3 = ContainerSimulator.createFromTaskContainerDefinition(
+-        createDefaultTaskContainerDefMock(resource, priority, execType, type,
+-            "/default-rack/h2", 1));
+-
+-    containerSimulators.add(s1);
+-    containerSimulators.add(s2);
+-    containerSimulators.add(s3);
+-
+-    res = app.packageRequests(containerSimulators, priority);
+-
+-    // total 7 resource requests: any -> 2, rack -> 2, node -> 3
+-    // All resource requests for any would be packaged into 2 as there are
+-    // two different allocation id.
+-    // All resource requests for racks would be packaged into 2 as all of them
+-    // are for same rack but for two different allocation id.
+-    // All resource requests for nodes would be packaged into 3 as either node
+-    // or allocation id is different for each request.
+-    Assert.assertEquals(7, res.size());
+-
+-    anyRequestCount = 0;
+-    rackRequestCount = 0;
+-    nodeRequestCount = 0;
+-
+-    for (ResourceRequest request : res) {
+-      String resourceName = request.getResourceName();
+-      long allocationId = request.getAllocationRequestId();
+-      // allocation id should be either 1 or 2
+-      Assert.assertTrue(allocationId == 1 || allocationId == 2);
+-      if (resourceName.equals("*")) {
+-        anyRequestCount++;
+-      } else if (resourceName.equals("/default-rack")) {
+-        rackRequestCount++;
+-      } else {
+-        nodeRequestCount++;
+-      }
+-    }
+-
+-    Assert.assertEquals(2, anyRequestCount);
+-    Assert.assertEquals(2, rackRequestCount);
+-    Assert.assertEquals(3, nodeRequestCount);
+-  }
+-
+-  @Test
+-  public void testAMSimulatorRanNodesCleared() throws Exception {
+-    NMSimulator nm = new NMSimulator();
+-    nm.init("/rack1/testNode1", Resources.createResource(1024 * 10, 10), 0, 1000,
+-        rm, -1f);
+-
+-    Map<NodeId, NMSimulator> nmMap = new HashMap<>();
+-    nmMap.put(nm.getNode().getNodeID(), nm);
+-
+-    MockAMSimulator app = new MockAMSimulator();
+-    app.appId = ApplicationId.newInstance(0l, 1);
+-    SLSRunner slsRunner = Mockito.mock(SLSRunner.class);
+-    app.se = slsRunner;
+-    when(slsRunner.getNmMap()).thenReturn(nmMap);
+-    app.getRanNodes().add(nm.getNode().getNodeID());
+-    nm.getNode().getRunningApps().add(app.appId);
+-    Assert.assertTrue(nm.getNode().getRunningApps().contains(app.appId));
+-
+-    app.lastStep();
+-    Assert.assertFalse(nm.getNode().getRunningApps().contains(app.appId));
+-    Assert.assertTrue(nm.getNode().getRunningApps().isEmpty());
+-  }
+-  private TaskContainerDefinition createDefaultTaskContainerDefMock(
+-      Resource resource, int priority, ExecutionType execType, String type,
+-      String hostname, long allocationId) {
+-    TaskContainerDefinition taskContainerDef =
+-        mock(TaskContainerDefinition.class);
+-    when(taskContainerDef.getResource()).thenReturn(resource);
+-    when(taskContainerDef.getDuration()).thenReturn(100L);
+-    when(taskContainerDef.getPriority()).thenReturn(priority);
+-    when(taskContainerDef.getType()).thenReturn(type);
+-    when(taskContainerDef.getExecutionType()).thenReturn(execType);
+-    when(taskContainerDef.getHostname()).thenReturn(hostname);
+-    when(taskContainerDef.getAllocationId()).thenReturn(allocationId);
+-    return taskContainerDef;
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    if (rm != null) {
+-      rm.stop();
+-    }
+-
+-    deleteMetricOutputDir();
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/nodemanager/TestNMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/nodemanager/TestNMSimulator.java
+deleted file mode 100644
+index 6f7ff179246..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/nodemanager/TestNMSimulator.java
++++ /dev/null
+@@ -1,234 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.nodemanager;
+-
+-import java.util.function.Supplier;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-import org.apache.hadoop.yarn.sls.conf.SLSConfiguration;
+-import org.apache.hadoop.yarn.sls.scheduler.SLSCapacityScheduler;
+-import org.apache.hadoop.yarn.sls.scheduler.SLSFairScheduler;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-@RunWith(Parameterized.class)
+-public class TestNMSimulator {
+-  private final int GB = 1024;
+-  private ResourceManager rm;
+-  private YarnConfiguration conf;
+-
+-  private Class slsScheduler;
+-  private Class scheduler;
+-
+-  @Parameterized.Parameters
+-  public static Collection<Object[]> params() {
+-    return Arrays.asList(new Object[][] {
+-        {SLSFairScheduler.class, FairScheduler.class},
+-        {SLSCapacityScheduler.class, CapacityScheduler.class}
+-    });
+-  }
+-
+-  public TestNMSimulator(Class slsScheduler, Class scheduler) {
+-    this.slsScheduler = slsScheduler;
+-    this.scheduler = scheduler;
+-  }
+-
+-  @Before
+-  public void setup() {
+-    conf = new YarnConfiguration();
+-    conf.set(YarnConfiguration.RM_SCHEDULER, slsScheduler.getName());
+-    conf.set(SLSConfiguration.RM_SCHEDULER, scheduler.getName());
+-    conf.setBoolean(SLSConfiguration.METRICS_SWITCH, false);
+-    rm = new ResourceManager();
+-    rm.init(conf);
+-    rm.start();
+-  }
+-
+-  @Test
+-  public void testNMSimulator() throws Exception {
+-    // Register one node
+-    NMSimulator node1 = new NMSimulator();
+-    node1.init("/rack1/node1", Resources.createResource(GB * 10, 10), 0, 1000,
+-        rm, -1f);
+-    node1.middleStep();
+-
+-    int numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    int cumulativeSleepTime = 0;
+-    int sleepInterval = 100;
+-
+-    while(numClusterNodes != 1 && cumulativeSleepTime < 5000) {
+-      Thread.sleep(sleepInterval);
+-      cumulativeSleepTime = cumulativeSleepTime + sleepInterval;
+-      numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    }
+-
+-    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-      @Override public Boolean get() {
+-        return rm.getResourceScheduler().getRootQueueMetrics()
+-            .getAvailableMB() > 0;
+-      }
+-    }, 500, 10000);
+-
+-    Assert.assertEquals(1, rm.getResourceScheduler().getNumClusterNodes());
+-    Assert.assertEquals(GB * 10,
+-        rm.getResourceScheduler().getRootQueueMetrics().getAvailableMB());
+-    Assert.assertEquals(10,
+-        rm.getResourceScheduler().getRootQueueMetrics()
+-            .getAvailableVirtualCores());
+-
+-    // Allocate one container on node1
+-    ContainerId cId1 = newContainerId(1, 1, 1);
+-    Container container1 = Container.newInstance(cId1, null, null,
+-        Resources.createResource(GB, 1), null, null);
+-    node1.addNewContainer(container1, 100000l, null);
+-    Assert.assertTrue("Node1 should have one running container.",
+-        node1.getRunningContainers().containsKey(cId1));
+-
+-    // Allocate one AM container on node1
+-    ContainerId cId2 = newContainerId(2, 1, 1);
+-    Container container2 = Container.newInstance(cId2, null, null,
+-        Resources.createResource(GB, 1), null, null);
+-    node1.addNewContainer(container2, -1l, null);
+-    Assert.assertTrue("Node1 should have one running AM container",
+-        node1.getAMContainers().contains(cId2));
+-
+-    // Remove containers
+-    node1.cleanupContainer(cId1);
+-    Assert.assertTrue("Container1 should be removed from Node1.",
+-        node1.getCompletedContainers().contains(cId1));
+-    node1.cleanupContainer(cId2);
+-    Assert.assertFalse("Container2 should be removed from Node1.",
+-        node1.getAMContainers().contains(cId2));
+-  }
+-
+-  private ContainerId newContainerId(int appId, int appAttemptId, int cId) {
+-    return BuilderUtils.newContainerId(
+-        BuilderUtils.newApplicationAttemptId(
+-            BuilderUtils.newApplicationId(System.currentTimeMillis(), appId),
+-            appAttemptId), cId);
+-  }
+-
+-  @Test
+-  public void testNMSimAppAddedAndRemoved() throws Exception {
+-    // Register one node
+-    NMSimulator node = new NMSimulator();
+-    node.init("/rack1/node1", Resources.createResource(GB * 10, 10), 0, 1000,
+-        rm, -1f);
+-    node.middleStep();
+-
+-    int numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    int cumulativeSleepTime = 0;
+-    int sleepInterval = 100;
+-
+-    while (numClusterNodes != 1 && cumulativeSleepTime < 5000) {
+-      Thread.sleep(sleepInterval);
+-      cumulativeSleepTime = cumulativeSleepTime + sleepInterval;
+-      numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    }
+-
+-    GenericTestUtils.waitFor(() ->
+-            rm.getResourceScheduler().getRootQueueMetrics()
+-                .getAvailableMB() > 0,
+-        500, 10000);
+-
+-    Assert.assertEquals("Node should have no runningApps.",
+-        node.getNode().getRunningApps().size(), 0);
+-
+-    // Allocate one app container on node
+-    ApplicationId appId = BuilderUtils.newApplicationId(1, 1);
+-    ApplicationAttemptId appAttemptId =
+-        BuilderUtils.newApplicationAttemptId(appId, 1);
+-    ContainerId cId = BuilderUtils.newContainerId(appAttemptId, 1);
+-    Container container = Container.newInstance(cId, null, null,
+-        Resources.createResource(GB, 1), null, null);
+-    node.addNewContainer(container, 100000l, appId);
+-    Assert.assertTrue("Node should have app: "
+-            + appId + " in runningApps list.",
+-        node.getNode().getRunningApps().contains(appId));
+-
+-    // Finish the app on the node.
+-    node.finishApplication(appId);
+-    Assert.assertFalse("Node should not have app: "
+-            + appId + " in runningApps list.",
+-        node.getNode().getRunningApps().contains(appId));
+-    Assert.assertEquals("Node should have no runningApps.",
+-        node.getNode().getRunningApps().size(), 0);
+-  }
+-
+-  @Test
+-  public void testNMSimNullAppAddedAndRemoved() throws Exception {
+-    // Register one node
+-    NMSimulator node = new NMSimulator();
+-    node.init("/rack1/node1", Resources.createResource(GB * 10, 10), 0, 1000,
+-        rm, -1f);
+-    node.middleStep();
+-
+-    int numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    int cumulativeSleepTime = 0;
+-    int sleepInterval = 100;
+-
+-    while (numClusterNodes != 1 && cumulativeSleepTime < 5000) {
+-      Thread.sleep(sleepInterval);
+-      cumulativeSleepTime = cumulativeSleepTime + sleepInterval;
+-      numClusterNodes = rm.getResourceScheduler().getNumClusterNodes();
+-    }
+-
+-    GenericTestUtils.waitFor(() ->
+-            rm.getResourceScheduler().getRootQueueMetrics()
+-                .getAvailableMB() > 0,
+-        500, 10000);
+-
+-    Assert.assertEquals("Node should have no runningApps.",
+-        node.getNode().getRunningApps().size(), 0);
+-
+-    // Allocate null app container on node
+-    ContainerId cId = newContainerId(1, 1, 1);
+-    Container container = Container.newInstance(cId, null, null,
+-        Resources.createResource(GB, 1), null, null);
+-    node.addNewContainer(container, 100000l, null);
+-    Assert.assertEquals("Node should have no runningApps if appId is null.",
+-        node.getNode().getRunningApps().size(), 0);
+-
+-    // Finish non-existent app on the node.
+-    ApplicationId appId = BuilderUtils.newApplicationId(1, 1);
+-    node.finishApplication(appId);
+-    Assert.assertEquals("Node should have no runningApps.",
+-        node.getNode().getRunningApps().size(), 0);
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    rm.stop();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
+deleted file mode 100644
+index ce6c1b30b65..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/scheduler/TestTaskRunner.java
++++ /dev/null
+@@ -1,247 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.sls.scheduler;
+-
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.TimeUnit;
+-
+-public class TestTaskRunner {
+-  private TaskRunner runner;
+-
+-  @Before
+-  public void setUp() {
+-    runner = new TaskRunner();
+-    runner.setQueueSize(5);
+-  }
+-
+-  @After
+-  public void cleanUp() throws InterruptedException {
+-    runner.stop();
+-  }
+-
+-  public static class SingleTask extends TaskRunner.Task {
+-    public static CountDownLatch latch = new CountDownLatch(1);
+-    public static boolean first;
+-
+-    public SingleTask(long startTime) {
+-      super.init(startTime);
+-    }
+-
+-    @Override
+-    public void firstStep() {
+-      if (first) {
+-        Assert.fail();
+-      }
+-      first = true;
+-      latch.countDown();
+-    }
+-
+-    @Override
+-    public void middleStep() {
+-      Assert.fail();
+-    }
+-
+-    @Override
+-    public void lastStep() {
+-      Assert.fail();
+-    }
+-  }
+-
+-  @Test
+-  public void testSingleTask() throws Exception {
+-    runner.start();
+-    runner.schedule(new SingleTask(0));
+-    SingleTask.latch.await(5000, TimeUnit.MILLISECONDS);
+-    Assert.assertTrue(SingleTask.first);
+-  }
+-
+-  public static class DualTask extends TaskRunner.Task {
+-    public static CountDownLatch latch = new CountDownLatch(1);
+-    public static boolean first;
+-    public static boolean last;
+-
+-    public DualTask(long startTime, long endTime, long interval) {
+-      super.init(startTime, endTime, interval);
+-    }
+-
+-    @Override
+-    public void firstStep() {
+-      if (first) {
+-        Assert.fail();
+-      }
+-      first = true;
+-    }
+-
+-    @Override
+-    public void middleStep() {
+-      Assert.fail();
+-    }
+-
+-    @Override
+-    public void lastStep() {
+-      if (last) {
+-        Assert.fail();
+-      }
+-      last = true;
+-      latch.countDown();
+-    }
+-  }
+-
+-  @Test
+-  public void testDualTask() throws Exception {
+-    runner.start();
+-    runner.schedule(new DualTask(0, 10, 10));
+-    DualTask.latch.await(5000, TimeUnit.MILLISECONDS);
+-    Assert.assertTrue(DualTask.first);
+-    Assert.assertTrue(DualTask.last);
+-  }
+-
+-  public static class TriTask extends TaskRunner.Task {
+-    public static CountDownLatch latch = new CountDownLatch(1);
+-    public static boolean first;
+-    public static boolean middle;
+-    public static boolean last;
+-
+-    public TriTask(long startTime, long endTime, long interval) {
+-      super.init(startTime, endTime, interval);
+-    }
+-
+-    @Override
+-    public void firstStep() {
+-      if (first) {
+-        Assert.fail();
+-      }
+-      first = true;
+-    }
+-
+-    @Override
+-    public void middleStep() {
+-      if (middle) {
+-        Assert.fail();
+-      }
+-      middle = true;
+-    }
+-
+-    @Override
+-    public void lastStep() {
+-      if (last) {
+-        Assert.fail();
+-      }
+-      last = true;
+-      latch.countDown();
+-    }
+-  }
+-
+-  @Test
+-  public void testTriTask() throws Exception {
+-    runner.start();
+-    runner.schedule(new TriTask(0, 10, 5));
+-    TriTask.latch.await(5000, TimeUnit.MILLISECONDS);
+-    Assert.assertTrue(TriTask.first);
+-    Assert.assertTrue(TriTask.middle);
+-    Assert.assertTrue(TriTask.last);
+-  }
+-
+-  public static class MultiTask extends TaskRunner.Task {
+-    public static CountDownLatch latch = new CountDownLatch(1);
+-    public static boolean first;
+-    public static int middle;
+-    public static boolean last;
+-
+-    public MultiTask(long startTime, long endTime, long interval) {
+-      super.init(startTime, endTime, interval);
+-    }
+-
+-    @Override
+-    public void firstStep() {
+-      if (first) {
+-        Assert.fail();
+-      }
+-      first = true;
+-    }
+-
+-    @Override
+-    public void middleStep() {
+-      middle++;
+-    }
+-
+-    @Override
+-    public void lastStep() {
+-      if (last) {
+-        Assert.fail();
+-      }
+-      last = true;
+-      latch.countDown();
+-    }
+-  }
+-
+-  @Test
+-  public void testMultiTask() throws Exception {
+-    runner.start();
+-    runner.schedule(new MultiTask(0, 20, 5));
+-    MultiTask.latch.await(5000, TimeUnit.MILLISECONDS);
+-    Assert.assertTrue(MultiTask.first);
+-    Assert.assertEquals((20 - 0) / 5 - 2 + 1, MultiTask.middle);
+-    Assert.assertTrue(MultiTask.last);
+-  }
+-
+-
+-  public static class PreStartTask extends TaskRunner.Task {
+-    public static CountDownLatch latch = new CountDownLatch(1);
+-    public static boolean first;
+-
+-    public PreStartTask(long startTime) {
+-      super.init(startTime);
+-    }
+-
+-    @Override
+-    public void firstStep() {
+-      if (first) {
+-        Assert.fail();
+-      }
+-      first = true;
+-      latch.countDown();
+-    }
+-
+-    @Override
+-    public void middleStep() {
+-    }
+-
+-    @Override
+-    public void lastStep() {
+-    }
+-  }
+-
+-  @Test
+-  public void testPreStartQueueing() throws Exception {
+-    runner.schedule(new PreStartTask(210));
+-    Thread.sleep(210);
+-    runner.start();
+-    long startedAt = System.currentTimeMillis();
+-    PreStartTask.latch.await(5000, TimeUnit.MILLISECONDS);
+-    long runAt = System.currentTimeMillis();
+-    Assert.assertTrue(PreStartTask.first);
+-    Assert.assertTrue(runAt - startedAt >= 200);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
+deleted file mode 100644
+index 5376a55cc63..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/utils/TestSLSUtils.java
++++ /dev/null
+@@ -1,144 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.utils;
+-
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.sls.SLSRunner.NodeDetails;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-public class TestSLSUtils {
+-
+-  @Test
+-  public void testGetRackHostname() {
+-    String str = "/rack1/node1";
+-    String[] rackHostname = SLSUtils.getRackHostName(str);
+-    Assert.assertEquals("rack1", rackHostname[0]);
+-    Assert.assertEquals("node1", rackHostname[1]);
+-
+-    str = "/rackA/rackB/node1";
+-    rackHostname = SLSUtils.getRackHostName(str);
+-    Assert.assertEquals("rackA/rackB", rackHostname[0]);
+-    Assert.assertEquals("node1", rackHostname[1]);
+-  }
+-
+-  @Test
+-  public void testParseNodesFromNodeFile() throws Exception {
+-    String nodeFile = "src/test/resources/nodes.json";
+-    Set<NodeDetails> nodeDetails = SLSUtils.parseNodesFromNodeFile(
+-        nodeFile, Resources.createResource(1024, 2));
+-    Assert.assertEquals(20, nodeDetails.size());
+-
+-    nodeFile = "src/test/resources/nodes-with-resources.json";
+-    nodeDetails = SLSUtils.parseNodesFromNodeFile(
+-        nodeFile, Resources.createResource(1024, 2));
+-    Assert.assertEquals(4, nodeDetails.size());
+-    for (NodeDetails nodeDetail : nodeDetails) {
+-      if (nodeDetail.getHostname().equals("/rack1/node1")) {
+-        Assert.assertEquals(2048,
+-            nodeDetail.getNodeResource().getMemorySize());
+-        Assert.assertEquals(6,
+-            nodeDetail.getNodeResource().getVirtualCores());
+-      } else if (nodeDetail.getHostname().equals("/rack1/node2")) {
+-        Assert.assertEquals(1024,
+-            nodeDetail.getNodeResource().getMemorySize());
+-        Assert.assertEquals(2,
+-            nodeDetail.getNodeResource().getVirtualCores());
+-        Assert.assertNull(nodeDetail.getLabels());
+-      } else if (nodeDetail.getHostname().equals("/rack1/node3")) {
+-        Assert.assertEquals(1024,
+-            nodeDetail.getNodeResource().getMemorySize());
+-        Assert.assertEquals(2,
+-            nodeDetail.getNodeResource().getVirtualCores());
+-        Assert.assertEquals(2, nodeDetail.getLabels().size());
+-        for (NodeLabel nodeLabel : nodeDetail.getLabels()) {
+-          if (nodeLabel.getName().equals("label1")) {
+-            Assert.assertTrue(nodeLabel.isExclusive());
+-          } else if(nodeLabel.getName().equals("label2")) {
+-            Assert.assertFalse(nodeLabel.isExclusive());
+-          } else {
+-            Assert.fail("Unexpected label");
+-          }
+-        }
+-      } else if (nodeDetail.getHostname().equals("/rack1/node4")) {
+-        Assert.assertEquals(6144,
+-            nodeDetail.getNodeResource().getMemorySize());
+-        Assert.assertEquals(12,
+-            nodeDetail.getNodeResource().getVirtualCores());
+-        Assert.assertEquals(2, nodeDetail.getLabels().size());
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testGenerateNodes() {
+-    Set<NodeDetails> nodes = SLSUtils.generateNodes(3, 3);
+-    Assert.assertEquals("Number of nodes is wrong.", 3, nodes.size());
+-    Assert.assertEquals("Number of racks is wrong.", 3, getNumRack(nodes));
+-
+-    nodes = SLSUtils.generateNodes(3, 1);
+-    Assert.assertEquals("Number of nodes is wrong.", 3, nodes.size());
+-    Assert.assertEquals("Number of racks is wrong.", 1, getNumRack(nodes));
+-
+-    nodes = SLSUtils.generateNodes(3, 4);
+-    Assert.assertEquals("Number of nodes is wrong.", 3, nodes.size());
+-    Assert.assertEquals("Number of racks is wrong.", 3, getNumRack(nodes));
+-
+-    nodes = SLSUtils.generateNodes(3, 0);
+-    Assert.assertEquals("Number of nodes is wrong.", 3, nodes.size());
+-    Assert.assertEquals("Number of racks is wrong.", 1, getNumRack(nodes));
+-  }
+-
+-  /**
+-   * Tests creation of table mapping based on given node details.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testGenerateNodeTableMapping() throws Exception {
+-    Set<NodeDetails> nodes = SLSUtils.generateNodes(3, 3);
+-    File tempFile = File.createTempFile("testslsutils", ".tmp");
+-    tempFile.deleteOnExit();
+-    String fileName = tempFile.getAbsolutePath();
+-    SLSUtils.generateNodeTableMapping(nodes, fileName);
+-
+-    List<String> lines = Files.readAllLines(Paths.get(fileName));
+-    Assert.assertEquals(3, lines.size());
+-    for (String line : lines) {
+-      Assert.assertTrue(line.contains("node"));
+-      Assert.assertTrue(line.contains("/rack"));
+-    }
+-  }
+-
+-  private int getNumRack(Set<NodeDetails> nodes) {
+-    Set<String> racks = new HashSet<>();
+-    for (NodeDetails node : nodes) {
+-      String[] rackHostname = SLSUtils.getRackHostName(node.getHostname());
+-      racks.add(rackHostname[0]);
+-    }
+-    return racks.size();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
+deleted file mode 100644
+index c3f66a0b74d..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/web/TestSLSWebApp.java
++++ /dev/null
+@@ -1,122 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.sls.web;
+-
+-import org.junit.Assert;
+-import org.apache.commons.io.FileUtils;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.nio.charset.StandardCharsets;
+-import java.text.MessageFormat;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.HashMap;
+-
+-public class TestSLSWebApp {
+-
+-  @Test
+-  public void testSimulateInfoPageHtmlTemplate() throws Exception {
+-    String simulateInfoTemplate = FileUtils.readFileToString(
+-            new File("src/main/html/simulate.info.html.template"), StandardCharsets.UTF_8);
+-
+-    Map<String, Object> simulateInfoMap = new HashMap<>();
+-    simulateInfoMap.put("Number of racks", 10);
+-    simulateInfoMap.put("Number of nodes", 100);
+-    simulateInfoMap.put("Node memory (MB)", 1024);
+-    simulateInfoMap.put("Node VCores", 1);
+-    simulateInfoMap.put("Number of applications", 100);
+-    simulateInfoMap.put("Number of tasks", 1000);
+-    simulateInfoMap.put("Average tasks per applicaion", 10);
+-    simulateInfoMap.put("Number of queues", 4);
+-    simulateInfoMap.put("Average applications per queue", 25);
+-    simulateInfoMap.put("Estimated simulate time (s)", 10000);
+-
+-    StringBuilder info = new StringBuilder();
+-    for (Map.Entry<String, Object> entry :
+-        simulateInfoMap.entrySet()) {
+-      info.append("<tr>");
+-      info.append("<td class='td1'>" + entry.getKey() + "</td>");
+-      info.append("<td class='td2'>" + entry.getValue() + "</td>");
+-      info.append("</tr>");
+-    }
+-
+-    String simulateInfo =
+-            MessageFormat.format(simulateInfoTemplate, info.toString());
+-    Assert.assertTrue("The simulate info html page should not be empty",
+-            simulateInfo.length() > 0);
+-    for (Map.Entry<String, Object> entry : simulateInfoMap.entrySet()) {
+-      Assert.assertTrue("The simulate info html page should have information "
+-              + "of " + entry.getKey(), simulateInfo.contains("<td class='td1'>"
+-              + entry.getKey() + "</td><td class='td2'>"
+-              + entry.getValue() + "</td>"));
+-    }
+-  }
+-
+-  @Test
+-  public void testSimulatePageHtmlTemplate() throws Exception {
+-    String simulateTemplate = FileUtils.readFileToString(
+-            new File("src/main/html/simulate.html.template"), StandardCharsets.UTF_8);
+-
+-    Set<String> queues = new HashSet<String>();
+-    queues.add("sls_queue_1");
+-    queues.add("sls_queue_2");
+-    queues.add("sls_queue_3");
+-    String queueInfo = "";
+-    int i = 0;
+-    for (String queue : queues) {
+-      queueInfo += "legends[4][" + i + "] = 'queue" + queue
+-              + ".allocated.memory'";
+-      queueInfo += "legends[5][" + i + "] = 'queue" + queue
+-              + ".allocated.vcores'";
+-      i ++;
+-    }
+-    String simulateInfo = MessageFormat.format(simulateTemplate,
+-            queueInfo, "s", 1000, 1000);
+-    Assert.assertTrue("The simulate page html page should not be empty",
+-            simulateInfo.length() > 0);
+-  }
+-
+-  @Test
+-  public void testTrackPageHtmlTemplate() throws Exception {
+-    String trackTemplate = FileUtils.readFileToString(
+-            new File("src/main/html/track.html.template"), StandardCharsets.UTF_8);
+-    String trackedQueueInfo = "";
+-    Set<String> trackedQueues = new HashSet<String>();
+-    trackedQueues.add("sls_queue_1");
+-    trackedQueues.add("sls_queue_2");
+-    trackedQueues.add("sls_queue_3");
+-    for(String queue : trackedQueues) {
+-      trackedQueueInfo += "<option value='Queue " + queue + "'>"
+-              + queue + "</option>";
+-    }
+-    String trackedAppInfo = "";
+-    Set<String> trackedApps = new HashSet<String>();
+-    trackedApps.add("app_1");
+-    trackedApps.add("app_2");
+-    for(String job : trackedApps) {
+-      trackedAppInfo += "<option value='Job " + job + "'>" + job + "</option>";
+-    }
+-    String trackInfo = MessageFormat.format(trackTemplate, trackedQueueInfo,
+-            trackedAppInfo, "s", 1000, 1000);
+-    Assert.assertTrue("The queue/app tracking html page should not be empty",
+-            trackInfo.length() > 0);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml b/hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml
+deleted file mode 100644
+index 1762265f6d8..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/capacity-scheduler.xml
++++ /dev/null
+@@ -1,70 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<!--
+-  This file contains queue allocations for the Capacity Scheduler.
+-  Its format is explained in the Capacity Scheduler documentation at
+-  http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html.
+-  The documentation also includes a sample config file.
+--->
+-
+-<configuration>
+-  <property>
+-    <name>yarn.scheduler.capacity.root.queues</name>
+-    <value>sls_queue_1,sls_queue_2,sls_queue_3</value>
+-    <description>The queues at the this level (root is the root queue).
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.capacity</name>
+-    <value>25</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.reservable</name>
+-    <value>true</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_1.show-reservations-as-queues</name>
+-    <value>true</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_2.capacity</name>
+-    <value>25</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_2.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_3.capacity</name>
+-    <value>50</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.sls_queue_3.maximum-capacity</name>
+-    <value>100</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/exit-invariants.txt b/hadoop-tools/hadoop-sls/src/test/resources/exit-invariants.txt
+deleted file mode 100644
+index b4a3228be51..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/exit-invariants.txt
++++ /dev/null
+@@ -1,8 +0,0 @@
+-ActiveApplications >= 0
+-AppsCompleted >= 0
+-AppsFailed >= 0
+-AppsKilled >= 0
+-AppsPending >= 0
+-AppsRunning >= 0
+-AppsSubmitted >= 0
+-PendingContainers >= 0
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml b/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
+deleted file mode 100644
+index 7c46767737f..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/fair-scheduler.xml
++++ /dev/null
+@@ -1,52 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<!--
+-  This file contains pool and user allocations for the Fair Scheduler.
+-  Its format is explained in the Fair Scheduler documentation at
+-  http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html.
+-  The documentation also includes a sample config file.
+--->
+-
+-<allocations>
+-  <defaultQueueSchedulingPolicy>drf</defaultQueueSchedulingPolicy>
+-  <user name="jenkins">
+-    <!-- Limit on running jobs for the user across all pools. If more
+-      jobs than this are submitted, only the first <maxRunningJobs> will
+-      be scheduled at any given time. Defaults to infinity or the
+-      userMaxJobsDefault value set below. -->
+-    <maxRunningJobs>1000</maxRunningJobs>
+-  </user>
+-  <userMaxAppsDefault>1000</userMaxAppsDefault>
+-  <queue name="sls_queue_1">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <schedulingPolicy>drf</schedulingPolicy>
+-    <weight>0.25</weight>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-    <reservation>true</reservation>
+-  </queue>
+-  <queue name="sls_queue_2">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <schedulingMode>drf</schedulingMode>
+-    <weight>0.25</weight>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-  </queue>
+-  <queue name="sls_queue_3">
+-    <minResources>1024 mb, 1 vcores</minResources>
+-    <weight>0.5</weight>
+-    <schedulingMode>drf</schedulingMode>
+-    <minSharePreemptionTimeout>2</minSharePreemptionTimeout>
+-  </queue>
+-</allocations>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/inputsls.json b/hadoop-tools/hadoop-sls/src/test/resources/inputsls.json
+deleted file mode 100644
+index 3d46b5ea6ec..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/inputsls.json
++++ /dev/null
+@@ -1,63 +0,0 @@
+-{
+-  "am.type": "mapreduce",
+-  "job.start.ms": 0,
+-  "job.end.ms": 95375,
+-  "job.queue.name": "sls_queue_1",
+-  "job.id": "job_1",
+-  "job.user": "default",
+-  "job.tasks": [
+-    {
+-      "container.host": "/default-rack/node1",
+-      "container.start.ms": 6664,
+-      "container.end.ms": 23707,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED",
+-      "container.allocation.id": 1
+-    },
+-    {
+-      "container.host": "/default-rack/node3",
+-      "container.start.ms": 6665,
+-      "container.end.ms": 21593,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED",
+-      "container.allocation.id": 2
+-    },
+-    {
+-      "container.host": "/default-rack/node2",
+-      "container.start.ms": 68770,
+-      "container.end.ms": 86613,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED",
+-      "container.allocation.id": 2
+-    }
+-  ]
+-}
+-{
+-  "am.type": "mapreduce",
+-  "job.start.ms": 105204,
+-  "job.end.ms": 197256,
+-  "job.queue.name": "sls_queue_2",
+-  "job.id": "job_2",
+-  "job.user": "default",
+-  "job.tasks": [
+-    {
+-      "container.host": "/default-rack/node1",
+-      "container.start.ms": 111822,
+-      "container.end.ms": 133985,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    },
+-    {
+-      "container.host": "/default-rack/node2",
+-      "container.start.ms": 111788,
+-      "container.end.ms": 131377,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/log4j.properties b/hadoop-tools/hadoop-sls/src/test/resources/log4j.properties
+deleted file mode 100644
+index 81a3f6ad5d2..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/nodes-with-resources.json b/hadoop-tools/hadoop-sls/src/test/resources/nodes-with-resources.json
+deleted file mode 100644
+index dc5f0203c56..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/nodes-with-resources.json
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{
+-  "rack": "rack1",
+-  "nodes": [
+-    {
+-      "node": "node1",
+-      "memory-mb" : 2048,
+-      "vcores" : 6
+-    },
+-    {
+-      "node": "node2"
+-    },
+-    {
+-      "node": "node3",
+-      "labels": "label1, label2(exclusive=false)"
+-    },
+-    {
+-      "node": "node4",
+-      "labels": "label1, label2(exclusive=false)",
+-      "memory-mb" : 6144,
+-      "vcores" : 12
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/nodes.json b/hadoop-tools/hadoop-sls/src/test/resources/nodes.json
+deleted file mode 100644
+index 3039554bfdf..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/nodes.json
++++ /dev/null
+@@ -1,84 +0,0 @@
+-{
+-  "rack": "rack1",
+-  "nodes": [
+-    {
+-      "node": "node1"
+-    },
+-    {
+-      "node": "node2"
+-    },
+-    {
+-      "node": "node3"
+-    },
+-    {
+-      "node": "node4"
+-    }
+-  ]
+-}
+-{
+-  "rack": "rack2",
+-  "nodes": [
+-    {
+-      "node": "node5"
+-    },
+-    {
+-      "node": "node6"
+-    },
+-    {
+-      "node": "node7"
+-    },
+-    {
+-      "node": "node8"
+-    }
+-  ]
+-}
+-{
+-  "rack": "rack3",
+-  "nodes": [
+-    {
+-      "node": "node9"
+-    },
+-    {
+-      "node": "node10"
+-    },
+-    {
+-      "node": "node11"
+-    },
+-    {
+-      "node": "node12"
+-    }
+-  ]
+-}
+-{
+-  "rack": "rack4",
+-  "nodes": [
+-    {
+-      "node": "node13"
+-    },
+-    {
+-      "node": "node14"
+-    },
+-    {
+-      "node": "node15"
+-    },
+-    {
+-      "node": "node16"
+-    }
+-  ]
+-}
+-{
+-  "rack": "rack5",
+-  "nodes": [
+-    {
+-      "node": "node17"
+-    },
+-    {
+-      "node": "node18"
+-    },
+-    {
+-      "node": "node19"
+-    },
+-    {
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/ongoing-invariants.txt b/hadoop-tools/hadoop-sls/src/test/resources/ongoing-invariants.txt
+deleted file mode 100644
+index 363ed0d996e..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/ongoing-invariants.txt
++++ /dev/null
+@@ -1,54 +0,0 @@
+-running_0 >= 0
+-running_60 >= 0
+-running_300 >= 0
+-running_1440 >= 0
+-AppsSubmitted >= 0
+-AppsRunning >= 0
+-AppsPending >= 0
+-AppsCompleted >= 0
+-AppsKilled >= 0
+-AppsFailed >= 0
+-AllocatedMB >= 0
+-AllocatedVCores >= 0
+-AllocatedContainers >= 0
+-AggregateContainersAllocated >= 0
+-AggregateNodeLocalContainersAllocated >= 0
+-AggregateRackLocalContainersAllocated >= 0
+-AggregateOffSwitchContainersAllocated >= 0
+-AggregateContainersReleased >= 0
+-AggregateContainersPreempted >= 0
+-AvailableMB >= 0
+-AvailableVCores >= 0
+-PendingMB >= 0
+-PendingVCores >= 0
+-PendingContainers >= 0
+-ReservedMB >= 0
+-ReservedVCores >= 0
+-ReservedContainers >= 0
+-ActiveUsers >= 0
+-ActiveApplications >= 0
+-AppAttemptFirstContainerAllocationDelayNumOps >= 0
+-AppAttemptFirstContainerAllocationDelayAvgTime >= 0
+-MemNonHeapUsedM >= 0
+-MemNonHeapCommittedM >= 0
+-MemNonHeapMaxM >= 0 || MemNonHeapMaxM == -1
+-MemHeapUsedM >= 0
+-MemHeapCommittedM >= 0
+-MemHeapMaxM >= 0
+-MemMaxM >= 0
+-GcCountPS_Scavenge >= 0
+-GcTimeMillisPS_Scavenge >= 0
+-GcCountPS_MarkSweep >= 0
+-GcTimeMillisPS_MarkSweep >= 0
+-GcCount >= 0
+-GcTimeMillis >= 0
+-ThreadsNew >= 0
+-ThreadsRunnable >= 0
+-ThreadsBlocked >= 0
+-ThreadsWaiting >= 0
+-ThreadsTimedWaiting >= 0
+-ThreadsTerminated >= 0
+-LogFatal >= 0
+-LogError >= 0
+-LogWarn >= 0
+-LogInfo >= 0
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template b/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
+deleted file mode 100644
+index 1b897134f1f..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/simulate.html.template
++++ /dev/null
+@@ -1,278 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-      <link rel="stylesheet" href="css/bootstrap.min.css" media="screen">
+-      <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+-      <style type="text/css">
+-        body '{' font: 20px sans-serif; '}'
+-        .axis path,
+-        .axis line '{' fill: none; stroke: #000; shape-rendering: crispEdges; '}'
+-        .axis text '{' font-family: sans-serif; font-size: 20px; '}'
+-        .line '{' fill: none; stroke: steelblue; stroke-width: 3px; '}'
+-        .legend '{'
+-          padding: 5px;
+-          font: 18px sans-serif;
+-          background: yellow;
+-          box-shadow: 2px 2px 1px #888;
+-        '}'
+-        .title '{' font: 24px sans-serif; '}'
+-        .divborder '{'
+-          border-width: 1px;
+-          border-style: solid;
+-          border-color: black;
+-          margin-top:10px
+-        '}'
+-      </style>
+-      <script src="js/thirdparty/d3.v3.js"></script>
+-      <script src="js/thirdparty/jquery.js"></script>
+-      <script src="js/thirdparty/bootstrap.min.js"></script>
+-    </head>
+-  <body>
+-    <div class="row">
+-      <div class="span10 offset2"><br>
+-        <input type="button" style="float: right;" value="Stop"
+-               onClick="stop()" />
+-      </div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area1"></div>
+-      <div class="divborder span8" id="area2"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area3"></div>
+-      <div class="divborder span8" id="area4"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area5"></div>
+-      <div class="divborder span8" id="area6"></div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span8" style="margin-left:50px" id="area7"></div>
+-      <div class="span8" id="area8"></div>
+-    </div><br/><br/>
+-
+-    <script>
+-      var basetime = 0;
+-      var running = 1;
+-      var data = [];
+-      var width, height;
+-      var legends = [];
+-      var titles = [];
+-      var yLabels = [];
+-      var isAreas = [];
+-      var svgs = [];
+-      var xs = [];
+-      var ys = [];
+-      var xAxiss = [];
+-      var yAxiss = [];
+-      var lineAreas = [];
+-      var stacks = [];
+-
+-      // legends
+-      legends[0] = [''running.applications'', ''running.containers''];
+-      legends[1] = [''jvm.free.memory'', ''jvm.max.memory'', ''jvm.total.memory''];
+-      legends[2] = [''cluster.allocated.memory'', ''cluster.available.memory''];
+-      legends[3] = [''cluster.allocated.vcores'', ''cluster.available.vcores''];
+-      legends[4] = [];
+-      legends[5] = [];
+-      {0}
+-      legends[6] = [''scheduler.allocate.timecost'',
+-                    ''scheduler.handle-NODE_ADDED.timecost'',
+-                    ''scheduler.handle-NODE_REMOVED.timecost'',
+-                    ''scheduler.handle-NODE_UPDATE.timecost'',
+-                    ''scheduler.handle-APP_ADDED.timecost'',
+-                    ''scheduler.handle-APP_REMOVED.timecost'',
+-                    ''scheduler.handle-CONTAINER_EXPIRED.timecost''];
+-
+-      // title
+-      titles[0] = ''Cluster running applications & containers'';
+-      titles[1] = ''JVM memory'';
+-      titles[2] = ''Cluster allocated & available memory'';
+-      titles[3] = ''Cluster allocated & available vcores'';
+-      titles[4] = ''Queue allocated memory'';
+-      titles[5] = ''Queue allocated vcores'';
+-      titles[6] = ''Scheduler allocate & handle operation timecost'';
+-
+-      // ylabels
+-      yLabels[0] = ''Number'';
+-      yLabels[1] = ''Memory (GB)'';
+-      yLabels[2] = ''Memory (GB)'';
+-      yLabels[3] = ''Number'';
+-      yLabels[4] = ''Memory (GB)'';
+-      yLabels[5] = ''Number'';
+-      yLabels[6] = ''Timecost (ms)'';
+-
+-      // is area?
+-      isAreas = [0, 0, 0, 0, 1, 1, 0];
+-
+-      // draw all charts
+-      for (var i = 0; i < 7; i ++) '{'
+-        drawEachChart(i);
+-      '}'
+-
+-      // draw each chart
+-      function drawEachChart(index) '{'
+-        var margin = '{'top: 50, right: 250, bottom: 50, left: 70'}';
+-        width = 750 - margin.left - margin.right;
+-        height = 420 - margin.top - margin.bottom;
+-
+-      xs[index] = d3.scale.linear().range([0, width]);
+-      ys[index] = d3.scale.linear().range([height, 0]);
+-      xAxiss[index] = d3.svg.axis().scale(xs[index]).orient(''bottom'');
+-      yAxiss[index] = d3.svg.axis().scale(ys[index]).orient(''left'');
+-
+-      if (isAreas[index] == 1)'{'
+-        lineAreas[index] = d3.svg.area()
+-                            .x(function(d) '{' return xs[index](d.time); '}')
+-                            .y0(function(d) '{' return ys[index](d.y0); '}')
+-                            .y1(function(d) '{' return ys[index](d.y0 + d.y); '}');
+-
+-        stacks[index] = d3.layout.stack()
+-                          .values(function(d) '{' return d.values; '}');
+-      '}' else '{'
+-        lineAreas[index] = d3.svg.line()
+-                            .interpolate(''basis'')
+-                            .x(function(d) '{' return xs[index](d.time); '}')
+-                            .y(function(d) '{' return ys[index](d.value); '}');
+-      '}'
+-
+-      svgs[index] = d3.select(''#area'' + (index + 1)).append(''svg'')
+-        .attr(''width'', width + margin.left + margin.right)
+-        .attr(''height'', height + margin.top + margin.bottom)
+-        .append(''g'')
+-        .attr(''transform'', ''translate('' + margin.left + '','' + margin.top + '')'');
+-
+-      // x, y and title
+-      svgs[index].append(''text'')
+-        .attr(''transform'', ''translate('' + (width / 2) + '' ,'' +
+-              (height + margin.bottom - 10 ) + '')'')
+-        .style(''text-anchor'', ''middle'')
+-        .text(''Time ({1})'');
+-
+-      svgs[index].append(''text'')
+-        .attr(''transform'', ''rotate(-90)'')
+-        .attr(''y'', 0 - margin.left)
+-        .attr(''x'',0 - (height / 2))
+-        .attr(''dy'', ''1em'')
+-        .style(''text-anchor'', ''middle'')
+-        .text(yLabels[index]);
+-
+-      svgs[index].append(''text'')
+-        .attr(''x'', (width / 2))
+-        .attr(''y'', 10 - (margin.top / 2))
+-        .attr(''text-anchor'', ''middle'')
+-        .text(titles[index]);
+-    '}'
+-
+-    // request data
+-    function requestData() '{'
+-      $.ajax('{'url: ''simulateMetrics'',
+-        success: function(point) '{'
+-          // update data
+-          if (basetime == 0)  basetime = point.time;
+-          point.time = (point.time - basetime) / {2};
+-          data.push(point);
+-
+-          // clear old
+-          for (var i = 0; i < 7; i ++) '{'
+-            svgs[i].selectAll(''g.tick'').remove();
+-            svgs[i].selectAll(''g'').remove();
+-            var color = d3.scale.category10();
+-            color.domain(d3.keys(data[0]).filter(function(key) '{'
+-              return $.inArray(key, legends[i]) !== -1;
+-            '}'));
+-
+-            var values;
+-            if (isAreas[i] == 1) '{'
+-              values = stacks[i](color.domain().map(function(name) '{'
+-                return '{'
+-                  name: name,
+-                  values: data.map(function(d) '{'
+-                    return '{'time: d.time, y: d[name]'}';
+-                  '}')
+-                '}'
+-              '}'));
+-              xs[i].domain(d3.extent(data, function(d) '{' return d.time;'}'));
+-              ys[i].domain([
+-                d3.min(values, function(c) '{' return 0; '}'),
+-                d3.max(values, function(c) '{' return 1.1 * d3.max(c.values,
+-                                        function(v) '{' return v.y + v.y0; '}'); '}')
+-              ]);
+-            '}' else '{'
+-              values = color.domain().map(function(name) '{'
+-                return '{'
+-                  name: name,
+-                  values: data.map(function(d) '{'
+-                    return '{'time: d.time, value: d[name]'}';
+-                  '}')
+-                '}'
+-              '}');
+-              xs[i].domain(d3.extent(data, function(d) '{' return d.time;'}'));
+-              ys[i].domain([
+-                d3.min(values, function(c) '{' return 0; '}'),
+-                d3.max(values, function(c) '{' return 1.1 * d3.max(c.values,
+-                                        function(v) '{' return v.value; '}'); '}')
+-              ]);
+-            '}'
+-
+-            svgs[i].append(''g'').attr(''class'', ''x axis'')
+-              .attr(''transform'', ''translate(0,'' + height + '')'').call(xAxiss[i]);
+-
+-            svgs[i].append(''g'').attr(''class'', ''y axis'').call(yAxiss[i]);
+-
+-            var value = svgs[i].selectAll(''.path'')
+-              .data(values).enter().append(''g'').attr(''class'', ''line'');
+-
+-            if(isAreas[i] == 1) '{'
+-              value.append(''path'').attr(''class'', ''area'')
+-                    .attr(''d'', function(d) '{'return lineAreas[i](d.values); '}')
+-                    .style(''fill'', function(d) '{'return color(d.name); '}');
+-            '}' else '{'
+-              value.append(''path'').attr(''class'', ''line'')
+-                    .attr(''d'', function(d) '{'return lineAreas[i](d.values); '}')
+-                    .style(''stroke'', function(d) '{'return color(d.name); '}');
+-            '}'
+-
+-            // legend
+-            var legend = svgs[i].append(''g'')
+-              .attr(''class'', ''legend'')
+-              .attr(''x'', width + 5)
+-              .attr(''y'', 25)
+-              .attr(''height'', 120)
+-              .attr(''width'', 140);
+-            legend.selectAll(''g'').data(legends[i])
+-              .enter()
+-              .append(''g'')
+-              .each(function(d, i) '{'
+-                var g = d3.select(this);
+-                g.append(''rect'')
+-                  .attr(''x'', width + 5)
+-                  .attr(''y'', i*20)
+-                  .attr(''width'', 10)
+-                  .attr(''height'', 10)
+-                  .style(''fill'', color(d));
+-                g.append(''text'')
+-                  .attr(''x'', width + 25)
+-                  .attr(''y'', i * 20 + 8)
+-                  .attr(''height'',30)
+-                  .attr(''width'',250)
+-                  .style(''fill'', color(d))
+-                  .text(d);
+-              '}');
+-            '}'
+-
+-            if(running == 1)
+-              setTimeout(requestData, {3});
+-          '}',
+-          cache: false
+-        '}');
+-      '}'
+-
+-      // stop
+-      function stop() '{'
+-        running = 0;
+-      '}'
+-      requestData();
+-    </script>
+-  </body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template b/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
+deleted file mode 100644
+index ead508fed9a..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/simulate.info.html.template
++++ /dev/null
+@@ -1,50 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <style type="text/css">
+-      .td1 '{'
+-        border-width: 1px;
+-        padding: 8px;
+-        border-style: solid;
+-        border-color: #666666;
+-        background-color: #dedede;
+-        width: 50%;
+-      '}'
+-      table.gridtable '{'
+-        font-family: verdana,arial,sans-serif;
+-        font-size:11px;
+-        color:#333333;
+-        border-width: 1px;
+-        border-color: #666666;
+-        border-collapse: collapse;
+-        margin-top: 80px;
+-      '}'
+-      .td2 '{'
+-        border-width: 1px;
+-        padding: 8px;
+-        border-style: solid;
+-        border-color: #666666;
+-        background-color: #ffffff;
+-        width: 50%;
+-      '}'
+-    </style>
+-  </head>
+-  <body>
+-    <table class="gridtable" align="center" width="400px">
+-      <tr>
+-        <td colspan="2" class="td2" align="center">
+-          <b>SLS Simulate Information</b>
+-        </td>
+-      </tr>
+-      {0}
+-      <tr>
+-        <td align="center" height="80px">
+-          <a href="simulate">Simulation Charts</a>
+-        </td>
+-        <td align="center">
+-          <a href="track">Tracked Jobs & Queues</a>
+-        </td>
+-      </tr>
+-    </table>
+-  </body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml b/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
+deleted file mode 100644
+index 1c76aa97305..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/sls-runner.xml
++++ /dev/null
+@@ -1,89 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-
+-  <!-- SLSRunner configuration -->
+-  <property>
+-    <name>yarn.sls.runner.pool.size</name>
+-    <value>100</value>
+-  </property>
+-  
+-  <!-- Nodes configuration -->
+-  <property>
+-    <name>yarn.sls.nm.memory.mb</name>
+-    <value>100240</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.nm.vcores</name>
+-    <value>100</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.nm.heartbeat.interval.ms</name>
+-    <value>1000</value>
+-  </property>
+-  
+-  <!-- Apps configuration -->
+-  <property>
+-    <name>yarn.sls.am.heartbeat.interval.ms</name>
+-    <value>1000</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.am.type.mapreduce</name>
+-    <value>org.apache.hadoop.yarn.sls.appmaster.MRAMSimulator</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.am.type.stream</name>
+-    <value>org.apache.hadoop.yarn.sls.appmaster.StreamAMSimulator</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.am.type.dag</name>
+-    <value>org.apache.hadoop.yarn.sls.appmaster.DAGAMSimulator</value>
+-  </property>
+-
+-  <!-- Containers configuration -->
+-  <property>
+-    <name>yarn.sls.container.memory.mb</name>
+-    <value>1024</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.container.vcores</name>
+-    <value>1</value>
+-  </property>
+-
+-  <!--  metrics  -->
+-  <property>
+-    <name>yarn.sls.metrics.switch</name>
+-    <value>ON</value>
+-  </property>
+-  <property>
+-    <name>yarn.sls.metrics.web.address.port</name>
+-    <value>10001</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.FifoSchedulerMetrics</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.FairSchedulerMetrics</value>
+-  </property>
+-  <property>
+-    <name>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</name>
+-    <value>org.apache.hadoop.yarn.sls.scheduler.CapacitySchedulerMetrics</value>
+-  </property>
+-
+-</configuration>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/sls_dag.json b/hadoop-tools/hadoop-sls/src/test/resources/sls_dag.json
+deleted file mode 100644
+index 13e2adcab8a..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/sls_dag.json
++++ /dev/null
+@@ -1,62 +0,0 @@
+-{
+-  "yarn.sls.am.type": "dag",
+-  "job.start.ms": 0,
+-  "job.end.ms": 95375,
+-  "job.queue.name": "sls_queue_1",
+-  "job.id": "job_1",
+-  "job.user": "default",
+-  "job.tasks": [
+-    {
+-      "container.host": "/default-rack/node1",
+-      "container.request.delay": 1000,
+-      "container.start.ms": 6664,
+-      "container.end.ms": 23707,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    },
+-    {
+-      "container.host": "/default-rack/node3",
+-      "container.request.delay": 1500,
+-      "container.start.ms": 6665,
+-      "container.end.ms": 21593,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    },
+-    {
+-      "container.host": "/default-rack/node2",
+-      "container.start.ms": 68770,
+-      "container.end.ms": 86613,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    }
+-  ]
+-}
+-{
+-  "yarn.sls.am.type": "dag",
+-  "job.start.ms": 105204,
+-  "job.end.ms": 197256,
+-  "job.queue.name": "sls_queue_2",
+-  "job.id": "job_2",
+-  "job.user": "default",
+-  "job.tasks": [
+-    {
+-      "container.host": "/default-rack/node1",
+-      "container.start.ms": 111822,
+-      "container.end.ms": 133985,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    },
+-    {
+-      "container.host": "/default-rack/node2",
+-      "container.start.ms": 111788,
+-      "container.end.ms": 131377,
+-      "container.priority": 20,
+-      "container.type": "map",
+-      "container.execution.type": "GUARANTEED"
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/syn.json b/hadoop-tools/hadoop-sls/src/test/resources/syn.json
+deleted file mode 100644
+index 2e0cb5cebdd..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/syn.json
++++ /dev/null
+@@ -1,55 +0,0 @@
+-{
+-  "description": "tiny jobs workload",
+-  "num_nodes": 20,
+-  "nodes_per_rack": 4,
+-  "num_jobs": 10,
+-  "rand_seed": 2,
+-  "workloads": [
+-    {
+-      "workload_name": "tiny-test",
+-      "workload_weight": 0.5,
+-      "description": "Sort jobs",
+-      "queue_name": "sls_queue_1",
+-      "job_classes": [
+-        {
+-          "class_name": "class_1",
+-          "user_name": "foobar",
+-          "class_weight": 1.0,
+-          "mtasks_avg": 5,
+-          "mtasks_stddev": 1,
+-          "rtasks_avg": 5,
+-          "rtasks_stddev": 1,
+-          "dur_avg": 60,
+-          "dur_stddev": 5,
+-          "mtime_avg": 10,
+-          "mtime_stddev": 2,
+-          "rtime_avg": 20,
+-          "rtime_stddev": 4,
+-          "map_max_memory_avg": 1024,
+-          "map_max_memory_stddev": 0.001,
+-          "map_execution_type": "GUARANTEED",
+-          "reduce_max_memory_avg": 2048,
+-          "reduce_max_memory_stddev": 0.001,
+-          "reduce_execution_type": "GUARANTEED",
+-          "map_max_vcores_avg": 1,
+-          "map_max_vcores_stddev": 0.001,
+-          "reduce_max_vcores_avg": 2,
+-          "reduce_max_vcores_stddev": 0.001,
+-          "chance_of_reservation": 0.5,
+-          "deadline_factor_avg": 10.0,
+-          "deadline_factor_stddev": 0.001
+-        }
+-      ],
+-      "time_distribution": [
+-        {
+-          "time": 1,
+-          "weight": 100
+-        },
+-        {
+-          "time": 60,
+-          "weight": 0
+-        }
+-      ]
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/syn_generic.json b/hadoop-tools/hadoop-sls/src/test/resources/syn_generic.json
+deleted file mode 100644
+index 3afb9530e6b..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/syn_generic.json
++++ /dev/null
+@@ -1,56 +0,0 @@
+-{
+-  "description": "tiny jobs workload",
+-  "num_nodes": 20,
+-  "nodes_per_rack": 4,
+-  "num_jobs": 10,
+-  "rand_seed": 2,
+-  "workloads": [
+-    {
+-      "workload_name": "tiny-test",
+-      "workload_weight": 0.5,
+-      "description": "Sort jobs",
+-      "queue_name": "sls_queue_1",
+-      "job_classes": [
+-        {
+-          "class_name": "class_1",
+-          "user_name": "foobar",
+-          "class_weight": 1.0,
+-          "type": "mapreduce",
+-          "deadline_factor": {"val": 10},
+-          "duration": {"val": 60, "std": 5},
+-          "reservation": {"val": 0.5},
+-          "tasks":[
+-            {
+-              "type": "map",
+-              "priority": 20,
+-              "count": { "val": 5, "std": 1},
+-              "time": {"val": 10, "std": 2},
+-              "max_memory": {"val": 1024},
+-              "max_vcores": {"val": 1},
+-              "execution_type": "GUARANTEED"
+-            },
+-            {
+-              "type": "reduce",
+-              "priority": 10,
+-              "count": { "val": 5, "std": 1},
+-              "time": {"val": 20, "std": 4},
+-              "max_memory": {"val": 2048},
+-              "max_vcores": {"val": 2},
+-              "execution_type": "GUARANTEED"
+-            }
+-          ]
+-        }
+-      ],
+-      "time_distribution": [
+-        {
+-          "time": 1,
+-          "weight": 100
+-        },
+-        {
+-          "time": 60,
+-          "weight": 0
+-        }
+-      ]
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/syn_stream.json b/hadoop-tools/hadoop-sls/src/test/resources/syn_stream.json
+deleted file mode 100644
+index a52de408849..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/syn_stream.json
++++ /dev/null
+@@ -1,47 +0,0 @@
+-{
+-  "description": "stream workload",
+-  "num_nodes": 20,
+-  "nodes_per_rack": 4,
+-  "num_jobs": 5,
+-  "rand_seed": 2,
+-  "workloads": [
+-    {
+-      "workload_name": "tiny-test",
+-      "workload_weight": 1,
+-      "description": "long lived streaming jobs",
+-      "queue_name": "sls_queue_1",
+-      "job_classes": [
+-        {
+-          "class_name": "class_1",
+-          "user_name": "foobar",
+-          "class_weight": 1.0,
+-          "type": "stream",
+-          "deadline_factor": {"val": 10},
+-          "duration": {"val": 30, "std": 5},
+-          "reservation": {"val": 0.5},
+-          "tasks":[
+-            {
+-              "type": "stream",
+-              "priority": 20,
+-              "count": { "val": 2},
+-              "time": {"val": 60000},
+-              "max_memory": {"val": 4096},
+-              "max_vcores": {"val": 4},
+-              "execution_type": "GUARANTEED"
+-            }
+-          ]
+-        }
+-      ],
+-      "time_distribution": [
+-        {
+-          "time": 1,
+-          "weight": 100
+-        },
+-        {
+-          "time": 2,
+-          "weight": 0
+-        }
+-      ]
+-    }
+-  ]
+-}
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/track.html.template b/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
+deleted file mode 100644
+index 5522b9f7796..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/track.html.template
++++ /dev/null
+@@ -1,193 +0,0 @@
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <link rel="stylesheet" href="css/bootstrap.min.css" media="screen">
+-    <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+-    <style type="text/css">
+-      body '{' font: 20px sans-serif;'}'
+-      .axis path,
+-      .axis line '{' fill: none; stroke: #000; shape-rendering: crispEdges;'}'
+-      .axis text '{' font-family: sans-serif; font-size: 20px; '}'
+-      .line '{' fill: none; stroke: steelblue; stroke-width: 3px; '}'
+-      .legend '{' padding: 5px; font: 18px sans-serif; background: yellow;
+-                box-shadow: 2px 2px 1px #888;'}'
+-      .title '{' font: 24px sans-serif; '}'
+-      .divborder '{' border-width: 1px; border-style: solid; border-color: black;
+-                    margin-top:10px '}'
+-    </style>
+-    <script src="js/thirdparty/d3.v3.js"></script>
+-    <script src="js/thirdparty/jquery.js"></script>
+-    <script src="js/thirdparty/bootstrap.min.js"></script>
+-  </head>
+-  <body>
+-    <div class="row">
+-      <div class="offset4 span8"><br/><br/><br/>
+-        Select Tracked Job/Queue:
+-        <select id="trackedSelect" onchange="redrawChart()">
+-          <option>----Queue----</option>
+-          {0}
+-          <option>----Job----</option>
+-          {1}
+-        </select>
+-        <input type="button" style="float: right;" value="Stop"
+-               onClick="stop()" />
+-      </div>
+-    </div>
+-    <div class="row">
+-      <div class="divborder span9 offset4" id="area1"></div>
+-    </div>
+-    <script>
+-      // global variables
+-      var basetime = 0;
+-      var running = 1;
+-      var para = '''';
+-      var data = [];
+-      var path, line, svg;
+-      var x, y;
+-      var width, height;
+-      var xAxis, yAxis;
+-      var legends = [''usage.memory'', ''demand.memory'', ''maxshare.memory'',
+-                      ''minshare.memory'', ''fairshare.memory''];
+-
+-      // stop function
+-      function stop() '{'
+-        running = 0;
+-      '}'
+-
+-      // select changed event
+-      function redrawChart() '{'
+-        var value = $(''#trackedSelect'').val();
+-        if (value.substring(0, ''Job ''.length) === ''Job ''
+-                      || value.substring(0, ''Queue ''.length) === ''Queue '') '{'
+-          para = value;
+-          running = 0;
+-          basetime = 0;
+-          data = [];
+-          $(''#area1'').empty();
+-          drawChart(''Tracking '' + value);
+-          running = 1;
+-          requestData();
+-        }
+-      }
+-
+-      // draw chart
+-      function drawChart(title) '{'
+-        // location
+-        var margin = '{'top: 50, right: 150, bottom: 50, left: 80'}';
+-        width = 800 - margin.left - margin.right;
+-        height = 420 - margin.top - margin.bottom;
+-        x = d3.scale.linear().range([0, width]);
+-        y = d3.scale.linear().range([height, 0]);
+-        xAxis = d3.svg.axis().scale(x).orient(''bottom'');
+-        yAxis = d3.svg.axis().scale(y).orient(''left'');
+-        // lines
+-        line = d3.svg.line().interpolate(''basis'')
+-                .x(function(d) '{' return x(d.time); })
+-                .y(function(d) '{' return y(d.value); });
+-        // create chart
+-        svg = d3.select(''#area1'').append(''svg'')
+-                .attr(''width'', width + margin.left + margin.right)
+-                .attr(''height'', height + margin.top + margin.bottom)
+-                .append(''g'')
+-                .attr(''transform'', ''translate('' + margin.left + '','' + margin.top + '')'');
+-        // axis labels
+-        svg.append(''text'')
+-                .attr(''transform'', ''translate('' + (width / 2) + '','' + (height + margin.bottom - 5 ) + '')'')
+-                .style(''text-anchor'', ''middle'')
+-                .text(''Time ({2})'');
+-        svg.append(''text'')
+-                .attr(''transform'', ''rotate(-90)'')
+-                .attr(''y'', 0 - margin.left)
+-                .attr(''x'',0 - (height / 2))
+-                .attr(''dy'', ''1em'')
+-                .style(''text-anchor'', ''middle'')
+-                .text(''Memory (GB)'');
+-        // title
+-        svg.append(''text'')
+-                .attr(''x'', (width / 2))
+-                .attr(''y'', 10 - (margin.top / 2))
+-                .attr(''text-anchor'', ''middle'')
+-                .text(title);
+-      '}'
+-
+-      // request data
+-      function requestData() '{'
+-        $.ajax('{'url: ''trackMetrics?t='' + para,
+-          success: function(point) '{'
+-            // clear old
+-            svg.selectAll(''g.tick'').remove();
+-            svg.selectAll(''g'').remove();
+-
+-          if(basetime == 0)  basetime = point.time;
+-          point.time = (point.time - basetime)/{3};
+-          data.push(point);
+-
+-          var color = d3.scale.category10();
+-          color.domain(d3.keys(data[0]).filter(function(key) '{'
+-            return $.inArray(key, legends) !== -1;
+-          '}'));
+-
+-          var values = color.domain().map(function(name) '{'
+-            return '{'
+-              name: name,
+-              values: data.map(function(d) '{'
+-                return '{' time: d.time, value: d[name]'}';
+-              '}')
+-            '}';
+-          '}');
+-
+-          // set x/y range
+-          x.domain(d3.extent(data, function(d) '{' return d.time; '}'));
+-          y.domain([
+-            d3.min(values, function(c) '{' return 0 '}'),
+-            d3.max(values, function(c) '{' return 1.1 * d3.max(c.values, function(v) '{' return v.value; '}'); '}')
+-          ]);
+-
+-          svg.append(''g'').attr(''class'', ''x axis'')
+-            .attr(''transform'', ''translate(0,'' + height + '')'').call(xAxis);
+-          svg.append(''g'').attr(''class'', ''y axis'').call(yAxis);
+-          var value = svg.selectAll(''.path'')
+-            .data(values).enter().append(''g'').attr(''class'', ''line'');
+-
+-          value.append(''path'').attr(''class'', ''line'')
+-            .attr(''d'', function(d) '{'return line(d.values); '}')
+-            .style(''stroke'', function(d) '{'return color(d.name); '}');
+-
+-          // legend
+-          var legend = svg.append(''g'')
+-            .attr(''class'', ''legend'')
+-            .attr(''x'', width + 5)
+-            .attr(''y'', 25)
+-            .attr(''height'', 120)
+-            .attr(''width'', 180);
+-
+-          legend.selectAll(''g'').data(legends)
+-            .enter()
+-            .append(''g'')
+-            .each(function(d, i) '{'
+-              var g = d3.select(this);
+-              g.append(''rect'')
+-                .attr(''x'', width + 5)
+-                .attr(''y'', i * 20)
+-                .attr(''width'', 10)
+-                .attr(''height'', 10)
+-                .style(''fill'', color(d));
+-
+-              g.append(''text'')
+-                .attr(''x'', width + 25)
+-                .attr(''y'', i * 20 + 8)
+-                .attr(''height'',30)
+-                .attr(''width'',250)
+-                .style(''fill'', color(d))
+-                .text(d);
+-            '}');
+-
+-          if(running == 1)
+-            setTimeout(requestData, {4});
+-        '}',
+-        cache: false
+-      '}');
+-    '}'
+-  </script>
+-</body>
+-</html>
+diff --git a/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml b/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index 20146fcef66..00000000000
+--- a/hadoop-tools/hadoop-sls/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,80 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <property>
+-    <name>yarn.resourcemanager.scheduler.class</name>
+-    <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler</value>
+-    <!-- <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> -->
+-  </property>
+-
+-  <property>
+-    <description>The address of the RM web application.</description>
+-    <name>yarn.resourcemanager.webapp.address</name>
+-    <value>localhost:18088</value>
+-  </property>
+-
+-  <property>
+-    <name>yarn.resourcemanager.resource-tracker.address</name>
+-    <value>localhost:18031</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the scheduler interface.</description>
+-    <name>yarn.resourcemanager.scheduler.address</name>
+-    <value>localhost:18030</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the applications manager interface in the RM.</description>
+-    <name>yarn.resourcemanager.address</name>
+-    <value>localhost:18032</value>
+-  </property>
+-
+-  <property>
+-    <description>The address of the RM admin interface.</description>
+-    <name>yarn.resourcemanager.admin.address</name>
+-    <value>localhost:18033</value>
+-  </property>
+-
+-  <property>
+-    <description>Set to false, to avoid ip check</description>
+-    <name>hadoop.security.token.service.use_ip</name>
+-    <value>false</value>
+-  </property>
+-
+-  <property>
+-    <description>Whether to use preemption. Note that preemption is experimental
+-    in the current version. Defaults to false.</description>
+-    <name>yarn.scheduler.fair.preemption</name>
+-    <value>true</value>
+-  </property>
+-
+-  <property>
+-    <description>Whether to allow multiple container assignments in one
+-    heartbeat. Defaults to false.</description>
+-    <name>yarn.scheduler.fair.assignmultiple</name>
+-    <value>true</value>
+-  </property>
+-
+-
+-  <property>
+-    <description>Enable reservation system.</description>
+-    <name>yarn.resourcemanager.reservation-system.enable</name>
+-    <value>true</value>
+-  </property>
+-
+-</configuration>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index b07155fb74c..ecf47ef52b1 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -78,11 +78,6 @@
+       <scope>compile</scope>
+       <version>${project.version}</version>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-sls</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure-datalake</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 54bdd157715..744db181673 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-sls</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+     <module>hadoop-azure-datalake</module>
diff --git a/hadoop/stackable/patches/3.4.0/13-remove-hadoop-rumen.patch b/hadoop/stackable/patches/3.4.0/13-remove-hadoop-rumen.patch
new file mode 100644
index 000000000..97e1b9588
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/13-remove-hadoop-rumen.patch
@@ -0,0 +1,17825 @@
+Entirely remove hadoop-rumen
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 
+ hadoop-project/pom.xml                             |    6 
+ hadoop-project/src/site/site.xml                   |    1 
+ .../hadoop-rumen/dev-support/findbugs-exclude.xml  |   31 
+ hadoop-tools/hadoop-rumen/pom.xml                  |  163 --
+ .../hadoop/tools/rumen/AbstractClusterStory.java   |  184 --
+ .../org/apache/hadoop/tools/rumen/Anonymizer.java  |  272 ---
+ .../rumen/CDFPiecewiseLinearRandomGenerator.java   |   68 -
+ .../hadoop/tools/rumen/CDFRandomGenerator.java     |   89 -
+ .../apache/hadoop/tools/rumen/ClusterStory.java    |   83 -
+ .../hadoop/tools/rumen/ClusterTopologyReader.java  |   81 -
+ .../apache/hadoop/tools/rumen/CurrentJHParser.java |   86 -
+ .../org/apache/hadoop/tools/rumen/DeepCompare.java |   45 
+ .../tools/rumen/DeepInequalityException.java       |   61 -
+ .../hadoop/tools/rumen/DefaultInputDemuxer.java    |   70 -
+ .../hadoop/tools/rumen/DefaultOutputter.java       |   69 -
+ .../hadoop/tools/rumen/DeskewedJobTraceReader.java |  201 --
+ .../java/org/apache/hadoop/tools/rumen/Folder.java |  547 ------
+ .../hadoop/tools/rumen/Hadoop20JHParser.java       |  211 --
+ .../hadoop/tools/rumen/HadoopLogsAnalyzer.java     | 1850 --------------------
+ .../org/apache/hadoop/tools/rumen/Histogram.java   |  164 --
+ .../hadoop/tools/rumen/HistoryEventEmitter.java    |   95 -
+ .../apache/hadoop/tools/rumen/InputDemuxer.java    |   56 -
+ .../tools/rumen/Job20LineHistoryEventEmitter.java  |  277 ---
+ .../org/apache/hadoop/tools/rumen/JobBuilder.java  |  800 ---------
+ .../hadoop/tools/rumen/JobConfPropertyNames.java   |   40 
+ .../hadoop/tools/rumen/JobConfigurationParser.java |  119 -
+ .../hadoop/tools/rumen/JobHistoryParser.java       |   36 
+ .../tools/rumen/JobHistoryParserFactory.java       |   72 -
+ .../apache/hadoop/tools/rumen/JobHistoryUtils.java |  168 --
+ .../org/apache/hadoop/tools/rumen/JobStory.java    |  124 -
+ .../hadoop/tools/rumen/JobStoryProducer.java       |   33 
+ .../apache/hadoop/tools/rumen/JobTraceReader.java  |   51 -
+ .../hadoop/tools/rumen/JsonObjectMapperParser.java |   89 -
+ .../hadoop/tools/rumen/JsonObjectMapperWriter.java |   70 -
+ .../apache/hadoop/tools/rumen/LogRecordType.java   |   73 -
+ .../hadoop/tools/rumen/LoggedDiscreteCDF.java      |  144 --
+ .../org/apache/hadoop/tools/rumen/LoggedJob.java   |  679 -------
+ .../apache/hadoop/tools/rumen/LoggedLocation.java  |  140 --
+ .../hadoop/tools/rumen/LoggedNetworkTopology.java  |  177 --
+ .../tools/rumen/LoggedSingleRelativeRanking.java   |  101 -
+ .../org/apache/hadoop/tools/rumen/LoggedTask.java  |  372 ----
+ .../hadoop/tools/rumen/LoggedTaskAttempt.java      |  772 --------
+ .../org/apache/hadoop/tools/rumen/MachineNode.java |  205 --
+ .../rumen/MapAttempt20LineHistoryEventEmitter.java |   94 -
+ .../hadoop/tools/rumen/MapTaskAttemptInfo.java     |   72 -
+ .../java/org/apache/hadoop/tools/rumen/Node.java   |  148 --
+ .../org/apache/hadoop/tools/rumen/Outputter.java   |   45 
+ .../java/org/apache/hadoop/tools/rumen/Pair.java   |   38 
+ .../hadoop/tools/rumen/ParsedConfigFile.java       |  209 --
+ .../org/apache/hadoop/tools/rumen/ParsedHost.java  |  134 -
+ .../org/apache/hadoop/tools/rumen/ParsedJob.java   |  179 --
+ .../org/apache/hadoop/tools/rumen/ParsedLine.java  |   91 -
+ .../org/apache/hadoop/tools/rumen/ParsedTask.java  |  131 -
+ .../hadoop/tools/rumen/ParsedTaskAttempt.java      |  119 -
+ .../rumen/PossiblyDecompressedInputStream.java     |   75 -
+ .../tools/rumen/Pre21JobHistoryConstants.java      |   89 -
+ .../org/apache/hadoop/tools/rumen/RackNode.java    |   48 -
+ .../hadoop/tools/rumen/RandomSeedGenerator.java    |   86 -
+ .../ReduceAttempt20LineHistoryEventEmitter.java    |  100 -
+ .../hadoop/tools/rumen/ReduceTaskAttemptInfo.java  |   94 -
+ .../hadoop/tools/rumen/ResourceUsageMetrics.java   |  160 --
+ .../hadoop/tools/rumen/RewindableInputStream.java  |   78 -
+ .../hadoop/tools/rumen/SingleEventEmitter.java     |   25 
+ .../tools/rumen/Task20LineHistoryEventEmitter.java |  182 --
+ .../tools/rumen/TaskAttempt20LineEventEmitter.java |  171 --
+ .../apache/hadoop/tools/rumen/TaskAttemptInfo.java |   78 -
+ .../org/apache/hadoop/tools/rumen/TaskInfo.java    |  110 -
+ .../apache/hadoop/tools/rumen/TopologyBuilder.java |  138 -
+ .../apache/hadoop/tools/rumen/TraceBuilder.java    |  315 ---
+ .../org/apache/hadoop/tools/rumen/TreePath.java    |   57 -
+ .../tools/rumen/Version20LogInterfaceUtils.java    |   41 
+ .../apache/hadoop/tools/rumen/ZombieCluster.java   |  150 --
+ .../org/apache/hadoop/tools/rumen/ZombieJob.java   |  939 ----------
+ .../hadoop/tools/rumen/ZombieJobProducer.java      |  133 -
+ .../tools/rumen/anonymization/DataAnonymizer.java  |   27 
+ .../hadoop/tools/rumen/anonymization/WordList.java |  123 -
+ .../anonymization/WordListAnonymizerUtility.java   |  110 -
+ .../rumen/datatypes/AnonymizableDataType.java      |   28 
+ .../hadoop/tools/rumen/datatypes/ClassName.java    |   57 -
+ .../hadoop/tools/rumen/datatypes/DataType.java     |   25 
+ .../datatypes/DefaultAnonymizableDataType.java     |   67 -
+ .../tools/rumen/datatypes/DefaultDataType.java     |   37 
+ .../hadoop/tools/rumen/datatypes/FileName.java     |  213 --
+ .../hadoop/tools/rumen/datatypes/JobName.java      |   41 
+ .../tools/rumen/datatypes/JobProperties.java       |   93 -
+ .../hadoop/tools/rumen/datatypes/NodeName.java     |  177 --
+ .../hadoop/tools/rumen/datatypes/QueueName.java    |   41 
+ .../hadoop/tools/rumen/datatypes/UserName.java     |   40 
+ .../datatypes/util/DefaultJobPropertiesParser.java |   31 
+ .../rumen/datatypes/util/JobPropertyParser.java    |   34 
+ .../util/MapReduceJobPropertiesParser.java         |  228 --
+ .../apache/hadoop/tools/rumen/package-info.java    |  377 ----
+ .../rumen/serializers/BlockingSerializer.java      |   36 
+ .../DefaultAnonymizingRumenSerializer.java         |   57 -
+ .../rumen/serializers/DefaultRumenSerializer.java  |   43 
+ .../rumen/serializers/ObjectStringSerializer.java  |   35 
+ .../org/apache/hadoop/tools/rumen/state/State.java |   46 
+ .../tools/rumen/state/StateDeserializer.java       |   59 -
+ .../apache/hadoop/tools/rumen/state/StatePool.java |  334 ----
+ .../src/main/shellprofile.d/hadoop-rumen.sh        |   54 -
+ .../hadoop-rumen/src/site/markdown/Rumen.md.vm     |  416 ----
+ .../hadoop-rumen/src/site/resources/css/site.css   |   30 
+ .../tools/rumen/ConcatenatedInputFilesDemuxer.java |  338 ----
+ .../hadoop/tools/rumen/HistogramRawTestData.java   |   54 -
+ .../apache/hadoop/tools/rumen/TestHistograms.java  |  158 --
+ .../rumen/TestPiecewiseLinearInterpolation.java    |  123 -
+ .../tools/rumen/TestRandomSeedGenerator.java       |   40 
+ hadoop-tools/hadoop-tools-dist/pom.xml             |    5 
+ hadoop-tools/pom.xml                               |    1 
+ 110 files changed, 16897 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-rumen/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-rumen/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java
+ delete mode 100755 hadoop-tools/hadoop-rumen/src/main/shellprofile.d/hadoop-rumen.sh
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/site/markdown/Rumen.md.vm
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java
+ delete mode 100644 hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 8270d72e496..4cde654d0fa 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -53,21 +53,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-rumen/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-rumen/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-streaming/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 87f23a3ddbc..43ca02d5464 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -658,12 +658,6 @@
+         <version>${hadoop.version}</version>
+         <type>test-jar</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-rumen</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-client</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 65a03b815b9..5d9ad281ce6 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -193,7 +193,6 @@
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+-      <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+ 
+diff --git a/hadoop-tools/hadoop-rumen/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-rumen/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 93e48194869..00000000000
+--- a/hadoop-tools/hadoop-rumen/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,31 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-  <And>
+-    <Class name="org.apache.hadoop.tools.rumen.LoggedJob"/>
+-    <Method name="getMapperTriesToSucceed"/>
+-    <Bug pattern="EI_EXPOSE_REP"/>
+-    <Bug code="EI"/>
+-  </And>
+-  <And>
+-    <Class name="org.apache.hadoop.tools.rumen.ZombieJob"/>
+-    <Method name="getInputSplits"/>
+-    <Bug pattern="EI_EXPOSE_REP"/>
+-    <Bug code="EI"/>
+-  </And>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml
+deleted file mode 100644
+index d0e9df16115..00000000000
+--- a/hadoop-tools/hadoop-rumen/pom.xml
++++ /dev/null
+@@ -1,163 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-rumen</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop Rumen</description>
+-  <name>Apache Hadoop Rumen</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-hs</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.fasterxml.jackson.core</groupId>
+-      <artifactId>jackson-databind</artifactId>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-         <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+-
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java
+deleted file mode 100644
+index 0acd2d3f0d6..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java
++++ /dev/null
+@@ -1,184 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayDeque;
+-import java.util.Collections;
+-import java.util.Deque;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.Set;
+-import java.util.SortedSet;
+-import java.util.TreeSet;
+-
+-/**
+- * {@link AbstractClusterStory} provides a partial implementation of
+- * {@link ClusterStory} by parsing the topology tree.
+- */
+-public abstract class AbstractClusterStory implements ClusterStory {
+-  protected Set<MachineNode> machineNodes;
+-  protected Set<RackNode> rackNodes;
+-  protected MachineNode[] mNodesFlattened;
+-  protected Map<String, MachineNode> mNodeMap;
+-  protected Map<String, RackNode> rNodeMap;
+-  protected int maximumDistance = 0;
+-  
+-  @Override
+-  public Set<MachineNode> getMachines() {
+-    parseTopologyTree();
+-    return machineNodes;
+-  }
+-  
+-  @Override
+-  public synchronized Set<RackNode> getRacks() {
+-    parseTopologyTree();    
+-    return rackNodes;
+-  }
+-  
+-  @Override
+-  public synchronized MachineNode[] getRandomMachines(int expected, 
+-                                                      Random random) {
+-    if (expected == 0) {
+-      return new MachineNode[0];
+-    }
+-
+-    parseTopologyTree();
+-    int total = machineNodes.size();
+-    int select = Math.min(expected, total);
+-
+-    if (mNodesFlattened == null) {
+-      mNodesFlattened = machineNodes.toArray(new MachineNode[total]);
+-    }
+-
+-    MachineNode[] retval = new MachineNode[select];
+-    int i = 0;
+-    while ((i != select) && (total != i + select)) {
+-      int index = random.nextInt(total - i);
+-      MachineNode tmp = mNodesFlattened[index];
+-      mNodesFlattened[index] = mNodesFlattened[total - i - 1];
+-      mNodesFlattened[total - i - 1] = tmp;
+-      ++i;
+-    }
+-    if (i == select) {
+-      System.arraycopy(mNodesFlattened, total - i, retval, 0, select);
+-    } else {
+-      System.arraycopy(mNodesFlattened, 0, retval, 0, select);
+-    }
+-
+-    return retval;
+-  }
+-  
+-  protected synchronized void buildMachineNodeMap() {
+-    if (mNodeMap == null) {
+-      mNodeMap = new HashMap<String, MachineNode>(machineNodes.size());
+-      for (MachineNode mn : machineNodes) {
+-        mNodeMap.put(mn.getName(), mn);
+-      }
+-    }
+-  }
+-  
+-  @Override
+-  public MachineNode getMachineByName(String name) {
+-    buildMachineNodeMap();
+-    return mNodeMap.get(name);
+-  }
+-  
+-  @Override
+-  public int distance(Node a, Node b) {
+-    int lvl_a = a.getLevel();
+-    int lvl_b = b.getLevel();
+-    int retval = 0;
+-    if (lvl_a > lvl_b) {
+-      retval = lvl_a-lvl_b;
+-      for (int i=0; i<retval; ++i) {
+-        a = a.getParent();
+-      }
+-    } else if (lvl_a < lvl_b) {
+-      retval = lvl_b-lvl_a;
+-      for (int i=0; i<retval; ++i) {
+-        b = b.getParent();
+-      }      
+-    }
+-    
+-    while (a != b) {
+-      a = a.getParent();
+-      b = b.getParent();
+-      ++retval;
+-    }
+-    
+-    return retval;
+-  }
+-  
+-  protected synchronized void buildRackNodeMap() {
+-    if (rNodeMap == null) {
+-      rNodeMap = new HashMap<String, RackNode>(rackNodes.size());
+-      for (RackNode rn : rackNodes) {
+-        rNodeMap.put(rn.getName(), rn);
+-      }
+-    }
+-  }
+-  
+-  @Override
+-  public RackNode getRackByName(String name) {
+-    buildRackNodeMap();
+-    return rNodeMap.get(name);
+-  }
+-  
+-  @Override
+-  public int getMaximumDistance() {
+-    parseTopologyTree();
+-    return maximumDistance;
+-  }
+-  
+-  protected synchronized void parseTopologyTree() {
+-    if (machineNodes == null) {
+-      Node root = getClusterTopology();
+-      SortedSet<MachineNode> mNodes = new TreeSet<MachineNode>();
+-      SortedSet<RackNode> rNodes = new TreeSet<RackNode>();
+-      // dfs search of the tree.
+-      Deque<Node> unvisited = new ArrayDeque<Node>();
+-      Deque<Integer> distUnvisited = new ArrayDeque<Integer>();
+-      unvisited.add(root);
+-      distUnvisited.add(0);
+-      for (Node n = unvisited.poll(); n != null; n = unvisited.poll()) {
+-        int distance = distUnvisited.poll();
+-        if (n instanceof RackNode) {
+-          rNodes.add((RackNode) n);
+-          mNodes.addAll(((RackNode) n).getMachinesInRack());
+-          if (distance + 1 > maximumDistance) {
+-            maximumDistance = distance + 1;
+-          }
+-        } else if (n instanceof MachineNode) {
+-          mNodes.add((MachineNode) n);
+-          if (distance > maximumDistance) {
+-            maximumDistance = distance;
+-          }
+-        } else {
+-          for (Node child : n.getChildren()) {
+-            unvisited.addFirst(child);
+-            distUnvisited.addFirst(distance+1);
+-          }
+-        }
+-      }
+-
+-      machineNodes = Collections.unmodifiableSortedSet(mNodes);
+-      rackNodes = Collections.unmodifiableSortedSet(rNodes);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java
+deleted file mode 100644
+index 3c85a93ddbf..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java
++++ /dev/null
+@@ -1,272 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-
+-import com.fasterxml.jackson.core.JsonEncoding;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.Version;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.module.SimpleModule;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.compress.CodecPool;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.io.compress.Compressor;
+-import org.apache.hadoop.mapreduce.ID;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.tools.rumen.datatypes.*;
+-import org.apache.hadoop.tools.rumen.serializers.*;
+-import org.apache.hadoop.tools.rumen.state.*;
+-
+-public class Anonymizer extends Configured implements Tool {
+-  private boolean anonymizeTrace = false;
+-  private Path inputTracePath = null;
+-  private Path outputTracePath = null;
+-  private boolean anonymizeTopology = false;
+-  private Path inputTopologyPath = null;
+-  private Path outputTopologyPath = null;
+-  
+-  //TODO Make this final if not using JSON
+-  // private final StatePool statePool = new StatePool();
+-  private StatePool statePool;
+-  
+-  private ObjectMapper outMapper = null;
+-  private JsonFactory outFactory = null;
+-  
+-  private void initialize(String[] args) throws Exception {
+-    try {
+-      for (int i = 0; i < args.length; ++i) {
+-        if ("-trace".equals(args[i])) {
+-          anonymizeTrace = true;
+-          inputTracePath = new Path(args[i+1]);
+-          outputTracePath = new Path(args[i+2]);
+-          i +=2;
+-        }
+-        if ("-topology".equals(args[i])) {
+-          anonymizeTopology = true;
+-          inputTopologyPath = new Path(args[i+1]);
+-          outputTopologyPath = new Path(args[i+2]);
+-          i +=2;
+-        }
+-      }
+-    } catch (Exception e) {
+-      throw new IllegalArgumentException("Illegal arguments list!", e);
+-    }
+-    
+-    if (!anonymizeTopology && !anonymizeTrace) {
+-      throw new IllegalArgumentException("Invalid arguments list!");
+-    }
+-    
+-    statePool = new StatePool();
+-    // initialize the state manager after the anonymizers are registered
+-    statePool.initialize(getConf());
+-     
+-    outMapper = new ObjectMapper();
+-    // define a module
+-    SimpleModule module = new SimpleModule(
+-        "Anonymization Serializer", new Version(0, 1, 1, "FINAL", "", ""));
+-    // add various serializers to the module
+-    // use the default (as-is) serializer for default data types
+-    module.addSerializer(DataType.class, new DefaultRumenSerializer());
+-    // use a blocking serializer for Strings as they can contain sensitive 
+-    // information
+-    module.addSerializer(String.class, new BlockingSerializer());
+-    // use object.toString() for object of type ID
+-    module.addSerializer(ID.class, new ObjectStringSerializer<ID>());
+-    // use getAnonymizedValue() for data types that have the anonymizing 
+-    // feature
+-    module.addSerializer(AnonymizableDataType.class, 
+-        new DefaultAnonymizingRumenSerializer(statePool, getConf()));
+-    
+-    // register the module with the object-mapper
+-    outMapper.registerModule(module);
+-    
+-    outFactory = outMapper.getFactory();
+-  }
+-  
+-  // anonymize the job trace file
+-  private void anonymizeTrace() throws Exception {
+-    if (anonymizeTrace) {
+-      System.out.println("Anonymizing trace file: " + inputTracePath);
+-      JobTraceReader reader = null;
+-      JsonGenerator outGen = null;
+-      Configuration conf = getConf();
+-      
+-      try {
+-        // create a generator
+-        outGen = createJsonGenerator(conf, outputTracePath);
+-
+-        // define the input trace reader
+-        reader = new JobTraceReader(inputTracePath, conf);
+-        
+-        // read the plain unanonymized logged job
+-        LoggedJob job = reader.getNext();
+-        
+-        while (job != null) {
+-          // write it via an anonymizing channel
+-          outGen.writeObject(job);
+-          // read the next job
+-          job = reader.getNext();
+-        }
+-        
+-        System.out.println("Anonymized trace file: " + outputTracePath);
+-      } finally {
+-        if (outGen != null) {
+-          outGen.close();
+-        }
+-        if (reader != null) {
+-          reader.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  // anonymize the cluster topology file
+-  private void anonymizeTopology() throws Exception {
+-    if (anonymizeTopology) {
+-      System.out.println("Anonymizing topology file: " + inputTopologyPath);
+-      ClusterTopologyReader reader = null;
+-      JsonGenerator outGen = null;
+-      Configuration conf = getConf();
+-
+-      try {
+-        // create a generator
+-        outGen = createJsonGenerator(conf, outputTopologyPath);
+-
+-        // define the input cluster topology reader
+-        reader = new ClusterTopologyReader(inputTopologyPath, conf);
+-        
+-        // read the plain unanonymized logged job
+-        LoggedNetworkTopology job = reader.get();
+-        
+-        // write it via an anonymizing channel
+-        outGen.writeObject(job);
+-        
+-        System.out.println("Anonymized topology file: " + outputTopologyPath);
+-      } finally {
+-        if (outGen != null) {
+-          outGen.close();
+-        }
+-      }
+-    }
+-  }
+-  
+-  // Creates a JSON generator
+-  private JsonGenerator createJsonGenerator(Configuration conf, Path path) 
+-  throws IOException {
+-    FileSystem outFS = path.getFileSystem(conf);
+-    CompressionCodec codec =
+-      new CompressionCodecFactory(conf).getCodec(path);
+-    OutputStream output;
+-    Compressor compressor = null;
+-    if (codec != null) {
+-      compressor = CodecPool.getCompressor(codec);
+-      output = codec.createOutputStream(outFS.create(path), compressor);
+-    } else {
+-      output = outFS.create(path);
+-    }
+-
+-    JsonGenerator outGen =
+-        outFactory.createGenerator(output, JsonEncoding.UTF8);
+-    outGen.useDefaultPrettyPrinter();
+-    
+-    return outGen;
+-  }
+-  
+-  @Override
+-  public int run(String[] args) throws Exception {
+-    try {
+-      initialize(args);
+-    } catch (Exception e) {
+-      e.printStackTrace();
+-      printUsage();
+-      return -1;
+-    }
+-    
+-    return run();
+-  }
+-
+-  /**
+-   * Runs the actual anonymization tool.
+-   */
+-  public int run() throws Exception {
+-    try {
+-      anonymizeTrace();
+-    } catch (IOException ioe) {
+-      System.err.println("Error running the trace anonymizer!");
+-      ioe.printStackTrace();
+-      System.out.println("\n\nAnonymization unsuccessful!");
+-      return -1;
+-    }
+-    
+-    try {
+-      anonymizeTopology();
+-    } catch (IOException ioe) {
+-      System.err.println("Error running the cluster topology anonymizer!");
+-      ioe.printStackTrace();
+-      System.out.println("\n\nAnonymization unsuccessful!");
+-      return -1;
+-    }
+-    
+-    statePool.persist();
+-    
+-    System.out.println("Anonymization completed successfully!");
+-    
+-    return 0;
+-  }
+-
+-  private static void printUsage() {
+-    System.out.println("\nUsage:-");
+-    System.out.print("  Anonymizer");
+-    System.out.print(" [-trace <input-trace-path> <output-trace-path>]");
+-    System.out.println(" [-topology <input-topology-path> " 
+-                       + "<output-topology-path>] ");
+-    System.out.print("\n");
+-  }
+-  
+-  /**
+-   * The main driver program to use the anonymization utility.
+-   * @param args
+-   */
+-  public static void main(String[] args) {
+-    Anonymizer instance = new Anonymizer();
+-    int result = 0;
+-    
+-    try {
+-      result = ToolRunner.run(instance, args);
+-    } catch (Exception e) {
+-      e.printStackTrace(System.err);
+-      System.exit(-1);
+-    }
+-
+-    if (result != 0) {
+-      System.exit(result);
+-    }
+-
+-    return;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java
+deleted file mode 100644
+index 8971d047437..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-public class CDFPiecewiseLinearRandomGenerator extends CDFRandomGenerator {
+-
+-  /**
+-   * @param cdf
+-   *          builds a CDFRandomValue engine around this
+-   *          {@link LoggedDiscreteCDF}, with a defaultly seeded RNG
+-   */
+-  public CDFPiecewiseLinearRandomGenerator(LoggedDiscreteCDF cdf) {
+-    super(cdf);
+-  }
+-
+-  /**
+-   * @param cdf
+-   *          builds a CDFRandomValue engine around this
+-   *          {@link LoggedDiscreteCDF}, with an explicitly seeded RNG
+-   * @param seed
+-   *          the random number generator seed
+-   */
+-  public CDFPiecewiseLinearRandomGenerator(LoggedDiscreteCDF cdf, long seed) {
+-    super(cdf, seed);
+-  }
+-
+-  /**
+-   * TODO This code assumes that the empirical minimum resp. maximum is the
+-   * epistomological minimum resp. maximum. This is probably okay for the
+-   * minimum, because that likely represents a task where everything went well,
+-   * but for the maximum we may want to develop a way of extrapolating past the
+-   * maximum.
+-   */
+-  @Override
+-  public long valueAt(double probability) {
+-    int rangeFloor = floorIndex(probability);
+-
+-    double segmentProbMin = getRankingAt(rangeFloor);
+-    double segmentProbMax = getRankingAt(rangeFloor + 1);
+-
+-    long segmentMinValue = getDatumAt(rangeFloor);
+-    long segmentMaxValue = getDatumAt(rangeFloor + 1);
+-
+-    // If this is zero, this object is based on an ill-formed cdf
+-    double segmentProbRange = segmentProbMax - segmentProbMin;
+-    long segmentDatumRange = segmentMaxValue - segmentMinValue;
+-
+-    long result = (long) ((probability - segmentProbMin) / segmentProbRange * segmentDatumRange)
+-        + segmentMinValue;
+-
+-    return result;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java
+deleted file mode 100644
+index c2211924b74..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- * 
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Random;
+-
+-/**
+- * An instance of this class generates random values that confirm to the
+- * embedded {@link LoggedDiscreteCDF} . The discrete CDF is a pointwise
+- * approximation of the "real" CDF. We therefore have a choice of interpolation
+- * rules.
+- * 
+- * A concrete subclass of this abstract class will implement valueAt(double)
+- * using a class-dependent interpolation rule.
+- * 
+- */
+-public abstract class CDFRandomGenerator {
+-  final double[] rankings;
+-  final long[] values;
+-
+-  final Random random;
+-
+-  CDFRandomGenerator(LoggedDiscreteCDF cdf) {
+-    this(cdf, new Random());
+-  }
+-
+-  CDFRandomGenerator(LoggedDiscreteCDF cdf, long seed) {
+-    this(cdf, new Random(seed));
+-  }
+-
+-  private CDFRandomGenerator(LoggedDiscreteCDF cdf, Random random) {
+-    this.random = random;
+-    rankings = new double[cdf.getRankings().size() + 2];
+-    values = new long[cdf.getRankings().size() + 2];
+-    initializeTables(cdf);
+-  }
+-
+-  protected final void initializeTables(LoggedDiscreteCDF cdf) {
+-    rankings[0] = 0.0;
+-    values[0] = cdf.getMinimum();
+-    rankings[rankings.length - 1] = 1.0;
+-    values[rankings.length - 1] = cdf.getMaximum();
+-
+-    List<LoggedSingleRelativeRanking> subjects = cdf.getRankings();
+-
+-    for (int i = 0; i < subjects.size(); ++i) {
+-      rankings[i + 1] = subjects.get(i).getRelativeRanking();
+-      values[i + 1] = subjects.get(i).getDatum();
+-    }
+-  }
+-
+-  protected int floorIndex(double probe) {
+-    int result = Arrays.binarySearch(rankings, probe);
+-
+-    return Math.abs(result + 1) - 1;
+-  }
+-
+-  protected double getRankingAt(int index) {
+-    return rankings[index];
+-  }
+-
+-  protected long getDatumAt(int index) {
+-    return values[index];
+-  }
+-
+-  public long randomValue() {
+-    return valueAt(random.nextDouble());
+-  }
+-
+-  public abstract long valueAt(double probability);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java
+deleted file mode 100644
+index 1e3b8ab0476..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Set;
+-import java.util.Random;
+-
+-/**
+- * {@link ClusterStory} represents all configurations of a MapReduce cluster,
+- * including nodes, network topology, and slot configurations.
+- */
+-public interface ClusterStory {
+-  /**
+-   * Get all machines of the cluster.
+-   * @return A read-only set that contains all machines of the cluster.
+-   */
+-  public Set<MachineNode> getMachines();
+-
+-  /**
+-   * Get all racks of the cluster.
+-   * @return A read-only set that contains all racks of the cluster.
+-   */
+-  public Set<RackNode> getRacks();
+-  
+-  /**
+-   * Get the cluster topology tree.
+-   * @return The root node of the cluster topology tree.
+-   */
+-  public Node getClusterTopology();
+-  
+-  /**
+-   * Select a random set of machines.
+-   * @param expected The expected sample size.
+-   * @param random Random number generator to use.
+-   * @return An array of up to expected number of {@link MachineNode}s.
+-   */
+-  public MachineNode[] getRandomMachines(int expected, Random random);
+-
+-  /**
+-   * Get {@link MachineNode} by its host name.
+-   * 
+-   * @return The {@link MachineNode} with the same name. Or null if not found.
+-   */
+-  public MachineNode getMachineByName(String name);
+-  
+-  /**
+-   * Get {@link RackNode} by its name.
+-   * @return The {@link RackNode} with the same name. Or null if not found.
+-   */
+-  public RackNode getRackByName(String name);
+-
+-  /**
+-   * Determine the distance between two {@link Node}s. Currently, the distance
+-   * is loosely defined as the length of the longer path for either a or b to
+-   * reach their common ancestor.
+-   * 
+-   * @param a
+-   * @param b
+-   * @return The distance between {@link Node} a and {@link Node} b.
+-   */
+-  int distance(Node a, Node b);
+-  
+-  /**
+-   * Get the maximum distance possible between any two nodes.
+-   * @return the maximum distance possible between any two nodes.
+-   */
+-  int getMaximumDistance();
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java
+deleted file mode 100644
+index 9c003801320..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * Reading JSON-encoded cluster topology and produce the parsed
+- * {@link LoggedNetworkTopology} object.
+- */
+-public class ClusterTopologyReader {
+-  private LoggedNetworkTopology topology;
+-
+-  private void readTopology(JsonObjectMapperParser<LoggedNetworkTopology> parser)
+-      throws IOException {
+-    try {
+-      topology = parser.getNext();
+-      if (topology == null) {
+-        throw new IOException(
+-            "Input file does not contain valid topology data.");
+-      }
+-    } finally {
+-      parser.close();
+-    }
+-  }
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param path
+-   *          Path to the JSON-encoded topology file, possibly compressed.
+-   * @param conf
+-   * @throws IOException
+-   */
+-  public ClusterTopologyReader(Path path, Configuration conf)
+-      throws IOException {
+-    JsonObjectMapperParser<LoggedNetworkTopology> parser = new JsonObjectMapperParser<LoggedNetworkTopology>(
+-        path, LoggedNetworkTopology.class, conf);
+-    readTopology(parser);
+-  }
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param input
+-   *          The input stream for the JSON-encoded topology data.
+-   */
+-  public ClusterTopologyReader(InputStream input) throws IOException {
+-    JsonObjectMapperParser<LoggedNetworkTopology> parser = new JsonObjectMapperParser<LoggedNetworkTopology>(
+-        input, LoggedNetworkTopology.class);
+-    readTopology(parser);
+-  }
+-
+-  /**
+-   * Get the {@link LoggedNetworkTopology} object.
+-   * 
+-   * @return The {@link LoggedNetworkTopology} object parsed from the input.
+-   */
+-  public LoggedNetworkTopology get() {
+-    return topology;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java
+deleted file mode 100644
+index 3531118ae10..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.DataInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.mapreduce.jobhistory.EventReader;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.v2.hs.JobHistory;
+-
+-/**
+- * {@link JobHistoryParser} that parses JobHistory files.
+- */
+-public class CurrentJHParser implements JobHistoryParser {
+-  private EventReader reader;
+-
+-  private static class ForkedDataInputStream extends DataInputStream {
+-    ForkedDataInputStream(InputStream input) {
+-      super(input);
+-    }
+-
+-    @Override
+-    public void close() {
+-      // no code
+-    }
+-  }
+-
+-  /**
+-   * Can this parser parse the input?
+-   * 
+-   * @param input
+-   * @return Whether this parser can parse the input.
+-   * @throws IOException
+-   */
+-  public static boolean canParse(InputStream input) throws IOException {
+-    final DataInputStream in = new ForkedDataInputStream(input);
+-
+-    try {
+-      final EventReader reader = new EventReader(in);
+-
+-      try {
+-        reader.getNextEvent();
+-      } catch (IOException e) {
+-        return false;
+-      } finally {
+-        reader.close();
+-      }
+-    } catch (IOException e) {
+-      return false;
+-    }
+-
+-    return true;
+-  }
+-
+-  public CurrentJHParser(InputStream input) throws IOException {
+-    reader = new EventReader(new DataInputStream(input));
+-  }
+-
+-  @Override
+-  public HistoryEvent nextEvent() throws IOException {
+-    return reader.getNextEvent();
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    reader.close();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java
+deleted file mode 100644
+index 04dd31468c4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-/**
+- * Classes that implement this interface can deep-compare [for equality only,
+- * not order] with another instance. They do a deep compare. If there is any
+- * semantically significant difference, an implementer throws an Exception to be
+- * thrown with a chain of causes describing the chain of field references and
+- * indices that get you to the miscompared point.
+- * 
+- */
+-public interface DeepCompare {
+-  /**
+-   * @param other
+-   *          the other comparand that's being compared to me
+-   * @param myLocation
+-   *          the path that got to me. In the root, myLocation is null. To
+-   *          process the scalar {@code foo} field of the root we will make a
+-   *          recursive call with a {@link TreePath} whose {@code fieldName} is
+-   *          {@code "bar"} and whose {@code index} is -1 and whose {@code
+-   *          parent} is {@code null}. To process the plural {@code bar} field
+-   *          of the root we will make a recursive call with a {@link TreePath}
+-   *          whose fieldName is {@code "foo"} and whose {@code index} is -1 and
+-   *          whose {@code parent} is also {@code null}.
+-   * @throws DeepInequalityException
+-   */
+-  public void deepCompare(DeepCompare other, TreePath myLocation)
+-      throws DeepInequalityException;
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java
+deleted file mode 100644
+index 604a8502a7b..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-/**
+- * We use this exception class in the unit test, and we do a deep comparison
+- * when we run the
+- * 
+- */
+-public class DeepInequalityException extends Exception {
+-
+-  static final long serialVersionUID = 1352469876;
+-
+-  final TreePath path;
+-
+-  /**
+-   * @param message
+-   *          an exception message
+-   * @param path
+-   *          the path that gets from the root to the inequality
+-   * 
+-   *          This is the constructor that I intend to have used for this
+-   *          exception.
+-   */
+-  public DeepInequalityException(String message, TreePath path,
+-      Throwable chainee) {
+-    super(message, chainee);
+-
+-    this.path = path;
+-  }
+-
+-  /**
+-   * @param message
+-   *          an exception message
+-   * @param path
+-   *          the path that gets from the root to the inequality
+-   * 
+-   *          This is the constructor that I intend to have used for this
+-   *          exception.
+-   */
+-  public DeepInequalityException(String message, TreePath path) {
+-    super(message);
+-
+-    this.path = path;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java
+deleted file mode 100644
+index 59e2e68b837..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * {@link DefaultInputDemuxer} acts as a pass-through demuxer. It just opens
+- * each file and returns back the input stream. If the input is compressed, it
+- * would return a decompression stream.
+- */
+-public class DefaultInputDemuxer implements InputDemuxer {
+-  String name;
+-  InputStream input;
+-
+-  @Override
+-  public void bindTo(Path path, Configuration conf) throws IOException {
+-    if (name != null) { // re-binding before the previous one was consumed.
+-      close();
+-    }
+-    name = path.getName();
+-
+-    input = new PossiblyDecompressedInputStream(path, conf);
+-
+-    return;
+-  }
+-
+-  @Override
+-  public Pair<String, InputStream> getNext() throws IOException {
+-    if (name != null) {
+-      Pair<String, InputStream> ret =
+-          new Pair<String, InputStream>(name, input);
+-      name = null;
+-      input = null;
+-      return ret;
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    try {
+-      if (input != null) {
+-        input.close();
+-      }
+-    } finally {
+-      name = null;
+-      input = null;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java
+deleted file mode 100644
+index b42b44b28a4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java
++++ /dev/null
+@@ -1,69 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.compress.CodecPool;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.io.compress.Compressor;
+-
+-/**
+- * The default {@link Outputter} that outputs to a plain file. Compression
+- * will be applied if the path has the right suffix.
+- */
+-public class DefaultOutputter<T> implements Outputter<T> {
+-  JsonObjectMapperWriter<T> writer;
+-  Compressor compressor;
+-  
+-  @Override
+-  public void init(Path path, Configuration conf) throws IOException {
+-    FileSystem fs = path.getFileSystem(conf);
+-    CompressionCodec codec = new CompressionCodecFactory(conf).getCodec(path);
+-    OutputStream output;
+-    if (codec != null) {
+-      compressor = CodecPool.getCompressor(codec);
+-      output = codec.createOutputStream(fs.create(path), compressor);
+-    } else {
+-      output = fs.create(path);
+-    }
+-    writer = new JsonObjectMapperWriter<T>(output, 
+-        conf.getBoolean("rumen.output.pretty.print", true));
+-  }
+-
+-  @Override
+-  public void output(T object) throws IOException {
+-    writer.write(object);
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    try {
+-      writer.close();
+-    } finally {
+-      if (compressor != null) {
+-        CodecPool.returnCompressor(compressor);
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java
+deleted file mode 100644
+index 369c54b6ca4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java
++++ /dev/null
+@@ -1,201 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.Serializable;
+-import java.util.Comparator;
+-import java.util.Iterator;
+-import java.util.PriorityQueue;
+-import java.util.TreeMap;
+-import java.util.TreeSet;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class DeskewedJobTraceReader implements Closeable {
+-  // underlying engine
+-  private final JobTraceReader reader;
+-
+-  // configuration variables
+-  private final int skewBufferLength;
+-
+-  private final boolean abortOnUnfixableSkew;
+-
+-  // state variables
+-  private long skewMeasurementLatestSubmitTime = Long.MIN_VALUE;
+-
+-  private long returnedLatestSubmitTime = Long.MIN_VALUE;
+-
+-  private int maxSkewBufferNeeded = 0;
+-
+-  // a submit time will NOT be in countedRepeatedSubmitTimesSoFar if
+-  // it only occurs once. This situation is represented by having the
+-  // time in submitTimesSoFar only. A submit time that occurs twice or more
+-  // appears in countedRepeatedSubmitTimesSoFar [with the appropriate range
+-  // value] AND submitTimesSoFar
+-  private TreeMap<Long, Integer> countedRepeatedSubmitTimesSoFar =
+-      new TreeMap<Long, Integer>();
+-  private TreeSet<Long> submitTimesSoFar = new TreeSet<Long>();
+-
+-  private final PriorityQueue<LoggedJob> skewBuffer;
+-
+-  static final private Logger LOG =
+-      LoggerFactory.getLogger(DeskewedJobTraceReader.class);
+-
+-  static private class JobComparator implements Comparator<LoggedJob>, 
+-  Serializable {
+-    @Override
+-    public int compare(LoggedJob j1, LoggedJob j2) {
+-      return (j1.getSubmitTime() < j2.getSubmitTime()) ? -1 : (j1
+-          .getSubmitTime() == j2.getSubmitTime()) ? 0 : 1;
+-    }
+-  }
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param reader
+-   *          the {@link JobTraceReader} that's being protected
+-   * @param skewBufferLength
+-   *          [the number of late jobs that can preced a later out-of-order
+-   *          earlier job
+-   * @throws IOException
+-   */
+-  public DeskewedJobTraceReader(JobTraceReader reader, int skewBufferLength,
+-      boolean abortOnUnfixableSkew) throws IOException {
+-    this.reader = reader;
+-
+-    this.skewBufferLength = skewBufferLength;
+-
+-    this.abortOnUnfixableSkew = abortOnUnfixableSkew;
+-
+-    skewBuffer =
+-        new PriorityQueue<LoggedJob>(skewBufferLength + 1, new JobComparator());
+-
+-    fillSkewBuffer();
+-  }
+-
+-  public DeskewedJobTraceReader(JobTraceReader reader) throws IOException {
+-    this(reader, 0, true);
+-  }
+-
+-  private LoggedJob rawNextJob() throws IOException {
+-    LoggedJob result = reader.getNext();
+-
+-    if ((!abortOnUnfixableSkew || skewBufferLength > 0) && result != null) {
+-      long thisTime = result.getSubmitTime();
+-
+-      if (submitTimesSoFar.contains(thisTime)) {
+-        Integer myCount = countedRepeatedSubmitTimesSoFar.get(thisTime);
+-
+-        countedRepeatedSubmitTimesSoFar.put(thisTime, myCount == null ? 2
+-            : myCount + 1);
+-      } else {
+-        submitTimesSoFar.add(thisTime);
+-      }
+-
+-      if (thisTime < skewMeasurementLatestSubmitTime) {
+-        Iterator<Long> endCursor = submitTimesSoFar.descendingIterator();
+-
+-        int thisJobNeedsSkew = 0;
+-
+-        Long keyNeedingSkew;
+-
+-        while (endCursor.hasNext()
+-            && (keyNeedingSkew = endCursor.next()) > thisTime) {
+-          Integer keyNeedsSkewAmount =
+-              countedRepeatedSubmitTimesSoFar.get(keyNeedingSkew);
+-
+-          thisJobNeedsSkew +=
+-              keyNeedsSkewAmount == null ? 1 : keyNeedsSkewAmount;
+-        }
+-
+-        maxSkewBufferNeeded = Math.max(maxSkewBufferNeeded, thisJobNeedsSkew);
+-      }
+-
+-      skewMeasurementLatestSubmitTime =
+-          Math.max(thisTime, skewMeasurementLatestSubmitTime);
+-    }
+-
+-    return result;
+-  }
+-
+-  static class OutOfOrderException extends RuntimeException {
+-    static final long serialVersionUID = 1L;
+-
+-    public OutOfOrderException(String text) {
+-      super(text);
+-    }
+-  }
+-
+-  LoggedJob nextJob() throws IOException, OutOfOrderException {
+-    LoggedJob newJob = rawNextJob();
+-
+-    if (newJob != null) {
+-      skewBuffer.add(newJob);
+-    }
+-
+-    LoggedJob result = skewBuffer.poll();
+-
+-    while (result != null && result.getSubmitTime() < returnedLatestSubmitTime) {
+-      LOG.error("The current job was submitted earlier than the previous one");
+-      LOG.error("Its jobID is " + result.getJobID());
+-      LOG.error("Its submit time is " + result.getSubmitTime()
+-          + ",but the previous one was " + returnedLatestSubmitTime);
+-
+-      if (abortOnUnfixableSkew) {
+-        throw new OutOfOrderException("Job submit time is "
+-            + result.getSubmitTime() + ",but the previous one was "
+-            + returnedLatestSubmitTime);
+-      }
+-
+-      result = rawNextJob();
+-    }
+-
+-    if (result != null) {
+-      returnedLatestSubmitTime = result.getSubmitTime();
+-    }
+-
+-    return result;
+-  }
+-
+-  private void fillSkewBuffer() throws IOException {
+-    for (int i = 0; i < skewBufferLength; ++i) {
+-      LoggedJob newJob = rawNextJob();
+-
+-      if (newJob == null) {
+-        return;
+-      }
+-
+-      skewBuffer.add(newJob);
+-    }
+-  }
+-
+-  int neededSkewBufferSize() {
+-    return maxSkewBufferNeeded;
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    reader.close();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java
+deleted file mode 100644
+index 683bcc80f1f..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java
++++ /dev/null
+@@ -1,547 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.util.Comparator;
+-import java.util.HashSet;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.PriorityQueue;
+-import java.util.Queue;
+-import java.util.Random;
+-import java.util.Set;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-public class Folder extends Configured implements Tool {
+-  private long outputDuration = -1;
+-  private long inputCycle = -1;
+-  private double concentration = 1.0;
+-  private long randomSeed = 0; // irrelevant if seeded == false
+-  private boolean seeded = false;
+-  private boolean debug = false;
+-  private boolean allowMissorting = false;
+-  private int skewBufferLength = 0;
+-  private long startsAfter = -1;
+-
+-  static final private Logger LOG = LoggerFactory.getLogger(Folder.class);
+-
+-  private DeskewedJobTraceReader reader = null;
+-  private Outputter<LoggedJob> outGen = null;
+-
+-  private List<Path> tempPaths = new LinkedList<Path>();
+-
+-  private Path tempDir = null;
+-
+-  private long firstJobSubmitTime;
+-
+-  private double timeDilation;
+-
+-  private double transcriptionRateFraction;
+-
+-  private int transcriptionRateInteger;
+-
+-  private Random random;
+-
+-  static private final long TICKS_PER_SECOND = 1000L;
+-
+-  // error return codes
+-  static private final int NON_EXISTENT_FILES = 1;
+-  static private final int NO_INPUT_CYCLE_LENGTH = 2;
+-  static private final int EMPTY_JOB_TRACE = 3;
+-  static private final int OUT_OF_ORDER_JOBS = 4;
+-  static private final int ALL_JOBS_SIMULTANEOUS = 5;
+-  static private final int IO_ERROR = 6;
+-  static private final int OTHER_ERROR = 7;
+-
+-  private Set<Closeable> closees = new HashSet<Closeable>();
+-  private Set<Path> deletees = new HashSet<Path>();
+-
+-  static long parseDuration(String durationString) {
+-    String numeral = durationString.substring(0, durationString.length() - 1);
+-    char durationCode = durationString.charAt(durationString.length() - 1);
+-
+-    long result = Integer.parseInt(numeral);
+-
+-    if (result <= 0) {
+-      throw new IllegalArgumentException("Negative durations are not allowed");
+-    }
+-
+-    switch (durationCode) {
+-    case 'D':
+-    case 'd':
+-      return 24L * 60L * 60L * TICKS_PER_SECOND * result;
+-    case 'H':
+-    case 'h':
+-      return 60L * 60L * TICKS_PER_SECOND * result;
+-    case 'M':
+-    case 'm':
+-      return 60L * TICKS_PER_SECOND * result;
+-    case 'S':
+-    case 's':
+-      return TICKS_PER_SECOND * result;
+-    default:
+-      throw new IllegalArgumentException("Missing or invalid duration code");
+-    }
+-  }
+-
+-  private int initialize(String[] args) throws IllegalArgumentException {
+-    String tempDirName = null;
+-    String inputPathName = null;
+-    String outputPathName = null;
+-
+-    for (int i = 0; i < args.length; ++i) {
+-      String thisArg = args[i];
+-      if (thisArg.equalsIgnoreCase("-starts-after")) {
+-        startsAfter = parseDuration(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-output-duration")) {
+-        outputDuration = parseDuration(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-input-cycle")) {
+-        inputCycle = parseDuration(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-concentration")) {
+-        concentration = Double.parseDouble(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-debug")) {
+-        debug = true;
+-      } else if (thisArg.equalsIgnoreCase("-allow-missorting")) {
+-        allowMissorting = true;
+-      } else if (thisArg.equalsIgnoreCase("-seed")) {
+-        seeded = true;
+-        randomSeed = Long.parseLong(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-skew-buffer-length")) {
+-        skewBufferLength = Integer.parseInt(args[++i]);
+-      } else if (thisArg.equalsIgnoreCase("-temp-directory")) {
+-        tempDirName = args[++i];
+-      } else if (thisArg.equals("") || thisArg.startsWith("-")) {
+-        throw new IllegalArgumentException("Illegal switch argument, "
+-            + thisArg + " at position " + i);
+-      } else {
+-        inputPathName = thisArg;
+-        outputPathName = args[++i];
+-
+-        if (i != args.length - 1) {
+-          throw new IllegalArgumentException("Too many non-switch arguments");
+-        }
+-      }
+-    }
+-
+-    try {
+-      Configuration conf = getConf();
+-      Path inPath = new Path(inputPathName);
+-      reader =
+-          new DeskewedJobTraceReader(new JobTraceReader(inPath, conf),
+-              skewBufferLength, !allowMissorting);
+-      Path outPath = new Path(outputPathName);
+-
+-      outGen = new DefaultOutputter<LoggedJob>();
+-      outGen.init(outPath, conf);
+-
+-      tempDir =
+-          tempDirName == null ? outPath.getParent() : new Path(tempDirName);
+-
+-      FileSystem fs = tempDir.getFileSystem(getConf());
+-      if (!fs.getFileStatus(tempDir).isDirectory()) {
+-        throw new IOException("Your temp directory is not a directory");
+-      }
+-
+-      if (inputCycle <= 0) {
+-        LOG.error("You must have an input cycle length.");
+-        return NO_INPUT_CYCLE_LENGTH;
+-      }
+-
+-      if (outputDuration <= 0) {
+-        outputDuration = 60L * 60L * TICKS_PER_SECOND;
+-      }
+-
+-      if (inputCycle <= 0) {
+-        inputCycle = outputDuration;
+-      }
+-
+-      timeDilation = (double) outputDuration / (double) inputCycle;
+-
+-      random = seeded ? new Random(randomSeed) : new Random();
+-
+-      if (debug) {
+-        randomSeed = random.nextLong();
+-
+-        LOG.warn("This run effectively has a -seed of " + randomSeed);
+-
+-        random = new Random(randomSeed);
+-
+-        seeded = true;
+-      }
+-    } catch (IOException e) {
+-      e.printStackTrace(System.err);
+-
+-      return NON_EXISTENT_FILES;
+-    }
+-
+-    return 0;
+-  }
+-
+-  @Override
+-  public int run(String[] args) throws IOException {
+-    int result = initialize(args);
+-
+-    if (result != 0) {
+-      return result;
+-    }
+-
+-    return run();
+-  }
+-
+-  public int run() throws IOException {
+-    class JobEntryComparator implements
+-        Comparator<Pair<LoggedJob, JobTraceReader>> {
+-      public int compare(Pair<LoggedJob, JobTraceReader> p1,
+-          Pair<LoggedJob, JobTraceReader> p2) {
+-        LoggedJob j1 = p1.first();
+-        LoggedJob j2 = p2.first();
+-
+-        return (j1.getSubmitTime() < j2.getSubmitTime()) ? -1 : (j1
+-            .getSubmitTime() == j2.getSubmitTime()) ? 0 : 1;
+-      }
+-    }
+-
+-    // we initialize an empty heap so if we take an error before establishing
+-    // a real one the finally code goes through
+-    Queue<Pair<LoggedJob, JobTraceReader>> heap =
+-        new PriorityQueue<Pair<LoggedJob, JobTraceReader>>();
+-
+-    try {
+-      LoggedJob job = reader.nextJob();
+-
+-      if (job == null) {
+-        LOG.error("The job trace is empty");
+-
+-        return EMPTY_JOB_TRACE;
+-      }
+-      
+-      // If starts-after time is specified, skip the number of jobs till we reach
+-      // the starting time limit.
+-      if (startsAfter > 0) {
+-        LOG.info("starts-after time is specified. Initial job submit time : " 
+-                 + job.getSubmitTime());
+-
+-        long approximateTime = job.getSubmitTime() + startsAfter;
+-        job = reader.nextJob();
+-        long skippedCount = 0;
+-        while (job != null && job.getSubmitTime() < approximateTime) {
+-          job = reader.nextJob();
+-          skippedCount++;
+-        }
+-
+-        LOG.debug("Considering jobs with submit time greater than " 
+-                  + startsAfter + " ms. Skipped " + skippedCount + " jobs.");
+-
+-        if (job == null) {
+-          LOG.error("No more jobs to process in the trace with 'starts-after'"+
+-                    " set to " + startsAfter + "ms.");
+-          return EMPTY_JOB_TRACE;
+-        }
+-        LOG.info("The first job has a submit time of " + job.getSubmitTime());
+-      }
+-
+-      firstJobSubmitTime = job.getSubmitTime();
+-      long lastJobSubmitTime = firstJobSubmitTime;
+-
+-      int numberJobs = 0;
+-
+-      long currentIntervalEnd = Long.MIN_VALUE;
+-
+-      Path nextSegment = null;
+-      Outputter<LoggedJob> tempGen = null;
+-
+-      if (debug) {
+-        LOG.debug("The first job has a submit time of " + firstJobSubmitTime);
+-      }
+-
+-      final Configuration conf = getConf();
+-
+-      try {
+-        // At the top of this loop, skewBuffer has at most
+-        // skewBufferLength entries.
+-        while (job != null) {
+-          final Random tempNameGenerator = new Random();
+-
+-          lastJobSubmitTime = job.getSubmitTime();
+-
+-          ++numberJobs;
+-
+-          if (job.getSubmitTime() >= currentIntervalEnd) {
+-            if (tempGen != null) {
+-              tempGen.close();
+-            }
+-            
+-            nextSegment = null;
+-            for (int i = 0; i < 3 && nextSegment == null; ++i) {
+-              try {
+-                nextSegment =
+-                    new Path(tempDir, "segment-" + tempNameGenerator.nextLong()
+-                        + ".json.gz");
+-
+-                if (debug) {
+-                  LOG.debug("The next segment name is " + nextSegment);
+-                }
+-
+-                FileSystem fs = nextSegment.getFileSystem(conf);
+-
+-                try {
+-                  if (!fs.exists(nextSegment)) {
+-                    break;
+-                  }
+-
+-                  continue;
+-                } catch (IOException e) {
+-                  // no code -- file did not already exist
+-                }
+-              } catch (IOException e) {
+-                // no code -- file exists now, or directory bad. We try three
+-                // times.
+-              }
+-            }
+-
+-            if (nextSegment == null) {
+-              throw new RuntimeException("Failed to create a new file!");
+-            }
+-            
+-            if (debug) {
+-              LOG.debug("Creating " + nextSegment
+-                  + " for a job with a submit time of " + job.getSubmitTime());
+-            }
+-
+-            deletees.add(nextSegment);
+-
+-            tempPaths.add(nextSegment);
+-
+-            tempGen = new DefaultOutputter<LoggedJob>();
+-            tempGen.init(nextSegment, conf);
+-
+-            long currentIntervalNumber =
+-                (job.getSubmitTime() - firstJobSubmitTime) / inputCycle;
+-
+-            currentIntervalEnd =
+-                firstJobSubmitTime + ((currentIntervalNumber + 1) * inputCycle);
+-          }
+-
+-          // the temp files contain UDadjusted times, but each temp file's
+-          // content is in the same input cycle interval.
+-          if (tempGen != null) {
+-            tempGen.output(job);
+-          }
+-
+-          job = reader.nextJob();
+-        }
+-      } catch (DeskewedJobTraceReader.OutOfOrderException e) {
+-        return OUT_OF_ORDER_JOBS;
+-      } finally {
+-        if (tempGen != null) {
+-          tempGen.close();
+-        }
+-      }
+-
+-      if (lastJobSubmitTime <= firstJobSubmitTime) {
+-        LOG.error("All of your job[s] have the same submit time."
+-            + "  Please just use your input file.");
+-
+-        return ALL_JOBS_SIMULTANEOUS;
+-      }
+-
+-      double submitTimeSpan = lastJobSubmitTime - firstJobSubmitTime;
+-
+-      LOG.warn("Your input trace spans "
+-          + (lastJobSubmitTime - firstJobSubmitTime) + " ticks.");
+-
+-      double foldingRatio =
+-          submitTimeSpan * (numberJobs + 1) / numberJobs / inputCycle;
+-
+-      if (debug) {
+-        LOG.warn("run: submitTimeSpan = " + submitTimeSpan + ", numberJobs = "
+-            + numberJobs + ", inputCycle = " + inputCycle);
+-      }
+-
+-      if (reader.neededSkewBufferSize() > 0) {
+-        LOG.warn("You needed a -skew-buffer-length of "
+-            + reader.neededSkewBufferSize() + " but no more, for this input.");
+-      }
+-
+-      double tProbability = timeDilation * concentration / foldingRatio;
+-
+-      if (debug) {
+-        LOG.warn("run: timeDilation = " + timeDilation + ", concentration = "
+-            + concentration + ", foldingRatio = " + foldingRatio);
+-        LOG.warn("The transcription probability is " + tProbability);
+-      }
+-
+-      transcriptionRateInteger = (int) Math.floor(tProbability);
+-      transcriptionRateFraction = tProbability - Math.floor(tProbability);
+-
+-      // Now read all the inputs in parallel
+-      heap =
+-          new PriorityQueue<Pair<LoggedJob, JobTraceReader>>(tempPaths.size(),
+-              new JobEntryComparator());
+-
+-      for (Path tempPath : tempPaths) {
+-        JobTraceReader thisReader = new JobTraceReader(tempPath, conf);
+-
+-        closees.add(thisReader);
+-
+-        LoggedJob streamFirstJob = thisReader.getNext();
+-
+-        long thisIndex =
+-            (streamFirstJob.getSubmitTime() - firstJobSubmitTime) / inputCycle;
+-
+-        if (debug) {
+-          LOG.debug("A job with submit time of "
+-              + streamFirstJob.getSubmitTime() + " is in interval # "
+-              + thisIndex);
+-        }
+-
+-        adjustJobTimes(streamFirstJob);
+-
+-        if (debug) {
+-          LOG.debug("That job's submit time is adjusted to "
+-              + streamFirstJob.getSubmitTime());
+-        }
+-
+-        heap
+-            .add(new Pair<LoggedJob, JobTraceReader>(streamFirstJob, thisReader));
+-      }
+-
+-      Pair<LoggedJob, JobTraceReader> next = heap.poll();
+-
+-      while (next != null) {
+-        maybeOutput(next.first());
+-
+-        if (debug) {
+-          LOG.debug("The most recent job has an adjusted submit time of "
+-              + next.first().getSubmitTime());
+-          LOG.debug(" Its replacement in the heap will come from input engine "
+-              + next.second());
+-        }
+-
+-        LoggedJob replacement = next.second().getNext();
+-
+-        if (replacement == null) {
+-          next.second().close();
+-
+-          if (debug) {
+-            LOG.debug("That input engine is depleted.");
+-          }
+-        } else {
+-          adjustJobTimes(replacement);
+-
+-          if (debug) {
+-            LOG.debug("The replacement has an adjusted submit time of "
+-                + replacement.getSubmitTime());
+-          }
+-
+-          heap.add(new Pair<LoggedJob, JobTraceReader>(replacement, next
+-              .second()));
+-        }
+-
+-        next = heap.poll();
+-      }
+-    } finally {
+-      IOUtils.cleanupWithLogger(null, reader);
+-      if (outGen != null) {
+-        outGen.close();
+-      }
+-      for (Pair<LoggedJob, JobTraceReader> heapEntry : heap) {
+-        heapEntry.second().close();
+-      }
+-      for (Closeable closee : closees) {
+-        closee.close();
+-      }
+-      if (!debug) {
+-        Configuration conf = getConf();
+-
+-        for (Path deletee : deletees) {
+-          FileSystem fs = deletee.getFileSystem(conf);
+-
+-          try {
+-            fs.delete(deletee, false);
+-          } catch (IOException e) {
+-            // no code
+-          }
+-        }
+-      }
+-    }
+-
+-    return 0;
+-  }
+-
+-  private void maybeOutput(LoggedJob job) throws IOException {
+-    for (int i = 0; i < transcriptionRateInteger; ++i) {
+-      outGen.output(job);
+-    }
+-
+-    if (random.nextDouble() < transcriptionRateFraction) {
+-      outGen.output(job);
+-    }
+-  }
+-
+-  private void adjustJobTimes(LoggedJob adjustee) {
+-    long offsetInCycle =
+-        (adjustee.getSubmitTime() - firstJobSubmitTime) % inputCycle;
+-
+-    long outputOffset = (long) ((double) offsetInCycle * timeDilation);
+-
+-    long adjustment =
+-        firstJobSubmitTime + outputOffset - adjustee.getSubmitTime();
+-
+-    adjustee.adjustTimes(adjustment);
+-  }
+-
+-  /**
+-   * @param args
+-   */
+-  public static void main(String[] args) {
+-    Folder instance = new Folder();
+-
+-    int result = 0;
+-
+-    try {
+-      result = ToolRunner.run(instance, args);
+-    } catch (IOException e) {
+-      e.printStackTrace(System.err);
+-      System.exit(IO_ERROR);
+-    } catch (Exception e) {
+-      e.printStackTrace(System.err);
+-      System.exit(OTHER_ERROR);
+-    }
+-
+-    if (result != 0) {
+-      System.exit(result);
+-    }
+-
+-    return;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
+deleted file mode 100644
+index 08e825b4035..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java
++++ /dev/null
+@@ -1,211 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.Map;
+-import java.util.Queue;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.util.LineReader;
+-
+-/**
+- * {@link JobHistoryParser} to parse job histories for hadoop 0.20 (META=1).
+- */
+-public class Hadoop20JHParser implements JobHistoryParser {
+-  final LineReader reader;
+-
+-  static final String endLineString = " .";
+-  static final int internalVersion = 1;
+-
+-  /**
+-   * Can this parser parse the input?
+-   * 
+-   * @param input
+-   * @return Whether this parser can parse the input.
+-   * @throws IOException
+-   * 
+-   *           We will deem a stream to be a good 0.20 job history stream if the
+-   *           first line is exactly "Meta VERSION=\"1\" ."
+-   */
+-  public static boolean canParse(InputStream input) throws IOException {
+-    try {
+-      LineReader reader = new LineReader(input);
+-
+-      Text buffer = new Text();
+-
+-      return reader.readLine(buffer) != 0
+-          && buffer.toString().equals("Meta VERSION=\"1\" .");
+-    } catch (EOFException e) {
+-      return false;
+-    }
+-  }
+-
+-  public Hadoop20JHParser(InputStream input) throws IOException {
+-    super();
+-
+-    reader = new LineReader(input);
+-  }
+-
+-  public Hadoop20JHParser(LineReader reader) throws IOException {
+-    super();
+-    this.reader = reader;
+-  }
+-
+-  Map<String, HistoryEventEmitter> liveEmitters =
+-      new HashMap<String, HistoryEventEmitter>();
+-  Queue<HistoryEvent> remainingEvents = new LinkedList<HistoryEvent>();
+-
+-  enum LineType {
+-    JOB("Job", "JOBID") {
+-      HistoryEventEmitter createEmitter() {
+-        return new Job20LineHistoryEventEmitter();
+-      }
+-    },
+-
+-    TASK("Task", "TASKID") {
+-      HistoryEventEmitter createEmitter() {
+-        return new Task20LineHistoryEventEmitter();
+-      }
+-    },
+-
+-    MAP_ATTEMPT("MapAttempt", "TASK_ATTEMPT_ID") {
+-      HistoryEventEmitter createEmitter() {
+-        return new MapAttempt20LineHistoryEventEmitter();
+-      }
+-    },
+-
+-    REDUCE_ATTEMPT("ReduceAttempt", "TASK_ATTEMPT_ID") {
+-      HistoryEventEmitter createEmitter() {
+-        return new ReduceAttempt20LineHistoryEventEmitter();
+-      }
+-    };
+-
+-    private LogRecordType type;
+-    private String name;
+-
+-    LineType(String s, String name) {
+-      type = LogRecordType.intern(s);
+-      this.name = name;
+-    }
+-
+-    LogRecordType recordType() {
+-      return type;
+-    }
+-
+-    String getName(ParsedLine line) {
+-      return line.get(name);
+-    }
+-
+-    abstract HistoryEventEmitter createEmitter();
+-
+-    static LineType findLineType(LogRecordType lrt) {
+-      for (LineType lt : LineType.values()) {
+-        if (lt.type == lrt) {
+-          return lt;
+-        }
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  public HistoryEvent nextEvent() {
+-    try {
+-      while (remainingEvents.isEmpty()) {
+-        ParsedLine line = new ParsedLine(getFullLine(), internalVersion);
+-        LineType type = LineType.findLineType(line.getType());
+-        if (type == null) {
+-          continue;
+-        }
+-        String name = type.getName(line);
+-        HistoryEventEmitter emitter = findOrMakeEmitter(name, type);
+-        Pair<Queue<HistoryEvent>, HistoryEventEmitter.PostEmitAction> pair =
+-            emitter.emitterCore(line, name);
+-        if (pair.second() == HistoryEventEmitter.PostEmitAction.REMOVE_HEE) {
+-          liveEmitters.remove(name);
+-        }
+-        remainingEvents = pair.first();
+-      }
+-      return remainingEvents.poll();
+-    } catch (EOFException e) {
+-      return null;
+-    } catch (IOException e) {
+-      return null;
+-    }
+-  }
+-
+-  HistoryEventEmitter findOrMakeEmitter(String name, LineType type) {
+-    HistoryEventEmitter result = liveEmitters.get(name);
+-    if (result == null) {
+-      result = type.createEmitter();
+-      liveEmitters.put(name, result);
+-    }
+-    return result;
+-  }
+-
+-  private String getOneLine() throws IOException {
+-    Text resultText = new Text();
+-
+-    if (reader.readLine(resultText) == 0) {
+-      throw new EOFException("apparent bad line");
+-    }
+-
+-    return resultText.toString();
+-  }
+-
+-  private String getFullLine() throws IOException {
+-    String line = getOneLine();
+-
+-    while (line.length() < endLineString.length()) {
+-      line = getOneLine();
+-    }
+-
+-    if (line.endsWith(endLineString)) {
+-      return line;
+-    }
+-
+-    StringBuilder sb = new StringBuilder(line);
+-
+-    String addedLine;
+-
+-    do {
+-      addedLine = getOneLine();
+-      sb.append("\n");
+-      sb.append(addedLine);
+-    } while (addedLine.length() < endLineString.length()
+-        || !endLineString.equals(addedLine.substring(addedLine.length()
+-            - endLineString.length())));
+-
+-    return sb.toString();
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    if (reader != null) {
+-      reader.close();
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java
+deleted file mode 100644
+index 381199a0b6a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java
++++ /dev/null
+@@ -1,1850 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * 
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.EOFException;
+-import java.io.PrintStream;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.StringTokenizer;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.util.LineReader;
+-
+-import org.apache.hadoop.conf.Configured;
+-
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-
+-import org.apache.hadoop.io.Text;
+-
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.io.compress.CodecPool;
+-import org.apache.hadoop.io.compress.Decompressor;
+-
+-/**
+- * This is the main class for rumen log mining functionality.
+- * 
+- * It reads a directory of job tracker logs, and computes various information
+- * about it. See {@code usage()}, below.
+- * 
+- */
+-@Deprecated
+-public class HadoopLogsAnalyzer extends Configured implements Tool {
+-
+-  // output streams
+-  private PrintStream statusOutput = System.out;
+-  private PrintStream statisticalOutput = System.out;
+-
+-  private static PrintStream staticDebugOutput = System.err;
+-
+-  /**
+-   * The number of splits a task can have, before we ignore them all.
+-   */
+-  private final static int MAXIMUM_PREFERRED_LOCATIONS = 25;
+-
+-  /**
+-   * This element is to compensate for the fact that our percentiles engine
+-   * rounds up for the expected sample count, so if the total number of readings
+-   * is small enough we need to compensate slightly when aggregating the spread
+-   * data from jobs with few reducers together with jobs with many reducers.
+-   */
+-  private static final long SMALL_SPREAD_COMPENSATION_THRESHOLD = 5L;
+-
+-  /**
+-   * {@code MAXIMUM_CLOCK_SKEW} is the maximum plausible difference between the
+-   * clocks of machines in the same cluster. This is important because an event
+-   * that logically must follow a second event will be considered non-anomalous
+-   * if it precedes that second event, provided they happen on different
+-   * machines.
+-   */
+-  private static final long MAXIMUM_CLOCK_SKEW = 10000L;
+-
+-  /**
+-   * The regular expression used to parse task attempt IDs in job tracker logs
+-   */
+-  private final static Pattern taskAttemptIDPattern =
+-      Pattern.compile(".*_([0-9]+)");
+-
+-  private final static Pattern xmlFilePrefix = Pattern.compile("[ \t]*<");
+-
+-  private final static Pattern confFileHeader = Pattern.compile("_conf.xml!!");
+-
+-  private final Map<String, Pattern> counterPatterns =
+-      new HashMap<String, Pattern>();
+-
+-  /**
+-   * The unpaired job config file. Currently only used to glean the {@code -Xmx}
+-   * field of the JRE options
+-   */
+-  private ParsedConfigFile jobconf = null;
+-
+-  /**
+-   * Set by {@code -omit-task-details}. If true, we <i>only</i> emit the job
+-   * digest [statistical info], not the detailed job trace.
+-   */
+-  private boolean omitTaskDetails = false;
+-
+-  private Outputter<LoggedJob> jobTraceGen = null;
+-
+-  private boolean prettyprintTrace = true;
+-
+-  private LoggedJob jobBeingTraced = null;
+-
+-  private Map<String, LoggedTask> tasksInCurrentJob;
+-
+-  private Map<String, LoggedTaskAttempt> attemptsInCurrentJob;
+-
+-  private Histogram[] successfulMapAttemptTimes;
+-  private Histogram successfulReduceAttemptTimes;
+-  private Histogram[] failedMapAttemptTimes;
+-  private Histogram failedReduceAttemptTimes;
+-  private Histogram successfulNthMapperAttempts;
+-  private Histogram successfulNthReducerAttempts;
+-  private Histogram mapperLocality;
+-
+-  static final private Logger LOG = LoggerFactory.getLogger(HadoopLogsAnalyzer.class);
+-
+-  private int[] attemptTimesPercentiles;
+-
+-  private Outputter<LoggedNetworkTopology> topologyGen = null;
+-
+-  private HashSet<ParsedHost> allHosts = new HashSet<ParsedHost>();
+-
+-  // number of ticks per second
+-  private boolean collecting = false;
+-
+-  private long lineNumber = 0;
+-
+-  private String rereadableLine = null;
+-
+-  private String inputFilename;
+-
+-  private boolean inputIsDirectory = false;
+-
+-  private Path inputDirectoryPath = null;
+-  private String[] inputDirectoryFiles = null;
+-
+-  private int inputDirectoryCursor = -1;
+-
+-  private LineReader input = null;
+-  private CompressionCodec inputCodec = null;
+-  private Decompressor inputDecompressor = null;
+-  private Text inputLineText = new Text();
+-
+-  private boolean debug = false;
+-
+-  private int version = 0;
+-
+-  private int numberBuckets = 99;
+-
+-  private int spreadMin;
+-
+-  private int spreadMax;
+-
+-  private boolean spreading = false;
+-  private boolean delays = false;
+-  private boolean runtimes = false;
+-
+-  private boolean collectTaskTimes = false;
+-
+-  private LogRecordType canonicalJob = LogRecordType.intern("Job");
+-  private LogRecordType canonicalMapAttempt =
+-      LogRecordType.intern("MapAttempt");
+-  private LogRecordType canonicalReduceAttempt =
+-      LogRecordType.intern("ReduceAttempt");
+-  private LogRecordType canonicalTask = LogRecordType.intern("Task");
+-
+-  private static Pattern streamingJobnamePattern =
+-      Pattern.compile("streamjob\\d+.jar");
+-
+-  private HashSet<String> hostNames = new HashSet<String>();
+-
+-  private boolean fileFirstLine = true;
+-  private String currentFileName = null;
+-
+-  // Here are the cumulative statistics.
+-  enum JobOutcome {
+-    SUCCESS, FAILURE, OVERALL
+-  };
+-
+-  /**
+-   * These rectangular arrays of {@link Histogram}s are indexed by the job type
+-   * [java, streaming, pig or pipes] and then by the outcome [success or
+-   * failure]
+-   */
+-  private Histogram runTimeDists[][];
+-  private Histogram delayTimeDists[][];
+-  private Histogram mapTimeSpreadDists[][];
+-  private Histogram shuffleTimeSpreadDists[][];
+-  private Histogram sortTimeSpreadDists[][];
+-  private Histogram reduceTimeSpreadDists[][];
+-
+-  private Histogram mapTimeDists[][];
+-  private Histogram shuffleTimeDists[][];
+-  private Histogram sortTimeDists[][];
+-  private Histogram reduceTimeDists[][];
+-
+-  private Map<String, Long> taskAttemptStartTimes;
+-  private Map<String, Long> taskReduceAttemptShuffleEndTimes;
+-  private Map<String, Long> taskReduceAttemptSortEndTimes;
+-  private Map<String, Long> taskMapAttemptFinishTimes;
+-  private Map<String, Long> taskReduceAttemptFinishTimes;
+-
+-  private long submitTimeCurrentJob;
+-  private long launchTimeCurrentJob;
+-
+-  private String currentJobID;
+-
+-  // TODO this is currently not being set correctly. We should fix it.
+-  // That only matters for statistics extraction.
+-  private LoggedJob.JobType thisJobType;
+-
+-  private Histogram[][] newDistributionBlock() {
+-    return newDistributionBlock(null);
+-  }
+-
+-  private Histogram[][] newDistributionBlock(String blockname) {
+-    Histogram[][] result = new Histogram[JobOutcome.values().length][];
+-
+-    for (int i = 0; i < JobOutcome.values().length; ++i) {
+-      result[i] = new Histogram[LoggedJob.JobType.values().length];
+-
+-      for (int j = 0; j < LoggedJob.JobType.values().length; ++j) {
+-        result[i][j] =
+-            blockname == null ? new Histogram() : new Histogram(blockname);
+-      }
+-    }
+-
+-    return result;
+-  }
+-
+-  private Histogram getDistribution(Histogram[][] block, JobOutcome outcome,
+-      LoggedJob.JobType type) {
+-    return block[outcome.ordinal()][type.ordinal()];
+-  }
+-
+-  private void usage() {
+-    statusOutput
+-        .print("Usage: \n"
+-            + "administrative subcommands:\n"
+-            + "-v1                  specify version 1 of the jt logs\n"
+-            + "-h or -help          print this message\n"
+-            + "-d or -debug         print voluminous debug info during processing\n"
+-            + "-collect-prefixes    collect the prefixes of log lines\n\n"
+-            + "  job trace subcommands\n"
+-            + "-write-job-trace     takes a filename.\n"
+-            + "                     writes job trace in JSON to that filename\n"
+-            + "-single-line-job-traces  omit prettyprinting of job trace\n"
+-            + "-omit-task-details   leave out info about each task and attempt,\n"
+-            + "                     so only statistical info is added to each job\n"
+-            + "-write-topology      takes a filename.\n"
+-            + "                     writes JSON file giving network topology\n"
+-            + "-job-digest-spectra  takes a list of percentile points\n"
+-            + "                     writes CDFs with min, max, and those percentiles\n\n"
+-            + "subcommands for task statistical info\n"
+-            + "-spreads             we have a mode where, for each job, we can\n"
+-            + "                     develop the ratio of percentile B to percentile A\n"
+-            + "                     of task run times.  Having developed that ratio,\n"
+-            + "                     we can consider it to be a datum and we can\n"
+-            + "                     build a CDF of those ratios.  -spreads turns\n"
+-            + "                     this option on, and takes A and B\n"
+-            + "-delays              tells us to gather and print CDFs for delays\n"
+-            + "                     from job submit to job start\n"
+-            + "-runtimes            prints CDFs of job wallclock times [launch\n"
+-            + "                     to finish]\n"
+-            + "-tasktimes           prints CDFs of job wallclock times [launch\n"
+-            + "                     to finish]\n\n");
+-  }
+-
+-  public HadoopLogsAnalyzer() {
+-    super();
+-  }
+-
+-  private boolean pathIsDirectory(Path p) throws IOException {
+-    FileSystem fs = p.getFileSystem(getConf());
+-    return fs.getFileStatus(p).isDirectory();
+-  }
+-
+-  /**
+-   * @param args
+-   *          string arguments. See {@code usage()}
+-   * @throws FileNotFoundException
+-   * @throws IOException
+-   */
+-  private int initializeHadoopLogsAnalyzer(String[] args)
+-      throws FileNotFoundException, IOException {
+-    Path jobTraceFilename = null;
+-    Path topologyFilename = null;
+-    if (args.length == 0 || args[args.length - 1].charAt(0) == '-') {
+-      throw new IllegalArgumentException("No input specified.");
+-    } else {
+-      inputFilename = args[args.length - 1];
+-    }
+-
+-    for (int i = 0; i < args.length - (inputFilename == null ? 0 : 1); ++i) {
+-      if (StringUtils.equalsIgnoreCase("-h", args[i])
+-          || StringUtils.equalsIgnoreCase("-help", args[i])) {
+-        usage();
+-        return 0;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-c", args[i])
+-          || StringUtils.equalsIgnoreCase("-collect-prefixes", args[i])) {
+-        collecting = true;
+-        continue;
+-      }
+-
+-      // these control the job digest
+-      if (StringUtils.equalsIgnoreCase("-write-job-trace", args[i])) {
+-        ++i;
+-        jobTraceFilename = new Path(args[i]);
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-single-line-job-traces", args[i])) {
+-        prettyprintTrace = false;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-omit-task-details", args[i])) {
+-        omitTaskDetails = true;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-write-topology", args[i])) {
+-        ++i;
+-        topologyFilename = new Path(args[i]);
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-job-digest-spectra", args[i])) {
+-        ArrayList<Integer> values = new ArrayList<Integer>();
+-
+-        ++i;
+-
+-        while (i < args.length && Character.isDigit(args[i].charAt(0))) {
+-          values.add(Integer.parseInt(args[i]));
+-          ++i;
+-        }
+-
+-        if (values.size() == 0) {
+-          throw new IllegalArgumentException("Empty -job-digest-spectra list");
+-        }
+-
+-        attemptTimesPercentiles = new int[values.size()];
+-
+-        int lastValue = 0;
+-
+-        for (int j = 0; j < attemptTimesPercentiles.length; ++j) {
+-          if (values.get(j) <= lastValue || values.get(j) >= 100) {
+-            throw new IllegalArgumentException(
+-                "Bad -job-digest-spectra percentiles list");
+-          }
+-          attemptTimesPercentiles[j] = values.get(j);
+-        }
+-
+-        --i;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-d", args[i])
+-          || StringUtils.equalsIgnoreCase("-debug", args[i])) {
+-        debug = true;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-spreads", args[i])) {
+-        int min = Integer.parseInt(args[i + 1]);
+-        int max = Integer.parseInt(args[i + 2]);
+-
+-        if (min < max && min < 1000 && max < 1000) {
+-          spreadMin = min;
+-          spreadMax = max;
+-          spreading = true;
+-          i += 2;
+-        }
+-        continue;
+-      }
+-
+-      // These control log-wide CDF outputs
+-      if (StringUtils.equalsIgnoreCase("-delays", args[i])) {
+-        delays = true;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-runtimes", args[i])) {
+-        runtimes = true;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-tasktimes", args[i])) {
+-        collectTaskTimes = true;
+-        continue;
+-      }
+-
+-      if (StringUtils.equalsIgnoreCase("-v1", args[i])) {
+-        version = 1;
+-        continue;
+-      }
+-
+-      throw new IllegalArgumentException("Unrecognized argument: " + args[i]);
+-    }
+-
+-    runTimeDists = newDistributionBlock();
+-    delayTimeDists = newDistributionBlock();
+-    mapTimeSpreadDists = newDistributionBlock("map-time-spreads");
+-    shuffleTimeSpreadDists = newDistributionBlock();
+-    sortTimeSpreadDists = newDistributionBlock();
+-    reduceTimeSpreadDists = newDistributionBlock();
+-
+-    mapTimeDists = newDistributionBlock();
+-    shuffleTimeDists = newDistributionBlock();
+-    sortTimeDists = newDistributionBlock();
+-    reduceTimeDists = newDistributionBlock();
+-
+-    taskAttemptStartTimes = new HashMap<String, Long>();
+-    taskReduceAttemptShuffleEndTimes = new HashMap<String, Long>();
+-    taskReduceAttemptSortEndTimes = new HashMap<String, Long>();
+-    taskMapAttemptFinishTimes = new HashMap<String, Long>();
+-    taskReduceAttemptFinishTimes = new HashMap<String, Long>();
+-
+-    final Path inputPath = new Path(inputFilename);
+-
+-    inputIsDirectory = pathIsDirectory(inputPath);
+-
+-    if (jobTraceFilename != null && attemptTimesPercentiles == null) {
+-      attemptTimesPercentiles = new int[19];
+-
+-      for (int i = 0; i < 19; ++i) {
+-        attemptTimesPercentiles[i] = (i + 1) * 5;
+-      }
+-    }
+-
+-    if (!inputIsDirectory) {
+-      input = maybeUncompressedPath(inputPath);
+-    } else {
+-      inputDirectoryPath = inputPath;
+-      FileSystem fs = inputPath.getFileSystem(getConf());
+-      FileStatus[] statuses = fs.listStatus(inputPath);
+-      inputDirectoryFiles = new String[statuses.length];
+-
+-      for (int i = 0; i < statuses.length; ++i) {
+-        inputDirectoryFiles[i] = statuses[i].getPath().getName();
+-      }
+-
+-      // filter out the .crc files, if any
+-      int dropPoint = 0;
+-
+-      for (int i = 0; i < inputDirectoryFiles.length; ++i) {
+-        String name = inputDirectoryFiles[i];
+-
+-        if (!(name.length() >= 4 && ".crc".equals(name
+-            .substring(name.length() - 4)))) {
+-          inputDirectoryFiles[dropPoint++] = name;
+-        }
+-      }
+-
+-      LOG.info("We dropped " + (inputDirectoryFiles.length - dropPoint)
+-          + " crc files.");
+-
+-      String[] new_inputDirectoryFiles = new String[dropPoint];
+-      System.arraycopy(inputDirectoryFiles, 0, new_inputDirectoryFiles, 0,
+-          dropPoint);
+-      inputDirectoryFiles = new_inputDirectoryFiles;
+-
+-      Arrays.sort(inputDirectoryFiles);
+-
+-      if (!setNextDirectoryInputStream()) {
+-        throw new FileNotFoundException("Empty directory specified.");
+-      }
+-    }
+-
+-    if (jobTraceFilename != null) {
+-      jobTraceGen = new DefaultOutputter<LoggedJob>();
+-      jobTraceGen.init(jobTraceFilename, getConf());
+-
+-      if (topologyFilename != null) {
+-        topologyGen = new DefaultOutputter<LoggedNetworkTopology>();
+-        topologyGen.init(topologyFilename, getConf());
+-      }
+-    }
+-
+-    return 0;
+-  }
+-
+-  private LineReader maybeUncompressedPath(Path p)
+-      throws FileNotFoundException, IOException {
+-    CompressionCodecFactory codecs = new CompressionCodecFactory(getConf());
+-    inputCodec = codecs.getCodec(p);
+-    FileSystem fs = p.getFileSystem(getConf());
+-    FSDataInputStream fileIn = fs.open(p);
+-
+-    if (inputCodec == null) {
+-      return new LineReader(fileIn, getConf());
+-    } else {
+-      inputDecompressor = CodecPool.getDecompressor(inputCodec);
+-      return new LineReader(inputCodec.createInputStream(fileIn,
+-          inputDecompressor), getConf());
+-    }
+-  }
+-
+-  private boolean setNextDirectoryInputStream() throws FileNotFoundException,
+-      IOException {
+-    if (input != null) {
+-      input.close();
+-      LOG.info("File closed: " + currentFileName);
+-      input = null;
+-    }
+-
+-    if (inputCodec != null) {
+-      CodecPool.returnDecompressor(inputDecompressor);
+-      inputDecompressor = null;
+-      inputCodec = null;
+-    }
+-
+-    ++inputDirectoryCursor;
+-
+-    if (inputDirectoryCursor >= inputDirectoryFiles.length) {
+-      return false;
+-    }
+-
+-    fileFirstLine = true;
+-
+-    currentFileName = inputDirectoryFiles[inputDirectoryCursor];
+-
+-    LOG.info("\nOpening file " + currentFileName
+-        + "  *************************** .");
+-    LOG
+-        .info("This file, " + (inputDirectoryCursor + 1) + "/"
+-            + inputDirectoryFiles.length + ", starts with line " + lineNumber
+-            + ".");
+-
+-    input =
+-        maybeUncompressedPath(new Path(inputDirectoryPath, currentFileName));
+-
+-    return true;
+-  }
+-
+-  private String readInputLine() throws IOException {
+-    try {
+-      if (input == null) {
+-        return null;
+-      }
+-      inputLineText.clear();
+-      if (input.readLine(inputLineText) == 0) {
+-        return null;
+-      }
+-
+-      return inputLineText.toString();
+-    } catch (EOFException e) {
+-      return null;
+-    }
+-
+-  }
+-
+-  private String readCountedLine() throws IOException {
+-    if (rereadableLine != null) {
+-      String result = rereadableLine;
+-      rereadableLine = null;
+-      return result;
+-    }
+-
+-    String result = readInputLine();
+-
+-    if (result != null) {
+-      if (fileFirstLine && (result.equals("") || result.charAt(0) != '\f')) {
+-        fileFirstLine = false;
+-        rereadableLine = result;
+-        return "\f!!FILE " + currentFileName + "!!\n";
+-      }
+-      fileFirstLine = false;
+-      ++lineNumber;
+-    } else if (inputIsDirectory && setNextDirectoryInputStream()) {
+-      result = readCountedLine();
+-    }
+-
+-    return result;
+-  }
+-
+-  private void unreadCountedLine(String unreadee) {
+-    if (rereadableLine == null) {
+-      rereadableLine = unreadee;
+-    }
+-  }
+-
+-  private boolean apparentConfFileHeader(String header) {
+-    return confFileHeader.matcher(header).find();
+-  }
+-
+-  private boolean apparentXMLFileStart(String line) {
+-    return xmlFilePrefix.matcher(line).lookingAt();
+-  }
+-
+-  // This can return either the Pair of the !!file line and the XMLconf
+-  // file, or null and an ordinary line. Returns just null if there's
+-  // no more input.
+-  private Pair<String, String> readBalancedLine() throws IOException {
+-    String line = readCountedLine();
+-
+-    if (line == null) {
+-      return null;
+-    }
+-
+-    while (line.indexOf('\f') > 0) {
+-      line = line.substring(line.indexOf('\f'));
+-    }
+-
+-    if (line.length() != 0 && line.charAt(0) == '\f') {
+-      String subjectLine = readCountedLine();
+-
+-      if (subjectLine != null && subjectLine.length() != 0
+-          && apparentConfFileHeader(line) && apparentXMLFileStart(subjectLine)) {
+-        StringBuilder sb = new StringBuilder();
+-
+-        while (subjectLine != null && subjectLine.indexOf('\f') > 0) {
+-          subjectLine = subjectLine.substring(subjectLine.indexOf('\f'));
+-        }
+-
+-        while (subjectLine != null
+-            && (subjectLine.length() == 0 || subjectLine.charAt(0) != '\f')) {
+-          sb.append(subjectLine);
+-          subjectLine = readCountedLine();
+-        }
+-
+-        if (subjectLine != null) {
+-          unreadCountedLine(subjectLine);
+-        }
+-
+-        return new Pair<String, String>(line, sb.toString());
+-      }
+-
+-      // here we had a file line, but it introduced a log segment, not
+-      // a conf file. We want to just ignore the file line.
+-
+-      return readBalancedLine();
+-    }
+-
+-    String endlineString = (version == 0 ? " " : " .");
+-
+-    if (line.length() < endlineString.length()) {
+-      return new Pair<String, String>(null, line);
+-    }
+-
+-    if (!endlineString.equals(line.substring(line.length()
+-        - endlineString.length()))) {
+-      StringBuilder sb = new StringBuilder(line);
+-
+-      String addedLine;
+-
+-      do {
+-        addedLine = readCountedLine();
+-
+-        if (addedLine == null) {
+-          return new Pair<String, String>(null, sb.toString());
+-        }
+-
+-        while (addedLine.indexOf('\f') > 0) {
+-          addedLine = addedLine.substring(addedLine.indexOf('\f'));
+-        }
+-
+-        if (addedLine.length() > 0 && addedLine.charAt(0) == '\f') {
+-          unreadCountedLine(addedLine);
+-          return new Pair<String, String>(null, sb.toString());
+-        }
+-
+-        sb.append("\n");
+-        sb.append(addedLine);
+-      } while (!endlineString.equals(addedLine.substring(addedLine.length()
+-          - endlineString.length())));
+-
+-      line = sb.toString();
+-    }
+-
+-    return new Pair<String, String>(null, line);
+-  }
+-
+-  private void incorporateSpread(Histogram taskTimes, Histogram[][] spreadTo,
+-      JobOutcome outcome, LoggedJob.JobType jtype) {
+-    if (!spreading) {
+-      return;
+-    }
+-
+-    if (taskTimes.getTotalCount() <= 1) {
+-      return;
+-    }
+-
+-    // there are some literals here that probably should be options
+-    int[] endpoints = new int[2];
+-
+-    endpoints[0] = spreadMin;
+-    endpoints[1] = spreadMax;
+-
+-    long[] endpointKeys = taskTimes.getCDF(1000, endpoints);
+-
+-    int smallResultOffset =
+-        (taskTimes.getTotalCount() < SMALL_SPREAD_COMPENSATION_THRESHOLD ? 1
+-            : 0);
+-
+-    Histogram myTotal = spreadTo[outcome.ordinal()][jtype.ordinal()];
+-
+-    long dividend = endpointKeys[2 + smallResultOffset];
+-    long divisor = endpointKeys[1 - smallResultOffset];
+-
+-    if (divisor > 0) {
+-      long mytotalRatio = dividend * 1000000L / divisor;
+-
+-      myTotal.enter(mytotalRatio);
+-    }
+-  }
+-
+-  private void canonicalDistributionsEnter(Histogram[][] block,
+-      JobOutcome outcome, LoggedJob.JobType type, long value) {
+-    getDistribution(block, outcome, type).enter(value);
+-    getDistribution(block, JobOutcome.OVERALL, type).enter(value);
+-    getDistribution(block, outcome, LoggedJob.JobType.OVERALL).enter(value);
+-    getDistribution(block, JobOutcome.OVERALL, LoggedJob.JobType.OVERALL)
+-        .enter(value);
+-  }
+-
+-  private void processJobLine(ParsedLine line) throws JsonProcessingException,
+-      IOException {
+-    try {
+-      if (version == 0 || version == 1) {
+-        // determine the job type if this is the declaration line
+-        String jobID = line.get("JOBID");
+-
+-        String user = line.get("USER");
+-
+-        String jobPriority = line.get("JOB_PRIORITY");
+-
+-        String submitTime = line.get("SUBMIT_TIME");
+-
+-        String jobName = line.get("JOBNAME");
+-
+-        String launchTime = line.get("LAUNCH_TIME");
+-
+-        String finishTime = line.get("FINISH_TIME");
+-
+-        String status = line.get("JOB_STATUS");
+-
+-        String totalMaps = line.get("TOTAL_MAPS");
+-
+-        String totalReduces = line.get("TOTAL_REDUCES");
+-
+-        /*
+-         * If the job appears new [the ID is different from the most recent one,
+-         * if any] we make a new LoggedJob.
+-         */
+-        if (jobID != null
+-            && jobTraceGen != null
+-            && (jobBeingTraced == null 
+-                || !jobID.equals(jobBeingTraced.getJobID().toString()))) {
+-          // push out the old job if there is one, even though it did't get
+-          // mated
+-          // with a conf.
+-
+-          finalizeJob();
+-
+-          jobBeingTraced = new LoggedJob(jobID);
+-
+-          tasksInCurrentJob = new HashMap<String, LoggedTask>();
+-          attemptsInCurrentJob = new HashMap<String, LoggedTaskAttempt>();
+-
+-          // initialize all the per-job statistics gathering places
+-          successfulMapAttemptTimes =
+-              new Histogram[ParsedHost.numberOfDistances() + 1];
+-          for (int i = 0; i < successfulMapAttemptTimes.length; ++i) {
+-            successfulMapAttemptTimes[i] = new Histogram();
+-          }
+-
+-          successfulReduceAttemptTimes = new Histogram();
+-          failedMapAttemptTimes =
+-              new Histogram[ParsedHost.numberOfDistances() + 1];
+-          for (int i = 0; i < failedMapAttemptTimes.length; ++i) {
+-            failedMapAttemptTimes[i] = new Histogram();
+-          }
+-
+-          failedReduceAttemptTimes = new Histogram();
+-          successfulNthMapperAttempts = new Histogram();
+-          successfulNthReducerAttempts = new Histogram();
+-          mapperLocality = new Histogram();
+-        }
+-
+-        // here we fill in all the stuff the trace might need
+-        if (jobBeingTraced != null) {
+-          if (user != null) {
+-            jobBeingTraced.setUser(user);
+-          }
+-
+-          if (jobPriority != null) {
+-            jobBeingTraced.setPriority(LoggedJob.JobPriority
+-                .valueOf(jobPriority));
+-          }
+-
+-          if (totalMaps != null) {
+-            jobBeingTraced.setTotalMaps(Integer.parseInt(totalMaps));
+-          }
+-
+-          if (totalReduces != null) {
+-            jobBeingTraced.setTotalReduces(Integer.parseInt(totalReduces));
+-          }
+-
+-          if (submitTime != null) {
+-            jobBeingTraced.setSubmitTime(Long.parseLong(submitTime));
+-          }
+-
+-          if (launchTime != null) {
+-            jobBeingTraced.setLaunchTime(Long.parseLong(launchTime));
+-          }
+-
+-          if (finishTime != null) {
+-            jobBeingTraced.setFinishTime(Long.parseLong(finishTime));
+-            if (status != null) {
+-              jobBeingTraced.setOutcome(Pre21JobHistoryConstants.Values
+-                  .valueOf(status));
+-            }
+-
+-            maybeMateJobAndConf();
+-          }
+-        }
+-
+-        if (jobName != null) {
+-          // we'll make it java unless the name parses out
+-          Matcher m = streamingJobnamePattern.matcher(jobName);
+-
+-          thisJobType = LoggedJob.JobType.JAVA;
+-
+-          if (m.matches()) {
+-            thisJobType = LoggedJob.JobType.STREAMING;
+-          }
+-        }
+-        if (submitTime != null) {
+-          submitTimeCurrentJob = Long.parseLong(submitTime);
+-
+-          currentJobID = jobID;
+-
+-          taskAttemptStartTimes = new HashMap<String, Long>();
+-          taskReduceAttemptShuffleEndTimes = new HashMap<String, Long>();
+-          taskReduceAttemptSortEndTimes = new HashMap<String, Long>();
+-          taskMapAttemptFinishTimes = new HashMap<String, Long>();
+-          taskReduceAttemptFinishTimes = new HashMap<String, Long>();
+-
+-          launchTimeCurrentJob = 0L;
+-        } else if (launchTime != null && jobID != null
+-            && currentJobID.equals(jobID)) {
+-          launchTimeCurrentJob = Long.parseLong(launchTime);
+-        } else if (finishTime != null && jobID != null
+-            && currentJobID.equals(jobID)) {
+-          long endTime = Long.parseLong(finishTime);
+-
+-          if (launchTimeCurrentJob != 0) {
+-            String jobResultText = line.get("JOB_STATUS");
+-
+-            JobOutcome thisOutcome =
+-                ((jobResultText != null && "SUCCESS".equals(jobResultText))
+-                    ? JobOutcome.SUCCESS : JobOutcome.FAILURE);
+-
+-            if (submitTimeCurrentJob != 0L) {
+-              canonicalDistributionsEnter(delayTimeDists, thisOutcome,
+-                  thisJobType, launchTimeCurrentJob - submitTimeCurrentJob);
+-            }
+-
+-            if (launchTimeCurrentJob != 0L) {
+-              canonicalDistributionsEnter(runTimeDists, thisOutcome,
+-                  thisJobType, endTime - launchTimeCurrentJob);
+-            }
+-
+-            // Now we process the hash tables with successful task attempts
+-
+-            Histogram currentJobMapTimes = new Histogram();
+-            Histogram currentJobShuffleTimes = new Histogram();
+-            Histogram currentJobSortTimes = new Histogram();
+-            Histogram currentJobReduceTimes = new Histogram();
+-
+-            Iterator<Map.Entry<String, Long>> taskIter =
+-                taskAttemptStartTimes.entrySet().iterator();
+-
+-            while (taskIter.hasNext()) {
+-              Map.Entry<String, Long> entry = taskIter.next();
+-
+-              long startTime = entry.getValue();
+-
+-              // Map processing
+-              Long mapEndTime = taskMapAttemptFinishTimes.get(entry.getKey());
+-
+-              if (mapEndTime != null) {
+-                currentJobMapTimes.enter(mapEndTime - startTime);
+-
+-                canonicalDistributionsEnter(mapTimeDists, thisOutcome,
+-                    thisJobType, mapEndTime - startTime);
+-              }
+-
+-              // Reduce processing
+-              Long shuffleEnd =
+-                  taskReduceAttemptShuffleEndTimes.get(entry.getKey());
+-              Long sortEnd = taskReduceAttemptSortEndTimes.get(entry.getKey());
+-              Long reduceEnd = taskReduceAttemptFinishTimes.get(entry.getKey());
+-
+-              if (shuffleEnd != null && sortEnd != null && reduceEnd != null) {
+-                currentJobShuffleTimes.enter(shuffleEnd - startTime);
+-                currentJobSortTimes.enter(sortEnd - shuffleEnd);
+-                currentJobReduceTimes.enter(reduceEnd - sortEnd);
+-
+-                canonicalDistributionsEnter(shuffleTimeDists, thisOutcome,
+-                    thisJobType, shuffleEnd - startTime);
+-                canonicalDistributionsEnter(sortTimeDists, thisOutcome,
+-                    thisJobType, sortEnd - shuffleEnd);
+-                canonicalDistributionsEnter(reduceTimeDists, thisOutcome,
+-                    thisJobType, reduceEnd - sortEnd);
+-              }
+-            }
+-
+-            // Here we save out the task information
+-            incorporateSpread(currentJobMapTimes, mapTimeSpreadDists,
+-                thisOutcome, thisJobType);
+-            incorporateSpread(currentJobShuffleTimes, shuffleTimeSpreadDists,
+-                thisOutcome, thisJobType);
+-            incorporateSpread(currentJobSortTimes, sortTimeSpreadDists,
+-                thisOutcome, thisJobType);
+-            incorporateSpread(currentJobReduceTimes, reduceTimeSpreadDists,
+-                thisOutcome, thisJobType);
+-          }
+-        }
+-      }
+-    } catch (NumberFormatException e) {
+-      LOG.warn(
+-          "HadoopLogsAnalyzer.processJobLine: bad numerical format, at line "
+-              + lineNumber + ".", e);
+-    }
+-  }
+-
+-  private void processTaskLine(ParsedLine line) {
+-    if (jobBeingTraced != null) {
+-      // these fields are in both the start and finish record
+-      String taskID = line.get("TASKID");
+-      String taskType = line.get("TASK_TYPE");
+-
+-      // this field is only in the start record
+-      String startTime = line.get("START_TIME");
+-
+-      // these fields only exist or are only relevant in the finish record
+-      String status = line.get("TASK_STATUS");
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      String splits = line.get("SPLITS");
+-
+-      LoggedTask task = tasksInCurrentJob.get(taskID);
+-
+-      boolean taskAlreadyLogged = task != null;
+-
+-      if (task == null) {
+-        task = new LoggedTask();
+-      }
+-
+-      if (splits != null) {
+-        ArrayList<LoggedLocation> locations = null;
+-
+-        StringTokenizer tok = new StringTokenizer(splits, ",", false);
+-
+-        if (tok.countTokens() <= MAXIMUM_PREFERRED_LOCATIONS) {
+-          locations = new ArrayList<LoggedLocation>();
+-        }
+-
+-        while (tok.hasMoreTokens()) {
+-          String nextSplit = tok.nextToken();
+-
+-          ParsedHost node = getAndRecordParsedHost(nextSplit);
+-
+-          if (locations != null && node != null) {
+-            locations.add(node.makeLoggedLocation());
+-          }
+-        }
+-
+-        task.setPreferredLocations(locations);
+-      }
+-
+-      task.setTaskID(taskID);
+-
+-      if (startTime != null) {
+-        task.setStartTime(Long.parseLong(startTime));
+-      }
+-
+-      if (finishTime != null) {
+-        task.setFinishTime(Long.parseLong(finishTime));
+-      }
+-
+-      Pre21JobHistoryConstants.Values typ;
+-      Pre21JobHistoryConstants.Values stat;
+-
+-      try {
+-        stat =
+-            status == null ? null : Pre21JobHistoryConstants.Values
+-                .valueOf(status);
+-      } catch (IllegalArgumentException e) {
+-        LOG.error("A task status you don't know about is \"" + status + "\".",
+-            e);
+-        stat = null;
+-      }
+-
+-      task.setTaskStatus(stat);
+-
+-      try {
+-        typ =
+-            taskType == null ? null : Pre21JobHistoryConstants.Values
+-                .valueOf(taskType);
+-      } catch (IllegalArgumentException e) {
+-        LOG.error("A task type you don't know about is \"" + taskType + "\".",
+-            e);
+-        typ = null;
+-      }
+-
+-      if (typ == null) {
+-        return;
+-      }
+-
+-      task.setTaskType(typ);
+-
+-      List<LoggedTask> vec =
+-          typ == Pre21JobHistoryConstants.Values.MAP ? jobBeingTraced
+-              .getMapTasks() : typ == Pre21JobHistoryConstants.Values.REDUCE
+-              ? jobBeingTraced.getReduceTasks() : jobBeingTraced
+-                  .getOtherTasks();
+-
+-      if (!taskAlreadyLogged) {
+-        vec.add(task);
+-
+-        tasksInCurrentJob.put(taskID, task);
+-      }
+-    }
+-  }
+-
+-  private Pattern counterPattern(String counterName) {
+-    Pattern result = counterPatterns.get(counterName);
+-
+-    if (result == null) {
+-      String namePatternRegex =
+-          "\\[\\(" + counterName + "\\)\\([^)]+\\)\\(([0-9]+)\\)\\]";
+-      result = Pattern.compile(namePatternRegex);
+-      counterPatterns.put(counterName, result);
+-    }
+-
+-    return result;
+-  }
+-
+-  private String parseCounter(String counterString, String counterName) {
+-    if (counterString == null) {
+-      return null;
+-    }
+-
+-    Matcher mat = counterPattern(counterName).matcher(counterString);
+-
+-    if (mat.find()) {
+-      return mat.group(1);
+-    }
+-
+-    return null;
+-  }
+-
+-  abstract class SetField {
+-    LoggedTaskAttempt attempt;
+-
+-    SetField(LoggedTaskAttempt attempt) {
+-      this.attempt = attempt;
+-    }
+-
+-    abstract void set(long value);
+-  }
+-
+-  private void incorporateCounter(SetField thunk, String counterString,
+-      String counterName) {
+-    String valueString = parseCounter(counterString, counterName);
+-
+-    if (valueString != null) {
+-      thunk.set(Long.parseLong(valueString));
+-    }
+-  }
+-
+-  private void incorporateCounters(LoggedTaskAttempt attempt2,
+-      String counterString) {
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.hdfsBytesRead = val;
+-      }
+-    }, counterString, "HDFS_BYTES_READ");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.hdfsBytesWritten = val;
+-      }
+-    }, counterString, "HDFS_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.fileBytesRead = val;
+-      }
+-    }, counterString, "FILE_BYTES_READ");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.fileBytesWritten = val;
+-      }
+-    }, counterString, "FILE_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapInputBytes = val;
+-      }
+-    }, counterString, "MAP_INPUT_BYTES");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapInputRecords = val;
+-      }
+-    }, counterString, "MAP_INPUT_RECORDS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapOutputBytes = val;
+-      }
+-    }, counterString, "MAP_OUTPUT_BYTES");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapOutputRecords = val;
+-      }
+-    }, counterString, "MAP_OUTPUT_RECORDS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.combineInputRecords = val;
+-      }
+-    }, counterString, "COMBINE_INPUT_RECORDS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceInputGroups = val;
+-      }
+-    }, counterString, "REDUCE_INPUT_GROUPS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceInputRecords = val;
+-      }
+-    }, counterString, "REDUCE_INPUT_RECORDS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceShuffleBytes = val;
+-      }
+-    }, counterString, "REDUCE_SHUFFLE_BYTES");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceOutputRecords = val;
+-      }
+-    }, counterString, "REDUCE_OUTPUT_RECORDS");
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.spilledRecords = val;
+-      }
+-    }, counterString, "SPILLED_RECORDS");
+-    
+-    // incorporate CPU usage
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.getResourceUsageMetrics().setCumulativeCpuUsage(val);
+-      }
+-    }, counterString, "CPU_MILLISECONDS");
+-    
+-    // incorporate virtual memory usage
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.getResourceUsageMetrics().setVirtualMemoryUsage(val);
+-      }
+-    }, counterString, "VIRTUAL_MEMORY_BYTES");
+-    
+-    // incorporate physical memory usage
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.getResourceUsageMetrics().setPhysicalMemoryUsage(val);
+-      }
+-    }, counterString, "PHYSICAL_MEMORY_BYTES");
+-    
+-    // incorporate heap usage
+-    incorporateCounter(new SetField(attempt2) {
+-      @Override
+-      void set(long val) {
+-        attempt.getResourceUsageMetrics().setHeapUsage(val);
+-      }
+-    }, counterString, "COMMITTED_HEAP_BYTES");
+-  }
+-
+-  private ParsedHost getAndRecordParsedHost(String hostName) {
+-    ParsedHost result = ParsedHost.parse(hostName);
+-
+-    if (result != null && !allHosts.contains(result)) {
+-      allHosts.add(result);
+-    }
+-
+-    return result;
+-  }
+-
+-  private void processMapAttemptLine(ParsedLine line) {
+-    String attemptID = line.get("TASK_ATTEMPT_ID");
+-
+-    String taskID = line.get("TASKID");
+-
+-    String status = line.get("TASK_STATUS");
+-
+-    String attemptStartTime = line.get("START_TIME");
+-    String attemptFinishTime = line.get("FINISH_TIME");
+-
+-    String hostName = line.get("HOSTNAME");
+-
+-    String counters = line.get("COUNTERS");
+-
+-    if (jobBeingTraced != null && taskID != null) {
+-      LoggedTask task = tasksInCurrentJob.get(taskID);
+-
+-      if (task == null) {
+-        task = new LoggedTask();
+-
+-        task.setTaskID(taskID);
+-
+-        jobBeingTraced.getMapTasks().add(task);
+-
+-        tasksInCurrentJob.put(taskID, task);
+-      }
+-
+-      task.setTaskID(taskID);
+-
+-      LoggedTaskAttempt attempt = attemptsInCurrentJob.get(attemptID);
+-
+-      boolean attemptAlreadyExists = attempt != null;
+-
+-      if (attempt == null) {
+-        attempt = new LoggedTaskAttempt();
+-
+-        attempt.setAttemptID(attemptID);
+-      }
+-
+-      if (!attemptAlreadyExists) {
+-        attemptsInCurrentJob.put(attemptID, attempt);
+-        task.getAttempts().add(attempt);
+-      }
+-
+-      Pre21JobHistoryConstants.Values stat = null;
+-
+-      try {
+-        stat =
+-            status == null ? null : Pre21JobHistoryConstants.Values
+-                .valueOf(status);
+-      } catch (IllegalArgumentException e) {
+-        LOG.error("A map attempt status you don't know about is \"" + status
+-            + "\".", e);
+-        stat = null;
+-      }
+-
+-      incorporateCounters(attempt, counters);
+-
+-      attempt.setResult(stat);
+-
+-      if (attemptStartTime != null) {
+-        attempt.setStartTime(Long.parseLong(attemptStartTime));
+-      }
+-
+-      if (attemptFinishTime != null) {
+-        attempt.setFinishTime(Long.parseLong(attemptFinishTime));
+-      }
+-
+-      int distance = Integer.MAX_VALUE;
+-
+-      if (hostName != null) {
+-
+-        ParsedHost host = getAndRecordParsedHost(hostName);
+-
+-        if (host != null) {
+-          attempt.setHostName(host.getNodeName(), host.getRackName());
+-          attempt.setLocation(host.makeLoggedLocation());
+-        } else {
+-          attempt.setHostName(hostName, null);
+-        }
+-
+-        List<LoggedLocation> locs = task.getPreferredLocations();
+-
+-        if (host != null && locs != null) {
+-          for (LoggedLocation loc : locs) {
+-            ParsedHost preferedLoc = new ParsedHost(loc);
+-
+-            distance = Math.min(distance, preferedLoc.distance(host));
+-          }
+-        }
+-
+-        mapperLocality.enter(distance);
+-      }
+-
+-      distance = Math.min(distance, successfulMapAttemptTimes.length - 1);
+-
+-      if (attempt.getStartTime() > 0 && attempt.getFinishTime() > 0) {
+-        long runtime = attempt.getFinishTime() - attempt.getStartTime();
+-
+-        if (stat == Pre21JobHistoryConstants.Values.SUCCESS) {
+-          successfulMapAttemptTimes[distance].enter(runtime);
+-        }
+-
+-        if (stat == Pre21JobHistoryConstants.Values.FAILED) {
+-          failedMapAttemptTimes[distance].enter(runtime);
+-        }
+-      }
+-
+-      if (attemptID != null) {
+-        Matcher matcher = taskAttemptIDPattern.matcher(attemptID);
+-
+-        if (matcher.matches()) {
+-          String attemptNumberString = matcher.group(1);
+-
+-          if (attemptNumberString != null) {
+-            int attemptNumber = Integer.parseInt(attemptNumberString);
+-
+-            successfulNthMapperAttempts.enter(attemptNumber);
+-          }
+-        }
+-      }
+-    }
+-
+-    try {
+-      if (attemptStartTime != null) {
+-        long startTimeValue = Long.parseLong(attemptStartTime);
+-
+-        if (startTimeValue != 0
+-            && startTimeValue + MAXIMUM_CLOCK_SKEW >= launchTimeCurrentJob) {
+-          taskAttemptStartTimes.put(attemptID, startTimeValue);
+-        } else {
+-          taskAttemptStartTimes.remove(attemptID);
+-        }
+-      } else if (status != null && attemptFinishTime != null) {
+-        long finishTime = Long.parseLong(attemptFinishTime);
+-
+-        if (status.equals("SUCCESS")) {
+-          taskMapAttemptFinishTimes.put(attemptID, finishTime);
+-        }
+-      }
+-    } catch (NumberFormatException e) {
+-      LOG.warn(
+-          "HadoopLogsAnalyzer.processMapAttemptLine: bad numerical format, at line"
+-              + lineNumber + ".", e);
+-    }
+-  }
+-
+-  private void processReduceAttemptLine(ParsedLine line) {
+-    String attemptID = line.get("TASK_ATTEMPT_ID");
+-
+-    String taskID = line.get("TASKID");
+-
+-    String status = line.get("TASK_STATUS");
+-
+-    String attemptStartTime = line.get("START_TIME");
+-    String attemptFinishTime = line.get("FINISH_TIME");
+-    String attemptShuffleFinished = line.get("SHUFFLE_FINISHED");
+-    String attemptSortFinished = line.get("SORT_FINISHED");
+-
+-    String counters = line.get("COUNTERS");
+-
+-    String hostName = line.get("HOSTNAME");
+-
+-    if (hostName != null && !hostNames.contains(hostName)) {
+-      hostNames.add(hostName);
+-    }
+-
+-    if (jobBeingTraced != null && taskID != null) {
+-      LoggedTask task = tasksInCurrentJob.get(taskID);
+-
+-      if (task == null) {
+-        task = new LoggedTask();
+-
+-        task.setTaskID(taskID);
+-
+-        jobBeingTraced.getReduceTasks().add(task);
+-
+-        tasksInCurrentJob.put(taskID, task);
+-      }
+-
+-      task.setTaskID(taskID);
+-
+-      LoggedTaskAttempt attempt = attemptsInCurrentJob.get(attemptID);
+-
+-      boolean attemptAlreadyExists = attempt != null;
+-
+-      if (attempt == null) {
+-        attempt = new LoggedTaskAttempt();
+-
+-        attempt.setAttemptID(attemptID);
+-      }
+-
+-      if (!attemptAlreadyExists) {
+-        attemptsInCurrentJob.put(attemptID, attempt);
+-        task.getAttempts().add(attempt);
+-      }
+-
+-      Pre21JobHistoryConstants.Values stat = null;
+-
+-      try {
+-        stat =
+-            status == null ? null : Pre21JobHistoryConstants.Values
+-                .valueOf(status);
+-      } catch (IllegalArgumentException e) {
+-        LOG.warn("A map attempt status you don't know about is \"" + status
+-            + "\".", e);
+-        stat = null;
+-      }
+-
+-      incorporateCounters(attempt, counters);
+-
+-      attempt.setResult(stat);
+-
+-      if (attemptStartTime != null) {
+-        attempt.setStartTime(Long.parseLong(attemptStartTime));
+-      }
+-
+-      if (attemptFinishTime != null) {
+-        attempt.setFinishTime(Long.parseLong(attemptFinishTime));
+-      }
+-
+-      if (attemptShuffleFinished != null) {
+-        attempt.setShuffleFinished(Long.parseLong(attemptShuffleFinished));
+-      }
+-
+-      if (attemptSortFinished != null) {
+-        attempt.setSortFinished(Long.parseLong(attemptSortFinished));
+-      }
+-
+-      if (attempt.getStartTime() > 0 && attempt.getFinishTime() > 0) {
+-        long runtime = attempt.getFinishTime() - attempt.getStartTime();
+-
+-        if (stat == Pre21JobHistoryConstants.Values.SUCCESS) {
+-          successfulReduceAttemptTimes.enter(runtime);
+-        }
+-
+-        if (stat == Pre21JobHistoryConstants.Values.FAILED) {
+-          failedReduceAttemptTimes.enter(runtime);
+-        }
+-      }
+-
+-      if (hostName != null) {
+-        ParsedHost host = getAndRecordParsedHost(hostName);
+-        if (host != null) {
+-          attempt.setHostName(host.getNodeName(), host.getRackName());
+-        } else {
+-          attempt.setHostName(hostName, null);
+-        }
+-      }
+-
+-      if (attemptID != null) {
+-        Matcher matcher = taskAttemptIDPattern.matcher(attemptID);
+-
+-        if (matcher.matches()) {
+-          String attemptNumberString = matcher.group(1);
+-
+-          if (attemptNumberString != null) {
+-            int attemptNumber = Integer.parseInt(attemptNumberString);
+-
+-            successfulNthReducerAttempts.enter(attemptNumber);
+-          }
+-        }
+-      }
+-    }
+-
+-    try {
+-      if (attemptStartTime != null) {
+-        long startTimeValue = Long.parseLong(attemptStartTime);
+-
+-        if (startTimeValue != 0
+-            && startTimeValue + MAXIMUM_CLOCK_SKEW >= launchTimeCurrentJob) {
+-          taskAttemptStartTimes.put(attemptID, startTimeValue);
+-        }
+-      } else if (status != null && status.equals("SUCCESS")
+-          && attemptFinishTime != null) {
+-        long finishTime = Long.parseLong(attemptFinishTime);
+-
+-        taskReduceAttemptFinishTimes.put(attemptID, finishTime);
+-
+-        if (attemptShuffleFinished != null) {
+-          taskReduceAttemptShuffleEndTimes.put(attemptID, Long
+-              .parseLong(attemptShuffleFinished));
+-        }
+-
+-        if (attemptSortFinished != null) {
+-          taskReduceAttemptSortEndTimes.put(attemptID, Long
+-              .parseLong(attemptSortFinished));
+-        }
+-      }
+-    } catch (NumberFormatException e) {
+-      LOG.error(
+-          "HadoopLogsAnalyzer.processReduceAttemptLine: bad numerical format, at line"
+-              + lineNumber + ".", e);
+-    }
+-  }
+-
+-  private void processParsedLine(ParsedLine line)
+-      throws JsonProcessingException, IOException {
+-    if (!collecting) {
+-      // "Job", "MapAttempt", "ReduceAttempt", "Task"
+-      LogRecordType myType = line.getType();
+-
+-      if (myType == canonicalJob) {
+-        processJobLine(line);
+-      } else if (myType == canonicalTask) {
+-        processTaskLine(line);
+-      } else if (myType == canonicalMapAttempt) {
+-        processMapAttemptLine(line);
+-      } else if (myType == canonicalReduceAttempt) {
+-        processReduceAttemptLine(line);
+-      } else {
+-      }
+-    }
+-  }
+-
+-  private void printDistributionSet(String title, Histogram[][] distSet) {
+-    statisticalOutput.print(title + "\n\n");
+-
+-    // print out buckets
+-
+-    for (int i = 0; i < JobOutcome.values().length; ++i) {
+-      for (int j = 0; j < LoggedJob.JobType.values().length; ++j) {
+-        JobOutcome thisOutcome = JobOutcome.values()[i];
+-        LoggedJob.JobType thisType = LoggedJob.JobType.values()[j];
+-
+-        statisticalOutput.print("outcome = ");
+-        statisticalOutput.print(thisOutcome.toString());
+-        statisticalOutput.print(", and type = ");
+-        statisticalOutput.print(thisType.toString());
+-        statisticalOutput.print(".\n\n");
+-
+-        Histogram dist = distSet[i][j];
+-
+-        printSingleDistributionData(dist);
+-      }
+-    }
+-  }
+-
+-  private void printSingleDistributionData(Histogram dist) {
+-    int[] percentiles = new int[numberBuckets];
+-
+-    for (int k = 0; k < numberBuckets; ++k) {
+-      percentiles[k] = k + 1;
+-    }
+-
+-    long[] cdf = dist.getCDF(numberBuckets + 1, percentiles);
+-
+-    if (cdf == null) {
+-      statisticalOutput.print("(No data)\n");
+-    } else {
+-      statisticalOutput.print("min:  ");
+-      statisticalOutput.print(cdf[0]);
+-      statisticalOutput.print("\n");
+-
+-      for (int k = 0; k < numberBuckets; ++k) {
+-        statisticalOutput.print(percentiles[k]);
+-        statisticalOutput.print("%   ");
+-        statisticalOutput.print(cdf[k + 1]);
+-        statisticalOutput.print("\n");
+-      }
+-
+-      statisticalOutput.print("max:  ");
+-      statisticalOutput.print(cdf[numberBuckets + 1]);
+-      statisticalOutput.print("\n");
+-    }
+-  }
+-
+-  private void maybeMateJobAndConf() throws IOException {
+-    if (jobBeingTraced != null && jobconf != null
+-        && jobBeingTraced.getJobID().toString().equals(jobconf.jobID)) {
+-      jobBeingTraced.setHeapMegabytes(jobconf.heapMegabytes);
+-
+-      jobBeingTraced.setQueue(jobconf.queue);
+-      jobBeingTraced.setJobName(jobconf.jobName);
+-
+-      jobBeingTraced.setClusterMapMB(jobconf.clusterMapMB);
+-      jobBeingTraced.setClusterReduceMB(jobconf.clusterReduceMB);
+-      jobBeingTraced.setJobMapMB(jobconf.jobMapMB);
+-      jobBeingTraced.setJobReduceMB(jobconf.jobReduceMB);
+-
+-      jobBeingTraced.setJobProperties(jobconf.properties);
+-      
+-      jobconf = null;
+-
+-      finalizeJob();
+-    }
+-  }
+-
+-  private ArrayList<LoggedDiscreteCDF> mapCDFArrayList(Histogram[] data) {
+-    ArrayList<LoggedDiscreteCDF> result = new ArrayList<LoggedDiscreteCDF>();
+-
+-    for (Histogram hist : data) {
+-      LoggedDiscreteCDF discCDF = new LoggedDiscreteCDF();
+-      discCDF.setCDF(hist, attemptTimesPercentiles, 100);
+-      result.add(discCDF);
+-    }
+-
+-    return result;
+-  }
+-
+-  private void finalizeJob() throws IOException {
+-    if (jobBeingTraced != null) {
+-      if (omitTaskDetails) {
+-        jobBeingTraced.setMapTasks(null);
+-        jobBeingTraced.setReduceTasks(null);
+-        jobBeingTraced.setOtherTasks(null);
+-      }
+-
+-      // add digest info to the job
+-      jobBeingTraced
+-          .setSuccessfulMapAttemptCDFs(mapCDFArrayList(successfulMapAttemptTimes));
+-      jobBeingTraced
+-          .setFailedMapAttemptCDFs(mapCDFArrayList(failedMapAttemptTimes));
+-
+-      LoggedDiscreteCDF discCDF = new LoggedDiscreteCDF();
+-      discCDF
+-          .setCDF(successfulReduceAttemptTimes, attemptTimesPercentiles, 100);
+-      jobBeingTraced.setSuccessfulReduceAttemptCDF(discCDF);
+-
+-      discCDF = new LoggedDiscreteCDF();
+-      discCDF.setCDF(failedReduceAttemptTimes, attemptTimesPercentiles, 100);
+-      jobBeingTraced.setFailedReduceAttemptCDF(discCDF);
+-
+-      long totalSuccessfulAttempts = 0L;
+-      long maxTriesToSucceed = 0L;
+-
+-      for (Map.Entry<Long, Long> ent : successfulNthMapperAttempts) {
+-        totalSuccessfulAttempts += ent.getValue();
+-        maxTriesToSucceed = Math.max(maxTriesToSucceed, ent.getKey());
+-      }
+-
+-      if (totalSuccessfulAttempts > 0L) {
+-        double[] successAfterI = new double[(int) maxTriesToSucceed + 1];
+-        for (int i = 0; i < successAfterI.length; ++i) {
+-          successAfterI[i] = 0.0D;
+-        }
+-
+-        for (Map.Entry<Long, Long> ent : successfulNthMapperAttempts) {
+-          successAfterI[ent.getKey().intValue()] =
+-              ((double) ent.getValue()) / totalSuccessfulAttempts;
+-        }
+-        jobBeingTraced.setMapperTriesToSucceed(successAfterI);
+-      } else {
+-        jobBeingTraced.setMapperTriesToSucceed(null);
+-      }
+-
+-      jobTraceGen.output(jobBeingTraced);
+-
+-      jobBeingTraced = null;
+-    }
+-  }
+-
+-  public int run(String[] args) throws IOException {
+-
+-    int result = initializeHadoopLogsAnalyzer(args);
+-
+-    if (result != 0) {
+-      return result;
+-    }
+-
+-    return run();
+-  }
+-
+-  int run() throws IOException {
+-    Pair<String, String> line = readBalancedLine();
+-
+-    while (line != null) {
+-      if (debug
+-          && (lineNumber < 1000000L && lineNumber % 1000L == 0 || lineNumber % 1000000L == 0)) {
+-        LOG.debug("" + lineNumber + " " + line.second());
+-      }
+-
+-      if (line.first() == null) {
+-        try {
+-          // HACK ALERT!! It's possible for a Job end line to end a
+-          // job for which we have a config file
+-          // image [ a ParsedConfigFile ] in jobconf.
+-          //
+-          // processParsedLine handles this.
+-
+-          processParsedLine(new ParsedLine(line.second(), version));
+-        } catch (StringIndexOutOfBoundsException e) {
+-          LOG.warn("anomalous line #" + lineNumber + ":" + line, e);
+-        }
+-      } else {
+-        jobconf = new ParsedConfigFile(line.first(), line.second());
+-
+-        if (jobconf.valid == false) {
+-          jobconf = null;
+-        }
+-
+-        maybeMateJobAndConf();
+-      }
+-
+-      line = readBalancedLine();
+-    }
+-
+-    finalizeJob();
+-
+-    if (collecting) {
+-      String[] typeNames = LogRecordType.lineTypes();
+-
+-      for (int i = 0; i < typeNames.length; ++i) {
+-        statisticalOutput.print(typeNames[i]);
+-        statisticalOutput.print('\n');
+-      }
+-    } else {
+-      if (delays) {
+-        printDistributionSet("Job start delay spectrum:", delayTimeDists);
+-      }
+-
+-      if (runtimes) {
+-        printDistributionSet("Job run time spectrum:", runTimeDists);
+-      }
+-
+-      if (spreading) {
+-        String ratioDescription =
+-            "(" + spreadMax + "/1000 %ile) to (" + spreadMin
+-                + "/1000 %ile) scaled by 1000000";
+-
+-        printDistributionSet(
+-            "Map task success times " + ratioDescription + ":",
+-            mapTimeSpreadDists);
+-        printDistributionSet("Shuffle success times " + ratioDescription + ":",
+-            shuffleTimeSpreadDists);
+-        printDistributionSet("Sort success times " + ratioDescription + ":",
+-            sortTimeSpreadDists);
+-        printDistributionSet("Reduce success times " + ratioDescription + ":",
+-            reduceTimeSpreadDists);
+-      }
+-
+-      if (collectTaskTimes) {
+-        printDistributionSet("Global map task success times:", mapTimeDists);
+-        printDistributionSet("Global shuffle task success times:",
+-            shuffleTimeDists);
+-        printDistributionSet("Global sort task success times:", sortTimeDists);
+-        printDistributionSet("Global reduce task success times:",
+-            reduceTimeDists);
+-      }
+-    }
+-
+-    if (topologyGen != null) {
+-      LoggedNetworkTopology topo =
+-          new LoggedNetworkTopology(allHosts, "<root>", 0);
+-      topologyGen.output(topo);
+-      topologyGen.close();
+-    }
+-
+-    if (jobTraceGen != null) {
+-      jobTraceGen.close();
+-    }
+-
+-    if (input != null) {
+-      input.close();
+-      input = null;
+-    }
+-
+-    if (inputCodec != null) {
+-      CodecPool.returnDecompressor(inputDecompressor);
+-      inputDecompressor = null;
+-      inputCodec = null;
+-    }
+-
+-    return 0;
+-  }
+-
+-  /**
+-   * @param args
+-   * 
+-   *          Last arg is the input file. That file can be a directory, in which
+-   *          case you get all the files in sorted order. We will decompress
+-   *          files whose nmes end in .gz .
+-   * 
+-   *          switches: -c collect line types.
+-   * 
+-   *          -d debug mode
+-   * 
+-   *          -delays print out the delays [interval between job submit time and
+-   *          launch time]
+-   * 
+-   *          -runtimes print out the job runtimes
+-   * 
+-   *          -spreads print out the ratio of 10%ile and 90%ile, of both the
+-   *          successful map task attempt run times and the the successful
+-   *          reduce task attempt run times
+-   * 
+-   *          -tasktimes prints out individual task time distributions
+-   * 
+-   *          collects all the line types and prints the first example of each
+-   *          one
+-   */
+-  public static void main(String[] args) {
+-    try {
+-      HadoopLogsAnalyzer analyzer = new HadoopLogsAnalyzer();
+-
+-      int result = ToolRunner.run(analyzer, args);
+-
+-      if (result == 0) {
+-        return;
+-      }
+-
+-      System.exit(result);
+-    } catch (FileNotFoundException e) {
+-      LOG.error("", e);
+-      e.printStackTrace(staticDebugOutput);
+-      System.exit(1);
+-    } catch (IOException e) {
+-      LOG.error("", e);
+-      e.printStackTrace(staticDebugOutput);
+-      System.exit(2);
+-    } catch (Exception e) {
+-      LOG.error("", e);
+-      e.printStackTrace(staticDebugOutput);
+-      System.exit(3);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java
+deleted file mode 100644
+index 68e7bc73e6a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java
++++ /dev/null
+@@ -1,164 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * 
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.PrintStream;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.TreeMap;
+-
+-/**
+- * {@link Histogram} represents an ordered summary of a sequence of {@code long}
+- * s which can be queried to produce a discrete approximation of its cumulative
+- * distribution function
+- * 
+- */
+-class Histogram implements Iterable<Map.Entry<Long, Long>> {
+-  private TreeMap<Long, Long> content = new TreeMap<Long, Long>();
+-
+-  private String name;
+-
+-  private long totalCount;
+-
+-  public Histogram() {
+-    this("(anonymous)");
+-  }
+-
+-  public Histogram(String name) {
+-    super();
+-
+-    this.name = name;
+-
+-    totalCount = 0L;
+-  }
+-
+-  public void dump(PrintStream stream) {
+-    stream.print("dumping Histogram " + name + ":\n");
+-
+-    Iterator<Map.Entry<Long, Long>> iter = iterator();
+-
+-    while (iter.hasNext()) {
+-      Map.Entry<Long, Long> ent = iter.next();
+-
+-      stream.print("val/count pair: " + (long) ent.getKey() + ", "
+-          + (long) ent.getValue() + "\n");
+-    }
+-
+-    stream.print("*** end *** \n");
+-  }
+-
+-  public Iterator<Map.Entry<Long, Long>> iterator() {
+-    return content.entrySet().iterator();
+-  }
+-
+-  public long get(long key) {
+-    Long result = content.get(key);
+-
+-    return result == null ? 0 : result;
+-  }
+-
+-  public long getTotalCount() {
+-    return totalCount;
+-  }
+-
+-  public void enter(long value) {
+-    Long existingValue = content.get(value);
+-
+-    if (existingValue == null) {
+-      content.put(value, 1L);
+-    } else {
+-      content.put(value, existingValue + 1L);
+-    }
+-
+-    ++totalCount;
+-  }
+-
+-  /**
+-   * Produces a discrete approximation of the CDF. The user provides the points
+-   * on the {@code Y} axis he wants, and we give the corresponding points on the
+-   * {@code X} axis, plus the minimum and maximum from the data.
+-   * 
+-   * @param scale
+-   *          the denominator applied to every element of buckets. For example,
+-   *          if {@code scale} is {@code 1000}, a {@code buckets} element of 500
+-   *          will specify the median in that output slot.
+-   * @param buckets
+-   *          an array of int, all less than scale and each strictly greater
+-   *          than its predecessor if any. We don't check these requirements.
+-   * @return a {@code long[]}, with two more elements than {@code buckets} has.
+-   *         The first resp. last element is the minimum resp. maximum value
+-   *         that was ever {@code enter}ed. The rest of the elements correspond
+-   *         to the elements of {@code buckets} and carry the first element
+-   *         whose rank is no less than {@code #content elements * scale /
+-   *         bucket}.
+-   * 
+-   */
+-  public long[] getCDF(int scale, int[] buckets) {
+-    if (totalCount == 0) {
+-      return null;
+-    }
+-
+-    long[] result = new long[buckets.length + 2];
+-
+-    // fill in the min and the max
+-    result[0] = content.firstEntry().getKey();
+-
+-    result[buckets.length + 1] = content.lastEntry().getKey();
+-
+-    Iterator<Map.Entry<Long, Long>> iter = content.entrySet().iterator();
+-    long cumulativeCount = 0;
+-    int bucketCursor = 0;
+-
+-    
+-    // Loop invariant: the item at buckets[bucketCursor] can still be reached
+-    // from iter, and the number of logged elements no longer available from
+-    // iter is cumulativeCount.
+-    // 
+-    // cumulativeCount/totalCount is therefore strictly less than
+-    // buckets[bucketCursor]/scale .
+-     
+-    while (iter.hasNext()) {
+-      long targetCumulativeCount = buckets[bucketCursor] * totalCount / scale;
+-
+-      Map.Entry<Long, Long> elt = iter.next();
+-
+-      cumulativeCount += elt.getValue();
+-
+-      while (cumulativeCount >= targetCumulativeCount) {
+-        result[bucketCursor + 1] = elt.getKey();
+-
+-        ++bucketCursor;
+-
+-        if (bucketCursor < buckets.length) {
+-          targetCumulativeCount = buckets[bucketCursor] * totalCount / scale;
+-        } else {
+-          break;
+-        }
+-      }
+-
+-      if (bucketCursor == buckets.length) {
+-        break;
+-      }
+-    }
+-
+-    return result;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java
+deleted file mode 100644
+index ab4ea71f9ba..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.text.ParseException;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Queue;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-
+-abstract class HistoryEventEmitter {
+-  static final private Logger LOG = LoggerFactory.getLogger(HistoryEventEmitter.class);
+-
+-  abstract List<SingleEventEmitter> nonFinalSEEs();
+-
+-  abstract List<SingleEventEmitter> finalSEEs();
+-
+-  protected HistoryEventEmitter() {
+-    // no code
+-  }
+-
+-  enum PostEmitAction {
+-    NONE, REMOVE_HEE
+-  };
+-
+-  final Pair<Queue<HistoryEvent>, PostEmitAction> emitterCore(ParsedLine line,
+-      String name) {
+-    Queue<HistoryEvent> results = new LinkedList<HistoryEvent>();
+-    PostEmitAction removeEmitter = PostEmitAction.NONE;
+-    for (SingleEventEmitter see : nonFinalSEEs()) {
+-      HistoryEvent event = see.maybeEmitEvent(line, name, this);
+-      if (event != null) {
+-        results.add(event);
+-      }
+-    }
+-    for (SingleEventEmitter see : finalSEEs()) {
+-      HistoryEvent event = see.maybeEmitEvent(line, name, this);
+-      if (event != null) {
+-        results.add(event);
+-        removeEmitter = PostEmitAction.REMOVE_HEE;
+-        break;
+-      }
+-    }
+-    return new Pair<Queue<HistoryEvent>, PostEmitAction>(results, removeEmitter);
+-  }
+-
+-  protected static Counters maybeParseCounters(String counters) {
+-    try {
+-      return parseCounters(counters);
+-    } catch (ParseException e) {
+-      LOG.warn("The counter string, \"" + counters + "\" is badly formatted.");
+-      return null;
+-    }
+-  }
+-
+-  protected static Counters parseCounters(String counters)
+-      throws ParseException {
+-    if (counters == null) {
+-      LOG.warn("HistoryEventEmitters: null counter detected:");
+-      return null;
+-    }
+-
+-    counters = counters.replace("\\.", "\\\\.");
+-    counters = counters.replace("\\\\{", "\\{");
+-    counters = counters.replace("\\\\}", "\\}");
+-    counters = counters.replace("\\\\(", "\\(");
+-    counters = counters.replace("\\\\)", "\\)");
+-    counters = counters.replace("\\\\[", "\\[");
+-    counters = counters.replace("\\\\]", "\\]");
+-
+-    org.apache.hadoop.mapred.Counters depForm =
+-        org.apache.hadoop.mapred.Counters.fromEscapedCompactString(counters);
+-
+-    return new Counters(depForm);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java
+deleted file mode 100644
+index 0927a771d3b..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * {@link InputDemuxer} dem-ultiplexes the input files into individual input
+- * streams.
+- */
+-public interface InputDemuxer extends Closeable {
+-  /**
+-   * Bind the {@link InputDemuxer} to a particular file.
+-   * 
+-   * @param path
+-   *          The path to the file it should bind to.
+-   * @param conf
+-   *          Configuration
+-   * @throws IOException
+-   * 
+-   *           Returns true when the binding succeeds. If the file can be read
+-   *           but is in the wrong format, returns false. IOException is
+-   *           reserved for read errors.
+-   */
+-  public void bindTo(Path path, Configuration conf) throws IOException;
+-
+-  /**
+-   * Get the next &lt;name, input&gt; pair. The name should preserve the original job
+-   * history file or job conf file name. The input object should be closed
+-   * before calling getNext() again. The old input object would be invalid after
+-   * calling getNext() again.
+-   * 
+-   * @return the next &lt;name, input&gt; pair.
+-   */
+-  public Pair<String, InputStream> getNext() throws IOException;
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
+deleted file mode 100644
+index ef32db43506..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java
++++ /dev/null
+@@ -1,277 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.mapred.JobPriority;
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.JobACL;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobInfoChangeEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobInitedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobPriorityChangeEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobStatusChangedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobSubmittedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobUnsuccessfulCompletionEvent;
+-import org.apache.hadoop.security.authorize.AccessControlList;
+-
+-public class Job20LineHistoryEventEmitter extends HistoryEventEmitter {
+-
+-  static List<SingleEventEmitter> nonFinals =
+-      new LinkedList<SingleEventEmitter>();
+-  static List<SingleEventEmitter> finals = new LinkedList<SingleEventEmitter>();
+-
+-  Long originalSubmitTime = null;
+-
+-  static {
+-    nonFinals.add(new JobSubmittedEventEmitter());
+-    nonFinals.add(new JobPriorityChangeEventEmitter());
+-    nonFinals.add(new JobStatusChangedEventEmitter());
+-    nonFinals.add(new JobInitedEventEmitter());
+-    nonFinals.add(new JobInfoChangeEventEmitter());
+-
+-    finals.add(new JobUnsuccessfulCompletionEventEmitter());
+-    finals.add(new JobFinishedEventEmitter());
+-  }
+-
+-  Job20LineHistoryEventEmitter() {
+-    super();
+-  }
+-
+-  static private class JobSubmittedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      String submitTime = line.get("SUBMIT_TIME");
+-      String jobConf = line.get("JOBCONF");
+-      String user = line.get("USER");
+-      if (user == null) {
+-        user = "nulluser";
+-      }
+-      String jobName = line.get("JOBNAME");
+-      String jobQueueName = line.get("JOB_QUEUE");// could be null
+-      String workflowId = line.get("WORKFLOW_ID");
+-      if (workflowId == null) {
+-        workflowId = "";
+-      }
+-      String workflowName = line.get("WORKFLOW_NAME");
+-      if (workflowName == null) {
+-        workflowName = "";
+-      }
+-      String workflowNodeName = line.get("WORKFLOW_NODE_NAME");
+-      if (workflowNodeName == null) {
+-        workflowNodeName = "";
+-      }
+-      String workflowAdjacencies = line.get("WORKFLOW_ADJACENCIES");
+-      if (workflowAdjacencies == null) {
+-        workflowAdjacencies = "";
+-      }
+-      String workflowTags = line.get("WORKFLOW_TAGS");
+-      if (workflowTags == null) {
+-        workflowTags = "";
+-      }
+-      
+-
+-      if (submitTime != null) {
+-        Job20LineHistoryEventEmitter that =
+-            (Job20LineHistoryEventEmitter) thatg;
+-
+-        that.originalSubmitTime = Long.parseLong(submitTime);
+-
+-        Map<JobACL, AccessControlList> jobACLs =
+-          new HashMap<JobACL, AccessControlList>();
+-        return new JobSubmittedEvent(jobID, jobName, user,
+-            that.originalSubmitTime, jobConf, jobACLs, jobQueueName,
+-            workflowId, workflowName, workflowNodeName, workflowAdjacencies,
+-            workflowTags);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobPriorityChangeEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      String priority = line.get("JOB_PRIORITY");
+-
+-      if (priority != null) {
+-        return new JobPriorityChangeEvent(jobID, JobPriority.valueOf(priority));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobInitedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      String launchTime = line.get("LAUNCH_TIME");
+-      String status = line.get("JOB_STATUS");
+-      String totalMaps = line.get("TOTAL_MAPS");
+-      String totalReduces = line.get("TOTAL_REDUCES");
+-      String uberized = line.get("UBERIZED");
+-
+-      if (launchTime != null && totalMaps != null && totalReduces != null) {
+-        return new JobInitedEvent(jobID, Long.parseLong(launchTime), Integer
+-            .parseInt(totalMaps), Integer.parseInt(totalReduces), status,
+-            Boolean.parseBoolean(uberized));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobStatusChangedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      String status = line.get("JOB_STATUS");
+-
+-      if (status != null) {
+-        return new JobStatusChangedEvent(jobID, status);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobInfoChangeEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      String launchTime = line.get("LAUNCH_TIME");
+-
+-      if (launchTime != null) {
+-        Job20LineHistoryEventEmitter that =
+-            (Job20LineHistoryEventEmitter) thatg;
+-        return new JobInfoChangeEvent(jobID, that.originalSubmitTime, Long
+-            .parseLong(launchTime));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobUnsuccessfulCompletionEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      String status = line.get("JOB_STATUS");
+-
+-      String finishedMaps = line.get("FINISHED_MAPS");
+-      String finishedReduces = line.get("FINISHED_REDUCES");
+-
+-      if (status != null && !status.equalsIgnoreCase("success")
+-          && finishTime != null && finishedMaps != null
+-          && finishedReduces != null) {
+-        return new JobUnsuccessfulCompletionEvent(jobID, Long
+-            .parseLong(finishTime), Integer.parseInt(finishedMaps), Integer
+-            .parseInt(finishedReduces), -1, -1, -1, -1, status);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class JobFinishedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String jobIDName,
+-        HistoryEventEmitter thatg) {
+-      if (jobIDName == null) {
+-        return null;
+-      }
+-
+-      JobID jobID = JobID.forName(jobIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      String status = line.get("JOB_STATUS");
+-
+-      String finishedMaps = line.get("FINISHED_MAPS");
+-      String finishedReduces = line.get("FINISHED_REDUCES");
+-
+-      String failedMaps = line.get("FAILED_MAPS");
+-      String failedReduces = line.get("FAILED_REDUCES");
+-
+-      String counters = line.get("COUNTERS");
+-
+-      if (status != null && status.equalsIgnoreCase("success")
+-          && finishTime != null && finishedMaps != null
+-          && finishedReduces != null) {
+-        return new JobFinishedEvent(jobID, Long.parseLong(finishTime), Integer
+-            .parseInt(finishedMaps), Integer.parseInt(finishedReduces), Integer
+-            .parseInt(failedMaps), Integer.parseInt(failedReduces), -1, -1,
+-            null, null, maybeParseCounters(counters));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> finalSEEs() {
+-    return finals;
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> nonFinalSEEs() {
+-    return nonFinals;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
+deleted file mode 100644
+index 1213e6a46f4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
++++ /dev/null
+@@ -1,800 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.StringTokenizer;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapred.TaskStatus;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.jobhistory.AMStartedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobFinished;
+-import org.apache.hadoop.mapreduce.jobhistory.JobFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobInfoChangeEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobInitedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobPriorityChangeEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobStatusChangedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobSubmittedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobQueueChangeEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.JobUnsuccessfulCompletionEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinished;
+-import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.NormalizedResourceEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinished;
+-import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinished;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptStartedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletion;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletionEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFailed;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFailedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFinished;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskStartedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskUpdatedEvent;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * {@link JobBuilder} builds one job. It processes a sequence of
+- * {@link HistoryEvent}s.
+- */
+-public class JobBuilder {
+-  private static final long BYTES_IN_MEG =
+-      StringUtils.TraditionalBinaryPrefix.string2long("1m");
+-
+-  static final private Logger LOG = LoggerFactory.getLogger(JobBuilder.class);
+-  
+-  private String jobID;
+-
+-  private boolean finalized = false;
+-
+-  private ParsedJob result = new ParsedJob();
+-
+-  private Map<String, ParsedTask> mapTasks = new HashMap<String, ParsedTask>();
+-  private Map<String, ParsedTask> reduceTasks =
+-      new HashMap<String, ParsedTask>();
+-  private Map<String, ParsedTask> otherTasks =
+-      new HashMap<String, ParsedTask>();
+-
+-  private Map<String, ParsedTaskAttempt> attempts =
+-      new HashMap<String, ParsedTaskAttempt>();
+-
+-  private Map<ParsedHost, ParsedHost> allHosts =
+-      new HashMap<ParsedHost, ParsedHost>();
+-
+-  private org.apache.hadoop.mapreduce.jobhistory.JhCounters EMPTY_COUNTERS =
+-      new org.apache.hadoop.mapreduce.jobhistory.JhCounters();
+-
+-  /**
+-   * The number of splits a task can have, before we ignore them all.
+-   */
+-  private final static int MAXIMUM_PREFERRED_LOCATIONS = 25;
+-
+-  private int[] attemptTimesPercentiles = null;
+-
+-  // Use this to search within the java options to get heap sizes.
+-  // The heap size number is in Capturing Group 1.
+-  // The heap size order-of-magnitude suffix is in Capturing Group 2
+-  private static final Pattern heapPattern =
+-      Pattern.compile("-Xmx([0-9]+[kKmMgGtT])");
+-
+-  private Properties jobConfigurationParameters = null;
+-
+-  public JobBuilder(String jobID) {
+-    this.jobID = jobID;
+-  }
+-
+-  public String getJobID() {
+-    return jobID;
+-  }
+-
+-  {
+-    if (attemptTimesPercentiles == null) {
+-      attemptTimesPercentiles = new int[19];
+-
+-      for (int i = 0; i < 19; ++i) {
+-        attemptTimesPercentiles[i] = (i + 1) * 5;
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Process one {@link HistoryEvent}
+-   * 
+-   * @param event
+-   *          The {@link HistoryEvent} to be processed.
+-   */
+-  public void process(HistoryEvent event) {
+-    if (finalized) {
+-      throw new IllegalStateException(
+-          "JobBuilder.process(HistoryEvent event) called after ParsedJob built");
+-    }
+-
+-    // these are in lexicographical order by class name.
+-    if (event instanceof AMStartedEvent) {
+-      // ignore this event as Rumen currently doesnt need this event
+-      //TODO Enhance Rumen to process this event and capture restarts
+-      return;
+-    } else if (event instanceof NormalizedResourceEvent) {
+-      // Log an warn message as NormalizedResourceEvent shouldn't be written.
+-      LOG.warn("NormalizedResourceEvent should be ignored in history server.");
+-    } else if (event instanceof JobFinishedEvent) {
+-      processJobFinishedEvent((JobFinishedEvent) event);
+-    } else if (event instanceof JobInfoChangeEvent) {
+-      processJobInfoChangeEvent((JobInfoChangeEvent) event);
+-    } else if (event instanceof JobInitedEvent) {
+-      processJobInitedEvent((JobInitedEvent) event);
+-    } else if (event instanceof JobPriorityChangeEvent) {
+-      processJobPriorityChangeEvent((JobPriorityChangeEvent) event);
+-    } else if (event instanceof JobQueueChangeEvent) {
+-      processJobQueueChangeEvent((JobQueueChangeEvent) event);
+-    } else if (event instanceof JobStatusChangedEvent) {
+-      processJobStatusChangedEvent((JobStatusChangedEvent) event);
+-    } else if (event instanceof JobSubmittedEvent) {
+-      processJobSubmittedEvent((JobSubmittedEvent) event);
+-    } else if (event instanceof JobUnsuccessfulCompletionEvent) {
+-      processJobUnsuccessfulCompletionEvent((JobUnsuccessfulCompletionEvent) event);
+-    } else if (event instanceof MapAttemptFinishedEvent) {
+-      processMapAttemptFinishedEvent((MapAttemptFinishedEvent) event);
+-    } else if (event instanceof ReduceAttemptFinishedEvent) {
+-      processReduceAttemptFinishedEvent((ReduceAttemptFinishedEvent) event);
+-    } else if (event instanceof TaskAttemptFinishedEvent) {
+-      processTaskAttemptFinishedEvent((TaskAttemptFinishedEvent) event);
+-    } else if (event instanceof TaskAttemptStartedEvent) {
+-      processTaskAttemptStartedEvent((TaskAttemptStartedEvent) event);
+-    } else if (event instanceof TaskAttemptUnsuccessfulCompletionEvent) {
+-      processTaskAttemptUnsuccessfulCompletionEvent((TaskAttemptUnsuccessfulCompletionEvent) event);
+-    } else if (event instanceof TaskFailedEvent) {
+-      processTaskFailedEvent((TaskFailedEvent) event);
+-    } else if (event instanceof TaskFinishedEvent) {
+-      processTaskFinishedEvent((TaskFinishedEvent) event);
+-    } else if (event instanceof TaskStartedEvent) {
+-      processTaskStartedEvent((TaskStartedEvent) event);
+-    } else if (event instanceof TaskUpdatedEvent) {
+-      processTaskUpdatedEvent((TaskUpdatedEvent) event);
+-    } else
+-      throw new IllegalArgumentException(
+-          "JobBuilder.process(HistoryEvent): unknown event type:"
+-          + event.getEventType() + " for event:" + event);
+-  }
+-
+-  static String extract(Properties conf, String[] names, String defaultValue) {
+-    for (String name : names) {
+-      String result = conf.getProperty(name);
+-
+-      if (result != null) {
+-        return result;
+-      }
+-    }
+-
+-    return defaultValue;
+-  }
+-
+-  private Integer extractMegabytes(Properties conf, String[] names) {
+-    String javaOptions = extract(conf, names, null);
+-
+-    if (javaOptions == null) {
+-      return null;
+-    }
+-
+-    Matcher matcher = heapPattern.matcher(javaOptions);
+-
+-    Integer heapMegabytes = null;
+-
+-    while (matcher.find()) {
+-      String heapSize = matcher.group(1);
+-      heapMegabytes =
+-          ((int) (StringUtils.TraditionalBinaryPrefix.string2long(heapSize) / BYTES_IN_MEG));
+-    }
+-
+-    return heapMegabytes;
+-  }
+-
+-  private void maybeSetHeapMegabytes(Integer megabytes) {
+-    if (megabytes != null) {
+-      result.setHeapMegabytes(megabytes);
+-    }
+-  }
+-
+-  private void maybeSetJobMapMB(Integer megabytes) {
+-    if (megabytes != null) {
+-      result.setJobMapMB(megabytes);
+-    }
+-  }
+-
+-  private void maybeSetJobReduceMB(Integer megabytes) {
+-    if (megabytes != null) {
+-      result.setJobReduceMB(megabytes);
+-    }
+-  }
+-
+-  /**
+-   * Process a collection of JobConf {@link Properties}. We do not restrict it
+-   * to be called once. It is okay to process a conf before, during or after the
+-   * events.
+-   * 
+-   * @param conf
+-   *          The job conf properties to be added.
+-   */
+-  public void process(Properties conf) {
+-    if (finalized) {
+-      throw new IllegalStateException(
+-          "JobBuilder.process(Properties conf) called after ParsedJob built");
+-    }
+-
+-    //TODO remove this once the deprecate APIs in LoggedJob are removed
+-    String queue = extract(conf, JobConfPropertyNames.QUEUE_NAMES
+-                           .getCandidates(), null);
+-    // set the queue name if existing
+-    if (queue != null) {
+-      result.setQueue(queue);
+-    }
+-    result.setJobName(extract(conf, JobConfPropertyNames.JOB_NAMES
+-        .getCandidates(), null));
+-
+-    maybeSetHeapMegabytes(extractMegabytes(conf,
+-        JobConfPropertyNames.TASK_JAVA_OPTS_S.getCandidates()));
+-    maybeSetJobMapMB(extractMegabytes(conf,
+-        JobConfPropertyNames.MAP_JAVA_OPTS_S.getCandidates()));
+-    maybeSetJobReduceMB(extractMegabytes(conf,
+-        JobConfPropertyNames.REDUCE_JAVA_OPTS_S.getCandidates()));
+-        
+-    this.jobConfigurationParameters = conf;
+-  }
+-
+-  /**
+-   * Request the builder to build the final object. Once called, the
+-   * {@link JobBuilder} would accept no more events or job-conf properties.
+-   * 
+-   * @return Parsed {@link ParsedJob} object.
+-   */
+-  public ParsedJob build() {
+-    // The main job here is to build CDFs and manage the conf
+-    finalized = true;
+-
+-    // set the conf
+-    if (jobConfigurationParameters != null) {
+-      result.setJobProperties(jobConfigurationParameters);
+-    }
+-    
+-    // initialize all the per-job statistics gathering places
+-    Histogram[] successfulMapAttemptTimes =
+-        new Histogram[ParsedHost.numberOfDistances() + 1];
+-    for (int i = 0; i < successfulMapAttemptTimes.length; ++i) {
+-      successfulMapAttemptTimes[i] = new Histogram();
+-    }
+-
+-    Histogram successfulReduceAttemptTimes = new Histogram();
+-    Histogram[] failedMapAttemptTimes =
+-        new Histogram[ParsedHost.numberOfDistances() + 1];
+-    for (int i = 0; i < failedMapAttemptTimes.length; ++i) {
+-      failedMapAttemptTimes[i] = new Histogram();
+-    }
+-    Histogram failedReduceAttemptTimes = new Histogram();
+-
+-    Histogram successfulNthMapperAttempts = new Histogram();
+-    // Histogram successfulNthReducerAttempts = new Histogram();
+-    // Histogram mapperLocality = new Histogram();
+-
+-    for (LoggedTask task : result.getMapTasks()) {
+-      for (LoggedTaskAttempt attempt : task.getAttempts()) {
+-        int distance = successfulMapAttemptTimes.length - 1;
+-        Long runtime = null;
+-
+-        if (attempt.getFinishTime() > 0 && attempt.getStartTime() > 0) {
+-          runtime = attempt.getFinishTime() - attempt.getStartTime();
+-
+-          if (attempt.getResult() == Values.SUCCESS) {
+-            LoggedLocation host = attempt.getLocation();
+-
+-            List<LoggedLocation> locs = task.getPreferredLocations();
+-
+-            if (host != null && locs != null) {
+-              for (LoggedLocation loc : locs) {
+-                ParsedHost preferedLoc = new ParsedHost(loc);
+-
+-                distance =
+-                    Math.min(distance, preferedLoc
+-                        .distance(new ParsedHost(host)));
+-              }
+-
+-              // mapperLocality.enter(distance);
+-            }
+-
+-            if (attempt.getStartTime() > 0 && attempt.getFinishTime() > 0) {
+-              if (runtime != null) {
+-                successfulMapAttemptTimes[distance].enter(runtime);
+-              }
+-            }
+-
+-            TaskAttemptID attemptID = attempt.getAttemptID();
+-
+-            if (attemptID != null) {
+-              successfulNthMapperAttempts.enter(attemptID.getId());
+-            }
+-          } else {
+-            if (attempt.getResult() == Pre21JobHistoryConstants.Values.FAILED) {
+-              if (runtime != null) {
+-                failedMapAttemptTimes[distance].enter(runtime);
+-              }
+-            }
+-          }
+-        }
+-      }
+-    }
+-
+-    for (LoggedTask task : result.getReduceTasks()) {
+-      for (LoggedTaskAttempt attempt : task.getAttempts()) {
+-        Long runtime = attempt.getFinishTime() - attempt.getStartTime();
+-
+-        if (attempt.getFinishTime() > 0 && attempt.getStartTime() > 0) {
+-          runtime = attempt.getFinishTime() - attempt.getStartTime();
+-        }
+-        if (attempt.getResult() == Values.SUCCESS) {
+-          if (runtime != null) {
+-            successfulReduceAttemptTimes.enter(runtime);
+-          }
+-        } else if (attempt.getResult() == Pre21JobHistoryConstants.Values.FAILED) {
+-          failedReduceAttemptTimes.enter(runtime);
+-        }
+-      }
+-    }
+-
+-    result.setFailedMapAttemptCDFs(mapCDFArrayList(failedMapAttemptTimes));
+-
+-    LoggedDiscreteCDF failedReduce = new LoggedDiscreteCDF();
+-    failedReduce.setCDF(failedReduceAttemptTimes, attemptTimesPercentiles, 100);
+-    result.setFailedReduceAttemptCDF(failedReduce);
+-
+-    result
+-        .setSuccessfulMapAttemptCDFs(mapCDFArrayList(successfulMapAttemptTimes));
+-
+-    LoggedDiscreteCDF succReduce = new LoggedDiscreteCDF();
+-    succReduce.setCDF(successfulReduceAttemptTimes, attemptTimesPercentiles,
+-        100);
+-    result.setSuccessfulReduceAttemptCDF(succReduce);
+-
+-    long totalSuccessfulAttempts = 0L;
+-    long maxTriesToSucceed = 0L;
+-
+-    for (Map.Entry<Long, Long> ent : successfulNthMapperAttempts) {
+-      totalSuccessfulAttempts += ent.getValue();
+-      maxTriesToSucceed = Math.max(maxTriesToSucceed, ent.getKey());
+-    }
+-
+-    if (totalSuccessfulAttempts > 0L) {
+-      double[] successAfterI = new double[(int) maxTriesToSucceed + 1];
+-      for (int i = 0; i < successAfterI.length; ++i) {
+-        successAfterI[i] = 0.0D;
+-      }
+-
+-      for (Map.Entry<Long, Long> ent : successfulNthMapperAttempts) {
+-        successAfterI[ent.getKey().intValue()] =
+-            ((double) ent.getValue()) / totalSuccessfulAttempts;
+-      }
+-      result.setMapperTriesToSucceed(successAfterI);
+-    } else {
+-      result.setMapperTriesToSucceed(null);
+-    }
+-
+-    return result;
+-  }
+-
+-  private ArrayList<LoggedDiscreteCDF> mapCDFArrayList(Histogram[] data) {
+-    ArrayList<LoggedDiscreteCDF> result = new ArrayList<LoggedDiscreteCDF>();
+-
+-    for (Histogram hist : data) {
+-      LoggedDiscreteCDF discCDF = new LoggedDiscreteCDF();
+-      discCDF.setCDF(hist, attemptTimesPercentiles, 100);
+-      result.add(discCDF);
+-    }
+-
+-    return result;
+-  }
+-
+-  private static Values getPre21Value(String name) {
+-    if (name.equalsIgnoreCase("JOB_CLEANUP")) {
+-      return Values.CLEANUP;
+-    }
+-    if (name.equalsIgnoreCase("JOB_SETUP")) {
+-      return Values.SETUP;
+-    }
+-
+-    // Note that pre-21, the task state of a successful task was logged as 
+-    // SUCCESS while from 21 onwards, its logged as SUCCEEDED.
+-    if (name.equalsIgnoreCase(TaskStatus.State.SUCCEEDED.toString())) {
+-      return Values.SUCCESS;
+-    }
+-    
+-    return Values.valueOf(StringUtils.toUpperCase(name));
+-  }
+-
+-  private void processTaskUpdatedEvent(TaskUpdatedEvent event) {
+-    ParsedTask task = getTask(event.getTaskId().toString());
+-    if (task == null) {
+-      return;
+-    }
+-    task.setFinishTime(event.getFinishTime());
+-  }
+-
+-  private void processTaskStartedEvent(TaskStartedEvent event) {
+-    ParsedTask task =
+-        getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), true);
+-    task.setStartTime(event.getStartTime());
+-    task.setPreferredLocations(preferredLocationForSplits(event
+-        .getSplitLocations()));
+-  }
+-
+-  private void processTaskFinishedEvent(TaskFinishedEvent event) {
+-    ParsedTask task =
+-        getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), false);
+-    if (task == null) {
+-      return;
+-    }
+-    task.setFinishTime(event.getFinishTime());
+-    task.setTaskStatus(getPre21Value(event.getTaskStatus()));
+-    task.incorporateCounters(((TaskFinished) event.getDatum()).counters);
+-  }
+-
+-  private void processTaskFailedEvent(TaskFailedEvent event) {
+-    ParsedTask task =
+-        getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), false);
+-    if (task == null) {
+-      return;
+-    }
+-    task.setFinishTime(event.getFinishTime());
+-    task.setTaskStatus(getPre21Value(event.getTaskStatus()));
+-    TaskFailed t = (TaskFailed)(event.getDatum());
+-    task.putDiagnosticInfo(t.error.toString());
+-    // killed task wouldn't have failed attempt.
+-    if (t.getFailedDueToAttempt() != null) {
+-      task.putFailedDueToAttemptId(t.getFailedDueToAttempt().toString());
+-    }
+-    org.apache.hadoop.mapreduce.jobhistory.JhCounters counters =
+-        ((TaskFailed) event.getDatum()).getCounters();
+-    task.incorporateCounters(
+-        counters == null ? EMPTY_COUNTERS : counters);
+-  }
+-
+-  private void processTaskAttemptUnsuccessfulCompletionEvent(
+-      TaskAttemptUnsuccessfulCompletionEvent event) {
+-    ParsedTaskAttempt attempt =
+-        getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(),
+-            event.getTaskAttemptId().toString());
+-
+-    if (attempt == null) {
+-      return;
+-    }
+-
+-    attempt.setResult(getPre21Value(event.getTaskStatus()));
+-    attempt.setHostName(event.getHostname(), event.getRackName());
+-    ParsedHost pHost = 
+-      getAndRecordParsedHost(event.getRackName(), event.getHostname());
+-    if (pHost != null) {
+-      attempt.setLocation(pHost.makeLoggedLocation());
+-    }
+-
+-    attempt.setFinishTime(event.getFinishTime());
+-    org.apache.hadoop.mapreduce.jobhistory.JhCounters counters =
+-        ((TaskAttemptUnsuccessfulCompletion) event.getDatum()).getCounters();
+-    attempt.incorporateCounters(
+-        counters == null ? EMPTY_COUNTERS : counters);
+-    attempt.arraySetClockSplits(event.getClockSplits());
+-    attempt.arraySetCpuUsages(event.getCpuUsages());
+-    attempt.arraySetVMemKbytes(event.getVMemKbytes());
+-    attempt.arraySetPhysMemKbytes(event.getPhysMemKbytes());
+-    TaskAttemptUnsuccessfulCompletion t =
+-        (TaskAttemptUnsuccessfulCompletion) (event.getDatum());
+-    attempt.putDiagnosticInfo(t.getError().toString());
+-  }
+-
+-  private void processTaskAttemptStartedEvent(TaskAttemptStartedEvent event) {
+-    ParsedTaskAttempt attempt =
+-        getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(),
+-            event.getTaskAttemptId().toString());
+-    if (attempt == null) {
+-      return;
+-    }
+-    attempt.setStartTime(event.getStartTime());
+-    attempt.putTrackerName(event.getTrackerName());
+-    attempt.putHttpPort(event.getHttpPort());
+-    attempt.putShufflePort(event.getShufflePort());
+-  }
+-
+-  private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) {
+-    ParsedTaskAttempt attempt =
+-        getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(),
+-            event.getAttemptId().toString());
+-    if (attempt == null) {
+-      return;
+-    }
+-    attempt.setResult(getPre21Value(event.getTaskStatus()));
+-    ParsedHost pHost = getAndRecordParsedHost(event.getRackName(), event.getHostname());
+-    if (pHost != null) {
+-      attempt.setLocation(pHost.makeLoggedLocation());
+-    }
+-    attempt.setFinishTime(event.getFinishTime());
+-    attempt
+-        .incorporateCounters(((TaskAttemptFinished) event.getDatum()).counters);
+-  }
+-
+-  private void processReduceAttemptFinishedEvent(
+-      ReduceAttemptFinishedEvent event) {
+-    ParsedTaskAttempt attempt =
+-        getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(),
+-            event.getAttemptId().toString());
+-    if (attempt == null) {
+-      return;
+-    }
+-    attempt.setResult(getPre21Value(event.getTaskStatus()));
+-    attempt.setHostName(event.getHostname(), event.getRackName());
+-    ParsedHost pHost = 
+-      getAndRecordParsedHost(event.getRackName(), event.getHostname());
+-    if (pHost != null) {
+-      attempt.setLocation(pHost.makeLoggedLocation());
+-    }
+-
+-    // XXX There may be redundant location info available in the event.
+-    // We might consider extracting it from this event. Currently this
+-    // is redundant, but making this will add future-proofing.
+-    attempt.setFinishTime(event.getFinishTime());
+-    attempt.setShuffleFinished(event.getShuffleFinishTime());
+-    attempt.setSortFinished(event.getSortFinishTime());
+-    attempt
+-        .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).counters);
+-    attempt.arraySetClockSplits(event.getClockSplits());
+-    attempt.arraySetCpuUsages(event.getCpuUsages());
+-    attempt.arraySetVMemKbytes(event.getVMemKbytes());
+-    attempt.arraySetPhysMemKbytes(event.getPhysMemKbytes());
+-  }
+-
+-  private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) {
+-    ParsedTaskAttempt attempt =
+-        getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(),
+-            event.getAttemptId().toString());
+-    if (attempt == null) {
+-      return;
+-    }
+-    attempt.setResult(getPre21Value(event.getTaskStatus()));
+-    attempt.setHostName(event.getHostname(), event.getRackName());
+-
+-    ParsedHost pHost = 
+-      getAndRecordParsedHost(event.getRackName(), event.getHostname());
+-    if (pHost != null) {
+-      attempt.setLocation(pHost.makeLoggedLocation());
+-    }
+-    
+-    // XXX There may be redundant location info available in the event.
+-    // We might consider extracting it from this event. Currently this
+-    // is redundant, but making this will add future-proofing.
+-    attempt.setFinishTime(event.getFinishTime());
+-    attempt
+-      .incorporateCounters(((MapAttemptFinished) event.getDatum()).counters);
+-    attempt.arraySetClockSplits(event.getClockSplits());
+-    attempt.arraySetCpuUsages(event.getCpuUsages());
+-    attempt.arraySetVMemKbytes(event.getVMemKbytes());
+-    attempt.arraySetPhysMemKbytes(event.getPhysMemKbytes());
+-  }
+-
+-  private void processJobUnsuccessfulCompletionEvent(
+-      JobUnsuccessfulCompletionEvent event) {
+-    result.setOutcome(Pre21JobHistoryConstants.Values
+-        .valueOf(event.getStatus()));
+-    result.setFinishTime(event.getFinishTime());
+-    // No counters in JobUnsuccessfulCompletionEvent
+-  }
+-
+-  private void processJobSubmittedEvent(JobSubmittedEvent event) {
+-    result.setJobID(event.getJobId().toString());
+-    result.setJobName(event.getJobName());
+-    result.setUser(event.getUserName());
+-    result.setSubmitTime(event.getSubmitTime());
+-    result.putJobConfPath(event.getJobConfPath());
+-    result.putJobAcls(event.getJobAcls());
+-
+-    // set the queue name if existing
+-    String queue = event.getJobQueueName();
+-    if (queue != null) {
+-      result.setQueue(queue);
+-    }
+-  }
+-
+-  private void processJobQueueChangeEvent(JobQueueChangeEvent event) {
+-    // set the queue name if existing
+-    String queue = event.getJobQueueName();
+-    if (queue != null) {
+-      result.setQueue(queue);
+-    }
+-  }
+-
+-  private void processJobStatusChangedEvent(JobStatusChangedEvent event) {
+-    result.setOutcome(Pre21JobHistoryConstants.Values
+-        .valueOf(event.getStatus()));
+-  }
+-
+-  private void processJobPriorityChangeEvent(JobPriorityChangeEvent event) {
+-    result.setPriority(LoggedJob.JobPriority.valueOf(event.getPriority()
+-        .toString()));
+-  }
+-
+-  private void processJobInitedEvent(JobInitedEvent event) {
+-    result.setLaunchTime(event.getLaunchTime());
+-    result.setTotalMaps(event.getTotalMaps());
+-    result.setTotalReduces(event.getTotalReduces());
+-  }
+-
+-  private void processJobInfoChangeEvent(JobInfoChangeEvent event) {
+-    result.setLaunchTime(event.getLaunchTime());
+-  }
+-
+-  private void processJobFinishedEvent(JobFinishedEvent event) {
+-    result.setFinishTime(event.getFinishTime());
+-    result.setJobID(jobID);
+-    result.setOutcome(Values.SUCCESS);
+-
+-    JobFinished job = (JobFinished)event.getDatum();
+-    Map<String, Long> countersMap =
+-        JobHistoryUtils.extractCounters(job.totalCounters);
+-    result.putTotalCounters(countersMap);
+-    countersMap = JobHistoryUtils.extractCounters(job.mapCounters);
+-    result.putMapCounters(countersMap);
+-    countersMap = JobHistoryUtils.extractCounters(job.reduceCounters);
+-    result.putReduceCounters(countersMap);
+-  }
+-
+-  private ParsedTask getTask(String taskIDname) {
+-    ParsedTask result = mapTasks.get(taskIDname);
+-
+-    if (result != null) {
+-      return result;
+-    }
+-
+-    result = reduceTasks.get(taskIDname);
+-
+-    if (result != null) {
+-      return result;
+-    }
+-
+-    return otherTasks.get(taskIDname);
+-  }
+-
+-  /**
+-   * @param type
+-   *          the task type
+-   * @param taskIDname
+-   *          the task ID name, as a string
+-   * @param allowCreate
+-   *          if true, we can create a task.
+-   * @return
+-   */
+-  private ParsedTask getOrMakeTask(TaskType type, String taskIDname,
+-      boolean allowCreate) {
+-    Map<String, ParsedTask> taskMap = otherTasks;
+-    List<LoggedTask> tasks = this.result.getOtherTasks();
+-
+-    switch (type) {
+-    case MAP:
+-      taskMap = mapTasks;
+-      tasks = this.result.getMapTasks();
+-      break;
+-
+-    case REDUCE:
+-      taskMap = reduceTasks;
+-      tasks = this.result.getReduceTasks();
+-      break;
+-
+-    default:
+-      // no code
+-    }
+-
+-    ParsedTask result = taskMap.get(taskIDname);
+-
+-    if (result == null && allowCreate) {
+-      result = new ParsedTask();
+-      result.setTaskType(getPre21Value(type.toString()));
+-      result.setTaskID(taskIDname);
+-      taskMap.put(taskIDname, result);
+-      tasks.add(result);
+-    }
+-
+-    return result;
+-  }
+-
+-  private ParsedTaskAttempt getOrMakeTaskAttempt(TaskType type,
+-      String taskIDName, String taskAttemptName) {
+-    ParsedTask task = getOrMakeTask(type, taskIDName, false);
+-    ParsedTaskAttempt result = attempts.get(taskAttemptName);
+-
+-    if (result == null && task != null) {
+-      result = new ParsedTaskAttempt();
+-      result.setAttemptID(taskAttemptName);
+-      attempts.put(taskAttemptName, result);
+-      task.getAttempts().add(result);
+-    }
+-
+-    return result;
+-  }
+-
+-  private ParsedHost getAndRecordParsedHost(String hostName) {
+-    return getAndRecordParsedHost(null, hostName);
+-  }
+-  
+-  private ParsedHost getAndRecordParsedHost(String rackName, String hostName) {
+-    ParsedHost result = null;
+-    if (rackName == null) {
+-      // for old (pre-23) job history files where hostname was represented as
+-      // /rackname/hostname
+-      result = ParsedHost.parse(hostName);
+-    } else {
+-      // for new (post-23) job history files
+-      result = new ParsedHost(rackName, hostName);
+-    }
+-
+-    if (result != null) {
+-      ParsedHost canonicalResult = allHosts.get(result);
+-
+-      if (canonicalResult != null) {
+-        return canonicalResult;
+-      }
+-
+-      allHosts.put(result, result);
+-
+-      return result;
+-    }
+-
+-    return null;
+-  }
+-
+-  private ArrayList<LoggedLocation> preferredLocationForSplits(String splits) {
+-    if (splits != null) {
+-      ArrayList<LoggedLocation> locations = null;
+-
+-      StringTokenizer tok = new StringTokenizer(splits, ",", false);
+-
+-      if (tok.countTokens() <= MAXIMUM_PREFERRED_LOCATIONS) {
+-        locations = new ArrayList<LoggedLocation>();
+-
+-        while (tok.hasMoreTokens()) {
+-          String nextSplit = tok.nextToken();
+-
+-          ParsedHost node = getAndRecordParsedHost(nextSplit);
+-
+-          if (locations != null && node != null) {
+-            locations.add(node.makeLoggedLocation());
+-          }
+-        }
+-
+-        return locations;
+-      }
+-    }
+-
+-    return null;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java
+deleted file mode 100644
+index c1ba83ece49..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Arrays;
+-
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-
+-public enum JobConfPropertyNames {
+-  QUEUE_NAMES("mapred.job.queue.name", MRJobConfig.QUEUE_NAME),
+-  JOB_NAMES("mapred.job.name", MRJobConfig.JOB_NAME),
+-  TASK_JAVA_OPTS_S("mapred.child.java.opts"),
+-  MAP_JAVA_OPTS_S("mapred.child.java.opts", MRJobConfig.MAP_JAVA_OPTS),
+-  REDUCE_JAVA_OPTS_S("mapred.child.java.opts", MRJobConfig.REDUCE_JAVA_OPTS);
+-
+-  private String[] candidates;
+-
+-  JobConfPropertyNames(String... candidates) {
+-    this.candidates = candidates;
+-  }
+-
+-  public String[] getCandidates() {
+-    return Arrays.copyOf(candidates, candidates.length);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java
+deleted file mode 100644
+index 9cd2f4778fc..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.Properties;
+-
+-import javax.xml.parsers.DocumentBuilder;
+-import javax.xml.parsers.DocumentBuilderFactory;
+-import javax.xml.parsers.ParserConfigurationException;
+-
+-import org.apache.hadoop.util.XMLUtils;
+-
+-import org.w3c.dom.Document;
+-import org.w3c.dom.Element;
+-import org.w3c.dom.NodeList;
+-import org.w3c.dom.Node;
+-import org.w3c.dom.Text;
+-import org.xml.sax.SAXException;
+-
+-/**
+- * {@link JobConfigurationParser} parses the job configuration xml file, and
+- * extracts configuration properties. It parses the file using a
+- * stream-parser and thus is more memory efficient. [This optimization may be
+- * postponed for a future release]
+- */
+-public class JobConfigurationParser {
+-
+-  /**
+-   * Parse the job configuration file (as an input stream) and return a
+-   * {@link Properties} collection. The input stream will not be closed after
+-   * return from the call.
+-   * 
+-   * @param input
+-   *          The input data.
+-   * @return A {@link Properties} collection extracted from the job
+-   *         configuration xml.
+-   * @throws IOException
+-   */
+-  static Properties parse(InputStream input) throws IOException {
+-    Properties result = new Properties();
+-
+-    try {
+-      DocumentBuilderFactory dbf = XMLUtils.newSecureDocumentBuilderFactory();
+-
+-      DocumentBuilder db = dbf.newDocumentBuilder();
+-
+-      Document doc = db.parse(input);
+-
+-      Element root = doc.getDocumentElement();
+-
+-      if (!"configuration".equals(root.getTagName())) {
+-        System.out.print("root is not a configuration node");
+-        return null;
+-      }
+-
+-      NodeList props = root.getChildNodes();
+-
+-      for (int i = 0; i < props.getLength(); ++i) {
+-        Node propNode = props.item(i);
+-        if (!(propNode instanceof Element))
+-          continue;
+-        Element prop = (Element) propNode;
+-        if (!"property".equals(prop.getTagName())) {
+-          System.out.print("bad conf file: element not <property>");
+-        }
+-        NodeList fields = prop.getChildNodes();
+-        String attr = null;
+-        String value = null;
+-        @SuppressWarnings("unused")
+-        boolean finalParameter = false;
+-        for (int j = 0; j < fields.getLength(); j++) {
+-          Node fieldNode = fields.item(j);
+-          if (!(fieldNode instanceof Element)) {
+-            continue;
+-          }
+-
+-          Element field = (Element) fieldNode;
+-          if ("name".equals(field.getTagName()) && field.hasChildNodes()) {
+-            attr = ((Text) field.getFirstChild()).getData().trim();
+-          }
+-          if ("value".equals(field.getTagName()) && field.hasChildNodes()) {
+-            value = ((Text) field.getFirstChild()).getData();
+-          }
+-          if ("final".equals(field.getTagName()) && field.hasChildNodes()) {
+-            finalParameter =
+-                "true".equals(((Text) field.getFirstChild()).getData());
+-          }
+-        }
+-
+-        if (attr != null && value != null) {
+-          result.put(attr, value);
+-        }
+-      }
+-    } catch (ParserConfigurationException e) {
+-      return null;
+-    } catch (SAXException e) {
+-      return null;
+-    }
+-
+-    return result;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java
+deleted file mode 100644
+index 2dc83c8f371..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-
+-/**
+- * {@link JobHistoryParser} defines the interface of a Job History file parser.
+- */
+-public interface JobHistoryParser extends Closeable {
+-  /**
+-   * Get the next {@link HistoryEvent}
+-   * @return the next {@link HistoryEvent}. If no more events left, return null.
+-   * @throws IOException 
+-   */
+-  HistoryEvent nextEvent() throws IOException;
+-  
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java
+deleted file mode 100644
+index b84f264e545..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-/**
+- * {@link JobHistoryParserFactory} is a singleton class that attempts to
+- * determine the version of job history and return a proper parser.
+- */
+-public class JobHistoryParserFactory {
+-  public static JobHistoryParser getParser(RewindableInputStream ris)
+-      throws IOException {
+-    for (VersionDetector vd : VersionDetector.values()) {
+-      boolean canParse = vd.canParse(ris);
+-      ris.rewind();
+-      if (canParse) {
+-        return vd.newInstance(ris);
+-      }
+-    }
+-
+-    throw new IOException("No suitable parser.");
+-  }
+-
+-  public enum VersionDetector {
+-    Hadoop20() {
+-
+-      @Override
+-      public boolean canParse(InputStream input) throws IOException {
+-        return Hadoop20JHParser.canParse(input);
+-      }
+-
+-      @Override
+-      public JobHistoryParser newInstance(InputStream input) throws IOException {
+-        return new Hadoop20JHParser(input);
+-      }
+-    },
+-
+-    Current() {
+-
+-      @Override
+-      public boolean canParse(InputStream input) throws IOException {
+-        return CurrentJHParser.canParse(input);
+-      }
+-
+-      @Override
+-      public JobHistoryParser newInstance(InputStream input) throws IOException {
+-        return new CurrentJHParser(input);
+-      }
+-    };
+-
+-    abstract JobHistoryParser newInstance(InputStream input) throws IOException;
+-
+-    abstract boolean canParse(InputStream input) throws IOException;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
+deleted file mode 100644
+index 6ae87bbd40a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
++++ /dev/null
+@@ -1,168 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounter;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounterGroup;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounters;
+-import org.apache.hadoop.mapreduce.v2.hs.JobHistory;
+-
+-/**
+- * Job History related utils for handling multiple formats of history logs of
+- * different hadoop versions like Pre21 history logs, current history logs.
+- */
+-public class JobHistoryUtils {
+-
+-  private static String applyParser(String fileName, Pattern pattern) {
+-    Matcher matcher = pattern.matcher(fileName);
+-
+-    if (!matcher.matches()) {
+-      return null;
+-    }
+-
+-    return matcher.group(1);
+-  }
+-
+-  /**
+-   * Extracts jobID string from the given job history log file name or
+-   * job history configuration file name.
+-   * @param fileName name of job history file or job history configuration file
+-   * @return a valid jobID String, parsed out of the file name. Otherwise,
+-   *         [especially for .crc files] returns null.
+-   */
+-  static String extractJobID(String fileName) {
+-    // Get jobID if fileName is a config file name.
+-    String jobId = extractJobIDFromConfFileName(fileName);
+-    if (jobId == null) {
+-      // Get JobID if fileName is a job history file name
+-      jobId = extractJobIDFromHistoryFileName(fileName);
+-    }
+-    return jobId;
+-  }
+-
+-  /**
+-   * Extracts job id from the current hadoop version's job history file name.
+-   * @param fileName job history file name from which job id is to be extracted
+-   * @return job id if the history file name format is same as that of the
+-   * current hadoop version. Returns null otherwise.
+-   */
+-  private static String extractJobIDFromCurrentHistoryFile(String fileName) {
+-    JobID id = null;
+-    if (org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils
+-            .isValidJobHistoryFileName(fileName)) {
+-      try {
+-        id = org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils
+-                 .getJobIDFromHistoryFilePath(fileName);
+-      } catch (IOException e) {
+-        // Ignore this exception and go ahead with getting of jobID assuming
+-        // older hadoop verison's history file
+-      }
+-    }
+-    if (id != null) {
+-      return id.toString();
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Extracts jobID string from the given job history file name.
+-   * @param fileName name of the job history file
+-   * @return JobID if the given <code>fileName</code> is a valid job history
+-   *         file name, <code>null</code> otherwise.
+-   */
+-  private static String extractJobIDFromHistoryFileName(String fileName) {
+-    // History file name could be in one of the following formats
+-    // (1) old pre21 job history file name format
+-    // (2) new pre21 job history file name format
+-    // (3) current job history file name format i.e. 0.22
+-
+-    // Try to get the jobID assuming that the history file is from the current
+-    // hadoop version
+-    String jobID = extractJobIDFromCurrentHistoryFile(fileName);
+-    if (jobID != null) {
+-      return jobID;//history file is of current hadoop version
+-    }
+-
+-    // History file could be of older hadoop versions
+-    String pre21JobID = applyParser(fileName,
+-        Pre21JobHistoryConstants.JOBHISTORY_FILENAME_REGEX_V1);
+-    if (pre21JobID == null) {
+-      pre21JobID = applyParser(fileName,
+-          Pre21JobHistoryConstants.JOBHISTORY_FILENAME_REGEX_V2);
+-    }
+-    return pre21JobID;
+-  }
+-
+-  /**
+-   * Extracts jobID string from the given job conf xml file name.
+-   * @param fileName name of the job conf xml file
+-   * @return job id if the given <code>fileName</code> is a valid job conf xml
+-   *         file name, <code>null</code> otherwise.
+-   */
+-  private static String extractJobIDFromConfFileName(String fileName) {
+-    // History conf file name could be in one of the following formats
+-    // (1) old pre21 job history file name format
+-    // (2) new pre21 job history file name format
+-    // (3) current job history file name format i.e. 0.22
+-    String pre21JobID = applyParser(fileName,
+-                          Pre21JobHistoryConstants.CONF_FILENAME_REGEX_V1);
+-    if (pre21JobID == null) {
+-      pre21JobID = applyParser(fileName,
+-                     Pre21JobHistoryConstants.CONF_FILENAME_REGEX_V2);
+-    }
+-    if (pre21JobID != null) {
+-      return pre21JobID;
+-    }
+-    return applyParser(fileName, JobHistory.CONF_FILENAME_REGEX);
+-  }
+-
+-  /**
+-   * Checks if the given <code>fileName</code> is a valid job conf xml file name
+-   * @param fileName name of the file to be validated
+-   * @return <code>true</code> if the given <code>fileName</code> is a valid
+-   *         job conf xml file name.
+-   */
+-  static boolean isJobConfXml(String fileName) {
+-    String jobId = extractJobIDFromConfFileName(fileName);
+-    return jobId != null;
+-  }
+-
+-  /**
+-   * Extract/Add counters into the Map from the given JhCounters object.
+-   * @param counters the counters to be extracted from
+-   * @return the map of counters
+-   */
+-  static Map<String, Long> extractCounters(JhCounters counters) {
+-    Map<String, Long> countersMap = new HashMap<String, Long>();
+-    if (counters != null) {
+-      for (JhCounterGroup group : counters.groups) {
+-        for (JhCounter counter : group.counts) {
+-          countersMap.put(counter.name.toString(), counter.value);
+-        }
+-      }
+-    }
+-    return countersMap;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java
+deleted file mode 100644
+index 36eeeab90d0..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java
++++ /dev/null
+@@ -1,124 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-
+-/**
+- * {@link JobStory} represents the runtime information available for a
+- * completed Map-Reduce job.
+- */
+-public interface JobStory {
+-  
+-  /**
+-   * Get the {@link JobConf} for the job.
+-   * @return the <code>JobConf</code> for the job
+-   */
+-  public JobConf getJobConf();
+-  
+-  /**
+-   * Get the job name.
+-   * @return the job name
+-   */
+-  public String getName();
+-  
+-  /**
+-   * Get the job ID
+-   * @return the job ID
+-   */
+-  public JobID getJobID();
+-  
+-  /**
+-   * Get the user who ran the job.
+-   * @return the user who ran the job
+-   */
+-  public String getUser();
+-  
+-  /**
+-   * Get the job submission time.
+-   * @return the job submission time
+-   */
+-  public long getSubmissionTime();
+-  
+-  /**
+-   * Get the number of maps in the {@link JobStory}.
+-   * @return the number of maps in the <code>Job</code>
+-   */
+-  public int getNumberMaps();
+-  
+-  /**
+-   * Get the number of reduce in the {@link JobStory}.
+-   * @return the number of reduces in the <code>Job</code>
+-   */
+-  public int getNumberReduces();
+-
+-  /**
+-   * Get the input splits for the job.
+-   * @return the input splits for the job
+-   */
+-  public InputSplit[] getInputSplits();
+-  
+-  /**
+-   * Get {@link TaskInfo} for a given task.
+-   * @param taskType {@link TaskType} of the task
+-   * @param taskNumber Partition number of the task
+-   * @return the <code>TaskInfo</code> for the given task
+-   */
+-  public TaskInfo getTaskInfo(TaskType taskType, int taskNumber);
+-  
+-  /**
+-   * Get {@link TaskAttemptInfo} for a given task-attempt, without regard to
+-   * impact of locality (e.g. not needed to make scheduling decisions).
+-   * @param taskType {@link TaskType} of the task-attempt
+-   * @param taskNumber Partition number of the task-attempt
+-   * @param taskAttemptNumber Attempt number of the task
+-   * @return the <code>TaskAttemptInfo</code> for the given task-attempt
+-   */
+-  public TaskAttemptInfo getTaskAttemptInfo(TaskType taskType, 
+-                                            int taskNumber, 
+-                                            int taskAttemptNumber);
+-  
+-  /**
+-   * Get {@link TaskAttemptInfo} for a given task-attempt, considering impact
+-   * of locality.
+-   * @param taskNumber Partition number of the task-attempt
+-   * @param taskAttemptNumber Attempt number of the task
+-   * @param locality Data locality of the task as scheduled in simulation
+-   * @return the <code>TaskAttemptInfo</code> for the given task-attempt
+-   */
+-  public TaskAttemptInfo
+-    getMapTaskAttemptInfoAdjusted(int taskNumber,
+-                                  int taskAttemptNumber,
+-                                  int locality);
+-  
+-  /**
+-   * Get the outcome of the job execution.
+-   * @return The outcome of the job execution.
+-   */
+-  public Values getOutcome();
+-  
+-  /**
+-   * Get the queue where the job is submitted.
+-   * @return the queue where the job is submitted.
+-   */
+-  public String getQueueName();
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java
+deleted file mode 100644
+index 5a66eb61817..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-
+-/**
+- * {@link JobStoryProducer} produces the sequence of {@link JobStory}'s.
+- */
+-public interface JobStoryProducer extends Closeable {
+-  /**
+-   * Get the next job.
+-   * @return The next job. Or null if no more job is available.
+-   * @throws IOException 
+-   */
+-  JobStory getNextJob() throws IOException;
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java
+deleted file mode 100644
+index f32e789d7cc..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * Reading JSON-encoded job traces and produce {@link LoggedJob} instances.
+- */
+-public class JobTraceReader extends JsonObjectMapperParser<LoggedJob> {
+-  /**
+-   * Constructor.
+-   * 
+-   * @param path
+-   *          Path to the JSON trace file, possibly compressed.
+-   * @param conf
+-   * @throws IOException
+-   */
+-  public JobTraceReader(Path path, Configuration conf) throws IOException {
+-    super(path, LoggedJob.class, conf);
+-  }
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param input
+-   *          The input stream for the JSON trace.
+-   */
+-  public JobTraceReader(InputStream input) throws IOException {
+-    super(input, LoggedJob.class);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java
+deleted file mode 100644
+index f95878dde95..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.JsonMappingException;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * A simple wrapper for parsing JSON-encoded data using ObjectMapper.
+- * 
+- * @param <T>
+- *          The (base) type of the object(s) to be parsed by this parser.
+- */
+-class JsonObjectMapperParser<T> implements Closeable {
+-  private final ObjectMapper mapper;
+-  private final Class<? extends T> clazz;
+-  private final JsonParser jsonParser;
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param path
+-   *          Path to the JSON data file, possibly compressed.
+-   * @param conf
+-   * @throws IOException
+-   */
+-  public JsonObjectMapperParser(Path path, Class<? extends T> clazz,
+-      Configuration conf) throws IOException {
+-    mapper = new ObjectMapper();
+-    this.clazz = clazz;
+-    InputStream input = new PossiblyDecompressedInputStream(path, conf);
+-    jsonParser = mapper.getFactory().createParser(input);
+-  }
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param input
+-   *          The input stream for the JSON data.
+-   */
+-  public JsonObjectMapperParser(InputStream input, Class<? extends T> clazz)
+-      throws IOException {
+-    mapper = new ObjectMapper();
+-    this.clazz = clazz;
+-    jsonParser = mapper.getFactory().createParser(input);
+-  }
+-
+-  /**
+-   * Get the next object from the trace.
+-   * 
+-   * @return The next instance of the object. Or null if we reach the end of
+-   *         stream.
+-   * @throws IOException
+-   */
+-  public T getNext() throws IOException {
+-    try {
+-      return mapper.readValue(jsonParser, clazz);
+-    } catch (JsonMappingException e) {
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    jsonParser.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java
+deleted file mode 100644
+index 747b141fd98..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-
+-import com.fasterxml.jackson.core.JsonEncoding;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.Version;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.module.SimpleModule;
+-import org.apache.hadoop.mapreduce.ID;
+-import org.apache.hadoop.tools.rumen.datatypes.DataType;
+-import org.apache.hadoop.tools.rumen.serializers.DefaultRumenSerializer;
+-import org.apache.hadoop.tools.rumen.serializers.ObjectStringSerializer;
+-
+-/**
+- * Simple wrapper around {@link JsonGenerator} to write objects in JSON format.
+- * @param <T> The type of the objects to be written.
+- */
+-public class JsonObjectMapperWriter<T> implements Closeable {
+-  private JsonGenerator writer;
+-  
+-  public JsonObjectMapperWriter(OutputStream output, boolean prettyPrint) throws IOException {
+-    ObjectMapper mapper = new ObjectMapper();
+-
+-    // define a module
+-    SimpleModule module = new SimpleModule(
+-        "Default Serializer", new Version(0, 1, 1, "FINAL", "", ""));
+-    // add various serializers to the module
+-    //   add default (all-pass) serializer for all rumen specific data types
+-    module.addSerializer(DataType.class, new DefaultRumenSerializer());
+-    //   add a serializer to use object.toString() while serializing
+-    module.addSerializer(ID.class, new ObjectStringSerializer<ID>());
+-    
+-    // register the module with the object-mapper
+-    mapper.registerModule(module);
+-
+-    writer = mapper.getFactory().createGenerator(output, JsonEncoding.UTF8);
+-    if (prettyPrint) {
+-      writer.useDefaultPrettyPrinter();
+-    }
+-  }
+-  
+-  public void write(T object) throws IOException {
+-    writer.writeObject(object);
+-  }
+-  
+-  @Override
+-  public void close() throws IOException {
+-    writer.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java
+deleted file mode 100644
+index cb431e4235c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Iterator;
+-
+-class LogRecordType {
+-  static Map<String, LogRecordType> internees = new HashMap<String, LogRecordType>();
+-
+-  final String name;
+-
+-  final int index;
+-
+-  private LogRecordType(String name) {
+-    super();
+-
+-    this.name = name;
+-
+-    index = internees.size();
+-  }
+-
+-  static LogRecordType intern(String typeName) {
+-    LogRecordType result = internees.get(typeName);
+-
+-    if (result == null) {
+-      result = new LogRecordType(typeName);
+-
+-      internees.put(typeName, result);
+-    }
+-
+-    return result;
+-  }
+-
+-  static LogRecordType internSoft(String typeName) {
+-    return internees.get(typeName);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return name;
+-  }
+-
+-  static String[] lineTypes() {
+-    Iterator<Map.Entry<String, LogRecordType>> iter = internees.entrySet()
+-        .iterator();
+-
+-    String[] result = new String[internees.size()];
+-
+-    for (int i = 0; i < internees.size(); ++i) {
+-      result[i] = iter.next().getKey();
+-    }
+-
+-    return result;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java
+deleted file mode 100644
+index 877cb6113df..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java
++++ /dev/null
+@@ -1,144 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * A {@link LoggedDiscreteCDF} is a discrete approximation of a cumulative
+- * distribution function, with this class set up to meet the requirements of the
+- * Jackson JSON parser/generator.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedDiscreteCDF implements DeepCompare {
+-  /**
+-   * The number of values this CDF is built on
+-   */
+-  long numberValues = -1L;
+-  /**
+-   * The least {@code X} value
+-   */
+-  long minimum = Long.MIN_VALUE;
+-  /**
+-   * The coordinates of the bulk of the CDF
+-   */
+-  List<LoggedSingleRelativeRanking> rankings = new ArrayList<LoggedSingleRelativeRanking>();
+-  /**
+-   * The greatest {@code X} value
+-   */
+-  long maximum = Long.MAX_VALUE;
+-
+-  void setCDF(Histogram data, int[] steps, int modulus) {
+-
+-    numberValues = data.getTotalCount();
+-    long[] CDF = data.getCDF(modulus, steps);
+-
+-    if (CDF != null) {
+-      minimum = CDF[0];
+-      maximum = CDF[CDF.length - 1];
+-
+-      rankings = new ArrayList<LoggedSingleRelativeRanking>();
+-
+-      for (int i = 1; i < CDF.length - 1; ++i) {
+-        LoggedSingleRelativeRanking srr = new LoggedSingleRelativeRanking();
+-
+-        srr.setRelativeRanking(((double) steps[i - 1]) / modulus);
+-        srr.setDatum(CDF[i]);
+-
+-        rankings.add(srr);
+-      }
+-    }
+-  }
+-
+-  public long getMinimum() {
+-    return minimum;
+-  }
+-
+-  void setMinimum(long minimum) {
+-    this.minimum = minimum;
+-  }
+-
+-  public List<LoggedSingleRelativeRanking> getRankings() {
+-    return rankings;
+-  }
+-
+-  void setRankings(List<LoggedSingleRelativeRanking> rankings) {
+-    this.rankings = rankings;
+-  }
+-
+-  public long getMaximum() {
+-    return maximum;
+-  }
+-
+-  void setMaximum(long maximum) {
+-    this.maximum = maximum;
+-  }
+-
+-  public long getNumberValues() {
+-    return numberValues;
+-  }
+-
+-  void setNumberValues(long numberValues) {
+-    this.numberValues = numberValues;
+-  }
+-
+-  private void compare1(long c1, long c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(List<LoggedSingleRelativeRanking> c1,
+-      List<LoggedSingleRelativeRanking> c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedDiscreteCDF)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedDiscreteCDF other = (LoggedDiscreteCDF) comparand;
+-
+-    compare1(numberValues, other.numberValues, loc, "numberValues");
+-
+-    compare1(minimum, other.minimum, loc, "minimum");
+-    compare1(maximum, other.maximum, loc, "maximum");
+-
+-    compare1(rankings, other.rankings, loc, "rankings");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java
+deleted file mode 100644
+index 597aab88deb..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java
++++ /dev/null
+@@ -1,679 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * 
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.Set;
+-import java.util.TreeSet;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.tools.rumen.datatypes.*;
+-
+-/**
+- * A {@link LoggedDiscreteCDF} is a representation of an hadoop job, with the
+- * details of this class set up to meet the requirements of the Jackson JSON
+- * parser/generator.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedJob implements DeepCompare {
+-  public enum JobType {
+-    JAVA, PIG, STREAMING, PIPES, OVERALL
+-  };
+-
+-  public enum JobPriority {
+-    VERY_LOW, LOW, NORMAL, HIGH, VERY_HIGH
+-  };
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  JobID jobID;
+-  UserName user;
+-  long computonsPerMapInputByte = -1L;
+-  long computonsPerMapOutputByte = -1L;
+-  long computonsPerReduceInputByte = -1L;
+-  long computonsPerReduceOutputByte = -1L;
+-  long submitTime = -1L;
+-  long launchTime = -1L;
+-  long finishTime = -1L;
+-
+-  int heapMegabytes = -1;
+-  int totalMaps = -1;
+-  int totalReduces = -1;
+-  Pre21JobHistoryConstants.Values outcome = null;
+-  JobType jobtype = JobType.JAVA;
+-  JobPriority priority = JobPriority.NORMAL;
+-
+-  List<String> directDependantJobs = new ArrayList<String>();
+-  List<LoggedTask> mapTasks = new ArrayList<LoggedTask>();
+-  List<LoggedTask> reduceTasks = new ArrayList<LoggedTask>();
+-  List<LoggedTask> otherTasks = new ArrayList<LoggedTask>();
+-
+-  // There are CDFs for each level of locality -- most local first
+-  ArrayList<LoggedDiscreteCDF> successfulMapAttemptCDFs;
+-  // There are CDFs for each level of locality -- most local first
+-  ArrayList<LoggedDiscreteCDF> failedMapAttemptCDFs;
+-
+-  LoggedDiscreteCDF successfulReduceAttemptCDF;
+-  LoggedDiscreteCDF failedReduceAttemptCDF;
+-
+-  QueueName queue = null;
+-
+-  JobName jobName = null;
+-
+-  int clusterMapMB = -1;
+-  int clusterReduceMB = -1;
+-  int jobMapMB = -1;
+-  int jobReduceMB = -1;
+-
+-  long relativeTime = 0;
+-
+-  double[] mapperTriesToSucceed;
+-  double failedMapperFraction; // !!!!!
+-
+-  private JobProperties jobProperties = new JobProperties();
+-  
+-  LoggedJob() {
+-
+-  }
+-
+-  LoggedJob(String jobID) {
+-    super();
+-
+-    setJobID(jobID);
+-  }
+-
+-  /**
+-   * Set the configuration properties of the job.
+-   */
+-  void setJobProperties(Properties conf) {
+-    this.jobProperties = new JobProperties(conf);
+-  }
+-  
+-  /**
+-   * Get the configuration properties of the job.
+-   */
+-  public JobProperties getJobProperties() {
+-    return jobProperties;
+-  }
+-  
+-  void adjustTimes(long adjustment) {
+-    submitTime += adjustment;
+-    launchTime += adjustment;
+-    finishTime += adjustment;
+-
+-    for (LoggedTask task : mapTasks) {
+-      task.adjustTimes(adjustment);
+-    }
+-
+-    for (LoggedTask task : reduceTasks) {
+-      task.adjustTimes(adjustment);
+-    }
+-
+-    for (LoggedTask task : otherTasks) {
+-      task.adjustTimes(adjustment);
+-    }
+-  }
+-
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  public UserName getUser() {
+-    return user;
+-  }
+-
+-  void setUser(String user) {
+-    this.user = new UserName(user);
+-  }
+-
+-  public JobID getJobID() {
+-    return jobID;
+-  }
+-
+-  void setJobID(String jobID) {
+-    this.jobID = JobID.forName(jobID);
+-  }
+-
+-  public JobPriority getPriority() {
+-    return priority;
+-  }
+-
+-  void setPriority(JobPriority priority) {
+-    this.priority = priority;
+-  }
+-
+-  public long getComputonsPerMapInputByte() {
+-    return computonsPerMapInputByte;
+-  }
+-
+-  void setComputonsPerMapInputByte(long computonsPerMapInputByte) {
+-    this.computonsPerMapInputByte = computonsPerMapInputByte;
+-  }
+-
+-  public long getComputonsPerMapOutputByte() {
+-    return computonsPerMapOutputByte;
+-  }
+-
+-  void setComputonsPerMapOutputByte(long computonsPerMapOutputByte) {
+-    this.computonsPerMapOutputByte = computonsPerMapOutputByte;
+-  }
+-
+-  public long getComputonsPerReduceInputByte() {
+-    return computonsPerReduceInputByte;
+-  }
+-
+-  void setComputonsPerReduceInputByte(long computonsPerReduceInputByte) {
+-    this.computonsPerReduceInputByte = computonsPerReduceInputByte;
+-  }
+-
+-  public long getComputonsPerReduceOutputByte() {
+-    return computonsPerReduceOutputByte;
+-  }
+-
+-  void setComputonsPerReduceOutputByte(long computonsPerReduceOutputByte) {
+-    this.computonsPerReduceOutputByte = computonsPerReduceOutputByte; // !!!!!
+-  }
+-
+-  public long getSubmitTime() {
+-    return submitTime;
+-  }
+-
+-  void setSubmitTime(long submitTime) {
+-    this.submitTime = submitTime;
+-  }
+-
+-  public long getLaunchTime() {
+-    return launchTime;
+-  }
+-
+-  void setLaunchTime(long startTime) {
+-    this.launchTime = startTime;
+-  }
+-
+-  public long getFinishTime() {
+-    return finishTime;
+-  }
+-
+-  void setFinishTime(long finishTime) {
+-    this.finishTime = finishTime;
+-  }
+-
+-  public int getHeapMegabytes() {
+-    return heapMegabytes;
+-  }
+-
+-  void setHeapMegabytes(int heapMegabytes) {
+-    this.heapMegabytes = heapMegabytes;
+-  }
+-
+-  public int getTotalMaps() {
+-    return totalMaps;
+-  }
+-
+-  void setTotalMaps(int totalMaps) {
+-    this.totalMaps = totalMaps;
+-  }
+-
+-  public int getTotalReduces() {
+-    return totalReduces;
+-  }
+-
+-  void setTotalReduces(int totalReduces) {
+-    this.totalReduces = totalReduces;
+-  }
+-
+-  public Pre21JobHistoryConstants.Values getOutcome() {
+-    return outcome;
+-  }
+-
+-  void setOutcome(Pre21JobHistoryConstants.Values outcome) {
+-    this.outcome = outcome;
+-  }
+-
+-  public JobType getJobtype() {
+-    return jobtype;
+-  }
+-
+-  void setJobtype(JobType jobtype) {
+-    this.jobtype = jobtype;
+-  }
+-
+-  public List<String> getDirectDependantJobs() {
+-    return directDependantJobs;
+-  }
+-
+-  void setDirectDependantJobs(List<String> directDependantJobs) {
+-    this.directDependantJobs = directDependantJobs;
+-  }
+-
+-  public List<LoggedTask> getMapTasks() {
+-    return mapTasks;
+-  }
+-
+-  void setMapTasks(List<LoggedTask> mapTasks) {
+-    this.mapTasks = mapTasks;
+-  }
+-
+-  public List<LoggedTask> getReduceTasks() {
+-    return reduceTasks;
+-  }
+-
+-  void setReduceTasks(List<LoggedTask> reduceTasks) {
+-    this.reduceTasks = reduceTasks;
+-  }
+-
+-  public List<LoggedTask> getOtherTasks() {
+-    return otherTasks;
+-  }
+-
+-  void setOtherTasks(List<LoggedTask> otherTasks) {
+-    this.otherTasks = otherTasks;
+-  }
+-
+-  public ArrayList<LoggedDiscreteCDF> getSuccessfulMapAttemptCDFs() {
+-    return successfulMapAttemptCDFs;
+-  }
+-
+-  void setSuccessfulMapAttemptCDFs(
+-      ArrayList<LoggedDiscreteCDF> successfulMapAttemptCDFs) {
+-    this.successfulMapAttemptCDFs = successfulMapAttemptCDFs;
+-  }
+-
+-  public ArrayList<LoggedDiscreteCDF> getFailedMapAttemptCDFs() {
+-    return failedMapAttemptCDFs;
+-  }
+-
+-  void setFailedMapAttemptCDFs(ArrayList<LoggedDiscreteCDF> failedMapAttemptCDFs) {
+-    this.failedMapAttemptCDFs = failedMapAttemptCDFs;
+-  }
+-
+-  public LoggedDiscreteCDF getSuccessfulReduceAttemptCDF() {
+-    return successfulReduceAttemptCDF;
+-  }
+-
+-  void setSuccessfulReduceAttemptCDF(
+-      LoggedDiscreteCDF successfulReduceAttemptCDF) {
+-    this.successfulReduceAttemptCDF = successfulReduceAttemptCDF;
+-  }
+-
+-  public LoggedDiscreteCDF getFailedReduceAttemptCDF() {
+-    return failedReduceAttemptCDF;
+-  }
+-
+-  void setFailedReduceAttemptCDF(LoggedDiscreteCDF failedReduceAttemptCDF) {
+-    this.failedReduceAttemptCDF = failedReduceAttemptCDF;
+-  }
+-
+-  public double[] getMapperTriesToSucceed() {
+-    return mapperTriesToSucceed;
+-  }
+-
+-  void setMapperTriesToSucceed(double[] mapperTriesToSucceed) {
+-    this.mapperTriesToSucceed = mapperTriesToSucceed;
+-  }
+-
+-  public double getFailedMapperFraction() {
+-    return failedMapperFraction;
+-  }
+-
+-  void setFailedMapperFraction(double failedMapperFraction) {
+-    this.failedMapperFraction = failedMapperFraction;
+-  }
+-
+-  public long getRelativeTime() {
+-    return relativeTime;
+-  }
+-
+-  void setRelativeTime(long relativeTime) {
+-    this.relativeTime = relativeTime;
+-  }
+-
+-  /**
+-   * @return job queue name if it is available in job history file or
+-   *         job history conf file. Returns null otherwise.
+-   */
+-  public QueueName getQueue() {
+-    return queue;
+-  }
+-
+-  void setQueue(String queue) {
+-    this.queue = new QueueName(queue);
+-  }
+-
+-  public JobName getJobName() {
+-    return jobName;
+-  }
+-
+-  void setJobName(String jobName) {
+-    this.jobName = new JobName(jobName);
+-  }
+-
+-  public int getClusterMapMB() {
+-    return clusterMapMB;
+-  }
+-
+-  void setClusterMapMB(int clusterMapMB) {
+-    this.clusterMapMB = clusterMapMB;
+-  }
+-
+-  public int getClusterReduceMB() {
+-    return clusterReduceMB;
+-  }
+-
+-  void setClusterReduceMB(int clusterReduceMB) {
+-    this.clusterReduceMB = clusterReduceMB;
+-  }
+-
+-  public int getJobMapMB() {
+-    return jobMapMB;
+-  }
+-
+-  void setJobMapMB(int jobMapMB) {
+-    this.jobMapMB = jobMapMB;
+-  }
+-
+-  public int getJobReduceMB() {
+-    return jobReduceMB;
+-  }
+-
+-  void setJobReduceMB(int jobReduceMB) {
+-    this.jobReduceMB = jobReduceMB;
+-  }
+-
+-  private void compare1(String c1, String c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || !c1.equals(c2)) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(long c1, long c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(Pre21JobHistoryConstants.Values c1,
+-      Pre21JobHistoryConstants.Values c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(JobType c1, JobType c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(JobPriority c1, JobPriority c2, TreePath loc,
+-      String eltname) throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(int c1, int c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(double c1, double c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(double[] c1, double[] c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    TreePath recursePath = new TreePath(loc, eltname);
+-
+-    if (c1 == null || c2 == null || c1.length != c2.length) {
+-      throw new DeepInequalityException(eltname + " miscompared", recursePath);
+-    }
+-
+-    for (int i = 0; i < c1.length; ++i) {
+-      if (c1[i] != c2[i]) {
+-        throw new DeepInequalityException(eltname + " miscompared",
+-            new TreePath(loc, eltname, i));
+-      }
+-    }
+-  }
+-
+-  private void compare1(DeepCompare c1, DeepCompare c2, TreePath loc,
+-      String eltname, int index) throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    TreePath recursePath = new TreePath(loc, eltname, index);
+-
+-    if (c1 == null || c2 == null) {
+-      if (index == -1) {
+-        throw new DeepInequalityException(eltname + " miscompared", recursePath);
+-      } else {
+-        throw new DeepInequalityException(eltname + "[" + index
+-            + "] miscompared", recursePath);
+-      }
+-    }
+-
+-    c1.deepCompare(c2, recursePath);
+-  }
+-
+-  // I'll treat this as an atomic object type
+-  private void compareStrings(List<String> c1, List<String> c2, TreePath loc,
+-      String eltname) throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    TreePath recursePath = new TreePath(loc, eltname);
+-
+-    if (c1 == null || c2 == null || !c1.equals(c2)) {
+-      throw new DeepInequalityException(eltname + " miscompared", recursePath);
+-    }
+-  }
+-
+-  private void compareLoggedTasks(List<LoggedTask> c1, List<LoggedTask> c2,
+-      TreePath loc, String eltname) throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  private void compareCDFs(List<LoggedDiscreteCDF> c1,
+-      List<LoggedDiscreteCDF> c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  private void compareJobProperties(JobProperties jprop1, JobProperties jprop2,
+-                                    TreePath loc, String eltname) 
+-  throws DeepInequalityException {
+-    if (jprop1 == null && jprop2 == null) {
+-      return;
+-    }
+-
+-    if (jprop1 == null || jprop2 == null) {
+-      throw new DeepInequalityException(eltname + " miscompared", 
+-                                        new TreePath(loc, eltname));
+-    }
+-
+-    Properties prop1 = jprop1.getValue();
+-    Properties prop2 = jprop2.getValue();
+-    
+-    if (prop1.size() != prop2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared [size]", 
+-                                        new TreePath(loc, eltname));
+-    }
+-    
+-    for (Map.Entry<Object, Object> entry : prop1.entrySet()) {
+-      String v1 = entry.getValue().toString();
+-      String v2 = prop2.get(entry.getKey()).toString();
+-      compare1(v1, v2, new TreePath(loc, eltname), "key:" + entry.getKey());
+-    }
+-  }
+-  
+-  private void compare1(DataType<String> c1, DataType<String> c2, TreePath loc, 
+-                        String eltname) 
+-  throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null) {
+-      throw new DeepInequalityException(eltname + " miscompared", 
+-                                        new TreePath(loc, eltname));
+-    }
+-    TreePath dtPath = new TreePath(loc, eltname);
+-    
+-    if (!c1.getClass().getName().equals(c2.getClass().getName())) {
+-      throw new DeepInequalityException(eltname + " miscompared", 
+-                                        new TreePath(dtPath, "class"));
+-    }
+-    
+-    compare1(c1.getValue(), c2.getValue(), dtPath, "value");
+-  }
+-  
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedJob)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedJob other = (LoggedJob) comparand;
+-
+-    compare1(jobID.toString(), other.jobID.toString(), loc, "jobID");
+-    compare1(user, other.user, loc, "user");
+-
+-    compare1(computonsPerMapInputByte, other.computonsPerMapInputByte, loc,
+-        "computonsPerMapInputByte");
+-    compare1(computonsPerMapOutputByte, other.computonsPerMapOutputByte, loc,
+-        "computonsPerMapOutputByte");
+-    compare1(computonsPerReduceInputByte, other.computonsPerReduceInputByte,
+-        loc, "computonsPerReduceInputByte");
+-    compare1(computonsPerReduceOutputByte, other.computonsPerReduceOutputByte,
+-        loc, "computonsPerReduceOutputByte");
+-
+-    compare1(submitTime, other.submitTime, loc, "submitTime");
+-    compare1(launchTime, other.launchTime, loc, "launchTime");
+-    compare1(finishTime, other.finishTime, loc, "finishTime");
+-
+-    compare1(heapMegabytes, other.heapMegabytes, loc, "heapMegabytes");
+-
+-    compare1(totalMaps, other.totalMaps, loc, "totalMaps");
+-    compare1(totalReduces, other.totalReduces, loc, "totalReduces");
+-
+-    compare1(outcome, other.outcome, loc, "outcome");
+-    compare1(jobtype, other.jobtype, loc, "jobtype");
+-    compare1(priority, other.priority, loc, "priority");
+-
+-    compareStrings(directDependantJobs, other.directDependantJobs, loc,
+-        "directDependantJobs");
+-
+-    compareLoggedTasks(mapTasks, other.mapTasks, loc, "mapTasks");
+-    compareLoggedTasks(reduceTasks, other.reduceTasks, loc, "reduceTasks");
+-    compareLoggedTasks(otherTasks, other.otherTasks, loc, "otherTasks");
+-
+-    compare1(relativeTime, other.relativeTime, loc, "relativeTime");
+-
+-    compareCDFs(successfulMapAttemptCDFs, other.successfulMapAttemptCDFs, loc,
+-        "successfulMapAttemptCDFs");
+-    compareCDFs(failedMapAttemptCDFs, other.failedMapAttemptCDFs, loc,
+-        "failedMapAttemptCDFs");
+-    compare1(successfulReduceAttemptCDF, other.successfulReduceAttemptCDF, loc,
+-        "successfulReduceAttemptCDF", -1);
+-    compare1(failedReduceAttemptCDF, other.failedReduceAttemptCDF, loc,
+-        "failedReduceAttemptCDF", -1);
+-
+-    compare1(mapperTriesToSucceed, other.mapperTriesToSucceed, loc,
+-        "mapperTriesToSucceed");
+-    compare1(failedMapperFraction, other.failedMapperFraction, loc,
+-        "failedMapperFraction");
+-
+-    compare1(queue, other.queue, loc, "queue");
+-    compare1(jobName, other.jobName, loc, "jobName");
+-
+-    compare1(clusterMapMB, other.clusterMapMB, loc, "clusterMapMB");
+-    compare1(clusterReduceMB, other.clusterReduceMB, loc, "clusterReduceMB");
+-    compare1(jobMapMB, other.jobMapMB, loc, "jobMapMB");
+-    compare1(jobReduceMB, other.jobReduceMB, loc, "jobReduceMB");
+-
+-    // compare the job configuration parameters
+-    compareJobProperties(jobProperties, other.getJobProperties(), loc, 
+-                         "JobProperties");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java
+deleted file mode 100644
+index 6d51e4a8651..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java
++++ /dev/null
+@@ -1,140 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.TreeSet;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-import org.apache.hadoop.tools.rumen.datatypes.NodeName;
+-
+-/**
+- * A {@link LoggedLocation} is a representation of a point in an hierarchical
+- * network, represented as a series of membership names, broadest first.
+- * 
+- * For example, if your network has <i>hosts</i> grouped into <i>racks</i>, then
+- * in onecluster you might have a node {@code node1} on rack {@code rack1}. This
+- * would be represented with a ArrayList of two layers, with two {@link String}
+- * s being {@code "rack1"} and {@code "node1"}.
+- * 
+- * The details of this class are set up to meet the requirements of the Jackson
+- * JSON parser/generator.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedLocation implements DeepCompare {
+-   static final Map<List<String>, List<NodeName>> layersCache = 
+-    new HashMap<List<String>, List<NodeName>>();
+-
+-  /**
+-   * The full path from the root of the network to the host.
+-   * 
+-   * NOTE that this assumes that the network topology is a tree.
+-   */
+-  List<NodeName> layers = Collections.emptyList();
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  public List<NodeName> getLayers() {
+-    return layers;
+-  }
+-
+-  void setLayers(List<String> layers) {
+-    if (layers == null || layers.isEmpty()) {
+-      this.layers = Collections.emptyList();
+-    } else {
+-      synchronized (layersCache) {
+-        List<NodeName> found = layersCache.get(layers);
+-        if (found == null) {
+-          // make a copy with interned string.
+-          List<NodeName> clone = new ArrayList<NodeName>(layers.size());
+-          clone.add(new NodeName(layers.get(0).intern(), null)); 
+-          clone.add(new NodeName(null, layers.get(1).intern()));
+-          
+-          // making it read-only as we are sharing them.
+-          List<NodeName> readonlyLayers = Collections.unmodifiableList(clone);
+-          List<String> readonlyLayersKey = Collections.unmodifiableList(layers);
+-          layersCache.put(readonlyLayersKey, readonlyLayers);
+-          this.layers = readonlyLayers;
+-        } else {
+-          this.layers = found;
+-        }
+-      }
+-    }
+-  }
+-
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  // I'll treat this as an atomic object type
+-  private void compareStrings(List<NodeName> c1, List<NodeName> c2, 
+-                              TreePath loc, String eltname) 
+-  throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    TreePath recursePath = new TreePath(loc, eltname);
+-
+-    if (c1 == null || c2 == null || (c1.size() != c2.size())) {
+-      throw new DeepInequalityException(eltname + " miscompared", recursePath);
+-    }
+-    
+-    for (NodeName n1 : c1) {
+-      boolean found = false;
+-      for (NodeName n2 : c2) {
+-        if (n1.getValue().equals(n2.getValue())) {
+-          found = true;
+-          break;
+-        }
+-      }
+-      
+-      if (!found) {
+-        throw new DeepInequalityException(eltname 
+-                  + " miscompared [" + n1.getValue() +"]", recursePath);
+-      }
+-    }
+-  }
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedLocation)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedLocation other = (LoggedLocation) comparand;
+-
+-    compareStrings(layers, other.layers, loc, "layers");
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java
+deleted file mode 100644
+index 5d79a83c343..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java
++++ /dev/null
+@@ -1,177 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Serializable;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.TreeSet;
+-import java.util.ArrayList;
+-import java.util.Comparator;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-import org.apache.hadoop.tools.rumen.datatypes.NodeName;
+-
+-/**
+- * A {@link LoggedNetworkTopology} represents a tree that in turn represents a
+- * hierarchy of hosts. The current version requires the tree to have all leaves
+- * at the same level.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedNetworkTopology implements DeepCompare {
+-  NodeName name;
+-  List<LoggedNetworkTopology> children = new ArrayList<LoggedNetworkTopology>();
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  public LoggedNetworkTopology() {
+-    super();
+-  }
+-
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  /**
+-   * We need this because we have to sort the {@code children} field. That field
+-   * is set-valued, but if we sort these fields we ensure that comparisons won't
+-   * bogusly fail because the hash table happened to enumerate in a different
+-   * order.
+-   * 
+-   */
+-  static class TopoSort implements Comparator<LoggedNetworkTopology>, 
+-  Serializable {
+-    public int compare(LoggedNetworkTopology t1, LoggedNetworkTopology t2) {
+-      return t1.name.getValue().compareTo(t2.name.getValue());
+-    }
+-  }
+-
+-  /**
+-   * @param hosts
+-   *          a HashSet of the {@link ParsedHost}
+-   * @param name
+-   *          the name of this level's host [for recursive descent]
+-   * @param level
+-   *          the level number
+-   */
+-  LoggedNetworkTopology(Set<ParsedHost> hosts, String name, int level) {
+-    if (name == null) {
+-      this.name = NodeName.ROOT;
+-    } else {
+-      this.name = new NodeName(name);
+-    }
+-    this.children = null;
+-
+-    if (level < ParsedHost.numberOfDistances() - 1) {
+-      HashMap<String, HashSet<ParsedHost>> topologies =
+-          new HashMap<String, HashSet<ParsedHost>>();
+-
+-      Iterator<ParsedHost> iter = hosts.iterator();
+-
+-      while (iter.hasNext()) {
+-        ParsedHost host = iter.next();
+-
+-        String thisComponent = host.nameComponent(level);
+-
+-        HashSet<ParsedHost> thisSet = topologies.get(thisComponent);
+-
+-        if (thisSet == null) {
+-          thisSet = new HashSet<ParsedHost>();
+-          topologies.put(thisComponent, thisSet);
+-        }
+-
+-        thisSet.add(host);
+-      }
+-
+-      children = new ArrayList<LoggedNetworkTopology>();
+-
+-      for (Map.Entry<String, HashSet<ParsedHost>> ent : topologies.entrySet()) {
+-        children.add(new LoggedNetworkTopology(ent.getValue(), ent.getKey(),
+-            level + 1));
+-      }
+-    } else {
+-      // nothing to do here
+-    }
+-  }
+-
+-  LoggedNetworkTopology(Set<ParsedHost> hosts) {
+-    this(hosts, null, 0);
+-  }
+-
+-  public NodeName getName() {
+-    return name;
+-  }
+-
+-  void setName(String name) {
+-    this.name = new NodeName(name);
+-  }
+-
+-  public List<LoggedNetworkTopology> getChildren() {
+-    return children;
+-  }
+-
+-  void setChildren(List<LoggedNetworkTopology> children) {
+-    this.children = children;
+-  }
+-
+-  private void compare1(List<LoggedNetworkTopology> c1,
+-      List<LoggedNetworkTopology> c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    Collections.sort(c1, new TopoSort());
+-    Collections.sort(c2, new TopoSort());
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedNetworkTopology)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedNetworkTopology other = (LoggedNetworkTopology) comparand;
+-
+-    compare1(children, other.children, loc, "children");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java
+deleted file mode 100644
+index d9be325b2f4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-
+-import java.util.Set;
+-import java.util.TreeSet;
+-
+-/**
+- * A {@link LoggedSingleRelativeRanking} represents an X-Y coordinate of a
+- * single point in a discrete CDF.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedSingleRelativeRanking implements DeepCompare {
+-  /**
+-   * The Y coordinate, as a fraction {@code ( 0.0D, 1.0D )}. The default value
+-   * is there to mark an unfilled-in value.
+-   */
+-  double relativeRanking = -1.0D;
+-  /**
+-   * The X coordinate
+-   */
+-  long datum = -1L;
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  @SuppressWarnings("unused")
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  public double getRelativeRanking() {
+-    return relativeRanking;
+-  }
+-
+-  void setRelativeRanking(double relativeRanking) {
+-    this.relativeRanking = relativeRanking;
+-  }
+-
+-  public long getDatum() {
+-    return datum;
+-  }
+-
+-  void setDatum(long datum) {
+-    this.datum = datum;
+-  }
+-
+-  private void compare1(long c1, long c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(double c1, double c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedSingleRelativeRanking)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedSingleRelativeRanking other = (LoggedSingleRelativeRanking) comparand;
+-
+-    compare1(relativeRanking, other.relativeRanking, loc, "relativeRanking");
+-    compare1(datum, other.datum, loc, "datum");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
+deleted file mode 100644
+index 4ae33a76617..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
++++ /dev/null
+@@ -1,372 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.TreeSet;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-import org.apache.hadoop.mapreduce.TaskID;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounter;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounterGroup;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounters;
+-
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * A {@link LoggedTask} represents a [hadoop] task that is part of a hadoop job.
+- * It knows about the [pssibly empty] sequence of attempts, its I/O footprint,
+- * and its runtime.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedTask implements DeepCompare {
+-  long inputBytes = -1L;
+-  long inputRecords = -1L;
+-  long outputBytes = -1L;
+-  long outputRecords = -1L;
+-  TaskID taskID;
+-  long startTime = -1L;
+-  long finishTime = -1L;
+-  Pre21JobHistoryConstants.Values taskType;
+-  Pre21JobHistoryConstants.Values taskStatus;
+-  List<LoggedTaskAttempt> attempts = new ArrayList<LoggedTaskAttempt>();
+-  List<LoggedLocation> preferredLocations = Collections.emptyList();
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  LoggedTask() {
+-    super();
+-  }
+-
+-  void adjustTimes(long adjustment) {
+-    startTime += adjustment;
+-    finishTime += adjustment;
+-
+-    for (LoggedTaskAttempt attempt : attempts) {
+-      attempt.adjustTimes(adjustment);
+-    }
+-  }
+-
+-  public long getInputBytes() {
+-    return inputBytes;
+-  }
+-
+-  void setInputBytes(long inputBytes) {
+-    this.inputBytes = inputBytes;
+-  }
+-
+-  public long getInputRecords() {
+-    return inputRecords;
+-  }
+-
+-  void setInputRecords(long inputRecords) {
+-    this.inputRecords = inputRecords;
+-  }
+-
+-  public long getOutputBytes() {
+-    return outputBytes;
+-  }
+-
+-  void setOutputBytes(long outputBytes) {
+-    this.outputBytes = outputBytes;
+-  }
+-
+-  public long getOutputRecords() {
+-    return outputRecords;
+-  }
+-
+-  void setOutputRecords(long outputRecords) {
+-    this.outputRecords = outputRecords;
+-  }
+-
+-  public TaskID getTaskID() {
+-    return taskID;
+-  }
+-
+-  void setTaskID(String taskID) {
+-    this.taskID = TaskID.forName(taskID);
+-  }
+-
+-  public long getStartTime() {
+-    return startTime;
+-  }
+-
+-  void setStartTime(long startTime) {
+-    this.startTime = startTime;
+-  }
+-
+-  public long getFinishTime() {
+-    return finishTime;
+-  }
+-
+-  void setFinishTime(long finishTime) {
+-    this.finishTime = finishTime;
+-  }
+-
+-  public List<LoggedTaskAttempt> getAttempts() {
+-    return attempts;
+-  }
+-
+-  void setAttempts(List<LoggedTaskAttempt> attempts) {
+-    if (attempts == null) {
+-      this.attempts = new ArrayList<LoggedTaskAttempt>();
+-    } else {
+-      this.attempts = attempts;
+-    }
+-  }
+-
+-  public List<LoggedLocation> getPreferredLocations() {
+-    return preferredLocations;
+-  }
+-
+-  void setPreferredLocations(List<LoggedLocation> preferredLocations) {
+-    if (preferredLocations == null || preferredLocations.isEmpty()) {
+-      this.preferredLocations = Collections.emptyList();
+-    } else {
+-      this.preferredLocations = preferredLocations;
+-    }
+-  }
+-
+-  public Pre21JobHistoryConstants.Values getTaskStatus() {
+-    return taskStatus;
+-  }
+-
+-  void setTaskStatus(Pre21JobHistoryConstants.Values taskStatus) {
+-    this.taskStatus = taskStatus;
+-  }
+-
+-  public Pre21JobHistoryConstants.Values getTaskType() {
+-    return taskType;
+-  }
+-
+-  void setTaskType(Pre21JobHistoryConstants.Values taskType) {
+-    this.taskType = taskType;
+-  }
+-
+-  private void incorporateMapCounters(JhCounters counters) {
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.inputBytes = val;
+-      }
+-    }, counters, "HDFS_BYTES_READ");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.outputBytes = val;
+-      }
+-    }, counters, "FILE_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.inputRecords = val;
+-      }
+-    }, counters, "MAP_INPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.outputRecords = val;
+-      }
+-    }, counters, "MAP_OUTPUT_RECORDS");
+-  }
+-
+-  private void incorporateReduceCounters(JhCounters counters) {
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.inputBytes = val;
+-      }
+-    }, counters, "REDUCE_SHUFFLE_BYTES");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.outputBytes = val;
+-      }
+-    }, counters, "HDFS_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.inputRecords = val;
+-      }
+-    }, counters, "REDUCE_INPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        task.outputRecords = val;
+-      }
+-    }, counters, "REDUCE_OUTPUT_RECORDS");
+-  }
+-
+-  // incorporate event counters
+-  // LoggedTask MUST KNOW ITS TYPE BEFORE THIS CALL
+-  public void incorporateCounters(JhCounters counters) {
+-    switch (taskType) {
+-    case MAP:
+-      incorporateMapCounters(counters);
+-      return;
+-    case REDUCE:
+-      incorporateReduceCounters(counters);
+-      return;
+-      // NOT exhaustive
+-    }
+-  }
+-
+-  private static String canonicalizeCounterName(String nonCanonicalName) {
+-    String result = StringUtils.toLowerCase(nonCanonicalName);
+-
+-    result = result.replace(' ', '|');
+-    result = result.replace('-', '|');
+-    result = result.replace('_', '|');
+-    result = result.replace('.', '|');
+-
+-    return result;
+-  }
+-
+-  private abstract class SetField {
+-    LoggedTask task;
+-
+-    SetField(LoggedTask task) {
+-      this.task = task;
+-    }
+-
+-    abstract void set(long value);
+-  }
+-
+-  private static void incorporateCounter(SetField thunk, JhCounters counters,
+-      String counterName) {
+-    counterName = canonicalizeCounterName(counterName);
+-
+-    for (JhCounterGroup group : counters.groups) {
+-      for (JhCounter counter : group.counts) {
+-        if (counterName
+-            .equals(canonicalizeCounterName(counter.name.toString()))) {
+-          thunk.set(counter.value);
+-          return;
+-        }
+-      }
+-    }
+-  }
+-
+-  private void compare1(long c1, long c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(String c1, String c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-    if (c1 == null || c2 == null || !c1.equals(c2)) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(Pre21JobHistoryConstants.Values c1,
+-      Pre21JobHistoryConstants.Values c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-    if (c1 == null || c2 == null || !c1.equals(c2)) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compareLoggedLocations(List<LoggedLocation> c1,
+-      List<LoggedLocation> c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  private void compareLoggedTaskAttempts(List<LoggedTaskAttempt> c1,
+-      List<LoggedTaskAttempt> c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      c1.get(i).deepCompare(c2.get(i), new TreePath(loc, eltname, i));
+-    }
+-  }
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedTask)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedTask other = (LoggedTask) comparand;
+-
+-    compare1(inputBytes, other.inputBytes, loc, "inputBytes");
+-    compare1(inputRecords, other.inputRecords, loc, "inputRecords");
+-    compare1(outputBytes, other.outputBytes, loc, "outputBytes");
+-    compare1(outputRecords, other.outputRecords, loc, "outputRecords");
+-
+-    compare1(taskID.toString(), other.taskID.toString(), loc, "taskID");
+-
+-    compare1(startTime, other.startTime, loc, "startTime");
+-    compare1(finishTime, other.finishTime, loc, "finishTime");
+-
+-    compare1(taskType, other.taskType, loc, "taskType");
+-    compare1(taskStatus, other.taskStatus, loc, "taskStatus");
+-
+-    compareLoggedTaskAttempts(attempts, other.attempts, loc, "attempts");
+-    compareLoggedLocations(preferredLocations, other.preferredLocations, loc,
+-        "preferredLocations");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
+deleted file mode 100644
+index 5c6abd372c0..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
++++ /dev/null
+@@ -1,772 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.TreeSet;
+-
+-import com.fasterxml.jackson.annotation.JsonAnySetter;
+-import org.apache.hadoop.util.StringUtils;
+-
+-// HACK ALERT!!!  This "should" have have two subclasses, which might be called
+-//                LoggedMapTaskAttempt and LoggedReduceTaskAttempt, but 
+-//                the Jackson implementation of JSON doesn't handle a 
+-//                superclass-valued field.
+-
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounter;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounterGroup;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounters;
+-import org.apache.hadoop.tools.rumen.datatypes.NodeName;
+-
+-/**
+- * A {@link LoggedTaskAttempt} represents an attempt to run an hadoop task in a
+- * hadoop job. Note that a task can have several attempts.
+- * 
+- * All of the public methods are simply accessors for the instance variables we
+- * want to write out in the JSON files.
+- * 
+- */
+-public class LoggedTaskAttempt implements DeepCompare {
+-
+-  TaskAttemptID attemptID;
+-  Pre21JobHistoryConstants.Values result;
+-  long startTime = -1L;
+-  long finishTime = -1L;
+-  NodeName hostName;
+-
+-  long hdfsBytesRead = -1L;
+-  long hdfsBytesWritten = -1L;
+-  long fileBytesRead = -1L;
+-  long fileBytesWritten = -1L;
+-  long mapInputRecords = -1L;
+-  long mapInputBytes = -1L;
+-  long mapOutputBytes = -1L;
+-  long mapOutputRecords = -1L;
+-  long combineInputRecords = -1L;
+-  long reduceInputGroups = -1L;
+-  long reduceInputRecords = -1L;
+-  long reduceShuffleBytes = -1L;
+-  long reduceOutputRecords = -1L;
+-  long spilledRecords = -1L;
+-
+-  long shuffleFinished = -1L;
+-  long sortFinished = -1L;
+-
+-  LoggedLocation location;
+-
+-  // Initialize to default object for backward compatibility
+-  ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-  
+-  List<Integer> clockSplits = new ArrayList<Integer>();
+-  List<Integer> cpuUsages = new ArrayList<Integer>();
+-  List<Integer> vMemKbytes = new ArrayList<Integer>();
+-  List<Integer> physMemKbytes = new ArrayList<Integer>();
+-
+-  LoggedTaskAttempt() {
+-    super();
+-  }
+-
+-  // carries the kinds of splits vectors a LoggedTaskAttempt holds.
+-  //
+-  // Each enumeral has the following methods:
+-  //   get(LoggedTaskAttempt attempt)
+-  //    returns a List<Integer> with the corresponding value field
+-  //   set(LoggedTaskAttempt attempt, List<Integer> newValue)
+-  //    sets the value
+-  // There is also a pair of methods get(List<List<Integer>>) and
+-  //  set(List<List<Integer>>, List<Integer>) which correspondingly
+-  //  delivers or sets the appropriate element of the
+-  //  List<List<Integer>> .
+-  // This makes it easier to add another kind in the future.
+-  public enum SplitVectorKind {
+-
+-    WALLCLOCK_TIME {
+-      @Override
+-      public List<Integer> get(LoggedTaskAttempt attempt) {
+-        return attempt.getClockSplits();
+-      }
+-      @Override
+-      public void set(LoggedTaskAttempt attempt, List<Integer> newValue) {
+-        attempt.setClockSplits(newValue);
+-      }
+-    },
+-
+-    CPU_USAGE {
+-      @Override
+-      public List<Integer> get(LoggedTaskAttempt attempt) {
+-        return attempt.getCpuUsages();
+-      }
+-      @Override
+-      public void set(LoggedTaskAttempt attempt, List<Integer> newValue) {
+-        attempt.setCpuUsages(newValue);
+-      }
+-    },
+-
+-    VIRTUAL_MEMORY_KBYTES {
+-      @Override
+-      public List<Integer> get(LoggedTaskAttempt attempt) {
+-        return attempt.getVMemKbytes();
+-      }
+-      @Override
+-      public void set(LoggedTaskAttempt attempt, List<Integer> newValue) {
+-        attempt.setVMemKbytes(newValue);
+-      }
+-    },
+-
+-    PHYSICAL_MEMORY_KBYTES {
+-      @Override
+-      public List<Integer> get(LoggedTaskAttempt attempt) {
+-        return attempt.getPhysMemKbytes();
+-      }
+-      @Override
+-      public void set(LoggedTaskAttempt attempt, List<Integer> newValue) {
+-        attempt.setPhysMemKbytes(newValue);
+-      }
+-    };
+-
+-    static private final List<List<Integer>> NULL_SPLITS_VECTOR
+-      = new ArrayList<List<Integer>>();
+-
+-    static {
+-      for (SplitVectorKind kind : SplitVectorKind.values() ) {
+-        NULL_SPLITS_VECTOR.add(new ArrayList<Integer>());
+-      }
+-    }
+-
+-    abstract public List<Integer> get(LoggedTaskAttempt attempt);
+-
+-    abstract public void set(LoggedTaskAttempt attempt, List<Integer> newValue);
+-
+-    public List<Integer> get(List<List<Integer>> listSplits) {
+-      return listSplits.get(this.ordinal());
+-    }
+-
+-    public void set(List<List<Integer>> listSplits, List<Integer> newValue) {
+-      listSplits.set(this.ordinal(), newValue);
+-    }
+-
+-    static public List<List<Integer>> getNullSplitsVector() {
+-      return NULL_SPLITS_VECTOR;
+-    }
+-  }
+-
+-  /**
+-   *
+-   * @return a list of all splits vectors, ordered in enumeral order
+-   *           within {@link SplitVectorKind} .  Do NOT use hard-coded
+-   *           indices within the return for this with a hard-coded
+-   *           index to get individual values; use
+-   *           {@code SplitVectorKind.get(LoggedTaskAttempt)} instead.
+-   */
+-  public List<List<Integer>> allSplitVectors() {
+-    List<List<Integer>> result
+-      = new ArrayList<List<Integer>>(SplitVectorKind.values().length);
+-
+-    for (SplitVectorKind kind : SplitVectorKind.values() ) {
+-      result.add(kind.get(this));
+-    }
+-
+-    return result;
+-  }
+-
+-  static private Set<String> alreadySeenAnySetterAttributes =
+-      new TreeSet<String>();
+-
+-  // for input parameter ignored.
+-  @JsonAnySetter
+-  public void setUnknownAttribute(String attributeName, Object ignored) {
+-    if (!alreadySeenAnySetterAttributes.contains(attributeName)) {
+-      alreadySeenAnySetterAttributes.add(attributeName);
+-      System.err.println("In LoggedJob, we saw the unknown attribute "
+-          + attributeName + ".");
+-    }
+-  }
+-
+-  public List<Integer> getClockSplits() {
+-    return clockSplits;
+-  }
+-
+-  void setClockSplits(List<Integer> clockSplits) {
+-    this.clockSplits = clockSplits;
+-  }
+-
+-  void arraySetClockSplits(int[] clockSplits) {
+-    List<Integer> result = new ArrayList<Integer>();
+-
+-    for (int i = 0; i < clockSplits.length; ++i) {
+-      result.add(clockSplits[i]);
+-    }
+-
+-    this.clockSplits = result;
+-  }
+-
+-  public List<Integer> getCpuUsages() {
+-    return cpuUsages;
+-  }
+-
+-  void setCpuUsages(List<Integer> cpuUsages) {
+-    this.cpuUsages = cpuUsages;
+-  }
+-
+-  void arraySetCpuUsages(int[] cpuUsages) {
+-    List<Integer> result = new ArrayList<Integer>();
+-
+-    for (int i = 0; i < cpuUsages.length; ++i) {
+-      result.add(cpuUsages[i]);
+-    }
+-
+-    this.cpuUsages = result;
+-  }
+-
+-  public List<Integer> getVMemKbytes() {
+-    return vMemKbytes;
+-  }
+-
+-  void setVMemKbytes(List<Integer> vMemKbytes) {
+-    this.vMemKbytes = vMemKbytes;
+-  }
+-
+-  void arraySetVMemKbytes(int[] vMemKbytes) {
+-    List<Integer> result = new ArrayList<Integer>();
+-
+-    for (int i = 0; i < vMemKbytes.length; ++i) {
+-      result.add(vMemKbytes[i]);
+-    }
+-
+-    this.vMemKbytes = result;
+-  }
+-
+-  public List<Integer> getPhysMemKbytes() {
+-    return physMemKbytes;
+-  }
+-
+-  void setPhysMemKbytes(List<Integer> physMemKbytes) {
+-    this.physMemKbytes = physMemKbytes;
+-  }
+-
+-  void arraySetPhysMemKbytes(int[] physMemKbytes) {
+-    List<Integer> result = new ArrayList<Integer>();
+-
+-    for (int i = 0; i < physMemKbytes.length; ++i) {
+-      result.add(physMemKbytes[i]);
+-    }
+-
+-    this.physMemKbytes = result;
+-  }
+-
+-  void adjustTimes(long adjustment) {
+-    startTime += adjustment;
+-    finishTime += adjustment;
+-
+-    // For reduce attempts, adjust the different phases' finish times also 
+-    if (sortFinished >= 0) {
+-      shuffleFinished += adjustment;
+-      sortFinished += adjustment;
+-    }
+-  }
+-
+-  public long getShuffleFinished() {
+-    return shuffleFinished;
+-  }
+-
+-  void setShuffleFinished(long shuffleFinished) {
+-    this.shuffleFinished = shuffleFinished;
+-  }
+-
+-  public long getSortFinished() {
+-    return sortFinished;
+-  }
+-
+-  void setSortFinished(long sortFinished) {
+-    this.sortFinished = sortFinished;
+-  }
+-
+-  public TaskAttemptID getAttemptID() {
+-    return attemptID;
+-  }
+-
+-  void setAttemptID(String attemptID) {
+-    this.attemptID = TaskAttemptID.forName(attemptID);
+-  }
+-
+-  public Pre21JobHistoryConstants.Values getResult() {
+-    return result;
+-  }
+-
+-  void setResult(Pre21JobHistoryConstants.Values result) {
+-    this.result = result;
+-  }
+-
+-  public long getStartTime() {
+-    return startTime;
+-  }
+-
+-  void setStartTime(long startTime) {
+-    this.startTime = startTime;
+-  }
+-
+-  public long getFinishTime() {
+-    return finishTime;
+-  }
+-
+-  void setFinishTime(long finishTime) {
+-    this.finishTime = finishTime;
+-  }
+-
+-  public NodeName getHostName() {
+-    return hostName;
+-  }
+-
+-  // This is needed for JSON deserialization
+-  void setHostName(String hostName) {
+-    this.hostName = hostName == null ? null : new NodeName(hostName);
+-  }
+-
+-  // In job-history, hostName is saved in the format rackName/NodeName
+-  //TODO this is a hack! The '/' handling needs fixing.
+-  void setHostName(String hostName, String rackName) {
+-    if (hostName == null || hostName.length() == 0) {
+-      throw new RuntimeException("Invalid entry! Missing hostname");
+-    } else if (rackName == null || rackName.length() == 0) {
+-      setHostName(hostName);
+-    } else {
+-      // make sure that the rackname is prefixed with a '/'
+-      if (!rackName.startsWith("/")) {
+-        rackName = "/" + rackName;
+-      }
+-      // make sure that the hostname is prefixed with a '/'
+-      if (!hostName.startsWith("/")) {
+-        hostName = "/" + hostName;
+-      }
+-      setHostName(rackName.intern() + hostName.intern());
+-    }
+-  }
+-
+-  public long getHdfsBytesRead() {
+-    return hdfsBytesRead;
+-  }
+-
+-  void setHdfsBytesRead(long hdfsBytesRead) {
+-    this.hdfsBytesRead = hdfsBytesRead;
+-  }
+-
+-  public long getHdfsBytesWritten() {
+-    return hdfsBytesWritten;
+-  }
+-
+-  void setHdfsBytesWritten(long hdfsBytesWritten) {
+-    this.hdfsBytesWritten = hdfsBytesWritten;
+-  }
+-
+-  public long getFileBytesRead() {
+-    return fileBytesRead;
+-  }
+-
+-  void setFileBytesRead(long fileBytesRead) {
+-    this.fileBytesRead = fileBytesRead;
+-  }
+-
+-  public long getFileBytesWritten() {
+-    return fileBytesWritten;
+-  }
+-
+-  void setFileBytesWritten(long fileBytesWritten) {
+-    this.fileBytesWritten = fileBytesWritten;
+-  }
+-
+-  public long getMapInputRecords() {
+-    return mapInputRecords;
+-  }
+-
+-  void setMapInputRecords(long mapInputRecords) {
+-    this.mapInputRecords = mapInputRecords;
+-  }
+-
+-  public long getMapOutputBytes() {
+-    return mapOutputBytes;
+-  }
+-
+-  void setMapOutputBytes(long mapOutputBytes) {
+-    this.mapOutputBytes = mapOutputBytes;
+-  }
+-
+-  public long getMapOutputRecords() {
+-    return mapOutputRecords;
+-  }
+-
+-  void setMapOutputRecords(long mapOutputRecords) {
+-    this.mapOutputRecords = mapOutputRecords;
+-  }
+-
+-  public long getCombineInputRecords() {
+-    return combineInputRecords;
+-  }
+-
+-  void setCombineInputRecords(long combineInputRecords) {
+-    this.combineInputRecords = combineInputRecords;
+-  }
+-
+-  public long getReduceInputGroups() {
+-    return reduceInputGroups;
+-  }
+-
+-  void setReduceInputGroups(long reduceInputGroups) {
+-    this.reduceInputGroups = reduceInputGroups;
+-  }
+-
+-  public long getReduceInputRecords() {
+-    return reduceInputRecords;
+-  }
+-
+-  void setReduceInputRecords(long reduceInputRecords) {
+-    this.reduceInputRecords = reduceInputRecords;
+-  }
+-
+-  public long getReduceShuffleBytes() {
+-    return reduceShuffleBytes;
+-  }
+-
+-  void setReduceShuffleBytes(long reduceShuffleBytes) {
+-    this.reduceShuffleBytes = reduceShuffleBytes;
+-  }
+-
+-  public long getReduceOutputRecords() {
+-    return reduceOutputRecords;
+-  }
+-
+-  void setReduceOutputRecords(long reduceOutputRecords) {
+-    this.reduceOutputRecords = reduceOutputRecords;
+-  }
+-
+-  public long getSpilledRecords() {
+-    return spilledRecords;
+-  }
+-
+-  void setSpilledRecords(long spilledRecords) {
+-    this.spilledRecords = spilledRecords;
+-  }
+-
+-  public LoggedLocation getLocation() {
+-    return location;
+-  }
+-
+-  void setLocation(LoggedLocation location) {
+-    this.location = location;
+-  }
+-
+-  public long getMapInputBytes() {
+-    return mapInputBytes;
+-  }
+-
+-  void setMapInputBytes(long mapInputBytes) {
+-    this.mapInputBytes = mapInputBytes;
+-  }
+-
+-  // incorporate event counters
+-  public void incorporateCounters(JhCounters counters) {
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.hdfsBytesRead = val;
+-      }
+-    }, counters, "HDFS_BYTES_READ");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.hdfsBytesWritten = val;
+-      }
+-    }, counters, "HDFS_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.fileBytesRead = val;
+-      }
+-    }, counters, "FILE_BYTES_READ");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.fileBytesWritten = val;
+-      }
+-    }, counters, "FILE_BYTES_WRITTEN");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapInputBytes = val;
+-      }
+-    }, counters, "MAP_INPUT_BYTES");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapInputRecords = val;
+-      }
+-    }, counters, "MAP_INPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapOutputBytes = val;
+-      }
+-    }, counters, "MAP_OUTPUT_BYTES");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.mapOutputRecords = val;
+-      }
+-    }, counters, "MAP_OUTPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.combineInputRecords = val;
+-      }
+-    }, counters, "COMBINE_INPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceInputGroups = val;
+-      }
+-    }, counters, "REDUCE_INPUT_GROUPS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceInputRecords = val;
+-      }
+-    }, counters, "REDUCE_INPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceShuffleBytes = val;
+-      }
+-    }, counters, "REDUCE_SHUFFLE_BYTES");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.reduceOutputRecords = val;
+-      }
+-    }, counters, "REDUCE_OUTPUT_RECORDS");
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        attempt.spilledRecords = val;
+-      }
+-    }, counters, "SPILLED_RECORDS");
+-    
+-    // incorporate CPU usage
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        metrics.setCumulativeCpuUsage(val);
+-      }
+-    }, counters, "CPU_MILLISECONDS");
+-    
+-    // incorporate virtual memory usage
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        metrics.setVirtualMemoryUsage(val);
+-      }
+-    }, counters, "VIRTUAL_MEMORY_BYTES");
+-    
+-    // incorporate physical memory usage
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        metrics.setPhysicalMemoryUsage(val);
+-      }
+-    }, counters, "PHYSICAL_MEMORY_BYTES");
+-    
+-    // incorporate heap usage
+-    incorporateCounter(new SetField(this) {
+-      @Override
+-      void set(long val) {
+-        metrics.setHeapUsage(val);
+-      }
+-    }, counters, "COMMITTED_HEAP_BYTES");
+-  }
+-
+-  // Get the resource usage metrics
+-  public ResourceUsageMetrics getResourceUsageMetrics() {
+-    return metrics;
+-  }
+-  
+-  // Set the resource usage metrics
+-  void setResourceUsageMetrics(ResourceUsageMetrics metrics) {
+-    this.metrics = metrics;
+-  }
+-  
+-  private static String canonicalizeCounterName(String nonCanonicalName) {
+-    String result = StringUtils.toLowerCase(nonCanonicalName);
+-
+-    result = result.replace(' ', '|');
+-    result = result.replace('-', '|');
+-    result = result.replace('_', '|');
+-    result = result.replace('.', '|');
+-
+-    return result;
+-  }
+-
+-  private abstract class SetField {
+-    LoggedTaskAttempt attempt;
+-
+-    SetField(LoggedTaskAttempt attempt) {
+-      this.attempt = attempt;
+-    }
+-
+-    abstract void set(long value);
+-  }
+-
+-  private static void incorporateCounter(SetField thunk, JhCounters counters,
+-      String counterName) {
+-    counterName = canonicalizeCounterName(counterName);
+-
+-    for (JhCounterGroup group : counters.groups) {
+-      for (JhCounter counter : group.counts) {
+-        if (counterName
+-            .equals(canonicalizeCounterName(counter.name.toString()))) {
+-          thunk.set(counter.value);
+-          return;
+-        }
+-      }
+-    }
+-  }
+-
+-  private void compare1(String c1, String c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || !c1.equals(c2)) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(NodeName c1, NodeName c2, TreePath loc, String eltname)
+-  throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-
+-    compare1(c1.getValue(), c2.getValue(), new TreePath(loc, eltname), "value");
+-  }
+-
+-  private void compare1(long c1, long c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(Pre21JobHistoryConstants.Values c1,
+-      Pre21JobHistoryConstants.Values c2, TreePath loc, String eltname)
+-      throws DeepInequalityException {
+-    if (c1 != c2) {
+-      throw new DeepInequalityException(eltname + " miscompared", new TreePath(
+-          loc, eltname));
+-    }
+-  }
+-
+-  private void compare1(LoggedLocation c1, LoggedLocation c2, TreePath loc,
+-      String eltname) throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    TreePath recurse = new TreePath(loc, eltname);
+-
+-    if (c1 == null || c2 == null) {
+-      throw new DeepInequalityException(eltname + " miscompared", recurse);
+-    }
+-
+-    c1.deepCompare(c2, recurse);
+-  }
+-
+-  private void compare1(List<Integer> c1, List<Integer> c2, TreePath loc,
+-                        String eltname)
+-        throws DeepInequalityException {
+-    if (c1 == null && c2 == null) {
+-      return;
+-    }
+-
+-    if (c1 == null || c2 == null || c1.size() != c2.size()) {
+-      throw new DeepInequalityException
+-              (eltname + " miscompared", new TreePath(loc, eltname));
+-    }
+-
+-    for (int i = 0; i < c1.size(); ++i) {
+-      if (!c1.get(i).equals(c2.get(i))) {
+-        throw new DeepInequalityException("" + c1.get(i) + " != " + c2.get(i),
+-                                          new TreePath(loc, eltname, i));
+-      }
+-    }
+-  }    
+-
+-  public void deepCompare(DeepCompare comparand, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(comparand instanceof LoggedTaskAttempt)) {
+-      throw new DeepInequalityException("comparand has wrong type", loc);
+-    }
+-
+-    LoggedTaskAttempt other = (LoggedTaskAttempt) comparand;
+-
+-    compare1(attemptID.toString(), other.attemptID.toString(), loc, "attemptID");
+-    compare1(result, other.result, loc, "result");
+-    compare1(startTime, other.startTime, loc, "startTime");
+-    compare1(finishTime, other.finishTime, loc, "finishTime");
+-    compare1(hostName, other.hostName, loc, "hostName");
+-
+-    compare1(hdfsBytesRead, other.hdfsBytesRead, loc, "hdfsBytesRead");
+-    compare1(hdfsBytesWritten, other.hdfsBytesWritten, loc, "hdfsBytesWritten");
+-    compare1(fileBytesRead, other.fileBytesRead, loc, "fileBytesRead");
+-    compare1(fileBytesWritten, other.fileBytesWritten, loc, "fileBytesWritten");
+-    compare1(mapInputBytes, other.mapInputBytes, loc, "mapInputBytes");
+-    compare1(mapInputRecords, other.mapInputRecords, loc, "mapInputRecords");
+-    compare1(mapOutputBytes, other.mapOutputBytes, loc, "mapOutputBytes");
+-    compare1(mapOutputRecords, other.mapOutputRecords, loc, "mapOutputRecords");
+-    compare1(combineInputRecords, other.combineInputRecords, loc,
+-        "combineInputRecords");
+-    compare1(reduceInputGroups, other.reduceInputGroups, loc,
+-        "reduceInputGroups");
+-    compare1(reduceInputRecords, other.reduceInputRecords, loc,
+-        "reduceInputRecords");
+-    compare1(reduceShuffleBytes, other.reduceShuffleBytes, loc,
+-        "reduceShuffleBytes");
+-    compare1(reduceOutputRecords, other.reduceOutputRecords, loc,
+-        "reduceOutputRecords");
+-    compare1(spilledRecords, other.spilledRecords, loc, "spilledRecords");
+-
+-    compare1(shuffleFinished, other.shuffleFinished, loc, "shuffleFinished");
+-    compare1(sortFinished, other.sortFinished, loc, "sortFinished");
+-
+-    compare1(location, other.location, loc, "location");
+-
+-    compare1(clockSplits, other.clockSplits, loc, "clockSplits");
+-    compare1(cpuUsages, other.cpuUsages, loc, "cpuUsages");
+-    compare1(vMemKbytes, other.vMemKbytes, loc, "vMemKbytes");
+-    compare1(physMemKbytes, other.physMemKbytes, loc, "physMemKbytes");
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java
+deleted file mode 100644
+index b86de74a705..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java
++++ /dev/null
+@@ -1,205 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-/**
+- * {@link MachineNode} represents the configuration of a cluster node.
+- * {@link MachineNode} should be constructed by {@link MachineNode.Builder}.
+- */
+-public final class MachineNode extends Node {
+-  long memory = -1; // in KB
+-  int mapSlots = 1;
+-  int reduceSlots = 1;
+-  long memoryPerMapSlot = -1; // in KB
+-  long memoryPerReduceSlot = -1; // in KB
+-  int numCores = 1;
+-  
+-  MachineNode(String name, int level) {
+-    super(name, level);
+-  }
+-  
+-  @Override
+-  public boolean equals(Object obj) {
+-    // name/level sufficient
+-    return super.equals(obj);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    // match equals
+-    return super.hashCode();
+-  }
+-
+-  /**
+-   * Get the available physical RAM of the node.
+-   * @return The available physical RAM of the node, in KB.
+-   */
+-  public long getMemory() {
+-    return memory;
+-  }
+-  
+-  /**
+-   * Get the number of map slots of the node.
+-   * @return The number of map slots of the node.
+-   */
+-  public int getMapSlots() {
+-    return mapSlots;
+-  }
+-  
+-  /**
+-   * Get the number of reduce slots of the node.
+-   * @return The number of reduce slots fo the node.
+-   */
+-  public int getReduceSlots() {
+-    return reduceSlots;
+-  }
+-  
+-  /**
+-   * Get the amount of RAM reserved for each map slot.
+-   * @return the amount of RAM reserved for each map slot, in KB.
+-   */
+-  public long getMemoryPerMapSlot() {
+-    return memoryPerMapSlot;
+-  }
+-
+-  /**
+-   * Get the amount of RAM reserved for each reduce slot.
+-   * @return the amount of RAM reserved for each reduce slot, in KB.
+-   */
+-  public long getMemoryPerReduceSlot() {
+-    return memoryPerReduceSlot;
+-  }
+-  
+-  /**
+-   * Get the number of cores of the node.
+-   * @return the number of cores of the node.
+-   */
+-  public int getNumCores() {
+-    return numCores;
+-  }
+-
+-  /**
+-   * Get the rack node that the machine belongs to.
+-   * 
+-   * @return The rack node that the machine belongs to. Returns null if the
+-   *         machine does not belong to any rack.
+-   */
+-  public RackNode getRackNode() {
+-    return (RackNode)getParent();
+-  }
+-  
+-  @Override
+-  public synchronized boolean addChild(Node child) {
+-    throw new IllegalStateException("Cannot add child to MachineNode");
+-  }
+-
+-  /**
+-   * Builder for a NodeInfo object
+-   */
+-  public static final class Builder {
+-    private MachineNode node;
+-    
+-    /**
+-     * Start building a new NodeInfo object.
+-     * @param name
+-     *          Unique name of the node. Typically the fully qualified domain
+-     *          name.
+-     */
+-    public Builder(String name, int level) {
+-      node = new MachineNode(name, level);
+-    }
+-
+-    /**
+-     * Set the physical memory of the node.
+-     * @param memory Available RAM in KB.
+-     */
+-    public Builder setMemory(long memory) {
+-      node.memory = memory;
+-      return this;
+-    }
+-    
+-    /**
+-     * Set the number of map slot for the node.
+-     * @param mapSlots The number of map slots for the node.
+-     */
+-    public Builder setMapSlots(int mapSlots) {
+-      node.mapSlots = mapSlots;
+-      return this;
+-    }
+-    
+-    /**
+-     * Set the number of reduce slot for the node.
+-     * @param reduceSlots The number of reduce slots for the node.
+-     */   
+-    public Builder setReduceSlots(int reduceSlots) {
+-      node.reduceSlots = reduceSlots;
+-      return this;
+-    }
+-    
+-    /**
+-     * Set the amount of RAM reserved for each map slot.
+-     * @param memoryPerMapSlot The amount of RAM reserved for each map slot, in KB.
+-     */
+-    public Builder setMemoryPerMapSlot(long memoryPerMapSlot) {
+-      node.memoryPerMapSlot = memoryPerMapSlot;
+-      return this;
+-    }
+-    
+-    /**
+-     * Set the amount of RAM reserved for each reduce slot.
+-     * @param memoryPerReduceSlot The amount of RAM reserved for each reduce slot, in KB.
+-     */
+-    public Builder setMemoryPerReduceSlot(long memoryPerReduceSlot) {
+-      node.memoryPerReduceSlot = memoryPerReduceSlot;
+-      return this;
+-    }
+-    
+-    /**
+-     * Set the number of cores for the node.
+-     * @param numCores Number of cores for the node.
+-     */
+-    public Builder setNumCores(int numCores) {
+-      node.numCores = numCores;
+-      return this;
+-    }
+-    
+-    /**
+-     * Clone the settings from a reference {@link MachineNode} object.
+-     * @param ref The reference {@link MachineNode} object.
+-     */
+-    public Builder cloneFrom(MachineNode ref) {
+-      node.memory = ref.memory;
+-      node.mapSlots = ref.mapSlots;
+-      node.reduceSlots = ref.reduceSlots;
+-      node.memoryPerMapSlot = ref.memoryPerMapSlot;
+-      node.memoryPerReduceSlot = ref.memoryPerReduceSlot;
+-      node.numCores = ref.numCores;
+-      return this;
+-    }
+-    
+-    /**
+-     * Build the {@link MachineNode} object.
+-     * @return The {@link MachineNode} object being built.
+-     */
+-    public MachineNode build() {
+-      MachineNode retVal = node;
+-      node = null;
+-      return retVal;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java
+deleted file mode 100644
+index 6e73582d7c0..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.text.ParseException;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent;
+-
+-public class MapAttempt20LineHistoryEventEmitter extends
+-    TaskAttempt20LineEventEmitter {
+-
+-  static List<SingleEventEmitter> nonFinals =
+-      new LinkedList<SingleEventEmitter>();
+-  static List<SingleEventEmitter> finals = new LinkedList<SingleEventEmitter>();
+-
+-  static {
+-    nonFinals.addAll(taskEventNonFinalSEEs);
+-
+-    finals.add(new MapAttemptFinishedEventEmitter());
+-  }
+-
+-  protected MapAttempt20LineHistoryEventEmitter() {
+-    super();
+-  }
+-
+-  static private class MapAttemptFinishedEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskAttemptIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskAttemptIDName == null) {
+-        return null;
+-      }
+-
+-      TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskAttemptIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-      String status = line.get("TASK_STATUS");
+-
+-      if (finishTime != null && status != null
+-          && status.equalsIgnoreCase("success")) {
+-        String hostName = line.get("HOSTNAME");
+-        String counters = line.get("COUNTERS");
+-        String state = line.get("STATE_STRING");
+-
+-        MapAttempt20LineHistoryEventEmitter that =
+-            (MapAttempt20LineHistoryEventEmitter) thatg;
+-
+-        if ("success".equalsIgnoreCase(status)) {
+-          return new MapAttemptFinishedEvent
+-            (taskAttemptID,
+-              that.originalTaskType, status,
+-             Long.parseLong(finishTime),
+-             Long.parseLong(finishTime),
+-             hostName, -1, null, state, maybeParseCounters(counters),
+-             null);
+-        }
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> finalSEEs() {
+-    return finals;
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> nonFinalSEEs() {
+-    return nonFinals;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java
+deleted file mode 100644
+index 2406b9daae5..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.List;
+-
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-
+-/**
+- * {@link MapTaskAttemptInfo} represents the information with regard to a
+- * map task attempt.
+- */
+-public class MapTaskAttemptInfo extends TaskAttemptInfo {
+-  private long runtime;
+-
+-  public MapTaskAttemptInfo(State state, TaskInfo taskInfo,
+-                            long runtime, List<List<Integer>> allSplits) {
+-    super(state, taskInfo,
+-          allSplits == null
+-            ? LoggedTaskAttempt.SplitVectorKind.getNullSplitsVector()
+-           : allSplits);
+-    this.runtime = runtime;
+-  }
+-
+-  /**
+-   *
+-   * @deprecated please use the constructor with 
+-   *               {@code (state, taskInfo, runtime,
+-   *                  List<List<Integer>> allSplits)}
+-   *             instead.  
+-   *
+-   * see {@link LoggedTaskAttempt} for an explanation of
+-   *        {@code allSplits}.
+-   *
+-   * If there are no known splits, use {@code null}.
+-   */
+-  @Deprecated
+-  public MapTaskAttemptInfo(State state, TaskInfo taskInfo,
+-                            long runtime) {
+-    this(state, taskInfo, runtime, null);
+-  }
+-
+-  @Override
+-  public long getRuntime() {
+-    return getMapRuntime();
+-  }
+-
+-  /**
+-   * Get the runtime for the <b>map</b> phase of the map-task attempt.
+-   * 
+-   * @return the runtime for the <b>map</b> phase of the map-task attempt
+-   */
+-  public long getMapRuntime() {
+-    return runtime;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java
+deleted file mode 100644
+index 1f16727f357..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Collections;
+-import java.util.Set;
+-import java.util.SortedSet;
+-import java.util.TreeSet;
+-
+-/**
+- * {@link Node} represents a node in the cluster topology. A node can be a
+- * {@link MachineNode}, or a {@link RackNode}, etc.
+- */
+-public class Node implements Comparable<Node> {
+-  private static final SortedSet<Node> EMPTY_SET = 
+-    Collections.unmodifiableSortedSet(new TreeSet<Node>());
+-  private Node parent;
+-  private final String name;
+-  private final int level;
+-  private SortedSet<Node> children;
+-
+-  /**
+-   * @param name
+-   *          A unique name to identify a node in the cluster.
+-   * @param level
+-   *          The level of the node in the cluster
+-   */
+-  public Node(String name, int level) {
+-    if (name == null) {
+-      throw new IllegalArgumentException("Node name cannot be null");
+-    }
+-
+-    if (level < 0) {
+-      throw new IllegalArgumentException("Level cannot be negative");
+-    }
+-
+-    this.name = name;
+-    this.level = level;
+-  }
+-
+-  /**
+-   * Get the name of the node.
+-   * 
+-   * @return The name of the node.
+-   */
+-  public String getName() {
+-    return name;
+-  }
+-
+-  /**
+-   * Get the level of the node.
+-   * @return The level of the node.
+-   */
+-  public int getLevel() {
+-    return level;
+-  }
+-  
+-  private void checkChildren() {
+-    if (children == null) {
+-      children = new TreeSet<Node>();
+-    }
+-  }
+-
+-  /**
+-   * Add a child node to this node.
+-   * @param child The child node to be added. The child node should currently not be belong to another cluster topology.
+-   * @return Boolean indicating whether the node is successfully added.
+-   */
+-  public synchronized boolean addChild(Node child) {
+-    if (child.parent != null) {
+-      throw new IllegalArgumentException(
+-          "The child is already under another node:" + child.parent);
+-    }
+-    checkChildren();
+-    boolean retval = children.add(child);
+-    if (retval) child.parent = this;
+-    return retval;
+-  }
+-
+-  /**
+-   * Does this node have any children?
+-   * @return Boolean indicate whether this node has any children.
+-   */
+-  public synchronized boolean hasChildren() {
+-    return children != null && !children.isEmpty();
+-  }
+-
+-  /**
+-   * Get the children of this node.
+-   * 
+-   * @return The children of this node. If no child, an empty set will be
+-   *         returned. The returned set is read-only.
+-   */
+-  public synchronized Set<Node> getChildren() {
+-    return (children == null) ? EMPTY_SET : 
+-      Collections.unmodifiableSortedSet(children);
+-  }
+-  
+-  /**
+-   * Get the parent node.
+-   * @return the parent node. If root node, return null.
+-   */
+-  public Node getParent() {
+-    return parent;
+-  }
+-  
+-  @Override
+-  public int hashCode() {
+-    return name.hashCode();
+-  }
+-
+-  @Override
+-  public boolean equals(Object obj) {
+-    if (this == obj)
+-      return true;
+-    if (obj == null)
+-      return false;
+-    if (obj.getClass() != this.getClass())
+-      return false;
+-    Node other = (Node) obj;
+-    return name.equals(other.name);
+-  }
+-  
+-  @Override
+-  public String toString() {
+-    return "(" + name +", " + level +")";
+-  }
+-
+-  @Override
+-  public int compareTo(Node o) {
+-    return name.compareTo(o.name);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java
+deleted file mode 100644
+index d60d7154503..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * Interface to output a sequence of objects of type T.
+- */
+-public interface Outputter<T> extends Closeable {
+-  /**
+-   * Initialize the {@link Outputter} to a specific path.
+-   * @param path The {@link Path} to the output file.
+-   * @param conf Configuration
+-   * @throws IOException
+-   */
+-  public void init(Path path, Configuration conf) throws IOException;
+-  
+-  /**
+-   * Output an object.
+-   * @param object The objecte.
+-   * @throws IOException
+-   */
+-  public void output(T object) throws IOException;
+-
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java
+deleted file mode 100644
+index 20bf48d48c4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-class Pair<CarType, CdrType> {
+-  private final CarType car;
+-  private final CdrType cdr;
+-
+-  Pair(CarType car, CdrType cdr) {
+-    super();
+-
+-    this.car = car;
+-    this.cdr = cdr;
+-  }
+-
+-  CarType first() {
+-    return car;
+-  }
+-
+-  CdrType second() {
+-    return cdr;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java
+deleted file mode 100644
+index a6c8bdad87d..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java
++++ /dev/null
+@@ -1,209 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.StringReader;
+-import java.util.Properties;
+-import java.util.regex.Pattern;
+-import java.util.regex.Matcher;
+-
+-import javax.xml.parsers.DocumentBuilderFactory;
+-import javax.xml.parsers.DocumentBuilder;
+-import javax.xml.parsers.ParserConfigurationException;
+-
+-import org.apache.hadoop.mapreduce.MRConfig;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.util.XMLUtils;
+-
+-import org.w3c.dom.Document;
+-import org.w3c.dom.NodeList;
+-import org.w3c.dom.Node;
+-import org.w3c.dom.Element;
+-import org.w3c.dom.Text;
+-
+-import org.xml.sax.InputSource;
+-import org.xml.sax.SAXException;
+-
+-class ParsedConfigFile {
+-  private static final Pattern jobIDPattern =
+-      Pattern.compile("_(job_[0-9]+_[0-9]+)_");
+-  private static final Pattern heapPattern =
+-      Pattern.compile("-Xmx([0-9]+)([mMgG])");
+-
+-  final int heapMegabytes;
+-
+-  final String queue;
+-  final String jobName;
+-
+-  final int clusterMapMB;
+-  final int clusterReduceMB;
+-  final int jobMapMB;
+-  final int jobReduceMB;
+-
+-  final String jobID;
+-
+-  final boolean valid;
+-  
+-  final Properties properties = new Properties();
+-
+-  private int maybeGetIntValue(String propName, String attr, String value,
+-      int oldValue) {
+-    if (propName.equals(attr) && value != null) {
+-      try {
+-        return Integer.parseInt(value);
+-      } catch (NumberFormatException e) {
+-        return oldValue;
+-      }
+-    }
+-
+-    return oldValue;
+-  }
+-
+-  @SuppressWarnings("hiding")
+-  @Deprecated
+-  ParsedConfigFile(String filenameLine, String xmlString) {
+-    super();
+-
+-    int heapMegabytes = -1;
+-
+-    String queue = null;
+-    String jobName = null;
+-
+-    int clusterMapMB = -1;
+-    int clusterReduceMB = -1;
+-    int jobMapMB = -1;
+-    int jobReduceMB = -1;
+-
+-    String jobID = null;
+-
+-    boolean valid = true;
+-
+-    Matcher jobIDMatcher = jobIDPattern.matcher(filenameLine);
+-
+-    if (jobIDMatcher.find()) {
+-      jobID = jobIDMatcher.group(1);
+-    }
+-
+-    try {
+-      DocumentBuilderFactory dbf = XMLUtils.newSecureDocumentBuilderFactory();
+-
+-      DocumentBuilder db = dbf.newDocumentBuilder();
+-
+-      Document doc = db.parse(new InputSource(new StringReader(xmlString)));
+-
+-      Element root = doc.getDocumentElement();
+-
+-      if (!"configuration".equals(root.getTagName())) {
+-        System.out.print("root is not a configuration node");
+-        valid = false;
+-      }
+-
+-      NodeList props = root.getChildNodes();
+-
+-      for (int i = 0; i < props.getLength(); ++i) {
+-        Node propNode = props.item(i);
+-        if (!(propNode instanceof Element))
+-          continue;
+-        Element prop = (Element) propNode;
+-        if (!"property".equals(prop.getTagName())) {
+-          System.out.print("bad conf file: element not <property>");
+-        }
+-        NodeList fields = prop.getChildNodes();
+-        String attr = null;
+-        String value = null;
+-        @SuppressWarnings("unused")
+-        boolean finalParameter = false;
+-        for (int j = 0; j < fields.getLength(); j++) {
+-          Node fieldNode = fields.item(j);
+-          if (!(fieldNode instanceof Element)) {
+-            continue;
+-          }
+-
+-          Element field = (Element) fieldNode;
+-          if ("name".equals(field.getTagName()) && field.hasChildNodes()) {
+-            attr = ((Text) field.getFirstChild()).getData().trim();
+-          }
+-          if ("value".equals(field.getTagName()) && field.hasChildNodes()) {
+-            value = ((Text) field.getFirstChild()).getData();
+-          }
+-          if ("final".equals(field.getTagName()) && field.hasChildNodes()) {
+-            finalParameter =
+-                "true".equals(((Text) field.getFirstChild()).getData());
+-          }
+-        }
+-        
+-        properties.setProperty(attr, value);
+-
+-        if ("mapred.child.java.opts".equals(attr)) {
+-          Matcher matcher = heapPattern.matcher(value);
+-          if (matcher.find()) {
+-            String heapSize = matcher.group(1);
+-
+-            heapMegabytes = Integer.parseInt(heapSize);
+-
+-            if (matcher.group(2).equalsIgnoreCase("G")) {
+-              heapMegabytes *= 1024;
+-            }
+-          }
+-        }
+-
+-        if (MRJobConfig.QUEUE_NAME.equals(attr)) {
+-          queue = value;
+-        }
+-
+-        if (MRJobConfig.JOB_NAME.equals(attr)) {
+-          jobName = value;
+-        }
+-
+-        clusterMapMB =
+-            maybeGetIntValue(MRConfig.MAPMEMORY_MB, attr, value, clusterMapMB);
+-        clusterReduceMB =
+-            maybeGetIntValue(MRConfig.REDUCEMEMORY_MB, attr, value,
+-                clusterReduceMB);
+-        jobMapMB =
+-            maybeGetIntValue(MRJobConfig.MAP_MEMORY_MB, attr, value, jobMapMB);
+-        jobReduceMB =
+-            maybeGetIntValue(MRJobConfig.REDUCE_MEMORY_MB, attr, value,
+-                jobReduceMB);
+-      }
+-
+-      valid = true;
+-    } catch (ParserConfigurationException e) {
+-      valid = false;
+-    } catch (SAXException e) {
+-      valid = false;
+-    } catch (IOException e) {
+-      valid = false;
+-    }
+-
+-    this.heapMegabytes = heapMegabytes;
+-
+-    this.queue = queue;
+-    this.jobName = jobName;
+-
+-    this.clusterMapMB = clusterMapMB;
+-    this.clusterReduceMB = clusterReduceMB;
+-    this.jobMapMB = jobMapMB;
+-    this.jobReduceMB = jobReduceMB;
+-
+-    this.jobID = jobID;
+-
+-    this.valid = valid;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
+deleted file mode 100644
+index ef2dda78324..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
++++ /dev/null
+@@ -1,134 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.regex.Pattern;
+-import java.util.regex.Matcher;
+-
+-import org.apache.hadoop.tools.rumen.datatypes.NodeName;
+-
+-public class ParsedHost {
+-  private final String rackName;
+-  private final String nodeName;
+-
+-  /**
+-   * TODO the following only works for /rack/host format. Change to support
+-   * arbitrary level of network names.
+-   */
+-  private static final Pattern splitPattern = Pattern
+-      .compile("/([^/]+)/([^/]+)");
+-
+-  /**
+-   * TODO handle arbitrary level of network names.
+-   */
+-  static int numberOfDistances() {
+-    return 3;
+-  }
+-
+-  String nameComponent(int i) throws IllegalArgumentException {
+-    switch (i) {
+-    case 0:
+-      return rackName;
+-
+-    case 1:
+-      return nodeName;
+-
+-    default:
+-      throw new IllegalArgumentException(
+-          "Host location component index out of range.");
+-    }
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return rackName.hashCode() * 17 + nodeName.hashCode();
+-  }
+-
+-  public static ParsedHost parse(String name) {
+-    // separate out the node name
+-    Matcher matcher = splitPattern.matcher(name);
+-
+-    if (!matcher.matches())
+-      return null;
+-
+-    return new ParsedHost(matcher.group(1), matcher.group(2));
+-  }
+-
+-  private String process(String name) {
+-    return name == null 
+-           ? null 
+-           : name.startsWith("/") ? name.substring(1) : name;
+-  }
+-  
+-  public ParsedHost(LoggedLocation loc) {
+-    List<NodeName> coordinates = loc.getLayers();
+-
+-    rackName = process(coordinates.get(0).getRackName());
+-    nodeName = process(coordinates.get(1).getHostName());
+-  }
+-
+-  LoggedLocation makeLoggedLocation() {
+-    LoggedLocation result = new LoggedLocation();
+-
+-    List<String> coordinates = new ArrayList<String>();
+-
+-    coordinates.add(rackName);
+-    coordinates.add(nodeName);
+-
+-    result.setLayers(coordinates);
+-
+-    return result;
+-  }
+-  
+-  public String getNodeName() {
+-    return nodeName;
+-  }
+-  
+-  public String getRackName() {
+-    return rackName;
+-  }
+-
+-  // expects the broadest name first
+-  ParsedHost(String rackName, String nodeName) {
+-    this.rackName = process(rackName);
+-    this.nodeName = process(nodeName);
+-  }
+-
+-  @Override
+-  public boolean equals(Object other) {
+-    if (!(other instanceof ParsedHost)) {
+-      return false;
+-    }
+-    ParsedHost host = (ParsedHost) other;
+-    return (nodeName.equals(host.nodeName) && rackName.equals(host.rackName));
+-  }
+-
+-  int distance(ParsedHost other) {
+-    if (nodeName.equals(other.nodeName)) {
+-      return 0;
+-    }
+-
+-    if (rackName.equals(other.rackName)) {
+-      return 1;
+-    }
+-
+-    return 2;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java
+deleted file mode 100644
+index 0d19ee4eb3c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java
++++ /dev/null
+@@ -1,179 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * 
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapreduce.JobACL;
+-import org.apache.hadoop.security.authorize.AccessControlList;
+-
+-/**
+- * This is a wrapper class around {@link LoggedJob}. This provides also the
+- * extra information about the job obtained from job history which is not
+- * written to the JSON trace file.
+- */
+-public class ParsedJob extends LoggedJob {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(ParsedJob.class);
+-
+-  private Map<String, Long> totalCountersMap = new HashMap<String, Long>();
+-  private Map<String, Long> mapCountersMap = new HashMap<String, Long>();
+-  private Map<String, Long> reduceCountersMap = new HashMap<String, Long>();
+-
+-  private String jobConfPath;
+-  private Map<JobACL, AccessControlList> jobAcls;
+-
+-  ParsedJob() {
+-
+-  }
+-
+-  ParsedJob(String jobID) {
+-    super();
+-
+-    setJobID(jobID);
+-  }
+-
+-  /** Set the job total counters */
+-  void putTotalCounters(Map<String, Long> totalCounters) {
+-    this.totalCountersMap = totalCounters;
+-  }
+-
+-  /**
+-   * @return the job total counters
+-   */
+-  public Map<String, Long> obtainTotalCounters() {
+-    return totalCountersMap;
+-  }
+-
+-  /** Set the job level map tasks' counters */
+-  void putMapCounters(Map<String, Long> mapCounters) {
+-    this.mapCountersMap = mapCounters;
+-  }
+-
+-  /**
+-   * @return the job level map tasks' counters
+-   */
+-  public Map<String, Long> obtainMapCounters() {
+-    return mapCountersMap;
+-  }
+-
+-  /** Set the job level reduce tasks' counters */
+-  void putReduceCounters(Map<String, Long> reduceCounters) {
+-    this.reduceCountersMap = reduceCounters;
+-  }
+-
+-  /**
+-   * @return the job level reduce tasks' counters
+-   */
+-  public Map<String, Long> obtainReduceCounters() {
+-    return reduceCountersMap;
+-  }
+-
+-  /** Set the job conf path in staging dir on hdfs */
+-  void putJobConfPath(String confPath) {
+-    jobConfPath = confPath;
+-  }
+-
+-  /**
+-   * @return the job conf path in staging dir on hdfs
+-   */
+-  public String obtainJobConfpath() {
+-    return jobConfPath;
+-  }
+-
+-  /** Set the job acls */
+-  void putJobAcls(Map<JobACL, AccessControlList> acls) {
+-    jobAcls = acls;
+-  }
+-
+-  /**
+-   * @return the job acls
+-   */
+-  public Map<JobACL, AccessControlList> obtainJobAcls() {
+-    return jobAcls;
+-  }
+-
+-  /**
+-   * @return the list of map tasks of this job
+-   */
+-  public List<ParsedTask> obtainMapTasks() {
+-    List<LoggedTask> tasks = super.getMapTasks();
+-    return convertTasks(tasks);
+-  }
+-
+-  /**
+-   * @return the list of reduce tasks of this job
+-   */
+-  public List<ParsedTask> obtainReduceTasks() {
+-    List<LoggedTask> tasks = super.getReduceTasks();
+-    return convertTasks(tasks);
+-  }
+-
+-  /**
+-   * @return the list of other tasks of this job
+-   */
+-  public List<ParsedTask> obtainOtherTasks() {
+-    List<LoggedTask> tasks = super.getOtherTasks();
+-    return convertTasks(tasks);
+-  }
+-
+-  /** As we know that this list of {@link LoggedTask} objects is actually a list
+-   * of {@link ParsedTask} objects, we go ahead and cast them.
+-   * @return the list of {@link ParsedTask} objects
+-   */
+-  private List<ParsedTask> convertTasks(List<LoggedTask> tasks) {
+-    List<ParsedTask> result = new ArrayList<ParsedTask>();
+-
+-    for (LoggedTask t : tasks) {
+-      if (t instanceof ParsedTask) {
+-        result.add((ParsedTask)t);
+-      } else {
+-        throw new RuntimeException("Unexpected type of tasks in the list...");
+-      }
+-    }
+-    return result;
+-  }
+-
+-  /** Dump the extra info of ParsedJob */
+-  void dumpParsedJob() {
+-    LOG.info("ParsedJob details:" + obtainTotalCounters() + ";"
+-        + obtainMapCounters() + ";" + obtainReduceCounters()
+-        + "\n" + obtainJobConfpath() + "\n" + obtainJobAcls()
+-        + ";Q=" + (getQueue() == null ? "null" : getQueue().getValue()));
+-    List<ParsedTask> maps = obtainMapTasks();
+-    for (ParsedTask task : maps) {
+-      task.dumpParsedTask();
+-    }
+-    List<ParsedTask> reduces = obtainReduceTasks();
+-    for (ParsedTask task : reduces) {
+-      task.dumpParsedTask();
+-    }
+-    List<ParsedTask> others = obtainOtherTasks();
+-    for (ParsedTask task : others) {
+-      task.dumpParsedTask();
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java
+deleted file mode 100644
+index df820528701..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java
++++ /dev/null
+@@ -1,91 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Properties;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-class ParsedLine {
+-  Properties content;
+-  LogRecordType type;
+-
+-  static final String KEY = "(\\w+)";
+-  /**
+-   * The value string is enclosed in double quotation marks ('"') and
+-   * occurrences of '"' and '\' are escaped with a '\'. So the escaped value
+-   * string is essentially a string of escaped sequence ('\' followed by any
+-   * character) or any character other than '"' and '\'.
+-   * 
+-   * The straightforward REGEX to capture the above is "((?:[^\"\\\\]|\\\\.)*)".
+-   * Unfortunately Java's REGEX implementation is "broken" that it does not
+-   * perform the NFA-to-DFA conversion and such expressions would lead to
+-   * backtracking and stack overflow when matching with long strings. The
+-   * following is a manual "unfolding" of the REGEX to get rid of backtracking.
+-   */
+-  static final String VALUE = "([^\"\\\\]*+(?:\\\\.[^\"\\\\]*+)*+)";
+-  /**
+-   * REGEX to match the Key-Value pairs in an input line. Capture group 1
+-   * matches the key and capture group 2 matches the value (without quotation
+-   * marks).
+-   */
+-  static final Pattern keyValPair = Pattern.compile(KEY + "=" + "\"" + VALUE + "\"");
+-
+-  @SuppressWarnings("unused")
+-  ParsedLine(String fullLine, int version) {
+-    super();
+-
+-    content = new Properties();
+-
+-    int firstSpace = fullLine.indexOf(" ");
+-
+-    if (firstSpace < 0) {
+-      firstSpace = fullLine.length();
+-    }
+-
+-    if (firstSpace == 0) {
+-      return; // This is a junk line of some sort
+-    }
+-
+-    type = LogRecordType.intern(fullLine.substring(0, firstSpace));
+-
+-    String propValPairs = fullLine.substring(firstSpace + 1);
+-
+-    Matcher matcher = keyValPair.matcher(propValPairs);
+-
+-    while(matcher.find()){
+-      String key = matcher.group(1);
+-      String value = matcher.group(2);
+-      content.setProperty(key, value);
+-    }
+-  }
+-
+-  protected LogRecordType getType() {
+-    return type;
+-  }
+-
+-  protected String get(String key) {
+-    return content.getProperty(key);
+-  }
+-
+-  protected long getLong(String key) {
+-    String val = get(key);
+-
+-    return Long.parseLong(val);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
+deleted file mode 100644
+index a05af643fd8..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
++++ /dev/null
+@@ -1,131 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounters;
+-
+-/**
+- * This is a wrapper class around {@link LoggedTask}. This provides also the
+- * extra information about the task obtained from job history which is not
+- * written to the JSON trace file.
+- */
+-public class ParsedTask extends LoggedTask {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(ParsedTask.class);
+-
+-  private String diagnosticInfo;
+-  private String failedDueToAttempt;
+-  private Map<String, Long> countersMap = new HashMap<String, Long>();
+-
+-  ParsedTask() {
+-    super();
+-  }
+-
+-  public void incorporateCounters(JhCounters counters) {
+-    Map<String, Long> countersMap =
+-        JobHistoryUtils.extractCounters(counters);
+-    putCounters(countersMap);
+-
+-    super.incorporateCounters(counters);
+-  }
+-
+-  /** Set the task counters */
+-  public void putCounters(Map<String, Long> counters) {
+-    this.countersMap = counters;
+-  }
+-
+-  /**
+-   * @return the task counters
+-   */
+-  public Map<String, Long> obtainCounters() {
+-    return countersMap;
+-  }
+-
+-  /** Set the task diagnostic-info */
+-  public void putDiagnosticInfo(String msg) {
+-    diagnosticInfo = msg;
+-  }
+-
+-  /**
+-   * @return the diagnostic-info of this task.
+-   *         If the task is successful, returns null.
+-   */
+-  public String obtainDiagnosticInfo() {
+-    return diagnosticInfo;
+-  }
+-
+-  /**
+-   * Set the failed-due-to-attemptId info of this task.
+-   */
+-  public void putFailedDueToAttemptId(String attempt) {
+-    failedDueToAttempt = attempt;
+-  }
+-
+-  /**
+-   * @return the failed-due-to-attemptId info of this task.
+-   *         If the task is successful, returns null.
+-   */
+-  public String obtainFailedDueToAttemptId() {
+-    return failedDueToAttempt;
+-  }
+-
+-  /**
+-   * @return the list of attempts of this task.
+-   */
+-  public List<ParsedTaskAttempt> obtainTaskAttempts() {
+-    List<LoggedTaskAttempt> attempts = getAttempts();
+-    return convertTaskAttempts(attempts);
+-  }
+-
+-  List<ParsedTaskAttempt> convertTaskAttempts(
+-      List<LoggedTaskAttempt> attempts) {
+-    List<ParsedTaskAttempt> result = new ArrayList<ParsedTaskAttempt>();
+-
+-    for (LoggedTaskAttempt t : attempts) {
+-      if (t instanceof ParsedTaskAttempt) {
+-        result.add((ParsedTaskAttempt)t);
+-      } else {
+-        throw new RuntimeException(
+-            "Unexpected type of taskAttempts in the list...");
+-      }
+-    }
+-    return result;
+-  }
+-
+-  /** Dump the extra info of ParsedTask */
+-  void dumpParsedTask() {
+-    LOG.info("ParsedTask details:" + obtainCounters()
+-        + "\n" + obtainFailedDueToAttemptId()
+-        + "\nPreferred Locations are:");
+-    List<LoggedLocation> loc = getPreferredLocations();
+-    for (LoggedLocation l : loc) {
+-      LOG.info(l.getLayers() + ";" + l.toString());
+-    }
+-    List<ParsedTaskAttempt> attempts = obtainTaskAttempts();
+-    for (ParsedTaskAttempt attempt : attempts) {
+-      attempt.dumpParsedTaskAttempt();
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java
+deleted file mode 100644
+index f0e7bdd6d00..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.mapreduce.jobhistory.JhCounters;
+-
+-/**
+- * This is a wrapper class around {@link LoggedTaskAttempt}. This provides
+- * also the extra information about the task attempt obtained from
+- * job history which is not written to the JSON trace file.
+- */
+-public class ParsedTaskAttempt extends LoggedTaskAttempt {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(ParsedTaskAttempt.class);
+-
+-  private String diagnosticInfo;
+-  private String trackerName;
+-  private Integer httpPort, shufflePort;
+-  private Map<String, Long> countersMap = new HashMap<String, Long>();
+-
+-  ParsedTaskAttempt() {
+-    super();
+-  }
+-
+-  /** incorporate event counters */
+-  public void incorporateCounters(JhCounters counters) {
+-
+-    Map<String, Long> countersMap =
+-      JobHistoryUtils.extractCounters(counters);
+-    putCounters(countersMap);
+-
+-    super.incorporateCounters(counters);
+-  }
+-
+-  /** Set the task attempt counters */
+-  public void putCounters(Map<String, Long> counters) {
+-    this.countersMap = counters;
+-  }
+-
+-  /**
+-   * @return the task attempt counters
+-   */
+-  public Map<String, Long> obtainCounters() {
+-    return countersMap;
+-  }
+-
+-  /** Set the task attempt diagnostic-info */
+-  public void putDiagnosticInfo(String msg) {
+-    diagnosticInfo = msg;
+-  }
+-
+-  /**
+-   * @return the diagnostic-info of this task attempt.
+-   *         If the attempt is successful, returns null.
+-   */
+-  public String obtainDiagnosticInfo() {
+-    return diagnosticInfo;
+-  }
+-
+-  void putTrackerName(String trackerName) {
+-    this.trackerName = trackerName;
+-  }
+-
+-  public String obtainTrackerName() {
+-    return trackerName;
+-  }
+-
+-  void putHttpPort(int port) {
+-    httpPort = port;
+-  }
+-
+-  /**
+-   * @return http port if set. Returns null otherwise.
+-   */
+-  public Integer obtainHttpPort() {
+-    return httpPort;
+-  }
+-
+-  void putShufflePort(int port) {
+-    shufflePort = port;
+-  }
+-
+-  /**
+-   * @return shuffle port if set. Returns null otherwise.
+-   */
+-  public Integer obtainShufflePort() {
+-    return shufflePort;
+-  }
+-
+-  /** Dump the extra info of ParsedTaskAttempt */
+-  void dumpParsedTaskAttempt() {
+-    LOG.info("ParsedTaskAttempt details:" + obtainCounters()
+-        + ";DiagnosticInfo=" + obtainDiagnosticInfo() + "\n"
+-        + obtainTrackerName() + ";" + obtainHttpPort() + ";"
+-        + obtainShufflePort() + ";rack=" + getHostName().getRackName()
+-        + ";host=" + getHostName().getHostName());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java
+deleted file mode 100644
+index b2dd3e992dc..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.compress.CodecPool;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionCodecFactory;
+-import org.apache.hadoop.io.compress.Decompressor;
+-
+-class PossiblyDecompressedInputStream extends InputStream {
+-  private final Decompressor decompressor;
+-  private final InputStream coreInputStream;
+-
+-  public PossiblyDecompressedInputStream(Path inputPath, Configuration conf)
+-      throws IOException {
+-    CompressionCodecFactory codecs = new CompressionCodecFactory(conf);
+-    CompressionCodec inputCodec = codecs.getCodec(inputPath);
+-
+-    FileSystem ifs = inputPath.getFileSystem(conf);
+-    FSDataInputStream fileIn = ifs.open(inputPath);
+-
+-    if (inputCodec == null) {
+-      decompressor = null;
+-      coreInputStream = fileIn;
+-    } else {
+-      decompressor = CodecPool.getDecompressor(inputCodec);
+-      coreInputStream = inputCodec.createInputStream(fileIn, decompressor);
+-    }
+-  }
+-
+-  @Override
+-  public int read() throws IOException {
+-    return coreInputStream.read();
+-  }
+-
+-  @Override
+-  public int read(byte[] buffer, int offset, int length) throws IOException {
+-    return coreInputStream.read(buffer, offset, length);
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    // coreInputStream.close() is called before returning of decompressor to the
+-    // pool because coreInputStream.close() could(though currently it doesn't)
+-    // access the decompressor.
+-    coreInputStream.close();
+-
+-    if (decompressor != null) {
+-      CodecPool.returnDecompressor(decompressor);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java
+deleted file mode 100644
+index 8adff46fa55..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.v2.hs.JobHistory;
+-
+-/**
+- * Job History related constants for Hadoop releases prior to 0.21
+- */
+-public class Pre21JobHistoryConstants {
+-  
+-  /**
+-   * Job history files contain key="value" pairs, where keys belong to this enum. 
+-   * It acts as a global namespace for all keys. 
+-   */
+-  static enum Keys {
+-    JOBTRACKERID,
+-    START_TIME, FINISH_TIME, JOBID, JOBNAME, USER, JOBCONF, SUBMIT_TIME,
+-    LAUNCH_TIME, TOTAL_MAPS, TOTAL_REDUCES, FAILED_MAPS, FAILED_REDUCES,
+-    FINISHED_MAPS, FINISHED_REDUCES, JOB_STATUS, TASKID, HOSTNAME, TASK_TYPE,
+-    ERROR, TASK_ATTEMPT_ID, TASK_STATUS, COPY_PHASE, SORT_PHASE, REDUCE_PHASE,
+-    SHUFFLE_FINISHED, SORT_FINISHED, MAP_FINISHED, COUNTERS, SPLITS,
+-    JOB_PRIORITY, HTTP_PORT, TRACKER_NAME, STATE_STRING, VERSION
+-  }
+-
+-  /**
+-   * This enum contains some of the values commonly used by history log events. 
+-   * since values in history can only be strings - Values.name() is used in 
+-   * most places in history file.
+-   *
+-   * Note: "SUCCEEDED" is actually not a pre-0.21 value, but it might appear
+-   * in jhist logs when the event is an unsuccessful job completion, yet, the
+-   * overall job status is "SUCCEEDED".
+-   */
+-  public static enum Values {
+-    SUCCESS, SUCCEEDED, FAILED, KILLED, MAP, REDUCE, CLEANUP, RUNNING, PREP,
+-    SETUP
+-  }
+-
+-  /**
+-   * Regex for Pre21 V1(old) jobhistory filename
+-   *   i.e jt-identifier_job-id_user-name_job-name
+-   */
+-  static final Pattern JOBHISTORY_FILENAME_REGEX_V1 =
+-    Pattern.compile("[^.].+_(" + JobID.JOBID_REGEX + ")_.+");
+-  /**
+-   * Regex for Pre21 V2(new) jobhistory filename
+-   *   i.e job-id_user-name_job-name
+-   */
+-  static final Pattern JOBHISTORY_FILENAME_REGEX_V2 =
+-    Pattern.compile("(" + JobID.JOBID_REGEX + ")_.+");
+-
+-  static final String OLD_FULL_SUFFIX_REGEX_STRING =
+-    "(?:\\.[0-9]+" + Pattern.quote(JobHistory.OLD_SUFFIX) + ")";
+-
+-  /**
+-   * Regex for Pre21 V1(old) jobhistory conf filename 
+-   *   i.e jt-identifier_job-id_conf.xml
+-   */
+-  static final Pattern CONF_FILENAME_REGEX_V1 =
+-    Pattern.compile("[^.].+_(" + JobID.JOBID_REGEX + ")_conf.xml"
+-                    + OLD_FULL_SUFFIX_REGEX_STRING + "?");
+-  /**
+-   * Regex for Pre21 V2(new) jobhistory conf filename
+-   *   i.e job-id_conf.xml
+-   */
+-  static final Pattern CONF_FILENAME_REGEX_V2 =
+-    Pattern.compile("(" + JobID.JOBID_REGEX + ")_conf.xml"
+-                    + OLD_FULL_SUFFIX_REGEX_STRING + "?");
+- 
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java
+deleted file mode 100644
+index 03667f243fc..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Set;
+-
+-/**
+- * {@link RackNode} represents a rack node in the cluster topology.
+- */
+-public final class RackNode extends Node {
+-  public RackNode(String name, int level) {
+-    // Hack: ensuring rack name starts with "/".
+-    super(name.startsWith("/") ? name : "/" + name, level);
+-  }
+-  
+-  @Override
+-  public synchronized boolean addChild(Node child) {
+-    if (!(child instanceof MachineNode)) {
+-      throw new IllegalArgumentException(
+-          "Only MachineNode can be added to RackNode");
+-    }
+-    return super.addChild(child);
+-  }
+-  
+-  /**
+-   * Get the machine nodes that belong to the rack.
+-   * @return The machine nodes that belong to the rack.
+-   */
+-  @SuppressWarnings({ "cast", "unchecked" })
+-  public Set<MachineNode> getMachinesInRack() {
+-    return (Set<MachineNode>)(Set)getChildren();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java
+deleted file mode 100644
+index 817c5c8b2f7..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.nio.charset.StandardCharsets;
+-import java.security.MessageDigest;
+-import java.security.NoSuchAlgorithmException;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The purpose of this class is to generate new random seeds from a master
+- * seed. This is needed to make the Random().next*() calls in rumen and mumak
+- * deterministic so that mumak simulations become deterministically replayable.
+- *
+- * In these tools we need many independent streams of random numbers, some of
+- * which are created dynamically. We seed these streams with the sub-seeds 
+- * returned by RandomSeedGenerator.
+- * 
+- * For a slightly more complicated approach to generating multiple streams of 
+- * random numbers with better theoretical guarantees, see
+- * P. L'Ecuyer, R. Simard, E. J. Chen, and W. D. Kelton, 
+- * ``An Objected-Oriented Random-Number Package with Many Long Streams and 
+- * Substreams'', Operations Research, 50, 6 (2002), 1073--1075
+- * http://www.iro.umontreal.ca/~lecuyer/papers.html
+- * http://www.iro.umontreal.ca/~lecuyer/myftp/streams00/
+- */
+-public class RandomSeedGenerator {
+-  private static Logger LOG = LoggerFactory.getLogger(RandomSeedGenerator.class);
+-
+-  /** MD5 algorithm instance, one for each thread. */
+-  private static final ThreadLocal<MessageDigest> md5Holder =
+-      new ThreadLocal<MessageDigest>() {
+-        @Override protected MessageDigest initialValue() {
+-          MessageDigest md5 = null; 
+-          try {
+-            md5 = MessageDigest.getInstance("MD5");
+-          } catch (NoSuchAlgorithmException nsae) {
+-            throw new RuntimeException("Can't create MD5 digests", nsae);
+-          }
+-          return md5;
+-        }
+-      };
+-      
+-  /**
+-   * Generates a new random seed.
+-   *
+-   * @param streamId a string identifying the stream of random numbers
+-   * @param masterSeed higher level master random seed
+-   * @return the random seed. Different (streamId, masterSeed) pairs result in
+-   *         (vastly) different random seeds.
+-   */   
+-  public static long getSeed(String streamId, long masterSeed) {
+-    MessageDigest md5 = md5Holder.get();
+-    md5.reset();
+-    //'/' : make sure that we don't get the same str from ('11',0) and ('1',10)
+-    // We could have fed the bytes of masterSeed one by one to md5.update()
+-    // instead
+-    String str = streamId + '/' + masterSeed;
+-    byte[] digest = md5.digest(str.getBytes(StandardCharsets.UTF_8));
+-    // Create a long from the first 8 bytes of the digest
+-    // This is fine as MD5 has the avalanche property.
+-    // Paranoids could have XOR folded the other 8 bytes in too. 
+-    long seed = 0;
+-    for (int i=0; i<8; i++) {
+-      seed = (seed<<8) + ((int)digest[i]+128);
+-    }
+-    return seed;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java
+deleted file mode 100644
+index 0261ea225f2..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java
++++ /dev/null
+@@ -1,100 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.text.ParseException;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent;
+-
+-public class ReduceAttempt20LineHistoryEventEmitter
+-     extends TaskAttempt20LineEventEmitter {
+-
+-  static List<SingleEventEmitter> nonFinals =
+-      new LinkedList<SingleEventEmitter>();
+-  static List<SingleEventEmitter> finals = new LinkedList<SingleEventEmitter>();
+-
+-  static {
+-    nonFinals.addAll(taskEventNonFinalSEEs);
+-
+-    finals.add(new ReduceAttemptFinishedEventEmitter());
+-  }
+-
+-  ReduceAttempt20LineHistoryEventEmitter() {
+-    super();
+-  }
+-
+-  static private class ReduceAttemptFinishedEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskAttemptIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskAttemptIDName == null) {
+-        return null;
+-      }
+-
+-      TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskAttemptIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-      String status = line.get("TASK_STATUS");
+-
+-      if (finishTime != null && status != null
+-          && status.equalsIgnoreCase("success")) {
+-        String hostName = line.get("HOSTNAME");
+-        String counters = line.get("COUNTERS");
+-        String state = line.get("STATE_STRING");
+-        String shuffleFinish = line.get("SHUFFLE_FINISHED");
+-        String sortFinish = line.get("SORT_FINISHED");
+-
+-        if (shuffleFinish != null && sortFinish != null
+-            && "success".equalsIgnoreCase(status)) {
+-          ReduceAttempt20LineHistoryEventEmitter that =
+-              (ReduceAttempt20LineHistoryEventEmitter) thatg;
+-
+-          return new ReduceAttemptFinishedEvent
+-            (taskAttemptID,
+-             that.originalTaskType, status,
+-             Long.parseLong(shuffleFinish),
+-             Long.parseLong(sortFinish),
+-             Long.parseLong(finishTime),
+-             hostName, -1, null,
+-             state, maybeParseCounters(counters),
+-             null);
+-        }
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> finalSEEs() {
+-    return finals;
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> nonFinalSEEs() {
+-    return nonFinals;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java
+deleted file mode 100644
+index bd9fe9aca40..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.List;
+-
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-
+-/**
+- * {@link ReduceTaskAttemptInfo} represents the information with regard to a
+- * reduce task attempt.
+- */
+-public class ReduceTaskAttemptInfo extends TaskAttemptInfo {
+-  private long shuffleTime;
+-  private long mergeTime;
+-  private long reduceTime;
+-
+-  public ReduceTaskAttemptInfo(State state, TaskInfo taskInfo, long shuffleTime,
+-      long mergeTime, long reduceTime, List<List<Integer>> allSplits) {
+-    super(state, taskInfo,
+-          allSplits == null
+-            ? LoggedTaskAttempt.SplitVectorKind.getNullSplitsVector()
+-           : allSplits);
+-    this.shuffleTime = shuffleTime;
+-    this.mergeTime = mergeTime;
+-    this.reduceTime = reduceTime;
+-  }
+-
+-
+-  /**
+-   *
+-   * @deprecated please use the constructor with 
+-   *               {@code (state, taskInfo, shuffleTime, mergeTime, reduceTime
+-   *                  List<List<Integer>> allSplits)}
+-   *             instead.  
+-   *
+-   * see {@link LoggedTaskAttempt} for an explanation of
+-   *        {@code allSplits}.
+-   *
+-   * If there are no known splits, use {@code null}.
+-   */
+-  @Deprecated
+-  public ReduceTaskAttemptInfo(State state, TaskInfo taskInfo, long shuffleTime,
+-      long mergeTime, long reduceTime) {
+-    this(state, taskInfo, shuffleTime, mergeTime, reduceTime, null);
+-  }
+-
+-  /**
+-   * Get the runtime for the <b>reduce</b> phase of the reduce task-attempt.
+-   * 
+-   * @return the runtime for the <b>reduce</b> phase of the reduce task-attempt
+-   */
+-  public long getReduceRuntime() {
+-    return reduceTime;
+-  }
+-
+-  /**
+-   * Get the runtime for the <b>shuffle</b> phase of the reduce task-attempt.
+-   * 
+-   * @return the runtime for the <b>shuffle</b> phase of the reduce task-attempt
+-   */
+-  public long getShuffleRuntime() {
+-    return shuffleTime;
+-  }
+-
+-  /**
+-   * Get the runtime for the <b>merge</b> phase of the reduce task-attempt
+-   * 
+-   * @return the runtime for the <b>merge</b> phase of the reduce task-attempt
+-   */
+-  public long getMergeRuntime() {
+-    return mergeTime;
+-  }
+-
+-  @Override
+-  public long getRuntime() {
+-    return (getShuffleRuntime() + getMergeRuntime() + getReduceRuntime());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java
+deleted file mode 100644
+index a0944c8134a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java
++++ /dev/null
+@@ -1,160 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-
+-/**
+- * Captures the resource usage metrics.
+- */
+-public class ResourceUsageMetrics implements Writable, DeepCompare  {
+-  private long cumulativeCpuUsage;
+-  private long virtualMemoryUsage;
+-  private long physicalMemoryUsage;
+-  private long heapUsage;
+-  
+-  public ResourceUsageMetrics() {
+-  }
+-  
+-  /**
+-   * Get the cumulative CPU usage.
+-   */
+-  public long getCumulativeCpuUsage() {
+-    return cumulativeCpuUsage;
+-  }
+-  
+-  /**
+-   * Set the cumulative CPU usage.
+-   */
+-  public void setCumulativeCpuUsage(long usage) {
+-    cumulativeCpuUsage = usage;
+-  }
+-  
+-  /**
+-   * Get the virtual memory usage.
+-   */
+-  public long getVirtualMemoryUsage() {
+-    return virtualMemoryUsage;
+-  }
+-  
+-  /**
+-   * Set the virtual memory usage.
+-   */
+-  public void setVirtualMemoryUsage(long usage) {
+-    virtualMemoryUsage = usage;
+-  }
+-  
+-  /**
+-   * Get the physical memory usage.
+-   */
+-  public long getPhysicalMemoryUsage() {
+-    return physicalMemoryUsage;
+-  }
+-  
+-  /**
+-   * Set the physical memory usage.
+-   */
+-  public void setPhysicalMemoryUsage(long usage) {
+-    physicalMemoryUsage = usage;
+-  }
+-  
+-  /**
+-   * Get the total heap usage.
+-   */
+-  public long getHeapUsage() {
+-    return heapUsage;
+-  }
+-  
+-  /**
+-   * Set the total heap usage.
+-   */
+-  public void setHeapUsage(long usage) {
+-    heapUsage = usage;
+-  }
+-  
+-  /**
+-   * Returns the size of the serialized data
+-   */
+-  public int size() {
+-    int size = 0;
+-    size += WritableUtils.getVIntSize(cumulativeCpuUsage);   // long #1
+-    size += WritableUtils.getVIntSize(virtualMemoryUsage);   // long #2
+-    size += WritableUtils.getVIntSize(physicalMemoryUsage);  // long #3
+-    size += WritableUtils.getVIntSize(heapUsage);            // long #4
+-    return size;
+-  }
+-  
+-  @Override
+-  public void readFields(DataInput in) throws IOException {
+-    cumulativeCpuUsage = WritableUtils.readVLong(in);  // long #1
+-    virtualMemoryUsage = WritableUtils.readVLong(in);  // long #2
+-    physicalMemoryUsage = WritableUtils.readVLong(in); // long #3
+-    heapUsage = WritableUtils.readVLong(in);           // long #4
+-  }
+-  
+-  @Override
+-  public void write(DataOutput out) throws IOException {
+-    //TODO Write resources version no too
+-    WritableUtils.writeVLong(out, cumulativeCpuUsage);  // long #1
+-    WritableUtils.writeVLong(out, virtualMemoryUsage);  // long #2
+-    WritableUtils.writeVLong(out, physicalMemoryUsage); // long #3
+-    WritableUtils.writeVLong(out, heapUsage);           // long #4
+-  }
+-
+-  private static void compareMetric(long m1, long m2, TreePath loc) 
+-  throws DeepInequalityException {
+-    if (m1 != m2) {
+-      throw new DeepInequalityException("Value miscompared:" + loc.toString(), 
+-                                        loc);
+-    }
+-  }
+-  
+-  private static void compareSize(ResourceUsageMetrics m1, 
+-                                  ResourceUsageMetrics m2, TreePath loc) 
+-  throws DeepInequalityException {
+-    if (m1.size() != m2.size()) {
+-      throw new DeepInequalityException("Size miscompared: " + loc.toString(), 
+-                                        loc);
+-    }
+-  }
+-  
+-  @Override
+-  public void deepCompare(DeepCompare other, TreePath loc)
+-      throws DeepInequalityException {
+-    if (!(other instanceof ResourceUsageMetrics)) {
+-      throw new DeepInequalityException("Comparand has wrong type", loc);
+-    }
+-
+-    ResourceUsageMetrics metrics2 = (ResourceUsageMetrics) other;
+-    compareMetric(getCumulativeCpuUsage(), metrics2.getCumulativeCpuUsage(), 
+-                  new TreePath(loc, "cumulativeCpu"));
+-    compareMetric(getVirtualMemoryUsage(), metrics2.getVirtualMemoryUsage(), 
+-                  new TreePath(loc, "virtualMemory"));
+-    compareMetric(getPhysicalMemoryUsage(), metrics2.getPhysicalMemoryUsage(), 
+-                  new TreePath(loc, "physicalMemory"));
+-    compareMetric(getHeapUsage(), metrics2.getHeapUsage(), 
+-                  new TreePath(loc, "heapUsage"));
+-    compareSize(this, metrics2, new TreePath(loc, "size"));
+-  }
+-}
+-
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java
+deleted file mode 100644
+index 7bff20cbe0d..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.BufferedInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-/**
+- * A simple wrapper class to make any input stream "rewindable". It could be
+- * made more memory efficient by grow the internal buffer adaptively.
+- */
+-public class RewindableInputStream extends InputStream {
+-  private InputStream input;
+-
+-  /**
+-   * Constructor.
+-   * 
+-   * @param input
+-   */
+-  public RewindableInputStream(InputStream input) {
+-    this(input, 1024 * 1024);
+-  }
+-
+-  /**
+-   * Constructor
+-   * 
+-   * @param input
+-   *          input stream.
+-   * @param maxBytesToRemember
+-   *          Maximum number of bytes we need to remember at the beginning of
+-   *          the stream. If {@link #rewind()} is called after so many bytes are
+-   *          read from the stream, {@link #rewind()} would fail.
+-   */
+-  public RewindableInputStream(InputStream input, int maxBytesToRemember) {
+-    this.input = new BufferedInputStream(input, maxBytesToRemember);
+-    this.input.mark(maxBytesToRemember);
+-  }
+-
+-  @Override
+-  public int read() throws IOException {
+-    return input.read();
+-  }
+-
+-  @Override
+-  public int read(byte[] buffer, int offset, int length) throws IOException {
+-    return input.read(buffer, offset, length);
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    input.close();
+-  }
+-
+-  public InputStream rewind() throws IOException {
+-    try {
+-      input.reset();
+-      return this;
+-    } catch (IOException e) {
+-      throw new IOException("Unable to rewind the stream", e);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java
+deleted file mode 100644
+index c41819c6b12..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-
+-abstract class SingleEventEmitter {
+-  abstract HistoryEvent maybeEmitEvent(ParsedLine line, String name,
+-      HistoryEventEmitter that);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
+deleted file mode 100644
+index dd002a4342a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
++++ /dev/null
+@@ -1,182 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.text.ParseException;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.TaskID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFailedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskStartedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskUpdatedEvent;
+-
+-public class Task20LineHistoryEventEmitter extends HistoryEventEmitter {
+-
+-  static List<SingleEventEmitter> nonFinals =
+-      new LinkedList<SingleEventEmitter>();
+-  static List<SingleEventEmitter> finals = new LinkedList<SingleEventEmitter>();
+-
+-  Long originalStartTime = null;
+-  TaskType originalTaskType = null;
+-
+-  static {
+-    nonFinals.add(new TaskStartedEventEmitter());
+-    nonFinals.add(new TaskUpdatedEventEmitter());
+-
+-    finals.add(new TaskFinishedEventEmitter());
+-    finals.add(new TaskFailedEventEmitter());
+-  }
+-
+-  protected Task20LineHistoryEventEmitter() {
+-    super();
+-  }
+-
+-  static private class TaskStartedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskIDName == null) {
+-        return null;
+-      }
+-
+-      TaskID taskID = TaskID.forName(taskIDName);
+-
+-      String taskType = line.get("TASK_TYPE");
+-      String startTime = line.get("START_TIME");
+-      String splits = line.get("SPLITS");
+-
+-      if (startTime != null && taskType != null) {
+-        Task20LineHistoryEventEmitter that =
+-            (Task20LineHistoryEventEmitter) thatg;
+-
+-        that.originalStartTime = Long.parseLong(startTime);
+-        that.originalTaskType =
+-            Version20LogInterfaceUtils.get20TaskType(taskType);
+-
+-        return new TaskStartedEvent(taskID, that.originalStartTime,
+-            that.originalTaskType, splits);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class TaskUpdatedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskIDName == null) {
+-        return null;
+-      }
+-
+-      TaskID taskID = TaskID.forName(taskIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      if (finishTime != null) {
+-        return new TaskUpdatedEvent(taskID, Long.parseLong(finishTime));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class TaskFinishedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskIDName == null) {
+-        return null;
+-      }
+-
+-      TaskID taskID = TaskID.forName(taskIDName);
+-
+-      String status = line.get("TASK_STATUS");
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      String error = line.get("ERROR");
+-
+-      String counters = line.get("COUNTERS");
+-
+-      if (finishTime != null && error == null
+-          && (status != null && status.equalsIgnoreCase("success"))) {
+-        Counters eventCounters = maybeParseCounters(counters);
+-
+-        Task20LineHistoryEventEmitter that =
+-            (Task20LineHistoryEventEmitter) thatg;
+-
+-        if (that.originalTaskType == null) {
+-          return null;
+-        }
+-
+-        return new TaskFinishedEvent(taskID, null, Long.parseLong(finishTime),
+-            that.originalTaskType, status, eventCounters);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class TaskFailedEventEmitter extends SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskIDName == null) {
+-        return null;
+-      }
+-
+-      TaskID taskID = TaskID.forName(taskIDName);
+-
+-      String status = line.get("TASK_STATUS");
+-      String finishTime = line.get("FINISH_TIME");
+-
+-      String taskType = line.get("TASK_TYPE");
+-
+-      String error = line.get("ERROR");
+-
+-      if (finishTime != null
+-          && (error != null || (status != null && !status
+-              .equalsIgnoreCase("success")))) {
+-        Task20LineHistoryEventEmitter that =
+-            (Task20LineHistoryEventEmitter) thatg;
+-
+-        TaskType originalTaskType =
+-            that.originalTaskType == null ? Version20LogInterfaceUtils
+-                .get20TaskType(taskType) : that.originalTaskType;
+-
+-        return new TaskFailedEvent(taskID, Long.parseLong(finishTime),
+-            originalTaskType, error, status, null);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> finalSEEs() {
+-    return finals;
+-  }
+-
+-  @Override
+-  List<SingleEventEmitter> nonFinalSEEs() {
+-    return nonFinals;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
+deleted file mode 100644
+index b8cb83b4cc2..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java
++++ /dev/null
+@@ -1,171 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.text.ParseException;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.mapreduce.Counters;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptStartedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletionEvent;
+-
+-public abstract class TaskAttempt20LineEventEmitter extends HistoryEventEmitter {
+-  static List<SingleEventEmitter> taskEventNonFinalSEEs =
+-      new LinkedList<SingleEventEmitter>();
+-  static List<SingleEventEmitter> taskEventFinalSEEs =
+-      new LinkedList<SingleEventEmitter>();
+-
+-  static private final int DEFAULT_HTTP_PORT = 80;
+-
+-  Long originalStartTime = null;
+-  org.apache.hadoop.mapreduce.TaskType originalTaskType = null;
+-
+-  static {
+-    taskEventNonFinalSEEs.add(new TaskAttemptStartedEventEmitter());
+-    taskEventNonFinalSEEs.add(new TaskAttemptFinishedEventEmitter());
+-    taskEventNonFinalSEEs
+-        .add(new TaskAttemptUnsuccessfulCompletionEventEmitter());
+-  }
+-
+-  protected TaskAttempt20LineEventEmitter() {
+-    super();
+-  }
+-
+-  static private class TaskAttemptStartedEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskAttemptIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskAttemptIDName == null) {
+-        return null;
+-      }
+-
+-      TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskAttemptIDName);
+-
+-      String startTime = line.get("START_TIME");
+-      String taskType = line.get("TASK_TYPE");
+-      String trackerName = line.get("TRACKER_NAME");
+-      String httpPort = line.get("HTTP_PORT");
+-      String locality = line.get("LOCALITY");
+-      if (locality == null) {
+-        locality = "";
+-      }
+-      String avataar = line.get("AVATAAR");
+-      if (avataar == null) {
+-        avataar = "";
+-      }
+-
+-      if (startTime != null && taskType != null) {
+-        TaskAttempt20LineEventEmitter that =
+-            (TaskAttempt20LineEventEmitter) thatg;
+-
+-        that.originalStartTime = Long.parseLong(startTime);
+-        that.originalTaskType =
+-            Version20LogInterfaceUtils.get20TaskType(taskType);
+-
+-        int port =
+-            httpPort.equals("") ? DEFAULT_HTTP_PORT : Integer
+-                .parseInt(httpPort);
+-
+-        return new TaskAttemptStartedEvent(taskAttemptID,
+-            that.originalTaskType, that.originalStartTime, trackerName, port, -1,
+-            locality, avataar);
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class TaskAttemptFinishedEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskAttemptIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskAttemptIDName == null) {
+-        return null;
+-      }
+-
+-      TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskAttemptIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-      String status = line.get("TASK_STATUS");
+-
+-      if (finishTime != null && status != null
+-          && status.equalsIgnoreCase("success")) {
+-        String hostName = line.get("HOSTNAME");
+-        String counters = line.get("COUNTERS");
+-        String state = line.get("STATE_STRING");
+-
+-        TaskAttempt20LineEventEmitter that =
+-            (TaskAttempt20LineEventEmitter) thatg;
+-
+-        ParsedHost pHost = ParsedHost.parse(hostName);
+-
+-        return new TaskAttemptFinishedEvent(taskAttemptID,
+-            that.originalTaskType, status, Long.parseLong(finishTime),
+-            pHost.getRackName(), pHost.getNodeName(), state, 
+-            maybeParseCounters(counters));
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-  static private class TaskAttemptUnsuccessfulCompletionEventEmitter extends
+-      SingleEventEmitter {
+-    HistoryEvent maybeEmitEvent(ParsedLine line, String taskAttemptIDName,
+-        HistoryEventEmitter thatg) {
+-      if (taskAttemptIDName == null) {
+-        return null;
+-      }
+-
+-      TaskAttemptID taskAttemptID = TaskAttemptID.forName(taskAttemptIDName);
+-
+-      String finishTime = line.get("FINISH_TIME");
+-      String status = line.get("TASK_STATUS");
+-
+-      if (finishTime != null && status != null
+-          && !status.equalsIgnoreCase("success")) {
+-        String hostName = line.get("HOSTNAME");
+-        String error = line.get("ERROR");
+-
+-        TaskAttempt20LineEventEmitter that =
+-            (TaskAttempt20LineEventEmitter) thatg;
+-
+-        ParsedHost pHost = ParsedHost.parse(hostName);
+-        String rackName = null;
+-        
+-        // Earlier versions of MR logged on hostnames (without rackname) for
+-        // unsuccessful attempts
+-        if (pHost != null) {
+-          rackName = pHost.getRackName();
+-          hostName = pHost.getNodeName();
+-        }
+-        return new TaskAttemptUnsuccessfulCompletionEvent
+-          (taskAttemptID,
+-           that.originalTaskType, status, Long.parseLong(finishTime),
+-           hostName, -1, rackName, error, null);
+-      }
+-
+-      return null;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java
+deleted file mode 100644
+index d13974f2ca2..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.List;
+-
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-
+-/**
+- * {@link TaskAttemptInfo} is a collection of statistics about a particular
+- * task-attempt gleaned from job-history of the job.
+- */
+-public abstract class TaskAttemptInfo {
+-  protected final State state;
+-  protected final TaskInfo taskInfo;
+-
+-  protected final List<List<Integer>> allSplits;
+-
+-  protected TaskAttemptInfo
+-       (State state, TaskInfo taskInfo, List<List<Integer>> allSplits) {
+-    if (state == State.SUCCEEDED || state == State.FAILED) {
+-      this.state = state;
+-    } else {
+-      throw new IllegalArgumentException("status cannot be " + state);
+-    }
+-    this.taskInfo = taskInfo;
+-    this.allSplits = allSplits;
+-  }
+-
+-  protected TaskAttemptInfo
+-       (State state, TaskInfo taskInfo) {
+-    this(state, taskInfo, LoggedTaskAttempt.SplitVectorKind.getNullSplitsVector());
+-  }
+-
+-  /**
+-   * Get the final {@link State} of the task-attempt.
+-   * 
+-   * @return the final <code>State</code> of the task-attempt
+-   */
+-  public State getRunState() {
+-    return state;
+-  }
+-
+-  /**
+-   * Get the total runtime for the task-attempt.
+-   * 
+-   * @return the total runtime for the task-attempt
+-   */
+-  public abstract long getRuntime();
+-
+-  /**
+-   * Get the {@link TaskInfo} for the given task-attempt.
+-   * 
+-   * @return the <code>TaskInfo</code> for the given task-attempt
+-   */
+-  public TaskInfo getTaskInfo() {
+-    return taskInfo;
+-  }
+-      
+-  public List<Integer> getSplitVector(LoggedTaskAttempt.SplitVectorKind kind) {
+-    return kind.get(allSplits);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java
+deleted file mode 100644
+index 6159f85fef1..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-public class TaskInfo {
+-  private final long bytesIn;
+-  private final int recsIn;
+-  private final long bytesOut;
+-  private final int recsOut;
+-  private final long maxMemory;
+-  private final long maxVcores;
+-  private final ResourceUsageMetrics metrics;
+-
+-
+-  public TaskInfo(long bytesIn, int recsIn, long bytesOut, int recsOut,
+-                  long maxMemory) {
+-    this(bytesIn, recsIn, bytesOut, recsOut, maxMemory, 1,
+-        new ResourceUsageMetrics());
+-  }
+-
+-  public TaskInfo(long bytesIn, int recsIn, long bytesOut, int recsOut,
+-                  long maxMemory, ResourceUsageMetrics
+-                      metrics) {
+-    this(bytesIn, recsIn, bytesOut, recsOut, maxMemory, 1, metrics);
+-  }
+-
+-  public TaskInfo(long bytesIn, int recsIn, long bytesOut, int recsOut,
+-      long maxMemory, long maxVcores) {
+-    this(bytesIn, recsIn, bytesOut, recsOut, maxMemory, maxVcores,
+-         new ResourceUsageMetrics());
+-  }
+-  
+-  public TaskInfo(long bytesIn, int recsIn, long bytesOut, int recsOut,
+-                  long maxMemory, long maxVcores, ResourceUsageMetrics
+-                      metrics) {
+-    this.bytesIn = bytesIn;
+-    this.recsIn = recsIn;
+-    this.bytesOut = bytesOut;
+-    this.recsOut = recsOut;
+-    this.maxMemory = maxMemory;
+-    this.maxVcores = maxVcores;
+-    this.metrics = metrics;
+-  }
+-
+-  /**
+-   * @return Raw bytes read from the FileSystem into the task. Note that this
+-   *         may not always match the input bytes to the task.
+-   */
+-  public long getInputBytes() {
+-    return bytesIn;
+-  }
+-
+-  /**
+-   * @return Number of records input to this task.
+-   */
+-  public int getInputRecords() {
+-    return recsIn;
+-  }
+-
+-  /**
+-   * @return Raw bytes written to the destination FileSystem. Note that this may
+-   *         not match output bytes.
+-   */
+-  public long getOutputBytes() {
+-    return bytesOut;
+-  }
+-
+-  /**
+-   * @return Number of records output from this task.
+-   */
+-  public int getOutputRecords() {
+-    return recsOut;
+-  }
+-
+-  /**
+-   * @return Memory used by the task leq the heap size.
+-   */
+-  public long getTaskMemory() {
+-    return maxMemory;
+-  }
+-
+-  /**
+-   * @return Vcores used by the task.
+-   */
+-  public long getTaskVCores() {
+-    return maxVcores;
+-  }
+-
+-  /**
+-   * @return Resource usage metrics
+-   */
+-  public ResourceUsageMetrics getResourceUsageMetrics() {
+-    return metrics;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java
+deleted file mode 100644
+index 7cef6d19092..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java
++++ /dev/null
+@@ -1,138 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.Properties;
+-import java.util.StringTokenizer;
+-
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletionEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.MapAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent;
+-import org.apache.hadoop.mapreduce.jobhistory.TaskStartedEvent;
+-
+-/**
+- * Building the cluster topology.
+- */
+-public class TopologyBuilder {
+-  private Set<ParsedHost> allHosts = new HashSet<ParsedHost>();
+-
+-  /**
+-   * Process one {@link HistoryEvent}
+-   * 
+-   * @param event
+-   *          The {@link HistoryEvent} to be processed.
+-   */
+-  public void process(HistoryEvent event) {
+-    if (event instanceof TaskAttemptFinishedEvent) {
+-      processTaskAttemptFinishedEvent((TaskAttemptFinishedEvent) event);
+-    } else if (event instanceof TaskAttemptUnsuccessfulCompletionEvent) {
+-      processTaskAttemptUnsuccessfulCompletionEvent((TaskAttemptUnsuccessfulCompletionEvent) event);
+-    } else if (event instanceof TaskStartedEvent) {
+-      processTaskStartedEvent((TaskStartedEvent) event);
+-    } else if (event instanceof MapAttemptFinishedEvent) {
+-      processMapAttemptFinishedEvent((MapAttemptFinishedEvent) event);
+-    } else if (event instanceof ReduceAttemptFinishedEvent) {
+-      processReduceAttemptFinishedEvent((ReduceAttemptFinishedEvent) event);
+-    }
+-
+-    // I do NOT expect these if statements to be exhaustive.
+-  }
+-
+-  /**
+-   * Process a collection of JobConf {@link Properties}. We do not restrict it
+-   * to be called once.
+-   * 
+-   * @param conf
+-   *          The job conf properties to be added.
+-   */
+-  public void process(Properties conf) {
+-    // no code
+-  }
+-
+-  /**
+-   * Request the builder to build the final object. Once called, the
+-   * {@link TopologyBuilder} would accept no more events or job-conf properties.
+-   * 
+-   * @return Parsed {@link LoggedNetworkTopology} object.
+-   */
+-  public LoggedNetworkTopology build() {
+-    return new LoggedNetworkTopology(allHosts);
+-  }
+-
+-  private void processTaskStartedEvent(TaskStartedEvent event) {
+-    preferredLocationForSplits(event.getSplitLocations());
+-  }
+-
+-  private void processTaskAttemptUnsuccessfulCompletionEvent(
+-      TaskAttemptUnsuccessfulCompletionEvent event) {
+-    recordParsedHost(event.getHostname(), event.getRackName());
+-  }
+-
+-  private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) {
+-    recordParsedHost(event.getHostname(), event.getRackName());
+-  }
+-
+-  private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) {
+-    recordParsedHost(event.getHostname(), event.getRackName());
+-  }
+-
+-  private void processReduceAttemptFinishedEvent(ReduceAttemptFinishedEvent event) {
+-    recordParsedHost(event.getHostname(), event.getRackName());
+-  }
+-
+-  private void recordParsedHost(String hostName, String rackName) {
+-    if (hostName == null) {
+-      return;
+-    }
+-    ParsedHost result = null;
+-    if (rackName == null) {
+-      result = ParsedHost.parse(hostName);
+-    } else {
+-      result = new ParsedHost(rackName, hostName);
+-    }
+-    
+-
+-    if (result != null && !allHosts.contains(result)) {
+-      allHosts.add(result);
+-    }
+-  }
+-
+-  private void recordParsedHost(String nodeName) {
+-    ParsedHost result = ParsedHost.parse(nodeName);
+-
+-    if (result != null && !allHosts.contains(result)) {
+-      allHosts.add(result);
+-    }
+-  }
+-
+-  private void preferredLocationForSplits(String splits) {
+-    if (splits != null) {
+-      StringTokenizer tok = new StringTokenizer(splits, ",", false);
+-
+-      while (tok.hasMoreTokens()) {
+-        String nextSplit = tok.nextToken();
+-
+-        recordParsedHost(nextSplit);
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java
+deleted file mode 100644
+index b402a16cee0..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java
++++ /dev/null
+@@ -1,315 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.Serializable;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Comparator;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Properties;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.Configured;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.LocatedFileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent;
+-import org.apache.hadoop.mapreduce.v2.hs.JobHistory;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * The main driver of the Rumen Parser.
+- */
+-public class TraceBuilder extends Configured implements Tool {
+-  static final private Logger LOG = LoggerFactory.getLogger(TraceBuilder.class);
+-
+-  static final int RUN_METHOD_FAILED_EXIT_CODE = 3;
+-
+-  TopologyBuilder topologyBuilder = new TopologyBuilder();
+-  Outputter<LoggedJob> traceWriter;
+-  Outputter<LoggedNetworkTopology> topologyWriter;
+-
+-  static class MyOptions {
+-    Class<? extends InputDemuxer> inputDemuxerClass = DefaultInputDemuxer.class;
+-
+-    @SuppressWarnings("unchecked")
+-    Class<? extends Outputter> clazzTraceOutputter = DefaultOutputter.class;
+-    Path traceOutput;
+-    Path topologyOutput;
+-
+-    List<Path> inputs = new LinkedList<Path>();
+-
+-    MyOptions(String[] args, Configuration conf) throws FileNotFoundException,
+-        IOException, ClassNotFoundException {
+-      int switchTop = 0;
+-
+-      // to determine if the input paths should be recursively scanned or not
+-      boolean doRecursiveTraversal = false;
+-
+-      while (args[switchTop].startsWith("-")) {
+-        if (args[switchTop].equalsIgnoreCase("-demuxer")) {
+-          inputDemuxerClass =
+-              Class.forName(args[++switchTop]).asSubclass(InputDemuxer.class);
+-        } else if (args[switchTop].equalsIgnoreCase("-recursive")) {
+-          doRecursiveTraversal = true;
+-        }
+-        ++switchTop;
+-      }
+-
+-      traceOutput = new Path(args[0 + switchTop]);
+-      topologyOutput = new Path(args[1 + switchTop]);
+-
+-      for (int i = 2 + switchTop; i < args.length; ++i) {
+-        inputs.addAll(processInputArgument(
+-            args[i], conf, doRecursiveTraversal));
+-      }
+-    }
+-
+-    /**
+-     * Compare the history file names, not the full paths.
+-     * Job history file name format is such that doing lexicographic sort on the
+-     * history file names should result in the order of jobs' submission times.
+-     */
+-    private static class HistoryLogsComparator
+-        implements Comparator<FileStatus>, Serializable {
+-      @Override
+-      public int compare(FileStatus file1, FileStatus file2) {
+-        return file1.getPath().getName().compareTo(
+-                   file2.getPath().getName());
+-      }
+-    }
+-
+-    /**
+-     * Processes the input file/folder argument. If the input is a file,
+-     * then it is directly considered for further processing by TraceBuilder.
+-     * If the input is a folder, then all the history logs in the
+-     * input folder are considered for further processing.
+-     *
+-     * If isRecursive is true, then the input path is recursively scanned
+-     * for job history logs for further processing by TraceBuilder.
+-     *
+-     * NOTE: If the input represents a globbed path, then it is first flattened
+-     *       and then the individual paths represented by the globbed input
+-     *       path are considered for further processing.
+-     *
+-     * @param input        input path, possibly globbed
+-     * @param conf         configuration
+-     * @param isRecursive  whether to recursively traverse the input paths to
+-     *                     find history logs
+-     * @return the input history log files' paths
+-     * @throws FileNotFoundException
+-     * @throws IOException
+-     */
+-    static List<Path> processInputArgument(String input, Configuration conf,
+-        boolean isRecursive) throws FileNotFoundException, IOException {
+-      Path inPath = new Path(input);
+-      FileSystem fs = inPath.getFileSystem(conf);
+-      FileStatus[] inStatuses = fs.globStatus(inPath);
+-
+-      List<Path> inputPaths = new LinkedList<Path>();
+-      if (inStatuses == null || inStatuses.length == 0) {
+-        return inputPaths;
+-      }
+-
+-      for (FileStatus inStatus : inStatuses) {
+-        Path thisPath = inStatus.getPath();
+-        if (inStatus.isDirectory()) {
+-
+-          // Find list of files in this path(recursively if -recursive option
+-          // is specified).
+-          List<FileStatus> historyLogs = new ArrayList<FileStatus>();
+-
+-          RemoteIterator<LocatedFileStatus> iter =
+-            fs.listFiles(thisPath, isRecursive);
+-          while (iter.hasNext()) {
+-            LocatedFileStatus child = iter.next();
+-            String fileName = child.getPath().getName();
+-
+-            if (!(fileName.endsWith(".crc") || fileName.startsWith("."))) {
+-              historyLogs.add(child);
+-            }
+-          }
+-
+-          if (historyLogs.size() > 0) {
+-            // Add the sorted history log file names in this path to the
+-            // inputPaths list
+-            FileStatus[] sortableNames =
+-                historyLogs.toArray(new FileStatus[historyLogs.size()]);
+-            Arrays.sort(sortableNames, new HistoryLogsComparator());
+-
+-            for (FileStatus historyLog : sortableNames) {
+-              inputPaths.add(historyLog.getPath());
+-            }
+-          }
+-        } else {
+-          inputPaths.add(thisPath);
+-        }
+-      }
+-
+-      return inputPaths;
+-    }
+-  }
+-
+-  public static void main(String[] args) {
+-    TraceBuilder builder = new TraceBuilder();
+-    int result = RUN_METHOD_FAILED_EXIT_CODE;
+-
+-    try {
+-      result = ToolRunner.run(builder, args); 
+-    } catch (Throwable t) {
+-      t.printStackTrace(System.err);
+-    } finally {
+-      try {
+-        builder.finish();
+-      } finally {
+-        if (result == 0) {
+-          return;
+-        }
+-
+-        System.exit(result);
+-      }
+-    }
+-  }
+-
+-
+-  @SuppressWarnings("unchecked")
+-  @Override
+-  public int run(String[] args) throws Exception {
+-    MyOptions options = new MyOptions(args, getConf());
+-    traceWriter = options.clazzTraceOutputter.newInstance();
+-    traceWriter.init(options.traceOutput, getConf());
+-    topologyWriter = new DefaultOutputter<LoggedNetworkTopology>();
+-    topologyWriter.init(options.topologyOutput, getConf());
+-
+-    try {
+-      JobBuilder jobBuilder = null;
+-
+-      for (Path p : options.inputs) {
+-        InputDemuxer inputDemuxer = options.inputDemuxerClass.newInstance();
+-
+-        try {
+-          inputDemuxer.bindTo(p, getConf());
+-        } catch (IOException e) {
+-          LOG.warn("Unable to bind Path " + p + " .  Skipping...", e);
+-
+-          continue;
+-        }
+-
+-        Pair<String, InputStream> filePair = null;
+-
+-        try {
+-          while ((filePair = inputDemuxer.getNext()) != null) {
+-            RewindableInputStream ris =
+-                new RewindableInputStream(filePair.second());
+-
+-            JobHistoryParser parser = null;
+-
+-            try {
+-              String jobID = JobHistoryUtils.extractJobID(filePair.first());
+-              if (jobID == null) {
+-                LOG.warn("File skipped: Invalid file name: "
+-                    + filePair.first());
+-                continue;
+-              }
+-              if ((jobBuilder == null)
+-                  || (!jobBuilder.getJobID().equals(jobID))) {
+-                if (jobBuilder != null) {
+-                  traceWriter.output(jobBuilder.build());
+-                }
+-                jobBuilder = new JobBuilder(jobID);
+-              }
+-
+-              if (JobHistoryUtils.isJobConfXml(filePair.first())) {
+-                processJobConf(JobConfigurationParser.parse(ris.rewind()),
+-                               jobBuilder);
+-              } else {
+-                parser = JobHistoryParserFactory.getParser(ris);
+-                if (parser == null) {
+-                  LOG.warn("File skipped: Cannot find suitable parser: "
+-                      + filePair.first());
+-                } else {
+-                  processJobHistory(parser, jobBuilder);
+-                }
+-              }
+-            } finally {
+-              if (parser == null) {
+-                ris.close();
+-              } else {
+-                parser.close();
+-                parser = null;
+-              }
+-            }
+-          }
+-        } catch (Throwable t) {
+-          if (filePair != null) {
+-            LOG.warn("TraceBuilder got an error while processing the [possibly virtual] file "
+-                + filePair.first() + " within Path " + p , t);
+-          }
+-        } finally {
+-          inputDemuxer.close();
+-        }
+-      }
+-      if (jobBuilder != null) {
+-        traceWriter.output(jobBuilder.build());
+-        jobBuilder = null;
+-      } else {
+-        LOG.warn("No job found in traces: ");
+-      }
+-
+-      topologyWriter.output(topologyBuilder.build());
+-    } finally {
+-      traceWriter.close();
+-      topologyWriter.close();
+-    }
+-
+-    return 0;
+-  }
+-
+-  private void processJobConf(Properties properties, JobBuilder jobBuilder) {
+-    jobBuilder.process(properties);
+-    topologyBuilder.process(properties);
+-  }
+-
+-  void processJobHistory(JobHistoryParser parser, JobBuilder jobBuilder)
+-      throws IOException {
+-    HistoryEvent e;
+-    while ((e = parser.nextEvent()) != null) {
+-      jobBuilder.process(e);
+-      topologyBuilder.process(e);
+-    }
+-
+-    parser.close();
+-  }
+-
+-  void finish() {
+-    IOUtils.cleanupWithLogger(LOG, traceWriter, topologyWriter);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java
+deleted file mode 100644
+index 98a8c1afd5c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-/**
+- * This describes a path from a node to the root. We use it when we compare two
+- * trees during rumen unit tests. If the trees are not identical, this chain
+- * will be converted to a string which describes the path from the root to the
+- * fields that did not compare.
+- * 
+- */
+-public class TreePath {
+-  final TreePath parent;
+-
+-  final String fieldName;
+-
+-  final int index;
+-
+-  public TreePath(TreePath parent, String fieldName) {
+-    super();
+-
+-    this.parent = parent;
+-    this.fieldName = fieldName;
+-    this.index = -1;
+-  }
+-
+-  public TreePath(TreePath parent, String fieldName, int index) {
+-    super();
+-
+-    this.parent = parent;
+-    this.fieldName = fieldName;
+-    this.index = index;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    String mySegment = fieldName + (index == -1 ? "" : ("[" + index + "]"));
+-
+-    return ((parent == null) ? "" : parent.toString() + "-->") + mySegment;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java
+deleted file mode 100644
+index 7b3ba02ac28..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import org.apache.hadoop.mapreduce.TaskType;
+-
+-// This class exists to hold a bunch of static utils.  It's never instantiated.
+-abstract class Version20LogInterfaceUtils {
+-
+-  static TaskType get20TaskType(String taskType) {
+-    try {
+-      return TaskType.valueOf(taskType);
+-    } catch (IllegalArgumentException e) {
+-      if ("CLEANUP".equals(taskType)) {
+-        return TaskType.JOB_CLEANUP;
+-      }
+-
+-      if ("SETUP".equals(taskType)) {
+-        return TaskType.JOB_SETUP;
+-      }
+-
+-      return null;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java
+deleted file mode 100644
+index 6b9fdd202cb..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java
++++ /dev/null
+@@ -1,150 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayDeque;
+-import java.util.Deque;
+-import java.util.IdentityHashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * {@link ZombieCluster} rebuilds the cluster topology using the information
+- * obtained from job history logs.
+- */
+-public class ZombieCluster extends AbstractClusterStory {
+-  private Node root;
+-
+-  /**
+-   * Construct a homogeneous cluster. We assume that the leaves on the topology
+-   * are {@link MachineNode}s, and the parents of {@link MachineNode}s are
+-   * {@link RackNode}s. We also expect all leaf nodes are on the same level.
+-   * 
+-   * @param topology
+-   *          The network topology.
+-   * @param defaultNode
+-   *          The default node setting.
+-   */
+-  public ZombieCluster(LoggedNetworkTopology topology, MachineNode defaultNode) {
+-    buildCluster(topology, defaultNode);
+-  }
+-
+-  /**
+-   * Construct a homogeneous cluster. We assume that the leaves on the topology
+-   * are {@link MachineNode}s, and the parents of {@link MachineNode}s are
+-   * {@link RackNode}s. We also expect all leaf nodes are on the same level.
+-   * 
+-   * @param path Path to the JSON-encoded topology file.
+-   * @param conf
+-   * @param defaultNode
+-   *          The default node setting.
+-   * @throws IOException 
+-   */
+-  public ZombieCluster(Path path, MachineNode defaultNode, Configuration conf) throws IOException {
+-    this(new ClusterTopologyReader(path, conf).get(), defaultNode);
+-  }
+-  
+-  /**
+-   * Construct a homogeneous cluster. We assume that the leaves on the topology
+-   * are {@link MachineNode}s, and the parents of {@link MachineNode}s are
+-   * {@link RackNode}s. We also expect all leaf nodes are on the same level.
+-   * 
+-   * @param input The input stream for the JSON-encoded topology file.
+-   * @param defaultNode
+-   *          The default node setting.
+-   * @throws IOException 
+-   */
+-  public ZombieCluster(InputStream input, MachineNode defaultNode) throws IOException {
+-    this(new ClusterTopologyReader(input).get(), defaultNode);
+-  }
+-
+-  @Override
+-  public Node getClusterTopology() {
+-    return root;
+-  }
+-
+-  private final void buildCluster(LoggedNetworkTopology topology,
+-      MachineNode defaultNode) {
+-    Map<LoggedNetworkTopology, Integer> levelMapping = 
+-      new IdentityHashMap<LoggedNetworkTopology, Integer>();
+-    Deque<LoggedNetworkTopology> unvisited = 
+-      new ArrayDeque<LoggedNetworkTopology>();
+-    unvisited.add(topology);
+-    levelMapping.put(topology, 0);
+-    
+-    // building levelMapping and determine leafLevel
+-    int leafLevel = -1; // -1 means leafLevel unknown.
+-    for (LoggedNetworkTopology n = unvisited.poll(); n != null; 
+-      n = unvisited.poll()) {
+-      int level = levelMapping.get(n);
+-      List<LoggedNetworkTopology> children = n.getChildren();
+-      if (children == null || children.isEmpty()) {
+-        if (leafLevel == -1) {
+-          leafLevel = level;
+-        } else if (leafLevel != level) {
+-          throw new IllegalArgumentException(
+-              "Leaf nodes are not on the same level");
+-        }
+-      } else {
+-        for (LoggedNetworkTopology child : children) {
+-          levelMapping.put(child, level + 1);
+-          unvisited.addFirst(child);
+-        }
+-      }
+-    }
+-
+-    /**
+-     * A second-pass dfs traverse of topology tree. path[i] contains the parent
+-     * of the node at level i+1.
+-     */
+-    Node[] path = new Node[leafLevel];
+-    unvisited.add(topology);
+-    for (LoggedNetworkTopology n = unvisited.poll(); n != null; 
+-      n = unvisited.poll()) {
+-      int level = levelMapping.get(n);
+-      Node current;
+-      if (level == leafLevel) { // a machine node
+-        MachineNode.Builder builder = 
+-          new MachineNode.Builder(n.getName().getValue(), level);
+-        if (defaultNode != null) {
+-          builder.cloneFrom(defaultNode);
+-        }
+-        current = builder.build();
+-      } else {
+-        current = (level == leafLevel - 1) 
+-          ? new RackNode(n.getName().getValue(), level) : 
+-            new Node(n.getName().getValue(), level);
+-        path[level] = current;
+-        // Add all children to the front of the queue.
+-        for (LoggedNetworkTopology child : n.getChildren()) {
+-          unvisited.addFirst(child);
+-        }
+-      }
+-      if (level != 0) {
+-        path[level - 1].addChild(current);
+-      }
+-    }
+-
+-    root = path[0];
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java
+deleted file mode 100644
+index 36625aa0c77..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java
++++ /dev/null
+@@ -1,939 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.HashMap;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.TaskStatus.State;
+-import org.apache.hadoop.mapreduce.ID;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.JobID;
+-import org.apache.hadoop.mapreduce.TaskAttemptID;
+-import org.apache.hadoop.mapreduce.TaskID;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.tools.rumen.datatypes.*;
+-import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values;
+-
+-/**
+- * {@link ZombieJob} is a layer above {@link LoggedJob} raw JSON objects.
+- * 
+- * Each {@link ZombieJob} object represents a job in job history. For everything
+- * that exists in job history, contents are returned unchanged faithfully. To
+- * get input splits of a non-exist task, a non-exist task attempt, or an
+- * ill-formed task attempt, proper objects are made up from statistical
+- * sketches.
+- */
+-@SuppressWarnings("deprecation")
+-public class ZombieJob implements JobStory {
+-  static final Logger LOG = LoggerFactory.getLogger(ZombieJob.class);
+-  private final LoggedJob job;
+-  private Map<TaskID, LoggedTask> loggedTaskMap;
+-  private Map<TaskAttemptID, LoggedTaskAttempt> loggedTaskAttemptMap;
+-  private final Random random;
+-  private InputSplit[] splits;
+-  private final ClusterStory cluster;
+-  private JobConf jobConf;
+-
+-  private long seed;
+-  private long numRandomSeeds = 0;
+-  private boolean hasRandomSeed = false;
+-
+-  private Map<LoggedDiscreteCDF, CDFRandomGenerator> interpolatorMap =
+-      new HashMap<LoggedDiscreteCDF, CDFRandomGenerator>();
+-
+-  // TODO: Fix ZombieJob to initialize this correctly from observed data
+-  double rackLocalOverNodeLocal = 1.5;
+-  double rackRemoteOverNodeLocal = 3.0;
+-
+-  /**
+-   * This constructor creates a {@link ZombieJob} with the same semantics as the
+-   * {@link LoggedJob} passed in this parameter
+-   * 
+-   * @param job
+-   *          The dead job this ZombieJob instance is based on.
+-   * @param cluster
+-   *          The cluster topology where the dead job ran on. This argument can
+-   *          be null if we do not have knowledge of the cluster topology.
+-   * @param seed
+-   *          Seed for the random number generator for filling in information
+-   *          not available from the ZombieJob.
+-   */
+-  public ZombieJob(LoggedJob job, ClusterStory cluster, long seed) {
+-    if (job == null) {
+-      throw new IllegalArgumentException("job is null");
+-    }
+-    this.job = job;
+-    this.cluster = cluster;
+-    random = new Random(seed);
+-    this.seed = seed;
+-    hasRandomSeed = true;
+-  }
+-
+-  /**
+-   * This constructor creates a {@link ZombieJob} with the same semantics as the
+-   * {@link LoggedJob} passed in this parameter
+-   * 
+-   * @param job
+-   *          The dead job this ZombieJob instance is based on.
+-   * @param cluster
+-   *          The cluster topology where the dead job ran on. This argument can
+-   *          be null if we do not have knowledge of the cluster topology.
+-   */
+-  public ZombieJob(LoggedJob job, ClusterStory cluster) {
+-    this(job, cluster, System.nanoTime());
+-  }
+-
+-  private static State convertState(Values status) {
+-    if (status == Values.SUCCESS) {
+-      return State.SUCCEEDED;
+-    } else if (status == Values.FAILED) {
+-      return State.FAILED;
+-    } else if (status == Values.KILLED) {
+-      return State.KILLED;
+-    } else {
+-      throw new IllegalArgumentException("unknown status " + status);
+-    }
+-  }
+-
+-  @Override
+-  public synchronized JobConf getJobConf() {
+-    if (jobConf == null) {
+-      jobConf = new JobConf();
+-      
+-      // Add parameters from the configuration in the job trace
+-      //
+-      // The reason why the job configuration parameters, as seen in the jobconf
+-      // file, are added first because the specialized values obtained from 
+-      // Rumen should override the job conf values.
+-      //
+-      for (Map.Entry<Object, Object> entry : job.getJobProperties().getValue().entrySet()) {
+-        jobConf.set(entry.getKey().toString(), entry.getValue().toString());
+-      }
+-      
+-      //TODO Eliminate parameters that are already copied from the job's 
+-      // configuration file.
+-      jobConf.setJobName(getName());
+-      jobConf.setUser(getUser());
+-      jobConf.setNumMapTasks(getNumberMaps());
+-      jobConf.setNumReduceTasks(getNumberReduces());
+-      jobConf.setQueueName(getQueueName());
+-    }
+-    return jobConf;
+-  }
+-  
+-  @Override
+-  public InputSplit[] getInputSplits() {
+-    if (splits == null) {
+-      List<InputSplit> splitsList = new ArrayList<InputSplit>();
+-      Path emptyPath = new Path("/");
+-      int totalHosts = 0; // use to determine avg # of hosts per split.
+-      for (LoggedTask mapTask : job.getMapTasks()) {
+-        Pre21JobHistoryConstants.Values taskType = mapTask.getTaskType();
+-        if (taskType != Pre21JobHistoryConstants.Values.MAP) {
+-          LOG.warn("TaskType for a MapTask is not Map. task="
+-              + mapTask.getTaskID() + " type="
+-              + ((taskType == null) ? "null" : taskType.toString()));
+-          continue;
+-        }
+-        List<LoggedLocation> locations = mapTask.getPreferredLocations();
+-        List<String> hostList = new ArrayList<String>();
+-        if (locations != null) {
+-          for (LoggedLocation location : locations) {
+-            List<NodeName> layers = location.getLayers();
+-            if (layers.size() == 0) {
+-              LOG.warn("Bad location layer format for task "+mapTask.getTaskID());
+-              continue;
+-            }
+-            String host = layers.get(layers.size() - 1).getValue();
+-            if (host == null) {
+-              LOG.warn("Bad location layer format for task "+mapTask.getTaskID() + ": " + layers);
+-              continue;
+-            }
+-            hostList.add(host);
+-          }
+-        }
+-        String[] hosts = hostList.toArray(new String[hostList.size()]);
+-        totalHosts += hosts.length;
+-        long mapInputBytes = getTaskInfo(mapTask).getInputBytes();
+-        if (mapInputBytes < 0) {
+-          LOG.warn("InputBytes for task "+mapTask.getTaskID()+" is not defined.");
+-          mapInputBytes = 0;
+-        }
+-       
+-        splitsList.add(new FileSplit(emptyPath, 0, mapInputBytes, hosts));
+-      }
+-
+-      // If not all map tasks are in job trace, should make up some splits
+-      // for missing map tasks.
+-      int totalMaps = job.getTotalMaps();
+-      if (totalMaps < splitsList.size()) {
+-        LOG.warn("TotalMaps for job " + job.getJobID()
+-            + " is less than the total number of map task descriptions ("
+-            + totalMaps + "<" + splitsList.size() + ").");
+-      }
+-
+-      int avgHostPerSplit;
+-      if (splitsList.size() == 0) {
+-        avgHostPerSplit = 3;
+-      } else {
+-        avgHostPerSplit = totalHosts / splitsList.size();
+-        if (avgHostPerSplit == 0) {
+-          avgHostPerSplit = 3;
+-        }
+-      }
+-
+-      for (int i = splitsList.size(); i < totalMaps; i++) {
+-        if (cluster == null) {
+-          splitsList.add(new FileSplit(emptyPath, 0, 0, new String[0]));
+-        } else {
+-          MachineNode[] mNodes = cluster.getRandomMachines(avgHostPerSplit,
+-                                                           random);
+-          String[] hosts = new String[mNodes.length];
+-          for (int j = 0; j < hosts.length; ++j) {
+-            hosts[j] = mNodes[j].getName();
+-          }
+-          // TODO set size of a split to 0 now.
+-          splitsList.add(new FileSplit(emptyPath, 0, 0, hosts));
+-        }
+-      }
+-
+-      splits = splitsList.toArray(new InputSplit[splitsList.size()]);
+-    }
+-    return splits;
+-  }
+-
+-  @Override
+-  public String getName() {
+-    JobName jobName = job.getJobName();
+-    if (jobName == null || jobName.getValue() == null) {
+-      return "(name unknown)";
+-    } else {
+-      return jobName.getValue();
+-    }
+-  }
+-
+-  @Override
+-  public JobID getJobID() {
+-    return getLoggedJob().getJobID();
+-  }
+-
+-  private int sanitizeValue(int oldVal, int defaultVal, String name, JobID id) {
+-    if (oldVal == -1) {
+-      LOG.warn(name +" not defined for "+id);
+-      return defaultVal;
+-    }
+-    return oldVal;
+-  }
+-  
+-  @Override
+-  public int getNumberMaps() {
+-    return sanitizeValue(job.getTotalMaps(), 0, "NumberMaps", job.getJobID());
+-  }
+-
+-  @Override
+-  public int getNumberReduces() {
+-    return sanitizeValue(job.getTotalReduces(), 0, "NumberReduces", job.getJobID());
+-  }
+-
+-  @Override
+-  public Values getOutcome() {
+-    return job.getOutcome();
+-  }
+-
+-  @Override
+-  public long getSubmissionTime() {
+-    return job.getSubmitTime() - job.getRelativeTime();
+-  }
+-
+-  @Override
+-  public String getQueueName() {
+-    QueueName queue = job.getQueue();
+-    return (queue == null || queue.getValue() == null) 
+-           ? JobConf.DEFAULT_QUEUE_NAME 
+-           : queue.getValue();
+-  }
+-  
+-  /**
+-   * Getting the number of map tasks that are actually logged in the trace.
+-   * @return The number of map tasks that are actually logged in the trace.
+-   */
+-  public int getNumLoggedMaps() {
+-    return job.getMapTasks().size();
+-  }
+-
+-
+-  /**
+-   * Getting the number of reduce tasks that are actually logged in the trace.
+-   * @return The number of map tasks that are actually logged in the trace.
+-   */
+-  public int getNumLoggedReduces() {
+-    return job.getReduceTasks().size();
+-  }
+-  
+-  /**
+-   * Mask the job ID part in a {@link TaskID}.
+-   * 
+-   * @param taskId
+-   *          raw {@link TaskID} read from trace
+-   * @return masked {@link TaskID} with empty {@link JobID}.
+-   */
+-  private TaskID maskTaskID(TaskID taskId) {
+-    JobID jobId = new JobID();
+-    TaskType taskType = taskId.getTaskType();
+-    return new TaskID(jobId, taskType, taskId.getId());
+-  }
+-
+-  /**
+-   * Mask the job ID part in a {@link TaskAttemptID}.
+-   * 
+-   * @param attemptId
+-   *          raw {@link TaskAttemptID} read from trace
+-   * @return masked {@link TaskAttemptID} with empty {@link JobID}.
+-   */
+-  private TaskAttemptID maskAttemptID(TaskAttemptID attemptId) {
+-    JobID jobId = new JobID();
+-    TaskType taskType = attemptId.getTaskType();
+-    TaskID taskId = attemptId.getTaskID();
+-    return new TaskAttemptID(jobId.getJtIdentifier(), jobId.getId(), taskType,
+-        taskId.getId(), attemptId.getId());
+-  }
+-
+-  private LoggedTask sanitizeLoggedTask(LoggedTask task) {
+-    if (task == null) {
+-      return null;
+-    }
+-    if (task.getTaskType() == null) {
+-      LOG.warn("Task " + task.getTaskID() + " has nulll TaskType");
+-      return null;
+-    }
+-    if (task.getTaskStatus() == null) {
+-      LOG.warn("Task " + task.getTaskID() + " has nulll TaskStatus");
+-      return null;
+-    }
+-    return task;
+-  }
+-
+-  private LoggedTaskAttempt sanitizeLoggedTaskAttempt(LoggedTaskAttempt attempt) {
+-    if (attempt == null) {
+-      return null;
+-    }
+-    if (attempt.getResult() == null) {
+-      LOG.warn("TaskAttempt " + attempt.getResult() + " has nulll Result");
+-      return null;
+-    }
+-
+-    return attempt;
+-  }
+-
+-  /**
+-   * Build task mapping and task attempt mapping, to be later used to find
+-   * information of a particular {@link TaskID} or {@link TaskAttemptID}.
+-   */
+-  private synchronized void buildMaps() {
+-    if (loggedTaskMap == null) {
+-      loggedTaskMap = new HashMap<TaskID, LoggedTask>();
+-      loggedTaskAttemptMap = new HashMap<TaskAttemptID, LoggedTaskAttempt>();
+-      
+-      for (LoggedTask map : job.getMapTasks()) {
+-        map = sanitizeLoggedTask(map);
+-        if (map != null) {
+-          loggedTaskMap.put(maskTaskID(map.taskID), map);
+-
+-          for (LoggedTaskAttempt mapAttempt : map.getAttempts()) {
+-            mapAttempt = sanitizeLoggedTaskAttempt(mapAttempt);
+-            if (mapAttempt != null) {
+-              TaskAttemptID id = mapAttempt.getAttemptID();
+-              loggedTaskAttemptMap.put(maskAttemptID(id), mapAttempt);
+-            }
+-          }
+-        }
+-      }
+-      for (LoggedTask reduce : job.getReduceTasks()) {
+-        reduce = sanitizeLoggedTask(reduce);
+-        if (reduce != null) {
+-          loggedTaskMap.put(maskTaskID(reduce.taskID), reduce);
+-
+-          for (LoggedTaskAttempt reduceAttempt : reduce.getAttempts()) {
+-            reduceAttempt = sanitizeLoggedTaskAttempt(reduceAttempt);
+-            if (reduceAttempt != null) {
+-              TaskAttemptID id = reduceAttempt.getAttemptID();
+-              loggedTaskAttemptMap.put(maskAttemptID(id), reduceAttempt);
+-            }
+-          }
+-        }
+-      }
+-
+-      // TODO: do not care about "other" tasks, "setup" or "clean"
+-    }
+-  }
+-
+-  @Override
+-  public String getUser() {
+-    UserName retval = job.getUser();
+-    return (retval == null || retval.getValue() == null)
+-           ? "(unknown)"
+-           : retval.getValue();
+-  }
+-
+-  /**
+-   * Get the underlining {@link LoggedJob} object read directly from the trace.
+-   * This is mainly for debugging.
+-   * 
+-   * @return the underlining {@link LoggedJob} object
+-   */
+-  public LoggedJob getLoggedJob() {
+-    return job;
+-  }
+-
+-  /**
+-   * Get a {@link TaskAttemptInfo} with a {@link TaskAttemptID} associated with
+-   * taskType, taskNumber, and taskAttemptNumber. This function does not care
+-   * about locality, and follows the following decision logic: 1. Make up a
+-   * {@link TaskAttemptInfo} if the task attempt is missing in trace, 2. Make up
+-   * a {@link TaskAttemptInfo} if the task attempt has a KILLED final status in
+-   * trace, 3. Otherwise (final state is SUCCEEDED or FAILED), construct the
+-   * {@link TaskAttemptInfo} from the trace.
+-   */
+-  public TaskAttemptInfo getTaskAttemptInfo(TaskType taskType, int taskNumber,
+-      int taskAttemptNumber) {
+-    // does not care about locality. assume default locality is NODE_LOCAL.
+-    // But if both task and task attempt exist in trace, use logged locality.
+-    int locality = 0;
+-    LoggedTask loggedTask = getLoggedTask(taskType, taskNumber);
+-    if (loggedTask == null) {
+-      // TODO insert parameters
+-      TaskInfo taskInfo = new TaskInfo(0, 0, 0, 0, 0, 0);
+-      return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-          taskNumber, locality);
+-    }
+-
+-    LoggedTaskAttempt loggedAttempt = getLoggedTaskAttempt(taskType,
+-        taskNumber, taskAttemptNumber);
+-    if (loggedAttempt == null) {
+-      // Task exists, but attempt is missing.
+-      TaskInfo taskInfo = getTaskInfo(loggedTask);
+-      return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-          taskNumber, locality);
+-    } else {
+-      // TODO should we handle killed attempts later?
+-      if (loggedAttempt.getResult()== Values.KILLED) {
+-        TaskInfo taskInfo = getTaskInfo(loggedTask);
+-        return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-            taskNumber, locality);
+-      } else {
+-        return getTaskAttemptInfo(loggedTask, loggedAttempt);
+-      }
+-    }
+-  }
+-
+-  @Override
+-  public TaskInfo getTaskInfo(TaskType taskType, int taskNumber) {
+-    return getTaskInfo(getLoggedTask(taskType, taskNumber));
+-  }
+-
+-  /**
+-   * Get a {@link TaskAttemptInfo} with a {@link TaskAttemptID} associated with
+-   * taskType, taskNumber, and taskAttemptNumber. This function considers
+-   * locality, and follows the following decision logic: 1. Make up a
+-   * {@link TaskAttemptInfo} if the task attempt is missing in trace, 2. Make up
+-   * a {@link TaskAttemptInfo} if the task attempt has a KILLED final status in
+-   * trace, 3. If final state is FAILED, construct a {@link TaskAttemptInfo}
+-   * from the trace, without considering locality. 4. If final state is
+-   * SUCCEEDED, construct a {@link TaskAttemptInfo} from the trace, with runtime
+-   * scaled according to locality in simulation and locality in trace.
+-   */
+-  @Override
+-  public TaskAttemptInfo getMapTaskAttemptInfoAdjusted(int taskNumber,
+-      int taskAttemptNumber, int locality) {
+-    TaskType taskType = TaskType.MAP;
+-    LoggedTask loggedTask = getLoggedTask(taskType, taskNumber);
+-    if (loggedTask == null) {
+-      // TODO insert parameters
+-      TaskInfo taskInfo = new TaskInfo(0, 0, 0, 0, 0, 0);
+-      return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-          taskNumber, locality);
+-    }
+-    LoggedTaskAttempt loggedAttempt = getLoggedTaskAttempt(taskType,
+-        taskNumber, taskAttemptNumber);
+-    if (loggedAttempt == null) {
+-      // Task exists, but attempt is missing.
+-      TaskInfo taskInfo = getTaskInfo(loggedTask);
+-      return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-          taskNumber, locality);
+-    } else {
+-      // Task and TaskAttempt both exist.
+-      if (loggedAttempt.getResult() == Values.KILLED) {
+-        TaskInfo taskInfo = getTaskInfo(loggedTask);
+-        return makeUpTaskAttemptInfo(taskType, taskInfo, taskAttemptNumber,
+-            taskNumber, locality);
+-      } else if (loggedAttempt.getResult() == Values.FAILED) {
+-        /**
+-         * FAILED attempt is not affected by locality however, made-up FAILED
+-         * attempts ARE affected by locality, since statistics are present for
+-         * attempts of different locality.
+-         */
+-        return getTaskAttemptInfo(loggedTask, loggedAttempt);
+-      } else if (loggedAttempt.getResult() == Values.SUCCESS) {
+-        int loggedLocality = getLocality(loggedTask, loggedAttempt);
+-        if (locality == loggedLocality) {
+-          return getTaskAttemptInfo(loggedTask, loggedAttempt);
+-        } else {
+-          // attempt succeeded in trace. It is scheduled in simulation with
+-          // a different locality.
+-          return scaleInfo(loggedTask, loggedAttempt, locality, loggedLocality,
+-              rackLocalOverNodeLocal, rackRemoteOverNodeLocal);
+-        }
+-      } else {
+-        throw new IllegalArgumentException(
+-            "attempt result is not SUCCEEDED, FAILED or KILLED: "
+-                + loggedAttempt.getResult());
+-      }
+-    }
+-  }
+-
+-  private long sanitizeTaskRuntime(long time, ID id) {
+-    if (time < 0) {
+-      LOG.warn("Negative running time for task "+id+": "+time);
+-      return 100L; // set default to 100ms.
+-    }
+-    return time;
+-  }
+-  
+-  @SuppressWarnings("hiding") 
+-  private TaskAttemptInfo scaleInfo(LoggedTask loggedTask,
+-      LoggedTaskAttempt loggedAttempt, int locality, int loggedLocality,
+-      double rackLocalOverNodeLocal, double rackRemoteOverNodeLocal) {
+-    TaskInfo taskInfo = getTaskInfo(loggedTask);
+-    double[] factors = new double[] { 1.0, rackLocalOverNodeLocal,
+-        rackRemoteOverNodeLocal };
+-    double scaleFactor = factors[locality] / factors[loggedLocality];
+-    State state = convertState(loggedAttempt.getResult());
+-    if (loggedTask.getTaskType() == Values.MAP) {
+-      long taskTime = 0;
+-      if (loggedAttempt.getStartTime() == 0) {
+-        taskTime = makeUpMapRuntime(state, locality);
+-      } else {
+-        taskTime = loggedAttempt.getFinishTime() - loggedAttempt.getStartTime();
+-      }
+-      taskTime = sanitizeTaskRuntime(taskTime, loggedAttempt.getAttemptID());
+-      taskTime *= scaleFactor;
+-      return new MapTaskAttemptInfo
+-        (state, taskInfo, taskTime, loggedAttempt.allSplitVectors());
+-    } else {
+-      throw new IllegalArgumentException("taskType can only be MAP: "
+-          + loggedTask.getTaskType());
+-    }
+-  }
+-
+-  private int getLocality(LoggedTask loggedTask, LoggedTaskAttempt loggedAttempt) {
+-    int distance = cluster.getMaximumDistance();
+-    String rackHostName = loggedAttempt.getHostName().getValue();
+-    if (rackHostName == null) {
+-      return distance;
+-    }
+-    MachineNode mn = getMachineNode(rackHostName);
+-    if (mn == null) {
+-      return distance;
+-    }
+-    List<LoggedLocation> locations = loggedTask.getPreferredLocations();
+-    if (locations != null) {
+-      for (LoggedLocation location : locations) {
+-        List<NodeName> layers = location.getLayers();
+-        if ((layers == null) || (layers.isEmpty())) {
+-          continue;
+-        }
+-        String dataNodeName = layers.get(layers.size()-1).getValue();
+-        MachineNode dataNode = cluster.getMachineByName(dataNodeName);
+-        if (dataNode != null) {
+-          distance = Math.min(distance, cluster.distance(mn, dataNode));
+-        }
+-      }
+-    }
+-    return distance;
+-  }
+-
+-  private MachineNode getMachineNode(String rackHostName) {
+-    ParsedHost parsedHost = ParsedHost.parse(rackHostName);
+-    String hostName = (parsedHost == null) ? rackHostName 
+-                                           : parsedHost.getNodeName();
+-    if (hostName == null) {
+-      return null;
+-    }
+-    return (cluster == null) ? null : cluster.getMachineByName(hostName);
+-  }
+-
+-  private TaskAttemptInfo getTaskAttemptInfo(LoggedTask loggedTask,
+-      LoggedTaskAttempt loggedAttempt) {
+-    TaskInfo taskInfo = getTaskInfo(loggedTask);
+-    
+-    List<List<Integer>> allSplitVectors = loggedAttempt.allSplitVectors();
+-
+-    State state = convertState(loggedAttempt.getResult());
+-    if (loggedTask.getTaskType() == Values.MAP) {
+-      long taskTime;
+-      if (loggedAttempt.getStartTime() == 0) {
+-        int locality = getLocality(loggedTask, loggedAttempt);
+-        taskTime = makeUpMapRuntime(state, locality);
+-      } else {
+-        taskTime = loggedAttempt.getFinishTime() - loggedAttempt.getStartTime();
+-      }
+-      taskTime = sanitizeTaskRuntime(taskTime, loggedAttempt.getAttemptID());
+-      return new MapTaskAttemptInfo(state, taskInfo, taskTime, allSplitVectors);
+-    } else if (loggedTask.getTaskType() == Values.REDUCE) {
+-      long startTime = loggedAttempt.getStartTime();
+-      long mergeDone = loggedAttempt.getSortFinished();
+-      long shuffleDone = loggedAttempt.getShuffleFinished();
+-      long finishTime = loggedAttempt.getFinishTime();
+-      if (startTime <= 0 || startTime >= finishTime) {
+-        // have seen startTime>finishTime.
+-        // haven't seen reduce task with startTime=0 ever. But if this happens,
+-        // make up a reduceTime with no shuffle/merge.
+-        long reduceTime = makeUpReduceRuntime(state);
+-        return new ReduceTaskAttemptInfo
+-          (state, taskInfo, 0, 0, reduceTime, allSplitVectors);
+-      } else {
+-        if (shuffleDone <= 0) {
+-          shuffleDone = startTime;
+-        }
+-        if (mergeDone <= 0) {
+-          mergeDone = finishTime;
+-        }
+-        long shuffleTime = shuffleDone - startTime;
+-        long mergeTime = mergeDone - shuffleDone;
+-        long reduceTime = finishTime - mergeDone;
+-        reduceTime = sanitizeTaskRuntime(reduceTime, loggedAttempt.getAttemptID());
+-        
+-        return new ReduceTaskAttemptInfo(state, taskInfo, shuffleTime,
+-            mergeTime, reduceTime, allSplitVectors);
+-      }
+-    } else {
+-      throw new IllegalArgumentException("taskType for "
+-          + loggedTask.getTaskID() + " is neither MAP nor REDUCE: "
+-          + loggedTask.getTaskType());
+-    }
+-  }
+-
+-  private TaskInfo getTaskInfo(LoggedTask loggedTask) {
+-    if (loggedTask == null) {
+-      return new TaskInfo(0, 0, 0, 0, 0, 0);
+-    }
+-    List<LoggedTaskAttempt> attempts = loggedTask.getAttempts();
+-
+-    long inputBytes = -1;
+-    long inputRecords = -1;
+-    long outputBytes = -1;
+-    long outputRecords = -1;
+-    long heapMegabytes = -1;
+-    ResourceUsageMetrics metrics = new ResourceUsageMetrics();
+-
+-    Values type = loggedTask.getTaskType();
+-    if ((type != Values.MAP) && (type != Values.REDUCE)) {
+-      throw new IllegalArgumentException(
+-          "getTaskInfo only supports MAP or REDUCE tasks: " + type.toString()
+-              + " for task = " + loggedTask.getTaskID());
+-    }
+-
+-    for (LoggedTaskAttempt attempt : attempts) {
+-      attempt = sanitizeLoggedTaskAttempt(attempt);
+-      // ignore bad attempts or unsuccessful attempts.
+-      if ((attempt == null) || (attempt.getResult() != Values.SUCCESS)) {
+-        continue;
+-      }
+-
+-      if (type == Values.MAP) {
+-        inputBytes = attempt.getHdfsBytesRead();
+-        inputRecords = attempt.getMapInputRecords();
+-        outputBytes =
+-            (job.getTotalReduces() > 0) ? attempt.getMapOutputBytes() : attempt
+-                .getHdfsBytesWritten();
+-        outputRecords = attempt.getMapOutputRecords();
+-        heapMegabytes =
+-            (job.getJobMapMB() > 0) ? job.getJobMapMB() : job
+-                .getHeapMegabytes();
+-      } else {
+-        inputBytes = attempt.getReduceShuffleBytes();
+-        inputRecords = attempt.getReduceInputRecords();
+-        outputBytes = attempt.getHdfsBytesWritten();
+-        outputRecords = attempt.getReduceOutputRecords();
+-        heapMegabytes =
+-            (job.getJobReduceMB() > 0) ? job.getJobReduceMB() : job
+-                .getHeapMegabytes();
+-      }
+-      // set the resource usage metrics
+-      metrics = attempt.getResourceUsageMetrics();
+-      break;
+-    }
+-
+-    //note: hardcoding vCores, as they are not collected
+-    TaskInfo taskInfo =
+-        new TaskInfo(inputBytes, (int) inputRecords, outputBytes,
+-            (int) outputRecords, (int) heapMegabytes, 1,
+-            metrics);
+-    return taskInfo;
+-  }
+-
+-  private TaskAttemptID makeTaskAttemptID(TaskType taskType, int taskNumber,
+-      int taskAttemptNumber) {
+-    return new TaskAttemptID(new TaskID(job.getJobID(), taskType, taskNumber), 
+-                             taskAttemptNumber);
+-  }
+-  
+-  private TaskAttemptInfo makeUpTaskAttemptInfo(TaskType taskType, TaskInfo taskInfo,
+-      int taskAttemptNumber, int taskNumber, int locality) {
+-    if (taskType == TaskType.MAP) {
+-      State state = State.SUCCEEDED;
+-      long runtime = 0;
+-
+-      // make up state
+-      state = makeUpState(taskAttemptNumber, job.getMapperTriesToSucceed());
+-      runtime = makeUpMapRuntime(state, locality);
+-      runtime = sanitizeTaskRuntime(runtime, makeTaskAttemptID(taskType,
+-                                               taskNumber, taskAttemptNumber));
+-      TaskAttemptInfo tai
+-        = new MapTaskAttemptInfo(state, taskInfo, runtime, null);
+-      return tai;
+-    } else if (taskType == TaskType.REDUCE) {
+-      State state = State.SUCCEEDED;
+-      long shuffleTime = 0;
+-      long sortTime = 0;
+-      long reduceTime = 0;
+-
+-      // TODO make up state
+-      // state = makeUpState(taskAttemptNumber, job.getReducerTriesToSucceed());
+-      reduceTime = makeUpReduceRuntime(state);
+-      TaskAttemptInfo tai = new ReduceTaskAttemptInfo
+-        (state, taskInfo, shuffleTime, sortTime, reduceTime, null);
+-      return tai;
+-    }
+-
+-    throw new IllegalArgumentException("taskType is neither MAP nor REDUCE: "
+-        + taskType);
+-  }
+-
+-  private long makeUpReduceRuntime(State state) {
+-    long reduceTime = 0;
+-    for (int i = 0; i < 5; i++) {
+-      reduceTime = doMakeUpReduceRuntime(state);
+-      if (reduceTime >= 0) {
+-        return reduceTime;
+-      }
+-    }
+-    return 0;
+-  }
+-
+-  private long doMakeUpReduceRuntime(State state) {
+-    long reduceTime;
+-    try {
+-      if (state == State.SUCCEEDED) {
+-        reduceTime = makeUpRuntime(job.getSuccessfulReduceAttemptCDF());
+-      } else if (state == State.FAILED) {
+-        reduceTime = makeUpRuntime(job.getFailedReduceAttemptCDF());
+-      } else {
+-        throw new IllegalArgumentException(
+-            "state is neither SUCCEEDED nor FAILED: " + state);
+-      }
+-      return reduceTime;
+-    } catch (NoValueToMakeUpRuntime e) {
+-      return 0;
+-    }
+-  }
+-
+-  private long makeUpMapRuntime(State state, int locality) {
+-    long runtime;
+-    // make up runtime
+-    if (state == State.SUCCEEDED || state == State.FAILED) {
+-      List<LoggedDiscreteCDF> cdfList =
+-          state == State.SUCCEEDED ? job.getSuccessfulMapAttemptCDFs() : job
+-              .getFailedMapAttemptCDFs();
+-      // XXX MapCDFs is a ArrayList of 4 possible groups: distance=0, 1, 2, and
+-      // the last group is "distance cannot be determined". All pig jobs
+-      // would have only the 4th group, and pig tasks usually do not have
+-      // any locality, so this group should count as "distance=2".
+-      // However, setup/cleanup tasks are also counted in the 4th group.
+-      // These tasks do not make sense.
+-      if(cdfList==null) {
+-    	  runtime = -1;
+-    	  return runtime;
+-      }
+-      try {
+-        runtime = makeUpRuntime(cdfList.get(locality));
+-      } catch (NoValueToMakeUpRuntime e) {
+-        runtime = makeUpRuntime(cdfList);
+-      }
+-    } else {
+-      throw new IllegalArgumentException(
+-          "state is neither SUCCEEDED nor FAILED: " + state);
+-    }
+-    return runtime;
+-  }
+-
+-  /**
+-   * Perform a weighted random selection on a list of CDFs, and produce a random
+-   * variable using the selected CDF.
+-   * 
+-   * @param mapAttemptCDFs
+-   *          A list of CDFs for the distribution of runtime for the 1st, 2nd,
+-   *          ... map attempts for the job.
+-   */
+-  private long makeUpRuntime(List<LoggedDiscreteCDF> mapAttemptCDFs) {
+-    int total = 0;
+-    if(mapAttemptCDFs == null) {
+-    	return -1;
+-    }
+-    for (LoggedDiscreteCDF cdf : mapAttemptCDFs) {
+-      total += cdf.getNumberValues();
+-    }
+-    if (total == 0) {
+-      return -1;
+-    }
+-    int index = random.nextInt(total);
+-    for (LoggedDiscreteCDF cdf : mapAttemptCDFs) {
+-      if (index >= cdf.getNumberValues()) {
+-        index -= cdf.getNumberValues();
+-      } else {
+-        if (index < 0) {
+-          throw new IllegalStateException("application error");
+-        }
+-        return makeUpRuntime(cdf);
+-      }
+-    }
+-    throw new IllegalStateException("not possible to get here");
+-  }
+-
+-  private long makeUpRuntime(LoggedDiscreteCDF loggedDiscreteCDF) {
+-    /*
+-     * We need this odd-looking code because if a seed exists we need to ensure
+-     * that only one interpolator is generated per LoggedDiscreteCDF, but if no
+-     * seed exists then the potentially lengthy process of making an
+-     * interpolator can happen outside the lock. makeUpRuntimeCore only locks
+-     * around the two hash map accesses.
+-     */
+-    if (hasRandomSeed) {
+-      synchronized (interpolatorMap) {
+-        return makeUpRuntimeCore(loggedDiscreteCDF);
+-      }
+-    }
+-
+-    return makeUpRuntimeCore(loggedDiscreteCDF);
+-  }
+-  
+-  private synchronized long getNextRandomSeed() {
+-    numRandomSeeds++;
+-    return RandomSeedGenerator.getSeed("forZombieJob" + job.getJobID(),
+-                                       numRandomSeeds);
+-  }
+-   
+-  private long makeUpRuntimeCore(LoggedDiscreteCDF loggedDiscreteCDF) {
+-    CDFRandomGenerator interpolator;
+-
+-    synchronized (interpolatorMap) {
+-      interpolator = interpolatorMap.get(loggedDiscreteCDF);
+-    }
+-
+-    if (interpolator == null) {
+-      if (loggedDiscreteCDF.getNumberValues() == 0) {
+-        throw new NoValueToMakeUpRuntime("no value to use to make up runtime");
+-      }
+-
+-      interpolator =
+-          hasRandomSeed ? new CDFPiecewiseLinearRandomGenerator(
+-              loggedDiscreteCDF, getNextRandomSeed())
+-              : new CDFPiecewiseLinearRandomGenerator(loggedDiscreteCDF);
+-
+-      /*
+-       * It doesn't matter if we compute and store an interpolator twice because
+-       * the two instances will be semantically identical and stateless, unless
+-       * we're seeded, in which case we're not stateless but this code will be
+-       * called synchronizedly.
+-       */
+-      synchronized (interpolatorMap) {
+-        interpolatorMap.put(loggedDiscreteCDF, interpolator);
+-      }
+-    }
+-
+-    return interpolator.randomValue();
+-  }
+-
+-  static private class NoValueToMakeUpRuntime extends IllegalArgumentException {
+-    static final long serialVersionUID = 1L;
+-
+-    NoValueToMakeUpRuntime() {
+-      super();
+-    }
+-
+-    NoValueToMakeUpRuntime(String detailMessage) {
+-      super(detailMessage);
+-    }
+-
+-    NoValueToMakeUpRuntime(String detailMessage, Throwable cause) {
+-      super(detailMessage, cause);
+-    }
+-
+-    NoValueToMakeUpRuntime(Throwable cause) {
+-      super(cause);
+-    }
+-  }
+-
+-  private State makeUpState(int taskAttemptNumber, double[] numAttempts) {
+-	  
+-  // if numAttempts == null we are returning FAILED.
+-  if(numAttempts == null) {
+-    return State.FAILED;
+-  }
+-    if (taskAttemptNumber >= numAttempts.length - 1) {
+-      // always succeed
+-      return State.SUCCEEDED;
+-    } else {
+-      double pSucceed = numAttempts[taskAttemptNumber];
+-      double pFail = 0;
+-      for (int i = taskAttemptNumber + 1; i < numAttempts.length; i++) {
+-        pFail += numAttempts[i];
+-      }
+-      return (random.nextDouble() < pSucceed / (pSucceed + pFail)) ? State.SUCCEEDED
+-          : State.FAILED;
+-    }
+-  }
+-
+-  private TaskID getMaskedTaskID(TaskType taskType, int taskNumber) {
+-    return new TaskID(new JobID(), taskType, taskNumber);
+-  }
+-
+-  private LoggedTask getLoggedTask(TaskType taskType, int taskNumber) {
+-    buildMaps();
+-    return loggedTaskMap.get(getMaskedTaskID(taskType, taskNumber));
+-  }
+-
+-  private LoggedTaskAttempt getLoggedTaskAttempt(TaskType taskType,
+-      int taskNumber, int taskAttemptNumber) {
+-    buildMaps();
+-    TaskAttemptID id =
+-        new TaskAttemptID(getMaskedTaskID(taskType, taskNumber),
+-            taskAttemptNumber);
+-    return loggedTaskAttemptMap.get(id);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java
+deleted file mode 100644
+index 428823dcd60..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java
++++ /dev/null
+@@ -1,133 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * Producing {@link JobStory}s from job trace.
+- */
+-public class ZombieJobProducer implements JobStoryProducer {
+-  private final JobTraceReader reader;
+-  private final ZombieCluster cluster;
+-
+-  private boolean hasRandomSeed = false;
+-  private long randomSeed = 0;
+-      
+-  private ZombieJobProducer(JobTraceReader reader, ZombieCluster cluster,
+-      boolean hasRandomSeed, long randomSeed) {
+-    this.reader = reader;
+-    this.cluster = cluster;
+-    this.hasRandomSeed = hasRandomSeed;
+-    this.randomSeed = (hasRandomSeed) ? randomSeed : System.nanoTime();
+-  }
+-
+-  /**
+-   * Constructor
+-   * 
+-   * @param path
+-   *          Path to the JSON trace file, possibly compressed.
+-   * @param cluster
+-   *          The topology of the cluster that corresponds to the jobs in the
+-   *          trace. The argument can be null if we do not have knowledge of the
+-   *          cluster topology.
+-   * @param conf
+-   * @throws IOException
+-   */
+-  public ZombieJobProducer(Path path, ZombieCluster cluster, Configuration conf)
+-      throws IOException {
+-    this(new JobTraceReader(path, conf), cluster, false, -1);
+-  }
+-
+-  
+-  /**
+-   * Constructor
+-   * 
+-   * @param path
+-   *          Path to the JSON trace file, possibly compressed.
+-   * @param cluster
+-   *          The topology of the cluster that corresponds to the jobs in the
+-   *          trace. The argument can be null if we do not have knowledge of the
+-   *          cluster topology.
+-   * @param conf
+-   * @param randomSeed
+-   *          use a deterministic seed.
+-   * @throws IOException
+-   */
+-  public ZombieJobProducer(Path path, ZombieCluster cluster,
+-      Configuration conf, long randomSeed) throws IOException {
+-    this(new JobTraceReader(path, conf), cluster, true, randomSeed);
+-  }
+-  
+-  /**
+-   * Constructor
+-   * 
+-   * @param input
+-   *          The input stream for the JSON trace.
+-   * @param cluster
+-   *          The topology of the cluster that corresponds to the jobs in the
+-   *          trace. The argument can be null if we do not have knowledge of the
+-   *          cluster topology.
+-   * @throws IOException
+-   */
+-  public ZombieJobProducer(InputStream input, ZombieCluster cluster)
+-      throws IOException {
+-    this(new JobTraceReader(input), cluster, false, -1);
+-  }
+-
+-  /**
+-   * Constructor
+-   * 
+-   * @param input
+-   *          The input stream for the JSON trace.
+-   * @param cluster
+-   *          The topology of the cluster that corresponds to the jobs in the
+-   *          trace. The argument can be null if we do not have knowledge of the
+-   *          cluster topology.
+-   * @param randomSeed
+-   *          use a deterministic seed.
+-   * @throws IOException
+-   */
+-  public ZombieJobProducer(InputStream input, ZombieCluster cluster,
+-      long randomSeed) throws IOException {
+-    this(new JobTraceReader(input), cluster, true, randomSeed);
+-  }
+-
+-  @Override
+-  public ZombieJob getNextJob() throws IOException {
+-    LoggedJob job = reader.getNext();
+-    if (job == null) {
+-      return null;
+-    } else if (hasRandomSeed) {
+-      long subRandomSeed = RandomSeedGenerator.getSeed(
+-            "forZombieJob" + job.getJobID(), randomSeed);
+-      return new ZombieJob(job, cluster, subRandomSeed);
+-    } else {
+-      return new ZombieJob(job, cluster);
+-    }
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    reader.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java
+deleted file mode 100644
+index c3d45a6d4e1..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.anonymization;
+-
+-import org.apache.hadoop.tools.rumen.state.State;
+-
+-/**
+- * The data anonymizer interface.
+- */
+-public interface DataAnonymizer<T> {
+-  T anonymize(T data, State state);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
+deleted file mode 100644
+index 10b8d84852e..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.tools.rumen.anonymization;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import org.apache.hadoop.tools.rumen.state.State;
+-
+-/**
+- * Represents the list of words used in list-backed anonymizers.
+- */
+-public class WordList implements State {
+-  private Map<String, Integer> list = new HashMap<String, Integer>(0);
+-  private boolean isUpdated = false;
+-  private String name;
+-
+-  public WordList() {
+-    this("word");
+-  }
+-
+-  public WordList(String name) {
+-    this.name = name;
+-  }
+-
+-  @Override
+-  public String getName() {
+-    return name;
+-  }
+-
+-  /**
+-   * Adds the specified word to the list if the word is not already added.
+-   */
+-  public void add(String word) {
+-    if (!contains(word)) {
+-      int index = getSize();
+-      list.put(word, index);
+-      isUpdated = true;
+-    }
+-  }
+-
+-  /**
+-   * Returns 'true' if the list contains the specified word.
+-   */
+-  public boolean contains(String word) {
+-    return list.containsKey(word);
+-  }
+-
+-  /**
+-   * Returns the index of the specified word in the list.
+-   */
+-  public int indexOf(String word) {
+-    return list.get(word);
+-  }
+-
+-  /**
+-   * Returns the size of the list.
+-   */
+-  public int getSize() {
+-    return list.size();
+-  }
+-
+-  /**
+-   * Returns 'true' if the list is updated since creation (and reload).
+-   */
+-  @Override
+-  public boolean isUpdated() {
+-    return isUpdated;
+-  }
+-  
+-  /**
+-   * Setters and getters for Jackson JSON
+-   */
+-  /**
+-   * Sets the size of the list.
+-   * 
+-   * Note: That this API is only for Jackson JSON deserialization.
+-   */
+-  public void setSize(int size) {
+-    list = new HashMap<String, Integer>(size);
+-  }
+-  
+-  /**
+-   * Note: That this API is only for Jackson JSON deserialization.
+-   */
+-  @Override
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-  
+-  /**
+-   * Gets the words.
+-   * 
+-   * Note: That this API is only for Jackson JSON serialization.
+-   */
+-  public Map<String, Integer> getWords() {
+-    return list;
+-  }
+-  
+-  /**
+-   * Sets the words. 
+-   * 
+-   * Note: That this API is only for Jackson JSON deserialization.
+-   */
+-  public void setWords(Map<String, Integer> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java
+deleted file mode 100644
+index e6d09dcb3c6..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.anonymization;
+-
+-
+-import org.apache.commons.lang3.StringUtils;
+-
+-/**
+- * Utility class to handle commonly performed tasks in a 
+- * {@link org.apache.hadoop.tools.rumen.datatypes.DefaultAnonymizableDataType} 
+- * using a {@link WordList} for anonymization.
+- * //TODO There is no caching for saving memory.
+- */
+-public class WordListAnonymizerUtility {
+-  static final String[] KNOWN_WORDS = 
+-    new String[] {"job", "tmp", "temp", "home", "homes", "usr", "user", "test"};
+-  
+-  /**
+-   * Checks if the data needs anonymization. Typically, data types which are 
+-   * numeric in nature doesn't need anonymization.
+-   */
+-  public static boolean needsAnonymization(String data) {
+-    // Numeric data doesn't need anonymization
+-    // Currently this doesnt support inputs like
+-    //   - 12.3
+-    //   - 12.3f
+-    //   - 90L
+-    //   - 1D
+-    if (StringUtils.isNumeric(data)) {
+-      return false;
+-    }
+-    return true; // by default return true
+-  }
+-  
+-  /**
+-   * Checks if the given data has a known suffix.
+-   */
+-  public static boolean hasSuffix(String data, String[] suffixes) {
+-    // check if they end in known suffixes
+-    for (String ks : suffixes) {
+-      if (data.endsWith(ks)) {
+-        return true;
+-      }
+-    }
+-    
+-    return false;
+-  }
+-  
+-  /**
+-   * Extracts a known suffix from the given data.
+-   * 
+-   * @throws RuntimeException if the data doesn't have a suffix. 
+-   *         Use {@link #hasSuffix(String, String[])} to make sure that the 
+-   *         given data has a suffix.
+-   */
+-  public static String[] extractSuffix(String data, String[] suffixes) {
+-    // check if they end in known suffixes
+-    String suffix = "";
+-    for (String ks : suffixes) {
+-      if (data.endsWith(ks)) {
+-        suffix = ks;
+-        // stripe off the suffix which will get appended later
+-        data = data.substring(0, data.length() - suffix.length());
+-        return new String[] {data, suffix};
+-      }
+-    }
+-    
+-    // throw exception
+-    throw new RuntimeException("Data [" + data + "] doesn't have a suffix from" 
+-        + " known suffixes [" + StringUtils.join(suffixes, ',') + "]");
+-  }
+-  
+-  /**
+-   * Checks if the given data is known. This API uses {@link #KNOWN_WORDS} to
+-   * detect if the given data is a commonly used (so called 'known') word.
+-   */
+-  public static boolean isKnownData(String data) {
+-    return isKnownData(data, KNOWN_WORDS);
+-  }
+-  
+-  /**
+-   * Checks if the given data is known.
+-   */
+-  public static boolean isKnownData(String data, String[] knownWords) {
+-    // check if the data is known content
+-    //TODO [Chunking] Do this for sub-strings of data
+-    
+-    for (String kd : knownWords) {
+-      if (data.equals(kd)) {
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java
+deleted file mode 100644
+index c70d7752003..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-
+-/**
+- * An interface for data-types that can be anonymized.
+- */
+-public interface AnonymizableDataType<T> extends DataType<T> {
+-  public T getAnonymizedValue(StatePool statePool, Configuration conf);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java
+deleted file mode 100644
+index 5eaef1282cb..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * Represents a class name.
+- */
+-public class ClassName extends DefaultAnonymizableDataType {
+-  public static final String CLASSNAME_PRESERVE_CONFIG = "rumen.data-types.classname.preserve";
+-  private final String className;
+-  
+-  public ClassName(String className) {
+-    super();
+-    this.className = className;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return className;
+-  }
+-  
+-  @Override
+-  protected String getPrefix() {
+-    return "class";
+-  }
+-  
+-  @Override
+-  protected boolean needsAnonymization(Configuration conf) {
+-    String[] preserves = conf.getStrings(CLASSNAME_PRESERVE_CONFIG);
+-    if (preserves != null) {
+-      // do a simple starts with check
+-      for (String p : preserves) {
+-        if (className.startsWith(p)) {
+-          return false;
+-        }
+-      }
+-    }
+-    return true;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java
+deleted file mode 100644
+index 067eb32fbb1..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-/**
+- * Represents a Rumen data-type.
+- */
+-public interface DataType<T> {
+-  T getValue();
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java
+deleted file mode 100644
+index 0791a4326a9..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java
++++ /dev/null
+@@ -1,67 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.anonymization.WordList;
+-import org.apache.hadoop.tools.rumen.anonymization.WordListAnonymizerUtility;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-
+-/**
+- * Represents a default anonymizable Rumen data-type. It uses 
+- * {@link WordListAnonymizerUtility} for anonymization.
+- */
+-public abstract class DefaultAnonymizableDataType 
+-implements AnonymizableDataType<String> {
+-  private static final String DEFAULT_PREFIX = "data";
+-  
+-  protected String getPrefix() {
+-    return DEFAULT_PREFIX;
+-  }
+-  
+-  // Determines if the contained data needs anonymization
+-  protected boolean needsAnonymization(Configuration conf) {
+-    return true;
+-  }
+-  
+-  @Override
+-  public final String getAnonymizedValue(StatePool statePool, 
+-                                         Configuration conf) {
+-    if (needsAnonymization(conf)) {
+-      WordList state = (WordList) statePool.getState(getClass());
+-      if (state == null) {
+-        state = new WordList(getPrefix());
+-        statePool.addState(getClass(), state);
+-      }
+-      return anonymize(getValue(), state);
+-    } else {
+-      return getValue();
+-    }
+-  }
+-  
+-  private static String anonymize(String data, WordList wordList) {
+-    if (data == null) {
+-      return null;
+-    }
+-
+-    if (!wordList.contains(data)) {
+-      wordList.add(data);
+-    }
+-    return wordList.getName() + wordList.indexOf(data);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java
+deleted file mode 100644
+index d00b89ec422..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-/**
+- * This represents the default java data-types (like int, long, float etc).
+- */
+-public class DefaultDataType implements DataType<String> {
+-  private String value;
+-  
+-  public DefaultDataType(String value) {
+-    this.value = value;
+-  }
+-  
+-  /**
+-   * Get the value of the attribute.
+-   */
+-  @Override
+-  public String getValue() {
+-    return value;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java
+deleted file mode 100644
+index c8bbb06a6d5..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java
++++ /dev/null
+@@ -1,213 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.util.StringTokenizer;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.tools.rumen.anonymization.WordList;
+-import org.apache.hadoop.tools.rumen.anonymization.WordListAnonymizerUtility;
+-import org.apache.hadoop.tools.rumen.state.State;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * Represents a file's location.
+- * 
+- * Currently, only filenames that can be represented using {@link Path} are 
+- * supported.
+- */
+-public class FileName implements AnonymizableDataType<String> {
+-  private final String fileName;
+-  private String anonymizedFileName;
+-  private static final String PREV_DIR = "..";
+-  private static final String[] KNOWN_SUFFIXES = 
+-    new String[] {".xml", ".jar", ".txt", ".tar", ".zip", ".json", ".gzip", 
+-                  ".lzo"};
+-  
+-  /**
+-   * A composite state for filename.
+-   */
+-  public static class FileNameState implements State {
+-    private WordList dirState = new WordList("dir");
+-    private WordList fileNameState =  new WordList("file");
+-    
+-    @Override
+-    public boolean isUpdated() {
+-      return dirState.isUpdated() || fileNameState.isUpdated();
+-    }
+-    
+-    public WordList getDirectoryState() {
+-      return dirState;
+-    }
+-    
+-    public WordList getFileNameState() {
+-      return fileNameState;
+-    }
+-    
+-    public void setDirectoryState(WordList state) {
+-      this.dirState = state;
+-    }
+-    
+-    public void setFileNameState(WordList state) {
+-      this.fileNameState = state;
+-    }
+-    
+-    @Override
+-    public String getName() {
+-      return "path";
+-    }
+-    
+-    @Override
+-    public void setName(String name) {
+-      // for now, simply assert since this class has a hardcoded name
+-      if (!getName().equals(name)) {
+-        throw new RuntimeException("State name mismatch! Expected '" 
+-                                   + getName() + "' but found '" + name + "'.");
+-      }
+-    }
+-  }
+-  
+-  public FileName(String fileName) {
+-    this.fileName = fileName;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return fileName;
+-  }
+-  
+-  @Override
+-  public String getAnonymizedValue(StatePool statePool, 
+-                                   Configuration conf) {
+-    if (anonymizedFileName == null) {
+-      anonymize(statePool, conf);
+-    }
+-    return anonymizedFileName;
+-  }
+-  
+-  private void anonymize(StatePool statePool, Configuration conf) {
+-    FileNameState fState = (FileNameState) statePool.getState(getClass());
+-    if (fState == null) {
+-      fState = new FileNameState();
+-      statePool.addState(getClass(), fState);
+-    }
+-    
+-    String[] files = StringUtils.split(fileName);
+-    String[] anonymizedFileNames = new String[files.length];
+-    int i = 0;
+-    for (String f : files) {
+-      anonymizedFileNames[i++] = 
+-        anonymize(statePool, conf, fState, f);
+-    }
+-
+-    anonymizedFileName = StringUtils.arrayToString(anonymizedFileNames);
+-  }
+-  
+-  private static String anonymize(StatePool statePool, Configuration conf, 
+-                                  FileNameState fState, String fileName) {
+-    String ret = null;
+-    try {
+-      URI uri = new URI(fileName);
+-      
+-      // anonymize the path i.e without the authority & scheme
+-      ret = 
+-        anonymizePath(uri.getPath(), fState.getDirectoryState(), 
+-                      fState.getFileNameState());
+-      
+-      // anonymize the authority and scheme
+-      String authority = uri.getAuthority();
+-      String scheme = uri.getScheme();
+-      if (scheme != null) {
+-        String anonymizedAuthority = "";
+-        if (authority != null) {
+-          // anonymize the authority
+-          NodeName hostName = new NodeName(null, uri.getHost());
+-          anonymizedAuthority = hostName.getAnonymizedValue(statePool, conf);
+-        }
+-        ret = scheme + "://" + anonymizedAuthority + ret;
+-      }
+-    } catch (URISyntaxException use) {
+-      throw new RuntimeException (use);
+-    }
+-    
+-    return ret;
+-  }
+-  
+-  // Anonymize the file-path
+-  private static String anonymizePath(String path, WordList dState, 
+-                                      WordList fState) {
+-    StringBuilder buffer = new StringBuilder();
+-    StringTokenizer tokenizer = new StringTokenizer(path, Path.SEPARATOR, true);
+-    while (tokenizer.hasMoreTokens()) {
+-      String token = tokenizer.nextToken();
+-      if (Path.SEPARATOR.equals(token)) {
+-        buffer.append(token);
+-      } else if (Path.CUR_DIR.equals(token)) {
+-        buffer.append(token);
+-      } else if (PREV_DIR.equals(token)) {
+-        buffer.append(token);
+-      } else if (tokenizer.hasMoreTokens()){
+-        // this component is a directory
+-        buffer.append(anonymize(token, dState));
+-      } else {
+-        // this component is a file
+-        buffer.append(anonymize(token, fState));
+-      }
+-    }
+-    
+-    return buffer.toString();
+-  }
+-  
+-  //TODO There is no caching for saving memory.
+-  private static String anonymize(String data, WordList wordList) {
+-    if (data == null) {
+-      return null;
+-    }
+-
+-    if (WordListAnonymizerUtility.needsAnonymization(data)) {
+-      String suffix = "";
+-      String coreData = data;
+-      // check and extract suffix
+-      if (WordListAnonymizerUtility.hasSuffix(data, KNOWN_SUFFIXES)) {
+-        // check if the data ends with a known suffix
+-        String[] split = 
+-          WordListAnonymizerUtility.extractSuffix(data, KNOWN_SUFFIXES);
+-        suffix = split[1];
+-        coreData = split[0];
+-      }
+-
+-      // check if the data is known content
+-      //TODO [Chunking] Do this for sub-strings of data
+-      String anonymizedData = coreData;
+-      if (!WordListAnonymizerUtility.isKnownData(coreData)) {
+-        if (!wordList.contains(coreData)) {
+-          wordList.add(coreData);
+-        }
+-        anonymizedData  = wordList.getName() + wordList.indexOf(coreData);
+-      }
+-
+-      return anonymizedData + suffix;
+-    } else {
+-      return data;
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java
+deleted file mode 100644
+index 45edfe47ad5..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-
+-/**
+- * Represents a job's name.
+- */
+-public class JobName extends DefaultAnonymizableDataType {
+-  private final String jobName;
+-  
+-  public JobName(String jobName) {
+-    super();
+-    this.jobName = jobName;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return jobName;
+-  }
+-  
+-  @Override
+-  protected String getPrefix() {
+-    return "job";
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java
+deleted file mode 100644
+index 7d63d8df229..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.datatypes.util.JobPropertyParser;
+-import org.apache.hadoop.tools.rumen.datatypes.util.MapReduceJobPropertiesParser;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-import org.apache.hadoop.util.ReflectionUtils;
+-
+-/**
+- * This represents the job configuration properties.
+- */
+-public class JobProperties implements AnonymizableDataType<Properties> {
+-  public static final String PARSERS_CONFIG_KEY = 
+-    "rumen.datatypes.jobproperties.parsers";
+-  private final Properties jobProperties;
+-  
+-  public JobProperties() {
+-    this(new Properties());
+-  }
+-  
+-  public JobProperties(Properties properties) {
+-    this.jobProperties = properties;
+-  }
+-  
+-  public Properties getValue() {
+-    return jobProperties;
+-  }
+-  
+-  @Override
+-  public Properties getAnonymizedValue(StatePool statePool, 
+-                                       Configuration conf) {
+-    Properties filteredProperties = null;
+-    List<JobPropertyParser> pList = new ArrayList<JobPropertyParser>(1);
+-    // load the parsers
+-    String config = conf.get(PARSERS_CONFIG_KEY);
+-    if (config != null) {
+-      @SuppressWarnings("unchecked")
+-      Class<JobPropertyParser>[] parsers = 
+-        (Class[])conf.getClasses(PARSERS_CONFIG_KEY);
+-      for (Class<JobPropertyParser> c : parsers) {
+-        JobPropertyParser parser = ReflectionUtils.newInstance(c, conf);
+-        pList.add(parser);
+-      }
+-    } else {
+-      // add the default MapReduce filter
+-      JobPropertyParser parser = new MapReduceJobPropertiesParser();
+-      pList.add(parser);
+-    }
+-    
+-    // filter out the desired config key-value pairs
+-    if (jobProperties != null) {
+-      filteredProperties = new Properties();
+-      // define a configuration object and load it with original job properties
+-      for (Map.Entry<Object, Object> entry : jobProperties.entrySet()) {
+-        //TODO Check for null key/value?
+-        String key = entry.getKey().toString();
+-        String value = entry.getValue().toString(); 
+-        
+-        // find a parser for this key
+-        for (JobPropertyParser p : pList) {
+-          DataType<?> pValue = p.parseJobProperty(key, value);
+-          if (pValue != null) {
+-            filteredProperties.put(key, pValue);
+-            break;
+-          }
+-        }
+-      }
+-    }
+-    return filteredProperties;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java
+deleted file mode 100644
+index 20eb535d0cb..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java
++++ /dev/null
+@@ -1,177 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnore;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.ParsedHost;
+-import org.apache.hadoop.tools.rumen.anonymization.WordList;
+-import org.apache.hadoop.tools.rumen.state.State;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-
+-/**
+- * Represents the cluster host.
+- */
+-public class NodeName implements AnonymizableDataType<String> {
+-  private String hostName;
+-  private String rackName;
+-  private String nodeName;
+-  private String anonymizedNodeName;
+-  
+-  public static final NodeName ROOT = new NodeName("<root>");
+-  
+-  /**
+-   * A composite state for node-name.
+-   */
+-  public static class NodeNameState implements State {
+-    private WordList rackNameState = new WordList("rack");
+-    private WordList hostNameState =  new WordList("host");
+-    
+-    @Override
+-    @JsonIgnore
+-    public boolean isUpdated() {
+-      return rackNameState.isUpdated() || hostNameState.isUpdated();
+-    }
+-    
+-    public WordList getRackNameState() {
+-      return rackNameState;
+-    }
+-    
+-    public WordList getHostNameState() {
+-      return hostNameState;
+-    }
+-    
+-    public void setRackNameState(WordList state) {
+-      this.rackNameState = state;
+-    }
+-    
+-    public void setHostNameState(WordList state) {
+-      this.hostNameState = state;
+-    }
+-    
+-    @Override
+-    public String getName() {
+-      return "node";
+-    }
+-    
+-    @Override
+-    public void setName(String name) {
+-      // for now, simply assert since this class has a hardcoded name
+-      if (!getName().equals(name)) {
+-        throw new RuntimeException("State name mismatch! Expected '" 
+-                                   + getName() + "' but found '" + name + "'.");
+-      }
+-    }
+-  }
+-  
+-  public NodeName(String nodeName) {
+-    this.nodeName = nodeName;
+-    ParsedHost pHost = ParsedHost.parse(nodeName);
+-    if (pHost == null) {
+-      this.rackName = null;
+-      this.hostName = nodeName;
+-    } else {
+-      //TODO check for null and improve .. possibly call NodeName(r,h)
+-      this.rackName = pHost.getRackName();
+-      this.hostName = pHost.getNodeName();
+-    }
+-  }
+-  
+-  public NodeName(String rName, String hName) {
+-    rName = (rName == null || rName.length() == 0) ? null : rName;
+-    hName = (hName == null || hName.length() == 0) ? null : hName;
+-    if (hName == null) {
+-      nodeName = rName;
+-      rackName = rName;
+-    } else if (rName == null) {
+-      nodeName = hName;
+-      ParsedHost pHost = ParsedHost.parse(nodeName);
+-      if (pHost == null) {
+-        this.rackName = null;
+-        this.hostName = hName;
+-      } else {
+-        this.rackName = pHost.getRackName();
+-        this.hostName = pHost.getNodeName();
+-      }
+-    } else {
+-      rackName = rName;
+-      this.hostName = hName;
+-      this.nodeName = "/" + rName + "/" + hName;
+-    }
+-  }
+-  
+-  public String getHostName() {
+-    return hostName;
+-  }
+-  
+-  public String getRackName() {
+-    return rackName;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return nodeName;
+-  }
+-  
+-  @Override
+-  public String getAnonymizedValue(StatePool statePool, Configuration conf) {
+-    if (this.getValue().equals(ROOT.getValue())) {
+-      return getValue();
+-    }
+-    if (anonymizedNodeName == null) {
+-      anonymize(statePool);
+-    }
+-    return anonymizedNodeName;
+-  }
+-  
+-  private void anonymize(StatePool pool) {
+-    StringBuffer buf = new StringBuffer();
+-    NodeNameState state = (NodeNameState) pool.getState(getClass());
+-    if (state == null) {
+-      state = new NodeNameState();
+-      pool.addState(getClass(), state);
+-    }
+-    
+-    if (rackName != null && hostName != null) {
+-      buf.append('/');
+-      buf.append(anonymize(rackName, state.getRackNameState()));
+-      buf.append('/');
+-      buf.append(anonymize(hostName, state.getHostNameState()));
+-    } else {
+-      if (state.getRackNameState().contains(nodeName) || rackName != null) {
+-        buf.append(anonymize(nodeName, state.getRackNameState()));
+-      } else {
+-        buf.append(anonymize(nodeName, state.getHostNameState()));
+-      }
+-    }
+-    
+-    anonymizedNodeName = buf.toString();
+-  }
+-  
+-  //TODO There is no caching for saving memory.
+-  private static String anonymize(String data, WordList wordList) {
+-    if (data == null) {
+-      return null;
+-    }
+-
+-    if (!wordList.contains(data)) {
+-      wordList.add(data);
+-    }
+-    return wordList.getName() + wordList.indexOf(data);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java
+deleted file mode 100644
+index 8af61bc4ade..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-
+-/**
+- * Represents a queue name.
+- */
+-public class QueueName extends DefaultAnonymizableDataType {
+-  private final String queueName;
+-  
+-  public QueueName(String queueName) {
+-    super();
+-    this.queueName = queueName;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return queueName;
+-  }
+-  
+-  @Override
+-  protected String getPrefix() {
+-    return "queue";
+-  };
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java
+deleted file mode 100644
+index b6516f4737b..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes;
+-
+-/**
+- * Represents a user's name.
+- */
+-public class UserName extends DefaultAnonymizableDataType {
+-  private final String userName;
+-  
+-  public UserName(String userName) {
+-    super();
+-    this.userName = userName;
+-  }
+-  
+-  @Override
+-  public String getValue() {
+-    return userName;
+-  }
+-  
+-  @Override
+-  protected String getPrefix() {
+-    return "user";
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java
+deleted file mode 100644
+index 2868ccdf4c2..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes.util;
+-
+-import org.apache.hadoop.tools.rumen.datatypes.DataType;
+-import org.apache.hadoop.tools.rumen.datatypes.DefaultDataType;
+-
+-/**
+- * A simple job property parser that acts like a pass-through filter.
+- */
+-public class DefaultJobPropertiesParser implements JobPropertyParser {
+-  @Override
+-  public DataType<?> parseJobProperty(String key, String value) {
+-    return new DefaultDataType(value);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java
+deleted file mode 100644
+index 3b031f20766..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes.util;
+-
+-import org.apache.hadoop.tools.rumen.datatypes.DataType;
+-import org.apache.hadoop.tools.rumen.datatypes.JobProperties;
+-
+-/**
+- * A {@link JobProperties} parsing utility.
+- */
+-public interface JobPropertyParser {
+-  /**
+-   * Parse the specified job configuration key-value pair.
+-   * 
+-   * @return Returns a {@link DataType} if this parser can parse this value.
+-   *         Returns 'null' otherwise.
+-   */
+-  public DataType<?> parseJobProperty(String key, String value);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java
+deleted file mode 100644
+index 02fd48a071b..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java
++++ /dev/null
+@@ -1,228 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.datatypes.util;
+-
+-import java.lang.reflect.Field;
+-import java.text.DecimalFormat;
+-import java.text.ParseException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.tools.rumen.datatypes.*;
+-import org.apache.log4j.Level;
+-import org.apache.log4j.Logger;
+-
+-/**
+- * A default parser for MapReduce job configuration properties.
+- * MapReduce job configuration properties are represented as key-value pairs. 
+- * Each key represents a configuration knob which controls or affects the 
+- * behavior of a MapReduce job or a job's task. The value associated with the 
+- * configuration key represents its value. Some of the keys are deprecated. As a
+- * result of deprecation some keys change or are preferred over other keys, 
+- * across versions. {@link MapReduceJobPropertiesParser} is a utility class that
+- * parses MapReduce job configuration properties and converts the value into a 
+- * well defined {@link DataType}. Users can use the
+- * {@link #parseJobProperty(String, String)} API to process job 
+- * configuration parameters. This API will parse a job property represented as a
+- * key-value pair and return the value wrapped inside a {@link DataType}. 
+- * Callers can then use the returned {@link DataType} for further processing.
+- * 
+- * {@link MapReduceJobPropertiesParser} thrives on the key name to decide which
+- * {@link DataType} to wrap the value with. Values for keys representing 
+- * job-name, queue-name, user-name etc are wrapped inside {@link JobName}, 
+- * {@link QueueName}, {@link UserName} etc respectively. Keys ending with *dir* 
+- * are considered as a directory and hence gets be wrapped inside 
+- * {@link FileName}. Similarly key ending with *codec*, *log*, *class* etc are
+- * also handled accordingly. Values representing basic java data-types like 
+- * integer, float, double, boolean etc are wrapped inside 
+- * {@link DefaultDataType}. If the key represents some jvm-level settings then 
+- * only standard settings are extracted and gets wrapped inside 
+- * {@link DefaultDataType}. Currently only '-Xmx' and '-Xms' settings are 
+- * considered while the rest are ignored.
+- * 
+- * Note that the {@link #parseJobProperty(String, String)} API 
+- * maps the keys to a configuration parameter listed in 
+- * {@link MRJobConfig}. This not only filters non-framework specific keys thus 
+- * ignoring user-specific and hard-to-parse keys but also provides a consistent
+- * view for all possible inputs. So if users invoke the 
+- * {@link #parseJobProperty(String, String)} API with either
+- * &lt;"mapreduce.job.user.name", "bob"&gt; or &lt;"user.name", "bob"&gt;,
+- * then the result would be a {@link UserName} {@link DataType} wrapping
+- * the user-name "bob".
+- */
+-@SuppressWarnings("deprecation")
+-public class MapReduceJobPropertiesParser implements JobPropertyParser {
+-  private Field[] mrFields = MRJobConfig.class.getFields();
+-  private DecimalFormat format = new DecimalFormat();
+-  private JobConf configuration = new JobConf(false);
+-  private static final Pattern MAX_HEAP_PATTERN = 
+-    Pattern.compile("-Xmx[0-9]+[kKmMgGtT]?+");
+-  private static final Pattern MIN_HEAP_PATTERN = 
+-    Pattern.compile("-Xms[0-9]+[kKmMgGtT]?+");
+-  
+-  // turn off the warning w.r.t deprecated mapreduce keys
+-  static {
+-    Logger.getLogger(Configuration.class).setLevel(Level.OFF);
+-  }
+-    
+-  // Accepts a key if there is a corresponding key in the current mapreduce
+-  // configuration
+-  private boolean accept(String key) {
+-    return getLatestKeyName(key) != null;
+-  }
+-  
+-  // Finds a corresponding key for the specified key in the current mapreduce
+-  // setup.
+-  // Note that this API uses a cached copy of the Configuration object. This is
+-  // purely for performance reasons.
+-  private String getLatestKeyName(String key) {
+-    // set the specified key
+-    configuration.set(key, key);
+-    try {
+-      // check if keys in MRConfig maps to the specified key.
+-      for (Field f : mrFields) {
+-        String mrKey = f.get(f.getName()).toString();
+-        if (configuration.get(mrKey) != null) {
+-          return mrKey;
+-        }
+-      }
+-      
+-      // unset the key
+-      return null;
+-    } catch (IllegalAccessException iae) {
+-      throw new RuntimeException(iae);
+-    } finally {
+-      // clean up!
+-      configuration.clear();
+-    }
+-  }
+-  
+-  @Override
+-  public DataType<?> parseJobProperty(String key, String value) {
+-    if (accept(key)) {
+-      return fromString(key, value);
+-    }
+-    
+-    return null;
+-  }
+-  
+-  /**
+-   * Extracts the -Xmx heap option from the specified string.
+-   */
+-  public static void extractMaxHeapOpts(final String javaOptions,
+-                                        List<String> heapOpts, 
+-                                        List<String> others) {
+-    for (String opt : javaOptions.split(" ")) {
+-      Matcher matcher = MAX_HEAP_PATTERN.matcher(opt);
+-      if (matcher.find()) {
+-        heapOpts.add(opt);
+-      } else {
+-        others.add(opt);
+-      }
+-    }
+-  }
+-  
+-  /**
+-   * Extracts the -Xms heap option from the specified string.
+-   */
+-  public static void extractMinHeapOpts(String javaOptions,  
+-      List<String> heapOpts,  List<String> others) {
+-    for (String opt : javaOptions.split(" ")) {
+-      Matcher matcher = MIN_HEAP_PATTERN.matcher(opt);
+-      if (matcher.find()) {
+-        heapOpts.add(opt);
+-      } else {
+-        others.add(opt);
+-      }
+-    }
+-  }
+-  
+-  // Maps the value of the specified key.
+-  private DataType<?> fromString(String key, String value) {
+-    DefaultDataType defaultValue = new DefaultDataType(value);
+-    if (value != null) {
+-      // check known configs
+-      //  job-name
+-      String latestKey = getLatestKeyName(key);
+-      
+-      if (MRJobConfig.JOB_NAME.equals(latestKey)) {
+-        return new JobName(value);
+-      }
+-      // user-name
+-      if (MRJobConfig.USER_NAME.equals(latestKey)) {
+-        return new UserName(value);
+-      }
+-      // queue-name
+-      if (MRJobConfig.QUEUE_NAME.equals(latestKey)) {
+-        return new QueueName(value);
+-      }
+-      if (MRJobConfig.MAP_JAVA_OPTS.equals(latestKey) 
+-          || MRJobConfig.REDUCE_JAVA_OPTS.equals(latestKey)) {
+-        List<String> heapOptions = new ArrayList<String>();
+-        extractMaxHeapOpts(value, heapOptions, new ArrayList<String>());
+-        extractMinHeapOpts(value, heapOptions, new ArrayList<String>());
+-        return new DefaultDataType(StringUtils.join(heapOptions, ' '));
+-      }
+-      
+-      //TODO compression?
+-      //TODO Other job configs like FileOutputFormat/FileInputFormat etc
+-
+-      // check if the config parameter represents a number
+-      try {
+-        format.parse(value);
+-        return defaultValue;
+-      } catch (ParseException pe) {}
+-
+-      // check if the config parameters represents a boolean 
+-      // avoiding exceptions
+-      if ("true".equals(value) || "false".equals(value)) {
+-        return defaultValue;
+-      }
+-
+-      // check if the config parameter represents a class
+-      if (latestKey.endsWith(".class") || latestKey.endsWith(".codec")) {
+-        return new ClassName(value);
+-      }
+-
+-      // handle distributed cache sizes and timestamps
+-      if (latestKey.endsWith("sizes") 
+-          || latestKey.endsWith(".timestamps")) {
+-        return defaultValue;
+-      }
+-      
+-      // check if the config parameter represents a file-system path
+-      //TODO: Make this concrete .location .path .dir .jar?
+-      if (latestKey.endsWith(".dir") || latestKey.endsWith(".location") 
+-          || latestKey.endsWith(".jar") || latestKey.endsWith(".path") 
+-          || latestKey.endsWith(".logfile") || latestKey.endsWith(".file")
+-          || latestKey.endsWith(".files") || latestKey.endsWith(".archives")) {
+-        try {
+-          return new FileName(value);
+-        } catch (Exception ioe) {}
+-      }
+-    }
+-
+-    return null;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java
+deleted file mode 100644
+index 22532252348..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java
++++ /dev/null
+@@ -1,377 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Rumen is a data extraction and analysis tool built for 
+- * <a href="http://hadoop.apache.org/">Apache Hadoop</a>. Rumen mines job history
+- * logs to extract meaningful data and stores it into an easily-parsed format.
+- * 
+- * The default output format of Rumen is <a href="http://www.json.org">JSON</a>.
+- * Rumen uses the <a href="http://jackson.codehaus.org/">Jackson</a> library to 
+- * create JSON objects.
+- * <br><br>
+- * 
+- * The following classes can be used to programmatically invoke Rumen:
+- * <ol>
+- *   <li>
+- *    {@link org.apache.hadoop.tools.rumen.JobConfigurationParser}<br>
+- *      A parser to parse and filter out interesting properties from job 
+- *      configuration.
+- *      
+- *      <br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to parse and filter out job name
+- *        
+- *        String conf_filename = .. // assume the job configuration filename here
+- *        
+- *        // construct a list of interesting properties
+- *        List&lt;String&gt; interestedProperties = new ArrayList&lt;String&gt;();
+- *        interestedProperties.add("mapreduce.job.name");
+- *        
+- *        JobConfigurationParser jcp = 
+- *          new JobConfigurationParser(interestedProperties);
+- *
+- *        InputStream in = new FileInputStream(conf_filename);
+- *        Properties parsedProperties = jcp.parse(in);
+- *     </code>
+- *     </pre>
+- *     Some of the commonly used interesting properties are enumerated in 
+- *     {@link org.apache.hadoop.tools.rumen.JobConfPropertyNames}. <br><br>
+- *     
+- *     <b>Note:</b>
+- *        A single instance of {@link org.apache.hadoop.tools.rumen.JobConfigurationParser} 
+- *        can be used to parse multiple job configuration files. 
+- *     
+- *   </li>
+- *   <li>
+- *    {@link org.apache.hadoop.tools.rumen.JobHistoryParser} <br>
+- *      A parser that parses job history files. It is an interface and actual 
+- *      implementations are defined as Enum in 
+- *      {@link org.apache.hadoop.tools.rumen.JobHistoryParserFactory}. Note that
+- *      {@link org.apache.hadoop.tools.rumen.RewindableInputStream}<br>
+- *      is a wrapper class around {@link java.io.InputStream} to make the input 
+- *      stream rewindable.
+- *      
+- *      <br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to parse a current job history file i.e a job history 
+- *        // file for which the version is known
+- *        
+- *        String filename = .. // assume the job history filename here
+- *        
+- *        InputStream in = new FileInputStream(filename);
+- *        
+- *        HistoryEvent event = null;
+- *        
+- *        JobHistoryParser parser = new CurrentJHParser(in);
+- *        
+- *        event = parser.nextEvent();
+- *        // process all the events
+- *        while (event != null) {
+- *          // ... process all event
+- *          event = parser.nextEvent();
+- *        }
+- *        
+- *        // close the parser and the underlying stream
+- *        parser.close();
+- *      </code>
+- *      </pre>
+- *      
+- *      {@link org.apache.hadoop.tools.rumen.JobHistoryParserFactory} provides a 
+- *      {@link org.apache.hadoop.tools.rumen.JobHistoryParserFactory#getParser(org.apache.hadoop.tools.rumen.RewindableInputStream)}
+- *      API to get a parser for parsing the job history file. Note that this
+- *      API can be used if the job history version is unknown.<br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to parse a job history for which the version is not 
+- *        // known i.e using JobHistoryParserFactory.getParser()
+- *        
+- *        String filename = .. // assume the job history filename here
+- *        
+- *        InputStream in = new FileInputStream(filename);
+- *        RewindableInputStream ris = new RewindableInputStream(in);
+- *        
+- *        // JobHistoryParserFactory will check and return a parser that can
+- *        // parse the file
+- *        JobHistoryParser parser = JobHistoryParserFactory.getParser(ris);
+- *        
+- *        // now use the parser to parse the events
+- *        HistoryEvent event = parser.nextEvent();
+- *        while (event != null) {
+- *          // ... process the event
+- *          event = parser.nextEvent();
+- *        }
+- *        
+- *        parser.close();
+- *      </code>
+- *      </pre>
+- *      <b>Note:</b>
+- *        Create one instance to parse a job history log and close it after use.
+- *  </li>
+- *  <li>
+- *    {@link org.apache.hadoop.tools.rumen.TopologyBuilder}<br>
+- *      Builds the cluster topology based on the job history events. Every 
+- *      job history file consists of events. Each event can be represented using
+- *      {@link org.apache.hadoop.mapreduce.jobhistory.HistoryEvent}. 
+- *      These events can be passed to {@link org.apache.hadoop.tools.rumen.TopologyBuilder} using 
+- *      {@link org.apache.hadoop.tools.rumen.TopologyBuilder#process(org.apache.hadoop.mapreduce.jobhistory.HistoryEvent)}.
+- *      A cluster topology can be represented using {@link org.apache.hadoop.tools.rumen.LoggedNetworkTopology}.
+- *      Once all the job history events are processed, the cluster 
+- *      topology can be obtained using {@link org.apache.hadoop.tools.rumen.TopologyBuilder#build()}.
+- *      
+- *      <br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // Building topology for a job history file represented using 
+- *        // 'filename' and the corresponding configuration file represented 
+- *        // using 'conf_filename'
+- *        String filename = .. // assume the job history filename here
+- *        String conf_filename = .. // assume the job configuration filename here
+- *        
+- *        InputStream jobConfInputStream = new FileInputStream(filename);
+- *        InputStream jobHistoryInputStream = new FileInputStream(conf_filename);
+- *        
+- *        TopologyBuilder tb = new TopologyBuilder();
+- *        
+- *        // construct a list of interesting properties
+- *        List&lt;String&gt; interestingProperties = new ArrayList%lt;String&gt;();
+- *        // add the interesting properties here
+- *        interestingProperties.add("mapreduce.job.name");
+- *        
+- *        JobConfigurationParser jcp = 
+- *          new JobConfigurationParser(interestingProperties);
+- *        
+- *        // parse the configuration file
+- *        tb.process(jcp.parse(jobConfInputStream));
+- *        
+- *        // read the job history file and pass it to the 
+- *        // TopologyBuilder.
+- *        JobHistoryParser parser = new CurrentJHParser(jobHistoryInputStream);
+- *        HistoryEvent e;
+- *        
+- *        // read and process all the job history events
+- *        while ((e = parser.nextEvent()) != null) {
+- *          tb.process(e);
+- *        }
+- *        
+- *        LoggedNetworkTopology topology = tb.build();
+- *      </code>
+- *      </pre>
+- *  </li>
+- *  <li>
+- *    {@link org.apache.hadoop.tools.rumen.JobBuilder}<br>
+- *      Summarizes a job history file.
+- *      {@link org.apache.hadoop.tools.rumen.JobHistoryUtils} provides  
+- *      {@link org.apache.hadoop.tools.rumen.JobHistoryUtils#extractJobID(String)} 
+- *      API for extracting job id from job history or job configuration files
+- *      which can be used for instantiating {@link org.apache.hadoop.tools.rumen.JobBuilder}. 
+- *      {@link org.apache.hadoop.tools.rumen.JobBuilder} generates a 
+- *      {@link org.apache.hadoop.tools.rumen.LoggedJob} object via 
+- *      {@link org.apache.hadoop.tools.rumen.JobBuilder#build()}. 
+- *      See {@link org.apache.hadoop.tools.rumen.LoggedJob} for more details.
+- *      
+- *      <br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to summarize a current job history file 'filename'
+- *        // and the corresponding configuration file 'conf_filename'
+- *        
+- *        String filename = .. // assume the job history filename here
+- *        String conf_filename = .. // assume the job configuration filename here
+- *        
+- *        InputStream jobConfInputStream = new FileInputStream(job_filename);
+- *        InputStream jobHistoryInputStream = new FileInputStream(conf_filename);
+- *        
+- *        String jobID = TraceBuilder.extractJobID(job_filename);
+- *        JobBuilder jb = new JobBuilder(jobID);
+- *        
+- *        // construct a list of interesting properties
+- *        List&lt;String&gt; interestingProperties = new ArrayList%lt;String&gt;();
+- *        // add the interesting properties here
+- *        interestingProperties.add("mapreduce.job.name");
+- *        
+- *        JobConfigurationParser jcp = 
+- *          new JobConfigurationParser(interestingProperties);
+- *        
+- *        // parse the configuration file
+- *        jb.process(jcp.parse(jobConfInputStream));
+- *        
+- *        // parse the job history file
+- *        JobHistoryParser parser = new CurrentJHParser(jobHistoryInputStream);
+- *        try {
+- *          HistoryEvent e;
+- *          // read and process all the job history events
+- *          while ((e = parser.nextEvent()) != null) {
+- *            jobBuilder.process(e);
+- *          }
+- *        } finally {
+- *          parser.close();
+- *        }
+- *        
+- *        LoggedJob job = jb.build();
+- *      </code>
+- *      </pre>
+- *     <b>Note:</b>
+- *       The order of parsing the job configuration file or job history file is 
+- *       not important. Create one instance to parse the history file and job 
+- *       configuration.
+- *   </li>
+- *   <li>
+- *    {@link org.apache.hadoop.tools.rumen.DefaultOutputter}<br>
+- *      Implements {@link org.apache.hadoop.tools.rumen.Outputter} and writes 
+- *      JSON object in text format to the output file. 
+- *      {@link org.apache.hadoop.tools.rumen.DefaultOutputter} can be 
+- *      initialized with the output filename.
+- *      
+- *      <br><br>
+- *      <i>Sample code</i>:  
+- *      <pre>
+- *      <code>
+- *        // An example to summarize a current job history file represented by
+- *        // 'filename' and the configuration filename represented using 
+- *        // 'conf_filename'. Also output the job summary to 'out.json' along 
+- *        // with the cluster topology to 'topology.json'.
+- *        
+- *        String filename = .. // assume the job history filename here
+- *        String conf_filename = .. // assume the job configuration filename here
+- *        
+- *        Configuration conf = new Configuration();
+- *        DefaultOutputter do = new DefaultOutputter();
+- *        do.init("out.json", conf);
+- *        
+- *        InputStream jobConfInputStream = new FileInputStream(filename);
+- *        InputStream jobHistoryInputStream = new FileInputStream(conf_filename);
+- *        
+- *        // extract the job-id from the filename
+- *        String jobID = TraceBuilder.extractJobID(filename);
+- *        JobBuilder jb = new JobBuilder(jobID);
+- *        TopologyBuilder tb = new TopologyBuilder();
+- *        
+- *        // construct a list of interesting properties
+- *        List&lt;String&gt; interestingProperties = new ArrayList%lt;String&gt;();
+- *        // add the interesting properties here
+- *        interestingProperties.add("mapreduce.job.name");
+- *        
+- *        JobConfigurationParser jcp =
+- *          new JobConfigurationParser(interestingProperties);
+- *          
+- *        // parse the configuration file
+- *        tb.process(jcp.parse(jobConfInputStream));
+- *        
+- *        // read the job history file and pass it to the
+- *        // TopologyBuilder.
+- *        JobHistoryParser parser = new CurrentJHParser(jobHistoryInputStream);
+- *        HistoryEvent e;
+- *        while ((e = parser.nextEvent()) != null) {
+- *          jb.process(e);
+- *          tb.process(e);
+- *        }
+- *        
+- *        LoggedJob j = jb.build();
+- *        
+- *        // serialize the job summary in json (text) format
+- *        do.output(j);
+- *        
+- *        // close
+- *        do.close();
+- *        
+- *        do.init("topology.json", conf);
+- *        
+- *        // get the job summary using TopologyBuilder
+- *        LoggedNetworkTopology topology = topologyBuilder.build();
+- *        
+- *        // serialize the cluster topology in json (text) format
+- *        do.output(topology);
+- *        
+- *        // close
+- *        do.close();
+- *      </code>
+- *      </pre>
+- *   </li>
+- *   <li>
+- *    {@link org.apache.hadoop.tools.rumen.JobTraceReader}<br>
+- *      A reader for reading {@link org.apache.hadoop.tools.rumen.LoggedJob} serialized using 
+- *      {@link org.apache.hadoop.tools.rumen.DefaultOutputter}. {@link org.apache.hadoop.tools.rumen.LoggedJob} 
+- *      provides various APIs for extracting job details. Following are the most
+- *      commonly used ones
+- *        <ul>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getMapTasks()} : Get the map tasks</li>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getReduceTasks()} : Get the reduce tasks</li>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getOtherTasks()} : Get the setup/cleanup tasks</li>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getOutcome()} : Get the job's outcome</li>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getSubmitTime()} : Get the job's submit time</li>
+- *          <li>{@link org.apache.hadoop.tools.rumen.LoggedJob#getFinishTime()} : Get the job's finish time</li>
+- *        </ul>
+- *        
+- *      <br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to read job summary from a trace file 'out.json'.
+- *        JobTraceReader reader = new JobTracerReader("out.json");
+- *        LoggedJob job = reader.getNext();
+- *        while (job != null) {
+- *          // .... process job level information
+- *          for (LoggedTask task : job.getMapTasks()) {
+- *            // process all the map tasks in the job
+- *            for (LoggedTaskAttempt attempt : task.getAttempts()) {
+- *              // process all the map task attempts in the job
+- *            }
+- *          }
+- *          
+- *          // get the next job
+- *          job = reader.getNext();
+- *        }
+- *        reader.close();
+- *      </code>
+- *      </pre>         
+- *   </li>
+- *   <li>
+- *    {@link org.apache.hadoop.tools.rumen.ClusterTopologyReader}<br>
+- *      A reader to read {@link org.apache.hadoop.tools.rumen.LoggedNetworkTopology} serialized using 
+- *      {@link org.apache.hadoop.tools.rumen.DefaultOutputter}. {@link org.apache.hadoop.tools.rumen.ClusterTopologyReader} can be 
+- *      initialized using the serialized topology filename. 
+- *      {@link org.apache.hadoop.tools.rumen.ClusterTopologyReader#get()} can
+- *      be used to get the 
+- *      {@link org.apache.hadoop.tools.rumen.LoggedNetworkTopology}. 
+- *      
+- *      <br><br>
+- *      <i>Sample code</i>:
+- *      <pre>
+- *      <code>
+- *        // An example to read the cluster topology from a topology output file
+- *        // 'topology.json'
+- *        ClusterTopologyReader reader = new ClusterTopologyReader("topology.json");
+- *        LoggedNetworkTopology topology  = reader.get();
+- *        for (LoggedNetworkTopology t : topology.getChildren()) {
+- *          // process the cluster topology
+- *        }
+- *        reader.close();
+- *      </code>
+- *      </pre>
+- *   </li>
+- * </ol>     
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java
+deleted file mode 100644
+index a720214ec82..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.serializers;
+-
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.JsonSerializer;
+-import com.fasterxml.jackson.databind.SerializerProvider;
+-
+-import java.io.IOException;
+-
+-/**
+- * A JSON serializer for Strings.
+- */
+-public class BlockingSerializer extends JsonSerializer<String> {
+-  
+-  public void serialize(String object, JsonGenerator jGen, SerializerProvider sProvider) 
+-  throws IOException, JsonProcessingException {
+-    jGen.writeNull();
+-  };
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java
+deleted file mode 100644
+index 944d1932ba4..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.serializers;
+-
+-import java.io.IOException;
+-
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.JsonSerializer;
+-import com.fasterxml.jackson.databind.SerializerProvider;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.tools.rumen.datatypes.AnonymizableDataType;
+-import org.apache.hadoop.tools.rumen.state.StatePool;
+-
+-/**
+- * Default Rumen JSON serializer.
+- */
+-@SuppressWarnings("unchecked")
+-public class DefaultAnonymizingRumenSerializer 
+-  extends JsonSerializer<AnonymizableDataType> {
+-  private StatePool statePool;
+-  private Configuration conf;
+-  
+-  public DefaultAnonymizingRumenSerializer(StatePool statePool, 
+-                                           Configuration conf) {
+-    this.statePool = statePool;
+-    this.conf = conf;
+-  }
+-  
+-  public void serialize(AnonymizableDataType object, JsonGenerator jGen, 
+-                        SerializerProvider sProvider) 
+-  throws IOException, JsonProcessingException {
+-    Object val = object.getAnonymizedValue(statePool, conf);
+-    // output the data if its a string
+-    if (val instanceof String) {
+-      jGen.writeString(val.toString());
+-    } else {
+-      // let the mapper (JSON generator) handle this anonymized object.
+-      jGen.writeObject(val);
+-    }
+-  };
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java
+deleted file mode 100644
+index 766a75057be..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.serializers;
+-
+-import java.io.IOException;
+-
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.JsonSerializer;
+-import com.fasterxml.jackson.databind.SerializerProvider;
+-
+-import org.apache.hadoop.tools.rumen.datatypes.DataType;
+-
+-/**
+- * Default Rumen JSON serializer.
+- */
+-@SuppressWarnings("unchecked")
+-public class DefaultRumenSerializer extends JsonSerializer<DataType> {
+-  public void serialize(DataType object, JsonGenerator jGen, SerializerProvider sProvider) 
+-  throws IOException, JsonProcessingException {
+-    Object data = object.getValue();
+-    if (data instanceof String) {
+-      jGen.writeString(data.toString());
+-    } else {
+-      jGen.writeObject(data);
+-    }
+-  };
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java
+deleted file mode 100644
+index a576871a12f..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.serializers;
+-
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.JsonSerializer;
+-import com.fasterxml.jackson.databind.SerializerProvider;
+-
+-import java.io.IOException;
+-
+-/**
+- * Rumen JSON serializer for serializing object using toSring() API.
+- */
+-public class ObjectStringSerializer<T> extends JsonSerializer<T> {
+-  public void serialize(T object, JsonGenerator jGen, SerializerProvider sProvider) 
+-  throws IOException, JsonProcessingException {
+-    jGen.writeString(object.toString());
+-  };
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java
+deleted file mode 100644
+index 6ff43d5d26a..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.state;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnore;
+-
+-/**
+- * Represents a state. This state is managed by {@link StatePool}.
+- * 
+- * Note that a {@link State} objects should be persistable. Currently, the 
+- * {@link State} objects are persisted using the Jackson JSON library. Hence the
+- * implementors of the {@link State} interface should be careful while defining 
+- * their public setter and getter APIs.  
+- */
+-public interface State {
+-  /**
+-   * Returns true if the state is updated since creation (or reload).
+-   */
+-  @JsonIgnore
+-  boolean isUpdated();
+-  
+-  /**
+-   * Get the name of the state.
+-   */
+-  public String getName();
+-  
+-  /**
+-   * Set the name of the state.
+-   */
+-  public void setName(String name);
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java
+deleted file mode 100644
+index 4fd2f12f65c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.state;
+-
+-import java.io.IOException;
+-
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.DeserializationContext;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+-import com.fasterxml.jackson.databind.node.ObjectNode;
+-import org.apache.hadoop.tools.rumen.state.StatePool.StatePair;
+-
+-/**
+- * Rumen JSON deserializer for deserializing the {@link State} object.
+- */
+-public class StateDeserializer extends StdDeserializer<StatePair> {
+-  public StateDeserializer() {
+-      super(StatePair.class);
+-  }
+-  
+-  @Override
+-  public StatePair deserialize(JsonParser parser, 
+-                               DeserializationContext context)
+-  throws IOException, JsonProcessingException {
+-    ObjectMapper mapper = (ObjectMapper) parser.getCodec();
+-    // set the state-pair object tree
+-    ObjectNode statePairObject = (ObjectNode) mapper.readTree(parser);
+-    Class<?> stateClass = null;
+-    
+-    try {
+-      stateClass = 
+-        Class.forName(statePairObject.get("className").textValue().trim());
+-    } catch (ClassNotFoundException cnfe) {
+-      throw new RuntimeException("Invalid classname!", cnfe);
+-    }
+-    
+-    String stateJsonString = statePairObject.get("state").toString();
+-    State state = (State) mapper.readValue(stateJsonString, stateClass);
+-    
+-    return new StatePair(state);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java
+deleted file mode 100644
+index ab6f8942e7c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java
++++ /dev/null
+@@ -1,334 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen.state;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.text.DateFormat;
+-import java.text.SimpleDateFormat;
+-import java.util.Calendar;
+-import java.util.HashMap;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnore;
+-import com.fasterxml.jackson.core.JsonEncoding;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.core.Version;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.module.SimpleModule;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.tools.rumen.Anonymizer;
+-import org.apache.hadoop.tools.rumen.datatypes.DataType;
+-
+-/**
+- * A pool of states. States used by {@link DataType}'s can be managed the 
+- * {@link StatePool}. {@link StatePool} also supports persistence. Persistence
+- * is key to share states across multiple {@link Anonymizer} runs.
+- */
+-@SuppressWarnings("unchecked")
+-public class StatePool {
+-  private static final long VERSION = 1L;
+-  private boolean isUpdated = false;
+-  private boolean isInitialized = false;
+-  private Configuration conf;
+-  
+-  // persistence configuration
+-  public static final String DIR_CONFIG = "rumen.anonymization.states.dir";
+-  public static final String RELOAD_CONFIG = 
+-    "rumen.anonymization.states.reload";
+-  public static final String PERSIST_CONFIG = 
+-    "rumen.anonymization.states.persist";
+-  
+-  // internal state management configs
+-  private static final String COMMIT_STATE_FILENAME = "latest";
+-  private static final String CURRENT_STATE_FILENAME = "temp";
+-  
+-  private String timeStamp;
+-  private Path persistDirPath;
+-  private boolean reload;
+-  private boolean persist;
+-  
+-  /**
+-   * A wrapper class that binds the state implementation to its implementing 
+-   * class name.
+-   */
+-  public static class StatePair {
+-    private String className;
+-    private State state;
+-    
+-    public StatePair(State state) {
+-      this.className = state.getClass().getName();
+-      this.state = state;
+-    }
+-    
+-    public String getClassName() {
+-      return className;
+-    }
+-    
+-    public void setClassName(String className) {
+-      this.className = className;
+-    }
+-    
+-    public State getState() {
+-      return state;
+-    }
+-    
+-    public void setState(State state) {
+-      this.state = state;
+-    }
+-  }
+-  
+-  /**
+-   * Identifies to identify and cache {@link State}s.
+-   */
+-  private HashMap<String, StatePair> pool = new HashMap<String, StatePair>();
+-  
+-  public void addState(Class id, State state) {
+-    if (pool.containsKey(id.getName())) {
+-      throw new RuntimeException("State '" + state.getName() + "' added for the" 
+-          + " class " + id.getName() + " already exists!");
+-    }
+-    isUpdated = true;
+-    pool.put(id.getName(), new StatePair(state));
+-  }
+-  
+-  public State getState(Class clazz) {
+-    return pool.containsKey(clazz.getName()) 
+-           ? pool.get(clazz.getName()).getState() 
+-           : null;
+-  }
+-  
+-  // For testing
+-  @JsonIgnore
+-  public boolean isUpdated() {
+-    if (!isUpdated) {
+-      for (StatePair statePair : pool.values()) {
+-        // if one of the states have changed, then the pool is dirty
+-        if (statePair.getState().isUpdated()) {
+-          isUpdated = true;
+-          return true;
+-        }
+-      }
+-    }
+-    return isUpdated;
+-  }
+-  
+-  /**
+-   * Initialized the {@link StatePool}. This API also reloads the previously
+-   * persisted state. Note that the {@link StatePool} should be initialized only
+-   * once.
+-   */
+-  public void initialize(Configuration conf) throws Exception {
+-    if (isInitialized) {
+-      throw new RuntimeException("StatePool is already initialized!");
+-    }
+-    
+-    this.conf = conf;
+-    String persistDir = conf.get(DIR_CONFIG);
+-    reload = conf.getBoolean(RELOAD_CONFIG, false);
+-    persist = conf.getBoolean(PERSIST_CONFIG, false);
+-    
+-    // reload if configured
+-    if (reload || persist) {
+-      System.out.println("State Manager initializing. State directory : " 
+-                         + persistDir);
+-      System.out.println("Reload:" + reload + " Persist:" + persist);
+-      if (persistDir == null) {
+-        throw new RuntimeException("No state persist directory configured!" 
+-                                   + " Disable persistence.");
+-      } else {
+-        this.persistDirPath = new Path(persistDir);
+-      }
+-    } else {
+-      System.out.println("State Manager disabled.");
+-    }
+-    
+-    // reload
+-    reload();
+-    
+-    // now set the timestamp
+-    DateFormat formatter = 
+-      new SimpleDateFormat("dd-MMM-yyyy-hh'H'-mm'M'-ss'S'");
+-    Calendar calendar = Calendar.getInstance();
+-    calendar.setTimeInMillis(System.currentTimeMillis());
+-    timeStamp = formatter.format(calendar.getTime());
+-    
+-    isInitialized = true;
+-  }
+-  
+-  private void reload() throws Exception {
+-    if (reload) {
+-      // Reload persisted entries
+-      Path stateFilename = new Path(persistDirPath, COMMIT_STATE_FILENAME);
+-      if (!reloadState(stateFilename, conf)) {
+-        throw new RuntimeException("No latest state persist directory found!"
+-                                   + " Disable persistence and run.");
+-      }
+-    }
+-  }
+-  
+-  private boolean reloadState(Path stateFile, Configuration configuration)
+-      throws Exception {
+-    FileSystem fs = stateFile.getFileSystem(configuration);
+-    try (FSDataInputStream in = fs.open(stateFile)) {
+-      System.out.println("Reading state from " + stateFile.toString());
+-      read(in);
+-      return true;
+-    } catch (FileNotFoundException e) {
+-      System.out.println("No state information found for " + stateFile);
+-      return false;
+-    }
+-  }
+-  
+-  private void read(DataInput in) throws IOException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    // define a module
+-    SimpleModule module = new SimpleModule("State Serializer",  
+-        new Version(0, 1, 1, "FINAL", "", ""));
+-    // add the state deserializer
+-    module.addDeserializer(StatePair.class, new StateDeserializer());
+-
+-    // register the module with the object-mapper
+-    mapper.registerModule(module);
+-
+-    JsonParser parser = mapper.getFactory().createParser((InputStream)in);
+-    StatePool statePool = mapper.readValue(parser, StatePool.class);
+-    this.setStates(statePool.getStates());
+-    parser.close();
+-  }
+-  
+-  /**
+-   * Persists the current state to the state directory. The state will be 
+-   * persisted to the 'latest' file in the state directory.
+-   */
+-  public void persist() throws IOException {
+-    if (!persist) {
+-      return;
+-    }
+-    if (isUpdated()) {
+-      System.out.println("State is updated! Committing.");
+-      Path currStateFile = new Path(persistDirPath, CURRENT_STATE_FILENAME);
+-      Path commitStateFile = new Path(persistDirPath, COMMIT_STATE_FILENAME);
+-      FileSystem fs = currStateFile.getFileSystem(conf);
+-
+-      System.out.println("Starting the persist phase. Persisting to " 
+-                         + currStateFile.toString());
+-      // persist current state 
+-      //  write the contents of the current state to the current(temp) directory
+-      FSDataOutputStream out = fs.create(currStateFile, true);
+-      write(out);
+-      out.close();
+-
+-      System.out.println("Persist phase over. The best known un-committed state"
+-                         + " is located at " + currStateFile.toString());
+-
+-      // commit (phase-1) 
+-      //  copy the previous commit file to the relocation file
+-      if (fs.exists(commitStateFile)) {
+-        Path commitRelocationFile = new Path(persistDirPath, timeStamp);
+-        System.out.println("Starting the pre-commit phase. Moving the previous " 
+-            + "best known state to " + commitRelocationFile.toString());
+-        // copy the commit file to the relocation file
+-        FileUtil.copy(fs,commitStateFile, fs, commitRelocationFile, false, 
+-                      conf);
+-      }
+-
+-      // commit (phase-2)
+-      System.out.println("Starting the commit phase. Committing the states in " 
+-                         + currStateFile.toString());
+-      FileUtil.copy(fs, currStateFile, fs, commitStateFile, true, true, conf);
+-
+-      System.out.println("Commit phase successful! The best known committed " 
+-                         + "state is located at " + commitStateFile.toString());
+-    } else {
+-      System.out.println("State not updated! No commit required.");
+-    }
+-  }
+-  
+-  private void write(DataOutput out) throws IOException {
+-    // This is just a JSON experiment
+-    System.out.println("Dumping the StatePool's in JSON format.");
+-    ObjectMapper outMapper = new ObjectMapper();
+-    // define a module
+-    SimpleModule module = new SimpleModule("State Serializer",  
+-        new Version(0, 1, 1, "FINAL", "", ""));
+-    // add the state serializer
+-    //module.addSerializer(State.class, new StateSerializer());
+-
+-    // register the module with the object-mapper
+-    outMapper.registerModule(module);
+-
+-    JsonFactory outFactory = outMapper.getFactory();
+-    JsonGenerator jGen =
+-        outFactory.createGenerator((OutputStream)out, JsonEncoding.UTF8);
+-    jGen.useDefaultPrettyPrinter();
+-
+-    jGen.writeObject(this);
+-    jGen.close();
+-  }
+-  
+-  /**
+-   * Getters and setters for JSON serialization
+-   */
+-  
+-  /**
+-   * To be invoked only by the Jackson JSON serializer.
+-   */
+-  public long getVersion() {
+-    return VERSION;
+-  }
+-  
+-  /**
+-   * To be invoked only by the Jackson JSON deserializer.
+-   */
+-  public void setVersion(long version) {
+-    if (version != VERSION) {
+-      throw new RuntimeException("Version mismatch! Expected " + VERSION 
+-                                 + " got " + version);
+-    }
+-  }
+-  
+-  /**
+-   * To be invoked only by the Jackson JSON serializer.
+-   */
+-  public HashMap<String, StatePair> getStates() {
+-    return pool;
+-  }
+-  
+-  /**
+-   * To be invoked only by the Jackson JSON deserializer.
+-   */
+-  public void setStates(HashMap<String, StatePair> states) {
+-    if (pool.size() > 0) {
+-      throw new RuntimeException("Pool not empty!");
+-    }
+-    
+-    //TODO Should we do a clone?
+-    this.pool = states;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/main/shellprofile.d/hadoop-rumen.sh b/hadoop-tools/hadoop-rumen/src/main/shellprofile.d/hadoop-rumen.sh
+deleted file mode 100755
+index b0d606deb63..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/main/shellprofile.d/hadoop-rumen.sh
++++ /dev/null
+@@ -1,54 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f hadoop_subcommand_rumenfolder >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = hadoop ]]; then
+-    hadoop_add_subcommand "rumenfolder" client "scale a rumen input trace"
+-  fi
+-
+-## @description  rumenfolder command for hadoop
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function hadoop_subcommand_rumenfolder
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.rumen.Folder
+-  hadoop_add_to_classpath_tools hadoop-rumen
+-}
+-
+-fi
+-
+-if ! declare -f hadoop_subcommand_rumentrace >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = hadoop ]]; then
+-    hadoop_add_subcommand "rumentrace" client "convert logs into a rumen trace"
+-  fi
+-
+-## @description  rumentrace command for hadoop
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function hadoop_subcommand_rumentrace
+-{
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.tools.rumen.TraceBuilder
+-  hadoop_add_to_classpath_tools hadoop-rumen
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-rumen/src/site/markdown/Rumen.md.vm b/hadoop-tools/hadoop-rumen/src/site/markdown/Rumen.md.vm
+deleted file mode 100644
+index 34dfd0bf598..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/site/markdown/Rumen.md.vm
++++ /dev/null
+@@ -1,416 +0,0 @@
+-<!--
+-  Licensed to the Apache Software Foundation (ASF) under one or more
+-  contributor license agreements.  See the NOTICE file distributed with
+-  this work for additional information regarding copyright ownership.
+-  The ASF licenses this file to You under the Apache License, Version 2.0
+-  (the "License"); you may not use this file except in compliance with
+-  the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-
+-#set ( $H3 = '###' )
+-#set ( $H4 = '####' )
+-#set ( $H5 = '#####' )
+-
+-Rumen
+-=====
+-
+----
+-
+-- [Overview](#Overview)
+-    - [Motivation](#Motivation)
+-    - [Components](#Components)
+-- [How to use Rumen?](#How_to_use_Rumen)
+-    - [Trace Builder](#Trace_Builder)
+-    - [Folder](#Folder)
+-- [Appendix](#Appendix)
+-    - [Resources](#Resources)
+-    - [Dependencies](#Dependencies)
+-
+----
+-
+-Overview
+---------
+-    
+-*Rumen* is a data extraction and analysis tool built for
+-*Apache Hadoop*. *Rumen* mines *JobHistory* logs to 
+-extract meaningful data and stores it in an easily-parsed, condensed 
+-format or *digest*. The raw trace data from MapReduce logs are 
+-often insufficient for simulation, emulation, and benchmarking, as these 
+-tools often attempt to measure conditions that did not occur in the 
+-source data. For example, if a task ran locally in the raw trace data 
+-but a simulation of the scheduler elects to run that task on a remote 
+-rack, the simulator requires a runtime its input cannot provide. 
+-To fill in these gaps, Rumen performs a statistical analysis of the 
+-digest to estimate the variables the trace doesn't supply. Rumen traces 
+-drive both Gridmix (a benchmark of Hadoop MapReduce clusters) and SLS
+-(a simulator for the resource manager scheduler).
+-
+-
+-$H3 Motivation
+-     
+-* Extracting meaningful data from *JobHistory* logs is a common
+-  task for any tool built to work on *MapReduce*. It 
+-  is tedious to write a custom tool which is so tightly coupled with 
+-  the *MapReduce* framework. Hence there is a need for a 
+-  built-in tool for performing framework level task of log parsing and
+-  analysis. Such a tool would insulate external systems depending on 
+-  job history against the changes made to the job history format.
+-
+-* Performing statistical analysis of various attributes of a 
+-  *MapReduce Job* such as *task runtimes, task failures 
+-  etc* is another common task that the benchmarking 
+-  and simulation tools might need. *Rumen* generates 
+-  <a href="http://en.wikipedia.org/wiki/Cumulative_distribution_function">
+-  *Cumulative Distribution Functions (CDF)*
+-  </a> for the Map/Reduce task runtimes. 
+-  Runtime CDF can be used for extrapolating the task runtime of 
+-  incomplete, missing and synthetic tasks. Similarly CDF is also 
+-  computed for the total number of successful tasks for every attempt.
+-
+-
+-$H3 Components
+-
+-*Rumen* consists of 2 components
+-
+-* *Trace Builder* : 
+-  Converts *JobHistory* logs into an easily-parsed format.
+-  Currently `TraceBuilder` outputs the trace in 
+-  <a href="http://www.json.org/">*JSON*</a> 
+-  format.   
+-
+-* *Folder *: 
+-  A utility to scale the input trace. A trace obtained from
+-  *TraceBuilder* simply summarizes the jobs in the 
+-  input folders and files. The time-span within which all the jobs in 
+-  a given trace finish can be considered as the trace runtime. 
+-  *Folder* can be used to scale the runtime of a trace.
+-  Decreasing the trace runtime might involve dropping some jobs from 
+-  the input trace and scaling down the runtime of remaining jobs. 
+-  Increasing the trace runtime might involve adding some dummy jobs to
+-  the resulting trace and scaling up the runtime of individual jobs.
+-
+-
+-How to use Rumen?
+------------------
+-
+-Converting *JobHistory* logs into a desired job-trace consists of  2 steps
+-
+-1.  Extracting information into an intermediate format
+-
+-2.  Adjusting the job-trace obtained from the intermediate trace to 
+-    have the desired properties.
+-       
+-> Extracting information from *JobHistory* logs is a one time
+-> operation. This so called *Gold Trace* can be reused to
+-> generate traces with desired values of properties such as 
+-> `output-duration`, `concentration` etc.
+-       
+-*Rumen* provides 2 basic commands
+-
+-* `TraceBuilder`
+-* `Folder`
+-       
+-Firstly, we need to generate the *Gold Trace*. Hence the first 
+-step is to run `TraceBuilder` on a job-history folder. 
+-The output of the `TraceBuilder` is a job-trace file (and an 
+-optional cluster-topology file). In case we want to scale the output, we 
+-can use the `Folder` utility to fold the current trace to the 
+-desired length. The remaining part of this section explains these 
+-utilities in detail.
+-    
+-
+-$H3 Trace Builder
+-      
+-$H4 Command
+-
+-```
+-hadoop rumentrace [options] <jobtrace-output> <topology-output> <inputs>
+-```
+-  
+-This command invokes the `TraceBuilder` utility of *Rumen*.
+-
+-TraceBuilder converts the JobHistory files into a series of JSON
+-objects and writes them into the `<jobtrace-output>`
+-file. It also extracts the cluster layout (topology) and writes it in
+-the`<topology-output>` file.
+-`<inputs>` represents a space-separated list of
+-JobHistory files and folders.
+-         
+-> 1) Input and output to `TraceBuilder` is expected to
+-> be a fully qualified FileSystem path. So use file://
+-> to specify files on the `local` FileSystem and 
+-> hdfs:// to specify files on HDFS. Since input files or
+-> folder are FileSystem paths, it means that they can be globbed.
+-> This can be useful while specifying multiple file paths using
+-> regular expressions.
+-
+-> 2) By default, TraceBuilder does not recursively scan the input
+-> folder for job history files. Only the files that are directly
+-> placed under the input folder will be considered for generating
+-> the trace. To add all the files under the input directory by
+-> recursively scanning the input directory, use ‘-recursive’
+-> option.
+-
+-Cluster topology is used as follows :
+-
+-* To reconstruct the splits and make sure that the 
+-  distances/latencies seen in the actual run are modeled correctly.
+-
+-* To extrapolate splits information for tasks with missing splits
+-  details or synthetically generated tasks.
+-      
+-$H4 Options
+-
+-<table>
+-  <tr>
+-    <th> Parameter</th>
+-    <th> Description</th>
+-    <th> Notes </th>
+-  </tr>
+-  <tr>
+-    <td><code>-demuxer</code></td>
+-    <td>Used to read the jobhistory files. The default is 
+-        <code>DefaultInputDemuxer</code>.</td>
+-    <td>Demuxer decides how the input file maps to jobhistory file(s). 
+-        Job history logs and job configuration files are typically small 
+-        files, and can be more effectively stored when embedded in some
+-        container file format like SequenceFile or TFile. To support such 
+-        usage cases, one can specify a customized Demuxer class that can 
+-        extract individual job history logs and job configuration files 
+-        from the source files.
+-    </td>
+-  </tr>
+-  <tr>
+-     <td><code>-recursive</code></td>
+-     <td>Recursively traverse input paths for job history logs.</td>
+-     <td>This option should be used to inform the TraceBuilder to
+-     recursively scan the input paths and process all the files under it.
+-     Note that, by default, only the history logs that are directly under
+-     the input folder are considered for generating the trace.
+-     </td>
+-  </tr>
+-</table>
+-      
+-
+-$H4 Example
+-
+-```
+-hadoop rumentrace \
+-  file:///tmp/job-trace.json \
+-  file:///tmp/job-topology.json \
+-  hdfs:///tmp/hadoop-yarn/staging/history/done_intermediate/testuser
+-```
+-
+-This will analyze all the jobs in 
+-`/tmp/hadoop-yarn/staging/history/done_intermediate/testuser`
+-stored on the  `HDFS` FileSystem
+-and output the jobtraces in  `/tmp/job-trace.json`
+-along with topology information in `/tmp/job-topology.json`
+-stored on the `local` FileSystem.
+-
+-
+-$H3 Folder
+-      
+-$H4 Command
+-
+-```
+-hadoop rumenfolder [options] [input] [output]
+-```
+-      
+-This command invokes the `Folder` utility of 
+-*Rumen*. Folding essentially means that the output duration of 
+-the resulting trace is fixed and job timelines are adjusted 
+-to respect the final output duration. 
+-
+-> Input and output to `Folder` is expected to be a fully 
+-> qualified FileSystem path. So use `file://` to specify 
+-> files on the `local` FileSystem and `hdfs://` to
+-> specify files on HDFS.
+-
+-
+-$H4 Options
+-
+-<table>
+-  <tr>
+-    <th> Parameter</th>
+-    <th> Description</th>
+-    <th> Notes </th>
+-  </tr>
+-  <tr>
+-    <td><code>-input-cycle</code></td>
+-    <td>Defines the basic unit of time for the folding operation. There is
+-        no default value for <code>input-cycle</code>. 
+-        <strong>Input cycle must be provided</strong>.
+-    </td>
+-    <td>'<code>-input-cycle 10m</code>' 
+-        implies that the whole trace run will be now sliced at a 10min 
+-        interval. Basic operations will be done on the 10m chunks. Note 
+-        that *Rumen* understands various time units like 
+-        <em>m(min), h(hour), d(days) etc</em>.
+-    </td>
+-  </tr>
+-  <tr>
+-    <td><code>-output-duration</code></td>
+-    <td>This parameter defines the final runtime of the trace. 
+-        Default value if <strong>1 hour</strong>.
+-    </td>
+-    <td>'<code>-output-duration 30m</code>' 
+-        implies that the resulting trace will have a max runtime of 
+-        30mins. All the jobs in the input trace file will be folded and 
+-        scaled to fit this window.
+-    </td>
+-  </tr>
+-  <tr>
+-    <td><code>-concentration</code></td>
+-    <td>Set the concentration of the resulting trace. Default value is 
+-        <strong>1</strong>.
+-    </td>
+-    <td>If the total runtime of the resulting trace is less than the total
+-        runtime of the input trace, then the resulting trace would contain
+-        lesser number of jobs as compared to the input trace. This 
+-        essentially means that the output is diluted. To increase the 
+-        density of jobs, set the concentration to a higher value.</td>
+-  </tr>
+-  <tr>
+-    <td><code>-debug</code></td>
+-    <td>Run the Folder in debug mode. By default it is set to 
+-        <strong>false</strong>.</td>
+-    <td>In debug mode, the Folder will print additional statements for 
+-        debugging. Also the intermediate files generated in the scratch 
+-        directory will not be cleaned up.
+-    </td>
+-  </tr>
+-  <tr>
+-    <td><code>-seed</code></td>
+-    <td>Initial seed to the Random Number Generator. By default, a Random 
+-        Number Generator is used to generate a seed and the seed value is
+-        reported back to the user for future use.
+-    </td>
+-    <td>If an initial seed is passed, then the <code>Random Number 
+-        Generator</code> will generate the random numbers in the same 
+-        sequence i.e the sequence of random numbers remains same if the 
+-        same seed is used. Folder uses Random Number Generator to decide 
+-        whether or not to emit the job. 
+-    </td>
+-  </tr>
+-  <tr>
+-    <td><code>-temp-directory</code></td>
+-    <td>Temporary directory for the Folder. By default the <strong>output
+-        folder's parent directory</strong> is used as the scratch space.
+-    </td>
+-    <td>This is the scratch space used by Folder.  All the 
+-        temporary files are cleaned up in the end unless the Folder is run
+-        in <code>debug</code> mode.</td>
+-  </tr>
+-  <tr>
+-    <td><code>-skew-buffer-length</code></td>
+-    <td>Enables <em>Folder</em> to tolerate skewed jobs.
+-        The default buffer length is <strong>0</strong>.</td>
+-    <td>'<code>-skew-buffer-length 100</code>' 
+-        indicates that if the jobs appear out of order within a window 
+-        size of 100, then they will be emitted in-order by the folder. 
+-        If a job appears out-of-order outside this window, then the Folder
+-        will bail out provided <code>-allow-missorting</code> is not set.
+-        <em>Folder</em> reports the maximum skew size seen in the 
+-        input trace for future use.
+-    </td>
+-  </tr>
+-  <tr>
+-    <td><code>-allow-missorting</code></td>
+-    <td>Enables <em>Folder</em> to tolerate out-of-order jobs. By default 
+-        mis-sorting is not allowed.
+-    </td>
+-    <td>If mis-sorting is allowed, then the <em>Folder</em> will ignore 
+-        out-of-order jobs that cannot be deskewed using a skew buffer of
+-        size specified using <code>-skew-buffer-length</code>. If 
+-        mis-sorting is not allowed, then the Folder will bail out if the
+-        skew buffer is incapable of tolerating the skew.
+-    </td>
+-  </tr>
+-</table>
+-
+-
+-$H4 Examples
+-
+-$H5 Folding an input trace with 10 hours of total runtime to generate an output trace with 1 hour of total runtime
+-
+-```
+-hadoop rumenfolder \
+-  -output-duration 1h \
+-  -input-cycle 20m \
+-  file:///tmp/job-trace.json \
+-  file:///tmp/job-trace-1hr.json
+-```
+-
+-If the folded jobs are out of order then the command will bail out. 
+-
+-$H5 Folding an input trace with 10 hours of total runtime to generate an output trace with 1 hour of total runtime and tolerate some skewness
+-
+-```
+-hadoop rumenfolder \
+-  -output-duration 1h \
+-  -input-cycle 20m \
+-  -allow-missorting \
+-  -skew-buffer-length 100 \
+-  file:///tmp/job-trace.json \
+-  file:///tmp/job-trace-1hr.json
+-```
+-
+-If the folded jobs are out of order, then atmost
+-100 jobs will be de-skewed. If the 101<sup>st</sup> job is 
+-*out-of-order*, then the command will bail out.
+-
+-$H5 Folding an input trace with 10 hours of total runtime to generate an output trace with 1 hour of total runtime in debug mode
+-
+-```
+-hadoop rumenfolder \
+-  -output-duration 1h \
+-  -input-cycle 20m \
+-  -debug -temp-directory file:///tmp/debug \
+-  file:///tmp/job-trace.json \
+-  file:///tmp/job-trace-1hr.json
+-```
+-
+-This will fold the 10hr job-trace file 
+-`file:///tmp/job-trace.json` to finish within 1hr 
+-and use `file:///tmp/debug` as the temporary directory. 
+-The intermediate files in the temporary directory will not be cleaned
+-up.
+-      
+-$H5 Folding an input trace with 10 hours of total runtime to generate an output trace with 1 hour of total runtime with custom concentration.
+-
+-```
+-hadoop rumenfolder \
+-  -output-duration 1h \
+-  -input-cycle 20m \
+-  -concentration 2 \
+-  file:///tmp/job-trace.json \
+-  file:///tmp/job-trace-1hr.json
+-```
+-
+-This will fold the 10hr job-trace file 
+-`file:///tmp/job-trace.json` to finish within 1hr 
+-with concentration of 2.
+-If the 10h job-trace is folded to 1h, it retains 10% of the jobs by default.
+-With *concentration* as 2, 20% of the total input jobs will be retained.
+-
+-
+-Appendix
+---------
+-    
+-$H3 Resources
+-
+-<a href="https://issues.apache.org/jira/browse/MAPREDUCE-751">MAPREDUCE-751</a>
+-is the main JIRA that introduced *Rumen* to *MapReduce*. 
+-Look at the MapReduce
+-<a href="https://issues.apache.org/jira/browse/MAPREDUCE/component/12313617">rumen-component</a>
+-for further details.
+-
+diff --git a/hadoop-tools/hadoop-rumen/src/site/resources/css/site.css b/hadoop-tools/hadoop-rumen/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java
+deleted file mode 100644
+index e9172f60f83..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java
++++ /dev/null
+@@ -1,338 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.io.BufferedInputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-
+-public class ConcatenatedInputFilesDemuxer implements InputDemuxer {
+-  private String name;
+-  private DelimitedInputStream input;
+-
+-  private String knownNextFileName = null;
+-
+-  static private int MAXIMUM_HEADER_LINE_LENGTH = 500;
+-
+-  @Override
+-  public void bindTo(Path path, Configuration conf) throws IOException {
+-    InputStream underlyingInput = null;
+-
+-    if (name != null) { // re-binding before the previous one was consumed.
+-      close();
+-    }
+-    name = path.getName();
+-
+-    underlyingInput = new PossiblyDecompressedInputStream(path, conf);
+-
+-    input =
+-        new DelimitedInputStream(new BufferedInputStream(underlyingInput),
+-            "\f!!FILE=", "!!\n");
+-
+-    knownNextFileName = input.nextFileName();
+-
+-    if (knownNextFileName == null) {
+-      close();
+-
+-      return;
+-    }
+-
+-    /*
+-     * We handle files in specialized formats by trying their demuxers first,
+-     * not by failing here.
+-     */
+-    return;
+-  }
+-
+-  @Override
+-  public Pair<String, InputStream> getNext() throws IOException {
+-    if (knownNextFileName != null) {
+-      Pair<String, InputStream> result =
+-          new Pair<String, InputStream>(knownNextFileName, input);
+-
+-      knownNextFileName = null;
+-
+-      return result;
+-    }
+-
+-    String nextFileName = input.nextFileName();
+-
+-    if (nextFileName == null) {
+-      return null;
+-    }
+-
+-    return new Pair<String, InputStream>(nextFileName, input);
+-  }
+-
+-  @Override
+-  public void close() throws IOException {
+-    if (input != null) {
+-      input.close();
+-    }
+-  }
+-
+-  /**
+-   * A simple wrapper class to make any input stream delimited. It has an extra
+-   * method, getName.
+-   * 
+-   * The input stream should have lines that look like
+-   * <marker><filename><endmarker> . The text <marker> should not occur
+-   * elsewhere in the file. The text <endmarker> should not occur in a file
+-   * name.
+-   */
+-  static class DelimitedInputStream extends InputStream {
+-    private InputStream input;
+-
+-    private boolean endSeen = false;
+-
+-    private final String fileMarker;
+-
+-    private final byte[] markerBytes;
+-
+-    private final byte[] fileMarkerBuffer;
+-
+-    private final String fileEndMarker;
+-
+-    private final byte[] endMarkerBytes;
+-
+-    private final byte[] fileEndMarkerBuffer;
+-
+-    /**
+-     * Constructor.
+-     * 
+-     * @param input
+-     */
+-    public DelimitedInputStream(InputStream input, String fileMarker,
+-        String fileEndMarker) {
+-      this.input = new BufferedInputStream(input, 10000);
+-      this.input.mark(10000);
+-      this.fileMarker = fileMarker;
+-      this.markerBytes = this.fileMarker.getBytes();
+-      this.fileMarkerBuffer = new byte[this.markerBytes.length];
+-      this.fileEndMarker = fileEndMarker;
+-      this.endMarkerBytes = this.fileEndMarker.getBytes();
+-      this.fileEndMarkerBuffer = new byte[this.endMarkerBytes.length];
+-    }
+-
+-    @Override
+-    public int read() throws IOException {
+-      if (endSeen) {
+-        return -1;
+-      }
+-
+-      input.mark(10000);
+-
+-      int result = input.read();
+-
+-      if (result < 0) {
+-        endSeen = true;
+-        return result;
+-      }
+-
+-      if (result == markerBytes[0]) {
+-        input.reset();
+-
+-        // this might be a marker line
+-        int markerReadResult =
+-            input.read(fileMarkerBuffer, 0, fileMarkerBuffer.length);
+-
+-        input.reset();
+-
+-        if (markerReadResult < fileMarkerBuffer.length
+-            || !fileMarker.equals(new String(fileMarkerBuffer))) {
+-          return input.read();
+-        }
+-
+-        return -1;
+-      }
+-
+-      return result;
+-    }
+-
+-    /*
+-     * (non-Javadoc)
+-     * 
+-     * @see java.io.InputStream#read(byte[], int, int)
+-     * 
+-     * This does SLIGHTLY THE WRONG THING.
+-     * 
+-     * If we run off the end of the segment then the input buffer will be
+-     * dirtied beyond the point where we claim to have read. If this turns out
+-     * to be a problem, save that data somewhere and restore it if needed.
+-     */
+-    @Override
+-    public int read(byte[] buffer, int offset, int length) throws IOException {
+-      if (endSeen) {
+-        return -1;
+-      }
+-
+-      input.mark(length + markerBytes.length + 10);
+-
+-      int dataSeen = input.read(buffer, offset, length);
+-
+-      byte[] extraReadBuffer = null;
+-      int extraActualRead = -1;
+-
+-      // search for an instance of a file marker
+-      for (int i = offset; i < offset + dataSeen; ++i) {
+-        if (buffer[i] == markerBytes[0]) {
+-          boolean mismatch = false;
+-
+-          for (int j = 1; j < Math.min(markerBytes.length, offset + dataSeen
+-              - i); ++j) {
+-            if (buffer[i + j] != markerBytes[j]) {
+-              mismatch = true;
+-              break;
+-            }
+-          }
+-
+-          if (!mismatch) {
+-            // see if we have only a prefix of the markerBytes
+-            int uncheckedMarkerCharCount =
+-                markerBytes.length - (offset + dataSeen - i);
+-
+-            if (uncheckedMarkerCharCount > 0) {
+-              if (extraReadBuffer == null) {
+-                extraReadBuffer = new byte[markerBytes.length - 1];
+-
+-                extraActualRead = input.read(extraReadBuffer);
+-              }
+-
+-              if (extraActualRead < uncheckedMarkerCharCount) {
+-                input.reset();
+-                return input.read(buffer, offset, length);
+-              }
+-
+-              for (int j = 0; j < uncheckedMarkerCharCount; ++j) {
+-                if (extraReadBuffer[j] != markerBytes[markerBytes.length
+-                    - uncheckedMarkerCharCount + j]) {
+-                  input.reset();
+-                  return input.read(buffer, offset, length);
+-                }
+-              }
+-            }
+-
+-            input.reset();
+-
+-            if (i == offset) {
+-              return -1;
+-            }
+-
+-            int result = input.read(buffer, offset, i - offset);
+-            return result;
+-          }
+-        }
+-      }
+-
+-      return dataSeen;
+-    }
+-
+-    @Override
+-    public int read(byte[] buffer) throws IOException {
+-      return read(buffer, 0, buffer.length);
+-    }
+-
+-    @Override
+-    public void close() throws IOException {
+-      if (endSeen) {
+-        input.close();
+-      }
+-    }
+-
+-    String nextFileName() throws IOException {
+-      return nextFileName(MAXIMUM_HEADER_LINE_LENGTH);
+-    }
+-
+-    private String nextFileName(int bufferSize) throws IOException {
+-      // the line can't contain a newline and must contain a form feed
+-      byte[] buffer = new byte[bufferSize];
+-
+-      input.mark(bufferSize + 1);
+-
+-      int actualRead = input.read(buffer);
+-      int mostRecentRead = actualRead;
+-
+-      while (actualRead < bufferSize && mostRecentRead > 0) {
+-        mostRecentRead =
+-            input.read(buffer, actualRead, bufferSize - actualRead);
+-
+-        if (mostRecentRead > 0) {
+-          actualRead += mostRecentRead;
+-        }
+-      }
+-
+-      if (actualRead < markerBytes.length) {
+-        input.reset();
+-        return null;
+-      }
+-
+-      for (int i = 0; i < markerBytes.length; ++i) {
+-        if (markerBytes[i] != buffer[i]) {
+-          input.reset();
+-          return null;
+-        }
+-      }
+-
+-      for (int i = markerBytes.length; i < actualRead; ++i) {
+-        if (buffer[i] == endMarkerBytes[0]) {
+-          // gather the file name
+-          input.reset();
+-          // burn the marker
+-          if (input.read(buffer, 0, markerBytes.length) < markerBytes.length) {
+-            throw new IOException("Can't reread bytes I've read before.");
+-          }
+-          // get the file name
+-          if (input.read(buffer, 0, i - markerBytes.length) < i
+-              - markerBytes.length) {
+-            throw new IOException("Can't reread bytes I've read before.");
+-          }
+-          // burn the two exclamation points and the newline
+-          if (input.read(fileEndMarkerBuffer) < fileEndMarkerBuffer.length) {
+-            input.reset();
+-            return null;
+-          }
+-          for (int j = 0; j < endMarkerBytes.length; ++j) {
+-            if (endMarkerBytes[j] != fileEndMarkerBuffer[j]) {
+-              input.reset();
+-              return null;
+-            }
+-          }
+-
+-          return new String(buffer, 0, i - markerBytes.length);
+-        }
+-
+-        if (buffer[i] == '\n') {
+-          return null;
+-        }
+-      }
+-
+-      // we ran off the end. Was the buffer too short, or is this all there was?
+-      input.reset();
+-
+-      if (actualRead < bufferSize) {
+-        return null;
+-      }
+-
+-      return nextFileName(bufferSize * 2);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java
+deleted file mode 100644
+index 6930f9b5532..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-class HistogramRawTestData {
+-  List<Long> data = new ArrayList<Long>();
+-
+-  List<Integer> percentiles = new ArrayList<Integer>();
+-
+-  int scale;
+-
+-  public List<Integer> getPercentiles() {
+-    return percentiles;
+-  }
+-
+-  public void setPercentiles(List<Integer> percentiles) {
+-    this.percentiles = percentiles;
+-  }
+-
+-  public int getScale() {
+-    return scale;
+-  }
+-
+-  public void setScale(int scale) {
+-    this.scale = scale;
+-  }
+-
+-  public List<Long> getData() {
+-    return data;
+-  }
+-
+-  public void setData(List<Long> data) {
+-    this.data = data;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java
+deleted file mode 100644
+index 187251900b7..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java
++++ /dev/null
+@@ -1,158 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-import java.io.IOException;
+-
+-import java.io.OutputStream;
+-import java.util.List;
+-
+-import com.fasterxml.jackson.core.JsonEncoding;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-
+-import org.junit.Ignore;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-@Ignore
+-public class TestHistograms {
+-
+-  /**
+-   * @throws IOException
+-   * 
+-   *           There should be files in the directory named by
+-   *           ${test.build.data}/rumen/histogram-test .
+-   * 
+-   *           There will be pairs of files, inputXxx.json and goldXxx.json .
+-   * 
+-   *           We read the input file as a HistogramRawTestData in json. Then we
+-   *           create a Histogram using the data field, and then a
+-   *           LoggedDiscreteCDF using the percentiles and scale field. Finally,
+-   *           we read the corresponding goldXxx.json as a LoggedDiscreteCDF and
+-   *           deepCompare them.
+-   */
+-  @Test
+-  public void testHistograms() throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem lfs = FileSystem.getLocal(conf);
+-    final Path rootInputDir = lfs.makeQualified(new Path(
+-        System.getProperty("test.tools.input.dir", "target/input")));
+-    final Path rootInputFile = new Path(rootInputDir, "rumen/histogram-tests");
+-
+-
+-    FileStatus[] tests = lfs.listStatus(rootInputFile);
+-
+-    for (int i = 0; i < tests.length; ++i) {
+-      Path filePath = tests[i].getPath();
+-      String fileName = filePath.getName();
+-      if (fileName.startsWith("input")) {
+-        String testName = fileName.substring("input".length());
+-        Path goldFilePath = new Path(rootInputFile, "gold"+testName);
+-        assertTrue("Gold file dies not exist", lfs.exists(goldFilePath));
+-        LoggedDiscreteCDF newResult = histogramFileToCDF(filePath, lfs);
+-        System.out.println("Testing a Histogram for " + fileName);
+-        FSDataInputStream goldStream = lfs.open(goldFilePath);
+-        JsonObjectMapperParser<LoggedDiscreteCDF> parser = new JsonObjectMapperParser<LoggedDiscreteCDF>(
+-            goldStream, LoggedDiscreteCDF.class); 
+-        try {
+-          LoggedDiscreteCDF dcdf = parser.getNext();
+-          dcdf.deepCompare(newResult, new TreePath(null, "<root>"));
+-        } catch (DeepInequalityException e) {
+-          fail(e.path.toString());
+-        }
+-        finally {
+-            parser.close();
+-        }
+-      }
+-    }
+-  }
+-
+-  private static LoggedDiscreteCDF histogramFileToCDF(Path path, FileSystem fs)
+-      throws IOException {
+-    FSDataInputStream dataStream = fs.open(path);
+-    JsonObjectMapperParser<HistogramRawTestData> parser = new JsonObjectMapperParser<HistogramRawTestData>(
+-        dataStream, HistogramRawTestData.class);
+-    HistogramRawTestData data;
+-    try {
+-      data = parser.getNext();
+-    } finally {
+-      parser.close();
+-    }
+-    
+-    Histogram hist = new Histogram();
+-    List<Long> measurements = data.getData();
+-    List<Long> typeProbeData = new HistogramRawTestData().getData();
+-
+-    assertTrue(
+-        "The data attribute of a jackson-reconstructed HistogramRawTestData "
+-            + " should be a " + typeProbeData.getClass().getName()
+-            + ", like a virgin HistogramRawTestData, but it's a "
+-            + measurements.getClass().getName(),
+-        measurements.getClass() == typeProbeData.getClass());
+-
+-    for (int j = 0; j < measurements.size(); ++j) {
+-      hist.enter(measurements.get(j));
+-    }
+-
+-    LoggedDiscreteCDF result = new LoggedDiscreteCDF();
+-    int[] percentiles = new int[data.getPercentiles().size()];
+-
+-    for (int j = 0; j < data.getPercentiles().size(); ++j) {
+-      percentiles[j] = data.getPercentiles().get(j);
+-    }
+-
+-    result.setCDF(hist, percentiles, data.getScale());
+-    return result;
+-  }
+-  
+-  public static void main(String[] args) throws IOException {
+-    final Configuration conf = new Configuration();
+-    final FileSystem lfs = FileSystem.getLocal(conf);
+-
+-    for (String arg : args) {
+-      Path filePath = lfs.makeQualified(new Path(arg));
+-      String fileName = filePath.getName();
+-      if (fileName.startsWith("input")) {
+-        LoggedDiscreteCDF newResult = histogramFileToCDF(filePath, lfs);
+-        String testName = fileName.substring("input".length());
+-        Path goldFilePath = new Path(filePath.getParent(), "gold"+testName);
+-
+-        ObjectMapper mapper = new ObjectMapper();
+-        JsonFactory factory = mapper.getFactory();
+-        FSDataOutputStream ostream = lfs.create(goldFilePath, true);
+-        JsonGenerator gen = factory.createGenerator((OutputStream)ostream,
+-            JsonEncoding.UTF8);
+-        gen.useDefaultPrettyPrinter();
+-        
+-        gen.writeObject(newResult);
+-        
+-        gen.close();
+-      } else {
+-        System.err.println("Input file not started with \"input\". File "+fileName+" skipped.");
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java
+deleted file mode 100644
+index 573f8628ee5..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import java.util.ArrayList;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestPiecewiseLinearInterpolation {
+-
+-  static private double maximumRelativeError = 0.002D;
+-
+-  static private LoggedSingleRelativeRanking makeRR(double ranking, long datum) {
+-    LoggedSingleRelativeRanking result = new LoggedSingleRelativeRanking();
+-
+-    result.setDatum(datum);
+-    result.setRelativeRanking(ranking);
+-
+-    return result;
+-  }
+-
+-  @Test
+-  public void testOneRun() {
+-    LoggedDiscreteCDF input = new LoggedDiscreteCDF();
+-
+-    input.setMinimum(100000L);
+-    input.setMaximum(1100000L);
+-
+-    ArrayList<LoggedSingleRelativeRanking> rankings = new ArrayList<LoggedSingleRelativeRanking>();
+-
+-    rankings.add(makeRR(0.1, 200000L));
+-    rankings.add(makeRR(0.5, 800000L));
+-    rankings.add(makeRR(0.9, 1000000L));
+-
+-    input.setRankings(rankings);
+-    input.setNumberValues(3);
+-
+-    CDFRandomGenerator gen = new CDFPiecewiseLinearRandomGenerator(input);
+-    Histogram values = new Histogram();
+-
+-    for (int i = 0; i < 1000000; ++i) {
+-      long value = gen.randomValue();
+-      values.enter(value);
+-    }
+-
+-    /*
+-     * Now we build a percentiles CDF, and compute the sum of the squares of the
+-     * actual percentiles vrs. the predicted percentiles
+-     */
+-    int[] percentiles = new int[99];
+-
+-    for (int i = 0; i < 99; ++i) {
+-      percentiles[i] = i + 1;
+-    }
+-
+-    long[] result = values.getCDF(100, percentiles);
+-    long sumErrorSquares = 0L;
+-
+-    for (int i = 0; i < 10; ++i) {
+-      long error = result[i] - (10000L * i + 100000L);
+-      System.out.println("element " + i + ", got " + result[i] + ", expected "
+-          + (10000L * i + 100000L) + ", error = " + error);
+-      sumErrorSquares += error * error;
+-    }
+-
+-    for (int i = 10; i < 50; ++i) {
+-      long error = result[i] - (15000L * i + 50000L);
+-      System.out.println("element " + i + ", got " + result[i] + ", expected "
+-          + (15000L * i + 50000L) + ", error = " + error);
+-      sumErrorSquares += error * error;
+-    }
+-
+-    for (int i = 50; i < 90; ++i) {
+-      long error = result[i] - (5000L * i + 550000L);
+-      System.out.println("element " + i + ", got " + result[i] + ", expected "
+-          + (5000L * i + 550000L) + ", error = " + error);
+-      sumErrorSquares += error * error;
+-    }
+-
+-    for (int i = 90; i <= 100; ++i) {
+-      long error = result[i] - (10000L * i + 100000L);
+-      System.out.println("element " + i + ", got " + result[i] + ", expected "
+-          + (10000L * i + 100000L) + ", error = " + error);
+-      sumErrorSquares += error * error;
+-    }
+-
+-    // normalize the error
+-    double realSumErrorSquares = (double) sumErrorSquares;
+-
+-    double normalizedError = realSumErrorSquares / 100
+-        / rankings.get(1).getDatum() / rankings.get(1).getDatum();
+-    double RMSNormalizedError = Math.sqrt(normalizedError);
+-
+-    System.out.println("sumErrorSquares = " + sumErrorSquares);
+-
+-    System.out.println("normalizedError: " + normalizedError
+-        + ", RMSNormalizedError: " + RMSNormalizedError);
+-
+-    System.out.println("Cumulative error is " + RMSNormalizedError);
+-
+-    assertTrue("The RMS relative error per bucket, " + RMSNormalizedError
+-        + ", exceeds our tolerance of " + maximumRelativeError,
+-        RMSNormalizedError <= maximumRelativeError);
+-
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java
+deleted file mode 100644
+index cca662c5295..00000000000
+--- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.tools.rumen;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import static org.apache.hadoop.tools.rumen.RandomSeedGenerator.getSeed;
+-
+-public class TestRandomSeedGenerator {
+-  @Test
+-  public void testSeedGeneration() {
+-    long masterSeed1 = 42;
+-    long masterSeed2 = 43;
+-    
+-    assertTrue("Deterministic seeding",
+-        getSeed("stream1", masterSeed1) == getSeed("stream1", masterSeed1));
+-    assertTrue("Deterministic seeding",
+-        getSeed("stream2", masterSeed2) == getSeed("stream2", masterSeed2));
+-    assertTrue("Different streams", 
+-        getSeed("stream1", masterSeed1) != getSeed("stream2", masterSeed1));
+-    assertTrue("Different master seeds",
+-        getSeed("stream1", masterSeed1) != getSeed("stream1", masterSeed2));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index ecf47ef52b1..cf641d633fc 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -55,11 +55,6 @@
+       <artifactId>hadoop-federation-balance</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-rumen</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-aws</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 744db181673..2b2842fe9fc 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -33,7 +33,6 @@
+     <module>hadoop-streaming</module>
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+-    <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
diff --git a/hadoop/stackable/patches/3.4.0/14-remove-hadoop-streaming.patch b/hadoop/stackable/patches/3.4.0/14-remove-hadoop-streaming.patch
new file mode 100644
index 000000000..c5822ad4a
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/14-remove-hadoop-streaming.patch
@@ -0,0 +1,16871 @@
+Entirely remove hadoop-streaming
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../src/main/resources/assemblies/hadoop-tools.xml |   15 
+ hadoop-project/pom.xml                             |    5 
+ hadoop-project/src/site/site.xml                   |    1 
+ .../dev-support/findbugs-exclude.xml               |   51 -
+ hadoop-tools/hadoop-streaming/pom.xml              |  219 ----
+ .../apache/hadoop/record/BinaryRecordInput.java    |  161 ---
+ .../apache/hadoop/record/BinaryRecordOutput.java   |  143 ---
+ .../main/java/org/apache/hadoop/record/Buffer.java |  258 -----
+ .../org/apache/hadoop/record/CsvRecordOutput.java  |  161 ---
+ .../main/java/org/apache/hadoop/record/Index.java  |   45 -
+ .../main/java/org/apache/hadoop/record/Record.java |  103 --
+ .../org/apache/hadoop/record/RecordComparator.java |   55 -
+ .../java/org/apache/hadoop/record/RecordInput.java |  128 --
+ .../org/apache/hadoop/record/RecordOutput.java     |  149 ---
+ .../main/java/org/apache/hadoop/record/Utils.java  |  498 ---------
+ .../java/org/apache/hadoop/record/package.html     |  806 ---------------
+ .../apache/hadoop/streaming/AutoInputFormat.java   |   74 -
+ .../apache/hadoop/streaming/DumpTypedBytes.java    |  145 ---
+ .../org/apache/hadoop/streaming/Environment.java   |  132 --
+ .../apache/hadoop/streaming/HadoopStreaming.java   |   71 -
+ .../org/apache/hadoop/streaming/JarBuilder.java    |  208 ----
+ .../apache/hadoop/streaming/LoadTypedBytes.java    |  104 --
+ .../org/apache/hadoop/streaming/PathFinder.java    |  102 --
+ .../org/apache/hadoop/streaming/PipeCombiner.java  |   42 -
+ .../org/apache/hadoop/streaming/PipeMapRed.java    |  627 -----------
+ .../org/apache/hadoop/streaming/PipeMapRunner.java |   36 -
+ .../org/apache/hadoop/streaming/PipeMapper.java    |  157 ---
+ .../org/apache/hadoop/streaming/PipeReducer.java   |  161 ---
+ .../hadoop/streaming/StreamBaseRecordReader.java   |  148 ---
+ .../apache/hadoop/streaming/StreamInputFormat.java |   82 -
+ .../org/apache/hadoop/streaming/StreamJob.java     | 1105 --------------------
+ .../apache/hadoop/streaming/StreamKeyValUtil.java  |  137 --
+ .../org/apache/hadoop/streaming/StreamUtil.java    |  205 ----
+ .../hadoop/streaming/StreamXmlRecordReader.java    |  302 -----
+ .../hadoop/streaming/io/IdentifierResolver.java    |  132 --
+ .../apache/hadoop/streaming/io/InputWriter.java    |   48 -
+ .../streaming/io/KeyOnlyTextInputWriter.java       |   35 -
+ .../streaming/io/KeyOnlyTextOutputReader.java      |   86 --
+ .../apache/hadoop/streaming/io/OutputReader.java   |   59 -
+ .../hadoop/streaming/io/RawBytesInputWriter.java   |   73 -
+ .../hadoop/streaming/io/RawBytesOutputReader.java  |   92 --
+ .../hadoop/streaming/io/TextInputWriter.java       |   76 -
+ .../hadoop/streaming/io/TextOutputReader.java      |  115 --
+ .../hadoop/streaming/io/TypedBytesInputWriter.java |   63 -
+ .../streaming/io/TypedBytesOutputReader.java       |   80 -
+ .../mapreduce/StreamBaseRecordReader.java          |  154 ---
+ .../streaming/mapreduce/StreamInputFormat.java     |  104 --
+ .../streaming/mapreduce/StreamXmlRecordReader.java |  341 ------
+ .../java/org/apache/hadoop/streaming/package.html  |   27 
+ .../java/org/apache/hadoop/typedbytes/Type.java    |   50 -
+ .../apache/hadoop/typedbytes/TypedBytesInput.java  |  506 ---------
+ .../apache/hadoop/typedbytes/TypedBytesOutput.java |  334 ------
+ .../hadoop/typedbytes/TypedBytesRecordInput.java   |  161 ---
+ .../hadoop/typedbytes/TypedBytesRecordOutput.java  |  139 ---
+ .../hadoop/typedbytes/TypedBytesWritable.java      |   88 --
+ .../hadoop/typedbytes/TypedBytesWritableInput.java |  385 -------
+ .../typedbytes/TypedBytesWritableOutput.java       |  224 ----
+ .../java/org/apache/hadoop/typedbytes/package.html |   67 -
+ .../src/main/shellprofile.d/hadoop-streaming.sh    |   51 -
+ .../src/site/markdown/HadoopStreaming.md.vm        |  576 ----------
+ .../src/site/resources/css/site.css                |   30 -
+ hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd |   18 
+ .../hadoop-streaming/src/test/bin/xargs_cat.cmd    |   18 
+ .../src/test/java/ClassWithNoPackage.java          |   20 
+ .../org/apache/hadoop/streaming/DelayEchoApp.java  |   57 -
+ .../java/org/apache/hadoop/streaming/FailApp.java  |   58 -
+ .../org/apache/hadoop/streaming/OutputOnlyApp.java |   38 -
+ .../apache/hadoop/streaming/RawBytesMapApp.java    |   66 -
+ .../apache/hadoop/streaming/RawBytesReduceApp.java |   75 -
+ .../org/apache/hadoop/streaming/StderrApp.java     |   78 -
+ .../apache/hadoop/streaming/StreamAggregate.java   |   57 -
+ .../hadoop/streaming/TestAutoInputFormat.java      |  113 --
+ .../hadoop/streaming/TestClassWithNoPackage.java   |   56 -
+ .../hadoop/streaming/TestDumpTypedBytes.java       |   94 --
+ .../org/apache/hadoop/streaming/TestFileArgs.java  |  118 --
+ .../org/apache/hadoop/streaming/TestGzipInput.java |   44 -
+ .../hadoop/streaming/TestLoadTypedBytes.java       |   91 --
+ .../apache/hadoop/streaming/TestMRFramework.java   |   48 -
+ .../hadoop/streaming/TestMultipleArchiveFiles.java |  140 ---
+ .../hadoop/streaming/TestMultipleCachefiles.java   |  157 ---
+ .../hadoop/streaming/TestRawBytesStreaming.java    |   97 --
+ .../hadoop/streaming/TestStreamAggregate.java      |  104 --
+ .../hadoop/streaming/TestStreamDataProtocol.java   |  117 --
+ .../org/apache/hadoop/streaming/TestStreamJob.java |   85 --
+ .../hadoop/streaming/TestStreamReduceNone.java     |  110 --
+ .../streaming/TestStreamXmlMultipleRecords.java    |  184 ---
+ .../streaming/TestStreamXmlRecordReader.java       |   61 -
+ .../org/apache/hadoop/streaming/TestStreaming.java |  203 ----
+ .../hadoop/streaming/TestStreamingBackground.java  |   87 --
+ .../hadoop/streaming/TestStreamingBadRecords.java  |  329 ------
+ .../hadoop/streaming/TestStreamingCombiner.java    |   54 -
+ .../hadoop/streaming/TestStreamingCounters.java    |   53 -
+ .../hadoop/streaming/TestStreamingExitStatus.java  |  109 --
+ .../hadoop/streaming/TestStreamingFailure.java     |   55 -
+ .../hadoop/streaming/TestStreamingKeyValue.java    |  139 ---
+ .../TestStreamingOutputKeyValueTypes.java          |  198 ----
+ .../streaming/TestStreamingOutputOnlyKeys.java     |   51 -
+ .../hadoop/streaming/TestStreamingSeparator.java   |  122 --
+ .../hadoop/streaming/TestStreamingStatus.java      |  336 ------
+ .../hadoop/streaming/TestStreamingStderr.java      |  110 --
+ .../org/apache/hadoop/streaming/TestSymLink.java   |  142 ---
+ .../hadoop/streaming/TestTypedBytesStreaming.java  |   91 --
+ .../hadoop/streaming/TestUnconsumedInput.java      |  104 --
+ .../java/org/apache/hadoop/streaming/TrApp.java    |  116 --
+ .../org/apache/hadoop/streaming/TrAppReduce.java   |  112 --
+ .../apache/hadoop/streaming/TypedBytesMapApp.java  |   59 -
+ .../hadoop/streaming/TypedBytesReduceApp.java      |   58 -
+ .../java/org/apache/hadoop/streaming/UniqApp.java  |   57 -
+ .../java/org/apache/hadoop/streaming/UtilTest.java |  145 ---
+ .../apache/hadoop/streaming/ValueCountReduce.java  |   64 -
+ .../streaming/io/TestKeyOnlyTextOutputReader.java  |   68 -
+ .../mapreduce/TestStreamXmlRecordReader.java       |  145 ---
+ .../hadoop/typedbytes/TestTypedBytesWritable.java  |   65 -
+ hadoop-tools/hadoop-tools-dist/pom.xml             |   11 
+ hadoop-tools/pom.xml                               |    2 
+ 115 files changed, 1 insertion(+), 15920 deletions(-)
+ delete mode 100644 hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-tools/hadoop-streaming/pom.xml
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/AutoInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/DumpTypedBytes.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/HadoopStreaming.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/JarBuilder.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/LoadTypedBytes.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PathFinder.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeCombiner.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRunner.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamBaseRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamKeyValUtil.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamXmlRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/InputWriter.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextInputWriter.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextOutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/OutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesInputWriter.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextInputWriter.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesInputWriter.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamXmlRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/Type.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritable.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableOutput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html
+ delete mode 100755 hadoop-tools/hadoop-streaming/src/main/shellprofile.d/hadoop-streaming.sh
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/site/resources/css/site.css
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/ClassWithNoPackage.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/DelayEchoApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/FailApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesMapApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesReduceApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StderrApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StreamAggregate.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestAutoInputFormat.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestClassWithNoPackage.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestFileArgs.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestGzipInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestLoadTypedBytes.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleCachefiles.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestRawBytesStreaming.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamAggregate.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamDataProtocol.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamJob.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlMultipleRecords.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreaming.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBackground.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCombiner.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCounters.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingExitStatus.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingFailure.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingKeyValue.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputKeyValueTypes.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputOnlyKeys.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingSeparator.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStatus.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStderr.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestSymLink.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestTypedBytesStreaming.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrAppReduce.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesMapApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesReduceApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UniqApp.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/ValueCountReduce.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
+ delete mode 100644 hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestTypedBytesWritable.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 4cde654d0fa..f8f4a6ea528 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -53,21 +53,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-streaming/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-streaming/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-aws/src/main/bin</directory>
+       <outputDirectory>/bin</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 43ca02d5464..2e3eec4aeb8 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -631,11 +631,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-streaming</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 5d9ad281ce6..728267ead6a 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -190,7 +190,6 @@
+     </menu>
+ 
+     <menu name="Tools" inherit="top">
+-      <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+diff --git a/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml b/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index b886222b3cc..00000000000
+--- a/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,51 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-  <!-- Workaround bugs in findbugs 1.3.9. See http://sourceforge.net/p/findbugs/bugs/918 for more details. -->
+-  <Match>
+-    <Or>
+-      <Package name="org.apache.hadoop.streaming" />
+-    </Or>
+-    <Bug pattern="NP_ALWAYS_NULL"/>
+-  </Match>
+-  <Match>
+-    <Class name="org.apache.hadoop.streaming.JarBuilder" />
+-    <Bug pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS"/>
+-  </Match>
+-
+-  <Match>
+-    <Or>
+-      <Class name="org.apache.hadoop.streaming.PipeMapper" />
+-      <Class name="org.apache.hadoop.streaming.PipeReducer"/>
+-    </Or>
+-    <Or>
+-      <Method name="getFieldSeparator"/>
+-      <Method name="getInputSeparator"/>
+-    </Or>
+-    <Bug pattern="EI_EXPOSE_REP"/>
+-  </Match>
+-
+-  <Match>
+-    <Package name="org.apache.hadoop.record" />
+-    <Or>
+-      <Bug pattern="EI_EXPOSE_REP" />
+-      <Bug pattern="EI_EXPOSE_REP2" />
+-      <Bug pattern="MS_PKGPROTECT" />
+-    </Or>
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml
+deleted file mode 100644
+index 443d45c73d9..00000000000
+--- a/hadoop-tools/hadoop-streaming/pom.xml
++++ /dev/null
+@@ -1,219 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-streaming</artifactId>
+-  <version>3.4.0</version>
+-  <description>Apache Hadoop MapReduce Streaming</description>
+-  <name>Apache Hadoop MapReduce Streaming</name>
+-  <packaging>jar</packaging>
+-
+-  <properties>
+-    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+-    <test.exclude.pattern>%regex[.*(TestStreamingStatus).*]</test.exclude.pattern>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-app</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-hs</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>cglib</groupId>
+-      <artifactId>cglib</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcprov-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bouncycastle</groupId>
+-      <artifactId>bcpkix-jdk15on</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-       <plugin>
+-        <groupId>com.github.spotbugs</groupId>
+-        <artifactId>spotbugs-maven-plugin</artifactId>
+-         <configuration>
+-          <xmlOutput>true</xmlOutput>
+-          <excludeFilterFile>${basedir}/dev-support/findbugs-exclude.xml</excludeFilterFile>
+-          <effort>Max</effort>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>create-log-dir</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <delete dir="${test.build.data}"/>
+-                <mkdir dir="${test.build.data}"/>
+-                <mkdir dir="${hadoop.log.dir}"/>
+-              </target>
+-            </configuration>
+-          </execution>
+-          <execution>
+-            <id>copy-test-bin</id>
+-            <phase>process-test-resources</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <target>
+-                <copy todir="target/bin">
+-                  <fileset dir="src/test/bin" />
+-                </copy>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-         <configuration>
+-          <archive>
+-           <manifest>
+-            <mainClass>org.apache.hadoop.streaming.HadoopStreaming</mainClass>
+-           </manifest>
+-         </archive>
+-        </configuration>
+-       </plugin>
+-       <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>deplist</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>list</goal>
+-            </goals>
+-            <configuration>
+-              <!-- referenced by a built-in command -->
+-              <outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-    <testResources>
+-      <testResource>
+-        <directory>${basedir}/../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory>
+-        <includes>
+-          <include>capacity-scheduler.xml</include>
+-        </includes>
+-        <filtering>false</filtering>
+-      </testResource>
+-    </testResources>
+-  </build>
+-</project>
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
+deleted file mode 100644
+index f923a8065fd..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
++++ /dev/null
+@@ -1,161 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.DataInput;
+-import java.io.IOException;
+-import java.io.DataInputStream;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public class BinaryRecordInput implements RecordInput {
+-    
+-  private DataInput in;
+-    
+-  static private class BinaryIndex implements Index {
+-    private int nelems;
+-    private BinaryIndex(int nelems) {
+-      this.nelems = nelems;
+-    }
+-    @Override
+-    public boolean done() {
+-      return (nelems <= 0);
+-    }
+-    @Override
+-    public void incr() {
+-      nelems--;
+-    }
+-  }
+-    
+-  private BinaryRecordInput() {}
+-    
+-  private void setDataInput(DataInput inp) {
+-    this.in = inp;
+-  }
+-    
+-  private static final ThreadLocal<BinaryRecordInput> B_IN =
+-      new ThreadLocal<BinaryRecordInput>() {
+-      @Override
+-      protected BinaryRecordInput initialValue() {
+-        return new BinaryRecordInput();
+-      }
+-    };
+-    
+-  /**
+-   * Get a thread-local record input for the supplied DataInput.
+-   * @param inp data input stream
+-   * @return binary record input corresponding to the supplied DataInput.
+-   */
+-  public static BinaryRecordInput get(DataInput inp) {
+-    BinaryRecordInput bin = B_IN.get();
+-    bin.setDataInput(inp);
+-    return bin;
+-  }
+-    
+-  /** Creates a new instance of BinaryRecordInput */
+-  public BinaryRecordInput(InputStream strm) {
+-    this.in = new DataInputStream(strm);
+-  }
+-    
+-  /** Creates a new instance of BinaryRecordInput */
+-  public BinaryRecordInput(DataInput din) {
+-    this.in = din;
+-  }
+-    
+-  @Override
+-  public byte readByte(final String tag) throws IOException {
+-    return in.readByte();
+-  }
+-    
+-  @Override
+-  public boolean readBool(final String tag) throws IOException {
+-    return in.readBoolean();
+-  }
+-    
+-  @Override
+-  public int readInt(final String tag) throws IOException {
+-    return Utils.readVInt(in);
+-  }
+-    
+-  @Override
+-  public long readLong(final String tag) throws IOException {
+-    return Utils.readVLong(in);
+-  }
+-    
+-  @Override
+-  public float readFloat(final String tag) throws IOException {
+-    return in.readFloat();
+-  }
+-    
+-  @Override
+-  public double readDouble(final String tag) throws IOException {
+-    return in.readDouble();
+-  }
+-    
+-  @Override
+-  public String readString(final String tag) throws IOException {
+-    return Utils.fromBinaryString(in);
+-  }
+-    
+-  @Override
+-  public Buffer readBuffer(final String tag) throws IOException {
+-    final int len = Utils.readVInt(in);
+-    final byte[] barr = new byte[len];
+-    in.readFully(barr);
+-    return new Buffer(barr);
+-  }
+-    
+-  @Override
+-  public void startRecord(final String tag) throws IOException {
+-    // no-op
+-  }
+-    
+-  @Override
+-  public void endRecord(final String tag) throws IOException {
+-    // no-op
+-  }
+-    
+-  @Override
+-  public Index startVector(final String tag) throws IOException {
+-    return new BinaryIndex(readInt(tag));
+-  }
+-    
+-  @Override
+-  public void endVector(final String tag) throws IOException {
+-    // no-op
+-  }
+-    
+-  @Override
+-  public Index startMap(final String tag) throws IOException {
+-    return new BinaryIndex(readInt(tag));
+-  }
+-    
+-  @Override
+-  public void endMap(final String tag) throws IOException {
+-    // no-op
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
+deleted file mode 100644
+index adc01f311f8..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
++++ /dev/null
+@@ -1,143 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.IOException;
+-import java.util.TreeMap;
+-import java.util.ArrayList;
+-import java.io.DataOutput;
+-import java.io.DataOutputStream;
+-import java.io.OutputStream;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public class BinaryRecordOutput implements RecordOutput {
+-    
+-  private DataOutput out;
+-    
+-  private BinaryRecordOutput() {}
+-    
+-  private void setDataOutput(DataOutput out) {
+-    this.out = out;
+-  }
+-    
+-  private static final ThreadLocal<BinaryRecordOutput> B_OUT =
+-      new ThreadLocal<BinaryRecordOutput>() {
+-    @Override
+-    protected BinaryRecordOutput initialValue() {
+-      return new BinaryRecordOutput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local record output for the supplied DataOutput.
+-   * @param out data output stream
+-   * @return binary record output corresponding to the supplied DataOutput.
+-   */
+-  public static BinaryRecordOutput get(DataOutput out) {
+-    BinaryRecordOutput bout = B_OUT.get();
+-    bout.setDataOutput(out);
+-    return bout;
+-  }
+-    
+-  /** Creates a new instance of BinaryRecordOutput */
+-  public BinaryRecordOutput(OutputStream out) {
+-    this.out = new DataOutputStream(out);
+-  }
+-    
+-  /** Creates a new instance of BinaryRecordOutput */
+-  public BinaryRecordOutput(DataOutput out) {
+-    this.out = out;
+-  }
+-    
+-    
+-  @Override
+-  public void writeByte(byte b, String tag) throws IOException {
+-    out.writeByte(b);
+-  }
+-    
+-  @Override
+-  public void writeBool(boolean b, String tag) throws IOException {
+-    out.writeBoolean(b);
+-  }
+-    
+-  @Override
+-  public void writeInt(int i, String tag) throws IOException {
+-    Utils.writeVInt(out, i);
+-  }
+-    
+-  @Override
+-  public void writeLong(long l, String tag) throws IOException {
+-    Utils.writeVLong(out, l);
+-  }
+-    
+-  @Override
+-  public void writeFloat(float f, String tag) throws IOException {
+-    out.writeFloat(f);
+-  }
+-    
+-  @Override
+-  public void writeDouble(double d, String tag) throws IOException {
+-    out.writeDouble(d);
+-  }
+-    
+-  @Override
+-  public void writeString(String s, String tag) throws IOException {
+-    Utils.toBinaryString(out, s);
+-  }
+-    
+-  @Override
+-  public void writeBuffer(Buffer buf, String tag)
+-    throws IOException {
+-    byte[] barr = buf.get();
+-    int len = buf.getCount();
+-    Utils.writeVInt(out, len);
+-    out.write(barr, 0, len);
+-  }
+-    
+-  @Override
+-  public void startRecord(Record r, String tag) throws IOException {}
+-    
+-  @Override
+-  public void endRecord(Record r, String tag) throws IOException {}
+-    
+-  @Override
+-  public void startVector(ArrayList v, String tag) throws IOException {
+-    writeInt(v.size(), tag);
+-  }
+-    
+-  @Override
+-  public void endVector(ArrayList v, String tag) throws IOException {}
+-    
+-  @Override
+-  public void startMap(TreeMap v, String tag) throws IOException {
+-    writeInt(v.size(), tag);
+-  }
+-    
+-  @Override
+-  public void endMap(TreeMap v, String tag) throws IOException {}
+-    
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java
+deleted file mode 100644
+index 737d63d11d6..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Buffer.java
++++ /dev/null
+@@ -1,258 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.UnsupportedEncodingException;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * A byte sequence that is used as a Java native type for buffer.
+- * It is resizable and distinguishes between the count of the sequence and
+- * the current capacity.
+- * 
+- * @deprecated Replaced by <a href="http://avro.apache.org/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public class Buffer implements Comparable, Cloneable {
+-  /** Number of valid bytes in this.bytes. */
+-  private int count;
+-  /** Backing store for Buffer. */
+-  private byte[] bytes = null;
+-
+-  /**
+-   * Create a zero-count sequence.
+-   */
+-  public Buffer() {
+-    this.count = 0;
+-  }
+-
+-  /**
+-   * Create a Buffer using the byte array as the initial value.
+-   *
+-   * @param bytes This array becomes the backing storage for the object.
+-   */
+-  public Buffer(byte[] bytes) {
+-    this.bytes = bytes;
+-    this.count = (bytes == null) ? 0 : bytes.length;
+-  }
+-  
+-  /**
+-   * Create a Buffer using the byte range as the initial value.
+-   *
+-   * @param bytes Copy of this array becomes the backing storage for the object.
+-   * @param offset offset into byte array
+-   * @param length length of data
+-   */
+-  public Buffer(byte[] bytes, int offset, int length) {
+-    copy(bytes, offset, length);
+-  }
+-  
+-  
+-  /**
+-   * Use the specified bytes array as underlying sequence.
+-   *
+-   * @param bytes byte sequence
+-   */
+-  public void set(byte[] bytes) {
+-    this.count = (bytes == null) ? 0 : bytes.length;
+-    this.bytes = bytes;
+-  }
+-  
+-  /**
+-   * Copy the specified byte array to the Buffer. Replaces the current buffer.
+-   *
+-   * @param bytes byte array to be assigned
+-   * @param offset offset into byte array
+-   * @param length length of data
+-   */
+-  public final void copy(byte[] bytes, int offset, int length) {
+-    if (this.bytes == null || this.bytes.length < length) {
+-      this.bytes = new byte[length];
+-    }
+-    System.arraycopy(bytes, offset, this.bytes, 0, length);
+-    this.count = length;
+-  }
+-  
+-  /**
+-   * Get the data from the Buffer.
+-   * 
+-   * @return The data is only valid between 0 and getCount() - 1.
+-   */
+-  public byte[] get() {
+-    if (bytes == null) {
+-      bytes = new byte[0];
+-    }
+-    return bytes;
+-  }
+-  
+-  /**
+-   * Get the current count of the buffer.
+-   */
+-  public int getCount() {
+-    return count;
+-  }
+-  
+-  /**
+-   * Get the capacity, which is the maximum count that could handled without
+-   * resizing the backing storage.
+-   * 
+-   * @return The number of bytes
+-   */
+-  public int getCapacity() {
+-    return this.get().length;
+-  }
+-  
+-  /**
+-   * Change the capacity of the backing storage.
+-   * The data is preserved if newCapacity {@literal >=} getCount().
+-   * @param newCapacity The new capacity in bytes.
+-   */
+-  public void setCapacity(int newCapacity) {
+-    if (newCapacity < 0) {
+-      throw new IllegalArgumentException("Invalid capacity argument "+newCapacity); 
+-    }
+-    if (newCapacity == 0) {
+-      this.bytes = null;
+-      this.count = 0;
+-      return;
+-    }
+-    if (newCapacity != getCapacity()) {
+-      byte[] data = new byte[newCapacity];
+-      if (newCapacity < count) {
+-        count = newCapacity;
+-      }
+-      if (count != 0) {
+-        System.arraycopy(this.get(), 0, data, 0, count);
+-      }
+-      bytes = data;
+-    }
+-  }
+-  
+-  /**
+-   * Reset the buffer to 0 size
+-   */
+-  public void reset() {
+-    setCapacity(0);
+-  }
+-  
+-  /**
+-   * Change the capacity of the backing store to be the same as the current 
+-   * count of buffer.
+-   */
+-  public void truncate() {
+-    setCapacity(count);
+-  }
+-
+-  /**
+-   * Append specified bytes to the buffer.
+-   *
+-   * @param bytes byte array to be appended
+-   * @param offset offset into byte array
+-   * @param length length of data
+-
+-  */
+-  public void append(byte[] bytes, int offset, int length) {
+-    setCapacity(count+length);
+-    System.arraycopy(bytes, offset, this.get(), count, length);
+-    count = count + length;
+-  }
+-  
+-  /**
+-   * Append specified bytes to the buffer
+-   *
+-   * @param bytes byte array to be appended
+-   */
+-  public void append(byte[] bytes) {
+-    append(bytes, 0, bytes.length);
+-  }
+-  
+-  // inherit javadoc
+-  @Override
+-  public int hashCode() {
+-    int hash = 1;
+-    byte[] b = this.get();
+-    for (int i = 0; i < count; i++)
+-      hash = (31 * hash) + b[i];
+-    return hash;
+-  }
+-  
+-  /**
+-   * Define the sort order of the Buffer.
+-   * 
+-   * @param other The other buffer
+-   * @return Positive if this is bigger than other, 0 if they are equal, and
+-   *         negative if this is smaller than other.
+-   */
+-  @Override
+-  public int compareTo(Object other) {
+-    Buffer right = ((Buffer) other);
+-    byte[] lb = this.get();
+-    byte[] rb = right.get();
+-    for (int i = 0; i < count && i < right.count; i++) {
+-      int a = (lb[i] & 0xff);
+-      int b = (rb[i] & 0xff);
+-      if (a != b) {
+-        return a - b;
+-      }
+-    }
+-    return count - right.count;
+-  }
+-  
+-  // inherit javadoc
+-  @Override
+-  public boolean equals(Object other) {
+-    if (other instanceof Buffer && this != other) {
+-      return compareTo(other) == 0;
+-    }
+-    return (this == other);
+-  }
+-  
+-  // inheric javadoc
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder(2*count);
+-    for(int idx = 0; idx < count; idx++) {
+-      sb.append(Character.forDigit((bytes[idx] & 0xF0) >> 4, 16));
+-      sb.append(Character.forDigit(bytes[idx] & 0x0F, 16));
+-    }
+-    return sb.toString();
+-  }
+-  
+-  /**
+-   * Convert the byte buffer to a string an specific character encoding
+-   *
+-   * @param charsetName Valid Java Character Set Name
+-   */
+-  public String toString(String charsetName)
+-    throws UnsupportedEncodingException {
+-    return new String(this.get(), 0, this.getCount(), charsetName);
+-  }
+-  
+-  // inherit javadoc
+-  @Override
+-  public Object clone() throws CloneNotSupportedException {
+-    Buffer result = (Buffer) super.clone();
+-    result.copy(this.get(), 0, this.getCount());
+-    return result;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
+deleted file mode 100644
+index 18cf23e78a4..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
++++ /dev/null
+@@ -1,161 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.IOException;
+-import java.util.TreeMap;
+-import java.util.ArrayList;
+-import java.io.PrintStream;
+-import java.io.OutputStream;
+-import java.io.UnsupportedEncodingException;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public class CsvRecordOutput implements RecordOutput {
+-
+-  private PrintStream stream;
+-  private boolean isFirst = true;
+-    
+-  private void throwExceptionOnError(String tag) throws IOException {
+-    if (stream.checkError()) {
+-      throw new IOException("Error serializing "+tag);
+-    }
+-  }
+- 
+-  private void printCommaUnlessFirst() {
+-    if (!isFirst) {
+-      stream.print(",");
+-    }
+-    isFirst = false;
+-  }
+-    
+-  /** Creates a new instance of CsvRecordOutput */
+-  public CsvRecordOutput(OutputStream out) {
+-    try {
+-      stream = new PrintStream(out, true, "UTF-8");
+-    } catch (UnsupportedEncodingException ex) {
+-      throw new RuntimeException(ex);
+-    }
+-  }
+-    
+-  @Override
+-  public void writeByte(byte b, String tag) throws IOException {
+-    writeLong((long)b, tag);
+-  }
+-    
+-  @Override
+-  public void writeBool(boolean b, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    String val = b ? "T" : "F";
+-    stream.print(val);
+-    throwExceptionOnError(tag);
+-  }
+-    
+-  @Override
+-  public void writeInt(int i, String tag) throws IOException {
+-    writeLong((long)i, tag);
+-  }
+-    
+-  @Override
+-  public void writeLong(long l, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print(l);
+-    throwExceptionOnError(tag);
+-  }
+-    
+-  @Override
+-  public void writeFloat(float f, String tag) throws IOException {
+-    writeDouble((double)f, tag);
+-  }
+-    
+-  @Override
+-  public void writeDouble(double d, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print(d);
+-    throwExceptionOnError(tag);
+-  }
+-    
+-  @Override
+-  public void writeString(String s, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print(Utils.toCSVString(s));
+-    throwExceptionOnError(tag);
+-  }
+-    
+-  @Override
+-  public void writeBuffer(Buffer buf, String tag)
+-    throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print(Utils.toCSVBuffer(buf));
+-    throwExceptionOnError(tag);
+-  }
+-    
+-  @Override
+-  public void startRecord(Record r, String tag) throws IOException {
+-    if (tag != null && ! tag.isEmpty()) {
+-      printCommaUnlessFirst();
+-      stream.print("s{");
+-      isFirst = true;
+-    }
+-  }
+-    
+-  @Override
+-  public void endRecord(Record r, String tag) throws IOException {
+-    if (tag == null || tag.isEmpty()) {
+-      stream.print("\n");
+-      isFirst = true;
+-    } else {
+-      stream.print("}");
+-      isFirst = false;
+-    }
+-  }
+-    
+-  @Override
+-  public void startVector(ArrayList v, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print("v{");
+-    isFirst = true;
+-  }
+-    
+-  @Override
+-  public void endVector(ArrayList v, String tag) throws IOException {
+-    stream.print("}");
+-    isFirst = false;
+-  }
+-    
+-  @Override
+-  public void startMap(TreeMap v, String tag) throws IOException {
+-    printCommaUnlessFirst();
+-    stream.print("m{");
+-    isFirst = true;
+-  }
+-    
+-  @Override
+-  public void endMap(TreeMap v, String tag) throws IOException {
+-    stream.print("}");
+-    isFirst = false;
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java
+deleted file mode 100644
+index 1d36c92bc0c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Index.java
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Interface that acts as an iterator for deserializing maps.
+- * The deserializer returns an instance that the record uses to
+- * read vectors and maps. An example of usage is as follows:
+- *
+- * <code>
+- * Index idx = startVector(...);
+- * while (!idx.done()) {
+- *   .... // read element of a vector
+- *   idx.incr();
+- * }
+- * </code>
+- * 
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public interface Index {
+-  boolean done();
+-  void incr();
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java
+deleted file mode 100644
+index 84df8b8187e..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Record.java
++++ /dev/null
+@@ -1,103 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.ByteArrayOutputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.io.WritableComparable;
+-
+-/**
+- * Abstract class that is extended by generated classes.
+- * 
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public abstract class Record implements WritableComparable, Cloneable {
+-  
+-  /**
+-   * Serialize a record with tag (ususally field name)
+-   * @param rout Record output destination
+-   * @param tag record tag (Used only in tagged serialization e.g. XML)
+-   */
+-  public abstract void serialize(RecordOutput rout, String tag)
+-    throws IOException;
+-  
+-  /**
+-   * Deserialize a record with a tag (usually field name)
+-   * @param rin Record input source
+-   * @param tag Record tag (Used only in tagged serialization e.g. XML)
+-   */
+-  public abstract void deserialize(RecordInput rin, String tag)
+-    throws IOException;
+-  
+-  // inheric javadoc
+-  @Override
+-  public abstract int compareTo (final Object peer) throws ClassCastException;
+-  
+-  /**
+-   * Serialize a record without a tag
+-   * @param rout Record output destination
+-   */
+-  public void serialize(RecordOutput rout) throws IOException {
+-    this.serialize(rout, "");
+-  }
+-  
+-  /**
+-   * Deserialize a record without a tag
+-   * @param rin Record input source
+-   */
+-  public void deserialize(RecordInput rin) throws IOException {
+-    this.deserialize(rin, "");
+-  }
+-  
+-  // inherit javadoc
+-  @Override
+-  public void write(final DataOutput out) throws java.io.IOException {
+-    BinaryRecordOutput bout = BinaryRecordOutput.get(out);
+-    this.serialize(bout);
+-  }
+-  
+-  // inherit javadoc
+-  @Override
+-  public void readFields(final DataInput din) throws java.io.IOException {
+-    BinaryRecordInput rin = BinaryRecordInput.get(din);
+-    this.deserialize(rin);
+-  }
+-
+-  // inherit javadoc
+-  @Override
+-  public String toString() {
+-    try {
+-      ByteArrayOutputStream s = new ByteArrayOutputStream();
+-      CsvRecordOutput a = new CsvRecordOutput(s);
+-      this.serialize(a);
+-      return new String(s.toByteArray(), StandardCharsets.UTF_8);
+-    } catch (Exception ex) {
+-      throw new RuntimeException(ex);
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java
+deleted file mode 100644
+index 805d93160a8..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordComparator.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.io.WritableComparator;
+-
+-/**
+- * A raw record comparator base class
+- * 
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public abstract class RecordComparator extends WritableComparator {
+-  
+-  /**
+-   * Construct a raw {@link Record} comparison implementation. */
+-  protected RecordComparator(Class<? extends WritableComparable> recordClass) {
+-    super(recordClass);
+-  }
+-  
+-  // inheric JavaDoc
+-  @Override
+-  public abstract int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2);
+-  
+-  /**
+-   * Register an optimized comparator for a {@link Record} implementation.
+-   *
+-   * @param c record classs for which a raw comparator is provided
+-   * @param comparator Raw comparator instance for class c 
+-   */
+-  public static synchronized void define(Class c, RecordComparator comparator) {
+-    WritableComparator.define(c, comparator);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java
+deleted file mode 100644
+index 6495194a248..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordInput.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Interface that all the Deserializers have to implement.
+- * 
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public interface RecordInput {
+-  /**
+-   * Read a byte from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  byte readByte(String tag) throws IOException;
+-  
+-  /**
+-   * Read a boolean from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  boolean readBool(String tag) throws IOException;
+-  
+-  /**
+-   * Read an integer from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  int readInt(String tag) throws IOException;
+-  
+-  /**
+-   * Read a long integer from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  long readLong(String tag) throws IOException;
+-  
+-  /**
+-   * Read a single-precision float from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  float readFloat(String tag) throws IOException;
+-  
+-  /**
+-   * Read a double-precision number from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  double readDouble(String tag) throws IOException;
+-  
+-  /**
+-   * Read a UTF-8 encoded string from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  String readString(String tag) throws IOException;
+-  
+-  /**
+-   * Read byte array from serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return value read from serialized record.
+-   */
+-  Buffer readBuffer(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for start of the serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   */
+-  void startRecord(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for end of the serialized record.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   */
+-  void endRecord(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for start of the serialized vector.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return Index that is used to count the number of elements.
+-   */
+-  Index startVector(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for end of the serialized vector.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   */
+-  void endVector(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for start of the serialized map.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @return Index that is used to count the number of map entries.
+-   */
+-  Index startMap(String tag) throws IOException;
+-  
+-  /**
+-   * Check the mark for end of the serialized map.
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   */
+-  void endMap(String tag) throws IOException;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java
+deleted file mode 100644
+index 503ea35f794..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/RecordOutput.java
++++ /dev/null
+@@ -1,149 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.IOException;
+-import java.util.TreeMap;
+-import java.util.ArrayList;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Interface that all the serializers have to implement.
+- * 
+- * @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public interface RecordOutput {
+-  /**
+-   * Write a byte to serialized record.
+-   * @param b Byte to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeByte(byte b, String tag) throws IOException;
+-  
+-  /**
+-   * Write a boolean to serialized record.
+-   * @param b Boolean to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeBool(boolean b, String tag) throws IOException;
+-  
+-  /**
+-   * Write an integer to serialized record.
+-   * @param i Integer to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeInt(int i, String tag) throws IOException;
+-  
+-  /**
+-   * Write a long integer to serialized record.
+-   * @param l Long to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeLong(long l, String tag) throws IOException;
+-  
+-  /**
+-   * Write a single-precision float to serialized record.
+-   * @param f Float to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeFloat(float f, String tag) throws IOException;
+-  
+-  /**
+-   * Write a double precision floating point number to serialized record.
+-   * @param d Double to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeDouble(double d, String tag) throws IOException;
+-  
+-  /**
+-   * Write a unicode string to serialized record.
+-   * @param s String to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeString(String s, String tag) throws IOException;
+-  
+-  /**
+-   * Write a buffer to serialized record.
+-   * @param buf Buffer to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void writeBuffer(Buffer buf, String tag)
+-    throws IOException;
+-  
+-  /**
+-   * Mark the start of a record to be serialized.
+-   * @param r Record to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void startRecord(Record r, String tag) throws IOException;
+-  
+-  /**
+-   * Mark the end of a serialized record.
+-   * @param r Record to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void endRecord(Record r, String tag) throws IOException;
+-  
+-  /**
+-   * Mark the start of a vector to be serialized.
+-   * @param v Vector to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void startVector(ArrayList v, String tag) throws IOException;
+-  
+-  /**
+-   * Mark the end of a serialized vector.
+-   * @param v Vector to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void endVector(ArrayList v, String tag) throws IOException;
+-  
+-  /**
+-   * Mark the start of a map to be serialized.
+-   * @param m Map to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void startMap(TreeMap m, String tag) throws IOException;
+-  
+-  /**
+-   * Mark the end of a serialized map.
+-   * @param m Map to be serialized
+-   * @param tag Used by tagged serialization formats (such as XML)
+-   * @throws IOException Indicates error in serialization
+-   */
+-  public void endMap(TreeMap m, String tag) throws IOException;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java
+deleted file mode 100644
+index 59e2080c3ed..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/Utils.java
++++ /dev/null
+@@ -1,498 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.record;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.io.WritableComparator;
+-import org.apache.hadoop.io.WritableUtils;
+-
+-/**
+- * Various utility functions for Hadoop record I/O runtime.
+- * 
+- * @deprecated Replaced by <a href="http://avro.apache.org/">Avro</a>.
+- */
+-@Deprecated
+-@InterfaceAudience.Public
+-@InterfaceStability.Stable
+-public class Utils {
+-  
+-  /** Cannot create a new instance of Utils */
+-  private Utils() {
+-  }
+-  
+-  public static final char[] hexchars = { '0', '1', '2', '3', '4', '5',
+-                                          '6', '7', '8', '9', 'A', 'B',
+-                                          'C', 'D', 'E', 'F' };
+-  /**
+-   *
+-   * @param s
+-   * @return
+-   */
+-  static String toXMLString(String s) {
+-    StringBuilder sb = new StringBuilder();
+-    for (int idx = 0; idx < s.length(); idx++) {
+-      char ch = s.charAt(idx);
+-      if (ch == '<') {
+-        sb.append("&lt;");
+-      } else if (ch == '&') {
+-        sb.append("&amp;");
+-      } else if (ch == '%') {
+-        sb.append("%0025");
+-      } else if (ch < 0x20 ||
+-                 (ch > 0xD7FF && ch < 0xE000) ||
+-                 (ch > 0xFFFD)) {
+-        sb.append("%");
+-        sb.append(hexchars[(ch & 0xF000) >> 12]);
+-        sb.append(hexchars[(ch & 0x0F00) >> 8]);
+-        sb.append(hexchars[(ch & 0x00F0) >> 4]);
+-        sb.append(hexchars[(ch & 0x000F)]);
+-      } else {
+-        sb.append(ch);
+-      }
+-    }
+-    return sb.toString();
+-  }
+-  
+-  static private int h2c(char ch) {
+-    if (ch >= '0' && ch <= '9') {
+-      return ch - '0';
+-    } else if (ch >= 'A' && ch <= 'F') {
+-      return ch - 'A' + 10;
+-    } else if (ch >= 'a' && ch <= 'f') {
+-      return ch - 'a' + 10;
+-    }
+-    return 0;
+-  }
+-  
+-  /**
+-   *
+-   * @param s
+-   * @return
+-   */
+-  static String fromXMLString(String s) {
+-    StringBuilder sb = new StringBuilder();
+-    for (int idx = 0; idx < s.length();) {
+-      char ch = s.charAt(idx++);
+-      if (ch == '%') {
+-        int ch1 = h2c(s.charAt(idx++)) << 12;
+-        int ch2 = h2c(s.charAt(idx++)) << 8;
+-        int ch3 = h2c(s.charAt(idx++)) << 4;
+-        int ch4 = h2c(s.charAt(idx++));
+-        char res = (char)(ch1 | ch2 | ch3 | ch4);
+-        sb.append(res);
+-      } else {
+-        sb.append(ch);
+-      }
+-    }
+-    return sb.toString();
+-  }
+-  
+-  /**
+-   *
+-   * @param s
+-   * @return
+-   */
+-  static String toCSVString(String s) {
+-    StringBuilder sb = new StringBuilder(s.length()+1);
+-    sb.append('\'');
+-    int len = s.length();
+-    for (int i = 0; i < len; i++) {
+-      char c = s.charAt(i);
+-      switch(c) {
+-      case '\0':
+-        sb.append("%00");
+-        break;
+-      case '\n':
+-        sb.append("%0A");
+-        break;
+-      case '\r':
+-        sb.append("%0D");
+-        break;
+-      case ',':
+-        sb.append("%2C");
+-        break;
+-      case '}':
+-        sb.append("%7D");
+-        break;
+-      case '%':
+-        sb.append("%25");
+-        break;
+-      default:
+-        sb.append(c);
+-      }
+-    }
+-    return sb.toString();
+-  }
+-  
+-  /**
+-   *
+-   * @param s
+-   * @throws java.io.IOException
+-   * @return
+-   */
+-  static String fromCSVString(String s) throws IOException {
+-    if (s.charAt(0) != '\'') {
+-      throw new IOException("Error deserializing string.");
+-    }
+-    int len = s.length();
+-    StringBuilder sb = new StringBuilder(len-1);
+-    for (int i = 1; i < len; i++) {
+-      char c = s.charAt(i);
+-      if (c == '%') {
+-        char ch1 = s.charAt(i+1);
+-        char ch2 = s.charAt(i+2);
+-        i += 2;
+-        if (ch1 == '0' && ch2 == '0') {
+-          sb.append('\0');
+-        } else if (ch1 == '0' && ch2 == 'A') {
+-          sb.append('\n');
+-        } else if (ch1 == '0' && ch2 == 'D') {
+-          sb.append('\r');
+-        } else if (ch1 == '2' && ch2 == 'C') {
+-          sb.append(',');
+-        } else if (ch1 == '7' && ch2 == 'D') {
+-          sb.append('}');
+-        } else if (ch1 == '2' && ch2 == '5') {
+-          sb.append('%');
+-        } else {
+-          throw new IOException("Error deserializing string.");
+-        }
+-      } else {
+-        sb.append(c);
+-      }
+-    }
+-    return sb.toString();
+-  }
+-  
+-  /**
+-   *
+-   * @param s
+-   * @return
+-   */
+-  static String toXMLBuffer(Buffer s) {
+-    return s.toString();
+-  }
+-  
+-  /**
+-   *
+-   * @param s
+-   * @throws java.io.IOException
+-   * @return
+-   */
+-  static Buffer fromXMLBuffer(String s)
+-    throws IOException {
+-    if (s.length() == 0) { return new Buffer(); }
+-    int blen = s.length()/2;
+-    byte[] barr = new byte[blen];
+-    for (int idx = 0; idx < blen; idx++) {
+-      char c1 = s.charAt(2*idx);
+-      char c2 = s.charAt(2*idx+1);
+-      barr[idx] = (byte)Integer.parseInt(""+c1+c2, 16);
+-    }
+-    return new Buffer(barr);
+-  }
+-  
+-  /**
+-   *
+-   * @param buf
+-   * @return
+-   */
+-  static String toCSVBuffer(Buffer buf) {
+-    StringBuilder sb = new StringBuilder("#");
+-    sb.append(buf.toString());
+-    return sb.toString();
+-  }
+-  
+-  /**
+-   * Converts a CSV-serialized representation of buffer to a new
+-   * Buffer
+-   * @param s CSV-serialized representation of buffer
+-   * @throws java.io.IOException
+-   * @return Deserialized Buffer
+-   */
+-  static Buffer fromCSVBuffer(String s)
+-    throws IOException {
+-    if (s.charAt(0) != '#') {
+-      throw new IOException("Error deserializing buffer.");
+-    }
+-    if (s.length() == 1) { return new Buffer(); }
+-    int blen = (s.length()-1)/2;
+-    byte[] barr = new byte[blen];
+-    for (int idx = 0; idx < blen; idx++) {
+-      char c1 = s.charAt(2*idx+1);
+-      char c2 = s.charAt(2*idx+2);
+-      barr[idx] = (byte)Integer.parseInt(""+c1+c2, 16);
+-    }
+-    return new Buffer(barr);
+-  }
+-  
+-  private static int utf8LenForCodePoint(final int cpt) throws IOException {
+-    if (cpt >=0 && cpt <= 0x7F) {
+-      return 1;
+-    }
+-    if (cpt >= 0x80 && cpt <= 0x07FF) {
+-      return 2;
+-    }
+-    if ((cpt >= 0x0800 && cpt < 0xD800) ||
+-        (cpt > 0xDFFF && cpt <= 0xFFFD)) {
+-      return 3;
+-    }
+-    if (cpt >= 0x10000 && cpt <= 0x10FFFF) {
+-      return 4;
+-    }
+-    throw new IOException("Illegal Unicode Codepoint "+
+-                          Integer.toHexString(cpt)+" in string.");
+-  }
+-  
+-  private static final int B10 =    Integer.parseInt("10000000", 2);
+-  private static final int B110 =   Integer.parseInt("11000000", 2);
+-  private static final int B1110 =  Integer.parseInt("11100000", 2);
+-  private static final int B11110 = Integer.parseInt("11110000", 2);
+-  private static final int B11 =    Integer.parseInt("11000000", 2);
+-  private static final int B111 =   Integer.parseInt("11100000", 2);
+-  private static final int B1111 =  Integer.parseInt("11110000", 2);
+-  private static final int B11111 = Integer.parseInt("11111000", 2);
+-  
+-  private static int writeUtf8(int cpt, final byte[] bytes, final int offset)
+-    throws IOException {
+-    if (cpt >=0 && cpt <= 0x7F) {
+-      bytes[offset] = (byte) cpt;
+-      return 1;
+-    }
+-    if (cpt >= 0x80 && cpt <= 0x07FF) {
+-      bytes[offset+1] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset] = (byte) (B110 | (cpt & 0x1F));
+-      return 2;
+-    }
+-    if ((cpt >= 0x0800 && cpt < 0xD800) ||
+-        (cpt > 0xDFFF && cpt <= 0xFFFD)) {
+-      bytes[offset+2] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset+1] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset] = (byte) (B1110 | (cpt & 0x0F));
+-      return 3;
+-    }
+-    if (cpt >= 0x10000 && cpt <= 0x10FFFF) {
+-      bytes[offset+3] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset+2] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset+1] = (byte) (B10 | (cpt & 0x3F));
+-      cpt = cpt >> 6;
+-      bytes[offset] = (byte) (B11110 | (cpt & 0x07));
+-      return 4;
+-    }
+-    throw new IOException("Illegal Unicode Codepoint "+
+-                          Integer.toHexString(cpt)+" in string.");
+-  }
+-  
+-  static void toBinaryString(final DataOutput out, final String str)
+-    throws IOException {
+-    final int strlen = str.length();
+-    byte[] bytes = new byte[strlen*4]; // Codepoints expand to 4 bytes max
+-    int utf8Len = 0;
+-    int idx = 0;
+-    while(idx < strlen) {
+-      final int cpt = str.codePointAt(idx);
+-      idx += Character.isSupplementaryCodePoint(cpt) ? 2 : 1;
+-      utf8Len += writeUtf8(cpt, bytes, utf8Len);
+-    }
+-    writeVInt(out, utf8Len);
+-    out.write(bytes, 0, utf8Len);
+-  }
+-  
+-  static boolean isValidCodePoint(int cpt) {
+-    return !((cpt > 0x10FFFF) ||
+-             (cpt >= 0xD800 && cpt <= 0xDFFF) ||
+-             (cpt >= 0xFFFE && cpt <=0xFFFF));
+-  }
+-  
+-  private static int utf8ToCodePoint(int b1, int b2, int b3, int b4) {
+-    int cpt = 0;
+-    cpt = (((b1 & ~B11111) << 18) |
+-           ((b2 & ~B11) << 12) |
+-           ((b3 & ~B11) << 6) |
+-           (b4 & ~B11));
+-    return cpt;
+-  }
+-  
+-  private static int utf8ToCodePoint(int b1, int b2, int b3) {
+-    int cpt = 0;
+-    cpt = (((b1 & ~B1111) << 12) | ((b2 & ~B11) << 6) | (b3 & ~B11));
+-    return cpt;
+-  }
+-  
+-  private static int utf8ToCodePoint(int b1, int b2) {
+-    int cpt = 0;
+-    cpt = (((b1 & ~B111) << 6) | (b2 & ~B11));
+-    return cpt;
+-  }
+-  
+-  private static void checkB10(int b) throws IOException {
+-    if ((b & B11) != B10) {
+-      throw new IOException("Invalid UTF-8 representation.");
+-    }
+-  }
+-  
+-  static String fromBinaryString(final DataInput din) throws IOException {
+-    final int utf8Len = readVInt(din);
+-    final byte[] bytes = new byte[utf8Len];
+-    din.readFully(bytes);
+-    int len = 0;
+-    // For the most commmon case, i.e. ascii, numChars = utf8Len
+-    StringBuilder sb = new StringBuilder(utf8Len);
+-    while(len < utf8Len) {
+-      int cpt = 0;
+-      final int b1 = bytes[len++] & 0xFF;
+-      if (b1 <= 0x7F) {
+-        cpt = b1;
+-      } else if ((b1 & B11111) == B11110) {
+-        int b2 = bytes[len++] & 0xFF;
+-        checkB10(b2);
+-        int b3 = bytes[len++] & 0xFF;
+-        checkB10(b3);
+-        int b4 = bytes[len++] & 0xFF;
+-        checkB10(b4);
+-        cpt = utf8ToCodePoint(b1, b2, b3, b4);
+-      } else if ((b1 & B1111) == B1110) {
+-        int b2 = bytes[len++] & 0xFF;
+-        checkB10(b2);
+-        int b3 = bytes[len++] & 0xFF;
+-        checkB10(b3);
+-        cpt = utf8ToCodePoint(b1, b2, b3);
+-      } else if ((b1 & B111) == B110) {
+-        int b2 = bytes[len++] & 0xFF;
+-        checkB10(b2);
+-        cpt = utf8ToCodePoint(b1, b2);
+-      } else {
+-        throw new IOException("Invalid UTF-8 byte "+Integer.toHexString(b1)+
+-                              " at offset "+(len-1)+" in length of "+utf8Len);
+-      }
+-      if (!isValidCodePoint(cpt)) {
+-        throw new IOException("Illegal Unicode Codepoint "+
+-                              Integer.toHexString(cpt)+" in stream.");
+-      }
+-      sb.appendCodePoint(cpt);
+-    }
+-    return sb.toString();
+-  }
+-  
+-  /** Parse a float from a byte array. */
+-  public static float readFloat(byte[] bytes, int start) {
+-    return WritableComparator.readFloat(bytes, start);
+-  }
+-  
+-  /** Parse a double from a byte array. */
+-  public static double readDouble(byte[] bytes, int start) {
+-    return WritableComparator.readDouble(bytes, start);
+-  }
+-  
+-  /**
+-   * Reads a zero-compressed encoded long from a byte array and returns it.
+-   * @param bytes byte array with decode long
+-   * @param start starting index
+-   * @throws java.io.IOException
+-   * @return deserialized long
+-   */
+-  public static long readVLong(byte[] bytes, int start) throws IOException {
+-    return WritableComparator.readVLong(bytes, start);
+-  }
+-  
+-  /**
+-   * Reads a zero-compressed encoded integer from a byte array and returns it.
+-   * @param bytes byte array with the encoded integer
+-   * @param start start index
+-   * @throws java.io.IOException
+-   * @return deserialized integer
+-   */
+-  public static int readVInt(byte[] bytes, int start) throws IOException {
+-    return WritableComparator.readVInt(bytes, start);
+-  }
+-  
+-  /**
+-   * Reads a zero-compressed encoded long from a stream and return it.
+-   * @param in input stream
+-   * @throws java.io.IOException
+-   * @return deserialized long
+-   */
+-  public static long readVLong(DataInput in) throws IOException {
+-    return WritableUtils.readVLong(in);
+-  }
+-  
+-  /**
+-   * Reads a zero-compressed encoded integer from a stream and returns it.
+-   * @param in input stream
+-   * @throws java.io.IOException
+-   * @return deserialized integer
+-   */
+-  public static int readVInt(DataInput in) throws IOException {
+-    return WritableUtils.readVInt(in);
+-  }
+-  
+-  /**
+-   * Get the encoded length if an integer is stored in a variable-length format
+-   * @return the encoded length
+-   */
+-  public static int getVIntSize(long i) {
+-    return WritableUtils.getVIntSize(i);
+-  }
+-  
+-  /**
+-   * Serializes a long to a binary stream with zero-compressed encoding.
+-   * For {@literal -112 <= i <= 127}, only one byte is used with the actual
+-   * value. For other values of i, the first byte value indicates whether the
+-   * long is positive or negative, and the number of bytes that follow.
+-   * If the first byte value v is between -113 and -120, the following long
+-   * is positive, with number of bytes that follow are -(v+112).
+-   * If the first byte value v is between -121 and -128, the following long
+-   * is negative, with number of bytes that follow are -(v+120). Bytes are
+-   * stored in the high-non-zero-byte-first order.
+-   *
+-   * @param stream Binary output stream
+-   * @param i Long to be serialized
+-   * @throws java.io.IOException
+-   */
+-  public static void writeVLong(DataOutput stream, long i) throws IOException {
+-    WritableUtils.writeVLong(stream, i);
+-  }
+-  
+-  /**
+-   * Serializes an int to a binary stream with zero-compressed encoding.
+-   *
+-   * @param stream Binary output stream
+-   * @param i int to be serialized
+-   * @throws java.io.IOException
+-   */
+-  public static void writeVInt(DataOutput stream, int i) throws IOException {
+-    WritableUtils.writeVInt(stream, i);
+-  }
+-  
+-  /** Lexicographic order of binary data. */
+-  public static int compareBytes(byte[] b1, int s1, int l1,
+-                                 byte[] b2, int s2, int l2) {
+-    return WritableComparator.compareBytes(b1, s1, l1, b2, s2, l2);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html
+deleted file mode 100644
+index 2c1e94564e6..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/package.html
++++ /dev/null
+@@ -1,806 +0,0 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+-<html>
+-
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-  <head>
+-    <title>Hadoop Record I/O</title>
+-  </head>
+-  <body>
+-    <p>
+-    (DEPRECATED) Hadoop record I/O contains classes and a record description language
+-    translator for simplifying serialization and deserialization of records in a
+-    language-neutral manner.
+-    </p>
+-    
+-    <p>
+-    DEPRECATED: Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
+-    </p>
+-  
+-  <h2>Introduction</h2>
+-  
+-  Software systems of any significant complexity require mechanisms for data 
+-interchange with the outside world. These interchanges typically involve the
+-marshaling and unmarshaling of logical units of data to and from data streams
+-(files, network connections, memory buffers etc.). Applications usually have
+-some code for serializing and deserializing the data types that they manipulate
+-embedded in them. The work of serialization has several features that make
+-automatic code generation for it worthwhile. Given a particular output encoding
+-(binary, XML, etc.), serialization of primitive types and simple compositions
+-of primitives (structs, vectors etc.) is a very mechanical task. Manually
+-written serialization code can be susceptible to bugs especially when records
+-have a large number of fields or a record definition changes between software
+-versions. Lastly, it can be very useful for applications written in different
+-programming languages to be able to share and interchange data. This can be 
+-made a lot easier by describing the data records manipulated by these
+-applications in a language agnostic manner and using the descriptions to derive
+-implementations of serialization in multiple target languages. 
+-
+-This document describes Hadoop Record I/O, a mechanism that is aimed 
+-at
+-<ul> 
+-<li> enabling the specification of simple serializable data types (records) 
+-<li> enabling the generation of code in multiple target languages for
+-marshaling and unmarshaling such types
+-<li> providing target language specific support that will enable application 
+-programmers to incorporate generated code into their applications
+-</ul>
+-
+-The goals of Hadoop Record I/O are similar to those of mechanisms such as XDR,
+-ASN.1, PADS and ICE. While these systems all include a DDL that enables
+-the specification of most record types, they differ widely in what else they
+-focus on. The focus in Hadoop Record I/O is on data marshaling and
+-multi-lingual support.  We take a translator-based approach to serialization.
+-Hadoop users have to describe their data in a simple data description
+-language. The Hadoop DDL translator rcc generates code that users
+-can invoke in order to read/write their data from/to simple stream 
+-abstractions. Next we list explicitly some of the goals and non-goals of
+-Hadoop Record I/O.
+-
+-
+-<h3>Goals</h3>
+-
+-<ul>
+-<li> Support for commonly used primitive types. Hadoop should include as
+-primitives commonly used builtin types from programming languages we intend to
+-support.
+-
+-<li> Support for common data compositions (including recursive compositions).
+-Hadoop should support widely used composite types such as structs and
+-vectors.
+-
+-<li> Code generation in multiple target languages. Hadoop should be capable of
+-generating serialization code in multiple target languages and should be
+-easily extensible to new target languages. The initial target languages are
+-C++ and Java.
+-
+-<li> Support for generated target languages. Hadooop should include support
+-in the form of headers, libraries, packages for supported target languages 
+-that enable easy inclusion and use of generated code in applications.
+-
+-<li> Support for multiple output encodings. Candidates include
+-packed binary, comma-separated text, XML etc.
+-
+-<li> Support for specifying record types in a backwards/forwards compatible
+-manner. This will probably be in the form of support for optional fields in
+-records. This version of the document does not include a description of the
+-planned mechanism, we intend to include it in the next iteration.
+-
+-</ul>
+-
+-<h3>Non-Goals</h3>
+-
+-<ul>
+-  <li> Serializing existing arbitrary C++ classes.
+-  <li> Serializing complex data structures such as trees, linked lists etc.
+-  <li> Built-in indexing schemes, compression, or check-sums.
+-  <li> Dynamic construction of objects from an XML schema.
+-</ul>
+-
+-The remainder of this document describes the features of Hadoop record I/O
+-in more detail. Section 2 describes the data types supported by the system.
+-Section 3 lays out the DDL syntax with some examples of simple records. 
+-Section 4 describes the process of code generation with rcc. Section 5
+-describes target language mappings and support for Hadoop types. We include a
+-fairly complete description of C++ mappings with intent to include Java and
+-others in upcoming iterations of this document. The last section talks about
+-supported output encodings.
+-
+-
+-<h2>Data Types and Streams</h2>
+-
+-This section describes the primitive and composite types supported by Hadoop.
+-We aim to support a set of types that can be used to simply and efficiently
+-express a wide range of record types in different programming languages.
+-
+-<h3>Primitive Types</h3>
+-
+-For the most part, the primitive types of Hadoop map directly to primitive
+-types in high level programming languages. Special cases are the
+-ustring (a Unicode string) and buffer types, which we believe
+-find wide use and which are usually implemented in library code and not
+-available as language built-ins. Hadoop also supplies these via library code
+-when a target language built-in is not present and there is no widely
+-adopted "standard" implementation. The complete list of primitive types is:
+-
+-<ul>
+-  <li> byte: An 8-bit unsigned integer.
+-  <li> boolean: A boolean value.
+-  <li> int: A 32-bit signed integer.
+-  <li> long: A 64-bit signed integer.
+-  <li> float: A single precision floating point number as described by
+-    IEEE-754.
+-  <li> double: A double precision floating point number as described by
+-    IEEE-754.
+-  <li> ustring: A string consisting of Unicode characters.
+-  <li> buffer: An arbitrary sequence of bytes. 
+-</ul>
+-
+-
+-<h3>Composite Types</h3>
+-Hadoop supports a small set of composite types that enable the description
+-of simple aggregate types and containers. A composite type is serialized
+-by sequentially serializing it constituent elements. The supported
+-composite types are:
+-
+-<ul>
+-
+-  <li> record: An aggregate type like a C-struct. This is a list of
+-typed fields that are together considered a single unit of data. A record
+-is serialized by sequentially serializing its constituent fields. In addition
+-to serialization a record has comparison operations (equality and less-than)
+-implemented for it, these are defined as memberwise comparisons.
+-
+-  <li>vector: A sequence of entries of the same data type, primitive
+-or composite.
+-
+-  <li> map: An associative container mapping instances of a key type to
+-instances of a value type. The key and value types may themselves be primitive
+-or composite types. 
+-
+-</ul>
+-
+-<h3>Streams</h3>
+-
+-Hadoop generates code for serializing and deserializing record types to
+-abstract streams. For each target language Hadoop defines very simple input
+-and output stream interfaces. Application writers can usually develop
+-concrete implementations of these by putting a one method wrapper around
+-an existing stream implementation.
+-
+-
+-<h2>DDL Syntax and Examples</h2>
+-
+-We now describe the syntax of the Hadoop data description language. This is
+-followed by a few examples of DDL usage.
+- 
+-<h3>Hadoop DDL Syntax</h3>
+-
+-<pre><code>
+-recfile = *include module *record
+-include = "include" path
+-path = (relative-path / absolute-path)
+-module = "module" module-name
+-module-name = name *("." name)
+-record := "class" name "{" 1*(field) "}"
+-field := type name ";"
+-name :=  ALPHA (ALPHA / DIGIT / "_" )*
+-type := (ptype / ctype)
+-ptype := ("byte" / "boolean" / "int" |
+-          "long" / "float" / "double"
+-          "ustring" / "buffer")
+-ctype := (("vector" "&lt;" type "&gt;") /
+-          ("map" "&lt;" type "," type "&gt;" ) ) / name)
+-</code></pre>
+-
+-A DDL file describes one or more record types. It begins with zero or
+-more include declarations, a single mandatory module declaration
+-followed by zero or more class declarations. The semantics of each of
+-these declarations are described below:
+-
+-<ul>
+-
+-<li>include: An include declaration specifies a DDL file to be
+-referenced when generating code for types in the current DDL file. Record types
+-in the current compilation unit may refer to types in all included files.
+-File inclusion is recursive. An include does not trigger code
+-generation for the referenced file.
+-
+-<li> module: Every Hadoop DDL file must have a single module
+-declaration that follows the list of includes and precedes all record
+-declarations. A module declaration identifies a scope within which
+-the names of all types in the current file are visible. Module names are
+-mapped to C++ namespaces, Java packages etc. in generated code.
+-
+-<li> class: Records types are specified through class
+-declarations. A class declaration is like a Java class declaration.
+-It specifies a named record type and a list of fields that constitute records
+-of the type. Usage is illustrated in the following examples.
+-
+-</ul>
+-
+-<h3>Examples</h3>
+-
+-<ul>
+-<li>A simple DDL file links.jr with just one record declaration. 
+-<pre><code>
+-module links {
+-    class Link {
+-        ustring URL;
+-        boolean isRelative;
+-        ustring anchorText;
+-    };
+-}
+-</code></pre>
+-
+-<li> A DDL file outlinks.jr which includes another
+-<pre><code>
+-include "links.jr"
+-
+-module outlinks {
+-    class OutLinks {
+-        ustring baseURL;
+-        vector&lt;links.Link&gt; outLinks;
+-    };
+-}
+-</code></pre>
+-</ul>
+-
+-<h2>Code Generation</h2>
+-
+-The Hadoop translator is written in Java. Invocation is done by executing a 
+-wrapper shell script named named rcc. It takes a list of
+-record description files as a mandatory argument and an
+-optional language argument (the default is Java) --language or
+--l. Thus a typical invocation would look like:
+-<pre><code>
+-$ rcc -l C++ &lt;filename&gt; ...
+-</code></pre>
+-
+-
+-<h2>Target Language Mappings and Support</h2>
+-
+-For all target languages, the unit of code generation is a record type. 
+-For each record type, Hadoop generates code for serialization and
+-deserialization, record comparison and access to record members.
+-
+-<h3>C++</h3>
+-
+-Support for including Hadoop generated C++ code in applications comes in the
+-form of a header file recordio.hh which needs to be included in source
+-that uses Hadoop types and a library librecordio.a which applications need
+-to be linked with. The header declares the Hadoop C++ namespace which defines
+-appropriate types for the various primitives, the basic interfaces for
+-records and streams and enumerates the supported serialization encodings.
+-Declarations of these interfaces and a description of their semantics follow:
+-
+-<pre><code>
+-namespace hadoop {
+-
+-  enum RecFormat { kBinary, kXML, kCSV };
+-
+-  class InStream {
+-  public:
+-    virtual ssize_t read(void *buf, size_t n) = 0;
+-  };
+-
+-  class OutStream {
+-  public:
+-    virtual ssize_t write(const void *buf, size_t n) = 0;
+-  };
+-
+-  class IOError : public runtime_error {
+-  public:
+-    explicit IOError(const std::string&amp; msg);
+-  };
+-
+-  class IArchive;
+-  class OArchive;
+-
+-  class RecordReader {
+-  public:
+-    RecordReader(InStream&amp; in, RecFormat fmt);
+-    virtual ~RecordReader(void);
+-
+-    virtual void read(Record&amp; rec);
+-  };
+-
+-  class RecordWriter {
+-  public:
+-    RecordWriter(OutStream&amp; out, RecFormat fmt);
+-    virtual ~RecordWriter(void);
+-
+-    virtual void write(Record&amp; rec);
+-  };
+-
+-
+-  class Record {
+-  public:
+-    virtual std::string type(void) const = 0;
+-    virtual std::string signature(void) const = 0;
+-  protected:
+-    virtual bool validate(void) const = 0;
+-
+-    virtual void
+-    serialize(OArchive&amp; oa, const std::string&amp; tag) const = 0;
+-
+-    virtual void
+-    deserialize(IArchive&amp; ia, const std::string&amp; tag) = 0;
+-  };
+-}
+-</code></pre>
+-
+-<ul>
+-
+-<li> RecFormat: An enumeration of the serialization encodings supported
+-by this implementation of Hadoop.
+-
+-<li> InStream: A simple abstraction for an input stream. This has a 
+-single public read method that reads n bytes from the stream into
+-the buffer buf. Has the same semantics as a blocking read system
+-call. Returns the number of bytes read or -1 if an error occurs.
+-
+-<li> OutStream: A simple abstraction for an output stream. This has a 
+-single write method that writes n bytes to the stream from the
+-buffer buf. Has the same semantics as a blocking write system
+-call. Returns the number of bytes written or -1 if an error occurs.
+-
+-<li> RecordReader: A RecordReader reads records one at a time from
+-an underlying stream in a specified record format. The reader is instantiated
+-with a stream and a serialization format. It has a read method that
+-takes an instance of a record and deserializes the record from the stream.
+-
+-<li> RecordWriter: A RecordWriter writes records one at a
+-time to an underlying stream in a specified record format. The writer is
+-instantiated with a stream and a serialization format. It has a
+-write method that takes an instance of a record and serializes the
+-record to the stream.
+-
+-<li> Record: The base class for all generated record types. This has two
+-public methods type and signature that return the typename and the
+-type signature of the record.
+-
+-</ul>
+-
+-Two files are generated for each record file (note: not for each record). If a
+-record file is named "name.jr", the generated files are 
+-"name.jr.cc" and "name.jr.hh" containing serialization 
+-implementations and record type declarations respectively.
+-
+-For each record in the DDL file, the generated header file will contain a
+-class definition corresponding to the record type, method definitions for the
+-generated type will be present in the '.cc' file.  The generated class will
+-inherit from the abstract class hadoop::Record. The DDL files
+-module declaration determines the namespace the record belongs to.
+-Each '.' delimited token in the module declaration results in the
+-creation of a namespace. For instance, the declaration module docs.links
+-results in the creation of a docs namespace and a nested 
+-docs::links namespace. In the preceding examples, the Link class
+-is placed in the links namespace. The header file corresponding to
+-the links.jr file will contain:
+-
+-<pre><code>
+-namespace links {
+-  class Link : public hadoop::Record {
+-    // ....
+-  };
+-};
+-</code></pre>
+-
+-Each field within the record will cause the generation of a private member
+-declaration of the appropriate type in the class declaration, and one or more
+-acccessor methods. The generated class will implement the serialize and
+-deserialize methods defined in hadoop::Record+. It will also 
+-implement the inspection methods type and signature from
+-hadoop::Record. A default constructor and virtual destructor will also
+-be generated. Serialization code will read/write records into streams that
+-implement the hadoop::InStream and the hadoop::OutStream interfaces.
+-
+-For each member of a record an accessor method is generated that returns 
+-either the member or a reference to the member. For members that are returned 
+-by value, a setter method is also generated. This is true for primitive 
+-data members of the types byte, int, long, boolean, float and 
+-double. For example, for a int field called MyField the folowing
+-code is generated.
+-
+-<pre><code>
+-...
+-private:
+-  int32_t mMyField;
+-  ...
+-public:
+-  int32_t getMyField(void) const {
+-    return mMyField;
+-  };
+-
+-  void setMyField(int32_t m) {
+-    mMyField = m;
+-  };
+-  ...
+-</code></pre>
+-
+-For a ustring or buffer or composite field. The generated code
+-only contains accessors that return a reference to the field. A const
+-and a non-const accessor are generated. For example:
+-
+-<pre><code>
+-...
+-private:
+-  std::string mMyBuf;
+-  ...
+-public:
+-
+-  std::string&amp; getMyBuf() {
+-    return mMyBuf;
+-  };
+-
+-  const std::string&amp; getMyBuf() const {
+-    return mMyBuf;
+-  };
+-  ...
+-</code></pre>
+-
+-<h4>Examples</h4>
+-
+-Suppose the inclrec.jr file contains:
+-<pre><code>
+-module inclrec {
+-    class RI {
+-        int      I32;
+-        double   D;
+-        ustring  S;
+-    };
+-}
+-</code></pre>
+-
+-and the testrec.jr file contains:
+-
+-<pre><code>
+-include "inclrec.jr"
+-module testrec {
+-    class R {
+-        vector&lt;float&gt; VF;
+-        RI            Rec;
+-        buffer        Buf;
+-    };
+-}
+-</code></pre>
+-
+-Then the invocation of rcc such as:
+-<pre><code>
+-$ rcc -l c++ inclrec.jr testrec.jr
+-</code></pre>
+-will result in generation of four files:
+-inclrec.jr.{cc,hh} and testrec.jr.{cc,hh}.
+-
+-The inclrec.jr.hh will contain:
+-
+-<pre><code>
+-#ifndef _INCLREC_JR_HH_
+-#define _INCLREC_JR_HH_
+-
+-#include "recordio.hh"
+-
+-namespace inclrec {
+-  
+-  class RI : public hadoop::Record {
+-
+-  private:
+-
+-    int32_t      I32;
+-    double       D;
+-    std::string  S;
+-
+-  public:
+-
+-    RI(void);
+-    virtual ~RI(void);
+-
+-    virtual bool operator==(const RI&amp; peer) const;
+-    virtual bool operator&lt;(const RI&amp; peer) const;
+-
+-    virtual int32_t getI32(void) const { return I32; }
+-    virtual void setI32(int32_t v) { I32 = v; }
+-
+-    virtual double getD(void) const { return D; }
+-    virtual void setD(double v) { D = v; }
+-
+-    virtual std::string&amp; getS(void) const { return S; }
+-    virtual const std::string&amp; getS(void) const { return S; }
+-
+-    virtual std::string type(void) const;
+-    virtual std::string signature(void) const;
+-
+-  protected:
+-
+-    virtual void serialize(hadoop::OArchive&amp; a) const;
+-    virtual void deserialize(hadoop::IArchive&amp; a);
+-  };
+-} // end namespace inclrec
+-
+-#endif /* _INCLREC_JR_HH_ */
+-
+-</code></pre>
+-
+-The testrec.jr.hh file will contain:
+-
+-
+-<pre><code>
+-
+-#ifndef _TESTREC_JR_HH_
+-#define _TESTREC_JR_HH_
+-
+-#include "inclrec.jr.hh"
+-
+-namespace testrec {
+-  class R : public hadoop::Record {
+-
+-  private:
+-
+-    std::vector&lt;float&gt; VF;
+-    inclrec::RI        Rec;
+-    std::string        Buf;
+-
+-  public:
+-
+-    R(void);
+-    virtual ~R(void);
+-
+-    virtual bool operator==(const R&amp; peer) const;
+-    virtual bool operator&lt;(const R&amp; peer) const;
+-
+-    virtual std::vector&lt;float&gt;&amp; getVF(void) const;
+-    virtual const std::vector&lt;float&gt;&amp; getVF(void) const;
+-
+-    virtual std::string&amp; getBuf(void) const ;
+-    virtual const std::string&amp; getBuf(void) const;
+-
+-    virtual inclrec::RI&amp; getRec(void) const;
+-    virtual const inclrec::RI&amp; getRec(void) const;
+-    
+-    virtual bool serialize(hadoop::OutArchive&amp; a) const;
+-    virtual bool deserialize(hadoop::InArchive&amp; a);
+-    
+-    virtual std::string type(void) const;
+-    virtual std::string signature(void) const;
+-  };
+-}; // end namespace testrec
+-#endif /* _TESTREC_JR_HH_ */
+-
+-</code></pre>
+-
+-<h3>Java</h3>
+-
+-Code generation for Java is similar to that for C++. A Java class is generated
+-for each record type with private members corresponding to the fields. Getters
+-and setters for fields are also generated. Some differences arise in the
+-way comparison is expressed and in the mapping of modules to packages and
+-classes to files. For equality testing, an equals method is generated
+-for each record type. As per Java requirements a hashCode method is also
+-generated. For comparison a compareTo method is generated for each
+-record type. This has the semantics as defined by the Java Comparable
+-interface, that is, the method returns a negative integer, zero, or a positive
+-integer as the invoked object is less than, equal to, or greater than the
+-comparison parameter.
+-
+-A .java file is generated per record type as opposed to per DDL
+-file as in C++. The module declaration translates to a Java
+-package declaration. The module name maps to an identical Java package
+-name. In addition to this mapping, the DDL compiler creates the appropriate
+-directory hierarchy for the package and places the generated .java
+-files in the correct directories.
+-
+-<h2>Mapping Summary</h2>
+-
+-<pre><code>
+-DDL Type        C++ Type            Java Type 
+-
+-boolean         bool                boolean
+-byte            int8_t              byte
+-int             int32_t             int
+-long            int64_t             long
+-float           float               float
+-double          double              double
+-ustring         std::string         java.lang.String
+-buffer          std::string         org.apache.hadoop.record.Buffer
+-class type      class type          class type
+-vector&lt;type&gt;    std::vector&lt;type&gt;   java.util.ArrayList&lt;type&gt;
+-map&lt;type,type&gt;  std::map&lt;type,type&gt; java.util.TreeMap&lt;type,type&gt;
+-</code></pre>
+-
+-<h2>Data encodings</h2>
+-
+-This section describes the format of the data encodings supported by Hadoop.
+-Currently, three data encodings are supported, namely binary, CSV and XML.
+-
+-<h3>Binary Serialization Format</h3>
+-
+-The binary data encoding format is fairly dense. Serialization of composite
+-types is simply defined as a concatenation of serializations of the constituent
+-elements (lengths are included in vectors and maps).
+-
+-Composite types are serialized as follows:
+-<ul>
+-<li> class: Sequence of serialized members.
+-<li> vector: The number of elements serialized as an int. Followed by a
+-sequence of serialized elements.
+-<li> map: The number of key value pairs serialized as an int. Followed
+-by a sequence of serialized (key,value) pairs.
+-</ul>
+-
+-Serialization of primitives is more interesting, with a zero compression
+-optimization for integral types and normalization to UTF-8 for strings. 
+-Primitive types are serialized as follows:
+-
+-<ul>
+-<li> byte: Represented by 1 byte, as is.
+-<li> boolean: Represented by 1-byte (0 or 1)
+-<li> int/long: Integers and longs are serialized zero compressed.
+-Represented as 1-byte if -120 &lt;= value &lt; 128. Otherwise, serialized as a
+-sequence of 2-5 bytes for ints, 2-9 bytes for longs. The first byte represents
+-the number of trailing bytes, N, as the negative number (-120-N). For example,
+-the number 1024 (0x400) is represented by the byte sequence 'x86 x04 x00'.
+-This doesn't help much for 4-byte integers but does a reasonably good job with
+-longs without bit twiddling.
+-<li> float/double: Serialized in IEEE 754 single and double precision
+-format in network byte order. This is the format used by Java.
+-<li> ustring: Serialized as 4-byte zero compressed length followed by
+-data encoded as UTF-8. Strings are normalized to UTF-8 regardless of native
+-language representation.
+-<li> buffer: Serialized as a 4-byte zero compressed length followed by the
+-raw bytes in the buffer.
+-</ul>
+-
+-
+-<h3>CSV Serialization Format</h3>
+-
+-The CSV serialization format has a lot more structure than the "standard"
+-Excel CSV format, but we believe the additional structure is useful because
+-
+-<ul>
+-<li> it makes parsing a lot easier without detracting too much from legibility
+-<li> the delimiters around composites make it obvious when one is reading a
+-sequence of Hadoop records
+-</ul>
+-
+-Serialization formats for the various types are detailed in the grammar that
+-follows. The notable feature of the formats is the use of delimiters for 
+-indicating the certain field types.
+-
+-<ul>
+-<li> A string field begins with a single quote (').
+-<li> A buffer field begins with a sharp (#).
+-<li> A class, vector or map begins with 's{', 'v{' or 'm{' respectively and
+-ends with '}'.
+-</ul>
+-
+-The CSV format can be described by the following grammar:
+-
+-<pre><code>
+-record = primitive / struct / vector / map
+-primitive = boolean / int / long / float / double / ustring / buffer
+-
+-boolean = "T" / "F"
+-int = ["-"] 1*DIGIT
+-long = ";" ["-"] 1*DIGIT
+-float = ["-"] 1*DIGIT "." 1*DIGIT ["E" / "e" ["-"] 1*DIGIT]
+-double = ";" ["-"] 1*DIGIT "." 1*DIGIT ["E" / "e" ["-"] 1*DIGIT]
+-
+-ustring = "'" *(UTF8 char except NULL, LF, % and , / "%00" / "%0a" / "%25" / "%2c" )
+-
+-buffer = "#" *(BYTE except NULL, LF, % and , / "%00" / "%0a" / "%25" / "%2c" )
+-
+-struct = "s{" record *("," record) "}"
+-vector = "v{" [record *("," record)] "}"
+-map = "m{" [*(record "," record)] "}"
+-</code></pre>
+-
+-<h3>XML Serialization Format</h3>
+-
+-The XML serialization format is the same used by Apache XML-RPC
+-(http://ws.apache.org/xmlrpc/types.html). This is an extension of the original
+-XML-RPC format and adds some additional data types. All record I/O types are
+-not directly expressible in this format, and access to a DDL is required in
+-order to convert these to valid types. All types primitive or composite are
+-represented by &lt;value&gt; elements. The particular XML-RPC type is
+-indicated by a nested element in the &lt;value&gt; element. The encoding for
+-records is always UTF-8. Primitive types are serialized as follows:
+-
+-<ul>
+-<li> byte: XML tag &lt;ex:i1&gt;. Values: 1-byte unsigned 
+-integers represented in US-ASCII
+-<li> boolean: XML tag &lt;boolean&gt;. Values: "0" or "1"
+-<li> int: XML tags &lt;i4&gt; or &lt;int&gt;. Values: 4-byte
+-signed integers represented in US-ASCII.
+-<li> long: XML tag &lt;ex:i8&gt;. Values: 8-byte signed integers
+-represented in US-ASCII.
+-<li> float: XML tag &lt;ex:float&gt;. Values: Single precision
+-floating point numbers represented in US-ASCII.
+-<li> double: XML tag &lt;double&gt;. Values: Double precision
+-floating point numbers represented in US-ASCII.
+-<li> ustring: XML tag &lt;;string&gt;. Values: String values
+-represented as UTF-8. XML does not permit all Unicode characters in literal
+-data. In particular, NULLs and control chars are not allowed. Additionally,
+-XML processors are required to replace carriage returns with line feeds and to
+-replace CRLF sequences with line feeds. Programming languages that we work
+-with do not impose these restrictions on string types. To work around these
+-restrictions, disallowed characters and CRs are percent escaped in strings.
+-The '%' character is also percent escaped.
+-<li> buffer: XML tag &lt;string&gt;. Values: Arbitrary binary
+-data. Represented as hexBinary, each byte is replaced by its 2-byte
+-hexadecimal representation.
+-</ul>
+-
+-Composite types are serialized as follows:
+-
+-<ul>
+-<li> class: XML tag &lt;struct&gt;. A struct is a sequence of
+-&lt;member&gt; elements. Each &lt;member&gt; element has a &lt;name&gt;
+-element and a &lt;value&gt; element. The &lt;name&gt; is a string that must
+-match /[a-zA-Z][a-zA-Z0-9_]*/. The value of the member is represented
+-by a &lt;value&gt; element.
+-
+-<li> vector: XML tag &lt;array&gt;. An &lt;array&gt; contains a
+-single &lt;data&gt; element. The &lt;data&gt; element is a sequence of
+-&lt;value&gt; elements each of which represents an element of the vector.
+-
+-<li> map: XML tag &lt;array&gt;. Same as vector.
+-
+-</ul>
+-
+-For example:
+-
+-<pre><code>
+-class {
+-  int           MY_INT;            // value 5
+-  vector&lt;float&gt; MY_VEC;            // values 0.1, -0.89, 2.45e4
+-  buffer        MY_BUF;            // value '\00\n\tabc%'
+-}
+-</code></pre>
+-
+-is serialized as
+-
+-<pre><code class="XML">
+-&lt;value&gt;
+-  &lt;struct&gt;
+-    &lt;member&gt;
+-      &lt;name&gt;MY_INT&lt;/name&gt;
+-      &lt;value&gt;&lt;i4&gt;5&lt;/i4&gt;&lt;/value&gt;
+-    &lt;/member&gt;
+-    &lt;member&gt;
+-      &lt;name&gt;MY_VEC&lt;/name&gt;
+-      &lt;value&gt;
+-        &lt;array&gt;
+-          &lt;data&gt;
+-            &lt;value&gt;&lt;ex:float&gt;0.1&lt;/ex:float&gt;&lt;/value&gt;
+-            &lt;value&gt;&lt;ex:float&gt;-0.89&lt;/ex:float&gt;&lt;/value&gt;
+-            &lt;value&gt;&lt;ex:float&gt;2.45e4&lt;/ex:float&gt;&lt;/value&gt;
+-          &lt;/data&gt;
+-        &lt;/array&gt;
+-      &lt;/value&gt;
+-    &lt;/member&gt;
+-    &lt;member&gt;
+-      &lt;name&gt;MY_BUF&lt;/name&gt;
+-      &lt;value&gt;&lt;string&gt;%00\n\tabc%25&lt;/string&gt;&lt;/value&gt;
+-    &lt;/member&gt;
+-  &lt;/struct&gt;
+-&lt;/value&gt; 
+-</code></pre>
+-
+-  </body>
+-</html>
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/AutoInputFormat.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/AutoInputFormat.java
+deleted file mode 100644
+index 10cf614b944..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/AutoInputFormat.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.EOFException;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.mapred.FileInputFormat;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.InputFormat;
+-import org.apache.hadoop.mapred.InputSplit;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.SequenceFileInputFormat;
+-import org.apache.hadoop.mapred.TextInputFormat;
+-
+-/**
+- * An {@link InputFormat} that tries to deduce the types of the input files
+- * automatically. It can currently handle text and sequence files.
+- */
+-public class AutoInputFormat extends FileInputFormat {
+-
+-  private TextInputFormat textInputFormat = new TextInputFormat();
+-
+-  private SequenceFileInputFormat seqFileInputFormat = 
+-    new SequenceFileInputFormat();
+-
+-  public void configure(JobConf job) {
+-    textInputFormat.configure(job);
+-    // SequenceFileInputFormat has no configure() method
+-  }
+-
+-  public RecordReader getRecordReader(InputSplit split, JobConf job,
+-    Reporter reporter) throws IOException {
+-    FileSplit fileSplit = (FileSplit) split;
+-    FileSystem fs = FileSystem.get(fileSplit.getPath().toUri(), job);
+-    FSDataInputStream is = fs.open(fileSplit.getPath());
+-    byte[] header = new byte[3];
+-    RecordReader reader = null;
+-    try {
+-      is.readFully(header);
+-    } catch (EOFException eof) {
+-      reader = textInputFormat.getRecordReader(split, job, reporter);
+-    } finally {
+-      is.close();
+-    }
+-    if (header[0] == 'S' && header[1] == 'E' && header[2] == 'Q') {
+-      reader = seqFileInputFormat.getRecordReader(split, job, reporter);
+-    } else {
+-      reader = textInputFormat.getRecordReader(split, job, reporter);
+-    }
+-    return reader;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/DumpTypedBytes.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/DumpTypedBytes.java
+deleted file mode 100644
+index ffddc7cc111..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/DumpTypedBytes.java
++++ /dev/null
+@@ -1,145 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.typedbytes.TypedBytesOutput;
+-import org.apache.hadoop.typedbytes.TypedBytesWritableOutput;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * Utility program that fetches all files that match a given pattern and dumps
+- * their content to stdout as typed bytes. This works for all files that can be
+- * handled by {@link org.apache.hadoop.streaming.AutoInputFormat}.
+- */
+-public class DumpTypedBytes implements Tool {
+-
+-  private Configuration conf;
+-
+-  public DumpTypedBytes(Configuration conf) {
+-    this.conf = conf;
+-  }
+-  
+-  public DumpTypedBytes() {
+-    this(new Configuration());
+-  }
+-
+-  public Configuration getConf() {
+-    return conf;
+-  }
+-
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-  }
+-
+-  /**
+-   * The main driver for <code>DumpTypedBytes</code>.
+-   */
+-  public int run(String[] args) throws Exception {
+-    if (args.length == 0) {
+-      System.err.println("Too few arguments!");
+-      printUsage();
+-      return 1;
+-    }
+-    Path pattern = new Path(args[0]);
+-    FileSystem fs = pattern.getFileSystem(getConf());
+-    fs.setVerifyChecksum(true);
+-    for (Path p : FileUtil.stat2Paths(fs.globStatus(pattern), pattern)) {
+-      List<FileStatus> inputFiles = new ArrayList<FileStatus>();
+-      FileStatus status = fs.getFileStatus(p);
+-      if (status.isDirectory()) {
+-        FileStatus[] files = fs.listStatus(p);
+-        Collections.addAll(inputFiles, files);
+-      } else {
+-        inputFiles.add(status);
+-      }
+-      return dumpTypedBytes(inputFiles);
+-    }
+-    return -1;
+-  }
+-
+-  private void printUsage() {
+-    System.out.println("Usage: mapred streaming dumptb <glob-pattern>");
+-    System.out.println("  Dumps all files that match the given pattern to " +
+-        "standard output as typed bytes.");
+-    System.out.println("  The files can be text or sequence files");
+-  }
+-
+-  /**
+-   * Dump given list of files to standard output as typed bytes.
+-   */
+-  @SuppressWarnings("unchecked")
+-  private int dumpTypedBytes(List<FileStatus> files) throws IOException {
+-    JobConf job = new JobConf(getConf()); 
+-    DataOutputStream dout = new DataOutputStream(System.out);
+-    AutoInputFormat autoInputFormat = new AutoInputFormat();
+-    for (FileStatus fileStatus : files) {
+-      FileSplit split = new FileSplit(fileStatus.getPath(), 0,
+-        fileStatus.getLen() * fileStatus.getBlockSize(),
+-        (String[]) null);
+-      RecordReader recReader = null;
+-      try {
+-        recReader = autoInputFormat.getRecordReader(split, job, Reporter.NULL);
+-        Object key = recReader.createKey();
+-        Object value = recReader.createValue();
+-        while (recReader.next(key, value)) {
+-          if (key instanceof Writable) {
+-            TypedBytesWritableOutput.get(dout).write((Writable) key);
+-          } else {
+-            TypedBytesOutput.get(dout).write(key);
+-          }
+-          if (value instanceof Writable) {
+-            TypedBytesWritableOutput.get(dout).write((Writable) value);
+-          } else {
+-            TypedBytesOutput.get(dout).write(value);
+-          }
+-        }
+-      } finally {
+-        if (recReader != null) {
+-          recReader.close();
+-        }
+-      }
+-    }
+-    dout.flush();
+-    return 0;
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    DumpTypedBytes dumptb = new DumpTypedBytes();
+-    int res = ToolRunner.run(dumptb, args);
+-    System.exit(res);
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
+deleted file mode 100644
+index 7871a4c969e..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/Environment.java
++++ /dev/null
+@@ -1,132 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.net.InetAddress;
+-import java.nio.charset.StandardCharsets;
+-import java.util.*;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.util.StringUtils;
+-
+-/**
+- * This is a class used to get the current environment
+- * on the host machines running the map/reduce. This class
+- * assumes that setting the environment in streaming is 
+- * allowed on windows/ix/linuz/freebsd/sunos/solaris/hp-ux
+- */
+-@InterfaceAudience.Private
+-public class Environment extends Properties {
+-
+-  private static final long serialVersionUID = 1L;
+-
+-  public Environment() throws IOException {
+-    // Extend this code to fit all operating
+-    // environments that you expect to run in
+-    // http://lopica.sourceforge.net/os.html
+-    String command = null;
+-    String OS = System.getProperty("os.name");
+-    String lowerOs = StringUtils.toLowerCase(OS);
+-    if (OS.indexOf("Windows") > -1) {
+-      command = "cmd /C set";
+-    } else if (lowerOs.indexOf("ix") > -1 || lowerOs.indexOf("linux") > -1
+-               || lowerOs.indexOf("freebsd") > -1 || lowerOs.indexOf("sunos") > -1
+-               || lowerOs.indexOf("solaris") > -1 || lowerOs.indexOf("hp-ux") > -1) {
+-      command = "env";
+-    } else if (lowerOs.startsWith("mac os x") || lowerOs.startsWith("darwin")) {
+-      command = "env";
+-    } else {
+-      // Add others here
+-    }
+-
+-    if (command == null) {
+-      throw new RuntimeException("Operating system " + OS + " not supported by this class");
+-    }
+-
+-    // Read the environment variables
+-
+-    Process pid = Runtime.getRuntime().exec(command);
+-    BufferedReader in = new BufferedReader(
+-        new InputStreamReader(pid.getInputStream(), StandardCharsets.UTF_8));
+-    try {
+-      while (true) {
+-        String line = in.readLine();
+-        if (line == null)
+-          break;
+-        int p = line.indexOf("=");
+-        if (p != -1) {
+-          String name = line.substring(0, p);
+-          String value = line.substring(p + 1);
+-          setProperty(name, value);
+-        }
+-      }
+-      in.close();
+-      in = null;
+-    } finally {
+-      IOUtils.closeStream(in);
+-    }
+-   
+-    try {
+-      pid.waitFor();
+-    } catch (InterruptedException e) {
+-      throw new IOException(e.getMessage());
+-    }
+-  }
+-
+-  // to be used with Runtime.exec(String[] cmdarray, String[] envp) 
+-  String[] toArray() {
+-    String[] arr = new String[super.size()];
+-    Enumeration<Object> it = super.keys();
+-    int i = -1;
+-    while (it.hasMoreElements()) {
+-      String key = (String) it.nextElement();
+-      String val = (String) get(key);
+-      i++;
+-      arr[i] = key + "=" + val;
+-    }
+-    return arr;
+-  }
+-
+-  public Map<String, String> toMap() {
+-    Map<String, String> map = new HashMap<String, String>();
+-    Enumeration<Object> it = super.keys();
+-    while (it.hasMoreElements()) {
+-      String key = (String) it.nextElement();
+-      String val = (String) get(key);
+-      map.put(key, val);
+-    }
+-    return map;
+-  }
+-  
+-  public String getHost() {
+-    String host = getProperty("HOST");
+-    if (host == null) {
+-      // HOST isn't always in the environment
+-      try {
+-        host = InetAddress.getLocalHost().getHostName();
+-      } catch (IOException io) {
+-        io.printStackTrace();
+-      }
+-    }
+-    return host;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/HadoopStreaming.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/HadoopStreaming.java
+deleted file mode 100644
+index 92f9d03866a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/HadoopStreaming.java
++++ /dev/null
+@@ -1,71 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.util.Arrays;
+-
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/** The main entry point. Usually invoked with the script 
+- *  bin/hadoop jar hadoop-streaming.jar args.
+- */
+-public class HadoopStreaming {
+-
+-  public static void main(String[] args) throws Exception {
+-    if (args.length < 1) {
+-      System.err.println("No Arguments Given!");
+-      printUsage();
+-      System.exit(1);
+-    }
+-    int returnStatus = 0;
+-    String cmd = args[0];
+-    String[] remainingArgs = Arrays.copyOfRange(args, 1, args.length);
+-    if (cmd.equalsIgnoreCase("dumptb")) {
+-      DumpTypedBytes dumptb = new DumpTypedBytes();
+-      returnStatus = ToolRunner.run(dumptb, remainingArgs);
+-    } else if (cmd.equalsIgnoreCase("loadtb")) {
+-      LoadTypedBytes loadtb = new LoadTypedBytes();
+-      returnStatus = ToolRunner.run(loadtb, remainingArgs);
+-    } else if (cmd.equalsIgnoreCase("streamjob")) {
+-      StreamJob job = new StreamJob();
+-      returnStatus = ToolRunner.run(job, remainingArgs);
+-    } else { // for backward compatibility
+-      StreamJob job = new StreamJob();
+-      returnStatus = ToolRunner.run(job, args);
+-    }
+-    if (returnStatus != 0) {
+-      System.err.println("Streaming Command Failed!");
+-      System.exit(returnStatus);
+-    }
+-  }
+-  
+-  private static void printUsage() {
+-    System.out.println("Usage: mapred streaming [options]");
+-    System.out.println("Options:");
+-    System.out.println("  dumptb <glob-pattern> Dumps all files that match the" 
+-        + " given pattern to ");
+-    System.out.println("                        standard output as typed " +
+-    		"bytes.");
+-    System.out.println("  loadtb <path> Reads typed bytes from standard input" +
+-        " and stores them in");
+-    System.out.println("                a sequence file in the specified path");
+-    System.out.println("  [streamjob] <args> Runs streaming job with given" +
+-        " arguments");
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/JarBuilder.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/JarBuilder.java
+deleted file mode 100644
+index 1945127a9ba..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/JarBuilder.java
++++ /dev/null
+@@ -1,208 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.*;
+-import java.util.jar.*;
+-import java.util.zip.ZipException;
+-
+-/**
+- * This class is the main class for generating job.jar
+- * for Hadoop Streaming jobs. It includes the files specified 
+- * with the -file option and includes them in the jar. Also,
+- * hadoop-streaming is a user level appplication, so all the classes
+- * with hadoop-streaming that are needed in the job are also included
+- * in the job.jar.
+- */
+-public class JarBuilder {
+-
+-  public JarBuilder() {
+-  }
+-
+-  public void setVerbose(boolean v) {
+-    this.verbose = v;
+-  }
+-
+-  public void merge(List srcNames, List srcUnjar, String dstJar) throws IOException {
+-    String source = null;
+-    JarOutputStream jarOut = null;
+-    JarFile jarSource = null;
+-    jarOut = new JarOutputStream(new FileOutputStream(dstJar));
+-    boolean throwing = false;
+-    try {
+-      if (srcNames != null) {
+-        Iterator iter = srcNames.iterator();
+-        while (iter.hasNext()) {
+-          source = (String) iter.next();
+-          File fsource = new File(source);
+-          String base = getBasePathInJarOut(source);
+-          if (!fsource.exists()) {
+-            throwing = true;
+-            throw new FileNotFoundException(fsource.getAbsolutePath());
+-          }
+-          if (fsource.isDirectory()) {
+-            addDirectory(jarOut, base, fsource, 0);
+-          } else {
+-            addFileStream(jarOut, base, fsource);
+-          }
+-        }
+-      }
+-      if (srcUnjar != null) {
+-        Iterator iter = srcUnjar.iterator();
+-        while (iter.hasNext()) {
+-          source = (String) iter.next();
+-          jarSource = new JarFile(source);
+-          addJarEntries(jarOut, jarSource);
+-          jarSource.close();
+-        }
+-
+-      }
+-    } finally {
+-      try {
+-        jarOut.close();
+-      } catch (ZipException z) {
+-        if (!throwing) {
+-          throw new IOException(z.toString());
+-        }
+-      }
+-    }
+-  }
+-
+-  protected String fileExtension(String file) {
+-    int leafPos = file.lastIndexOf('/');
+-    if (leafPos == file.length() - 1) return "";
+-    String leafName = file.substring(leafPos + 1);
+-    int dotPos = leafName.lastIndexOf('.');
+-    if (dotPos == -1) return "";
+-    String ext = leafName.substring(dotPos + 1);
+-    return ext;
+-  }
+-
+-  /** @return empty or a jar base path. Must not start with '/' */
+-  protected String getBasePathInJarOut(String sourceFile) {
+-    // TaskRunner will unjar and append to classpath: .:classes/:lib/*    	
+-    String ext = fileExtension(sourceFile);
+-    if (ext.equals("class")) {
+-      return "classes/"; // or ""
+-    } else if (ext.equals("jar") || ext.equals("zip")) {
+-      return "lib/";
+-    } else {
+-      return "";
+-    }
+-  }
+-
+-  private void addJarEntries(JarOutputStream dst, JarFile src) throws IOException {
+-    Enumeration entries = src.entries();
+-    JarEntry entry = null;
+-    while (entries.hasMoreElements()) {
+-      entry = (JarEntry) entries.nextElement();
+-      //if (entry.getName().startsWith("META-INF/")) continue; 
+-      InputStream in = src.getInputStream(entry);
+-      addNamedStream(dst, entry.getName(), in);
+-    }
+-  }
+-
+-  /** @param name path in jar for this jar element. Must not start with '/' */
+-  void addNamedStream(JarOutputStream dst, String name, InputStream in) throws IOException {
+-    if (verbose) {
+-      System.err.println("JarBuilder.addNamedStream " + name);
+-    }
+-    try {
+-      dst.putNextEntry(new JarEntry(name));
+-      int bytesRead = 0;
+-      while ((bytesRead = in.read(buffer, 0, BUFF_SIZE)) != -1) {
+-        dst.write(buffer, 0, bytesRead);
+-      }
+-    } catch (ZipException ze) {
+-      if (ze.getMessage().indexOf("duplicate entry") >= 0) {
+-        if (verbose) {
+-          System.err.println(ze + " Skip duplicate entry " + name);
+-        }
+-      } else {
+-        throw ze;
+-      }
+-    } finally {
+-      in.close();
+-      dst.flush();
+-      dst.closeEntry();
+-    }
+-  }
+-
+-  void addFileStream(JarOutputStream dst, String jarBaseName, File file) throws IOException {
+-    FileInputStream in = new FileInputStream(file);
+-    try {
+-      String name = jarBaseName + file.getName();
+-      addNamedStream(dst, name, in);
+-    } finally {
+-      in.close();
+-    }
+-  }
+-
+-  void addDirectory(JarOutputStream dst, String jarBaseName, File dir, int depth) throws IOException {
+-    File[] contents = dir.listFiles();
+-    if (contents != null) {
+-      for (int i = 0; i < contents.length; i++) {
+-        File f = contents[i];
+-        String fBaseName = (depth == 0) ? "" : dir.getName();
+-        if (jarBaseName.length() > 0) {
+-          fBaseName = jarBaseName + "/" + fBaseName;
+-        }
+-        if (f.isDirectory()) {
+-          addDirectory(dst, fBaseName, f, depth + 1);
+-        } else {
+-          addFileStream(dst, fBaseName + "/", f);
+-        }
+-      }
+-    }
+-  }
+-
+-  /** Test program */
+-  public static void main(String args[]) {
+-    // args = new String[] { "C:/Temp/merged.jar", "C:/jdk1.5.0/jre/lib/ext/dnsns.jar",  "/Temp/addtojar2.log", "C:/jdk1.5.0/jre/lib/ext/mtest.jar", "C:/Temp/base"};
+-    if (args.length < 2) {
+-      System.err.println("Usage: JarFiles merged.jar [src.jar | dir | file ]+");
+-    } else {
+-      JarBuilder jarFiles = new JarBuilder();
+-      List names = new ArrayList();
+-      List unjar = new ArrayList();
+-      for (int i = 1; i < args.length; i++) {
+-        String f = args[i];
+-        String ext = jarFiles.fileExtension(f);
+-        boolean expandAsJar = ext.equals("jar") || ext.equals("zip");
+-        if (expandAsJar) {
+-          unjar.add(f);
+-        } else {
+-          names.add(f);
+-        }
+-      }
+-      try {
+-        jarFiles.merge(names, unjar, args[0]);
+-        Date lastMod = new Date(new File(args[0]).lastModified());
+-        System.out.println("Merge done to " + args[0] + " " + lastMod);
+-      } catch (Exception ge) {
+-        ge.printStackTrace(System.err);
+-      }
+-    }
+-  }
+-
+-  private static final int BUFF_SIZE = 32 * 1024;
+-  private byte buffer[] = new byte[BUFF_SIZE];
+-  protected boolean verbose = false;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/LoadTypedBytes.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/LoadTypedBytes.java
+deleted file mode 100644
+index 838cfa16279..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/LoadTypedBytes.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataInputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.typedbytes.TypedBytesInput;
+-import org.apache.hadoop.typedbytes.TypedBytesWritable;
+-import org.apache.hadoop.util.Tool;
+-import org.apache.hadoop.util.ToolRunner;
+-
+-/**
+- * Utility program that reads typed bytes from standard input and stores them in
+- * a sequence file for which the path is given as an argument.
+- */
+-public class LoadTypedBytes implements Tool {
+-
+-  private Configuration conf;
+-
+-  public LoadTypedBytes(Configuration conf) {
+-    this.conf = conf;
+-  }
+-  
+-  public LoadTypedBytes() {
+-    this(new Configuration());
+-  }
+-  
+-  public Configuration getConf() {
+-    return conf;
+-  }
+-
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-  }
+-  
+-  /**
+-   * The main driver for <code>LoadTypedBytes</code>.
+-   */
+-  public int run(String[] args) throws Exception {
+-    if (args.length == 0) {
+-      System.err.println("Too few arguments!");
+-      printUsage();
+-      return 1;
+-    }
+-    Path path = new Path(args[0]);
+-    FileSystem fs = path.getFileSystem(getConf());
+-    if (fs.exists(path)) {
+-      System.err.println("given path exists already!");
+-      return -1;
+-    }
+-    TypedBytesInput tbinput = new TypedBytesInput(new DataInputStream(System.in));
+-    SequenceFile.Writer writer = SequenceFile.createWriter(fs, conf, path,
+-      TypedBytesWritable.class, TypedBytesWritable.class);
+-    try {
+-      TypedBytesWritable key = new TypedBytesWritable();
+-      TypedBytesWritable value = new TypedBytesWritable();
+-      byte[] rawKey = tbinput.readRaw();
+-      while (rawKey != null) {
+-        byte[] rawValue = tbinput.readRaw();
+-        key.set(rawKey, 0, rawKey.length);
+-        value.set(rawValue, 0, rawValue.length);
+-        writer.append(key, value);
+-        rawKey = tbinput.readRaw();
+-      }
+-    } finally {
+-      writer.close();
+-    }
+-    return 0;
+-  }
+-
+-  private void printUsage() {
+-    System.out.println("Usage: mapred streaming loadtb <path>");
+-    System.out.println("  Reads typed bytes from standard input" +
+-    " and stores them in a sequence file in");
+-    System.out.println("  the specified path");
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    LoadTypedBytes loadtb = new LoadTypedBytes();
+-    int res = ToolRunner.run(loadtb, args);
+-    System.exit(res);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PathFinder.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PathFinder.java
+deleted file mode 100644
+index d0010b6b975..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PathFinder.java
++++ /dev/null
+@@ -1,102 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.fs.FileUtil;
+-
+-/**
+- * Maps a relative pathname to an absolute pathname using the PATH environment.
+- */
+-@InterfaceAudience.Private
+-public class PathFinder {
+-  String pathenv; // a string of pathnames
+-  String pathSep; // the path separator
+-  String fileSep; // the file separator in a directory
+-
+-  /**
+-   * Construct a PathFinder object using the path from java.class.path
+-   */
+-  public PathFinder() {
+-    pathenv = System.getProperty("java.class.path");
+-    pathSep = System.getProperty("path.separator");
+-    fileSep = System.getProperty("file.separator");
+-  }
+-
+-  /**
+-   * Construct a PathFinder object using the path from the specified system
+-   * environment variable.
+-   */
+-  public PathFinder(String envpath) {
+-    pathenv = System.getenv(envpath);
+-    pathSep = System.getProperty("path.separator");
+-    fileSep = System.getProperty("file.separator");
+-  }
+-
+-  /**
+-   * Appends the specified component to the path list
+-   */
+-  public void prependPathComponent(String str) {
+-    pathenv = str + pathSep + pathenv;
+-  }
+-
+-  /**
+-   * Returns the full path name of this file if it is listed in the path
+-   */
+-  public File getAbsolutePath(String filename) {
+-    if (pathenv == null || pathSep == null || fileSep == null) {
+-      return null;
+-    }
+-    int val = -1;
+-    String classvalue = pathenv + pathSep;
+-
+-    while (((val = classvalue.indexOf(pathSep)) >= 0)
+-        && classvalue.length() > 0) {
+-      // Extract each entry from the pathenv
+-      String entry = classvalue.substring(0, val).trim();
+-      File f = new File(entry);
+-
+-      if (f.isDirectory()) {
+-        // this entry in the pathenv is a directory.
+-        // see if the required file is in this directory
+-        f = new File(entry + fileSep + filename);
+-      }
+-      // see if the filename matches and we can read it
+-      if (f.isFile() && FileUtil.canRead(f)) {
+-        return f;
+-      }
+-      classvalue = classvalue.substring(val + 1).trim();
+-    }
+-    return null;
+-  }
+-
+-  public static void main(String args[]) throws IOException {
+-    if (args.length < 1) {
+-      System.out.println("Usage: java PathFinder <filename>");
+-      System.exit(1);
+-    }
+-    PathFinder finder = new PathFinder("PATH");
+-    File file = finder.getAbsolutePath(args[0]);
+-    if (file != null) {
+-      System.out.println("Full path name = " + file.getCanonicalPath());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeCombiner.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeCombiner.java
+deleted file mode 100644
+index 444042d74f4..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeCombiner.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.UnsupportedEncodingException;
+-import java.net.URLDecoder;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-
+-public class PipeCombiner extends PipeReducer {
+-  String getPipeCommand(JobConf job) {
+-    String str = job.get("stream.combine.streamprocessor");
+-    try {
+-      if (str != null) {
+-        return URLDecoder.decode(str, "UTF-8");
+-      }
+-    } catch (UnsupportedEncodingException e) {
+-      System.err.println("stream.combine.streamprocessor" + 
+-                         " in jobconf not found");
+-    }
+-    return null;
+-  }
+-  boolean getDoPipe() {
+-    return (getPipeCommand(job_) != null);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
+deleted file mode 100644
+index ef62505c4c6..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRed.java
++++ /dev/null
+@@ -1,627 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.Map.Entry;
+-import java.util.Arrays;
+-import java.util.ArrayList;
+-import java.util.Properties;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.streaming.io.InputWriter;
+-import org.apache.hadoop.streaming.io.OutputReader;
+-import org.apache.hadoop.streaming.io.TextInputWriter;
+-import org.apache.hadoop.streaming.io.TextOutputReader;
+-import org.apache.hadoop.util.LineReader;
+-import org.apache.hadoop.util.ReflectionUtils;
+-
+-import org.apache.hadoop.io.Text;
+-
+-/** Shared functionality for PipeMapper, PipeReducer.
+- */
+-public abstract class PipeMapRed {
+-
+-  protected static final Logger LOG = LoggerFactory.getLogger(PipeMapRed.class.getName());
+-
+-  /**
+-   * Returns the Configuration.
+-   */
+-  public Configuration getConfiguration() {
+-    return job_;
+-  }
+-  
+-  /**
+-   * Returns the DataOutput to which the client input is written.
+-   */
+-  public DataOutput getClientOutput() {
+-    return clientOut_;
+-  }
+-  
+-  /**
+-   * Returns the DataInput from which the client output is read.
+-   */
+-  public DataInput getClientInput() {
+-    return clientIn_;
+-  }
+-  
+-  /**
+-   * Returns the input separator to be used.
+-   */
+-  public abstract byte[] getInputSeparator();
+-  
+-  /**
+-   * Returns the field separator to be used.
+-   */
+-  public abstract byte[] getFieldSeparator();
+-
+-  /**
+-   * Returns the number of key fields.
+-   */
+-  public abstract int getNumOfKeyFields();
+-
+-  
+-  /** 
+-   * Returns the command to be spawned as a subprocess.
+-   * Mapper/Reducer operations will delegate to it
+-   */
+-  abstract String getPipeCommand(JobConf job);
+-  
+-  abstract boolean getDoPipe();
+-
+-  final static int OUTSIDE = 1;
+-  final static int SINGLEQ = 2;
+-  final static int DOUBLEQ = 3;
+-  
+-  private final static int BUFFER_SIZE = 128 * 1024;
+-
+-  static String[] splitArgs(String args) {
+-    ArrayList argList = new ArrayList();
+-    char[] ch = args.toCharArray();
+-    int clen = ch.length;
+-    int state = OUTSIDE;
+-    int argstart = 0;
+-    for (int c = 0; c <= clen; c++) {
+-      boolean last = (c == clen);
+-      int lastState = state;
+-      boolean endToken = false;
+-      if (!last) {
+-        if (ch[c] == '\'') {
+-          if (state == OUTSIDE) {
+-            state = SINGLEQ;
+-          } else if (state == SINGLEQ) {
+-            state = OUTSIDE;
+-          }
+-          endToken = (state != lastState);
+-        } else if (ch[c] == '"') {
+-          if (state == OUTSIDE) {
+-            state = DOUBLEQ;
+-          } else if (state == DOUBLEQ) {
+-            state = OUTSIDE;
+-          }
+-          endToken = (state != lastState);
+-        } else if (ch[c] == ' ') {
+-          if (state == OUTSIDE) {
+-            endToken = true;
+-          }
+-        }
+-      }
+-      if (last || endToken) {
+-        if (c == argstart) {
+-          // unquoted space
+-        } else {
+-          String a;
+-          a = args.substring(argstart, c);
+-          argList.add(a);
+-        }
+-        argstart = c + 1;
+-        lastState = state;
+-      }
+-    }
+-    return (String[]) argList.toArray(new String[0]);
+-  }
+-
+-  public void configure(JobConf job) {
+-    try {
+-      String argv = getPipeCommand(job);
+-
+-      joinDelay_ = job.getLong("stream.joindelay.milli", 0);
+-
+-      job_ = job;
+-      
+-      mapInputWriterClass_ = 
+-        job_.getClass("stream.map.input.writer.class", 
+-          TextInputWriter.class, InputWriter.class);
+-      mapOutputReaderClass_ = 
+-        job_.getClass("stream.map.output.reader.class",
+-          TextOutputReader.class, OutputReader.class);
+-      reduceInputWriterClass_ = 
+-        job_.getClass("stream.reduce.input.writer.class",
+-          TextInputWriter.class, InputWriter.class);
+-      reduceOutputReaderClass_ = 
+-        job_.getClass("stream.reduce.output.reader.class",
+-          TextOutputReader.class, OutputReader.class);
+-      nonZeroExitIsFailure_ = job_.getBoolean("stream.non.zero.exit.is.failure", true);
+-      
+-      doPipe_ = getDoPipe();
+-      if (!doPipe_) return;
+-
+-      setStreamJobDetails(job);
+-      
+-      String[] argvSplit = splitArgs(argv);
+-      String prog = argvSplit[0];
+-      File currentDir = new File(".").getAbsoluteFile();
+-      if (new File(prog).isAbsolute()) {
+-        // we don't own it. Hope it is executable
+-      } else {
+-        FileUtil.chmod(new File(currentDir, prog).toString(), "a+x");
+-      }
+-
+-      // 
+-      // argvSplit[0]:
+-      // An absolute path should be a preexisting valid path on all TaskTrackers
+-      // A relative path is converted into an absolute pathname by looking
+-      // up the PATH env variable. If it still fails, look it up in the
+-      // tasktracker's local working directory
+-      //
+-      if (!new File(argvSplit[0]).isAbsolute()) {
+-        PathFinder finder = new PathFinder("PATH");
+-        finder.prependPathComponent(currentDir.toString());
+-        File f = finder.getAbsolutePath(argvSplit[0]);
+-        if (f != null) {
+-          argvSplit[0] = f.getAbsolutePath();
+-        }
+-        f = null;
+-      }
+-      LOG.info("PipeMapRed exec " + Arrays.asList(argvSplit));
+-      Environment childEnv = (Environment) StreamUtil.env().clone();
+-      addJobConfToEnvironment(job_, childEnv);
+-      addEnvironment(childEnv, job_.get("stream.addenvironment"));
+-      // add TMPDIR environment variable with the value of java.io.tmpdir
+-      envPut(childEnv, "TMPDIR", System.getProperty("java.io.tmpdir"));
+-
+-      // Start the process
+-      ProcessBuilder builder = new ProcessBuilder(argvSplit);
+-      builder.environment().putAll(childEnv.toMap());
+-      sim = builder.start();
+-
+-      clientOut_ = new DataOutputStream(new BufferedOutputStream(
+-                                              sim.getOutputStream(),
+-                                              BUFFER_SIZE));
+-      clientIn_ = new DataInputStream(new BufferedInputStream(
+-                                              sim.getInputStream(),
+-                                              BUFFER_SIZE));
+-      clientErr_ = new DataInputStream(new BufferedInputStream(sim.getErrorStream()));
+-      startTime_ = System.currentTimeMillis();
+-
+-    } catch (IOException e) {
+-      LOG.error("configuration exception", e);
+-      throw new RuntimeException("configuration exception", e);
+-    } catch (InterruptedException e)  {
+-      LOG.error("configuration exception", e);
+-      throw new RuntimeException("configuration exception", e);
+-    }
+-  }
+-  
+-  void setStreamJobDetails(JobConf job) {
+-    String s = job.get("stream.minRecWrittenToEnableSkip_");
+-    if (s != null) {
+-      minRecWrittenToEnableSkip_ = Long.parseLong(s);
+-      LOG.info("JobConf set minRecWrittenToEnableSkip_ ="
+-          + minRecWrittenToEnableSkip_);
+-    }
+-  }
+-
+-  void addJobConfToEnvironment(JobConf jobconf, Properties env) {
+-    JobConf conf = new JobConf(jobconf);
+-    conf.setDeprecatedProperties();
+-    int lenLimit = conf.getInt("stream.jobconf.truncate.limit", -1);
+-
+-    for (Entry<String, String> confEntry: conf) {
+-      String name = confEntry.getKey();
+-      String value = conf.get(name); // does variable expansion
+-      name = safeEnvVarName(name);
+-      if (lenLimit > -1  && value.length() > lenLimit) {
+-        LOG.warn("Environment variable " + name + " truncated to " + lenLimit
+-            + " to  fit system limits.");
+-        value = value.substring(0, lenLimit);
+-      }
+-      envPut(env, name, value);
+-    }
+-  }
+-
+-  String safeEnvVarName(String var) {
+-    StringBuffer safe = new StringBuffer();
+-    int len = var.length();
+-    for (int i = 0; i < len; i++) {
+-      char c = var.charAt(i);
+-      char s;
+-      if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) {
+-        s = c;
+-      } else {
+-        s = '_';
+-      }
+-      safe.append(s);
+-    }
+-    return safe.toString();
+-  }
+-
+-  void addEnvironment(Properties env, String nameVals) {
+-    // encoding "a=b c=d" from StreamJob
+-    if (nameVals == null) return;
+-    String[] nv = nameVals.split(" ");
+-    for (int i = 0; i < nv.length; i++) {
+-      String[] pair = nv[i].split("=", 2);
+-      if (pair.length != 2) {
+-        LOG.info("Skip env entry:" + nv[i]);
+-      } else {
+-        envPut(env, pair[0], pair[1]);
+-      }
+-    }
+-  }
+-
+-  void envPut(Properties env, String name, String value) {
+-    if (LOG.isDebugEnabled()) {
+-      LOG.debug("Add  env entry:" + name + "=" + value);
+-    }
+-    env.put(name, value);
+-  }
+-
+-  void startOutputThreads(OutputCollector output, Reporter reporter) 
+-    throws IOException {
+-    inWriter_ = createInputWriter();
+-    outReader_ = createOutputReader();
+-    outThread_ = new MROutputThread(outReader_, output, reporter);
+-    outThread_.start();
+-    errThread_ = new MRErrorThread();
+-    errThread_.setReporter(reporter);
+-    errThread_.start();
+-  }
+-  
+-  void waitOutputThreads() throws IOException {
+-    try {
+-      if (outThread_ == null) {
+-        // This happens only when reducer has empty input(So reduce() is not
+-        // called at all in this task). If reducer still generates output,
+-        // which is very uncommon and we may not have to support this case.
+-        // So we don't write this output to HDFS, but we consume/collect
+-        // this output just to avoid reducer hanging forever.
+-
+-        OutputCollector collector = new OutputCollector() {
+-          public void collect(Object key, Object value)
+-            throws IOException {
+-            //just consume it, no need to write the record anywhere
+-          }
+-        };
+-        Reporter reporter = Reporter.NULL;//dummy reporter
+-        startOutputThreads(collector, reporter);
+-      }
+-      int exitVal = sim.waitFor();
+-      // how'd it go?
+-      if (exitVal != 0) {
+-        if (nonZeroExitIsFailure_) {
+-          throw new RuntimeException("PipeMapRed.waitOutputThreads(): subprocess failed with code "
+-                                     + exitVal);
+-        } else {
+-          LOG.info("PipeMapRed.waitOutputThreads(): subprocess exited with " +
+-          		"code " + exitVal + " in " + PipeMapRed.class.getName());
+-        }
+-      }
+-      if (outThread_ != null) {
+-        outThread_.join(joinDelay_);
+-      }
+-      if (errThread_ != null) {
+-        errThread_.join(joinDelay_);
+-      }
+-      if (outerrThreadsThrowable != null) {
+-        throw new RuntimeException(outerrThreadsThrowable);
+-      }
+-    } catch (InterruptedException e) {
+-      //ignore
+-    }
+-  }
+-  
+-  
+-  abstract InputWriter createInputWriter() throws IOException;
+-  
+-  InputWriter createInputWriter(Class<? extends InputWriter> inputWriterClass) 
+-    throws IOException {
+-    InputWriter inputWriter =
+-      ReflectionUtils.newInstance(inputWriterClass, job_);
+-    inputWriter.initialize(this);
+-    return inputWriter;
+-  }
+-
+-  abstract OutputReader createOutputReader() throws IOException;
+-
+-  OutputReader createOutputReader(Class<? extends OutputReader> outputReaderClass) 
+-    throws IOException {
+-    OutputReader outputReader =
+-      ReflectionUtils.newInstance(outputReaderClass, job_);
+-    outputReader.initialize(this);
+-    return outputReader;
+-  }
+-  
+-  
+-  class MROutputThread extends Thread {
+-
+-    MROutputThread(OutputReader outReader, OutputCollector outCollector,
+-      Reporter reporter) {
+-      setDaemon(true);
+-      this.outReader = outReader;
+-      this.outCollector = outCollector;
+-      this.reporter = reporter;
+-    }
+-
+-    public void run() {
+-      try {
+-        // 3/4 Tool to Hadoop
+-        while (outReader.readKeyValue()) {
+-          Object key = outReader.getCurrentKey();
+-          Object value = outReader.getCurrentValue();
+-          outCollector.collect(key, value);
+-          numRecWritten_++;
+-          long now = System.currentTimeMillis();
+-          if (now-lastStdoutReport > reporterOutDelay_) {
+-            lastStdoutReport = now;
+-            String hline = "Records R/W=" + numRecRead_ + "/" + numRecWritten_;
+-            if (!processProvidedStatus_) {
+-              reporter.setStatus(hline);
+-            } else {
+-              reporter.progress();
+-            }
+-            LOG.info(hline);
+-          }
+-        }
+-      } catch (Throwable th) {
+-        outerrThreadsThrowable = th;
+-        LOG.warn("{}", th);
+-      } finally {
+-        try {
+-          if (clientIn_ != null) {
+-            clientIn_.close();
+-            clientIn_ = null;
+-          }
+-        } catch (IOException io) {
+-          LOG.info("{}", io);
+-        }
+-      }
+-    }
+-
+-    OutputReader outReader = null;
+-    OutputCollector outCollector = null;
+-    Reporter reporter = null;
+-    long lastStdoutReport = 0;
+-    
+-  }
+-
+-  class MRErrorThread extends Thread {
+-
+-    public MRErrorThread() {
+-      this.reporterPrefix = job_.get("stream.stderr.reporter.prefix", "reporter:");
+-      this.counterPrefix = reporterPrefix + "counter:";
+-      this.statusPrefix = reporterPrefix + "status:";
+-      setDaemon(true);
+-    }
+-    
+-    public void setReporter(Reporter reporter) {
+-      this.reporter = reporter;
+-    }
+-      
+-    public void run() {
+-      Text line = new Text();
+-      LineReader lineReader = null;
+-      try {
+-        lineReader = new LineReader((InputStream)clientErr_, job_);
+-        while (lineReader.readLine(line) > 0) {
+-          String lineStr = line.toString();
+-          if (matchesReporter(lineStr)) {
+-            if (matchesCounter(lineStr)) {
+-              incrCounter(lineStr);
+-            } else if (matchesStatus(lineStr)) {
+-              processProvidedStatus_ = true;
+-              setStatus(lineStr);
+-            } else {
+-              LOG.warn("Cannot parse reporter line: " + lineStr);
+-            }
+-          } else {
+-            System.err.println(lineStr);
+-          }
+-          long now = System.currentTimeMillis(); 
+-          if (reporter != null && now-lastStderrReport > reporterErrDelay_) {
+-            lastStderrReport = now;
+-            reporter.progress();
+-          }
+-          line.clear();
+-        }
+-        if (lineReader != null) {
+-          lineReader.close();
+-        }
+-        if (clientErr_ != null) {
+-          clientErr_.close();
+-          clientErr_ = null;
+-          LOG.info("MRErrorThread done");
+-        }
+-      } catch (Throwable th) {
+-        outerrThreadsThrowable = th;
+-        LOG.warn("{}", th);
+-        try {
+-          if (lineReader != null) {
+-            lineReader.close();
+-          }
+-          if (clientErr_ != null) {
+-            clientErr_.close();
+-            clientErr_ = null;
+-          }
+-        } catch (IOException io) {
+-          LOG.info("{}", io);
+-        }
+-      }
+-    }
+-    
+-    private boolean matchesReporter(String line) {
+-      return line.startsWith(reporterPrefix);
+-    }
+-
+-    private boolean matchesCounter(String line) {
+-      return line.startsWith(counterPrefix);
+-    }
+-
+-    private boolean matchesStatus(String line) {
+-      return line.startsWith(statusPrefix);
+-    }
+-
+-    private void incrCounter(String line) {
+-      String trimmedLine = line.substring(counterPrefix.length()).trim();
+-      String[] columns = trimmedLine.split(",");
+-      if (columns.length == 3) {
+-        try {
+-          reporter.incrCounter(columns[0], columns[1],
+-              Long.parseLong(columns[2]));
+-        } catch (NumberFormatException e) {
+-          LOG.warn("Cannot parse counter increment '" + columns[2] +
+-              "' from line: " + line);
+-        }
+-      } else {
+-        LOG.warn("Cannot parse counter line: " + line);
+-      }
+-    }
+-
+-    private void setStatus(String line) {
+-      reporter.setStatus(line.substring(statusPrefix.length()).trim());
+-    }
+-    
+-    long lastStderrReport = 0;
+-    volatile Reporter reporter;
+-    private final String reporterPrefix;
+-    private final String counterPrefix;
+-    private final String statusPrefix;
+-  }
+-
+-  public void mapRedFinished() {
+-    try {
+-      if (!doPipe_) {
+-        LOG.info("mapRedFinished");
+-        return;
+-      }
+-      if (clientOut_ != null) {
+-        try {
+-          clientOut_.flush();
+-          clientOut_.close();
+-        } catch (IOException io) {
+-          LOG.warn("{}", io);
+-        }
+-      }
+-      try {
+-        waitOutputThreads();
+-      } catch (IOException io) {
+-        LOG.warn("{}", io);
+-      }
+-      if (sim != null) sim.destroy();
+-      LOG.info("mapRedFinished");
+-    } catch (RuntimeException e) {
+-      LOG.info("PipeMapRed failed!", e);
+-      throw e;
+-    }
+-  }
+-
+-  void maybeLogRecord() {
+-    if (numRecRead_ >= nextRecReadLog_) {
+-      String info = numRecInfo();
+-      LOG.info(info);
+-      if (nextRecReadLog_ < 100000) {
+-	  nextRecReadLog_ *= 10;
+-      } else {
+-	  nextRecReadLog_ += 100000;
+-      }
+-    }
+-  }
+-
+-  public String getContext() {
+-
+-    String s = numRecInfo() + "\n";
+-    s += "minRecWrittenToEnableSkip_=" + minRecWrittenToEnableSkip_ + " ";
+-    s += envline("HOST");
+-    s += envline("USER");
+-    s += envline("HADOOP_USER");
+-    if (outThread_ != null) {
+-      s += "last tool output: |" + outReader_.getLastOutput() + "|\n";
+-    }
+-    return s;
+-  }
+-
+-  String envline(String var) {
+-    return var + "=" + StreamUtil.env().get(var) + "\n";
+-  }
+-
+-  String numRecInfo() {
+-    long elapsed = (System.currentTimeMillis() - startTime_) / 1000;
+-    return "R/W/S=" + numRecRead_ + "/" + numRecWritten_ + "/" + numRecSkipped_ + " in:"
+-      + safeDiv(numRecRead_, elapsed) + " [rec/s]" + " out:" + safeDiv(numRecWritten_, elapsed)
+-      + " [rec/s]";
+-  }
+-
+-  String safeDiv(long n, long d) {
+-    return (d == 0) ? "NA" : "" + n / d + "=" + n + "/" + d;
+-  }
+-
+-  long startTime_;
+-  long numRecRead_ = 0;
+-  long numRecWritten_ = 0;
+-  long numRecSkipped_ = 0;
+-  long nextRecReadLog_ = 1;
+-
+-  long minRecWrittenToEnableSkip_ = Long.MAX_VALUE;
+-
+-  long reporterOutDelay_ = 10*1000L; 
+-  long reporterErrDelay_ = 10*1000L; 
+-  long joinDelay_;
+-  JobConf job_;
+-
+-  boolean doPipe_;
+-
+-  Class<? extends InputWriter> mapInputWriterClass_;
+-  Class<? extends OutputReader> mapOutputReaderClass_;
+-  Class<? extends InputWriter> reduceInputWriterClass_;
+-  Class<? extends OutputReader> reduceOutputReaderClass_;
+-  boolean nonZeroExitIsFailure_;
+-  
+-  Process sim;
+-  InputWriter inWriter_;
+-  OutputReader outReader_;
+-  MROutputThread outThread_;
+-  MRErrorThread errThread_;
+-  DataOutputStream clientOut_;
+-  DataInputStream clientErr_;
+-  DataInputStream clientIn_;
+-
+-  // set in PipeMapper/PipeReducer subclasses
+-  int numExceptions_;
+-
+-  protected volatile Throwable outerrThreadsThrowable;
+-
+-  volatile boolean processProvidedStatus_ = false;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRunner.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRunner.java
+deleted file mode 100644
+index da2790b861e..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapRunner.java
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.apache.hadoop.mapred.MapRunner;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.OutputCollector;
+-
+-import java.io.IOException;
+-
+-public class PipeMapRunner<K1, V1, K2, V2> extends MapRunner<K1, V1, K2, V2> {
+-  public void run(RecordReader<K1, V1> input, OutputCollector<K2, V2> output,
+-                  Reporter reporter)
+-         throws IOException {
+-    PipeMapper pipeMapper = (PipeMapper)getMapper();
+-    pipeMapper.startOutputThreads(output, reporter);
+-    super.run(input, output, reporter);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java
+deleted file mode 100644
+index 438a00057ec..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java
++++ /dev/null
+@@ -1,157 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.net.URLDecoder;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Mapper;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.SkipBadRecords;
+-import org.apache.hadoop.mapred.TextInputFormat;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.streaming.io.InputWriter;
+-import org.apache.hadoop.streaming.io.OutputReader;
+-import org.apache.hadoop.streaming.io.TextInputWriter;
+-
+-/** A generic Mapper bridge.
+- *  It delegates operations to an external program via stdin and stdout.
+- */
+-public class PipeMapper extends PipeMapRed implements Mapper {
+-
+-  private boolean ignoreKey = false;
+-  private boolean skipping = false;
+-
+-  private byte[] mapOutputFieldSeparator;
+-  private byte[] mapInputFieldSeparator;
+-  private int numOfMapOutputKeyFields = 1;
+-  
+-  String getPipeCommand(JobConf job) {
+-    String str = job.get("stream.map.streamprocessor");
+-    if (str == null) {
+-      return str;
+-    }
+-    try {
+-      return URLDecoder.decode(str, "UTF-8");
+-    }
+-    catch (UnsupportedEncodingException e) {
+-      System.err.println("stream.map.streamprocessor in jobconf not found");
+-      return null;
+-    }
+-  }
+-
+-  boolean getDoPipe() {
+-    return true;
+-  }
+-  
+-  public void configure(JobConf job) {
+-    super.configure(job);
+-    //disable the auto increment of the counter. For streaming, no of 
+-    //processed records could be different(equal or less) than the no of 
+-    //records input.
+-    SkipBadRecords.setAutoIncrMapperProcCount(job, false);
+-    skipping = job.getBoolean(MRJobConfig.SKIP_RECORDS, false);
+-    if (mapInputWriterClass_.getCanonicalName().equals(TextInputWriter.class.getCanonicalName())) {
+-      String inputFormatClassName = job.getClass("mapred.input.format.class", TextInputFormat.class).getCanonicalName();
+-      ignoreKey = job.getBoolean("stream.map.input.ignoreKey", 
+-        inputFormatClassName.equals(TextInputFormat.class.getCanonicalName()));
+-    }
+-    
+-    mapOutputFieldSeparator = job.get("stream.map.output.field.separator", "\t")
+-            .getBytes(StandardCharsets.UTF_8);
+-    mapInputFieldSeparator = job.get("stream.map.input.field.separator", "\t")
+-            .getBytes(StandardCharsets.UTF_8);
+-    numOfMapOutputKeyFields = job.getInt("stream.num.map.output.key.fields", 1);
+-  }
+-
+-  // Do NOT declare default constructor
+-  // (MapRed creates it reflectively)
+-
+-  public void map(Object key, Object value, OutputCollector output, Reporter reporter) throws IOException {
+-    if (outerrThreadsThrowable != null) {
+-      mapRedFinished();
+-      throw new IOException("MROutput/MRErrThread failed:",
+-          outerrThreadsThrowable);
+-    }
+-    try {
+-      // 1/4 Hadoop in
+-      numRecRead_++;
+-      maybeLogRecord();
+-
+-      // 2/4 Hadoop to Tool
+-      if (numExceptions_ == 0) {
+-        if (!this.ignoreKey) {
+-          inWriter_.writeKey(key);
+-        }
+-        inWriter_.writeValue(value);
+-        if(skipping) {
+-          //flush the streams on every record input if running in skip mode
+-          //so that we don't buffer other records surrounding a bad record. 
+-          clientOut_.flush();
+-        }
+-      } else {
+-        numRecSkipped_++;
+-      }
+-    } catch (IOException io) {
+-      numExceptions_++;
+-      if (numExceptions_ > 1 || numRecWritten_ < minRecWrittenToEnableSkip_) {
+-        // terminate with failure
+-        LOG.info(getContext() , io);
+-        mapRedFinished();
+-        throw io;
+-      } else {
+-        // terminate with success:
+-        // swallow input records although the stream processor failed/closed
+-      }
+-    }
+-  }
+-
+-  public void close() {
+-    mapRedFinished();
+-  }
+-
+-  @Override
+-  public byte[] getInputSeparator() {
+-    return mapInputFieldSeparator;
+-  }
+-
+-  @Override
+-  public byte[] getFieldSeparator() {
+-    return mapOutputFieldSeparator;
+-  }
+-
+-  @Override
+-  public int getNumOfKeyFields() {
+-    return numOfMapOutputKeyFields;
+-  }
+-
+-  @Override
+-  InputWriter createInputWriter() throws IOException {
+-    return super.createInputWriter(mapInputWriterClass_);
+-  }
+-
+-  @Override
+-  OutputReader createOutputReader() throws IOException {
+-    return super.createOutputReader(mapOutputReaderClass_);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java
+deleted file mode 100644
+index 1f5a247bb2a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java
++++ /dev/null
+@@ -1,161 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-import java.io.UnsupportedEncodingException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Iterator;
+-import java.net.URLDecoder;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.Reducer;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.SkipBadRecords;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.streaming.io.InputWriter;
+-import org.apache.hadoop.streaming.io.OutputReader;
+-
+-import org.apache.hadoop.io.Writable;
+-
+-/** A generic Reducer bridge.
+- *  It delegates operations to an external program via stdin and stdout.
+- */
+-public class PipeReducer extends PipeMapRed implements Reducer {
+-
+-  private byte[] reduceOutFieldSeparator;
+-  private byte[] reduceInputFieldSeparator;
+-  private int numOfReduceOutputKeyFields = 1;
+-  private boolean skipping = false;
+-  
+-  String getPipeCommand(JobConf job) {
+-    String str = job.get("stream.reduce.streamprocessor");
+-    if (str == null) {
+-      return str;
+-    }
+-    try {
+-      return URLDecoder.decode(str, "UTF-8");
+-    } catch (UnsupportedEncodingException e) {
+-      System.err.println("stream.reduce.streamprocessor in jobconf not found");
+-      return null;
+-    }
+-  }
+-
+-  boolean getDoPipe() {
+-    String argv = getPipeCommand(job_);
+-    // Currently: null is identity reduce. REDUCE_NONE is no-map-outputs.
+-    return (argv != null) && !StreamJob.REDUCE_NONE.equals(argv);
+-  }
+-
+-  public void configure(JobConf job) {
+-    super.configure(job);
+-    //disable the auto increment of the counter. For streaming, no of 
+-    //processed records could be different(equal or less) than the no of 
+-    //records input.
+-    SkipBadRecords.setAutoIncrReducerProcCount(job, false);
+-    skipping = job.getBoolean(MRJobConfig.SKIP_RECORDS, false);
+-
+-    reduceOutFieldSeparator = job_.get("stream.reduce.output.field.separator", "\t")
+-            .getBytes(StandardCharsets.UTF_8);
+-    reduceInputFieldSeparator = job_.get("stream.reduce.input.field.separator", "\t")
+-            .getBytes(StandardCharsets.UTF_8);
+-    this.numOfReduceOutputKeyFields = job_.getInt("stream.num.reduce.output.key.fields", 1);
+-  }
+-
+-  public void reduce(Object key, Iterator values, OutputCollector output,
+-                     Reporter reporter) throws IOException {
+-
+-    // init
+-    if (doPipe_ && outThread_ == null) {
+-      startOutputThreads(output, reporter);
+-    }
+-    try {
+-      while (values.hasNext()) {
+-        Writable val = (Writable) values.next();
+-        numRecRead_++;
+-        maybeLogRecord();
+-        if (doPipe_) {
+-          if (outerrThreadsThrowable != null) {
+-            mapRedFinished();
+-            throw new IOException("MROutput/MRErrThread failed:",
+-                outerrThreadsThrowable);
+-          }
+-          inWriter_.writeKey(key);
+-          inWriter_.writeValue(val);
+-        } else {
+-          // "identity reduce"
+-          output.collect(key, val);
+-        }
+-      }
+-      if(doPipe_ && skipping) {
+-        //flush the streams on every record input if running in skip mode
+-        //so that we don't buffer other records surrounding a bad record. 
+-        clientOut_.flush();
+-      }
+-    } catch (IOException io) {
+-      // a common reason to get here is failure of the subprocess.
+-      // Document that fact, if possible.
+-      String extraInfo = "";
+-      try {
+-        int exitVal = sim.exitValue();
+-	if (exitVal == 0) {
+-	  extraInfo = "subprocess exited successfully\n";
+-	} else {
+-	  extraInfo = "subprocess exited with error code " + exitVal + "\n";
+-	};
+-      } catch (IllegalThreadStateException e) {
+-        // hmm, but child is still running.  go figure.
+-	extraInfo = "subprocess still running\n";
+-      };
+-      mapRedFinished();
+-      throw new IOException(extraInfo + getContext() + io.getMessage());
+-    }
+-  }
+-
+-  public void close() {
+-    mapRedFinished();
+-  }
+-
+-  @Override
+-  public byte[] getInputSeparator() {
+-    return reduceInputFieldSeparator;
+-  }
+-
+-  @Override
+-  public byte[] getFieldSeparator() {
+-    return reduceOutFieldSeparator;
+-  }
+-  
+-  @Override
+-  public int getNumOfKeyFields() {
+-    return numOfReduceOutputKeyFields;
+-  }
+-  
+-  @Override
+-  InputWriter createInputWriter() throws IOException {
+-    return super.createInputWriter(reduceInputWriterClass_);
+-  }
+-
+-  @Override
+-  OutputReader createOutputReader() throws IOException {
+-    return super.createOutputReader(reduceOutputReaderClass_);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamBaseRecordReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamBaseRecordReader.java
+deleted file mode 100644
+index c757cf6d464..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamBaseRecordReader.java
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/** 
+- * Shared functionality for hadoopStreaming formats.
+- * A custom reader can be defined to be a RecordReader with the constructor below
+- * and is selected with the option bin/hadoopStreaming -inputreader ...
+- * @see StreamXmlRecordReader 
+- */
+-public abstract class StreamBaseRecordReader implements RecordReader<Text, Text> {
+-
+-  protected static final Logger LOG = LoggerFactory.getLogger(StreamBaseRecordReader.class.getName());
+-
+-  // custom JobConf properties for this class are prefixed with this namespace
+-  final static String CONF_NS = "stream.recordreader.";
+-
+-  public StreamBaseRecordReader(FSDataInputStream in, FileSplit split, Reporter reporter,
+-                                JobConf job, FileSystem fs) throws IOException {
+-    in_ = in;
+-    split_ = split;
+-    start_ = split_.getStart();
+-    length_ = split_.getLength();
+-    end_ = start_ + length_;
+-    splitName_ = split_.getPath().getName();
+-    reporter_ = reporter;
+-    job_ = job;
+-    fs_ = fs;
+-
+-    statusMaxRecordChars_ = job_.getInt(CONF_NS + "statuschars", 200);
+-  }
+-
+-  /// RecordReader API
+-
+-  /** Read a record. Implementation should call numRecStats at the end
+-   */
+-  public abstract boolean next(Text key, Text value) throws IOException;
+-
+-  /** Returns the current position in the input. */
+-  public synchronized long getPos() throws IOException {
+-    return in_.getPos();
+-  }
+-
+-  /** Close this to future operations.*/
+-  public synchronized void close() throws IOException {
+-    in_.close();
+-  }
+-
+-  public float getProgress() throws IOException {
+-    if (end_ == start_) {
+-      return 1.0f;
+-    } else {
+-      return ((float)(in_.getPos() - start_)) / ((float)(end_ - start_));
+-    }
+-  }
+-  
+-  public Text createKey() {
+-    return new Text();
+-  }
+-
+-  public Text createValue() {
+-    return new Text();
+-  }
+-
+-  /// StreamBaseRecordReader API
+-
+-  /** Implementation should seek forward in_ to the first byte of the next record.
+-   *  The initial byte offset in the stream is arbitrary.
+-   */
+-  public abstract void seekNextRecordBoundary() throws IOException;
+-
+-  void numRecStats(byte[] record, int start, int len) throws IOException {
+-    numRec_++;
+-    if (numRec_ == nextStatusRec_) {
+-      String recordStr = new String(record, start,
+-              Math.min(len, statusMaxRecordChars_), StandardCharsets.UTF_8);
+-      nextStatusRec_ += 100;//*= 10;
+-      String status = getStatus(recordStr);
+-      LOG.info(status);
+-      reporter_.setStatus(status);
+-    }
+-  }
+-
+-  long lastMem = 0;
+-
+-  String getStatus(CharSequence record) {
+-    long pos = -1;
+-    try {
+-      pos = getPos();
+-    } catch (IOException io) {
+-    }
+-    String recStr;
+-    if (record.length() > statusMaxRecordChars_) {
+-      recStr = record.subSequence(0, statusMaxRecordChars_) + "...";
+-    } else {
+-      recStr = record.toString();
+-    }
+-    String unqualSplit = split_.getPath().getName() + ":" +
+-                         split_.getStart() + "+" + split_.getLength();
+-    String status = "HSTR " + StreamUtil.getHost() + " " + numRec_ + ". pos=" + pos + " " + unqualSplit
+-      + " Processing record=" + recStr;
+-    status += " " + splitName_;
+-    return status;
+-  }
+-
+-  FSDataInputStream in_;
+-  FileSplit split_;
+-  long start_;
+-  long end_;
+-  long length_;
+-  String splitName_;
+-  Reporter reporter_;
+-  JobConf job_;
+-  FileSystem fs_;
+-  int numRec_ = 0;
+-  int nextStatusRec_ = 1;
+-  int statusMaxRecordChars_;
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamInputFormat.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamInputFormat.java
+deleted file mode 100644
+index 984c9651e5a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamInputFormat.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.lang.reflect.*;
+-
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.io.Text;
+-
+-import org.apache.hadoop.mapred.*;
+-
+-/** An input format that selects a RecordReader based on a JobConf property.
+- *  This should be used only for non-standard record reader such as 
+- *  StreamXmlRecordReader. For all other standard 
+- *  record readers, the appropriate input format classes should be used.
+- */
+-public class StreamInputFormat extends KeyValueTextInputFormat {
+-
+-  @SuppressWarnings("unchecked")
+-  public RecordReader<Text, Text> getRecordReader(final InputSplit genericSplit,
+-                                      JobConf job, Reporter reporter) throws IOException {
+-    String c = job.get("stream.recordreader.class");
+-    if (c == null || c.indexOf("LineRecordReader") >= 0) {
+-      return super.getRecordReader(genericSplit, job, reporter);
+-    }
+-
+-    // handling non-standard record reader (likely StreamXmlRecordReader) 
+-    FileSplit split = (FileSplit) genericSplit;
+-    LOG.info("getRecordReader start.....split=" + split);
+-    reporter.setStatus(split.toString());
+-
+-    // Open the file and seek to the start of the split
+-    FileSystem fs = split.getPath().getFileSystem(job);
+-    FSDataInputStream in = fs.open(split.getPath());
+-
+-    // Factory dispatch based on available params..
+-    Class readerClass;
+-
+-    {
+-      readerClass = StreamUtil.goodClassOrNull(job, c, null);
+-      if (readerClass == null) {
+-        throw new RuntimeException("Class not found: " + c);
+-      }
+-    }
+-
+-    Constructor ctor;
+-    try {
+-      ctor = readerClass.getConstructor(new Class[] { FSDataInputStream.class,
+-                                                      FileSplit.class, Reporter.class, JobConf.class, FileSystem.class });
+-    } catch (NoSuchMethodException nsm) {
+-      throw new RuntimeException(nsm);
+-    }
+-
+-    RecordReader<Text, Text> reader;
+-    try {
+-      reader = (RecordReader<Text, Text>) ctor.newInstance(new Object[] { in, split,
+-                                                              reporter, job, fs });
+-    } catch (Exception nsm) {
+-      throw new RuntimeException(nsm);
+-    }
+-    return reader;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
+deleted file mode 100644
+index 023371ce994..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
++++ /dev/null
+@@ -1,1105 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.net.URI;
+-import java.net.URLEncoder;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.TreeMap;
+-import java.util.TreeSet;
+-
+-import org.apache.commons.cli.BasicParser;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.CommandLineParser;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.MRConfig;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.filecache.DistributedCache;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.FileAlreadyExistsException;
+-import org.apache.hadoop.mapred.FileInputFormat;
+-import org.apache.hadoop.mapred.FileOutputFormat;
+-import org.apache.hadoop.mapred.InvalidJobConfException;
+-import org.apache.hadoop.mapred.JobClient;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.JobID;
+-import org.apache.hadoop.mapred.KeyValueTextInputFormat;
+-import org.apache.hadoop.mapred.RunningJob;
+-import org.apache.hadoop.mapred.SequenceFileAsTextInputFormat;
+-import org.apache.hadoop.mapred.SequenceFileInputFormat;
+-import org.apache.hadoop.mapred.TextInputFormat;
+-import org.apache.hadoop.mapred.TextOutputFormat;
+-import org.apache.hadoop.mapred.lib.LazyOutputFormat;
+-import org.apache.hadoop.mapred.lib.aggregate.ValueAggregatorCombiner;
+-import org.apache.hadoop.mapred.lib.aggregate.ValueAggregatorReducer;
+-import org.apache.hadoop.security.AccessControlException;
+-import org.apache.hadoop.streaming.io.IdentifierResolver;
+-import org.apache.hadoop.streaming.io.InputWriter;
+-import org.apache.hadoop.streaming.io.OutputReader;
+-import org.apache.hadoop.util.GenericOptionsParser;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.RunJar;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.Tool;
+-
+-import static org.apache.hadoop.util.RunJar.MATCH_ANY;
+-
+-/** All the client-side work happens here.
+- * (Jar packaging, MapRed job submission and monitoring)
+- */
+-public class StreamJob implements Tool {
+-
+-  protected static final Logger LOG = LoggerFactory.getLogger(StreamJob.class.getName());
+-  final static String REDUCE_NONE = "NONE";
+-
+-  /** -----------Streaming CLI Implementation  **/
+-  private CommandLineParser parser = new BasicParser();
+-  private Options allOptions;
+-  /**@deprecated use StreamJob() with ToolRunner or set the
+-   * Configuration using {@link #setConf(Configuration)} and
+-   * run with {@link #run(String[])}.
+-   */
+-  @Deprecated
+-  public StreamJob(String[] argv, boolean mayExit) {
+-    this();
+-    argv_ = Arrays.copyOf(argv, argv.length);
+-    this.config_ = new Configuration();
+-  }
+-
+-  public StreamJob() {
+-    setupOptions();
+-    this.config_ = new Configuration();
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return config_;
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.config_ = conf;
+-  }
+-
+-  @Override
+-  public int run(String[] args) throws Exception {
+-    try {
+-      this.argv_ = Arrays.copyOf(args, args.length);
+-      init();
+-
+-      preProcessArgs();
+-      parseArgv();
+-      if (printUsage) {
+-        printUsage(detailedUsage_);
+-        return 0;
+-      }
+-      postProcessArgs();
+-
+-      setJobConf();
+-    } catch (IllegalArgumentException ex) {
+-      //ignore, since log will already be printed
+-      // print the log in debug mode.
+-      LOG.debug("Error in streaming job", ex);
+-      return 1;
+-    }
+-    return submitAndMonitorJob();
+-  }
+-
+-  /**
+-   * This method creates a streaming job from the given argument list.
+-   * The created object can be used and/or submitted to a jobtracker for
+-   * execution by a job agent such as JobControl
+-   * @param argv the list args for creating a streaming job
+-   * @return the created JobConf object
+-   * @throws IOException
+-   */
+-  static public JobConf createJob(String[] argv) throws IOException {
+-    StreamJob job = new StreamJob();
+-    job.argv_ = argv;
+-    job.init();
+-    job.preProcessArgs();
+-    job.parseArgv();
+-    job.postProcessArgs();
+-    job.setJobConf();
+-    return job.jobConf_;
+-  }
+-
+-  /**
+-   * This is the method that actually
+-   * initializes the job conf and submits the job
+-   * to the jobtracker
+-   * @throws IOException
+-   * @deprecated use {@link #run(String[])} instead.
+-   */
+-  @Deprecated
+-  public int go() throws IOException {
+-    try {
+-      return run(argv_);
+-    }
+-    catch (Exception ex) {
+-      throw new IOException(ex.getMessage());
+-    }
+-  }
+-
+-  protected void init() {
+-    try {
+-      env_ = new Environment();
+-    } catch (IOException io) {
+-      throw new RuntimeException(io);
+-    }
+-  }
+-
+-  void preProcessArgs() {
+-    verbose_ = false;
+-    // Unset HADOOP_ROOT_LOGGER in case streaming job
+-    // invokes additional hadoop commands.
+-    addTaskEnvironment_ = "HADOOP_ROOT_LOGGER=";
+-  }
+-
+-  void postProcessArgs() throws IOException {
+-
+-    if (inputSpecs_.size() == 0) {
+-      fail("Required argument: -input <name>");
+-    }
+-    if (output_ == null) {
+-      fail("Required argument: -output ");
+-    }
+-    msg("addTaskEnvironment=" + addTaskEnvironment_);
+-
+-    for (final String packageFile : packageFiles_) {
+-      File f = new File(packageFile);
+-      if (f.isFile()) {
+-        shippedCanonFiles_.add(f.getCanonicalPath());
+-      }
+-    }
+-    msg("shippedCanonFiles_=" + shippedCanonFiles_);
+-
+-    // careful with class names..
+-    mapCmd_ = unqualifyIfLocalPath(mapCmd_);
+-    comCmd_ = unqualifyIfLocalPath(comCmd_);
+-    redCmd_ = unqualifyIfLocalPath(redCmd_);
+-  }
+-
+-  String unqualifyIfLocalPath(String cmd) throws IOException {
+-    if (cmd == null) {
+-      //
+-    } else {
+-      String prog = cmd;
+-      String args = "";
+-      int s = cmd.indexOf(" ");
+-      if (s != -1) {
+-        prog = cmd.substring(0, s);
+-        args = cmd.substring(s + 1);
+-      }
+-      String progCanon;
+-      try {
+-        progCanon = new File(prog).getCanonicalPath();
+-      } catch (IOException io) {
+-        progCanon = prog;
+-      }
+-      boolean shipped = shippedCanonFiles_.contains(progCanon);
+-      msg("shipped: " + shipped + " " + progCanon);
+-      if (shipped) {
+-        // Change path to simple filename.
+-        // That way when PipeMapRed calls Runtime.exec(),
+-        // it will look for the excutable in Task's working dir.
+-        // And this is where TaskRunner unjars our job jar.
+-        prog = new File(prog).getName();
+-        if (args.length() > 0) {
+-          cmd = prog + " " + args;
+-        } else {
+-          cmd = prog;
+-        }
+-      }
+-    }
+-    msg("cmd=" + cmd);
+-    return cmd;
+-  }
+-
+-  void parseArgv() {
+-    CommandLine cmdLine = null;
+-    try {
+-      cmdLine = parser.parse(allOptions, argv_);
+-    } catch(Exception oe) {
+-      LOG.error(oe.getMessage());
+-      exitUsage(argv_.length > 0 && "-info".equals(argv_[0]));
+-    }
+-
+-    if (cmdLine != null) {
+-      @SuppressWarnings("unchecked")
+-      List<String> args = cmdLine.getArgList();
+-      if(args != null && args.size() > 0) {
+-        fail("Found " + args.size() + " unexpected arguments on the " +
+-            "command line " + args);
+-      }
+-      
+-      detailedUsage_ = cmdLine.hasOption("info");
+-      if (cmdLine.hasOption("help") || detailedUsage_) {
+-        printUsage = true;
+-        return;
+-      }
+-      verbose_ =  cmdLine.hasOption("verbose");
+-      background_ =  cmdLine.hasOption("background");
+-      debug_ = cmdLine.hasOption("debug")? debug_ + 1 : debug_;
+-
+-      String[] values = cmdLine.getOptionValues("input");
+-      if (values != null && values.length > 0) {
+-        for (String input : values) {
+-          inputSpecs_.add(input);
+-        }
+-      }
+-      output_ =  cmdLine.getOptionValue("output");
+-
+-      mapCmd_ = cmdLine.getOptionValue("mapper");
+-      comCmd_ = cmdLine.getOptionValue("combiner");
+-      redCmd_ = cmdLine.getOptionValue("reducer");
+-
+-      lazyOutput_ = cmdLine.hasOption("lazyOutput");
+-
+-      values = cmdLine.getOptionValues("file");
+-      if (values != null && values.length > 0) {
+-        LOG.warn("-file option is deprecated, please use generic option" +
+-        		" -files instead.");
+-
+-        StringBuffer fileList = new StringBuffer();
+-        for (String file : values) {
+-          packageFiles_.add(file);
+-          try {
+-            Path path = new Path(file);
+-            FileSystem localFs = FileSystem.getLocal(config_);
+-            Path qualifiedPath = path.makeQualified(
+-                localFs.getUri(), localFs.getWorkingDirectory());
+-            validate(qualifiedPath);
+-            String finalPath = qualifiedPath.toString();
+-            if(fileList.length() > 0) {
+-              fileList.append(',');
+-            }
+-            fileList.append(finalPath);
+-          } catch (Exception e) {
+-            throw new IllegalArgumentException(e);
+-          }
+-        }
+-        String tmpFiles = config_.get("tmpfiles", "");
+-        if (tmpFiles.isEmpty()) {
+-          tmpFiles = fileList.toString();
+-        } else {
+-          tmpFiles = tmpFiles + "," + fileList;
+-        }
+-        config_.set("tmpfiles", tmpFiles);
+-      }
+-
+-      String fsName = cmdLine.getOptionValue("dfs");
+-      if (null != fsName){
+-        LOG.warn("-dfs option is deprecated, please use -fs instead.");
+-        config_.set("fs.default.name", fsName);
+-      }
+-
+-      additionalConfSpec_ = cmdLine.getOptionValue("additionalconfspec");
+-      inputFormatSpec_ = cmdLine.getOptionValue("inputformat");
+-      outputFormatSpec_ = cmdLine.getOptionValue("outputformat");
+-      numReduceTasksSpec_ = cmdLine.getOptionValue("numReduceTasks");
+-      partitionerSpec_ = cmdLine.getOptionValue("partitioner");
+-      inReaderSpec_ = cmdLine.getOptionValue("inputreader");
+-      mapDebugSpec_ = cmdLine.getOptionValue("mapdebug");
+-      reduceDebugSpec_ = cmdLine.getOptionValue("reducedebug");
+-      ioSpec_ = cmdLine.getOptionValue("io");
+-
+-      String[] car = cmdLine.getOptionValues("cacheArchive");
+-      if (null != car && car.length > 0){
+-        LOG.warn("-cacheArchive option is deprecated, please use -archives instead.");
+-        for(String s : car){
+-          cacheArchives = (cacheArchives == null)?s :cacheArchives + "," + s;
+-        }
+-      }
+-
+-      String[] caf = cmdLine.getOptionValues("cacheFile");
+-      if (null != caf && caf.length > 0){
+-        LOG.warn("-cacheFile option is deprecated, please use -files instead.");
+-        for(String s : caf){
+-          cacheFiles = (cacheFiles == null)?s :cacheFiles + "," + s;
+-        }
+-      }
+-
+-      String[] jobconf = cmdLine.getOptionValues("jobconf");
+-      if (null != jobconf && jobconf.length > 0){
+-        LOG.warn("-jobconf option is deprecated, please use -D instead.");
+-        for(String s : jobconf){
+-          String[] parts = s.split("=", 2);
+-          config_.set(parts[0], parts[1]);
+-        }
+-      }
+-
+-      String[] cmd = cmdLine.getOptionValues("cmdenv");
+-      if (null != cmd && cmd.length > 0){
+-        for(String s : cmd) {
+-          if (addTaskEnvironment_.length() > 0) {
+-            addTaskEnvironment_ += " ";
+-          }
+-          addTaskEnvironment_ += s;
+-        }
+-      }
+-    } else {
+-      exitUsage(argv_.length > 0 && "-info".equals(argv_[0]));
+-    }
+-  }
+-
+-  protected void msg(String msg) {
+-    if (verbose_) {
+-      System.out.println("STREAM: " + msg);
+-    }
+-  }
+-
+-  private Option createOption(String name, String desc,
+-                              String argName, int max, boolean required){
+-    return Option.builder(name)
+-           .argName(argName)
+-           .hasArgs()
+-           .numberOfArgs(max)
+-           .desc(desc)
+-           .required(required)
+-           .build();
+-  }
+-
+-  private Option createBoolOption(String name, String desc){
+-    return Option.builder(name).desc(desc).build();
+-  }
+-
+-  private void validate(final Path path) throws IOException {
+-    try {
+-      path.getFileSystem(config_).access(path, FsAction.READ);
+-    } catch (FileNotFoundException e) {
+-      fail("File: " + path + " does not exist.");
+-    } catch (AccessControlException e) {
+-      fail("File: " + path + " is not readable.");
+-    }
+-  }
+-
+-  private void setupOptions(){
+-
+-    // input and output are not required for -info and -help options,
+-    // though they are required for streaming job to be run.
+-    Option input   = createOption("input",
+-                                  "DFS input file(s) for the Map step",
+-                                  "path",
+-                                  Integer.MAX_VALUE,
+-                                  false);
+-
+-    Option output  = createOption("output",
+-                                  "DFS output directory for the Reduce step",
+-                                  "path", 1, false);
+-    Option mapper  = createOption("mapper",
+-                                  "The streaming command to run", "cmd", 1, false);
+-    Option combiner = createOption("combiner",
+-                                   "The streaming command to run", "cmd", 1, false);
+-    // reducer could be NONE
+-    Option reducer = createOption("reducer",
+-                                  "The streaming command to run", "cmd", 1, false);
+-    Option file = createOption("file",
+-                               "File to be shipped in the Job jar file",
+-                               "file", Integer.MAX_VALUE, false);
+-    Option dfs = createOption("dfs",
+-                              "Optional. Override DFS configuration", "<h:p>|local", 1, false);
+-    Option additionalconfspec = createOption("additionalconfspec",
+-                                             "Optional.", "spec", 1, false);
+-    Option inputformat = createOption("inputformat",
+-                                      "Optional.", "spec", 1, false);
+-    Option outputformat = createOption("outputformat",
+-                                       "Optional.", "spec", 1, false);
+-    Option partitioner = createOption("partitioner",
+-                                      "Optional.", "spec", 1, false);
+-    Option numReduceTasks = createOption("numReduceTasks",
+-        "Optional.", "spec",1, false );
+-    Option inputreader = createOption("inputreader",
+-                                      "Optional.", "spec", 1, false);
+-    Option mapDebug = createOption("mapdebug",
+-                                   "Optional.", "spec", 1, false);
+-    Option reduceDebug = createOption("reducedebug",
+-                                      "Optional", "spec",1, false);
+-    Option jobconf =
+-      createOption("jobconf",
+-                   "(n=v) Optional. Add or override a JobConf property.",
+-                   "spec", 1, false);
+-
+-    Option cmdenv =
+-      createOption("cmdenv", "(n=v) Pass env.var to streaming commands.",
+-                   "spec", 1, false);
+-    Option cacheFile = createOption("cacheFile",
+-                                    "File name URI", "fileNameURI", Integer.MAX_VALUE, false);
+-    Option cacheArchive = createOption("cacheArchive",
+-                                       "File name URI", "fileNameURI", Integer.MAX_VALUE, false);
+-    Option io = createOption("io",
+-                             "Optional.", "spec", 1, false);
+-
+-    // boolean properties
+-
+-    Option background = createBoolOption("background", "Submit the job and don't wait till it completes.");
+-    Option verbose = createBoolOption("verbose", "print verbose output");
+-    Option info = createBoolOption("info", "print verbose output");
+-    Option help = createBoolOption("help", "print this help message");
+-    Option debug = createBoolOption("debug", "print debug output");
+-    Option lazyOutput = createBoolOption("lazyOutput", "create outputs lazily");
+-
+-    allOptions = new Options().
+-      addOption(input).
+-      addOption(output).
+-      addOption(mapper).
+-      addOption(combiner).
+-      addOption(reducer).
+-      addOption(file).
+-      addOption(dfs).
+-      addOption(additionalconfspec).
+-      addOption(inputformat).
+-      addOption(outputformat).
+-      addOption(partitioner).
+-      addOption(numReduceTasks).
+-      addOption(inputreader).
+-      addOption(mapDebug).
+-      addOption(reduceDebug).
+-      addOption(jobconf).
+-      addOption(cmdenv).
+-      addOption(cacheFile).
+-      addOption(cacheArchive).
+-      addOption(io).
+-      addOption(background).
+-      addOption(verbose).
+-      addOption(info).
+-      addOption(debug).
+-      addOption(help).
+-      addOption(lazyOutput);
+-  }
+-
+-  public void exitUsage(boolean detailed) {
+-    printUsage(detailed);
+-    fail("");
+-  }
+-
+-  private void printUsage(boolean detailed) {
+-    System.out.println("Usage: $HADOOP_HOME/bin/hadoop jar hadoop-streaming.jar"
+-        + " [options]");
+-    System.out.println("Options:");
+-    System.out.println("  -input          <path> DFS input file(s) for the Map"
+-        + " step.");
+-    System.out.println("  -output         <path> DFS output directory for the"
+-        + " Reduce step.");
+-    System.out.println("  -mapper         <cmd|JavaClassName> Optional. Command"
+-        + " to be run as mapper.");
+-    System.out.println("  -combiner       <cmd|JavaClassName> Optional. Command"
+-        + " to be run as combiner.");
+-    System.out.println("  -reducer        <cmd|JavaClassName> Optional. Command"
+-        + " to be run as reducer.");
+-    System.out.println("  -file           <file> Optional. File/dir to be "
+-        + "shipped in the Job jar file.\n" +
+-        "                  Deprecated. Use generic option \"-files\" instead.");
+-    System.out.println("  -inputformat    <TextInputFormat(default)"
+-        + "|SequenceFileAsTextInputFormat|JavaClassName>\n"
+-        + "                  Optional. The input format class.");
+-    System.out.println("  -outputformat   <TextOutputFormat(default)"
+-        + "|JavaClassName>\n"
+-        + "                  Optional. The output format class.");
+-    System.out.println("  -partitioner    <JavaClassName>  Optional. The"
+-        + " partitioner class.");
+-    System.out.println("  -numReduceTasks <num> Optional. Number of reduce "
+-        + "tasks.");
+-    System.out.println("  -inputreader    <spec> Optional. Input recordreader"
+-        + " spec.");
+-    System.out.println("  -cmdenv         <n>=<v> Optional. Pass env.var to"
+-        + " streaming commands.");
+-    System.out.println("  -mapdebug       <cmd> Optional. "
+-        + "To run this script when a map task fails.");
+-    System.out.println("  -reducedebug    <cmd> Optional."
+-        + " To run this script when a reduce task fails.");
+-    System.out.println("  -io             <identifier> Optional. Format to use"
+-        + " for input to and output");
+-    System.out.println("                  from mapper/reducer commands");
+-    System.out.println("  -lazyOutput     Optional. Lazily create Output.");
+-    System.out.println("  -background     Optional. Submit the job and don't wait till it completes.");
+-    System.out.println("  -verbose        Optional. Print verbose output.");
+-    System.out.println("  -info           Optional. Print detailed usage.");
+-    System.out.println("  -help           Optional. Print help message.");
+-    System.out.println();
+-    GenericOptionsParser.printGenericCommandUsage(System.out);
+-
+-    if (!detailed) {
+-      System.out.println();
+-      System.out.println("For more details about these options:");
+-      System.out.println("Use " +
+-          "$HADOOP_HOME/bin/hadoop jar hadoop-streaming.jar -info");
+-      return;
+-    }
+-    System.out.println();
+-    System.out.println("Usage tips:");
+-    System.out.println("In -input: globbing on <path> is supported and can "
+-        + "have multiple -input");
+-    System.out.println();
+-    System.out.println("Default Map input format: a line is a record in UTF-8 "
+-        + "the key part ends at first");
+-    System.out.println("  TAB, the rest of the line is the value");
+-    System.out.println();
+-    System.out.println("To pass a Custom input format:");
+-    System.out.println("  -inputformat package.MyInputFormat");
+-    System.out.println();
+-    System.out.println("Similarly, to pass a custom output format:");
+-    System.out.println("  -outputformat package.MyOutputFormat");
+-    System.out.println();
+-    System.out.println("The files with extensions .class and .jar/.zip," +
+-        " specified for the -file");
+-    System.out.println("  argument[s], end up in \"classes\" and \"lib\" " +
+-        "directories respectively inside");
+-    System.out.println("  the working directory when the mapper and reducer are"
+-        + " run. All other files");
+-    System.out.println("  specified for the -file argument[s]" +
+-        " end up in the working directory when the");
+-    System.out.println("  mapper and reducer are run. The location of this " +
+-        "working directory is");
+-    System.out.println("  unspecified.");
+-    System.out.println();
+-    System.out.println("To set the number of reduce tasks (num. of output " +
+-        "files) as, say 10:");
+-    System.out.println("  Use -numReduceTasks 10");
+-    System.out.println("To skip the sort/combine/shuffle/sort/reduce step:");
+-    System.out.println("  Use -numReduceTasks 0");
+-    System.out.println("  Map output then becomes a 'side-effect " +
+-        "output' rather than a reduce input.");
+-    System.out.println("  This speeds up processing. This also feels " +
+-        "more like \"in-place\" processing");
+-    System.out.println("  because the input filename and the map " +
+-        "input order are preserved.");
+-    System.out.println("  This is equivalent to -reducer NONE");
+-    System.out.println();
+-    System.out.println("To speed up the last maps:");
+-    System.out.println("  -D " + MRJobConfig.MAP_SPECULATIVE + "=true");
+-    System.out.println("To speed up the last reduces:");
+-    System.out.println("  -D " + MRJobConfig.REDUCE_SPECULATIVE + "=true");
+-    System.out.println("To name the job (appears in the JobTracker Web UI):");
+-    System.out.println("  -D " + MRJobConfig.JOB_NAME + "='My Job'");
+-    System.out.println("To change the local temp directory:");
+-    System.out.println("  -D dfs.data.dir=/tmp/dfs");
+-    System.out.println("  -D stream.tmpdir=/tmp/streaming");
+-    System.out.println("Additional local temp directories with -jt local:");
+-    System.out.println("  -D " + MRConfig.LOCAL_DIR + "=/tmp/local");
+-    System.out.println("  -D " + JTConfig.JT_SYSTEM_DIR + "=/tmp/system");
+-    System.out.println("  -D " + MRConfig.TEMP_DIR + "=/tmp/temp");
+-    System.out.println("To treat tasks with non-zero exit status as SUCCEDED:");
+-    System.out.println("  -D stream.non.zero.exit.is.failure=false");
+-    System.out.println("Use a custom hadoop streaming build along with standard"
+-        + " hadoop install:");
+-    System.out.println("  $HADOOP_HOME/bin/hadoop jar " +
+-        "/path/my-hadoop-streaming.jar [...]\\");
+-    System.out.println("    [...] -D stream.shipped.hadoopstreaming=" +
+-        "/path/my-hadoop-streaming.jar");
+-    System.out.println("For more details about jobconf parameters see:");
+-    System.out.println("  http://wiki.apache.org/hadoop/JobConfFile");
+-    System.out.println("Truncate the values of the job configuration copied" +
+-        "to the environment at the given length:");
+-    System.out.println("   -D stream.jobconf.truncate.limit=-1");
+-    System.out.println("To set an environment variable in a streaming " +
+-        "command:");
+-    System.out.println("   -cmdenv EXAMPLE_DIR=/home/example/dictionaries/");
+-    System.out.println();
+-    System.out.println("Shortcut:");
+-    System.out.println("   setenv HSTREAMING \"$HADOOP_HOME/bin/hadoop jar " +
+-        "hadoop-streaming.jar\"");
+-    System.out.println();
+-    System.out.println("Example: $HSTREAMING -mapper " +
+-        "\"/usr/local/bin/perl5 filter.pl\"");
+-    System.out.println("           -file /local/filter.pl -input " +
+-        "\"/logs/0604*/*\" [...]");
+-    System.out.println("  Ships a script, invokes the non-shipped perl " +
+-        "interpreter. Shipped files go to");
+-    System.out.println("  the working directory so filter.pl is found by perl. "
+-        + "Input files are all the");
+-    System.out.println("  daily logs for days in month 2006-04");
+-  }
+-
+-  public void fail(String message) {
+-    System.err.println(message);
+-    System.err.println("Try -help for more information");
+-    throw new IllegalArgumentException(message);
+-  }
+-
+-  // --------------------------------------------
+-
+-  protected String getHadoopClientHome() {
+-    String h = env_.getProperty("HADOOP_HOME"); // standard Hadoop
+-    if (h == null) {
+-      //fail("Missing required environment variable: HADOOP_HOME");
+-      h = "UNDEF";
+-    }
+-    return h;
+-  }
+-
+-  protected boolean isLocalHadoop() {
+-    return StreamUtil.isLocalJobTracker(jobConf_);
+-  }
+-
+-  @Deprecated
+-  protected String getClusterNick() {
+-    return "default";
+-  }
+-
+-  /** @return path to the created Jar file or null if no files are necessary.
+-   */
+-  protected String packageJobJar() throws IOException {
+-    ArrayList<String> unjarFiles = new ArrayList<String>();
+-
+-    // Runtime code: ship same version of code as self (job submitter code)
+-    // usually found in: build/contrib or build/hadoop-<version>-dev-streaming.jar
+-
+-    // First try an explicit spec: it's too hard to find our own location in this case:
+-    // $HADOOP_HOME/bin/hadoop jar /not/first/on/classpath/custom-hadoop-streaming.jar
+-    // where findInClasspath() would find the version of hadoop-streaming.jar in $HADOOP_HOME
+-    String runtimeClasses = config_.get("stream.shipped.hadoopstreaming"); // jar or class dir
+-
+-    if (runtimeClasses == null) {
+-      runtimeClasses = StreamUtil.findInClasspath(StreamJob.class.getName());
+-    }
+-    if (runtimeClasses == null) {
+-      throw new IOException("runtime classes not found: " + getClass().getPackage());
+-    } else {
+-      msg("Found runtime classes in: " + runtimeClasses);
+-    }
+-    if (isLocalHadoop()) {
+-      // don't package class files (they might get unpackaged in "." and then
+-      //  hide the intended CLASSPATH entry)
+-      // we still package everything else (so that scripts and executable are found in
+-      //  Task workdir like distributed Hadoop)
+-    } else {
+-      if (new File(runtimeClasses).isDirectory()) {
+-        packageFiles_.add(runtimeClasses);
+-      } else {
+-        unjarFiles.add(runtimeClasses);
+-      }
+-    }
+-    if (packageFiles_.size() + unjarFiles.size() == 0) {
+-      return null;
+-    }
+-    String tmp = jobConf_.get("stream.tmpdir"); //, "/tmp/${mapreduce.job.user.name}/"
+-    File tmpDir = (tmp == null) ? null : new File(tmp);
+-    // tmpDir=null means OS default tmp dir
+-    File jobJar = File.createTempFile("streamjob", ".jar", tmpDir);
+-    System.out.println("packageJobJar: " + packageFiles_ + " " + unjarFiles + " " + jobJar
+-                       + " tmpDir=" + tmpDir);
+-    if (debug_ == 0) {
+-      jobJar.deleteOnExit();
+-    }
+-    JarBuilder builder = new JarBuilder();
+-    if (verbose_) {
+-      builder.setVerbose(true);
+-    }
+-    String jobJarName = jobJar.getAbsolutePath();
+-    builder.merge(packageFiles_, unjarFiles, jobJarName);
+-    return jobJarName;
+-  }
+-
+-  /**
+-   * get the uris of all the files/caches
+-   */
+-  protected void getURIs(String lcacheArchives, String lcacheFiles) {
+-    String archives[] = StringUtils.getStrings(lcacheArchives);
+-    String files[] = StringUtils.getStrings(lcacheFiles);
+-    fileURIs = StringUtils.stringToURI(files);
+-    archiveURIs = StringUtils.stringToURI(archives);
+-  }
+-
+-  protected void setJobConf() throws IOException {
+-    if (additionalConfSpec_ != null) {
+-      LOG.warn("-additionalconfspec option is deprecated, please use -conf instead.");
+-      config_.addResource(new Path(additionalConfSpec_));
+-    }
+-
+-    // general MapRed job properties
+-    jobConf_ = new JobConf(config_, StreamJob.class);
+-
+-    // All streaming jobs get the task timeout value
+-    // from the configuration settings.
+-
+-    // The correct FS must be set before this is called!
+-    // (to resolve local vs. dfs drive letter differences)
+-    // (mapreduce.job.working.dir will be lazily initialized ONCE and depends on FS)
+-    for (int i = 0; i < inputSpecs_.size(); i++) {
+-      FileInputFormat.addInputPaths(jobConf_,
+-                        (String) inputSpecs_.get(i));
+-    }
+-
+-    String defaultPackage = this.getClass().getPackage().getName();
+-    Class c;
+-    Class fmt = null;
+-    if (inReaderSpec_ == null && inputFormatSpec_ == null) {
+-      fmt = TextInputFormat.class;
+-    } else if (inputFormatSpec_ != null) {
+-      if (inputFormatSpec_.equals(TextInputFormat.class.getName())
+-          || inputFormatSpec_.equals(TextInputFormat.class.getCanonicalName())
+-          || inputFormatSpec_.equals(TextInputFormat.class.getSimpleName())) {
+-        fmt = TextInputFormat.class;
+-      } else if (inputFormatSpec_.equals(KeyValueTextInputFormat.class
+-          .getName())
+-          || inputFormatSpec_.equals(KeyValueTextInputFormat.class
+-              .getCanonicalName())
+-          || inputFormatSpec_.equals(KeyValueTextInputFormat.class.getSimpleName())) {
+-        if (inReaderSpec_ == null) {
+-          fmt = KeyValueTextInputFormat.class;
+-        }
+-      } else if (inputFormatSpec_.equals(SequenceFileInputFormat.class
+-          .getName())
+-          || inputFormatSpec_
+-              .equals(org.apache.hadoop.mapred.SequenceFileInputFormat.class
+-                  .getCanonicalName())
+-          || inputFormatSpec_
+-              .equals(org.apache.hadoop.mapred.SequenceFileInputFormat.class.getSimpleName())) {
+-        if (inReaderSpec_ == null) {
+-          fmt = SequenceFileInputFormat.class;
+-        }
+-      } else if (inputFormatSpec_.equals(SequenceFileAsTextInputFormat.class
+-          .getName())
+-          || inputFormatSpec_.equals(SequenceFileAsTextInputFormat.class
+-              .getCanonicalName())
+-          || inputFormatSpec_.equals(SequenceFileAsTextInputFormat.class.getSimpleName())) {
+-        fmt = SequenceFileAsTextInputFormat.class;
+-      } else {
+-        c = StreamUtil.goodClassOrNull(jobConf_, inputFormatSpec_, defaultPackage);
+-        if (c != null) {
+-          fmt = c;
+-        } else {
+-          fail("-inputformat : class not found : " + inputFormatSpec_);
+-        }
+-      }
+-    }
+-    if (fmt == null) {
+-      fmt = StreamInputFormat.class;
+-    }
+-
+-    jobConf_.setInputFormat(fmt);
+-
+-    if (ioSpec_ != null) {
+-      jobConf_.set("stream.map.input", ioSpec_);
+-      jobConf_.set("stream.map.output", ioSpec_);
+-      jobConf_.set("stream.reduce.input", ioSpec_);
+-      jobConf_.set("stream.reduce.output", ioSpec_);
+-    }
+-
+-    Class<? extends IdentifierResolver> idResolverClass =
+-      jobConf_.getClass("stream.io.identifier.resolver.class",
+-        IdentifierResolver.class, IdentifierResolver.class);
+-    IdentifierResolver idResolver = ReflectionUtils.newInstance(idResolverClass, jobConf_);
+-
+-    idResolver.resolve(jobConf_.get("stream.map.input", IdentifierResolver.TEXT_ID));
+-    jobConf_.setClass("stream.map.input.writer.class",
+-      idResolver.getInputWriterClass(), InputWriter.class);
+-
+-    idResolver.resolve(jobConf_.get("stream.reduce.input", IdentifierResolver.TEXT_ID));
+-    jobConf_.setClass("stream.reduce.input.writer.class",
+-      idResolver.getInputWriterClass(), InputWriter.class);
+-
+-    jobConf_.set("stream.addenvironment", addTaskEnvironment_);
+-
+-    boolean isMapperACommand = false;
+-    if (mapCmd_ != null) {
+-      c = StreamUtil.goodClassOrNull(jobConf_, mapCmd_, defaultPackage);
+-      if (c != null) {
+-        jobConf_.setMapperClass(c);
+-      } else {
+-        isMapperACommand = true;
+-        jobConf_.setMapperClass(PipeMapper.class);
+-        jobConf_.setMapRunnerClass(PipeMapRunner.class);
+-        jobConf_.set("stream.map.streamprocessor",
+-                     URLEncoder.encode(mapCmd_, "UTF-8"));
+-      }
+-    }
+-
+-    if (comCmd_ != null) {
+-      c = StreamUtil.goodClassOrNull(jobConf_, comCmd_, defaultPackage);
+-      if (c != null) {
+-        jobConf_.setCombinerClass(c);
+-      } else {
+-        jobConf_.setCombinerClass(PipeCombiner.class);
+-        jobConf_.set("stream.combine.streamprocessor", URLEncoder.encode(
+-                comCmd_, "UTF-8"));
+-      }
+-    }
+-
+-    if (numReduceTasksSpec_!= null) {
+-      int numReduceTasks = Integer.parseInt(numReduceTasksSpec_);
+-      jobConf_.setNumReduceTasks(numReduceTasks);
+-    }
+-
+-    boolean isReducerACommand = false;
+-    if (redCmd_ != null) {
+-      if (redCmd_.equals(REDUCE_NONE)) {
+-        jobConf_.setNumReduceTasks(0);
+-      }
+-      if (jobConf_.getNumReduceTasks() != 0) {
+-        if (redCmd_.compareToIgnoreCase("aggregate") == 0) {
+-          jobConf_.setReducerClass(ValueAggregatorReducer.class);
+-          jobConf_.setCombinerClass(ValueAggregatorCombiner.class);
+-        } else {
+-
+-          c = StreamUtil.goodClassOrNull(jobConf_, redCmd_, defaultPackage);
+-          if (c != null) {
+-            jobConf_.setReducerClass(c);
+-          } else {
+-            isReducerACommand = true;
+-            jobConf_.setReducerClass(PipeReducer.class);
+-            jobConf_.set("stream.reduce.streamprocessor", URLEncoder.encode(
+-                redCmd_, "UTF-8"));
+-          }
+-        }
+-      }
+-    }
+-
+-    idResolver.resolve(jobConf_.get("stream.map.output",
+-        IdentifierResolver.TEXT_ID));
+-    jobConf_.setClass("stream.map.output.reader.class",
+-      idResolver.getOutputReaderClass(), OutputReader.class);
+-    if (isMapperACommand || jobConf_.get("stream.map.output") != null) {
+-      // if mapper is a command, then map output key/value classes come from the
+-      // idResolver
+-      jobConf_.setMapOutputKeyClass(idResolver.getOutputKeyClass());
+-      jobConf_.setMapOutputValueClass(idResolver.getOutputValueClass());
+-
+-      if (jobConf_.getNumReduceTasks() == 0) {
+-        jobConf_.setOutputKeyClass(idResolver.getOutputKeyClass());
+-        jobConf_.setOutputValueClass(idResolver.getOutputValueClass());
+-      }
+-    }
+-
+-    idResolver.resolve(jobConf_.get("stream.reduce.output",
+-        IdentifierResolver.TEXT_ID));
+-    jobConf_.setClass("stream.reduce.output.reader.class",
+-      idResolver.getOutputReaderClass(), OutputReader.class);
+-    if (isReducerACommand || jobConf_.get("stream.reduce.output") != null) {
+-      // if reducer is a command, then output key/value classes come from the
+-      // idResolver
+-      jobConf_.setOutputKeyClass(idResolver.getOutputKeyClass());
+-      jobConf_.setOutputValueClass(idResolver.getOutputValueClass());
+-    }
+-
+-    if (inReaderSpec_ != null) {
+-      String[] args = inReaderSpec_.split(",");
+-      String readerClass = args[0];
+-      // this argument can only be a Java class
+-      c = StreamUtil.goodClassOrNull(jobConf_, readerClass, defaultPackage);
+-      if (c != null) {
+-        jobConf_.set("stream.recordreader.class", c.getName());
+-      } else {
+-        fail("-inputreader: class not found: " + readerClass);
+-      }
+-      for (int i = 1; i < args.length; i++) {
+-        String[] nv = args[i].split("=", 2);
+-        String k = "stream.recordreader." + nv[0];
+-        String v = (nv.length > 1) ? nv[1] : "";
+-        jobConf_.set(k, v);
+-      }
+-    }
+-
+-    FileOutputFormat.setOutputPath(jobConf_, new Path(output_));
+-    fmt = null;
+-    if (outputFormatSpec_!= null) {
+-      c = StreamUtil.goodClassOrNull(jobConf_, outputFormatSpec_, defaultPackage);
+-      if (c != null) {
+-        fmt = c;
+-      } else {
+-        fail("-outputformat : class not found : " + outputFormatSpec_);
+-      }
+-    }
+-    if (fmt == null) {
+-      fmt = TextOutputFormat.class;
+-    }
+-    if (lazyOutput_) {
+-      LazyOutputFormat.setOutputFormatClass(jobConf_, fmt);
+-    } else {
+-      jobConf_.setOutputFormat(fmt);
+-    }
+-
+-    if (partitionerSpec_!= null) {
+-      c = StreamUtil.goodClassOrNull(jobConf_, partitionerSpec_, defaultPackage);
+-      if (c != null) {
+-        jobConf_.setPartitionerClass(c);
+-      } else {
+-        fail("-partitioner : class not found : " + partitionerSpec_);
+-      }
+-    }
+-
+-    if(mapDebugSpec_ != null){
+-    	jobConf_.setMapDebugScript(mapDebugSpec_);
+-    }
+-    if(reduceDebugSpec_ != null){
+-    	jobConf_.setReduceDebugScript(reduceDebugSpec_);
+-    }
+-    // last, allow user to override anything
+-    // (although typically used with properties we didn't touch)
+-
+-    jar_ = packageJobJar();
+-    if (jar_ != null) {
+-      jobConf_.setJar(jar_);
+-    }
+-
+-    if ((cacheArchives != null) || (cacheFiles != null)){
+-      getURIs(cacheArchives, cacheFiles);
+-      boolean b = DistributedCache.checkURIs(fileURIs, archiveURIs);
+-      if (!b)
+-        fail(LINK_URI);
+-    }
+-    // set the jobconf for the caching parameters
+-    if (cacheArchives != null) {
+-      Job.setCacheArchives(archiveURIs, jobConf_);
+-    }
+-    if (cacheFiles != null) {
+-      Job.setCacheFiles(fileURIs, jobConf_);
+-    }
+-
+-    if (verbose_) {
+-      listJobConfProperties();
+-    }
+-
+-    msg("submitting to jobconf: " + getJobTrackerHostPort());
+-  }
+-
+-  /**
+-   * Prints out the jobconf properties on stdout
+-   * when verbose is specified.
+-   */
+-  protected void listJobConfProperties()
+-  {
+-    msg("==== JobConf properties:");
+-    TreeMap<String,String> sorted = new TreeMap<String,String>();
+-    for (final Map.Entry<String, String> en : jobConf_)  {
+-      sorted.put(en.getKey(), en.getValue());
+-    }
+-    for (final Map.Entry<String,String> en: sorted.entrySet()) {
+-      msg(en.getKey() + "=" + en.getValue());
+-    }
+-    msg("====");
+-  }
+-
+-  protected String getJobTrackerHostPort() {
+-    return jobConf_.get(JTConfig.JT_IPC_ADDRESS);
+-  }
+-
+-  // Based on JobClient
+-  public int submitAndMonitorJob() throws IOException {
+-
+-    if (jar_ != null && isLocalHadoop()) {
+-      // getAbs became required when shell and subvm have different working dirs...
+-      File wd = new File(".").getAbsoluteFile();
+-      RunJar.unJar(new File(jar_), wd, MATCH_ANY);
+-    }
+-
+-    // if jobConf_ changes must recreate a JobClient
+-    jc_ = new JobClient(jobConf_);
+-    running_ = null;
+-    try {
+-      running_ = jc_.submitJob(jobConf_);
+-      jobId_ = running_.getID();
+-      if (background_) {
+-        LOG.info("Job is running in background.");
+-      } else if (!jc_.monitorAndPrintJob(jobConf_, running_)) {
+-        LOG.error("Job not successful!");
+-        return 1;
+-      }
+-      LOG.info("Output directory: " + output_);
+-    } catch(FileNotFoundException fe) {
+-      LOG.error("Error launching job , bad input path : " + fe.getMessage());
+-      return 2;
+-    } catch(InvalidJobConfException je) {
+-      LOG.error("Error launching job , Invalid job conf : " + je.getMessage());
+-      return 3;
+-    } catch(FileAlreadyExistsException fae) {
+-      LOG.error("Error launching job , Output path already exists : "
+-                + fae.getMessage());
+-      return 4;
+-    } catch(IOException ioe) {
+-      LOG.error("Error Launching job : " + ioe.getMessage());
+-      return 5;
+-    } catch (InterruptedException ie) {
+-      LOG.error("Error monitoring job : " + ie.getMessage());
+-      return 6;
+-    } finally {
+-      jc_.close();
+-    }
+-    return 0;
+-  }
+-
+-  protected String[] argv_;
+-  protected boolean background_;
+-  protected boolean verbose_;
+-  protected boolean detailedUsage_;
+-  protected boolean printUsage = false;
+-  protected int debug_;
+-
+-  protected Environment env_;
+-
+-  protected String jar_;
+-  protected boolean localHadoop_;
+-  protected Configuration config_;
+-  protected JobConf jobConf_;
+-  protected JobClient jc_;
+-
+-  // command-line arguments
+-  protected ArrayList<String> inputSpecs_ = new ArrayList<String>();
+-  protected TreeSet<String> seenPrimary_ = new TreeSet<String>();
+-  protected boolean hasSimpleInputSpecs_;
+-  protected ArrayList<String> packageFiles_ = new ArrayList<String>();
+-  protected ArrayList<String> shippedCanonFiles_ = new ArrayList<String>();
+-  //protected TreeMap<String, String> userJobConfProps_ = new TreeMap<String, String>();
+-  protected String output_;
+-  protected String mapCmd_;
+-  protected String comCmd_;
+-  protected String redCmd_;
+-  protected String cacheFiles;
+-  protected String cacheArchives;
+-  protected URI[] fileURIs;
+-  protected URI[] archiveURIs;
+-  protected String inReaderSpec_;
+-  protected String inputFormatSpec_;
+-  protected String outputFormatSpec_;
+-  protected String partitionerSpec_;
+-  protected String numReduceTasksSpec_;
+-  protected String additionalConfSpec_;
+-  protected String mapDebugSpec_;
+-  protected String reduceDebugSpec_;
+-  protected String ioSpec_;
+-  protected boolean lazyOutput_;
+-
+-  // Use to communicate config to the external processes (ex env.var.HADOOP_USER)
+-  // encoding "a=b c=d"
+-  protected String addTaskEnvironment_;
+-
+-  protected boolean outputSingleNode_;
+-  protected long minRecWrittenToEnableSkip_;
+-
+-  protected RunningJob running_;
+-  protected JobID jobId_;
+-  protected static final String LINK_URI = "You need to specify the uris as scheme://path#linkname," +
+-    "Please specify a different link name for all of your caching URIs";
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamKeyValUtil.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamKeyValUtil.java
+deleted file mode 100644
+index fba45b11f24..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamKeyValUtil.java
++++ /dev/null
+@@ -1,137 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.util.LineReader;
+-
+-public class StreamKeyValUtil {
+-
+-  /**
+-   * Find the first occurred tab in a UTF-8 encoded string
+-   * @param utf a byte array containing a UTF-8 encoded string
+-   * @param start starting offset
+-   * @param length no. of bytes
+-   * @return position that first tab occurres otherwise -1
+-   */
+-  public static int findTab(byte [] utf, int start, int length) {
+-    for(int i=start; i<(start+length); i++) {
+-      if (utf[i]==(byte)'\t') {
+-        return i;
+-      }
+-    }
+-    return -1;      
+-  }
+-  /**
+-   * Find the first occurred tab in a UTF-8 encoded string
+-   * @param utf a byte array containing a UTF-8 encoded string
+-   * @return position that first tab occurres otherwise -1
+-   */
+-  public static int findTab(byte [] utf) {
+-    return org.apache.hadoop.util.UTF8ByteArrayUtils.findNthByte(utf, 0, 
+-        utf.length, (byte)'\t', 1);
+-  }
+-
+-  /**
+-   * split a UTF-8 byte array into key and value 
+-   * assuming that the delimilator is at splitpos. 
+-   * @param utf utf-8 encoded string
+-   * @param start starting offset
+-   * @param length no. of bytes
+-   * @param key contains key upon the method is returned
+-   * @param val contains value upon the method is returned
+-   * @param splitPos the split pos
+-   * @param separatorLength the length of the separator between key and value
+-   * @throws IOException
+-   */
+-  public static void splitKeyVal(byte[] utf, int start, int length, 
+-                                 Text key, Text val, int splitPos,
+-                                 int separatorLength) throws IOException {
+-    if (splitPos<start || splitPos >= (start+length))
+-      throw new IllegalArgumentException("splitPos must be in the range " +
+-                                         "[" + start + ", " + (start+length) + "]: " + splitPos);
+-    int keyLen = (splitPos-start);
+-    int valLen = (start+length)-splitPos-separatorLength;
+-    key.set(utf, start, keyLen);
+-    val.set(utf, splitPos+separatorLength, valLen);
+-  }
+-
+-  /**
+-   * split a UTF-8 byte array into key and value 
+-   * assuming that the delimilator is at splitpos. 
+-   * @param utf utf-8 encoded string
+-   * @param start starting offset
+-   * @param length no. of bytes
+-   * @param key contains key upon the method is returned
+-   * @param val contains value upon the method is returned
+-   * @param splitPos the split pos
+-   * @throws IOException
+-   */
+-  public static void splitKeyVal(byte[] utf, int start, int length, 
+-                                 Text key, Text val, int splitPos) throws IOException {
+-    splitKeyVal(utf, start, length, key, val, splitPos, 1);
+-  }
+-  
+-
+-  /**
+-   * split a UTF-8 byte array into key and value 
+-   * assuming that the delimilator is at splitpos. 
+-   * @param utf utf-8 encoded string
+-   * @param key contains key upon the method is returned
+-   * @param val contains value upon the method is returned
+-   * @param splitPos the split pos
+-   * @param separatorLength the length of the separator between key and value
+-   * @throws IOException
+-   */
+-  public static void splitKeyVal(byte[] utf, Text key, Text val, int splitPos, 
+-                                 int separatorLength) 
+-    throws IOException {
+-    splitKeyVal(utf, 0, utf.length, key, val, splitPos, separatorLength);
+-  }
+-
+-  /**
+-   * split a UTF-8 byte array into key and value 
+-   * assuming that the delimilator is at splitpos. 
+-   * @param utf utf-8 encoded string
+-   * @param key contains key upon the method is returned
+-   * @param val contains value upon the method is returned
+-   * @param splitPos the split pos
+-   * @throws IOException
+-   */
+-  public static void splitKeyVal(byte[] utf, Text key, Text val, int splitPos) 
+-    throws IOException {
+-    splitKeyVal(utf, 0, utf.length, key, val, splitPos, 1);
+-  }
+-  
+-  /**
+-   * Read a utf8 encoded line from a data input stream. 
+-   * @param lineReader LineReader to read the line from.
+-   * @param out Text to read into
+-   * @return number of bytes read 
+-   * @throws IOException
+-   */
+-  public static int readLine(LineReader lineReader, Text out) 
+-  throws IOException {
+-    out.clear();
+-    return lineReader.readLine(out);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java
+deleted file mode 100644
+index a6983e1c6c3..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamUtil.java
++++ /dev/null
+@@ -1,205 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.net.URL;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.MRConfig;
+-
+-/** 
+- * Utilities used in streaming
+- */
+-@InterfaceAudience.Private
+-public class StreamUtil {
+-
+-  /** It may seem strange to silently switch behaviour when a String
+-   * is not a classname; the reason is simplified Usage:<pre>
+-   * -mapper [classname | program ]
+-   * instead of the explicit Usage:
+-   * [-mapper program | -javamapper classname], -mapper and -javamapper are mutually exclusive.
+-   * (repeat for -reducer, -combiner) </pre>
+-   */
+-  public static Class goodClassOrNull(Configuration conf, String className, String defaultPackage) {
+-    Class clazz = null;
+-    try {
+-      clazz = conf.getClassByName(className);
+-    } catch (ClassNotFoundException cnf) {
+-    }
+-    if (clazz == null) {
+-      if (className.indexOf('.') == -1 && defaultPackage != null) {
+-        className = defaultPackage + "." + className;
+-        try {
+-          clazz = conf.getClassByName(className);
+-        } catch (ClassNotFoundException cnf) {
+-        }
+-      }
+-    }
+-    return clazz;
+-  }
+-
+-  public static String findInClasspath(String className) {
+-    return findInClasspath(className, StreamUtil.class.getClassLoader());
+-  }
+-
+-  /** @return a jar file path or a base directory or null if not found.
+-   */
+-  public static String findInClasspath(String className, ClassLoader loader) {
+-
+-    String relPath = className;
+-    relPath = relPath.replace('.', '/');
+-    relPath += ".class";
+-    java.net.URL classUrl = loader.getResource(relPath);
+-
+-    String codePath;
+-    if (classUrl != null) {
+-      boolean inJar = classUrl.getProtocol().equals("jar");
+-      codePath = classUrl.toString();
+-      if (codePath.startsWith("jar:")) {
+-        codePath = codePath.substring("jar:".length());
+-      }
+-      if (codePath.startsWith("file:")) { // can have both
+-        codePath = codePath.substring("file:".length());
+-      }
+-      if (inJar) {
+-        // A jar spec: remove class suffix in /path/my.jar!/package/Class
+-        int bang = codePath.lastIndexOf('!');
+-        codePath = codePath.substring(0, bang);
+-      } else {
+-        // A class spec: remove the /my/package/Class.class portion
+-        int pos = codePath.lastIndexOf(relPath);
+-        if (pos == -1) {
+-          throw new IllegalArgumentException("invalid codePath: className=" + className
+-                                             + " codePath=" + codePath);
+-        }
+-        codePath = codePath.substring(0, pos);
+-      }
+-    } else {
+-      codePath = null;
+-    }
+-    return codePath;
+-  }
+-
+-  static String qualifyHost(String url) {
+-    try {
+-      return qualifyHost(new URL(url)).toString();
+-    } catch (IOException io) {
+-      return url;
+-    }
+-  }
+-
+-  static URL qualifyHost(URL url) {
+-    try {
+-      InetAddress a = InetAddress.getByName(url.getHost());
+-      String qualHost = a.getCanonicalHostName();
+-      URL q = new URL(url.getProtocol(), qualHost, url.getPort(), url.getFile());
+-      return q;
+-    } catch (IOException io) {
+-      return url;
+-    }
+-  }
+-
+-  static final String regexpSpecials = "[]()?*+|.!^-\\~@";
+-
+-  public static String regexpEscape(String plain) {
+-    StringBuffer buf = new StringBuffer();
+-    char[] ch = plain.toCharArray();
+-    int csup = ch.length;
+-    for (int c = 0; c < csup; c++) {
+-      if (regexpSpecials.indexOf(ch[c]) != -1) {
+-        buf.append("\\");
+-      }
+-      buf.append(ch[c]);
+-    }
+-    return buf.toString();
+-  }
+-
+-  static String slurp(File f) throws IOException {
+-    int len = (int) f.length();
+-    byte[] buf = new byte[len];
+-    FileInputStream in = new FileInputStream(f);
+-    String contents = null;
+-    try {
+-      in.read(buf, 0, len);
+-      contents = new String(buf, StandardCharsets.UTF_8);
+-    } finally {
+-      in.close();
+-    }
+-    return contents;
+-  }
+-
+-  static String slurpHadoop(Path p, FileSystem fs) throws IOException {
+-    int len = (int) fs.getFileStatus(p).getLen();
+-    byte[] buf = new byte[len];
+-    FSDataInputStream in = fs.open(p);
+-    String contents = null;
+-    try {
+-      in.readFully(in.getPos(), buf);
+-      contents = new String(buf, StandardCharsets.UTF_8);
+-    } finally {
+-      in.close();
+-    }
+-    return contents;
+-  }
+-
+-  static private Environment env;
+-  private static String host;
+-
+-  public static String getHost(){
+-    return host;
+-  }
+- 
+-   
+-  static {
+-    try {
+-      env = new Environment();
+-      host = env.getHost();
+-    } catch (IOException io) {
+-      io.printStackTrace();
+-    }
+-  }
+-
+-  static Environment env() {
+-    if (env != null) {
+-      return env;
+-    }
+-    try {
+-      env = new Environment();
+-    } catch (IOException io) {
+-      io.printStackTrace();
+-    }
+-    return env;
+-  }
+-
+-  public static boolean isLocalJobTracker(JobConf job) {
+-    String framework = 
+-        job.get(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME); 
+-    return framework.equals(MRConfig.LOCAL_FRAMEWORK_NAME);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamXmlRecordReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamXmlRecordReader.java
+deleted file mode 100644
+index 974cdc7c8d0..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamXmlRecordReader.java
++++ /dev/null
+@@ -1,302 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.nio.charset.StandardCharsets;
+-import java.util.regex.*;
+-
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.FileSplit;
+-import org.apache.hadoop.mapred.JobConf;
+-
+-/** A way to interpret XML fragments as Mapper input records.
+- *  Values are XML subtrees delimited by configurable tags.
+- *  Keys could be the value of a certain attribute in the XML subtree, 
+- *  but this is left to the stream processor application.
+- *
+- *  The name-value properties that StreamXmlRecordReader understands are:
+- *    String begin (chars marking beginning of record)
+- *    String end   (chars marking end of record)
+- *    int maxrec   (maximum record size)
+- *    int lookahead(maximum lookahead to sync CDATA)
+- *    boolean slowmatch
+- */
+-public class StreamXmlRecordReader extends StreamBaseRecordReader {
+-
+-  public StreamXmlRecordReader(FSDataInputStream in, FileSplit split, Reporter reporter,
+-                               JobConf job, FileSystem fs) throws IOException {
+-    super(in, split, reporter, job, fs);
+-
+-    beginMark_ = checkJobGet(CONF_NS + "begin");
+-    endMark_ = checkJobGet(CONF_NS + "end");
+-
+-    maxRecSize_ = job_.getInt(CONF_NS + "maxrec", 50 * 1000);
+-    lookAhead_ = job_.getInt(CONF_NS + "lookahead", 2 * maxRecSize_);
+-    synched_ = false;
+-
+-    slowMatch_ = job_.getBoolean(CONF_NS + "slowmatch", false);
+-    if (slowMatch_) {
+-      beginPat_ = makePatternCDataOrMark(beginMark_);
+-      endPat_ = makePatternCDataOrMark(endMark_);
+-    }
+-    init();
+-  }
+-
+-  public final void init() throws IOException {
+-    LOG.info("StreamBaseRecordReader.init: " + " start_=" + start_ + " end_=" + end_ + " length_="
+-             + length_ + " start_ > in_.getPos() =" + (start_ > in_.getPos()) + " " + start_ + " > "
+-             + in_.getPos());
+-    if (start_ > in_.getPos()) {
+-      in_.seek(start_);
+-    }
+-    pos_ = start_;
+-    bin_ = new BufferedInputStream(in_);
+-    seekNextRecordBoundary();
+-  }
+-  
+-  int numNext = 0;
+-
+-  public synchronized boolean next(Text key, Text value) throws IOException {
+-    numNext++;
+-    if (pos_ >= end_) {
+-      return false;
+-    }
+-
+-    DataOutputBuffer buf = new DataOutputBuffer();
+-    if (!readUntilMatchBegin()) {
+-      return false;
+-    }
+-    if (pos_ >= end_ || !readUntilMatchEnd(buf)) {
+-      return false;
+-    }
+-
+-    // There is only one elem..key/value splitting is not done here.
+-    byte[] record = new byte[buf.getLength()];
+-    System.arraycopy(buf.getData(), 0, record, 0, record.length);
+-
+-    numRecStats(record, 0, record.length);
+-
+-    key.set(record);
+-    value.set("");
+-
+-    return true;
+-  }
+-
+-  public void seekNextRecordBoundary() throws IOException {
+-    readUntilMatchBegin();
+-  }
+-
+-  boolean readUntilMatchBegin() throws IOException {
+-    if (slowMatch_) {
+-      return slowReadUntilMatch(beginPat_, false, null);
+-    } else {
+-      return fastReadUntilMatch(beginMark_, false, null);
+-    }
+-  }
+-
+-  private boolean readUntilMatchEnd(DataOutputBuffer buf) throws IOException {
+-    if (slowMatch_) {
+-      return slowReadUntilMatch(endPat_, true, buf);
+-    } else {
+-      return fastReadUntilMatch(endMark_, true, buf);
+-    }
+-  }
+-
+-  private boolean slowReadUntilMatch(Pattern markPattern, boolean includePat,
+-                                     DataOutputBuffer outBufOrNull) throws IOException {
+-    byte[] buf = new byte[Math.max(lookAhead_, maxRecSize_)];
+-    int read = 0;
+-    bin_.mark(Math.max(lookAhead_, maxRecSize_) + 2); //mark to invalidate if we read more
+-    read = bin_.read(buf);
+-    if (read == -1) return false;
+-
+-    String sbuf = new String(buf, 0, read, StandardCharsets.UTF_8);
+-    Matcher match = markPattern.matcher(sbuf);
+-
+-    firstMatchStart_ = NA;
+-    firstMatchEnd_ = NA;
+-    int bufPos = 0;
+-    int state = synched_ ? CDATA_OUT : CDATA_UNK;
+-    int s = 0;
+-
+-    while (match.find(bufPos)) {
+-      int input;
+-      if (match.group(1) != null) {
+-        input = CDATA_BEGIN;
+-      } else if (match.group(2) != null) {
+-        input = CDATA_END;
+-        firstMatchStart_ = NA; // |<DOC CDATA[ </DOC> ]]> should keep it
+-      } else {
+-        input = RECORD_MAYBE;
+-      }
+-      if (input == RECORD_MAYBE) {
+-        if (firstMatchStart_ == NA) {
+-          firstMatchStart_ = match.start();
+-          firstMatchEnd_ = match.end();
+-        }
+-      }
+-      state = nextState(state, input, match.start());
+-      if (state == RECORD_ACCEPT) {
+-        break;
+-      }
+-      bufPos = match.end();
+-      s++;
+-    }
+-    if (state != CDATA_UNK) {
+-      synched_ = true;
+-    }
+-    boolean matched = (firstMatchStart_ != NA) && (state == RECORD_ACCEPT || state == CDATA_UNK);
+-    if (matched) {
+-      int endPos = includePat ? firstMatchEnd_ : firstMatchStart_;
+-      bin_.reset();
+-
+-      for (long skiplen = endPos; skiplen > 0; ) {
+-        skiplen -= bin_.skip(skiplen); // Skip succeeds as we have read this buffer
+-      }
+-
+-      pos_ += endPos;
+-      if (outBufOrNull != null) {
+-        outBufOrNull.writeBytes(sbuf.substring(0,endPos));
+-      }
+-    }
+-    return matched;
+-  }
+-
+-  // states
+-  private final static int CDATA_IN = 10;
+-  private final static int CDATA_OUT = 11;
+-  private final static int CDATA_UNK = 12;
+-  private final static int RECORD_ACCEPT = 13;
+-  // inputs
+-  private final static int CDATA_BEGIN = 20;
+-  private final static int CDATA_END = 21;
+-  private final static int RECORD_MAYBE = 22;
+-
+-  /* also updates firstMatchStart_;*/
+-  int nextState(int state, int input, int bufPos) {
+-    switch (state) {
+-    case CDATA_UNK:
+-    case CDATA_OUT:
+-      switch (input) {
+-      case CDATA_BEGIN:
+-        return CDATA_IN;
+-      case CDATA_END:
+-        if (state == CDATA_OUT) {
+-          //System.out.println("buggy XML " + bufPos);
+-        }
+-        return CDATA_OUT;
+-      case RECORD_MAYBE:
+-        return (state == CDATA_UNK) ? CDATA_UNK : RECORD_ACCEPT;
+-      }
+-      break;
+-    case CDATA_IN:
+-      return (input == CDATA_END) ? CDATA_OUT : CDATA_IN;
+-    }
+-    throw new IllegalStateException(state + " " + input + " " + bufPos + " " + splitName_);
+-  }
+-
+-  Pattern makePatternCDataOrMark(String escapedMark) {
+-    StringBuffer pat = new StringBuffer();
+-    addGroup(pat, StreamUtil.regexpEscape("CDATA[")); // CDATA_BEGIN
+-    addGroup(pat, StreamUtil.regexpEscape("]]>")); // CDATA_END
+-    addGroup(pat, escapedMark); // RECORD_MAYBE
+-    return Pattern.compile(pat.toString());
+-  }
+-
+-  void addGroup(StringBuffer pat, String escapedGroup) {
+-    if (pat.length() > 0) {
+-      pat.append("|");
+-    }
+-    pat.append("(");
+-    pat.append(escapedGroup);
+-    pat.append(")");
+-  }
+-
+-  boolean fastReadUntilMatch(String textPat, boolean includePat, DataOutputBuffer outBufOrNull) throws IOException {
+-    byte[] cpat = textPat.getBytes(StandardCharsets.UTF_8);
+-    int m = 0;
+-    boolean match = false;
+-    int msup = cpat.length;
+-    int LL = 120000 * 10;
+-
+-    bin_.mark(LL); // large number to invalidate mark
+-    while (true) {
+-      int b = bin_.read();
+-      if (b == -1) break;
+-
+-      byte c = (byte) b; // this assumes eight-bit matching. OK with UTF-8
+-      if (c == cpat[m]) {
+-        m++;
+-        if (m == msup) {
+-          match = true;
+-          break;
+-        }
+-      } else {
+-        bin_.mark(LL); // rest mark so we could jump back if we found a match
+-        if (outBufOrNull != null) {
+-          outBufOrNull.write(cpat, 0, m);
+-          outBufOrNull.write(c);
+-        }
+-        pos_ += m + 1; // skip m chars, +1 for 'c'
+-        m = 0;
+-      }
+-    }
+-    if (!includePat && match) {
+-      bin_.reset();
+-    } else if (outBufOrNull != null) {
+-      outBufOrNull.write(cpat);
+-      pos_ += msup;
+-    }
+-    return match;
+-  }
+-
+-  String checkJobGet(String prop) throws IOException {
+-    String val = job_.get(prop);
+-    if (val == null) {
+-      throw new IOException("JobConf: missing required property: " + prop);
+-    }
+-    return val;
+-  }
+-
+-  String beginMark_;
+-  String endMark_;
+-
+-  Pattern beginPat_;
+-  Pattern endPat_;
+-
+-  boolean slowMatch_;
+-  int lookAhead_; // bytes to read to try to synch CDATA/non-CDATA. Should be more than max record size
+-  int maxRecSize_;
+-
+-  BufferedInputStream bin_; // Wrap FSDataInputStream for efficient backward seeks 
+-  long pos_; // Keep track on position with respect encapsulated FSDataInputStream  
+-
+-  private final static int NA = -1;
+-  int firstMatchStart_ = 0; // candidate record boundary. Might just be CDATA.
+-  int firstMatchEnd_ = 0;
+-
+-  boolean synched_;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java
+deleted file mode 100644
+index b0cd5b4fdb7..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java
++++ /dev/null
+@@ -1,132 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.typedbytes.TypedBytesWritable;
+-
+-/**
+- * This class is used to resolve a string identifier into the required IO
+- * classes. By extending this class and pointing the property
+- * <tt>stream.io.identifier.resolver.class</tt> to this extension, additional
+- * IO classes can be added by external code.
+- */
+-public class IdentifierResolver {
+-
+-  // note that the identifiers are case insensitive
+-  public static final String TEXT_ID = "text";
+-  public static final String RAW_BYTES_ID = "rawbytes";
+-  public static final String TYPED_BYTES_ID = "typedbytes";
+-  public static final String KEY_ONLY_TEXT_ID = "keyonlytext";
+-  
+-  private Class<? extends InputWriter> inputWriterClass = null;
+-  private Class<? extends OutputReader> outputReaderClass = null;
+-  private Class outputKeyClass = null;
+-  private Class outputValueClass = null;
+-  
+-  /**
+-   * Resolves a given identifier. This method has to be called before calling
+-   * any of the getters.
+-   */
+-  public void resolve(String identifier) {
+-    if (identifier.equalsIgnoreCase(RAW_BYTES_ID)) {
+-      setInputWriterClass(RawBytesInputWriter.class);
+-      setOutputReaderClass(RawBytesOutputReader.class);
+-      setOutputKeyClass(BytesWritable.class);
+-      setOutputValueClass(BytesWritable.class);
+-    } else if (identifier.equalsIgnoreCase(TYPED_BYTES_ID)) {
+-      setInputWriterClass(TypedBytesInputWriter.class);
+-      setOutputReaderClass(TypedBytesOutputReader.class);
+-      setOutputKeyClass(TypedBytesWritable.class);
+-      setOutputValueClass(TypedBytesWritable.class);
+-    } else if (identifier.equalsIgnoreCase(KEY_ONLY_TEXT_ID)) {
+-      setInputWriterClass(KeyOnlyTextInputWriter.class);
+-      setOutputReaderClass(KeyOnlyTextOutputReader.class);
+-      setOutputKeyClass(Text.class);
+-      setOutputValueClass(NullWritable.class);
+-    } else { // assume TEXT_ID
+-      setInputWriterClass(TextInputWriter.class);
+-      setOutputReaderClass(TextOutputReader.class);
+-      setOutputKeyClass(Text.class);
+-      setOutputValueClass(Text.class);
+-    }
+-  }
+-  
+-  /**
+-   * Returns the resolved {@link InputWriter} class.
+-   */
+-  public Class<? extends InputWriter> getInputWriterClass() {
+-    return inputWriterClass;
+-  }
+-
+-  /**
+-   * Returns the resolved {@link OutputReader} class.
+-   */
+-  public Class<? extends OutputReader> getOutputReaderClass() {
+-    return outputReaderClass;
+-  }
+-  
+-  /**
+-   * Returns the resolved output key class.
+-   */
+-  public Class getOutputKeyClass() {
+-    return outputKeyClass;
+-  }
+-
+-  /**
+-   * Returns the resolved output value class.
+-   */
+-  public Class getOutputValueClass() {
+-    return outputValueClass;
+-  }
+-  
+-  
+-  /**
+-   * Sets the {@link InputWriter} class.
+-   */
+-  protected void setInputWriterClass(Class<? extends InputWriter>
+-    inputWriterClass) {
+-    this.inputWriterClass = inputWriterClass;
+-  }
+-  
+-  /**
+-   * Sets the {@link OutputReader} class.
+-   */
+-  protected void setOutputReaderClass(Class<? extends OutputReader>
+-    outputReaderClass) {
+-    this.outputReaderClass = outputReaderClass;
+-  }
+-  
+-  /**
+-   * Sets the output key class class.
+-   */
+-  protected void setOutputKeyClass(Class outputKeyClass) {
+-    this.outputKeyClass = outputKeyClass;
+-  }
+-  
+-  /**
+-   * Sets the output value class.
+-   */
+-  protected void setOutputValueClass(Class outputValueClass) {
+-    this.outputValueClass = outputValueClass;
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/InputWriter.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/InputWriter.java
+deleted file mode 100644
+index 35245513204..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/InputWriter.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.streaming.PipeMapRed;
+-
+-/**
+- * Abstract base for classes that write the client's input.
+- */
+-public abstract class InputWriter<K, V> {
+-  
+-  /**
+-   * Initializes the InputWriter. This method has to be called before calling
+-   * any of the other methods.
+-   */
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    // nothing here yet, but that might change in the future
+-  }
+-  
+-  /**
+-   * Writes an input key.
+-   */
+-  public abstract void writeKey(K key) throws IOException;
+-
+-  /**
+-   * Writes an input value.
+-   */
+-  public abstract void writeValue(V value) throws IOException;
+-
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextInputWriter.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextInputWriter.java
+deleted file mode 100644
+index 366eff72f30..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextInputWriter.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.IOException;
+-
+-
+-public class KeyOnlyTextInputWriter extends TextInputWriter {
+-
+-  @Override
+-  public void writeKey(Object key) throws IOException {
+-    writeUTF8(key);
+-    clientOut.write('\n');
+-  }
+-
+-  @Override
+-  public void writeValue(Object value) throws IOException {}
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextOutputReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextOutputReader.java
+deleted file mode 100644
+index 1c17659b778..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/KeyOnlyTextOutputReader.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataInput;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.NullWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-import org.apache.hadoop.util.LineReader;
+-
+-/**
+- * OutputReader that reads the client's output as text, interpreting each line
+- * as a key and outputting NullWritables for values.
+- */
+-public class KeyOnlyTextOutputReader extends OutputReader<Text, NullWritable> {
+-
+-  private LineReader lineReader;
+-  private byte[] bytes;
+-  private DataInput clientIn;
+-  private Configuration conf;
+-  private Text key;
+-  private Text line;
+-  
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientIn = pipeMapRed.getClientInput();
+-    conf = pipeMapRed.getConfiguration();
+-    lineReader = new LineReader((InputStream)clientIn, conf);
+-    key = new Text();
+-    line = new Text();
+-  }
+-  
+-  @Override
+-  public boolean readKeyValue() throws IOException {
+-    if (lineReader.readLine(line) <= 0) {
+-      return false;
+-    }
+-    bytes = line.getBytes();
+-    key.set(bytes, 0, line.getLength());
+-
+-    line.clear();
+-    return true;
+-  }
+-  
+-  @Override
+-  public Text getCurrentKey() throws IOException {
+-    return key;
+-  }
+-  
+-  @Override
+-  public NullWritable getCurrentValue() throws IOException {
+-    return NullWritable.get();
+-  }
+-
+-  @Override
+-  public String getLastOutput() {
+-    if (bytes != null) {
+-      return new String(bytes, StandardCharsets.UTF_8);
+-    } else {
+-      return null;
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/OutputReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/OutputReader.java
+deleted file mode 100644
+index 33f02991770..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/OutputReader.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.streaming.PipeMapRed;
+-
+-/**
+- * Abstract base for classes that read the client's output.
+- */
+-public abstract class OutputReader<K, V> {
+-  
+-  /**
+-   * Initializes the OutputReader. This method has to be called before
+-   * calling any of the other methods.
+-   */
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    // nothing here yet, but that might change in the future
+-  }
+-  
+-  /**
+-   * Read the next key/value pair outputted by the client.
+-   * @return true iff a key/value pair was read
+-   */
+-  public abstract boolean readKeyValue() throws IOException;
+-  
+-  /**
+-   * Returns the current key.
+-   */
+-  public abstract K getCurrentKey() throws IOException;
+-  
+-  /**
+-   * Returns the current value.
+-   */
+-  public abstract V getCurrentValue() throws IOException;
+-  
+-  /**
+-   * Returns the last output from the client as a String.
+-   */
+-  public abstract String getLastOutput();
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesInputWriter.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesInputWriter.java
+deleted file mode 100644
+index effee05c513..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesInputWriter.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataOutput;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-
+-/**
+- * InputWriter that writes the client's input as raw bytes.
+- */
+-public class RawBytesInputWriter extends InputWriter<Writable, Writable> {
+-
+-  private DataOutput clientOut;
+-  private ByteArrayOutputStream bufferOut;
+-  private DataOutputStream bufferDataOut;
+-
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientOut = pipeMapRed.getClientOutput();
+-    bufferOut = new ByteArrayOutputStream();
+-    bufferDataOut = new DataOutputStream(bufferOut);
+-  }
+-  
+-  @Override
+-  public void writeKey(Writable key) throws IOException {
+-    writeRawBytes(key);
+-  }
+-
+-  @Override
+-  public void writeValue(Writable value) throws IOException {
+-    writeRawBytes(value);
+-  }
+-
+-  private void writeRawBytes(Writable writable) throws IOException {
+-    if (writable instanceof BytesWritable) {
+-      BytesWritable bw = (BytesWritable) writable;
+-      byte[] bytes = bw.getBytes();
+-      int length = bw.getLength();
+-      clientOut.writeInt(length);
+-      clientOut.write(bytes, 0, length);
+-    } else {
+-      bufferOut.reset();
+-      writable.write(bufferDataOut);
+-      byte[] bytes = bufferOut.toByteArray();
+-      clientOut.writeInt(bytes.length);
+-      clientOut.write(bytes);
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java
+deleted file mode 100644
+index 2ffb62c27a8..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataInput;
+-import java.io.EOFException;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-
+-/**
+- * OutputReader that reads the client's output as raw bytes.
+- */
+-public class RawBytesOutputReader 
+-  extends OutputReader<BytesWritable, BytesWritable> {
+-
+-  private DataInput clientIn;
+-  private byte[] bytes;
+-  private BytesWritable key;
+-  private BytesWritable value;
+-
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientIn = pipeMapRed.getClientInput();
+-    key = new BytesWritable();
+-    value = new BytesWritable();
+-  }
+-  
+-  @Override
+-  public boolean readKeyValue() throws IOException {
+-    int length = readLength();
+-    if (length < 0) {
+-      return false;
+-    }
+-    key.set(readBytes(length), 0, length);
+-    length = readLength();
+-    value.set(readBytes(length), 0, length);
+-    return true;
+-  }
+-  
+-  @Override
+-  public BytesWritable getCurrentKey() throws IOException {
+-    return key;
+-  }
+-  
+-  @Override
+-  public BytesWritable getCurrentValue() throws IOException {
+-    return value;
+-  }
+-
+-  @Override
+-  public String getLastOutput() {
+-    if (bytes != null) {
+-      return new BytesWritable(bytes).toString();
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-  private int readLength() throws IOException {
+-    try {
+-      return clientIn.readInt();
+-    } catch (EOFException eof) {
+-      return -1;
+-    }
+-  }
+-  
+-  private byte[] readBytes(int length) throws IOException {
+-    bytes = new byte[length];
+-    clientIn.readFully(bytes);
+-    return bytes;
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextInputWriter.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextInputWriter.java
+deleted file mode 100644
+index 31513da71d9..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextInputWriter.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-
+-/**
+- * InputWriter that writes the client's input as text.
+- */
+-public class TextInputWriter extends InputWriter<Object, Object> {
+-  
+-  protected DataOutput clientOut;
+-  private byte[] inputSeparator;
+-  
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientOut = pipeMapRed.getClientOutput();
+-    inputSeparator = pipeMapRed.getInputSeparator();
+-  }
+-  
+-  @Override
+-  public void writeKey(Object key) throws IOException {
+-    writeUTF8(key);
+-    clientOut.write(inputSeparator);
+-  }
+-
+-  @Override
+-  public void writeValue(Object value) throws IOException {
+-    writeUTF8(value);
+-    clientOut.write('\n');
+-  }
+-  
+-  // Write an object to the output stream using UTF-8 encoding
+-  protected void writeUTF8(Object object) throws IOException {
+-    byte[] bval;
+-    int valSize;
+-    if (object instanceof BytesWritable) {
+-      BytesWritable val = (BytesWritable) object;
+-      bval = val.getBytes();
+-      valSize = val.getLength();
+-    } else if (object instanceof Text) {
+-      Text val = (Text) object;
+-      bval = val.getBytes();
+-      valSize = val.getLength();
+-    } else {
+-      String sval = object.toString();
+-      bval = sval.getBytes(StandardCharsets.UTF_8);
+-      valSize = bval.length;
+-    }
+-    clientOut.write(bval, 0, valSize);
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java
+deleted file mode 100644
+index 11c84a471f7..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataInput;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.nio.charset.CharacterCodingException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-import org.apache.hadoop.streaming.StreamKeyValUtil;
+-import org.apache.hadoop.util.LineReader;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.UTF8ByteArrayUtils;
+-
+-/**
+- * OutputReader that reads the client's output as text.
+- */
+-public class TextOutputReader extends OutputReader<Text, Text> {
+-
+-  private LineReader lineReader;
+-  private byte[] bytes;
+-  private DataInput clientIn;
+-  private Configuration conf;
+-  private int numKeyFields;
+-  private byte[] separator;
+-  private Text key;
+-  private Text value;
+-  private Text line;
+-  
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientIn = pipeMapRed.getClientInput();
+-    conf = pipeMapRed.getConfiguration();
+-    numKeyFields = pipeMapRed.getNumOfKeyFields();
+-    separator = pipeMapRed.getFieldSeparator();
+-    lineReader = new LineReader((InputStream)clientIn, conf);
+-    key = new Text();
+-    value = new Text();
+-    line = new Text();
+-  }
+-  
+-  @Override
+-  public boolean readKeyValue() throws IOException {
+-    if (lineReader.readLine(line) <= 0) {
+-      return false;
+-    }
+-    bytes = line.getBytes();
+-    splitKeyVal(bytes, line.getLength(), key, value);
+-    line.clear();
+-    return true;
+-  }
+-  
+-  @Override
+-  public Text getCurrentKey() throws IOException {
+-    return key;
+-  }
+-  
+-  @Override
+-  public Text getCurrentValue() throws IOException {
+-    return value;
+-  }
+-
+-  @Override
+-  public String getLastOutput() {
+-    if (bytes != null) {
+-      return new String(bytes, StandardCharsets.UTF_8);
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-  // split a UTF-8 line into key and value
+-  private void splitKeyVal(byte[] line, int length, Text key, Text val)
+-    throws IOException {
+-    // Need to find numKeyFields separators
+-    int pos = UTF8ByteArrayUtils.findBytes(line, 0, length, separator);
+-    for(int k=1; k<numKeyFields && pos!=-1; k++) {
+-      pos = UTF8ByteArrayUtils.findBytes(line, pos + separator.length, 
+-        length, separator);
+-    }
+-    try {
+-      if (pos == -1) {
+-        key.set(line, 0, length);
+-        val.set("");
+-      } else {
+-        StreamKeyValUtil.splitKeyVal(line, 0, length, key, val, pos,
+-          separator.length);
+-      }
+-    } catch (CharacterCodingException e) {
+-      throw new IOException(StringUtils.stringifyException(e));
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesInputWriter.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesInputWriter.java
+deleted file mode 100644
+index 9891f9856b0..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesInputWriter.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-import org.apache.hadoop.typedbytes.TypedBytesOutput;
+-import org.apache.hadoop.typedbytes.TypedBytesWritableOutput;
+-
+-/**
+- * InputWriter that writes the client's input as typed bytes.
+- */
+-public class TypedBytesInputWriter extends InputWriter<Object, Object> {
+-
+-  private TypedBytesOutput tbOut;
+-  private TypedBytesWritableOutput tbwOut;
+-
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    DataOutput clientOut = pipeMapRed.getClientOutput();
+-    tbOut = new TypedBytesOutput(clientOut);
+-    tbwOut = new TypedBytesWritableOutput(clientOut);
+-  }
+-
+-  @Override
+-  public void writeKey(Object key) throws IOException {
+-    writeTypedBytes(key);
+-  }
+-
+-  @Override
+-  public void writeValue(Object value) throws IOException {
+-    writeTypedBytes(value);
+-  }
+-  
+-  private void writeTypedBytes(Object value) throws IOException {
+-    if (value instanceof Writable) {
+-      tbwOut.write((Writable) value);
+-    } else {
+-      tbOut.write(value);
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java
+deleted file mode 100644
+index e5526ef6f71..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java
++++ /dev/null
+@@ -1,80 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.DataInput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.streaming.PipeMapRed;
+-import org.apache.hadoop.typedbytes.TypedBytesInput;
+-import org.apache.hadoop.typedbytes.TypedBytesWritable;
+-
+-/**
+- * OutputReader that reads the client's output as typed bytes.
+- */
+-public class TypedBytesOutputReader extends 
+-  OutputReader<TypedBytesWritable, TypedBytesWritable> {
+-
+-  private byte[] bytes;
+-  private DataInput clientIn;
+-  private TypedBytesWritable key;
+-  private TypedBytesWritable value;
+-  private TypedBytesInput in;
+-  
+-  @Override
+-  public void initialize(PipeMapRed pipeMapRed) throws IOException {
+-    super.initialize(pipeMapRed);
+-    clientIn = pipeMapRed.getClientInput();
+-    key = new TypedBytesWritable();
+-    value = new TypedBytesWritable();
+-    in = new TypedBytesInput(clientIn);
+-  }
+-  
+-  @Override
+-  public boolean readKeyValue() throws IOException {
+-    bytes = in.readRaw();
+-    if (bytes == null) {
+-      return false;
+-    }
+-    key.set(bytes, 0, bytes.length);
+-    bytes = in.readRaw();
+-    value.set(bytes, 0, bytes.length);
+-    return true;
+-  }
+-  
+-  @Override
+-  public TypedBytesWritable getCurrentKey() throws IOException {
+-    return key;
+-  }
+-  
+-  @Override
+-  public TypedBytesWritable getCurrentValue() throws IOException {
+-    return value;
+-  }
+-
+-  @Override
+-  public String getLastOutput() {
+-    if (bytes != null) {
+-      return new TypedBytesWritable(bytes).toString();
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java
+deleted file mode 100644
+index e3c14743cb3..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java
++++ /dev/null
+@@ -1,154 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.mapreduce;
+-
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.streaming.StreamUtil;
+-
+-/**
+- * Shared functionality for hadoopStreaming formats. A custom reader can be
+- * defined to be a RecordReader with the constructor below and is selected with
+- * the option bin/hadoopStreaming -inputreader ...
+- * 
+- * @see StreamXmlRecordReader
+- */
+-public abstract class StreamBaseRecordReader extends RecordReader<Text, Text> {
+-
+-  protected static final Logger LOG = LoggerFactory
+-      .getLogger(StreamBaseRecordReader.class.getName());
+-
+-  // custom JobConf properties for this class are prefixed with this namespace
+-  final static String CONF_NS = "stream.recordreader.";
+-
+-  public StreamBaseRecordReader(FSDataInputStream in, FileSplit split,
+-      TaskAttemptContext context, Configuration conf, FileSystem fs)
+-      throws IOException {
+-    in_ = in;
+-    split_ = split;
+-    start_ = split_.getStart();
+-    length_ = split_.getLength();
+-    end_ = start_ + length_;
+-    splitName_ = split_.getPath().getName();
+-    this.context_ = context;
+-    conf_ = conf;
+-    fs_ = fs;
+-
+-    statusMaxRecordChars_ = conf.getInt(CONF_NS + "statuschars", 200);
+-  }
+-
+-  // / RecordReader API
+-
+-  /**
+-   * Read a record. Implementation should call numRecStats at the end
+-   */
+-  public abstract boolean next(Text key, Text value) throws IOException;
+-
+-  /** Returns the current position in the input. */
+-  public synchronized long getPos() throws IOException {
+-    return in_.getPos();
+-  }
+-
+-  /** Close this to future operations. */
+-  public synchronized void close() throws IOException {
+-    in_.close();
+-  }
+-
+-  public float getProgress() throws IOException {
+-    if (end_ == start_) {
+-      return 1.0f;
+-    } else {
+-      return ((float) (in_.getPos() - start_)) / ((float) (end_ - start_));
+-    }
+-  }
+-
+-  public Text createKey() {
+-    return new Text();
+-  }
+-
+-  public Text createValue() {
+-    return new Text();
+-  }
+-
+-  // / StreamBaseRecordReader API
+-
+-  /**
+-   * Implementation should seek forward in_ to the first byte of the next
+-   * record. The initial byte offset in the stream is arbitrary.
+-   */
+-  public abstract void seekNextRecordBoundary() throws IOException;
+-
+-  void numRecStats(byte[] record, int start, int len) throws IOException {
+-    numRec_++;
+-    if (numRec_ == nextStatusRec_) {
+-      String recordStr = new String(record, start, Math.min(len,
+-          statusMaxRecordChars_), StandardCharsets.UTF_8);
+-      nextStatusRec_ += 100;// *= 10;
+-      String status = getStatus(recordStr);
+-      LOG.info(status);
+-      context_.setStatus(status);
+-    }
+-  }
+-
+-  long lastMem = 0;
+-
+-  String getStatus(CharSequence record) {
+-    long pos = -1;
+-    try {
+-      pos = getPos();
+-    } catch (IOException io) {
+-    }
+-    String recStr;
+-    if (record.length() > statusMaxRecordChars_) {
+-      recStr = record.subSequence(0, statusMaxRecordChars_) + "...";
+-    } else {
+-      recStr = record.toString();
+-    }
+-    String unqualSplit = split_.getPath().getName() + ":" + split_.getStart()
+-        + "+" + split_.getLength();
+-    String status = "HSTR " + StreamUtil.getHost() + " " + numRec_ + ". pos="
+-        + pos + " " + unqualSplit + " Processing record=" + recStr;
+-    status += " " + splitName_;
+-    return status;
+-  }
+-
+-  FSDataInputStream in_;
+-  FileSplit split_;
+-  long start_;
+-  long end_;
+-  long length_;
+-  String splitName_;
+-  TaskAttemptContext context_;
+-  Configuration conf_;
+-  FileSystem fs_;
+-  int numRec_ = 0;
+-  int nextStatusRec_ = 1;
+-  int statusMaxRecordChars_;
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamInputFormat.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamInputFormat.java
+deleted file mode 100644
+index f44488c7c02..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamInputFormat.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.mapreduce;
+-
+-import java.io.IOException;
+-import java.lang.reflect.Constructor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FutureDataInputStreamBuilder;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.RecordReader;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.mapreduce.lib.input.KeyValueTextInputFormat;
+-import org.apache.hadoop.streaming.StreamUtil;
+-import org.apache.hadoop.util.functional.FutureIO;
+-
+-/**
+- * An input format that selects a RecordReader based on a JobConf property. This
+- * should be used only for non-standard record reader such as
+- * StreamXmlRecordReader. For all other standard record readers, the appropriate
+- * input format classes should be used.
+- */
+-public class StreamInputFormat extends KeyValueTextInputFormat {
+-
+-  @Override
+-  public RecordReader<Text, Text> createRecordReader(InputSplit genericSplit,
+-      TaskAttemptContext context) throws IOException {
+-
+-    Configuration conf = context.getConfiguration();
+-
+-    String c = conf.get("stream.recordreader.class");
+-    if (c == null || c.indexOf("LineRecordReader") >= 0) {
+-      return super.createRecordReader(genericSplit, context);
+-    }
+-
+-    // handling non-standard record reader (likely StreamXmlRecordReader)
+-    FileSplit split = (FileSplit) genericSplit;
+-    // LOG.info("getRecordReader start.....split=" + split);
+-    context.setStatus(split.toString());
+-    context.progress();
+-
+-    // Open the file and seek to the start of the split
+-    Path path = split.getPath();
+-    FileSystem fs = path.getFileSystem(conf);
+-    // open the file
+-    final FutureDataInputStreamBuilder builder = fs.openFile(path);
+-    FutureIO.propagateOptions(builder, conf,
+-        MRJobConfig.INPUT_FILE_OPTION_PREFIX,
+-        MRJobConfig.INPUT_FILE_MANDATORY_PREFIX);
+-    FSDataInputStream in = FutureIO.awaitFuture(builder.build());
+-
+-    // Factory dispatch based on available params..
+-    Class readerClass;
+-
+-    {
+-      readerClass = StreamUtil.goodClassOrNull(conf, c, null);
+-      if (readerClass == null) {
+-        throw new RuntimeException("Class not found: " + c);
+-      }
+-    }
+-    Constructor ctor;
+-
+-    try {
+-      ctor = readerClass.getConstructor(new Class[] { FSDataInputStream.class,
+-          FileSplit.class, TaskAttemptContext.class, Configuration.class,
+-          FileSystem.class });
+-    } catch (NoSuchMethodException nsm) {
+-      throw new RuntimeException(nsm);
+-    }
+-
+-    RecordReader<Text, Text> reader;
+-    try {
+-      reader = (RecordReader<Text, Text>) ctor.newInstance(new Object[] { in,
+-          split, context, conf, fs });
+-    } catch (Exception nsm) {
+-      throw new RuntimeException(nsm);
+-    }
+-    return reader;
+-
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamXmlRecordReader.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamXmlRecordReader.java
+deleted file mode 100644
+index aa8a4d8832c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamXmlRecordReader.java
++++ /dev/null
+@@ -1,341 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.mapreduce;
+-
+-import java.io.BufferedInputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.InputSplit;
+-import org.apache.hadoop.mapreduce.TaskAttemptContext;
+-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
+-import org.apache.hadoop.streaming.StreamUtil;
+-
+-/**
+- * A way to interpret XML fragments as Mapper input records. Values are XML
+- * subtrees delimited by configurable tags. Keys could be the value of a certain
+- * attribute in the XML subtree, but this is left to the stream processor
+- * application.
+- * 
+- * The name-value properties that StreamXmlRecordReader understands are: String
+- * begin (chars marking beginning of record) String end (chars marking end of
+- * record) int maxrec (maximum record size) int lookahead(maximum lookahead to
+- * sync CDATA) boolean slowmatch
+- */
+-public class StreamXmlRecordReader extends StreamBaseRecordReader {
+-
+-  private Text key;
+-  private Text value;
+-
+-  public StreamXmlRecordReader(FSDataInputStream in, FileSplit split,
+-      TaskAttemptContext context, Configuration conf, FileSystem fs)
+-  throws IOException {
+-    super(in, split, context, conf, fs);
+-
+-    beginMark_ = checkJobGet(CONF_NS + "begin");
+-    endMark_ = checkJobGet(CONF_NS + "end");
+-
+-    maxRecSize_ = conf_.getInt(CONF_NS + "maxrec", 50 * 1000);
+-    lookAhead_ = conf_.getInt(CONF_NS + "lookahead", 2 * maxRecSize_);
+-    synched_ = false;
+-
+-    slowMatch_ = conf_.getBoolean(CONF_NS + "slowmatch", false);
+-    if (slowMatch_) {
+-      beginPat_ = makePatternCDataOrMark(beginMark_);
+-      endPat_ = makePatternCDataOrMark(endMark_);
+-    }
+-    init();
+-  }
+-
+-  public final void init() throws IOException {
+-    LOG.info("StreamBaseRecordReader.init: " + " start_=" + start_ + " end_="
+-        + end_ + " length_=" + length_ + " start_ > in_.getPos() ="
+-        + (start_ > in_.getPos()) + " " + start_ + " > " + in_.getPos());
+-    if (start_ > in_.getPos()) {
+-      in_.seek(start_);
+-    }
+-    pos_ = start_;
+-    bin_ = new BufferedInputStream(in_);
+-    seekNextRecordBoundary();
+-  }
+-
+-  int numNext = 0;
+-
+-  public synchronized boolean next(Text key, Text value) throws IOException {
+-    numNext++;
+-    if (pos_ >= end_) {
+-      return false;
+-    }
+-
+-    DataOutputBuffer buf = new DataOutputBuffer();
+-    if (!readUntilMatchBegin()) {
+-      return false;
+-    }
+-    if (pos_ >= end_ || !readUntilMatchEnd(buf)) {
+-      return false;
+-    }
+-
+-    // There is only one elem..key/value splitting is not done here.
+-    byte[] record = new byte[buf.getLength()];
+-    System.arraycopy(buf.getData(), 0, record, 0, record.length);
+-
+-    numRecStats(record, 0, record.length);
+-
+-    key.set(record);
+-    value.set("");
+-
+-    return true;
+-  }
+-
+-  public void seekNextRecordBoundary() throws IOException {
+-    readUntilMatchBegin();
+-  }
+-
+-  boolean readUntilMatchBegin() throws IOException {
+-    if (slowMatch_) {
+-      return slowReadUntilMatch(beginPat_, false, null);
+-    } else {
+-      return fastReadUntilMatch(beginMark_, false, null);
+-    }
+-  }
+-
+-  private boolean readUntilMatchEnd(DataOutputBuffer buf) throws IOException {
+-    if (slowMatch_) {
+-      return slowReadUntilMatch(endPat_, true, buf);
+-    } else {
+-      return fastReadUntilMatch(endMark_, true, buf);
+-    }
+-  }
+-
+-  private boolean slowReadUntilMatch(Pattern markPattern, boolean includePat,
+-      DataOutputBuffer outBufOrNull) throws IOException {
+-    byte[] buf = new byte[Math.max(lookAhead_, maxRecSize_)];
+-    int read = 0;
+-    bin_.mark(Math.max(lookAhead_, maxRecSize_) + 2); // mark to invalidate if
+-    // we read more
+-    read = bin_.read(buf);
+-    if (read == -1)
+-      return false;
+-
+-    String sbuf = new String(buf, 0, read, StandardCharsets.UTF_8);
+-    Matcher match = markPattern.matcher(sbuf);
+-
+-    firstMatchStart_ = NA;
+-    firstMatchEnd_ = NA;
+-    int bufPos = 0;
+-    int state = synched_ ? CDATA_OUT : CDATA_UNK;
+-    int s = 0;
+-
+-    while (match.find(bufPos)) {
+-      int input;
+-      if (match.group(1) != null) {
+-        input = CDATA_BEGIN;
+-      } else if (match.group(2) != null) {
+-        input = CDATA_END;
+-        firstMatchStart_ = NA; // |<DOC CDATA[ </DOC> ]]> should keep it
+-      } else {
+-        input = RECORD_MAYBE;
+-      }
+-      if (input == RECORD_MAYBE) {
+-        if (firstMatchStart_ == NA) {
+-          firstMatchStart_ = match.start();
+-          firstMatchEnd_ = match.end();
+-        }
+-      }
+-      state = nextState(state, input, match.start());
+-      if (state == RECORD_ACCEPT) {
+-        break;
+-      }
+-      bufPos = match.end();
+-      s++;
+-    }
+-    if (state != CDATA_UNK) {
+-      synched_ = true;
+-    }
+-    boolean matched = (firstMatchStart_ != NA)
+-    && (state == RECORD_ACCEPT || state == CDATA_UNK);
+-    if (matched) {
+-      int endPos = includePat ? firstMatchEnd_ : firstMatchStart_;
+-      bin_.reset();
+-
+-      for (long skiplen = endPos; skiplen > 0;) {
+-        skiplen -= bin_.skip(skiplen); // Skip succeeds as we have read this
+-        // buffer
+-      }
+-
+-      pos_ += endPos;
+-      if (outBufOrNull != null) {
+-        outBufOrNull.writeBytes(sbuf.substring(0, endPos));
+-      }
+-    }
+-    return matched;
+-  }
+-
+-  // states
+-  private final static int CDATA_IN = 10;
+-  private final static int CDATA_OUT = 11;
+-  private final static int CDATA_UNK = 12;
+-  private final static int RECORD_ACCEPT = 13;
+-  // inputs
+-  private final static int CDATA_BEGIN = 20;
+-  private final static int CDATA_END = 21;
+-  private final static int RECORD_MAYBE = 22;
+-
+-  /* also updates firstMatchStart_; */
+-  int nextState(int state, int input, int bufPos) {
+-    switch (state) {
+-    case CDATA_UNK:
+-    case CDATA_OUT:
+-      switch (input) {
+-      case CDATA_BEGIN:
+-        return CDATA_IN;
+-      case CDATA_END:
+-        if (state == CDATA_OUT) {
+-          // System.out.println("buggy XML " + bufPos);
+-        }
+-        return CDATA_OUT;
+-      case RECORD_MAYBE:
+-        return (state == CDATA_UNK) ? CDATA_UNK : RECORD_ACCEPT;
+-      }
+-      break;
+-    case CDATA_IN:
+-      return (input == CDATA_END) ? CDATA_OUT : CDATA_IN;
+-    }
+-    throw new IllegalStateException(state + " " + input + " " + bufPos + " "
+-        + splitName_);
+-  }
+-
+-  Pattern makePatternCDataOrMark(String escapedMark) {
+-    StringBuffer pat = new StringBuffer();
+-    addGroup(pat, StreamUtil.regexpEscape("CDATA[")); // CDATA_BEGIN
+-    addGroup(pat, StreamUtil.regexpEscape("]]>")); // CDATA_END
+-    addGroup(pat, escapedMark); // RECORD_MAYBE
+-    return Pattern.compile(pat.toString());
+-  }
+-
+-  void addGroup(StringBuffer pat, String escapedGroup) {
+-    if (pat.length() > 0) {
+-      pat.append("|");
+-    }
+-    pat.append("(");
+-    pat.append(escapedGroup);
+-    pat.append(")");
+-  }
+-
+-  boolean fastReadUntilMatch(String textPat, boolean includePat,
+-      DataOutputBuffer outBufOrNull) throws IOException {
+-    byte[] cpat = textPat.getBytes(StandardCharsets.UTF_8);
+-    int m = 0;
+-    boolean match = false;
+-    int msup = cpat.length;
+-    int LL = 120000 * 10;
+-
+-    bin_.mark(LL); // large number to invalidate mark
+-    while (true) {
+-      int b = bin_.read();
+-      if (b == -1)
+-        break;
+-
+-      byte c = (byte) b; // this assumes eight-bit matching. OK with UTF-8
+-      if (c == cpat[m]) {
+-        m++;
+-        if (m == msup) {
+-          match = true;
+-          break;
+-        }
+-      } else {
+-        bin_.mark(LL); // rest mark so we could jump back if we found a match
+-        if (outBufOrNull != null) {
+-          outBufOrNull.write(cpat, 0, m);
+-          outBufOrNull.write(c);
+-        }
+-        pos_ += m + 1; // skip m chars, +1 for 'c'
+-        m = 0;
+-      }
+-    }
+-    if (!includePat && match) {
+-      bin_.reset();
+-    } else if (outBufOrNull != null) {
+-      outBufOrNull.write(cpat);
+-      pos_ += msup;
+-    }
+-    return match;
+-  }
+-
+-  String checkJobGet(String prop) throws IOException {
+-    String val = conf_.get(prop);
+-    if (val == null) {
+-      throw new IOException("JobConf: missing required property: " + prop);
+-    }
+-    return val;
+-  }
+-
+-  String beginMark_;
+-  String endMark_;
+-
+-  Pattern beginPat_;
+-  Pattern endPat_;
+-
+-  boolean slowMatch_;
+-  int lookAhead_; // bytes to read to try to synch CDATA/non-CDATA. Should be
+-  // more than max record size
+-  int maxRecSize_;
+-
+-  BufferedInputStream bin_; // Wrap FSDataInputStream for efficient backward
+-  // seeks
+-  long pos_; // Keep track on position with respect encapsulated
+-  // FSDataInputStream
+-
+-  private final static int NA = -1;
+-  int firstMatchStart_ = 0; // candidate record boundary. Might just be CDATA.
+-  int firstMatchEnd_ = 0;
+-
+-  boolean synched_;
+-
+-  @Override
+-  public Text getCurrentKey() throws IOException, InterruptedException {
+-    return key;
+-  }
+-
+-  @Override
+-  public Text getCurrentValue() throws IOException, InterruptedException {
+-    return value;
+-  }
+-
+-  @Override
+-  public void initialize(InputSplit arg0, TaskAttemptContext arg1)
+-  throws IOException, InterruptedException {
+-
+-  }
+-
+-  @Override
+-  public boolean nextKeyValue() throws IOException, InterruptedException {
+-    key = createKey();
+-    value = createValue();
+-    return next(key, value);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html
+deleted file mode 100644
+index be64426757e..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html
++++ /dev/null
+@@ -1,27 +0,0 @@
+-<html>
+-
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<body>
+-
+-<tt>Hadoop Streaming</tt> is a utility which allows users to create and run 
+-Map-Reduce jobs with any executables (e.g. Unix shell utilities) as the mapper 
+-and/or the reducer.
+-
+-</body>
+-</html>
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/Type.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/Type.java
+deleted file mode 100644
+index 8922617ad5c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/Type.java
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-/**
+- * The possible type codes.
+- */
+-public enum Type {
+-
+-  // codes for supported types (< 50):
+-  BYTES(0),
+-  BYTE(1),
+-  BOOL(2),
+-  INT(3),
+-  LONG(4),
+-  FLOAT(5),
+-  DOUBLE(6),
+-  STRING(7),
+-  VECTOR(8),
+-  LIST(9),
+-  MAP(10),
+-  
+-  // application-specific codes (50-200):
+-  WRITABLE(50),
+-  
+-  // low-level codes (> 200):
+-  MARKER(255);
+-
+-  final int code;
+-
+-  Type(int code) {
+-    this.code = code;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesInput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesInput.java
+deleted file mode 100644
+index cff0be24b21..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesInput.java
++++ /dev/null
+@@ -1,506 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.DataInput;
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.record.Buffer;
+-
+-/**
+- * Provides functionality for reading typed bytes.
+- */
+-public class TypedBytesInput {
+-
+-  private DataInput in;
+-
+-  private TypedBytesInput() {}
+-
+-  private void setDataInput(DataInput in) {
+-    this.in = in;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesInput> TB_IN =
+-      new ThreadLocal<TypedBytesInput>() {
+-    @Override
+-    protected TypedBytesInput initialValue() {
+-      return new TypedBytesInput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes input for the supplied {@link DataInput}.
+-   * @param in data input object
+-   * @return typed bytes input corresponding to the supplied {@link DataInput}.
+-   */
+-  public static TypedBytesInput get(DataInput in) {
+-    TypedBytesInput bin = TB_IN.get();
+-    bin.setDataInput(in);
+-    return bin;
+-  }
+-
+-  /** Creates a new instance of TypedBytesInput. */
+-  public TypedBytesInput(DataInput in) {
+-    this.in = in;
+-  }
+-
+-  /**
+-   * Reads a typed bytes sequence and converts it to a Java object. The first 
+-   * byte is interpreted as a type code, and then the right number of 
+-   * subsequent bytes are read depending on the obtained type.
+-   * @return the obtained object or null when the end of the file is reached
+-   * @throws IOException
+-   */
+-  public Object read() throws IOException {
+-    int code = 1;
+-    try {
+-      code = in.readUnsignedByte();
+-    } catch (EOFException eof) {
+-      return null;
+-    }
+-    if (code == Type.BYTES.code) {
+-      return new Buffer(readBytes());
+-    } else if (code == Type.BYTE.code) {
+-      return readByte();
+-    } else if (code == Type.BOOL.code) {
+-      return readBool();
+-    } else if (code == Type.INT.code) {
+-      return readInt();
+-    } else if (code == Type.LONG.code) {
+-      return readLong();
+-    } else if (code == Type.FLOAT.code) {
+-      return readFloat();
+-    } else if (code == Type.DOUBLE.code) {
+-      return readDouble();
+-    } else if (code == Type.STRING.code) {
+-      return readString();
+-    } else if (code == Type.VECTOR.code) {
+-      return readVector();
+-    } else if (code == Type.LIST.code) {
+-      return readList();
+-    } else if (code == Type.MAP.code) {
+-      return readMap();
+-    } else if (code == Type.MARKER.code) {
+-      return null;
+-    } else if (50 <= code && code <= 200) { // application-specific typecodes
+-      return new Buffer(readBytes());
+-    } else {
+-      throw new RuntimeException("unknown type");
+-    }
+-  }
+-
+-  /**
+-   * Reads a typed bytes sequence. The first byte is interpreted as a type code,
+-   * and then the right number of subsequent bytes are read depending on the
+-   * obtained type.
+-   * 
+-   * @return the obtained typed bytes sequence or null when the end of the file
+-   *         is reached
+-   * @throws IOException
+-   */
+-  public byte[] readRaw() throws IOException {
+-    int code = -1;
+-    try {
+-      code = in.readUnsignedByte();
+-    } catch (EOFException eof) {
+-      return null;
+-    }
+-    if (code == Type.BYTES.code) {
+-      return readRawBytes();
+-    } else if (code == Type.BYTE.code) {
+-      return readRawByte();
+-    } else if (code == Type.BOOL.code) {
+-      return readRawBool();
+-    } else if (code == Type.INT.code) {
+-      return readRawInt();
+-    } else if (code == Type.LONG.code) {
+-      return readRawLong();
+-    } else if (code == Type.FLOAT.code) {
+-      return readRawFloat();
+-    } else if (code == Type.DOUBLE.code) {
+-      return readRawDouble();
+-    } else if (code == Type.STRING.code) {
+-      return readRawString();
+-    } else if (code == Type.VECTOR.code) {
+-      return readRawVector();
+-    } else if (code == Type.LIST.code) {
+-      return readRawList();
+-    } else if (code == Type.MAP.code) {
+-      return readRawMap();
+-    } else if (code == Type.MARKER.code) {
+-      return null;
+-    } else if (50 <= code && code <= 200) { // application-specific typecodes
+-      return readRawBytes(code);
+-    } else {
+-      throw new RuntimeException("unknown type");
+-    }
+-  }
+-
+-  /**
+-   * Reads a type byte and returns the corresponding {@link Type}.
+-   * @return the obtained Type or null when the end of the file is reached
+-   * @throws IOException
+-   */
+-  public Type readType() throws IOException {
+-    int code = -1;
+-    try {
+-      code = in.readUnsignedByte();
+-    } catch (EOFException eof) {
+-      return null;
+-    }
+-    for (Type type : Type.values()) {
+-      if (type.code == code) {
+-        return type;
+-      }
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Skips a type byte.
+-   * @return true iff the end of the file was not reached
+-   * @throws IOException
+-   */
+-  public boolean skipType() throws IOException {
+-    try {
+-      in.readByte();
+-      return true;
+-    } catch (EOFException eof) {
+-      return false;
+-    }
+-  }
+-
+-  /**
+-   * Reads the bytes following a <code>Type.BYTES</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readBytes() throws IOException {
+-    int length = in.readInt();
+-    byte[] bytes = new byte[length];
+-    in.readFully(bytes);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a custom code.
+-   * @param code the custom type code
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawBytes(int code) throws IOException {
+-    int length = in.readInt();
+-    byte[] bytes = new byte[5 + length];
+-    bytes[0] = (byte) code;
+-    bytes[1] = (byte) (0xff & (length >> 24));
+-    bytes[2] = (byte) (0xff & (length >> 16));
+-    bytes[3] = (byte) (0xff & (length >> 8));
+-    bytes[4] = (byte) (0xff & length);
+-    in.readFully(bytes, 5, length);
+-    return bytes;
+-  }
+-  
+-  /**
+-   * Reads the raw bytes following a <code>Type.BYTES</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawBytes() throws IOException {
+-    return readRawBytes(Type.BYTES.code);
+-  }
+-
+-  /**
+-   * Reads the byte following a <code>Type.BYTE</code> code.
+-   * @return the obtained byte
+-   * @throws IOException
+-   */
+-  public byte readByte() throws IOException {
+-    return in.readByte();
+-  }
+-
+-  /**
+-   * Reads the raw byte following a <code>Type.BYTE</code> code.
+-   * @return the obtained byte
+-   * @throws IOException
+-   */
+-  public byte[] readRawByte() throws IOException {
+-    byte[] bytes = new byte[2];
+-    bytes[0] = (byte) Type.BYTE.code;
+-    in.readFully(bytes, 1, 1);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the boolean following a <code>Type.BOOL</code> code.
+-   * @return the obtained boolean
+-   * @throws IOException
+-   */
+-  public boolean readBool() throws IOException {
+-    return in.readBoolean();
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.BOOL</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawBool() throws IOException {
+-    byte[] bytes = new byte[2];
+-    bytes[0] = (byte) Type.BOOL.code;
+-    in.readFully(bytes, 1, 1);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the integer following a <code>Type.INT</code> code.
+-   * @return the obtained integer
+-   * @throws IOException
+-   */
+-  public int readInt() throws IOException {
+-    return in.readInt();
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.INT</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawInt() throws IOException {
+-    byte[] bytes = new byte[5];
+-    bytes[0] = (byte) Type.INT.code;
+-    in.readFully(bytes, 1, 4);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the long following a <code>Type.LONG</code> code.
+-   * @return the obtained long
+-   * @throws IOException
+-   */
+-  public long readLong() throws IOException {
+-    return in.readLong();
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.LONG</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawLong() throws IOException {
+-    byte[] bytes = new byte[9];
+-    bytes[0] = (byte) Type.LONG.code;
+-    in.readFully(bytes, 1, 8);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the float following a <code>Type.FLOAT</code> code.
+-   * @return the obtained float
+-   * @throws IOException
+-   */
+-  public float readFloat() throws IOException {
+-    return in.readFloat();
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.FLOAT</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawFloat() throws IOException {
+-    byte[] bytes = new byte[5];
+-    bytes[0] = (byte) Type.FLOAT.code;
+-    in.readFully(bytes, 1, 4);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the double following a <code>Type.DOUBLE</code> code.
+-   * @return the obtained double
+-   * @throws IOException
+-   */
+-  public double readDouble() throws IOException {
+-    return in.readDouble();
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.DOUBLE</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawDouble() throws IOException {
+-    byte[] bytes = new byte[9];
+-    bytes[0] = (byte) Type.DOUBLE.code;
+-    in.readFully(bytes, 1, 8);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the string following a <code>Type.STRING</code> code.
+-   * @return the obtained string
+-   * @throws IOException
+-   */
+-  public String readString() throws IOException {
+-    return WritableUtils.readString(in);
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.STRING</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawString() throws IOException {
+-    int length = in.readInt();
+-    byte[] bytes = new byte[5 + length];
+-    bytes[0] = (byte) Type.STRING.code;
+-    bytes[1] = (byte) (0xff & (length >> 24));
+-    bytes[2] = (byte) (0xff & (length >> 16));
+-    bytes[3] = (byte) (0xff & (length >> 8));
+-    bytes[4] = (byte) (0xff & length);
+-    in.readFully(bytes, 5, length);
+-    return bytes;
+-  }
+-
+-  /**
+-   * Reads the vector following a <code>Type.VECTOR</code> code.
+-   * @return the obtained vector
+-   * @throws IOException
+-   */
+-  @SuppressWarnings("unchecked")
+-  public ArrayList readVector() throws IOException {
+-    int length = readVectorHeader();
+-    ArrayList result = new ArrayList(length);
+-    for (int i = 0; i < length; i++) {
+-      result.add(read());
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.VECTOR</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawVector() throws IOException {
+-    Buffer buffer = new Buffer();
+-    int length = readVectorHeader();
+-    buffer.append(new byte[] {
+-      (byte) Type.VECTOR.code,
+-      (byte) (0xff & (length >> 24)), (byte) (0xff & (length >> 16)),
+-      (byte) (0xff & (length >> 8)), (byte) (0xff & length)
+-    });
+-    for (int i = 0; i < length; i++) {
+-      buffer.append(readRaw());
+-    }
+-    return buffer.get();
+-  }
+-
+-  /**
+-   * Reads the header following a <code>Type.VECTOR</code> code.
+-   * @return the number of elements in the vector
+-   * @throws IOException
+-   */
+-  public int readVectorHeader() throws IOException {
+-    return in.readInt();
+-  }
+-
+-  /**
+-   * Reads the list following a <code>Type.LIST</code> code.
+-   * @return the obtained list
+-   * @throws IOException
+-   */
+-  @SuppressWarnings("unchecked")
+-  public List readList() throws IOException {
+-    List list = new ArrayList();
+-    Object obj = read();
+-    while (obj != null) {
+-      list.add(obj);
+-      obj = read();
+-    }
+-    return list;
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.LIST</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawList() throws IOException {
+-    Buffer buffer = new Buffer(new byte[] { (byte) Type.LIST.code });
+-    byte[] bytes = readRaw();
+-    while (bytes != null) {
+-      buffer.append(bytes);
+-      bytes = readRaw();
+-    }
+-    buffer.append(new byte[] { (byte) Type.MARKER.code });
+-    return buffer.get();
+-  }
+-
+-  /**
+-   * Reads the map following a <code>Type.MAP</code> code.
+-   * @return the obtained map
+-   * @throws IOException
+-   */
+-  @SuppressWarnings("unchecked")
+-  public TreeMap readMap() throws IOException {
+-    int length = readMapHeader();
+-    TreeMap result = new TreeMap();
+-    for (int i = 0; i < length; i++) {
+-      Object key = read();
+-      Object value = read();
+-      result.put(key, value);
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Reads the raw bytes following a <code>Type.MAP</code> code.
+-   * @return the obtained bytes sequence
+-   * @throws IOException
+-   */
+-  public byte[] readRawMap() throws IOException {
+-    Buffer buffer = new Buffer();
+-    int length = readMapHeader();
+-    buffer.append(new byte[] {
+-      (byte) Type.MAP.code,
+-      (byte) (0xff & (length >> 24)), (byte) (0xff & (length >> 16)),
+-      (byte) (0xff & (length >> 8)), (byte) (0xff & length)
+-    });
+-    for (int i = 0; i < length; i++) {
+-      buffer.append(readRaw());
+-      buffer.append(readRaw());
+-    }
+-    return buffer.get();
+-  }
+-
+-  /**
+-   * Reads the header following a <code>Type.MAP</code> code.
+-   * @return the number of key-value pairs in the map
+-   * @throws IOException
+-   */
+-  public int readMapHeader() throws IOException {
+-    return in.readInt();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesOutput.java
+deleted file mode 100644
+index ecb35656c6c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesOutput.java
++++ /dev/null
+@@ -1,334 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.Map.Entry;
+-
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.record.Buffer;
+-
+-/**
+- * Provides functionality for writing typed bytes.
+- */
+-public class TypedBytesOutput {
+-
+-  private DataOutput out;
+-
+-  private TypedBytesOutput() {}
+-
+-  private void setDataOutput(DataOutput out) {
+-    this.out = out;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesOutput> TB_OUT =
+-      new ThreadLocal<TypedBytesOutput>() {
+-    @Override
+-    protected TypedBytesOutput initialValue() {
+-      return new TypedBytesOutput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes output for the supplied {@link DataOutput}.
+-   * 
+-   * @param out data output object
+-   * @return typed bytes output corresponding to the supplied 
+-   * {@link DataOutput}.
+-   */
+-  public static TypedBytesOutput get(DataOutput out) {
+-    TypedBytesOutput bout = TB_OUT.get();
+-    bout.setDataOutput(out);
+-    return bout;
+-  }
+-
+-  /** Creates a new instance of TypedBytesOutput. */
+-  public TypedBytesOutput(DataOutput out) {
+-    this.out = out;
+-  }
+-  
+-  /**
+-   * Writes a Java object as a typed bytes sequence.
+-   * 
+-   * @param obj the object to be written
+-   * @throws IOException
+-   */
+-  public void write(Object obj) throws IOException {
+-    if (obj instanceof Buffer) {
+-      writeBytes((Buffer) obj);
+-    } else if (obj instanceof Byte) {
+-      writeByte((Byte) obj);
+-    } else if (obj instanceof Boolean) {
+-      writeBool((Boolean) obj);
+-    } else if (obj instanceof Integer) {
+-      writeInt((Integer) obj);
+-    } else if (obj instanceof Long) {
+-      writeLong((Long) obj);
+-    } else if (obj instanceof Float) {
+-      writeFloat((Float) obj);
+-    } else if (obj instanceof Double) {
+-      writeDouble((Double) obj);
+-    } else if (obj instanceof String) {
+-      writeString((String) obj);
+-    } else if (obj instanceof ArrayList) {
+-      writeVector((ArrayList) obj);
+-    } else if (obj instanceof List) {
+-      writeList((List) obj);
+-    } else if (obj instanceof Map) {
+-      writeMap((Map) obj);
+-    } else {
+-      throw new RuntimeException("cannot write objects of this type");
+-    }
+-  }
+-
+-  /**
+-   * Writes a raw sequence of typed bytes.
+-   * 
+-   * @param bytes the bytes to be written
+-   * @throws IOException
+-   */
+-  public void writeRaw(byte[] bytes) throws IOException {
+-    out.write(bytes);
+-  }
+-
+-  /**
+-   * Writes a raw sequence of typed bytes.
+-   * 
+-   * @param bytes the bytes to be written
+-   * @param offset an offset in the given array
+-   * @param length number of bytes from the given array to write
+-   * @throws IOException
+-   */
+-  public void writeRaw(byte[] bytes, int offset, int length)
+-    throws IOException {
+-    out.write(bytes, offset, length);
+-  }
+-
+-  /**
+-   * Writes a bytes array as a typed bytes sequence, using a given typecode 
+-   * and length.
+-   * 
+-   * @param bytes the bytes array to be written
+-   * @param code the typecode to use
+-   * @param length the number of bytes to write, starting from position 0
+-   * @throws IOException
+-   */
+-  public void writeBytes(byte[] bytes, int code, int length) throws IOException {
+-    out.write(code);
+-    out.writeInt(length);
+-    out.write(bytes, 0, length);
+-  }
+-  
+-  /**
+-   * Writes a bytes array as a typed bytes sequence, using a given typecode.
+-   * 
+-   * @param bytes the bytes array to be written
+-   * @param code the typecode to use
+-   * @throws IOException
+-   */
+-  public void writeBytes(byte[] bytes, int code) throws IOException {
+-    writeBytes(bytes, code, bytes.length);
+-  }
+-  
+-  /**
+-   * Writes a bytes array as a typed bytes sequence.
+-   * 
+-   * @param bytes the bytes array to be written
+-   * @throws IOException
+-   */
+-  public void writeBytes(byte[] bytes) throws IOException {
+-    writeBytes(bytes, Type.BYTES.code);
+-  }
+-  
+-  /**
+-   * Writes a bytes buffer as a typed bytes sequence.
+-   * 
+-   * @param buffer the bytes buffer to be written
+-   * @throws IOException
+-   */
+-  public void writeBytes(Buffer buffer) throws IOException {
+-    writeBytes(buffer.get(), Type.BYTES.code, buffer.getCount());
+-  }
+-
+-  /**
+-   * Writes a byte as a typed bytes sequence.
+-   * 
+-   * @param b the byte to be written
+-   * @throws IOException
+-   */
+-  public void writeByte(byte b) throws IOException {
+-    out.write(Type.BYTE.code);
+-    out.write(b);
+-  }
+-
+-  /**
+-   * Writes a boolean as a typed bytes sequence.
+-   * 
+-   * @param b the boolean to be written
+-   * @throws IOException
+-   */
+-  public void writeBool(boolean b) throws IOException {
+-    out.write(Type.BOOL.code);
+-    out.writeBoolean(b);
+-  }
+-
+-  /**
+-   * Writes an integer as a typed bytes sequence.
+-   * 
+-   * @param i the integer to be written
+-   * @throws IOException
+-   */
+-  public void writeInt(int i) throws IOException {
+-    out.write(Type.INT.code);
+-    out.writeInt(i);
+-  }
+-
+-  /**
+-   * Writes a long as a typed bytes sequence.
+-   * 
+-   * @param l the long to be written
+-   * @throws IOException
+-   */
+-  public void writeLong(long l) throws IOException {
+-    out.write(Type.LONG.code);
+-    out.writeLong(l);
+-  }
+-
+-  /**
+-   * Writes a float as a typed bytes sequence.
+-   * 
+-   * @param f the float to be written
+-   * @throws IOException
+-   */
+-  public void writeFloat(float f) throws IOException {
+-    out.write(Type.FLOAT.code);
+-    out.writeFloat(f);
+-  }
+-
+-  /**
+-   * Writes a double as a typed bytes sequence.
+-   * 
+-   * @param d the double to be written
+-   * @throws IOException
+-   */
+-  public void writeDouble(double d) throws IOException {
+-    out.write(Type.DOUBLE.code);
+-    out.writeDouble(d);
+-  }
+-
+-  /**
+-   * Writes a string as a typed bytes sequence.
+-   * 
+-   * @param s the string to be written
+-   * @throws IOException
+-   */
+-  public void writeString(String s) throws IOException {
+-    out.write(Type.STRING.code);
+-    WritableUtils.writeString(out, s);
+-  }
+-
+-  /**
+-   * Writes a vector as a typed bytes sequence.
+-   * 
+-   * @param vector the vector to be written
+-   * @throws IOException
+-   */
+-  public void writeVector(ArrayList vector) throws IOException {
+-    writeVectorHeader(vector.size());
+-    for (Object obj : vector) {
+-      write(obj);
+-    }
+-  }
+-
+-  /**
+-   * Writes a vector header.
+-   * 
+-   * @param length the number of elements in the vector
+-   * @throws IOException
+-   */
+-  public void writeVectorHeader(int length) throws IOException {
+-    out.write(Type.VECTOR.code);
+-    out.writeInt(length);
+-  }
+-
+-  /**
+-   * Writes a list as a typed bytes sequence.
+-   * 
+-   * @param list the list to be written
+-   * @throws IOException
+-   */
+-  public void writeList(List list) throws IOException {
+-    writeListHeader();
+-    for (Object obj : list) {
+-      write(obj);
+-    }
+-    writeListFooter();
+-  }
+-
+-  /**
+-   * Writes a list header.
+-   * 
+-   * @throws IOException
+-   */
+-  public void writeListHeader() throws IOException {
+-    out.write(Type.LIST.code);
+-  }
+-
+-  /**
+-   * Writes a list footer.
+-   * 
+-   * @throws IOException
+-   */
+-  public void writeListFooter() throws IOException {
+-    out.write(Type.MARKER.code);
+-  }
+-
+-  /**
+-   * Writes a map as a typed bytes sequence.
+-   * 
+-   * @param map the map to be written
+-   * @throws IOException
+-   */
+-  @SuppressWarnings("unchecked")
+-  public void writeMap(Map map) throws IOException {
+-    writeMapHeader(map.size());
+-    Set<Entry> entries = map.entrySet();
+-    for (Entry entry : entries) {
+-      write(entry.getKey());
+-      write(entry.getValue());
+-    }
+-  }
+-
+-  /**
+-   * Writes a map header.
+-   * 
+-   * @param length the number of key-value pairs in the map
+-   * @throws IOException
+-   */
+-  public void writeMapHeader(int length) throws IOException {
+-    out.write(Type.MAP.code);
+-    out.writeInt(length);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordInput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordInput.java
+deleted file mode 100644
+index e5e918c7d7c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordInput.java
++++ /dev/null
+@@ -1,161 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.DataInput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.record.Buffer;
+-import org.apache.hadoop.record.Index;
+-import org.apache.hadoop.record.RecordInput;
+-
+-/**
+- * Serializer for records that writes typed bytes.
+- */
+-public class TypedBytesRecordInput implements RecordInput {
+-
+-  private TypedBytesInput in;
+-
+-  private TypedBytesRecordInput() {}
+-
+-  private void setTypedBytesInput(TypedBytesInput in) {
+-    this.in = in;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesRecordInput> TB_IN =
+-      new ThreadLocal<TypedBytesRecordInput>() {
+-    @Override
+-    protected TypedBytesRecordInput initialValue() {
+-      return new TypedBytesRecordInput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes record input for the supplied
+-   * {@link TypedBytesInput}.
+-   * 
+-   * @param in typed bytes input object
+-   * @return typed bytes record input corresponding to the supplied
+-   *         {@link TypedBytesInput}.
+-   */
+-  public static TypedBytesRecordInput get(TypedBytesInput in) {
+-    TypedBytesRecordInput bin = TB_IN.get();
+-    bin.setTypedBytesInput(in);
+-    return bin;
+-  }
+-
+-  /**
+-   * Get a thread-local typed bytes record input for the supplied
+-   * {@link DataInput}.
+-   * 
+-   * @param in data input object
+-   * @return typed bytes record input corresponding to the supplied
+-   *         {@link DataInput}.
+-   */
+-  public static TypedBytesRecordInput get(DataInput in) {
+-    return get(TypedBytesInput.get(in));
+-  }
+-
+-  /** Creates a new instance of TypedBytesRecordInput. */
+-  public TypedBytesRecordInput(TypedBytesInput in) {
+-    this.in = in;
+-  }
+-
+-  /** Creates a new instance of TypedBytesRecordInput. */
+-  public TypedBytesRecordInput(DataInput in) {
+-    this(new TypedBytesInput(in));
+-  }
+-
+-  public boolean readBool(String tag) throws IOException {
+-    in.skipType();
+-    return in.readBool();
+-  }
+-
+-  public Buffer readBuffer(String tag) throws IOException {
+-    in.skipType();
+-    return new Buffer(in.readBytes());
+-  }
+-
+-  public byte readByte(String tag) throws IOException {
+-    in.skipType();
+-    return in.readByte();
+-  }
+-
+-  public double readDouble(String tag) throws IOException {
+-    in.skipType();
+-    return in.readDouble();
+-  }
+-
+-  public float readFloat(String tag) throws IOException {
+-    in.skipType();
+-    return in.readFloat();
+-  }
+-
+-  public int readInt(String tag) throws IOException {
+-    in.skipType();
+-    return in.readInt();
+-  }
+-
+-  public long readLong(String tag) throws IOException {
+-    in.skipType();
+-    return in.readLong();
+-  }
+-
+-  public String readString(String tag) throws IOException {
+-    in.skipType();
+-    return in.readString();
+-  }
+-
+-  public void startRecord(String tag) throws IOException {
+-    in.skipType();
+-  }
+-
+-  public Index startVector(String tag) throws IOException {
+-    in.skipType();
+-    return new TypedBytesIndex(in.readVectorHeader());
+-  }
+-
+-  public Index startMap(String tag) throws IOException {
+-    in.skipType();
+-    return new TypedBytesIndex(in.readMapHeader());
+-  }
+-
+-  public void endRecord(String tag) throws IOException {}
+-
+-  public void endVector(String tag) throws IOException {}
+-
+-  public void endMap(String tag) throws IOException {}
+-
+-  private static  final class TypedBytesIndex implements Index {
+-    private int nelems;
+-
+-    private TypedBytesIndex(int nelems) {
+-      this.nelems = nelems;
+-    }
+-
+-    public boolean done() {
+-      return (nelems <= 0);
+-    }
+-
+-    public void incr() {
+-      nelems--;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordOutput.java
+deleted file mode 100644
+index 8f55206f7d3..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesRecordOutput.java
++++ /dev/null
+@@ -1,139 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.TreeMap;
+-
+-import org.apache.hadoop.record.Buffer;
+-import org.apache.hadoop.record.Record;
+-import org.apache.hadoop.record.RecordOutput;
+-
+-/**
+- * Deserialized for records that reads typed bytes.
+- */
+-public class TypedBytesRecordOutput implements RecordOutput {
+-
+-  private TypedBytesOutput out;
+-
+-  private TypedBytesRecordOutput() {}
+-
+-  private void setTypedBytesOutput(TypedBytesOutput out) {
+-    this.out = out;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesRecordOutput> TB_OUT =
+-      new ThreadLocal<TypedBytesRecordOutput>() {
+-    @Override
+-    protected TypedBytesRecordOutput initialValue() {
+-      return new TypedBytesRecordOutput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes record input for the supplied
+-   * {@link TypedBytesOutput}.
+-   * 
+-   * @param out typed bytes output object
+-   * @return typed bytes record output corresponding to the supplied
+-   *         {@link TypedBytesOutput}.
+-   */
+-  public static TypedBytesRecordOutput get(TypedBytesOutput out) {
+-    TypedBytesRecordOutput bout = TB_OUT.get();
+-    bout.setTypedBytesOutput(out);
+-    return bout;
+-  }
+-
+-  /**
+-   * Get a thread-local typed bytes record output for the supplied
+-   * {@link DataOutput}.
+-   * 
+-   * @param out data output object
+-   * @return typed bytes record output corresponding to the supplied
+-   *         {@link DataOutput}.
+-   */
+-  public static TypedBytesRecordOutput get(DataOutput out) {
+-    return get(TypedBytesOutput.get(out));
+-  }
+-
+-  /** Creates a new instance of TypedBytesRecordOutput. */
+-  public TypedBytesRecordOutput(TypedBytesOutput out) {
+-    this.out = out;
+-  }
+-
+-  /** Creates a new instance of TypedBytesRecordOutput. */
+-  public TypedBytesRecordOutput(DataOutput out) {
+-    this(new TypedBytesOutput(out));
+-  }
+-
+-  public void writeBool(boolean b, String tag) throws IOException {
+-    out.writeBool(b);
+-  }
+-
+-  public void writeBuffer(Buffer buf, String tag) throws IOException {
+-    out.writeBytes(buf.get());
+-  }
+-
+-  public void writeByte(byte b, String tag) throws IOException {
+-    out.writeByte(b);
+-  }
+-
+-  public void writeDouble(double d, String tag) throws IOException {
+-    out.writeDouble(d);
+-  }
+-
+-  public void writeFloat(float f, String tag) throws IOException {
+-    out.writeFloat(f);
+-  }
+-
+-  public void writeInt(int i, String tag) throws IOException {
+-    out.writeInt(i);
+-  }
+-
+-  public void writeLong(long l, String tag) throws IOException {
+-    out.writeLong(l);
+-  }
+-
+-  public void writeString(String s, String tag) throws IOException {
+-    out.writeString(s);
+-  }
+-
+-  public void startRecord(Record r, String tag) throws IOException {
+-    out.writeListHeader();
+-  }
+-
+-  public void startVector(ArrayList v, String tag) throws IOException {
+-    out.writeVectorHeader(v.size());
+-  }
+-
+-  public void startMap(TreeMap m, String tag) throws IOException {
+-    out.writeMapHeader(m.size());
+-  }
+-
+-  public void endRecord(Record r, String tag) throws IOException {
+-    out.writeListFooter();
+-  }
+-
+-  public void endVector(ArrayList v, String tag) throws IOException {}
+-
+-  public void endMap(TreeMap m, String tag) throws IOException {}
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritable.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritable.java
+deleted file mode 100644
+index d0cca560059..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritable.java
++++ /dev/null
+@@ -1,88 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.io.BytesWritable;
+-
+-/**
+- * Writable for typed bytes.
+- */
+-public class TypedBytesWritable extends BytesWritable {
+-
+-  /** Create a TypedBytesWritable. */
+-  public TypedBytesWritable() {
+-    super();
+-  }
+-
+-  /** Create a TypedBytesWritable with a given byte array as initial value. */
+-  public TypedBytesWritable(byte[] bytes) {
+-    super(bytes);
+-  }
+-
+-  /** Set the typed bytes from a given Java object. */
+-  public void setValue(Object obj) {
+-    try {
+-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-      TypedBytesOutput tbo = TypedBytesOutput.get(new DataOutputStream(baos));
+-      tbo.write(obj);
+-      byte[] bytes = baos.toByteArray();
+-      set(bytes, 0, bytes.length);
+-    } catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  /** Get the typed bytes as a Java object. */
+-  public Object getValue() {
+-    try {
+-      ByteArrayInputStream bais = new ByteArrayInputStream(getBytes());
+-      TypedBytesInput tbi = TypedBytesInput.get(new DataInputStream(bais));
+-      Object obj = tbi.read();
+-      return obj;
+-    } catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  /** Get the type code embedded in the first byte. */
+-  public Type getType() {
+-    byte[] bytes = getBytes();
+-    if (bytes == null || bytes.length == 0) {
+-      return null;
+-    }
+-    for (Type type : Type.values()) {
+-      if (type.code == (int) bytes[0]) {
+-        return type;
+-      }
+-    }
+-    return null;
+-  }
+-
+-  /** Generate a suitable string representation. */
+-  public String toString() {
+-    return getValue().toString();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableInput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableInput.java
+deleted file mode 100644
+index 70b2100361c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableInput.java
++++ /dev/null
+@@ -1,385 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.DataInput;
+-import java.io.DataInputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.ArrayWritable;
+-import org.apache.hadoop.io.BooleanWritable;
+-import org.apache.hadoop.io.ByteWritable;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.DoubleWritable;
+-import org.apache.hadoop.io.FloatWritable;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.MapWritable;
+-import org.apache.hadoop.io.SortedMapWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.VIntWritable;
+-import org.apache.hadoop.io.VLongWritable;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.util.ReflectionUtils;
+-
+-/**
+- * Provides functionality for reading typed bytes as Writable objects.
+- * 
+- * @see TypedBytesInput
+- */
+-public class TypedBytesWritableInput implements Configurable {
+-
+-  private TypedBytesInput in;
+-  private Configuration conf;
+-
+-  private TypedBytesWritableInput() {
+-    conf = new Configuration();
+-  }
+-
+-  private void setTypedBytesInput(TypedBytesInput in) {
+-    this.in = in;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesWritableInput> TB_IN =
+-      new ThreadLocal<TypedBytesWritableInput>() {
+-    @Override
+-    protected TypedBytesWritableInput initialValue() {
+-      return new TypedBytesWritableInput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes writable input for the supplied
+-   * {@link TypedBytesInput}.
+-   * 
+-   * @param in typed bytes input object
+-   * @return typed bytes writable input corresponding to the supplied
+-   *         {@link TypedBytesInput}.
+-   */
+-  public static TypedBytesWritableInput get(TypedBytesInput in) {
+-    TypedBytesWritableInput bin = TB_IN.get();
+-    bin.setTypedBytesInput(in);
+-    return bin;
+-  }
+-
+-  /**
+-   * Get a thread-local typed bytes writable input for the supplied
+-   * {@link DataInput}.
+-   * 
+-   * @param in data input object
+-   * @return typed bytes writable input corresponding to the supplied
+-   *         {@link DataInput}.
+-   */
+-  public static TypedBytesWritableInput get(DataInput in) {
+-    return get(TypedBytesInput.get(in));
+-  }
+-
+-  /** Creates a new instance of TypedBytesWritableInput. */
+-  public TypedBytesWritableInput(TypedBytesInput in) {
+-    this();
+-    this.in = in;
+-  }
+-
+-  /** Creates a new instance of TypedBytesWritableInput. */
+-  public TypedBytesWritableInput(DataInput din) {
+-    this(new TypedBytesInput(din));
+-  }
+-
+-  public Writable read() throws IOException {
+-    Type type = in.readType();
+-    if (type == null) {
+-      return null;
+-    }
+-    switch (type) {
+-    case BYTES:
+-      return readBytes();
+-    case BYTE:
+-      return readByte();
+-    case BOOL:
+-      return readBoolean();
+-    case INT:
+-      return readVInt();
+-    case LONG:
+-      return readVLong();
+-    case FLOAT:
+-      return readFloat();
+-    case DOUBLE:
+-      return readDouble();
+-    case STRING:
+-      return readText();
+-    case VECTOR:
+-      return readArray();
+-    case MAP:
+-      return readMap();
+-    case WRITABLE:
+-      return readWritable();
+-    default:
+-      throw new RuntimeException("unknown type");
+-    }
+-  }
+-
+-  public Class<? extends Writable> readType() throws IOException {
+-    Type type = in.readType();
+-    if (type == null) {
+-      return null;
+-    }
+-    switch (type) {
+-    case BYTES:
+-      return BytesWritable.class;
+-    case BYTE:
+-      return ByteWritable.class;
+-    case BOOL:
+-      return BooleanWritable.class;
+-    case INT:
+-      return VIntWritable.class;
+-    case LONG:
+-      return VLongWritable.class;
+-    case FLOAT:
+-      return FloatWritable.class;
+-    case DOUBLE:
+-      return DoubleWritable.class;
+-    case STRING:
+-      return Text.class;
+-    case VECTOR:
+-      return ArrayWritable.class;
+-    case MAP:
+-      return MapWritable.class;
+-    case WRITABLE:
+-      return Writable.class;
+-    default:
+-      throw new RuntimeException("unknown type");
+-    }
+-  }
+-
+-  public BytesWritable readBytes(BytesWritable bw) throws IOException {
+-    byte[] bytes = in.readBytes();
+-    if (bw == null) {
+-      bw = new BytesWritable(bytes);
+-    } else {
+-      bw.set(bytes, 0, bytes.length);
+-    }
+-    return bw;
+-  }
+-
+-  public BytesWritable readBytes() throws IOException {
+-    return readBytes(null);
+-  }
+-
+-  public ByteWritable readByte(ByteWritable bw) throws IOException {
+-    if (bw == null) {
+-      bw = new ByteWritable();
+-    }
+-    bw.set(in.readByte());
+-    return bw;
+-  }
+-
+-  public ByteWritable readByte() throws IOException {
+-    return readByte(null);
+-  }
+-
+-  public BooleanWritable readBoolean(BooleanWritable bw) throws IOException {
+-    if (bw == null) {
+-      bw = new BooleanWritable();
+-    }
+-    bw.set(in.readBool());
+-    return bw;
+-  }
+-
+-  public BooleanWritable readBoolean() throws IOException {
+-    return readBoolean(null);
+-  }
+-
+-  public IntWritable readInt(IntWritable iw) throws IOException {
+-    if (iw == null) {
+-      iw = new IntWritable();
+-    }
+-    iw.set(in.readInt());
+-    return iw;
+-  }
+-
+-  public IntWritable readInt() throws IOException {
+-    return readInt(null);
+-  }
+-
+-  public VIntWritable readVInt(VIntWritable iw) throws IOException {
+-    if (iw == null) {
+-      iw = new VIntWritable();
+-    }
+-    iw.set(in.readInt());
+-    return iw;
+-  }
+-
+-  public VIntWritable readVInt() throws IOException {
+-    return readVInt(null);
+-  }
+-
+-  public LongWritable readLong(LongWritable lw) throws IOException {
+-    if (lw == null) {
+-      lw = new LongWritable();
+-    }
+-    lw.set(in.readLong());
+-    return lw;
+-  }
+-
+-  public LongWritable readLong() throws IOException {
+-    return readLong(null);
+-  }
+-
+-  public VLongWritable readVLong(VLongWritable lw) throws IOException {
+-    if (lw == null) {
+-      lw = new VLongWritable();
+-    }
+-    lw.set(in.readLong());
+-    return lw;
+-  }
+-
+-  public VLongWritable readVLong() throws IOException {
+-    return readVLong(null);
+-  }
+-
+-  public FloatWritable readFloat(FloatWritable fw) throws IOException {
+-    if (fw == null) {
+-      fw = new FloatWritable();
+-    }
+-    fw.set(in.readFloat());
+-    return fw;
+-  }
+-
+-  public FloatWritable readFloat() throws IOException {
+-    return readFloat(null);
+-  }
+-
+-  public DoubleWritable readDouble(DoubleWritable dw) throws IOException {
+-    if (dw == null) {
+-      dw = new DoubleWritable();
+-    }
+-    dw.set(in.readDouble());
+-    return dw;
+-  }
+-
+-  public DoubleWritable readDouble() throws IOException {
+-    return readDouble(null);
+-  }
+-
+-  public Text readText(Text t) throws IOException {
+-    if (t == null) {
+-      t = new Text();
+-    }
+-    t.set(in.readString());
+-    return t;
+-  }
+-
+-  public Text readText() throws IOException {
+-    return readText(null);
+-  }
+-
+-  public ArrayWritable readArray(ArrayWritable aw) throws IOException {
+-    if (aw == null) {
+-      aw = new ArrayWritable(TypedBytesWritable.class);
+-    } else if (!aw.getValueClass().equals(TypedBytesWritable.class)) {
+-      throw new RuntimeException("value class has to be TypedBytesWritable");
+-    }
+-    int length = in.readVectorHeader();
+-    Writable[] writables = new Writable[length];
+-    for (int i = 0; i < length; i++) {
+-      writables[i] = new TypedBytesWritable(in.readRaw());
+-    }
+-    aw.set(writables);
+-    return aw;
+-  }
+-
+-  public ArrayWritable readArray() throws IOException {
+-    return readArray(null);
+-  }
+-
+-  public MapWritable readMap(MapWritable mw) throws IOException {
+-    if (mw == null) {
+-      mw = new MapWritable();
+-    }
+-    int length = in.readMapHeader();
+-    for (int i = 0; i < length; i++) {
+-      Writable key = read();
+-      Writable value = read();
+-      mw.put(key, value);
+-    }
+-    return mw;
+-  }
+-
+-  public MapWritable readMap() throws IOException {
+-    return readMap(null);
+-  }
+-
+-  public <K extends WritableComparable<? super K>>
+-    SortedMapWritable<K> readSortedMap(SortedMapWritable<K> mw)
+-    throws IOException {
+-    if (mw == null) {
+-      mw = new SortedMapWritable<K>();
+-    }
+-    int length = in.readMapHeader();
+-    for (int i = 0; i < length; i++) {
+-      @SuppressWarnings("unchecked")
+-      K key = (K) read();
+-      Writable value = read();
+-      mw.put(key, value);
+-    }
+-    return mw;
+-  }
+-
+-  public <K extends WritableComparable<? super K>> SortedMapWritable<K>
+-    readSortedMap() throws IOException {
+-    return readSortedMap((SortedMapWritable<K>)null);
+-  }
+-  
+-  public Writable readWritable(Writable writable) throws IOException {
+-    ByteArrayInputStream bais = new ByteArrayInputStream(in.readBytes());
+-    DataInputStream dis = new DataInputStream(bais);
+-    String className = WritableUtils.readString(dis);
+-    if (writable == null) {
+-      try {
+-        Class<? extends Writable> cls = 
+-          conf.getClassByName(className).asSubclass(Writable.class);
+-        writable = (Writable) ReflectionUtils.newInstance(cls, conf);
+-      } catch (ClassNotFoundException e) {
+-        throw new IOException(e);
+-      }
+-    } else if (!writable.getClass().getName().equals(className)) {
+-      throw new IOException("wrong Writable class given");
+-    }
+-    writable.readFields(dis);
+-    return writable;
+-  }
+-
+-  public Writable readWritable() throws IOException {
+-    return readWritable(null);
+-  }
+-
+-  public Configuration getConf() {
+-    return conf;
+-  }
+-
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableOutput.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableOutput.java
+deleted file mode 100644
+index e7afe93548c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/TypedBytesWritableOutput.java
++++ /dev/null
+@@ -1,224 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataOutput;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.util.Arrays;
+-import java.util.Map;
+-
+-import org.apache.hadoop.io.ArrayWritable;
+-import org.apache.hadoop.io.BooleanWritable;
+-import org.apache.hadoop.io.ByteWritable;
+-import org.apache.hadoop.io.BytesWritable;
+-import org.apache.hadoop.io.DoubleWritable;
+-import org.apache.hadoop.io.FloatWritable;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.MapWritable;
+-import org.apache.hadoop.io.SortedMapWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.VIntWritable;
+-import org.apache.hadoop.io.VLongWritable;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.record.Record;
+-
+-/**
+- * Provides functionality for writing Writable objects as typed bytes.
+- * 
+- * @see TypedBytesOutput
+- */
+-public class TypedBytesWritableOutput {
+-
+-  private TypedBytesOutput out;
+-
+-  private TypedBytesWritableOutput() {}
+-
+-  private void setTypedBytesOutput(TypedBytesOutput out) {
+-    this.out = out;
+-  }
+-
+-  private static final ThreadLocal<TypedBytesWritableOutput> TB_OUT =
+-      new ThreadLocal<TypedBytesWritableOutput>() {
+-    @Override
+-    protected TypedBytesWritableOutput initialValue() {
+-      return new TypedBytesWritableOutput();
+-    }
+-  };
+-
+-  /**
+-   * Get a thread-local typed bytes writable input for the supplied
+-   * {@link TypedBytesOutput}.
+-   * 
+-   * @param out typed bytes output object
+-   * @return typed bytes writable output corresponding to the supplied
+-   *         {@link TypedBytesOutput}.
+-   */
+-  public static TypedBytesWritableOutput get(TypedBytesOutput out) {
+-    TypedBytesWritableOutput bout = TB_OUT.get();
+-    bout.setTypedBytesOutput(out);
+-    return bout;
+-  }
+-
+-  /**
+-   * Get a thread-local typed bytes writable output for the supplied
+-   * {@link DataOutput}.
+-   * 
+-   * @param out data output object
+-   * @return typed bytes writable output corresponding to the supplied
+-   *         {@link DataOutput}.
+-   */
+-  public static TypedBytesWritableOutput get(DataOutput out) {
+-    return get(TypedBytesOutput.get(out));
+-  }
+-
+-  /** Creates a new instance of TypedBytesWritableOutput. */
+-  public TypedBytesWritableOutput(TypedBytesOutput out) {
+-    this();
+-    this.out = out;
+-  }
+-
+-  /** Creates a new instance of TypedBytesWritableOutput. */
+-  public TypedBytesWritableOutput(DataOutput dout) {
+-    this(new TypedBytesOutput(dout));
+-  }
+-
+-  public void write(Writable w) throws IOException {
+-    if (w instanceof TypedBytesWritable) {
+-      writeTypedBytes((TypedBytesWritable) w);
+-    } else if (w instanceof BytesWritable) {
+-      writeBytes((BytesWritable) w);
+-    } else if (w instanceof ByteWritable) {
+-      writeByte((ByteWritable) w);
+-    } else if (w instanceof BooleanWritable) {
+-      writeBoolean((BooleanWritable) w);
+-    } else if (w instanceof IntWritable) {
+-      writeInt((IntWritable) w);
+-    } else if (w instanceof VIntWritable) {
+-      writeVInt((VIntWritable) w);
+-    } else if (w instanceof LongWritable) {
+-      writeLong((LongWritable) w);
+-    } else if (w instanceof VLongWritable) {
+-      writeVLong((VLongWritable) w);
+-    } else if (w instanceof FloatWritable) {
+-      writeFloat((FloatWritable) w);
+-    } else if (w instanceof DoubleWritable) {
+-      writeDouble((DoubleWritable) w);
+-    } else if (w instanceof Text) {
+-      writeText((Text) w);
+-    } else if (w instanceof ArrayWritable) {
+-      writeArray((ArrayWritable) w);
+-    } else if (w instanceof MapWritable) {
+-      writeMap((MapWritable) w);
+-    } else if (w instanceof SortedMapWritable) {
+-      writeSortedMap((SortedMapWritable<?>) w);
+-    } else if (w instanceof Record) {
+-      writeRecord((Record) w);
+-    } else {
+-      writeWritable(w); // last resort
+-    }
+-  }
+-
+-  public void writeTypedBytes(TypedBytesWritable tbw) throws IOException {
+-    out.writeRaw(tbw.getBytes(), 0, tbw.getLength());
+-  }
+-
+-  public void writeBytes(BytesWritable bw) throws IOException {
+-    byte[] bytes = Arrays.copyOfRange(bw.getBytes(), 0, bw.getLength());
+-    out.writeBytes(bytes);
+-  }
+-
+-  public void writeByte(ByteWritable bw) throws IOException {
+-    out.writeByte(bw.get());
+-  }
+-
+-  public void writeBoolean(BooleanWritable bw) throws IOException {
+-    out.writeBool(bw.get());
+-  }
+-
+-  public void writeInt(IntWritable iw) throws IOException {
+-    out.writeInt(iw.get());
+-  }
+-
+-  public void writeVInt(VIntWritable viw) throws IOException {
+-    out.writeInt(viw.get());
+-  }
+-
+-  public void writeLong(LongWritable lw) throws IOException {
+-    out.writeLong(lw.get());
+-  }
+-
+-  public void writeVLong(VLongWritable vlw) throws IOException {
+-    out.writeLong(vlw.get());
+-  }
+-
+-  public void writeFloat(FloatWritable fw) throws IOException {
+-    out.writeFloat(fw.get());
+-  }
+-
+-  public void writeDouble(DoubleWritable dw) throws IOException {
+-    out.writeDouble(dw.get());
+-  }
+-
+-  public void writeText(Text t) throws IOException {
+-    out.writeString(t.toString());
+-  }
+-
+-  public void writeArray(ArrayWritable aw) throws IOException {
+-    Writable[] writables = aw.get();
+-    out.writeVectorHeader(writables.length);
+-    for (Writable writable : writables) {
+-      write(writable);
+-    }
+-  }
+-
+-  public void writeMap(MapWritable mw) throws IOException {
+-    out.writeMapHeader(mw.size());
+-    for (Map.Entry<Writable, Writable> entry : mw.entrySet()) {
+-      write(entry.getKey());
+-      write(entry.getValue());
+-    }
+-  }
+-
+-  public void writeSortedMap(SortedMapWritable<?> smw) throws IOException {
+-    out.writeMapHeader(smw.size());
+-    for (Map.Entry<? extends WritableComparable<?>, Writable> entry : smw.entrySet()) {
+-      write(entry.getKey());
+-      write(entry.getValue());
+-    }
+-  }
+-
+-  public void writeRecord(Record r) throws IOException {
+-    r.serialize(TypedBytesRecordOutput.get(out));
+-  }
+-
+-  public void writeWritable(Writable w) throws IOException {
+-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-    DataOutputStream dos = new DataOutputStream(baos);
+-    WritableUtils.writeString(dos, w.getClass().getName());
+-    w.write(dos);
+-    dos.close();
+-    out.writeBytes(baos.toByteArray(), Type.WRITABLE.code);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html
+deleted file mode 100644
+index 3494fbd8586..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html
++++ /dev/null
+@@ -1,67 +0,0 @@
+-<html>
+-
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<body>
+-
+-Typed bytes are sequences of bytes in which the first byte is a type code. They are especially useful as a 
+-(simple and very straightforward) binary format for transferring data to and from Hadoop Streaming programs.
+-
+-<h3>Type Codes</h3>
+-
+-Each typed bytes sequence starts with an unsigned byte that contains the type code. Possible values are:
+-
+-<table border="1" cellpadding="2" summary="Type Codes">
+-<tr><th>Code</th><th>Type</th></tr>
+-<tr><td><i>0</i></td><td>A sequence of bytes.</td></tr>
+-<tr><td><i>1</i></td><td>A byte.</td></tr>
+-<tr><td><i>2</i></td><td>A boolean.</td></tr>
+-<tr><td><i>3</i></td><td>An integer.</td></tr>
+-<tr><td><i>4</i></td><td>A long.</td></tr>
+-<tr><td><i>5</i></td><td>A float.</td></tr>
+-<tr><td><i>6</i></td><td>A double.</td></tr>
+-<tr><td><i>7</i></td><td>A string.</td></tr>
+-<tr><td><i>8</i></td><td>A vector.</td></tr>
+-<tr><td><i>9</i></td><td>A list.</td></tr>
+-<tr><td><i>10</i></td><td>A map.</td></tr>
+-</table>
+-
+-The type codes <i>50</i> to <i>200</i> are treated as aliases for <i>0</i>, and can thus be used for
+-application-specific serialization.
+-
+-<h3>Subsequent Bytes</h3>
+-
+-These are the subsequent bytes for the different type codes (everything is big-endian and unpadded):
+-
+-<table border="1" cellpadding="2" summary="Subsequent Bytes">
+-<tr><th>Code</th><th>Subsequent Bytes</th></tr>
+-<tr><td><i>0</i></td><td>&lt;32-bit signed integer&gt; &lt;as many bytes as indicated by the integer&gt;</td></tr>
+-<tr><td><i>1</i></td><td>&lt;signed byte&gt;</td></tr>
+-<tr><td><i>2</i></td><td>&lt;signed byte (<i>0</i> = <i>false</i> and <i>1</i> = <i>true</i>)&gt;</td></tr>
+-<tr><td><i>3</i></td><td>&lt;32-bit signed integer&gt;</td></tr>
+-<tr><td><i>4</i></td><td>&lt;64-bit signed integer&gt;</td></tr>
+-<tr><td><i>5</i></td><td>&lt;32-bit IEEE floating point number&gt;</td></tr>
+-<tr><td><i>6</i></td><td>&lt;64-bit IEEE floating point number&gt;</td></tr>
+-<tr><td><i>7</i></td><td>&lt;32-bit signed integer&gt; &lt;as many UTF-8 bytes as indicated by the integer&gt;</td></tr>
+-<tr><td><i>8</i></td><td>&lt;32-bit signed integer&gt; &lt;as many typed bytes sequences as indicated by the integer&gt;</td></tr>
+-<tr><td><i>9</i></td><td>&lt;variable number of typed bytes sequences&gt; &lt;<i>255</i> written as an unsigned byte&gt;</td></tr>
+-<tr><td><i>10</i></td><td>&lt;32-bit signed integer&gt; &lt;as many (key-value) pairs of typed bytes sequences as indicated by the integer&gt;</td></tr>
+-</table>
+-
+-</body>
+-</html>
+diff --git a/hadoop-tools/hadoop-streaming/src/main/shellprofile.d/hadoop-streaming.sh b/hadoop-tools/hadoop-streaming/src/main/shellprofile.d/hadoop-streaming.sh
+deleted file mode 100755
+index be76b060595..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/main/shellprofile.d/hadoop-streaming.sh
++++ /dev/null
+@@ -1,51 +0,0 @@
+-#!/usr/bin/env bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-if ! declare -f mapred_subcommand_streaming >/dev/null 2>/dev/null; then
+-
+-  if [[ "${HADOOP_SHELL_EXECNAME}" = mapred ]]; then
+-    hadoop_add_subcommand "streaming" client "launch a mapreduce streaming job"
+-  fi
+-
+-## @description  streaming command for mapred
+-## @audience     public
+-## @stability    stable
+-## @replaceable  yes
+-function mapred_subcommand_streaming
+-{
+-  declare jarname
+-  declare oldifs
+-
+-  # shellcheck disable=SC2034
+-  HADOOP_CLASSNAME=org.apache.hadoop.util.RunJar
+-  hadoop_add_to_classpath_tools hadoop-streaming
+-
+-  # locate the streaming jar so we have something to
+-  # give to RunJar
+-  oldifs=${IFS}
+-  IFS=:
+-  for jarname in ${CLASSPATH}; do
+-    if [[ "${jarname}" =~ hadoop-streaming-[0-9] ]]; then
+-      HADOOP_SUBCMD_ARGS=("${jarname}" "${HADOOP_SUBCMD_ARGS[@]}")
+-      break
+-    fi
+-  done
+-
+-  IFS=${oldifs}
+-}
+-
+-fi
+diff --git a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm b/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
+deleted file mode 100644
+index f125b631b43..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/site/markdown/HadoopStreaming.md.vm
++++ /dev/null
+@@ -1,576 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-#set ( $H3 = '###' )
+-#set ( $H4 = '####' )
+-#set ( $H5 = '#####' )
+-
+-Hadoop Streaming
+-================
+-
+-* [Hadoop Streaming](#Hadoop_Streaming)
+-    * [Hadoop Streaming](#Hadoop_Streaming)
+-    * [How Streaming Works](#How_Streaming_Works)
+-    * [Streaming Command Options](#Streaming_Command_Options)
+-        * [Specifying a Java Class as the Mapper/Reducer](#Specifying_a_Java_Class_as_the_MapperReducer)
+-        * [Packaging Files With Job Submissions](#Packaging_Files_With_Job_Submissions)
+-        * [Specifying Other Plugins for Jobs](#Specifying_Other_Plugins_for_Jobs)
+-        * [Setting Environment Variables](#Setting_Environment_Variables)
+-    * [Generic Command Options](#Generic_Command_Options)
+-        * [Specifying Configuration Variables with the -D Option](#Specifying_Configuration_Variables_with_the_-D_Option)
+-            * [Specifying Directories](#Specifying_Directories)
+-            * [Specifying Map-Only Jobs](#Specifying_Map-Only_Jobs)
+-            * [Specifying the Number of Reducers](#Specifying_the_Number_of_Reducers)
+-            * [Customizing How Lines are Split into Key/Value Pairs](#Customizing_How_Lines_are_Split_into_KeyValue_Pairs)
+-        * [Working with Large Files and Archives](#Working_with_Large_Files_and_Archives)
+-            * [Making Files Available to Tasks](#Making_Files_Available_to_Tasks)
+-            * [Making Archives Available to Tasks](#Making_Archives_Available_to_Tasks)
+-    * [More Usage Examples](#More_Usage_Examples)
+-        * [Hadoop Partitioner Class](#Hadoop_Partitioner_Class)
+-        * [Hadoop Comparator Class](#Hadoop_Comparator_Class)
+-        * [Hadoop Aggregate Package](#Hadoop_Aggregate_Package)
+-        * [Hadoop Field Selection Class](#Hadoop_Field_Selection_Class)
+-    * [Frequently Asked Questions](#Frequently_Asked_Questions)
+-        * [How do I use Hadoop Streaming to run an arbitrary set of (semi) independent tasks?](#How_do_I_use_Hadoop_Streaming_to_run_an_arbitrary_set_of_semi_independent_tasks)
+-        * [How do I process files, one per map?](#How_do_I_process_files_one_per_map)
+-        * [How many reducers should I use?](#How_many_reducers_should_I_use)
+-        * [If I set up an alias in my shell script, will that work after -mapper?](#If_I_set_up_an_alias_in_my_shell_script_will_that_work_after_-mapper)
+-        * [Can I use UNIX pipes?](#Can_I_use_UNIX_pipes)
+-        * [What do I do if I get the "No space left on device" error?](#What_do_I_do_if_I_get_the_No_space_left_on_device_error)
+-        * [How do I specify multiple input directories?](#How_do_I_specify_multiple_input_directories)
+-        * [How do I generate output files with gzip format?](#How_do_I_generate_output_files_with_gzip_format)
+-        * [How do I provide my own input/output format with streaming?](#How_do_I_provide_my_own_inputoutput_format_with_streaming)
+-        * [How do I parse XML documents using streaming?](#How_do_I_parse_XML_documents_using_streaming)
+-        * [How do I update counters in streaming applications?](#How_do_I_update_counters_in_streaming_applications)
+-        * [How do I update status in streaming applications?](#How_do_I_update_status_in_streaming_applications)
+-        * [How do I get the Job variables in a streaming job's mapper/reducer?](#How_do_I_get_the_Job_variables_in_a_streaming_jobs_mapperreducer)
+-        * [What do I do if I get a "error=7, Argument list too long"](#What_do_I_do_if_I_get_a_error_Argument_list_too_long)
+-
+-Hadoop Streaming
+-----------------
+-
+-Hadoop streaming is a utility that comes with the Hadoop distribution. The utility allows you to create and run Map/Reduce jobs with any executable or script as the mapper and/or the reducer. For example:
+-
+-    mapred streaming \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper /bin/cat \
+-      -reducer /usr/bin/wc
+-
+-How Streaming Works
+--------------------
+-
+-In the above example, both the mapper and the reducer are executables that read the input from stdin (line by line) and emit the output to stdout. The utility will create a Map/Reduce job, submit the job to an appropriate cluster, and monitor the progress of the job until it completes.
+-
+-When an executable is specified for mappers, each mapper task will launch the executable as a separate process when the mapper is initialized. As the mapper task runs, it converts its inputs into lines and feed the lines to the stdin of the process. In the meantime, the mapper collects the line oriented outputs from the stdout of the process and converts each line into a key/value pair, which is collected as the output of the mapper. By default, the *prefix of a line up to the first tab character* is the `key` and the rest of the line (excluding the tab character) will be the `value`. If there is no tab character in the line, then entire line is considered as key and the value is null. However, this can be customized by setting `-inputformat` command option, as discussed later.
+-
+-When an executable is specified for reducers, each reducer task will launch the executable as a separate process then the reducer is initialized. As the reducer task runs, it converts its input key/values pairs into lines and feeds the lines to the stdin of the process. In the meantime, the reducer collects the line oriented outputs from the stdout of the process, converts each line into a key/value pair, which is collected as the output of the reducer. By default, the prefix of a line up to the first tab character is the key and the rest of the line (excluding the tab character) is the value. However, this can be customized by setting `-outputformat` command option, as discussed later.
+-
+-This is the basis for the communication protocol between the Map/Reduce framework and the streaming mapper/reducer.
+-
+-User can specify `stream.non.zero.exit.is.failure` as `true` or `false` to make a streaming task that exits with a non-zero status to be `Failure` or `Success` respectively. By default, streaming tasks exiting with non-zero status are considered to be failed tasks.
+-
+-Streaming Command Options
+--------------------------
+-
+-Streaming supports streaming command options as well as [generic command options](#Generic_Command_Options). The general command line syntax is shown below.
+-
+-**Note:** Be sure to place the generic options before the streaming options, otherwise the command will fail. For an example, see [Making Archives Available to Tasks](#Making_Archives_Available_to_Tasks).
+-
+-    mapred streaming [genericOptions] [streamingOptions]
+-
+-The Hadoop streaming command options are listed here:
+-
+-| Parameter | Optional/Required | Description |
+-|:---- |:---- |:---- |
+-| -input directoryname or filename | Required | Input location for mapper |
+-| -output directoryname | Required | Output location for reducer |
+-| -mapper executable or JavaClassName | Optional | Mapper executable. If not specified, IdentityMapper is used as the default |
+-| -reducer executable or JavaClassName | Optional | Reducer executable. If not specified, IdentityReducer is used as the default |
+-| -file filename | Optional | Make the mapper, reducer, or combiner executable available locally on the compute nodes |
+-| -inputformat JavaClassName | Optional | Class you supply should return key/value pairs of Text class. If not specified, TextInputFormat is used as the default |
+-| -outputformat JavaClassName | Optional | Class you supply should take key/value pairs of Text class. If not specified, TextOutputformat is used as the default |
+-| -partitioner JavaClassName | Optional | Class that determines which reduce a key is sent to |
+-| -combiner streamingCommand or JavaClassName | Optional | Combiner executable for map output |
+-| -cmdenv name=value | Optional | Pass environment variable to streaming commands |
+-| -inputreader | Optional | For backwards-compatibility: specifies a record reader class (instead of an input format class) |
+-| -verbose | Optional | Verbose output |
+-| -lazyOutput | Optional | Create output lazily. For example, if the output format is based on FileOutputFormat, the output file is created only on the first call to Context.write |
+-| -numReduceTasks | Optional | Specify the number of reducers |
+-| -mapdebug | Optional | Script to call when map task fails |
+-| -reducedebug | Optional | Script to call when reduce task fails |
+-
+-$H3 Specifying a Java Class as the Mapper/Reducer
+-
+-You can supply a Java class as the mapper and/or the reducer.
+-
+-    mapred streaming \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -inputformat org.apache.hadoop.mapred.KeyValueTextInputFormat \
+-      -mapper org.apache.hadoop.mapred.lib.IdentityMapper \
+-      -reducer /usr/bin/wc
+-
+-You can specify `stream.non.zero.exit.is.failure` as `true` or `false` to make a streaming task that exits with a non-zero status to be `Failure` or `Success` respectively. By default, streaming tasks exiting with non-zero status are considered to be failed tasks.
+-
+-$H3 Packaging Files With Job Submissions
+-
+-You can specify any executable as the mapper and/or the reducer. The executables do not need to pre-exist on the machines in the cluster; however, if they don't, you will need to use "-file" option to tell the framework to pack your executable files as a part of job submission. For example:
+-
+-    mapred streaming \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper myPythonScript.py \
+-      -reducer /usr/bin/wc \
+-      -file myPythonScript.py
+-
+-The above example specifies a user defined Python executable as the mapper. The option "-file myPythonScript.py" causes the python executable shipped to the cluster machines as a part of job submission.
+-
+-In addition to executable files, you can also package other auxiliary files (such as dictionaries, configuration files, etc) that may be used by the mapper and/or the reducer. For example:
+-
+-    mapred streaming \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper myPythonScript.py \
+-      -reducer /usr/bin/wc \
+-      -file myPythonScript.py \
+-      -file myDictionary.txt
+-
+-$H3 Specifying Other Plugins for Jobs
+-
+-Just as with a normal Map/Reduce job, you can specify other plugins for a streaming job:
+-
+-     -inputformat JavaClassName
+-     -outputformat JavaClassName
+-     -partitioner JavaClassName
+-     -combiner streamingCommand or JavaClassName
+-
+-The class you supply for the input format should return key/value pairs of Text class. If you do not specify an input format class, the TextInputFormat is used as the default. Since the TextInputFormat returns keys of LongWritable class, which are actually not part of the input data, the keys will be discarded; only the values will be piped to the streaming mapper.
+-
+-The class you supply for the output format is expected to take key/value pairs of Text class. If you do not specify an output format class, the TextOutputFormat is used as the default.
+-
+-$H3 Setting Environment Variables
+-
+-To set an environment variable in a streaming command use:
+-
+-     -cmdenv EXAMPLE_DIR=/home/example/dictionaries/
+-
+-Generic Command Options
+------------------------
+-
+-Streaming supports [streaming command options](#Streaming_Command_Options) as well as generic command options. The general command line syntax is shown below.
+-
+-**Note:** Be sure to place the generic options before the streaming options, otherwise the command will fail. For an example, see [Making Archives Available to Tasks](#Making_Archives_Available_to_Tasks).
+-
+-    hadoop command [genericOptions] [streamingOptions]
+-
+-The Hadoop generic command options you can use with streaming are listed here:
+-
+-| Parameter | Optional/Required | Description |
+-|:---- |:---- |:---- |
+-| -conf configuration\_file | Optional | Specify an application configuration file |
+-| -D property=value | Optional | Use value for given property |
+-| -fs host:port or local | Optional | Specify a namenode |
+-| -files | Optional | Specify comma-separated files to be copied to the Map/Reduce cluster |
+-| -libjars | Optional | Specify comma-separated jar files to include in the classpath |
+-| -archives | Optional | Specify comma-separated archives to be unarchived on the compute machines |
+-
+-$H3 Specifying Configuration Variables with the -D Option
+-
+-You can specify additional configuration variables by using "-D \<property\>=\<value\>".
+-
+-$H4 Specifying Directories
+-
+-To change the local temp directory use:
+-
+-     -D dfs.data.dir=/tmp
+-
+-To specify additional local temp directories use:
+-
+-     -D mapred.local.dir=/tmp/local
+-     -D mapred.system.dir=/tmp/system
+-     -D mapred.temp.dir=/tmp/temp
+-
+-**Note:** For more details on job configuration parameters see: [mapred-default.xml](../hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml)
+-
+-$H4 Specifying Map-Only Jobs
+-
+-Often, you may want to process input data using a map function only. To do this, simply set `mapreduce.job.reduces` to zero. The Map/Reduce framework will not create any reducer tasks. Rather, the outputs of the mapper tasks will be the final output of the job.
+-
+-     -D mapreduce.job.reduces=0
+-
+-To be backward compatible, Hadoop Streaming also supports the "-reducer NONE" option, which is equivalent to "-D mapreduce.job.reduces=0".
+-
+-$H4 Specifying the Number of Reducers
+-
+-To specify the number of reducers, for example two, use:
+-
+-    mapred streaming \
+-      -D mapreduce.job.reduces=2 \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper /bin/cat \
+-      -reducer /usr/bin/wc
+-
+-$H4 Customizing How Lines are Split into Key/Value Pairs
+-
+-As noted earlier, when the Map/Reduce framework reads a line from the stdout of the mapper, it splits the line into a key/value pair. By default, the prefix of the line up to the first tab character is the key and the rest of the line (excluding the tab character) is the value.
+-
+-However, you can customize this default. You can specify a field separator other than the tab character (the default), and you can specify the nth (n \>= 1) character rather than the first character in a line (the default) as the separator between the key and value. For example:
+-
+-    mapred streaming \
+-      -D stream.map.output.field.separator=. \
+-      -D stream.num.map.output.key.fields=4 \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper /bin/cat \
+-      -reducer /bin/cat
+-
+-In the above example, "-D stream.map.output.field.separator=." specifies "." as the field separator for the map outputs, and the prefix up to the fourth "." in a line will be the key and the rest of the line (excluding the fourth ".") will be the value. If a line has less than four "."s, then the whole line will be the key and the value will be an empty Text object (like the one created by new Text("")).
+-
+-Similarly, you can use "-D stream.reduce.output.field.separator=SEP" and "-D stream.num.reduce.output.fields=NUM" to specify the nth field separator in a line of the reduce outputs as the separator between the key and the value.
+-
+-Similarly, you can specify "stream.map.input.field.separator" and "stream.reduce.input.field.separator" as the input separator for Map/Reduce inputs. By default the separator is the tab character.
+-
+-$H3 Working with Large Files and Archives
+-
+-The -files and -archives options allow you to make files and archives available to the tasks. The argument is a URI to the file or archive that you have already uploaded to HDFS. These files and archives are cached across jobs. You can retrieve the host and fs\_port values from the fs.default.name config variable.
+-
+-**Note:** The -files and -archives options are generic options. Be sure to place the generic options before the command options, otherwise the command will fail.
+-
+-$H4 Making Files Available to Tasks
+-
+-The -files option creates a symlink in the current working directory of the tasks that points to the local copy of the file.
+-
+-In this example, Hadoop automatically creates a symlink named testfile.txt in the current working directory of the tasks. This symlink points to the local copy of testfile.txt.
+-
+-    -files hdfs://host:fs_port/user/testfile.txt
+-
+-User can specify a different symlink name for -files using \#.
+-
+-    -files hdfs://host:fs_port/user/testfile.txt#testfile
+-
+-Multiple entries can be specified like this:
+-
+-    -files hdfs://host:fs_port/user/testfile1.txt,hdfs://host:fs_port/user/testfile2.txt
+-
+-$H4 Making Archives Available to Tasks
+-
+-The -archives option allows you to copy jars locally to the current working directory of tasks and automatically unjar the files.
+-
+-In this example, Hadoop automatically creates a symlink named testfile.jar in the current working directory of tasks. This symlink points to the directory that stores the unjarred contents of the uploaded jar file.
+-
+-    -archives hdfs://host:fs_port/user/testfile.jar
+-
+-User can specify a different symlink name for -archives using \#.
+-
+-    -archives hdfs://host:fs_port/user/testfile.tgz#tgzdir
+-
+-In this example, the input.txt file has two lines specifying the names of the two files: cachedir.jar/cache.txt and cachedir.jar/cache2.txt. "cachedir.jar" is a symlink to the archived directory, which has the files "cache.txt" and "cache2.txt".
+-
+-    mapred streaming \
+-                    -archives 'hdfs://hadoop-nn1.example.com/user/me/samples/cachefile/cachedir.jar' \
+-                    -D mapreduce.job.maps=1 \
+-                    -D mapreduce.job.reduces=1 \
+-                    -D mapreduce.job.name="Experiment" \
+-                    -input "/user/me/samples/cachefile/input.txt" \
+-                    -output "/user/me/samples/cachefile/out" \
+-                    -mapper "xargs cat" \
+-                    -reducer "cat"
+-    
+-    $ ls test_jar/
+-    cache.txt  cache2.txt
+-    
+-    $ jar cvf cachedir.jar -C test_jar/ .
+-    added manifest
+-    adding: cache.txt(in = 30) (out= 29)(deflated 3%)
+-    adding: cache2.txt(in = 37) (out= 35)(deflated 5%)
+-    
+-    $ hdfs dfs -put cachedir.jar samples/cachefile
+-    
+-    $ hdfs dfs -cat /user/me/samples/cachefile/input.txt
+-    cachedir.jar/cache.txt
+-    cachedir.jar/cache2.txt
+-    
+-    $ cat test_jar/cache.txt
+-    This is just the cache string
+-    
+-    $ cat test_jar/cache2.txt
+-    This is just the second cache string
+-    
+-    $ hdfs dfs -ls /user/me/samples/cachefile/out
+-    Found 2 items
+-    -rw-r--r-* 1 me supergroup        0 2013-11-14 17:00 /user/me/samples/cachefile/out/_SUCCESS
+-    -rw-r--r-* 1 me supergroup       69 2013-11-14 17:00 /user/me/samples/cachefile/out/part-00000
+-    
+-    $ hdfs dfs -cat /user/me/samples/cachefile/out/part-00000
+-    This is just the cache string
+-    This is just the second cache string
+-
+-More Usage Examples
+--------------------
+-
+-$H3 Hadoop Partitioner Class
+-
+-Hadoop has a library class, [KeyFieldBasedPartitioner](../api/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.html), that is useful for many applications. This class allows the Map/Reduce framework to partition the map outputs based on certain key fields, not the whole keys. For example:
+-
+-    mapred streaming \
+-      -D stream.map.output.field.separator=. \
+-      -D stream.num.map.output.key.fields=4 \
+-      -D map.output.key.field.separator=. \
+-      -D mapreduce.partition.keypartitioner.options=-k1,2 \
+-      -D mapreduce.job.reduces=12 \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper /bin/cat \
+-      -reducer /bin/cat \
+-      -partitioner org.apache.hadoop.mapred.lib.KeyFieldBasedPartitioner
+-
+-Here, *-D stream.map.output.field.separator=.* and *-D stream.num.map.output.key.fields=4* are as explained in previous example. The two variables are used by streaming to identify the key/value pair of mapper.
+-
+-The map output keys of the above Map/Reduce job normally have four fields separated by ".". However, the Map/Reduce framework will partition the map outputs by the first two fields of the keys using the *-D mapred.text.key.partitioner.options=-k1,2* option. Here, *-D map.output.key.field.separator=.* specifies the separator for the partition. This guarantees that all the key/value pairs with the same first two fields in the keys will be partitioned into the same reducer.
+-
+-*This is effectively equivalent to specifying the first two fields as the primary key and the next two fields as the secondary. The primary key is used for partitioning, and the combination of the primary and secondary keys is used for sorting.* A simple illustration is shown here:
+-
+-Output of map (the keys)
+-
+-    11.12.1.2
+-    11.14.2.3
+-    11.11.4.1
+-    11.12.1.1
+-    11.14.2.2
+-
+-Partition into 3 reducers (the first 2 fields are used as keys for partition)
+-
+-    11.11.4.1
+-    -----------
+-    11.12.1.2
+-    11.12.1.1
+-    -----------
+-    11.14.2.3
+-    11.14.2.2
+-
+-Sorting within each partition for the reducer(all 4 fields used for sorting)
+-
+-    11.11.4.1
+-    -----------
+-    11.12.1.1
+-    11.12.1.2
+-    -----------
+-    11.14.2.2
+-    11.14.2.3
+-
+-$H3 Hadoop Comparator Class
+-
+-Hadoop has a library class, [KeyFieldBasedComparator](../api/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.html), that is useful for many applications. This class provides a subset of features provided by the Unix/GNU Sort. For example:
+-
+-    mapred streaming \
+-      -D mapreduce.job.output.key.comparator.class=org.apache.hadoop.mapreduce.lib.partition.KeyFieldBasedComparator \
+-      -D stream.map.output.field.separator=. \
+-      -D stream.num.map.output.key.fields=4 \
+-      -D mapreduce.map.output.key.field.separator=. \
+-      -D mapreduce.partition.keycomparator.options=-k2,2nr \
+-      -D mapreduce.job.reduces=1 \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper /bin/cat \
+-      -reducer /bin/cat
+-
+-The map output keys of the above Map/Reduce job normally have four fields separated by ".". However, the Map/Reduce framework will sort the outputs by the second field of the keys using the *-D mapreduce.partition.keycomparator.options=-k2,2nr* option. Here, *-n* specifies that the sorting is numerical sorting and *-r* specifies that the result should be reversed. A simple illustration is shown below:
+-
+-Output of map (the keys)
+-
+-    11.12.1.2
+-    11.14.2.3
+-    11.11.4.1
+-    11.12.1.1
+-    11.14.2.2
+-
+-Sorting output for the reducer (where second field used for sorting)
+-
+-    11.14.2.3
+-    11.14.2.2
+-    11.12.1.2
+-    11.12.1.1
+-    11.11.4.1
+-
+-$H3 Hadoop Aggregate Package
+-
+-Hadoop has a library package called [Aggregate](../api/org/apache/hadoop/mapred/lib/aggregate/package-summary.html). Aggregate provides a special reducer class and a special combiner class, and a list of simple aggregators that perform aggregations such as "sum", "max", "min" and so on over a sequence of values. Aggregate allows you to define a mapper plugin class that is expected to generate "aggregatable items" for each input key/value pair of the mappers. The combiner/reducer will aggregate those aggregatable items by invoking the appropriate aggregators.
+-
+-To use Aggregate, simply specify "-reducer aggregate":
+-
+-    mapred streaming \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper myAggregatorForKeyCount.py \
+-      -reducer aggregate \
+-      -file myAggregatorForKeyCount.py
+-
+-The python program myAggregatorForKeyCount.py looks like:
+-
+-    #!/usr/bin/python3
+-
+-    import sys
+-
+-    def generateLongCountToken(id):
+-        return "LongValueSum:" + id + "\t" + "1"
+-
+-    def main(argv):
+-        line = sys.stdin.readline()
+-        try:
+-            while line:
+-                line = line[:-1]
+-                fields = line.split("\t")
+-                print(generateLongCountToken(fields[0]))
+-                line = sys.stdin.readline()
+-        except "end of file":
+-            return None
+-
+-    if __name__ == "__main__":
+-         main(sys.argv)
+-
+-$H3 Hadoop Field Selection Class
+-
+-Hadoop has a library class, [FieldSelectionMapReduce](../api/org/apache/hadoop/mapred/lib/FieldSelectionMapReduce.html), that effectively allows you to process text data like the unix "cut" utility. The map function defined in the class treats each input key/value pair as a list of fields. You can specify the field separator (the default is the tab character). You can select an arbitrary list of fields as the map output key, and an arbitrary list of fields as the map output value. Similarly, the reduce function defined in the class treats each input key/value pair as a list of fields. You can select an arbitrary list of fields as the reduce output key, and an arbitrary list of fields as the reduce output value. For example:
+-
+-    mapred streaming \
+-      -D mapreduce.map.output.key.field.separator=. \
+-      -D mapreduce.partition.keypartitioner.options=-k1,2 \
+-      -D mapreduce.fieldsel.data.field.separator=. \
+-      -D mapreduce.fieldsel.map.output.key.value.fields.spec=6,5,1-3:0- \
+-      -D mapreduce.fieldsel.reduce.output.key.value.fields.spec=0-2:5- \
+-      -D mapreduce.map.output.key.class=org.apache.hadoop.io.Text \
+-      -D mapreduce.job.reduces=12 \
+-      -input myInputDirs \
+-      -output myOutputDir \
+-      -mapper org.apache.hadoop.mapred.lib.FieldSelectionMapReduce \
+-      -reducer org.apache.hadoop.mapred.lib.FieldSelectionMapReduce \
+-      -partitioner org.apache.hadoop.mapred.lib.KeyFieldBasedPartitioner
+-
+-The option "-D mapreduce.fieldsel.map.output.key.value.fields.spec=6,5,1-3:0-" specifies key/value selection for the map outputs. Key selection spec and value selection spec are separated by ":". In this case, the map output key will consist of fields 6, 5, 1, 2, and 3. The map output value will consist of all fields (0- means field 0 and all the subsequent fields).
+-
+-The option "-D mapreduce.fieldsel.reduce.output.key.value.fields.spec=0-2:5-" specifies key/value selection for the reduce outputs. In this case, the reduce output key will consist of fields 0, 1, 2 (corresponding to the original fields 6, 5, 1). The reduce output value will consist of all fields starting from field 5 (corresponding to all the original fields).
+-
+-Frequently Asked Questions
+---------------------------
+-
+-$H3 How do I use Hadoop Streaming to run an arbitrary set of (semi) independent tasks?
+-
+-Often you do not need the full power of Map Reduce, but only need to run multiple instances of the same program - either on different parts of the data, or on the same data, but with different parameters. You can use Hadoop Streaming to do this.
+-
+-$H3 How do I process files, one per map?
+-
+-As an example, consider the problem of zipping (compressing) a set of files across the hadoop cluster. You can achieve this by using Hadoop Streaming and custom mapper script:
+-
+-*   Generate a file containing the full HDFS path of the input files. Each map
+-    task would get one file name as input.
+-
+-*   Create a mapper script which, given a filename, will get the file to local
+-    disk, gzip the file and put it back in the desired output directory.
+-
+-$H3 How many reducers should I use?
+-
+-See MapReduce Tutorial for details: [Reducer](../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduceTutorial.html#Reducer)
+-
+-$H3 If I set up an alias in my shell script, will that work after -mapper?
+-
+-For example, say I do: alias c1='cut -f1'. Will -mapper "c1" work?
+-
+-Using an alias will not work, but variable substitution is allowed as shown in this example:
+-
+-    $ hdfs dfs -cat /user/me/samples/student_marks
+-    alice   50
+-    bruce   70
+-    charlie 80
+-    dan     75
+-
+-    $ c2='cut -f2'; mapred streaming \
+-      -D mapreduce.job.name='Experiment' \
+-      -input /user/me/samples/student_marks \
+-      -output /user/me/samples/student_out \
+-      -mapper "$c2" -reducer 'cat'
+-
+-    $ hdfs dfs -cat /user/me/samples/student_out/part-00000
+-    50
+-    70
+-    75
+-    80
+-
+-$H3 Can I use UNIX pipes?
+-
+-For example, will -mapper "cut -f1 | sed s/foo/bar/g" work?
+-
+-Currently this does not work and gives an "java.io.IOException: Broken pipe" error. This is probably a bug that needs to be investigated.
+-
+-$H3 What do I do if I get the "No space left on device" error?
+-
+-For example, when I run a streaming job by distributing large executables (for example, 3.6G) through the -file option, I get a "No space left on device" error.
+-
+-The jar packaging happens in a directory pointed to by the configuration variable stream.tmpdir. The default value of stream.tmpdir is /tmp. Set the value to a directory with more space:
+-
+-  -D stream.tmpdir=/export/bigspace/...
+-
+-$H3 How do I specify multiple input directories?
+-
+-You can specify multiple input directories with multiple '-input' options:
+-
+-    mapred streaming \
+-      -input '/user/foo/dir1' -input '/user/foo/dir2' \
+-        (rest of the command)
+-
+-$H3 How do I generate output files with gzip format?
+-
+-Instead of plain text files, you can generate gzip files as your generated output. Pass '-D mapreduce.output.fileoutputformat.compress=true -D mapreduce.output.fileoutputformat.compress.codec=org.apache.hadoop.io.compress.GzipCodec' as option to your streaming job.
+-
+-$H3 How do I provide my own input/output format with streaming?
+-
+-You can specify your own custom class by packing them and putting the custom jar to `$HADOOP_CLASSPATH`.
+-
+-$H3 How do I parse XML documents using streaming?
+-
+-You can use the record reader StreamXmlRecordReader to process XML documents.
+-
+-    mapred streaming \
+-      -inputreader "StreamXmlRecord,begin=BEGIN_STRING,end=END_STRING" \
+-        (rest of the command)
+-
+-Anything found between BEGIN\_STRING and END\_STRING would be treated as one record for map tasks.
+-
+-The name-value properties that StreamXmlRecordReader understands are:
+-
+-*   (strings) 'begin' - Characters marking beginning of record, and 'end' - Characters marking end of record.
+-*   (boolean) 'slowmatch' - Toggle to look for begin and end characters, but within CDATA instead of regular tags. Defaults to false.
+-*   (integer) 'lookahead' - Maximum lookahead bytes to sync CDATA when using 'slowmatch', should be larger than 'maxrec'. Defaults to 2*'maxrec'.
+-*   (integer) 'maxrec' - Maximum record size to read between each match during 'slowmatch'. Defaults to 50000 bytes.
+-
+-$H3 How do I update counters in streaming applications?
+-
+-A streaming process can use the stderr to emit counter information. `reporter:counter:<group>,<counter>,<amount>` should be sent to stderr to update the counter.
+-
+-$H3 How do I update status in streaming applications?
+-
+-A streaming process can use the stderr to emit status information. To set a status, `reporter:status:<message>` should be sent to stderr.
+-
+-$H3 How do I get the Job variables in a streaming job's mapper/reducer?
+-
+-See [Configured Parameters](../hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduceTutorial.html#Configured_Parameters). During the execution of a streaming job, the names of the "mapred" parameters are transformed. The dots ( . ) become underscores ( \_ ). For example, mapreduce.job.id becomes mapreduce\_job\_id and mapreduce.job.jar becomes mapreduce\_job\_jar. In your code, use the parameter names with the underscores.
+-
+-$H3 What do I do if I get a "error=7, Argument list too long"
+-
+-The job copies the whole configuration to the environment. If the job is processing a large number of input files adding the job configuration to the environment could cause an overrun of the environment. The job configuration copy in the environment is not essential for running the job and can be truncated by setting:
+-
+-  -D stream.jobconf.truncate.limit=20000
+-
+-By default the values are not truncated (-1). Zero (0) will only copy the names and not values. For almost all cases 20000 is a safe value that will prevent the overrun of the environment.
+diff --git a/hadoop-tools/hadoop-streaming/src/site/resources/css/site.css b/hadoop-tools/hadoop-streaming/src/site/resources/css/site.css
+deleted file mode 100644
+index f830baafa8c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/site/resources/css/site.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+-* Licensed to the Apache Software Foundation (ASF) under one or more
+-* contributor license agreements.  See the NOTICE file distributed with
+-* this work for additional information regarding copyright ownership.
+-* The ASF licenses this file to You under the Apache License, Version 2.0
+-* (the "License"); you may not use this file except in compliance with
+-* the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-#banner {
+-  height: 93px;
+-  background: none;
+-}
+-
+-#bannerLeft img {
+-  margin-left: 30px;
+-  margin-top: 10px;
+-}
+-
+-#bannerRight img {
+-  margin: 17px;
+-}
+-
+diff --git a/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd b/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
+deleted file mode 100644
+index 4b38e3e3b4b..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
++++ /dev/null
+@@ -1,18 +0,0 @@
+-@rem Licensed to the Apache Software Foundation (ASF) under one
+-@rem or more contributor license agreements.  See the NOTICE file
+-@rem distributed with this work for additional information
+-@rem regarding copyright ownership.  The ASF licenses this file
+-@rem to you under the Apache License, Version 2.0 (the
+-@rem "License"); you may not use this file except in compliance
+-@rem with the License.  You may obtain a copy of the License at
+-@rem
+-@rem     http://www.apache.org/licenses/LICENSE-2.0
+-@rem
+-@rem Unless required by applicable law or agreed to in writing, software
+-@rem distributed under the License is distributed on an "AS IS" BASIS,
+-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-@rem See the License for the specific language governing permissions and
+-@rem limitations under the License.
+-
+-@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @echo %%A
+-@rem lines have been copied from stdin to stdout
+diff --git a/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd b/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
+deleted file mode 100644
+index f398a8d65c3..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
++++ /dev/null
+@@ -1,18 +0,0 @@
+-@rem Licensed to the Apache Software Foundation (ASF) under one
+-@rem or more contributor license agreements.  See the NOTICE file
+-@rem distributed with this work for additional information
+-@rem regarding copyright ownership.  The ASF licenses this file
+-@rem to you under the Apache License, Version 2.0 (the
+-@rem "License"); you may not use this file except in compliance
+-@rem with the License.  You may obtain a copy of the License at
+-@rem
+-@rem     http://www.apache.org/licenses/LICENSE-2.0
+-@rem
+-@rem Unless required by applicable law or agreed to in writing, software
+-@rem distributed under the License is distributed on an "AS IS" BASIS,
+-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-@rem See the License for the specific language governing permissions and
+-@rem limitations under the License.
+-
+-@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @type %%A
+-@rem files named on stdin have been copied to stdout
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/ClassWithNoPackage.java b/hadoop-tools/hadoop-streaming/src/test/java/ClassWithNoPackage.java
+deleted file mode 100644
+index 5bb597ffa56..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/ClassWithNoPackage.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-public class ClassWithNoPackage {
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/DelayEchoApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/DelayEchoApp.java
+deleted file mode 100644
+index a912dc9c23b..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/DelayEchoApp.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-/**
+- * A simple Java app that will consume all input from stdin, wait a few seconds
+- * and echoing it to stdout.
+- */
+-public class DelayEchoApp {
+-
+-  public DelayEchoApp() {
+-  }
+-
+-  public void go(int seconds) throws IOException, InterruptedException {
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-
+-    // Consume all input (to make sure streaming will still count this
+-    // task as failed even if all input was consumed).
+-    while ((line = in.readLine()) != null) {
+-      Thread.sleep(seconds * 1000L);
+-      System.out.println(line);
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException, InterruptedException {
+-    int seconds = 5;
+-    if (args.length >= 1) {
+-      try {
+-        seconds = Integer.parseInt(args[0]);
+-      } catch (NumberFormatException e) {
+-        // just use default 5.
+-      }
+-    }
+-
+-    DelayEchoApp app = new DelayEchoApp();
+-    app.go(seconds);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/FailApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/FailApp.java
+deleted file mode 100644
+index 47479564ef2..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/FailApp.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-/**
+- * A simple Java app that will consume all input from stdin, echoing
+- * it to stdout, and then optionally throw an exception (which should
+- * cause a non-zero exit status for the process).
+- */
+-public class FailApp
+-{
+-
+-  public FailApp() {
+-  }
+-
+-  public void go(boolean fail) throws IOException {
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-
+-    // Consume all input (to make sure streaming will still count this
+-    // task as failed even if all input was consumed).
+-    while ((line = in.readLine()) != null) {
+-      System.out.println(line);
+-    }
+-
+-    if (fail) {
+-      throw new RuntimeException("Intentionally failing task");
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException {
+-    boolean fail = true;
+-    if (args.length >= 1 && "false".equals(args[0])) {
+-      fail = false;
+-    }
+-    
+-    FailApp app = new FailApp();
+-    app.go(fail);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
+deleted file mode 100644
+index 0a659ce187a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/OutputOnlyApp.java
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-
+-/**
+- * An application that outputs a specified number of lines
+- * without consuming any input.
+- */
+-public class OutputOnlyApp {
+-  public static void main(String[] args) throws IOException {
+-    if (args.length < 1) {
+-      System.err.println("Usage: OutputOnlyApp NUMRECORDS");
+-      return;
+-    }
+-    int numRecords = Integer.parseInt(args[0]);
+-    while (numRecords-- > 0) {
+-      System.out.println("key\tvalue");
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesMapApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesMapApp.java
+deleted file mode 100644
+index e9c2740ee88..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesMapApp.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.BufferedReader;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.io.IntWritable;
+-
+-public class RawBytesMapApp {
+-  private String find;
+-  private DataOutputStream dos;
+-
+-  public RawBytesMapApp(String find) {
+-    this.find = find;
+-    dos = new DataOutputStream(System.out);
+-  }
+-
+-  public void go() throws IOException {
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-    while ((line = in.readLine()) != null) {
+-      for (String part : line.split(find)) {
+-        writeString(part);  // write key
+-        writeInt(1);        // write value
+-      }
+-    }
+-    System.out.flush();
+-  }
+-  
+-  public static void main(String[] args) throws IOException {
+-    RawBytesMapApp app = new RawBytesMapApp(args[0].replace(".","\\."));
+-    app.go();
+-  }
+-  
+-  private void writeString(String str) throws IOException {
+-    byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
+-    dos.writeInt(bytes.length);
+-    dos.write(bytes);
+-  }
+-  
+-  private void writeInt(int i) throws IOException {
+-    dos.writeInt(4);
+-    IntWritable iw = new IntWritable(i);
+-    iw.write(dos);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesReduceApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesReduceApp.java
+deleted file mode 100644
+index 4a21f11f58c..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/RawBytesReduceApp.java
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataInputStream;
+-import java.io.EOFException;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.io.IntWritable;
+-
+-public class RawBytesReduceApp {
+-  private DataInputStream dis;
+-
+-  public RawBytesReduceApp() {
+-    dis = new DataInputStream(System.in);
+-  }
+-  
+-  public void go() throws IOException {
+-    String prevKey = null;
+-    int sum = 0;
+-    String key = readString();
+-    while (key != null) {
+-      if (prevKey != null && !key.equals(prevKey)) {
+-        System.out.println(prevKey + "\t" + sum);
+-        sum = 0;
+-      }
+-      sum += readInt();
+-      prevKey = key;
+-      key = readString();
+-    }
+-    System.out.println(prevKey + "\t" + sum);
+-    System.out.flush();
+-  }
+-
+-  public static void main(String[] args) throws IOException {
+-    RawBytesReduceApp app = new RawBytesReduceApp();
+-    app.go();
+-  }
+-  
+-  private String readString() throws IOException {
+-    int length;
+-    try {
+-      length = dis.readInt();
+-    } catch (EOFException eof) {
+-      return null;
+-    }
+-    byte[] bytes = new byte[length];
+-    dis.readFully(bytes);
+-    return new String(bytes, StandardCharsets.UTF_8);
+-  }
+-  
+-  private int readInt() throws IOException {
+-    dis.readInt(); // ignore (we know it's 4)
+-    IntWritable iw = new IntWritable();
+-    iw.readFields(dis);
+-    return iw.get();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StderrApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StderrApp.java
+deleted file mode 100644
+index 17c90537576..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StderrApp.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-/**
+- * Output an arbitrary number of stderr lines before or after
+- * consuming the keys/values from stdin.
+- */
+-public class StderrApp
+-{
+-  /**
+-   * Print preWriteLines to stderr, pausing sleep ms between each
+-   * output, then consume stdin and echo it to stdout, then write
+-   * postWriteLines to stderr.
+-   */
+-  public static void go(int preWriteLines, int sleep, int postWriteLines) throws IOException {
+-    go(preWriteLines, sleep, postWriteLines, false);
+-  }
+-  
+-  public static void go(int preWriteLines, int sleep, int postWriteLines, boolean status) throws IOException {
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-    
+-    if (status) {
+-      System.err.println("reporter:status:starting echo");
+-    }      
+-       
+-    while (preWriteLines > 0) {
+-      --preWriteLines;
+-      System.err.println("some stderr output before reading input, "
+-                         + preWriteLines + " lines remaining, sleeping " + sleep);
+-      try {
+-        Thread.sleep(sleep);
+-      } catch (InterruptedException e) {}
+-    }
+-    
+-    while ((line = in.readLine()) != null) {
+-      System.out.println(line);
+-    }
+-    
+-    while (postWriteLines > 0) {
+-      --postWriteLines;
+-      System.err.println("some stderr output after reading input, lines remaining "
+-                         + postWriteLines);
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException {
+-    if (args.length < 3) {
+-      System.err.println("Usage: StderrApp PREWRITE SLEEP POSTWRITE [STATUS]");
+-      return;
+-    }
+-    int preWriteLines = Integer.parseInt(args[0]);
+-    int sleep = Integer.parseInt(args[1]);
+-    int postWriteLines = Integer.parseInt(args[2]);
+-    boolean status = args.length > 3 ? Boolean.parseBoolean(args[3]) : false;
+-    
+-    go(preWriteLines, sleep, postWriteLines, status);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StreamAggregate.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StreamAggregate.java
+deleted file mode 100644
+index 2a3236ac70f..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/StreamAggregate.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-import org.apache.hadoop.streaming.Environment;
+-
+-/** 
+-    Used to test the usage of external applications without adding
+-    platform-specific dependencies.
+- */
+-public class StreamAggregate extends TrApp
+-{
+-
+-  public StreamAggregate()
+-  {
+-    super('.', ' ');
+-  }
+-
+-  public void go() throws IOException
+-  {
+-    testParentJobConfToEnvVars();
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-
+-    while ((line = in.readLine()) != null) {
+-      String [] words = line.split(" ");
+-      for (int i = 0; i< words.length; i++) {
+-        String out = "LongValueSum:" + words[i].trim() + "\t" + "1";
+-        System.out.println(out);
+-      }
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException
+-  {
+-    TrApp app = new StreamAggregate();
+-    app.go();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestAutoInputFormat.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestAutoInputFormat.java
+deleted file mode 100644
+index 4ff3f54ecfb..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestAutoInputFormat.java
++++ /dev/null
+@@ -1,113 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-import java.io.OutputStreamWriter;
+-import java.io.Writer;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.InputSplit;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.FileInputFormat;
+-import org.apache.hadoop.mapred.RecordReader;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.streaming.AutoInputFormat;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestAutoInputFormat {
+-
+-  private static Configuration conf = new Configuration();
+-
+-  private static final int LINES_COUNT = 3;
+-
+-  private static final int RECORDS_COUNT = 3;
+-
+-  private static final int SPLITS_COUNT = 2;
+-
+-  @SuppressWarnings( { "unchecked", "deprecation" })
+-  @Test
+-  public void testFormat() throws IOException {
+-    JobConf job = new JobConf(conf);
+-    FileSystem fs = FileSystem.getLocal(conf);
+-    Path dir = new Path(System.getProperty("test.build.data", ".") + "/mapred");
+-    Path txtFile = new Path(dir, "auto.txt");
+-    Path seqFile = new Path(dir, "auto.seq");
+-
+-    fs.delete(dir, true);
+-
+-    FileInputFormat.setInputPaths(job, dir);
+-
+-    Writer txtWriter = new OutputStreamWriter(fs.create(txtFile));
+-    try {
+-      for (int i = 0; i < LINES_COUNT; i++) {
+-        txtWriter.write("" + (10 * i));
+-        txtWriter.write("\n");
+-      }
+-    } finally {
+-      txtWriter.close();
+-    }
+-
+-    SequenceFile.Writer seqWriter = SequenceFile.createWriter(fs, conf,
+-      seqFile, IntWritable.class, LongWritable.class);
+-    try {
+-      for (int i = 0; i < RECORDS_COUNT; i++) {
+-        IntWritable key = new IntWritable(11 * i);
+-        LongWritable value = new LongWritable(12 * i);
+-        seqWriter.append(key, value);
+-      }
+-    } finally {
+-      seqWriter.close();
+-    }
+-
+-    AutoInputFormat format = new AutoInputFormat();
+-    InputSplit[] splits = format.getSplits(job, SPLITS_COUNT);
+-    for (InputSplit split : splits) {
+-      RecordReader reader = format.getRecordReader(split, job, Reporter.NULL);
+-      Object key = reader.createKey();
+-      Object value = reader.createValue();
+-      try {
+-        while (reader.next(key, value)) {
+-          if (key instanceof LongWritable) {
+-            assertEquals("Wrong value class.", Text.class, value.getClass());
+-            assertTrue("Invalid value", Integer.parseInt(((Text) value)
+-              .toString()) % 10 == 0);
+-          } else {
+-            assertEquals("Wrong key class.", IntWritable.class, key.getClass());
+-            assertEquals("Wrong value class.", LongWritable.class, value
+-              .getClass());
+-            assertTrue("Invalid key.", ((IntWritable) key).get() % 11 == 0);
+-            assertTrue("Invalid value.", ((LongWritable) value).get() % 12 == 0);
+-          }
+-        }
+-      } finally {
+-        reader.close();
+-      }
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestClassWithNoPackage.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestClassWithNoPackage.java
+deleted file mode 100644
+index 4d5cf61af62..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestClassWithNoPackage.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.net.URL;
+-import java.net.URLClassLoader;
+-import java.net.MalformedURLException;
+-
+-import org.apache.hadoop.util.JarFinder;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import org.apache.hadoop.conf.Configuration;
+-
+-/**
+- * Test Hadoop StreamUtil successfully returns a class loaded by the job conf
+- * but has no package name.
+- */
+-public class TestClassWithNoPackage
+-{
+-  @Test
+-  public void testGoodClassOrNull() throws Exception {
+-    String NAME = "ClassWithNoPackage";
+-    ClassLoader cl = TestClassWithNoPackage.class.getClassLoader();
+-    String JAR = JarFinder.getJar(cl.loadClass(NAME));
+-
+-    // Add testjob jar file to classpath.
+-    Configuration conf = new Configuration();
+-    conf.setClassLoader(new URLClassLoader(new URL[]{new URL("file", null, JAR)}, 
+-                                           null));
+-    // Get class with no package name.
+-    String defaultPackage = this.getClass().getPackage().getName();
+-    Class c = StreamUtil.goodClassOrNull(conf, NAME, defaultPackage);
+-    assertNotNull("Class " + NAME + " not found!", c);
+-  }
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestClassWithNoPackage().testGoodClassOrNull();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java
+deleted file mode 100644
+index bbfc02068e7..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestDumpTypedBytes.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataInputStream;
+-import java.io.OutputStreamWriter;
+-import java.io.PrintStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.streaming.DumpTypedBytes;
+-import org.apache.hadoop.typedbytes.TypedBytesInput;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestDumpTypedBytes {
+-
+-  @Test
+-  public void testDumping() throws Exception {
+-    Configuration conf = new Configuration();
+-    MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+-        .build();
+-    FileSystem fs = cluster.getFileSystem();
+-    PrintStream psBackup = System.out;
+-    ByteArrayOutputStream out = new ByteArrayOutputStream();
+-    PrintStream psOut = new PrintStream(out);
+-    System.setOut(psOut);
+-    DumpTypedBytes dumptb = new DumpTypedBytes(conf);
+-
+-    try {
+-      Path root = new Path("/typedbytestest");
+-      assertTrue(fs.mkdirs(root));
+-      assertTrue(fs.exists(root));
+-      OutputStreamWriter writer = new OutputStreamWriter(fs.create(new Path(
+-        root, "test.txt")));
+-      try {
+-        for (int i = 0; i < 100; i++) {
+-          writer.write("" + (10 * i) + "\n");
+-        }
+-      } finally {
+-        writer.close();
+-      }
+-
+-      String[] args = new String[1];
+-      args[0] = "/typedbytestest";
+-      int ret = dumptb.run(args);
+-      assertEquals("Return value != 0.", 0, ret);
+-
+-      ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+-      TypedBytesInput tbinput = new TypedBytesInput(new DataInputStream(in));
+-      int counter = 0;
+-      Object key = tbinput.read();
+-      while (key != null) {
+-        assertEquals(Long.class, key.getClass()); // offset
+-        Object value = tbinput.read();
+-        assertEquals(String.class, value.getClass());
+-        assertTrue("Invalid output.",
+-          Integer.parseInt(value.toString()) % 10 == 0);
+-        counter++;
+-        key = tbinput.read();
+-      }
+-      assertEquals("Wrong number of outputs.", 100, counter);
+-    } finally {
+-      try {
+-        fs.close();
+-      } catch (Exception e) {
+-      }
+-      System.setOut(psBackup);
+-      cluster.shutdown();
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestFileArgs.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestFileArgs.java
+deleted file mode 100644
+index 901abba885b..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestFileArgs.java
++++ /dev/null
+@@ -1,118 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Map;
+-
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.MiniMRCluster;
+-import org.apache.hadoop.util.Shell;
+-import org.junit.After;
+-import org.junit.Before;
+-
+-/**
+- * This class tests that the '-file' argument to streaming results
+- * in files being unpacked in the job working directory.
+- */
+-public class TestFileArgs extends TestStreaming
+-{
+-  private MiniDFSCluster dfs = null;
+-  private MiniMRCluster mr = null;
+-  private FileSystem fileSys = null;
+-  private String namenode = null;
+-  private Configuration conf = null;
+-
+-  private static final String EXPECTED_OUTPUT =
+-    "job.jar\t\nsidefile\t\n";
+-
+-  private static final String LS_PATH = Shell.WINDOWS ? "cmd /c dir /B" :
+-    "/bin/ls";
+-
+-  public TestFileArgs() throws IOException
+-  {
+-    // Set up mini cluster
+-    conf = new Configuration();
+-    dfs = new MiniDFSCluster.Builder(conf).build();
+-    fileSys = dfs.getFileSystem();
+-    namenode = fileSys.getUri().getAuthority();
+-    mr  = new MiniMRCluster(1, namenode, 1);
+-
+-    map = LS_PATH;
+-    FileSystem.setDefaultUri(conf, "hdfs://" + namenode);
+-    setTestDir(new File("/tmp/TestFileArgs"));
+-  }
+-
+-  @Before
+-  @Override
+-  public void setUp() throws IOException {
+-    // Set up side file
+-    FileSystem localFs = FileSystem.getLocal(conf);
+-    DataOutputStream dos = localFs.create(new Path("target/sidefile"));
+-    dos.write("hello world\n".getBytes(StandardCharsets.UTF_8));
+-    dos.close();
+-
+-    // Since ls doesn't read stdin, we don't want to write anything
+-    // to it, or else we risk Broken Pipe exceptions.
+-    input = "";
+-  }
+-
+-  @After
+-  @Override
+-  public void tearDown() {
+-    if (mr != null) {
+-      mr.shutdown();
+-    }
+-    if (dfs != null) {
+-      dfs.shutdown();
+-    }
+-  }
+-
+-  @Override
+-  protected String getExpectedOutput() {
+-    return EXPECTED_OUTPUT;
+-  }
+-
+-  @Override
+-  protected Configuration getConf() {
+-    return conf;
+-  }
+-
+-  @Override
+-  protected String[] genArgs() {
+-    for (Map.Entry<String, String> entry : mr.createJobConf()) {
+-      args.add("-jobconf");
+-      args.add(entry.getKey() + "=" + entry.getValue());
+-    }
+-    args.add("-file");
+-    args.add(new java.io.File("target/sidefile").getAbsolutePath());
+-    args.add("-numReduceTasks");
+-    args.add("0");
+-    args.add("-jobconf");
+-    args.add("mapred.jar=" + STREAMING_JAR);
+-    args.add("-verbose");
+-    return super.genArgs();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestGzipInput.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestGzipInput.java
+deleted file mode 100644
+index dc12e4eff97..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestGzipInput.java
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.zip.GZIPOutputStream;
+-
+-/**
+- * This class tests gzip input streaming in MapReduce local mode.
+- */
+-public class TestGzipInput extends TestStreaming
+-{
+-
+-  public TestGzipInput() throws IOException {
+-    INPUT_FILE = new File(TEST_DIR, "input.txt.gz");
+-  }
+-  
+-  protected void createInput() throws IOException
+-  {
+-    GZIPOutputStream out = new GZIPOutputStream(
+-      new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes(StandardCharsets.UTF_8));
+-    out.close();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestLoadTypedBytes.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestLoadTypedBytes.java
+deleted file mode 100644
+index 0c004e7135f..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestLoadTypedBytes.java
++++ /dev/null
+@@ -1,91 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataOutputStream;
+-import java.io.InputStream;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.io.SequenceFile;
+-import org.apache.hadoop.typedbytes.TypedBytesOutput;
+-import org.apache.hadoop.typedbytes.TypedBytesWritable;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestLoadTypedBytes {
+-
+-  @Test
+-  public void testLoading() throws Exception {
+-    Configuration conf = new Configuration();
+-    MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2)
+-        .build();
+-    FileSystem fs = cluster.getFileSystem();
+-    
+-    ByteArrayOutputStream out = new ByteArrayOutputStream();
+-    TypedBytesOutput tboutput = new TypedBytesOutput(new DataOutputStream(out));
+-    for (int i = 0; i < 100; i++) {
+-      tboutput.write(new Long(i)); // key
+-      tboutput.write("" + (10 * i)); // value
+-    }
+-    InputStream isBackup = System.in;
+-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+-    System.setIn(in);
+-    LoadTypedBytes loadtb = new LoadTypedBytes(conf);
+-
+-    try {
+-      Path root = new Path("/typedbytestest");
+-      assertTrue(fs.mkdirs(root));
+-      assertTrue(fs.exists(root));
+-      
+-      String[] args = new String[1];
+-      args[0] = "/typedbytestest/test.seq";
+-      int ret = loadtb.run(args);
+-      assertEquals("Return value != 0.", 0, ret);
+-
+-      Path file = new Path(root, "test.seq");
+-      assertTrue(fs.exists(file));
+-      SequenceFile.Reader reader = new SequenceFile.Reader(fs, file, conf);
+-      int counter = 0;
+-      TypedBytesWritable key = new TypedBytesWritable();
+-      TypedBytesWritable value = new TypedBytesWritable();
+-      while (reader.next(key, value)) {
+-        assertEquals(Long.class, key.getValue().getClass());
+-        assertEquals(String.class, value.getValue().getClass());
+-        assertTrue("Invalid record.",
+-          Integer.parseInt(value.toString()) % 10 == 0);
+-        counter++;
+-      }
+-      assertEquals("Wrong number of records.", 100, counter);
+-    } finally {
+-      try {
+-        fs.close();
+-      } catch (Exception e) {
+-      }
+-      System.setIn(isBackup);
+-      cluster.shutdown();
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java
+deleted file mode 100644
+index 17dc7ad633d..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMRFramework.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.streaming;
+-
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapreduce.MRConfig;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.junit.Test;
+-
+-public class TestMRFramework {
+-
+-  @Test
+-  public void testFramework() {
+-    JobConf jobConf = new JobConf();
+-    jobConf.set(JTConfig.JT_IPC_ADDRESS, MRConfig.LOCAL_FRAMEWORK_NAME);
+-    jobConf.set(MRConfig.FRAMEWORK_NAME, MRConfig.YARN_FRAMEWORK_NAME);
+-    assertFalse("Expected 'isLocal' to be false", 
+-        StreamUtil.isLocalJobTracker(jobConf));
+-    
+-    jobConf.set(JTConfig.JT_IPC_ADDRESS, MRConfig.LOCAL_FRAMEWORK_NAME);
+-    jobConf.set(MRConfig.FRAMEWORK_NAME, MRConfig.CLASSIC_FRAMEWORK_NAME);
+-    assertFalse("Expected 'isLocal' to be false", 
+-        StreamUtil.isLocalJobTracker(jobConf));
+-    
+-    jobConf.set(JTConfig.JT_IPC_ADDRESS, "jthost:9090");
+-    jobConf.set(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME);
+-    assertTrue("Expected 'isLocal' to be true", 
+-        StreamUtil.isLocalJobTracker(jobConf));
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
+deleted file mode 100644
+index 041d527ab17..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java
++++ /dev/null
+@@ -1,140 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.DataOutputStream;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Map;
+-import java.util.zip.ZipEntry;
+-import java.util.zip.ZipOutputStream;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.*;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-
+-/**
+- * This class tests cacheArchive option of streaming
+- * The test case creates 2 archive files, ships it with hadoop
+- * streaming and compares the output with expected output
+- */
+-public class TestMultipleArchiveFiles extends TestStreaming
+-{
+-  private static final Logger LOG = LoggerFactory.getLogger(TestMultipleArchiveFiles.class);
+-
+-  private StreamJob job;
+-  private String INPUT_DIR = "multiple-archive-files/";
+-  private String INPUT_FILE = INPUT_DIR + "input.txt";
+-  private String CACHE_ARCHIVE_1 = INPUT_DIR + "cacheArchive1.zip";
+-  private File CACHE_FILE_1 = null;
+-  private String CACHE_ARCHIVE_2 = INPUT_DIR + "cacheArchive2.zip";
+-  private File CACHE_FILE_2 = null;
+-  private String expectedOutput = null;
+-  private String OUTPUT_DIR = "out";
+-  private Configuration conf = null;
+-  private MiniDFSCluster dfs = null;
+-  private MiniMRCluster mr = null;
+-  private FileSystem fileSys = null;
+-  private String namenode = null;
+-
+-  public TestMultipleArchiveFiles() throws Exception {
+-    CACHE_FILE_1 = new File("cacheArchive1");
+-    CACHE_FILE_2 = new File("cacheArchive2");
+-    input = "HADOOP";
+-    expectedOutput = "HADOOP\t\nHADOOP\t\n";
+-    conf = new Configuration();
+-    dfs = new MiniDFSCluster.Builder(conf).build();
+-    fileSys = dfs.getFileSystem();
+-    namenode = fileSys.getUri().getAuthority();
+-    mr  = new MiniMRCluster(1, namenode, 1);
+-
+-    map = XARGS_CAT;
+-    reduce = CAT;
+-  }
+-
+-  @Override
+-  protected void setInputOutput() {
+-    inputFile = INPUT_FILE;
+-    outDir = OUTPUT_DIR;
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    fileSys.delete(new Path(INPUT_DIR), true);
+-    DataOutputStream dos = fileSys.create(new Path(INPUT_FILE));
+-    String inputFileString = "symlink1" + File.separator
+-      + "cacheArchive1\nsymlink2" + File.separator + "cacheArchive2";
+-    dos.write(inputFileString.getBytes(StandardCharsets.UTF_8));
+-    dos.close();
+-
+-    DataOutputStream out = fileSys.create(new Path(CACHE_ARCHIVE_1.toString()));
+-    ZipOutputStream zos = new ZipOutputStream(out);
+-    ZipEntry ze = new ZipEntry(CACHE_FILE_1.toString());
+-    zos.putNextEntry(ze);
+-    zos.write(input.getBytes(StandardCharsets.UTF_8));
+-    zos.closeEntry();
+-    zos.close();
+-
+-    out = fileSys.create(new Path(CACHE_ARCHIVE_2.toString()));
+-    zos = new ZipOutputStream(out);
+-    ze = new ZipEntry(CACHE_FILE_2.toString());
+-    zos.putNextEntry(ze);
+-    zos.write(input.getBytes(StandardCharsets.UTF_8));
+-    zos.closeEntry();
+-    zos.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    String workDir = fileSys.getWorkingDirectory().toString() + "/";
+-    String cache1 = workDir + CACHE_ARCHIVE_1 + "#symlink1";
+-    String cache2 = workDir + CACHE_ARCHIVE_2 + "#symlink2";
+-
+-    for (Map.Entry<String, String> entry : mr.createJobConf()) {
+-      args.add("-jobconf");
+-      args.add(entry.getKey() + "=" + entry.getValue());
+-    }
+-    args.add("-jobconf");
+-    args.add("mapreduce.job.reduces=1");
+-    args.add("-cacheArchive");
+-    args.add(cache1);
+-    args.add("-cacheArchive");
+-    args.add(cache2);
+-    args.add("-jobconf");
+-    args.add("mapred.jar=" + STREAMING_JAR);
+-    return super.genArgs();
+-  }
+-
+-  protected void checkOutput() throws IOException {
+-    StringBuffer output = new StringBuffer(256);
+-    Path[] fileList = FileUtil.stat2Paths(fileSys.listStatus(
+-                                            new Path(OUTPUT_DIR)));
+-    for (int i = 0; i < fileList.length; i++){
+-      LOG.info("Adding output from file: " + fileList[i]);
+-      output.append(StreamUtil.slurpHadoop(fileList[i], fileSys));
+-    }
+-    assertOutput(expectedOutput, output.toString());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleCachefiles.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleCachefiles.java
+deleted file mode 100644
+index 36565e3fc1b..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestMultipleCachefiles.java
++++ /dev/null
+@@ -1,157 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.BufferedReader;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.MiniMRCluster;
+-import org.apache.hadoop.mapred.Utils;
+-
+-/**
+- * This test case tests the symlink creation
+- * utility provided by distributed caching 
+- */
+-public class TestMultipleCachefiles
+-{
+-  String INPUT_FILE = "/testing-streaming/input.txt";
+-  String OUTPUT_DIR = "/testing-streaming/out";
+-  String CACHE_FILE = "/testing-streaming/cache.txt";
+-  String CACHE_FILE_2 = "/testing-streaming/cache2.txt";
+-  String input = "check to see if we can read this none reduce";
+-  String map = TestStreaming.XARGS_CAT;
+-  String reduce = TestStreaming.CAT;
+-  String mapString = "testlink";
+-  String mapString2 = "testlink2";
+-  String cacheString = "This is just the cache string";
+-  String cacheString2 = "This is just the second cache string";
+-  StreamJob job;
+-
+-  public TestMultipleCachefiles() throws IOException
+-  {
+-  }
+-
+-  @Test
+-  public void testMultipleCachefiles() throws Exception
+-  {
+-    boolean mayExit = false;
+-    MiniMRCluster mr = null;
+-    MiniDFSCluster dfs = null; 
+-    try{
+-      Configuration conf = new Configuration();
+-      dfs = new MiniDFSCluster.Builder(conf).build();
+-      FileSystem fileSys = dfs.getFileSystem();
+-      String namenode = fileSys.getUri().toString();
+-
+-      mr  = new MiniMRCluster(1, namenode, 3);
+-
+-      List<String> args = new ArrayList<String>();
+-      for (Map.Entry<String, String> entry : mr.createJobConf()) {
+-        args.add("-jobconf");
+-        args.add(entry.getKey() + "=" + entry.getValue());
+-      }
+-
+-      String argv[] = new String[] {
+-        "-input", INPUT_FILE,
+-        "-output", OUTPUT_DIR,
+-        "-mapper", map,
+-        "-reducer", reduce,
+-        "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-        "-jobconf", 
+-          JobConf.MAPRED_MAP_TASK_JAVA_OPTS + "=" +
+-            "-Dcontrib.name=" + System.getProperty("contrib.name") + " " +
+-            "-Dbuild.test=" + System.getProperty("build.test") + " " +
+-            conf.get(JobConf.MAPRED_MAP_TASK_JAVA_OPTS, 
+-                     conf.get(JobConf.MAPRED_TASK_JAVA_OPTS, "")),
+-        "-jobconf", 
+-          JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS + "=" +
+-            "-Dcontrib.name=" + System.getProperty("contrib.name") + " " +
+-            "-Dbuild.test=" + System.getProperty("build.test") + " " +
+-            conf.get(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS, 
+-                     conf.get(JobConf.MAPRED_TASK_JAVA_OPTS, "")),
+-        "-cacheFile", fileSys.getUri() + CACHE_FILE + "#" + mapString,
+-        "-cacheFile", fileSys.getUri() + CACHE_FILE_2 + "#" + mapString2,
+-        "-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
+-      };
+-
+-      for (String arg : argv) {
+-        args.add(arg);
+-      }
+-      argv = args.toArray(new String[args.size()]);
+-      
+-      fileSys.delete(new Path(OUTPUT_DIR), true);
+-      
+-      DataOutputStream file = fileSys.create(new Path(INPUT_FILE));
+-      file.writeBytes(mapString + "\n");
+-      file.writeBytes(mapString2 + "\n");
+-      file.close();
+-      file = fileSys.create(new Path(CACHE_FILE));
+-      file.writeBytes(cacheString + "\n");
+-      file.close();
+-      file = fileSys.create(new Path(CACHE_FILE_2));
+-      file.writeBytes(cacheString2 + "\n");
+-      file.close();
+-        
+-      job = new StreamJob(argv, mayExit);     
+-      job.go();
+-
+-      fileSys = dfs.getFileSystem();
+-      String line = null;
+-      String line2 = null;
+-      Path[] fileList = FileUtil.stat2Paths(fileSys.listStatus(
+-                                   new Path(OUTPUT_DIR),
+-                                   new Utils.OutputFileUtils
+-                                            .OutputFilesFilter()));
+-      for (int i = 0; i < fileList.length; i++){
+-        System.out.println(fileList[i].toString());
+-        BufferedReader bread =
+-          new BufferedReader(new InputStreamReader(fileSys.open(fileList[i])));
+-        line = bread.readLine();
+-        System.out.println(line);
+-        line2 = bread.readLine();
+-        System.out.println(line2);
+-      }
+-      assertEquals(cacheString + "\t", line);
+-      assertEquals(cacheString2 + "\t", line2);
+-    } finally{
+-      if (dfs != null) { dfs.shutdown(); }
+-      if (mr != null) { mr.shutdown();}
+-    }
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestMultipleCachefiles().testMultipleCachefiles();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestRawBytesStreaming.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestRawBytesStreaming.java
+deleted file mode 100644
+index 09adb3d5fd4..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestRawBytesStreaming.java
++++ /dev/null
+@@ -1,97 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileUtil;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestRawBytesStreaming {
+-
+-  protected File INPUT_FILE = new File("target/input.txt");
+-  protected File OUTPUT_DIR = new File("target/out");
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  protected String map = UtilTest.makeJavaCommand(RawBytesMapApp.class, new String[]{"."});
+-  protected String reduce = UtilTest.makeJavaCommand(RawBytesReduceApp.class, new String[0]);
+-  protected String outputExpect = "are\t3\nblue\t1\nbunnies\t1\npink\t1\nred\t1\nroses\t1\nviolets\t1\n";
+-  
+-  public TestRawBytesStreaming() throws IOException {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException {
+-    DataOutputStream out = new DataOutputStream(new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes(StandardCharsets.UTF_8));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", reduce,
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-jobconf", "stream.map.output=rawbytes",
+-      "-jobconf", "stream.reduce.input=rawbytes",
+-      "-verbose"
+-    };
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception {
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-      OUTPUT_DIR.delete();
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      StreamJob job = new StreamJob();
+-      job.setConf(new Configuration());
+-      job.run(genArgs());
+-      File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      outFile.delete();
+-      System.out.println("   map=" + map);
+-      System.out.println("reduce=" + reduce);
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamAggregate.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamAggregate.java
+deleted file mode 100644
+index b303c8c9772..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamAggregate.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-import java.io.*;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-
+-/**
+- * This class tests hadoopStreaming in MapReduce local mode.
+- * It uses Hadoop Aggregate to count the numbers of word occurrences 
+- * in the input.
+- */
+-public class TestStreamAggregate
+-{
+-  protected File INPUT_FILE = new File("stream_aggregate_input.txt");
+-  protected File OUTPUT_DIR = new File("stream_aggregate_out");
+-  protected String input = "roses are red\nviolets are blue\nbunnies are pink\n";
+-  // map parses input lines and generates count entries for each word.
+-  protected String map = UtilTest.makeJavaCommand(StreamAggregate.class, new String[]{".", "\\n"});
+-  // Use the aggregate combine, reducei to aggregate the counts
+-  protected String outputExpect = "are\t3\nblue\t1\nbunnies\t1\npink\t1\nred\t1\nroses\t1\nviolets\t1\n";
+-
+-  private StreamJob job;
+-
+-  public TestStreamAggregate() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = new DataOutputStream(
+-                                                new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes(StandardCharsets.UTF_8));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", "aggregate",
+-      "-jobconf", MRJobConfig.PRESERVE_FAILED_TASK_FILES + "=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
+-    };
+-  }
+-  
+-  @Test
+-  public void testCommandLine() throws Exception {
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-      boolean mayExit = false;
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      job = new StreamJob(genArgs(), mayExit);      
+-      job.go();
+-      File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      outFile.delete();
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreaming().testCommandLine();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamDataProtocol.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamDataProtocol.java
+deleted file mode 100644
+index 14f0f9607e5..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamDataProtocol.java
++++ /dev/null
+@@ -1,117 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.*;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.lib.KeyFieldBasedPartitioner;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-/**
+- * This class tests hadoopStreaming in MapReduce local mode.
+- */
+-public class TestStreamDataProtocol
+-{
+-
+-  // "map" command: grep -E (red|green|blue)
+-  // reduce command: uniq
+-  protected File INPUT_FILE = new File("input_for_data_protocol_test.txt");
+-  protected File OUTPUT_DIR = new File("out_for_data_protocol_test");
+-  protected String input = "roses.smell.good\nroses.look.good\nroses.need.care\nroses.attract.bees\nroses.are.red\nroses.are.not.blue\nbunnies.are.pink\nbunnies.run.fast\nbunnies.have.short.tail\nbunnies.have.long.ears\n";
+-  // map behaves like "/usr/bin/cat"; 
+-  protected String map = UtilTest.makeJavaCommand(TrApp.class, new String[]{".", "."});
+-  // reduce counts the number of values for each key
+-  protected String reduce = "org.apache.hadoop.streaming.ValueCountReduce";
+-  protected String outputExpect = "bunnies.are\t1\nbunnies.have\t2\nbunnies.run\t1\nroses.are\t2\nroses.attract\t1\nroses.look\t1\nroses.need\t1\nroses.smell\t1\n";
+-
+-  private StreamJob job;
+-
+-  public TestStreamDataProtocol() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = new DataOutputStream(
+-                                                new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", reduce,
+-      "-partitioner", KeyFieldBasedPartitioner.class.getCanonicalName(),
+-      "-jobconf", "stream.map.output.field.separator=.",
+-      "-jobconf", "stream.num.map.output.key.fields=2",
+-      "-jobconf", "mapreduce.map.output.key.field.separator=.",
+-      "-jobconf", "num.key.fields.for.partition=1",
+-      "-jobconf", "mapreduce.job.reduces=2",
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
+-    };
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception
+-  {
+-    try {
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    } catch (Exception e) {
+-    }
+-
+-    try {
+-      createInput();
+-      boolean mayExit = false;
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      job = new StreamJob(genArgs(), mayExit);      
+-      job.go();
+-      File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      outFile.delete();
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      System.err.println("  equals=" + outputExpect.compareTo(output));
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreamDataProtocol().testCommandLine();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamJob.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamJob.java
+deleted file mode 100644
+index 3e9036fca92..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamJob.java
++++ /dev/null
+@@ -1,85 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.KeyValueTextInputFormat;
+-import org.apache.hadoop.mapred.SequenceFileInputFormat;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-/**
+- * This class tests hadoop Streaming's StreamJob class.
+- */
+-public class TestStreamJob {
+-  
+-  @Test(expected = IllegalArgumentException.class)
+-  public void testCreateJobWithExtraArgs() throws IOException {
+-    ArrayList<String> dummyArgs = new ArrayList<String>();
+-    dummyArgs.add("-input"); dummyArgs.add("dummy");
+-    dummyArgs.add("-output"); dummyArgs.add("dummy");
+-    dummyArgs.add("-mapper"); dummyArgs.add("dummy");
+-    dummyArgs.add("dummy");
+-    dummyArgs.add("-reducer"); dummyArgs.add("dummy");
+-    StreamJob.createJob(dummyArgs.toArray(new String[] {}));
+-  }
+-  
+-  @Test
+-  public void testCreateJob() throws IOException {
+-    JobConf job;
+-    ArrayList<String> dummyArgs = new ArrayList<String>();
+-    dummyArgs.add("-input"); dummyArgs.add("dummy");
+-    dummyArgs.add("-output"); dummyArgs.add("dummy");
+-    dummyArgs.add("-mapper"); dummyArgs.add("dummy");
+-    dummyArgs.add("-reducer"); dummyArgs.add("dummy");
+-    ArrayList<String> args;
+-    
+-    args = new ArrayList<String>(dummyArgs);
+-    args.add("-inputformat");
+-    args.add("org.apache.hadoop.mapred.KeyValueTextInputFormat");
+-    job = StreamJob.createJob(args.toArray(new String[] {}));
+-    assertEquals(KeyValueTextInputFormat.class, job.getInputFormat().getClass());
+-    
+-    args = new ArrayList<String>(dummyArgs);
+-    args.add("-inputformat");
+-    args.add("org.apache.hadoop.mapred.SequenceFileInputFormat");
+-    job = StreamJob.createJob(args.toArray(new String[] {}));
+-    assertEquals(SequenceFileInputFormat.class, job.getInputFormat().getClass());
+-    
+-    args = new ArrayList<String>(dummyArgs);
+-    args.add("-inputformat");
+-    args.add("org.apache.hadoop.mapred.KeyValueTextInputFormat");
+-    args.add("-inputreader");
+-    args.add("StreamXmlRecordReader,begin=<doc>,end=</doc>");
+-    job = StreamJob.createJob(args.toArray(new String[] {}));
+-    assertEquals(StreamInputFormat.class, job.getInputFormat().getClass());
+-  }
+-  
+-  @Test
+-  public void testOptions() throws Exception {
+-    StreamJob streamJob = new StreamJob();
+-    assertEquals(1, streamJob.run(new String[0]));
+-    assertEquals(0, streamJob.run(new String[] {"-help"}));
+-    assertEquals(0, streamJob.run(new String[] {"-info"}));
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java
+deleted file mode 100644
+index 766402184ce..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamReduceNone.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.*;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-
+-import static org.junit.Assert.*;
+-import org.junit.Test;
+-
+-/**
+- * This class tests hadoopStreaming in MapReduce local mode.
+- * It tests the case where number of reducers is set to 0.
+-   In this case, the mappers are expected to write out outputs directly.
+-   No reducer/combiner will be activated.
+- */
+-public class TestStreamReduceNone
+-{
+-  protected File INPUT_FILE = new File("stream_reduce_none_input.txt");
+-  protected File OUTPUT_DIR = new File("stream_reduce_none_out");
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  // map parses input lines and generates count entries for each word.
+-  protected String map = UtilTest.makeJavaCommand(TrApp.class, new String[]{".", "\\n"});
+-  protected String outputExpect = "roses\t\nare\t\nred\t\nviolets\t\nare\t\nblue\t\nbunnies\t\nare\t\npink\t\n";
+-
+-  private StreamJob job;
+-
+-  public TestStreamReduceNone() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = new DataOutputStream(
+-                                                new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", "org.apache.hadoop.mapred.lib.IdentityReducer",
+-      "-numReduceTasks", "0",
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "mapreduce.job.maps=1",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
+-    };
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception
+-  {
+-    String outFileName = "part-00000";
+-    File outFile = null;
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-      boolean mayExit = false;
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      job = new StreamJob(genArgs(), mayExit);      
+-      job.go();
+-      outFile = new File(OUTPUT_DIR, outFileName).getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreamReduceNone().testCommandLine();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlMultipleRecords.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlMultipleRecords.java
+deleted file mode 100644
+index fc8c20dd695..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlMultipleRecords.java
++++ /dev/null
+@@ -1,184 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Tests if StreamXmlRecordReader will read the next record, _after_ the
+- * end of a split if the split falls before the end of end-tag of a record.
+- * Also tests if StreamXmlRecordReader will read a record twice if end of a
+- * split is after few characters after the end-tag of a record but before the
+- * begin-tag of next record.
+- */
+-public class TestStreamXmlMultipleRecords extends TestStreaming
+-{
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      TestStreamXmlMultipleRecords.class);
+-
+-  private boolean hasPerl = false;
+-  private long blockSize;
+-  private String isSlowMatch;
+-
+-  // Our own configuration used for creating FileSystem object where
+-  // fs.local.block.size is set to 60 OR 80.
+-  // See 60th char in input. It is before the end of end-tag of a record.
+-  // See 80th char in input. It is in between the end-tag of a record and
+-  // the begin-tag of next record.
+-  private Configuration conf = null;
+-
+-  private String myPerlMapper =
+-      "perl -n -a -e 'print join(qq(\\n), map { qq($_\\t1) } @F), qq(\\n);'";
+-  private String myPerlReducer =
+-      "perl -n -a -e '$freq{$F[0]}++; END { print qq(is\\t$freq{is}\\n); }'";
+-
+-  public TestStreamXmlMultipleRecords() throws IOException {
+-    super();
+-
+-    input = "<line>This is a single line,\nand it is containing multiple" +
+-        " words.</line>                     <line>Only is appears more than" +
+-        " once.</line>\n";
+-    outputExpect = "is\t3\n";
+-
+-    map = myPerlMapper;
+-    reduce = myPerlReducer;
+-
+-    hasPerl = UtilTest.hasPerlSupport();
+-  }
+-
+-  @Override
+-  @Before
+-  public void setUp() throws IOException {
+-    super.setUp();
+-    // Without this closeAll() call, setting of FileSystem block size is
+-    // not effective and will be old block size set in earlier test.
+-    FileSystem.closeAll();
+-  }
+-
+-  // Set file system block size such that split falls
+-  // (a) before the end of end-tag of a record (testStreamXmlMultiInner...) OR
+-  // (b) between records(testStreamXmlMultiOuter...)
+-  @Override
+-  protected Configuration getConf() {
+-    conf = new Configuration();
+-    conf.setLong("fs.local.block.size", blockSize);
+-    return conf;
+-  }
+-
+-  @Override
+-  protected String[] genArgs() {
+-    args.add("-inputreader");
+-    args.add("StreamXmlRecordReader,begin=<line>,end=</line>,slowmatch=" +
+-        isSlowMatch);
+-    return super.genArgs();
+-  }
+-
+-  /**
+-   * Tests if StreamXmlRecordReader will read the next record, _after_ the
+-   * end of a split if the split falls before the end of end-tag of a record.
+-   * Tests with slowmatch=false.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testStreamXmlMultiInnerFast() throws Exception {
+-    if (hasPerl) {
+-      blockSize = 60;
+-
+-      isSlowMatch = "false";
+-      super.testCommandLine();
+-    }
+-    else {
+-      LOG.warn("No perl; skipping test.");
+-    }
+-  }
+-
+-  /**
+-   * Tests if StreamXmlRecordReader will read a record twice if end of a
+-   * split is after few characters after the end-tag of a record but before the
+-   * begin-tag of next record.
+-   * Tests with slowmatch=false.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testStreamXmlMultiOuterFast() throws Exception {
+-    if (hasPerl) {
+-      blockSize = 80;
+-
+-      isSlowMatch = "false";
+-      super.testCommandLine();
+-    }
+-    else {
+-      LOG.warn("No perl; skipping test.");
+-    }
+-  }
+-
+-  /**
+-   * Tests if StreamXmlRecordReader will read the next record, _after_ the
+-   * end of a split if the split falls before the end of end-tag of a record.
+-   * Tests with slowmatch=true.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testStreamXmlMultiInnerSlow() throws Exception {
+-    if (hasPerl) {
+-      blockSize = 60;
+-
+-      isSlowMatch = "true";
+-      super.testCommandLine();
+-    }
+-    else {
+-      LOG.warn("No perl; skipping test.");
+-    }
+-  }
+-
+-  /**
+-   * Tests if StreamXmlRecordReader will read a record twice if end of a
+-   * split is after few characters after the end-tag of a record but before the
+-   * begin-tag of next record.
+-   * Tests with slowmatch=true.
+-   * @throws Exception
+-   */
+-  @Test
+-  public void testStreamXmlMultiOuterSlow() throws Exception {
+-    if (hasPerl) {
+-      blockSize = 80;
+-
+-      isSlowMatch = "true";
+-      super.testCommandLine();
+-    }
+-    else {
+-      LOG.warn("No perl; skipping test.");
+-    }
+-  }
+-
+-  @Override
+-  @Test
+-  public void testCommandLine() {
+-    // Do nothing
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
+deleted file mode 100644
+index 53009dbbabc..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-
+-/**
+- * This class tests StreamXmlRecordReader
+- * The test creates an XML file, uses StreamXmlRecordReader and compares
+- * the expected output against the generated output
+- */
+-public class TestStreamXmlRecordReader extends TestStreaming {
+-
+-  public TestStreamXmlRecordReader() throws IOException {
+-    INPUT_FILE = new File("target/input.xml");
+-    input = "<xmltag>\t\nroses.are.red\t\nviolets.are.blue\t\n" +
+-        "bunnies.are.pink\t\n</xmltag>\t\n";
+-    map = CAT;
+-    reduce = "NONE";
+-    outputExpect = input;
+-  }
+-
+-  @Override
+-  protected void createInput() throws IOException
+-  {
+-    FileOutputStream out = new FileOutputStream(INPUT_FILE.getAbsoluteFile());
+-    String dummyXmlStartTag = "<PATTERN>\n";
+-    String dummyXmlEndTag = "</PATTERN>\n";
+-    out.write(dummyXmlStartTag.getBytes("UTF-8"));
+-    out.write(input.getBytes("UTF-8"));
+-    out.write(dummyXmlEndTag.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  @Override
+-  protected String[] genArgs() {
+-    args.add("-inputreader");
+-    args.add("StreamXmlRecordReader,begin=<xmltag>,end=</xmltag>");
+-    args.add("-jobconf");
+-    args.add("mapreduce.job.maps=1");
+-    return super.genArgs();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreaming.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreaming.java
+deleted file mode 100644
+index 4f39120a162..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreaming.java
++++ /dev/null
+@@ -1,203 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import org.apache.hadoop.util.JarFinder;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Shell;
+-
+-/**
+- * This class tests hadoopStreaming in MapReduce local mode.
+- */
+-public class TestStreaming
+-{
+-
+-  public static final String STREAMING_JAR = JarFinder.getJar(StreamJob.class);
+-
+-  /**
+-   * cat command used for copying stdin to stdout as mapper or reducer function.
+-   * On Windows, use a cmd script that approximates the functionality of cat.
+-   */
+-  static final String CAT = Shell.WINDOWS ?
+-    "cmd /c " + new File("target/bin/cat.cmd").getAbsolutePath() : "cat";
+-
+-  /**
+-   * Command used for iterating through file names on stdin and copying each
+-   * file's contents to stdout, used as mapper or reducer function.  On Windows,
+-   * use a cmd script that approximates the functionality of xargs cat.
+-   */
+-  static final String XARGS_CAT = Shell.WINDOWS ?
+-    "cmd /c " + new File("target/bin/xargs_cat.cmd").getAbsolutePath() :
+-    "xargs cat";
+-
+-  // "map" command: grep -E (red|green|blue)
+-  // reduce command: uniq
+-  protected File TEST_DIR;
+-  protected File INPUT_FILE;
+-  protected File OUTPUT_DIR;
+-  protected String inputFile;
+-  protected String outDir;
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  // map behaves like "/usr/bin/tr . \\n"; (split words into lines)
+-  protected String map = UtilTest.makeJavaCommand(TrApp.class, new String[]{".", "\\n"});
+-  // reduce behave like /usr/bin/uniq. But also prepend lines with R.
+-  // command-line combiner does not have any effect any more.
+-  protected String reduce = UtilTest.makeJavaCommand(UniqApp.class, new String[]{"R"});
+-  protected String outputExpect = "Rare\t\nRblue\t\nRbunnies\t\nRpink\t\nRred\t\nRroses\t\nRviolets\t\n";
+-
+-  protected ArrayList<String> args = new ArrayList<String>();
+-  protected StreamJob job;
+-
+-  public TestStreaming() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-    setTestDir(new File("target/TestStreaming").getAbsoluteFile());
+-  }
+-
+-  /**
+-   * Sets root of test working directory and resets any other paths that must be
+-   * children of the test working directory.  Typical usage is for subclasses
+-   * that use HDFS to override the test directory to the form "/tmp/<test name>"
+-   * so that on Windows, tests won't attempt to use paths containing a ':' from
+-   * the drive specifier.  The ':' character is considered invalid by HDFS.
+-   * 
+-   * @param testDir File to set
+-   */
+-  protected void setTestDir(File testDir) {
+-    TEST_DIR = testDir;
+-    OUTPUT_DIR = new File(testDir, "out");
+-    INPUT_FILE = new File(testDir, "input.txt");
+-  }
+-
+-  @Before
+-  public void setUp() throws IOException {
+-    UtilTest.recursiveDelete(TEST_DIR);
+-    assertTrue("Creating " + TEST_DIR, TEST_DIR.mkdirs());
+-    args.clear();
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    UtilTest.recursiveDelete(TEST_DIR);
+-  }
+-
+-  protected String getInputData() {
+-    return input;
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = getFileSystem().create(new Path(
+-      INPUT_FILE.getPath()));
+-    out.write(getInputData().getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected void setInputOutput() {
+-    inputFile = INPUT_FILE.getPath();
+-    outDir = OUTPUT_DIR.getPath();
+-  }
+-
+-  protected String[] genArgs() {
+-    args.add("-input");args.add(inputFile);
+-    args.add("-output");args.add(outDir);
+-    args.add("-mapper");args.add(map);
+-    args.add("-reducer");args.add(reduce);
+-    args.add("-jobconf");
+-    args.add("mapreduce.task.files.preserve.failedtasks=true");
+-    args.add("-jobconf");
+-    args.add("stream.tmpdir="+System.getProperty("test.build.data","/tmp"));
+-
+-    String str[] = new String [args.size()];
+-    args.toArray(str);
+-    return str;
+-  }
+-
+-  protected Configuration getConf() {
+-    return new Configuration();
+-  }
+-
+-  protected FileSystem getFileSystem() throws IOException {
+-    return FileSystem.get(getConf());
+-  }
+-
+-  protected String getExpectedOutput() {
+-    return outputExpect;
+-  }
+-
+-  protected void checkOutput() throws IOException {
+-    Path outPath = new Path(OUTPUT_DIR.getPath(), "part-00000");
+-    FileSystem fs = getFileSystem();
+-    String output = StreamUtil.slurpHadoop(outPath, fs);
+-    fs.delete(outPath, true);
+-    System.err.println("outEx1=" + getExpectedOutput());
+-    System.err.println("  out1=" + output);
+-    assertOutput(getExpectedOutput(), output);
+-  }
+-
+-  protected void assertOutput(String expectedOutput, String output) throws IOException {
+-    String[] words = expectedOutput.split("\t\n");
+-    Set<String> expectedWords = new HashSet<String>(Arrays.asList(words));
+-    words = output.split("\t\n");
+-    Set<String> returnedWords = new HashSet<String>(Arrays.asList(words));
+-//    PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(new File("/tmp/tucu.txt"), true)), true);
+-//    writer.println("** Expected: " + expectedOutput);
+-//    writer.println("** Output  : " + output);
+-    assertTrue(returnedWords.containsAll(expectedWords));
+-  }
+-
+-  /**
+-   * Runs a streaming job with the given arguments
+-   * @return the streaming job return status
+-   * @throws IOException
+-   */
+-  protected int runStreamJob() throws IOException {
+-    setInputOutput();
+-    createInput();
+-    boolean mayExit = false;
+-
+-    // During tests, the default Configuration will use a local mapred
+-    // So don't specify -config or -cluster
+-    job = new StreamJob(genArgs(), mayExit);
+-    return job.go();
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception
+-  {
+-    int ret = runStreamJob();
+-    assertEquals(0, ret);
+-    checkOutput();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBackground.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBackground.java
+deleted file mode 100644
+index c18c283dd75..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBackground.java
++++ /dev/null
+@@ -1,87 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * This class tests if hadoopStreaming background works fine. A DelayEchoApp
+- * with 10 seconds delay is submited. 
+- */
+-public class TestStreamingBackground {
+-  protected File TEST_DIR = new File("target/TestStreamingBackground")
+-      .getAbsoluteFile();
+-  protected File INPUT_FILE = new File(TEST_DIR, "input.txt");
+-  protected File OUTPUT_DIR = new File(TEST_DIR, "out");
+-
+-  protected String tenSecondsTask = UtilTest.makeJavaCommand(
+-      DelayEchoApp.class, new String[] { "10" });
+-
+-  public TestStreamingBackground() throws IOException {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected String[] args = new String[] { 
+-      "-background",
+-      "-input", INPUT_FILE.getAbsolutePath(), 
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", tenSecondsTask, 
+-      "-reducer", tenSecondsTask, 
+-      "-jobconf", "stream.tmpdir=" + System.getProperty("test.build.data", "/tmp"),
+-      "-jobconf", "mapreduce.task.io.sort.mb=10" 
+-  };
+-
+-  @Before
+-  public void setUp() throws IOException {
+-    UtilTest.recursiveDelete(TEST_DIR);
+-    assertTrue(TEST_DIR.mkdirs());
+-
+-    FileOutputStream out = new FileOutputStream(INPUT_FILE.getAbsoluteFile());
+-    out.write("hello\n".getBytes());
+-    out.close();
+-  }
+-
+-  public void runStreamJob() throws Exception {
+-    boolean mayExit = false;
+-    int returnStatus = 0;
+-
+-    StreamJob job = new StreamJob(args, mayExit);
+-    returnStatus = job.go();
+-
+-    assertEquals("Streaming Job expected to succeed", 0, returnStatus);
+-    job.running_.killJob();
+-    job.running_.waitForCompletion();
+-  }
+-
+-  @Test
+-  public void testBackgroundSubmitOk() throws Exception {
+-    runStreamJob();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
+deleted file mode 100644
+index 5a4e3a960d2..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingBadRecords.java
++++ /dev/null
+@@ -1,329 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.OutputStream;
+-import java.io.OutputStreamWriter;
+-import java.io.Writer;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.Properties;
+-import java.util.StringTokenizer;
+-
+-import org.junit.BeforeClass;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.ClusterMapReduceTestCase;
+-import org.apache.hadoop.mapred.Counters;
+-import org.apache.hadoop.mapred.RunningJob;
+-import org.apache.hadoop.mapred.SkipBadRecords;
+-import org.apache.hadoop.mapred.Utils;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-public class TestStreamingBadRecords extends ClusterMapReduceTestCase
+-{
+-
+-  private static final Logger LOG =
+-    LoggerFactory.getLogger(TestStreamingBadRecords.class);
+-  
+-  private static final List<String> MAPPER_BAD_RECORDS = 
+-    Arrays.asList("hey022","hey023","hey099");
+-  
+-  private static final List<String> REDUCER_BAD_RECORDS = 
+-    Arrays.asList("hey001","hey018");
+-  
+-  private static final String badMapper = 
+-    UtilTest.makeJavaCommand(BadApp.class, new String[]{});
+-  private static final String badReducer = 
+-    UtilTest.makeJavaCommand(BadApp.class, new String[]{"true"});
+-  private static final int INPUTSIZE=100;
+-
+-  @BeforeClass
+-  public static void setupClass() throws Exception {
+-    setupClassBase(TestStreamingBadRecords.class);
+-  }
+-
+-  public TestStreamingBadRecords() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  @Before
+-  public void setUp() throws Exception {
+-    Properties props = new Properties();
+-    props.setProperty(JTConfig.JT_RETIREJOBS, "false");
+-    props.setProperty(JTConfig.JT_PERSIST_JOBSTATUS, "false");
+-    startCluster(true, props);
+-  }
+-
+-  private void createInput() throws Exception {
+-    OutputStream os = getFileSystem().create(new Path(getInputDir(), 
+-        "text.txt"));
+-    Writer wr = new OutputStreamWriter(os);
+-    //increasing the record size so that we have stream flushing
+-    String prefix = new String(new byte[20*1024]);
+-    for(int i=1;i<=INPUTSIZE;i++) {
+-      String str = ""+i;
+-      int zerosToPrepend = 3 - str.length();
+-      for(int j=0;j<zerosToPrepend;j++){
+-        str = "0"+str;
+-      }
+-      wr.write(prefix + "hey"+str+"\n");
+-    }wr.close();
+-  }
+-  
+-  private void validateOutput(RunningJob runningJob, boolean validateCount) 
+-    throws Exception {
+-    LOG.info(runningJob.getCounters().toString());
+-    assertTrue(runningJob.isSuccessful());
+-    
+-    if(validateCount) {
+-     //validate counters
+-      String counterGrp = "org.apache.hadoop.mapred.Task$Counter";
+-      Counters counters = runningJob.getCounters();
+-      assertEquals(counters.findCounter(counterGrp, "MAP_SKIPPED_RECORDS").
+-          getCounter(),MAPPER_BAD_RECORDS.size());
+-      
+-      int mapRecs = INPUTSIZE - MAPPER_BAD_RECORDS.size();
+-      assertEquals(counters.findCounter(counterGrp, "MAP_INPUT_RECORDS").
+-          getCounter(),mapRecs);
+-      assertEquals(counters.findCounter(counterGrp, "MAP_OUTPUT_RECORDS").
+-          getCounter(),mapRecs);
+-      
+-      int redRecs = mapRecs - REDUCER_BAD_RECORDS.size();
+-      assertEquals(counters.findCounter(counterGrp, "REDUCE_SKIPPED_RECORDS").
+-          getCounter(),REDUCER_BAD_RECORDS.size());
+-      assertEquals(counters.findCounter(counterGrp, "REDUCE_SKIPPED_GROUPS").
+-          getCounter(),REDUCER_BAD_RECORDS.size());
+-      assertEquals(counters.findCounter(counterGrp, "REDUCE_INPUT_GROUPS").
+-          getCounter(),redRecs);
+-      assertEquals(counters.findCounter(counterGrp, "REDUCE_INPUT_RECORDS").
+-          getCounter(),redRecs);
+-      assertEquals(counters.findCounter(counterGrp, "REDUCE_OUTPUT_RECORDS").
+-          getCounter(),redRecs);
+-    }
+-    
+-    List<String> badRecs = new ArrayList<String>();
+-    badRecs.addAll(MAPPER_BAD_RECORDS);
+-    badRecs.addAll(REDUCER_BAD_RECORDS);
+-    Path[] outputFiles = FileUtil.stat2Paths(
+-        getFileSystem().listStatus(getOutputDir(),
+-        new Utils.OutputFileUtils.OutputFilesFilter()));
+-    
+-    if (outputFiles.length > 0) {
+-      InputStream is = getFileSystem().open(outputFiles[0]);
+-      BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+-      String line = reader.readLine();
+-      int counter = 0;
+-      while (line != null) {
+-        counter++;
+-        StringTokenizer tokeniz = new StringTokenizer(line, "\t");
+-        String value = tokeniz.nextToken();
+-        int index = value.indexOf("hey");
+-        assertTrue(index>-1);
+-        if(index>-1) {
+-          String heyStr = value.substring(index);
+-          assertTrue(!badRecs.contains(heyStr));
+-        }
+-        
+-        line = reader.readLine();
+-      }
+-      reader.close();
+-      if(validateCount) {
+-        assertEquals(INPUTSIZE-badRecs.size(), counter);
+-      }
+-    }
+-  }
+-
+-  /*
+-   * Disable test as skipping bad records not supported in 0.23
+-   */
+-  /*
+-  public void testSkip() throws Exception {
+-    JobConf clusterConf = createJobConf();
+-    createInput();
+-    int attSkip =0;
+-    SkipBadRecords.setAttemptsToStartSkipping(clusterConf,attSkip);
+-    //the no of attempts to successfully complete the task depends 
+-    //on the no of bad records.
+-    int mapperAttempts = attSkip+1+MAPPER_BAD_RECORDS.size();
+-    int reducerAttempts = attSkip+1+REDUCER_BAD_RECORDS.size();
+-    
+-    String[] args =  new String[] {
+-      "-input", (new Path(getInputDir(), "text.txt")).toString(),
+-      "-output", getOutputDir().toString(),
+-      "-mapper", badMapper,
+-      "-reducer", badReducer,
+-      "-verbose",
+-      "-inputformat", "org.apache.hadoop.mapred.KeyValueTextInputFormat",
+-      "-jobconf", "mapreduce.task.skip.start.attempts="+attSkip,
+-      "-jobconf", "mapreduce.job.skip.outdir=none",
+-      "-jobconf", "mapreduce.map.maxattempts="+mapperAttempts,
+-      "-jobconf", "mapreduce.reduce.maxattempts="+reducerAttempts,
+-      "-jobconf", "mapreduce.map.skip.maxrecords="+Long.MAX_VALUE,
+-      "-jobconf", "mapreduce.reduce.skip.maxgroups="+Long.MAX_VALUE,
+-      "-jobconf", "mapreduce.job.maps=1",
+-      "-jobconf", "mapreduce.job.reduces=1",
+-      "-jobconf", "fs.default.name="+clusterConf.get("fs.default.name"),
+-      "-jobconf", "mapreduce.jobtracker.address=" + 
+-                   clusterConf.get(JTConfig.JT_IPC_ADDRESS),
+-      "-jobconf", "mapreduce.jobtracker.http.address="
+-                    +clusterConf.get(JTConfig.JT_HTTP_ADDRESS),
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
+-      "-jobconf", "mapreduce.framework.name=yarn"
+-    };
+-    StreamJob job = new StreamJob(args, false);      
+-    job.go();
+-    validateOutput(job.running_, false);
+-    //validate that there is no skip directory as it has been set to "none"
+-    assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)==null);
+-  }
+-  */
+-  
+-  /*
+-   * Disable test as skipping bad records not supported in 0.23
+-   */
+-  /*
+-  public void testNarrowDown() throws Exception {
+-    createInput();
+-    JobConf clusterConf = createJobConf();
+-    String[] args =  new String[] {
+-      "-input", (new Path(getInputDir(), "text.txt")).toString(),
+-      "-output", getOutputDir().toString(),
+-      "-mapper", badMapper,
+-      "-reducer", badReducer,
+-      "-verbose",
+-      "-inputformat", "org.apache.hadoop.mapred.KeyValueTextInputFormat",
+-      "-jobconf", "mapreduce.task.skip.start.attempts=1",
+-      //actually fewer attempts are required than specified
+-      //but to cater to the case of slow processed counter update, need to 
+-      //have more attempts
+-      "-jobconf", "mapreduce.map.maxattempts=20",
+-      "-jobconf", "mapreduce.reduce.maxattempts=15",
+-      "-jobconf", "mapreduce.map.skip.maxrecords=1",
+-      "-jobconf", "mapreduce.reduce.skip.maxgroups=1",
+-      "-jobconf", "mapreduce.job.maps=1",
+-      "-jobconf", "mapreduce.job.reduces=1",
+-      "-jobconf", "fs.default.name="+clusterConf.get("fs.default.name"),
+-      "-jobconf", "mapreduce.jobtracker.address="+clusterConf.get(JTConfig.JT_IPC_ADDRESS),
+-      "-jobconf", "mapreduce.jobtracker.http.address="
+-                    +clusterConf.get(JTConfig.JT_HTTP_ADDRESS),
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
+-      "-jobconf", "mapreduce.framework.name=yarn"
+-    };
+-    StreamJob job = new StreamJob(args, false);      
+-    job.go();
+-    
+-    validateOutput(job.running_, true);
+-    assertTrue(SkipBadRecords.getSkipOutputPath(job.jobConf_)!=null);
+-  }
+-  */
+-
+-  @Test
+-  public void testNoOp() {
+-    // Added to avoid warnings when running this disabled test
+-  }
+-  
+-  static class App{
+-    boolean isReducer;
+-    
+-    public App(String[] args) throws Exception{
+-      if(args.length>0) {
+-        isReducer = Boolean.parseBoolean(args[0]);
+-      }
+-      String counter = SkipBadRecords.COUNTER_MAP_PROCESSED_RECORDS;
+-      if(isReducer) {
+-        counter = SkipBadRecords.COUNTER_REDUCE_PROCESSED_GROUPS;
+-      }
+-      BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-      String line;
+-      int count = 0;
+-      while ((line = in.readLine()) != null) {
+-        processLine(line);
+-        count++;
+-        if(count>=10) {
+-          System.err.println("reporter:counter:"+SkipBadRecords.COUNTER_GROUP+
+-              ","+counter+","+count);
+-          count = 0;
+-        }
+-      }
+-    }
+-    
+-    protected void processLine(String line) throws Exception{
+-      System.out.println(line);
+-    }
+-    
+-    
+-    public static void main(String[] args) throws Exception{
+-      new App(args);
+-    }
+-  }
+-  
+-  static class BadApp extends App{
+-    
+-    public BadApp(String[] args) throws Exception {
+-      super(args);
+-    }
+-
+-    protected void processLine(String line) throws Exception {
+-      List<String> badRecords = MAPPER_BAD_RECORDS;
+-      if(isReducer) {
+-        badRecords = REDUCER_BAD_RECORDS;
+-      }
+-      if(badRecords.size()>0 && line.contains(badRecords.get(0))) {
+-        LOG.warn("Encountered BAD record");
+-        System.exit(-1);
+-      }
+-      else if(badRecords.size()>1 && line.contains(badRecords.get(1))) {
+-        LOG.warn("Encountered BAD record");
+-        throw new Exception("Got bad record..crashing");
+-      }
+-      else if(badRecords.size()>2 && line.contains(badRecords.get(2))) {
+-        LOG.warn("Encountered BAD record");
+-        System.exit(-1);
+-      }
+-      super.processLine(line);
+-    }
+-    
+-    public static void main(String[] args) throws Exception{
+-      new BadApp(args);
+-    }
+-  }
+-  
+-  
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCombiner.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCombiner.java
+deleted file mode 100644
+index 3076d8e6ae7..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCombiner.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.mapred.Counters;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestStreamingCombiner extends TestStreaming {
+-
+-  protected String combine = UtilTest.makeJavaCommand(
+-      UniqApp.class, new String[]{""});
+-  
+-  public TestStreamingCombiner() throws IOException {
+-    super();
+-  }
+-  
+-  protected String[] genArgs() {
+-    args.add("-combiner");
+-    args.add(combine);
+-    return super.genArgs();
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception {
+-    super.testCommandLine();
+-    // validate combiner counters
+-    String counterGrp = "org.apache.hadoop.mapred.Task$Counter";
+-    Counters counters = job.running_.getCounters();
+-    assertTrue(counters.findCounter(
+-               counterGrp, "COMBINE_INPUT_RECORDS").getValue() != 0);
+-    assertTrue(counters.findCounter(
+-               counterGrp, "COMBINE_OUTPUT_RECORDS").getValue() != 0);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCounters.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCounters.java
+deleted file mode 100644
+index 3748f4fb93a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingCounters.java
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.mapred.Counters;
+-import org.apache.hadoop.mapred.Counters.Counter;
+-import org.apache.hadoop.mapred.Counters.Group;
+-
+-/**
+- * This class tests streaming counters in MapReduce local mode.
+- */
+-public class TestStreamingCounters extends TestStreaming {
+-  public TestStreamingCounters() throws IOException {
+-    super();
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception {
+-    super.testCommandLine();
+-    validateCounters();
+-  }
+-  
+-  private void validateCounters() throws IOException {
+-    Counters counters = job.running_.getCounters();
+-    assertNotNull("Counters", counters);
+-    Group group = counters.getGroup("UserCounters");
+-    assertNotNull("Group", group);
+-    Counter counter = group.getCounterForName("InputLines");
+-    assertNotNull("Counter", counter);
+-    assertEquals(3, counter.getCounter());
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingExitStatus.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingExitStatus.java
+deleted file mode 100644
+index 411f740fcda..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingExitStatus.java
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import org.junit.Before;
+-import static org.junit.Assert.*;
+-
+-import java.io.*;
+-import java.util.*;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * This class tests if hadoopStreaming fails a job when the mapper or
+- * reducers have non-zero exit status and the
+- * stream.non.zero.exit.status.is.failure jobconf is set.
+- */
+-public class TestStreamingExitStatus
+-{
+-  protected File TEST_DIR =
+-    new File("target/TestStreamingExitStatus").getAbsoluteFile();
+-  protected File INPUT_FILE = new File(TEST_DIR, "input.txt");
+-  protected File OUTPUT_DIR = new File(TEST_DIR, "out");
+-
+-  protected String failingTask = UtilTest.makeJavaCommand(FailApp.class, new String[]{"true"});
+-  protected String echoTask = UtilTest.makeJavaCommand(FailApp.class, new String[]{"false"});
+-
+-  public TestStreamingExitStatus() throws IOException {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected String[] genArgs(boolean exitStatusIsFailure, boolean failMap) {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", (failMap ? failingTask : echoTask),
+-      "-reducer", (failMap ? echoTask : failingTask),
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.non.zero.exit.is.failure=" + exitStatusIsFailure,
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-jobconf", "mapreduce.task.io.sort.mb=10"
+-    };
+-  }
+-
+-  @Before
+-  public void setUp() throws IOException {
+-    UtilTest.recursiveDelete(TEST_DIR);
+-    assertTrue(TEST_DIR.mkdirs());
+-
+-    FileOutputStream out = new FileOutputStream(INPUT_FILE.getAbsoluteFile());
+-    out.write("hello\n".getBytes());
+-    out.close();
+-  }
+-
+-  public void runStreamJob(boolean exitStatusIsFailure, boolean failMap) throws Exception {
+-    boolean mayExit = false;
+-    int returnStatus = 0;
+-
+-    StreamJob job = new StreamJob(genArgs(exitStatusIsFailure, failMap), mayExit);
+-    returnStatus = job.go();
+-    
+-    if (exitStatusIsFailure) {
+-      assertEquals("Streaming Job failure code expected", /*job not successful:*/1, returnStatus);
+-    } else {
+-      assertEquals("Streaming Job expected to succeed", 0, returnStatus);
+-    }
+-  }
+-
+-  @Test
+-  public void testMapFailOk() throws Exception {
+-    runStreamJob(false, true);
+-  }
+-
+-  @Test
+-  public void testMapFailNotOk() throws Exception {
+-    runStreamJob(true, true);
+-  }
+-
+-  @Test
+-  public void testReduceFailOk() throws Exception {
+-    runStreamJob(false, false);
+-  }
+-  
+-  @Test
+-  public void testReduceFailNotOk() throws Exception {
+-    runStreamJob(true, false);
+-  }  
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingFailure.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingFailure.java
+deleted file mode 100644
+index 29901cc77d8..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingFailure.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.assertEquals;
+-
+-import java.io.File;
+-import java.io.IOException;
+-
+-/**
+- * This class tests if hadoopStreaming returns Exception 
+- * on failure when submitted an invalid/failed job
+- * The test case provides an invalid input file for map/reduce job as
+- * a unit test case
+- */
+-public class TestStreamingFailure extends TestStreaming
+-{
+-
+-  protected File INVALID_INPUT_FILE;
+-
+-  public TestStreamingFailure() throws IOException
+-  {
+-    INVALID_INPUT_FILE = new File("invalid_input.txt");
+-  }
+-
+-  @Override
+-  protected void setInputOutput() {
+-    inputFile = INVALID_INPUT_FILE.getAbsolutePath();
+-    outDir = OUTPUT_DIR.getAbsolutePath();
+-  }
+-
+-  @Override
+-  @Test
+-  public void testCommandLine() throws IOException {
+-    int returnStatus = runStreamJob();
+-    assertEquals("Streaming Job Failure code expected", 5, returnStatus);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingKeyValue.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingKeyValue.java
+deleted file mode 100644
+index c21cb159f4f..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingKeyValue.java
++++ /dev/null
+@@ -1,139 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import java.io.*;
+-
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-
+-/**
+- * This class tests hadoopStreaming in MapReduce local mode.
+- * This testcase looks at different cases of tab position in input. 
+- */
+-public class TestStreamingKeyValue
+-{
+-  protected File INPUT_FILE = new File("target/input.txt");
+-  protected File OUTPUT_DIR = new File("target/stream_out");
+-  // First line of input has 'key' 'tab' 'value'
+-  // Second line of input starts with a tab character. 
+-  // So, it has empty key and the whole line as value.
+-  // Third line of input does not have any tab character.
+-  // So, the whole line is the key and value is empty.
+-  protected String input = 
+-    "roses are \tred\t\n\tviolets are blue\nbunnies are pink\n" +
+-    "this is for testing a big\tinput line\n" +
+-    "small input\n";
+-  protected String outputWithoutKey = 
+-    "\tviolets are blue\nbunnies are pink\t\n" + 
+-    "roses are \tred\t\n" +
+-    "small input\t\n" +
+-    "this is for testing a big\tinput line\n";
+-  protected String outputWithKey = 
+-    "0\troses are \tred\t\n" +  
+-    "16\t\tviolets are blue\n" +
+-    "34\tbunnies are pink\n" +
+-    "51\tthis is for testing a big\tinput line\n" +
+-    "88\tsmall input\n";
+-
+-  private StreamJob job;
+-
+-  public TestStreamingKeyValue() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = new DataOutputStream(
+-       new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs(boolean ignoreKey) {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", TestStreaming.CAT,
+-      "-jobconf", MRJobConfig.PRESERVE_FAILED_TASK_FILES + "=true", 
+-      "-jobconf", "stream.non.zero.exit.is.failure=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-jobconf", "stream.map.input.ignoreKey="+ignoreKey,      
+-    };
+-  }
+-  
+-  public void runStreamJob(final String outputExpect, boolean ignoreKey) 
+-      throws Exception
+-  {
+-    String outFileName = "part-00000";
+-    File outFile = null;
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-      boolean mayExit = false;
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      job = new StreamJob(genArgs(ignoreKey), mayExit);      
+-      job.go();
+-      outFile = new File(OUTPUT_DIR, outFileName).getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-
+-  /**
+-   * Run the job with the indicating the input format key should be emitted. 
+-   */
+-  @Test
+-  public void testCommandLineWithKey() throws Exception
+-  {
+-    runStreamJob(outputWithKey, false);
+-  }
+-
+-  /**
+-   * Run the job the default way (the input format key is not emitted).
+-   */
+-  @Test
+-  public void testCommandLineWithoutKey() throws Exception
+-  {
+-      runStreamJob(outputWithoutKey, true);
+-  }
+-  
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreamingKeyValue().testCommandLineWithKey();    
+-    new TestStreamingKeyValue().testCommandLineWithoutKey();
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputKeyValueTypes.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputKeyValueTypes.java
+deleted file mode 100644
+index 35eb752b23a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputKeyValueTypes.java
++++ /dev/null
+@@ -1,198 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapred.MapReduceBase;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.Reducer;
+-import org.apache.hadoop.mapred.Reporter;
+-import org.apache.hadoop.mapred.TextInputFormat;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-
+-/**
+- * Tests stream job with java tasks, commands in MapReduce local mode.
+- * Validates if user-set config properties
+- * {@link MRJobConfig#MAP_OUTPUT_KEY_CLASS} and
+- * {@link MRJobConfig#OUTPUT_KEY_CLASS} are honored by streaming jobs.
+- */
+-public class TestStreamingOutputKeyValueTypes extends TestStreaming {
+-
+-  public TestStreamingOutputKeyValueTypes() throws IOException {
+-    super();
+-    input = "one line dummy input\n";
+-  }
+-
+-  @Before
+-  @Override
+-  public void setUp() throws IOException {
+-    args.clear();
+-    super.setUp();
+-  }
+-
+-  @Override
+-  protected String[] genArgs() {
+-    // set the testcase-specific config properties first and the remaining
+-    // arguments are set in TestStreaming.genArgs().
+-    args.add("-jobconf");
+-    args.add(MRJobConfig.MAP_OUTPUT_KEY_CLASS +
+-        "=org.apache.hadoop.io.LongWritable");
+-    args.add("-jobconf");
+-    args.add(MRJobConfig.OUTPUT_KEY_CLASS +
+-        "=org.apache.hadoop.io.LongWritable");
+-
+-    // Using SequenceFileOutputFormat here because with TextOutputFormat, the
+-    // mapred.output.key.class set in JobConf (which we want to test here) is
+-    // not read/used at all.
+-    args.add("-outputformat");
+-    args.add("org.apache.hadoop.mapred.SequenceFileOutputFormat");
+-
+-    return super.genArgs();
+-  }
+-
+-  @Override
+-  protected void checkOutput() throws IOException {
+-    // No need to validate output for the test cases in this class
+-  }
+-
+-  public static class MyReducer<K, V>
+-  extends MapReduceBase implements Reducer<K, V, LongWritable, Text> {
+-
+-    public void reduce(K key, Iterator<V> values,
+-        OutputCollector<LongWritable, Text> output, Reporter reporter)
+-        throws IOException {
+-      LongWritable l = new LongWritable();
+-      while (values.hasNext()) {
+-        output.collect(l, new Text(values.next().toString()));
+-      }
+-    }
+-  }
+-
+-  // Check with Java Mapper, Java Reducer
+-  @Test
+-  public void testJavaMapperAndJavaReducer() throws Exception {
+-    map = "org.apache.hadoop.mapred.lib.IdentityMapper";
+-    reduce = "org.apache.hadoop.mapred.lib.IdentityReducer";
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Java Mapper, Java Reducer and -numReduceTasks 0
+-  @Test
+-  public void testJavaMapperAndJavaReducerAndZeroReduces() throws Exception {
+-    map = "org.apache.hadoop.mapred.lib.IdentityMapper";
+-    reduce = "org.apache.hadoop.mapred.lib.IdentityReducer";
+-    args.add("-numReduceTasks");
+-    args.add("0");
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Java Mapper, Reducer = "NONE"
+-  @Test
+-  public void testJavaMapperWithReduceNone() throws Exception {
+-    map = "org.apache.hadoop.mapred.lib.IdentityMapper";
+-    reduce = "NONE";
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Java Mapper, command Reducer
+-  @Test
+-  public void testJavaMapperAndCommandReducer() throws Exception {
+-    map = "org.apache.hadoop.mapred.lib.IdentityMapper";
+-    reduce = CAT;
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Java Mapper, command Reducer and -numReduceTasks 0
+-  @Test
+-  public void testJavaMapperAndCommandReducerAndZeroReduces() throws Exception {
+-    map = "org.apache.hadoop.mapred.lib.IdentityMapper";
+-    reduce = CAT;
+-    args.add("-numReduceTasks");
+-    args.add("0");
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Command Mapper, Java Reducer
+-  @Test
+-  public void testCommandMapperAndJavaReducer() throws Exception {
+-    map = CAT;
+-    reduce = MyReducer.class.getName();
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Command Mapper, Java Reducer and -numReduceTasks 0
+-  @Test
+-  public void testCommandMapperAndJavaReducerAndZeroReduces() throws Exception {
+-    map = CAT;
+-    reduce = MyReducer.class.getName();
+-    args.add("-numReduceTasks");
+-    args.add("0");
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Command Mapper, Reducer = "NONE"
+-  @Test
+-  public void testCommandMapperWithReduceNone() throws Exception {
+-    map = CAT;
+-    reduce = "NONE";
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Command Mapper, Command Reducer
+-  @Test
+-  public void testCommandMapperAndCommandReducer() throws Exception {
+-    map = CAT;
+-    reduce = CAT;
+-    super.testCommandLine();
+-  }
+-
+-  // Check with Command Mapper, Command Reducer and -numReduceTasks 0
+-  @Test
+-  public void testCommandMapperAndCommandReducerAndZeroReduces()
+-      throws Exception {
+-    map = CAT;
+-    reduce = CAT;
+-    args.add("-numReduceTasks");
+-    args.add("0");
+-    super.testCommandLine();
+-  }
+-  
+-  @Test
+-  public void testDefaultToIdentityReducer() throws Exception {
+-    args.add("-mapper");args.add(map);
+-    args.add("-jobconf");
+-    args.add("mapreduce.task.files.preserve.failedtasks=true");
+-    args.add("-jobconf");
+-    args.add("stream.tmpdir="+System.getProperty("test.build.data","/tmp"));
+-    args.add("-inputformat");args.add(TextInputFormat.class.getName());
+-    super.testCommandLine();
+-  }
+-
+-  @Override
+-  @Test
+-  public void testCommandLine() {
+-    // Do nothing
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputOnlyKeys.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputOnlyKeys.java
+deleted file mode 100644
+index ee2647ea3e4..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingOutputOnlyKeys.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.IOException;
+-
+-import org.junit.Test;
+-
+-public class TestStreamingOutputOnlyKeys extends TestStreaming {
+-
+-  public TestStreamingOutputOnlyKeys() throws IOException {
+-    super();
+-  }
+-  
+-  @Test
+-  public void testOutputOnlyKeys() throws Exception {
+-    args.add("-jobconf"); args.add("stream.reduce.input" +
+-        "=keyonlytext");
+-    args.add("-jobconf"); args.add("stream.reduce.output" +
+-        "=keyonlytext");
+-    super.testCommandLine();
+-  }
+-  
+-  @Override
+-  public String getExpectedOutput() {
+-    return outputExpect.replaceAll("\t", "");
+-  }
+-  
+-  @Override
+-  @Test
+-  public void testCommandLine() {
+-    // Do nothing
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingSeparator.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingSeparator.java
+deleted file mode 100644
+index f8167bbdd7a..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingSeparator.java
++++ /dev/null
+@@ -1,122 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import java.io.*;
+-import java.util.*;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-
+-/**
+- * This class tests hadoopStreaming with customized separator in MapReduce local mode.
+- */
+-public class TestStreamingSeparator
+-{
+-
+-  // "map" command: grep -E (red|green|blue)
+-  // reduce command: uniq
+-  protected File INPUT_FILE = new File("TestStreamingSeparator.input.txt");
+-  protected File OUTPUT_DIR = new File("TestStreamingSeparator.out");
+-  protected String input = "roses1are.red\nviolets1are.blue\nbunnies1are.pink\n";
+-  // mapreduce.input.keyvaluelinerecordreader.key.value.separator reads 1 as separator
+-  // stream.map.input.field.separator uses 2 as separator
+-  // map behaves like "/usr/bin/tr 2 3"; (translate 2 to 3)
+-  protected String map = UtilTest.makeJavaCommand(TrApp.class, new String[]{"2", "3"});
+-  // stream.map.output.field.separator recognize 3 as separator
+-  // stream.reduce.input.field.separator recognize 3 as separator
+-  // reduce behaves like "/usr/bin/tr 3 4"; (translate 3 to 4)
+-  protected String reduce = UtilTest.makeJavaCommand(TrAppReduce.class, new String[]{"3", "4"});
+-  // stream.reduce.output.field.separator recognize 4 as separator
+-  // mapreduce.output.textoutputformat.separator outputs 5 as separator
+-  protected String outputExpect = "bunnies5are.pink\nroses5are.red\nviolets5are.blue\n";
+-
+-  private StreamJob job;
+-
+-  public TestStreamingSeparator() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    DataOutputStream out = new DataOutputStream(
+-                                                new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", reduce,
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-inputformat", "KeyValueTextInputFormat",
+-      "-jobconf", "mapreduce.input.keyvaluelinerecordreader.key.value.separator=1",
+-      "-jobconf", "stream.map.input.field.separator=2",
+-      "-jobconf", "stream.map.output.field.separator=3",
+-      "-jobconf", "stream.reduce.input.field.separator=3",
+-      "-jobconf", "stream.reduce.output.field.separator=4",
+-      "-jobconf", "mapreduce.output.textoutputformat.separator=5",
+-    };
+-  }
+-  
+-  @Test
+-  public void testCommandLine() throws Exception
+-  {
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-      boolean mayExit = false;
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      job = new StreamJob(genArgs(), mayExit);      
+-      job.go();
+-      File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      outFile.delete();
+-      System.err.println("outEx1=" + outputExpect);
+-      System.err.println("  out1=" + output);
+-      assertEquals(outputExpect, output);
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreamingSeparator().testCommandLine();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStatus.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStatus.java
+deleted file mode 100644
+index 5cdb0d4b85f..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStatus.java
++++ /dev/null
+@@ -1,336 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.io.File;
+-
+-import org.apache.hadoop.mapred.MiniMRClientCluster;
+-import org.apache.hadoop.mapred.MiniMRClientClusterFactory;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.mapred.Counters;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.TaskAttemptID;
+-import org.apache.hadoop.mapred.TaskID;
+-import org.apache.hadoop.mapred.TaskLog;
+-import org.apache.hadoop.mapred.TaskReport;
+-import org.apache.hadoop.mapreduce.MRJobConfig;
+-import org.apache.hadoop.mapreduce.TaskType;
+-import org.apache.hadoop.mapreduce.MapReduceTestUtil;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-
+-
+-/**
+- * Tests if mapper/reducer with empty/nonempty input works properly if
+- * reporting is done using lines like "reporter:status:" and
+- * "reporter:counter:" before map()/reduce() method is called.
+- * Validates the task's log of STDERR if messages are written to stderr before
+- * map()/reduce() is called.
+- * Also validates job output.
+- * Uses MiniMR since the local jobtracker doesn't track task status. 
+- */
+-public class TestStreamingStatus {
+-  protected static String TEST_ROOT_DIR =
+-    new File(System.getProperty("test.build.data","/tmp"),
+-    TestStreamingStatus.class.getSimpleName())
+-    .toURI().toString().replace(' ', '+');
+-  protected String INPUT_FILE = TEST_ROOT_DIR + "/input.txt";
+-  protected String OUTPUT_DIR = TEST_ROOT_DIR + "/out";
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  protected String map = null;
+-  protected String reduce = null;
+-
+-  protected String scriptFile = TEST_ROOT_DIR + "/perlScript.pl";
+-  protected String scriptFileName = new Path(scriptFile).toUri().getPath();
+-
+-
+-  String expectedStderr = "my error msg before consuming input\n" +
+-      "my error msg after consuming input\n";
+-  String expectedOutput = null;// inited in setUp()
+-  String expectedStatus = "before consuming input";
+-
+-  // This script does the following
+-  // (a) setting task status before reading input
+-  // (b) writing to stderr before reading input and after reading input
+-  // (c) writing to stdout before reading input
+-  // (d) incrementing user counter before reading input and after reading input
+-  // Write lines to stdout before reading input{(c) above} is to validate
+-  // the hanging task issue when input to task is empty(because of not starting
+-  // output thread).
+-  protected String script =
+-    "#!/usr/bin/perl\n" +
+-    "print STDERR \"reporter:status:" + expectedStatus + "\\n\";\n" +
+-    "print STDERR \"reporter:counter:myOwnCounterGroup,myOwnCounter,1\\n\";\n" +
+-    "print STDERR \"my error msg before consuming input\\n\";\n" +
+-    "for($count = 1500; $count >= 1; $count--) {print STDOUT \"$count \";}" +
+-    "while(<STDIN>) {chomp;}\n" +
+-    "print STDERR \"my error msg after consuming input\\n\";\n" +
+-    "print STDERR \"reporter:counter:myOwnCounterGroup,myOwnCounter,1\\n\";\n";
+-
+-  private MiniMRClientCluster mr;
+-  FileSystem fs = null;
+-  JobConf conf = null;
+-
+-  /**
+-   * Start the cluster and create input file before running the actual test.
+-   *
+-   * @throws IOException
+-   */
+-  @Before
+-  public void setUp() throws IOException {
+-    conf = new JobConf();
+-    conf.setBoolean(JTConfig.JT_RETIREJOBS, false);
+-    conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
+-
+-    mr = MiniMRClientClusterFactory.create(this.getClass(), 3, conf);
+-
+-    Path inFile = new Path(INPUT_FILE);
+-    fs = inFile.getFileSystem(mr.getConfig());
+-    clean(fs);
+-
+-    buildExpectedJobOutput();
+-  }
+-
+-  /**
+-   * Kill the cluster after the test is done.
+-   */
+-  @After
+-  public void tearDown() throws IOException {
+-    if (fs != null) {
+-      clean(fs);
+-    }
+-    if (mr != null) {
+-      mr.stop();
+-    }
+-  }
+-
+-  // Updates expectedOutput to have the expected job output as a string
+-  void buildExpectedJobOutput() {
+-    if (expectedOutput == null) {
+-      expectedOutput = "";
+-      for(int i = 1500; i >= 1; i--) {
+-        expectedOutput = expectedOutput.concat(Integer.toString(i) + " ");
+-      }
+-      expectedOutput = expectedOutput.trim();
+-    }
+-  }
+-
+-  // Create empty/nonempty input file.
+-  // Create script file with the specified content.
+-  protected void createInputAndScript(boolean isEmptyInput,
+-      String script) throws IOException {
+-    makeInput(fs, isEmptyInput ? "" : input);
+-
+-    // create script file
+-    DataOutputStream file = fs.create(new Path(scriptFileName));
+-    file.writeBytes(script);
+-    file.close();
+-  }
+-
+-  protected String[] genArgs(String jobtracker, String rmAddress,
+-                             String mapper, String reducer)
+-  {
+-    return new String[] {
+-        "-input", INPUT_FILE,
+-        "-output", OUTPUT_DIR,
+-        "-mapper", mapper,
+-        "-reducer", reducer,
+-        "-jobconf", MRJobConfig.NUM_MAPS + "=1",
+-        "-jobconf", MRJobConfig.NUM_REDUCES + "=1",
+-        "-jobconf", MRJobConfig.PRESERVE_FAILED_TASK_FILES + "=true",
+-        "-jobconf", YarnConfiguration.RM_ADDRESS + "=" + rmAddress,
+-        "-jobconf", "stream.tmpdir=" +
+-        new Path(TEST_ROOT_DIR).toUri().getPath(),
+-        "-jobconf", JTConfig.JT_IPC_ADDRESS + "="+jobtracker,
+-        "-jobconf", "fs.default.name=file:///",
+-        "-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
+-        "-jobconf", "mapreduce.framework.name=yarn"
+-    };
+-  }
+-
+-  // create input file with the given content
+-  public void makeInput(FileSystem fs, String input) throws IOException {
+-    Path inFile = new Path(INPUT_FILE);
+-    DataOutputStream file = fs.create(inFile);
+-    file.writeBytes(input);
+-    file.close();
+-  }
+-
+-  // Delete output directory
+-  protected void deleteOutDir(FileSystem fs) {
+-    try {
+-      Path outDir = new Path(OUTPUT_DIR);
+-      fs.delete(outDir, true);
+-    } catch (Exception e) {}
+-  }
+-
+-  // Delete input file, script file and output directory
+-  public void clean(FileSystem fs) {
+-    deleteOutDir(fs);
+-    try {
+-      Path file = new Path(INPUT_FILE);
+-      if (fs.exists(file)) {
+-        fs.delete(file, false);
+-      }
+-      file = new Path(scriptFile);
+-      if (fs.exists(file)) {
+-        fs.delete(file, false);
+-      }
+-    } catch (Exception e) {
+-      e.printStackTrace();
+-    }
+-  }
+-
+-  /**
+-   * Check if mapper/reducer with empty/nonempty input works properly if
+-   * reporting is done using lines like "reporter:status:" and
+-   * "reporter:counter:" before map()/reduce() method is called.
+-   * Validate the task's log of STDERR if messages are written
+-   * to stderr before map()/reduce() is called.
+-   * Also validate job output.
+-   *
+-   * @throws IOException
+-   */
+-  @Test
+-  public void testReporting() throws Exception {
+-    testStreamJob(false);// nonempty input
+-    testStreamJob(true);// empty input
+-  }
+-
+-  /**
+-   * Run a streaming job with the given script as mapper and validate.
+-   * Run another streaming job with the given script as reducer and validate.
+-   *
+-   * @param isEmptyInput Should the input to the script be empty ?
+-   */
+-  private void testStreamJob(boolean isEmptyInput)
+-      throws Exception {
+-
+-      createInputAndScript(isEmptyInput, script);
+-
+-      // Check if streaming mapper works as expected
+-      map = scriptFileName;
+-      reduce = "/bin/cat";
+-      runStreamJob(TaskType.MAP, isEmptyInput);
+-      deleteOutDir(fs);
+-
+-      // Check if streaming reducer works as expected.
+-      map = "/bin/cat";
+-      reduce = scriptFileName;
+-      runStreamJob(TaskType.REDUCE, isEmptyInput);
+-      clean(fs);
+-  }
+-
+-  // Run streaming job for the specified input file, mapper and reducer and
+-  // (1) Validate if the job succeeds.
+-  // (2) Validate if user counter is incremented properly for the cases of
+-  //   (a) nonempty input to map
+-  //   (b) empty input to map and
+-  //   (c) nonempty input to reduce
+-  // (3) Validate task status for the cases of (2)(a),(2)(b),(2)(c).
+-  //     Because empty input to reduce task => reporter is dummy and ignores
+-  //     all "reporter:status" and "reporter:counter" lines. 
+-  // (4) Validate stderr of task of given task type.
+-  // (5) Validate job output
+-  private void runStreamJob(TaskType type, boolean isEmptyInput)
+-      throws Exception {
+-    StreamJob job = new StreamJob();
+-    int returnValue = job.run(genArgs(
+-        mr.getConfig().get(JTConfig.JT_IPC_ADDRESS),
+-        mr.getConfig().get(YarnConfiguration.RM_ADDRESS), map, reduce));
+-    assertEquals(0, returnValue);
+-
+-    // If input to reducer is empty, dummy reporter(which ignores all
+-    // reporting lines) is set for MRErrorThread in waitOutputThreads(). So
+-    // expectedCounterValue is 0 for empty-input-to-reducer case.
+-    // Output of reducer is also empty for empty-input-to-reducer case.
+-    int expectedCounterValue = 0;
+-    if (type == TaskType.MAP || !isEmptyInput) {
+-      validateTaskStatus(job, type);
+-      // output is from "print STDOUT" statements in perl script
+-      validateJobOutput(job.getConf());
+-      expectedCounterValue = 2;
+-    }
+-    validateUserCounter(job, expectedCounterValue);
+-    validateTaskStderr(job, type);
+-
+-    deleteOutDir(fs);
+-  }
+-
+-  // validate task status of task of given type(validates 1st task of that type)
+-  void validateTaskStatus(StreamJob job, TaskType type) throws IOException {
+-    // Map Task has 2 phases: map, sort
+-    // Reduce Task has 3 phases: copy, sort, reduce
+-    String finalPhaseInTask;
+-    TaskReport[] reports;
+-    if (type == TaskType.MAP) {
+-      reports = job.jc_.getMapTaskReports(job.jobId_);
+-      finalPhaseInTask = "sort";
+-    } else {// reduce task
+-      reports = job.jc_.getReduceTaskReports(job.jobId_);
+-      finalPhaseInTask = "reduce";
+-    }
+-    assertEquals(1, reports.length);
+-    assertEquals(expectedStatus + " > " + finalPhaseInTask,
+-        reports[0].getState());
+-  }
+-
+-  // Validate the job output
+-  void validateJobOutput(Configuration conf)
+-      throws IOException {
+-
+-    String output = MapReduceTestUtil.readOutput(
+-        new Path(OUTPUT_DIR), conf).trim();
+-
+-    assertTrue(output.equals(expectedOutput));
+-  }
+-
+-  // Validate stderr task log of given task type(validates 1st
+-  // task of that type).
+-  void validateTaskStderr(StreamJob job, TaskType type)
+-      throws IOException {
+-    TaskAttemptID attemptId =
+-        new TaskAttemptID(new TaskID(job.jobId_, type, 0), 0);
+-
+-    String log = MapReduceTestUtil.readTaskLog(TaskLog.LogName.STDERR,
+-        attemptId, false);
+-
+-    // trim() is called on expectedStderr here because the method
+-    // MapReduceTestUtil.readTaskLog() returns trimmed String.
+-    assertTrue(log.equals(expectedStderr.trim()));
+-  }
+-
+-  // Validate if user counter is incremented properly
+-  void validateUserCounter(StreamJob job, int expectedCounterValue)
+-      throws IOException {
+-    Counters counters = job.running_.getCounters();
+-    assertEquals(expectedCounterValue, counters.findCounter(
+-        "myOwnCounterGroup", "myOwnCounter").getValue());
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStderr.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStderr.java
+deleted file mode 100644
+index b80777968ef..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingStderr.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.*;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-/**
+- * Test that streaming consumes stderr from the streaming process
+- * (before, during, and after the main processing of mapred input),
+- * and that stderr messages count as task progress.
+- */
+-public class TestStreamingStderr
+-{
+-  public TestStreamingStderr() throws IOException {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected String[] genArgs(File input, File output, int preLines, int duringLines, int postLines) {
+-    return new String[] {
+-      "-input", input.getAbsolutePath(),
+-      "-output", output.getAbsolutePath(),
+-      "-mapper", UtilTest.makeJavaCommand(StderrApp.class,
+-                                            new String[]{Integer.toString(preLines),
+-                                                         Integer.toString(duringLines),
+-                                                         Integer.toString(postLines)}),
+-      "-reducer", StreamJob.REDUCE_NONE,
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "mapreduce.task.timeout=5000",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
+-    };
+-  }
+-
+-  protected File setupInput(String base, boolean hasInput) throws IOException {
+-    File input = new File(base + "-input.txt");
+-    UtilTest.recursiveDelete(input);
+-    FileOutputStream in = new FileOutputStream(input.getAbsoluteFile());
+-    if (hasInput) {
+-      in.write("hello\n".getBytes());      
+-    }
+-    in.close();
+-    return input;
+-  }
+-  
+-  protected File setupOutput(String base) throws IOException {
+-    File output = new File(base + "-out");
+-    UtilTest.recursiveDelete(output);
+-    return output;
+-  }
+-
+-  public void runStreamJob(String baseName, boolean hasInput,
+-                           int preLines, int duringLines, int postLines)
+-    throws Exception {
+-    File input = setupInput(baseName, hasInput);
+-    File output = setupOutput(baseName);
+-    boolean mayExit = false;
+-    int returnStatus = 0;
+-
+-    StreamJob job = new StreamJob(genArgs(input, output, preLines, duringLines, postLines), mayExit);
+-    returnStatus = job.go();
+-    assertEquals("StreamJob success", 0, returnStatus);
+-  }
+-
+-  // This test will fail by blocking forever if the stderr isn't
+-  // consumed by Hadoop for tasks that don't have any input.
+-  @Test
+-  public void testStderrNoInput() throws Exception {
+-    runStreamJob("target/stderr-pre", false, 10000, 0, 0);
+-  }
+-
+-  // Streaming should continue to read stderr even after all input has
+-  // been consumed.
+-  @Test
+-  public void testStderrAfterOutput() throws Exception {
+-    runStreamJob("target/stderr-post", false, 0, 0, 10000);
+-  }
+-
+-  // This test should produce a task timeout if stderr lines aren't
+-  // counted as progress. This won't actually work until
+-  // LocalJobRunner supports timeouts.
+-  @Test
+-  public void testStderrCountsAsProgress() throws Exception {
+-    runStreamJob("target/stderr-progress", true, 10, 1000, 0);
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestSymLink.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestSymLink.java
+deleted file mode 100644
+index 7994952578f..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestSymLink.java
++++ /dev/null
+@@ -1,142 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.BufferedReader;
+-import java.io.DataOutputStream;
+-import java.io.InputStreamReader;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.MiniMRCluster;
+-import org.apache.hadoop.mapred.Utils;
+-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
+-/**
+- * This test case tests the symlink creation
+- * utility provided by distributed caching 
+- */
+-public class TestSymLink
+-{
+-  String INPUT_FILE = "/testing-streaming/input.txt";
+-  String OUTPUT_DIR = "/testing-streaming/out";
+-  String CACHE_FILE = "/testing-streaming/cache.txt";
+-  String input = "check to see if we can read this none reduce";
+-  String map = TestStreaming.XARGS_CAT;
+-  String reduce = TestStreaming.CAT;
+-  String mapString = "testlink\n";
+-  String cacheString = "This is just the cache string";
+-  StreamJob job;
+-
+-  @Test (timeout = 120000)
+-  public void testSymLink() throws Exception
+-  {
+-    boolean mayExit = false;
+-    MiniMRCluster mr = null;
+-    MiniDFSCluster dfs = null; 
+-    try {
+-      Configuration conf = new Configuration();
+-      dfs = new MiniDFSCluster.Builder(conf).build();
+-      FileSystem fileSys = dfs.getFileSystem();
+-      String namenode = fileSys.getUri().toString();
+-      mr  = new MiniMRCluster(1, namenode, 3);
+-
+-      List<String> args = new ArrayList<String>();
+-      for (Map.Entry<String, String> entry : mr.createJobConf()) {
+-        args.add("-jobconf");
+-        args.add(entry.getKey() + "=" + entry.getValue());
+-      }
+-
+-      // During tests, the default Configuration will use a local mapred
+-      // So don't specify -config or -cluster
+-      String argv[] = new String[] {
+-        "-input", INPUT_FILE,
+-        "-output", OUTPUT_DIR,
+-        "-mapper", map,
+-        "-reducer", reduce,
+-        "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-        "-jobconf", 
+-          JobConf.MAPRED_MAP_TASK_JAVA_OPTS+ "=" +
+-            "-Dcontrib.name=" + System.getProperty("contrib.name") + " " +
+-            "-Dbuild.test=" + System.getProperty("build.test") + " " +
+-            conf.get(JobConf.MAPRED_MAP_TASK_JAVA_OPTS, 
+-                     conf.get(JobConf.MAPRED_TASK_JAVA_OPTS, "")),
+-        "-jobconf", 
+-          JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS+ "=" +
+-            "-Dcontrib.name=" + System.getProperty("contrib.name") + " " +
+-            "-Dbuild.test=" + System.getProperty("build.test") + " " +
+-            conf.get(JobConf.MAPRED_REDUCE_TASK_JAVA_OPTS, 
+-                     conf.get(JobConf.MAPRED_TASK_JAVA_OPTS, "")),
+-        "-cacheFile", fileSys.getUri() + CACHE_FILE + "#testlink",
+-        "-jobconf", "mapred.jar=" + TestStreaming.STREAMING_JAR,
+-      };
+-
+-      for (String arg : argv) {
+-        args.add(arg);
+-      }
+-      argv = args.toArray(new String[args.size()]);
+-  
+-      fileSys.delete(new Path(OUTPUT_DIR), true);
+-      
+-      DataOutputStream file = fileSys.create(new Path(INPUT_FILE));
+-      file.writeBytes(mapString);
+-      file.close();
+-      file = fileSys.create(new Path(CACHE_FILE));
+-      file.writeBytes(cacheString);
+-      file.close();
+-        
+-      job = new StreamJob(argv, mayExit);      
+-      job.go();
+-
+-      fileSys = dfs.getFileSystem();
+-      String line = null;
+-      Path[] fileList = FileUtil.stat2Paths(fileSys.listStatus(
+-                                              new Path(OUTPUT_DIR),
+-                                              new Utils.OutputFileUtils
+-                                                       .OutputFilesFilter()));
+-      for (int i = 0; i < fileList.length; i++){
+-        System.out.println(fileList[i].toString());
+-        BufferedReader bread =
+-          new BufferedReader(new InputStreamReader(fileSys.open(fileList[i])));
+-        line = bread.readLine();
+-        System.out.println(line);
+-      }
+-      assertEquals(cacheString + "\t", line);
+-    } finally{
+-      if (dfs != null) { dfs.shutdown(); }
+-      if (mr != null) { mr.shutdown();}
+-    }
+-    
+-  }
+-
+-  public static void main(String[]args) throws Exception
+-  {
+-    new TestStreaming().testCommandLine();
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestTypedBytesStreaming.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestTypedBytesStreaming.java
+deleted file mode 100644
+index 05a050cac83..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestTypedBytesStreaming.java
++++ /dev/null
+@@ -1,91 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileUtil;
+-
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestTypedBytesStreaming {
+-
+-  protected File INPUT_FILE = new File("target/input.txt");
+-  protected File OUTPUT_DIR = new File("target/out");
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  protected String map = UtilTest.makeJavaCommand(TypedBytesMapApp.class, new String[]{"."});
+-  protected String reduce = UtilTest.makeJavaCommand(TypedBytesReduceApp.class, new String[0]);
+-  protected String outputExpect = "are\t3\nred\t1\nblue\t1\npink\t1\nroses\t1\nbunnies\t1\nviolets\t1\n";
+-  
+-  public TestTypedBytesStreaming() throws IOException {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException {
+-    DataOutputStream out = new DataOutputStream(new FileOutputStream(INPUT_FILE.getAbsoluteFile()));
+-    out.write(input.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", reduce,
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp"),
+-      "-io", "typedbytes"
+-    };
+-  }
+-
+-  @Before
+-  @After
+-  public void cleanupOutput() throws Exception {
+-    FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    INPUT_FILE.delete();
+-    createInput();
+-  }
+-
+-  @Test
+-  public void testCommandLine() throws Exception {
+-    // During tests, the default Configuration will use a local mapred
+-    // So don't specify -config or -cluster
+-    StreamJob job = new StreamJob();
+-    job.setConf(new Configuration());
+-    job.run(genArgs());
+-    File outFile = new File(OUTPUT_DIR, "part-00000").getAbsoluteFile();
+-    String output = StreamUtil.slurp(outFile);
+-    outFile.delete();
+-    System.out.println("   map=" + map);
+-    System.out.println("reduce=" + reduce);
+-    System.err.println("outEx1=" + outputExpect);
+-    System.err.println("  out1=" + output);
+-    assertEquals(outputExpect, output);
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
+deleted file mode 100644
+index b2bc84b4f90..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestUnconsumedInput.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import static org.junit.Assert.*;
+-
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.junit.Test;
+-
+-public class TestUnconsumedInput {
+-  protected final int EXPECTED_OUTPUT_SIZE = 10000;
+-  protected File INPUT_FILE = new File("stream_uncinput_input.txt");
+-  protected File OUTPUT_DIR = new File("stream_uncinput_out");
+-  // map parses input lines and generates count entries for each word.
+-  protected String input = "roses.are.red\nviolets.are.blue\nbunnies.are.pink\n";
+-  protected String map = UtilTest.makeJavaCommand(OutputOnlyApp.class,
+-      new String[]{Integer.toString(EXPECTED_OUTPUT_SIZE)});
+-
+-  private StreamJob job;
+-
+-  public TestUnconsumedInput() throws IOException
+-  {
+-    UtilTest utilTest = new UtilTest(getClass().getName());
+-    utilTest.checkUserDir();
+-    utilTest.redirectIfAntJunit();
+-  }
+-
+-  protected void createInput() throws IOException
+-  {
+-    try (DataOutputStream out = new DataOutputStream(
+-            new FileOutputStream(INPUT_FILE.getAbsoluteFile()))) {
+-      for (int i=0; i<10000; ++i) {
+-        out.write(input.getBytes(StandardCharsets.UTF_8));
+-      }
+-    }
+-  }
+-
+-  protected String[] genArgs() {
+-    return new String[] {
+-      "-input", INPUT_FILE.getAbsolutePath(),
+-      "-output", OUTPUT_DIR.getAbsolutePath(),
+-      "-mapper", map,
+-      "-reducer", "org.apache.hadoop.mapred.lib.IdentityReducer",
+-      "-numReduceTasks", "0",
+-      "-jobconf", "mapreduce.task.files.preserve.failedtasks=true",
+-      "-jobconf", "stream.tmpdir="+System.getProperty("test.build.data","/tmp")
+-    };
+-  }
+-
+-  @Test
+-  public void testUnconsumedInput() throws Exception
+-  {
+-    String outFileName = "part-00000";
+-    File outFile = null;
+-    try {
+-      try {
+-        FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-      } catch (Exception e) {
+-      }
+-
+-      createInput();
+-
+-      // setup config to ignore unconsumed input
+-      Configuration conf = new Configuration();
+-      conf.set("stream.minRecWrittenToEnableSkip_", "0");
+-
+-      job = new StreamJob();
+-      job.setConf(conf);
+-      int exitCode = job.run(genArgs());
+-      assertEquals("Job failed", 0, exitCode);
+-      outFile = new File(OUTPUT_DIR, outFileName).getAbsoluteFile();
+-      String output = StreamUtil.slurp(outFile);
+-      assertEquals("Output was truncated", EXPECTED_OUTPUT_SIZE,
+-          StringUtils.countMatches(output, "\t"));
+-    } finally {
+-      INPUT_FILE.delete();
+-      FileUtil.fullyDelete(OUTPUT_DIR.getAbsoluteFile());
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrApp.java
+deleted file mode 100644
+index d0583320e70..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrApp.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-import org.apache.hadoop.streaming.Environment;
+-
+-/** A minimal Java implementation of /usr/bin/tr.
+- *  Used to test the usage of external applications without adding
+- *  platform-specific dependencies.
+- *  Use TrApp as mapper only. For reducer, use TrAppReduce.
+- */
+-public class TrApp
+-{
+-
+-  public TrApp(char find, char replace)
+-  {
+-    this.find = find;
+-    this.replace = replace;
+-  }
+-
+-  void testParentJobConfToEnvVars() throws IOException
+-  {
+-    env = new Environment();
+-    // test that some JobConf properties are exposed as expected     
+-    // Note the dots translated to underscore: 
+-    // property names have been escaped in PipeMapRed.safeEnvVarName()
+-    expectDefined("mapreduce_cluster_local_dir");
+-    expect("mapreduce_map_output_key_class", "org.apache.hadoop.io.Text");
+-    expect("mapreduce_map_output_value_class", "org.apache.hadoop.io.Text");
+-
+-    expect("mapreduce_task_ismap", "true");
+-    expectDefined("mapreduce_task_attempt_id");
+-
+-    expectDefined("mapreduce_map_input_file");
+-    expectDefined("mapreduce_map_input_length");
+-
+-    expectDefined("mapreduce_task_io_sort_factor");
+-
+-    // the FileSplit context properties are not available in local hadoop..
+-    // so can't check them in this test.
+-
+-    // verify some deprecated properties appear for older stream jobs
+-    expect("map_input_file", env.getProperty("mapreduce_map_input_file"));
+-    expect("map_input_length", env.getProperty("mapreduce_map_input_length"));
+-  }
+-
+-  // this runs in a subprocess; won't use JUnit's assertTrue()    
+-  void expect(String evName, String evVal) throws IOException
+-  {
+-    String got = env.getProperty(evName);
+-    if (!evVal.equals(got)) {
+-      String msg = "FAIL evName=" + evName + " got=" + got + " expect=" + evVal;
+-      throw new IOException(msg);
+-    }
+-  }
+-
+-  void expectDefined(String evName) throws IOException
+-  {
+-    String got = env.getProperty(evName);
+-    if (got == null) {
+-      String msg = "FAIL evName=" + evName + " is undefined. Expect defined.";
+-      throw new IOException(msg);
+-    }
+-  }
+-
+-  public void go() throws IOException
+-  {
+-    testParentJobConfToEnvVars();
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-
+-    while ((line = in.readLine()) != null) {
+-      String out = line.replace(find, replace);
+-      System.out.println(out);
+-      System.err.println("reporter:counter:UserCounters,InputLines,1");
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException
+-  {
+-    args[0] = CUnescape(args[0]);
+-    args[1] = CUnescape(args[1]);
+-    TrApp app = new TrApp(args[0].charAt(0), args[1].charAt(0));
+-    app.go();
+-  }
+-
+-  public static String CUnescape(String s)
+-  {
+-    if (s.equals("\\n")) {
+-      return "\n";
+-    } else {
+-      return s;
+-    }
+-  }
+-  char find;
+-  char replace;
+-  Environment env;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrAppReduce.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrAppReduce.java
+deleted file mode 100644
+index e373f07d0cd..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TrAppReduce.java
++++ /dev/null
+@@ -1,112 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-
+-import org.apache.hadoop.streaming.Environment;
+-
+-/** A minimal Java implementation of /usr/bin/tr.
+- *  Used to test the usage of external applications without adding
+- *  platform-specific dependencies.
+- *  Use TrAppReduce as reducer only. For mapper, use TrApp.
+- */
+-public class TrAppReduce
+-{
+-
+-  public TrAppReduce(char find, char replace)
+-  {
+-    this.find = find;
+-    this.replace = replace;
+-  }
+-
+-  void testParentJobConfToEnvVars() throws IOException
+-  {
+-    env = new Environment();
+-    // test that some JobConf properties are exposed as expected     
+-    // Note the dots translated to underscore: 
+-    // property names have been escaped in PipeMapRed.safeEnvVarName()
+-    expect("mapreduce_jobtracker_address", "local");
+-    //expect("mapred_local_dir", "build/test/mapred/local");
+-    expectDefined("mapreduce_cluster_local_dir");
+-    expect("mapred_output_format_class", "org.apache.hadoop.mapred.TextOutputFormat");
+-    expect("mapreduce_job_output_key_class", "org.apache.hadoop.io.Text");
+-    expect("mapreduce_job_output_value_class", "org.apache.hadoop.io.Text");
+-
+-    expect("mapreduce_task_ismap", "false");
+-    expectDefined("mapreduce_task_attempt_id");
+-
+-    expectDefined("mapreduce_task_io_sort_factor");
+-
+-    // the FileSplit context properties are not available in local hadoop..
+-    // so can't check them in this test.
+-
+-  }
+-
+-  // this runs in a subprocess; won't use JUnit's assertTrue()    
+-  void expect(String evName, String evVal) throws IOException
+-  {
+-    String got = env.getProperty(evName);
+-    if (!evVal.equals(got)) {
+-      String msg = "FAIL evName=" + evName + " got=" + got + " expect=" + evVal;
+-      throw new IOException(msg);
+-    }
+-  }
+-
+-  void expectDefined(String evName) throws IOException
+-  {
+-    String got = env.getProperty(evName);
+-    if (got == null) {
+-      String msg = "FAIL evName=" + evName + " is undefined. Expect defined.";
+-      throw new IOException(msg);
+-    }
+-  }
+-
+-  public void go() throws IOException
+-  {
+-    testParentJobConfToEnvVars();
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-
+-    while ((line = in.readLine()) != null) {
+-      String out = line.replace(find, replace);
+-      System.out.println(out);
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException
+-  {
+-    args[0] = CUnescape(args[0]);
+-    args[1] = CUnescape(args[1]);
+-    TrAppReduce app = new TrAppReduce(args[0].charAt(0), args[1].charAt(0));
+-    app.go();
+-  }
+-
+-  public static String CUnescape(String s)
+-  {
+-    if (s.equals("\\n")) {
+-      return "\n";
+-    } else {
+-      return s;
+-    }
+-  }
+-  char find;
+-  char replace;
+-  Environment env;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesMapApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesMapApp.java
+deleted file mode 100644
+index 6dd268c2c58..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesMapApp.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.typedbytes.TypedBytesInput;
+-import org.apache.hadoop.typedbytes.TypedBytesOutput;
+-
+-public class TypedBytesMapApp {
+-
+-  private String find;
+-
+-  public TypedBytesMapApp(String find) {
+-    this.find = find;
+-  }
+-
+-  public void go() throws IOException {
+-    TypedBytesInput tbinput = new TypedBytesInput(new DataInputStream(System.in));
+-    TypedBytesOutput tboutput = new TypedBytesOutput(new DataOutputStream(System.out));
+-
+-    Object key = tbinput.readRaw();
+-    while (key != null) {
+-      Object value = tbinput.read();
+-      for (String part : value.toString().split(find)) {
+-        tboutput.write(part);  // write key
+-        tboutput.write(1);     // write value
+-      }
+-      System.err.println("reporter:counter:UserCounters,InputLines,1");
+-      key = tbinput.readRaw();
+-    }
+-    
+-    System.out.flush();
+-  }
+-  
+-  public static void main(String[] args) throws IOException {
+-    TypedBytesMapApp app = new TypedBytesMapApp(args[0].replace(".","\\."));
+-    app.go();
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesReduceApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesReduceApp.java
+deleted file mode 100644
+index 4ea0caa5d13..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TypedBytesReduceApp.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.typedbytes.TypedBytesInput;
+-import org.apache.hadoop.typedbytes.TypedBytesOutput;
+-
+-public class TypedBytesReduceApp {
+-
+-  public void go() throws IOException {
+-    TypedBytesInput tbinput = new TypedBytesInput(new DataInputStream(System.in));
+-    TypedBytesOutput tboutput = new TypedBytesOutput(new DataOutputStream(System.out));
+-    
+-    Object prevKey = null;
+-    int sum = 0;
+-    Object key = tbinput.read();
+-    while (key != null) {
+-      if (prevKey != null && !key.equals(prevKey)) {
+-        tboutput.write(prevKey);  // write key
+-        tboutput.write(sum);      // write value
+-        sum = 0;
+-      }
+-      sum += (Integer) tbinput.read();
+-      prevKey = key;
+-      key = tbinput.read();
+-    }
+-    tboutput.write(prevKey);
+-    tboutput.write(sum);
+-    
+-    System.out.flush();
+-  }
+-
+-  public static void main(String[] args) throws IOException {
+-    TypedBytesReduceApp app = new TypedBytesReduceApp();
+-    app.go();
+-  }
+-  
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UniqApp.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UniqApp.java
+deleted file mode 100644
+index 30188932c59..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UniqApp.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.Date;
+-
+-/** A minimal Java implementation of /usr/bin/uniq
+-    Used to test the usage of external applications without adding
+-    platform-specific dependencies.
+-    Uniques lines and prepends a header on the line.
+- */
+-public class UniqApp
+-{
+-
+-  public UniqApp(String header)
+-  {
+-    this.header = header;
+-  }
+-  public void go() throws IOException
+-  {
+-    BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+-    String line;
+-    String prevLine = null;
+-    while ((line = in.readLine()) != null) {
+-      if (!line.equals(prevLine)) {
+-        System.out.println(header + line);
+-      }
+-      prevLine = line;
+-    }
+-  }
+-
+-  public static void main(String[] args) throws IOException
+-  {
+-    String h = (args.length < 1) ? "" : args[0];
+-    UniqApp app = new UniqApp(h);
+-    app.go();
+-  }
+-
+-  String header;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java
+deleted file mode 100644
+index 2378c7b4149..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/UtilTest.java
++++ /dev/null
+@@ -1,145 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.util.ArrayList;
+-import java.util.Iterator;
+-import java.util.List;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-import org.apache.hadoop.util.Shell.ShellCommandExecutor;
+-
+-class UtilTest {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(UtilTest.class);
+-
+-  /**
+-   * Utility routine to recurisvely delete a directory.
+-   * On normal return, the file does not exist.
+-   *
+-   * @param file File or directory to delete.
+-   *
+-   * @throws RuntimeException if the file, or some file within
+-   * it, could not be deleted.
+-   */
+-  static void recursiveDelete(File file) {
+-    file = file.getAbsoluteFile();
+-
+-    if (!file.exists()) return;
+-    
+-    if (file.isDirectory()) {
+-      for (File child : file.listFiles()) {
+-	recursiveDelete(child);
+-      }
+-    }
+-    if (!file.delete()) {
+-      throw new RuntimeException("Failed to delete " + file);
+-    }
+-  }
+-  
+-  public UtilTest(String testName) {
+-    testName_ = testName;
+-    userDir_ = System.getProperty("user.dir");
+-    antTestDir_ = System.getProperty("test.build.data", userDir_);
+-    System.out.println("test.build.data-or-user.dir=" + antTestDir_);
+-  }
+-
+-  void checkUserDir() {
+-//    // trunk/src/contrib/streaming --> trunk/build/contrib/streaming/test/data
+-//    if (!userDir_.equals(antTestDir_)) {
+-//      // because changes to user.dir are ignored by File static methods.
+-//      throw new IllegalStateException("user.dir != test.build.data. The junit Ant task must be forked.");
+-//    }
+-  }
+-
+-  void redirectIfAntJunit() throws IOException
+-  {
+-    boolean fromAntJunit = System.getProperty("test.build.data") != null;
+-    if (fromAntJunit) {
+-      new File(antTestDir_).mkdirs();
+-      File outFile = new File(antTestDir_, testName_+".log");
+-      PrintStream out = new PrintStream(new FileOutputStream(outFile));
+-      System.setOut(out);
+-      System.setErr(out);
+-    }
+-  }
+-
+-  public static String collate(List<String> args, String sep) {
+-    StringBuffer buf = new StringBuffer();
+-    Iterator<String> it = args.iterator();
+-    while (it.hasNext()) {
+-      if (buf.length() > 0) {
+-        buf.append(" ");
+-      }
+-      buf.append(it.next());
+-    }
+-    return buf.toString();
+-  }
+-
+-  public static String makeJavaCommand(Class<?> main, String[] argv) {
+-    ArrayList<String> vargs = new ArrayList<String>();
+-    File javaHomeBin = new File(System.getProperty("java.home"), "bin");
+-    File jvm = new File(javaHomeBin, "java");
+-    vargs.add(jvm.toString());
+-    // copy parent classpath
+-    vargs.add("-classpath");
+-    vargs.add("\"" + System.getProperty("java.class.path") + "\"");
+-  
+-    // add heap-size limit
+-    vargs.add("-Xmx" + Runtime.getRuntime().maxMemory());
+-  
+-    // Add main class and its arguments
+-    vargs.add(main.getName());
+-    for (int i = 0; i < argv.length; i++) {
+-      vargs.add(argv[i]);
+-    }
+-    return collate(vargs, " ");
+-  }
+-
+-  /**
+-   * Is perl supported on this machine ?
+-   * @return true if perl is available and is working as expected
+-   */
+-  public static boolean hasPerlSupport() {
+-    boolean hasPerl = false;
+-    ShellCommandExecutor shexec = new ShellCommandExecutor(
+-      new String[] { "perl", "-e", "print 42" });
+-    try {
+-      shexec.execute();
+-      if (shexec.getOutput().equals("42")) {
+-        hasPerl = true;
+-      }
+-      else {
+-        LOG.warn("Perl is installed, but isn't behaving as expected.");
+-      }
+-    } catch (Exception e) {
+-      LOG.warn("Could not run perl: " + e);
+-    }
+-    return hasPerl;
+-  }
+-
+-  private String userDir_;
+-  private String antTestDir_;
+-  private String testName_;
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/ValueCountReduce.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/ValueCountReduce.java
+deleted file mode 100644
+index 025b6d999a6..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/ValueCountReduce.java
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming;
+-
+-import java.io.*;
+-import java.util.Date;
+-
+-import java.io.IOException;
+-import java.util.Iterator;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.WritableComparable;
+-import org.apache.hadoop.mapred.JobConf;
+-import org.apache.hadoop.mapred.OutputCollector;
+-import org.apache.hadoop.mapred.Reducer;
+-import org.apache.hadoop.mapred.Reporter;
+-
+-public class ValueCountReduce implements Reducer {
+-
+-  /**
+-   * @param args
+-   */
+-  public static void main(String[] args) {
+-    // TODO Auto-generated method stub
+-
+-  }
+-
+-  public void reduce(Object arg0, Iterator arg1, OutputCollector arg2, Reporter arg3) throws IOException {
+-    int count = 0;
+-    while (arg1.hasNext()) {
+-      count += 1;
+-      arg1.next();
+-    }
+-    arg2.collect(arg0, new Text("" + count));
+-  }
+-
+-  public void configure(JobConf arg0) {
+-    // TODO Auto-generated method stub
+-    
+-  }
+-
+-  public void close() throws IOException {
+-    // TODO Auto-generated method stub
+-    
+-  }
+-
+-}
+-
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
+deleted file mode 100644
+index d606fe106c2..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/io/TestKeyOnlyTextOutputReader.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.io;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.DataInput;
+-import java.io.DataInputStream;
+-import java.io.IOException;
+-
+-import org.junit.Assert;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.streaming.PipeMapRed;
+-import org.apache.hadoop.streaming.PipeMapper;
+-import org.junit.Test;
+-
+-public class TestKeyOnlyTextOutputReader {
+-  @Test
+-  public void testKeyOnlyTextOutputReader() throws IOException {
+-    String text = "key,value\nkey2,value2\nnocomma\n";
+-    PipeMapRed pipeMapRed = new MyPipeMapRed(text);
+-    KeyOnlyTextOutputReader outputReader = new KeyOnlyTextOutputReader();
+-    outputReader.initialize(pipeMapRed);
+-    outputReader.readKeyValue();
+-    Assert.assertEquals(new Text("key,value"), outputReader.getCurrentKey());
+-    outputReader.readKeyValue();
+-    Assert.assertEquals(new Text("key2,value2"), outputReader.getCurrentKey());
+-    outputReader.readKeyValue();
+-    Assert.assertEquals(new Text("nocomma"), outputReader.getCurrentKey());
+-    Assert.assertEquals(false, outputReader.readKeyValue());
+-  }
+-  
+-  private class MyPipeMapRed extends PipeMapper {
+-    private DataInput clientIn;
+-    private Configuration conf = new Configuration();
+-    
+-    public MyPipeMapRed(String text) {
+-      clientIn = new DataInputStream(new ByteArrayInputStream(text.getBytes()));
+-    }
+-    
+-    @Override
+-    public DataInput getClientInput() {
+-      return clientIn;
+-    }
+-    
+-    @Override
+-    public Configuration getConfiguration() {
+-      return conf;
+-    }
+-  }
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
+deleted file mode 100644
+index 5bf2fe52d44..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
++++ /dev/null
+@@ -1,145 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.streaming.mapreduce;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Arrays;
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.mapreduce.Job;
+-import org.apache.hadoop.mapreduce.Mapper;
+-import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
+-import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * This class tests StreamXmlRecordReader The test creates an XML file, uses
+- * StreamXmlRecordReader and compares the expected output against the generated
+- * output
+- */
+-public class TestStreamXmlRecordReader {
+-
+-  private File INPUT_FILE;
+-  private String input;
+-  private String outputExpect;
+-  Path OUTPUT_DIR;
+-  FileSystem fs;
+-
+-  public TestStreamXmlRecordReader() throws IOException {
+-    INPUT_FILE = new File("target/input.xml");
+-    input = "<xmltag>\t\nroses.are.red\t\nviolets.are.blue\t\n"
+-        + "bunnies.are.pink\t\n</xmltag>\t\n";
+-    outputExpect = input;
+-  }
+-
+-  protected void assertOutput(String expectedOutput, String output)
+-      throws IOException {
+-    String[] words = expectedOutput.split("\t\n");
+-    Set<String> expectedWords = new HashSet<String>(Arrays.asList(words));
+-    words = output.split("\t\n");
+-    Set<String> returnedWords = new HashSet<String>(Arrays.asList(words));
+-    assertTrue(returnedWords.containsAll(expectedWords));
+-  }
+-
+-  protected void checkOutput() throws IOException {
+-    File outFile = new File(OUTPUT_DIR.toString());
+-    Path outPath = new Path(outFile.getAbsolutePath(), "part-r-00000");
+-    String output = slurpHadoop(outPath, fs);
+-    fs.delete(outPath, true);
+-    outputExpect = "<PATTERN>\n" + outputExpect + "</PATTERN>";
+-    System.err.println("outEx1=" + outputExpect);
+-    System.err.println("  out1=" + output);
+-    assertOutput(outputExpect, output);
+-  }
+-
+-  private String slurpHadoop(Path p, FileSystem fs) throws IOException {
+-    int len = (int) fs.getFileStatus(p).getLen();
+-    byte[] buf = new byte[len];
+-    FSDataInputStream in = fs.open(p);
+-    String contents = null;
+-    try {
+-      in.readFully(in.getPos(), buf);
+-      contents = new String(buf, StandardCharsets.UTF_8);
+-    } finally {
+-      in.close();
+-    }
+-    return contents;
+-  }
+-
+-  @Before
+-  public void createInput() throws IOException {
+-    FileOutputStream out = new FileOutputStream(INPUT_FILE.getAbsoluteFile());
+-    String dummyXmlStartTag = "<PATTERN>\n";
+-    String dummyXmlEndTag = "</PATTERN>\n";
+-    out.write(dummyXmlStartTag.getBytes("UTF-8"));
+-    out.write(input.getBytes("UTF-8"));
+-    out.write(dummyXmlEndTag.getBytes("UTF-8"));
+-    out.close();
+-  }
+-
+-  @Test
+-  public void testStreamXmlRecordReader() throws Exception {
+-
+-    Job job = Job.getInstance();
+-    Configuration conf = job.getConfiguration();
+-    job.setJarByClass(TestStreamXmlRecordReader.class);
+-    job.setMapperClass(Mapper.class);
+-    conf.set("stream.recordreader.class",
+-        "org.apache.hadoop.streaming.mapreduce.StreamXmlRecordReader");
+-    conf.set("stream.recordreader.begin", "<PATTERN>");
+-    conf.set("stream.recordreader.end", "</PATTERN>");
+-    job.setInputFormatClass(StreamInputFormat.class);
+-    job.setMapOutputKeyClass(Text.class);
+-    job.setMapOutputValueClass(Text.class);
+-    job.setOutputKeyClass(Text.class);
+-    job.setOutputValueClass(Text.class);
+-    FileInputFormat.addInputPath(job, new Path("target/input.xml"));
+-    OUTPUT_DIR = new Path("target/output");
+-    fs = FileSystem.get(conf);
+-    if (fs.exists(OUTPUT_DIR)) {
+-      fs.delete(OUTPUT_DIR, true);
+-    }
+-    FileOutputFormat.setOutputPath(job, OUTPUT_DIR);
+-    boolean ret = job.waitForCompletion(true);
+-
+-    assertEquals(true, ret);
+-    checkOutput();
+-
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    fs.delete(OUTPUT_DIR, true);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestTypedBytesWritable.java b/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestTypedBytesWritable.java
+deleted file mode 100644
+index 1ca543610f6..00000000000
+--- a/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/typedbytes/TestTypedBytesWritable.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.typedbytes;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataInput;
+-import java.io.DataInputStream;
+-import java.io.DataOutput;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-
+-import org.junit.Test;
+-import static org.junit.Assert.*;
+-
+-public class TestTypedBytesWritable {
+-
+-  @Test
+-  public void testToString() {
+-    TypedBytesWritable tbw = new TypedBytesWritable();
+-    tbw.setValue(true);
+-    assertEquals("true", tbw.toString());
+-    tbw.setValue(12345);
+-    assertEquals("12345", tbw.toString());
+-    tbw.setValue(123456789L);
+-    assertEquals("123456789", tbw.toString());
+-    tbw.setValue((float) 1.23);
+-    assertEquals("1.23", tbw.toString());
+-    tbw.setValue(1.23456789);
+-    assertEquals("1.23456789", tbw.toString());
+-    tbw.setValue("random text");
+-    assertEquals("random text", tbw.toString());
+-  }
+-
+-  @Test
+-  public void testIO() throws IOException {
+-    TypedBytesWritable tbw = new TypedBytesWritable();
+-    tbw.setValue(12345);
+-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-    DataOutput dout = new DataOutputStream(baos);
+-    tbw.write(dout);
+-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+-    DataInput din = new DataInputStream(bais);
+-    TypedBytesWritable readTbw = new TypedBytesWritable();
+-    readTbw.readFields(din);
+-    assertEquals(tbw, readTbw);
+-  }
+-
+-}
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index cf641d633fc..e4b67499db0 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -34,17 +34,6 @@
+   </properties>
+ 
+   <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-streaming</artifactId>
+-      <scope>compile</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.projectlombok</groupId>
+-          <artifactId>lombok</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 2b2842fe9fc..329157f3fd2 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -30,7 +30,7 @@
+   <packaging>pom</packaging>
+ 
+   <modules>
+-    <module>hadoop-streaming</module>
++
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-tools-dist</module>
diff --git a/hadoop/stackable/patches/3.4.0/15-hadoop-yarn-csi.patch b/hadoop/stackable/patches/3.4.0/15-hadoop-yarn-csi.patch
new file mode 100644
index 000000000..49f48176a
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/15-hadoop-yarn-csi.patch
@@ -0,0 +1,4142 @@
+Entirely remove hadoop-yarn-csi
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../main/resources/assemblies/hadoop-yarn-dist.xml |   14 
+ .../dev-support/findbugs-exclude.xml               |   21 
+ .../hadoop-yarn/hadoop-yarn-csi/pom.xml            |  261 -----
+ .../hadoop/yarn/csi/adaptor/CsiAdaptorFactory.java |   73 -
+ .../csi/adaptor/CsiAdaptorProtocolService.java     |  114 --
+ .../yarn/csi/adaptor/CsiAdaptorServices.java       |  108 --
+ .../yarn/csi/adaptor/DefaultCsiAdaptorImpl.java    |  124 --
+ .../hadoop/yarn/csi/adaptor/package-info.java      |   21 
+ .../apache/hadoop/yarn/csi/client/CsiClient.java   |   49 -
+ .../hadoop/yarn/csi/client/CsiClientImpl.java      |   82 -
+ .../hadoop/yarn/csi/client/CsiGrpcClient.java      |  127 --
+ .../hadoop/yarn/csi/client/package-info.java       |   21 
+ .../org/apache/hadoop/yarn/csi/package-info.java   |   21 
+ .../GetPluginInfoResponseProtoTranslator.java      |   44 -
+ .../NodePublishVolumeRequestProtoTranslator.java   |   77 -
+ .../NodeUnpublishVolumeRequestProtoTranslator.java |   49 -
+ .../yarn/csi/translator/ProtoTranslator.java       |   49 -
+ .../csi/translator/ProtoTranslatorFactory.java     |   78 -
+ ...teVolumeCapabilitiesRequestProtoTranslator.java |   93 --
+ ...nVolumeCapabilitiesResponseProtoTranslator.java |   48 -
+ .../hadoop/yarn/csi/translator/package-info.java   |   21 
+ .../apache/hadoop/yarn/csi/utils/GrpcHelper.java   |   52 -
+ .../apache/hadoop/yarn/csi/utils/package-info.java |   21 
+ .../hadoop-yarn-csi/src/main/proto/csi.proto       | 1114 --------------------
+ .../hadoop/yarn/csi/adaptor/MockCsiAdaptor.java    |   85 --
+ .../yarn/csi/adaptor/TestCsiAdaptorService.java    |  460 --------
+ .../adaptor/TestGetPluginInfoRequestResponse.java  |   68 -
+ .../csi/adaptor/TestNodePublishVolumeRequest.java  |   57 -
+ .../TestValidateVolumeCapabilityRequest.java       |  113 --
+ .../TestValidateVolumeCapabilityResponse.java      |   62 -
+ .../hadoop/yarn/csi/adaptor/package-info.java      |   21 
+ .../hadoop/yarn/csi/client/FakeCsiDriver.java      |   66 -
+ .../yarn/csi/client/FakeCsiIdentityService.java    |   42 -
+ .../hadoop/yarn/csi/client/ICsiClientTest.java     |   53 -
+ .../hadoop/yarn/csi/client/TestCsiClient.java      |   84 --
+ .../hadoop/yarn/csi/client/package-info.java       |   21 
+ hadoop-yarn-project/hadoop-yarn/pom.xml            |    1 
+ 37 files changed, 3815 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorProtocolService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/DefaultCsiAdaptorImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClientImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiGrpcClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/GetPluginInfoResponseProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodePublishVolumeRequestProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodeUnpublishVolumeRequestProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslatorFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidateVolumeCapabilitiesRequestProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidationVolumeCapabilitiesResponseProtoTranslator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/GrpcHelper.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/proto/csi.proto
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/MockCsiAdaptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestGetPluginInfoRequestResponse.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestNodePublishVolumeRequest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityResponse.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiDriver.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiIdentityService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/ICsiClientTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/package-info.java
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index cd86ce4e417..71031593c3c 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -220,10 +220,6 @@
+       <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/target/lib</directory>
+       <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/lib</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-csi/target/lib</directory>
+-      <outputDirectory>share/hadoop/${hadoop.component}/csi/lib</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/target/lib</directory>
+       <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/lib</outputDirectory>
+@@ -266,16 +262,6 @@
+         <unpack>false</unpack>
+       </binaries>
+     </moduleSet>
+-    <moduleSet>
+-      <includes>
+-        <include>org.apache.hadoop:hadoop-yarn-csi</include>
+-      </includes>
+-      <binaries>
+-        <outputDirectory>share/hadoop/${hadoop.component}/csi</outputDirectory>
+-        <includeDependencies>false</includeDependencies>
+-        <unpack>false</unpack>
+-      </binaries>
+-    </moduleSet>
+     <moduleSet>
+       <excludes>
+         <exclude>org.apache.hadoop:hadoop-yarn-server-timelineservice*</exclude>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 6ab0a7fc711..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,21 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-    <Match>
+-        <Package name="csi.v0" />
+-    </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+deleted file mode 100644
+index 49506137c89..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
++++ /dev/null
+@@ -1,261 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-    <parent>
+-        <artifactId>hadoop-yarn</artifactId>
+-        <groupId>org.apache.hadoop</groupId>
+-        <version>3.4.0</version>
+-    </parent>
+-    <modelVersion>4.0.0</modelVersion>
+-    <artifactId>hadoop-yarn-csi</artifactId>
+-    <name>Apache Hadoop YARN CSI</name>
+-    <packaging>jar</packaging>
+-
+-    <properties>
+-        <grpc.version>1.53.0</grpc.version>
+-        <animal-sniffer.version>1.21</animal-sniffer.version>
+-    </properties>
+-
+-    <dependencies>
+-        <dependency>
+-            <groupId>org.apache.hadoop.thirdparty</groupId>
+-            <artifactId>hadoop-shaded-guava</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>com.google.protobuf</groupId>
+-            <artifactId>protobuf-java</artifactId>
+-            <version>${hadoop.protobuf.version}</version>
+-            <scope>${transient.protobuf2.scope}</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.netty</groupId>
+-            <artifactId>netty-all</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.grpc</groupId>
+-            <artifactId>grpc-core</artifactId>
+-            <version>${grpc.version}</version>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.codehaus.mojo</groupId>
+-                    <artifactId>animal-sniffer-annotations</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.codehaus.mojo</groupId>
+-            <artifactId>animal-sniffer-annotations</artifactId>
+-            <version>${animal-sniffer.version}</version>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.grpc</groupId>
+-            <artifactId>grpc-protobuf</artifactId>
+-            <version>${grpc.version}</version>
+-            <exclusions>
+-                <!-- Exclude protobuf-java 2.5.0 -->
+-                <exclusion>
+-                    <groupId>com.google.protobuf</groupId>
+-                    <artifactId>protobuf-java</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.grpc</groupId>
+-            <artifactId>grpc-stub</artifactId>
+-            <version>${grpc.version}</version>
+-        </dependency>
+-        <dependency>
+-            <groupId>io.grpc</groupId>
+-            <artifactId>grpc-netty</artifactId>
+-            <version>${grpc.version}</version>
+-            <exclusions>
+-                <!-- Contained in netty-all. skip -->
+-                <exclusion>
+-                    <groupId>io.netty</groupId>
+-                    <artifactId>netty-codec-http2</artifactId>
+-                </exclusion>
+-                <!-- Contained in netty-all. skip -->
+-                <exclusion>
+-                    <groupId>io.netty</groupId>
+-                    <artifactId>netty-handler-proxy</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>junit</groupId>
+-            <artifactId>junit</artifactId>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.assertj</groupId>
+-            <artifactId>assertj-core</artifactId>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.junit.jupiter</groupId>
+-            <artifactId>junit-jupiter-api</artifactId>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.junit.jupiter</groupId>
+-            <artifactId>junit-jupiter-engine</artifactId>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-common</artifactId>
+-            <type>test-jar</type>
+-            <scope>test</scope>
+-            <exclusions>
+-                <!-- Exclude protobuf-java 2.5.0 -->
+-                <exclusion>
+-                    <groupId>com.google.protobuf</groupId>
+-                    <artifactId>protobuf-java</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-common</artifactId>
+-            <scope>provided</scope>
+-            <exclusions>
+-                <!-- Exclude protobuf-java 2.5.0 -->
+-                <exclusion>
+-                    <groupId>com.google.protobuf</groupId>
+-                    <artifactId>protobuf-java</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-common</artifactId>
+-            <scope>provided</scope>
+-            <exclusions>
+-                <!-- Exclude protobuf-java 2.5.0 -->
+-                <exclusion>
+-                    <groupId>com.google.protobuf</groupId>
+-                    <artifactId>protobuf-java</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-api</artifactId>
+-            <scope>provided</scope>
+-            <exclusions>
+-                <!-- Exclude protobuf-java 2.5.0 -->
+-                <exclusion>
+-                    <groupId>com.google.protobuf</groupId>
+-                    <artifactId>protobuf-java</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-        <dependency>
+-            <groupId>javax.annotation</groupId>
+-            <artifactId>javax.annotation-api</artifactId>
+-            <scope>compile</scope>
+-        </dependency>
+-    </dependencies>
+-
+-    <build>
+-        <plugins>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-dependency-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <phase>package</phase>
+-                        <goals>
+-                            <goal>copy-dependencies</goal>
+-                        </goals>
+-                        <configuration>
+-                            <includeScope>runtime</includeScope>
+-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-compiler-plugin</artifactId>
+-            </plugin>
+-            <plugin>
+-                <artifactId>maven-clean-plugin</artifactId>
+-                <configuration>
+-                    <filesets>
+-                        <fileset>
+-                            <directory>target/</directory>
+-                        </fileset>
+-                    </filesets>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.xolstice.maven.plugins</groupId>
+-                <artifactId>protobuf-maven-plugin</artifactId>
+-                <version>${protobuf-maven-plugin.version}</version>
+-                <configuration>
+-                    <protocArtifact>com.google.protobuf:protoc:${hadoop.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+-                    <pluginId>grpc-java</pluginId>
+-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+-                </configuration>
+-                <executions>
+-                    <execution>
+-                        <goals>
+-                            <goal>compile</goal>
+-                            <goal>compile-custom</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.rat</groupId>
+-                <artifactId>apache-rat-plugin</artifactId>
+-                <configuration>
+-                    <excludes>
+-                        <exclude>target/generated-sources/**</exclude>
+-                        <exclude>target/surefire-reports/**</exclude>
+-                        <exclude>target/protoc-dependencies/**</exclude>
+-                    </excludes>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-javadoc-plugin</artifactId>
+-                <configuration>
+-                    <excludePackageNames>csi.v0</excludePackageNames>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.codehaus.mojo</groupId>
+-                <artifactId>build-helper-maven-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <id>add-source</id>
+-                        <phase>generate-sources</phase>
+-                        <goals>
+-                            <goal>add-source</goal>
+-                        </goals>
+-                        <configuration>
+-                            <sources>
+-                                <source>${basedir}/target/generated-sources/protobuf/java</source>
+-                            </sources>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-        </plugins>
+-    </build>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorFactory.java
+deleted file mode 100644
+index 955c36f81f8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorFactory.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Desired csi-adaptor implementation is configurable, default to
+- * CsiAdaptorProtocolService. If user wants to have a different implementation,
+- * just to configure a different class for the csi-driver.
+- */
+-public final class CsiAdaptorFactory {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CsiAdaptorFactory.class);
+-
+-  private CsiAdaptorFactory() {
+-    // hide constructor for this factory class.
+-  }
+-
+-  /**
+-   * Load csi-driver-adaptor from configuration. If the configuration is not
+-   * specified, the default implementation
+-   * for the adaptor is {@link DefaultCsiAdaptorImpl}. If the configured class
+-   * is not a valid variation of {@link CsiAdaptorPlugin} or the class cannot
+-   * be found, this function will throw a RuntimeException.
+-   * @param driverName
+-   * @param conf
+-   * @return CsiAdaptorPlugin
+-   * @throws YarnException if unable to create the adaptor class.
+-   * @throws RuntimeException if given class is not found or not
+-   *   an instance of {@link CsiAdaptorPlugin}
+-   */
+-  public static CsiAdaptorPlugin getAdaptor(String driverName,
+-      Configuration conf) throws YarnException {
+-    // load configuration
+-    String configName = YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-        + driverName + YarnConfiguration.NM_CSI_ADAPTOR_CLASS;
+-    Class<? extends CsiAdaptorPlugin> impl = conf.getClass(configName,
+-        DefaultCsiAdaptorImpl.class, CsiAdaptorPlugin.class);
+-    if (impl == null) {
+-      throw new YarnException("Unable to init csi-adaptor from the"
+-          + " class specified via " + configName);
+-    }
+-
+-    // init the adaptor
+-    CsiAdaptorPlugin instance = ReflectionUtils.newInstance(impl, conf);
+-    LOG.info("csi-adaptor initiated, implementation: "
+-        + impl.getCanonicalName());
+-    return instance;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorProtocolService.java
+deleted file mode 100644
+index 300c5bcaa26..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorProtocolService.java
++++ /dev/null
+@@ -1,114 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.CsiAdaptorProtocol;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.util.csi.CsiConfigUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-/**
+- * This is a Hadoop RPC server, we uses the Hadoop RPC framework here
+- * because we need to stick to the security model current Hadoop supports.
+- */
+-public class CsiAdaptorProtocolService extends AbstractService
+-    implements CsiAdaptorProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CsiAdaptorProtocolService.class);
+-
+-  private Server server;
+-  private InetSocketAddress adaptorServiceAddress;
+-  private CsiAdaptorPlugin serverImpl;
+-
+-  public CsiAdaptorProtocolService(CsiAdaptorPlugin adaptorImpl) {
+-    super(CsiAdaptorProtocolService.class.getName());
+-    this.serverImpl = adaptorImpl;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    adaptorServiceAddress = CsiConfigUtils
+-        .getCsiAdaptorAddressForDriver(serverImpl.getDriverName(), conf);
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    Configuration conf = getConfig();
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    this.server = rpc.getServer(
+-        CsiAdaptorProtocol.class,
+-        serverImpl, adaptorServiceAddress, conf, null, 1);
+-    this.server.start();
+-    LOG.info("{} started, listening on address: {}",
+-        CsiAdaptorProtocolService.class.getName(),
+-        adaptorServiceAddress.toString());
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.server != null) {
+-      this.server.stop();
+-    }
+-    super.serviceStop();
+-  }
+-
+-  @Override
+-  public GetPluginInfoResponse getPluginInfo(
+-      GetPluginInfoRequest request) throws YarnException, IOException {
+-    return serverImpl.getPluginInfo(request);
+-  }
+-
+-  @Override
+-  public ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-      ValidateVolumeCapabilitiesRequest request) throws YarnException,
+-      IOException {
+-    return serverImpl.validateVolumeCapacity(request);
+-  }
+-
+-  @Override
+-  public NodePublishVolumeResponse nodePublishVolume(
+-      NodePublishVolumeRequest request) throws YarnException, IOException {
+-    return serverImpl.nodePublishVolume(request);
+-  }
+-
+-  @Override
+-  public NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      NodeUnpublishVolumeRequest request) throws YarnException, IOException {
+-    return serverImpl.nodeUnpublishVolume(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorServices.java
+deleted file mode 100644
+index 78debbe5baa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/CsiAdaptorServices.java
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.server.api.ApplicationInitializationContext;
+-import org.apache.hadoop.yarn.server.api.ApplicationTerminationContext;
+-import org.apache.hadoop.yarn.server.api.AuxiliaryService;
+-import org.apache.hadoop.yarn.util.csi.CsiConfigUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.nio.ByteBuffer;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * NM manages csi-adaptors as a single NM AUX service, this service
+- * manages a set of rpc services and each of them serves one particular
+- * csi-driver. It loads all available drivers from configuration, and
+- * find a csi-driver-adaptor implementation class for each of them. At last
+- * it brings up all of them as a composite service.
+- */
+-public class CsiAdaptorServices extends AuxiliaryService {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CsiAdaptorServices.class);
+-
+-  private List<CsiAdaptorProtocolService> serviceList;
+-  protected CsiAdaptorServices() {
+-    super(CsiAdaptorServices.class.getName());
+-    serviceList = new ArrayList<>();
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    // load configuration and init adaptors
+-    String[] names = CsiConfigUtils.getCsiDriverNames(conf);
+-    if (names != null && names.length > 0) {
+-      for (String driverName : names) {
+-        LOG.info("Adding csi-driver-adaptor for csi-driver {}", driverName);
+-        CsiAdaptorPlugin serviceImpl = CsiAdaptorFactory
+-            .getAdaptor(driverName, conf);
+-        serviceImpl.init(driverName, conf);
+-        CsiAdaptorProtocolService service =
+-            new CsiAdaptorProtocolService(serviceImpl);
+-        serviceList.add(service);
+-        service.serviceInit(conf);
+-      }
+-    }
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (serviceList != null && serviceList.size() > 0) {
+-      for (CsiAdaptorProtocolService service : serviceList) {
+-        try {
+-          service.serviceStop();
+-        } catch (Exception e) {
+-          LOG.warn("Unable to stop service " + service.getName(), e);
+-        }
+-      }
+-    }
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    if (serviceList != null && serviceList.size() > 0) {
+-      for (CsiAdaptorProtocolService service : serviceList) {
+-        service.serviceStart();
+-      }
+-    }
+-  }
+-
+-  @Override
+-  public void initializeApplication(
+-      ApplicationInitializationContext initAppContext) {
+-    // do nothing
+-  }
+-
+-  @Override
+-  public void stopApplication(
+-      ApplicationTerminationContext stopAppContext) {
+-    // do nothing
+-  }
+-
+-  @Override
+-  public ByteBuffer getMetaData() {
+-    return ByteBuffer.allocate(0);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/DefaultCsiAdaptorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/DefaultCsiAdaptorImpl.java
+deleted file mode 100644
+index 26ffae46832..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/DefaultCsiAdaptorImpl.java
++++ /dev/null
+@@ -1,124 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.csi.client.CsiClient;
+-import org.apache.hadoop.yarn.csi.client.CsiClientImpl;
+-import org.apache.hadoop.yarn.csi.translator.ProtoTranslatorFactory;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.util.csi.CsiConfigUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-/**
+- * The default implementation of csi-driver-adaptor service.
+- */
+-public class DefaultCsiAdaptorImpl implements CsiAdaptorPlugin {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DefaultCsiAdaptorImpl.class);
+-
+-  private String driverName;
+-  private CsiClient csiClient;
+-
+-  public DefaultCsiAdaptorImpl() {
+-    // use default constructor for reflection
+-  }
+-
+-  @Override
+-  public void init(String driverName, Configuration conf)
+-      throws YarnException {
+-    // if the driver end point is invalid, following code will fail.
+-    String driverEndpoint = CsiConfigUtils
+-        .getCsiDriverEndpoint(driverName, conf);
+-    LOG.info("This csi-adaptor is configured to contact with"
+-            + " the csi-driver {} via gRPC endpoint: {}",
+-        driverName, driverEndpoint);
+-    this.csiClient = new CsiClientImpl(driverEndpoint);
+-    this.driverName = driverName;
+-  }
+-
+-  @Override
+-  public String getDriverName() {
+-    return driverName;
+-  }
+-
+-  @Override
+-  public GetPluginInfoResponse getPluginInfo(
+-      GetPluginInfoRequest request) throws YarnException, IOException {
+-    Csi.GetPluginInfoResponse response = csiClient.getPluginInfo();
+-    return ProtoTranslatorFactory.getTranslator(
+-        GetPluginInfoResponse.class, Csi.GetPluginInfoResponse.class)
+-        .convertFrom(response);
+-  }
+-
+-  @Override
+-  public ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-      ValidateVolumeCapabilitiesRequest request) throws YarnException,
+-      IOException {
+-    Csi.ValidateVolumeCapabilitiesRequest req = ProtoTranslatorFactory
+-        .getTranslator(ValidateVolumeCapabilitiesRequest.class,
+-            Csi.ValidateVolumeCapabilitiesRequest.class)
+-        .convertTo(request);
+-    Csi.ValidateVolumeCapabilitiesResponse response =
+-        csiClient.validateVolumeCapabilities(req);
+-    return ProtoTranslatorFactory.getTranslator(
+-        ValidateVolumeCapabilitiesResponse.class,
+-        Csi.ValidateVolumeCapabilitiesResponse.class)
+-        .convertFrom(response);
+-  }
+-
+-  @Override
+-  public NodePublishVolumeResponse nodePublishVolume(
+-      NodePublishVolumeRequest request) throws YarnException, IOException {
+-    LOG.debug("Received nodePublishVolume call, request: {}",
+-        request);
+-    Csi.NodePublishVolumeRequest req = ProtoTranslatorFactory
+-        .getTranslator(NodePublishVolumeRequest.class,
+-            Csi.NodePublishVolumeRequest.class).convertTo(request);
+-    LOG.debug("Translate to CSI proto message: {}", req);
+-    csiClient.nodePublishVolume(req);
+-    return NodePublishVolumeResponse.newInstance();
+-  }
+-
+-  @Override
+-  public NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      NodeUnpublishVolumeRequest request) throws YarnException, IOException {
+-    LOG.debug("Received nodeUnpublishVolume call, request: {}",
+-        request);
+-    Csi.NodeUnpublishVolumeRequest req = ProtoTranslatorFactory
+-        .getTranslator(NodeUnpublishVolumeRequest.class,
+-            Csi.NodeUnpublishVolumeRequest.class).convertTo(request);
+-    LOG.debug("Translate to CSI proto message: {}", req);
+-    csiClient.nodeUnpublishVolume(req);
+-    return NodeUnpublishVolumeResponse.newInstance();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
+deleted file mode 100644
+index 919aab587aa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains CSI adaptor classes.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClient.java
+deleted file mode 100644
+index 837b667a5e6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClient.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.Csi;
+-import csi.v0.Csi.GetPluginInfoResponse;
+-
+-import java.io.IOException;
+-
+-/**
+- * General interface for a CSI client. This interface defines all APIs
+- * that CSI spec supports, including both identity/controller/node service
+- * APIs.
+- */
+-public interface CsiClient {
+-
+-  /**
+-   * Gets some basic info about the CSI plugin, including the driver name,
+-   * version and optionally some manifest info.
+-   * @return {@link GetPluginInfoResponse}
+-   * @throws IOException when unable to get plugin info from the driver.
+-   */
+-  GetPluginInfoResponse getPluginInfo() throws IOException;
+-
+-  Csi.ValidateVolumeCapabilitiesResponse validateVolumeCapabilities(
+-      Csi.ValidateVolumeCapabilitiesRequest request) throws IOException;
+-
+-  Csi.NodePublishVolumeResponse nodePublishVolume(
+-      Csi.NodePublishVolumeRequest request) throws IOException;
+-
+-  Csi.NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      Csi.NodeUnpublishVolumeRequest request) throws IOException;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClientImpl.java
+deleted file mode 100644
+index 0a107e16b5e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiClientImpl.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.Csi;
+-import csi.v0.Csi.GetPluginInfoRequest;
+-import csi.v0.Csi.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.csi.utils.GrpcHelper;
+-
+-import java.io.IOException;
+-import java.net.SocketAddress;
+-
+-/**
+- * A CSI client implementation that communicates with a CSI driver via
+- * unix domain socket. It leverages gRPC blocking stubs to synchronize
+- * the call with CSI driver. CSI spec is designed as a set of synchronized
+- * APIs, in order to make the call idempotent for failure recovery,
+- * so the client does the same.
+- */
+-public class CsiClientImpl implements CsiClient {
+-
+-  private final SocketAddress address;
+-
+-  public CsiClientImpl(String address) {
+-    this.address = GrpcHelper.getSocketAddress(address);
+-  }
+-
+-  @Override
+-  public GetPluginInfoResponse getPluginInfo() throws IOException {
+-    try (CsiGrpcClient client = CsiGrpcClient.newBuilder()
+-        .setDomainSocketAddress(address).build()) {
+-      GetPluginInfoRequest request = GetPluginInfoRequest.getDefaultInstance();
+-      return client.createIdentityBlockingStub().getPluginInfo(request);
+-    }
+-  }
+-
+-  @Override
+-  public Csi.ValidateVolumeCapabilitiesResponse validateVolumeCapabilities(
+-      Csi.ValidateVolumeCapabilitiesRequest request) throws IOException {
+-    try (CsiGrpcClient client = CsiGrpcClient.newBuilder()
+-        .setDomainSocketAddress(address).build()) {
+-      return client.createControllerBlockingStub()
+-          .validateVolumeCapabilities(request);
+-    }
+-  }
+-
+-  @Override
+-  public Csi.NodePublishVolumeResponse nodePublishVolume(
+-      Csi.NodePublishVolumeRequest request) throws IOException {
+-    try (CsiGrpcClient client = CsiGrpcClient.newBuilder()
+-        .setDomainSocketAddress(address).build()) {
+-      return client.createNodeBlockingStub()
+-          .nodePublishVolume(request);
+-    }
+-  }
+-
+-  @Override
+-  public Csi.NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      Csi.NodeUnpublishVolumeRequest request) throws IOException {
+-    try (CsiGrpcClient client = CsiGrpcClient.newBuilder()
+-        .setDomainSocketAddress(address).build()) {
+-      return client.createNodeBlockingStub()
+-          .nodeUnpublishVolume(request);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiGrpcClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiGrpcClient.java
+deleted file mode 100644
+index af6eec23565..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/CsiGrpcClient.java
++++ /dev/null
+@@ -1,127 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.ControllerGrpc;
+-import csi.v0.IdentityGrpc;
+-import csi.v0.NodeGrpc;
+-import io.grpc.ManagedChannel;
+-import io.grpc.netty.NettyChannelBuilder;
+-import io.netty.channel.epoll.EpollDomainSocketChannel;
+-import io.netty.channel.epoll.EpollEventLoopGroup;
+-import io.netty.channel.unix.DomainSocketAddress;
+-import io.netty.util.concurrent.DefaultThreadFactory;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.SocketAddress;
+-import java.util.concurrent.TimeUnit;
+-
+-/**
+- * A CSI gRPC client, it connects a CSI driver via a given unix domain socket.
+- */
+-public final class CsiGrpcClient implements AutoCloseable {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CsiGrpcClient.class);
+-
+-  private final ManagedChannel channel;
+-
+-  private CsiGrpcClient(ManagedChannel channel) {
+-    this.channel = channel;
+-  }
+-
+-  public static GrpcClientBuilder newBuilder() {
+-    return new GrpcClientBuilder();
+-  }
+-
+-  /**
+-   * The Grpc Client builder.
+-   */
+-  public static class GrpcClientBuilder {
+-
+-    private SocketAddress socket;
+-
+-    public GrpcClientBuilder setDomainSocketAddress(SocketAddress address) {
+-      this.socket = address;
+-      return this;
+-    }
+-
+-    private ManagedChannel getChannel(SocketAddress socketAddress)
+-        throws IOException {
+-      DefaultThreadFactory tf = new DefaultThreadFactory(
+-          "yarn-csi-client-", true);
+-      EpollEventLoopGroup loopGroup = new EpollEventLoopGroup(0, tf);
+-      if (socketAddress instanceof DomainSocketAddress) {
+-        ManagedChannel channel = NettyChannelBuilder.forAddress(socketAddress)
+-            .channelType(EpollDomainSocketChannel.class)
+-            .eventLoopGroup(loopGroup)
+-            .usePlaintext()
+-            .build();
+-        return channel;
+-      } else {
+-        throw new IOException("Currently only unix domain socket is supported");
+-      }
+-    }
+-
+-    public CsiGrpcClient build() throws IOException {
+-      ManagedChannel socketChannel = getChannel(socket);
+-      return new CsiGrpcClient(socketChannel);
+-    }
+-  }
+-
+-  /**
+-   * Shutdown the communication channel gracefully,
+-   * wait for 5 seconds before it is enforced.
+-   */
+-  @Override
+-  public void close() {
+-    try {
+-      this.channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
+-    } catch (InterruptedException e) {
+-      LOG.error("Failed to gracefully shutdown"
+-          + " gRPC communication channel in 5 seconds", e);
+-    }
+-  }
+-
+-  /**
+-   * Creates a blocking stub for CSI identity plugin on the given channel.
+-   * @return the blocking stub
+-   */
+-  public IdentityGrpc.IdentityBlockingStub createIdentityBlockingStub() {
+-    return IdentityGrpc.newBlockingStub(channel);
+-  }
+-
+-  /**
+-   * Creates a blocking stub for CSI controller plugin on the given channel.
+-   * @return the blocking stub
+-   */
+-  public ControllerGrpc.ControllerBlockingStub createControllerBlockingStub(){
+-    return ControllerGrpc.newBlockingStub(channel);
+-  }
+-
+-  /**
+-   * Creates a blocking stub for CSI node plugin on the given channel.
+-   * @return the blocking stub
+-   */
+-  public NodeGrpc.NodeBlockingStub createNodeBlockingStub() {
+-    return NodeGrpc.newBlockingStub(channel);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/package-info.java
+deleted file mode 100644
+index 54afe1b8b0a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/client/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains CSI client classes.
+- */
+-package org.apache.hadoop.yarn.csi.client;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/package-info.java
+deleted file mode 100644
+index ee61f871b78..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains classes for CSI.
+- */
+-package org.apache.hadoop.yarn.csi;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/GetPluginInfoResponseProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/GetPluginInfoResponseProtoTranslator.java
+deleted file mode 100644
+index bcf634addcb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/GetPluginInfoResponseProtoTranslator.java
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * Protobuf message translator for GetPluginInfoResponse and
+- * Csi.GetPluginInfoResponse.
+- */
+-public class GetPluginInfoResponseProtoTranslator<A, B> implements
+-    ProtoTranslator<GetPluginInfoResponse, Csi.GetPluginInfoResponse> {
+-
+-  @Override public Csi.GetPluginInfoResponse convertTo(
+-      GetPluginInfoResponse messageA) throws YarnException {
+-    return Csi.GetPluginInfoResponse.newBuilder()
+-        .setName(messageA.getDriverName())
+-        .setVendorVersion(messageA.getVersion())
+-        .build();
+-  }
+-
+-  @Override public GetPluginInfoResponse convertFrom(
+-      Csi.GetPluginInfoResponse messageB) throws YarnException {
+-    return GetPluginInfoResponse.newInstance(messageB.getName(),
+-        messageB.getVendorVersion());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodePublishVolumeRequestProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodePublishVolumeRequestProtoTranslator.java
+deleted file mode 100644
+index e86dd3fcc9f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodePublishVolumeRequestProtoTranslator.java
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * This class helps to transform a YARN side NodePublishVolumeRequest
+- * to corresponding CSI protocol message.
+- * @param <A> YARN NodePublishVolumeRequest
+- * @param <B> CSI NodePublishVolumeRequest
+- */
+-public class NodePublishVolumeRequestProtoTranslator<A, B> implements
+-    ProtoTranslator<NodePublishVolumeRequest,
+-        Csi.NodePublishVolumeRequest> {
+-
+-  @Override
+-  public Csi.NodePublishVolumeRequest convertTo(
+-      NodePublishVolumeRequest messageA) throws YarnException {
+-    Csi.NodePublishVolumeRequest.Builder builder =
+-        Csi.NodePublishVolumeRequest.newBuilder();
+-    ValidateVolumeCapabilitiesRequest.VolumeCapability cap =
+-        messageA.getVolumeCapability();
+-    Csi.VolumeCapability csiVolumeCap = Csi.VolumeCapability.newBuilder()
+-        .setAccessMode(Csi.VolumeCapability.AccessMode.newBuilder()
+-            .setModeValue(cap.getAccessMode().ordinal())) // access mode
+-        // TODO support block
+-        .setMount(Csi.VolumeCapability.MountVolume.newBuilder()
+-            // TODO support fsType
+-            .setFsType("xfs") // fs type
+-            .addAllMountFlags(cap.getMountFlags())) // mount flags
+-        .build();
+-    builder.setVolumeCapability(csiVolumeCap);
+-    builder.setVolumeId(messageA.getVolumeId());
+-    builder.setTargetPath(messageA.getTargetPath());
+-    builder.setReadonly(messageA.getReadOnly());
+-    builder.putAllNodePublishSecrets(messageA.getSecrets());
+-    builder.putAllPublishInfo(messageA.getPublishContext());
+-    builder.setStagingTargetPath(messageA.getStagingPath());
+-    return builder.build();
+-  }
+-
+-  @Override
+-  public NodePublishVolumeRequest convertFrom(
+-      Csi.NodePublishVolumeRequest messageB) throws YarnException {
+-    Csi.VolumeCapability cap0 = messageB.getVolumeCapability();
+-    ValidateVolumeCapabilitiesRequest.VolumeCapability cap =
+-        new ValidateVolumeCapabilitiesRequest.VolumeCapability(
+-            ValidateVolumeCapabilitiesRequest.AccessMode
+-                .valueOf(cap0.getAccessMode().getMode().name()),
+-            ValidateVolumeCapabilitiesRequest.VolumeType.FILE_SYSTEM,
+-            cap0.getMount().getMountFlagsList());
+-    return NodePublishVolumeRequest.newInstance(
+-        messageB.getVolumeId(), messageB.getReadonly(),
+-        messageB.getTargetPath(), messageB.getStagingTargetPath(),
+-        cap, messageB.getPublishInfoMap(),
+-        messageB.getNodePublishSecretsMap());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodeUnpublishVolumeRequestProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodeUnpublishVolumeRequestProtoTranslator.java
+deleted file mode 100644
+index 485237e3697..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/NodeUnpublishVolumeRequestProtoTranslator.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * This class helps to transform a YARN side NodeUnpublishVolumeRequest
+- * to corresponding CSI protocol message.
+- * @param <A> YARN NodeUnpublishVolumeRequest
+- * @param <B> CSI NodeUnpublishVolumeRequest
+- */
+-public class NodeUnpublishVolumeRequestProtoTranslator<A, B> implements
+-    ProtoTranslator<NodeUnpublishVolumeRequest,
+-        Csi.NodeUnpublishVolumeRequest> {
+-
+-  @Override
+-  public Csi.NodeUnpublishVolumeRequest convertTo(
+-      NodeUnpublishVolumeRequest messageA) throws YarnException {
+-    return Csi.NodeUnpublishVolumeRequest.newBuilder()
+-        .setVolumeId(messageA.getVolumeId())
+-        .setTargetPath(messageA.getTargetPath())
+-        .build();
+-  }
+-
+-  @Override
+-  public NodeUnpublishVolumeRequest convertFrom(
+-      Csi.NodeUnpublishVolumeRequest messageB) throws YarnException {
+-    return NodeUnpublishVolumeRequest
+-        .newInstance(messageB.getVolumeId(), messageB.getTargetPath());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslator.java
+deleted file mode 100644
+index 93cb44128d8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslator.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * ProtoTranslator converts a YARN side message to CSI proto message
+- * and vice versa. Each CSI proto message should have a corresponding
+- * YARN side message implementation, and a transformer to convert them
+- * one to the other. This layer helps we to hide CSI spec messages
+- * from YARN components.
+- *
+- * @param <A> YARN side internal messages
+- * @param <B> CSI proto messages
+- */
+-public interface ProtoTranslator<A, B> {
+-
+-  /**
+-   * Convert message from type A to type B.
+-   * @param messageA
+-   * @return messageB
+-   * @throws YarnException
+-   */
+-  B convertTo(A messageA) throws YarnException;
+-
+-  /**
+-   * Convert message from type B to type A.
+-   * @param messageB
+-   * @return messageA
+-   * @throws YarnException
+-   */
+-  A convertFrom(B messageB) throws YarnException;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslatorFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslatorFactory.java
+deleted file mode 100644
+index 1a7306f0bf2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ProtoTranslatorFactory.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-
+-/**
+- * Factory class to get desired proto transformer instance.
+- */
+-public final class ProtoTranslatorFactory {
+-
+-  private ProtoTranslatorFactory() {
+-    // hide constructor for the factory class
+-  }
+-
+-  /**
+-   * Get a {@link ProtoTranslator} based on the given input message
+-   * types. If the type is not supported, a IllegalArgumentException
+-   * will be thrown. When adding more transformers to this factory class,
+-   * note each transformer works exactly for one message to another
+-   * (and vice versa). For each type of the message, make sure there is
+-   * a corresponding unit test added, such as
+-   * TestValidateVolumeCapabilitiesRequest.
+-   *
+-   * @param yarnProto yarn proto message
+-   * @param csiProto CSI proto message
+-   * @param <A> yarn proto message
+-   * @param <B> CSI proto message
+-   * @throws IllegalArgumentException
+-   *   when given types are not supported
+-   * @return
+-   *   a proto message transformer that transforms
+-   *   YARN internal proto message to CSI
+-   */
+-  public static <A, B> ProtoTranslator<A, B> getTranslator(
+-      Class<A> yarnProto, Class<B> csiProto) {
+-    if (yarnProto == ValidateVolumeCapabilitiesRequest.class
+-        && csiProto == Csi.ValidateVolumeCapabilitiesRequest.class) {
+-      return new ValidateVolumeCapabilitiesRequestProtoTranslator();
+-    } else if (yarnProto == ValidateVolumeCapabilitiesResponse.class
+-        && csiProto == Csi.ValidateVolumeCapabilitiesResponse.class) {
+-      return new ValidationVolumeCapabilitiesResponseProtoTranslator();
+-    } else if (yarnProto == NodePublishVolumeRequest.class
+-        && csiProto == Csi.NodePublishVolumeRequest.class) {
+-      return new NodePublishVolumeRequestProtoTranslator();
+-    } else if (yarnProto == GetPluginInfoResponse.class
+-        && csiProto == Csi.GetPluginInfoResponse.class) {
+-      return new GetPluginInfoResponseProtoTranslator();
+-    } else if (yarnProto == NodeUnpublishVolumeRequest.class
+-        && csiProto == Csi.NodeUnpublishVolumeRequest.class) {
+-      return new NodeUnpublishVolumeRequestProtoTranslator();
+-    }
+-    throw new IllegalArgumentException("A problem is found while processing"
+-        + " proto message translating. Unexpected message types,"
+-        + " no transformer is found can handle the transformation from type "
+-        + yarnProto.getName() + " <-> " + csiProto.getName());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidateVolumeCapabilitiesRequestProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidateVolumeCapabilitiesRequestProtoTranslator.java
+deleted file mode 100644
+index a74c47a9f6e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidateVolumeCapabilitiesRequestProtoTranslator.java
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeCapability;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeType;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Proto message translator for ValidateVolumeCapabilitiesRequest.
+- * @param <A> ValidateVolumeCapabilitiesRequest
+- * @param <B> Csi.ValidateVolumeCapabilitiesRequest
+- */
+-public class ValidateVolumeCapabilitiesRequestProtoTranslator<A, B>
+-    implements ProtoTranslator<ValidateVolumeCapabilitiesRequest,
+-            Csi.ValidateVolumeCapabilitiesRequest> {
+-
+-  @Override
+-  public Csi.ValidateVolumeCapabilitiesRequest convertTo(
+-      ValidateVolumeCapabilitiesRequest request) throws YarnException {
+-    Csi.ValidateVolumeCapabilitiesRequest.Builder buidler =
+-        Csi.ValidateVolumeCapabilitiesRequest.newBuilder();
+-    buidler.setVolumeId(request.getVolumeId());
+-    if (request.getVolumeCapabilities() != null
+-        && request.getVolumeCapabilities().size() > 0) {
+-      buidler.putAllVolumeAttributes(request.getVolumeAttributes());
+-    }
+-    for (VolumeCapability cap :
+-        request.getVolumeCapabilities()) {
+-      Csi.VolumeCapability.AccessMode accessMode =
+-          Csi.VolumeCapability.AccessMode.newBuilder()
+-              .setModeValue(cap.getAccessMode().ordinal())
+-              .build();
+-      Csi.VolumeCapability.MountVolume mountVolume =
+-          Csi.VolumeCapability.MountVolume.newBuilder()
+-              .addAllMountFlags(cap.getMountFlags())
+-              .build();
+-      Csi.VolumeCapability capability =
+-          Csi.VolumeCapability.newBuilder()
+-              .setAccessMode(accessMode)
+-              .setMount(mountVolume)
+-              .build();
+-      buidler.addVolumeCapabilities(capability);
+-    }
+-    return buidler.build();
+-  }
+-
+-  @Override
+-  public ValidateVolumeCapabilitiesRequest convertFrom(
+-      Csi.ValidateVolumeCapabilitiesRequest request) throws YarnException {
+-    ValidateVolumeCapabilitiesRequest result = ValidateVolumeCapabilitiesRequest
+-        .newInstance(request.getVolumeId(), request.getVolumeAttributesMap());
+-    for (Csi.VolumeCapability csiCap :
+-        request.getVolumeCapabilitiesList()) {
+-      ValidateVolumeCapabilitiesRequest.AccessMode mode =
+-          ValidateVolumeCapabilitiesRequest.AccessMode
+-              .valueOf(csiCap.getAccessMode().getMode().name());
+-      if (!csiCap.hasMount()) {
+-        throw new YarnException("Invalid request,"
+-            + " mount is not found in the request.");
+-      }
+-      List<String> mountFlags = new ArrayList<>();
+-      for (int i=0; i<csiCap.getMount().getMountFlagsCount(); i++) {
+-        mountFlags.add(csiCap.getMount().getMountFlags(i));
+-      }
+-      VolumeCapability capability = new VolumeCapability(mode,
+-          VolumeType.FILE_SYSTEM, mountFlags);
+-      result.addVolumeCapability(capability);
+-    }
+-    return result;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidationVolumeCapabilitiesResponseProtoTranslator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidationVolumeCapabilitiesResponseProtoTranslator.java
+deleted file mode 100644
+index fd42712625e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/ValidationVolumeCapabilitiesResponseProtoTranslator.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+-
+-import csi.v0.Csi;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * Proto message translator for ValidateVolumeCapabilitiesResponse.
+- * @param <A> ValidateVolumeCapabilitiesResponse
+- * @param <B> Csi.ValidateVolumeCapabilitiesResponse
+- */
+-public class ValidationVolumeCapabilitiesResponseProtoTranslator<A, B>
+-    implements ProtoTranslator<ValidateVolumeCapabilitiesResponse,
+-            Csi.ValidateVolumeCapabilitiesResponse> {
+-
+-  @Override
+-  public Csi.ValidateVolumeCapabilitiesResponse convertTo(
+-      ValidateVolumeCapabilitiesResponse response) throws YarnException {
+-    return Csi.ValidateVolumeCapabilitiesResponse.newBuilder()
+-        .setSupported(response.isSupported())
+-        .setMessage(response.getResponseMessage())
+-        .build();
+-  }
+-
+-  @Override
+-  public ValidateVolumeCapabilitiesResponse convertFrom(
+-      Csi.ValidateVolumeCapabilitiesResponse response) throws YarnException {
+-    return ValidateVolumeCapabilitiesResponse.newInstance(
+-        response.getSupported(), response.getMessage());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/package-info.java
+deleted file mode 100644
+index c0964cdf089..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/translator/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains classes for protocol translation between YARN and CSI.
+- */
+-package org.apache.hadoop.yarn.csi.translator;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/GrpcHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/GrpcHelper.java
+deleted file mode 100644
+index a00f78a2ab7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/GrpcHelper.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.utils;
+-
+-import io.netty.channel.unix.DomainSocketAddress;
+-
+-import java.io.File;
+-import java.net.SocketAddress;
+-
+-/**
+- * Helper classes for gRPC utility functions.
+- */
+-public final class GrpcHelper {
+-
+-  protected static final String UNIX_DOMAIN_SOCKET_PREFIX = "unix://";
+-
+-  private GrpcHelper() {
+-    // hide constructor for utility class
+-  }
+-
+-  public static SocketAddress getSocketAddress(String value) {
+-    if (value.startsWith(UNIX_DOMAIN_SOCKET_PREFIX)) {
+-      String filePath = value.substring(UNIX_DOMAIN_SOCKET_PREFIX.length());
+-      File file = new File(filePath);
+-      if (!file.isAbsolute()) {
+-        throw new IllegalArgumentException(
+-            "Unix domain socket file path must be absolute, file: " + value);
+-      }
+-      // Create the SocketAddress referencing the file.
+-      return new DomainSocketAddress(file);
+-    } else {
+-      throw new IllegalArgumentException("Given address " + value
+-          + " is not a valid unix domain socket path");
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/package-info.java
+deleted file mode 100644
+index 9ead276a625..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/java/org/apache/hadoop/yarn/csi/utils/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains utility classes for CSI.
+- */
+-package org.apache.hadoop.yarn.csi.utils;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/proto/csi.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/proto/csi.proto
+deleted file mode 100644
+index e9301bc6bc9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/main/proto/csi.proto
++++ /dev/null
+@@ -1,1114 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-// https://github.com/container-storage-interface/spec/blob/v0.3.0/csi.proto
+-// ** v0.3 **
+-
+-// Code generated by make; DO NOT EDIT.
+-syntax = "proto3";
+-package csi.v0;
+-
+-import "google/protobuf/wrappers.proto";
+-
+-option go_package = "csi";
+-service Identity {
+-    rpc GetPluginInfo(GetPluginInfoRequest)
+-    returns (GetPluginInfoResponse) {}
+-
+-    rpc GetPluginCapabilities(GetPluginCapabilitiesRequest)
+-    returns (GetPluginCapabilitiesResponse) {}
+-
+-    rpc Probe (ProbeRequest)
+-    returns (ProbeResponse) {}
+-}
+-
+-service Controller {
+-    rpc CreateVolume (CreateVolumeRequest)
+-    returns (CreateVolumeResponse) {}
+-
+-    rpc DeleteVolume (DeleteVolumeRequest)
+-    returns (DeleteVolumeResponse) {}
+-
+-    rpc ControllerPublishVolume (ControllerPublishVolumeRequest)
+-    returns (ControllerPublishVolumeResponse) {}
+-
+-    rpc ControllerUnpublishVolume (ControllerUnpublishVolumeRequest)
+-    returns (ControllerUnpublishVolumeResponse) {}
+-
+-    rpc ValidateVolumeCapabilities (ValidateVolumeCapabilitiesRequest)
+-    returns (ValidateVolumeCapabilitiesResponse) {}
+-
+-    rpc ListVolumes (ListVolumesRequest)
+-    returns (ListVolumesResponse) {}
+-
+-    rpc GetCapacity (GetCapacityRequest)
+-    returns (GetCapacityResponse) {}
+-
+-    rpc ControllerGetCapabilities (ControllerGetCapabilitiesRequest)
+-    returns (ControllerGetCapabilitiesResponse) {}
+-
+-    rpc CreateSnapshot (CreateSnapshotRequest)
+-    returns (CreateSnapshotResponse) {}
+-
+-    rpc DeleteSnapshot (DeleteSnapshotRequest)
+-    returns (DeleteSnapshotResponse) {}
+-
+-    rpc ListSnapshots (ListSnapshotsRequest)
+-    returns (ListSnapshotsResponse) {}
+-}
+-
+-service Node {
+-    rpc NodeStageVolume (NodeStageVolumeRequest)
+-    returns (NodeStageVolumeResponse) {}
+-
+-    rpc NodeUnstageVolume (NodeUnstageVolumeRequest)
+-    returns (NodeUnstageVolumeResponse) {}
+-
+-    rpc NodePublishVolume (NodePublishVolumeRequest)
+-    returns (NodePublishVolumeResponse) {}
+-
+-    rpc NodeUnpublishVolume (NodeUnpublishVolumeRequest)
+-    returns (NodeUnpublishVolumeResponse) {}
+-
+-    // NodeGetId is being deprecated in favor of NodeGetInfo and will be
+-    // removed in CSI 1.0. Existing drivers, however, may depend on this
+-    // RPC call and hence this RPC call MUST be implemented by the CSI
+-    // plugin prior to v1.0.
+-    rpc NodeGetId (NodeGetIdRequest)
+-    returns (NodeGetIdResponse) {
+-        option deprecated = true;
+-    }
+-
+-    rpc NodeGetCapabilities (NodeGetCapabilitiesRequest)
+-    returns (NodeGetCapabilitiesResponse) {}
+-
+-    // Prior to CSI 1.0 - CSI plugins MUST implement both NodeGetId and
+-    // NodeGetInfo RPC calls.
+-    rpc NodeGetInfo (NodeGetInfoRequest)
+-    returns (NodeGetInfoResponse) {}
+-}
+-message GetPluginInfoRequest {
+-    // Intentionally empty.
+-}
+-
+-message GetPluginInfoResponse {
+-    // The name MUST follow reverse domain name notation format
+-    // (https://en.wikipedia.org/wiki/Reverse_domain_name_notation).
+-    // It SHOULD include the plugin's host company name and the plugin
+-    // name, to minimize the possibility of collisions. It MUST be 63
+-    // characters or less, beginning and ending with an alphanumeric
+-    // character ([a-z0-9A-Z]) with dashes (-), underscores (_),
+-    // dots (.), and alphanumerics between. This field is REQUIRED.
+-    string name = 1;
+-
+-    // This field is REQUIRED. Value of this field is opaque to the CO.
+-    string vendor_version = 2;
+-
+-    // This field is OPTIONAL. Values are opaque to the CO.
+-    map<string, string> manifest = 3;
+-}
+-message GetPluginCapabilitiesRequest {
+-    // Intentionally empty.
+-}
+-
+-message GetPluginCapabilitiesResponse {
+-    // All the capabilities that the controller service supports. This
+-    // field is OPTIONAL.
+-    repeated PluginCapability capabilities = 2;
+-}
+-
+-// Specifies a capability of the plugin.
+-message PluginCapability {
+-    message Service {
+-        enum Type {
+-            UNKNOWN = 0;
+-
+-            // CONTROLLER_SERVICE indicates that the Plugin provides RPCs for
+-            // the ControllerService. Plugins SHOULD provide this capability.
+-            // In rare cases certain plugins may wish to omit the
+-            // ControllerService entirely from their implementation, but such
+-            // SHOULD NOT be the common case.
+-            // The presence of this capability determines whether the CO will
+-            // attempt to invoke the REQUIRED ControllerService RPCs, as well
+-            // as specific RPCs as indicated by ControllerGetCapabilities.
+-            CONTROLLER_SERVICE = 1;
+-
+-            // ACCESSIBILITY_CONSTRAINTS indicates that the volumes for this
+-            // plugin may not be equally accessible by all nodes in the
+-            // cluster. The CO MUST use the topology information returned by
+-            // CreateVolumeRequest along with the topology information
+-            // returned by NodeGetInfo to ensure that a given volume is
+-            // accessible from a given node when scheduling workloads.
+-            ACCESSIBILITY_CONSTRAINTS = 2;
+-        }
+-        Type type = 1;
+-    }
+-
+-    oneof type {
+-        // Service that the plugin supports.
+-        Service service = 1;
+-    }
+-}
+-message ProbeRequest {
+-    // Intentionally empty.
+-}
+-
+-message ProbeResponse {
+-    // Readiness allows a plugin to report its initialization status back
+-    // to the CO. Initialization for some plugins MAY be time consuming
+-    // and it is important for a CO to distinguish between the following
+-    // cases:
+-    //
+-    // 1) The plugin is in an unhealthy state and MAY need restarting. In
+-    //    this case a gRPC error code SHALL be returned.
+-    // 2) The plugin is still initializing, but is otherwise perfectly
+-    //    healthy. In this case a successful response SHALL be returned
+-    //    with a readiness value of `false`. Calls to the plugin's
+-    //    Controller and/or Node services MAY fail due to an incomplete
+-    //    initialization state.
+-    // 3) The plugin has finished initializing and is ready to service
+-    //    calls to its Controller and/or Node services. A successful
+-    //    response is returned with a readiness value of `true`.
+-    //
+-    // This field is OPTIONAL. If not present, the caller SHALL assume
+-    // that the plugin is in a ready state and is accepting calls to its
+-    // Controller and/or Node services (according to the plugin's reported
+-    // capabilities).
+-    .google.protobuf.BoolValue ready = 1;
+-}
+-message CreateVolumeRequest {
+-    // The suggested name for the storage space. This field is REQUIRED.
+-    // It serves two purposes:
+-    // 1) Idempotency - This name is generated by the CO to achieve
+-    //    idempotency. If `CreateVolume` fails, the volume may or may not
+-    //    be provisioned. In this case, the CO may call `CreateVolume`
+-    //    again, with the same name, to ensure the volume exists. The
+-    //    Plugin should ensure that multiple `CreateVolume` calls for the
+-    //    same name do not result in more than one piece of storage
+-    //    provisioned corresponding to that name. If a Plugin is unable to
+-    //    enforce idempotency, the CO's error recovery logic could result
+-    //    in multiple (unused) volumes being provisioned.
+-    // 2) Suggested name - Some storage systems allow callers to specify
+-    //    an identifier by which to refer to the newly provisioned
+-    //    storage. If a storage system supports this, it can optionally
+-    //    use this name as the identifier for the new volume.
+-    string name = 1;
+-
+-    // This field is OPTIONAL. This allows the CO to specify the capacity
+-    // requirement of the volume to be provisioned. If not specified, the
+-    // Plugin MAY choose an implementation-defined capacity range. If
+-    // specified it MUST always be honored, even when creating volumes
+-    // from a source; which may force some backends to internally extend
+-    // the volume after creating it.
+-
+-    CapacityRange capacity_range = 2;
+-
+-    // The capabilities that the provisioned volume MUST have: the Plugin
+-    // MUST provision a volume that could satisfy ALL of the
+-    // capabilities specified in this list. The Plugin MUST assume that
+-    // the CO MAY use the  provisioned volume later with ANY of the
+-    // capabilities specified in this list. This also enables the CO to do
+-    // early validation: if ANY of the specified volume capabilities are
+-    // not supported by the Plugin, the call SHALL fail. This field is
+-    // REQUIRED.
+-    repeated VolumeCapability volume_capabilities = 3;
+-
+-    // Plugin specific parameters passed in as opaque key-value pairs.
+-    // This field is OPTIONAL. The Plugin is responsible for parsing and
+-    // validating these parameters. COs will treat these as opaque.
+-    map<string, string> parameters = 4;
+-
+-    // Secrets required by plugin to complete volume creation request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> controller_create_secrets = 5;
+-
+-    // If specified, the new volume will be pre-populated with data from
+-    // this source. This field is OPTIONAL.
+-    VolumeContentSource volume_content_source = 6;
+-
+-    // Specifies where (regions, zones, racks, etc.) the provisioned
+-    // volume MUST be accessible from.
+-    // An SP SHALL advertise the requirements for topological
+-    // accessibility information in documentation. COs SHALL only specify
+-    // topological accessibility information supported by the SP.
+-    // This field is OPTIONAL.
+-    // This field SHALL NOT be specified unless the SP has the
+-    // ACCESSIBILITY_CONSTRAINTS plugin capability.
+-    // If this field is not specified and the SP has the
+-    // ACCESSIBILITY_CONSTRAINTS plugin capability, the SP MAY choose
+-    // where the provisioned volume is accessible from.
+-    TopologyRequirement accessibility_requirements = 7;
+-}
+-
+-// Specifies what source the volume will be created from. One of the
+-// type fields MUST be specified.
+-message VolumeContentSource {
+-    message SnapshotSource {
+-        // Contains identity information for the existing source snapshot.
+-        // This field is REQUIRED. Plugin is REQUIRED to support creating
+-        // volume from snapshot if it supports the capability
+-        // CREATE_DELETE_SNAPSHOT.
+-        string id = 1;
+-    }
+-
+-    oneof type {
+-        SnapshotSource snapshot = 1;
+-    }
+-}
+-
+-message CreateVolumeResponse {
+-    // Contains all attributes of the newly created volume that are
+-    // relevant to the CO along with information required by the Plugin
+-    // to uniquely identify the volume. This field is REQUIRED.
+-    Volume volume = 1;
+-}
+-
+-// Specify a capability of a volume.
+-message VolumeCapability {
+-    // Indicate that the volume will be accessed via the block device API.
+-    message BlockVolume {
+-        // Intentionally empty, for now.
+-    }
+-
+-    // Indicate that the volume will be accessed via the filesystem API.
+-    message MountVolume {
+-        // The filesystem type. This field is OPTIONAL.
+-        // An empty string is equal to an unspecified field value.
+-        string fs_type = 1;
+-
+-        // The mount options that can be used for the volume. This field is
+-        // OPTIONAL. `mount_flags` MAY contain sensitive information.
+-        // Therefore, the CO and the Plugin MUST NOT leak this information
+-        // to untrusted entities. The total size of this repeated field
+-        // SHALL NOT exceed 4 KiB.
+-        repeated string mount_flags = 2;
+-    }
+-
+-    // Specify how a volume can be accessed.
+-    message AccessMode {
+-        enum Mode {
+-            UNKNOWN = 0;
+-
+-            // Can only be published once as read/write on a single node, at
+-            // any given time.
+-            SINGLE_NODE_WRITER = 1;
+-
+-            // Can only be published once as readonly on a single node, at
+-            // any given time.
+-            SINGLE_NODE_READER_ONLY = 2;
+-
+-            // Can be published as readonly at multiple nodes simultaneously.
+-            MULTI_NODE_READER_ONLY = 3;
+-
+-            // Can be published at multiple nodes simultaneously. Only one of
+-            // the node can be used as read/write. The rest will be readonly.
+-            MULTI_NODE_SINGLE_WRITER = 4;
+-
+-            // Can be published as read/write at multiple nodes
+-            // simultaneously.
+-            MULTI_NODE_MULTI_WRITER = 5;
+-        }
+-
+-        // This field is REQUIRED.
+-        Mode mode = 1;
+-    }
+-
+-    // Specifies what API the volume will be accessed using. One of the
+-    // following fields MUST be specified.
+-    oneof access_type {
+-        BlockVolume block = 1;
+-        MountVolume mount = 2;
+-    }
+-
+-    // This is a REQUIRED field.
+-    AccessMode access_mode = 3;
+-}
+-
+-// The capacity of the storage space in bytes. To specify an exact size,
+-// `required_bytes` and `limit_bytes` SHALL be set to the same value. At
+-// least one of the these fields MUST be specified.
+-message CapacityRange {
+-    // Volume MUST be at least this big. This field is OPTIONAL.
+-    // A value of 0 is equal to an unspecified field value.
+-    // The value of this field MUST NOT be negative.
+-    int64 required_bytes = 1;
+-
+-    // Volume MUST not be bigger than this. This field is OPTIONAL.
+-    // A value of 0 is equal to an unspecified field value.
+-    // The value of this field MUST NOT be negative.
+-    int64 limit_bytes = 2;
+-}
+-
+-// The information about a provisioned volume.
+-message Volume {
+-    // The capacity of the volume in bytes. This field is OPTIONAL. If not
+-    // set (value of 0), it indicates that the capacity of the volume is
+-    // unknown (e.g., NFS share).
+-    // The value of this field MUST NOT be negative.
+-    int64 capacity_bytes = 1;
+-
+-    // Contains identity information for the created volume. This field is
+-    // REQUIRED. The identity information will be used by the CO in
+-    // subsequent calls to refer to the provisioned volume.
+-    string id = 2;
+-
+-    // Attributes reflect static properties of a volume and MUST be passed
+-    // to volume validation and publishing calls.
+-    // Attributes SHALL be opaque to a CO. Attributes SHALL NOT be mutable
+-    // and SHALL be safe for the CO to cache. Attributes SHOULD NOT
+-    // contain sensitive information. Attributes MAY NOT uniquely identify
+-    // a volume. A volume uniquely identified by `id` SHALL always report
+-    // the same attributes. This field is OPTIONAL and when present MUST
+-    // be passed to volume validation and publishing calls.
+-    map<string, string> attributes = 3;
+-
+-    // If specified, indicates that the volume is not empty and is
+-    // pre-populated with data from the specified source.
+-    // This field is OPTIONAL.
+-    VolumeContentSource content_source = 4;
+-
+-    // Specifies where (regions, zones, racks, etc.) the provisioned
+-    // volume is accessible from.
+-    // A plugin that returns this field MUST also set the
+-    // ACCESSIBILITY_CONSTRAINTS plugin capability.
+-    // An SP MAY specify multiple topologies to indicate the volume is
+-    // accessible from multiple locations.
+-    // COs MAY use this information along with the topology information
+-    // returned by NodeGetInfo to ensure that a given volume is accessible
+-    // from a given node when scheduling workloads.
+-    // This field is OPTIONAL. If it is not specified, the CO MAY assume
+-    // the volume is equally accessible from all nodes in the cluster and
+-    // may schedule workloads referencing the volume on any available
+-    // node.
+-    //
+-    // Example 1:
+-    //   accessible_topology = {"region": "R1", "zone": "Z2"}
+-    // Indicates a volume accessible only from the "region" "R1" and the
+-    // "zone" "Z2".
+-    //
+-    // Example 2:
+-    //   accessible_topology =
+-    //     {"region": "R1", "zone": "Z2"},
+-    //     {"region": "R1", "zone": "Z3"}
+-    // Indicates a volume accessible from both "zone" "Z2" and "zone" "Z3"
+-    // in the "region" "R1".
+-    repeated Topology accessible_topology = 5;
+-}
+-
+-message TopologyRequirement {
+-    // Specifies the list of topologies the provisioned volume MUST be
+-    // accessible from.
+-    // This field is OPTIONAL. If TopologyRequirement is specified either
+-    // requisite or preferred or both MUST be specified.
+-    //
+-    // If requisite is specified, the provisioned volume MUST be
+-    // accessible from at least one of the requisite topologies.
+-    //
+-    // Given
+-    //   x = number of topologies provisioned volume is accessible from
+-    //   n = number of requisite topologies
+-    // The CO MUST ensure n >= 1. The SP MUST ensure x >= 1
+-    // If x==n, than the SP MUST make the provisioned volume available to
+-    // all topologies from the list of requisite topologies. If it is
+-    // unable to do so, the SP MUST fail the CreateVolume call.
+-    // For example, if a volume should be accessible from a single zone,
+-    // and requisite =
+-    //   {"region": "R1", "zone": "Z2"}
+-    // then the provisioned volume MUST be accessible from the "region"
+-    // "R1" and the "zone" "Z2".
+-    // Similarly, if a volume should be accessible from two zones, and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"}
+-    // then the provisioned volume MUST be accessible from the "region"
+-    // "R1" and both "zone" "Z2" and "zone" "Z3".
+-    //
+-    // If x<n, than the SP SHALL choose x unique topologies from the list
+-    // of requisite topologies. If it is unable to do so, the SP MUST fail
+-    // the CreateVolume call.
+-    // For example, if a volume should be accessible from a single zone,
+-    // and requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"}
+-    // then the SP may choose to make the provisioned volume available in
+-    // either the "zone" "Z2" or the "zone" "Z3" in the "region" "R1".
+-    // Similarly, if a volume should be accessible from two zones, and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"},
+-    //   {"region": "R1", "zone": "Z4"}
+-    // then the provisioned volume MUST be accessible from any combination
+-    // of two unique topologies: e.g. "R1/Z2" and "R1/Z3", or "R1/Z2" and
+-    //  "R1/Z4", or "R1/Z3" and "R1/Z4".
+-    //
+-    // If x>n, than the SP MUST make the provisioned volume available from
+-    // all topologies from the list of requisite topologies and MAY choose
+-    // the remaining x-n unique topologies from the list of all possible
+-    // topologies. If it is unable to do so, the SP MUST fail the
+-    // CreateVolume call.
+-    // For example, if a volume should be accessible from two zones, and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"}
+-    // then the provisioned volume MUST be accessible from the "region"
+-    // "R1" and the "zone" "Z2" and the SP may select the second zone
+-    // independently, e.g. "R1/Z4".
+-    repeated Topology requisite = 1;
+-
+-    // Specifies the list of topologies the CO would prefer the volume to
+-    // be provisioned in.
+-    //
+-    // This field is OPTIONAL. If TopologyRequirement is specified either
+-    // requisite or preferred or both MUST be specified.
+-    //
+-    // An SP MUST attempt to make the provisioned volume available using
+-    // the preferred topologies in order from first to last.
+-    //
+-    // If requisite is specified, all topologies in preferred list MUST
+-    // also be present in the list of requisite topologies.
+-    //
+-    // If the SP is unable to to make the provisioned volume available
+-    // from any of the preferred topologies, the SP MAY choose a topology
+-    // from the list of requisite topologies.
+-    // If the list of requisite topologies is not specified, then the SP
+-    // MAY choose from the list of all possible topologies.
+-    // If the list of requisite topologies is specified and the SP is
+-    // unable to to make the provisioned volume available from any of the
+-    // requisite topologies it MUST fail the CreateVolume call.
+-    //
+-    // Example 1:
+-    // Given a volume should be accessible from a single zone, and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"}
+-    // preferred =
+-    //   {"region": "R1", "zone": "Z3"}
+-    // then the the SP SHOULD first attempt to make the provisioned volume
+-    // available from "zone" "Z3" in the "region" "R1" and fall back to
+-    // "zone" "Z2" in the "region" "R1" if that is not possible.
+-    //
+-    // Example 2:
+-    // Given a volume should be accessible from a single zone, and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"},
+-    //   {"region": "R1", "zone": "Z4"},
+-    //   {"region": "R1", "zone": "Z5"}
+-    // preferred =
+-    //   {"region": "R1", "zone": "Z4"},
+-    //   {"region": "R1", "zone": "Z2"}
+-    // then the the SP SHOULD first attempt to make the provisioned volume
+-    // accessible from "zone" "Z4" in the "region" "R1" and fall back to
+-    // "zone" "Z2" in the "region" "R1" if that is not possible. If that
+-    // is not possible, the SP may choose between either the "zone"
+-    // "Z3" or "Z5" in the "region" "R1".
+-    //
+-    // Example 3:
+-    // Given a volume should be accessible from TWO zones (because an
+-    // opaque parameter in CreateVolumeRequest, for example, specifies
+-    // the volume is accessible from two zones, aka synchronously
+-    // replicated), and
+-    // requisite =
+-    //   {"region": "R1", "zone": "Z2"},
+-    //   {"region": "R1", "zone": "Z3"},
+-    //   {"region": "R1", "zone": "Z4"},
+-    //   {"region": "R1", "zone": "Z5"}
+-    // preferred =
+-    //   {"region": "R1", "zone": "Z5"},
+-    //   {"region": "R1", "zone": "Z3"}
+-    // then the the SP SHOULD first attempt to make the provisioned volume
+-    // accessible from the combination of the two "zones" "Z5" and "Z3" in
+-    // the "region" "R1". If that's not possible, it should fall back to
+-    // a combination of "Z5" and other possibilities from the list of
+-    // requisite. If that's not possible, it should fall back  to a
+-    // combination of "Z3" and other possibilities from the list of
+-    // requisite. If that's not possible, it should fall back  to a
+-    // combination of other possibilities from the list of requisite.
+-    repeated Topology preferred = 2;
+-}
+-
+-// Topology is a map of topological domains to topological segments.
+-// A topological domain is a sub-division of a cluster, like "region",
+-// "zone", "rack", etc.
+-// A topological segment is a specific instance of a topological domain,
+-// like "zone3", "rack3", etc.
+-// For example {"com.company/zone": "Z1", "com.company/rack": "R3"}
+-// Valid keys have two segments: an optional prefix and name, separated
+-// by a slash (/), for example: "com.company.example/zone".
+-// The key name segment is required. The prefix is optional.
+-// Both the key name and the prefix MUST each be 63 characters or less,
+-// begin and end with an alphanumeric character ([a-z0-9A-Z]) and
+-// contain only dashes (-), underscores (_), dots (.), or alphanumerics
+-// in between, for example "zone".
+-// The key prefix MUST follow reverse domain name notation format
+-// (https://en.wikipedia.org/wiki/Reverse_domain_name_notation).
+-// The key prefix SHOULD include the plugin's host company name and/or
+-// the plugin name, to minimize the possibility of collisions with keys
+-// from other plugins.
+-// If a key prefix is specified, it MUST be identical across all
+-// topology keys returned by the SP (across all RPCs).
+-// Keys MUST be case-insensitive. Meaning the keys "Zone" and "zone"
+-// MUST not both exist.
+-// Each value (topological segment) MUST contain 1 or more strings.
+-// Each string MUST be 63 characters or less and begin and end with an
+-// alphanumeric character with '-', '_', '.', or alphanumerics in
+-// between.
+-message Topology {
+-    map<string, string> segments = 1;
+-}
+-message DeleteVolumeRequest {
+-    // The ID of the volume to be deprovisioned.
+-    // This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // Secrets required by plugin to complete volume deletion request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> controller_delete_secrets = 2;
+-}
+-
+-message DeleteVolumeResponse {
+-    // Intentionally empty.
+-}
+-message ControllerPublishVolumeRequest {
+-    // The ID of the volume to be used on a node.
+-    // This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The ID of the node. This field is REQUIRED. The CO SHALL set this
+-    // field to match the node ID returned by `NodeGetInfo`.
+-    string node_id = 2;
+-
+-    // The capability of the volume the CO expects the volume to have.
+-    // This is a REQUIRED field.
+-    VolumeCapability volume_capability = 3;
+-
+-    // Whether to publish the volume in readonly mode. This field is
+-    // REQUIRED.
+-    bool readonly = 4;
+-
+-    // Secrets required by plugin to complete controller publish volume
+-    // request. This field is OPTIONAL. Refer to the
+-    // `Secrets Requirements` section on how to use this field.
+-    map<string, string> controller_publish_secrets = 5;
+-
+-    // Attributes of the volume to be used on a node. This field is
+-    // OPTIONAL and MUST match the attributes of the Volume identified
+-    // by `volume_id`.
+-    map<string, string> volume_attributes = 6;
+-}
+-
+-message ControllerPublishVolumeResponse {
+-    // The SP specific information that will be passed to the Plugin in
+-    // the subsequent `NodeStageVolume` or `NodePublishVolume` calls
+-    // for the given volume.
+-    // This information is opaque to the CO. This field is OPTIONAL.
+-    map<string, string> publish_info = 1;
+-}
+-message ControllerUnpublishVolumeRequest {
+-    // The ID of the volume. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The ID of the node. This field is OPTIONAL. The CO SHOULD set this
+-    // field to match the node ID returned by `NodeGetInfo` or leave it
+-    // unset. If the value is set, the SP MUST unpublish the volume from
+-    // the specified node. If the value is unset, the SP MUST unpublish
+-    // the volume from all nodes it is published to.
+-    string node_id = 2;
+-
+-    // Secrets required by plugin to complete controller unpublish volume
+-    // request. This SHOULD be the same secrets passed to the
+-    // ControllerPublishVolume call for the specified volume.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> controller_unpublish_secrets = 3;
+-}
+-
+-message ControllerUnpublishVolumeResponse {
+-    // Intentionally empty.
+-}
+-message ValidateVolumeCapabilitiesRequest {
+-    // The ID of the volume to check. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The capabilities that the CO wants to check for the volume. This
+-    // call SHALL return "supported" only if all the volume capabilities
+-    // specified below are supported. This field is REQUIRED.
+-    repeated VolumeCapability volume_capabilities = 2;
+-
+-    // Attributes of the volume to check. This field is OPTIONAL and MUST
+-    // match the attributes of the Volume identified by `volume_id`.
+-    map<string, string> volume_attributes = 3;
+-
+-    // Specifies where (regions, zones, racks, etc.) the caller believes
+-    // the volume is accessible from.
+-    // A caller MAY specify multiple topologies to indicate they believe
+-    // the volume to be accessible from multiple locations.
+-    // This field is OPTIONAL. This field SHALL NOT be set unless the
+-    // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+-    repeated Topology accessible_topology = 4;
+-}
+-
+-message ValidateVolumeCapabilitiesResponse {
+-    // True if the Plugin supports the specified capabilities for the
+-    // given volume. This field is REQUIRED.
+-    bool supported = 1;
+-
+-    // Message to the CO if `supported` above is false. This field is
+-    // OPTIONAL.
+-    // An empty string is equal to an unspecified field value.
+-    string message = 2;
+-}
+-message ListVolumesRequest {
+-    // If specified (non-zero value), the Plugin MUST NOT return more
+-    // entries than this number in the response. If the actual number of
+-    // entries is more than this number, the Plugin MUST set `next_token`
+-    // in the response which can be used to get the next page of entries
+-    // in the subsequent `ListVolumes` call. This field is OPTIONAL. If
+-    // not specified (zero value), it means there is no restriction on the
+-    // number of entries that can be returned.
+-    // The value of this field MUST NOT be negative.
+-    int32 max_entries = 1;
+-
+-    // A token to specify where to start paginating. Set this field to
+-    // `next_token` returned by a previous `ListVolumes` call to get the
+-    // next page of entries. This field is OPTIONAL.
+-    // An empty string is equal to an unspecified field value.
+-    string starting_token = 2;
+-}
+-
+-message ListVolumesResponse {
+-    message Entry {
+-        Volume volume = 1;
+-    }
+-
+-    repeated Entry entries = 1;
+-
+-    // This token allows you to get the next page of entries for
+-    // `ListVolumes` request. If the number of entries is larger than
+-    // `max_entries`, use the `next_token` as a value for the
+-    // `starting_token` field in the next `ListVolumes` request. This
+-    // field is OPTIONAL.
+-    // An empty string is equal to an unspecified field value.
+-    string next_token = 2;
+-}
+-message GetCapacityRequest {
+-    // If specified, the Plugin SHALL report the capacity of the storage
+-    // that can be used to provision volumes that satisfy ALL of the
+-    // specified `volume_capabilities`. These are the same
+-    // `volume_capabilities` the CO will use in `CreateVolumeRequest`.
+-    // This field is OPTIONAL.
+-    repeated VolumeCapability volume_capabilities = 1;
+-
+-    // If specified, the Plugin SHALL report the capacity of the storage
+-    // that can be used to provision volumes with the given Plugin
+-    // specific `parameters`. These are the same `parameters` the CO will
+-    // use in `CreateVolumeRequest`. This field is OPTIONAL.
+-    map<string, string> parameters = 2;
+-
+-    // If specified, the Plugin SHALL report the capacity of the storage
+-    // that can be used to provision volumes that in the specified
+-    // `accessible_topology`. This is the same as the
+-    // `accessible_topology` the CO returns in a `CreateVolumeResponse`.
+-    // This field is OPTIONAL. This field SHALL NOT be set unless the
+-    // plugin advertises the ACCESSIBILITY_CONSTRAINTS capability.
+-    Topology accessible_topology = 3;
+-}
+-
+-message GetCapacityResponse {
+-    // The available capacity, in bytes, of the storage that can be used
+-    // to provision volumes. If `volume_capabilities` or `parameters` is
+-    // specified in the request, the Plugin SHALL take those into
+-    // consideration when calculating the available capacity of the
+-    // storage. This field is REQUIRED.
+-    // The value of this field MUST NOT be negative.
+-    int64 available_capacity = 1;
+-}
+-message ControllerGetCapabilitiesRequest {
+-    // Intentionally empty.
+-}
+-
+-message ControllerGetCapabilitiesResponse {
+-    // All the capabilities that the controller service supports. This
+-    // field is OPTIONAL.
+-    repeated ControllerServiceCapability capabilities = 2;
+-}
+-
+-// Specifies a capability of the controller service.
+-message ControllerServiceCapability {
+-    message RPC {
+-        enum Type {
+-            UNKNOWN = 0;
+-            CREATE_DELETE_VOLUME = 1;
+-            PUBLISH_UNPUBLISH_VOLUME = 2;
+-            LIST_VOLUMES = 3;
+-            GET_CAPACITY = 4;
+-            // Currently the only way to consume a snapshot is to create
+-            // a volume from it. Therefore plugins supporting
+-            // CREATE_DELETE_SNAPSHOT MUST support creating volume from
+-            // snapshot.
+-            CREATE_DELETE_SNAPSHOT = 5;
+-            // LIST_SNAPSHOTS is NOT REQUIRED. For plugins that need to upload
+-            // a snapshot after it is being cut, LIST_SNAPSHOTS COULD be used
+-            // with the snapshot_id as the filter to query whether the
+-            // uploading process is complete or not.
+-            LIST_SNAPSHOTS = 6;
+-        }
+-
+-        Type type = 1;
+-    }
+-
+-    oneof type {
+-        // RPC that the controller supports.
+-        RPC rpc = 1;
+-    }
+-}
+-message CreateSnapshotRequest {
+-    // The ID of the source volume to be snapshotted.
+-    // This field is REQUIRED.
+-    string source_volume_id = 1;
+-
+-    // The suggested name for the snapshot. This field is REQUIRED for
+-    // idempotency.
+-    string name = 2;
+-
+-    // Secrets required by plugin to complete snapshot creation request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> create_snapshot_secrets = 3;
+-
+-    // Plugin specific parameters passed in as opaque key-value pairs.
+-    // This field is OPTIONAL. The Plugin is responsible for parsing and
+-    // validating these parameters. COs will treat these as opaque.
+-    // Use cases for opaque parameters:
+-    // - Specify a policy to automatically clean up the snapshot.
+-    // - Specify an expiration date for the snapshot.
+-    // - Specify whether the snapshot is readonly or read/write.
+-    // - Specify if the snapshot should be replicated to some place.
+-    // - Specify primary or secondary for replication systems that
+-    //   support snapshotting only on primary.
+-    map<string, string> parameters = 4;
+-}
+-
+-message CreateSnapshotResponse {
+-    // Contains all attributes of the newly created snapshot that are
+-    // relevant to the CO along with information required by the Plugin
+-    // to uniquely identify the snapshot. This field is REQUIRED.
+-    Snapshot snapshot = 1;
+-}
+-
+-// The information about a provisioned snapshot.
+-message Snapshot {
+-    // This is the complete size of the snapshot in bytes. The purpose of
+-    // this field is to give CO guidance on how much space is needed to
+-    // create a volume from this snapshot. The size of the volume MUST NOT
+-    // be less than the size of the source snapshot. This field is
+-    // OPTIONAL. If this field is not set, it indicates that this size is
+-    // unknown. The value of this field MUST NOT be negative and a size of
+-    // zero means it is unspecified.
+-    int64 size_bytes = 1;
+-
+-    // Uniquely identifies a snapshot and is generated by the plugin. It
+-    // will not change over time. This field is REQUIRED. The identity
+-    // information will be used by the CO in subsequent calls to refer to
+-    // the provisioned snapshot.
+-    string id = 2;
+-
+-    // Identity information for the source volume. Note that creating a
+-    // snapshot from a snapshot is not supported here so the source has to
+-    // be a volume. This field is REQUIRED.
+-    string source_volume_id = 3;
+-
+-    // Timestamp when the point-in-time snapshot is taken on the storage
+-    // system. The format of this field should be a Unix nanoseconds time
+-    // encoded as an int64. On Unix, the command `date +%s%N` returns the
+-    // current time in nanoseconds since 1970-01-01 00:00:00 UTC. This
+-    // field is REQUIRED.
+-    int64 created_at = 4;
+-
+-    // The status of a snapshot.
+-    SnapshotStatus status = 5;
+-}
+-
+-// The status of a snapshot.
+-message SnapshotStatus {
+-    enum Type {
+-        UNKNOWN = 0;
+-        // A snapshot is ready for use.
+-        READY = 1;
+-        // A snapshot is cut and is now being uploaded.
+-        // Some cloud providers and storage systems uploads the snapshot
+-        // to the cloud after the snapshot is cut. During this phase,
+-        // `thaw` can be done so the application can be running again if
+-        // `freeze` was done before taking the snapshot.
+-        UPLOADING = 2;
+-        // An error occurred during the snapshot uploading process.
+-        // This error status is specific for uploading because
+-        // `CreateSnaphot` is a blocking call before the snapshot is
+-        // cut and therefore it SHOULD NOT come back with an error
+-        // status when an error occurs. Instead a gRPC error code SHALL
+-        // be returned by `CreateSnapshot` when an error occurs before
+-        // a snapshot is cut.
+-        ERROR_UPLOADING = 3;
+-    }
+-    // This field is REQUIRED.
+-    Type type = 1;
+-
+-    // Additional information to describe why a snapshot ended up in the
+-    // `ERROR_UPLOADING` status. This field is OPTIONAL.
+-    string details = 2;
+-}
+-message DeleteSnapshotRequest {
+-    // The ID of the snapshot to be deleted.
+-    // This field is REQUIRED.
+-    string snapshot_id = 1;
+-
+-    // Secrets required by plugin to complete snapshot deletion request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> delete_snapshot_secrets = 2;
+-}
+-
+-message DeleteSnapshotResponse {}
+-// List all snapshots on the storage system regardless of how they were
+-// created.
+-message ListSnapshotsRequest {
+-    // If specified (non-zero value), the Plugin MUST NOT return more
+-    // entries than this number in the response. If the actual number of
+-    // entries is more than this number, the Plugin MUST set `next_token`
+-    // in the response which can be used to get the next page of entries
+-    // in the subsequent `ListSnapshots` call. This field is OPTIONAL. If
+-    // not specified (zero value), it means there is no restriction on the
+-    // number of entries that can be returned.
+-    // The value of this field MUST NOT be negative.
+-    int32 max_entries = 1;
+-
+-    // A token to specify where to start paginating. Set this field to
+-    // `next_token` returned by a previous `ListSnapshots` call to get the
+-    // next page of entries. This field is OPTIONAL.
+-    // An empty string is equal to an unspecified field value.
+-    string starting_token = 2;
+-
+-    // Identity information for the source volume. This field is OPTIONAL.
+-    // It can be used to list snapshots by volume.
+-    string source_volume_id = 3;
+-
+-    // Identity information for a specific snapshot. This field is
+-    // OPTIONAL. It can be used to list only a specific snapshot.
+-    // ListSnapshots will return with current snapshot information
+-    // and will not block if the snapshot is being uploaded.
+-    string snapshot_id = 4;
+-}
+-
+-message ListSnapshotsResponse {
+-    message Entry {
+-        Snapshot snapshot = 1;
+-    }
+-
+-    repeated Entry entries = 1;
+-
+-    // This token allows you to get the next page of entries for
+-    // `ListSnapshots` request. If the number of entries is larger than
+-    // `max_entries`, use the `next_token` as a value for the
+-    // `starting_token` field in the next `ListSnapshots` request. This
+-    // field is OPTIONAL.
+-    // An empty string is equal to an unspecified field value.
+-    string next_token = 2;
+-}
+-message NodeStageVolumeRequest {
+-    // The ID of the volume to publish. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The CO SHALL set this field to the value returned by
+-    // `ControllerPublishVolume` if the corresponding Controller Plugin
+-    // has `PUBLISH_UNPUBLISH_VOLUME` controller capability, and SHALL be
+-    // left unset if the corresponding Controller Plugin does not have
+-    // this capability. This is an OPTIONAL field.
+-    map<string, string> publish_info = 2;
+-
+-    // The path to which the volume will be published. It MUST be an
+-    // absolute path in the root filesystem of the process serving this
+-    // request. The CO SHALL ensure that there is only one
+-    // staging_target_path per volume.
+-    // This is a REQUIRED field.
+-    string staging_target_path = 3;
+-
+-    // The capability of the volume the CO expects the volume to have.
+-    // This is a REQUIRED field.
+-    VolumeCapability volume_capability = 4;
+-
+-    // Secrets required by plugin to complete node stage volume request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> node_stage_secrets = 5;
+-
+-    // Attributes of the volume to publish. This field is OPTIONAL and
+-    // MUST match the attributes of the `Volume` identified by
+-    // `volume_id`.
+-    map<string, string> volume_attributes = 6;
+-}
+-
+-message NodeStageVolumeResponse {
+-    // Intentionally empty.
+-}
+-message NodeUnstageVolumeRequest {
+-    // The ID of the volume. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The path at which the volume was published. It MUST be an absolute
+-    // path in the root filesystem of the process serving this request.
+-    // This is a REQUIRED field.
+-    string staging_target_path = 2;
+-}
+-
+-message NodeUnstageVolumeResponse {
+-    // Intentionally empty.
+-}
+-message NodePublishVolumeRequest {
+-    // The ID of the volume to publish. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The CO SHALL set this field to the value returned by
+-    // `ControllerPublishVolume` if the corresponding Controller Plugin
+-    // has `PUBLISH_UNPUBLISH_VOLUME` controller capability, and SHALL be
+-    // left unset if the corresponding Controller Plugin does not have
+-    // this capability. This is an OPTIONAL field.
+-    map<string, string> publish_info = 2;
+-
+-    // The path to which the device was mounted by `NodeStageVolume`.
+-    // It MUST be an absolute path in the root filesystem of the process
+-    // serving this request.
+-    // It MUST be set if the Node Plugin implements the
+-    // `STAGE_UNSTAGE_VOLUME` node capability.
+-    // This is an OPTIONAL field.
+-    string staging_target_path = 3;
+-
+-    // The path to which the volume will be published. It MUST be an
+-    // absolute path in the root filesystem of the process serving this
+-    // request. The CO SHALL ensure uniqueness of target_path per volume.
+-    // The CO SHALL ensure that the path exists, and that the process
+-    // serving the request has `read` and `write` permissions to the path.
+-    // This is a REQUIRED field.
+-    string target_path = 4;
+-
+-    // The capability of the volume the CO expects the volume to have.
+-    // This is a REQUIRED field.
+-    VolumeCapability volume_capability = 5;
+-
+-    // Whether to publish the volume in readonly mode. This field is
+-    // REQUIRED.
+-    bool readonly = 6;
+-
+-    // Secrets required by plugin to complete node publish volume request.
+-    // This field is OPTIONAL. Refer to the `Secrets Requirements`
+-    // section on how to use this field.
+-    map<string, string> node_publish_secrets = 7;
+-
+-    // Attributes of the volume to publish. This field is OPTIONAL and
+-    // MUST match the attributes of the Volume identified by
+-    // `volume_id`.
+-    map<string, string> volume_attributes = 8;
+-}
+-
+-message NodePublishVolumeResponse {
+-    // Intentionally empty.
+-}
+-message NodeUnpublishVolumeRequest {
+-    // The ID of the volume. This field is REQUIRED.
+-    string volume_id = 1;
+-
+-    // The path at which the volume was published. It MUST be an absolute
+-    // path in the root filesystem of the process serving this request.
+-    // This is a REQUIRED field.
+-    string target_path = 2;
+-}
+-
+-message NodeUnpublishVolumeResponse {
+-    // Intentionally empty.
+-}
+-message NodeGetIdRequest {
+-    // Intentionally empty.
+-}
+-
+-message NodeGetIdResponse {
+-    // The ID of the node as understood by the SP which SHALL be used by
+-    // CO in subsequent `ControllerPublishVolume`.
+-    // This is a REQUIRED field.
+-    string node_id = 1;
+-}
+-message NodeGetCapabilitiesRequest {
+-    // Intentionally empty.
+-}
+-
+-message NodeGetCapabilitiesResponse {
+-    // All the capabilities that the node service supports. This field
+-    // is OPTIONAL.
+-    repeated NodeServiceCapability capabilities = 1;
+-}
+-
+-// Specifies a capability of the node service.
+-message NodeServiceCapability {
+-    message RPC {
+-        enum Type {
+-            UNKNOWN = 0;
+-            STAGE_UNSTAGE_VOLUME = 1;
+-        }
+-
+-        Type type = 1;
+-    }
+-
+-    oneof type {
+-        // RPC that the controller supports.
+-        RPC rpc = 1;
+-    }
+-}
+-message NodeGetInfoRequest {
+-}
+-
+-message NodeGetInfoResponse {
+-    // The ID of the node as understood by the SP which SHALL be used by
+-    // CO in subsequent calls to `ControllerPublishVolume`.
+-    // This is a REQUIRED field.
+-    string node_id = 1;
+-
+-    // Maximum number of volumes that controller can publish to the node.
+-    // If value is not set or zero CO SHALL decide how many volumes of
+-    // this type can be published by the controller to the node. The
+-    // plugin MUST NOT set negative values here.
+-    // This field is OPTIONAL.
+-    int64 max_volumes_per_node = 2;
+-
+-    // Specifies where (regions, zones, racks, etc.) the node is
+-    // accessible from.
+-    // A plugin that returns this field MUST also set the
+-    // ACCESSIBILITY_CONSTRAINTS plugin capability.
+-    // COs MAY use this information along with the topology information
+-    // returned in CreateVolumeResponse to ensure that a given volume is
+-    // accessible from a given node when scheduling workloads.
+-    // This field is OPTIONAL. If it is not specified, the CO MAY assume
+-    // the node is not subject to any topological constraint, and MAY
+-    // schedule workloads that reference any volume V, such that there are
+-    // no topological constraints declared for V.
+-    //
+-    // Example 1:
+-    //   accessible_topology =
+-    //     {"region": "R1", "zone": "R2"}
+-    // Indicates the node exists within the "region" "R1" and the "zone"
+-    // "Z2".
+-    Topology accessible_topology = 3;
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/MockCsiAdaptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/MockCsiAdaptor.java
+deleted file mode 100644
+index 4bcc5092861..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/MockCsiAdaptor.java
++++ /dev/null
+@@ -1,85 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-import java.io.IOException;
+-
+-/**
+- * This class is used by {@link TestCsiAdaptorService} for testing.
+- * It gives some dummy implementation for a adaptor plugin, and used to
+- * verify the plugin can be properly loaded by NM and execution logic is
+- * as expected.
+- *
+- * This is created as a separated class instead of an inner class, because
+- * {@link CsiAdaptorServices} is loading classes using conf.getClass(),
+- * the utility class is unable to resolve inner classes.
+- */
+-public class MockCsiAdaptor implements CsiAdaptorPlugin {
+-
+-  private String driverName;
+-
+-  @Override
+-  public void init(String driverName, Configuration conf)
+-      throws YarnException {
+-    this.driverName = driverName;
+-  }
+-
+-  @Override
+-  public String getDriverName() {
+-    return this.driverName;
+-  }
+-
+-  @Override
+-  public GetPluginInfoResponse getPluginInfo(
+-      GetPluginInfoRequest request) throws YarnException, IOException {
+-    return GetPluginInfoResponse.newInstance(driverName,
+-        "1.0");
+-  }
+-
+-  @Override
+-  public ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-      ValidateVolumeCapabilitiesRequest request)
+-      throws YarnException, IOException {
+-    return ValidateVolumeCapabilitiesResponse.newInstance(true,
+-        "verified via MockCsiAdaptor");
+-  }
+-
+-  @Override
+-  public NodePublishVolumeResponse nodePublishVolume(
+-      NodePublishVolumeRequest request) throws YarnException, IOException {
+-    return null;
+-  }
+-
+-  @Override
+-  public NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      NodeUnpublishVolumeRequest request) throws YarnException, IOException {
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
+deleted file mode 100644
+index cc147113973..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestCsiAdaptorService.java
++++ /dev/null
+@@ -1,460 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import csi.v0.Csi;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.ServiceStateException;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+-import org.apache.hadoop.yarn.api.CsiAdaptorProtocol;
+-import org.apache.hadoop.yarn.api.CsiAdaptorPlugin;
+-import org.apache.hadoop.yarn.api.impl.pb.client.CsiAdaptorProtocolPBClientImpl;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodePublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.NodeUnpublishVolumeResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.ValidateVolumeCapabilitiesRequestPBImpl;
+-import org.apache.hadoop.yarn.client.NMProxy;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.Test;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.ServerSocket;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertThrows;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.AccessMode.MULTI_NODE_MULTI_WRITER;
+-import static org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeType.FILE_SYSTEM;
+-
+-/**
+- * UT for {@link CsiAdaptorProtocolService}.
+- */
+-public class TestCsiAdaptorService {
+-
+-  private static File testRoot = null;
+-  private static String domainSocket = null;
+-
+-  @BeforeAll
+-  public static void setUp() throws IOException {
+-    testRoot = GenericTestUtils.getTestDir("csi-test");
+-    File socketPath = new File(testRoot, "csi.sock");
+-    FileUtils.forceMkdirParent(socketPath);
+-    domainSocket = "unix://" + socketPath.getAbsolutePath();
+-  }
+-
+-  @AfterAll
+-  public static void tearDown() throws IOException {
+-    if (testRoot != null) {
+-      FileUtils.deleteDirectory(testRoot);
+-    }
+-  }
+-
+-  private interface FakeCsiAdaptor extends CsiAdaptorPlugin {
+-
+-    default void init(String driverName, Configuration conf)
+-        throws YarnException {
+-      return;
+-    }
+-
+-    default String getDriverName() {
+-      return null;
+-    }
+-
+-    default GetPluginInfoResponse getPluginInfo(GetPluginInfoRequest request)
+-        throws YarnException, IOException {
+-      return null;
+-    }
+-
+-    default ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-        ValidateVolumeCapabilitiesRequest request) throws YarnException,
+-        IOException {
+-      return null;
+-    }
+-
+-    default NodePublishVolumeResponse nodePublishVolume(
+-        NodePublishVolumeRequest request) throws YarnException, IOException {
+-      return null;
+-    }
+-
+-    default NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-        NodeUnpublishVolumeRequest request) throws YarnException, IOException{
+-      return null;
+-    }
+-  }
+-
+-  @Test
+-  void testValidateVolume() throws IOException, YarnException {
+-    ServerSocket ss = new ServerSocket(0);
+-    ss.close();
+-    InetSocketAddress address = new InetSocketAddress(ss.getLocalPort());
+-    Configuration conf = new Configuration();
+-    conf.setSocketAddr(
+-        YarnConfiguration.NM_CSI_ADAPTOR_PREFIX + "test-driver.address",
+-        address);
+-    conf.set(
+-        YarnConfiguration.NM_CSI_DRIVER_PREFIX + "test-driver.endpoint",
+-        "unix:///tmp/test-driver.sock");
+-
+-    // inject a fake CSI adaptor
+-    // this client validates if the ValidateVolumeCapabilitiesRequest
+-    // is integrity, and then reply a fake response
+-    CsiAdaptorPlugin plugin = new FakeCsiAdaptor() {
+-      @Override
+-      public String getDriverName() {
+-        return "test-driver";
+-      }
+-
+-
+-      @Override
+-      public GetPluginInfoResponse getPluginInfo(GetPluginInfoRequest request) {
+-        return GetPluginInfoResponse.newInstance("test-plugin", "0.1");
+-      }
+-
+-      @Override
+-      public ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-          ValidateVolumeCapabilitiesRequest request) throws YarnException,
+-          IOException {
+-        // validate we get all info from the request
+-        assertEquals("volume-id-0000123", request.getVolumeId());
+-        assertEquals(1, request.getVolumeCapabilities().size());
+-        assertEquals(Csi.VolumeCapability.AccessMode
+-                .newBuilder().setModeValue(5).build().getMode().name(),
+-            request.getVolumeCapabilities().get(0).getAccessMode().name());
+-        assertEquals(2, request.getVolumeCapabilities().get(0)
+-            .getMountFlags().size());
+-        assertTrue(request.getVolumeCapabilities().get(0)
+-            .getMountFlags().contains("mountFlag1"));
+-        assertTrue(request.getVolumeCapabilities().get(0)
+-            .getMountFlags().contains("mountFlag2"));
+-        assertEquals(2, request.getVolumeAttributes().size());
+-        assertEquals("v1", request.getVolumeAttributes().get("k1"));
+-        assertEquals("v2", request.getVolumeAttributes().get("k2"));
+-        // return a fake result
+-        return ValidateVolumeCapabilitiesResponse
+-            .newInstance(false, "this is a test");
+-      }
+-    };
+-
+-    CsiAdaptorProtocolService service =
+-        new CsiAdaptorProtocolService(plugin);
+-    service.init(conf);
+-    service.start();
+-
+-    try (CsiAdaptorProtocolPBClientImpl client =
+-        new CsiAdaptorProtocolPBClientImpl(1L, address, new Configuration())) {
+-      ValidateVolumeCapabilitiesRequest request =
+-          ValidateVolumeCapabilitiesRequestPBImpl
+-              .newInstance("volume-id-0000123",
+-                  ImmutableList.of(
+-                      new ValidateVolumeCapabilitiesRequest
+-                          .VolumeCapability(
+-                          MULTI_NODE_MULTI_WRITER, FILE_SYSTEM,
+-                          ImmutableList.of("mountFlag1", "mountFlag2"))),
+-                  ImmutableMap.of("k1", "v1", "k2", "v2"));
+-
+-      ValidateVolumeCapabilitiesResponse response = client
+-          .validateVolumeCapacity(request);
+-
+-      assertEquals(false, response.isSupported());
+-      assertEquals("this is a test", response.getResponseMessage());
+-    } finally {
+-      service.stop();
+-    }
+-  }
+-
+-  @Test
+-  void testValidateVolumeWithNMProxy() throws Exception {
+-    ServerSocket ss = new ServerSocket(0);
+-    ss.close();
+-    InetSocketAddress address = new InetSocketAddress(ss.getLocalPort());
+-    Configuration conf = new Configuration();
+-    conf.setSocketAddr(
+-        YarnConfiguration.NM_CSI_ADAPTOR_PREFIX + "test-driver.address",
+-        address);
+-    conf.set(
+-        YarnConfiguration.NM_CSI_DRIVER_PREFIX + "test-driver.endpoint",
+-        "unix:///tmp/test-driver.sock");
+-
+-    // inject a fake CSI adaptor
+-    // this client validates if the ValidateVolumeCapabilitiesRequest
+-    // is integrity, and then reply a fake response
+-    FakeCsiAdaptor plugin = new FakeCsiAdaptor() {
+-      @Override
+-      public String getDriverName() {
+-        return "test-driver";
+-      }
+-
+-      @Override
+-      public GetPluginInfoResponse getPluginInfo(
+-          GetPluginInfoRequest request) throws YarnException, IOException {
+-        return GetPluginInfoResponse.newInstance("test-plugin", "0.1");
+-      }
+-
+-      @Override
+-      public ValidateVolumeCapabilitiesResponse validateVolumeCapacity(
+-          ValidateVolumeCapabilitiesRequest request)
+-          throws YarnException, IOException {
+-        // validate we get all info from the request
+-        assertEquals("volume-id-0000123", request.getVolumeId());
+-        assertEquals(1, request.getVolumeCapabilities().size());
+-        assertEquals(
+-            Csi.VolumeCapability.AccessMode.newBuilder().setModeValue(5)
+-                .build().getMode().name(),
+-            request.getVolumeCapabilities().get(0).getAccessMode().name());
+-        assertEquals(2,
+-            request.getVolumeCapabilities().get(0).getMountFlags().size());
+-        assertTrue(request.getVolumeCapabilities().get(0).getMountFlags()
+-            .contains("mountFlag1"));
+-        assertTrue(request.getVolumeCapabilities().get(0).getMountFlags()
+-            .contains("mountFlag2"));
+-        assertEquals(2, request.getVolumeAttributes().size());
+-        assertEquals("v1", request.getVolumeAttributes().get("k1"));
+-        assertEquals("v2", request.getVolumeAttributes().get("k2"));
+-        // return a fake result
+-        return ValidateVolumeCapabilitiesResponse
+-            .newInstance(false, "this is a test");
+-      }
+-    };
+-
+-    CsiAdaptorProtocolService service =
+-        new CsiAdaptorProtocolService(plugin);
+-    service.init(conf);
+-    service.start();
+-
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
+-    CsiAdaptorProtocol adaptorClient = NMProxy
+-        .createNMProxy(conf, CsiAdaptorProtocol.class, currentUser, rpc,
+-            NetUtils.createSocketAddrForHost("localhost", ss.getLocalPort()));
+-    ValidateVolumeCapabilitiesRequest request =
+-        ValidateVolumeCapabilitiesRequestPBImpl
+-            .newInstance("volume-id-0000123",
+-                ImmutableList.of(new ValidateVolumeCapabilitiesRequest
+-                    .VolumeCapability(
+-                    MULTI_NODE_MULTI_WRITER, FILE_SYSTEM,
+-                    ImmutableList.of("mountFlag1", "mountFlag2"))),
+-                ImmutableMap.of("k1", "v1", "k2", "v2"));
+-
+-    ValidateVolumeCapabilitiesResponse response = adaptorClient
+-        .validateVolumeCapacity(request);
+-    assertEquals(false, response.isSupported());
+-    assertEquals("this is a test", response.getResponseMessage());
+-
+-    service.stop();
+-  }
+-
+-  @Test
+-  void testMissingConfiguration() {
+-    assertThrows(ServiceStateException.class, () -> {
+-      Configuration conf = new Configuration();
+-      CsiAdaptorProtocolService service =
+-          new CsiAdaptorProtocolService(new FakeCsiAdaptor() {
+-          });
+-      service.init(conf);
+-    });
+-  }
+-
+-  @Test
+-  void testInvalidServicePort() {
+-    assertThrows(ServiceStateException.class, () -> {
+-      Configuration conf = new Configuration();
+-      conf.set(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-          + "test-driver-0001.address",
+-          "0.0.0.0:-100"); // this is an invalid address
+-      CsiAdaptorProtocolService service =
+-          new CsiAdaptorProtocolService(new FakeCsiAdaptor() {
+-          });
+-      service.init(conf);
+-    });
+-  }
+-
+-  @Test
+-  void testInvalidHost() {
+-    assertThrows(ServiceStateException.class, () -> {
+-      Configuration conf = new Configuration();
+-      conf.set(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-          + "test-driver-0001.address",
+-          "192.0.1:8999"); // this is an invalid ip address
+-      CsiAdaptorProtocolService service =
+-          new CsiAdaptorProtocolService(new FakeCsiAdaptor() {
+-          });
+-      service.init(conf);
+-    });
+-  }
+-
+-  @Test
+-  void testCustomizedAdaptor() throws IOException, YarnException {
+-    ServerSocket ss = new ServerSocket(0);
+-    ss.close();
+-    InetSocketAddress address = new InetSocketAddress(ss.getLocalPort());
+-    Configuration conf = new Configuration();
+-    conf.set(YarnConfiguration.NM_CSI_DRIVER_NAMES, "customized-driver");
+-    conf.setSocketAddr(
+-        YarnConfiguration.NM_CSI_ADAPTOR_PREFIX + "customized-driver.address",
+-        address);
+-    conf.set(
+-        YarnConfiguration.NM_CSI_ADAPTOR_PREFIX + "customized-driver.class",
+-        "org.apache.hadoop.yarn.csi.adaptor.MockCsiAdaptor");
+-    conf.set(
+-        YarnConfiguration.NM_CSI_DRIVER_PREFIX + "customized-driver.endpoint",
+-        "unix:///tmp/customized-driver.sock");
+-
+-    CsiAdaptorServices services =
+-        new CsiAdaptorServices();
+-    services.init(conf);
+-    services.start();
+-
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
+-    CsiAdaptorProtocol adaptorClient = NMProxy
+-        .createNMProxy(conf, CsiAdaptorProtocol.class, currentUser, rpc,
+-            NetUtils.createSocketAddrForHost("localhost", ss.getLocalPort()));
+-
+-    // Test getPluginInfo
+-    GetPluginInfoResponse pluginInfo =
+-        adaptorClient.getPluginInfo(GetPluginInfoRequest.newInstance());
+-    assertThat(pluginInfo.getDriverName()).isEqualTo("customized-driver");
+-    assertThat(pluginInfo.getVersion()).isEqualTo("1.0");
+-
+-    // Test validateVolumeCapacity
+-    ValidateVolumeCapabilitiesRequest request =
+-        ValidateVolumeCapabilitiesRequestPBImpl
+-            .newInstance("volume-id-0000123",
+-                ImmutableList.of(new ValidateVolumeCapabilitiesRequest
+-                    .VolumeCapability(
+-                    MULTI_NODE_MULTI_WRITER, FILE_SYSTEM,
+-                    ImmutableList.of("mountFlag1", "mountFlag2"))),
+-                ImmutableMap.of("k1", "v1", "k2", "v2"));
+-
+-    ValidateVolumeCapabilitiesResponse response = adaptorClient
+-        .validateVolumeCapacity(request);
+-    assertEquals(true, response.isSupported());
+-    assertEquals("verified via MockCsiAdaptor",
+-        response.getResponseMessage());
+-
+-    services.stop();
+-  }
+-
+-  @Test
+-  void testMultipleCsiAdaptors() throws IOException, YarnException {
+-    ServerSocket driver1Addr = new ServerSocket(0);
+-    ServerSocket driver2Addr = new ServerSocket(0);
+-
+-    InetSocketAddress address1 =
+-        new InetSocketAddress(driver1Addr.getLocalPort());
+-    InetSocketAddress address2 =
+-        new InetSocketAddress(driver2Addr.getLocalPort());
+-
+-    Configuration conf = new Configuration();
+-
+-    // Two csi-drivers configured
+-    conf.set(YarnConfiguration.NM_CSI_DRIVER_NAMES,
+-        "customized-driver-1,customized-driver-2");
+-
+-    // customized-driver-1
+-    conf.setSocketAddr(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-        + "customized-driver-1.address", address1);
+-    conf.set(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-        + "customized-driver-1.class",
+-        "org.apache.hadoop.yarn.csi.adaptor.MockCsiAdaptor");
+-    conf.set(YarnConfiguration.NM_CSI_DRIVER_PREFIX
+-        + "customized-driver-1.endpoint",
+-        "unix:///tmp/customized-driver-1.sock");
+-
+-    // customized-driver-2
+-    conf.setSocketAddr(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-        + "customized-driver-2.address", address2);
+-    conf.set(YarnConfiguration.NM_CSI_ADAPTOR_PREFIX
+-        + "customized-driver-2.class",
+-        "org.apache.hadoop.yarn.csi.adaptor.MockCsiAdaptor");
+-    conf.set(YarnConfiguration.NM_CSI_DRIVER_PREFIX
+-        + "customized-driver-2.endpoint",
+-        "unix:///tmp/customized-driver-2.sock");
+-
+-    driver1Addr.close();
+-    driver2Addr.close();
+-
+-    CsiAdaptorServices services =
+-        new CsiAdaptorServices();
+-    services.init(conf);
+-    services.start();
+-
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
+-    CsiAdaptorProtocol client1 = NMProxy
+-        .createNMProxy(conf, CsiAdaptorProtocol.class, currentUser, rpc,
+-            NetUtils.createSocketAddrForHost("localhost",
+-                driver1Addr.getLocalPort()));
+-
+-    // ***************************************************
+-    // Verify talking with customized-driver-1
+-    // ***************************************************
+-    // Test getPluginInfo
+-    GetPluginInfoResponse pluginInfo =
+-        client1.getPluginInfo(GetPluginInfoRequest.newInstance());
+-    assertThat(pluginInfo.getDriverName()).isEqualTo("customized-driver-1");
+-    assertThat(pluginInfo.getVersion()).isEqualTo("1.0");
+-
+-    // Test validateVolumeCapacity
+-    ValidateVolumeCapabilitiesRequest request =
+-        ValidateVolumeCapabilitiesRequestPBImpl
+-            .newInstance("driver-1-volume-00001",
+-                ImmutableList.of(new ValidateVolumeCapabilitiesRequest
+-                    .VolumeCapability(
+-                    MULTI_NODE_MULTI_WRITER, FILE_SYSTEM,
+-                    ImmutableList.of())), ImmutableMap.of());
+-
+-    ValidateVolumeCapabilitiesResponse response = client1
+-        .validateVolumeCapacity(request);
+-    assertEquals(true, response.isSupported());
+-    assertEquals("verified via MockCsiAdaptor",
+-        response.getResponseMessage());
+-
+-
+-    // ***************************************************
+-    // Verify talking with customized-driver-2
+-    // ***************************************************
+-    CsiAdaptorProtocol client2 = NMProxy
+-        .createNMProxy(conf, CsiAdaptorProtocol.class, currentUser, rpc,
+-            NetUtils.createSocketAddrForHost("localhost",
+-                driver2Addr.getLocalPort()));
+-    GetPluginInfoResponse pluginInfo2 =
+-        client2.getPluginInfo(GetPluginInfoRequest.newInstance());
+-    assertThat(pluginInfo2.getDriverName()).isEqualTo("customized-driver-2");
+-    assertThat(pluginInfo2.getVersion()).isEqualTo("1.0");
+-
+-    services.stop();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestGetPluginInfoRequestResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestGetPluginInfoRequestResponse.java
+deleted file mode 100644
+index a6591091e5a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestGetPluginInfoRequestResponse.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.GetPluginInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetPluginInfoRequestPBImpl;
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.GetPluginInfoResponsePBImpl;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos;
+-import org.junit.jupiter.api.Test;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-
+-/**
+- * Verify the integrity of GetPluginInfoRequest and GetPluginInfoResponse.
+- */
+-public class TestGetPluginInfoRequestResponse {
+-
+-  @Test
+-  void testGetPluginInfoRequestPBRecord() {
+-    CsiAdaptorProtos.GetPluginInfoRequest requestProto =
+-        CsiAdaptorProtos.GetPluginInfoRequest.newBuilder().build();
+-    GetPluginInfoRequestPBImpl pbImpl =
+-        new GetPluginInfoRequestPBImpl(requestProto);
+-    assertNotNull(pbImpl);
+-    assertEquals(requestProto, pbImpl.getProto());
+-  }
+-
+-  @Test
+-  void testGetPluginInfoResponsePBRecord() {
+-    CsiAdaptorProtos.GetPluginInfoResponse responseProto =
+-        CsiAdaptorProtos.GetPluginInfoResponse.newBuilder()
+-            .setName("test-driver")
+-            .setVendorVersion("1.0.1")
+-            .build();
+-
+-    GetPluginInfoResponsePBImpl pbImpl =
+-        new GetPluginInfoResponsePBImpl(responseProto);
+-    assertEquals("test-driver", pbImpl.getDriverName());
+-    assertEquals("1.0.1", pbImpl.getVersion());
+-    assertEquals(responseProto, pbImpl.getProto());
+-
+-    GetPluginInfoResponse pbImpl2 = GetPluginInfoResponsePBImpl
+-        .newInstance("test-driver", "1.0.1");
+-    assertEquals("test-driver", pbImpl2.getDriverName());
+-    assertEquals("1.0.1", pbImpl2.getVersion());
+-
+-    CsiAdaptorProtos.GetPluginInfoResponse proto =
+-        ((GetPluginInfoResponsePBImpl) pbImpl2).getProto();
+-    assertEquals("test-driver", proto.getName());
+-    assertEquals("1.0.1", proto.getVendorVersion());
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestNodePublishVolumeRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestNodePublishVolumeRequest.java
+deleted file mode 100644
+index 77c60fd6d11..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestNodePublishVolumeRequest.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.NodePublishVolumeRequestPBImpl;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos.VolumeCapability.AccessMode;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos.VolumeCapability.VolumeType;
+-import org.junit.jupiter.api.Test;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-
+-/**
+- * UT for NodePublishVolumeRequest.
+- */
+-public class TestNodePublishVolumeRequest {
+-
+-  @Test
+-  void testPBRecord() {
+-    CsiAdaptorProtos.VolumeCapability capability =
+-        CsiAdaptorProtos.VolumeCapability.newBuilder()
+-            .setAccessMode(AccessMode.MULTI_NODE_READER_ONLY)
+-            .setVolumeType(VolumeType.FILE_SYSTEM)
+-            .build();
+-    CsiAdaptorProtos.NodePublishVolumeRequest proto =
+-        CsiAdaptorProtos.NodePublishVolumeRequest.newBuilder()
+-            .setReadonly(false)
+-            .setVolumeId("test-vol-000001")
+-            .setTargetPath("/mnt/data")
+-            .setStagingTargetPath("/mnt/staging")
+-            .setVolumeCapability(capability)
+-            .build();
+-
+-    NodePublishVolumeRequestPBImpl pbImpl =
+-        new NodePublishVolumeRequestPBImpl(proto);
+-    assertEquals("test-vol-000001", pbImpl.getVolumeId());
+-    assertEquals("/mnt/data", pbImpl.getTargetPath());
+-    assertEquals("/mnt/staging", pbImpl.getStagingPath());
+-    assertFalse(pbImpl.getReadOnly());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
+deleted file mode 100644
+index 0c1d243a625..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityRequest.java
++++ /dev/null
+@@ -1,113 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableList;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeCapability;
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.ValidateVolumeCapabilitiesRequestPBImpl;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos.VolumeCapability.AccessMode;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos.VolumeCapability.VolumeType;
+-import org.apache.hadoop.yarn.proto.YarnProtos;
+-import org.junit.jupiter.api.Test;
+-
+-import static org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.AccessMode.MULTI_NODE_MULTI_WRITER;
+-import static org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesRequest.VolumeType.FILE_SYSTEM;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-
+-/**
+- * UT for message exchanges.
+- */
+-public class TestValidateVolumeCapabilityRequest {
+-
+-  @Test
+-  void testPBRecord() {
+-    CsiAdaptorProtos.VolumeCapability vcProto =
+-        CsiAdaptorProtos.VolumeCapability.newBuilder()
+-            .setAccessMode(AccessMode.MULTI_NODE_MULTI_WRITER)
+-            .setVolumeType(VolumeType.FILE_SYSTEM)
+-            .addMountFlags("flag0")
+-            .addMountFlags("flag1")
+-            .build();
+-
+-    CsiAdaptorProtos.ValidateVolumeCapabilitiesRequest requestProto =
+-        CsiAdaptorProtos.ValidateVolumeCapabilitiesRequest.newBuilder()
+-            .setVolumeId("volume-id-0000001")
+-            .addVolumeCapabilities(vcProto)
+-            .addVolumeAttributes(YarnProtos.StringStringMapProto
+-                .newBuilder().setKey("attr0")
+-                .setValue("value0")
+-                .build())
+-            .addVolumeAttributes(YarnProtos.StringStringMapProto
+-                .newBuilder().setKey("attr1")
+-                .setValue("value1")
+-                .build())
+-            .build();
+-
+-    ValidateVolumeCapabilitiesRequestPBImpl request =
+-        new ValidateVolumeCapabilitiesRequestPBImpl(requestProto);
+-
+-    assertEquals("volume-id-0000001", request.getVolumeId());
+-    assertEquals(2, request.getVolumeAttributes().size());
+-    assertEquals("value0", request.getVolumeAttributes().get("attr0"));
+-    assertEquals("value1", request.getVolumeAttributes().get("attr1"));
+-    assertEquals(1, request.getVolumeCapabilities().size());
+-    VolumeCapability vc =
+-        request.getVolumeCapabilities().get(0);
+-    assertEquals(MULTI_NODE_MULTI_WRITER, vc.getAccessMode());
+-    assertEquals(FILE_SYSTEM, vc.getVolumeType());
+-    assertEquals(2, vc.getMountFlags().size());
+-
+-    assertEquals(requestProto, request.getProto());
+-  }
+-
+-  @Test
+-  void testNewInstance() {
+-    ValidateVolumeCapabilitiesRequest pbImpl =
+-        ValidateVolumeCapabilitiesRequestPBImpl
+-            .newInstance("volume-id-0000123",
+-                ImmutableList.of(
+-                    new VolumeCapability(
+-                        MULTI_NODE_MULTI_WRITER, FILE_SYSTEM,
+-                        ImmutableList.of("mountFlag1", "mountFlag2"))),
+-                ImmutableMap.of("k1", "v1", "k2", "v2"));
+-
+-    assertEquals("volume-id-0000123", pbImpl.getVolumeId());
+-    assertEquals(1, pbImpl.getVolumeCapabilities().size());
+-    assertEquals(FILE_SYSTEM,
+-        pbImpl.getVolumeCapabilities().get(0).getVolumeType());
+-    assertEquals(MULTI_NODE_MULTI_WRITER,
+-        pbImpl.getVolumeCapabilities().get(0).getAccessMode());
+-    assertEquals(2, pbImpl.getVolumeAttributes().size());
+-
+-    CsiAdaptorProtos.ValidateVolumeCapabilitiesRequest proto =
+-        ((ValidateVolumeCapabilitiesRequestPBImpl) pbImpl).getProto();
+-    assertEquals("volume-id-0000123", proto.getVolumeId());
+-    assertEquals(1, proto.getVolumeCapabilitiesCount());
+-    assertEquals(AccessMode.MULTI_NODE_MULTI_WRITER,
+-        proto.getVolumeCapabilities(0).getAccessMode());
+-    assertEquals(VolumeType.FILE_SYSTEM,
+-        proto.getVolumeCapabilities(0).getVolumeType());
+-    assertEquals(2, proto.getVolumeCapabilities(0)
+-        .getMountFlagsCount());
+-    assertEquals(2, proto.getVolumeCapabilities(0)
+-        .getMountFlagsList().size());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityResponse.java
+deleted file mode 100644
+index ee80bf4d0c6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/TestValidateVolumeCapabilityResponse.java
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.ValidateVolumeCapabilitiesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.ValidateVolumeCapabilitiesResponsePBImpl;
+-import org.apache.hadoop.yarn.proto.CsiAdaptorProtos;
+-import org.junit.jupiter.api.Test;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-
+-/**
+- * UT for message exchanges.
+- */
+-public class TestValidateVolumeCapabilityResponse {
+-
+-  @Test
+-  void testPBRecord() {
+-    CsiAdaptorProtos.ValidateVolumeCapabilitiesResponse proto =
+-        CsiAdaptorProtos.ValidateVolumeCapabilitiesResponse.newBuilder()
+-            .setSupported(true)
+-            .setMessage("capability is supported")
+-            .build();
+-
+-    ValidateVolumeCapabilitiesResponsePBImpl pbImpl =
+-        new ValidateVolumeCapabilitiesResponsePBImpl(proto);
+-
+-    assertEquals(true, pbImpl.isSupported());
+-    assertEquals("capability is supported", pbImpl.getResponseMessage());
+-    assertEquals(proto, pbImpl.getProto());
+-  }
+-
+-  @Test
+-  void testNewInstance() {
+-    ValidateVolumeCapabilitiesResponse pbImpl =
+-        ValidateVolumeCapabilitiesResponsePBImpl
+-            .newInstance(false, "capability not supported");
+-    assertEquals(false, pbImpl.isSupported());
+-    assertEquals("capability not supported",
+-        pbImpl.getResponseMessage());
+-
+-    CsiAdaptorProtos.ValidateVolumeCapabilitiesResponse proto =
+-        ((ValidateVolumeCapabilitiesResponsePBImpl) pbImpl).getProto();
+-    assertEquals(false, proto.getSupported());
+-    assertEquals("capability not supported", proto.getMessage());
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
+deleted file mode 100644
+index ecc7fc2c7e7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/adaptor/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains UT classes for CSI adaptor.
+- */
+-package org.apache.hadoop.yarn.csi.adaptor;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiDriver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiDriver.java
+deleted file mode 100644
+index 0c6de32e519..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiDriver.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import io.grpc.Server;
+-import io.grpc.netty.NettyServerBuilder;
+-import io.netty.channel.epoll.EpollEventLoopGroup;
+-import io.netty.channel.epoll.EpollServerDomainSocketChannel;
+-import org.apache.hadoop.yarn.csi.utils.GrpcHelper;
+-
+-import java.io.IOException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * A fake implementation of CSI driver.
+- * This is for testing purpose only.
+- */
+-public class FakeCsiDriver {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(FakeCsiDriver.class.getName());
+-
+-  private Server server;
+-  private String socketAddress;
+-
+-  public FakeCsiDriver(String socketAddress) {
+-    this.socketAddress = socketAddress;
+-  }
+-
+-  public void start() throws IOException {
+-    EpollEventLoopGroup group = new EpollEventLoopGroup();
+-    server = NettyServerBuilder
+-        .forAddress(GrpcHelper.getSocketAddress(socketAddress))
+-        .channelType(EpollServerDomainSocketChannel.class)
+-        .workerEventLoopGroup(group)
+-        .bossEventLoopGroup(group)
+-        .addService(new FakeCsiIdentityService())
+-        .build();
+-    server.start();
+-    LOG.info("Server started, listening on " + socketAddress);
+-  }
+-
+-  public void stop() {
+-    if (server != null) {
+-      server.shutdown();
+-      LOG.info("Server has been shutdown");
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiIdentityService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiIdentityService.java
+deleted file mode 100644
+index 0ecdcbe3780..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/FakeCsiIdentityService.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.Csi.GetPluginInfoRequest;
+-import csi.v0.Csi.GetPluginInfoResponse;
+-import csi.v0.IdentityGrpc;
+-import io.grpc.stub.StreamObserver;
+-
+-/**
+- * A fake implementation of CSI identity plugin gRPC service.
+- * This is for testing purpose only.
+- */
+-public class FakeCsiIdentityService extends IdentityGrpc.IdentityImplBase {
+-
+-  @Override
+-  public void getPluginInfo(GetPluginInfoRequest request,
+-      StreamObserver<GetPluginInfoResponse> responseObserver) {
+-    GetPluginInfoResponse response = GetPluginInfoResponse.newBuilder()
+-        .setName("fake-csi-identity-service")
+-        .setVendorVersion("0.1")
+-        .build();
+-    responseObserver.onNext(response);
+-    responseObserver.onCompleted();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/ICsiClientTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/ICsiClientTest.java
+deleted file mode 100644
+index 2f150cb8dfb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/ICsiClientTest.java
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.Csi;
+-
+-import java.io.IOException;
+-
+-/**
+- * This interface is used only in testing. It gives default implementation
+- * of all methods.
+- */
+-public interface ICsiClientTest extends CsiClient {
+-
+-  @Override
+-  default Csi.GetPluginInfoResponse getPluginInfo()
+-      throws IOException {
+-    return null;
+-  }
+-
+-  @Override
+-  default Csi.ValidateVolumeCapabilitiesResponse validateVolumeCapabilities(
+-      Csi.ValidateVolumeCapabilitiesRequest request) throws IOException {
+-    return null;
+-  }
+-
+-  @Override
+-  default Csi.NodePublishVolumeResponse nodePublishVolume(
+-      Csi.NodePublishVolumeRequest request) throws IOException {
+-    return null;
+-  }
+-
+-  @Override
+-  default Csi.NodeUnpublishVolumeResponse nodeUnpublishVolume(
+-      Csi.NodeUnpublishVolumeRequest request) throws IOException {
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
+deleted file mode 100644
+index 059cc90c4f3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/TestCsiClient.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.csi.client;
+-
+-import csi.v0.Csi;
+-import org.apache.commons.io.FileUtils;
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.Assumptions;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.file.Files;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-
+-/**
+- * Test class for CSI client.
+- */
+-public class TestCsiClient {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestCsiClient.class);
+-  private static File testRoot = null;
+-  private static String domainSocket = null;
+-  private static FakeCsiDriver driver = null;
+-
+-  @BeforeAll
+-  public static void setUp() throws IOException {
+-    // Use /tmp to fix bind failure caused by the long file name
+-    File tmpDir = new File(System.getProperty("java.io.tmpdir"));
+-    testRoot = Files
+-        .createTempDirectory(tmpDir.toPath(), "test").toFile();
+-    File socketPath = new File(testRoot, "csi.sock");
+-    FileUtils.forceMkdirParent(socketPath);
+-    domainSocket = "unix://" + socketPath.getAbsolutePath();
+-    LOG.info("Create unix domain socket: {}", domainSocket);
+-    driver = new FakeCsiDriver(domainSocket);
+-  }
+-
+-  @AfterAll
+-  public static void tearDown() throws IOException {
+-    if (testRoot != null) {
+-      FileUtils.deleteDirectory(testRoot);
+-    }
+-  }
+-
+-  @BeforeEach
+-  public void beforeMethod() {
+-    // Skip tests on non-linux systems
+-    String osName = System.getProperty("os.name").toLowerCase();
+-    Assumptions.assumeTrue(osName.contains("nix") || osName.contains("nux"));
+-  }
+-
+-  @Test
+-  void testIdentityService() throws IOException {
+-    try {
+-      driver.start();
+-      CsiClient client = new CsiClientImpl(domainSocket);
+-      Csi.GetPluginInfoResponse response = client.getPluginInfo();
+-      assertEquals("fake-csi-identity-service", response.getName());
+-    } finally {
+-      driver.stop();
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/package-info.java
+deleted file mode 100644
+index e90175daa96..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/src/test/java/org/apache/hadoop/yarn/csi/client/package-info.java
++++ /dev/null
+@@ -1,21 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * This package contains classes for CSI client library testing.
+- */
+-package org.apache.hadoop.yarn.csi.client;
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index d3ce9fef41f..4e45c200fc3 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -244,7 +244,6 @@
+     <module>hadoop-yarn-client</module>
+     <module>hadoop-yarn-registry</module>
+     <module>hadoop-yarn-ui</module>
+-    <module>hadoop-yarn-csi</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.0/16-remove-hadoop-yarn-ui.patch b/hadoop/stackable/patches/3.4.0/16-remove-hadoop-yarn-ui.patch
new file mode 100644
index 000000000..43672e0c6
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/16-remove-hadoop-yarn-ui.patch
@@ -0,0 +1,47411 @@
+Entirely remove hadoop-yarn-ui
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../main/resources/assemblies/hadoop-yarn-dist.xml |    7 
+ .../hadoop-yarn/hadoop-yarn-ui/README.md           |   89 
+ .../hadoop-yarn/hadoop-yarn-ui/pom.xml             |  332 -
+ .../hadoop-yarn-ui/src/main/webapp/.bowerrc        |    5 
+ .../hadoop-yarn-ui/src/main/webapp/.ember-cli      |    9 
+ .../hadoop-yarn-ui/src/main/webapp/.gitignore      |    5 
+ .../hadoop-yarn-ui/src/main/webapp/.jshintrc       |   35 
+ .../hadoop-yarn-ui/src/main/webapp/.watchmanconfig |    3 
+ .../hadoop-yarn-ui/src/main/webapp/WEB-INF/web.xml |   21 
+ .../hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml |    9 
+ .../src/main/webapp/app/adapters/abstract.js       |   49 
+ .../src/main/webapp/app/adapters/cluster-info.js   |   30 
+ .../src/main/webapp/app/adapters/cluster-metric.js |   30 
+ .../main/webapp/app/adapters/cluster-user-info.js  |   29 
+ .../src/main/webapp/app/adapters/jhs-health.js     |   30 
+ .../src/main/webapp/app/adapters/restabstract.js   |   50 
+ .../main/webapp/app/adapters/timeline-health.js    |   30 
+ .../main/webapp/app/adapters/yarn-app-attempt.js   |   40 
+ .../main/webapp/app/adapters/yarn-app-flowrun.js   |   33 
+ .../main/webapp/app/adapters/yarn-app-jhs-log.js   |   75 
+ .../app/adapters/yarn-app-jhs-redirect-log.js      |   59 
+ .../src/main/webapp/app/adapters/yarn-app-log.js   |   79 
+ .../webapp/app/adapters/yarn-app-redirect-log.js   |   60 
+ .../main/webapp/app/adapters/yarn-app-timeline.js  |   39 
+ .../src/main/webapp/app/adapters/yarn-app.js       |   50 
+ .../webapp/app/adapters/yarn-component-instance.js |   36 
+ .../src/main/webapp/app/adapters/yarn-conf.js      |   79 
+ .../main/webapp/app/adapters/yarn-container-log.js |   80 
+ .../app/adapters/yarn-container-threaddump.js      |   88 
+ .../src/main/webapp/app/adapters/yarn-container.js |   49 
+ .../src/main/webapp/app/adapters/yarn-entity.js    |   35 
+ .../main/webapp/app/adapters/yarn-flow-activity.js |   34 
+ .../main/webapp/app/adapters/yarn-flowrun-brief.js |   32 
+ .../src/main/webapp/app/adapters/yarn-flowrun.js   |   38 
+ .../main/webapp/app/adapters/yarn-jhs-container.js |   33 
+ .../src/main/webapp/app/adapters/yarn-jhs-log.js   |   42 
+ .../webapp/app/adapters/yarn-jhs-redirect-log.js   |   30 
+ .../src/main/webapp/app/adapters/yarn-log.js       |   55 
+ .../src/main/webapp/app/adapters/yarn-metrics.js   |   76 
+ .../src/main/webapp/app/adapters/yarn-nm-gpu.js    |   33 
+ .../src/main/webapp/app/adapters/yarn-node-app.js  |   53 
+ .../webapp/app/adapters/yarn-node-container-log.js |   94 
+ .../webapp/app/adapters/yarn-node-container.js     |   54 
+ .../src/main/webapp/app/adapters/yarn-node.js      |   33 
+ .../app/adapters/yarn-queue/capacity-queue.js      |   23 
+ .../webapp/app/adapters/yarn-queue/fair-queue.js   |   23 
+ .../webapp/app/adapters/yarn-queue/fifo-queue.js   |   23 
+ .../webapp/app/adapters/yarn-queue/yarn-queue.js   |   30 
+ .../main/webapp/app/adapters/yarn-redirect-log.js  |   30 
+ .../src/main/webapp/app/adapters/yarn-rm-log.js    |   76 
+ .../src/main/webapp/app/adapters/yarn-rm-node.js   |   36 
+ .../webapp/app/adapters/yarn-service-component.js  |   36 
+ .../main/webapp/app/adapters/yarn-service-info.js  |   36 
+ .../src/main/webapp/app/adapters/yarn-service.js   |   32 
+ .../main/webapp/app/adapters/yarn-servicedef.js    |   58 
+ .../app/adapters/yarn-timeline-appattempt.js       |   49 
+ .../webapp/app/adapters/yarn-timeline-container.js |   44 
+ .../hadoop-yarn-ui/src/main/webapp/app/app.js      |   38 
+ .../webapp/app/components/app-attempt-table.js     |   22 
+ .../src/main/webapp/app/components/app-table.js    |   22 
+ .../main/webapp/app/components/app-timeout-bar.js  |   60 
+ .../webapp/app/components/app-usage-donut-chart.js |   59 
+ .../src/main/webapp/app/components/bar-chart.js    |  123 
+ .../webapp/app/components/base-chart-component.js  |  148 
+ .../app/components/base-usage-donut-chart.js       |   42 
+ .../main/webapp/app/components/breadcrumb-bar.js   |   32 
+ .../webapp/app/components/collapsible-panel.js     |   64 
+ .../main/webapp/app/components/confirm-dialog.js   |   31 
+ .../main/webapp/app/components/container-table.js  |   22 
+ .../main/webapp/app/components/deploy-service.js   |  179 -
+ .../src/main/webapp/app/components/donut-chart.js  |  209 -
+ .../webapp/app/components/em-table-html-cell.js    |   23 
+ .../app/components/em-table-simple-status-cell.js  |   31 
+ .../webapp/app/components/em-table-tooltip-text.js |   33 
+ .../app/components/fileconfig-viewer-dialog.js     |   36 
+ .../main/webapp/app/components/gpu-donut-chart.js  |   66 
+ .../src/main/webapp/app/components/info-tooltip.js |   44 
+ .../main/webapp/app/components/item-selector.js    |   39 
+ .../main/webapp/app/components/metrics-table.js    |   24 
+ .../main/webapp/app/components/node-menu-panel.js  |   25 
+ .../main/webapp/app/components/nodes-heatmap.js    |  317 -
+ .../per-app-memusage-by-nodes-stacked-barchart.js  |   86 
+ ...er-app-ncontainers-by-nodes-stacked-barchart.js |   65 
+ ...per-app-vcoreusage-by-nodes-stacked-barchart.js |   85 
+ .../app/components/queue-configuration-table.js    |   22 
+ .../main/webapp/app/components/queue-navigator.js  |   42 
+ .../app/components/queue-usage-donut-chart.js      |   67 
+ .../src/main/webapp/app/components/queue-view.js   |  288 -
+ .../app/components/service-component-table.js      |   56 
+ .../webapp/app/components/service-config-table.js  |   89 
+ .../app/components/service-fileconfig-table.js     |  112 
+ .../main/webapp/app/components/simple-bar-chart.js |  206 -
+ .../src/main/webapp/app/components/simple-table.js |   81 
+ .../main/webapp/app/components/stacked-barchart.js |  201 -
+ .../main/webapp/app/components/sunburst-chart.js   |  261 -
+ .../main/webapp/app/components/timeline-view.js    |  546 --
+ .../main/webapp/app/components/tree-selector.js    |  412 -
+ .../main/webapp/app/components/upload-config.js    |   54 
+ .../yarn-queue-partition-capacity-labels.js        |   60 
+ .../hadoop-yarn-ui/src/main/webapp/app/config.js   |   24 
+ .../src/main/webapp/app/constants.js               |   39 
+ .../webapp/app/controllers/app-table-columns.js    |  204 -
+ .../src/main/webapp/app/controllers/application.js |   83 
+ .../webapp/app/controllers/cluster-overview.js     |   32 
+ .../webapp/app/controllers/yarn-app-attempt.js     |   71 
+ .../src/main/webapp/app/controllers/yarn-app.js    |  188 -
+ .../webapp/app/controllers/yarn-app/attempts.js    |   31 
+ .../main/webapp/app/controllers/yarn-app/charts.js |   28 
+ .../webapp/app/controllers/yarn-app/components.js  |   64 
+ .../webapp/app/controllers/yarn-app/configs.js     |   24 
+ .../main/webapp/app/controllers/yarn-app/info.js   |  109 
+ .../main/webapp/app/controllers/yarn-app/logs.js   |  334 -
+ .../webapp/app/controllers/yarn-app/threaddump.js  |  281 -
+ .../src/main/webapp/app/controllers/yarn-apps.js   |   31 
+ .../main/webapp/app/controllers/yarn-apps/apps.js  |   37 
+ .../app/controllers/yarn-component-instance.js     |   58 
+ .../controllers/yarn-component-instance/info.js    |   26 
+ .../app/controllers/yarn-component-instances.js    |   58 
+ .../yarn-component-instances/configs.js            |   25 
+ .../controllers/yarn-component-instances/info.js   |   81 
+ .../webapp/app/controllers/yarn-container-log.js   |   44 
+ .../webapp/app/controllers/yarn-deploy-service.js  |   73 
+ .../webapp/app/controllers/yarn-flow-activity.js   |  125 
+ .../src/main/webapp/app/controllers/yarn-flow.js   |   36 
+ .../main/webapp/app/controllers/yarn-flow/info.js  |   66 
+ .../main/webapp/app/controllers/yarn-flow/runs.js  |  178 -
+ .../main/webapp/app/controllers/yarn-flowrun.js    |   50 
+ .../webapp/app/controllers/yarn-flowrun/info.js    |  162 
+ .../webapp/app/controllers/yarn-flowrun/metrics.js |  131 
+ .../main/webapp/app/controllers/yarn-node-app.js   |   45 
+ .../main/webapp/app/controllers/yarn-node-apps.js  |   45 
+ .../webapp/app/controllers/yarn-node-container.js  |   45 
+ .../webapp/app/controllers/yarn-node-containers.js |   45 
+ .../src/main/webapp/app/controllers/yarn-node.js   |   39 
+ .../webapp/app/controllers/yarn-nodes-heatmap.js   |   36 
+ .../webapp/app/controllers/yarn-nodes-status.js    |   36 
+ .../src/main/webapp/app/controllers/yarn-nodes.js  |   33 
+ .../webapp/app/controllers/yarn-nodes/table.js     |  137 
+ .../src/main/webapp/app/controllers/yarn-queue.js  |   49 
+ .../main/webapp/app/controllers/yarn-queue/apps.js |   34 
+ .../src/main/webapp/app/controllers/yarn-queues.js |   55 
+ .../main/webapp/app/controllers/yarn-services.js   |  115 
+ .../src/main/webapp/app/controllers/yarn-tools.js  |   29 
+ .../webapp/app/controllers/yarn-tools/yarn-conf.js |   60 
+ .../app/controllers/yarn-tools/yarn-rm-log.js      |   24 
+ .../main/webapp/app/helpers/check-availability.js  |   28 
+ .../src/main/webapp/app/helpers/date-formatter.js  |   29 
+ .../src/main/webapp/app/helpers/divide.js          |   31 
+ .../src/main/webapp/app/helpers/json-pretty.js     |   25 
+ .../main/webapp/app/helpers/log-adapter-helper.js  |   30 
+ .../src/main/webapp/app/helpers/log-files-comma.js |   55 
+ .../src/main/webapp/app/helpers/lower.js           |   30 
+ .../src/main/webapp/app/helpers/node-link.js       |   37 
+ .../src/main/webapp/app/helpers/node-menu.js       |   66 
+ .../main/webapp/app/helpers/prepend-protocol.js    |   29 
+ .../hadoop-yarn-ui/src/main/webapp/app/index.html  |   44 
+ .../src/main/webapp/app/initializers/env.js        |   30 
+ .../src/main/webapp/app/initializers/hosts.js      |   28 
+ .../src/main/webapp/app/initializers/jquery.js     |   35 
+ .../src/main/webapp/app/initializers/loader.js     |  307 -
+ .../src/main/webapp/app/mixins/app-attempt.js      |   88 
+ .../src/main/webapp/app/models/cluster-info.js     |   34 
+ .../src/main/webapp/app/models/cluster-metric.js   |  211 -
+ .../main/webapp/app/models/cluster-user-info.js    |   24 
+ .../src/main/webapp/app/models/jhs-health.js       |   28 
+ .../src/main/webapp/app/models/timeline-health.js  |   27 
+ .../src/main/webapp/app/models/yarn-app-attempt.js |  156 
+ .../src/main/webapp/app/models/yarn-app-flowrun.js |   52 
+ .../src/main/webapp/app/models/yarn-app-jhs-log.js |   26 
+ .../webapp/app/models/yarn-app-jhs-redirect-log.js |   26 
+ .../src/main/webapp/app/models/yarn-app-log.js     |   26 
+ .../webapp/app/models/yarn-app-redirect-log.js     |   26 
+ .../main/webapp/app/models/yarn-app-timeline.js    |  104 
+ .../src/main/webapp/app/models/yarn-app.js         |  155 
+ .../webapp/app/models/yarn-component-instance.js   |   69 
+ .../src/main/webapp/app/models/yarn-conf.js        |   25 
+ .../main/webapp/app/models/yarn-container-log.js   |   25 
+ .../src/main/webapp/app/models/yarn-container.js   |   77 
+ .../src/main/webapp/app/models/yarn-entity.js      |   26 
+ .../main/webapp/app/models/yarn-flow-activity.js   |   28 
+ .../main/webapp/app/models/yarn-flowrun-brief.js   |   73 
+ .../src/main/webapp/app/models/yarn-flowrun.js     |   32 
+ .../main/webapp/app/models/yarn-jhs-container.js   |   27 
+ .../src/main/webapp/app/models/yarn-jhs-log.js     |   28 
+ .../webapp/app/models/yarn-jhs-redirect-log.js     |   28 
+ .../src/main/webapp/app/models/yarn-log.js         |   28 
+ .../src/main/webapp/app/models/yarn-metrics.js     |   23 
+ .../src/main/webapp/app/models/yarn-nm-gpu.js      |   27 
+ .../src/main/webapp/app/models/yarn-node-app.js    |   44 
+ .../webapp/app/models/yarn-node-container-log.js   |   23 
+ .../main/webapp/app/models/yarn-node-container.js  |   57 
+ .../src/main/webapp/app/models/yarn-node.js        |   33 
+ .../webapp/app/models/yarn-queue/capacity-queue.js |  124 
+ .../webapp/app/models/yarn-queue/fair-queue.js     |   81 
+ .../webapp/app/models/yarn-queue/fifo-queue.js     |   54 
+ .../webapp/app/models/yarn-queue/yarn-queue.js     |   23 
+ .../main/webapp/app/models/yarn-redirect-log.js    |   28 
+ .../src/main/webapp/app/models/yarn-rm-log.js      |   24 
+ .../src/main/webapp/app/models/yarn-rm-node.js     |  142 
+ .../webapp/app/models/yarn-service-component.js    |   46 
+ .../main/webapp/app/models/yarn-service-info.js    |   57 
+ .../src/main/webapp/app/models/yarn-service.js     |   30 
+ .../src/main/webapp/app/models/yarn-servicedef.js  |  282 -
+ .../webapp/app/models/yarn-timeline-appattempt.js  |  148 
+ .../webapp/app/models/yarn-timeline-container.js   |   78 
+ .../src/main/webapp/app/models/yarn-user.js        |   35 
+ .../hadoop-yarn-ui/src/main/webapp/app/router.js   |  101 
+ .../src/main/webapp/app/routes/abstract.js         |   32 
+ .../src/main/webapp/app/routes/application.js      |   74 
+ .../src/main/webapp/app/routes/cluster-overview.js |   47 
+ .../src/main/webapp/app/routes/index.js            |   29 
+ .../src/main/webapp/app/routes/timeline-error.js   |   32 
+ .../src/main/webapp/app/routes/yarn-app-attempt.js |   51 
+ .../src/main/webapp/app/routes/yarn-app.js         |   62 
+ .../main/webapp/app/routes/yarn-app/attempts.js    |   46 
+ .../src/main/webapp/app/routes/yarn-app/charts.js  |   59 
+ .../main/webapp/app/routes/yarn-app/components.js  |   55 
+ .../src/main/webapp/app/routes/yarn-app/configs.js |   58 
+ .../src/main/webapp/app/routes/yarn-app/info.js    |   54 
+ .../src/main/webapp/app/routes/yarn-app/logs.js    |   73 
+ .../main/webapp/app/routes/yarn-app/threaddump.js  |   68 
+ .../src/main/webapp/app/routes/yarn-apps.js        |   33 
+ .../src/main/webapp/app/routes/yarn-apps/apps.js   |   31 
+ .../webapp/app/routes/yarn-component-instance.js   |   29 
+ .../app/routes/yarn-component-instance/info.js     |   50 
+ .../webapp/app/routes/yarn-component-instances.js  |   29 
+ .../app/routes/yarn-component-instances/configs.js |   44 
+ .../app/routes/yarn-component-instances/info.js    |   53 
+ .../main/webapp/app/routes/yarn-container-log.js   |   65 
+ .../main/webapp/app/routes/yarn-deploy-service.js  |   27 
+ .../main/webapp/app/routes/yarn-flow-activity.js   |   37 
+ .../src/main/webapp/app/routes/yarn-flow.js        |   53 
+ .../src/main/webapp/app/routes/yarn-flow/info.js   |   22 
+ .../src/main/webapp/app/routes/yarn-flow/runs.js   |   22 
+ .../main/webapp/app/routes/yarn-flowrun-metric.js  |  107 
+ .../src/main/webapp/app/routes/yarn-flowrun.js     |   58 
+ .../main/webapp/app/routes/yarn-flowrun/info.js    |   22 
+ .../main/webapp/app/routes/yarn-flowrun/metrics.js |   22 
+ .../src/main/webapp/app/routes/yarn-log-service.js |   66 
+ .../src/main/webapp/app/routes/yarn-node-app.js    |   38 
+ .../src/main/webapp/app/routes/yarn-node-apps.js   |   38 
+ .../main/webapp/app/routes/yarn-node-container.js  |   39 
+ .../main/webapp/app/routes/yarn-node-containers.js |   37 
+ .../src/main/webapp/app/routes/yarn-node.js        |   41 
+ .../webapp/app/routes/yarn-node/yarn-nm-gpu.js     |   22 
+ .../src/main/webapp/app/routes/yarn-nodes.js       |   35 
+ .../main/webapp/app/routes/yarn-nodes/heatmap.js   |   22 
+ .../src/main/webapp/app/routes/yarn-nodes/table.js |   22 
+ .../src/main/webapp/app/routes/yarn-queue.js       |   49 
+ .../src/main/webapp/app/routes/yarn-queue/apps.js  |   22 
+ .../src/main/webapp/app/routes/yarn-queue/info.js  |   22 
+ .../src/main/webapp/app/routes/yarn-queues.js      |   76 
+ .../src/main/webapp/app/routes/yarn-services.js    |   34 
+ .../src/main/webapp/app/routes/yarn-tools.js       |   22 
+ .../main/webapp/app/routes/yarn-tools/yarn-conf.js |   22 
+ .../webapp/app/routes/yarn-tools/yarn-metrics.js   |   43 
+ .../webapp/app/routes/yarn-tools/yarn-rm-log.js    |   36 
+ .../main/webapp/app/serializers/cluster-info.js    |   47 
+ .../main/webapp/app/serializers/cluster-metric.js  |   47 
+ .../webapp/app/serializers/cluster-user-info.js    |   43 
+ .../src/main/webapp/app/serializers/jhs-health.js  |   32 
+ .../main/webapp/app/serializers/timeline-health.js |   31 
+ .../webapp/app/serializers/yarn-app-attempt.js     |   74 
+ .../webapp/app/serializers/yarn-app-flowrun.js     |   64 
+ .../webapp/app/serializers/yarn-app-jhs-log.js     |   39 
+ .../app/serializers/yarn-app-jhs-redirect-log.js   |   36 
+ .../main/webapp/app/serializers/yarn-app-log.js    |   39 
+ .../app/serializers/yarn-app-redirect-log.js       |   36 
+ .../webapp/app/serializers/yarn-app-timeline.js    |   77 
+ .../src/main/webapp/app/serializers/yarn-app.js    |  107 
+ .../app/serializers/yarn-component-instance.js     |   72 
+ .../src/main/webapp/app/serializers/yarn-conf.js   |   43 
+ .../webapp/app/serializers/yarn-container-log.js   |   38 
+ .../main/webapp/app/serializers/yarn-container.js  |   77 
+ .../src/main/webapp/app/serializers/yarn-entity.js |   51 
+ .../webapp/app/serializers/yarn-flow-activity.js   |   54 
+ .../webapp/app/serializers/yarn-flowrun-brief.js   |   71 
+ .../main/webapp/app/serializers/yarn-flowrun.js    |   70 
+ .../webapp/app/serializers/yarn-jhs-container.js   |   62 
+ .../main/webapp/app/serializers/yarn-jhs-log.js    |   57 
+ .../app/serializers/yarn-jhs-redirect-log.js       |   57 
+ .../src/main/webapp/app/serializers/yarn-log.js    |   54 
+ .../main/webapp/app/serializers/yarn-metrics.js    |   33 
+ .../src/main/webapp/app/serializers/yarn-nm-gpu.js |   43 
+ .../main/webapp/app/serializers/yarn-node-app.js   |   63 
+ .../app/serializers/yarn-node-container-log.js     |   50 
+ .../webapp/app/serializers/yarn-node-container.js  |   68 
+ .../src/main/webapp/app/serializers/yarn-node.js   |   54 
+ .../app/serializers/yarn-queue/capacity-queue.js   |  170 
+ .../app/serializers/yarn-queue/fair-queue.js       |   93 
+ .../app/serializers/yarn-queue/fifo-queue.js       |   59 
+ .../app/serializers/yarn-queue/yarn-queue.js       |   47 
+ .../webapp/app/serializers/yarn-redirect-log.js    |   54 
+ .../src/main/webapp/app/serializers/yarn-rm-log.js |   49 
+ .../main/webapp/app/serializers/yarn-rm-node.js    |   73 
+ .../app/serializers/yarn-service-component.js      |   77 
+ .../webapp/app/serializers/yarn-service-info.js    |   87 
+ .../main/webapp/app/serializers/yarn-service.js    |   44 
+ .../app/serializers/yarn-timeline-appattempt.js    |   70 
+ .../app/serializers/yarn-timeline-container.js     |   67 
+ .../src/main/webapp/app/services/env.js            |   59 
+ .../src/main/webapp/app/services/hosts.js          |   95 
+ .../src/main/webapp/app/styles/app.scss            |  775 --
+ .../src/main/webapp/app/styles/colors.scss         |   39 
+ .../src/main/webapp/app/styles/compose-box.scss    |   39 
+ .../src/main/webapp/app/styles/em-table.scss       |  119 
+ .../src/main/webapp/app/styles/layout.scss         |   54 
+ .../src/main/webapp/app/styles/variables.scss      |   43 
+ .../src/main/webapp/app/styles/yarn-app.scss       |   40 
+ .../src/main/webapp/app/styles/yarn-queues.scss    |   29 
+ .../src/main/webapp/app/templates/application.hbs  |  117 
+ .../main/webapp/app/templates/cluster-overview.hbs |  181 -
+ .../app/templates/components/app-attempt-table.hbs |   80 
+ .../webapp/app/templates/components/app-table.hbs  |   86 
+ .../app/templates/components/app-timeout-bar.hbs   |   34 
+ .../app/templates/components/breadcrumb-bar.hbs    |   24 
+ .../app/templates/components/collapsible-panel.hbs |   21 
+ .../app/templates/components/confirm-dialog.hbs    |   37 
+ .../app/templates/components/container-table.hbs   |   78 
+ .../app/templates/components/deploy-service.hbs    |  180 -
+ .../templates/components/em-table-html-cell.hbs    |   23 
+ .../components/em-table-simple-status-cell.hbs     |   27 
+ .../templates/components/em-table-tooltip-text.hbs |   26 
+ .../components/fileconfig-viewer-dialog.hbs        |   53 
+ .../app/templates/components/info-tooltip.hbs      |   20 
+ .../app/templates/components/metrics-table.hbs     |   55 
+ .../app/templates/components/node-menu-panel.hbs   |   50 
+ .../app/templates/components/nodes-heatmap.hbs     |   27 
+ .../app/templates/components/queue-navigator.hbs   |   47 
+ .../components/service-component-table.hbs         |  107 
+ .../templates/components/service-config-table.hbs  |  130 
+ .../components/service-fileconfig-table.hbs        |  152 
+ .../app/templates/components/timeline-view.hbs     |   83 
+ .../app/templates/components/upload-config.hbs     |   44 
+ .../app/templates/components/yarn-nm-gpu-info.hbs  |   69 
+ .../yarn-queue-partition-capacity-labels.hbs       |   74 
+ .../yarn-queue/capacity-queue-conf-table.hbs       |   56 
+ .../components/yarn-queue/capacity-queue-info.hbs  |   53 
+ .../components/yarn-queue/capacity-queue.hbs       |   46 
+ .../yarn-queue/fair-queue-conf-table.hbs           |   52 
+ .../components/yarn-queue/fair-queue-info.hbs      |   66 
+ .../templates/components/yarn-queue/fair-queue.hbs |   77 
+ .../yarn-queue/fifo-queue-conf-table.hbs           |   58 
+ .../components/yarn-queue/fifo-queue-info.hbs      |   47 
+ .../templates/components/yarn-queue/fifo-queue.hbs |   49 
+ .../src/main/webapp/app/templates/error.hbs        |   19 
+ .../src/main/webapp/app/templates/loading.hbs      |   23 
+ .../src/main/webapp/app/templates/notauth.hbs      |   20 
+ .../src/main/webapp/app/templates/notfound.hbs     |   20 
+ .../main/webapp/app/templates/timeline-error.hbs   |   22 
+ .../main/webapp/app/templates/yarn-app-attempt.hbs |  117 
+ .../src/main/webapp/app/templates/yarn-app.hbs     |  195 -
+ .../webapp/app/templates/yarn-app/attempts.hbs     |   44 
+ .../main/webapp/app/templates/yarn-app/charts.hbs  |   49 
+ .../webapp/app/templates/yarn-app/components.hbs   |   21 
+ .../main/webapp/app/templates/yarn-app/configs.hbs |   51 
+ .../main/webapp/app/templates/yarn-app/info.hbs    |  150 
+ .../main/webapp/app/templates/yarn-app/loading.hbs |   23 
+ .../main/webapp/app/templates/yarn-app/logs.hbs    |  154 
+ .../webapp/app/templates/yarn-app/threaddump.hbs   |  113 
+ .../src/main/webapp/app/templates/yarn-apps.hbs    |   25 
+ .../main/webapp/app/templates/yarn-apps/apps.hbs   |   29 
+ .../webapp/app/templates/yarn-apps/loading.hbs     |   23 
+ .../app/templates/yarn-component-instance.hbs      |   25 
+ .../app/templates/yarn-component-instance/info.hbs |   85 
+ .../app/templates/yarn-component-instances.hbs     |   39 
+ .../templates/yarn-component-instances/configs.hbs |   53 
+ .../templates/yarn-component-instances/info.hbs    |   28 
+ .../templates/yarn-component-instances/loading.hbs |   23 
+ .../webapp/app/templates/yarn-container-log.hbs    |   38 
+ .../webapp/app/templates/yarn-deploy-service.hbs   |   33 
+ .../webapp/app/templates/yarn-flow-activity.hbs    |   45 
+ .../src/main/webapp/app/templates/yarn-flow.hbs    |   49 
+ .../main/webapp/app/templates/yarn-flow/info.hbs   |   53 
+ .../main/webapp/app/templates/yarn-flow/runs.hbs   |  131 
+ .../webapp/app/templates/yarn-flowrun-metric.hbs   |   34 
+ .../src/main/webapp/app/templates/yarn-flowrun.hbs |   49 
+ .../webapp/app/templates/yarn-flowrun/info.hbs     |  128 
+ .../webapp/app/templates/yarn-flowrun/metrics.hbs  |   34 
+ .../main/webapp/app/templates/yarn-log-service.hbs |   37 
+ .../main/webapp/app/templates/yarn-node-app.hbs    |   62 
+ .../main/webapp/app/templates/yarn-node-apps.hbs   |   53 
+ .../webapp/app/templates/yarn-node-container.hbs   |   72 
+ .../webapp/app/templates/yarn-node-containers.hbs  |   60 
+ .../src/main/webapp/app/templates/yarn-node.hbs    |   25 
+ .../main/webapp/app/templates/yarn-node/info.hbs   |  150 
+ .../webapp/app/templates/yarn-node/yarn-nm-gpu.hbs |   55 
+ .../src/main/webapp/app/templates/yarn-nodes.hbs   |   49 
+ .../webapp/app/templates/yarn-nodes/heatmap.hbs    |   26 
+ .../webapp/app/templates/yarn-nodes/status.hbs     |   35 
+ .../main/webapp/app/templates/yarn-nodes/table.hbs |   28 
+ .../src/main/webapp/app/templates/yarn-queue.hbs   |   89 
+ .../main/webapp/app/templates/yarn-queue/apps.hbs  |   84 
+ .../main/webapp/app/templates/yarn-queue/info.hbs  |   26 
+ .../src/main/webapp/app/templates/yarn-queues.hbs  |   32 
+ .../main/webapp/app/templates/yarn-services.hbs    |   29 
+ .../src/main/webapp/app/templates/yarn-tools.hbs   |  108 
+ .../webapp/app/templates/yarn-tools/yarn-conf.hbs  |   28 
+ .../app/templates/yarn-tools/yarn-metrics.hbs      |   33 
+ .../app/templates/yarn-tools/yarn-rm-log.hbs       |   42 
+ .../src/main/webapp/app/utils/color-utils.js       |   64 
+ .../src/main/webapp/app/utils/converter.js         |  235 -
+ .../src/main/webapp/app/utils/date-utils.js        |   33 
+ .../src/main/webapp/app/utils/error-utils.js       |   61 
+ .../main/webapp/app/utils/href-address-utils.js    |   27 
+ .../src/main/webapp/app/utils/info-seeder.js       |   28 
+ .../src/main/webapp/app/utils/mock.js              |   36 
+ .../src/main/webapp/app/utils/sorter.js            |   73 
+ .../src/main/webapp/bower-shrinkwrap.json          |   69 
+ .../hadoop-yarn-ui/src/main/webapp/bower.json      |   29 
+ .../src/main/webapp/config/configs.env             |   54 
+ .../src/main/webapp/config/default-config.js       |   40 
+ .../src/main/webapp/config/environment.js          |   73 
+ .../src/main/webapp/ember-cli-build.js             |   75 
+ .../hadoop-yarn-ui/src/main/webapp/jsconfig.json   |   14 
+ .../hadoop-yarn-ui/src/main/webapp/package.json    |   66 
+ .../assets/images/datatables/Sorting icons.psd     |  Bin
+ .../public/assets/images/datatables/favicon.ico    |  Bin
+ .../public/assets/images/datatables/sort_asc.png   |  Bin
+ .../assets/images/datatables/sort_asc_disabled.png |  Bin
+ .../public/assets/images/datatables/sort_both.png  |  Bin
+ .../public/assets/images/datatables/sort_desc.png  |  Bin
+ .../images/datatables/sort_desc_disabled.png       |  Bin
+ .../webapp/public/assets/images/hadoop_logo.png    |  Bin
+ .../main/webapp/public/assets/images/spinner.gif   |  Bin
+ .../src/main/webapp/public/crossdomain.xml         |   39 
+ .../hadoop-yarn-ui/src/main/webapp/testem.json     |   12 
+ .../src/main/webapp/tests/helpers/resolver.js      |   29 
+ .../src/main/webapp/tests/helpers/start-app.js     |   36 
+ .../src/main/webapp/tests/index.html               |   52 
+ .../integration/components/app-timeout-bar-test.js |   34 
+ .../integration/components/breadcrumb-bar-test.js  |   50 
+ .../components/collapsible-panel-test.js           |   43 
+ .../integration/components/confirm-dialog-test.js  |   43 
+ .../integration/components/deploy-service-test.js  |   43 
+ .../components/em-table-html-cell-test.js          |   43 
+ .../components/em-table-simple-status-cell-test.js |   43 
+ .../components/em-table-tooltip-text-test.js       |   43 
+ .../components/fileconfig-viewer-dialog-test.js    |   43 
+ .../integration/components/info-tooltip-test.js    |   43 
+ .../integration/components/metrics-table-test.js   |   43 
+ .../components/service-component-table-test.js     |   43 
+ .../components/service-config-table-test.js        |   43 
+ .../components/service-fileconfig-table-test.js    |   43 
+ .../components/simple-bar-chart-test.js            |   43 
+ .../integration/components/upload-config-test.js   |   43 
+ .../yarn-queue-partition-capacity-labels-test.js   |   43 
+ .../src/main/webapp/tests/test-helper.js           |   24 
+ .../tests/unit/adapters/yarn-app-attempt-test.js   |   59 
+ .../tests/unit/adapters/yarn-app-log-test.js       |   30 
+ .../webapp/tests/unit/adapters/yarn-app-test.js    |   58 
+ .../tests/unit/adapters/yarn-app-timeline-test.js  |   30 
+ .../unit/adapters/yarn-component-instance-test.js  |   30 
+ .../webapp/tests/unit/adapters/yarn-conf-test.js   |   29 
+ .../tests/unit/adapters/yarn-container-log-test.js |   83 
+ .../tests/unit/adapters/yarn-container-test.js     |   38 
+ .../webapp/tests/unit/adapters/yarn-log-test.js    |   30 
+ .../tests/unit/adapters/yarn-metrics-test.js       |   30 
+ .../tests/unit/adapters/yarn-node-app-test.js      |  107 
+ .../unit/adapters/yarn-node-container-test.js      |  109 
+ .../webapp/tests/unit/adapters/yarn-node-test.js   |   49 
+ .../webapp/tests/unit/adapters/yarn-rm-log-test.js |   30 
+ .../tests/unit/adapters/yarn-rm-node-test.js       |   49 
+ .../unit/adapters/yarn-service-component-test.js   |   30 
+ .../tests/unit/adapters/yarn-service-info-test.js  |   30 
+ .../tests/unit/adapters/yarn-servicedef-test.js    |   30 
+ .../unit/adapters/yarn-timeline-appattempt-test.js |   30 
+ .../unit/adapters/yarn-timeline-container-test.js  |   30 
+ .../unit/controllers/app-table-columns-test.js     |   30 
+ .../unit/controllers/yarn-app-attempt-test.js      |   30 
+ .../webapp/tests/unit/controllers/yarn-app-test.js |   35 
+ .../unit/controllers/yarn-app/attempts-test.js     |   30 
+ .../tests/unit/controllers/yarn-app/charts-test.js |   30 
+ .../unit/controllers/yarn-app/components-test.js   |   30 
+ .../unit/controllers/yarn-app/configs-test.js      |   30 
+ .../tests/unit/controllers/yarn-app/info-test.js   |   30 
+ .../tests/unit/controllers/yarn-app/logs-test.js   |   30 
+ .../tests/unit/controllers/yarn-apps-test.js       |   30 
+ .../tests/unit/controllers/yarn-apps/apps-test.js  |   30 
+ .../controllers/yarn-component-instance-test.js    |   30 
+ .../yarn-component-instance/info-test.js           |   30 
+ .../controllers/yarn-component-instances-test.js   |   30 
+ .../yarn-component-instances/configs-test.js       |   30 
+ .../yarn-component-instances/info-test.js          |   30 
+ .../tests/unit/controllers/yarn-conf-test.js       |   29 
+ .../unit/controllers/yarn-container-log-test.js    |   30 
+ .../unit/controllers/yarn-deploy-service-test.js   |   30 
+ .../tests/unit/controllers/yarn-flow/info-test.js  |   30 
+ .../tests/unit/controllers/yarn-flow/runs-test.js  |   30 
+ .../unit/controllers/yarn-flowrun/info-test.js     |   30 
+ .../unit/controllers/yarn-flowrun/metrics-test.js  |   30 
+ .../tests/unit/controllers/yarn-node-app-test.js   |   30 
+ .../tests/unit/controllers/yarn-node-apps-test.js  |   30 
+ .../unit/controllers/yarn-node-container-test.js   |   30 
+ .../unit/controllers/yarn-node-containers-test.js  |   30 
+ .../tests/unit/controllers/yarn-node-test.js       |   30 
+ .../unit/controllers/yarn-nodes-heatmap-test.js    |   30 
+ .../tests/unit/controllers/yarn-nodes-test.js      |   30 
+ .../unit/controllers/yarn-nodes/table-test.js      |   30 
+ .../tests/unit/controllers/yarn-queue/apps-test.js |   30 
+ .../tests/unit/controllers/yarn-queues-test.js     |   30 
+ .../tests/unit/controllers/yarn-rm-log-test.js     |   30 
+ .../tests/unit/controllers/yarn-services-test.js   |   30 
+ .../tests/unit/controllers/yarn-tools-test.js      |   30 
+ .../tests/unit/helpers/check-availability-test.js  |   28 
+ .../tests/unit/helpers/date-formatter-test.js      |   28 
+ .../webapp/tests/unit/helpers/json-pretty-test.js  |   28 
+ .../main/webapp/tests/unit/helpers/lower-test.js   |   28 
+ .../tests/unit/helpers/prepend-protocol-test.js    |   28 
+ .../webapp/tests/unit/initializers/env-test.js     |   40 
+ .../webapp/tests/unit/initializers/hosts-test.js   |   40 
+ .../webapp/tests/unit/initializers/loader-test.js  |   40 
+ .../webapp/tests/unit/mixins/app-attempt-test.js   |   30 
+ .../webapp/tests/unit/models/cluster-info-test.js  |   37 
+ .../tests/unit/models/cluster-metric-test.js       |   81 
+ .../tests/unit/models/yarn-app-attempt-test.js     |   65 
+ .../main/webapp/tests/unit/models/yarn-app-test.js |   83 
+ .../tests/unit/models/yarn-app-timeline-test.js    |   30 
+ .../unit/models/yarn-component-instance-test.js    |   30 
+ .../webapp/tests/unit/models/yarn-conf-test.js     |   29 
+ .../tests/unit/models/yarn-container-log-test.js   |   31 
+ .../tests/unit/models/yarn-container-test.js       |   49 
+ .../main/webapp/tests/unit/models/yarn-log-test.js |   30 
+ .../webapp/tests/unit/models/yarn-metrics-test.js  |   30 
+ .../webapp/tests/unit/models/yarn-node-app-test.js |   54 
+ .../tests/unit/models/yarn-node-container-test.js  |   65 
+ .../webapp/tests/unit/models/yarn-node-test.js     |   41 
+ .../webapp/tests/unit/models/yarn-queue-test.js    |  122 
+ .../webapp/tests/unit/models/yarn-rm-log-test.js   |   30 
+ .../webapp/tests/unit/models/yarn-rm-node-test.js  |   84 
+ .../unit/models/yarn-service-component-test.js     |   30 
+ .../tests/unit/models/yarn-service-info-test.js    |   30 
+ .../tests/unit/models/yarn-servicedef-test.js      |   30 
+ .../unit/models/yarn-timeline-appattempt-test.js   |   30 
+ .../unit/models/yarn-timeline-container-test.js    |   30 
+ .../webapp/tests/unit/models/yarn-user-test.js     |   32 
+ .../tests/unit/routes/cluster-overview-test.js     |  143 
+ .../tests/unit/routes/timeline-error-test.js       |   29 
+ .../tests/unit/routes/yarn-app-attempt-test.js     |   30 
+ .../main/webapp/tests/unit/routes/yarn-app-test.js |  152 
+ .../tests/unit/routes/yarn-app/attempts-test.js    |   29 
+ .../tests/unit/routes/yarn-app/charts-test.js      |   29 
+ .../tests/unit/routes/yarn-app/components-test.js  |   29 
+ .../tests/unit/routes/yarn-app/configs-test.js     |   29 
+ .../webapp/tests/unit/routes/yarn-app/info-test.js |   29 
+ .../webapp/tests/unit/routes/yarn-app/logs-test.js |   29 
+ .../webapp/tests/unit/routes/yarn-apps-test.js     |  136 
+ .../unit/routes/yarn-component-instance-test.js    |   29 
+ .../routes/yarn-component-instance/info-test.js    |   29 
+ .../unit/routes/yarn-component-instances-test.js   |   29 
+ .../yarn-component-instances/configs-test.js       |   29 
+ .../routes/yarn-component-instances/info-test.js   |   29 
+ .../webapp/tests/unit/routes/yarn-conf-test.js     |   28 
+ .../tests/unit/routes/yarn-container-log-test.js   |  116 
+ .../tests/unit/routes/yarn-deploy-service-test.js  |   29 
+ .../tests/unit/routes/yarn-flow/info-test.js       |   29 
+ .../tests/unit/routes/yarn-flow/runs-test.js       |   29 
+ .../tests/unit/routes/yarn-flowrun/info-test.js    |   29 
+ .../tests/unit/routes/yarn-flowrun/metrics-test.js |   29 
+ .../webapp/tests/unit/routes/yarn-metrics-test.js  |   28 
+ .../webapp/tests/unit/routes/yarn-node-app-test.js |   56 
+ .../tests/unit/routes/yarn-node-apps-test.js       |   60 
+ .../tests/unit/routes/yarn-node-container-test.js  |   61 
+ .../tests/unit/routes/yarn-node-containers-test.js |   68 
+ .../webapp/tests/unit/routes/yarn-node-test.js     |   87 
+ .../webapp/tests/unit/routes/yarn-nodes-test.js    |   75 
+ .../tests/unit/routes/yarn-queue/apps-test.js      |   29 
+ .../tests/unit/routes/yarn-queue/info-test.js      |   29 
+ .../webapp/tests/unit/routes/yarn-queues-test.js   |  309 -
+ .../webapp/tests/unit/routes/yarn-rm-log-test.js   |   28 
+ .../webapp/tests/unit/routes/yarn-services-test.js |   29 
+ .../webapp/tests/unit/routes/yarn-tools-test.js    |   28 
+ .../tests/unit/serializers/cluster-info-test.js    |   70 
+ .../tests/unit/serializers/cluster-metric-test.js  |   90 
+ .../unit/serializers/yarn-app-attempt-test.js      |  101 
+ .../webapp/tests/unit/serializers/yarn-app-test.js |   77 
+ .../unit/serializers/yarn-app-timeline-test.js     |   33 
+ .../serializers/yarn-component-instance-test.js    |   33 
+ .../tests/unit/serializers/yarn-conf-test.js       |   32 
+ .../unit/serializers/yarn-container-log-test.js    |   49 
+ .../tests/unit/serializers/yarn-container-test.js  |   30 
+ .../webapp/tests/unit/serializers/yarn-log-test.js |   33 
+ .../tests/unit/serializers/yarn-metrics-test.js    |   33 
+ .../tests/unit/serializers/yarn-node-app-test.js   |   99 
+ .../unit/serializers/yarn-node-container-test.js   |  125 
+ .../tests/unit/serializers/yarn-node-test.js       |   69 
+ .../tests/unit/serializers/yarn-rm-log-test.js     |   33 
+ .../tests/unit/serializers/yarn-rm-node-test.js    |  149 
+ .../serializers/yarn-service-component-test.js     |   33 
+ .../unit/serializers/yarn-service-info-test.js     |   33 
+ .../serializers/yarn-timeline-appattempt-test.js   |   33 
+ .../serializers/yarn-timeline-container-test.js    |   33 
+ .../main/webapp/tests/unit/services/env-test.js    |   30 
+ .../main/webapp/tests/unit/services/hosts-test.js  |   30 
+ .../main/webapp/tests/unit/utils/converter-test.js |   52 
+ .../main/webapp/tests/unit/utils/sorter-test.js    |   26 
+ .../hadoop-yarn-ui/src/main/webapp/yarn.lock       | 7093 --------------------
+ hadoop-yarn-project/hadoop-yarn/pom.xml            |    1 
+ 598 files changed, 41382 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/web.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-user-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/jhs-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/restabstract.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/timeline-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-component-instance.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-threaddump.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-nm-gpu.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-component.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/breadcrumb-bar.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/collapsible-panel.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/confirm-dialog.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/container-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/deploy-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-simple-status-cell.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-tooltip-text.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/fileconfig-viewer-dialog.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/gpu-donut-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/info-tooltip.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/item-selector.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/metrics-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/node-menu-panel.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-vcoreusage-by-nodes-stacked-barchart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-configuration-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-navigator.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-config-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-fileconfig-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/upload-config.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/constants.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/cluster-overview.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/configs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/threaddump.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/configs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-deploy-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-status.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/check-availability.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/date-formatter.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/json-pretty.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-adapter-helper.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/lower.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/index.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/env.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/hosts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/jquery.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-user-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/jhs-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/timeline-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-nm-gpu.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-component.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/abstract.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/components.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/configs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/threaddump.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/configs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-deploy-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-log-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node/yarn-nm-gpu.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/heatmap.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/table.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-metric.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-user-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/jhs-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/timeline-health.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-metrics.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-nm-gpu.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-redirect-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-component.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-info.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/env.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/colors.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/em-table.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/variables.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-app.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-queues.scss
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/breadcrumb-bar.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/collapsible-panel.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/confirm-dialog.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/deploy-service.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-simple-status-cell.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-tooltip-text.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/fileconfig-viewer-dialog.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/info-tooltip.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-config-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-fileconfig-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/upload-config.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-nm-gpu-info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/error.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notauth.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notfound.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/threaddump.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/configs.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/loading.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-deploy-service.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-log-service.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/yarn-nm-gpu.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/status.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-metrics.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/info-seeder.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/Sorting icons.psd
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/favicon.ico
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc_disabled.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_both.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc_disabled.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/resolver.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/start-app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/index.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/breadcrumb-bar-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/collapsible-panel-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/confirm-dialog-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/deploy-service-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-tooltip-text-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/fileconfig-viewer-dialog-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/info-tooltip-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/metrics-table-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-component-table-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-config-table-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-fileconfig-table-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/upload-config-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/yarn-queue-partition-capacity-labels-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/test-helper.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-component-instance-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-conf-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-component-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-servicedef-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/components-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/configs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/logs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/configs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-conf-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-container-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-deploy-service-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-containers-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-heatmap-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queues-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-rm-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-services-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-tools-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/check-availability-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/date-formatter-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/json-pretty-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/lower-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/env-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/hosts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-metric-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-component-instance-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-conf-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-queue-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-component-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-servicedef-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-user-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/cluster-overview-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/components-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/configs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/logs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/configs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-conf-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-deploy-service-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queues-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-rm-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-tools-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-metric-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-attempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-component-instance-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-conf-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-metrics-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-app-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-log-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-node-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-component-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-info-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/env-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/hosts-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/converter-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/sorter-test.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 71031593c3c..9230f0c7a75 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -203,13 +203,6 @@
+     <fileSet>
+       <directory>${project.build.directory}/site</directory>
+       <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+-    </fileSet>
+-      <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-ui/target/hadoop-yarn-ui-${project.version}</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/webapps/ui2</outputDirectory>
+-      <includes>
+-        <include>**/*</include>
+-      </includes>
+     </fileSet>
+     <!-- Copy dependecies from hadoop-yarn-server-timelineservice as well -->
+     <fileSet>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
+deleted file mode 100644
+index 0ee58985ffc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
++++ /dev/null
+@@ -1,89 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-# YARN UI
+-
+-The YARN UI is an Ember based web-app that provides visualization of the applications running on the Apache Hadoop YARN framework.
+-
+-## Configurations
+-
+-You can point the UI to custom locations by setting the environment variables in `src/main/webapp/config/configs.env`.
+-
+-In order to make the UI running on Ember server (started by `yarn start`)
+-work with independently running ResourceManager,
+-you need to enable CORS by setting `hadoop.http.cross-origin.enabled` to true
+-and adding `org.apache.hadoop.security.HttpCrossOriginFilterInitializer`
+-to `hadoop.http.filter.initializers` in core-site.xml of the ResourceManager.
+-
+-## Development
+-
+-All the following commands must be run inside `src/main/webapp`.
+-
+-### Prerequisites
+-
+-You will need the following things properly installed on your computer.
+-
+-* Install [Yarn](https://yarnpkg.com) v1.21.1
+-* Install [Bower](http://bower.io/) v1.8.8
+-* Install all dependencies by running `yarn install` & `bower install`
+-
+-### Running UI
+-
+-* `yarn start`
+-* Visit your app at [http://localhost:4200](http://localhost:4200).
+-
+-### Building
+-
+-* `yarn run build` (production)
+-* Files would be stored in "dist/"
+-
+-### Adding new dependencies
+-
+-**Warning: Do not edit the _package.json_ or _bower.json_ files manually. This could make them out-of-sync with the respective lock or shrinkwrap files.**
+-
+-YARN UI has replaced NPM with Yarn package manager. And hence Yarn would be used to manage dependencies defined in package.json.
+-
+-* Please use the Yarn and Bower command-line tools to add new dependencies. And the tool version must be same as those defined in Prerequisites section.
+-* Once any dependency is added:
+-  *  If it's in package.json. Make sure that the respective, and only those changes are reflected in yarn.lock file.
+-  *  If it's in bower.json. Make sure that the respective, and only those changes are reflected in bower-shrinkwrap.json file.
+-* Commands to add using CLI tools:
+-  * Yarn: yarn add [package-name]
+-  * Bower: bower install --save [package-name]
+-
+-### Adding new routes (pages), controllers, components etc.
+-
+-* Use ember-cli blueprint generator - [Ember CLI](http://ember-cli.com/extending/#generators-and-blueprints)
+-
+-### Building with Maven
+-
+-[YARN-6278](https://issues.apache.org/jira/browse/YARN-6278)
+-added `yarn-ui` profile to pom.xml leveraging
+-[frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) which
+-automatically installs Node.js and Yarn locally under target/webapp directory.
+-After building yarn-ui by `mvn package -Pyarn-ui`, you can reuse
+-the locally installed Node.js and Yarn instead of manually installing them.
+-
+-```
+-$ mvn package -Pyarn-ui
+-$ export PATH=$PWD/target/webapp/node:$PATH
+-$ export YARNJS=$PWD/target/webapp/node/yarn/dist/bin/yarn.js
+-$ cd src/main/webapp/
+-$ node $YARNJS install
+-$ node node_modules/.bin/bower install
+-$ node $YARNJS start
+-```
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+deleted file mode 100644
+index afa66e1b5ba..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
++++ /dev/null
+@@ -1,332 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-ui</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN UI</name>
+-  <packaging>${packagingType}</packaging>
+-
+-  <properties>
+-    <packagingType>pom</packagingType>
+-    <webappDir>${basedir}/target/webapp</webappDir>
+-    <nodeExecutable>${basedir}/target/webapp/node/node</nodeExecutable>
+-    <packageManagerScript>node/yarn/dist/bin/yarn.js</packageManagerScript>
+-    <keepUIBuildCache>false</keepUIBuildCache>
+-  </properties>
+-
+-  <build>
+-    <plugins>
+-      <!-- Pkck the appropriate ember build script to use in src/package.json based on the OS -->
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-antrun-plugin</artifactId>
+-        <version>1.8</version>
+-        <executions>
+-          <execution>
+-            <phase>validate</phase>
+-            <goals>
+-              <goal>run</goal>
+-            </goals>
+-            <configuration>
+-              <exportAntProperties>true</exportAntProperties>
+-              <target>
+-                <!-- Set the Maven property emberBuildScript to build:mvn:windows if this is
+-                 running on Windows. Set it to build:mvn otherwise. -->
+-                <condition property="emberBuildScript" value="build:mvn:windows" else="build:mvn">
+-                  <and>
+-                    <os family="windows"/>
+-                  </and>
+-                </condition>
+-                <echo>Ember build script to use = ${emberBuildScript}</echo>
+-              </target>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-
+-      <!-- Apache RAT -->
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/main/webapp/jsconfig.json</exclude>
+-            <exclude>src/main/webapp/bower.json</exclude>
+-            <exclude>src/main/webapp/bower-shrinkwrap.json</exclude>
+-            <exclude>src/main/webapp/package.json</exclude>
+-            <exclude>src/main/webapp/yarn.lock</exclude>
+-            <exclude>src/main/webapp/testem.json</exclude>
+-            <exclude>src/main/webapp/public/assets/images/**/*</exclude>
+-            <exclude>src/main/webapp/public/assets/images/*</exclude>
+-            <exclude>src/main/webapp/public/robots.txt</exclude>
+-            <exclude>public/crossdomain.xml</exclude>
+-            <exclude>src/main/webapp/.bowerrc</exclude>
+-            <exclude>src/main/webapp/.ember-cli</exclude>
+-            <exclude>src/main/webapp/.jshintrc</exclude>
+-            <exclude>src/main/webapp/.watchmanconfig</exclude>
+-            <exclude>src/main/webapp/WEB-INF/wro.xml</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-
+-      <plugin>
+-        <artifactId>maven-clean-plugin</artifactId>
+-        <configuration>
+-          <skip>${keepUIBuildCache}</skip>
+-          <followSymLinks>false</followSymLinks>
+-          <filesets>
+-            <fileset>
+-              <directory>${webappDir}/bower_components</directory>
+-            </fileset>
+-            <fileset>
+-              <directory>${webappDir}/node_modules</directory>
+-            </fileset>
+-          </filesets>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>yarn-ui</id>
+-
+-      <activation>
+-        <activeByDefault>false</activeByDefault>
+-      </activation>
+-
+-      <properties>
+-        <packagingType>war</packagingType>
+-      </properties>
+-
+-      <build>
+-        <plugins>
+-          <!-- Copy files into target for build -->
+-          <plugin>
+-            <artifactId>maven-resources-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <id>copy-resources</id>
+-                <!-- here the phase you need -->
+-                <phase>validate</phase>
+-                <goals>
+-                  <goal>copy-resources</goal>
+-                </goals>
+-                <configuration>
+-                  <outputDirectory>${webappDir}</outputDirectory>
+-                  <resources>
+-                    <resource>
+-                      <directory>${basedir}/src/main/webapp</directory>
+-                      <filtering>true</filtering>
+-                      <excludes>
+-                        <exclude>node_modules/**/*</exclude>
+-                        <exclude>bower_components/**/*</exclude>
+-                        <exclude>tmp/**/*</exclude>
+-                        <exclude>dist/**/*</exclude>
+-                        <exclude>terminal/**/*</exclude>
+-                      </excludes>
+-                    </resource>
+-                  </resources>
+-                </configuration>
+-              </execution>
+-              <execution>
+-                <id>copy-terminal</id>
+-                <!-- here the phase you need -->
+-                <phase>compile</phase>
+-                <goals>
+-                  <goal>copy-resources</goal>
+-                </goals>
+-                <configuration>
+-                  <outputDirectory>${webappDir}/dist</outputDirectory>
+-                  <resources>
+-                    <resource>
+-                      <directory>${basedir}/src/main/webapp</directory>
+-                      <filtering>true</filtering>
+-                      <includes>
+-                        <include>terminal/**/*</include>
+-                      </includes>
+-                    </resource>
+-                  </resources>
+-                </configuration>
+-              </execution>
+-              <execution>
+-                <id>copy-xterm</id>
+-                <!-- here the phase you need -->
+-                <phase>compile</phase>
+-                <goals>
+-                  <goal>copy-resources</goal>
+-                </goals>
+-                <configuration>
+-                  <outputDirectory>${webappDir}/dist/terminal/xterm</outputDirectory>
+-                  <resources>
+-                    <resource>
+-                      <directory>${basedir}/target/webapp/node_modules/xterm</directory>
+-                      <filtering>true</filtering>
+-                      <includes>
+-                        <include>dist/**/*</include>
+-                      </includes>
+-                    </resource>
+-                  </resources>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-
+-          <!-- Install Node, Yarn, Bower & dependencies -->
+-          <plugin>
+-            <groupId>com.github.eirslett</groupId>
+-            <artifactId>frontend-maven-plugin</artifactId>
+-            <version>${frontend-maven-plugin.version}</version>
+-            <configuration>
+-              <workingDirectory>${webappDir}</workingDirectory>
+-            </configuration>
+-            <executions>
+-
+-              <!-- Install all dependencies -->
+-              <execution>
+-                <phase>generate-resources</phase>
+-                <id>install node and yarn</id>
+-                <goals>
+-                  <goal>install-node-and-yarn</goal>
+-                </goals>
+-                <configuration>
+-                  <nodeVersion>${nodejs.version}</nodeVersion>
+-                  <yarnVersion>${yarnpkg.version}</yarnVersion>
+-                </configuration>
+-              </execution>
+-              <execution>
+-                <phase>generate-resources</phase>
+-                <id>yarn install</id>
+-                <goals>
+-                  <goal>yarn</goal>
+-                </goals>
+-                <configuration>
+-                  <arguments>install</arguments>
+-                </configuration>
+-              </execution>
+-              <execution>
+-                <phase>generate-resources</phase>
+-                <id>bower install</id>
+-                <configuration>
+-                  <arguments>install --allow-root</arguments>
+-                </configuration>
+-                <goals>
+-                  <goal>bower</goal>
+-                </goals>
+-              </execution>
+-            </executions>
+-          </plugin>
+-
+-          <plugin>
+-            <groupId>org.codehaus.mojo</groupId>
+-            <artifactId>exec-maven-plugin</artifactId>
+-            <executions>
+-
+-              <!-- Ember Build -->
+-              <execution>
+-                <id>ember build</id>
+-                <phase>generate-resources</phase>
+-                <goals>
+-                  <goal>exec</goal>
+-                </goals>
+-                <configuration>
+-                  <workingDirectory>${webappDir}</workingDirectory>
+-                  <executable>${nodeExecutable}</executable>
+-                  <arguments>
+-                    <argument>${packageManagerScript}</argument>
+-                    <argument>run</argument>
+-                    <argument>${emberBuildScript}</argument>
+-                  </arguments>
+-                </configuration>
+-              </execution>
+-
+-            </executions>
+-          </plugin>
+-
+-          <!-- Asset minifier -->
+-          <plugin>
+-            <groupId>ro.isdc.wro4j</groupId>
+-            <artifactId>wro4j-maven-plugin</artifactId>
+-            <version>1.7.9</version>
+-            <dependencies>
+-              <!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
+-              <dependency>
+-                <groupId>org.mockito</groupId>
+-                <artifactId>mockito-core</artifactId>
+-                <version>2.18.0</version>
+-              </dependency>
+-            </dependencies>
+-            <executions>
+-              <execution>
+-                <phase>prepare-package</phase>
+-                <goals>
+-                  <goal>run</goal>
+-                </goals>
+-              </execution>
+-            </executions>
+-            <configuration>
+-              <minimize>true</minimize>
+-              <targetGroups>yarn-ui,vendor</targetGroups>
+-              <destinationFolder>${basedir}/target/minified-resources/assets</destinationFolder>
+-              <contextFolder>${webappDir}/dist/assets</contextFolder>
+-              <wroFile>${webappDir}/WEB-INF/wro.xml</wroFile>
+-            </configuration>
+-          </plugin>
+-
+-          <!-- Package into war -->
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-war-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <phase>package</phase>
+-              </execution>
+-            </executions>
+-            <configuration>
+-              <webXml>${webappDir}/WEB-INF/web.xml</webXml>
+-              <warSourceDirectory>${webappDir}/dist</warSourceDirectory>
+-              <webResources>
+-                <resource>
+-                  <filtering>false</filtering>
+-                  <directory>${basedir}/target/minified-resources</directory>
+-                </resource>
+-              </webResources>
+-            </configuration>
+-          </plugin>
+-
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-jar-plugin</artifactId>
+-            <configuration>
+-              <skipIfEmpty>true</skipIfEmpty>
+-            </configuration>
+-          </plugin>
+-
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
+deleted file mode 100644
+index daf4462c44a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
++++ /dev/null
+@@ -1,5 +0,0 @@
+-{
+-  "directory": "bower_components",
+-  "analytics": false,
+-  "registry": "https://registry.bower.io"
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
+deleted file mode 100644
+index ee64cfed2a8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
++++ /dev/null
+@@ -1,9 +0,0 @@
+-{
+-  /**
+-    Ember CLI sends analytics information by default. The data is completely
+-    anonymous, but there are times when you might want to disable this behavior.
+-
+-    Setting `disableAnalytics` to true will prevent any data from being sent.
+-  */
+-  "disableAnalytics": false
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
+deleted file mode 100644
+index 082fb271f64..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
++++ /dev/null
+@@ -1,5 +0,0 @@
+-tmp/
+-node_modules/
+-bower_components/
+-dist/
+-node/
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
+deleted file mode 100644
+index 63cfe40a368..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
++++ /dev/null
+@@ -1,35 +0,0 @@
+-{
+-  "predef": [
+-    "document",
+-    "window",
+-    "-Promise",
+-    "d3",
+-    "$",
+-    "moment"
+-  ],
+-  "browser": true,
+-  "boss": true,
+-  "curly": true,
+-  "debug": false,
+-  "devel": true,
+-  "eqeqeq": true,
+-  "evil": true,
+-  "forin": false,
+-  "immed": false,
+-  "laxbreak": false,
+-  "newcap": true,
+-  "noarg": true,
+-  "noempty": false,
+-  "nonew": false,
+-  "nomen": false,
+-  "onevar": false,
+-  "plusplus": false,
+-  "regexp": false,
+-  "undef": true,
+-  "sub": true,
+-  "strict": false,
+-  "white": false,
+-  "eqnull": true,
+-  "esnext": true,
+-  "unused": true
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
+deleted file mode 100644
+index e7834e3e4f3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
++++ /dev/null
+@@ -1,3 +0,0 @@
+-{
+-  "ignore_dirs": ["tmp", "dist"]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/web.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/web.xml
+deleted file mode 100644
+index ac74d5ccea7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/web.xml
++++ /dev/null
+@@ -1,21 +0,0 @@
+-<!--
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+--->
+-
+-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
+-  <display-name>YARN UI</display-name>
+-</web-app>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
+deleted file mode 100644
+index 64c925adf88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/WEB-INF/wro.xml
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<groups xmlns="http://www.isdc.ro/wro">
+-  <group name='vendor'>
+-    <js>/vendor.js</js>
+-  </group>
+-  <group name='yarn-ui'>
+-    <js>/yarn-ui.js</js>
+-  </group>
+-</groups>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
+deleted file mode 100644
+index 0db27a6e9a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/abstract.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import Ember from 'ember';
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPIAdapter.extend({
+-  address: null, //Must be set by inheriting classes
+-  restNameSpace: null, //Must be set by inheriting classes
+-  serverName: null, //Must be set by inheriting classes
+-
+-  headers: {
+-    Accept: 'application/json'
+-  },
+-
+-  host: Ember.computed("address", function () {
+-    var address = this.get("address");
+-    return this.get(`hosts.${address}`);
+-  }),
+-
+-  namespace: Ember.computed("restNameSpace", function () {
+-    var serverName = this.get("restNameSpace");
+-    return this.get(`env.app.namespaces.${serverName}`);
+-  }),
+-
+-  ajax: function(url, method, options) {
+-    options = options || {};
+-    options.crossDomain = true;
+-    options.xhrFields = {
+-      withCredentials: true
+-    };
+-    options.targetServer = this.get('serverName');
+-    return this._super(url, method, options);
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
+deleted file mode 100644
+index 0665499685d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-info.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  // Any cluster-info specific adapter changes must be added here
+-  pathForType(/*modelName*/) {
+-    return ''; // move to some common place, return path by modelname.
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
+deleted file mode 100644
+index f431340d5de..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-metric.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "metrics",
+-  serverName: "RM",
+-
+-  // Any cluster-metric specific adapter changes must be added here
+-  pathForType(/*modelName*/) {
+-    return ''; // move to some common place, return path by modelname.
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-user-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-user-info.js
+deleted file mode 100644
+index a49c0f5edef..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/cluster-user-info.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  pathForType(/*modelName*/) {
+-    return 'userinfo';
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/jhs-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/jhs-health.js
+deleted file mode 100644
+index b55ac0b271d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/jhs-health.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "jhsAddress",
+-  restNameSpace: "jhs",
+-  serverName: "JHS",
+-
+-  urlForQueryRecord(/*query, modelName*/) {
+-    var url = this.buildURL();
+-    return url + '/info';
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/restabstract.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/restabstract.js
+deleted file mode 100644
+index df409d63b09..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/restabstract.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.RESTAdapter.extend({
+-  address: null, //Must be set by inheriting classes
+-  restNameSpace: null, //Must be set by inheriting classes
+-  serverName: null, //Must be set by inheriting classes
+-
+-  headers: {
+-    Accept: 'application/json'
+-  },
+-
+-  host: Ember.computed("address", function() {
+-    var address = this.get("address");
+-    return this.get(`hosts.${address}`);
+-  }),
+-
+-  namespace: Ember.computed("restNameSpace", function() {
+-    var nameSpace = this.get("restNameSpace");
+-    return this.get(`env.app.namespaces.${nameSpace}`);
+-  }),
+-
+-  ajax(url, method, options) {
+-    options = options || {};
+-    options.crossDomain = true;
+-    options.xhrFields = {
+-      withCredentials: true
+-    };
+-    options.targetServer = this.get('serverName');
+-    return this._super(url, method, options);
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/timeline-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/timeline-health.js
+deleted file mode 100644
+index 8ca23106306..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/timeline-health.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQueryRecord(/*query, modelName*/) {
+-    var url = this.buildURL();
+-    return url + '/health';
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
+deleted file mode 100644
+index d5f3d0c2a4e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-attempt.js
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default AbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this._buildURL();
+-    var appId = query.appId;
+-    delete query.appId;
+-    return url + '/apps/' + appId + "/appattempts";
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    return url + '/apps/' +
+-           Converter.attemptIdToAppId(id) + "/appattempts/" + id;
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
+deleted file mode 100644
+index 23ecd1bae6d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-flowrun.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/){
+-    var url = this._buildURL();
+-    var flowrunUid = query['flowrunUid'];
+-    delete query.flowrunUid;
+-    url = url + '/run-uid/' + flowrunUid + '/apps?fields=ALL';
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-log.js
+deleted file mode 100644
+index 911e04062bc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-log.js
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-import RESTAbstractAdapter from './restabstract';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default RESTAbstractAdapter.extend({
+-  address: "jhsAddress",
+-  restNameSpace: "jhs",
+-  serverName: "JHS",
+-
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var containerId = splits[0];
+-    var logFile = splits[1];
+-    var url = this._buildURL();
+-    url = url + '/containerlogs/' + containerId + '/' + logFile + '?manual_redirection=true';
+-    Ember.Logger.info('The URL for getting the log: ' + url);
+-    return url;
+-  },
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    if (headers['location'] !== undefined && headers['location'] !== null) {
+-      return { redirectedUrl: headers.location, data: "" }
+-    } else {
+-      return { data: payload }
+-    }
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-redirect-log.js
+deleted file mode 100644
+index 0f7e47d6496..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-jhs-redirect-log.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-import RESTAbstractAdapter from './restabstract';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default RESTAbstractAdapter.extend({
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var url = splits[0];
+-    return url;
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-log.js
+deleted file mode 100644
+index e4ee6d11737..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-log.js
++++ /dev/null
+@@ -1,79 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-import RESTAbstractAdapter from './restabstract';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default RESTAbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2Log",
+-  serverName: "ATS",
+-
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var clusterId = this.get("env.app.clusterId");
+-    var containerId = splits[0];
+-    var logFile = splits[1];
+-    if (splits[2]) {
+-      clusterId = splits[2];
+-    }
+-    var url = this._buildURL();
+-    url = url + '/containers/' + containerId + '/logs/' + logFile + '?clusterid=' + clusterId + '?manual_redirection=true';
+-    Ember.Logger.info('The URL for getting the log: ' + url);
+-    return url;
+-  },
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    if (headers['location'] !== undefined && headers['location'] !== null) {
+-      return { redirectedUrl: headers.location, data: "" }
+-    } else {
+-      return { data: payload }
+-    }
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-redirect-log.js
+deleted file mode 100644
+index ba6accb2fdd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-redirect-log.js
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-import RESTAbstractAdapter from './restabstract';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default RESTAbstractAdapter.extend({
+-
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var url = splits[0];
+-    return url;
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
+deleted file mode 100644
+index f2bc30db209..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app-timeline.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    var clusterId = this.get("env.app.clusterId");
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    url += '/apps/' + id + '?fields=ALL';
+-    return url;
+-  },
+-
+-  pathForType(/*modelName*/) {
+-    return 'apps';
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
+deleted file mode 100644
+index d29dff460d5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-app.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  urlForQuery(/*query, modelName*/) {
+-    var url = this._buildURL();
+-    url = url + '/apps';
+-    return url;
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    url = url + '/apps/' + id;
+-    return url;
+-  },
+-
+-  pathForType(/*modelName*/) {
+-    return 'apps'; // move to some common place, return path by modelname.
+-  },
+-
+-  sendKillApplication(id) {
+-    var url = this._buildURL();
+-    url += '/apps/' + id + '/state';
+-    var data = {
+-      "state": "KILLED"
+-    };
+-    return this.ajax(url, "PUT", { data: data });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-component-instance.js
+deleted file mode 100644
+index 86e08fe3786..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-component-instance.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this.buildURL();
+-    var clusterId = this.get("env.app.clusterId");
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    url += '/apps/' + query.appId + '/entities/COMPONENT_INSTANCE?fields=ALL';
+-    delete query.appId;
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-conf.js
+deleted file mode 100644
+index 662197216f4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-conf.js
++++ /dev/null
+@@ -1,79 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+- import DS from 'ember-data';
+- import Ember from 'ember';
+- import Converter from 'yarn-ui/utils/converter';
+- import AbstractAdapter from './abstract';
+-
+- export default AbstractAdapter.extend({
+-
+-   address: 'rmWebAddress',
+-
+-   headers: {
+-     Accept: 'text/plain'
+-   },
+-
+-   host: Ember.computed("address", function () {
+-     let address = this.get("address");
+-     return this.get(`hosts.${address}`);
+-   }),
+-
+-   pathForType(type) {
+-     return  'conf';
+-   },
+-
+-   urlForFindRecord(id, modelName, snapshot) {
+-     var extension = this.get("host").split('/').pop();
+-     if (extension != id) {
+-       this.host = this.get("host") + id;
+-     }
+-     var url = this._buildURL();
+-     return url;
+-   },
+-
+-   ajax(url, method, hash) {
+-     hash = hash || {};
+-     hash.crossDomain = true;
+-     hash.xhrFields = {withCredentials: true};
+-     hash.targetServer = "RM";
+-     return this._super(url, method, hash);
+-   },
+-
+-   /**
+-    * Override options so that result is not expected to be JSON
+-    */
+-   ajaxOptions: function (url, type, options) {
+-     var hash = options || {};
+-     hash.url = url;
+-     hash.type = type;
+-     // Make sure jQuery does not try to convert response to JSON.
+-     hash.dataType = 'text';
+-     hash.context = this;
+-
+-     var headers = Ember.get(this, 'headers');
+-     if (headers != undefined) {
+-       hash.beforeSend = function (xhr) {
+-         Object.keys(headers).forEach(function (key) {
+-           return xhr.setRequestHeader(key, headers[key]);
+-         });
+-       };
+-     }
+-     return hash;
+-   },
+- });
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
+deleted file mode 100644
+index df461278c1e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-log.js
++++ /dev/null
+@@ -1,80 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default DS.RESTAdapter.extend({
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  host: Ember.computed("address", function () {
+-    return this.get(`hosts.localBaseAddress`);
+-  }),
+-
+-  namespace: Ember.computed("restNameSpace", function () {
+-    return this.get(`env.app.namespaces.node`);
+-  }),
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var splits = Converter.splitForContainerLogs(id);
+-    var nodeHttpAddr = splits[0];
+-    var containerId = splits[1];
+-    var filename = splits[2];
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", nodeHttpAddr)  + "/containerlogs/"
+-           + containerId + "/" + filename;
+-    return url;
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = hash || {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "NM";
+-    return this._super(url, method, hash);
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-threaddump.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-threaddump.js
+deleted file mode 100644
+index c4e9382b9b8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container-threaddump.js
++++ /dev/null
+@@ -1,88 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    // If the user is not authorized to signal a threaddump for a container,
+-    // the response contains a RemoteException with a 403 (Forbidden) status
+-    // code. Extract out the error message from the RemoteException in this
+-    // case.
+-    // If the status is '0' or empty, it is symptomatic of the YARN role not
+-    // available or able to respond or a network timeout/firewall issue.
+-    if (status === 403)  {
+-      if (payload
+-          && typeof payload === 'object'
+-          && payload.RemoteException
+-          && payload.RemoteException.message) {
+-        return new Error(payload.RemoteException.message);
+-      }
+-    } else if (status === 0 && payload === "") {
+-      return new Error("Not able to connect to YARN!");
+-    }
+-
+-    return payload;
+-  },
+-
+-  /**
+-   * Set up the POST request to use the signalToContainer REST API
+-   * to signal a thread dump for a running container to RM.
+-   */
+-  signalContainerForThreaddump(request, containerId, user) {
+-    var url = this.buildURL();
+-    if (user && containerId) {
+-      url += "/containers" + "/" + containerId + "/signal"
+-            + "/OUTPUT_THREAD_DUMP" + "?user.name=" + user;
+-    }
+-    return this.ajax(url, "POST", {data: request});
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "RM";
+-    return this._super(url, method, hash);
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
+deleted file mode 100644
+index 476c9bec196..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-container.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPIAdapter.extend({
+-  headers: {
+-    Accept: 'application/json'
+-  },
+-
+-  host: function() {
+-    return this.get(`hosts.rmWebAddress`);
+-  }.property(),
+-
+-  namespace: function() {
+-    return this.get(`env.app.namespaces.cluster`);
+-  }.property(),
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this._buildURL();
+-    url = url + '/apps/' + Converter.attemptIdToAppId(query.app_attempt_id) +
+-          "/appattempts/" + query.app_attempt_id + "/containers";
+-    return url;
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "RM";
+-    return this._super(url, method, hash);
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
+deleted file mode 100644
+index 3d7338f8905..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-entity.js
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/){
+-    var url = this._buildURL();
+-    var appUid = query.app_uid;
+-    var entityType = query.entity_type;
+-    delete query.app_uid;
+-    delete query.entity_type;
+-    url = url + '/app-uid/' + appUid + '/entities/' + entityType + '?fields=INFO';
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
+deleted file mode 100644
+index cb8dfee20fc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flow-activity.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  pathForType(/*modelName*/) {
+-    var clusterId = this.get("env.app.clusterId");
+-    if (clusterId) {
+-      return `clusters/${clusterId}/flows`;
+-    }
+-    return 'flows'; // move to some common place, return path by modelname.
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
+deleted file mode 100644
+index ea9c6cb4969..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun-brief.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/){
+-    var url = this._buildURL();
+-    var flowuid = query['flowuid'];
+-    delete query.flowuid;
+-    return url + '/flow-uid/' + flowuid + '/runs?fields=ALL';
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
+deleted file mode 100644
+index 9163c83625f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-flowrun.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQueryRecord(query/*, modelName*/){
+-    var url = this._buildURL();
+-    var flowrunuid = query.flowrun_uid;
+-    delete query.flowrun_uid;
+-    url = url + '/run-uid/' + flowrunuid;
+-    return url;
+-  },
+-
+-  pathForType(/*modelName*/) {
+-    return 'run-uid'; // move to some common place, return path by modelname.
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-container.js
+deleted file mode 100644
+index aeab48de52d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-container.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "jhsAddress",
+-  restNameSpace: "jhs",
+-  serverName: "JHS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this.buildURL();
+-    url = url + '/aggregatedlogs?appattemptid=' + query.app_attempt_id;
+-    delete query.app_attempt_id;
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-log.js
+deleted file mode 100644
+index 97fe57bb958..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-log.js
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-import { createEmptyContainerLogInfo } from 'yarn-ui/helpers/log-adapter-helper';
+-
+-export default AbstractAdapter.extend({
+-  address: "jhsAddress",
+-  restNameSpace: "jhs",
+-  serverName: "JHS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this._buildURL();
+-    var containerId = query['containerId'];
+-    delete query.containerId;
+-    return url + '/containers/' + containerId + '/logs' + '?manual_redirection=true';
+-  },
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    if (headers['location'] !== undefined && headers['location'] !== null) {
+-      return createEmptyContainerLogInfo(headers['location']);
+-    } else {
+-      return payload;
+-    }
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-redirect-log.js
+deleted file mode 100644
+index b3bb66e8a47..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-jhs-redirect-log.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "jhsAddress",
+-  restNameSpace: "jhs",
+-  serverName: "JHS",
+-
+-  urlForQuery(url/*, modelName*/) {
+-    return url;
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-log.js
+deleted file mode 100644
+index 171dda740df..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-log.js
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-function createEmptyContainerLogInfo(location) {
+-  return {
+-    containerLogsInfo: {
+-      containerLogInfo: [{
+-        fileName: "",
+-        fileSize: "",
+-        lastModifiedTime: "",
+-        redirectedUrl: location
+-      }]
+-    }
+-  };
+-}
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2Log",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this._buildURL();
+-    var containerId = query['containerId'];
+-    var clusterId = this.get("env.app.clusterId");
+-    delete query.containerId;
+-    return url + '/containers/' + containerId + '/logs' + '?clusterid=' + clusterId + '?manual_redirection=true';
+-  },
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    if (headers['location'] !== undefined && headers['location'] !== null) {
+-      return createEmptyContainerLogInfo(headers['location']);
+-    } else {
+-      return payload;
+-    }
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-metrics.js
+deleted file mode 100644
+index d26de2819e3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-metrics.js
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.RESTAdapter.extend({
+-  address: 'rmWebAddress',
+-
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  host: Ember.computed("address", function() {
+-    let address = this.get("address");
+-    return this.get(`hosts.${address}`);
+-  }),
+-
+-  pathForType(type) {
+-    return  'jmx';
+-  },
+-
+-  urlForFindRecord(id, modelName, snapshot) {
+-    var extension = this.get("host").split('/').pop();
+-    if (extension != id) {
+-      this.host = this.get("host") + id;
+-    }
+-    var url = this._buildURL();
+-    return url;
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = hash || {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "RM";
+-    return this._super(url, method, hash);
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-    var headers = Ember.get(this, 'headers');
+-    if (headers != undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-nm-gpu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-nm-gpu.js
+deleted file mode 100644
+index bf6307a664c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-nm-gpu.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-
+-  address: "localBaseAddress",
+-  restNameSpace: "node",
+-  serverName: "NM",
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", id) + "/resources/yarn.io%2Fgpu";
+-    return url;
+-  }
+-
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
+deleted file mode 100644
+index 6d69828069e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-app.js
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-
+-  address: "localBaseAddress",
+-  restNameSpace: "node",
+-  serverName: "NM",
+-
+-  urlForQuery(query) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps";
+-    return url;
+-  },
+-
+-  urlForQueryRecord: function (query) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", query.nodeAddr) + "/apps/" + query.appId;
+-    return url;
+-  },
+-
+-  query: function (store, type, query) {
+-    var url = this.urlForQuery(query);
+-    // Query params not required.
+-    query = null;
+-    return this.ajax(url, 'GET', { data: query });
+-  },
+-
+-  queryRecord: function (store, type, query) {
+-    var url = this.urlForQueryRecord(query);
+-    // Query params not required.
+-    query = null;
+-    return this.ajax(url, 'GET', { data: query });
+-  },
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container-log.js
+deleted file mode 100644
+index ba01a7037d6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container-log.js
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-/**
+- * REST URL's response when fetching container logs will be
+- * in plain text format and not JSON.
+- */
+-export default DS.RESTAdapter.extend({
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  host: Ember.computed("address", function () {
+-    return this.get(`hosts.localBaseAddress`);
+-  }),
+-
+-  namespace: Ember.computed("restNameSpace", function () {
+-    return this.get(`env.app.namespaces.node`);
+-  }),
+-
+-  urlForQueryRecord(query) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containerlogs/"
+-            + query.containerId + "/" + query.fileName;
+-    return url;
+-  },
+-
+-  queryRecord: function (store, type, query) {
+-    var url = this.urlForQueryRecord(query);
+-    // Query params not required.
+-    query = null;
+-    console.log(url);
+-    return this.ajax(url, 'GET', { data: query });
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = hash || {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "NM";
+-    return this._super(url, method, hash);
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-
+-    var headers = Ember.get(this, 'headers');
+-    if (headers !== undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  },
+-
+-  handleResponse(status, headers, payload, requestData) {
+-    // If the status is '0' or empty, it is symptomatic of the YARN role not
+-    // available or able to respond or a network timeout/firewall issue.
+-    if (status === 0 && payload === "")  {
+-        return new Error("Not able to connect to YARN!");
+-    }
+-
+-    return payload;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
+deleted file mode 100644
+index 0fff047165d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node-container.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-
+-  address: "localBaseAddress",
+-  restNameSpace: "node",
+-  serverName: "NM",
+-
+-  urlForQuery(query) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers";
+-    return url;
+-  },
+-
+-  urlForQueryRecord(query) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", query.nodeHttpAddr) + "/containers/" + query.containerId;
+-    return url;
+-  },
+-
+-  query: function (store, type, query) {
+-    var url = this.urlForQuery(query);
+-    // Query params not required.
+-    query = null;
+-    return this.ajax(url, 'GET', { data: query });
+-  },
+-
+-  queryRecord: function (store, type, query) {
+-    var url = this.urlForQueryRecord(query);
+-    // Query params not required.
+-    query = null;
+-    console.log(url);
+-    return this.ajax(url, 'GET', { data: query });
+-  },
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
+deleted file mode 100644
+index 1436bc13f2b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-node.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-
+-  address: "localBaseAddress",
+-  restNameSpace: "node",
+-  serverName: "NM",
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    url = url.replace("{nodeAddress}", id);
+-    return url;
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
+deleted file mode 100644
+index 7eb9f76b0af..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/capacity-queue.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import YarnQueueAdapter from './yarn-queue';
+-
+-export default YarnQueueAdapter.extend({
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
+deleted file mode 100644
+index 7eb9f76b0af..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fair-queue.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import YarnQueueAdapter from './yarn-queue';
+-
+-export default YarnQueueAdapter.extend({
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
+deleted file mode 100644
+index 7eb9f76b0af..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/fifo-queue.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import YarnQueueAdapter from './yarn-queue';
+-
+-export default YarnQueueAdapter.extend({
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
+deleted file mode 100644
+index 8184c39cf09..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-queue/yarn-queue.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from '../abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  pathForType(/*modelName*/) {
+-    return 'scheduler'; // move to some common place, return path by modelname.
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-redirect-log.js
+deleted file mode 100644
+index 7c2b81e025b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-redirect-log.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2Log",
+-  serverName: "ATS",
+-
+-  urlForQuery(url/*, modelName*/) {
+-    return url;
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-log.js
+deleted file mode 100644
+index a912ffeaab6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-log.js
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.RESTAdapter.extend({
+-  address: 'rmWebAddress',
+-  headers: {
+-    Accept: 'text/plain'
+-  },
+-
+-  host: Ember.computed("address", function() {
+-    let address = this.get("address");
+-    return this.get(`hosts.${address}`);
+-  }),
+-
+-  pathForType(type) {
+-    return  'logs';
+-  },
+-
+-  buildURL (modelName, id, snapshot, requestType, query) {
+-    return this._super(modelName, id, snapshot, requestType, query) + '/';
+-  },
+-
+-  urlForFindRecord(id, modelName, snapshot) {
+-    this.host = this.get('host');
+-    let url = this.host + id;
+-    return url;
+-  },
+-
+-  ajax(url, method, hash) {
+-    hash = hash || {};
+-    hash.crossDomain = true;
+-    hash.xhrFields = {withCredentials: true};
+-    hash.targetServer = "RM";
+-    return this._super(url, method, hash);
+-  },
+-
+-  /**
+-   * Override options so that result is not expected to be JSON
+-   */
+-  ajaxOptions: function (url, type, options) {
+-    var hash = options || {};
+-    hash.url = url;
+-    hash.type = type;
+-    // Make sure jQuery does not try to convert response to JSON.
+-    hash.dataType = 'text';
+-    hash.context = this;
+-    var headers = Ember.get(this, 'headers');
+-    if (headers != undefined) {
+-      hash.beforeSend = function (xhr) {
+-        Object.keys(headers).forEach(function (key) {
+-          return xhr.setRequestHeader(key, headers[key]);
+-        });
+-      };
+-    }
+-    return hash;
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
+deleted file mode 100644
+index 6783ded87b1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-rm-node.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "cluster",
+-  serverName: "RM",
+-
+-  pathForType(/*modelName*/) {
+-    return 'nodes';
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    url = url + "/nodes/" + id;
+-    return url;
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-component.js
+deleted file mode 100644
+index 4fda603e11a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-component.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this.buildURL();
+-    var clusterId = this.get("env.app.clusterId");
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    url += '/apps/' + query.appId + '/entities/COMPONENT?fields=ALL';
+-    delete query.appId;
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-info.js
+deleted file mode 100644
+index 9e3775489a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service-info.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQueryRecord(query/*, modelName*/) {
+-    var url = this.buildURL();
+-    var clusterId = this.get("env.app.clusterId");
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    url += '/apps/' + query.appId + '/entities/SERVICE_ATTEMPT?fields=ALL';
+-    delete query.appId;
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service.js
+deleted file mode 100644
+index 22128104749..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-service.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "dashService",
+-  serverName: "DASH",
+-
+-  urlForQueryRecord(query/*, modelName*/) {
+-    var url = this.buildURL();
+-    url += '/' + query.serviceName;
+-    delete query.serviceName;
+-    return url;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js
+deleted file mode 100644
+index 954aafc7842..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-servicedef.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import RESTAbstractAdapter from './restabstract';
+-
+-export default RESTAbstractAdapter.extend({
+-  address: "rmWebAddress",
+-  restNameSpace: "dashService",
+-  serverName: "DASH",
+-
+-  normalizeErrorResponse(status, headers, payload) {
+-    if (payload && typeof payload === 'object' && payload.errors) {
+-      return payload.errors;
+-    } else {
+-      return [
+-        payload
+-      ];
+-    }
+-  },
+-
+-  deployService(request, user) {
+-    var url = this.buildURL();
+-    if(user) {
+-      url += "/?user.name=" + user;
+-    }
+-    return this.ajax(url, "POST", {data: request});
+-  },
+-
+-  stopService(serviceName, user) {
+-    var url = this.buildURL();
+-    url += "/" + serviceName;
+-    url += "/?user.name=" + user;
+-    var data = {"state": "STOPPED", "name": serviceName};
+-    return this.ajax(url, "PUT", {data: data});
+-  },
+-
+-  deleteService(serviceName, user) {
+-    var url = this.buildURL();
+-    url += "/" + serviceName;
+-    url += "/?user.name=" + user;
+-    return this.ajax(url, "DELETE", {data: {}});
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
+deleted file mode 100644
+index cbc10bd6890..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-appattempt.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/) {
+-    var url = this._buildURL();
+-    var clusterId = this.get("env.app.clusterId")
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    var appId = query.appId;
+-    query.fields = 'ALL';
+-    delete query.appId;
+-    return url + '/apps/' + appId + "/entities/YARN_APPLICATION_ATTEMPT";
+-  },
+-
+-  urlForFindRecord(id/*, modelName, snapshot*/) {
+-    var url = this._buildURL();
+-    var clusterId = this.get("env.app.clusterId")
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    return url + '/apps/' + Converter.attemptIdToAppId(id) +
+-      "/entities/YARN_APPLICATION_ATTEMPT/" + id + "?fields=ALL";
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
+deleted file mode 100644
+index 546b03f4627..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/adapters/yarn-timeline-container.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractAdapter from './abstract';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default AbstractAdapter.extend({
+-  address: "timelineWebAddress",
+-  restNameSpace: "timelineV2",
+-  serverName: "ATS",
+-
+-  urlForQuery(query/*, modelName*/){
+-    var url = this._buildURL();
+-    var clusterId = this.get("env.app.clusterId")
+-    if (clusterId) {
+-      url += `/clusters/${clusterId}`;
+-    }
+-    var app_attempt_id = query.app_attempt_id;
+-    query.fields = 'ALL';
+-    delete query.app_attempt_id;
+-    url = url + '/apps/' + Converter.attemptIdToAppId(app_attempt_id) +
+-        '/entities/YARN_CONTAINER';
+-    return url;
+-  },
+-
+-  pathForType(/*modelName*/) {
+-    return '';
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/app.js
+deleted file mode 100644
+index 8c1025ae726..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/app.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Resolver from 'ember-resolver';
+-import loadInitializers from 'ember/load-initializers';
+-import config from './config/environment';
+-import Sorter from 'yarn-ui/utils/sorter';
+-
+-var App;
+-
+-Ember.MODEL_FACTORY_INJECTIONS = true;
+-
+-App = Ember.Application.extend({
+-  modulePrefix: config.modulePrefix,
+-  podModulePrefix: config.podModulePrefix,
+-  Resolver
+-});
+-
+-loadInitializers(App, config.modulePrefix);
+-Sorter.initDataTableSorter();
+-
+-export default App;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
+deleted file mode 100644
+index 88282750e23..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-attempt-table.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-table.js
+deleted file mode 100644
+index 4b741b88627..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-table.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
+deleted file mode 100644
+index 0eac82759f2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-timeout-bar.js
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default Ember.Component.extend({
+-  app: null,
+-
+-  appTimeoutValue: function() {
+-    var timeoutValueInSecs = this.get("app.remainingTimeoutInSeconds");
+-    if (timeoutValueInSecs > -1) {
+-      return Converter.msToElapsedTime(timeoutValueInSecs * 1000);
+-    } else {
+-      return timeoutValueInSecs;
+-    }
+-  }.property("app.remainingTimeoutInSeconds"),
+-
+-  isAppTimedOut: function() {
+-    if (this.get("app.remainingTimeoutInSeconds") > 0) {
+-      return false;
+-    } else {
+-      return true;
+-    }
+-  }.property("app.remainingTimeoutInSeconds"),
+-
+-  appTimeoutBarStyle: function() {
+-    var remainingInSecs = this.get("app.remainingTimeoutInSeconds"),
+-        expiryTimestamp = Converter.dateToTimeStamp(this.get("app.applicationExpiryTime")),
+-        expiryInSecs = expiryTimestamp / 1000,
+-        startTimestamp = Converter.dateToTimeStamp(this.get("app.startTime")),
+-        startInSecs = startTimestamp / 1000,
+-        totalRunInSecs = 0,
+-        appRunDurationInSecs = 0,
+-        width = 0;
+-
+-    if (remainingInSecs > 0) {
+-      totalRunInSecs = expiryInSecs - startInSecs;
+-      appRunDurationInSecs = totalRunInSecs - remainingInSecs;
+-      width = appRunDurationInSecs / totalRunInSecs * 100;
+-    }
+-
+-    return "width: " + width + "%";
+-  }.property("app.remainingTimeoutInSeconds", "app.applicationExpiryTime", "app.startTime")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
+deleted file mode 100644
+index f6288378349..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/app-usage-donut-chart.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
+-import ColorUtils from 'yarn-ui/utils/color-utils';
+-import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
+-
+-export default BaseUsageDonutChart.extend({
+-  colors: d3.scale.category20().range(),
+-
+-  draw: function() {
+-    var usageByApps = [];
+-    var avail = 100;
+-
+-    this.get("data").forEach(function (app) {
+-      var v = app.get("clusterUsagePercentage");
+-      if (v > 1e-2) {
+-        usageByApps.push({
+-          label: app.get("id"),
+-          link: HrefAddressUtils.getApplicationLink(app.get("id")),
+-          value: v.toFixed(2)
+-        });
+-
+-        avail = avail - v;
+-      }
+-    }.bind(this));
+-
+-    usageByApps.sort(function(a,b) {
+-      return b.value - a.value;
+-    });
+-
+-    usageByApps = this.mergeLongTails(usageByApps, 8);
+-
+-    usageByApps.push({
+-      label: "Available",
+-      value: avail.toFixed(2)
+-    });
+-
+-    this.colors = ColorUtils.getColors(usageByApps.length, ["others", "good"], true);
+-
+-    this.renderDonutChart(usageByApps, this.get("title"), this.get("showLabels"),
+-      this.get("middleLabel"), "100%", "%");
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
+deleted file mode 100644
+index 05d78eb902f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import BaseChartComponent from 'yarn-ui/components/base-chart-component';
+-
+-export default BaseChartComponent.extend({
+-  // data: 
+-  //    [{label=label1, value=value1}, ...]
+-  //    ...
+-  renderBarChart: function(data, title, textWidth = 50) {
+-    var g = this.chart.g;
+-    var layout = this.getLayout();
+-    this.renderTitleAndBG(g, title, layout);
+-
+-    var maxValue = -1;
+-    for (var i = 0; i < data.length; i++) {
+-      if (data[i] instanceof Array) {
+-        if (data[i][0].value > maxValue) {
+-          maxValue = data[i][0].value;
+-        }
+-      } else {
+-        if (data[i].value > maxValue) {
+-          maxValue = data[i].value;
+-        }
+-      }
+-    }
+-
+-    var singleBarHeight = 30;
+-
+-    // 50 is for text
+-    var maxBarWidth = layout.x2 - layout.x1 - 2 * layout.margin - textWidth - 50;
+-
+-    // 30 is for title
+-    var maxBarsHeight = layout.y2 - layout.y1 - 2 * layout.margin - 30;
+-    var gap = (maxBarsHeight - data.length * singleBarHeight) / (data.length -
+-      1);
+-
+-    var xScaler = d3.scale.linear()
+-      .domain([0, maxValue])
+-      .range([0, maxBarWidth]);
+-
+-    var getBarText = function(i) {
+-      return data[i].label;
+-    };
+-    // show bar text
+-    for (i = 0; i < data.length; i++) {
+-      g.append("text")
+-        .text(getBarText(i))
+-        .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+-          (gap + singleBarHeight) * i + 30)
+-        .attr("x", layout.x1 + layout.margin);
+-    }
+-
+-    // show bar
+-    var bar = g.selectAll("bars")
+-      .data(data)
+-      .enter()
+-      .append("rect")
+-      .attr("y", function(d, i) {
+-        return layout.y1 + 30 + layout.margin + (gap + singleBarHeight) * i;
+-      })
+-      .attr("x", layout.x1 + layout.margin + textWidth)
+-      .attr("height", singleBarHeight)
+-      .attr("fill", function(d, i) {
+-        return this.colors[i];
+-      }.bind(this))
+-      .attr("width", 0);
+-
+-    this.bindTooltip(bar);
+-
+-    bar.transition()
+-      .duration(500)
+-      .attr("width", function(d) {
+-        var w;
+-        w = xScaler(d.value);
+-        // At least each item has 3 px
+-        w = Math.max(w, 3);
+-        return w;
+-      });
+-
+-    var getBarValue = function(i) {
+-      return data[i].value;
+-    };
+-    // show bar value
+-    for (i = 0; i < data.length; i++) {
+-      g.append("text")
+-        .text(getBarValue(i))
+-        .attr("y", layout.y1 + singleBarHeight / 2 + layout.margin +
+-              (gap + singleBarHeight) * i + 30)
+-        .attr("x", layout.x1 + layout.margin + textWidth + 15 + xScaler(data[i].value));
+-    }
+-  },
+-
+-  draw: function() {
+-    this.renderBarChart(this.get("data"), this.get("title"), this.get("textWidth"));
+-  },
+-
+-  _dataChange: Ember.observer("data", function() {
+-    this.chart.g.selectAll("*").remove();
+-    this.draw();
+-  }),
+-
+-  didInsertElement: function() {
+-    this.initChart();
+-    this.draw();
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
+deleted file mode 100644
+index 26aa2b05105..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-chart-component.js
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default Ember.Component.extend({
+-  tooltip : undefined,
+-  colors: d3.scale.category10().range(),
+-
+-  init: function () {
+-    this._super();
+-    this.set("chart", {
+-      svg: undefined,
+-      g: undefined,
+-      h: 0,
+-      w: 0,
+-      tooltip: undefined
+-    });
+-  },
+-
+-  initChart: function(removeLast = false) {
+-    // Init tooltip if it is not initialized
+-    // this.tooltip = d3.select("#chart-tooltip");
+-    if (!this.tooltip) {
+-      this.tooltip = d3.select("body")
+-        .append("div")
+-        .attr("class", "tooltip")
+-        .attr("id", "chart-tooltip")
+-        .style("opacity", 0);
+-    }
+-
+-    var parentId = this.get("parentId");
+-
+-    if (removeLast) {
+-      // Init svg
+-      var svg = d3.select("#" + parentId + "-svg");
+-      if (svg) {
+-        svg.remove();
+-      }
+-    }
+-
+-    var parent = d3.select("#" + parentId);
+-    var bbox = parent.node().getBoundingClientRect();
+-    this.chart.w = bbox.width - 30;
+-
+-    var ratio = 0.75; // 4:3 by default
+-    if (this.get("ratio")) {
+-      ratio = this.get("ratio");
+-    }
+-    this.chart.h = bbox.width * ratio;
+-
+-    if (this.get("maxHeight")) {
+-      this.chart.h = Math.min(this.get("maxHeight"), this.chart.h);
+-    }
+-
+-    this.chart.svg = parent.append("svg")
+-      .attr("width", this.chart.w)
+-      .attr("height", this.chart.h)
+-      .attr("id", parentId + "-svg");
+-
+-    this.chart.g = this.chart.svg.append("g");
+-  },
+-
+-  renderTitleAndBG: function(g, title, layout, background=true) {
+-    var bg = g.append("g");
+-    bg.append("text")
+-      .text(title)
+-      .attr("x", (layout.x1 + layout.x2) / 2)
+-      .attr("y", layout.y1 + layout.margin + 20)
+-      .attr("class", "chart-title");
+-
+-    if (background) {
+-      bg.append("rect")
+-        .attr("x", layout.x1)
+-        .attr("y", layout.y1)
+-        .attr("width", layout.x2 - layout.x1)
+-        .attr("height", layout.y2 - layout.y1)
+-        .attr("class", "chart-frame");
+-    }
+-  },
+-
+-  bindTooltip: function(d) {
+-    d.on("mouseover", function() {
+-        this.tooltip
+-          .style("left", (d3.event.pageX) + "px")
+-          .style("top", (d3.event.pageY - 28) + "px");
+-      }.bind(this))
+-      .on("mousemove", function(d) {
+-        // Handle pie chart case
+-        var data = d;
+-        if (d.data) {
+-          data = d.data;
+-        }
+-
+-        this.tooltip.style("opacity", 0.7);
+-        var value = data.value;
+-        if (this.get("type") === "memory") {
+-          value = Converter.memoryToSimpliedUnit(value);
+-        }
+-        this.tooltip.html(data.label + " = " + value)
+-          .style("left", (d3.event.pageX) + "px")
+-          .style("top", (d3.event.pageY - 28) + "px");
+-      }.bind(this))
+-      .on("mouseout", function() {
+-        this.tooltip.style("opacity", 0);
+-      }.bind(this));
+-  },
+-
+-  adjustMaxHeight: function(h) {
+-    this.chart.svg.attr("height", h);
+-  },
+-
+-  getLayout: function() {
+-    var x1 = 0;
+-    var y1 = 0;
+-    var x2 = this.chart.w;
+-    var y2 = this.chart.h;
+-
+-    var layout = {
+-      x1: x1,
+-      y1: y1,
+-      x2: x2 - 10,
+-      y2: y2 - 10,
+-      margin: 10
+-    };
+-    return layout;
+-  },
+-
+-  willDestroy: function() {
+-    this.tooltip.remove();
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
+deleted file mode 100644
+index 201ae6ca85e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/base-usage-donut-chart.js
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DonutChart from 'yarn-ui/components/donut-chart';
+-
+-export default DonutChart.extend({
+-  mergeLongTails: function(usages, nItemsKept) {
+-    var arr = [];
+-    for (var i = 0; i < Math.min(usages.length, nItemsKept); i++) {
+-      arr.push(usages[i]);
+-    }
+-
+-    var others = {
+-      label: "Used by others",
+-      value: 0
+-    };
+-
+-    for (i = nItemsKept; i < usages.length; i++) {
+-      others.value += Number(usages[i].value);
+-    }
+-    others.value = others.value.toFixed(2);
+-
+-    arr.push(others);
+-
+-    return arr;
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/breadcrumb-bar.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/breadcrumb-bar.js
+deleted file mode 100644
+index e3f3d2ef282..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/breadcrumb-bar.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-
+-  breadcrumbs: null,
+-  hideRefresh: false,
+-
+-  actions:{
+-    refresh: function () {
+-      this.get("_targetObject").send("refresh");
+-    }
+-  }
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/collapsible-panel.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/collapsible-panel.js
+deleted file mode 100644
+index 6a40f8f2714..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/collapsible-panel.js
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  classNames: ['pull-right'],
+-
+-  targetId: '',
+-  initialClosedState: false,
+-
+-  didInsertElement() {
+-    if (!this.get('targetId')) {
+-      this.$('.toggle_switch').hide();
+-    }
+-    if (this.get('targetId') && this.get('initialClosedState')) {
+-      this.$('.toggle_switch').show();
+-      this.toggleToggleSwitchArrow();
+-      Ember.$('#' + this.get('targetId')).removeClass('panel-collapsed').show();
+-    }
+-  },
+-
+-  toggleToggleSwitchArrow() {
+-    let $toggleArrow = this.$('.toggle_switch').find('span');
+-    if ($toggleArrow.hasClass('glyphicon-chevron-up')) {
+-      $toggleArrow.removeClass('glyphicon-chevron-up').addClass('glyphicon-chevron-down');
+-    } else {
+-      $toggleArrow.removeClass('glyphicon-chevron-down').addClass('glyphicon-chevron-up');
+-    }
+-  },
+-
+-  toggleCollapsiblePanel() {
+-    let $collapsiblePanel = Ember.$('#' + this.get('targetId'));
+-    if ($collapsiblePanel.hasClass('panel-collapsed')) {
+-      $collapsiblePanel.removeClass('panel-collapsed');
+-      $collapsiblePanel.slideDown();
+-    } else {
+-      $collapsiblePanel.addClass('panel-collapsed');
+-      $collapsiblePanel.slideUp();
+-    }
+-  },
+-
+-  actions: {
+-    togglePanelCollapse() {
+-      this.toggleToggleSwitchArrow();
+-      this.toggleCollapsiblePanel();
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/confirm-dialog.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/confirm-dialog.js
+deleted file mode 100644
+index a6f518b921f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/confirm-dialog.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  dialogId: "confirmModalDialog",
+-  title: "Confirm",
+-  message: "Are you sure?",
+-
+-  actions: {
+-    yesConfirmed() {
+-      this.sendAction();
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/container-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/container-table.js
+deleted file mode 100644
+index 4b741b88627..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/container-table.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/deploy-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/deploy-service.js
+deleted file mode 100644
+index f73f33fca08..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/deploy-service.js
++++ /dev/null
+@@ -1,179 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  viewType: 'standard',
+-  savedStandardTemplates: null,
+-  savedJsonTemplates: null,
+-  savedTemplateName: '',
+-  serviceDef: null,
+-  customServiceDef: '',
+-  serviceResp: null,
+-  isLoading: false,
+-  userName: '',
+-  hosts: Ember.inject.service('hosts'),
+-
+-  actions: {
+-    showSaveTemplateModal() {
+-      this.$('#saveListModal').modal('show');
+-    },
+-
+-    deployService() {
+-      this.set('serviceResp', null);
+-      if (this.get('isStandardViewType')) {
+-        this.sendAction("deployServiceDef", this.get('serviceDef'), this.get('userName'));
+-      } else {
+-        try {
+-          var parsed = JSON.parse(this.get('customServiceDef'));
+-          this.sendAction("deployServiceJson", parsed, this.get('userName'));
+-        } catch (err) {
+-          this.set('serviceResp', {type: 'error', message: 'Invalid JSON: ' + err.message});
+-          throw err;
+-        }
+-      }
+-    },
+-
+-    updateViewType(type) {
+-      this.set('viewType', type);
+-    },
+-
+-    addToSavedList() {
+-      this.unselectAllSavedList();
+-      if (this.get('isStandardViewType')) {
+-        this.get('savedStandardTemplates').addObject({
+-          name: this.get('savedTemplateName'),
+-          defId: this.get('serviceDef.id'),
+-          active: true
+-        });
+-        this.set('serviceDef.isCached', true);
+-      } else {
+-        this.get('savedJsonTemplates').addObject({
+-          name: this.get('savedTemplateName'),
+-          custom: this.get('customServiceDef'),
+-          active: true
+-        });
+-      }
+-      this.$('#saveListModal').modal('hide');
+-      this.set('savedTemplateName', '');
+-    },
+-
+-    updateServiceDef(def) {
+-      this.selectActiveListItem(def);
+-      if (this.get('isStandardViewType')) {
+-        this.set('serviceDef', this.getStore().peekRecord('yarn-servicedef', def.defId));
+-      } else {
+-        this.set('customServiceDef', def.custom);
+-      }
+-    },
+-
+-    clearConfigs() {
+-      this.unselectAllSavedList();
+-      this.set('serviceResp', null);
+-      if (this.get('isStandardViewType')) {
+-        var oldDef = this.get('serviceDef');
+-        var def = oldDef.createNewServiceDef();
+-        this.set('serviceDef', def);
+-        if (!oldDef.get('isCached')) {
+-          oldDef.deleteRecord();
+-        }
+-      } else {
+-        this.set('customServiceDef', '');
+-      }
+-    },
+-
+-    removeFromSavedList(list) {
+-      if (list.active) {
+-        this.send('clearConfigs');
+-      }
+-      if (this.get('isStandardViewType')) {
+-        this.get('savedStandardTemplates').removeObject(list);
+-      } else {
+-        this.get('savedJsonTemplates').removeObject(list);
+-      }
+-    },
+-
+-    clearServiceResponse() {
+-      this.set('serviceResp', null);
+-    }
+-  },
+-
+-  didInsertElement() {
+-    var self = this;
+-    self.$().find('.modal').on('shown.bs.modal', function() {
+-      self.$().find('.modal.in').find('input.form-control:first').focus();
+-    });
+-  },
+-
+-  selectActiveListItem(item) {
+-    this.unselectAllSavedList();
+-    Ember.set(item, 'active', true);
+-  },
+-
+-  unselectAllSavedList() {
+-    this.get('getSavedList').forEach(function(item) {
+-      Ember.set(item, 'active', false);
+-    });
+-  },
+-
+-  getSavedList: Ember.computed('viewType', function() {
+-    if (this.get('isStandardViewType')) {
+-      return this.get('savedStandardTemplates');
+-    } else {
+-      return this.get('savedJsonTemplates');
+-    }
+-  }),
+-
+-  getStore: function() {
+-    return this.get('serviceDef.store');
+-  },
+-
+-  isStandardViewType: Ember.computed.equal('viewType', 'standard'),
+-
+-  isCustomViewType: Ember.computed.equal('viewType', 'custom'),
+-
+-  isValidTemplateName: Ember.computed.notEmpty('savedTemplateName'),
+-
+-  isUserNameGiven: Ember.computed.empty('userName'),
+-
+-  isValidServiceDef: Ember.computed('serviceDef.name', 'serviceDef.queue',
+-      'serviceDef.version', 'serviceDef.serviceComponents.[]', function () {
+-    return this.get('serviceDef').isValidServiceDef();
+-  }),
+-
+-  isValidCustomServiceDef: Ember.computed.notEmpty('customServiceDef'),
+-
+-  isSecurityNotEnabled: Ember.computed('isSecurityEnabled', function () {
+-    return this.get(`hosts.isSecurityEnabled`) === 'simple';
+-  }),
+-
+-  enableSaveOrDeployBtn: Ember.computed('isValidServiceDef', 'isValidCustomServiceDef', 'viewType', 'isLoading', 'isUserNameGiven', function() {
+-    if (this.get('isLoading')) {
+-      return false;
+-    }
+-    if (this.get('isSecurityNotEnabled') && this.get('isUserNameGiven')) {
+-      return false;
+-    }
+-    if (this.get('isStandardViewType')) {
+-      return this.get('isValidServiceDef');
+-    } else {
+-      return this.get('isValidCustomServiceDef');
+-    }
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
+deleted file mode 100644
+index 03b633682f7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js
++++ /dev/null
+@@ -1,209 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import BaseChartComponent from 'yarn-ui/components/base-chart-component';
+-import ColorUtils from 'yarn-ui/utils/color-utils';
+-import Converter from 'yarn-ui/utils/converter';
+-import {Entities} from 'yarn-ui/constants';
+-
+-export default BaseChartComponent.extend({
+-  /*
+-   * data = [{label="xx", value=},{...}]
+-   */
+-  renderDonutChart: function(data, title, showLabels = false, 
+-    middleLabel = "Total", middleValue = undefined, suffix = "") {
+-    var g = this.chart.g;
+-    var layout = this.getLayout();
+-    this.renderTitleAndBG(g, title, layout);
+-
+-    var total = 0;
+-    var allZero = true;
+-    for (var i = 0; i < data.length; i++) {
+-      total += data[i].value;
+-      if (data[i].value > 1e-6) {
+-        allZero = false;
+-      }
+-    }
+-
+-    if (!middleValue) {
+-      if (this.get(Entities.Type) === Entities.Memory) {
+-        middleValue = Converter.memoryToSimpliedUnit(total);
+-      } else if (this.get(Entities.Type) === Entities.Resource) {
+-        middleValue = Converter.resourceToSimplifiedUnit(total, this.get(Entities.Unit));
+-      } else {
+-        middleValue = total;
+-      }
+-    }
+-
+-    //Width and height
+-    var h = layout.y2 - layout.y1;
+-
+-    // 50 is for title
+-    var outerRadius = (h - 50 - 2 * layout.margin) / 2;
+-
+-    // Ratio of inner radius to outer radius
+-    var radiusRatio = 0.75;
+-    var innerRadius = outerRadius * radiusRatio;
+-
+-    var arc = d3.svg.arc()
+-      .innerRadius(innerRadius)
+-      .outerRadius(outerRadius);
+-
+-    var cx;
+-    var cy = layout.y1 + 50 + layout.margin + outerRadius;
+-    if (showLabels) {
+-      cx = layout.x1 + layout.margin + outerRadius;
+-    } else {
+-      cx = (layout.x1 + layout.x2) / 2;
+-    }
+-
+-    var pie = d3.layout.pie();
+-    pie.sort(null);
+-    pie.value(function(d) {
+-      var v = d.value;
+-      // make sure it > 0
+-      v = Math.max(v, 1e-6);
+-      return v;
+-    });
+-
+-    //Set up groups
+-    var arcs = g
+-      .selectAll("g.arc")
+-      .data(pie(data))
+-      .enter()
+-      .append("g")
+-      .attr("class", "arc")
+-      .attr("transform", "translate(" + cx + "," + cy + ")");
+-
+-    function tweenPie(finish) {
+-      var start = {
+-        startAngle: 0,
+-        endAngle: 0
+-      };
+-      var i = d3.interpolate(start, finish);
+-      return function(d) {
+-        return arc(i(d));
+-      };
+-    }
+-
+-    //Draw arc paths
+-    var path = arcs.append("path")
+-      .attr("fill", function(d, i) {
+-        if (d.value > 1e-6) {
+-          return this.colors[i];
+-        } else {
+-          return "white";
+-        }
+-      }.bind(this))
+-      .attr("d", arc)
+-      .attr("stroke", function(d, i) {
+-        if (allZero) {
+-          return this.colors[i];
+-        }
+-      }.bind(this));
+-    this.bindTooltip(path);
+-    path.on("click", function (d) {
+-      var data = d.data;
+-      if (data.link) {
+-        this.tooltip.remove();
+-        document.location.href = data.link;
+-      }
+-    }.bind(this));
+-
+-    // Show labels
+-    if (showLabels) {
+-      var lx = layout.x1 + layout.margin + outerRadius * 2 + 30;
+-      var squareW = 15;
+-      var margin = 10;
+-
+-      var select = g.selectAll(".rect")
+-        .data(data)
+-        .enter();
+-      select.append("rect")
+-        .attr("fill", function(d, i) {
+-          return this.colors[i];
+-        }.bind(this))
+-        .attr("x", lx)
+-        .attr("y", function(d, i) {
+-          return layout.y1 + 75 + (squareW + margin) * i + layout.margin;
+-        })
+-        .attr("width", squareW)
+-        .attr("height", squareW);
+-      select.append("text")
+-        .attr("x", lx + squareW + margin)
+-        .attr("y", function(d, i) {
+-          return layout.y1 + 80 + (squareW + margin) * i + layout.margin + squareW / 2;
+-        })
+-        .text(function(d) {
+-          var value = d.value;
+-          if (this.get("type") === "memory") {
+-            value = Converter.memoryToSimpliedUnit(value);
+-          } else if (this.get("type") === "resource") {
+-            value = Converter.resourceToSimplifiedUnit(value, this.get(Entities.Unit));
+-          }
+-
+-          return d.label + ' = ' + value + suffix;
+-        }.bind(this));
+-    }
+-
+-    if (middleLabel) {
+-      var highLightColor = this.colors[0];
+-      g.append("text").text(middleLabel).attr("x", cx).attr("y", cy - 10).
+-        attr("class", "donut-highlight-text").attr("fill", highLightColor);
+-      g.append("text").text(middleValue).attr("x", cx).attr("y", cy + 15).
+-        attr("class", "donut-highlight-sub").attr("fill", highLightColor);
+-    }
+-
+-    path.transition()
+-      .duration(500)
+-      .attrTween('d', tweenPie);
+-  },
+-
+-  _dataChange: Ember.observer("data", function() {
+-    this.chart.g.selectAll("*").remove();
+-    if(this.get("data")) {
+-      this.draw();
+-    }
+-  }),
+-
+-  draw: function() {
+-    var colorTargets = this.get("colorTargets");
+-    if (colorTargets) {
+-      var colorTargetReverse = Boolean(this.get("colorTargetReverse"));
+-      var targets = colorTargets.split(" ");
+-      this.colors = ColorUtils.getColors(this.get("data").length, targets, colorTargetReverse);
+-    }
+-
+-    this.renderDonutChart(this.get("data"), this.get("title"), this.get("showLabels"), 
+-                          this.get("middleLabel"), this.get("middleValue"), this.get("suffix"));
+-  },
+-
+-  didInsertElement: function() {
+-    // When parentIdPrefix is specified, use parentidPrefix + name as new parent
+-    // id
+-    if (this.get("parentIdPrefix")) {
+-      var newParentId = this.get("parentIdPrefix") + this.get("id");
+-      this.set("parentId", newParentId);
+-      console.log(newParentId);
+-    }
+-
+-    this.initChart();
+-    this.draw();
+-  },
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
+deleted file mode 100644
+index 56fc68a2b0b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-html-cell.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  content: null
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-simple-status-cell.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-simple-status-cell.js
+deleted file mode 100644
+index af8b605eeb0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-simple-status-cell.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  content: null,
+-
+-  classNames: ["em-table-simple-status-cell"],
+-
+-  statusName: Ember.computed("content", function () {
+-    var status = this.get("content");
+-
+-    return status.toLowerCase().capitalize();
+-  }),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-tooltip-text.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-tooltip-text.js
+deleted file mode 100644
+index f3634607faf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/em-table-tooltip-text.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+- import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  content: null,
+-
+-  classNames: ["em-table-text-with-tooltip"],
+-
+-  didRender: function() {
+-    this.$().parent().css("position", "static");
+-  },
+-
+-  tooltipText: Ember.computed("content", function () {
+-    return this.get("content");
+-  }),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/fileconfig-viewer-dialog.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/fileconfig-viewer-dialog.js
+deleted file mode 100644
+index d4912768b18..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/fileconfig-viewer-dialog.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  dialogId: "fileconfig_viewer_dialog",
+-  title: "File Configuration Properties",
+-  props: null,
+-  customProps: Ember.computed('props', function() {
+-    var custom = [];
+-    var props = this.get('props');
+-    for (var pro in props) {
+-      custom.push({
+-        name: pro,
+-        value: props[pro]
+-      });
+-    }
+-    return custom;
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/gpu-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/gpu-donut-chart.js
+deleted file mode 100644
+index fa5ca8ac1dc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/gpu-donut-chart.js
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DonutChart from 'yarn-ui/components/donut-chart';
+-import ColorUtils from 'yarn-ui/utils/color-utils';
+-
+-export default DonutChart.extend({
+-  draw: function() {
+-    // Construct data
+-    var data = [];
+-    if (this.get("gpu-render-type") === "gpu-memory") {
+-      data.push({
+-        label: "Used",
+-        value: parseFloat(this.get("gpuInfo").gpuMemoryUsage.usedMemoryMiB),
+-      });
+-      data.push({
+-        label: "Available",
+-        value: parseFloat(this.get("gpuInfo").gpuMemoryUsage.availMemoryMiB)
+-      });
+-    } else if (this.get("gpu-render-type") === "gpu-utilization") {
+-      var utilization = parseFloat(this.get("gpuInfo").gpuUtilizations.overallGpuUtilization);
+-      data.push({
+-        label: "Utilized",
+-        value: utilization,
+-      });
+-      data.push({
+-        label: "Available",
+-        value: 100 - utilization
+-      });
+-    }
+-
+-    var colorTargets = this.get("colorTargets");
+-    if (colorTargets) {
+-      var colorTargetReverse = Boolean(this.get("colorTargetReverse"));
+-      var targets = colorTargets.split(" ");
+-      this.colors = ColorUtils.getColors(data.length, targets, colorTargetReverse);
+-    }
+-
+-    this.renderDonutChart(data, this.get("title"), this.get("showLabels"),
+-      this.get("middleLabel"), this.get("middleValue"), this.get("suffix"));
+-  },
+-
+-  didInsertElement: function() {
+-    // ParentId includes minorNumber
+-    var newParentId = this.get("parentId") + this.get("gpuInfo").minorNumber;
+-    this.set("parentId", newParentId);
+-
+-    this.initChart();
+-    this.draw();
+-  },
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/info-tooltip.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/info-tooltip.js
+deleted file mode 100644
+index 605b611f0b7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/info-tooltip.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import InfoSeeder from 'yarn-ui/utils/info-seeder';
+-
+-export default Ember.Component.extend({
+-  classNames: ['tooltip', 'info-tooltip'],
+-  elementId: 'info_tooltip_wrapper',
+-
+-  didInsertElement() {
+-    var $tooltip = Ember.$('#info_tooltip_wrapper');
+-    Ember.$('body').on('mouseenter', '.info-icon', function() {
+-      var $elem = Ember.$(this);
+-      var info = InfoSeeder[$elem.data('info')];
+-      var offset = $elem.offset();
+-      $tooltip.show();
+-      $tooltip.find("#tooltip_content").text(info);
+-      $tooltip.offset({top: offset.top + 20, left: offset.left - 10});
+-    }).on('mouseleave', '.info-icon', function() {
+-      $tooltip.find("#tooltip_content").text('');
+-      $tooltip.hide();
+-    });
+-  },
+-
+-  WillDestroyElement() {
+-    Ember.$('body').off('hover');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/item-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/item-selector.js
+deleted file mode 100644
+index 235e4386e45..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/item-selector.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  didInsertElement: function() {
+-    $(".js-example-basic-single").select2(
+-      {
+-        width: '100%',
+-        placeholder: "Select a queue"
+-      });
+-    var elementId = this.get("element-id");
+-    var prefix = this.get("prefix");
+-
+-    var element = d3.select("#" + elementId);
+-
+-    if (element) {
+-      this.get("model").forEach(function(o) {
+-        element.append("option").attr("value", o.get("name")).text(prefix + o.get("name"));
+-      });
+-    }
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/metrics-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/metrics-table.js
+deleted file mode 100644
+index 62b2fc5964c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/metrics-table.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  metrics: null,
+-  type: ''
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/node-menu-panel.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/node-menu-panel.js
+deleted file mode 100644
+index 31457bed20a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/node-menu-panel.js
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  encodedAddr : Ember.computed("nodeAddr", function(){
+-    return encodeURIComponent(this.get('nodeAddr'));
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
+deleted file mode 100644
+index 7eac266505a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/nodes-heatmap.js
++++ /dev/null
+@@ -1,317 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import BaseChartComponent from 'yarn-ui/components/base-chart-component';
+-
+-export default BaseChartComponent.extend({
+-  CELL_WIDTH: 250,
+-  SAMPLE_CELL_WIDTH: 100,
+-  SAMPLE_HEIGHT: 30,
+-  CELL_HEIGHT: 30,
+-  CELL_MARGIN: 2,
+-  RACK_MARGIN: 20,
+-  filter: "",
+-  selectedCategory: 0,
+-  memoryLabel: "Memory",
+-  cpuLabel: "VCores",
+-  containersLabel: "Containers",
+-  totalContainers: 0,
+-
+-  bindTP: function(element, cell) {
+-    var currentToolTip = this.tooltip;
+-    element.on("mouseover", function() {
+-      currentToolTip
+-        .style("left", (d3.event.pageX) + "px")
+-        .style("top", (d3.event.pageY - 28) + "px");
+-      cell.style("opacity", 1.0);
+-    }.bind(this))
+-      .on("mousemove", function() {
+-        // Handle pie chart case
+-        var text = cell.attr("tooltiptext");
+-        currentToolTip
+-            .style("background", "black")
+-            .style("opacity", 0.7);
+-        currentToolTip
+-            .html(text)
+-            .style('font-size', '12px')
+-            .style('color', 'white')
+-            .style('font-weight', '400');
+-        currentToolTip
+-            .style("left", (d3.event.pageX) + "px")
+-            .style("top", (d3.event.pageY - 28) + "px");
+-  }.bind(this))
+-      .on("mouseout", function() {
+-        currentToolTip.style("opacity", 0);
+-        cell.style("opacity", 0.8);
+-      }.bind(this));
+-  },
+-
+-  bindSelectCategory: function(element, i) {
+-    element.on("click", function() {
+-      if (this.selectedCategory === i) {
+-        // Remove selection for second click
+-        this.selectedCategory = 0;
+-      } else {
+-        this.selectedCategory = i;
+-      }
+-      this.didInsertElement();
+-    }.bind(this));
+-  },
+-
+-  isNodeSelected: function(node) {
+-    if (this.filter) {
+-      var rack = node.get("rack");
+-      var host = node.get("nodeHostName");
+-      if (!rack.includes(this.filter) && !host.includes(this.filter)) {
+-        return false;
+-      }
+-    }
+-
+-    if (this.selectedCategory === 0) {
+-      return true;
+-    }
+-
+-    var usage = this.calcUsage(node);
+-    var lowerLimit = (this.selectedCategory - 1) * 0.2;
+-    var upperLimit = this.selectedCategory * 0.2;
+-    if (lowerLimit <= usage && usage <= upperLimit) {
+-      return true;
+-    }
+-    return false;
+-  },
+-
+-  // data:
+-  //    [{label=label1, value=value1}, ...]
+-  //    ...
+-  renderCells: function (model, title) {
+-    var selectedOption = d3.select("select").property("value");
+-    var data = [];
+-    model.forEach(function (o) {
+-      data.push(o);
+-    });
+-
+-    this.chart.g.remove();
+-    this.chart.g = this.chart.svg.append("g");
+-    var g = this.chart.g;
+-    var layout = this.getLayout();
+-    layout.margin = 50;
+-
+-    let racks = new Set();
+-    for (var i = 0; i < data.length; i++) {
+-      racks.add(data[i].get("rack"));
+-    }
+-
+-    let racksArray = [];
+-    racks.forEach(v => racksArray.push(v));
+-
+-    var xOffset = layout.margin;
+-    var yOffset = layout.margin * 3;
+-
+-    var gradientStartColor = "#60cea5";
+-    var gradientEndColor = "#ffbc0b";
+-
+-    var colorFunc = d3.interpolateRgb(d3.rgb(gradientStartColor), d3.rgb(gradientEndColor));
+-
+-    var sampleXOffset = (layout.x2 - layout.x1) / 2 - 2.5 * this.SAMPLE_CELL_WIDTH -
+-      2 * this.CELL_MARGIN;
+-    var sampleYOffset = layout.margin * 2;
+-    var text;
+-
+-    for (i = 1; i <= 5; i++) {
+-      var ratio = i * 0.2 - 0.1;
+-
+-      var rect = g.append("rect")
+-        .attr("x", sampleXOffset)
+-        .attr("y", sampleYOffset)
+-        .attr("fill", this.selectedCategory === i ? "#26bbf0" : colorFunc(ratio))
+-        .attr("width", this.SAMPLE_CELL_WIDTH)
+-        .attr("height", this.SAMPLE_HEIGHT)
+-        .attr("class", "hyperlink");
+-      this.bindSelectCategory(rect, i);
+-      text = g.append("text")
+-        .text("" + (ratio * 100).toFixed(1) + "% Used")
+-        .attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
+-        .attr("x", sampleXOffset + this.SAMPLE_CELL_WIDTH / 2)
+-        .attr("class", "heatmap-cell hyperlink");
+-      this.bindSelectCategory(text, i);
+-      sampleXOffset += this.CELL_MARGIN + this.SAMPLE_CELL_WIDTH;
+-    }
+-
+-    if (this.selectedCategory !== 0) {
+-      text = g.append("text")
+-        .text("Clear")
+-        .attr("y", sampleYOffset + this.SAMPLE_HEIGHT / 2 + 5)
+-        .attr("x", sampleXOffset + 20)
+-        .attr("class", "heatmap-clear hyperlink");
+-      this.bindSelectCategory(text, 0);
+-    }
+-
+-    var chartXOffset = -1;
+-
+-    this.totalContainers = 0;
+-    for (i = 0; i < racksArray.length; i++) {
+-      text = g.append("text")
+-        .text(racksArray[i])
+-        .attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
+-        .attr("x", layout.margin)
+-        .attr("class", "heatmap-rack");
+-
+-      if (-1 === chartXOffset) {
+-        chartXOffset = layout.margin + text.node().getComputedTextLength() + 30;
+-      }
+-
+-      xOffset = chartXOffset;
+-
+-      for (var j = 0; j < data.length; j++) {
+-        var rack = data[j].get("rack");
+-
+-        if (rack === racksArray[i]) {
+-          this.totalContainers += data[j].get("numContainers");
+-          this.addNode(g, xOffset, yOffset, colorFunc, data[j]);
+-          xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
+-          if (xOffset + this.CELL_MARGIN + this.CELL_WIDTH >= layout.x2 -
+-            layout.margin) {
+-            xOffset = chartXOffset;
+-            yOffset = yOffset + this.CELL_MARGIN + this.CELL_HEIGHT;
+-          }
+-
+-        }
+-      }
+-
+-      while (xOffset > chartXOffset && xOffset + this.CELL_MARGIN +
+-        this.CELL_WIDTH < layout.x2 - layout.margin) {
+-        this.addPlaceholderNode(g, xOffset, yOffset);
+-        xOffset += this.CELL_MARGIN + this.CELL_WIDTH;
+-      }
+-
+-      if (xOffset !== chartXOffset) {
+-        xOffset = chartXOffset;
+-        yOffset += this.CELL_MARGIN + this.CELL_HEIGHT;
+-      }
+-      yOffset += this.RACK_MARGIN;
+-    }
+-
+-    layout.y2 = yOffset + layout.margin;
+-    this.adjustMaxHeight(layout.y2);
+-    this.renderTitleAndBG(g, title + selectedOption + ")" , layout, false);
+-  },
+-
+-  addNode: function (g, xOffset, yOffset, colorFunc, data) {
+-    var rect = g.append("rect")
+-      .attr("y", yOffset)
+-      .attr("x", xOffset)
+-      .attr("height", this.CELL_HEIGHT)
+-      .attr("fill", colorFunc(this.calcUsage(data)))
+-      .attr("width", this.CELL_WIDTH)
+-      .attr("tooltiptext", data.get("toolTipText") + this.getToolTipText(data));
+-
+-    if (this.isNodeSelected(data)) {
+-      rect.style("opacity", 0.8);
+-      this.bindTP(rect, rect);
+-    } else {
+-      rect.style("opacity", 0.8);
+-      rect.attr("fill", "DimGray");
+-    }
+-    var node_id = data.get("id"),
+-        node_addr = encodeURIComponent(data.get("nodeHTTPAddress")),
+-        href = `#/yarn-node/${node_id}/${node_addr}/info`;
+-    var nodeHostName = data.get("nodeHostName");
+-    var a = g.append("a")
+-      .attr("href", href);
+-    a.append("text")
+-      .text(nodeHostName.length > 30 ? nodeHostName.substr(0, 30) + '...' : nodeHostName)
+-      .attr("y", yOffset + this.CELL_HEIGHT / 2 + 5)
+-      .attr("x", nodeHostName.length > 30 ? xOffset + 10 : xOffset + this.CELL_WIDTH / 2)
+-      .style("text-anchor", nodeHostName.length > 30 ? "start" : "middle")
+-      .attr("class", this.isNodeSelected(data) ? "heatmap-cell" : "heatmap-cell-notselected");
+-    if (this.isNodeSelected(data)) {
+-      this.bindTP(a, rect);
+-    }
+-  },
+-
+-  addPlaceholderNode: function(g, xOffset, yOffset) {
+-    g.append("rect")
+-      .attr("y", yOffset)
+-      .attr("x", xOffset)
+-      .attr("height", this.CELL_HEIGHT)
+-      .attr("fill", "grey")
+-      .attr("width", this.CELL_WIDTH)
+-      .style("opacity", 0.20);
+-  },
+-
+-  draw: function() {
+-    this.initChart(true);
+-    this.renderCells(this.get("model"), this.get("title"), this.get("textWidth"));
+-  },
+-
+-  didInsertElement: function () {
+-    var self = this;
+-    var optionsData = [this.memoryLabel, this.cpuLabel, this.containersLabel];
+-    d3.select("#heatmap-select")
+-      .on('change', function() {
+-        self.renderCells(self.get("model"), self.get("title"), self.get("textWidth"));
+-      })
+-      .selectAll('option')
+-      .data(optionsData).enter()
+-      .append('option')
+-      .text(function (d) { return d; });
+-
+-    this.draw();
+-  },
+-
+-  actions: {
+-    applyFilter: function(event) {
+-      this.filter = event.srcElement.value;
+-      this.selectedCategory = 0;
+-      this.didInsertElement();
+-    }
+-  },
+-
+-  calcUsage: function(data) {
+-    var selectedOption = d3.select('select').property("value");
+-    if (selectedOption === this.memoryLabel) {
+-      return data.get("usedMemoryMB") /
+-        (data.get("usedMemoryMB") + data.get("availMemoryMB"));
+-    }
+-    else if (selectedOption === this.cpuLabel) {
+-      return data.get("usedVirtualCores") /
+-        (data.get("usedVirtualCores") + data.get("availableVirtualCores"));
+-    }
+-    else if (selectedOption === this.containersLabel) {
+-      var totalContainers = this.totalContainers;
+-      if (totalContainers === 0) { return 0; }
+-      return data.get("numContainers") / totalContainers;
+-    }
+-  },
+-
+-  getToolTipText: function(data) {
+-    var selectedOption = d3.select('select').property("value");
+-    if (selectedOption === this.memoryLabel) {
+-      return "<p>Used Memory: " + Math.round(data.get("usedMemoryMB")) + " MB</p>" +
+-        "<p>Available Memory: " + Math.round(data.get("availMemoryMB")) + " MB</p>";
+-    }
+-    else if (selectedOption === this.cpuLabel) {
+-      return "<p>Used VCores: " + Math.round(data.get("usedVirtualCores")) + " VCores</p>" +
+-        "<p>Available VCores: " + Math.round(data.get("availableVirtualCores")) + " VCores</p>";
+-    }
+-    else if (selectedOption === this.containersLabel) {
+-        return "<p>Containers: " + Math.round(data.get("numContainers")) + " Containers</p>" +
+-          "<p>Total Containers: " + this.totalContainers + " Containers</p>";
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
+deleted file mode 100644
+index ef81c05dca9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-memusage-by-nodes-stacked-barchart.js
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import StackedBarchart from 'yarn-ui/components/stacked-barchart';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default StackedBarchart.extend({
+-  getDataForRender: function(containers, nodes) {
+-    var arr = [];
+-    var nodeToResources = {};
+-    nodes.forEach(function(n) {
+-      nodeToResources[n.id] =
+-      {
+-        used: Number(n.get("usedMemoryMB")),
+-        avail: Number(n.get("availMemoryMB"))
+-      };
+-    });
+-
+-    containers.forEach(function(c) {
+-      res = nodeToResources[c.get("assignedNodeId")];
+-      if (res) {
+-        if (!res.usedByTheApp) {
+-          res.usedByTheApp = 0;
+-        }
+-        res.usedByTheApp += Number(c.get("allocatedMB"));
+-      }
+-    });
+-
+-    for (var nodeId in nodeToResources) {
+-      var res = nodeToResources[nodeId];
+-
+-      var subArr = [];
+-      var value = res.usedByTheApp ? res.usedByTheApp : 0;
+-      subArr.push({
+-        value: value,
+-        bindText: "This app uses " + Converter.memoryToSimpliedUnit(value) + " on node=" + nodeId,
+-      });
+-
+-      value = res.used - value;
+-      value = Math.max(value, 0);
+-      subArr.push({
+-        value: value,
+-        bindText: "Other applications use " + Converter.memoryToSimpliedUnit(value) + " on node=" + nodeId,
+-      });
+-
+-      subArr.push({
+-        value: res.avail,
+-        bindText: Converter.memoryToSimpliedUnit(res.avail) + " memory is available on node=" + nodeId
+-      });
+-
+-      arr.push(subArr);
+-    }
+-
+-    return arr;
+-  },
+-
+-  didInsertElement: function() {
+-    this.initChart(true);
+-
+-    this.colors = ["lightsalmon", "Grey", "mediumaquamarine"];
+-
+-    var containers = this.get("rmContainers");
+-    var nodes = this.get("nodes");
+-
+-    var data = this.getDataForRender(containers, nodes);
+-
+-    this.show(
+-      data, this.get("title"), ["Used by this app", "Used by other apps", "Available"]
+-    );
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
+deleted file mode 100644
+index 27822d2b357..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-ncontainers-by-nodes-stacked-barchart.js
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import StackedBarchart from 'yarn-ui/components/stacked-barchart';
+-
+-export default StackedBarchart.extend({
+-  getDataForRender: function(containers, nodes) {
+-    var arr = [];
+-    var nodeToContainers = {};
+-    nodes.forEach(function(n) {
+-      nodeToContainers[n.id] = 0;
+-    });
+-
+-    containers.forEach(function(c) {
+-      var nodeId = c.get("assignedNodeId");
+-      var n = nodeToContainers[nodeId];
+-      if (undefined !== n) {
+-        nodeToContainers[nodeId] += 1;
+-      }
+-    });
+-
+-    for (var nodeId in nodeToContainers) {
+-      var n = nodeToContainers[nodeId];
+-
+-      var subArr = [];
+-      subArr.push({
+-        value: n,
+-        bindText: "This app has " + n + " containers running on node=" + nodeId
+-      });
+-
+-      arr.push(subArr);
+-    }
+-
+-    return arr;
+-  },
+-
+-  didInsertElement: function() {
+-    this.initChart(true);
+-
+-    this.colors = ["Orange", "Grey", "Gainsboro"];
+-
+-    var containers = this.get("rmContainers");
+-    var nodes = this.get("nodes");
+-
+-    var data = this.getDataForRender(containers, nodes);
+-
+-    this.show(
+-      data, this.get("title"), ["Running containers from this app"]);
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-vcoreusage-by-nodes-stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-vcoreusage-by-nodes-stacked-barchart.js
+deleted file mode 100644
+index acb6f6e0599..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/per-app-vcoreusage-by-nodes-stacked-barchart.js
++++ /dev/null
+@@ -1,85 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import StackedBarchart from 'yarn-ui/components/stacked-barchart';
+-
+-export default StackedBarchart.extend({
+-  getDataForRender: function(containers, nodes) {
+-    var arr = [];
+-    var nodeToResources = {};
+-    nodes.forEach(function(n) {
+-      nodeToResources[n.id] =
+-      {
+-        used: Number(n.get("usedVirtualCores")),
+-        avail: Number(n.get("availableVirtualCores"))
+-      };
+-    });
+-
+-    containers.forEach(function(c) {
+-      res = nodeToResources[c.get("assignedNodeId")];
+-      if (res) {
+-        if (!res.usedByTheApp) {
+-          res.usedByTheApp = 0;
+-        }
+-        res.usedByTheApp += Number(c.get("allocatedVCores"));
+-      }
+-    });
+-
+-    for (var nodeId in nodeToResources) {
+-      var res = nodeToResources[nodeId];
+-
+-      var subArr = [];
+-      var value = res.usedByTheApp ? res.usedByTheApp : 0;
+-      subArr.push({
+-        value: value,
+-        bindText: "This app uses " + value + " vcores on node=" + nodeId,
+-      });
+-
+-      value = res.used - value;
+-      value = Math.max(value, 0);
+-      subArr.push({
+-        value: value,
+-        bindText: "Other applications use " + value + " vcores on node=" + nodeId,
+-      });
+-
+-      subArr.push({
+-        value: res.avail,
+-        bindText: res.avail + (res.avail > 1 ? " vcores are" : " vcore is") + " available on node=" + nodeId
+-      });
+-
+-      arr.push(subArr);
+-    }
+-
+-    return arr;
+-  },
+-
+-  didInsertElement: function() {
+-    this.initChart(true);
+-
+-    this.colors = ["lightsalmon", "Grey", "mediumaquamarine"];
+-
+-    var containers = this.get("rmContainers");
+-    var nodes = this.get("nodes");
+-
+-    var data = this.getDataForRender(containers, nodes);
+-
+-    this.show(
+-      data, this.get("title"), ["Used by this app", "Used by other apps", "Available"]
+-    );
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-configuration-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-configuration-table.js
+deleted file mode 100644
+index 4b741b88627..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-configuration-table.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-navigator.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-navigator.js
+deleted file mode 100644
+index 2cecefb7720..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-navigator.js
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from "ember";
+-
+-export default Ember.Component.extend(Ember.TargetActionSupport,{
+-  actions: {
+-    filterQueuesByPartition(filter) {
+-      this.set("filteredPartition", filter);
+-      this.sendAction("setFilter", filter);
+-    }
+-  },
+-  didInsertElement: function() {
+-    $(".js-filter-queue-by-labels").select2({
+-      width: "350px",
+-      multiple: false
+-    });
+-
+-    $(".js-filter-queue-by-labels").on("select2:select", e => {
+-      this.triggerAction({
+-        action: "filterQueuesByPartition",
+-        target: this,
+-        actionContext: e.params.data.text
+-      });
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
+deleted file mode 100644
+index 5426838b2f3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-usage-donut-chart.js
++++ /dev/null
+@@ -1,67 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import BaseUsageDonutChart from 'yarn-ui/components/base-usage-donut-chart';
+-import ColorUtils from 'yarn-ui/utils/color-utils';
+-import HrefAddressUtils from 'yarn-ui/utils/href-address-utils';
+-
+-export default BaseUsageDonutChart.extend({
+-  colors: d3.scale.category20().range(),
+-
+-  draw: function() {
+-    var usageByQueues = [];
+-    var avail = 100;
+-
+-    this.get("data").forEach(function (queue) {
+-      var v = queue.get("absUsedCapacity");
+-
+-      if (queue.get("isLeafQueue")) {
+-        if (v > 1e-2) {
+-          usageByQueues.push({
+-            label: queue.get("id"),
+-            link: HrefAddressUtils.getQueueLink(queue.get("id")),
+-            value: v.toFixed(2)
+-          });
+-
+-          avail = avail - v;
+-        }
+-      }
+-    });
+-
+-    usageByQueues.sort(function(a, b) {
+-      return b.value - a.value;
+-    });
+-
+-    usageByQueues = this.mergeLongTails(usageByQueues, 8);
+-
+-    usageByQueues.push({
+-      label: "Available",
+-      value: avail.toFixed(2)
+-    });
+-
+-    this.colors = ColorUtils.getColors(usageByQueues.length, ["others", "good"], true);
+-
+-    this.renderDonutChart(usageByQueues, this.get("title"), this.get("showLabels"),
+-      this.get("middleLabel"), "100%", "%");
+-  },
+-
+-  didInsertElement: function() {
+-    this.initChart();
+-    this.draw();
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
+deleted file mode 100644
+index f5fb68d1c83..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/queue-view.js
++++ /dev/null
+@@ -1,288 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ChartUtilsMixin from 'yarn-ui/mixins/charts-utils';
+-
+-export default Ember.Component.extend(ChartUtilsMixin, {
+-  queues: {
+-    data: undefined,
+-    foldedQueues: {},
+-    selectedQueueCircle: undefined,
+-    maxDepth: -1,
+-  },
+-
+-  queueColors: d3.scale.category20().range(),
+-
+-  renderQueue: function (now, depth, sequence) {
+-    if (depth > this.queues.maxDepth) {
+-      this.queues.maxDepth = depth;
+-    }
+-
+-    var cx = 20 + depth * 30;
+-    var cy = 20 + sequence * 30;
+-    var name = now.get("name");
+-
+-    var g = this.queues.dataGroup.append("g")
+-      .attr("id", "queue-" + name + "-g");
+-
+-    var folded = this.queues.foldedQueues[name];
+-    var isParentQueue = false;
+-
+-    // render its children
+-    var children = [];
+-    var childrenNames = now.get("children");
+-    if (childrenNames) {
+-      childrenNames.forEach(function (name) {
+-        isParentQueue = true;
+-        var child = this.queues.data[name];
+-        if (child) {
+-          children.push(child);
+-        }
+-      }.bind(this));
+-    }
+-    if (folded) {
+-      children = [];
+-    }
+-    var linefunction = d3.svg.line()
+-      .interpolate("basis")
+-      .x(function (d) {
+-        return d.x;
+-      })
+-      .y(function (d) {
+-        return d.y;
+-      });
+-
+-    for (var i = 0; i < children.length; i++) {
+-      sequence = sequence + 1;
+-      // Get center of children queue
+-      var cc = this.renderQueue(children[i],
+-        depth + 1, sequence);
+-      g.append("path")
+-        .attr("class", "queue")
+-        .attr("d", linefunction([{
+-          x: cx,
+-          y: cy
+-        }, {
+-          x: cc.x - 20,
+-          y: cc.y
+-        }, cc]));
+-    }
+-
+-    var circle = g.append("circle")
+-      .attr("cx", cx)
+-      .attr("cy", cy)
+-      .attr("class", "queue");
+-
+-    circle.on('mouseover', function () {
+-    }.bind(this));
+-    circle.on('mouseout', function () {
+-      if (circle !== this.queues.selectedQueueCircle) {
+-        circle.style("fill", this.queueColors[0]);
+-      }
+-    }.bind(this));
+-    circle.on('click', function () {
+-      circle.style("fill", this.queueColors[2]);
+-      var pre = this.queues.selectedQueueCircle;
+-      this.queues.selectedQueueCircle = circle;
+-      if (pre) {
+-        pre.on('mouseout')();
+-      }
+-      this.renderCharts(name);
+-    }.bind(this));
+-    circle.on('dblclick', function () {
+-      if (!isParentQueue) {
+-        return;
+-      }
+-
+-      if (this.queues.foldedQueues[name]) {
+-        delete this.queues.foldedQueues[name];
+-      } else {
+-        this.queues.foldedQueues[name] = now;
+-      }
+-      this.renderQueues();
+-    }.bind(this));
+-
+-    var text = name;
+-    if (folded) {
+-      text = name + " (+)";
+-    }
+-
+-    // print queue's name
+-    g.append("text")
+-      .attr("x", cx + 30)
+-      .attr("y", cy + 5)
+-      .text(text)
+-      .attr("class", "queue");
+-
+-    return {
+-      x: cx,
+-      y: cy
+-    };
+-  },
+-
+-  renderQueues: function () {
+-    if (this.queues.dataGroup) {
+-      this.queues.dataGroup.remove();
+-    }
+-    // render queues
+-    this.queues.dataGroup = this.canvas.svg.append("g")
+-      .attr("id", "queues-g");
+-
+-    if (this.queues.data) {
+-      this.renderQueue(this.queues.data['root'], 0, 0);
+-
+-    }
+-  },
+-
+-  draw: function () {
+-    this.queues.data = {};
+-    this.get("model")
+-      .forEach(function (o) {
+-        this.queues.data[o.id] = o;
+-      }.bind(this));
+-
+-    // get w/h of the svg
+-    var bbox = d3.select("#main-container")
+-      .node()
+-      .getBoundingClientRect();
+-    this.canvas.w = bbox.width;
+-    this.canvas.h = Math.max(Object.keys(this.queues.data)
+-        .length * 35, 1500);
+-
+-    this.canvas.svg = d3.select("#main-container")
+-      .append("svg")
+-      .attr("width", this.canvas.w)
+-      .attr("height", this.canvas.h)
+-      .attr("id", "main-svg");
+-
+-    this.renderBackground();
+-
+-    this.renderQueues();
+-    this.renderCharts("root");
+-  },
+-
+-  didInsertElement: function () {
+-    this.draw();
+-  },
+-
+-  /*
+-   * data = [{label="xx", value=},{...}]
+-   */
+-  renderTable: function (data) {
+-    d3.select("#main-svg")
+-      .append('table')
+-      .selectAll('tr')
+-      .data(data)
+-      .enter()
+-      .append('tr')
+-      .selectAll('td')
+-      .data(function (d) {
+-        return d;
+-      })
+-      .enter()
+-      .append('td')
+-      .text(function (d) {
+-        return d;
+-      });
+-  },
+-
+-  renderQueueCapacities: function (queue, layout) {
+-    // Render bar chart
+-    this.renderCells(this.charts.g, [{
+-      label: "Cap",
+-      value: queue.get("capacity")
+-    }, {
+-      label: "MaxCap",
+-      value: queue.get("maxCapacity")
+-    }, {
+-      label: "UsedCap",
+-      value: queue.get("usedCapacity")
+-    }], "Queue Capacities", layout, 60);
+-  },
+-
+-  renderChildrenCapacities: function (queue, layout) {
+-    var data = [];
+-    var children = queue.get("children");
+-    if (children) {
+-      for (var i = 0; i < children.length; i++) {
+-        var child = this.queues.data[children[i]];
+-        data.push({
+-          label: child.get("name"),
+-          value: child.get("capacity")
+-        });
+-      }
+-    }
+-
+-    this.renderDonutChart(this.charts.g, data, "Children Capacities", layout, true);
+-  },
+-
+-  renderChildrenUsedCapacities: function (queue, layout) {
+-    var data = [];
+-    var children = queue.get("children");
+-    if (children) {
+-      for (var i = 0; i < children.length; i++) {
+-        var child = this.queues.data[children[i]];
+-        data.push({
+-          label: child.get("name"),
+-          value: child.get("usedCapacity")
+-        });
+-      }
+-    }
+-
+-    this.renderDonutChart(this.charts.g, data, "Children Used Capacities", layout, true);
+-  },
+-
+-  renderLeafQueueUsedCapacities: function (layout) {
+-    var leafQueueUsedCaps = [];
+-    for (var queueName in this.queues.data) {
+-      var q = this.queues.data[queueName];
+-      if ((!q.get("children")) || q.get("children")
+-          .length === 0) {
+-        // it's a leafqueue
+-        leafQueueUsedCaps.push({
+-          label: q.get("name"),
+-          value: q.get("usedCapacity")
+-        });
+-      }
+-    }
+-
+-    this.renderDonutChart(this.charts.g, leafQueueUsedCaps, "LeafQueues Used Capacities",
+-      layout, true);
+-  },
+-
+-  renderCharts: function (queueName) {
+-    this.charts.leftBannerLen = this.queues.maxDepth * 30 + 100;
+-    this.initCharts();
+-
+-    var queue = this.queues.data[queueName];
+-    var idx = 0;
+-
+-    if (queue.get("name") === "root") {
+-      this.renderLeafQueueUsedCapacities(this.getLayout(idx++));
+-    }
+-    if (queue.get("name") !== "root") {
+-      this.renderQueueCapacities(queue, this.getLayout(idx++));
+-    }
+-    if (queue.get("children") && queue.get("children")
+-        .length > 0) {
+-      this.renderChildrenCapacities(queue, this.getLayout(idx++));
+-      this.renderChildrenUsedCapacities(queue, this.getLayout(idx++));
+-    }
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
+deleted file mode 100644
+index 23c2cfb8de1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  serviceDef: null,
+-  currentComponent: null,
+-  duplicateNameError: false,
+-
+-  actions: {
+-    showAddComponentModal() {
+-      var newComp = this.get('serviceDef').createNewServiceComponent();
+-      this.set('currentComponent', newComp);
+-      this.set('duplicateNameError', false);
+-      this.$('#addComponentModal').modal('show');
+-    },
+-
+-    addNewComponent() {
+-      this.set('duplicateNameError', false);
+-      if (this.isCurrentNameDuplicate()) {
+-        this.set('duplicateNameError', true);
+-        return;
+-      }
+-      this.get('serviceDef.serviceComponents').addObject(this.get('currentComponent'));
+-      this.$('#addComponentModal').modal('hide');
+-    },
+-
+-    removeComponent(component) {
+-      this.get('serviceDef.serviceComponents').removeObject(component);
+-    }
+-  },
+-
+-  isCurrentNameDuplicate() {
+-    var currName = this.get('currentComponent.name');
+-    var item = this.get('serviceDef.serviceComponents').findBy('name', currName);
+-    return !Ember.isNone(item);
+-  },
+-
+-  isValidCurrentComponent: Ember.computed.and('currentComponent', 'currentComponent.name', 'currentComponent.cpus', 'currentComponent.memory', 'currentComponent.numOfContainers', 'currentComponent.launchCommand')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-config-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-config-table.js
+deleted file mode 100644
+index b0a78dd27c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-config-table.js
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  serviceDef: null,
+-  currentConfig: null,
+-  serviceConfigJson: '',
+-
+-  actions: {
+-    showNewConfigurationModal() {
+-      var newConfig = this.get('serviceDef').createNewServiceConfig();
+-      this.set('currentConfig', newConfig);
+-      this.$('#addConfigurationModal').modal('show');
+-      if (this.get('isNonEmptyComponents') && this.get('currentConfig.componentName') === '') {
+-        this.set('currentConfig.componentName', this.get('componentNames.firstObject'));
+-      }
+-    },
+-
+-    removeConfiguration(config) {
+-      this.get('serviceDef.serviceConfigs').removeObject(config);
+-    },
+-
+-    configTypeChanged(type) {
+-      this.set('currentConfig.type', type);
+-      if (type === 'quicklink') {
+-        this.set('currentConfig.scope', 'service');
+-        this.set('currentConfig.componentName', '');
+-      }
+-    },
+-
+-    addNewConfiguration() {
+-      this.get('serviceDef.serviceConfigs').addObject(this.get('currentConfig'));
+-      this.$('#addConfigurationModal').modal('hide');
+-    },
+-
+-    showServiceConfigUploadModal() {
+-      this.set('serviceConfigJson', '');
+-      this.$("#service_config_upload_modal").modal('show');
+-    },
+-
+-    uploadServiceConfig(json) {
+-      this.get('serviceDef').convertJsonServiceConfigs(json);
+-      this.$("#service_config_upload_modal").modal('hide');
+-    },
+-
+-    configScopeChanged(scope) {
+-      this.set('currentConfig.scope', scope);
+-    },
+-
+-    scopeComponentChanged(name) {
+-      this.set('currentConfig.componentName', name);
+-    }
+-  },
+-
+-  isNonEmptyComponents: Ember.computed('serviceDef.serviceComponents.length', function() {
+-    return this.get('serviceDef.serviceComponents.length') > 0;
+-  }),
+-
+-  isNotQuicklink: Ember.computed('currentConfig.type', function() {
+-    return this.get('currentConfig.type') !== "quicklink";
+-  }),
+-
+-  componentNames: Ember.computed('serviceDef.serviceComponents.[]', function() {
+-    var names = [];
+-    this.get('serviceDef.serviceComponents').forEach(function(cmp) {
+-      names.push(cmp.get('name'));
+-    });
+-    return names;
+-  }),
+-
+-  isValidCurrentConfig: Ember.computed.and('currentConfig', 'currentConfig.name', 'currentConfig.value')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-fileconfig-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-fileconfig-table.js
+deleted file mode 100644
+index 7c06152813e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-fileconfig-table.js
++++ /dev/null
+@@ -1,112 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  serviceDef: null,
+-  currentFileConfig: null,
+-  fileConfigJson: '',
+-  fileConfigProps: '',
+-  propertyViewer: null,
+-  parseError: '',
+-
+-  actions: {
+-    showNewConfigFileModal() {
+-      var newFile = this.get('serviceDef').createNewFileConfig();
+-      this.set('currentFileConfig', newFile);
+-      this.set('fileConfigProps', '');
+-      this.set('parseError', '');
+-      this.$('#addFileConfigModal').modal('show');
+-      if (this.get('isNonEmptyComponents') && this.get('currentFileConfig.componentName') === '') {
+-        this.set('currentFileConfig.componentName', this.get('componentNames.firstObject'));
+-      }
+-    },
+-
+-    removeFileConfiguration(file) {
+-      this.get('serviceDef.fileConfigs').removeObject(file);
+-    },
+-
+-    addNewFileConfig() {
+-      this.set('parseError', '');
+-      var props = this.get('fileConfigProps');
+-      if (props) {
+-        try {
+-          var parsed = JSON.parse(props);
+-          this.set('currentFileConfig.props', parsed);
+-        } catch (err) {
+-          this.set('parseError', `Invalid JSON: ${err.message}`);
+-          throw err;
+-        }
+-      }
+-      this.get('serviceDef.fileConfigs').addObject(this.get('currentFileConfig'));
+-      this.$('#addFileConfigModal').modal('hide');
+-    },
+-
+-    showFileConfigUploadModal() {
+-      this.set('fileConfigJson', '');
+-      this.$("#service_file_config_upload_modal").modal('show');
+-    },
+-
+-    uploadFileConfig(json) {
+-      this.get('serviceDef').convertJsonFileConfigs(json);
+-      this.$("#service_file_config_upload_modal").modal('hide');
+-    },
+-
+-    configScopeChanged(scope) {
+-      this.set('currentFileConfig.scope', scope);
+-    },
+-
+-    scopeComponentChanged(name) {
+-      this.set('currentFileConfig.componentName', name);
+-    },
+-
+-    configTypeChanged(type) {
+-      this.set('currentFileConfig.type', type);
+-      if (type === "TEMPLATE") {
+-        this.set('currentFileConfig.props', null);
+-        this.set('fileConfigProps', '');
+-      }
+-    },
+-
+-    showFileConfigPropertyViewer(props) {
+-      this.set('propertyViewer', props);
+-      this.$("#file_config_properties_viewer").modal('show');
+-    }
+-  },
+-
+-  isNonEmptyComponents: Ember.computed('serviceDef.serviceComponents.length', function() {
+-    return this.get('serviceDef.serviceComponents.length') > 0;
+-  }),
+-
+-  componentNames: Ember.computed('serviceDef.serviceComponents.[]', function() {
+-    var names = [];
+-    this.get('serviceDef.serviceComponents').forEach(function(cmp) {
+-      names.push(cmp.get('name'));
+-    });
+-    return names;
+-  }),
+-
+-  isValidCurrentFileConfig: Ember.computed('currentFileConfig', 'currentFileConfig.srcFile', 'currentFileConfig.destFile', 'fileConfigProps', function() {
+-    return this.get('currentFileConfig') && this.get('currentFileConfig.destFile') && (this.get('currentFileConfig.srcFile') || this.get('fileConfigProps'));
+-  }),
+-
+-  isConfigTypeHadoopXml: Ember.computed('currentFileConfig.type', function() {
+-    return this.get('currentFileConfig.type') === 'HADOOP_XML';
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
+deleted file mode 100644
+index 8527e91867f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-bar-chart.js
++++ /dev/null
+@@ -1,206 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  data: [],
+-  xAxisTickFormatter: null,
+-  yAxisTickFormatter: null,
+-  xAxisText: '',
+-  yAxisText: '',
+-  enableTooltip: true,
+-  onBarChartClickCallback: Ember.K,
+-  hideTootlipOnBarChartClick: true,
+-
+-  initChart() {
+-    this.height = 400;
+-    this.barWidth = 30;
+-    this.width = Math.max(500, 40 * this.data.length);
+-  },
+-
+-  drawChart() {
+-    var margin = {top: 20, right: 20, bottom: 100, left: 100},
+-        axisLabelPadding = 10,
+-        width = this.width - margin.left - margin.right - axisLabelPadding,
+-        height = this.height - margin.top - margin.bottom - axisLabelPadding,
+-        xAxisText = this.xAxisText? this.xAxisText : '',
+-        yAxisText = this.yAxisText? this.yAxisText : '',
+-        data = this.data,
+-        self = this;
+-
+-    var xScale = d3.scale.ordinal().rangeRoundBands([0, width], 0.1);
+-    var yScale = d3.scale.linear().range([height, 0]);
+-
+-    var xAxis = d3.svg.axis()
+-        .scale(xScale)
+-        .orient("bottom")
+-        .tickFormat(function(tick) {
+-          if (self.isFunction(self.xAxisTickFormatter)) {
+-            return self.xAxisTickFormatter(tick);
+-          } else {
+-            return tick;
+-          }
+-        });
+-
+-    var yAxis = d3.svg.axis()
+-        .scale(yScale)
+-        .orient("left")
+-        .tickFormat(function(tick) {
+-          if (self.isFunction(self.yAxisTickFormatter)) {
+-            return self.yAxisTickFormatter(tick);
+-          } else {
+-            return tick;
+-          }
+-        });
+-
+-    var svg = d3.select(this.element)
+-      .append("svg")
+-        .attr("class", "simple-bar-chart")
+-        .attr("width", width + margin.left + margin.right + axisLabelPadding)
+-        .attr("height", height + margin.top + margin.bottom + axisLabelPadding)
+-      .append("g")
+-        .attr("transform", "translate("+(margin.left+axisLabelPadding)+","+(margin.top)+")");
+-
+-    xScale.domain(data.map(function(d) { return d.label; }));
+-    yScale.domain([0, d3.max(data, function(d) { return d.value; })]);
+-
+-    var gx = svg.append("g")
+-        .attr("class", "x axis")
+-        .attr("transform", "translate(0," + height + ")")
+-        .call(xAxis);
+-
+-    gx.selectAll("text")
+-        .style("text-anchor", "end")
+-        .attr("dx", "-.8em")
+-        .attr("dy", "-.3em")
+-        .attr("transform", "rotate(-60)");
+-
+-    gx.append("text")
+-        .attr("transform", "translate("+(width/2)+","+(margin.bottom)+")")
+-        .style("text-anchor", "middle")
+-        .text(xAxisText);
+-
+-    var gy = svg.append("g")
+-        .attr("class", "y axis")
+-        .call(yAxis);
+-
+-    gy.append("text")
+-        .attr("transform", "translate("+(-margin.left)+","+(height/2)+")rotate(-90)")
+-        .style("text-anchor", "middle")
+-        .text(yAxisText);
+-
+-    var barWidth = this.barWidth;
+-    var minBarWidth = Math.min(barWidth, xScale.rangeBand());
+-    var bars = svg.selectAll("bar")
+-        .data(data)
+-      .enter().append("rect")
+-        .attr("x", function(d) {
+-          var padding = 0;
+-          var rangeBand = xScale.rangeBand();
+-          if ((rangeBand - barWidth) > 0) {
+-            padding = (rangeBand - barWidth) / 2;
+-          }
+-          return xScale(d.label) + padding;
+-        })
+-        .attr("width", minBarWidth)
+-        .attr("y", function() {
+-          return yScale(0);
+-        })
+-        .attr("height", function() {
+-          return height - yScale(0);
+-        })
+-        .on('click', function(d) {
+-          if (self.enableTooltip && self.hideTootlipOnBarChartClick) {
+-            self.hideTootlip();
+-          }
+-          if (self.isFunction(self.onBarChartClickCallback)) {
+-            self.onBarChartClickCallback(d);
+-          }
+-        });
+-
+-    bars.transition()
+-        .duration(1000)
+-        .delay(100)
+-        .attr("y", function(d) {
+-          return yScale(d.value);
+-        })
+-        .attr("height", function(d) {
+-          return height - yScale(d.value);
+-        });
+-
+-    if (this.enableTooltip) {
+-      this.bindTooltip(bars);
+-    }
+-  },
+-
+-  bindTooltip(bars) {
+-    var self = this;
+-    var tooltip = this.tooltip;
+-    if (tooltip) {
+-      bars.on("mouseenter", function(d) {
+-        tooltip.html(d.tooltip);
+-        self.showTooltip();
+-      }).on("mousemove", function() {
+-        tooltip.style("left", (d3.event.pageX + 5) + "px")
+-            .style("top", (d3.event.pageY - 25) + "px");
+-      }).on("mouseout", function() {
+-        self.hideTootlip();
+-      });
+-    }
+-  },
+-
+-  initTooltip() {
+-    this.tooltip = d3.select("body")
+-        .append("div")
+-        .attr("class", "tooltip simple-barchart-tooltip")
+-        .style("opacity", 1);
+-
+-    this.hideTootlip();
+-  },
+-
+-  hideTootlip() {
+-    if (this.tooltip) {
+-     this.tooltip.style("display", "none");
+-    }
+-  },
+-
+-  showTooltip() {
+-    if (this.tooltip) {
+-     this.tooltip.style("display", "block");
+-    }
+-  },
+-
+-  isFunction(func) {
+-    return Ember.typeOf(func) === "function";
+-  },
+-
+-  didInsertElement() {
+-    this.initChart();
+-    if (this.enableTooltip) {
+-      this.initTooltip();
+-    }
+-    this.drawChart();
+-  },
+-
+-  willDestroyElement() {
+-    if (this.tooltip) {
+-      this.tooltip.remove();
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
+deleted file mode 100644
+index c5dadc3d925..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/simple-table.js
++++ /dev/null
+@@ -1,81 +0,0 @@
+-
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  didInsertElement: function() {
+-    var paging = this.get("paging") ? true : this.get("paging");
+-    var ordering = this.get("ordering") ? true : this.get("ordering");
+-    var info = this.get("info") ? true : this.get("info");
+-    var bFilter = this.get("bFilter") ? true : this.get("bFilter");
+-    var defaultSearch = this.get("defaultSearch") ? this.get("defaultSearch") : "";
+-
+-    // Defines sorter for the columns if not default.
+-    // Can also specify a custom sorter.
+-    var i;
+-    var colDefs = [];
+-    if (this.get("colTypes")) {
+-      var typesArr = this.get("colTypes").split(' ');
+-      var targetsArr = this.get("colTargets").split(' ');
+-      for (i = 0; i < typesArr.length; i++) {
+-        console.log(typesArr[i] + " " + targetsArr[i]);
+-        colDefs.push({
+-          type: typesArr[i],
+-          targets: parseInt(targetsArr[i])
+-        });
+-      }
+-    }
+-    // Defines initial column and sort order.
+-    var orderArr = [];
+-    if (this.get("colsOrder")) {
+-      var cols = this.get("colsOrder").split(' ');
+-      for (i = 0; i < cols.length; i++) {
+-        var col = cols[i].split(',');
+-        if (col.length !== 2) {
+-          continue;
+-        }
+-        var order = col[1].trim();
+-        if (order !== 'asc' && order !== 'desc') {
+-          continue;
+-        }
+-        var colOrder = [];
+-        colOrder.push(parseInt(col[0]));
+-        colOrder.push(order);
+-        orderArr.push(colOrder);
+-      }
+-    }
+-    if (orderArr.length === 0) {
+-      var defaultOrder = [0, 'asc'];
+-      orderArr.push(defaultOrder);
+-    }
+-    console.log(orderArr[0]);
+-    Ember.$('#' + this.get('table-id')).DataTable({
+-      "paging":   paging,
+-      "ordering": ordering,
+-      "info":     info,
+-      "bFilter": bFilter,
+-      "order": orderArr,
+-      "columnDefs": colDefs,
+-      "oSearch": {
+-        "sSearch": defaultSearch
+-      }
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
+deleted file mode 100644
+index e57d747e4d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/stacked-barchart.js
++++ /dev/null
+@@ -1,201 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import BaseChartComponent from 'yarn-ui/components/base-chart-component';
+-
+-export default BaseChartComponent.extend({
+-  MAX_BAR_HEIGHT: 120,
+-  MAX_BAR_WIDTH: 30,
+-  GAP: 5,
+-  filter: "",
+-  WIDTH_OF_SAMPLE: 200,
+-
+-  bindTP: function(element) {
+-    element.on("mouseover", function() {
+-      this.tooltip
+-        .style("left", (d3.event.pageX) + "px")
+-        .style("top", (d3.event.pageY - 28) + "px");
+-      element.style("opacity", 1.0);
+-    }.bind(this))
+-      .on("mousemove", function() {
+-        // Handle pie chart case
+-        var text = element.attr("tooltiptext");
+-
+-        this.tooltip.style("opacity", 0.9);
+-        this.tooltip.html(text)
+-          .style("left", (d3.event.pageX) + "px")
+-          .style("top", (d3.event.pageY - 28) + "px");
+-      }.bind(this))
+-      .on("mouseout", function() {
+-        this.tooltip.style("opacity", 0);
+-        element.style("opacity", 0.8);
+-      }.bind(this));
+-
+-    element.on("click", function() {
+-      if (element.attr("link")) {
+-        this.tooltip.remove();
+-        document.location.href = element.attr("link");
+-      }
+-    }.bind(this));
+-  },
+-
+-  printSamples: function(n, layout, g, colorTitles) {
+-    var yOffset = layout.margin * 3;
+-
+-    for (var i = 0; i < n; i++) {
+-      var xOffset = layout.x2 - this.WIDTH_OF_SAMPLE - layout.margin;
+-      g.append("rect").
+-        attr("fill", this.colors[i]).
+-        attr("x", xOffset).
+-        attr("y", yOffset).
+-        attr("width", 20).
+-        attr("height", 20);
+-
+-      g.append("text").
+-        attr("x", xOffset + 30).
+-        attr("y", yOffset + 10).
+-        text(colorTitles[i]);
+-
+-      yOffset = yOffset + 30;
+-    }
+-  },
+-
+-  // data:
+-  //    [[{value=xx, bindText=xx}, {value=yy, bindText=yy}],  [  ...    ]]
+-  //     __________________________________________________   ___________
+-  //                          bar-1                              bar-2
+-  show: function (data, title, colorTitles) {
+-    var width = this.MAX_BAR_WIDTH;
+-    var height = this.MAX_BAR_HEIGHT;
+-
+-    this.chart.g.remove();
+-    this.chart.g = this.chart.svg.append("g");
+-    var g = this.chart.g;
+-    var layout = this.getLayout();
+-    layout.margin = 50;
+-
+-    var nBarPerRow = Math.floor((layout.x2 - layout.x1 - 3 * layout.margin -
+-      this.WIDTH_OF_SAMPLE) /
+-      (width + this.GAP));
+-
+-    var xOffset;
+-    var yOffset = layout.margin * 2;
+-
+-    var maxValue = 0;
+-    var maxN = 0;
+-
+-    var i = 0;
+-    var j = 0;
+-
+-    for (i = 0; i < data.length; i++) {
+-      var total = 0;
+-      for (j = 0; j < data[i].length; j++) {
+-        total += data[i][j].value;
+-      }
+-
+-      if (total > maxValue) {
+-        maxValue = total;
+-      }
+-      if (data[i].length > maxN) {
+-        maxN = data[i].length;
+-      }
+-    }
+-
+-    // print samples
+-    this.printSamples(maxN, layout, g, colorTitles);
+-
+-    // print data
+-    data.sort(function(a, b) {
+-      return b[0].value - a[0].value;
+-    });
+-
+-    for (i = 0; i < data.length; i++) {
+-      if (i % nBarPerRow === 0) {
+-        xOffset = layout.margin;
+-        yOffset += layout.margin + height;
+-      }
+-
+-      var leftTopY = yOffset;
+-      for (j = 0; j < data[i].length; j++) {
+-        var dy = data[i][j].value * height / maxValue;
+-        if (dy > 0) {
+-          leftTopY = leftTopY - dy;
+-
+-          var node = g.append("rect").
+-            attr("fill", this.colors[j]).
+-            attr("x", xOffset).
+-            attr("y", leftTopY).
+-            attr("width", width).
+-            attr("height", dy).
+-            attr("tooltiptext",
+-              (data[i][j].bindText) ? data[i][j].bindText : data[i][j].value).
+-            attr("link", data[i][j].link)
+-            .style("opacity", 0.8);
+-
+-          this.bindTP(node);
+-        }
+-      }
+-
+-      if (data[i].length === 1) {
+-        g.append("text")
+-          .text(data[i][0].value)
+-          .attr("y", leftTopY - 10)
+-          .attr("x", xOffset + width / 2)
+-          .attr("class", "heatmap-cell")
+-          .style("fill", "black");
+-      }
+-
+-      xOffset += width + this.GAP;
+-    }
+-
+-    layout.y2 = yOffset + layout.margin;
+-    this.adjustMaxHeight(layout.y2);
+-    this.renderTitleAndBG(g, title, layout, false);
+-  },
+-
+-  draw: function() {
+-    this.initChart(true);
+-    //Mock.initMockNodesData(this);
+-
+-    // mock data
+-    var arr = [];
+-    for (var i = 0; i < 5; i++) {
+-      var subArr = [];
+-      for (var j = 0; j < Math.random() * 4 + 1; j++) {
+-        subArr.push({
+-          value : Math.abs(Math.random())
+-        });
+-      }
+-      arr.push(subArr);
+-    }
+-
+-    this.show(
+-      arr, this.get("title"));
+-  },
+-
+-  didInsertElement: function () {
+-    this.draw();
+-  },
+-
+-  actions: {
+-    applyFilter: function(event) {
+-      this.filter = event.srcElement.value;
+-      this.didInsertElement();
+-    }
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
+deleted file mode 100644
+index 3a2302a2fc3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/sunburst-chart.js
++++ /dev/null
+@@ -1,261 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-
+-  didInsertElement: function() {
+-    var json = buildHierarchy(this.get("arr"));
+-    createVisualization(json);
+-  },
+-
+-});
+-// Dimensions of sunburst.
+-var  width = 1000;
+-var  height = 750;
+-var  radius = Math.min(width, height) / 2;
+-// Breadcrumb dimensions: width, height, spacing, width of tip/tail.
+-var  b = { w: 225, h: 30, s: 3, t: 10 };
+-// Total size of all segments; we set this later, after loading the data.
+-var totalSize = 0;
+-var vis = null;
+-var  partition = null;
+-var  arc = null;
+-var colors = d3.scale.category20c();
+-
+-function colorMap(d) {
+-  return colors(d.name);
+-}
+-
+-// Given a node in a partition layout, return an array of all of its ancestor
+-// nodes, highest first, but excluding the root.
+-function  getAncestors(node) {
+-  var path = [];
+-  var current = node;
+-  while (current.parent) {
+-    path.unshift(current);
+-    current = current.parent;
+-  }
+-  return path;
+-}
+-
+-// Main function to draw and set up the visualization, once we have the data.
+-function createVisualization(json) {
+-  partition = d3.layout.partition()
+-      .size([2 * Math.PI, radius * radius])
+-      .value(function(d) { return d.size; });
+-  arc = d3.svg.arc()
+-      .startAngle(function(d) { return d.x; })
+-      .endAngle(function(d) { return d.x + d.dx; })
+-      .innerRadius(function(d) { return Math.sqrt(d.y); })
+-      .outerRadius(function(d) { return Math.sqrt(d.y + d.dy); });
+-  // Basic setup of page elements.
+-  initializeBreadcrumbTrail();
+-  //drawLegend();
+-  //d3.select("#togglelegend").on("click", toggleLegend);
+-
+-  // Bounding circle underneath the sunburst, to make it easier to detect
+-  // when the mouse leaves the parent g.
+-  vis = d3.select("#chart").append("svg:svg")
+-      .attr("width", width)
+-      .attr("height", height)
+-      .append("svg:g")
+-      .attr("id", "container")
+-      .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+-  vis.append("svg:circle").attr("r", radius)
+-      .style("opacity", 0);
+-
+-  // For efficiency, filter nodes to keep only those large enough to see.
+-  var nodes = partition.nodes(json)
+-    .filter(function(d) {
+-      return (d.dx > 0.005); // 0.005 radians = 0.29 degrees
+-    });
+-
+-  var path = vis.data([json]).selectAll("path")
+-    .data(nodes)
+-    .enter().append("svg:path")
+-    .attr("display", function(d) { return d.depth ? null : "none"; })
+-    .attr("d", arc)
+-    .attr("fill-rule", "evenodd")
+-    .attr("fill", colorMap)
+-    .style("opacity", 1)
+-    .on("mouseover", mouseover);
+-  // Add the mouseleave handler to the bounding circle.
+-  d3.select("#container").on("mouseleave", mouseleave);
+-
+-  // Get total size of the tree = value of root node from partition.
+-  totalSize = path.node().__data__.value;
+-}
+-
+-  // Take a 2-column CSV and transform it into a hierarchical structure suitable
+-  // for a partition layout. The first column is a sequence of step names, from
+-  // root to leaf, separated by hyphens. The second column is a count of how
+-  // often that sequence occurred.
+-function  buildHierarchy(csv) {
+-  var root = {"name": "root", "children": []};
+-  for (var i = 0; i < csv.length; i++) {
+-    var sequence = csv[i][0];
+-    var size = +csv[i][1];
+-    if (isNaN(size)) { // e.g. if this is a header row
+-      continue;
+-    }
+-    var parts = sequence.split("-");
+-    var currentNode = root;
+-    for (var j = 0; j < parts.length; j++) {
+-      var children = currentNode["children"];
+-      var nodeName = parts[j];
+-      var childNode;
+-      if (j + 1 < parts.length) {
+-        // Not yet at the end of the sequence; move down the tree.
+-        var foundChild = false;
+-        for (var k = 0; k < children.length; k++) {
+-          if (children[k]["name"] === nodeName) {
+-            childNode = children[k];
+-            foundChild = true;
+-            break;
+-          }
+-        }
+-        // If we don't already have a child node for this branch, create it.
+-        if (!foundChild) {
+-          childNode = {"name": nodeName, "children": []};
+-          children.push(childNode);
+-        }
+-        currentNode = childNode;
+-      } else {
+-        // Reached the end of the sequence; create a leaf node.
+-        childNode = {"name": nodeName, "size": size, "children": [], "sequence": sequence};
+-        children.push(childNode);
+-      }
+-    }
+-  }
+-  return root;
+-}
+-
+-// Fade all but the current sequence, and show it in the breadcrumb trail.
+-function mouseover(d) {
+-  //var percentage = (100 * d.value / totalSize).toPrecision(3);
+-  //var percentageString = percentage + "%";
+-  var percentageString = d.value;
+-
+-  d3.select("#percentage").html('<p align="center" style="font-size: 150%;"><b>' + percentageString +
+-      '</b></p><br/><p align="center">(' + d.name + ')</p>');
+-  d3.select("#explanation").style("visibility", "");
+-
+-  var sequenceArray = getAncestors(d);
+-  updateBreadcrumbs(sequenceArray, percentageString);
+-
+-  // Fade all the segments.
+-  d3.selectAll("path").style("opacity", 0.2);
+-
+-  // Then highlight only those that are an ancestor of the current segment.
+-  vis.selectAll("path")
+-    .filter(function(node) {
+-        return (sequenceArray.indexOf(node) >= 0);
+-    })
+-    .style("opacity", 1);
+-}
+-
+-// Restore everything to full opacity when moving off the visualization.
+-function mouseleave() {
+-  // Hide the breadcrumb trail
+-  d3.select("#trail").style("visibility", "hidden");
+-
+-  // Deactivate all segments during transition.
+-  d3.selectAll("path").on("mouseover", null);
+-
+-  // Transition each segment to full opacity and then reactivate it.
+-  d3.selectAll("path")
+-    .transition()
+-    .duration(1000)
+-    .style("opacity", 1)
+-    .each("end", function() {
+-      d3.select(this).on("mouseover", mouseover);
+-    });
+-
+-  d3.select("#explanation")
+-    .style("visibility", "hidden");
+-}
+-
+-function initializeBreadcrumbTrail() {
+-  // Add the svg area.
+-  var trail = d3.select("#sequence").append("svg:svg")
+-    .attr("width", width)
+-    .attr("height", 50)
+-    .attr("id", "trail");
+-  // Add the label at the end, for the percentage.
+-  trail.append("svg:text")
+-    .attr("id", "endlabel")
+-    .style("fill", "#000");
+-}
+-
+-// Generate a string that describes the points of a breadcrumb polygon.
+-function breadcrumbPoints(d, i) {
+-  var points = [];
+-  points.push("0,0");
+-  points.push(b.w + ",0");
+-  points.push(b.w + b.t + "," + (b.h / 2));
+-  points.push(b.w + "," + b.h);
+-  points.push("0," + b.h);
+-  if (i > 0) { // Leftmost breadcrumb; don't include 6th vertex.
+-    points.push(b.t + "," + (b.h / 2));
+-  }
+-  return points.join(" ");
+-}
+-
+-// Update the breadcrumb trail to show the current sequence and percentage.
+-function updateBreadcrumbs(nodeArray, percentageString) {
+-  // Data join; key function combines name and depth (= position in sequence).
+-  var g = d3.select("#trail")
+-      .selectAll("g")
+-      .data(nodeArray, function(d) { return d.name + d.depth; });
+-
+-  // Add breadcrumb and label for entering nodes.
+-  var entering = g.enter().append("svg:g");
+-
+-  entering.append("svg:polygon")
+-      .attr("points", breadcrumbPoints)
+-      .attr("fill", colorMap);
+-
+-  entering.append("svg:text")
+-      .attr("x", (b.w + b.t) / 2)
+-      .attr("y", b.h / 2)
+-      .attr("dy", "0.35em")
+-      .attr("text-anchor", "middle")
+-      .text(function(d) { return d.name; });
+-
+-  // Set position for entering and updating nodes.
+-  g.attr("transform", function(d, i) {
+-    return "translate(" + i * (b.w + b.s) + ", 0)";
+-  });
+-
+-  // Remove exiting nodes.
+-  g.exit().remove();
+-
+-  // Now move and update the percentage at the end.
+-  d3.select("#trail").select("#endlabel")
+-      .attr("x", (nodeArray.length + 0.5) * (b.w + b.s))
+-      .attr("y", b.h / 2)
+-      .attr("dy", "0.35em")
+-      .attr("text-anchor", "middle")
+-      .text(percentageString);
+-
+-  // Make the breadcrumb trail visible, if it's hidden.
+-  d3.select("#trail")
+-      .style("visibility", "");
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
+deleted file mode 100644
+index 031dd41be93..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js
++++ /dev/null
+@@ -1,546 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-export default Ember.Component.extend({
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-  }),
+-  graphDrawn: false,
+-  userInfo: null,
+-
+-  actions: {
+-    changeViewType(param) {
+-      this.sendAction("changeViewType", param);
+-      if (this.get('attemptModel')) {
+-        this.setAttemptsGridColumnsAndRows();
+-      }
+-    }
+-  },
+-
+-  canvas: {
+-    svg: undefined,
+-    h: 0,
+-    w: 0,
+-    tooltip: undefined
+-  },
+-
+-  clusterMetrics: undefined,
+-  modelArr: [],
+-  containerIdArr: [],
+-  colors: d3.scale.category10().range(),
+-  _selected: undefined,
+-  gridColumns: [],
+-  gridRows: [],
+-  serviceName: undefined,
+-
+-  selected: function() {
+-    return this._selected;
+-  }.property(),
+-
+-  tableComponentName: function() {
+-    return "app-attempt-table";
+-  }.property(),
+-
+-  setSelected: function(d) {
+-    var dom;
+-
+-    if (this._selected === d) {
+-      return;
+-    }
+-
+-    // restore color
+-    if (this._selected) {
+-      dom = d3.select("#timeline-bar-" + this._selected.get("id"));
+-      dom.attr("fill", this.colors[0]);
+-    }
+-
+-    this._selected = d;
+-    this.set("selected", d);
+-    dom = d3.select("#timeline-bar-" + d.get("id"));
+-    dom.attr("fill", this.colors[1]);
+-  },
+-
+-  getPerItemHeight: function() {
+-    var arrSize = this.modelArr.length;
+-
+-    if (arrSize < 20) {
+-      return 30;
+-    } else if (arrSize < 100) {
+-      return 10;
+-    } else {
+-      return 2;
+-    }
+-  },
+-
+-  getPerItemGap: function() {
+-    var arrSize = this.modelArr.length;
+-
+-    if (arrSize < 20) {
+-      return 5;
+-    } else if (arrSize < 100) {
+-      return 1;
+-    } else {
+-      return 1;
+-    }
+-  },
+-
+-  getCanvasHeight: function() {
+-    return (this.getPerItemHeight() + this.getPerItemGap()) * this.modelArr.length + 200;
+-  },
+-
+-  draw: function(start, end) {
+-    // get w/h of the svg
+-    var bbox = d3.select("#" + this.get("parent-id"))
+-      .node()
+-      .getBoundingClientRect();
+-    this.canvas.w = bbox.width;
+-    this.canvas.h = this.getCanvasHeight();
+-
+-    this.canvas.svg = d3.select("#" + this.get("parent-id"))
+-      .append("svg")
+-      .attr("width", this.canvas.w)
+-      .attr("height", this.canvas.h)
+-      .attr("id", this.get("my-id"));
+-    this.renderTimeline(start, end);
+-  },
+-
+-  renderTimeline: function(start, end) {
+-    var border = 30;
+-    var singleBarHeight = this.getPerItemHeight();
+-    var gap = this.getPerItemGap();
+-    var textWidth = 200;
+-    /*
+-     start-time                              end-time
+-      |--------------------------------------|
+-         ==============
+-                ==============
+-                        ==============
+-                              ===============
+-     */
+-    var xScaler = d3.scale.linear()
+-      .domain([start, end])
+-      .range([0, this.canvas.w - 2 * border - textWidth]);
+-
+-    /*
+-     * Render frame of timeline view
+-     */
+-    this.canvas.svg.append("line")
+-      .attr("x1", border + textWidth)
+-      .attr("y1", border - 5)
+-      .attr("x2", this.canvas.w - border)
+-      .attr("y2", border - 5)
+-      .attr("class", "chart");
+-
+-    this.canvas.svg.append("line")
+-      .attr("x1", border + textWidth)
+-      .attr("y1", border - 10)
+-      .attr("x2", border + textWidth)
+-      .attr("y2", border - 5)
+-      .attr("class", "chart");
+-
+-    this.canvas.svg.append("line")
+-      .attr("x1", this.canvas.w - border)
+-      .attr("y1", border - 10)
+-      .attr("x2", this.canvas.w - border)
+-      .attr("y2", border - 5)
+-      .attr("class", "chart");
+-
+-    this.canvas.svg.append("text")
+-        .text(Converter.timeStampToDate(start))
+-        .attr("y", border - 15)
+-        .attr("x", border + textWidth)
+-        .attr("class", "bar-chart-text")
+-        .attr("text-anchor", "left");
+-
+-    this.canvas.svg.append("text")
+-        .text(Converter.timeStampToDate(end))
+-        .attr("y", border - 15)
+-        .attr("x", this.canvas.w - border)
+-        .attr("class", "bar-chart-text")
+-        .attr("text-anchor", "end");
+-
+-    // show bar
+-    var bar = this.canvas.svg.selectAll("bars")
+-      .data(this.modelArr)
+-      .enter()
+-      .append("rect")
+-      .attr("y", function(d, i) {
+-        return border + (gap + singleBarHeight) * i;
+-      })
+-      .attr("x", function(d) {
+-        return border + textWidth + xScaler(d.get("startTs"));
+-      })
+-      .attr("height", singleBarHeight)
+-      .attr("fill", function() {
+-        return this.colors[0];
+-      }.bind(this))
+-      .attr("width", function(d) {
+-        var finishedTs = xScaler(d.get("finishedTs"));
+-        finishedTs = finishedTs > 0 ? finishedTs : xScaler(end);
+-        return finishedTs - xScaler(d.get("startTs"));
+-      })
+-      .attr("id", function(d) {
+-        return "timeline-bar-" + d.get("id");
+-      });
+-    bar.on("click", function(d) {
+-      this.setSelected(d);
+-    }.bind(this));
+-
+-    this.bindTooltip(bar);
+-
+-    if (this.modelArr.length <= 20) {
+-      // show bar texts
+-      for (var i = 0; i < this.modelArr.length; i++) {
+-        this.canvas.svg.append("text")
+-          .text(this.modelArr[i].get(this.get("label")))
+-          .attr("y", border + (gap + singleBarHeight) * i + singleBarHeight / 2)
+-          .attr("x", border)
+-          .attr("class", "bar-chart-text");
+-      }
+-    }
+-  },
+-
+-  bindTooltip: function(d) {
+-    d.on("mouseover", function() {
+-        this.tooltip
+-          .style("left", (d3.event.pageX) + "px")
+-          .style("top", (d3.event.pageY - 28) + "px");
+-      }.bind(this))
+-      .on("mousemove", function(d) {
+-        this.tooltip.style("opacity", 0.9);
+-        this.tooltip.html(d.get("tooltipLabel"))
+-          .style("left", (d3.event.pageX) + "px")
+-          .style("top", (d3.event.pageY - 28) + "px");
+-      }.bind(this))
+-      .on("mouseout", function() {
+-        this.tooltip.style("opacity", 0);
+-      }.bind(this));
+-  },
+-
+-  initTooltip: function() {
+-    this.tooltip = d3.select("body")
+-      .append("div")
+-      .attr("class", "tooltip")
+-      .attr("id", "chart-tooltip")
+-      .style("opacity", 0);
+-  },
+-
+-  didInsertElement: function() {
+-    // init model
+-    this.modelArr = [];
+-    this.containerIdArr = [];
+-
+-    if (this.get("rmModel")) {
+-      this.get("rmModel").forEach(function(o) {
+-        if(!this.modelArr.contains(o)) {
+-          this.modelArr.push(o);
+-          this.containerIdArr.push(o.id);
+-        }
+-      }.bind(this));
+-    }
+-
+-    if (this.get("tsModel")) {
+-      this.get("tsModel").forEach(function(o) {
+-        if(!this.containerIdArr.contains(o.id)) {
+-          this.modelArr.push(o);
+-        }
+-      }.bind(this));
+-    }
+-
+-    if (this.modelArr.length === 0) {
+-      return;
+-    }
+-
+-    this.modelArr.sort(function(a, b) {
+-      var tsA = a.get("startTs");
+-      var tsB = b.get("startTs");
+-      return tsA - tsB;
+-    });
+-
+-    if (this.get('attemptModel')) {
+-      this.setAttemptsGridColumnsAndRows();
+-    } else {
+-      this.setContainersGridColumnsAndRows();
+-    }
+-  },
+-
+-  didUpdate: function() {
+-    if (this.get("viewType") === "grid" || this.graphDrawn) {
+-      return;
+-    }
+-
+-    this.initTooltip();
+-
+-    var begin = 0;
+-    if (this.modelArr.length > 0) {
+-      begin = this.modelArr[0].get("startTs");
+-    }
+-    var end = 0;
+-    for (var i = 0; i < this.modelArr.length; i++) {
+-      var ts = this.modelArr[i].get("finishedTs");
+-      if (ts > end) {
+-        end = ts;
+-      }
+-    }
+-    if (end < begin) {
+-      end = Date.now();
+-    }
+-
+-    this.draw(begin, end);
+-
+-    if (this.modelArr.length > 0) {
+-      this.setSelected(this.modelArr[0]);
+-    }
+-
+-    this.graphDrawn = true;
+-  },
+-
+-  setAttemptsGridColumnsAndRows: function() {
+-    var self = this;
+-    var columns = [];
+-    var serviceName = this.get('serviceName');
+-
+-    columns.push({
+-      id: 'id',
+-      headerTitle: 'Attempt ID',
+-      contentPath: 'id',
+-      cellComponentName: 'em-table-linked-cell',
+-      minWidth: '300px',
+-      getCellContent: function(row) {
+-        var attemptId = row.get('id');
+-        var query = 'viewType=' + self.get("viewType");
+-        if (serviceName) {
+-          query += '&service=' + serviceName;
+-        }
+-        return {
+-          displayText: attemptId,
+-          href: `#/yarn-app-attempt/${attemptId}?${query}`
+-        };
+-      }
+-    }, {
+-      id: 'attemptStartedTime',
+-      headerTitle: 'Started Time',
+-      contentPath: 'attemptStartedTime'
+-    }, {
+-      id: 'finishedTime',
+-      headerTitle: 'Finished Time',
+-      contentPath: 'finishedTime',
+-      getCellContent: function(row) {
+-        if (row.get('finishedTs')) {
+-          return row.get('finishedTime');
+-        }
+-        return 'N/A';
+-      }
+-    }, {
+-      id: 'elapsedTime',
+-      headerTitle: 'Elapsed Time',
+-      contentPath: 'elapsedTime'
+-    }, {
+-      id: 'appMasterContainerId',
+-      headerTitle: 'AM Container ID',
+-      contentPath: 'appMasterContainerId',
+-      minWidth: '350px'
+-    }, {
+-      id: 'amNodeId',
+-      headerTitle: 'AM Node ID',
+-      contentPath: 'amNodeId'
+-    }, {
+-      id: 'attemptState',
+-      headerTitle: 'State',
+-      contentPath: 'attemptState',
+-      getCellContent: function(row) {
+-        var state = row.get('attemptState');
+-        if (state) {
+-          return state;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'exposedPorts',
+-      headerTitle: 'Exposed Ports',
+-      contentPath: 'exposedPorts',
+-      getCellContent: function(row) {
+-        var ports = row.get('exposedPorts');
+-        if (ports) {
+-          return ports;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'nodeHttpAddress',
+-      headerTitle: 'NodeManager Web UI',
+-      contentPath: 'nodeHttpAddress',
+-      cellComponentName: 'em-table-html-cell',
+-      getCellContent: function(row) {
+-        var address = self.checkHttpProtocol(row.get('nodeHttpAddress'));
+-        var link = row.get('masterNodeURL');
+-        if (address) {
+-          return `<a href="${link}">${address}</a>`;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'logsLink',
+-      headerTitle: 'Logs',
+-      contentPath: 'logsLink',
+-      cellComponentName: 'em-table-html-cell',
+-      getCellContent: function(row) {
+-        var containerLogUrl = row.get('appAttemptContainerLogsURL');
+-        if (containerLogUrl) {
+-          return `<a href="${containerLogUrl}">Link</a>`;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    });
+-
+-    var gridCols = ColumnDef.make(columns);
+-    this.set('gridColumns', gridCols);
+-    this.set('gridRows', this.modelArr);
+-  },
+-
+-  setContainersGridColumnsAndRows: function() {
+-    var self = this;
+-    var columns = [];
+-
+-    columns.push({
+-      id: 'id',
+-      headerTitle: 'Container ID',
+-      contentPath: 'id',
+-      cellComponentName: 'em-table-html-cell',
+-      minWidth: '350px',
+-      getCellContent: function(row) {
+-        var termLink = self.checkHttpProtocol(row.get('nodeHttpAddress'));
+-        var containerId = row.get('id');
+-        var requestedUser = self.get('requestedUser');
+-        return `<a href="${termLink}/terminal/terminal.template?container=${containerId}&user.name=${requestedUser}" target="_blank">${containerId}</a>`;
+-      }
+-    }, {
+-      id: 'startedTime',
+-      headerTitle: 'Started Time',
+-      contentPath: 'startedTime'
+-    }, {
+-      id: 'finishedTime',
+-      headerTitle: 'Finished Time',
+-      contentPath: 'finishedTime',
+-      getCellContent: function(row) {
+-        if (row.get('finishedTs')) {
+-          return row.get('finishedTime');
+-        }
+-        return 'N/A';
+-      }
+-    }, {
+-      id: 'elapsedTime',
+-      headerTitle: 'Elapsed Time',
+-      contentPath: 'elapsedTime'
+-    }, {
+-      id: 'priority',
+-      headerTitle: 'Priority',
+-      contentPath: 'priority'
+-    }, {
+-      id: 'containerExitStatus',
+-      headerTitle: 'Exit Status',
+-      contentPath: 'containerExitStatus',
+-      getCellContent: function(row) {
+-        var status = row.get('containerExitStatus');
+-        if (status) {
+-          return status;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'containerState',
+-      headerTitle: 'State',
+-      contentPath: 'containerState',
+-      getCellContent: function(row) {
+-        var state = row.get('containerState');
+-        if (state) {
+-          return state;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'logUrl',
+-      headerTitle: 'Logs',
+-      contentPath: 'logUrl',
+-      cellComponentName: 'em-table-html-cell',
+-      getCellContent: function(row) {
+-        var containerLogUrl = row.get('appAttemptContainerLogsURL');
+-        if (containerLogUrl) {
+-          return `<a href="${containerLogUrl}">Link</a>`;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'exposedPorts',
+-      headerTitle: 'Exposed Ports',
+-      contentPath: 'exposedPorts',
+-      getCellContent: function(row) {
+-        var ports = row.get('exposedPorts');
+-        if (ports) {
+-          return ports;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    }, {
+-      id: 'nodeHttpAddress',
+-      headerTitle: 'Node Manager UI',
+-      contentPath: 'nodeHttpAddress',
+-      cellComponentName: 'em-table-html-cell',
+-      getCellContent: function(row) {
+-        var address = self.checkHttpProtocol(row.get('nodeHttpAddress'));
+-        var link = row.get('masterNodeURL');
+-        if (address) {
+-          return `<a href="${link}">${address}</a>`;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    });
+-
+-    var gridCols = ColumnDef.make(columns);
+-    this.set('gridColumns', gridCols);
+-    this.set('gridRows', this.modelArr);
+-  },
+-
+-  checkHttpProtocol: function(prop) {
+-    if (prop && prop.indexOf('://') < 0) {
+-      prop = 'http://' + prop;
+-    }
+-    return prop;
+-  },
+-
+-  requestedUser: function() {
+-    if (this.get('userInfo')) {
+-      return this.get('userInfo.requestedUser');
+-    }
+-    return '';
+-  }.property('userInfo'),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
+deleted file mode 100644
+index a85dff29405..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/tree-selector.js
++++ /dev/null
+@@ -1,412 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from "ember";
+-import {PARTITION_LABEL} from '../constants';
+-
+-const INBETWEEN_HEIGHT = 130;
+-
+-export default Ember.Component.extend({
+-  // Map: <queue-name, queue>
+-  map: undefined,
+-
+-  // Normalized data for d3
+-  treeData: undefined,
+-
+-  // folded queues, folded[<queue-name>] == true means <queue-name> is folded
+-  foldedQueues: {},
+-
+-  // maxDepth
+-  maxDepth: 0,
+-
+-  // num of leaf queue, folded queue is treated as leaf queue
+-  numOfLeafQueue: 0,
+-
+-  // mainSvg
+-  mainSvg: undefined,
+-
+-  used: undefined,
+-  max: undefined,
+-
+-  didUpdateAttrs: function({ oldAttrs, newAttrs }) {
+-    if (oldAttrs.filteredPartition.value !== newAttrs.filteredPartition.value) {
+-      this.reDraw();
+-    }
+-  },
+-  // Init data
+-  initData: function() {
+-    this.map = {};
+-    this.treeData = {};
+-    this.maxDepth = 0;
+-    this.numOfLeafQueue = 0;
+-
+-    this.get("model").forEach(
+-      function(o) {
+-        this.map[o.id] = o;
+-      }.bind(this)
+-    );
+-
+-    // var selected = this.get("selected");
+-    this.used = this.get("used");
+-    this.max = this.get("max");
+-    this.initQueue("root", 1, this.treeData);
+-  },
+-
+-  // get Children array of given queue
+-  getChildrenNamesArray: function(q) {
+-    var namesArr = [];
+-
+-    // Folded queue's children is empty
+-    if (this.foldedQueues[q.get("name")]) {
+-      return namesArr;
+-    }
+-
+-    var names = q.get("children");
+-    if (names) {
+-      names.forEach(function(name) {
+-        namesArr.push(name);
+-      });
+-    }
+-
+-    return namesArr;
+-  },
+-
+-  // Init queues
+-  initQueue: function(queueName, depth, node) {
+-    if (!queueName || !this.map[queueName]) {
+-      // Queue is not existed
+-      return false;
+-    }
+-    if (depth > this.maxDepth) {
+-      this.maxDepth = this.maxDepth + 1;
+-    }
+-
+-    var queue = this.map[queueName];
+-
+-    if (
+-      this.filteredPartition &&
+-      !queue.get("partitions").contains(this.filteredPartition)
+-    ) {
+-      return false;
+-    }
+-
+-    var names = this.getChildrenNamesArray(queue);
+-
+-    node.name = queueName;
+-    node.parent = queue.get("parent");
+-    node.queueData = queue;
+-
+-    if (names.length > 0) {
+-      node.children = [];
+-
+-      names.forEach(
+-        function(name) {
+-          var childQueueData = {};
+-          node.children.push(childQueueData);
+-          const status = this.initQueue(name, depth + 1, childQueueData);
+-          if (!status) {
+-            node.children.pop();
+-          }
+-        }.bind(this)
+-      );
+-    } else {
+-      this.numOfLeafQueue = this.numOfLeafQueue + 1;
+-    }
+-
+-    return true;
+-  },
+-
+-  update: function(source, root, tree, diagonal) {
+-    var duration = 300;
+-    var i = 0;
+-
+-    // Compute the new tree layout.
+-    var nodes = tree.nodes(root).reverse();
+-    var links = tree.links(nodes);
+-
+-    // Normalize for fixed-depth.
+-    nodes.forEach(function(d) {
+-      d.y = d.depth * 200;
+-    });
+-
+-    // Update the nodes…
+-    var node = this.mainSvg.selectAll("g.node").data(nodes, function(d) {
+-      return d.id || (d.id = ++i);
+-    });
+-
+-    // Enter any new nodes at the parent's previous position.
+-    var nodeEnter = node
+-      .enter()
+-      .append("g")
+-      .attr("class", "node")
+-      .attr("transform", function() {
+-        return `translate(${source.y0 + 50}, ${source.x0})`;
+-      })
+-      .on(
+-        "click",
+-        function(d) {
+-          if (d.queueData.get("queuePath") !== this.get("selected")) {
+-            document.location.href =
+-              "#/yarn-queues/" + d.queueData.get("queuePath") + "!";
+-          }
+-
+-          Ember.run.later(
+-            this,
+-            function() {
+-              var treeWidth = this.maxDepth * 200;
+-              var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT;
+-              var tree = d3.layout.tree().size([treeHeight, treeWidth]);
+-              var diagonal = d3.svg.diagonal().projection(function(d) {
+-                return [d.y + 50, d.x];
+-              });
+-
+-              this.update(this.treeData, this.treeData, tree, diagonal);
+-            },
+-            100
+-          );
+-        }.bind(this)
+-      )
+-      .on("dblclick", function(d) {
+-        document.location.href =
+-          "#/yarn-queue/" + d.queueData.get("queuePath") + "/apps";
+-      });
+-
+-    nodeEnter
+-      .append("circle")
+-      .attr("r", 1e-6)
+-      .style(
+-        "fill",
+-        function(d) {
+-          const usedCapacity = getUsedCapacity(d.queueData, this.filteredPartition);
+-
+-          if (usedCapacity <= 60.0) {
+-            return "#60cea5";
+-          } else if (usedCapacity <= 100.0) {
+-            return "#ffbc0b";
+-          } else {
+-            return "#ef6162";
+-          }
+-        }.bind(this)
+-      );
+-
+-    // append percentage
+-    nodeEnter
+-      .append("text")
+-      .attr("x", function() {
+-        return 0;
+-      })
+-      .attr("dy", ".35em")
+-      .attr("fill", "white")
+-      .attr("text-anchor", function() {
+-        return "middle";
+-      })
+-      .text(
+-        function(d) {
+-          const usedCapacity = getUsedCapacity(d.queueData, this.filteredPartition);
+-
+-          if (usedCapacity >= 100.0) {
+-            return usedCapacity.toFixed(0) + "%";
+-          } else {
+-            return usedCapacity.toFixed(1) + "%";
+-          }
+-        }.bind(this)
+-      )
+-      .style("fill-opacity", 1e-6);
+-
+-    // append queue name
+-    nodeEnter
+-      .append("text")
+-      .attr("x", "0px")
+-      .attr("dy", "45px")
+-      .attr("text-anchor", "middle")
+-      .text(function(d) {
+-        return d.queueData.get("name");
+-      })
+-      .style("fill-opacity", 1e-6);
+-
+-    // Transition nodes to their new position.
+-    var nodeUpdate = node
+-      .transition()
+-      .duration(duration)
+-      .attr("transform", function(d) {
+-        return `translate(${d.y + 50}, ${d.x})`;
+-      });
+-
+-    nodeUpdate
+-      .select("circle")
+-      .attr("r", 30)
+-      .attr("href", function(d) {
+-        return "#/yarn-queues/" + d.queueData.get("queuePath");
+-      })
+-      .style(
+-        "stroke-width",
+-        function(d) {
+-          if (d.queueData.get("queuePath") === this.get("selected")) {
+-            return 7;
+-          } else {
+-            return 2;
+-          }
+-        }.bind(this)
+-      )
+-      .style(
+-        "stroke",
+-        function(d) {
+-          if (d.queueData.get("queuePath") === this.get("selected")) {
+-            return "gray";
+-          } else {
+-            return "gray";
+-          }
+-        }.bind(this)
+-      );
+-
+-    nodeUpdate.selectAll("text").style("fill-opacity", 1);
+-
+-    // Transition exiting nodes to the parent's new position.
+-    var nodeExit = node
+-      .exit()
+-      .transition()
+-      .duration(duration)
+-      .attr("transform", function() {
+-        return `translate(${source.y}, ${source.x})`;
+-      })
+-      .remove();
+-
+-    nodeExit.select("circle").attr("r", 1e-6);
+-
+-    nodeExit.select("text").style("fill-opacity", 1e-6);
+-
+-    // Update the links…
+-    var link = this.mainSvg.selectAll("path.link").data(links, function(d) {
+-      return d.target.id;
+-    });
+-
+-    // Enter any new links at the parent's previous position.
+-    link
+-      .enter()
+-      .insert("path", "g")
+-      .attr("class", "link")
+-      .attr("d", function() {
+-        var o = { x: source.x0, y: source.y0 + 50 };
+-        return diagonal({ source: o, target: o });
+-      });
+-
+-    // Transition links to their new position.
+-    link
+-      .transition()
+-      .duration(duration)
+-      .attr("d", diagonal);
+-
+-    // Transition exiting nodes to the parent's new position.
+-    link
+-      .exit()
+-      .transition()
+-      .duration(duration)
+-      .attr("d", function() {
+-        var o = { x: source.x, y: source.y };
+-        return diagonal({ source: o, target: o });
+-      })
+-      .remove();
+-
+-    // Stash the old positions for transition.
+-    nodes.forEach(function(d) {
+-      d.x0 = d.x;
+-      d.y0 = d.y;
+-    });
+-  },
+-
+-  reDraw: function() {
+-    this.initData();
+-
+-    var margin = { top: 20, right: 120, bottom: 20, left: 120 };
+-    var treeWidth = this.maxDepth * 200;
+-    var treeHeight = this.numOfLeafQueue * INBETWEEN_HEIGHT;
+-    var width = treeWidth + margin.left + margin.right;
+-    var height = treeHeight + margin.top + margin.bottom;
+-
+-    if (this.mainSvg) {
+-      this.mainSvg.selectAll("*").remove();
+-    } else {
+-      this.mainSvg = d3
+-        .select("#" + this.get("parentId"))
+-        .append("svg")
+-        .attr("width", width)
+-        .attr("height", height)
+-        .attr("class", "tree-selector");
+-    }
+-
+-    this.mainSvg
+-      .append("g")
+-      .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+-
+-    var tree = d3.layout.tree().size([treeHeight, treeWidth]);
+-
+-    var diagonal = d3.svg.diagonal().projection(function(d) {
+-      return [d.y + 50, d.x];
+-    });
+-
+-    var root = this.treeData;
+-    root.x0 = height / 2;
+-    root.y0 = 0;
+-
+-    d3.select(window.frameElement).style("height", height);
+-
+-    this.update(root, root, tree, diagonal);
+-  },
+-
+-  didInsertElement: function() {
+-    this.reDraw();
+-  }
+-});
+-
+-
+-const getUsedCapacity = (queueData, filter=PARTITION_LABEL) => {
+-
+-  const type = queueData.get("type");
+-  var result;
+-
+-  switch (type) {
+-    case "capacity":
+-      const partitionMap = queueData.get("partitionMap");
+-      if (null == partitionMap || null == partitionMap[filter] || null == partitionMap[filter].absoluteUsedCapacity) {
+-        result = 0.0;
+-      } else {
+-        result = partitionMap[filter].absoluteUsedCapacity;
+-      }
+-      break;
+-
+-    case "fair":
+-       if (null == queueData.get("fairResources") || null == queueData.get("fairResources").memory || null == queueData.get("usedResources") || null == queueData.get("usedResources").memory || 0 == queueData.get("fairResources").memory) {
+-         result = 0.0;
+-       } else {
+-         result = queueData.get("usedResources").memory / queueData.get("fairResources").memory * 100;
+-       }
+-      break;
+-
+-    case "fifo":
+-       if (null == queueData.get("usedCapacity") || (null == queueData.get("capacity")) || (queueData.get("capacity") == 0)) {
+-         result = 0.0;
+-       } else {
+-         result = queueData.get("usedCapacity") / queueData.get("capacity") * 100;
+-       }
+-       break;
+-
+-    default:
+-      result = 0.0;
+-  }
+-  return result;
+-};
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/upload-config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/upload-config.js
+deleted file mode 100644
+index 2f9dc9c1a98..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/upload-config.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Component.extend({
+-  dialogId: "config_upload_modal",
+-  title: "Upload Configuration",
+-  configJson: '',
+-  parseErrorMsg: '',
+-
+-  actions: {
+-    uploadConfig() {
+-      var json = this.get('configJson');
+-      try {
+-        JSON.parse(json);
+-        this.upateParseResults("");
+-      } catch (ex) {
+-        this.upateParseResults("Invalid JSON: " + ex.message);
+-        throw ex;
+-      }
+-      if (!this.get('parseErrorMsg')) {
+-        this.sendAction("uploadConfig", json);
+-      }
+-    }
+-  },
+-
+-  didInsertElement() {
+-    this.$('#' + this.get('dialogId')).on('shown.bs.modal', function() {
+-      this.upateParseResults("");
+-    }.bind(this));
+-  },
+-
+-  isValidConfigJson: Ember.computed.notEmpty('configJson'),
+-
+-  upateParseResults(message) {
+-    this.set('parseErrorMsg', message);
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
+deleted file mode 100644
+index 788155c3877..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/yarn-queue-partition-capacity-labels.js
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from "ember";
+-import { PARTITION_LABEL } from "../constants";
+-
+-export default Ember.Component.extend({
+-  didUpdateAttrs: function({ oldAttrs, newAttrs }) {
+-    this._super(...arguments);
+-    this.set("data", this.initData());
+-  },
+-
+-  init() {
+-    this._super(...arguments);
+-    this.set("data", this.initData());
+-  },
+-
+-  initData() {
+-    const queue = this.get("queue");
+-    const partitionMap = this.get("partitionMap");
+-    const filteredParition = this.get("filteredPartition") || PARTITION_LABEL;
+-    const userLimit = queue.get("userLimit");
+-    const userLimitFactor = queue.get("userLimitFactor");
+-    const isLeafQueue = queue.get("isLeafQueue");
+-    const isWeightMode = queue.get("isWeightMode");
+-    const isFlexibleDynamicQueue = queue.get("isFlexibleDynamicQueue");
+-    const weight = queue.get("weight");
+-    const orderingPolicy = queue.get("orderingPolicy");
+-    const normalizedWeight = queue.get("normalizedWeight");
+-    const creationMethod = queue.get("creationMethod");
+-
+-    return {
+-      ...partitionMap[filteredParition],
+-      userLimit,
+-      userLimitFactor,
+-      isLeafQueue,
+-      isWeightMode,
+-      weight,
+-      normalizedWeight,
+-      orderingPolicy,
+-      creationMethod,
+-      isFlexibleDynamicQueue
+-    };
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js
+deleted file mode 100644
+index 157d48b858f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/config.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Host and port configurations
+- */
+-
+-export default {
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/constants.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/constants.js
+deleted file mode 100644
+index 6b37b7f4d34..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/constants.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Application level global constants go here.
+- */
+-export default {
+-  PARAM_SEPARATOR: '!',
+-};
+-
+-const BASE_UNIT = 1024
+-
+-export const Type = 'type';
+-export const Memory = 'memory';
+-export const Resource = 'resource';
+-export const Unit = 'unit';
+-export const Entities = {
+-  Type: 'type',
+-  Memory:'memory',
+-  Resource: 'resource',
+-  Unit: 'unit'
+-}
+-
+-export const PARTITION_LABEL = 'Default partition';
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
+deleted file mode 100644
+index db0074db1d9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/app-table-columns.js
++++ /dev/null
+@@ -1,204 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDef from 'em-table/utils/table-definition';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default Ember.Controller.extend({
+-  tableDefinition: TableDef.create({
+-    sortColumnId: 'stTime',
+-    sortOrder: 'desc'
+-  }),
+-
+-  columns: function() {
+-      var colums = [];
+-      colums.push({
+-          id: 'appId',
+-          headerTitle: 'Application ID',
+-          contentPath: 'id',
+-          cellComponentName: 'em-table-linked-cell',
+-          minWidth: "280px",
+-          facetType: null,
+-          getCellContent: function(row) {
+-            return {
+-              displayText: row.id,
+-              href: `#/yarn-app/${row.id}/attempts`
+-            };
+-          }
+-      }, {
+-          id: 'appType',
+-          headerTitle: 'Application Type',
+-          contentPath: 'applicationType',
+-          facetType: null,
+-      }, {
+-          id: 'appTag',
+-          headerTitle: 'Application Tag',
+-          contentPath: 'applicationTags',
+-          facetType: null,
+-      }, {
+-          id: 'appName',
+-          headerTitle: 'Application Name',
+-          cellComponentName: 'em-table-tooltip-text',
+-          contentPath: 'appName',
+-          facetType: null,
+-      }, {
+-          id: 'appUsr',
+-          headerTitle: 'User',
+-          contentPath: 'user',
+-          minWidth: "50px"
+-      }, {
+-        id: 'state',
+-        headerTitle: 'State',
+-        contentPath: 'state',
+-        cellComponentName: 'em-table-simple-status-cell',
+-        minWidth: "50px"
+-      }, {
+-          id: 'queue',
+-          headerTitle: 'Queue',
+-          cellComponentName: 'em-table-tooltip-text',
+-          contentPath: 'queue',
+-      }, {
+-          id: 'progress',
+-          headerTitle: 'Progress',
+-          contentPath: 'progress',
+-          cellComponentName: 'em-table-progress-cell',
+-          facetType: null,
+-          cellDefinition: {
+-            valueMax: 100
+-          }
+-      }, {
+-          id: 'stTime',
+-          headerTitle: 'Start Time',
+-          contentPath: 'startTime',
+-          facetType: null,
+-          getCellContent: function(row) {
+-            return row.get('formattedStartTime');
+-          }
+-      }, {
+-          id: 'elTime',
+-          headerTitle: 'Elapsed Time',
+-          contentPath: 'elapsedTime',
+-          facetType: null,
+-          cellDefinition: {
+-            type: "duration"
+-          }
+-      }, {
+-          id: 'finishTime',
+-          headerTitle: 'Finished Time',
+-          contentPath: 'validatedFinishedTs',
+-          facetType: null,
+-          observePath: true,
+-          getCellContent: function(row) {
+-            return row.get('formattedFinishedTime');
+-          }
+-      }, {
+-          id: 'priority',
+-          headerTitle: 'Priority',
+-          contentPath: 'priority',
+-      }, {
+-          id: 'cluster',
+-          headerTitle: '%Cluster',
+-          contentPath: 'clusterUsagePercentage',
+-          observePath: true
+-      });
+-      return ColumnDef.make(colums);
+-  }.property(),
+-
+-  serviceColumns: function() {
+-    var colums = [];
+-    colums.push({
+-      id: 'appName',
+-      headerTitle: 'Service Name',
+-      contentPath: 'appName',
+-      minWidth: "200px",
+-      facetType: null,
+-      cellComponentName: 'em-table-linked-cell',
+-      getCellContent: function(row) {
+-        return {
+-          displayText: row.get('appName'),
+-          href: `#/yarn-app/${row.id}/components?service=${row.get('appName')}`
+-        };
+-      }
+-    }, {
+-      id: 'appId',
+-      headerTitle: 'Application Tag',
+-      contentPath: 'id',
+-      facetType: null,
+-      cellComponentName: 'em-table-tooltip-text',
+-      minWidth: "250px"
+-    }, {
+-      id: 'appTag',
+-      headerTitle: 'Application ID',
+-      contentPath: 'applicationTags',
+-      facetType: null,
+-    }, {
+-      id: 'state',
+-      headerTitle: 'State',
+-      contentPath: 'state',
+-      cellComponentName: 'em-table-simple-status-cell',
+-      minWidth: "50px"
+-    }, {
+-      id: 'cluster',
+-      headerTitle: '%Cluster',
+-      contentPath: 'clusterUsagePercentage',
+-      facetType: null,
+-      observePath: true
+-    }, {
+-      id: 'elTime',
+-      headerTitle: 'Elapsed Time',
+-      contentPath: 'elapsedTime',
+-      facetType: null,
+-      cellDefinition: {
+-        type: "duration"
+-      },
+-      minWidth: "200px"
+-    }, {
+-        id: 'appUsr',
+-        headerTitle: 'User',
+-        contentPath: 'user',
+-        facetType: null,
+-        minWidth: "50px"
+-    }, {
+-        id: 'queue',
+-        headerTitle: 'Queue',
+-        contentPath: 'queue',
+-        cellComponentName: 'em-table-tooltip-text',
+-    }, {
+-      id: 'stTime',
+-      headerTitle: 'Started Time',
+-      contentPath: 'startTime',
+-      facetType: null,
+-      getCellContent: function(row) {
+-        return row.get('formattedStartTime');
+-      }
+-    }, {
+-      id: 'finishTime',
+-      headerTitle: 'Finished Time',
+-      contentPath: 'validatedFinishedTs',
+-      facetType: null,
+-      observePath: true,
+-      getCellContent: function(row) {
+-        return row.get('formattedFinishedTime');
+-      }
+-    });
+-    return ColumnDef.make(colums);
+-  }.property(),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
+deleted file mode 100644
+index 34702aca2df..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-/**
+- * Base controller for application.
+- */
+-export default Ember.Controller.extend({
+-  /**
+-   * Output main top UI menu which is common across all pages.
+-   * Menu item will be made active based on current path.
+-   */
+-  outputMainMenu: function(){
+-    var path = this.get('currentPath');
+-    var html = '<li';
+-    if (path === 'yarn-queue') {
+-      html = html + ' class="active"';
+-    }
+-    html = html + '><a href="yarn-queue/root">Queues<span class="sr-only">' +
+-        '(current)</span></a></li><li';
+-    if (path.lastIndexOf('yarn-app', 0) === 0) {
+-      html = html + ' class="active"';
+-    }
+-    html = html + '><a href="yarn-apps">Applications<span class="sr-only">' +
+-        '(current)</span></a></li><li';
+-    if (path === 'cluster-overview') {
+-      html = html + ' class="active"';
+-    }
+-    html = html + '><a href="cluster-overview">Cluster Overview<span class=' +
+-        '"sr-only">(current)</span></a></li><li';
+-    if (path.lastIndexOf('yarn-node', 0) === 0) {
+-      html = html + ' class="active"';
+-    }
+-    html = html + '><a href="yarn-nodes">Nodes<span class="sr-only">' +
+-        '(current)</span></a></li>';
+-    return Ember.String.htmlSafe(html);
+-  }.property('currentPath'),
+-
+-  isQueuesTabActive: function() {
+-    var path = this.get('currentPath');
+-    if (path === 'yarn-queues') {
+-      return true;
+-    }
+-    return false;
+-  }.property('currentPath'),
+-
+-  clusterInfo: function() {
+-    if (this.model && this.model.clusterInfo) {
+-      return this.model.clusterInfo.get('firstObject');
+-    }
+-    return null;
+-  }.property('model.clusterInfo'),
+-
+-  userInfo: function() {
+-    if (this.model && this.model.userInfo) {
+-      return this.model.userInfo.get('firstObject');
+-    }
+-    return null;
+-  }.property('model.userInfo'),
+-
+-  isTimelineUnHealthy: function() {
+-    if (this.model && this.model.timelineHealth) {
+-      return this.model.timelineHealth.get('isTimelineUnHealthy');
+-    }
+-    return true;
+-  }.property('model.timelineHealth')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/cluster-overview.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/cluster-overview.js
+deleted file mode 100644
+index 22e62675589..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/cluster-overview.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  loading: true,
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Cluster Overview",
+-    routeName: 'cluster-overview',
+-  }]
+-
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
+deleted file mode 100644
+index 08f099b0f35..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app-attempt.js
++++ /dev/null
+@@ -1,71 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "viewType"],
+-  service: undefined,
+-  viewType: "graph",
+-
+-  actions: {
+-    changeViewType(param) {
+-      this.set("viewType", param);
+-    }
+-  },
+-
+-  breadcrumbs: Ember.computed("model.attempt.appId", "model.attempt.id", function () {
+-    var appId = this.get("model.attempt.appId");
+-    var attemptId = this.get("model.attempt.id");
+-    var serviceName = this.get('service');
+-    var breadcrumbs = [{
+-      text: "Home",
+-      routeName: 'application'
+-    },{
+-      text: "Applications",
+-      routeName: 'yarn-apps.apps'
+-    }, {
+-      text: `App [${appId}]`,
+-      href: `#/yarn-app/${appId}/attempts`
+-    }, {
+-      text: "Attempts",
+-      href: `#/yarn-app/${appId}/attempts`
+-    }, {
+-      text: `Attempt [${attemptId}]`
+-    }];
+-    if (serviceName) {
+-      breadcrumbs = [{
+-        text: "Home",
+-        routeName: 'application'
+-      }, {
+-        text: "Services",
+-        routeName: 'yarn-services'
+-      }, {
+-        text: `${serviceName} [${appId}]`,
+-        href: `#/yarn-app/${appId}/components?service=${serviceName}`
+-      }, {
+-        text: "Attempts",
+-        href: `#/yarn-app/${appId}/attempts?service=${serviceName}`
+-      }, {
+-        text: `Attempt [${attemptId}]`
+-      }];
+-    }
+-    return breadcrumbs;
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
+deleted file mode 100644
+index 8b48347e68d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app.js
++++ /dev/null
+@@ -1,188 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  appId: '',
+-  serviceName: undefined,
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Applications",
+-    routeName: 'yarn-apps.apps'
+-  }, {
+-    text: 'App'
+-  }],
+-
+-  actions: {
+-    showStopServiceConfirm() {
+-      this.set('actionResponse', null);
+-      Ember.$("#stopServiceConfirmDialog").modal('show');
+-    },
+-
+-    stopService() {
+-      var self = this;
+-      Ember.$("#stopServiceConfirmDialog").modal('hide');
+-      var adapter = this.store.adapterFor('yarn-servicedef');
+-      self.set('isLoading', true);
+-      adapter.stopService(this.model.serviceName, this.get('model.app.user')).then(function () {
+-        self.set('actionResponse', { msg: 'Service stopped successfully. Auto refreshing in 5 seconds.', type: 'success' });
+-        Ember.run.later(self, function () {
+-          this.set('actionResponse', null);
+-          this.send("refresh");
+-        }, 5000);
+-      }, function (errr) {
+-        let messg = 'Error: Stop service failed!';
+-        if (errr.errors && errr.errors[0] && errr.errors[0].diagnostics) {
+-          messg = 'Error: ' + errr.errors[0].diagnostics;
+-        }
+-        self.set('actionResponse', { msg: messg, type: 'error' });
+-      }).finally(function () {
+-        self.set('isLoading', false);
+-      });
+-    },
+-
+-    showDeleteServiceConfirm() {
+-      this.set('actionResponse', null);
+-      Ember.$("#deleteServiceConfirmDialog").modal('show');
+-    },
+-
+-    deleteService() {
+-      var self = this;
+-      Ember.$("#deleteServiceConfirmDialog").modal('hide');
+-      var adapter = this.store.adapterFor('yarn-servicedef');
+-      self.set('isLoading', true);
+-      adapter.deleteService(this.model.serviceName, this.get('model.app.user')).then(function () {
+-        self.set('actionResponse', { msg: 'Service deleted successfully. Redirecting to services in 5 seconds.', type: 'success' });
+-        Ember.run.later(self, function () {
+-          this.set('actionResponse', null);
+-          this.transitionToRoute("yarn-services");
+-        }, 5000);
+-      }, function (errr) {
+-        let messg = 'Error: Delete service failed!';
+-        if (errr.errors && errr.errors[0] && errr.errors[0].diagnostics) {
+-          messg = 'Error: ' + errr.errors[0].diagnostics;
+-        }
+-        self.set('actionResponse', { msg: messg, type: 'error' });
+-      }).finally(function () {
+-        self.set('isLoading', false);
+-      });
+-    },
+-
+-    showKillApplicationConfirm() {
+-      this.set('actionResponse', null);
+-      Ember.$("#killApplicationConfirmDialog").modal('show');
+-    },
+-
+-    killApplication() {
+-      var self = this;
+-      Ember.$("#killApplicationConfirmDialog").modal('hide');
+-      const adapter = this.store.adapterFor('yarn-app');
+-      self.set('isLoading', true);
+-      adapter.sendKillApplication(this.model.app.id).then(function () {
+-        self.set('actionResponse', {
+-          msg: 'Application killed successfully. Auto refreshing in 5 seconds.',
+-          type: 'success'
+-        });
+-        Ember.run.later(self, function () {
+-          this.set('actionResponse', null);
+-          this.send("refresh");
+-        }, 5000);
+-      }, function (err) {
+-        let message = err.diagnostics || 'Error: Kill application failed!';
+-        self.set('actionResponse', { msg: message, type: 'error' });
+-      }).finally(function () {
+-        self.set('isLoading', false);
+-      });
+-    },
+-
+-    resetActionResponse() {
+-      this.set('actionResponse', null);
+-    }
+-  },
+-
+-  isRunningService: Ember.computed('model.serviceName', 'model.app.state', function () {
+-    return this.model.serviceName && this.model.app.get('state') === 'RUNNING';
+-  }),
+-
+-
+-  updateBreadcrumbs(appId, serviceName, tailCrumbs) {
+-    var breadcrumbs = [{
+-      text: "Home",
+-      routeName: 'application'
+-    }];
+-    if (appId && serviceName) {
+-      breadcrumbs.push({
+-        text: "Services",
+-        routeName: 'yarn-services'
+-      }, {
+-        text: `${serviceName} [${appId}]`,
+-        href: `#/yarn-app/${appId}/components?service=${serviceName}`
+-      });
+-    } else {
+-      breadcrumbs.push({
+-        text: "Applications",
+-        routeName: 'yarn-apps.apps'
+-      }, {
+-        text: `App [${appId}]`,
+-        href: `#/yarn-app/${appId}/attempts`
+-      });
+-    }
+-    if (tailCrumbs) {
+-      breadcrumbs.pushObjects(tailCrumbs);
+-    }
+-    this.set('breadcrumbs', breadcrumbs);
+-  },
+-
+-  amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function () {
+-    var amHostAddress = this.get('model.app.amHostHttpAddress');
+-    if (amHostAddress && amHostAddress.indexOf('://') < 0) {
+-      amHostAddress = 'http://' + amHostAddress;
+-    }
+-    return amHostAddress;
+-  }),
+-
+-  isAppKillable: Ember.computed("model.app.state", function () {
+-    if (this.get("model.app.applicationType") === 'yarn-service') {
+-      return false;
+-    }
+-    const killableStates = ['NEW', 'NEW_SAVING', 'SUBMITTED', 'ACCEPTED', 'RUNNING'];
+-    return killableStates.indexOf(this.get("model.app.state")) > -1;
+-  }),
+-
+-  isServiceDeployedOrRunning: Ember.computed('model.serviceInfo', function() {
+-    const serviceInfo = this.get('model.serviceInfo');
+-    const stoppedStates = ['STOPPED', 'SUCCEEDED', 'FAILED'];
+-    if (serviceInfo) {
+-      return stoppedStates.indexOf(serviceInfo.get('state')) === -1;
+-    }
+-    return false;
+-  }),
+-
+-  isServiceStoppped: Ember.computed('model.serviceInfo', function() {
+-    const serviceInfo = this.get('model.serviceInfo');
+-    const stoppedStates = ['STOPPED', 'SUCCEEDED'];
+-    if (serviceInfo) {
+-      return stoppedStates.indexOf(serviceInfo.get('state')) > -1;
+-    }
+-    return false;
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
+deleted file mode 100644
+index 32638e5da2e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/attempts.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "viewType"],
+-  service: undefined,
+-  viewType: "graph",
+-
+-  actions: {
+-    changeViewType(param) {
+-      this.set("viewType", param);
+-    }
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
+deleted file mode 100644
+index 1078b145d16..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/charts.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service"],
+-  service: undefined,
+-
+-  isRunningApp: Ember.computed('model.app.state', function() {
+-    return this.get('model.app.state') === "RUNNING";
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js
+deleted file mode 100644
+index 5a6c616caf0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/components.js
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service"],
+-  service: undefined,
+-
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-  }),
+-
+-  tableColumns: Ember.computed('model.appId', 'model.serviceName', function() {
+-    var cols = [];
+-    var service = this.get('model.serviceName');
+-    var appId = this.get('model.appId');
+-
+-    cols.push({
+-      id: 'name',
+-      headerTitle: 'Component',
+-      contentPath: 'name',
+-      cellComponentName: 'em-table-linked-cell',
+-      getCellContent: function(row) {
+-        return {
+-          displayText: row.get('name'),
+-          href: `#/yarn-component-instances/${row.get('name')}/info?service=${service}&appid=${appId}`
+-        };
+-      }
+-    }, {
+-      id: 'vcores',
+-      headerTitle: 'VCores',
+-      contentPath: 'vcores'
+-    }, {
+-      id: 'memory',
+-      headerTitle: 'Memory (MB)',
+-      contentPath: 'memory'
+-    }, {
+-      id: 'instances',
+-      headerTitle: 'Number of Instances',
+-      contentPath: 'instances',
+-      observePath: true
+-    });
+-
+-    return ColumnDef.make(cols);
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/configs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/configs.js
+deleted file mode 100644
+index a6cba9eea62..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/configs.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service"],
+-  service: undefined
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
+deleted file mode 100644
+index 68954ce173d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/info.js
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service"],
+-  service: undefined,
+-  isLoading: false,
+-  actionResponse: null,
+-
+-  actions: {
+-    showStopServiceConfirm() {
+-      this.set('actionResponse', null);
+-      Ember.$("#stopServiceConfirmDialog").modal('show');
+-    },
+-
+-    stopService() {
+-      var self = this;
+-      Ember.$("#stopServiceConfirmDialog").modal('hide');
+-      var adapter = this.store.adapterFor('yarn-servicedef');
+-      self.set('isLoading', true);
+-      adapter.stopService(this.get('service'), this.get('model.app.user')).then(function () {
+-        self.set('actionResponse', { msg: 'Service stopped successfully. Auto refreshing in 5 seconds.', type: 'success' });
+-        Ember.run.later(self, function () {
+-          this.set('actionResponse', null);
+-          this.send("refresh");
+-        }, 5000);
+-      }, function (errr) {
+-        let messg = errr.diagnostics || 'Error: Stop service failed!';
+-        self.set('actionResponse', { msg: messg, type: 'error' });
+-      }).finally(function () {
+-        self.set('isLoading', false);
+-      });
+-    },
+-
+-    showDeleteServiceConfirm() {
+-      this.set('actionResponse', null);
+-      Ember.$("#deleteServiceConfirmDialog").modal('show');
+-    },
+-
+-    deleteService() {
+-      var self = this;
+-      Ember.$("#deleteServiceConfirmDialog").modal('hide');
+-      var adapter = this.store.adapterFor('yarn-servicedef');
+-      self.set('isLoading', true);
+-      adapter.deleteService(this.get('service'), this.get('model.app.user')).then(function () {
+-        self.set('actionResponse', { msg: 'Service deleted successfully. Redirecting to services in 5 seconds.', type: 'success' });
+-        Ember.run.later(self, function () {
+-          this.set('actionResponse', null);
+-          this.transitionToRoute("yarn-services");
+-        }, 5000);
+-      }, function (errr) {
+-        let messg = errr.diagnostics || 'Error: Delete service failed!';
+-        self.set('actionResponse', { msg: messg, type: 'error' });
+-      }).finally(function () {
+-        self.set('isLoading', false);
+-      });
+-    },
+-
+-    resetActionResponse() {
+-      this.set('actionResponse', null);
+-    }
+-  },
+-
+-  isRunningService: Ember.computed('model.serviceName', 'model.app.state', function () {
+-    return this.get('service') !== undefined && this.get('model.app.state') === 'RUNNING';
+-  }),
+-
+-  amHostHttpAddressFormatted: Ember.computed('model.app.amHostHttpAddress', function () {
+-    var amHostAddress = this.get('model.app.amHostHttpAddress');
+-    if (amHostAddress && amHostAddress.indexOf('://') < 0) {
+-      amHostAddress = 'http://' + amHostAddress;
+-    }
+-    return amHostAddress;
+-  }),
+-
+-  totalOutstandingResourceRequests: Ember.computed('model.app.resourceRequests', function() {
+-    const resourceRequests = this.get('model.app.resourceRequests');
+-    if (resourceRequests) {
+-      const totatResourceRequests = { memory: 0, vCores: 0 };
+-      [].forEach.call(resourceRequests, resource => {
+-        if (resource.resourceName === '*') {
+-          const totalMemory = resource.capability.resourceInformations.resourceInformation[0].value * resource.numContainers;
+-          const totalVCores = resource.capability.resourceInformations.resourceInformation[1].value * resource.numContainers;
+-          totatResourceRequests.memory += totalMemory;
+-          totatResourceRequests.vCores += totalVCores;
+-        }
+-      });
+-      return totatResourceRequests;
+-    }
+-    return null;
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
+deleted file mode 100644
+index 4a5a444ee62..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/logs.js
++++ /dev/null
+@@ -1,334 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Constants from 'yarn-ui/constants';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "attempt", "containerid"],
+-  service: undefined,
+-  attempt: undefined,
+-  containerid: undefined,
+-
+-  selectedAttemptId: "",
+-  attemptContainerList: null,
+-  selectedContainerId: "",
+-  selectedLogFileName: "",
+-  containerLogFiles: null,
+-  selectedLogFileContent: "",
+-
+-  _isLoadingTopPanel: false,
+-  _isLoadingBottomPanel: false,
+-
+-  initializeSelect: function(selector = ".js-fetch-attempt-containers") {
+-    Ember.run.schedule("afterRender", this, function() {
+-      $(selector).select2({ width: "350px", multiple: false });
+-    });
+-  },
+-
+-  actions: {
+-    showContainersForAttemptId(attemptId, containerId = "") {
+-      this.set("selectedAttemptId", "");
+-      if (attemptId) {
+-        this.set("_isLoadingTopPanel", true);
+-        this.set("selectedAttemptId", attemptId);
+-        this.fetchContainersForAttemptId(attemptId)
+-          .then(hash => {
+-            let containers = null;
+-            let containerIdArr = {};
+-
+-            // Getting running containers from the RM first
+-            if (
+-              hash.rmContainers.get("length") > 0 &&
+-              hash.rmContainers.get("content")
+-            ) {
+-              hash.rmContainers.get("content").forEach(function(o) {
+-                containerIdArr[o.id] = true;
+-              }.bind(this));
+-              containers = (containers || []).concat(
+-                hash.rmContainers.get("content")
+-              );
+-            }
+-
+-            let historyProvider = this.fallbackToJHS ? hash.jhsContainers : hash.tsContainers;
+-            let fieldName =  this.fallbackToJHS ? "containerId" : "id";
+-
+-            // Getting aggregated containers from the selected history provider
+-            if (
+-              historyProvider.get("length") > 0 &&
+-              historyProvider.get("content")
+-            ) {
+-              let historyContainers = [];
+-              historyProvider.get("content").forEach(function(o) {
+-                if(!containerIdArr[o[fieldName]]) {
+-                  historyContainers.push(o);
+-                }
+-              }.bind(this));
+-              containers = (containers || []).concat(
+-                historyContainers);
+-            }
+-
+-            this.set("attemptContainerList", containers);
+-            this.initializeSelect(".js-fetch-logs-containers");
+-            if (containerId) {
+-              this.send("showLogFilesForContainerId", containerId);
+-            }
+-          })
+-          .finally(() => {
+-            this.set("_isLoadingTopPanel", false);
+-          });
+-      } else {
+-        this.set("attemptContainerList", null);
+-        this.set("selectedContainerId", "");
+-        this.set("containerLogFiles", null);
+-        this.set("selectedLogFileName", "");
+-        this.set("selectedLogFileContent", "");
+-      }
+-    },
+-
+-    showLogFilesForContainerId(containerId) {
+-      this.set("selectedContainerId", "");
+-      this.set("containerLogFiles", null);
+-      this.set("selectedLogFileName", "");
+-      this.set("selectedLogFileContent", "");
+-
+-      if (containerId) {
+-        this.set("_isLoadingBottomPanel", true);
+-        this.set("selectedContainerId", containerId);
+-        this.fetchLogFilesForContainerId(containerId)
+-          .then(hash => {
+-            if (hash.logs.get("length") > 0) {
+-              this.set("containerLogFiles", hash.logs);
+-            } else {
+-              this.set("containerLogFiles", null);
+-            }
+-            this.initializeSelect(".js-fetch-log-for-container");
+-          })
+-          .finally(() => {
+-            this.set("_isLoadingBottomPanel", false);
+-          });
+-      }
+-    },
+-
+-    showContentForLogFile(logFile) {
+-      this.set("selectedLogFileName", "");
+-      Ember.$("#logContentTextArea1234554321").val("");
+-      this.set("showFullLog", false);
+-      if (logFile) {
+-        this.set("_isLoadingBottomPanel", true);
+-        this.set("selectedLogFileName", logFile);
+-        var id = this.get("selectedContainerId") + Constants.PARAM_SEPARATOR + logFile;
+-        this.fetchContentForLogFile(id)
+-          .then(
+-            hash => {
+-              this.set("selectedLogFileContent", hash.logs.get('logs').trim());
+-            },
+-            () => {
+-              this.set("selectedLogFileContent", "");
+-            }
+-          )
+-          .then(() => {
+-            this.set("_isLoadingBottomPanel", false);
+-          });
+-      } else {
+-        this.set("selectedLogFileContent", "");
+-      }
+-    },
+-
+-    findNextTextInLogContent() {
+-      let searchInputElem = document.getElementById("logSeachInput98765");
+-      this.send("searchTextInLogContent", searchInputElem.value);
+-    },
+-
+-    searchTextInLogContent(searchText) {
+-      Ember.$("body").scrollTop(278);
+-      let textAreaElem = document.getElementById(
+-        "logContentTextArea1234554321"
+-      );
+-      let logContent = textAreaElem.innerText;
+-      let startIndex = this.searchTextStartIndex || 0;
+-      if (startIndex === -1) {
+-        startIndex = this.searchTextStartIndex = 0;
+-      }
+-      if (this.prevSearchText !== searchText) {
+-        startIndex = this.searchTextStartIndex = 0;
+-      }
+-      if (searchText && searchText.trim()) {
+-        searchText = searchText.trim();
+-        this.prevSearchText = searchText;
+-        if (startIndex === 0) {
+-          startIndex = logContent.indexOf(searchText, 0);
+-        }
+-        let endIndex = startIndex + searchText.length;
+-        if (document.createRange && window.getSelection) {
+-          let range = document.createRange();
+-          range.selectNodeContents(textAreaElem);
+-          range.setStart(textAreaElem.childNodes.item(0), startIndex);
+-          range.setEnd(textAreaElem.childNodes.item(0), endIndex);
+-          let selection = window.getSelection();
+-          selection.removeAllRanges();
+-          selection.addRange(range);
+-        }
+-        this.searchTextStartIndex = logContent.indexOf(
+-          searchText,
+-          endIndex + 1
+-        );
+-      } else {
+-        this.searchTextStartIndex = 0;
+-      }
+-    },
+-
+-    showFullLogFileContent() {
+-      this.set("showFullLog", true);
+-      this.notifyPropertyChange("selectedLogFileContent");
+-    }
+-  },
+-
+-  attemptList: Ember.computed("model.attempts", function() {
+-    let attempts = this.get("model.attempts");
+-    let list = null;
+-    if (attempts && attempts.get("length") && attempts.get("content")) {
+-      list = [].concat(attempts.get("content"));
+-    }
+-    return list;
+-  }),
+-
+-  fetchContainersForAttemptId(attemptId) {
+-    let request = {};
+-
+-    request["rmContainers"] = this.store
+-      .query("yarn-container", {
+-        app_attempt_id: attemptId
+-      })
+-      .catch(function(error) {
+-        return Ember.A();
+-      });
+-
+-    let historyProvider = this.fallbackToJHS ? "jhsContainers" : "tsContainers";
+-    let historyQuery = this.fallbackToJHS ? "yarn-jhs-container" : "yarn-timeline-container";
+-
+-    request[historyProvider] = this.store
+-      .query(historyQuery, {
+-        app_attempt_id: attemptId
+-      })
+-      .catch(function(error) {
+-        return Ember.A();
+-      });
+-
+-    return Ember.RSVP.hash(request);
+-  },
+-
+-  fetchLogFilesForContainerId(containerId) {
+-    let queryName = this.fallbackToJHS ? "yarn-jhs-log" : "yarn-log";
+-    let redirectQuery = queryName === "yarn-jhs-log" ? "yarn-jhs-redirect-log" : "yarn-redirect-log";
+-
+-    return Ember.RSVP.hash({
+-      logs: this.resolveRedirectableQuery(
+-        this.store.query(queryName, { containerId }),
+-        m => {
+-          return m.map(model => model.get('redirectedUrl'))[0];
+-        },
+-        url => {
+-          return this.store.query(redirectQuery, url);
+-        })
+-    });
+-  },
+-
+-  fetchContentForLogFile(id) {
+-    let queryName = this.fallbackToJHS ? 'yarn-app-jhs-log' : 'yarn-app-log';
+-    let redirectQuery = queryName === "yarn-app-jhs-log" ? "yarn-app-jhs-redirect-log" : "yarn-app-redirect-log";
+-
+-    return Ember.RSVP.hash({
+-      logs: this.resolveRedirectableQuery(
+-        this.store.findRecord(queryName, id),
+-        m => {
+-          return m.get('redirectedUrl');
+-        },
+-        url => {
+-          return this.store.findRecord(redirectQuery, url + Constants.PARAM_SEPARATOR + id);
+-        })
+-    });
+-  },
+-
+-  resolveRedirectableQuery(initial, urlResolver, redirectResolver) {
+-    return initial.then(m => {
+-      let redirectedUrl = urlResolver(m);
+-      if (redirectedUrl !== null && redirectedUrl !== undefined && redirectedUrl !== '') {
+-        let logFromRedirect = redirectResolver(redirectedUrl);
+-        return Promise.all([m, logFromRedirect]);
+-      } else {
+-        return Promise.all([m, null]);
+-      }
+-    })
+-      .then(([originalLog, logFromRedirect]) => {
+-        return logFromRedirect !== null ? logFromRedirect : originalLog;
+-      })
+-      .catch(function () {
+-        return Ember.A();
+-      });
+-  },
+-
+-  resetAfterRefresh() {
+-    this.set("selectedAttemptId", "");
+-    this.set("attemptContainerList", null);
+-    this.set("selectedContainerId", "");
+-    this.set("selectedLogFileName", "");
+-    this.set("containerLogFiles", null);
+-    this.set("selectedLogFileContent", "");
+-  },
+-
+-  showFullLog: false,
+-
+-  showLastFewLinesOfLogContent: Ember.computed(
+-    "selectedLogFileContent",
+-    function() {
+-      let content = this.get("selectedLogFileContent");
+-      let lines = content.split("\n");
+-      if (this.get("showFullLog") || lines.length < 10) {
+-        return content;
+-      }
+-      return lines.slice(lines.length - 10).join("\n");
+-    }
+-  ),
+-
+-  isLogAggregationNotSucceeded: Ember.computed("model.app", function() {
+-    const logAggregationStatus = this.get("model.app.logAggregationStatus");
+-    return logAggregationStatus !== "SUCCEEDED";
+-  }),
+-
+-  fallbackToJHS: function() {
+-    // Let's fall back to JHS if ATS is not available, but JHS is.
+-    return this.model &&
+-      (!this.model.timelineHealth || this.model.timelineHealth.get('isTimelineUnHealthy')) &&
+-      this.model.jhsHealth && this.model.jhsHealth.get('isJHSHealthy');
+-  }.property('model.timelineHealth', 'model.isJHSHealthy'),
+-
+-  areJHSandATSUnhealthy: function() {
+-    if (this.model && this.model.timelineHealth) {
+-      if (!this.model.timelineHealth.get('isTimelineUnHealthy')) {
+-        return false;
+-      }
+-    }
+-    if (this.model && this.model.jhsHealth) {
+-      if (this.model.jhsHealth.get('isJHSHealthy')) {
+-        return false;
+-      }
+-    }
+-    return true;
+-  }.property('model.timelineHealth', 'model.isJHSHealthy')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/threaddump.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/threaddump.js
+deleted file mode 100644
+index 4b1e57b5ec8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-app/threaddump.js
++++ /dev/null
+@@ -1,281 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Constants from 'yarn-ui/constants';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "attempt", "containerid"],
+-  service: undefined,
+-  attempt: undefined,
+-  containerid: undefined,
+-
+-  selectedAttemptId: "",
+-  attemptContainerList: null,
+-  selectedContainerId: "",
+-  selectedLogFileName: "",
+-  containerLogFiles: null,
+-  selectedContainerThreaddumpContent: "",
+-  containerNodeMappings: [],
+-  threaddumpErrorMessage: "",
+-  stdoutLogsFetchFailedError: "",
+-  appAttemptToStateMappings: [],
+-
+-  _isLoadingTopPanel: false,
+-  _isLoadingBottomPanel: false,
+-  _isThreaddumpAttemptFailed: false,
+-  _isStdoutLogsFetchFailed: false,
+-
+-  initializeSelect: function(selector = ".js-fetch-attempt-containers") {
+-    Ember.run.schedule("afterRender", this, function() {
+-      $(selector).select2({ width: "350px", multiple: false });
+-    });
+-  },
+-
+-  actions: {
+-    showContainersForAttemptId(attemptId, containerId = "") {
+-      this.set("selectedAttemptId", "");
+-      if (attemptId) {
+-        this.set("_isLoadingTopPanel", true);
+-        this.set("selectedAttemptId", attemptId);
+-        this.fetchRunningContainersForAttemptId(attemptId)
+-          .then(hash => {
+-            let containers = null;
+-            let containerIdArr = {};
+-            var containerNodeMapping = null;
+-            var nodeHttpAddress = null;
+-
+-            // Getting RUNNING containers from the RM first.
+-            if (
+-              hash.rmContainers.get("length") > 0 &&
+-              hash.rmContainers.get("content")
+-            ) {
+-                // Create a container-to-NMnode mapping for later use.
+-                hash.rmContainers.get("content").forEach(
+-                  function(containerInfo) {
+-                    nodeHttpAddress = containerInfo._data.nodeHttpAddress;
+-                    nodeHttpAddress = nodeHttpAddress
+-                                        .replace(/(^\w+:|^)\/\//, '');
+-                      containerNodeMapping = Ember.Object.create({
+-                        name: containerInfo.id,
+-                        value: nodeHttpAddress
+-                      });
+-                      this.containerNodeMappings.push(containerNodeMapping);
+-                      containerIdArr[containerInfo.id] = true;
+-                }.bind(this));
+-
+-                containers = (containers || []).concat(
+-                  hash.rmContainers.get("content")
+-                );
+-            }
+-
+-            this.set("attemptContainerList", containers);
+-            this.initializeSelect(".js-fetch-threaddump-containers");
+-
+-            if (containerId) {
+-              this.send("showThreaddumpForContainer", containerId);
+-            }
+-          })
+-          .finally(() => {
+-            this.set("_isLoadingTopPanel", false);
+-          });
+-      } else {
+-        this.set("attemptContainerList", null);
+-        this.set("selectedContainerId", "");
+-        this.set("containerLogFiles", null);
+-        this.set("selectedLogFileName", "");
+-        this.set("selectedContainerThreaddumpContent", "");
+-        this.set("containerNodeMappings", []);
+-      }
+-    },
+-
+-    showThreaddumpForContainer(containerIdForThreaddump) {
+-      Ember.$("#logContentTextArea1234554321").val("");
+-      this.set("showFullThreaddump", false);
+-      this.set("selectedContainerId", containerIdForThreaddump);
+-      this.set("_isLoadingBottomPanel", true);
+-      this.set("_isStdoutLogsFetchFailed", false);
+-      this.set("stdoutLogsFetchFailedError", "");
+-      this.set("_isThreaddumpAttemptFailed", false);
+-      this.set("threaddumpErrorMessage", "");
+-
+-      if (containerIdForThreaddump) {
+-        this.set("selectedContainerThreaddumpContent", "");
+-
+-        this.fetchThreaddumpForContainer(containerIdForThreaddump)
+-          .then(function() {
+-            Ember.Logger.log("Threaddump attempt has been successful!");
+-
+-            var currentContainerId = null;
+-            var currentContainerNode = null;
+-            var nodeForContainerThreaddump = null;
+-
+-            // Fetch the NM node for the selected container from the
+-            // mappings stored above when
+-            this.containerNodeMappings.forEach(function(item) {
+-              currentContainerId = item.name;
+-              currentContainerNode = item.value;
+-
+-              if ((currentContainerId === containerIdForThreaddump)
+-                    && nodeForContainerThreaddump == null) {
+-                nodeForContainerThreaddump = currentContainerNode;
+-              }
+-            });
+-
+-            if (nodeForContainerThreaddump) {
+-              // Fetch stdout logs after 1.2 seconds of a successful POST
+-              // request to RM. This is to allow for sufficient time for the NM
+-              // to heartbeat into RM (default of 1 second) whereupon it will
+-              // receive RM's signal to post a threaddump that will be captured
+-              // in the stdout logs of the container. The extra 200ms is to
+-              // allow for any network/IO delays.
+-              Ember.run.later((function() {
+-                this.fetchLogsForContainer(nodeForContainerThreaddump,
+-                                                containerIdForThreaddump,
+-                                                "stdout")
+-                .then(
+-                  hash => {
+-                   this.set("selectedContainerThreaddumpContent",
+-                              hash.logs.get('logs').trim());
+-                }.bind(this))
+-                .catch(function(error) {
+-                  this.set("_isStdoutLogsFetchFailed", true);
+-                  this.set("stdoutLogsFetchFailedError", error);
+-                }.bind(this))
+-                .finally(function() {
+-                  this.set("_isLoadingBottomPanel", false);
+-                }.bind(this));
+-              }.bind(this)), 1200);
+-            }
+-          }.bind(this), function(error) {
+-            this.set("_isThreaddumpAttemptFailed", true);
+-            this.set("threaddumpErrorMessage", error);
+-            this.set("_isLoadingBottomPanel", false);
+-          }.bind(this)).finally(function() {
+-            this.set("selectedContainerThreaddumpContent", "");
+-          }.bind(this));
+-      } else {
+-        this.set("selectedContainerId", "");
+-        this.set("selectedContainerThreaddumpContent", "");
+-      }
+-    }
+-  },
+-
+-  // Set up the running attempt for the first time threaddump button is clicked.
+-  runningAttempt: Ember.computed("model.attempts", function() {
+-    let attempts = this.get("model.attempts");
+-    let runningAttemptId = null;
+-
+-    if (attempts && attempts.get("length") && attempts.get("content")) {
+-      attempts.get("content").forEach(function(appAttempt) {
+-        if (appAttempt._data.state === "RUNNING") {
+-          runningAttemptId = appAttempt._data.appAttemptId;
+-        }
+-      });
+-    }
+-
+-    return runningAttemptId;
+-  }),
+-
+-  /**
+-   * Create and send fetch running containers request.
+-   */
+-  fetchRunningContainersForAttemptId(attemptId) {
+-    let request = {};
+-
+-    request["rmContainers"] = this.store
+-      .query("yarn-container", {
+-        app_attempt_id: attemptId
+-      })
+-      .catch(function(error) {
+-        return Ember.A();
+-      });
+-
+-    return Ember.RSVP.hash(request);
+-  },
+-
+-  /**
+-   * Create and send fetch logs request for a selected container, from a
+-   * specific node.
+-   */
+-  fetchLogsForContainer(nodeForContainer, containerId, logFile) {
+-    let request = {};
+-
+-    request["logs"] = this.store
+-      .queryRecord("yarn-node-container-log", {
+-        nodeHttpAddr: nodeForContainer,
+-        containerId: containerId,
+-        fileName: logFile
+-      })
+-
+-    return Ember.RSVP.hash(request);
+-  },
+-
+-  /**
+-   * Send out a POST request to RM to signal a threaddump for the selected
+-   * container for the currently logged-in user.
+-   */
+-  fetchThreaddumpForContainer(containerId) {
+-    var adapter = this.store.adapterFor("yarn-container-threaddump");
+-
+-    let requestedUser = "";
+-    if (this.model
+-        && this.model.userInfo
+-        && this.model.userInfo.get('firstObject')) {
+-      requestedUser = this.model.userInfo
+-                        .get('firstObject')
+-                        .get('requestedUser');
+-    }
+-
+-    return adapter.signalContainerForThreaddump({}, containerId, requestedUser);
+-  },
+-
+-  /**
+-   * Reset attributes after a refresh.
+-   */
+-  resetAfterRefresh() {
+-    this.set("selectedAttemptId", "");
+-    this.set("attemptContainerList", null);
+-    this.set("selectedContainerId", "");
+-    this.set("selectedLogFileName", "");
+-    this.set("containerLogFiles", null);
+-    this.set("selectedContainerThreaddumpContent", "");
+-    this.set("containerNodeMappings", []);
+-    this.set("_isThreaddumpAttemptFailed", false);
+-    this.set("threaddumpErrorMessage", "");
+-    this.set("_isStdoutLogsFetchFailed", false);
+-    this.set("stdoutLogsFetchFailedError", "");
+-    this.set("appAttemptToStateMappings", []);
+-  },
+-
+-  // Set the threaddump content in the content area.
+-  showThreaddumpContent: Ember.computed(
+-    "selectedContainerThreaddumpContent",
+-    function() {
+-      return this.get("selectedContainerThreaddumpContent");
+-    }
+-  ),
+-
+-  /**
+-   * Check if the application for the container whose threaddump is being attempted
+-   * is even running.
+-   */
+-  isRunningApp: Ember.computed('model.app.state', function() {
+-    return this.get('model.app.state') === "RUNNING";
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
+deleted file mode 100644
+index 18bf68222ad..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Applications",
+-    routeName: 'yarn-apps.apps',
+-  }]
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
+deleted file mode 100644
+index 10965cf0e3b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-apps/apps.js
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import TableDefinition from 'em-table/utils/table-definition';
+-import AppTableController from '../app-table-columns';
+-
+-export default AppTableController.extend({
+-  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-    enableFaceting: true,
+-    rowCount: 25,
+-    sortColumnId: 'stTime',
+-    sortOrder: 'desc'
+-  }),
+-  searchText: Ember.computed.alias('tableDefinition.searchText'),
+-  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+-  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+-  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+-  rowCount: Ember.computed.alias('tableDefinition.rowCount')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js
+deleted file mode 100644
+index 61ebae1d41b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  componentName: '',
+-  instanceName: '',
+-  serviceName: '',
+-  appId: '',
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Services",
+-    routeName: 'yarn-services',
+-  }],
+-
+-  updateBreadcrumbs(appId, serviceName, componentName, instanceName) {
+-    var crumbs =  [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Services",
+-      routeName: 'yarn-services',
+-    }];
+-    if (appId && serviceName && componentName && instanceName) {
+-      crumbs.push({
+-        text: `${serviceName} [${appId}]`,
+-        href: `#/yarn-app/${appId}/components?service=${serviceName}`
+-      }, {
+-        text: 'Components'
+-      }, {
+-        text: `${componentName}`,
+-        href: `#/yarn-component-instances/${componentName}/info?service=${serviceName}&&appid=${appId}`
+-      }, {
+-        text: `${instanceName}`
+-      });
+-    }
+-    this.set('breadcrumbs', crumbs);
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance/info.js
+deleted file mode 100644
+index e920aa2e104..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instance/info.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["appid", "service", "containerid"],
+-  appid: undefined,
+-  service: undefined,
+-  containerid: undefined
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js
+deleted file mode 100644
+index fbd034ab785..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  componentName: '',
+-  serviceName: '',
+-  appId: '',
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Services",
+-    routeName: 'yarn-services',
+-  }],
+-
+-  updateBreadcrumbs(appId, serviceName, componentName, tailCrumbs) {
+-    var crumbs =  [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Services",
+-      routeName: 'yarn-services',
+-    }];
+-    if (appId && serviceName && componentName) {
+-      crumbs.push({
+-        text: `${serviceName} [${appId}]`,
+-        href: `#/yarn-app/${appId}/components?service=${serviceName}`
+-      }, {
+-        text: 'Components'
+-      }, {
+-        text: `${componentName}`,
+-        href: `#/yarn-component-instances/${componentName}/info?service=${serviceName}&&appid=${appId}`
+-      });
+-    }
+-    if (tailCrumbs) {
+-      crumbs.pushObjects(tailCrumbs);
+-    }
+-    this.set('breadcrumbs', crumbs);
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/configs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/configs.js
+deleted file mode 100644
+index dac649851d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/configs.js
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "appid"],
+-  appid: undefined,
+-  service: undefined
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js
+deleted file mode 100644
+index 16e0e03c3e6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-component-instances/info.js
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ["service", "appid"],
+-  appid: undefined,
+-  service: undefined,
+-
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-  }),
+-
+-  tableColumns: Ember.computed('model.appId', 'model.serviceName', function() {
+-    var cols = [];
+-    var appId = this.get('model.appId');
+-    var serviceName = this.get('model.serviceName');
+-
+-    cols.push({
+-      id: 'instanceName',
+-      headerTitle: 'Component Instance',
+-      contentPath: 'instanceName',
+-      cellComponentName: 'em-table-linked-cell',
+-      getCellContent: function(row) {
+-        var component = row.get('component');
+-        var instance = row.get('instanceName');
+-        var containerId = row.get('containerId');
+-        return {
+-          text: instance,
+-          href: `#/yarn-component-instance/${component}/instances/${instance}/info?appid=${appId}&service=${serviceName}&containerid=${containerId}`
+-        };
+-      }
+-    }, {
+-      id: 'containerId',
+-      headerTitle: 'Current Container Id',
+-      contentPath: 'containerId',
+-      minWidth: '350px'
+-    }, {
+-      id: 'state',
+-      headerTitle: 'State',
+-      contentPath: 'state'
+-    }, {
+-      id: 'startedDate',
+-      headerTitle: 'Started Time',
+-      contentPath: 'startedDate'
+-    }, {
+-      id: 'logsLink',
+-      headerTitle: 'Logs',
+-      contentPath: 'logsLink',
+-      cellComponentName: 'em-table-html-cell',
+-      getCellContent: function(row) {
+-        var containerLogUrl = row.get('containerLogURL');
+-        if (containerLogUrl) {
+-          return `<a href="${containerLogUrl}&service=${serviceName}">Link</a>`;
+-        } else {
+-          return 'N/A';
+-        }
+-      }
+-    });
+-
+-    return ColumnDef.make(cols);
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
+deleted file mode 100644
+index d23b2b379f5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-container-log.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed('model.nodeInfo', 'model.containerInfo', function () {
+-    var nodeInfo = this.get('model.nodeInfo'),
+-        containerInfo = this.get('model.containerInfo');
+-    var nodeAddr = encodeURIComponent(nodeInfo.addr);
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${nodeAddr}/info`,
+-    }, {
+-      text: `Container [ ${containerInfo.id} ]`,
+-      href: `#/yarn-node-container/${nodeInfo.id}/${nodeAddr}/${containerInfo.id}`,
+-    }, {
+-      text: "Log",
+-    }];
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-deploy-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-deploy-service.js
+deleted file mode 100644
+index 38c84d69014..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-deploy-service.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Services",
+-    routeName: 'yarn-services',
+-  }, {
+-    text: "New Service",
+-    routeName: 'yarn-deploy-service',
+-  }],
+-
+-  savedStandardTemplates: [],
+-  savedJsonTemplates: [],
+-  serviceResponse: null,
+-  isLoading: false,
+-
+-  actions: {
+-    deployServiceDef(serviceDef, userName) {
+-      var defjson = serviceDef.getServiceJSON();
+-      this.deployServiceApp(defjson, userName);
+-    },
+-
+-    deployServiceJson(json, userName) {
+-      this.deployServiceApp(json, userName);
+-    }
+-  },
+-
+-  gotoServices() {
+-    Ember.run.later(this, function() {
+-      this.set('serviceResponse', null);
+-      this.transitionToRoute('yarn-services');
+-    }, 1000);
+-  },
+-
+-  deployServiceApp(requestJson, userName) {
+-    var self = this;
+-    var adapter = this.store.adapterFor('yarn-servicedef');
+-    this.set('isLoading', true);
+-    adapter.deployService(requestJson, userName).then(function() {
+-      self.set('serviceResponse', {message: 'Service has been accepted successfully. Redirecting to services in a second.', type: 'success'});
+-      self.gotoServices();
+-    }, function(errr) {
+-      let messg = 'Error: Deploy service failed!';
+-      if (errr.errors && errr.errors[0] && errr.errors[0].diagnostics) {
+-        messg = 'Error: ' + errr.errors[0].diagnostics;
+-      }
+-      self.set('serviceResponse', {message: messg, type: 'error'});
+-    }).finally(function() {
+-      self.set('isLoading', false);
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
+deleted file mode 100644
+index 61e78237409..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow-activity.js
++++ /dev/null
+@@ -1,125 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import TableDef from 'em-table/utils/table-definition';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import lodash from 'lodash/lodash';
+-
+-function _createColumns() {
+-  var columns = [];
+-  columns.push({
+-    id: 'flowName',
+-    headerTitle: 'Flow Name',
+-    contentPath: 'flowName',
+-    observePath: true,
+-  }, {
+-    id: 'user',
+-    headerTitle: 'User',
+-    contentPath: 'user',
+-    observePath: true
+-  }, {
+-    id: 'uid',
+-    headerTitle: 'Flow ID',
+-    contentPath: 'uid',
+-    observePath: true,
+-    cellComponentName: 'em-table-linked-cell',
+-    minWidth: "300px",
+-    getCellContent: function (row) {
+-      return {
+-        routeName: 'yarn-flow.info',
+-        id: row.get('uid'),
+-        displayText: row.get('uid')
+-      };
+-    }
+-  }, {
+-    id: 'lastExecDate',
+-    headerTitle: 'Last Execution Date',
+-    contentPath: 'lastExecDate',
+-    observePath: true
+-  });
+-  return ColumnDef.make(columns);
+-}
+-
+-function _getAggregatedFlowsData(flows) {
+-  var aggregatedFlows = [];
+-  flows = flows? flows.get('content') : [];
+-
+-  var aggregated = lodash.groupBy(flows, function(flow) {
+-    return flow.getRecord().get('uid');
+-  });
+-
+-  lodash.forIn(aggregated, function(flows) {
+-    let flowsInAsc = lodash.sortBy(flows, function(flow) {
+-      return flow.getRecord().get('lastExecDate');
+-    });
+-    let flowsInDesc = flowsInAsc.reverse();
+-    aggregatedFlows.push(flowsInDesc[0].getRecord());
+-  });
+-
+-  return aggregatedFlows;
+-}
+-
+-function _createRows(flows) {
+-  var data = [],
+-      aggregatedFlows = null,
+-      row = null;
+-
+-  aggregatedFlows = _getAggregatedFlowsData(flows);
+-
+-  aggregatedFlows.forEach(function(flow) {
+-    row = Ember.Object.create({
+-      user: flow.get('user'),
+-      flowName: flow.get('flowName'),
+-      uid: flow.get('uid'),
+-      lastExecDate: flow.get('lastExecDate')
+-    });
+-    data.push(row);
+-  });
+-
+-  return Ember.A(data);
+-}
+-
+-export default Ember.Controller.extend({
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Flow Activities",
+-    routeName: 'yarn-flow-activity',
+-  }],
+-
+-  columns: _createColumns(),
+-
+-  rows: Ember.computed('model', function() {
+-    return _createRows(this.get('model'));
+-  }),
+-
+-  tableDefinition: TableDef.create({
+-    sortColumnId: 'lastExecDate',
+-    sortOrder: 'desc'
+-  }),
+-
+-  getLastFlowExecutionInfoByFlowUid: function(uid) {
+-    var aggregatedFlows = _getAggregatedFlowsData(this.get('model'));
+-    var recent = aggregatedFlows.find(function(flow) {
+-      return flow.get('uid') === uid;
+-    });
+-    return recent;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
+deleted file mode 100644
+index 216ab1145d6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  breadcrumbs: Ember.computed("model.flowUid", function() {
+-    var flowUid = this.get('model.flowUid');
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Flow Activities",
+-      routeName: 'yarn-flow-activity'
+-    }, {
+-      text: `Flow Info [${flowUid}]`,
+-      routeName: 'yarn-flow.info',
+-      model: flowUid
+-    }];
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
+deleted file mode 100644
+index fc4dd2318bb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/info.js
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default Ember.Controller.extend({
+-  flowUid: function() {
+-    return this.get('model.flowUid');
+-  }.property('model.flowUid'),
+-
+-  flowLastExecutionDate: function() {
+-    if (this.get('model.lastFlowExecutionInfo')) {
+-      return this.get('model.lastFlowExecutionInfo').get('lastExecDate');
+-    } else {
+-      return '';
+-    }
+-  }.property('model.lastFlowExecutionInfo'),
+-
+-  flowInfo: function() {
+-    var info = {};
+-    var firstRunObj = this.get('model.flowRuns').get('firstObject');
+-    info.flowUid = this.get('flowUid');
+-    info.flowName = firstRunObj.get('flowName');
+-    info.user = firstRunObj.get('user');
+-    info.lastExecutionDate = this.get('flowLastExecutionDate');
+-    info.firstRunStarted = this.get('earliestStartTime');
+-    info.lastRunFinished = this.get('latestFinishTime');
+-    return info;
+-  }.property('model.flowRuns', 'flowLastExecutionDate'),
+-
+-  earliestStartTime: function() {
+-    var earliestStart = Number.MAX_VALUE;
+-    this.get('model.flowRuns').forEach(function(flowrun) {
+-      if (flowrun.get('createTimeRaw') < earliestStart) {
+-        earliestStart = flowrun.get('createTimeRaw');
+-      }
+-    });
+-    return Converter.timeStampToDate(earliestStart);
+-  }.property('model.flowRuns'),
+-
+-  latestFinishTime: function() {
+-    var latestFinish = 0;
+-    this.get('model.flowRuns').forEach(function(flowrun) {
+-      if (flowrun.get('endTimeRaw') > latestFinish) {
+-        latestFinish = flowrun.get('endTimeRaw');
+-      }
+-    });
+-    return Converter.timeStampToDate(latestFinish);
+-  }.property('model.flowRuns')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
+deleted file mode 100644
+index a6c14628ddc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flow/runs.js
++++ /dev/null
+@@ -1,178 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import TableDef from 'em-table/utils/table-definition';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-function createColumn() {
+-  var columns = [];
+-
+-  // Generate columns
+-  columns.push({
+-    id: 'runid',
+-    headerTitle: 'Run ID',
+-    contentPath: 'runid',
+-    cellComponentName: 'em-table-linked-cell',
+-    minWidth: "300px",
+-    getCellContent: function (row) {
+-      return {
+-        routeName: 'yarn-flowrun.info',
+-        id: row.get('uid'),
+-        displayText: row.get('shownid')
+-      };
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'runDurationTs',
+-    headerTitle: 'Run Duration',
+-    contentPath: 'runDurationTs',
+-    getCellContent: function(row) {
+-      return Converter.msToElapsedTimeUnit(row.get('runDurationTs'));
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'cpuVCores',
+-    headerTitle: 'CPU VCores',
+-    contentPath: 'cpuVCores',
+-    getCellContent: function(row) {
+-      if (row.get('cpuVCores') > -1) {
+-        return row.get('cpuVCores');
+-      }
+-      return 'N/A';
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'memoryUsed',
+-    headerTitle: 'Memory Used',
+-    contentPath: 'memoryUsed',
+-    getCellContent: function(row) {
+-      if (row.get('memoryUsed') > -1) {
+-        return Converter.memoryBytesToMB(row.get('memoryUsed'));
+-      }
+-      return 'N/A';
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'createTime',
+-    headerTitle: 'Creation Time',
+-    contentPath: 'createTime'
+-  });
+-
+-  columns.push({
+-    id: 'endTime',
+-    headerTitle: 'End Time',
+-    contentPath: 'endTime'
+-  });
+-
+-  return ColumnDef.make(columns);
+-}
+-
+-export default Ember.Controller.extend({
+-  vizWidgets: {
+-    runDuration: true,
+-    cpuVcores: false,
+-    memoryUsed: false
+-  },
+-
+-  actions: {
+-    addVizWidget(widget) {
+-      Ember.set(this.vizWidgets, widget, true);
+-    },
+-
+-    removeVizWidget(widget) {
+-      Ember.set(this.vizWidgets, widget, false);
+-    }
+-  },
+-
+-  columns: createColumn(),
+-
+-  tableDefinition: TableDef.create({
+-    sortColumnId: 'createTime',
+-    sortOrder: 'desc'
+-  }),
+-
+-  elapsedTimeVizData: function() {
+-    var data = [];
+-    this.get('model.flowRuns').forEach(function(run) {
+-      var vizData = run.getElapsedTimeVizDataForBarChart();
+-      if (vizData.value > 0) {
+-        data.push(vizData);
+-      }
+-    });
+-    data = this.getSortedVizDataInDesc(data);
+-    return this.getRefactoredVizData(data);
+-  }.property('model.flowRuns'),
+-
+-  elapsedTimeFormatter: function(tick) {
+-    return Converter.msToElapsedTimeUnit(tick, true);
+-  },
+-
+-  cpuVCoresVizData: function() {
+-    var data = [];
+-    this.get('model.flowRuns').forEach(function(run) {
+-      var vizData = run.getCpuVCoresVizDataForBarChart();
+-      if (vizData.value > 0) {
+-        data.push(vizData);
+-      }
+-    });
+-    data = this.getSortedVizDataInDesc(data);
+-    return this.getRefactoredVizData(data);
+-  }.property('model.flowRuns'),
+-
+-  memoryVizData: function() {
+-    var data = [];
+-    this.get('model.flowRuns').forEach(function(run) {
+-      var vizData = run.getMemoryVizDataForBarChart();
+-      if (vizData.value > 0) {
+-        data.push(vizData);
+-      }
+-    });
+-    data = this.getSortedVizDataInDesc(data);
+-    return this.getRefactoredVizData(data);
+-  }.property('model.flowRuns'),
+-
+-  memoryFormatter: function(tick) {
+-    return Converter.memoryBytesToMB(tick);
+-  },
+-
+-  onBarChartClick: function() {
+-    var self = this;
+-    return function(data) {
+-      self.transitionToRoute('yarn-flowrun.info', data.flowrunUid);
+-    };
+-  }.property(),
+-
+-  getSortedVizDataInDesc: function(data) {
+-    return data.sort(function(d1, d2) {
+-      return d2.createdTs - d1.createdTs;
+-    });
+-  },
+-
+-  getRefactoredVizData: function(data) {
+-    data.forEach(function(viz, idx) {
+-      viz.label = "Run " + (++idx);
+-    }, this);
+-    return data;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
+deleted file mode 100644
+index 6af87ab1ee1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  breadcrumbs: Ember.computed('model.flowrun_uid', 'model.parentFlowUid', function() {
+-    var flowRunId = this.get('model.flowrun_uid');
+-    var parentFlowUid = this.get('model.parentFlowUid');
+-    var crumbs = [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Flow Activities",
+-      routeName: 'yarn-flow-activity'
+-    }];
+-    if (parentFlowUid) {
+-      crumbs.push({
+-        text: `Flow Info [${parentFlowUid}]`,
+-        routeName: 'yarn-flow.info',
+-        model: parentFlowUid
+-      }, {
+-        text: `Flow Runs [${parentFlowUid}]`,
+-        routeName: 'yarn-flow.runs',
+-        model: parentFlowUid
+-      });
+-    }
+-    crumbs.push({
+-      text: `Run Info [${flowRunId}]`,
+-      routeName: 'yarn-flowrun.info',
+-      model: flowRunId
+-    });
+-    return crumbs;
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
+deleted file mode 100644
+index b72afc4a77a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/info.js
++++ /dev/null
+@@ -1,162 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import Converter from 'yarn-ui/utils/converter';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-function createColumn() {
+-  var columns = [];
+-
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-  }),
+-
+-  // Generate columns
+-  columns.push({
+-    id: 'appId',
+-    headerTitle: 'Application ID',
+-    contentPath: 'appId',
+-    cellComponentName: 'em-table-linked-cell',
+-    minWidth: "300px",
+-    getCellContent: function (row) {
+-      return {
+-        routeName: 'yarn-app.attempts',
+-        id: row.get('appId'),
+-        displayText: row.get('appId')
+-      };
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'appType',
+-    headerTitle: 'Application Type',
+-    contentPath: 'type'
+-  });
+-
+-  columns.push({
+-    id: 'state',
+-    headerTitle: 'State',
+-    contentPath: 'state',
+-    cellComponentName: 'em-table-status-cell',
+-  });
+-
+-  columns.push({
+-    id: 'elapsedTs',
+-    headerTitle: 'Elapsed Time',
+-    contentPath: 'elapsedTs',
+-    getCellContent: function(row) {
+-      return Converter.msToElapsedTimeUnit(row.get('elapsedTs'));
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'cpuVCores',
+-    headerTitle: 'CPU VCores',
+-    contentPath: 'cpuVCores',
+-    getCellContent: function(row) {
+-      if (row.get('cpuVCores') > -1) {
+-        return row.get('cpuVCores');
+-      }
+-      return 'N/A';
+-    }
+-  });
+-
+-  columns.push({
+-    id: 'memoryUsed',
+-    headerTitle: 'Memory Used',
+-    contentPath: 'memoryUsed',
+-    getCellContent: function(row) {
+-      if (row.get('memoryUsed') > -1) {
+-        return Converter.memoryBytesToMB(row.get('memoryUsed'));
+-      }
+-      return 'N/A';
+-    }
+-  });
+-
+-  return ColumnDef.make(columns);
+-}
+-
+-export default Ember.Controller.extend({
+-  vizWidgets: {
+-    cpuVcores: true,
+-    memoryUsed: false
+-  },
+-
+-  actions: {
+-    addVizWidget(widget) {
+-      Ember.set(this.vizWidgets, widget, true);
+-    },
+-
+-    removeVizWidget(widget) {
+-      Ember.set(this.vizWidgets, widget, false);
+-    }
+-  },
+-
+-  columns: createColumn(),
+-
+-  cpuVCoresVizData: function() {
+-    var data = [];
+-    this.get('model.apps').forEach(function(app) {
+-      var vizData = app.getCpuVCoresVizDataForBarChart();
+-      if (vizData.value > 0) {
+-        data.push(vizData);
+-      }
+-    });
+-    data = this.getSortedVizDataInDesc(data);
+-    return this.getRefactoredVizData(data);
+-  }.property('model.apps'),
+-
+-  memoryVizData: function() {
+-    var data = [];
+-    this.get('model.apps').forEach(function(app) {
+-      var vizData = app.getMemoryVizDataForBarChart();
+-      if (vizData.value > 0) {
+-        data.push(vizData);
+-      }
+-    });
+-    data = this.getSortedVizDataInDesc(data);
+-    return this.getRefactoredVizData(data);
+-  }.property('model.apps'),
+-
+-  memoryFormatter: function(tick) {
+-    return Converter.memoryBytesToMB(tick);
+-  },
+-
+-  onBarChartClick: function() {
+-    var self = this;
+-    return function(data) {
+-      self.transitionToRoute('yarn-app', data.appId);
+-    };
+-  }.property(),
+-
+-  getSortedVizDataInDesc: function(data) {
+-    return data.sort(function(d1, d2) {
+-      return d2.value - d1.value;
+-    });
+-  },
+-
+-  getRefactoredVizData: function(data) {
+-    data.forEach(function(viz, idx) {
+-      viz.appId = viz.label;
+-      viz.label = "App " + (++idx);
+-    }, this);
+-    return data;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
+deleted file mode 100644
+index 12e3c491528..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-flowrun/metrics.js
++++ /dev/null
+@@ -1,131 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-function _createColumns() {
+-  var columns = [];
+-
+-  columns.push({
+-    id: 'name',
+-    headerTitle: 'Name',
+-    contentPath: 'name',
+-    observePath: true,
+-    cellComponentName: 'em-table-html-cell',
+-    getCellContent: function(row) {
+-      var plainName = row.name;
+-      if (plainName.indexOf('MAP:') > -1 || plainName.indexOf('REDUCE:') > -1) {
+-        plainName = plainName.substring(plainName.indexOf(':') + 1);
+-      }
+-      return `<span>${plainName}</span>`;
+-    }
+-  }, {
+-    id: 'value',
+-    headerTitle: 'Value',
+-    contentPath: 'value',
+-    observePath: true
+-  });
+-
+-  return ColumnDef.make(columns);
+-}
+-
+-export default Ember.Controller.extend({
+-  mapMetrics: null,
+-  reduceMetrics: null,
+-  generalMetrics: null,
+-
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-  }),
+-
+-  columns: Ember.computed(function() {
+-    return _createColumns(this.get('model.flowrun_uid'));
+-  }),
+-
+-  metricsObserver: Ember.observer('model.flowrun', function() {
+-    var metrics = this.get('model.flowrun.metrics');
+-    var mapConfigs = [],
+-        reduceConfigs = [],
+-        generalConfigs = [];
+-
+-    metrics.forEach(function(metric) {
+-      let id = metric.id;
+-      if (id.startsWith('MAP:')) {
+-        mapConfigs.push(metric);
+-      } else if (id.startsWith('REDUCE:')) {
+-        reduceConfigs.push(metric);
+-      } else {
+-        generalConfigs.push(metric);
+-      }
+-    }, this);
+-
+-    this.set('mapMetrics', mapConfigs);
+-    this.set('reduceMetrics', reduceConfigs);
+-    this.set('generalMetrics', generalConfigs);
+-  }),
+-
+-  mapConfigRows: Ember.computed('mapMetrics', function() {
+-    var row = null,
+-        data = [];
+-
+-    this.get('mapMetrics').forEach(function(map) {
+-      let value = map.values[Object.keys(map.values)[0]];
+-      row = Ember.Object.create({
+-        name: map.id,
+-        value: value
+-      });
+-      data.push(row);
+-    }, this);
+-
+-    return Ember.A(data);
+-  }),
+-
+-  reduceConfigRows: Ember.computed('reduceMetrics', function() {
+-    var row = null,
+-        data = [];
+-
+-    this.get('reduceMetrics').forEach(function(map) {
+-      let value = map.values[Object.keys(map.values)[0]];
+-      row = Ember.Object.create({
+-        name: map.id,
+-        value: value
+-      });
+-      data.push(row);
+-    }, this);
+-
+-    return Ember.A(data);
+-  }),
+-
+-  generalConfigRows: Ember.computed('generalMetrics', function() {
+-    var row = null,
+-        data = [];
+-
+-    this.get('generalMetrics').forEach(function(map) {
+-      let value = map.values[Object.keys(map.values)[0]];
+-      row = Ember.Object.create({
+-        name: map.id,
+-        value: value
+-      });
+-      data.push(row);
+-    }, this);
+-
+-    return Ember.A(data);
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
+deleted file mode 100644
+index 5ecf706f8f5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-app.js
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed('model.nodeInfo', function () {
+-    var nodeInfo = this.get('model.nodeInfo');
+-    var addr = encodeURIComponent(nodeInfo.addr);
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${addr}/info`,
+-    }, {
+-      text: `Application [ ${nodeInfo.appId} ]`,
+-    }];
+-  }),
+-
+-  encodedNodeAddr: Ember.computed("model.nodeInfo", function() {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    return encodeURIComponent(nodeInfo.addr);
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
+deleted file mode 100644
+index 460f186af34..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-apps.js
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed("model.attempt.appId", function () {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    var addr = encodeURIComponent(nodeInfo.addr);
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    },{
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${addr}/info`
+-    }, {
+-      text: "Applications",
+-    }];
+-  }),
+-
+-  encodedNodeAddr: Ember.computed("model.nodeInfo", function() {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    return encodeURIComponent(nodeInfo.addr);
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
+deleted file mode 100644
+index bac26b2c91f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-container.js
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed("model.nodeInfo", function () {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    var addr = encodeURIComponent(nodeInfo.addr);
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    },{
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${addr}/info`
+-    }, {
+-      text: `Container [ ${nodeInfo.containerId} ]`
+-    }];
+-  }),
+-
+-  encodedNodeAddr: Ember.computed("model.nodeInfo", function() {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    return encodeURIComponent(nodeInfo.addr);
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
+deleted file mode 100644
+index 4dbd05b2ff8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node-containers.js
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed("model.nodeInfo", function () {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    var addr = encodeURIComponent(nodeInfo.addr);
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    },{
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${addr}/info`
+-    }, {
+-      text: "Containers",
+-    }];
+-  }),
+-
+-  encodedNodeAddr: Ember.computed("model.nodeInfo", function() {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    return encodeURIComponent(nodeInfo.addr);
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
+deleted file mode 100644
+index c6cf2e34940..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-node.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-
+-  breadcrumbs: Ember.computed("model.nodeInfo", function () {
+-    var nodeInfo = this.get("model.nodeInfo");
+-    var addr = encodeURIComponent(nodeInfo.addr);
+-
+-    return [{
+-      text: "Home",
+-      routeName: 'application'
+-    },{
+-      text: "Nodes",
+-      routeName: 'yarn-nodes.table'
+-    }, {
+-      text: `Node [ ${nodeInfo.id} ]`,
+-      href: `#/yarn-node/${nodeInfo.id}/${addr}/info`,
+-    }];
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
+deleted file mode 100644
+index a38d8c50f43..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-heatmap.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  needReload: true,
+-  selectedQueue: undefined,
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Nodes",
+-    routeName: 'yarn-nodes.table',
+-  }, {
+-    text: "Heatmap",
+-    routeName: 'yarn-nodes-heatmap',
+-  }]
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-status.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-status.js
+deleted file mode 100644
+index b007cf48938..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes-status.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  needReload: true,
+-  selectedQueue: undefined,
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Nodes",
+-    routeName: 'yarn-nodes.table',
+-  }, {
+-    text: "Node status",
+-    routeName: 'yarn-nodes-status',
+-  }]
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
+deleted file mode 100644
+index 24f9550dccd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  needReload: true,
+-  selectedQueue: undefined,
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Nodes",
+-    routeName: 'yarn-nodes.table',
+-  }]
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
+deleted file mode 100644
+index 936e9358fdd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-nodes/table.js
++++ /dev/null
+@@ -1,137 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-import Ember from 'ember';
+-import ColumnDef from 'em-table/utils/column-definition';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-export default Ember.Controller.extend({
+-    queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+-    tableDefinition: TableDefinition.create({
+-      searchType: 'manual',
+-    }),
+-    searchText: Ember.computed.alias('tableDefinition.searchText'),
+-    sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+-    sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+-    pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+-    rowCount: Ember.computed.alias('tableDefinition.rowCount'),
+-    tableDefinition: TableDefinition.create({
+-        enableFaceting: true,
+-        minValuesToDisplay: 1,
+-        rowCount: 25
+-    }),
+-    columns: function() {
+-        var colums = [];
+-        colums.push({
+-            id: 'label',
+-            headerTitle: 'Node Label',
+-            contentPath: 'nodeLabelsAsString',
+-            minWidth: "125px"
+-        }, {
+-            id: 'rack',
+-            headerTitle: 'Rack',
+-            contentPath: 'rack',
+-            facetType: null,
+-            minWidth: "250px"
+-        }, {
+-            id: 'state',
+-            headerTitle: 'Node State',
+-            contentPath: 'state',
+-            cellComponentName: 'em-table-status-cell',
+-            minWidth: "125px"
+-        }, {
+-            id: 'address',
+-            headerTitle: 'Node Address',
+-            contentPath: 'id',
+-            minWidth: "300px",
+-            facetType: null,
+-        }, {
+-            id: 'nodeId',
+-            headerTitle: 'Node HTTP Address',
+-            contentPath: 'nodeHTTPAddress',
+-            cellComponentName: 'em-table-linked-cell',
+-            facetType: null,
+-            getCellContent: function(row) {
+-              var node_id = row.get("id"),
+-                  node_addr = encodeURIComponent(row.get("nodeHTTPAddress")),
+-                  href = `#/yarn-node/${node_id}/${node_addr}/info`;
+-                switch(row.get("nodeState")) {
+-                case "SHUTDOWN":
+-                case "LOST":
+-                    href = "";
+-                }
+-              return {
+-                text: row.get("nodeHTTPAddress"),
+-                href: href
+-              };
+-            },
+-            minWidth: "250px"
+-        }, {
+-            id: 'containers',
+-            headerTitle: 'Containers',
+-            contentPath: 'numContainers',
+-            facetType: null,
+-        }, {
+-            id: 'memUsed',
+-            headerTitle: 'Mem Used',
+-            contentPath: 'usedMemoryBytes',
+-            facetType: null,
+-            cellDefinition: {
+-              type: "memory"
+-            }
+-        }, {
+-            id: 'memAvail',
+-            headerTitle: 'Mem Available',
+-            contentPath: 'availMemoryBytes',
+-            facetType: null,
+-            cellDefinition: {
+-              type: "memory"
+-            }
+-        }, {
+-            id: 'coresUsed',
+-            headerTitle: 'VCores Used',
+-            contentPath: 'usedVirtualCores',
+-            facetType: null,
+-        }, {
+-            id: 'coresAvail',
+-            headerTitle: 'VCores Available',
+-            contentPath: 'availableVirtualCores',
+-            facetType: null,
+-        }, {
+-            id: 'healthUpdate',
+-            headerTitle: 'Last Health Update',
+-            contentPath: 'lastHealthUpdate',
+-            facetType: null,
+-            minWidth: "250px"
+-        }, {
+-            id: 'healthReport',
+-            headerTitle: 'Health-Report',
+-            contentPath: 'healthReport',
+-            facetType: null,
+-            minWidth: "200px"
+-        }, {
+-            id: 'version',
+-            headerTitle: 'Version',
+-            contentPath: 'version',
+-            facetType: null,
+-            observePath: true
+-        });
+-        return ColumnDef.make(colums);
+-    }.property()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
+deleted file mode 100644
+index e9f945ba722..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  needReload: true,
+-  selectedQueue: undefined,
+-
+-  breadcrumbs: Ember.computed("model.selected", "target.currentPath", function () {
+-    var queueName = this.get("model.selected");
+-    var path = this.get("target.currentPath");
+-
+-    var crumbs = [{
+-      text: "Home",
+-      routeName: 'application'
+-    }, {
+-      text: "Queues",
+-      routeName: 'yarn-queues',
+-      model: 'root'
+-    }];
+-
+-    if (path && path === "yarn-queue.apps") {
+-      crumbs.push({
+-        text: `Queue [ ${queueName} ]`,
+-        routeName: 'yarn-queue.apps',
+-        model: queueName
+-      });
+-    }
+-
+-    return crumbs;
+-  })
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
+deleted file mode 100644
+index 1ce630638a7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queue/apps.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import TableDefinition from 'em-table/utils/table-definition';
+-import AppTableController from '../app-table-columns';
+-
+-export default AppTableController.extend({
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-    enableFaceting: true,
+-    rowCount: 25
+-  }),
+-
+-  // Search text alias, any change in controller's searchText would affect the table's searchText, and vice-versa.
+-  _selectedObserver: Ember.on("init", Ember.observer("model.selected", function () {
+-    this.set("tableDefinition.searchText", this.get("model.selected"));
+-  })),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
+deleted file mode 100644
+index 6cc87675b50..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-queues.js
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import {PARTITION_LABEL} from '../constants';
+-
+-export default Ember.Controller.extend({
+-  needReload: true,
+-  selectedQueue: undefined,
+-  showLoading: true,
+-  filteredPartition: PARTITION_LABEL,
+-
+-  breadcrumbs: [
+-    {
+-      text: "Home",
+-      routeName: "application"
+-    },
+-    {
+-      text: "Queues",
+-      routeName: "yarn-queues",
+-      model: "root"
+-    }
+-  ],
+-
+-  actions: {
+-    setFilter(partition) {
+-      this.set("filteredPartition", partition);
+-      const model = this.get('model');
+-      const {selectedQueue} = model;
+-      // If the selected queue does not have the filtered partition
+-      // reset it to root
+-      if (!selectedQueue.get('partitions').contains(partition)) {
+-        const root = model.queues.get('firstObject');
+-        document.location.href = "#/yarn-queues/" + root.get("id") + "!";
+-        this.set("model.selectedQueue", root);
+-        this.set("model.selected", root.get('id'));
+-      }
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
+deleted file mode 100644
+index 1af915e0b3e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-services.js
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AppTableController from './app-table-columns';
+-import TableDefinition from 'em-table/utils/table-definition';
+-
+-export default AppTableController.extend({
+-  queryParams: ['searchText', 'sortColumnId', 'sortOrder', 'pageNum', 'rowCount'],
+-  tableDefinition: TableDefinition.create({
+-    searchType: 'manual',
+-    sortColumnId: 'stTime',
+-    sortOrder: 'desc',
+-    rowCount: 25,
+-    minValuesToDisplay: 1,
+-    enableFaceting: true
+-  }),
+-  searchText: Ember.computed.alias('tableDefinition.searchText'),
+-  sortColumnId: Ember.computed.alias('tableDefinition.sortColumnId'),
+-  sortOrder: Ember.computed.alias('tableDefinition.sortOrder'),
+-  pageNum: Ember.computed.alias('tableDefinition.pageNum'),
+-  rowCount: Ember.computed.alias('tableDefinition.rowCount'),
+-
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "Services",
+-    routeName: 'yarn-services',
+-  }],
+-
+-  getFinishedServicesDataForDonutChart: Ember.computed('model.apps', function() {
+-
+-    var finishdApps = 0;
+-    var failedApps = 0;
+-    var killedApps = 0;
+-
+-    this.get('model.apps').forEach(function(service){
+-      if (service.get('state') === "FINISHED") {
+-        finishdApps++;
+-      }
+-
+-      if (service.get('state') === "FAILED") {
+-        failedApps++;
+-      }
+-
+-     if (service.get('state') === "KILLED") {
+-        killedApps++;
+-      }
+-    });
+-
+-    var arr = [];
+-    arr.push({
+-      label: "Completed",
+-      value: finishdApps
+-    });
+-    arr.push({
+-      label: "Killed",
+-      value: killedApps
+-    });
+-    arr.push({
+-      label: "Failed",
+-      value: failedApps
+-    });
+-
+-    return arr;
+-  }),
+-
+-
+-  getRunningServicesDataForDonutChart: Ember.computed('model.apps', function() {
+-    var pendingApps = 0;
+-    var runningApps = 0;
+-
+-    this.get('model.apps').forEach(function(service){
+-    if (service.get('state') === "RUNNING") {
+-        runningApps++;
+-      }
+-
+-     if (service.get('state') === "ACCEPTED" ||
+-          service.get('state') === "SUBMITTED" ||
+-          service.get('state') === "NEW" ||
+-          service.get('state') === "NEW_SAVING") {
+-        pendingApps++;
+-      }
+-    });
+-
+-    var arr = [];
+-    arr.push({
+-      label: "Pending",
+-      value: pendingApps
+-    });
+-    arr.push({
+-      label: "Running",
+-      value: runningApps
+-    });
+-
+-    return arr;
+-  }),
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js
+deleted file mode 100644
+index cb0c8d3a099..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  breadcrumbs: [{
+-    text: "Home",
+-    routeName: 'application'
+-  }, {
+-    text: "YARN Tools",
+-    routeName: 'yarn-tools',
+-  }],
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
+deleted file mode 100644
+index cc3be2e526f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import TableDef from 'em-table/utils/table-definition';
+-import ColumnDef from 'em-table/utils/column-definition';
+-
+-import YarnConf from '../../models/yarn-conf';
+-
+-export default Ember.Controller.extend({
+-  coreTableDefinition: TableDef.create({
+-    searchType: 'manual',
+-  }),
+-
+-  mapredTableDefinition: TableDef.create({
+-    searchType: 'manual',
+-  }),
+-
+-  yarnTableDefinition: TableDef.create({
+-    searchType: 'manual',
+-  }),
+-
+-  init: function () {
+-    var that = this;
+-    this.get('store').query('yarn-conf', {})
+-      .then(function(conf) {
+-        let coreProps = conf.filter(function(o) {
+-          return o.get('source') == 'core-default.xml';
+-        });
+-        that.set('rowsForCoreColumnsFromModel', coreProps);
+-        let mapredProps = conf.filter(function(o) {
+-          return o.get('source') == 'mapred-default.xml';
+-        });
+-        that.set('rowsForMapredColumnsFromModel', mapredProps);
+-        let yarnProps = conf.filter(function(o) {
+-          return o.get('source') == 'yarn-default.xml';
+-        });
+-        that.set('rowsForYarnColumnsFromModel', yarnProps);
+-      });
+-  },
+-
+-  columnsFromModel: ColumnDef.makeFromModel(YarnConf),
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js
+deleted file mode 100644
+index a5e0eb5744b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-rm-log.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Controller.extend({
+-  queryParams: ['filename'],
+-  filename: null
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/check-availability.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/check-availability.js
+deleted file mode 100644
+index 4470d6542a3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/check-availability.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export function checkAvailability(params/*, hash*/) {
+-  if (params[0] !== undefined && params[0] !== null && params[0] !== '') {
+-    return params[0];
+-  }
+-  return 'N/A';
+-}
+-
+-export default Ember.Helper.helper(checkAvailability);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/date-formatter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/date-formatter.js
+deleted file mode 100644
+index 17834e4df9c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/date-formatter.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export function dateFormatter(params) {
+-  const [timestamp, dateOnly] = params;
+-
+-  return dateOnly ? Converter.timeStampToDateOnly(timestamp) : Converter.timeStampToDate(timestamp);
+-}
+-
+-export default Ember.Helper.helper(dateFormatter);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
+deleted file mode 100644
+index 437def8a12e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/divide.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import Ember from 'ember';
+-
+-/**
+- * Helper assumes values are numeric. num means numerator and
+- * den means denominator.
+- */
+-export default Ember.Helper.helper(function(params,hash) {
+-  var num = hash.num;
+-  var den = hash.den;
+-  if (den === 0) {
+-    return 0;
+-  }
+-  return Math.floor(num/den);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/json-pretty.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/json-pretty.js
+deleted file mode 100644
+index a820c38778a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/json-pretty.js
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import Ember from 'ember';
+-
+-export function jsonPretty(params/*, hash*/) {
+-  let j = params[0];
+-  return j;
+-}
+-
+-export default Ember.Helper.helper(jsonPretty);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-adapter-helper.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-adapter-helper.js
+deleted file mode 100644
+index 616a38b3f1c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-adapter-helper.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export function createEmptyContainerLogInfo(location) {
+-  return {
+-    containerLogsInfo: {
+-      containerLogInfo: [{
+-        fileName: "",
+-        fileSize: "",
+-        lastModifiedTime: "",
+-        redirectedUrl: location
+-      }]
+-    }
+-  };
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
+deleted file mode 100644
+index 963fc1418c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/log-files-comma.js
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-/**
+- * Represent log files as comma separated list.
+- */
+-export default Ember.Helper.helper(function(params,hash) {
+-  var logFiles = hash.logFiles;
+-  if (logFiles == null) {
+-    return "";
+-  }
+-  var logFilesLen = logFiles.length;
+-  if (logFilesLen === 0) {
+-    return "";
+-  }
+-  var nodeId = hash.nodeId;
+-  var nodeAddr = hash.nodeAddr;
+-  var containerId = hash.containerId;
+-  var html = '<td>';
+-  for (var i = 0; i < logFilesLen; i++) {
+-    var logFileName = "";
+-    if (logFiles[i]) {
+-      if (typeof logFiles[i] === "object" && logFiles[i].containerLogFiles) {
+-        logFileName = logFiles[i].containerLogFiles;
+-      } else if (typeof logFiles[i] === "string") {
+-        logFileName = logFiles[i];
+-      }
+-    }
+-    html = html + '<a href="#/yarn-container-log/' + nodeId + '/' +
+-        nodeAddr + '/' + containerId + '/' + logFileName + '">' + logFileName +
+-        '</a>';
+-    if (i !== logFilesLen - 1) {
+-      html = html + ", ";
+-    }
+-  }
+-  html = html + '</td>';
+-  return Ember.String.htmlSafe(html);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/lower.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/lower.js
+deleted file mode 100644
+index 34c936f9df6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/lower.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-import Ember from 'ember';
+-
+-export function lower(params) {
+-  const string = params[0];
+-  if(!string) {
+-    return "";
+-  }
+-  return string.toLowerCase();
+-}
+-
+-export default Ember.Helper.helper(lower);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
+deleted file mode 100644
+index 4f412da8a83..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-link.js
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-/**
+- * Generate link to node page if its not SHUTDOWN or LOST.
+- */
+-export default Ember.Helper.helper(function(params,hash) {
+-  var nodeState = hash.nodeState;
+-  var nodeHTTPAddress = hash.nodeHTTPAddress;
+-  var nodeId = hash.nodeId;
+-  var html = '<td>';
+-  if (nodeState === "SHUTDOWN" || nodeState === "LOST") {
+-    html = html + nodeHTTPAddress;
+-  } else {
+-    html = html + '<a href="#/yarn-node/' + nodeId + "/" + encodeURIComponent(nodeHTTPAddress) + '">' +
+-        nodeHTTPAddress + '</a>';
+-  }
+-  html = html + '</td>';
+-  return Ember.String.htmlSafe(html);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
+deleted file mode 100644
+index ace50e652ff..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import Ember from 'ember';
+-
+-/**
+- * Create left hand side node manager menu with menu item activated based
+- * on page being accessed.
+- */
+-export default Ember.Helper.helper(function(params,hash) {
+-  // Place a menu within a panel inside col-md-2 container.
+-  var nodeIdSplitAtPort = hash.nodeId;
+-  var portIndex = nodeIdSplitAtPort.indexOf(':');
+-  if (portIndex !== -1) {
+-    nodeIdSplitAtPort = nodeIdSplitAtPort.substring(0, portIndex) +
+-        ':&#8203;' + nodeIdSplitAtPort.substring(portIndex + 1);
+-  }
+-  var normalizedNodeId = '';
+-  var splitsAlongDots = nodeIdSplitAtPort.split('.');
+-  if (splitsAlongDots) {
+-    var len = splitsAlongDots.length;
+-    for (var i = 0; i < len; i++) {
+-      normalizedNodeId = normalizedNodeId + splitsAlongDots[i];
+-      if (i !== len - 1) {
+-        normalizedNodeId = normalizedNodeId + '.&#8203;';
+-      }
+-    }
+-  } else {
+-    normalizedNodeId = nodeIdSplitAtPort;
+-  }
+-
+-  var html = '<div class="col-md-2 container-fluid"><div class="panel panel-default">'+
+-      '<div class="panel-heading"><h4>Node Manager<br>(' + normalizedNodeId + ')</h4></div>'+
+-      '<div class="panel-body"><ul class="nav nav-pills nav-stacked" id="stacked-menu">' +
+-      '<ul class="nav nav-pills nav-stacked collapse in"><li';
+-  if (hash.path === 'yarn-node') {
+-    html = html + ' class="active"';
+-  }
+-  html = html + '><a href="#/yarn-node/' + hash.nodeId + '/' + hash.nodeAddr +
+-      '">Node Information</a></li><li';
+-  if (hash.path === 'yarn-node-apps') {
+-    html = html + ' class="active"';
+-  }
+-  html = html + '><a href="#/yarn-node-apps/' + hash.nodeId + '/' + hash.nodeAddr +
+-      '">List of Applications on this Node</a></li><li';
+-  if (hash.path === 'yarn-node-containers') {
+-    html = html + ' class="active"';
+-  }
+-  html = html + '><a href="#/yarn-node-containers/' +hash.nodeId + '/' + hash.nodeAddr +
+-      '">List of Containers on this Node</a></li></ul></ul></div>';
+-  return Ember.String.htmlSafe(html);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
+deleted file mode 100644
+index e8d18c44720..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/prepend-protocol.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export function prependProtocol(params/*, hash*/) {
+-  let address = params[0];
+-  if (address && address.indexOf('://') < 0) {
+-    address = 'http://' + address;
+-  }
+-  return address;
+-}
+-
+-export default Ember.Helper.helper(prependProtocol);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/index.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/index.html
+deleted file mode 100644
+index 9fcf0eed408..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/index.html
++++ /dev/null
+@@ -1,44 +0,0 @@
+-<!--
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+--->
+-
+-<!DOCTYPE html>
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+-    <title>YARN</title>
+-    <meta name="description" content="">
+-    <meta name="viewport" content="width=device-width, initial-scale=1">
+-
+-    {{content-for 'head'}}
+-
+-    <link rel="stylesheet" href="assets/vendor.css">
+-    <link rel="stylesheet" href="assets/yarn-ui.css">
+-
+-    {{content-for 'head-footer'}}
+-  </head>
+-  <body>
+-    {{content-for 'body'}}
+-    <script src="config/configs.env" integrity=""></script>
+-
+-    <script src="assets/vendor.js"></script>
+-    <script src="assets/yarn-ui.js"></script>
+-
+-    {{content-for 'body-footer'}}
+-  </body>
+-</html>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/env.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/env.js
+deleted file mode 100644
+index bb9329ecf48..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/env.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-export function initialize( application ) {
+-   application.inject('controller', 'env', 'service:env');
+-   application.inject('route', 'env', 'service:env');
+-   application.inject('adapter', 'env', 'service:env');
+-   application.inject('model', 'env', 'service:env');
+-}
+-
+-export default {
+-  name: 'env',
+-  initialize
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/hosts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/hosts.js
+deleted file mode 100644
+index 6e3aa964c89..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/hosts.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export function initialize( application ) {
+-   application.inject('controller', 'hosts', 'service:hosts');
+-   application.inject('route', 'hosts', 'service:hosts');
+-   application.inject('adapter', 'hosts', 'service:hosts');
+-}
+-
+-export default {
+-  name: 'hosts',
+-  initialize
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/jquery.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/jquery.js
+deleted file mode 100644
+index 9633cbcdedd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/jquery.js
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export function initialize(/* application */) {
+-  Ember.$(document).tooltip({
+-    tooltipClass: 'generic-tooltip',
+-    selector: ".yarn-tooltip"
+-  });
+-
+-  Ember.$.ajaxSetup({
+-    cache: false
+-  });
+-}
+-
+-export default {
+-  name: 'jquery',
+-  initialize
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+deleted file mode 100644
+index 5a697eaf692..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
++++ /dev/null
+@@ -1,307 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/* globals ENV: true */
+-
+-import Ember from 'ember';
+-
+-function getConfigFromYarn(rmhost, application, config) {
+-  var httpUrl = window.location.protocol + '//' +
+-    (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+-
+-  httpUrl += '/conf?name=' + config;
+-  Ember.Logger.log("The RM URL is: " + httpUrl);
+-
+-  var configValue = "";
+-    $.ajax({
+-      type: 'GET',
+-      dataType: 'json',
+-      async: false,
+-      context: this,
+-      url: httpUrl,
+-      success: function(data) {
+-        configValue = data.property.value;
+-        Ember.Logger.log("Value of the config returned from RM: " + configValue);
+-
+-        application.advanceReadiness();
+-      },
+-      error: function() {
+-        application.advanceReadiness();
+-      }
+-    });
+-  return configValue;
+-}
+-
+-function getJHSURL(rmhost, application, isHttpsSchemeEnabled) {
+-  Ember.Logger.log("getJHSURL, params:rmhost=" + rmhost + ",application=" + application + ",isHttpsSchemeEnabled=" + isHttpsSchemeEnabled);
+-  var config = '';
+-  if (isHttpsSchemeEnabled) {
+-    config = 'mapreduce.jobhistory.webapp.https.address';
+-  } else {
+-    config = 'mapreduce.jobhistory.webapp.address';
+-  }
+-  return getConfigFromYarn(rmhost, application, config);
+-}
+-
+-function getYarnHttpProtocolScheme(rmhost, application) {
+-  return getConfigFromYarn(rmhost, application, 'yarn.http.policy');
+-}
+-
+-function getYarnTimelineEnabled(rmhost, application) {
+-  return getConfigFromYarn(rmhost, application, 'yarn.timeline-service.enabled');
+-}
+-
+-function getTimeLineURL(rmhost, isHttpsSchemeEnabled) {
+-  var url = window.location.protocol + '//' +
+-    (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+-
+-  if(isHttpsSchemeEnabled) {
+-    url += '/conf?name=yarn.timeline-service.reader.webapp.https.address';
+-  } else {
+-    url += '/conf?name=yarn.timeline-service.reader.webapp.address';
+-  }
+-
+-  Ember.Logger.log("Get Timeline V2 Address URL: " + url);
+-  return url;
+-}
+-
+-function getTimeLineV1URL(rmhost, isHttpsSchemeEnabled) {
+-  var url = window.location.protocol + '//' +
+-    (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+-
+-  if(isHttpsSchemeEnabled) {
+-    url += '/conf?name=yarn.timeline-service.webapp.https.address';
+-  } else {
+-    url += '/conf?name=yarn.timeline-service.webapp.address';
+-  }
+-
+-  Ember.Logger.log("Get Timeline V1 Address URL: " + url);
+-  return url;
+-}
+-
+-function getSecurityURL(rmhost) {
+-  var url = window.location.protocol + '//' +
+-    (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+-
+-  url += '/conf?name=hadoop.security.authentication';
+-  Ember.Logger.log("Server security mode url is: " + url);
+-  return url;
+-}
+-
+-function getClusterIdFromYARN(rmhost, application) {
+-  var httpUrl = window.location.protocol + '//' +
+-    (ENV.hosts.localBaseAddress? ENV.hosts.localBaseAddress + '/' : '') + rmhost;
+-
+-  httpUrl += '/conf?name=yarn.resourcemanager.cluster-id';
+-  Ember.Logger.log("Get cluster-id URL is: " + httpUrl);
+-
+-  var clusterId = "";
+-  $.ajax({
+-    type: 'GET',
+-    dataType: 'json',
+-    async: false,
+-    context: this,
+-    url: httpUrl,
+-    success: function(data) {
+-      clusterId = data.property.value;
+-      Ember.Logger.log("Cluster Id from RM: " + clusterId);
+-      application.advanceReadiness();
+-    },
+-    error: function() {
+-      application.advanceReadiness();
+-    }
+-  });
+-  return clusterId;
+-}
+-
+-function getNodeManagerPort(rmhost, application) {
+-  var httpUrl = window.location.protocol + "//" +
+-    (ENV.hosts.localBaseAddress ? ENV.hosts.localBaseAddress + '/' : '') + rmhost
+-    + "/conf?name=yarn.nodemanager.webapp.address";
+-
+-  var port = "8042";
+-  $.ajax({
+-    type: 'GET',
+-    dataType: 'json',
+-    async: false,
+-    context: this,
+-    url: httpUrl,
+-    success: function(data) {
+-      port = data.property.value.split(":")[1];
+-      application.advanceReadiness();
+-    },
+-    error: function() {
+-      port = "8042";
+-      application.advanceReadiness();
+-    }
+-  });
+-  return port;
+-}
+-
+-function transformURL(url, hostname) {
+-  // Deleting the scheme from the beginning of the url
+-  url = url.replace(/(^\w+:|^)\/\//, '');
+-
+-  var address = url.split(":")[0];
+-  var port = url.split(":")[1];
+-  // Instead of localhost, use the name of the host
+-  if (address === "0.0.0.0" || address === "localhost") {
+-    url = hostname + ":" + port;
+-  }
+-
+-  Ember.Logger.log("The transformed URL is: " + url);
+-  return url;
+-}
+-
+-function updateConfigs(application) {
+-  var hostname = window.location.hostname;
+-  var rmhost = hostname + (window.location.port ? ':' + window.location.port: '') +
+-    skipTrailingSlash(window.location.pathname);
+-
+-  window.ENV = window.ENV || {};
+-  window.ENV.hosts = window.ENV.hosts || {};
+-
+-  if(!ENV.hosts.rmWebAddress) {
+-    ENV.hosts.rmWebAddress = rmhost;
+-    ENV.hosts.protocolScheme = window.location.protocol;
+-  } else {
+-    rmhost = ENV.hosts.rmWebAddress;
+-  }
+-
+-  Ember.Logger.log("RM Address: " + rmhost);
+-
+-  var protocolSchemeFromRM = getYarnHttpProtocolScheme(rmhost, application);
+-  Ember.Logger.log("Is protocol scheme https? " + (protocolSchemeFromRM == "HTTPS_ONLY"));
+-  var isHttpsSchemeEnabled = (protocolSchemeFromRM == "HTTPS_ONLY");
+-
+-  var clusterIdFromYARN = getClusterIdFromYARN(rmhost, application);
+-  ENV.clusterId = clusterIdFromYARN;
+-
+-  var nodeManagerPort = getNodeManagerPort(rmhost, application);
+-  Ember.Logger.log("NodeMananger port: " + nodeManagerPort);
+-  ENV.nodeManagerPort = nodeManagerPort;
+-
+-  var timelineServiceEnabled = getYarnTimelineEnabled(rmhost, application);
+-  Ember.Logger.log("Timeline Service enabled: " + timelineServiceEnabled);
+-  ENV.timelineServiceEnabled = (timelineServiceEnabled.toLowerCase() === 'true');
+-
+-  if (!ENV.hosts.jhsAddress) {
+-    var jhsAddress = getJHSURL(rmhost, application, isHttpsSchemeEnabled);
+-    jhsAddress = transformURL(jhsAddress, hostname);
+-    Ember.Logger.log("The JHS address is " + jhsAddress);
+-    ENV.hosts.jhsAddress = jhsAddress;
+-  }
+-
+-  if(!ENV.hosts.timelineWebAddress) {
+-    var timelinehost = "";
+-    $.ajax({
+-      type: 'GET',
+-      dataType: 'json',
+-      async: false,
+-      context: this,
+-      url: getTimeLineURL(rmhost, isHttpsSchemeEnabled),
+-      success: function(data) {
+-        timelinehost = data.property.value;
+-        timelinehost = transformURL(timelinehost, hostname);
+-        ENV.hosts.timelineWebAddress = timelinehost;
+-        Ember.Logger.log("Timeline Address from RM: " + timelinehost);
+-
+-        application.advanceReadiness();
+-      },
+-      error: function() {
+-        application.advanceReadiness();
+-      }
+-    });
+-  } else {
+-    Ember.Logger.log("Timeline Address: " + ENV.hosts.timelineWebAddress);
+-    application.advanceReadiness();
+-  }
+-
+-  if(!ENV.hosts.timelineV1WebAddress) {
+-    var timelinehost = "";
+-    $.ajax({
+-      type: 'GET',
+-      dataType: 'json',
+-      async: false,
+-      context: this,
+-      url: getTimeLineV1URL(rmhost, isHttpsSchemeEnabled),
+-      success: function(data) {
+-        timelinehost = data.property.value;
+-        timelinehost = transformURL(timelinehost, hostname);
+-        ENV.hosts.timelineV1WebAddress = timelinehost;
+-        Ember.Logger.log("Timeline V1 Address from RM: " + timelinehost);
+-
+-        application.advanceReadiness();
+-      },
+-      error: function() {
+-        application.advanceReadiness();
+-      }
+-    });
+-  } else {
+-    Ember.Logger.log("Timeline V1 Address: " + ENV.hosts.timelineV1WebAddress);
+-    application.advanceReadiness();
+-  }
+-
+-  if(!ENV.hosts.isSecurityEnabled) {
+-    var isSecurityEnabled = "";
+-    $.ajax({
+-      type: 'GET',
+-      dataType: 'json',
+-      async: false,
+-      context: this,
+-      url: getSecurityURL(rmhost),
+-      success: function(data) {
+-        isSecurityEnabled = data.property.value;
+-        ENV.hosts.isSecurityEnabled = isSecurityEnabled;
+-        Ember.Logger.log("Security mode is : " + isSecurityEnabled);
+-        application.advanceReadiness();
+-      },
+-      error: function() {
+-        application.advanceReadiness();
+-      }
+-    });
+-  } else {
+-    Ember.Logger.log("Security mode is: " + ENV.hosts.isSecurityEnabled);
+-    application.advanceReadiness();
+-  }
+-}
+-
+-export function initialize( application ) {
+-  application.deferReadiness();
+-  updateConfigs(application);
+-}
+-
+-export default {
+-  name: 'loader',
+-  before: 'env',
+-  initialize
+-};
+-
+-const skipTrailingSlash = function(path) {
+-  path = path.replace('index.html', '');
+-  path = path.replace('ui2/', '');
+-  path = path.replace(/\/$/, '');
+-  console.log('base url:' + path)
+-  if(path.includes("redirect")) {
+-    var to = path.lastIndexOf('/');
+-    to = to == -1 ? path.length : to + 1;
+-    path = path.substring(0, to);
+-    console.log('base url after redirect:' + path)
+-  }
+-  return path;
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
+deleted file mode 100644
+index a1b9a2f0a24..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/mixins/app-attempt.js
++++ /dev/null
+@@ -1,88 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Mixin.create({
+-  fetchAppInfoFromRMorATS(appId, store) {
+-    return new Ember.RSVP.Promise(function(resolve, reject) {
+-      store.find('yarn-app', appId).then(function(rmApp) {
+-        resolve(rmApp);
+-      }, function() {
+-        store.find('yarn-app-timeline', appId).then(function(atsApp) {
+-          resolve(atsApp);
+-        }, function() {
+-          console.error('Error:', 'Application not found in RM or ATS for appId: ' + appId);
+-          reject(null);
+-        });
+-      });
+-    });
+-  },
+-
+-  fetchAppInfoFromRM(appId, store) {
+-    return new Ember.RSVP.Promise(function(resolve, reject) {
+-      store.find('yarn-app', appId).then(function(rmApp) {
+-        resolve(rmApp);
+-      }, function() {
+-          console.error('Error:', 'Application not found in RM for appId: ' + appId);
+-          reject(null);
+-      });
+-    });
+-  },
+-
+-  fetchAttemptInfoFromRMorATS(attemptId, store) {
+-    return new Ember.RSVP.Promise(function(resolve, reject) {
+-      store.findRecord('yarn-app-attempt', attemptId, {reload: true}).then(function(rmAttempt) {
+-        resolve(rmAttempt);
+-      }, function() {
+-        store.findRecord('yarn-timeline-appattempt', attemptId, {reload: true}).then(function(atsAttempt) {
+-          resolve(atsAttempt);
+-        }, function() {
+-          console.error('Error:', 'Application attempt not found in RM or ATS for attemptId: ' + attemptId);
+-          reject(null);
+-        });
+-      });
+-    });
+-  },
+-
+-  fetchAttemptListFromRMorATS(appId, store) {
+-    return new Ember.RSVP.Promise(function(resolve, reject) {
+-      store.query('yarn-app-attempt', {appId: appId}).then(function(rmAttempts) {
+-        resolve(rmAttempts);
+-      }, function() {
+-        store.query('yarn-timeline-appattempt', {appId: appId}).then(function(atsAttempts) {
+-          resolve(atsAttempts);
+-        }, function() {
+-          console.error('Error:', 'Application attempts not found in RM or ATS for appId: ' + appId);
+-          reject(null);
+-        });
+-      });
+-    });
+-  },
+-
+-  fetchAttemptListFromRM(appId, store) {
+-    return new Ember.RSVP.Promise(function(resolve, reject) {
+-      store.query('yarn-app-attempt', {appId: appId}).then(function(rmAttempts) {
+-        resolve(rmAttempts);
+-      }, function() {
+-          console.error('Error:', 'Application attempts not found in RM for appId: ' + appId);
+-          reject(null);
+-        });
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-info.js
+deleted file mode 100644
+index c1a095a7740..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-info.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  startedOn: DS.attr('string'),
+-  state: DS.attr('string'),
+-  haState: DS.attr('string'),
+-  rmStateStoreName: DS.attr('string'),
+-  resourceManagerVersion: DS.attr('string'),
+-  resourceManagerBuildVersion: DS.attr('string'),
+-  hadoopVersion: DS.attr('string'),
+-  hadoopBuildVersion: DS.attr('string'),
+-  hadoopVersionBuiltOn: DS.attr('string'),
+-  getYARNBuildHash: function() {
+-	return this.get("hadoopVersion") + " from " +  this.get("resourceManagerBuildVersion").split(" ")[2];
+-  }.property("yarnHash")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
+deleted file mode 100644
+index c1459b8ac80..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-metric.js
++++ /dev/null
+@@ -1,211 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  appsSubmitted: DS.attr('number'),
+-  appsCompleted: DS.attr('number'),
+-  appsPending: DS.attr('number'),
+-  appsRunning: DS.attr('number'),
+-  appsFailed: DS.attr('number'),
+-  appsKilled: DS.attr('number'),
+-  reservedMB: DS.attr('number'),
+-  availableMB: DS.attr('number'),
+-  allocatedMB: DS.attr('number'),
+-  reservedVirtualCores: DS.attr('number'),
+-  availableVirtualCores: DS.attr('number'),
+-  allocatedVirtualCores: DS.attr('number'),
+-  containersAllocated: DS.attr('number'),
+-  containersReserved: DS.attr('number'),
+-  containersPending: DS.attr('number'),
+-  totalMB: DS.attr('number'),
+-  totalVirtualCores: DS.attr('number'),
+-  totalNodes: DS.attr('number'),
+-  lostNodes: DS.attr('number'),
+-  unhealthyNodes: DS.attr('number'),
+-  decommissioningNodes: DS.attr('number'),
+-  decommissionedNodes: DS.attr('number'),
+-  rebootedNodes: DS.attr('number'),
+-  activeNodes: DS.attr('number'),
+-  totalUsedResourcesAcrossPartition: DS.attr('object'),
+-  totalClusterResourcesAcrossPartition: DS.attr('object'),
+-
+-  getFinishedAppsDataForDonutChart: function() {
+-    var arr = [];
+-    arr.push({
+-      label: "Completed",
+-      value: this.get("appsCompleted")
+-    });
+-    arr.push({
+-      label: "Killed",
+-      value: this.get("appsKilled")
+-    });
+-    arr.push({
+-      label: "Failed",
+-      value: this.get("appsFailed")
+-    });
+-
+-    return arr;
+-  }.property("appsCompleted", "appsKilled", "appsFailed"),
+-
+-  getRunningAppsDataForDonutChart: function() {
+-    var arr = [];
+-
+-    arr.push({
+-      label: "Pending",
+-      value: this.get("appsPending")
+-    });
+-    arr.push({
+-      label: "Running",
+-      value: this.get("appsRunning")
+-    });
+-
+-    return arr;
+-  }.property("appsPending", "appsRunning"),
+-
+-  getNodesDataForDonutChart: function() {
+-    var arr = [];
+-    arr.push({
+-      label: "Active",
+-      value: this.get("activeNodes")
+-    });
+-    arr.push({
+-      label: "Unhealthy",
+-      value: this.get("unhealthyNodes")
+-    });
+-    arr.push({
+-      label: "Decommissioning",
+-      value: this.get("decommissioningNodes") || 0
+-    });
+-    arr.push({
+-      label: "Decommissioned",
+-      value: this.get("decommissionedNodes")
+-    });
+-    arr.push({
+-      label: "Lost",
+-      value: this.get("lostNodes")
+-    });
+-    return arr;
+-  }.property("activeNodes", "unhealthyNodes", "decommissioningNodes", "decommissionedNodes", "lostNodes"),
+-
+-  getMemoryDataForDonutChart: function() {
+-    var type = "MB";
+-    var arr = [];
+-    arr.push({
+-      label: "Allocated",
+-      value: this.get("allocated" + type)
+-    });
+-    arr.push({
+-      label: "Reserved",
+-      value: this.get("reserved" + type)
+-    });
+-    arr.push({
+-      label: "Available",
+-      value: this.get("available" + type)
+-    });
+-
+-    return arr;
+-  }.property("allocatedMB", "reservedMB", "availableMB"),
+-
+-  getVCoreDataForDonutChart: function() {
+-    var type = "VirtualCores";
+-    var arr = [];
+-    arr.push({
+-      label: "Allocated",
+-      value: this.get("allocated" + type)
+-    });
+-    arr.push({
+-      label: "Reserved",
+-      value: this.get("reserved" + type)
+-    });
+-    arr.push({
+-      label: "Available",
+-      value: Math.max(this.get("available" + type), 0)
+-    });
+-
+-    return arr;
+-  }.property("allocatedVirtualCores", "reservedVirtualCores", "availableVirtualCores"),
+-
+-  getResourceTypes: function() {
+-    var types = [];
+-    if (this.get("totalClusterResourcesAcrossPartition")) {
+-
+-      console.log(types);
+-    }
+-  }.property("totalClusterResourcesAcrossPartition"),
+-
+-  /*
+-   * Returned format
+-   * [
+-   *     {
+-   *         name: <resource-name>
+-   *         unit: <resource-unit>
+-   *         [
+-   *            {
+-   *               label: <label>
+-   *               value: <value>
+-   *            },
+-   *            {
+-   *            }
+-   *            ...
+-   *         ],
+-   *     }
+-   * ]
+-   */
+-  getAllResourceTypesDonutChart: function() {
+-    if (this.get("totalClusterResourcesAcrossPartition")
+-      && this.get("totalUsedResourcesAcrossPartition")) {
+-      var usages = [];
+-
+-      var clusterResourceInformations = this.get("totalClusterResourcesAcrossPartition").resourceInformations.resourceInformation;
+-      var usedResourceInformations = this.get("totalUsedResourcesAcrossPartition").resourceInformations.resourceInformation;
+-
+-      clusterResourceInformations.forEach(function(cluster) {
+-        var perResourceTypeUsage = {
+-          name: cluster.name,
+-          unit: cluster.units,
+-          data: []
+-        };
+-
+-        usedResourceInformations.forEach(function (used) {
+-          if (used.name === perResourceTypeUsage.name) {
+-            var usedValue = used.value;
+-            perResourceTypeUsage.data.push({
+-              label: "Used",
+-              value: usedValue
+-            }, {
+-              label: "Available",
+-              value: cluster.value - usedValue
+-            });
+-          }
+-        });
+-
+-        usages.push(perResourceTypeUsage);
+-
+-        // Make sure id is a valid w3c ID
+-        perResourceTypeUsage.id = perResourceTypeUsage.name.replace('/', '-');
+-        perResourceTypeUsage.id = perResourceTypeUsage.id.replace('.', '-');
+-      });
+-
+-      console.log(usages);
+-      return usages;
+-    }
+-    return null;
+-  }.property()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-user-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-user-info.js
+deleted file mode 100644
+index c2867f8b044..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/cluster-user-info.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-    rmLoginUser: DS.attr('string'),
+-    requestedUser: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/jhs-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/jhs-health.js
+deleted file mode 100644
+index f4c49041a12..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/jhs-health.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.Model.extend({
+-  startedOn: DS.attr('string'),
+-
+-  isJHSHealthy: function() {
+-    return this.get('startedOn') !== null;
+-  }.property('startedOn')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/timeline-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/timeline-health.js
+deleted file mode 100644
+index 367ab07d787..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/timeline-health.js
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  healthStatus: DS.attr('string'),
+-
+-  isTimelineUnHealthy: function() {
+-    return this.get('healthStatus') !== 'RUNNING';
+-  }.property('healthStatus')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
+deleted file mode 100644
+index b89db46268a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js
++++ /dev/null
+@@ -1,156 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  startTime: DS.attr('string'),
+-  startedTime: DS.attr('string'),
+-  finishedTime: DS.attr('string'),
+-  containerId: DS.attr('string'),
+-  amContainerId: DS.attr('string'),
+-  nodeHttpAddress: DS.attr('string'),
+-  exposedPorts: DS.attr('string'),
+-  nodeId: DS.attr('string'),
+-  hosts: DS.attr('string'),
+-  logsLink: DS.attr('string'),
+-  state: DS.attr('string'),
+-  appAttemptId: DS.attr('string'),
+-  diagnosticsInfo: DS.attr('string'),
+-
+-  appId: Ember.computed("id",function () {
+-    var id = this.get("id");
+-    id = id.split("_");
+-
+-    id[0] = "application";
+-    id.pop();
+-
+-    return id.join("_");
+-  }),
+-
+-  attemptStartedTime: function() {
+-    var startTime = this.get("startTime");
+-    // If startTime variable is not present, get from startedTime
+-    if (startTime === undefined ||
+-      startTime === "Invalid date") {
+-      startTime = this.get("startedTime");
+-    }
+-
+-    return startTime;
+-  }.property("startedTime"),
+-
+-  startTs: function() {
+-    return Converter.dateToTimeStamp(this.get('attemptStartedTime'));
+-  }.property("startTime"),
+-
+-  finishedTs: function() {
+-    var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+-    return ts;
+-  }.property("finishedTime"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTs") < this.get("startTs")) {
+-      return "";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  shortAppAttemptId: function() {
+-    if (!this.get("containerId")) {
+-      return this.get("id");
+-    }
+-    return "attempt_" +
+-           parseInt(Converter.containerIdToAttemptId(this.get("containerId")).split("_")[3]);
+-  }.property("containerId"),
+-
+-  appMasterContainerId: function() {
+-    var id = this.get("containerId");
+-    // If containerId variable is not present, get from amContainerId
+-    if (id === undefined) {
+-      id = this.get("amContainerId");
+-    }
+-    return id;
+-  }.property("amContainerId"),
+-
+-  IsAmNodeUrl: function() {
+-    var url = this.get("nodeHttpAddress");
+-      // If nodeHttpAddress variable is not present, hardcode it.
+-    if (url === undefined) {
+-      url = "Not Available";
+-    }
+-    return url !== "Not Available";
+-  }.property("nodeHttpAddress"),
+-
+-  amNodeId : function() {
+-    var id = this.get("nodeId");
+-    // If nodeId variable is not present, get from host
+-    if (id === undefined) {
+-      id = this.get("hosts");
+-    }
+-    return id;
+-  }.property("nodeId"),
+-
+-  IsLinkAvailable: function() {
+-    var url = this.get("logsLink");
+-    // If logsLink variable is not present, hardcode its.
+-    if (url === undefined) {
+-      url = "Not Available";
+-    }
+-    return url !== "Not Available";
+-  }.property("logsLink"),
+-
+-  elapsedTime: function() {
+-    var elapsedMs = this.get("finishedTs") - this.get("startTs");
+-    if (elapsedMs <= 0) {
+-      elapsedMs = Date.now() - this.get("startTs");
+-    }
+-    return Converter.msToElapsedTimeUnit(elapsedMs);
+-  }.property(),
+-
+-  tooltipLabel: function() {
+-    return "<p>Id:" + this.get("id") +
+-           "</p><p>ElapsedTime:" +
+-           String(this.get("elapsedTime")) + "</p>";
+-  }.property(),
+-
+-  link: function() {
+-    return "/yarn-app-attempt/" + this.get("id");
+-  }.property(),
+-
+-  linkname: function() {
+-    return "yarn-app-attempt";
+-  }.property(),
+-
+-  attemptState: function() {
+-    return this.get("state");
+-  }.property(),
+-
+-  masterNodeURL: function() {
+-    var addr = encodeURIComponent(this.get("nodeHttpAddress"));
+-    return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`;
+-  }.property("nodeId", "nodeHttpAddress"),
+-
+-  appAttemptContainerLogsURL: function() {
+-    const attemptId = this.get("id");
+-    const containerId = this.get("appMasterContainerId");
+-    const appId = Converter.attemptIdToAppId(attemptId);
+-    return `#/yarn-app/${appId}/logs?attempt=${attemptId}&containerid=${containerId}`;
+-  }.property("id", "appMasterContainerId")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
+deleted file mode 100644
+index a8a7471f1c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-flowrun.js
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  appId: DS.attr('string'),
+-  type: DS.attr('string'),
+-  uid: DS.attr('string'),
+-  metrics: DS.attr('array'),
+-  startedTs: DS.attr('number'),
+-  finishedTs: DS.attr('number'),
+-  state: DS.attr('string'),
+-  cpuVCores: DS.attr('number'),
+-  memoryUsed: DS.attr('number'),
+-
+-  elapsedTs: function() {
+-    return this.get('finishedTs') - this.get('startedTs');
+-  }.property('startedTs', 'finishedTs'),
+-
+-  getCpuVCoresVizDataForBarChart: function() {
+-    return {
+-      label: this.get('appId'),
+-      value: this.get('cpuVCores'),
+-      tooltip: this.get("appId") + "<br>" + 'CPU VCores: ' + this.get('cpuVCores')
+-    };
+-  },
+-
+-  getMemoryVizDataForBarChart: function() {
+-    return {
+-      label: this.get('appId'),
+-      value: this.get('memoryUsed'),
+-      tooltip: this.get("appId") + "<br>" + 'Memory Used: ' + Converter.memoryBytesToMB(this.get('memoryUsed'))
+-    };
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-log.js
+deleted file mode 100644
+index 87b9fa69d88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-log.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string', {defaultValue: ''}),
+-  containerID: DS.attr('string', {defaultValue: ''}),
+-  logFileName: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''}),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-redirect-log.js
+deleted file mode 100644
+index 87b9fa69d88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-jhs-redirect-log.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string', {defaultValue: ''}),
+-  containerID: DS.attr('string', {defaultValue: ''}),
+-  logFileName: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''}),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-log.js
+deleted file mode 100644
+index 87b9fa69d88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-log.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string', {defaultValue: ''}),
+-  containerID: DS.attr('string', {defaultValue: ''}),
+-  logFileName: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''}),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-redirect-log.js
+deleted file mode 100644
+index 87b9fa69d88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-redirect-log.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string', {defaultValue: ''}),
+-  containerID: DS.attr('string', {defaultValue: ''}),
+-  logFileName: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''}),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
+deleted file mode 100644
+index 8b2702f63f8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-timeline.js
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  appName: DS.attr('string'),
+-  user: DS.attr('string'),
+-  queue: DS.attr('string'),
+-  state: DS.attr('string'),
+-  startTime: DS.attr('string'),
+-  elapsedTime: DS.attr('string'),
+-  finalStatus: DS.attr('string'),
+-  finishedTime: DS.attr('finishedTime'),
+-  progress: DS.attr('number'),
+-  diagnostics: DS.attr('string'),
+-  amHostHttpAddress: DS.attr('string'),
+-  logAggregationStatus: DS.attr('string'),
+-  unmanagedApplication: DS.attr('string'),
+-  amNodeLabelExpression: DS.attr('string'),
+-  applicationTags: DS.attr('string'),
+-  applicationType: DS.attr('string'),
+-  priority: DS.attr('number'),
+-  allocatedMB: DS.attr('number'),
+-  allocatedVCores: DS.attr('number'),
+-  runningContainers: DS.attr('number'),
+-  memorySeconds: DS.attr('number'),
+-  vcoreSeconds: DS.attr('number'),
+-  preemptedResourceMB: DS.attr('number'),
+-  preemptedResourceVCores: DS.attr('number'),
+-  numNonAMContainerPreempted: DS.attr('number'),
+-  numAMContainerPreempted: DS.attr('number'),
+-  clusterUsagePercentage: DS.attr('number'),
+-  queueUsagePercentage: DS.attr('number'),
+-  currentAppAttemptId: DS.attr('string'),
+-
+-  isFailed: function() {
+-    return this.get('finalStatus') === "FAILED";
+-  }.property("finalStatus"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTime") < this.get("startTime")) {
+-      return "";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  formattedElapsedTime: function() {
+-    return Converter.msToElapsedTimeUnit(this.get('elapsedTime'));
+-  }.property('elapsedTime'),
+-
+-  allocatedResource: function() {
+-    return Converter.resourceToString(this.get("allocatedMB"), this.get("allocatedVCores"));
+-  }.property("allocatedMB", "allocatedVCores"),
+-
+-  preemptedResource: function() {
+-    return Converter.resourceToString(this.get("preemptedResourceMB"), this.get("preemptedResourceVCores"));
+-  }.property("preemptedResourceMB", "preemptedResourceVCores"),
+-
+-  aggregatedResourceUsage: function() {
+-    return Converter.resourceToString(this.get("memorySeconds"), this.get("vcoreSeconds")) + " (× Secs)";
+-  }.property("memorySeconds", "vcoreSeconds"),
+-
+-  progressStyle: function() {
+-    return "width: " + this.get("progress") + "%";
+-  }.property("progress"),
+-
+-  runningContainersNumber: function() {
+-    if(this.get("runningContainers") < 0) {
+-      return 0;
+-    }
+-    return this.get("runningContainers");
+-  }.property("progress"),
+-
+-  finalStatusStyle: function() {
+-    var style = "default";
+-    var finalStatus = this.get("finalStatus");
+-    if (finalStatus === "KILLED") {
+-      style = "warning";
+-    } else if (finalStatus === "FAILED") {
+-      style = "danger";
+-    } else {
+-      style = "success";
+-    }
+-
+-    return "label label-" + style;
+-  }.property("finalStatus")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+deleted file mode 100644
+index f0d6a72d9d8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
++++ /dev/null
+@@ -1,155 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Converter from 'yarn-ui/utils/converter';
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  appName: DS.attr("string"),
+-  user: DS.attr("string"),
+-  queue: DS.attr("string"),
+-  state: DS.attr("string"),
+-  startTime: DS.attr("number"),
+-  elapsedTime: DS.attr("string"),
+-  finalStatus: DS.attr("string"),
+-  finishedTime: DS.attr("number"),
+-  progress: DS.attr("number"),
+-  diagnostics: DS.attr("string"),
+-  amHostHttpAddress: DS.attr("string"),
+-  masterNodeId: DS.attr("string"),
+-  logAggregationStatus: DS.attr("string"),
+-  unmanagedApplication: DS.attr("boolean"),
+-  amNodeLabelExpression: DS.attr("string"),
+-  applicationTags: DS.attr("string"),
+-  applicationType: DS.attr("string"),
+-  priority: DS.attr("string"),
+-  allocatedMB: DS.attr("number"),
+-  allocatedVCores: DS.attr("number"),
+-  runningContainers: DS.attr("number"),
+-  memorySeconds: DS.attr("number"),
+-  vcoreSeconds: DS.attr("number"),
+-  preemptedResourceMB: DS.attr("number"),
+-  preemptedResourceVCores: DS.attr("number"),
+-  numNonAMContainerPreempted: DS.attr("number"),
+-  numAMContainerPreempted: DS.attr("number"),
+-  clusterUsagePercentage: DS.attr("number"),
+-  queueUsagePercentage: DS.attr("number"),
+-  currentAppAttemptId: DS.attr("string"),
+-  remainingTimeoutInSeconds: DS.attr("number"),
+-  applicationExpiryTime: DS.attr("string"),
+-  resourceRequests: DS.attr("array"),
+-  trackingUI: DS.attr("string"),
+-  trackingUrl: DS.attr("string"),
+-
+-  isFailed: function() {
+-    return this.get("finalStatus") === "FAILED";
+-  }.property("finalStatus"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTime") < this.get("startTime")) {
+-      return "N/A";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  hasFinishedTime: function() {
+-    return this.get("finishedTime") >= this.get("startTime");
+-  }.property("hasFinishedTime"),
+-
+-  formattedStartTime: function() {
+-    return Converter.timeStampToDate(this.get('startTime'));
+-  }.property('startTime'),
+-
+-  formattedFinishedTime: function() {
+-    if (this.get("finishedTime") < this.get("startTime")) {
+-      return "N/A";
+-    }
+-    return Converter.timeStampToDate(this.get("finishedTime"));
+-  }.property('finishedTime'),
+-
+-  formattedElapsedTime: function() {
+-    return Converter.msToElapsedTimeUnit(this.get("elapsedTime"));
+-  }.property("elapsedTime"),
+-
+-  allocatedResource: function() {
+-    return Converter.resourceToString(
+-      this.get("allocatedMB"),
+-      this.get("allocatedVCores")
+-    );
+-  }.property("allocatedMB", "allocatedVCores"),
+-
+-  preemptedResource: function() {
+-    return Converter.resourceToString(
+-      this.get("preemptedResourceMB"),
+-      this.get("preemptedResourceVCores")
+-    );
+-  }.property("preemptedResourceMB", "preemptedResourceVCores"),
+-
+-  aggregatedResourceUsage: function() {
+-    return (
+-      Converter.resourceToString(
+-        this.get("memorySeconds"),
+-        this.get("vcoreSeconds")
+-      ) + " (× Secs)"
+-    );
+-  }.property("memorySeconds", "vcoreSeconds"),
+-
+-  progressStyle: function() {
+-    return "width: " + this.get("progress") + "%";
+-  }.property("progress"),
+-
+-  runningContainersNumber: function() {
+-    if (this.get("runningContainers") < 0) {
+-      return 0;
+-    }
+-    return this.get("runningContainers");
+-  }.property("progress"),
+-
+-  finalStatusStyle: function() {
+-    var finalStatus = this.get("finalStatus");
+-    var style = "";
+-
+-    if (finalStatus === "KILLED") {
+-      style = "warning";
+-    } else if (finalStatus === "FAILED") {
+-      style = "danger";
+-    } else if (finalStatus === "SUCCEEDED") {
+-      style = "success";
+-    } else {
+-      style = "default";
+-    }
+-
+-    return "label label-" + style;
+-  }.property("finalStatus"),
+-
+-  logAggregationStatusStyle: function() {
+-    const logAggregationStatus = this.get("logAggregationStatus");
+-    var style = "";
+-    if (logAggregationStatus === "FAILED" ||
+-        logAggregationStatus === "TIME_OUT") {
+-      style = "danger";
+-    } else if (logAggregationStatus === "RUNNING_WITH_FAILURE") {
+-      style = "warning";
+-    } else if (logAggregationStatus === "SUCCEEDED") {
+-      style = "success";
+-    } else {
+-      style = "default";
+-    }
+-    return "label label-" + style;
+-  }.property("logAggregationStatus")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js
+deleted file mode 100644
+index 1bce60761b4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-component-instance.js
++++ /dev/null
+@@ -1,69 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  containerId: DS.attr('string'),
+-  component: DS.attr('string'),
+-  instanceName: DS.attr('string'),
+-  state: DS.attr('number'),
+-  createdTimestamp: DS.attr('number'),
+-  startedTimestamp: DS.attr('number'),
+-  host: DS.attr('string'),
+-  node: DS.attr('string'),
+-  hostUrl: DS.attr('string'),
+-  ipAddr: DS.attr('string'),
+-  exposedPorts: DS.attr('string'),
+-  exitStatusCode: DS.attr('string'),
+-
+-  createdDate: Ember.computed('createdTimestamp', function() {
+-    var timestamp = this.get('createdTimestamp');
+-    if (timestamp > 0) {
+-      return Converter.timeStampToDate(timestamp);
+-    }
+-    return 'N/A';
+-  }),
+-
+-  startedDate: Ember.computed('startedTimestamp', function() {
+-    var timestamp = this.get('startedTimestamp');
+-    if (timestamp > 0) {
+-      return Converter.timeStampToDate(timestamp);
+-    }
+-    return 'N/A';
+-  }),
+-
+-  termLink: Ember.computed('node', 'containerId', function() {
+-    var protocol = window.location.protocol;
+-    var node = this.get('node');
+-    var port = this.get('env.app.nodeManagerPort');
+-    var containerId = this.get('containerId');
+-    var url = protocol + "//" + node + ":" + port +
+-       "/terminal/terminal.template?container=" + containerId;
+-    return url;
+-  }),
+-
+-  containerLogURL: Ember.computed('containerId', function() {
+-    const containerId = this.get('containerId');
+-    const attemptId = Converter.containerIdToAttemptId(containerId);
+-    const appId = Converter.attemptIdToAppId(attemptId);
+-    return `#/yarn-app/${appId}/logs?attempt=${attemptId}&containerid=${containerId}`;
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-conf.js
+deleted file mode 100644
+index 9846ea18ae8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-conf.js
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  name: DS.attr(),
+-  source: DS.attr(),
+-  value: DS.attr()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container-log.js
+deleted file mode 100644
+index 31cf61ecbcd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container-log.js
++++ /dev/null
+@@ -1,25 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string'),
+-  containerID: DS.attr('string'),
+-  logFileName: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
+deleted file mode 100644
+index 6a33e9a2fed..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  allocatedMB: DS.attr('number'),
+-  allocatedVCores: DS.attr('number'),
+-  assignedNodeId: DS.attr('string'),
+-  priority: DS.attr('number'),
+-  startedTime: DS.attr('number'),
+-  finishedTime: DS.attr('number'),
+-  logUrl: DS.attr('string'),
+-  containerExitStatus: DS.attr('number'),
+-  containerState: DS.attr('string'),
+-  nodeHttpAddress: DS.attr('string'),
+-  exposedPorts: DS.attr('string'),
+-  nodeId: DS.attr('string'),
+-
+-  startTs: function() {
+-    return Converter.dateToTimeStamp(this.get("startedTime"));
+-  }.property("startedTime"),
+-
+-  finishedTs: function() {
+-    var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+-    return ts;
+-  }.property("finishedTime"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTs") < this.get("startTs")) {
+-      return "";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  elapsedTime: function() {
+-    var elapsedMs = this.get("finishedTs") - this.get("startTs");
+-    if (elapsedMs <= 0) {
+-      elapsedMs = Date.now() - this.get("startTs");
+-    }
+-    return Converter.msToElapsedTimeUnit(elapsedMs);
+-  }.property(),
+-
+-  tooltipLabel: function() {
+-    return "<p>Id:" + this.get("id") +
+-           "</p><p>ElapsedTime:" +
+-           String(this.get("elapsedTime")) + "</p>";
+-  }.property(),
+-
+-  masterNodeURL: function() {
+-    var addr = encodeURIComponent(this.get("nodeHttpAddress"));
+-    return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`;
+-  }.property("nodeId", "nodeHttpAddress"),
+-
+-  appAttemptContainerLogsURL: function() {
+-    const containerId = this.get("id");
+-    const attemptId = Converter.containerIdToAttemptId(containerId);
+-    const appId = Converter.attemptIdToAppId(attemptId);
+-    return `#/yarn-app/${appId}/logs?attempt=${attemptId}&containerid=${containerId}`;
+-  }.property("id")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
+deleted file mode 100644
+index a06d6ab72de..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-entity.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  entityId: DS.attr('string'),
+-  type: DS.attr('string'),
+-  uid: DS.attr('string'),
+-  metrics: DS.attr('array')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
+deleted file mode 100644
+index 1095cfea3ae..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flow-activity.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  cluster: DS.attr('string'),
+-  flowName: DS.attr('string'),
+-  lastExecDate: DS.attr('string'),
+-  user: DS.attr('string'),
+-  flowruns: DS.attr('string'),
+-  uid: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
+deleted file mode 100644
+index 9bcf1e174e2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun-brief.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  flowName: DS.attr('string'),
+-  runid: DS.attr('string'),
+-  shownid: DS.attr('string'),
+-  type: DS.attr('string'),
+-  createTime: DS.attr('string'),
+-  createTimeRaw: DS.attr(),
+-  endTime: DS.attr('string'),
+-  endTimeRaw: DS.attr(),
+-  user: DS.attr('string'),
+-  uid: DS.attr('string'),
+-  cpuVCores: DS.attr('number'),
+-  memoryUsed: DS.attr('number'),
+-
+-  runDurationTs: function() {
+-    var duration = this.get('endTimeRaw') - this.get('createTimeRaw');
+-    if (duration <= 0) {
+-      duration = Date.now() - this.get('createTimeRaw');
+-    }
+-    return duration;
+-  }.property('createTimeRaw', 'endTimeRaw'),
+-
+-  getElapsedTimeVizDataForBarChart: function() {
+-    return {
+-      label: this.get('runid'),
+-      value: this.get('runDurationTs'),
+-      tooltip: this.get("shownid") + "<br>" + Converter.msToElapsedTimeUnit(this.get('runDurationTs')),
+-      flowrunUid: this.get('uid'),
+-      createdTs: this.get('createTimeRaw')
+-    };
+-  },
+-
+-  getCpuVCoresVizDataForBarChart: function() {
+-    return {
+-      label: this.get('runid'),
+-      value: this.get('cpuVCores'),
+-      tooltip: this.get("shownid") + "<br>" + 'CPU VCores: ' + this.get('cpuVCores'),
+-      flowrunUid: this.get('uid'),
+-      createdTs: this.get('createTimeRaw')
+-    };
+-  },
+-
+-  getMemoryVizDataForBarChart: function() {
+-    return {
+-      label: this.get('runid'),
+-      value: this.get('memoryUsed'),
+-      tooltip: this.get("shownid") + "<br>" + 'Memory Used: ' + Converter.memoryBytesToMB(this.get('memoryUsed')),
+-      flowrunUid: this.get('uid'),
+-      createdTs: this.get('createTimeRaw')
+-    };
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
+deleted file mode 100644
+index 5e3a050dc24..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-flowrun.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-// For now, similar to yarn-flowrun-brief, but may add more in future.
+-
+-export default DS.Model.extend({
+-  flowName: DS.attr('string'),
+-  runid: DS.attr('string'),
+-  shownid: DS.attr('string'),
+-  type: DS.attr('string'),
+-  createTime: DS.attr('string'),
+-  endTime: DS.attr('string'),
+-  user: DS.attr('string'),
+-  metrics: DS.attr('array')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-container.js
+deleted file mode 100644
+index 9d222ce0074..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-container.js
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  containerLogInfo: DS.attr('array'),
+-  logAggregationType: DS.attr('string'),
+-  containerId: DS.attr('string'),
+-  nodeId: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-log.js
+deleted file mode 100644
+index ab96c075d40..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-log.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  fileName: DS.attr('string', {defaultValue: ''}),
+-  fileSize: DS.attr('string', {defaultValue: ''}),
+-  lastModifiedTime: DS.attr('string', {defaultValue: ''}),
+-  containerId: DS.attr('string', {defaultValue: ''}),
+-  nodeId: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''})
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-redirect-log.js
+deleted file mode 100644
+index ab96c075d40..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-jhs-redirect-log.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  fileName: DS.attr('string', {defaultValue: ''}),
+-  fileSize: DS.attr('string', {defaultValue: ''}),
+-  lastModifiedTime: DS.attr('string', {defaultValue: ''}),
+-  containerId: DS.attr('string', {defaultValue: ''}),
+-  nodeId: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''})
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-log.js
+deleted file mode 100644
+index ab96c075d40..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-log.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  fileName: DS.attr('string', {defaultValue: ''}),
+-  fileSize: DS.attr('string', {defaultValue: ''}),
+-  lastModifiedTime: DS.attr('string', {defaultValue: ''}),
+-  containerId: DS.attr('string', {defaultValue: ''}),
+-  nodeId: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''})
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-metrics.js
+deleted file mode 100644
+index 5ed217d9ee8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-metrics.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  metrics: DS.attr()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-nm-gpu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-nm-gpu.js
+deleted file mode 100644
+index b3e9c2a20d0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-nm-gpu.js
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  info: DS.attr('object'),
+-
+-  jsonString: function() {
+-    return JSON.stringify(this.get("info"));
+-  }.property(),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
+deleted file mode 100644
+index bc2447f7b02..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-app.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  appId: DS.attr('string'),
+-  state: DS.attr('string'),
+-  user: DS.attr('string'),
+-  containers: DS.attr('array'),
+-  /**
+-   * Indicates no rows were retrieved from backend
+-   */
+-  isDummyApp: function() {
+-    return this.get('id') === "dummy";
+-  }.property("id"),
+-
+-  appStateStyle: function() {
+-    var style = "default";
+-    var appState = this.get("state");
+-    if (appState === "RUNNING" || appState === "FINISHING_CONTAINERS_WAIT" ||
+-        appState === "APPLICATION_RESOURCES_CLEANINGUP") {
+-      style = "primary";
+-    } else if (appState === "FINISHED") {
+-      style = "success";
+-    }
+-    return "label label-" + style;
+-  }.property("state")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container-log.js
+deleted file mode 100644
+index 01dc6db1cb5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container-log.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logs: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
+deleted file mode 100644
+index 40e8447af46..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node-container.js
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  containerId: DS.attr('string'),
+-  state: DS.attr('string'),
+-  user: DS.attr('string'),
+-  exitCode: DS.attr('string'),
+-  diagnostics: DS.attr('string'),
+-  totalMemoryNeeded: DS.attr('number'),
+-  totalVCoresNeeded: DS.attr('number'),
+-  containerLogFiles: DS.attr('array'),
+-
+-  /**
+-   * Indicates that there was no container retrieved from backend.
+-   */
+-  isDummyContainer: function() {
+-    return this.get('id') === "dummy";
+-  }.property("id"),
+-
+-  containerStateStyle: function() {
+-    var style = "primary";
+-    var containerState = this.get('state');
+-    var containerExitCode = this.get('exitCode');
+-    if (containerState === "DONE") {
+-      if (parseInt(containerExitCode) === 0) {
+-        style = "success";
+-      } else if (containerExitCode !== "N/A") {
+-        style = "danger";
+-      }
+-    }
+-    if (containerState === "EXITED_WITH_SUCCESS") {
+-      style = "success";
+-    }
+-    if (containerState === "EXITED_WITH_FAILURE") {
+-      style = "danger";
+-    }
+-    return "label label-" + style;
+-  }.property("state", "exitCode")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node.js
+deleted file mode 100644
+index 4753983b36c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-node.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  totalVmemAllocatedContainersMB: DS.attr('number'),
+-  totalPmemAllocatedContainersMB: DS.attr('number'),
+-  totalVCoresAllocatedContainers: DS.attr('number'),
+-  vmemCheckEnabled: DS.attr('boolean'),
+-  pmemCheckEnabled: DS.attr('boolean'),
+-  nodeHealthy: DS.attr('boolean'),
+-  lastNodeUpdateTime: DS.attr('string'),
+-  healthReport: DS.attr('string'),
+-  nmStartupTime: DS.attr('string'),
+-  nodeManagerBuildVersion: DS.attr('string'),
+-  hadoopBuildVersion: DS.attr('string'),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
+deleted file mode 100644
+index c05b666e6df..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/capacity-queue.js
++++ /dev/null
+@@ -1,124 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  name: DS.attr("string"),
+-  queuePath: DS.attr("string"),
+-  children: DS.attr("array"),
+-  parent: DS.attr("string"),
+-  capacity: DS.attr("number"),
+-  partitions: DS.attr("array"),
+-  partitionMap: DS.attr("object"),
+-  maxCapacity: DS.attr("number"),
+-  usedCapacity: DS.attr("number"),
+-  absCapacity: DS.attr("number"),
+-  absMaxCapacity: DS.attr("number"),
+-  absUsedCapacity: DS.attr("number"),
+-  weight: DS.attr("number"),
+-  normalizedWeight: DS.attr("number"),
+-  creationMethod: DS.attr("string"),
+-  orderingPolicy: DS.attr("string"),
+-  state: DS.attr("string"),
+-  userLimit: DS.attr("number"),
+-  userLimitFactor: DS.attr("number"),
+-  preemptionDisabled: DS.attr("number"),
+-  numPendingApplications: DS.attr("number"),
+-  numActiveApplications: DS.attr("number"),
+-  users: DS.hasMany("YarnUser"),
+-  type: DS.attr("string"),
+-  resources: DS.attr("object"),
+-
+-  isLeafQueue: function() {
+-    var len = this.get("children.length");
+-    if (!len) {
+-      return true;
+-    }
+-    return len <= 0;
+-  }.property("children"),
+-
+-  isWeightMode: function() {
+-   return this.get("weight") !== -1;
+-  }.property("children"),
+-
+-  isFlexibleDynamicQueue: function() {
+-    return this.get("creationMethod") === "dynamicFlexible";
+-  }.property("children"),
+-
+-  capacitiesBarChartData: function() {
+-    var floatToFixed = Converter.floatToFixed;
+-    return [
+-      {
+-        label: "Absolute Used",
+-        style: "primary",
+-        value:
+-          this.get("name") === "root"
+-            ? floatToFixed(this.get("usedCapacity"))
+-            : floatToFixed(this.get("absUsedCapacity"))
+-      },
+-      {
+-        label: "Absolute Capacity",
+-        style: "primary",
+-        value:
+-          this.get("name") === "root"
+-            ? 100
+-            : floatToFixed(this.get("absCapacity"))
+-      },
+-      {
+-        label: "Absolute Max Capacity",
+-        style: "secondary",
+-        value:
+-          this.get("name") === "root"
+-            ? 100
+-            : floatToFixed(this.get("absMaxCapacity"))
+-      }
+-    ];
+-  }.property("absCapacity", "usedCapacity", "absMaxCapacity"),
+-  userUsagesDonutChartData: function() {
+-    var data = [];
+-    if (this.get("users")) {
+-      this.get("users").forEach(function(o) {
+-        data.push({
+-          label: o.get("name"),
+-          value: o.get("usedMemoryMB")
+-        });
+-      });
+-    }
+-
+-    return data;
+-  }.property("users"),
+-
+-  hasUserUsages: function() {
+-    return this.get("userUsagesDonutChartData").length > 0;
+-  }.property("userUsagesDonutChartData"),
+-
+-  numOfApplicationsDonutChartData: function() {
+-    return [
+-      {
+-        label: "Pending Apps",
+-        value: this.get("numPendingApplications") || 0 // TODO, fix the REST API so root will return #applications as well.
+-      },
+-      {
+-        label: "Active Apps",
+-        value: this.get("numActiveApplications") || 0
+-      }
+-    ];
+-  }.property("numPendingApplications", "numActiveApplications")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
+deleted file mode 100644
+index 3f358cf27c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fair-queue.js
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string'),
+-  children: DS.attr('array'),
+-  parent: DS.attr('string'),
+-  maxApps: DS.attr('number'),
+-  minResources: DS.attr(),
+-  maxResources: DS.attr(),
+-  usedResources: DS.attr(),
+-  demandResources: DS.attr(),
+-  steadyFairResources: DS.attr(),
+-  fairResources: DS.attr(),
+-  clusterResources: DS.attr(),
+-  pendingContainers: DS.attr('number'),
+-  allocatedContainers: DS.attr('number'),
+-  reservedContainers: DS.attr('number'),
+-  schedulingPolicy: DS.attr('string'),
+-  preemptable: DS.attr('number'),
+-  numPendingApplications: DS.attr('number'),
+-  numActiveApplications: DS.attr('number'),
+-  type: DS.attr('string'),
+-
+-  isLeafQueue: function() {
+-    var len = this.get("children.length");
+-    if (!len) {
+-      return true;
+-    }
+-    return len <= 0;
+-  }.property("children"),
+-
+-  capacitiesBarChartData: function() {
+-    var floatToFixed = Converter.floatToFixed;
+-    return [
+-      {
+-        label: "Steady Fair Memory",
+-        value: floatToFixed(this.get("steadyFairResources.memory"))
+-      },
+-      {
+-        label: "Used Memory",
+-        value: floatToFixed(this.get("usedResources.memory"))
+-      },
+-      {
+-        label: "Maximum Memory",
+-        value: floatToFixed(this.get("maxResources.memory"))
+-      }
+-    ];
+-  }.property("maxResources.memory", "usedResources.memory", "maxResources.memory"),
+-
+-  numOfApplicationsDonutChartData: function() {
+-    return [
+-      {
+-        label: "Pending Apps",
+-        value: this.get("numPendingApplications") || 0 // TODO, fix the REST API so root will return #applications as well.
+-      },
+-      {
+-        label: "Active Apps",
+-        value: this.get("numActiveApplications") || 0
+-      }
+-    ];
+-  }.property()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
+deleted file mode 100644
+index 40a8e6cff9a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/fifo-queue.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string'),
+-  capacity: DS.attr('number'),
+-  usedCapacity: DS.attr('number'),
+-  state: DS.attr('string'),
+-  minQueueMemoryCapacity: DS.attr('number'),
+-  maxQueueMemoryCapacity: DS.attr('number'),
+-  numNodes: DS.attr('number'),
+-  usedNodeCapacity: DS.attr('number'),
+-  availNodeCapacity: DS.attr('number'),
+-  totalNodeCapacity: DS.attr('number'),
+-  numContainers: DS.attr('number'),
+-  type: DS.attr('string'),
+-
+-  capacitiesBarChartData: function() {
+-    var floatToFixed = Converter.floatToFixed;
+-    return [
+-      {
+-        label: "Available Capacity",
+-        value: floatToFixed(this.get("availNodeCapacity"))
+-      },
+-      {
+-        label: "Used Capacity",
+-        value: floatToFixed(this.get("usedNodeCapacity"))
+-      },
+-      {
+-        label: "Total Capacity",
+-        value: floatToFixed(this.get("totalNodeCapacity"))
+-      }
+-    ];
+-  }.property("availNodeCapacity", "usedNodeCapacity", "totalNodeCapacity")
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
+deleted file mode 100644
+index dcf5f48776f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-queue/yarn-queue.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  type: DS.attr('string')
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-redirect-log.js
+deleted file mode 100644
+index ab96c075d40..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-redirect-log.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  fileName: DS.attr('string', {defaultValue: ''}),
+-  fileSize: DS.attr('string', {defaultValue: ''}),
+-  lastModifiedTime: DS.attr('string', {defaultValue: ''}),
+-  containerId: DS.attr('string', {defaultValue: ''}),
+-  nodeId: DS.attr('string', {defaultValue: ''}),
+-  redirectedUrl: DS.attr('string', {defaultValue: ''})
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
+deleted file mode 100644
+index 17adc9f0f6e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-log.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  logFileName: DS.attr(),
+-  logFileUrl: DS.attr()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
+deleted file mode 100644
+index 64fe7b86914..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-rm-node.js
++++ /dev/null
+@@ -1,142 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  rack: DS.attr('string'),
+-  state: DS.attr('string'),
+-  nodeHostName: DS.attr('string'),
+-  nodeHTTPAddress: DS.attr('string'),
+-  lastHealthUpdate: DS.attr('string'),
+-  healthReport: DS.attr('string'),
+-  numContainers: DS.attr('number'),
+-  usedMemoryMB: DS.attr('number'),
+-  availMemoryMB: DS.attr('number'),
+-  usedVirtualCores: DS.attr('number'),
+-  availableVirtualCores: DS.attr('number'),
+-  version: DS.attr('string'),
+-  nodeLabels: DS.attr('array'),
+-  availableResource: DS.attr('object'),
+-  usedResource: DS.attr('object'),
+-
+-  nodeLabelsAsString: function() {
+-    var labels = this.get("nodeLabels");
+-    var labelToReturn = "default";
+-    // Only one label per node supported.
+-    if (labels && labels.length > 0) {
+-      labelToReturn = labels[0];
+-    }
+-    return labelToReturn;
+-  }.property("nodeLabels"),
+-
+-  /**
+-   * Indicates no rows were retrieved from backend
+-   */
+-  isDummyNode: function() {
+-    return this.get('id') === "dummy";
+-  }.property("id"),
+-
+-  nodeStateStyle: function() {
+-    var style = "default";
+-    var nodeState = this.get("state");
+-    if (nodeState === "REBOOTED" || nodeState === "DECOMMISSIONING") {
+-      style = "warning";
+-    } else if (nodeState === "UNHEALTHY" || nodeState === "DECOMMISSIONED" ||
+-          nodeState === "LOST" || nodeState === "SHUTDOWN") {
+-      style = "danger";
+-    } else if (nodeState === "RUNNING") {
+-      style = "success";
+-    }
+-    return "label label-" + style;
+-  }.property("state"),
+-
+-  getMemoryDataForDonutChart: function() {
+-    var arr = [];
+-    arr.push({
+-      label: "Used",
+-      value: this.get("usedMemoryMB")
+-    });
+-    arr.push({
+-      label: "Available",
+-      value: this.get("availMemoryMB")
+-    });
+-    return arr;
+-  }.property("availMemoryMB", "usedMemoryMB"),
+-
+-  getVCoreDataForDonutChart: function() {
+-    var arr = [];
+-    arr.push({
+-      label: "Used",
+-      value: this.get("usedVirtualCores")
+-    });
+-    arr.push({
+-      label: "Available",
+-      value: this.get("availableVirtualCores")
+-    });
+-    return arr;
+-  }.property("availableVirtualCores", "usedVirtualCores"),
+-
+-  getGpuDataForDonutChart: function() {
+-    var arr = [];
+-    var used = 0;
+-    var ri;
+-
+-    const usedResource = this.get("usedResource");
+-    const availableResource = this.get("availableResource");
+-    var resourceInformations = usedResource ? usedResource.resourceInformations.resourceInformation : [];
+-    for (var i = 0; i < resourceInformations.length; i++) {
+-      ri = resourceInformations[i];
+-      if (ri.name === "yarn.io/gpu") {
+-        used = ri.value;
+-      }
+-    }
+-
+-    var available = 0;
+-    resourceInformations = availableResource ? availableResource.resourceInformations.resourceInformation : [];
+-    for (i = 0; i < resourceInformations.length; i++) {
+-      ri = resourceInformations[i];
+-      if (ri.name === "yarn.io/gpu") {
+-        available = ri.value;
+-      }
+-    }
+-
+-    arr.push({
+-      label: "Used",
+-      value: used
+-    });
+-    arr.push({
+-      label: "Available",
+-      value: available
+-    });
+-    return arr;
+-  }.property("availableResource", "usedResource"),
+-
+-  toolTipText: function() {
+-    return "<p>Rack: " + this.get("rack") + '</p>' +
+-           "<p>Host: " + this.get("nodeHostName") + '</p>';
+-  }.property(),
+-
+-  usedMemoryBytes: function() {
+-    return this.get("usedMemoryMB") * 1024 * 1024;
+-  }.property("usedMemoryMB"),
+-
+-  availMemoryBytes: function() {
+-    return this.get("availMemoryMB") * 1024 * 1024;
+-  }.property("availMemoryMB"),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-component.js
+deleted file mode 100644
+index 9e064199a2f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-component.js
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string'),
+-  vcores: DS.attr('string'),
+-  memory: DS.attr('string'),
+-  priority: DS.attr('string'),
+-  instances: DS.attr('string'),
+-  createdTimestamp: DS.attr('number'),
+-
+-  configs: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  metrics: DS.attr({defaultValue: function() {
+-    return Ember.Object.create();
+-  }}),
+-
+-  createdDate: Ember.computed('createdTimestamp', function() {
+-    var timestamp = this.get('createdTimestamp');
+-    if (timestamp > 0) {
+-      return Converter.timeStampToDate(timestamp);
+-    }
+-    return 'N/A';
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-info.js
+deleted file mode 100644
+index 7b961e8457e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service-info.js
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string'),
+-  appId: DS.attr('string'),
+-  state: DS.attr('string'),
+-  createdTimestamp: DS.attr('number'),
+-  launchTimestamp: DS.attr('number'),
+-
+-  quicklinks: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  configs: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  metrics: DS.attr({defaultValue: function() {
+-    return Ember.Object.create();
+-  }}),
+-
+-  createdDate: Ember.computed('createdTimestamp', function() {
+-    var timestamp = this.get('createdTimestamp');
+-    if (timestamp > 0) {
+-      return Converter.timeStampToDate(timestamp);
+-    }
+-    return 'N/A';
+-  }),
+-
+-  launchDate: Ember.computed('launchTimestamp', function() {
+-    var timestamp = this.get('launchTimestamp');
+-    if (timestamp > 0) {
+-      return Converter.timeStampToDate(timestamp);
+-    }
+-    return 'N/A';
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service.js
+deleted file mode 100644
+index f7d114eb885..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-service.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  appId: DS.attr('string'),
+-  name: DS.attr('string'),
+-  state: DS.attr('string'),
+-  version: DS.attr('string'),
+-  lifetime: DS.attr('string'),
+-  components: DS.attr(),
+-  configuration: DS.attr(),
+-  quicklinks: DS.attr()
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
+deleted file mode 100644
+index c0153a5a2b9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
++++ /dev/null
+@@ -1,282 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string', {defaultValue: ''}),
+-  queue: DS.attr('string', {defaultValue: ''}),
+-  version: DS.attr('string', {defaultValue: ''}),
+-  lifetime: DS.attr('string', {defaultValue: ''}),
+-  isCached: DS.attr('boolean', {defaultValue: false}),
+-
+-  serviceComponents: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  serviceConfigs: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  fileConfigs: DS.attr({defaultValue: function() {
+-    return Ember.A();
+-  }}),
+-
+-  quicklinks: DS.attr({defaultValue: function() {
+-    return {};
+-  }}),
+-
+-  clear() {
+-    this.set('name', '');
+-    this.set('queue', '');
+-    this.set('version', '');
+-    this.set('lifetime', '');
+-    this.get('serviceComponents').clear();
+-    this.get('serviceConfigs').clear();
+-    this.get('fileConfigs').clear();
+-    this.set('quicklinks', {});
+-  },
+-
+-  isValidServiceDef() {
+-    return this.get('name') !== '' && this.get('queue') !== '' &&
+-      this.get('version') !== '' && this.get('serviceComponents.length') > 0;
+-  },
+-
+-  createNewServiceComponent() {
+-    return Ember.Object.create({
+-      name: '',
+-      numOfContainers: '',
+-      cpus: '',
+-      memory: '',
+-      artifactId: '',
+-      artifactType: 'DOCKER',
+-      launchCommand: '',
+-      dependencies: [],
+-      configuration: null
+-    });
+-  },
+-
+-  createNewServiceConfig(name, value) {
+-    var Config = Ember.Object.extend({
+-      name: name || '',
+-      value: value || '',
+-      type: 'property', // property OR env OR quicklink
+-      scope: 'service', // service OR component
+-      componentName: '',
+-      capitalizedType: Ember.computed('type', function() {
+-        return Ember.String.capitalize(this.get('type'));
+-      }),
+-      formattedScope: Ember.computed('scope', 'componentName', function() {
+-        if (this.get('scope') !== 'service') {
+-          return this.get('componentName') + ' [Component]';
+-        }
+-        return Ember.String.capitalize(this.get('scope'));
+-      })
+-    });
+-    return Config.create();
+-  },
+-
+-  createNewFileConfig(src, dest) {
+-    var FileConfig = Ember.Object.extend({
+-      type: 'TEMPLATE', // HADOOP_XML OR TEMPLATE
+-      srcFile: src || '',
+-      destFile: dest || '',
+-      scope: 'service', // service OR component
+-      componentName: '',
+-      props: null,
+-      formattedScope: Ember.computed('scope', 'componentName', function() {
+-        if (this.get('scope') !== 'service') {
+-          return this.get('componentName') + ' [Component]';
+-        }
+-        return Ember.String.capitalize(this.get('scope'));
+-      })
+-    });
+-    return FileConfig.create();
+-  },
+-
+-  getServiceJSON() {
+-    return this.serializeServiceDef();
+-  },
+-
+-  serializeServiceDef() {
+-    var json = {
+-      name: "",
+-      queue: "",
+-      version: "",
+-      lifetime: "-1",
+-      components: [],
+-      configuration: {
+-        properties: {},
+-        env: {},
+-        files: []
+-      },
+-      quicklinks: {}
+-    };
+-
+-    var components = this.get('serviceComponents');
+-    var configs = this.get('serviceConfigs');
+-    var fileConfigs = this.get('fileConfigs');
+-
+-    json['name'] = this.get('name');
+-    json['queue'] = this.get('queue');
+-    json['version'] = this.get('version');
+-
+-    if (this.get('lifetime')) {
+-      json['lifetime'] = this.get('lifetime');
+-    }
+-
+-    components.forEach(function(component) {
+-      json.components.push(this.serializeComponent(component));
+-    }.bind(this));
+-
+-    configs.forEach(function(config) {
+-      let conf = this.serializeConfiguration(config);
+-      if (conf.scope === "service") {
+-        if (conf.type === "property") {
+-          json.configuration.properties[conf.name] = conf.value;
+-        } else if (conf.type === "env") {
+-          json.configuration.env[conf.name] = conf.value;
+-        } else if (conf.type === "quicklink") {
+-          json.quicklinks[conf.name] = conf.value;
+-        }
+-      } else if (conf.scope === "component") {
+-        let requiredCmp = json.components.findBy('name', conf.componentName);
+-        if (requiredCmp) {
+-          requiredCmp.configuration = requiredCmp.configuration || {};
+-          requiredCmp.configuration.properties = requiredCmp.configuration.properties || {};
+-          requiredCmp.configuration.env = requiredCmp.configuration.env || {};
+-          if (conf.type === "property") {
+-            requiredCmp.configuration.properties[conf.name] = conf.value;
+-          } else if (conf.type === "env") {
+-            requiredCmp.configuration.env[conf.name] = conf.value;
+-          }
+-        }
+-      }
+-    }.bind(this));
+-
+-    fileConfigs.forEach(function(file) {
+-      let scope = file.get('scope');
+-      if (scope === "service") {
+-        json.configuration.files.push(this.serializeFileConfig(file));
+-      } else if (scope === "component") {
+-        let requiredCmp = json.components.findBy('name', file.get('componentName'));
+-        if (requiredCmp) {
+-          requiredCmp.configuration = requiredCmp.configuration || {};
+-          requiredCmp.configuration.files = requiredCmp.configuration.files || [];
+-          requiredCmp.configuration.files.push(this.serializeFileConfig(file));
+-        }
+-      }
+-    }.bind(this));
+-
+-    return json;
+-  },
+-
+-  serializeComponent(record) {
+-    var json = {};
+-    json['name'] = record.get('name');
+-    json['number_of_containers'] = record.get('numOfContainers');
+-    json['launch_command'] = record.get('launchCommand');
+-    json['dependencies'] = [];
+-    if (!Ember.isEmpty(record.get('artifactId'))) {
+-      json['artifact'] = {
+-        id: record.get('artifactId'),
+-        type: record.get('artifactType')
+-      };
+-    }
+-    json['resource'] = {
+-      cpus: record.get('cpus'),
+-      memory: record.get('memory')
+-    };
+-    if (record.get('configuration')) {
+-      json['configuration'] = record.get('configuration');
+-    }
+-    return json;
+-  },
+-
+-  serializeConfiguration(config) {
+-    var json = {};
+-    json["type"] = config.get('type');
+-    json["scope"] = config.get('scope');
+-    json["componentName"] = config.get('componentName');
+-    json["name"] = config.get('name');
+-    json["value"] = config.get('value');
+-    return json;
+-  },
+-
+-  serializeFileConfig(file) {
+-    var json = {};
+-    json["type"] = file.get('type');
+-    json["dest_file"] = file.get('destFile');
+-    json["src_file"] = file.get('srcFile');
+-    if (file.get('type') === "HADOOP_XML" && file.get('props')) {
+-      json["props"] = file.get('props');
+-    }
+-    return json;
+-  },
+-
+-  createNewServiceDef() {
+-    return this.get('store').createRecord('yarn-servicedef', {
+-      id: 'yarn_servicedef_' + Date.now()
+-    });
+-  },
+-
+-  convertJsonServiceConfigs(json) {
+-    var parsedJson = JSON.parse(json);
+-    if (parsedJson.properties) {
+-      for (let prop in parsedJson.properties) {
+-        if (parsedJson.properties.hasOwnProperty(prop)) {
+-          let newPropObj = this.createNewServiceConfig(prop, parsedJson.properties[prop]);
+-          this.get('serviceConfigs').addObject(newPropObj);
+-        }
+-      }
+-    }
+-    if (parsedJson.env) {
+-      for (let envprop in parsedJson.env) {
+-        if (parsedJson.env.hasOwnProperty(envprop)) {
+-          let newEnvObj = this.createNewServiceConfig(envprop, parsedJson.env[envprop]);
+-          newEnvObj.set('type', 'env');
+-          this.get('serviceConfigs').addObject(newEnvObj);
+-        }
+-      }
+-    }
+-  },
+-
+-  convertJsonFileConfigs(json) {
+-    var parsedJson = JSON.parse(json);
+-    if (parsedJson.files) {
+-      parsedJson.files.forEach(function(file) {
+-        let newFileObj = this.createNewFileConfig(file.src_file, file.dest_file);
+-        this.get('fileConfigs').addObject(newFileObj);
+-      }.bind(this));
+-    }
+-  },
+-
+-  cloneServiceDef() {
+-    var clone = this.createNewServiceDef();
+-    clone.set('name', this.get('name'));
+-    clone.set('queue', this.get('queue'));
+-    clone.set('version', this.get('version'));
+-    clone.set('lifetime', this.get('lifetime'));
+-    clone.get('serviceComponents', this.get('serviceComponents'));
+-    clone.get('serviceConfigs', this.get('serviceConfigs'));
+-    clone.get('fileConfigs', this.get('fileConfigs'));
+-    clone.set('quicklinks', this.get('quicklinks'));
+-    return clone;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
+deleted file mode 100644
+index f0fb537a192..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js
++++ /dev/null
+@@ -1,148 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  startTime: DS.attr('string'),
+-  startedTime: DS.attr('string'),
+-  finishedTime: DS.attr('string'),
+-  containerId: DS.attr('string'),
+-  amContainerId: DS.attr('string'),
+-  nodeHttpAddress: DS.attr('string'),
+-  nodeId: DS.attr('string'),
+-  hosts: DS.attr('string'),
+-  logsLink: DS.attr('string'),
+-  state: DS.attr('string'),
+-  appAttemptId: DS.attr('string'),
+-  exposedPorts: DS.attr('string'),
+-
+-  appId: Ember.computed("id",function () {
+-    var id = this.get("id");
+-    id = id.split("_");
+-
+-    id[0] = "application";
+-    id.pop();
+-
+-    return id.join("_");
+-  }),
+-
+-  attemptStartedTime: function() {
+-    var startTime = this.get("startTime");
+-    // If startTime variable is not present, get from startedTime
+-    if (startTime === undefined ||
+-      startTime === "Invalid date") {
+-      startTime = this.get("startedTime");
+-    }
+-
+-    return startTime;
+-  }.property("startedTime"),
+-
+-  startTs: function() {
+-    return Converter.dateToTimeStamp(this.get('attemptStartedTime'));
+-  }.property("startTime"),
+-
+-  finishedTs: function() {
+-    var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+-    return ts;
+-  }.property("finishedTime"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTs") < this.get("startTs")) {
+-      return "";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  shortAppAttemptId: function() {
+-    if (!this.get("containerId")) {
+-      return this.get("id");
+-    }
+-    return "attempt_" +
+-           parseInt(Converter.containerIdToAttemptId(this.get("containerId")).split("_")[3]);
+-  }.property("containerId"),
+-
+-  appMasterContainerId: function() {
+-    var id = this.get("containerId");
+-    // If containerId variable is not present, get from amContainerId
+-    if (id === undefined) {
+-      id = this.get("amContainerId");
+-    }
+-    return id;
+-  }.property("amContainerId"),
+-
+-  IsAmNodeUrl: function() {
+-    var url = this.get("nodeHttpAddress");
+-      // If nodeHttpAddress variable is not present, hardcode it.
+-    if (url === undefined) {
+-      url = "Not Available";
+-    }
+-    return url !== "Not Available";
+-  }.property("nodeHttpAddress"),
+-
+-  amNodeId : function() {
+-    var id = this.get("nodeId");
+-    // If nodeId variable is not present, get from host
+-    if (id === undefined) {
+-      id = this.get("hosts");
+-    }
+-    return id;
+-  }.property("nodeId"),
+-
+-  IsLinkAvailable: function() {
+-    var url = this.get("logsLink");
+-    // If logsLink variable is not present, hardcode its.
+-    if (url === undefined) {
+-      url = "Not Available";
+-    }
+-    return url !== "Not Available";
+-  }.property("logsLink"),
+-
+-  elapsedTime: function() {
+-    var elapsedMs = this.get("finishedTs") - this.get("startTs");
+-    if (elapsedMs <= 0) {
+-      elapsedMs = Date.now() - this.get("startTs");
+-    }
+-    return Converter.msToElapsedTimeUnit(elapsedMs);
+-  }.property(),
+-
+-  tooltipLabel: function() {
+-    return "<p>Id:" + this.get("id") +
+-           "</p><p>ElapsedTime:" +
+-           String(this.get("elapsedTime")) + "</p>";
+-  }.property(),
+-
+-  link: function() {
+-    return "/yarn-app-attempt/" + this.get("id");
+-  }.property(),
+-
+-  linkname: function() {
+-    return "yarn-app-attempt";
+-  }.property(),
+-
+-  attemptState: function() {
+-    return this.get("state");
+-  }.property(),
+-
+-  masterNodeURL: function() {
+-    var addr = encodeURIComponent(this.get("nodeHttpAddress"));
+-    return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`;
+-  }.property("nodeId", "nodeHttpAddress"),
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
+deleted file mode 100644
+index 1a972361af4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.Model.extend({
+-  allocatedMB: DS.attr('number'),
+-  allocatedVCores: DS.attr('number'),
+-  assignedNodeId: DS.attr('string'),
+-  priority: DS.attr('number'),
+-  startedTime: DS.attr('number'),
+-  finishedTime: DS.attr('number'),
+-  logUrl: DS.attr('string'),
+-  containerExitStatus: DS.attr('number'),
+-  containerState: DS.attr('string'),
+-  nodeHttpAddress: DS.attr('string'),
+-  nodeId: DS.attr('string'),
+-  diagnosticsInfo: DS.attr('string'),
+-  exposedPorts: DS.attr('string'),
+-
+-  startTs: function() {
+-    return Converter.dateToTimeStamp(this.get("startedTime"));
+-  }.property("startedTime"),
+-
+-  finishedTs: function() {
+-    var ts = Converter.dateToTimeStamp(this.get("finishedTime"));
+-    return ts;
+-  }.property("finishedTime"),
+-
+-  validatedFinishedTs: function() {
+-    if (this.get("finishedTs") < this.get("startTs")) {
+-      return "";
+-    }
+-    return this.get("finishedTime");
+-  }.property("finishedTime"),
+-
+-  elapsedTime: function() {
+-    var elapsedMs = this.get("finishedTs") - this.get("startTs");
+-    if (elapsedMs <= 0) {
+-      elapsedMs = Date.now() - this.get("startTs");
+-    }
+-    return Converter.msToElapsedTimeUnit(elapsedMs);
+-  }.property(),
+-
+-  tooltipLabel: function() {
+-    return "<p>Id:" + this.get("id") +
+-           "</p><p>ElapsedTime:" +
+-           String(this.get("elapsedTime")) + "</p>";
+-  }.property(),
+-
+-  masterNodeURL: function() {
+-    var addr = encodeURIComponent(this.get("nodeHttpAddress"));
+-    return `#/yarn-node/${this.get("nodeId")}/${addr}/info/`;
+-  }.property("nodeId", "nodeHttpAddress"),
+-
+-  appAttemptContainerLogsURL: function() {
+-    const containerId = this.get("id");
+-    const attemptId = Converter.containerIdToAttemptId(containerId);
+-    const appId = Converter.attemptIdToAppId(attemptId);
+-    return `#/yarn-app/${appId}/logs?attempt=${attemptId}&containerid=${containerId}`;
+-  }.property("id")
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
+deleted file mode 100644
+index 9016e92559b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-user.js
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.Model.extend({
+-  name: DS.attr('string'),
+-  queueName: DS.attr('string'),
+-  usedMemoryMB: DS.attr('number'),
+-  usedVCore: DS.attr('number'),
+-  maxMemoryMB: DS.attr('number'),
+-  maxVCore: DS.attr('number'),
+-  amUsedMemoryMB: DS.attr('number'),
+-  amUsedVCore: DS.attr('number'),
+-  maxAMMemoryMB: DS.attr('number'),
+-  maxAMVCore: DS.attr('number'),
+-  userWeight: DS.attr('string'),
+-  activeApps: DS.attr('number'),
+-  pendingApps: DS.attr('number')
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
+deleted file mode 100644
+index 48a2e1b3854..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/router.js
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import config from './config/environment';
+-
+-var Router = Ember.Router.extend({
+-  location: config.locationType
+-});
+-
+-Router.map(function() {
+-  this.route('yarn-apps', function () {
+-    this.route('apps');
+-  });
+-  this.route('yarn-services');
+-  this.route('yarn-nodes', function(){
+-    this.route('table');
+-    this.route('heatmap');
+-    this.route('status');
+-  });
+-  this.route('yarn-queue', {path: '/yarn-queue/:queue_name'}, function() {
+-    this.route('info');
+-    this.route('apps');
+-  });
+-  this.route('yarn-nodes-heatmap');
+-  this.route('yarn-node', { path: '/yarn-node/:node_id/:node_addr' }, function() {
+-    this.route("info");
+-    this.route("yarn-nm-gpu");
+-  });
+-  this.route('yarn-node-apps', { path: '/yarn-node-apps/:node_id/:node_addr' });
+-  this.route('yarn-node-app',
+-      { path: '/yarn-node-app/:node_id/:node_addr/:app_id' });
+-  this.route('yarn-node-containers',
+-      { path: '/yarn-node-containers/:node_id/:node_addr' });
+-  this.route('yarn-node-container',
+-      { path: '/yarn-node-container/:node_id/:node_addr/:container_id' });
+-  this.route('yarn-container-log',
+-    { path: '/yarn-container-log/:node_id/:node_addr/:container_id/:filename' });
+-  this.route('yarn-log-service',
+-    { path: '/yarn-log-service/cluster/:cluster_id/container/:container_id/user/:user_name/filename/:filename' });
+-
+-  this.route('yarn-deploy-service');
+-  this.route('cluster-overview');
+-  this.route('yarn-app', { path: '/yarn-app/:app_id' }, function() {
+-    this.route('info');
+-    this.route('attempts');
+-    this.route('components');
+-    this.route('charts');
+-    this.route('configs');
+-    this.route('logs');
+-    this.route('threaddump');
+-  });
+-  this.route('yarn-component-instances', function() {
+-    this.route('info', {path: '/:component_name/info'});
+-    this.route('configs', {path: '/:component_name/configs'});
+-  });
+-  this.route('yarn-component-instance', function() {
+-    this.route('info', {path: '/:component_name/instances/:instance_name/info'});
+-  });
+-  this.route('yarn-app-attempt', { path: '/yarn-app-attempt/:app_attempt_id'});
+-  this.route('yarn-queues', { path: '/yarn-queues/:queue_name' });
+-  this.route('yarn-queue-apps', { path: '/yarn-queue-apps/:queue_name' });
+-  this.route('yarn-tools', function() {
+-    this.route('yarn-conf');
+-    this.route('yarn-metrics');
+-    this.route('yarn-rm-log');
+-  });
+-
+-  this.route('yarn-flow-activity');
+-  this.route('yarn-flow', { path: '/yarn-flow/:flow_uid'}, function() {
+-    this.route('info');
+-    this.route('runs');
+-  });
+-  this.route('yarn-flowrun', { path: '/yarn-flowrun/:flowrun_uid'}, function() {
+-    this.route('info');
+-    this.route('metrics');
+-  });
+-  this.route('yarn-flowrun-metric', { path: '/yarn-flowrun-metric/:flowrun_uid/:metric_id'});
+-  this.route('timeline-error', {path: 'timeline-error/:error_id'});
+-
+-  this.route('notauth');
+-  this.route('notfound');
+-  this.route('error', { path: '*:' });
+-});
+-
+-export default Router;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/abstract.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/abstract.js
+deleted file mode 100644
+index 3163237675c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/abstract.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  unloadAll() {
+-    // Must be implemented by inheriting classes
+-  },
+-
+-  actions: {
+-    refresh: function () {
+-      this.unloadAll();
+-      this.refresh();
+-    }
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
+deleted file mode 100644
+index 7c3b311f467..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-    let promises = {
+-      clusterInfo: this.store.findAll('ClusterInfo', {reload: true}).catch(function() {
+-        return null;
+-      }),
+-      userInfo: this.store.findAll('cluster-user-info', {reload: true}).catch(function() {
+-        return null;
+-      }),
+-      jhsHealth: this.store.queryRecord('jhs-health', {}).catch(function() {
+-        return null;
+-      })
+-    };
+-
+-    if (ENV.timelineServiceEnabled) {
+-      promises.timelineHealth = this.store.queryRecord('timeline-health', {}).catch(function() {
+-        return null;
+-      });
+-    }
+-    return Ember.RSVP.hash(promises);
+-  },
+-
+-  actions: {
+-    /**
+-     * Base error handler for the application.
+-     * If specific routes do not handle the error, it will bubble up to
+-     * this handler. Here we redirect to either 404 page or a generic
+-     * error handler page.
+-     */
+-    error: function (error) {
+-      if (error && error.stack) {
+-        Ember.Logger.log(error.stack);
+-      }
+-
+-      if (error && error.errors[0] && parseInt(error.errors[0].status) === 404) {
+-        this.intermediateTransitionTo('/notfound');
+-      } else if (error && error.errors[0] && parseInt(error.errors[0].status) === 401) {
+-        this.intermediateTransitionTo('/notauth');
+-      } else {
+-        this.intermediateTransitionTo('/error');
+-      }
+-    }
+-  },
+-
+-  unloadAll: function() {
+-    this.store.unloadAll('ClusterInfo');
+-    this.store.unloadAll('cluster-user-info');
+-    if (ENV.timelineServiceEnabled) {
+-      this.store.unloadAll('timeline-health');
+-    }
+-    this.store.unloadAll('jhs-health');
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
+deleted file mode 100644
+index 254ece43479..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/cluster-overview.js
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-    return Ember.RSVP.hash({
+-      clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
+-      apps: this.store.query('yarn-app',
+-        {
+-          state: "RUNNING"
+-        }),
+-      queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => {
+-        let type = model.get('firstObject').get('type');
+-        return this.store.query("yarn-queue." + type + "-queue", {});
+-      })
+-    });
+-  },
+-
+-  afterModel() {
+-    this.controllerFor("ClusterOverview").set("loading", false);
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('ClusterMetric');
+-    this.store.unloadAll('yarn-app');
+-    this.store.unloadAll('yarn-queue.yarn-queue');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js
+deleted file mode 100644
+index af26670a21f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/index.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  /**
+-   * Redirect root URL to cluster overview page.
+-   */
+-  beforeModel: function() {
+-    this.replaceWith('cluster-overview');
+-  }
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
+deleted file mode 100644
+index 54fc8d4c1bb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/timeline-error.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  model() {
+-    return {};
+-  },
+-  afterModel(model/*, transition*/) {
+-    model.error_id = "error";
+-    model.isValidErrorCode = false;
+-    if (model.errorCode && model.errorCode !== "0") {
+-      model.isValidErrorCode = true;
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
+deleted file mode 100644
+index 69c26c9aef8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app-attempt.js
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from './abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param) {
+-    return Ember.RSVP.hash({
+-      attempt: this.fetchAttemptInfoFromRMorATS(param.app_attempt_id, this.store),
+-      rmContainers: this.store.query('yarn-container', {
+-        app_attempt_id: param.app_attempt_id
+-      }).catch(function() {
+-        return Ember.A();
+-      }),
+-      tsContainers: this.store.query('yarn-timeline-container', {
+-        app_attempt_id: param.app_attempt_id
+-      }).catch(function() {
+-        return Ember.A();
+-      })
+-    });
+-  },
+-
+-  afterModel(model) {
+-    const appContrl = this.controllerFor('application');
+-    model.userInfo = appContrl.get('userInfo');
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app-attempt');
+-    this.store.unloadAll('yarn-timeline-appattempt');
+-    this.store.unloadAll('yarn-container');
+-    this.store.unloadAll('yarn-timeline-container');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
+deleted file mode 100644
+index 21f5c951f99..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app.js
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from './abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param, transition) {
+-    const {service} = transition.queryParams;
+-    transition.send('updateBreadcrumbs', param.app_id, service);
+-
+-    return Ember.RSVP.hash({
+-      appId: param.app_id,
+-      serviceName: service,
+-      app: this.fetchAppInfoFromRMorATS(param.app_id, this.store),
+-
+-      quicklinks: this.store.queryRecord('yarn-service-info', { appId: param.app_id }).then(function (info) {
+-        if (info && info.get('quicklinks')) {
+-          return info.get('quicklinks');
+-        }
+-        return [];
+-      }, function () {
+-        return [];
+-      }),
+-
+-      serviceInfo: new Ember.RSVP.Promise(resolve => {
+-        if (service) {
+-          this.store.queryRecord('yarn-service', {serviceName: service}).then(function(info) {
+-            resolve(info);
+-          }, function() {
+-            resolve(null);
+-          });
+-        } else {
+-          resolve(null);
+-        }
+-      })
+-    });
+-  },
+-  actions: {
+-    updateBreadcrumbs(appId, serviceName, tailCrumbs) {
+-      var controller = this.controllerFor('yarn-app');
+-      controller.setProperties({appId: appId, serviceName: serviceName});
+-      controller.updateBreadcrumbs(appId, serviceName, tailCrumbs);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
+deleted file mode 100644
+index 451ecc29e18..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/attempts.js
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param, transition) {
+-    const {app_id} = this.paramsFor('yarn-app');
+-    const {service} = param;
+-
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: 'Attempts'}]);
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-      attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() {
+-        return Ember.A();
+-      })
+-    });
+-  },
+-
+-  refresh() {
+-    window.location.reload();
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app-attempt');
+-    this.store.unloadAll('yarn-timeline-appattempt');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
+deleted file mode 100644
+index 308f6748b57..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/charts.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: "Charts"}]);
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-
+-      app: this.store.find('yarn-app', app_id),
+-
+-      rmContainers: this.store.find('yarn-app', app_id).then(function() {
+-        return this.store.query('yarn-app-attempt', {appId: app_id}).then(function (attempts) {
+-          if (attempts && attempts.get('firstObject')) {
+-            var appAttemptId = attempts.get('firstObject').get('appAttemptId');
+-            return this.store.query('yarn-container', {
+-              app_attempt_id: appAttemptId,
+-              is_rm: true
+-            });
+-          }
+-        }.bind(this));
+-      }.bind(this)),
+-
+-      nodes: this.store.findAll('yarn-rm-node')
+-    });
+-  },
+-
+-  refresh() {
+-    window.location.reload();
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app');
+-    this.store.unloadAll('yarn-app-attempt');
+-    this.store.unloadAll('yarn-container');
+-    this.store.unloadAll('yarn-rm-node');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/components.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/components.js
+deleted file mode 100644
+index 395e6d704c8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/components.js
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: 'Components'}]);
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-      components: this.store.query('yarn-service-component', {appId: app_id, type: 'COMPONENT'}).catch(function() {
+-        return [];
+-      }),
+-      instances: this.store.query('yarn-component-instance', {appId: app_id}).catch(function() {
+-        return [];
+-      })
+-    });
+-  },
+-
+-  afterModel(model) {
+-    let instances = model.instances;
+-    model.components.forEach(function(component) {
+-      var num = instances.filterBy('component', component.get('name')).length;
+-      component.set('instances', num);
+-    });
+-  },
+-
+-  refresh() {
+-    window.location.reload();
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-service-component');
+-    this.store.unloadAll('yarn-component-instance');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/configs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/configs.js
+deleted file mode 100644
+index c5dda549eda..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/configs.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: "Configurations & Metrics"}]);
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-
+-      configs: this.store.queryRecord('yarn-service-info', {appId: app_id}).then(function(info) {
+-        if (info && info.get('configs')) {
+-          return info.get('configs');
+-        }
+-        return [];
+-      }, function() {
+-        return [];
+-      }),
+-
+-      metrics: this.store.queryRecord('yarn-service-info', {appId: app_id}).then(function(info) {
+-        if (info && info.get('metrics')) {
+-          return info.get('metrics');
+-        }
+-        return null;
+-      }, function() {
+-        return null;
+-      })
+-    });
+-  },
+-
+-  refresh() {
+-    window.location.reload();
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-service-info');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
+deleted file mode 100644
+index df6de2fb2ae..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/info.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service);
+-
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-      app: this.fetchAppInfoFromRMorATS(app_id, this.store),
+-
+-      quicklinks: this.store.queryRecord('yarn-service-info', {appId: app_id}).then(function(info) {
+-        if (info && info.get('quicklinks')) {
+-          return info.get('quicklinks');
+-        }
+-        return [];
+-      }, function() {
+-        return [];
+-      })
+-    });
+-  },
+-
+-  refresh() {
+-    window.location.reload();
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app');
+-    this.store.unloadAll('yarn-app-timeline');
+-    this.store.unloadAll('yarn-service-info');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
+deleted file mode 100644
+index 888ab7cc483..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/logs.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: 'Logs'}]);
+-    let promises = {
+-      appId: app_id,
+-      serviceName: service,
+-      attempts: this.fetchAttemptListFromRMorATS(app_id, this.store).catch(function() {
+-        return [];
+-      }),
+-      app: this.fetchAppInfoFromRMorATS(app_id, this.store),
+-      jhsHealth: this.store.queryRecord('jhs-health', {}).catch(function(error) {
+-        Ember.Logger.log("jhs-health querying failed");
+-        Ember.Logger.log(error);
+-        return null;
+-      })
+-    };
+-
+-    if (ENV.timelineServiceEnabled) {
+-      promises.timelineHealth = this.store.queryRecord('timeline-health', {}).catch(function() {
+-        return null;
+-      });
+-    }
+-    return Ember.RSVP.hash(promises);
+-  },
+-
+-  activate() {
+-    const controller = this.controllerFor("yarn-app.logs");
+-    const { attempt, containerid } = this.paramsFor('yarn-app.logs');
+-    controller.resetAfterRefresh();
+-    controller.initializeSelect();
+-    if (attempt) {
+-      controller.send("showContainersForAttemptId", attempt, containerid);
+-    } else {
+-      controller.set("selectedAttemptId", "");
+-    }
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app-attempt');
+-    this.store.unloadAll('yarn-timeline-appattempt');
+-    this.store.unloadAll('yarn-container');
+-    this.store.unloadAll('yarn-timeline-container');
+-    this.store.unloadAll('yarn-jhs-container');
+-    this.store.unloadAll('yarn-log');
+-    if (this.controller) {
+-      this.controller.resetAfterRefresh();
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/threaddump.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/threaddump.js
+deleted file mode 100644
+index 676c9d254ad..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-app/threaddump.js
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-import AppAttemptMixin from 'yarn-ui/mixins/app-attempt';
+-
+-export default AbstractRoute.extend(AppAttemptMixin, {
+-  model(param, transition) {
+-    const { app_id } = this.paramsFor('yarn-app');
+-    const { service } = param;
+-    transition.send('updateBreadcrumbs', app_id, service, [{text: 'Threaddump'}]);
+-    return Ember.RSVP.hash({
+-      appId: app_id,
+-      serviceName: service,
+-      attempts: this.fetchAttemptListFromRM(app_id, this.store)
+-        .catch(function(error) {
+-          Ember.Logger.log("App attempt list fetch failed!");
+-          Ember.Logger.log(error);
+-          return [];
+-        }),
+-      app: this.fetchAppInfoFromRM(app_id, this.store),
+-      userInfo: this.store.findAll('cluster-user-info', {reload: true})
+-        .catch(function(error) {
+-            Ember.Logger.log("userInfo querying failed");
+-            Ember.Logger.log(error);
+-            return null;
+-        })
+-    });
+-  },
+-
+-  activate() {
+-    const controller = this.controllerFor("yarn-app.threaddump");
+-    const { attempt, containerid } = this.paramsFor('yarn-app.threaddump');
+-    controller.resetAfterRefresh();
+-    controller.initializeSelect();
+-    if (attempt) {
+-      controller.send("showContainersForAttemptId", attempt, containerid);
+-    } else {
+-      controller.set("selectedAttemptId", "");
+-    }
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app-attempt');
+-    this.store.unloadAll('yarn-container');
+-    this.store.unloadAll('yarn-node-container-log');
+-    this.store.unloadAll('cluster-user-info');
+-    if (this.controller) {
+-      this.controller.resetAfterRefresh();
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
+deleted file mode 100644
+index 56349aaadd9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-    return Ember.RSVP.hash({
+-      clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('ClusterMetric');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
+deleted file mode 100644
+index b0f37452af0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-apps/apps.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  model() {
+-    return Ember.RSVP.hash({
+-      apps: this.store.findAll('yarn-app', {reload: true}),
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance.js
+deleted file mode 100644
+index 681eed56cfd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  actions: {
+-    updateBreadcrumbs(appId, serviceName, componentName, instanceName) {
+-      var controller = this.controllerFor('yarn-component-instance');
+-      controller.setProperties({appId: appId, serviceName: serviceName, componentName: componentName, instanceName: instanceName});
+-      controller.updateBreadcrumbs(appId, serviceName, componentName, instanceName);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance/info.js
+deleted file mode 100644
+index 71c28934d24..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instance/info.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(params, transition) {
+-    var instanceName = params.instance_name;
+-    transition.send('updateBreadcrumbs', params.appid, params.service, params.component_name, instanceName);
+-    return Ember.RSVP.hash({
+-      appId: params.appid,
+-      serviceName: params.service,
+-      componentName: params.component_name,
+-      instanceName: instanceName,
+-      container: this.store.query('yarn-component-instance', {appId: params.appid}).then(function(instances) {
+-        if (instances && instances.findBy('containerId', params.containerid)) {
+-          return instances.findBy('containerId', params.containerid);
+-        }
+-        return null;
+-      }, function() {
+-        return null;
+-      }),
+-    });
+-  },
+-
+-  afterModel(model) {
+-    const appContrl = this.controllerFor('application');
+-    model.userInfo = appContrl.get('userInfo');
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-component-instance');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances.js
+deleted file mode 100644
+index 0190911e186..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  actions: {
+-    updateBreadcrumbs(appId, serviceName, componentName, tailCrumbs) {
+-      var controller = this.controllerFor('yarn-component-instances');
+-      controller.setProperties({appId: appId, componentName: componentName, serviceName: serviceName});
+-      controller.updateBreadcrumbs(appId, serviceName, componentName, tailCrumbs);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/configs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/configs.js
+deleted file mode 100644
+index a2540fe952b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/configs.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(params, transition) {
+-    var componentName = params.component_name;
+-    transition.send('updateBreadcrumbs', params.appid, params.service, componentName, [{text: 'Configurations'}]);
+-    return Ember.RSVP.hash({
+-      appId: params.appid,
+-      serviceName: params.service,
+-      componentName: componentName,
+-      configs: this.store.query('yarn-service-component', {appId: params.appid}).then(function(components) {
+-        if (components && components.findBy('name', componentName)) {
+-          return components.findBy('name', componentName).get('configs');
+-        }
+-        return [];
+-      }, function() {
+-        return [];
+-      })
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-service-component');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/info.js
+deleted file mode 100644
+index 83fd4201e2f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-component-instances/info.js
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from '../abstract';
+-
+-export default AbstractRoute.extend({
+-  model(params, transition) {
+-    var componentName = params.component_name;
+-    transition.send('updateBreadcrumbs', params.appid, params.service, componentName);
+-    return Ember.RSVP.hash({
+-      appId: params.appid,
+-      serviceName: params.service,
+-      componentName: componentName,
+-      instances: this.store.query('yarn-component-instance', {appId: params.appid}).then(function(instances) {
+-        if (instances && instances.filterBy('component', componentName)) {
+-          return instances.filterBy('component', componentName);
+-        }
+-        return [];
+-      }, function() {
+-        return [];
+-      }),
+-      metrics: this.store.query('yarn-service-component', {appId: params.appid}).then(function(components) {
+-        if (components && components.findBy('name', componentName)) {
+-          return components.findBy('name', componentName).get('metrics');
+-        }
+-        return null;
+-      }, function() {
+-        return null;
+-      })
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-service-component');
+-    this.store.unloadAll('yarn-component-instance');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
+deleted file mode 100644
+index fcd3cdc4ee1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-container-log.js
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Constants from 'yarn-ui/constants';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    var nodeAddress = decodeURIComponent(param.node_addr);
+-    nodeAddress = nodeAddress.replace(/(^\w+:|^)\/\//, '');
+-    var id = nodeAddress + Constants.PARAM_SEPARATOR + param.container_id +
+-        Constants.PARAM_SEPARATOR + param.filename;
+-    return Ember.RSVP.hash({
+-      containerLog: this.store.findRecord('yarn-container-log', id),
+-      containerInfo: { id: param.container_id },
+-      nodeInfo: { id: param.node_id, addr: nodeAddress }
+-    }).then(function(hash) {
+-      // Just return as its success.
+-      return hash;
+-    }, function(reason) {
+-      if (reason.errors && reason.errors[0]) {
+-        // This means HTTP error response was sent by adapter.
+-        return reason;
+-      } else {
+-        // Assume empty response received from server.
+-        return { nodeInfo: { id: param.node_id, addr: nodeAddress },
+-            containerInfo: { id: param.container_id },
+-            containerLog: { logs: "", containerID: param.container_id,
+-                logFileName: param.filename}};
+-      }
+-    });
+-  },
+-
+-  afterModel(model) {
+-    // Handle errors and redirect if promise is rejected.
+-    if (model.errors && model.errors[0]) {
+-      if (parseInt(model.errors[0].status) === 404) {
+-        this.replaceWith('/notfound');
+-      } else {
+-        this.replaceWith('/error');
+-      }
+-    }
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-container-log');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-deploy-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-deploy-service.js
+deleted file mode 100644
+index 05ef6007ba1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-deploy-service.js
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  model() {
+-    return this.store.createRecord('yarn-servicedef', {
+-      id: 'yarn_servicedef_' + Date.now()
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
+deleted file mode 100644
+index 4c1d02e9747..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow-activity.js
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import AbstractRoute from './abstract';
+-import ErrorUtils from 'yarn-ui/utils/error-utils';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-    return this.store.findAll('yarn-flow-activity', {reload: true});
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-flow-activity');
+-  },
+-
+-  actions: {
+-    error(err/*, transition*/) {
+-      var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+-      this.transitionTo('timeline-error', errObj);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
+deleted file mode 100644
+index 1da90644e30..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow.js
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-import ErrorUtils from 'yarn-ui/utils/error-utils';
+-
+-export default AbstractRoute.extend({
+-  model(params) {
+-    return Ember.RSVP.hash({
+-      flowRuns: this.store.query('yarn-flowrun-brief', {flowuid: params.flow_uid}),
+-      flowUid: params.flow_uid,
+-      lastFlowExecutionInfo: this.getLastFlowExecutionInfo(params.flow_uid)
+-    });
+-  },
+-
+-  getLastFlowExecutionInfo(flowUid) {
+-    var yarnfaCtrl = this.controllerFor('yarn-flow-activity');
+-    var recentFlow = yarnfaCtrl.getLastFlowExecutionInfoByFlowUid(flowUid);
+-    if (recentFlow) {
+-      return recentFlow;
+-    } else {
+-      return null;
+-    }
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-flowrun-brief');
+-  },
+-
+-  actions: {
+-    error(err/*, transition*/) {
+-      var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+-      this.transitionTo('timeline-error', errObj);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/info.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flow/runs.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
+deleted file mode 100644
+index 3c542598e21..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun-metric.js
++++ /dev/null
+@@ -1,107 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import ErrorUtils from 'yarn-ui/utils/error-utils';
+-
+-export default Ember.Route.extend({
+-  model: function(params) {
+-    var _this = this;
+-   var appsArr = [];
+-   var flowrun = _this.store.queryRecord('yarn-flowrun', {flowrun_uid: params.flowrun_uid,
+-        metricstoretrieve: params.metric_id}).then(function(value) {
+-      var apps = _this.store.query('yarn-app-flowrun', {flowrunUid: params.flowrun_uid,
+-          metricstoretrieve: params.metric_id}).then(function(value) {
+-        for (var i = 0; i < value.content.length; i++) {
+-          var tasks = undefined;
+-          // No need to fetch task or container info for Job counters.
+-          if (params.metric_id.indexOf("JobCounter") === -1) {
+-            var entityType = "MAPREDUCE_TASK";
+-            // CPU and MEMORY are container metrics.
+-            if (params.metric_id === "CPU" || params.metric_id === "MEMORY") {
+-              entityType = "YARN_CONTAINER";
+-            }
+-            tasks = _this.fetchTasksForEntity(value.content[i]._data.uid, params.metric_id, entityType);
+-          }
+-          appsArr.push(Ember.RSVP.hash({id: value.content[i].id, tasks: tasks , metrics: value.content[i]._data.metrics}));
+-        }
+-        return Ember.RSVP.all(appsArr);
+-      });
+-      return Ember.RSVP.hash({run: value, id: value.id, metrics: value._internalModel._data.metrics, apps: apps});
+-    });
+-    return Ember.RSVP.all([Ember.RSVP.hash({flowrun:flowrun, metricId: params.metric_id})]);
+-  },
+-
+-  fetchTasksForEntity: function(appUid, metricId, entityType) {
+-    return this.store.query('yarn-entity', {
+-      app_uid: appUid,
+-      metricstoretrieve: metricId,
+-      entity_type: entityType,
+-      metricslimit: 100
+-    }).then(function(value) {
+-      var tasksArr = [];
+-      for (var j = 0; j < value.content.length; j++) {
+-        tasksArr.push(Ember.RSVP.hash({id: value.content[j].id, metrics: value.content[j]._data.metrics}));
+-      }
+-      return Ember.RSVP.all(tasksArr);
+-    });
+-  },
+-
+-  getMetricValue: function(metrics) {
+-    var metricValue = 0;
+-    if (metrics.length > 0) {
+-      for (var j in metrics[0].values) {
+-        metricValue = metrics[0].values[j];
+-        break;
+-      }
+-    }
+-    return metricValue.toString();
+-  },
+-
+-  setupController: function(controller, model) {
+-    var metricsArr = [];
+-    var flowRunId = model[0].flowrun.id;
+-    metricsArr.push([model[0].flowrun.id, this.getMetricValue(model[0].flowrun.metrics)]);
+-    for (var i = 0; i < model[0].flowrun.apps.length; i++) {
+-      var appId = flowRunId + '-' + model[0].flowrun.apps[i].id;
+-      metricsArr.push([appId, this.getMetricValue(model[0].flowrun.apps[i].metrics)]);
+-      if (model[0].flowrun.apps[i].tasks) {
+-        for (var j = 0; j < model[0].flowrun.apps[i].tasks.length; j++) {
+-          var taskId = appId + '-' + model[0].flowrun.apps[i].tasks[j].id;
+-          metricsArr.push([taskId, this.getMetricValue(model[0].flowrun.apps[i].tasks[j].metrics)]);
+-        }
+-      }
+-    }
+-    controller.set('flowrun', model[0].flowrun);
+-    controller.set('metric_id', model[0].metricId);
+-    controller.set('arr', metricsArr);
+-  },
+-
+-  unloadAll: function() {
+-    this.store.unloadAll('yarn-flowrun');
+-    this.store.unloadAll('yarn-app-flowrun');
+-    this.store.unloadAll('yarn-entity');
+-  },
+-
+-  actions: {
+-    error(err/*, transition*/) {
+-      var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+-      this.transitionTo('timeline-error', errObj);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
+deleted file mode 100644
+index 3163a675ddd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-import ErrorUtils from 'yarn-ui/utils/error-utils';
+-
+-export default AbstractRoute.extend({
+-  model: function(params) {
+-    return Ember.RSVP.hash({
+-      flowrun: this.store.findRecord('yarn-flowrun', params.flowrun_uid),
+-      apps: this.store.query('yarn-app-flowrun', {flowrunUid: params.flowrun_uid}),
+-      flowrun_uid: params.flowrun_uid,
+-      parentFlowUid: this.getParentFlowUid()
+-    });
+-  },
+-
+-  getParentFlowUid: function() {
+-    var parentFlowModel = this.modelFor('yarn-flow');
+-    if (parentFlowModel) {
+-      return parentFlowModel.flowUid;
+-    } else {
+-      return '';
+-    }
+-  },
+-
+-  unloadAll: function() {
+-    this.store.unloadAll('yarn-flowrun');
+-    this.store.unloadAll('yarn-app-flowrun');
+-  },
+-
+-  actions: {
+-    reload: function() {
+-      this.modelFor('apps').reload();
+-    },
+-
+-    error(err/*, transition*/) {
+-      var errObj = ErrorUtils.stripErrorCodeAndMessageFromError(err);
+-      this.transitionTo('timeline-error', errObj);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/info.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-flowrun/metrics.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-log-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-log-service.js
+deleted file mode 100644
+index e1c45406d20..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-log-service.js
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Constants from 'yarn-ui/constants';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    var id = param.container_id + Constants.PARAM_SEPARATOR + param.filename
+-      + Constants.PARAM_SEPARATOR + param.cluster_id;
+-    return Ember.RSVP.hash({
+-      containerLog: this.store.findRecord('yarn-app-log', id),
+-      containerInfo: { id: param.container_id }
+-    }).then(function (hash) {
+-      // Just return as its success.
+-      return hash;
+-    }, function (reason) {
+-      if (reason.errors && reason.errors[0]) {
+-        // This means HTTP error response was sent by adapter.
+-        return reason;
+-      } else {
+-        // Assume empty response received from server.
+-        return {
+-          containerInfo: { id: param.container_id },
+-          containerLog: {
+-            logs: "",
+-            containerID: param.container_id,
+-            logFileName: param.filename
+-          }
+-        };
+-      }
+-    });
+-  },
+-
+-  afterModel(model) {
+-    // Handle errors and redirect if promise is rejected.
+-    if (model.errors && model.errors[0]) {
+-      if (parseInt(model.errors[0].status) === 404) {
+-        this.replaceWith('/notfound');
+-      } else {
+-        this.replaceWith('/error');
+-      }
+-    }
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app-log');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
+deleted file mode 100644
+index 7167cd12705..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-app.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    var address = decodeURIComponent(param.node_addr);
+-    address = address.replace(/(^\w+:|^)\/\//, '');
+-    return Ember.RSVP.hash({
+-      nodeApp: this.store.queryRecord('yarn-node-app',
+-          { nodeAddr : address, appId: param.app_id }),
+-      nmGpuInfo: this.store.findRecord('yarn-nm-gpu', address, {reload:true}),
+-      nodeInfo: { id: param.node_id, addr: address, appId: param.app_id }
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-node-app');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js
+deleted file mode 100644
+index a1d9f153a6f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-apps.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    // Get all apps running on a specific node. Node is contacted by using node_addr.
+-    var address = decodeURIComponent(param.node_addr);
+-    address = address.replace(/(^\w+:|^)\/\//, '');
+-    return Ember.RSVP.hash({
+-      apps: this.store.query('yarn-node-app', { nodeAddr: address }),
+-      nmGpuInfo: this.store.findRecord('yarn-nm-gpu', address, {reload:true}),
+-      nodeInfo: { id: param.node_id, addr: address }
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-node-app');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
+deleted file mode 100644
+index 0060e2bbb52..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-container.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    let nodeAddress = decodeURIComponent(param.node_addr);
+-    nodeAddress = nodeAddress.replace(/(^\w+:|^)\/\//, '');
+-    // Get a specific container running on a specific node.
+-    return Ember.RSVP.hash({
+-      nodeContainer: this.store.queryRecord('yarn-node-container',
+-          { nodeHttpAddr: nodeAddress, containerId: param.container_id }),
+-      nmGpuInfo: this.store.findRecord('yarn-nm-gpu', nodeAddress, {reload:true}),
+-      nodeInfo: { id: param.node_id, addr: nodeAddress, containerId: param.container_id }
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-node-container');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js
+deleted file mode 100644
+index 67c8fa64e6f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node-containers.js
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    // Get all containers running on specific node.
+-    var address = decodeURIComponent(param.node_addr);
+-    address = address.replace(/(^\w+:|^)\/\//, '');
+-    return Ember.RSVP.hash({
+-      containers: this.store.query('yarn-node-container', { nodeHttpAddr: address }),
+-      nmGpuInfo: this.store.findRecord('yarn-nm-gpu', address, {reload:true}),
+-      nodeInfo: { id: param.node_id, addr: address }
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-node-container');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
+deleted file mode 100644
+index 0e0b701acb4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node.js
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    // Fetches data from both NM and RM. RM is queried to get node usage info.
+-    var address = decodeURIComponent(param.node_addr);
+-    address = address.replace(/(^\w+:|^)\/\//, '');
+-    return Ember.RSVP.hash({
+-      nodeInfo: { id: param.node_id, addr: address },
+-      nmGpuInfo: this.store.findRecord('yarn-nm-gpu', address, {reload:true}),
+-      node: this.store.findRecord('yarn-node', address, {reload: true}),
+-      rmNode: this.store.findRecord('yarn-rm-node', param.node_id, {reload: true})
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-node');
+-    this.store.unloadAll('yarn-rm-node');
+-    this.store.unloadAll('yarn-nm-gpu');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node/yarn-nm-gpu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node/yarn-nm-gpu.js
+deleted file mode 100644
+index 38ae5d15f4c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-node/yarn-nm-gpu.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
+deleted file mode 100644
+index d31eb5c6bfc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes.js
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-    return Ember.RSVP.hash({
+-      nodes: this.store.findAll('yarn-rm-node', {reload: true}),
+-      clusterMetrics: this.store.findAll('ClusterMetric', {reload: true}),
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-rm-node');
+-    this.store.unloadAll('ClusterMetric');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/heatmap.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/heatmap.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/heatmap.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/table.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/table.js
+deleted file mode 100644
+index 38ae5d15f4c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-nodes/table.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
+deleted file mode 100644
+index cd4ed0983ba..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-      return Ember.RSVP.hash({
+-        selected : param.queue_name,
+-        queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => {
+-          let type = model.get('firstObject').get('type');
+-          return this.store.query("yarn-queue." + type + "-queue", {});
+-        }),
+-        selectedQueue : undefined,
+-        apps: this.store.query('yarn-app', {
+-          queue: param.queue_name
+-        })
+-      });
+-  },
+-
+-  afterModel(model) {
+-    var type = model.queues.get('firstObject').constructor.modelName;
+-    model.selectedQueue = this.store.peekRecord(type, model.selected);
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-queue.capacity-queue');
+-    this.store.unloadAll('yarn-queue.fair-queue');
+-    this.store.unloadAll('yarn-queue.fifo-queue');
+-    this.store.unloadAll('yarn-app');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/apps.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queue/info.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
+deleted file mode 100644
+index 7d8a200bdfb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-queues.js
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model(param) {
+-    var queueName = param.queue_name? param.queue_name.split('!')[0] : 'root';
+-    if (param.queue_name && param.queue_name.split('!').length > 1) {
+-      this.controllerFor('yarn-queues').set('showLoading', false);
+-    } else {
+-      this.controllerFor('yarn-queues').set('showLoading', true);
+-    }
+-    return Ember.RSVP.hash({
+-      selected : queueName,
+-      queues: this.store.query("yarn-queue.yarn-queue", {}).then((model) => {
+-        let type = model.get('firstObject').get('type');
+-        return this.store.query("yarn-queue." + type + "-queue", {});
+-      }),
+-      selectedQueue : undefined
+-    });
+-  },
+-
+-  afterModel(model) {
+-    var type = model.queues.get('firstObject').constructor.modelName;
+-    model.selectedQueue = this.store.peekRecord(type, model.selected);
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-queue.capacity-queue');
+-    this.store.unloadAll('yarn-queue.fair-queue');
+-    this.store.unloadAll('yarn-queue.fifo-queue');
+-    this.store.unloadAll('yarn-app');
+-  },
+-
+-  refreshModel() {
+-    var param = this.paramsFor('yarn-queues');
+-    var queueName = param.queue_name? param.queue_name.split('!')[0] : 'root';
+-    if (queueName !== param.queue_name) {
+-      this.transitionTo('yarn-queues', queueName);
+-    } else {
+-      this.refresh();
+-    }
+-  },
+-
+-  actions: {
+-    refresh: function () {
+-      this.unloadAll();
+-      this.refreshModel();
+-    },
+-
+-    loading() {
+-      if (!this.controllerFor('yarn-queues').get('showLoading')) {
+-        return false;
+-      }
+-      return true;
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
+deleted file mode 100644
+index a6535aec1eb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-services.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AbstractRoute from './abstract';
+-
+-export default AbstractRoute.extend({
+-  model() {
+-      return Ember.RSVP.hash({
+-        apps: this.store.query('yarn-app', {
+-          applicationTypes: "yarn-service"
+-        }),
+-    });
+-  },
+-
+-  unloadAll() {
+-    this.store.unloadAll('yarn-app');
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-conf.js
+deleted file mode 100644
+index 871917068fd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-conf.js
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-metrics.js
+deleted file mode 100644
+index cca2a5346b5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-metrics.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+- import Ember from 'ember';
+- import Constants from 'yarn-ui/constants';
+-
+- import AbstractRoute from '../abstract';
+-
+- export default AbstractRoute.extend({
+-   model() {
+-     return Ember.RSVP.hash({jmx: this.store.findAll('yarn-metrics')});
+-   },
+-
+-   afterModel(model) {
+-     // Handle errors and redirect if promise is rejected.
+-     if (model.errors && model.errors[0]) {
+-       if (model.errors[0].status == 404) {
+-         this.replaceWith('/notfound');
+-       } else {
+-         this.replaceWith('/error');
+-       }
+-     }
+-   },
+-
+-   unloadAll() {
+-     this.store.unloadAll('yarn-metrics');
+-   }
+- });
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js
+deleted file mode 100644
+index a12c2803fb0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/yarn-tools/yarn-rm-log.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Route.extend({
+-  queryParams: {
+-    filename: {
+-      refreshModel: true
+-    }
+-  },
+-
+-  model(param) {
+-    if (param.filename == null) {
+-      return Ember.RSVP.hash({logs: this.store.findAll('yarn-rm-log')});
+-    } else {
+-      // TODO: Loading log file is disallowed for cross-origin requests that require preflight
+-      window.open(this.get('hosts.rmWebAddress') + param.filename);
+-    }
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-info.js
+deleted file mode 100644
+index fad321af143..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-info.js
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: payload
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      // payload has apps : { app: [ {},{},{} ]  }
+-      // need some error handling for ex apps or app may not be defined.
+-      normalizedArrayResponse.data = [
+-        this.normalizeSingleResponse(store, primaryModelClass,
+-          payload.clusterInfo, payload.clusterInfo.id, requestType)
+-      ];
+-      return normalizedArrayResponse;
+-    }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-metric.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-metric.js
+deleted file mode 100644
+index 73c4bc5ca61..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-metric.js
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: payload
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      // payload has apps : { app: [ {},{},{} ]  }
+-      // need some error handling for ex apps or app may not be defined.
+-      normalizedArrayResponse.data = [
+-        this.normalizeSingleResponse(store, primaryModelClass,
+-          payload.clusterMetrics, 1, requestType)
+-      ];
+-      return normalizedArrayResponse;
+-    }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-user-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-user-info.js
+deleted file mode 100644
+index 617e96054a1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/cluster-user-info.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id,
+-    requestType) {
+-    var fixedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: payload
+-    };
+-
+-    return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload, id,
+-    requestType) {
+-    // return expected is { data: [ {}, {} ] }
+-    var normalizedArrayResponse = {};
+-
+-    normalizedArrayResponse.data = [
+-      this.normalizeSingleResponse(store, primaryModelClass, payload, Date.now(), requestType)
+-    ];
+-    return normalizedArrayResponse;
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/jhs-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/jhs-health.js
+deleted file mode 100644
+index 4e6aa3c7949..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/jhs-health.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload) {
+-    var fixedPayload = {
+-      id: Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: payload.historyInfo
+-    };
+-
+-    return { data: fixedPayload };
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/timeline-health.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/timeline-health.js
+deleted file mode 100644
+index 79fb4610ef0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/timeline-health.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload) {
+-    var fixedPayload = {
+-      id: Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: payload
+-    };
+-
+-    return { data: fixedPayload };
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
+deleted file mode 100644
+index 8a77c67a6be..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-attempt.js
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-    internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-
+-      if (payload.appAttempt) {
+-        payload = payload.appAttempt;
+-      }
+-
+-      var fixedPayload = {
+-        id: payload.appAttemptId,
+-        type: primaryModelClass.modelName, // yarn-app
+-        attributes: {
+-          startTime: Converter.timeStampToDate(payload.startTime),
+-          startedTime: Converter.timeStampToDate(payload.startedTime),
+-          finishedTime: Converter.timeStampToDate(payload.finishedTime),
+-          containerId: payload.containerId,
+-          amContainerId: payload.amContainerId,
+-          nodeHttpAddress: payload.nodeHttpAddress,
+-          exposedPorts: payload.exposedPorts,
+-          nodeId: payload.nodeId,
+-          hosts: payload.host,
+-          state: payload.appAttemptState,
+-          logsLink: payload.logsLink,
+-          appAttemptId: payload.appAttemptId,
+-          diagnosticsInfo: payload.diagnosticsInfo
+-        }
+-      };
+-
+-      return fixedPayload;
+-    },
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-      return { data: p };
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      if (payload.appAttempts && payload.appAttempts.appAttempt) {
+-        // payload has apps : { app: [ {},{},{} ]  }
+-        // need some error handling for ex apps or app may not be defined.
+-        normalizedArrayResponse.data = payload.appAttempts.appAttempt.map(singleApp => {
+-          return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-            singleApp);
+-        }, this);
+-      } else {
+-        normalizedArrayResponse.data = [];
+-      }
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
+deleted file mode 100644
+index 289c1cd1cdc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-flowrun.js
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var events = payload.events,
+-          appFinishedEvent = events.findBy('id', 'YARN_APPLICATION_FINISHED'),
+-          finishedTs = appFinishedEvent? appFinishedEvent.timestamp : Date.now(),
+-          appState = (appFinishedEvent && appFinishedEvent.info)? appFinishedEvent.info.YARN_APPLICATION_STATE : "N/A",
+-          metrics = payload.metrics,
+-          cpuMetric = metrics.findBy('id', 'CPU'),
+-          memoryMetric = metrics.findBy('id', 'MEMORY'),
+-          cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1,
+-          memory = memoryMetric? memoryMetric.values[Object.keys(memoryMetric.values)[0]] : -1;
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          appId: payload.id,
+-          type: payload.info.YARN_APPLICATION_TYPE,
+-          uid: payload.info.UID,
+-          metrics: metrics,
+-          startedTs: payload.createdtime,
+-          finishedTs: finishedTs,
+-          state: payload.info.YARN_APPLICATION_STATE || appState,
+-          cpuVCores: cpu,
+-          memoryUsed: memory
+-        }
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {};
+-
+-      normalizedArrayResponse.data = payload.map(singleApp => {
+-        return this.normalizeSingleResponse(store, primaryModelClass,
+-          singleApp, singleApp.id, requestType);
+-      });
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-log.js
+deleted file mode 100644
+index 716526cdc66..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-log.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // Convert plain text response into JSON.
+-    // ID is of the form containerId!fileName
+-    var splits = Converter.splitForAppLogs(id);
+-    var convertedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload.data,
+-        containerID: splits[0],
+-        logFileName: splits[1],
+-        redirectedUrl: payload.redirectedUrl
+-      }
+-    };
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-redirect-log.js
+deleted file mode 100644
+index 8660c51e67f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-jhs-redirect-log.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var convertedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload,
+-        containerID: splits[1],
+-        logFileName: splits[2]
+-      }
+-    };
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-log.js
+deleted file mode 100644
+index 716526cdc66..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-log.js
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // Convert plain text response into JSON.
+-    // ID is of the form containerId!fileName
+-    var splits = Converter.splitForAppLogs(id);
+-    var convertedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload.data,
+-        containerID: splits[0],
+-        logFileName: splits[1],
+-        redirectedUrl: payload.redirectedUrl
+-      }
+-    };
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-redirect-log.js
+deleted file mode 100644
+index 8660c51e67f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-redirect-log.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    var splits = Converter.splitForAppLogs(id);
+-    var convertedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload,
+-        containerID: splits[1],
+-        logFileName: splits[2]
+-      }
+-    };
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
+deleted file mode 100644
+index 36a1c7b48ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-
+-    var events = payload.events,
+-        appFinishedEvent = events.findBy('id', 'YARN_APPLICATION_FINISHED'),
+-        startedTime = payload.createdtime,
+-        finishedTime = appFinishedEvent? appFinishedEvent.timestamp : Date.now(),
+-        elapsedTime = finishedTime - startedTime,
+-        diagnostics = payload.info.YARN_APPLICATION_DIAGNOSTICS_INFO,
+-        priority = payload.info.YARN_APPLICATION_PRIORITY;
+-
+-    var fixedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        appName: payload.info.YARN_APPLICATION_NAME,
+-        user: payload.info.YARN_APPLICATION_USER,
+-        queue: "N/A",
+-        state: payload.info.YARN_APPLICATION_STATE,
+-        startTime: Converter.timeStampToDate(startedTime),
+-        elapsedTime: elapsedTime,
+-        finishedTime: Converter.timeStampToDate(finishedTime),
+-        finalStatus: payload.info.YARN_APPLICATION_FINAL_STATUS,
+-        progress: 100,
+-        applicationType: payload.info.YARN_APPLICATION_TYPE,
+-        diagnostics: (diagnostics && diagnostics !== 'null')? diagnostics : '',
+-        amHostHttpAddress: '',
+-        logAggregationStatus: '',
+-        unmanagedApplication: payload.info.YARN_APPLICATION_UNMANAGED_APPLICATION || 'N/A',
+-        amNodeLabelExpression: payload.configs.YARN_AM_NODE_LABEL_EXPRESSION,
+-        priority: (priority !== undefined)? priority : 'N/A',
+-        allocatedMB: 0,
+-        allocatedVCores: 0,
+-        runningContainers: 0,
+-        memorySeconds: payload.info.YARN_APPLICATION_MEM_METRIC,
+-        vcoreSeconds: payload.info.YARN_APPLICATION_CPU_METRIC,
+-        preemptedResourceMB: 0,
+-        preemptedResourceVCores: 0,
+-        numNonAMContainerPreempted: 0,
+-        numAMContainerPreempted: 0,
+-        clusterUsagePercentage: 0,
+-        queueUsagePercentage: 0,
+-        currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT,
+-        trackingUI : '',
+-        trackingUrl : ''
+-      }
+-    };
+-
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    var p = this.internalNormalizeSingleResponse(store, primaryModelClass, payload, id);
+-    return {data: p};
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+deleted file mode 100644
+index 5e838010305..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
++++ /dev/null
+@@ -1,107 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-    internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-      if (payload.app) {
+-        payload = payload.app;
+-      }
+-
+-      var timeoutInSecs = -1;
+-      var appExpiryTime = Converter.timeStampToDate(payload.finishedTime);
+-      if (payload.timeouts && payload.timeouts.timeout && payload.timeouts.timeout[0]) {
+-        timeoutInSecs = payload.timeouts.timeout[0].remainingTimeInSeconds;
+-        if (timeoutInSecs > -1) {
+-          appExpiryTime = Converter.isoDateToDate(payload.timeouts.timeout[0].expiryTime);
+-        }
+-      }
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName, // yarn-app
+-        attributes: {
+-          appName: payload.name,
+-          user: payload.user,
+-          queue: payload.queue,
+-          state: payload.state,
+-          startTime: payload.startedTime, // will be formatted in yarn-app model
+-          elapsedTime: payload.elapsedTime,
+-          finishedTime: payload.finishedTime, // will be formatted in yarn-app model
+-          finalStatus: payload.finalStatus,
+-          progress: payload.progress,
+-          applicationType: payload.applicationType,
+-          applicationTags:
+-              (payload.applicationTags && payload.applicationTags !== 'null')?
+-                  payload.applicationTags : 'N/A',
+-          diagnostics: (payload.diagnostics && payload.diagnostics !== 'null')? payload.diagnostics : '',
+-          amHostHttpAddress: payload.amHostHttpAddress,
+-          masterNodeId: payload.masterNodeId,
+-          logAggregationStatus: payload.logAggregationStatus,
+-          unmanagedApplication: payload.unmanagedApplication,
+-          amNodeLabelExpression: payload.amNodeLabelExpression,
+-          priority: (payload.priority !== undefined)? payload.priority : 'N/A',
+-          allocatedMB: payload.allocatedMB,
+-          allocatedVCores: payload.allocatedVCores,
+-          runningContainers: payload.runningContainers,
+-          resourceRequests: payload.resourceRequests,
+-          memorySeconds: payload.memorySeconds,
+-          vcoreSeconds: payload.vcoreSeconds,
+-          preemptedResourceMB: payload.preemptedResourceMB,
+-          preemptedResourceVCores: payload.preemptedResourceVCores,
+-          numNonAMContainerPreempted: payload.numNonAMContainerPreempted,
+-          numAMContainerPreempted: payload.numAMContainerPreempted,
+-          clusterUsagePercentage: payload.clusterUsagePercentage,
+-          queueUsagePercentage: payload.queueUsagePercentage,
+-          currentAppAttemptId: payload.currentAppAttemptId,
+-          remainingTimeoutInSeconds: timeoutInSecs,
+-          applicationExpiryTime: appExpiryTime,
+-          trackingUI : payload.trackingUI,
+-          trackingUrl : payload.trackingUrl
+-        }
+-      };
+-
+-      return fixedPayload;
+-    },
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-      var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload, id);
+-      return { data: p };
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      // payload has apps : { app: [ {},{},{} ]  }
+-      // need some error handling for ex apps or app may not be defined.
+-      if(payload.apps && payload.apps.app) {
+-        normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
+-          return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-            singleApp, singleApp.id);
+-          }, this);
+-      } else {
+-        normalizedArrayResponse.data = [];
+-      }
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js
+deleted file mode 100644
+index 9ee4a6e3a8e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-component-instance.js
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    var info = payload.info;
+-
+-    var fixedPayload = {
+-      id: 'yarn_component_instance_' + payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        containerId: payload.id,
+-        component: info.COMPONENT_NAME,
+-        instanceName: info.COMPONENT_INSTANCE_NAME,
+-        state: info.STATE,
+-        createdTimestamp: payload.createdtime,
+-        startedTimestamp: info.LAUNCH_TIME,
+-        host: info.HOSTNAME,
+-        node: info.BARE_HOST,
+-        ipAddr: info.IP,
+-        exposedPorts: info.EXPOSED_PORTS,
+-        exitStatusCode: info.EXIT_STATUS_CODE
+-      }
+-    };
+-
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedResponse = {data: []};
+-    var instanceUid = {};
+-
+-    if (payload && Array.isArray(payload)) {
+-      this.sortPayloadByCreatedTimeAscending(payload);
+-
+-      payload.forEach(function(container) {
+-        let componentName = container.info.COMPONENT_NAME;
+-        if (!instanceUid[componentName]) {
+-          instanceUid[componentName] = 0;
+-        }
+-        container.instanceId = ++instanceUid[componentName];
+-        var pl = this.internalNormalizeSingleResponse(store, primaryModelClass, container);
+-        normalizedResponse.data.push(pl);
+-      }.bind(this));
+-    }
+-
+-    return normalizedResponse;
+-  },
+-
+-  sortPayloadByCreatedTimeAscending(payload) {
+-    payload.sort(function(inst1, inst2) {
+-      return inst1.createdtime - inst2.createdtime;
+-    });
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-conf.js
+deleted file mode 100644
+index dc9c64f4bea..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-conf.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+-    var x2js = new X2JS();
+-    let props = x2js.xml_str2json(payload);
+-    let properties = props.configuration.property;
+-    var convertedPayload = [];
+-    for (var i = 0; i < properties.length; i++) {
+-      var row = {
+-        id: i,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          name: properties[i].name,
+-          source: properties[i].source,
+-          value: properties[i].value
+-        }
+-      };
+-      convertedPayload.push(row);
+-    }
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
+deleted file mode 100644
+index 2aacf727447..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container-log.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // Convert plain text response into JSON.
+-    // ID is of the form nodeAddress!containerId!fileName
+-    var splits = Converter.splitForContainerLogs(id);
+-    var convertedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload,
+-        containerID: splits[1],
+-        logFileName: splits[2]
+-      }
+-    };
+-    return { data: convertedPayload };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
+deleted file mode 100644
+index 73b59195e41..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-container.js
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-    internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-
+-      var fixedPayload = {
+-        id: payload.containerId,
+-        type: primaryModelClass.modelName, // yarn-app
+-        attributes: {
+-          allocatedMB: payload.allocatedMB,
+-          allocatedVCores: payload.allocatedVCores,
+-          assignedNodeId: payload.assignedNodeId,
+-          priority: payload.priority,
+-          startedTime: Converter.timeStampToDate(payload.startedTime),
+-          finishedTime: Converter.timeStampToDate(payload.finishedTime),
+-          elapsedTime: payload.elapsedTime,
+-          logUrl: payload.logUrl,
+-          containerExitStatus: payload.containerExitStatus + '',
+-          containerState: payload.containerState,
+-          nodeId : payload.nodeId,
+-          nodeHttpAddress: payload.nodeHttpAddress,
+-          exposedPorts: payload.exposedPorts
+-        }
+-      };
+-
+-      return fixedPayload;
+-    },
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-      return { data: p };
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      if (payload && payload.container) {
+-        if (Array.isArray(payload.container)) {
+-          // payload has apps : { app: [ {},{},{} ]  }
+-          // need some error handling for ex apps or app may not be defined.
+-          normalizedArrayResponse.data = payload.container.map(singleContainer => {
+-            return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-              singleContainer);
+-          }, this);
+-        } else {
+-          normalizedArrayResponse.data = [this.internalNormalizeSingleResponse(
+-            store, primaryModelClass, payload.container)];
+-        }
+-        return normalizedArrayResponse;
+-      } else {
+-        normalizedArrayResponse.data = [];
+-      }
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
+deleted file mode 100644
+index 9ed70cfa8c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-entity.js
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName, // yarn-entity
+-        attributes: {
+-          entityId: payload.id,
+-          type: payload.type,
+-          uid: payload.info.UID,
+-          metrics: payload.metrics
+-        }
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      normalizedArrayResponse.data = payload.map(singleApp => {
+-        return this.normalizeSingleResponse(store, primaryModelClass,
+-          singleApp, singleApp.id, requestType);
+-      }, this);
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
+deleted file mode 100644
+index c26872bcb78..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flow-activity.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName, // yarn-timeline-flow
+-        attributes: {
+-          cluster: payload.info.SYSTEM_INFO_CLUSTER,
+-          flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+-          lastExecDate: Converter.timeStampToDateOnly(payload.info.SYSTEM_INFO_DATE),
+-          user: payload.info.SYSTEM_INFO_USER,
+-          flowruns: payload.flowruns,
+-          uid: payload.info.UID
+-        }
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      normalizedArrayResponse.data = payload.map(singleEntity => {
+-        return this.normalizeSingleResponse(store, primaryModelClass,
+-          singleEntity, singleEntity.id, requestType);
+-      }, this);
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
+deleted file mode 100644
+index 89dc85a08ed..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun-brief.js
++++ /dev/null
+@@ -1,71 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var metrics = payload.metrics,
+-          cpuMetric = metrics.findBy('id', 'CPU'),
+-          cpu = cpuMetric? cpuMetric.values[Object.keys(cpuMetric.values)[0]] : -1,
+-          memMetric = metrics.findBy('id', 'MEMORY'),
+-          memory = memMetric? memMetric.values[Object.keys(memMetric.values)[0]] : -1;
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName, // yarn-flowrun-brief
+-        attributes: {
+-          flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+-          runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID,
+-          shownid: payload.id,
+-          type: payload.type,
+-          createTime: this.checkDateValidity(payload.createdtime),
+-          createTimeRaw: payload.createdtime,
+-          endTime: this.checkDateValidity(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME),
+-          endTimeRaw: payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME || 0,
+-          user: payload.info.SYSTEM_INFO_USER,
+-          uid: payload.info.UID,
+-          cpuVCores: cpu,
+-          memoryUsed: memory
+-        }
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+-    },
+-
+-    checkDateValidity(timestamp) {
+-      if (timestamp && timestamp > 0) {
+-        return Converter.timeStampToDate(timestamp);
+-      }
+-      return 'N/A';
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {data: []};
+-
+-      normalizedArrayResponse.data = payload.map(singleApp => {
+-        return this.normalizeSingleResponse(store, primaryModelClass,
+-          singleApp, singleApp.id, requestType);
+-      });
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
+deleted file mode 100644
+index 97dde353b9f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-flowrun.js
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-      var recordId = id;
+-      if (!recordId) {
+-        recordId = payload.id;
+-      }
+-      var fixedPayload = {
+-        id: recordId,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          flowName: payload.info.SYSTEM_INFO_FLOW_NAME,
+-          runid: payload.info.SYSTEM_INFO_FLOW_RUN_ID,
+-          shownid: payload.id,
+-          type: payload.type,
+-          createTime: this.checkDateValidity(payload.createdtime),
+-          endTime: this.checkDateValidity(payload.info.SYSTEM_INFO_FLOW_RUN_END_TIME),
+-          user: payload.info.SYSTEM_INFO_USER,
+-          metrics: payload.metrics,
+-        }
+-      };
+-
+-      return fixedPayload;
+-    },
+-
+-    checkDateValidity(timestamp) {
+-      if (timestamp && timestamp > 0) {
+-        return Converter.timeStampToDate(timestamp);
+-      }
+-      return 'N/A';
+-    },
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-      var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload, id);
+-      return { data: p };
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      // return expected is { data: [ {}, {} ] }
+-      var normalizedArrayResponse = {};
+-
+-      normalizedArrayResponse.data = payload.map(singleApp => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-          singleApp, singleApp.id);
+-      }, this);
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-container.js
+deleted file mode 100644
+index 8aebb7157be..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-container.js
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-
+-    var fixedPayload = {
+-      id: payload.containerId,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        containerLogInfo: payload.containerLogInfo,
+-        logAggregationType: payload.logAggregationType,
+-        containerId: payload.containerId,
+-        nodeId: payload.nodeId
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalized = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-    return {
+-      data: normalized
+-    };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // Handling single container and multiple containers case at the same time
+-    payload = [].concat(payload["containerLogsInfo"]);
+-
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    if (payload && Ember.isArray(payload) && !Ember.isEmpty(payload)) {
+-      normalizedArrayResponse.data = payload.map(singleContainer => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-          singleContainer);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-log.js
+deleted file mode 100644
+index f9db7b9e4b0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-log.js
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, containerId, nodeId) {
+-    var fixedPayload = {
+-      id: "yarn_log_" + payload.fileName + "_" + Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        fileName: payload.fileName,
+-        fileSize: payload.fileSize,
+-        lastModifiedTime: payload.lastModifiedTime,
+-        redirectedUrl: payload.redirectedUrl,
+-        containerId: containerId,
+-        nodeId: nodeId
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    // If JSON payload is an object with a containerLogsInfo property
+-    if (payload && payload.containerLogsInfo && payload.containerLogsInfo.containerLogInfo) {
+-      normalizedArrayResponse.data = payload.containerLogsInfo.containerLogInfo.map((signle_payload) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, signle_payload,
+-          payload.containerLogsInfo.containerId, payload.containerLogsInfo.nodeId);
+-      });
+-    }
+-    // If JSON payload is an array
+-    if (payload && payload[0] && payload[0].containerLogInfo) {
+-      normalizedArrayResponse.data = payload[0].containerLogInfo.map((signle_payload) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, signle_payload,
+-          payload[0].containerId, payload[0].nodeId);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-redirect-log.js
+deleted file mode 100644
+index f9db7b9e4b0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-jhs-redirect-log.js
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, containerId, nodeId) {
+-    var fixedPayload = {
+-      id: "yarn_log_" + payload.fileName + "_" + Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        fileName: payload.fileName,
+-        fileSize: payload.fileSize,
+-        lastModifiedTime: payload.lastModifiedTime,
+-        redirectedUrl: payload.redirectedUrl,
+-        containerId: containerId,
+-        nodeId: nodeId
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    // If JSON payload is an object with a containerLogsInfo property
+-    if (payload && payload.containerLogsInfo && payload.containerLogsInfo.containerLogInfo) {
+-      normalizedArrayResponse.data = payload.containerLogsInfo.containerLogInfo.map((signle_payload) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, signle_payload,
+-          payload.containerLogsInfo.containerId, payload.containerLogsInfo.nodeId);
+-      });
+-    }
+-    // If JSON payload is an array
+-    if (payload && payload[0] && payload[0].containerLogInfo) {
+-      normalizedArrayResponse.data = payload[0].containerLogInfo.map((signle_payload) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, signle_payload,
+-          payload[0].containerId, payload[0].nodeId);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-log.js
+deleted file mode 100644
+index c41170870fa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-log.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, containerId, nodeId) {
+-    var fixedPayload = {
+-      id: "yarn_log_" + payload.fileName + "_" + Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        fileName: payload.fileName,
+-        fileSize: payload.fileSize,
+-        lastModifiedTime: payload.lastModifiedTime,
+-        containerId: containerId,
+-        nodeId: nodeId
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    if (payload && payload.containerLogsInfo && payload.containerLogsInfo.containerLogInfo) {
+-      normalizedArrayResponse.data = payload.containerLogsInfo.containerLogInfo.map((paylog) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, paylog,
+-          payload.containerLogsInfo.containerId, payload.containerLogsInfo.nodeId);
+-      });
+-    }
+-    if (payload && payload[0] && payload[0].containerLogInfo) {
+-      normalizedArrayResponse.data = payload[0].containerLogInfo.map((paylog) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, paylog,
+-          payload[0].containerId, payload[0].nodeId);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-metrics.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-metrics.js
+deleted file mode 100644
+index 70c9ca0d950..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-metrics.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeResponse(store, primaryModelClass, payload, id, requestType) {
+-    var ret =
+-      {
+-        id: 0,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          metrics: payload
+-        }
+-      };
+-    return { data : ret };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-nm-gpu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-nm-gpu.js
+deleted file mode 100644
+index 3567c683013..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-nm-gpu.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-    if (payload.nodeInfo) {
+-      payload = payload.nodeInfo;
+-    }
+-
+-    var fixedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        info: payload
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // payload is of the form {"nodeInfo":{}}
+-    var p = this.internalNormalizeSingleResponse(store,
+-      primaryModelClass, payload, id);
+-    return { data: p };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
+deleted file mode 100644
+index 9f6c425a811..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-app.js
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    if (payload.app) {
+-      payload = payload.app;
+-    }
+-
+-    var fixedPayload = {
+-      id: payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        appId: payload.id,
+-        state: payload.state,
+-        user: payload.user,
+-        containers: payload.containerids
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // payload is of the form {"app":{}}
+-    var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-    return { data: p };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // expected return response is of the form { data: [ {}, {} ] }
+-    var normalizedArrayResponse = {};
+-    // payload is of the form { "apps" : { "app": [ {},{},{} ]  } }
+-    if (payload.apps && payload.apps.app) {
+-      normalizedArrayResponse.data = payload.apps.app.map(singleApp => {
+-          return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-              singleApp);
+-          }, this);
+-    } else {
+-      // No container reported inside containers.
+-      // Response of the form { "apps": null }
+-      normalizedArrayResponse.data = [];
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container-log.js
+deleted file mode 100644
+index 6f75a304557..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container-log.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    var fixedPayload = {
+-      id: "yarn_node_container_log" + "_" + Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        logs: payload
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var p = this.internalNormalizeSingleResponse(store,
+-      primaryModelClass, payload);
+-
+-    return { data: p };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-
+-    if (payload) {
+-      normalizedArrayResponse.data = [this.internalNormalizeSingleResponse(store, primaryModelClass, payload)];
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
+deleted file mode 100644
+index 7bcb6553c0b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node-container.js
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    if (payload.container) {
+-      payload = payload.container;
+-    }
+-    var fixedPayload = {
+-      id: payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        containerId: payload.id,
+-        state: payload.state,
+-        user: payload.user,
+-        diagnostics: payload.diagnostics || 'N/A',
+-        exitCode: payload.exitCode,
+-        totalMemoryNeeded: payload.totalMemoryNeededMB,
+-        totalVCoresNeeded: payload.totalVCoresNeeded,
+-        containerLogFiles: payload.containerLogFiles
+-      }
+-    };
+-
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // payload is of the form {"container":{}}
+-    var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-    return { data: p };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // expected return response is of the form { data: [ {}, {} ] }
+-    var normalizedArrayResponse = {};
+-    if (payload.containers && payload.containers.container) {
+-      // payload is of the form { "containers" : { "container": [ {},{},{} ]  } }
+-      normalizedArrayResponse.data =
+-          payload.containers.container.map(singleContainer => {
+-            return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-                singleContainer);
+-          }, this);
+-    } else {
+-      // No container reported inside containers.
+-      // Response of the form { "containers": null }
+-      normalizedArrayResponse.data = [];
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
+deleted file mode 100644
+index 10521e62a83..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-node.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-    if (payload.nodeInfo) {
+-      payload = payload.nodeInfo;
+-    }
+-
+-    var fixedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        totalVmemAllocatedContainersMB: payload.totalVmemAllocatedContainersMB,
+-        totalPmemAllocatedContainersMB: payload.totalPmemAllocatedContainersMB,
+-        totalVCoresAllocatedContainers: payload.totalVCoresAllocatedContainers,
+-        vmemCheckEnabled: payload.vmemCheckEnabled,
+-        pmemCheckEnabled: payload.pmemCheckEnabled,
+-        nodeHealthy: payload.nodeHealthy,
+-        lastNodeUpdateTime: Converter.timeStampToDate(payload.lastNodeUpdateTime),
+-        healthReport: payload.healthReport || 'N/A',
+-        nmStartupTime: payload.nmStartupTime? Converter.timeStampToDate(payload.nmStartupTime) : '',
+-        nodeManagerBuildVersion: payload.nodeManagerBuildVersion,
+-        hadoopBuildVersion: payload.hadoopBuildVersion
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // payload is of the form {"nodeInfo":{}}
+-    var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload, id);
+-    return { data: p };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
+deleted file mode 100644
+index 1c58547e004..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/capacity-queue.js
++++ /dev/null
+@@ -1,170 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import {PARTITION_LABEL} from '../../constants';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var children = [];
+-      if (payload.queues && payload.queues.queue) {
+-        payload.queues.queue.forEach(function(queue) {
+-          children.push(queue.queuePath);
+-        });
+-      }
+-
+-      var includedData = [];
+-      var relationshipUserData = [];
+-
+-      // update user models
+-      if (payload.users && payload.users.user) {
+-        payload.users.user.forEach(function(u) {
+-          var defaultPartitionResource = u.resources.resourceUsagesByPartition[0];
+-          var maxAMResource = defaultPartitionResource.amLimit;
+-          includedData.push({
+-            type: "YarnUser",
+-            id: u.username + "_" + payload.queuePath,
+-            attributes: {
+-              name: u.username,
+-              queueName: payload.queuePath,
+-              usedMemoryMB: u.resourcesUsed.memory || 0,
+-              usedVCore: u.resourcesUsed.vCores || 0,
+-              maxMemoryMB: u.userResourceLimit.memory || 0,
+-              maxVCore: u.userResourceLimit.vCores || 0,
+-              amUsedMemoryMB: u.AMResourceUsed.memory || 0,
+-              amUsedVCore: u.AMResourceUsed.vCores || 0,
+-              maxAMMemoryMB: maxAMResource.memory || 0,
+-              maxAMVCore: maxAMResource.vCores || 0,
+-              userWeight: u.userWeight || '',
+-              activeApps: u.numActiveApplications || 0,
+-              pendingApps: u.numPendingApplications || 0
+-            }
+-          });
+-
+-          relationshipUserData.push({
+-            type: "YarnUser",
+-            id: u.username + "_" + payload.queuePath,
+-          });
+-        });
+-      }
+-
+-      var partitions = [];
+-      var partitionMap = {};
+-      if ("capacities" in payload) {
+-        partitions = payload.capacities.queueCapacitiesByPartition.map(
+-          cap => cap.partitionName || PARTITION_LABEL);
+-        partitionMap = payload.capacities.queueCapacitiesByPartition.reduce((init, cap) => {
+-          init[cap.partitionName || PARTITION_LABEL] = cap;
+-          return init;
+-        }, {});
+-      } else {
+-        partitions = [PARTITION_LABEL];
+-        partitionMap[PARTITION_LABEL] = {
+-          partitionName: "",
+-          capacity: payload.capacity,
+-          maxCapacity: payload.maxCapacity,
+-          usedCapacity: payload.usedCapacity,
+-          absoluteCapacity: 'absoluteCapacity' in payload ? payload.absoluteCapacity : payload.capacity,
+-          absoluteMaxCapacity: 'absoluteMaxCapacity' in payload ? payload.absoluteMaxCapacity : payload.maxCapacity,
+-          absoluteUsedCapacity: 'absoluteUsedCapacity' in payload ? payload.absoluteUsedCapacity : payload.usedCapacity,
+-        };
+-      }
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName, // yarn-queue
+-        attributes: {
+-          name: payload.queueName,
+-          queuePath: payload.queuePath,
+-          parent: payload.myParent,
+-          children: children,
+-          capacity: payload.capacity,
+-          usedCapacity: payload.usedCapacity,
+-          maxCapacity: payload.maxCapacity,
+-          absCapacity: payload.absoluteCapacity,
+-          absMaxCapacity: payload.absoluteMaxCapacity,
+-          absUsedCapacity: payload.absoluteUsedCapacity,
+-          weight: payload.weight,
+-          normalizedWeight: payload.normalizedWeight,
+-          creationMethod: payload.creationMethod,
+-          state: payload.state,
+-          orderingPolicy: payload.orderingPolicyInfo,
+-          userLimit: payload.userLimit,
+-          userLimitFactor: payload.userLimitFactor,
+-          preemptionDisabled: payload.preemptionDisabled,
+-          numPendingApplications: payload.numPendingApplications,
+-          numActiveApplications: payload.numActiveApplications,
+-          resources: payload.resources,
+-          partitions: partitions,
+-          partitionMap: partitionMap,
+-          type: "capacity",
+-        },
+-        // Relationships
+-        relationships: {
+-          users: {
+-            data: relationshipUserData
+-          }
+-        }
+-      };
+-      return {
+-        queue: this._super(store, primaryModelClass, fixedPayload, id, requestType),
+-        includedData: includedData
+-      };
+-    },
+-
+-    handleQueue(store, primaryModelClass, payload, id, requestType) {
+-      var data = [];
+-      var includedData = [];
+-      var result = this.normalizeSingleResponse(store, primaryModelClass,
+-        payload, id, requestType);
+-
+-      data.push(result.queue);
+-      includedData = includedData.concat(result.includedData);
+-
+-      if (payload.queues && payload.queues.queue) {
+-        for (var i = 0; i < payload.queues.queue.length; i++) {
+-          var queue = payload.queues.queue[i];
+-          queue.myParent = payload.queuePath;
+-          var childResult = this.handleQueue(store, primaryModelClass, queue,
+-            queue.queuePath,
+-            requestType);
+-
+-          data = data.concat(childResult.data);
+-          includedData = includedData.concat(childResult.includedData);
+-        }
+-      }
+-
+-      return {
+-        data: data,
+-        includedData: includedData
+-      };
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {};
+-      var result = this.handleQueue(store, primaryModelClass,
+-        payload.scheduler.schedulerInfo, "root", requestType);
+-
+-      normalizedArrayResponse.data = result.data;
+-      normalizedArrayResponse.included = result.includedData;
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
+deleted file mode 100644
+index c730e448e2a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fair-queue.js
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-      var children = [];
+-      if (payload.childQueues) {
+-        payload.childQueues.queue.forEach(function(queue) {
+-          children.push(queue.queueName);
+-        });
+-      }
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          name: payload.queueName,
+-          parent: payload.myParent,
+-          children: children,
+-          maxApps: payload.maxApps,
+-          minResources: payload.minResources,
+-          maxResources: payload.maxResources,
+-          usedResources: payload.usedResources,
+-          demandResources: payload.demandResources,
+-          steadyFairResources: payload.steadyFairResources,
+-          fairResources: payload.fairResources,
+-          clusterResources: payload.clusterResources,
+-          pendingContainers: payload.pendingContainers,
+-          allocatedContainers: payload.allocatedContainers,
+-          reservedContainers: payload.reservedContainers,
+-          schedulingPolicy: payload.schedulingPolicy,
+-          preemptable: payload.preemptable,
+-          numPendingApplications: payload.numPendingApps,
+-          numActiveApplications: payload.numActiveApps,
+-          type: "fair",
+-        },
+-      };
+-      return this._super(store, primaryModelClass, fixedPayload, id, requestType);
+-    },
+-
+-    handleQueue(store, primaryModelClass, payload, id, requestType) {
+-      var data = [];
+-      if (!payload) {
+-        return data;
+-      }
+-      var result = this.normalizeSingleResponse(store, primaryModelClass,
+-        payload, id, requestType);
+-
+-      data.push(result);
+-
+-      if (payload.childQueues) {
+-        for (var i = 0; i < payload.childQueues.queue.length; i++) {
+-          var queue = payload.childQueues.queue[i];
+-          queue.myParent = payload.queueName;
+-          var childResult = this.handleQueue(store, primaryModelClass, queue,
+-            queue.queueName,
+-            requestType);
+-
+-          data = data.concat(childResult);
+-        }
+-      }
+-
+-      return data;
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {};
+-      var result = this.handleQueue(store, primaryModelClass,
+-        payload.scheduler.schedulerInfo.rootQueue, "root", requestType);
+-
+-      normalizedArrayResponse.data = result;
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
+deleted file mode 100644
+index 297ec182cdb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/fifo-queue.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          name: id,
+-          capacity: payload.capacity * 100,
+-          usedCapacity: payload.usedCapacity * 100,
+-          usedNodeCapacity: payload.usedNodeCapacity,
+-          availNodeCapacity: payload.availNodeCapacity,
+-          totalNodeCapacity: payload.totalNodeCapacity,
+-          numNodes: payload.numNodes,
+-          numContainers: payload.numContainers,
+-          state: payload.qstate,
+-          minQueueMemoryCapacity: payload.minQueueMemoryCapacity,
+-          maxQueueMemoryCapacity: payload.maxQueueMemoryCapacity,
+-          type: "fifo",
+-        },
+-
+-      };
+-
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {};
+-      normalizedArrayResponse.data = [
+-        this.normalizeSingleResponse(store, primaryModelClass,
+-          payload.scheduler.schedulerInfo, "root", requestType)
+-      ];
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
+deleted file mode 100644
+index b2e0f2f4298..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-queue/yarn-queue.js
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload, id,
+-      requestType) {
+-
+-      var fixedPayload = {
+-        id: id,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          type: payload.type.split(/(?=[A-Z])/)[0]
+-        }
+-      };
+-      return this._super(store, primaryModelClass, fixedPayload, id,
+-        requestType);
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+-      var normalizedArrayResponse = {};
+-
+-      normalizedArrayResponse.data = [
+-        this.normalizeSingleResponse(store, primaryModelClass,
+-          payload.scheduler.schedulerInfo, "root", requestType)
+-        ];
+-
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-redirect-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-redirect-log.js
+deleted file mode 100644
+index c41170870fa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-redirect-log.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, containerId, nodeId) {
+-    var fixedPayload = {
+-      id: "yarn_log_" + payload.fileName + "_" + Date.now(),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        fileName: payload.fileName,
+-        fileSize: payload.fileSize,
+-        lastModifiedTime: payload.lastModifiedTime,
+-        containerId: containerId,
+-        nodeId: nodeId
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    if (payload && payload.containerLogsInfo && payload.containerLogsInfo.containerLogInfo) {
+-      normalizedArrayResponse.data = payload.containerLogsInfo.containerLogInfo.map((paylog) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, paylog,
+-          payload.containerLogsInfo.containerId, payload.containerLogsInfo.nodeId);
+-      });
+-    }
+-    if (payload && payload[0] && payload[0].containerLogInfo) {
+-      normalizedArrayResponse.data = payload[0].containerLogInfo.map((paylog) => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass, paylog,
+-          payload[0].containerId, payload[0].nodeId);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
+deleted file mode 100644
+index 900e0ff2f3e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-log.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  normalizeResponse(store, primaryModelClass, payload) {
+-    const pattern = new RegExp('<A HREF="/logs/.+">|<a href="/logs/.+">', 'g');
+-    let fileNames = payload.match(pattern);
+-
+-    if (fileNames == null) {
+-      return {data : []};
+-    }
+-
+-    let logfileNames = [];
+-    for (var i = 0; i < fileNames.length; i++) {
+-      var fileNameMatch = fileNames[i].match(/<A HREF="(\/logs\/.+)">.+<\/A>|<a href="(\/logs\/.+)">.+<\/a>/);
+-      var logFileUrl = fileNameMatch[1] || fileNameMatch[2];
+-      var logFileName = logFileUrl.replace('logs', '').replace(/\//g, '');
+-
+-      if (fileNameMatch.length != null) {
+-        logfileNames.push({
+-          id: i,
+-          type: primaryModelClass.modelName,
+-          attributes: {
+-            logFileUrl: logFileUrl,
+-            logFileName: logFileName
+-          }
+-        });
+-      }
+-    }
+-    return { data : logfileNames };
+-  },
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
+deleted file mode 100644
+index c27fd924905..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-rm-node.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload, id) {
+-    if (payload.node) {
+-      payload = payload.node;
+-    }
+-
+-    var fixedPayload = {
+-      id: id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        rack: payload.rack,
+-        state: payload.state,
+-        nodeHostName: payload.nodeHostName,
+-        nodeHTTPAddress: payload.nodeHTTPAddress,
+-        lastHealthUpdate: Converter.timeStampToDate(payload.lastHealthUpdate),
+-        healthReport: payload.healthReport || 'N/A',
+-        numContainers: payload.numContainers,
+-        usedMemoryMB: payload.usedMemoryMB,
+-        availMemoryMB: payload.availMemoryMB,
+-        usedVirtualCores: payload.usedVirtualCores,
+-        availableVirtualCores: payload.availableVirtualCores,
+-        version: payload.version,
+-        nodeLabels: payload.nodeLabels,
+-        usedResource: payload.usedResource,
+-        availableResource: payload.availableResource
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload, id/*, requestType*/) {
+-    // payload is of the form {"nodeInfo":{}}
+-    var p = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload, id);
+-    return { data: p };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    // expected response is of the form { data: [ {}, {} ] }
+-    var normalizedArrayResponse = {};
+-    if (payload.nodes && payload.nodes.node) {
+-      // payload is of the form { "nodes": { "node": [ {},{},{} ]  } }
+-      normalizedArrayResponse.data = payload.nodes.node.map(singleNode => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-          singleNode, singleNode.id);
+-          }, this);
+-    } else {
+-      normalizedArrayResponse.data = [];
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-component.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-component.js
+deleted file mode 100644
+index 9dd7e6c4e90..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-component.js
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    var info = payload.info;
+-    var configs = payload.configs;
+-    var metrics = payload.metrics;
+-    var newConfigs = Ember.A();
+-    var newMetrics = Ember.Object.create();
+-
+-    if (configs) {
+-      for (let conf in configs) {
+-        let confObj = Ember.Object.create({
+-          name: conf,
+-          value: configs[conf] || 'N/A'
+-        });
+-        newConfigs.push(confObj);
+-      }
+-    }
+-
+-    if (metrics) {
+-      metrics.forEach(function(metric) {
+-        let val = metric.values[Object.keys(metric.values)[0]];
+-        newMetrics.set(metric.id, ((val !== undefined)? val : 'N/A'));
+-      });
+-    }
+-
+-    var fixedPayload = {
+-      id: 'yarn_service_component_' + payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        name: payload.id,
+-        vcores: info.RESOURCE_CPU,
+-        memory: info.RESOURCE_MEMORY,
+-        priority: 'N/A',
+-        instances: '0',
+-        createdTimestamp: payload.createdtime,
+-        configs: newConfigs,
+-        metrics: newMetrics
+-      }
+-    };
+-
+-    return fixedPayload;
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedResponse = {data: []};
+-
+-    if (payload && Array.isArray(payload)) {
+-      payload.forEach(function(component) {
+-        var pl = this.internalNormalizeSingleResponse(store, primaryModelClass, component);
+-        normalizedResponse.data.push(pl);
+-      }.bind(this));
+-    }
+-
+-    return normalizedResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-info.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-info.js
+deleted file mode 100644
+index d3ee93ea7a0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service-info.js
++++ /dev/null
+@@ -1,87 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    var info = payload.info;
+-    var configs = payload.configs;
+-    var quicklinks = info.QUICK_LINKS;
+-    var metrics = payload.metrics;
+-    var newConfigs = Ember.A();
+-    var newQuicklinks = Ember.A();
+-    var newMetrics = Ember.Object.create();
+-
+-    if (configs) {
+-      for (let conf in configs) {
+-        let confObj = Ember.Object.create({
+-          name: conf,
+-          value: configs[conf] || 'N/A'
+-        });
+-        newConfigs.push(confObj);
+-      }
+-    }
+-
+-    if (quicklinks) {
+-      for (let link in quicklinks) {
+-        let linkObj = Ember.Object.create({
+-          name: link,
+-          value: quicklinks[link] || 'N/A'
+-        });
+-        newQuicklinks.push(linkObj);
+-      }
+-    }
+-
+-    if (metrics) {
+-      metrics.forEach(function(metric) {
+-        let val = metric.values[Object.keys(metric.values)[0]];
+-        newMetrics.set(metric.id, ((val !== undefined)? val : 'N/A'));
+-      });
+-    }
+-
+-    var fixedPayload = {
+-      id: 'yarn_service_info_' + payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        name: info.NAME,
+-        appId: payload.id,
+-        state: info.STATE,
+-        createdTimestamp: payload.createdtime,
+-        launchTimestamp: info.LAUNCH_TIME,
+-        quicklinks: newQuicklinks,
+-        configs: newConfigs,
+-        metrics: newMetrics
+-      }
+-    };
+-
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedResponse = {data: []};
+-
+-    if (payload && payload[0]) {
+-      var pl = this.internalNormalizeSingleResponse(store, primaryModelClass, payload[0]);
+-      normalizedResponse.data = pl;
+-    }
+-
+-    return normalizedResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service.js
+deleted file mode 100644
+index a96b28ba86b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-service.js
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-    const fixedPayload = {
+-      id: 'yarn_service_' + (payload.id || Date.now()),
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        appId: payload.id,
+-        name: payload.name,
+-        state: payload.state,
+-        version: payload.version,
+-        lifetime: payload.lifetime,
+-        components: payload.components,
+-        configuration: payload.configuration,
+-        quicklinks: payload.quicklinks
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    const pl = this.internalNormalizeSingleResponse(store, primaryModelClass, payload);
+-    return {data: pl};
+-  }
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
+deleted file mode 100644
+index d6e94a0139e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-appattempt.js
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-    internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-      var payloadEvents = payload.events,
+-          createdEvent = payloadEvents.filterBy('id', 'YARN_APPLICATION_ATTEMPT_REGISTERED')[0],
+-          startedTime = createdEvent? createdEvent.timestamp : Date.now(),
+-          finishedEvent = payloadEvents.filterBy('id', 'YARN_APPLICATION_ATTEMPT_FINISHED')[0],
+-          finishedTime = finishedEvent? finishedEvent.timestamp : Date.now();
+-
+-      var fixedPayload = {
+-        id: payload.id,
+-        type: primaryModelClass.modelName,
+-        attributes: {
+-          startTime: Converter.timeStampToDate(startedTime),
+-          startedTime: Converter.timeStampToDate(startedTime),
+-          finishedTime: Converter.timeStampToDate(finishedTime),
+-          containerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER,
+-          amContainerId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_CONTAINER,
+-          nodeHttpAddress: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ADDRESS,
+-          exposedPorts: payload.info.YARN_CONTAINER_ALLOCATED_EXPOSED_PORTS,
+-          nodeId: payload.info.YARN_APPLICATION_ATTEMPT_MASTER_NODE_ID,
+-          hosts: payload.info.YARN_APPLICATION_ATTEMPT_HOST,
+-          state: payload.info.YARN_APPLICATION_ATTEMPT_STATE,
+-          logsLink: '',
+-          appAttemptId: payload.id
+-        }
+-      };
+-      return fixedPayload;
+-    },
+-
+-    normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      var normalized = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-      return {data: normalized};
+-    },
+-
+-    normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-      var normalizedArrayResponse = {
+-        data: []
+-      };
+-      if (payload && Ember.isArray(payload) && !Ember.isEmpty(payload)) {
+-        normalizedArrayResponse.data = payload.map(singleAttempt => {
+-          return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-            singleAttempt);
+-        });
+-      }
+-      return normalizedArrayResponse;
+-    }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
+deleted file mode 100644
+index 82b5e57aff3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-timeline-container.js
++++ /dev/null
+@@ -1,67 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import DS from 'ember-data';
+-import Ember from 'ember';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-export default DS.JSONAPISerializer.extend({
+-  internalNormalizeSingleResponse(store, primaryModelClass, payload) {
+-
+-    var fixedPayload = {
+-      id: payload.id,
+-      type: primaryModelClass.modelName,
+-      attributes: {
+-        allocatedMB: payload.info.YARN_CONTAINER_ALLOCATED_MEMORY,
+-        allocatedVCores: payload.info.YARN_CONTAINER_ALLOCATED_VCORE,
+-        assignedNodeId: payload.info.YARN_CONTAINER_ALLOCATED_HOST,
+-        priority: payload.info.YARN_CONTAINER_ALLOCATED_PRIORITY,
+-        startedTime:  Converter.timeStampToDate(payload.createdtime),
+-        finishedTime: Converter.timeStampToDate(payload.info.YARN_CONTAINER_FINISHED_TIME),
+-        nodeHttpAddress: payload.info.YARN_CONTAINER_ALLOCATED_HOST_HTTP_ADDRESS,
+-        exposedPorts: payload.info.YARN_CONTAINER_ALLOCATED_EXPOSED_PORTS,
+-        containerExitStatus: payload.info.YARN_CONTAINER_EXIT_STATUS + '',
+-        containerState: payload.info.YARN_CONTAINER_STATE,
+-        nodeId: payload.info.YARN_CONTAINER_ALLOCATED_HOST + ':' + payload.info.YARN_CONTAINER_ALLOCATED_PORT,
+-        diagnosticsInfo: payload.info.YARN_CONTAINER_DIAGNOSTICS_INFO
+-      }
+-    };
+-    return fixedPayload;
+-  },
+-
+-  normalizeSingleResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalized = this.internalNormalizeSingleResponse(store,
+-        primaryModelClass, payload);
+-    return {
+-      data: normalized
+-    };
+-  },
+-
+-  normalizeArrayResponse(store, primaryModelClass, payload/*, id, requestType*/) {
+-    var normalizedArrayResponse = {
+-      data: []
+-    };
+-    if (payload && Ember.isArray(payload) && !Ember.isEmpty(payload)) {
+-      normalizedArrayResponse.data = payload.map(singleContainer => {
+-        return this.internalNormalizeSingleResponse(store, primaryModelClass,
+-          singleContainer);
+-      });
+-    }
+-    return normalizedArrayResponse;
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/env.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/env.js
+deleted file mode 100644
+index 208499c40ca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/env.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/*global more*/
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-import environment from '../config/environment';
+-
+-var MoreObject = more.Object;
+-
+-export default Ember.Service.extend({
+-  ENV: null,
+-
+-  init: function () {
+-    this.collateConfigs();
+-  },
+-
+-  collateConfigs: function () {
+-    var collatedENV = {
+-          APP: {}
+-        },
+-    ENV = window.ENV;
+-
+-    MoreObject.merge(collatedENV, environment);
+-
+-    if(ENV) {
+-      MoreObject.merge(collatedENV.APP, ENV);
+-    }
+-
+-    this.setComputedENVs(collatedENV);
+-
+-    this.set("ENV", collatedENV);
+-  },
+-
+-  setComputedENVs: function (env) {
+-    var navigator = window.navigator;
+-    env.isIE = navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0;
+-    console.log('In setComputedENVs', env.isIE);
+-  },
+-
+-  app: Ember.computed("ENV.APP", function () {
+-    return this.get("ENV.APP");
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
+deleted file mode 100644
+index e6700f07b31..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-
+-export default Ember.Service.extend({
+-
+-  env: Ember.inject.service("env"),
+-
+-  attachProtocolScheme: function (url) {
+-    var localProto = this.get("env.app.hosts.protocolScheme");
+-
+-    if(localProto === "") {
+-      localProto = "http:";
+-    }
+-
+-    if(url.match("://")) {
+-      url = url.substr(url.indexOf("://") + 3);
+-    }
+-
+-    return localProto + "//" + url;
+-  },
+-
+-  normalizeURL: function (url) {
+-    var address;
+-
+-    // If localBaseAddress is configured, then normalized URL has to
+-    // start with this address. For eg: when used with CORS proxy.
+-    // In any case, this fn will return with correct proto scheme.
+-    address = this.localAddress() + url;
+-
+-    // Remove trailing slash
+-    if(address && address.charAt(address.length - 1) === '/') {
+-      address = address.slice(0, -1);
+-    }
+-    return address;
+-  },
+-
+-  localAddress: function () {
+-    var localBaseAddressProto = "";
+-
+-    if (this.get("env.app.hosts.localBaseAddress").length > 0) {
+-      localBaseAddressProto = this.get("env.app.hosts.localBaseAddress") + '/';
+-    }
+-    return this.attachProtocolScheme(localBaseAddressProto);
+-  },
+-
+-  localBaseAddress: Ember.computed(function () {
+-    var url = this.localAddress();
+-    if (url.endsWith('/')) {
+-      url = url.slice(0, -1);
+-    }
+-    return url;
+-  }),
+-
+-  timelineWebAddress: Ember.computed(function () {
+-    return this.normalizeURL(this.get("env.app.hosts.timelineWebAddress"));
+-  }),
+-
+-  timelineV1WebAddress: Ember.computed(function () {
+-    return this.normalizeURL(this.get("env.app.hosts.timelineV1WebAddress"));
+-  }),
+-
+-  rmWebAddress: Ember.computed(function () {
+-    return this.normalizeURL(this.get("env.app.hosts.rmWebAddress"));
+-  }),
+-
+-  jhsAddress: Ember.computed(function() {
+-    return this.normalizeURL(this.get("env.app.hosts.jhsAddress"));
+-  }),
+-
+-  dashWebAddress: Ember.computed(function () {
+-    return this.normalizeURL(this.get("env.app.hosts.dashWebAddress"));
+-  }),
+-
+-  isSecurityEnabled: Ember.computed(function () {
+-    console.log(this.get("env.app.hosts.isSecurityEnabled"));
+-    return this.get("env.app.hosts.isSecurityEnabled");
+-  })
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss
+deleted file mode 100644
+index 59e437a9f55..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/app.scss
++++ /dev/null
+@@ -1,775 +0,0 @@
+-@import 'variables.scss';
+-@import 'layout.scss';
+-@import 'yarn-app.scss';
+-@import './compose-box.scss';
+-@import 'em-table.scss';
+-@import './yarn-queues.scss';
+-
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-body, html, body > .ember-view {
+-  height: 100%;
+-  overflow: visible;
+-  background: $yarn-bg;
+-  color: $yarn-primary-color;
+-  font-family: "Open Sans","Helvetica Neue", sans-serif!important;
+-}
+-body, html {
+-  min-width: 1024px;
+-}
+-
+-/*
+- Over all style
+- */
+-text {
+-  font-size: 14px;
+-}
+-
+-text.small {
+-  font-size: 8px;
+-}
+-
+-html, body
+-{
+-    margin: 0px;
+-    padding: 0px;
+-    height: 100%;
+-    width: 100%;
+-}
+-
+-
+-/*
+- queue's style (left banner of queues)
+- */
+-
+-text.queue {
+-  font-family : sans-serif;
+-  font-size : 15px;
+-  fill : gray;
+-}
+-
+-text.heatmap-cell {
+-  font-size: 14px;
+-  text-anchor: middle;
+-  fill: Azure;
+-  text-align: center;
+-}
+-
+-.hyperlink {
+-  cursor: pointer;
+-  -webkit-user-select: none;
+-  -moz-user-select: none;
+-  -ms-user-select: none;
+-  user-select: none;
+-}
+-
+-.heatmap-clear {
+-  fill: #337ab7;
+-}
+-
+-text.heatmap-cell-notselected {
+-  font: 14px sans-serif;
+-  font-weight: bold;
+-  text-anchor: middle;
+-  fill: Silver;
+-  text-align: center;
+-
+-}
+-
+-text.heatmap-rack {
+-  font-size: 18px;
+-  font-weight: 400;
+-  fill: #4b5052;
+-}
+-
+-path.queue {
+-  stroke: "red";
+-  fill: none;
+-}
+-
+-/*
+- background style
+- */
+-line.grid {
+-  stroke: WhiteSmoke;
+-}
+-
+-line.chart {
+-  stroke: Gray;
+-}
+-
+-/*
+- charts styles
+- */
+-text.chart-title {
+-  font-size: 30px;
+-  text-anchor: middle;
+-  fill: #4b5052;
+-}
+-
+-text.donut-highlight-text, text.donut-highlight-sub {
+-  font-size: 15px;
+-  font-family: sans-serif;
+-  text-anchor: middle;
+-  fill: Gray;
+-  vertical-align: middle;
+-}
+-
+-text.donut-highlight-sub {
+-  font-size: 23px;
+-  margin-top: 10px;
+-}
+-
+-rect.chart-frame {
+-  fill: none;
+-}
+-
+-text.bar-chart-text {
+-  font-size: 8px;
+-  font-family: sans-serif;
+-  vertical-align: middle;
+-  fill: Gray;;
+-}
+-
+-div.tooltip {
+-  position: absolute;
+-  text-align: center;
+-  padding: 10px;
+-  font-size: 16px;
+-  background: black;
+-  color: white;
+-  border: 0px;
+-  border-radius: 8px;
+-  pointer-events: none;
+-}
+-
+-/*
+- * Loading icon styles
+- */
+-.loading-mask > img {
+-  display: block;
+-  margin: 0 auto;
+-}
+-
+-/*
+- * Data table
+- */
+-
+-table.dataTable thead .sorting {
+-  background-image: url("/assets/images/datatables/sort_both.png");
+-}
+-table.dataTable thead .sorting_asc {
+-  background-image: url("/assets/images/datatables/sort_asc.png");
+-}
+-table.dataTable thead .sorting_desc {
+-  background-image: url("/assets/images/datatables/sort_desc.png");
+-}
+-table.dataTable thead .sorting_asc_disabled {
+-  background-image: url("/assets/images/datatables/sort_asc_disabled.png");
+-}
+-table.dataTable thead .sorting_desc_disabled {
+-  background-image: url("/assets/images/datatables/sort_desc_disabled.png");
+-}
+-
+-.add-ellipsis {
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-}
+-
+-.breadcrumb {
+-  padding-bottom: 3px;
+-  background: none;
+-}
+-
+-.navbar-default .navbar-nav > li > a {
+-  color: #337ab7;
+-}
+-
+-/*
+- * Queue selector
+- */
+-.node {
+-  cursor: pointer;
+-}
+-
+-.node circle {
+-  fill: $yarn-panel-bg;
+-  stroke: steelblue;
+-  stroke-width: 3px;
+-}
+-
+-.node text {
+-  font: 12px sans-serif;
+-}
+-
+-.link {
+-  fill: none;
+-  stroke: #ccc;
+-  stroke-width: 2px;
+-}
+-
+-.lr-margin {
+-  margin: 0px 30px;
+-}
+-
+-.footer {
+-  background-color: $yarn-panel-bg;
+-  color: $yarn-primary-color;
+-
+-  padding: 10px 0px;
+-  margin: 0px;
+-
+-  border-top: 1px lightgrey solid;
+-
+-  font-size: .9em;
+-}
+-
+-.table {
+-  margin-bottom: 0px;
+-  border: none;
+-
+-  overflow: hidden;
+-}
+-
+-.table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
+-  border: none !important;
+-}
+-
+-.dataTables_wrapper .table {
+-  border: 1px solid lightgrey;
+-  border-bottom: 1px solid lightgrey !important;
+-  border-radius: 5px;
+-}
+-
+-.dataTables_wrapper .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
+-  border: 1px solid lightgrey;
+-}
+-
+-td {
+- padding: 8px 15px 8px 15px !important;
+-}
+-
+-.footer-frame {
+-  height: 60px;
+-}
+-.footer {
+-  height: 40px;
+-}
+-
+-.footer-pusher {
+-  min-height: 100%;
+-  height: auto !important;
+-  height: 100%;
+-  margin: 0 auto -40px; // Must be same as footer & footer-frame
+-}
+-
+-.panel {
+-  background-color: $yarn-panel-bg;
+-  border: 1px solid $yarn-border-color;
+-  border-radius: 3px;
+-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+-  overflow: hidden;
+-}
+-
+-.panel-default .container-fluid {
+-  margin-top: -45px !important;
+-  margin-bottom: -10px !important;
+-}
+-
+-.panel-default > .panel-heading {
+-  background-image: none;
+-  background-color: $yarn-header-bg !important;
+-  border-color: $yarn-border-color;
+-  border-radius: 3px;
+-}
+-
+-
+-.panel-heading {
+-  background-color: rgba(0, 0, 0, 0) !important;
+-  font-weight: bold;
+-}
+-
+-.hadoop-brand-image {
+-  margin-top: -10px;
+-  width: auto;
+-  height: 45px;
+-}
+-
+-li a.navigation-link.ember-view {
+-  color: #2196f3;
+-  font-weight: bold;
+-}
+-
+-.breadcrumb-bar .refresh {
+-  position: absolute;
+-  right: 20px;
+-  top: 3px;
+-}
+-
+-.x-scroll {
+-  overflow-x: scroll;
+-}
+-
+-.donut-chart {
+-  padding: 0px !important;
+-}
+-
+-.donut-chart svg {
+-  width: 100%;
+-}
+-
+-div.attempt-info-panel table {
+-  table-layout: fixed;
+-}
+-
+-div.attempt-info-panel table > tbody > tr > td:last-of-type {
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-}
+-
+-#main {
+-  float: left;
+-  width: 750px;
+-}
+-
+-#sidebar {
+-  float: right;
+-  width: 100px;
+-}
+-
+-#sequence {
+-  width: 600px;
+-  height: 70px;
+-}
+-
+-#legend {
+-  padding: 10px 0 0 3px;
+-}
+-
+-#sequence text, #legend text {
+-  font-weight: 600;
+-  fill: $yarn-panel-bg;
+-}
+-
+-#chart {
+-  position: relative;
+-}
+-
+-#chart path {
+-  stroke: $yarn-panel-bg;
+-}
+-
+-#explanation {
+-  position: absolute;
+-  top: 360px;
+-  left: 385px;
+-  width: 230px;
+-  text-align: center;
+-  color: #666;
+-  z-index: -1;
+-}
+-
+-.simple-bar-chart .axis text {
+-  font: 10px sans-serif;
+-}
+-
+-.simple-bar-chart .axis path, .simple-bar-chart .axis line {
+-  fill: none;
+-  stroke: #000;
+-  stroke-width: 1px;
+-}
+-
+-.simple-bar-chart rect {
+-  fill: steelblue;
+-}
+-
+-.simple-bar-chart rect:hover {
+-  fill: brown;
+-  cursor: pointer;
+-}
+-
+-.yarn-flow-runs .chart-panel, .yarn-flow-runinfo .chart-panel {
+-  overflow: auto;
+-}
+-
+-.yarn-flow-runs .glyphicon-remove, .yarn-flow-runinfo .glyphicon-remove {
+-  cursor: pointer;
+-}
+-
+-.yarn-flow-runs .glyphicon-remove:hover, .yarn-flow-runinfo .glyphicon-remove:hover {
+-  color: #c9302c;
+-}
+-
+-.yarn-flow-runs .dropdown-menu .item-text, .yarn-flow-runinfo .dropdown-menu .item-text {
+-  width: auto;
+-  display: inline-block;
+-}
+-
+-.yarn-flow-runs .dropdown-menu .item-icon, .yarn-flow-runinfo .dropdown-menu .item-icon {
+-  width: 14px;
+-  display: inline-block;
+-}
+-
+-.yarn-cluster-status i,
+-.em-table-simple-status-cell i{
+-  display: inline-block;
+-  border-radius: 100%;
+-  border: 1px solid;
+-}
+-
+-.yarn-cluster-status i {
+-  width: 12px;
+-  height: 12px;
+-  margin: 3px;
+-  vertical-align: bottom;
+-}
+-
+-.em-table-simple-status-cell i {
+-  width: 10px;
+-  height: 10px;
+-  margin: 3px 3px 3px 0;
+-  vertical-align: text-bottom;
+-}
+-
+-.yarn-cluster-status i.started,
+-.em-table-simple-status-cell i.finished {
+-  border-color: $yarn-success-border;
+-  background-color: $yarn-success-bg;
+-}
+-
+-.yarn-cluster-status i.stopped,
+-.em-table-simple-status-cell i.killed,
+-.em-table-simple-status-cell i.failed {
+-  border-color: $yarn-error-border;
+-  background-color: $yarn-error-bg;
+-}
+-.yarn-cluster-status i.inited,
+-.em-table-simple-status-cell i.running {
+-  border-color: $yarn-info-border;
+-  background-color: $yarn-info-bg;
+-}
+-.yarn-cluster-status i.notinited,
+-.em-table-simple-status-cell i.accepted {
+-    border-color: $yarn-warn-border;
+-    background-color: $yarn-warn-bg;
+-}
+-.yarn-cluster-info {
+-  display: flex;
+-  margin-left: auto;
+-  margin-top: -7px;
+-}
+-
+-.yarn-ui-footer {
+-  display: flex;
+-  padding: 10px 25px;
+-}
+-
+-.deploy-service textarea {
+-  border-radius: 5px !important;
+-  resize: none;
+-  word-wrap: break-word;
+-}
+-
+-.deploy-service .loading-state {
+-  opacity: 0.5;
+-}
+-
+-.deploy-service .loading-state img {
+-  width: 80px;
+-  height: 80px;
+-  margin: 40px auto;
+-  left: 50% !important;
+-  position: absolute;
+-  z-index: 9999;
+-}
+-
+-.align-center {
+-  text-align: center !important;
+-}
+-.align-right {
+-  text-align: right;
+-}
+-
+-.bold-text {
+-  font-weight: bold !important;
+-}
+-
+-.deploy-service .saved-list {
+-  min-height: 600px;
+-}
+-
+-.deploy-service .glyphicon {
+-  cursor: pointer;
+-}
+-
+-.deploy-service .remove-icon:hover {
+-  color: #d9534f;
+-}
+-
+-.deploy-service .savedlist-column {
+-  padding-top: 10px;
+-}
+-
+-.deploy-service .definition-column {
+-  padding-top: 10px;
+-  border-left: 1px solid #ddd;
+-}
+-
+-.deploy-service .content-area {
+-  padding: 15px 0px;
+-  border-top: 1px solid #ddd;
+-}
+-
+-.deploy-service .custom-json-area {
+-  padding: 10px 0;
+-  margin-top: -26px;
+-}
+-
+-.deploy-service-modal .modal-dialog {
+-  width: 400px;
+-}
+-
+-.deploy-service-modal .form-group {
+-  margin-bottom: 5px;
+-}
+-
+-.deploy-service .action-btns {
+-  text-align: right;
+-  padding-bottom: 15px;
+-  padding-right: 0;
+-}
+-
+-table.table-custom-action > thead > tr > th:last-of-type, table.table-custom-action > tbody > tr > td:last-of-type {
+-  width: 50px !important;
+-}
+-
+-.deploy-service .toggle-btn.active {
+-  color: $yarn-panel-bg;
+-  background-color: #337ab7;
+-  border-color: #337ab7;
+-  text-shadow: none;
+-}
+-
+-.deploy-service .service-resp {
+-  word-wrap: break-word;
+-}
+-
+-table.table-custom-bordered {
+-  border: 1px solid #ddd !important;
+-  border-radius: 4px !important;
+-}
+-
+-table.table-custom-bordered > thead > tr > th, table.table-custom-bordered > tbody > tr > td {
+-  border-bottom: 1px solid #ddd !important;
+-  border-right: 1px solid #ddd !important;
+-}
+-
+-table.table-custom-striped > thead > tr, .table-custom-striped > tbody > tr:nth-of-type(even) {
+-  background-color: #f9f9f9 !important;
+-}
+-
+-table.table-custom-header > thead > tr > th {
+-  background-color: #f5f5f5 !important;
+-}
+-
+-table.table-radius-none {
+-  border-radius: 0 !important;
+-}
+-
+-table.table-border-none {
+-  border: none !important;
+-}
+-
+-.deploy-service label.required:after, .deploy-service-modal label.required:after {
+-  content: '*';
+-  color: #d9534f;
+-}
+-
+-.deploy-service .form-group.shrink-height {
+-  margin-bottom: -8px;
+-}
+-
+-table.fix-table-overflow {
+-  table-layout: fixed;
+-}
+-
+-table.fix-table-overflow > tbody > tr > td:last-of-type {
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-}
+-
+-div.tooltip.info-tooltip {
+-  font: 14px sans-serif !important;
+-  background: lightsteelblue;
+-  word-wrap: break-word;
+-  position: absolute;
+-  text-align: justify;
+-  border-radius: 3px;
+-  z-index: 9999;
+-  padding: 10px;
+-  display: none;
+-  min-width: 200px;
+-  max-width: 500px;
+-  opacity: 1;
+-  top: 10px;
+-  left: 0;
+-}
+-
+-div.tooltip.info-tooltip > span.top-arrow {
+-  color: lightsteelblue;
+-  position: absolute;
+-  top: -10px;
+-  left: 10px;
+-}
+-
+-span.info-icon {
+-  color: #337ab7 !important;
+-}
+-
+-div.service-action-mask {
+-  position: absolute;
+-  opacity: 0.5;
+-  z-index: 9999;
+-  width: 100%;
+-  height: 100%;
+-}
+-
+-div.service-action-mask img {
+-  position: absolute;
+-  width: 80px;
+-  height: 80px;
+-  margin: 40px auto;
+-  left: 45% !important;
+-  z-index: 9999;
+-}
+-
+-.muted-text {
+-  color: $yarn-muted-text;
+-}
+-
+-.glyphicon-gray {
+-  color: $yarn-gray-icon;
+-}
+-
+-.btn.btn-unstyled {
+-  padding: 5px;
+-  background: none;
+-  border: none;
+-  box-shadow: none;
+-}
+-
+-.queue-page-breadcrumb,
+-#tree-selector-container {
+-  width: calc(100% - #{$compose-box-width});
+-}
+-
+-#tree-selector-container {
+-  overflow: scroll;
+-}
+-
+-.yarn-label {
+-  border-radius: 3px;
+-  margin-bottom: 5px;
+-  border: 1px solid $yarn-panel-bg;
+-  font-size: 12px;
+-  > span {
+-    padding: 5px;
+-  }
+-  &.primary {
+-    display: inline-grid;
+-    .label-key {
+-      color: $yarn-panel-bg;
+-      background: #666;
+-    }
+-    .label-value {
+-      color: $yarn-panel-bg;
+-      background: $yarn-success-border;
+-    }
+-  }
+-  &.secondary {
+-    display: inline-table;
+-    .label-key {
+-      color: $yarn-panel-bg;
+-      background: #999;
+-    }
+-
+-    .label-value {
+-      color: $yarn-panel-bg;
+-      background: yellowgreen;
+-    }
+-  }
+-}
+-
+-.yarn-queues-container {
+-  padding: 15px;
+-  h3 {
+-    margin-top: 0;
+-  }
+-}
+-
+-.yarn-metrics-json {
+-  white-space: pre-wrap;
+-  word-wrap: nowrap;
+-  overflow: scroll;
+-}
+-
+-div.loggedin-user {
+-  float: right;
+-  padding: 15px 5px;
+-  color: #555;
+-  .username {
+-    font-weight: bold;
+-  }
+-}
+-
+-.no-border-bottom {
+-  border-bottom: none;
+-}
+-
+-.margin-bottom-20 {
+-  margin-bottom: 20px;
+-}
+-
+-.diagnostic-info {
+-  pre {
+-    margin-bottom: 0;
+-    white-space: pre-wrap;
+-    border: none;
+-    border-radius: 2px;
+-  }
+-}
+-
+-/**
+- * Active User Info table styles
+- */
+-.active-user-panel {
+-  margin-top: 10px;
+-}
+-
+-table.active-user-table {
+-  border: 1px solid #ddd;
+-  > thead > tr > th {
+-    background-color: #f7f7f7;
+-  }
+-  &.table-bordered > thead > tr > th,
+-  &.table-bordered > tbody > tr > td {
+-    border: 1px solid #dcdcdc !important;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/colors.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/colors.scss
+deleted file mode 100644
+index 21ff58df2cb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/colors.scss
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-// Colors
+-$color-ghost-white: #f1f2f8;
+-$color-white: #fff;
+-
+-$color-gray-20: #333;
+-$color-gray-40: #666666;
+-$color-gray-60: #999999;
+-$color-gray-97: #f7f7f7;
+-$color-light-gray: #d5d5d5;
+-
+-$color-green-primary: #60cea5;
+-$color-green-secondary: #43b135;
+-
+-$color-red-primary: #ef6162;
+-$color-red-secondary: #b04b4e;
+-
+-$color-blue-primary: #26bbf0;
+-$color-blue-secondary:#1c95c0;
+-
+-$color-yellow-primary: #ffbc0b;
+-$color-yellow-secondary: #dca41b;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss
+deleted file mode 100644
+index 330106c513f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/compose-box.scss
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-@import 'variables.scss';
+-
+-.yarn-compose-box {
+-  position: absolute;
+-  top: 50px;
+-  bottom: 40px;
+-  right: 0px;
+-  background-color: $yarn-panel-bg;
+-  border: 1px solid $yarn-border-color;
+-  border-radius: 3px;
+-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+-  max-width: $compose-box-width;
+-  overflow: scroll;
+-
+-  .panel-heading {
+-    background-color: $yarn-header-bg !important;
+-    border-color: $yarn-border-color;
+-    border-radius: 3px;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/em-table.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/em-table.scss
+deleted file mode 100644
+index 83667fc94bd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/em-table.scss
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-// All emtable style overrides go here
+-
+-.yarn-applications-container {
+-  .table-panel-left {
+-    .em-table-facet-panel {
+-      width: 240px;
+-      margin-right: 15px;
+-      padding: 0 0 15px 0;
+-      background: none;
+-      border: none;
+-      border-radius: 0;
+-      .field-list {
+-        padding-top: 0px;
+-
+-        & > li .em-table-facet-panel-values {
+-          margin-top: 0px;
+-          margin-bottom: -4px;
+-          background: $yarn-panel-bg;
+-          border: 1px solid $yarn-border-color;
+-          .field-name {
+-            cursor: default;
+-            &::before {
+-              display: none;
+-            }
+-            .all-button {
+-              display: block;
+-              cursor: pointer;
+-            }
+-          }
+-
+-          &.hide-values {
+-            .value-list,
+-            .more-less,
+-            .field-name .all-button {
+-              display: block;
+-            }
+-            &.hide-select-all {
+-              .field-name .all-button {
+-                display: none;
+-              }
+-            }
+-          }
+-        }
+-      }
+-
+-      .field-name {
+-        background-color: $yarn-header-bg;
+-        border-bottom: 1px solid $yarn-border-color;
+-        padding: 10px 15px;
+-      }
+-      .all-button {
+-        right: 5px !important;
+-      }
+-
+-      .field-name::before {
+-        margin-right: 5px;
+-      }
+-
+-      .value-list {
+-        padding: 0 10px;
+-      }
+-
+-      .filter-box {
+-        padding: 5px;
+-        margin: 5px 0;
+-      }
+-
+-      .more-less {
+-        padding: 5px 0;
+-      }
+-    }
+-  }
+-
+-  .ember-view.table-cell {
+-    padding: 10px 15px;
+-    height: auto;
+-  }
+-
+-  .resize-column {
+-    position: absolute;
+-    right: -14px;
+-    display: inline-block;
+-    padding: 10px 0;
+-    top: -36px;
+-    font-size: 42px;
+-    line-height: 2em;
+-  }
+-  .em-progress-container {
+-    padding-bottom: 1px;
+-  }
+-}
+-
+-.em-table {
+-  .table-column {
+-    .table-header-cell {
+-      padding: 7.5px 0 7.5px 7.5px;
+-      background-color: $yarn-header-bg;
+-      border-bottom: 1px solid $yarn-border-color;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss
+deleted file mode 100644
+index 10607af4dc8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/layout.scss
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-.flex {
+-  display: flex;
+-}
+-
+-/** Pushes the flex element to the right corner **/
+-.flex-right {
+-  margin-left: auto;
+-}
+-
+-.offset-1 {
+-  margin-left: 5px
+-}
+-
+-.offset-2 {
+-  margin-left: 10px
+-}
+-
+-.tail-1 {
+-  margin-right: 5px
+-}
+-
+-.tail-2 {
+-  margin-right: 10px
+-}
+-
+-.top-1 {
+-  margin-top: 5px;
+-}
+-
+-.top-2 {
+-  margin-top: 10px;
+-}
+-
+-.top-3 {
+-  margin-top: 20px;
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/variables.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/variables.scss
+deleted file mode 100644
+index e25b4826c0b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/variables.scss
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-@import './colors.scss';
+-
+-$yarn-bg: $color-ghost-white;
+-$yarn-panel-bg: $color-white;
+-$yarn-primary-color: $color-gray-20;
+-
+-$yarn-header-bg: $color-gray-97;
+-$yarn-border-color: $color-light-gray;
+-
+-
+-$yarn-success-border: $color-green-secondary;
+-$yarn-success-bg: $color-green-primary;
+-$yarn-error-border: $color-red-secondary;
+-$yarn-error-bg: $color-red-primary;
+-$yarn-info-border: $color-blue-secondary;
+-$yarn-info-bg: $color-blue-primary;
+-$yarn-warn-border: $color-yellow-secondary;
+-$yarn-warn-bg: $color-yellow-primary;
+-
+-$yarn-gray-icon: $color-gray-40;
+-$yarn-muted-text: $color-gray-60;
+-
+-$compose-box-width: 400px;
+-//shadows
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-app.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-app.scss
+deleted file mode 100644
+index 875da72b0c8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-app.scss
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-.yarn-app-header {
+-  padding: 20px;
+-  line-height: 2em;
+-
+-  h3 {
+-    margin: 0px;
+-  }
+-
+-  i.glyphicon {
+-    vertical-align: text-top;
+-    margin-right: 3px;
+-  }
+-
+-  .yarn-app-final-status .label {
+-    vertical-align: middle;
+-  }
+-
+-  .quick-links {
+-    display: block;
+-    margin-left: -5px;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-queues.scss b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-queues.scss
+deleted file mode 100644
+index 88522706a53..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/styles/yarn-queues.scss
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-.filter-partitions {
+-  padding: 15px;
+-  margin-left: auto;
+-  label {
+-    font-weight: 500;
+-  }
+-  .filter-queue-by-labels {
+-    display: inline-block;
+-    max-width: 350px;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
+deleted file mode 100644
+index 1d469d9ce80..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/application.hbs
++++ /dev/null
+@@ -1,117 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="footer-pusher">
+-
+-  <nav class="navbar navbar-default">
+-    <div class="container-fluid">
+-      <!-- Brand and toggle get grouped for better mobile display -->
+-      <div class="navbar-header">
+-        <a class="navbar-brand" href="#">
+-         <img class="hadoop-brand-image" alt="Apache Hadoop" src="assets/images/hadoop_logo.png"  />
+-        </a>
+-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+-          <span class="sr-only">Toggle navigation</span>
+-          <span class="icon-bar"></span>
+-          <span class="icon-bar"></span>
+-          <span class="icon-bar"></span>
+-        </button>
+-      </div>
+-
+-      <!-- Collect the nav links, forms, and other content for toggling -->
+-      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+-        <ul class="nav navbar-nav">
+-          {{#link-to 'cluster-overview' tagName="li"}}
+-            {{#link-to 'cluster-overview' class="navigation-link"}}Cluster Overview
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-queues' 'root' tagName="li" classNameBindings="isQueuesTabActive:active"}}
+-            {{#link-to 'yarn-queues' 'root' class="navigation-link"}}Queues
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-apps.apps' tagName="li" current-when="yarn-apps.apps"}}
+-            {{#link-to 'yarn-apps.apps' class="navigation-link"}}Applications
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-services' tagName="li"}}
+-            {{#link-to 'yarn-services' class="navigation-link"}}Services
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-flow-activity' tagName="li" disabled=isTimelineUnHealthy}}
+-            {{#link-to 'yarn-flow-activity' class="navigation-link" disabled=isTimelineUnHealthy}}Flow Activity
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-nodes.table' tagName="li" current-when="yarn-nodes.table yarn-nodes.heatmap"}}
+-            {{#link-to 'yarn-nodes.table' class="navigation-link"}}Nodes
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-tools.yarn-conf' tagName="li"}}
+-            {{#link-to 'yarn-tools.yarn-conf' class="navigation-link"}}Tools
+-              <span class="sr-only">(current)</span>
+-            {{/link-to}}
+-          {{/link-to}}
+-        </ul>
+-        {{#if userInfo}}
+-        <div class="loggedin-user">
+-          Logged in as: <span class="username">{{userInfo.requestedUser}}</span>
+-        </div>
+-        {{/if}}
+-      </div><!-- /.navbar-collapse -->
+-    </div><!-- /.container-fluid -->
+-  </nav>
+-
+-  <div class="container-fluid">
+-    {{outlet}}
+-  </div>
+-
+-  <br/>
+-  <br/>
+-  <br/>
+-</div>
+-
+-<div class="footer yarn-ui-footer">
+-  <div>
+-    <a href={{env.app.hrefs.license}} target="_blank">
+-      Licensed under the Apache License, Version 2.0.
+-    </a>
+-    <div class="ui-info">
+-      {{#if env.app.timezone}}
+-        <span>Timezone <b>{{env.app.timezone}}</b></span>
+-      {{/if}}
+-    </div>
+-  </div>
+-  <div class="yarn-cluster-info">
+-    {{#if clusterInfo}}
+-    <div>
+-      <strong>v{{clusterInfo.hadoopVersion}}</strong>
+-      <span class="yarn-cluster-status yarn-tooltip" title="Hadoop Version: {{clusterInfo.getYARNBuildHash}} &#10;Started on: {{date-formatter clusterInfo.startedOn}}" data-toggle="tooltip" data-placement="top">
+-        <i class={{lower clusterInfo.state}} />
+-      </span>
+-      <div>Started at {{date-formatter clusterInfo.startedOn}}</div>
+-    </div>
+-    {{/if}}
+-  </div>
+-</div>
+-
+-{{info-tooltip}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
+deleted file mode 100644
+index e7752ea0980..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs
++++ /dev/null
+@@ -1,181 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-{{#if model}}
+-
+-  <div class="col-md-12 container-fluid">
+-    <div class="row">
+-      <div class="col-lg-6 container-fluid">
+-        <div class="panel panel-default">
+-          <div class="panel-heading">
+-            Cluster Resource Usage By Applications
+-          </div>
+-          <div class="container-fluid donut-chart" id="appusage-donut-chart">
+-            {{app-usage-donut-chart data=model.apps
+-            showLabels=true
+-            parentId="appusage-donut-chart"
+-            ratio=0.5
+-            maxHeight=400}}
+-          </div>
+-        </div>
+-      </div>
+-
+-      <div class="col-lg-6 container-fluid">
+-        <div class="panel panel-default">
+-          <div class="panel-heading">
+-            Cluster Resource Usage By Leaf Queues
+-          </div>
+-          <div class="container-fluid donut-chart" id="queueusage-donut-chart">
+-            {{queue-usage-donut-chart data=model.queues
+-            showLabels=true
+-            parentId="queueusage-donut-chart"
+-            ratio=0.5
+-            maxHeight=400}}
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-    <hr>
+-
+-  <div class="row">
+-    <div class="col-lg-4 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Finished Apps From All Users
+-        </div>
+-        <div class="container-fluid" id="finishedapps-donut-chart">
+-          {{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart
+-          showLabels=true
+-          parentId="finishedapps-donut-chart"
+-          ratio=0.6
+-          maxHeight=350
+-          colorTargets="good warn error"}}
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="col-lg-4 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Running Apps From All Users
+-        </div>
+-        <div class="container-fluid" id="runningapps-donut-chart">
+-          {{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart
+-          showLabels=true
+-          parentId="runningapps-donut-chart"
+-          ratio=0.6
+-          maxHeight=350
+-          colorTargets="warn good"}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-
+-  <hr>
+-  <div class="row">
+-    <!-- When getAllResourceTypesDonutChart is not null, use it to show per-resource-type usages. Otherwise only show
+-         vcore/memory usage from metrics -->
+-    {{#if model.clusterMetrics.firstObject.getAllResourceTypesDonutChart}}
+-      {{#each
+-        model.clusterMetrics.firstObject.getAllResourceTypesDonutChart as |perTypeUsage|}}
+-        <div class="col-lg-4 container-fluid">
+-          <div class="panel panel-default">
+-            <div class="panel-heading">
+-              {{perTypeUsage.name}} - Usages
+-            </div>
+-            <div class="container-fluid" id="resource-type-{{perTypeUsage.id}}">
+-              {{donut-chart
+-                data=perTypeUsage.data
+-                showLabels=true
+-                parentIdPrefix="resource-type-"
+-                id=perTypeUsage.id
+-                ratio=0.6
+-                unit=perTypeUsage.unit
+-                type="resource"
+-                maxHeight=350
+-                colorTargets="good"
+-                colorTargetReverse=true}}
+-            </div>
+-          </div>
+-        </div>
+-      {{/each}}
+-    {{else}}
+-      <div class="col-lg-4 container-fluid">
+-        <div class="panel panel-default">
+-          <div class="panel-heading">
+-            Resource - Memory
+-          </div>
+-          <div class="container-fluid" id="mem-donut-chart">
+-            {{donut-chart
+-              data=model.clusterMetrics.firstObject.getMemoryDataForDonutChart
+-              showLabels=true
+-              parentId="mem-donut-chart"
+-              ratio=0.6
+-              maxHeight=350
+-              colorTargets="good"
+-              colorTargetReverse=true
+-              type="memory"}}
+-          </div>
+-        </div>
+-      </div>
+-
+-      <div class="col-lg-4 container-fluid">
+-        <div class="panel panel-default">
+-          <div class="panel-heading">
+-            Resource - VCores
+-          </div>
+-          <div class="container-fluid" id="vcore-donut-chart">
+-            {{donut-chart
+-              data=model.clusterMetrics.firstObject.getVCoreDataForDonutChart
+-              showLabels=true
+-              parentId="vcore-donut-chart"
+-              ratio=0.6
+-              maxHeight=350
+-              colorTargets="good"
+-              colorTargetReverse=true}}
+-          </div>
+-        </div>
+-      </div>
+-    {{/if}}
+-
+-  </div>
+-  <div class="row">
+-    <div class="col-lg-6 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Node Managers
+-        </div>
+-        <div class="container-fluid" id="nodes-donut-chart">
+-          {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart
+-          showLabels=true
+-          parentId="nodes-donut-chart"
+-          ratio=0.6
+-          maxHeight=350
+-          colorTargets="good error warn"}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-
+-{{/if}}
+-
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs
+deleted file mode 100644
+index 91c7eeaf9a0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-attempt-table.hbs
++++ /dev/null
+@@ -1,80 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id="app-attempt-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+-  <tbody>
+-    <tr>
+-      <td>Application Attempt Id</td>
+-      <td title="{{attempt.id}}">{{attempt.id}}</td>
+-    </tr>
+-    <tr>
+-      <td>Started Time</td>
+-      <td>{{attempt.attemptStartedTime}}</td>
+-    </tr>
+-    {{#if attempt.validatedFinishedTs}}
+-    <tr>
+-      <td>Finished Time</td>
+-      <td>{{attempt.validatedFinishedTs}}</td>
+-    </tr>
+-    {{/if}}
+-    <tr>
+-      <td>Elapsed Time</td>
+-      <td>{{attempt.elapsedTime}}</td>
+-    </tr>
+-    <tr>
+-      <td>AM Container Id</td>
+-      <td title="{{attempt.appMasterContainerId}}">{{attempt.appMasterContainerId}}</td>
+-    </tr>
+-    <tr>
+-      <td>AM Node Id</td>
+-      <td title="{{attempt.amNodeId}}">{{attempt.amNodeId}}</td>
+-    </tr>
+-    {{#if attempt.attemptState}}
+-    <tr>
+-      <td>Attempt State</td>
+-      <td>{{attempt.attemptState}}</td>
+-    </tr>
+-    {{/if}}
+-    {{#if attempt.nodeHttpAddress}}
+-    <tr>
+-      <td>AM Node Web UI</td>
+-      <td title="{{attempt.nodeHttpAddress}}"><a href="{{attempt.masterNodeURL}}">{{attempt.nodeHttpAddress}}</a></td>
+-    </tr>
+-    {{/if}}
+-    {{#if attempt.exposedPorts}}
+-    <tr>
+-      <td>Exposed Ports</td>
+-      <td title="{{attempt.exposedPorts}}">{{attempt.exposedPorts}}</td>
+-    </tr>
+-    {{/if}}
+-    {{#if attempt.appAttemptContainerLogsURL}}
+-    <tr>
+-      <td>Logs</td>
+-      <td>
+-        <a href="{{attempt.appAttemptContainerLogsURL}}">Link</a>
+-      </td>
+-    </tr>
+-    {{/if}}
+-    {{#if attempt.diagnosticsInfo}}
+-    <tr>
+-      <td>Diagnostics Info</td>
+-      <td>{{attempt.diagnosticsInfo}}</td>
+-    </tr>
+-    {{/if}}
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
+deleted file mode 100644
+index 3bad063b422..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-table.hbs
++++ /dev/null
+@@ -1,86 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id={{table-id}} class="display table table-striped table-bordered" cellspacing="0" width="100%">
+-  <thead>
+-    <tr>
+-          <th>Application ID</th>
+-          <th>Application Type</th>
+-          <th>Name</th>
+-          <th>User</th>
+-          <th>Queue</th>
+-          <th>State</th>
+-          <th>Final Status</th>
+-          <th>Start Time</th>
+-          <th>Elapsed Time</th> <!-- idx = 7 -->
+-          <th>Finished Time</th>
+-          <th>Priority</th>
+-          <th>Progress</th>
+-          <th>%Cluster</th>
+-    </tr>
+-  </thead>
+-  <tbody>
+-    {{#if arr}}
+-      {{#each arr as |app|}}
+-        <tr>
+-          <td><a href="#/yarn-app/{{app.id}}/info">{{app.id}}</a></td>
+-          <td>{{app.applicationType}}</td>
+-          <td>{{app.appName}}</td>
+-          <td>{{app.user}}</td>
+-          <td>{{app.queue}}</td>
+-          <td>{{app.state}}</td>
+-          <td><span class={{app.finalStatusStyle}}>{{app.finalStatus}}</span></td>
+-          <td>{{app.startTime}}</td>
+-          <td>{{app.elapsedTime}}</td>
+-          <td>{{app.validatedFinishedTs}}</td>
+-          <td>{{app.priority}}</td>
+-          <td>
+-            <div class="progress" style="margin-bottom: 0;">
+-              <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style={{app.progressStyle}}>
+-                {{app.progress}}%
+-              </div>
+-            </div>
+-          </td>
+-          <td>{{app.clusterUsagePercentage}}</td>
+-        </tr>
+-      {{/each}}
+-    {{else}}
+-      <tr>
+-          <td><a href="#/yarn-app/{{app.id}}/info">{{app.id}}</a></td>
+-          <td>{{app.applicationType}}</td>
+-          <td>{{app.appName}}</td>
+-          <td>{{app.user}}</td>
+-          <td>{{app.queue}}</td>
+-          <td>{{app.state}}</td>
+-          <td><span class={{app.finalStatusStyle}}>{{app.finalStatus}}</span></td>
+-          <td>{{app.startTime}}</td>
+-          <td>{{app.elapsedTime}}</td>
+-          <td>{{app.validatedFinishedTs}}</td>
+-          <td>{{app.priority}}</td>
+-          <td>
+-            <div class="progress" style="margin-bottom: 0;">
+-              <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style={{app.progressStyle}}>
+-                {{app.progress}}%
+-              </div>
+-            </div>
+-          </td>
+-          <td>{{app.clusterUsagePercentage}}</td>
+-      </tr>
+-    {{/if}}
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
+deleted file mode 100644
+index acbe0b2470b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/app-timeout-bar.hbs
++++ /dev/null
+@@ -1,34 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="app-timeout-wrapper">
+-  {{#unless isAppTimedOut}}
+-    <div class="panel panel-default">
+-      <div class="panel-body">
+-        <label>Application will be timed out after <span class="text-danger">{{appTimeoutValue}}</span></label>
+-        <div class="progress">
+-          <div class="progress-bar progress-bar-danger progress-bar-striped active" style="{{appTimeoutBarStyle}}"></div>
+-        </div>
+-        <div>
+-          <label class="pull-left">{{app.startTime}}</label>
+-          <label class="pull-right">{{app.applicationExpiryTime}}</label>
+-        </div>
+-      </div>
+-    </div>
+-  {{/unless}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/breadcrumb-bar.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/breadcrumb-bar.hbs
+deleted file mode 100644
+index 54229cc7ed8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/breadcrumb-bar.hbs
++++ /dev/null
+@@ -1,24 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 container-fluid breadcrumb-bar">
+-  {{em-breadcrumbs items=breadcrumbs}}
+-  {{#unless hideRefresh}}
+-    <button type="button" class="btn btn-sm btn-primary refresh" {{action "refresh"}}>Refresh</button>
+-  {{/unless}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/collapsible-panel.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/collapsible-panel.hbs
+deleted file mode 100644
+index aab80b18a29..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/collapsible-panel.hbs
++++ /dev/null
+@@ -1,21 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<a class="pull-right toggle_switch" href="#" {{action "togglePanelCollapse"}}>
+-  <span class="glyphicon glyphicon-chevron-up"></span>
+-</a>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/confirm-dialog.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/confirm-dialog.hbs
+deleted file mode 100644
+index b3bc49a3ffa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/confirm-dialog.hbs
++++ /dev/null
+@@ -1,37 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="modal fade" tabindex="-1" role="dialog" id="{{dialogId}}">
+-  <div class="modal-dialog" role="document">
+-    <div class="modal-content" style="width: 500px;">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+-          <span aria-hidden="true">&times;</span>
+-        </button>
+-        <h3 class="modal-title">{{title}}</h3>
+-      </div>
+-      <div class="modal-body">
+-        {{message}}
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">No</button>
+-        <button type="button" class="btn btn-primary" {{action "yesConfirmed"}}>Yes</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs
+deleted file mode 100644
+index 25d57c5f02a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/container-table.hbs
++++ /dev/null
+@@ -1,78 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id="container-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+-  <tbody>
+-    <tr>
+-      <td>Started Time</td>
+-      <td>{{container.startedTime}}</td>
+-    </tr>
+-    {{#if container.validatedFinishedTs}}
+-    <tr>
+-      <td>Finished Time</td>
+-      <td>{{container.validatedFinishedTs}}</td>
+-    </tr>
+-    {{/if}}
+-    <tr>
+-      <td>Elapsed Time</td>
+-      <td>{{container.elapsedTime}}</td>
+-    </tr>
+-    <tr>
+-      <td>Priority</td>
+-      <td>{{container.priority}}</td>
+-    </tr>
+-    {{#if container.containerExitStatus}}
+-    <tr>
+-      <td>Exit Status</td>
+-      <td>{{container.containerExitStatus}}</td>
+-    </tr>
+-    {{/if}}
+-    {{#if container.containerState}}
+-    <tr>
+-      <td>State</td>
+-      <td>{{container.containerState}}</td>
+-    </tr>
+-    {{/if}}
+-    {{#if container.nodeHttpAddress}}
+-    <tr>
+-      <td>NodeManager UI</td>
+-      <td title="{{container.nodeHttpAddress}}"><a href="{{container.masterNodeURL}}">{{container.nodeHttpAddress}}</a></td>
+-    </tr>
+-    {{/if}}
+-    {{#if container.exposedPorts}}
+-    <tr>
+-      <td>Exposed Ports</td>
+-      <td title="{{container.exposedPorts}}">{{container.exposedPorts}}</td>
+-    </tr>
+-    {{/if}}
+-    {{#if container.appAttemptContainerLogsURL}}
+-    <tr>
+-      <td>Logs</td>
+-      <td>
+-        <a href="{{container.appAttemptContainerLogsURL}}">Link</a>
+-      </td>
+-    </tr>
+-    {{/if}}
+-    {{#if container.nodeHttpAddress}}
+-    <tr>
+-      <td>Terminal</td>
+-      <td><a href="{{container.nodeHttpAddress}}/terminal/terminal.template?container={{container.id}}&user.name={{requestedUser}}" target="_blank">Link</a></td>
+-    </tr>
+-    {{/if}}
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/deploy-service.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/deploy-service.hbs
+deleted file mode 100644
+index d348200920d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/deploy-service.hbs
++++ /dev/null
+@@ -1,180 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="container-fluid deploy-service">
+-  {{#if serviceResp}}
+-    <div class="row">
+-      <div class="col-md-12">
+-        <div class="panel panel-default service-resp">
+-          <div class="panel-body {{if (eq serviceResp.type 'error') 'bg-danger' 'bg-success'}}">
+-            <span class="glyphicon glyphicon-remove pull-right remove-icon" {{action "clearServiceResponse"}}></span>
+-            <strong class="{{if (eq serviceResp.type 'error') 'text-danger' 'text-success'}}">{{serviceResp.message}}</strong>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-  {{/if}}
+-  {{#if isSecurityNotEnabled}}
+-    <div class="row">
+-      <div class="col-md-4">
+-        <div class="form-group shrink-height">
+-          <label class="required">User Name for service</label>
+-          <span class="glyphicon glyphicon-info-sign info-icon" data-info="userName"></span>
+-          {{input type="text" class="form-control" placeholder="User Name" value=userName}}
+-        </div>
+-        <br>
+-      </div>
+-    </div>
+-  {{/if}}
+-  <div class="panel panel-default {{if isLoading 'loading-state'}}">
+-    {{#if isLoading}}
+-      <img src="assets/images/spinner.gif" alt="Loading...">
+-    {{/if}}
+-    <div class="row">
+-      <div class="col-md-12">
+-        <div class="col-md-2 savedlist-column">
+-          <label>Saved Templates</label>
+-          <div class="panel panel-default saved-list">
+-            <ul class="list-group">
+-              {{#each getSavedList as |list|}}
+-                <a href="#" class="list-group-item {{if list.active 'active'}}" {{action "updateServiceDef" list}}>
+-                  {{list.name}}
+-                  <span class="glyphicon glyphicon-remove pull-right remove-icon" {{action "removeFromSavedList" list}}></span>
+-                </a>
+-              {{else}}
+-                <li class="list-group-item align-center">No saved templates</li>
+-              {{/each}}
+-            </ul>
+-          </div>
+-        </div>
+-
+-        <div class="col-md-10 definition-column">
+-          <label>Service Definition</label>
+-          <div class="btn-group pull-right" data-toggle="buttons">
+-            <label class="btn btn-default btn-sm toggle-btn active" {{action "updateViewType" "standard"}}>
+-              <input type="radio" name="custom" checked><b>Standard</b>
+-            </label>
+-            <label class="btn btn-default btn-sm toggle-btn" {{action "updateViewType" "custom"}}>
+-              <input type="radio" name="custom"><b>Custom</b>
+-            </label>
+-          </div>
+-
+-          <div class="col-md-12 content-area">
+-            {{#if isStandardViewType}}
+-
+-              <div class="row">
+-                <div class="col-md-4">
+-                  <div class="form-group shrink-height">
+-                    <label class="required">Service Name</label>
+-                    <span class="glyphicon glyphicon-info-sign info-icon" data-info="serviceName"></span>
+-                    {{input type="text" class="form-control" placeholder="Service Name" value=serviceDef.name}}
+-                  </div>
+-                  <br>
+-                </div>
+-              </div>
+-
+-              <div class="row">
+-                <div class="col-md-4">
+-                  <div class="form-group shrink-height">
+-                    <label class="required">Queue Name</label>
+-                    <span class="glyphicon glyphicon-info-sign info-icon" data-info="queueName"></span>
+-                    {{input type="text" class="form-control" placeholder="Queue Name" value=serviceDef.queue}}
+-                  </div>
+-                  <br>
+-                </div>
+-              </div>
+-
+-              <div class="row">
+-                <div class="col-md-4">
+-                  <div class="form-group shrink-height">
+-                    <label class="required">Service Version</label>
+-                    <span class="glyphicon glyphicon-info-sign info-icon" data-info="version"></span>
+-                    {{input type="text" class="form-control" placeholder="1.0.0" value=serviceDef.version}}
+-                  </div>
+-                  <br>
+-                </div>
+-              </div>
+-
+-              <div class="row">
+-                <div class="col-md-4">
+-                  <div class="form-group">
+-                    <label>Service Lifetime</label>
+-                    <span class="glyphicon glyphicon-info-sign info-icon" data-info="lifetime"></span>
+-                    {{input type="number" min="0" class="form-control" placeholder="Service Lifetime (Seconds)" value=serviceDef.lifetime}}
+-                  </div>
+-                  <br>
+-                </div>
+-              </div>
+-
+-              <div class="row">
+-                {{service-component-table serviceDef=serviceDef applicationCtrl=applicationCtrl}}
+-              </div>
+-
+-              <div class="row">
+-                {{service-config-table serviceDef=serviceDef}}
+-              </div>
+-
+-              <div class="row">
+-                {{service-fileconfig-table serviceDef=serviceDef}}
+-              </div>
+-            {{/if}}
+-
+-            {{#if isCustomViewType}}
+-            <div class="form-group custom-json-area">
+-              {{textarea class="form-control" rows="29" cols="120" value=customServiceDef placeholder="Service JSON configuration here..."}}
+-            </div>
+-            {{/if}}
+-          </div>
+-
+-          <div class="col-md-12 action-btns">
+-            <button class="btn btn-default btn-sm" {{action "clearConfigs"}} disabled={{if isLoading "disabled"}}>
+-              Reset
+-            </button>
+-            <button class="btn btn-primary btn-sm" disabled={{unless enableSaveOrDeployBtn "disabled"}} {{action "showSaveTemplateModal"}}>
+-              Save
+-            </button>
+-            <button class="btn btn-success btn-sm" disabled={{unless enableSaveOrDeployBtn "disabled"}} {{action "deployService"}}>
+-              Deploy
+-            </button>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-
+-<div class="modal fade deploy-service-modal" tabindex="-1" role="dialog" id="saveListModal">
+-  <div class="modal-dialog" role="document">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title">Save Template As</h4>
+-      </div>
+-      <div class="modal-body">
+-        <div class="form-group">
+-          <label>Template Name</label>
+-          {{input type="text" class="form-control" id="templateNameInput" value=savedTemplateName}}
+-        </div>
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-        <button type="button" class="btn btn-primary" {{action "addToSavedList"}} disabled={{unless isValidTemplateName "disabled"}}>Add</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
+deleted file mode 100644
+index cf0b59a8311..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-html-cell.hbs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{#if content}}
+-  {{{content}}}
+-{{else}}
+-  <span class="txt-message">Not Available!</span>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-simple-status-cell.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-simple-status-cell.hbs
+deleted file mode 100644
+index 1897069ffbb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-simple-status-cell.hbs
++++ /dev/null
+@@ -1,27 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-
+-{{#if content}}
+-  <span>
+-    <i class={{lower content}} />
+-    {{statusName}}
+-  </span>
+-{{else}}
+-  <span class="txt-message"> N/A </span>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-tooltip-text.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-tooltip-text.hbs
+deleted file mode 100644
+index cf8b5d1c477..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/em-table-tooltip-text.hbs
++++ /dev/null
+@@ -1,26 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-
+-{{#if content}}
+-  <span title={{tooltipText}} class="yarn-tooltip">
+-    {{content}}
+-  </span>
+-{{else}}
+-  <span class="txt-message"> N/A </span>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/fileconfig-viewer-dialog.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/fileconfig-viewer-dialog.hbs
+deleted file mode 100644
+index 1420340716c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/fileconfig-viewer-dialog.hbs
++++ /dev/null
+@@ -1,53 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="modal fade" tabindex="-1" role="dialog" id="{{dialogId}}">
+-  <div class="modal-dialog" role="document" style="width: 700px;">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title bold-text">{{title}}</h4>
+-      </div>
+-      <div class="modal-body" style="padding: 0;">
+-        <table class="table table-hover table-custom-bordered table-custom-striped fix-table-overflow" style="max-width: 700px;">
+-          <thead>
+-            <tr>
+-              <th>Name</th>
+-              <th>Value</th>
+-            </tr>
+-          </thead>
+-          <tbody>
+-            {{#each customProps as |prop|}}
+-              <tr>
+-                <td>{{prop.name}}</td>
+-                <td title="{{prop.value}}">{{prop.value}}</td>
+-              </tr>
+-            {{else}}
+-              <tr>
+-                <td colspan="2">No data available</td>
+-              </tr>
+-            {{/each}}
+-          </tbody>
+-        </table>
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/info-tooltip.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/info-tooltip.hbs
+deleted file mode 100644
+index faba135f647..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/info-tooltip.hbs
++++ /dev/null
+@@ -1,20 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<span class="glyphicon glyphicon-triangle-top top-arrow"></span>
+-<div id="tooltip_content"></div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs
+deleted file mode 100644
+index 0f0156a8862..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/metrics-table.hbs
++++ /dev/null
+@@ -1,55 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{#if metrics}}
+-  <div class="row">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        <div class="panel-title">{{type}} Metrics:</div>
+-      </div>
+-      <div class="">
+-        <table class="table table-hover table-custom-bordered table-custom-stripped table-radius-none table-border-none">
+-          <thead>
+-            <tr>
+-              <th>Desired Containers</th>
+-              <th>Running Containers</th>
+-              <th>Ready Containers</th>
+-              <th>Failed Containers</th>
+-              <th>Preempted Containers</th>
+-            </tr>
+-          </thead>
+-          <tbody>
+-            <tr>
+-              <td>{{metrics.ContainersDesired}}</td>
+-              <td>{{metrics.ContainersRunning}}</td>
+-              <td>{{metrics.ContainersReady}}</td>
+-              <td>{{metrics.ContainersFailed}}</td>
+-              <td>{{metrics.ContainersPreempted}}</td>
+-            </tr>
+-          </tbody>
+-        </table>
+-      </div>
+-    </div>
+-  </div>
+-{{else}}
+-  <div class="row">
+-    <div class="panel panel-default">
+-      <h4 class="text-center">No {{type}} metrics available!</h4>
+-    </div>
+-  </div>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs
+deleted file mode 100644
+index ba48952a3e3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs
++++ /dev/null
+@@ -1,50 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-2 container-fluid">
+-  <div class="panel panel-default">
+-    <div class="panel-heading">
+-       <h4>Node Manager</h4>
+-    </div>
+-      <div class="panel-body">
+-        <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+-          <ul class="nav nav-pills nav-stacked collapse in">
+-            {{#link-to 'yarn-node.info' tagName="li"}}
+-              {{#link-to 'yarn-node.info' nodeId encodedAddr}}Node Information
+-              {{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-node-apps' tagName="li"}}
+-              {{#link-to 'yarn-node-apps' nodeId encodedAddr}}List of Applications on this Node
+-              {{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-node-containers' tagName="li"}}
+-              {{#link-to 'yarn-node-containers' nodeId encodedAddr}}List of Containers on this Node
+-              {{/link-to}}
+-            {{/link-to}}
+-            {{#if (and nmGpuInfo nmGpuInfo.info.totalGpuDevices)}}
+-              {{#link-to 'yarn-node.yarn-nm-gpu' tagName="li"}}
+-                {{#link-to 'yarn-node.yarn-nm-gpu' nodeId encodedAddr }}GPU Information
+-                {{/link-to}}
+-              {{/link-to}}
+-            {{/if}}
+-          </ul>
+-        </ul>
+-      </div>
+-    </div>
+-  </div>
+-{{outlet}}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
+deleted file mode 100644
+index d1ac8e7a30f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/nodes-heatmap.hbs
++++ /dev/null
+@@ -1,27 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row clearfix">
+-  <div class="col-md-6">
+-    <input type="text" class="form-control" aria-label="..." placeholder="Enter part of host/rack to filter nodes"
+-            onchange={{action "applyFilter"}}>
+-  </div>
+-  <div class="col-md-6">
+-    <select id="heatmap-select" class="form-control"></select>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
+deleted file mode 100644
+index b063aae8eda..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/queue-navigator.hbs
++++ /dev/null
+@@ -1,47 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<!-- queue selector -->
+-<div class="row">
+-  <div class="col-md-12 container-fluid">
+-    <div class="panel panel-default" id="tree-selector-container">
+-      <div class="panel-heading">
+-        {{#if filteredPartition}}
+-           {{model.firstObject.type}} scheduler - Showing queues from partition {{lower filteredPartition}}
+-        {{else}}
+-          {{model.firstObject.type}} scheduler - Showing queues from all partitions
+-        {{/if}}
+-      </div>
+-       {{#if (eq model.firstObject.type "capacity")}}
+-       <div class="flex">
+-        <div class="filter-partitions flex-right">
+-          <label><i class="glyphicon glyphicon-filter"/> Partitions: </label>
+-            <select onchange={{action "filterQueuesByPartition" value="target.value"}} class="form-control js-filter-queue-by-labels">
+-              {{#each model.firstObject.partitions as |part|}}
+-                <option value={{part}}>{{part}}</option>
+-              {{/each}}
+-            </select>
+-        </div>
+-       </div>
+-      {{/if}}
+-     {{tree-selector model=model parentId="tree-selector-container" selected=selected used=used max=max filteredPartition=filteredPartition}}
+-    </div>
+-  </div>
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
+deleted file mode 100644
+index 05a7451f4c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
++++ /dev/null
+@@ -1,107 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  <div class="form-group">
+-    <label>Service Components</label>
+-    <span class="glyphicon glyphicon-info-sign info-icon" data-info="components"></span>
+-    <button class="btn btn-primary btn-xs pull-right" {{action "showAddComponentModal"}}>
+-      <span class="glyphicon glyphicon-plus"></span>
+-    </button>
+-    <div class="panel panel-default">
+-      <table class="table table-hover table-custom-bordered table-custom-striped table-custom-action">
+-        <thead>
+-          <tr>
+-            <th>Component Name</th>
+-            <th>CPU</th>
+-            <th>Memory</th>
+-            <th># Containers</th>
+-            <th>Artifact Id</th>
+-            <th>Launch Command</th>
+-            <th></th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#each serviceDef.serviceComponents as |component|}}
+-            <tr>
+-              <td>{{component.name}}</td>
+-              <td>{{component.cpus}}</td>
+-              <td>{{component.memory}}</td>
+-              <td>{{component.numOfContainers}}</td>
+-              <td>{{component.artifactId}}</td>
+-              <td>{{component.launchCommand}}</td>
+-              <td class="align-center">
+-                <span class="glyphicon glyphicon-remove remove-icon" {{action "removeComponent" component}}></span>
+-              </td>
+-            </tr>
+-          {{else}}
+-            <tr class="align-center">
+-              <td colspan="7">No data available</td>
+-            </tr>
+-          {{/each}}
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-</div>
+-
+-<div class="modal fade deploy-service-modal" tabindex="-1" role="dialog" id="addComponentModal">
+-  <div class="modal-dialog" role="document">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title">Add Component</h4>
+-      </div>
+-      <div class="modal-body">
+-        {{#if duplicateNameError}}
+-          <div class="alert alert-danger alert-dismissible" role="alert">
+-            <strong>Component name already exists</strong>
+-          </div>
+-        {{/if}}
+-        <div class="form-group">
+-          <label class="required">Component Name</label>
+-          {{input type="text" class="form-control" value=currentComponent.name}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">CPU</label>
+-          {{input type="number" min="0" class="form-control" value=currentComponent.cpus}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">Memory</label>
+-          {{input type="number" min="0" class="form-control" value=currentComponent.memory}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required"># Containers</label>
+-          {{input type="number" min="0" class="form-control" value=currentComponent.numOfContainers}}
+-        </div>
+-        <div class="form-group">
+-          <label>Artifact Id</label>
+-          {{input type="text" class="form-control" value=currentComponent.artifactId}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">Launch Command</label>
+-          {{input type="text" class="form-control" value=currentComponent.launchCommand}}
+-        </div>
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-        <button type="button" class="btn btn-primary" {{action "addNewComponent"}} disabled={{unless isValidCurrentComponent "disabled"}}>Add</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-config-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-config-table.hbs
+deleted file mode 100644
+index 46a66ee1665..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-config-table.hbs
++++ /dev/null
+@@ -1,130 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  <div class="form-group">
+-    <label>Service Configurations</label>
+-    <span class="glyphicon glyphicon-info-sign info-icon" data-info="configurations"></span>
+-    <button class="btn btn-primary btn-xs pull-right" {{action "showNewConfigurationModal"}}>
+-      <span class="glyphicon glyphicon-plus"></span>
+-    </button>
+-    <button class="btn btn-primary btn-xs pull-right" style="margin-right: 5px;" {{action "showServiceConfigUploadModal"}}>
+-      <span class="glyphicon glyphicon-open"></span>
+-    </button>
+-    <div class="panel panel-default">
+-      <table class="table table-hover table-custom-bordered table-custom-striped table-custom-action">
+-        <thead>
+-          <tr>
+-            <th>Name</th>
+-            <th>Value</th>
+-            <th>Type</th>
+-            <th>Scope</th>
+-            <th></th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#each serviceDef.serviceConfigs as |config|}}
+-            <tr>
+-              <td>{{config.name}}</td>
+-              <td>{{config.value}}</td>
+-              <td>{{config.capitalizedType}}</td>
+-              <td>{{config.formattedScope}}</td>
+-              <td>
+-                <span class="glyphicon glyphicon-remove remove-icon" {{action "removeConfiguration" config}}></span>
+-              </td>
+-            </tr>
+-          {{else}}
+-            <tr class="align-center">
+-              <td colspan="5">No data available</td>
+-            </tr>
+-          {{/each}}
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-</div>
+-
+-<div class="modal fade deploy-service-modal" tabindex="-1" role="dialog" id="addConfigurationModal">
+-  <div class="modal-dialog" role="document">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title bold-text">Add Configuration</h4>
+-      </div>
+-      <div class="modal-body">
+-        <div class="form-group">
+-          <label class="required">Name</label>
+-          {{input type="text" class="form-control" value=currentConfig.name}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">Value</label>
+-          {{input type="text" class="form-control" value=currentConfig.value}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">Type</label>
+-          <div>
+-            <label class="radio-inline">
+-              <input type="radio" name="type" value="property" checked={{eq currentConfig.type "property"}} onchange={{action "configTypeChanged" "property"}}>Property
+-            </label>
+-            <label class="radio-inline">
+-              <input type="radio" name="type" value="env" checked={{eq currentConfig.type "env"}} onchange={{action "configTypeChanged" "env"}}>Env
+-            </label>
+-            <label class="radio-inline">
+-              <input type="radio" name="type" value="quicklink" checked={{eq currentConfig.type "quicklink"}} onchange={{action "configTypeChanged" "quicklink"}}>Quicklink
+-            </label>
+-          </div>
+-        </div>
+-        {{#if isNotQuicklink}}
+-          <div class="form-group">
+-            <label class="required">Scope</label>
+-            <div>
+-              <label class="radio-inline">
+-                <input type="radio" name="scope" value="service" checked={{eq currentConfig.scope "service"}} onchange={{action "configScopeChanged" "service"}}>Service
+-              </label>
+-              {{#if isNonEmptyComponents}}
+-                <label class="radio-inline">
+-                  <input type="radio" name="scope" value="component" checked={{eq currentConfig.scope "component"}} onchange={{action "configScopeChanged" "component"}}>Component
+-                </label>
+-              {{/if}}
+-            </div>
+-          </div>
+-          {{#if (eq currentConfig.scope "component")}}
+-            <div class="form-group">
+-              <select class="form-control" onchange={{action "scopeComponentChanged" value="target.value"}}>
+-                {{#each componentNames as |name|}}
+-                  <option value="{{name}}" selected={{eq currentConfig.componentName name}}>{{name}}</option>
+-                {{/each}}
+-              </select>
+-            </div>
+-          {{/if}}
+-        {{/if}}
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-        <button type="button" class="btn btn-primary" {{action "addNewConfiguration"}} disabled={{unless isValidCurrentConfig "disabled"}}>Add</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-
+-{{upload-config
+-  dialogId="service_config_upload_modal"
+-  title="Upload Service Configurations"
+-  configJson=serviceConfigJson
+-  uploadConfig="uploadServiceConfig"
+-}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-fileconfig-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-fileconfig-table.hbs
+deleted file mode 100644
+index 97442c6f6ce..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-fileconfig-table.hbs
++++ /dev/null
+@@ -1,152 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  <div class="form-group">
+-    <label>File Configurations</label>
+-    <span class="glyphicon glyphicon-info-sign info-icon" data-info="fileConfigs"></span>
+-    <button class="btn btn-primary btn-xs pull-right" {{action "showNewConfigFileModal"}}>
+-      <span class="glyphicon glyphicon-plus"></span>
+-    </button>
+-    <button class="btn btn-primary btn-xs pull-right" style="margin-right: 5px;" {{action "showFileConfigUploadModal"}}>
+-      <span class="glyphicon glyphicon-open"></span>
+-    </button>
+-    <div class="panel panel-default">
+-      <table class="table table-hover table-custom-bordered table-custom-striped table-custom-action">
+-        <thead>
+-          <tr>
+-            <th>Source File</th>
+-            <th>Properties</th>
+-            <th>Destination File</th>
+-            <th>Type</th>
+-            <th>Scope</th>
+-            <th></th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#each serviceDef.fileConfigs as |file|}}
+-            <tr>
+-              <td>
+-                {{#if file.srcFile}}
+-                  {{file.srcFile}}
+-                {{else}}
+-                  <span>N/A</span>
+-                {{/if}}
+-              </td>
+-              <td>
+-                {{#if file.props}}
+-                  <a href="#" {{action "showFileConfigPropertyViewer" file.props}}>View Properties</a>
+-                {{else}}
+-                  <span>N/A</span>
+-                {{/if}}
+-              </td>
+-              <td>{{file.destFile}}</td>
+-              <td>{{file.type}}</td>
+-              <td>{{file.formattedScope}}</td>
+-              <td class="align-center">
+-                <span class="glyphicon glyphicon-remove remove-icon" {{action "removeFileConfiguration" file}}></span>
+-              </td>
+-            </tr>
+-          {{else}}
+-            <tr class="align-center">
+-              <td colspan="6">No data available</td>
+-            </tr>
+-          {{/each}}
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-</div>
+-
+-<div class="modal fade deploy-service-modal" tabindex="-1" role="dialog" id="addFileConfigModal">
+-  <div class="modal-dialog" role="document" style="width: 500px;">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title bold-text">Add File Configuration</h4>
+-      </div>
+-      <div class="modal-body">
+-        {{#if parseError}}
+-          <div class="alert alert-danger alert-dismissible" role="alert">
+-            <strong>{{parseError}}</strong>
+-          </div>
+-        {{/if}}
+-        <div class="form-group">
+-          <label class="required">Type</label>
+-          <div>
+-            <label class="radio-inline">
+-              <input type="radio" name="type" value="TEMPLATE" checked={{eq currentFileConfig.type "TEMPLATE"}} onchange={{action "configTypeChanged" "TEMPLATE"}}>TEMPLATE
+-            </label>
+-            <label class="radio-inline">
+-              <input type="radio" name="type" value="HADOOP_XML" checked={{eq currentFileConfig.type "HADOOP_XML"}} onchange={{action "configTypeChanged" "HADOOP_XML"}}>HADOOP_XML
+-            </label>
+-          </div>
+-        </div>
+-        <div class="form-group">
+-          <label class={{unless isConfigTypeHadoopXml "required"}}>Source File</label>
+-          {{input type="text" class="form-control" value=currentFileConfig.srcFile}}
+-        </div>
+-        {{#if isConfigTypeHadoopXml}}
+-          <div class="form-group">
+-            <label>Properties</label> <span>(Source File and/or Properties are required)</span>
+-            {{textarea class="form-control" rows="15" value=fileConfigProps placeholder="Configuration file properties here..."}}
+-          </div>
+-        {{/if}}
+-        <div class="form-group">
+-          <label class="required">Destination File</label>
+-          {{input type="text" class="form-control" value=currentFileConfig.destFile}}
+-        </div>
+-        <div class="form-group">
+-          <label class="required">Scope</label>
+-          <div>
+-            <label class="radio-inline">
+-              <input type="radio" name="scope" value="service" checked={{eq currentFileConfig.scope "service"}} onchange={{action "configScopeChanged" "service"}}>Service
+-            </label>
+-            {{#if isNonEmptyComponents}}
+-              <label class="radio-inline">
+-                <input type="radio" name="scope" value="component" checked={{eq currentFileConfig.scope "component"}} onchange={{action "configScopeChanged" "component"}}>Component
+-              </label>
+-            {{/if}}
+-          </div>
+-        </div>
+-        {{#if (eq currentFileConfig.scope "component")}}
+-          <div class="form-group">
+-            <select class="form-control" onchange={{action "scopeComponentChanged" value="target.value"}}>
+-              {{#each componentNames as |name|}}
+-                <option value="{{name}}" selected={{eq currentFileConfig.componentName name}}>{{name}}</option>
+-              {{/each}}
+-            </select>
+-          </div>
+-        {{/if}}
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-        <button type="button" class="btn btn-primary" {{action "addNewFileConfig"}} disabled={{unless isValidCurrentFileConfig "disabled"}}>Add</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-
+-{{upload-config
+-  dialogId="service_file_config_upload_modal"
+-  title="Upload File Configurations"
+-  configJson=fileConfigJson
+-  uploadConfig="uploadFileConfig"
+-}}
+-
+-{{fileconfig-viewer-dialog dialogId="file_config_properties_viewer" props=propertyViewer}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
+deleted file mode 100644
+index c358ce557f2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/timeline-view.hbs
++++ /dev/null
+@@ -1,83 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  <div class="panel panel-default">
+-    <div class="panel-heading">
+-      {{#if attemptModel}}
+-        Application Attempts
+-      {{else}}
+-        Containers
+-      {{/if}}
+-    </div>
+-    <ul class="nav nav-tabs" role="tablist">
+-      <li class="{{if (eq viewType "graph") "active" ""}}">
+-        <a href="#graphViewTab" role="tab" data-toggle="tab" {{action "changeViewType" "graph"}}>Graph View</a>
+-      </li>
+-      <li class="{{if (eq viewType "grid") "active" ""}}">
+-        <a href="#gridViewTab" role="tab" data-toggle="tab" {{action "changeViewType" "grid"}}>Grid View</a>
+-      </li>
+-    </ul>
+-    <div class="panel-body">
+-      <div class="tab-content">
+-        <div role="tabpanel" class="tab-pane {{if (eq viewType "graph") "active" ""}}" id="graphViewTab">
+-          <br/><br/>
+-          <div class="row">
+-            <div class="col-md-7 container-fluid" id={{parent-id}}></div>
+-            <!-- diag info -->
+-            <div class="col-md-5 container-fluid">
+-              <div class="panel panel-default add-ellipsis attempt-info-panel">
+-                <div class="panel-heading">
+-                  {{#if selected.link}}
+-                    {{#link-to selected.linkname selected.id (query-params service=serviceName)}}{{selected.id}}{{/link-to}}
+-                  {{else}}
+-                    {{selected.id}}
+-                  {{/if}}
+-                </div>
+-                {{#if attemptModel}}
+-                  {{app-attempt-table attempt=selected}}
+-                {{else}}
+-                  {{container-table container=selected requestedUser=requestedUser}}
+-                {{/if}}
+-              </div>
+-            </div>
+-          </div>
+-          {{#unless attemptModel}}
+-            {{#if selected.diagnosticsInfo}}
+-            <div class="row">
+-              <div class="col-md-12">
+-                <div class="panel panel-default">
+-                  <div class="panel-heading">
+-                    Diagnostic Info for {{selected.id}}
+-                  </div>
+-                  <div class="diagnostic-info">
+-                    <pre>{{selected.diagnosticsInfo}}</pre>
+-                  </div>
+-                </div>
+-              </div>
+-            </div>
+-            {{/if}}
+-          {{/unless}}
+-        </div>
+-        <div role="tabpanel" class="tab-pane {{if (eq viewType "grid") "active" ""}}" id="gridViewTab">
+-          {{em-table columns=gridColumns rows=gridRows definition=tableDefinition}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/upload-config.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/upload-config.hbs
+deleted file mode 100644
+index 045fb0f1bbb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/upload-config.hbs
++++ /dev/null
+@@ -1,44 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="modal fade" tabindex="-1" role="dialog" id="{{dialogId}}">
+-  <div class="modal-dialog" role="document">
+-    <div class="modal-content">
+-      <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+-        <h4 class="modal-title bold-text">{{title}}</h4>
+-      </div>
+-      <div class="modal-body">
+-        <div class="form-group">
+-          {{textarea class="form-control" rows="20" cols="100" value=configJson placeholder="JSON Configuration Here..."}}
+-        </div>
+-        {{#if isParseError}}
+-          <div class="panel panel-default">
+-            <div class="panel-body bg-danger">
+-              <strong>{{parseErrorMsg}}</strong>
+-            </div>
+-          </div>
+-        {{/if}}
+-      </div>
+-      <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+-        <button type="button" class="btn btn-primary" {{action "uploadConfig"}} disabled={{unless isValidConfigJson "disabled"}}>Upload</button>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-nm-gpu-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-nm-gpu-info.hbs
+deleted file mode 100644
+index 4118b1e7c81..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-nm-gpu-info.hbs
++++ /dev/null
+@@ -1,69 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="panel panel-default">
+-  <div class="panel-heading">Gpu Information - (Minor
+-    Number {{gpu.minorNumber}})
+-  </div>
+-  <table class="table">
+-    <tbody>
+-    <tr>
+-      <td>Product Name</td>
+-      <td>{{gpu.productName}}</td>
+-    </tr>
+-    <tr>
+-      <td>UUID</td>
+-      <td>{{gpu.uuid}}</td>
+-    </tr>
+-    <tr>
+-      <td>Current Temperature</td>
+-      <td>{{gpu.temperature.currentGpuTemp}}</td>
+-    </tr>
+-    <tr>
+-      <td>Max Temperature</td>
+-      <td>{{gpu.temperature.maxGpuTemp}}</td>
+-    </tr>
+-    </tbody>
+-  </table>
+-
+-  <div class="col-md-5 container-fluid" id="mem-donut-chart{{gpu.minorNumber}}">
+-    {{gpu-donut-chart gpuInfo=gpu
+-                      showLabels=true
+-                      parentId="mem-donut-chart"
+-                      middleLabel = "Gpu Memory"
+-                      ratio=0.6
+-                      type="memory"
+-                      gpu-render-type = "gpu-memory"
+-                      colorTargets="good"
+-                      colorTargetReverse=true
+-                      maxHeight=350}}
+-  </div>
+-
+-  <div class="col-md-5 container-fluid" id="utilization-donut-chart{{gpu.minorNumber}}">
+-    {{gpu-donut-chart gpuInfo=gpu
+-                      showLabels=true
+-                      parentId="utilization-donut-chart"
+-                      middleLabel = "Gpu Utilization"
+-                      ratio=0.6
+-                      gpu-render-type = "gpu-utilization"
+-                      colorTargets="good"
+-                      colorTargetReverse=true
+-                      suffix="%"
+-                      maxHeight=350}}
+-  </div>
+-</div>
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
+deleted file mode 100644
+index a84538da8d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue-partition-capacity-labels.hbs
++++ /dev/null
+@@ -1,74 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="top-1">
+-  <span class="yarn-label primary">
+-    <span class="label-key">absolute used</span>
+-    <span class="label-value">{{data.absoluteUsedCapacity}}%</span>
+-  </span>
+-  <span class="yarn-label primary">
+-    <span class="label-key">absolute capacity</span>
+-    <span class="label-value">{{data.absoluteCapacity}}%</span>
+-  </span>
+-  <span class="yarn-label secondary">
+-    <span class="label-key">absolute max capacity</span>
+-    <span class="label-value">{{data.absoluteMaxCapacity}}%</span>
+-  </span>
+-</div>
+-{{#if data.isWeightMode}}
+-<div class="top-1">
+-  <span class="yarn-label secondary">
+-    <span class="label-key">weight</span>
+-    <span class="label-value">{{data.weight}}</span>
+-  </span>
+-  <span class="yarn-label secondary">
+-    <span class="label-key">normalized weight</span>
+-    <span class="label-value">{{data.normalizedWeight}}</span>
+-  </span>
+-</div>
+-{{else}}
+-<div class="top-1">
+-  <span class="yarn-label secondary">
+-    <span class="label-key">configured capacity</span>
+-    <span class="label-value">{{data.capacity}}%</span>
+-  </span>
+-  <span class="yarn-label secondary">
+-    <span class="label-key">configured max capacity</span>
+-    <span class="label-value">{{data.maxCapacity}}%</span>
+-  </span>
+-</div>
+-{{/if}}
+-{{#if data.isLeafQueue}}
+-<div class="top-1">
+-  <span class="yarn-label secondary">
+-    <span class="label-key">user limit</span>
+-    <span class="label-value">{{data.userLimit}}%</span>
+-  </span>
+-  <span class="yarn-label secondary">
+-    <span class="label-key">user limit factor</span>
+-    <span class="label-value">{{data.userLimitFactor}}</span>
+-  </span>
+-</div>
+-{{/if}}
+-{{#if data.isFlexibleDynamicQueue}}
+-<div class="top-1">
+-  <span class="yarn-label secondary">
+-    <span class="label-key">flexible dynamic queue</span>
+-  </span>
+-</div>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
+deleted file mode 100644
+index a04a26d8007..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-conf-table.hbs
++++ /dev/null
+@@ -1,56 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+-  <thead>
+-    <tr>
+-      <td><b>Configurations</b></td>
+-      <td><b>Value</b></td>
+-    </tr>
+-  </thead>
+-  <tbody>
+-    <tr>
+-      <td>Configured Capacity</td>
+-      <td>{{queue.capacity}}</td>
+-    </tr>
+-    <tr>
+-      <td>Configured Max Capacity</td>
+-      <td>{{queue.maxCapacity}}</td>
+-    </tr>
+-  {{#if queue.state}}
+-    <tr>
+-      <td>State</td>
+-      <td>{{queue.state}}</td>
+-    </tr>
+-  {{/if}}
+-  {{#if queue.isLeafQueue}}
+-    <tr>
+-      <td>User Limit Percent</td>
+-      <td>{{queue.userLimit}}</td>
+-    </tr>
+-    <tr>
+-      <td>User Limit Factor</td>
+-      <td>{{queue.userLimitFactor}}</td>
+-    </tr>
+-    <tr>
+-      <td>Preemption Disabled</td>
+-      <td>{{queue.preemptionDisabled}}</td>
+-    </tr>
+-  {{/if}}
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
+deleted file mode 100644
+index 11fed76a96f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs
++++ /dev/null
+@@ -1,53 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div>
+-  <div class="col-lg-6">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Running Apps From All Users: {{model.selected}}
+-      </div>
+-      <div id="numapplications-donut-chart">
+-        {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+-        showLabels=true
+-        parentId="numapplications-donut-chart"
+-        ratio=0.6
+-        maxHeight=350}}
+-      </div>
+-    </div>
+-  </div>
+-
+-  {{#if model.selectedQueue.hasUserUsages}}
+-    <div class="col-lg-6">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          User Usages: {{model.selected}}
+-        </div>
+-        <div id="userusage-donut-chart">
+-          {{donut-chart data=model.selectedQueue.userUsagesDonutChartData
+-          showLabels=true
+-          parentId="userusage-donut-chart"
+-          type="memory"
+-          ratio=0.6
+-          maxHeight=350}}
+-        </div>
+-      </div>
+-    </div>
+-  {{/if}}
+-
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
+deleted file mode 100644
+index 6615b1dbd4a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs
++++ /dev/null
+@@ -1,46 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{queue-navigator model=model.queues selected=model.selected
+-  used="usedCapacity" max="absMaxCapacity" setFilter=(action setFilter)}}
+-
+-<div class="yarn-compose-box yarn-queues-container">
+-  <div>
+-    <h3>
+-      <a href="#/yarn-queue/{{model.selected}}/apps">
+-        {{model.selected}}
+-      </a>
+-    </h3>
+-    {{#if model.selectedQueue.state}}
+-      <div>
+-        {{em-table-simple-status-cell content=model.selectedQueue.state}}
+-      </div>
+-    {{/if}}
+-
+-    {{yarn-queue-partition-capacity-labels partitionMap=model.selectedQueue.partitionMap queue=model.selectedQueue filteredPartition=filteredPartition}}
+-  </div>
+-
+-  <h5> Running Apps From All Users in Queue </h5>
+-  <div id="numapplications-donut-chart">
+-    {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+-    showLabels=true
+-    parentId="numapplications-donut-chart"
+-    ratio=0.6
+-    maxHeight=350}}
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
+deleted file mode 100644
+index fba7a55ebad..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-conf-table.hbs
++++ /dev/null
+@@ -1,52 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+-  <thead>
+-    <tr>
+-      <td><b>Configurations</b></td>
+-      <td><b>Value</b></td>
+-    </tr>
+-  </thead>
+-  <tbody>
+-    <tr>
+-      <td>Fair Memory, VCores</td>
+-      <td>{{queue.fairResources.memory}} MB, {{queue.fairResources.vCores}}</td>
+-    </tr>
+-    <tr>
+-      <td>Minimum Memory, VCores</td>
+-      <td>{{queue.minResources.memory}} MB, {{queue.minResources.vCores}}</td>
+-    </tr>
+-    <tr>
+-      <td>Cluster Memory, VCores</td>
+-      <td>{{queue.clusterResources.memory}} MB, {{queue.clusterResources.vCores}}</td>
+-    </tr>
+-    <tr>
+-      <td>Pending, Allocated, Reserved Containers</td>
+-      <td>{{#if queue.pendingContainers}}{{queue.pendingContainers}}{{else}}0{{/if}}, {{#if queue.allocatedContainers}}{{queue.allocatedContainers}}{{else}}0{{/if}}, {{#if queue.reservedContainers}}{{queue.reservedContainers}}{{else}}0{{/if}}</td>
+-    </tr>
+-    <tr>
+-      <td>Scheduling Policy</td>
+-      <td>{{queue.schedulingPolicy}}</td>
+-    </tr>
+-    <tr>
+-      <td>Preemption Enabled</td>
+-      <td>{{queue.preemptable}}</td>
+-    </tr>
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
+deleted file mode 100644
+index 3e368ae9cfb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs
++++ /dev/null
+@@ -1,66 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-
+-  <div class="col-lg-6 container-fluid">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Queue Capacities: {{model.selected}}
+-      </div>
+-      <div class="container-fluid" id="capacity-bar-chart">
+-        <br/>
+-        {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+-        title=""
+-        parentId="capacity-bar-chart"
+-        textWidth=170
+-        ratio=0.55
+-        maxHeight=350}}
+-      </div>
+-    </div>
+-  </div>
+-
+-  <div class="col-lg-6 container-fluid">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Queue Information: {{model.selected}}
+-      </div>
+-        {{yarn-queue.fair-queue-conf-table queue=model.selectedQueue}}
+-    </div>
+-  </div>
+-
+-</div>
+-
+-<div class="row">
+-
+-    <div class="col-lg-6 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Running Apps From All Users: {{model.selected}}
+-        </div>
+-        <div class="container-fluid" id="numapplications-donut-chart">
+-          {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+-          showLabels=true
+-          parentId="numapplications-donut-chart"
+-          ratio=0.6
+-          maxHeight=350}}
+-        </div>
+-      </div>
+-    </div>
+-
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
+deleted file mode 100644
+index 4ef22fc3ee2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs
++++ /dev/null
+@@ -1,77 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{queue-navigator model=model.queues selected=model.selected
+-  used="usedResources.memory" max="clusterResources.memory"}}
+-
+-<div class="yarn-compose-box">
+-  <div class="panel-heading">
+-    Queue Information: {{model.selected}}
+-  </div>
+-  <div class="panel-body">
+-    <div class="container-fluid">
+-        <div class="panel panel-default">
+-          <div class="panel-heading">
+-              Queue details for {{model.selected}}
+-          </div>
+-          <div class="panel-body">
+-            <a href="#/yarn-queue/{{model.selected}}/apps">
+-              {{model.selected}}
+-            </a>
+-          </div>
+-        </div>
+-    </div>
+-    <div class="container-fluid">
+-      <div class="panel panel-default">
+-          {{yarn-queue.fair-queue-conf-table queue=model.selectedQueue}}
+-      </div>
+-    </div>
+-
+-    <div class="container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Queue Capacities: {{model.selected}}
+-        </div>
+-        <div class="container-fluid" id="capacity-bar-chart">
+-          <br/>
+-          {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+-          title=""
+-          parentId="capacity-bar-chart"
+-          textWidth=175
+-          ratio=0.55
+-          maxHeight=350}}
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Running Apps From All Users: {{model.selected}}
+-        </div>
+-        <div class="container-fluid" id="numapplications-donut-chart">
+-          {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData
+-          showLabels=true
+-          parentId="numapplications-donut-chart"
+-          ratio=0.6
+-          maxHeight=350}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
+deleted file mode 100644
+index f6f467ff390..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-conf-table.hbs
++++ /dev/null
+@@ -1,58 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<table id="queue-configuration-table" class="table table-striped table-bordered" cellspacing="0" width="100%" height="100%">
+-  <thead>
+-    <tr>
+-      <td><b>Configurations</b></td>
+-      <td><b>Value</b></td>
+-    </tr>
+-  </thead>
+-  <tbody>
+-    <tr>
+-      <td>Configured Capacity</td>
+-      <td>{{queue.capacity}}</td>
+-    </tr>
+-    <tr>
+-      <td>Used Capacity</td>
+-      <td>{{queue.usedCapacity}}</td>
+-    </tr>
+-  {{#if queue.state}}
+-    <tr>
+-      <td>State</td>
+-      <td>{{queue.state}}</td>
+-    </tr>
+-  {{/if}}
+-    <tr>
+-      <td>Minimum Queue Memory Capacity</td>
+-      <td>{{queue.minQueueMemoryCapacity}}</td>
+-    </tr>
+-    <tr>
+-      <td>Maximum Queue Memory Capacity</td>
+-      <td>{{queue.maxQueueMemoryCapacity}}</td>
+-    </tr>
+-    <tr>
+-      <td>Number of Nodes</td>
+-      <td>{{queue.numNodes}}</td>
+-    </tr>
+-    <tr>
+-      <td>Number of Containers</td>
+-      <td>{{queue.numContainers}}</td>
+-    </tr>
+-  </tbody>
+-</table>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
+deleted file mode 100644
+index 7f4e8a7996a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue-info.hbs
++++ /dev/null
+@@ -1,47 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-
+-  <div class="col-lg-6 container-fluid">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Queue Capacities: {{model.selected}}
+-      </div>
+-      <div class="container-fluid" id="capacity-bar-chart">
+-        <br/>
+-        {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+-        title=""
+-        parentId="capacity-bar-chart"
+-        textWidth=170
+-        ratio=0.55
+-        maxHeight=350}}
+-      </div>
+-    </div>
+-  </div>
+-
+-  <div class="col-lg-6 container-fluid">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Queue Information: {{model.selected}}
+-      </div>
+-        {{yarn-queue.fifo-queue-conf-table queue=model.selectedQueue}}
+-    </div>
+-  </div>
+-
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
+deleted file mode 100644
+index 98db5cb4153..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fifo-queue.hbs
++++ /dev/null
+@@ -1,49 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{queue-navigator model=model.queues selected=model.selected
+-  used="usedNodeCapacity" max="totalNodeCapacity"}}
+-
+-<div class="yarn-compose-box">
+-  <div class="panel-heading">
+-    Queue Information: {{model.selected}}
+-  </div>
+-  <div class="panel-body">
+-    <div class="container-fluid">
+-      <div class="panel panel-default">
+-          {{yarn-queue.fifo-queue-conf-table queue=model.selectedQueue}}
+-      </div>
+-    </div>
+-    <div class="container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Queue Capacities: {{model.selected}}
+-        </div>
+-        <div class="container-fluid" id="capacity-bar-chart">
+-          <br/>
+-          {{bar-chart data=model.selectedQueue.capacitiesBarChartData
+-          title=""
+-          parentId="capacity-bar-chart"
+-          textWidth=175
+-          ratio=0.55
+-          maxHeight=350}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/error.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/error.hbs
+deleted file mode 100644
+index aace3c747d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/error.hbs
++++ /dev/null
+@@ -1,19 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<h3 align = "center">Sorry, error occurred.</h3>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
+deleted file mode 100644
+index a95af2bdb39..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/loading.hbs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="loading-mask">
+-    <img src="assets/images/spinner.gif" alt="Loading...">
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notauth.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notauth.hbs
+deleted file mode 100644
+index cdf93100d1c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notauth.hbs
++++ /dev/null
+@@ -1,20 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<h2 align = "center">401, Authorization required.</h2>
+-<h4 align = "center">Please check your security settings.</h4>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notfound.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notfound.hbs
+deleted file mode 100644
+index 8f60a2bd5c6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/notfound.hbs
++++ /dev/null
+@@ -1,20 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<h2 align = "center">404, Not Found</h2>
+-<h4 align = "center">Please check your URL</h4>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
+deleted file mode 100644
+index e33c77c8097..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/timeline-error.hbs
++++ /dev/null
+@@ -1,22 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{#if model.isValidErrorCode}}
+-  <h3 class="text-center text-danger">{{model.errorCode}}: {{model.errorType}}</h3>
+-{{/if}}
+-<h2 class="text-center text-danger">Timeline server failed with an error</h2>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
+deleted file mode 100644
+index 05d2f21b493..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app-attempt.hbs
++++ /dev/null
+@@ -1,117 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="row container-fluid">
+-
+-  <div class="col-md-12">
+-    <div class="row container-fluid">
+-      {{#if model.attempt}}
+-        <div class="panel panel-default">
+-          <div class="panel-body">
+-            <div class="flex">
+-              <div>
+-                <h3 class="top-2">{{model.attempt.id}}</h3>
+-                <div class="muted-text">{{model.attempt.appMasterContainerId}}</div>
+-                {{#if model.attempt.attemptState}}
+-                  {{em-table-simple-status-cell class="top-1" content=model.attempt.attemptState}}
+-                {{/if}}
+-                {{#if (or model.attempt.attemptStartedTime model.attempt.validatedFinishedTs)}}
+-                <div class="flex yarn-tooltip" title="Elapsed Time: {{model.attempt.elapsedTime}}">
+-                  {{#if model.attempt.attemptStartedTime}}
+-                  <div class="top-1 tail-2" >
+-                    <i class="glyphicon glyphicon-time glyphicon-gray" />
+-                    Started at {{model.attempt.attemptStartedTime}}
+-                  </div>
+-                  {{/if}}
+-                  {{#if model.attempt.validatedFinishedTs}}
+-                  <div class="top-1">
+-                    <i class="glyphicon glyphicon-time glyphicon-gray" />
+-                    Finished at {{model.attempt.validatedFinishedTs}}
+-                  </div>
+-                  {{/if}}
+-                </div>
+-                {{/if}}
+-              </div>
+-              <div class="flex-right">
+-                <div class="top-2">
+-                  <span>AM Host: </span>
+-                  <strong class="yarn-tooltip" title="{{model.attempt.amNodeId}}">{{model.attempt.amNodeId}}</strong>
+-                </div>
+-                {{#if model.attempt.nodeHttpAddress}}
+-                 <div class="top-1">
+-                  <span>AM Node WebUI: </span>
+-                  <strong class="yarn-tooltip" title="{{model.attempt.nodeHttpAddress}}">
+-                    <a href="{{model.attempt.masterNodeURL}}">{{model.attempt.nodeHttpAddress}}</a>
+-                  </strong>
+-                </div>
+-                {{/if}}
+-                {{#if model.attempt.logsLink}}
+-                <div class="top-1">
+-                  <span>Log: </span>
+-                  <strong>
+-                    <a href="{{prepend-protocol model.attempt.logsLink}}" target="_blank">{{model.attempt.logsLink}}</a>
+-                  </strong>
+-                </div>
+-                {{/if}}
+-              </div>
+-            </div>
+-            {{#if model.attempt.diagnosticsInfo}}
+-            <div class="panel panel-default top-3">
+-              <div class="panel-heading">
+-                Diagnostic Info for {{model.attempt.id}}
+-              </div>
+-              <div class="diagnostic-info">
+-                <pre>{{model.attempt.diagnosticsInfo}}</pre>
+-              </div>
+-            </div>
+-            {{/if}}
+-          </div>
+-        </div>
+-      {{/if}}
+-    </div>
+-    <div class="row">
+-      {{#if (or model.rmContainers model.tsContainers)}}
+-        {{timeline-view
+-          parent-id="containers-timeline-div"
+-          my-id="timeline-view"
+-          height="400"
+-          rmModel=model.rmContainers
+-          tsModel=model.tsContainers
+-          label="shortAppAttemptId"
+-          attemptModel=false
+-          changeViewType="changeViewType"
+-          viewType=viewType
+-          userInfo=model.userInfo
+-        }}
+-      {{else}}
+-        <div class="col-md-12 container-fluid">
+-          <div class="panel panel-default">
+-            <div class="panel-heading">
+-               Containers
+-            </div>
+-            <div class="panel-body">
+-              <h4 class="text-center">No data available!</h4>
+-            </div>
+-          </div>
+-        </div>
+-      {{/if}}
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+deleted file mode 100644
+index f6421d4492c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
++++ /dev/null
+@@ -1,195 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-{{#if actionResponse}}
+-  <div class="alert-wrapper">
+-    <div class="col-md-12">
+-      <div class="alert alert-dismissible {{if (eq actionResponse.type 'error') 'alert-danger' 'alert-success'}}" role="alert">
+-        <button class="close" data-dismiss="alert" aria-label="Close" {{action "resetActionResponse"}}><span aria-hidden="true">&times;</span></button>
+-        <strong>{{actionResponse.msg}}</strong>
+-      </div>
+-    </div>
+-  </div>
+-{{/if}}
+-
+-<div class="panel-group col-md-12">
+-  <div class="panel panel-default">
+-    <div class="yarn-app-header">
+-      <div class="flex">
+-        <div>
+-          <div class="flex">
+-            <div>
+-              <h3 class="yarn-app-name">
+-                {{#if model.app.unmanagedApplication}}
+-                  <span title="This is an unmanaged application" class="yarn-tooltip">
+-                    <i class="glyphicon glyphicon-exclamation-sign glyphicon-gray" />
+-                  </span>
+-                {{/if}}
+-                {{model.app.appName}}
+-              </h3>
+-            </div>
+-            {{#if model.app.finalStatus}}
+-            <div title="Final status" class="yarn-tooltip yarn-app-final-status offset-1">
+-              <span class={{model.app.finalStatusStyle}}>
+-                {{model.app.finalStatus}}
+-              </span>
+-            </div>
+-            {{/if}}
+-          </div>
+-          <div title="Application id" class="muted-text">{{model.app.id}}</div>
+-          {{em-table-simple-status-cell content=model.app.state}}
+-          <div class="flex">
+-            <div class="tail-2">
+-              <i class="glyphicon glyphicon-user glyphicon-gray" /> {{model.app.user}}
+-            </div>
+-            {{#if model.app.hasFinishedTime}}
+-              <div title="Started at {{model.app.formattedStartTime}}. &#10; Ran for {{model.app.formattedElapsedTime}}" class="yarn-tooltip">
+-                <i class="glyphicon glyphicon-time glyphicon-gray" />
+-                Finished at {{model.app.formattedFinishedTime}}
+-              </div>
+-            {{else}}
+-              <div title="Running for {{model.app.formattedElapsedTime}}" class="yarn-tooltip">
+-                <i class="glyphicon glyphicon-time glyphicon-gray" />
+-                Started at {{model.app.formattedStartTime}}
+-              </div>
+-            {{/if}}
+-          </div>
+-        </div>
+-
+-        <div class="flex-right">
+-          <div class="links">
+-              {{#if (or (or isServiceDeployedOrRunning isServiceStoppped) isAppKillable)}}
+-              <div class="btn-group">
+-                <button type="button" class="btn btn-unstyled dropdown-toggle" title="Settings"
+-                  data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="margin-left: -5px;">
+-                  <i class="glyphicon glyphicon-cog"/> Settings
+-                </button>
+-                <ul class="dropdown-menu dropdown-menu-right">
+-                  {{#if isServiceDeployedOrRunning}}
+-                    <li>
+-                      <a href="#"  {{action "showStopServiceConfirm"}} target="_blank">
+-                        <i class="glyphicon glyphicon-stop" /> &nbsp;Stop Service
+-                      </a>
+-                    </li>
+-                    <li>
+-                      <a href="#" target="_blank" {{action "showDeleteServiceConfirm"}}>
+-                        <i class="glyphicon glyphicon-trash" /> &nbsp;Delete Service
+-                      </a>
+-                    </li>
+-                  {{/if}}
+-                  {{#if isServiceStoppped}}
+-                  <li>
+-                    <a href="#" target="_blank" {{action "showDeleteServiceConfirm"}}>
+-                      <i class="glyphicon glyphicon-trash" /> &nbsp;Delete Service
+-                    </a>
+-                  </li>
+-                  {{/if}}
+-                  {{#if isAppKillable}}
+-                    <li>
+-                      <a href="#"  {{action "showKillApplicationConfirm"}} target="_blank">
+-                        <i class="glyphicon glyphicon-stop" />&nbsp;Kill Application
+-                      </a>
+-                    </li>
+-                  {{/if}}
+-                </ul>
+-              </div>
+-            {{/if}}
+-
+-            {{#if model.serviceName}}
+-              {{#if model.quicklinks}}
+-              <div class="btn-group quick-links">
+-                <button type="button" class="btn btn-unstyled dropdown-toggle" title="Quick links" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+-                  <i class="glyphicon glyphicon-option-vertical" /> Quicklinks
+-                </button>
+-                <ul class="dropdown-menu dropdown-menu-right">
+-                  {{#each model.quicklinks as |link|}}
+-                    <li><a href="{{link.value}}" target="_blank">{{link.name}}</a></li>
+-                  {{/each}}
+-                </ul>
+-              </div>
+-              {{/if}}
+-            {{/if}}
+-          </div>
+-          <div class="btn-group">
+-            <span title="Queue" class="yarn-tooltip">
+-              <i class="glyphicon glyphicon-tasks glyphicon-gray" /> {{model.app.queue}}
+-            </span>
+-          </div>
+-          <div>Priority: {{model.app.priority}}</div>
+-          {{#if model.app.trackingUrl}}
+-            <div><a href="{{model.app.trackingUrl}}" target="_blank">{{model.app.trackingUI}}</a></div>
+-          {{/if}}
+-        </div>
+-      </div>
+-    </div>
+-    <div class="panel-heading">
+-      <div class="clearfix">
+-        <ul class="nav nav-pills">
+-          <ul class="nav nav-pills collapse in">
+-            {{#if model.serviceName}}
+-              {{#link-to 'yarn-app.components' tagName="li" class=(if (eq target.currentPath 'yarn-app.components') "active")}}
+-                {{#link-to 'yarn-app.components' appId (query-params service=model.serviceName)}}Components{{/link-to}}
+-              {{/link-to}}
+-              {{#link-to 'yarn-app.configs' tagName="li" class=(if (eq target.currentPath 'yarn-app.configs') "active")}}
+-                {{#link-to 'yarn-app.configs' appId (query-params service=model.serviceName)}}Configurations &amp; Metrics{{/link-to}}
+-              {{/link-to}}
+-            {{/if}}
+-            {{#link-to 'yarn-app.attempts' tagName="li" class=(if (eq target.currentPath 'yarn-app.attempts') "active")}}
+-              {{#link-to 'yarn-app.attempts' appId (query-params service=model.serviceName)}}Attempts List{{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-app.charts' tagName="li" class=(if (eq target.currentPath 'yarn-app.charts') "active")}}
+-              {{#link-to 'yarn-app.charts' appId (query-params service=model.serviceName)}}Resource Usage{{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-app.info' tagName="li" class=(if (eq target.currentPath 'yarn-app.info') "active")}}
+-              {{#link-to 'yarn-app.info' appId (query-params service=model.serviceName)}}Diagnostics{{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-app.logs' tagName="li" class=(if (eq target.currentPath 'yarn-app.logs') "active")}}
+-              {{#link-to 'yarn-app.logs' appId (query-params service=serviceName)}}Logs{{/link-to}}
+-            {{/link-to}}
+-            {{#link-to 'yarn-app.threaddump' tagName="li" class=(if (eq target.currentPath 'yarn-app.threaddump') "active")}}
+-              {{#link-to 'yarn-app.threaddump' appId (query-params service=serviceName)}}Threaddump{{/link-to}}
+-            {{/link-to}}
+-          </ul>
+-        </ul>
+-      </div>
+-    </div>
+-    <div class="panel-body yarn-app-body">
+-      {{outlet}}
+-    </div>
+-  </div>
+-</div>
+-
+-{{confirm-dialog
+-  dialogId="stopServiceConfirmDialog"
+-  message=(concat 'Are you sure you want to stop service "' model.serviceName '" for user "' model.app.user '" ?')
+-  action="stopService"
+-}}
+-
+-{{confirm-dialog
+-  dialogId="deleteServiceConfirmDialog"
+-  message=(concat 'Are you sure you want to delete service "' model.serviceName '" for user "' model.app.user '" ?')
+-  action="deleteService"
+-}}
+-
+-{{confirm-dialog
+-  dialogId="killApplicationConfirmDialog"
+-  message=(concat 'Are you sure you want to kill application "' model.app.id '"?')
+-  action="killApplication"
+-}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
+deleted file mode 100644
+index 4aa47c876e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/attempts.hbs
++++ /dev/null
+@@ -1,44 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div>
+-{{#if model.attempts}}
+-  {{timeline-view
+-    parent-id="attempt-timeline-div"
+-    my-id="timeline-view"
+-    height="100%"
+-    rmModel=model.attempts
+-    label="shortAppAttemptId"
+-    attemptModel=true
+-    serviceName=model.serviceName
+-    changeViewType="changeViewType"
+-    viewType=viewType
+-  }}
+-{{else}}
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-         Application Attempts
+-      </div>
+-      <div class="panel-body">
+-        <h4 class="text-center">No data available!</h4>
+-      </div>
+-    </div>
+-  </div>
+-{{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
+deleted file mode 100644
+index 52a6e9471bd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/charts.hbs
++++ /dev/null
+@@ -1,49 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  {{#if isRunningApp}}
+-    <div class="row" id="stackd-bar-chart-mem">
+-      {{per-app-memusage-by-nodes-stacked-barchart
+-      nodes=model.nodes
+-      rmContainers=model.rmContainers
+-      parentId="stackd-bar-chart-mem"
+-      title=(concat 'Memory usage by nodes for: [' model.appId ']')}}
+-    </div>
+-    <hr>
+-    <div class="row" id="stackd-bar-chart-vcore">
+-      {{per-app-vcoreusage-by-nodes-stacked-barchart
+-      nodes=model.nodes
+-      rmContainers=model.rmContainers
+-      parentId="stackd-bar-chart-vcore"
+-      title=(concat 'VCore usage by nodes for: [' model.appId ']')}}
+-    </div>
+-    <hr>
+-    <div class="row" id="stackd-bar-chart-ncontainer">
+-      {{per-app-ncontainers-by-nodes-stacked-barchart
+-      nodes=model.nodes
+-      rmContainers=model.rmContainers
+-      parentId="stackd-bar-chart-ncontainer"
+-      title=(concat 'Running #Containers by nodes for: [' model.appId ']')}}
+-    </div>
+-  {{else}}
+-    <div class="panel panel-default">
+-      <h4 class="text-center">This application is not running. Hence no resource usage data is available.</h4>
+-    </div>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs
+deleted file mode 100644
+index a137088c129..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/components.hbs
++++ /dev/null
+@@ -1,21 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 yarn-applications-container">
+-  {{em-table columns=tableColumns rows=model.components definition=tableDefinition}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs
+deleted file mode 100644
+index 851bf778296..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/configs.hbs
++++ /dev/null
+@@ -1,51 +0,0 @@
+-{{!
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements. See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership. The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License. You may obtain a copy of the License at
+-*
+-* http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-}}
+-
+-<div class="col-md-12 margin-bottom-20">
+-  {{metrics-table metrics=model.metrics type="Service"}}
+-</div>
+-
+-{{#if model.configs}}
+-<div class="panel panel-default">
+-  <div class="panel-heading">
+-    <div class="panel-title">Service Configurations</div>
+-  </div>
+-  <div class="">
+-    <table class="table table-hover table-custom-bordered table-custom-stripped table-radius-none table-border-none">
+-      <thead>
+-        <tr>
+-          <th>Name</th>
+-          <th>Value</th>
+-        </tr>
+-      </thead>
+-      <tbody>
+-        {{#each model.configs as |config|}}
+-        <tr>
+-          <td>{{config.name}}</td>
+-          <td>{{config.value}}</td>
+-        </tr>
+-        {{/each}}
+-      </tbody>
+-    </table>
+-  </div>
+-</div>
+-{{else}}
+-<div class="panel panel-default">
+-  <h4 class="text-center">No service configurations available!</h4>
+-</div>
+-{{/if}}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
+deleted file mode 100644
+index 87e581383b8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/info.hbs
++++ /dev/null
+@@ -1,150 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  {{app-timeout-bar app=model.app}}
+-</div>
+-
+-{{#if actionResponse}}
+-  <div class="col-md-12">
+-    <div class="alert alert-dismissible {{if (eq actionResponse.type 'error') 'alert-danger' 'alert-success'}}" role="alert">
+-      <button class="close" data-dismiss="alert" aria-label="Close" {{action "resetActionResponse"}}><span aria-hidden="true">&times;</span></button>
+-      <strong>{{actionResponse.msg}}</strong>
+-    </div>
+-  </div>
+-{{/if}}
+-
+-{{#if isLoading}}
+-  <div class="panel panel-default service-action-mask">
+-    <img src="assets/images/spinner.gif" alt="Loading...">
+-  </div>
+-{{/if}}
+-
+-{{#if model.app.diagnostics}}
+-  <div class="col-md-12 margin-bottom-20">
+-    {{#if model.app.isFailed}}
+-      <div class="panel panel-danger">
+-        <div class="panel-heading">
+-          Diagnostics
+-        </div>
+-        <div class="panel-body" style="white-space: pre-wrap;">{{model.app.diagnostics}}</div>
+-      </div>
+-    {{else}}
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Diagnostics
+-        </div>
+-        <div class="panel-body">{{model.app.diagnostics}}</div>
+-      </div>
+-    {{/if}}
+-  </div>
+-{{/if}}
+-
+-{{#unless model.serviceName}}
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Outstanding Resource Requests
+-        {{#if totalOutstandingResourceRequests}}
+-          <span class="pull-right">
+-            Total: &lt;Memory: {{totalOutstandingResourceRequests.memory}},
+-              vCores: {{totalOutstandingResourceRequests.vCores}}&gt;
+-          </span>
+-        {{/if}}
+-      </div>
+-      <table class="display table table-striped table-bordered"
+-            cellspacing="0" width="100%">
+-        <thead>
+-        <tr>
+-          <th>Priority</th>
+-          <th>Resource Name</th>
+-          <th>Capability</th>
+-          <th># Containers</th>
+-          <th>Relax Locality</th>
+-          <th>Node Label Expression</th>
+-        </tr>
+-        </thead>
+-        <tbody>
+-        {{#each model.app.resourceRequests as |request|}}
+-          <tr>
+-            <td>{{request.priority}}</td>
+-            <td>{{request.resourceName}}</td>
+-            <td>&lt;Memory: {{request.capability.resourceInformations.resourceInformation.[0].value}},
+-              vCores: {{request.capability.resourceInformations.resourceInformation.[1].value}}&gt;</td>
+-            <td>{{request.numContainers}}</td>
+-            <td>{{request.relaxLocality}}</td>
+-            <td>
+-              {{#if request.nodeLabelExpression}}
+-                {{request.nodeLabelExpression}}
+-              {{else}}
+-                N/A
+-              {{/if}}
+-            </td>
+-          </tr>
+-        {{else}}
+-          <tr>
+-            <td class="text-center" colspan="6">No data available!</td>
+-          </tr>
+-        {{/each}}
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-{{/unless}}
+-
+-<div class="col-md-12">
+-  <div class="panel panel-default">
+-    <div class="panel-heading">Scheduling Info</div>
+-    <table class="display table table-striped table-bordered"
+-            cellspacing="0" width="100%">
+-      <thead>
+-      <tr>
+-        <th>Allocated Resource</th>
+-        <th>Running Containers</th>
+-        <th>Preempted Resource</th>
+-        <th>Num Non-AM container preempted</th>
+-        <th>Num AM container preempted</th>
+-        <th>Aggregated Resource Usage</th>
+-      </tr>
+-      </thead>
+-
+-      <tbody>
+-      <tr>
+-        <td>{{model.app.allocatedResource}}</td>
+-        <td>{{model.app.runningContainersNumber}}</td>
+-        <td>{{model.app.preemptedResource}}</td>
+-        <td>{{model.app.numNonAMContainerPreempted}}</td>
+-        <td>{{model.app.numAMContainerPreempted}}</td>
+-        <td>{{model.app.aggregatedResourceUsage}}</td>
+-      </tr>
+-      </tbody>
+-    </table>
+-  </div>
+-</div>
+-
+-{{confirm-dialog
+-  dialogId="stopServiceConfirmDialog"
+-  message=(concat 'Are you sure you want to stop service "' model.serviceName '" for user "' model.app.user '" ?')
+-  action="stopService"
+-}}
+-
+-{{confirm-dialog
+-  dialogId="deleteServiceConfirmDialog"
+-  message=(concat 'Are you sure you want to delete service "' model.serviceName '" for user "' model.app.user '" ?')
+-  action="deleteService"
+-}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
+deleted file mode 100644
+index df985fc58d8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/loading.hbs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12">
+-  <div class="loading-mask">
+-    <img src="assets/images/spinner.gif" alt="Loading...">
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
+deleted file mode 100644
+index acb5734eed1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/logs.hbs
++++ /dev/null
+@@ -1,154 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Logs {{collapsible-panel targetId="logFilesCollapsablePanel"}}
+-      </div>
+-      <div class="panel-body" id="logFilesCollapsablePanel">
+-        <label>Log aggregation status:</label>&nbsp;
+-        <span class={{model.app.logAggregationStatusStyle}}>
+-          {{model.app.logAggregationStatus}}
+-        </span>
+-        {{#if _isLoadingTopPanel}}
+-          <div class="text-center" style="z-index: 100; position: absolute; left: 46%; top: 45px;">
+-            <img src="assets/images/spinner.gif" alt="Loading...">
+-          </div>
+-        {{/if}}
+-        {{#if areJHSandATSUnhealthy}}
+-          <div class="row">
+-            <div class="col-md-8 col-md-offset-2 alert alert-warning text-center">
+-              <span class="glyphicon glyphicon-warning-sign" style="padding-right: 10px"></span>
+-              <span>Logs are unavailable because Application Timeline Service seems unhealthy and could not connect to the JobHistory server.</span>
+-            </div>
+-          </div>
+-        {{else}}
+-            {{#if attemptList}}
+-                <div class="row">
+-                    <div class="col-md-6">
+-                        <label>Choose attempt to fetch containers</label>
+-                        <div>
+-                            <select class="js-fetch-attempt-containers" onchange={{action "showContainersForAttemptId" value="target.value"}} style="max-width:350px;">
+-                                <option value="" selected={{eq selectedAttemptId ''}}>None</option>
+-                                {{#each attemptList as |attempt|}}
+-                                    <option value="{{attempt.id}}" selected={{eq selectedAttemptId attempt.id}}>{{attempt.id}}</option>
+-                                {{/each}}
+-                            </select>
+-                        </div>
+-                    </div>
+-                    {{#if attemptContainerList}}
+-                        <div class="col-md-6">
+-                            <label>Choose container to fetch logs</label>
+-                            <div>
+-                                <select class="js-fetch-logs-containers" onchange={{action "showLogFilesForContainerId" value="target.value"}} style="max-width:350px">
+-                                    <option value="" selected={{eq selectedContainerId ''}}>None</option>
+-                                    {{#each attemptContainerList as |container|}}
+-                                        <option value="{{container.id}}" selected={{eq selectedContainerId container.id}}>{{container.id}}</option>
+-                                    {{/each}}
+-                                </select>
+-                            </div>
+-                        </div>
+-                    {{else}}
+-                        {{#if (and selectedAttemptId (not _isLoadingTopPanel))}}
+-                            <div class="col-md-4">
+-                                <h4 class="text-center" style="margin-top:25px;">No container data available!</h4>
+-                            </div>
+-                        {{/if}}
+-                    {{/if}}
+-                </div>
+-            {{else}}
+-                <div class="col-md-12">
+-                    <h4 class="text-center">No data available!</h4>
+-                </div>
+-            {{/if}}
+-        {{/if}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{#if selectedContainerId}}
+-  <div class="row">
+-    <div class="col-md-12">
+-      <div class="panel panel-default" style="min-height:150px;">
+-        <div class="panel-heading">
+-          Log: {{selectedLogFileName}} [ {{selectedContainerId}} &amp; {{selectedAttemptId}} ]
+-          {{collapsible-panel targetId="logContentCollapsablePanel"}}
+-        </div>
+-        <div class="panel-body" id="logContentCollapsablePanel">
+-          {{#if _isLoadingBottomPanel}}
+-            <div class="text-center" style="z-index: 100; position: absolute; left: 46%;">
+-              <img src="assets/images/spinner.gif" alt="Loading...">
+-            </div>
+-          {{/if}}
+-          {{#if containerLogFiles}}
+-            <div class="row">
+-              <div class="col-md-6" style="margin-bottom:20px;">
+-                <label>Choose log for {{selectedContainerId}}</label>
+-                <div>
+-                  <select class="js-fetch-log-for-container" onchange={{action "showContentForLogFile" value="target.value"}} style="max-width:350px">
+-                    <option value="" selected={{eq selectedLogFileName ''}}>None</option>
+-                    {{#each containerLogFiles as |file|}}
+-                      <option value="{{file.fileName}}" selected={{eq selectedLogFileName file.fileName}}>{{file.fileName}} - {{file.fileSize}} bytes</option>
+-                    {{/each}}
+-                  </select>
+-                </div>
+-              </div>
+-              {{#if selectedLogFileName}}
+-                <div class="col-md-6">
+-                  <label>Find in log</label>
+-                  <div class="input-group" style="max-width:350px;">
+-                    {{input
+-                      class="form-control"
+-                      value=""
+-                      enter="searchTextInLogContent"
+-                      id="logSeachInput98765"
+-                    }}
+-                    <span class="input-group-btn">
+-                      <button class="btn btn-default" {{action "findNextTextInLogContent"}}>Find</button>
+-                    </span>
+-                  </div>
+-                </div>
+-              {{/if}}
+-            </div>
+-            <div>
+-              {{#if selectedLogFileContent}}
+-                {{#unless showFullLog}}
+-                  <div>
+-                    <strong>Showing last 10 lines of log. Click <a href="#" {{action "showFullLogFileContent"}}>here</a> for full log.</strong>
+-                  </div>
+-                {{/unless}}
+-                <pre id="logContentTextArea1234554321" class="log-content-area">{{showLastFewLinesOfLogContent}}</pre>
+-              {{/if}}
+-            </div>
+-          {{else}}
+-            {{#unless _isLoadingBottomPanel}}
+-              <div class="col-md-12" style="margin-top:20px;">
+-                <h4 class="text-center">Logs are not available!</h4>
+-                {{#if isLogAggregationNotSucceeded}}
+-                  <h4 class="text-center">Log aggregation may not be complete, check back later!</h4>
+-                {{/if}}
+-              </div>
+-            {{/unless}}
+-          {{/if}}
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/threaddump.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/threaddump.hbs
+deleted file mode 100644
+index 4f7cfaaa241..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app/threaddump.hbs
++++ /dev/null
+@@ -1,113 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Threaddump {{collapsible-panel targetId="threaddumpFilesCollapsablePanel"}}
+-      </div>
+-      <div class="panel-body" id="threaddumpFilesCollapsablePanel">
+-        {{#if _isLoadingTopPanel}}
+-          <div class="text-center" style="z-index: 100; position: absolute; left: 46%; top: 45px;">
+-            <img src="assets/images/spinner.gif" alt="Loading...">
+-          </div>
+-        {{/if}}
+-        {{#unless isRunningApp}}
+-          <div class="row">
+-            <div class="col-md-8 col-md-offset-2 alert alert-warning text-center">
+-              <span class="glyphicon glyphicon-warning-sign" style="padding-right: 10px"></span>
+-              <span>Threaddump cannot be collected for an application that is not running.</span>
+-            </div>
+-          </div>
+-        {{else}}
+-            {{#if runningAttempt}}
+-                <div class="row">
+-                    <div class="col-md-6">
+-                        <label>Choose the running attempt to fetch containers</label>
+-                        <div>
+-                            <select class="js-fetch-attempt-containers" onchange={{action "showContainersForAttemptId" value="target.value"}} style="max-width:350px;">
+-                                <option value="" selected={{eq selectedAttemptId ''}}>None</option>
+-                                <option value="{{runningAttempt}}" selected={{eq selectedAttemptId runningAttempt}}>{{runningAttempt}}</option>
+-                            </select>
+-                        </div>
+-                    </div>
+-                    {{#if attemptContainerList}}
+-                        <div class="col-md-6">
+-                            <label>Choose container to fetch threaddump</label>
+-                            <div>
+-                                <select class="js-fetch-threaddump-containers" onchange={{action "showThreaddumpForContainer" value="target.value"}} style="max-width:350px">
+-                                    <option value="" selected={{eq selectedContainerId ''}}>None</option>
+-                                    {{#each attemptContainerList as |container|}}
+-                                        <option value="{{container.id}}" selected={{eq selectedContainerId container.id}}>{{container.id}}</option>
+-                                    {{/each}}
+-                                </select>
+-                            </div>
+-                        </div>
+-                    {{else}}
+-                        {{#if (and selectedAttemptId (not _isLoadingTopPanel))}}
+-                            <div class="col-md-4">
+-                                <h4 class="text-center" style="margin-top:25px;">No container data available!</h4>
+-                            </div>
+-                        {{/if}}
+-                    {{/if}}
+-                </div>
+-            {{else}}
+-                <div class="col-md-12">
+-                    <h4 class="text-center">No data available!</h4>
+-                </div>
+-            {{/if}}
+-        {{/unless}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{#if selectedContainerId}}
+-  <div class="row">
+-    <div class="col-md-12">
+-      <div class="panel panel-default" style="min-height:150px;">
+-        <div class="panel-heading">
+-          Threaddump: [ {{selectedContainerId}} &amp; {{selectedAttemptId}} ]
+-          {{collapsible-panel targetId="threaddumpContentCollapsablePanel"}}
+-        </div>
+-        <div class="panel-body" id="threaddumpContentCollapsablePanel">
+-          {{#if _isLoadingBottomPanel}}
+-            <div class="text-center" style="z-index: 100; position: absolute; left: 46%;">
+-              <img src="assets/images/spinner.gif" alt="Loading...">
+-            </div>
+-          {{/if}}
+-          <div>
+-            {{#if _isThreaddumpAttemptFailed}}
+-              <div class="col-md-10 col-md-offset-1 alert alert-warning text-center">
+-                <span class="glyphicon glyphicon-warning-sign" style="padding-right: 10px"></span>
+-                <span>Threaddump fetch failed for container: {{selectedContainerId}} due to: &#8220;{{threaddumpErrorMessage}}&#8221;</span>
+-              </div>
+-            {{else if _isStdoutLogsFetchFailed}}
+-              <div class="col-md-10 col-md-offset-1 alert alert-warning text-center">
+-                <span class="glyphicon glyphicon-warning-sign" style="padding-right: 10px"></span>
+-                <span>Logs fetch failed for container: {{selectedContainerId}} due to: &#8220;{{stdoutLogsFetchFailedError}}&#8221;</span>
+-              </div>
+-            {{else}}
+-                <pre id="logContentTextArea1234554321" class="log-content-area">{{showThreaddumpContent}}</pre>
+-            {{/if}}
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
+deleted file mode 100644
+index ccadb7c6e91..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps.hbs
++++ /dev/null
+@@ -1,25 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid yarn-applications-container">
+-  <div class="row">
+-    {{outlet}}
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
+deleted file mode 100644
+index 743e2bfa74b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/apps.hbs
++++ /dev/null
+@@ -1,29 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{#if model.apps.isPending}}
+-  <h4 align="center">Loading...</h4>
+-{{else}}
+-  {{#if model.apps}}
+-    <div class="col-md-12">
+-    {{em-table columns=columns rows=model.apps definition=tableDefinition}}
+-    </div>
+-  {{else}}
+-    <h4 align="center">Could not find any applications from this cluster</h4>
+-  {{/if}}
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
+deleted file mode 100644
+index a95af2bdb39..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-apps/loading.hbs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="loading-mask">
+-    <img src="assets/images/spinner.gif" alt="Loading...">
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs
+deleted file mode 100644
+index a837dd89b3b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance.hbs
++++ /dev/null
+@@ -1,25 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="container-fluid">
+-  <div class="col-md-12 container-fluid">
+-      {{outlet}}
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs
+deleted file mode 100644
+index b83a7435051..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instance/info.hbs
++++ /dev/null
+@@ -1,85 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  {{#if model.container}}
+-  <div class="panel panel-default">
+-    <div class="panel-heading">
+-      <div class="panel-title">Component Instance Information</div>
+-    </div>
+-    <div class="">
+-      <table class="table table-striped table-bordered table-hover">
+-        <tbody>
+-          <tr>
+-            <td>Component Instance</td>
+-            <td>{{check-availability model.container.instanceName}}</td>
+-          </tr>
+-          <tr>
+-            <td>Component</td>
+-            <td>{{check-availability model.container.component}}</td>
+-          </tr>
+-          <tr>
+-            <td>Current Container Id</td>
+-            <td>{{check-availability model.container.containerId}}</td>
+-          </tr>
+-          <tr>
+-            <td>State</td>
+-            <td>{{check-availability model.container.state}}</td>
+-          </tr>
+-          <tr>
+-            <td>Started Time</td>
+-            <td>{{check-availability model.container.startedDate}}</td>
+-          </tr>
+-          <tr>
+-            <td>Host</td>
+-            <td>{{check-availability model.container.host}}</td>
+-          </tr>
+-          <tr>
+-            <td>Node</td>
+-            <td>{{check-availability model.container.node}}</td>
+-          </tr>
+-          <tr>
+-            <td>IP Address</td>
+-            <td>{{check-availability model.container.ipAddr}}</td>
+-          </tr>
+-          <tr>
+-            <td>Exposed Ports</td>
+-            <td>{{check-availability model.container.exposedPorts}}</td>
+-          </tr>
+-          <tr>
+-            <td>Exit Status Code</td>
+-            <td>{{check-availability model.container.exitStatusCode}}</td>
+-          </tr>
+-          <tr>
+-            <td>Logs</td>
+-            <td><a href="{{model.container.containerLogURL}}&service={{service}}">Link</a></td>
+-          </tr>
+-          <tr>
+-            <td>Terminal</td>
+-            <td><a href="{{model.container.termLink}}&user.name={{model.userInfo.requestedUser}}" target="_blank">Link</a></td>
+-          </tr>
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-  {{else}}
+-  <div class="panel panel-default">
+-    <h4 class="text-center">No component information available!</h4>
+-  </div>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs
+deleted file mode 100644
+index 7cf4b1e6936..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances.hbs
++++ /dev/null
+@@ -1,39 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="container-fluid">
+-  <div class="panel panel-default">
+-    <div class="panel-heading no-border-bottom">
+-      <div class="clearfix">
+-        <ul class="nav nav-pills collapse in">
+-          {{#link-to 'yarn-component-instances.info' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.info') "active")}}
+-            {{#link-to 'yarn-component-instances.info' componentName (query-params service=serviceName appid=appId)}}Information{{/link-to}}
+-          {{/link-to}}
+-          {{#link-to 'yarn-component-instances.configs' tagName="li" class=(if (eq target.currentPath 'yarn-component-instances.configs') "active")}}
+-            {{#link-to 'yarn-component-instances.configs' componentName (query-params service=serviceName appid=appId)}}Configurations{{/link-to}}
+-          {{/link-to}}
+-        </ul>
+-      </div>
+-    </div>
+-    <div class="panel-body">
+-      {{outlet}}
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/configs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/configs.hbs
+deleted file mode 100644
+index 85b6b426269..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/configs.hbs
++++ /dev/null
+@@ -1,53 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  {{#if model.configs}}
+-    <div class="col-md-12">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          <div class="panel-title">Component Configurations</div>
+-        </div>
+-        <div class="">
+-          <table class="table table-hover table-custom-bordered table-custom-stripped table-radius-none table-border-none">
+-            <thead>
+-              <tr>
+-                <th>Name</th>
+-                <th>Value</th>
+-              </tr>
+-            </thead>
+-            <tbody>
+-              {{#each model.configs as |config|}}
+-                <tr>
+-                  <td>{{config.name}}</td>
+-                  <td>{{config.value}}</td>
+-                </tr>
+-              {{/each}}
+-            </tbody>
+-          </table>
+-        </div>
+-      </div>
+-    </div>
+-  {{else}}
+-    <div class="col-md-12">
+-      <div class="panel panel-default">
+-        <h4 class="text-center">No component configurations available!</h4>
+-      </div>
+-    </div>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs
+deleted file mode 100644
+index 0a4aafe0e51..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/info.hbs
++++ /dev/null
+@@ -1,28 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  <div class="col-md-12">
+-    <h3>Component: {{model.componentName}}</h3>
+-    {{em-table columns=tableColumns rows=model.instances definition=tableDefinition}}
+-  </div>
+-</div>
+-
+-<div class="col-md-12">
+-  {{metrics-table metrics=model.metrics type="Component"}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/loading.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/loading.hbs
+deleted file mode 100644
+index a95af2bdb39..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-component-instances/loading.hbs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="loading-mask">
+-    <img src="assets/images/spinner.gif" alt="Loading...">
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs
+deleted file mode 100644
+index 6376caa8a8e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-container-log.hbs
++++ /dev/null
+@@ -1,38 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  {{node-menu-panel path="yarn-container-log" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id}}
+-  <div class="col-md-10">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        <h5 align="center"><b>{{model.containerLog.logFileName}} for {{model.containerLog.containerID}}</b></h5>
+-      </div>
+-      <div class="panel-body">
+-        {{#if model.containerLog.logs}}
+-          <pre>{{model.containerLog.logs}}</pre>
+-        {{else}}
+-          <p>No logs were written in {{model.containerLog.logFileName}}.</p>
+-        {{/if}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-deploy-service.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-deploy-service.hbs
+deleted file mode 100644
+index 98bc917d1e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-deploy-service.hbs
++++ /dev/null
+@@ -1,33 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs hideRefresh=true}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{deploy-service
+-      savedStandardTemplates=savedStandardTemplates
+-      savedJsonTemplates=savedJsonTemplates
+-      serviceDef=model
+-      serviceResp=serviceResponse
+-      isLoading=isLoading
+-      deployServiceDef="deployServiceDef"
+-      deployServiceJson="deployServiceJson"
+-    }}
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
+deleted file mode 100644
+index c9b682c48c5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow-activity.hbs
++++ /dev/null
+@@ -1,45 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="container-fluid col-md-12">
+-  <div class="row">
+-    {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-  </div>
+-  <div class="row">
+-    <div class="col-md-2">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          Flow Activity
+-        </div>
+-        <div class="panel-body">
+-          <ul class="nav nav-pills nav-stacked collapse in">
+-            {{#link-to 'yarn-flow-activity' tagName="li"}}
+-              {{#link-to 'yarn-flow-activity'}}Flow Activities{{/link-to}}
+-            {{/link-to}}
+-          </ul>
+-        </div>
+-      </div>
+-    </div>
+-    <div class="col-md-10">
+-      <h3>Recent Flow Activities</h3>
+-      {{em-table columns=columns rows=rows definition=tableDefinition}}
+-    </div>
+-  </div>
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
+deleted file mode 100644
+index 2e989580d03..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow.hbs
++++ /dev/null
+@@ -1,49 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-  </div>
+-  <div class="row">
+-    <div class="col-md-2">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          <div class="panel-title">
+-            Flow Information
+-          </div>
+-        </div>
+-        <div class="panel-body">
+-          <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+-            <ul class="nav nav-pills nav-stacked collapse in">
+-              {{#link-to 'yarn-flow.info' tagName="li"}}
+-                {{#link-to 'yarn-flow.info' model.flowUid}}Flow Info{{/link-to}}
+-              {{/link-to}}
+-              {{#link-to 'yarn-flow.runs' tagName="li"}}
+-                {{#link-to 'yarn-flow.runs' model.flowUid}}Flow Runs{{/link-to}}
+-              {{/link-to}}
+-            </ul>
+-          </ul>
+-        </div>
+-      </div>
+-    </div>
+-    <div class="col-md-10">
+-      {{outlet}}
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
+deleted file mode 100644
+index b7004643127..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/info.hbs
++++ /dev/null
+@@ -1,53 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<h3>Flow Information</h3>
+-<div class="panel panel-default">
+-  <div class="panel-body">
+-    <table class="table table-striped table-bordered">
+-      <tbody>
+-        <tr>
+-          <td>Flow Name</td>
+-          <td>{{flowInfo.flowName}}</td>
+-        </tr>
+-        <tr>
+-          <td>User</td>
+-          <td>{{flowInfo.user}}</td>
+-        </tr>
+-        <tr>
+-          <td>Flow ID</td>
+-          <td>{{flowInfo.flowUid}}</td>
+-        </tr>
+-        <tr>
+-          <td>First Run Started</td>
+-          <td>{{flowInfo.firstRunStarted}}</td>
+-        </tr>
+-        <tr>
+-          <td>Last Run Finished</td>
+-          <td>{{flowInfo.lastRunFinished}}</td>
+-        </tr>
+-        {{#if flowInfo.lastExecutionDate}}
+-          <tr>
+-            <td>Last Execution Date</td>
+-            <td>{{flowInfo.lastExecutionDate}}</td>
+-          </tr>
+-        {{/if}}
+-      </tbody>
+-    </table>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
+deleted file mode 100644
+index 96d9e634020..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flow/runs.hbs
++++ /dev/null
+@@ -1,131 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="yarn-flow-runs">
+-
+-  {{#if (or (or elapsedTimeVizData.length cpuVCoresVizData.length) memoryVizData.length)}}
+-  <div class="dropdown pull-right">
+-    <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+-      Add Metrics Widget <span class="caret"></span>
+-    </button>
+-    <ul class="dropdown-menu">
+-      {{#if elapsedTimeVizData.length}}
+-        <li>
+-          <a href="#" {{action "addVizWidget" "runDuration"}}>
+-            <div class="item-icon">
+-              {{#if vizWidgets.runDuration}}
+-                <i class="glyphicon glyphicon-ok text-success"></i>
+-              {{/if}}
+-            </div>
+-            <div class="item-text">Flow Run Vs Run Duration</div>
+-          </a>
+-        </li>
+-      {{/if}}
+-      {{#if cpuVCoresVizData.length}}
+-        <li>
+-          <a href="#" {{action "addVizWidget" "cpuVcores"}}>
+-            <div class="item-icon">
+-              {{#if vizWidgets.cpuVcores}}
+-                <i class="glyphicon glyphicon-ok text-success"></i>
+-              {{/if}}
+-            </div>
+-            <div class="item-text">Flow Run Vs Cpu Vcores</div>
+-          </a>
+-        </li>
+-      {{/if}}
+-      {{#if memoryVizData.length}}
+-        <li>
+-          <a href="#" {{action "addVizWidget" "memoryUsed"}}>
+-            <div class="item-icon">
+-              {{#if vizWidgets.memoryUsed}}
+-                <i class="glyphicon glyphicon-ok text-success"></i>
+-              {{/if}}
+-            </div>
+-            <div class="item-text">Flow Run Vs Memory Used</div>
+-          </a>
+-        </li>
+-      {{/if}}
+-    </ul>
+-  </div>
+-  {{/if}}
+-
+-  <h3>Flow Runs</h3>
+-  {{em-table columns=columns rows=model.flowRuns definition=tableDefinition}}
+-
+-  <div class="col-md-12">
+-    {{#if (and elapsedTimeVizData.length vizWidgets.runDuration)}}
+-      <div class="row">
+-        <div class="panel panel-default">
+-          <div class="panel-body">
+-            <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "runDuration"}}></div>
+-            <h4 class="text-center">Flow Run Vs Run Duration</h4>
+-            {{simple-bar-chart
+-              class="chart-panel"
+-              data=elapsedTimeVizData
+-              xAxisTickFormatter=flowrunIdFormatter
+-              yAxisTickFormatter=elapsedTimeFormatter
+-              xAxisText="Flow Run"
+-              yAxisText="Run Duration"
+-              onBarChartClickCallback=onBarChartClick
+-            }}
+-          </div>
+-        </div>
+-      </div>
+-    {{/if}}
+-
+-    {{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
+-      <div class="row">
+-        <div class="panel panel-default">
+-          <div class="panel-body">
+-            <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "cpuVcores"}}></div>
+-            <h4 class="text-center">Flow Run Vs CPU VCores</h4>
+-            {{simple-bar-chart
+-              class="chart-panel"
+-              data=cpuVCoresVizData
+-              xAxisTickFormatter=flowrunIdFormatter
+-              xAxisText="Flow Run"
+-              yAxisText="CPU VCores"
+-              onBarChartClickCallback=onBarChartClick
+-            }}
+-          </div>
+-        </div>
+-      </div>
+-    {{/if}}
+-
+-    {{#if (and memoryVizData.length vizWidgets.memoryUsed)}}
+-      <div class="row">
+-        <div class="panel panel-default">
+-          <div class="panel-body">
+-            <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "memoryUsed"}}></div>
+-            <h4 class="text-center">Flow Run Vs Memory Used</h4>
+-            {{simple-bar-chart
+-              class="chart-panel"
+-              data=memoryVizData
+-              xAxisTickFormatter=flowrunIdFormatter
+-              yAxisTickFormatter=memoryFormatter
+-              xAxisText="Flow Run"
+-              yAxisText="Memory Used"
+-              onBarChartClickCallback=onBarChartClick
+-            }}
+-          </div>
+-        </div>
+-      </div>
+-    {{/if}}
+-  </div>
+-
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
+deleted file mode 100644
+index 832b47aeb25..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun-metric.hbs
++++ /dev/null
+@@ -1,34 +0,0 @@
+-{{!--
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+---}}
+-
+-<div class="container">
+-  <div class="row">
+-    <h4>Sunburst chart for Metric "{{metric_id}}"</h4>
+-    <h4>(Flowrun: {{flowrun.id}})</h4>
+-    <div id="main">
+-     <div id="sequence"></div>
+-      <div id="chart">
+-        <div id="explanation" style="visibility: hidden;">
+-          <span id="percentage"></span>
+-        </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{sunburst-chart arr=arr}}
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
+deleted file mode 100644
+index eb0b4bd6997..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun.hbs
++++ /dev/null
+@@ -1,49 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-  </div>
+-  <div class="row">
+-    <div class="col-md-2">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          <div class="panel-title">
+-            Flow Run Information
+-          </div>
+-        </div>
+-        <div class="panel-body">
+-          <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+-            <ul class="nav nav-pills nav-stacked collapse in">
+-              {{#link-to 'yarn-flowrun.info' tagName="li"}}
+-                {{#link-to 'yarn-flowrun.info' model.flowrun_uid}}Information{{/link-to}}
+-              {{/link-to}}
+-              {{#link-to 'yarn-flowrun.metrics' tagName="li"}}
+-                {{#link-to 'yarn-flowrun.metrics' model.flowrun_uid}}Metrics{{/link-to}}
+-              {{/link-to}}
+-            </ul>
+-          </ul>
+-        </div>
+-      </div>
+-    </div>
+-    <div class="col-md-10">
+-      {{outlet}}
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
+deleted file mode 100644
+index dac8fd9bd2e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/info.hbs
++++ /dev/null
+@@ -1,128 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="yarn-flow-runinfo">
+-  <h3>Flow Run Info</h3>
+-  <div class="panel panel-default">
+-    <div class="panel-body">
+-      <table class="table table-striped table-bordered">
+-        <tbody>
+-          <tr>
+-            <td>Flow Name</td>
+-            <td>{{model.flowrun.flowName}}</td>
+-          </tr>
+-          <tr>
+-            <td>Run ID</td>
+-            <td>{{model.flowrun.shownid}}</td>
+-          </tr>
+-          <tr>
+-            <td>Launched By</td>
+-            <td>{{model.flowrun.user}}</td>
+-          </tr>
+-          <tr>
+-            <td>Run Sequence ID</td>
+-            <td>{{model.flowrun.runid}}</td>
+-          </tr>
+-          <tr>
+-            <td>Start Time</td>
+-            <td>{{model.flowrun.createTime}}</td>
+-          </tr>
+-          <tr>
+-            <td>End Time</td>
+-            <td>{{model.flowrun.endTime}}</td>
+-          </tr>
+-        </tbody>
+-      </table>
+-    </div>
+-  </div>
+-
+-  {{#if (or cpuVCoresVizData.length memoryVizData.length)}}
+-  <div class="dropdown pull-right">
+-    <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
+-      Add Metrics Widget <span class="caret"></span>
+-    </button>
+-    <ul class="dropdown-menu">
+-      {{#if cpuVCoresVizData.length}}
+-        <li>
+-          <a href="#" {{action "addVizWidget" "cpuVcores"}}>
+-            <div class="item-icon">
+-              {{#if vizWidgets.cpuVcores}}
+-                <i class="glyphicon glyphicon-ok text-success"></i>
+-              {{/if}}
+-            </div>
+-            <div class="item-text">Application Vs Cpu Vcores</div>
+-          </a>
+-        </li>
+-      {{/if}}
+-      {{#if memoryVizData.length}}
+-        <li>
+-          <a href="#" {{action "addVizWidget" "memoryUsed"}}>
+-            <div class="item-icon">
+-              {{#if vizWidgets.memoryUsed}}
+-                <i class="glyphicon glyphicon-ok text-success"></i>
+-              {{/if}}
+-            </div>
+-            <div class="item-text">Application Vs Memory Used</div>
+-          </a>
+-        </li>
+-      {{/if}}
+-    </ul>
+-  </div>
+-  {{/if}}
+-
+-  <!-- Flowrun aggregated data -->
+-  <h3>Applications</h3>
+-  {{em-table columns=columns rows=model.apps definition=tableDefinition}}
+-
+-  {{#if (and cpuVCoresVizData.length vizWidgets.cpuVcores)}}
+-    <div class="panel panel-default">
+-      <div class="panel-body">
+-        <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "cpuVcores"}}>
+-        </div>
+-        <h4 class="text-center">Application Vs CPU VCores</h4>
+-        {{simple-bar-chart
+-          class="chart-panel"
+-          data=cpuVCoresVizData
+-          xAxisTickFormatter=appIdFormatter
+-          xAxisText="Application"
+-          yAxisText="CPU VCores"
+-          onBarChartClickCallback=onBarChartClick
+-        }}
+-      </div>
+-    </div>
+-  {{/if}}
+-
+-  {{#if (and memoryVizData.length vizWidgets.memoryUsed)}}
+-    <div class="panel panel-default">
+-      <div class="panel-body">
+-        <div class="glyphicon glyphicon-remove pull-right" {{action "removeVizWidget" "memoryUsed"}}>
+-        </div>
+-        <h4 class="text-center">Application Vs Memory Used</h4>
+-        {{simple-bar-chart
+-          class="chart-panel"
+-          data=memoryVizData
+-          xAxisTickFormatter=appIdFormatter
+-          yAxisTickFormatter=memoryFormatter
+-          xAxisText="Application"
+-          yAxisText="Memory Used"
+-          onBarChartClickCallback=onBarChartClick
+-        }}
+-      </div>
+-    </div>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
+deleted file mode 100644
+index 026c6e2ea4e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-flowrun/metrics.hbs
++++ /dev/null
+@@ -1,34 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<h3>Flow Run <small>{{model.flowrun_uid}}</small></h3>
+-<hr>
+-
+-<h3>GENERAL Metrics</h3>
+-{{em-table columns=columns rows=generalConfigRows definition=tableDefinition}}
+-
+-{{#if mapMetrics}}
+-  <hr>
+-  <h3>MAP Metrics</h3>
+-  {{em-table columns=columns rows=mapConfigRows definition=tableDefinition}}
+-{{/if}}
+-
+-{{#if reduceMetrics}}
+-  <h3>REDUCER Metrics</h3>
+-  {{em-table columns=columns rows=reduceConfigRows definition=tableDefinition}}
+-{{/if}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-log-service.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-log-service.hbs
+deleted file mode 100644
+index 708c861d871..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-log-service.hbs
++++ /dev/null
+@@ -1,37 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        <h5 align="center">
+-          <b>Log: {{model.containerLog.logFileName}} [ {{model.containerLog.containerID}} ]</b>
+-        </h5>
+-      </div>
+-      <div class="panel-body">
+-        {{#if model.containerLog.logs}}
+-          <pre>{{model.containerLog.logs}}</pre>
+-        {{else}}
+-          <p>No logs were written in {{model.containerLog.logFileName}}.</p>
+-        {{/if}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs
+deleted file mode 100644
+index 053cbe39e22..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-app.hbs
++++ /dev/null
+@@ -1,62 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{node-menu-panel path="yarn-node-app" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id nmGpuInfo=model.nmGpuInfo}}
+-    <div class="col-md-10 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading"><b>Application Information</b></div>
+-        <table class="table">
+-          <tbody>
+-            <tr>
+-              <td>Application ID</td>
+-              <td>{{model.nodeApp.appId}}</td>
+-            </tr>
+-            <tr>
+-              <td>Application State</td>
+-              <td>{{model.nodeApp.state}}</td>
+-            </tr>
+-            <tr>
+-              <td>User</td>
+-              <td>{{model.nodeApp.user}}</td>
+-            </tr>
+-          </tbody>
+-        </table>
+-      </div>
+-      <table id="node-app-table" class="display table table-striped table-bordered" cellspacing="0">
+-        <thead>
+-          <tr>
+-            <th>Containers for {{model.nodeApp.appId}}</th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#each model.nodeApp.containers as |container|}}
+-            <tr>
+-              <td><a href="#/yarn-node-container/{{model.nodeInfo.id}}/{{encodedNodeAddr}}/{{container}}">{{container}}</a></td>
+-            </tr>
+-          {{/each}}
+-       </tbody>
+-     </table>
+-     {{simple-table table-id="node-app-table" bFilter=true colsOrder="0,desc" colTypes="natural" colTargets="0"}}
+-   </div>
+-  </div>
+- </div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs
+deleted file mode 100644
+index 4cfd13cbe9a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-apps.hbs
++++ /dev/null
+@@ -1,53 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{node-menu-panel path="yarn-node-apps" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id nmGpuInfo=model.nmGpuInfo}}
+-    {{#if model.apps}}
+-    <div class="col-md-10 container-fluid">
+-      <table id="node-apps-table" class="display table table-striped table-bordered" cellspacing="0" width="100%">
+-        <thead>
+-          <tr>
+-            <th>Application ID</th>
+-            <th>State</th>
+-            <th>User</th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#if model.apps}}
+-            {{#each model.apps as |app|}}
+-                <tr>
+-                  <td><a href="#/yarn-node-app/{{model.nodeInfo.id}}/{{encodedNodeAddr}}/{{app.appId}}">{{app.appId}}</a></td>
+-                  <td><span class={{app.appStateStyle}}>{{app.state}}</span></td>
+-                  <td>{{app.user}}</td>
+-                </tr>
+-            {{/each}}
+-          {{/if}}
+-        </tbody>
+-      </table>
+-      {{simple-table table-id="node-apps-table" bFilter=true colsOrder="0,desc" colTypes="natural" colTargets="0"}}
+-    </div>
+-    {{else}}
+-      <h4 align = "center">No apps found on this node</h4>
+-    {{/if}}
+-  </div>
+-</div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs
+deleted file mode 100644
+index d26fea0a3a0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-container.hbs
++++ /dev/null
+@@ -1,72 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{node-menu-panel path="yarn-node-container" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id nmGpuInfo=model.nmGpuInfo}}
+-    <div class="col-md-10 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading"><b>Container Information</b></div>
+-        <table class="table">
+-          <tbody>
+-            <tr>
+-              <td>Container ID</td>
+-              <td>{{model.nodeContainer.containerId}}</td>
+-            </tr>
+-            <tr>
+-              <td>Container State</td>
+-              <td>{{model.nodeContainer.state}}</td>
+-            </tr>
+-            <tr>
+-              <td>Exit Code</td>
+-              <td>{{model.nodeContainer.exitCode}}</td>
+-            </tr>
+-            <tr>
+-              <td>Diagnostics</td>
+-              <td>{{model.nodeContainer.diagnostics}}</td>
+-            </tr>
+-            <tr>
+-              <td>User</td>
+-              <td>{{model.nodeContainer.user}}</td>
+-            </tr>
+-            <tr>
+-              <td>Total Memory Needed</td>
+-              <td>{{model.nodeContainer.totalMemoryNeeded}} MB</td>
+-            </tr>
+-            <tr>
+-              <td>Total VCores Needed</td>
+-              <td>{{model.nodeContainer.totalVCoresNeeded}}</td>
+-            </tr>
+-            <tr>
+-              <td>Link to Logs</td>
+-              <td>
+-                {{log-files-comma nodeId=model.nodeInfo.id
+-                    nodeAddr=encodedNodeAddr
+-                    containerId=model.nodeContainer.containerId
+-                    logFiles=model.nodeContainer.containerLogFiles}}
+-              </td>
+-            </tr>
+-          </tbody>
+-        </table>
+-      </div>
+-   </div>
+-  </div>
+- </div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs
+deleted file mode 100644
+index 7b276849dc8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node-containers.hbs
++++ /dev/null
+@@ -1,60 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-    {{node-menu-panel path="yarn-node-containers" nodeAddr=model.nodeInfo.addr nodeId=model.nodeInfo.id nmGpuInfo=model.nmGpuInfo}}
+-    {{#if model.containers}}
+-    <div class="col-md-10 container-fluid">
+-      <table id="node-containers-table" class="display table table-striped table-bordered" cellspacing="0" width="100%">
+-        <thead>
+-          <tr>
+-            <th>Container ID</th>
+-            <th>Container State</th>
+-            <th>User</th>
+-            <th>Logs</th>
+-          </tr>
+-        </thead>
+-        <tbody>
+-          {{#if model.containers}}
+-            {{#each model.containers as |container|}}
+-                <tr>
+-                  <td><a href="#/yarn-node-container/{{model.nodeInfo.id}}/{{encodedNodeAddr}}/{{container.containerId}}">{{container.containerId}}</a></td>
+-                  <td><span class={{container.containerStateStyle}}>{{container.state}}</span></td>
+-                  <td>{{container.user}}</td>
+-                  <td>
+-                    {{log-files-comma nodeId=model.nodeInfo.id
+-                        nodeAddr=encodedNodeAddr
+-                        containerId=container.containerId
+-                        logFiles=container.containerLogFiles}}
+-                  </td>
+-                </tr>
+-            {{/each}}
+-          {{/if}}
+-        </tbody>
+-      </table>
+-      {{simple-table table-id="node-containers-table" bFilter=true colsOrder="0,desc" colTypes="natural" colTargets="0"}}
+-    </div>
+-    {{else}}
+-      <h4 align = "center">No containers found on this node</h4>
+-    {{/if}}
+-  </div>
+-</div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
+deleted file mode 100644
+index d82b1756b3f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node.hbs
++++ /dev/null
+@@ -1,25 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid yarn-applications-container">
+-  <div class="row">
+-    {{outlet}}
+-  </div>
+-</div>
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/info.hbs
+deleted file mode 100644
+index 59cbbf0abd2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/info.hbs
++++ /dev/null
+@@ -1,150 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-
+-    {{node-menu-panel path="yarn-node" nodeId=model.rmNode.id
+-                      nodeAddr=model.node.id nmGpuInfo=model.nmGpuInfo}}
+-
+-    <div class="col-md-10 container-fluid">
+-
+-      <div class="row">
+-        <div class="col-md-12 container-fluid">
+-          <div class="panel panel-default">
+-            <div class="panel-heading">Node
+-              Information: {{model.rmNode.id}}</div>
+-            <table class="table">
+-              <tbody>
+-              <tr>
+-                <td>Total Vmem allocated for Containers</td>
+-                <td>{{divide num=model.node.totalVmemAllocatedContainersMB
+-                             den=1024}} GB
+-                </td>
+-              </tr>
+-              <tr>
+-                <td>Vmem enforcement enabled</td>
+-                <td>{{model.node.vmemCheckEnabled}}</td>
+-              </tr>
+-              <tr>
+-                <td>Total Pmem allocated for Containers</td>
+-                <td>{{divide num=model.node.totalPmemAllocatedContainersMB
+-                             den=1024}} GB
+-                </td>
+-              </tr>
+-              <tr>
+-                <td>Pmem enforcement enabled</td>
+-                <td>{{model.node.pmemCheckEnabled}}</td>
+-              </tr>
+-              <tr>
+-                <td>Total VCores allocated for Containers</td>
+-                <td>{{model.node.totalVCoresAllocatedContainers}}</td>
+-              </tr>
+-              <tr>
+-                <td>Node Healthy Status</td>
+-                <td>{{model.node.nodeHealthy}}</td>
+-              </tr>
+-              <tr>
+-                <td>Last Node Health Report Time</td>
+-                <td>{{model.node.lastNodeUpdateTime}}</td>
+-              </tr>
+-              <tr>
+-                <td>Node Health Report</td>
+-                <td>{{model.node.healthReport}}</td>
+-              </tr>
+-              {{#if model.node.nmStartupTime}}
+-                <tr>
+-                  <td>Node Manager Start Time</td>
+-                  <td>{{model.node.nmStartupTime}}</td>
+-                </tr>
+-              {{/if}}
+-              <tr>
+-                <td>Node Manager Version</td>
+-                <td>{{model.node.nodeManagerBuildVersion}}</td>
+-              </tr>
+-              <tr>
+-                <td>Hadoop Version</td>
+-                <td>{{model.node.hadoopBuildVersion}}</td>
+-              </tr>
+-              </tbody>
+-            </table>
+-          </div>
+-        </div>
+-      </div>
+-
+-      <div class="row">
+-        <div class="col-lg-6 container-fluid">
+-          <div class="panel panel-default">
+-            <div class="panel-heading">
+-              Resource - Memory
+-            </div>
+-            <div class="container-fluid" id="mem-donut-chart">
+-              {{donut-chart data=model.rmNode.getMemoryDataForDonutChart
+-                            showLabels=true
+-                            parentId="mem-donut-chart"
+-                            ratio=0.6
+-                            type="memory"
+-                            colorTargets="good"
+-                            colorTargetReverse=true
+-                            maxHeight=350}}
+-            </div>
+-          </div>
+-        </div>
+-
+-        <div class="col-lg-6 container-fluid">
+-          <div class="panel panel-default">
+-            <div class="panel-heading">
+-              Resource - VCores
+-            </div>
+-            <div class="container-fluid" id="vcore-donut-chart">
+-              {{donut-chart data=model.rmNode.getVCoreDataForDonutChart
+-                            showLabels=true
+-                            parentId="vcore-donut-chart"
+-                            ratio=0.6
+-                            colorTargets="good"
+-                            colorTargetReverse=true
+-                            maxHeight=350}}
+-            </div>
+-          </div>
+-        </div>
+-      </div>
+-
+-      {{#if model.nmGpuInfo}}
+-        <div class="row">
+-          <div class="col-lg-6 container-fluid">
+-            <div class="panel panel-default">
+-              <div class="panel-heading">
+-                Resources - yarn.io/gpu
+-              </div>
+-              <div class="container-fluid" id="gpu-donut-chart">
+-                {{donut-chart data=model.rmNode.getGpuDataForDonutChart
+-                              showLabels=true
+-                              parentId="gpu-donut-chart"
+-                              ratio=0.6
+-                              colorTargets="good"
+-                              colorTargetReverse=true
+-                              maxHeight=350}}
+-              </div>
+-            </div>
+-          </div>
+-        </div>
+-      {{/if}}
+-    </div>
+-  </div>
+-</div>
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/yarn-nm-gpu.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/yarn-nm-gpu.hbs
+deleted file mode 100644
+index f3aafe51181..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-node/yarn-nm-gpu.hbs
++++ /dev/null
+@@ -1,55 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-
+-    {{node-menu-panel path="yarn-node" nodeId=model.rmNode.id
+-                      nodeAddr=model.node.id nmGpuInfo=model.nmGpuInfo}}
+-    {{#if model.nmGpuInfo.info.totalGpuDevices}}
+-
+-    <div class="col-md-10 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">Gpu Information</div>
+-        <table class="table">
+-          <tbody>
+-          <tr>
+-            <td>Vendor</td>
+-            <td>NVIDIA</td>
+-          </tr>
+-          <tr>
+-            <td>Driver Version</td>
+-            <td>{{model.nmGpuInfo.info.gpuDeviceInformation.driverVersion}}</td>
+-          </tr>
+-          <tr>
+-            <td>Total Number Of Gpus</td>
+-            <td>{{model.nmGpuInfo.info.totalGpuDevices.length}}</td>
+-          </tr>
+-          </tbody>
+-        </table>
+-      </div>
+-
+-      {{#each model.nmGpuInfo.info.gpuDeviceInformation.gpus as |gpu|}}
+-        {{yarn-nm-gpu-info gpu=gpu}}
+-      {{/each}}
+-    </div>
+-    {{else}}
+-      <h4 align = "center">No GPUs are found on this node.</h4>
+-    {{/if}}
+-  </div>
+-</div>
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
+deleted file mode 100644
+index c850386b681..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes.hbs
++++ /dev/null
+@@ -1,49 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-<div class="row">
+-  <div class="container-fluid">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        <div class="clearfix">
+-          <ul class="nav nav-pills">
+-            <ul class="nav nav-pills collapse in">
+-              {{#link-to "yarn-nodes.table" tagName="li"}}
+-                {{#link-to 'yarn-nodes.table'}}Information
+-                {{/link-to}}
+-              {{/link-to}}
+-
+-              {{#link-to 'yarn-nodes.status' tagName="li"}}
+-                {{#link-to 'yarn-nodes.status'}}Node Status
+-                {{/link-to}}
+-              {{/link-to}}
+-
+-              {{#link-to 'yarn-nodes.heatmap' tagName="li"}}
+-                {{#link-to 'yarn-nodes.heatmap'}}Nodes Heatmap Chart
+-                {{/link-to}}
+-              {{/link-to}}
+-            </ul>
+-          </ul>
+-        </div>
+-      </div>
+-      <div class="panel-body">
+-        {{outlet}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
+deleted file mode 100644
+index 1421c824b5a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/heatmap.hbs
++++ /dev/null
+@@ -1,26 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-{{#if model.nodes}}
+-  <div id="nodes-heatmap-chart">
+-    {{nodes-heatmap model=model.nodes parentId="nodes-heatmap-chart"
+-      title="Node Heatmap Chart (Usage of "}}
+-  </div>
+-
+-{{/if}}
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/status.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/status.hbs
+deleted file mode 100644
+index a941f774248..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/status.hbs
++++ /dev/null
+@@ -1,35 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{#if model.clusterMetrics}}
+-<div class="row clearfix">
+-  <div class="col-lg-6">
+-    <div class="panel panel-default">
+-      <div class="panel-heading">
+-        Node Managers
+-      </div>
+-      <div class="container-fluid" id="nodes-donut-chart">
+-        {{donut-chart data=model.clusterMetrics.firstObject.getNodesDataForDonutChart showLabels=true parentId="nodes-donut-chart"
+-        ratio=0.6 maxHeight=350 colorTargets="good error warn"}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-{{/if}}
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
+deleted file mode 100644
+index 11757f06241..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-nodes/table.hbs
++++ /dev/null
+@@ -1,28 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-<div class="row clearfix">
+-  <div class="col-md-12 yarn-applications-container">
+-    {{#if model.nodes}}
+-      {{em-table columns=columns rows=model.nodes definition=tableDefinition}}
+-    {{else}}
+-      <h4 align="center">No nodes found on this cluster</h4>
+-    {{/if}}
+-  </div>
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
+deleted file mode 100644
+index b65a3be69e4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue.hbs
++++ /dev/null
+@@ -1,89 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="panel-group">
+-  <div class="panel panel-default">
+-    <div class="yarn-app-header">
+-      <div class="flex">
+-        <div class="top-1">
+-          <h3>{{model.selected}}</h3>
+-          {{#if model.selectedQueue.state}}
+-          <div>
+-            {{em-table-simple-status-cell content=model.selectedQueue.state}}
+-          </div>
+-          {{/if}}
+-          {{#if (eq model.queues.firstObject.type "capacity")}}
+-              <div class="top-1">
+-                  {{#if model.selectedQueue.isWeightMode}}
+-  <span class="yarn-label secondary">
+-    <span class="label-key">weight</span>
+-    <span class="label-value">{{model.selectedQueue.weight}}</span>
+-  </span>
+-                          <span class="yarn-label secondary">
+-    <span class="label-key">normalized weight</span>
+-    <span class="label-value">{{model.selectedQueue.normalizedWeight}}</span>
+-  </span>
+-                  {{else}}
+-  <span class="yarn-label secondary">
+-    <span class="label-key">configured capacity</span>
+-    <span class="label-value">{{model.selectedQueue.capacity}}%</span>
+-  </span>
+-                          <span class="yarn-label secondary">
+-    <span class="label-key">configured max capacity</span>
+-    <span class="label-value">{{model.selectedQueue.maxCapacity}}%</span>
+-  </span>
+-                  {{/if}}
+-                  <span class="yarn-label secondary">
+-    <span class="label-key">ordering policy</span>
+-    <span class="label-value">{{model.selectedQueue.orderingPolicy}}</span>
+-  </span>
+-                  {{#if model.selectedQueue.isFlexibleDynamicQueue}}
+-  <span class="yarn-label secondary">
+-    <span class="label-key">flexible dynamic queue</span>
+-  </span>
+-                  {{/if}}
+-                {{#if model.selectedQueue.isLeafQueue}}
+-                <span class="yarn-label secondary">
+-                  <span class="label-key">user limit</span>
+-                  <span class="label-value">{{model.selectedQueue.userLimit}}%</span>
+-                </span>
+-                <span class="yarn-label secondary">
+-                  <span class="label-key">user limit factor</span>
+-                  <span class="label-value">{{model.selectedQueue.userLimitFactor}}</span>
+-                </span>
+-                {{/if}}
+-              </div>
+-          {{/if}}
+-        </div>
+-        <div class="flex-right">
+-          {{#each model.selectedQueue.capacitiesBarChartData as |item|}}
+-            <span class="yarn-label primary">
+-              <span class="label-key"> {{lower item.label}}</span>
+-                <span class="label-value">{{item.value}}{{#if (eq model.queues.firstObject.type "fair")}} MB{{else}}%{{/if}}</span>
+-            </span>
+-          {{/each}}
+-        </div>
+-      </div>
+-    </div>
+-    <div class="panel-body yarn-app-body">
+-      {{outlet}}
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
+deleted file mode 100644
+index 29fe91311bf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/apps.hbs
++++ /dev/null
+@@ -1,84 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="row">
+-  <div class="col-lg-12 col-md-12">
+-    <div class="row">
+-      {{#if (eq model.queues.firstObject.type "capacity")}}
+-        {{yarn-queue.capacity-queue-info model=model}}
+-      {{else if (eq model.queues.firstObject.type "fair")}}
+-        {{yarn-queue.fair-queue-info model=model}}
+-      {{else}}
+-        {{yarn-queue.fifo-queue-info model=model}}
+-      {{/if}}
+-    </div>
+-  </div>
+-  <div class="col-lg-12 col-md-12 yarn-applications-container">
+-    {{#if model.apps}}
+-      {{em-table columns=columns rows=model.apps  definition=tableDefinitio}}
+-    {{else}}
+-      <br>
+-      <div class="panel panel-default">
+-        <h4 align = "center">Could not find any applications from this cluster</h4>
+-      </div>
+-    {{/if}}
+-  </div>
+-  {{!-- Active User Info --}}
+-  {{#if model.selectedQueue.users}}
+-  <div class="col-lg-12 col-md-12">
+-    <div class="panel panel-default active-user-panel">
+-      <div class="panel-heading">
+-        Active User Info: {{ model.selected }}
+-      </div>
+-      <div class="panel-body">
+-        <table class="table table-striped table-bordered active-user-table">
+-          <thead>
+-            <tr>
+-              <th>User Name</th>
+-              <th>User Limit Resource</th>
+-              <th>Used Resource</th>
+-              <th>Max AM Resource</th>
+-              <th>Used AM Resource</th>
+-              <th>Active Apps</th>
+-              <th>Pending Apps</th>
+-              <th>Weight</th>
+-            </tr>
+-          </thead>
+-          <tbody>
+-            <tr style="display: none">
+-              {{!-- Fix to start odd row background color from third row --}}
+-            </tr>
+-            {{#each model.selectedQueue.users as |user|}}
+-            <tr>
+-              <td>{{ user.name }}</td>
+-              <td>&lt;memory: {{user.maxMemoryMB}} MB, vCores: {{user.maxVCore}}&gt;</td>
+-              <td>&lt;memory: {{user.usedMemoryMB}} MB, vCores: {{user.usedVCore}}&gt;</td>
+-              <td>&lt;memory: {{user.maxAMMemoryMB}} MB, vCores: {{user.maxAMVCore}}&gt;</td>
+-              <td>&lt;memory: {{user.amUsedMemoryMB}} MB, vCores: {{user.amUsedVCore}}&gt;</td>
+-              <td>{{user.activeApps}}</td>
+-              <td>{{user.pendingApps}}</td>
+-              <td>{{user.userWeight}}</td>
+-            </tr>
+-            {{/each}}
+-          </tbody>
+-        </table>
+-      </div>
+-    </div>
+-  </div>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
+deleted file mode 100644
+index b84425ae6f0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queue/info.hbs
++++ /dev/null
+@@ -1,26 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-<div class="row">
+-  {{#if (eq model.queues.firstObject.type "capacity")}}
+-    {{yarn-queue.capacity-queue-info model=model}}
+-  {{else if (eq model.queues.firstObject.type "fair")}}
+-    {{yarn-queue.fair-queue-info model=model}}
+-  {{else}}
+-    {{yarn-queue.fifo-queue-info model=model}}
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
+deleted file mode 100644
+index ede29946f0c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-queues.hbs
++++ /dev/null
+@@ -1,32 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-<div class="queue-page-breadcrumb">
+-  {{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-</div>
+-
+-<div class="container-fluid">
+-  {{#if (eq model.queues.firstObject.type "capacity")}}
+-    {{yarn-queue.capacity-queue model=model setFilter=(action "setFilter") filteredPartition=filteredPartition}}
+-  {{else if (eq model.queues.firstObject.type "fair")}}
+-    {{yarn-queue.fair-queue model=model}}
+-  {{else}}
+-    {{yarn-queue.fifo-queue model=model}}
+-  {{/if}}
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
+deleted file mode 100644
+index c971b0bfff1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-services.hbs
++++ /dev/null
+@@ -1,29 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-<div class="col-md-12">
+-  <a class="btn btn-primary pull-right" href="#/yarn-deploy-service">New Service</a>
+-</div>
+-<div class="col-md-12 container-fluid yarn-applications-container">
+-  {{#if model.apps}}
+-    {{em-table columns=serviceColumns rows=model.apps definition=tableDefinition}}
+-  {{else}}
+-    <h4 align="center">Could not find any services from this cluster</h4>
+-  {{/if}}
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
+deleted file mode 100644
+index 2306e4b107e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs
++++ /dev/null
+@@ -1,108 +0,0 @@
+-{{!--
+-  Licensed to the Apache Software Foundation (ASF) under one
+-  or more contributor license agreements.  See the NOTICE file
+-  distributed with this work for additional information
+-  regarding copyright ownership.  The ASF licenses this file
+-  to you under the Apache License, Version 2.0 (the
+-  "License"); you may not use this file except in compliance
+-  with the License.  You may obtain a copy of the License at
+-
+-      http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+---}}
+-
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-{{breadcrumb-bar breadcrumbs=breadcrumbs}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="row">
+-
+-    <div class="col-md-2 container-fluid">
+-      <div class="panel panel-default">
+-        <div class="panel-heading">
+-          <h4>Tools</h4>
+-        </div>
+-        <div class="panel-body">
+-          <ul class="nav nav-pills nav-stacked" id="stacked-menu">
+-            <ul class="nav nav-pills nav-stacked collapse in">
+-              {{#link-to 'yarn-tools.yarn-conf' tagName="li"}}
+-                {{#link-to 'yarn-tools.yarn-conf'}}YARN Configuration
+-                {{/link-to}}
+-              {{/link-to}}
+-              {{#link-to 'yarn-tools.yarn-rm-log' tagName="li"}}
+-                {{#link-to 'yarn-tools.yarn-rm-log'}}YARN Daemon Logs
+-                {{/link-to}}
+-              {{/link-to}}
+-            </ul>
+-          </ul>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="col-md-10 container-fluid">
+-      {{#if model.clusterMetrics}}
+-        <div class="row">
+-          <div class="col-lg-4 container-fluid">
+-            <div class="panel panel-default">
+-              <div class="panel-heading">
+-                Finished Apps From All Users
+-              </div>
+-              <div class="container-fluid" id="finishedapps-donut-chart">
+-                {{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart
+-                showLabels=true
+-                parentId="finishedapps-donut-chart"
+-                ratio=0.6
+-                maxHeight=350
+-                colorTargets="good warn error"
+-                }}
+-              </div>
+-            </div>
+-          </div>
+-
+-          <div class="col-lg-4 container-fluid">
+-            <div class="panel panel-default">
+-              <div class="panel-heading">
+-                Running Apps From All Users
+-              </div>
+-              <div class="container-fluid" id="runningapps-donut-chart">
+-                {{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart
+-                showLabels=true
+-                parentId="runningapps-donut-chart"
+-                ratio=0.6
+-                maxHeight=350
+-                colorTargets="warn good"
+-                }}
+-              </div>
+-            </div>
+-          </div>
+-        </div>
+-      {{/if}}
+-
+-      <div class="row">
+-        {{outlet}}
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
+deleted file mode 100644
+index c2108a253eb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
++++ /dev/null
+@@ -1,28 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<h1>Core Configuration</h1>
+-{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel rowCount=10 definition=coreTableDefinition}}
+-
+-<h1>YARN Configuration</h1>
+-{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel rowCount=10 definition=yarnTableDefinition}}
+-
+-<h1>MapReduce Configuration</h1>
+-{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel rowCount=10 definition=mapredTableDefinition}}
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-metrics.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-metrics.hbs
+deleted file mode 100644
+index b11171a4b60..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-metrics.hbs
++++ /dev/null
+@@ -1,33 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<div class="col-md-12 container-fluid">
+-  <div class="col-md-10">
+-    <div class="panel panel-default">
+-      <div class="panel-body">
+-          <div class="yarn-metrics-json">
+-        {{#each model.jmx as |jmx|}}
+-            {{json-pretty jmx.metrics}}
+-        {{/each}}
+-          </div>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
+deleted file mode 100644
+index 6d80246e734..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-rm-log.hbs
++++ /dev/null
+@@ -1,42 +0,0 @@
+-{{!
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+-}}
+-
+-<h1>YARN Daemon Logs</h1>
+-<div class="row">
+-  <div class="col-md-12">
+-    <div class="panel panel-default">
+-      <ul class="list-group">
+-      {{#if model.logs}}
+-        {{#each model.logs as |log|}}
+-        <li class="list-group-item">
+-          {{#link-to 'yarn-tools.yarn-rm-log' (query-params filename=log.logFileUrl)}}
+-            {{log.logFileName}}
+-          {{/link-to}}
+-        </li>
+-        {{/each}}
+-      {{else}}
+-        <div class="panel-body">
+-          No logs were found.
+-        </div>
+-      {{/if}}
+-      </ul>
+-    </div>
+-  </div>
+-</div>
+-
+-{{outlet}}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
+deleted file mode 100644
+index f3acad0a0c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/color-utils.js
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export default {
+-  preDefinedColors : ["#1f77b4", "#aec7e8", "#ffbb78",
+-    "#98df8a", "#ff9896", "#9467bd", "#c5b0d5", "#8c564b",
+-    "#c49c94", "#e377c2", "#f7b6d2", "#c7c7c7", "#bcbd22",
+-    "#dbdb8d", "#17becf", "#9edae5"],
+-
+-  colorMap: {
+-    "warn": "#ffbc0b",
+-    "good": "#60cea5",
+-    "error": "#cc6164",
+-    "others": "#26bbf0",
+-  },
+-
+-  getColors: function(nColors, colorsTarget, reverse = false) {
+-    var colors = [];
+-    for (var i = 0; i < nColors; i++) {
+-      colors.push(undefined);
+-    }
+-
+-    var startIdx = 0;
+-
+-    if (reverse) {
+-      startIdx = Math.max(nColors - colorsTarget.length, 0);
+-    }
+-
+-    for (i = 0; i < colorsTarget.length; i++) {
+-      if (i + startIdx < nColors) {
+-        colors[i + startIdx] = this.getColorByTarget(colorsTarget[i]);
+-      }
+-    }
+-
+-    var idx = 0;
+-    for (i = 0; i < nColors; i++) {
+-      if (!colors[i]) {
+-        colors[i] = this.preDefinedColors[i % this.preDefinedColors.length];
+-        idx ++;
+-      }
+-    }
+-
+-    return colors;
+-  },
+-
+-  getColorByTarget: function(target) {
+-    return this.colorMap[target];
+-  }
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
+deleted file mode 100644
+index 689aa5eeff7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/converter.js
++++ /dev/null
+@@ -1,235 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Constants from 'yarn-ui/constants';
+-import { convertTimestampWithTz } from "./date-utils";
+-
+-export default {
+-  containerIdToAttemptId: function(containerId) {
+-    if (containerId) {
+-      var arr = containerId.split('_');
+-      var attemptId = ["appattempt", arr[1],
+-        arr[2], this.padding(arr[3], 6)];
+-      return attemptId.join('_');
+-    }
+-  },
+-  attemptIdToAppId: function(attemptId) {
+-    if (attemptId) {
+-      var arr = attemptId.split('_');
+-      var appId = ["application", arr[1],
+-        arr[2]].join('_');
+-      return appId;
+-    }
+-  },
+-  padding: function(str, toLen=2) {
+-    str = str.toString();
+-    if (str.length >= toLen) {
+-      return str;
+-    }
+-    return '0'.repeat(toLen - str.length) + str;
+-  },
+-  resourceToString: function(mem, cpu) {
+-    mem = Math.max(0, mem);
+-    cpu = Math.max(0, cpu);
+-    return mem + " MBs, " + cpu + " VCores";
+-  },
+-  msToElapsedTime: function(timeInMs) {
+-    var sec_num = timeInMs / 1000; // don't forget the second param
+-    var hours = Math.floor(sec_num / 3600);
+-    var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+-    var seconds = sec_num - (hours * 3600) - (minutes * 60);
+-
+-    var timeStrArr = [];
+-
+-    if (hours > 0) {
+-      timeStrArr.push(hours + ' Hrs');
+-    }
+-    if (minutes > 0) {
+-      timeStrArr.push(minutes + ' Mins');
+-    }
+-    if (seconds > 0) {
+-      timeStrArr.push(Math.round(seconds) + " Secs");
+-    }
+-    return timeStrArr.join(' : ');
+-  },
+-  elapsedTimeToMs: function(elapsedTime) {
+-    elapsedTime = elapsedTime.toLowerCase();
+-    var arr = elapsedTime.split(' : ');
+-    var total = 0;
+-    for (var i = 0; i < arr.length; i++) {
+-      if (arr[i].indexOf('hr') > 0) {
+-        total += parseInt(arr[i].substring(0, arr[i].indexOf(' '))) * 3600;
+-      } else if (arr[i].indexOf('min') > 0) {
+-        total += parseInt(arr[i].substring(0, arr[i].indexOf(' '))) * 60;
+-      } else if (arr[i].indexOf('sec') > 0) {
+-        total += parseInt(arr[i].substring(0, arr[i].indexOf(' ')));
+-      }
+-    }
+-    return total * 1000;
+-  },
+-  timeStampToDate: function(timeStamp) {
+-    return convertTimestampWithTz(timeStamp, "YYYY/MM/DD HH:mm:ss");
+-  },
+-  timeStampToDateOnly: function(timeStamp) {
+-    return convertTimestampWithTz(timeStamp, "YYYY/MM/DD");
+-  },
+-  dateToTimeStamp: function(date) {
+-    if (date) {
+-      var ts = moment(date, "YYYY/MM/DD HH:mm:ss").valueOf();
+-      return ts;
+-    }
+-  },
+-  isoDateToDate: function(isoDate) {
+-    return moment(isoDate).format("YYYY/MM/DD HH:mm:ss");
+-  },
+-  splitForContainerLogs: function(id) {
+-    if (id) {
+-      var splits = id.split(Constants.PARAM_SEPARATOR);
+-      var splitLen = splits.length;
+-      if (splitLen < 3) {
+-        return null;
+-      }
+-      var fileName = splits[2];
+-      var index;
+-      for (index = 3; index < splitLen; index++) {
+-        fileName = fileName + Constants.PARAM_SEPARATOR + splits[index];
+-      }
+-      return [splits[0], splits[1], fileName];
+-    }
+-  },
+-  splitForAppLogs: function(id) {
+-    if (id) {
+-      var splits = id.split(Constants.PARAM_SEPARATOR);
+-      var splitLen = splits.length;
+-      if (splitLen < 2) {
+-        return null;
+-      }
+-      return splits[2] ? [splits[0], splits[1], splits[2]] : [splits[0], splits[1]];
+-    }
+-  },
+-  memoryToSimpliedUnit: function(mb) {
+-    var unit = "MB";
+-    var value = mb;
+-    if (value / 1024 >= 0.9) {
+-      value = value / 1024;
+-      unit = "GB";
+-    }
+-    if (value / 1024 >= 0.9) {
+-      value = value / 1024;
+-      unit = "TB";
+-    }
+-    if (value / 1024 >= 0.9) {
+-      value = value / 1024;
+-      unit = "PB";
+-    }
+-    return value.toFixed(1) + " " + unit;
+-  },
+-  resourceToSimplifiedUnit: function (value, unit) {
+-    // First convert unit to base unit ("").
+-    var normalizedValue = value;
+-    if (unit === "Ki") {
+-      normalizedValue = normalizedValue * 1024;
+-    } else if (unit === "Mi") {
+-      normalizedValue = normalizedValue * 1024 * 1024;
+-    } else if (unit === "Gi") {
+-      normalizedValue = normalizedValue * 1024 * 1024 * 1024;
+-    } else if (unit === "Ti") {
+-      normalizedValue = normalizedValue * 1024 * 1024 * 1024 * 1024;
+-    } else if (unit === "Pi") {
+-      normalizedValue = normalizedValue * 1024 * 1024 * 1024 * 1024 * 1024;
+-    } else if (unit === "K" || unit === "k") {
+-      normalizedValue = normalizedValue * 1000;
+-    } else if (unit === "M" || unit === "m") {
+-      normalizedValue = normalizedValue * 1000 * 1000;
+-    } else if (unit === "G" || unit === "g") {
+-      normalizedValue = normalizedValue * 1000 * 1000 * 1000;
+-    } else if (unit === "T" || unit === "t") {
+-      normalizedValue = normalizedValue * 1000 * 1000 * 1000 * 1000;
+-    } else if (unit === "P" || unit === "p") {
+-      normalizedValue = normalizedValue * 1000 * 1000 * 1000 * 1000 * 1000;
+-    }
+-
+-    // From baseunit ("") convert to most human readable unit
+-    // (which value < 1024 * 0.9).
+-    var finalUnit = "";
+-    if (normalizedValue / 1024 >= 0.9) {
+-      normalizedValue = normalizedValue / 1024;
+-      finalUnit = "Ki";
+-    }
+-    if (normalizedValue / 1024 >= 0.9) {
+-      normalizedValue = normalizedValue / 1024;
+-      finalUnit = "Mi";
+-    }
+-    if (normalizedValue / 1024 >= 0.9) {
+-      normalizedValue = normalizedValue / 1024;
+-      finalUnit = "Gi";
+-    }
+-    if (normalizedValue / 1024 >= 0.9) {
+-      normalizedValue = normalizedValue / 1024;
+-      finalUnit = "Ti";
+-    }
+-    if (normalizedValue / 1024 >= 0.9) {
+-      normalizedValue = normalizedValue / 1024;
+-      finalUnit = "Pi";
+-    }
+-
+-    return normalizedValue.toFixed(1) + " " + finalUnit;
+-  },
+-  msToElapsedTimeUnit: function(millisecs, short) {
+-    var seconds = Math.floor(millisecs / 1000);
+-    var days = Math.floor(seconds / (3600 * 24));
+-    var hours = Math.floor(seconds / 3600) - (days * 24);
+-    var mins = Math.floor((seconds - (hours * 3600) - (days * 24 * 3600)) / 60);
+-    var secs = seconds - (days * 24 * 3600) - (hours * 3600) - (mins * 60);
+-    var timeStrArr = [];
+-    var pluralize = "";
+-    if (days > 0) {
+-      pluralize = days > 1? " Days" : " Day";
+-      timeStrArr.push(days + pluralize);
+-    }
+-    if (hours > 0) {
+-      pluralize = hours > 1? " Hrs" : " Hour";
+-      timeStrArr.push(hours + pluralize);
+-    }
+-    if (mins > 0) {
+-      pluralize = mins > 1? " Mins" : " Min";
+-      timeStrArr.push(mins + pluralize);
+-    }
+-    pluralize = secs > 1? " Secs" : " Sec";
+-    timeStrArr.push(secs + pluralize);
+-    if (short) {
+-      return timeStrArr[0] + (timeStrArr[1]? " : " + timeStrArr[1] : "");
+-    }
+-    return timeStrArr.join(" : ");
+-  },
+-  memoryBytesToMB: function(mem) {
+-    var unit = "MB";
+-    var value = mem / (1024 * 1024);
+-    if (value / 1024 >= 0.9) {
+-      value = value / 1024;
+-      unit = "GB";
+-    }
+-    return value.toFixed(1) + " " + unit;
+-  },
+-  floatToFixed: function(value, fixed=2) {
+-    if (value && value.toFixed) {
+-      return parseFloat(value.toFixed(fixed));
+-    }
+-    return value;
+-  }
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js
+deleted file mode 100644
+index 4abdc7219df..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/date-utils.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-const defaultTz = "America/Los_Angeles";
+-
+-const getDefaultTimezone = () => {
+-  let timezone = defaultTz;
+-  try {
+-    timezone = moment.tz.guess();
+-  } catch (e) {
+-    console.log(e);
+-  }
+-  return timezone || defaultTz;
+-};
+-
+-export const convertTimestampWithTz = (timestamp, format = "YYYY/MM/DD") => {
+-  return moment.tz(parseInt(timestamp), getDefaultTimezone()).format(format);
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
+deleted file mode 100644
+index 7945be9c1b0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/error-utils.js
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export default {
+-  getErrorTypeByErrorCode: function(code) {
+-    var errorType = '';
+-    if (code) {
+-      switch (code) {
+-        case "500":
+-          errorType = "Internal Server Error";
+-          break;
+-        case "502":
+-          errorType = "Bad Gateway";
+-          break;
+-        case "503":
+-          errorType = "Service Unavailable";
+-          break;
+-        case "400":
+-          errorType = "Bad Request";
+-          break;
+-        case "403":
+-          errorType = "Forbidden";
+-          break;
+-        case "404":
+-          errorType = "Not Found";
+-          break;
+-        case "401":
+-          errorType = "Authorization required";
+-          break;
+-        default:
+-          errorType = "";
+-          break;
+-      }
+-    }
+-    return errorType;
+-  },
+-  stripErrorCodeAndMessageFromError: function(err) {
+-    var obj = {};
+-    if (err && err.errors && err.errors[0]) {
+-      obj.errorCode = err.errors[0].status || "";
+-      obj.title = err.errors[0].title || "";
+-      obj.errorType = this.getErrorTypeByErrorCode(err.errors[0].status);
+-    }
+-    return obj;
+-  }
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
+deleted file mode 100644
+index fcf6a1ee41f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/href-address-utils.js
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export default {
+-  getApplicationLink: function(applicationId) {
+-    return "#/yarn-app/" + applicationId + '/attempts';
+-  },
+-
+-  getQueueLink: function(queueName) {
+-    return '#/yarn-queue/' + queueName + '/info';
+-  }
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/info-seeder.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/info-seeder.js
+deleted file mode 100644
+index cfff9d0ebd6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/info-seeder.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export default {
+-  serviceName: "A unique application name",
+-  queueName: "The YARN queue that this application should be submitted to",
+-  version: "Version of the service",
+-  lifetime: "Life time (in seconds) of the application from the time it reaches the STARTED state (after which it is automatically destroyed by YARN). For unlimited lifetime do not set a lifetime value.",
+-  components: "One or more components of the application. If the application is HBase say, then the component can be a simple role like master or regionserver. If the application is a complex business webapp then a component can be other applications say Kafka or Storm. Thereby it opens up the support for complex and nested applications.",
+-  configurations: "Set of configuration properties that can be injected into the application components via envs, files and custom pluggable helper docker containers. Files of several standard formats like xml, properties, json, yaml and templates will be supported.",
+-  fileConfigs: "Set of file configurations that needs to be created and made available as a volume in an application component container.",
+-  userName: "Name of the user who launches the service."
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
+deleted file mode 100644
+index 3112acc889a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/mock.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-export default {
+-  initMockNodesData: function(ref) {
+-    var data = [];
+-    for (var i = 0; i < 3; i++) {
+-      for (var j = 0; j < 38; j++) {
+-        var node = ref.get('targetObject.store').createRecord('YarnRmNode', {
+-          rack: "/rack-" + i,
+-          nodeHostName: "hadoop-" + ["centos6", "ubuntu7", "win"][i % 3] + "-" + ["web", "etl", "dm"][j % 3] + "-" + j,
+-          usedMemoryMB: Math.abs(Math.random() * 10000),
+-          availMemoryMB: Math.abs(Math.random() * 10000)
+-        });
+-        data.push(node);
+-      }
+-    }
+-
+-    ref.set("model", data);
+-  }
+-};
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
+deleted file mode 100644
+index c9867985672..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/utils/sorter.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Converter from 'yarn-ui/utils/converter';
+-import Ember from 'ember';
+-
+-export default {
+-  _initElapsedTimeSorter: function() {
+-    Ember.$.extend(Ember.$.fn.dataTableExt.oSort, {
+-      "elapsed-time-pre": function (a) {
+-         return Converter.padding(Converter.elapsedTimeToMs(a), 20);
+-      },
+-    });
+-  },
+-
+-  _initNaturalSorter: function() {
+-    Ember.$.extend(Ember.$.fn.dataTableExt.oSort, {
+-      "natural-asc": function (a, b) {
+-        return naturalSort(a,b);
+-      },
+-      "natural-desc": function (a, b) {
+-        return naturalSort(a,b) * -1;
+-      },
+-    });
+-  },
+-
+-  initDataTableSorter: function() {
+-    this._initElapsedTimeSorter();
+-    this._initNaturalSorter();
+-  },
+-};
+-
+-/**
+- * Natural sort implementation.
+- * Typically used to sort application Ids'.
+- */
+-function naturalSort(a, b) {
+-  var diff = a.length - b.length;
+-  if (diff !== 0) {
+-    var splitA = a.split("_");
+-    var splitB = b.split("_");
+-    if (splitA.length !== splitB.length) {
+-      return a.localeCompare(b);
+-    }
+-    for (var i = 1; i < splitA.length; i++) {
+-      var splitdiff = splitA[i].length - splitB[i].length;
+-      if (splitdiff !== 0) {
+-        return splitdiff;
+-      }
+-      var splitCompare = splitA[i].localeCompare(splitB[i]);
+-      if (splitCompare !== 0) {
+-        return splitCompare;
+-      }
+-    }
+-    return diff;
+-  }
+-  return a.localeCompare(b);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
+deleted file mode 100644
+index 2ce4628116b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower-shrinkwrap.json
++++ /dev/null
+@@ -1,69 +0,0 @@
+-{
+-  "https://github.com/DataTables/DataTables.git": {
+-    "1.10.15": "84d24d41477bac7657c9ddfa1d86245f9affc879"
+-  },
+-  "https://github.com/components/ember-data.git": {
+-    "2.1.0": "d8b4d3092f67afe22d9d374c40d719d557915fa3"
+-  },
+-  "https://github.com/components/ember.git": {
+-    "2.2.0": "49e042ca89922ed96b27488c2a98add280ae7123"
+-  },
+-  "https://github.com/components/jqueryui.git": {
+-    "1.11.4": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1",
+-    "1.12.1": "44ecf3794cc56b65954cc19737234a3119d036cc"
+-  },
+-  "https://github.com/dockyard/ember-qunit-notifications.git": {
+-    "0.1.0": "a83277aa7a1c0545c66e6d133caebb9a620e71ad"
+-  },
+-  "https://github.com/dockyard/qunit-notifications.git": {
+-    "0.1.1": "7a13f6dba5a340e1cb9e0b64c1c711e4d7edaca1"
+-  },
+-  "https://github.com/ember-cli/ember-cli-shims.git": {
+-    "0.0.6": "dcab43b58d5698690050bb9a46ead5c8663c7da1"
+-  },
+-  "https://github.com/ember-cli/ember-cli-test-loader.git": {
+-    "0.2.1": "3348d801089279296c38f31ae14d9c4d115ce154"
+-  },
+-  "https://github.com/ember-cli/ember-load-initializers.git": {
+-    "0.1.7": "7bb21488563bd1bba23e903a812bf5815beddd1a"
+-  },
+-  "https://github.com/fgnass/spin.js.git": {
+-    "2.3.2": "5a9ea41651105302fe76d15cb294070c5863e759"
+-  },
+-  "https://github.com/ivaynberg/select2.git": {
+-    "4.0.0": "80eb44bec78568b152dc5547269c164cb7b5363c"
+-  },
+-  "https://github.com/jquery/jquery-dist.git": {
+-    "2.1.4": "7751e69b615c6eca6f783a81e292a55725af6b85",
+-    "3.6.0": "e786e3d9707ffd9b0dd330ca135b66344dcef85a"
+-  },
+-  "https://github.com/jquery/qunit.git": {
+-    "1.19.0": "467e7e34652ad7d5883ce9c568461cf8c5e172a8"
+-  },
+-  "https://github.com/mbostock-bower/d3-bower.git": {
+-    "3.5.17": "abe0262a205c9f3755c3a757de4dfd1d49f34b24"
+-  },
+-  "https://github.com/moment/moment-timezone.git": {
+-    "0.5.0": "74a2e9378ecf4a31a168f3049f086565c8d66814"
+-  },
+-  "https://github.com/moment/moment.git": {
+-    "2.10.6": "446ce77eb08c5c862d7b0b11ef1d2e884d12e3d7",
+-    "2.12.0": "d3d7488b4d60632854181cb0a9af325d57fb3d51"
+-  },
+-  "https://github.com/rwjblue/ember-qunit-builds.git": {
+-    "0.4.16": "142c4066a5458bef9dfcb92b70152b9c01d79188"
+-  },
+-  "https://github.com/sreenaths/more-js.git": {
+-    "0.8.2": "015ab7c7dad2dc9edc0049b8b65aeb020fd20c51"
+-  },
+-  "https://github.com/sreenaths/snippet-ss.git": {
+-    "1.11.0": "c1abc566f4e001b7f1939b6dbdd911eadc969cf9"
+-  },
+-  "https://github.com/stefanpenner/loader.js.git": {
+-    "3.3.0": "ac909550c9544325632542bbea97531cc60bc628"
+-  },
+-  "https://github.com/twbs/bootstrap.git": {
+-    "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a",
+-    "3.4.1": "3.4.1"
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+deleted file mode 100644
+index 625aedb9171..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
++++ /dev/null
+@@ -1,29 +0,0 @@
+-{
+-  "name": "yarn-ui",
+-  "dependencies": {
+-    "ember": "2.8.0",
+-    "ember-cli-shims": "0.0.6",
+-    "ember-cli-test-loader": "0.2.1",
+-    "ember-data": "2.1.0",
+-    "ember-load-initializers": "0.1.7",
+-    "ember-qunit": "0.4.16",
+-    "ember-qunit-notifications": "0.1.0",
+-    "jquery": "3.6.0",
+-    "loader.js": "3.3.0",
+-    "qunit": "1.19.0",
+-    "jquery-ui": "1.12.1",
+-    "moment": "2.12.0",
+-    "moment-timezone": "0.5.33",
+-    "more-js": "0.8.2",
+-    "bootstrap": "3.4.1",
+-    "d3": "~3.5.6",
+-    "spin.js": "~2.3.2",
+-    "momentjs": "~2.10.6",
+-    "select2": "4.0.0",
+-    "snippet-ss": "~1.11.0",
+-    "alasql": "^0.4.3",
+-    "x2js": "1.2.0",
+-    "datatables.net": "1.11.5",
+-    "datatables.net-dt": "3.2.2"
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env
+deleted file mode 100644
+index c9cf35bf2d8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/configs.env
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-ENV = {
+-  hosts: {
+-    /*
+-     * Local URL. This is empty by default. In case when ResourceManager
+-     * and Timeline Server (ATS) are running on same node, cross domain
+-     * requests has to be supported. In such cases, proxy URL can be configured
+-     * here to handle requests (CORS). For eg:"localhost:1337"
+-     */
+-      //localBaseAddress: "localhost:1337",
+-
+-    /*
+-     * Timeline web interface can be configured below.
+-     * By default timeline server is set as localhost:8188, uncomment and change
+-     * the following value for pointing to a different address.
+-     */
+-      //timelineWebAddress: "localhost:8188",
+-
+-    /*
+-     * RM web interface can be configured below.
+-     * By default RM web address is set as localhost:8088, uncomment and change
+-     * the following value for pointing to a different address.
+-     */
+-      //rmWebAddress: "localhost:8088",
+-
+-    /*
+-     * Protocol scheme. It can be "http:" or "https:". By default, http is used.
+-     */
+-      //protocolScheme: "http:",
+-
+-    /*
+-     * JHS web interface can be configured below.
+-     */
+-      //jhsAddress: "localhost:19888"
+-
+-  },
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
+deleted file mode 100644
+index 7aa110e8148..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/default-config.js
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-module.exports = { // YARN UI App configurations
+-    hosts: {
+-      localBaseAddress: "",
+-      timelineWebAddress: "localhost:8188",
+-      timelineV1WebAddress: "localhost:8188",
+-      rmWebAddress: "localhost:8088",
+-      jhsAddress: "localhost:19888",
+-      protocolScheme: "http:",
+-      isSecurityEnabled: ""
+-    },
+-    namespaces: {
+-      timeline: 'ws/v1/applicationhistory',
+-      timelineService: 'ws/v2/timeline/apps',
+-      cluster: 'ws/v1/cluster',
+-      metrics: 'ws/v1/cluster/metrics',
+-      timelineV2: 'ws/v2/timeline',
+-      timelineV2Log: 'ws/v2/applicationlog',
+-      dashService: 'app/v1/services',
+-      node: '{nodeAddress}/ws/v1/node',
+-      jhs: 'ws/v1/history'
+-    },
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js
+deleted file mode 100644
+index c6ed5ed3a09..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/config/environment.js
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/* jshint node: true */
+-
+-const DEFAULT_CONFIG = require('./default-config');
+-
+-module.exports = function(environment) {
+-  var ENV = {
+-    modulePrefix: 'yarn-ui',
+-    environment: environment,
+-    baseURL: '/',
+-    locationType: 'hash',
+-    EmberENV: {
+-      FEATURES: {
+-        // Here you can enable experimental features on an ember canary build
+-        // e.g. 'with-controller': true
+-      }
+-    },
+-
+-    moment: {
+-      includeTimezone: 'all'
+-    },
+-
+-    APP: DEFAULT_CONFIG,
+-    contentSecurityPolicy: {
+-      'connect-src': "* 'self'",
+-      'child-src': "'self' 'unsafe-inline'",
+-      'style-src': "'self' 'unsafe-inline'",
+-    }
+-  };
+-
+-  if (environment === 'development') {
+-    // ENV.APP.LOG_RESOLVER = true;
+-    // ENV.APP.LOG_ACTIVE_GENERATION = true;
+-    // ENV.APP.LOG_TRANSITIONS = true;
+-    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+-    // ENV.APP.LOG_VIEW_LOOKUPS = true;
+-  }
+-
+-  if (environment === 'test') {
+-    // Testem prefers this...
+-    ENV.baseURL = '/';
+-    ENV.locationType = 'none';
+-
+-    // keep test console output quieter
+-    ENV.APP.LOG_ACTIVE_GENERATION = false;
+-    ENV.APP.LOG_VIEW_LOOKUPS = false;
+-
+-    ENV.APP.rootElement = '#ember-testing';
+-  }
+-
+-  if (environment === 'production') {
+-
+-  }
+-
+-  return ENV;
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+deleted file mode 100644
+index e73f9b7a997..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/* global require, module */
+-var Funnel = require("broccoli-funnel");
+-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+-
+-module.exports = function(defaults) {
+-  var isProd = EmberApp.env() === 'production';
+-  var app = new EmberApp(defaults, {
+-    storeConfigInMeta: false,
+-    minifyCSS: {
+-      enabled: isProd
+-    },
+-    minifyJS: {
+-      // Will be minified by wro4j-maven-plugin for performance
+-      enabled: false,
+-    },
+-    fingerprint: {
+-      enabled: false
+-    },
+-    sourcemaps: {
+-      enabled: !isProd
+-    }
+-  });
+-
+-  app.import("bower_components/datatables.net-dt/css/jquery.dataTables.min.css");
+-  app.import("bower_components/datatables.net/js/jquery.dataTables.min.js");
+-  app.import("bower_components/momentjs/min/moment.min.js");
+-  app.import("bower_components/moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js");
+-  app.import("bower_components/select2/dist/css/select2.min.css");
+-  app.import("bower_components/select2/dist/js/select2.min.js");
+-  app.import('bower_components/jquery-ui/jquery-ui.js');
+-  app.import('bower_components/more-js/dist/more.js');
+-  app.import('bower_components/bootstrap/dist/css/bootstrap.css');
+-  app.import('bower_components/bootstrap/dist/css/bootstrap-theme.css');
+-  app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
+-  app.import('bower_components/alasql/dist/alasql.js');
+-  app.import('bower_components/x2js/xml2json.js');
+-
+-  // Use `app.import` to add additional libraries to the generated
+-  // output files.
+-  //
+-  // If you need to use different assets in different
+-  // environments, specify an object as the first parameter. That
+-  // object's keys should be the environment name and the values
+-  // should be the asset to use in that environment.
+-  //
+-  // If the library that you are including contains AMD or ES6
+-  // modules that you would like to import into your application
+-  // please specify an object with the list of modules as keys
+-  // along with the exports of each module as its value.
+-  var extraAssets = new Funnel('config', {
+-     srcDir: '/',
+-     include: ['*.env'],
+-     destDir: '/config'
+-  });
+-
+-  return app.toTree(extraAssets);
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
+deleted file mode 100644
+index c892e33be36..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/jsconfig.json
++++ /dev/null
+@@ -1,14 +0,0 @@
+-{
+-    "compilerOptions": {
+-        "target": "ES6",
+-        "module": "commonjs"
+-    },
+-    "exclude": [
+-        "node_modules",
+-        "dist",
+-        "bower_components",
+-        "jspm_packages",
+-        "tmp",
+-        "temp"
+-    ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+deleted file mode 100644
+index deb79a722e6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
++++ /dev/null
+@@ -1,66 +0,0 @@
+-{
+-  "name": "yarn-ui",
+-  "version": "0.0.1",
+-  "description": "New UI framework of Apache Hadoop YARN",
+-  "private": true,
+-  "directories": {
+-    "doc": "doc",
+-    "test": "tests"
+-  },
+-  "scripts": {
+-    "build": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember build",
+-    "start": "TMPDIR=tmp node ./node_modules/ember-cli/bin/ember server",
+-    "build:mvn": "TMPDIR=tmp node/node ./node_modules/ember-cli/bin/ember build -prod",
+-    "build:mvn:windows": "set TMPDIR=tmp; node/node ./node_modules/ember-cli/bin/ember build -prod"
+-  },
+-  "repository": "",
+-  "engines": {
+-    "node": ">= 0.10.0"
+-  },
+-  "author": "",
+-  "license": "Apache",
+-  "devDependencies": {
+-    "bower": "1.8.8",
+-    "bower-shrinkwrap-resolver-ext": "0.1.0",
+-    "broccoli-asset-rev": "2.4.2",
+-    "broccoli-funnel": "1.0.1",
+-    "broccoli-merge-trees": "1.1.1",
+-    "ember-array-contains-helper": "1.0.2",
+-    "ember-bootstrap": "0.5.1",
+-    "ember-cli": "1.13.14",
+-    "ember-cli-app-version": "1.0.0",
+-    "ember-cli-babel": "5.1.6",
+-    "ember-cli-content-security-policy": "0.4.0",
+-    "ember-cli-dependency-checker": "1.2.0",
+-    "ember-cli-htmlbars": "1.0.2",
+-    "ember-cli-htmlbars-inline-precompile": "0.3.1",
+-    "ember-cli-ic-ajax": "0.2.1",
+-    "ember-cli-inject-live-reload": "1.4.0",
+-    "ember-cli-jquery-ui": "0.0.20",
+-    "ember-cli-moment-shim": "0.7.3",
+-    "ember-cli-numeral": "^0.2.0",
+-    "ember-cli-qunit": "1.2.1",
+-    "ember-cli-release": "0.2.8",
+-    "ember-cli-sass": "=7.0.0",
+-    "ember-cli-sri": "1.2.1",
+-    "ember-cli-uglify": "1.2.0",
+-    "ember-d3": "0.1.0",
+-    "ember-data": "2.1.0",
+-    "ember-disable-proxy-controllers": "1.0.1",
+-    "ember-export-application-global": "1.0.5",
+-    "ember-lodash": "0.0.10",
+-    "ember-resolver": "2.0.3",
+-    "ember-spin-spinner": "0.2.3",
+-    "ember-truth-helpers": "1.3.0",
+-    "loader.js": "4.2.3",
+-    "select2": "4.0.0",
+-    "testem": "0.9.11"
+-  },
+-  "dependencies": {
+-    "em-helpers": "^0.8.0",
+-    "em-table": "0.12.0"
+-  },
+-  "resolutions": {
+-    "graceful-fs": "^4.2.4"
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/Sorting icons.psd b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/Sorting icons.psd
+deleted file mode 100644
+index 53b2e06850767cb57c52b316f0b845b1a8e0ca0e..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 27490
+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
+Y16@Zf7?Q8!JB-NJ(KYBs*Ff|C0Zg4MIsgCw
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/favicon.ico b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/favicon.ico
+deleted file mode 100644
+index 6eeaa2a0d393190ce748107222d9a026f992e4a7..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 894
+zcmZQzU<5(|0R|u`!H~hsz#zuJz@P!dKp_SNAO?xUfG{@$0|>*we<X0{?!DZ?LR&jK
+zJ4*`(D+_yj`}mZUV<%4{DS<No{rlI{+GcBJTomZJrYz@lN9~2?%3V3hT|wRfwpN+B
+zxv$^6LDrRDRAizmzo(`AZg1n=>Y}F;x;`B~@Mg`jC-vo5%k$%{OoKy1zkdA+(K2o3
+zEDKGQQ~gcX+N!Tt<ln6-e!X((x9eB`|NHmj>Ej1|9e2tL(rheJva*5dKY#gZsIRxM
+zB;!h7<JJ1on-%#_W>5Wi?9l5?>z>S-`t`=OAFp5C?(007k>qM(bnVuyja#;c*qL9N
+z(Q%=@`f7d2?T&^wySIHjy#MKh?rZrO7i!Bt-@f(!@WDrwB`uD&)%Eqcd3o(gVV7ri
+zp6ji@(BF7(+uE0x&)(R!?s#YIg_7JW1=-KHZv1@s(DS<L4gNk(j*fnQelrS_FV5;Z
+zF}eA|vYC(19e;50(BU}~*0+>xD9<^am-%+f#!uU}z9=j>5*%b{WE2`20#tutPWS1#
+zz4s39d~xOMwaqJzOl{rMU%#oo=xj&xyY1WF&71o?Hs-LOkA<OOT|+}_QrMM+6RvMw
+z{^IiKhevmxo!@_KTI>D^4SRbV?yXz(e#efNwKXpT1J^s+yE;1`KXoe5&f?1A$<NLo
+z|MBttt(|L+O=>tYso}un=1c3AzCL>B&D=RpqN3i1hL&lnclP!D`u*G0#bsJv!oAH)
+z-rc|T`^Wdkrw?7(xb)_p%`Y#WdAn`Pvz+W#0Rbo6-Ha3zp1gPgjDkZ)k6Gz!@9D0(
+zG^hL4?)Be4zWep#`{$>RUhUoaq@wgyfd9*oU{6tz+SXQhl3284sj;T&{L=I*bGxt4
+z@4vfX%A<*$FN^a&MMa!<bG7B?%PuH@D~2#OZ`<zU;hyB_*c#=(G&yozSimf6i&AxU
+ucVnZ@2@}v1L%4tb{$0CaV_ZU_m8GSrv9VuZ;G~(e-hB9gtQeLL$fW`Ph4SP8
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc.png
+deleted file mode 100644
+index e1ba61a8055fcb18273f2468d335572204667b1f..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 160
+zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*bWaz@5R22v2@;zYta_*?F5u6Q
+zWR@in#&u+WgT?Hi<}D3B3<dtPKf3L(#%G;lkAsbPmH>}GOXuX|8Oj3tosHiJ3*4TN
+zC7>_x-r1O=t(?KoTC+`+>7&2GzdqLHBg&F)2Q?&EGZ+}|Rpsc~9`m>jw35No)z4*}
+HQ$iB}HK{Sd
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc_disabled.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_asc_disabled.png
+deleted file mode 100644
+index fb11dfe24a6c564cb7ddf8bc96703ebb121df1e7..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 148
+zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX(Vi}jAsXkC6BcOhI9!^3NY?Do
+zDX;f`c1`y6n0RgO@$!H7ch<T~&R05SUEJ8^Q1D3B?anEg_j{VPewQ3)o33=v`u75$
+u@NwC)H>ZT&|Jn0dmaqO^XNm-CGtk!Ur<_=Jws3;%W$<+Mb6Mw<&;$T1GdZXL
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_both.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_both.png
+deleted file mode 100644
+index af5bc7c5a10b9d6d57cb641aeec752428a07f0ca..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 201
+zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX6FglULp08By<o`a;2_ZY@ahDQ
+zIZn@cq>cxyy87-Q;~nRxO8@-UU*I^KVWyN+&SiMHu5xDOu|HNvwzODfTdXjhVyNu1
+z#7^XbGKZ7<gEZFeRPCMIsy$+yhaA3~(<<ARU4F{HcWVEZS94u?w%>LW3XeONb<yeJ
+z>$RKLeE*WhqbYpIXPIqK@r4)v+qN8um%99%MPpS9d#7Ed7SL@Bp00i_>zopr0H-Zb
+Aj{pDw
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc.png
+deleted file mode 100644
+index 0e156deb5f61d18f9e2ec5da4f6a8c94a5b4fb41..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 158
+zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*R8JSj5R22v2@<S}6GRp?u4>yo
+z(czD9$NuDl3Ljm9c#_#4$vXUz=f1~&WY3aa=h!;z7fOEN>ySP9QA=6C-^Dmb&tuM=
+z4Z&=WZU;2WF>e%GI&mWJk^K!jrbro{W;-I>FeCfLGJl3}+Z^2)3Kw?+EoAU?^>bP0
+Hl+XkKC^<KP
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc_disabled.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/datatables/sort_desc_disabled.png
+deleted file mode 100644
+index c9fdd8a1502fda301682e907afde86bc450da10f..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 146
+zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRXk)AG&AsXkC6C_xhx$boC`TY4@
+zxy7GKb-~?6->j|Q{b@g3TV7E(Grjn^aLC2o)_ptHrtUEoT$S@q)~)7U@V;W{6)!%@
+u>N?4t-1qslpJw9!O?PJ&w0Cby<YFk^=EPF?qfY~934^DrpUXO@geCx6y*UB^
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/hadoop_logo.png
+deleted file mode 100644
+index d48139563b2635670303f7f92b8acf3fa7017818..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 31716
+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
+ToJs!Af43z?<wR<Q41)d_>SZw7
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/assets/images/spinner.gif
+deleted file mode 100644
+index 727b91d1761e22e0d5191097e4ea6610ee60a2cc..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 33076
+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
+KFd72GI|Kj(^~e<f
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
+deleted file mode 100644
+index a9597e98639..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml
++++ /dev/null
+@@ -1,39 +0,0 @@
+-<?xml version="1.0"?>
+-  
+-<!--
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+--->
+-
+-<!DOCTYPE cross-domain-policy [
+-  <!ELEMENT cross-domain-policy (site-control)*>
+-  <!ELEMENT site-control (#PCDATA)>
+-  <!ATTLIST site-control
+-          permitted-cross-domain-policies CDATA #REQUIRED>
+-  ]>
+-<cross-domain-policy>
+-  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+-
+-  <!-- Most restrictive policy: -->
+-  <site-control permitted-cross-domain-policies="none"/>
+-
+-  <!-- Least restrictive policy: -->
+-  <!--
+-  <site-control permitted-cross-domain-policies="all"/>
+-  <allow-access-from domain="*" to-ports="*" secure="false"/>
+-  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+-  -->
+-</cross-domain-policy>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.json
+deleted file mode 100644
+index 0f35392cf2e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/testem.json
++++ /dev/null
+@@ -1,12 +0,0 @@
+-{
+-  "framework": "qunit",
+-  "test_page": "tests/index.html?hidepassed",
+-  "disable_watching": true,
+-  "launch_in_ci": [
+-    "PhantomJS"
+-  ],
+-  "launch_in_dev": [
+-    "PhantomJS",
+-    "Chrome"
+-  ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/resolver.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/resolver.js
+deleted file mode 100644
+index 6e0f0ee9efa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/resolver.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Resolver from 'ember-resolver';
+-import config from '../../config/environment';
+-
+-var resolver = Resolver.create();
+-
+-resolver.namespace = {
+-  modulePrefix: config.modulePrefix,
+-  podModulePrefix: config.podModulePrefix
+-};
+-
+-export default resolver;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/start-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/start-app.js
+deleted file mode 100644
+index a7d05be317d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/helpers/start-app.js
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import Application from '../../app';
+-import config from '../../config/environment';
+-
+-export default function startApp(attrs) {
+-  var application;
+-
+-  var attributes = Ember.merge({}, config.APP);
+-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+-
+-  Ember.run(function() {
+-    application = Application.create(attributes);
+-    application.setupForTesting();
+-    application.injectTestHelpers();
+-  });
+-
+-  return application;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/index.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/index.html
+deleted file mode 100644
+index 36d4ed5012d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/index.html
++++ /dev/null
+@@ -1,52 +0,0 @@
+-<!--
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+--->
+-
+-<!DOCTYPE html>
+-<html>
+-  <head>
+-    <meta charset="utf-8">
+-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+-    <title>YarnUi Tests</title>
+-    <meta name="description" content="">
+-    <meta name="viewport" content="width=device-width, initial-scale=1">
+-
+-    {{content-for 'head'}}
+-    {{content-for 'test-head'}}
+-
+-    <link rel="stylesheet" href="assets/vendor.css">
+-    <link rel="stylesheet" href="assets/yarn-ui.css">
+-    <link rel="stylesheet" href="assets/test-support.css">
+-
+-    {{content-for 'head-footer'}}
+-    {{content-for 'test-head-footer'}}
+-  </head>
+-  <body>
+-
+-    {{content-for 'body'}}
+-    {{content-for 'test-body'}}
+-    <script src="assets/vendor.js"></script>
+-    <script src="assets/test-support.js"></script>
+-    <script src="assets/yarn-ui.js"></script>
+-    <script src="testem.js"></script>
+-    <script src="assets/test-loader.js"></script>
+-    <script src="assets/tests.js"></script>
+-
+-    {{content-for 'body-footer'}}
+-    {{content-for 'test-body-footer'}}
+-  </body>
+-</html>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
+deleted file mode 100644
+index fb2a73a3b3a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/app-timeout-bar-test.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('app-timeout-bar', 'Integration | Component | app timeout bar', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{app-timeout-bar}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/breadcrumb-bar-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/breadcrumb-bar-test.js
+deleted file mode 100644
+index 871bdd4856e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/breadcrumb-bar-test.js
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('breadcrumb-bar', 'Integration | Component | breadcrumb bar', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-	var breadcrumbs = [{
+-		text: "Home",
+-		routeName: "application"
+-	}, {
+-		text: "Test"
+-	}];
+-
+-	this.set("breadcrumbs", breadcrumbs);
+-
+-  this.render(hbs`{{breadcrumb-bar breadcrumbs=breadcrumbs}}`);
+-
+-  assert.equal(this.$('ol.breadcrumb li').length, 2);
+-  assert.equal(this.$('button.refresh').text(), 'Refresh');
+-});
+-
+-test('should trigger refresh action', function(assert) {
+-	this.on('refresh', function() {
+-		assert.ok("refresh action");
+-	});
+-
+-	this.render(hbs`{{breadcrumb-bar action="refresh"}}`);
+-
+-	this.$('button.refresh').click();
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/collapsible-panel-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/collapsible-panel-test.js
+deleted file mode 100644
+index b80eb076ea3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/collapsible-panel-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('collapsible-panel', 'Integration | Component | collapsible panel', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{collapsible-panel}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#collapsible-panel}}
+-      template block text
+-    {{/collapsible-panel}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/confirm-dialog-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/confirm-dialog-test.js
+deleted file mode 100644
+index fedf00bcb8d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/confirm-dialog-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('confirm-dialog', 'Integration | Component | confirm dialog', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{confirm-dialog}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#confirm-dialog}}
+-      template block text
+-    {{/confirm-dialog}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/deploy-service-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/deploy-service-test.js
+deleted file mode 100644
+index ba855a79503..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/deploy-service-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('deploy-service', 'Integration | Component | deploy service', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{deploy-service}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#deploy-service}}
+-      template block text
+-    {{/deploy-service}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
+deleted file mode 100644
+index 777b9a88c49..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-html-cell-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('em-table-html-cell', 'Integration | Component | em table html cell', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{em-table-html-cell}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#em-table-html-cell}}
+-      template block text
+-    {{/em-table-html-cell}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js
+deleted file mode 100644
+index 5cc03ea9644..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-simple-status-cell-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('em-table-simple-status-cell', 'Integration | Component | em table simple status cell', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{em-table-simple-status-cell}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#em-table-simple-status-cell}}
+-      template block text
+-    {{/em-table-simple-status-cell}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-tooltip-text-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-tooltip-text-test.js
+deleted file mode 100644
+index fb7d2116f8c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/em-table-tooltip-text-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('em-table-tooltip-text', 'Integration | Component | em table tooltip text', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{em-table-tooltip-text}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#em-table-tooltip-text}}
+-      template block text
+-    {{/em-table-tooltip-text}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/fileconfig-viewer-dialog-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/fileconfig-viewer-dialog-test.js
+deleted file mode 100644
+index f99e08f84d6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/fileconfig-viewer-dialog-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('fileconfig-viewer-dialog', 'Integration | Component | fileconfig viewer dialog', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{fileconfig-viewer-dialog}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#fileconfig-viewer-dialog}}
+-      template block text
+-    {{/fileconfig-viewer-dialog}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/info-tooltip-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/info-tooltip-test.js
+deleted file mode 100644
+index 7b0c1a187f0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/info-tooltip-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('info-tooltip', 'Integration | Component | info tooltip', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{info-tooltip}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#info-tooltip}}
+-      template block text
+-    {{/info-tooltip}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/metrics-table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/metrics-table-test.js
+deleted file mode 100644
+index f6f9ef0a4c8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/metrics-table-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('metrics-table', 'Integration | Component | metrics table', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{metrics-table}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#metrics-table}}
+-      template block text
+-    {{/metrics-table}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-component-table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-component-table-test.js
+deleted file mode 100644
+index 3ea27a566a3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-component-table-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('service-component-table', 'Integration | Component | service component table', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{service-component-table}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#service-component-table}}
+-      template block text
+-    {{/service-component-table}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-config-table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-config-table-test.js
+deleted file mode 100644
+index 39f269add5b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-config-table-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('service-config-table', 'Integration | Component | service config table', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{service-config-table}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#service-config-table}}
+-      template block text
+-    {{/service-config-table}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-fileconfig-table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-fileconfig-table-test.js
+deleted file mode 100644
+index a486fa0979a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/service-fileconfig-table-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('service-fileconfig-table', 'Integration | Component | service fileconfig table', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{service-fileconfig-table}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#service-fileconfig-table}}
+-      template block text
+-    {{/service-fileconfig-table}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
+deleted file mode 100644
+index 7298e65eaf0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/simple-bar-chart-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('simple-bar-chart', 'Integration | Component | simple bar chart', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{simple-bar-chart}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#simple-bar-chart}}
+-      template block text
+-    {{/simple-bar-chart}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/upload-config-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/upload-config-test.js
+deleted file mode 100644
+index 64fdf4a8a2d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/upload-config-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('upload-config', 'Integration | Component | upload config', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{upload-config}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#upload-config}}
+-      template block text
+-    {{/upload-config}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/yarn-queue-partition-capacity-labels-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/yarn-queue-partition-capacity-labels-test.js
+deleted file mode 100644
+index 414e326d30b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/integration/components/yarn-queue-partition-capacity-labels-test.js
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+- import { moduleForComponent, test } from 'ember-qunit';
+-import hbs from 'htmlbars-inline-precompile';
+-
+-moduleForComponent('yarn-queue-partition-capacity-labels', 'Integration | Component | yarn queue partition capacity labels', {
+-  integration: true
+-});
+-
+-test('it renders', function(assert) {
+-
+-  // Set any properties with this.set('myProperty', 'value');
+-  // Handle any actions with this.on('myAction', function(val) { ... });" + EOL + EOL +
+-
+-  this.render(hbs`{{yarn-queue-partition-capacity-labels}}`);
+-
+-  assert.equal(this.$().text().trim(), '');
+-
+-  // Template block usage:" + EOL +
+-  this.render(hbs`
+-    {{#yarn-queue-partition-capacity-labels}}
+-      template block text
+-    {{/yarn-queue-partition-capacity-labels}}
+-  `);
+-
+-  assert.equal(this.$().text().trim(), 'template block text');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/test-helper.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/test-helper.js
+deleted file mode 100644
+index 96975ee7e49..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/test-helper.js
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import resolver from './helpers/resolver';
+-import {
+-  setResolver
+-} from 'ember-qunit';
+-
+-setResolver(resolver);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-attempt-test.js
+deleted file mode 100644
+index cf03f9da1c4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-attempt-test.js
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-moduleFor('adapter:yarn-app-attempt', 'Unit | Adapter | yarn app attempt', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  assert.ok(adapter);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.ok(adapter.urlForQuery);
+-  assert.ok(adapter.urlForFindRecord);
+-  assert.equal(adapter.namespace, "ws/v1/cluster");
+-});
+-
+-test("urlForQuery test", function(assert) {
+-	let adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  var host = adapter.host;
+-  assert.equal(adapter.urlForQuery({appId: "application_1472139065385_0007"}),
+-    host + "/ws/v1/cluster/apps/application_1472139065385_0007/appattempts");
+-});
+-
+-test("urlForFindRecord test", function(assert) {
+-	let adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  var host = adapter.host;
+-  var attemptId = "appattempt_1472139065385_0007_000001";
+-	assert.equal(adapter.urlForFindRecord(attemptId),
+-		host + "/ws/v1/cluster/apps/" +
+-		Converter.attemptIdToAppId(attemptId) + "/appattempts/" + attemptId);
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-log-test.js
+deleted file mode 100644
+index 83b3c59e4c4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-app-log', 'Unit | Adapter | yarn app log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-test.js
+deleted file mode 100644
+index 9218f000d28..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-test.js
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-app', 'Unit | Adapter | yarn app', {
+-  unit: true
+-});
+-
+-// Replace this with your real tests.
+-test('Basic creation test', function(assert) {
+-  var adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForQuery);
+-  assert.ok(adapter.urlForFindRecord);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal(adapter.namespace, "ws/v1/cluster");
+-});
+-
+-test("urlForQuery test", function(assert) {
+-	var adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  var host = adapter.host;
+-  assert.equal(adapter.urlForQuery({state: "RUNNING"}),
+-    host + "/ws/v1/cluster/apps/?state=RUNNING");
+-});
+-
+-test("urlForFindRecord test", function(assert) {
+-	var adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  var host = adapter.host;
+-  var appId= "application_1111111111_1111";
+-  assert.equal(adapter.urlForFindRecord(appId),
+-    host + "/ws/v1/cluster/apps/" + appId);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
+deleted file mode 100644
+index e53d28914f0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-app-timeline-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-app-timeline', 'Unit | Adapter | yarn app timeline', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-component-instance-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-component-instance-test.js
+deleted file mode 100644
+index f1eaba607f0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-component-instance-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-component-instance', 'Unit | Adapter | yarn component instance', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-conf-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-conf-test.js
+deleted file mode 100644
+index c892933341e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-conf-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-conf', 'Unit | Adapter | yarn conf', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-log-test.js
+deleted file mode 100644
+index 7335db4d0bd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-log-test.js
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Constants from 'yarn-ui/constants';
+-
+-moduleFor('adapter:yarn-container-log', 'Unit | Adapter | ContainerLog', {
+-  unit: true
+-});
+-
+-test('Basic creation', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "ws/v1/node"
+-  });
+-
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForFindRecord);
+-  assert.ok(adapter.ajax);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal(adapter.headers.Accept, "text/plain");
+-  assert.equal(adapter.namespace, "ws/v1/node");
+-});
+-
+-test('urlForFindRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200/",
+-    namespace: "ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(adapter.urlForFindRecord("localhost:8042" +
+-      Constants.PARAM_SEPARATOR + "container_e27_11111111111_0001_01_000001" +
+-      Constants.PARAM_SEPARATOR + "syslog"),
+-      host + "localhost:8042/ws/v1/node/containerlogs/" +
+-      "container_e27_11111111111_0001_01_000001/syslog");
+-});
+-
+-test('ajaxOptions test', function(assert) {
+-  let adapter = this.subject();
+-  var hash = adapter.ajaxOptions('/containerlogs', 'type', {});
+-  assert.equal(hash.dataType, 'text');
+-});
+-
+-test('findRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200/",
+-    namespace: "ws/v1/node"
+-  });
+-  let testModel = { modelName: "testModel" },
+-      testStore = {},
+-      testSnapshot = {};
+-  let host = adapter.host;
+-  let testId = "localhost:8042" + Constants.PARAM_SEPARATOR +
+-      "container_e27_11111111111_0001_01_000001" + Constants.PARAM_SEPARATOR +
+-      "syslog";
+-  assert.expect(2);
+-
+-  adapter.ajax = function (url, method) {
+-    assert.equal(url, host + "localhost:8042/ws/v1/node/containerlogs/" +
+-        "container_e27_11111111111_0001_01_000001/syslog");
+-    assert.equal(method, 'GET');
+-  };
+-
+-  adapter.findRecord(testStore, testModel, testId, testSnapshot);
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-test.js
+deleted file mode 100644
+index cc92773bd7d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-container-test.js
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-container', 'Unit | Adapter | yarn container', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:8088",
+-    namespace: "ws/v1/cluster"
+-  });
+-  assert.ok(adapter);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.ok(adapter.urlForQuery);
+-  assert.ok(adapter.ajax);
+-  assert.equal(adapter.headers.Accept, "application/json");
+-  assert.equal(adapter.namespace, "ws/v1/cluster");
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-log-test.js
+deleted file mode 100644
+index 04664cc85a3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-log', 'Unit | Adapter | yarn log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-metrics-test.js
+deleted file mode 100644
+index 10941d20dd3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-metrics-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-metrics', 'Unit | Adapter | yarn metrics', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-app-test.js
+deleted file mode 100644
+index bc7ea9a33e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-app-test.js
++++ /dev/null
+@@ -1,107 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-node-app', 'Unit | Adapter | NodeApp', {
+-  unit: true
+-});
+-
+-test('Basic creation', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  assert.expect(11);
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForQueryRecord);
+-  assert.ok(adapter.queryRecord);
+-  assert.ok(adapter.urlForQuery);
+-  assert.ok(adapter.query);
+-  assert.ok(adapter.ajax);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal("application/json", adapter.headers.Accept);
+-  assert.equal("{nodeAddress}/ws/v1/node", adapter.namespace);
+-});
+-
+-test('urlForQueryRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(
+-      host + "/localhost:8042/ws/v1/node/apps/application_1111111111_1111",
+-      adapter.urlForQueryRecord(
+-      {nodeAddr: "localhost:8042", appId: "application_1111111111_1111"}));
+-});
+-
+-test('urlForQuery test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(host + "/localhost:8042/ws/v1/node/apps",
+-      adapter.urlForQuery({nodeAddr: "localhost:8042"}));
+-});
+-
+-test('query test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let testModel = { modelName: "testModel" },
+-      testStore = {},
+-      testQuery = {nodeAddr: "localhost:8042"};
+-  let host = adapter.host;
+-  assert.expect(3);
+-
+-  adapter.ajax = function (url, method, hash) {
+-    assert.equal(host + "/localhost:8042/ws/v1/node/apps", url);
+-    assert.equal('GET', method);
+-    assert.equal(null, hash.data);
+-  };
+-
+-  adapter.query(testStore, testModel, testQuery);
+-});
+-
+-test('queryRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let testModel = { modelName: "testModel" },
+-      testStore = {},
+-      testQuery = {
+-        nodeAddr: "localhost:8042",
+-        appId: "application_1111111111_1111"
+-      };
+-  let host = adapter.host;
+-  assert.expect(3);
+-
+-  adapter.ajax = function (url, method, hash) {
+-    assert.equal(host + "/localhost:8042/ws/v1/node/apps/application_1111111111_1111", url);
+-    assert.equal('GET', method);
+-    assert.equal(null, hash.data);
+-  };
+-
+-  adapter.queryRecord(testStore, testModel, testQuery);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-container-test.js
+deleted file mode 100644
+index d61d86838ef..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-container-test.js
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-node-container', 'Unit | Adapter | NodeContainer', {
+-  unit: true
+-});
+-
+-test('Basic creation', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  assert.expect(11);
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForQueryRecord);
+-  assert.ok(adapter.queryRecord);
+-  assert.ok(adapter.urlForQuery);
+-  assert.ok(adapter.query);
+-  assert.ok(adapter.ajax);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal("application/json", adapter.headers.Accept);
+-  assert.equal("{nodeAddress}/ws/v1/node", adapter.namespace);
+-});
+-
+-test('urlForQueryRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(host + "/localhost:8042/ws/v1/node/containers/" +
+-      "container_e27_11111111111_0001_01_000001",
+-      adapter.urlForQueryRecord(
+-      {nodeHttpAddr: "localhost:8042",
+-      containerId: "container_e27_11111111111_0001_01_000001"}));
+-});
+-
+-test('urlForQuery test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(host + "/localhost:8042/ws/v1/node/containers",
+-      adapter.urlForQuery({nodeHttpAddr: "localhost:8042"}));
+-});
+-
+-test('query test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let testModel = { modelName: "testModel" },
+-      testStore = {},
+-      testQuery = {nodeHttpAddr: "localhost:8042"};
+-  let host = adapter.host;
+-  assert.expect(3);
+-
+-  adapter.ajax = function (url, method, hash) {
+-    assert.equal(host + "/localhost:8042/ws/v1/node/containers", url);
+-    assert.equal('GET', method);
+-    assert.equal(null, hash.data);
+-  };
+-
+-  adapter.query(testStore, testModel, testQuery);
+-});
+-
+-test('queryRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let testModel = { modelName: "testModel" },
+-      testStore = {},
+-      testQuery = {
+-        nodeHttpAddr: "localhost:8042",
+-        containerId: "container_e27_11111111111_0001_01_000001"
+-      };
+-  let host = adapter.host;
+-  assert.expect(3);
+-
+-  adapter.ajax = function (url, method, hash) {
+-    assert.equal(host + "/localhost:8042/ws/v1/node/containers/" +
+-        "container_e27_11111111111_0001_01_000001", url);
+-    assert.equal('GET', method);
+-    assert.equal(null, hash.data);
+-  };
+-
+-  adapter.queryRecord(testStore, testModel, testQuery);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-test.js
+deleted file mode 100644
+index 2730efb1efa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-node-test.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-node', 'Unit | Adapter | Node', {
+-  unit: true
+-});
+-
+-test('Basic creation', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForFindRecord);
+-  assert.ok(adapter.ajax);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal(adapter.headers.Accept, "application/json");
+-  assert.equal(adapter.namespace, "{nodeAddress}/ws/v1/node");
+-});
+-
+-test('urlForFindRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "{nodeAddress}/ws/v1/node"
+-  });
+-  let host = adapter.host;
+-  assert.equal(adapter.urlForFindRecord("localhost:8042"),
+-      host + "/localhost:8042/ws/v1/node");
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-log-test.js
+deleted file mode 100644
+index b7369572294..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-rm-log', 'Unit | Adapter | yarn rm log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-node-test.js
+deleted file mode 100644
+index adf65c0a4ab..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-rm-node-test.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-rm-node', 'Unit | Adapter | RMNode', {
+-  unit: true
+-});
+-
+-test('Basic creation', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "ws/v1/cluster"
+-  });
+-
+-  assert.ok(adapter);
+-  assert.ok(adapter.urlForFindRecord);
+-  assert.ok(adapter.ajax);
+-  assert.ok(adapter.headers);
+-  assert.ok(adapter.host);
+-  assert.ok(adapter.namespace);
+-  assert.equal(adapter.headers.Accept, "application/json");
+-  assert.equal(adapter.namespace, "ws/v1/cluster");
+-});
+-
+-test('urlForFindRecord test', function(assert) {
+-  let adapter = this.subject({
+-    host: "localhost:4200",
+-    namespace: "ws/v1/cluster"
+-  });
+-  let host = adapter.host;
+-  assert.equal(adapter.urlForFindRecord("localhost:8042"),
+-      host + "/ws/v1/cluster/nodes/localhost:8042");
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-component-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-component-test.js
+deleted file mode 100644
+index 15b862b0172..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-component-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-service-component', 'Unit | Adapter | yarn service component', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-info-test.js
+deleted file mode 100644
+index 4ab8680dec0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-service-info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-service-info', 'Unit | Adapter | yarn service info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-servicedef-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-servicedef-test.js
+deleted file mode 100644
+index ea12bc50267..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-servicedef-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-servicedef', 'Unit | Adapter | yarn servicedef', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
+deleted file mode 100644
+index 013713fbc3c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-appattempt-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-timeline-appattempt', 'Unit | Adapter | yarn timeline appattempt', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
+deleted file mode 100644
+index 9167268c57e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/adapters/yarn-timeline-container-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('adapter:yarn-timeline-container', 'Unit | Adapter | yarn timeline container', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['serializer:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let adapter = this.subject();
+-  assert.ok(adapter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
+deleted file mode 100644
+index b8b77ad1b1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/app-table-columns-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:app-table-columns', 'Unit | Controller | app table columns', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempt-test.js
+deleted file mode 100644
+index 0d6c16c7df8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-attempt-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app-attempt', 'Unit | Controller | yarn app attempt', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-test.js
+deleted file mode 100644
+index 5f944ddde15..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app-test.js
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('controller:yarn-app', 'Unit | Controller | yarn app', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-  assert.ok(controller.amHostHttpAddressFormatted);
+-  var app = Ember.Object.create({
+-	amHostHttpAddress: 'localhost:8042'
+-  });
+-  controller.set('model', Ember.Object.create({app: app}));
+-  assert.equal(controller.get('amHostHttpAddressFormatted'), 'http://localhost:8042');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
+deleted file mode 100644
+index b8bad851ddc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/attempts-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/attempts', 'Unit | Controller | yarn app/attempts', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
+deleted file mode 100644
+index 91acb6c10ec..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/charts-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/charts', 'Unit | Controller | yarn app/charts', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/components-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/components-test.js
+deleted file mode 100644
+index 4ef38ffc0c7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/components-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/components', 'Unit | Controller | yarn app/components', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/configs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/configs-test.js
+deleted file mode 100644
+index 0b26cded04e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/configs-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/configs', 'Unit | Controller | yarn app/configs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
+deleted file mode 100644
+index 910d3ef1a46..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/info', 'Unit | Controller | yarn app/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/logs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/logs-test.js
+deleted file mode 100644
+index 87c8dded050..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-app/logs-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-app/logs', 'Unit | Controller | yarn app/logs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps-test.js
+deleted file mode 100644
+index baa67cca8d3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-apps', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  var controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
+deleted file mode 100644
+index a0042831374..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-apps/apps-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-apps/apps', 'Unit | Controller | yarn apps/apps', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance-test.js
+deleted file mode 100644
+index c8f29b9afe6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-component-instance', 'Unit | Controller | yarn component instance', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance/info-test.js
+deleted file mode 100644
+index 2abbe9fa0d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instance/info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-component-instance/info', 'Unit | Controller | yarn component instance/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances-test.js
+deleted file mode 100644
+index 8622c719a05..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-component-instances', 'Unit | Controller | yarn component instances', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/configs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/configs-test.js
+deleted file mode 100644
+index 63a6836753a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/configs-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-component-instances/configs', 'Unit | Controller | yarn component instances/configs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/info-test.js
+deleted file mode 100644
+index 328679a3fd9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-component-instances/info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-component-instances/info', 'Unit | Controller | yarn component instances/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-conf-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-conf-test.js
+deleted file mode 100644
+index adec93b82e4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-conf-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-conf', 'Unit | Controller | yarn conf', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-container-log-test.js
+deleted file mode 100644
+index 0f8dc030131..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-container-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-container-log', 'Unit | Controller | yarn container log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-deploy-service-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-deploy-service-test.js
+deleted file mode 100644
+index c3918f409d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-deploy-service-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-deploy-service', 'Unit | Controller | yarn deploy service', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
+deleted file mode 100644
+index 6ca796e1c1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-flow/info', 'Unit | Controller | yarn flow/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
+deleted file mode 100644
+index aa80a0ff87f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flow/runs-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-flow/runs', 'Unit | Controller | yarn flow/runs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
+deleted file mode 100644
+index 94233ba96c3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-flowrun/info', 'Unit | Controller | yarn flowrun/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
+deleted file mode 100644
+index 9f1650b5713..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-flowrun/metrics-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-flowrun/metrics', 'Unit | Controller | yarn flowrun/metrics', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-app-test.js
+deleted file mode 100644
+index 852efefa8d1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-app-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-node-app', 'Unit | Controller | yarn node app', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-apps-test.js
+deleted file mode 100644
+index 40c5d44f8e2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-apps-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-node-apps', 'Unit | Controller | yarn node apps', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
+deleted file mode 100644
+index c35e4139099..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-container-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-node-container', 'Unit | Controller | yarn node container', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-containers-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-containers-test.js
+deleted file mode 100644
+index 929adcdbd16..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-containers-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-node-containers', 'Unit | Controller | yarn node containers', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-test.js
+deleted file mode 100644
+index 59f443f06c4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-node-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-node', 'Unit | Controller | yarn node', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-heatmap-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-heatmap-test.js
+deleted file mode 100644
+index 4833302fda4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-heatmap-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-nodes-heatmap', 'Unit | Controller | yarn nodes heatmap', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-test.js
+deleted file mode 100644
+index ccd0bffbdcd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-nodes', 'Unit | Controller | yarn nodes', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
+deleted file mode 100644
+index fdf586e27d5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-nodes/table-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-nodes/table', 'Unit | Controller | yarn nodes/table', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
+deleted file mode 100644
+index 3abf21a2a88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queue/apps-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-queue/apps', 'Unit | Controller | yarn queue/apps', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queues-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queues-test.js
+deleted file mode 100644
+index 09782080c44..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-queues-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-queues', 'Unit | Controller | yarn queues', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-rm-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-rm-log-test.js
+deleted file mode 100644
+index 6f847bf4f4b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-rm-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-rm-log', 'Unit | Controller | yarn rm log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-services-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-services-test.js
+deleted file mode 100644
+index 53834e2d8fe..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-services-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-services', 'Unit | Controller | yarn services', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-tools-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-tools-test.js
+deleted file mode 100644
+index a92ee590491..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/controllers/yarn-tools-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('controller:yarn-tools', 'Unit | Controller | yarn tools', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  let controller = this.subject();
+-  assert.ok(controller);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/check-availability-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/check-availability-test.js
+deleted file mode 100644
+index 2a9db72c021..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/check-availability-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { checkAvailability } from '../../../helpers/check-availability';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Helper | check availability');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let result = checkAvailability(42);
+-  assert.ok(result);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/date-formatter-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/date-formatter-test.js
+deleted file mode 100644
+index 27232817793..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/date-formatter-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { dateFormatter } from '../../../helpers/date-formatter';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Helper | date formatter');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let result = dateFormatter(42);
+-  assert.ok(result);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/json-pretty-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/json-pretty-test.js
+deleted file mode 100644
+index a6bc7c29c72..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/json-pretty-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { jsonPretty } from '../../../helpers/json-pretty';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Helper | json pretty');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let result = jsonPretty(42);
+-  assert.ok(result);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/lower-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/lower-test.js
+deleted file mode 100644
+index 044a9626d0d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/lower-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { lower } from '../../../helpers/lower';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Helper | lower');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let result = lower(42);
+-  assert.ok(result);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
+deleted file mode 100644
+index 6dc8137c26f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/helpers/prepend-protocol-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { prependProtocol } from '../../../helpers/prepend-protocol';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Helper | prepend protocol');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let result = prependProtocol(42);
+-  assert.ok(result);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/env-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/env-test.js
+deleted file mode 100644
+index 025df978eca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/env-test.js
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import { initialize } from '../../../initializers/env';
+-import { module, test } from 'qunit';
+-
+-var application;
+-
+-module('Unit | Initializer | env', {
+-  beforeEach: function() {
+-    Ember.run(function() {
+-      application = Ember.Application.create();
+-      application.deferReadiness();
+-    });
+-  }
+-});
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  initialize(application);
+-
+-  // you would normally confirm the results of the initializer here
+-  assert.ok(true);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/hosts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/hosts-test.js
+deleted file mode 100644
+index 7aa510c863b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/hosts-test.js
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import { initialize } from '../../../initializers/hosts';
+-import { module, test } from 'qunit';
+-
+-var application;
+-
+-module('Unit | Initializer | hosts', {
+-  beforeEach: function() {
+-    Ember.run(function() {
+-      application = Ember.Application.create();
+-      application.deferReadiness();
+-    });
+-  }
+-});
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  initialize(application);
+-
+-  // you would normally confirm the results of the initializer here
+-  assert.ok(true);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
+deleted file mode 100644
+index cc32e929b92..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/initializers/loader-test.js
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import LoaderInitializer from '../../../initializers/loader';
+-import { module, test } from 'qunit';
+-
+-let application;
+-
+-module('Unit | Initializer | loader', {
+-  beforeEach() {
+-    Ember.run(function() {
+-      application = Ember.Application.create();
+-      application.deferReadiness();
+-    });
+-  }
+-});
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  LoaderInitializer.initialize(application);
+-
+-  // you would normally confirm the results of the initializer here
+-  assert.ok(true);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
+deleted file mode 100644
+index af7b3dca376..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/mixins/app-attempt-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Ember from 'ember';
+-import AppAttemptMixin from '../../../mixins/app-attempt';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Mixin | app attempt');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  let AppAttemptObject = Ember.Object.extend(AppAttemptMixin);
+-  let subject = AppAttemptObject.create();
+-  assert.ok(subject);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-info-test.js
+deleted file mode 100644
+index 153ff336be7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-info-test.js
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('cluster-info', 'Unit | Model | cluster info', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.startedOn);
+-  assert.ok(model.state);
+-  assert.ok(model.haState);
+-  assert.ok(model.rmStateStoreName);
+-  assert.ok(model.resourceManagerVersion);
+-  assert.ok(model.resourceManagerBuildVersion);
+-  assert.ok(model.hadoopVersion);
+-  assert.ok(model.hadoopBuildVersion);
+-  assert.ok(model.hadoopVersionBuiltOn);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-metric-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-metric-test.js
+deleted file mode 100644
+index 63defa488b0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/cluster-metric-test.js
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('cluster-metric', 'Unit | Model | cluster metric', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.appsSubmitted);
+-  assert.ok(model.appsCompleted);
+-  assert.ok(model.appsPending);
+-  assert.ok(model.appsRunning);
+-  assert.ok(model.appsFailed);
+-  assert.ok(model.appsKilled);
+-  assert.ok(model.reservedMB);
+-  assert.ok(model.availableMB);
+-  assert.ok(model.allocatedMB);
+-  assert.ok(model.reservedVirtualCores);
+-  assert.ok(model.availableVirtualCores);
+-  assert.ok(model.allocatedVirtualCores);
+-  assert.ok(model.containersAllocated);
+-  assert.ok(model.containersReserved);
+-  assert.ok(model.containersPending);
+-  assert.ok(model.totalMB);
+-  assert.ok(model.totalVirtualCores);
+-  assert.ok(model.totalNodes);
+-  assert.ok(model.lostNodes);
+-  assert.ok(model.unhealthyNodes);
+-  assert.ok(model.decommissionedNodes);
+-  assert.ok(model.rebootedNodes);
+-  assert.ok(model.activeNodes);
+-});
+-
+-test('Testing fields', function(assert) {
+-	let model = this.subject({
+-		"appsCompleted": 0,
+-    "appsPending": 0,
+-    "appsRunning": 0,
+-    "appsFailed": 0,
+-    "appsKilled": 0,
+-    "reservedMB": 0,
+-    "availableMB": 32768,
+-    "allocatedMB": 0,
+-    "activeNodes": 4,
+-    "unhealthyNodes": 0,
+-    "decommissionedNodes": 0,
+-    "reservedVirtualCores": 0,
+-    "availableVirtualCores": 32,
+-    "allocatedVirtualCores": 0
+-	});
+-
+-	assert.deepEqual(model.get('getFinishedAppsDataForDonutChart'),
+-		[{label: "Completed", value: 0}, {label: "Killed", value: 0}, {label: "Failed", value: 0}]);
+-	assert.deepEqual(model.get('getRunningAppsDataForDonutChart'),
+-		[{label: "Pending", value: 0}, {label: "Running", value: 0}]);
+-	assert.deepEqual(model.get('getNodesDataForDonutChart'),
+-		[{label: "Active", value: 4}, {label: "Unhealthy", value: 0}, {label: "Decommissioned", value: 0}]);
+-	assert.deepEqual(model.get('getMemoryDataForDonutChart'),
+-		[{label: "Allocated", value: 0}, {label: "Reserved", value: 0}, {label: "Available", value: 32768}]);
+-	assert.deepEqual(model.get('getVCoreDataForDonutChart'),
+-		[{label: "Allocated", value: 0}, {label: "Reserved", value: 0}, {label: "Available", value: 32}]);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-attempt-test.js
+deleted file mode 100644
+index 7217b16d0c4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-attempt-test.js
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-moduleForModel('yarn-app-attempt', 'Unit | Model | yarn app attempt', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.startTime);
+-  assert.ok(model.startedTime);
+-  assert.ok(model.finishedTime);
+-  assert.ok(model.containerId);
+-  assert.ok(model.amContainerId);
+-  assert.ok(model.nodeHttpAddress);
+-  assert.ok(model.nodeId);
+-  assert.ok(model.hosts);
+-  assert.ok(model.logsLink);
+-  assert.ok(model.state);
+-  assert.ok(model.appAttemptId);
+-});
+-
+-test('Testing fields', function(assert) {
+-	let model = this.subject({
+-		"id": "appattempt_1479277364592_0001_000001",
+-		"startedTime": Converter.timeStampToDate("1479280913398"),
+-		"finishedTime": Converter.timeStampToDate("1479280966401"),
+-    "amContainerId": "container_e01_1479277364592_0001_01_000001",
+-    "hosts": "N/A",
+-    "state": "FINISHED",
+-    "appAttemptId": "appattempt_1479277364592_0001_000001"
+-	});
+-
+-	assert.equal(model.get('appId'), "application_1479277364592_0001");
+-	assert.equal(model.get('startTs'), 1479280913000);
+-	assert.equal(model.get('finishedTs'), 1479280966000);
+-	assert.equal(model.get('shortAppAttemptId'), "appattempt_1479277364592_0001_000001");
+-	assert.equal(model.get('appMasterContainerId'), "container_e01_1479277364592_0001_01_000001");
+-	assert.equal(model.get('IsAmNodeUrl'), false);
+-	assert.equal(model.get('amNodeId'), "N/A");
+-	assert.equal(model.get('IsLinkAvailable'), false);
+-	assert.equal(model.get('elapsedTime'), "53 Secs");
+-	assert.equal(model.get('link'), "/yarn-app-attempt/appattempt_1479277364592_0001_000001");
+-	assert.equal(model.get('linkname'), "yarn-app-attempt");
+-	assert.equal(model.get('attemptState'), "FINISHED");
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-test.js
+deleted file mode 100644
+index 103a63b6a56..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-test.js
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-app', 'Unit | Model | yarn app', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  var model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.appName);
+-  assert.ok(model.user);
+-  assert.ok(model.queue);
+-  assert.ok(model.state);
+-  assert.ok(model.startTime);
+-  assert.ok(model.elapsedTime);
+-  assert.ok(model.finalStatus);
+-  assert.ok(model.finishedTime);
+-  assert.ok(model.progress);
+-  assert.ok(model.diagnostics);
+-  assert.ok(model.amContainerLogs);
+-  assert.ok(model.amHostHttpAddress);
+-  assert.ok(model.logAggregationStatus);
+-  assert.ok(model.unmanagedApplication);
+-  assert.ok(model.amNodeLabelExpression);
+-  assert.ok(model.applicationTags);
+-  assert.ok(model.applicationType);
+-  assert.ok(model.priority);
+-  assert.ok(model.allocatedMB);
+-  assert.ok(model.allocatedVCores);
+-  assert.ok(model.runningContainers);
+-  assert.ok(model.memorySeconds);
+-  assert.ok(model.vcoreSeconds);
+-  assert.ok(model.preemptedResourceMB);
+-  assert.ok(model.preemptedResourceVCores);
+-  assert.ok(model.numNonAMContainerPreempted);
+-  assert.ok(model.numAMContainerPreempted);
+-  assert.ok(model.clusterUsagePercentage);
+-  assert.ok(model.queueUsagePercentage);
+-  assert.ok(model.currentAppAttemptId);
+-});
+-
+-test('Testing fields', function(assert) {
+-	let model = this.subject({
+-		"finalStatus": "SUCCEEDED",
+-		"startedTime": 1479280923314,
+-    "finishedTime": 1479280966402,
+-    "allocatedMB": 0,
+-    "allocatedVCores": 0,
+-    "preemptedResourceMB": 0,
+-    "preemptedResourceVCores": 0,
+-    "memorySeconds": 93406,
+-    "vcoreSeconds": 49,
+-    "progress": 100,
+-    "runningContainers": 0
+-	});
+-
+-	assert.equal(model.get('isFailed'), false);
+-	assert.equal(model.get('validatedFinishedTs'), 1479280966402);
+-	assert.equal(model.get('allocatedResource'), '0 MBs, 0 VCores');
+-	assert.equal(model.get('preemptedResource'), '0 MBs, 0 VCores');
+-	assert.equal(model.get('aggregatedResourceUsage'), '93406 MBs, 49 VCores (× Secs)');
+-	assert.equal(model.get('progressStyle'), 'width: 100%');
+-	assert.equal(model.get('runningContainersNumber'), 0);
+-	assert.equal(model.get('finalStatusStyle'), 'label label-success');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
+deleted file mode 100644
+index e2d7e2a2cbd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-app-timeline-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-app-timeline', 'Unit | Model | yarn app timeline', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-component-instance-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-component-instance-test.js
+deleted file mode 100644
+index 0c79c392b74..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-component-instance-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-component-instance', 'Unit | Model | yarn component instance', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-conf-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-conf-test.js
+deleted file mode 100644
+index 68ea891059d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-conf-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-conf', 'Unit | Model | yarn conf', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
+deleted file mode 100644
+index dcdf3782d37..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-log-test.js
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-container-log', 'Unit | Model | ContainerLog', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.logs);
+-  assert.ok(model.containerID);
+-  assert.ok(model.logFileName);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-test.js
+deleted file mode 100644
+index 90182d54f99..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-container-test.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-moduleForModel('yarn-container', 'Unit | Model | yarn container', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.allocatedMB);
+-  assert.ok(model.allocatedVCores);
+-  assert.ok(model.assignedNodeId);
+-  assert.ok(model.priority);
+-  assert.ok(model.startedTime);
+-  assert.ok(model.finishedTime);
+-  assert.ok(model.logUrl);
+-  assert.ok(model.containerExitStatus);
+-  assert.ok(model.containerState);
+-  assert.ok(model.nodeHttpAddress);
+-});
+-
+-test('Testing fields', function(assert) {
+-  let model = this.subject({
+-    startedTime: Converter.timeStampToDate(1481696493793),
+-    finishedTime: Converter.timeStampToDate(1481696501857)
+-  });
+-  assert.equal(model.get('startTs'), 1481696493000);
+-  assert.equal(model.get('finishedTs'), 1481696501000);
+-  assert.equal(model.get('elapsedTime'), '8 Secs');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-log-test.js
+deleted file mode 100644
+index 6c331b4d607..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-log', 'Unit | Model | yarn log', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-metrics-test.js
+deleted file mode 100644
+index 2068dc87c3f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-metrics-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-metrics', 'Unit | Model | yarn metrics', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
+deleted file mode 100644
+index 57f68756210..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-app-test.js
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleForModel('yarn-node-app', 'Unit | Model | NodeApp', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-
+-  assert.ok(model);
+-  assert.ok(model._notifyProperties);
+-  assert.ok(model.didLoad);
+-  assert.ok(model.appId);
+-  assert.ok(model.state);
+-  assert.ok(model.user);
+-  assert.ok(model.containers);
+-});
+-
+-test('test fields', function(assert) {
+-  let model = this.subject();
+-
+-  assert.expect(5);
+-  Ember.run(function () {
+-    model.set("id", "application_1456251210105_0002");
+-    model.set("state", "RUNNING");
+-    assert.equal(model.get("appStateStyle"), "label label-primary");
+-    assert.equal(model.get("isDummyApp"), false);
+-    model.set("id", "dummy");
+-    assert.equal(model.get("isDummyApp"), true);
+-    model.set("state", "FINISHED");
+-    assert.equal(model.get("appStateStyle"), "label label-success");
+-    model.set("state", "NEW");
+-    assert.equal(model.get("appStateStyle"), "label label-default");
+-  });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
+deleted file mode 100644
+index 7a664febd6e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-container-test.js
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleForModel('yarn-node-container', 'Unit | Model | NodeContainer', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-
+-  assert.ok(model);
+-  assert.ok(model._notifyProperties);
+-  assert.ok(model.didLoad);
+-  assert.ok(model.containerId);
+-  assert.ok(model.state);
+-  assert.ok(model.user);
+-  assert.ok(model.exitCode);
+-  assert.ok(model.totalMemoryNeeded);
+-  assert.ok(model.totalVCoresNeeded);
+-  assert.ok(model.containerLogFiles);
+-  assert.ok(model.isDummyContainer);
+-  assert.ok(model.containerStateStyle);
+-});
+-
+-test('test fields', function(assert) {
+-  let model = this.subject();
+-
+-  Ember.run(function () {
+-    model.set("id", "container_e32_1456000363780_0002_01_000003");
+-    model.set("state", "RUNNING");
+-    model.set("exitCode", "-1000");
+-    assert.equal(model.get("isDummyContainer"), false);
+-    assert.equal(model.get("containerStateStyle"), "label label-primary");
+-    model.set("id", "dummy");
+-    assert.equal(model.get("isDummyContainer"), true);
+-    model.set("state", "EXITED_WITH_SUCCESS");
+-    assert.equal(model.get("containerStateStyle"), "label label-success");
+-    model.set("state", "EXITED_WITH_FAILURE");
+-    assert.equal(model.get("containerStateStyle"), "label label-danger");
+-    model.set("state", "DONE");
+-    model.set("exitCode", "0");
+-    assert.equal(model.get("containerStateStyle"), "label label-success");
+-    model.set("exitCode", "-105");
+-    assert.equal(model.get("containerStateStyle"), "label label-danger");
+-  });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
+deleted file mode 100644
+index decfca67290..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-node-test.js
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-node', 'Unit | Model | Node', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-
+-  assert.ok(model);
+-  assert.ok(model._notifyProperties);
+-  assert.ok(model.didLoad);
+-  assert.ok(model.totalVmemAllocatedContainersMB);
+-  assert.ok(model.vmemCheckEnabled);
+-  assert.ok(model.pmemCheckEnabled);
+-  assert.ok(model.nodeHealthy);
+-  assert.ok(model.lastNodeUpdateTime);
+-  assert.ok(model.healthReport);
+-  assert.ok(model.nmStartupTime);
+-  assert.ok(model.nodeManagerBuildVersion);
+-  assert.ok(model.hadoopBuildVersion);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-queue-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-queue-test.js
+deleted file mode 100644
+index 590c57c388b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-queue-test.js
++++ /dev/null
+@@ -1,122 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleForModel('yarn-queue', 'Unit | Model | yarn queue', {
+-  needs: ['model:yarn-user']
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.name);
+-  assert.ok(model.children);
+-  assert.ok(model.parent);
+-  assert.ok(model.capacity);
+-  assert.ok(model.maxCapacity);
+-  assert.ok(model.usedCapacity);
+-  assert.ok(model.absCapacity);
+-  assert.ok(model.absMaxCapacity);
+-  assert.ok(model.absUsedCapacity);
+-  assert.ok(model.state);
+-  assert.ok(model.userLimit);
+-  assert.ok(model.userLimitFactor);
+-  assert.ok(model.preemptionDisabled);
+-  assert.ok(model.numPendingApplications);
+-  assert.ok(model.numActiveApplications);
+-  assert.ok(model.users);
+-});
+-
+-test('Test fields', function(assert) {
+-	let model = this.subject();
+-	Ember.run(function() {
+-		model.set('name', 'default');
+-		model.set('children', []);
+-		model.set('parent', 'root');
+-		model.set('capacity', 100);
+-		model.set('maxCapacity', 100);
+-		model.set('usedCapacity', 0);
+-		model.set('absCapacity', 100);
+-		model.set('absMaxCapacity', 100);
+-		model.set('absUsedCapacity', 0);
+-		model.set('state', 'RUNNING');
+-		model.set('userLimit', 100);
+-		model.set('userLimitFactor', 1.0);
+-		model.set('preemptionDisabled', true);
+-		model.set('numPendingApplications', 0);
+-		model.set('numActiveApplications', 0);
+-
+-		assert.equal(model.get('isLeafQueue'), true);
+-		assert.deepEqual(model.get('capacitiesBarChartData'),
+-			[{label: "Absolute Capacity", value: 100},
+-			{label: "Absolute Used", value: 0},
+-			{label: "Absolute Max Capacity", value: 100}]);
+-		assert.deepEqual(model.get('userUsagesDonutChartData'), []);
+-		assert.equal(model.get('hasUserUsages'), false);
+-		assert.deepEqual(model.get('numOfApplicationsDonutChartData'),
+-			[{label: "Pending Apps", value: 0}, {label: "Active Apps", value: 0}]);
+-
+-    var user1 = model.store.createRecord('yarn-user', {
+-      name: 'user1',
+-      usedMemoryMB: 2048
+-    });
+-    model.set('users', [user1]);
+-    assert.deepEqual(model.get('userUsagesDonutChartData'),
+-      [{label: 'user1', value: 2048}]);
+-    assert.equal(model.get('hasUserUsages'), true);
+-
+-    model.set('name', 'root');
+-    let child = this.subject({
+-      name: 'default'
+-    });
+-    model.set('children', [child]);
+-    model.set('parent', '');
+-    model.set('capacity', 100);
+-		model.set('maxCapacity', 100);
+-		model.set('usedCapacity', 0);
+-		model.set('absCapacity', 100);
+-		model.set('absMaxCapacity', 100);
+-		model.set('absUsedCapacity', 0);
+-		model.set('state', 'RUNNING');
+-    model.set('numPendingApplications', 0);
+-		model.set('numActiveApplications', 0);
+-
+-    assert.equal(model.get('isLeafQueue'), false);
+-    assert.deepEqual(model.get('capacitiesBarChartData'),
+-      [
+-        {label: "Absolute Capacity", value: 100},
+-        {label: "Absolute Used", value: 0},
+-        {label: "Absolute Max Capacity", value: 100}
+-      ]);
+-    assert.deepEqual(model.get('numOfApplicationsDonutChartData'),
+-      [
+-        {label: "Pending Apps", value: 0},
+-        {label: "Active Apps", value: 0}
+-      ]);
+-	}.bind(this));
+-});
+-
+-test('Test relationship with yarn-user', function(assert) {
+-	let YarnQueue = this.store().modelFor('yarn-queue');
+-	let relationship = Ember.get(YarnQueue, 'relationshipsByName').get('users');
+-	assert.expect(2);
+-	assert.equal(relationship.key, 'users');
+-  assert.equal(relationship.kind, 'hasMany');
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-log-test.js
+deleted file mode 100644
+index 6adf3d9fb7d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-log-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-rm-log', 'Unit | Model | yarn rm log', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
+deleted file mode 100644
+index 9b18a365fcc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-rm-node-test.js
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleForModel('yarn-rm-node', 'Unit | Model | RMNode', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-
+-  assert.ok(model);
+-  assert.ok(model._notifyProperties);
+-  assert.ok(model.didLoad);
+-  assert.ok(model.rack);
+-  assert.ok(model.state);
+-  assert.ok(model.nodeHostName);
+-  assert.ok(model.nodeHTTPAddress);
+-  assert.ok(model.lastHealthUpdate);
+-  assert.ok(model.healthReport);
+-  assert.ok(model.numContainers);
+-  assert.ok(model.usedMemoryMB);
+-  assert.ok(model.availMemoryMB);
+-  assert.ok(model.usedVirtualCores);
+-  assert.ok(model.availableVirtualCores);
+-  assert.ok(model.version);
+-  assert.ok(model.nodeLabels);
+-  assert.ok(model.nodeLabelsAsString);
+-  assert.ok(model.nodeStateStyle);
+-  assert.ok(model.isDummyNode);
+-  assert.ok(model.getMemoryDataForDonutChart);
+-  assert.ok(model.getVCoreDataForDonutChart);
+-});
+-
+-test('test fields', function(assert) {
+-  let model = this.subject();
+-
+-  Ember.run(function () {
+-    model.set("rack", "/default-rack");
+-    model.set("state", "RUNNING");
+-    model.set("nodeHostName", "localhost");
+-    model.set("id", "localhost:64318");
+-    model.set("nodeHTTPAddress", "localhost:8042");
+-    model.set("usedMemoryMB", 1024);
+-    model.set("availMemoryMB", 7168);
+-    model.set("usedVirtualCores", 1);
+-    model.set("availableVirtualCores", 7);
+-    model.set("nodeLabels", ["x"]);
+-
+-    assert.equal(model.get("nodeLabelsAsString"), "x");
+-    assert.deepEqual(model.get("nodeStateStyle"), "label label-success");
+-    assert.deepEqual(model.get("getMemoryDataForDonutChart"),
+-        [{label: "Used", value: 1024}, {label: "Available", value: 7168}]);
+-    assert.deepEqual(model.get("getVCoreDataForDonutChart"),
+-        [{label: "Used", value: 1}, {label: "Available", value: 7}]);
+-    model.set("state", "SHUTDOWN");
+-    assert.deepEqual(model.get("nodeStateStyle"), "label label-danger");
+-    model.set("state", "REBOOTED");
+-    assert.deepEqual(model.get("nodeStateStyle"), "label label-warning");
+-    model.set("state", "NEW");
+-    assert.deepEqual(model.get("nodeStateStyle"), "label label-default");
+-    model.set("nodeLabels", ["x","y"]);
+-    assert.equal(model.get("nodeLabelsAsString"), "x");
+-    model.set("nodeLabels", undefined);
+-    assert.equal(model.get("nodeLabelsAsString"), "");
+-  });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-component-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-component-test.js
+deleted file mode 100644
+index d7476a21fb0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-component-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-service-component', 'Unit | Model | yarn service component', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-info-test.js
+deleted file mode 100644
+index 114be008bd4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-service-info-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-service-info', 'Unit | Model | yarn service info', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-servicedef-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-servicedef-test.js
+deleted file mode 100644
+index 141a94bddd5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-servicedef-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-servicedef', 'Unit | Model | yarn servicedef', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
+deleted file mode 100644
+index 854030d9fde..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-appattempt-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-timeline-appattempt', 'Unit | Model | yarn timeline appattempt', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
+deleted file mode 100644
+index bc9da86fc88..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-timeline-container-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-timeline-container', 'Unit | Model | yarn timeline container', {
+-  // Specify the other units that are required for this test.
+-  needs: []
+-});
+-
+-test('it exists', function(assert) {
+-  let model = this.subject();
+-  // let store = this.store();
+-  assert.ok(!!model);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-user-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-user-test.js
+deleted file mode 100644
+index 0afe3ef6664..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/models/yarn-user-test.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-user', 'Unit | Model | yarn user', {
+-  needs: []
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let model = this.subject();
+-  assert.ok(model);
+-  assert.ok(model.name);
+-  assert.ok(model.queueName);
+-  assert.ok(model.usedMemoryMB);
+-  assert.ok(model.usedVCore);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/cluster-overview-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/cluster-overview-test.js
+deleted file mode 100644
+index f4c281fc8bc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/cluster-overview-test.js
++++ /dev/null
+@@ -1,143 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:cluster-overview', 'Unit | Route | cluster overview', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-  assert.ok(route.afterModel);
+-  assert.ok(route.unloadAll);
+-});
+-
+-test('Test getting cluster metrics data', function(assert) {
+-	var response = {
+-		clusterMetrics: {
+-	    appsSubmitted: 0,
+-	    appsCompleted: 0,
+-	    appsPending: 0,
+-	    appsRunning: 0,
+-	    appsFailed: 0,
+-	    appsKilled: 0,
+-	    reservedMB: 0,
+-	    availableMB: 17408,
+-	    allocatedMB: 0,
+-	    reservedVirtualCores: 0,
+-	    availableVirtualCores: 7,
+-	    allocatedVirtualCores: 1,
+-	    containersAllocated: 0,
+-	    containersReserved: 0,
+-	    containersPending: 0,
+-	    totalMB: 17408,
+-	    totalVirtualCores: 8,
+-	    totalNodes: 1,
+-	    lostNodes: 0,
+-	    unhealthyNodes: 0,
+-	    decommissionedNodes: 0,
+-	    rebootedNodes: 0,
+-	    activeNodes: 1
+-	  }
+-	};
+-	var store = {
+-		findAll: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-		},
+-		query: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve({});
+-      });
+-		}
+-	};
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(3);
+-	route.model().then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.clusterMetrics);
+-		assert.deepEqual(model.clusterMetrics, response);
+-	});
+-});
+-
+-test("Test getting yarn app data", function(assert) {
+-	var response = {
+-	  "apps": {
+-	    "app": [{
+-		"finishedTime" : 1326815598530,
+-        "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001",
+-        "trackingUI" : "History",
+-        "state" : "FINISHED",
+-        "user" : "user1",
+-        "id" : "application_1326815542473_0001",
+-        "clusterId" : 1326815542473,
+-        "finalStatus" : "SUCCEEDED",
+-        "amHostHttpAddress" : "host.domain.com:8042",
+-        "amRPCAddress" : "host.domain.com:4201",
+-        "progress" : 100,
+-        "name" : "word count",
+-        "startedTime" : 1326815573334,
+-        "elapsedTime" : 25196,
+-        "diagnostics" : "",
+-        "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job/job_1326815542473",
+-        "queue" : "default",
+-        "allocatedMB" : 0,
+-        "allocatedVCores" : 0,
+-        "runningContainers" : 0,
+-        "applicationType" : "MAPREDUCE",
+-        "applicationTags" : "",
+-        "memorySeconds" : 151730,
+-        "vcoreSeconds" : 103,
+-        "unmanagedApplication" : "false",
+-        "applicationPriority" : 0,
+-        "appNodeLabelExpression" : "",
+-        "amnodeLabelExpression" : ""
+-	    }]
+-	  }
+-	};
+-	var store = {
+-		findAll: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve({});
+-      });
+-		},
+-		query: function(type) {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-				if (type === 'yarn-app') {
+-					resolve(response);
+-				} else {
+-					resolve({});
+-				}
+-      });
+-		}
+-	};
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(3);
+-	route.model().then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.apps);
+-		assert.deepEqual(model.apps, response);
+-	});
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
+deleted file mode 100644
+index 840b64b9604..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/timeline-error-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:timeline-error', 'Unit | Route | timeline error', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempt-test.js
+deleted file mode 100644
+index 10af7ca080a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-attempt-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app-attempt', 'Unit | Route | yarn app attempt', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-  assert.ok(route.unloadAll);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-test.js
+deleted file mode 100644
+index 5b7833e3983..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app-test.js
++++ /dev/null
+@@ -1,152 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-app', 'Unit | Route | yarn app', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-  assert.ok(route.unloadAll);
+-});
+-
+-test('Test getting yarn application data', function(assert) {
+-	var response = {
+-   "app" : {
+-      "finishedTime" : 1326824991300,
+-      "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326821518301_0005_01_000001",
+-      "trackingUI" : "History",
+-      "state" : "FINISHED",
+-      "user" : "user1",
+-      "id" : "application_1326821518301_0005",
+-      "clusterId" : 1326821518301,
+-      "finalStatus" : "SUCCEEDED",
+-      "amHostHttpAddress" : "host.domain.com:8042",
+-      "amRPCAddress" : "host.domain.com:4201",
+-      "progress" : 100,
+-      "name" : "Sleep job",
+-      "applicationType" : "Yarn",
+-      "startedTime" : 1326824544552,
+-      "elapsedTime" : 446748,
+-      "diagnostics" : "",
+-      "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5",
+-      "queue" : "a1",
+-      "memorySeconds" : 151730,
+-      "vcoreSeconds" : 103,
+-      "unmanagedApplication" : "false",
+-      "applicationPriority" : 0,
+-      "appNodeLabelExpression" : "",
+-      "amNodeLabelExpression" : ""
+-   }
+-	};
+-	var store = {
+-		find: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-		},
+-		findAll: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve({});
+-      });
+-		},
+-		query: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve([]);
+-      });
+-		}
+-	};
+-	var appId = "application_1326821518301_0005";
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(3);
+-	route.model({app_id: appId}).then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.app);
+-		assert.deepEqual(model.app, response);
+-	});
+-});
+-
+-test('Test getting yarm rm nodes data', function(assert) {
+-	var response = {
+-	  "nodes": {
+-	    "node": [{
+-        "rack":"\/default-rack",
+-        "state":"NEW",
+-        "id":"h2:1235",
+-        "nodeHostName":"h2",
+-        "nodeHTTPAddress":"h2:2",
+-        "healthStatus":"Healthy",
+-        "lastHealthUpdate":1324056895432,
+-        "healthReport":"Healthy",
+-        "numContainers":0,
+-        "usedMemoryMB":0,
+-        "availMemoryMB":8192,
+-        "usedVirtualCores":0,
+-        "availableVirtualCores":8
+-      },
+-      {
+-        "rack":"\/default-rack",
+-        "state":"NEW",
+-        "id":"h1:1234",
+-        "nodeHostName":"h1",
+-        "nodeHTTPAddress":"h1:2",
+-        "healthStatus":"Healthy",
+-        "lastHealthUpdate":1324056895092,
+-        "healthReport":"Healthy",
+-        "numContainers":0,
+-        "usedMemoryMB":0,
+-        "availMemoryMB":8192,
+-        "usedVirtualCores":0,
+-        "availableVirtualCores":8
+-      }]
+-	  }
+-	};
+-	var store = {
+-		find: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve({});
+-      });
+-		},
+-		findAll: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-		},
+-		query: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve([]);
+-      });
+-		}
+-	};
+-	var appId = "application_1326821518301_0005";
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(4);
+-	route.model({app_id: appId}).then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.nodes);
+-		assert.deepEqual(model.nodes.nodes.node[0], response.nodes.node[0]);
+-		assert.deepEqual(model.nodes.nodes.node[1], response.nodes.node[1]);
+-	});
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
+deleted file mode 100644
+index eaf2f65f58d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/attempts-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/attempts', 'Unit | Route | yarn app/attempts', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
+deleted file mode 100644
+index 1284c6f16a6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/charts-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/charts', 'Unit | Route | yarn app/charts', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/components-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/components-test.js
+deleted file mode 100644
+index 1dd8909a85f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/components-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/components', 'Unit | Route | yarn app/components', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/configs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/configs-test.js
+deleted file mode 100644
+index 7b90712402c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/configs-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/configs', 'Unit | Route | yarn app/configs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
+deleted file mode 100644
+index f7dd6c87cd0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/info', 'Unit | Route | yarn app/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/logs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/logs-test.js
+deleted file mode 100644
+index e1bc64e1b44..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-app/logs-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-app/logs', 'Unit | Route | yarn app/logs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-apps-test.js
+deleted file mode 100644
+index 5d65d65b2da..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-apps-test.js
++++ /dev/null
+@@ -1,136 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-apps', 'Unit | Route | yarn apps', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  var route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-  assert.ok(route.unloadAll);
+-});
+-
+-test("Test getting yarn applications data", function(assert) {
+-	var response = {
+-	  "apps": {
+-	    "app": [{
+-		"finishedTime" : 1326815598530,
+-        "amContainerLogs" : "http://host.domain.com:8042/node/containerlogs/container_1326815542473_0001_01_000001",
+-        "trackingUI" : "History",
+-        "state" : "FINISHED",
+-        "user" : "user1",
+-        "id" : "application_1326815542473_0001",
+-        "clusterId" : 1326815542473,
+-        "finalStatus" : "SUCCEEDED",
+-        "amHostHttpAddress" : "host.domain.com:8042",
+-        "amRPCAddress" : "host.domain.com:4201",
+-        "progress" : 100,
+-        "name" : "word count",
+-        "startedTime" : 1326815573334,
+-        "elapsedTime" : 25196,
+-        "diagnostics" : "",
+-        "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job/job_1326815542473",
+-        "queue" : "default",
+-        "allocatedMB" : 0,
+-        "allocatedVCores" : 0,
+-        "runningContainers" : 0,
+-        "applicationType" : "MAPREDUCE",
+-        "applicationTags" : "",
+-        "memorySeconds" : 151730,
+-        "vcoreSeconds" : 103,
+-        "unmanagedApplication" : "false",
+-        "applicationPriority" : 0,
+-        "appNodeLabelExpression" : "",
+-        "amnodeLabelExpression" : ""
+-	    }]
+-	  }
+-	};
+-	var store = {
+-		findAll: function(type) {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-				if (type === 'yarn-app') {
+-					resolve(response);
+-				} else {
+-					resolve({});
+-				}
+-      });
+-		}
+-	};
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(3);
+-	route.model().then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.apps);
+-		assert.deepEqual(model.apps, response);
+-	});
+-});
+-
+-test('Test getting cluster metrics data', function(assert) {
+-	var response = {
+-		"clusterMetrics": {
+-	    "appsSubmitted": 0,
+-	    "appsCompleted": 0,
+-	    "appsPending": 0,
+-	    "appsRunning": 0,
+-	    "appsFailed": 0,
+-	    "appsKilled": 0,
+-	    "reservedMB": 0,
+-	    "availableMB": 17408,
+-	    "allocatedMB": 0,
+-	    "reservedVirtualCores": 0,
+-	    "availableVirtualCores": 7,
+-	    "allocatedVirtualCores": 1,
+-	    "containersAllocated": 0,
+-	    "containersReserved": 0,
+-	    "containersPending": 0,
+-	    "totalMB": 17408,
+-	    "totalVirtualCores": 8,
+-	    "totalNodes": 1,
+-	    'lostNodes': 0,
+-	    "unhealthyNodes": 0,
+-	    "decommissionedNodes": 0,
+-	    'rebootedNodes': 0,
+-	    "activeNodes": 1
+-	  }
+-	};
+-	var store = {
+-		findAll: function(type) {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-				if (type === 'ClusterMetric') {
+-					resolve(response);
+-				} else {
+-					resolve({});
+-				}
+-      });
+-		}
+-	};
+-	var route = this.subject();
+-	route.set('store', store);
+-	assert.expect(3);
+-	route.model().then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.clusterMetrics);
+-		assert.deepEqual(model.clusterMetrics, response);
+-	});
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance-test.js
+deleted file mode 100644
+index b9ab2f07cc0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-component-instance', 'Unit | Route | yarn component instance', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance/info-test.js
+deleted file mode 100644
+index a2784ce305f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instance/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-component-instance/info', 'Unit | Route | yarn component instance/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances-test.js
+deleted file mode 100644
+index 6aee99a5832..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-component-instances', 'Unit | Route | yarn component instances', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/configs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/configs-test.js
+deleted file mode 100644
+index 281aabb1b58..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/configs-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-component-instances/configs', 'Unit | Route | yarn component instances/configs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/info-test.js
+deleted file mode 100644
+index 23d9bb89404..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-component-instances/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-component-instances/info', 'Unit | Route | yarn component instances/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-conf-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-conf-test.js
+deleted file mode 100644
+index 306fa93fa1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-conf-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-conf', 'Unit | Route | yarn conf', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
+deleted file mode 100644
+index d0a78ddc969..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-container-log-test.js
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-container-log', 'Unit | Route | ContainerLog', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting container log', function(assert) {
+-  var response = {
+-      logs: "This is syslog",
+-      containerID: "container_e32_1456000363780_0002_01_000001",
+-      logFileName: "syslog"};
+-  var store = {
+-    findRecord: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-    }
+-  };
+-  assert.expect(6);
+-  var route = this.subject();
+-  route.set('store', store);
+-  var model = route.model({node_id: "localhost:64318",
+-      node_addr: "localhost:8042",
+-      container_id: "container_e32_1456000363780_0002_01_000001",
+-      filename: "syslog"});
+-   model.then(function(value) {
+-     assert.ok(value);
+-     assert.ok(value.containerLog);
+-     assert.deepEqual(value.containerLog, response);
+-     assert.ok(value.nodeInfo);
+-     assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-     assert.equal(value.nodeInfo.id, 'localhost:64318');
+-   });
+-});
+-
+-/**
+- * This can happen when an empty response is sent from server
+- */
+-test('Test non HTTP error while getting container log', function(assert) {
+-  var error = {};
+-  var response = {
+-      logs: "",
+-      containerID: "container_e32_1456000363780_0002_01_000001",
+-      logFileName: "syslog"};
+-  var store = {
+-    findRecord: function() {
+-      return new Ember.RSVP.Promise(function(resolve, reject) {
+-        reject(error);
+-      });
+-    }
+-  };
+-  assert.expect(6);
+-  var route = this.subject();
+-  route.set('store', store);
+-  var model = route.model({node_id: "localhost:64318",
+-      node_addr: "localhost:8042",
+-      container_id: "container_e32_1456000363780_0002_01_000001",
+-      filename: "syslog"});
+-   model.then(function(value) {
+-     assert.ok(value);
+-     assert.ok(value.containerLog);
+-     assert.deepEqual(value.containerLog, response);
+-     assert.ok(value.nodeInfo);
+-     assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-     assert.equal(value.nodeInfo.id, 'localhost:64318');
+-   });
+-});
+-
+-test('Test HTTP error while getting container log', function(assert) {
+-  var error = {errors: [{status: 404, responseText: 'Not Found'}]};
+-  var store = {
+-    findRecord: function() {
+-      return new Ember.RSVP.Promise(function(resolve, reject) {
+-        reject(error);
+-      });
+-    }
+-  };
+-  assert.expect(5);
+-  var route = this.subject();
+-  route.set('store', store);
+-  var model = route.model({node_id: "localhost:64318",
+-      node_addr: "localhost:8042",
+-      container_id: "container_e32_1456000363780_0002_01_000001",
+-      filename: "syslog"});
+-   model.then(function(value) {
+-     assert.ok(value);
+-     assert.ok(value.errors);
+-     assert.equal(value.errors.length, 1);
+-     assert.equal(value.errors[0].status, 404);
+-     assert.equal(value.errors[0].responseText, 'Not Found');
+-   });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-deploy-service-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-deploy-service-test.js
+deleted file mode 100644
+index 4e2dcf1102f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-deploy-service-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-deploy-service', 'Unit | Route | yarn deploy service', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
+deleted file mode 100644
+index 4b5bd3839e2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-flow/info', 'Unit | Route | yarn flow/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
+deleted file mode 100644
+index f890b7655c0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flow/runs-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-flow/runs', 'Unit | Route | yarn flow/runs', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
+deleted file mode 100644
+index 5c24276b367..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-flowrun/info', 'Unit | Route | yarn flowrun/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
+deleted file mode 100644
+index ad3084077b3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-flowrun/metrics-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-flowrun/metrics', 'Unit | Route | yarn flowrun/metrics', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-metrics-test.js
+deleted file mode 100644
+index 13d109bd644..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-metrics-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-metric', 'Unit | Route | yarn metric', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
+deleted file mode 100644
+index a4f787e2fa4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-app-test.js
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-node-app', 'Unit | Route | NodeApp', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting specific app on a node', function(assert) {
+-  var response =
+-      {id:"application_1456251210105_0001", state:"FINISHED", user:"root"};
+-  var store = {
+-    queryRecord: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-    }
+-  };
+-  assert.expect(6);
+-  var route = this.subject();
+-  route.set('store', store);
+-  route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+-      app_id:"application_1456251210105_0001"})
+-    .then(
+-      function(value){
+-        assert.ok(value);
+-        assert.ok(value.nodeApp);
+-        assert.deepEqual(value.nodeApp, response);
+-        assert.ok(value.nodeInfo);
+-        assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-        assert.equal(value.nodeInfo.id, 'localhost:64318');
+-      }
+-    );
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
+deleted file mode 100644
+index 8666ca56510..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-apps-test.js
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-node-apps', 'Unit | Route | NodeApps', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting apps on a node', function(assert) {
+-  var response = [
+-      {id:"application_1456251210105_0001", state:"FINISHED", user:"root"},
+-      {id:"application_1456251210105_0002", state:"RUNNING",user:"root",
+-      containerids:["container_e38_1456251210105_0002_01_000001",
+-      "container_e38_1456251210105_0002_01_000002"]}];
+-  var store = {
+-    query: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response.slice());
+-      });
+-    }
+-  };
+-  assert.expect(8);
+-  var route = this.subject();
+-  route.set('store', store);
+-  route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+-    .then(
+-      function(value){
+-        assert.ok(value);
+-        assert.ok(value.apps);
+-        assert.equal(value.apps.length, 2);
+-        assert.deepEqual(response[0], value.apps[0]);
+-        assert.deepEqual(response[1], value.apps[1]);
+-        assert.ok(value.nodeInfo);
+-        assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-        assert.equal(value.nodeInfo.id, 'localhost:64318');
+-      }
+-    );
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
+deleted file mode 100644
+index f304d4239ce..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-container-test.js
++++ /dev/null
+@@ -1,61 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-node-container', 'Unit | Route | NodeContainer', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting specific container on a node', function(assert) {
+-  var response =
+-      {id: "container_e32_1456000363780_0002_01_000001", state: "RUNNING",
+-      exitCode:-1000,diagnostics:"",user:"root",totalMemoryNeededMB:2048,
+-      totalVCoresNeeded:1,containerLogsLink: "http://localhost:8042/node/" +
+-      "containerlogs/container_e32_1456000363780_0002_01_000001/root",
+-      nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
+-      "stdout"]};
+-  var store = {
+-    queryRecord: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-    }
+-  };
+-  assert.expect(6);
+-  var route = this.subject();
+-  route.set('store', store);
+-  route.model({node_id:"localhost:64318", node_addr:"localhost:8042",
+-        container_id:"container_e32_1456000363780_0002_01_000001"})
+-    .then(
+-      function(value){
+-        assert.ok(value);
+-        assert.ok(value.nodeContainer);
+-        assert.deepEqual(value.nodeContainer, response);
+-        assert.ok(value.nodeInfo);
+-        assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-        assert.equal(value.nodeInfo.id, 'localhost:64318');
+-      }
+-    );
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
+deleted file mode 100644
+index 5c25ca2c345..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-containers-test.js
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-node-containers', 'Unit | Route | NodeContainers', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting apps on a node', function(assert) {
+-  var response =
+-      [{id: "container_e32_1456000363780_0002_01_000001", state: "RUNNING",
+-      exitCode:-1000,diagnostics:"",user:"root",totalMemoryNeededMB:2048,
+-      totalVCoresNeeded:1,containerLogsLink: "http://localhost:8042/node/" +
+-      "containerlogs/container_e32_1456000363780_0002_01_000001/root",
+-      nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
+-      "stdout"]},
+-      {id:"container_e32_1456000363780_0002_01_000003", state:"RUNNING",
+-      exitCode:-1000, diagnostics:"", user:"root", totalMemoryNeededMB:1024,
+-      totalVCoresNeeded:1,containerLogsLink:"http://localhost:8042/node" +
+-      "/containerlogs/container_e32_1456000363780_0002_01_000003/root",
+-      nodeId:"localhost:64318",containerLogFiles:["syslog","stderr",
+-      "syslog.shuffle","stdout"]}];
+-  var store = {
+-    query: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response.slice());
+-      });
+-    }
+-  };
+-  assert.expect(8);
+-  var route = this.subject();
+-  route.set('store', store);
+-  route.model({node_id:"localhost:64318", node_addr:"localhost:8042"})
+-    .then(
+-      function(value){
+-        assert.ok(value);
+-        assert.ok(value.containers);
+-        assert.equal(value.containers.length, 2);
+-        assert.deepEqual(value.containers[0], response[0]);
+-        assert.deepEqual(value.containers[1], response[1]);
+-        assert.ok(value.nodeInfo);
+-        assert.equal(value.nodeInfo.addr, 'localhost:8042');
+-        assert.equal(value.nodeInfo.id, 'localhost:64318');
+-      }
+-    );
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
+deleted file mode 100644
+index cce08ded738..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-node-test.js
++++ /dev/null
+@@ -1,87 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-node', 'Unit | Route | Node', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting a node', function(assert) {
+-  var nodeResponse =
+-      {healthReport: "Healthy", totalVmemAllocatedContainersMB: 344064,
+-      totalPmemAllocatedContainersMB: 163840,
+-      totalVCoresAllocatedContainers: 160,
+-      vmemCheckEnabled: true, pmemCheckEnabled: true,
+-      lastNodeUpdateTime: 1456250210310, nodeHealthy: true,
+-      nodeManagerVersion: "3.0.0-SNAPSHOT",
+-      nodeManagerBuildVersion: "3.0.0-SNAPSHOT",
+-      nodeManagerVersionBuiltOn: "2000-01-01T00:00Z",
+-      hadoopVersion: "3.0.0-SNAPSHOT",
+-      hadoopBuildVersion: "3.0.0-SNAPSHOT",
+-      hadoopVersionBuiltOn: "2000-01-01T00:00Z",
+-      id: "localhost:64318", nodeHostName: "192.168.0.102",
+-      nmStartupTime: 1456250208231};
+-  var rmNodeResponse =
+-      {rack: "/default-rack", state: "RUNNING", id: "localhost:64318",
+-      nodeHostName: "localhost", nodeHTTPAddress: "localhost:8042",
+-      lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-      healthReport: "", numContainers: 0, usedMemoryMB: 0,
+-      availMemoryMB: 163840, usedVirtualCores: 0,
+-      availableVirtualCores: 160,
+-      resourceUtilization: {
+-      nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-      nodeCPUUsage: 0.14995001256465912,
+-      aggregatedContainersPhysicalMemoryMB: 0,
+-      aggregatedContainersVirtualMemoryMB: 0,
+-      containersCPUUsage: 0
+-      }};
+-
+-  // Create store which returns appropriate responses.
+-  var store = {
+-    findRecord: function(type) {
+-      if (type === 'yarn-node') {
+-        return new Ember.RSVP.Promise(function(resolve) {
+-          resolve(nodeResponse);
+-        });
+-      } else if (type === 'yarn-rm-node') {
+-        return new Ember.RSVP.Promise(function(resolve) {
+-          resolve(rmNodeResponse);
+-        });
+-      }
+-    }
+-  };
+-  var route = this.subject();
+-  assert.expect(4);
+-  route.set('store', store);
+-  route.model({
+-    node_addr:"localhost:8042",
+-    node_id:"localhost:64318"
+-  }).then(function(model) {
+-    assert.ok(model.node);
+-    assert.deepEqual(model.node, nodeResponse);
+-    assert.ok(model.rmNode);
+-    assert.deepEqual(model.rmNode, rmNodeResponse);
+-  });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
+deleted file mode 100644
+index 017ee9c103b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-nodes-test.js
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-nodes', 'Unit | Route | Nodes', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-});
+-
+-test('Test getting nodes', function(assert) {
+-  var response = [{
+-      rack: "/default-rack", state: "RUNNING", id: "192.168.1.1:64318",
+-      nodeHostName: "192.168.1.1", nodeHTTPAddress: "192.168.1.1:8042",
+-      lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-      healthReport: "", numContainers: 0, usedMemoryMB: 0,
+-      availMemoryMB: 163840, usedVirtualCores: 0,
+-      availableVirtualCores: 160,
+-      resourceUtilization: {
+-        nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-        nodeCPUUsage: 0.14995001256465912,
+-        aggregatedContainersPhysicalMemoryMB: 0,
+-        aggregatedContainersVirtualMemoryMB: 0,
+-        containersCPUUsage: 0
+-      }},
+-      {rack: "/default-rack", state: "RUNNING", id: "192.168.1.2:64318",
+-      nodeHostName: "192.168.1.2", nodeHTTPAddress: "192.168.1.2:8042",
+-      lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-      healthReport: "", numContainers: 0, usedMemoryMB: 0,
+-      availMemoryMB: 163840, usedVirtualCores: 0,
+-      availableVirtualCores: 160,
+-      resourceUtilization: {
+-        nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-        nodeCPUUsage: 0.14995001256465912,
+-        aggregatedContainersPhysicalMemoryMB: 0,
+-        aggregatedContainersVirtualMemoryMB: 0,
+-        containersCPUUsage: 0
+-      }}];
+-  var store = {
+-    findAll: function() {
+-      return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-    }
+-  };
+-  var route = this.subject();
+-  route.set('store', store);
+-  route.model().then(function(model) {
+-    assert.expect(4);
+-    assert.ok(model.nodes);
+-    assert.equal(model.nodes.length, 2);
+-    assert.deepEqual(response[0], model.nodes[0]);
+-    assert.deepEqual(response[1], model.nodes[1]);
+-  });
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
+deleted file mode 100644
+index faa116bdbe4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/apps-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-queue/apps', 'Unit | Route | yarn queue/apps', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
+deleted file mode 100644
+index ca6f1372d1e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queue/info-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-queue/info', 'Unit | Route | yarn queue/info', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queues-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queues-test.js
+deleted file mode 100644
+index 5e96fae7047..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-queues-test.js
++++ /dev/null
+@@ -1,309 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Ember from 'ember';
+-
+-moduleFor('route:yarn-queues', 'Unit | Route | yarn queues', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-  assert.ok(route.model);
+-  assert.ok(route.afterModel);
+-  assert.ok(route.unloadAll);
+-});
+-
+-test('Test getting yarn queues', function(assert) {
+-	let response = {
+-	  "scheduler": {
+-	    "schedulerInfo": {
+-	      "capacity": 100,
+-	      "maxCapacity": 100,
+-	      "queueName": "root",
+-	      "queues": {
+-	        "queue": [
+-	          {
+-	            "absoluteCapacity": 10.5,
+-	            "absoluteMaxCapacity": 50,
+-	            "absoluteUsedCapacity": 0,
+-	            "capacity": 10.5,
+-	            "maxCapacity": 50,
+-	            "numApplications": 0,
+-	            "queueName": "a",
+-	            "queues": {
+-	              "queue": [
+-	                {
+-	                  "absoluteCapacity": 3.15,
+-	                  "absoluteMaxCapacity": 25,
+-	                  "absoluteUsedCapacity": 0,
+-	                  "capacity": 30.000002,
+-	                  "maxCapacity": 50,
+-	                  "numApplications": 0,
+-	                  "queueName": "a1",
+-	                  "queues": {
+-	                    "queue": [
+-	                      {
+-	                        "absoluteCapacity": 2.6775,
+-	                        "absoluteMaxCapacity": 25,
+-	                        "absoluteUsedCapacity": 0,
+-	                        "capacity": 85,
+-	                        "maxActiveApplications": 1,
+-	                        "maxActiveApplicationsPerUser": 1,
+-	                        "maxApplications": 267,
+-	                        "maxApplicationsPerUser": 267,
+-	                        "maxCapacity": 100,
+-	                        "numActiveApplications": 0,
+-	                        "numApplications": 0,
+-	                        "numContainers": 0,
+-	                        "numPendingApplications": 0,
+-	                        "queueName": "a1a",
+-	                        "resourcesUsed": {
+-	                          "memory": 0,
+-	                          "vCores": 0
+-	                        },
+-	                        "state": "RUNNING",
+-	                        "type": "capacitySchedulerLeafQueueInfo",
+-	                        "usedCapacity": 0,
+-	                        "usedResources": "<memory:0, vCores:0>",
+-	                        "userLimit": 100,
+-	                        "userLimitFactor": 1,
+-	                        "users": null
+-	                      },
+-	                      {
+-	                        "absoluteCapacity": 0.47250003,
+-	                        "absoluteMaxCapacity": 25,
+-	                        "absoluteUsedCapacity": 0,
+-	                        "capacity": 15.000001,
+-	                        "maxActiveApplications": 1,
+-	                        "maxActiveApplicationsPerUser": 1,
+-	                        "maxApplications": 47,
+-	                        "maxApplicationsPerUser": 47,
+-	                        "maxCapacity": 100,
+-	                        "numActiveApplications": 0,
+-	                        "numApplications": 0,
+-	                        "numContainers": 0,
+-	                        "numPendingApplications": 0,
+-	                        "queueName": "a1b",
+-	                        "resourcesUsed": {
+-	                          "memory": 0,
+-	                          "vCores": 0
+-	                        },
+-	                        "state": "RUNNING",
+-	                        "type": "capacitySchedulerLeafQueueInfo",
+-	                        "usedCapacity": 0,
+-	                        "usedResources": "<memory:0, vCores:0>",
+-	                        "userLimit": 100,
+-	                        "userLimitFactor": 1,
+-	                        "users": null
+-	                      }
+-	                    ]
+-	                  },
+-	                  "resourcesUsed": {
+-	                    "memory": 0,
+-	                    "vCores": 0
+-	                  },
+-	                  "state": "RUNNING",
+-	                  "usedCapacity": 0,
+-	                  "usedResources": "<memory:0, vCores:0>"
+-	                },
+-	                {
+-	                  "absoluteCapacity": 7.35,
+-	                  "absoluteMaxCapacity": 50,
+-	                  "absoluteUsedCapacity": 0,
+-	                  "capacity": 70,
+-	                  "maxActiveApplications": 1,
+-	                  "maxActiveApplicationsPerUser": 100,
+-	                  "maxApplications": 735,
+-	                  "maxApplicationsPerUser": 73500,
+-	                  "maxCapacity": 100,
+-	                  "numActiveApplications": 0,
+-	                  "numApplications": 0,
+-	                  "numContainers": 0,
+-	                  "numPendingApplications": 0,
+-	                  "queueName": "a2",
+-	                  "resourcesUsed": {
+-	                    "memory": 0,
+-	                    "vCores": 0
+-	                  },
+-	                  "state": "RUNNING",
+-	                  "type": "capacitySchedulerLeafQueueInfo",
+-	                  "usedCapacity": 0,
+-	                  "usedResources": "<memory:0, vCores:0>",
+-	                  "userLimit": 100,
+-	                  "userLimitFactor": 100,
+-	                  "users": null
+-	                }
+-	              ]
+-	            },
+-	            "resourcesUsed": {
+-	              "memory": 0,
+-	              "vCores": 0
+-	            },
+-	            "state": "RUNNING",
+-	            "usedCapacity": 0,
+-	            "usedResources": "<memory:0, vCores:0>"
+-	          },
+-	          {
+-	            "absoluteCapacity": 89.5,
+-	            "absoluteMaxCapacity": 100,
+-	            "absoluteUsedCapacity": 0,
+-	            "capacity": 89.5,
+-	            "maxCapacity": 100,
+-	            "numApplications": 2,
+-	            "queueName": "b",
+-	            "queues": {
+-	              "queue": [
+-	                {
+-	                  "absoluteCapacity": 53.7,
+-	                  "absoluteMaxCapacity": 100,
+-	                  "absoluteUsedCapacity": 0,
+-	                  "capacity": 60.000004,
+-	                  "maxActiveApplications": 1,
+-	                  "maxActiveApplicationsPerUser": 100,
+-	                  "maxApplications": 5370,
+-	                  "maxApplicationsPerUser": 537000,
+-	                  "maxCapacity": 100,
+-	                  "numActiveApplications": 1,
+-	                  "numApplications": 2,
+-	                  "numContainers": 0,
+-	                  "numPendingApplications": 1,
+-	                  "queueName": "b1",
+-	                  "resourcesUsed": {
+-	                    "memory": 0,
+-	                    "vCores": 0
+-	                  },
+-	                  "state": "RUNNING",
+-	                  "type": "capacitySchedulerLeafQueueInfo",
+-	                  "usedCapacity": 0,
+-	                  "usedResources": "<memory:0, vCores:0>",
+-	                  "userLimit": 100,
+-	                  "userLimitFactor": 100,
+-	                  "users": {
+-	                    "user": [
+-	                      {
+-	                        "numActiveApplications": 0,
+-	                        "numPendingApplications": 1,
+-	                        "resourcesUsed": {
+-	                          "memory": 0,
+-	                          "vCores": 0
+-	                        },
+-	                        "username": "user2"
+-	                      },
+-	                      {
+-	                        "numActiveApplications": 1,
+-	                        "numPendingApplications": 0,
+-	                        "resourcesUsed": {
+-	                          "memory": 0,
+-	                          "vCores": 0
+-	                        },
+-	                        "username": "user1"
+-	                      }
+-	                    ]
+-	                  }
+-	                },
+-	                {
+-	                  "absoluteCapacity": 35.3525,
+-	                  "absoluteMaxCapacity": 100,
+-	                  "absoluteUsedCapacity": 0,
+-	                  "capacity": 39.5,
+-	                  "maxActiveApplications": 1,
+-	                  "maxActiveApplicationsPerUser": 100,
+-	                  "maxApplications": 3535,
+-	                  "maxApplicationsPerUser": 353500,
+-	                  "maxCapacity": 100,
+-	                  "numActiveApplications": 0,
+-	                  "numApplications": 0,
+-	                  "numContainers": 0,
+-	                  "numPendingApplications": 0,
+-	                  "queueName": "b2",
+-	                  "resourcesUsed": {
+-	                    "memory": 0,
+-	                    "vCores": 0
+-	                  },
+-	                  "state": "RUNNING",
+-	                  "type": "capacitySchedulerLeafQueueInfo",
+-	                  "usedCapacity": 0,
+-	                  "usedResources": "<memory:0, vCores:0>",
+-	                  "userLimit": 100,
+-	                  "userLimitFactor": 100,
+-	                  "users": null
+-	                },
+-	                {
+-	                  "absoluteCapacity": 0.4475,
+-	                  "absoluteMaxCapacity": 100,
+-	                  "absoluteUsedCapacity": 0,
+-	                  "capacity": 0.5,
+-	                  "maxActiveApplications": 1,
+-	                  "maxActiveApplicationsPerUser": 100,
+-	                  "maxApplications": 44,
+-	                  "maxApplicationsPerUser": 4400,
+-	                  "maxCapacity": 100,
+-	                  "numActiveApplications": 0,
+-	                  "numApplications": 0,
+-	                  "numContainers": 0,
+-	                  "numPendingApplications": 0,
+-	                  "queueName": "b3",
+-	                  "resourcesUsed": {
+-	                    "memory": 0,
+-	                    "vCores": 0
+-	                  },
+-	                  "state": "RUNNING",
+-	                  "type": "capacitySchedulerLeafQueueInfo",
+-	                  "usedCapacity": 0,
+-	                  "usedResources": "<memory:0, vCores:0>",
+-	                  "userLimit": 100,
+-	                  "userLimitFactor": 100,
+-	                  "users": null
+-	                }
+-	              ]
+-	            },
+-	            "resourcesUsed": {
+-	              "memory": 0,
+-	              "vCores": 0
+-	            },
+-	            "state": "RUNNING",
+-	            "usedCapacity": 0,
+-	            "usedResources": "<memory:0, vCores:0>"
+-	          }
+-	        ]
+-	      },
+-	      "type": "capacityScheduler",
+-	      "usedCapacity": 0
+-	    }
+-	  }
+-	};
+-	let store = {
+-		query: function() {
+-			return new Ember.RSVP.Promise(function(resolve) {
+-        resolve(response);
+-      });
+-		}
+-	};
+-	let route = this.subject();
+-	route.set('store', store);
+-	route.model({queue_name: 'a1'}).then(function(model) {
+-		assert.ok(model);
+-		assert.ok(model.queues);
+-		assert.ok(model.selected);
+-		assert.equal(model.selected, 'a1');
+-		assert.deepEqual(model.queues, response);
+-	});
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-rm-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-rm-log-test.js
+deleted file mode 100644
+index 6d696c8843d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-rm-log-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-rm-log', 'Unit | Route | yarn rm log', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
+deleted file mode 100644
+index 6348f860b65..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-services-test.js
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-services', 'Unit | Route | yarn services', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-tools-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-tools-test.js
+deleted file mode 100644
+index 2950fd43d73..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/routes/yarn-tools-test.js
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('route:yarn-tools', 'Unit | Route | yarn tools', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['controller:foo']
+-});
+-
+-test('it exists', function(assert) {
+-  let route = this.subject();
+-  assert.ok(route);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-info-test.js
+deleted file mode 100644
+index d4405016d23..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-info-test.js
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:cluster-info', 'Unit | Serializer | cluster info', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-});
+-
+-test('Test normalizeArrayResponse', function(assert) {
+-	var serializer = this.subject(),
+-  modelClass = {
+-    modelName: "cluster-info"
+-  },
+-	payload = {
+-	  "clusterInfo": {
+-	    "id":1324053971963,
+-	    "startedOn":1324053971963,
+-	    "state":"STARTED",
+-	    "resourceManagerVersion":"0.23.1-SNAPSHOT",
+-	    "resourceManagerBuildVersion":"0.23.1-SNAPSHOT from 1214049 by user1 source checksum 050cd664439d931c8743a6428fd6a693",
+-	    "resourceManagerVersionBuiltOn":"Tue Dec 13 22:12:48 CST 2011",
+-	    "hadoopVersion":"0.23.1-SNAPSHOT",
+-	    "hadoopBuildVersion":"0.23.1-SNAPSHOT from 1214049 by user1 source checksum 11458df3bb77342dca5f917198fad328",
+-	    "hadoopVersionBuiltOn":"Tue Dec 13 22:12:26 CST 2011"
+-	  }
+-	};
+-	var id = 1324053971963;
+-	var normalized = serializer.normalizeArrayResponse({}, modelClass, payload, id, null);
+-	assert.expect(12);
+-	assert.ok(normalized.data);
+-	assert.ok(normalized.data[0]);
+-	assert.equal(normalized.data.length, 1);
+-	assert.equal(normalized.data[0].id, id);
+-	assert.equal(normalized.data[0].type, modelClass.modelName);
+-	assert.equal(normalized.data[0].attributes.startedOn, payload.clusterInfo.startedOn);
+-	assert.equal(normalized.data[0].attributes.state, payload.clusterInfo.state);
+-	assert.equal(normalized.data[0].attributes.resourceManagerVersion,
+-		payload.clusterInfo.resourceManagerVersion);
+-	assert.equal(normalized.data[0].attributes.resourceManagerBuildVersion,
+-		payload.clusterInfo.resourceManagerBuildVersion);
+-	assert.equal(normalized.data[0].attributes.hadoopVersion,
+-		payload.clusterInfo.hadoopVersion);
+-	assert.equal(normalized.data[0].attributes.hadoopBuildVersion,
+-		payload.clusterInfo.hadoopBuildVersion);
+-	assert.equal(normalized.data[0].attributes.hadoopVersionBuiltOn,
+-		payload.clusterInfo.hadoopVersionBuiltOn);
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-metric-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-metric-test.js
+deleted file mode 100644
+index 53efa535ed7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/cluster-metric-test.js
++++ /dev/null
+@@ -1,90 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:cluster-metric', 'Unit | Serializer | cluster metric', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-});
+-
+-test('Test normalizeArrayResponse', function(assert) {
+-	let serializer = this.subject(),
+-	modelClass = {
+-		modelName: 'cluster-metric'
+-	},
+-	payload = {
+-	  "clusterMetrics": {
+-	    "appsSubmitted":0,
+-	    "appsCompleted":0,
+-	    "appsPending":0,
+-	    "appsRunning":0,
+-	    "appsFailed":0,
+-	    "appsKilled":0,
+-	    "reservedMB":0,
+-	    "availableMB":17408,
+-	    "allocatedMB":0,
+-	    "reservedVirtualCores":0,
+-	    "availableVirtualCores":7,
+-	    "allocatedVirtualCores":1,
+-	    "containersAllocated":0,
+-	    "containersReserved":0,
+-	    "containersPending":0,
+-	    "totalMB":17408,
+-	    "totalVirtualCores":8,
+-	    "totalNodes":1,
+-	    "lostNodes":0,
+-	    "unhealthyNodes":0,
+-	    "decommissionedNodes":0,
+-	    "rebootedNodes":0,
+-	    "activeNodes":1
+-	  }
+-	};
+-	let normalized = serializer.normalizeArrayResponse({}, modelClass, payload, 1, null);
+-	assert.expect(20);
+-	assert.ok(normalized.data);
+-	assert.ok(normalized.data[0]);
+-	assert.equal(normalized.data[0].id, 1);
+-	assert.equal(normalized.data[0].type, modelClass.modelName);
+-	assert.equal(normalized.data[0].attributes.appsSubmitted, payload.clusterMetrics.appsSubmitted);
+-	assert.equal(normalized.data[0].attributes.appsCompleted, payload.clusterMetrics.appsCompleted);
+-	assert.equal(normalized.data[0].attributes.appsPending, payload.clusterMetrics.appsPending);
+-	assert.equal(normalized.data[0].attributes.appsRunning, payload.clusterMetrics.appsRunning);
+-	assert.equal(normalized.data[0].attributes.appsFailed, payload.clusterMetrics.appsFailed);
+-	assert.equal(normalized.data[0].attributes.appsKilled, payload.clusterMetrics.appsKilled);
+-	assert.equal(normalized.data[0].attributes.reservedMB, payload.clusterMetrics.reservedMB);
+-	assert.equal(normalized.data[0].attributes.availableMB, payload.clusterMetrics.availableMB);
+-	assert.equal(normalized.data[0].attributes.allocatedMB, payload.clusterMetrics.allocatedMB);
+-	assert.equal(normalized.data[0].attributes.totalMB, payload.clusterMetrics.totalMB);
+-	assert.equal(normalized.data[0].attributes.reservedVirtualCores,
+-		payload.clusterMetrics.reservedVirtualCores);
+-	assert.equal(normalized.data[0].attributes.availableVirtualCores,
+-		payload.clusterMetrics.availableVirtualCores);
+-	assert.equal(normalized.data[0].attributes.allocatedVirtualCores,
+-		payload.clusterMetrics.allocatedVirtualCores);
+-	assert.equal(normalized.data[0].attributes.totalVirtualCores,
+-		payload.clusterMetrics.totalVirtualCores);
+-	assert.equal(normalized.data[0].attributes.activeNodes, payload.clusterMetrics.activeNodes);
+-	assert.equal(normalized.data[0].attributes.totalNodes, payload.clusterMetrics.totalNodes);
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-attempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-attempt-test.js
+deleted file mode 100644
+index bc883743144..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-attempt-test.js
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-moduleFor('serializer:yarn-app-attempt', 'Unit | Serializer | yarn app attempt', {
+-  unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-});
+-
+-test('Test normalizeSingleResponse', function(assert) {
+-	let serializer = this.subject(),
+-	payload = {
+-	  "appAttemptId": "appattempt_1479277364592_0001_000001",
+-	  "host": "N/A",
+-	  "rpcPort": "-1",
+-	  "trackingUrl": "http://ctr-e46-1478293962054-1774-01-000007.hwx.site:25005/proxy/application_1479277364592_0001/",
+-	  "originalTrackingUrl": "http://ctr-e46-1478293962054-1774-01-000004.hwx.site:19888/jobhistory/job/job_1479277364592_0001",
+-	  "diagnosticsInfo": "Attempt recovered after RM restart",
+-	  "appAttemptState": "FINISHED",
+-	  "amContainerId": "container_e01_1479277364592_0001_01_000001",
+-	  "startedTime": "1479280923398",
+-	  "finishedTime": "1479280966401"
+-	},
+-	modelClass = {
+-		modelName: 'yarn-app-attempt'
+-	};
+-	var response = serializer.normalizeSingleResponse({}, modelClass, payload, payload.appAttemptId);
+-	assert.ok(response);
+-	assert.ok(response.data);
+-	assert.equal(response.data.id, payload.appAttemptId);
+-	assert.equal(response.data.type, modelClass.modelName);
+-	assert.equal(response.data.attributes.appAttemptId, payload.appAttemptId);
+-	assert.equal(response.data.attributes.hosts, payload.host);
+-	assert.equal(response.data.attributes.amContainerId, payload.amContainerId);
+-	assert.equal(response.data.attributes.state, payload.appAttemptState);
+-	assert.equal(response.data.attributes.startedTime, Converter.timeStampToDate(payload.startedTime));
+-	assert.equal(response.data.attributes.finishedTime, Converter.timeStampToDate(payload.finishedTime));
+-});
+-
+-test('Test normalizeArrayResponse', function(assert) {
+-	let serializer = this.subject(),
+-	modelClass = {
+-		modelName: 'yarn-app-attempt'
+-	},
+-	payload = {
+-	  "appAttempts": {
+-	    "appAttempt": [
+-	      {
+-	        "id": 1,
+-	        "startTime": 1479280923398,
+-	        "finishedTime": 1479280966401,
+-	        "containerId": "container_e01_1479277364592_0001_01_000001",
+-	        "nodeHttpAddress": "ctr-e46-1478293962054-1774-01-000004.hwx.site:25008",
+-	        "nodeId": "ctr-e46-1478293962054-1774-01-000004.hwx.site:25006",
+-	        "logsLink": "http://ctr-e46-1478293962054-1774-01-000004.hwx.site:25008/node/containerlogs/container_e01_1479277364592_0001_01_000001/user1",
+-	        "blacklistedNodes": "",
+-	        "nodesBlacklistedBySystem": "",
+-	        "appAttemptId": "appattempt_1479277364592_0001_000001"
+-	      }
+-	    ]
+-	  }
+-	};
+-	let response = serializer.normalizeArrayResponse({}, modelClass, payload);
+-	assert.ok(response);
+-	assert.ok(response.data);
+-	assert.ok(response.data[0]);
+-	assert.equal(response.data[0].id, payload.appAttempts.appAttempt[0].appAttemptId);
+-	assert.equal(response.data[0].type, modelClass.modelName);
+-	assert.equal(response.data[0].attributes.appAttemptId, payload.appAttempts.appAttempt[0].appAttemptId);
+-	assert.equal(response.data[0].attributes.containerId, payload.appAttempts.appAttempt[0].containerId);
+-	assert.equal(response.data[0].attributes.nodeHttpAddress, payload.appAttempts.appAttempt[0].nodeHttpAddress);
+-	assert.equal(response.data[0].attributes.nodeId, payload.appAttempts.appAttempt[0].nodeId);
+-	assert.equal(response.data[0].attributes.logsLink, payload.appAttempts.appAttempt[0].logsLink);
+-	assert.equal(response.data[0].attributes.startTime,
+-		Converter.timeStampToDate(payload.appAttempts.appAttempt[0].startTime));
+-	assert.equal(response.data[0].attributes.finishedTime,
+-		Converter.timeStampToDate(payload.appAttempts.appAttempt[0].finishedTime));
+-});
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-test.js
+deleted file mode 100644
+index b2b4c6d1881..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-test.js
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-app', 'Unit | Serializer | yarn app', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.internalNormalizeSingleResponse);
+-});
+-
+-// Replace this with your real tests.
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-app"
+-  },
+-  payload = {
+-	   app : {
+-	      finishedTime : 1326824991300,
+-				amContainerLogs : "localhost:8042/node/containerlogs/container_1326821518301_0005_01_000001",
+-				trackingUI : "History",
+-				state : "FINISHED",
+-				user : "user1",
+-				id : "application_1326821518301_0005",
+-				clusterId : 1326821518301,
+-				finalStatus : "SUCCEEDED",
+-				amHostHttpAddress : "localhost:8042",
+-				amRPCAddress : "localhost:4201",
+-				progress : 100,
+-				name : "Sleep job",
+-				applicationType : "Yarn",
+-				startedTime : 1326824544552,
+-				elapsedTime : 446748,
+-				diagnostics : "",
+-				trackingUrl : "localhost:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5",
+-				queue : "a1",
+-				memorySeconds : 151730,
+-				vcoreSeconds : 103,
+-				unmanagedApplication : "false",
+-				applicationPriority : 0,
+-				appNodeLabelExpression : "",
+-				amNodeLabelExpression : ""
+-	   }
+-	},
+-	id = "application_1326821518301_0005";
+-	var response = serializer.normalizeSingleResponse({}, modelClass, payload, id);
+-	assert.equal(response.data.id, id);
+-  assert.equal(response.data.type, modelClass.modelName);
+-  assert.equal(response.data.attributes.appName, payload.app.name);
+-  assert.equal(response.data.attributes.user, payload.app.user);
+-  assert.equal(response.data.attributes.state, payload.app.state);
+-  assert.equal(response.data.attributes.finalStatus, payload.app.finalStatus);
+-  assert.equal(response.data.attributes.queue, payload.app.queue);
+-  assert.equal(response.data.attributes.applicationType, payload.app.applicationType);
+-  assert.equal(response.data.attributes.progress, payload.app.progress);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
+deleted file mode 100644
+index 11a21db20f0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-app-timeline-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-app-timeline', 'Unit | Serializer | yarn app timeline', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-app-timeline']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-component-instance-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-component-instance-test.js
+deleted file mode 100644
+index 6add066a957..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-component-instance-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-component-instance', 'Unit | Serializer | yarn component instance', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-component-instance']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-conf-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-conf-test.js
+deleted file mode 100644
+index 36576fda9d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-conf-test.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-conf', 'Unit | Serializer | yarn conf', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-conf']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-log-test.js
+deleted file mode 100644
+index 2349dc2e4ec..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-log-test.js
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-container-log', 'Unit | Serializer | ContainerLog', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-});
+-
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-container-log"
+-  },
+-  payload = "This is syslog";
+-  var id = "localhost:64318!container_e32_1456000363780_0002_01_000001!syslog";
+-  assert.expect(6);
+-  var response =
+-      serializer.normalizeSingleResponse({}, modelClass, payload, id, null);
+-  assert.ok(response.data);
+-  assert.equal(response.data.id, id);
+-  assert.equal(response.data.type, modelClass.modelName);
+-  assert.equal(response.data.attributes.logs, payload);
+-  assert.equal(response.data.attributes.containerID,
+-      "container_e32_1456000363780_0002_01_000001");
+-  assert.equal(response.data.attributes.logFileName, "syslog");
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-test.js
+deleted file mode 100644
+index 97c09625eca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-container-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-container', 'Unit | Serializer | yarn container', {
+-	unit: true
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-log-test.js
+deleted file mode 100644
+index a84e68920a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-log-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-log', 'Unit | Serializer | yarn log', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-log']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-metrics-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-metrics-test.js
+deleted file mode 100644
+index 7cab348f47b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-metrics-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-metrics', 'Unit | Serializer | yarn metrics', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-metrics']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-app-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-app-test.js
+deleted file mode 100644
+index 8c8f3cd0cc9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-app-test.js
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-node-app', 'Unit | Serializer | NodeApp', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-  assert.ok(serializer.internalNormalizeSingleResponse);
+-});
+-
+-test('normalizeArrayResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-app"
+-  },
+-  payload = {
+-    apps: {
+-      app: [{
+-        id:"application_1456251210105_0001", state:"FINISHED", user:"root"
+-      },{
+-        id:"application_1456251210105_0002", state:"RUNNING",user:"root",
+-        containerids:["container_e38_1456251210105_0002_01_000001",
+-        "container_e38_1456251210105_0002_01_000002"]
+-      }]
+-    }
+-  };
+-  assert.expect(15);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 2);
+-  assert.equal(response.data[0].attributes.containers, undefined);
+-  assert.equal(response.data[1].attributes.containers.length, 2);
+-  assert.deepEqual(response.data[1].attributes.containers,
+-      payload.apps.app[1].containerids);
+-  for (var i = 0; i < 2; i++) {
+-    assert.equal(response.data[i].type, modelClass.modelName);
+-    assert.equal(response.data[i].id, payload.apps.app[i].id);
+-    assert.equal(response.data[i].attributes.appId, payload.apps.app[i].id);
+-    assert.equal(response.data[i].attributes.state, payload.apps.app[i].state);
+-    assert.equal(response.data[i].attributes.user, payload.apps.app[i].user);
+-  }
+-});
+-
+-test('normalizeArrayResponse no apps test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-app"
+-  },
+-  payload = { apps: null };
+-  assert.expect(2);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 0);
+-});
+-
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-app"
+-  },
+-  payload = {
+-    app: {id:"application_1456251210105_0001", state:"FINISHED", user:"root"}
+-  };
+-  assert.expect(7);
+-  var response =
+-      serializer.normalizeSingleResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(payload.app.id, response.data.id);
+-  assert.equal(modelClass.modelName, response.data.type);
+-  assert.equal(payload.app.id, response.data.attributes.appId);
+-  assert.equal(payload.app.state, response.data.attributes.state);
+-  assert.equal(payload.app.user, response.data.attributes.user);
+-  assert.equal(response.data.attributes.containers, undefined);
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-container-test.js
+deleted file mode 100644
+index dbe94db70dc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-container-test.js
++++ /dev/null
+@@ -1,125 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-node-container', 'Unit | Serializer | NodeContainer', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-  assert.ok(serializer.internalNormalizeSingleResponse);
+-});
+-
+-test('normalizeArrayResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-container"
+-  },
+-  payload = {
+-    containers: {
+-      container: [{
+-        id: "container_e32_1456000363780_0002_01_000001", state: "RUNNING",
+-        exitCode:-1000,diagnostics:"",user:"root",totalMemoryNeededMB:2048,
+-        totalVCoresNeeded:1,containerLogsLink: "http://localhost:8042/node/" +
+-        "containerlogs/container_e32_1456000363780_0002_01_000001/root",
+-        nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
+-        "stdout"]
+-      },{
+-        id:"container_e32_1456000363780_0002_01_000003", state:"RUNNING",
+-        exitCode:-1000, diagnostics:"", user:"root", totalMemoryNeededMB:1024,
+-        totalVCoresNeeded:1,containerLogsLink:"http://localhost:8042/node" +
+-        "/containerlogs/container_e32_1456000363780_0002_01_000003/root",
+-        nodeId:"localhost:64318",containerLogFiles:["syslog","stderr",
+-        "syslog.shuffle","stdout"]
+-      }]
+-    }
+-  };
+-  assert.expect(14);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 2);
+-  assert.equal(response.data[0].id,
+-      "container_e32_1456000363780_0002_01_000001");
+-  assert.equal(response.data[1].id,
+-      "container_e32_1456000363780_0002_01_000003");
+-  assert.equal(response.data[0].attributes.containerLogFiles.length, 3);
+-  assert.equal(response.data[1].attributes.containerLogFiles.length, 4);
+-  for (var i = 0; i < 2; i++) {
+-    assert.equal(response.data[i].type, modelClass.modelName);
+-    assert.deepEqual(response.data[i].attributes.containerLogFiles,
+-        payload.containers.container[i].containerLogFiles);
+-    assert.equal(response.data[i].attributes.state,
+-        payload.containers.container[i].state);
+-    assert.equal(response.data[i].attributes.user,
+-        payload.containers.container[i].user);
+-  }
+-});
+-
+-test('normalizeArrayResponse no containers test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-container"
+-  },
+-  payload = { containers: null };
+-  assert.expect(2);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 0);
+-});
+-
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node-container"
+-  },
+-  payload = {
+-    container: {
+-      id: "container_e32_1456000363780_0002_01_000001", state: "RUNNING",
+-      exitCode:-1000,diagnostics:"",user:"root",totalMemoryNeededMB:2048,
+-      totalVCoresNeeded:1,containerLogsLink: "http://localhost:8042/node/" +
+-      "containerlogs/container_e32_1456000363780_0002_01_000001/root",
+-      nodeId: "localhost:64318", containerLogFiles:["syslog","stderr",
+-      "stdout"]
+-    }
+-  };
+-  assert.expect(11);
+-  var response =
+-      serializer.normalizeSingleResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.id, payload.container.id);
+-  assert.equal(response.data.type, modelClass.modelName);
+-  assert.equal(response.data.attributes.containerId, payload.container.id);
+-  assert.equal(response.data.attributes.state, payload.container.state);
+-  assert.equal(response.data.attributes.user, payload.container.user);
+-  assert.equal(response.data.attributes.exitCode, payload.container.exitCode);
+-  assert.equal(response.data.attributes.totalMemoryNeededMB,
+-      payload.container.totalMemoryNeeded);
+-  assert.equal(response.data.attributes.totalVCoresNeeded,
+-      payload.container.totalVCoresNeeded);
+-  assert.equal(response.data.attributes.containerLogFiles.length, 3);
+-  assert.deepEqual(response.data.attributes.containerLogFiles,
+-      payload.container.containerLogFiles);
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-test.js
+deleted file mode 100644
+index 0e76ccbce28..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-node-test.js
++++ /dev/null
+@@ -1,69 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-import Converter from 'yarn-ui/utils/converter';
+-
+-moduleFor('serializer:yarn-node', 'Unit | Serializer | Node', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.internalNormalizeSingleResponse);
+-});
+-
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-node"
+-  },
+-  payload = {
+-    nodeInfo: {
+-      healthReport: "Healthy", totalVmemAllocatedContainersMB: 344064,
+-      totalPmemAllocatedContainersMB: 163840,
+-      totalVCoresAllocatedContainers: 160,
+-      vmemCheckEnabled: true, pmemCheckEnabled: true,
+-      lastNodeUpdateTime: 1456250210310, nodeHealthy: true,
+-      nodeManagerVersion: "3.0.0-SNAPSHOT",
+-      nodeManagerBuildVersion: "3.0.0-SNAPSHOT",
+-      nodeManagerVersionBuiltOn: "2000-01-01T00:00Z",
+-      hadoopVersion: "3.0.0-SNAPSHOT",
+-      hadoopBuildVersion: "3.0.0-SNAPSHOT",
+-      hadoopVersionBuiltOn: "2000-01-01T00:00Z",
+-      id: "localhost:64318", nodeHostName: "192.168.0.102",
+-      nmStartupTime: 1456250208231
+-    }
+-  };
+-  assert.expect(6);
+-  var id = "localhost:64318";
+-  var response = serializer.normalizeSingleResponse({}, modelClass, payload, id, null);
+-  assert.equal(response.data.id, id);
+-  assert.equal(response.data.type, modelClass.modelName);
+-  assert.equal(response.data.attributes.totalVmemAllocatedContainersMB,
+-      payload.nodeInfo.totalVmemAllocatedContainersMB);
+-  assert.equal(response.data.attributes.totalPmemAllocatedContainersMB,
+-      payload.nodeInfo.totalPmemAllocatedContainersMB);
+-  assert.equal(response.data.attributes.totalVCoresAllocatedContainers,
+-      payload.nodeInfo.totalVCoresAllocatedContainers);
+-  assert.equal(response.data.attributes.nmStartupTime,
+-      Converter.timeStampToDate(payload.nodeInfo.nmStartupTime));
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-log-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-log-test.js
+deleted file mode 100644
+index fa049b35667..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-log-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-rm-log', 'Unit | Serializer | yarn rm log', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-rm-log']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-node-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-node-test.js
+deleted file mode 100644
+index 1fc85391c0d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-rm-node-test.js
++++ /dev/null
+@@ -1,149 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('serializer:yarn-rm-node', 'Unit | Serializer | RMNode', {
+-});
+-
+-test('Basic creation test', function(assert) {
+-  let serializer = this.subject();
+-
+-  assert.ok(serializer);
+-  assert.ok(serializer.normalizeSingleResponse);
+-  assert.ok(serializer.normalizeArrayResponse);
+-  assert.ok(serializer.internalNormalizeSingleResponse);
+-});
+-
+-test('normalizeArrayResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-rm-node"
+-  },
+-  payload = {
+-    nodes: {
+-      node: [{
+-        rack: "/default-rack", state: "RUNNING", id: "192.168.1.1:64318",
+-        nodeHostName: "192.168.1.1", nodeHTTPAddress: "192.168.1.1:8042",
+-        lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-        healthReport: "", numContainers: 0, usedMemoryMB: 2048,
+-        availMemoryMB: 161792, usedVirtualCores: 2,
+-        availableVirtualCores: 158, nodeLabels: ["x"],
+-        resourceUtilization: {
+-          nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-          nodeCPUUsage: 0.14995001256465912,
+-          aggregatedContainersPhysicalMemoryMB: 0,
+-          aggregatedContainersVirtualMemoryMB: 0,
+-          containersCPUUsage: 0
+-        }
+-      },{
+-        rack: "/default-rack", state: "RUNNING", id: "192.168.1.2:64318",
+-        nodeHostName: "192.168.1.2", nodeHTTPAddress: "192.168.1.2:8042",
+-        lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-        healthReport: "", numContainers: 0, usedMemoryMB: 0,
+-        availMemoryMB: 163840, usedVirtualCores: 0,
+-        availableVirtualCores: 160, nodeLabels: ["y"],
+-        resourceUtilization: {
+-          nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-          nodeCPUUsage: 0.14995001256465912,
+-          aggregatedContainersPhysicalMemoryMB: 0,
+-          aggregatedContainersVirtualMemoryMB: 0,
+-          containersCPUUsage: 0
+-        }
+-      }]
+-    }
+-  };
+-  assert.expect(12);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 2);
+-  assert.equal(response.data[0].id, "192.168.1.1:64318");
+-  assert.equal(response.data[1].id, "192.168.1.2:64318");
+-  for (var i = 0; i < 2; i++) {
+-    assert.equal(response.data[i].type, modelClass.modelName);
+-    assert.equal(response.data[i].attributes.nodeHostName,
+-        payload.nodes.node[i].nodeHostName);
+-    assert.equal(response.data[i].attributes.nodeHTTPAddress,
+-        payload.nodes.node[i].nodeHTTPAddress);
+-    assert.deepEqual(response.data[i].attributes.nodeLabels,
+-        payload.nodes.node[i].nodeLabels);
+-  }
+-});
+-
+-test('normalizeArrayResponse no nodes test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-rm-node"
+-  },
+-  payload = { nodes: null };
+-  assert.expect(2);
+-  var response =
+-      serializer.normalizeArrayResponse({}, modelClass, payload);
+-  assert.ok(response.data);
+-  assert.equal(response.data.length, 0);
+-});
+-
+-test('normalizeSingleResponse test', function(assert) {
+-  let serializer = this.subject(),
+-  modelClass = {
+-    modelName: "yarn-rm-node"
+-  },
+-  payload = {
+-    node: {
+-      rack: "/default-rack", state: "RUNNING", id: "192.168.1.1:64318",
+-      nodeHostName: "192.168.1.1", nodeHTTPAddress: "192.168.1.1:8042",
+-      lastHealthUpdate: 1456251290905, version: "3.0.0-SNAPSHOT",
+-      healthReport: "", numContainers: 0, usedMemoryMB: 2048,
+-      availMemoryMB: 161792, usedVirtualCores: 2,
+-      availableVirtualCores: 158, nodeLabels: ["x"],
+-      resourceUtilization: {
+-        nodePhysicalMemoryMB: 4549, nodeVirtualMemoryMB: 4549,
+-        nodeCPUUsage: 0.14995001256465912,
+-        aggregatedContainersPhysicalMemoryMB: 0,
+-        aggregatedContainersVirtualMemoryMB: 0,
+-        containersCPUUsage: 0
+-      }
+-    }
+-  };
+-  assert.expect(13);
+-  var id = "localhost:64318";
+-  var response =
+-      serializer.normalizeSingleResponse({}, modelClass, payload, id);
+-  assert.ok(response.data);
+-  assert.equal(response.data.id, id);
+-  assert.equal(response.data.type, modelClass.modelName);
+-  assert.equal(response.data.attributes.rack, payload.node.rack);
+-  assert.equal(response.data.attributes.state, payload.node.state);
+-  assert.equal(response.data.attributes.nodeHostName,
+-      payload.node.nodeHostName);
+-  assert.equal(response.data.attributes.nodeHTTPAddress,
+-      payload.node.nodeHTTPAddress);
+-  assert.equal(response.data.attributes.version, payload.node.version);
+-  assert.equal(response.data.attributes.availMemoryMB,
+-      payload.node.availMemoryMB);
+-  assert.equal(response.data.attributes.usedMemoryMB,
+-      payload.node.usedMemoryMB);
+-  assert.equal(response.data.attributes.availableVirtualCores,
+-      payload.node.availableVirtualCores);
+-  assert.equal(response.data.attributes.usedVirtualCores,
+-      payload.node.usedVirtualCores);
+-  assert.deepEqual(response.data.attributes.nodeLabels,
+-      payload.node.nodeLabels);
+-});
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-component-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-component-test.js
+deleted file mode 100644
+index c9df24bdf0a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-component-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-service-component', 'Unit | Serializer | yarn service component', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-service-component']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-info-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-info-test.js
+deleted file mode 100644
+index 9b1d3105be0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-service-info-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-service-info', 'Unit | Serializer | yarn service info', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-service-info']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
+deleted file mode 100644
+index 4e9146caea8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-appattempt-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-timeline-appattempt', 'Unit | Serializer | yarn timeline appattempt', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-timeline-appattempt']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
+deleted file mode 100644
+index e55fea07d7f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/serializers/yarn-timeline-container-test.js
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleForModel, test } from 'ember-qunit';
+-
+-moduleForModel('yarn-timeline-container', 'Unit | Serializer | yarn timeline container', {
+-  // Specify the other units that are required for this test.
+-  needs: ['serializer:yarn-timeline-container']
+-});
+-
+-// Replace this with your real tests.
+-test('it serializes records', function(assert) {
+-  let record = this.subject();
+-
+-  let serializedRecord = record.serialize();
+-
+-  assert.ok(serializedRecord);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/env-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/env-test.js
+deleted file mode 100644
+index 9eb93679b1b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/env-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('service:env', 'Unit | Service | env', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['service:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  var service = this.subject();
+-  assert.ok(service);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/hosts-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/hosts-test.js
+deleted file mode 100644
+index 015748a64fa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/services/hosts-test.js
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import { moduleFor, test } from 'ember-qunit';
+-
+-moduleFor('service:hosts', 'Unit | Service | hosts', {
+-  // Specify the other units that are required for this test.
+-  // needs: ['service:foo']
+-});
+-
+-// Replace this with your real tests.
+-test('it exists', function(assert) {
+-  var service = this.subject();
+-  assert.ok(service);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/converter-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/converter-test.js
+deleted file mode 100644
+index 481537de961..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/converter-test.js
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import converter from '../../../utils/converter';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Utility | Converter');
+-
+-// Replace this with your real tests.
+-test('it works', function(assert) {
+-  assert.ok(converter);
+-  assert.ok(converter.splitForContainerLogs);
+-});
+-
+-test('split for container logs', function(assert) {
+-  var id = "localhost:64318!container_e32_1456000363780_0002_01_000001!" +
+-      "syslog";
+-  var arr = converter.splitForContainerLogs(id);
+-  assert.ok(arr);
+-  assert.deepEqual(arr, ["localhost:64318",
+-      "container_e32_1456000363780_0002_01_000001", "syslog"]);
+-  id = "localhost:64318!container_e32_1456000363780_0002_01_000001!" +
+-      "syslog!logs";
+-  arr = converter.splitForContainerLogs(id);
+-  assert.ok(arr);
+-  assert.deepEqual(arr, ["localhost:64318",
+-      "container_e32_1456000363780_0002_01_000001", "syslog!logs"]);
+-  id = "localhost:64318!container_e32_1456000363780_0002_01_000001";
+-  arr = converter.splitForContainerLogs(id);
+-  assert.notOk(arr);
+-  id = null;
+-  arr = converter.splitForContainerLogs(id);
+-  assert.notOk(arr);
+-  id = undefined;
+-  arr = converter.splitForContainerLogs(id);
+-  assert.notOk(arr);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/sorter-test.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/sorter-test.js
+deleted file mode 100644
+index 8f173806561..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/tests/unit/utils/sorter-test.js
++++ /dev/null
+@@ -1,26 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-import Sorter from 'yarn-ui/utils/sorter';
+-import { module, test } from 'qunit';
+-
+-module('Unit | Utility | Sorter');
+-
+-test('Basic creation test', function(assert) {
+-  assert.ok(Sorter);
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
+deleted file mode 100644
+index 39d38e7f933..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
++++ /dev/null
+@@ -1,7093 +0,0 @@
+-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+-# yarn lockfile v1
+-
+-
+-"@sailshq/lodash@^3.10.2":
+-  version "3.10.4"
+-  resolved "https://registry.yarnpkg.com/@sailshq/lodash/-/lodash-3.10.4.tgz#2299648a81a67f4c6ee222c6cf8e261bd9c3fa50"
+-  integrity sha512-YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==
+-
+-abbrev@1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+-
+-abbrev@~1.0.7:
+-  version "1.0.9"
+-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+-  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
+-
+-accepts@~1.3.5, accepts@~1.3.7:
+-  version "1.3.7"
+-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+-  dependencies:
+-    mime-types "~2.1.24"
+-    negotiator "0.6.2"
+-
+-acorn@^5.2.1:
+-  version "5.7.4"
+-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+-
+-after@0.8.1:
+-  version "0.8.1"
+-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627"
+-  integrity sha1-q11PuIP1loFtNRX495HAr0ht1ic=
+-
+-ajv@^4.9.1:
+-  version "4.11.8"
+-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+-  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
+-  dependencies:
+-    co "^4.6.0"
+-    json-stable-stringify "^1.0.1"
+-
+-ajv@^6.12.3:
+-  version "6.12.6"
+-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+-  dependencies:
+-    fast-deep-equal "^3.1.1"
+-    fast-json-stable-stringify "^2.0.0"
+-    json-schema-traverse "^0.4.1"
+-    uri-js "^4.2.2"
+-
+-align-text@^0.1.1, align-text@^0.1.3:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+-  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
+-  dependencies:
+-    kind-of "^3.0.2"
+-    longest "^1.0.1"
+-    repeat-string "^1.5.2"
+-
+-alter@~0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/alter/-/alter-0.2.0.tgz#c7588808617572034aae62480af26b1d4d1cb3cd"
+-  integrity sha1-x1iICGF1cgNKrmJICvJrHU0cs80=
+-  dependencies:
+-    stable "~0.1.3"
+-
+-amd-name-resolver@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.2.tgz#7bee4e112aabeecc2e14429c4ca750c55d8e5ecd"
+-  integrity sha1-e+5OESqr7swuFEKcTKdQxV2OXs0=
+-
+-amdefine@>=0.0.4:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+-
+-ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+-  integrity sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=
+-
+-ansi-regex@^1.0.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d"
+-  integrity sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0=
+-
+-ansi-regex@^2.0.0:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+-
+-ansi-regex@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+-
+-ansi-regex@^4.1.0:
+-  version "4.1.0"
+-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+-
+-ansi-styles@^1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+-  integrity sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=
+-
+-ansi-styles@^2.0.1, ansi-styles@^2.1.0, ansi-styles@^2.2.1:
+-  version "2.2.1"
+-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+-
+-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+-  version "3.2.1"
+-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+-  dependencies:
+-    color-convert "^1.9.0"
+-
+-ansi-styles@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+-  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
+-
+-ansi@^0.3.0, ansi@~0.3.0, ansi@~0.3.1:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21"
+-  integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=
+-
+-ansicolors@~0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+-  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+-
+-ansicolors@~0.3.2:
+-  version "0.3.2"
+-  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+-  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
+-
+-ansistyles@~0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+-  integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk=
+-
+-anymatch@^1.3.0:
+-  version "1.3.2"
+-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
+-  dependencies:
+-    micromatch "^2.1.5"
+-    normalize-path "^2.0.0"
+-
+-aproba@^1.0.3:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+-
+-archy@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
+-
+-are-we-there-yet@~1.0.0:
+-  version "1.0.6"
+-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz#a2d28c93102aa6cc96245a26cb954de06ec53f0c"
+-  integrity sha1-otKMkxAqpsyWJFomy5VN4G7FPww=
+-  dependencies:
+-    delegates "^1.0.0"
+-    readable-stream "^2.0.0 || ^1.1.13"
+-
+-are-we-there-yet@~1.1.2:
+-  version "1.1.5"
+-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+-  dependencies:
+-    delegates "^1.0.0"
+-    readable-stream "^2.0.6"
+-
+-argparse@^1.0.7, argparse@~1.0.2:
+-  version "1.0.10"
+-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+-  dependencies:
+-    sprintf-js "~1.0.2"
+-
+-arr-diff@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+-  dependencies:
+-    arr-flatten "^1.0.1"
+-
+-arr-flatten@^1.0.1:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+-
+-array-equal@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+-
+-array-find-index@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+-
+-array-flatten@1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+-
+-array-index@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
+-  integrity sha1-7FanSe4QPk4Ix5C5w1PfFgVbl/k=
+-  dependencies:
+-    debug "^2.2.0"
+-    es6-symbol "^3.0.2"
+-
+-array-unique@^0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+-
+-arraybuffer.slice@0.0.6:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+-  integrity sha1-8zshWfBTKj8xB6JywMz70a0peco=
+-
+-asap@^2.0.0, asap@~2.0.3:
+-  version "2.0.6"
+-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+-
+-asn1@0.1.11:
+-  version "0.1.11"
+-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
+-  integrity sha1-VZvhg3bQik7E2+gId9J4GGObLfc=
+-
+-asn1@~0.2.3:
+-  version "0.2.4"
+-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+-  dependencies:
+-    safer-buffer "~2.1.0"
+-
+-assert-plus@1.0.0, assert-plus@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+-
+-assert-plus@^0.1.5:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
+-  integrity sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=
+-
+-assert-plus@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
+-
+-ast-traverse@~0.1.1:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6"
+-  integrity sha1-ac8rg4bxnc2hux4F1o/jWdiJfeY=
+-
+-ast-types@0.8.12:
+-  version "0.8.12"
+-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
+-  integrity sha1-oNkOQ1G7iHcWyD/WN+v4GK9K38w=
+-
+-ast-types@0.8.15:
+-  version "0.8.15"
+-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
+-  integrity sha1-ju8IJ/BN/w7IhXupJavj/qYZTlI=
+-
+-ast-types@0.9.6:
+-  version "0.9.6"
+-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
+-  integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
+-
+-async-disk-cache@^1.2.1:
+-  version "1.3.5"
+-  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.5.tgz#cc6206ed79bb6982b878fc52e0505e4f52b62a02"
+-  integrity sha512-VZpqfR0R7CEOJZ/0FOTgWq70lCrZyS1rkI8PXugDUkTKyyAUgZ2zQ09gLhMkEn+wN8LYeUTPxZdXtlX/kmbXKQ==
+-  dependencies:
+-    debug "^2.1.3"
+-    heimdalljs "^0.2.3"
+-    istextorbinary "2.1.0"
+-    mkdirp "^0.5.0"
+-    rimraf "^2.5.3"
+-    rsvp "^3.0.18"
+-    username-sync "^1.0.2"
+-
+-async-foreach@^0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
+-
+-async-promise-queue@^1.0.3:
+-  version "1.0.5"
+-  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
+-  integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
+-  dependencies:
+-    async "^2.4.1"
+-    debug "^2.6.8"
+-
+-async-some@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/async-some/-/async-some-1.0.2.tgz#4d8a81620d5958791b5b98f802d3207776e95509"
+-  integrity sha1-TYqBYg1ZWHkbW5j4AtMgd3bpVQk=
+-  dependencies:
+-    dezalgo "^1.0.2"
+-
+-async@0.9.0:
+-  version "0.9.0"
+-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
+-  integrity sha1-rDYTsdqb7RtHUQu0ZRuJMeRxRsc=
+-
+-async@^1.0.0:
+-  version "1.5.2"
+-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+-
+-async@^2.0.1, async@^2.4.1:
+-  version "2.6.3"
+-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+-  dependencies:
+-    lodash "^4.17.14"
+-
+-async@~0.2.9:
+-  version "0.2.10"
+-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+-  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+-
+-async@~0.8.0:
+-  version "0.8.0"
+-  resolved "https://registry.yarnpkg.com/async/-/async-0.8.0.tgz#ee65ec77298c2ff1456bc4418a052d0f06435112"
+-  integrity sha1-7mXsdymML/FFa8RBigUtDwZDURI=
+-
+-asynckit@^0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+-
+-aws-sign2@~0.6.0:
+-  version "0.6.0"
+-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
+-
+-aws-sign2@~0.7.0:
+-  version "0.7.0"
+-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+-
+-aws4@^1.2.1:
+-  version "1.9.0"
+-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
+-  integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
+-
+-aws4@^1.8.0:
+-  version "1.11.0"
+-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+-
+-babel-core@^5.0.0:
+-  version "5.8.38"
+-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558"
+-  integrity sha1-H8ruedfmG3ULALjlT238nQr4ZVg=
+-  dependencies:
+-    babel-plugin-constant-folding "^1.0.1"
+-    babel-plugin-dead-code-elimination "^1.0.2"
+-    babel-plugin-eval "^1.0.1"
+-    babel-plugin-inline-environment-variables "^1.0.1"
+-    babel-plugin-jscript "^1.0.4"
+-    babel-plugin-member-expression-literals "^1.0.1"
+-    babel-plugin-property-literals "^1.0.1"
+-    babel-plugin-proto-to-assign "^1.0.3"
+-    babel-plugin-react-constant-elements "^1.0.3"
+-    babel-plugin-react-display-name "^1.0.3"
+-    babel-plugin-remove-console "^1.0.1"
+-    babel-plugin-remove-debugger "^1.0.1"
+-    babel-plugin-runtime "^1.0.7"
+-    babel-plugin-undeclared-variables-check "^1.0.2"
+-    babel-plugin-undefined-to-void "^1.1.6"
+-    babylon "^5.8.38"
+-    bluebird "^2.9.33"
+-    chalk "^1.0.0"
+-    convert-source-map "^1.1.0"
+-    core-js "^1.0.0"
+-    debug "^2.1.1"
+-    detect-indent "^3.0.0"
+-    esutils "^2.0.0"
+-    fs-readdir-recursive "^0.1.0"
+-    globals "^6.4.0"
+-    home-or-tmp "^1.0.0"
+-    is-integer "^1.0.4"
+-    js-tokens "1.0.1"
+-    json5 "^0.4.0"
+-    lodash "^3.10.0"
+-    minimatch "^2.0.3"
+-    output-file-sync "^1.1.0"
+-    path-exists "^1.0.0"
+-    path-is-absolute "^1.0.0"
+-    private "^0.1.6"
+-    regenerator "0.8.40"
+-    regexpu "^1.3.0"
+-    repeating "^1.1.2"
+-    resolve "^1.1.6"
+-    shebang-regex "^1.0.0"
+-    slash "^1.0.0"
+-    source-map "^0.5.0"
+-    source-map-support "^0.2.10"
+-    to-fast-properties "^1.0.0"
+-    trim-right "^1.0.0"
+-    try-resolve "^1.0.0"
+-
+-babel-plugin-constant-folding@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-constant-folding/-/babel-plugin-constant-folding-1.0.1.tgz#8361d364c98e449c3692bdba51eff0844290aa8e"
+-  integrity sha1-g2HTZMmORJw2kr26Ue/whEKQqo4=
+-
+-babel-plugin-dead-code-elimination@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65"
+-  integrity sha1-X3xFEnTc18zNv7s+C4XdKBIfD2U=
+-
+-babel-plugin-eval@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da"
+-  integrity sha1-ovrtJc5r5preS/7CY/cBaRlZUNo=
+-
+-babel-plugin-htmlbars-inline-precompile@0.0.5:
+-  version "0.0.5"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.0.5.tgz#60fc2a3a453664cb524b21866892c212ee63ff70"
+-  integrity sha1-YPwqOkU2ZMtSSyGGaJLCEu5j/3A=
+-
+-babel-plugin-inline-environment-variables@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz#1f58ce91207ad6a826a8bf645fafe68ff5fe3ffe"
+-  integrity sha1-H1jOkSB61qgmqL9kX6/mj/X+P/4=
+-
+-babel-plugin-jscript@^1.0.4:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-jscript/-/babel-plugin-jscript-1.0.4.tgz#8f342c38276e87a47d5fa0a8bd3d5eb6ccad8fcc"
+-  integrity sha1-jzQsOCduh6R9X6CovT1etsytj8w=
+-
+-babel-plugin-member-expression-literals@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-member-expression-literals/-/babel-plugin-member-expression-literals-1.0.1.tgz#cc5edb0faa8dc927170e74d6d1c02440021624d3"
+-  integrity sha1-zF7bD6qNyScXDnTW0cAkQAIWJNM=
+-
+-babel-plugin-property-literals@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-property-literals/-/babel-plugin-property-literals-1.0.1.tgz#0252301900192980b1c118efea48ce93aab83336"
+-  integrity sha1-AlIwGQAZKYCxwRjv6kjOk6q4MzY=
+-
+-babel-plugin-proto-to-assign@^1.0.3:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-proto-to-assign/-/babel-plugin-proto-to-assign-1.0.4.tgz#c49e7afd02f577bc4da05ea2df002250cf7cd123"
+-  integrity sha1-xJ56/QL1d7xNoF6i3wAiUM980SM=
+-  dependencies:
+-    lodash "^3.9.3"
+-
+-babel-plugin-react-constant-elements@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-react-constant-elements/-/babel-plugin-react-constant-elements-1.0.3.tgz#946736e8378429cbc349dcff62f51c143b34e35a"
+-  integrity sha1-lGc26DeEKcvDSdz/YvUcFDs041o=
+-
+-babel-plugin-react-display-name@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-react-display-name/-/babel-plugin-react-display-name-1.0.3.tgz#754fe38926e8424a4e7b15ab6ea6139dee0514fc"
+-  integrity sha1-dU/jiSboQkpOexWrbqYTne4FFPw=
+-
+-babel-plugin-remove-console@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-remove-console/-/babel-plugin-remove-console-1.0.1.tgz#d8f24556c3a05005d42aaaafd27787f53ff013a7"
+-  integrity sha1-2PJFVsOgUAXUKqqv0neH9T/wE6c=
+-
+-babel-plugin-remove-debugger@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-remove-debugger/-/babel-plugin-remove-debugger-1.0.1.tgz#fd2ea3cd61a428ad1f3b9c89882ff4293e8c14c7"
+-  integrity sha1-/S6jzWGkKK0fO5yJiC/0KT6MFMc=
+-
+-babel-plugin-runtime@^1.0.7:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-runtime/-/babel-plugin-runtime-1.0.7.tgz#bf7c7d966dd56ecd5c17fa1cb253c9acb7e54aaf"
+-  integrity sha1-v3x9lm3Vbs1cF/ocslPJrLflSq8=
+-
+-babel-plugin-undeclared-variables-check@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-undeclared-variables-check/-/babel-plugin-undeclared-variables-check-1.0.2.tgz#5cf1aa539d813ff64e99641290af620965f65dee"
+-  integrity sha1-XPGqU52BP/ZOmWQSkK9iCWX2Xe4=
+-  dependencies:
+-    leven "^1.0.2"
+-
+-babel-plugin-undefined-to-void@^1.1.6:
+-  version "1.1.6"
+-  resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81"
+-  integrity sha1-f1eO+LeN+uYAM4XYQXph7aBuL4E=
+-
+-babylon@^5.8.38:
+-  version "5.8.38"
+-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
+-  integrity sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=
+-
+-backbone@^1.1.2:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
+-  integrity sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==
+-  dependencies:
+-    underscore ">=1.8.3"
+-
+-backo2@1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+-
+-balanced-match@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+-
+-base64-arraybuffer@0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz#474df4a9f2da24e05df3158c3b1db3c3cd46a154"
+-  integrity sha1-R030qfLaJOBd8xWMOx2zw81GoVQ=
+-
+-base64id@0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"
+-  integrity sha1-As4P3u4M709ACA4ec+g08LG/zj8=
+-
+-basic-auth@~2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+-  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+-  dependencies:
+-    safe-buffer "5.1.2"
+-
+-bcrypt-pbkdf@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+-  dependencies:
+-    tweetnacl "^0.14.3"
+-
+-benchmark@1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-1.0.0.tgz#2f1e2fa4c359f11122aa183082218e957e390c73"
+-  integrity sha1-Lx4vpMNZ8REiqhgwgiGOlX45DHM=
+-
+-better-assert@~1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+-  dependencies:
+-    callsite "1.0.0"
+-
+-"binaryextensions@1 || 2":
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311"
+-  integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==
+-
+-bl@~1.0.0:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
+-  integrity sha1-/FQhoo/UImA2w7OJGmaiW8ZNIm4=
+-  dependencies:
+-    readable-stream "~2.0.5"
+-
+-bl@~1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+-  integrity sha1-/cqHGplxOqANGeO7ukHER4emU5g=
+-  dependencies:
+-    readable-stream "~2.0.5"
+-
+-blank-object@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
+-  integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
+-
+-blob@0.0.4:
+-  version "0.0.4"
+-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
+-
+-block-stream@*:
+-  version "0.0.9"
+-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
+-  dependencies:
+-    inherits "~2.0.0"
+-
+-block-stream@0.0.8:
+-  version "0.0.8"
+-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.8.tgz#0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b"
+-  integrity sha1-Boj0baK7+c/wxPaCJaDLlcvopGs=
+-  dependencies:
+-    inherits "~2.0.0"
+-
+-bluebird@^2.9.26, bluebird@^2.9.33:
+-  version "2.11.0"
+-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+-  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
+-
+-body-parser@1.19.0, body-parser@^1.2.0:
+-  version "1.19.0"
+-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+-  dependencies:
+-    bytes "3.1.0"
+-    content-type "~1.0.4"
+-    debug "2.6.9"
+-    depd "~1.1.2"
+-    http-errors "1.7.2"
+-    iconv-lite "0.4.24"
+-    on-finished "~2.3.0"
+-    qs "6.7.0"
+-    raw-body "2.4.0"
+-    type-is "~1.6.17"
+-
+-body-parser@~1.14.0:
+-  version "1.14.2"
+-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.14.2.tgz#1015cb1fe2c443858259581db53332f8d0cf50f9"
+-  integrity sha1-EBXLH+LEQ4WCWVgdtTMy+NDPUPk=
+-  dependencies:
+-    bytes "2.2.0"
+-    content-type "~1.0.1"
+-    debug "~2.2.0"
+-    depd "~1.1.0"
+-    http-errors "~1.3.1"
+-    iconv-lite "0.4.13"
+-    on-finished "~2.3.0"
+-    qs "5.2.0"
+-    raw-body "~2.1.5"
+-    type-is "~1.6.10"
+-
+-boom@2.x.x:
+-  version "2.10.1"
+-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
+-  dependencies:
+-    hoek "2.x.x"
+-
+-bower-config@0.6.1:
+-  version "0.6.1"
+-  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-0.6.1.tgz#7093155688bef44079bf4cb32d189312c87ded60"
+-  integrity sha1-cJMVVoi+9EB5v0yzLRiTEsh97WA=
+-  dependencies:
+-    graceful-fs "~2.0.0"
+-    mout "~0.9.0"
+-    optimist "~0.6.0"
+-    osenv "0.0.3"
+-
+-bower-endpoint-parser@0.2.2:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
+-  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+-
+-bower-shrinkwrap-resolver-ext@0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/bower-shrinkwrap-resolver-ext/-/bower-shrinkwrap-resolver-ext-0.1.0.tgz#963c1a87107501b0cb7823d8cbc84d5167c7fa23"
+-  integrity sha1-ljwahxB1AbDLeCPYy8hNUWfH+iM=
+-  dependencies:
+-    debuglog "^1.0.1"
+-    json-stable-stringify "^1.0.1"
+-    object-assign "^4.0.1"
+-    semver "^5.3.0"
+-    string.prototype.endswith "^0.2.0"
+-
+-bower@1.8.8, bower@^1.3.12:
+-  version "1.8.8"
+-  resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.8.tgz#82544be34a33aeae7efb8bdf9905247b2cffa985"
+-  integrity sha512-1SrJnXnkP9soITHptSO+ahx3QKp3cVzn8poI6ujqc5SeOkg5iqM1pK9H+DSc2OQ8SnO0jC/NG4Ur/UIwy7574A==
+-
+-brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+-  version "1.1.11"
+-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+-  dependencies:
+-    balanced-match "^1.0.0"
+-    concat-map "0.0.1"
+-
+-braces@^1.8.2:
+-  version "1.8.5"
+-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+-  dependencies:
+-    expand-range "^1.8.1"
+-    preserve "^0.2.0"
+-    repeat-element "^1.1.2"
+-
+-breakable@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
+-  integrity sha1-eEp5eRWjjq0nutRWtVcstLuqeME=
+-
+-broccoli-asset-rev@2.4.2:
+-  version "2.4.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-2.4.2.tgz#b84953affbda78d17dffb41349398f50fc26125c"
+-  integrity sha1-uElTr/vaeNF9/7QTSTmPUPwmElw=
+-  dependencies:
+-    broccoli-asset-rewrite "^1.0.9"
+-    broccoli-filter "^1.2.2"
+-    json-stable-stringify "^1.0.0"
+-    matcher-collection "^1.0.1"
+-    rsvp "~3.0.6"
+-
+-broccoli-asset-rewrite@^1.0.9:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-asset-rewrite/-/broccoli-asset-rewrite-1.1.0.tgz#77a5da56157aa318c59113245e8bafb4617f8830"
+-  integrity sha1-d6XaVhV6oxjFkRMkXouvtGF/iDA=
+-  dependencies:
+-    broccoli-filter "^1.2.3"
+-
+-broccoli-babel-transpiler@^5.4.5, broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2:
+-  version "5.7.4"
+-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz#2b0611ce9e5d98b8d8d2b49ae1219af2f52767e3"
+-  integrity sha512-gI14Pqc4qbmn5RW4SuAmybLiOoYW59D+HzQyhY6WdaGMAjikKBwJN0p17phyvafQ+kvG0mUiMd83lgHLeATnEA==
+-  dependencies:
+-    babel-core "^5.0.0"
+-    broccoli-funnel "^1.0.0"
+-    broccoli-merge-trees "^1.0.0"
+-    broccoli-persistent-filter "^1.4.2"
+-    clone "^0.2.0"
+-    hash-for-dep "^1.0.2"
+-    heimdalljs-logger "^0.1.7"
+-    json-stable-stringify "^1.0.0"
+-    rsvp "^3.5.0"
+-    workerpool "^2.3.0"
+-
+-broccoli-caching-writer@^2.0.0, broccoli-caching-writer@^2.2.0, broccoli-caching-writer@^2.3.1:
+-  version "2.3.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.3.1.tgz#b93cf58f9264f003075868db05774f4e7f25bd07"
+-  integrity sha1-uTz1j5Jk8AMHWGjbBXdPTn8lvQc=
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.2.5"
+-    broccoli-plugin "1.1.0"
+-    debug "^2.1.1"
+-    rimraf "^2.2.8"
+-    rsvp "^3.0.17"
+-    walk-sync "^0.2.5"
+-
+-broccoli-caching-writer@^3.0.3:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
+-  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.3.1"
+-    broccoli-plugin "^1.2.1"
+-    debug "^2.1.1"
+-    rimraf "^2.2.8"
+-    rsvp "^3.0.17"
+-    walk-sync "^0.3.0"
+-
+-broccoli-clean-css@0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-0.2.0.tgz#15f1c265a6986585a972bfb070bf52e9c054c861"
+-  integrity sha1-FfHCZaaYZYWpcr+wcL9S6cBUyGE=
+-  dependencies:
+-    broccoli-filter "^0.1.6"
+-    clean-css "^2.2.1"
+-
+-broccoli-config-loader@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
+-  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+-  dependencies:
+-    broccoli-caching-writer "^3.0.3"
+-
+-broccoli-config-replace@^1.1.0:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
+-  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.3.1"
+-    broccoli-plugin "^1.2.0"
+-    debug "^2.2.0"
+-    fs-extra "^0.24.0"
+-
+-broccoli-debug@^0.6.1:
+-  version "0.6.5"
+-  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
+-  integrity sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==
+-  dependencies:
+-    broccoli-plugin "^1.2.1"
+-    fs-tree-diff "^0.5.2"
+-    heimdalljs "^0.2.1"
+-    heimdalljs-logger "^0.1.7"
+-    symlink-or-copy "^1.1.8"
+-    tree-sync "^1.2.2"
+-
+-broccoli-filter@^0.1.6:
+-  version "0.1.14"
+-  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad"
+-  integrity sha1-I8rjiR/567e019sAxtzwNTXa960=
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.2.6"
+-    broccoli-writer "^0.1.1"
+-    mkdirp "^0.3.5"
+-    promise-map-series "^0.2.1"
+-    quick-temp "^0.1.2"
+-    rsvp "^3.0.16"
+-    symlink-or-copy "^1.0.1"
+-    walk-sync "^0.1.3"
+-
+-broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
+-  version "1.3.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6"
+-  integrity sha512-VXJXw7eBfG82CFxaBDjYmyN7V72D4In2zwLVQJd/h3mBfF3CMdRTsv2L20lmRTtCv1sAHcB+LgMso90e/KYiLw==
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.3.1"
+-    broccoli-plugin "^1.0.0"
+-    copy-dereference "^1.0.0"
+-    debug "^2.2.0"
+-    mkdirp "^0.5.1"
+-    promise-map-series "^0.2.1"
+-    rsvp "^3.0.18"
+-    symlink-or-copy "^1.0.1"
+-    walk-sync "^0.3.1"
+-
+-broccoli-funnel@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.0.1.tgz#12cb76e342343592a3b18ae7840c0db3bd16d8af"
+-  integrity sha1-Est240I0NZKjsYrnhAwNs70W2K8=
+-  dependencies:
+-    array-equal "^1.0.0"
+-    blank-object "^1.0.1"
+-    broccoli-plugin "^1.0.0"
+-    debug "^2.2.0"
+-    fast-ordered-set "^1.0.0"
+-    fs-tree-diff "^0.3.0"
+-    minimatch "^2.0.1"
+-    mkdirp "^0.5.0"
+-    path-posix "^1.0.0"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-    walk-sync "^0.2.6"
+-
+-broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
+-  integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
+-  dependencies:
+-    array-equal "^1.0.0"
+-    blank-object "^1.0.1"
+-    broccoli-plugin "^1.3.0"
+-    debug "^2.2.0"
+-    exists-sync "0.0.4"
+-    fast-ordered-set "^1.0.0"
+-    fs-tree-diff "^0.5.3"
+-    heimdalljs "^0.2.0"
+-    minimatch "^3.0.0"
+-    mkdirp "^0.5.0"
+-    path-posix "^1.0.0"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-    walk-sync "^0.3.1"
+-
+-broccoli-funnel@^2.0.0:
+-  version "2.0.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.2.tgz#0edf629569bc10bd02cc525f74b9a38e71366a75"
+-  integrity sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==
+-  dependencies:
+-    array-equal "^1.0.0"
+-    blank-object "^1.0.1"
+-    broccoli-plugin "^1.3.0"
+-    debug "^2.2.0"
+-    fast-ordered-set "^1.0.0"
+-    fs-tree-diff "^0.5.3"
+-    heimdalljs "^0.2.0"
+-    minimatch "^3.0.0"
+-    mkdirp "^0.5.0"
+-    path-posix "^1.0.0"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-    walk-sync "^0.3.1"
+-
+-broccoli-jshint@^1.0.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-jshint/-/broccoli-jshint-1.2.0.tgz#8cd565d11a04bfd32cb8f85a0f7ede1e5be7a6a2"
+-  integrity sha1-jNVl0RoEv9MsuPhaD37eHlvnpqI=
+-  dependencies:
+-    broccoli-persistent-filter "^1.2.0"
+-    chalk "~0.4.0"
+-    findup-sync "^0.3.0"
+-    jshint "^2.7.0"
+-    json-stable-stringify "^1.0.0"
+-    mkdirp "~0.4.0"
+-
+-broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@^0.2.7:
+-  version "0.2.9"
+-  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
+-  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+-  dependencies:
+-    glob "^5.0.10"
+-    mkdirp "^0.5.1"
+-
+-broccoli-kitchen-sink-helpers@^0.3.1:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.3.1.tgz#77c7c18194b9664163ec4fcee2793444926e0c06"
+-  integrity sha1-d8fBgZS5ZkFj7E/O4nk0RJJuDAY=
+-  dependencies:
+-    glob "^5.0.10"
+-    mkdirp "^0.5.1"
+-
+-broccoli-less-single@^0.6.4:
+-  version "0.6.4"
+-  resolved "https://registry.yarnpkg.com/broccoli-less-single/-/broccoli-less-single-0.6.4.tgz#200316f4146b8cf7e6ab97fc661b8085cc89bdb9"
+-  integrity sha1-IAMW9BRrjPfmq5f8ZhuAhcyJvbk=
+-  dependencies:
+-    broccoli-caching-writer "^2.3.1"
+-    include-path-searcher "^0.1.0"
+-    less "^2.5.0"
+-    lodash.merge "^3.3.2"
+-    mkdirp "^0.5.0"
+-
+-broccoli-merge-trees@1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.1.1.tgz#1e283d18c686da922bb91a80d7aac0d161388e21"
+-  integrity sha1-Hig9GMaG2pIruRqA16rA0WE4jiE=
+-  dependencies:
+-    broccoli-plugin "^1.0.0"
+-    can-symlink "^1.0.0"
+-    debug "^2.2.0"
+-    fast-ordered-set "^1.0.2"
+-    fs-tree-diff "^0.4.3"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-
+-broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1:
+-  version "1.2.4"
+-  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
+-  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+-  dependencies:
+-    broccoli-plugin "^1.3.0"
+-    can-symlink "^1.0.0"
+-    fast-ordered-set "^1.0.2"
+-    fs-tree-diff "^0.5.4"
+-    heimdalljs "^0.2.1"
+-    heimdalljs-logger "^0.1.7"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-
+-broccoli-merge-trees@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz#14d4b7fc1a90318c12b16f843e6ba2693808100c"
+-  integrity sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==
+-  dependencies:
+-    broccoli-plugin "^1.3.0"
+-    merge-trees "^1.0.1"
+-
+-broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.2:
+-  version "1.4.6"
+-  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz#80762d19000880a77da33c34373299c0f6a3e615"
+-  integrity sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==
+-  dependencies:
+-    async-disk-cache "^1.2.1"
+-    async-promise-queue "^1.0.3"
+-    broccoli-plugin "^1.0.0"
+-    fs-tree-diff "^0.5.2"
+-    hash-for-dep "^1.0.2"
+-    heimdalljs "^0.2.1"
+-    heimdalljs-logger "^0.1.7"
+-    mkdirp "^0.5.1"
+-    promise-map-series "^0.2.1"
+-    rimraf "^2.6.1"
+-    rsvp "^3.0.18"
+-    symlink-or-copy "^1.0.1"
+-    walk-sync "^0.3.1"
+-
+-broccoli-plugin@1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
+-  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+-  dependencies:
+-    promise-map-series "^0.2.1"
+-    quick-temp "^0.1.3"
+-    rimraf "^2.3.4"
+-    symlink-or-copy "^1.0.1"
+-
+-broccoli-plugin@^1.0.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
+-  integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
+-  dependencies:
+-    promise-map-series "^0.2.1"
+-    quick-temp "^0.1.3"
+-    rimraf "^2.3.4"
+-    symlink-or-copy "^1.1.8"
+-
+-broccoli-sane-watcher@^1.1.1:
+-  version "1.1.5"
+-  resolved "https://registry.yarnpkg.com/broccoli-sane-watcher/-/broccoli-sane-watcher-1.1.5.tgz#f2b0af9cf0afb74c7a49cd88eb11c6869ee8c0c0"
+-  integrity sha1-8rCvnPCvt0x6Sc2I6xHGhp7owMA=
+-  dependencies:
+-    broccoli-slow-trees "^1.1.0"
+-    debug "^2.1.0"
+-    rsvp "^3.0.18"
+-    sane "^1.1.1"
+-
+-broccoli-sass-source-maps@^2.0.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68"
+-  integrity sha512-X1yTOGQcjQxYebP+hjeAI286x63VZ0WfgFxqHsr4eimgNNL2TPxkJKKgOaDKJ3nE8pszbJWgHrWpEVXuwgsUzw==
+-  dependencies:
+-    broccoli-caching-writer "^3.0.3"
+-    include-path-searcher "^0.1.0"
+-    mkdirp "^0.3.5"
+-    node-sass "^4.7.2"
+-    object-assign "^2.0.0"
+-    rsvp "^3.0.6"
+-
+-broccoli-slow-trees@^1.0.0, broccoli-slow-trees@^1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-1.1.0.tgz#426c5724e008107e4573f73e8a9ca702916b78f7"
+-  integrity sha1-QmxXJOAIEH5Fc/c+ipynApFrePc=
+-
+-broccoli-source@^1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
+-  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
+-
+-broccoli-sourcemap-concat@^1.1.6:
+-  version "1.1.6"
+-  resolved "https://registry.yarnpkg.com/broccoli-sourcemap-concat/-/broccoli-sourcemap-concat-1.1.6.tgz#7caa0e28e2553c58897c369a673da05600541872"
+-  integrity sha1-fKoOKOJVPFiJfDaaZz2gVgBUGHI=
+-  dependencies:
+-    broccoli-caching-writer "^2.0.0"
+-    broccoli-kitchen-sink-helpers "^0.2.5"
+-    fast-sourcemap-concat " ^0.2.4"
+-    lodash-node "^2.4.1"
+-    lodash.uniq "^3.2.2"
+-    mkdirp "^0.5.1"
+-
+-broccoli-sourcemap-concat@^2.0.2:
+-  version "2.0.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-sourcemap-concat/-/broccoli-sourcemap-concat-2.0.2.tgz#64dbea4f9da4737c3fc5502efa20bb6322cd06a2"
+-  integrity sha1-ZNvqT52kc3w/xVAu+iC7YyLNBqI=
+-  dependencies:
+-    broccoli-caching-writer "^2.0.0"
+-    broccoli-kitchen-sink-helpers "^0.2.5"
+-    fast-sourcemap-concat " ^0.2.4"
+-    lodash-node "^2.4.1"
+-    lodash.uniq "^3.2.2"
+-    minimatch "^2.0.10"
+-    mkdirp "^0.5.1"
+-
+-broccoli-sri-hash@^1.2.2:
+-  version "1.2.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-sri-hash/-/broccoli-sri-hash-1.2.2.tgz#64e54401ac02ea49ebf2701169ae214c07588493"
+-  integrity sha1-ZOVEAawC6knr8nARaa4hTAdYhJM=
+-  dependencies:
+-    broccoli-caching-writer "^2.2.0"
+-    mkdirp "^0.5.1"
+-    rsvp "^3.1.0"
+-    sri-toolbox "^0.2.0"
+-    symlink-or-copy "^1.0.1"
+-
+-broccoli-stew@^1.0.0:
+-  version "1.6.0"
+-  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.6.0.tgz#01f6d92806ed6679ddbe48d405066a0e164dfbef"
+-  integrity sha512-sUwCJNnYH4Na690By5xcEMAZqKgquUQnMAEuIiL3Z2k63mSw9Xg+7Ew4wCrFrMmXMcLpWjZDOm6Yqnq268N+ZQ==
+-  dependencies:
+-    broccoli-debug "^0.6.1"
+-    broccoli-funnel "^2.0.0"
+-    broccoli-merge-trees "^2.0.0"
+-    broccoli-persistent-filter "^1.1.6"
+-    broccoli-plugin "^1.3.0"
+-    chalk "^2.4.1"
+-    debug "^3.1.0"
+-    ensure-posix-path "^1.0.1"
+-    fs-extra "^5.0.0"
+-    minimatch "^3.0.4"
+-    resolve "^1.8.1"
+-    rsvp "^4.8.3"
+-    symlink-or-copy "^1.2.0"
+-    walk-sync "^0.3.0"
+-
+-broccoli-uglify-sourcemap@^1.0.0:
+-  version "1.5.2"
+-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb"
+-  integrity sha1-BPhKsNtTkDH6hozPpWPJky1Qzts=
+-  dependencies:
+-    broccoli-plugin "^1.2.1"
+-    debug "^2.2.0"
+-    lodash.merge "^4.5.1"
+-    matcher-collection "^1.0.0"
+-    mkdirp "^0.5.0"
+-    source-map-url "^0.3.0"
+-    symlink-or-copy "^1.0.1"
+-    uglify-js "^2.7.0"
+-    walk-sync "^0.1.3"
+-
+-broccoli-unwatched-tree@^0.1.1:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.3.tgz#ab0fb820f613845bf67a803baad820f68b1e3aae"
+-  integrity sha1-qw+4IPYThFv2eoA7qtgg9oseOq4=
+-  dependencies:
+-    broccoli-source "^1.1.0"
+-
+-broccoli-viz@^2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-viz/-/broccoli-viz-2.0.1.tgz#3f3ed2fb83e368aa5306fae460801dea552e40db"
+-  integrity sha1-Pz7S+4PjaKpTBvrkYIAd6lUuQNs=
+-
+-broccoli-writer@^0.1.1:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d"
+-  integrity sha1-1NcaqPKvvGejhmuRotp5CEuWqy0=
+-  dependencies:
+-    quick-temp "^0.1.0"
+-    rsvp "^3.0.6"
+-
+-broccoli@0.16.8:
+-  version "0.16.8"
+-  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-0.16.8.tgz#2a00f6b82a8106ec9cfb380a8ada4ad490b836d5"
+-  integrity sha1-KgD2uCqBBuyc+zgKitpK1JC4NtU=
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.2.5"
+-    broccoli-slow-trees "^1.0.0"
+-    commander "^2.5.0"
+-    connect "^3.3.3"
+-    copy-dereference "^1.0.0"
+-    findup-sync "^0.2.1"
+-    handlebars "^3.0.1"
+-    mime "^1.2.11"
+-    promise-map-series "^0.2.1"
+-    quick-temp "^0.1.2"
+-    rimraf "^2.2.8"
+-    rsvp "^3.0.17"
+-
+-bser@2.1.1:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+-  dependencies:
+-    node-int64 "^0.4.0"
+-
+-buffer-from@^1.0.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+-
+-builtin-modules@^1.0.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+-
+-builtins@0.0.7:
+-  version "0.0.7"
+-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz#355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"
+-  integrity sha1-NVIZzWzxjb58Acx/0tznZc/cVJo=
+-
+-builtins@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+-
+-bytes@2.2.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.2.0.tgz#fd35464a403f6f9117c2de3609ecff9cae000588"
+-  integrity sha1-/TVGSkA/b5EXwt42Cez/nK4ABYg=
+-
+-bytes@2.4.0:
+-  version "2.4.0"
+-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
+-  integrity sha1-fZcZb51br39pNeJZhVSe3SpsIzk=
+-
+-bytes@3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+-
+-bytes@3.1.0:
+-  version "3.1.0"
+-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+-
+-callsite@1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+-
+-camelcase-keys@^2.0.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
+-  dependencies:
+-    camelcase "^2.0.0"
+-    map-obj "^1.0.0"
+-
+-camelcase@^1.0.2, camelcase@^1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+-  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
+-
+-camelcase@^2.0.0:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+-
+-camelcase@^5.0.0:
+-  version "5.3.1"
+-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+-
+-can-symlink@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
+-  integrity sha1-l7YH2KhLtsbiKLkC2GTstZS50hk=
+-  dependencies:
+-    tmp "0.0.28"
+-
+-cardinal@^0.5.0:
+-  version "0.5.0"
+-  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291"
+-  integrity sha1-ANX2YdvUqr/ffUHOSKWlm8o1opE=
+-  dependencies:
+-    ansicolors "~0.2.1"
+-    redeyed "~0.5.0"
+-
+-caseless@~0.11.0:
+-  version "0.11.0"
+-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
+-
+-caseless@~0.12.0:
+-  version "0.12.0"
+-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+-
+-center-align@^0.1.1:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+-  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
+-  dependencies:
+-    align-text "^0.1.3"
+-    lazy-cache "^1.0.3"
+-
+-chalk@1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.0.tgz#09b453cec497a75520e4a60ae48214a8700e0921"
+-  integrity sha1-CbRTzsSXp1Ug5KYK5IIUqHAOCSE=
+-  dependencies:
+-    ansi-styles "^2.1.0"
+-    escape-string-regexp "^1.0.2"
+-    has-ansi "^2.0.0"
+-    strip-ansi "^3.0.0"
+-    supports-color "^2.0.0"
+-
+-chalk@^0.5.1:
+-  version "0.5.1"
+-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+-  integrity sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=
+-  dependencies:
+-    ansi-styles "^1.1.0"
+-    escape-string-regexp "^1.0.0"
+-    has-ansi "^0.1.0"
+-    strip-ansi "^0.3.0"
+-    supports-color "^0.2.0"
+-
+-chalk@^1.0.0, chalk@^1.1.1:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+-  dependencies:
+-    ansi-styles "^2.2.1"
+-    escape-string-regexp "^1.0.2"
+-    has-ansi "^2.0.0"
+-    strip-ansi "^3.0.0"
+-    supports-color "^2.0.0"
+-
+-chalk@^2.4.1:
+-  version "2.4.2"
+-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+-  dependencies:
+-    ansi-styles "^3.2.1"
+-    escape-string-regexp "^1.0.5"
+-    supports-color "^5.3.0"
+-
+-chalk@~0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+-  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
+-  dependencies:
+-    ansi-styles "~1.0.0"
+-    has-color "~0.1.0"
+-    strip-ansi "~0.1.0"
+-
+-char-spinner@~1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/char-spinner/-/char-spinner-1.0.1.tgz#e6ea67bd247e107112983b7ab0479ed362800081"
+-  integrity sha1-5upnvSR+EHESmDt6sEee02KAAIE=
+-
+-charm@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
+-  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+-  dependencies:
+-    inherits "^2.0.1"
+-
+-chmodr@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.0.2.tgz#04662b932d0f02ec66deaa2b0ea42811968e3eb9"
+-  integrity sha1-BGYrky0PAuxm3qorDqQoEZaOPrk=
+-
+-chownr@^1.0.1:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+-  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+-
+-chownr@~1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+-  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
+-
+-clean-base-url@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
+-  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+-
+-clean-css@^2.2.1:
+-  version "2.2.23"
+-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-2.2.23.tgz#0590b5478b516c4903edc2d89bd3fdbdd286328c"
+-  integrity sha1-BZC1R4tRbEkD7cLYm9P9vdKGMow=
+-  dependencies:
+-    commander "2.2.x"
+-
+-cli-color@~0.3.2:
+-  version "0.3.3"
+-  resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-0.3.3.tgz#12d5bdd158ff8a0b0db401198913c03df069f6f5"
+-  integrity sha1-EtW90Vj/igsNtAEZiRPAPfBp9vU=
+-  dependencies:
+-    d "~0.1.1"
+-    es5-ext "~0.10.6"
+-    memoizee "~0.3.8"
+-    timers-ext "0.1"
+-
+-cli-table@^0.3.1:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+-  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+-  dependencies:
+-    colors "1.0.3"
+-
+-cli@~1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
+-  integrity sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=
+-  dependencies:
+-    exit "0.1.2"
+-    glob "^7.1.1"
+-
+-cliui@^2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+-  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
+-  dependencies:
+-    center-align "^0.1.1"
+-    right-align "^0.1.1"
+-    wordwrap "0.0.2"
+-
+-cliui@^5.0.0:
+-  version "5.0.0"
+-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+-  dependencies:
+-    string-width "^3.1.0"
+-    strip-ansi "^5.2.0"
+-    wrap-ansi "^5.1.0"
+-
+-clone@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
+-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
+-
+-clone@^1.0.2:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+-
+-clone@^2.0.0:
+-  version "2.1.2"
+-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+-
+-cmd-shim@~2.0.1:
+-  version "2.0.2"
+-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+-  integrity sha1-b8vamUg6j9FdfTChlspp1oii79s=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    mkdirp "~0.5.0"
+-
+-co@^4.6.0:
+-  version "4.6.0"
+-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+-
+-code-point-at@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+-
+-color-convert@^1.9.0:
+-  version "1.9.3"
+-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+-  dependencies:
+-    color-name "1.1.3"
+-
+-color-name@1.1.3:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+-
+-colors@1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+-  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+-
+-colors@~0.6.0-1:
+-  version "0.6.2"
+-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
+-  integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=
+-
+-columnify@~1.5.2:
+-  version "1.5.4"
+-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+-  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
+-  dependencies:
+-    strip-ansi "^3.0.0"
+-    wcwidth "^1.0.0"
+-
+-combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+-  version "1.0.8"
+-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+-  dependencies:
+-    delayed-stream "~1.0.0"
+-
+-commander@2.2.x:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.2.0.tgz#175ad4b9317f3ff615f201c1e57224f55a3e91df"
+-  integrity sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8=
+-
+-commander@^2.5.0, commander@^2.6.0, commander@^2.9.0:
+-  version "2.20.3"
+-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+-
+-commander@~2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
+-  integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
+-
+-commoner@~0.10.3:
+-  version "0.10.8"
+-  resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
+-  integrity sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=
+-  dependencies:
+-    commander "^2.5.0"
+-    detective "^4.3.1"
+-    glob "^5.0.15"
+-    graceful-fs "^4.1.2"
+-    iconv-lite "^0.4.5"
+-    mkdirp "^0.5.0"
+-    private "^0.1.6"
+-    q "^1.1.2"
+-    recast "^0.11.17"
+-
+-component-bind@1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+-
+-component-emitter@1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
+-  integrity sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=
+-
+-component-inherit@0.0.3:
+-  version "0.0.3"
+-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+-
+-compressible@~2.0.16:
+-  version "2.0.17"
+-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+-  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
+-  dependencies:
+-    mime-db ">= 1.40.0 < 2"
+-
+-compression@^1.4.4:
+-  version "1.7.4"
+-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+-  dependencies:
+-    accepts "~1.3.5"
+-    bytes "3.0.0"
+-    compressible "~2.0.16"
+-    debug "2.6.9"
+-    on-headers "~1.0.2"
+-    safe-buffer "5.1.2"
+-    vary "~1.1.2"
+-
+-concat-map@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+-
+-concat-stream@1.5.0:
+-  version "1.5.0"
+-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
+-  integrity sha1-U/fUPFHF5D+ByP3QMyHGMb5o1hE=
+-  dependencies:
+-    inherits "~2.0.1"
+-    readable-stream "~2.0.0"
+-    typedarray "~0.0.5"
+-
+-concat-stream@^1.4.6:
+-  version "1.6.2"
+-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+-  dependencies:
+-    buffer-from "^1.0.0"
+-    inherits "^2.0.3"
+-    readable-stream "^2.2.2"
+-    typedarray "^0.0.6"
+-
+-config-chain@~1.1.9:
+-  version "1.1.12"
+-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+-  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+-  dependencies:
+-    ini "^1.3.4"
+-    proto-list "~1.2.1"
+-
+-configstore@1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-1.2.1.tgz#00ad402c0dba027bd8b4b7228dc7d42cefe3c81a"
+-  integrity sha1-AK1ALA26AnvYtLcijcfULO/jyBo=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    mkdirp "^0.5.0"
+-    object-assign "^3.0.0"
+-    os-tmpdir "^1.0.0"
+-    osenv "^0.1.0"
+-    uuid "^2.0.1"
+-    write-file-atomic "^1.1.2"
+-    xdg-basedir "^2.0.0"
+-
+-connect@^3.3.3:
+-  version "3.7.0"
+-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+-  dependencies:
+-    debug "2.6.9"
+-    finalhandler "1.1.2"
+-    parseurl "~1.3.3"
+-    utils-merge "1.0.1"
+-
+-console-browserify@1.1.x:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
+-  dependencies:
+-    date-now "^0.1.4"
+-
+-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+-
+-consolidate@^0.13.1:
+-  version "0.13.1"
+-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.13.1.tgz#9e9503568eb4850889da6ed87a852c8dd2d13f64"
+-  integrity sha1-npUDVo60hQiJ2m7YeoUsjdLRP2Q=
+-  dependencies:
+-    bluebird "^2.9.26"
+-
+-content-disposition@0.5.3:
+-  version "0.5.3"
+-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+-  dependencies:
+-    safe-buffer "5.1.2"
+-
+-content-type@~1.0.1, content-type@~1.0.4:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+-
+-convert-source-map@^1.1.0:
+-  version "1.7.0"
+-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+-  dependencies:
+-    safe-buffer "~5.1.1"
+-
+-cookie-signature@1.0.6:
+-  version "1.0.6"
+-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+-
+-cookie@0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+-
+-copy-dereference@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/copy-dereference/-/copy-dereference-1.0.0.tgz#6b131865420fd81b413ba994b44d3655311152b6"
+-  integrity sha1-axMYZUIP2BtBO6mUtE02VTERUrY=
+-
+-core-js@^1.0.0:
+-  version "1.2.7"
+-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+-  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+-
+-core-object@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/core-object/-/core-object-0.0.2.tgz#c9a6fee8f712e281fa9f6fba10243409ea2debc3"
+-  integrity sha1-yab+6PcS4oH6n2+6ECQ0Ceot68M=
+-  dependencies:
+-    lodash-node "^2.4.1"
+-
+-core-util-is@1.0.2, core-util-is@~1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+-
+-cpr@0.4.2:
+-  version "0.4.2"
+-  resolved "https://registry.yarnpkg.com/cpr/-/cpr-0.4.2.tgz#cc5083e6d2fa31f52bbfeefae508a445fe6180f2"
+-  integrity sha1-zFCD5tL6MfUrv+765QikRf5hgPI=
+-  dependencies:
+-    graceful-fs "~4.1.2"
+-    mkdirp "~0.5.0"
+-    rimraf "~2.4.3"
+-
+-cross-spawn-async@^2.0.0:
+-  version "2.2.5"
+-  resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
+-  integrity sha1-hF/wwINKPe2dFg2sptOQkGuyiMw=
+-  dependencies:
+-    lru-cache "^4.0.0"
+-    which "^1.2.8"
+-
+-cross-spawn@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
+-  dependencies:
+-    lru-cache "^4.0.1"
+-    which "^1.2.9"
+-
+-cryptiles@2.x.x:
+-  version "2.0.5"
+-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
+-  dependencies:
+-    boom "2.x.x"
+-
+-ctype@0.5.3:
+-  version "0.5.3"
+-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
+-  integrity sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=
+-
+-currently-unhandled@^0.4.1:
+-  version "0.4.1"
+-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+-  dependencies:
+-    array-find-index "^1.0.1"
+-
+-d@1, d@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+-  dependencies:
+-    es5-ext "^0.10.50"
+-    type "^1.0.1"
+-
+-d@~0.1.1:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+-  integrity sha1-2hhMU10Y2O57oqoim5FACfrhEwk=
+-  dependencies:
+-    es5-ext "~0.10.2"
+-
+-dashdash@^1.12.0:
+-  version "1.14.1"
+-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+-  dependencies:
+-    assert-plus "^1.0.0"
+-
+-date-now@^0.1.4:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
+-
+-debug@0.7.4:
+-  version "0.7.4"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+-  integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=
+-
+-debug@1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.2.tgz#3849591c10cce648476c3c7c2e2e3416db5963c4"
+-  integrity sha1-OElZHBDM5khHbDx8Li40FttZY8Q=
+-  dependencies:
+-    ms "0.6.2"
+-
+-debug@1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.3.tgz#fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4"
+-  integrity sha1-/IxrLWACgEtAgcAgjg9kYLofo+Q=
+-  dependencies:
+-    ms "0.6.2"
+-
+-debug@1.0.4:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-1.0.4.tgz#5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"
+-  integrity sha1-W5wla9VLbsAigxdvqKDt5tFUy/g=
+-  dependencies:
+-    ms "0.6.2"
+-
+-debug@2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.1.0.tgz#33ab915659d8c2cc8a41443d94d6ebd37697ed21"
+-  integrity sha1-M6uRVlnYwsyKQUQ9lNbr03aX7SE=
+-  dependencies:
+-    ms "0.6.2"
+-
+-debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8:
+-  version "2.6.9"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+-  dependencies:
+-    ms "2.0.0"
+-
+-debug@^3.1.0:
+-  version "3.2.6"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+-  dependencies:
+-    ms "^2.1.1"
+-
+-debug@~2.2.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+-  integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
+-  dependencies:
+-    ms "0.7.1"
+-
+-debuglog@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+-
+-decamelize@^1.0.0, decamelize@^1.1.2, decamelize@^1.2.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+-
+-defaults@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+-  dependencies:
+-    clone "^1.0.2"
+-
+-defined@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+-
+-defs@~1.1.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/defs/-/defs-1.1.1.tgz#b22609f2c7a11ba7a3db116805c139b1caffa9d2"
+-  integrity sha1-siYJ8sehG6ej2xFoBcE5scr/qdI=
+-  dependencies:
+-    alter "~0.2.0"
+-    ast-traverse "~0.1.1"
+-    breakable "~1.0.0"
+-    esprima-fb "~15001.1001.0-dev-harmony-fb"
+-    simple-fmt "~0.1.0"
+-    simple-is "~0.2.0"
+-    stringmap "~0.2.2"
+-    stringset "~0.2.1"
+-    tryor "~0.1.2"
+-    yargs "~3.27.0"
+-
+-delayed-stream@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+-
+-delegates@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+-
+-depd@~1.1.0, depd@~1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+-
+-destroy@~1.0.4:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+-
+-detect-indent@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-3.0.1.tgz#9dc5e5ddbceef8325764b9451b02bc6d54084f75"
+-  integrity sha1-ncXl3bzu+DJXZLlFGwK8bVQIT3U=
+-  dependencies:
+-    get-stdin "^4.0.1"
+-    minimist "^1.1.0"
+-    repeating "^1.1.0"
+-
+-detective@^4.3.1:
+-  version "4.7.1"
+-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+-  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
+-  dependencies:
+-    acorn "^5.2.1"
+-    defined "^1.0.0"
+-
+-dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@^1.0.2, dezalgo@~1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+-  dependencies:
+-    asap "^2.0.0"
+-    wrappy "1"
+-
+-did_it_work@0.0.6:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/did_it_work/-/did_it_work-0.0.6.tgz#5180cb9e16ebf9a8753a0cc6b4af9ccdff71ec05"
+-  integrity sha1-UYDLnhbr+ah1OgzGtK+czf9x7AU=
+-
+-diff@^1.3.1:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+-  integrity sha1-fyjS657nsVqX79ic5j3P2qPMur8=
+-
+-dom-serializer@0:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+-  dependencies:
+-    domelementtype "^2.0.1"
+-    entities "^2.0.0"
+-
+-domelementtype@1:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+-
+-domelementtype@^2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
+-  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+-
+-domhandler@2.3:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
+-  integrity sha1-LeWaCCLVAn+r/28DLCsloqir5zg=
+-  dependencies:
+-    domelementtype "1"
+-
+-domutils@1.5:
+-  version "1.5.1"
+-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+-  dependencies:
+-    dom-serializer "0"
+-    domelementtype "1"
+-
+-ecc-jsbn@~0.1.1:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+-  dependencies:
+-    jsbn "~0.1.0"
+-    safer-buffer "^2.1.0"
+-
+-editions@^1.1.1:
+-  version "1.3.4"
+-  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+-  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
+-
+-editor@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
+-  integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I=
+-
+-ee-first@1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+-
+-em-helpers@^0.8.0:
+-  version "0.8.0"
+-  resolved "https://registry.yarnpkg.com/em-helpers/-/em-helpers-0.8.0.tgz#01678f3692a61d563cce68e49459e206d14db095"
+-  integrity sha1-AWePNpKmHVY8zmjklFniBtFNsJU=
+-  dependencies:
+-    ember-cli-htmlbars "^1.0.1"
+-    ember-cli-less "^1.4.0"
+-    source-map "^0.5.6"
+-  optionalDependencies:
+-    phantomjs-prebuilt "2.1.13"
+-
+-em-table@0.12.0:
+-  version "0.12.0"
+-  resolved "https://registry.yarnpkg.com/em-table/-/em-table-0.12.0.tgz#a47c63ab2a4a02a0d4a728ec3857bfa870fff08c"
+-  integrity sha1-pHxjqypKAqDUpyjsOFe/qHD/8Iw=
+-  dependencies:
+-    ember-cli-htmlbars "^1.0.1"
+-    ember-cli-less "^1.4.0"
+-    source-map "^0.5.6"
+-  optionalDependencies:
+-    phantomjs-prebuilt "2.1.13"
+-
+-ember-array-contains-helper@1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/ember-array-contains-helper/-/ember-array-contains-helper-1.0.2.tgz#53427e6e9dfcfceb443bfeb6965928b5f624f6a0"
+-  integrity sha1-U0J+bp38/OtEO/62llkotfYk9qA=
+-  dependencies:
+-    ember-cli-babel "^5.1.5"
+-
+-ember-bootstrap@0.5.1:
+-  version "0.5.1"
+-  resolved "https://registry.yarnpkg.com/ember-bootstrap/-/ember-bootstrap-0.5.1.tgz#bbad60b2818c47b3fb31562967ae02ee7e92d38c"
+-  integrity sha1-u61gsoGMR7P7MVYpZ64C7n6S04w=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-    ember-wormhole "^0.3.4"
+-
+-ember-cli-app-version@1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-1.0.0.tgz#6963591abb3a176f68ab1507f41324e8154d0e66"
+-  integrity sha1-aWNZGrs6F29oqxUH9BMk6BVNDmY=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-    ember-cli-htmlbars "^1.0.0"
+-    git-repo-version "0.3.0"
+-
+-ember-cli-babel@5.1.6:
+-  version "5.1.6"
+-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.1.6.tgz#d3e4fe59d96589adf7db1d99ff4f6b9dfa9dc132"
+-  integrity sha1-0+T+Wdllia332x2Z/09rnfqdwTI=
+-  dependencies:
+-    broccoli-babel-transpiler "^5.4.5"
+-    broccoli-funnel "^1.0.0"
+-    clone "^1.0.2"
+-    ember-cli-version-checker "^1.0.2"
+-    resolve "^1.1.2"
+-
+-ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6:
+-  version "5.2.8"
+-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876"
+-  integrity sha512-Mt9OOB5RaZwjde+LYef8EgwNVCAzsYDv4ktshblaXxr4m/Xm5/7/rxEu42RNrYkoy/qWpT9uhaD+JKK4riMf+w==
+-  dependencies:
+-    broccoli-babel-transpiler "^5.6.2"
+-    broccoli-funnel "^1.0.0"
+-    clone "^2.0.0"
+-    ember-cli-version-checker "^1.0.2"
+-    resolve "^1.1.2"
+-
+-ember-cli-content-security-policy@0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-0.4.0.tgz#71e4f228e68bcefc313f0ffae26f3600a0093276"
+-  integrity sha1-ceTyKOaLzvwxPw/64m82AKAJMnY=
+-  dependencies:
+-    body-parser "^1.2.0"
+-
+-ember-cli-copy-dereference@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-copy-dereference/-/ember-cli-copy-dereference-1.0.0.tgz#a1795bf6c70650317df4ab8674dd02e0bea5d4fd"
+-  integrity sha1-oXlb9scGUDF99KuGdN0C4L6l1P0=
+-
+-ember-cli-dependency-checker@1.2.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.2.0.tgz#0d1d4fc93a48d9a105fbb120d262d05485dd7425"
+-  integrity sha1-DR1PyTpI2aEF+7Eg0mLQVIXddCU=
+-  dependencies:
+-    chalk "^0.5.1"
+-    is-git-url "0.2.0"
+-    semver "^4.1.0"
+-
+-ember-cli-get-dependency-depth@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11"
+-  integrity sha1-4K/s+CotUvAPKKtGgpUoGuw2jRE=
+-
+-ember-cli-htmlbars-inline-precompile@0.3.1:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.3.1.tgz#5e37101d7017c61ae11b721ee709ae0c1802ce59"
+-  integrity sha1-XjcQHXAXxhrhG3Ie5wmuDBgCzlk=
+-  dependencies:
+-    babel-plugin-htmlbars-inline-precompile "0.0.5"
+-    ember-cli-babel "^5.1.3"
+-    ember-cli-htmlbars "^1.0.0"
+-
+-ember-cli-htmlbars@0.7.6:
+-  version "0.7.6"
+-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-0.7.6.tgz#07e068eea68133d7e2fa6b505d87673f4bce145f"
+-  integrity sha1-B+Bo7qaBM9fi+mtQXYdnP0vOFF8=
+-  dependencies:
+-    broccoli-filter "^0.1.6"
+-    ember-cli-version-checker "^1.0.2"
+-
+-ember-cli-htmlbars@1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.0.2.tgz#53b3e503ed3aaccb8c23592f292bc2e10ae467a1"
+-  integrity sha1-U7PlA+06rMuMI1kvKSvC4QrkZ6E=
+-  dependencies:
+-    broccoli-persistent-filter "^1.0.3"
+-    ember-cli-version-checker "^1.0.2"
+-    json-stable-stringify "^1.0.0"
+-    strip-bom "^2.0.0"
+-
+-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1:
+-  version "1.3.5"
+-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.5.tgz#65be9678b274b5e7861d7f75c188780af7ef9d13"
+-  integrity sha512-Qur/anb0Vk57qmIhGLkSzl8X1QIMoae6pLa14MRQ8+YD2N5fNs3qdhEFf0SDBquPOH1QxQtraiNQvji47QBJyg==
+-  dependencies:
+-    broccoli-persistent-filter "^1.0.3"
+-    ember-cli-version-checker "^1.0.2"
+-    hash-for-dep "^1.0.2"
+-    json-stable-stringify "^1.0.0"
+-    strip-bom "^2.0.0"
+-
+-ember-cli-ic-ajax@0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/ember-cli-ic-ajax/-/ember-cli-ic-ajax-0.2.1.tgz#0dd9a2c9f9d16f4da98ade15fef427ee63cf8710"
+-  integrity sha1-DdmiyfnRb02pit4V/vQn7mPPhxA=
+-  dependencies:
+-    ic-ajax "~2.0.1"
+-
+-ember-cli-inject-live-reload@1.4.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-1.4.0.tgz#1dac5b4a2fecc51cea3c17bce9089596115a7fbd"
+-  integrity sha1-HaxbSi/sxRzqPBe86QiVlhFaf70=
+-
+-ember-cli-is-package-missing@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390"
+-  integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A=
+-
+-ember-cli-jquery-ui@0.0.20:
+-  version "0.0.20"
+-  resolved "https://registry.yarnpkg.com/ember-cli-jquery-ui/-/ember-cli-jquery-ui-0.0.20.tgz#c9949a18c5dc3c650ad9ab6bd8ac107cddf15a40"
+-  integrity sha1-yZSaGMXcPGUK2atr2KwQfN3xWkA=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-    ember-cli-htmlbars "0.7.6"
+-
+-ember-cli-less@^1.4.0:
+-  version "1.5.7"
+-  resolved "https://registry.yarnpkg.com/ember-cli-less/-/ember-cli-less-1.5.7.tgz#2420ae4b10cb4b6923f61782a9060ff31232e8ac"
+-  integrity sha512-y2wQL4Ebtt5fMv6VNPGUrHAIpFZAxgBwO1Bcf1UXLOqcZCTtGqj4QrwfEbcmzEqdcnyqws/0PU577imAWrQX0w==
+-  dependencies:
+-    broccoli-less-single "^0.6.4"
+-    broccoli-merge-trees "^1.0.0"
+-    ember-cli-version-checker "^1.1.4"
+-    lodash.merge "^3.3.2"
+-
+-ember-cli-moment-shim@0.7.3:
+-  version "0.7.3"
+-  resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-0.7.3.tgz#bb4f6a36ad726acb9e432b0c73270cf1cd193973"
+-  integrity sha1-u09qNq1yasueQysMcycM8c0ZOXM=
+-  dependencies:
+-    broccoli-funnel "^1.0.0"
+-    broccoli-merge-trees "^1.0.0"
+-    broccoli-stew "^1.0.0"
+-    chalk "^1.1.1"
+-    ember-cli-babel "^5.0.0"
+-    exists-sync "0.0.3"
+-    lodash.defaults "^3.1.2"
+-
+-ember-cli-node-assets@^0.1.4:
+-  version "0.1.6"
+-  resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146"
+-  integrity sha1-ZIiilJBIyAGtbZ4zdTx7zjL8EUY=
+-  dependencies:
+-    broccoli-funnel "^1.0.1"
+-    broccoli-merge-trees "^1.1.1"
+-    broccoli-unwatched-tree "^0.1.1"
+-    debug "^2.2.0"
+-    lodash "^4.5.1"
+-    resolve "^1.1.7"
+-
+-ember-cli-normalize-entity-name@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
+-  integrity sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=
+-  dependencies:
+-    silent-error "^1.0.0"
+-
+-ember-cli-numeral@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-numeral/-/ember-cli-numeral-0.2.0.tgz#60c984aa9e8b97bf79ded777104848935796528a"
+-  integrity sha1-YMmEqp6Ll7953td3EEhIk1eWUoo=
+-  dependencies:
+-    ember-cli-node-assets "^0.1.4"
+-    numeral "^1.5.3"
+-
+-ember-cli-path-utils@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed"
+-  integrity sha1-Tjmvi1UwHN3FAXc5t3qAT7ogce0=
+-
+-ember-cli-preprocess-registry@^1.0.3:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-1.1.0.tgz#1a8f848876de2851507842e4c0c9051f62b4aac6"
+-  integrity sha1-Go+EiHbeKFFQeELkwMkFH2K0qsY=
+-  dependencies:
+-    broccoli-clean-css "0.2.0"
+-    broccoli-funnel "^1.0.0"
+-    broccoli-merge-trees "^1.0.0"
+-    debug "^2.2.0"
+-    exists-sync "0.0.3"
+-    lodash "^3.10.0"
+-    process-relative-require "^1.0.0"
+-    silent-error "^1.0.0"
+-
+-ember-cli-qunit@1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-1.2.1.tgz#b728bc72ced1b4991d1044eb906b88dbfb019abe"
+-  integrity sha1-tyi8cs7RtJkdEETrkGuI2/sBmr4=
+-  dependencies:
+-    broccoli-babel-transpiler "^5.5.0"
+-    broccoli-jshint "^1.0.0"
+-    broccoli-merge-trees "^1.1.0"
+-    broccoli-sourcemap-concat "^1.1.6"
+-    ember-cli-version-checker "^1.1.4"
+-    ember-qunit "^0.4.18"
+-    qunitjs "^1.20.0"
+-    resolve "^1.1.6"
+-
+-ember-cli-release@0.2.8:
+-  version "0.2.8"
+-  resolved "https://registry.yarnpkg.com/ember-cli-release/-/ember-cli-release-0.2.8.tgz#e9fddd06058c0f3bc2ea57ab2667e9611f8fb205"
+-  integrity sha1-6f3dBgWMDzvC6lerJmfpYR+PsgU=
+-  dependencies:
+-    chalk "^1.0.0"
+-    git-tools "^0.1.4"
+-    make-array "^0.1.2"
+-    merge "^1.2.0"
+-    moment-timezone "^0.3.0"
+-    nopt "^3.0.3"
+-    rsvp "^3.0.17"
+-    semver "^4.3.1"
+-    silent-error "^1.0.0"
+-
+-ember-cli-sass@=7.0.0:
+-  version "7.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-7.0.0.tgz#24bdf6e6c13610c57cbddb1f077715588aedcf13"
+-  integrity sha512-AclT44UrZedFG3IG3PngYR/JeLxtNYlJPWM3VWbKbdvVePV1Y50TtbSSLsyPtoByl+Si41EiUSqLRQSV/hIu8g==
+-  dependencies:
+-    broccoli-funnel "^1.0.0"
+-    broccoli-merge-trees "^1.1.0"
+-    broccoli-sass-source-maps "^2.0.0"
+-    ember-cli-version-checker "^1.0.2"
+-
+-ember-cli-sri@1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-1.2.1.tgz#105b1f8bfb88fff8817caa14d0776ecb06f857ee"
+-  integrity sha1-EFsfi/uI//iBfKoU0Hduywb4V+4=
+-  dependencies:
+-    broccoli-sri-hash "^1.2.2"
+-
+-ember-cli-string-utils@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
+-  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
+-
+-ember-cli-test-info@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4"
+-  integrity sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q=
+-  dependencies:
+-    ember-cli-string-utils "^1.0.0"
+-
+-ember-cli-uglify@1.2.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-1.2.0.tgz#3208c32b54bc2783056e8bb0d5cfe9bbaf17ffb2"
+-  integrity sha1-MgjDK1S8J4MFbouw1c/pu68X/7I=
+-  dependencies:
+-    broccoli-uglify-sourcemap "^1.0.0"
+-
+-ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72"
+-  integrity sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=
+-  dependencies:
+-    semver "^5.3.0"
+-
+-ember-cli@1.13.14:
+-  version "1.13.14"
+-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-1.13.14.tgz#1ff35577a0b4fbb8efad24710f52bb7b874a7765"
+-  integrity sha1-H/NVd6C0+7jvrSRxD1K7e4dKd2U=
+-  dependencies:
+-    amd-name-resolver "0.0.2"
+-    bower "^1.3.12"
+-    bower-config "0.6.1"
+-    bower-endpoint-parser "0.2.2"
+-    broccoli "0.16.8"
+-    broccoli-babel-transpiler "^5.4.5"
+-    broccoli-config-loader "^1.0.0"
+-    broccoli-config-replace "^1.1.0"
+-    broccoli-funnel "^1.0.0"
+-    broccoli-kitchen-sink-helpers "^0.2.7"
+-    broccoli-merge-trees "^1.0.0"
+-    broccoli-plugin "^1.2.0"
+-    broccoli-sane-watcher "^1.1.1"
+-    broccoli-source "^1.1.0"
+-    broccoli-sourcemap-concat "^2.0.2"
+-    broccoli-viz "^2.0.1"
+-    chalk "1.1.0"
+-    clean-base-url "^1.0.0"
+-    compression "^1.4.4"
+-    configstore "1.2.1"
+-    core-object "0.0.2"
+-    cpr "0.4.2"
+-    debug "^2.1.3"
+-    diff "^1.3.1"
+-    ember-cli-copy-dereference "^1.0.0"
+-    ember-cli-get-dependency-depth "^1.0.0"
+-    ember-cli-is-package-missing "^1.0.0"
+-    ember-cli-normalize-entity-name "^1.0.0"
+-    ember-cli-path-utils "^1.0.0"
+-    ember-cli-preprocess-registry "^1.0.3"
+-    ember-cli-string-utils "^1.0.0"
+-    ember-cli-test-info "^1.0.0"
+-    ember-router-generator "^1.0.0"
+-    escape-string-regexp "^1.0.3"
+-    exists-sync "0.0.3"
+-    exit "^0.1.2"
+-    express "^4.12.3"
+-    findup "0.1.5"
+-    findup-sync "^0.2.1"
+-    fs-extra "0.22.1"
+-    fs-monitor-stack "^1.0.2"
+-    git-repo-info "^1.0.4"
+-    glob "5.0.13"
+-    http-proxy "^1.9.0"
+-    inflection "^1.7.0"
+-    inquirer "0.5.1"
+-    is-git-url "^0.2.0"
+-    isbinaryfile "^2.0.3"
+-    leek "0.0.18"
+-    lodash "^3.6.0"
+-    markdown-it "4.3.0"
+-    markdown-it-terminal "0.0.2"
+-    merge-defaults "^0.2.1"
+-    minimatch "^2.0.4"
+-    morgan "^1.5.2"
+-    node-modules-path "^1.0.0"
+-    node-uuid "^1.4.3"
+-    nopt "^3.0.1"
+-    npm "2.14.10"
+-    pleasant-progress "^1.0.2"
+-    portfinder "^0.4.0"
+-    promise-map-series "^0.2.1"
+-    quick-temp "0.1.3"
+-    readline2 "0.1.1"
+-    resolve "^1.1.6"
+-    rsvp "^3.0.17"
+-    sane "^1.1.1"
+-    semver "^4.3.3"
+-    silent-error "^1.0.0"
+-    symlink-or-copy "^1.0.1"
+-    temp "0.8.1"
+-    testem "0.9.11"
+-    through "^2.3.6"
+-    tiny-lr "0.2.0"
+-    walk-sync "0.1.3"
+-    yam "0.0.18"
+-
+-ember-d3@0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/ember-d3/-/ember-d3-0.1.0.tgz#f670809632298b3f7124c398ea48f1d7503ef1e1"
+-  integrity sha1-9nCAljIpiz9xJMOY6kjx11A+8eE=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-
+-ember-data@2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.1.0.tgz#9aa0f95042010513250818119d63ace3888c7dd9"
+-  integrity sha1-mqD5UEIBBRMlCBgRnWOs44iMfdk=
+-  dependencies:
+-    rsvp "^3.0.18"
+-
+-ember-disable-proxy-controllers@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/ember-disable-proxy-controllers/-/ember-disable-proxy-controllers-1.0.1.tgz#1254eeec0ba025c24eb9e8da611afa7b38754281"
+-  integrity sha1-ElTu7AugJcJOuejaYRr6ezh1QoE=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-
+-ember-export-application-global@1.0.5:
+-  version "1.0.5"
+-  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-1.0.5.tgz#73bd641b19e3474190f717c9b504617511506bea"
+-  integrity sha1-c71kGxnjR0GQ9xfJtQRhdRFQa+o=
+-
+-ember-lodash@0.0.10:
+-  version "0.0.10"
+-  resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-0.0.10.tgz#edf132aa54a983a87543a093615df03892c9a15c"
+-  integrity sha1-7fEyqlSpg6h1Q6CTYV3wOJLJoVw=
+-  dependencies:
+-    broccoli-merge-trees "^1.1.1"
+-    ember-cli-babel "^5.1.5"
+-    lodash-es "^3.10.0"
+-
+-ember-qunit@^0.4.18:
+-  version "0.4.24"
+-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-0.4.24.tgz#b54cf6688c442d07eacea47c3285879cdd7c2163"
+-  integrity sha1-tUz2aIxELQfqzqR8MoWHnN18IWM=
+-  dependencies:
+-    ember-test-helpers "^0.5.32"
+-
+-ember-resolver@2.0.3:
+-  version "2.0.3"
+-  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-2.0.3.tgz#7ed5cc60049906def4edc80c25eedb301cace3b2"
+-  integrity sha1-ftXMYASZBt707cgMJe7bMBys47I=
+-  dependencies:
+-    ember-cli-babel "^5.1.3"
+-    ember-cli-version-checker "^1.1.4"
+-
+-ember-router-generator@^1.0.0:
+-  version "1.2.3"
+-  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
+-  integrity sha1-jtLKhv8yM2MSD8FCeBkeno8TFe4=
+-  dependencies:
+-    recast "^0.11.3"
+-
+-ember-spin-spinner@0.2.3:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/ember-spin-spinner/-/ember-spin-spinner-0.2.3.tgz#932c7823686f33274fc4daf08557fcb18037e876"
+-  integrity sha1-kyx4I2hvMydPxNrwhVf8sYA36HY=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-
+-ember-test-helpers@^0.5.32:
+-  version "0.5.34"
+-  resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.5.34.tgz#c8439108d1cba1d7d838c212208a5c4061471b83"
+-  integrity sha1-yEORCNHLodfYOMISIIpcQGFHG4M=
+-  dependencies:
+-    klassy "^0.1.3"
+-
+-ember-truth-helpers@1.3.0:
+-  version "1.3.0"
+-  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-1.3.0.tgz#6ed9f83ce9a49f52bb416d55e227426339a64c60"
+-  integrity sha1-btn4POmkn1K7QW1V4idCYzmmTGA=
+-  dependencies:
+-    ember-cli-babel "^5.1.6"
+-
+-ember-wormhole@^0.3.4:
+-  version "0.3.6"
+-  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.3.6.tgz#bbe21bb5478ad254efe4fff4019ac6710f4ad85c"
+-  integrity sha1-u+IbtUeK0lTv5P/0AZrGcQ9K2Fw=
+-  dependencies:
+-    ember-cli-babel "^5.0.0"
+-
+-emoji-regex@^7.0.1:
+-  version "7.0.3"
+-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+-
+-encodeurl@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+-
+-engine.io-client-pure@1.5.9:
+-  version "1.5.9"
+-  resolved "https://registry.yarnpkg.com/engine.io-client-pure/-/engine.io-client-pure-1.5.9.tgz#fc3c4977b00ffc5b059dfa73c06216ad838496e2"
+-  integrity sha1-/DxJd7AP/FsFnfpzwGIWrYOEluI=
+-  dependencies:
+-    component-emitter "1.1.2"
+-    component-inherit "0.0.3"
+-    debug "1.0.4"
+-    engine.io-parser "1.2.2"
+-    has-cors "1.1.0"
+-    indexof "0.0.1"
+-    parsejson "0.0.1"
+-    parseqs "0.0.2"
+-    parseuri "0.0.4"
+-    ws-pure "0.8.0"
+-    xmlhttprequest-ssl "1.5.1"
+-
+-engine.io-parser@1.2.2:
+-  version "1.2.2"
+-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.2.2.tgz#cd081041feea39c64323ff79b82a90a72afcccdd"
+-  integrity sha1-zQgQQf7qOcZDI/95uCqQpyr8zN0=
+-  dependencies:
+-    after "0.8.1"
+-    arraybuffer.slice "0.0.6"
+-    base64-arraybuffer "0.1.2"
+-    blob "0.0.4"
+-    has-binary "0.1.6"
+-    utf8 "2.1.0"
+-
+-engine.io-pure@1.5.9:
+-  version "1.5.9"
+-  resolved "https://registry.yarnpkg.com/engine.io-pure/-/engine.io-pure-1.5.9.tgz#d46f763e0945e5f818d6a59061bf93f1e05c89b6"
+-  integrity sha1-1G92PglF5fgY1qWQYb+T8eBcibY=
+-  dependencies:
+-    base64id "0.1.0"
+-    debug "1.0.3"
+-    engine.io-parser "1.2.2"
+-    ws-pure "0.8.0"
+-
+-ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
+-  integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
+-
+-entities@1.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
+-  integrity sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=
+-
+-entities@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
+-  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+-
+-entities@~1.1.1:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+-
+-errno@^0.1.1:
+-  version "0.1.7"
+-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+-  dependencies:
+-    prr "~1.0.1"
+-
+-error-ex@^1.2.0:
+-  version "1.3.2"
+-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+-  dependencies:
+-    is-arrayish "^0.2.1"
+-
+-es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.11, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46, es5-ext@~0.10.5, es5-ext@~0.10.6:
+-  version "0.10.53"
+-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
+-  dependencies:
+-    es6-iterator "~2.0.3"
+-    es6-symbol "~3.1.3"
+-    next-tick "~1.0.0"
+-
+-es6-iterator@~0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-0.1.3.tgz#d6f58b8c4fc413c249b4baa19768f8e4d7c8944e"
+-  integrity sha1-1vWLjE/EE8JJtLqhl2j45NfIlE4=
+-  dependencies:
+-    d "~0.1.1"
+-    es5-ext "~0.10.5"
+-    es6-symbol "~2.0.1"
+-
+-es6-iterator@~2.0.3:
+-  version "2.0.3"
+-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+-  dependencies:
+-    d "1"
+-    es5-ext "^0.10.35"
+-    es6-symbol "^3.1.1"
+-
+-es6-promise@~4.0.3:
+-  version "4.0.5"
+-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
+-  integrity sha1-eILzCt3lskDM+n99eMVIMwlRrkI=
+-
+-es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+-  version "3.1.3"
+-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+-  dependencies:
+-    d "^1.0.1"
+-    ext "^1.1.2"
+-
+-es6-symbol@~2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-2.0.1.tgz#761b5c67cfd4f1d18afb234f691d678682cb3bf3"
+-  integrity sha1-dhtcZ8/U8dGK+yNPaR1nhoLLO/M=
+-  dependencies:
+-    d "~0.1.1"
+-    es5-ext "~0.10.5"
+-
+-es6-weak-map@~0.1.4:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-0.1.4.tgz#706cef9e99aa236ba7766c239c8b9e286ea7d228"
+-  integrity sha1-cGzvnpmqI2undmwjnIueKG6n0ig=
+-  dependencies:
+-    d "~0.1.1"
+-    es5-ext "~0.10.6"
+-    es6-iterator "~0.1.3"
+-    es6-symbol "~2.0.1"
+-
+-escape-html@~1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+-
+-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
+-  version "1.0.5"
+-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+-
+-esprima-fb@~12001.1.0-dev-harmony-fb:
+-  version "12001.1.0-dev-harmony-fb"
+-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915"
+-  integrity sha1-2EQAOEupXOJnjGF60kp/QICNqRU=
+-
+-esprima-fb@~15001.1001.0-dev-harmony-fb:
+-  version "15001.1001.0-dev-harmony-fb"
+-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659"
+-  integrity sha1-Q761fsJujPI3092LM+QlM1d/Jlk=
+-
+-esprima@^2.6.0:
+-  version "2.7.3"
+-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
+-
+-esprima@^4.0.0:
+-  version "4.0.1"
+-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+-
+-esprima@~3.1.0:
+-  version "3.1.3"
+-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+-
+-esutils@^2.0.0:
+-  version "2.0.3"
+-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+-
+-etag@~1.8.1:
+-  version "1.8.1"
+-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+-
+-event-emitter@~0.3.4:
+-  version "0.3.5"
+-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+-  dependencies:
+-    d "1"
+-    es5-ext "~0.10.14"
+-
+-eventemitter3@^4.0.0:
+-  version "4.0.7"
+-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+-
+-events-to-array@^1.0.1:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
+-  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+-
+-exec-sh@^0.2.0:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+-  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+-  dependencies:
+-    merge "^1.2.0"
+-
+-exists-sync@0.0.3:
+-  version "0.0.3"
+-  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf"
+-  integrity sha1-uRAAC+27ETs3i4L19adjgQdiLc8=
+-
+-exists-sync@0.0.4:
+-  version "0.0.4"
+-  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
+-  integrity sha1-l0TCxCjMA7AQYNtFTUsS8O88iHk=
+-
+-exit@0.1.2, exit@0.1.x, exit@^0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+-
+-expand-brackets@^0.1.4:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+-  dependencies:
+-    is-posix-bracket "^0.1.0"
+-
+-expand-range@^1.8.1:
+-  version "1.8.2"
+-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
+-  dependencies:
+-    fill-range "^2.1.0"
+-
+-express@^4.10.7, express@^4.12.3:
+-  version "4.17.1"
+-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+-  dependencies:
+-    accepts "~1.3.7"
+-    array-flatten "1.1.1"
+-    body-parser "1.19.0"
+-    content-disposition "0.5.3"
+-    content-type "~1.0.4"
+-    cookie "0.4.0"
+-    cookie-signature "1.0.6"
+-    debug "2.6.9"
+-    depd "~1.1.2"
+-    encodeurl "~1.0.2"
+-    escape-html "~1.0.3"
+-    etag "~1.8.1"
+-    finalhandler "~1.1.2"
+-    fresh "0.5.2"
+-    merge-descriptors "1.0.1"
+-    methods "~1.1.2"
+-    on-finished "~2.3.0"
+-    parseurl "~1.3.3"
+-    path-to-regexp "0.1.7"
+-    proxy-addr "~2.0.5"
+-    qs "6.7.0"
+-    range-parser "~1.2.1"
+-    safe-buffer "5.1.2"
+-    send "0.17.1"
+-    serve-static "1.14.1"
+-    setprototypeof "1.1.1"
+-    statuses "~1.5.0"
+-    type-is "~1.6.18"
+-    utils-merge "1.0.1"
+-    vary "~1.1.2"
+-
+-ext@^1.1.2:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+-  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+-  dependencies:
+-    type "^2.0.0"
+-
+-extend@~3.0.0, extend@~3.0.2:
+-  version "3.0.2"
+-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+-
+-extglob@^0.3.1:
+-  version "0.3.2"
+-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+-  dependencies:
+-    is-extglob "^1.0.0"
+-
+-extract-zip@~1.5.0:
+-  version "1.5.0"
+-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
+-  integrity sha1-ksz22B73Cp+kwXRxFMzvbYaIpsQ=
+-  dependencies:
+-    concat-stream "1.5.0"
+-    debug "0.7.4"
+-    mkdirp "0.5.0"
+-    yauzl "2.4.1"
+-
+-extsprintf@1.3.0:
+-  version "1.3.0"
+-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+-
+-extsprintf@^1.2.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+-
+-fast-deep-equal@^3.1.1:
+-  version "3.1.3"
+-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+-
+-fast-json-stable-stringify@^2.0.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+-
+-fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb"
+-  integrity sha1-P7s2Y097555PftvbSjV97iXRhOs=
+-  dependencies:
+-    blank-object "^1.0.1"
+-
+-"fast-sourcemap-concat@ ^0.2.4":
+-  version "0.2.7"
+-  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-0.2.7.tgz#b5d68a6d33e52f9d326fec38b836fa44d9b0d8fc"
+-  integrity sha1-tdaKbTPlL50yb+w4uDb6RNmw2Pw=
+-  dependencies:
+-    chalk "^0.5.1"
+-    debug "^2.2.0"
+-    mkdirp "^0.5.0"
+-    rsvp "^3.0.14"
+-    source-map "^0.4.2"
+-    source-map-url "^0.3.0"
+-
+-faye-websocket@~0.10.0:
+-  version "0.10.0"
+-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+-  dependencies:
+-    websocket-driver ">=0.5.1"
+-
+-fb-watchman@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+-  dependencies:
+-    bser "2.1.1"
+-
+-fd-slicer@~1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+-  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+-  dependencies:
+-    pend "~1.2.0"
+-
+-filename-regex@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+-
+-fileset@^0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-0.2.1.tgz#588ef8973c6623b2a76df465105696b96aac8067"
+-  integrity sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=
+-  dependencies:
+-    glob "5.x"
+-    minimatch "2.x"
+-
+-fill-range@^2.1.0:
+-  version "2.2.4"
+-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
+-  dependencies:
+-    is-number "^2.1.0"
+-    isobject "^2.0.0"
+-    randomatic "^3.0.0"
+-    repeat-element "^1.1.2"
+-    repeat-string "^1.5.2"
+-
+-finalhandler@1.1.2, finalhandler@~1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+-  dependencies:
+-    debug "2.6.9"
+-    encodeurl "~1.0.2"
+-    escape-html "~1.0.3"
+-    on-finished "~2.3.0"
+-    parseurl "~1.3.3"
+-    statuses "~1.5.0"
+-    unpipe "~1.0.0"
+-
+-find-up@^1.0.0:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+-  dependencies:
+-    path-exists "^2.0.0"
+-    pinkie-promise "^2.0.0"
+-
+-find-up@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+-  dependencies:
+-    locate-path "^3.0.0"
+-
+-findup-sync@^0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
+-  integrity sha1-4KkKRQB1xJRm7lE3MgV1FLgeh4w=
+-  dependencies:
+-    glob "~4.3.0"
+-
+-findup-sync@^0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
+-  integrity sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=
+-  dependencies:
+-    glob "~5.0.0"
+-
+-findup@0.1.5, findup@^0.1.5:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/findup/-/findup-0.1.5.tgz#8ad929a3393bac627957a7e5de4623b06b0e2ceb"
+-  integrity sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=
+-  dependencies:
+-    colors "~0.6.0-1"
+-    commander "~2.1.0"
+-
+-fireworm@^0.6.6:
+-  version "0.6.6"
+-  resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.6.6.tgz#6023218e215c8ae628ac5105a60e470a50983f6f"
+-  integrity sha1-YCMhjiFciuYorFEFpg5HClCYP28=
+-  dependencies:
+-    async "~0.2.9"
+-    is-type "0.0.1"
+-    lodash "~2.3.0"
+-    minimatch "~0.2.9"
+-
+-follow-redirects@^1.0.0:
+-  version "1.14.7"
+-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+-
+-for-in@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+-
+-for-own@^0.1.4:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+-  dependencies:
+-    for-in "^1.0.1"
+-
+-forever-agent@~0.6.1:
+-  version "0.6.1"
+-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+-
+-form-data@~1.0.0-rc3, form-data@~1.0.0-rc4:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
+-  integrity sha1-rjFduaSQf6BlUCMEpm13M0de43w=
+-  dependencies:
+-    async "^2.0.1"
+-    combined-stream "^1.0.5"
+-    mime-types "^2.1.11"
+-
+-form-data@~2.1.1:
+-  version "2.1.4"
+-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+-  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
+-  dependencies:
+-    asynckit "^0.4.0"
+-    combined-stream "^1.0.5"
+-    mime-types "^2.1.12"
+-
+-form-data@~2.3.2:
+-  version "2.3.3"
+-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+-  dependencies:
+-    asynckit "^0.4.0"
+-    combined-stream "^1.0.6"
+-    mime-types "^2.1.12"
+-
+-forwarded@~0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+-
+-fresh@0.5.2:
+-  version "0.5.2"
+-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+-
+-fs-extra@0.22.1:
+-  version "0.22.1"
+-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056"
+-  integrity sha1-X9b4BJ3JdsoZ6yNV1lgXPKvM4FY=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    jsonfile "^2.1.0"
+-    rimraf "^2.2.8"
+-
+-fs-extra@^0.16.3:
+-  version "0.16.5"
+-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.16.5.tgz#1ad661fa6c86c9608cd1b49efc6fce834939a750"
+-  integrity sha1-GtZh+myGyWCM0bSe/G/Og0k5p1A=
+-  dependencies:
+-    graceful-fs "^3.0.5"
+-    jsonfile "^2.0.0"
+-    rimraf "^2.2.8"
+-
+-fs-extra@^0.24.0:
+-  version "0.24.0"
+-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
+-  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    jsonfile "^2.1.0"
+-    path-is-absolute "^1.0.0"
+-    rimraf "^2.2.8"
+-
+-fs-extra@^5.0.0:
+-  version "5.0.0"
+-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+-  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    jsonfile "^4.0.0"
+-    universalify "^0.1.0"
+-
+-fs-extra@~0.30.0:
+-  version "0.30.0"
+-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+-  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    jsonfile "^2.1.0"
+-    klaw "^1.0.0"
+-    path-is-absolute "^1.0.0"
+-    rimraf "^2.2.8"
+-
+-fs-monitor-stack@^1.0.2:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/fs-monitor-stack/-/fs-monitor-stack-1.1.1.tgz#c4038d5977939b6b4e38396d7e7cd0895a7ac6b3"
+-  integrity sha1-xAONWXeTm2tOODltfnzQiVp6xrM=
+-
+-fs-readdir-recursive@^0.1.0:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
+-  integrity sha1-MVtPuMHKW4xH3v7zGdBz2tNWgFk=
+-
+-fs-tree-diff@^0.3.0:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.3.1.tgz#41a84ee34994bd564c63d9852f1109c5de7f9290"
+-  integrity sha1-QahO40mUvVZMY9mFLxEJxd5/kpA=
+-  dependencies:
+-    debug "^2.2.0"
+-    fast-ordered-set "^1.0.2"
+-
+-fs-tree-diff@^0.4.3:
+-  version "0.4.4"
+-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.4.4.tgz#f6b75d70db22c1f3b05d592270f4ed6c9c2f82dd"
+-  integrity sha1-9rddcNsiwfOwXVkicPTtbJwvgt0=
+-  dependencies:
+-    debug "^2.2.0"
+-    fast-ordered-set "^1.0.2"
+-
+-fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6:
+-  version "0.5.9"
+-  resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
+-  integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
+-  dependencies:
+-    heimdalljs-logger "^0.1.7"
+-    object-assign "^4.1.0"
+-    path-posix "^1.0.0"
+-    symlink-or-copy "^1.1.8"
+-
+-fs-vacuum@~1.2.7:
+-  version "1.2.10"
+-  resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
+-  integrity sha1-t2Kb7AekAxolSP35n17PHMizHjY=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    path-is-inside "^1.0.1"
+-    rimraf "^2.5.2"
+-
+-fs-write-stream-atomic@~1.0.4:
+-  version "1.0.10"
+-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    iferr "^0.1.5"
+-    imurmurhash "^0.1.4"
+-    readable-stream "1 || 2"
+-
+-fs.realpath@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+-
+-fstream-ignore@^1.0.0:
+-  version "1.0.5"
+-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+-  integrity sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=
+-  dependencies:
+-    fstream "^1.0.0"
+-    inherits "2"
+-    minimatch "^3.0.0"
+-
+-fstream-npm@~1.0.7:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/fstream-npm/-/fstream-npm-1.0.7.tgz#7ed0d1ac13d7686dd9e1bf6ceb8be273bf6d2f86"
+-  integrity sha1-ftDRrBPXaG3Z4b9s64vic79tL4Y=
+-  dependencies:
+-    fstream-ignore "^1.0.0"
+-    inherits "2"
+-
+-fstream@^1.0.0, fstream@^1.0.12, fstream@^1.0.2, fstream@~1.0.8:
+-  version "1.0.12"
+-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    inherits "~2.0.0"
+-    mkdirp ">=0.5 0"
+-    rimraf "2"
+-
+-function-bind@^1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+-
+-gauge@~1.2.0, gauge@~1.2.5:
+-  version "1.2.7"
+-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
+-  integrity sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=
+-  dependencies:
+-    ansi "^0.3.0"
+-    has-unicode "^2.0.0"
+-    lodash.pad "^4.1.0"
+-    lodash.padend "^4.1.0"
+-    lodash.padstart "^4.1.0"
+-
+-gauge@~2.7.3:
+-  version "2.7.4"
+-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+-  dependencies:
+-    aproba "^1.0.3"
+-    console-control-strings "^1.0.0"
+-    has-unicode "^2.0.0"
+-    object-assign "^4.1.0"
+-    signal-exit "^3.0.0"
+-    string-width "^1.0.1"
+-    strip-ansi "^3.0.1"
+-    wide-align "^1.1.0"
+-
+-gaze@^1.0.0:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
+-  dependencies:
+-    globule "^1.0.0"
+-
+-generate-function@^2.0.0:
+-  version "2.3.1"
+-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
+-  dependencies:
+-    is-property "^1.0.2"
+-
+-generate-object-property@^1.1.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
+-  dependencies:
+-    is-property "^1.0.0"
+-
+-get-caller-file@^2.0.1:
+-  version "2.0.5"
+-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+-
+-get-stdin@^4.0.1:
+-  version "4.0.1"
+-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+-
+-getpass@^0.1.1:
+-  version "0.1.7"
+-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+-  dependencies:
+-    assert-plus "^1.0.0"
+-
+-git-repo-info@^1.0.4:
+-  version "1.4.1"
+-  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
+-  integrity sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM=
+-
+-git-repo-version@0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.3.0.tgz#c9b97d0d21c4357d669dc1269c2b6a75da6cc0e9"
+-  integrity sha1-ybl9DSHENX1mncEmnCtqddpswOk=
+-  dependencies:
+-    git-repo-info "^1.0.4"
+-
+-git-tools@^0.1.4:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/git-tools/-/git-tools-0.1.4.tgz#5e43e59443b8a5dedb39dba663da49e79f943978"
+-  integrity sha1-XkPllEO4pd7bOdumY9pJ55+UOXg=
+-  dependencies:
+-    spawnback "~1.0.0"
+-
+-github-url-from-git@~1.4.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.4.0.tgz#285e6b520819001bde128674704379e4ff03e0de"
+-  integrity sha1-KF5rUggZABveEoZ0cEN55P8D4N4=
+-
+-github-url-from-username-repo@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz#7dd79330d2abe69c10c2cef79714c97215791dfa"
+-  integrity sha1-fdeTMNKr5pwQws73lxTJchV5Hfo=
+-
+-glob-base@^0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
+-  dependencies:
+-    glob-parent "^2.0.0"
+-    is-glob "^2.0.0"
+-
+-glob-parent@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
+-  dependencies:
+-    is-glob "^2.0.0"
+-
+-"glob@3 || 4":
+-  version "4.5.3"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
+-  integrity sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=
+-  dependencies:
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "^2.0.1"
+-    once "^1.3.0"
+-
+-glob@5.0.13:
+-  version "5.0.13"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.13.tgz#0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f"
+-  integrity sha1-C2/8OsZOuQZp9yOgCg67coGzP48=
+-  dependencies:
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "^2.0.1"
+-    once "^1.3.0"
+-    path-is-absolute "^1.0.0"
+-
+-glob@5.x, glob@^5.0.10, glob@^5.0.15, glob@~5.0.0, glob@~5.0.15:
+-  version "5.0.15"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+-  dependencies:
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "2 || 3"
+-    once "^1.3.0"
+-    path-is-absolute "^1.0.0"
+-
+-glob@^6.0.1:
+-  version "6.0.4"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+-  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+-  dependencies:
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "2 || 3"
+-    once "^1.3.0"
+-    path-is-absolute "^1.0.0"
+-
+-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+-  version "7.1.7"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+-  dependencies:
+-    fs.realpath "^1.0.0"
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "^3.0.4"
+-    once "^1.3.0"
+-    path-is-absolute "^1.0.0"
+-
+-glob@~4.3.0:
+-  version "4.3.5"
+-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
+-  integrity sha1-gPuwjKVA8jiszl0R0em8QedRc9M=
+-  dependencies:
+-    inflight "^1.0.4"
+-    inherits "2"
+-    minimatch "^2.0.1"
+-    once "^1.3.0"
+-
+-globals@^6.4.0:
+-  version "6.4.1"
+-  resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f"
+-  integrity sha1-hJgDKzttHMge68X3lpDY/in6v08=
+-
+-globule@^1.0.0:
+-  version "1.3.2"
+-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
+-  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
+-  dependencies:
+-    glob "~7.1.1"
+-    lodash "~4.17.10"
+-    minimatch "~3.0.2"
+-
+-graceful-fs@^3.0.5, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.4, graceful-fs@~2.0.0, graceful-fs@~4.1.2:
+-  version "4.2.6"
+-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+-
+-growl@^1.8.1:
+-  version "1.10.5"
+-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+-
+-handlebars@^3.0.1:
+-  version "3.0.7"
+-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.7.tgz#d64f0d6a480e0a637420af75713475166a2d644b"
+-  integrity sha512-Pb/VCTFwbcm3KbD5rIzVVsbVBk7XMfhS4ZIJUfXdMF7H+UngtsofnUBfop/i24GSr3HCDG1PL0KoIX0YqEsXTg==
+-  dependencies:
+-    optimist "^0.6.1"
+-    source-map "^0.1.40"
+-  optionalDependencies:
+-    uglify-js "^2.6"
+-
+-har-schema@^1.0.5:
+-  version "1.0.5"
+-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+-  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
+-
+-har-schema@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+-
+-har-validator@~2.0.2, har-validator@~2.0.6:
+-  version "2.0.6"
+-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
+-  dependencies:
+-    chalk "^1.1.1"
+-    commander "^2.9.0"
+-    is-my-json-valid "^2.12.4"
+-    pinkie-promise "^2.0.0"
+-
+-har-validator@~4.2.1:
+-  version "4.2.1"
+-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+-  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
+-  dependencies:
+-    ajv "^4.9.1"
+-    har-schema "^1.0.5"
+-
+-har-validator@~5.1.3:
+-  version "5.1.5"
+-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+-  dependencies:
+-    ajv "^6.12.3"
+-    har-schema "^2.0.0"
+-
+-has-ansi@^0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+-  integrity sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=
+-  dependencies:
+-    ansi-regex "^0.2.0"
+-
+-has-ansi@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+-  dependencies:
+-    ansi-regex "^2.0.0"
+-
+-has-binary-data@0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/has-binary-data/-/has-binary-data-0.1.3.tgz#8ebb18388b57f19a5231275a16fc18d51f379aae"
+-  integrity sha1-jrsYOItX8ZpSMSdaFvwY1R83mq4=
+-  dependencies:
+-    isarray "0.0.1"
+-
+-has-binary@0.1.6:
+-  version "0.1.6"
+-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.6.tgz#25326f39cfa4f616ad8787894e3af2cfbc7b6e10"
+-  integrity sha1-JTJvOc+k9hath4eJTjryz7x7bhA=
+-  dependencies:
+-    isarray "0.0.1"
+-
+-has-color@~0.1.0:
+-  version "0.1.7"
+-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+-  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
+-
+-has-cors@1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+-
+-has-flag@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+-
+-has-unicode@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+-
+-has@^1.0.3:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+-  dependencies:
+-    function-bind "^1.1.1"
+-
+-hash-for-dep@^1.0.2:
+-  version "1.5.1"
+-  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
+-  integrity sha512-/dQ/A2cl7FBPI2pO0CANkvuuVi/IFS5oTyJ0PsOb6jW6WbVW1js5qJXMJTNbWHXBIPdFTWFbabjB+mE0d+gelw==
+-  dependencies:
+-    broccoli-kitchen-sink-helpers "^0.3.1"
+-    heimdalljs "^0.2.3"
+-    heimdalljs-logger "^0.1.7"
+-    path-root "^0.1.1"
+-    resolve "^1.10.0"
+-    resolve-package-path "^1.0.11"
+-
+-hasha@~2.2.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
+-  integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=
+-  dependencies:
+-    is-stream "^1.0.1"
+-    pinkie-promise "^2.0.0"
+-
+-hawk@~3.1.0, hawk@~3.1.3:
+-  version "3.1.3"
+-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
+-  dependencies:
+-    boom "2.x.x"
+-    cryptiles "2.x.x"
+-    hoek "2.x.x"
+-    sntp "1.x.x"
+-
+-heimdalljs-logger@^0.1.7:
+-  version "0.1.10"
+-  resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz#90cad58aabb1590a3c7e640ddc6a4cd3a43faaf7"
+-  integrity sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==
+-  dependencies:
+-    debug "^2.2.0"
+-    heimdalljs "^0.2.6"
+-
+-heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.6:
+-  version "0.2.6"
+-  resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.6.tgz#b0eebabc412813aeb9542f9cc622cb58dbdcd9fe"
+-  integrity sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==
+-  dependencies:
+-    rsvp "~3.2.1"
+-
+-hoek@2.x.x:
+-  version "2.16.3"
+-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
+-
+-home-or-tmp@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.0.tgz#4b9f1e40800c3e50c6c27f781676afcce71f3985"
+-  integrity sha1-S58eQIAMPlDGwn94FnavzOcfOYU=
+-  dependencies:
+-    os-tmpdir "^1.0.1"
+-    user-home "^1.1.1"
+-
+-hosted-git-info@^2.1.4:
+-  version "2.8.9"
+-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+-
+-hosted-git-info@^2.1.5, hosted-git-info@^2.4.2:
+-  version "2.8.5"
+-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+-  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+-
+-hosted-git-info@~2.1.4:
+-  version "2.1.5"
+-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
+-  integrity sha1-C6gdkNouJas0ozLm7HeTbhWYEYs=
+-
+-htmlparser2@3.8.x:
+-  version "3.8.3"
+-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
+-  integrity sha1-mWwosZFRaovoZQGn15dX5ccMEGg=
+-  dependencies:
+-    domelementtype "1"
+-    domhandler "2.3"
+-    domutils "1.5"
+-    entities "1.0"
+-    readable-stream "1.1"
+-
+-http-errors@1.7.2:
+-  version "1.7.2"
+-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+-  dependencies:
+-    depd "~1.1.2"
+-    inherits "2.0.3"
+-    setprototypeof "1.1.1"
+-    statuses ">= 1.5.0 < 2"
+-    toidentifier "1.0.0"
+-
+-http-errors@~1.3.1:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.3.1.tgz#197e22cdebd4198585e8694ef6786197b91ed942"
+-  integrity sha1-GX4izevUGYWF6GlO9nhhl7ke2UI=
+-  dependencies:
+-    inherits "~2.0.1"
+-    statuses "1"
+-
+-http-errors@~1.7.2:
+-  version "1.7.3"
+-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+-  dependencies:
+-    depd "~1.1.2"
+-    inherits "2.0.4"
+-    setprototypeof "1.1.1"
+-    statuses ">= 1.5.0 < 2"
+-    toidentifier "1.0.0"
+-
+-"http-parser-js@>=0.4.0 <0.4.11":
+-  version "0.4.10"
+-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+-  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+-
+-http-proxy@^1.8.1, http-proxy@^1.9.0:
+-  version "1.18.1"
+-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+-  dependencies:
+-    eventemitter3 "^4.0.0"
+-    follow-redirects "^1.0.0"
+-    requires-port "^1.0.0"
+-
+-http-signature@~0.11.0:
+-  version "0.11.0"
+-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.11.0.tgz#1796cf67a001ad5cd6849dca0991485f09089fe6"
+-  integrity sha1-F5bPZ6ABrVzWhJ3KCZFIXwkIn+Y=
+-  dependencies:
+-    asn1 "0.1.11"
+-    assert-plus "^0.1.5"
+-    ctype "0.5.3"
+-
+-http-signature@~1.1.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
+-  dependencies:
+-    assert-plus "^0.2.0"
+-    jsprim "^1.2.2"
+-    sshpk "^1.7.0"
+-
+-http-signature@~1.2.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+-  dependencies:
+-    assert-plus "^1.0.0"
+-    jsprim "^1.2.2"
+-    sshpk "^1.7.0"
+-
+-ic-ajax@~2.0.1:
+-  version "2.0.2"
+-  resolved "https://registry.yarnpkg.com/ic-ajax/-/ic-ajax-2.0.2.tgz#50c8ab1c494320fac66830ce1ee3990ab827f596"
+-  integrity sha1-UMirHElDIPrGaDDOHuOZCrgn9ZY=
+-
+-iconv-lite@0.4.13:
+-  version "0.4.13"
+-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+-  integrity sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=
+-
+-iconv-lite@0.4.24, iconv-lite@^0.4.5:
+-  version "0.4.24"
+-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+-  dependencies:
+-    safer-buffer ">= 2.1.2 < 3"
+-
+-iferr@^0.1.5:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+-
+-image-size@~0.5.0:
+-  version "0.5.5"
+-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+-
+-imurmurhash@^0.1.4:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+-
+-in-publish@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
+-  integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
+-
+-include-path-searcher@^0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/include-path-searcher/-/include-path-searcher-0.1.0.tgz#c0cf2ddfa164fb2eae07bc7ca43a7f191cb4d7bd"
+-  integrity sha1-wM8t36Fk+y6uB7x8pDp/GRy0170=
+-
+-indent-string@^2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+-  dependencies:
+-    repeating "^2.0.0"
+-
+-indexof@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+-
+-inflection@^1.7.0:
+-  version "1.12.0"
+-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+-
+-inflight@^1.0.4, inflight@~1.0.4:
+-  version "1.0.6"
+-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+-  dependencies:
+-    once "^1.3.0"
+-    wrappy "1"
+-
+-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+-  version "2.0.4"
+-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+-
+-inherits@2.0.3:
+-  version "2.0.3"
+-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+-
+-ini@^1.3.4, ini@~1.3.4:
+-  version "1.3.5"
+-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+-
+-init-package-json@~1.9.1:
+-  version "1.9.6"
+-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.9.6.tgz#789fc2b74466a4952b9ea77c0575bc78ebd60a61"
+-  integrity sha1-eJ/Ct0RmpJUrnqd8BXW8eOvWCmE=
+-  dependencies:
+-    glob "^7.1.1"
+-    npm-package-arg "^4.0.0 || ^5.0.0"
+-    promzard "^0.3.0"
+-    read "~1.0.1"
+-    read-package-json "1 || 2"
+-    semver "2.x || 3.x || 4 || 5"
+-    validate-npm-package-license "^3.0.1"
+-    validate-npm-package-name "^3.0.0"
+-
+-inquirer@0.5.1:
+-  version "0.5.1"
+-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.5.1.tgz#e9f2cd1ee172c7a32e054b78a03d4ddb0d7707f1"
+-  integrity sha1-6fLNHuFyx6MuBUt4oD1N2w13B/E=
+-  dependencies:
+-    async "~0.8.0"
+-    chalk "~0.4.0"
+-    cli-color "~0.3.2"
+-    lodash "~2.4.1"
+-    mute-stream "0.0.4"
+-    readline2 "~0.1.0"
+-    through "~2.3.4"
+-
+-invert-kv@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+-
+-ipaddr.js@1.9.0:
+-  version "1.9.0"
+-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+-
+-is-arrayish@^0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+-
+-is-buffer@^1.1.5:
+-  version "1.1.6"
+-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+-
+-is-builtin-module@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
+-  dependencies:
+-    builtin-modules "^1.0.0"
+-
+-is-core-module@^2.2.0:
+-  version "2.4.0"
+-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+-  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+-  dependencies:
+-    has "^1.0.3"
+-
+-is-dotfile@^1.0.0:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
+-
+-is-equal-shallow@^0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+-  dependencies:
+-    is-primitive "^2.0.0"
+-
+-is-extendable@^0.1.1:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+-
+-is-extglob@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
+-
+-is-finite@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
+-
+-is-fullwidth-code-point@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+-  dependencies:
+-    number-is-nan "^1.0.0"
+-
+-is-fullwidth-code-point@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+-
+-is-git-url@0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.0.tgz#b9ce0fb044821c88880213d602db03bdb255da1b"
+-  integrity sha1-uc4PsESCHIiIAhPWAtsDvbJV2hs=
+-
+-is-git-url@^0.2.0:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64"
+-  integrity sha1-RFIA1vvW2gKPteAUQNmvyT88y2Q=
+-
+-is-glob@^2.0.0, is-glob@^2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+-  dependencies:
+-    is-extglob "^1.0.0"
+-
+-is-integer@^1.0.4:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/is-integer/-/is-integer-1.0.7.tgz#6bde81aacddf78b659b6629d629cadc51a886d5c"
+-  integrity sha1-a96Bqs3feLZZtmKdYpytxRqIbVw=
+-  dependencies:
+-    is-finite "^1.0.0"
+-
+-is-my-ip-valid@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
+-
+-is-my-json-valid@^2.12.4:
+-  version "2.20.0"
+-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a"
+-  integrity sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==
+-  dependencies:
+-    generate-function "^2.0.0"
+-    generate-object-property "^1.1.0"
+-    is-my-ip-valid "^1.0.0"
+-    jsonpointer "^4.0.0"
+-    xtend "^4.0.0"
+-
+-is-number@^2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
+-  dependencies:
+-    kind-of "^3.0.2"
+-
+-is-number@^4.0.0:
+-  version "4.0.0"
+-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+-
+-is-posix-bracket@^0.1.0:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
+-
+-is-primitive@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+-
+-is-property@^1.0.0, is-property@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+-
+-is-stream@^1.0.1:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+-
+-is-type@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
+-  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+-  dependencies:
+-    core-util-is "~1.0.0"
+-
+-is-typedarray@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+-
+-is-utf8@^0.2.0:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+-
+-isarray@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+-
+-isarray@1.0.0, isarray@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+-
+-isbinaryfile@^2.0.3:
+-  version "2.0.4"
+-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-2.0.4.tgz#d23592e6a6f093efb84c2e6152056be294e414a1"
+-  integrity sha1-0jWS5qbwk++4TC5hUgVr4pTkFKE=
+-
+-isexe@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+-
+-isobject@^2.0.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+-  dependencies:
+-    isarray "1.0.0"
+-
+-isstream@~0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+-
+-istextorbinary@2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874"
+-  integrity sha1-2+0qb1G+L3R1to+JRlgRFBt1iHQ=
+-  dependencies:
+-    binaryextensions "1 || 2"
+-    editions "^1.1.1"
+-    textextensions "1 || 2"
+-
+-js-base64@^2.1.8:
+-  version "2.6.4"
+-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
+-
+-js-tokens@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.1.tgz#cc435a5c8b94ad15acb7983140fc80182c89aeae"
+-  integrity sha1-zENaXIuUrRWst5gxQPyAGCyJrq4=
+-
+-js-yaml@^3.2.5, js-yaml@^3.2.7:
+-  version "3.13.1"
+-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+-  dependencies:
+-    argparse "^1.0.7"
+-    esprima "^4.0.0"
+-
+-jsbn@~0.1.0:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+-
+-jsesc@~0.5.0:
+-  version "0.5.0"
+-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+-
+-jshint@^2.7.0:
+-  version "2.10.3"
+-  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.10.3.tgz#98dc765bf6920b41bc2719f76b8739d6f6e93a9c"
+-  integrity sha512-d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ==
+-  dependencies:
+-    cli "~1.0.0"
+-    console-browserify "1.1.x"
+-    exit "0.1.x"
+-    htmlparser2 "3.8.x"
+-    lodash "~4.17.11"
+-    minimatch "~3.0.2"
+-    shelljs "0.3.x"
+-    strip-json-comments "1.0.x"
+-
+-json-parse-better-errors@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+-
+-json-schema-traverse@^0.4.1:
+-  version "0.4.1"
+-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+-
+-json-schema@0.2.3:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+-
+-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+-  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
+-  dependencies:
+-    jsonify "~0.0.0"
+-
+-json-stringify-safe@~5.0.1:
+-  version "5.0.1"
+-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+-
+-json3@3.2.6:
+-  version "3.2.6"
+-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.2.6.tgz#f6efc93c06a04de9aec53053df2559bb19e2038b"
+-  integrity sha1-9u/JPAagTemuxTBT3yVZuxniA4s=
+-
+-json5@^0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d"
+-  integrity sha1-BUNS5MTIDIbAkjh31EneF2pzLI0=
+-
+-jsonfile@^2.0.0, jsonfile@^2.1.0:
+-  version "2.4.0"
+-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+-  optionalDependencies:
+-    graceful-fs "^4.1.6"
+-
+-jsonfile@^4.0.0:
+-  version "4.0.0"
+-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+-  optionalDependencies:
+-    graceful-fs "^4.1.6"
+-
+-jsonify@~0.0.0:
+-  version "0.0.0"
+-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+-  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
+-
+-jsonpointer@^4.0.0:
+-  version "4.0.1"
+-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
+-
+-jsprim@^1.2.2:
+-  version "1.4.1"
+-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+-  dependencies:
+-    assert-plus "1.0.0"
+-    extsprintf "1.3.0"
+-    json-schema "0.2.3"
+-    verror "1.10.0"
+-
+-kew@~0.7.0:
+-  version "0.7.0"
+-  resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
+-  integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=
+-
+-kind-of@^3.0.2:
+-  version "3.2.2"
+-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+-  dependencies:
+-    is-buffer "^1.1.5"
+-
+-kind-of@^6.0.0:
+-  version "6.0.2"
+-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+-
+-klassy@^0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/klassy/-/klassy-0.1.3.tgz#c31d5756d583197d75f582b6e692872be497067f"
+-  integrity sha1-wx1XVtWDGX119YK25pKHK+SXBn8=
+-
+-klaw@^1.0.0:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
+-  optionalDependencies:
+-    graceful-fs "^4.1.9"
+-
+-lazy-cache@^1.0.3:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+-  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
+-
+-lcid@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+-  dependencies:
+-    invert-kv "^1.0.0"
+-
+-leek@0.0.18:
+-  version "0.0.18"
+-  resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.18.tgz#12b4a0c70aa500e9099b41c73f73b7d9b23c93d1"
+-  integrity sha1-ErSgxwqlAOkJm0HHP3O32bI8k9E=
+-  dependencies:
+-    debug "^2.1.0"
+-    lodash-node "^2.4.1"
+-    request "^2.27.0"
+-    rsvp "^3.0.6"
+-
+-less@^2.5.0:
+-  version "2.7.3"
+-  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+-  integrity sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==
+-  optionalDependencies:
+-    errno "^0.1.1"
+-    graceful-fs "^4.1.2"
+-    image-size "~0.5.0"
+-    mime "^1.2.11"
+-    mkdirp "^0.5.0"
+-    promise "^7.1.1"
+-    request "2.81.0"
+-    source-map "^0.5.3"
+-
+-leven@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3"
+-  integrity sha1-kUS27ryl8dBoAWnxpncNzqYLdcM=
+-
+-linkify-it@~1.2.0:
+-  version "1.2.4"
+-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
+-  integrity sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=
+-  dependencies:
+-    uc.micro "^1.0.1"
+-
+-livereload-js@^2.2.0:
+-  version "2.4.0"
+-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
+-  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
+-
+-load-json-file@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    parse-json "^2.2.0"
+-    pify "^2.0.0"
+-    pinkie-promise "^2.0.0"
+-    strip-bom "^2.0.0"
+-
+-loader.js@4.2.3:
+-  version "4.2.3"
+-  resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.2.3.tgz#845228877aa5317209e41f6c00d9bab36a6a4808"
+-  integrity sha1-hFIoh3qlMXIJ5B9sANm6s2pqSAg=
+-
+-locate-path@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+-  dependencies:
+-    p-locate "^3.0.0"
+-    path-exists "^3.0.0"
+-
+-lockfile@~1.0.1:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
+-  integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==
+-  dependencies:
+-    signal-exit "^3.0.2"
+-
+-lodash-es@^3.10.0:
+-  version "3.10.1"
+-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-3.10.1.tgz#a1c85d9829c9009004339dc3846dbabb46cf4e19"
+-  integrity sha1-ochdmCnJAJAEM53DhG26u0bPThk=
+-
+-lodash-node@^2.4.1:
+-  version "2.4.1"
+-  resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-2.4.1.tgz#ea82f7b100c733d1a42af76801e506105e2a80ec"
+-  integrity sha1-6oL3sQDHM9GkKvdoAeUGEF4qgOw=
+-
+-lodash-node@^3.4.0:
+-  version "3.10.2"
+-  resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
+-  integrity sha1-JZjVsbVOami0y1ROXHMJU8v2Mvc=
+-
+-lodash._arraycopy@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
+-  integrity sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE=
+-
+-lodash._arrayeach@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
+-  integrity sha1-urFWsqkNPxu9XGU0AzSeXlkz754=
+-
+-lodash._baseassign@^3.0.0:
+-  version "3.2.0"
+-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+-  dependencies:
+-    lodash._basecopy "^3.0.0"
+-    lodash.keys "^3.0.0"
+-
+-lodash._basecallback@^3.0.0:
+-  version "3.3.1"
+-  resolved "https://registry.yarnpkg.com/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz#b7b2bb43dc2160424a21ccf26c57e443772a8e27"
+-  integrity sha1-t7K7Q9whYEJKIczybFfkQ3cqjic=
+-  dependencies:
+-    lodash._baseisequal "^3.0.0"
+-    lodash._bindcallback "^3.0.0"
+-    lodash.isarray "^3.0.0"
+-    lodash.pairs "^3.0.0"
+-
+-lodash._basecopy@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+-
+-lodash._basefor@^3.0.0:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
+-  integrity sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI=
+-
+-lodash._baseindexof@^3.0.0:
+-  version "3.1.0"
+-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
+-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
+-
+-lodash._baseisequal@^3.0.0:
+-  version "3.0.7"
+-  resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1"
+-  integrity sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=
+-  dependencies:
+-    lodash.isarray "^3.0.0"
+-    lodash.istypedarray "^3.0.0"
+-    lodash.keys "^3.0.0"
+-
+-lodash._baseuniq@^3.0.0:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-3.0.3.tgz#2123fa0db2d69c28d5beb1c1f36d61522a740234"
+-  integrity sha1-ISP6DbLWnCjVvrHB821hUip0AjQ=
+-  dependencies:
+-    lodash._baseindexof "^3.0.0"
+-    lodash._cacheindexof "^3.0.0"
+-    lodash._createcache "^3.0.0"
+-
+-lodash._bindcallback@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+-
+-lodash._cacheindexof@^3.0.0:
+-  version "3.0.2"
+-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
+-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
+-
+-lodash._createassigner@^3.0.0:
+-  version "3.1.1"
+-  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+-  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+-  dependencies:
+-    lodash._bindcallback "^3.0.0"
+-    lodash._isiterateecall "^3.0.0"
+-    lodash.restparam "^3.0.0"
+-
+-lodash._createcache@^3.0.0:
+-  version "3.1.2"
+-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
+-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
+-  dependencies:
+-    lodash._getnative "^3.0.0"
+-
+-lodash._getnative@^3.0.0:
+-  version "3.9.1"
+-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+-
+-lodash._isiterateecall@^3.0.0:
+-  version "3.0.9"
+-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+-
+-lodash.assign@^3.0.0:
+-  version "3.2.0"
+-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+-  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+-  dependencies:
+-    lodash._baseassign "^3.0.0"
+-    lodash._createassigner "^3.0.0"
+-    lodash.keys "^3.0.0"
+-
+-lodash.defaults@^3.1.2:
+-  version "3.1.2"
+-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
+-  integrity sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=
+-  dependencies:
+-    lodash.assign "^3.0.0"
+-    lodash.restparam "^3.0.0"
+-
+-lodash.isarguments@^3.0.0:
+-  version "3.1.0"
+-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+-
+-lodash.isarray@^3.0.0:
+-  version "3.0.4"
+-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+-
+-lodash.isplainobject@^3.0.0:
+-  version "3.2.0"
+-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5"
+-  integrity sha1-moI4rhayAEMpYM1zRlEtASP79MU=
+-  dependencies:
+-    lodash._basefor "^3.0.0"
+-    lodash.isarguments "^3.0.0"
+-    lodash.keysin "^3.0.0"
+-
+-lodash.istypedarray@^3.0.0:
+-  version "3.0.6"
+-  resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62"
+-  integrity sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=
+-
+-lodash.keys@^3.0.0:
+-  version "3.1.2"
+-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+-  dependencies:
+-    lodash._getnative "^3.0.0"
+-    lodash.isarguments "^3.0.0"
+-    lodash.isarray "^3.0.0"
+-
+-lodash.keysin@^3.0.0:
+-  version "3.0.8"
+-  resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f"
+-  integrity sha1-IsRJPrvtsUJ5YqVLRFssinZ/tH8=
+-  dependencies:
+-    lodash.isarguments "^3.0.0"
+-    lodash.isarray "^3.0.0"
+-
+-lodash.merge@^3.0.2, lodash.merge@^3.3.2:
+-  version "3.3.2"
+-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994"
+-  integrity sha1-DZDZPtY3sYeEN7s+IWASYNev6ZQ=
+-  dependencies:
+-    lodash._arraycopy "^3.0.0"
+-    lodash._arrayeach "^3.0.0"
+-    lodash._createassigner "^3.0.0"
+-    lodash._getnative "^3.0.0"
+-    lodash.isarguments "^3.0.0"
+-    lodash.isarray "^3.0.0"
+-    lodash.isplainobject "^3.0.0"
+-    lodash.istypedarray "^3.0.0"
+-    lodash.keys "^3.0.0"
+-    lodash.keysin "^3.0.0"
+-    lodash.toplainobject "^3.0.0"
+-
+-lodash.merge@^4.5.1:
+-  version "4.6.2"
+-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+-
+-lodash.pad@^4.1.0:
+-  version "4.5.1"
+-  resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70"
+-  integrity sha1-QzCUmoM6fI2iLMIPaibE1Z3runA=
+-
+-lodash.padend@^4.1.0:
+-  version "4.6.1"
+-  resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e"
+-  integrity sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=
+-
+-lodash.padstart@^4.1.0:
+-  version "4.6.1"
+-  resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
+-  integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=
+-
+-lodash.pairs@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/lodash.pairs/-/lodash.pairs-3.0.1.tgz#bbe08d5786eeeaa09a15c91ebf0dcb7d2be326a9"
+-  integrity sha1-u+CNV4bu6qCaFckevw3LfSvjJqk=
+-  dependencies:
+-    lodash.keys "^3.0.0"
+-
+-lodash.restparam@^3.0.0:
+-  version "3.6.1"
+-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+-
+-lodash.toplainobject@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d"
+-  integrity sha1-KHkK2ULSk9eKpmOgfs9/UsoEGY0=
+-  dependencies:
+-    lodash._basecopy "^3.0.0"
+-    lodash.keysin "^3.0.0"
+-
+-lodash.uniq@^3.2.2:
+-  version "3.2.2"
+-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-3.2.2.tgz#146c36f25e75d19501ba402e88ba14937f63cd8b"
+-  integrity sha1-FGw28l510ZUBukAuiLoUk39jzYs=
+-  dependencies:
+-    lodash._basecallback "^3.0.0"
+-    lodash._baseuniq "^3.0.0"
+-    lodash._getnative "^3.0.0"
+-    lodash._isiterateecall "^3.0.0"
+-    lodash.isarray "^3.0.0"
+-
+-lodash@^3.10.0, lodash@^3.6.0, lodash@^3.9.3:
+-  version "3.10.1"
+-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+-  integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
+-
+-lodash@^4.0.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.5.1, lodash@~4.17.10, lodash@~4.17.11:
+-  version "4.17.21"
+-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+-
+-lodash@~2.3.0:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.3.0.tgz#dfbdac99cf87a59a022c474730570d8716c267dd"
+-  integrity sha1-372smc+HpZoCLEdHMFcNhxbCZ90=
+-
+-lodash@~2.4.1:
+-  version "2.4.2"
+-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
+-  integrity sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=
+-
+-longest@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+-  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
+-
+-loud-rejection@^1.0.0:
+-  version "1.6.0"
+-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+-  dependencies:
+-    currently-unhandled "^0.4.1"
+-    signal-exit "^3.0.0"
+-
+-lru-cache@2, lru-cache@~2.7.0:
+-  version "2.7.3"
+-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+-  integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
+-
+-lru-cache@^4.0.0, lru-cache@^4.0.1:
+-  version "4.1.5"
+-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+-  dependencies:
+-    pseudomap "^1.0.2"
+-    yallist "^2.1.2"
+-
+-lru-queue@0.1:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+-  integrity sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=
+-  dependencies:
+-    es5-ext "~0.10.2"
+-
+-make-array@^0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef"
+-  integrity sha1-M14267DFpDFU0hIToeyuriobs+8=
+-
+-makeerror@1.0.x:
+-  version "1.0.11"
+-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+-  dependencies:
+-    tmpl "1.0.x"
+-
+-map-obj@^1.0.0, map-obj@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+-
+-markdown-it-terminal@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.2.tgz#fff2c4a5df237800639b468a5fdd78e21917c4f2"
+-  integrity sha1-//LEpd8jeABjm0aKX9144hkXxPI=
+-  dependencies:
+-    ansi-styles "^2.0.1"
+-    cardinal "^0.5.0"
+-    cli-table "^0.3.1"
+-    lodash-node "^3.4.0"
+-    markdown-it "^4.0.0"
+-
+-markdown-it@4.3.0:
+-  version "4.3.0"
+-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.3.0.tgz#0ee2b0724079d186b3f04b7345ce395ae47cc474"
+-  integrity sha1-DuKwckB50Yaz8EtzRc45WuR8xHQ=
+-  dependencies:
+-    argparse "~1.0.2"
+-    entities "~1.1.1"
+-    linkify-it "~1.2.0"
+-    mdurl "~1.0.0"
+-    uc.micro "^1.0.0"
+-
+-markdown-it@^4.0.0:
+-  version "4.4.0"
+-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
+-  integrity sha1-PfNz2+pYepp/7z5WMRtokI91xBQ=
+-  dependencies:
+-    argparse "~1.0.2"
+-    entities "~1.1.1"
+-    linkify-it "~1.2.0"
+-    mdurl "~1.0.0"
+-    uc.micro "^1.0.0"
+-
+-matcher-collection@^1.0.0, matcher-collection@^1.0.1:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
+-  integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
+-  dependencies:
+-    minimatch "^3.0.2"
+-
+-math-random@^1.0.1:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
+-  integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
+-
+-mdurl@~1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+-
+-media-typer@0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+-
+-memoizee@~0.3.8:
+-  version "0.3.10"
+-  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.3.10.tgz#4eca0d8aed39ec9d017f4c5c2f2f6432f42e5c8f"
+-  integrity sha1-TsoNiu057J0Bf0xcLy9kMvQuXI8=
+-  dependencies:
+-    d "~0.1.1"
+-    es5-ext "~0.10.11"
+-    es6-weak-map "~0.1.4"
+-    event-emitter "~0.3.4"
+-    lru-queue "0.1"
+-    next-tick "~0.2.2"
+-    timers-ext "0.1"
+-
+-meow@^3.7.0:
+-  version "3.7.0"
+-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
+-  dependencies:
+-    camelcase-keys "^2.0.0"
+-    decamelize "^1.1.2"
+-    loud-rejection "^1.0.0"
+-    map-obj "^1.0.1"
+-    minimist "^1.1.3"
+-    normalize-package-data "^2.3.4"
+-    object-assign "^4.0.1"
+-    read-pkg-up "^1.0.1"
+-    redent "^1.0.0"
+-    trim-newlines "^1.0.0"
+-
+-merge-defaults@^0.2.1:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/merge-defaults/-/merge-defaults-0.2.2.tgz#68b9da04fef804674a0d63df1c469378c343d506"
+-  integrity sha512-rKkxPFgGDZfmen0IN8BKRsGEbFU3PdO0RhR1GjOk+BLJF7+LAIhs5bUG3s26FkbB5bfIn9il25KkntRGdqHQ3A==
+-  dependencies:
+-    "@sailshq/lodash" "^3.10.2"
+-
+-merge-descriptors@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+-
+-merge-trees@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
+-  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+-  dependencies:
+-    can-symlink "^1.0.0"
+-    fs-tree-diff "^0.5.4"
+-    heimdalljs "^0.2.1"
+-    heimdalljs-logger "^0.1.7"
+-    rimraf "^2.4.3"
+-    symlink-or-copy "^1.0.0"
+-
+-merge@^1.2.0:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+-
+-methods@~1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+-
+-micromatch@^2.1.5:
+-  version "2.3.11"
+-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+-  dependencies:
+-    arr-diff "^2.0.0"
+-    array-unique "^0.2.1"
+-    braces "^1.8.2"
+-    expand-brackets "^0.1.4"
+-    extglob "^0.3.1"
+-    filename-regex "^2.0.0"
+-    is-extglob "^1.0.0"
+-    is-glob "^2.0.1"
+-    kind-of "^3.0.2"
+-    normalize-path "^2.0.1"
+-    object.omit "^2.0.0"
+-    parse-glob "^3.0.4"
+-    regex-cache "^0.4.2"
+-
+-mime-db@1.42.0, "mime-db@>= 1.40.0 < 2":
+-  version "1.42.0"
+-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac"
+-  integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==
+-
+-mime-db@1.47.0:
+-  version "1.47.0"
+-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+-  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
+-
+-mime-types@^2.1.11, mime-types@~2.1.24, mime-types@~2.1.7:
+-  version "2.1.25"
+-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437"
+-  integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==
+-  dependencies:
+-    mime-db "1.42.0"
+-
+-mime-types@^2.1.12, mime-types@~2.1.19:
+-  version "2.1.30"
+-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+-  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
+-  dependencies:
+-    mime-db "1.47.0"
+-
+-mime@1.6.0, mime@^1.2.11:
+-  version "1.6.0"
+-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+-
+-minimatch@1:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz#e0dd2120b49e1b724ce8d714c520822a9438576d"
+-  integrity sha1-4N0hILSeG3JM6NcUxSCCKpQ4V20=
+-  dependencies:
+-    lru-cache "2"
+-    sigmund "~1.0.0"
+-
+-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.0, minimatch@~3.0.2:
+-  version "3.0.4"
+-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+-  dependencies:
+-    brace-expansion "^1.1.7"
+-
+-minimatch@2.x, minimatch@^2.0.1, minimatch@^2.0.10, minimatch@^2.0.3, minimatch@^2.0.4:
+-  version "2.0.10"
+-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+-  integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=
+-  dependencies:
+-    brace-expansion "^1.0.0"
+-
+-minimatch@~0.2.9:
+-  version "0.2.14"
+-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
+-  integrity sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=
+-  dependencies:
+-    lru-cache "2"
+-    sigmund "~1.0.0"
+-
+-minimist@0.0.8:
+-  version "0.0.8"
+-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+-
+-minimist@^1.1.0, minimist@^1.1.1:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+-
+-minimist@^1.1.3, minimist@^1.2.5:
+-  version "1.2.5"
+-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+-
+-minimist@~0.0.1:
+-  version "0.0.10"
+-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+-
+-mkdirp@0.5.0:
+-  version "0.5.0"
+-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
+-  integrity sha1-HXMHam35hs2TROFecfzAWkyavxI=
+-  dependencies:
+-    minimist "0.0.8"
+-
+-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+-  version "0.5.5"
+-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+-  dependencies:
+-    minimist "^1.2.5"
+-
+-mkdirp@^0.3.5:
+-  version "0.3.5"
+-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+-  integrity sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=
+-
+-mkdirp@~0.4.0:
+-  version "0.4.2"
+-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.4.2.tgz#427c8c18ece398b932f6f666f4e1e5b7740e78c8"
+-  integrity sha1-QnyMGOzjmLky9vZm9OHlt3QOeMg=
+-  dependencies:
+-    minimist "0.0.8"
+-
+-mktemp@~0.3.4:
+-  version "0.3.5"
+-  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.3.5.tgz#a1504c706d0d2b198c6a0eb645f7fdaf8181f7de"
+-  integrity sha1-oVBMcG0NKxmMag62Rff9r4GB994=
+-
+-mktemp@~0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
+-  integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
+-
+-moment-timezone@^0.3.0:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.3.1.tgz#3ef47856b02d53b718a10a5ec2023aa299e07bf5"
+-  integrity sha1-PvR4VrAtU7cYoQpewgI6opnge/U=
+-  dependencies:
+-    moment ">= 2.6.0"
+-
+-"moment@>= 2.6.0":
+-  version "2.24.0"
+-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+-
+-morgan@^1.5.2:
+-  version "1.9.1"
+-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
+-  integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
+-  dependencies:
+-    basic-auth "~2.0.0"
+-    debug "2.6.9"
+-    depd "~1.1.2"
+-    on-finished "~2.3.0"
+-    on-headers "~1.0.1"
+-
+-mout@~0.9.0:
+-  version "0.9.1"
+-  resolved "https://registry.yarnpkg.com/mout/-/mout-0.9.1.tgz#84f0f3fd6acc7317f63de2affdcc0cee009b0477"
+-  integrity sha1-hPDz/WrMcxf2PeKv/cwM7gCbBHc=
+-
+-ms@0.6.2:
+-  version "0.6.2"
+-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.6.2.tgz#d89c2124c6fdc1353d65a8b77bf1aac4b193708c"
+-  integrity sha1-2JwhJMb9wTU9Zai3e/GqxLGTcIw=
+-
+-ms@0.7.1:
+-  version "0.7.1"
+-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+-  integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=
+-
+-ms@2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+-
+-ms@2.1.1:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+-
+-ms@^2.1.1:
+-  version "2.1.2"
+-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+-
+-mustache@^2.0.0:
+-  version "2.3.2"
+-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5"
+-  integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==
+-
+-mute-stream@0.0.4:
+-  version "0.0.4"
+-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.4.tgz#a9219960a6d5d5d046597aee51252c6655f7177e"
+-  integrity sha1-qSGZYKbV1dBGWXruUSUsZlX3F34=
+-
+-mute-stream@~0.0.4:
+-  version "0.0.8"
+-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+-
+-nan@^2.13.2:
+-  version "2.14.2"
+-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+-
+-negotiator@0.6.2:
+-  version "0.6.2"
+-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+-
+-next-tick@1, next-tick@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+-
+-next-tick@~0.2.2:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-0.2.2.tgz#75da4a927ee5887e39065880065b7336413b310d"
+-  integrity sha1-ddpKkn7liH45BliABltzNkE7MQ0=
+-
+-node-gyp@^3.8.0:
+-  version "3.8.0"
+-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+-  dependencies:
+-    fstream "^1.0.0"
+-    glob "^7.0.3"
+-    graceful-fs "^4.1.2"
+-    mkdirp "^0.5.0"
+-    nopt "2 || 3"
+-    npmlog "0 || 1 || 2 || 3 || 4"
+-    osenv "0"
+-    request "^2.87.0"
+-    rimraf "2"
+-    semver "~5.3.0"
+-    tar "^2.0.0"
+-    which "1"
+-
+-node-gyp@~3.0.3:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.0.3.tgz#9b004219f4fa9efbfd78c5fc674aa12e58fb8694"
+-  integrity sha1-mwBCGfT6nvv9eMX8Z0qhLlj7hpQ=
+-  dependencies:
+-    fstream "^1.0.0"
+-    glob "3 || 4"
+-    graceful-fs "^4.1.2"
+-    minimatch "1"
+-    mkdirp "^0.5.0"
+-    nopt "2 || 3"
+-    npmlog "0 || 1"
+-    osenv "0"
+-    path-array "^1.0.0"
+-    request "2"
+-    rimraf "2"
+-    semver "2.x || 3.x || 4 || 5"
+-    tar "^1.0.0"
+-    which "1"
+-
+-node-int64@^0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+-
+-node-modules-path@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.2.tgz#e3acede9b7baf4bc336e3496b58e5b40d517056e"
+-  integrity sha512-6Gbjq+d7uhkO7epaKi5DNgUJn7H0gEyA4Jg0Mo1uQOi3Rk50G83LtmhhFyw0LxnAFhtlspkiiw52ISP13qzcBg==
+-
+-node-sass@^4.7.2:
+-  version "4.14.1"
+-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
+-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
+-  dependencies:
+-    async-foreach "^0.1.3"
+-    chalk "^1.1.1"
+-    cross-spawn "^3.0.0"
+-    gaze "^1.0.0"
+-    get-stdin "^4.0.1"
+-    glob "^7.0.3"
+-    in-publish "^2.0.0"
+-    lodash "^4.17.15"
+-    meow "^3.7.0"
+-    mkdirp "^0.5.1"
+-    nan "^2.13.2"
+-    node-gyp "^3.8.0"
+-    npmlog "^4.0.0"
+-    request "^2.88.0"
+-    sass-graph "2.2.5"
+-    stdout-stream "^1.4.0"
+-    "true-case-path" "^1.0.2"
+-
+-node-uuid@^1.4.3, node-uuid@~1.4.3, node-uuid@~1.4.7:
+-  version "1.4.8"
+-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
+-
+-"nopt@2 || 3", nopt@^3.0.1, nopt@^3.0.3, nopt@~3.0.4:
+-  version "3.0.6"
+-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+-  dependencies:
+-    abbrev "1"
+-
+-normalize-git-url@~3.0.1:
+-  version "3.0.2"
+-  resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4"
+-  integrity sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q=
+-
+-normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0":
+-  version "2.5.0"
+-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+-  dependencies:
+-    hosted-git-info "^2.1.4"
+-    resolve "^1.10.0"
+-    semver "2 || 3 || 4 || 5"
+-    validate-npm-package-license "^3.0.1"
+-
+-normalize-package-data@~2.3.5:
+-  version "2.3.8"
+-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+-  integrity sha1-2Bntoqne29H/pWPqQHHZNngilbs=
+-  dependencies:
+-    hosted-git-info "^2.1.4"
+-    is-builtin-module "^1.0.0"
+-    semver "2 || 3 || 4 || 5"
+-    validate-npm-package-license "^3.0.1"
+-
+-normalize-path@^2.0.0, normalize-path@^2.0.1:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+-  dependencies:
+-    remove-trailing-separator "^1.0.1"
+-
+-npm-cache-filename@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
+-  integrity sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE=
+-
+-npm-install-checks@~1.0.6:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-1.0.7.tgz#6d91aeda0ac96801f1ed7aadee116a6c0a086a57"
+-  integrity sha1-bZGu2grJaAHx7Xqt7hFqbAoIalc=
+-  dependencies:
+-    npmlog "0.1 || 1 || 2"
+-    semver "^2.3.0 || 3.x || 4 || 5"
+-
+-npm-normalize-package-bin@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+-
+-"npm-package-arg@^3.0.0 || ^4.0.0", npm-package-arg@^4.1.1:
+-  version "4.2.1"
+-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.2.1.tgz#593303fdea85f7c422775f17f9eb7670f680e3ec"
+-  integrity sha1-WTMD/eqF98Qid18X+et2cPaA4+w=
+-  dependencies:
+-    hosted-git-info "^2.1.5"
+-    semver "^5.1.0"
+-
+-"npm-package-arg@^4.0.0 || ^5.0.0":
+-  version "5.1.2"
+-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-5.1.2.tgz#fb18d17bb61e60900d6312619919bd753755ab37"
+-  integrity sha512-wJBsrf0qpypPT7A0LART18hCdyhpCMxeTtcb0X4IZO2jsP6Om7EHN1d9KSKiqD+KVH030RVNpWS9thk+pb7wzA==
+-  dependencies:
+-    hosted-git-info "^2.4.2"
+-    osenv "^0.1.4"
+-    semver "^5.1.0"
+-    validate-npm-package-name "^3.0.0"
+-
+-npm-package-arg@~4.0.2:
+-  version "4.0.2"
+-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.0.2.tgz#3f28235f9f6428e54bfeca73629e27d6c81a7e82"
+-  integrity sha1-PygjX59kKOVL/spzYp4n1sgafoI=
+-  dependencies:
+-    hosted-git-info "^2.1.4"
+-    semver "4 || 5"
+-
+-npm-registry-client@~7.0.7:
+-  version "7.0.9"
+-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-7.0.9.tgz#1baf86ee5285c4e6d38d4556208ded56049231bb"
+-  integrity sha1-G6+G7lKFxObTjUVWII3tVgSSMbs=
+-  dependencies:
+-    chownr "^1.0.1"
+-    concat-stream "^1.4.6"
+-    graceful-fs "^4.1.2"
+-    mkdirp "^0.5.0"
+-    normalize-package-data "~1.0.1 || ^2.0.0"
+-    npm-package-arg "^3.0.0 || ^4.0.0"
+-    once "^1.3.0"
+-    request "^2.47.0"
+-    retry "^0.8.0"
+-    rimraf "2"
+-    semver "2 >=2.2.1 || 3.x || 4 || 5"
+-    slide "^1.1.3"
+-  optionalDependencies:
+-    npmlog "~2.0.0"
+-
+-npm-user-validate@~0.1.2:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-0.1.5.tgz#52465d50c2d20294a57125b996baedbf56c5004b"
+-  integrity sha1-UkZdUMLSApSlcSW5lrrtv1bFAEs=
+-
+-npm@2.14.10:
+-  version "2.14.10"
+-  resolved "https://registry.yarnpkg.com/npm/-/npm-2.14.10.tgz#96597ee1e5efeebdcf5f91b57763fe9ae17b9903"
+-  integrity sha1-lll+4eXv7r3PX5G1d2P+muF7mQM=
+-  dependencies:
+-    abbrev "~1.0.7"
+-    ansi "~0.3.0"
+-    ansicolors "~0.3.2"
+-    ansistyles "~0.1.3"
+-    archy "~1.0.0"
+-    async-some "~1.0.2"
+-    block-stream "0.0.8"
+-    char-spinner "~1.0.1"
+-    chmodr "~1.0.2"
+-    chownr "~1.0.1"
+-    cmd-shim "~2.0.1"
+-    columnify "~1.5.2"
+-    config-chain "~1.1.9"
+-    dezalgo "~1.0.3"
+-    editor "~1.0.0"
+-    fs-vacuum "~1.2.7"
+-    fs-write-stream-atomic "~1.0.4"
+-    fstream "~1.0.8"
+-    fstream-npm "~1.0.7"
+-    github-url-from-git "~1.4.0"
+-    github-url-from-username-repo "~1.0.2"
+-    glob "~5.0.15"
+-    graceful-fs "~4.1.2"
+-    hosted-git-info "~2.1.4"
+-    inflight "~1.0.4"
+-    inherits "~2.0.1"
+-    ini "~1.3.4"
+-    init-package-json "~1.9.1"
+-    lockfile "~1.0.1"
+-    lru-cache "~2.7.0"
+-    minimatch "~3.0.0"
+-    mkdirp "~0.5.1"
+-    node-gyp "~3.0.3"
+-    nopt "~3.0.4"
+-    normalize-git-url "~3.0.1"
+-    normalize-package-data "~2.3.5"
+-    npm-cache-filename "~1.0.2"
+-    npm-install-checks "~1.0.6"
+-    npm-package-arg "~4.0.2"
+-    npm-registry-client "~7.0.7"
+-    npm-user-validate "~0.1.2"
+-    npmlog "~2.0.0"
+-    once "~1.3.2"
+-    opener "~1.4.1"
+-    osenv "~0.1.3"
+-    path-is-inside "~1.0.0"
+-    read "~1.0.7"
+-    read-installed "~4.0.3"
+-    read-package-json "~2.0.2"
+-    readable-stream "~1.1.13"
+-    realize-package-specifier "~3.0.1"
+-    request "~2.65.0"
+-    retry "~0.8.0"
+-    rimraf "~2.4.3"
+-    semver "~5.0.3"
+-    sha "~2.0.1"
+-    slide "~1.1.6"
+-    sorted-object "~1.0.0"
+-    spdx "~0.4.1"
+-    tar "~2.2.1"
+-    text-table "~0.2.0"
+-    uid-number "0.0.6"
+-    umask "~1.1.0"
+-    validate-npm-package-license "~3.0.1"
+-    validate-npm-package-name "~2.2.2"
+-    which "~1.2.0"
+-    wrappy "~1.0.1"
+-    write-file-atomic "~1.1.3"
+-
+-"npmlog@0 || 1", npmlog@^1.0.0:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-1.2.1.tgz#28e7be619609b53f7ad1dd300a10d64d716268b6"
+-  integrity sha1-KOe+YZYJtT960d0wChDWTXFiaLY=
+-  dependencies:
+-    ansi "~0.3.0"
+-    are-we-there-yet "~1.0.0"
+-    gauge "~1.2.0"
+-
+-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
+-  version "4.1.2"
+-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+-  dependencies:
+-    are-we-there-yet "~1.1.2"
+-    console-control-strings "~1.1.0"
+-    gauge "~2.7.3"
+-    set-blocking "~2.0.0"
+-
+-"npmlog@0.1 || 1 || 2", npmlog@~2.0.0:
+-  version "2.0.4"
+-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692"
+-  integrity sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=
+-  dependencies:
+-    ansi "~0.3.1"
+-    are-we-there-yet "~1.1.2"
+-    gauge "~1.2.5"
+-
+-number-is-nan@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+-
+-numeral@^1.5.3:
+-  version "1.5.6"
+-  resolved "https://registry.yarnpkg.com/numeral/-/numeral-1.5.6.tgz#3831db968451b9cf6aff9bf95925f1ef8e37b33f"
+-  integrity sha1-ODHbloRRuc9q/5v5WSXx7443sz8=
+-
+-oauth-sign@~0.8.0, oauth-sign@~0.8.1:
+-  version "0.8.2"
+-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
+-
+-oauth-sign@~0.9.0:
+-  version "0.9.0"
+-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+-
+-object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0:
+-  version "4.1.1"
+-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+-
+-object-assign@^2.0.0:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+-  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
+-
+-object-assign@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
+-
+-object-component@0.0.3:
+-  version "0.0.3"
+-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+-
+-object-keys@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.1.tgz#55802e85842c26bbb5ebbc157abf3be302569ba8"
+-  integrity sha1-VYAuhYQsJru167wVer874wJWm6g=
+-
+-object.omit@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
+-  dependencies:
+-    for-own "^0.1.4"
+-    is-extendable "^0.1.1"
+-
+-on-finished@~2.3.0:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+-  dependencies:
+-    ee-first "1.1.1"
+-
+-on-headers@~1.0.1, on-headers@~1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+-
+-once@^1.3.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+-  dependencies:
+-    wrappy "1"
+-
+-once@~1.3.2:
+-  version "1.3.3"
+-  resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
+-  integrity sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=
+-  dependencies:
+-    wrappy "1"
+-
+-opener@~1.4.1:
+-  version "1.4.3"
+-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+-  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
+-
+-optimist@^0.6.1, optimist@~0.6.0:
+-  version "0.6.1"
+-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+-  dependencies:
+-    minimist "~0.0.1"
+-    wordwrap "~0.0.2"
+-
+-options@>=0.0.5:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+-  integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
+-
+-os-homedir@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+-
+-os-locale@^1.4.0:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+-  dependencies:
+-    lcid "^1.0.0"
+-
+-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+-
+-osenv@0, osenv@^0.1.0, osenv@^0.1.4, osenv@~0.1.3:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+-  dependencies:
+-    os-homedir "^1.0.0"
+-    os-tmpdir "^1.0.0"
+-
+-osenv@0.0.3:
+-  version "0.0.3"
+-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.0.3.tgz#cd6ad8ddb290915ad9e22765576025d411f29cb6"
+-  integrity sha1-zWrY3bKQkVrZ4idlV2Al1BHynLY=
+-
+-output-file-sync@^1.1.0:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
+-  integrity sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=
+-  dependencies:
+-    graceful-fs "^4.1.4"
+-    mkdirp "^0.5.1"
+-    object-assign "^4.1.0"
+-
+-p-limit@^2.0.0:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+-  dependencies:
+-    p-try "^2.0.0"
+-
+-p-locate@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+-  dependencies:
+-    p-limit "^2.0.0"
+-
+-p-try@^2.0.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+-
+-parse-glob@^3.0.4:
+-  version "3.0.4"
+-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
+-  dependencies:
+-    glob-base "^0.3.0"
+-    is-dotfile "^1.0.0"
+-    is-extglob "^1.0.0"
+-    is-glob "^2.0.0"
+-
+-parse-json@^2.2.0:
+-  version "2.2.0"
+-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+-  dependencies:
+-    error-ex "^1.2.0"
+-
+-parsejson@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.1.tgz#9b10c6c0d825ab589e685153826de0a3ba278bcc"
+-  integrity sha1-mxDGwNglq1ieaFFTgm3go7oni8w=
+-  dependencies:
+-    better-assert "~1.0.0"
+-
+-parseqs@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.2.tgz#9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"
+-  integrity sha1-nf5wss3aw4i95PNbHyQPpYrb5sc=
+-  dependencies:
+-    better-assert "~1.0.0"
+-
+-parseuri@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.2.tgz#db41878f2d6964718be870b3140973d8093be156"
+-  integrity sha1-20GHjy1pZHGL6HCzFAlz2Ak74VY=
+-  dependencies:
+-    better-assert "~1.0.0"
+-
+-parseuri@0.0.4:
+-  version "0.0.4"
+-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.4.tgz#806582a39887e1ea18dd5e2fe0e01902268e9350"
+-  integrity sha1-gGWCo5iH4eoY3V4v4OAZAiaOk1A=
+-  dependencies:
+-    better-assert "~1.0.0"
+-
+-parseurl@~1.3.0, parseurl@~1.3.3:
+-  version "1.3.3"
+-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+-
+-path-array@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271"
+-  integrity sha1-fi8PNfB6IBUSK4aLfqwOssT+wnE=
+-  dependencies:
+-    array-index "^1.0.0"
+-
+-path-exists@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081"
+-  integrity sha1-1aiZjrce83p0w06w2eum6HjuoIE=
+-
+-path-exists@^2.0.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+-  dependencies:
+-    pinkie-promise "^2.0.0"
+-
+-path-exists@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+-
+-path-is-absolute@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+-
+-path-is-inside@^1.0.1, path-is-inside@~1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+-
+-path-parse@^1.0.6:
+-  version "1.0.6"
+-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+-
+-path-posix@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
+-  integrity sha1-BrJhE/Vr6rBCVFojv6iAA8ysJg8=
+-
+-path-root-regex@^0.1.0:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+-
+-path-root@^0.1.1:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+-  dependencies:
+-    path-root-regex "^0.1.0"
+-
+-path-to-regexp@0.1.7:
+-  version "0.1.7"
+-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+-
+-path-type@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    pify "^2.0.0"
+-    pinkie-promise "^2.0.0"
+-
+-pend@~1.2.0:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+-
+-performance-now@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+-  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
+-
+-performance-now@^2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+-
+-phantomjs-prebuilt@2.1.13:
+-  version "2.1.13"
+-  resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz#66556ad9e965d893ca5a7dc9e763df7e8697f76d"
+-  integrity sha1-ZlVq2ell2JPKWn3J52PffoaX920=
+-  dependencies:
+-    es6-promise "~4.0.3"
+-    extract-zip "~1.5.0"
+-    fs-extra "~0.30.0"
+-    hasha "~2.2.0"
+-    kew "~0.7.0"
+-    progress "~1.1.8"
+-    request "~2.74.0"
+-    request-progress "~2.0.1"
+-    which "~1.2.10"
+-
+-pify@^2.0.0:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+-
+-pinkie-promise@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+-  dependencies:
+-    pinkie "^2.0.0"
+-
+-pinkie@^2.0.0:
+-  version "2.0.4"
+-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+-
+-pleasant-progress@^1.0.2:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/pleasant-progress/-/pleasant-progress-1.1.0.tgz#c99cd730a2e50cffdd3badff845fc4d5282e266b"
+-  integrity sha1-yZzXMKLlDP/dO63/hF/E1SguJms=
+-
+-portfinder@^0.4.0:
+-  version "0.4.0"
+-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.4.0.tgz#a3ffadffafe4fb98e0601a85eda27c27ce84ca1e"
+-  integrity sha1-o/+t/6/k+5jgYBqF7aJ8J86Eyh4=
+-  dependencies:
+-    async "0.9.0"
+-    mkdirp "0.5.x"
+-
+-preserve@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+-
+-printf@^0.2.3:
+-  version "0.2.5"
+-  resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f"
+-  integrity sha1-xDjKLKM+OSdnHbSracDlL5NqTw8=
+-
+-private@^0.1.6, private@~0.1.5:
+-  version "0.1.8"
+-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
+-
+-process-nextick-args@~1.0.6:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
+-
+-process-nextick-args@~2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+-
+-process-relative-require@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
+-  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+-  dependencies:
+-    node-modules-path "^1.0.0"
+-
+-progress@~1.1.8:
+-  version "1.1.8"
+-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
+-
+-promise-map-series@^0.2.1:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
+-  integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
+-  dependencies:
+-    rsvp "^3.0.14"
+-
+-promise@^7.1.1:
+-  version "7.3.1"
+-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+-  dependencies:
+-    asap "~2.0.3"
+-
+-promzard@^0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+-  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
+-  dependencies:
+-    read "1"
+-
+-proto-list@~1.2.1:
+-  version "1.2.4"
+-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+-
+-proxy-addr@~2.0.5:
+-  version "2.0.5"
+-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+-  dependencies:
+-    forwarded "~0.1.2"
+-    ipaddr.js "1.9.0"
+-
+-prr@~1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+-
+-pseudomap@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+-
+-psl@^1.1.28:
+-  version "1.8.0"
+-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+-
+-punycode@^1.4.1:
+-  version "1.4.1"
+-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+-
+-punycode@^2.1.0, punycode@^2.1.1:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+-
+-q@^1.1.2:
+-  version "1.5.1"
+-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+-
+-qs@5.2.0:
+-  version "5.2.0"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.0.tgz#a9f31142af468cb72b25b30136ba2456834916be"
+-  integrity sha1-qfMRQq9GjLcrJbMBNrokVoNJFr4=
+-
+-qs@6.7.0:
+-  version "6.7.0"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+-
+-qs@~5.1.0:
+-  version "5.1.0"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-5.1.0.tgz#4d932e5c7ea411cca76a312d39a606200fd50cd9"
+-  integrity sha1-TZMuXH6kEcynajEtOaYGIA/VDNk=
+-
+-qs@~5.2.0:
+-  version "5.2.1"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.1.tgz#801fee030e0b9450d6385adc48a4cc55b44aedfc"
+-  integrity sha1-gB/uAw4LlFDWOFrcSKTMVbRK7fw=
+-
+-qs@~6.2.0:
+-  version "6.2.3"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
+-
+-qs@~6.4.0:
+-  version "6.4.0"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+-  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
+-
+-qs@~6.5.2:
+-  version "6.5.2"
+-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+-
+-quick-temp@0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.3.tgz#48c1886114691d74b96003de9322a7c992022af4"
+-  integrity sha1-SMGIYRRpHXS5YAPekyKnyZICKvQ=
+-  dependencies:
+-    mktemp "~0.3.4"
+-    rimraf "~2.2.6"
+-    underscore.string "~2.3.3"
+-
+-quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5:
+-  version "0.1.8"
+-  resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
+-  integrity sha1-urAqJCq4+w3XWKPJd2sy+aXZRAg=
+-  dependencies:
+-    mktemp "~0.4.0"
+-    rimraf "^2.5.4"
+-    underscore.string "~3.3.4"
+-
+-qunitjs@^1.20.0:
+-  version "1.23.1"
+-  resolved "https://registry.yarnpkg.com/qunitjs/-/qunitjs-1.23.1.tgz#1971cf97ac9be01a64d2315508d2e48e6fd4e719"
+-  integrity sha1-GXHPl6yb4Bpk0jFVCNLkjm/U5xk=
+-
+-randomatic@^3.0.0:
+-  version "3.1.1"
+-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+-  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
+-  dependencies:
+-    is-number "^4.0.0"
+-    kind-of "^6.0.0"
+-    math-random "^1.0.1"
+-
+-range-parser@~1.2.1:
+-  version "1.2.1"
+-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+-
+-raw-body@2.4.0:
+-  version "2.4.0"
+-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+-  dependencies:
+-    bytes "3.1.0"
+-    http-errors "1.7.2"
+-    iconv-lite "0.4.24"
+-    unpipe "1.0.0"
+-
+-raw-body@~2.1.5:
+-  version "2.1.7"
+-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.1.7.tgz#adfeace2e4fb3098058014d08c072dcc59758774"
+-  integrity sha1-rf6s4uT7MJgFgBTQjActzFl1h3Q=
+-  dependencies:
+-    bytes "2.4.0"
+-    iconv-lite "0.4.13"
+-    unpipe "1.0.0"
+-
+-read-installed@~4.0.3:
+-  version "4.0.3"
+-  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+-  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
+-  dependencies:
+-    debuglog "^1.0.1"
+-    read-package-json "^2.0.0"
+-    readdir-scoped-modules "^1.0.0"
+-    semver "2 || 3 || 4 || 5"
+-    slide "~1.1.3"
+-    util-extend "^1.0.1"
+-  optionalDependencies:
+-    graceful-fs "^4.1.2"
+-
+-"read-package-json@1 || 2", read-package-json@^2.0.0:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1"
+-  integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==
+-  dependencies:
+-    glob "^7.1.1"
+-    json-parse-better-errors "^1.0.1"
+-    normalize-package-data "^2.0.0"
+-    npm-normalize-package-bin "^1.0.0"
+-  optionalDependencies:
+-    graceful-fs "^4.1.2"
+-
+-read-package-json@~2.0.2:
+-  version "2.0.13"
+-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+-  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
+-  dependencies:
+-    glob "^7.1.1"
+-    json-parse-better-errors "^1.0.1"
+-    normalize-package-data "^2.0.0"
+-    slash "^1.0.0"
+-  optionalDependencies:
+-    graceful-fs "^4.1.2"
+-
+-read-pkg-up@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+-  dependencies:
+-    find-up "^1.0.0"
+-    read-pkg "^1.0.0"
+-
+-read-pkg@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+-  dependencies:
+-    load-json-file "^1.0.0"
+-    normalize-package-data "^2.3.2"
+-    path-type "^1.0.0"
+-
+-read@1, read@~1.0.1, read@~1.0.7:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
+-  dependencies:
+-    mute-stream "~0.0.4"
+-
+-"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.2.2:
+-  version "2.3.6"
+-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+-  dependencies:
+-    core-util-is "~1.0.0"
+-    inherits "~2.0.3"
+-    isarray "~1.0.0"
+-    process-nextick-args "~2.0.0"
+-    safe-buffer "~5.1.1"
+-    string_decoder "~1.1.1"
+-    util-deprecate "~1.0.1"
+-
+-readable-stream@1.1:
+-  version "1.1.13"
+-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
+-  integrity sha1-9u73ZPUUyJ4rniMUanW6EGdW0j4=
+-  dependencies:
+-    core-util-is "~1.0.0"
+-    inherits "~2.0.1"
+-    isarray "0.0.1"
+-    string_decoder "~0.10.x"
+-
+-readable-stream@^2.0.1, readable-stream@^2.0.6:
+-  version "2.3.7"
+-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+-  dependencies:
+-    core-util-is "~1.0.0"
+-    inherits "~2.0.3"
+-    isarray "~1.0.0"
+-    process-nextick-args "~2.0.0"
+-    safe-buffer "~5.1.1"
+-    string_decoder "~1.1.1"
+-    util-deprecate "~1.0.1"
+-
+-readable-stream@~1.1.13:
+-  version "1.1.14"
+-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+-  dependencies:
+-    core-util-is "~1.0.0"
+-    inherits "~2.0.1"
+-    isarray "0.0.1"
+-    string_decoder "~0.10.x"
+-
+-readable-stream@~2.0.0, readable-stream@~2.0.5:
+-  version "2.0.6"
+-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+-  dependencies:
+-    core-util-is "~1.0.0"
+-    inherits "~2.0.1"
+-    isarray "~1.0.0"
+-    process-nextick-args "~1.0.6"
+-    string_decoder "~0.10.x"
+-    util-deprecate "~1.0.1"
+-
+-readdir-scoped-modules@^1.0.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+-  dependencies:
+-    debuglog "^1.0.1"
+-    dezalgo "^1.0.0"
+-    graceful-fs "^4.1.2"
+-    once "^1.3.0"
+-
+-readline2@0.1.1, readline2@~0.1.0:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-0.1.1.tgz#99443ba6e83b830ef3051bfd7dc241a82728d568"
+-  integrity sha1-mUQ7pug7gw7zBRv9fcJBqCco1Wg=
+-  dependencies:
+-    mute-stream "0.0.4"
+-    strip-ansi "^2.0.1"
+-
+-realize-package-specifier@~3.0.1:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz#d0def882952b8de3f67eba5e91199661271f41f4"
+-  integrity sha1-0N74gpUrjeP2frpekRmWYScfQfQ=
+-  dependencies:
+-    dezalgo "^1.0.1"
+-    npm-package-arg "^4.1.1"
+-
+-recast@0.10.33:
+-  version "0.10.33"
+-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
+-  integrity sha1-lCgI96oBbx+nFCxGHX5XBKqo1pc=
+-  dependencies:
+-    ast-types "0.8.12"
+-    esprima-fb "~15001.1001.0-dev-harmony-fb"
+-    private "~0.1.5"
+-    source-map "~0.5.0"
+-
+-recast@^0.10.10:
+-  version "0.10.43"
+-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
+-  integrity sha1-uV1Q9tYHYaX2JS4V2AZ4FoSRzn8=
+-  dependencies:
+-    ast-types "0.8.15"
+-    esprima-fb "~15001.1001.0-dev-harmony-fb"
+-    private "~0.1.5"
+-    source-map "~0.5.0"
+-
+-recast@^0.11.17, recast@^0.11.3:
+-  version "0.11.23"
+-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+-  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
+-  dependencies:
+-    ast-types "0.9.6"
+-    esprima "~3.1.0"
+-    private "~0.1.5"
+-    source-map "~0.5.0"
+-
+-redent@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+-  dependencies:
+-    indent-string "^2.1.0"
+-    strip-indent "^1.0.1"
+-
+-redeyed@~0.5.0:
+-  version "0.5.0"
+-  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1"
+-  integrity sha1-erAA5g7jh1rBFdKe2zLBQDxsJdE=
+-  dependencies:
+-    esprima-fb "~12001.1.0-dev-harmony-fb"
+-
+-regenerate@^1.2.1:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+-
+-regenerator@0.8.40:
+-  version "0.8.40"
+-  resolved "https://registry.yarnpkg.com/regenerator/-/regenerator-0.8.40.tgz#a0e457c58ebdbae575c9f8cd75127e93756435d8"
+-  integrity sha1-oORXxY69uuV1yfjNdRJ+k3VkNdg=
+-  dependencies:
+-    commoner "~0.10.3"
+-    defs "~1.1.0"
+-    esprima-fb "~15001.1001.0-dev-harmony-fb"
+-    private "~0.1.5"
+-    recast "0.10.33"
+-    through "~2.3.8"
+-
+-regex-cache@^0.4.2:
+-  version "0.4.4"
+-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+-  dependencies:
+-    is-equal-shallow "^0.1.3"
+-
+-regexpu@^1.3.0:
+-  version "1.3.0"
+-  resolved "https://registry.yarnpkg.com/regexpu/-/regexpu-1.3.0.tgz#e534dc991a9e5846050c98de6d7dd4a55c9ea16d"
+-  integrity sha1-5TTcmRqeWEYFDJjebX3UpVyeoW0=
+-  dependencies:
+-    esprima "^2.6.0"
+-    recast "^0.10.10"
+-    regenerate "^1.2.1"
+-    regjsgen "^0.2.0"
+-    regjsparser "^0.1.4"
+-
+-regjsgen@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+-
+-regjsparser@^0.1.4:
+-  version "0.1.5"
+-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+-  dependencies:
+-    jsesc "~0.5.0"
+-
+-remove-trailing-separator@^1.0.1:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+-
+-repeat-element@^1.1.2:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+-
+-repeat-string@^1.5.2:
+-  version "1.6.1"
+-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+-
+-repeating@^1.1.0, repeating@^1.1.2:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-1.1.3.tgz#3d4114218877537494f97f77f9785fab810fa4ac"
+-  integrity sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=
+-  dependencies:
+-    is-finite "^1.0.0"
+-
+-repeating@^2.0.0:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+-  dependencies:
+-    is-finite "^1.0.0"
+-
+-request-progress@~2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
+-  integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=
+-  dependencies:
+-    throttleit "^1.0.0"
+-
+-request@2, request@^2.27.0, request@^2.47.0, request@^2.87.0, request@^2.88.0:
+-  version "2.88.2"
+-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+-  dependencies:
+-    aws-sign2 "~0.7.0"
+-    aws4 "^1.8.0"
+-    caseless "~0.12.0"
+-    combined-stream "~1.0.6"
+-    extend "~3.0.2"
+-    forever-agent "~0.6.1"
+-    form-data "~2.3.2"
+-    har-validator "~5.1.3"
+-    http-signature "~1.2.0"
+-    is-typedarray "~1.0.0"
+-    isstream "~0.1.2"
+-    json-stringify-safe "~5.0.1"
+-    mime-types "~2.1.19"
+-    oauth-sign "~0.9.0"
+-    performance-now "^2.1.0"
+-    qs "~6.5.2"
+-    safe-buffer "^5.1.2"
+-    tough-cookie "~2.5.0"
+-    tunnel-agent "^0.6.0"
+-    uuid "^3.3.2"
+-
+-request@2.81.0:
+-  version "2.81.0"
+-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+-  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
+-  dependencies:
+-    aws-sign2 "~0.6.0"
+-    aws4 "^1.2.1"
+-    caseless "~0.12.0"
+-    combined-stream "~1.0.5"
+-    extend "~3.0.0"
+-    forever-agent "~0.6.1"
+-    form-data "~2.1.1"
+-    har-validator "~4.2.1"
+-    hawk "~3.1.3"
+-    http-signature "~1.1.0"
+-    is-typedarray "~1.0.0"
+-    isstream "~0.1.2"
+-    json-stringify-safe "~5.0.1"
+-    mime-types "~2.1.7"
+-    oauth-sign "~0.8.1"
+-    performance-now "^0.2.0"
+-    qs "~6.4.0"
+-    safe-buffer "^5.0.1"
+-    stringstream "~0.0.4"
+-    tough-cookie "~2.3.0"
+-    tunnel-agent "^0.6.0"
+-    uuid "^3.0.0"
+-
+-request@~2.65.0:
+-  version "2.65.0"
+-  resolved "https://registry.yarnpkg.com/request/-/request-2.65.0.tgz#cc1a3bc72b96254734fc34296da322f9486ddeba"
+-  integrity sha1-zBo7xyuWJUc0/DQpbaMi+Uht3ro=
+-  dependencies:
+-    aws-sign2 "~0.6.0"
+-    bl "~1.0.0"
+-    caseless "~0.11.0"
+-    combined-stream "~1.0.5"
+-    extend "~3.0.0"
+-    forever-agent "~0.6.1"
+-    form-data "~1.0.0-rc3"
+-    har-validator "~2.0.2"
+-    hawk "~3.1.0"
+-    http-signature "~0.11.0"
+-    isstream "~0.1.2"
+-    json-stringify-safe "~5.0.1"
+-    mime-types "~2.1.7"
+-    node-uuid "~1.4.3"
+-    oauth-sign "~0.8.0"
+-    qs "~5.2.0"
+-    stringstream "~0.0.4"
+-    tough-cookie "~2.2.0"
+-    tunnel-agent "~0.4.1"
+-
+-request@~2.74.0:
+-  version "2.74.0"
+-  resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
+-  integrity sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=
+-  dependencies:
+-    aws-sign2 "~0.6.0"
+-    aws4 "^1.2.1"
+-    bl "~1.1.2"
+-    caseless "~0.11.0"
+-    combined-stream "~1.0.5"
+-    extend "~3.0.0"
+-    forever-agent "~0.6.1"
+-    form-data "~1.0.0-rc4"
+-    har-validator "~2.0.6"
+-    hawk "~3.1.3"
+-    http-signature "~1.1.0"
+-    is-typedarray "~1.0.0"
+-    isstream "~0.1.2"
+-    json-stringify-safe "~5.0.1"
+-    mime-types "~2.1.7"
+-    node-uuid "~1.4.7"
+-    oauth-sign "~0.8.1"
+-    qs "~6.2.0"
+-    stringstream "~0.0.4"
+-    tough-cookie "~2.3.0"
+-    tunnel-agent "~0.4.1"
+-
+-require-directory@^2.1.1:
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+-
+-require-main-filename@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+-
+-requires-port@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+-
+-resolve-package-path@^1.0.11:
+-  version "1.2.7"
+-  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
+-  integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
+-  dependencies:
+-    path-root "^0.1.1"
+-    resolve "^1.10.0"
+-
+-resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.8.1:
+-  version "1.14.1"
+-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff"
+-  integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==
+-  dependencies:
+-    path-parse "^1.0.6"
+-
+-resolve@^1.10.0:
+-  version "1.20.0"
+-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+-  dependencies:
+-    is-core-module "^2.2.0"
+-    path-parse "^1.0.6"
+-
+-retry@^0.8.0, retry@~0.8.0:
+-  version "0.8.0"
+-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.8.0.tgz#2367628dc0edb247b1eab649dc53ac8628ac2d5f"
+-  integrity sha1-I2dijcDtskex6rZJ3FOshiisLV8=
+-
+-right-align@^0.1.1:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+-  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
+-  dependencies:
+-    align-text "^0.1.1"
+-
+-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1:
+-  version "2.7.1"
+-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+-  dependencies:
+-    glob "^7.1.3"
+-
+-rimraf@~2.2.6:
+-  version "2.2.8"
+-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+-  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
+-
+-rimraf@~2.4.3:
+-  version "2.4.5"
+-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+-  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+-  dependencies:
+-    glob "^6.0.1"
+-
+-rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.5.0:
+-  version "3.6.2"
+-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+-
+-rsvp@^4.8.3:
+-  version "4.8.5"
+-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+-
+-rsvp@~3.0.6:
+-  version "3.0.21"
+-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"
+-  integrity sha1-ScWI/hjvKTvNCrn05nVuasQzNZ8=
+-
+-rsvp@~3.2.1:
+-  version "3.2.1"
+-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
+-  integrity sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=
+-
+-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+-  version "5.1.2"
+-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+-
+-safe-buffer@>=5.1.0:
+-  version "5.2.0"
+-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+-
+-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
+-  version "5.2.1"
+-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+-
+-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+-  version "2.1.2"
+-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+-
+-sane@^1.1.1:
+-  version "1.7.0"
+-  resolved "https://registry.yarnpkg.com/sane/-/sane-1.7.0.tgz#b3579bccb45c94cf20355cc81124990dfd346e30"
+-  integrity sha1-s1ebzLRclM8gNVzIESSZDf00bjA=
+-  dependencies:
+-    anymatch "^1.3.0"
+-    exec-sh "^0.2.0"
+-    fb-watchman "^2.0.0"
+-    minimatch "^3.0.2"
+-    minimist "^1.1.1"
+-    walker "~1.0.5"
+-    watch "~0.10.0"
+-
+-sass-graph@2.2.5:
+-  version "2.2.5"
+-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
+-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+-  dependencies:
+-    glob "^7.0.0"
+-    lodash "^4.0.0"
+-    scss-tokenizer "^0.2.3"
+-    yargs "^13.3.2"
+-
+-scss-tokenizer@^0.2.3:
+-  version "0.2.3"
+-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+-  dependencies:
+-    js-base64 "^2.1.8"
+-    source-map "^0.4.2"
+-
+-select2@4.0.0:
+-  version "4.0.0"
+-  resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.0.tgz#81b461456c77148e7e422eb63bd71ca0b254fce7"
+-  integrity sha1-gbRhRWx3FI5+Qi62O9ccoLJU/Oc=
+-
+-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.3.0:
+-  version "5.7.1"
+-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+-
+-semver@^4.1.0, semver@^4.3.1, semver@^4.3.3:
+-  version "4.3.6"
+-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+-
+-semver@~5.0.3:
+-  version "5.0.3"
+-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
+-  integrity sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=
+-
+-semver@~5.3.0:
+-  version "5.3.0"
+-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+-
+-send@0.17.1:
+-  version "0.17.1"
+-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+-  dependencies:
+-    debug "2.6.9"
+-    depd "~1.1.2"
+-    destroy "~1.0.4"
+-    encodeurl "~1.0.2"
+-    escape-html "~1.0.3"
+-    etag "~1.8.1"
+-    fresh "0.5.2"
+-    http-errors "~1.7.2"
+-    mime "1.6.0"
+-    ms "2.1.1"
+-    on-finished "~2.3.0"
+-    range-parser "~1.2.1"
+-    statuses "~1.5.0"
+-
+-serve-static@1.14.1:
+-  version "1.14.1"
+-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+-  dependencies:
+-    encodeurl "~1.0.2"
+-    escape-html "~1.0.3"
+-    parseurl "~1.3.3"
+-    send "0.17.1"
+-
+-set-blocking@^2.0.0, set-blocking@~2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+-
+-setprototypeof@1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+-
+-sha@~2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae"
+-  integrity sha1-YDCCL70smCOUn49y7WQR7lzyWq4=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    readable-stream "^2.0.2"
+-
+-shebang-regex@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+-
+-shelljs@0.3.x:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
+-  integrity sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=
+-
+-sigmund@~1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+-  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+-
+-signal-exit@^3.0.0:
+-  version "3.0.3"
+-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+-
+-signal-exit@^3.0.2:
+-  version "3.0.2"
+-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+-
+-silent-error@^1.0.0:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
+-  integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
+-  dependencies:
+-    debug "^2.2.0"
+-
+-simple-fmt@~0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b"
+-  integrity sha1-GRv1ZqWeZTBILLJatTtKjchcOms=
+-
+-simple-is@~0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0"
+-  integrity sha1-Krt1qt453rXMgVzhDmGRFkhQuvA=
+-
+-slash@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+-
+-slide@^1.1.3, slide@^1.1.5, slide@~1.1.3, slide@~1.1.6:
+-  version "1.1.6"
+-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
+-
+-sntp@1.x.x:
+-  version "1.0.9"
+-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
+-  dependencies:
+-    hoek "2.x.x"
+-
+-socket.io-adapter@0.3.1:
+-  version "0.3.1"
+-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.3.1.tgz#df81f970b4df6493902d93e519c7b72755c3a958"
+-  integrity sha1-34H5cLTfZJOQLZPlGce3J1XDqVg=
+-  dependencies:
+-    debug "1.0.2"
+-    object-keys "1.0.1"
+-    socket.io-parser "2.2.2"
+-
+-socket.io-client-pure@1.3.12:
+-  version "1.3.12"
+-  resolved "https://registry.yarnpkg.com/socket.io-client-pure/-/socket.io-client-pure-1.3.12.tgz#613145967160830708713edfe2d9bb394c7dad22"
+-  integrity sha1-YTFFlnFggwcIcT7f4tm7OUx9rSI=
+-  dependencies:
+-    backo2 "1.0.2"
+-    component-bind "1.0.0"
+-    component-emitter "1.1.2"
+-    debug "0.7.4"
+-    engine.io-client-pure "1.5.9"
+-    has-binary "0.1.6"
+-    indexof "0.0.1"
+-    object-component "0.0.3"
+-    parseuri "0.0.2"
+-    socket.io-parser "2.2.4"
+-    to-array "0.1.3"
+-
+-socket.io-parser@2.2.2:
+-  version "2.2.2"
+-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.2.tgz#3d7af6b64497e956b7d9fe775f999716027f9417"
+-  integrity sha1-PXr2tkSX6Va32f53X5mXFgJ/lBc=
+-  dependencies:
+-    benchmark "1.0.0"
+-    component-emitter "1.1.2"
+-    debug "0.7.4"
+-    isarray "0.0.1"
+-    json3 "3.2.6"
+-
+-socket.io-parser@2.2.4:
+-  version "2.2.4"
+-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.4.tgz#f9ce19bf1909608ceb15d97721e23bfdd1e7cf65"
+-  integrity sha1-+c4ZvxkJYIzrFdl3IeI7/dHnz2U=
+-  dependencies:
+-    benchmark "1.0.0"
+-    component-emitter "1.1.2"
+-    debug "0.7.4"
+-    isarray "0.0.1"
+-    json3 "3.2.6"
+-
+-socket.io-pure@^1.3.11:
+-  version "1.3.12"
+-  resolved "https://registry.yarnpkg.com/socket.io-pure/-/socket.io-pure-1.3.12.tgz#04204d303f358650b5423f72b190dc0275d30e30"
+-  integrity sha1-BCBNMD81hlC1Qj9ysZDcAnXTDjA=
+-  dependencies:
+-    debug "2.1.0"
+-    engine.io-pure "1.5.9"
+-    has-binary-data "0.1.3"
+-    socket.io-adapter "0.3.1"
+-    socket.io-client-pure "1.3.12"
+-    socket.io-parser "2.2.4"
+-
+-sorted-object@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-1.0.0.tgz#5d1f4f9c1fb2cd48965967304e212eb44cfb6d05"
+-  integrity sha1-XR9PnB+yzUiWWWcwTiEutEz7bQU=
+-
+-source-map-support@^0.2.10:
+-  version "0.2.10"
+-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.2.10.tgz#ea5a3900a1c1cb25096a0ae8cc5c2b4b10ded3dc"
+-  integrity sha1-6lo5AKHByyUJagrozFwrSxDe09w=
+-  dependencies:
+-    source-map "0.1.32"
+-
+-source-map-url@^0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+-  integrity sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=
+-
+-source-map@0.1.32:
+-  version "0.1.32"
+-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
+-  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
+-  dependencies:
+-    amdefine ">=0.0.4"
+-
+-source-map@^0.1.40:
+-  version "0.1.43"
+-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+-  dependencies:
+-    amdefine ">=0.0.4"
+-
+-source-map@^0.4.2:
+-  version "0.4.4"
+-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+-  dependencies:
+-    amdefine ">=0.0.4"
+-
+-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1:
+-  version "0.5.7"
+-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+-
+-spawnback@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/spawnback/-/spawnback-1.0.0.tgz#f73662f7e54d95367eca74d6426c677dd7ea686f"
+-  integrity sha1-9zZi9+VNlTZ+ynTWQmxnfdfqaG8=
+-
+-spdx-correct@^3.0.0:
+-  version "3.1.1"
+-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+-  dependencies:
+-    spdx-expression-parse "^3.0.0"
+-    spdx-license-ids "^3.0.0"
+-
+-spdx-exceptions@^2.1.0:
+-  version "2.3.0"
+-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+-
+-spdx-expression-parse@^3.0.0:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+-  dependencies:
+-    spdx-exceptions "^2.1.0"
+-    spdx-license-ids "^3.0.0"
+-
+-spdx-license-ids@^1.0.0:
+-  version "1.2.2"
+-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+-  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
+-
+-spdx-license-ids@^3.0.0:
+-  version "3.0.7"
+-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+-
+-spdx@~0.4.1:
+-  version "0.4.3"
+-  resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.4.3.tgz#ab373c3fcf7b84ffd8fdeb0592d24ff0d14812e4"
+-  integrity sha1-qzc8P897hP/Y/esFktJP8NFIEuQ=
+-  dependencies:
+-    spdx-license-ids "^1.0.0"
+-
+-sprintf-js@^1.0.3:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+-
+-sprintf-js@~1.0.2:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+-
+-sri-toolbox@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e"
+-  integrity sha1-p/6lw/3lXmdc8cjAbz67XCk1g14=
+-
+-sshpk@^1.7.0:
+-  version "1.16.1"
+-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+-  dependencies:
+-    asn1 "~0.2.3"
+-    assert-plus "^1.0.0"
+-    bcrypt-pbkdf "^1.0.0"
+-    dashdash "^1.12.0"
+-    ecc-jsbn "~0.1.1"
+-    getpass "^0.1.1"
+-    jsbn "~0.1.0"
+-    safer-buffer "^2.0.2"
+-    tweetnacl "~0.14.0"
+-
+-stable@~0.1.3:
+-  version "0.1.8"
+-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
+-
+-statuses@1, "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+-  version "1.5.0"
+-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+-
+-stdout-stream@^1.4.0:
+-  version "1.4.1"
+-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
+-  dependencies:
+-    readable-stream "^2.0.1"
+-
+-string-width@^1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+-  dependencies:
+-    code-point-at "^1.0.0"
+-    is-fullwidth-code-point "^1.0.0"
+-    strip-ansi "^3.0.0"
+-
+-"string-width@^1.0.2 || 2":
+-  version "2.1.1"
+-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+-  dependencies:
+-    is-fullwidth-code-point "^2.0.0"
+-    strip-ansi "^4.0.0"
+-
+-string-width@^3.0.0, string-width@^3.1.0:
+-  version "3.1.0"
+-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+-  dependencies:
+-    emoji-regex "^7.0.1"
+-    is-fullwidth-code-point "^2.0.0"
+-    strip-ansi "^5.1.0"
+-
+-string.prototype.endswith@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/string.prototype.endswith/-/string.prototype.endswith-0.2.0.tgz#a19c20dee51a98777e9a47e10f09be393b9bba75"
+-  integrity sha1-oZwg3uUamHd+mkfhDwm+OTubunU=
+-
+-string_decoder@~0.10.x:
+-  version "0.10.31"
+-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+-
+-string_decoder@~1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+-  dependencies:
+-    safe-buffer "~5.1.0"
+-
+-stringmap@~0.2.2:
+-  version "0.2.2"
+-  resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
+-  integrity sha1-VWwTeyWPlCuHdvWy71gqoGnX0bE=
+-
+-stringset@~0.2.1:
+-  version "0.2.1"
+-  resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5"
+-  integrity sha1-7yWcTjSTRDd/zRyRPdLoSMnAQrU=
+-
+-stringstream@~0.0.4:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
+-
+-strip-ansi@^0.3.0:
+-  version "0.3.0"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+-  integrity sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=
+-  dependencies:
+-    ansi-regex "^0.2.1"
+-
+-strip-ansi@^2.0.1:
+-  version "2.0.1"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-2.0.1.tgz#df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"
+-  integrity sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=
+-  dependencies:
+-    ansi-regex "^1.0.0"
+-
+-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+-  version "3.0.1"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+-  dependencies:
+-    ansi-regex "^2.0.0"
+-
+-strip-ansi@^4.0.0:
+-  version "4.0.0"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+-  dependencies:
+-    ansi-regex "^3.0.0"
+-
+-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+-  version "5.2.0"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+-  dependencies:
+-    ansi-regex "^4.1.0"
+-
+-strip-ansi@~0.1.0:
+-  version "0.1.1"
+-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+-  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+-
+-strip-bom@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+-  dependencies:
+-    is-utf8 "^0.2.0"
+-
+-strip-indent@^1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+-  dependencies:
+-    get-stdin "^4.0.1"
+-
+-strip-json-comments@1.0.x:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
+-  integrity sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=
+-
+-styled_string@0.0.1:
+-  version "0.0.1"
+-  resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
+-  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+-
+-supports-color@^0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+-  integrity sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=
+-
+-supports-color@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+-
+-supports-color@^5.3.0:
+-  version "5.5.0"
+-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+-  dependencies:
+-    has-flag "^3.0.0"
+-
+-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
+-  integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
+-
+-tap-parser@^1.1.3:
+-  version "1.3.2"
+-  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.3.2.tgz#120c5089c88c3c8a793ef288867de321e18f8c22"
+-  integrity sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI=
+-  dependencies:
+-    events-to-array "^1.0.1"
+-    inherits "~2.0.1"
+-    js-yaml "^3.2.7"
+-  optionalDependencies:
+-    readable-stream "^2"
+-
+-tar@^1.0.0:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/tar/-/tar-1.0.3.tgz#15bcdab244fa4add44e4244a0176edb8aa9a2b44"
+-  integrity sha1-FbzaskT6St1E5CRKAXbtuKqaK0Q=
+-  dependencies:
+-    block-stream "*"
+-    fstream "^1.0.2"
+-    inherits "2"
+-
+-tar@^2.0.0, tar@~2.2.1:
+-  version "2.2.2"
+-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
+-  dependencies:
+-    block-stream "*"
+-    fstream "^1.0.12"
+-    inherits "2"
+-
+-temp@0.8.1:
+-  version "0.8.1"
+-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.1.tgz#4b7b4ffde85bb09f2dd6ba6cc43b44213c94fd3a"
+-  integrity sha1-S3tP/ehbsJ8t1rpsxDtEITyU/To=
+-  dependencies:
+-    rimraf "~2.2.6"
+-
+-testem@0.9.11:
+-  version "0.9.11"
+-  resolved "https://registry.yarnpkg.com/testem/-/testem-0.9.11.tgz#3e6ba35e9e1b520c4288cd0e1a9611cb068e62f7"
+-  integrity sha1-PmujXp4bUgxCiM0OGpYRywaOYvc=
+-  dependencies:
+-    async "^1.0.0"
+-    backbone "^1.1.2"
+-    charm "^1.0.0"
+-    commander "^2.6.0"
+-    consolidate "^0.13.1"
+-    cross-spawn-async "^2.0.0"
+-    did_it_work "0.0.6"
+-    express "^4.10.7"
+-    fileset "^0.2.1"
+-    fireworm "^0.6.6"
+-    growl "^1.8.1"
+-    http-proxy "^1.8.1"
+-    js-yaml "^3.2.5"
+-    mkdirp "^0.5.0"
+-    mustache "^2.0.0"
+-    npmlog "^1.0.0"
+-    printf "^0.2.3"
+-    rimraf "^2.2.8"
+-    socket.io-pure "^1.3.11"
+-    styled_string "0.0.1"
+-    tap-parser "^1.1.3"
+-    xmldom "^0.1.19"
+-
+-text-table@~0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+-
+-"textextensions@1 || 2":
+-  version "2.6.0"
+-  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
+-  integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
+-
+-throttleit@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
+-  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
+-
+-through@^2.3.6, through@~2.3.4, through@~2.3.8:
+-  version "2.3.8"
+-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+-
+-timers-ext@0.1:
+-  version "0.1.7"
+-  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+-  integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
+-  dependencies:
+-    es5-ext "~0.10.46"
+-    next-tick "1"
+-
+-tiny-lr@0.2.0:
+-  version "0.2.0"
+-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-0.2.0.tgz#f2514ec0018ef54432efac73c4655129813dd570"
+-  integrity sha1-8lFOwAGO9UQy76xzxGVRKYE91XA=
+-  dependencies:
+-    body-parser "~1.14.0"
+-    debug "~2.2.0"
+-    faye-websocket "~0.10.0"
+-    livereload-js "^2.2.0"
+-    parseurl "~1.3.0"
+-    qs "~5.1.0"
+-
+-tmp@0.0.28:
+-  version "0.0.28"
+-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
+-  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+-  dependencies:
+-    os-tmpdir "~1.0.1"
+-
+-tmpl@1.0.x:
+-  version "1.0.4"
+-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+-
+-to-array@0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.3.tgz#d45dadc6363417f60f28474fea50ecddbb4f4991"
+-  integrity sha1-1F2txjY0F/YPKEdP6lDs3btPSZE=
+-
+-to-fast-properties@^1.0.0:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+-
+-toidentifier@1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+-
+-tough-cookie@~2.2.0:
+-  version "2.2.2"
+-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.2.2.tgz#c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"
+-  integrity sha1-yDoYMPTl7wuT7yo0iOck+N4Basc=
+-
+-tough-cookie@~2.3.0:
+-  version "2.3.4"
+-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
+-  dependencies:
+-    punycode "^1.4.1"
+-
+-tough-cookie@~2.5.0:
+-  version "2.5.0"
+-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+-  dependencies:
+-    psl "^1.1.28"
+-    punycode "^2.1.1"
+-
+-tree-sync@^1.2.2:
+-  version "1.4.0"
+-  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
+-  integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
+-  dependencies:
+-    debug "^2.2.0"
+-    fs-tree-diff "^0.5.6"
+-    mkdirp "^0.5.1"
+-    quick-temp "^0.1.5"
+-    walk-sync "^0.3.3"
+-
+-trim-newlines@^1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
+-
+-trim-right@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
+-
+-"true-case-path@^1.0.2":
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
+-  dependencies:
+-    glob "^7.1.2"
+-
+-try-resolve@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/try-resolve/-/try-resolve-1.0.1.tgz#cfde6fabd72d63e5797cfaab873abbe8e700e912"
+-  integrity sha1-z95vq9ctY+V5fPqrhzq76OcA6RI=
+-
+-tryor@~0.1.2:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
+-  integrity sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=
+-
+-tunnel-agent@^0.6.0:
+-  version "0.6.0"
+-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+-  dependencies:
+-    safe-buffer "^5.0.1"
+-
+-tunnel-agent@~0.4.1:
+-  version "0.4.3"
+-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
+-
+-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+-  version "0.14.5"
+-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+-
+-type-is@~1.6.10, type-is@~1.6.17, type-is@~1.6.18:
+-  version "1.6.18"
+-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+-  dependencies:
+-    media-typer "0.3.0"
+-    mime-types "~2.1.24"
+-
+-type@^1.0.1:
+-  version "1.2.0"
+-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+-
+-type@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
+-  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+-
+-typedarray@^0.0.6, typedarray@~0.0.5:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+-
+-uc.micro@^1.0.0, uc.micro@^1.0.1:
+-  version "1.0.6"
+-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+-
+-uglify-js@^2.6, uglify-js@^2.7.0:
+-  version "2.8.29"
+-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+-  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+-  dependencies:
+-    source-map "~0.5.1"
+-    yargs "~3.10.0"
+-  optionalDependencies:
+-    uglify-to-browserify "~1.0.0"
+-
+-uglify-to-browserify@~1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+-  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+-
+-uid-number@0.0.6:
+-  version "0.0.6"
+-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+-  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
+-
+-ultron@1.0.x:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+-  integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=
+-
+-umask@~1.1.0:
+-  version "1.1.0"
+-  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+-  integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
+-
+-underscore.string@~2.3.3:
+-  version "2.3.3"
+-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d"
+-  integrity sha1-ccCL9rQosRM/N+ePo6Icgvcymw0=
+-
+-underscore.string@~3.3.4:
+-  version "3.3.5"
+-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
+-  integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
+-  dependencies:
+-    sprintf-js "^1.0.3"
+-    util-deprecate "^1.0.2"
+-
+-underscore@>=1.8.3:
+-  version "1.13.1"
+-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
+-  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
+-
+-universalify@^0.1.0:
+-  version "0.1.2"
+-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+-
+-unpipe@1.0.0, unpipe@~1.0.0:
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+-
+-uri-js@^4.2.2:
+-  version "4.4.1"
+-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+-  dependencies:
+-    punycode "^2.1.0"
+-
+-user-home@^1.1.1:
+-  version "1.1.1"
+-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+-  integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA=
+-
+-username-sync@^1.0.2:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
+-  integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
+-
+-utf8@2.1.0:
+-  version "2.1.0"
+-  resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.0.tgz#0cfec5c8052d44a23e3aaa908104e8075f95dfd5"
+-  integrity sha1-DP7FyAUtRKI+OqqQgQToB1+V39U=
+-
+-util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+-
+-util-extend@^1.0.1:
+-  version "1.0.3"
+-  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+-  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
+-
+-utils-merge@1.0.1:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+-
+-uuid@^2.0.1:
+-  version "2.0.3"
+-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+-  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
+-
+-uuid@^3.0.0:
+-  version "3.3.3"
+-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
+-  integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
+-
+-uuid@^3.3.2:
+-  version "3.4.0"
+-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+-
+-validate-npm-package-license@^3.0.1, validate-npm-package-license@~3.0.1:
+-  version "3.0.4"
+-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+-  dependencies:
+-    spdx-correct "^3.0.0"
+-    spdx-expression-parse "^3.0.0"
+-
+-validate-npm-package-name@^3.0.0:
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+-  dependencies:
+-    builtins "^1.0.3"
+-
+-validate-npm-package-name@~2.2.2:
+-  version "2.2.2"
+-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz#f65695b22f7324442019a3c7fa39a6e7fd299085"
+-  integrity sha1-9laVsi9zJEQgGaPH+jmm5/0pkIU=
+-  dependencies:
+-    builtins "0.0.7"
+-
+-vary@~1.1.2:
+-  version "1.1.2"
+-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+-
+-verror@1.10.0:
+-  version "1.10.0"
+-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+-  dependencies:
+-    assert-plus "^1.0.0"
+-    core-util-is "1.0.2"
+-    extsprintf "^1.2.0"
+-
+-walk-sync@0.1.3, walk-sync@^0.1.3:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583"
+-  integrity sha1-igcmGgC9ps+xviXp8QD61XVG9YM=
+-
+-walk-sync@^0.2.5, walk-sync@^0.2.6:
+-  version "0.2.7"
+-  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
+-  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+-  dependencies:
+-    ensure-posix-path "^1.0.0"
+-    matcher-collection "^1.0.0"
+-
+-walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.3:
+-  version "0.3.4"
+-  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
+-  integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
+-  dependencies:
+-    ensure-posix-path "^1.0.0"
+-    matcher-collection "^1.0.0"
+-
+-walker@~1.0.5:
+-  version "1.0.7"
+-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+-  dependencies:
+-    makeerror "1.0.x"
+-
+-watch@~0.10.0:
+-  version "0.10.0"
+-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+-  integrity sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw=
+-
+-wcwidth@^1.0.0:
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+-  dependencies:
+-    defaults "^1.0.3"
+-
+-websocket-driver@>=0.5.1:
+-  version "0.7.3"
+-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+-  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
+-  dependencies:
+-    http-parser-js ">=0.4.0 <0.4.11"
+-    safe-buffer ">=5.1.0"
+-    websocket-extensions ">=0.1.1"
+-
+-websocket-extensions@>=0.1.1:
+-  version "0.1.3"
+-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+-
+-which-module@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+-
+-which@1, which@^1.2.8, which@^1.2.9:
+-  version "1.3.1"
+-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+-  dependencies:
+-    isexe "^2.0.0"
+-
+-which@~1.2.0, which@~1.2.10:
+-  version "1.2.14"
+-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+-  integrity sha1-mofEN48D6CfOyvGs31bHNsAcFOU=
+-  dependencies:
+-    isexe "^2.0.0"
+-
+-wide-align@^1.1.0:
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+-  dependencies:
+-    string-width "^1.0.2 || 2"
+-
+-window-size@0.1.0:
+-  version "0.1.0"
+-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
+-
+-window-size@^0.1.2:
+-  version "0.1.4"
+-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+-  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+-
+-wordwrap@0.0.2:
+-  version "0.0.2"
+-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+-  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
+-
+-wordwrap@~0.0.2:
+-  version "0.0.3"
+-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+-
+-workerpool@^2.3.0:
+-  version "2.3.3"
+-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-2.3.3.tgz#49a70089bd55e890d68cc836a19419451d7c81d7"
+-  integrity sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==
+-  dependencies:
+-    object-assign "4.1.1"
+-
+-wrap-ansi@^5.1.0:
+-  version "5.1.0"
+-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+-  dependencies:
+-    ansi-styles "^3.2.0"
+-    string-width "^3.0.0"
+-    strip-ansi "^5.0.0"
+-
+-wrappy@1, wrappy@~1.0.1:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+-
+-write-file-atomic@^1.1.2:
+-  version "1.3.4"
+-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+-  integrity sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=
+-  dependencies:
+-    graceful-fs "^4.1.11"
+-    imurmurhash "^0.1.4"
+-    slide "^1.1.5"
+-
+-write-file-atomic@~1.1.3:
+-  version "1.1.4"
+-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.1.4.tgz#b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b"
+-  integrity sha1-sfUtwujcDjywTRh6JfdYo4qQyjs=
+-  dependencies:
+-    graceful-fs "^4.1.2"
+-    imurmurhash "^0.1.4"
+-    slide "^1.1.5"
+-
+-ws-pure@0.8.0:
+-  version "0.8.0"
+-  resolved "https://registry.yarnpkg.com/ws-pure/-/ws-pure-0.8.0.tgz#55163abed4d4f93484c8f0e4e729b5d729d37236"
+-  integrity sha1-VRY6vtTU+TSEyPDk5ym11ynTcjY=
+-  dependencies:
+-    options ">=0.0.5"
+-    ultron "1.0.x"
+-
+-xdg-basedir@^2.0.0:
+-  version "2.0.0"
+-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2"
+-  integrity sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=
+-  dependencies:
+-    os-homedir "^1.0.0"
+-
+-xmldom@^0.1.19:
+-  version "0.1.31"
+-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+-
+-xmlhttprequest-ssl@1.5.1:
+-  version "1.5.1"
+-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67"
+-  integrity sha1-O3dB/qSoZnWXbpCNKW1ERZYfqmc=
+-
+-xtend@^4.0.0:
+-  version "4.0.2"
+-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+-
+-y18n@^3.2.0:
+-  version "3.2.2"
+-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
+-
+-y18n@^4.0.0:
+-  version "4.0.3"
+-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+-
+-yallist@^2.1.2:
+-  version "2.1.2"
+-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+-
+-yam@0.0.18:
+-  version "0.0.18"
+-  resolved "https://registry.yarnpkg.com/yam/-/yam-0.0.18.tgz#e5cab771f0fc80ca599814cb9c269cb8bff00e2c"
+-  integrity sha1-5cq3cfD8gMpZmBTLnCacuL/wDiw=
+-  dependencies:
+-    findup "^0.1.5"
+-    fs-extra "^0.16.3"
+-    lodash.merge "^3.0.2"
+-
+-yargs-parser@^13.1.2:
+-  version "13.1.2"
+-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+-  dependencies:
+-    camelcase "^5.0.0"
+-    decamelize "^1.2.0"
+-
+-yargs@^13.3.2:
+-  version "13.3.2"
+-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+-  dependencies:
+-    cliui "^5.0.0"
+-    find-up "^3.0.0"
+-    get-caller-file "^2.0.1"
+-    require-directory "^2.1.1"
+-    require-main-filename "^2.0.0"
+-    set-blocking "^2.0.0"
+-    string-width "^3.0.0"
+-    which-module "^2.0.0"
+-    y18n "^4.0.0"
+-    yargs-parser "^13.1.2"
+-
+-yargs@~3.10.0:
+-  version "3.10.0"
+-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+-  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
+-  dependencies:
+-    camelcase "^1.0.2"
+-    cliui "^2.1.0"
+-    decamelize "^1.0.0"
+-    window-size "0.1.0"
+-
+-yargs@~3.27.0:
+-  version "3.27.0"
+-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.27.0.tgz#21205469316e939131d59f2da0c6d7f98221ea40"
+-  integrity sha1-ISBUaTFuk5Ex1Z8toMbX+YIh6kA=
+-  dependencies:
+-    camelcase "^1.2.1"
+-    cliui "^2.1.0"
+-    decamelize "^1.0.0"
+-    os-locale "^1.4.0"
+-    window-size "^0.1.2"
+-    y18n "^3.2.0"
+-
+-yauzl@2.4.1:
+-  version "2.4.1"
+-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
+-  integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
+-  dependencies:
+-    fd-slicer "~1.0.1"
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 4e45c200fc3..87128835af5 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -243,7 +243,6 @@
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+     <module>hadoop-yarn-registry</module>
+-    <module>hadoop-yarn-ui</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.0/17-remove-hadoop-yarn-registry.patch b/hadoop/stackable/patches/3.4.0/17-remove-hadoop-yarn-registry.patch
new file mode 100644
index 000000000..ed3f1dced
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/17-remove-hadoop-yarn-registry.patch
@@ -0,0 +1,68 @@
+Entirely remove hadoop-yarn-registry
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../hadoop-yarn/hadoop-yarn-registry/pom.xml       |   39 --------------------
+ hadoop-yarn-project/hadoop-yarn/pom.xml            |    1 -
+ 2 files changed, 40 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
+deleted file mode 100644
+index f9fffb28ac5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/pom.xml
++++ /dev/null
+@@ -1,39 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-registry</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN Registry</name>
+-
+-  <dependencies>
+-
+-    <!-- The registry moved to Hadoop commons, this is just a stub pom. -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-registry</artifactId>
+-    </dependency>
+-
+-  </dependencies>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 87128835af5..38b7a872619 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -242,7 +242,6 @@
+     <module>hadoop-yarn-applications</module>
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+-    <module>hadoop-yarn-registry</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.0/18-remove-hadoop-yarn-applications-catalog.patch b/hadoop/stackable/patches/3.4.0/18-remove-hadoop-yarn-applications-catalog.patch
new file mode 100644
index 000000000..35891a31a
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/18-remove-hadoop-yarn-applications-catalog.patch
@@ -0,0 +1,10509 @@
+Entirely remove hadoop-yarn-applications-catalog
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-project/pom.xml                             |    7 
+ .../hadoop-yarn-applications-catalog/README.md     |   50 -
+ .../Dockerfile                                     |   37 
+ .../README.md                                      |   43 -
+ .../pom.xml                                        |  107 -
+ .../src/main/resources/jaas.config                 |    9 
+ .../src/main/resources/samples.xml                 |  135 --
+ .../src/main/scripts/entrypoint.sh                 |   80 -
+ .../src/main/scripts/setup-image.sh                |   26 
+ .../.gitignore                                     |    5 
+ .../.yarnrc                                        |    1 
+ .../README.md                                      |   51 -
+ .../dev-support/findbugs-exclude.xml               |   20 
+ .../package.json                                   |   29 
+ .../pom.xml                                        |  569 -------
+ .../yarn/appcatalog/application/AppCatalog.java    |   60 -
+ .../application/AppCatalogInitializer.java         |   54 -
+ .../application/AppCatalogSolrClient.java          |  445 ------
+ .../appcatalog/application/YarnServiceClient.java  |  196 ---
+ .../yarn/appcatalog/application/package-info.java  |   22 
+ .../controller/AppDetailsController.java           |  299 ----
+ .../appcatalog/controller/AppListController.java   |  182 --
+ .../appcatalog/controller/AppStoreController.java  |  198 ---
+ .../yarn/appcatalog/controller/package-info.java   |   22 
+ .../hadoop/yarn/appcatalog/model/AppDetails.java   |   76 -
+ .../hadoop/yarn/appcatalog/model/AppEntry.java     |   72 -
+ .../yarn/appcatalog/model/AppStoreEntry.java       |  106 -
+ .../hadoop/yarn/appcatalog/model/Application.java  |   89 -
+ .../hadoop/yarn/appcatalog/model/package-info.java |   22 
+ .../hadoop/yarn/appcatalog/utils/RandomWord.java   |  422 ------
+ .../yarn/appcatalog/utils/WordLengthException.java |   29 
+ .../hadoop/yarn/appcatalog/utils/package-info.java |   22 
+ .../src/main/javascript/app.js                     |   62 -
+ .../src/main/javascript/controllers.js             |  374 -----
+ .../src/main/javascript/filters.js                 |   32 
+ .../src/main/javascript/routes.js                  |   17 
+ .../src/main/javascript/services.js                |   17 
+ .../src/main/resources/appcatalog.properties       |    1 
+ .../src/main/resources/log4j.properties            |   23 
+ .../src/main/webapp/.gitignore                     |    1 
+ .../src/main/webapp/WEB-INF/beans.xml              |   22 
+ .../src/main/webapp/WEB-INF/web.xml                |  117 --
+ .../src/main/webapp/css/bootstrap-hadoop.css       | 1526 --------------------
+ .../src/main/webapp/css/bootstrap-hadoop.min.css   |   18 
+ .../src/main/webapp/css/img/feather.png            |  Bin
+ .../src/main/webapp/css/img/jenkins.png            |  Bin
+ .../src/main/webapp/css/img/loading.svg            |    8 
+ .../pattern-f61c2e99f82389a67432f54155c5f483.png   |  Bin
+ .../src/main/webapp/css/specific.css               |  290 ----
+ .../src/main/webapp/css/theme.css                  |   30 
+ .../src/main/webapp/index.html                     |   89 -
+ .../src/main/webapp/js/bootstrap-hadoop.js         |  284 ----
+ .../src/main/webapp/js/bootstrap-hadoop.min.js     |   19 
+ .../src/main/webapp/partials/deploy.html           |   80 -
+ .../src/main/webapp/partials/details.html          |   65 -
+ .../src/main/webapp/partials/home.html             |   52 -
+ .../src/main/webapp/partials/new.html              |  111 -
+ .../src/main/webapp/partials/upgrade.html          |  114 -
+ .../src/main/webapp/theme.html                     |  649 ---------
+ .../application/EmbeddedSolrServerFactory.java     |  101 -
+ .../application/TestAppCatalogSolrClient.java      |  150 --
+ .../controller/AppDetailsControllerTest.java       |  158 --
+ .../controller/AppListControllerTest.java          |   96 -
+ .../controller/AppStoreControllerTest.java         |   98 -
+ .../src/test/javascript/controllersSpec.js         |  249 ---
+ .../src/test/javascript/karma.conf.js              |   34 
+ .../src/test/resources/configsets.tgz              |  Bin
+ .../exampleCollection/conf/lang/stopwords_en.txt   |   54 -
+ .../configsets/exampleCollection/conf/params.json  |   20 
+ .../exampleCollection/conf/protwords.txt           |   20 
+ .../configsets/exampleCollection/conf/schema.xml   |  116 --
+ .../exampleCollection/conf/solrconfig.xml          |   36 
+ .../exampleCollection/conf/stopwords.txt           |   14 
+ .../configsets/exampleCollection/conf/synonyms.txt |   28 
+ .../src/test/resources/log4j.properties            |   11 
+ .../hadoop-yarn-applications-catalog/pom.xml       |   37 
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |    1 
+ hadoop-yarn-project/pom.xml                        |    5 
+ 78 files changed, 8714 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml
+ delete mode 100755 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh
+ delete mode 100755 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogInitializer.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/upgrade.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 2e3eec4aeb8..26c428044d6 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -605,13 +605,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>war</type>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md
+deleted file mode 100644
+index f048661708e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/README.md
++++ /dev/null
+@@ -1,50 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-# Apache Hadoop YARN Application Catalog
+-
+-## Introduction
+-
+-YARN Application Catalog is application catalog for
+-deploying docker enabled cloud application on Hadoop.
+-
+-check it out:
+-
+-```bash
+-git clone https://github.com/apache/hadoop.git
+-```
+-
+-## Prerequisites
+-* Firefox or Chrome
+-* [npm](https://www.npmjs.org)
+-* [nodejs](http://nodejs.org)
+-* [JDK](http://www.oracle.com/technetwork/java/javaee/downloads/index.html)
+-* [IDE](http://www.jetbrains.com/)
+-* [bower](http://bower.io)
+-* [PhantomJs](http://phantomjs.org) or `brew install phantomjs`
+-* [Docker](http://docker.io)
+-
+-## Installation
+-
+-```bash
+-mvn package
+-```
+-
+-When running this command a couple of things happen:
+-* YARN Application Catalog web application is built
+-* YARN Application Docker image is built
+-
+-## Status of the project
+-
+-See Apache [JIRA](http://issues.apache.org/jira/browse/HADOOP)
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
+deleted file mode 100644
+index 4a3ec65fb00..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/Dockerfile
++++ /dev/null
+@@ -1,37 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-FROM centos:7
+-
+-RUN yum -y install tomcat lsof krb5-workstation sssd-client curl
+-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+-RUN mkdir -p /opt/apache/solr && \
+-    curl -SL http://archive.apache.org/dist/lucene/solr/7.7.0/solr-7.7.0.tgz | \
+-    tar -xzC /opt/apache/solr --strip 1
+-COPY src/main/scripts/setup-image.sh /setup-image.sh
+-COPY src/main/resources/samples.xml /tmp/samples.xml
+-COPY src/main/resources/jaas.config /etc/tomcat/jaas.config.template
+-COPY src/main/scripts/entrypoint.sh /usr/bin/entrypoint.sh
+-COPY target/ROOT.war /var/lib/tomcat/webapps/ROOT.war
+-RUN chmod 755 /setup-image.sh
+-RUN chmod 755 /usr/bin/entrypoint.sh
+-RUN /setup-image.sh
+-
+-EXPOSE 8080
+-EXPOSE 8983
+-WORKDIR /
+-
+-ENTRYPOINT ["/usr/bin/entrypoint.sh" ]
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md
+deleted file mode 100644
+index 1e2d12bba64..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/README.md
++++ /dev/null
+@@ -1,43 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-# Apache Hadoop YARN AppCatalog Docker Image
+-
+-## Introduction
+-
+-AppCatalog Docker image is pre-packaged docker container for Hadoop Application Catalog.
+-
+-check it out:
+-
+-```
+-git clone https://github.com/apache/hadoop.git
+-```
+-
+-## Compile
+-
+-```
+-mvn package
+-```
+-
+-## Run
+-
+-```
+-docker run -d -p 8080:8080 -p 8983:8983 hadoop/appcatalog-docker:1.0-SNAPSHOT
+-```
+-
+-When running this command a couple of things happens:
+-* Solr server will create appcatalog collection for hosting application catalog
+-* Sample applications are registered in Embedded Solr
+-* Tomcat will run appcatalog-webapp on port 8080
+-
+-User can browse port 8080 to deploy application on a Hadoop cluster.
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
+deleted file mode 100644
+index 53d45f7c4e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
++++ /dev/null
+@@ -1,107 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <groupId>org.apache.hadoop</groupId>
+-  <artifactId>hadoop-yarn-applications-catalog-docker</artifactId>
+-  <packaging>pom</packaging>
+-
+-  <parent>
+-    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-
+-  <name>Apache Hadoop YARN Application Catalog Docker Image</name>
+-  <url>https://maven.apache.org</url>
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-      <version>${project.version}</version>
+-      <type>war</type>
+-    </dependency>
+-  </dependencies>
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/main/resources/jaas.config</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <profiles>
+-    <profile>
+-      <id>docker</id>
+-      <build>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-dependency-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <id>copy-dependencies</id>
+-                <phase>package</phase>
+-                <goals>
+-                  <goal>copy</goal>
+-                </goals>
+-                <configuration>
+-                  <artifactItems>
+-                    <artifactItem>
+-                      <groupId>org.apache.hadoop</groupId>
+-                      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-                      <version>${project.version}</version>
+-                      <destFileName>ROOT.war</destFileName>
+-                      <type>war</type>
+-                    </artifactItem>
+-                  </artifactItems>
+-                  <outputDirectory>${project.build.directory}</outputDirectory>
+-                  <overWriteReleases>false</overWriteReleases>
+-                  <overWriteSnapshots>true</overWriteSnapshots>
+-                  <excludeTransitive>true</excludeTransitive>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-          <plugin>
+-            <groupId>com.spotify</groupId>
+-            <artifactId>dockerfile-maven-plugin</artifactId>
+-            <version>1.3.4</version>
+-            <executions>
+-              <execution>
+-                <id>default</id>
+-                <goals>
+-                  <goal>build</goal>
+-                </goals>
+-              </execution>
+-            </executions>
+-            <configuration>
+-              <repository>apache/hadoop-yarn-applications-catalog-docker</repository>
+-              <tag>${project.version}</tag>
+-            </configuration>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config
+deleted file mode 100644
+index 937df572bd2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/jaas.config
++++ /dev/null
+@@ -1,9 +0,0 @@
+-com.sun.security.jgss.krb5.initiate {
+-  com.sun.security.auth.module.Krb5LoginModule required
+-  doNotPrompt=true
+-  principal="${PRINCIPAL}"
+-  useKeyTab=true
+-  keyTab="${KEYTAB}"
+-  storeKey=true
+-  useTicketCache=false;
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml
+deleted file mode 100644
+index 5389cfb5276..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/resources/samples.xml
++++ /dev/null
+@@ -1,135 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<add>
+-  <doc>
+-    <field name="id">appStore_1</field>
+-    <field name="type_s">AppStoreEntry</field>
+-    <field name="org_s">Apache</field>
+-    <field name="name_s">Http Server Project</field>
+-    <field name="desc_s">The Number One HTTP Server On The Internet</field>
+-    <field name="like_i">50000</field>
+-    <field name="download_i">100000</field>
+-    <field name="yarnfile_s">{
+-  "name": "httpd",
+-  "version": "1.0",
+-  "components" :
+-  [
+-    {
+-      "name": "httpd",
+-      "number_of_containers": 2,
+-      "artifact": {
+-        "id": "centos/httpd-24-centos7:latest",
+-        "type": "DOCKER"
+-      },
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "256"
+-      },
+-      "configuration": {
+-        "env": {
+-          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+-          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"8080:8080"
+-        },
+-        "properties": {
+-        }
+-      }
+-    }
+-  ],
+-  "quicklinks": {
+-    "Httpd UI": "http://httpd.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+-  }
+-}
+-    </field>
+-  </doc>
+-  <doc>
+-    <field name="id">appStore_2</field>
+-    <field name="type_s">AppStoreEntry</field>
+-    <field name="org_s">Jenkins-ci.org</field>
+-    <field name="name_s">Jenkins</field>
+-    <field name="desc_s">The leading open source automation server</field>
+-    <field name="like_i">100000</field>
+-    <field name="download_i">1000000</field>
+-    <field name="yarnfile_s">{
+-  "name": "httpd",
+-  "version": "1.0",
+-  "components" :
+-  [
+-    {
+-      "name": "jenkins",
+-      "number_of_containers": 1,
+-      "artifact": {
+-        "id": "jenkins/jenkins:latest",
+-        "type": "DOCKER"
+-      },
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "run_privileged_container": true,
+-      "configuration": {
+-        "env": {
+-          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+-          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"8080:8080"
+-        },
+-        "properties": {
+-        }
+-      }
+-    }
+-  ],
+-  "quicklinks": {
+-    "Jenkins UI": "http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+-  }
+-}
+-    </field>
+-  </doc>
+-  <doc>
+-    <field name="id">appStore_3</field>
+-    <field name="type_s">AppStoreEntry</field>
+-    <field name="org_s">Docker</field>
+-    <field name="name_s">Registry</field>
+-    <field name="desc_s">The Docker Registry 2.0 implementation for storing and distributing Docker images.</field>
+-    <field name="like_i">360</field>
+-    <field name="download_i">1</field>
+-    <field name="yarnfile_s">{
+-  "name": "docker-registry",
+-  "version": "1.0",
+-  "components" :
+-  [
+-    {
+-      "name": "registry",
+-      "number_of_containers": 1,
+-      "artifact": {
+-        "id": "registry:latest",
+-        "type": "DOCKER"
+-      },
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "configuration": {
+-        "env": {
+-          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+-          "YARN_CONTAINER_RUNTIME_DOCKER_PORTS_MAPPING":"5000:5000"
+-        },
+-        "properties": {
+-        }
+-      }
+-    }
+-  ]
+-}
+-    </field>
+-  </doc>
+-</add>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh
+deleted file mode 100755
+index e8ab488c935..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh
++++ /dev/null
+@@ -1,80 +0,0 @@
+-#!/bin/bash -x
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-template_generator() {
+-  REGEX='(\$\{[a-zA-Z_][a-zA-Z_0-9]*\})'
+-  if [ -e "$2" ]; then
+-    mv -f "$2" "$2.bak"
+-  fi
+-  while IFS='' read -r line || [[ -n "$line" ]]; do
+-    while [[ "$line" =~ $REGEX ]] ; do
+-      LHS=${BASH_REMATCH[1]}
+-      RHS="$(eval echo "\"$LHS\"")"
+-      line=${line//$LHS/$RHS}
+-    done
+-    echo "$line" >> "$2"
+-  done < "$1"
+-}
+-
+-export JAVA_HOME=/usr/lib/jvm/jre
+-export HADOOP_CONF_DIR=/etc/hadoop/conf
+-
+-SOLR_OPTS=()
+-
+-if [ "${SOLR_STORAGE_TYPE}" == "hdfs" ]; then
+-  SOLR_OPTS+=("-Dsolr.directoryFactory=HdfsDirectoryFactory")
+-  SOLR_OPTS+=("-Dsolr.lock.type=hdfs")
+-  if [ -e "$HADOOP_CONF_DIR" ]; then
+-    SOLR_OPTS+=("-Dsolr.hdfs.confdir=${HADOOP_CONF_DIR}")
+-  fi
+-fi
+-
+-if [ "${SOLR_DATA_DIR}" != "" ]; then
+-  SOLR_OPTS+=("-Dsolr.data.dir=$SOLR_DATA_DIR")
+- fi
+-
+-if [ -e "$KEYTAB" ]; then
+-  SOLR_OPTS+=("-Dsolr.hdfs.security.kerberos.enabled=true")
+-  SOLR_OPTS+=("-Dsolr.hdfs.security.kerberos.keytabfile=${KEYTAB}")
+-  SOLR_OPTS+=("-Dsolr.hdfs.security.kerberos.principal=${PRINCIPAL}")
+-  export JAVA_OPTS="$JAVA_OPTS -Djava.security.auth.login.config=/etc/tomcat/jaas.config -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false"
+-  template_generator /etc/tomcat/jaas.config.template /etc/tomcat/jaas.config
+-fi
+-
+-export SOLR_OPTS
+-
+-/opt/apache/solr/bin/solr start "${SOLR_OPTS[@]}" -p 8983 -force
+-/opt/apache/solr/bin/solr create_core -c appcatalog -force
+-/opt/apache/solr/bin/post -c appcatalog /tmp/samples.xml
+-if [ -d /etc/hadoop/conf ]; then
+-  sed -i.bak 's/shared.loader=.*$/shared.loader=\/etc\/hadoop\/conf/g' /etc/tomcat/catalina.properties
+-fi
+-
+-if [ -e "$SPNEGO_KEYTAB" ]; then
+-  sed -i.bak 's/authentication.type=.*$/authentication.type=kerberos/g' /etc/tomcat/catalina.properties
+-  sed -i.bak 's/simple.anonymous.allowed=.*$/simple.anonymous.allowed=false/g' /etc/tomcat/catalina.properties
+-  {
+-    if [ -z "$SPNEGO_PRINCIPAL" ]; then
+-      echo "kerberos.principal=HTTP/$HOSTNAME"
+-    else
+-      echo "kerberos.principal=$SPNEGO_PRINCIPAL"
+-    fi
+-    echo "kerberos.keytab=$SPNEGO_KEYTAB"
+-    echo "hostname=$HOSTNAME"
+-  } >> /etc/tomcat/catalina.properties
+-fi
+-/usr/libexec/tomcat/server start
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh
+deleted file mode 100755
+index 8cc1ec66c6d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/setup-image.sh
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#!/bin/bash
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-mkdir -p /etc/hadoop
+-mkdir -p /opt/apache/solr/server/logs
+-chmod -R 777 /opt/apache/solr/server/logs /var/log/tomcat /var/cache/tomcat /var/lib/tomcat/webapps /opt/apache/solr/server/solr
+-chmod 777 /etc/tomcat
+-{
+-  echo "auth.filter=org.apache.hadoop.security.authentication.server.AuthenticationFilter"
+-  echo "authentication.type=simple"
+-  echo "simple.anonymous.allowed=true"
+-} >> /etc/tomcat/catalina.properties
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
+deleted file mode 100644
+index 2d8667ea022..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
++++ /dev/null
+@@ -1,5 +0,0 @@
+-.classpath
+-.project
+-/target/
+-/node_modules/
+-yarn.lock
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc
+deleted file mode 100644
+index e0ca4e9145e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.yarnrc
++++ /dev/null
+@@ -1 +0,0 @@
+---modules-folder target/generated-sources/vendor
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md
+deleted file mode 100644
+index 58fe29f86d8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/README.md
++++ /dev/null
+@@ -1,51 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-# Apache Hadoop YARN Application Catalog
+-
+-## Introduction
+-
+-Hadoop YARN Application Catalog is application catalog for
+-deploying docker enabled cloud application on Hadoop.
+-
+-check it out:
+-
+-```bash
+-git clone https://github.com/apache/hadoop.git
+-```
+-
+-## Prerequisites
+-* Firefox or Chrome
+-* [npm](https://www.npmjs.org)
+-* [nodejs](http://nodejs.org)
+-* [JDK](http://www.oracle.com/technetwork/java/javaee/downloads/index.html)
+-* [IDE](http://www.jetbrains.com/)
+-* [bower](http://bower.io)
+-* [PhantomJs](http://phantomjs.org) or `brew install phantomjs`
+-* [Application Server](https://glassfish.java.net/download.html) or `brew install glassfish`
+-
+-## Installation
+-
+-```bash
+-mvn package
+-```
+-
+-When running this command a couple of things happen:
+-* Npm and yarnpkg install will be run
+-* JSLint will be run in src/main/javascript sources
+-* Javascript will be minified
+-* All the other standard maven phases.
+-
+-## Status of the project
+-
+-See Apache [JIRA](http://issues.apache.org/jira/browse/YARN)
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index b89146a264a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+deleted file mode 100644
+index 59cc3da179f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
++++ /dev/null
+@@ -1,29 +0,0 @@
+-{
+-    "name": "AppCatalog",
+-    "private": true,
+-    "version": "0.0.0",
+-    "description": "YARN App Catalog",
+-    "repository": "git://git.apache.org/hadoop.git",
+-    "license": "Apache 2.0",
+-    "dependencies": {
+-        "jquery": "3.3.1",
+-        "angular-loader": "~1.6.4",
+-        "angular-mocks": "~1.6.4",
+-        "angular-route": "~1.6.4",
+-        "angular": "~1.6.4",
+-        "bootstrap": "~3.3.7",
+-        "roboto-fontface": "0.10.0"
+-    },
+-    "devDependencies": {
+-        "requirejs": "^2.1.0",
+-        "shelljs": "^0.2.6",
+-        "apidoc": "0.17.7"
+-    },
+-    "resolutions": {
+-        "triple-beam": "1.3.0"
+-    },
+-    "scripts": {
+-        "prestart": "npm install & mvn clean package",
+-        "pretest": "npm install"
+-    }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+deleted file mode 100644
+index a805f770837..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
++++ /dev/null
+@@ -1,569 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <groupId>org.apache.hadoop</groupId>
+-  <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-  <packaging>war</packaging>
+-
+-  <parent>
+-    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-
+-  <name>Apache Hadoop YARN Application Catalog Webapp</name>
+-
+-  <url>https://hadoop.apache.org</url>
+-
+-    <properties>
+-        <artifact.name>app</artifact.name>
+-        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+-        <vendor.loc>target/generated-sources/vendor</vendor.loc>
+-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-        <dependency.locations.enabled>false</dependency.locations.enabled>
+-        <javascript.test>*Spec</javascript.test>
+-    </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>io.swagger</groupId>
+-      <artifactId>swagger-annotations</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-all</artifactId>
+-      <version>1.9.5</version>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.powermock</groupId>
+-      <artifactId>powermock-module-junit4</artifactId>
+-      <version>${powermock.version}</version>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>junit</groupId>
+-          <artifactId>junit</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.powermock</groupId>
+-      <artifactId>powermock-api-mockito</artifactId>
+-      <version>${powermock.version}</version>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.mockito</groupId>
+-          <artifactId>mockito-all</artifactId>
+-        </exclusion>
+-      </exclusions>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.glassfish.jersey.media</groupId>
+-      <artifactId>jersey-media-json-jackson</artifactId>
+-      <version>2.12</version>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.javassist</groupId>
+-          <artifactId>javassist</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-          <artifactId>jackson-jaxrs-base</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-      <dependency>
+-          <groupId>org.junit.jupiter</groupId>
+-          <artifactId>junit-jupiter-api</artifactId>
+-          <scope>test</scope>
+-      </dependency>
+-      <dependency>
+-          <groupId>org.junit.jupiter</groupId>
+-          <artifactId>junit-jupiter-engine</artifactId>
+-          <scope>test</scope>
+-      </dependency>
+-      <dependency>
+-          <groupId>org.junit.platform</groupId>
+-          <artifactId>junit-platform-launcher</artifactId>
+-          <scope>test</scope>
+-      </dependency>
+-
+-      <dependency>
+-            <groupId>com.github.pjfanning</groupId>
+-            <artifactId>jersey-json</artifactId>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.core</groupId>
+-                    <artifactId>jackson-core</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.core</groupId>
+-                    <artifactId>jackson-databind</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-                    <artifactId>jackson-jaxrs-json-provider</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.codehaus.jettison</groupId>
+-                    <artifactId>jettison</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.solr</groupId>
+-            <artifactId>solr-solrj</artifactId>
+-            <version>${solr.version}</version>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.slf4j</groupId>
+-                    <artifactId>jcl-over-slf4j</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.slf4j</groupId>
+-                    <artifactId>slf4j-api</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-http</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-client</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-io</artifactId>
+-                </exclusion>
+-            </exclusions>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.solr</groupId>
+-            <artifactId>solr-core</artifactId>
+-            <version>${solr.version}</version>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.slf4j</groupId>
+-                    <artifactId>jcl-over-slf4j</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-io</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-xml</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-http</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-client</artifactId>
+-                </exclusion>
+-            </exclusions>
+-            <scope>test</scope>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.solr</groupId>
+-            <artifactId>solr-test-framework</artifactId>
+-            <version>${solr.version}</version>
+-            <exclusions>
+-                <exclusion>
+-                    <groupId>org.slf4j</groupId>
+-                    <artifactId>jcl-over-slf4j</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-io</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-xml</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-http</artifactId>
+-                </exclusion>
+-                <exclusion>
+-                    <groupId>org.eclipse.jetty</groupId>
+-                    <artifactId>jetty-client</artifactId>
+-                </exclusion>
+-            </exclusions>
+-            <scope>test</scope>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>jcl-over-slf4j</artifactId>
+-            <version>${slf4j.version}</version>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.slf4j</groupId>
+-            <artifactId>slf4j-api</artifactId>
+-            <version>${slf4j.version}</version>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-common</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-auth</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-common</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-services-core</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>org.apache.hadoop</groupId>
+-            <artifactId>hadoop-yarn-services-api</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>com.fasterxml.jackson.core</groupId>
+-            <artifactId>jackson-core</artifactId>
+-            <version>${jackson2.version}</version>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>com.fasterxml.jackson.core</groupId>
+-            <artifactId>jackson-annotations</artifactId>
+-            <version>${jackson2.version}</version>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>com.fasterxml.jackson.core</groupId>
+-            <artifactId>jackson-databind</artifactId>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-            <artifactId>jackson-jaxrs-json-provider</artifactId>
+-            <version>${jackson2.version}</version>
+-        </dependency>
+-
+-        <dependency>
+-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-            <artifactId>jackson-jaxrs-base</artifactId>
+-            <version>${jackson2.version}</version>
+-        </dependency>
+-    </dependencies>
+-    <build>
+-        <finalName>${artifact.name}</finalName>
+-        <resources>
+-            <resource>
+-                <directory>src/main/javascript</directory>
+-                <filtering>true</filtering>
+-            </resource>
+-            <resource>
+-                <directory>src/main/resources</directory>
+-                <filtering>true</filtering>
+-            </resource>
+-        </resources>
+-        <plugins>
+-            <plugin>
+-                <groupId>com.github.eirslett</groupId>
+-                <artifactId>frontend-maven-plugin</artifactId>
+-                <configuration>
+-                    <workingDirectory>target</workingDirectory>
+-                </configuration>
+-                <executions>
+-                    <execution>
+-                        <id>install node and yarn</id>
+-                        <goals>
+-                            <goal>install-node-and-yarn</goal>
+-                        </goals>
+-                        <phase>generate-resources</phase>
+-                        <configuration>
+-                            <nodeVersion>${nodejs.version}</nodeVersion>
+-                            <yarnVersion>${yarnpkg.version}</yarnVersion>
+-                        </configuration>
+-                    </execution>
+-                    <execution>
+-                        <id>yarn install</id>
+-                        <goals>
+-                            <goal>yarn</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-compiler-plugin</artifactId>
+-                <configuration>
+-                    <compilerArguments>
+-                        <endorseddirs>${endorsed.dir}</endorseddirs>
+-                    </compilerArguments>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-surefire-plugin</artifactId>
+-                <configuration>
+-                    <systemPropertyVariables>
+-                        <log4j.configuration>file:${project.build.testOutputDirectory}/log4j.properties</log4j.configuration>
+-                    </systemPropertyVariables>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-war-plugin</artifactId>
+-                <configuration>
+-                    <failOnMissingWebXml>false</failOnMissingWebXml>
+-                    <webResources>
+-                        <resource>
+-                            <directory>target/generated-sources</directory>
+-                            <includes>
+-                                <include>vendor/jquery/**</include>
+-                                <include>vendor/angular/**</include>
+-                                <include>vendor/angular-route/**</include>
+-                                <include>vendor/bootstrap/**</include>
+-                                <include>vendor/roboto-fontface/fonts/roboto/Roboto-Regular.woff</include>
+-                            </includes>
+-                        </resource>
+-                    </webResources>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-dependency-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <phase>validate</phase>
+-                        <goals>
+-                            <goal>copy</goal>
+-                        </goals>
+-                        <configuration>
+-                            <outputDirectory>${endorsed.dir}</outputDirectory>
+-                            <silent>true</silent>
+-                            <artifactItems>
+-                                <artifactItem>
+-                                    <groupId>javax</groupId>
+-                                    <artifactId>javaee-endorsed-api</artifactId>
+-                                    <version>7.0</version>
+-                                    <type>jar</type>
+-                                </artifactItem>
+-                            </artifactItems>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-            </plugin>
+-            <plugin>
+-                <groupId>net.alchim31.maven</groupId>
+-                <artifactId>yuicompressor-maven-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <id>compress-js</id>
+-                        <phase>process-resources</phase>
+-                        <goals>
+-                            <!--<goal>jslint</goal>-->
+-                            <goal>compress</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <failOnWarning>true</failOnWarning>
+-                    <!--<outputDirectory>src/main/webapp/js</outputDirectory>-->
+-                    <outputDirectory>target/${artifact.name}/js</outputDirectory>
+-                    <nosuffix>true</nosuffix>
+-                    <excludes>
+-                        <exclude>**/js/**/*js</exclude>
+-                        <exclude>vendor/**</exclude>
+-                        <exclude>**/*min.css</exclude>
+-                        <exclude>**/*min.js</exclude>
+-                    </excludes>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>com.github.klieber</groupId>
+-                <artifactId>phantomjs-maven-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <goals>
+-                            <goal>install</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <version>2.1.1</version>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>com.github.searls</groupId>
+-                <artifactId>jasmine-maven-plugin</artifactId>
+-                <executions>
+-                    <execution>
+-                        <goals>
+-                            <goal>test</goal>
+-                            <goal>bdd</goal>
+-                        </goals>
+-                    </execution>
+-                </executions>
+-                <configuration>
+-                    <skipJasmineTests>${skipTests}</skipJasmineTests>
+-                    <webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
+-                    <webDriverCapabilities>
+-                        <capability>
+-                            <name>phantomjs.binary.path</name>
+-                            <value>${phantomjs.binary}</value>
+-                        </capability>
+-                    </webDriverCapabilities>
+-                    <preloadSources>
+-                        <source>${vendor.loc}/jquery/dist/jquery.js</source>
+-                        <source>${vendor.loc}/angular/angular.min.js</source>
+-                        <source>${vendor.loc}/angular-route/angular-route.min.js</source>
+-                        <source>${vendor.loc}/angular-mocks/angular-mocks.js</source>
+-                    </preloadSources>
+-                    <jsSrcDir>src/main/javascript</jsSrcDir>
+-                    <jsTestSrcDir>src/test/javascript</jsTestSrcDir>
+-                    <specIncludes>
+-                        <include>${javascript.test}.js</include>
+-                    </specIncludes>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.rat</groupId>
+-                <artifactId>apache-rat-plugin</artifactId>
+-                <configuration>
+-                    <excludes>
+-                        <exclude>src/main/webapp/vendor/**</exclude>
+-                        <exclude>src/main/resources/appcatalog.properties</exclude>
+-                        <exclude>src/main/webapp//**/*.svg</exclude>
+-                        <exclude>src/test/javascript/karma.conf.js</exclude>
+-                        <exclude>src/test/resources/configsets/exampleCollection/conf/params.json</exclude>
+-                        <exclude>src/test/resources/log4j.properties</exclude>
+-                        <exclude>src/test/resources/jaas.config</exclude>
+-                        <exclude>.bowerrc</exclude>
+-                        <exclude>.yarnrc</exclude>
+-                        <exclude>bower.json</exclude>
+-                        <exclude>package.json</exclude>
+-                        <exclude>yarn.lock</exclude>
+-                        <exclude>node/**</exclude>
+-                        <exclude>node_modules/**</exclude>
+-                    </excludes>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-javadoc-plugin</artifactId>
+-                <configuration>
+-                    <excludePackageNames>org.apache.hadoop.yarn.appcatalog</excludePackageNames>
+-                </configuration>
+-            </plugin>
+-        </plugins>
+-    </build>
+-
+-    <profiles>
+-      <profile>
+-        <id>parallel-tests</id>
+-        <build>
+-          <plugins>
+-            <plugin>
+-              <groupId>org.apache.hadoop</groupId>
+-              <artifactId>hadoop-maven-plugins</artifactId>
+-              <executions>
+-                <execution>
+-                  <id>parallel-tests-createdir</id>
+-                  <goals>
+-                    <goal>parallel-tests-createdir</goal>
+-                  </goals>
+-                </execution>
+-              </executions>
+-            </plugin>
+-            <plugin>
+-              <groupId>org.apache.maven.plugins</groupId>
+-              <artifactId>maven-surefire-plugin</artifactId>
+-              <configuration>
+-                <forkCount>${testsThreadCount}</forkCount>
+-                <reuseForks>false</reuseForks>
+-                <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
+-                <systemPropertyVariables>
+-                  <testsThreadCount>${testsThreadCount}</testsThreadCount>
+-                  <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data>
+-                  <test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir>
+-                  <hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir>
+-
+-                  <!-- Due to a Maven quirk, setting this to just -->
+-                  <!-- surefire.forkNumber won't do the parameter substitution. -->
+-                  <!-- Putting a prefix in front of it like "fork-" makes it -->
+-                  <!-- work. -->
+-                  <test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id>
+-                </systemPropertyVariables>
+-              </configuration>
+-            </plugin>
+-          </plugins>
+-        </build>
+-      </profile>
+-      <profile>
+-        <id>test-selector</id>
+-        <activation>
+-          <property>
+-            <name>test</name>
+-          </property>
+-        </activation>
+-        <properties>
+-          <javascript.test>${test}</javascript.test>
+-        </properties>
+-      </profile>
+-      <profile>
+-        <id>rest-docs</id>
+-        <build>
+-          <plugins>
+-            <plugin>
+-              <groupId>org.codehaus.mojo</groupId>
+-              <artifactId>exec-maven-plugin</artifactId>
+-              <executions>
+-                <execution>
+-                  <id>apidocs</id>
+-                  <phase>package</phase>
+-                  <goals>
+-                    <goal>exec</goal>
+-                  </goals>
+-                  <configuration>
+-                    <outputFile>${project.build.directory}/apidocs.log</outputFile>
+-                    <executable>${basedir}/node/node</executable>
+-                    <commandlineArgs>${basedir}/node_modules/.bin/apidoc -i src/main/java -o ${project.build.directory}/site/apidocs</commandlineArgs>
+-                    <silent>true</silent>
+-                  </configuration>
+-                </execution>
+-              </executions>
+-            </plugin>
+-          </plugins>
+-        </build>
+-      </profile>
+-    </profiles>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java
+deleted file mode 100644
+index 07e3a6ff6a1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalog.java
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import javax.ws.rs.ApplicationPath;
+-import javax.ws.rs.core.Application;
+-
+-import org.apache.hadoop.yarn.appcatalog.controller.AppDetailsController;
+-
+-import java.util.Set;
+-
+-/**
+- * Jackson resource configuration class for Application Catalog.
+- */
+-@ApplicationPath("service")
+-public class AppCatalog extends Application {
+-
+-  @Override
+-  public Set<Class<?>> getClasses() {
+-    final Set<Class<?>> resources = new java.util.HashSet<>();
+-    // following code can be used to customize Jersey 2.0 JSON provider:
+-    try {
+-      final Class<?> jsonProvider =
+-          Class.forName("org.glassfish.jersey.jackson.JacksonFeature");
+-      // Class jsonProvider =
+-      // Class.forName("org.glassfish.jersey.moxy.json.MoxyJsonFeature");
+-      // Class jsonProvider =
+-      // Class.forName("org.glassfish.jersey.jettison.JettisonFeature");
+-      resources.add(jsonProvider);
+-    } catch (final ClassNotFoundException ex) {
+-      ex.printStackTrace();
+-    }
+-    addRestResourceClasses(resources);
+-    return resources;
+-  }
+-
+-  /**
+-   * Add your own resources here.
+-   */
+-  private void addRestResourceClasses(final Set<Class<?>> resources) {
+-    resources.add(AppDetailsController.class);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogInitializer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogInitializer.java
+deleted file mode 100644
+index 92e95d8460c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogInitializer.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import java.io.IOException;
+-
+-import javax.servlet.ServletContextEvent;
+-import javax.servlet.ServletContextListener;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.HadoopKerberosName;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Initialization class for setting Kerberos configuration.
+- */
+-public class AppCatalogInitializer implements ServletContextListener {
+-
+-  static final Logger LOG = LoggerFactory.getLogger(
+-      AppCatalogInitializer.class);
+-
+-  @Override
+-  public void contextInitialized(ServletContextEvent sce) {
+-    Configuration conf = new Configuration();
+-    if (!HadoopKerberosName.hasRulesBeenSet()) {
+-      try {
+-        HadoopKerberosName.setConfiguration(conf);
+-      } catch (IOException e) {
+-        LOG.error("Application Catalog initialization failed:", e);
+-      }
+-    }
+-  }
+-
+-  @Override
+-  public void contextDestroyed(ServletContextEvent sce) {
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java
+deleted file mode 100644
+index ac8dbbac61d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/AppCatalogSolrClient.java
++++ /dev/null
+@@ -1,445 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Properties;
+-import java.util.Random;
+-
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.Application;
+-import org.apache.hadoop.yarn.appcatalog.utils.RandomWord;
+-import org.apache.hadoop.yarn.appcatalog.utils.WordLengthException;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.solr.client.solrj.SolrClient;
+-import org.apache.solr.client.solrj.SolrQuery;
+-import org.apache.solr.client.solrj.SolrQuery.ORDER;
+-import org.apache.solr.client.solrj.SolrServerException;
+-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+-import org.apache.solr.client.solrj.response.QueryResponse;
+-import org.apache.solr.client.solrj.response.UpdateResponse;
+-import org.apache.solr.common.SolrDocument;
+-import org.apache.solr.common.SolrInputDocument;
+-
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Driver class for accessing Solr.
+- */
+-public class AppCatalogSolrClient {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(AppCatalogSolrClient.class);
+-  private static String urlString;
+-
+-  public AppCatalogSolrClient() {
+-    // Locate Solr URL
+-    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+-    InputStream input =
+-        classLoader.getResourceAsStream("appcatalog.properties");
+-    Properties properties = new Properties();
+-    try {
+-      properties.load(input);
+-      setSolrUrl(properties.getProperty("solr_url"));
+-    } catch (IOException e) {
+-      LOG.error("Error reading appcatalog configuration: ", e);
+-    }
+-  }
+-
+-  private synchronized static void setSolrUrl(String url) {
+-    urlString = url;
+-  }
+-
+-  public SolrClient getSolrClient() {
+-    return new HttpSolrClient.Builder(urlString).build();
+-  }
+-
+-  public List<AppStoreEntry> getRecommendedApps() {
+-    List<AppStoreEntry> apps = new ArrayList<AppStoreEntry>();
+-    SolrClient solr = getSolrClient();
+-    SolrQuery query = new SolrQuery();
+-    query.setQuery("*:*");
+-    query.setSort("download_i", ORDER.desc);
+-    query.setFilterQueries("type_s:AppStoreEntry");
+-    query.setRows(40);
+-    QueryResponse response;
+-    try {
+-      response = solr.query(query);
+-      Iterator<SolrDocument> list = response.getResults().listIterator();
+-      while (list.hasNext()) {
+-        SolrDocument d = list.next();
+-        AppStoreEntry entry = new AppStoreEntry();
+-        entry.setId(d.get("id").toString());
+-        entry.setOrg(d.get("org_s").toString());
+-        entry.setName(d.get("name_s").toString());
+-        entry.setDesc(d.get("desc_s").toString());
+-        if (d.get("icon_s")!=null) {
+-          entry.setIcon(d.get("icon_s").toString());
+-        }
+-        entry.setLike(Integer.parseInt(d.get("like_i").toString()));
+-        entry.setDownload(Integer.parseInt(d.get("download_i").toString()));
+-        apps.add(entry);
+-      }
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error getting a list of recommended applications: ", e);
+-    }
+-    return apps;
+-  }
+-
+-  public List<AppStoreEntry> search(String keyword) {
+-    List<AppStoreEntry> apps = new ArrayList<AppStoreEntry>();
+-    SolrClient solr = getSolrClient();
+-    SolrQuery query = new SolrQuery();
+-    if (keyword.length()==0) {
+-      query.setQuery("*:*");
+-      query.setFilterQueries("type_s:AppStoreEntry");
+-    } else {
+-      query.setQuery(keyword);
+-      query.setFilterQueries("type_s:AppStoreEntry");
+-    }
+-    query.setRows(40);
+-    QueryResponse response;
+-    try {
+-      response = solr.query(query);
+-      Iterator<SolrDocument> list = response.getResults().listIterator();
+-      while (list.hasNext()) {
+-        SolrDocument d = list.next();
+-        AppStoreEntry entry = new AppStoreEntry();
+-        entry.setId(d.get("id").toString());
+-        entry.setOrg(d.get("org_s").toString());
+-        entry.setName(d.get("name_s").toString());
+-        entry.setDesc(d.get("desc_s").toString());
+-        entry.setLike(Integer.parseInt(d.get("like_i").toString()));
+-        entry.setDownload(Integer.parseInt(d.get("download_i").toString()));
+-        apps.add(entry);
+-      }
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error in searching for applications: ", e);
+-    }
+-    return apps;
+-  }
+-
+-  public List<AppEntry> listAppEntries() {
+-    List<AppEntry> list = new ArrayList<AppEntry>();
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-
+-    SolrClient solr = getSolrClient();
+-    SolrQuery query = new SolrQuery();
+-    query.setQuery("*:*");
+-    query.setFilterQueries("type_s:AppEntry");
+-    query.setRows(40);
+-    QueryResponse response;
+-    try {
+-      response = solr.query(query);
+-      Iterator<SolrDocument> appList = response.getResults().listIterator();
+-      while (appList.hasNext()) {
+-        SolrDocument d = appList.next();
+-        AppEntry entry = new AppEntry();
+-        entry.setId(d.get("id").toString());
+-        entry.setName(d.get("name_s").toString());
+-        entry.setApp(d.get("app_s").toString());
+-        entry.setYarnfile(mapper.readValue(d.get("yarnfile_s").toString(),
+-            Service.class));
+-        list.add(entry);
+-      }
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error in listing deployed applications: ", e);
+-    }
+-    return list;
+-  }
+-
+-  public AppStoreEntry findAppStoreEntry(String id) {
+-    AppStoreEntry entry = new AppStoreEntry();
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-
+-    SolrClient solr = getSolrClient();
+-    SolrQuery query = new SolrQuery();
+-    query.setQuery("id:" + id);
+-    query.setFilterQueries("type_s:AppStoreEntry");
+-    query.setRows(1);
+-
+-    QueryResponse response;
+-    try {
+-      response = solr.query(query);
+-      Iterator<SolrDocument> appList = response.getResults().listIterator();
+-      while (appList.hasNext()) {
+-        SolrDocument d = appList.next();
+-        entry.setId(d.get("id").toString());
+-        entry.setOrg(d.get("org_s").toString());
+-        entry.setName(d.get("name_s").toString());
+-        entry.setDesc(d.get("desc_s").toString());
+-        entry.setLike(Integer.parseInt(d.get("like_i").toString()));
+-        entry.setDownload(Integer.parseInt(d.get("download_i").toString()));
+-        Service yarnApp = mapper.readValue(d.get("yarnfile_s").toString(),
+-            Service.class);
+-        String name;
+-        try {
+-          Random r = new Random();
+-          int low = 3;
+-          int high = 10;
+-          int seed = r.nextInt(high-low) + low;
+-          int seed2 = r.nextInt(high-low) + low;
+-          name = RandomWord.getNewWord(seed).toLowerCase() + "-" + RandomWord
+-              .getNewWord(seed2).toLowerCase();
+-        } catch (WordLengthException e) {
+-          name = "c" + java.util.UUID.randomUUID().toString().substring(0, 11);
+-        }
+-        yarnApp.setName(name);
+-        entry.setApp(yarnApp);
+-      }
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error in finding deployed application: " + id, e);
+-    }
+-    return entry;
+-  }
+-
+-  public AppEntry findAppEntry(String id) {
+-    AppEntry entry = new AppEntry();
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-
+-    SolrClient solr = getSolrClient();
+-    SolrQuery query = new SolrQuery();
+-    query.setQuery("id:" + id);
+-    query.setFilterQueries("type_s:AppEntry");
+-    query.setRows(1);
+-
+-    QueryResponse response;
+-    try {
+-      response = solr.query(query);
+-      Iterator<SolrDocument> appList = response.getResults().listIterator();
+-      while (appList.hasNext()) {
+-        SolrDocument d = appList.next();
+-        entry.setId(d.get("id").toString());
+-        entry.setApp(d.get("app_s").toString());
+-        entry.setName(d.get("name_s").toString());
+-        entry.setYarnfile(mapper.readValue(d.get("yarnfile_s").toString(),
+-            Service.class));
+-      }
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error in finding deployed application: " + id, e);
+-    }
+-    return entry;
+-  }
+-
+-  public void deployApp(String id, Service service) throws SolrServerException,
+-      IOException {
+-    long download = 0;
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+-    SolrClient solr = getSolrClient();
+-    // Find application information from AppStore
+-    SolrQuery query = new SolrQuery();
+-    query.setQuery("id:" + id);
+-    query.setFilterQueries("type_s:AppStoreEntry");
+-    query.setRows(1);
+-    QueryResponse response = solr.query(query);
+-    Iterator<SolrDocument> appList = response.getResults().listIterator();
+-    AppStoreEntry entry = new AppStoreEntry();
+-    while (appList.hasNext()) {
+-      SolrDocument d = appList.next();
+-      entry.setOrg(d.get("org_s").toString());
+-      entry.setName(d.get("name_s").toString());
+-      entry.setDesc(d.get("desc_s").toString());
+-      entry.setLike(Integer.parseInt(d.get("like_i").toString()));
+-      entry.setDownload(Integer.parseInt(d.get("download_i").toString()));
+-      download = entry.getDownload() + 1;
+-
+-      // Update download count
+-      docs.add(incrementDownload(d, download));
+-    }
+-
+-    // increment download count for application
+-
+-    if (service!=null) {
+-      // Register deployed application instance with AppList
+-      SolrInputDocument request = new SolrInputDocument();
+-      String name = service.getName();
+-      request.addField("type_s", "AppEntry");
+-      request.addField("id", name);
+-      request.addField("name_s", name);
+-      request.addField("app_s", entry.getOrg()+"/"+entry.getName());
+-      request.addField("yarnfile_s", mapper.writeValueAsString(service));
+-      docs.add(request);
+-    }
+-
+-    try {
+-      commitSolrChanges(solr, docs);
+-    } catch (IOException e) {
+-      throw new IOException("Unable to register docker instance "
+-          + "with application entry.", e);
+-    }
+-  }
+-
+-  private SolrInputDocument incrementDownload(SolrDocument doc,
+-      long download) {
+-    Collection<String> names = doc.getFieldNames();
+-    SolrInputDocument s = new SolrInputDocument();
+-    for (String name : names) {
+-      if(!name.equals("_version_")) {
+-        s.addField(name, doc.getFieldValues(name));
+-      }
+-    }
+-    download++;
+-    s.setField("download_i", download);
+-    return s;
+-  }
+-
+-  public void deleteApp(String id) {
+-    SolrClient solr = getSolrClient();
+-    try {
+-      solr.deleteById(id);
+-      solr.commit();
+-    } catch (SolrServerException | IOException e) {
+-      LOG.error("Error in removing deployed application: "+id, e);
+-    }
+-  }
+-
+-  public void register(Application app) throws IOException {
+-    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+-    SolrClient solr = getSolrClient();
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    try {
+-      SolrInputDocument buffer = new SolrInputDocument();
+-      buffer.setField("id", java.util.UUID.randomUUID().toString()
+-          .substring(0, 11));
+-      buffer.setField("org_s", app.getOrganization());
+-      buffer.setField("name_s", app.getName());
+-      buffer.setField("desc_s", app.getDescription());
+-      if (app.getIcon() != null) {
+-        buffer.setField("icon_s", app.getIcon());
+-      }
+-      buffer.setField("type_s", "AppStoreEntry");
+-      buffer.setField("like_i", 0);
+-      buffer.setField("download_i", 0);
+-
+-      // Keep only YARN data model for yarnfile field
+-      String yarnFile = mapper.writeValueAsString(app);
+-      LOG.info("app:"+yarnFile);
+-      Service yarnApp = mapper.readValue(yarnFile, Service.class);
+-      buffer.setField("yarnfile_s", mapper.writeValueAsString(yarnApp));
+-
+-      docs.add(buffer);
+-      commitSolrChanges(solr, docs);
+-    } catch (SolrServerException | IOException e) {
+-      throw new IOException("Unable to register application " +
+-          "in Application Store. ", e);
+-    }
+-  }
+-
+-  protected void register(AppStoreEntry app) throws IOException {
+-    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+-    SolrClient solr = getSolrClient();
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    try {
+-      SolrInputDocument buffer = new SolrInputDocument();
+-      buffer.setField("id", java.util.UUID.randomUUID().toString()
+-          .substring(0, 11));
+-      buffer.setField("org_s", app.getOrg());
+-      buffer.setField("name_s", app.getName());
+-      buffer.setField("desc_s", app.getDesc());
+-      if (app.getIcon() != null) {
+-        buffer.setField("icon_s", app.getIcon());
+-      }
+-      buffer.setField("type_s", "AppStoreEntry");
+-      buffer.setField("like_i", app.getLike());
+-      buffer.setField("download_i", app.getDownload());
+-
+-      // Keep only YARN data model for yarnfile field
+-      String yarnFile = mapper.writeValueAsString(app);
+-      LOG.info("app:"+yarnFile);
+-      Service yarnApp = mapper.readValue(yarnFile, Service.class);
+-      buffer.setField("yarnfile_s", mapper.writeValueAsString(yarnApp));
+-
+-      docs.add(buffer);
+-      commitSolrChanges(solr, docs);
+-    } catch (SolrServerException | IOException e) {
+-      throw new IOException("Unable to register application " +
+-          "in Application Store. ", e);
+-    }
+-  }
+-
+-  public void upgradeApp(Service service) throws IOException,
+-      SolrServerException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    Collection<SolrInputDocument> docs = new HashSet<SolrInputDocument>();
+-    SolrClient solr = getSolrClient();
+-    if (service!=null) {
+-      String name = service.getName();
+-      String app = "";
+-      SolrQuery query = new SolrQuery();
+-      query.setQuery("id:" + name);
+-      query.setFilterQueries("type_s:AppEntry");
+-      query.setRows(1);
+-
+-      QueryResponse response;
+-      try {
+-        response = solr.query(query);
+-        Iterator<SolrDocument> appList = response.getResults().listIterator();
+-        while (appList.hasNext()) {
+-          SolrDocument d = appList.next();
+-          app = d.get("app_s").toString();
+-        }
+-      } catch (SolrServerException | IOException e) {
+-        LOG.error("Error in finding deployed application: " + name, e);
+-      }
+-      // Register deployed application instance with AppList
+-      SolrInputDocument request = new SolrInputDocument();
+-      request.addField("type_s", "AppEntry");
+-      request.addField("id", name);
+-      request.addField("name_s", name);
+-      request.addField("app_s", app);
+-      request.addField("yarnfile_s", mapper.writeValueAsString(service));
+-      docs.add(request);
+-    }
+-    try {
+-      commitSolrChanges(solr, docs);
+-    } catch (IOException e) {
+-      throw new IOException("Unable to register docker instance "
+-          + "with application entry.", e);
+-    }
+-  }
+-
+-  private void commitSolrChanges(SolrClient solr,
+-      Collection<SolrInputDocument> docs)
+-          throws IOException, SolrServerException {
+-    // Commit Solr changes.
+-    UpdateResponse detailsResponse = solr.add(docs);
+-    if (detailsResponse.getStatus() != 0) {
+-      throw new IOException("Failed to commit document in solr, status code: "
+-          + detailsResponse.getStatus());
+-    }
+-    solr.commit();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java
+deleted file mode 100644
+index 185b1c8ddeb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java
++++ /dev/null
+@@ -1,196 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import java.io.IOException;
+-
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.KerberosPrincipal;
+-import org.apache.hadoop.yarn.service.client.ApiServiceClient;
+-
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.sun.jersey.api.client.ClientHandlerException;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.UniformInterfaceException;
+-import com.sun.jersey.api.client.config.ClientConfig;
+-import com.sun.jersey.api.client.config.DefaultClientConfig;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Driver class for calling YARN Resource Manager REST API.
+- */
+-public class YarnServiceClient {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(YarnServiceClient.class);
+-  private static Configuration conf = new Configuration();
+-  private static ClientConfig getClientConfig() {
+-    ClientConfig config = new DefaultClientConfig();
+-    config.getProperties().put(ClientConfig.PROPERTY_CHUNKED_ENCODING_SIZE, 0);
+-    config.getProperties()
+-        .put(ClientConfig.PROPERTY_BUFFER_RESPONSE_ENTITY_ON_EXCEPTION, true);
+-    return config;
+-  }
+-
+-  private ApiServiceClient asc;
+-
+-  public YarnServiceClient() {
+-    try {
+-      asc = new ApiServiceClient(conf);
+-    } catch (Exception e) {
+-      LOG.error("Error initialize YARN Service Client.", e);
+-    }
+-  }
+-
+-  public void createApp(Service app) {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    ClientResponse response;
+-    try {
+-      boolean useKerberos = UserGroupInformation.isSecurityEnabled();
+-      if (useKerberos) {
+-        KerberosPrincipal kerberos = new KerberosPrincipal();
+-        String[] temp = System.getenv("PRINCIPAL").split("@");
+-        String[] temp2 = temp[0].split("/");
+-        StringBuilder sb = new StringBuilder();
+-        sb.append(temp2[0]);
+-        sb.append("/");
+-        sb.append("_HOST");
+-        sb.append("@");
+-        sb.append(temp[1]);
+-        String keytab = System.getenv("KEYTAB");
+-        if (!keytab.startsWith("file://")) {
+-          keytab = "file://" + keytab;
+-        }
+-        kerberos.setPrincipalName(sb.toString());
+-        kerberos.setKeytab(keytab);
+-        app.setKerberosPrincipal(kerberos);
+-      }
+-      response = asc.getApiClient().post(ClientResponse.class,
+-          mapper.writeValueAsString(app));
+-      if (response.getStatus() >= 299) {
+-        String message = response.getEntity(String.class);
+-        throw new RuntimeException("Failed : HTTP error code : "
+-            + response.getStatus() + " error: " + message);
+-      }
+-    } catch (UniformInterfaceException | ClientHandlerException
+-        | IOException e) {
+-      LOG.error("Error in deploying application: ", e);
+-    }
+-  }
+-
+-  public void deleteApp(String appInstanceId) {
+-    ClientResponse response;
+-    try {
+-      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+-          .delete(ClientResponse.class);
+-      if (response.getStatus() >= 299) {
+-        String message = response.getEntity(String.class);
+-        throw new RuntimeException("Failed : HTTP error code : "
+-            + response.getStatus() + " error: " + message);
+-      }
+-    } catch (UniformInterfaceException | ClientHandlerException
+-        | IOException e) {
+-      LOG.error("Error in deleting application: ", e);
+-    }
+-  }
+-
+-  public void restartApp(Service app) throws JsonProcessingException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    String appInstanceId = app.getName();
+-    String yarnFile = mapper.writeValueAsString(app);
+-    ClientResponse response;
+-    try {
+-      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+-          .put(ClientResponse.class, yarnFile);
+-      if (response.getStatus() >= 299) {
+-        String message = response.getEntity(String.class);
+-        throw new RuntimeException("Failed : HTTP error code : "
+-            + response.getStatus() + " error: " + message);
+-      }
+-    } catch (UniformInterfaceException | ClientHandlerException
+-        | IOException e) {
+-      LOG.error("Error in restarting application: ", e);
+-    }
+-  }
+-
+-  public void stopApp(Service app) throws JsonProcessingException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    String appInstanceId = app.getName();
+-    String yarnFile = mapper.writeValueAsString(app);
+-    ClientResponse response;
+-    try {
+-      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+-          .put(ClientResponse.class, yarnFile);
+-      if (response.getStatus() >= 299) {
+-        String message = response.getEntity(String.class);
+-        throw new RuntimeException("Failed : HTTP error code : "
+-            + response.getStatus() + " error: " + message);
+-      }
+-    } catch (UniformInterfaceException | ClientHandlerException
+-        | IOException e) {
+-      LOG.error("Error in stopping application: ", e);
+-    }
+-  }
+-
+-  public void getStatus(AppEntry entry) {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    String appInstanceId = entry.getName();
+-    Service app = null;
+-    try {
+-      String yarnFile = asc.getApiClient(asc.getServicePath(appInstanceId))
+-          .get(String.class);
+-      app = mapper.readValue(yarnFile, Service.class);
+-      entry.setYarnfile(app);
+-    } catch (UniformInterfaceException | IOException e) {
+-      LOG.error("Error in fetching application status: ", e);
+-    }
+-  }
+-
+-  public void upgradeApp(Service app) throws JsonProcessingException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    String appInstanceId = app.getName();
+-    app.setState(ServiceState.EXPRESS_UPGRADING);
+-    String yarnFile = mapper.writeValueAsString(app);
+-    ClientResponse response;
+-    try {
+-      response = asc.getApiClient(asc.getServicePath(appInstanceId))
+-          .put(ClientResponse.class, yarnFile);
+-      if (response.getStatus() >= 299) {
+-        String message = response.getEntity(String.class);
+-        throw new RuntimeException("Failed : HTTP error code : "
+-            + response.getStatus() + " error: " + message);
+-      }
+-    } catch (UniformInterfaceException | ClientHandlerException
+-        | IOException e) {
+-      LOG.error("Error in stopping application: ", e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java
+deleted file mode 100644
+index e8077cacc44..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- *
+- */
+-/**
+- * Application Catalog.
+- */
+-package org.apache.hadoop.yarn.appcatalog.application;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java
+deleted file mode 100644
+index 63aefa615ff..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsController.java
++++ /dev/null
+@@ -1,299 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import java.io.IOException;
+-
+-import javax.ws.rs.Consumes;
+-import javax.ws.rs.GET;
+-import javax.ws.rs.POST;
+-import javax.ws.rs.PUT;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.PathParam;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+-import org.apache.hadoop.yarn.appcatalog.application.YarnServiceClient;
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.solr.client.solrj.SolrServerException;
+-
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-
+-/**
+- * Application catalog REST API for displaying application details.
+- */
+-@Path("/app_details")
+-public class AppDetailsController {
+-
+-  public AppDetailsController() {
+-  }
+-
+-  /**
+-   * List detail information about the deployed application.
+-   *
+-   * @apiGroup AppDetailController
+-   * @apiName getDetails
+-   * @api {get} /app_details/config/{id}  Check config of application instance.
+-   * @apiParam {String} id Application ID to fetch configuration.
+-   * @apiSuccess {Object} AppEntry Application configuration.
+-   * @apiSuccessExample {json} Success-Response:
+-   *     HTTP/1.1 200 OK
+-   *     {
+-   *       "id":"howita_man",
+-   *        "name":"howita_man",
+-   *        "app":"Jenkins-ci.org/Jenkins",
+-   *        "yarnfile":{
+-   *           "name":"howita_man",
+-   *           "lifetime":3600,
+-   *           "containers":[
+-   *           ],
+-   *           "components":[
+-   *              {
+-   *                 "name":"jenkins",
+-   *                 "dependencies":[
+-   *                 ],
+-   *                 "artifact":{
+-   *                    "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+-   *                    "type":"DOCKER"
+-   *                 },
+-   *                 "launch_command":"",
+-   *                 "resource":{
+-   *                    "uri":null,
+-   *                    "profile":null,
+-   *                    "cpus":1,
+-   *                    "memory":"2048"
+-   *                 },
+-   *                 "number_of_containers":1,
+-   *                 "run_privileged_container":false,
+-   *                 "configuration":{
+-   *                    "properties":{
+-   *                    },
+-   *                    "env":{
+-   *                    },
+-   *                    "files":[
+-   *                    ]
+-   *                 },
+-   *                 "quicklinks":[
+-   *                 ],
+-   *                 "containers":[
+-   *                 ]
+-   *              }
+-   *           ],
+-   *           "configuration":{
+-   *              "properties":{
+-   *              },
+-   *              "env":{
+-   *              },
+-   *              "files":[
+-   *              ]
+-   *           },
+-   *           "quicklinks":{
+-   *              "Jenkins UI":"http://jenkins.howita_man.yarn.${DOMAIN}:8080/"
+-   *           }
+-   *        }
+-   *     }
+-   * @param id - Application ID
+-   * @return application entry-
+-   */
+-  @Path("config/{id}")
+-  @GET
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public AppEntry getDetails(@PathParam("id") String id) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    return sc.findAppEntry(id);
+-  }
+-
+-  /**
+-   * Check application status.
+-   *
+-   * @apiGroup AppDetailController
+-   * @apiName getStatus
+-   * @api {get} /app_details/status/{id}  Check status of application instance.
+-   * @apiParam {String} id Application ID to check.
+-   * @apiSuccessExample {json} Success-Response:
+-   *     HTTP/1.1 200 OK
+-   *     {
+-   *       "id":"howita_man",
+-   *        "name":"howita_man",
+-   *        "app":"Jenkins-ci.org/Jenkins",
+-   *        "yarnfile":{
+-   *           "name":"howita_man",
+-   *           "lifetime":3099,
+-   *           "containers":[
+-   *           ],
+-   *           "id":"application_1503694240849_0043",
+-   *           "components":[
+-   *              {
+-   *                 "name":"jenkins",
+-   *                 "dependencies":[
+-   *                 ],
+-   *                 "artifact":{
+-   *                    "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+-   *                    "type":"DOCKER"
+-   *                 },
+-   *                 "launch_command":"",
+-   *                 "resource":{
+-   *                    "uri":null,
+-   *                    "profile":null,
+-   *                    "cpus":1,
+-   *                    "memory":"2048"
+-   *                 },
+-   *                 "number_of_containers":1,
+-   *                 "run_privileged_container":false,
+-   *                 "configuration":{
+-   *                    "properties":{
+-   *                    },
+-   *                    "env":{
+-   *                    },
+-   *                    "files":[
+-   *                    ]
+-   *                 },
+-   *                 "quicklinks":[
+-   *                 ],
+-   *                 "containers":[
+-   *                    {
+-   *                       "id":"container_1503694240849_0043_01_000002",
+-   *                       "launch_time":1504630535403,
+-   *                       "bare_host":"eyang-4.openstacklocal",
+-   *                       "state":"READY",
+-   *                       "component_name":"jenkins-0"
+-   *                    }
+-   *                 ]
+-   *              }
+-   *           ],
+-   *           "configuration":{
+-   *              "properties":{
+-   *              },
+-   *              "env":{
+-   *              },
+-   *              "files":[
+-   *              ]
+-   *           },
+-   *           "quicklinks":{
+-   *              "Jenkins UI":"http://jenkins.howita_man.yarn.${DOMAIN}:8080/"
+-   *           }
+-   *        }
+-   *     }
+-   * @apiSuccess {Object} text Give status
+-   * @param id - Application ID
+-   * @return application entry
+-   */
+-  @Path("status/{id}")
+-  @GET
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public AppEntry getStatus(@PathParam("id") String id) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    AppEntry appEntry = sc.findAppEntry(id);
+-    YarnServiceClient yc = new YarnServiceClient();
+-    yc.getStatus(appEntry);
+-    return appEntry;
+-  }
+-
+-  /**
+-   * Stop an application.
+-   *
+-   * @apiGroup AppDetailController
+-   * @apiName stopApp
+-   * @api {post} /app_details/stop/{id}  Stop one instance of application.
+-   * @apiParam {String} id Application ID to stop.
+-   * @apiSuccess {String} text Give deployment status
+-   * @apiError BadRequest Requested application does not stop.
+-   * @param id - Application ID
+-   * @return Web response code
+-   */
+-  @Path("stop/{id}")
+-  @POST
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response stopApp(@PathParam("id") String id) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    AppEntry app = sc.findAppEntry(id);
+-    Service yarnApp = app.getYarnfile();
+-    yarnApp.setState(ServiceState.STOPPED);
+-    try {
+-      YarnServiceClient yc = new YarnServiceClient();
+-      yc.stopApp(yarnApp);
+-    } catch (JsonProcessingException e) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-    return Response.ok().build();
+-  }
+-
+-  /**
+-   * Restart an application.
+-   *
+-   * @apiGroup AppDetailController
+-   * @apiName restartApp
+-   * @api {post} /app_details/restart/{id}  Restart one instance of application.
+-   * @apiParam {String} id Application ID to restart.
+-   * @apiSuccess {String} text Give deployment status
+-   * @apiError BadRequest Requested application does not restart.
+-   * @param id - Application ID
+-   * @return Web response code
+-   */
+-  @Path("restart/{id}")
+-  @POST
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response restartApp(@PathParam("id") String id) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    AppEntry app = sc.findAppEntry(id);
+-    Service yarnApp = app.getYarnfile();
+-    yarnApp.setState(ServiceState.STARTED);
+-    try {
+-      YarnServiceClient yc = new YarnServiceClient();
+-      yc.restartApp(yarnApp);
+-    } catch (JsonProcessingException e) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-    return Response.ok().build();
+-  }
+-
+-  /**
+-   * Upgrade an application.
+-   *
+-   * @apiGroup AppDetailController
+-   * @apiName upgradeApp
+-   * @api {put} /app_details/upgrade/{id} Upgrade one instance of application.
+-   * @apiParam {String} id Application Name to upgrade.
+-   * @apiSuccess {String} text
+-   * @apiError BadRequest Requested application does not upgrade.
+-   * @return Web response code
+-   */
+-  @Path("upgrade/{id}")
+-  @PUT
+-  @Consumes(MediaType.APPLICATION_JSON)
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response upgradeApp(@PathParam("id") String id, Service app) {
+-    try {
+-      AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-      sc.upgradeApp(app);
+-      YarnServiceClient yc = new YarnServiceClient();
+-      yc.upgradeApp(app);
+-    } catch (IOException | SolrServerException e) {
+-      return Response.status(Status.BAD_REQUEST).entity(e.toString()).build();
+-    }
+-    String output = "{\"status\":\"Application upgrade requested.\",\"id\":\"" +
+-        app.getName() + "\"}";
+-    return Response.status(Status.ACCEPTED).entity(output).build();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java
+deleted file mode 100644
+index d818f23cdcf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppListController.java
++++ /dev/null
+@@ -1,182 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import java.io.IOException;
+-import java.util.List;
+-
+-import javax.ws.rs.Consumes;
+-import javax.ws.rs.DELETE;
+-import javax.ws.rs.GET;
+-import javax.ws.rs.POST;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.PathParam;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+-import org.apache.hadoop.yarn.appcatalog.application.YarnServiceClient;
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.solr.client.solrj.SolrServerException;
+-
+-/**
+- * Application deployment module.
+- */
+-@Path("/app_list")
+-@Produces({ MediaType.APPLICATION_JSON })
+-public class AppListController {
+-
+-  public AppListController() {
+-  }
+-
+-  /**
+-   * Get Application List.
+-   *
+-   * @apiGroup AppListController
+-   * @apiName get
+-   * @api {get} /app_list  Get list of deployed applications.
+-   * @apiSuccess {Object[]}  List<AppEntry> List of deployed Applications.
+-   * @apiSuccessExample {json} Success-Response:
+-   *     HTTP/1.1 200 OK
+-   *     [
+-   *        {
+-   *           "id":"howita-man",
+-   *           "name":"howita-man",
+-   *           "app":"Jenkins-ci.org/Jenkins",
+-   *           "yarnfile":{
+-   *              "name":"howita_man",
+-   *              "lifetime":3600,
+-   *              "containers":[
+-   *              ],
+-   *              "components":[
+-   *                 {
+-   *                    "name":"jenkins",
+-   *                    "dependencies":[
+-   *                    ],
+-   *                    "artifact":{
+-   *                       "id":"eyang-1.openstacklocal:5000/jenkins:latest",
+-   *                       "type":"DOCKER"
+-   *                    },
+-   *                    "launch_command":"",
+-   *                    "resource":{
+-   *                       "uri":null,
+-   *                       "profile":null,
+-   *                       "cpus":1,
+-   *                       "memory":"2048"
+-   *                    },
+-   *                    "number_of_containers":1,
+-   *                    "run_privileged_container":false,
+-   *                    "configuration":{
+-   *                       "properties":{
+-   *                       },
+-   *                       "env":{
+-   *                       },
+-   *                       "files":[
+-   *                       ]
+-   *                    },
+-   *                    "quicklinks":[
+-   *                    ],
+-   *                    "containers":[
+-   *                    ]
+-   *                 }
+-   *              ],
+-   *              "configuration":{
+-   *                 "properties":{
+-   *                 },
+-   *                 "env":{
+-   *                 },
+-   *                 "files":[
+-   *                 ]
+-   *              },
+-   *              "quicklinks":{
+-   *                 "Jenkins UI":"http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+-   *              }
+-   *           }
+-   *        },
+-   *        {
+-   *        ...
+-   *        }
+-   *     ]
+-   * @return - Active application deployed by current user.
+-   */
+-  @GET
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public List<AppEntry> getList() {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    return sc.listAppEntries();
+-  }
+-
+-  /**
+-   * Delete an application.
+-   *
+-   * @apiGroup AppListController
+-   * @apiName delete
+-   * @api {delete} /app_list  Delete one instance of application.
+-   * @apiParam {String} id Application name to delete.
+-   * @apiSuccess {String} text Delete request accepted
+-   * @param id - application ID
+-   * @param name - application name
+-   * @return Web response
+-   */
+-  @DELETE
+-  @Path("{id}/{name}")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response delete(@PathParam("id") String id,
+-      @PathParam("name") String name) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    sc.deleteApp(id);
+-    YarnServiceClient yc = new YarnServiceClient();
+-    yc.deleteApp(name);
+-    return Response.status(Status.ACCEPTED).build();
+-  }
+-
+-  /**
+-   * Deploy an application.
+-   *
+-   * @apiGroup AppListController
+-   * @apiName deploy
+-   * @api {post} /app_list/{id}  Deploy one instance of application.
+-   * @apiParam {String} id Application ID to deploy.
+-   * @apiSuccess {String} text Give deployment status
+-   * @apiError BadRequest Unable to deploy requested application.
+-   * @param id - application ID
+-   * @return Web response
+-   */
+-  @POST
+-  @Path("{id}")
+-  @Consumes(MediaType.APPLICATION_JSON)
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response deploy(@PathParam("id") String id, Service service) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    try {
+-      sc.deployApp(id, service);
+-    } catch (SolrServerException | IOException e) {
+-      return Response.status(Status.BAD_REQUEST).entity(e.toString()).build();
+-    }
+-    YarnServiceClient yc = new YarnServiceClient();
+-    yc.createApp(service);
+-    String output = "{\"status\":\"Application deployed.\",\"id\":\"" +
+-        service.getName() + "\"}";
+-    return Response.status(Status.ACCEPTED).entity(output).build();
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java
+deleted file mode 100644
+index 5abb548b5dc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreController.java
++++ /dev/null
+@@ -1,198 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import java.io.IOException;
+-import java.util.List;
+-
+-import javax.ws.rs.GET;
+-import javax.ws.rs.POST;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.PathParam;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.QueryParam;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.hadoop.yarn.appcatalog.application.AppCatalogSolrClient;
+-import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.Application;
+-
+-/**
+- * Application catalog REST API for searching and recommending
+- * applications.
+- *
+- */
+-@Path("/app_store")
+-public class AppStoreController {
+-
+-  public AppStoreController() {
+-  }
+-
+-  /**
+-   * Display the most frequently used applications on YARN AppCatalog home page.
+-   *
+-   * @apiGroup AppStoreController
+-   * @apiName get
+-   * @api {get} /app_store/recommended  Display recommended applications.
+-   * @apiSuccess {Object} AppEntry Application configuration.
+-   * @apiSuccessExample {json} Success-Response:
+-   *     HTTP/1.1 200 OK
+-   *     [
+-   *        {
+-   *           "id":"96b7833a-e3",
+-   *           "org":"Hortonworks",
+-   *           "name":"LAMP",
+-   *           "desc":"Linux Apache MySQL PHP web application",
+-   *           "icon":"/css/img/feather.png",
+-   *           "like":0,
+-   *           "download":0,
+-   *           "app":null
+-   *        },
+-   *        {
+-   *        ...
+-   *        }
+-   *     ]
+-   * @return - List of YARN applications
+-   */
+-  @GET
+-  @Path("recommended")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public List<AppStoreEntry> get() {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    return sc.getRecommendedApps();
+-  }
+-
+-  /**
+-   * Search for yarn applications from solr.
+-   *
+-   * @apiGroup AppStoreController
+-   * @apiName search
+-   * @api {get} /app_store/search  Find application from appstore.
+-   * @apiParam {String} q Keyword to search.
+-   * @apiSuccess {Object} AppStoreEntry List of matched applications.
+-   * @apiSuccessExample {json} Success-Response:
+-   *     HTTP/1.1 200 OK
+-   *     [
+-   *        {
+-   *           "id":"96b7833a-e3",
+-   *           "org":"Hortonworks",
+-   *           "name":"LAMP",
+-   *           "desc":"Linux Apache MySQL PHP web application",
+-   *           "icon":"/css/img/feather.png",
+-   *           "like":0,
+-   *           "download":0,
+-   *           "app":null
+-   *        },
+-   *        {
+-   *        ...
+-   *        }
+-   *     ]
+-   * @param keyword - search for keyword
+-   * @return - List of YARN applications matching keyword search.
+-   */
+-  @GET
+-  @Path("search")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public List<AppStoreEntry> search(@QueryParam("q") String keyword) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    return sc.search(keyword);
+-  }
+-
+-  /**
+-   * Find yarn application from solr.
+-   *
+-   * @param id Application ID
+-   * @return AppEntry
+-   */
+-  @GET
+-  @Path("get/{id}")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public AppStoreEntry get(@PathParam("id") String id) {
+-    AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-    return sc.findAppStoreEntry(id);
+-  }
+-
+-  /**
+-   * Register an application.
+-   *
+-   * @apiGroup AppStoreController
+-   * @apiName register
+-   * @api {post} /app_store/register  Register an application in appstore.
+-   * @apiParam {Object} app Application definition.
+-   * @apiParamExample {json} Request-Example:
+-   *     {
+-   *       "name": "Jenkins",
+-   *       "organization": "Jenkins-ci.org",
+-   *       "description": "The leading open source automation server",
+-   *       "icon": "/css/img/jenkins.png",
+-   *       "lifetime": "3600",
+-   *       "components": [
+-   *         {
+-   *           "name": "jenkins",
+-   *           "number_of_containers": 1,
+-   *           "artifact": {
+-   *             "id": "eyang-1.openstacklocal:5000/jenkins:latest",
+-   *             "type": "DOCKER"
+-   *           },
+-   *           "launch_command": "",
+-   *           "resource": {
+-   *             "cpus": 1,
+-   *             "memory": "2048"
+-   *           },
+-   *           "configuration": {
+-   *             "env": {
+-   *             },
+-   *             "files": [
+-   *             ]
+-   *           }
+-   *         }
+-   *       ],
+-   *       "quicklinks": {
+-   *         "Jenkins UI": "http://jenkins.${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+-   *       }
+-   *     }
+-   * @apiSuccess {String} Response Application register result.
+-   * @apiError BadRequest Error in process application registration.
+-   * @param app - Yarnfile in JSON form
+-   * @return Web response
+-   */
+-  @POST
+-  @Path("register")
+-  @Produces(MediaType.APPLICATION_JSON)
+-  public Response register(Application app) {
+-    try {
+-      if (app.getName()==null) {
+-        throw new IOException("Application name can not be empty.");
+-      }
+-      if (app.getOrganization()==null) {
+-        throw new IOException("Application organization can not be empty.");
+-      }
+-      if (app.getDescription()==null) {
+-        throw new IOException("Application description can not be empty.");
+-      }
+-      AppCatalogSolrClient sc = new AppCatalogSolrClient();
+-      sc.register(app);
+-    } catch (IOException e) {
+-      return Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
+-    }
+-    return Response.status(Status.ACCEPTED).build();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java
+deleted file mode 100644
+index f2507b15977..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/controller/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- *
+- */
+-/**
+- * Application Catalog controllers.
+- */
+-package org.apache.hadoop.yarn.appcatalog.controller;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java
+deleted file mode 100644
+index d7168fc7ef3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppDetails.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.model;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-/**
+- * Data model for user defined application configuration.
+- */
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+-public class AppDetails {
+-  private String image;
+-  private String version;
+-  private String[] ports;
+-  private String[] volumes;
+-  private String[] env;
+-
+-  public String getImage() {
+-    return image;
+-  }
+-
+-  public void setImage(String image) {
+-    this.image = image;
+-  }
+-
+-  public String getVersion() {
+-    return version;
+-  }
+-
+-  public void setVersion(String version) {
+-    this.version = version;
+-  }
+-
+-  public String[] getPorts() {
+-    return ports.clone();
+-  }
+-
+-  public void setPorts(String[] ports2) {
+-    this.ports = ports2.clone();
+-  }
+-
+-  public String[] getVolumes() {
+-    return volumes.clone();
+-  }
+-
+-  public void setVolumes(String[] volumes) {
+-    this.volumes = volumes.clone();
+-  }
+-
+-  public String[] getEnv() {
+-    return env.clone();
+-  }
+-
+-  public void setEnv(String[] env) {
+-    this.env = env.clone();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java
+deleted file mode 100644
+index acba4d9a8ba..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppEntry.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.model;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import javax.xml.bind.annotation.XmlType;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-
+-/**
+- * Data model for deployed application.
+- *
+- */
+-@XmlType(namespace="http://hadoop.apache.org", name="AppEntry")
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+-public class AppEntry {
+-  private String id;
+-  private String name;
+-  private String app;
+-  private Service yarnfile;
+-
+-  public String getId() {
+-    return id;
+-  }
+-
+-  public void setId(String id) {
+-    this.id = id;
+-  }
+-
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  public String getApp() {
+-    return app;
+-  }
+-
+-  public void setApp(String app) {
+-    this.app = app;
+-  }
+-
+-  public Service getYarnfile() {
+-    return yarnfile;
+-  }
+-
+-  public void setYarnfile(Service yarnfile) {
+-    this.yarnfile = yarnfile;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java
+deleted file mode 100644
+index f2452976008..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/AppStoreEntry.java
++++ /dev/null
+@@ -1,106 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.model;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-
+-/**
+- * Data model of application template stored in application catalog.
+- */
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
+-public class AppStoreEntry {
+-  private String id;
+-  private String org;
+-  private String name;
+-  private String desc;
+-  private String icon = "/css/img/feather.png";
+-  private long like;
+-  private long download;
+-  private Service app;
+-
+-  public String getOrg() {
+-    return org;
+-  }
+-
+-  public void setOrg(String org) {
+-    this.org = org;
+-  }
+-
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  public String getDesc() {
+-    return desc;
+-  }
+-
+-  public void setDesc(String desc) {
+-    this.desc = desc;
+-  }
+-
+-  public long getLike() {
+-    return like;
+-  }
+-
+-  public void setLike(long like) {
+-    this.like = like;
+-  }
+-
+-  public long getDownload() {
+-    return download;
+-  }
+-
+-  public void setDownload(long download) {
+-    this.download = download;
+-  }
+-
+-  public String getId() {
+-    return id;
+-  }
+-
+-  public void setId(String id) {
+-    this.id = id;
+-  }
+-
+-  public Service getApp() {
+-    return app;
+-  }
+-
+-  public void setApp(Service app) {
+-    this.app = app;
+-  }
+-
+-  public String getIcon() {
+-    return icon;
+-  }
+-
+-  public void setIcon(String icon) {
+-    this.icon = icon;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java
+deleted file mode 100644
+index c99104a33a0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/Application.java
++++ /dev/null
+@@ -1,89 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.model;
+-
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-
+-/**
+- * Data model of display recommended applications and descriptions.
+- */
+-@XmlRootElement
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-@JsonIgnoreProperties(ignoreUnknown = true)
+-@JsonPropertyOrder({ "organization", "name", "description", "icon" })
+-public class Application extends Service {
+-  private static final long serialVersionUID = -1776203219305414248L;
+-
+-  private String organization;
+-  private String description;
+-  private String icon;
+-
+-  @JsonProperty("organization")
+-  public String getOrganization() {
+-    return organization;
+-  }
+-  public void setOrganization(String organization) {
+-    this.organization = organization;
+-  }
+-
+-  @JsonProperty("description")
+-  public String getDescription() {
+-    return description;
+-  }
+-  public void setDescription(String description) {
+-    this.description = description;
+-  }
+-
+-  @JsonProperty("icon")
+-  public String getIcon() {
+-    return icon;
+-  }
+-  public void setIcon(String icon) {
+-    this.icon = icon;
+-  }
+-
+-  @Override
+-  public boolean equals(final Object obj) {
+-    if (obj == this) {
+-      return true;
+-    } else if ((obj instanceof Application)) {
+-      if (((Application) obj).getName().equals(this.getName())
+-          && ((Application) obj).getVersion().equals(this.getVersion())
+-          && ((Application) obj).getOrganization()
+-              .equals(this.getOrganization())) {
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects
+-        .hash(this.getName() + this.getVersion() + this.getOrganization());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java
+deleted file mode 100644
+index 9a20b993848..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/model/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- *
+- */
+-/**
+- * Application Catalog Data Models.
+- */
+-package org.apache.hadoop.yarn.appcatalog.model;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java
+deleted file mode 100644
+index 4346d1e6242..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/RandomWord.java
++++ /dev/null
+@@ -1,422 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.appcatalog.utils;
+-
+-import java.util.Arrays;
+-import java.util.Random;
+-
+-/**
+- * Random word generator utility.
+- */
+-public final class RandomWord {
+-
+-  private RandomWord() {
+-  }
+-
+-  public static String getNewWord(int wordLength) throws WordLengthException {
+-    if (wordLength < 3 || wordLength > 15) {
+-      throw new WordLengthException(
+-          "Word length error, words must be between 3 and 15 characters long.");
+-    }
+-    String theNewWord = "e";
+-    while (theNewWord.equals("e")) {
+-      try {
+-        theNewWord = generateRandomWord(wordLength);
+-      } catch (Exception e) {
+-      }
+-    }
+-    return theNewWord;
+-  }
+-
+-  private static String generateRandomWord(int wordLength) {
+-    String randomWord;
+-    // -----------------------------------------------------------------------
+-    // Bigram source and general concept based on
+-    // https://github.com/scrollback/scrollback & described in
+-    // https://www.hackerearth.com/notes/random-pronouncable-text-generator/
+-    String[] startBiGram = {"TH", "OF", "AN", "IN", "TO", "CO", "BE", "HE",
+-        "RE", "HA", "WA", "FO", "WH", "MA", "WI", "ON", "HI", "PR", "ST", "NO",
+-        "IS", "IT", "SE", "WE", "AS", "CA", "DE", "SO", "MO", "SH", "DI", "AL",
+-        "AR", "LI", "WO", "FR", "PA", "ME", "AT", "SU", "BU", "SA", "FI", "NE",
+-        "CH", "PO", "HO", "DO", "OR", "UN", "LO", "EX", "BY", "FA", "LA", "LE",
+-        "PE", "MI", "SI", "YO", "TR", "BA", "GO", "BO", "GR", "TE", "EN", "OU",
+-        "RA", "AC", "FE", "PL", "CL", "SP", "BR", "EV", "TA", "DA", "AB", "TI",
+-        "RO", "MU", "EA", "NA", "SC", "AD", "GE", "YE", "AF", "AG", "UP", "AP",
+-        "DR", "US", "PU", "CE", "IF", "RI", "VI", "IM", "AM", "KN", "OP", "CR",
+-        "OT", "JU", "QU", "TW", "GA", "VA", "VE", "PI", "GI", "BI", "FL", "BL",
+-        "EL", "JO", "FU", "HU", "CU", "RU", "OV", "MY", "OB", "KE", "EF", "PH",
+-        "CI", "KI", "NI", "SL", "EM", "SM", "VO", "MR", "WR", "ES", "DU", "TU",
+-        "AU", "NU", "GU", "OW", "SY", "JA", "OC", "EC", "ED", "ID", "JE", "AI",
+-        "EI", "SK", "OL", "GL", "EQ", "LU", "AV", "SW", "AW", "EY", "TY"};
+-    String[] lookupBiGram = {"TH", "AN", "IN", "IO", "EN", "TI", "FO", "HE",
+-        "HA", "HI", "TE", "AT", "ER", "AL", "WA", "VE", "CO", "RE", "IT", "WI",
+-        "ME", "NC", "ON", "PR", "AR", "ES", "EV", "ST", "EA", "IV", "EC", "NO",
+-        "OU", "PE", "IL", "IS", "MA", "AV", "OM", "IC", "GH", "DE", "AI", "CT",
+-        "IG", "ID", " OR", "OV", "UL", "YO", "BU", "RA", "FR", "RO", "WH", "OT",
+-        "BL", "NT", "UN", "TR", "HO", "AC", "TU", "WE", "CA", "SH", "UR", "IE",
+-        "PA", "TO", "EE", "LI", "RI", "UG", "AM", "ND", "US", "LL", "AS", "TA",
+-        "LE", "MO", "WO", "MI", "AB", "EL", "IA", "NA", "SS", "AG", "TT", "NE",
+-        "PL", " LA", "OS", "CE", "DI", "BE", "AP", "SI", "NI", "OW", "SO", "AK",
+-        "CH", "EM", "IM", "SE", "NS", "PO", "EI", "EX", "KI", "UC", "AD", "GR",
+-        "IR", "NG", "OP", "SP", "OL", "DA", "NL", "TL", "LO", "BO", "RS", "FE",
+-        "FI", "SU", "GE", "MP", "UA", "OO", "RT", "SA", "CR", "FF", "IK", "MB",
+-        " KE", "FA", "CI", "EQ", "AF", "ET", "AY", "MU", "UE", "HR", "TW", "GI",
+-        "OI", "VI", "CU", "FU", "ED", "QU", "UT", "RC", "OF", "CL", "FT", "IZ",
+-        "PP", "RG", "DU", "RM", "YE", "RL", "DO", "AU", "EP", "BA", "JU", "RD",
+-        "RU", "OG", "BR", "EF", "KN", "LS", "GA", "PI", "YI", "BI", "IB", "UB",
+-        "VA", "OC", "IF", "RN", "RR", "SC", "TC", "CK", "DG", "DR", "MM", "NN",
+-        "OD", "RV", "UD", "XP", "JE", "UM", "EG", "DL", "PH", "SL", "GO", "CC",
+-        "LU", "OA", "PU", "UI", "YS", "ZA", "HU", "MR", "OE", "SY", "EO", "TY",
+-        "UP", "FL", "LM", "NF", "RP", "OH", "NU", "XA", "OB", "VO", "DM", "GN",
+-        " LD", "PT", "SK", "WR", "JO", "LT", "YT", "UF", "BJ", "DD", "EY", "GG",
+-        "GL", "GU", "HT", "LV", "MS", "NM", "NV", "OK", "PM", "RK", "SW", "TM",
+-        "XC", "ZE", "AW", "SM"};
+-    String[][][] nextCharLookup = {
+-        {{"E", "A", "I", "O", "R"}, {"E", "O"}},
+-        {{"D", "T", "Y", "C", "S", "G", "N", "I", "O", "E", "A", "K"},
+-            {"D", "T", "Y", "S", "G", "O", "E", "A", "K"}},
+-        {{"G", "T", "E", "D", "S", "C", "A", "I", "K", "V", "U", "N", "F"},
+-            {"G", "T", "E", "D", "S", "A", "K"}},
+-        {{"N", "U", "R"}, {"N", "U", "R"}},
+-        {{"T", "C", "D", "S", "E", "I", "G", "O", "N", "A"},
+-            {"T", "D", "S", "E", "G", "O", "A"}},
+-        {{"O", "N", "C", "V", "M", "L", "E", "T", "S", "A", "R", "F"},
+-            {"N", "C", "M", "L", "E", "T", "S", "A", "R", "F"}},
+-        {{"R", "U", "O", "L"}, {"R", "U", "O", "L"}},
+-        {{"R", "N", "Y", "S", "M", "I", "A", "L", "D", "T"},
+-            {"R", "N", "Y", "S", "M", "A", "L", "D", "T"}},
+-        {{"T", "D", "V", "N", "S", "R", "P", "L"},
+-            {"T", "D", "N", "S", "R", "L"}},
+-        {{"S", "N", "C", "M", "L", "P", "G", "T", "R", "E"},
+-            {"S", "N", "C", "M", "L", "P", "G", "T", "R", "E"}},
+-        {{"R", "D", "N", "S", "M", "L", "E", "C", "A"},
+-            {"R", "D", "N", "S", "M", "L", "E", "A"}},
+-        {{"I", "E", "T", "H", "U", "O", "C"}, {"E", "H", "O"}},
+-        {{"E", "S", "I", "A", "N", "Y", "T", "V", "M", "R", "O", "L", "G",
+-             "F", "C"}, {"E", "S", "A", "N", "Y", "T", "M"}},
+-        {{"L", "S", "I", "T", "E", "U", "O", "M", "K", "F", "A"},
+-            {"L", "S", "T", "E", "F"}},
+-        {{"S", "Y", "R", "T", "N", "L"}, {"S", "Y", "R", "T", "N", "L"}},
+-        {{"R", "N", "L", "S", "D"}, {"R", "N", "L", "S", "D"}},
+-        {{"N", "M", "U", "R", "L", "V", "S", "O"},
+-            {"N", "M", "U", "R", "L", "O"}},
+-        {{"S", "A", "D", "N", "E", "C", "L", "T", "P", "M", "V", "G", "F",
+-             "Q"}, {"S", "A", "D", "N", "E", "L", "T", "P", "M"}},
+-        {{"H", "I", "Y", "E", "S", "T", "A", "U"},
+-            {"H", "Y", "E", "S", "A"}},
+-        {{"T", "L", "N", "S"}, {"T", "L", "N", "S"}},
+-        {{"N", "R", "D", "T", "S", "M", "A"},
+-            {"N", "R", "D", "T", "S", "M", "A"}},
+-        {{"E", "I", "H", "T", "R", "O", "L"}, {"E", "H", "T"}},
+-        {{"S", "E", "T", "G", "A", "D", "L", "C", "V", "O", "I", "F"},
+-            {"S", "E", "T", "G", "A", "D", "O"}},
+-        {{"O", "E", "I", "A"}, {"E", "A"}},
+-        {{"E", "T", "D", "Y", "S", "I", "R", "L", "M", "K", "G", "A", "O",
+-             "N", "C"}, {"E", "T", "D", "Y", "S", "M", "K", "A", "N"}},
+-        {{"S", "T", "E", "I", "P", "U", "C"}, {"S", "T", "E"}},
+-        {{"E", "I"}, {"E"}},
+-        {{"A", "R", "I", "E", "O", "U", "S"}, {"A", "E", "O", "S"}},
+-        {{"R", "S", "T", "D", "L", "C", "N", "V", "M", "K"},
+-            {"R", "S", "T", "D", "L", "N", "M"}},
+-        {{"E", "I", "A"}, {"E"}},
+-        {{"T", "O", "I", "E", "A", "U", "R", "H"}, {"T", "E", "H"}},
+-        {{"T", "W", "R", "U", "N", "M"}, {"T", "W", "R", "U", "N", "M"}},
+-        {{"T", "L", "R", "N", "S", "G", "P", "B"},
+-            {"T", "L", "R", "N", "S", "P"}},
+-        {{"R", "N", "C", "A", "D", "T", "O"}, {"R", "N", "A", "D", "T"}},
+-        {{"L", "E", "I", "Y", "D", "A"}, {"L", "E", "Y", "D"}},
+-        {{"T", "H", "S", "I", "E", "C", "M"}, {"T", "H", "S", "E", "M"}},
+-        {{"N", "T", "L", "K", "D", "S", "I", "G"},
+-            {"N", "T", "L", "D", "S"}},
+-        {{"E", "I", "A"}, {"E"}},
+-        {{"E", "P", "M", "I", "A"}, {"E"}},
+-        {{"A", "H", "E", "I", "T", "K", "U", "S"},
+-            {"H", "E", "T", "K", "S"}},
+-        {{"T"}, {"T"}},
+-        {{"R", "N", "S", "D", "A", "V", "P", "T", "M", "L", "F"},
+-            {"R", "N", "S", "D", "A", "P", "T", "M", "L"}},
+-        {{"N", "D", "R", "L", "T"}, {"N", "D", "R", "L", "T"}},
+-        {{"I", "E", "U", "S", "O"}, {"E", "S", "O"}},
+-        {{"H", "N", "I"}, {"H", "N"}}, {{"E"}, {"E"}},
+-        {{"E", "T", "M", "D", "S", "K", "I", "Y", "L", "G", "A", "R", "N",
+-             "C"}, {"E", "T", "M", "D", "S", "K", "Y", "A", "N"}},
+-        {{"E", "I"}, {"E"}},
+-        {{"D", "T", "A", "L"}, {"D", "T", "L"}}, {{"U"}, {"U"}},
+-        {{"T", "S", "R", "I"}, {"T", "S", "R"}},
+-        {{"T", "N", "L", "C", "I", "M", "D", "S", "R", "P", "G", "B"},
+-            {"T", "N", "L", "M", "D", "S", "R"}},
+-        {{"O", "E", "A"}, {"E", "A"}},
+-        {{"M", "U", "V", "P", "N", "W", "S", "O", "L", "D", "C", "B", "A",
+-             "T", "G"}, {"M", "U", "P", "N", "W", "O", "L", "D", "T"}},
+-        {{"I", "E", "O", "A"}, {"E", "O"}},
+-        {{"H", "E", "T", "I"}, {"H", "E"}},
+-        {{"E", "I", "Y", "O", "A"}, {"E", "Y"}},
+-        {{"E", "I", "S", "R", "O", "A", "L", "Y", "U", "H"},
+-            {"E", "S", "O", "A", "Y", "H"}},
+-        {{"D", "T", "I", "C", "G"}, {"D", "T", "G"}},
+-        {{"A", "I", "O", "E", "U", "Y"}, {"A", "E", "Y"}},
+-        {{"U", "W", "S", "R", "L", "O", "M", "T", "P", "N", "D"},
+-            {"U", "W", "R", "L", "O", "M", "T", "P", "N", "D"}},
+-        {{"T", "E", "K", "H", "C", "R", "I"}, {"T", "E", "K", "H"}},
+-        {{"R", "D", "A", "T"}, {"R", "T"}},
+-        {{"R", "L", "E", "V", "S", "N", "A"},
+-            {"R", "L", "E", "S", "N", "A"}},
+-        {{"L", "N", "T", "R", "U", "S", "M", "P"},
+-            {"L", "N", "T", "R", "S", "M"}},
+-        {{"E", "O", "I", "A"}, {"E", "O"}},
+-        {{"E", "N", "T", "S", "I", "A", "Y", "R", "P", "C"},
+-            {"E", "N", "T", "S", "A", "Y"}},
+-        {{"S", "N", "D", "T", "W", "V", "R", "L", "F"},
+-            {"S", "N", "D", "T", "W", "R", "L"}},
+-        {{"R", "T", "S", "N", "L", "I", "C"}, {"R", "T", "S", "N", "L"}},
+-        {{"R", "O", "N", "W", "P", "M", "L"},
+-            {"R", "O", "N", "W", "P", "M", "L"}},
+-        {{"N", "D", "T", "M", "S", "R", "P", "L", "K"},
+-            {"N", "D", "T", "M", "S", "R", "P", "L", "K"}},
+-        {{"N", "T", "S", "C", "K", "G", "E", "F", "Z", "V", "O", "M", "A"},
+-            {"N", "T", "S", "C", "G", "E", "F", "M", "A"}},
+-        {{"N", "E", "C", "T", "S", "G", "A", "V", "O", "P", "M", "L", "D",
+-             "B"}, {"N", "E", "C", "T", "S", "G", "A", "P", "M", "L", "D"}},
+-        {{"H", "G"}, {"H"}}, {{"E", "P", "I", "O", "A"}, {"E"}},
+-        {{"E", "I", "S", "A", "U", "O"}, {"E", "S", "O"}},
+-        {{"E", "T", "I", "S", "L", "H"}, {"E", "T", "S", "H"}},
+-        {{"Y", "E", "O", "I", "S", "A"}, {"Y", "E", "S"}},
+-        {{"T", "S", "E", "I", "U", "O", "K", "H"},
+-            {"T", "S", "E", "O", "H"}},
+-        {{"T", "N", "L", "I", "R", "K", "B", "G", "C"},
+-            {"T", "N", "L", "R"}},
+-        {{"S", "D", "A", "T", "C", "R", "N", "M", "G", "V", "F"},
+-            {"S", "D", "A", "T", "R", "N", "M"}},
+-        {{"R", "S", "V", "T", "U", "D"}, {"R", "T", "U", "D"}},
+-        {{"R", "U"}, {"R", "U"}},
+-        {{"N", "L", "S", "T", "C", "G"}, {"N", "L", "S", "T", "C", "G"}},
+-        {{"L", "O", "I"}, {}},
+-        {{"L", "Y", "I", "E", "F", "O", "A", "T", "S", "P", "D"},
+-            {"L", "Y", "E", "F", "T", "S", "D"}},
+-        {{"L", "N", "T"}, {"L", "N", "T"}},
+-        {{"L", "T", "R", "N", "M"}, {"L", "T", "R", "N", "M"}},
+-        {{"I", "E", "U", "O", "A"}, {"E", "O"}},
+-        {{"E", "A", "O"}, {"E", "O"}}, {{"E", "L", "I"}, {"E"}},
+-        {{"D", "S", "W", "R", "E", "Y", "V", "T", "L", "C", "A"},
+-            {"D", "S", "W", "R", "E", "Y", "T", "L", "A"}},
+-        {{"A", "E", "I", "Y", "O"}, {"E", "Y"}},
+-        {{"T", "N", "R", "S", "C", "Y", "W", "I", "B"},
+-            {"T", "N", "R", "S", "Y", "W"}},
+-        {{"T", "E", "S", "I"}, {"T", "E", "S"}},
+-        {{"S", "N", "R", "D", "P", "L", "I"},
+-            {"S", "N", "R", "D", "P", "L"}},
+-        {{"S", "N", "T", "D", "F", "E", "C", "A", "V", "R"},
+-            {"S", "N", "T", "D", "F", "E", "C", "A", "R"}},
+-        {{"R", "E", "C", "T", "L", "F", "S", "I", "G", "D", "A"},
+-            {"R", "E", "T", "L", "S", "D", "A"}},
+-        {{"P", "E", "A"}, {"E"}},
+-        {{"O", "N", "D", "T", "S", "G", "C", "B", "V", "M", "A"},
+-            {"N", "D", "T", "S", "G", "C", "M", "A"}},
+-        {{"N", "T", "S", "C", "Z", "O", "G", "F"},
+-            {"N", "T", "S", "C", "G", "F"}},
+-        {{"N", "E", "S", "I", "A"}, {"N", "E", "S"}},
+-        {{"N", "M", "U", "L", "C", "R"}, {"N", "M", "U", "L", "R"}},
+-        {{"E", "I"}, {"E"}},
+-        {{"E", "A", "I", "O", "U", "R"}, {"E", "O"}},
+-        {{"E", "S", "P", "O", "B", "A", "I"}, {"E", "S"}},
+-        {{"E", "P", "I", "A", "S", "M"}, {"E", "S"}},
+-        {{"D", "N", "L", "S", "R", "E", "C", "T", "V", "A"},
+-            {"D", "N", "L", "S", "R", "E", "T", "A"}},
+-        {{"T", "I", "E"}, {"T", "E"}},
+-        {{"S", "R", "N", "L", "W", "T", "I"}, {"R", "N", "L", "W", "T"}},
+-        {{"R", "N", "G", "T"}, {"R", "N", "G", "T"}},
+-        {{"P", "T", "I", "C", "A"}, {"T"}}, {{"N"}, {"N"}},
+-        {{"H", "T", "K", "E"}, {"H", "T", "K", "E"}},
+-        {{"E", "I", "Y", "V", "M", "D"}, {"E", "Y"}},
+-        {{"E", "A", "O"}, {"E", "A"}},
+-        {{"E", "S", "T", "L", "I"}, {"E", "S", "T"}},
+-        {{"E", "S", "L", "T", "R", "I"}, {"E", "S"}},
+-        {{"E", "P", "L"}, {"E"}}, {{"E", "O", "I", "A"}, {"E"}},
+-        {{"D", "L", "I", "O", "E", "U"}, {"D", "L", "E"}},
+-        {{"Y", "T", "R", "N"}, {"Y", "T", "R", "N"}},
+-        {{"Y"}, {"Y"}}, {{"Y", "E"}, {"Y", "E"}},
+-        {{"W", "N", "O", "S", "C", "V", "U", "T", "R", "P", "G"},
+-            {"W", "N", "O", "U", "T", "R", "P"}},
+-        {{"U", "T", "R", "O", "D", "A"}, {"U", "T", "R", "O", "D"}},
+-        {{"T", "E", "O", "I"}, {"T", "E", "O"}},
+-        {{"R", "E", "W", "L", "C", "A"}, {"R", "E", "W", "L", "A"}},
+-        {{"R", "N", "C", "E", "L", "G"}, {"R", "N", "C", "E", "L", "G"}},
+-        {{"R", "C", "P", "B", "M", "L", "A"}, {"R", "P", "M", "L"}},
+-        {{"N", "T", "S", "R", "D"}, {"N", "T", "S", "R", "D"}},
+-        {{"L", "O", "A", "T", "R", "E"}, {"T", "E"}},
+-        {{"L", "T", "R"}, {"L", "T", "R"}},
+-        {{"K", "D", "L", "T", "R", "N", "M"},
+-            {"K", "D", "L", "T", "R", "N", "M"}},
+-        {{"I", "H", "A", "E", "Y", "U", "S"}, {"H", "A", "E", "Y", "S"}},
+-        {{"I", "M", "Y", "N", "L"}, {"M", "Y", "N", "L"}},
+-        {{"E", "I", "O", "A"}, {"E", "A"}}, {{"E", "I"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"D", "N", "T", "S", "R", "E"}, {"D", "N", "T", "S", "R", "E"}},
+-        {{"C", "R", "M", "I"}, {"R", "M"}},
+-        {{"A", "T", "E", "S", "P", "N"}, {"A", "T", "E", "S", "P", "N"}},
+-        {{"U"}, {}}, {{"T", "F"}, {"T", "F"}},
+-        {{"T", "I", "H", "E", "Y", "W", "S", "A"},
+-            {"H", "E", "Y", "S", "A"}},
+-        {{"S", "E"}, {"S"}},
+-        {{"S", "N", "L", "C"}, {"S", "N", "L"}},
+-        {{"S", "N"}, {"S", "N"}}, {{"O", "E", "I"}, {"E"}},
+-        {{"O", "E"}, {"O", "E"}},
+-        {{"N", "V", "O", "C"}, {"N", "C"}}, {{"N"}, {"N"}},
+-        {{"N", "D", "S", "C", "T", "O", "L", "E"},
+-            {"N", "D", "S", "C", "T", "L", "E"}},
+-        {{"L", "R", "T", "S"}, {"L", "R", "T", "S"}},
+-        {{"L", "R", "N"}, {"L", "R", "N"}},
+-        {{"I", "U", "E"}, {"E"}}, {{"I", "E", "A"}, {"E"}},
+-        {{"I", "H", "E"}, {"H", "E"}}, {{"H", "E"}, {"H", "E"}},
+-        {{"F", "T"}, {"F", "T"}}, {{"E", "A", "U", "O"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E", "A"}, {"E"}},
+-        {{"E", "O", "R", "L"}, {"E"}}, {{"E", "A"}, {"E"}},
+-        {{"C", "S", "R", "A"}, {"S", "R"}},
+-        {{"A", "S", "I", "E"}, {"S", "E"}},
+-        {{"A", "S", "D"}, {"A", "S", "D"}},
+-        {{"Y", "D"}, {"Y", "D"}},
+-        {{"W", "N", "M", "E"}, {"W", "N", "M"}},
+-        {{"T", "S"}, {"T", "S"}},
+-        {{"T", "O", "E", "A"}, {"T", "E"}},
+-        {{"S", "C", "R", "N", "L"}, {"S", "R", "N", "L"}},
+-        {{"S"}, {"S"}}, {{"S", "E", "I"}, {"S", "E"}},
+-        {{"S", "N", "C"}, {"S", "N"}}, {{"R", "I"}, {}},
+-        {{"O", "I", "E", "A"}, {"E", "A"}},
+-        {{"O", "F", "U", "T", "E"}, {"F", "T", "E"}},
+-        {{"O", "E"}, {"O", "E"}}, {{"O"}, {"O"}},
+-        {{"N", "I", "T", "R"}, {"N", "T", "R"}},
+-        {{"N", "T", "R", "E", "C"}, {"N", "T", "R", "E", "C"}},
+-        {{"N"}, {"N"}}, {{"L", "T", "N"}, {"L", "T", "N"}},
+-        {{"L", "I", "E"}, {"E"}}, {{"L"}, {}},
+-        {{"L", "T", "R", "N"}, {"L", "T", "R", "N"}},
+-        {{"K", "I", "E", "C", "A"}, {"K", "E"}},
+-        {{"I", "F", "E", "T"}, {"F", "E", "T"}},
+-        {{"I", "E", "M", "A"}, {"E", "A"}},
+-        {{"I", "E", "Y", "O"}, {"E", "Y"}},
+-        {{"H", "R", "O", "I", "A"}, {"H"}}, {{"H"}, {"H"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"E", "O", "I", "A"}, {"E", "A"}},
+-        {{"E", "U", "I"}, {"E"}}, {{"E", "O", "I"}, {"E", "O"}},
+-        {{"E", "Y", "U"}, {"E", "Y"}}, {{"E", "I"}, {"E"}},
+-        {{"E", "I"}, {"E"}}, {{"E"}, {"E"}}, {{"C"}, {}},
+-        {{"B", "E"}, {"E"}}, {{"A", "R", "I", "E"}, {"E"}},
+-        {{"Y", "E"}, {"Y", "E"}},
+-        {{"Y", "O", "I", "E"}, {"Y", "O", "E"}},
+-        {{"Y", "A"}, {"Y"}}, {{"V", "T", "O"}, {"T", "O"}},
+-        {{"U", "O", "E"}, {"E"}},
+-        {{"T", "S", "M", "E", "D"}, {"T", "S", "M", "E"}},
+-        {{"T", "R", "D"}, {"T", "R", "D"}},
+-        {{"T", "R", "L", "B"}, {"T", "R", "L"}},
+-        {{"T", "R", "L"}, {"T", "R", "L"}}, {{"T"}, {"T"}},
+-        {{"T"}, {"T"}},
+-        {{"S", "R", "N", "M"}, {"S", "R", "N", "M"}},
+-        {{"S"}, {"S"}}, {{"S"}, {"S"}}, {{"S"}, {"S"}},
+-        {{"R", "P"}, {"R", "P"}}, {{"P"}, {}}, {{"P", "O"}, {}},
+-        {{"O", "E"}, {"E"}}, {{"O"}, {}}, {{"O"}, {}},
+-        {{"O"}, {}}, {{"N"}, {}}, {{"M"}, {"M"}},
+-        {{"M"}, {"M"}}, {{"L"}, {}}, {{"L"}, {"L"}},
+-        {{"I"}, {}}, {{"I"}, {}}, {{"I", "E"}, {"E"}},
+-        {{"I"}, {}}, {{"I", "E"}, {"E"}}, {{"I"}, {}},
+-        {{"H"}, {}}, {{"H", "E"}, {"H", "E"}}, {{"H"}, {"H"}},
+-        {{"F"}, {"F"}}, {{"E"}, {}}, {{"E"}, {"E"}},
+-        {{"E"}, {}}, {{"E"}, {"E"}}, {{"E", "A"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"E"}, {"E"}}, {{"E"}, {"E"}}, {{"E"}, {"E"}},
+-        {{"D"}, {"D"}}, {{"A"}, {}}, {{"A"}, {}}};
+-    // ------------------------------------------------------------------------
+-    randomWord = startBiGram[indexGenerator(startBiGram.length)];
+-    int flag = 0;
+-    int count = 0;
+-    String previousWord;
+-    while (randomWord.length() != wordLength) {
+-      previousWord = randomWord;
+-      randomWord = addCharacter(startBiGram, wordLength, randomWord,
+-          lookupBiGram, nextCharLookup, flag);
+-      if (previousWord.equals(randomWord)) {
+-        count++;
+-      } else {
+-        flag = 0;
+-      }
+-      if (count == 5) {
+-        flag = 1;
+-        count++;
+-      } else if (count == 20) {
+-        randomWord = startBiGram[indexGenerator(startBiGram.length)];
+-        count = 0;
+-      }
+-    }
+-    return randomWord;
+-  }
+-
+-  private static String addCharacter(String[] startBiGram, int desiredLength,
+-      String currentWord, String[] lookupBiGram, String[][][] nextCharLookup,
+-      int flag) {
+-    int mainIndex = getLookupIndex(currentWord, lookupBiGram);
+-    int type = 0;
+-    if (currentWord.length() == (desiredLength - 1)) {
+-      type = 1;
+-    }
+-    while (mainIndex < 0 || mainIndex > 263
+-        || nextCharLookup[mainIndex][type].length <= 0) {
+-      if (currentWord.length() == 2) {
+-        return startBiGram[indexGenerator(startBiGram.length)];
+-      }
+-      if (flag == 1) {
+-        currentWord = backtrack(currentWord, 2);
+-        flag = 0;
+-      } else {
+-        currentWord = backtrack(currentWord, 1);
+-      }
+-      mainIndex = getLookupIndex(currentWord, lookupBiGram);
+-      if (type == 1) {
+-        type = 0;
+-      }
+-    }
+-    String updatedWord = currentWord
+-        + getNextCharacter(type, mainIndex, nextCharLookup);
+-    return updatedWord;
+-  }
+-
+-  private static int indexGenerator(int arrayLength) {
+-    int theIndex;
+-    Random generator = new Random();
+-    theIndex = generator.nextInt(arrayLength);
+-    return theIndex;
+-  }
+-
+-  private static String getNextCharacter(int type, int mainIndex,
+-      String[][][] theCharacterVault) {
+-    String nextChar;
+-    int i = indexGenerator(theCharacterVault[mainIndex][type].length);
+-    nextChar = theCharacterVault[mainIndex][type][i];
+-    return nextChar;
+-  }
+-
+-  private static String backtrack(String theWord, int numberChars) {
+-    theWord = theWord.substring(0, theWord.length() - numberChars);
+-    return theWord;
+-  }
+-
+-  private static int getLookupIndex(String theWord, String[] lookupArray) {
+-    String lookupCharacters = theWord.substring(theWord.length() - 2);
+-    int lookupIndex = Arrays.asList(lookupArray).indexOf(lookupCharacters);
+-    return lookupIndex;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java
+deleted file mode 100644
+index 42a5f7fb47c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/WordLengthException.java
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.appcatalog.utils;
+-
+-/**
+- * Word length exception class.
+- */
+-public class WordLengthException extends Exception {
+-  private static final long serialVersionUID = -217354336577036950L;
+-
+-  public WordLengthException(String message){
+-    super(message);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java
+deleted file mode 100644
+index bde7fc55e41..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/utils/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- *
+- */
+-/**
+- * Application Catalog Utilities classes.
+- */
+-package org.apache.hadoop.yarn.appcatalog.utils;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js
+deleted file mode 100644
+index 4cab2b4ddcc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/app.js
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-var app = angular.module('app', [
+-   'ngRoute',
+-   'filters',
+-   'controllers'
+-]);
+-
+-app.directive('jsonText', function() {
+-  return {
+-      restrict: 'A',
+-      require: 'ngModel',
+-      link: function(scope, element, attr, ngModel) {
+-        function into(input) {
+-          console.log(JSON.parse(input));
+-          return JSON.parse(input);
+-        }
+-        function out(data) {
+-          return JSON.stringify(data);
+-        }
+-        ngModel.$parsers.push(into);
+-        ngModel.$formatters.push(out);
+-      }
+-  };
+-});
+-
+-app.config(['$routeProvider',
+-  function ($routeProvider) {
+-    $routeProvider.when('/', {
+-      templateUrl: 'partials/home.html',
+-      controller: 'AppStoreController'
+-    }).when('/app/:id', {
+-      templateUrl: 'partials/details.html',
+-      controller: 'AppDetailsController'
+-    }).when('/new', {
+-      templateUrl: 'partials/new.html',
+-      controller: 'NewAppController'
+-    }).when('/deploy/:id', {
+-      templateUrl: 'partials/deploy.html',
+-      controller: 'DeployAppController'
+-    }).when('/upgrade/:id', {
+-      templateUrl: 'partials/upgrade.html',
+-      controller: 'UpgradeAppController'
+-    }).otherwise({
+-      redirectTo: '/'
+-    });
+-}]);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js
+deleted file mode 100644
+index 4d9e42d3277..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/controllers.js
++++ /dev/null
+@@ -1,374 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-var controllers = angular.module("controllers", []);
+-
+-controllers.controller("AppListController", [ '$scope', '$rootScope', '$http',
+-    function($scope, $rootScope, $http) {
+-      $scope.appList = [];
+-
+-      function successCallback(response) {
+-        $scope.appList = response.data;
+-        $rootScope.$emit("hideLoadScreen", {});
+-      }
+-
+-      function errorCallback(response) {
+-        $rootScope.$emit("hideLoadScreen", {});
+-        console.log("Error in downloading application list");
+-      }
+-
+-      $rootScope.$on("RefreshAppList", function() {
+-        $scope.refreshList();
+-      });
+-
+-      $scope.refreshList = function() {
+-        $http({
+-          method : 'GET',
+-          url : '/v1/app_list'
+-        }).then(successCallback, errorCallback);
+-      }
+-
+-      $scope.deleteApp = function(id, name) {
+-        $rootScope.$emit("showLoadScreen", {});
+-        $http({
+-          method: 'DELETE',
+-          url: '/v1/app_list/' + id + '/' + name
+-        }).then(function(response) {
+-          $rootScope.$emit("RefreshAppList", {});
+-          window.location = '/#';
+-        }, function(response) {
+-          console.log(response);
+-        });
+-      }
+-      $http({
+-        method : 'GET',
+-        url : '/v1/app_list'
+-      }).then(successCallback, errorCallback);
+-    } ]);
+-
+-controllers.controller("AppStoreController", [ '$scope', '$rootScope', '$http',
+-    function($scope, $rootScope, $http) {
+-      $scope.canDeployApp = function() {
+-        return false;
+-      };
+-      $scope.appStore = [];
+-      $scope.searchText = null;
+-
+-      function successCallback(response) {
+-        $scope.appStore = response.data;
+-      }
+-
+-      function errorCallback(response) {
+-        console.log("Error in downloading AppStore information.");
+-      }
+-
+-      $scope.deployApp = function(id) {
+-        window.location = '/#!/deploy/' + id;
+-      }
+-
+-      $http({
+-        method : 'GET',
+-        url : '/v1/app_store/recommended'
+-      }).then(successCallback, errorCallback);
+-
+-      $scope.change = function(text) {
+-        var q = $scope.searchText;
+-        $http({
+-          method : 'GET',
+-          url : '/v1/app_store/search?q=' + q
+-        }).then(successCallback, errorCallback);
+-      }
+-    } ]);
+-
+-controllers.controller("AppDetailsController", [ '$scope', '$interval', '$rootScope', '$http',
+-    '$routeParams', function($scope, $interval, $rootScope, $http, $routeParams) {
+-      $scope.details = {"yarnfile":{"state":"UNKNOWN"}};
+-      $scope.appName = $routeParams.id;
+-      var timer = $interval(function() {
+-        $scope.refreshAppDetails();
+-      }, 2000);
+-
+-      $scope.refreshAppDetails = function() {
+-        $http({
+-          method : 'GET',
+-          url : '/v1/app_details/status/' + $scope.appName
+-        }).then(successCallback, errorCallback);
+-      }
+-
+-      $scope.stopApp = function(id) {
+-        $http({
+-          method : 'POST',
+-          url : '/v1/app_details/stop/' + id
+-        }).then(function(data, status, header, config) {
+-          $scope.refreshAppDetails();
+-        }, errorCallback);
+-      }
+-
+-      $scope.restartApp = function(id) {
+-        $http({
+-          method : 'POST',
+-          url : '/v1/app_details/restart/' + id
+-        }).then(function(data, status, header, config) {
+-          $scope.refreshAppDetails();
+-        }, errorCallback);
+-      }
+-
+-      $scope.upgradeApp = function(id) {
+-        window.location = '/#!/upgrade/' + id;
+-      }
+-
+-      $scope.canDeployApp = function() {
+-        return true;
+-      };
+-
+-      $scope.checkServiceLink = function() {
+-        if ($scope.details.yarnfile.state != "STABLE") {
+-          return true;
+-        } else {
+-          return false;
+-        }
+-      }
+-
+-      function successCallback(response) {
+-        if (response.data.yarnfile.components.length!=0) {
+-          $scope.details = response.data;
+-        } else {
+-          // When application is in accepted or failed state, it does not
+-          // have components detail, hence we update states only.
+-          $scope.details.yarnfile.state = response.data.yarnfile.state;
+-        }
+-      }
+-
+-      function errorCallback(response) {
+-        console.log("Error in getting application detail");
+-      }
+-
+-      $rootScope.$on("RefreshAppDetails", function() {
+-        $scope.refreshAppDetails();
+-      });
+-
+-      $scope.$on("$locationChangeStart", function() {
+-        $interval.cancel(timer);
+-      });
+-
+-      $scope.$on('$destroy', function() {
+-        $interval.cancel(timer);
+-      });
+-
+-      $http({
+-        method : 'GET',
+-        url : '/v1/app_details/config/' + $scope.appName
+-      }).then(successCallback, errorCallback);
+-
+-    } ]);
+-
+-controllers.controller("NewAppController", [ '$scope', '$rootScope', '$http', function($scope, $rootScope, $http) {
+-    $scope.details = {
+-        "name" : "",
+-        "version" : "",
+-        "organization" : "",
+-        "description" : "",
+-        "quicklinks": {
+-          "UI": "http://${SERVICE_NAME}.${USER}.${DOMAIN}:8080/"
+-        },
+-        "icon" : "",
+-        "components" : [
+-          {
+-            "name" : "",
+-            "number_of_containers" : 1,
+-            "artifact" : {
+-              "id": "centos:latest"
+-            },
+-            "launch_command": "",
+-            "resource" : {
+-              "cpus" : 1,
+-              "memory" : 2048
+-            },
+-            "run_privileged_container" : false,
+-            "dependencies" : [],
+-            "placement_policy" : {
+-              "constraints" : []
+-            },
+-            "configuration" : {
+-              "env" : {
+-                "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true"
+-              },
+-              "properties" : {
+-                "docker.network":"host"
+-              }
+-            }
+-          }
+-        ]
+-    };
+-
+-    $scope.template = {
+-        "name" : "",
+-        "number_of_containers" : 1,
+-        "artifact" : {
+-          "id": "centos:latest"
+-        },
+-        "launch_command": "",
+-        "resource" : {
+-          "cpus" : 1,
+-          "memory" : 2048
+-        },
+-        "run_privileged_container" : false,
+-        "dependencies" : [],
+-        "placement_policy" : {
+-          "constraints" : []
+-        },
+-        "configuration" : {
+-          "env" : {
+-            "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true"
+-          },
+-          "properties" : {
+-            "docker.network":"host"
+-          }
+-        }
+-    };
+-
+-    $scope.message = null;
+-    $scope.error = null;
+-
+-    $scope.save = function() {
+-      $http({
+-        method : 'POST',
+-        url : '/v1/app_store/register',
+-        data : JSON.stringify($scope.details)
+-      }).then(successCallback, errorCallback)
+-    }
+-
+-    $scope.add = function() {
+-      $scope.details.components.push($scope.template);
+-    }
+-
+-    $scope.remove = function(index) {
+-      $scope.details.components.splice(index, 1);
+-    }
+-
+-    function successCallback(response) {
+-      $scope.message = "Application published successfully.";
+-      setTimeout(function() {
+-        $scope.$apply(function() {
+-          window.location = '/#';
+-        });
+-      }, 5000);
+-    }
+-
+-    function errorCallback(response) {
+-      $scope.error = "Error in registering application configuration.";
+-    }
+-
+-    } ]);
+-
+-controllers.controller("DeployAppController", [ '$scope', '$rootScope', '$http',
+-    '$routeParams', function($scope, $rootScope, $http, $routeParams) {
+-    $scope.id = $routeParams.id;
+-
+-    function successCallback(response) {
+-      $scope.details = response.data;
+-      $rootScope.$emit("hideLoadScreen", {});
+-    }
+-
+-    function errorCallback(response) {
+-      $rootScope.$emit("hideLoadScreen", {});
+-      console.log("Error in downloading application template.");
+-    }
+-
+-    $scope.launchApp = function(app) {
+-      $rootScope.$emit("showLoadScreen", {});
+-      $http({
+-        method : 'POST',
+-        url : '/v1/app_list/' + $scope.id,
+-        data : JSON.stringify($scope.details.app)
+-      }).then(function(data, status, headers, config) {
+-        $rootScope.$emit("RefreshAppList", {});
+-        window.location = '/#!/app/' + data.data.id;
+-      }, function(data, status, headers, config) {
+-        console.log('error', data, status);
+-      });
+-    }
+-
+-    $http({
+-      method : 'GET',
+-      url : '/v1/app_store/get/' + $scope.id
+-    }).then(successCallback, errorCallback);
+-
+-}]);
+-
+-controllers.controller("UpgradeAppController", [ '$scope', '$rootScope', '$http',
+-    '$routeParams', function($scope, $rootScope, $http, $routeParams) {
+-    $scope.message = null;
+-    $scope.error = null;
+-    $scope.appName = $routeParams.id;
+-    $scope.refreshAppDetails = function() {
+-      $http({
+-        method : 'GET',
+-        url : '/v1/app_details/status/' + $scope.appName
+-      }).then(successCallback, errorCallback);
+-    }
+-
+-    $scope.upgradeApp = function(app) {
+-      $rootScope.$emit("showLoadScreen", {});
+-      $http({
+-        method : 'PUT',
+-        url : '/v1/app_details/upgrade/' + $scope.appName,
+-        data : JSON.stringify($scope.details)
+-      }).then(function(data, status, headers, config) {
+-        $rootScope.$emit("RefreshAppList", {});
+-        window.location = '/#!/app/' + data.data.id;
+-      }, function(data, status, headers, config) {
+-        $rootScope.$emit("hideLoadScreen", {});
+-        $scope.error = data.data;
+-        $('#error-message').html(data.data);
+-        $('#myModal').modal('show');
+-        console.log('error', data, status);
+-      });
+-    }
+-
+-    function successCallback(response) {
+-      if (response.data.yarnfile.components.length!=0) {
+-        $scope.details = response.data.yarnfile;
+-      } else {
+-        // When application is in accepted or failed state, it does not
+-        // have components detail, hence we update states only.
+-        $scope.details.state = response.data.yarnfile.state;
+-      }
+-    }
+-
+-    function errorCallback(response) {
+-      $rootScope.$emit("hideLoadScreen", {});
+-      $scope.error = "Error in getting application detail.";
+-      $('#error-message').html($scope.error);
+-      $('#myModal').modal('show');
+-    }
+-
+-    $scope.refreshAppDetails();
+-}]);
+-
+-controllers.controller("LoadScreenController", [ '$scope', '$rootScope', '$http', function($scope, $rootScope, $http) {
+-  $scope.loadScreen = "hide";
+-
+-  $rootScope.$on("showLoadScreen", function() {
+-    $scope.loadScreen = "show";
+-  });
+-
+-  $rootScope.$on("hideLoadScreen", function() {
+-    $scope.loadScreen = "hide";
+-  });
+-
+-}]);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js
+deleted file mode 100644
+index bfb6838a6bf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/filters.js
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-var app = angular.module("filters", []);
+-
+-app.filter("counterValue",function(){
+-  return function(value){
+-    var count=parseInt(value), suffix="";
+-    if (count>=1000000){
+-      count=Math.round(count/1000000);
+-      suffix="M"
+-    } else if (count>=1000){
+-      count=Math.round(count/1000);
+-      suffix="K"
+-    }
+-    return""+count+suffix
+-  }
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js
+deleted file mode 100644
+index d5519133edc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/routes.js
++++ /dev/null
+@@ -1,17 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js
+deleted file mode 100644
+index d5519133edc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/javascript/services.js
++++ /dev/null
+@@ -1,17 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties
+deleted file mode 100644
+index 443b1082c1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/appcatalog.properties
++++ /dev/null
+@@ -1 +0,0 @@
+-solr_url=http://localhost:8983/solr/appcatalog/
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties
+deleted file mode 100644
+index 9a0c6083045..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/resources/log4j.properties
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-log4j.rootLogger = INFO, CATALINA
+-
+-# Define all the appenders
+-log4j.appender.CATALINA = org.apache.log4j.DailyRollingFileAppender
+-log4j.appender.CATALINA.File = ${catalina.base}/logs/appcatalog.log
+-log4j.appender.CATALINA.Append = true
+-log4j.appender.CATALINA.Encoding = UTF-8
+-# Roll-over the log once per day
+-log4j.appender.CATALINA.DatePattern = '.'yyyy-MM-dd'.log'
+-log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
+-log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore
+deleted file mode 100644
+index a725465aee2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/.gitignore
++++ /dev/null
+@@ -1 +0,0 @@
+-vendor/
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml
+deleted file mode 100644
+index 3326fa10766..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/beans.xml
++++ /dev/null
+@@ -1,22 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+-       bean-discovery-mode="annotated">
+-</beans>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml
+deleted file mode 100644
+index d9b17ae5905..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/WEB-INF/web.xml
++++ /dev/null
+@@ -1,117 +0,0 @@
+-<?xml version="1.0" encoding="ISO-8859-1"?>
+-<!--
+- Licensed to the Apache Software Foundation (ASF) under one or more
+-  contributor license agreements.  See the NOTICE file distributed with
+-  this work for additional information regarding copyright ownership.
+-  The ASF licenses this file to You under the Apache License, Version 2.0
+-  (the "License"); you may not use this file except in compliance with
+-  the License.  You may obtain a copy of the License at
+-      http://www.apache.org/licenses/LICENSE-2.0
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-
+-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+-   version="3.0">
+-
+-    <context-param>
+-      <param-name>local-deployment</param-name>
+-      <param-value>true</param-value>
+-    </context-param>
+-
+-
+-    <description>
+-      YARN Application Catalog
+-    </description>
+-    <display-name>appcatalog</display-name>
+-
+-    <listener>
+-      <listener-class>org.apache.hadoop.yarn.appcatalog.application.AppCatalogInitializer</listener-class>
+-    </listener>
+-
+-    <filter>
+-      <filter-name>AuthFilter</filter-name>
+-      <filter-class>${auth.filter}</filter-class>
+-      <init-param>
+-        <param-name>type</param-name>
+-        <param-value>${authentication.type}</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>simple.anonymous.allowed</param-name>
+-        <param-value>${simple.anonymous.allowed}</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>token.validity</param-name>
+-        <param-value>30</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>cookie.path</param-name>
+-        <param-value>/</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>cookie.domain</param-name>
+-        <param-value>${hostname}</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>kerberos.principal</param-name>
+-        <param-value>${kerberos.principal}</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>kerberos.keytab</param-name>
+-        <param-value>${kerberos.keytab}</param-value>
+-      </init-param>
+-    </filter>
+-
+-    <filter-mapping>
+-      <filter-name>AuthFilter</filter-name>
+-      <url-pattern>/*</url-pattern>
+-    </filter-mapping>
+-
+-    <servlet>
+-      <servlet-name>REST_API</servlet-name>
+-      <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+-      <init-param>
+-        <param-name>com.sun.jersey.config.property.packages</param-name>
+-        <param-value>org.apache.hadoop.yarn.appcatalog.controller;com.wordnik.swagger.jaxrs.listing;com.wordnik.swagger.jaxrs.json</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+-        <param-value>true</param-value>
+-      </init-param>
+-      <load-on-startup>1</load-on-startup>
+-    </servlet>
+-
+-    <servlet>
+-      <servlet-name>DefaultJaxrsConfig</servlet-name>
+-      <servlet-class>com.wordnik.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+-      <init-param>
+-        <param-name>api.version</param-name>
+-        <param-value>3</param-value>
+-      </init-param>
+-      <init-param>
+-        <param-name>swagger.api.basepath</param-name>
+-        <param-value>http://localhost:8080/v1</param-value>
+-      </init-param>
+-      <load-on-startup>2</load-on-startup>
+-    </servlet>
+-
+-    <servlet-mapping>
+-      <servlet-name>REST_API</servlet-name>
+-      <url-pattern>/v1/*</url-pattern>
+-    </servlet-mapping>
+-
+-    <filter>
+-       <filter-name>CorsFilter</filter-name>
+-       <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+-     </filter>
+-     <filter-mapping>
+-       <filter-name>CorsFilter</filter-name>
+-       <url-pattern>/*</url-pattern>
+-     </filter-mapping>
+-
+-</web-app>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css
+deleted file mode 100644
+index d6f9fa29d0c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.css
++++ /dev/null
+@@ -1,1526 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-@font-face {
+-  font-family: 'Roboto';
+-  font-weight: normal;
+-  font-style: normal;
+-  src: url('../vendor/roboto-fontface/fonts/roboto/Roboto-Regular.woff') format('woff');
+-}
+-.font-mixin {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-}
+-.btn,
+-.btn:focus {
+-  outline: none;
+-  font-family: 'Roboto', sans-serif;
+-  text-transform: uppercase;
+-  height: 34px;
+-  font-size: 14px;
+-  padding: 10px 20px;
+-  line-height: 14px;
+-}
+-.btn .glyphicon,
+-.btn:focus .glyphicon {
+-  top: -1px;
+-  float: left;
+-}
+-.box-shadow {
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-}
+-.btn-default-disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #FFF;
+-  background-color: #808793;
+-  border: none;
+-}
+-.btn-default,
+-.btn-default:focus {
+-  color: #666;
+-  background-color: #FFF;
+-  border: 1px solid #CFD3D7;
+-}
+-.btn-default:hover,
+-.btn-default:focus:hover {
+-  color: #FFF;
+-  background-color: #808793;
+-}
+-.btn-default:active,
+-.btn-default:focus:active {
+-  color: #666;
+-  background-color: #FFF;
+-  border: 1px solid #CFD3D7;
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-default[disabled],
+-.btn-default:focus[disabled],
+-.btn-default.disabled,
+-.btn-default:focus.disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #FFF;
+-  background-color: #808793;
+-  border: none;
+-}
+-.btn-default[disabled]:active,
+-.btn-default:focus[disabled]:active,
+-.btn-default.disabled:active,
+-.btn-default:focus.disabled:active,
+-.btn-default[disabled].active,
+-.btn-default:focus[disabled].active,
+-.btn-default.disabled.active,
+-.btn-default:focus.disabled.active,
+-.btn-default[disabled]:hover,
+-.btn-default:focus[disabled]:hover,
+-.btn-default.disabled:hover,
+-.btn-default:focus.disabled:hover {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #FFF;
+-  background-color: #808793;
+-  border: none;
+-}
+-.btn-primary-disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-primary,
+-.btn-primary:focus {
+-  color: #FFF;
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-primary:hover,
+-.btn-primary:focus:hover {
+-  color: #FFF;
+-  background-color: #429929;
+-  border: 1px solid #429929;
+-}
+-.btn-primary:active,
+-.btn-primary:focus:active,
+-.btn-primary.active,
+-.btn-primary:focus.active {
+-  color: #FFF;
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-primary[disabled],
+-.btn-primary:focus[disabled],
+-.btn-primary.disabled,
+-.btn-primary:focus.disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-primary[disabled]:active,
+-.btn-primary:focus[disabled]:active,
+-.btn-primary.disabled:active,
+-.btn-primary:focus.disabled:active,
+-.btn-primary[disabled].active,
+-.btn-primary:focus[disabled].active,
+-.btn-primary.disabled.active,
+-.btn-primary:focus.disabled.active,
+-.btn-primary[disabled]:hover,
+-.btn-primary:focus[disabled]:hover,
+-.btn-primary.disabled:hover,
+-.btn-primary:focus.disabled:hover {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-secondary-disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #429929;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-secondary,
+-.btn-secondary:focus {
+-  color: #429929;
+-  background-color: #FFF;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-secondary:hover,
+-.btn-secondary:focus:hover {
+-  color: #FFF;
+-  background-color: #429929;
+-}
+-.btn-secondary:active,
+-.btn-secondary:focus:active {
+-  color: #429929;
+-  background-color: #FFF;
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-secondary:visited {
+-  color: #429929;
+-  background-color: #FFF;
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-secondary:visited {
+-  color: #429929;
+-  background-color: #FFF;
+-  box-shadow: 0 0 2px 0 #1391c1;
+-}
+-.btn-secondary[disabled],
+-.btn-secondary:focus[disabled],
+-.btn-secondary.disabled,
+-.btn-secondary:focus.disabled {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #429929;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-secondary[disabled]:active,
+-.btn-secondary:focus[disabled]:active,
+-.btn-secondary.disabled:active,
+-.btn-secondary:focus.disabled:active,
+-.btn-secondary[disabled].active,
+-.btn-secondary:focus[disabled].active,
+-.btn-secondary.disabled.active,
+-.btn-secondary:focus.disabled.active,
+-.btn-secondary[disabled]:hover,
+-.btn-secondary:focus[disabled]:hover,
+-.btn-secondary.disabled:hover,
+-.btn-secondary:focus.disabled:hover {
+-  opacity: 0.6;
+-  box-shadow: none;
+-  color: #D1E8D1;
+-  background-color: #429929;
+-  border: 1px solid #3FAE2A;
+-}
+-.btn-success {
+-  border: none;
+-}
+-.btn-regular-default-state {
+-  background-color: #FFF;
+-  color: #666;
+-  border: 1px solid #cfd3d7;
+-}
+-.btn-primary-default-state {
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-  color: #FFF;
+-}
+-.btn-group.open .btn.dropdown-toggle,
+-.dropdown.open .btn.dropdown-toggle {
+-  box-shadow: inset 0px 0px 3px 0px #1391c1;
+-}
+-.btn-group.open .btn.dropdown-toggle,
+-.dropdown.open .btn.dropdown-toggle,
+-.btn-group.open .btn.dropdown-toggle.btn-default,
+-.dropdown.open .btn.dropdown-toggle.btn-default {
+-  background-color: #FFF;
+-  color: #666;
+-  border: 1px solid #cfd3d7;
+-}
+-.btn-group.open .btn.dropdown-toggle:hover,
+-.dropdown.open .btn.dropdown-toggle:hover,
+-.btn-group.open .btn.dropdown-toggle.btn-default:hover,
+-.dropdown.open .btn.dropdown-toggle.btn-default:hover {
+-  background-color: #FFF;
+-  color: #666;
+-  border: 1px solid #cfd3d7;
+-}
+-.btn-group.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
+-.dropdown.open .btn.dropdown-toggle + .dropdown-menu > li > a:hover,
+-.btn-group.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover,
+-.dropdown.open .btn.dropdown-toggle.btn-default + .dropdown-menu > li > a:hover {
+-  background-color: #808793;
+-  color: #FFF;
+-}
+-.btn-group.open .btn.dropdown-toggle.btn-primary,
+-.dropdown.open .btn.dropdown-toggle.btn-primary {
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-  color: #FFF;
+-}
+-.btn-group.open .btn.dropdown-toggle.btn-primary:hover,
+-.dropdown.open .btn.dropdown-toggle.btn-primary:hover {
+-  background-color: #3FAE2A;
+-  border: 1px solid #3FAE2A;
+-  color: #FFF;
+-}
+-.btn-group.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover,
+-.dropdown.open .btn.dropdown-toggle.btn-primary + .dropdown-menu > li > a:hover {
+-  background-color: #429929;
+-  color: #FFF;
+-}
+-.btn-group.open .dropdown-menu,
+-.dropdown.open .dropdown-menu {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  border-radius: 2px;
+-  font-size: 14px;
+-  min-width: 200px;
+-  background: #FFF;
+-  color: #666;
+-  border: 1px solid #cfd3d7;
+-}
+-.btn-group.open .dropdown-menu > li,
+-.dropdown.open .dropdown-menu > li {
+-  margin-bottom: 1px;
+-}
+-.btn-group.open .dropdown-menu > li > a,
+-.dropdown.open .dropdown-menu > li > a {
+-  height: 24px;
+-}
+-.btn-group .btn.dropdown-toggle:first-child,
+-.dropdown .btn.dropdown-toggle:first-child {
+-  min-width: 80px;
+-}
+-.btn-group .btn.dropdown-toggle.disabled,
+-.dropdown .btn.dropdown-toggle.disabled,
+-.btn-group .btn.dropdown-toggle[disabled],
+-.dropdown .btn.dropdown-toggle[disabled] {
+-  opacity: 0.6;
+-}
+-input.form-control {
+-  font-size: 14px;
+-  border-radius: 2px;
+-  color: #666;
+-  border: 1px solid #CFD3D7;
+-  height: 34px;
+-  padding: 10px;
+-}
+-input.form-control:focus {
+-  border-color: #1291c1;
+-  box-shadow: none;
+-}
+-.help-block {
+-  color: #999999;
+-  font-size: 14px;
+-}
+-.help-block.validation-block {
+-  color: #999999;
+-  margin-top: 10px;
+-}
+-.help-block.validation-block::before {
+-  position: relative;
+-  top: 2px;
+-  margin-right: 5px;
+-  font-family: 'Glyphicons Halflings';
+-}
+-.has-success input.form-control {
+-  color: #666;
+-  border: 1px solid #1EB475;
+-}
+-.has-success input.form-control:focus {
+-  border-color: #1EB475;
+-  box-shadow: none;
+-}
+-.has-success .help-block.validation-block::before {
+-  content: '\e084';
+-  color: #1EB475;
+-}
+-.has-error input.form-control {
+-  color: #666;
+-  border: 1px solid #EF6162;
+-}
+-.has-error input.form-control:focus {
+-  border-color: #EF6162;
+-  box-shadow: none;
+-}
+-.has-error .help-block.validation-block::before {
+-  content: '\e083';
+-  color: #EF6162;
+-}
+-.has-warning input.form-control {
+-  color: #666;
+-  border: 1px solid #E98A40;
+-}
+-.has-warning input.form-control:focus {
+-  border-color: #E98A40;
+-  box-shadow: none;
+-}
+-.has-warning .help-block.validation-block::before {
+-  content: '\e101';
+-  color: #E98A40;
+-}
+-.form-control[disabled],
+-.form-control[readonly],
+-fieldset[disabled] .form-control {
+-  color: #999999;
+-  border-color: #cccccc;
+-  background-color: #dddddd;
+-}
+-h2.table-title {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  margin-top: 10px;
+-  font-size: 20px;
+-}
+-.table {
+-  color: #666;
+-  font-size: 13px;
+-}
+-.table thead,
+-.table tfoot {
+-  color: #999;
+-}
+-.table input[type="checkbox"] + label {
+-  position: relative;
+-  line-height: 1.3em;
+-  font-size: initial;
+-  top: 4px;
+-  margin-bottom: 0;
+-}
+-.table thead > tr > th {
+-  border-bottom-color: #EEE;
+-}
+-.table tfoot > tr:first-of-type > td {
+-  border-top-width: 2px;
+-  border-top-color: #EEE;
+-}
+-.table > tbody > tr > td {
+-  border-top-color: #EEE;
+-}
+-.table > tbody > tr.active {
+-  background-color: #EEE;
+-}
+-.table > tbody > tr.active > td {
+-  background-color: #EEE;
+-}
+-.table.table-hover .action {
+-  visibility: hidden;
+-  padding: 0;
+-  line-height: 1;
+-}
+-.table.table-hover .action:hover {
+-  text-decoration: none;
+-}
+-.table.table-hover > tbody > tr {
+-  border-width: 0 1px 1px;
+-  border-style: solid;
+-  border-color: #EEE transparent;
+-}
+-.table.table-hover > tbody > tr > td {
+-  border-width: 0;
+-}
+-.table.table-hover > tbody > tr:hover {
+-  border-color: #A7DFF2;
+-  background-color: #E7F6FC;
+-}
+-.table.table-hover > tbody > tr:hover > td {
+-  border-top: 1px solid #A7DFF2;
+-  background-color: #E7F6FC;
+-}
+-.table.table-hover > tbody > tr:hover > td .action {
+-  visibility: visible;
+-}
+-.table.table-hover > tbody > tr:first-of-type > td {
+-  border-top: 1px solid transparent;
+-}
+-.table.table-hover > tbody > tr:first-of-type:hover > td {
+-  border-color: #A7DFF2;
+-}
+-.pagination-block .pagination-block-item {
+-  float: left;
+-  padding: 0 5px;
+-}
+-.pagination-block .pagination-block-item a,
+-.pagination-block .pagination-block-item a:visited,
+-.pagination-block .pagination-block-item a:focus {
+-  text-decoration: none;
+-}
+-.pagination-block .pagination-block-item select {
+-  border: none;
+-  background-color: transparent;
+-  color: #1491C1;
+-}
+-.nav.nav-tabs {
+-  border: none;
+-  margin-bottom: 20px;
+-}
+-.nav.nav-tabs li a {
+-  border-width: 0;
+-  border-radius: 0;
+-  border-bottom: 2px solid transparent;
+-  color: #666;
+-  text-transform: uppercase;
+-}
+-.nav.nav-tabs li a:hover,
+-.nav.nav-tabs li a:active,
+-.nav.nav-tabs li a:focus {
+-  color: #333;
+-  border-top-width: 0;
+-  border-left-width: 0;
+-  border-right-width: 0;
+-  background: none;
+-}
+-.nav.nav-tabs li a .badge.badge-important {
+-  display: inline;
+-}
+-.nav.nav-tabs li.active a {
+-  color: #333;
+-  border-bottom: 2px solid #3FAE2A;
+-}
+-.nav-tabs-left li,
+-.nav-tabs-right li {
+-  float: none;
+-  margin-bottom: 2px;
+-}
+-.nav-tabs-left li a,
+-.nav-tabs-right li a {
+-  margin-right: 0;
+-}
+-.nav-tabs-left li {
+-  margin-right: -1px;
+-}
+-.nav-tabs-left li a {
+-  border: 2px solid transparent !important;
+-}
+-.nav-tabs-left li.active a,
+-.nav-tabs-left li.active a:hover,
+-.nav-tabs-left li.active a:active,
+-.nav-tabs-left li.active a:focus {
+-  border-right: 2px solid #3FAE2A !important;
+-}
+-.nav-tabs-right li {
+-  margin-left: -1px;
+-}
+-.nav-tabs-right li a {
+-  border: 2px solid transparent !important;
+-}
+-.nav-tabs-right li.active a,
+-.nav-tabs-right li.active a:hover,
+-.nav-tabs-right li.active a:active,
+-.nav-tabs-right li.active a:focus {
+-  border-left: 2px solid #3FAE2A !important;
+-}
+-.wizard {
+-  border: 2px solid #ebecf1;
+-}
+-.wizard .wizard-header h3 {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  font-size: 20px;
+-  color: #333;
+-  margin: 15px 20px;
+-}
+-.wizard .wizard-body {
+-  overflow: hidden;
+-  margin: 0;
+-}
+-.wizard .wizard-body .wizard-content {
+-  background: #ebecf1;
+-  padding-top: 25px;
+-  float: left;
+-  margin-bottom: -99999px;
+-  padding-bottom: 99999px;
+-}
+-.wizard .wizard-body .wizard-content .step-title {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-weight: bold;
+-  font-size: 18px;
+-  color: #666;
+-}
+-.wizard .wizard-body .wizard-content .step-description {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  line-height: 1.4;
+-  color: #999;
+-}
+-.wizard .wizard-body .wizard-content .panel.panel-default {
+-  border: none;
+-  box-shadow: none;
+-  margin-top: 20px;
+-}
+-.wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
+-  padding: 30px 20px;
+-}
+-.wizard .wizard-body .wizard-nav {
+-  min-height: 550px;
+-  padding-top: 25px;
+-  background-color: #323544;
+-  float: left;
+-  margin-bottom: -99999px;
+-  padding-bottom: 99999px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li {
+-  padding: 0px 15px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li a {
+-  height: 48px;
+-  padding: 0px 5px;
+-  display: table-cell;
+-  vertical-align: middle;
+-}
+-.wizard .wizard-body .wizard-nav .nav li .step-marker {
+-  position: absolute;
+-  top: 9px;
+-  line-height: 16px;
+-  text-align: center;
+-  width: 20px;
+-  height: 20px;
+-  border: 2px solid #1EB475;
+-  border-radius: 50%;
+-  font-size: 12px;
+-  font-style: inherit;
+-  color: #1EB475;
+-  background-color: #323544;
+-}
+-.wizard .wizard-body .wizard-nav .nav li .step-name {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  color: #999;
+-  margin-left: 30px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li .step-index {
+-  line-height: 18px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li .step-description {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 12px;
+-  color: #999;
+-  margin-left: 30px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.completed .step-marker {
+-  background-color: #1EB475;
+-  color: white;
+-  font-size: 10px;
+-  padding-left: 2px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index {
+-  display: none;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.completed .step-marker:after {
+-  font-family: "Glyphicons Halflings";
+-  content: "\e013";
+-  position: relative;
+-  top: 1px;
+-  left: -1px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.completed:after {
+-  width: 2px;
+-  height: 100%;
+-  position: absolute;
+-  background-color: #1EB475;
+-  content: "";
+-  top: 25px;
+-  left: 29px;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.completed:last-child:after {
+-  content: none;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.active .step-name {
+-  font-weight: bold;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.disabled .step-marker {
+-  color: #666;
+-  border-color: #666;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.disabled .step-name,
+-.wizard .wizard-body .wizard-nav .nav li.disabled .step-description {
+-  color: #666;
+-}
+-.wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
+-  background-color: #1EB475;
+-  border: 2px solid #1EB475;
+-  color: white;
+-}
+-.wizard .wizard-body .wizard-nav .nav-pills > li.active > a,
+-.wizard .wizard-body .wizard-nav .nav-pills > li.active > a:focus,
+-.wizard .wizard-body .wizard-nav .nav-pills > li.active > a:hover,
+-.wizard .wizard-body .wizard-nav .nav > li > a:focus,
+-.wizard .wizard-body .wizard-nav .nav > li > a:hover {
+-  background-color: inherit;
+-}
+-.wizard .wizard-body .wizard-footer {
+-  background: white;
+-  padding: 15px 20px;
+-}
+-.wizard .wizard-body .wizard-footer button {
+-  margin: 0 10px;
+-}
+-.checkbox-disabled-style {
+-  background-color: #b2b8c1;
+-  border-color: #b2b8c1;
+-}
+-input[type="checkbox"]:not(:checked),
+-input[type="radio"]:not(:checked),
+-input[type="checkbox"]:checked,
+-input[type="radio"]:checked {
+-  display: none;
+-}
+-input[type="checkbox"]:not(:checked) + label,
+-input[type="radio"]:not(:checked) + label,
+-input[type="checkbox"]:checked + label,
+-input[type="radio"]:checked + label {
+-  position: relative;
+-  padding-left: 20px;
+-}
+-input[type="checkbox"]:not(:checked) + label:hover:before,
+-input[type="radio"]:not(:checked) + label:hover:before,
+-input[type="checkbox"]:checked + label:hover:before,
+-input[type="radio"]:checked + label:hover:before {
+-  border-color: #1491C1;
+-  background-color: #1491C1;
+-}
+-input[type="checkbox"]:checked + label:before,
+-input[type="radio"]:checked + label:before {
+-  background-color: #1491C1;
+-  border-color: #1491C1;
+-}
+-input[type="checkbox"][disabled] + label:before,
+-input[type="radio"][disabled] + label:before,
+-input[type="checkbox"].disabled + label:before,
+-input[type="radio"].disabled + label:before,
+-input[type="checkbox"][disabled] + label:hover:before,
+-input[type="radio"][disabled] + label:hover:before,
+-input[type="checkbox"].disabled + label:hover:before,
+-input[type="radio"].disabled + label:hover:before {
+-  background-color: #b2b8c1;
+-  border-color: #b2b8c1;
+-}
+-input[type="checkbox"] + label:before {
+-  content: '';
+-  position: absolute;
+-  left: 0;
+-  top: 4px;
+-  width: 10px;
+-  height: 10px;
+-  box-sizing: border-box;
+-  border-radius: 2px;
+-  border-width: 1px;
+-  border-style: solid;
+-  border-color: #ddd;
+-}
+-input[type="checkbox"]:checked + label:after {
+-  content: '\2714';
+-  color: #FFF;
+-  position: absolute;
+-  top: 0;
+-  left: 2px;
+-  font-size: 9px;
+-}
+-input[type="radio"] + label:before,
+-input.radio + label:before {
+-  content: '';
+-  position: absolute;
+-  left: 0;
+-  top: 0;
+-  width: 12px;
+-  height: 12px;
+-  box-sizing: border-box;
+-  border-radius: 12px;
+-  border-width: 1px;
+-  border-style: solid;
+-  border-color: #ddd;
+-}
+-input[type="radio"]:checked + label:after,
+-input.radio:checked + label:after {
+-  content: '';
+-  background-color: #FFF;
+-  position: absolute;
+-  top: 3px;
+-  left: 3px;
+-  width: 6px;
+-  height: 6px;
+-  border-radius: 6px;
+-}
+-.navigation-bar-container {
+-  min-width: 230px;
+-  padding: 0;
+-  -ms-overflow-style: none;
+-  transition: width 0.5s ease-out;
+-  -webkit-font-smoothing: antialiased;
+-  z-index: 999;
+-}
+-.navigation-bar-container ul.nav.side-nav-header {
+-  transition: width 0.5s ease-out;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header {
+-  padding: 15px 5px 15px 25px;
+-  height: 55px;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header > a.ambari-logo {
+-  padding: 0;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header > a.ambari-logo > img {
+-  height: 25px;
+-  float: left;
+-  margin-left: -3px;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group {
+-  cursor: pointer;
+-  margin-top: 3px;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.ambari-header,
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.toggle-icon {
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.ambari-header {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 20px;
+-  width: 55px;
+-  display: inline;
+-  color: #b8bec4;
+-  padding: 0 8px 0 10px;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.toggle-icon {
+-  margin-bottom: 5px;
+-  font-size: 13px;
+-  display: inline-block;
+-  vertical-align: middle;
+-  color: #b8bec4;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group.open .dropdown-toggle {
+-  -webkit-box-shadow: none;
+-  box-shadow: none;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu {
+-  top: 30px;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li > a {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  color: #666;
+-  line-height: 1.42;
+-  white-space: nowrap;
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-}
+-.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li > a:hover {
+-  background: #f5f5f5;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu,
+-.navigation-bar-container ul.nav.side-nav-footer {
+-  min-width: 230px;
+-  transition: width 0.5s ease-out;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li,
+-.navigation-bar-container ul.nav.side-nav-footer li {
+-  padding: 0;
+-  margin: 0;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer span.navbar-close,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer span.navbar-close,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li span.navbar-close,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li span.navbar-close,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li span.navbar-close,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li span.navbar-close {
+-  text-align:right;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > span.line,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > span.line,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > span.line,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > span.line,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > span.line,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > span.line {
+-  width: 49%;
+-  display:inline-block;
+-  height: 35px;
+-  padding: 10px 5px 10px 25px;
+-  white-space: nowrap;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer span.line a,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer span.line a,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li span.line a,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li span.line a,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li span.line a,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li span.line a {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  color: #b8bec4;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+-  vertical-align: middle;
+-  border-radius: 0;
+-  -moz-border-radius: 0;
+-  -webkit-border-radius: 0;
+-  white-space: nowrap;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .navigation-menu-item {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  color: #b8bec4;
+-  padding-left: 8px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .navigation-icon {
+-  line-height: 18px;
+-  font-size: 18px;
+-  color: #b8bec4;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a .toggle-icon {
+-  line-height: 14px;
+-  font-size: 14px;
+-  color: #b8bec4;
+-  padding: 3px 5px 3px 10px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+-  padding: 10px 5px 10px 20px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a {
+-  padding: 10px 5px 10px 25px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
+-  background: #313d54;
+-  height: 50px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon {
+-  color: #31823a;
+-  font-size: 20px;
+-  position: relative;
+-  padding: 0 15px;
+-  left: calc(30%);
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon:hover,
+-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon:hover {
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li {
+-  background-color: #323544;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li a,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li a {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-  color: #999;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li a .submenu-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li a .submenu-icon {
+-  line-height: 14px;
+-  font-size: 14px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover,
+-.navigation-bar-container ul.nav.side-nav-menu li > a:hover,
+-.navigation-bar-container ul.nav.side-nav-footer li > a:hover {
+-  background: #404351;
+-  cursor: pointer;
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li > a:hover .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li > a:hover .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li > a:hover .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li > a:hover .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li > a:hover .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li > a:hover .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li > ul > li > a:hover .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li > ul > li > a:hover .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li > a:hover .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li > a:hover .submenu-item {
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu),
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu),
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed {
+-  background: #404351;
+-  cursor: pointer;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a {
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .navigation-menu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .submenu-item,
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .navigation-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a .toggle-icon,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a .toggle-icon {
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > a:after,
+-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) > a:after,
+-.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a:after,
+-.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a:after {
+-  left: 0;
+-  top: 50%;
+-  border: solid transparent;
+-  border-width: 10px 7px;
+-  content: " ";
+-  height: 0;
+-  width: 0;
+-  position: absolute;
+-  pointer-events: none;
+-  border-color: transparent;
+-  border-left-color: #31823a;
+-  margin-top: -12px;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu .more-actions,
+-.navigation-bar-container ul.nav.side-nav-footer .more-actions {
+-  display: none;
+-  position: absolute;
+-  top: 14px;
+-  right: 33px;
+-  line-height: 25px;
+-  width: 20px;
+-  text-align: center;
+-  font-size: 14px;
+-  cursor: pointer;
+-  vertical-align: middle;
+-  color: #fff;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a,
+-.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a {
+-  color: #666;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a i,
+-.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a i {
+-  color: #666;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > li > a:hover,
+-.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu > li > a:hover {
+-  background: #f5f5f5;
+-}
+-.navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
+-.navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
+-  display: inline-block;
+-  vertical-align: bottom;
+-  max-width: 100px;
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-  -o-text-overflow: ellipsis;
+-  -ms-text-overflow: ellipsis;
+-  white-space: nowrap;
+-}
+-.navigation-bar-container .nav-pills > li.active > a,
+-.navigation-bar-container .nav-pills > li.active > a:focus,
+-.navigation-bar-container .nav-pills > li.active > a:hover,
+-.navigation-bar-container .nav > li > a:focus,
+-.navigation-bar-container .nav > li > a:hover {
+-  background-color: inherit;
+-}
+-.navigation-bar-container.collapsed {
+-  width: 50px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-header {
+-  width: 50px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header {
+-  padding: 15px 0 15px 15px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.ambari-header,
+-.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.toggle-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header .dropdown-menu {
+-  display: none;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer {
+-  width: 50px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li a,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li a {
+-  padding: 15px 0 15px 15px;
+-  width: 50px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .navigation-menu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .navigation-menu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .toggle-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .toggle-icon {
+-  display: none;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.navigation-footer a .navigation-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.navigation-footer a .navigation-icon {
+-  padding: 0 5px;
+-  left: 0;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.sub-menu,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu {
+-  display: none;
+-  min-width: 230px;
+-  position: absolute;
+-  z-index: 100;
+-  top: 0;
+-  left: 50px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li > a,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li > a {
+-  padding: 10px 5px 10px 25px;
+-  min-width: 230px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active {
+-  background: #404351;
+-  cursor: pointer;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a {
+-  color: #fff;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .navigation-menu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .navigation-menu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .submenu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .submenu-item,
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .navigation-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .navigation-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a .toggle-icon,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a .toggle-icon {
+-  color: #fff;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active > a:after,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active > a:after {
+-  left: 0;
+-  top: 50%;
+-  border: solid transparent;
+-  border-width: 12px 6px;
+-  content: " ";
+-  height: 0;
+-  width: 0;
+-  position: absolute;
+-  pointer-events: none;
+-  border-color: transparent;
+-  border-left-color: #31823a;
+-  margin-top: -12px;
+-}
+-.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions,
+-.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions {
+-  display: none;
+-}
+-.navigation-bar-fit-height {
+-  position: fixed;
+-  top: 0;
+-  bottom: 0;
+-  left: 0;
+-  z-index: 2079;
+-}
+-.navigation-bar-fit-height .side-nav-header {
+-  position: absolute;
+-  top: 0;
+-}
+-.navigation-bar-fit-height .side-nav-menu {
+-  position: absolute;
+-  top: 55px;
+-  bottom: 50px;
+-}
+-.navigation-bar-fit-height .side-nav-footer {
+-  position: absolute;
+-  bottom: 0;
+-}
+-.navigation-bar-fit-height .more-actions .dropdown-menu {
+-  position: fixed;
+-  top: auto;
+-  left: auto;
+-}
+-.navigation-bar-fit-height .navigation-bar-container {
+-  height: 100%;
+-}
+-.navigation-bar-fit-height .navigation-bar-container .side-nav-menu {
+-  overflow-y: auto;
+-}
+-.notifications-group {
+-  position: relative;
+-  top: 1px;
+-}
+-#notifications-dropdown.dropdown-menu {
+-  min-width: 300px;
+-  max-width: 300px;
+-  min-height: 150px;
+-  padding: 0px;
+-  z-index: 1000;
+-  right: -50px;
+-  left: auto;
+-  top: 260%;
+-  border: none;
+-  -webkit-box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+-  -moz-box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+-  box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.29);
+-}
+-#notifications-dropdown.dropdown-menu .popup-arrow-up {
+-  position: absolute;
+-  right: 37px;
+-  top: -40px;
+-  width: 40px;
+-  height: 40px;
+-  overflow: hidden;
+-}
+-#notifications-dropdown.dropdown-menu .popup-arrow-up:after {
+-  content: "";
+-  position: absolute;
+-  width: 20px;
+-  height: 20px;
+-  background: #fff;
+-  transform: rotate(45deg);
+-  top: 30px;
+-  left: 10px;
+-  box-shadow: -1px -1px 10px -2px rgba(0, 0, 0, 0.5);
+-}
+-#notifications-dropdown.dropdown-menu .notifications-header {
+-  border-bottom: 1px solid #eee;
+-  padding: 15px 20px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-header .notifications-title {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 16px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body {
+-  padding: 0px 15px;
+-  overflow: auto;
+-  max-height: 500px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .no-alert-text {
+-  padding: 15px 5px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table-controls {
+-  padding: 10px 0px;
+-  margin: 0px;
+-  border-bottom: 1px solid #eee;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter {
+-  padding: 0px;
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 12px;
+-  color: #666;
+-  position: relative;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter .form-control.filter-select {
+-  font-size: 12px;
+-  color: #666;
+-  height: 25px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table {
+-  margin-top: 0px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr {
+-  cursor: pointer;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover {
+-  cursor: default;
+-  border-color: transparent;
+-  border-bottom-color: #eee;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover > td {
+-  border-color: transparent;
+-  background-color: white;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status {
+-  width: 9%;
+-  padding: 15px 3px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-CRITICAL {
+-  color: #EF6162;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-WARNING {
+-  color: #E98A40;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content {
+-  width: 90%;
+-  padding: 15px 3px 10px 3px;
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  line-height: 1.3;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .name {
+-  font-weight: bold;
+-  font-size: 14px;
+-  color: #333;
+-  margin-bottom: 5px;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .description {
+-  font-size: 12px;
+-  color: #666;
+-  margin-bottom: 4px;
+-  display: block;
+-  display: -webkit-box;
+-  -webkit-line-clamp: 3;
+-  max-height: 47px;
+-  /* For firefox */
+-  -webkit-box-orient: vertical;
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-  /* Break long urls*/
+-  overflow-wrap: break-word;
+-  word-wrap: break-word;
+-  -ms-word-break: break-all;
+-  word-break: break-all;
+-  word-break: break-word;
+-  /* Adds a hyphen where the word breaks*/
+-  -ms-hyphens: auto;
+-  -moz-hyphens: auto;
+-  -webkit-hyphens: auto;
+-  hyphens: auto;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .timestamp {
+-  text-align: right;
+-  font-size: 11px;
+-  color: #999;
+-}
+-#notifications-dropdown.dropdown-menu .notifications-footer {
+-  border-top: 1px solid #eee;
+-  padding: 15px;
+-}
+-.modal-backdrop {
+-  background-color: #808080;
+-}
+-.modal .modal-content {
+-  border-radius: 2px;
+-}
+-.modal .modal-content .modal-header,
+-.modal .modal-content .modal-body,
+-.modal .modal-content .modal-footer {
+-  padding-left: 20px;
+-  padding-right: 20px;
+-}
+-.modal .modal-content .modal-header {
+-  border-bottom: none;
+-  padding-top: 20px;
+-  color: #666;
+-  font-size: 20px;
+-}
+-.modal .modal-content .modal-header h4 {
+-  margin: 0;
+-  color: inherit;
+-  font-size: inherit;
+-}
+-.modal .modal-content .modal-body {
+-  color: #666;
+-  font-size: 12px;
+-}
+-.modal .modal-content .modal-footer {
+-  border-top: none;
+-  padding-bottom: 20px;
+-}
+-.modal .modal-content .modal-footer .btn ~ .btn {
+-  margin-left: 10px;
+-}
+-.accordion .panel-group,
+-.wizard .wizard-body .wizard-content .accordion .panel-group {
+-  margin-bottom: 0px;
+-}
+-.accordion .panel-group .panel,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel {
+-  border-radius: 0px;
+-  border: none;
+-  margin-top: 0px;
+-}
+-.accordion .panel-group .panel .panel-heading,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading {
+-  height: 50px;
+-  padding: 15px 10px;
+-  border: 1px solid;
+-  border-color: #ddd transparent;
+-  border-top: none;
+-  background: #fff;
+-}
+-.accordion .panel-group .panel .panel-heading .panel-title,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-}
+-.accordion .panel-group .panel .panel-heading .panel-title > a,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title > a {
+-  font-size: 18px;
+-  color: #333;
+-}
+-.accordion .panel-group .panel .panel-heading .panel-title > i,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title > i {
+-  font-size: 20px;
+-  color: #1491c1;
+-}
+-.accordion .panel-group .panel .panel-heading:hover,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading:hover {
+-  background: #f3faff;
+-  cursor: pointer;
+-}
+-.accordion .panel-group .panel .panel-body,
+-.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-body {
+-  padding: 15px 10px 20px 20px;
+-}
+-h1,
+-h2,
+-h3,
+-h4,
+-h5,
+-h6,
+-.h1,
+-.h2,
+-.h3,
+-.h4,
+-.h5,
+-.h6 {
+-  font-family: 'Roboto', sans-serif;
+-}
+-h1,
+-.h1 {
+-  font-size: 24px;
+-}
+-h2,
+-.h2 {
+-  font-size: 18px;
+-}
+-body,
+-.body {
+-  font-family: 'Roboto', sans-serif;
+-  font-weight: normal;
+-  font-style: normal;
+-  line-height: 1;
+-  color: #333;
+-  font-size: 14px;
+-}
+-.description {
+-  font-family: 'Roboto', sans-serif;
+-  font-size: 12px;
+-  color: #000;
+-}
+-a,
+-a:visited,
+-a:focus {
+-  color: #1491C1;
+-  text-decoration: none;
+-}
+-a:hover,
+-a:visited:hover,
+-a:focus:hover {
+-  text-decoration: underline;
+-}
+-a:active,
+-a:visited:active,
+-a:focus:active {
+-  text-decoration: none;
+-}
+-a[disabled],
+-a:visited[disabled],
+-a:focus[disabled],
+-a.disabled,
+-a:visited.disabled,
+-a:focus.disabled {
+-  cursor: not-allowed;
+-  color: #666;
+-  text-decoration: none;
+-}
+-a[disabled]:hover,
+-a:visited[disabled]:hover,
+-a:focus[disabled]:hover,
+-a.disabled:hover,
+-a:visited.disabled:hover,
+-a:focus.disabled:hover {
+-  text-decoration: none;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css
+deleted file mode 100644
+index ea438a92337..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/bootstrap-hadoop.min.css
++++ /dev/null
+@@ -1,18 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-@font-face{font-family:Roboto;font-weight:400;font-style:normal;src:url(fonts/Roboto-Regular-webfont.eot);src:url(fonts/Roboto-Regular-webfont.eot?#iefix) format('embedded-opentype'),url(fonts/Roboto-Regular-webfont.woff) format('woff'),url(fonts/Roboto-Regular-webfont.ttf) format('truetype'),url(fonts/Roboto-Regular-webfont.svg#robotoregular) format('svg')}.font-mixin{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333}.btn,.btn:focus{outline:0;font-family:Roboto,sans-serif;text-transform:uppercase;height:34px;font-size:14px;padding:10px 20px;line-height:14px}.btn .glyphicon,.btn:focus .glyphicon{top:-1px;float:left}.box-shadow{box-shadow:0 0 2px 0 #1391c1}.btn-disabled{opacity:.6;box-shadow:none}.btn-default-disabled{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-default,.btn-default:focus{color:#666;background-color:#fff;border:1px solid #cfd3d7}.btn-default:focus:hover,.btn-default:hover{color:#fff;background-color:#808793}.btn-default:active,.btn-default:focus:active{color:#666;background-color:#fff;border:1px solid #cfd3d7;box-shadow:0 0 2px 0 #1391c1}.btn-default.disabled,.btn-default:focus.disabled,.btn-default:focus[disabled],.btn-default[disabled]{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-default.disabled.active,.btn-default.disabled:active,.btn-default.disabled:hover,.btn-default:focus.disabled.active,.btn-default:focus.disabled:active,.btn-default:focus.disabled:hover,.btn-default:focus[disabled].active,.btn-default:focus[disabled]:active,.btn-default:focus[disabled]:hover,.btn-default[disabled].active,.btn-default[disabled]:active,.btn-default[disabled]:hover{opacity:.6;box-shadow:none;color:#fff;background-color:#808793;border:none}.btn-primary-disabled{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary,.btn-primary:focus{color:#fff;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary:focus:hover,.btn-primary:hover{color:#fff;background-color:#429929;border:1px solid #429929}.btn-primary.active,.btn-primary:active,.btn-primary:focus.active,.btn-primary:focus:active{color:#fff;background-color:#3fae2a;border:1px solid #3fae2a;box-shadow:0 0 2px 0 #1391c1}.btn-primary.disabled,.btn-primary:focus.disabled,.btn-primary:focus[disabled],.btn-primary[disabled]{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-primary.disabled.active,.btn-primary.disabled:active,.btn-primary.disabled:hover,.btn-primary:focus.disabled.active,.btn-primary:focus.disabled:active,.btn-primary:focus.disabled:hover,.btn-primary:focus[disabled].active,.btn-primary:focus[disabled]:active,.btn-primary:focus[disabled]:hover,.btn-primary[disabled].active,.btn-primary[disabled]:active,.btn-primary[disabled]:hover{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#3fae2a;border:1px solid #3fae2a}.btn-secondary-disabled{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-secondary,.btn-secondary:focus{color:#429929;background-color:#fff;border:1px solid #3fae2a}.btn-secondary:focus:hover,.btn-secondary:hover{color:#fff;background-color:#429929}.btn-secondary:active,.btn-secondary:focus:active{color:#429929;background-color:#fff;box-shadow:0 0 2px 0 #1391c1}.btn-secondary.disabled,.btn-secondary:focus.disabled,.btn-secondary:focus[disabled],.btn-secondary[disabled]{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-secondary.disabled.active,.btn-secondary.disabled:active,.btn-secondary.disabled:hover,.btn-secondary:focus.disabled.active,.btn-secondary:focus.disabled:active,.btn-secondary:focus.disabled:hover,.btn-secondary:focus[disabled].active,.btn-secondary:focus[disabled]:active,.btn-secondary:focus[disabled]:hover,.btn-secondary[disabled].active,.btn-secondary[disabled]:active,.btn-secondary[disabled]:hover{opacity:.6;box-shadow:none;color:#d1e8d1;background-color:#429929;border:1px solid #3fae2a}.btn-success{border:none}.btn-regular-default-state{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-primary-default-state{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle,.dropdown.open .btn.dropdown-toggle{box-shadow:inset 0 0 3px 0 #1391c1}.btn-group.open .btn.dropdown-toggle,.btn-group.open .btn.dropdown-toggle.btn-default,.dropdown.open .btn.dropdown-toggle,.dropdown.open .btn.dropdown-toggle.btn-default{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .btn.dropdown-toggle.btn-default:hover,.btn-group.open .btn.dropdown-toggle:hover,.dropdown.open .btn.dropdown-toggle.btn-default:hover,.dropdown.open .btn.dropdown-toggle:hover{background-color:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .btn.dropdown-toggle+.dropdown-menu>li>a:hover,.btn-group.open .btn.dropdown-toggle.btn-default+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle.btn-default+.dropdown-menu>li>a:hover{background-color:#808793;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary,.dropdown.open .btn.dropdown-toggle.btn-primary{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary:hover,.dropdown.open .btn.dropdown-toggle.btn-primary:hover{background-color:#3fae2a;border:1px solid #3fae2a;color:#fff}.btn-group.open .btn.dropdown-toggle.btn-primary+.dropdown-menu>li>a:hover,.dropdown.open .btn.dropdown-toggle.btn-primary+.dropdown-menu>li>a:hover{background-color:#429929;color:#fff}.btn-group.open .dropdown-menu,.dropdown.open .dropdown-menu{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;border-radius:2px;font-size:14px;min-width:200px;background:#fff;color:#666;border:1px solid #cfd3d7}.btn-group.open .dropdown-menu>li,.dropdown.open .dropdown-menu>li{margin-bottom:1px}.btn-group.open .dropdown-menu>li>a,.dropdown.open .dropdown-menu>li>a{height:24px}.btn-group .btn.dropdown-toggle:first-child,.dropdown .btn.dropdown-toggle:first-child{min-width:80px}.btn-group .btn.dropdown-toggle.disabled,.btn-group .btn.dropdown-toggle[disabled],.dropdown .btn.dropdown-toggle.disabled,.dropdown .btn.dropdown-toggle[disabled]{opacity:.6}input.form-control{font-size:14px;border-radius:2px;color:#666;border:1px solid #cfd3d7;height:34px;padding:10px}input.form-control:focus{border-color:#1291c1;box-shadow:none}.help-block{color:#999;font-size:14px}.help-block.validation-block{color:#999;margin-top:10px}.help-block.validation-block::before{position:relative;top:2px;margin-right:5px;font-family:'Glyphicons Halflings'}.has-success input.form-control{color:#666;border:1px solid #1eb475}.has-success input.form-control:focus{border-color:#1eb475;box-shadow:none}.has-success .help-block.validation-block::before{content:'\e084';color:#1eb475}.has-error input.form-control{color:#666;border:1px solid #ef6162}.has-error input.form-control:focus{border-color:#ef6162;box-shadow:none}.has-error .help-block.validation-block::before{content:'\e083';color:#ef6162}.has-warning input.form-control{color:#666;border:1px solid #e98a40}.has-warning input.form-control:focus{border-color:#e98a40;box-shadow:none}.has-warning .help-block.validation-block::before{content:'\e101';color:#e98a40}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{color:#999;border-color:#ccc;background-color:#ddd}h2.table-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;margin-top:10px;font-size:20px}.table{color:#666;font-size:13px}.table tfoot,.table thead{color:#999}.table input[type=checkbox]+label{position:relative;line-height:1.3em;font-size:initial;top:4px;margin-bottom:0}.table thead>tr>th{border-bottom-color:#eee}.table tfoot>tr:first-of-type>td{border-top-width:2px;border-top-color:#eee}.table>tbody>tr>td{border-top-color:#eee}.table>tbody>tr.active{background-color:#eee}.table>tbody>tr.active>td{background-color:#eee}.table.table-hover .action{visibility:hidden;padding:0;line-height:1}.table.table-hover .action:hover{text-decoration:none}.table.table-hover>tbody>tr{border-width:0 1px 1px;border-style:solid;border-color:#eee transparent}.table.table-hover>tbody>tr>td{border-width:0}.table.table-hover>tbody>tr:hover{border-color:#a7dff2;background-color:#e7f6fc}.table.table-hover>tbody>tr:hover>td{border-top:1px solid #a7dff2;background-color:#e7f6fc}.table.table-hover>tbody>tr:hover>td .action{visibility:visible}.table.table-hover>tbody>tr:first-of-type>td{border-top:1px solid transparent}.table.table-hover>tbody>tr:first-of-type:hover>td{border-color:#a7dff2}.pagination-block .pagination-block-item{float:left;padding:0 5px}.pagination-block .pagination-block-item a,.pagination-block .pagination-block-item a:focus,.pagination-block .pagination-block-item a:visited{text-decoration:none}.pagination-block .pagination-block-item select{border:none;background-color:transparent;color:#1491c1}.nav.nav-tabs{border:none;margin-bottom:20px}.nav.nav-tabs li a{border-width:0;border-radius:0;border-bottom:2px solid transparent;color:#666;text-transform:uppercase}.nav.nav-tabs li a:active,.nav.nav-tabs li a:focus,.nav.nav-tabs li a:hover{color:#333;border-top-width:0;border-left-width:0;border-right-width:0;background:0 0}.nav.nav-tabs li a .badge.badge-important{display:inline}.nav.nav-tabs li.active a{color:#333;border-bottom:2px solid #3fae2a}.nav-tabs-left li,.nav-tabs-right li{float:none;margin-bottom:2px}.nav-tabs-left li a,.nav-tabs-right li a{margin-right:0}.nav-tabs-left li{margin-right:-1px}.nav-tabs-left li a{border:2px solid transparent!important}.nav-tabs-left li.active a,.nav-tabs-left li.active a:active,.nav-tabs-left li.active a:focus,.nav-tabs-left li.active a:hover{border-right:2px solid #3fae2a!important}.nav-tabs-right li{margin-left:-1px}.nav-tabs-right li a{border:2px solid transparent!important}.nav-tabs-right li.active a,.nav-tabs-right li.active a:active,.nav-tabs-right li.active a:focus,.nav-tabs-right li.active a:hover{border-left:2px solid #3fae2a!important}.wizard{border:2px solid #ebecf1}.wizard .wizard-header h3{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;font-size:20px;color:#333;margin:15px 20px}.wizard .wizard-body{overflow:hidden;margin:0}.wizard .wizard-body .wizard-content{background:#ebecf1;padding-top:25px;float:left;margin-bottom:-99999px;padding-bottom:99999px}.wizard .wizard-body .wizard-content .step-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-weight:700;font-size:18px;color:#666}.wizard .wizard-body .wizard-content .step-description{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;line-height:1.4;color:#999}.wizard .wizard-body .wizard-content .panel.panel-default{border:none;box-shadow:none;margin-top:20px}.wizard .wizard-body .wizard-content .panel.panel-default .panel-body{padding:30px 20px}.wizard .wizard-body .wizard-nav{min-height:550px;padding-top:25px;background-color:#323544;float:left;margin-bottom:-99999px;padding-bottom:99999px}.wizard .wizard-body .wizard-nav .nav li{padding:0 15px}.wizard .wizard-body .wizard-nav .nav li a{height:48px;padding:0 5px;display:table-cell;vertical-align:middle}.wizard .wizard-body .wizard-nav .nav li .step-marker{position:absolute;top:9px;line-height:16px;text-align:center;width:20px;height:20px;border:2px solid #1eb475;border-radius:50%;font-size:12px;font-style:inherit;color:#1eb475;background-color:#323544}.wizard .wizard-body .wizard-nav .nav li .step-name{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#999;margin-left:30px}.wizard .wizard-body .wizard-nav .nav li .step-index{line-height:18px}.wizard .wizard-body .wizard-nav .nav li .step-description{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:12px;color:#999;margin-left:30px}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker{background-color:#1eb475;color:#fff;font-size:10px;padding-left:2px}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index{display:none}.wizard .wizard-body .wizard-nav .nav li.completed .step-marker:after{font-family:"Glyphicons Halflings";content:"\e013";position:relative;top:1px;left:-1px}.wizard .wizard-body .wizard-nav .nav li.completed:after{width:2px;height:100%;position:absolute;background-color:#1eb475;content:"";top:25px;left:29px}.wizard .wizard-body .wizard-nav .nav li.completed:last-child:after{content:none}.wizard .wizard-body .wizard-nav .nav li.active .step-name{font-weight:700}.wizard .wizard-body .wizard-nav .nav li.disabled .step-marker{color:#666;border-color:#666}.wizard .wizard-body .wizard-nav .nav li.disabled .step-description,.wizard .wizard-body .wizard-nav .nav li.disabled .step-name{color:#666}.wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker{background-color:#1eb475;border:2px solid #1eb475;color:#fff}.wizard .wizard-body .wizard-nav .nav-pills>li.active>a,.wizard .wizard-body .wizard-nav .nav-pills>li.active>a:focus,.wizard .wizard-body .wizard-nav .nav-pills>li.active>a:hover,.wizard .wizard-body .wizard-nav .nav>li>a:focus,.wizard .wizard-body .wizard-nav .nav>li>a:hover{background-color:inherit}.wizard .wizard-body .wizard-footer{background:#fff;padding:15px 20px}.wizard .wizard-body .wizard-footer button{margin:0 10px}.checkbox-disabled-style{background-color:#b2b8c1;border-color:#b2b8c1}input[type=checkbox]:checked,input[type=checkbox]:not(:checked),input[type=radio]:checked,input[type=radio]:not(:checked){display:none}input[type=checkbox]:checked+label,input[type=checkbox]:not(:checked)+label,input[type=radio]:checked+label,input[type=radio]:not(:checked)+label{position:relative;padding-left:20px}input[type=checkbox]:checked+label:hover:before,input[type=checkbox]:not(:checked)+label:hover:before,input[type=radio]:checked+label:hover:before,input[type=radio]:not(:checked)+label:hover:before{border-color:#1491c1;background-color:#1491c1}input[type=checkbox]:checked+label:before,input[type=radio]:checked+label:before{background-color:#1491c1;border-color:#1491c1}input[type=checkbox].disabled+label:before,input[type=checkbox].disabled+label:hover:before,input[type=checkbox][disabled]+label:before,input[type=checkbox][disabled]+label:hover:before,input[type=radio].disabled+label:before,input[type=radio].disabled+label:hover:before,input[type=radio][disabled]+label:before,input[type=radio][disabled]+label:hover:before{background-color:#b2b8c1;border-color:#b2b8c1}input[type=checkbox]+label:before{content:'';position:absolute;left:0;top:4px;width:10px;height:10px;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:2px;border-width:1px;border-style:solid;border-color:#ddd}input[type=checkbox]:checked+label:after{content:'\2714';color:#fff;position:absolute;top:0;left:2px;font-size:9px}input.radio+label:before,input[type=radio]+label:before{content:'';position:absolute;left:0;top:0;width:12px;height:12px;-moz-box-sizing:border-box;box-sizing:border-box;border-radius:12px;border-width:1px;border-style:solid;border-color:#ddd}input.radio:checked+label:after,input[type=radio]:checked+label:after{content:'';background-color:#fff;position:absolute;top:3px;left:3px;width:6px;height:6px;border-radius:6px}.navigation-bar-container{height:auto;width:230px;background-color:#323544;padding:0;-ms-overflow-style:none;transition:width .5s ease-out;-webkit-font-smoothing:antialiased}.navigation-bar-container ul.nav.side-nav-header{width:230px;transition:width .5s ease-out}.navigation-bar-container ul.nav.side-nav-header li.navigation-header{background:#313d54;padding:15px 5px 15px 25px;height:55px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header>a.ambari-logo{padding:0}.navigation-bar-container ul.nav.side-nav-header li.navigation-header>a.ambari-logo>img{height:25px;float:left;margin-left:-3px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group{cursor:pointer;margin-top:3px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.ambari-header,.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group:hover span.toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.ambari-header{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:20px;width:55px;display:inline;color:#b8bec4;padding:0 8px 0 10px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group span.toggle-icon{margin-bottom:5px;font-size:13px;display:inline-block;vertical-align:middle;color:#b8bec4}.navigation-bar-container ul.nav.side-nav-header li.navigation-header .btn-group.open .dropdown-toggle{box-shadow:none}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu{top:30px}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li>a{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#666;line-height:1.42;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.navigation-bar-container ul.nav.side-nav-header li.navigation-header ul.dropdown-menu li>a:hover{background:#f5f5f5}.navigation-bar-container ul.nav.side-nav-footer,.navigation-bar-container ul.nav.side-nav-menu{background-color:#323544;width:230px;transition:width .5s ease-out}.navigation-bar-container ul.nav.side-nav-footer li,.navigation-bar-container ul.nav.side-nav-menu li{padding:0;margin:0}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a{display:table-cell;vertical-align:middle;width:230px;border-radius:0;-moz-border-radius:0;-webkit-border-radius:0;white-space:nowrap}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .navigation-menu-item{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#b8bec4;padding-left:8px}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .navigation-icon{line-height:18px;font-size:18px;color:#b8bec4}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a .toggle-icon{line-height:14px;font-size:14px;color:#b8bec4;padding:3px 5px 3px 10px}.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer>a,.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer>a{padding:10px 5px 10px 20px}.navigation-bar-container ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container ul.nav.side-nav-menu li.submenu-li>a{padding:10px 5px 10px 25px}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer{background:#313d54;height:50px}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon{color:#31823a;font-size:20px;position:relative;padding:0 15px;left:calc(30%)}.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a .navigation-icon:hover,.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a .navigation-icon:hover{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li>ul>li,.navigation-bar-container ul.nav.side-nav-menu li>ul>li{background-color:#323544}.navigation-bar-container ul.nav.side-nav-footer li>ul>li a,.navigation-bar-container ul.nav.side-nav-menu li>ul>li a{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px;color:#999}.navigation-bar-container ul.nav.side-nav-footer li>ul>li a .submenu-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li a .submenu-icon{line-height:14px;font-size:14px}.navigation-bar-container ul.nav.side-nav-footer li>a:hover,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover,.navigation-bar-container ul.nav.side-nav-menu li>a:hover,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover{background:#404351;cursor:pointer;color:#fff}.navigation-bar-container ul.nav.side-nav-footer li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li>ul>li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li>a:hover .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li>ul>li>a:hover .toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu),.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu){background:#404351;cursor:pointer}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .submenu-item,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a .toggle-icon,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .navigation-icon,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .navigation-menu-item,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .submenu-item,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a .toggle-icon{color:#fff}.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed>a:after,.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu)>a:after,.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed>a:after,.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu)>a:after{left:0;top:50%;border:solid transparent;border-width:10px 7px;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:transparent;border-left-color:#31823a;margin-top:-12px}.navigation-bar-container ul.nav.side-nav-footer .more-actions,.navigation-bar-container ul.nav.side-nav-menu .more-actions{display:none;position:absolute;top:14px;right:33px;line-height:25px;width:20px;text-align:center;font-size:14px;cursor:pointer;vertical-align:middle;color:#fff}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a{color:#666}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a i,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a i{color:#666}.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu>li>a:hover,.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu>li>a:hover{background:#f5f5f5}.navigation-bar-container ul.nav.side-nav-footer .menu-item-name,.navigation-bar-container ul.nav.side-nav-menu .menu-item-name{display:inline-block;vertical-align:bottom;max-width:100px;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis;-ms-text-overflow:ellipsis;white-space:nowrap}.navigation-bar-container .nav-pills>li.active>a,.navigation-bar-container .nav-pills>li.active>a:focus,.navigation-bar-container .nav-pills>li.active>a:hover,.navigation-bar-container .nav>li>a:focus,.navigation-bar-container .nav>li>a:hover{background-color:inherit}.navigation-bar-container.collapsed{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-header{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header{padding:15px 0 15px 15px}.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header .dropdown-menu,.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.ambari-header,.navigation-bar-container.collapsed ul.nav.side-nav-header li.navigation-header span.toggle-icon{display:none}.navigation-bar-container.collapsed ul.nav.side-nav-footer,.navigation-bar-container.collapsed ul.nav.side-nav-menu{width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a{padding:15px 0 15px 15px;width:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li a .toggle-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li a .toggle-icon{display:none}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.navigation-footer a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.navigation-footer a .navigation-icon{padding:0 5px;left:0}.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu,.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.sub-menu{display:none;width:230px;position:absolute;z-index:100;top:0;left:50px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li>a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li>a{padding:10px 5px 10px 25px;width:230px}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active{background:#404351;cursor:pointer}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a{color:#fff}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .submenu-item,.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a .toggle-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .navigation-icon,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .navigation-menu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .submenu-item,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a .toggle-icon{color:#fff}.navigation-bar-container.collapsed ul.nav.side-nav-footer li.active>a:after,.navigation-bar-container.collapsed ul.nav.side-nav-menu li.active>a:after{left:0;top:50%;border:solid transparent;border-width:12px 6px;content:" ";height:0;width:0;position:absolute;pointer-events:none;border-color:transparent;border-left-color:#31823a;margin-top:-12px}.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions,.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions{display:none}.navigation-bar-fit-height{position:fixed;top:0;bottom:0;left:0;z-index:2079}.navigation-bar-fit-height .side-nav-header{position:absolute;top:0}.navigation-bar-fit-height .side-nav-menu{position:absolute;top:55px;bottom:50px}.navigation-bar-fit-height .side-nav-footer{position:absolute;bottom:0}.navigation-bar-fit-height .more-actions .dropdown-menu{position:fixed;top:auto;left:auto}.navigation-bar-fit-height .navigation-bar-container{height:100%}.navigation-bar-fit-height .navigation-bar-container .side-nav-menu{overflow-y:auto}.notifications-group{position:relative;top:1px}#notifications-dropdown.dropdown-menu{min-width:300px;max-width:300px;min-height:150px;padding:0;z-index:1000;right:-50px;left:auto;top:260%;border:none;box-shadow:0 2px 10px 2px rgba(0,0,0,.29)}#notifications-dropdown.dropdown-menu .popup-arrow-up{position:absolute;right:37px;top:-40px;width:40px;height:40px;overflow:hidden}#notifications-dropdown.dropdown-menu .popup-arrow-up:after{content:"";position:absolute;width:20px;height:20px;background:#fff;-ms-transform:rotate(45deg);transform:rotate(45deg);top:30px;left:10px;box-shadow:-1px -1px 10px -2px rgba(0,0,0,.5)}#notifications-dropdown.dropdown-menu .notifications-header{border-bottom:1px solid #eee;padding:15px 20px}#notifications-dropdown.dropdown-menu .notifications-header .notifications-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:16px}#notifications-dropdown.dropdown-menu .notifications-body{padding:0 15px;overflow:auto;max-height:500px}#notifications-dropdown.dropdown-menu .notifications-body .no-alert-text{padding:15px 5px}#notifications-dropdown.dropdown-menu .notifications-body .table-controls{padding:10px 0;margin:0;border-bottom:1px solid #eee}#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter{padding:0;font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:12px;color:#666;position:relative}#notifications-dropdown.dropdown-menu .notifications-body .table-controls .state-filter .form-control.filter-select{font-size:12px;color:#666;height:25px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table{margin-top:0}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr{cursor:pointer}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover{cursor:default;border-color:transparent;border-bottom-color:#eee}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody tr.no-alert-tr:hover>td{border-color:transparent;background-color:#fff}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status{width:9%;padding:15px 3px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-CRITICAL{color:#ef6162}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.status .alert-state-WARNING{color:#e98a40}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content{width:90%;padding:15px 3px 10px 3px;font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;line-height:1.3}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .name{font-weight:700;font-size:14px;color:#333;margin-bottom:5px}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .description{font-size:12px;color:#666;margin-bottom:4px;display:block;display:-webkit-box;-webkit-line-clamp:3;max-height:47px;overflow:hidden;text-overflow:ellipsis;overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}#notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table tbody td.content .timestamp{text-align:right;font-size:11px;color:#999}#notifications-dropdown.dropdown-menu .notifications-footer{border-top:1px solid #eee;padding:15px}.modal-backdrop{background-color:grey}.modal .modal-content{border-radius:2px}.modal .modal-content .modal-body,.modal .modal-content .modal-footer,.modal .modal-content .modal-header{padding-left:20px;padding-right:20px}.modal .modal-content .modal-header{border-bottom:none;padding-top:20px;color:#666;font-size:20px}.modal .modal-content .modal-header h4{margin:0;color:inherit;font-size:inherit}.modal .modal-content .modal-body{color:#666;font-size:12px}.modal .modal-content .modal-footer{border-top:none;padding-bottom:20px}.modal .modal-content .modal-footer .btn~.btn{margin-left:10px}.accordion .panel-group,.wizard .wizard-body .wizard-content .accordion .panel-group{margin-bottom:0}.accordion .panel-group .panel,.wizard .wizard-body .wizard-content .accordion .panel-group .panel{border-radius:0;border:none;margin-top:0}.accordion .panel-group .panel .panel-heading,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading{height:50px;padding:15px 10px;border:1px solid;border-color:#ddd transparent;border-top:none;background:#fff}.accordion .panel-group .panel .panel-heading .panel-title,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333}.accordion .panel-group .panel .panel-heading .panel-title>a,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title>a{font-size:18px;color:#333}.accordion .panel-group .panel .panel-heading .panel-title>i,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading .panel-title>i{font-size:20px;color:#1491c1}.accordion .panel-group .panel .panel-heading:hover,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-heading:hover{background:#f3faff;cursor:pointer}.accordion .panel-group .panel .panel-body,.wizard .wizard-body .wizard-content .accordion .panel-group .panel .panel-body{padding:15px 10px 20px 20px}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:Roboto,sans-serif}.h1,h1{font-size:24px}.h2,h2{font-size:18px}.body,body{font-family:Roboto,sans-serif;font-weight:400;font-style:normal;line-height:1;color:#333;font-size:14px}.description{font-family:Roboto,sans-serif;font-size:12px;color:#000}a,a:focus,a:visited{color:#1491c1;text-decoration:none}a:focus:hover,a:hover,a:visited:hover{text-decoration:underline}a:active,a:focus:active,a:visited:active{text-decoration:none}a.disabled,a:focus.disabled,a:focus[disabled],a:visited.disabled,a:visited[disabled],a[disabled]{cursor:not-allowed;color:#666;text-decoration:none}a.disabled:hover,a:focus.disabled:hover,a:focus[disabled]:hover,a:visited.disabled:hover,a:visited[disabled]:hover,a[disabled]:hover{text-decoration:none}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/feather.png
+deleted file mode 100644
+index d4aff8b7c1963960f8cbdec37e97cd7a9eb19bab..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 6066
+zcmV;j7ftAiP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il000+xNkl<Zc-rlq
+zc~}$o*2n2x-}b)uw)Xbc>n&zx$joFRtVuv|-$9Wo3N8qWJ4)Cg>`@T}L9DiJZSQTZ
+z`%>#xTbH^^6;MHO14R}WaIJ`_Nb`Ho1OiD&#NPK02l;)U=R64$h37fvGv|EIFbP&x
+zSpP3QUMY~)t)$o1E~g*WekN?FSwdfYlr2=<&G_K2I6H5)-l|<Gbbqo^SorjF8r7|2
+z(352lpVFx26XCO(Z2HUURH`#h(;Fy_#_D%a{D3E`gjHPe^#If@2LL{!QSA~MJzmV9
+zM_KgRhZ^!doUu2o_)k^{r$O-_=!>t5RRF<?CIFTK0H4t4(IWcShne&o?*HJ-y)kW{
+z39Ma38yDXYfMo!{r;PyAWHacOOuG7h2Hg#(?oBX!D`?-xtLVFRpEIZx0ET1W)0Qz%
+zlf|Hi8Nwwvd+l6s)(@^-Nmp{kZxaB6F;KGz09Z($tI`NR#93^oda_(7uU*Al(ih(x
+z0ClT`TB9+rv}Fu{52(4HE_B10Y=?Tdf+TBKFvsdvwG`hJ0x*P6>sHbAEdaEP0S<si
+znY8vnIz0hrv%M96G5H>}{f)ZfTL9q6D*CbEMqt(laAP1{7=<(1j+8&$>W_Eg>9og7
+z=mtvwK;fUjnO|DBl73;d4Vd!*unyv^wj<q%VFIhwZ0*DOY~xwI%Cz`QJ*<R<Pgc@3
+z7S}-oAMnTkfS{nDPP1o+44A1>xy+myBJ=U_`4jhuv(A^|t8IE#$1oLlV_9@Bo`oVd
+z0kBG6d|C@z!C8pw7Po<A#$(`@Oj@n~{!s9@XQ@JG1P6!phnNr1H#j(S70x^lbTh<8
+zP_1T8aK+chgL#bBunR!pi{Z>a&VkV8I;aDHMh~;-sfIsi_Uus487h?&3Lh|A6{-#n
+z4vEFtf8E8O-sPRDDE7;{F(PzV-2%YfI97KSa{xfwzxQM%vklh5$Cj=Kn2v#(#q{$>
+zSwauPpA{S&Oih_G<^7<bFq=S?>K`*^gfO@QuN#1Haq#U((X%_zVss}OAkc#V@n9~C
+zYL|0!pWecC0G${30szp3;n@$H!E)W~*K+IMFKG<AKbNkq(g^X4=d*69q`hv1Np4m}
+zNKjRz1XV|I5Hx~thXVmR!NY~j;m4oRyJ}&+KVC{}Yq%mWf+A<o+J|Yd>(8UL_mdgz
+z{lrG^pzk1e)XeG1aO?MRmU*hO>5?utf~7}phuWgsVNz5T&INz~FjPm1bud&#iOQ>D
+z*iY}ovybm3G!;0`U`#Z13PbOpk193u75tdDaHe^>@86hZn|(7_hPb$;0tie%xD_sb
+zemjEw6#PL!D}T^Nz}c^@il!&yO!HLb(`3FCGi+;a%mM&rH$tEX;Z{f^2sc9{dv1q|
+z|I<7cbP&862(VF9-i##0IMY1TwE!_&HceJkIl~Tdabu<o-3T%U0Y*c`4V5JEW~k(D
+zD}NAUU=%F_uz~9`INLl^j*s=*<&$NrE2i3`%4rbO8zE=}!A=K4Wst0)a<+8g4VCR)
+zqp@JgD5_f(|M{J0+6QNwk7vKX{gkpvc2CPE+oOspO`(Iqt{H}k8M1?wv!t5J*|zn~
+zBf$a))kYwQngC$)ZmZ~j;B50uSI5}PN+&oJmjyVWvWX6;e3CsX4+H=vw}4PFRd&B@
+zs!UZr!?wuCAE;!lK`_}E^dMA6GtoHPd~^MtUEaAi&VJo>KSxwH0RZraFatu_Wcw9h
+z5SQx4LeoevXA~`ga63X=T%n?cIO9B1iLb-tYhxUrm5y^n*SQ$q8icZmb{ESg$tIUg
+zv8ys12|5sFng>C@F;s==S4U9_&Nk0<#nVn)Jj&_PH6JH*ZHyBt9m_=v2wYcy(eR?w
+z-!A6*B)d)Jlg)dBRvW`?V-RkINJ?*pibOc$JklNy`p+dJoW8v3?S!t5f*1`Da3J^s
+z1Whn-AY2>gxWClTZdz%8eQo(92i-_81fjyh#$ebLU~`y@GtM(z@^l(~#mlL-WP~%i
+zIugPR2qnIbHCKJ@Cte%x@RQ+KD4%Eof|;(M2caU!_ELEeV}mo!BNcksTVEdPly}9`
+z85IwAMkQVlA47~V2BCPg!|JQPP9fLEI=;}4gqImbQxGbq%YH4NW*d$(&Le58tbTWK
+zh;!;?4`*~`D8w)bGawX?aJqHH+hJtMXvfpn3`W9l0ik@V?D$oGeE&bMRNx@*S=86L
+z>hcgdy6g^N0fb^N$Awo$IL4KDJ8E@f!Pmej>OmN98HBPxyIR;Bym7{Pq~jlm{(4rd
+z+<soEM3)B2(WOBEz~I&(TpZ?f<%*}{&?_H1T{7zrENl#hAY2cy`>F(tCeAvKbed5F
+zo@SKK3ZyRRLQe&{I6!U;0(6B-?oQfE?v8PnJ)KgD4ZVQ{qgZNYJe2x56qoo(r8wg}
+z(izH$IBlaWI7_>rvy2NWa8PJ3^Z^L^$&Em`I7oix(jbSymxno(8jXcEKxpX-4o|O*
+zwV#4B&M&=nnsP}!YXik^iUQUJ6?Idf3%wzlKq%@bZz$^T9DH$*bH-(NXVjKaG`~7J
+ztl)mLh*QoZ<=QBf0KhFn0CW)8DzrsC6uNQ1fpEUJJm*|rr-2s+$Sd?C;blg#r7JXo
+zP&~?UTj5B1?D~0i#m|cV^J&U;%~=~))Dle)z&JRsP@tmjP<%Ie{rMj9sptF17hUXc
+zJQmsl0nB23@d)Ry&U?u^9~X)K%B`9>^E}Zhfs1Dz<x+Eoaz$s1AZP@kK%&r|cL4yp
+zDGnF9Irl%`OHrvC3w`CS{DJAlaCs;gMo*`b%flSQ3X~4Eg-UtoIam4ILsnLQz?tWP
+z4v~)U<r2z$&;byPfac&pXof-PiV7VR&kN=9iG|(dSw(Kp5x9}itI-?iKrrbDTwE9^
+ze|n+6^HG3jVS%IKKZVZntLGGQZK2W`zw4Jbv!7H>%BNhOHv*uK)*zf=T@Idca_Up4
+zkXPus0mM0_T&oL(LVM0xp)GWRaD;&E;hcjK71}AE7s!+k&)O+oa9^KuRH6cB#Xa~w
+z3Y>X<6#t*l`g4to-x`E`O8GobpzzOU6zK&bZbejT3z$ZKa8_t+8g*ZDufYbv{o4YG
+z3o5jQkhyR`paMI^o*Zku0q_I>*RXuj<yXr9G)5k&JPZKz$Rk~@Tk;95AfQ`=a8}~d
+zP#{&{`~CT#6J4ALC}>ez#fR}w50FgECzW#zyTU7hVA2uJu*!2etiwk*`#ew{;gZl+
+z@pWfE<$64yl)J*HC^k19ehUbvX+=EFJP(v(?My@aFU}{sq0?MgZ2hhc`Gj&RbP9D_
+zKA|lTPE*P&xdH{g>4O)0KiO>#SA4@T2Lhb+d8fL%DB$s2+ug!42ynasjASIvJP&lz
+z+Lbv)xR&HW!ShTYFa!bSz7`6vg4rMRDn{{TD<nMMbxdH_31^=V00_D#>x*v~rXb`I
+zu0{ET+!@+`&Z`%{H3+al6yyq&wm9=V&=JCgIz@KBoJV#?jbRxCFp2S}2$%8sq-*_Y
+zsvG)mAjl<M&g6DgDskp{qMrqBF{j8Lh>Kj(4Os#qmvAlB&3?jlkMU@DH4wNfi}{4h
+z=98prHy9ry03-@$|269<(W^@i*|Xpz*%NVL2tuw22mnClNy2p~c!k=0b3VZW2rw>Q
+zK*2A<nV$~cAq1Wu1c*LAM3Vo5EAYB6{0MqYJ3;hr_?het0Q5rUL2!fT-Kuj4r5hCg
+zo3?y{DF^_-Jt+REe2O!ft_|>Y=}Bv6dz}5(to@zj?;a!j9zH?#K{*f{1eQQJDRBF$
+z5rA%Y%z1>DZ4M?d)Paw{w|()#{B`Z;b&Tj+cbx2pPLO?(c@TQR^By%Py1ETMNpxSR
+z?+BL6;>$qLo&AI|le^IbXa6;8m6iODhl&2{kCFY+ab5I7rXb`rfsjM=*nRAyo(}MM
+zwWTY#z0@$~wO$`z<O;g2$cL_jv(E$lMD%w)L=LDvLJmMjAuNG#g6v&?jOaNohwK%m
+z?+C`@p=}UyN!LdZbGi2x;LP(x2Z=%R4wHk>5prNtw19BT0EFXYpWLH@Uee=a?~^$u
+zqrseEGz0;PUVjSA-_L|=U@ob2hj7H1=YbA<IH2<Za&W;Raxmh;90*67KsZYDi#RIi
+zJNhWu=Q-CE3`fJyF989zhI%lJdAWqkT38>C!}d_Y?f*FYJkUPDAfNq|`}2e35X6Ns
+z2!onII7|#EJ!0M4?g-KE+m`Xr7rhDyCkZ$0DWdxe{k4Q#qT7MJo$ddEv;Uf<vFiJW
+z{iMgbpC}LX6XmXpgH&q}xHu%}zxbe_Uk@;g4~{mE24fIT7=d8<TEfqS8~&{yAGDVo
+zEZ$3bRPLvSq60bzT0r>80EC~2!4D1z2KGEe49GI)6D(~G=0Jer-_Eh_Zilna1N}e@
+zoxP75hPdD$Fb{$|2f(%if&o%6izWJw@ZW-vL-gFd*-H8+oc-6V&DP!D{(&6!{a(rw
+zHAZU?8e>Sk&L@zAg8&5WL6gz&TR=EL_Ns>%i?h!I?V>y#_E5vCf24*ZE-ZntpBj?4
+z&w3DZfOJ39>=O(O<6#S%gE<h66TQzK_|O&q>33cLKzfDlp*}`GP+m=89)urB5A{CE
+zWAHxG{fX&#cvTSe*Ak8reUfnId7!0M9)I3Re!Sy*Y6SWoAg}}ijEEaQSi9T*NDTdA
+zpUG&j1cJF0@~Cc&>{oF>&<lUq10S^2+LPHyji}g7jYPY35SRyH59#^u-Cc*texQa`
+z=sUu`=Fu?pH-P}_<5K)?U!LeYV#K%|<j97dlsDQ15bQDo!uRCxC%edDLw1ux!_AF`
+zmv0WnARHnGRvqd(2*1~lHvo{{%Xd(t&`w==BXc0^CcTdAB!*MplU^qbN5hZJAb6rz
+zSs`^@ff%@Kvz68Faprlk{tbD58#O9#J2e{Z(1m#rc2Xa!c934~U>584=(>WjM`#O#
+z15F^n7E!s69E5-I!xw$q)myoh^m*_d<%75|2f}u8WZ5=im;`*nmt05KZ7>>Id_rpw
+z%w0>^M|jM$!hhL|M;(ClnZAwkMfxxVVS5t@+ez=0+XWv>cTnEthND409!x>7v_kGB
+zJx=fa*Wj)=>papH!uN}<)EM+F#5P?RgRqSpRl7|va?p2_w`!-E@nE<)?0Lxw`6D^3
+z_D5={FU~lh&i+n5?`|T;oZLc<MH~cr5WY14;ah6-(al{v1pvaK?M9=)G6)t{$mRH&
+zKhLyQ;3M5cj;-24jYAv+jUbFQ0s;I%=oWHx-)-dR$EKrU$18%sZ4TRU>*t^TO-=S%
+zPx;kvrpBYqItcX92*PH{w{kN;vW4_r(&7_ZdxV#*kh{qdWjh6)J#n^qs88sS*sp|B
+z(I(0dV!SR4LD)?Cezi{EZ3B;2wwjEF)*!TAA$O7^?!o4O=RQyM)?y~?>t%E>T2BR_
+zjR3($0}wWnW1npljPcwo80){89MiDX#3z`7V7fx?AiW=MCq_=imwS1t%+CIQSxko=
+z`Gg5WU)oI7Zlorl#_(&3ad~S$^0o$(_?_u!XbXhzs8Q8W{6KuQk0)okxeG7z+3=6D
+znedXuYy|p@R-v`jM6`kOhiC+012sNr9XZ}{12yi>CJP?H90*&<(U-RhMh(Xodw3%5
+zM$dGc$eyW0SQo?N=~S>o78`yq8vx)S_}pf?c0K8jbU{qGyM`F!yq@%nYZ(oGO&-Az
+z2L0wR27ys**h2a4-fBHc_r^{iE1%zMx=eouSAYjfW5au;vymIq=&0`cV;M~3piCzG
+z=^{1~Edl_RGNI@jY7$yU2B5X%gdJ;$30>9`emNVON5ce*Ai$Wo2|giqonTleJ#>qO
+z!5-PdSv1Z*PsTtx8=aaViY`wVMd@65Ivp`#Arq<1Vxv%&4uVMZxo{?0Lj?S~THrTv
+zt-x;pK=6d?2ph<j(O?Jy_=HEBsBvpxRg~+^Ub@Zncb70BNuSWF)ah2!@t<?&i@2Ge
+z&PJVCz(zkzXQIZ#^N36~8f5|inK}rf5N8PgLrpIEhVZApA^n%Eg>JA;7fqv~34{%#
+z-(46F>(>d!59ID9;=Vsu>}*!mE1L=Z{u4U%Vip-J##!gvC}3g&7l@)?KsUGn032B;
+zia`rS0D&mF8G<Fk;1#R8_z1os0xqp3Cn7G^kpA^+2>%=F2*3SM_}KN<<LtRM&vlke
+z;mi*+nXqAt=&;q<Z20|bCai9;Fl-XeHV+jm2<nu|#vDl(snG&9Mw<ZuWauDh1R;Zs
+zs!OLMhkQoO^j#^OS-(O!3vt&8pq<~zrbD-8(h+emLZ)QUk+U+Gh<TYz#0D56MOjQl
+z9p@t!G2y?0vCLM{D*PUQK6imMk^02~fFQjo^dLZI$kmY1{{%SJryIPU-t>A#6DSKs
+zEu%x<IRJ)V0g%-T05Y6qKCgvcWBxUtRi8@}#i9keXesmpHcFF1#faebO4HX2Aut93
+z9+}8z8EoXTw2x;09cQ>5D20v9N)^YUG!Yk#Af$<69?Z9iQOp;`&NO|E1HoL!XzUtM
+z6;S+H8d~)?ZuiI8Z3mjmsy$M~aZl%q<B`7D^Vyia8aDESd6L*Y`s1xZXz2<tCVqjA
+z@pZaQxLqn0+L`kXc=orKF<_$>%oE37OOeE*`CLH3Q&{zE4HNG;PaJnQMUv2bJk<aa
+z4un)z-2icn^AcRgfX*=myu;RXVT2pbEDse!$5_XU;_YKZG0mUB!(F1CD~>-n4+_l{
+z8;X7-MHC}Smc*;)NfMF%crysiFhExj#l8TKaDBcg=1Ll?zL&<v)ByxxR`}XKKLu_1
+zZ;6t`&?HIHE{J7Gl7ujgBw^MZaYEr-U9l6<97+79IC0$HHR6OL+%f&}mx3VX#)i5M
+zA{n=So{PImmmo<P2>|3kJl9B*kw%(?=0HHv8#Lnh@k!#O?#YsbN8GVFO%Sxe&;o*f
+zY|InIR-}m4GjQ?Sk>VxsGUx_h0|a%+ItY>x6upG=1WD4Qx%y*zILv_n<KjN}ht(QM
+zv@>q|?L^UZqA*UJoSGm>x|ASEewrlJATGFq0}Nkq?LSeH{Bv^CF@10#XrzfRU}W5d
+zE|D`w9G{xR#JXy%eDK}9?ZN<p@r#ipPl=VzITk0?<i?3LYvU!F^aMED<E2SIK+&Hi
+ziW0pN#hShe(&VcE$Oeej&?P>Hk&u}vPK-<zCydg7iRAWtoY8iqAVF*=wPfB{wRG-`
+zSaFhEZKHk{{D1TPd2y2D3@G}=C}GrxaiZkFIEm(dyi|k#KHr<7SyIjaMs<!d``LSu
+ztmcC_>729B4L;ME#4eh5;w8!Icw0?jj3`lrv-gH8R;qD_xTlsTdl+sCakg_ZVkOB5
+zI74r`DU{A#s+P_x;5vb^XVCmBR+_9ayl8~=hAEVa?;IsfDT2r{J07GOX`^4jdLtDf
+zOYw}doqsn%I(LADfASXI@84tqq^ZjzWhwdLQqB7~8y#;m_-B}H+J!LN)O4JU4k(rF
+z{NW+8w7X%l1$}WgIwAnF1<OKY>A7K~<~^K^4yLKH)Xu^78AT9jI2#>MGwc=)on^o9
+zPB3o&9aBN}nM;D~GV_A$7U0{qJDR4mSs%=_&n%c}mzjaH(E&BhE_2{?`$g4L?KAu1
+zY;-{R+ofkrvd=gZAWp+?+~{Z;L598OBh%!LwN1&!+30|Bm#TYu+Q!}Xk|w(2Y;-{N
+z5r-!alti8%ER6aPXQPA3zO(;dx`~4icNYh*z}e`4lF)(94(zm>5F>FmI-o@K#4s@v
+zc!j3@tZ_CvoP7QyW+v?xF@bBW@TYZlJlWU;uwpi_j1^7{z}e`4V%flnA~x{4jm;zm
+zXQSikcU<ddnZR9E_-$MrPZTwt001s=CJ<+%L$?1(V@1rQN}+I~9A~2=u76D6I+*|4
+syL9oyAJ*J4_y53+EF0j0Gr=GIA2665$TZ~=IsgCw07*qoM6N<$f*@>p_5c6?
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/jenkins.png
+deleted file mode 100644
+index 7b332ecba611c276b5930ddd3a822662d0f4ccac..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 23140
+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
+P00000NkvXXu0mjfDh12>
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg
+deleted file mode 100644
+index fcdb87de978..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/loading.svg
++++ /dev/null
+@@ -1,8 +0,0 @@
+-<svg width="200px"  height="200px"  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="lds-dual-ring" style="background: none;">
+-    <circle cx="50" cy="50" ng-attr-r="{{config.radius}}" ng-attr-stroke-width="{{config.width}}" ng-attr-stroke="{{config.c1}}" ng-attr-stroke-dasharray="{{config.dasharray}}" fill="none" stroke-linecap="round" r="40" stroke-width="4" stroke="#84de5c" stroke-dasharray="62.83185307179586 62.83185307179586" transform="rotate(318 50 50)">
+-      <animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform>
+-    </circle>
+-    <circle cx="50" cy="50" ng-attr-r="{{config.radius2}}" ng-attr-stroke-width="{{config.width}}" ng-attr-stroke="{{config.c2}}" ng-attr-stroke-dasharray="{{config.dasharray2}}" ng-attr-stroke-dashoffset="{{config.dashoffset2}}" fill="none" stroke-linecap="round" r="35" stroke-width="4" stroke="#21d129" stroke-dasharray="54.97787143782138 54.97787143782138" stroke-dashoffset="54.97787143782138" transform="rotate(-318 50 50)">
+-      <animateTransform attributeName="transform" type="rotate" calcMode="linear" values="0 50 50;-360 50 50" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animateTransform>
+-    </circle>
+-  </svg>
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/img/pattern-f61c2e99f82389a67432f54155c5f483.png
+deleted file mode 100644
+index 2d62a14fea55f2ea5f35499423a7f4dfc5741d48..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 27786
+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
+WBB$=3Q{Wk6B$^NO?pNKjdGSB87FsC)
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css
+deleted file mode 100644
+index 9724cefe8ed..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/specific.css
++++ /dev/null
+@@ -1,290 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-.tile {
+-  margin: 5px 5px 0px 5px;
+-  padding: 5px;
+-  border: 1px solid #cdcdcd;
+-  height: 210px;
+-  overflow: hidden;
+-  background-color: #ffffff;
+-  border-top-left-radius: 4px;
+-  border-top-right-radius: 4px;
+-  min-width: 250px;
+-}
+-
+-.panel {
+-  margin: 5px 0px 0px 0px;
+-  padding: 5px;
+-  border: 1px solid #cdcdcd;
+-}
+-
+-.desc {
+-  position: relative;
+-  top: 100px;
+-  margin: 5px;
+-  overflow: hidden;
+-  text-overflow: ellipsis;
+-  height: 60px;
+-  padding-right: 25px;
+-}
+-
+-.appBanner {
+-  display: block;
+-  height: 40px;
+-}
+-
+-.appList {
+-  display: block;
+-}
+-
+-html, body, .container {
+-  height: 100%;
+-}
+-
+-.container {
+-    display:table;
+-    width: 100%;
+-    margin: 0;
+-    padding: 0; /*set left/right padding according to needs*/
+-    box-sizing: border-box;
+-}
+-
+-.row {
+-    height: 100%;
+-    display: table-row;
+-}
+-
+-.wizard {
+-    height: 100%;
+-    border: none;
+-}
+-
+-.wizard-body {
+-    height: 100%;
+-}
+-
+-.navigation-header div.btn-group div {
+-    display: inline;
+-}
+-
+-.navigation-header div.btn-group div a:hover {
+-    text-decoration: none;
+-}
+-
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li {
+-    color: #999;
+-}
+-
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li:hover {
+-    background-color: #404351;
+-}
+-
+-.navigation-menu-item {
+-    padding-left: 30px;
+-}
+-
+-ul.nav.side-nav-menu li {
+-    height: 55px;
+-}
+-
+-.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li>a {
+-    color: #b8bec4;
+-}
+-
+-.navigation-bar {
+-    height: 100%;
+-}
+-
+-.navigation-bar-container {
+-    height: 100%;
+-}
+-
+-.content {
+-    margin: 5px;
+-}
+-
+-.mdl-shadow-4dp {
+-    box-shadow: 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12), 0 2px 4px -1px rgba(0,0,0,.2);
+-}
+-
+-/*
+- * hexagon
+- */
+-.hexa, .hexa div {
+-  position: absolute;
+-  top: -5px;
+-  left: 0px;
+-  overflow: hidden;
+-  width: 128px;
+-  height: 128px;
+-}
+-.hexa {
+-  width: 128px;
+-  height: 96px;
+-}
+-.hexa div {
+-  width: 100%;
+-  height: 100%;
+-}
+-.hexa {
+-      -webkit-transform: rotate(120deg);
+-       -moz-transform: rotate(120deg);
+-        -ms-transform: rotate(120deg);
+-         -o-transform: rotate(120deg);
+-            transform: rotate(120deg);
+-}
+-.hex1 {
+-      -webkit-transform: rotate(-60deg);
+-       -moz-transform: rotate(-60deg);
+-        -ms-transform: rotate(-60deg);
+-         -o-transform: rotate(-60deg);
+-            transform: rotate(-60deg);
+-}
+-.hex2 {
+-  box-shadow: 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12), 0 2px 4px -1px rgba(0,0,0,.2);
+-      -webkit-transform: rotate(-60deg);
+-       -moz-transform: rotate(-60deg);
+-        -ms-transform: rotate(-60deg);
+-         -o-transform: rotate(-60deg);
+-            transform: rotate(-60deg);
+-}
+-
+-/*
+- * card title
+- */
+-.card-title {
+-  position: absolute;
+-  top: 5px;
+-  left: 128px;
+-}
+-
+-.card-desc {
+-  margin: 10px;
+-  padding-right: 25px;
+-}
+-
+-.card-footer {
+-  position: relative;
+-  margin: 0px 5px 5px 5px;
+-  padding: 5px;
+-  background-color: #eeeeee;
+-  line-height: 25px;
+-  height: 45px;
+-  color: #666;
+-  font-family: Roboto,sans-serif!important;
+-  font-size: 14;
+-  min-width: 250px;
+-  border-bottom-left-radius: 4px;
+-  border-bottom-right-radius: 4px;
+-}
+-
+-.toparea {
+-  position: fixed;
+-  top: 0px;
+-  left: 0px;
+-  width: 100%;
+-  height: 300px;
+-  color: #2c2e3b;
+-  background: -webkit-linear-gradient(left,#2e3b51 ,#181d2b);
+-  background: -moz-linear-gradient(right,#2e3b51,#181d2b);
+-  background: -o-linear-gradient(right,#2e3b51,#181d2b);
+-  background: linear-gradient(to right,#2e3b51 ,#181d2b);
+-}
+-
+-.pattern-wrapper {
+-  width: 100%;
+-  height: 300px;
+-  background-image: url(img/pattern-f61c2e99f82389a67432f54155c5f483.png);
+-  background-repeat: no-repeat;
+-  background-position: 0px 30px;
+-  position: absolute;
+-  top: 0;
+-  left: 0;
+-}
+-
+-.recommended {
+-  color: #fff;
+-}
+-
+-.loader-wrapper {
+-  position: fixed;
+-  top: 0;
+-  width: 100%;
+-  height: 100%;
+-  background: #222222;
+-  z-index: 1000;
+-  opacity: 0.3;
+-}
+-
+-.loader {
+-  display: table;
+-  margin: 0 auto;
+-  position: relative;
+-  top: 50%;
+-  transform: translateY(-50%);
+-}
+-
+-.loader img {
+-  width: 300px;
+-  height: 225px;
+-}
+-
+-.infobox {
+-    font-size:14px;
+-    margin:20px;
+-    padding:10px;
+-}
+-
+-.grid-container {
+-  display:table;
+-  width:100%;
+-  height: 100%;
+-  padding: 0;
+-  margin-top: 0px;
+-}
+-
+-.grid-row {
+-  height: 100%;
+-  display: table-row;
+-}
+-
+-.grid-row .no-float {
+-  display: table-cell;
+-  float: none;
+-  vertical-align: top;
+-}
+-
+-.navbar-close {
+-  text-align:right;
+-}
+-
+-.apps {
+-  z-index: 99;
+-}
+-
+-.side-bar {
+-  min-width: 230px;
+-  width: 16.666667%;
+-  height: 100%;
+-  background-color: #2D3A4F;
+-  position: absolute;
+-  top: 0;
+-  left: 0;
+-  z-index: -1000;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css
+deleted file mode 100644
+index e787efe76e0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/css/theme.css
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-.theme-dropdown .dropdown-menu {
+-    position: static;
+-    display: block;
+-    margin-bottom: 20px;
+-}
+-
+-.theme-showcase > p > .btn {
+-    margin: 5px 0;
+-}
+-
+-.theme-showcase .navbar .container {
+-    width: auto;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html
+deleted file mode 100644
+index 306be22015e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/index.html
++++ /dev/null
+@@ -1,89 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<!doctype html>
+-<html lang="en" data-ng-app="app">
+-<head>
+-    <meta charset="utf-8">
+-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+-    <meta name="viewport" content="width=device-width, initial-scale=1">
+-    <title>YARN Application Catalog</title>
+-    <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css">
+-    <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap-theme.min.css">
+-    <link href="css/bootstrap-hadoop.css" rel="stylesheet">
+-    <link rel="stylesheet" href="css/theme.css">
+-    <link rel="stylesheet" href="css/specific.css">
+-</head>
+-<body role="document">
+-<div ng-controller="LoadScreenController" class="loader-wrapper {{loadScreen}}">
+-  <div class="loader"><img src="/css/img/loading.svg"></div>
+-</div>
+-<div class="grid-container">
+-  <div class="grid-row">
+-      <div class="side-bar"></div>
+-      <div class="navigation-bar-container col-sx-2 col-sm-2 col-md-2 col-lg-2 no-float" ng-controller="AppListController">
+-        <ul class="side-nav-header nav nav-pills nav-stacked">
+-          <li class="navigation-header">
+-            <div class="btn-group">
+-              <div>
+-                <a href="#"><span class="ambari-header">Applications</span></a>
+-              </div>
+-              <div class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+-                <span class="toggle-icon glyphicon glyphicon-menu-down"></span>
+-              </div>
+-              <ul class="dropdown-menu">
+-                <li><a href="#!/">Appstore</a></li>
+-                <li><a href="#!/new">Register App</a></li>
+-              </ul>
+-            </div>
+-          </li>
+-        </ul>
+-        <ul class="side-nav-menu nav nav-pills nav-stacked">
+-          <li class="mainmenu-li" ng-repeat="yarnApp in appList">
+-            <span class="line">
+-              <a href="#!/app/{{yarnApp.id}}"><span class="glyphicon glyphicon-ok-sign"></span> {{yarnApp.name}}</a>
+-            </span>
+-            <span class="line navbar-close">
+-              <a ng-click="deleteApp(yarnApp.id,yarnApp.name)"><span class="glyphicon glyphicon-remove"></span></a>
+-            </span>
+-            <div>
+-            <span class="navigation-menu-item">{{yarnApp.app}}</span>
+-              </div>
+-          </li>
+-        </ul>
+-        <!--<ul class="side-nav-footer nav nav-pills nav-stacked">
+-          <li class="navigation-footer">
+-            <a href="#" data-toggle="collapse-side-nav">
+-              <span class="navigation-icon fa fa-angle-double-left"></span>
+-            </a>
+-          </li>
+-        </ul>-->
+-      </div>
+-
+-    <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 no-float">
+-      <div data-ng-view></div>
+-    </div>
+-  </div>
+-</div>
+-<script src="vendor/jquery/dist/jquery.min.js"></script>
+-<script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+-<script src="vendor/angular/angular.min.js"></script>
+-<script src="vendor/angular-route/angular-route.min.js"></script>
+-<script src="js/bootstrap-hadoop.min.js"></script>
+-<script src="js/app.js"></script>
+-<script src="js/controllers.js"></script>
+-<script src="js/filters.js"></script>
+-<script src="js/routes.js"></script>
+-<script src="js/services.js"></script>
+-</body>
+-</html>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js
+deleted file mode 100644
+index bd57d5c86a7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.js
++++ /dev/null
+@@ -1,284 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-'use strict';
+-
+-$(document).ready(function () {
+-  var $accordionToggler = $(this).find('[data-toggle="collapseAccordion"]');
+-  $accordionToggler.off('click').on('click', function (event) {
+-    var $this = $(this);
+-    $this.siblings('.panel-body').slideToggle(500);
+-    $this.children().children('.panel-toggle').toggleClass('fa-angle-down fa-angle-up');
+-    event.stopPropagation();
+-    return false;
+-  });
+-});
+-'use strict';
+-
+-(function ($) {
+-
+-  /**
+-   * jQuery plugin for navigation bars
+-   * Usage:
+-   * <pre>
+-   *   $('.navigation-bar').navigationBar();
+-   * </pre>
+-   *
+-   * @param {object} options see <code>$.fn.navigationBar.defaults</code>
+-   * @returns {$}
+-   */
+-
+-  $.fn.navigationBar = function (options) {
+-
+-    var settings = $.extend({}, $.fn.navigationBar.defaults, options);
+-
+-    return this.each(function () {
+-      var _this = this;
+-
+-      var containerSelector = '.navigation-bar-container';
+-      var $navigationContainer = $(this).find(containerSelector);
+-      var $sideNavToggler = $(this).find('[data-toggle=' + settings.navBarToggleDataAttr + ']');
+-      var $subMenuToggler = $(this).find('[data-toggle=' + settings.subMenuNavToggleDataAttr + ']');
+-      var firstLvlMenuItemsSelector = '.side-nav-menu>li';
+-      var secondLvlMenuItemsSelector = '.side-nav-menu>li>ul>li';
+-      var $moreActions = $(this).find('.more-actions');
+-      var $dropdownMenu = $moreActions.children('.dropdown-menu');
+-
+-      $subMenuToggler.each(function (index, toggler) {
+-        return $(toggler).parent().addClass('has-sub-menu');
+-      });
+-
+-      if (settings.fitHeight) {
+-        $(this).addClass('navigation-bar-fit-height');
+-
+-        // make scrolling effect on side nav ONLY, i.e. not effected on ambari main contents
+-        $(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', function (ev) {
+-          var $this = $(this),
+-              scrollTop = this.scrollTop,
+-              scrollHeight = this.scrollHeight,
+-              height = $this.innerHeight(),
+-              delta = ev.originalEvent.wheelDelta,
+-              up = delta > 0;
+-          var prevent = function prevent() {
+-            ev.stopPropagation();
+-            ev.preventDefault();
+-            ev.returnValue = false;
+-            return false;
+-          };
+-
+-          if (!up && -delta > scrollHeight - height - scrollTop) {
+-            // Scrolling down, but this will take us past the bottom.
+-            $this.scrollTop(scrollHeight);
+-            return prevent();
+-          } else if (up && delta > scrollTop) {
+-            // Scrolling up, but this will take us past the top.
+-            $this.scrollTop(0);
+-            return prevent();
+-          }
+-        });
+-      }
+-
+-      //set main content left margin based on the width of side-nav
+-      var containerWidth = $navigationContainer.width();
+-      if (settings.moveLeftContent) {
+-        $(settings.content).css('margin-left', containerWidth);
+-      }
+-      if (settings.moveLeftFooter) {
+-        $(settings.footer).css('margin-left', containerWidth);
+-      }
+-
+-      function popStateHandler() {
+-        var path = window.location.pathname + window.location.hash;
+-        $navigationContainer.find('li a').each(function (index, link) {
+-          var $link = $(link);
+-          var href = $link.attr('data-href') || $link.attr('href');
+-          if (path.indexOf(href) !== -1 && ['', '#'].indexOf(href) === -1) {
+-            $link.parent().addClass('active');
+-          } else {
+-            $link.parent().removeClass('active');
+-          }
+-        });
+-      }
+-
+-      if (settings.handlePopState) {
+-        popStateHandler();
+-        $(window).bind('popstate', popStateHandler);
+-      }
+-
+-      function clickHandler(el) {
+-        var $li = $(el).parent();
+-        var activeClass = settings.activeClass;
+-
+-        var activeMenuItems = firstLvlMenuItemsSelector + '.' + activeClass;
+-        var activeSubMenuItems = secondLvlMenuItemsSelector + '.' + activeClass;
+-        $navigationContainer.find(activeMenuItems).removeClass(activeClass);
+-        $navigationContainer.find(activeSubMenuItems).removeClass(activeClass);
+-        $li.addClass(activeClass);
+-      }
+-
+-      /**
+-       * Click on menu item
+-       */
+-      $(firstLvlMenuItemsSelector + '>a').on('click', function () {
+-        clickHandler(this);
+-      });
+-
+-      /**
+-       * Click on sub menu item
+-       */
+-      $(secondLvlMenuItemsSelector + '>a').on('click', function () {
+-        clickHandler(this);
+-        $(this).parent().parent().parent().addClass(settings.activeClass);
+-      });
+-
+-      /**
+-       * Slider for sub menu
+-       */
+-      $subMenuToggler.off('click').on('click', function (event) {
+-        // ignore click if navigation-bar is collapsed
+-        if ($navigationContainer.hasClass('collapsed')) {
+-          return false;
+-        }
+-        var $this = $(this);
+-        $this.siblings('.sub-menu').slideToggle(600, function () {
+-          var $topMenuItem = $this.parent();
+-          var $subMenu = $topMenuItem.find('ul');
+-          return $subMenu.is(':visible') ? $topMenuItem.removeClass('collapsed') : $topMenuItem.addClass('collapsed');
+-        });
+-        $this.children('.toggle-icon').toggleClass(settings.menuLeftClass + ' ' + settings.menuDownClass);
+-        event.stopPropagation();
+-        return false;
+-      });
+-
+-      /**
+-       * Hovering effects for "more actions icon": "..."
+-       */
+-      $(this).find('.mainmenu-li>a').hover(function () {
+-        var $moreIcon = $(this).siblings('.more-actions');
+-        if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
+-          $moreIcon.css('display', 'inline-block');
+-        }
+-      }, function () {
+-        var $moreIcon = $(this).siblings('.more-actions');
+-        if ($moreIcon.length && !$navigationContainer.hasClass('collapsed')) {
+-          $moreIcon.hide();
+-        }
+-      });
+-      $moreActions.hover(function () {
+-        $(this).css('display', 'inline-block');
+-      });
+-      if (settings.fitHeight) {
+-        $moreActions.on('click', function () {
+-          // set actions submenu position
+-          var $moreIcon = $(this);
+-          var $header = $('.side-nav-header');
+-          $dropdownMenu.css({
+-            top: $moreIcon.offset().top - $header.offset().top + 20 + 'px',
+-            left: $moreIcon.offset().left + 'px'
+-          });
+-        });
+-      }
+-      $dropdownMenu.on('click', function () {
+-        // some action was triggered, should hide this icon
+-        var moreIcon = $(this).parent();
+-        setTimeout(function () {
+-          moreIcon.hide();
+-        }, 1000);
+-      });
+-      $navigationContainer.children('.side-nav-menu').scroll(function () {
+-        $moreActions.removeClass('open');
+-      });
+-
+-      /**
+-       * Expand/collapse navigation bar
+-       */
+-      $sideNavToggler.click(function () {
+-
+-        $navigationContainer.toggleClass('collapsed').promise().done(function () {
+-          var subMenuSelector = 'ul.sub-menu';
+-          var $subMenus = $navigationContainer.find(subMenuSelector);
+-          var $subMenuItems = $navigationContainer.find('.side-nav-menu>li');
+-          if ($navigationContainer.hasClass('collapsed')) {
+-            // set sub menu invisible when collapsed
+-            $subMenus.hide();
+-            $moreActions.hide();
+-            // set the hover effect when collapsed, should show sub-menu on hovering
+-            $subMenuItems.hover(function () {
+-              $(this).find(subMenuSelector).show();
+-              // set sub-menu position
+-              var $parent = $(this);
+-              var $header = $('.side-nav-header');
+-              if (settings.fitHeight) {
+-                $(this).find(subMenuSelector).css({
+-                  position: 'fixed',
+-                  top: $parent.offset().top - $header.offset().top + 'px',
+-                  left: 50 + 'px'
+-                });
+-              }
+-            }, function () {
+-              $(this).find(subMenuSelector).hide();
+-            });
+-          } else {
+-            // keep showing all sub menu
+-            $subMenus.show().each(function (index, item) {
+-              return $(item).parent().removeClass('collapsed');
+-            });
+-            $subMenuItems.unbind('mouseenter mouseleave');
+-            $navigationContainer.find('.toggle-icon').removeClass(settings.menuLeftClass).addClass(settings.menuDownClass);
+-            // set sub-menu position
+-            if (settings.fitHeight) {
+-              $(_this).find(subMenuSelector).css({
+-                position: 'relative',
+-                top: 0,
+-                left: 0
+-              });
+-            }
+-          }
+-
+-          $navigationContainer.on('transitionend', function () {
+-            //set main content left margin based on the width of side-nav
+-            var containerWidth = $navigationContainer.width();
+-            if (settings.moveLeftContent) {
+-              $(settings.content).css('margin-left', containerWidth);
+-            }
+-            if (settings.moveLeftFooter) {
+-              $(settings.footer).css('margin-left', containerWidth);
+-            }
+-          });
+-          $sideNavToggler.find('span').toggleClass(settings.collapseNavBarClass + ' ' + settings.expandNavBarClass);
+-        });
+-        return false;
+-      });
+-    });
+-  };
+-
+-  $.fn.navigationBar.defaults = {
+-    handlePopState: true,
+-    fitHeight: false,
+-    content: '#main',
+-    footer: 'footer',
+-    moveLeftContent: true,
+-    moveLeftFooter: true,
+-    menuLeftClass: 'glyphicon-menu-right',
+-    menuDownClass: 'glyphicon-menu-down',
+-    collapseNavBarClass: 'fa-angle-double-left',
+-    expandNavBarClass: 'fa-angle-double-right',
+-    activeClass: 'active',
+-    navBarToggleDataAttr: 'collapse-side-nav',
+-    subMenuNavToggleDataAttr: 'collapse-sub-menu'
+-  };
+-})(jQuery);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js
+deleted file mode 100644
+index 687279945b4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/js/bootstrap-hadoop.min.js
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-"use strict";$(document).ready(function(){$(this).find('[data-toggle="collapseAccordion"]').off("click").on("click",function(n){var l=$(this);return l.siblings(".panel-body").slideToggle(500),l.children().children(".panel-toggle").toggleClass("fa-angle-down fa-angle-up"),n.stopPropagation(),!1})});
+-"use strict";!function(e){e.fn.navigationBar=function(n){var t=e.extend({},e.fn.navigationBar.defaults,n);return this.each(function(){function n(){var n=window.location.pathname+window.location.hash;i.find("li a").each(function(t,a){var s=e(a),i=s.attr("data-href")||s.attr("href");-1!==n.indexOf(i)&&-1===["","#"].indexOf(i)?s.parent().addClass("active"):s.parent().removeClass("active")})}function a(n){var a=e(n).parent(),s=t.activeClass,o=r+"."+s,l=f+"."+s;i.find(o).removeClass(s),i.find(l).removeClass(s),a.addClass(s)}var s=this,i=e(this).find(".navigation-bar-container"),o=e(this).find("[data-toggle="+t.navBarToggleDataAttr+"]"),l=e(this).find("[data-toggle="+t.subMenuNavToggleDataAttr+"]"),r=".side-nav-menu>li",f=".side-nav-menu>li>ul>li",c=e(this).find(".more-actions"),u=c.children(".dropdown-menu");l.each(function(n,t){return e(t).parent().addClass("has-sub-menu")}),t.fitHeight&&(e(this).addClass("navigation-bar-fit-height"),e(this).find(".side-nav-menu").on("DOMMouseScroll mousewheel",function(n){var t=e(this),a=this.scrollTop,s=this.scrollHeight,i=t.innerHeight(),o=n.originalEvent.wheelDelta,l=o>0,r=function(){return n.stopPropagation(),n.preventDefault(),n.returnValue=!1,!1};return!l&&-o>s-i-a?(t.scrollTop(s),r()):l&&o>a?(t.scrollTop(0),r()):void 0}));var d=i.width();t.moveLeftContent&&e(t.content).css("margin-left",d),t.moveLeftFooter&&e(t.footer).css("margin-left",d),t.handlePopState&&(n(),e(window).bind("popstate",n)),e(r+">a").on("click",function(){a(this)}),e(f+">a").on("click",function(){a(this),e(this).parent().parent().parent().addClass(t.activeClass)}),l.off("click").on("click",function(n){if(i.hasClass("collapsed"))return!1;var a=e(this);return a.siblings(".sub-menu").slideToggle(600,function(){var e=a.parent();return e.find("ul").is(":visible")?e.removeClass("collapsed"):e.addClass("collapsed")}),a.children(".toggle-icon").toggleClass(t.menuLeftClass+" "+t.menuDownClass),n.stopPropagation(),!1}),e(this).find(".mainmenu-li>a").hover(function(){var n=e(this).siblings(".more-actions");n.length&&!i.hasClass("collapsed")&&n.css("display","inline-block")},function(){var n=e(this).siblings(".more-actions");n.length&&!i.hasClass("collapsed")&&n.hide()}),c.hover(function(){e(this).css("display","inline-block")}),t.fitHeight&&c.on("click",function(){var n=e(this),t=e(".side-nav-header");u.css({top:n.offset().top-t.offset().top+20+"px",left:n.offset().left+"px"})}),u.on("click",function(){var n=e(this).parent();setTimeout(function(){n.hide()},1e3)}),i.children(".side-nav-menu").scroll(function(){c.removeClass("open")}),o.click(function(){return i.toggleClass("collapsed").promise().done(function(){var n=i.find("ul.sub-menu"),a=i.find(".side-nav-menu>li");i.hasClass("collapsed")?(n.hide(),c.hide(),a.hover(function(){e(this).find("ul.sub-menu").show();var n=e(this),a=e(".side-nav-header");t.fitHeight&&e(this).find("ul.sub-menu").css({position:"fixed",top:n.offset().top-a.offset().top+"px",left:"50px"})},function(){e(this).find("ul.sub-menu").hide()})):(n.show().each(function(n,t){return e(t).parent().removeClass("collapsed")}),a.unbind("mouseenter mouseleave"),i.find(".toggle-icon").removeClass(t.menuLeftClass).addClass(t.menuDownClass),t.fitHeight&&e(s).find("ul.sub-menu").css({position:"relative",top:0,left:0})),i.on("transitionend",function(){var n=i.width();t.moveLeftContent&&e(t.content).css("margin-left",n),t.moveLeftFooter&&e(t.footer).css("margin-left",n)}),o.find("span").toggleClass(t.collapseNavBarClass+" "+t.expandNavBarClass)}),!1})})},e.fn.navigationBar.defaults={handlePopState:!0,fitHeight:!1,content:"#main",footer:"footer",moveLeftContent:!0,moveLeftFooter:!0,menuLeftClass:"glyphicon-menu-right",menuDownClass:"glyphicon-menu-down",collapseNavBarClass:"fa-angle-double-left",expandNavBarClass:"fa-angle-double-right",activeClass:"active",navBarToggleDataAttr:"collapse-side-nav",subMenuNavToggleDataAttr:"collapse-sub-menu"}}(jQuery);
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html
+deleted file mode 100644
+index 534d0e90e0d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/deploy.html
++++ /dev/null
+@@ -1,80 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<div class="container content">
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <div class="form-group">
+-          <h1>Deploy Application</h1>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="row">
+-      <div class="col-xs-2 col-md-2 col-lg-2">
+-        <img ng-src="{{details.icon}}" alt="" width="128" height="128" ng-if="details.icon != null" />
+-      </div>
+-      <div class="col-xs-10 col-md-10 col-lg-10">
+-        <div class="form-group">
+-          <h2>{{details.org}}/{{details.name}}</h2>
+-          {{details.desc}}
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <div class="form-group">
+-          <label>Application Name</label>
+-          <input type=text name="name" class="form-control" ng-model="details.app.name" autofocus />
+-        </div>
+-        <div class="form-group">
+-          <label>Queue</label>
+-          <input type=text name="queue" class="form-control" ng-model="details.app.queue" />
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.app.components track by $index">
+-        <div class="panel">
+-          <div class="form-group">
+-            <label>Component {{docker.name}}</label>
+-          </div>
+-          <div class="form-group">
+-            <label>Number of containers</label>
+-            <input type=text name="artifact_id" class="form-control" ng-model="docker.number_of_containers" />
+-          </div>
+-          <div class="form-group">
+-            <label>Environments</label>
+-            <textarea json-text name="env" class="form-control" ng-model="docker.configuration.env"/></textarea>
+-          </div>
+-          <div class="form-group">
+-            <label>Properties</label>
+-            <textarea json-text name="properties" class="form-control" ng-model="docker.configuration.properties"/></textarea>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <br>
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <p>
+-        <a class="btn btn-secondary" ng-click="launchApp(details.app)">LAUNCH</a>
+-        <a class="btn btn-secondary" href="/">CANCEL</a>
+-        <span class="infobox bg-info" ng-if="message">{{message}}</span>
+-        <span class="infobox bg-danger" ng-if="error">{{error}}</span>
+-      </div>
+-    </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html
+deleted file mode 100644
+index 64df3b7caeb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/details.html
++++ /dev/null
+@@ -1,65 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<div class="container content">
+-  <div class="row">
+-    <div class="col-xs-12 col-md-12 col-lg-12">
+-      <a ng-click="restartApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-play"></span> Start</a>
+-      <a ng-click="stopApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-stop"></span> Stop</a>
+-      <a ng-click="upgradeApp(appName)" class="btn btn-secondary"><span class="glyphicon glyphicon-circle-arrow-up"></span> Upgrade</a>
+-      <div style="display:inline-block;" ng-repeat="(key, value) in details.yarnfile.quicklinks">
+-        <a ng-href="{{value}}" class="btn btn-secondary" ng-hide="checkServiceLink()"><span class="glyphicon glyphicon-new-window"></span> {{key}}</a>
+-      </div>
+-      {{details.yarnfile.state}}
+-    </div>
+-  </div>
+-
+-  <div class="row">
+-    <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.yarnfile.components">
+-      <div class="panel">
+-        <h3>{{docker.name}}</h3>
+-        <p>Artifact: {{docker.artifact.id}}</p>
+-        <p>Number of containers: {{docker.number_of_containers}}</p>
+-        <p>CPU: {{docker.resource.cpus}}</p>
+-        <p>Memory: {{docker.resource.memory}}</p>
+-        <p>Environments
+-          <table class="table">
+-            <tbody class="table-striped">
+-              <tr ng-repeat="(key, value) in docker.configuration.env">
+-                <td>{{key}}</td><td>{{value}}</td>
+-              </tr>
+-            </tbody>
+-          </table>
+-        </p>
+-        <table class="table">
+-          <thead>
+-            <tr>
+-              <th>Hostname</th>
+-              <th>Container ID</th>
+-              <th>Launch Time</th>
+-              <th>State</th>
+-            </tr>
+-          </thead>
+-          <tbody class="table-striped">
+-            <tr ng-repeat="container in docker.containers">
+-              <td>{{container.bare_host}}</td>
+-              <td><a ng-href="http://{{container.bare_host}}:8042/terminal/terminal.template?container={{container.id}}" target="_blank">{{container.id}}</a></td>
+-              <td>{{container.launch_time | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
+-              <td>{{container.state}}</td>
+-            </tr>
+-          </tbody>
+-        </table>
+-      </div>
+-    </div>
+-  </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html
+deleted file mode 100644
+index 1a440b9b581..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/home.html
++++ /dev/null
+@@ -1,52 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<div class="container content apps">
+-      <div class="toparea"><div class="pattern-wrapper"></div></div>
+-      <form>
+-        <div class="input-group input-group-lg">
+-          <div class="input-group-addon">
+-            <span class="glyphicon glyphicon-search" id="search"></span>
+-          </div>
+-          <input type="text" class="form-control" placeholder="Search for applications from HDFS" aria-describedby="search" ng-model="searchText" ng-change="change(text)" />
+-        </div>
+-      </form>
+-
+-      <p></p>
+-      <p class="recommended">Recommended</p>
+-
+-      <div ng-repeat="a in appStore" ng-if="$index % 3 == 0" class="row">
+-        <div ng-repeat="i in [$index, $index + 1, $index + 2]"
+-             ng-if="appStore[i] != null" class="col-xs-4 col-md-4 col-lg-4 apps">
+-          <div class="tile mdl-shadow-4dp">
+-            <img ng-src="{{appStore[i].icon}}" alt="" width="128" height="128" ng-if="appStore[i] != null" />
+-            <div class="card-title">
+-              <h3>{{appStore[i].org}}</h3>
+-              <h2>{{appStore[i].name}}</h2>
+-            </div>
+-            <div class="card-desc">
+-              <p>{{appStore[i].desc}}</p>
+-            </div>
+-          </div>
+-          <div class="card-footer mdl-shadow-4dp">
+-            <div class="pull-left">
+-              <!-- <span class="glyphicon glyphicon-thumbs-up"></span> {{appStore[i].like | counterValue}} -->
+-              <span class="glyphicon glyphicon-cloud-download"></span> {{appStore[i].download | counterValue}}
+-            </div>
+-            <div class="pull-right">
+-              <button class="btn btn-secondary" ng-click="deployApp(appStore[i].id)">DEPLOY</button>
+-            </div>
+-          </div>
+-        </div>
+-      </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html
+deleted file mode 100644
+index 401722520c7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/new.html
++++ /dev/null
+@@ -1,111 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<div class="container content">
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <div class="form-group">
+-          <h1>Register Application</h1>
+-        </div>
+-        <div class="form-group">
+-          <label>Organization Name</label>
+-          <input type=text name="org" class="form-control" ng-model="details.organization" />
+-        </div>
+-        <div class="form-group">
+-          <label>Application Name</label>
+-          <input type=text name="name" class="form-control" ng-model="details.name" />
+-        </div>
+-        <div class="form-group">
+-          <label>Version</label>
+-          <input type=text name="version" class="form-control" ng-model="details.version" />
+-        </div>
+-        <div class="form-group">
+-          <label>Description</label>
+-          <textarea name="desc" class="form-control" ng-model="details.description"></textarea>
+-        </div>
+-        <div class="form-group">
+-          <label>Quick Link</label>
+-          <textarea json-text name="quicklink" class="form-control" ng-model="details.quicklinks"/></textarea>
+-        </div>
+-        <div class="form-group">
+-          <label>Icon</label>
+-          <input type=text name="icon" class="form-control" ng-model="details.icon" />
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.components track by $index">
+-        <div class="panel">
+-          <div class="pull-right">
+-            <a class="btn btn-secondary" ng-click="remove($index)">-</a>
+-          </div>
+-          <div class="form-group">
+-            <label>Component Name</label>
+-            <input type=text name="name" class="form-control" ng-model="docker.name" />
+-          </div>
+-          <div class="form-group">
+-            <label>Artifact</label>
+-            <input type=text name="artifact_id" class="form-control" ng-model="docker.artifact.id" />
+-          </div>
+-          <div class="form-group">
+-            <label>Number of containers</label>
+-            <input type=text name="artifact_id" class="form-control" ng-model="docker.number_of_containers" />
+-          </div>
+-          <div class="form-group">
+-            <label>Launch Command</label>
+-            <input type=text name="launch_command" class="form-control" ng-model="docker.launch_command" />
+-          </div>
+-          <div class="form-group">
+-            <label>CPU</label>
+-            <input type=text name="cpus" class="form-control" ng-model="docker.resource.cpus" />
+-          </div>
+-          <div class="form-group">
+-            <label>Memory</label>
+-            <input type=text name="memory" class="form-control" ng-model="docker.resource.memory" />
+-          </div>
+-          <div class="form-group">
+-            <input type="checkbox" ng-attr-id="{{'checkbox-priv-' + $index}}" ng-model="docker.run_privileged_container">
+-            <label for="checkbox-priv-{{$index}}"> Privileged Container</label>
+-          </div>
+-          <div class="form-group">
+-            <label>Dependencies</label>
+-            <input json-text type=text name="dependencies" class="form-control" ng-model="docker.dependencies" />
+-          </div>
+-          <div class="form-group">
+-            <label>Placement Policy</label>
+-            <input type=text name="placement" class="form-control" ng-model="docker.placement_policy.constraints" />
+-          </div>
+-          <div class="form-group">
+-            <label>Environments</label>
+-            <textarea json-text name="env" class="form-control" ng-model="docker.configuration.env"/></textarea>
+-          </div>
+-          <div class="form-group">
+-            <label>Properties</label>
+-            <textarea json-text name="properties" class="form-control" ng-model="docker.configuration.properties"/></textarea>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <br>
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <p>
+-        <a class="btn btn-secondary" ng-click="add()">+</a>
+-        <a class="btn btn-secondary" ng-click="save()">Publish</a>
+-        <span class="infobox bg-info" ng-if="message">{{message}}</span>
+-        <span class="infobox bg-danger" ng-if="error">{{error}}</span>
+-      </div>
+-    </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/upgrade.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/upgrade.html
+deleted file mode 100644
+index 2453aabdecb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/partials/upgrade.html
++++ /dev/null
+@@ -1,114 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<div class="container content">
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <div class="form-group">
+-          <h1>Upgrade Application</h1>
+-        </div>
+-        <div class="form-group">
+-          <label>Application Name</label>
+-          <input type=text name="name" class="form-control" ng-model="details.name" readonly />
+-        </div>
+-        <div class="form-group">
+-          <label>Version</label>
+-          <input type=text name="version" class="form-control" ng-model="details.version" />
+-        </div>
+-        <div class="form-group">
+-          <label>Quick Link</label>
+-          <textarea json-text name="quicklink" class="form-control" ng-model="details.quicklinks"/></textarea>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12" ng-repeat="docker in details.components track by $index">
+-        <div class="panel">
+-          <div class="form-group">
+-            <label>Component Name</label>
+-            <input type=text name="name" class="form-control" ng-model="docker.name" readonly />
+-          </div>
+-          <div class="form-group">
+-            <label>Artifact</label>
+-            <input type=text name="artifact_id" class="form-control" ng-model="docker.artifact.id" />
+-          </div>
+-          <div class="form-group">
+-            <label>Number of containers</label>
+-            <input type=text name="artifact_id" class="form-control" ng-model="docker.number_of_containers" readonly />
+-          </div>
+-          <div class="form-group">
+-            <label>Launch Command</label>
+-            <input type=text name="launch_command" class="form-control" ng-model="docker.launch_command" />
+-          </div>
+-          <div class="form-group">
+-            <label>CPU</label>
+-            <input type=text name="cpus" class="form-control" ng-model="docker.resource.cpus" readonly />
+-          </div>
+-          <div class="form-group">
+-            <label>Memory</label>
+-            <input type=text name="memory" class="form-control" ng-model="docker.resource.memory" readonly />
+-          </div>
+-          <div class="form-group">
+-            <input type="checkbox" ng-attr-id="{{'checkbox-priv-' + $index}}" ng-model="docker.run_privileged_container">
+-            <label for="checkbox-priv-{{$index}}"> Privileged Container</label>
+-          </div>
+-          <div class="form-group">
+-            <label>Dependencies</label>
+-            <input json-text type=text name="dependencies" class="form-control" ng-model="docker.dependencies" />
+-          </div>
+-          <div class="form-group">
+-            <label>Placement Policy</label>
+-            <input type=text name="placement" class="form-control" ng-model="docker.placement_policy.constraints" readonly />
+-          </div>
+-          <div class="form-group">
+-            <label>Environments</label>
+-            <textarea json-text name="env" class="form-control" ng-model="docker.configuration.env"/></textarea>
+-          </div>
+-          <div class="form-group">
+-            <label>Properties</label>
+-            <textarea json-text name="properties" class="form-control" ng-model="docker.configuration.properties"/></textarea>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-
+-    <br>
+-    <div class="row">
+-      <div class="col-xs-12 col-md-12 col-lg-12">
+-        <p>
+-        <a class="btn btn-secondary" ng-click="upgradeApp(details)">Upgrade</a>
+-        <a class="btn btn-secondary" href="/#!/app/{{details.name}}">CANCEL</a>
+-      </div>
+-    </div>
+-
+-    <div class="modal fade" id="myModal" role="dialog">
+-      <div class="modal-dialog">
+-        <!-- Modal content-->
+-        <div class="modal-content">
+-          <div class="modal-header">
+-            <button type="button" class="close" data-dismiss="modal">&times;</button>
+-            <h4 class="modal-title" ng-if="message">Info</h4>
+-            <h4 class="modal-title" ng-if="error">Error</h4>
+-          </div>
+-          <div class="modal-body">
+-            <p class="infobox bg-info" ng-if="message">{{message}}</p>
+-            <div id="error-message"></div>
+-          </div>
+-          <div class="modal-footer">
+-            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+-          </div>
+-        </div>
+-      </div>
+-    </div>
+-</div>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html
+deleted file mode 100644
+index 57982d1a9b5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/webapp/theme.html
++++ /dev/null
+@@ -1,649 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<!DOCTYPE html>
+-<html lang="en">
+-<head>
+-    <meta charset="utf-8">
+-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+-    <meta name="viewport" content="width=device-width, initial-scale=1">
+-    <meta name="description" content="">
+-    <meta name="author" content="">
+-
+-    <title>Theme Template for Bootstrap</title>
+-
+-    <!-- Bootstrap core CSS -->
+-    <link href="vendor/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+-    <!-- Bootstrap theme -->
+-    <link href="vendor/bootstrap/dist/css/bootstrap-theme.min.css" rel="stylesheet">
+-
+-    <!-- Custom styles for this template -->
+-    <link href="css/theme.css" rel="stylesheet">
+-    <link href="css/bootstrap-hadoop.css" rel="stylesheet">
+-
+-</head>
+-
+-<body role="document">
+-
+-<!-- Fixed navbar -->
+-<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+-    <div class="container">
+-        <div class="navbar-header">
+-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+-                <span class="sr-only">Toggle navigation</span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-            </button>
+-            <a class="navbar-brand" href="#">Bootstrap theme</a>
+-        </div>
+-        <div class="navbar-collapse collapse">
+-            <ul class="nav navbar-nav">
+-                <li class="active"><a href="index.html">Home</a></li>
+-                <li><a href="#about">About</a></li>
+-                <li><a href="#contact">Contact</a></li>
+-                <li class="dropdown">
+-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+-                    <ul class="dropdown-menu" role="menu">
+-                        <li><a href="#">Action</a></li>
+-                        <li><a href="#">Another action</a></li>
+-                        <li><a href="#">Something else here</a></li>
+-                        <li class="divider"></li>
+-                        <li class="dropdown-header">Nav header</li>
+-                        <li><a href="#">Separated link</a></li>
+-                        <li><a href="#">One more separated link</a></li>
+-                    </ul>
+-                </li>
+-            </ul>
+-        </div>
+-        <!--/.nav-collapse -->
+-    </div>
+-</div>
+-
+-<div class="container theme-showcase" role="main">
+-
+-<!-- Main jumbotron for a primary marketing message or call to action -->
+-<div class="jumbotron">
+-    <h1>Hello, world!</h1>
+-
+-    <p>This is a template for a simple marketing or informational website. It includes a large callout called a
+-        jumbotron and three supporting pieces of content. Use it as a starting point to create something more
+-        unique.</p>
+-
+-    <p><a href="#" class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a></p>
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Buttons</h1>
+-</div>
+-<p>
+-    <button type="button" class="btn btn-lg btn-default">Default</button>
+-    <button type="button" class="btn btn-lg btn-primary">Primary</button>
+-    <button type="button" class="btn btn-lg btn-success">Success</button>
+-    <button type="button" class="btn btn-lg btn-info">Info</button>
+-    <button type="button" class="btn btn-lg btn-warning">Warning</button>
+-    <button type="button" class="btn btn-lg btn-danger">Danger</button>
+-    <button type="button" class="btn btn-lg btn-link">Link</button>
+-</p>
+-<p>
+-    <button type="button" class="btn btn-default">Default</button>
+-    <button type="button" class="btn btn-primary">Primary</button>
+-    <button type="button" class="btn btn-success">Success</button>
+-    <button type="button" class="btn btn-info">Info</button>
+-    <button type="button" class="btn btn-warning">Warning</button>
+-    <button type="button" class="btn btn-danger">Danger</button>
+-    <button type="button" class="btn btn-link">Link</button>
+-</p>
+-<p>
+-    <button type="button" class="btn btn-sm btn-default">Default</button>
+-    <button type="button" class="btn btn-sm btn-primary">Primary</button>
+-    <button type="button" class="btn btn-sm btn-success">Success</button>
+-    <button type="button" class="btn btn-sm btn-info">Info</button>
+-    <button type="button" class="btn btn-sm btn-warning">Warning</button>
+-    <button type="button" class="btn btn-sm btn-danger">Danger</button>
+-    <button type="button" class="btn btn-sm btn-link">Link</button>
+-</p>
+-<p>
+-    <button type="button" class="btn btn-xs btn-default">Default</button>
+-    <button type="button" class="btn btn-xs btn-primary">Primary</button>
+-    <button type="button" class="btn btn-xs btn-success">Success</button>
+-    <button type="button" class="btn btn-xs btn-info">Info</button>
+-    <button type="button" class="btn btn-xs btn-warning">Warning</button>
+-    <button type="button" class="btn btn-xs btn-danger">Danger</button>
+-    <button type="button" class="btn btn-xs btn-link">Link</button>
+-</p>
+-
+-
+-<div class="page-header">
+-    <h1>Tables</h1>
+-</div>
+-<div class="row">
+-    <div class="col-md-6">
+-        <table class="table">
+-            <thead>
+-            <tr>
+-                <th>#</th>
+-                <th>First Name</th>
+-                <th>Last Name</th>
+-                <th>Username</th>
+-            </tr>
+-            </thead>
+-            <tbody>
+-            <tr>
+-                <td>1</td>
+-                <td>Mark</td>
+-                <td>Otto</td>
+-                <td>@mdo</td>
+-            </tr>
+-            <tr>
+-                <td>2</td>
+-                <td>Jacob</td>
+-                <td>Thornton</td>
+-                <td>@fat</td>
+-            </tr>
+-            <tr>
+-                <td>3</td>
+-                <td>Larry</td>
+-                <td>the Bird</td>
+-                <td>@twitter</td>
+-            </tr>
+-            </tbody>
+-        </table>
+-    </div>
+-    <div class="col-md-6">
+-        <table class="table table-striped">
+-            <thead>
+-            <tr>
+-                <th>#</th>
+-                <th>First Name</th>
+-                <th>Last Name</th>
+-                <th>Username</th>
+-            </tr>
+-            </thead>
+-            <tbody>
+-            <tr>
+-                <td>1</td>
+-                <td>Mark</td>
+-                <td>Otto</td>
+-                <td>@mdo</td>
+-            </tr>
+-            <tr>
+-                <td>2</td>
+-                <td>Jacob</td>
+-                <td>Thornton</td>
+-                <td>@fat</td>
+-            </tr>
+-            <tr>
+-                <td>3</td>
+-                <td>Larry</td>
+-                <td>the Bird</td>
+-                <td>@twitter</td>
+-            </tr>
+-            </tbody>
+-        </table>
+-    </div>
+-</div>
+-
+-<div class="row">
+-    <div class="col-md-6">
+-        <table class="table table-bordered">
+-            <thead>
+-            <tr>
+-                <th>#</th>
+-                <th>First Name</th>
+-                <th>Last Name</th>
+-                <th>Username</th>
+-            </tr>
+-            </thead>
+-            <tbody>
+-            <tr>
+-                <td rowspan="2">1</td>
+-                <td>Mark</td>
+-                <td>Otto</td>
+-                <td>@mdo</td>
+-            </tr>
+-            <tr>
+-                <td>Mark</td>
+-                <td>Otto</td>
+-                <td>@TwBootstrap</td>
+-            </tr>
+-            <tr>
+-                <td>2</td>
+-                <td>Jacob</td>
+-                <td>Thornton</td>
+-                <td>@fat</td>
+-            </tr>
+-            <tr>
+-                <td>3</td>
+-                <td colspan="2">Larry the Bird</td>
+-                <td>@twitter</td>
+-            </tr>
+-            </tbody>
+-        </table>
+-    </div>
+-    <div class="col-md-6">
+-        <table class="table table-condensed">
+-            <thead>
+-            <tr>
+-                <th>#</th>
+-                <th>First Name</th>
+-                <th>Last Name</th>
+-                <th>Username</th>
+-            </tr>
+-            </thead>
+-            <tbody>
+-            <tr>
+-                <td>1</td>
+-                <td>Mark</td>
+-                <td>Otto</td>
+-                <td>@mdo</td>
+-            </tr>
+-            <tr>
+-                <td>2</td>
+-                <td>Jacob</td>
+-                <td>Thornton</td>
+-                <td>@fat</td>
+-            </tr>
+-            <tr>
+-                <td>3</td>
+-                <td colspan="2">Larry the Bird</td>
+-                <td>@twitter</td>
+-            </tr>
+-            </tbody>
+-        </table>
+-    </div>
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Thumbnails</h1>
+-</div>
+-<img data-src="holder.js/200x200" class="img-thumbnail"
+-     alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
+-
+-
+-<div class="page-header">
+-    <h1>Labels</h1>
+-</div>
+-<h1>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h1>
+-
+-<h2>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h2>
+-
+-<h3>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h3>
+-<h4>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h4>
+-<h5>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h5>
+-<h6>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</h6>
+-
+-<p>
+-    <span class="label label-default">Default</span>
+-    <span class="label label-primary">Primary</span>
+-    <span class="label label-success">Success</span>
+-    <span class="label label-info">Info</span>
+-    <span class="label label-warning">Warning</span>
+-    <span class="label label-danger">Danger</span>
+-</p>
+-
+-
+-<div class="page-header">
+-    <h1>Badges</h1>
+-</div>
+-<p>
+-    <a href="#">Inbox <span class="badge">42</span></a>
+-</p>
+-<ul class="nav nav-pills">
+-    <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
+-    <li><a href="#">Profile</a></li>
+-    <li><a href="#">Messages <span class="badge">3</span></a></li>
+-</ul>
+-
+-
+-<div class="page-header">
+-    <h1>Dropdown menus</h1>
+-</div>
+-<div class="dropdown theme-dropdown clearfix">
+-    <a id="dropdownMenu1" href="#" role="button" class="sr-only dropdown-toggle" data-toggle="dropdown">Dropdown <span
+-            class="caret"></span></a>
+-    <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+-        <li class="active" role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li>
+-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li>
+-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li>
+-        <li role="presentation" class="divider"></li>
+-        <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li>
+-    </ul>
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Navs</h1>
+-</div>
+-<ul class="nav nav-tabs" role="tablist">
+-    <li class="active"><a href="#">Home</a></li>
+-    <li><a href="#">Profile</a></li>
+-    <li><a href="#">Messages</a></li>
+-</ul>
+-<ul class="nav nav-pills">
+-    <li class="active"><a href="#">Home</a></li>
+-    <li><a href="#">Profile</a></li>
+-    <li><a href="#">Messages</a></li>
+-</ul>
+-
+-
+-<div class="page-header">
+-    <h1>Navbars</h1>
+-</div>
+-
+-<div class="navbar navbar-default">
+-    <div class="container">
+-        <div class="navbar-header">
+-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+-                <span class="sr-only">Toggle navigation</span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-            </button>
+-            <a class="navbar-brand" href="#">Project name</a>
+-        </div>
+-        <div class="navbar-collapse collapse">
+-            <ul class="nav navbar-nav">
+-                <li class="active"><a href="#">Home</a></li>
+-                <li><a href="#about">About</a></li>
+-                <li><a href="#contact">Contact</a></li>
+-                <li class="dropdown">
+-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+-                    <ul class="dropdown-menu" role="menu">
+-                        <li><a href="#">Action</a></li>
+-                        <li><a href="#">Another action</a></li>
+-                        <li><a href="#">Something else here</a></li>
+-                        <li class="divider"></li>
+-                        <li class="dropdown-header">Nav header</li>
+-                        <li><a href="#">Separated link</a></li>
+-                        <li><a href="#">One more separated link</a></li>
+-                    </ul>
+-                </li>
+-            </ul>
+-        </div>
+-        <!--/.nav-collapse -->
+-    </div>
+-</div>
+-
+-<div class="navbar navbar-inverse">
+-    <div class="container">
+-        <div class="navbar-header">
+-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+-                <span class="sr-only">Toggle navigation</span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-                <span class="icon-bar"></span>
+-            </button>
+-            <a class="navbar-brand" href="#">Project name</a>
+-        </div>
+-        <div class="navbar-collapse collapse">
+-            <ul class="nav navbar-nav">
+-                <li class="active"><a href="#">Home</a></li>
+-                <li><a href="#about">About</a></li>
+-                <li><a href="#contact">Contact</a></li>
+-                <li class="dropdown">
+-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
+-                    <ul class="dropdown-menu" role="menu">
+-                        <li><a href="#">Action</a></li>
+-                        <li><a href="#">Another action</a></li>
+-                        <li><a href="#">Something else here</a></li>
+-                        <li class="divider"></li>
+-                        <li class="dropdown-header">Nav header</li>
+-                        <li><a href="#">Separated link</a></li>
+-                        <li><a href="#">One more separated link</a></li>
+-                    </ul>
+-                </li>
+-            </ul>
+-        </div>
+-        <!--/.nav-collapse -->
+-    </div>
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Alerts</h1>
+-</div>
+-<div class="alert alert-success" role="alert">
+-    <strong>Well done!</strong> You successfully read this important alert message.
+-</div>
+-<div class="alert alert-info" role="alert">
+-    <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+-</div>
+-<div class="alert alert-warning" role="alert">
+-    <strong>Warning!</strong> Best check yo self, you're not looking too good.
+-</div>
+-<div class="alert alert-danger" role="alert">
+-    <strong>Oh snap!</strong> Change a few things up and try submitting again.
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Progress bars</h1>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"
+-         style="width: 60%;"><span class="sr-only">60% Complete</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0"
+-         aria-valuemax="100" style="width: 40%"><span class="sr-only">40% Complete (success)</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0"
+-         aria-valuemax="100" style="width: 20%"><span class="sr-only">20% Complete</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0"
+-         aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete (warning)</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0"
+-         aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0"
+-         aria-valuemax="100" style="width: 60%"><span class="sr-only">100% Complete</span></div>
+-</div>
+-<div class="progress">
+-    <div class="progress-bar progress-bar-success" style="width: 35%"><span
+-            class="sr-only">35% Complete (success)</span></div>
+-    <div class="progress-bar progress-bar-warning" style="width: 20%"><span
+-            class="sr-only">20% Complete (warning)</span></div>
+-    <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span>
+-    </div>
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>List groups</h1>
+-</div>
+-<div class="row">
+-    <div class="col-sm-4">
+-        <ul class="list-group">
+-            <li class="list-group-item">Cras justo odio</li>
+-            <li class="list-group-item">Dapibus ac facilisis in</li>
+-            <li class="list-group-item">Morbi leo risus</li>
+-            <li class="list-group-item">Porta ac consectetur ac</li>
+-            <li class="list-group-item">Vestibulum at eros</li>
+-        </ul>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-    <div class="col-sm-4">
+-        <div class="list-group">
+-            <a href="#" class="list-group-item active">
+-                Cras justo odio
+-            </a>
+-            <a href="#" class="list-group-item">Dapibus ac facilisis in</a>
+-            <a href="#" class="list-group-item">Morbi leo risus</a>
+-            <a href="#" class="list-group-item">Porta ac consectetur ac</a>
+-            <a href="#" class="list-group-item">Vestibulum at eros</a>
+-        </div>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-    <div class="col-sm-4">
+-        <div class="list-group">
+-            <a href="#" class="list-group-item active">
+-                <h4 class="list-group-item-heading">List group item heading</h4>
+-
+-                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+-                    risus varius blandit.</p>
+-            </a>
+-            <a href="#" class="list-group-item">
+-                <h4 class="list-group-item-heading">List group item heading</h4>
+-
+-                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+-                    risus varius blandit.</p>
+-            </a>
+-            <a href="#" class="list-group-item">
+-                <h4 class="list-group-item-heading">List group item heading</h4>
+-
+-                <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget
+-                    risus varius blandit.</p>
+-            </a>
+-        </div>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Panels</h1>
+-</div>
+-<div class="row">
+-    <div class="col-sm-4">
+-        <div class="panel panel-default">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-        <div class="panel panel-primary">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-    <div class="col-sm-4">
+-        <div class="panel panel-success">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-        <div class="panel panel-info">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-    <div class="col-sm-4">
+-        <div class="panel panel-warning">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-        <div class="panel panel-danger">
+-            <div class="panel-heading">
+-                <h3 class="panel-title">Panel title</h3>
+-            </div>
+-            <div class="panel-body">
+-                Panel content
+-            </div>
+-        </div>
+-    </div>
+-    <!-- /.col-sm-4 -->
+-</div>
+-
+-
+-<div class="page-header">
+-    <h1>Wells</h1>
+-</div>
+-<div class="well">
+-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non
+-        magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque
+-        nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi
+-        erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.</p>
+-</div>
+-
+-
+-</div>
+-<!-- /container -->
+-
+-
+-<!-- Bootstrap core JavaScript
+-================================================== -->
+-<!-- Placed at the end of the document so the pages load faster -->
+-<script src="vendor/jquery/dist/jquery.min.js"></script>
+-<script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+-<script src="js/bootstrap-hadoop.min.js"></script>
+-</body>
+-</html>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
+deleted file mode 100644
+index fceca7955ce..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/EmbeddedSolrServerFactory.java
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.solr.client.solrj.SolrClient;
+-import org.apache.solr.client.solrj.SolrServerException;
+-import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+-import org.apache.solr.client.solrj.request.CoreAdminRequest;
+-import org.apache.solr.core.NodeConfig;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.file.Path;
+-import java.nio.file.Paths;
+-
+-/**
+- * Embedded solr server factory class for unit tests.
+- */
+-public final class EmbeddedSolrServerFactory {
+-
+-  private EmbeddedSolrServerFactory() {
+-  }
+-
+-  /**
+-   * Cleans the given solrHome directory and creates a new EmbeddedSolrServer.
+-   *
+-   * @param solrHome
+-   *          the Solr home directory to use
+-   * @param configSetHome
+-   *          the directory containing config sets
+-   * @param coreName
+-   *          the name of the core, must have a matching directory in configHome
+-   *
+-   * @return an EmbeddedSolrServer with a core created for the given coreName
+-   * @throws IOException
+-   */
+-  public static SolrClient create(final String solrHome,
+-      final String configSetHome, final String coreName)
+-      throws IOException, SolrServerException {
+-    return create(solrHome, configSetHome, coreName, true);
+-  }
+-
+-  /**
+-   * @param solrHome
+-   *          the Solr home directory to use
+-   * @param configSetHome
+-   *          the directory containing config sets
+-   * @param coreName
+-   *          the name of the core, must have a matching directory in configHome
+-   * @param cleanSolrHome
+-   *          if true the directory for solrHome will be deleted and re-created
+-   *          if it already exists
+-   *
+-   * @return an EmbeddedSolrServer with a core created for the given coreName
+-   * @throws IOException
+-   */
+-  public static SolrClient create(final String solrHome,
+-      final String configSetHome, final String coreName,
+-      final boolean cleanSolrHome) throws IOException, SolrServerException {
+-
+-    final File solrHomeDir = new File(solrHome);
+-    if (solrHomeDir.exists()) {
+-      FileUtils.deleteDirectory(solrHomeDir);
+-      solrHomeDir.mkdirs();
+-    } else {
+-      solrHomeDir.mkdirs();
+-    }
+-
+-    final Path configSetPath = Paths.get(configSetHome).toAbsolutePath();
+-
+-    final NodeConfig config = new NodeConfig.NodeConfigBuilder(
+-        "embeddedSolrServerNode", solrHomeDir.toPath())
+-            .setConfigSetBaseDirectory(configSetPath.toString()).build();
+-
+-    final EmbeddedSolrServer embeddedSolrServer = new EmbeddedSolrServer(config,
+-        coreName);
+-
+-    final CoreAdminRequest.Create createRequest = new CoreAdminRequest.Create();
+-    createRequest.setCoreName(coreName);
+-    createRequest.setConfigSet(coreName);
+-    embeddedSolrServer.request(createRequest);
+-
+-    return embeddedSolrServer;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
+deleted file mode 100644
+index 72e89151302..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
++++ /dev/null
+@@ -1,150 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.application;
+-
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.Application;
+-import org.apache.solr.client.solrj.SolrClient;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.powermock.api.mockito.PowerMockito;
+-import static org.powermock.api.mockito.PowerMockito.when;
+-import static org.powermock.api.support.membermodification.MemberMatcher.method;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-
+-import java.util.List;
+-
+-/**
+- * Unit test for AppCatalogSolrClient.
+- */
+-public class TestAppCatalogSolrClient {
+-
+-  static final String CONFIGSET_DIR = "src/test/resources/configsets";
+-  private static SolrClient solrClient;
+-  private static AppCatalogSolrClient spy;
+-
+-  @BeforeEach
+-  public void setup() throws Exception {
+-    String targetLocation = EmbeddedSolrServerFactory.class
+-        .getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
+-
+-    String solrHome = targetLocation.split("/test-classes")[0] + "/solr";
+-    solrClient = EmbeddedSolrServerFactory.create(solrHome, CONFIGSET_DIR,
+-        "exampleCollection");
+-    spy = PowerMockito.spy(new AppCatalogSolrClient());
+-    when(spy, method(AppCatalogSolrClient.class, "getSolrClient"))
+-        .withNoArguments().thenReturn(solrClient);
+-  }
+-
+-  @AfterEach
+-  public void teardown() throws Exception {
+-    try {
+-      solrClient.close();
+-    } catch (Exception e) {
+-    }
+-  }
+-
+-  @Test
+-  void testRegister() throws Exception {
+-    Application example = new Application();
+-    example.setOrganization("jenkins-ci.org");
+-    example.setName("jenkins");
+-    example.setDescription("World leading open source automation system.");
+-    example.setIcon("/css/img/feather.png");
+-    spy.register(example);
+-    List<AppStoreEntry> apps = spy.getRecommendedApps();
+-    assertEquals(1, apps.size());
+-  }
+-
+-  @Test
+-  void testSearch() throws Exception {
+-    Application example = new Application();
+-    example.setOrganization("jenkins-ci.org");
+-    example.setName("jenkins");
+-    example.setDescription("World leading open source automation system.");
+-    example.setIcon("/css/img/feather.png");
+-    spy.register(example);
+-    List<AppStoreEntry> results = spy.search("name_s:jenkins");
+-    int expected = 1;
+-    int actual = results.size();
+-    assertEquals(expected, actual);
+-  }
+-
+-  @Test
+-  void testNotFoundSearch() throws Exception {
+-    Application example = new Application();
+-    example.setOrganization("jenkins-ci.org");
+-    example.setName("jenkins");
+-    example.setDescription("World leading open source automation system.");
+-    example.setIcon("/css/img/feather.png");
+-    spy.register(example);
+-    List<AppStoreEntry> results = spy.search("name_s:abc");
+-    int expected = 0;
+-    int actual = results.size();
+-    assertEquals(expected, actual);
+-  }
+-
+-  @Test
+-  void testGetRecommendedApps() throws Exception {
+-    AppStoreEntry example = new AppStoreEntry();
+-    example.setOrg("jenkins-ci.org");
+-    example.setName("jenkins");
+-    example.setDesc("World leading open source automation system.");
+-    example.setIcon("/css/img/feather.png");
+-    example.setDownload(100);
+-    spy.register(example);
+-    AppStoreEntry example2 = new AppStoreEntry();
+-    example2.setOrg("Apache");
+-    example2.setName("httpd");
+-    example2.setDesc("Apache webserver");
+-    example2.setIcon("/css/img/feather.png");
+-    example2.setDownload(1);
+-    spy.register(example2);
+-    List<AppStoreEntry> actual = spy.getRecommendedApps();
+-    long previous = 1000L;
+-    for (AppStoreEntry app : actual) {
+-      assertTrue(previous > app.getDownload(),
+-          "Recommend app is not sort by download count.");
+-      previous = app.getDownload();
+-    }
+-  }
+-
+-  @Test
+-  void testUpgradeApp() throws Exception {
+-    Application example = new Application();
+-    String expected = "2.0";
+-    String actual = "";
+-    example.setOrganization("jenkins-ci.org");
+-    example.setVersion("1.0");
+-    example.setName("jenkins");
+-    example.setDescription("World leading open source automation system.");
+-    example.setIcon("/css/img/feather.png");
+-    spy.register(example);
+-    spy.deployApp("test", example);
+-    example.setVersion("2.0");
+-    spy.upgradeApp(example);
+-    List<AppEntry> appEntries = spy.listAppEntries();
+-    actual = appEntries.get(appEntries.size() - 1).getYarnfile().getVersion();
+-    assertEquals(expected, actual);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
+deleted file mode 100644
+index 1ceab0a69a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
++++ /dev/null
+@@ -1,158 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.mockito.Mockito;
+-
+-import javax.ws.rs.Path;
+-import javax.ws.rs.core.Response;
+-
+-import static org.hamcrest.MatcherAssert.assertThat;
+-import static org.hamcrest.core.Is.is;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.mockito.Mockito.when;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Unit test for AppDetailsController.
+- */
+-public class AppDetailsControllerTest {
+-
+-  private AppDetailsController controller;
+-
+-  @BeforeEach
+-  public void setUp() throws Exception {
+-    this.controller = new AppDetailsController();
+-
+-  }
+-
+-  @Test
+-  void testGetDetails() throws Exception {
+-    String id = "application 1";
+-    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+-
+-    AppEntry actual = new AppEntry();
+-    actual.setName(id);
+-    when(ac.getDetails(id)).thenReturn(actual);
+-    final AppEntry result = ac.getDetails(id);
+-    assertEquals(result, actual);
+-  }
+-
+-  @Test
+-  void testGetStatus() throws Exception {
+-    String id = "application 1";
+-    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+-
+-    Service yarnfile = new Service();
+-    Component comp = new Component();
+-    Container c = new Container();
+-    c.setId("container-1");
+-    List<Container> containers = new ArrayList<Container>();
+-    containers.add(c);
+-    comp.setContainers(containers);
+-    yarnfile.addComponent(comp);
+-    AppEntry actual = new AppEntry();
+-    actual.setName(id);
+-    actual.setYarnfile(yarnfile);
+-    when(ac.getStatus(id)).thenReturn(actual);
+-    final AppEntry result = ac.getStatus(id);
+-    assertEquals(result, actual);
+-  }
+-
+-  @Test
+-  void testStopApp() throws Exception {
+-    String id = "application 1";
+-    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+-
+-    Service yarnfile = new Service();
+-    Component comp = new Component();
+-    Container c = new Container();
+-    c.setId("container-1");
+-    List<Container> containers = new ArrayList<Container>();
+-    containers.add(c);
+-    comp.setContainers(containers);
+-    yarnfile.addComponent(comp);
+-    Response expected = Response.ok().build();
+-    when(ac.stopApp(id)).thenReturn(Response.ok().build());
+-    final Response actual = ac.stopApp(id);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-
+-  @Test
+-  void testRestartApp() throws Exception {
+-    String id = "application 1";
+-    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+-
+-    Service yarnfile = new Service();
+-    Component comp = new Component();
+-    Container c = new Container();
+-    c.setId("container-1");
+-    List<Container> containers = new ArrayList<Container>();
+-    containers.add(c);
+-    comp.setContainers(containers);
+-    yarnfile.addComponent(comp);
+-    Response expected = Response.ok().build();
+-    when(ac.restartApp(id)).thenReturn(Response.ok().build());
+-    final Response actual = ac.restartApp(id);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-
+-  @Test
+-  void testPathAnnotation() throws Exception {
+-    assertNotNull(this.controller.getClass()
+-        .getAnnotations());
+-    assertThat("The controller has the annotation Path",
+-        this.controller.getClass()
+-            .isAnnotationPresent(Path.class));
+-
+-    final Path path = this.controller.getClass()
+-        .getAnnotation(Path.class);
+-    assertThat("The path is /app_details", path.value(),
+-        is("/app_details"));
+-  }
+-
+-  @Test
+-  void testUpgradeApp() throws Exception {
+-    String id = "application1";
+-    AppDetailsController ac = Mockito.mock(AppDetailsController.class);
+-
+-    Service yarnfile = new Service();
+-    yarnfile.setVersion("1.0");
+-    Component comp = new Component();
+-    Container c = new Container();
+-    c.setId("container-1");
+-    List<Container> containers = new ArrayList<Container>();
+-    containers.add(c);
+-    comp.setContainers(containers);
+-    yarnfile.addComponent(comp);
+-    Response expected = Response.ok().build();
+-    when(ac.upgradeApp(id, yarnfile)).thenReturn(Response.ok().build());
+-    final Response actual = ac.upgradeApp(id, yarnfile);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
+deleted file mode 100644
+index d788de618a6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.mockito.Mockito;
+-
+-import javax.ws.rs.Path;
+-import javax.ws.rs.core.Response;
+-
+-import static org.hamcrest.MatcherAssert.assertThat;
+-import static org.hamcrest.core.Is.is;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.mockito.Mockito.when;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Unit test for AppListController.
+- */
+-public class AppListControllerTest {
+-
+-  private AppListController controller;
+-
+-  @BeforeEach
+-  public void setUp() throws Exception {
+-    this.controller = new AppListController();
+-
+-  }
+-
+-  @Test
+-  void testGetList() throws Exception {
+-    AppListController ac = Mockito.mock(AppListController.class);
+-
+-    List<AppEntry> actual = new ArrayList<AppEntry>();
+-    when(ac.getList()).thenReturn(actual);
+-    final List<AppEntry> result = ac.getList();
+-    assertEquals(result, actual);
+-  }
+-
+-  @Test
+-  void testDelete() throws Exception {
+-    String id = "application 1";
+-    AppListController ac = Mockito.mock(AppListController.class);
+-
+-    Response expected = Response.ok().build();
+-    when(ac.delete(id, id)).thenReturn(Response.ok().build());
+-    final Response actual = ac.delete(id, id);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-
+-  @Test
+-  void testDeploy() throws Exception {
+-    String id = "application 1";
+-    AppListController ac = Mockito.mock(AppListController.class);
+-    Service service = new Service();
+-    Response expected = Response.ok().build();
+-    when(ac.deploy(id, service)).thenReturn(Response.ok().build());
+-    final Response actual = ac.deploy(id, service);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-
+-  @Test
+-  void testPathAnnotation() throws Exception {
+-    assertNotNull(this.controller.getClass()
+-        .getAnnotations());
+-    assertThat("The controller has the annotation Path",
+-        this.controller.getClass().isAnnotationPresent(Path.class));
+-
+-    final Path path = this.controller.getClass()
+-        .getAnnotation(Path.class);
+-    assertThat("The path is /app_list", path.value(), is("/app_list"));
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
+deleted file mode 100644
+index df0c6802b5a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
++++ /dev/null
+@@ -1,98 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.appcatalog.controller;
+-
+-import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
+-import org.apache.hadoop.yarn.appcatalog.model.Application;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.mockito.Mockito;
+-
+-import javax.ws.rs.Path;
+-import javax.ws.rs.core.Response;
+-
+-import static org.hamcrest.MatcherAssert.assertThat;
+-import static org.hamcrest.core.Is.is;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.mockito.Mockito.when;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Unit tests for AppStoreController.
+- */
+-public class AppStoreControllerTest {
+-
+-  private AppStoreController controller;
+-
+-  @BeforeEach
+-  public void setUp() throws Exception {
+-    this.controller = new AppStoreController();
+-
+-  }
+-
+-  @Test
+-  void testGetRecommended() throws Exception {
+-    AppStoreController ac = Mockito.mock(AppStoreController.class);
+-    List<AppStoreEntry> actual = new ArrayList<AppStoreEntry>();
+-    when(ac.get()).thenReturn(actual);
+-    final List<AppStoreEntry> result = ac.get();
+-    assertEquals(result, actual);
+-  }
+-
+-  @Test
+-  void testSearch() throws Exception {
+-    String keyword = "jenkins";
+-    AppStoreController ac = Mockito.mock(AppStoreController.class);
+-    List<AppStoreEntry> expected = new ArrayList<AppStoreEntry>();
+-    when(ac.search(keyword)).thenReturn(expected);
+-    final List<AppStoreEntry> actual = ac.search(keyword);
+-    assertEquals(expected, actual);
+-  }
+-
+-  @Test
+-  void testRegister() throws Exception {
+-    AppStoreController ac = Mockito.mock(AppStoreController.class);
+-    Application app = new Application();
+-    app.setName("jenkins");
+-    app.setOrganization("jenkins.org");
+-    app.setDescription("This is a description");
+-    app.setIcon("/css/img/feather.png");
+-    Response expected = Response.ok().build();
+-    when(ac.register(app)).thenReturn(Response.ok().build());
+-    final Response actual = ac.register(app);
+-    assertEquals(expected.getStatus(), actual.getStatus());
+-  }
+-
+-  @Test
+-  void testPathAnnotation() throws Exception {
+-    assertNotNull(this.controller.getClass()
+-        .getAnnotations());
+-    assertThat("The controller has the annotation Path",
+-        this.controller.getClass()
+-            .isAnnotationPresent(Path.class));
+-
+-    final Path path = this.controller.getClass()
+-        .getAnnotation(Path.class);
+-    assertThat("The path is /app_store", path.value(), is("/app_store"));
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js
+deleted file mode 100644
+index ec589342407..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/controllersSpec.js
++++ /dev/null
+@@ -1,249 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-describe('Controller tests', function () {
+-
+-  // Unit test for listing, and start/stop applications.
+-  describe('AppListController', function() {
+-    var scope, ctrl, http, httpBackend;
+-
+-    beforeEach(module('app'));
+-    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+-      scope = $rootScope.$new();
+-      rootScope = $rootScope;
+-      http = $http;
+-      httpBackend = $httpBackend;
+-      ctrl = $controller('AppListController', {$scope: scope});
+-    }));
+-
+-    afterEach(function() {
+-      httpBackend.verifyNoOutstandingExpectation();
+-      httpBackend.verifyNoOutstandingRequest();
+-    });
+-
+-    it('should contain appList', function () {
+-      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.flush();
+-      expect(scope.appList.length).toBe(1);
+-    });
+-
+-    it('should test to delete app', function () {
+-      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+-      httpBackend.expectDELETE('/v1/app_list/jenkins/jenkins').respond(200, {data:"Application Deleted."});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      spyOn(rootScope, '$emit');
+-      scope.$apply(function() {
+-        scope.deleteApp("jenkins","jenkins");
+-      });
+-      httpBackend.flush();
+-      expect(rootScope.$emit).toHaveBeenCalledWith('RefreshAppList', {});
+-    });
+-
+-    it('should test to refresh appList', function() {
+-      spyOn(rootScope, '$emit');
+-      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+-      httpBackend.expectGET('/v1/app_list').respond(200, [{id:"jenkins",name:"jenkins",app:"",yarnfile:{}}]);
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      scope.$apply(function() {
+-        scope.refreshList();
+-      });
+-      httpBackend.flush();
+-      expect(rootScope.$emit).toHaveBeenCalledWith('hideLoadScreen', {});
+-    })
+-  });
+-
+-  // Unit test for inspect YARN application details.
+-  describe('AppDetailsController', function() {
+-    var scope, ctrl, http, routeParams, httpBackend;
+-
+-    beforeEach(module('app'));
+-    beforeEach(inject(function ($controller, $rootScope, $http, $routeParams, $httpBackend) {
+-      scope = $rootScope.$new();
+-      rootScope = $rootScope;
+-      http = $http;
+-      routeParams = $routeParams;
+-      httpBackend = $httpBackend;
+-      ctrl = $controller('AppDetailsController', {$scope: scope});
+-    }));
+-
+-    afterEach(function() {
+-      httpBackend.verifyNoOutstandingExpectation();
+-      httpBackend.verifyNoOutstandingRequest();
+-    });
+-
+-    it('should contain unknown state', function () {
+-      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.flush();
+-      expect(scope.details.yarnfile.state).toBe("UNKNOWN");
+-    });
+-
+-    it('should run test to refrshed details', function () {
+-      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+-      httpBackend.expectGET('/v1/app_details/status/aabbccdd').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      scope.$apply(function() {
+-        routeParams.id = "aabbccdd";
+-        scope.appName = "aabbccdd";
+-        scope.refreshAppDetails();
+-      });
+-      httpBackend.flush();
+-      expect(scope.details.yarnfile.state).toBe("ACCEPTED");
+-    });
+-
+-    it('should run test to restart app', function () {
+-      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+-      httpBackend.expectPOST('/v1/app_details/restart/aabbccdd').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.expectGET('/v1/app_details/status/undefined').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+-      scope.$apply(function() {
+-        scope.restartApp("aabbccdd");
+-      });
+-      httpBackend.flush();
+-      expect(scope.details.yarnfile.components).toBe();
+-    });
+-
+-    it('should run test to stop app', function () {
+-      httpBackend.expectGET('/v1/app_details/config/undefined').respond(200, {"yarnfile":{"state":"UNKNOWN","components":[]}});
+-      httpBackend.expectPOST('/v1/app_details/stop/aabbccdd').respond(200, {yarnfile:{state: "STOPPED", components:[]}});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.expectGET('/v1/app_details/status/undefined').respond(200, {yarnfile:{state: "ACCEPTED", components:[]}});
+-      scope.$apply(function() {
+-        scope.stopApp("aabbccdd");
+-      });
+-      httpBackend.flush();
+-      expect(scope.details.yarnfile.components).toBe();
+-    });
+-
+-  });
+-
+-  // Unit test for deploying app, and search for apps from Yarn Appstore.
+-  describe('AppStoreController', function() {
+-    var scope, ctrl, http, httpBackend;
+-
+-    beforeEach(module('app'));
+-    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+-      scope = $rootScope.$new();
+-      http = $http;
+-      httpBackend = $httpBackend;
+-      ctrl = $controller('AppStoreController', {$scope: scope});
+-    }));
+-
+-    afterEach(function() {
+-      httpBackend.verifyNoOutstandingExpectation();
+-      httpBackend.verifyNoOutstandingRequest();
+-    });
+-
+-    it('should contain appStore', function () {
+-      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.flush();
+-      expect(scope.appStore.length).toBe(0);
+-    });
+-
+-    it('should run test to deploy app', function() {
+-      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.flush();
+-      scope.$apply(function() {
+-        scope.deployApp("aabbccdd");
+-      });
+-      expect(scope.appStore.length).toBe(0);
+-    });
+-
+-    it('should run test to search for apps', function() {
+-      httpBackend.expectGET('/v1/app_store/recommended').respond(200, "");
+-      httpBackend.expectGET('/v1/app_store/search?q=aabbccdd').respond(204, {data:'ACCEPTED'});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      scope.$apply(function() {
+-        scope.searchText = "aabbccdd";
+-        scope.change("aabbccdd");
+-      });
+-      httpBackend.flush();
+-      expect(scope.appStore.data).toBe('ACCEPTED');
+-    });
+-
+-  });
+-
+-  // Unit test cases for creating a new YARN application.
+-  describe('NewAppController', function() {
+-    var scope, ctrl, http, httpBackend;
+-
+-    beforeEach(module('app'));
+-    beforeEach(inject(function ($controller, $rootScope, $http, $httpBackend) {
+-      scope = $rootScope.$new();
+-      http = $http;
+-      httpBackend = $httpBackend;
+-      ctrl = $controller('NewAppController', {$scope: scope});
+-    }));
+-
+-    afterEach(function() {
+-      httpBackend.verifyNoOutstandingExpectation();
+-      httpBackend.verifyNoOutstandingRequest();
+-    });
+-
+-    it('should contain details', function () {
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      httpBackend.flush();
+-      expect(scope.details.name).toBe("");
+-    });
+-
+-    it('should run test to register data to backend', function() {
+-      httpBackend.expectPOST('/v1/app_store/register').respond(204, {data:'ACCEPTED'});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      scope.$apply(function() {
+-        scope.save();
+-      });
+-      httpBackend.flush();
+-      expect(scope.message).toEqual("Application published successfully.");
+-    });
+-
+-    it('should run test to fail register data to backend', function() {
+-      httpBackend.expectPOST('/v1/app_store/register').respond(500, {data:'INTERNAL SERVER ERROR'});
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      scope.$apply(function() {
+-        scope.save();
+-      });
+-      httpBackend.flush();
+-      expect(scope.error).toEqual("Error in registering application configuration.");
+-    });
+-
+-    it('should run test to add more component to details', function() {
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      expect(scope.details.components.length).toEqual(1);
+-      scope.$apply(function() {
+-        scope.add();
+-      });
+-      httpBackend.flush();
+-      expect(scope.details.components.length).toEqual(2);
+-    });
+-
+-    it('should run test to remove second component', function() {
+-      httpBackend.expectGET('partials/home.html').respond(200, "");
+-      expect(scope.details.components.length).toEqual(1);
+-      scope.$apply(function() {
+-        scope.add();
+-        scope.remove(1);
+-      });
+-      httpBackend.flush();
+-      expect(scope.details.components.length).toEqual(1);
+-    });
+-  });
+-
+-});
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js
+deleted file mode 100644
+index f7620a4f933..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/javascript/karma.conf.js
++++ /dev/null
+@@ -1,34 +0,0 @@
+-module.exports = function(config){
+-  config.set({
+-
+-    basePath : '../../../',
+-
+-    files : [
+-      'target/generated-sources/vendor/angular**/**.min.js',
+-      'target/generated-sources/vendor/angular-mocks/angular-mocks.js',
+-      'src/main/javascript/**/*.js',
+-      'src/test/javascript/**/*Spec.js',
+-      'src/test/javascript/**/!(karma.conf).js'
+-    ],
+-
+-    autoWatch : true,
+-
+-    frameworks: ['jasmine'],
+-
+-                 browsers: ['PhantomJS'],
+-
+-    plugins : [
+-            'karma-chrome-launcher',
+-            'karma-firefox-launcher',
+-            'karma-phantomjs-launcher',
+-            'karma-jasmine',
+-            'karma-junit-reporter'
+-            ],
+-
+-    junitReporter : {
+-      outputFile: 'target/test_out/unit.xml',
+-        suite: 'src/test/javascript'
+-    }
+-
+-  });
+-};
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets.tgz
+deleted file mode 100644
+index 3352d31e3101f52fe6068f039785f3913c426fbb..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 2996
+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
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt
+deleted file mode 100644
+index 2c164c0b2a1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/lang/stopwords_en.txt
++++ /dev/null
+@@ -1,54 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# a couple of test stopwords to test that the words are really being
+-# configured from this file:
+-stopworda
+-stopwordb
+-
+-# Standard english stop words taken from Lucene's StopAnalyzer
+-a
+-an
+-and
+-are
+-as
+-at
+-be
+-but
+-by
+-for
+-if
+-in
+-into
+-is
+-it
+-no
+-not
+-of
+-on
+-or
+-such
+-that
+-the
+-their
+-then
+-there
+-these
+-they
+-this
+-to
+-was
+-will
+-with
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json
+deleted file mode 100644
+index 06114ef2577..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/params.json
++++ /dev/null
+@@ -1,20 +0,0 @@
+-{"params":{
+-  "query":{
+-    "defType":"edismax",
+-    "q.alt":"*:*",
+-    "rows":"10",
+-    "fl":"*,score",
+-    "":{"v":0}
+-  },
+-  "facets":{
+-    "facet":"on",
+-    "facet.mincount": "1",
+-    "":{"v":0}
+-  },
+- "velocity":{
+-   "wt": "velocity",
+-   "v.template":"browse",
+-   "v.layout": "layout",
+-   "":{"v":0}
+- }
+-}}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt
+deleted file mode 100644
+index 4341c051434..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/protwords.txt
++++ /dev/null
+@@ -1,20 +0,0 @@
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-#-----------------------------------------------------------------------
+-# Use a protected word file to protect against the stemmer reducing two
+-# unrelated words to the same base word.
+-
+-# Some non-words that normally won't be encountered,
+-# just to test that they won't be stemmed.
+-dontstems
+-zwhacky
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml
+deleted file mode 100644
+index 0921e132da2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/schema.xml
++++ /dev/null
+@@ -1,116 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<!--
+- Licensed to the Apache Software Foundation (ASF) under one or more
+- contributor license agreements.  See the NOTICE file distributed with
+- this work for additional information regarding copyright ownership.
+- The ASF licenses this file to You under the Apache License, Version 2.0
+- (the "License"); you may not use this file except in compliance with
+- the License.  You may obtain a copy of the License at
+-
+-     http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+--->
+-
+-<schema name="exampleCollection" version="1.6">
+-
+-    <!-- Defined fields -->
+-    <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" docValues="true" />
+-    <field name="type_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="org_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="name_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="app_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="desc_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="icon_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="yarnfile_s" type="string" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="like_i" type="int" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="download_i" type="int" indexed="true" stored="true" required="false" multiValued="false" docValues="true" />
+-    <field name="_version_" type="long" indexed="true" stored="false"/>
+-
+-    <uniqueKey>id</uniqueKey>
+-
+-    <!-- Field types -->
+-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" docValues="true" />
+-    <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true" docValues="true" />
+-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+-    <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
+-    <fieldType name="int" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+-    <fieldType name="float" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+-    <fieldType name="long" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+-    <fieldType name="double" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+-    <fieldType name="ints" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="floats" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="longs" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="doubles" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="tint" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+-    <fieldType name="tfloat" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+-    <fieldType name="tlong" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+-    <fieldType name="tdouble" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
+-    <fieldType name="tints" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="tfloats" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="tlongs" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="tdoubles" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="date" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
+-    <fieldType name="dates" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="tdate" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0"/>
+-    <fieldType name="tdates" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0" multiValued="true"/>
+-    <fieldType name="binary" class="solr.BinaryField"/>
+-    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+-
+-    <!-- A text field with defaults appropriate for English: it
+-         tokenizes with StandardTokenizer, removes English stop words
+-         (lang/stopwords_en.txt), down cases, protects words from protwords.txt, and
+-         finally applies Porter's stemming.  The query time analyzer
+-         also applies synonyms from synonyms.txt. -->
+-    <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
+-      <analyzer type="index">
+-        <tokenizer class="solr.StandardTokenizerFactory"/>
+-        <!-- in this example, we will only use synonyms at query time
+-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/> -->
+-        <!-- Case insensitive stop word removal. -->
+-        <filter class="solr.StopFilterFactory"
+-                ignoreCase="true"
+-                words="lang/stopwords_en.txt"
+-            />
+-        <filter class="solr.LowerCaseFilterFactory"/>
+-        <filter class="solr.EnglishPossessiveFilterFactory"/>
+-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+-        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
+-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+-        -->
+-        <filter class="solr.PorterStemFilterFactory"/>
+-      </analyzer>
+-      <analyzer type="query">
+-        <tokenizer class="solr.StandardTokenizerFactory"/>
+-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+-        <filter class="solr.StopFilterFactory"
+-                ignoreCase="true"
+-                words="lang/stopwords_en.txt"
+-        />
+-        <filter class="solr.LowerCaseFilterFactory"/>
+-        <filter class="solr.EnglishPossessiveFilterFactory"/>
+-        <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+-        <!-- Optionally you may want to use this less aggressive stemmer instead of PorterStemFilterFactory:
+-        <filter class="solr.EnglishMinimalStemFilterFactory"/>
+-        -->
+-        <filter class="solr.PorterStemFilterFactory"/>
+-      </analyzer>
+-    </fieldType>
+-
+-    <!-- lowercases the entire field value, keeping it as a single token.  -->
+-    <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
+-      <analyzer>
+-        <tokenizer class="solr.KeywordTokenizerFactory"/>
+-        <filter class="solr.LowerCaseFilterFactory" />
+-      </analyzer>
+-    </fieldType>
+-
+-    <!-- since fields of this type are by default not stored or indexed,
+-         any data added to them will be ignored outright.  -->
+-    <fieldType name="ignored" stored="false" indexed="false" docValues="false" multiValued="true" class="solr.StrField" />
+-
+-</schema>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml
+deleted file mode 100644
+index 392feec28aa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/solrconfig.xml
++++ /dev/null
+@@ -1,36 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<!--
+- Licensed to the Apache Software Foundation (ASF) under one or more
+- contributor license agreements.  See the NOTICE file distributed with
+- this work for additional information regarding copyright ownership.
+- The ASF licenses this file to You under the Apache License, Version 2.0
+- (the "License"); you may not use this file except in compliance with
+- the License.  You may obtain a copy of the License at
+-
+-     http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License.
+--->
+-<config>
+-  <luceneMatchVersion>6.2.1</luceneMatchVersion>
+-
+-  <dataDir>${solr.data.dir:}</dataDir>
+-
+-  <schemaFactory class="ClassicIndexSchemaFactory"/>
+-
+-  <indexConfig>
+-    <lockType>single</lockType>
+-  </indexConfig>
+-
+-  <requestDispatcher handleSelect="false">
+-    <httpCaching never304="true" />
+-  </requestDispatcher>
+-
+-  <requestHandler name="/select" class="solr.SearchHandler" />
+-  <requestHandler name="/update" class="solr.UpdateRequestHandler" />
+-
+-</config>
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt
+deleted file mode 100644
+index ae1e83eeb3d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/stopwords.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt
+deleted file mode 100644
+index 0ef0e8daaba..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/configsets/exampleCollection/conf/synonyms.txt
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-#-----------------------------------------------------------------------
+-#some test synonym mappings unlikely to appear in real input text
+-aaafoo => aaabar
+-bbbfoo => bbbfoo bbbbar
+-cccfoo => cccbar cccbaz
+-fooaaa,baraaa,bazaaa
+-
+-# Some synonym groups specific to this example
+-GB,gib,gigabyte,gigabytes
+-MB,mib,megabyte,megabytes
+-Television, Televisions, TV, TVs
+-#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+-#after us won't split it into two words.
+-
+-# Synonym mappings can be used for spelling correction too
+-pixima => pixma
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties
+deleted file mode 100644
+index eb04743a90a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,11 +0,0 @@
+-log4j.rootLogger = INFO, CATALINA
+-
+-# Define all the appenders
+-log4j.appender.CATALINA = org.apache.log4j.DailyRollingFileAppender
+-log4j.appender.CATALINA.File = target/appcatalog.log
+-log4j.appender.CATALINA.Append = true
+-log4j.appender.CATALINA.Encoding = UTF-8
+-# Roll-over the log once per day
+-log4j.appender.CATALINA.DatePattern = '.'yyyy-MM-dd'.log'
+-log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
+-log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
+deleted file mode 100644
+index c532834349e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/pom.xml
++++ /dev/null
+@@ -1,37 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-    <modelVersion>4.0.0</modelVersion>
+-    <parent>
+-        <artifactId>hadoop-yarn-applications</artifactId>
+-        <groupId>org.apache.hadoop</groupId>
+-        <version>3.4.0</version>
+-    </parent>
+-
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-yarn-applications-catalog</artifactId>
+-    <packaging>pom</packaging>
+-
+-    <name>Apache Hadoop YARN Application Catalog</name>
+-
+-    <url>https://hadoop.apache.org</url>
+-
+-    <modules>
+-      <module>hadoop-yarn-applications-catalog-webapp</module>
+-      <module>hadoop-yarn-applications-catalog-docker</module>
+-    </modules>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index d830b7fb381..2b7285f4989 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -37,7 +37,6 @@
+     <module>hadoop-yarn-applications-distributedshell</module>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+-    <module>hadoop-yarn-applications-catalog</module>
+     <module>hadoop-yarn-applications-mawo</module>
+   </modules>
+ 
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index f683e3c9acd..a91c83dc424 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -85,11 +85,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-services-core</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-      <type>war</type>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.0/19-remove-hadoop-yarn-applications-distributedshell.patch b/hadoop/stackable/patches/3.4.0/19-remove-hadoop-yarn-applications-distributedshell.patch
new file mode 100644
index 000000000..70986bbe3
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/19-remove-hadoop-yarn-applications-distributedshell.patch
@@ -0,0 +1,7270 @@
+Entirely remove hadoop-yarn-applications-distributedshell
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../main/resources/assemblies/hadoop-yarn-dist.xml |    7 
+ hadoop-project/pom.xml                             |    6 
+ .../pom.xml                                        |  207 --
+ .../distributedshell/ApplicationMaster.java        | 1954 --------------------
+ .../yarn/applications/distributedshell/Client.java | 1429 ---------------
+ .../applications/distributedshell/DSConstants.java |   52 -
+ .../DistributedShellTimelinePlugin.java            |   78 -
+ .../distributedshell/Log4jPropertyHelper.java      |   48 
+ .../distributedshell/PlacementSpec.java            |  116 -
+ .../distributedshell/package-info.java             |   19 
+ .../ContainerLaunchFailAppMaster.java              |   84 -
+ .../distributedshell/DistributedShellBaseTest.java |  607 ------
+ .../applications/distributedshell/TestClient.java  |   42 
+ .../distributedshell/TestDSAppMaster.java          |  252 ---
+ .../distributedshell/TestDSFailedAppMaster.java    |   82 -
+ .../distributedshell/TestDSSleepingAppMaster.java  |   63 -
+ .../distributedshell/TestDSTimelineV10.java        |  843 ---------
+ .../distributedshell/TestDSTimelineV15.java        |  100 -
+ .../distributedshell/TestDSTimelineV20.java        |  484 -----
+ .../TestDSWithMultipleNodeManager.java             |  503 -----
+ .../src/test/resources/a.txt                       |   15 
+ .../src/test/resources/b.txt                       |   15 
+ .../src/test/resources/log4j.properties            |   19 
+ .../src/test/resources/yarn-site.xml               |   21 
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |    1 
+ 25 files changed, 7047 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DSConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Log4jPropertyHelper.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/PlacementSpec.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/ContainerLaunchFailAppMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSAppMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSFailedAppMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSSleepingAppMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV10.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV15.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV20.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSWithMultipleNodeManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/a.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/b.txt
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/yarn-site.xml
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 9230f0c7a75..7b0bf7219cc 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -79,13 +79,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 26c428044d6..5792423d725 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -555,12 +555,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+deleted file mode 100644
+index fdd0fefb442..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
++++ /dev/null
+@@ -1,207 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn-applications</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN DistributedShell</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>ch.qos.reload4j</groupId>
+-      <artifactId>reload4j</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-cli</groupId>
+-      <artifactId>commons-cli</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-io</groupId>
+-      <artifactId>commons-io</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>jar</goal>
+-            </goals>
+-            <!-- strictly speaking, the unit test is really a regression test. It
+-                 needs the main jar to be available to be able to run. -->
+-            <phase>test-compile</phase>
+-          </execution>
+-        </executions>
+-        <configuration>
+-           <archive>
+-             <manifest>
+-               <mainClass>org.apache.hadoop.yarn.applications.distributedshell.Client</mainClass>
+-             </manifest>
+-           </archive>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+-          <environmentVariables>
+-            <JAVA_HOME>${java.home}</JAVA_HOME>
+-          </environmentVariables>
+-       </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
+deleted file mode 100644
+index a15c78e4267..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
++++ /dev/null
+@@ -1,1954 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.BufferedReader;
+-import java.io.DataInputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.IOException;
+-import java.io.StringReader;
+-import java.io.UncheckedIOException;
+-import java.lang.reflect.UndeclaredThrowableException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.ByteBuffer;
+-import java.nio.charset.StandardCharsets;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.Vector;
+-import java.util.Base64;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.Arrays;
+-import java.util.concurrent.atomic.AtomicLong;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.util.Shell;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
+-import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.ContainerRetryContext;
+-import org.apache.hadoop.yarn.api.records.ContainerRetryPolicy;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.NodeReport;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.ResourceSizing;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.api.records.UpdatedContainer;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
+-import org.apache.hadoop.yarn.api.records.UpdateContainerRequest;
+-import org.apache.hadoop.yarn.api.records.ContainerUpdateType;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEvent;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraint;
+-import org.apache.hadoop.yarn.client.api.AMRMClient;
+-import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
+-import org.apache.hadoop.yarn.client.api.TimelineClient;
+-import org.apache.hadoop.yarn.client.api.TimelineV2Client;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.NMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.impl.NMClientAsyncImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.util.BoundedAppender;
+-import org.apache.hadoop.yarn.util.SystemClock;
+-import org.apache.hadoop.yarn.util.TimelineServiceHelper;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+-import org.apache.log4j.LogManager;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import com.sun.jersey.api.client.ClientHandlerException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * An ApplicationMaster for executing shell commands on a set of launched
+- * containers using the YARN framework.
+- * 
+- * <p>
+- * This class is meant to act as an example on how to write yarn-based
+- * application masters.
+- * </p>
+- * 
+- * <p>
+- * The ApplicationMaster is started on a container by the
+- * <code>ResourceManager</code>'s launcher. The first thing that the
+- * <code>ApplicationMaster</code> needs to do is to connect and register itself
+- * with the <code>ResourceManager</code>. The registration sets up information
+- * within the <code>ResourceManager</code> regarding what host:port the
+- * ApplicationMaster is listening on to provide any form of functionality to a
+- * client as well as a tracking url that a client can use to keep track of
+- * status/job history if needed. However, in the distributedshell, trackingurl
+- * and appMasterHost:appMasterRpcPort are not supported.
+- * </p>
+- * 
+- * <p>
+- * The <code>ApplicationMaster</code> needs to send a heartbeat to the
+- * <code>ResourceManager</code> at regular intervals to inform the
+- * <code>ResourceManager</code> that it is up and alive. The
+- * {@link ApplicationMasterProtocol#allocate} to the <code>ResourceManager</code> from the
+- * <code>ApplicationMaster</code> acts as a heartbeat.
+- * 
+- * <p>
+- * For the actual handling of the job, the <code>ApplicationMaster</code> has to
+- * request the <code>ResourceManager</code> via {@link AllocateRequest} for the
+- * required no. of containers using {@link ResourceRequest} with the necessary
+- * resource specifications such as node location, computational
+- * (memory/disk/cpu) resource requirements. The <code>ResourceManager</code>
+- * responds with an {@link AllocateResponse} that informs the
+- * <code>ApplicationMaster</code> of the set of newly allocated containers,
+- * completed containers as well as current state of available resources.
+- * </p>
+- * 
+- * <p>
+- * For each allocated container, the <code>ApplicationMaster</code> can then set
+- * up the necessary launch context via {@link ContainerLaunchContext} to specify
+- * the allocated container id, local resources required by the executable, the
+- * environment to be setup for the executable, commands to execute, etc. and
+- * submit a {@link StartContainerRequest} to the {@link ContainerManagementProtocol} to
+- * launch and execute the defined commands on the given allocated container.
+- * </p>
+- * 
+- * <p>
+- * The <code>ApplicationMaster</code> can monitor the launched container by
+- * either querying the <code>ResourceManager</code> using
+- * {@link ApplicationMasterProtocol#allocate} to get updates on completed containers or via
+- * the {@link ContainerManagementProtocol} by querying for the status of the allocated
+- * container's {@link ContainerId}.
+- *
+- * <p>
+- * After the job has been completed, the <code>ApplicationMaster</code> has to
+- * send a {@link FinishApplicationMasterRequest} to the
+- * <code>ResourceManager</code> to inform it that the
+- * <code>ApplicationMaster</code> has been completed.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class ApplicationMaster {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(ApplicationMaster.class);
+-
+-  @VisibleForTesting
+-  @Private
+-  public enum DSEvent {
+-    DS_APP_ATTEMPT_START, DS_APP_ATTEMPT_END, DS_CONTAINER_START, DS_CONTAINER_END
+-  }
+-  
+-  @VisibleForTesting
+-  @Private
+-  public enum DSEntity {
+-    DS_APP_ATTEMPT, DS_CONTAINER
+-  }
+-
+-  private static final String YARN_SHELL_ID = "YARN_SHELL_ID";
+-
+-  // Configuration
+-  private Configuration conf;
+-
+-  // Handle to communicate with the Resource Manager
+-  @SuppressWarnings("rawtypes")
+-  private AMRMClientAsync amRMClient;
+-
+-  // In both secure and non-secure modes, this points to the job-submitter.
+-  @VisibleForTesting
+-  UserGroupInformation appSubmitterUgi;
+-
+-  private Path homeDirectory;
+-
+-  // Handle to communicate with the Node Manager
+-  private NMClientAsync nmClientAsync;
+-  // Listen to process the response from the Node Manager
+-  private NMCallbackHandler containerListener;
+-
+-  // Application Attempt Id ( combination of attemptId and fail count )
+-  @VisibleForTesting
+-  protected ApplicationAttemptId appAttemptID;
+-
+-  private ApplicationId appId;
+-  private String appName;
+-
+-  // TODO
+-  // For status update for clients - yet to be implemented
+-  // Hostname of the container
+-  private String appMasterHostname = "";
+-  // Port on which the app master listens for status updates from clients
+-  private int appMasterRpcPort = -1;
+-  // Tracking url to which app master publishes info for clients to monitor
+-  private String appMasterTrackingUrl = "";
+-
+-  private boolean timelineServiceV2Enabled = false;
+-
+-  private boolean timelineServiceV1Enabled = false;
+-
+-  // App Master configuration
+-  // No. of containers to run shell command on
+-  @VisibleForTesting
+-  protected int numTotalContainers = 1;
+-  // Memory to request for the container on which the shell command will run
+-  private static final long DEFAULT_CONTAINER_MEMORY = 10;
+-  private long containerMemory = DEFAULT_CONTAINER_MEMORY;
+-  // VirtualCores to request for the container on which the shell command will run
+-  private static final int DEFAULT_CONTAINER_VCORES = 1;
+-  private int containerVirtualCores = DEFAULT_CONTAINER_VCORES;
+-  // All other resources to request for the container
+-  // on which the shell command will run
+-  private Map<String, Long> containerResources = new HashMap<>();
+-  // Priority of the request
+-  private int requestPriority;
+-  // Execution type of the containers.
+-  // Default GUARANTEED.
+-  private ExecutionType containerType = ExecutionType.GUARANTEED;
+-  // Whether to automatically promote opportunistic containers.
+-  private boolean autoPromoteContainers = false;
+-  // Whether to enforce execution type of the containers.
+-  private boolean enforceExecType = false;
+-
+-  // Resource profile for the container
+-  private String containerResourceProfile = "";
+-  Map<String, Resource> resourceProfiles;
+-
+-  private boolean keepContainersAcrossAttempts = false;
+-
+-  // Counter for completed containers ( complete denotes successful or failed )
+-  private AtomicInteger numCompletedContainers = new AtomicInteger();
+-  // Allocated container count so that we know how many containers has the RM
+-  // allocated to us
+-  @VisibleForTesting
+-  protected AtomicInteger numAllocatedContainers = new AtomicInteger();
+-  // Count of failed containers
+-  private AtomicInteger numFailedContainers = new AtomicInteger();
+-  // Count of containers already requested from the RM
+-  // Needed as once requested, we should not request for containers again.
+-  // Only request for more if the original requirement changes.
+-  @VisibleForTesting
+-  protected AtomicInteger numRequestedContainers = new AtomicInteger();
+-
+-  protected AtomicInteger numIgnore = new AtomicInteger();
+-
+-  protected AtomicInteger totalRetries = new AtomicInteger(10);
+-
+-  // Shell command to be executed
+-  private String shellCommand = "";
+-  // Args to be passed to the shell command
+-  private String shellArgs = "";
+-  // Env variables to be setup for the shell command
+-  private Map<String, String> shellEnv = new HashMap<String, String>();
+-
+-  // Location of shell script ( obtained from info set in env )
+-  // Shell script path in fs
+-  private String scriptPath = "";
+-  // Timestamp needed for creating a local resource
+-  private long shellScriptPathTimestamp = 0;
+-  // File length needed for local resource
+-  private long shellScriptPathLen = 0;
+-
+-  // Placement Specifications
+-  private Map<String, PlacementSpec> placementSpecs = null;
+-
+-  // Container retry options
+-  private ContainerRetryPolicy containerRetryPolicy =
+-      ContainerRetryPolicy.NEVER_RETRY;
+-  private Set<Integer> containerRetryErrorCodes = null;
+-  private int containerMaxRetries = 0;
+-  private int containrRetryInterval = 0;
+-  private long containerFailuresValidityInterval = -1;
+-
+-  private List<String> localizableFiles = new ArrayList<>();
+-
+-  // Timeline domain ID
+-  private String domainId = null;
+-
+-  // Hardcoded path to shell script in launch container's local env
+-  private static final String EXEC_SHELL_STRING_PATH = Client.SCRIPT_PATH
+-      + ".sh";
+-  private static final String EXEC_BAT_SCRIPT_STRING_PATH = Client.SCRIPT_PATH
+-      + ".bat";
+-
+-  // Hardcoded path to custom log_properties
+-  private static final String log4jPath = "log4j.properties";
+-
+-  private static final String shellCommandPath = "shellCommands";
+-  private static final String shellArgsPath = "shellArgs";
+-
+-  private volatile boolean done;
+-
+-  private ByteBuffer allTokens;
+-
+-  // Launch threads
+-  private List<Thread> launchThreads = new ArrayList<Thread>();
+-
+-  // Timeline Client
+-  @VisibleForTesting
+-  TimelineClient timelineClient;
+-
+-  // Timeline v2 Client
+-  @VisibleForTesting
+-  TimelineV2Client timelineV2Client;
+-
+-  static final String CONTAINER_ENTITY_GROUP_ID = "CONTAINERS";
+-  static final String APPID_TIMELINE_FILTER_NAME = "appId";
+-  static final String USER_TIMELINE_FILTER_NAME = "user";
+-  static final String DIAGNOSTICS = "Diagnostics";
+-
+-  private final String linux_bash_command = "bash";
+-  private final String windows_command = "cmd /c";
+-
+-  private int yarnShellIdCounter = 1;
+-  private final AtomicLong allocIdCounter = new AtomicLong(1);
+-
+-  @VisibleForTesting
+-  protected final Set<ContainerId> launchedContainers =
+-      Collections.newSetFromMap(new ConcurrentHashMap<ContainerId, Boolean>());
+-
+-  private BoundedAppender diagnostics = new BoundedAppender(64 * 1024);
+-
+-  /**
+-   * Container start times used to set id prefix while publishing entity
+-   * to ATSv2.
+-   */
+-  private final ConcurrentMap<ContainerId, Long> containerStartTimes =
+-      new ConcurrentHashMap<ContainerId, Long>();
+-
+-  private ConcurrentMap<ContainerId, Long> getContainerStartTimes() {
+-    return containerStartTimes;
+-  }
+-
+-  /**
+-   * @param args Command line args
+-   */
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    ApplicationMaster appMaster = null;
+-    try {
+-      appMaster = new ApplicationMaster();
+-      LOG.info("Initializing ApplicationMaster");
+-      boolean doRun = appMaster.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      appMaster.run();
+-      result = appMaster.finish();
+-    } catch (Throwable t) {
+-      LOG.error("Error running ApplicationMaster", t);
+-      LogManager.shutdown();
+-      ExitUtil.terminate(1, t);
+-    } finally {
+-      if (appMaster != null) {
+-        appMaster.cleanup();
+-      }
+-    }
+-    if (result) {
+-      LOG.info("Application Master completed successfully. exiting");
+-      System.exit(0);
+-    } else {
+-      LOG.error("Application Master failed. exiting");
+-      System.exit(2);
+-    }
+-  }
+-
+-  /**
+-   * Dump out contents of $CWD and the environment to stdout for debugging
+-   */
+-  private void dumpOutDebugInfo() {
+-
+-    LOG.info("Dump debug output");
+-    Map<String, String> envs = System.getenv();
+-    for (Map.Entry<String, String> env : envs.entrySet()) {
+-      LOG.info("System env: key=" + env.getKey() + ", val=" + env.getValue());
+-      System.out.println("System env: key=" + env.getKey() + ", val="
+-          + env.getValue());
+-    }
+-
+-    BufferedReader buf = null;
+-    try {
+-      String lines = Shell.WINDOWS ? Shell.execCommand("cmd", "/c", "dir") :
+-        Shell.execCommand("ls", "-al");
+-      buf = new BufferedReader(new StringReader(lines));
+-      String line = "";
+-      while ((line = buf.readLine()) != null) {
+-        LOG.info("System CWD content: " + line);
+-        System.out.println("System CWD content: " + line);
+-      }
+-    } catch (IOException e) {
+-      e.printStackTrace();
+-    } finally {
+-      IOUtils.cleanupWithLogger(LOG, buf);
+-    }
+-  }
+-
+-  public ApplicationMaster() {
+-    // Set up the configuration
+-    conf = new YarnConfiguration();
+-  }
+-
+-  /**
+-   * Parse command line options
+-   *
+-   * @param args Command line args
+-   * @return Whether init successful and run should be invoked
+-   * @throws ParseException
+-   * @throws IOException
+-   */
+-  public boolean init(String[] args) throws ParseException, IOException {
+-    Options opts = new Options();
+-    opts.addOption("appname", true,
+-        "Application Name. Default value - DistributedShell");
+-    opts.addOption("app_attempt_id", true,
+-        "App Attempt ID. Not to be used unless for testing purposes");
+-    opts.addOption("shell_env", true,
+-        "Environment for shell script. Specified as env_key=env_val pairs");
+-    opts.addOption("container_type", true,
+-        "Container execution type, GUARANTEED or OPPORTUNISTIC");
+-    opts.addOption("promote_opportunistic_after_start", false,
+-        "Flag to indicate whether to automatically promote opportunistic"
+-            + " containers to guaranteed.");
+-    opts.addOption("enforce_execution_type", false,
+-        "Flag to indicate whether to enforce execution type of containers");
+-    opts.addOption("container_memory", true,
+-        "Amount of memory in MB to be requested to run the shell command");
+-    opts.addOption("container_vcores", true,
+-        "Amount of virtual cores to be requested to run the shell command");
+-    opts.addOption("container_resources", true,
+-        "Amount of resources to be requested to run the shell command. " +
+-        "Specified as resource type=value pairs separated by commas. " +
+-        "E.g. -container_resources memory-mb=512,vcores=1");
+-    opts.addOption("container_resource_profile", true,
+-        "Resource profile to be requested to run the shell command");
+-    opts.addOption("num_containers", true,
+-        "No. of containers on which the shell command needs to be executed");
+-    opts.addOption("priority", true, "Application Priority. Default 0");
+-    opts.addOption("container_retry_policy", true,
+-        "Retry policy when container fails to run, "
+-            + "0: NEVER_RETRY, 1: RETRY_ON_ALL_ERRORS, "
+-            + "2: RETRY_ON_SPECIFIC_ERROR_CODES");
+-    opts.addOption("container_retry_error_codes", true,
+-        "When retry policy is set to RETRY_ON_SPECIFIC_ERROR_CODES, error "
+-            + "codes is specified with this option, "
+-            + "e.g. --container_retry_error_codes 1,2,3");
+-    opts.addOption("container_max_retries", true,
+-        "If container could retry, it specifies max retires");
+-    opts.addOption("container_retry_interval", true,
+-        "Interval between each retry, unit is milliseconds");
+-    opts.addOption("container_failures_validity_interval", true,
+-        "Failures which are out of the time window will not be added to"
+-            + " the number of container retry attempts");
+-    opts.addOption("placement_spec", true, "Placement specification");
+-    opts.addOption("debug", false, "Dump out debug information");
+-    opts.addOption("keep_containers_across_application_attempts", false,
+-        "Flag to indicate whether to keep containers across application "
+-            + "attempts."
+-            + " If the flag is true, running containers will not be killed when"
+-            + " application attempt fails and these containers will be "
+-            + "retrieved by"
+-            + " the new application attempt ");
+-    opts.addOption("localized_files", true, "List of localized files");
+-    opts.addOption("homedir", true, "Home Directory of Job Owner");
+-
+-    opts.addOption("help", false, "Print usage");
+-    CommandLine cliParser = new GnuParser().parse(opts, args);
+-
+-    if (args.length == 0) {
+-      printUsage(opts);
+-      throw new IllegalArgumentException(
+-          "No args specified for application master to initialize");
+-    }
+-
+-    //Check whether customer log4j.properties file exists
+-    if (fileExist(log4jPath)) {
+-      try {
+-        Log4jPropertyHelper.updateLog4jConfiguration(ApplicationMaster.class,
+-            log4jPath);
+-      } catch (Exception e) {
+-        LOG.warn("Can not set up custom log4j properties. " + e);
+-      }
+-    }
+-
+-    appName = cliParser.getOptionValue("appname", "DistributedShell");
+-
+-    if (cliParser.hasOption("help")) {
+-      printUsage(opts);
+-      return false;
+-    }
+-
+-    if (cliParser.hasOption("debug")) {
+-      dumpOutDebugInfo();
+-    }
+-
+-    homeDirectory = cliParser.hasOption("homedir") ?
+-        new Path(cliParser.getOptionValue("homedir")) :
+-        new Path("/user/" + System.getenv(ApplicationConstants.
+-        Environment.USER.name()));
+-
+-    if (cliParser.hasOption("placement_spec")) {
+-      String placementSpec = cliParser.getOptionValue("placement_spec");
+-      String decodedSpec = getDecodedPlacementSpec(placementSpec);
+-      LOG.info("Placement Spec received [{}]", decodedSpec);
+-
+-      this.numTotalContainers = 0;
+-      int globalNumOfContainers = Integer
+-          .parseInt(cliParser.getOptionValue("num_containers", "0"));
+-      parsePlacementSpecs(decodedSpec, globalNumOfContainers);
+-      LOG.info("Total num containers requested [{}]", numTotalContainers);
+-
+-      if (numTotalContainers == 0) {
+-        throw new IllegalArgumentException(
+-            "Cannot run distributed shell with no containers");
+-      }
+-    }
+-
+-    Map<String, String> envs = System.getenv();
+-
+-    if (!envs.containsKey(Environment.CONTAINER_ID.name())) {
+-      if (cliParser.hasOption("app_attempt_id")) {
+-        String appIdStr = cliParser.getOptionValue("app_attempt_id", "");
+-        appAttemptID = ApplicationAttemptId.fromString(appIdStr);
+-      } else {
+-        throw new IllegalArgumentException(
+-            "Application Attempt Id not set in the environment");
+-      }
+-    } else {
+-      ContainerId containerId = ContainerId.fromString(envs
+-          .get(Environment.CONTAINER_ID.name()));
+-      appAttemptID = containerId.getApplicationAttemptId();
+-      appId = appAttemptID.getApplicationId();
+-    }
+-
+-    if (!envs.containsKey(ApplicationConstants.APP_SUBMIT_TIME_ENV)) {
+-      throw new RuntimeException(ApplicationConstants.APP_SUBMIT_TIME_ENV
+-          + " not set in the environment");
+-    }
+-    if (!envs.containsKey(Environment.NM_HOST.name())) {
+-      throw new RuntimeException(Environment.NM_HOST.name()
+-          + " not set in the environment");
+-    }
+-    if (!envs.containsKey(Environment.NM_HTTP_PORT.name())) {
+-      throw new RuntimeException(Environment.NM_HTTP_PORT
+-          + " not set in the environment");
+-    }
+-    if (!envs.containsKey(Environment.NM_PORT.name())) {
+-      throw new RuntimeException(Environment.NM_PORT.name()
+-          + " not set in the environment");
+-    }
+-
+-    LOG.info("Application master for app" + ", appId="
+-        + appAttemptID.getApplicationId().getId() + ", clustertimestamp="
+-        + appAttemptID.getApplicationId().getClusterTimestamp()
+-        + ", attemptId=" + appAttemptID.getAttemptId());
+-
+-    if (!fileExist(shellCommandPath)
+-        && envs.get(DSConstants.DISTRIBUTEDSHELLSCRIPTLOCATION).isEmpty()) {
+-      throw new IllegalArgumentException(
+-          "No shell command or shell script specified to be executed by application master");
+-    }
+-
+-    if (fileExist(shellCommandPath)) {
+-      shellCommand = readContent(shellCommandPath);
+-    }
+-
+-    if (fileExist(shellArgsPath)) {
+-      shellArgs = readContent(shellArgsPath);
+-    }
+-
+-    if (cliParser.hasOption("shell_env")) {
+-      String shellEnvs[] = cliParser.getOptionValues("shell_env");
+-      for (String env : shellEnvs) {
+-        env = env.trim();
+-        int index = env.indexOf('=');
+-        if (index == -1) {
+-          shellEnv.put(env, "");
+-          continue;
+-        }
+-        String key = env.substring(0, index);
+-        String val = "";
+-        if (index < (env.length() - 1)) {
+-          val = env.substring(index + 1);
+-        }
+-        shellEnv.put(key, val);
+-      }
+-    }
+-
+-    if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLSCRIPTLOCATION)) {
+-      scriptPath = envs.get(DSConstants.DISTRIBUTEDSHELLSCRIPTLOCATION);
+-
+-      if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLSCRIPTTIMESTAMP)) {
+-        shellScriptPathTimestamp = Long.parseLong(envs
+-            .get(DSConstants.DISTRIBUTEDSHELLSCRIPTTIMESTAMP));
+-      }
+-      if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLSCRIPTLEN)) {
+-        shellScriptPathLen = Long.parseLong(envs
+-            .get(DSConstants.DISTRIBUTEDSHELLSCRIPTLEN));
+-      }
+-      if (!scriptPath.isEmpty()
+-          && (shellScriptPathTimestamp <= 0 || shellScriptPathLen <= 0)) {
+-        LOG.error("Illegal values in env for shell script path" + ", path="
+-            + scriptPath + ", len=" + shellScriptPathLen + ", timestamp="
+-            + shellScriptPathTimestamp);
+-        throw new IllegalArgumentException(
+-            "Illegal values in env for shell script path");
+-      }
+-    }
+-
+-    if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN)) {
+-      domainId = envs.get(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN);
+-    }
+-
+-    if (cliParser.hasOption("container_type")) {
+-      String containerTypeStr = cliParser.getOptionValue("container_type");
+-      if (Arrays.stream(ExecutionType.values()).noneMatch(
+-          executionType -> executionType.toString()
+-              .equals(containerTypeStr))) {
+-        throw new IllegalArgumentException("Invalid container_type: "
+-            + containerTypeStr);
+-      }
+-      containerType = ExecutionType.valueOf(containerTypeStr);
+-    }
+-    if (cliParser.hasOption("promote_opportunistic_after_start")) {
+-      autoPromoteContainers = true;
+-    }
+-    if (cliParser.hasOption("enforce_execution_type")) {
+-      enforceExecType = true;
+-    }
+-    containerMemory = Integer.parseInt(cliParser.getOptionValue(
+-        "container_memory", "-1"));
+-    containerVirtualCores = Integer.parseInt(cliParser.getOptionValue(
+-        "container_vcores", "-1"));
+-    containerResources = new HashMap<>();
+-    if (cliParser.hasOption("container_resources")) {
+-      Map<String, Long> resources = Client.parseResourcesString(
+-          cliParser.getOptionValue("container_resources"));
+-      for (Map.Entry<String, Long> entry : resources.entrySet()) {
+-        containerResources.put(entry.getKey(), entry.getValue());
+-      }
+-    }
+-    containerResourceProfile =
+-        cliParser.getOptionValue("container_resource_profile", "");
+-
+-    keepContainersAcrossAttempts = cliParser.hasOption(
+-        "keep_containers_across_application_attempts");
+-
+-    if (this.placementSpecs == null) {
+-      numTotalContainers = Integer.parseInt(cliParser.getOptionValue(
+-          "num_containers", "1"));
+-    }
+-    if (numTotalContainers == 0) {
+-      throw new IllegalArgumentException(
+-          "Cannot run distributed shell with no containers");
+-    }
+-    requestPriority = Integer.parseInt(cliParser
+-        .getOptionValue("priority", "0"));
+-
+-    containerRetryPolicy = ContainerRetryPolicy.values()[
+-        Integer.parseInt(cliParser.getOptionValue(
+-            "container_retry_policy", "0"))];
+-    if (cliParser.hasOption("container_retry_error_codes")) {
+-      containerRetryErrorCodes = new HashSet<>();
+-      for (String errorCode :
+-          cliParser.getOptionValue("container_retry_error_codes").split(",")) {
+-        containerRetryErrorCodes.add(Integer.parseInt(errorCode));
+-      }
+-    }
+-    containerMaxRetries = Integer.parseInt(
+-        cliParser.getOptionValue("container_max_retries", "0"));
+-    containrRetryInterval = Integer.parseInt(cliParser.getOptionValue(
+-        "container_retry_interval", "0"));
+-    containerFailuresValidityInterval = Long.parseLong(
+-        cliParser.getOptionValue("container_failures_validity_interval", "-1"));
+-    if (!YarnConfiguration.timelineServiceEnabled(conf)) {
+-      timelineClient = null;
+-      timelineV2Client = null;
+-      LOG.warn("Timeline service is not enabled");
+-    }
+-
+-    if (cliParser.hasOption("localized_files")) {
+-      String localizedFilesArg = cliParser.getOptionValue("localized_files");
+-      if (localizedFilesArg.contains(",")) {
+-        String[] files = localizedFilesArg.split(",");
+-        localizableFiles = Arrays.asList(files);
+-      } else {
+-        localizableFiles.add(localizedFilesArg);
+-      }
+-    }
+-
+-    return true;
+-  }
+-
+-  private void parsePlacementSpecs(String decodedSpec,
+-      int globalNumOfContainers) {
+-    Map<String, PlacementSpec> pSpecs =
+-        PlacementSpec.parse(decodedSpec);
+-    this.placementSpecs = new HashMap<>();
+-    for (PlacementSpec pSpec : pSpecs.values()) {
+-      // Use global num of containers when the spec doesn't specify
+-      // source tags. This is allowed when using node-attribute constraints.
+-      if (Strings.isNullOrEmpty(pSpec.sourceTag)
+-          && pSpec.getNumContainers() == 0
+-          && globalNumOfContainers > 0) {
+-        pSpec.setNumContainers(globalNumOfContainers);
+-      }
+-      this.numTotalContainers += pSpec.getNumContainers();
+-      this.placementSpecs.put(pSpec.sourceTag, pSpec);
+-    }
+-  }
+-
+-  private String getDecodedPlacementSpec(String placementSpecifications) {
+-    Base64.Decoder decoder = Base64.getDecoder();
+-    byte[] decodedBytes = decoder.decode(
+-        placementSpecifications.getBytes(StandardCharsets.UTF_8));
+-    String decodedSpec = new String(decodedBytes, StandardCharsets.UTF_8);
+-    LOG.info("Decode placement spec: " + decodedSpec);
+-    return decodedSpec;
+-  }
+-
+-  /**
+-   * Helper function to print usage
+-   *
+-   * @param opts Parsed command line options
+-   */
+-  private void printUsage(Options opts) {
+-    new HelpFormatter().printHelp("ApplicationMaster", opts);
+-  }
+-
+-  protected void cleanup() {
+-    try {
+-      appSubmitterUgi.doAs(new PrivilegedExceptionAction<Void>() {
+-        @Override
+-        public Void run() throws IOException {
+-          FileSystem fs = FileSystem.get(conf);
+-          Path dst = new Path(homeDirectory,
+-              getRelativePath(appName, appId.toString(), ""));
+-          fs.delete(dst, true);
+-          return null;
+-        }
+-      });
+-    } catch(Exception e) {
+-      LOG.warn("Failed to remove application staging directory", e);
+-    }
+-  }
+-
+-  /**
+-   * Main run function for the application master
+-   *
+-   * @throws YarnException
+-   * @throws IOException
+-   */
+-  @SuppressWarnings({ "unchecked" })
+-  public void run() throws YarnException, IOException, InterruptedException {
+-    LOG.info("Starting ApplicationMaster");
+-
+-    // Note: Credentials, Token, UserGroupInformation, DataOutputBuffer class
+-    // are marked as LimitedPrivate
+-    Credentials credentials =
+-        UserGroupInformation.getCurrentUser().getCredentials();
+-    DataOutputBuffer dob = new DataOutputBuffer();
+-    credentials.writeTokenStorageToStream(dob);
+-    // Now remove the AM->RM token so that containers cannot access it.
+-    Iterator<Token<?>> iter = credentials.getAllTokens().iterator();
+-    LOG.info("Executing with tokens:");
+-    while (iter.hasNext()) {
+-      Token<?> token = iter.next();
+-      LOG.info(token.toString());
+-      if (token.getKind().equals(AMRMTokenIdentifier.KIND_NAME)) {
+-        iter.remove();
+-      }
+-    }
+-    allTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-
+-    // Create appSubmitterUgi and add original tokens to it
+-    String appSubmitterUserName =
+-        System.getenv(ApplicationConstants.Environment.USER.name());
+-    appSubmitterUgi =
+-        UserGroupInformation.createRemoteUser(appSubmitterUserName);
+-    appSubmitterUgi.addCredentials(credentials);
+-
+-    AMRMClientAsync.AbstractCallbackHandler allocListener =
+-        new RMCallbackHandler();
+-    amRMClient = AMRMClientAsync.createAMRMClientAsync(1000, allocListener);
+-    amRMClient.init(conf);
+-    amRMClient.start();
+-
+-    containerListener = createNMCallbackHandler();
+-    nmClientAsync = new NMClientAsyncImpl(containerListener);
+-    nmClientAsync.init(conf);
+-    nmClientAsync.start();
+-
+-    startTimelineClient(conf);
+-    if (timelineServiceV2Enabled) {
+-      // need to bind timelineClient
+-      amRMClient.registerTimelineV2Client(timelineV2Client);
+-      publishApplicationAttemptEventOnTimelineServiceV2(
+-          DSEvent.DS_APP_ATTEMPT_START);
+-    }
+-
+-    if (timelineServiceV1Enabled) {
+-      publishApplicationAttemptEvent(timelineClient, appAttemptID.toString(),
+-          DSEvent.DS_APP_ATTEMPT_START, domainId, appSubmitterUgi);
+-    }
+-
+-    // Setup local RPC Server to accept status requests directly from clients
+-    // TODO need to setup a protocol for client to be able to communicate to
+-    // the RPC server
+-    // TODO use the rpc port info to register with the RM for the client to
+-    // send requests to this app master
+-
+-    // Register self with ResourceManager
+-    // This will start heartbeating to the RM
+-    appMasterHostname = NetUtils.getHostname();
+-    Map<Set<String>, PlacementConstraint> placementConstraintMap = null;
+-    if (this.placementSpecs != null) {
+-      placementConstraintMap = new HashMap<>();
+-      for (PlacementSpec spec : this.placementSpecs.values()) {
+-        if (spec.constraint != null) {
+-          Set<String> allocationTags = Strings.isNullOrEmpty(spec.sourceTag) ?
+-              Collections.emptySet() : Collections.singleton(spec.sourceTag);
+-          placementConstraintMap.put(allocationTags, spec.constraint);
+-        }
+-      }
+-    }
+-
+-    RegisterApplicationMasterResponse response = amRMClient
+-        .registerApplicationMaster(appMasterHostname, appMasterRpcPort,
+-            appMasterTrackingUrl, placementConstraintMap);
+-    resourceProfiles = response.getResourceProfiles();
+-    ResourceUtils.reinitializeResources(response.getResourceTypes());
+-    // Dump out information about cluster capability as seen by the
+-    // resource manager
+-    long maxMem = response.getMaximumResourceCapability().getMemorySize();
+-    LOG.info("Max mem capability of resources in this cluster " + maxMem);
+-    
+-    int maxVCores = response.getMaximumResourceCapability().getVirtualCores();
+-    LOG.info("Max vcores capability of resources in this cluster " + maxVCores);
+-
+-    // A resource ask cannot exceed the max.
+-    if (containerMemory > maxMem) {
+-      LOG.info("Container memory specified above max threshold of cluster."
+-          + " Using max value." + ", specified=" + containerMemory + ", max="
+-          + maxMem);
+-      containerMemory = maxMem;
+-    }
+-
+-    if (containerVirtualCores > maxVCores) {
+-      LOG.info("Container virtual cores specified above max threshold of cluster."
+-          + " Using max value." + ", specified=" + containerVirtualCores + ", max="
+-          + maxVCores);
+-      containerVirtualCores = maxVCores;
+-    }
+-
+-    List<Container> previousAMRunningContainers =
+-        response.getContainersFromPreviousAttempts();
+-    LOG.info(appAttemptID + " received " + previousAMRunningContainers.size()
+-      + " previous attempts' running containers on AM registration.");
+-    for(Container container: previousAMRunningContainers) {
+-      launchedContainers.add(container.getId());
+-    }
+-    numAllocatedContainers.addAndGet(previousAMRunningContainers.size());
+-
+-
+-    int numTotalContainersToRequest =
+-        numTotalContainers - previousAMRunningContainers.size();
+-    // Setup ask for containers from RM
+-    // Send request for containers to RM
+-    // Until we get our fully allocated quota, we keep on polling RM for
+-    // containers
+-    // Keep looping until all the containers are launched and shell script
+-    // executed on them ( regardless of success/failure).
+-    if (this.placementSpecs == null) {
+-      LOG.info("placementSpecs null");
+-      for (int i = 0; i < numTotalContainersToRequest; ++i) {
+-        ContainerRequest containerAsk = setupContainerAskForRM();
+-        amRMClient.addContainerRequest(containerAsk);
+-      }
+-    } else {
+-      LOG.info("placementSpecs to create req:" + placementSpecs);
+-      List<SchedulingRequest> schedReqs = new ArrayList<>();
+-      for (PlacementSpec pSpec : this.placementSpecs.values()) {
+-        LOG.info("placementSpec :" + pSpec + ", container:" + pSpec
+-            .getNumContainers());
+-        for (int i = 0; i < pSpec.getNumContainers(); i++) {
+-          SchedulingRequest sr = setupSchedulingRequest(pSpec);
+-          schedReqs.add(sr);
+-        }
+-      }
+-      amRMClient.addSchedulingRequests(schedReqs);
+-    }
+-    numRequestedContainers.set(numTotalContainers);
+-  }
+-
+-  @VisibleForTesting
+-  void startTimelineClient(final Configuration conf)
+-      throws YarnException, IOException, InterruptedException {
+-    try {
+-      appSubmitterUgi.doAs(new PrivilegedExceptionAction<Void>() {
+-        @Override
+-        public Void run() throws Exception {
+-          if (YarnConfiguration.timelineServiceEnabled(conf)) {
+-            timelineServiceV1Enabled =
+-                YarnConfiguration.timelineServiceV1Enabled(conf);
+-            timelineServiceV2Enabled =
+-                YarnConfiguration.timelineServiceV2Enabled(conf);
+-            // Creating the Timeline Client
+-            if (timelineServiceV1Enabled) {
+-              timelineClient = TimelineClient.createTimelineClient();
+-              timelineClient.init(conf);
+-              timelineClient.start();
+-              LOG.info("Timeline service V1 client is enabled");
+-            }
+-            if (timelineServiceV2Enabled) {
+-              timelineV2Client = TimelineV2Client.createTimelineClient(
+-                  appAttemptID.getApplicationId());
+-              timelineV2Client.init(conf);
+-              timelineV2Client.start();
+-              LOG.info("Timeline service V2 client is enabled");
+-            }
+-          } else {
+-            timelineClient = null;
+-            timelineV2Client = null;
+-            LOG.warn("Timeline service is not enabled");
+-          }
+-          return null;
+-        }
+-      });
+-    } catch (UndeclaredThrowableException e) {
+-      throw new YarnException(e.getCause());
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  NMCallbackHandler createNMCallbackHandler() {
+-    return new NMCallbackHandler(this);
+-  }
+-
+-  @VisibleForTesting
+-  protected boolean finish() {
+-    // wait for completion.
+-    while (!done
+-        && (numCompletedContainers.get() != numTotalContainers)) {
+-      try {
+-        Thread.sleep(200);
+-      } catch (InterruptedException ex) {}
+-    }
+-
+-    if (timelineServiceV1Enabled) {
+-      publishApplicationAttemptEvent(timelineClient, appAttemptID.toString(),
+-          DSEvent.DS_APP_ATTEMPT_END, domainId, appSubmitterUgi);
+-    }
+-
+-    if (timelineServiceV2Enabled) {
+-      publishApplicationAttemptEventOnTimelineServiceV2(
+-          DSEvent.DS_APP_ATTEMPT_END);
+-    }
+-
+-    // Join all launched threads
+-    // needed for when we time out
+-    // and we need to release containers
+-    for (Thread launchThread : launchThreads) {
+-      try {
+-        launchThread.join(10000);
+-      } catch (InterruptedException e) {
+-        LOG.info("Exception thrown in thread join: " + e.getMessage());
+-        e.printStackTrace();
+-      }
+-    }
+-
+-    // When the application completes, it should stop all running containers
+-    LOG.info("Application completed. Stopping running containers");
+-    nmClientAsync.stop();
+-
+-    // When the application completes, it should send a finish application
+-    // signal to the RM
+-    LOG.info("Application completed. Signalling finished to RM");
+-
+-    FinalApplicationStatus appStatus;
+-    boolean success = true;
+-    String message = null;
+-    if (numCompletedContainers.get() - numFailedContainers.get()
+-        >= numTotalContainers) {
+-      appStatus = FinalApplicationStatus.SUCCEEDED;
+-    } else {
+-      appStatus = FinalApplicationStatus.FAILED;
+-      message = String.format("Application Failure: desired = %d, " +
+-              "completed = %d, allocated = %d, failed = %d, " +
+-              "diagnostics = %s", numRequestedContainers.get(),
+-          numCompletedContainers.get(), numAllocatedContainers.get(),
+-          numFailedContainers.get(), diagnostics);
+-      success = false;
+-    }
+-    try {
+-      amRMClient.unregisterApplicationMaster(appStatus, message, null);
+-    } catch (YarnException | IOException ex) {
+-      LOG.error("Failed to unregister application", ex);
+-    }
+-    amRMClient.stop();
+-
+-    // Stop Timeline Client
+-    if(timelineServiceV1Enabled) {
+-      timelineClient.stop();
+-    }
+-    if (timelineServiceV2Enabled) {
+-      timelineV2Client.stop();
+-    }
+-
+-    return success;
+-  }
+-
+-  public static String getRelativePath(String appName,
+-      String appId, String fileDstPath) {
+-    return appName + "/" + appId + "/" + fileDstPath;
+-  }
+-
+-  @VisibleForTesting
+-  class RMCallbackHandler extends AMRMClientAsync.AbstractCallbackHandler {
+-    @SuppressWarnings("unchecked")
+-    @Override
+-    public void onContainersCompleted(List<ContainerStatus> completedContainers) {
+-      LOG.info("Got response from RM for container ask, completedCnt="
+-          + completedContainers.size());
+-      for (ContainerStatus containerStatus : completedContainers) {
+-        String message = appAttemptID + " got container status for containerID="
+-            + containerStatus.getContainerId() + ", state="
+-            + containerStatus.getState() + ", exitStatus="
+-            + containerStatus.getExitStatus() + ", diagnostics="
+-            + containerStatus.getDiagnostics();
+-        if (containerStatus.getExitStatus() != 0) {
+-          LOG.error(message);
+-          diagnostics.append(containerStatus.getDiagnostics());
+-        } else {
+-          LOG.info(message);
+-        }
+-
+-        // non complete containers should not be here
+-        assert (containerStatus.getState() == ContainerState.COMPLETE);
+-        // ignore containers we know nothing about - probably from a previous
+-        // attempt
+-        if (!launchedContainers.contains(containerStatus.getContainerId())) {
+-          LOG.info("Ignoring completed status of "
+-              + containerStatus.getContainerId()
+-              + "; unknown container(probably launched by previous attempt)");
+-          continue;
+-        }
+-
+-        // increment counters for completed/failed containers
+-        int exitStatus = containerStatus.getExitStatus();
+-        if (0 != exitStatus) {
+-          // container failed
+-          if (ContainerExitStatus.ABORTED != exitStatus) {
+-            // shell script failed
+-            // counts as completed
+-            numCompletedContainers.incrementAndGet();
+-            numFailedContainers.incrementAndGet();
+-          } else {
+-            // container was killed by framework, possibly preempted
+-            // we should re-try as the container was lost for some reason
+-            numAllocatedContainers.decrementAndGet();
+-            numRequestedContainers.decrementAndGet();
+-            // we do not need to release the container as it would be done
+-            // by the RM
+-
+-            // Ignore these containers if placementspec is enabled
+-            // for the time being.
+-            if (placementSpecs != null) {
+-              numIgnore.incrementAndGet();
+-            }
+-          }
+-        } else {
+-          // nothing to do
+-          // container completed successfully
+-          numCompletedContainers.incrementAndGet();
+-          LOG.info("Container completed successfully." + ", containerId="
+-              + containerStatus.getContainerId());
+-        }
+-        if (timelineServiceV2Enabled) {
+-          Long containerStartTime =
+-              containerStartTimes.get(containerStatus.getContainerId());
+-          if (containerStartTime == null) {
+-            containerStartTime = SystemClock.getInstance().getTime();
+-            containerStartTimes.put(containerStatus.getContainerId(),
+-                containerStartTime);
+-          }
+-          publishContainerEndEventOnTimelineServiceV2(containerStatus,
+-              containerStartTime);
+-        }
+-        if (timelineServiceV1Enabled) {
+-          publishContainerEndEvent(timelineClient, containerStatus, domainId,
+-              appSubmitterUgi);
+-        }
+-      }
+-
+-      // ask for more containers if any failed
+-      int askCount = numTotalContainers - numRequestedContainers.get();
+-      numRequestedContainers.addAndGet(askCount);
+-
+-      // Dont bother re-asking if we are using placementSpecs
+-      if (placementSpecs == null) {
+-        if (askCount > 0) {
+-          for (int i = 0; i < askCount; ++i) {
+-            ContainerRequest containerAsk = setupContainerAskForRM();
+-            amRMClient.addContainerRequest(containerAsk);
+-          }
+-        }
+-      }
+-
+-      if (numCompletedContainers.get() + numIgnore.get() >=
+-          numTotalContainers) {
+-        done = true;
+-      }
+-    }
+-
+-    @Override
+-    public void onContainersAllocated(List<Container> allocatedContainers) {
+-      LOG.info("Got response from RM for container ask, allocatedCnt="
+-          + allocatedContainers.size());
+-      for (Container allocatedContainer : allocatedContainers) {
+-        if (numAllocatedContainers.get() == numTotalContainers) {
+-          LOG.info("The requested number of containers have been allocated."
+-              + " Releasing the extra container allocation from the RM.");
+-          amRMClient.releaseAssignedContainer(allocatedContainer.getId());
+-        } else {
+-          numAllocatedContainers.addAndGet(1);
+-          String yarnShellId = Integer.toString(yarnShellIdCounter);
+-          yarnShellIdCounter++;
+-          LOG.info(
+-              "Launching shell command on a new container."
+-                  + ", containerId=" + allocatedContainer.getId()
+-                  + ", yarnShellId=" + yarnShellId
+-                  + ", containerNode="
+-                  + allocatedContainer.getNodeId().getHost()
+-                  + ":" + allocatedContainer.getNodeId().getPort()
+-                  + ", containerNodeURI="
+-                  + allocatedContainer.getNodeHttpAddress()
+-                  + ", containerResourceMemory"
+-                  + allocatedContainer.getResource().getMemorySize()
+-                  + ", containerResourceVirtualCores"
+-                  + allocatedContainer.getResource().getVirtualCores());
+-
+-          Thread launchThread =
+-              createLaunchContainerThread(allocatedContainer, yarnShellId);
+-
+-          // launch and start the container on a separate thread to keep
+-          // the main thread unblocked
+-          // as all containers may not be allocated at one go.
+-          launchThreads.add(launchThread);
+-          launchedContainers.add(allocatedContainer.getId());
+-          launchThread.start();
+-
+-          // Remove the corresponding request
+-          Collection<AMRMClient.ContainerRequest> requests =
+-              amRMClient.getMatchingRequests(
+-                  allocatedContainer.getAllocationRequestId());
+-          if (requests.iterator().hasNext()) {
+-            AMRMClient.ContainerRequest request = requests.iterator().next();
+-            amRMClient.removeContainerRequest(request);
+-          }
+-        }
+-      }
+-    }
+-
+-    @Override
+-    public void onContainersUpdated(
+-        List<UpdatedContainer> containers) {
+-      for (UpdatedContainer container : containers) {
+-        LOG.info("Container {} updated, updateType={}, resource={}, "
+-                + "execType={}",
+-            container.getContainer().getId(),
+-            container.getUpdateType().toString(),
+-            container.getContainer().getResource().toString(),
+-            container.getContainer().getExecutionType());
+-
+-        // TODO Remove this line with finalized updateContainer API.
+-        // Currently nm client needs to notify the NM to update container
+-        // execution type via NMClient#updateContainerResource() or
+-        // NMClientAsync#updateContainerResourceAsync() when
+-        // auto-update.containers is disabled, but this API is
+-        // under evolving and will need to be replaced by a proper new API.
+-        nmClientAsync.updateContainerResourceAsync(container.getContainer());
+-      }
+-    }
+-
+-    @Override
+-    public void onRequestsRejected(List<RejectedSchedulingRequest> rejReqs) {
+-      List<SchedulingRequest> reqsToRetry = new ArrayList<>();
+-      for (RejectedSchedulingRequest rejReq : rejReqs) {
+-        LOG.info("Scheduling Request {} has been rejected. Reason {}",
+-            rejReq.getRequest(), rejReq.getReason());
+-        reqsToRetry.add(rejReq.getRequest());
+-      }
+-      totalRetries.addAndGet(-1 * reqsToRetry.size());
+-      if (totalRetries.get() <= 0) {
+-        LOG.info("Exiting, since retries are exhausted !!");
+-        done = true;
+-      } else {
+-        amRMClient.addSchedulingRequests(reqsToRetry);
+-      }
+-    }
+-
+-    @Override public void onShutdownRequest() {
+-      if (keepContainersAcrossAttempts) {
+-        LOG.info("Shutdown request received. Ignoring since "
+-            + "keep_containers_across_application_attempts is enabled");
+-      } else{
+-        LOG.info("Shutdown request received. Processing since "
+-            + "keep_containers_across_application_attempts is disabled");
+-        done = true;
+-      }
+-    }
+-
+-    @Override
+-    public void onNodesUpdated(List<NodeReport> updatedNodes) {}
+-
+-    @Override
+-    public float getProgress() {
+-      // set progress to deliver to RM on next heartbeat
+-      float progress = (float) numCompletedContainers.get()
+-          / numTotalContainers;
+-      return progress;
+-    }
+-
+-    @Override
+-    public void onError(Throwable e) {
+-      LOG.error("Error in RMCallbackHandler: ", e);
+-      done = true;
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  class NMCallbackHandler extends NMClientAsync.AbstractCallbackHandler {
+-
+-    private ConcurrentMap<ContainerId, Container> containers =
+-        new ConcurrentHashMap<ContainerId, Container>();
+-    private final ApplicationMaster applicationMaster;
+-
+-    public NMCallbackHandler(ApplicationMaster applicationMaster) {
+-      this.applicationMaster = applicationMaster;
+-    }
+-
+-    public void addContainer(ContainerId containerId, Container container) {
+-      containers.putIfAbsent(containerId, container);
+-    }
+-
+-    @Override
+-    public void onContainerStopped(ContainerId containerId) {
+-      LOG.debug("Succeeded to stop Container {}", containerId);
+-      containers.remove(containerId);
+-    }
+-
+-    @Override
+-    public void onContainerStatusReceived(ContainerId containerId,
+-        ContainerStatus containerStatus) {
+-      LOG.debug("Container Status: id={}, status={}", containerId,
+-          containerStatus);
+-
+-      // If promote_opportunistic_after_start is set, automatically promote
+-      // opportunistic containers to guaranteed.
+-      if (autoPromoteContainers) {
+-        if (containerStatus.getState() == ContainerState.RUNNING) {
+-          Container container = containers.get(containerId);
+-          if (container.getExecutionType() == ExecutionType.OPPORTUNISTIC) {
+-            // Promote container
+-            LOG.info("Promoting container {} to {}", container.getId(),
+-                container.getExecutionType());
+-            UpdateContainerRequest updateRequest = UpdateContainerRequest
+-                .newInstance(container.getVersion(), container.getId(),
+-                    ContainerUpdateType.PROMOTE_EXECUTION_TYPE, null,
+-                    ExecutionType.GUARANTEED);
+-            amRMClient.requestContainerUpdate(container, updateRequest);
+-          }
+-        }
+-      }
+-    }
+-
+-    @Override
+-    public void onContainerStarted(ContainerId containerId,
+-        Map<String, ByteBuffer> allServiceResponse) {
+-      LOG.debug("Succeeded to start Container {}", containerId);
+-      Container container = containers.get(containerId);
+-      if (container != null) {
+-        applicationMaster.nmClientAsync.getContainerStatusAsync(
+-            containerId, container.getNodeId());
+-      }
+-      if (applicationMaster.timelineServiceV2Enabled) {
+-        long startTime = SystemClock.getInstance().getTime();
+-        applicationMaster.getContainerStartTimes().put(containerId, startTime);
+-        applicationMaster.publishContainerStartEventOnTimelineServiceV2(
+-            container, startTime);
+-      }
+-      if (applicationMaster.timelineServiceV1Enabled) {
+-        applicationMaster.publishContainerStartEvent(
+-            applicationMaster.timelineClient, container,
+-            applicationMaster.domainId, applicationMaster.appSubmitterUgi);
+-      }
+-    }
+-
+-    @Override
+-    public void onStartContainerError(ContainerId containerId, Throwable t) {
+-      LOG.error("Failed to start Container {}", containerId, t);
+-      containers.remove(containerId);
+-      applicationMaster.numCompletedContainers.incrementAndGet();
+-      applicationMaster.numFailedContainers.incrementAndGet();
+-      if (timelineServiceV2Enabled) {
+-        publishContainerStartFailedEventOnTimelineServiceV2(containerId,
+-            t.getMessage());
+-      }
+-      if (timelineServiceV1Enabled) {
+-        publishContainerStartFailedEvent(containerId, t.getMessage());
+-      }
+-    }
+-
+-    @Override
+-    public void onGetContainerStatusError(
+-        ContainerId containerId, Throwable t) {
+-      LOG.error("Failed to query the status of Container " + containerId);
+-    }
+-
+-    @Override
+-    public void onStopContainerError(ContainerId containerId, Throwable t) {
+-      LOG.error("Failed to stop Container " + containerId);
+-      containers.remove(containerId);
+-    }
+-
+-    @Deprecated
+-    @Override
+-    public void onIncreaseContainerResourceError(
+-        ContainerId containerId, Throwable t) {}
+-
+-    @Deprecated
+-    @Override
+-    public void onContainerResourceIncreased(
+-        ContainerId containerId, Resource resource) {}
+-
+-    @Override
+-    public void onUpdateContainerResourceError(
+-        ContainerId containerId, Throwable t) {
+-    }
+-
+-    @Override
+-    public void onContainerResourceUpdated(ContainerId containerId,
+-        Resource resource) {
+-    }
+-  }
+-
+-  /**
+-   * Thread to connect to the {@link ContainerManagementProtocol} and launch the container
+-   * that will execute the shell command.
+-   */
+-  private class LaunchContainerRunnable implements Runnable {
+-
+-    // Allocated container
+-    private Container container;
+-    private String shellId;
+-
+-    NMCallbackHandler containerListener;
+-
+-    /**
+-     * @param lcontainer Allocated container
+-     * @param containerListener Callback handler of the container
+-     */
+-    public LaunchContainerRunnable(Container lcontainer,
+-        NMCallbackHandler containerListener, String shellId) {
+-      this.container = lcontainer;
+-      this.containerListener = containerListener;
+-      this.shellId = shellId;
+-    }
+-
+-    @Override
+-    /**
+-     * Connects to CM, sets up container launch context 
+-     * for shell command and eventually dispatches the container 
+-     * start request to the CM. 
+-     */
+-    public void run() {
+-      LOG.info("Setting up container launch container for containerid="
+-          + container.getId() + " with shellid=" + shellId);
+-
+-      // Set the local resources
+-      Map<String, LocalResource> localResources = new HashMap<String, LocalResource>();
+-
+-      // The container for the eventual shell commands needs its own local
+-      // resources too.
+-      // In this scenario, if a shell script is specified, we need to have it
+-      // copied and made available to the container.
+-      if (!scriptPath.isEmpty()) {
+-        Path renamedScriptPath = null;
+-        if (Shell.WINDOWS) {
+-          renamedScriptPath = new Path(scriptPath + ".bat");
+-        } else {
+-          renamedScriptPath = new Path(scriptPath + ".sh");
+-        }
+-
+-        try {
+-          // rename the script file based on the underlying OS syntax.
+-          renameScriptFile(renamedScriptPath);
+-        } catch (Exception e) {
+-          LOG.error(
+-              "Not able to add suffix (.bat/.sh) to the shell script filename",
+-              e);
+-          // We know we cannot continue launching the container
+-          // so we should release it.
+-          numCompletedContainers.incrementAndGet();
+-          numFailedContainers.incrementAndGet();
+-          return;
+-        }
+-
+-        URL yarnUrl = null;
+-        try {
+-          yarnUrl = URL.fromURI(new URI(renamedScriptPath.toString()));
+-        } catch (URISyntaxException e) {
+-          LOG.error("Error when trying to use shell script path specified"
+-              + " in env, path=" + renamedScriptPath, e);
+-          // A failure scenario on bad input such as invalid shell script path
+-          // We know we cannot continue launching the container
+-          // so we should release it.
+-          // TODO
+-          numCompletedContainers.incrementAndGet();
+-          numFailedContainers.incrementAndGet();
+-          return;
+-        }
+-        LocalResource shellRsrc = LocalResource.newInstance(yarnUrl,
+-          LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
+-          shellScriptPathLen, shellScriptPathTimestamp);
+-        localResources.put(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH :
+-            EXEC_SHELL_STRING_PATH, shellRsrc);
+-        shellCommand = Shell.WINDOWS ? windows_command : linux_bash_command;
+-      }
+-
+-      // Set up localization for the container which runs the command
+-      if (localizableFiles.size() > 0) {
+-        FileSystem fs;
+-        try {
+-          fs = FileSystem.get(conf);
+-        } catch (IOException e) {
+-          numCompletedContainers.incrementAndGet();
+-          numFailedContainers.incrementAndGet();
+-          throw new UncheckedIOException("Cannot get FileSystem", e);
+-        }
+-
+-        localizableFiles.stream().forEach(fileName -> {
+-          try {
+-            String relativePath =
+-                getRelativePath(appName, appId.toString(), fileName);
+-            Path dst =
+-                new Path(homeDirectory, relativePath);
+-            FileStatus fileStatus = fs.getFileStatus(dst);
+-            LocalResource localRes = LocalResource.newInstance(
+-                URL.fromURI(dst.toUri()),
+-                LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
+-                fileStatus.getLen(), fileStatus.getModificationTime());
+-            LOG.info("Setting up file for localization: " + dst);
+-            localResources.put(fileName, localRes);
+-          } catch (IOException e) {
+-            numCompletedContainers.incrementAndGet();
+-            numFailedContainers.incrementAndGet();
+-            throw new UncheckedIOException(
+-                "Error during localization setup", e);
+-          }
+-        });
+-      }
+-
+-      // Set the necessary command to execute on the allocated container
+-      Vector<CharSequence> vargs = new Vector<CharSequence>(5);
+-
+-      // Set executable command
+-      vargs.add(shellCommand);
+-      // Set shell script path
+-      if (!scriptPath.isEmpty()) {
+-        vargs.add(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH
+-            : EXEC_SHELL_STRING_PATH);
+-      }
+-
+-      // Set args for the shell command if any
+-      vargs.add(shellArgs);
+-      // Add log redirect params
+-      vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout");
+-      vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr");
+-
+-      // Get final commmand
+-      StringBuilder command = new StringBuilder();
+-      for (CharSequence str : vargs) {
+-        command.append(str).append(" ");
+-      }
+-
+-      List<String> commands = new ArrayList<String>();
+-      commands.add(command.toString());
+-
+-      // Set up ContainerLaunchContext, setting local resource, environment,
+-      // command and token for constructor.
+-
+-      // Note for tokens: Set up tokens for the container too. Today, for normal
+-      // shell commands, the container in distribute-shell doesn't need any
+-      // tokens. We are populating them mainly for NodeManagers to be able to
+-      // download anyfiles in the distributed file-system. The tokens are
+-      // otherwise also useful in cases, for e.g., when one is running a
+-      // "hadoop dfs" command inside the distributed shell.
+-      Map<String, String> myShellEnv = new HashMap<String, String>(shellEnv);
+-      myShellEnv.put(YARN_SHELL_ID, shellId);
+-      ContainerRetryContext containerRetryContext =
+-          ContainerRetryContext.newInstance(
+-              containerRetryPolicy, containerRetryErrorCodes,
+-              containerMaxRetries, containrRetryInterval,
+-              containerFailuresValidityInterval);
+-      ContainerLaunchContext ctx = ContainerLaunchContext.newInstance(
+-        localResources, myShellEnv, commands, null, allTokens.duplicate(),
+-          null, containerRetryContext);
+-      containerListener.addContainer(container.getId(), container);
+-      nmClientAsync.startContainerAsync(container, ctx);
+-    }
+-  }
+-
+-  private void renameScriptFile(final Path renamedScriptPath)
+-      throws IOException, InterruptedException {
+-    appSubmitterUgi.doAs(new PrivilegedExceptionAction<Void>() {
+-      @Override
+-      public Void run() throws IOException {
+-        FileSystem fs = renamedScriptPath.getFileSystem(conf);
+-        fs.rename(new Path(scriptPath), renamedScriptPath);
+-        return null;
+-      }
+-    });
+-    LOG.info("User " + appSubmitterUgi.getUserName()
+-        + " added suffix(.sh/.bat) to script file as " + renamedScriptPath);
+-  }
+-
+-  /**
+-   * Setup the request that will be sent to the RM for the container ask.
+-   *
+-   * @return the setup ResourceRequest to be sent to RM
+-   */
+-  private ContainerRequest setupContainerAskForRM() {
+-    // setup requirements for hosts
+-    // using * as any host will do for the distributed shell app
+-    // set the priority for the request
+-    // TODO - what is the range for priority? how to decide?
+-    Priority pri = Priority.newInstance(requestPriority);
+-
+-    // Set up resource type requirements
+-    ContainerRequest request = new ContainerRequest(
+-        getTaskResourceCapability(),
+-        null, null, pri, 0, true, null,
+-        ExecutionTypeRequest.newInstance(containerType, enforceExecType),
+-        containerResourceProfile);
+-    LOG.info("Requested container ask: " + request.toString());
+-    return request;
+-  }
+-
+-  private SchedulingRequest setupSchedulingRequest(PlacementSpec spec) {
+-    long allocId = allocIdCounter.incrementAndGet();
+-    SchedulingRequest sReq = SchedulingRequest.newInstance(
+-        allocId, Priority.newInstance(requestPriority),
+-        ExecutionTypeRequest.newInstance(),
+-        Collections.singleton(spec.sourceTag),
+-        ResourceSizing.newInstance(
+-            getTaskResourceCapability()), null);
+-    sReq.setPlacementConstraint(spec.constraint);
+-    LOG.info("Scheduling Request made: " + sReq.toString());
+-    return sReq;
+-  }
+-
+-  private boolean fileExist(String filePath) {
+-    return new File(filePath).exists();
+-  }
+-
+-  private String readContent(String filePath) throws IOException {
+-    try (DataInputStream ds = new DataInputStream(
+-        new FileInputStream(filePath))) {
+-      return ds.readUTF();
+-    }
+-  }
+-
+-  private void publishContainerStartEvent(
+-      final TimelineClient timelineClient, final Container container,
+-      String domainId, UserGroupInformation ugi) {
+-    final TimelineEntity entity = new TimelineEntity();
+-    entity.setEntityId(container.getId().toString());
+-    entity.setEntityType(DSEntity.DS_CONTAINER.toString());
+-    entity.setDomainId(domainId);
+-    entity.addPrimaryFilter(USER_TIMELINE_FILTER_NAME, ugi.getShortUserName());
+-    entity.addPrimaryFilter(APPID_TIMELINE_FILTER_NAME, container.getId()
+-        .getApplicationAttemptId().getApplicationId().toString());
+-    TimelineEvent event = new TimelineEvent();
+-    event.setTimestamp(System.currentTimeMillis());
+-    event.setEventType(DSEvent.DS_CONTAINER_START.toString());
+-    event.addEventInfo("Node", container.getNodeId().toString());
+-    event.addEventInfo("Resources", container.getResource().toString());
+-    entity.addEvent(event);
+-
+-    try {
+-      processTimelineResponseErrors(
+-          putContainerEntity(timelineClient,
+-              container.getId().getApplicationAttemptId(),
+-              entity));
+-    } catch (YarnException | IOException | ClientHandlerException e) {
+-      LOG.error("Container start event could not be published for "
+-          + container.getId().toString(), e);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  void publishContainerEndEvent(
+-      final TimelineClient timelineClient, ContainerStatus container,
+-      String domainId, UserGroupInformation ugi) {
+-    final TimelineEntity entity = new TimelineEntity();
+-    entity.setEntityId(container.getContainerId().toString());
+-    entity.setEntityType(DSEntity.DS_CONTAINER.toString());
+-    entity.setDomainId(domainId);
+-    entity.addPrimaryFilter(USER_TIMELINE_FILTER_NAME, ugi.getShortUserName());
+-    entity.addPrimaryFilter(APPID_TIMELINE_FILTER_NAME,
+-        container.getContainerId().getApplicationAttemptId()
+-            .getApplicationId().toString());
+-    TimelineEvent event = new TimelineEvent();
+-    event.setTimestamp(System.currentTimeMillis());
+-    event.setEventType(DSEvent.DS_CONTAINER_END.toString());
+-    event.addEventInfo("State", container.getState().name());
+-    event.addEventInfo("Exit Status", container.getExitStatus());
+-    event.addEventInfo(DIAGNOSTICS, container.getDiagnostics());
+-    entity.addEvent(event);
+-    try {
+-      processTimelineResponseErrors(
+-          putContainerEntity(timelineClient,
+-              container.getContainerId().getApplicationAttemptId(),
+-              entity));
+-    } catch (YarnException | IOException | ClientHandlerException e) {
+-      LOG.error("Container end event could not be published for "
+-          + container.getContainerId().toString(), e);
+-    }
+-  }
+-
+-  private TimelinePutResponse putContainerEntity(
+-      TimelineClient timelineClient, ApplicationAttemptId currAttemptId,
+-      TimelineEntity entity)
+-      throws YarnException, IOException {
+-    if (TimelineUtils.timelineServiceV1_5Enabled(conf)) {
+-      TimelineEntityGroupId groupId = TimelineEntityGroupId.newInstance(
+-          currAttemptId.getApplicationId(),
+-          CONTAINER_ENTITY_GROUP_ID);
+-      return timelineClient.putEntities(currAttemptId, groupId, entity);
+-    } else {
+-      return timelineClient.putEntities(entity);
+-    }
+-  }
+-
+-  private void publishApplicationAttemptEvent(
+-      final TimelineClient timelineClient, String appAttemptId,
+-      DSEvent appEvent, String domainId, UserGroupInformation ugi) {
+-    final TimelineEntity entity = new TimelineEntity();
+-    entity.setEntityId(appAttemptId);
+-    entity.setEntityType(DSEntity.DS_APP_ATTEMPT.toString());
+-    entity.setDomainId(domainId);
+-    entity.addPrimaryFilter(USER_TIMELINE_FILTER_NAME, ugi.getShortUserName());
+-    TimelineEvent event = new TimelineEvent();
+-    event.setEventType(appEvent.toString());
+-    event.setTimestamp(System.currentTimeMillis());
+-    entity.addEvent(event);
+-    try {
+-      TimelinePutResponse response = timelineClient.putEntities(entity);
+-      processTimelineResponseErrors(response);
+-    } catch (YarnException | IOException | ClientHandlerException e) {
+-      LOG.error("App Attempt "
+-          + (appEvent.equals(DSEvent.DS_APP_ATTEMPT_START) ? "start" : "end")
+-          + " event could not be published for "
+-          + appAttemptID, e);
+-    }
+-  }
+-
+-  private TimelinePutResponse processTimelineResponseErrors(
+-      TimelinePutResponse response) {
+-    List<TimelinePutResponse.TimelinePutError> errors = response.getErrors();
+-    if (errors.size() == 0) {
+-      LOG.debug("Timeline entities are successfully put");
+-    } else {
+-      for (TimelinePutResponse.TimelinePutError error : errors) {
+-        LOG.error(
+-            "Error when publishing entity [" + error.getEntityType() + ","
+-                + error.getEntityId() + "], server side error code: "
+-                + error.getErrorCode());
+-      }
+-    }
+-    return response;
+-  }
+-
+-  RMCallbackHandler getRMCallbackHandler() {
+-    return new RMCallbackHandler();
+-  }
+-
+-  @VisibleForTesting
+-  void setAmRMClient(AMRMClientAsync client) {
+-    this.amRMClient = client;
+-  }
+-
+-  @VisibleForTesting
+-  int getNumCompletedContainers() {
+-    return numCompletedContainers.get();
+-  }
+-
+-  @VisibleForTesting
+-  boolean getDone() {
+-    return done;
+-  }
+-
+-  @VisibleForTesting
+-  Thread createLaunchContainerThread(Container allocatedContainer,
+-      String shellId) {
+-    LaunchContainerRunnable runnableLaunchContainer =
+-        new LaunchContainerRunnable(allocatedContainer, containerListener,
+-            shellId);
+-    return new Thread(runnableLaunchContainer);
+-  }
+-
+-  private void publishContainerStartEventOnTimelineServiceV2(
+-      Container container, long startTime) {
+-    final org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity
+-        entity =
+-            new org.apache.hadoop.yarn.api.records.timelineservice.
+-            TimelineEntity();
+-    entity.setId(container.getId().toString());
+-    entity.setType(DSEntity.DS_CONTAINER.toString());
+-    entity.setCreatedTime(startTime);
+-    entity.addInfo("user", appSubmitterUgi.getShortUserName());
+-
+-    org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent event =
+-        new org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent();
+-    event.setTimestamp(startTime);
+-    event.setId(DSEvent.DS_CONTAINER_START.toString());
+-    event.addInfo("Node", container.getNodeId().toString());
+-    event.addInfo("Resources", container.getResource().toString());
+-    entity.addEvent(event);
+-    entity.setIdPrefix(TimelineServiceHelper.invertLong(startTime));
+-
+-    try {
+-      appSubmitterUgi.doAs(new PrivilegedExceptionAction<Object>() {
+-        @Override
+-        public TimelinePutResponse run() throws Exception {
+-          timelineV2Client.putEntitiesAsync(entity);
+-          return null;
+-        }
+-      });
+-    } catch (Exception e) {
+-      LOG.error("Container start event could not be published for "
+-          + container.getId().toString(),
+-          e instanceof UndeclaredThrowableException ? e.getCause() : e);
+-    }
+-  }
+-
+-  private void publishContainerStartFailedEventOnTimelineServiceV2(
+-      final ContainerId containerId, String diagnostics) {
+-    final org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity
+-        entity = new org.apache.hadoop.yarn.api.records.timelineservice.
+-        TimelineEntity();
+-    entity.setId(containerId.toString());
+-    entity.setType(DSEntity.DS_CONTAINER.toString());
+-    entity.addInfo("user", appSubmitterUgi.getShortUserName());
+-    org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent event =
+-        new org.apache.hadoop.yarn.api.records.timelineservice
+-            .TimelineEvent();
+-    event.setTimestamp(System.currentTimeMillis());
+-    event.setId(DSEvent.DS_CONTAINER_END.toString());
+-    event.addInfo(DIAGNOSTICS, diagnostics);
+-    entity.addEvent(event);
+-    try {
+-      appSubmitterUgi.doAs((PrivilegedExceptionAction<Object>) () -> {
+-        timelineV2Client.putEntitiesAsync(entity);
+-        return null;
+-      });
+-    } catch (Exception e) {
+-      LOG.error("Container start failed event could not be published for {}",
+-          containerId,
+-          e instanceof UndeclaredThrowableException ? e.getCause() : e);
+-    }
+-  }
+-
+-  private void publishContainerStartFailedEvent(final ContainerId containerId,
+-      String diagnostics) {
+-    final TimelineEntity entityV1 = new TimelineEntity();
+-    entityV1.setEntityId(containerId.toString());
+-    entityV1.setEntityType(DSEntity.DS_CONTAINER.toString());
+-    entityV1.setDomainId(domainId);
+-    entityV1.addPrimaryFilter(USER_TIMELINE_FILTER_NAME, appSubmitterUgi
+-        .getShortUserName());
+-    entityV1.addPrimaryFilter(APPID_TIMELINE_FILTER_NAME,
+-        containerId.getApplicationAttemptId().getApplicationId().toString());
+-
+-    TimelineEvent eventV1 = new TimelineEvent();
+-    eventV1.setTimestamp(System.currentTimeMillis());
+-    eventV1.setEventType(DSEvent.DS_CONTAINER_END.toString());
+-    eventV1.addEventInfo(DIAGNOSTICS, diagnostics);
+-    entityV1.addEvent(eventV1);
+-    try {
+-      processTimelineResponseErrors(putContainerEntity(timelineClient,
+-          containerId.getApplicationAttemptId(), entityV1));
+-    } catch (YarnException | IOException | ClientHandlerException e) {
+-      LOG.error("Container end event could not be published for {}",
+-          containerId, e);
+-    }
+-  }
+-
+-  private void publishContainerEndEventOnTimelineServiceV2(
+-      final ContainerStatus container, long containerStartTime) {
+-    final org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity
+-        entity =
+-            new org.apache.hadoop.yarn.api.records.timelineservice.
+-            TimelineEntity();
+-    entity.setId(container.getContainerId().toString());
+-    entity.setType(DSEntity.DS_CONTAINER.toString());
+-    //entity.setDomainId(domainId);
+-    entity.addInfo("user", appSubmitterUgi.getShortUserName());
+-    org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent event =
+-        new  org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent();
+-    event.setTimestamp(System.currentTimeMillis());
+-    event.setId(DSEvent.DS_CONTAINER_END.toString());
+-    event.addInfo("State", container.getState().name());
+-    event.addInfo("Exit Status", container.getExitStatus());
+-    event.addInfo(DIAGNOSTICS, container.getDiagnostics());
+-    entity.addEvent(event);
+-    entity.setIdPrefix(TimelineServiceHelper.invertLong(containerStartTime));
+-
+-    try {
+-      appSubmitterUgi.doAs(new PrivilegedExceptionAction<Object>() {
+-        @Override
+-        public TimelinePutResponse run() throws Exception {
+-          timelineV2Client.putEntitiesAsync(entity);
+-          return null;
+-        }
+-      });
+-    } catch (Exception e) {
+-      LOG.error("Container end event could not be published for "
+-          + container.getContainerId().toString(),
+-          e instanceof UndeclaredThrowableException ? e.getCause() : e);
+-    }
+-  }
+-
+-  private void publishApplicationAttemptEventOnTimelineServiceV2(
+-      DSEvent appEvent) {
+-    final org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity
+-        entity =
+-            new org.apache.hadoop.yarn.api.records.timelineservice.
+-            TimelineEntity();
+-    entity.setId(appAttemptID.toString());
+-    entity.setType(DSEntity.DS_APP_ATTEMPT.toString());
+-    long ts = System.currentTimeMillis();
+-    if (appEvent == DSEvent.DS_APP_ATTEMPT_START) {
+-      entity.setCreatedTime(ts);
+-    }
+-    entity.addInfo("user", appSubmitterUgi.getShortUserName());
+-    org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent event =
+-        new org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent();
+-    event.setId(appEvent.toString());
+-    event.setTimestamp(ts);
+-    entity.addEvent(event);
+-    entity.setIdPrefix(
+-        TimelineServiceHelper.invertLong(appAttemptID.getAttemptId()));
+-
+-    try {
+-      appSubmitterUgi.doAs(new PrivilegedExceptionAction<Object>() {
+-        @Override
+-        public TimelinePutResponse run() throws Exception {
+-          timelineV2Client.putEntitiesAsync(entity);
+-          return null;
+-        }
+-      });
+-    } catch (Exception e) {
+-      LOG.error("App Attempt "
+-          + (appEvent.equals(DSEvent.DS_APP_ATTEMPT_START) ? "start" : "end")
+-          + " event could not be published for "
+-          + appAttemptID,
+-          e instanceof UndeclaredThrowableException ? e.getCause() : e);
+-    }
+-  }
+-
+-  private Resource getTaskResourceCapability()
+-      throws YarnRuntimeException {
+-    if (containerMemory < -1 || containerMemory == 0) {
+-      throw new YarnRuntimeException("Value of AM memory '" + containerMemory
+-          + "' has to be greater than 0");
+-    }
+-    if (containerVirtualCores < -1 || containerVirtualCores == 0) {
+-      throw new YarnRuntimeException(
+-          "Value of AM vcores '" + containerVirtualCores
+-              + "' has to be greater than 0");
+-    }
+-
+-    Resource resourceCapability =
+-        Resource.newInstance(containerMemory, containerVirtualCores);
+-    containerMemory =
+-        containerMemory == -1 ? DEFAULT_CONTAINER_MEMORY : containerMemory;
+-    containerVirtualCores = containerVirtualCores == -1 ?
+-        DEFAULT_CONTAINER_VCORES :
+-        containerVirtualCores;
+-    resourceCapability.setMemorySize(containerMemory);
+-    resourceCapability.setVirtualCores(containerVirtualCores);
+-    for (Map.Entry<String, Long> entry : containerResources.entrySet()) {
+-      resourceCapability.setResourceValue(entry.getKey(), entry.getValue());
+-    }
+-
+-    return resourceCapability;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
+deleted file mode 100644
+index 2987165486e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java
++++ /dev/null
+@@ -1,1429 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.UncheckedIOException;
+-import java.nio.ByteBuffer;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.Vector;
+-import java.util.Arrays;
+-import java.util.Base64;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.LogAggregationContext;
+-import org.apache.hadoop.yarn.api.records.NodeReport;
+-import org.apache.hadoop.yarn.api.records.NodeState;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.QueueACL;
+-import org.apache.hadoop.yarn.api.records.QueueInfo;
+-import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.api.records.ResourceRequest;
+-import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.client.api.TimelineClient;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.client.api.YarnClientApplication;
+-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ResourceNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.util.DockerClientConfigHandler;
+-import org.apache.hadoop.yarn.util.UnitsConversionUtil;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Client for Distributed Shell application submission to YARN.
+- * 
+- * <p> The distributed shell client allows an application master to be launched that in turn would run 
+- * the provided shell command on a set of containers. </p>
+- * 
+- * <p>This client is meant to act as an example on how to write yarn-based applications. </p>
+- *
+- * <p> To submit an application, a client first needs to connect to the <code>ResourceManager</code> 
+- * aka ApplicationsManager or ASM via the {@link ApplicationClientProtocol}. The {@link ApplicationClientProtocol} 
+- * provides a way for the client to get access to cluster information and to request for a
+- * new {@link ApplicationId}. <p>
+- * 
+- * <p> For the actual job submission, the client first has to create an {@link ApplicationSubmissionContext}. 
+- * The {@link ApplicationSubmissionContext} defines the application details such as {@link ApplicationId} 
+- * and application name, the priority assigned to the application and the queue
+- * to which this application needs to be assigned. In addition to this, the {@link ApplicationSubmissionContext}
+- * also defines the {@link ContainerLaunchContext} which describes the <code>Container</code> with which 
+- * the {@link ApplicationMaster} is launched. </p>
+- * 
+- * <p> The {@link ContainerLaunchContext} in this scenario defines the resources to be allocated for the 
+- * {@link ApplicationMaster}'s container, the local resources (jars, configuration files) to be made available 
+- * and the environment to be set for the {@link ApplicationMaster} and the commands to be executed to run the 
+- * {@link ApplicationMaster}. <p>
+- * 
+- * <p> Using the {@link ApplicationSubmissionContext}, the client submits the application to the 
+- * <code>ResourceManager</code> and then monitors the application by requesting the <code>ResourceManager</code> 
+- * for an {@link ApplicationReport} at regular time intervals. In case of the application taking too long, the client 
+- * kills the application by submitting a {@link KillApplicationRequest} to the <code>ResourceManager</code>. </p>
+- *
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class Client {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(Client.class);
+-
+-  private static final int DEFAULT_AM_MEMORY = 100;
+-  private static final int DEFAULT_AM_VCORES = 1;
+-  private static final int DEFAULT_CONTAINER_MEMORY = 10;
+-  private static final int DEFAULT_CONTAINER_VCORES = 1;
+-
+-  // check the application once per second.
+-  private static final int APP_MONITOR_INTERVAL = 1000;
+-  
+-  // Configuration
+-  private Configuration conf;
+-  private YarnClient yarnClient;
+-  // Application master specific info to register a new Application with RM/ASM
+-  private String appName = "";
+-  private ApplicationId applicationId;
+-  // App master priority
+-  private int amPriority = 0;
+-  // Queue for App master
+-  private String amQueue = "";
+-  // Amt. of memory resource to request for to run the App Master
+-  private long amMemory = DEFAULT_AM_MEMORY;
+-  // Amt. of virtual core resource to request for to run the App Master
+-  private int amVCores = DEFAULT_AM_VCORES;
+-  // Amount of resources to request to run the App Master
+-  private Map<String, Long> amResources = new HashMap<>();
+-  // AM resource profile
+-  private String amResourceProfile = "";
+-
+-  // Application master jar file
+-  private String appMasterJar = ""; 
+-  // Main class to invoke application master
+-  private final String appMasterMainClass;
+-
+-  // Shell command to be executed 
+-  private String shellCommand = ""; 
+-  // Location of shell script 
+-  private String shellScriptPath = ""; 
+-  // Args to be passed to the shell command
+-  private String[] shellArgs = new String[] {};
+-  // Env variables to be setup for the shell command 
+-  private Map<String, String> shellEnv = new HashMap<String, String>();
+-  // Shell Command Container priority 
+-  private int shellCmdPriority = 0;
+-
+-  // Amt of memory to request for container in which shell script will be executed
+-  private long containerMemory = DEFAULT_CONTAINER_MEMORY;
+-  // Amt. of virtual cores to request for container in which shell script will be executed
+-  private int containerVirtualCores = DEFAULT_CONTAINER_VCORES;
+-  // Amt. of resources to request for container
+-  // in which shell script will be executed
+-  private Map<String, Long> containerResources = new HashMap<>();
+-  // container resource profile
+-  private String containerResourceProfile = "";
+-  // No. of containers in which the shell script needs to be executed
+-  private int numContainers = 1;
+-  private String nodeLabelExpression = null;
+-  // Container type, default GUARANTEED.
+-  private ExecutionType containerType = ExecutionType.GUARANTEED;
+-  // Whether to auto promote opportunistic containers
+-  private boolean autoPromoteContainers = false;
+-  // Whether to enforce execution type of containers
+-  private boolean enforceExecType = false;
+-
+-  // Placement specification
+-  private String placementSpec = "";
+-  // Node Attribute specification
+-  private String nodeAttributeSpec = "";
+-  // log4j.properties file 
+-  // if available, add to local resources and set into classpath 
+-  private String log4jPropFile = "";
+-  // rolling
+-  private String rollingFilesPattern = "";
+-
+-  // Start time for client
+-  private long clientStartTime = System.currentTimeMillis();
+-  // Timeout threshold for client. Kill app after time interval expires.
+-  private long clientTimeout = 600000;
+-
+-  // flag to indicate whether to keep containers across application attempts.
+-  private boolean keepContainers = false;
+-
+-  private long attemptFailuresValidityInterval = -1;
+-
+-  private Vector<CharSequence> containerRetryOptions = new Vector<>(5);
+-
+-  // Debug flag
+-  boolean debugFlag = false;
+-
+-  // Timeline domain ID
+-  private String domainId = null;
+-
+-  // Flag to indicate whether to create the domain of the given ID
+-  private boolean toCreateDomain = false;
+-
+-  // Timeline domain reader access control
+-  private String viewACLs = null;
+-
+-  // Timeline domain writer access control
+-  private String modifyACLs = null;
+-
+-  private String flowName = null;
+-  private String flowVersion = null;
+-  private long flowRunId = 0L;
+-
+-  // Docker client configuration
+-  private String dockerClientConfig = null;
+-
+-  // Application tags
+-  private Set<String> applicationTags = new HashSet<>();
+-
+-  private List<String> filesToLocalize = new ArrayList<>();
+-
+-  // Command line options
+-  private Options opts;
+-
+-  private final AtomicBoolean stopSignalReceived;
+-  private final AtomicBoolean isRunning;
+-  private final Object objectLock = new Object();
+-
+-  private static final String shellCommandPath = "shellCommands";
+-  private static final String shellArgsPath = "shellArgs";
+-  private static final String appMasterJarPath = "AppMaster.jar";
+-  // Hardcoded path to custom log_properties
+-  private static final String log4jPath = "log4j.properties";
+-
+-  public static final String SCRIPT_PATH = "ExecScript";
+-
+-  /**
+-   * @param args Command line arguments 
+-   */
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    try {
+-      Client client = new Client();
+-      LOG.info("Initializing Client");
+-      try {
+-        boolean doRun = client.init(args);
+-        if (!doRun) {
+-          System.exit(0);
+-        }
+-      } catch (IllegalArgumentException e) {
+-        System.err.println(e.getLocalizedMessage());
+-        client.printUsage();
+-        System.exit(-1);
+-      }
+-      result = client.run();
+-    } catch (Throwable t) {
+-      LOG.error("Error running Client", t);
+-      System.exit(1);
+-    }
+-    if (result) {
+-      LOG.info("Application completed successfully");
+-      System.exit(0);
+-    } 
+-    LOG.error("Application failed to complete successfully");
+-    System.exit(2);
+-  }
+-
+-  /**
+-   */
+-  public Client(Configuration conf) throws Exception  {
+-    this(
+-      "org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster",
+-      conf);
+-  }
+-
+-  Client(String appMasterMainClass, Configuration conf) {
+-    this.conf = conf;
+-    this.conf.setBoolean(
+-        YarnConfiguration.YARN_CLIENT_LOAD_RESOURCETYPES_FROM_SERVER, true);
+-    this.appMasterMainClass = appMasterMainClass;
+-    yarnClient = YarnClient.createYarnClient();
+-    yarnClient.init(conf);
+-    opts = new Options();
+-    opts.addOption("appname", true, "Application Name. Default value - DistributedShell");
+-    opts.addOption("priority", true, "Application Priority. Default 0");
+-    opts.addOption("queue", true, "RM Queue in which this application is to be submitted");
+-    opts.addOption("timeout", true, "Application timeout in milliseconds");
+-    opts.addOption("master_memory", true, "Amount of memory in MB to be requested to run the application master");
+-    opts.addOption("master_vcores", true, "Amount of virtual cores " +
+-        "to be requested to run the application master");
+-    opts.addOption("master_resources", true, "Amount of resources " +
+-        "to be requested to run the application master. " +
+-        "Specified as resource type=value pairs separated by commas." +
+-        "E.g. -master_resources memory-mb=512,vcores=2");
+-    opts.addOption("jar", true, "Jar file containing the application master");
+-    opts.addOption("master_resource_profile", true, "Resource profile for the application master");
+-    opts.addOption("shell_command", true, "Shell command to be executed by " +
+-        "the Application Master. Can only specify either --shell_command " +
+-        "or --shell_script");
+-    opts.addOption("shell_script", true, "Location of the shell script to be " +
+-        "executed. Can only specify either --shell_command or --shell_script");
+-    opts.addOption("shell_args", true, "Command line args for the shell script." +
+-        "Multiple args can be separated by empty space.");
+-    opts.getOption("shell_args").setArgs(Option.UNLIMITED_VALUES);
+-    opts.addOption("shell_env", true,
+-        "Environment for shell script. Specified as env_key=env_val pairs");
+-    opts.addOption("shell_cmd_priority", true, "Priority for the shell command containers");
+-    opts.addOption("container_type", true,
+-        "Container execution type, GUARANTEED or OPPORTUNISTIC");
+-    opts.addOption("container_memory", true, "Amount of memory in MB " +
+-        "to be requested to run the shell command");
+-    opts.addOption("container_vcores", true, "Amount of virtual cores " +
+-        "to be requested to run the shell command");
+-    opts.addOption("container_resources", true, "Amount of resources " +
+-        "to be requested to run the shell command. " +
+-        "Specified as resource type=value pairs separated by commas. " +
+-        "E.g. -container_resources memory-mb=256,vcores=1");
+-    opts.addOption("container_resource_profile", true, "Resource profile for the shell command");
+-    opts.addOption("num_containers", true, "No. of containers on which the shell command needs to be executed");
+-    opts.addOption("promote_opportunistic_after_start", false,
+-        "Flag to indicate whether to automatically promote opportunistic"
+-            + " containers to guaranteed.");
+-    opts.addOption("enforce_execution_type", false,
+-        "Flag to indicate whether to enforce execution type of containers");
+-    opts.addOption("log_properties", true, "log4j.properties file");
+-    opts.addOption("rolling_log_pattern", true,
+-        "pattern for files that should be aggregated in a rolling fashion");
+-    opts.addOption("keep_containers_across_application_attempts", false,
+-        "Flag to indicate whether to keep containers across application "
+-            + "attempts."
+-            + " If the flag is true, running containers will not be killed when"
+-            + " application attempt fails and these containers will be "
+-            + "retrieved by"
+-            + " the new application attempt ");
+-    opts.addOption("attempt_failures_validity_interval", true,
+-      "when attempt_failures_validity_interval in milliseconds is set to > 0," +
+-      "the failure number will not take failures which happen out of " +
+-      "the validityInterval into failure count. " +
+-      "If failure count reaches to maxAppAttempts, " +
+-      "the application will be failed.");
+-    opts.addOption("debug", false, "Dump out debug information");
+-    opts.addOption("domain", true, "ID of the timeline domain where the "
+-        + "timeline entities will be put");
+-    opts.addOption("view_acls", true, "Users and groups that allowed to "
+-        + "view the timeline entities in the given domain");
+-    opts.addOption("modify_acls", true, "Users and groups that allowed to "
+-        + "modify the timeline entities in the given domain");
+-    opts.addOption("create", false, "Flag to indicate whether to create the "
+-        + "domain specified with -domain.");
+-    opts.addOption("flow_name", true, "Flow name which the distributed shell "
+-        + "app belongs to");
+-    opts.addOption("flow_version", true, "Flow version which the distributed "
+-        + "shell app belongs to");
+-    opts.addOption("flow_run_id", true, "Flow run ID which the distributed "
+-        + "shell app belongs to");
+-    opts.addOption("help", false, "Print usage");
+-    opts.addOption("node_label_expression", true,
+-        "Node label expression to determine the nodes"
+-            + " where all the containers of this application"
+-            + " will be allocated, \"\" means containers"
+-            + " can be allocated anywhere, if you don't specify the option,"
+-            + " default node_label_expression of queue will be used.");
+-    opts.addOption("container_retry_policy", true,
+-        "Retry policy when container fails to run, "
+-            + "0: NEVER_RETRY, 1: RETRY_ON_ALL_ERRORS, "
+-            + "2: RETRY_ON_SPECIFIC_ERROR_CODES");
+-    opts.addOption("container_retry_error_codes", true,
+-        "When retry policy is set to RETRY_ON_SPECIFIC_ERROR_CODES, error "
+-            + "codes is specified with this option, "
+-            + "e.g. --container_retry_error_codes 1,2,3");
+-    opts.addOption("container_max_retries", true,
+-        "If container could retry, it specifies max retires");
+-    opts.addOption("container_retry_interval", true,
+-        "Interval between each retry, unit is milliseconds");
+-    opts.addOption("container_failures_validity_interval", true,
+-        "Failures which are out of the time window will not be added to"
+-            + " the number of container retry attempts");
+-    opts.addOption("docker_client_config", true,
+-        "The docker client configuration path. The scheme should be supplied"
+-            + " (i.e. file:// or hdfs://)."
+-            + " Only used when the Docker runtime is enabled and requested.");
+-    opts.addOption("placement_spec", true,
+-        "Placement specification. Please note, if this option is specified,"
+-            + " The \"num_containers\" option will be ignored. All requested"
+-            + " containers will be of type GUARANTEED" );
+-    opts.addOption("application_tags", true, "Application tags.");
+-    opts.addOption("localize_files", true, "List of files, separated by comma"
+-        + " to be localized for the command");
+-    stopSignalReceived = new AtomicBoolean(false);
+-    isRunning = new AtomicBoolean(false);
+-  }
+-
+-  /**
+-   */
+-  public Client() throws Exception  {
+-    this(new YarnConfiguration());
+-  }
+-
+-  /**
+-   * Helper function to print out usage
+-   */
+-  private void printUsage() {
+-    new HelpFormatter().printHelp("Client", opts);
+-  }
+-
+-  /**
+-   * Parse command line options
+-   * @param args Parsed command line options 
+-   * @return Whether the init was successful to run the client
+-   * @throws ParseException
+-   */
+-  public boolean init(String[] args) throws ParseException {
+-
+-    CommandLine cliParser = new GnuParser().parse(opts, args);
+-
+-    if (args.length == 0) {
+-      throw new IllegalArgumentException("No args specified for client to initialize");
+-    }
+-
+-    if (cliParser.hasOption("log_properties")) {
+-      String log4jPath = cliParser.getOptionValue("log_properties");
+-      try {
+-        Log4jPropertyHelper.updateLog4jConfiguration(Client.class, log4jPath);
+-      } catch (Exception e) {
+-        LOG.warn("Can not set up custom log4j properties. " + e);
+-      }
+-    }
+-
+-    if (cliParser.hasOption("rolling_log_pattern")) {
+-      rollingFilesPattern = cliParser.getOptionValue("rolling_log_pattern");
+-    }
+-
+-    if (cliParser.hasOption("help")) {
+-      printUsage();
+-      return false;
+-    }
+-
+-    if (cliParser.hasOption("debug")) {
+-      debugFlag = true;
+-
+-    }
+-
+-    if (cliParser.hasOption("keep_containers_across_application_attempts")) {
+-      LOG.info("keep_containers_across_application_attempts");
+-      keepContainers = true;
+-    }
+-
+-    if (cliParser.hasOption("placement_spec")) {
+-      placementSpec = cliParser.getOptionValue("placement_spec");
+-      // Check if it is parsable
+-      PlacementSpec.parse(this.placementSpec);
+-    }
+-
+-    appName = cliParser.getOptionValue("appname", "DistributedShell");
+-    amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
+-    amQueue = cliParser.getOptionValue("queue", "default");
+-    amMemory =
+-        Integer.parseInt(cliParser.getOptionValue("master_memory", "-1"));
+-    amVCores =
+-        Integer.parseInt(cliParser.getOptionValue("master_vcores", "-1"));
+-    if (cliParser.hasOption("master_resources")) {
+-      Map<String, Long> masterResources =
+-          parseResourcesString(cliParser.getOptionValue("master_resources"));
+-      for (Map.Entry<String, Long> entry : masterResources.entrySet()) {
+-        if (entry.getKey().equals(ResourceInformation.MEMORY_URI)) {
+-          amMemory = entry.getValue();
+-        } else if (entry.getKey().equals(ResourceInformation.VCORES_URI)) {
+-          amVCores = entry.getValue().intValue();
+-        } else {
+-          amResources.put(entry.getKey(), entry.getValue());
+-        }
+-      }
+-    }
+-    amResourceProfile = cliParser.getOptionValue("master_resource_profile", "");
+-
+-    if (!cliParser.hasOption("jar")) {
+-      throw new IllegalArgumentException("No jar file specified for application master");
+-    }
+-
+-    appMasterJar = cliParser.getOptionValue("jar");
+-
+-    if (!cliParser.hasOption("shell_command") && !cliParser.hasOption("shell_script")) {
+-      throw new IllegalArgumentException(
+-          "No shell command or shell script specified to be executed by application master");
+-    } else if (cliParser.hasOption("shell_command") && cliParser.hasOption("shell_script")) {
+-      throw new IllegalArgumentException("Can not specify shell_command option " +
+-          "and shell_script option at the same time");
+-    } else if (cliParser.hasOption("shell_command")) {
+-      shellCommand = cliParser.getOptionValue("shell_command");
+-    } else {
+-      shellScriptPath = cliParser.getOptionValue("shell_script");
+-    }
+-    if (cliParser.hasOption("shell_args")) {
+-      shellArgs = cliParser.getOptionValues("shell_args");
+-    }
+-    if (cliParser.hasOption("shell_env")) { 
+-      String envs[] = cliParser.getOptionValues("shell_env");
+-      for (String env : envs) {
+-        env = env.trim();
+-        int index = env.indexOf('=');
+-        if (index == -1) {
+-          shellEnv.put(env, "");
+-          continue;
+-        }
+-        String key = env.substring(0, index);
+-        String val = "";
+-        if (index < (env.length()-1)) {
+-          val = env.substring(index+1);
+-        }
+-        shellEnv.put(key, val);
+-      }
+-    }
+-    shellCmdPriority = Integer.parseInt(cliParser.getOptionValue("shell_cmd_priority", "0"));
+-
+-    if (cliParser.hasOption("container_type")) {
+-      String containerTypeStr = cliParser.getOptionValue("container_type");
+-      if (Arrays.stream(ExecutionType.values()).noneMatch(
+-          executionType -> executionType.toString()
+-          .equals(containerTypeStr))) {
+-        throw new IllegalArgumentException("Invalid container_type: "
+-            + containerTypeStr);
+-      }
+-      containerType = ExecutionType.valueOf(containerTypeStr);
+-    }
+-    if (cliParser.hasOption("promote_opportunistic_after_start")) {
+-      autoPromoteContainers = true;
+-    }
+-    if (cliParser.hasOption("enforce_execution_type")) {
+-      enforceExecType = true;
+-    }
+-    containerMemory =
+-        Integer.parseInt(cliParser.getOptionValue("container_memory", "-1"));
+-    containerVirtualCores =
+-        Integer.parseInt(cliParser.getOptionValue("container_vcores", "-1"));
+-    if (cliParser.hasOption("container_resources")) {
+-      Map<String, Long> resources =
+-          parseResourcesString(cliParser.getOptionValue("container_resources"));
+-      for (Map.Entry<String, Long> entry : resources.entrySet()) {
+-        if (entry.getKey().equals(ResourceInformation.MEMORY_URI)) {
+-          containerMemory = entry.getValue();
+-        } else if (entry.getKey().equals(ResourceInformation.VCORES_URI)) {
+-          containerVirtualCores = entry.getValue().intValue();
+-        } else {
+-          containerResources.put(entry.getKey(), entry.getValue());
+-        }
+-      }
+-    }
+-    containerResourceProfile =
+-        cliParser.getOptionValue("container_resource_profile", "");
+-    numContainers =
+-        Integer.parseInt(cliParser.getOptionValue("num_containers", "1"));
+-
+-    if (numContainers < 1) {
+-      throw new IllegalArgumentException("Invalid no. of containers specified,"
+-          + " exiting. Specified numContainer=" + numContainers);
+-    }
+-    
+-    nodeLabelExpression = cliParser.getOptionValue("node_label_expression", null);
+-
+-    clientTimeout = Integer.parseInt(cliParser.getOptionValue("timeout", "600000"));
+-
+-    attemptFailuresValidityInterval =
+-        Long.parseLong(cliParser.getOptionValue(
+-          "attempt_failures_validity_interval", "-1"));
+-
+-    log4jPropFile = cliParser.getOptionValue("log_properties", "");
+-
+-    // Get timeline domain options
+-    if (cliParser.hasOption("domain")) {
+-      domainId = cliParser.getOptionValue("domain");
+-      toCreateDomain = cliParser.hasOption("create");
+-      if (cliParser.hasOption("view_acls")) {
+-        viewACLs = cliParser.getOptionValue("view_acls");
+-      }
+-      if (cliParser.hasOption("modify_acls")) {
+-        modifyACLs = cliParser.getOptionValue("modify_acls");
+-      }
+-    }
+-
+-    // Get container retry options
+-    if (cliParser.hasOption("container_retry_policy")) {
+-      containerRetryOptions.add("--container_retry_policy "
+-          + cliParser.getOptionValue("container_retry_policy"));
+-    }
+-    if (cliParser.hasOption("container_retry_error_codes")) {
+-      containerRetryOptions.add("--container_retry_error_codes "
+-          + cliParser.getOptionValue("container_retry_error_codes"));
+-    }
+-    if (cliParser.hasOption("container_max_retries")) {
+-      containerRetryOptions.add("--container_max_retries "
+-          + cliParser.getOptionValue("container_max_retries"));
+-    }
+-    if (cliParser.hasOption("container_retry_interval")) {
+-      containerRetryOptions.add("--container_retry_interval "
+-          + cliParser.getOptionValue("container_retry_interval"));
+-    }
+-    if (cliParser.hasOption("container_failures_validity_interval")) {
+-      containerRetryOptions.add("--container_failures_validity_interval "
+-          + cliParser.getOptionValue("container_failures_validity_interval"));
+-    }
+-
+-    if (cliParser.hasOption("flow_name")) {
+-      flowName = cliParser.getOptionValue("flow_name");
+-    }
+-    if (cliParser.hasOption("flow_version")) {
+-      flowVersion = cliParser.getOptionValue("flow_version");
+-    }
+-    if (cliParser.hasOption("flow_run_id")) {
+-      try {
+-        flowRunId = Long.parseLong(cliParser.getOptionValue("flow_run_id"));
+-      } catch (NumberFormatException e) {
+-        throw new IllegalArgumentException(
+-            "Flow run is not a valid long value", e);
+-      }
+-    }
+-    if (cliParser.hasOption("docker_client_config")) {
+-      dockerClientConfig = cliParser.getOptionValue("docker_client_config");
+-    }
+-
+-    if (cliParser.hasOption("application_tags")) {
+-      String applicationTagsStr = cliParser.getOptionValue("application_tags");
+-      String[] appTags = applicationTagsStr.split(",");
+-      for (String appTag : appTags) {
+-        this.applicationTags.add(appTag.trim());
+-      }
+-    }
+-
+-    if (cliParser.hasOption("localize_files")) {
+-      String filesStr = cliParser.getOptionValue("localize_files");
+-      if (filesStr.contains(",")) {
+-        String[] files = filesStr.split(",");
+-        filesToLocalize = Arrays.asList(files);
+-      } else {
+-        filesToLocalize.add(filesStr);
+-      }
+-    }
+-
+-    return true;
+-  }
+-
+-  /**
+-   * Main run function for the client
+-   * @return true if application completed successfully
+-   * @throws IOException
+-   * @throws YarnException
+-   */
+-  public boolean run() throws IOException, YarnException {
+-    LOG.info("Running Client");
+-    isRunning.set(true);
+-    yarnClient.start();
+-    // set the client start time.
+-    clientStartTime = System.currentTimeMillis();
+-
+-    YarnClusterMetrics clusterMetrics = yarnClient.getYarnClusterMetrics();
+-    LOG.info("Got Cluster metric info from ASM" 
+-        + ", numNodeManagers=" + clusterMetrics.getNumNodeManagers());
+-
+-    List<NodeReport> clusterNodeReports = yarnClient.getNodeReports(
+-        NodeState.RUNNING);
+-    LOG.info("Got Cluster node info from ASM");
+-    for (NodeReport node : clusterNodeReports) {
+-      LOG.info("Got node report from ASM for"
+-          + ", nodeId=" + node.getNodeId() 
+-          + ", nodeAddress=" + node.getHttpAddress()
+-          + ", nodeRackName=" + node.getRackName()
+-          + ", nodeNumContainers=" + node.getNumContainers());
+-    }
+-
+-    QueueInfo queueInfo = yarnClient.getQueueInfo(this.amQueue);
+-    if (queueInfo == null) {
+-      throw new IllegalArgumentException(String
+-          .format("Queue %s not present in scheduler configuration.",
+-              this.amQueue));
+-    }
+-
+-    LOG.info("Queue info"
+-        + ", queueName=" + queueInfo.getQueueName()
+-        + ", queueCurrentCapacity=" + queueInfo.getCurrentCapacity()
+-        + ", queueMaxCapacity=" + queueInfo.getMaximumCapacity()
+-        + ", queueApplicationCount=" + queueInfo.getApplications().size()
+-        + ", queueChildQueueCount=" + queueInfo.getChildQueues().size());
+-
+-    List<QueueUserACLInfo> listAclInfo = yarnClient.getQueueAclsInfo();
+-    for (QueueUserACLInfo aclInfo : listAclInfo) {
+-      for (QueueACL userAcl : aclInfo.getUserAcls()) {
+-        LOG.info("User ACL Info for Queue"
+-            + ", queueName=" + aclInfo.getQueueName()
+-            + ", userAcl=" + userAcl.name());
+-      }
+-    }
+-
+-    if (domainId != null && domainId.length() > 0 && toCreateDomain) {
+-      prepareTimelineDomain();
+-    }
+-
+-    Map<String, Resource> profiles;
+-    try {
+-      profiles = yarnClient.getResourceProfiles();
+-    } catch (YARNFeatureNotEnabledException re) {
+-      profiles = null;
+-    }
+-
+-    List<String> appProfiles = new ArrayList<>(2);
+-    appProfiles.add(amResourceProfile);
+-    appProfiles.add(containerResourceProfile);
+-    for (String appProfile : appProfiles) {
+-      if (appProfile != null && !appProfile.isEmpty()) {
+-        if (profiles == null) {
+-          String message = "Resource profiles is not enabled";
+-          LOG.error(message);
+-          throw new IOException(message);
+-        }
+-        if (!profiles.containsKey(appProfile)) {
+-          String message = "Unknown resource profile '" + appProfile
+-              + "'. Valid resource profiles are " + profiles.keySet();
+-          LOG.error(message);
+-          throw new IOException(message);
+-        }
+-      }
+-    }
+-
+-    // Get a new application id
+-    YarnClientApplication app = yarnClient.createApplication();
+-    GetNewApplicationResponse appResponse = app.getNewApplicationResponse();
+-    // TODO get min/max resource capabilities from RM and change memory ask if needed
+-    // If we do not have min/max, we may not be able to correctly request 
+-    // the required resources from the RM for the app master
+-    // Memory ask has to be a multiple of min and less than max. 
+-    // Dump out information about cluster capability as seen by the resource manager
+-    long maxMem = appResponse.getMaximumResourceCapability().getMemorySize();
+-    LOG.info("Max mem capability of resources in this cluster " + maxMem);
+-
+-    // A resource ask cannot exceed the max. 
+-    if (amMemory > maxMem) {
+-      LOG.info("AM memory specified above max threshold of cluster. Using max value."
+-          + ", specified=" + amMemory
+-          + ", max=" + maxMem);
+-      amMemory = maxMem;
+-    }
+-
+-    int maxVCores = appResponse.getMaximumResourceCapability().getVirtualCores();
+-    LOG.info("Max virtual cores capability of resources in this cluster " + maxVCores);
+-    
+-    if (amVCores > maxVCores) {
+-      LOG.info("AM virtual cores specified above max threshold of cluster. " 
+-          + "Using max value." + ", specified=" + amVCores 
+-          + ", max=" + maxVCores);
+-      amVCores = maxVCores;
+-    }
+-    
+-    // set the application name
+-    ApplicationSubmissionContext appContext = app.getApplicationSubmissionContext();
+-    applicationId = appContext.getApplicationId();
+-
+-    // Set up resource type requirements
+-    // For now, both memory and vcores are supported, so we set memory and
+-    // vcores requirements
+-    List<ResourceTypeInfo> resourceTypes = yarnClient.getResourceTypeInfo();
+-    setAMResourceCapability(appContext, profiles, resourceTypes);
+-    setContainerResources(profiles, resourceTypes);
+-
+-    appContext.setKeepContainersAcrossApplicationAttempts(keepContainers);
+-    appContext.setApplicationName(appName);
+-
+-    if (attemptFailuresValidityInterval >= 0) {
+-      appContext
+-        .setAttemptFailuresValidityInterval(attemptFailuresValidityInterval);
+-    }
+-
+-    Set<String> tags = new HashSet<String>();
+-    if (applicationTags != null) {
+-      tags.addAll(applicationTags);
+-    }
+-    if (flowName != null) {
+-      tags.add(TimelineUtils.generateFlowNameTag(flowName));
+-    }
+-    if (flowVersion != null) {
+-      tags.add(TimelineUtils.generateFlowVersionTag(flowVersion));
+-    }
+-    if (flowRunId != 0) {
+-      tags.add(TimelineUtils.generateFlowRunIdTag(flowRunId));
+-    }
+-    appContext.setApplicationTags(tags);
+-
+-    // set local resources for the application master
+-    // local files or archives as needed
+-    // In this scenario, the jar file for the application master is part of the local resources
+-    Map<String, LocalResource> localResources = new HashMap<String, LocalResource>();
+-
+-    LOG.info("Copy App Master jar from local filesystem and add to local environment");
+-    // Copy the application master jar to the filesystem 
+-    // Create a local resource to point to the destination jar path 
+-    FileSystem fs = FileSystem.get(conf);
+-    addToLocalResources(fs, appMasterJar, appMasterJarPath,
+-        applicationId.toString(), localResources, null);
+-
+-    // Set the log4j properties if needed 
+-    if (!log4jPropFile.isEmpty()) {
+-      addToLocalResources(fs, log4jPropFile, log4jPath,
+-          applicationId.toString(), localResources, null);
+-    }
+-
+-    // Process local files for localization
+-    // Here we just upload the files, the AM
+-    // will set up localization later.
+-    StringBuilder localizableFiles = new StringBuilder();
+-    filesToLocalize.stream().forEach(path -> {
+-      File f = new File(path);
+-
+-      if (!f.exists()) {
+-        throw new UncheckedIOException(
+-            new IOException(path + " does not exist"));
+-      }
+-
+-      if (!f.canRead()) {
+-        throw new UncheckedIOException(
+-            new IOException(path + " cannot be read"));
+-      }
+-
+-      if (f.isDirectory()) {
+-        throw new UncheckedIOException(
+-          new IOException(path + " is a directory"));
+-      }
+-
+-      try {
+-        String fileName = f.getName();
+-        uploadFile(fs, path, fileName, applicationId.toString());
+-        if (localizableFiles.length() == 0) {
+-          localizableFiles.append(fileName);
+-        } else {
+-          localizableFiles.append(",").append(fileName);
+-        }
+-      } catch (IOException e) {
+-        throw new UncheckedIOException("Cannot upload file: " + path, e);
+-      }
+-    });
+-
+-    // The shell script has to be made available on the final container(s)
+-    // where it will be executed. 
+-    // To do this, we need to first copy into the filesystem that is visible 
+-    // to the yarn framework. 
+-    // We do not need to set this as a local resource for the application 
+-    // master as the application master does not need it.
+-    String hdfsShellScriptLocation = ""; 
+-    long hdfsShellScriptLen = 0;
+-    long hdfsShellScriptTimestamp = 0;
+-    if (!shellScriptPath.isEmpty()) {
+-      Path shellSrc = new Path(shellScriptPath);
+-      String shellPathSuffix =
+-          ApplicationMaster.getRelativePath(appName,
+-              applicationId.toString(),
+-              SCRIPT_PATH);
+-      Path shellDst =
+-          new Path(fs.getHomeDirectory(), shellPathSuffix);
+-      fs.copyFromLocalFile(false, true, shellSrc, shellDst);
+-      hdfsShellScriptLocation = shellDst.toUri().toString(); 
+-      FileStatus shellFileStatus = fs.getFileStatus(shellDst);
+-      hdfsShellScriptLen = shellFileStatus.getLen();
+-      hdfsShellScriptTimestamp = shellFileStatus.getModificationTime();
+-    }
+-
+-    if (!shellCommand.isEmpty()) {
+-      addToLocalResources(fs, null, shellCommandPath, applicationId.toString(),
+-          localResources, shellCommand);
+-    }
+-
+-    if (shellArgs.length > 0) {
+-      addToLocalResources(fs, null, shellArgsPath, applicationId.toString(),
+-          localResources, StringUtils.join(shellArgs, " "));
+-    }
+-
+-    // Set the necessary security tokens as needed
+-    //amContainer.setContainerTokens(containerToken);
+-
+-    // Set the env variables to be setup in the env where the application master will be run
+-    LOG.info("Set the environment for the application master");
+-    Map<String, String> env = new HashMap<String, String>();
+-
+-    // put location of shell script into env
+-    // using the env info, the application master will create the correct local resource for the 
+-    // eventual containers that will be launched to execute the shell scripts
+-    env.put(DSConstants.DISTRIBUTEDSHELLSCRIPTLOCATION, hdfsShellScriptLocation);
+-    env.put(DSConstants.DISTRIBUTEDSHELLSCRIPTTIMESTAMP, Long.toString(hdfsShellScriptTimestamp));
+-    env.put(DSConstants.DISTRIBUTEDSHELLSCRIPTLEN, Long.toString(hdfsShellScriptLen));
+-    if (domainId != null && domainId.length() > 0) {
+-      env.put(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN, domainId);
+-    }
+-
+-    // Add AppMaster.jar location to classpath
+-    // At some point we should not be required to add 
+-    // the hadoop specific classpaths to the env. 
+-    // It should be provided out of the box. 
+-    // For now setting all required classpaths including
+-    // the classpath to "." for the application jar
+-    StringBuilder classPathEnv = new StringBuilder(Environment.CLASSPATH.$$())
+-      .append(ApplicationConstants.CLASS_PATH_SEPARATOR).append("./*");
+-    for (String c : conf.getStrings(
+-        YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-        YarnConfiguration.DEFAULT_YARN_CROSS_PLATFORM_APPLICATION_CLASSPATH)) {
+-      classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR)
+-          .append(c.trim());
+-    }
+-    classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR).append(
+-      "./log4j.properties");
+-
+-    // add the runtime classpath needed for tests to work
+-    if (conf.getBoolean(YarnConfiguration.IS_MINI_YARN_CLUSTER, false)) {
+-      classPathEnv.append(ApplicationConstants.CLASS_PATH_SEPARATOR)
+-          .append(System.getProperty("java.class.path"));
+-    }
+-
+-    env.put("CLASSPATH", classPathEnv.toString());
+-
+-    // Set the necessary command to execute the application master 
+-    Vector<CharSequence> vargs = new Vector<CharSequence>(30);
+-
+-    // Set java executable command 
+-    LOG.info("Setting up app master command");
+-    // Need extra quote here because JAVA_HOME might contain space on Windows,
+-    // e.g. C:/Program Files/Java...
+-    vargs.add("\"" + Environment.JAVA_HOME.$$() + "/bin/java\"");
+-    // Set Xmx based on am memory size
+-    vargs.add("-Xmx" + amMemory + "m");
+-    // JDK17 support
+-    vargs.add(ApplicationConstants.JVM_ADD_OPENS_VAR);
+-    // Set class name 
+-    vargs.add(appMasterMainClass);
+-    // Set params for Application Master
+-    if (containerType != null) {
+-      vargs.add("--container_type " + String.valueOf(containerType));
+-    }
+-    if (autoPromoteContainers) {
+-      vargs.add("--promote_opportunistic_after_start");
+-    }
+-    if (enforceExecType) {
+-      vargs.add("--enforce_execution_type");
+-    }
+-    if (containerMemory > 0) {
+-      vargs.add("--container_memory " + String.valueOf(containerMemory));
+-    }
+-    if (containerVirtualCores > 0) {
+-      vargs.add("--container_vcores " + String.valueOf(containerVirtualCores));
+-    }
+-    if (!containerResources.isEmpty()) {
+-      Joiner.MapJoiner joiner = Joiner.on(',').withKeyValueSeparator("=");
+-      vargs.add("--container_resources " + joiner.join(containerResources));
+-    }
+-    if (containerResourceProfile != null && !containerResourceProfile
+-        .isEmpty()) {
+-      vargs.add("--container_resource_profile " + containerResourceProfile);
+-    }
+-    vargs.add("--num_containers " + String.valueOf(numContainers));
+-    if (placementSpec != null && placementSpec.length() > 0) {
+-      // Encode the spec to avoid passing special chars via shell arguments.
+-      String encodedSpec = Base64.getEncoder()
+-          .encodeToString(placementSpec.getBytes(StandardCharsets.UTF_8));
+-      LOG.info("Encode placement spec: " + encodedSpec);
+-      vargs.add("--placement_spec " + encodedSpec);
+-    }
+-    if (null != nodeLabelExpression) {
+-      appContext.setNodeLabelExpression(nodeLabelExpression);
+-    }
+-    vargs.add("--priority " + String.valueOf(shellCmdPriority));
+-
+-    if (keepContainers) {
+-      vargs.add("--keep_containers_across_application_attempts");
+-    }
+-    for (Map.Entry<String, String> entry : shellEnv.entrySet()) {
+-      vargs.add("--shell_env " + entry.getKey() + "=" + entry.getValue());
+-    }
+-    if (debugFlag) {
+-      vargs.add("--debug");
+-    }
+-    if (localizableFiles.length() > 0) {
+-      vargs.add("--localized_files " + localizableFiles.toString());
+-    }
+-    vargs.add("--appname " + appName);
+-
+-    vargs.add("--homedir " + fs.getHomeDirectory());
+-
+-    vargs.addAll(containerRetryOptions);
+-
+-    vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stdout");
+-    vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stderr");
+-
+-    // Get final commmand
+-    StringBuilder command = new StringBuilder();
+-    for (CharSequence str : vargs) {
+-      command.append(str).append(" ");
+-    }
+-
+-    LOG.info("Completed setting up app master command " + command.toString());
+-    List<String> commands = new ArrayList<String>();
+-    commands.add(command.toString());
+-
+-    // Set up the container launch context for the application master
+-    ContainerLaunchContext amContainer = ContainerLaunchContext.newInstance(
+-      localResources, env, commands, null, null, null);
+-
+-    // Service data is a binary blob that can be passed to the application
+-    // Not needed in this scenario
+-    // amContainer.setServiceData(serviceData);
+-
+-    // Setup security tokens
+-    Credentials rmCredentials = null;
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      // Note: Credentials class is marked as LimitedPrivate for HDFS and MapReduce
+-      rmCredentials = new Credentials();
+-      String tokenRenewer = YarnClientUtils.getRmPrincipal(conf);
+-      if (tokenRenewer == null || tokenRenewer.length() == 0) {
+-        throw new IOException(
+-          "Can't get Master Kerberos principal for the RM to use as renewer");
+-      }
+-
+-      // For now, only getting tokens for the default file-system.
+-      final Token<?> tokens[] =
+-          fs.addDelegationTokens(tokenRenewer, rmCredentials);
+-      if (tokens != null) {
+-        for (Token<?> token : tokens) {
+-          LOG.info("Got dt for " + fs.getUri() + "; " + token);
+-        }
+-      }
+-    }
+-
+-    // Add the docker client config credentials if supplied.
+-    Credentials dockerCredentials = null;
+-    if (dockerClientConfig != null) {
+-      dockerCredentials =
+-          DockerClientConfigHandler.readCredentialsFromConfigFile(
+-              new Path(dockerClientConfig), conf, applicationId.toString());
+-    }
+-
+-    if (rmCredentials != null || dockerCredentials != null) {
+-      DataOutputBuffer dob = new DataOutputBuffer();
+-      if (rmCredentials != null) {
+-        rmCredentials.writeTokenStorageToStream(dob);
+-      }
+-      if (dockerCredentials != null) {
+-        dockerCredentials.writeTokenStorageToStream(dob);
+-      }
+-      ByteBuffer tokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-      amContainer.setTokens(tokens);
+-    }
+-
+-    appContext.setAMContainerSpec(amContainer);
+-
+-    // Set the priority for the application master
+-    // TODO - what is the range for priority? how to decide? 
+-    Priority pri = Priority.newInstance(amPriority);
+-    appContext.setPriority(pri);
+-
+-    // Set the queue to which this application is to be submitted in the RM
+-    appContext.setQueue(amQueue);
+-
+-    specifyLogAggregationContext(appContext);
+-
+-    // Submit the application to the applications manager
+-    // SubmitApplicationResponse submitResp = applicationsManager.submitApplication(appRequest);
+-    // Ignore the response as either a valid response object is returned on success 
+-    // or an exception thrown to denote some form of a failure
+-    LOG.info("Submitting application to ASM");
+-
+-    yarnClient.submitApplication(appContext);
+-
+-    // TODO
+-    // Try submitting the same request again
+-    // app submission failure?
+-
+-    // Monitor the application
+-    return monitorApplication(applicationId);
+-
+-  }
+-
+-  @VisibleForTesting
+-  void specifyLogAggregationContext(ApplicationSubmissionContext appContext) {
+-    if (!rollingFilesPattern.isEmpty()) {
+-      LogAggregationContext logAggregationContext = LogAggregationContext
+-          .newInstance(null, null, rollingFilesPattern, "");
+-      appContext.setLogAggregationContext(logAggregationContext);
+-    }
+-  }
+-
+-  /**
+-   * Monitor the submitted application for completion. 
+-   * Kill application if time expires. 
+-   * @param appId Application Id of application to be monitored
+-   * @return true if application completed successfully
+-   * @throws YarnException
+-   * @throws IOException
+-   */
+-  private boolean monitorApplication(ApplicationId appId)
+-      throws YarnException, IOException {
+-
+-    boolean res = false;
+-    boolean needForceKill = false;
+-    while (isRunning.get()) {
+-      // Check app status every 1 second.
+-      try {
+-        synchronized (objectLock) {
+-          objectLock.wait(APP_MONITOR_INTERVAL);
+-        }
+-        needForceKill = stopSignalReceived.get();
+-      } catch (InterruptedException e) {
+-        LOG.warn("Thread sleep in monitoring loop interrupted");
+-        // if the application is to be killed when client times out;
+-        // then set needForceKill to true
+-        break;
+-      } finally {
+-        if (needForceKill) {
+-          break;
+-        }
+-      }
+-
+-      // Get application report for the appId we are interested in 
+-      ApplicationReport report = yarnClient.getApplicationReport(appId);
+-
+-      LOG.info("Got application report from ASM for"
+-          + ", appId=" + appId.getId()
+-          + ", clientToAMToken=" + report.getClientToAMToken()
+-          + ", appDiagnostics=" + report.getDiagnostics()
+-          + ", appMasterHost=" + report.getHost()
+-          + ", appQueue=" + report.getQueue()
+-          + ", appMasterRpcPort=" + report.getRpcPort()
+-          + ", appStartTime=" + report.getStartTime()
+-          + ", yarnAppState=" + report.getYarnApplicationState().toString()
+-          + ", distributedFinalState=" + report.getFinalApplicationStatus().toString()
+-          + ", appTrackingUrl=" + report.getTrackingUrl()
+-          + ", appUser=" + report.getUser());
+-
+-      YarnApplicationState state = report.getYarnApplicationState();
+-      FinalApplicationStatus dsStatus = report.getFinalApplicationStatus();
+-      if (YarnApplicationState.FINISHED == state) {
+-        if (FinalApplicationStatus.SUCCEEDED == dsStatus) {
+-          LOG.info("Application has completed successfully. "
+-                  + "Breaking monitoring loop");
+-          res = true;
+-        } else {
+-          LOG.info("Application did finished unsuccessfully. "
+-                  + "YarnState={}, DSFinalStatus={}. Breaking monitoring loop",
+-              state, dsStatus);
+-        }
+-        break;
+-      } else if (YarnApplicationState.KILLED == state
+-          || YarnApplicationState.FAILED == state) {
+-        LOG.info("Application did not finish. YarnState={}, DSFinalStatus={}. "
+-                + "Breaking monitoring loop", state, dsStatus);
+-        break;
+-      }
+-
+-      // The value equal or less than 0 means no timeout
+-      if (clientTimeout > 0
+-          && System.currentTimeMillis() > (clientStartTime + clientTimeout)) {
+-        LOG.info("Reached client specified timeout for application. " +
+-            "Killing application");
+-        needForceKill = true;
+-        break;
+-      }
+-    }
+-
+-    if (needForceKill) {
+-      forceKillApplication(appId);
+-    }
+-
+-    isRunning.set(false);
+-
+-    return res;
+-  }
+-
+-  /**
+-   * Kill a submitted application by sending a call to the ASM
+-   * @param appId Application Id to be killed. 
+-   * @throws YarnException
+-   * @throws IOException
+-   */
+-  private void forceKillApplication(ApplicationId appId)
+-      throws YarnException, IOException {
+-    // TODO clarify whether multiple jobs with the same app id can be submitted and be running at 
+-    // the same time. 
+-    // If yes, can we kill a particular attempt only?
+-
+-    // Response can be ignored as it is non-null on success or 
+-    // throws an exception in case of failures
+-    yarnClient.killApplication(appId);
+-  }
+-
+-  private void addToLocalResources(FileSystem fs, String fileSrcPath,
+-      String fileDstPath, String appId, Map<String, LocalResource> localResources,
+-      String resources) throws IOException {
+-    String suffix =
+-        ApplicationMaster.getRelativePath(appName, appId, fileDstPath);
+-    Path dst =
+-        new Path(fs.getHomeDirectory(), suffix);
+-    if (fileSrcPath == null) {
+-      try (FSDataOutputStream ostream = FileSystem.create(fs, dst,
+-          new FsPermission((short) 0710))) {
+-        ostream.writeUTF(resources);
+-      }
+-    } else {
+-      fs.copyFromLocalFile(new Path(fileSrcPath), dst);
+-    }
+-    FileStatus scFileStatus = fs.getFileStatus(dst);
+-    LocalResource scRsrc =
+-        LocalResource.newInstance(
+-            URL.fromURI(dst.toUri()),
+-            LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
+-            scFileStatus.getLen(), scFileStatus.getModificationTime());
+-    localResources.put(fileDstPath, scRsrc);
+-  }
+-
+-  private void uploadFile(FileSystem fs, String fileSrcPath,
+-      String fileDstPath, String appId) throws IOException {
+-    String relativePath =
+-        ApplicationMaster.getRelativePath(appName, appId, fileDstPath);
+-    Path dst =
+-        new Path(fs.getHomeDirectory(), relativePath);
+-    LOG.info("Uploading file: " + fileSrcPath + " to " + dst);
+-    fs.copyFromLocalFile(new Path(fileSrcPath), dst);
+-  }
+-
+-  @VisibleForTesting
+-  ApplicationId getAppId() {
+-    return applicationId;
+-  }
+-
+-  private void prepareTimelineDomain() {
+-    TimelineClient timelineClient = null;
+-    if (conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED,
+-        YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ENABLED)) {
+-      timelineClient = TimelineClient.createTimelineClient();
+-      timelineClient.init(conf);
+-      timelineClient.start();
+-    } else {
+-      LOG.warn("Cannot put the domain " + domainId +
+-          " because the timeline service is not enabled");
+-      return;
+-    }
+-    try {
+-      //TODO: we need to check and combine the existing timeline domain ACLs,
+-      //but let's do it once we have client java library to query domains.
+-      TimelineDomain domain = new TimelineDomain();
+-      domain.setId(domainId);
+-      domain.setReaders(
+-          viewACLs != null && viewACLs.length() > 0 ? viewACLs : " ");
+-      domain.setWriters(
+-          modifyACLs != null && modifyACLs.length() > 0 ? modifyACLs : " ");
+-      timelineClient.putDomain(domain);
+-      LOG.info("Put the timeline domain: " +
+-          TimelineUtils.dumpTimelineRecordtoJSON(domain));
+-    } catch (Exception e) {
+-      LOG.error("Error when putting the timeline domain", e);
+-    } finally {
+-      timelineClient.stop();
+-    }
+-  }
+-
+-  private void setAMResourceCapability(ApplicationSubmissionContext appContext,
+-      Map<String, Resource> profiles, List<ResourceTypeInfo> resourceTypes)
+-      throws IllegalArgumentException, IOException, YarnException {
+-    if (amMemory < -1 || amMemory == 0) {
+-      throw new IllegalArgumentException("Invalid memory specified for"
+-          + " application master, exiting. Specified memory=" + amMemory);
+-    }
+-    if (amVCores < -1 || amVCores == 0) {
+-      throw new IllegalArgumentException("Invalid virtual cores specified for"
+-          + " application master, exiting. " +
+-          "Specified virtual cores=" + amVCores);
+-    }
+-    Resource capability = Resource.newInstance(0, 0);
+-
+-    if (!amResourceProfile.isEmpty()) {
+-      if (!profiles.containsKey(amResourceProfile)) {
+-        throw new IllegalArgumentException(
+-            "Failed to find specified resource profile for application master="
+-                + amResourceProfile);
+-      }
+-      capability = Resources.clone(profiles.get(amResourceProfile));
+-    }
+-
+-    if (appContext.getAMContainerResourceRequests() == null) {
+-      List<ResourceRequest> amResourceRequests = new ArrayList<ResourceRequest>();
+-      amResourceRequests
+-          .add(ResourceRequest.newInstance(Priority.newInstance(amPriority),
+-              "*", Resources.clone(Resources.none()), 1));
+-      appContext.setAMContainerResourceRequests(amResourceRequests);
+-    }
+-
+-    validateResourceTypes(amResources.keySet(), resourceTypes);
+-    for (Map.Entry<String, Long> entry : amResources.entrySet()) {
+-      capability.setResourceValue(entry.getKey(), entry.getValue());
+-    }
+-    // set amMemory because it's used to set Xmx param
+-    if (amMemory == -1) {
+-      amMemory = DEFAULT_AM_MEMORY;
+-      LOG.warn("AM Memory not specified, use " + DEFAULT_AM_MEMORY
+-          + " mb as AM memory");
+-    }
+-    if (amVCores == -1) {
+-      amVCores = DEFAULT_AM_VCORES;
+-      LOG.warn("AM vcore not specified, use " + DEFAULT_AM_VCORES
+-          + " mb as AM vcores");
+-    }
+-    capability.setMemorySize(amMemory);
+-    capability.setVirtualCores(amVCores);
+-    appContext.getAMContainerResourceRequests().get(0).setCapability(
+-        capability);
+-    LOG.warn("AM Resource capability=" + capability);
+-  }
+-
+-  private void setContainerResources(Map<String, Resource> profiles,
+-      List<ResourceTypeInfo> resourceTypes) throws IllegalArgumentException {
+-    if (containerMemory < -1 || containerMemory == 0) {
+-      throw new IllegalArgumentException("Container memory '" +
+-          containerMemory + "' has to be greated than 0");
+-    }
+-    if (containerVirtualCores < -1 || containerVirtualCores == 0) {
+-      throw new IllegalArgumentException("Container vcores '" +
+-          containerVirtualCores + "' has to be greated than 0");
+-    }
+-    validateResourceTypes(containerResources.keySet(), resourceTypes);
+-    if (profiles == null) {
+-      containerMemory = containerMemory == -1 ?
+-          DEFAULT_CONTAINER_MEMORY : containerMemory;
+-      containerVirtualCores = containerVirtualCores == -1 ?
+-          DEFAULT_CONTAINER_VCORES : containerVirtualCores;
+-    }
+-  }
+-
+-  private void validateResourceTypes(Iterable<String> resourceNames,
+-      List<ResourceTypeInfo> resourceTypes) {
+-    for (String resourceName : resourceNames) {
+-      if (!resourceTypes.stream().anyMatch(e ->
+-          e.getName().equals(resourceName))) {
+-        throw new ResourceNotFoundException("Unknown resource: " +
+-            resourceName);
+-      }
+-    }
+-  }
+-
+-  static Map<String, Long> parseResourcesString(String resourcesStr) {
+-    Map<String, Long> resources = new HashMap<>();
+-
+-    // Ignore the grouping "[]"
+-    if (resourcesStr.startsWith("[")) {
+-      resourcesStr = resourcesStr.substring(1);
+-    }
+-    if (resourcesStr.endsWith("]")) {
+-      resourcesStr = resourcesStr.substring(0, resourcesStr.length() - 1);
+-    }
+-
+-    for (String resource : resourcesStr.trim().split(",")) {
+-      resource = resource.trim();
+-      if (!resource.matches("^[^=]+=\\d+\\s?\\w*$")) {
+-        throw new IllegalArgumentException("\"" + resource + "\" is not a " +
+-            "valid resource type/amount pair. " +
+-            "Please provide key=amount pairs separated by commas.");
+-      }
+-      String[] splits = resource.split("=");
+-      String key = splits[0], value = splits[1];
+-      String units = ResourceUtils.getUnits(value);
+-      String valueWithoutUnit = value.substring(
+-          0, value.length() - units.length()).trim();
+-      Long resourceValue = Long.valueOf(valueWithoutUnit);
+-      if (!units.isEmpty()) {
+-        resourceValue = UnitsConversionUtil.convert(units, "Mi", resourceValue);
+-      }
+-      if (key.equals("memory")) {
+-        key = ResourceInformation.MEMORY_URI;
+-      }
+-      resources.put(key, resourceValue);
+-    }
+-    return resources;
+-  }
+-
+-  @VisibleForTesting
+-  protected void sendStopSignal() {
+-    LOG.info("Sending stop Signal to Client");
+-    stopSignalReceived.set(true);
+-    synchronized (objectLock) {
+-      objectLock.notifyAll();
+-    }
+-    int waitCount = 0;
+-    LOG.info("Waiting for Client to exit loop");
+-    while (isRunning.get()) {
+-      try {
+-        Thread.sleep(50);
+-      } catch (InterruptedException ie) {
+-        // do nothing
+-      } finally {
+-        if (++waitCount > 2000) {
+-          break;
+-        }
+-      }
+-    }
+-    LOG.info("Stopping yarnClient within the DS Client");
+-    yarnClient.stop();
+-    LOG.info("done stopping Client");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DSConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DSConstants.java
+deleted file mode 100644
+index fbaf2d47fa1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DSConstants.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Constants used in both Client and Application Master
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class DSConstants {
+-
+-  /**
+-   * Environment key name pointing to the shell script's location
+-   */
+-  public static final String DISTRIBUTEDSHELLSCRIPTLOCATION = "DISTRIBUTEDSHELLSCRIPTLOCATION";
+-
+-  /**
+-   * Environment key name denoting the file timestamp for the shell script. 
+-   * Used to validate the local resource. 
+-   */
+-  public static final String DISTRIBUTEDSHELLSCRIPTTIMESTAMP = "DISTRIBUTEDSHELLSCRIPTTIMESTAMP";
+-
+-  /**
+-   * Environment key name denoting the file content length for the shell script. 
+-   * Used to validate the local resource. 
+-   */
+-  public static final String DISTRIBUTEDSHELLSCRIPTLEN = "DISTRIBUTEDSHELLSCRIPTLEN";
+-
+-  /**
+-   * Environment key name denoting the timeline domain ID.
+-   */
+-  public static final String DISTRIBUTEDSHELLTIMELINEDOMAIN = "DISTRIBUTEDSHELLTIMELINEDOMAIN";
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
+deleted file mode 100644
+index 89eea4b67a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellTimelinePlugin.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-import org.apache.hadoop.yarn.server.timeline.NameValuePair;
+-import org.apache.hadoop.yarn.server.timeline.TimelineEntityGroupPlugin;
+-
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.Set;
+-import java.util.SortedSet;
+-
+-/**
+- * Timeline v1.5 reader plugin for YARN distributed shell. It tranlsates an
+- * incoming getEntity request to a set of related timeline entity groups, via
+- * the information provided in the primary filter or entity id field.
+- */
+-public class DistributedShellTimelinePlugin extends TimelineEntityGroupPlugin {
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityType,
+-      NameValuePair primaryFilter, Collection<NameValuePair> secondaryFilters) {
+-    if (ApplicationMaster.DSEntity.DS_CONTAINER.toString().equals(entityType)) {
+-      if (primaryFilter == null) {
+-        return null;
+-      }
+-      return toEntityGroupId(primaryFilter.getValue().toString());
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityId,
+-      String entityType) {
+-    if (ApplicationMaster.DSEntity.DS_CONTAINER.toString().equals(entityType)) {
+-      ContainerId containerId = ContainerId.fromString(entityId);
+-      ApplicationId appId = containerId.getApplicationAttemptId()
+-          .getApplicationId();
+-      return toEntityGroupId(appId.toString());
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityType,
+-      SortedSet<String> entityIds, Set<String> eventTypes) {
+-    // Right now this method is not used by TimelineEntityGroupPlugin
+-    return null;
+-  }
+-
+-  private Set<TimelineEntityGroupId> toEntityGroupId(String strAppId) {
+-    ApplicationId appId = ApplicationId.fromString(strAppId);
+-    TimelineEntityGroupId groupId = TimelineEntityGroupId.newInstance(
+-        appId, ApplicationMaster.CONTAINER_ENTITY_GROUP_ID);
+-    Set<TimelineEntityGroupId> result = new HashSet<>();
+-    result.add(groupId);
+-    return result;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Log4jPropertyHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Log4jPropertyHelper.java
+deleted file mode 100644
+index 0301a6880f8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Log4jPropertyHelper.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.FileInputStream;
+-import java.io.InputStream;
+-import java.util.Map.Entry;
+-import java.util.Properties;
+-
+-import org.apache.log4j.LogManager;
+-import org.apache.log4j.PropertyConfigurator;
+-
+-public class Log4jPropertyHelper {
+-
+-  public static void updateLog4jConfiguration(Class<?> targetClass,
+-      String log4jPath) throws Exception {
+-    Properties customProperties = new Properties();
+-    try (
+-        FileInputStream fs = new FileInputStream(log4jPath);
+-        InputStream is = targetClass.getResourceAsStream("/log4j.properties")) {
+-      customProperties.load(fs);
+-      Properties originalProperties = new Properties();
+-      originalProperties.load(is);
+-      for (Entry<Object, Object> entry : customProperties.entrySet()) {
+-        originalProperties.setProperty(entry.getKey().toString(), entry
+-            .getValue().toString());
+-      }
+-      LogManager.resetConfiguration();
+-      PropertyConfigurator.configure(originalProperties);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/PlacementSpec.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/PlacementSpec.java
+deleted file mode 100644
+index 7c6daf6d21b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/PlacementSpec.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraint;
+-import org.apache.hadoop.yarn.util.constraint.PlacementConstraintParseException;
+-import org.apache.hadoop.yarn.util.constraint.PlacementConstraintParser;
+-import org.apache.hadoop.yarn.util.constraint.PlacementConstraintParser.SourceTags;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-/**
+- * Class encapsulating a SourceTag, number of container and a Placement
+- * Constraint.
+- */
+-public class PlacementSpec {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(PlacementSpec.class);
+-
+-  public final String sourceTag;
+-  public final PlacementConstraint constraint;
+-  private int numContainers;
+-
+-  public PlacementSpec(String sourceTag, int numContainers,
+-      PlacementConstraint constraint) {
+-    this.sourceTag = sourceTag;
+-    this.numContainers = numContainers;
+-    this.constraint = constraint;
+-  }
+-
+-  /**
+-   * Get the number of container for this spec.
+-   * @return container count
+-   */
+-  public int getNumContainers() {
+-    return numContainers;
+-  }
+-
+-  /**
+-   * Set number of containers for this spec.
+-   * @param numContainers number of containers.
+-   */
+-  public void setNumContainers(int numContainers) {
+-    this.numContainers = numContainers;
+-  }
+-
+-  // Placement specification should be of the form:
+-  // PlacementSpec => ""|KeyVal;PlacementSpec
+-  // KeyVal => SourceTag=Constraint
+-  // SourceTag => String
+-  // Constraint => NumContainers|
+-  //               NumContainers,"in",Scope,TargetTag|
+-  //               NumContainers,"notin",Scope,TargetTag|
+-  //               NumContainers,"cardinality",Scope,TargetTag,MinCard,MaxCard
+-  // NumContainers => int (number of containers)
+-  // Scope => "NODE"|"RACK"
+-  // TargetTag => String (Target Tag)
+-  // MinCard => int (min cardinality - needed if ConstraintType == cardinality)
+-  // MaxCard => int (max cardinality - needed if ConstraintType == cardinality)
+-
+-  /**
+-   * Parser to convert a string representation of a placement spec to mapping
+-   * from source tag to Placement Constraint.
+-   *
+-   * @param specs Placement spec.
+-   * @return Mapping from source tag to placement constraint.
+-   */
+-  public static Map<String, PlacementSpec> parse(String specs)
+-      throws IllegalArgumentException {
+-    LOG.info("Parsing Placement Specs: [{}]", specs);
+-
+-    Map<String, PlacementSpec> pSpecs = new HashMap<>();
+-    Map<SourceTags, PlacementConstraint> parsed;
+-    try {
+-      parsed = PlacementConstraintParser.parsePlacementSpec(specs);
+-      for (Map.Entry<SourceTags, PlacementConstraint> entry :
+-          parsed.entrySet()) {
+-        LOG.info("Parsed source tag: {}, number of allocations: {}",
+-            entry.getKey().getTag(), entry.getKey().getNumOfAllocations());
+-        if (entry.getValue() != null) {
+-          LOG.info("Parsed constraint: {}", entry.getValue()
+-              .getConstraintExpr().getClass().getSimpleName());
+-        } else {
+-          LOG.info("Parsed constraint Empty");
+-        }
+-        pSpecs.put(entry.getKey().getTag(), new PlacementSpec(
+-            entry.getKey().getTag(),
+-            entry.getKey().getNumOfAllocations(),
+-            entry.getValue()));
+-      }
+-      return pSpecs;
+-    } catch (PlacementConstraintParseException e) {
+-      throw new IllegalArgumentException(
+-          "Invalid placement spec: " + specs, e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/package-info.java
+deleted file mode 100644
+index 299a2867486..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/ContainerLaunchFailAppMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/ContainerLaunchFailAppMaster.java
+deleted file mode 100644
+index 1d41c0d4e56..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/ContainerLaunchFailAppMaster.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.nio.ByteBuffer;
+-import java.util.Map;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class ContainerLaunchFailAppMaster extends ApplicationMaster {
+-
+-  private static final Logger LOG =
+-    LoggerFactory.getLogger(ContainerLaunchFailAppMaster.class);
+-
+-  public ContainerLaunchFailAppMaster() {
+-    super();
+-  }
+-
+-  @Override
+-  NMCallbackHandler createNMCallbackHandler() {
+-    return new FailContainerLaunchNMCallbackHandler(this);
+-  }
+-
+-  class FailContainerLaunchNMCallbackHandler
+-    extends ApplicationMaster.NMCallbackHandler {
+-
+-    public FailContainerLaunchNMCallbackHandler(
+-      ApplicationMaster applicationMaster) {
+-      super(applicationMaster);
+-    }
+-
+-    @Override
+-    public void onContainerStarted(ContainerId containerId,
+-                                   Map<String, ByteBuffer> allServiceResponse) {
+-      super.onStartContainerError(containerId,
+-        new RuntimeException("Inject Container Launch failure"));
+-    }
+-
+-  }
+-
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    try {
+-      ContainerLaunchFailAppMaster appMaster =
+-        new ContainerLaunchFailAppMaster();
+-      LOG.info("Initializing ApplicationMaster");
+-      boolean doRun = appMaster.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      appMaster.run();
+-      result = appMaster.finish();
+-    } catch (Throwable t) {
+-      LOG.error("Error running ApplicationMaster", t);
+-      System.exit(1);
+-    }
+-    if (result) {
+-      LOG.info("Application Master completed successfully. exiting");
+-      System.exit(0);
+-    } else {
+-      LOG.info("Application Master failed. exiting");
+-      System.exit(2);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java
+deleted file mode 100644
+index 28cdf8f8223..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java
++++ /dev/null
+@@ -1,607 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.net.URL;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.nio.file.StandardCopyOption;
+-import java.util.List;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.concurrent.atomic.AtomicReference;
+-import java.util.function.Supplier;
+-
+-import org.junit.After;
+-import org.junit.AfterClass;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.BeforeClass;
+-import org.junit.Rule;
+-import org.junit.rules.TemporaryFolder;
+-import org.junit.rules.TestName;
+-import org.junit.rules.Timeout;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileContext;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.net.ServerSocketUtil;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.JarFinder;
+-import org.apache.hadoop.util.Shell;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ContainerReport;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.timeline.NameValuePair;
+-import org.apache.hadoop.yarn.util.LinuxResourceCalculatorPlugin;
+-import org.apache.hadoop.yarn.util.ProcfsBasedProcessTree;
+-
+-/**
+- * Base class for testing DistributedShell features.
+- */
+-public abstract class DistributedShellBaseTest {
+-  protected static final int MIN_ALLOCATION_MB = 128;
+-  protected static final int NUM_DATA_NODES = 1;
+-  protected static final int TEST_TIME_OUT = 160000;
+-  // set the timeout of the yarnClient to be 95% of the globalTimeout.
+-  protected static final int TEST_TIME_WINDOW_EXPIRE =
+-      (TEST_TIME_OUT * 90) / 100;
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DistributedShellBaseTest.class);
+-  private static final String APP_MASTER_JAR =
+-      JarFinder.getJar(ApplicationMaster.class);
+-  private static final int NUM_NMS = 1;
+-  // set the timeout of the yarnClient to be 95% of the globalTimeout.
+-  private static final String YARN_CLIENT_TIMEOUT =
+-      String.valueOf(TEST_TIME_WINDOW_EXPIRE);
+-  private static final String[] COMMON_ARGS = {
+-      "--jar",
+-      APP_MASTER_JAR,
+-      "--timeout",
+-      YARN_CLIENT_TIMEOUT,
+-      "--appname",
+-      ""
+-  };
+-  private static MiniDFSCluster hdfsCluster = null;
+-  private static MiniYARNCluster yarnCluster = null;
+-  private static String yarnSiteBackupPath = null;
+-  private static String yarnSitePath = null;
+-  @Rule
+-  public Timeout globalTimeout = new Timeout(TEST_TIME_OUT,
+-      TimeUnit.MILLISECONDS);
+-  @Rule
+-  public TemporaryFolder tmpFolder = new TemporaryFolder();
+-  @Rule
+-  public TestName name = new TestName();
+-  private Client dsClient;
+-  private YarnConfiguration conf = null;
+-  // location of the filesystem timeline writer for timeline service v.2
+-  private String timelineV2StorageDir = null;
+-
+-  @BeforeClass
+-  public static void setupUnitTests() throws Exception {
+-    URL url = Thread.currentThread().getContextClassLoader().getResource(
+-        "yarn-site.xml");
+-    if (url == null) {
+-      throw new RuntimeException(
+-          "Could not find 'yarn-site.xml' dummy file in classpath");
+-    }
+-    // backup the original yarn-site file.
+-    yarnSitePath = url.getPath();
+-    yarnSiteBackupPath = url.getPath() + "-backup";
+-    Files.copy(Paths.get(yarnSitePath),
+-        Paths.get(yarnSiteBackupPath),
+-        StandardCopyOption.COPY_ATTRIBUTES,
+-        StandardCopyOption.REPLACE_EXISTING);
+-  }
+-
+-  @AfterClass
+-  public static void tearDownUnitTests() throws Exception {
+-    // shutdown the clusters.
+-    shutdownYarnCluster();
+-    shutdownHdfsCluster();
+-    if (yarnSitePath == null || yarnSiteBackupPath == null) {
+-      return;
+-    }
+-    // restore the original yarn-site file.
+-    if (Files.exists(Paths.get(yarnSiteBackupPath))) {
+-      Files.move(Paths.get(yarnSiteBackupPath), Paths.get(yarnSitePath),
+-          StandardCopyOption.REPLACE_EXISTING);
+-    }
+-  }
+-
+-  /**
+-   * Utility function to merge two String arrays to form a new String array for
+-   * our arguments.
+-   *
+-   * @param args the first set of the arguments.
+-   * @param newArgs the second set of the arguments.
+-   * @return a String array consists of {args, newArgs}
+-   */
+-  protected static String[] mergeArgs(String[] args, String[] newArgs) {
+-    int length = args.length + newArgs.length;
+-    String[] result = new String[length];
+-    System.arraycopy(args, 0, result, 0, args.length);
+-    System.arraycopy(newArgs, 0, result, args.length, newArgs.length);
+-    return result;
+-  }
+-
+-  protected static String[] createArguments(Supplier<String> testNameProvider,
+-      String... args) {
+-    String[] res = mergeArgs(COMMON_ARGS, args);
+-    // set the application name so we can track down which command is running.
+-    res[COMMON_ARGS.length - 1] = testNameProvider.get();
+-    return res;
+-  }
+-
+-  protected static String getSleepCommand(int sec) {
+-    // Windows doesn't have a sleep command, ping -n does the trick
+-    return Shell.WINDOWS ? "ping -n " + (sec + 1) + " 127.0.0.1 >nul"
+-        : "sleep " + sec;
+-  }
+-
+-  protected static String getListCommand() {
+-    return Shell.WINDOWS ? "dir" : "ls";
+-  }
+-
+-  protected static String getCatCommand() {
+-    return Shell.WINDOWS ? "type" : "cat";
+-  }
+-
+-  protected static void shutdownYarnCluster() {
+-    if (yarnCluster != null) {
+-      try {
+-        yarnCluster.stop();
+-      } finally {
+-        yarnCluster = null;
+-      }
+-    }
+-  }
+-
+-  protected static void shutdownHdfsCluster() {
+-    if (hdfsCluster != null) {
+-      try {
+-        hdfsCluster.shutdown();
+-      } finally {
+-        hdfsCluster = null;
+-      }
+-    }
+-  }
+-
+-  public String getTimelineV2StorageDir() {
+-    return timelineV2StorageDir;
+-  }
+-
+-  public void setTimelineV2StorageDir() throws Exception {
+-    timelineV2StorageDir = tmpFolder.newFolder().getAbsolutePath();
+-  }
+-
+-  @Before
+-  public void setup() throws Exception {
+-    setupInternal(NUM_NMS, new YarnConfiguration());
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    cleanUpDFSClient();
+-    FileContext fsContext = FileContext.getLocalFSFileContext();
+-    fsContext
+-        .delete(
+-            new Path(conf.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_PATH)),
+-            true);
+-    shutdownYarnCluster();
+-    shutdownHdfsCluster();
+-  }
+-
+-  protected String[] createArgumentsWithAppName(String... args) {
+-    return createArguments(() -> generateAppName(), args);
+-  }
+-
+-  protected void waitForContainersLaunch(YarnClient client, int nContainers,
+-      AtomicReference<ApplicationAttemptReport> appAttemptReportRef,
+-      AtomicReference<List<ContainerReport>> containersListRef,
+-      AtomicReference<ApplicationAttemptId> appAttemptIdRef,
+-      AtomicReference<Throwable> thrownErrorRef) throws Exception {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        List<ApplicationReport> apps = client.getApplications();
+-        if (apps == null || apps.isEmpty()) {
+-          return false;
+-        }
+-        ApplicationId appId = apps.get(0).getApplicationId();
+-        List<ApplicationAttemptReport> appAttempts =
+-            client.getApplicationAttempts(appId);
+-        if (appAttempts == null || appAttempts.isEmpty()) {
+-          return false;
+-        }
+-        ApplicationAttemptId attemptId =
+-            appAttempts.get(0).getApplicationAttemptId();
+-        List<ContainerReport> containers = client.getContainers(attemptId);
+-        if (containers == null || containers.size() < nContainers) {
+-          return false;
+-        }
+-        containersListRef.set(containers);
+-        appAttemptIdRef.set(attemptId);
+-        appAttemptReportRef.set(appAttempts.get(0));
+-      } catch (Exception e) {
+-        LOG.error("Exception waiting for Containers Launch", e);
+-        thrownErrorRef.set(e);
+-      }
+-      return true;
+-    }, 10, TEST_TIME_WINDOW_EXPIRE);
+-  }
+-
+-  protected abstract void customizeConfiguration(YarnConfiguration config)
+-      throws Exception;
+-
+-  protected String[] appendFlowArgsForTestDSShell(String[] args,
+-      boolean defaultFlow) {
+-    return args;
+-  }
+-
+-  protected String[] appendDomainArgsForTestDSShell(String[] args,
+-      boolean haveDomain) {
+-    String[] result = args;
+-    if (haveDomain) {
+-      String[] domainArgs = {
+-          "--domain",
+-          "TEST_DOMAIN",
+-          "--view_acls",
+-          "reader_user reader_group",
+-          "--modify_acls",
+-          "writer_user writer_group",
+-          "--create"
+-      };
+-      result = mergeArgs(args, domainArgs);
+-    }
+-    return result;
+-  }
+-
+-  protected Client setAndGetDSClient(Configuration config) throws Exception {
+-    dsClient = new Client(config);
+-    return dsClient;
+-  }
+-
+-  protected Client setAndGetDSClient(String appMasterMainClass,
+-      Configuration config) throws Exception {
+-    dsClient = new Client(appMasterMainClass, config);
+-    return dsClient;
+-  }
+-
+-  protected void baseTestDSShell(boolean haveDomain, boolean defaultFlow)
+-      throws Exception {
+-    String[] baseArgs = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1");
+-    String[] domainArgs = appendDomainArgsForTestDSShell(baseArgs, haveDomain);
+-    String[] args = appendFlowArgsForTestDSShell(domainArgs, defaultFlow);
+-
+-    LOG.info("Initializing DS Client");
+-    YarnClient yarnClient;
+-    dsClient = setAndGetDSClient(new Configuration(yarnCluster.getConfig()));
+-    boolean initSuccess = dsClient.init(args);
+-    Assert.assertTrue(initSuccess);
+-    LOG.info("Running DS Client");
+-    final AtomicBoolean result = new AtomicBoolean(false);
+-    Thread t = new Thread(() -> {
+-      try {
+-        result.set(dsClient.run());
+-      } catch (Exception e) {
+-        throw new RuntimeException(e);
+-      }
+-    });
+-    t.start();
+-
+-    yarnClient = YarnClient.createYarnClient();
+-    yarnClient.init(new Configuration(yarnCluster.getConfig()));
+-    yarnClient.start();
+-
+-    AtomicInteger waitResult = new AtomicInteger(0);
+-    AtomicReference<ApplicationId> appIdRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<ApplicationReport> appReportRef =
+-        new AtomicReference<>(null);
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        List<ApplicationReport> apps = yarnClient.getApplications();
+-        if (apps.size() == 0) {
+-          return false;
+-        }
+-        ApplicationReport appReport = apps.get(0);
+-        appReportRef.set(appReport);
+-        appIdRef.set(appReport.getApplicationId());
+-        if (appReport.getHost().equals("N/A")) {
+-          return false;
+-        }
+-        if (appReport.getRpcPort() == -1) {
+-          waitResult.set(1);
+-        }
+-        if (appReport.getYarnApplicationState() == YarnApplicationState.FINISHED
+-            && appReport.getFinalApplicationStatus() !=
+-            FinalApplicationStatus.UNDEFINED) {
+-          return true;
+-        }
+-      } catch (Exception e) {
+-        LOG.error("Exception get application from Yarn Client", e);
+-        waitResult.set(2);
+-      }
+-      return waitResult.get() != 0;
+-    }, 10, TEST_TIME_WINDOW_EXPIRE);
+-    t.join();
+-    if (waitResult.get() == 2) {
+-      // Exception was raised
+-      Assert.fail("Exception in getting application report. Failed");
+-    }
+-    if (waitResult.get() == 1) {
+-      Assert.assertEquals("Failed waiting for expected rpc port to be -1.",
+-          -1, appReportRef.get().getRpcPort());
+-    }
+-    checkTimeline(appIdRef.get(), defaultFlow, haveDomain, appReportRef.get());
+-  }
+-
+-  protected void baseTestDSShell(boolean haveDomain) throws Exception {
+-    baseTestDSShell(haveDomain, true);
+-  }
+-
+-  protected void checkTimeline(ApplicationId appId,
+-      boolean defaultFlow, boolean haveDomain,
+-      ApplicationReport appReport) throws Exception {
+-    TimelineDomain domain = null;
+-    if (haveDomain) {
+-      domain = yarnCluster.getApplicationHistoryServer()
+-          .getTimelineStore().getDomain("TEST_DOMAIN");
+-      Assert.assertNotNull(domain);
+-      Assert.assertEquals("reader_user reader_group", domain.getReaders());
+-      Assert.assertEquals("writer_user writer_group", domain.getWriters());
+-    }
+-    TimelineEntities entitiesAttempts = yarnCluster
+-        .getApplicationHistoryServer()
+-        .getTimelineStore()
+-        .getEntities(ApplicationMaster.DSEntity.DS_APP_ATTEMPT.toString(),
+-            null, null, null, null, null, null, null, null, null);
+-    Assert.assertNotNull(entitiesAttempts);
+-    Assert.assertEquals(1, entitiesAttempts.getEntities().size());
+-    Assert.assertEquals(2, entitiesAttempts.getEntities().get(0).getEvents()
+-        .size());
+-    Assert.assertEquals(entitiesAttempts.getEntities().get(0).getEntityType(),
+-        ApplicationMaster.DSEntity.DS_APP_ATTEMPT.toString());
+-    Assert.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
+-        entitiesAttempts.getEntities().get(0).getDomainId());
+-    String currAttemptEntityId =
+-        entitiesAttempts.getEntities().get(0).getEntityId();
+-    ApplicationAttemptId attemptId = ApplicationAttemptId.fromString(
+-        currAttemptEntityId);
+-    NameValuePair primaryFilter = new NameValuePair(
+-        ApplicationMaster.APPID_TIMELINE_FILTER_NAME,
+-        attemptId.getApplicationId().toString());
+-    TimelineEntities entities = yarnCluster
+-        .getApplicationHistoryServer()
+-        .getTimelineStore()
+-        .getEntities(ApplicationMaster.DSEntity.DS_CONTAINER.toString(), null,
+-            null, null, null, null, primaryFilter, null, null, null);
+-    Assert.assertNotNull(entities);
+-    Assert.assertEquals(2, entities.getEntities().size());
+-    Assert.assertEquals(entities.getEntities().get(0).getEntityType(),
+-        ApplicationMaster.DSEntity.DS_CONTAINER.toString());
+-
+-    String entityId = entities.getEntities().get(0).getEntityId();
+-    TimelineEntity entity =
+-        yarnCluster.getApplicationHistoryServer().getTimelineStore()
+-            .getEntity(entityId,
+-                ApplicationMaster.DSEntity.DS_CONTAINER.toString(), null);
+-    Assert.assertNotNull(entity);
+-    Assert.assertEquals(entityId, entity.getEntityId());
+-    Assert.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
+-        entities.getEntities().get(0).getDomainId());
+-  }
+-
+-  protected String[] createArgsWithPostFix(int index, String... args) {
+-    String[] res = mergeArgs(COMMON_ARGS, args);
+-    // set the application name so we can track down which command is running.
+-    res[COMMON_ARGS.length - 1] = generateAppName(String.format("%03d",
+-        index));
+-    return res;
+-  }
+-
+-  protected String generateAppName() {
+-    return generateAppName(null);
+-  }
+-
+-  protected String generateAppName(String postFix) {
+-    return name.getMethodName().replaceFirst("test", "")
+-        .concat(postFix == null ? "" : "-" + postFix);
+-  }
+-
+-  protected void setUpHDFSCluster() throws IOException {
+-    if (hdfsCluster == null) {
+-      HdfsConfiguration hdfsConfig = new HdfsConfiguration();
+-      hdfsCluster = new MiniDFSCluster.Builder(hdfsConfig)
+-          .numDataNodes(NUM_DATA_NODES).build();
+-      hdfsCluster.waitActive();
+-    }
+-  }
+-
+-  protected void setUpYarnCluster(int numNodeManagers,
+-      YarnConfiguration yarnConfig) throws Exception {
+-    if (yarnCluster != null) {
+-      return;
+-    }
+-    yarnCluster =
+-        new MiniYARNCluster(getClass().getSimpleName(), 1, numNodeManagers,
+-            1, 1);
+-    yarnCluster.init(yarnConfig);
+-    yarnCluster.start();
+-    // wait for the node managers to register.
+-    waitForNMsToRegister();
+-    conf.set(
+-        YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+-        MiniYARNCluster.getHostname() + ":"
+-            + yarnCluster.getApplicationHistoryServer().getPort());
+-    Configuration yarnClusterConfig = yarnCluster.getConfig();
+-    yarnClusterConfig.set(YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-        new File(yarnSitePath).getParent());
+-    // write the document to a buffer (not directly to the file, as that
+-    // can cause the file being written to get read -which will then fail.
+-    ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+-    yarnClusterConfig.writeXml(bytesOut);
+-    bytesOut.close();
+-    // write the bytes to the file in the classpath
+-    OutputStream os = new FileOutputStream(yarnSitePath);
+-    os.write(bytesOut.toByteArray());
+-    os.close();
+-  }
+-
+-  protected void setupInternal(int numNodeManagers,
+-      YarnConfiguration yarnConfig) throws Exception {
+-    LOG.info("========== Setting UP UnitTest {}#{} ==========",
+-        getClass().getCanonicalName(), name.getMethodName());
+-    LOG.info("Starting up YARN cluster. Timeline version {}",
+-        getTimelineVersion());
+-    conf = yarnConfig;
+-    conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB,
+-        MIN_ALLOCATION_MB);
+-    // reduce the tearDown waiting time
+-    conf.setLong(YarnConfiguration.DISPATCHER_DRAIN_EVENTS_TIMEOUT, 1000);
+-    conf.setLong(YarnConfiguration.NM_LOG_RETAIN_SECONDS, 500);
+-    conf.set("yarn.log.dir", "target");
+-    conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+-    // mark if we need to launch the v1 timeline server
+-    // disable aux-service based timeline aggregators
+-    conf.set(YarnConfiguration.NM_AUX_SERVICES, "");
+-    conf.setBoolean(YarnConfiguration.SYSTEM_METRICS_PUBLISHER_ENABLED, true);
+-
+-    conf.set(YarnConfiguration.NM_VMEM_PMEM_RATIO, "8");
+-    conf.setBoolean(YarnConfiguration.NODE_LABELS_ENABLED, true);
+-    conf.set("mapreduce.jobhistory.address",
+-        "0.0.0.0:" + ServerSocketUtil.getPort(10021, 10));
+-    // Enable ContainersMonitorImpl
+-    conf.set(YarnConfiguration.NM_CONTAINER_MON_RESOURCE_CALCULATOR,
+-        LinuxResourceCalculatorPlugin.class.getName());
+-    conf.set(YarnConfiguration.NM_CONTAINER_MON_PROCESS_TREE,
+-        ProcfsBasedProcessTree.class.getName());
+-    conf.setBoolean(YarnConfiguration.NM_PMEM_CHECK_ENABLED, true);
+-    conf.setBoolean(YarnConfiguration.NM_VMEM_CHECK_ENABLED, true);
+-    conf.setBoolean(
+-        YarnConfiguration.YARN_MINICLUSTER_CONTROL_RESOURCE_MONITORING, true);
+-    conf.setBoolean(YarnConfiguration.RM_SYSTEM_METRICS_PUBLISHER_ENABLED,
+-        true);
+-    conf.setBoolean(
+-        YarnConfiguration.OPPORTUNISTIC_CONTAINER_ALLOCATION_ENABLED, true);
+-    conf.setInt(YarnConfiguration.NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH,
+-        10);
+-    conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
+-        YarnConfiguration.PROCESSOR_RM_PLACEMENT_CONSTRAINTS_HANDLER);
+-    // ATS version specific settings
+-    conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION,
+-        getTimelineVersion());
+-    // setup the configuration of relevant for each TimelineService version.
+-    customizeConfiguration(conf);
+-    // setup the yarn cluster.
+-    setUpYarnCluster(numNodeManagers, conf);
+-  }
+-
+-  protected NodeManager getNodeManager(int index) {
+-    return yarnCluster.getNodeManager(index);
+-  }
+-
+-  protected MiniYARNCluster getYarnCluster() {
+-    return yarnCluster;
+-  }
+-
+-  protected void setConfiguration(String key, String value) {
+-    conf.set(key, value);
+-  }
+-
+-  protected Configuration getYarnClusterConfiguration() {
+-    return yarnCluster.getConfig();
+-  }
+-
+-  protected Configuration getConfiguration() {
+-    return conf;
+-  }
+-
+-  protected ResourceManager getResourceManager() {
+-    return yarnCluster.getResourceManager();
+-  }
+-
+-  protected ResourceManager getResourceManager(int index) {
+-    return yarnCluster.getResourceManager(index);
+-  }
+-
+-  protected Client getDSClient() {
+-    return dsClient;
+-  }
+-
+-  protected void resetDSClient() {
+-    dsClient = null;
+-  }
+-
+-  protected abstract float getTimelineVersion();
+-
+-  protected void cleanUpDFSClient() {
+-    if (getDSClient() != null) {
+-      getDSClient().sendStopSignal();
+-      resetDSClient();
+-    }
+-  }
+-
+-  private void waitForNMsToRegister() throws Exception {
+-    GenericTestUtils.waitFor(() -> {
+-      RMContext rmContext = yarnCluster.getResourceManager().getRMContext();
+-      return (rmContext.getRMNodes().size() >= NUM_NMS);
+-    }, 100, 60000);
+-  }
+-
+-  protected MiniDFSCluster getHDFSCluster() {
+-    return hdfsCluster;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestClient.java
+deleted file mode 100644
+index 074f2e8422b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestClient.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.junit.Test;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-public class TestClient {
+-  @Test
+-  public void testParseResourcesString() {
+-    // Setup
+-    final Map<String, Long> expectedResult = new HashMap<>();
+-    expectedResult.put("memory-mb", 3072L);
+-    expectedResult.put("vcores", 1L);
+-
+-    // Run the test
+-    final Map<String, Long> result = Client.parseResourcesString("[memory-mb=3072,vcores=1]");
+-
+-    // Verify the results
+-    assertEquals(expectedResult, result);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSAppMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSAppMaster.java
+deleted file mode 100644
+index af095bc9187..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSAppMaster.java
++++ /dev/null
+@@ -1,252 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.client.api.AMRMClient;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.client.api.impl.TimelineClientImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineWriterImpl;
+-import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.mockito.ArgumentMatchers;
+-import org.mockito.Mockito;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-
+-/**
+- * A bunch of tests to make sure that the container allocations
+- * and releases occur correctly.
+- */
+-public class TestDSAppMaster {
+-
+-  static class TestAppMaster extends ApplicationMaster {
+-    private int threadsLaunched = 0;
+-    public List<String> yarnShellIds = new ArrayList<String>();
+-
+-    @Override
+-    protected Thread createLaunchContainerThread(Container allocatedContainer,
+-        String shellId) {
+-      threadsLaunched++;
+-      launchedContainers.add(allocatedContainer.getId());
+-      yarnShellIds.add(shellId);
+-      return new Thread();
+-    }
+-
+-    void setNumTotalContainers(int numTotalContainers) {
+-      this.numTotalContainers = numTotalContainers;
+-    }
+-
+-    int getAllocatedContainers() {
+-      return this.numAllocatedContainers.get();
+-    }
+-
+-    @Override
+-    void startTimelineClient(final Configuration conf) throws YarnException,
+-        IOException, InterruptedException {
+-      timelineClient = null;
+-    }
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  @Test
+-  public void testDSAppMasterAllocateHandler() throws Exception {
+-
+-    TestAppMaster master = new TestAppMaster();
+-    int targetContainers = 2;
+-    AMRMClientAsync mockClient = Mockito.mock(AMRMClientAsync.class);
+-    master.setAmRMClient(mockClient);
+-    master.setNumTotalContainers(targetContainers);
+-    Mockito.doNothing().when(mockClient)
+-        .addContainerRequest(ArgumentMatchers.any(
+-            AMRMClient.ContainerRequest.class));
+-
+-    ApplicationMaster.RMCallbackHandler handler = master.getRMCallbackHandler();
+-
+-    List<Container> containers = new ArrayList<>(1);
+-    ContainerId id1 = BuilderUtils.newContainerId(1, 1, 1, 1);
+-    containers.add(generateContainer(id1));
+-
+-    master.numRequestedContainers.set(targetContainers);
+-
+-    // first allocate a single container, everything should be fine
+-    handler.onContainersAllocated(containers);
+-    Assert.assertEquals("Wrong container allocation count", 1,
+-        master.getAllocatedContainers());
+-    Assert.assertEquals("Incorrect number of threads launched", 1,
+-        master.threadsLaunched);
+-    Assert.assertEquals("Incorrect YARN Shell IDs",
+-        Arrays.asList("1"), master.yarnShellIds);
+-
+-    // now send 3 extra containers
+-    containers.clear();
+-    ContainerId id2 = BuilderUtils.newContainerId(1, 1, 1, 2);
+-    containers.add(generateContainer(id2));
+-    ContainerId id3 = BuilderUtils.newContainerId(1, 1, 1, 3);
+-    containers.add(generateContainer(id3));
+-    ContainerId id4 = BuilderUtils.newContainerId(1, 1, 1, 4);
+-    containers.add(generateContainer(id4));
+-    handler.onContainersAllocated(containers);
+-    Assert.assertEquals("Wrong final container allocation count", 2,
+-        master.getAllocatedContainers());
+-
+-    Assert.assertEquals("Incorrect number of threads launched", 2,
+-        master.threadsLaunched);
+-
+-    Assert.assertEquals("Incorrect YARN Shell IDs",
+-        Arrays.asList("1", "2"), master.yarnShellIds);
+-    // make sure we handle completion events correctly
+-    List<ContainerStatus> status = new ArrayList<>();
+-    status.add(generateContainerStatus(id1, ContainerExitStatus.SUCCESS));
+-    status.add(generateContainerStatus(id2, ContainerExitStatus.SUCCESS));
+-    status.add(generateContainerStatus(id3, ContainerExitStatus.ABORTED));
+-    status.add(generateContainerStatus(id4, ContainerExitStatus.ABORTED));
+-    handler.onContainersCompleted(status);
+-
+-    Assert.assertEquals("Unexpected number of completed containers",
+-        targetContainers, master.getNumCompletedContainers());
+-    Assert.assertTrue("Master didn't finish containers as expected",
+-        master.getDone());
+-
+-    // test for events from containers we know nothing about
+-    // these events should be ignored
+-    status = new ArrayList<>();
+-    ContainerId id5 = BuilderUtils.newContainerId(1, 1, 1, 5);
+-    status.add(generateContainerStatus(id5, ContainerExitStatus.ABORTED));
+-    Assert.assertEquals("Unexpected number of completed containers",
+-        targetContainers, master.getNumCompletedContainers());
+-    Assert.assertTrue("Master didn't finish containers as expected",
+-        master.getDone());
+-    status.add(generateContainerStatus(id5, ContainerExitStatus.SUCCESS));
+-    Assert.assertEquals("Unexpected number of completed containers",
+-        targetContainers, master.getNumCompletedContainers());
+-    Assert.assertTrue("Master didn't finish containers as expected",
+-        master.getDone());
+-  }
+-
+-  private Container generateContainer(ContainerId cid) {
+-    return Container.newInstance(cid, NodeId.newInstance("host", 5000),
+-      "host:80", Resource.newInstance(1024, 1), Priority.newInstance(0),
+-      null);
+-  }
+-
+-  private ContainerStatus
+-      generateContainerStatus(ContainerId id, int exitStatus) {
+-    return ContainerStatus.newInstance(id, ContainerState.COMPLETE, "",
+-      exitStatus);
+-  }
+-
+-  @Test
+-  public void testTimelineClientInDSAppMasterV1() throws Exception {
+-    runTimelineClientInDSAppMaster(true, false);
+-  }
+-
+-  @Test
+-  public void testTimelineClientInDSAppMasterV2() throws Exception {
+-    runTimelineClientInDSAppMaster(false, true);
+-  }
+-
+-  @Test
+-  public void testTimelineClientInDSAppMasterV1V2() throws Exception {
+-    runTimelineClientInDSAppMaster(true, true);
+-  }
+-
+-  @Test
+-  public void testTimelineClientInDSAppMasterDisabled() throws Exception {
+-    runTimelineClientInDSAppMaster(false, false);
+-  }
+-
+-  private void runTimelineClientInDSAppMaster(boolean v1Enabled,
+-      boolean v2Enabled) throws Exception {
+-    ApplicationMaster appMaster = createAppMasterWithStartedTimelineService(
+-        v1Enabled, v2Enabled);
+-    validateAppMasterTimelineService(v1Enabled, v2Enabled, appMaster);
+-  }
+-
+-  private void validateAppMasterTimelineService(boolean v1Enabled,
+-      boolean v2Enabled, ApplicationMaster appMaster) {
+-    if (v1Enabled) {
+-      Assert.assertEquals(appMaster.appSubmitterUgi,
+-          ((TimelineClientImpl)appMaster.timelineClient).getUgi());
+-    } else {
+-      Assert.assertNull(appMaster.timelineClient);
+-    }
+-    if (v2Enabled) {
+-      Assert.assertNotNull(appMaster.timelineV2Client);
+-    } else {
+-      Assert.assertNull(appMaster.timelineV2Client);
+-    }
+-  }
+-
+-  private ApplicationMaster createAppMasterWithStartedTimelineService(
+-      boolean v1Enabled, boolean v2Enabled) throws Exception {
+-    ApplicationMaster appMaster = new ApplicationMaster();
+-    appMaster.appSubmitterUgi = UserGroupInformation
+-        .createUserForTesting("foo", new String[] {"bar"});
+-    Configuration conf = this.getTimelineServiceConf(v1Enabled, v2Enabled);
+-    ApplicationId appId = ApplicationId.newInstance(1L, 1);
+-    appMaster.appAttemptID = ApplicationAttemptId.newInstance(appId, 1);
+-    appMaster.startTimelineClient(conf);
+-    return appMaster;
+-  }
+-
+-  private Configuration getTimelineServiceConf(boolean v1Enabled,
+-      boolean v2Enabled) {
+-    Configuration conf = new YarnConfiguration(new Configuration(false));
+-    Assert.assertFalse(YarnConfiguration.timelineServiceEnabled(conf));
+-
+-    if (v1Enabled || v2Enabled) {
+-      conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+-    }
+-
+-    if (v1Enabled) {
+-      conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 1.0f);
+-    }
+-
+-    if (v2Enabled) {
+-      conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f);
+-      conf.setClass(YarnConfiguration.TIMELINE_SERVICE_WRITER_CLASS,
+-          FileSystemTimelineWriterImpl.class, TimelineWriter.class);
+-    }
+-
+-    if (v1Enabled && v2Enabled) {
+-      conf.set(YarnConfiguration.TIMELINE_SERVICE_VERSION, "1.0");
+-      conf.set(YarnConfiguration.TIMELINE_SERVICE_VERSIONS, "1.0,2.0f");
+-    }
+-    return conf;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSFailedAppMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSFailedAppMaster.java
+deleted file mode 100644
+index 4f424f930b2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSFailedAppMaster.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class TestDSFailedAppMaster extends ApplicationMaster {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(TestDSFailedAppMaster.class);
+-
+-  @Override
+-  public void run() throws YarnException, IOException, InterruptedException {
+-    super.run();
+-
+-    // for the 2nd attempt.
+-    if (appAttemptID.getAttemptId() == 2) {
+-      // should reuse the earlier running container, so numAllocatedContainers
+-      // should be set to 1. And should ask no more containers, so
+-      // numRequestedContainers should be the same as numTotalContainers.
+-      // The only container is the container requested by the AM in the first
+-      // attempt.
+-      if (numAllocatedContainers.get() != 1
+-          || numRequestedContainers.get() != numTotalContainers) {
+-        LOG.info("NumAllocatedContainers is " + numAllocatedContainers.get()
+-            + " and NumRequestedContainers is " + numAllocatedContainers.get()
+-            + ".Application Master failed. exiting");
+-        System.exit(200);
+-      }
+-    }
+-  }
+-
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    try {
+-      TestDSFailedAppMaster appMaster = new TestDSFailedAppMaster();
+-      boolean doRun = appMaster.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      appMaster.run();
+-      if (appMaster.appAttemptID.getAttemptId() == 1) {
+-        try {
+-          // sleep some time, wait for the AM to launch a container.
+-          Thread.sleep(3000);
+-        } catch (InterruptedException e) {}
+-        // fail the first am.
+-        System.exit(100);
+-      }
+-      result = appMaster.finish();
+-    } catch (Throwable t) {
+-      System.exit(1);
+-    }
+-    if (result) {
+-      LOG.info("Application Master completed successfully. exiting");
+-      System.exit(0);
+-    } else {
+-      LOG.info("Application Master failed. exiting");
+-      System.exit(2);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSSleepingAppMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSSleepingAppMaster.java
+deleted file mode 100644
+index ae25ece1f82..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSSleepingAppMaster.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class TestDSSleepingAppMaster extends ApplicationMaster {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(TestDSSleepingAppMaster.class);
+-  private static final long SLEEP_TIME = 5000;
+-
+-  public static void main(String[] args) {
+-    boolean result = false;
+-    TestDSSleepingAppMaster appMaster = new TestDSSleepingAppMaster();
+-    try {
+-      boolean doRun = appMaster.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      appMaster.run();
+-      if (appMaster.appAttemptID.getAttemptId() <= 2) {
+-        try {
+-          // sleep some time
+-          Thread.sleep(SLEEP_TIME);
+-        } catch (InterruptedException e) {}
+-        // fail the first am.
+-        System.exit(100);
+-      }
+-      result = appMaster.finish();
+-    } catch (Throwable t) {
+-      System.exit(1);
+-    } finally {
+-      if (appMaster != null) {
+-        appMaster.cleanup();
+-      }
+-    }
+-    if (result) {
+-      LOG.info("Application Master completed successfully. exiting");
+-      System.exit(0);
+-    } else {
+-      LOG.info("Application Master failed. exiting");
+-      System.exit(2);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV10.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV10.java
+deleted file mode 100644
+index 15dc1cb04ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV10.java
++++ /dev/null
+@@ -1,843 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.BufferedReader;
+-import java.io.File;
+-import java.io.FileReader;
+-import java.io.IOException;
+-import java.io.PrintWriter;
+-import java.io.UncheckedIOException;
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.concurrent.atomic.AtomicReference;
+-
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.commons.cli.MissingArgumentException;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.util.Shell;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.LogAggregationContext;
+-import org.apache.hadoop.yarn.client.api.impl.DirectTimelineWriter;
+-import org.apache.hadoop.yarn.client.api.impl.TestTimelineClient;
+-import org.apache.hadoop.yarn.client.api.impl.TimelineClientImpl;
+-import org.apache.hadoop.yarn.client.api.impl.TimelineWriter;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ResourceNotFoundException;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-import org.apache.hadoop.yarn.util.Records;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertFalse;
+-import static org.junit.Assert.assertTrue;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.spy;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Unit tests implementations for distributed shell on TimeLineV1.
+- */
+-public class TestDSTimelineV10 extends DistributedShellBaseTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDSTimelineV10.class);
+-
+-  @Override
+-  protected float getTimelineVersion() {
+-    return 1.0f;
+-  }
+-
+-  @Override
+-  protected void cleanUpDFSClient() {
+-
+-  }
+-
+-  @Test
+-  public void testDSShellWithDomain() throws Exception {
+-    baseTestDSShell(true);
+-  }
+-
+-  @Test
+-  public void testDSShellWithoutDomain() throws Exception {
+-    baseTestDSShell(false);
+-  }
+-
+-  @Test
+-  public void testDSRestartWithPreviousRunningContainers() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getSleepCommand(8),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128",
+-        "--keep_containers_across_application_attempts"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(TestDSFailedAppMaster.class.getName(),
+-        new Configuration(getYarnClusterConfiguration()));
+-
+-    getDSClient().init(args);
+-
+-    LOG.info("Running DS Client");
+-    boolean result = getDSClient().run();
+-    LOG.info("Client run completed. Result={}", result);
+-    // application should succeed
+-    Assert.assertTrue(result);
+-  }
+-
+-  /*
+-   * The sleeping period in TestDSSleepingAppMaster is set as 5 seconds.
+-   * Set attempt_failures_validity_interval as 2.5 seconds. It will check
+-   * how many attempt failures for previous 2.5 seconds.
+-   * The application is expected to be successful.
+-   */
+-  @Test
+-  public void testDSAttemptFailuresValidityIntervalSuccess() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getSleepCommand(8),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128",
+-        "--attempt_failures_validity_interval",
+-        "2500"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    Configuration config = getYarnClusterConfiguration();
+-    config.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, 2);
+-    setAndGetDSClient(TestDSSleepingAppMaster.class.getName(),
+-        new Configuration(config));
+-
+-    getDSClient().init(args);
+-
+-    LOG.info("Running DS Client");
+-    boolean result = getDSClient().run();
+-
+-    LOG.info("Client run completed. Result=" + result);
+-    // application should succeed
+-    Assert.assertTrue(result);
+-  }
+-
+-  /*
+-   * The sleeping period in TestDSSleepingAppMaster is set as 5 seconds.
+-   * Set attempt_failures_validity_interval as 15 seconds. It will check
+-   * how many attempt failure for previous 15 seconds.
+-   * The application is expected to be fail.
+-   */
+-  @Test
+-  public void testDSAttemptFailuresValidityIntervalFailed() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getSleepCommand(8),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128",
+-        "--attempt_failures_validity_interval",
+-        "15000"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    Configuration config = getYarnClusterConfiguration();
+-    config.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, 2);
+-    setAndGetDSClient(TestDSSleepingAppMaster.class.getName(),
+-        new Configuration(config));
+-
+-    getDSClient().init(args);
+-
+-    LOG.info("Running DS Client");
+-    boolean result = getDSClient().run();
+-
+-    LOG.info("Client run completed. Result=" + result);
+-    // application should be failed
+-    Assert.assertFalse(result);
+-  }
+-
+-  @Test
+-  public void testDSShellWithCustomLogPropertyFile() throws Exception {
+-    final File basedir = getBaseDirForTest();
+-    final File tmpDir = new File(basedir, "tmpDir");
+-    tmpDir.mkdirs();
+-    final File customLogProperty = new File(tmpDir, "custom_log4j.properties");
+-    if (customLogProperty.exists()) {
+-      customLogProperty.delete();
+-    }
+-    if (!customLogProperty.createNewFile()) {
+-      Assert.fail("Can not create custom log4j property file.");
+-    }
+-    PrintWriter fileWriter = new PrintWriter(customLogProperty);
+-    // set the output to DEBUG level
+-    fileWriter.write("log4j.rootLogger=debug,stdout");
+-    fileWriter.close();
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "3",
+-        "--shell_command",
+-        "echo",
+-        "--shell_args",
+-        "HADOOP",
+-        "--log_properties",
+-        customLogProperty.getAbsolutePath(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1"
+-    );
+-
+-    // Before run the DS, the default the log level is INFO
+-    final Logger LOG_Client =
+-        LoggerFactory.getLogger(Client.class);
+-    Assert.assertTrue(LOG_Client.isInfoEnabled());
+-    Assert.assertFalse(LOG_Client.isDebugEnabled());
+-    final Logger LOG_AM = LoggerFactory.getLogger(ApplicationMaster.class);
+-    Assert.assertTrue(LOG_AM.isInfoEnabled());
+-    Assert.assertFalse(LOG_AM.isDebugEnabled());
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    boolean initSuccess = getDSClient().init(args);
+-    Assert.assertTrue(initSuccess);
+-
+-    LOG.info("Running DS Client");
+-    boolean result = getDSClient().run();
+-    LOG.info("Client run completed. Result=" + result);
+-    Assert.assertTrue(verifyContainerLog(3, null, true, "DEBUG") > 10);
+-    //After DS is finished, the log level should be DEBUG
+-    Assert.assertTrue(LOG_Client.isInfoEnabled());
+-    Assert.assertTrue(LOG_Client.isDebugEnabled());
+-    Assert.assertTrue(LOG_AM.isInfoEnabled());
+-    Assert.assertTrue(LOG_AM.isDebugEnabled());
+-  }
+-
+-  @Test
+-  public void testSpecifyingLogAggregationContext() throws Exception {
+-    String regex = ".*(foo|bar)\\d";
+-    String[] args = createArgumentsWithAppName(
+-        "--shell_command",
+-        "echo",
+-        "--rolling_log_pattern",
+-        regex
+-    );
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    Assert.assertTrue(getDSClient().init(args));
+-
+-    ApplicationSubmissionContext context =
+-        Records.newRecord(ApplicationSubmissionContext.class);
+-    getDSClient().specifyLogAggregationContext(context);
+-    LogAggregationContext logContext = context.getLogAggregationContext();
+-    assertEquals(logContext.getRolledLogsIncludePattern(), regex);
+-    assertTrue(logContext.getRolledLogsExcludePattern().isEmpty());
+-  }
+-
+-  @Test
+-  public void testDSShellWithMultipleArgs() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "4",
+-        "--shell_command",
+-        "echo",
+-        "--shell_args",
+-        "HADOOP YARN MAPREDUCE HDFS",
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    boolean initSuccess = getDSClient().init(args);
+-    Assert.assertTrue(initSuccess);
+-    LOG.info("Running DS Client");
+-
+-    boolean result = getDSClient().run();
+-    LOG.info("Client run completed. Result=" + result);
+-    List<String> expectedContent = new ArrayList<>();
+-    expectedContent.add("HADOOP YARN MAPREDUCE HDFS");
+-    verifyContainerLog(4, expectedContent, false, "");
+-  }
+-
+-  @Test
+-  public void testDSShellWithShellScript() throws Exception {
+-    final File basedir = getBaseDirForTest();
+-    final File tmpDir = new File(basedir, "tmpDir");
+-    tmpDir.mkdirs();
+-    final File customShellScript = new File(tmpDir, "custom_script.sh");
+-    if (customShellScript.exists()) {
+-      customShellScript.delete();
+-    }
+-    if (!customShellScript.createNewFile()) {
+-      Assert.fail("Can not create custom shell script file.");
+-    }
+-    PrintWriter fileWriter = new PrintWriter(customShellScript);
+-    // set the output to DEBUG level
+-    fileWriter.write("echo testDSShellWithShellScript");
+-    fileWriter.close();
+-    LOG.info(customShellScript.getAbsolutePath());
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_script",
+-        customShellScript.getAbsolutePath(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    Assert.assertTrue(getDSClient().init(args));
+-    LOG.info("Running DS Client");
+-    assertTrue(getDSClient().run());
+-    List<String> expectedContent = new ArrayList<>();
+-    expectedContent.add("testDSShellWithShellScript");
+-    verifyContainerLog(1, expectedContent, false, "");
+-  }
+-
+-  @Test
+-  public void testDSShellWithInvalidArgs() throws Exception {
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    int appNameCounter = 0;
+-    LOG.info("Initializing DS Client with no args");
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "No args",
+-        () -> getDSClient().init(new String[]{}));
+-
+-    LOG.info("Initializing DS Client with no jar file");
+-    String[] noJarArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128"
+-    );
+-    String[] argsNoJar = Arrays.copyOfRange(noJarArgs, 2, noJarArgs.length);
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "No jar",
+-        () -> getDSClient().init(argsNoJar));
+-
+-    LOG.info("Initializing DS Client with no shell command");
+-    String[] noShellCmdArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128"
+-    );
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "No shell command",
+-        () -> getDSClient().init(noShellCmdArgs));
+-
+-    LOG.info("Initializing DS Client with invalid no. of containers");
+-
+-    String[] numContainersArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "-1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128"
+-    );
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Invalid no. of containers",
+-        () -> getDSClient().init(numContainersArgs));
+-
+-    LOG.info("Initializing DS Client with invalid no. of vcores");
+-
+-    String[] vCoresArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "-2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1"
+-    );
+-    getDSClient().init(vCoresArgs);
+-
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Invalid virtual cores specified",
+-        () -> {
+-          getDSClient().init(vCoresArgs);
+-          getDSClient().run();
+-        });
+-
+-    LOG.info("Initializing DS Client with --shell_command and --shell_script");
+-
+-    String[] scriptAndCmdArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1",
+-        "--shell_script",
+-        "test.sh"
+-    );
+-
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Can not specify shell_command option and shell_script option at "
+-            + "the same time",
+-        () -> getDSClient().init(scriptAndCmdArgs));
+-
+-    LOG.info(
+-        "Initializing DS Client without --shell_command and --shell_script");
+-
+-    String[] noShellCmdNoScriptArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1"
+-    );
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "No shell command or shell script specified "
+-            + "to be executed by application master",
+-        () -> getDSClient().init(noShellCmdNoScriptArgs));
+-
+-    LOG.info("Initializing DS Client with invalid container_type argument");
+-    String[] invalidTypeArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "2",
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1",
+-        "--shell_command",
+-        "date",
+-        "--container_type",
+-        "UNSUPPORTED_TYPE"
+-    );
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Invalid container_type: UNSUPPORTED_TYPE",
+-        () -> getDSClient().init(invalidTypeArgs));
+-
+-    String[] invalidMemArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_resources",
+-        "memory-mb=invalid"
+-    );
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        () -> getDSClient().init(invalidMemArgs));
+-
+-    String[] invalidMasterResArgs = createArgsWithPostFix(appNameCounter++,
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_resources"
+-    );
+-    LambdaTestUtils.intercept(MissingArgumentException.class,
+-        () -> getDSClient().init(invalidMasterResArgs));
+-  }
+-
+-  @Test
+-  public void testDSTimelineClientWithConnectionRefuse() throws Exception {
+-    ApplicationMaster am = new ApplicationMaster();
+-    final AtomicReference<TimelineWriter> spyTimelineWriterRef =
+-        new AtomicReference<>(null);
+-    TimelineClientImpl client = new TimelineClientImpl() {
+-      @Override
+-      protected TimelineWriter createTimelineWriter(Configuration conf,
+-          UserGroupInformation authUgi, com.sun.jersey.api.client.Client client,
+-          URI resURI) throws IOException {
+-        TimelineWriter timelineWriter =
+-            new DirectTimelineWriter(authUgi, client, resURI);
+-        spyTimelineWriterRef.set(spy(timelineWriter));
+-        return spyTimelineWriterRef.get();
+-      }
+-    };
+-    client.init(getConfiguration());
+-    client.start();
+-    TestTimelineClient.mockEntityClientResponse(spyTimelineWriterRef.get(),
+-        null, false, true);
+-    try {
+-      UserGroupInformation ugi = mock(UserGroupInformation.class);
+-      when(ugi.getShortUserName()).thenReturn("user1");
+-      // verify no ClientHandlerException get thrown out.
+-      am.publishContainerEndEvent(client, ContainerStatus.newInstance(
+-          BuilderUtils.newContainerId(1, 1, 1, 1), ContainerState.COMPLETE, "",
+-          1), "domainId", ugi);
+-    } finally {
+-      client.stop();
+-    }
+-  }
+-
+-  @Test
+-  public void testContainerLaunchFailureHandling() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--container_memory",
+-        "128"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(ContainerLaunchFailAppMaster.class.getName(),
+-        new Configuration(getYarnClusterConfiguration()));
+-    Assert.assertTrue(getDSClient().init(args));
+-    LOG.info("Running DS Client");
+-    Assert.assertFalse(getDSClient().run());
+-  }
+-
+-  @Test
+-  public void testDebugFlag() throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1",
+-        "--debug"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    Assert.assertTrue(getDSClient().init(args));
+-    LOG.info("Running DS Client");
+-    Assert.assertTrue(getDSClient().run());
+-  }
+-
+-  private int verifyContainerLog(int containerNum,
+-      List<String> expectedContent, boolean count, String expectedWord) {
+-    File logFolder =
+-        new File(getNodeManager(0).getConfig()
+-            .get(YarnConfiguration.NM_LOG_DIRS,
+-                YarnConfiguration.DEFAULT_NM_LOG_DIRS));
+-
+-    File[] listOfFiles = logFolder.listFiles();
+-    Assert.assertNotNull(listOfFiles);
+-    int currentContainerLogFileIndex = -1;
+-    for (int i = listOfFiles.length - 1; i >= 0; i--) {
+-      if (listOfFiles[i].listFiles().length == containerNum + 1) {
+-        currentContainerLogFileIndex = i;
+-        break;
+-      }
+-    }
+-    Assert.assertTrue(currentContainerLogFileIndex != -1);
+-    File[] containerFiles =
+-        listOfFiles[currentContainerLogFileIndex].listFiles();
+-
+-    int numOfWords = 0;
+-    for (File containerFile : containerFiles) {
+-      if (containerFile == null) {
+-        continue;
+-      }
+-      for (File output : containerFile.listFiles()) {
+-        if (output.getName().trim().contains("stdout")) {
+-          List<String> stdOutContent = new ArrayList<>();
+-          try (BufferedReader br = new BufferedReader(new FileReader(output))) {
+-            String sCurrentLine;
+-
+-            int numOfline = 0;
+-            while ((sCurrentLine = br.readLine()) != null) {
+-              if (count) {
+-                if (sCurrentLine.contains(expectedWord)) {
+-                  numOfWords++;
+-                }
+-              } else if (output.getName().trim().equals("stdout")) {
+-                if (!Shell.WINDOWS) {
+-                  Assert.assertEquals("The current is" + sCurrentLine,
+-                      expectedContent.get(numOfline), sCurrentLine.trim());
+-                  numOfline++;
+-                } else {
+-                  stdOutContent.add(sCurrentLine.trim());
+-                }
+-              }
+-            }
+-            /* By executing bat script using cmd /c,
+-             * it will output all contents from bat script first
+-             * It is hard for us to do check line by line
+-             * Simply check whether output from bat file contains
+-             * all the expected messages
+-             */
+-            if (Shell.WINDOWS && !count
+-                && output.getName().trim().equals("stdout")) {
+-              Assert.assertTrue(stdOutContent.containsAll(expectedContent));
+-            }
+-          } catch (IOException e) {
+-            LOG.error("Exception reading the buffer", e);
+-          }
+-        }
+-      }
+-    }
+-    return numOfWords;
+-  }
+-
+-  @Test
+-  public void testDistributedShellResourceProfiles() throws Exception {
+-    int appNameCounter = 0;
+-    String[][] args = {
+-        createArgsWithPostFix(appNameCounter++,
+-            "--num_containers", "1", "--shell_command",
+-            getListCommand(), "--container_resource_profile",
+-            "maximum"),
+-        createArgsWithPostFix(appNameCounter++,
+-            "--num_containers", "1", "--shell_command",
+-            getListCommand(), "--master_resource_profile",
+-            "default"),
+-        createArgsWithPostFix(appNameCounter++,
+-            "--num_containers", "1", "--shell_command",
+-            getListCommand(), "--master_resource_profile",
+-            "default", "--container_resource_profile", "maximum"),
+-    };
+-
+-    for (int i = 0; i < args.length; ++i) {
+-      LOG.info("Initializing DS Client[{}]", i);
+-      setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-      Assert.assertTrue(getDSClient().init(args[i]));
+-      LOG.info("Running DS Client[{}]", i);
+-      LambdaTestUtils.intercept(Exception.class,
+-          () -> getDSClient().run());
+-    }
+-  }
+-
+-  @Test
+-  public void testDSShellWithOpportunisticContainers() throws Exception {
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1",
+-        "--shell_command",
+-        "date",
+-        "--container_type",
+-        "OPPORTUNISTIC"
+-    );
+-    assertTrue(getDSClient().init(args));
+-    assertTrue(getDSClient().run());
+-  }
+-
+-  @Test(expected = ResourceNotFoundException.class)
+-  public void testDistributedShellAMResourcesWithUnknownResource()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_resources",
+-        "unknown-resource=5"
+-    );
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    assertTrue(getDSClient().init(args));
+-    getDSClient().run();
+-  }
+-
+-  @Test(expected = IllegalArgumentException.class)
+-  public void testDistributedShellNonExistentQueue()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--queue",
+-        "non-existent-queue"
+-    );
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    assertTrue(getDSClient().init(args));
+-    getDSClient().run();
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithSingleFileLocalization()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getCatCommand(),
+-        "--localize_files",
+-        "./src/test/resources/a.txt",
+-        "--shell_args",
+-        "a.txt"
+-    );
+-
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    assertTrue(getDSClient().init(args));
+-    assertTrue("Client exited with an error", getDSClient().run());
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithMultiFileLocalization()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getCatCommand(),
+-        "--localize_files",
+-        "./src/test/resources/a.txt,./src/test/resources/b.txt",
+-        "--shell_args",
+-        "a.txt b.txt"
+-    );
+-
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    assertTrue(getDSClient().init(args));
+-    assertTrue("Client exited with an error", getDSClient().run());
+-  }
+-
+-  @Test(expected = UncheckedIOException.class)
+-  public void testDistributedShellWithNonExistentFileLocalization()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getCatCommand(),
+-        "--localize_files",
+-        "/non/existing/path/file.txt",
+-        "--shell_args",
+-        "file.txt"
+-    );
+-
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    assertTrue(getDSClient().init(args));
+-    assertTrue(getDSClient().run());
+-  }
+-
+-  @Test
+-  public void testDistributedShellCleanup()
+-      throws Exception {
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "1",
+-        "--shell_command",
+-        getListCommand()
+-    );
+-    Configuration config = new Configuration(getYarnClusterConfiguration());
+-    setAndGetDSClient(config);
+-
+-    assertTrue(getDSClient().init(args));
+-    assertTrue(getDSClient().run());
+-    ApplicationId appId = getDSClient().getAppId();
+-    String relativePath =
+-        ApplicationMaster.getRelativePath(generateAppName(),
+-            appId.toString(), "");
+-    FileSystem fs1 = FileSystem.get(config);
+-    Path path = new Path(fs1.getHomeDirectory(), relativePath);
+-
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        return !fs1.exists(path);
+-      } catch (IOException e) {
+-        return false;
+-      }
+-    }, 10, 60000);
+-
+-    assertFalse("Distributed Shell Cleanup failed", fs1.exists(path));
+-  }
+-
+-  @Override
+-  protected void customizeConfiguration(
+-      YarnConfiguration config) throws Exception {
+-    config.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY,
+-        CommonConfigurationKeysPublic.FS_DEFAULT_NAME_DEFAULT);
+-  }
+-
+-  private static File getBaseDirForTest() {
+-    return new File("target", TestDSTimelineV10.class.getName());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV15.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV15.java
+deleted file mode 100644
+index 634bac4df43..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV15.java
++++ /dev/null
+@@ -1,100 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.util.concurrent.atomic.AtomicReference;
+-
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.timeline.PluginStoreTestUtils;
+-
+-/**
+- * Unit tests implementations for distributed shell on TimeLineV1.5.
+- */
+-public class TestDSTimelineV15 extends DistributedShellBaseTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDSTimelineV15.class);
+-
+-  @Override
+-  protected float getTimelineVersion() {
+-    return 1.5f;
+-  }
+-
+-  @Override
+-  protected void customizeConfiguration(
+-      YarnConfiguration config) throws Exception {
+-    setUpHDFSCluster();
+-    PluginStoreTestUtils.prepareFileSystemForPluginStore(
+-        getHDFSCluster().getFileSystem());
+-    PluginStoreTestUtils.prepareConfiguration(config, getHDFSCluster());
+-    config.set(YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSES,
+-        DistributedShellTimelinePlugin.class.getName());
+-  }
+-
+-  @Override
+-  protected void checkTimeline(ApplicationId appId,
+-      boolean defaultFlow, boolean haveDomain,
+-      ApplicationReport appReport) throws Exception {
+-    long scanInterval = getConfiguration().getLong(
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SCAN_INTERVAL_SECONDS,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SCAN_INTERVAL_SECONDS_DEFAULT
+-    );
+-    Path doneDir = new Path(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR_DEFAULT
+-    );
+-    // Wait till the data is moved to done dir, or timeout and fail
+-    AtomicReference<Exception> exceptionRef = new AtomicReference<>(null);
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        RemoteIterator<FileStatus> iterApps =
+-            getHDFSCluster().getFileSystem().listStatusIterator(doneDir);
+-        return (iterApps.hasNext());
+-      } catch (Exception e) {
+-        exceptionRef.set(e);
+-        LOG.error("Exception listing Done Dir", e);
+-        return true;
+-      }
+-    }, scanInterval * 2, TEST_TIME_WINDOW_EXPIRE);
+-    Assert.assertNull("Exception in getting listing status",
+-        exceptionRef.get());
+-    super.checkTimeline(appId, defaultFlow, haveDomain, appReport);
+-  }
+-
+-  @Test
+-  public void testDSShellWithDomain() throws Exception {
+-    baseTestDSShell(true);
+-  }
+-
+-  @Test
+-  public void testDSShellWithoutDomain() throws Exception {
+-    baseTestDSShell(false);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV20.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV20.java
+deleted file mode 100644
+index caf9d3b8de7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV20.java
++++ /dev/null
+@@ -1,484 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.BufferedReader;
+-import java.io.File;
+-import java.io.FileReader;
+-import java.io.IOException;
+-import java.util.List;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-import java.util.concurrent.atomic.AtomicReference;
+-
+-import org.junit.Assert;
+-import org.junit.Assume;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerReport;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntityType;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent;
+-import org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster.DSEvent;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.metrics.AppAttemptMetricsConstants;
+-import org.apache.hadoop.yarn.server.metrics.ApplicationMetricsConstants;
+-import org.apache.hadoop.yarn.server.metrics.ContainerMetricsConstants;
+-import org.apache.hadoop.yarn.server.timelineservice.collector.PerNodeTimelineCollectorsAuxService;
+-import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineReaderImpl;
+-import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineWriterImpl;
+-import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+-
+-/**
+- * Unit tests implementations for distributed shell on TimeLineV2.
+- */
+-public class TestDSTimelineV20 extends DistributedShellBaseTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDSTimelineV20.class);
+-  private static final String TIMELINE_AUX_SERVICE_NAME = "timeline_collector";
+-
+-  @Override
+-  protected float getTimelineVersion() {
+-    return 2.0f;
+-  }
+-
+-  @Override
+-  protected void customizeConfiguration(
+-      YarnConfiguration config) throws Exception {
+-    // disable v1 timeline server since we no longer have a server here
+-    // enable aux-service based timeline aggregators
+-    config.set(YarnConfiguration.NM_AUX_SERVICES, TIMELINE_AUX_SERVICE_NAME);
+-    config.set(YarnConfiguration.NM_AUX_SERVICES + "." +
+-            TIMELINE_AUX_SERVICE_NAME + ".class",
+-        PerNodeTimelineCollectorsAuxService.class.getName());
+-    config.setClass(YarnConfiguration.TIMELINE_SERVICE_WRITER_CLASS,
+-        FileSystemTimelineWriterImpl.class,
+-        org.apache.hadoop.yarn.server.timelineservice.storage.
+-            TimelineWriter.class);
+-    setTimelineV2StorageDir();
+-    // set the file system timeline writer storage directory
+-    config.set(FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_DIR_ROOT,
+-        getTimelineV2StorageDir());
+-  }
+-
+-  @Test
+-  public void testDSShellWithEnforceExecutionType() throws Exception {
+-    YarnClient yarnClient = null;
+-    AtomicReference<Throwable> thrownError = new AtomicReference<>(null);
+-    AtomicReference<List<ContainerReport>> containersListRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<ApplicationAttemptId> appAttemptIdRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<ApplicationAttemptReport> appAttemptReportRef =
+-        new AtomicReference<>(null);
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--master_memory",
+-        "512",
+-        "--master_vcores",
+-        "2",
+-        "--container_memory",
+-        "128",
+-        "--container_vcores",
+-        "1",
+-        "--shell_command",
+-        getListCommand(),
+-        "--container_type",
+-        "OPPORTUNISTIC",
+-        "--enforce_execution_type"
+-    );
+-    try {
+-      setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-      getDSClient().init(args);
+-      Thread dsClientRunner = new Thread(() -> {
+-        try {
+-          getDSClient().run();
+-        } catch (Exception e) {
+-          throw new RuntimeException(e);
+-        }
+-      });
+-      dsClientRunner.start();
+-
+-      yarnClient = YarnClient.createYarnClient();
+-      yarnClient.init(new Configuration(getYarnClusterConfiguration()));
+-      yarnClient.start();
+-
+-      // expecting three containers including the AM container.
+-      waitForContainersLaunch(yarnClient, 3, appAttemptReportRef,
+-          containersListRef, appAttemptIdRef, thrownError);
+-      if (thrownError.get() != null) {
+-        Assert.fail(thrownError.get().getMessage());
+-      }
+-      ContainerId amContainerId = appAttemptReportRef.get().getAMContainerId();
+-      for (ContainerReport container : containersListRef.get()) {
+-        if (!container.getContainerId().equals(amContainerId)) {
+-          Assert.assertEquals(container.getExecutionType(),
+-              ExecutionType.OPPORTUNISTIC);
+-        }
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Job execution with enforce execution type failed.", e);
+-      Assert.fail("Exception. " + e.getMessage());
+-    } finally {
+-      if (yarnClient != null) {
+-        yarnClient.stop();
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithResources() throws Exception {
+-    doTestDistributedShellWithResources(false);
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithResourcesWithLargeContainers()
+-      throws Exception {
+-    doTestDistributedShellWithResources(true);
+-  }
+-
+-  private void doTestDistributedShellWithResources(boolean largeContainers)
+-      throws Exception {
+-    AtomicReference<Throwable> thrownExceptionRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<List<ContainerReport>> containersListRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<ApplicationAttemptId> appAttemptIdRef =
+-        new AtomicReference<>(null);
+-    AtomicReference<ApplicationAttemptReport> appAttemptReportRef =
+-        new AtomicReference<>(null);
+-    Resource clusterResource = getYarnCluster().getResourceManager()
+-        .getResourceScheduler().getClusterResource();
+-    String masterMemoryString = "1 Gi";
+-    String containerMemoryString = "512 Mi";
+-    long[] memVars = {1024, 512};
+-    YarnClient yarnClient = null;
+-    Assume.assumeTrue("The cluster doesn't have enough memory for this test",
+-        clusterResource.getMemorySize() >= memVars[0] + memVars[1]);
+-    Assume.assumeTrue("The cluster doesn't have enough cores for this test",
+-        clusterResource.getVirtualCores() >= 2);
+-    if (largeContainers) {
+-      memVars[0] = clusterResource.getMemorySize() * 2 / 3;
+-      memVars[0] = memVars[0] - memVars[0] % MIN_ALLOCATION_MB;
+-      masterMemoryString = memVars[0] + "Mi";
+-      memVars[1] = clusterResource.getMemorySize() / 3;
+-      memVars[1] = memVars[1] - memVars[1] % MIN_ALLOCATION_MB;
+-      containerMemoryString = String.valueOf(memVars[1]);
+-    }
+-
+-    String[] args = createArgumentsWithAppName(
+-        "--num_containers",
+-        "2",
+-        "--shell_command",
+-        getListCommand(),
+-        "--master_resources",
+-        "memory=" + masterMemoryString + ",vcores=1",
+-        "--container_resources",
+-        "memory=" + containerMemoryString + ",vcores=1"
+-    );
+-
+-    LOG.info("Initializing DS Client");
+-    setAndGetDSClient(new Configuration(getYarnClusterConfiguration()));
+-    Assert.assertTrue(getDSClient().init(args));
+-    LOG.info("Running DS Client");
+-    final AtomicBoolean result = new AtomicBoolean(false);
+-    Thread dsClientRunner = new Thread(() -> {
+-      try {
+-        result.set(getDSClient().run());
+-      } catch (Exception e) {
+-        throw new RuntimeException(e);
+-      }
+-    });
+-    dsClientRunner.start();
+-    try {
+-      yarnClient = YarnClient.createYarnClient();
+-      yarnClient.init(new Configuration(getYarnClusterConfiguration()));
+-      yarnClient.start();
+-      // expecting two containers.
+-      waitForContainersLaunch(yarnClient, 2, appAttemptReportRef,
+-          containersListRef, appAttemptIdRef, thrownExceptionRef);
+-      if (thrownExceptionRef.get() != null) {
+-        Assert.fail(thrownExceptionRef.get().getMessage());
+-      }
+-      ContainerId amContainerId = appAttemptReportRef.get().getAMContainerId();
+-      ContainerReport report = yarnClient.getContainerReport(amContainerId);
+-      Resource masterResource = report.getAllocatedResource();
+-      Assert.assertEquals(memVars[0], masterResource.getMemorySize());
+-      Assert.assertEquals(1, masterResource.getVirtualCores());
+-      for (ContainerReport container : containersListRef.get()) {
+-        if (!container.getContainerId().equals(amContainerId)) {
+-          Resource containerResource = container.getAllocatedResource();
+-          Assert.assertEquals(memVars[1],
+-              containerResource.getMemorySize());
+-          Assert.assertEquals(1, containerResource.getVirtualCores());
+-        }
+-      }
+-    } finally {
+-      LOG.info("Signaling Client to Stop");
+-      if (yarnClient != null) {
+-        LOG.info("Stopping yarnClient service");
+-        yarnClient.stop();
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testDSShellWithoutDomain() throws Exception {
+-    baseTestDSShell(false);
+-  }
+-
+-  @Test
+-  public void testDSShellWithoutDomainDefaultFlow() throws Exception {
+-    baseTestDSShell(false, true);
+-  }
+-
+-  @Test
+-  public void testDSShellWithoutDomainCustomizedFlow() throws Exception {
+-    baseTestDSShell(false, false);
+-  }
+-
+-  @Override
+-  protected String[] appendFlowArgsForTestDSShell(String[] args,
+-      boolean defaultFlow) {
+-    if (!defaultFlow) {
+-      String[] flowArgs = {
+-          "--flow_name",
+-          "test_flow_name",
+-          "--flow_version",
+-          "test_flow_version",
+-          "--flow_run_id",
+-          "12345678"
+-      };
+-      args = mergeArgs(args, flowArgs);
+-    }
+-    return args;
+-  }
+-
+-  @Override
+-  protected void checkTimeline(ApplicationId appId, boolean defaultFlow,
+-      boolean haveDomain, ApplicationReport appReport) throws Exception {
+-    LOG.info("Started {}#checkTimeline()", getClass().getCanonicalName());
+-    // For PoC check using the file-based timeline writer (YARN-3264)
+-    String tmpRoot = getTimelineV2StorageDir() + File.separator + "entities"
+-        + File.separator;
+-
+-    File tmpRootFolder = new File(tmpRoot);
+-    try {
+-      Assert.assertTrue(tmpRootFolder.isDirectory());
+-      String basePath = tmpRoot +
+-          YarnConfiguration.DEFAULT_RM_CLUSTER_ID + File.separator +
+-          UserGroupInformation.getCurrentUser().getShortUserName() +
+-          (defaultFlow ?
+-              File.separator + appReport.getName() + File.separator +
+-                  TimelineUtils.DEFAULT_FLOW_VERSION + File.separator +
+-                  appReport.getStartTime() + File.separator :
+-              File.separator + "test_flow_name" + File.separator +
+-                  "test_flow_version" + File.separator + "12345678" +
+-                  File.separator) +
+-          appId.toString();
+-      LOG.info("basePath for appId {}: {}", appId, basePath);
+-      // for this test, we expect DS_APP_ATTEMPT AND DS_CONTAINER dirs
+-
+-      // Verify DS_APP_ATTEMPT entities posted by the client
+-      // there will be at least one attempt, look for that file
+-      String appTimestampFileName =
+-          String.format("appattempt_%d_000%d_000001%s",
+-              appId.getClusterTimestamp(), appId.getId(),
+-              FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_EXTENSION);
+-      File dsAppAttemptEntityFile = verifyEntityTypeFileExists(basePath,
+-          "DS_APP_ATTEMPT", appTimestampFileName);
+-      // Check if required events are published and same idprefix is sent for
+-      // on each publish.
+-      verifyEntityForTimeline(dsAppAttemptEntityFile,
+-          DSEvent.DS_APP_ATTEMPT_START.toString(), 1, 1, 0, true);
+-      // to avoid race condition of testcase, at least check 40 times with
+-      // sleep of 50ms
+-      verifyEntityForTimeline(dsAppAttemptEntityFile,
+-          DSEvent.DS_APP_ATTEMPT_END.toString(), 1, 40, 50, true);
+-
+-      // Verify DS_CONTAINER entities posted by the client.
+-      String containerTimestampFileName =
+-          String.format("container_%d_000%d_01_000002.thist",
+-              appId.getClusterTimestamp(), appId.getId());
+-      File dsContainerEntityFile = verifyEntityTypeFileExists(basePath,
+-          "DS_CONTAINER", containerTimestampFileName);
+-      // Check if required events are published and same idprefix is sent for
+-      // on each publish.
+-      verifyEntityForTimeline(dsContainerEntityFile,
+-          DSEvent.DS_CONTAINER_START.toString(), 1, 1, 0, true);
+-      // to avoid race condition of testcase, at least check 40 times with
+-      // sleep of 50ms.
+-      verifyEntityForTimeline(dsContainerEntityFile,
+-          DSEvent.DS_CONTAINER_END.toString(), 1, 40, 50, true);
+-
+-      // Verify NM posting container metrics info.
+-      String containerMetricsTimestampFileName =
+-          String.format("container_%d_000%d_01_000001%s",
+-              appId.getClusterTimestamp(), appId.getId(),
+-              FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_EXTENSION);
+-      File containerEntityFile = verifyEntityTypeFileExists(basePath,
+-          TimelineEntityType.YARN_CONTAINER.toString(),
+-          containerMetricsTimestampFileName);
+-      verifyEntityForTimeline(containerEntityFile,
+-          ContainerMetricsConstants.CREATED_EVENT_TYPE, 1, 1, 0, true);
+-
+-      // to avoid race condition of testcase, at least check 40 times with
+-      // sleep of 50ms
+-      verifyEntityForTimeline(containerEntityFile,
+-          ContainerMetricsConstants.FINISHED_EVENT_TYPE, 1, 40, 50, true);
+-
+-      // Verify RM posting Application life cycle Events are getting published
+-      String appMetricsTimestampFileName =
+-          String.format("application_%d_000%d%s",
+-              appId.getClusterTimestamp(), appId.getId(),
+-              FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_EXTENSION);
+-      File appEntityFile =
+-          verifyEntityTypeFileExists(basePath,
+-              TimelineEntityType.YARN_APPLICATION.toString(),
+-              appMetricsTimestampFileName);
+-      // No need to check idprefix for app.
+-      verifyEntityForTimeline(appEntityFile,
+-          ApplicationMetricsConstants.CREATED_EVENT_TYPE, 1, 1, 0, false);
+-
+-      // to avoid race condition of testcase, at least check 40 times with
+-      // sleep of 50ms
+-      verifyEntityForTimeline(appEntityFile,
+-          ApplicationMetricsConstants.FINISHED_EVENT_TYPE, 1, 40, 50, false);
+-
+-      // Verify RM posting AppAttempt life cycle Events are getting published
+-      String appAttemptMetricsTimestampFileName =
+-          String.format("appattempt_%d_000%d_000001%s",
+-              appId.getClusterTimestamp(), appId.getId(),
+-              FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_EXTENSION);
+-
+-      File appAttemptEntityFile =
+-          verifyEntityTypeFileExists(basePath,
+-              TimelineEntityType.YARN_APPLICATION_ATTEMPT.toString(),
+-              appAttemptMetricsTimestampFileName);
+-      verifyEntityForTimeline(appAttemptEntityFile,
+-          AppAttemptMetricsConstants.REGISTERED_EVENT_TYPE, 1, 1, 0, true);
+-      verifyEntityForTimeline(appAttemptEntityFile,
+-          AppAttemptMetricsConstants.FINISHED_EVENT_TYPE, 1, 1, 0, true);
+-    } finally {
+-      try {
+-        FileUtils.deleteDirectory(tmpRootFolder.getParentFile());
+-      } catch (Exception ex) {
+-        // the recursive delete can throw an exception when one of the file
+-        // does not exist.
+-        LOG.warn("Exception deleting a file/subDirectory: {}", ex.getMessage());
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Checks the events and idprefix published for an entity.
+-   *
+-   * @param entityFile Entity file.
+-   * @param expectedEvent Expected event Id.
+-   * @param numOfExpectedEvent Number of expected occurrences of expected event
+-   *                           id.
+-   * @param checkTimes Number of times to check.
+-   * @param sleepTime Sleep time for each iteration.
+-   * @param checkIdPrefix Whether to check idprefix.
+-   * @throws IOException if entity file reading fails.
+-   * @throws InterruptedException if sleep is interrupted.
+-   */
+-  private void verifyEntityForTimeline(File entityFile, String expectedEvent,
+-      long numOfExpectedEvent, int checkTimes, long sleepTime,
+-      boolean checkIdPrefix) throws Exception  {
+-    AtomicReference<Throwable> thrownExceptionRef = new AtomicReference<>(null);
+-    GenericTestUtils.waitFor(() -> {
+-      String strLine;
+-      long actualCount = 0;
+-      long idPrefix = -1;
+-      try (BufferedReader reader =
+-               new BufferedReader(new FileReader(entityFile))) {
+-        while ((strLine = reader.readLine()) != null) {
+-          String entityLine = strLine.trim();
+-          if (entityLine.isEmpty()) {
+-            continue;
+-          }
+-          if (entityLine.contains(expectedEvent)) {
+-            actualCount++;
+-          }
+-          if (expectedEvent.equals(DSEvent.DS_CONTAINER_END.toString())
+-              && entityLine.contains(expectedEvent)) {
+-            TimelineEntity entity = FileSystemTimelineReaderImpl.
+-                getTimelineRecordFromJSON(entityLine, TimelineEntity.class);
+-            TimelineEvent event = entity.getEvents().pollFirst();
+-            Assert.assertNotNull(event);
+-            Assert.assertTrue("diagnostics",
+-                event.getInfo().containsKey(ApplicationMaster.DIAGNOSTICS));
+-          }
+-          if (checkIdPrefix) {
+-            TimelineEntity entity = FileSystemTimelineReaderImpl.
+-                getTimelineRecordFromJSON(entityLine, TimelineEntity.class);
+-            Assert.assertTrue("Entity ID prefix expected to be > 0",
+-                entity.getIdPrefix() > 0);
+-            if (idPrefix == -1) {
+-              idPrefix = entity.getIdPrefix();
+-            } else {
+-              Assert.assertEquals(
+-                  "Entity ID prefix should be same across each publish of "
+-                      + "same entity", idPrefix, entity.getIdPrefix());
+-            }
+-          }
+-        }
+-      } catch (Throwable e) {
+-        LOG.error("Exception is waiting on application report", e);
+-        thrownExceptionRef.set(e);
+-        return true;
+-      }
+-      return (numOfExpectedEvent == actualCount);
+-    }, sleepTime, (checkTimes + 1) * sleepTime);
+-
+-    if (thrownExceptionRef.get() != null) {
+-      Assert.fail("verifyEntityForTimeline failed "
+-          + thrownExceptionRef.get().getMessage());
+-    }
+-  }
+-
+-  private File verifyEntityTypeFileExists(String basePath, String entityType,
+-      String entityFileName) {
+-    String outputDirPathForEntity =
+-        basePath + File.separator + entityType + File.separator;
+-    LOG.info("verifyEntityTypeFileExists output path for entityType {}: {}",
+-        entityType, outputDirPathForEntity);
+-    File outputDirForEntity = new File(outputDirPathForEntity);
+-    Assert.assertTrue(outputDirForEntity.isDirectory());
+-    String entityFilePath = outputDirPathForEntity + entityFileName;
+-    File entityFile = new File(entityFilePath);
+-    Assert.assertTrue(entityFile.exists());
+-    return entityFile;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSWithMultipleNodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSWithMultipleNodeManager.java
+deleted file mode 100644
+index 19f04237f09..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSWithMultipleNodeManager.java
++++ /dev/null
+@@ -1,503 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.distributedshell;
+-
+-import java.io.IOException;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicReference;
+-
+-import org.junit.After;
+-import org.junit.AfterClass;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.BeforeClass;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.junit.rules.TestName;
+-import org.junit.rules.Timeout;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement.ResourceUsageMultiNodeLookupPolicy;
+-import org.apache.hadoop.yarn.util.resource.DominantResourceCalculator;
+-
+-import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.PREFIX;
+-
+-/**
+- * Test for Distributed Shell With Multiple Node Managers.
+- * Parameter 0 tests with Single Node Placement and
+- * parameter 1 tests with Multiple Node Placement.
+- */
+-@RunWith(value = Parameterized.class)
+-public class TestDSWithMultipleNodeManager {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestDSWithMultipleNodeManager.class);
+-
+-  private static final int NUM_NMS = 2;
+-  private static final String POLICY_CLASS_NAME =
+-      ResourceUsageMultiNodeLookupPolicy.class.getName();
+-  private final Boolean multiNodePlacementEnabled;
+-  @Rule
+-  public TestName name = new TestName();
+-  @Rule
+-  public Timeout globalTimeout =
+-      new Timeout(DistributedShellBaseTest.TEST_TIME_OUT,
+-          TimeUnit.MILLISECONDS);
+-  private DistributedShellBaseTest distShellTest;
+-  private Client dsClient;
+-
+-  public TestDSWithMultipleNodeManager(Boolean multiNodePlacementEnabled) {
+-    this.multiNodePlacementEnabled = multiNodePlacementEnabled;
+-  }
+-
+-  @Parameterized.Parameters
+-  public static Collection<Boolean> getParams() {
+-    return Arrays.asList(false, true);
+-  }
+-
+-  private YarnConfiguration getConfiguration(
+-      boolean multiNodePlacementConfigs) {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    if (multiNodePlacementConfigs) {
+-      conf.set(CapacitySchedulerConfiguration.RESOURCE_CALCULATOR_CLASS,
+-          DominantResourceCalculator.class.getName());
+-      conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
+-          ResourceScheduler.class);
+-      conf.set(CapacitySchedulerConfiguration.MULTI_NODE_SORTING_POLICIES,
+-          "resource-based");
+-      conf.set(CapacitySchedulerConfiguration.MULTI_NODE_SORTING_POLICY_NAME,
+-          "resource-based");
+-      String policyName =
+-          CapacitySchedulerConfiguration.MULTI_NODE_SORTING_POLICY_NAME
+-          + ".resource-based" + ".class";
+-      conf.set(policyName, POLICY_CLASS_NAME);
+-      conf.setBoolean(
+-          CapacitySchedulerConfiguration.MULTI_NODE_PLACEMENT_ENABLED, true);
+-    }
+-    return conf;
+-  }
+-
+-  @BeforeClass
+-  public static void setupUnitTests() throws Exception {
+-    TestDSTimelineV10.setupUnitTests();
+-  }
+-
+-  @AfterClass
+-  public static void tearDownUnitTests() throws Exception {
+-    TestDSTimelineV10.tearDownUnitTests();
+-  }
+-
+-  @Before
+-  public void setup() throws Exception {
+-    distShellTest = new TestDSTimelineV10();
+-    distShellTest.setupInternal(NUM_NMS,
+-        getConfiguration(multiNodePlacementEnabled));
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (dsClient != null) {
+-      dsClient.sendStopSignal();
+-      dsClient = null;
+-    }
+-    if (distShellTest != null) {
+-      distShellTest.tearDown();
+-      distShellTest = null;
+-    }
+-  }
+-
+-  private void initializeNodeLabels() throws IOException {
+-    RMContext rmContext = distShellTest.getResourceManager(0).getRMContext();
+-    // Setup node labels
+-    RMNodeLabelsManager labelsMgr = rmContext.getNodeLabelManager();
+-    Set<String> labels = new HashSet<>();
+-    labels.add("x");
+-    labelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(labels);
+-
+-    // Setup queue access to node labels
+-    distShellTest.setConfiguration(PREFIX + "root.accessible-node-labels", "x");
+-    distShellTest.setConfiguration(
+-        PREFIX + "root.accessible-node-labels.x.capacity", "100");
+-    distShellTest.setConfiguration(
+-        PREFIX + "root.default.accessible-node-labels", "x");
+-    distShellTest.setConfiguration(PREFIX
+-        + "root.default.accessible-node-labels.x.capacity", "100");
+-
+-    rmContext.getScheduler().reinitialize(distShellTest.getConfiguration(),
+-        rmContext);
+-
+-    // Fetch node-ids from yarn cluster
+-    NodeId[] nodeIds = new NodeId[NUM_NMS];
+-    for (int i = 0; i < NUM_NMS; i++) {
+-      NodeManager mgr = distShellTest.getNodeManager(i);
+-      nodeIds[i] = mgr.getNMContext().getNodeId();
+-    }
+-
+-    // Set label x to NM[1]
+-    labelsMgr.addLabelsToNode(ImmutableMap.of(nodeIds[1], labels));
+-  }
+-
+-  @Test
+-  public void testDSShellWithNodeLabelExpression() throws Exception {
+-    NMContainerMonitor containerMonitorRunner = null;
+-    initializeNodeLabels();
+-
+-    try {
+-      // Start NMContainerMonitor
+-      containerMonitorRunner = new NMContainerMonitor();
+-      containerMonitorRunner.start();
+-
+-      // Submit a job which will sleep for 60 sec
+-      String[] args =
+-          DistributedShellBaseTest.createArguments(() -> generateAppName(),
+-              "--num_containers",
+-              "4",
+-              "--shell_command",
+-              "sleep",
+-              "--shell_args",
+-              "15",
+-              "--master_memory",
+-              "512",
+-              "--master_vcores",
+-              "2",
+-              "--container_memory",
+-              "128",
+-              "--container_vcores",
+-              "1",
+-              "--node_label_expression",
+-              "x"
+-          );
+-
+-      LOG.info("Initializing DS Client");
+-      dsClient =
+-          new Client(
+-              new Configuration(distShellTest.getYarnClusterConfiguration()));
+-      Assert.assertTrue(dsClient.init(args));
+-      LOG.info("Running DS Client");
+-      boolean result = dsClient.run();
+-      LOG.info("Client run completed. Result={}", result);
+-
+-      containerMonitorRunner.stopMonitoring();
+-
+-      // Check maximum number of containers on each NMs
+-      int[] maxRunningContainersOnNMs =
+-          containerMonitorRunner.getMaxRunningContainersReport();
+-      // Check no container allocated on NM[0]
+-      Assert.assertEquals(0, maxRunningContainersOnNMs[0]);
+-      // Check there are some containers allocated on NM[1]
+-      Assert.assertTrue(maxRunningContainersOnNMs[1] > 0);
+-    } finally {
+-      if (containerMonitorRunner != null) {
+-        containerMonitorRunner.stopMonitoring();
+-        containerMonitorRunner.join();
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithPlacementConstraint()
+-      throws Exception {
+-    NMContainerMonitor containerMonitorRunner = null;
+-    String[] args =
+-        DistributedShellBaseTest.createArguments(() -> generateAppName(),
+-            "1",
+-            "--shell_command",
+-            DistributedShellBaseTest.getSleepCommand(15),
+-            "--placement_spec",
+-            "zk(1),NOTIN,NODE,zk:spark(1),NOTIN,NODE,zk"
+-        );
+-    try {
+-      containerMonitorRunner = new NMContainerMonitor();
+-      containerMonitorRunner.start();
+-
+-      LOG.info("Initializing DS Client with args {}", Arrays.toString(args));
+-      dsClient =
+-          new Client(
+-              new Configuration(distShellTest.getYarnClusterConfiguration()));
+-      Assert.assertTrue(dsClient.init(args));
+-      LOG.info("Running DS Client");
+-      boolean result = dsClient.run();
+-      LOG.info("Client run completed. Result={}", result);
+-
+-      containerMonitorRunner.stopMonitoring();
+-
+-      ConcurrentMap<ApplicationId, RMApp> apps =
+-          distShellTest.getResourceManager().getRMContext().getRMApps();
+-      RMApp app = apps.values().iterator().next();
+-      RMAppAttempt appAttempt = app.getAppAttempts().values().iterator().next();
+-      NodeId masterNodeId = appAttempt.getMasterContainer().getNodeId();
+-      NodeManager nm1 = distShellTest.getNodeManager(0);
+-
+-      int[] expectedNMsCount = new int[]{1, 1};
+-      if (nm1.getNMContext().getNodeId().equals(masterNodeId)) {
+-        expectedNMsCount[0]++;
+-      } else {
+-        expectedNMsCount[1]++;
+-      }
+-
+-      int[] maxRunningContainersOnNMs =
+-          containerMonitorRunner.getMaxRunningContainersReport();
+-      Assert.assertEquals(expectedNMsCount[0], maxRunningContainersOnNMs[0]);
+-      Assert.assertEquals(expectedNMsCount[1], maxRunningContainersOnNMs[1]);
+-    } finally {
+-      if (containerMonitorRunner != null) {
+-        containerMonitorRunner.stopMonitoring();
+-        containerMonitorRunner.join();
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testDistributedShellWithAllocationTagNamespace()
+-      throws Exception {
+-    NMContainerMonitor containerMonitorRunner = null;
+-    Client clientB = null;
+-    YarnClient yarnClient = null;
+-
+-    String[] argsA =
+-        DistributedShellBaseTest.createArguments(() -> generateAppName("001"),
+-            "--shell_command",
+-            DistributedShellBaseTest.getSleepCommand(30),
+-            "--placement_spec",
+-            "bar(1),notin,node,bar"
+-        );
+-    String[] argsB =
+-        DistributedShellBaseTest.createArguments(() -> generateAppName("002"),
+-            "1",
+-            "--shell_command",
+-            DistributedShellBaseTest.getListCommand(),
+-            "--placement_spec",
+-            "foo(3),notin,node,all/bar"
+-        );
+-
+-    try {
+-      containerMonitorRunner = new NMContainerMonitor();
+-      containerMonitorRunner.start();
+-      dsClient =
+-          new Client(
+-              new Configuration(distShellTest.getYarnClusterConfiguration()));
+-      dsClient.init(argsA);
+-      Thread dsClientRunner = new Thread(() -> {
+-        try {
+-          dsClient.run();
+-        } catch (Exception e) {
+-          throw new RuntimeException(e);
+-        }
+-      });
+-      dsClientRunner.start();
+-
+-      NodeId taskContainerNodeIdA;
+-      ConcurrentMap<ApplicationId, RMApp> apps;
+-      AtomicReference<RMApp> appARef = new AtomicReference<>(null);
+-      AtomicReference<NodeId> masterContainerNodeIdARef =
+-          new AtomicReference<>(null);
+-      int[] expectedNMCounts = new int[]{0, 0};
+-
+-      waitForExpectedNMsCount(expectedNMCounts, appARef,
+-          masterContainerNodeIdARef);
+-
+-      NodeId nodeA = distShellTest.getNodeManager(0).getNMContext().
+-          getNodeId();
+-      NodeId nodeB = distShellTest.getNodeManager(1).getNMContext().
+-          getNodeId();
+-      Assert.assertEquals(2, (expectedNMCounts[0] + expectedNMCounts[1]));
+-      if (expectedNMCounts[0] != expectedNMCounts[1]) {
+-        taskContainerNodeIdA = masterContainerNodeIdARef.get();
+-      } else {
+-        taskContainerNodeIdA =
+-            masterContainerNodeIdARef.get().equals(nodeA) ? nodeB : nodeA;
+-      }
+-
+-      clientB =
+-          new Client(
+-              new Configuration(distShellTest.getYarnClusterConfiguration()));
+-      clientB.init(argsB);
+-      Assert.assertTrue(clientB.run());
+-      containerMonitorRunner.stopMonitoring();
+-      apps = distShellTest.getResourceManager().getRMContext().getRMApps();
+-      Iterator<RMApp> it = apps.values().iterator();
+-      RMApp appB = it.next();
+-      if (appARef.get().equals(appB)) {
+-        appB = it.next();
+-      }
+-      LOG.info("Allocation Tag NameSpace Applications are={} and {}",
+-          appARef.get().getApplicationId(), appB.getApplicationId());
+-
+-      RMAppAttempt appAttemptB =
+-          appB.getAppAttempts().values().iterator().next();
+-      NodeId masterContainerNodeIdB =
+-          appAttemptB.getMasterContainer().getNodeId();
+-
+-      if (nodeA.equals(masterContainerNodeIdB)) {
+-        expectedNMCounts[0]++;
+-      } else {
+-        expectedNMCounts[1]++;
+-      }
+-      if (nodeA.equals(taskContainerNodeIdA)) {
+-        expectedNMCounts[1] += 3;
+-      } else {
+-        expectedNMCounts[0] += 3;
+-      }
+-      int[] maxRunningContainersOnNMs =
+-          containerMonitorRunner.getMaxRunningContainersReport();
+-      Assert.assertEquals(expectedNMCounts[0], maxRunningContainersOnNMs[0]);
+-      Assert.assertEquals(expectedNMCounts[1], maxRunningContainersOnNMs[1]);
+-
+-      try {
+-        yarnClient = YarnClient.createYarnClient();
+-        yarnClient.init(
+-            new Configuration(distShellTest.getYarnClusterConfiguration()));
+-        yarnClient.start();
+-        yarnClient.killApplication(appARef.get().getApplicationId());
+-      } catch (Exception e) {
+-        // Ignore Exception while killing a job
+-        LOG.warn("Exception killing the job: {}", e.getMessage());
+-      }
+-    } finally {
+-      if (yarnClient != null) {
+-        yarnClient.stop();
+-      }
+-      if (clientB != null) {
+-        clientB.sendStopSignal();
+-      }
+-      if (containerMonitorRunner != null) {
+-        containerMonitorRunner.stopMonitoring();
+-        containerMonitorRunner.join();
+-      }
+-    }
+-  }
+-
+-  protected String generateAppName() {
+-    return generateAppName(null);
+-  }
+-
+-  protected String generateAppName(String postFix) {
+-    return name.getMethodName().replaceFirst("test", "")
+-        .concat(postFix == null ? "" : "-" + postFix);
+-  }
+-
+-  private void waitForExpectedNMsCount(int[] expectedNMCounts,
+-      AtomicReference<RMApp> appARef,
+-      AtomicReference<NodeId> masterContainerNodeIdARef) throws Exception {
+-    GenericTestUtils.waitFor(() -> {
+-      if ((expectedNMCounts[0] + expectedNMCounts[1]) < 2) {
+-        expectedNMCounts[0] =
+-            distShellTest.getNodeManager(0).getNMContext()
+-                .getContainers().size();
+-        expectedNMCounts[1] =
+-            distShellTest.getNodeManager(1).getNMContext()
+-                .getContainers().size();
+-        return false;
+-      }
+-      ConcurrentMap<ApplicationId, RMApp> appIDsMap =
+-          distShellTest.getResourceManager().getRMContext().getRMApps();
+-      if (appIDsMap.isEmpty()) {
+-        return false;
+-      }
+-      appARef.set(appIDsMap.values().iterator().next());
+-      if (appARef.get().getAppAttempts().isEmpty()) {
+-        return false;
+-      }
+-      RMAppAttempt appAttemptA =
+-          appARef.get().getAppAttempts().values().iterator().next();
+-      if (appAttemptA.getMasterContainer() == null) {
+-        return false;
+-      }
+-      masterContainerNodeIdARef.set(
+-          appAttemptA.getMasterContainer().getNodeId());
+-      return true;
+-    }, 10, 60000);
+-  }
+-
+-  /**
+-   * Monitor containers running on NMs.
+-   */
+-  class NMContainerMonitor extends Thread {
+-    // The interval of milliseconds of sampling (500ms)
+-    private final static int SAMPLING_INTERVAL_MS = 500;
+-
+-    // The maximum number of containers running on each NMs
+-    private final int[] maxRunningContainersOnNMs = new int[NUM_NMS];
+-    private final Object quitSignal = new Object();
+-    private volatile boolean isRunning = true;
+-
+-    @Override
+-    public void run() {
+-      while (isRunning) {
+-        for (int i = 0; i < NUM_NMS; i++) {
+-          int nContainers =
+-              distShellTest.getNodeManager(i).getNMContext()
+-                  .getContainers().size();
+-          if (nContainers > maxRunningContainersOnNMs[i]) {
+-            maxRunningContainersOnNMs[i] = nContainers;
+-          }
+-        }
+-        synchronized (quitSignal) {
+-          try {
+-            if (!isRunning) {
+-              break;
+-            }
+-            quitSignal.wait(SAMPLING_INTERVAL_MS);
+-          } catch (InterruptedException e) {
+-            LOG.warn("NMContainerMonitor interrupted");
+-            isRunning = false;
+-            break;
+-          }
+-        }
+-      }
+-    }
+-
+-    public int[] getMaxRunningContainersReport() {
+-      return maxRunningContainersOnNMs;
+-    }
+-
+-    public void stopMonitoring() {
+-      if (!isRunning) {
+-        return;
+-      }
+-      synchronized (quitSignal) {
+-        isRunning = false;
+-        quitSignal.notifyAll();
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/a.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/a.txt
+deleted file mode 100644
+index 231a9db3768..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/a.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-#
+-# Sample file for testing
+-
+-aaaaaaaaaaaaaaaaaa
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/b.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/b.txt
+deleted file mode 100644
+index 86464314564..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/b.txt
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-#
+-# Sample file for testing
+-
+-bbbbbbbbbbbbbbbbbbbb
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties
+deleted file mode 100644
+index 81a3f6ad5d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/yarn-site.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index 9660ace4688..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,21 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <!-- Dummy (invalid) config file to be overwriten by TestDistributedShell with MiniCluster configuration. -->
+-</configuration>
+-
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index 2b7285f4989..16b2787393c 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -34,7 +34,6 @@
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+   <modules>
+-    <module>hadoop-yarn-applications-distributedshell</module>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+     <module>hadoop-yarn-applications-mawo</module>
diff --git a/hadoop/stackable/patches/3.4.0/20-remove-hadoop-yarn-applications-mawo.patch b/hadoop/stackable/patches/3.4.0/20-remove-hadoop-yarn-applications-mawo.patch
new file mode 100644
index 000000000..bd946165b
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/20-remove-hadoop-yarn-applications-mawo.patch
@@ -0,0 +1,2674 @@
+Entirely remove hadoop-yarn-applications-mawo
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../dev-support/findbugs-exclude.xml               |   17 -
+ .../dev-support/findbugs-exclude.xml               |   17 -
+ .../hadoop-yarn-applications-mawo-core/pom.xml     |  169 -------
+ .../src/assembly/bin.xml                           |   41 --
+ .../mawo/server/common/AbstractTask.java           |  246 ----------
+ .../mawo/server/common/CompositeTask.java          |   42 --
+ .../applications/mawo/server/common/DieTask.java   |   32 -
+ .../mawo/server/common/MawoConfiguration.java      |  502 --------------------
+ .../applications/mawo/server/common/NullTask.java  |   33 -
+ .../mawo/server/common/SimpleTask.java             |   57 --
+ .../applications/mawo/server/common/Task.java      |   83 ---
+ .../applications/mawo/server/common/TaskId.java    |  149 ------
+ .../mawo/server/common/TaskStatus.java             |  383 ---------------
+ .../applications/mawo/server/common/TaskType.java  |   45 --
+ .../mawo/server/common/TeardownTask.java           |   48 --
+ .../mawo/server/common/WorkAssignmentProtocol.java |   65 ---
+ .../mawo/server/common/package-info.java           |   20 -
+ .../applications/mawo/server/master/job/JobId.java |  128 -----
+ .../mawo/server/master/job/package-info.java       |   20 -
+ .../applications/mawo/server/worker/WorkerId.java  |  168 -------
+ .../mawo/server/worker/package-info.java           |   20 -
+ .../src/main/resources/mawo-default.properties     |   41 --
+ .../mawo/server/common/TestMaWoConfiguration.java  |   62 --
+ .../src/test/resources/mawo.properties             |   28 -
+ .../hadoop-yarn-applications-mawo/pom.xml          |   37 -
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |    1 
+ 26 files changed, 2454 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/assembly/bin.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/AbstractTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/CompositeTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/DieTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/NullTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/SimpleTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/Task.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskId.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskStatus.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TeardownTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/WorkAssignmentProtocol.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/JobId.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/WorkerId.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/resources/mawo-default.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/resources/mawo.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/pom.xml
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index e4e59d93779..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,17 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index e4e59d93779..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,17 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-       http://www.apache.org/licenses/LICENSE-2.0
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
+deleted file mode 100644
+index f53cb2fff8a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
++++ /dev/null
+@@ -1,169 +0,0 @@
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-    http://www.apache.org/licenses/LICENSE-2.0
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-    <parent>
+-        <artifactId>hadoop-yarn-applications-mawo</artifactId>
+-        <groupId>org.apache.hadoop.applications.mawo</groupId>
+-        <version>3.4.0</version>
+-    </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-
+-  <!-- <groupId>org.apache.hadoop.applications.mawo</groupId> -->
+-  <artifactId>hadoop-yarn-applications-mawo-core</artifactId>
+-  <packaging>jar</packaging>
+-
+-  <name>Apache Hadoop YARN Application MaWo Core</name>
+-  <url>https://maven.apache.org</url>
+-
+-  <properties>
+-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-  </properties>
+-
+-  <dependencies>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.google.inject</groupId>
+-      <artifactId>guice</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-framework</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-client</artifactId>
+-    </dependency>
+-
+-      <dependency>
+-          <groupId>org.apache.curator</groupId>
+-          <artifactId>curator-test</artifactId>
+-          <scope>test</scope>
+-      </dependency>
+-
+-    <dependency>
+-      <groupId>commons-io</groupId>
+-      <artifactId>commons-io</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>commons-cli</groupId>
+-      <artifactId>commons-cli</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.zookeeper</groupId>
+-      <artifactId>zookeeper</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>io.dropwizard.metrics</groupId>
+-      <artifactId>metrics-core</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.xerial.snappy</groupId>
+-      <artifactId>snappy-java</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.slf4j</groupId>
+-      <artifactId>slf4j-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.googlecode.json-simple</groupId>
+-      <artifactId>json-simple</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.httpcomponents</groupId>
+-      <artifactId>httpclient</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.httpcomponents</groupId>
+-      <artifactId>httpcore</artifactId>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <pluginManagement>
+-      <plugins>
+-        <plugin>
+-          <groupId>org.apache.maven.plugins</groupId>
+-          <artifactId>maven-assembly-plugin</artifactId>
+-        </plugin>
+-      </plugins>
+-    </pluginManagement>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-assembly-plugin</artifactId>
+-        <configuration>
+-          <descriptors>
+-            <descriptor>src/assembly/bin.xml</descriptor>
+-          </descriptors>
+-          <finalName>hadoop-applications-mawo-core-${project.version}</finalName>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>single</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-              <exclude>target/**/*</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/assembly/bin.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/assembly/bin.xml
+deleted file mode 100644
+index 6f2d9a82dde..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/assembly/bin.xml
++++ /dev/null
+@@ -1,41 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-    http://www.apache.org/licenses/LICENSE-2.0
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<assembly>
+-   <id>bin</id>
+-   <formats>
+-      <format>tar.gz</format>
+-   </formats>
+-   <fileSets>
+-      <fileSet>
+-         <includes>
+-            <include>README*</include>
+-         </includes>
+-      </fileSet>
+-
+-      <!-- Packaging the bin scripts -->
+-      <fileSet>
+-         <directory>src/main/bin</directory>
+-         <outputDirectory>bin</outputDirectory>
+-      </fileSet>
+-
+-      <!-- Package the main artifcats -->
+-      <fileSet>
+-         <directory>target</directory>
+-         <outputDirectory>/</outputDirectory>
+-         <includes>
+-            <include>*.jar</include>
+-         </includes>
+-      </fileSet>
+-
+-   </fileSets>
+-</assembly>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/AbstractTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/AbstractTask.java
+deleted file mode 100644
+index f27c4ee7805..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/AbstractTask.java
++++ /dev/null
+@@ -1,246 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-import org.apache.hadoop.io.IntWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-/**
+- * Abstract class for MaWo Task.
+- */
+-public abstract class AbstractTask implements Task {
+-  /**
+-   * Task identifier.
+-   */
+-  private TaskId taskID = new TaskId();
+-  /**
+-   * Task environment.
+-   */
+-  private Map<String, String> environment = new HashMap<String, String>();
+-  /**
+-   * Command which need to be executed as Task.
+-   */
+-  private String taskCmd;
+-  /**
+-   * Type of task.
+-   */
+-  private TaskType taskType;
+-  /**
+-   * Task timeout.
+-   */
+-  private long timeout;
+-  /**
+-   * logger for abstract class.
+-   */
+-  static final Logger LOG = LoggerFactory.getLogger(AbstractTask.class);
+-
+-  /**
+-   * AbstractTask constructor.
+-   */
+-  public AbstractTask() {
+-  }
+-
+-  /**
+-   * AbstrackTask constructor.
+-   * @param taskId : Task identifier
+-   * @param localenvironment : Task environment vars
+-   * @param taskCMD : Cmd to run
+-   * @param localtimeout : Task timeout in seconds
+-   */
+-
+-  public AbstractTask(final TaskId taskId,
+-      final Map<String, String> localenvironment,
+-      final String taskCMD, final long localtimeout) {
+-    this();
+-    setTaskId(taskId);
+-    setEnvironment(localenvironment);
+-    setTaskCmd(taskCMD);
+-    setTimeout(localtimeout);
+-    LOG.info("Created Task - type: " + this.taskType + ", TaskId: "
+-        + this.taskID.toString() + ", cmd: '" + taskCMD + "' Timeout: "
+-        + timeout);
+-  }
+-
+-  /**
+-   * Get environment for a Task.
+-   * @return environment of a Task
+-   */
+-  @Override
+-  public final Map<String, String> getEnvironment() {
+-    return environment;
+-  }
+-
+-  /**
+-   * Set environment for a Task.
+-   * @param localenvironment : Map of environment vars
+-   */
+-  @Override
+-  public final void setEnvironment(final Map<String, String> localenvironment) {
+-    this.environment = localenvironment;
+-  }
+-
+-  /**
+-   * Get TaskCmd for a Task.
+-   * @return TaskCMD: Its a task command line such as sleep 10
+-   */
+-  @Override
+-  public final String getTaskCmd() {
+-    return taskCmd;
+-  }
+-
+-  /**
+-   * Set TaskCmd for a Task.
+-   * @param taskCMD : Task command line
+-   */
+-  @Override
+-  public final void setTaskCmd(final String taskCMD) {
+-    this.taskCmd = taskCMD;
+-  }
+-
+-  /**
+-   * Get TaskId for a Task.
+-   * @return TaskID: Task command line
+-   */
+-  @Override
+-  public final TaskId getTaskId() {
+-    return taskID;
+-  }
+-
+-  /**
+-   * Set Task Id.
+-   * @param taskId : Task Identifier
+-   */
+-  @Override
+-  public final void setTaskId(final TaskId taskId) {
+-    if (taskId != null) {
+-      this.taskID = taskId;
+-    }
+-  }
+-
+-  /**
+-   * Get TaskType for a Task.
+-   * @return TaskType: Type of Task
+-   */
+-  @Override
+-  public final TaskType getTaskType() {
+-    return taskType;
+-  }
+-
+-  /**
+-   * Set TaskType for a Task.
+-   * @param type Simple or Composite Task
+-   */
+-  public final void setTaskType(final TaskType type) {
+-    this.taskType = type;
+-  }
+-
+-  /**
+-   * Get Timeout for a Task.
+-   * @return timeout in seconds
+-   */
+-  @Override
+-  public final long getTimeout() {
+-    return this.timeout;
+-  }
+-
+-  /**
+-   * Set Task Timeout in seconds.
+-   * @param taskTimeout : Timeout in seconds
+-   */
+-  @Override
+-  public final void setTimeout(final long taskTimeout) {
+-    this.timeout = taskTimeout;
+-  }
+-
+-  /**
+-   * Write Task.
+-   * @param out : dataoutout object.
+-   * @throws IOException : Throws IO exception if any error occurs.
+-   */
+-  @Override
+-  public final void write(final DataOutput out) throws IOException {
+-    taskID.write(out);
+-    int environmentSize = 0;
+-    if (environment == null) {
+-      environmentSize = 0;
+-    } else {
+-      environmentSize = environment.size();
+-    }
+-    new IntWritable(environmentSize).write(out);
+-    if (environmentSize != 0) {
+-      for (Entry<String, String> envEntry : environment.entrySet()) {
+-        new Text(envEntry.getKey()).write(out);
+-        new Text(envEntry.getValue()).write(out);
+-      }
+-    }
+-    Text taskCmdText;
+-    if (taskCmd == null) {
+-      taskCmdText = new Text("");
+-    } else {
+-      taskCmdText = new Text(taskCmd);
+-    }
+-    taskCmdText.write(out);
+-    WritableUtils.writeEnum(out, taskType);
+-    WritableUtils.writeVLong(out, timeout);
+-  }
+-
+-  /**
+-   * Read Fields from file.
+-   * @param in : datainput object.
+-   * @throws IOException : Throws IOException in case of error.
+-   */
+-  @Override
+-  public final void readFields(final DataInput in) throws IOException {
+-    this.taskID = new TaskId();
+-    taskID.readFields(in);
+-    IntWritable envSize = new IntWritable(0);
+-    envSize.readFields(in);
+-    for (int i = 0; i < envSize.get(); i++) {
+-      Text key = new Text();
+-      Text value = new Text();
+-      key.readFields(in);
+-      value.readFields(in);
+-      environment.put(key.toString(), value.toString());
+-    }
+-    Text taskCmdText = new Text();
+-    taskCmdText.readFields(in);
+-    taskCmd = taskCmdText.toString();
+-    taskType = WritableUtils.readEnum(in, TaskType.class);
+-    timeout = WritableUtils.readVLong(in);
+-  }
+-
+-  /**
+-   * ToString.
+-   * @return String representation of Task
+-   */
+-  @Override
+-  public final String toString() {
+-    return "TaskId: " + this.taskID.toString() + ", TaskType: " + this.taskType
+-        + ", cmd: '" + taskCmd + "'";
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/CompositeTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/CompositeTask.java
+deleted file mode 100644
+index 05c17f8743c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/CompositeTask.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-/**
+- * Composite Task is Task with multiple commands.
+- */
+-public class CompositeTask extends AbstractTask {
+-  /**
+-   * Composite Task initializer.
+-   */
+-  public CompositeTask() {
+-    super();
+-    setTaskType(TaskType.COMPOSITE);
+-  }
+-
+-  /**
+-   * Composite initializer for specific task.
+-   * @param task : Task object
+-   */
+-  public CompositeTask(final Task task) {
+-    super(task.getTaskId(), task.getEnvironment(), task.getTaskCmd(),
+-        task.getTimeout());
+-    this.setTaskType(TaskType.COMPOSITE);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/DieTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/DieTask.java
+deleted file mode 100644
+index 6ac778fe703..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/DieTask.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-/**
+- * Die Task is a type of task which indicates app to die.
+- */
+-public class DieTask extends AbstractTask {
+-  /**
+-   * Die Task constructor.
+-   */
+-  public DieTask() {
+-    super();
+-    setTaskType(TaskType.DIE);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java
+deleted file mode 100644
+index a019913ccde..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/MawoConfiguration.java
++++ /dev/null
+@@ -1,502 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Properties;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import com.google.inject.Singleton;
+-
+-/**
+- * MaWo configuration class.
+- */
+-@Singleton
+-public final class MawoConfiguration {
+-  /**
+-   * logger initialization for mawo config class.
+-   */
+-  static final Logger LOG = LoggerFactory.getLogger(MawoConfiguration.class);
+-  /**
+-   * Define comma separator.
+-   */
+-  static final String COMMA_SPLITTER = ",";
+-  /**
+-   * MaWo config file name.
+-   */
+-  public static final String CONFIG_FILE = "mawo.properties";
+-
+-  /**
+-   * RPC server hostname.
+-   */
+-  private static final String RPC_SERVER_HOSTNAME = "rpc.server.hostname";
+-  /**
+-   * RPC server port.
+-   */
+-  private static final String RPC_SERVER_PORT = "rpc.server.port";
+-
+-  // Default values
+-  /**
+-   * RPC server hostname default value.
+-   */
+-  private static final String RPC_SERVER_HOSTNAME_DEFAULT = "localhost";
+-  /**
+-   * RPC server port default value.
+-   */
+-  private static final String RPC_SERVER_PORT_DEFAULT = "5121";
+-
+-  // Curator related Configurations
+-  /**
+-   * Config to check id Job Queue Storage is enabled.
+-   */
+-  private static final String JOB_QUEUE_STORAGE_ENABLED =
+-      "mawo.job-queue-storage.enabled";
+-
+-  /**
+-   * ZooKeeper property prefix.
+-   */
+-  private static final String ZK_PREFIX = "zookeeper.";
+-  /**
+-   * Property for ZooKeeper address.
+-   */
+-  private static final String ZK_ADDRESS = ZK_PREFIX + "address";
+-  /**
+-   * Default value for ZooKeeper address.
+-   */
+-  private static final String ZK_ADDRESS_DEFAULT = "localhost:2181";
+-
+-  /**
+-   * Property for ZooKeeper parent path.
+-   */
+-  private static final String ZK_PARENT_PATH = ZK_PREFIX + "parent.path";
+-  /**
+-   * Property for ZooKeeper parent path default value.
+-   */
+-  private static final String ZK_PARENT_PATH_DEFAULT = "/mawoRoot";
+-
+-  /**
+-   * Property for ZooKeeper retry interval.
+-   */
+-  private static final String ZK_RETRY_INTERVAL_MS =
+-      ZK_PREFIX + "retry.interval.ms";
+-  /**
+-   * Default value for ZooKeeper retry interval.
+-   */
+-  private static final String ZK_RETRY_INTERVAL_MS_DEFAULT = "1000";
+-
+-  /**
+-   * Property for Zookeeper session timeout.
+-   */
+-  private static final String ZK_SESSION_TIMEOUT_MS =
+-      ZK_PREFIX + "session.timeout.ms";
+-  /**
+-   * Default value for ZooKeeper session timeout.
+-   */
+-  private static final String ZK_SESSION_TIMEOUT_MS_DEFAULT = "10000";
+-
+-  /**
+-   * Property for ZooKeeper retry number.
+-   */
+-  private static final String ZK_RETRIES_NUM = ZK_PREFIX + "retries.num";
+-  /**
+-   * Default value for ZooKeeper retry number.
+-   */
+-  private static final String ZK_RETRIES_NUM_DEFAULT = "1000";
+-
+-  /**
+-   * Property for ZooKeeper acl.
+-   */
+-  private static final String ZK_ACL = ZK_PREFIX + "acl";
+-  /**
+-   * Default value for ZooKeeper acl.
+-   */
+-  private static final String ZK_ACL_DEFAULT = "world:anyone:rwcda";
+-
+-  /**
+-   * Property for setting num of workers.
+-   */
+-  private static final String WORKER_NUM_TASKS = "worker.num.tasks";
+-  /**
+-   * Default value for num of workers.
+-   */
+-  private static final String WORKER_NUM_TASKS_DEFAULT = "10";
+-
+-  /**
+-   * Property for setting job builder class.
+-   */
+-  public static final String JOB_BUILDER_CLASS = "mawo.job-builder.class";
+-  /**
+-   * Default value for job builder class = simpleTaskJobBuilder.
+-   */
+-  private static final String JOB_BUILDER_CLASS_DEFAULT =
+-      "org.apache.hadoop.applications.mawo.server.master.job."
+-          + "SimpleTaskJobBuilder";
+-
+-  /**
+-   * Property for setting worker workspace.
+-   */
+-  private static final String WORKER_WORK_SPACE = "worker.workspace";
+-  /**
+-   * Default value for worker workspace.
+-   */
+-  private static final String WORKER_WORK_SPACE_DEFAULT = "/tmp";
+-
+-  /**
+-   * Property for resource manager url.
+-   */
+-  public static final String CLUSTER_MANAGER_URL = "ycloud.url";
+-  /**
+-   * Default value for resource manager url.
+-   */
+-  private static final String DEFAULT_CLUSTER_MANAGER_URL = "0.0.0.0:9191";
+-
+-  /**
+-   * Property for setting auto shutdown for worker.
+-   */
+-  public static final String AUTO_SHUTDOWN_WORKERS =
+-      "mawo.master.auto-shutdown-workers";
+-  /**
+-   * Set auto shutdown of workers to False by default.
+-   */
+-  private static final boolean DEFAULT_AUTO_SHUTDOWN_WORKERS = false;
+-
+-  /**
+-   * Property for task status log path in master node.
+-   */
+-  public static final String MASTER_TASKS_STATUS_LOG_PATH
+-      = "master.tasks-status.log.path";
+-  /**
+-   * Default value for task status log path.
+-   */
+-  private static final String MASTER_TASKS_STATUS_LOG_PATH_DEFAULT = "/tmp";
+-
+-  /**
+-   * Property for drain event timeout.
+-   */
+-  private static final String MASTER_DRAIN_EVENTS_TIMEOUT =
+-      "master.drain-events.timeout";
+-  /**
+-   * Default value for drain event timeout.
+-   */
+-  private static final long MASTER_DRAIN_EVENTS_TIMEOUT_DEFAULT = 60000;
+-
+-  /**
+-   * Property for worker white list env.
+-   * This environment variables will be set for all tasks.
+-   */
+-  private static final String WORKER_WHITELIST_ENV = "worker.whitelist.env";
+-  /**
+-   * Default value for worker white list env.
+-   */
+-  private static final String WORKER_WHITELIST_ENV_DEFAULT = "";
+-
+-  /**
+-   * Property for teardown worker validity.
+-   */
+-  private static final String MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS =
+-      "master.teardown-worker.validity-interval.ms";
+-  /**
+-   * Default value for teardown worker validity.
+-   */
+-  private static final String
+-      MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS_DEFAULT = "120000";
+-
+-  /**
+-   * Map of MaWo Configs.
+-   */
+-  private Map<String, String> configsMap;
+-
+-  /**
+-   * Mowo configuration initializer.
+-   */
+-  public MawoConfiguration() {
+-    this(readConfigFile());
+-  }
+-
+-  /**
+-   * Set up MaWo properties.
+-   * @param properties : Map of properties
+-   */
+-  private MawoConfiguration(final Properties properties) {
+-
+-    configsMap = new HashMap<String, String>();
+-
+-    configsMap.put(RPC_SERVER_HOSTNAME, properties
+-        .getProperty(RPC_SERVER_HOSTNAME, RPC_SERVER_HOSTNAME_DEFAULT));
+-    configsMap.put(RPC_SERVER_PORT,
+-        properties.getProperty(RPC_SERVER_PORT, RPC_SERVER_PORT_DEFAULT));
+-
+-    configsMap.put(ZK_ADDRESS,
+-        properties.getProperty(ZK_ADDRESS, ZK_ADDRESS_DEFAULT));
+-    configsMap.put(ZK_PARENT_PATH,
+-        properties.getProperty(ZK_PARENT_PATH, ZK_PARENT_PATH_DEFAULT));
+-    configsMap.put(ZK_RETRY_INTERVAL_MS, properties
+-        .getProperty(ZK_RETRY_INTERVAL_MS, ZK_RETRY_INTERVAL_MS_DEFAULT));
+-    configsMap.put(ZK_SESSION_TIMEOUT_MS, properties
+-        .getProperty(ZK_SESSION_TIMEOUT_MS, ZK_SESSION_TIMEOUT_MS_DEFAULT));
+-    configsMap.put(ZK_RETRIES_NUM,
+-        properties.getProperty(ZK_RETRIES_NUM, ZK_RETRIES_NUM_DEFAULT));
+-    configsMap.put(ZK_ACL, properties.getProperty(ZK_ACL, ZK_ACL_DEFAULT));
+-
+-    configsMap.put(JOB_BUILDER_CLASS,
+-        properties.getProperty(JOB_BUILDER_CLASS, JOB_BUILDER_CLASS_DEFAULT));
+-
+-    configsMap.put(JOB_QUEUE_STORAGE_ENABLED,
+-        properties.getProperty(JOB_QUEUE_STORAGE_ENABLED, "false"));
+-
+-    configsMap.put(CLUSTER_MANAGER_URL, properties
+-        .getProperty(CLUSTER_MANAGER_URL, DEFAULT_CLUSTER_MANAGER_URL));
+-
+-    configsMap.put(WORKER_NUM_TASKS,
+-        properties.getProperty(WORKER_NUM_TASKS, WORKER_NUM_TASKS_DEFAULT));
+-
+-    configsMap.put(WORKER_WORK_SPACE,
+-        properties.getProperty(WORKER_WORK_SPACE, WORKER_WORK_SPACE_DEFAULT));
+-
+-    configsMap.put(AUTO_SHUTDOWN_WORKERS, properties.getProperty(
+-        AUTO_SHUTDOWN_WORKERS, String.valueOf(DEFAULT_AUTO_SHUTDOWN_WORKERS)));
+-
+-    configsMap.put(MASTER_TASKS_STATUS_LOG_PATH, properties.getProperty(
+-        MASTER_TASKS_STATUS_LOG_PATH,
+-        String.valueOf(MASTER_TASKS_STATUS_LOG_PATH_DEFAULT)));
+-
+-    configsMap.put(MASTER_DRAIN_EVENTS_TIMEOUT,
+-        properties.getProperty(MASTER_DRAIN_EVENTS_TIMEOUT,
+-        String.valueOf(MASTER_DRAIN_EVENTS_TIMEOUT_DEFAULT)));
+-
+-    configsMap.put(WORKER_WHITELIST_ENV, properties.getProperty(
+-        WORKER_WHITELIST_ENV, WORKER_WHITELIST_ENV_DEFAULT));
+-
+-    configsMap.put(MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS,
+-        properties.getProperty(MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS,
+-            MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS_DEFAULT));
+-
+-  }
+-
+-  /**
+-   * Get MaWo config map.
+-   * @return the config map for MaWo properties
+-   */
+-
+-  public Map<String, String> getConfigsMap() {
+-    return configsMap;
+-  }
+-
+-  /**
+-   * Find, read, and parse the configuration file.
+-   *
+-   * @return the properties that were found or empty if no file was found
+-   */
+-  private static Properties readConfigFile() {
+-    Properties properties = new Properties();
+-
+-    // Get property file stream from classpath
+-    LOG.info("Configuration file being loaded: " + CONFIG_FILE
+-        + ". Found in classpath at "
+-        + MawoConfiguration.class.getClassLoader().getResource(CONFIG_FILE));
+-    InputStream inputStream = MawoConfiguration.class.getClassLoader()
+-        .getResourceAsStream(CONFIG_FILE);
+-
+-    if (inputStream == null) {
+-      throw new RuntimeException(CONFIG_FILE + " not found in classpath");
+-    }
+-
+-    // load the properties
+-    try {
+-      properties.load(inputStream);
+-      inputStream.close();
+-    } catch (FileNotFoundException fnf) {
+-      LOG.error(
+-          "No configuration file " + CONFIG_FILE + " found in classpath.");
+-    } catch (IOException ie) {
+-      throw new IllegalArgumentException(
+-          "Can't read configuration file " + CONFIG_FILE, ie);
+-    }
+-
+-    return properties;
+-  }
+-
+-  /**
+-   * Get MaWo RPC server Port.
+-   * @return value of rpc.server.port
+-   */
+-  public int getRpcServerPort() {
+-    return Integer.parseInt(configsMap.get(RPC_SERVER_PORT));
+-  }
+-
+-  /**
+-   * Get RPC Host map.
+-   * @return value of rpc.server.hostname
+-   */
+-  public String getRpcHostName() {
+-    return configsMap.get(RPC_SERVER_HOSTNAME);
+-  }
+-
+-  /**
+-   * Check if Job Queue Storage is Enabled.
+-   * @return True if Job queue storage is enabled otherwise False
+-   */
+-  public boolean getJobQueueStorageEnabled() {
+-    return Boolean.parseBoolean(configsMap.get(JOB_QUEUE_STORAGE_ENABLED));
+-  }
+-
+-  /**
+-   * Get ZooKeeper Address.
+-   * @return value of ZooKeeper.address
+-   */
+-  public String getZKAddress() {
+-    return configsMap.get(ZK_ADDRESS);
+-  }
+-
+-  /**
+-   * Get ZooKeeper parent Path.
+-   * @return value of ZooKeeper.parent.path
+-   */
+-  public String getZKParentPath() {
+-    return configsMap.get(ZK_PARENT_PATH);
+-  }
+-
+-  /**
+-   * Get ZooKeeper retry interval value in milli seconds.
+-   * @return value of ZooKeeper.retry.interval.ms
+-   */
+-  public int getZKRetryIntervalMS() {
+-    return Integer.parseInt(configsMap.get(ZK_RETRY_INTERVAL_MS));
+-  }
+-
+-  /**
+-   * Get ZooKeeper session timeout in milli seconds.
+-   * @return value of ZooKeeper.session.timeout.ms
+-   */
+-  public int getZKSessionTimeoutMS() {
+-    return Integer.parseInt(configsMap.get(ZK_SESSION_TIMEOUT_MS));
+-  }
+-
+-  /**
+-   * Get ZooKeeper retries number.
+-   * @return value of ZooKeeper.retries.num
+-   */
+-  public int getZKRetriesNum() {
+-    return Integer.parseInt(configsMap.get(ZK_RETRIES_NUM));
+-  }
+-
+-  /**
+-   * Get ZooKeeper Acls.
+-   * @return value of ZooKeeper.acl
+-   */
+-  public String getZKAcl() {
+-    return configsMap.get(ZK_ACL);
+-  }
+-
+-  /**
+-   * Get number of tasks a worker can run in parallel.
+-   * @return value of worker.num.tasks
+-   */
+-  public int getWorkerConcurrentTasksLimit() {
+-    return Integer.parseInt(configsMap.get(WORKER_NUM_TASKS));
+-  }
+-
+-  /**
+-   * Get job builder class.
+-   * @return value of mawo.job-builder.class
+-   */
+-  public String getJobBuilderClass() {
+-    return configsMap.get(JOB_BUILDER_CLASS);
+-  }
+-
+-  /**
+-   * Get worker work space.
+-   * @return value of worker.workspace
+-   */
+-  public String getWorkerWorkSpace() {
+-    return configsMap.get(WORKER_WORK_SPACE);
+-  }
+-
+-  /**
+-   * Get cluster manager URL.
+-   * @return value of ycloud.url
+-   */
+-  public String getClusterManagerURL() {
+-    return configsMap.get(CLUSTER_MANAGER_URL);
+-  }
+-
+-  /**
+-   * Check if worker auto shutdown feature is enabled.
+-   * @return value of mawo.master.auto-shutdown-workers
+-   */
+-  public boolean getAutoShutdownWorkers() {
+-    return Boolean.parseBoolean(configsMap.get(AUTO_SHUTDOWN_WORKERS));
+-  }
+-
+-  /**
+-   * Get Task status log file path on master host.
+-   * @return value of master.tasks-status.log.path
+-   */
+-  public String getMasterTasksStatusLogPath() {
+-    return configsMap.get(MASTER_TASKS_STATUS_LOG_PATH);
+-  }
+-
+-  /**
+-   * Get Master drain event timeout.
+-   * @return value of master.drain-events.timeout
+-   */
+-  public long getMasterDrainEventsTimeout() {
+-    return Long.parseLong(configsMap.get(MASTER_DRAIN_EVENTS_TIMEOUT));
+-  }
+-
+-  /**
+-   * Get Worker whitelist env params.
+-   * These params will be set in all tasks.
+-   * @return list of white list environment
+-   */
+-  public List<String> getWorkerWhiteListEnv() {
+-    List<String> whiteList = new ArrayList<String>();
+-    String env = configsMap.get(WORKER_WHITELIST_ENV);
+-    if (env != null && !env.isEmpty()) {
+-      String[] variables = env.split(COMMA_SPLITTER);
+-      for (String variable : variables) {
+-        variable = variable.trim();
+-        if (variable.startsWith("$")) {
+-          variable = variable.substring(1);
+-        }
+-        if (!variable.isEmpty()) {
+-          whiteList.add(variable);
+-        }
+-      }
+-    }
+-    return whiteList;
+-  }
+-
+-  /**
+-   * Get Teardown worker validity interval.
+-   * @return value of master.teardown-worker.validity-interval.ms
+-   */
+-  public long getTeardownWorkerValidityInterval() {
+-    return Long.parseLong(configsMap.get(
+-        MASTER_TEARDOWN_WORKER_VALIDITY_INTERVAL_MS));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/NullTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/NullTask.java
+deleted file mode 100644
+index c9349131083..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/NullTask.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-/**
+- * Define Null Task.
+- */
+-public class NullTask extends AbstractTask {
+-
+-  /**
+-   * Null Task initializer.
+-   */
+-  public NullTask() {
+-    super();
+-    this.setTaskType(TaskType.NULL);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/SimpleTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/SimpleTask.java
+deleted file mode 100644
+index 1dd87a67bce..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/SimpleTask.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.util.Map;
+-
+-/**
+- * Define Simple Task.
+- * Each Task has only one command
+- */
+-public class SimpleTask extends AbstractTask {
+-  /**
+-   * Simple Task default initializer.
+-   */
+-  public SimpleTask() {
+-    super();
+-    this.setTaskType(TaskType.SIMPLE);
+-  }
+-
+-  /**
+-   * Set up Simple Task with Task object.
+-   * @param task : Task object
+-   */
+-  public SimpleTask(final Task task) {
+-    this(task.getTaskId(), task.getEnvironment(), task.getTaskCmd(),
+-        task.getTimeout());
+-  }
+-
+-  /**
+-   * Create Simple Task with Task details.
+-   * @param taskId : task identifier
+-   * @param environment : task environment
+-   * @param taskCMD : task command
+-   * @param timeout : task timeout
+-   */
+-  public SimpleTask(final TaskId taskId, final Map<String, String> environment,
+-      final String taskCMD, final long timeout) {
+-    super(taskId, environment, taskCMD, timeout);
+-    this.setTaskType(TaskType.SIMPLE);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/Task.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/Task.java
+deleted file mode 100644
+index e6b42ac9c35..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/Task.java
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.util.Map;
+-
+-import org.apache.hadoop.io.Writable;
+-
+-/**
+- * Define Task Interface.
+- */
+-public interface Task extends Writable {
+-
+-  /**
+-   * Get TaskId of a Task.
+-   * @return value of TaskId
+-   */
+-  TaskId getTaskId();
+-
+-  /**
+-   * Get Environment of Task.
+-   * @return map of environment
+-   */
+-  Map<String, String> getEnvironment();
+-
+-  /**
+-   * Get Task cmd.
+-   * @return value of Task cmd such "sleep 1"
+-   */
+-  String getTaskCmd();
+-
+-  /**
+-   * Get Task type such as Simple, Composite.
+-   * @return value of TaskType
+-   */
+-  TaskType getTaskType();
+-
+-  /**
+-   * Set TaskId.
+-   * @param taskId : Task identifier
+-   */
+-  void setTaskId(TaskId taskId);
+-
+-  /**
+-   * Set Task environment such as {"HOME":"/user/A"}.
+-   * @param environment : Map of environment variables
+-   */
+-  void setEnvironment(Map<String, String> environment);
+-
+-  /**
+-   * Set Task command.
+-   * @param taskCMD : Task command to be executed
+-   */
+-  void setTaskCmd(String taskCMD);
+-
+-  /**
+-   * Get Task Timeout in seconds.
+-   * @return value of TaskTimeout
+-   */
+-  long getTimeout();
+-
+-  /**
+-   * Set Task Timeout.
+-   * @param timeout : value of Task Timeout
+-   */
+-  void setTimeout(long timeout);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskId.java
+deleted file mode 100644
+index 19f8cbed904..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskId.java
++++ /dev/null
+@@ -1,149 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.hadoop.applications.mawo.server.master.job.JobId;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-
+-/**
+- * Defines TaskId for MaWo app.
+- */
+-public class TaskId implements Writable {
+-
+-  /**
+-   * MaWo TaskIds prefix.
+-   */
+-  static final String TASK_ID_PREFIX = "mawo_task_";
+-
+-  /**
+-   * MaWo Job ID.
+-   */
+-  private JobId jobId = new JobId();
+-  /**
+-   * Mawo TaskId.
+-   */
+-  private long taskId;
+-
+-  /**
+-   * TaskId constructor.
+-   */
+-  public TaskId() {
+-  }
+-
+-  /**
+-   * TaskId constructor with jobId and taskId.
+-   * @param localjobId : Job identifier
+-   * @param id : Task identifier
+-   */
+-  public TaskId(final JobId localjobId, final int id) {
+-    this.jobId = localjobId;
+-    this.taskId = id;
+-  }
+-
+-  /**
+-   * Getter method for jobId.
+-   * @return JobID: Job identifier
+-   */
+-  public final int getJobId() {
+-    return jobId.getID();
+-  }
+-
+-  /**
+-   * Getter method for TaskID.
+-   * @return TaskId: Task identifier
+-   */
+-  public final long getId() {
+-    return taskId;
+-  }
+-
+-  /**
+-   * Print method for TaskId.
+-   * @return : Full TaskId which is TaskId_prefix + jobId + _ + TaskId
+-   */
+-  public final String toString() {
+-    return TASK_ID_PREFIX + jobId.getID() + "_" + taskId;
+-  }
+-
+-  @Override
+-  /**
+-   * Hashcode method for TaskId.
+-   */
+-  public final int hashCode() {
+-    final int prime = 31;
+-    final int bits = 32;
+-    int result = 1;
+-    int jobHash = 0;
+-    if (jobId == null) {
+-      jobHash = 0;
+-    } else {
+-      jobHash = jobId.hashCode();
+-    }
+-    result = prime * result + jobHash;
+-    result = prime * result + (int) (taskId ^ (taskId >>> bits));
+-    return result;
+-  }
+-
+-  @Override
+-  /**
+-   * Equal method override for TaskId.
+-   */
+-  public final boolean equals(final Object obj) {
+-    if (this == obj) {
+-      return true;
+-    }
+-    if (obj == null) {
+-      return false;
+-    }
+-    if (getClass() != obj.getClass()) {
+-      return false;
+-    }
+-
+-    TaskId other = (TaskId) obj;
+-    if (jobId == null) {
+-      if (other.jobId != null) {
+-        return false;
+-      }
+-    } else if (!jobId.equals(other.jobId)) {
+-      return false;
+-    }
+-    if (taskId != other.taskId) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  /** {@inheritDoc} */
+-  public final void write(final DataOutput out) throws IOException {
+-    jobId.write(out);
+-    WritableUtils.writeVLong(out, taskId);
+-  }
+-
+-  /** {@inheritDoc} */
+-  public final void readFields(final DataInput in) throws IOException {
+-    jobId = new JobId();
+-    jobId.readFields(in);
+-    this.taskId = WritableUtils.readVLong(in);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskStatus.java
+deleted file mode 100644
+index 3529077d875..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskStatus.java
++++ /dev/null
+@@ -1,383 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-
+-import org.apache.commons.lang3.builder.HashCodeBuilder;
+-import org.apache.hadoop.applications.mawo.server.worker.WorkerId;
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Defines TaskStatus for MaWo app.
+- */
+-public class TaskStatus implements Writable, Cloneable {
+-
+-  /**
+-   * Set logger.
+-   */
+-  private static final Logger LOG = LoggerFactory.getLogger(TaskStatus.class);
+-
+-  /**
+-   * TaskId is a unique task identifier.
+-   */
+-  private TaskId taskId = new TaskId();
+-  /**
+-   * epoch time for a task starttime.
+-   */
+-  private long startTime;
+-  /**
+-   * epoch time for a task endtime.
+-   */
+-  private long endTime;
+-  /**
+-   * Unique worker identifier.
+-   */
+-  private WorkerId workerId = new WorkerId();
+-  /**
+-   * Task exit code.
+-   */
+-  private int exitCode = -1;
+-  /**
+-   * Task cmd.
+-   */
+-  private String taskCMD;
+-  /**
+-   * Task type.
+-   */
+-  private String taskType;
+-
+-  /**
+-   * Possible Task States.
+-   */
+-  public enum State {
+-    /**
+-     * INIT State refers to Task initialization.
+-     */
+-    INIT,
+-    /**
+-     * RUNNING State refers to Task in Running state.
+-     */
+-
+-    RUNNING,
+-    /**
+-     * SUCCEEDED State is assigned when task finishes successfully.
+-     */
+-    SUCCEEDED,
+-    /**
+-     * FAILED State is assigned when task fails.
+-     */
+-    FAILED,
+-    /**
+-     * KILLED State refers to when a task is killed.
+-     */
+-    KILLED,
+-    /**
+-     * EXPIRE State refers to when a task is expired.
+-     */
+-    EXPIRE
+-  }
+-
+-  /**
+-   * Current Task state.
+-   */
+-  private volatile State runState;
+-
+-  /**
+-   * Task status constructor.
+-   */
+-  public TaskStatus() {
+-  }
+-
+-  /**
+-   * Task status constructor with workerId, TaskId, TaskCmd, TaskType.
+-   * @param localworkerId : Worker ID
+-   * @param localtaskId : Task ID
+-   * @param localtaskCMD : Task command line
+-   * @param localtaskType : Type of Task
+-   */
+-  public TaskStatus(final WorkerId localworkerId, final TaskId localtaskId,
+-                    final String localtaskCMD, final String localtaskType) {
+-    this(localworkerId, localtaskId,
+-        TaskStatus.State.INIT, localtaskCMD,
+-        localtaskType);
+-  }
+-
+-  /**
+-   * Task status constructor with workerId, TaskId,
+-   * TaskCmd, TaskType and Run State.
+-   * @param localworkerId : Worker Id
+-   * @param localtaskId : Task Id
+-   * @param localrunState : Task run State
+-   * @param localtaskCMD : Task cmd
+-   * @param localtaskType : Task type
+-   */
+-  public TaskStatus(final WorkerId localworkerId, final TaskId localtaskId,
+-      final State localrunState, final String localtaskCMD,
+-      final String localtaskType) {
+-    setWorkerId(localworkerId);
+-    setTaskId(localtaskId);
+-    setRunState(localrunState);
+-    setTaskCMD(localtaskCMD);
+-    setTaskType(localtaskType);
+-  }
+-
+-  /**
+-   * Get status of a Task.
+-   * @return Status of a Task
+-   */
+-  public final State getRunState() {
+-    return runState;
+-  }
+-
+-  /**
+-   * Update status of a Task.
+-   * @param localrunState : Status of a Task
+-   */
+-  public final void setRunState(final State localrunState) {
+-    this.runState = localrunState;
+-  }
+-
+-  /**
+-   * Set exitcode of a Task.
+-   * @param localexitCode : Exitcode of a Task
+-   */
+-  public final void setExitCode(final int localexitCode) {
+-    this.exitCode = localexitCode;
+-  }
+-
+-  /**
+-   * Get exitcode of a Task.
+-   * @return exitCode of Task
+-   */
+-  public final int getExitCode() {
+-    return exitCode;
+-  }
+-
+-  /**
+-   * Set Task cmd of a Task.
+-   * @param localcmd : command line which need to be executed
+-   */
+-  public final void setTaskCMD(final String localcmd) {
+-    this.taskCMD = localcmd;
+-  }
+-
+-  /**
+-   * Get Task cmd of a Task.
+-   * @return TaskCmd : command line which need to be executed
+-   */
+-  public final String getTaskCMD() {
+-    return taskCMD;
+-  }
+-
+-  /**
+-   * Set Task Type.
+-   * @param localtaskType : TaskType such as SimpleTask, NullTask
+-   */
+-  public final void setTaskType(final String localtaskType) {
+-    this.taskType = localtaskType;
+-  }
+-
+-  /**
+-   * Get Task Type.
+-   * @return TaskType : TaskType such as SimpleTask, NullTask
+-   */
+-  public final String getTaskType() {
+-    return taskType;
+-  }
+-
+-  /**
+-   * Get Task Id.
+-   * @return TaskId : Task identifier
+-   */
+-  public final TaskId getTaskId() {
+-    return taskId;
+-  }
+-
+-  /**
+-   * Set TaskId.
+-   * @param localtaskId : Task identifier
+-   */
+-  public final void setTaskId(final TaskId localtaskId) {
+-    if (localtaskId != null) {
+-      this.taskId = localtaskId;
+-    }
+-  }
+-
+-  /**
+-   * Set staus of a Task.
+-   * @param localtaskId : TaskId of a task
+-   * @param localrunState : Run state of a task
+-   */
+-  public final void setTaskState(final TaskId localtaskId,
+-      final State localrunState) {
+-    setTaskId(localtaskId);
+-    setRunState(localrunState);
+-  }
+-
+-  /**
+-   * Get Task status of a Task.
+-   * @param localtaskId : Task Id
+-   * @return TaskStatus for valid Task otherwise Null
+-   */
+-  public final State getTaskState(final TaskId localtaskId) {
+-    if (localtaskId.equals(this.taskId)) {
+-      return getRunState();
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-  /**
+-   * Get starttime of a Task.
+-   * @return StartTime of Task
+-   */
+-  public final long getStartTime() {
+-    return startTime;
+-  }
+-
+-  /**
+-   * Set current time as start time of a Task.
+-   */
+-  public final void setStartTime() {
+-    this.startTime = getCurrentTime();
+-    LOG.debug("Start Time for " + this.taskId + " is " + this.startTime);
+-  }
+-
+-  /**
+-   * Set task start time to a specific time value.
+-   * @param time : epoch timestamp
+-   */
+-  private void setStartTime(final long time) {
+-    this.startTime = time;
+-  }
+-
+-  /**
+-   * Get task end time.
+-   * @return End time of task.
+-   */
+-  public final long getEndTime() {
+-    return endTime;
+-  }
+-
+-  /**
+-   * Set task end time to current time.
+-   */
+-  public final void setEndTime() {
+-    this.setEndTime(getCurrentTime());
+-  }
+-
+-  /**
+-   * Set task end time to a specific time value.
+-   * @param time : epoch timestamp
+-   */
+-  private void setEndTime(final long time) {
+-    this.endTime = time;
+-    LOG.debug("End Time for " + this.taskId + " is " + this.endTime);
+-  }
+-
+-  /**
+-   * Get current time in milliseconds.
+-   * @return Current time in milliseconds
+-   */
+-  private long getCurrentTime() {
+-    return System.currentTimeMillis();
+-  }
+-
+-  /** {@inheritDoc} */
+-  public final void write(final DataOutput dataOutput) throws IOException {
+-    workerId.write(dataOutput);
+-    taskId.write(dataOutput);
+-    WritableUtils.writeEnum(dataOutput, runState);
+-    WritableUtils.writeVLong(dataOutput, getStartTime());
+-    WritableUtils.writeVLong(dataOutput, getEndTime());
+-    WritableUtils.writeString(dataOutput, taskCMD);
+-    WritableUtils.writeString(dataOutput, taskType);
+-    WritableUtils.writeVInt(dataOutput, exitCode);
+-  }
+-
+-
+-  /** {@inheritDoc} */
+-  public final void readFields(final DataInput dataInput) throws IOException {
+-    workerId.readFields(dataInput);
+-    taskId.readFields(dataInput);
+-    setRunState(WritableUtils.readEnum(dataInput, State.class));
+-    setStartTime(WritableUtils.readVLong(dataInput));
+-    setEndTime(WritableUtils.readVLong(dataInput));
+-    setTaskCMD(WritableUtils.readString(dataInput));
+-    setTaskType(WritableUtils.readString(dataInput));
+-    setExitCode(WritableUtils.readVInt(dataInput));
+-  }
+-
+-  /**
+-   * Get workerId.
+-   * @return workerId : Worker identifier
+-   */
+-  public final WorkerId getWorkerId() {
+-    return workerId;
+-  }
+-
+-  /**
+-   * Set WorkerId.
+-   * @param localworkerId : Worker identifier
+-   */
+-  public final void setWorkerId(final WorkerId localworkerId) {
+-    this.workerId = localworkerId;
+-  }
+-
+-  @Override
+-  public boolean equals(Object obj) {
+-    if (obj == null || obj.getClass() != this.getClass()) {
+-      return false;
+-    }
+-    TaskStatus other = (TaskStatus) obj;
+-    return (getWorkerId().equals(other.getWorkerId()) &&
+-        getTaskId().equals(other.getTaskId()) &&
+-        getRunState().equals(other.getRunState()) &&
+-        getStartTime() == other.getStartTime() &&
+-        getEndTime() == other.getEndTime() &&
+-        getTaskCMD().equals(other.getTaskCMD()) &&
+-        getTaskType().equals(other.getTaskType()) &&
+-        getExitCode() == other.getExitCode());
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    HashCodeBuilder builder = new HashCodeBuilder();
+-    builder.append(getWorkerId())
+-        .append(getTaskId())
+-        .append(getRunState())
+-        .append(getStartTime())
+-        .append(getEndTime())
+-        .append(getTaskCMD())
+-        .append(getTaskType())
+-        .append(getExitCode());
+-    return builder.hashCode();
+-  }
+-
+-  @Override
+-  protected Object clone() throws CloneNotSupportedException {
+-    return super.clone();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskType.java
+deleted file mode 100644
+index b7f22ee832b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TaskType.java
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-/**
+- * Define MaWo Task Type.
+- */
+-public enum TaskType {
+-  /**
+-   * Its a Simple Task.
+-   */
+-  SIMPLE,
+-  /**
+-   * Its a composite task which consists of multiple simple tasks.
+-   */
+-  COMPOSITE,
+-  /**
+-   * Its a null task.
+-   */
+-  NULL,
+-  /**
+-   * Die Task is to signal for suicide.
+-   */
+-  DIE,
+-  /**
+-   * Teardown Task is a task which runs after all tasks are finished.
+-   */
+-  TEARDOWN
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TeardownTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TeardownTask.java
+deleted file mode 100644
+index 959e2cb4687..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/TeardownTask.java
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import java.util.Map;
+-
+-/**
+- * Define Teardown Task.
+- */
+-public class TeardownTask extends SimpleTask {
+-  /**
+-   * Teardown task default constructor.
+-   */
+-  public TeardownTask() {
+-    super();
+-    setTaskType(TaskType.TEARDOWN);
+-  }
+-
+-  /**
+-   * Teardown Task constructor.
+-   * @param taskId : Teardown task Id
+-   * @param environment : Environment map for teardown task
+-   * @param taskCMD : Teardown task command
+-   * @param timeout : Timeout for Teardown task
+-   */
+-  public TeardownTask(final TaskId taskId,
+-      final Map<String, String> environment,
+-      final String taskCMD, final long timeout) {
+-    super(taskId, environment, taskCMD, timeout);
+-    setTaskType(TaskType.TEARDOWN);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/WorkAssignmentProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/WorkAssignmentProtocol.java
+deleted file mode 100644
+index 39cb283a4a9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/WorkAssignmentProtocol.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-import org.apache.hadoop.applications.mawo.server.worker.WorkerId;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.ipc.ProtocolInfo;
+-
+-/**
+- * Define work assignment protocol.
+- */
+-@ProtocolInfo(protocolName = "WorkAssignmentProtocol", protocolVersion = 1)
+-public interface WorkAssignmentProtocol {
+-
+-  /**
+-   * Get next workerId to which new task will be assigned.
+-   * @return return workerId text
+-   */
+-  Text getNewWorkerId();
+-
+-  /**
+-   * Register Worker.
+-   * When worker will be launched first, it needs to be registered with Master.
+-   * @param workerId : Worker Id
+-   * @return Task instance
+-   */
+-  Task registerWorker(WorkerId workerId);
+-
+-  /**
+-   * De Register worker.
+-   * When worker is de-registered, no new task will be assigned to this worker.
+-   * @param workerId : Worker identifier
+-   */
+-  void deRegisterWorker(WorkerId workerId);
+-
+-  /**
+-   * Worker sends heartbeat to Master.
+-   * @param workerId : Worker Id
+-   * @param taskStatusList : TaskStatus list of all tasks assigned to worker.
+-   * @return Task instance
+-   */
+-  Task sendHeartbeat(WorkerId workerId, TaskStatus[] taskStatusList);
+-
+-  /**
+-   * Add Task to the list.
+-   * @param task : Task object
+-   */
+-  void addTask(Task task);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/package-info.java
+deleted file mode 100644
+index f00c547a252..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/common/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.applications.mawo.server.common;
+-/**
+- * Helper classes for the mawo server common operations.
+- */
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/JobId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/JobId.java
+deleted file mode 100644
+index f056f5787fe..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/JobId.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.master.job;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.util.Random;
+-
+-import org.apache.hadoop.io.Writable;
+-import org.apache.hadoop.io.WritableUtils;
+-
+-/**
+- * Define MaWo JobId.
+- */
+-public class JobId implements Writable {
+-
+-  /**
+-   * MaWo job prefix.
+-   */
+-  private static final String JOB_PREFIX = "mawo_job_";
+-
+-  /**
+-   * Create unique random JobId.
+-   * @return unique random JobId
+-   */
+-  static JobId newJobId() {
+-    Random rn = new Random();
+-    final int range = 900000;
+-    final int randomadd = 100000;
+-    int randomNum = rn.nextInt(range) + randomadd;
+-    return new JobId(randomNum);
+-  }
+-
+-  /**
+-   * Unique Id.
+-   */
+-  private int jobIdentifier;
+-
+-  /**
+-   * JobId default constructor.
+-   */
+-  public JobId() {
+-
+-  }
+-
+-  /**
+-   * JobId constructor with Id.
+-   * @param id : unique id
+-   */
+-  public JobId(final int id) {
+-    this.jobIdentifier = id;
+-  }
+-
+-  /**
+-   * Get JobId.
+-   * @return unique ID
+-   */
+-  public final int getID() {
+-    return jobIdentifier;
+-  }
+-
+-  /**
+-   * Print JobId.
+-   * @return JobId
+-   */
+-  public final String toString() {
+-    return JOB_PREFIX + jobIdentifier;
+-  }
+-
+-  @Override
+-  /**
+-   * Hashcode for jobId.
+-   */
+-  public final int hashCode() {
+-    final int prime = 31;
+-    int result = 1;
+-    result = prime * result + jobIdentifier;
+-    return result;
+-  }
+-
+-  @Override
+-  /**
+-   * Implement equals method for jobId.
+-   */
+-  public final boolean equals(final Object obj) {
+-    if (this == obj) {
+-      return true;
+-    }
+-    if (obj == null) {
+-      return false;
+-    }
+-    if (getClass() != obj.getClass()) {
+-      return false;
+-    }
+-    JobId other = (JobId) obj;
+-    if (jobIdentifier != other.jobIdentifier) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  /** {@inheritDoc} */
+-  public final void write(final DataOutput out) throws IOException {
+-    WritableUtils.writeVInt(out, jobIdentifier);
+-  }
+-
+-  /** {@inheritDoc} */
+-  public final void readFields(final DataInput in) throws IOException {
+-    this.jobIdentifier = WritableUtils.readVInt(in);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/package-info.java
+deleted file mode 100644
+index c9453805d1a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/master/job/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.applications.mawo.server.master.job;
+-/**
+- * Helper classes for the mawo master job.
+- */
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/WorkerId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/WorkerId.java
+deleted file mode 100644
+index cefc8641e40..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/WorkerId.java
++++ /dev/null
+@@ -1,168 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.worker;
+-
+-import java.io.DataInput;
+-import java.io.DataOutput;
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.io.Writable;
+-
+-/**
+- * Define WorkerId for Workers.
+- */
+-public class WorkerId implements Writable {
+-  /**
+-   * WorkerId is a unique identifier for workers.
+-   */
+-  private Text workerId = new Text();
+-  /**
+-   * Hostname of worker node.
+-   */
+-  private Text hostname = new Text();
+-  /**
+-   * Ip address of worker node.
+-   */
+-  private Text ipAdd = new Text();
+-
+-  /**
+-   * Default constructor for workerId.
+-   * Set Hostname and Ip address of the machine where worker is running.
+-   */
+-  public WorkerId() {
+-    try {
+-      this.hostname =
+-          new Text(InetAddress.getLocalHost().getHostName());
+-      this.ipAdd =
+-          new Text(InetAddress.getLocalHost().getHostAddress().toString());
+-    } catch (UnknownHostException e) {
+-      e.printStackTrace();
+-    }
+-  }
+-
+-  /**
+-   * Get hostname for Worker.
+-   * @return hostname of worker node
+-   */
+-  public final Text getHostname() {
+-    return hostname;
+-  }
+-
+-  /**
+-   * Set hostname for Worker.
+-   * @param wkhostname : Hostname of worker
+-   */
+-  public final void setHostname(final Text wkhostname) {
+-    this.hostname = wkhostname;
+-  }
+-
+-  /**
+-   * Get Worker IP address.
+-   * @return IP address of worker node
+-   */
+-  public final String getIPAddress() {
+-    return this.ipAdd.toString();
+-  }
+-
+-  /**
+-   * Print workerId.
+-   * @return workeId in string
+-   */
+-  @Override
+-  public final String toString() {
+-    return workerId.toString();
+-  }
+-
+-  /**
+-   * Get workerId.
+-   * @return workerId : Worker identifier
+-   */
+-  public final String getWorkerId() {
+-    return this.workerId.toString();
+-  }
+-
+-  /**
+-   * Set workerId.
+-   * @param localworkerId : Worker identifier
+-   */
+-  public final void setWorkerId(final String localworkerId) {
+-    this.workerId = new Text(localworkerId);
+-  }
+-
+-  @Override
+-  /**
+-   * Implememt equals method for WorkerId.
+-   */
+-  public final boolean equals(final Object o) {
+-    if (o == null || this.getClass() != o.getClass()) {
+-      return false;
+-    }
+-    WorkerId x = (WorkerId) o;
+-    return x.getHostname().equals(this.hostname);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public final void write(final DataOutput dataOutput) throws IOException {
+-    workerId.write(dataOutput);
+-    hostname.write(dataOutput);
+-    ipAdd.write(dataOutput);
+-  }
+-
+-  /** {@inheritDoc} */
+-  @Override
+-  public final void readFields(final DataInput dataInput) throws IOException {
+-    workerId.readFields(dataInput);
+-    hostname.readFields(dataInput);
+-    ipAdd.readFields(dataInput);
+-  }
+-
+-  @Override
+-  /**
+-   * Override hashcode method for WorkerId.
+-   */
+-  public final int hashCode() {
+-    final int prime = 31;
+-    int result = 1;
+-    int workerHash = 0;
+-    if (workerId == null) {
+-      workerHash = 0;
+-    } else {
+-      workerHash = workerId.hashCode();
+-    }
+-    int hostHash = 0;
+-    if (hostname == null) {
+-      hostHash = 0;
+-    } else {
+-      hostHash = hostname.hashCode();
+-    }
+-    int ipHash = 0;
+-    if (ipAdd == null) {
+-      ipHash = 0;
+-    } else {
+-      ipHash = ipAdd.hashCode();
+-    }
+-    result = prime * result + workerHash;
+-    result = prime * result + hostHash;
+-    result = prime * result + ipHash;
+-    return result;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/package-info.java
+deleted file mode 100644
+index 7fa0d55b6e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/java/org/apache/hadoop/applications/mawo/server/worker/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.applications.mawo.server.worker;
+-/**
+- * Helper classes for the mawo worker.
+- */
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/resources/mawo-default.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/resources/mawo-default.properties
+deleted file mode 100644
+index 5ebe59eaa1a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/main/resources/mawo-default.properties
++++ /dev/null
+@@ -1,41 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-rpc.server.hostname=localhost
+-rpc.server.port=5120
+-
+-#curator related configurations
+-zookeeper.parent.path=/mawoRoot
+-zookeeper.address=localhost:2181
+-zookeeper.retry.interval.ms=1000
+-zookeeper.session.timeout.ms=10000
+-zookeeper.retries.num=1000
+-zookeeper.acl=world:anyone:rwcda
+-worker.num.tasks=10
+-mawo.job-queue-storage.enabled=true
+-mawo.job-builder.class=org.apache.hadoop.applications.mawo.server.master.job.SimpleTaskJsonJobBuilder
+-worker.workspace=/tmp
+-
+-ycloud.url=0.0.0.0:9191
+-
+-task.block-size.min=10
+-task.uber-time.min=12
+-
+-master.tasks-status.log.path=/tmp
+-
+-master.teardown-worker.validity-interval.ms=120000
+-#a comma-separated list of environment variables needed by all the tasks
+-worker.whitelist.env=
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
+deleted file mode 100644
+index edfed8db1d7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.applications.mawo.server.common;
+-
+-
+-import org.junit.jupiter.api.Test;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-
+-/**
+- * Test MaWo configuration.
+- */
+-public class TestMaWoConfiguration {
+-
+-  /**
+-   * Validate default MaWo Configurations.
+-   */
+-  @Test
+-  void testMaWoConfiguration() {
+-
+-    MawoConfiguration mawoConf = new MawoConfiguration();
+-
+-    // validate Rpc server port
+-    assertEquals(5120, mawoConf.getRpcServerPort());
+-
+-    // validate Rpc hostname
+-    assertEquals("localhost", mawoConf.getRpcHostName());
+-
+-    // validate job queue storage conf
+-    boolean jobQueueStorage = mawoConf.getJobQueueStorageEnabled();
+-    assertTrue(jobQueueStorage);
+-
+-    // validate default teardownWorkerValidity Interval
+-    assertEquals(120000, mawoConf.getTeardownWorkerValidityInterval());
+-
+-    // validate Zk related configs
+-    assertEquals("/tmp/mawoRoot", mawoConf.getZKParentPath());
+-    assertEquals("localhost:2181", mawoConf.getZKAddress());
+-    assertEquals(1000, mawoConf.getZKRetryIntervalMS());
+-    assertEquals(10000, mawoConf.getZKSessionTimeoutMS());
+-    assertEquals(1000, mawoConf.getZKRetriesNum());
+-  }
+-
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/resources/mawo.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/resources/mawo.properties
+deleted file mode 100644
+index 0d5ea315894..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/resources/mawo.properties
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-rpc.server.hostname=localhost
+-rpc.server.port=5120
+-
+-#curator related configurations
+-zookeeper.parent.path=/tmp/mawoRoot
+-zookeeper.address=localhost:2181
+-zookeeper.retry.interval.ms=1000
+-zookeeper.session.timeout.ms=10000
+-zookeeper.retries.num=1000
+-zookeeper.acl=world:anyone:rwcda
+-worker.num.tasks=10
+-mawo.job-queue-storage.enabled=true
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/pom.xml
+deleted file mode 100644
+index fa01732603e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/pom.xml
++++ /dev/null
+@@ -1,37 +0,0 @@
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-    http://www.apache.org/licenses/LICENSE-2.0
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-    <parent>
+-        <artifactId>hadoop-yarn-applications</artifactId>
+-        <groupId>org.apache.hadoop</groupId>
+-        <version>3.4.0</version>
+-    </parent>
+-    <modelVersion>4.0.0</modelVersion>
+-
+-    <groupId>org.apache.hadoop.applications.mawo</groupId>
+-    <artifactId>hadoop-yarn-applications-mawo</artifactId>
+-    <packaging>pom</packaging>
+-
+-    <name>Apache Hadoop YARN Application MaWo</name>
+-    <url>https://maven.apache.org</url>
+-
+-    <properties>
+-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-    </properties>
+-
+-    <modules>
+-        <module>hadoop-yarn-applications-mawo-core</module>
+-    </modules>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index 16b2787393c..ff5aa69b9b0 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -36,7 +36,6 @@
+   <modules>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+-    <module>hadoop-yarn-applications-mawo</module>
+   </modules>
+ 
+  <profiles>
diff --git a/hadoop/stackable/patches/3.4.0/21-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch b/hadoop/stackable/patches/3.4.0/21-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
new file mode 100644
index 000000000..1ca931752
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/21-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
@@ -0,0 +1,974 @@
+Entirely remove hadoop-yarn-applications-unmanaged-am-launcher
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../main/resources/assemblies/hadoop-yarn-dist.xml |    7 
+ .../pom.xml                                        |  117 -----
+ .../unmanagedamlauncher/UnmanagedAMLauncher.java   |  497 --------------------
+ .../TestUnmanagedAMLauncher.java                   |  222 ---------
+ .../src/test/resources/log4j.properties            |   37 -
+ .../src/test/resources/yarn-site.xml               |   21 -
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |    1 
+ 7 files changed, 902 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/yarn-site.xml
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 7b0bf7219cc..3c9cf4642ba 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -104,13 +104,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-client/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
+deleted file mode 100644
+index d2842109f86..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
++++ /dev/null
+@@ -1,117 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn-applications</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-applications-unmanaged-am-launcher</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN Unmanaged Am Launcher</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-cli</groupId>
+-      <artifactId>commons-cli</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <configuration>
+-           <archive>
+-             <manifest>
+-               <mainClass>org.apache.hadoop.yarn.applications.unmanagedamlauncher.UnmanagedAMLauncher</mainClass>
+-             </manifest>
+-           </archive>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <environmentVariables>
+-            <JAVA_HOME>${java.home}</JAVA_HOME>
+-          </environmentVariables>
+-       </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
+deleted file mode 100644
+index c6fe29f65fb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java
++++ /dev/null
+@@ -1,497 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.unmanagedamlauncher;
+-
+-import java.io.BufferedReader;
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.InputStreamReader;
+-import java.net.InetAddress;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.EnumSet;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.GnuParser;
+-import org.apache.commons.cli.HelpFormatter;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The UnmanagedLauncher is a simple client that launches and unmanaged AM. An
+- * unmanagedAM is an AM that is not launched and managed by the RM. The client
+- * creates a new application on the RM and negotiates a new attempt id. Then it
+- * waits for the RM app state to reach be YarnApplicationState.ACCEPTED after
+- * which it spawns the AM in another process and passes it the container id via
+- * env variable Environment.CONTAINER_ID. The AM can be in any
+- * language. The AM can register with the RM using the attempt id obtained
+- * from the container id and proceed as normal.
+- * The client redirects app stdout and stderr to its own stdout and
+- * stderr and waits for the AM process to exit. Then it waits for the RM to
+- * report app completion.
+- */
+-public class UnmanagedAMLauncher {
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(UnmanagedAMLauncher.class);
+-
+-  private Configuration conf;
+-
+-  // Handle to talk to the Resource Manager/Applications Manager
+-  protected YarnClient rmClient;
+-
+-  // Application master specific info to register a new Application with RM/ASM
+-  private String appName = "";
+-  // App master priority
+-  private int amPriority = 0;
+-  // Queue for App master
+-  private String amQueue = "";
+-  // cmd to start AM
+-  private String amCmd = null;
+-  // set the classpath explicitly
+-  private String classpath = null;
+-
+-  private volatile boolean amCompleted = false;
+-
+-  private static final long AM_STATE_WAIT_TIMEOUT_MS = 10000;
+-  /**
+-   * @param args
+-   *          Command line arguments
+-   */
+-  public static void main(String[] args) {
+-    try {
+-      UnmanagedAMLauncher client = new UnmanagedAMLauncher();
+-      LOG.info("Initializing Client");
+-      boolean doRun = client.init(args);
+-      if (!doRun) {
+-        System.exit(0);
+-      }
+-      client.run();
+-    } catch (Throwable t) {
+-      LOG.error("Error running Client", t);
+-      System.exit(1);
+-    }
+-  }
+-
+-  /**
+-   */
+-  public UnmanagedAMLauncher(Configuration conf) throws Exception {
+-    // Set up RPC
+-    this.conf = conf;
+-  }
+-
+-  public UnmanagedAMLauncher() throws Exception {
+-    this(new Configuration());
+-  }
+-
+-  private void printUsage(Options opts) {
+-    new HelpFormatter().printHelp("Client", opts);
+-  }
+-
+-  public boolean init(String[] args) throws ParseException {
+-
+-    Options opts = new Options();
+-    opts.addOption("appname", true,
+-        "Application Name. Default value - UnmanagedAM");
+-    opts.addOption("priority", true, "Application Priority. Default 0");
+-    opts.addOption("queue", true,
+-        "RM Queue in which this application is to be submitted");
+-    opts.addOption("master_memory", true,
+-        "Amount of memory in MB to be requested to run the application master");
+-    opts.addOption("cmd", true, "command to start unmanaged AM (required)");
+-    opts.addOption("classpath", true, "additional classpath");
+-    opts.addOption("help", false, "Print usage");
+-    CommandLine cliParser = new GnuParser().parse(opts, args);
+-
+-    if (args.length == 0) {
+-      printUsage(opts);
+-      throw new IllegalArgumentException(
+-          "No args specified for client to initialize");
+-    }
+-
+-    if (cliParser.hasOption("help")) {
+-      printUsage(opts);
+-      return false;
+-    }
+-
+-    appName = cliParser.getOptionValue("appname", "UnmanagedAM");
+-    amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
+-    amQueue = cliParser.getOptionValue("queue", "default");
+-    classpath = cliParser.getOptionValue("classpath", null);
+-
+-    amCmd = cliParser.getOptionValue("cmd");
+-    if (amCmd == null) {
+-      printUsage(opts);
+-      throw new IllegalArgumentException(
+-          "No cmd specified for application master");
+-    }
+-
+-    YarnConfiguration yarnConf = new YarnConfiguration(conf);
+-    rmClient = YarnClient.createYarnClient();
+-    rmClient.init(yarnConf);
+-
+-    return true;
+-  }
+-
+-  public void launchAM(ApplicationAttemptId attemptId) 
+-    throws IOException, YarnException {
+-    Credentials credentials = new Credentials();
+-    Token<AMRMTokenIdentifier> token = 
+-        rmClient.getAMRMToken(attemptId.getApplicationId());
+-    // Service will be empty but that's okay, we are just passing down only
+-    // AMRMToken down to the real AM which eventually sets the correct
+-    // service-address.
+-    credentials.addToken(token.getService(), token);
+-    File tokenFile = File.createTempFile("unmanagedAMRMToken","", 
+-        new File(System.getProperty("user.dir")));
+-    try {
+-      FileUtil.chmod(tokenFile.getAbsolutePath(), "600");
+-    } catch (InterruptedException ex) {
+-      throw new RuntimeException(ex);
+-    }
+-    tokenFile.deleteOnExit();
+-    try (DataOutputStream os = new DataOutputStream(
+-        new FileOutputStream(tokenFile, true))) {
+-      credentials.writeTokenStorageToStream(os);
+-    }
+-
+-    Map<String, String> env = System.getenv();
+-    ArrayList<String> envAMList = new ArrayList<String>();
+-    boolean setClasspath = false;
+-    for (Map.Entry<String, String> entry : env.entrySet()) {
+-      String key = entry.getKey();
+-      String value = entry.getValue();
+-      if(key.equals("CLASSPATH")) {
+-        setClasspath = true;
+-        if(classpath != null) {
+-          value = value + File.pathSeparator + classpath;
+-        }
+-      }
+-      envAMList.add(key + "=" + value);
+-    }
+-    
+-    if(!setClasspath && classpath!=null) {
+-      envAMList.add("CLASSPATH="+classpath);
+-    }
+-    ContainerId containerId = ContainerId.newContainerId(attemptId, 0);
+-
+-    String hostname = InetAddress.getLocalHost().getHostName();
+-    envAMList.add(Environment.CONTAINER_ID.name() + "=" + containerId);
+-    envAMList.add(Environment.NM_HOST.name() + "=" + hostname);
+-    envAMList.add(Environment.NM_HTTP_PORT.name() + "=0");
+-    envAMList.add(Environment.NM_PORT.name() + "=0");
+-    envAMList.add(Environment.LOCAL_DIRS.name() + "= /tmp");
+-    envAMList.add(ApplicationConstants.APP_SUBMIT_TIME_ENV + "="
+-        + System.currentTimeMillis());
+-
+-    envAMList.add(ApplicationConstants.CONTAINER_TOKEN_FILE_ENV_NAME + "=" + 
+-      tokenFile.getAbsolutePath());
+-    
+-    String[] envAM = new String[envAMList.size()];
+-    Process amProc = Runtime.getRuntime().exec(amCmd, envAMList.toArray(envAM));
+-
+-    final BufferedReader errReader = 
+-        new BufferedReader(new InputStreamReader(
+-            amProc.getErrorStream(), StandardCharsets.UTF_8));
+-    final BufferedReader inReader = 
+-        new BufferedReader(new InputStreamReader(
+-            amProc.getInputStream(), StandardCharsets.UTF_8));
+-    
+-    // read error and input streams as this would free up the buffers
+-    // free the error stream buffer
+-    Thread errThread = new Thread() {
+-      @Override
+-      public void run() {
+-        try {
+-          String line = errReader.readLine();
+-          while((line != null) && !isInterrupted()) {
+-            System.err.println(line);
+-            line = errReader.readLine();
+-          }
+-        } catch(IOException ioe) {
+-          LOG.warn("Error reading the error stream", ioe);
+-        }
+-      }
+-    };
+-    Thread outThread = new Thread() {
+-      @Override
+-      public void run() {
+-        try {
+-          String line = inReader.readLine();
+-          while((line != null) && !isInterrupted()) {
+-            System.out.println(line);
+-            line = inReader.readLine();
+-          }
+-        } catch(IOException ioe) {
+-          LOG.warn("Error reading the out stream", ioe);
+-        }
+-      }
+-    };
+-    try {
+-      errThread.start();
+-      outThread.start();
+-    } catch (IllegalStateException ise) { }
+-
+-    // wait for the process to finish and check the exit code
+-    try {
+-      int exitCode = amProc.waitFor();
+-      LOG.info("AM process exited with value: " + exitCode);
+-    } catch (InterruptedException e) {
+-      e.printStackTrace();
+-    } finally {
+-      amCompleted = true;
+-    }
+-    
+-    try {
+-      // make sure that the error thread exits
+-      // on Windows these threads sometimes get stuck and hang the execution
+-      // timeout and join later after destroying the process.
+-      errThread.join();
+-      outThread.join();
+-      errReader.close();
+-      inReader.close();
+-    } catch (InterruptedException ie) {
+-      LOG.info("ShellExecutor: Interrupted while reading the error/out stream",
+-          ie);
+-    } catch (IOException ioe) {
+-      LOG.warn("Error while closing the error/out stream", ioe);
+-    }
+-    amProc.destroy();
+-  }
+-  
+-  public boolean run() throws IOException, YarnException {
+-    LOG.info("Starting Client");
+-    
+-    // Connect to ResourceManager
+-    rmClient.start();
+-    try {  
+-      // Create launch context for app master
+-      LOG.info("Setting up application submission context for ASM");
+-      ApplicationSubmissionContext appContext = rmClient.createApplication()
+-          .getApplicationSubmissionContext();
+-      ApplicationId appId = appContext.getApplicationId();
+-
+-      // set the application name
+-      appContext.setApplicationName(appName);
+-  
+-      // Set the priority for the application master
+-      Priority pri = Records.newRecord(Priority.class);
+-      pri.setPriority(amPriority);
+-      appContext.setPriority(pri);
+-  
+-      // Set the queue to which this application is to be submitted in the RM
+-      appContext.setQueue(amQueue);
+-  
+-      // Set up the container launch context for the application master
+-      ContainerLaunchContext amContainer = Records
+-          .newRecord(ContainerLaunchContext.class);
+-      appContext.setAMContainerSpec(amContainer);
+-  
+-      // unmanaged AM
+-      appContext.setUnmanagedAM(true);
+-      LOG.info("Setting unmanaged AM");
+-  
+-      // Submit the application to the applications manager
+-      LOG.info("Submitting application to ASM");
+-      rmClient.submitApplication(appContext);
+-
+-      ApplicationReport appReport =
+-          monitorApplication(appId, EnumSet.of(YarnApplicationState.ACCEPTED,
+-            YarnApplicationState.KILLED, YarnApplicationState.FAILED,
+-            YarnApplicationState.FINISHED));
+-
+-      if (appReport.getYarnApplicationState() == YarnApplicationState.ACCEPTED) {
+-        // Monitor the application attempt to wait for launch state
+-        ApplicationAttemptReport attemptReport =
+-            monitorCurrentAppAttempt(appId,
+-              YarnApplicationAttemptState.LAUNCHED);
+-        ApplicationAttemptId attemptId =
+-            attemptReport.getApplicationAttemptId();
+-        LOG.info("Launching AM with application attempt id " + attemptId);
+-        // launch AM
+-        launchAM(attemptId);
+-        // Monitor the application for end state
+-        appReport =
+-            monitorApplication(appId, EnumSet.of(YarnApplicationState.KILLED,
+-              YarnApplicationState.FAILED, YarnApplicationState.FINISHED));
+-      }
+-
+-      YarnApplicationState appState = appReport.getYarnApplicationState();
+-      FinalApplicationStatus appStatus = appReport.getFinalApplicationStatus();
+-  
+-      LOG.info("App ended with state: " + appReport.getYarnApplicationState()
+-          + " and status: " + appStatus);
+-      
+-      boolean success;
+-      if (YarnApplicationState.FINISHED == appState
+-          && FinalApplicationStatus.SUCCEEDED == appStatus) {
+-        LOG.info("Application has completed successfully.");
+-        success = true;
+-      } else {
+-        LOG.info("Application did finished unsuccessfully." + " YarnState="
+-            + appState.toString() + ", FinalStatus=" + appStatus.toString());
+-        success = false;
+-      }
+-      
+-      return success;
+-    } finally {
+-      rmClient.stop();
+-    }
+-  }
+-
+-  private ApplicationAttemptReport monitorCurrentAppAttempt(
+-      ApplicationId appId, YarnApplicationAttemptState attemptState)
+-      throws YarnException, IOException {
+-    long startTime = System.currentTimeMillis();
+-    ApplicationAttemptId attemptId = null;
+-    while (true) {
+-      if (attemptId == null) {
+-        attemptId =
+-            rmClient.getApplicationReport(appId)
+-              .getCurrentApplicationAttemptId();
+-      }
+-      ApplicationAttemptReport attemptReport = null;
+-      if (attemptId != null) {
+-        attemptReport = rmClient.getApplicationAttemptReport(attemptId);
+-        if (attemptState.equals(attemptReport.getYarnApplicationAttemptState())) {
+-          return attemptReport;
+-        }
+-      }
+-      LOG.info("Current attempt state of " + appId + " is " + (attemptReport == null
+-            ? " N/A " : attemptReport.getYarnApplicationAttemptState())
+-                + ", waiting for current attempt to reach " + attemptState);
+-      try {
+-        Thread.sleep(1000);
+-      } catch (InterruptedException e) {
+-        LOG.warn("Interrupted while waiting for current attempt of " + appId
+-            + " to reach " + attemptState);
+-      }
+-      if (System.currentTimeMillis() - startTime > AM_STATE_WAIT_TIMEOUT_MS) {
+-        String errmsg =
+-            "Timeout for waiting current attempt of " + appId + " to reach "
+-                + attemptState;
+-        LOG.error(errmsg);
+-        throw new RuntimeException(errmsg);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Monitor the submitted application for completion. Kill application if time
+-   * expires.
+-   * 
+-   * @param appId
+-   *          Application Id of application to be monitored
+-   * @return true if application completed successfully
+-   * @throws YarnException
+-   * @throws IOException
+-   */
+-  private ApplicationReport monitorApplication(ApplicationId appId,
+-      Set<YarnApplicationState> finalState) throws YarnException,
+-      IOException {
+-
+-    long foundAMCompletedTime = 0;
+-    StringBuilder expectedFinalState = new StringBuilder();
+-    boolean first = true;
+-    for (YarnApplicationState state : finalState) {
+-      if (first) {
+-        first = false;
+-        expectedFinalState.append(state.name());
+-      } else {
+-        expectedFinalState.append("," + state.name());
+-      }
+-    }
+-
+-    while (true) {
+-
+-      // Check app status every 1 second.
+-      try {
+-        Thread.sleep(1000);
+-      } catch (InterruptedException e) {
+-        LOG.debug("Thread sleep in monitoring loop interrupted");
+-      }
+-
+-      // Get application report for the appId we are interested in
+-      ApplicationReport report = rmClient.getApplicationReport(appId);
+-
+-      LOG.info("Got application report from ASM for" + ", appId="
+-          + appId.getId() + ", appAttemptId="
+-          + report.getCurrentApplicationAttemptId() + ", clientToAMToken="
+-          + report.getClientToAMToken() + ", appDiagnostics="
+-          + report.getDiagnostics() + ", appMasterHost=" + report.getHost()
+-          + ", appQueue=" + report.getQueue() + ", appMasterRpcPort="
+-          + report.getRpcPort() + ", appStartTime=" + report.getStartTime()
+-          + ", yarnAppState=" + report.getYarnApplicationState().toString()
+-          + ", distributedFinalState="
+-          + report.getFinalApplicationStatus().toString() + ", appTrackingUrl="
+-          + report.getTrackingUrl() + ", appUser=" + report.getUser());
+-
+-      YarnApplicationState state = report.getYarnApplicationState();
+-      if (finalState.contains(state)) {
+-        return report;
+-      }
+-
+-      // wait for 10 seconds after process has completed for app report to
+-      // come back
+-      if (amCompleted) {
+-        if (foundAMCompletedTime == 0) {
+-          foundAMCompletedTime = System.currentTimeMillis();
+-        } else if ((System.currentTimeMillis() - foundAMCompletedTime)
+-            > AM_STATE_WAIT_TIMEOUT_MS) {
+-          LOG.warn("Waited " + AM_STATE_WAIT_TIMEOUT_MS/1000
+-              + " seconds after process completed for AppReport"
+-              + " to reach desired final state. Not waiting anymore."
+-              + "CurrentState = " + state
+-              + ", ExpectedStates = " + expectedFinalState.toString());
+-          throw new RuntimeException("Failed to receive final expected state"
+-              + " in ApplicationReport"
+-              + ", CurrentState=" + state
+-              + ", ExpectedStates=" + expectedFinalState.toString());
+-        }
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java
+deleted file mode 100644
+index ed903f7f9b8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java
++++ /dev/null
+@@ -1,222 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.applications.unmanagedamlauncher;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.junit.jupiter.api.Assertions.fail;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.net.URL;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
+-import org.apache.hadoop.yarn.client.ClientRMProxy;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.Test;
+-import org.junit.jupiter.api.Timeout;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class TestUnmanagedAMLauncher {
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(TestUnmanagedAMLauncher.class);
+-
+-  protected static MiniYARNCluster yarnCluster = null;
+-  protected static Configuration conf = new YarnConfiguration();
+-
+-  @BeforeAll
+-  public static void setup() throws InterruptedException, IOException {
+-    LOG.info("Starting up YARN cluster");
+-    conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128);
+-    if (yarnCluster == null) {
+-      yarnCluster = new MiniYARNCluster(
+-          TestUnmanagedAMLauncher.class.getSimpleName(), 1, 1, 1);
+-      yarnCluster.init(conf);
+-      yarnCluster.start();
+-      //get the address
+-      Configuration yarnClusterConfig = yarnCluster.getConfig();
+-      LOG.info("MiniYARN ResourceManager published address: " +
+-               yarnClusterConfig.get(YarnConfiguration.RM_ADDRESS));
+-      LOG.info("MiniYARN ResourceManager published web address: " +
+-               yarnClusterConfig.get(YarnConfiguration.RM_WEBAPP_ADDRESS));
+-      String webapp = yarnClusterConfig.get(YarnConfiguration.RM_WEBAPP_ADDRESS);
+-      assertFalse(webapp.startsWith("0.0.0.0"),
+-          "Web app address still unbound to a host at " + webapp);
+-      LOG.info("Yarn webapp is at " + webapp);
+-      URL url = Thread.currentThread().getContextClassLoader()
+-          .getResource("yarn-site.xml");
+-      if (url == null) {
+-        throw new RuntimeException(
+-            "Could not find 'yarn-site.xml' dummy file in classpath");
+-      }
+-      //write the document to a buffer (not directly to the file, as that
+-      //can cause the file being written to get read -which will then fail.
+-      ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+-      yarnClusterConfig.writeXml(bytesOut);
+-      bytesOut.close();
+-      //write the bytes to the file in the classpath
+-      OutputStream os = new FileOutputStream(new File(url.getPath()));
+-      os.write(bytesOut.toByteArray());
+-      os.close();
+-    }
+-    try {
+-      Thread.sleep(2000);
+-    } catch (InterruptedException e) {
+-      LOG.info("setup thread sleep interrupted. message=" + e.getMessage());
+-    }
+-  }
+-
+-  @AfterAll
+-  public static void tearDown() throws IOException {
+-    if (yarnCluster != null) {
+-      try {
+-        yarnCluster.stop();
+-      } finally {
+-        yarnCluster = null;
+-      }
+-    }
+-  }
+-
+-  private static String getTestRuntimeClasspath() {
+-    LOG.info("Trying to generate classpath for app master from current thread's classpath");
+-    String envClassPath = "";
+-    String cp = System.getProperty("java.class.path");
+-    if (cp != null) {
+-      envClassPath += cp.trim() + File.pathSeparator;
+-    }
+-    // yarn-site.xml at this location contains proper config for mini cluster
+-    ClassLoader thisClassLoader = Thread.currentThread()
+-      .getContextClassLoader();
+-    URL url = thisClassLoader.getResource("yarn-site.xml");
+-    envClassPath += new File(url.getFile()).getParent();
+-    return envClassPath;
+-  }
+-
+-  @Test
+-  @Timeout(30000)
+-  void testUMALauncher() throws Exception {
+-    String classpath = getTestRuntimeClasspath();
+-    String javaHome = System.getenv("JAVA_HOME");
+-    if (javaHome == null) {
+-      LOG.error("JAVA_HOME not defined. Test not running.");
+-      return;
+-    }
+-    String[] args = {
+-        "--classpath",
+-        classpath,
+-        "--queue",
+-        "default",
+-        "--cmd",
+-        javaHome
+-            + "/bin/java -Xmx512m "
+-            + TestUnmanagedAMLauncher.class.getCanonicalName()
+-            + " success"};
+-
+-    LOG.info("Initializing Launcher");
+-    UnmanagedAMLauncher launcher =
+-        new UnmanagedAMLauncher(new Configuration(yarnCluster.getConfig())) {
+-          public void launchAM(ApplicationAttemptId attemptId)
+-              throws IOException, YarnException {
+-            YarnApplicationAttemptState attemptState =
+-                rmClient.getApplicationAttemptReport(attemptId)
+-                    .getYarnApplicationAttemptState();
+-            assertEquals(YarnApplicationAttemptState.LAUNCHED, attemptState);
+-            super.launchAM(attemptId);
+-          }
+-        };
+-    boolean initSuccess = launcher.init(args);
+-    assertTrue(initSuccess);
+-    LOG.info("Running Launcher");
+-    boolean result = launcher.run();
+-
+-    LOG.info("Launcher run completed. Result=" + result);
+-    assertTrue(result);
+-
+-  }
+-
+-  @Test
+-  @Timeout(30000)
+-  void testUMALauncherError() throws Exception {
+-    String classpath = getTestRuntimeClasspath();
+-    String javaHome = System.getenv("JAVA_HOME");
+-    if (javaHome == null) {
+-      LOG.error("JAVA_HOME not defined. Test not running.");
+-      return;
+-    }
+-    String[] args = {
+-        "--classpath",
+-        classpath,
+-        "--queue",
+-        "default",
+-        "--cmd",
+-        javaHome
+-            + "/bin/java -Xmx512m "
+-            + TestUnmanagedAMLauncher.class.getCanonicalName()
+-            + " failure"};
+-
+-    LOG.info("Initializing Launcher");
+-    UnmanagedAMLauncher launcher = new UnmanagedAMLauncher(new Configuration(
+-        yarnCluster.getConfig()));
+-    boolean initSuccess = launcher.init(args);
+-    assertTrue(initSuccess);
+-    LOG.info("Running Launcher");
+-
+-    try {
+-      launcher.run();
+-      fail("Expected an exception to occur as launch should have failed");
+-    } catch (RuntimeException e) {
+-      // Expected
+-    }
+-  }
+-
+-  // provide main method so this class can act as AM
+-  public static void main(String[] args) throws Exception {
+-    if (args[0].equals("success")) {
+-      ApplicationMasterProtocol client = ClientRMProxy.createRMProxy(conf,
+-          ApplicationMasterProtocol.class);
+-      client.registerApplicationMaster(RegisterApplicationMasterRequest
+-          .newInstance(NetUtils.getHostname(), -1, ""));
+-      Thread.sleep(1000);
+-      FinishApplicationMasterResponse resp =
+-          client.finishApplicationMaster(FinishApplicationMasterRequest
+-            .newInstance(FinalApplicationStatus.SUCCEEDED, "success", null));
+-      assertTrue(resp.getIsUnregistered());
+-      System.exit(0);
+-    } else {
+-      System.exit(1);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties
+deleted file mode 100644
+index e46856e7209..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,37 +0,0 @@
+-#
+-# Licensed to the Apache Software Foundation (ASF) under one
+-#  or more contributor license agreements.  See the NOTICE file
+-#  distributed with this work for additional information
+-#  regarding copyright ownership.  The ASF licenses this file
+-#  to you under the Apache License, Version 2.0 (the
+-#  "License"); you may not use this file except in compliance
+-#  with the License.  You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License.
+-#
+-
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=INFO,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/yarn-site.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index 7b02a822d9d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,21 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <!-- Dummy (invalid) config file to be overwriten by TestUnmanagedAMLauncher with MiniCluster configuration. -->
+-</configuration>
+-
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index ff5aa69b9b0..2cde68a34e9 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -34,7 +34,6 @@
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+   <modules>
+-    <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+   </modules>
+ 
diff --git a/hadoop/stackable/patches/3.4.0/22-remove-hadoop-yarn-services.patch b/hadoop/stackable/patches/3.4.0/22-remove-hadoop-yarn-services.patch
new file mode 100644
index 000000000..b0bcd3d7a
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/22-remove-hadoop-yarn-services.patch
@@ -0,0 +1,39503 @@
+Entirely remove hadoop-yarn-services
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../main/resources/assemblies/hadoop-yarn-dist.xml |   25 
+ hadoop-project/pom.xml                             |   19 
+ .../dev-support/findbugs-exclude.xml               |   59 -
+ .../dev-support/findbugs-exclude.xml               |   20 
+ .../hadoop-yarn-services-api/pom.xml               |  237 ---
+ .../yarn/service/client/ApiServiceClient.java      |  752 --------
+ .../service/client/SystemServiceManagerImpl.java   |  410 -----
+ .../hadoop/yarn/service/client/package-info.java   |   28 
+ .../hadoop/yarn/service/webapp/ApiServer.java      |  973 -----------
+ .../yarn/service/webapp/ApiServerWebApp.java       |  161 --
+ .../hadoop/yarn/service/webapp/package-info.java   |   28 
+ .../resources/definition/YARN-Services-Examples.md |  444 -----
+ .../YARN-Simplified-V1-API-Layer-For-Services.yaml |  740 --------
+ .../src/main/resources/log4j-server.properties     |   76 -
+ .../src/main/resources/webapps/api-server/app      |   16 
+ .../src/main/webapp/WEB-INF/web.xml                |   36 
+ .../hadoop/yarn/service/ServiceClientTest.java     |  226 ---
+ .../apache/hadoop/yarn/service/TestApiServer.java  |  620 -------
+ .../hadoop/yarn/service/TestCleanupAfterKill.java  |   95 -
+ .../yarn/service/client/TestApiServiceClient.java  |  344 ----
+ .../service/client/TestSecureApiServiceClient.java |  192 --
+ .../client/TestSystemServiceManagerImpl.java       |  264 ---
+ .../src/test/resources/example-app.json            |   16 
+ .../src/test/resources/log4j.properties            |   19 
+ .../resources/system-services/bad/bad.yarnfile     |   16 
+ .../sync/user1/example-app1.yarnfile               |   16 
+ .../sync/user1/example-app2.yarnfile               |   16 
+ .../system-services/sync/user1/example-app3.json   |   16 
+ .../sync/user2/example-app1.yarnfile               |   16 
+ .../sync/user2/example-app2.yarnfile               |   16 
+ .../src/test/resources/yarn-site.xml               |   19 
+ .../conf/yarnservice-log4j.properties              |   62 -
+ .../examples/appcatalog/appcatalog.json            |   28 
+ .../examples/httpd-no-dns/httpd-no-dns.json        |   63 -
+ .../examples/httpd-no-dns/httpd-proxy-no-dns.conf  |   24 
+ .../examples/httpd/httpd-proxy.conf                |   24 
+ .../examples/httpd/httpd.json                      |   56 -
+ .../examples/sleeper/sleeper.json                  |   16 
+ .../hadoop-yarn-services-core/pom.xml              |  279 ---
+ .../yarn/service/ClientAMPolicyProvider.java       |   39 
+ .../hadoop/yarn/service/ClientAMProtocol.java      |   74 -
+ .../hadoop/yarn/service/ClientAMSecurityInfo.java  |   62 -
+ .../hadoop/yarn/service/ClientAMService.java       |  253 ---
+ .../yarn/service/ContainerFailureTracker.java      |   92 -
+ .../apache/hadoop/yarn/service/ServiceContext.java |   63 -
+ .../apache/hadoop/yarn/service/ServiceEvent.java   |   84 -
+ .../hadoop/yarn/service/ServiceEventType.java      |   29 
+ .../apache/hadoop/yarn/service/ServiceManager.java |  520 ------
+ .../apache/hadoop/yarn/service/ServiceMaster.java  |  357 ----
+ .../apache/hadoop/yarn/service/ServiceMetrics.java |   94 -
+ .../hadoop/yarn/service/ServiceScheduler.java      | 1145 -------------
+ .../yarn/service/UpgradeComponentsFinder.java      |  159 --
+ .../yarn/service/api/ServiceApiConstants.java      |   74 -
+ .../hadoop/yarn/service/api/records/Artifact.java  |  166 --
+ .../yarn/service/api/records/BaseResource.java     |   52 -
+ .../hadoop/yarn/service/api/records/Component.java |  563 ------
+ .../service/api/records/ComponentContainers.java   |   97 -
+ .../yarn/service/api/records/ComponentState.java   |   30 
+ .../yarn/service/api/records/ConfigFile.java       |  262 ---
+ .../yarn/service/api/records/ConfigFormat.java     |   66 -
+ .../yarn/service/api/records/Configuration.java    |  224 --
+ .../hadoop/yarn/service/api/records/Container.java |  345 ----
+ .../yarn/service/api/records/ContainerState.java   |   31 
+ .../hadoop/yarn/service/api/records/Error.java     |  128 -
+ .../service/api/records/KerberosPrincipal.java     |  146 --
+ .../service/api/records/LocalizationStatus.java    |  132 -
+ .../service/api/records/PlacementConstraint.java   |  280 ---
+ .../yarn/service/api/records/PlacementPolicy.java  |  101 -
+ .../yarn/service/api/records/PlacementScope.java   |   53 -
+ .../yarn/service/api/records/PlacementType.java    |   35 
+ .../yarn/service/api/records/ReadinessCheck.java   |  197 --
+ .../hadoop/yarn/service/api/records/Resource.java  |  191 --
+ .../service/api/records/ResourceInformation.java   |  152 --
+ .../hadoop/yarn/service/api/records/Service.java   |  472 -----
+ .../yarn/service/api/records/ServiceState.java     |   38 
+ .../yarn/service/api/records/ServiceStatus.java    |  147 --
+ .../hadoop/yarn/service/client/ClientAMProxy.java  |   58 -
+ .../hadoop/yarn/service/client/ServiceClient.java  | 1804 --------------------
+ .../service/component/AlwaysRestartPolicy.java     |   87 -
+ .../hadoop/yarn/service/component/Component.java   | 1310 ---------------
+ .../yarn/service/component/ComponentEvent.java     |  126 -
+ .../yarn/service/component/ComponentEventType.java |   31 
+ .../service/component/ComponentRestartPolicy.java  |   47 -
+ .../yarn/service/component/ComponentState.java     |   27 
+ .../yarn/service/component/NeverRestartPolicy.java |   90 -
+ .../service/component/OnFailureRestartPolicy.java  |   94 -
+ .../component/instance/ComponentInstance.java      | 1181 -------------
+ .../component/instance/ComponentInstanceEvent.java |   60 -
+ .../instance/ComponentInstanceEventType.java       |   28 
+ .../component/instance/ComponentInstanceId.java    |   91 -
+ .../component/instance/ComponentInstanceState.java |   28 
+ .../hadoop/yarn/service/conf/RestApiConstants.java |   56 -
+ .../hadoop/yarn/service/conf/SliderExitCodes.java  |   88 -
+ .../hadoop/yarn/service/conf/YarnServiceConf.java  |  224 --
+ .../yarn/service/conf/YarnServiceConstants.java    |  102 -
+ .../service/containerlaunch/AbstractLauncher.java  |  262 ---
+ .../containerlaunch/ClasspathConstructor.java      |  172 --
+ .../containerlaunch/CommandLineBuilder.java        |   86 -
+ .../containerlaunch/ContainerLaunchService.java    |  210 --
+ .../containerlaunch/JavaCommandLineBuilder.java    |  180 --
+ .../exceptions/BadClusterStateException.java       |   36 
+ .../exceptions/BadCommandArgumentsException.java   |   30 
+ .../service/exceptions/BadConfigException.java     |   39 
+ .../yarn/service/exceptions/ErrorStrings.java      |   44 
+ .../yarn/service/exceptions/ExitCodeProvider.java  |   32 
+ .../yarn/service/exceptions/LauncherExitCodes.java |  196 --
+ .../service/exceptions/RestApiErrorMessages.java   |  131 -
+ .../service/exceptions/ServiceLaunchException.java |   73 -
+ .../yarn/service/exceptions/SliderException.java   |   66 -
+ .../yarn/service/exceptions/UsageException.java    |   34 
+ .../pb/client/ClientAMProtocolPBClientImpl.java    |  171 --
+ .../impl/pb/service/ClientAMProtocolPB.java        |   29 
+ .../pb/service/ClientAMProtocolPBServiceImpl.java  |  145 --
+ .../monitor/ComponentHealthThresholdMonitor.java   |  151 --
+ .../yarn/service/monitor/ServiceMonitor.java       |  155 --
+ .../yarn/service/monitor/probe/DefaultProbe.java   |   99 -
+ .../yarn/service/monitor/probe/HttpProbe.java      |  117 -
+ .../service/monitor/probe/LogEntryBuilder.java     |   76 -
+ .../yarn/service/monitor/probe/MonitorKeys.java    |   78 -
+ .../yarn/service/monitor/probe/MonitorUtils.java   |   84 -
+ .../yarn/service/monitor/probe/PortProbe.java      |   98 -
+ .../hadoop/yarn/service/monitor/probe/Probe.java   |  108 -
+ .../yarn/service/monitor/probe/ProbeStatus.java    |  160 --
+ .../apache/hadoop/yarn/service/package-info.java   |   24 
+ .../service/provider/AbstractClientProvider.java   |  150 --
+ .../service/provider/AbstractProviderService.java  |  176 --
+ .../yarn/service/provider/ProviderFactory.java     |   76 -
+ .../yarn/service/provider/ProviderService.java     |   81 -
+ .../yarn/service/provider/ProviderUtils.java       |  493 -----
+ .../defaultImpl/DefaultClientProvider.java         |   52 -
+ .../defaultImpl/DefaultProviderFactory.java        |   51 -
+ .../defaultImpl/DefaultProviderService.java        |   38 
+ .../provider/docker/DockerClientProvider.java      |   54 -
+ .../yarn/service/provider/docker/DockerKeys.java   |   23 
+ .../provider/docker/DockerProviderFactory.java     |   52 -
+ .../provider/docker/DockerProviderService.java     |  110 -
+ .../provider/tarball/TarballClientProvider.java    |   68 -
+ .../provider/tarball/TarballProviderFactory.java   |   52 -
+ .../provider/tarball/TarballProviderService.java   |   51 -
+ .../service/registry/CustomRegistryConstants.java  |   57 -
+ .../registry/YarnRegistryViewForProviders.java     |  252 ---
+ .../timelineservice/ServiceMetricsSink.java        |   98 -
+ .../timelineservice/ServiceTimelineEntityType.java |   39 
+ .../timelineservice/ServiceTimelineEvent.java      |   39 
+ .../ServiceTimelineMetricsConstants.java           |   94 -
+ .../timelineservice/ServiceTimelinePublisher.java  |  401 ----
+ .../yarn/service/timelineservice/package-info.java |   27 
+ .../service/utils/ApplicationReportSerDeser.java   |   50 -
+ .../yarn/service/utils/ClientRegistryBinder.java   |  201 --
+ .../hadoop/yarn/service/utils/Comparators.java     |   62 -
+ .../hadoop/yarn/service/utils/ConfigHelper.java    |  157 --
+ .../hadoop/yarn/service/utils/ConfigUtils.java     |   41 
+ .../hadoop/yarn/service/utils/CoreFileSystem.java  |  556 ------
+ .../apache/hadoop/yarn/service/utils/Duration.java |  109 -
+ .../hadoop/yarn/service/utils/FilterUtils.java     |   94 -
+ .../apache/hadoop/yarn/service/utils/HttpUtil.java |  119 -
+ .../hadoop/yarn/service/utils/JsonSerDeser.java    |  238 ---
+ .../yarn/service/utils/PatternValidator.java       |   58 -
+ .../hadoop/yarn/service/utils/PortScanner.java     |  113 -
+ .../yarn/service/utils/PublishedConfiguration.java |  187 --
+ .../utils/PublishedConfigurationOutputter.java     |  210 --
+ .../service/utils/SerializedApplicationReport.java |   96 -
+ .../hadoop/yarn/service/utils/ServiceApiUtil.java  |  786 ---------
+ .../yarn/service/utils/ServiceRegistryUtils.java   |  116 -
+ .../hadoop/yarn/service/utils/ServiceUtils.java    |  599 -------
+ .../yarn/service/utils/SliderFileSystem.java       |  134 -
+ .../hadoop/yarn/service/utils/ZookeeperUtils.java  |  146 --
+ .../src/main/proto/ClientAMProtocol.proto          |  115 -
+ .../org.apache.hadoop.security.SecurityInfo        |   14 
+ .../yarn/service/MockRunningServiceContext.java    |  205 --
+ .../apache/hadoop/yarn/service/MockServiceAM.java  |  468 -----
+ .../hadoop/yarn/service/ServiceTestUtils.java      |  584 ------
+ .../TestDefaultUpgradeComponentsFinder.java        |  123 -
+ .../apache/hadoop/yarn/service/TestServiceAM.java  |  607 -------
+ .../hadoop/yarn/service/TestServiceManager.java    |  431 -----
+ .../yarn/service/TestYarnNativeServices.java       | 1028 -----------
+ .../client/TestBuildExternalComponents.java        |  119 -
+ .../hadoop/yarn/service/client/TestServiceCLI.java |  354 ----
+ .../yarn/service/client/TestServiceClient.java     |  334 ----
+ .../yarn/service/component/TestComponent.java      |  517 ------
+ .../TestComponentDecommissionInstances.java        |  147 --
+ .../component/TestComponentRestartPolicy.java      |  131 -
+ .../component/instance/TestComponentInstance.java  |  819 ---------
+ .../hadoop/yarn/service/conf/ExampleAppJson.java   |   66 -
+ .../yarn/service/conf/TestAppJsonResolve.java      |  236 ---
+ .../yarn/service/conf/TestLoadExampleAppJson.java  |   71 -
+ .../service/conf/TestValidateServiceNames.java     |  125 -
+ .../containerlaunch/TestAbstractLauncher.java      |  119 -
+ .../yarn/service/monitor/TestServiceMonitor.java   |  126 -
+ .../service/monitor/probe/TestDefaultProbe.java    |  155 --
+ .../provider/TestAbstractProviderService.java      |  157 --
+ .../yarn/service/provider/TestProviderUtils.java   |  185 --
+ .../providers/TestAbstractClientProvider.java      |  163 --
+ .../providers/TestDefaultClientProvider.java       |   66 -
+ .../service/providers/TestProviderFactory.java     |   76 -
+ .../TestServiceTimelinePublisher.java              |  297 ---
+ .../yarn/service/utils/TestCoreFileSystem.java     |   46 -
+ .../hadoop/yarn/service/utils/TestFilterUtils.java |  111 -
+ .../yarn/service/utils/TestServiceApiUtil.java     |  771 ---------
+ .../src/test/resources/example-app.json            |   16 
+ .../src/test/resources/log4j.properties            |   19 
+ .../yarn/service/conf/examples/app-override.json   |   77 -
+ .../hadoop/yarn/service/conf/examples/app.json     |   60 -
+ .../hadoop/yarn/service/conf/examples/default.json |   17 
+ .../yarn/service/conf/examples/external0.json      |   16 
+ .../yarn/service/conf/examples/external1.json      |   31 
+ .../yarn/service/conf/examples/external2.json      |   23 
+ .../yarn/service/conf/examples/external3.json      |   27 
+ .../src/test/resources/yarn-site.xml               |   19 
+ .../hadoop-yarn-services/pom.xml                   |   39 
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |    4 
+ hadoop-yarn-project/pom.xml                        |    4 
+ 212 files changed, 37762 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/dev-support/findbugs-exclude.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/SystemServiceManagerImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServerWebApp.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/log4j-server.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/webapps/api-server/app
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/webapp/WEB-INF/web.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestCleanupAfterKill.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSecureApiServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSystemServiceManagerImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/example-app.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/bad/bad.yarnfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app1.yarnfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app2.yarnfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app3.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app1.yarnfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app2.yarnfile
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/yarn-site.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf/yarnservice-log4j.properties
+ delete mode 100755 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-no-dns.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-proxy-no-dns.conf
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd-proxy.conf
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/sleeper/sleeper.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMPolicyProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMProtocol.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMSecurityInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ContainerFailureTracker.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceContext.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEvent.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEventType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMaster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/UpgradeComponentsFinder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/ServiceApiConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Artifact.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/BaseResource.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentContainers.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentState.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFile.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFormat.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Configuration.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Container.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ContainerState.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Error.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/KerberosPrincipal.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/LocalizationStatus.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementConstraint.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementScope.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ReadinessCheck.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Resource.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ResourceInformation.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Service.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceState.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceStatus.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ClientAMProxy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/AlwaysRestartPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEvent.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEventType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentRestartPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentState.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEvent.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEventType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceId.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceState.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/RestApiConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/SliderExitCodes.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ClasspathConstructor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/CommandLineBuilder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ContainerLaunchService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/JavaCommandLineBuilder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadClusterStateException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadCommandArgumentsException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadConfigException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ErrorStrings.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ExitCodeProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/LauncherExitCodes.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/RestApiErrorMessages.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ServiceLaunchException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/SliderException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/UsageException.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/client/ClientAMProtocolPBClientImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPB.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPBServiceImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ComponentHealthThresholdMonitor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ServiceMonitor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/DefaultProbe.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/HttpProbe.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/LogEntryBuilder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorKeys.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/PortProbe.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/Probe.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/ProbeStatus.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/CustomRegistryConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/YarnRegistryViewForProviders.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEntityType.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEvent.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineMetricsConstants.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ApplicationReportSerDeser.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ClientRegistryBinder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Comparators.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigHelper.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/CoreFileSystem.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Duration.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/FilterUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/HttpUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/JsonSerDeser.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PatternValidator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PortScanner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfiguration.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfigurationOutputter.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SerializedApplicationReport.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceRegistryUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SliderFileSystem.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ZookeeperUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/proto/ClientAMProtocol.proto
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockRunningServiceContext.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestBuildExternalComponents.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceCLI.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceClient.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponent.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentDecommissionInstances.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/instance/TestComponentInstance.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/ExampleAppJson.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestAppJsonResolve.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestLoadExampleAppJson.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestValidateServiceNames.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/TestServiceMonitor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/probe/TestDefaultProbe.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestAbstractProviderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestProviderUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestAbstractClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestDefaultClientProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestProviderFactory.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestCoreFileSystem.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestFilterUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestServiceApiUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/example-app.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app-override.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/default.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external0.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external1.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external2.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external3.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/yarn-site.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml
+
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 3c9cf4642ba..5e5af377854 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -79,31 +79,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf</directory>
+-      <outputDirectory>etc/hadoop</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/yarn-service-examples</outputDirectory>
+-      <includes>
+-        <include>**/*</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-client/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 5792423d725..460cbf132e2 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -580,25 +580,6 @@
+         <version>${project.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-core</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-core</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>test-jar</type>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-api</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index 15ce952ef3c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,59 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-    <Match>
+-        <Package name="org.apache.hadoop.yarn.proto" />
+-    </Match>
+-    <Match>
+-        <class name="org.apache.hadoop.yarn.service.utils.ServiceApiUtil" />
+-        <Bug pattern="MS_CANNOT_BE_FINAL" />
+-    </Match>
+-    <Match>
+-        <Class name="org.apache.hadoop.yarn.service.utils.JsonSerDeser" />
+-        <Bug pattern="OBL_UNSATISFIED_OBLIGATION" />
+-    </Match>
+-    <Match>
+-        <Class name="org.apache.hadoop.yarn.service.utils.JsonSerDeser" />
+-        <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE" />
+-    </Match>
+-    <Match>
+-        <Package name="org.apache.hadoop.yarn.service.client.params"/>
+-        <Bug pattern="UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"/>
+-    </Match>
+-    <Match>
+-        <Package name="org.apache.hadoop.yarn.service.client.params"/>
+-        <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
+-    </Match>
+-    <Match>
+-        <Class name="org.apache.hadoop.yarn.service.client.ServiceClient"/>
+-        <Field name="registryClient" />
+-        <Bug pattern="IS2_INCONSISTENT_SYNC"/>
+-    </Match>
+-    <Match>
+-        <Class name="org.apache.hadoop.yarn.service.ClientAMPolicyProvider"/>
+-        <Bug pattern="EI_EXPOSE_REP"/>
+-    </Match>
+-    <!-- SE_BAD_FIELD -->
+-    <Match>
+-      <Class name="org.apache.hadoop.yarn.service.api.records.Resource" />
+-      <Or>
+-        <Field name="additional"/>
+-      </Or>
+-      <Bug pattern="SE_BAD_FIELD" />
+-  </Match>
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/dev-support/findbugs-exclude.xml
+deleted file mode 100644
+index b89146a264a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/dev-support/findbugs-exclude.xml
++++ /dev/null
+@@ -1,20 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<FindBugsFilter>
+-
+-</FindBugsFilter>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml
+deleted file mode 100644
+index 2b3e66a0370..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/pom.xml
++++ /dev/null
+@@ -1,237 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-yarn-services</artifactId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <artifactId>hadoop-yarn-services-api</artifactId>
+-  <name>Apache Hadoop YARN Services API</name>
+-  <packaging>jar</packaging>
+-  <description>Hadoop YARN REST APIs for services</description>
+-
+-  <build>
+-
+-    <!-- resources are filtered for dynamic updates. This gets build info in-->
+-    <resources>
+-      <resource>
+-        <directory>src/main/resources</directory>
+-        <filtering>true</filtering>
+-      </resource>
+-      <resource>
+-        <directory>src/main/scripts/</directory>
+-        <filtering>true</filtering>
+-      </resource>
+-    </resources>
+-
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <!-- The configuration of the plugin -->
+-        <configuration>
+-          <!-- Configuration of the archiver -->
+-          <archive>
+-            <manifestEntries>
+-              <mode>development</mode>
+-              <url>${project.url}</url>
+-            </manifestEntries>
+-            <!-- Manifest specific configuration -->
+-            <manifest>
+-            </manifest>
+-          </archive>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>**/*.json</exclude>
+-            <exclude>**/*.yarnfile</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-  <reporting>
+-  </reporting>
+-
+-  <dependencies>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-services-core</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-registry</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-auth</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.slf4j</groupId>
+-      <artifactId>slf4j-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-webapp</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.google.inject</groupId>
+-      <artifactId>guice</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>javax.ws.rs</groupId>
+-      <artifactId>jsr311-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>javax.servlet</groupId>
+-      <artifactId>javax.servlet-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-codec</groupId>
+-      <artifactId>commons-codec</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>commons-io</groupId>
+-      <artifactId>commons-io</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.commons</groupId>
+-      <artifactId>commons-lang3</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.sun.jersey</groupId>
+-      <artifactId>jersey-client</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-server</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-util</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.eclipse.jetty</groupId>
+-      <artifactId>jetty-servlet</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <!-- ======================================================== -->
+-    <!-- Test dependencies -->
+-    <!-- ======================================================== -->
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-services-core</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-test</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minikdc</artifactId>
+-      <scope>test</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>junit</groupId>
+-          <artifactId>junit</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
+deleted file mode 100644
+index c0d5272a124..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/ApiServiceClient.java
++++ /dev/null
+@@ -1,752 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.client;
+-
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.jsonSerDeser;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.URI;
+-import java.text.MessageFormat;
+-import java.util.List;
+-import java.util.Map;
+-import java.security.PrivilegedExceptionAction;
+-
+-import javax.ws.rs.core.HttpHeaders;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.UriBuilder;
+-
+-import org.apache.hadoop.util.Preconditions;
+-
+-import org.apache.commons.codec.binary.Base64;
+-import org.apache.hadoop.thirdparty.com.google.common.base.Strings;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.client.api.AppAdminClient;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
+-import org.apache.hadoop.yarn.conf.HAUtil;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.ServiceStatus;
+-import org.apache.hadoop.yarn.service.conf.RestApiConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.util.RMHAUtils;
+-import org.eclipse.jetty.util.UrlEncoded;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource.Builder;
+-import com.sun.jersey.api.client.config.ClientConfig;
+-import com.sun.jersey.api.client.config.DefaultClientConfig;
+-
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.*;
+-
+-/**
+- * The rest API client for users to manage services on YARN.
+- */
+-public class ApiServiceClient extends AppAdminClient {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ApiServiceClient.class);
+-  private static final Base64 BASE_64_CODEC = new Base64(0);
+-  protected YarnClient yarnClient;
+-
+-  public ApiServiceClient() {
+-  }
+-
+-  public ApiServiceClient(Configuration c) throws Exception {
+-    serviceInit(c);
+-  }
+-
+-  @Override protected void serviceInit(Configuration configuration)
+-      throws Exception {
+-    yarnClient = YarnClient.createYarnClient();
+-    addService(yarnClient);
+-    super.serviceInit(configuration);
+-  }
+-
+-  /**
+-   * Calculate Resource Manager address base on working REST API.
+-   */
+-  String getRMWebAddress() throws IOException {
+-    Configuration conf = getConfig();
+-    String scheme = "http://";
+-    String path = "/app/v1/services/version";
+-    String rmAddress = conf
+-        .get("yarn.resourcemanager.webapp.address");
+-    if (YarnConfiguration.useHttps(conf)) {
+-      scheme = "https://";
+-      rmAddress = conf
+-          .get("yarn.resourcemanager.webapp.https.address");
+-    }
+-
+-    if (HAUtil.isHAEnabled(conf)) {
+-      boolean useKerberos = UserGroupInformation.isSecurityEnabled();
+-      List<String> rmServers = getRMHAWebAddresses(conf);
+-      StringBuilder diagnosticsMsg = new StringBuilder();
+-      for (String host : rmServers) {
+-        try {
+-          Client client = Client.create();
+-          client.setFollowRedirects(false);
+-          StringBuilder sb = new StringBuilder();
+-          sb.append(scheme)
+-              .append(host)
+-              .append(path);
+-          if (!useKerberos) {
+-            try {
+-              String username = UserGroupInformation.getCurrentUser()
+-                  .getShortUserName();
+-              sb.append("?user.name=")
+-                  .append(username);
+-            } catch (IOException e) {
+-              LOG.debug("Fail to resolve username: {}", e);
+-            }
+-          }
+-          Builder builder = client
+-              .resource(sb.toString()).type(MediaType.APPLICATION_JSON);
+-          if (useKerberos) {
+-            String[] server = host.split(":");
+-            String challenge = YarnClientUtils.generateToken(server[0]);
+-            builder.header(HttpHeaders.AUTHORIZATION, "Negotiate " +
+-                challenge);
+-            LOG.debug("Authorization: Negotiate {}", challenge);
+-          }
+-          ClientResponse test = builder.get(ClientResponse.class);
+-          if (test.getStatus() == 200) {
+-            return scheme + host;
+-          }
+-        } catch (Exception e) {
+-          LOG.info("Fail to connect to: " + host);
+-          LOG.debug("Root cause: ", e);
+-          diagnosticsMsg.append("Error connecting to " + host
+-              + " due to " + e.getMessage() + "\n");
+-        }
+-      }
+-      throw new IOException(diagnosticsMsg.toString());
+-    }
+-    return scheme+rmAddress;
+-  }
+-
+-  List<String> getRMHAWebAddresses(Configuration conf) {
+-    return RMHAUtils
+-        .getRMHAWebappAddresses(new YarnConfiguration(conf));
+-  }
+-
+-  /**
+-   * Compute active resource manager API service location.
+-   *
+-   * @param appName - YARN service name
+-   * @return URI to API Service
+-   * @throws IOException
+-   */
+-  public String getServicePath(String appName) throws IOException {
+-    String url = getRMWebAddress();
+-    StringBuilder api = new StringBuilder();
+-    api.append(url)
+-        .append("/app/v1/services");
+-    if (appName != null) {
+-      api.append("/")
+-          .append(appName);
+-    }
+-    appendUserNameIfRequired(api);
+-    return api.toString();
+-  }
+-
+-  private String getInstancesPath(String appName) throws IOException {
+-    Preconditions.checkNotNull(appName);
+-    String url = getRMWebAddress();
+-    StringBuilder api = new StringBuilder();
+-    api.append(url)
+-        .append("/app/v1/services/").append(appName).append("/")
+-        .append(RestApiConstants.COMP_INSTANCES);
+-    appendUserNameIfRequired(api);
+-    return api.toString();
+-  }
+-
+-  private String getInstancePath(String appName, List<String> components,
+-      String version, List<String> containerStates) throws IOException {
+-    UriBuilder builder = UriBuilder.fromUri(getInstancesPath(appName));
+-    if (components != null && !components.isEmpty()) {
+-      components.forEach(compName ->
+-        builder.queryParam(RestApiConstants.PARAM_COMP_NAME, compName));
+-    }
+-    if (!Strings.isNullOrEmpty(version)){
+-      builder.queryParam(RestApiConstants.PARAM_VERSION, version);
+-    }
+-    if (containerStates != null && !containerStates.isEmpty()){
+-      containerStates.forEach(state ->
+-          builder.queryParam(RestApiConstants.PARAM_CONTAINER_STATE, state));
+-    }
+-    return builder.build().toString();
+-  }
+-
+-  private String getComponentsPath(String appName) throws IOException {
+-    Preconditions.checkNotNull(appName);
+-    String url = getRMWebAddress();
+-    StringBuilder api = new StringBuilder();
+-    api.append(url)
+-        .append("/app/v1/services/").append(appName).append("/")
+-        .append(RestApiConstants.COMPONENTS);
+-    appendUserNameIfRequired(api);
+-    return api.toString();
+-  }
+-
+-  private void appendUserNameIfRequired(StringBuilder builder)
+-      throws IOException {
+-    Configuration conf = getConfig();
+-    if (conf.get("hadoop.http.authentication.type")
+-        .equalsIgnoreCase("simple")) {
+-      String username = UserGroupInformation.getCurrentUser()
+-            .getShortUserName();
+-      builder.append("?user.name=").append(UrlEncoded
+-          .encodeString(username));
+-    }
+-  }
+-
+-  public Builder getApiClient() throws IOException {
+-    return getApiClient(getServicePath(null));
+-  }
+-
+-  /**
+-   * Setup API service web request.
+-   *
+-   * @param requestPath
+-   * @return
+-   * @throws IOException
+-   */
+-  public Builder getApiClient(String requestPath)
+-      throws IOException {
+-    Client client = Client.create(getClientConfig());
+-    client.setChunkedEncodingSize(null);
+-    Builder builder = client
+-        .resource(requestPath).type(MediaType.APPLICATION_JSON);
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      try {
+-        URI url = new URI(requestPath);
+-        String challenge = YarnClientUtils.generateToken(url.getHost());
+-        builder.header(HttpHeaders.AUTHORIZATION, "Negotiate " + challenge);
+-      } catch (Exception e) {
+-        throw new IOException(e);
+-      }
+-    }
+-    return builder
+-        .accept("application/json;charset=utf-8");
+-  }
+-
+-  private ClientConfig getClientConfig() {
+-    ClientConfig config = new DefaultClientConfig();
+-    config.getProperties().put(
+-        ClientConfig.PROPERTY_CHUNKED_ENCODING_SIZE, 0);
+-    config.getProperties().put(
+-        ClientConfig.PROPERTY_BUFFER_RESPONSE_ENTITY_ON_EXCEPTION, true);
+-    return config;
+-  }
+-
+-  private int processResponse(ClientResponse response) {
+-    response.bufferEntity();
+-    String output;
+-    if (response.getStatus() == 401) {
+-      LOG.error("Authentication required");
+-      return EXIT_EXCEPTION_THROWN;
+-    }
+-    if (response.getStatus() == 503) {
+-      LOG.error("YARN Service is unavailable or disabled.");
+-      return EXIT_EXCEPTION_THROWN;
+-    }
+-    try {
+-      ServiceStatus ss = response.getEntity(ServiceStatus.class);
+-      output = ss.getDiagnostics();
+-    } catch (Throwable t) {
+-      output = response.getEntity(String.class);
+-    }
+-    if (output==null) {
+-      output = response.getEntity(String.class);
+-    }
+-    if (response.getStatus() <= 299) {
+-      LOG.info(output);
+-      return EXIT_SUCCESS;
+-    } else {
+-      LOG.error(output);
+-      return EXIT_EXCEPTION_THROWN;
+-    }
+-  }
+-
+-  /**
+-   * Utility method to load Service json from disk or from
+-   * YARN examples.
+-   *
+-   * @param fileName - path to yarnfile
+-   * @param serviceName - YARN Service Name
+-   * @param lifetime - application lifetime
+-   * @param queue - Queue to submit application
+-   * @return
+-   * @throws IOException
+-   * @throws YarnException
+-   */
+-  public Service loadAppJsonFromLocalFS(String fileName, String serviceName,
+-      Long lifetime, String queue) throws IOException, YarnException {
+-    File file = new File(fileName);
+-    if (!file.exists() && fileName.equals(file.getName())) {
+-      String examplesDirStr = System.getenv("YARN_SERVICE_EXAMPLES_DIR");
+-      String[] examplesDirs;
+-      if (examplesDirStr == null) {
+-        String yarnHome = System
+-            .getenv(ApplicationConstants.Environment.HADOOP_YARN_HOME.key());
+-        examplesDirs = new String[]{
+-            yarnHome + "/share/hadoop/yarn/yarn-service-examples",
+-            yarnHome + "/yarn-service-examples"
+-        };
+-      } else {
+-        examplesDirs = StringUtils.split(examplesDirStr, ":");
+-      }
+-      for (String dir : examplesDirs) {
+-        file = new File(MessageFormat.format("{0}/{1}/{2}.json",
+-            dir, fileName, fileName));
+-        if (file.exists()) {
+-          break;
+-        }
+-        // Then look for secondary location.
+-        file = new File(MessageFormat.format("{0}/{1}.json",
+-            dir, fileName));
+-        if (file.exists()) {
+-          break;
+-        }
+-      }
+-    }
+-    if (!file.exists()) {
+-      throw new YarnException("File or example could not be found: " +
+-          fileName);
+-    }
+-    Path filePath = new Path(file.getAbsolutePath());
+-    LOG.info("Loading service definition from local FS: " + filePath);
+-    Service service = jsonSerDeser
+-        .load(FileSystem.getLocal(getConfig()), filePath);
+-    if (!StringUtils.isEmpty(serviceName)) {
+-      service.setName(serviceName);
+-    }
+-    if (lifetime != null && lifetime > 0) {
+-      service.setLifetime(lifetime);
+-    }
+-    if (!StringUtils.isEmpty(queue)) {
+-      service.setQueue(queue);
+-    }
+-    return service;
+-  }
+-
+-  /**
+-   * Launch YARN service application.
+-   *
+-   * @param fileName - path to yarnfile
+-   * @param appName - YARN Service Name
+-   * @param lifetime - application lifetime
+-   * @param queue - Queue to submit application
+-   */
+-  @Override
+-  public int actionLaunch(String fileName, String appName, Long lifetime,
+-      String queue) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service =
+-          loadAppJsonFromLocalFS(fileName, appName, lifetime, queue);
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient()
+-          .post(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to launch application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Stop YARN service application.
+-   *
+-   * @param appName - YARN Service Name
+-   */
+-  @Override
+-  public int actionStop(String appName) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service = new Service();
+-      service.setName(appName);
+-      service.setState(ServiceState.STOPPED);
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to stop application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Start YARN service application.
+-   *
+-   * @param appName - YARN Service Name
+-   */
+-  @Override
+-  public int actionStart(String appName) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service = new Service();
+-      service.setName(appName);
+-      service.setState(ServiceState.STARTED);
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to start application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Save Service configuration.
+-   *
+-   * @param fileName - path to Yarnfile
+-   * @param appName - YARN Service Name
+-   * @param lifetime - container life time
+-   * @param queue - Queue to submit the application
+-   */
+-  @Override
+-  public int actionSave(String fileName, String appName, Long lifetime,
+-      String queue) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service =
+-          loadAppJsonFromLocalFS(fileName, appName, lifetime, queue);
+-      service.setState(ServiceState.STOPPED);
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient()
+-          .post(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to save application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Decommission a YARN service.
+-   *
+-   * @param appName - YARN Service Name
+-   */
+-  @Override
+-  public int actionDestroy(String appName) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .delete(ClientResponse.class);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to destroy application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * Change number of containers associated with a service.
+-   *
+-   * @param appName - YARN Service Name
+-   * @param componentCounts - list of components and desired container count
+-   */
+-  @Override
+-  public int actionFlex(String appName, Map<String, String> componentCounts)
+-      throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service = new Service();
+-      service.setName(appName);
+-      service.setState(ServiceState.FLEX);
+-      for (Map.Entry<String, String> entry : componentCounts.entrySet()) {
+-        Component component = new Component();
+-        component.setName(entry.getKey());
+-        Long numberOfContainers = Long.parseLong(entry.getValue());
+-        component.setNumberOfContainers(numberOfContainers);
+-        service.addComponent(component);
+-      }
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to flex application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int enableFastLaunch(String destinationFolder) throws IOException, YarnException {
+-    ServiceClient sc = new ServiceClient();
+-    sc.init(getConfig());
+-    sc.start();
+-    int result = sc.enableFastLaunch(destinationFolder);
+-    sc.close();
+-    return result;
+-  }
+-
+-  /**
+-   * Retrieve Service Status through REST API.
+-   *
+-   * @param appIdOrName - YARN application ID or application name
+-   * @return Status output
+-   */
+-  @Override
+-  public String getStatusString(String appIdOrName) throws IOException,
+-      YarnException {
+-    String output = "";
+-    String appName;
+-    try {
+-      ApplicationId appId = ApplicationId.fromString(appIdOrName);
+-      ApplicationReport appReport = yarnClient.getApplicationReport(appId);
+-      appName = appReport.getName();
+-    } catch (IllegalArgumentException e) {
+-      // not app Id format, may be app name
+-      appName = appIdOrName;
+-      ServiceApiUtil.validateNameFormat(appName, getConfig());
+-    }
+-    try {
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .get(ClientResponse.class);
+-      if (response.getStatus() == 404) {
+-        StringBuilder sb = new StringBuilder();
+-        sb.append(" Service ")
+-            .append(appName)
+-            .append(" not found");
+-        return sb.toString();
+-      }
+-      if (response.getStatus() != 200) {
+-        StringBuilder sb = new StringBuilder();
+-        sb.append(appName)
+-            .append(" Failed : HTTP error code : ")
+-            .append(response.getStatus());
+-        return sb.toString();
+-      }
+-      output = response.getEntity(String.class);
+-    } catch (Exception e) {
+-      LOG.error("Fail to check application status: ", e);
+-    }
+-    return output;
+-  }
+-
+-  @Override
+-  public int actionUpgradeExpress(String appName, File path)
+-      throws IOException, YarnException {
+-    int result;
+-    try {
+-      Service service =
+-          loadAppJsonFromLocalFS(path.getAbsolutePath(), appName, null, null);
+-      service.setState(ServiceState.EXPRESS_UPGRADING);
+-      String buffer = jsonSerDeser.toJson(service);
+-      LOG.info("Upgrade in progress. Please wait..");
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Failed to upgrade application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int initiateUpgrade(String appName,
+-      String fileName, boolean autoFinalize) throws IOException, YarnException {
+-    int result;
+-    try {
+-      Service service =
+-          loadAppJsonFromLocalFS(fileName, appName, null, null);
+-      if (autoFinalize) {
+-        service.setState(ServiceState.UPGRADING_AUTO_FINALIZE);
+-      } else {
+-        service.setState(ServiceState.UPGRADING);
+-      }
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Failed to upgrade application: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int actionUpgradeInstances(String appName, List<String> compInstances)
+-      throws IOException, YarnException {
+-    int result;
+-    Container[] toUpgrade = new Container[compInstances.size()];
+-    try {
+-      int idx = 0;
+-      for (String instanceName : compInstances) {
+-        Container container = new Container();
+-        container.setComponentInstanceName(instanceName);
+-        container.setState(ContainerState.UPGRADING);
+-        toUpgrade[idx++] = container;
+-      }
+-      String buffer = ServiceApiUtil.CONTAINER_JSON_SERDE.toJson(toUpgrade);
+-      ClientResponse response = getApiClient(getInstancesPath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Failed to upgrade component instance: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int actionUpgradeComponents(String appName, List<String> components)
+-      throws IOException, YarnException {
+-    int result;
+-    Component[] toUpgrade = new Component[components.size()];
+-    try {
+-      int idx = 0;
+-      for (String compName : components) {
+-        Component component = new Component();
+-        component.setName(compName);
+-        component.setState(ComponentState.UPGRADING);
+-        toUpgrade[idx++] = component;
+-      }
+-      String buffer = ServiceApiUtil.COMP_JSON_SERDE.toJson(toUpgrade);
+-      ClientResponse response = getApiClient(getComponentsPath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Failed to upgrade components: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int actionCleanUp(String appName, String userName) throws
+-      IOException, YarnException, InterruptedException {
+-    UserGroupInformation proxyUser;
+-    UserGroupInformation ugi;
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      proxyUser = UserGroupInformation.getLoginUser();
+-      ugi = UserGroupInformation.createProxyUser(userName, proxyUser);
+-    } else {
+-      ugi = UserGroupInformation.createRemoteUser(userName);
+-    }
+-    return ugi.doAs((PrivilegedExceptionAction<Integer>) () -> {
+-      ServiceClient sc = new ServiceClient();
+-      try {
+-        sc.init(getConfig());
+-        sc.start();
+-        int result = sc.actionCleanUp(appName, userName);
+-        return result;
+-      } finally {
+-        sc.close();
+-      }
+-    });
+-  }
+-
+-  @Override
+-  public String getInstances(String appName, List<String> components,
+-      String version, List<String> containerStates) throws IOException,
+-      YarnException {
+-    try {
+-      String uri = getInstancePath(appName, components, version,
+-          containerStates);
+-      ClientResponse response = getApiClient(uri).get(ClientResponse.class);
+-      if (response.getStatus() != 200) {
+-        StringBuilder sb = new StringBuilder();
+-        sb.append("Failed: HTTP error code: ")
+-            .append(response.getStatus())
+-            .append(" ErrorMsg: ").append(response.getEntity(String.class));
+-        return sb.toString();
+-      }
+-      return response.getEntity(String.class);
+-    } catch (Exception e) {
+-      LOG.error("Fail to get containers {}", e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public int actionCancelUpgrade(
+-      String appName) throws IOException, YarnException {
+-    int result;
+-    try {
+-      Service service = new Service();
+-      service.setName(appName);
+-      service.setState(ServiceState.CANCEL_UPGRADING);
+-      String buffer = jsonSerDeser.toJson(service);
+-      LOG.info("Cancel upgrade in progress. Please wait..");
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Failed to cancel upgrade: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-
+-  @Override
+-  public int actionDecommissionInstances(String appName, List<String>
+-      componentInstances) throws IOException, YarnException {
+-    int result = EXIT_SUCCESS;
+-    try {
+-      Service service = new Service();
+-      service.setName(appName);
+-      for (String instance : componentInstances) {
+-        String componentName = ServiceApiUtil.parseComponentName(instance);
+-        Component component = service.getComponent(componentName);
+-        if (component == null) {
+-          component = new Component();
+-          component.setName(componentName);
+-          service.addComponent(component);
+-        }
+-        component.addDecommissionedInstance(instance);
+-      }
+-      String buffer = jsonSerDeser.toJson(service);
+-      ClientResponse response = getApiClient(getServicePath(appName))
+-          .put(ClientResponse.class, buffer);
+-      result = processResponse(response);
+-    } catch (Exception e) {
+-      LOG.error("Fail to decommission instance: ", e);
+-      result = EXIT_EXCEPTION_THROWN;
+-    }
+-    return result;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/SystemServiceManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/SystemServiceManagerImpl.java
+deleted file mode 100644
+index f971d7140aa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/SystemServiceManagerImpl.java
++++ /dev/null
+@@ -1,410 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.service.SystemServiceManager;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.lang.reflect.UndeclaredThrowableException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.jsonSerDeser;
+-
+-/**
+- * SystemServiceManager implementation.
+- * Scan for configure system service path.
+- *
+- * The service path structure is as follows:
+- * SYSTEM_SERVICE_DIR_PATH
+- * |---- sync
+- * |     |--- user1
+- * |     |    |---- service1.yarnfile
+- * |     |    |---- service2.yarnfile
+- * |     |--- user2
+- * |     |    |---- service1.yarnfile
+- * |     |    ....
+- * |     |
+- * |---- async
+- * |     |--- user3
+- * |     |    |---- service1.yarnfile
+- * |     |    |---- service2.yarnfile
+- * |     |--- user4
+- * |     |    |---- service1.yarnfile
+- * |     |    ....
+- * |     |
+- *
+- * sync: These services are launched at the time of service start synchronously.
+- *       It is a blocking service start.
+- * async: These services are launched in separate thread without any delay after
+- *       service start. Non-blocking service start.
+- */
+-public class SystemServiceManagerImpl extends AbstractService
+-    implements SystemServiceManager {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SystemServiceManagerImpl.class);
+-
+-  private static final String YARN_FILE_SUFFIX = ".yarnfile";
+-  private static final String SYNC = "sync";
+-  private static final String ASYNC = "async";
+-
+-  private FileSystem fs;
+-  private Path systemServiceDir;
+-  private AtomicBoolean stopExecutors = new AtomicBoolean(false);
+-  private Map<String, Set<Service>> syncUserServices = new HashMap<>();
+-  private Map<String, Set<Service>> asyncUserServices = new HashMap<>();
+-  private UserGroupInformation loginUGI;
+-  private Thread serviceLaucher;
+-
+-  @VisibleForTesting
+-  private int badFileNameExtensionSkipCounter;
+-  @VisibleForTesting
+-  private Map<String, Integer> ignoredUserServices =
+-      new HashMap<>();
+-  @VisibleForTesting
+-  private int badDirSkipCounter;
+-
+-  public SystemServiceManagerImpl() {
+-    super(SystemServiceManagerImpl.class.getName());
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    String dirPath =
+-        conf.get(YarnServiceConf.YARN_SERVICES_SYSTEM_SERVICE_DIRECTORY);
+-    if (dirPath != null) {
+-      systemServiceDir = new Path(dirPath);
+-      LOG.info("System Service Directory is configured to {}",
+-          systemServiceDir);
+-      fs = systemServiceDir.getFileSystem(conf);
+-      this.loginUGI = UserGroupInformation.isSecurityEnabled() ?
+-          UserGroupInformation.getLoginUser() :
+-          UserGroupInformation.getCurrentUser();
+-      LOG.info("UserGroupInformation initialized to {}", loginUGI);
+-    }
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    scanForUserServices();
+-    launchUserService(syncUserServices);
+-    // Create a thread and submit services in background otherwise it
+-    // block RM switch time.
+-    serviceLaucher = new Thread(createRunnable());
+-    serviceLaucher.setName("System service launcher");
+-    serviceLaucher.start();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping {}", getName());
+-    stopExecutors.set(true);
+-
+-    if (serviceLaucher != null) {
+-      serviceLaucher.interrupt();
+-      try {
+-        serviceLaucher.join();
+-      } catch (InterruptedException ie) {
+-        LOG.warn("Interrupted Exception while stopping", ie);
+-      }
+-    }
+-  }
+-
+-  private Runnable createRunnable() {
+-    return new Runnable() {
+-      @Override
+-      public void run() {
+-        launchUserService(asyncUserServices);
+-      }
+-    };
+-  }
+-
+-  void launchUserService(Map<String, Set<Service>> userServices) {
+-    for (Map.Entry<String, Set<Service>> entry : userServices.entrySet()) {
+-      String user = entry.getKey();
+-      Set<Service> services = entry.getValue();
+-      if (services.isEmpty()) {
+-        continue;
+-      }
+-      ServiceClient serviceClient = null;
+-      try {
+-        UserGroupInformation userUgi = getProxyUser(user);
+-        serviceClient = createServiceClient(userUgi);
+-        for (Service service : services) {
+-          LOG.info("POST: createService = {} user = {}", service, userUgi);
+-          try {
+-            launchServices(userUgi, serviceClient, service);
+-          } catch (IOException | UndeclaredThrowableException e) {
+-            if (e.getCause() != null) {
+-              LOG.warn(e.getCause().getMessage());
+-            } else {
+-              String message =
+-                  "Failed to create service " + service.getName() + " : ";
+-              LOG.error(message, e);
+-            }
+-          }
+-        }
+-      } catch (InterruptedException e) {
+-        LOG.warn("System service launcher thread interrupted", e);
+-        break;
+-      } catch (Exception e) {
+-        LOG.error("Error while submitting services for user " + user, e);
+-      } finally {
+-        if (serviceClient != null) {
+-          try {
+-            serviceClient.close();
+-          } catch (IOException e) {
+-            LOG.warn("Error while closing serviceClient for user {}", user);
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  private ServiceClient createServiceClient(UserGroupInformation userUgi)
+-      throws IOException, InterruptedException {
+-    ServiceClient serviceClient =
+-        userUgi.doAs(new PrivilegedExceptionAction<ServiceClient>() {
+-          @Override public ServiceClient run()
+-              throws IOException, YarnException {
+-            ServiceClient sc = getServiceClient();
+-            sc.init(getConfig());
+-            sc.start();
+-            return sc;
+-          }
+-        });
+-    return serviceClient;
+-  }
+-
+-  private void launchServices(UserGroupInformation userUgi,
+-      ServiceClient serviceClient, Service service)
+-      throws IOException, InterruptedException {
+-    if (service.getState() == ServiceState.STOPPED) {
+-      userUgi.doAs(new PrivilegedExceptionAction<Void>() {
+-        @Override public Void run() throws IOException, YarnException {
+-          serviceClient.actionBuild(service);
+-          return null;
+-        }
+-      });
+-      LOG.info("Service {} version {} saved.", service.getName(),
+-          service.getVersion());
+-    } else {
+-      ApplicationId applicationId =
+-          userUgi.doAs(new PrivilegedExceptionAction<ApplicationId>() {
+-            @Override public ApplicationId run()
+-                throws IOException, YarnException {
+-              boolean tryStart = true;
+-              try {
+-                serviceClient.actionBuild(service);
+-              } catch (Exception e) {
+-                if (e instanceof SliderException && ((SliderException) e)
+-                    .getExitCode() == SliderExitCodes.EXIT_INSTANCE_EXISTS) {
+-                  LOG.info("Service {} already exists, will attempt to start " +
+-                      "service", service.getName());
+-                } else {
+-                  tryStart = false;
+-                  LOG.info("Got exception saving {}, will not attempt to " +
+-                      "start service", service.getName(), e);
+-                }
+-              }
+-              if (tryStart) {
+-                return serviceClient.actionStartAndGetId(service.getName());
+-              } else {
+-                return null;
+-              }
+-            }
+-          });
+-      if (applicationId != null) {
+-        LOG.info("Service {} submitted with Application ID: {}",
+-            service.getName(), applicationId);
+-      }
+-    }
+-  }
+-
+-  ServiceClient getServiceClient() {
+-    return new ServiceClient();
+-  }
+-
+-  private UserGroupInformation getProxyUser(String user) {
+-    UserGroupInformation ugi;
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      ugi = UserGroupInformation.createProxyUser(user, loginUGI);
+-    } else {
+-      ugi = UserGroupInformation.createRemoteUser(user);
+-    }
+-    return ugi;
+-  }
+-
+-  // scan for both launch service types i.e sync and async
+-  void scanForUserServices() throws IOException {
+-    if (systemServiceDir == null) {
+-      return;
+-    }
+-    try {
+-      LOG.info("Scan for launch type on {}", systemServiceDir);
+-      RemoteIterator<FileStatus> iterLaunchType = list(systemServiceDir);
+-      while (iterLaunchType.hasNext()) {
+-        FileStatus launchType = iterLaunchType.next();
+-        if (!launchType.isDirectory()) {
+-          LOG.debug("Scanner skips for unknown file {}", launchType.getPath());
+-          continue;
+-        }
+-        if (launchType.getPath().getName().equals(SYNC)) {
+-          scanForUserServiceDefinition(launchType.getPath(), syncUserServices);
+-        } else if (launchType.getPath().getName().equals(ASYNC)) {
+-          scanForUserServiceDefinition(launchType.getPath(), asyncUserServices);
+-        } else {
+-          badDirSkipCounter++;
+-          LOG.debug("Scanner skips for unknown dir {}.", launchType.getPath());
+-        }
+-      }
+-    } catch (FileNotFoundException e) {
+-      LOG.warn("System service directory {} doesn't not exist.",
+-          systemServiceDir);
+-    }
+-  }
+-
+-  // Files are under systemServiceDir/<users>. Scan for 2 levels
+-  // 1st level for users
+-  // 2nd level for service definitions under user
+-  private void scanForUserServiceDefinition(Path userDirPath,
+-      Map<String, Set<Service>> userServices) throws IOException {
+-    LOG.info("Scan for users on {}", userDirPath);
+-    RemoteIterator<FileStatus> iterUsers = list(userDirPath);
+-    while (iterUsers.hasNext()) {
+-      FileStatus userDir = iterUsers.next();
+-      // if 1st level is not user directory then skip it.
+-      if (!userDir.isDirectory()) {
+-        LOG.info(
+-            "Service definition {} doesn't belong to any user. Ignoring.. ",
+-            userDir.getPath().getName());
+-        continue;
+-      }
+-      String userName = userDir.getPath().getName();
+-      LOG.info("Scanning service definitions for user {}.", userName);
+-
+-      //2nd level scan
+-      RemoteIterator<FileStatus> iterServices = list(userDir.getPath());
+-      while (iterServices.hasNext()) {
+-        FileStatus serviceCache = iterServices.next();
+-        String filename = serviceCache.getPath().getName();
+-        if (!serviceCache.isFile()) {
+-          LOG.info("Scanner skips for unknown dir {}", filename);
+-          continue;
+-        }
+-        if (!filename.endsWith(YARN_FILE_SUFFIX)) {
+-          LOG.info("Scanner skips for unknown file extension, filename = {}",
+-              filename);
+-          badFileNameExtensionSkipCounter++;
+-          continue;
+-        }
+-        Service service = getServiceDefinition(serviceCache.getPath());
+-        if (service != null) {
+-          Set<Service> services = userServices.get(userName);
+-          if (services == null) {
+-            services = new HashSet<>();
+-            userServices.put(userName, services);
+-          }
+-          if (!services.add(service)) {
+-            int count = ignoredUserServices.containsKey(userName) ?
+-                ignoredUserServices.get(userName) : 0;
+-            ignoredUserServices.put(userName, count + 1);
+-            LOG.warn(
+-                "Ignoring service {} for the user {} as it is already present,"
+-                    + " filename = {}", service.getName(), userName, filename);
+-          } else {
+-            LOG.info("Added service {} for the user {}, filename = {}",
+-                service.getName(), userName, filename);
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  private Service getServiceDefinition(Path filePath) {
+-    Service service = null;
+-    try {
+-      LOG.debug("Loading service definition from FS: {}", filePath);
+-      service = jsonSerDeser.load(fs, filePath);
+-    } catch (IOException e) {
+-      LOG.info("Error while loading service definition from FS: {}", e);
+-    }
+-    return service;
+-  }
+-
+-  private RemoteIterator<FileStatus> list(Path path) throws IOException {
+-    return new StoppableRemoteIterator(fs.listStatusIterator(path));
+-  }
+-
+-  @VisibleForTesting Map<String, Integer> getIgnoredUserServices() {
+-    return ignoredUserServices;
+-  }
+-
+-  private class StoppableRemoteIterator implements RemoteIterator<FileStatus> {
+-    private final RemoteIterator<FileStatus> remote;
+-
+-    StoppableRemoteIterator(RemoteIterator<FileStatus> remote) {
+-      this.remote = remote;
+-    }
+-
+-    @Override public boolean hasNext() throws IOException {
+-      return !stopExecutors.get() && remote.hasNext();
+-    }
+-
+-    @Override public FileStatus next() throws IOException {
+-      return remote.next();
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  Map<String, Set<Service>> getSyncUserServices() {
+-    return syncUserServices;
+-  }
+-
+-  @VisibleForTesting
+-  int getBadFileNameExtensionSkipCounter() {
+-    return badFileNameExtensionSkipCounter;
+-  }
+-
+-  @VisibleForTesting
+-  int getBadDirSkipCounter() {
+-    return badDirSkipCounter;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/package-info.java
+deleted file mode 100644
+index cf5ce112449..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/client/package-info.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Package org.apache.hadoop.yarn.service.client contains classes
+- * for YARN Services Client API.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+deleted file mode 100644
+index c4c5a760e77..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
++++ /dev/null
+@@ -1,973 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.webapp;
+-
+-import com.google.inject.Inject;
+-import com.google.inject.Singleton;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.AccessControlException;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.ServiceStatus;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.conf.RestApiConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.ws.rs.*;
+-import javax.ws.rs.core.Context;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.lang.reflect.UndeclaredThrowableException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.*;
+-import java.util.stream.Collectors;
+-
+-import static org.apache.hadoop.yarn.service.api.records.ServiceState.ACCEPTED;
+-import static org.apache.hadoop.yarn.service.api.records.ServiceState.CANCEL_UPGRADING;
+-import static org.apache.hadoop.yarn.service.conf.RestApiConstants.*;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.*;
+-
+-/**
+- * The rest API endpoints for users to manage services on YARN.
+- */
+-@Singleton
+-@Path(CONTEXT_ROOT)
+-public class ApiServer {
+-
+-  public ApiServer() {
+-    super();
+-  }
+-  
+-  @Inject
+-  public ApiServer(Configuration conf) {
+-    super();
+-  }
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ApiServer.class);
+-  private static Configuration YARN_CONFIG = new YarnConfiguration();
+-  private ServiceClient serviceClientUnitTest;
+-  private boolean unitTest = false;
+-
+-  static {
+-    init();
+-  }
+-
+-  // initialize all the common resources - order is important
+-  private static void init() {
+-  }
+-
+-  @GET
+-  @Path(VERSION)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+-  public Response getVersion() {
+-    String version = VersionInfo.getBuildVersion();
+-    LOG.info(version);
+-    return Response.ok("{ \"hadoop_version\": \"" + version + "\"}").build();
+-  }
+-
+-  @POST
+-  @Path(SERVICE_ROOT_PATH)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+-  public Response createService(@Context HttpServletRequest request,
+-      Service service) {
+-    ServiceStatus serviceStatus = new ServiceStatus();
+-    try {
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("POST: createService = {} user = {}", service, ugi);
+-      if(service.getState()==ServiceState.STOPPED) {
+-        ugi.doAs(new PrivilegedExceptionAction<Void>() {
+-          @Override
+-          public Void run() throws YarnException, IOException {
+-            ServiceClient sc = getServiceClient();
+-            try {
+-              sc.init(YARN_CONFIG);
+-              sc.start();
+-              sc.actionBuild(service);
+-            } finally {
+-              sc.close();
+-            }
+-            return null;
+-          }
+-        });
+-        serviceStatus.setDiagnostics("Service " + service.getName() +
+-            " version " + service.getVersion() + " saved.");
+-      } else {
+-        ApplicationId applicationId = ugi
+-            .doAs(new PrivilegedExceptionAction<ApplicationId>() {
+-              @Override
+-              public ApplicationId run() throws IOException, YarnException {
+-                ServiceClient sc = getServiceClient();
+-                try {
+-                  sc.init(YARN_CONFIG);
+-                  sc.start();
+-                  ApplicationId applicationId = sc.actionCreate(service);
+-                  return applicationId;
+-                } finally {
+-                  sc.close();
+-                }
+-              }
+-            });
+-        serviceStatus.setDiagnostics("Application ID: " + applicationId);
+-      }
+-      serviceStatus.setState(ACCEPTED);
+-      serviceStatus.setUri(
+-          CONTEXT_ROOT + SERVICE_ROOT_PATH + "/" + service
+-              .getName());
+-      return formatResponse(Status.ACCEPTED, serviceStatus);
+-    } catch (AccessControlException e) {
+-      serviceStatus.setDiagnostics(e.getMessage());
+-      return formatResponse(Status.FORBIDDEN, e.getCause().getMessage());
+-    } catch (IllegalArgumentException e) {
+-      return formatResponse(Status.BAD_REQUEST, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      String message = "Failed to create service " + service.getName()
+-          + ": {}";
+-      LOG.error(message, e);
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      String message = "Failed to create service " + service.getName()
+-          + ": {}";
+-      LOG.error(message, e);
+-      if (e.getCause().getMessage().contains("already exists")) {
+-        message = "Service name " + service.getName() + " is already taken.";
+-      } else {
+-        message = e.getCause().getMessage();
+-      }
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR,
+-          message);
+-    }
+-  }
+-
+-  @GET
+-  @Path(SERVICE_PATH)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+-  public Response getService(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String appName) {
+-    ServiceStatus serviceStatus = new ServiceStatus();
+-    try {
+-      if (appName == null) {
+-        throw new IllegalArgumentException("Service name cannot be null.");
+-      }
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("GET: getService for appName = {} user = {}", appName, ugi);
+-      Service app = getServiceFromClient(ugi, appName);
+-      return Response.ok(app).build();
+-    } catch (AccessControlException e) {
+-      return formatResponse(Status.FORBIDDEN, e.getMessage());
+-    } catch (IllegalArgumentException e) {
+-      serviceStatus.setDiagnostics(e.getMessage());
+-      serviceStatus.setCode(ERROR_CODE_APP_NAME_INVALID);
+-      return Response.status(Status.NOT_FOUND).entity(serviceStatus)
+-          .build();
+-    } catch (FileNotFoundException e) {
+-      serviceStatus.setDiagnostics("Service " + appName + " not found");
+-      serviceStatus.setCode(ERROR_CODE_APP_NAME_INVALID);
+-      return Response.status(Status.NOT_FOUND).entity(serviceStatus)
+-          .build();
+-    } catch (IOException | InterruptedException e) {
+-      LOG.error("Get service failed: {}", e);
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      LOG.error("Get service failed: {}", e);
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-  }
+-
+-  @DELETE
+-  @Path(SERVICE_PATH)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+-  public Response deleteService(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String appName) {
+-    try {
+-      if (appName == null) {
+-        throw new IllegalArgumentException("Service name can not be null.");
+-      }
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("DELETE: deleteService for appName = {} user = {}",
+-          appName, ugi);
+-      return stopService(appName, true, ugi);
+-    } catch (AccessControlException e) {
+-      return formatResponse(Status.FORBIDDEN, e.getMessage());
+-    } catch (IllegalArgumentException e) {
+-      return formatResponse(Status.BAD_REQUEST, e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      LOG.error("Fail to stop service: {}", e);
+-      return formatResponse(Status.BAD_REQUEST,
+-          e.getCause().getMessage());
+-    } catch (YarnException | FileNotFoundException e) {
+-      return formatResponse(Status.NOT_FOUND, e.getMessage());
+-    } catch (Exception e) {
+-      LOG.error("Fail to stop service: {}", e);
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+-    }
+-  }
+-
+-  private Response stopService(String appName, boolean destroy,
+-      final UserGroupInformation ugi) throws Exception {
+-    int result = ugi.doAs(new PrivilegedExceptionAction<Integer>() {
+-      @Override
+-      public Integer run() throws Exception {
+-        int result = 0;
+-        ServiceClient sc = getServiceClient();
+-        try {
+-          sc.init(YARN_CONFIG);
+-          sc.start();
+-          Exception stopException = null;
+-          try {
+-            result = sc.actionStop(appName, destroy);
+-            if (result == EXIT_SUCCESS) {
+-              LOG.info("Successfully stopped service {}", appName);
+-            }
+-          } catch (Exception e) {
+-            LOG.info("Got exception stopping service", e);
+-            stopException = e;
+-          }
+-          if (destroy) {
+-            result = sc.actionDestroy(appName);
+-            if (result == EXIT_SUCCESS) {
+-              LOG.info("Successfully deleted service {}", appName);
+-            }
+-          } else {
+-            if (stopException != null) {
+-              throw stopException;
+-            }
+-          }
+-        } finally {
+-          sc.close();
+-        }
+-        return result;
+-      }
+-    });
+-    ServiceStatus serviceStatus = new ServiceStatus();
+-    if (destroy) {
+-      if (result == EXIT_SUCCESS) {
+-        serviceStatus.setDiagnostics("Successfully destroyed service " +
+-            appName);
+-      } else {
+-        if (result == EXIT_NOT_FOUND) {
+-          serviceStatus
+-              .setDiagnostics("Service " + appName + " doesn't exist");
+-          return formatResponse(Status.BAD_REQUEST, serviceStatus);
+-        } else {
+-          serviceStatus
+-              .setDiagnostics("Service " + appName + " error cleaning up " +
+-                  "registry");
+-          return formatResponse(Status.INTERNAL_SERVER_ERROR, serviceStatus);
+-        }
+-      }
+-    } else {
+-      if (result == EXIT_COMMAND_ARGUMENT_ERROR) {
+-        serviceStatus
+-            .setDiagnostics("Service " + appName + " is already stopped");
+-        return formatResponse(Status.BAD_REQUEST, serviceStatus);
+-      } else {
+-        serviceStatus.setDiagnostics("Successfully stopped service " + appName);
+-      }
+-    }
+-    return formatResponse(Status.OK, serviceStatus);
+-  }
+-
+-  @PUT
+-  @Path(COMPONENTS_PATH)
+-  @Consumes({MediaType.APPLICATION_JSON})
+-  @Produces({RestApiConstants.MEDIA_TYPE_JSON_UTF8, MediaType.TEXT_PLAIN})
+-  public Response updateComponents(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String serviceName,
+-      List<Component> requestComponents) {
+-
+-    try {
+-      if (requestComponents == null || requestComponents.isEmpty()) {
+-        throw new YarnException("No components provided.");
+-      }
+-      UserGroupInformation ugi = getProxyUser(request);
+-      Set<String> compNamesToUpgrade = new HashSet<>();
+-      requestComponents.forEach(reqComp -> {
+-        if (reqComp.getState() != null &&
+-            reqComp.getState().equals(ComponentState.UPGRADING)) {
+-          compNamesToUpgrade.add(reqComp.getName());
+-        }
+-      });
+-      LOG.info("PUT: upgrade components {} for service {} " +
+-          "user = {}", compNamesToUpgrade, serviceName, ugi);
+-      return processComponentsUpgrade(ugi, serviceName, compNamesToUpgrade);
+-    } catch (AccessControlException e) {
+-      return formatResponse(Response.Status.FORBIDDEN, e.getMessage());
+-    } catch (YarnException e) {
+-      return formatResponse(Response.Status.BAD_REQUEST, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-  }
+-
+-  @PUT
+-  @Path(COMPONENT_PATH)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8",
+-              MediaType.TEXT_PLAIN  })
+-  public Response updateComponent(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String appName,
+-      @PathParam(COMPONENT_NAME) String componentName, Component component) {
+-
+-    try {
+-      if (component == null) {
+-        throw new YarnException("No component data provided");
+-      }
+-      if (component.getName() != null
+-          && !component.getName().equals(componentName)) {
+-        String msg = "Component name in the request object ("
+-            + component.getName() + ") does not match that in the URI path ("
+-            + componentName + ")";
+-        throw new YarnException(msg);
+-      }
+-      UserGroupInformation ugi = getProxyUser(request);
+-      if (component.getState() != null &&
+-          component.getState().equals(ComponentState.UPGRADING)) {
+-        LOG.info("PUT: upgrade component {} for service {} " +
+-            "user = {}", component.getName(), appName, ugi);
+-        return processComponentsUpgrade(ugi, appName,
+-            Sets.newHashSet(componentName));
+-      }
+-
+-      if (component.getNumberOfContainers() == null) {
+-        throw new YarnException("No container count provided");
+-      }
+-      if (component.getNumberOfContainers() < 0) {
+-        String message = "Invalid number of containers specified "
+-            + component.getNumberOfContainers();
+-        throw new YarnException(message);
+-      }
+-      Map<String, Long> original = ugi
+-          .doAs(new PrivilegedExceptionAction<Map<String, Long>>() {
+-            @Override
+-            public Map<String, Long> run() throws YarnException, IOException {
+-              ServiceClient sc = new ServiceClient();
+-              try {
+-                sc.init(YARN_CONFIG);
+-                sc.start();
+-                Map<String, Long> original = sc.flexByRestService(appName,
+-                    Collections.singletonMap(componentName,
+-                        component.getNumberOfContainers()));
+-                return original;
+-              } finally {
+-                sc.close();
+-              }
+-            }
+-          });
+-      ServiceStatus status = new ServiceStatus();
+-      status.setDiagnostics(
+-          "Updating component (" + componentName + ") size from " + original
+-              .get(componentName) + " to " + component.getNumberOfContainers());
+-      return formatResponse(Status.OK, status);
+-    } catch (AccessControlException e) {
+-      return formatResponse(Status.FORBIDDEN, e.getMessage());
+-    } catch (YarnException e) {
+-      return formatResponse(Status.BAD_REQUEST, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR,
+-          e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-  }
+-
+-  @PUT
+-  @Path(SERVICE_PATH)
+-  @Consumes({ MediaType.APPLICATION_JSON })
+-  @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" })
+-  public Response updateService(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String appName,
+-      Service updateServiceData) {
+-    try {
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("PUT: updateService for app = {} with data = {} user = {}",
+-          appName, updateServiceData, ugi);
+-      // Ignore the app name provided in updateServiceData and always use
+-      // appName path param
+-      updateServiceData.setName(appName);
+-
+-      if (updateServiceData.getState() != null
+-          && updateServiceData.getState() == ServiceState.FLEX) {
+-        return flexService(updateServiceData, ugi);
+-      }
+-      // For STOP the app should be running. If already stopped then this
+-      // operation will be a no-op. For START it should be in stopped state.
+-      // If already running then this operation will be a no-op.
+-      if (updateServiceData.getState() != null
+-          && updateServiceData.getState() == ServiceState.STOPPED) {
+-        return stopService(appName, false, ugi);
+-      }
+-
+-      // If a START is requested
+-      if (updateServiceData.getState() != null
+-          && updateServiceData.getState() == ServiceState.STARTED) {
+-        return startService(appName, ugi);
+-      }
+-
+-      // If an UPGRADE is requested
+-      if (updateServiceData.getState() != null && (
+-          updateServiceData.getState() == ServiceState.UPGRADING ||
+-              updateServiceData.getState() ==
+-                  ServiceState.UPGRADING_AUTO_FINALIZE) ||
+-          updateServiceData.getState() == ServiceState.EXPRESS_UPGRADING) {
+-        return upgradeService(updateServiceData, ugi);
+-      }
+-
+-      // If CANCEL_UPGRADING is requested
+-      if (updateServiceData.getState() != null &&
+-          updateServiceData.getState() == CANCEL_UPGRADING) {
+-        return cancelUpgradeService(appName, ugi);
+-      }
+-
+-      // If new lifetime value specified then update it
+-      if (updateServiceData.getLifetime() != null
+-          && updateServiceData.getLifetime() > 0) {
+-        return updateLifetime(appName, updateServiceData, ugi);
+-      }
+-
+-      for (Component c : updateServiceData.getComponents()) {
+-        if (c.getDecommissionedInstances().size() > 0) {
+-          return decommissionInstances(updateServiceData, ugi);
+-        }
+-      }
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Status.BAD_REQUEST,
+-          e.getCause().getMessage());
+-    } catch (AccessControlException e) {
+-      return formatResponse(Status.FORBIDDEN, e.getMessage());
+-    } catch (FileNotFoundException e) {
+-      String message = "Application is not found app: " + appName;
+-      LOG.error(message, e);
+-      return formatResponse(Status.NOT_FOUND, e.getMessage());
+-    } catch (YarnException e) {
+-      LOG.error(e.getMessage(), e);
+-      return formatResponse(Status.NOT_FOUND, e.getMessage());
+-    } catch (Exception e) {
+-      String message = "Error while performing operation for app: " + appName;
+-      LOG.error(message, e);
+-      return formatResponse(Status.INTERNAL_SERVER_ERROR, e.getMessage());
+-    }
+-
+-    // If nothing happens consider it a no-op
+-    return Response.status(Status.NO_CONTENT).build();
+-  }
+-
+-  @PUT
+-  @Path(COMP_INSTANCE_LONG_PATH)
+-  @Consumes({MediaType.APPLICATION_JSON})
+-  @Produces({RestApiConstants.MEDIA_TYPE_JSON_UTF8, MediaType.TEXT_PLAIN})
+-  public Response updateComponentInstance(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String serviceName,
+-      @PathParam(COMPONENT_NAME) String componentName,
+-      @PathParam(COMP_INSTANCE_NAME) String compInstanceName,
+-      Container reqContainer) {
+-
+-    try {
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("PUT: update component instance {} for component = {}" +
+-              " service = {} user = {}", compInstanceName, componentName,
+-          serviceName, ugi);
+-      if (reqContainer == null) {
+-        throw new YarnException("No container data provided.");
+-      }
+-      Service service = getServiceFromClient(ugi, serviceName);
+-      Component component = service.getComponent(componentName);
+-      if (component == null) {
+-        throw new YarnException(String.format(
+-            "The component name in the URI path (%s) is invalid.",
+-            componentName));
+-      }
+-
+-      Container liveContainer = component.getComponentInstance(
+-          compInstanceName);
+-      if (liveContainer == null) {
+-        throw new YarnException(String.format(
+-            "The component (%s) does not have a component instance (%s).",
+-            componentName, compInstanceName));
+-      }
+-
+-      if (reqContainer.getState() != null
+-          && reqContainer.getState().equals(ContainerState.UPGRADING)) {
+-        return processContainersUpgrade(ugi, service,
+-            Lists.newArrayList(liveContainer));
+-      }
+-    } catch (AccessControlException e) {
+-      return formatResponse(Response.Status.FORBIDDEN, e.getMessage());
+-    } catch (YarnException e) {
+-      return formatResponse(Response.Status.BAD_REQUEST, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-    return Response.status(Status.NO_CONTENT).build();
+-  }
+-
+-  @PUT
+-  @Path(COMP_INSTANCES_PATH)
+-  @Consumes({MediaType.APPLICATION_JSON})
+-  @Produces({RestApiConstants.MEDIA_TYPE_JSON_UTF8, MediaType.TEXT_PLAIN})
+-  public Response updateComponentInstances(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String serviceName,
+-      List<Container> requestContainers) {
+-
+-    try {
+-      if (requestContainers == null || requestContainers.isEmpty()) {
+-        throw new YarnException("No containers provided.");
+-      }
+-      UserGroupInformation ugi = getProxyUser(request);
+-      List<String> toUpgrade = new ArrayList<>();
+-      for (Container reqContainer : requestContainers) {
+-        if (reqContainer.getState() != null &&
+-            reqContainer.getState().equals(ContainerState.UPGRADING)) {
+-          toUpgrade.add(reqContainer.getComponentInstanceName());
+-        }
+-      }
+-
+-      if (!toUpgrade.isEmpty()) {
+-        Service service = getServiceFromClient(ugi, serviceName);
+-        LOG.info("PUT: upgrade component instances {} for service = {} " +
+-            "user = {}", toUpgrade, serviceName, ugi);
+-        List<Container> liveContainers = ServiceApiUtil
+-            .getLiveContainers(service, toUpgrade);
+-
+-        return processContainersUpgrade(ugi, service, liveContainers);
+-      }
+-    } catch (AccessControlException e) {
+-      return formatResponse(Response.Status.FORBIDDEN, e.getMessage());
+-    } catch (YarnException e) {
+-      return formatResponse(Response.Status.BAD_REQUEST, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-    return Response.status(Status.NO_CONTENT).build();
+-  }
+-
+-  @GET
+-  @Path(COMP_INSTANCES_PATH)
+-  @Produces({RestApiConstants.MEDIA_TYPE_JSON_UTF8})
+-  public Response getComponentInstances(@Context HttpServletRequest request,
+-      @PathParam(SERVICE_NAME) String serviceName,
+-      @QueryParam(PARAM_COMP_NAME) List<String> componentNames,
+-      @QueryParam(PARAM_VERSION) String version,
+-      @QueryParam(PARAM_CONTAINER_STATE) List<String> containerStates) {
+-    try {
+-      UserGroupInformation ugi = getProxyUser(request);
+-      LOG.info("GET: component instances for service = {}, compNames in {}, " +
+-          "version = {}, containerStates in {}, user = {}", serviceName,
+-          Objects.toString(componentNames, "[]"), Objects.toString(version, ""),
+-          Objects.toString(containerStates, "[]"), ugi);
+-
+-        List<ContainerState> containerStatesDe = containerStates.stream().map(
+-            ContainerState::valueOf).collect(Collectors.toList());
+-
+-        return Response.ok(getContainers(ugi, serviceName, componentNames,
+-            version, containerStatesDe)).build();
+-    } catch (IllegalArgumentException iae) {
+-      return formatResponse(Status.BAD_REQUEST, "valid container states are: " +
+-          Arrays.toString(ContainerState.values()));
+-    } catch (AccessControlException e) {
+-      return formatResponse(Response.Status.FORBIDDEN, e.getMessage());
+-    } catch (IOException | InterruptedException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getMessage());
+-    } catch (UndeclaredThrowableException e) {
+-      return formatResponse(Response.Status.INTERNAL_SERVER_ERROR,
+-          e.getCause().getMessage());
+-    }
+-  }
+-
+-  private Response flexService(Service service, UserGroupInformation ugi)
+-      throws IOException, InterruptedException {
+-    String appName = service.getName();
+-    Response response = Response.status(Status.BAD_REQUEST).build();
+-    Map<String, String> componentCountStrings = new HashMap<String, String>();
+-    for (Component c : service.getComponents()) {
+-      componentCountStrings.put(c.getName(),
+-          c.getNumberOfContainers().toString());
+-    }
+-    Integer result = ugi.doAs(new PrivilegedExceptionAction<Integer>() {
+-
+-      @Override
+-      public Integer run() throws YarnException, IOException {
+-        int result = 0;
+-        ServiceClient sc = new ServiceClient();
+-        try {
+-          sc.init(YARN_CONFIG);
+-          sc.start();
+-          result = sc
+-              .actionFlex(appName, componentCountStrings);
+-          return Integer.valueOf(result);
+-        } finally {
+-          sc.close();
+-        }
+-      }
+-    });
+-    if (result == EXIT_SUCCESS) {
+-      String message = "Service " + appName + " is successfully flexed.";
+-      LOG.info(message);
+-      ServiceStatus status = new ServiceStatus();
+-      status.setDiagnostics(message);
+-      status.setState(ServiceState.ACCEPTED);
+-      response = formatResponse(Status.ACCEPTED, status);
+-    }
+-    return response;
+-  }
+-
+-  private Response updateLifetime(String appName, Service updateAppData,
+-      final UserGroupInformation ugi) throws IOException,
+-      InterruptedException {
+-    String newLifeTime = ugi.doAs(new PrivilegedExceptionAction<String>() {
+-      @Override
+-      public String run() throws YarnException, IOException {
+-        ServiceClient sc = getServiceClient();
+-        try {
+-          sc.init(YARN_CONFIG);
+-          sc.start();
+-          String newLifeTime = sc.updateLifetime(appName,
+-              updateAppData.getLifetime());
+-          return newLifeTime;
+-        } finally {
+-          sc.close();
+-        }
+-      }
+-    });
+-    ServiceStatus status = new ServiceStatus();
+-    status.setDiagnostics(
+-        "Service (" + appName + ")'s lifeTime is updated to " + newLifeTime
+-            + ", " + updateAppData.getLifetime() + " seconds remaining");
+-    return formatResponse(Status.OK, status);
+-  }
+-
+-  private Response startService(String appName,
+-      final UserGroupInformation ugi) throws IOException,
+-      InterruptedException {
+-    ApplicationId appId =
+-        ugi.doAs(new PrivilegedExceptionAction<ApplicationId>() {
+-          @Override public ApplicationId run()
+-              throws YarnException, IOException {
+-            ServiceClient sc = getServiceClient();
+-            try {
+-              sc.init(YARN_CONFIG);
+-              sc.start();
+-              ApplicationId appId = sc.actionStartAndGetId(appName);
+-              return appId;
+-            } finally {
+-              sc.close();
+-            }
+-          }
+-        });
+-    LOG.info("Successfully started service " + appName);
+-    ServiceStatus status = new ServiceStatus();
+-    status.setDiagnostics(
+-        "Service " + appName + " is successfully started with ApplicationId: "
+-            + appId);
+-    status.setState(ServiceState.ACCEPTED);
+-    return formatResponse(Status.OK, status);
+-  }
+-
+-  private Response upgradeService(Service service,
+-      final UserGroupInformation ugi) throws IOException, InterruptedException {
+-    ServiceStatus status = new ServiceStatus();
+-    ugi.doAs((PrivilegedExceptionAction<Void>) () -> {
+-      ServiceClient sc = getServiceClient();
+-      try {
+-        sc.init(YARN_CONFIG);
+-        sc.start();
+-        if (service.getState().equals(ServiceState.EXPRESS_UPGRADING)) {
+-          sc.actionUpgradeExpress(service);
+-        } else {
+-          sc.initiateUpgrade(service);
+-        }
+-      } finally {
+-        sc.close();
+-      }
+-      return null;
+-    });
+-    LOG.info("Service {} version {} upgrade initialized", service.getName(),
+-        service.getVersion());
+-    status.setDiagnostics("Service " + service.getName() +
+-        " version " + service.getVersion() + " saved.");
+-    status.setState(ServiceState.ACCEPTED);
+-    return formatResponse(Status.ACCEPTED, status);
+-  }
+-
+-  private Response cancelUpgradeService(String serviceName,
+-      final UserGroupInformation ugi) throws IOException, InterruptedException {
+-    int result = ugi.doAs((PrivilegedExceptionAction<Integer>) () -> {
+-      ServiceClient sc = getServiceClient();
+-      try {
+-        sc.init(YARN_CONFIG);
+-        sc.start();
+-        int exitCode = sc.actionCancelUpgrade(serviceName);
+-        return exitCode;
+-      } finally {
+-        sc.close();
+-      }
+-    });
+-    if (result == EXIT_SUCCESS) {
+-      ServiceStatus status = new ServiceStatus();
+-      LOG.info("Service {} cancelling upgrade", serviceName);
+-      status.setDiagnostics("Service " + serviceName +
+-          " cancelling upgrade.");
+-      status.setState(ServiceState.ACCEPTED);
+-      return formatResponse(Status.ACCEPTED, status);
+-    }
+-    return Response.status(Status.BAD_REQUEST).build();
+-  }
+-
+-  private Response processComponentsUpgrade(UserGroupInformation ugi,
+-      String serviceName, Set<String> compNames) throws YarnException,
+-      IOException, InterruptedException {
+-    Service service = getServiceFromClient(ugi, serviceName);
+-    if (!service.getState().equals(ServiceState.UPGRADING) &&
+-        !service.getState().equals(ServiceState.UPGRADING_AUTO_FINALIZE)) {
+-      throw new YarnException(
+-          String.format("The upgrade of service %s has not been initiated.",
+-              service.getName()));
+-    }
+-    List<Container> containersToUpgrade = ServiceApiUtil
+-        .validateAndResolveCompsUpgrade(service, compNames);
+-    Integer result = invokeContainersUpgrade(ugi, service, containersToUpgrade);
+-    if (result == EXIT_SUCCESS) {
+-      ServiceStatus status = new ServiceStatus();
+-      status.setDiagnostics(
+-          "Upgrading components " + Joiner.on(',').join(compNames) + ".");
+-      return formatResponse(Response.Status.ACCEPTED, status);
+-    }
+-    // If result is not a success, consider it a no-op
+-    return Response.status(Response.Status.NO_CONTENT).build();
+-  }
+-
+-  private Response processContainersUpgrade(UserGroupInformation ugi,
+-      Service service, List<Container> containers) throws YarnException,
+-      IOException, InterruptedException {
+-
+-    if (!service.getState().equals(ServiceState.UPGRADING) &&
+-        !service.getState().equals(ServiceState.UPGRADING_AUTO_FINALIZE)) {
+-      throw new YarnException(
+-          String.format("The upgrade of service %s has not been initiated.",
+-              service.getName()));
+-    }
+-    ServiceApiUtil.validateInstancesUpgrade(containers);
+-    Integer result = invokeContainersUpgrade(ugi, service, containers);
+-    if (result == EXIT_SUCCESS) {
+-      ServiceStatus status = new ServiceStatus();
+-      status.setDiagnostics(
+-          "Upgrading component instances " + containers.stream()
+-              .map(Container::getId).collect(Collectors.joining(",")) + ".");
+-      return formatResponse(Response.Status.ACCEPTED, status);
+-    }
+-    // If result is not a success, consider it a no-op
+-    return Response.status(Response.Status.NO_CONTENT).build();
+-  }
+-
+-  private int invokeContainersUpgrade(UserGroupInformation ugi,
+-      Service service, List<Container> containers) throws IOException,
+-      InterruptedException {
+-    return ugi.doAs((PrivilegedExceptionAction<Integer>) () -> {
+-      int result1;
+-      ServiceClient sc = getServiceClient();
+-      try {
+-        sc.init(YARN_CONFIG);
+-        sc.start();
+-        result1 = sc.actionUpgrade(service, containers);
+-      } finally {
+-        sc.close();
+-      }
+-      return result1;
+-    });
+-  }
+-
+-  private Response decommissionInstances(Service service, UserGroupInformation
+-      ugi) throws IOException, InterruptedException {
+-    String appName = service.getName();
+-    Response response = Response.status(Status.BAD_REQUEST).build();
+-
+-    List<String> instances = new ArrayList<>();
+-    for (Component c : service.getComponents()) {
+-      instances.addAll(c.getDecommissionedInstances());
+-    }
+-    Integer result = ugi.doAs(new PrivilegedExceptionAction<Integer>() {
+-      @Override
+-      public Integer run() throws YarnException, IOException {
+-        int result = 0;
+-        ServiceClient sc = new ServiceClient();
+-        try {
+-          sc.init(YARN_CONFIG);
+-          sc.start();
+-          result = sc
+-              .actionDecommissionInstances(appName, instances);
+-          return Integer.valueOf(result);
+-        } finally {
+-          sc.close();
+-        }
+-      }
+-    });
+-    if (result == EXIT_SUCCESS) {
+-      String message = "Service " + appName + " has successfully " +
+-          "decommissioned instances.";
+-      LOG.info(message);
+-      ServiceStatus status = new ServiceStatus();
+-      status.setDiagnostics(message);
+-      status.setState(ServiceState.ACCEPTED);
+-      response = formatResponse(Status.ACCEPTED, status);
+-    }
+-    return response;
+-  }
+-
+-  private Service getServiceFromClient(UserGroupInformation ugi,
+-      String serviceName) throws IOException, InterruptedException {
+-
+-    return ugi.doAs((PrivilegedExceptionAction<Service>) () -> {
+-      ServiceClient sc = getServiceClient();
+-      try {
+-        sc.init(YARN_CONFIG);
+-        sc.start();
+-        Service app1 = sc.getStatus(serviceName);
+-        return app1;
+-      } finally {
+-        sc.close();
+-      }
+-    });
+-  }
+-
+-  private ComponentContainers[] getContainers(UserGroupInformation ugi,
+-      String serviceName, List<String> componentNames, String version,
+-      List<ContainerState> containerStates) throws IOException,
+-      InterruptedException {
+-    return ugi.doAs((PrivilegedExceptionAction<ComponentContainers[]>) () -> {
+-      ComponentContainers[] result;
+-      ServiceClient sc = getServiceClient();
+-      try {
+-        sc.init(YARN_CONFIG);
+-        sc.start();
+-        result = sc.getContainers(serviceName, componentNames, version,
+-            containerStates);
+-        return result;
+-      } finally {
+-        sc.close();
+-      }
+-    });
+-  }
+-
+-  /**
+-   * Used by negative test case.
+-   *
+-   * @param mockServerClient - A mocked version of ServiceClient
+-   */
+-  public void setServiceClient(ServiceClient mockServerClient) {
+-    serviceClientUnitTest = mockServerClient;
+-    unitTest = true;
+-  }
+-
+-  private ServiceClient getServiceClient() {
+-    if (unitTest) {
+-      return serviceClientUnitTest;
+-    } else {
+-      return new ServiceClient();
+-    }
+-  }
+-
+-  /**
+-   * Configure impersonation callback.
+-   *
+-   * @param request - web request
+-   * @return - configured UGI class for proxy callback
+-   * @throws IOException - if user is not login.
+-   */
+-  private UserGroupInformation getProxyUser(HttpServletRequest request)
+-      throws AccessControlException {
+-    UserGroupInformation proxyUser;
+-    UserGroupInformation ugi;
+-    String remoteUser = request.getRemoteUser();
+-    try {
+-      if (UserGroupInformation.isSecurityEnabled()) {
+-        proxyUser = UserGroupInformation.getLoginUser();
+-        ugi = UserGroupInformation.createProxyUser(remoteUser, proxyUser);
+-      } else {
+-        ugi = UserGroupInformation.createRemoteUser(remoteUser);
+-      }
+-      return ugi;
+-    } catch (IOException e) {
+-      throw new AccessControlException(e.getCause());
+-    }
+-  }
+-
+-  /**
+-   * Format HTTP response.
+-   *
+-   * @param status - HTTP Code
+-   * @param message - Diagnostic message
+-   * @return - HTTP response
+-   */
+-  private Response formatResponse(Status status, String message) {
+-    ServiceStatus entity = new ServiceStatus();
+-    entity.setDiagnostics(message);
+-    return formatResponse(status, entity);
+-  }
+-
+-  /**
+-   * Format HTTP response.
+-   *
+-   * @param status - HTTP Code
+-   * @param entity - ServiceStatus object
+-   * @return - HTTP response
+-   */
+-  private Response formatResponse(Status status, ServiceStatus entity) {
+-    return Response.status(status).entity(entity).build();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServerWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServerWebApp.java
+deleted file mode 100644
+index f4acd942cc9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServerWebApp.java
++++ /dev/null
+@@ -1,161 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.webapp;
+-
+-import org.apache.hadoop.http.HttpServer2;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.AuthenticationFilterInitializer;
+-import org.apache.hadoop.security.SecurityUtil;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+-import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
+-import org.eclipse.jetty.webapp.Configuration;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.URI;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_WEBAPP_SPNEGO_KEYTAB_FILE_KEY;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_WEBAPP_SPNEGO_USER_NAME_KEY;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.*;
+-
+-/**
+- * This class launches the web service using Hadoop HttpServer2 (which uses
+- * an embedded Jetty container). This is the entry point to your service.
+- * The Java command used to launch this app should call the main method.
+- */
+-public class ApiServerWebApp extends AbstractService {
+-  private static final Logger logger = LoggerFactory
+-      .getLogger(ApiServerWebApp.class);
+-  private static final String SEP = ";";
+-
+-  // REST API server for YARN native services
+-  private HttpServer2 apiServer;
+-  private InetSocketAddress bindAddress;
+-
+-  public static void main(String[] args) throws IOException {
+-    ApiServerWebApp apiWebApp = new ApiServerWebApp();
+-    try {
+-      apiWebApp.init(new YarnConfiguration());
+-      apiWebApp.serviceStart();
+-    } catch (Exception e) {
+-      logger.error("Got exception starting", e);
+-      apiWebApp.close();
+-    }
+-  }
+-
+-  public ApiServerWebApp() {
+-    super(ApiServerWebApp.class.getName());
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    bindAddress = getConfig().getSocketAddr(API_SERVER_ADDRESS,
+-        DEFAULT_API_SERVER_ADDRESS, DEFAULT_API_SERVER_PORT);
+-    logger.info("YARN API server running on " + bindAddress);
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      doSecureLogin(getConfig());
+-    }
+-    startWebApp();
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (apiServer != null) {
+-      apiServer.stop();
+-    }
+-    super.serviceStop();
+-  }
+-
+-  private void doSecureLogin(org.apache.hadoop.conf.Configuration conf)
+-      throws IOException {
+-    SecurityUtil.login(conf, YarnConfiguration.RM_KEYTAB,
+-        YarnConfiguration.RM_PRINCIPAL, bindAddress.getHostName());
+-    addFilters(conf);
+-  }
+-
+-  private void addFilters(org.apache.hadoop.conf.Configuration conf) {
+-    // Always load pseudo authentication filter to parse "user.name" in an URL
+-    // to identify a HTTP request's user.
+-    boolean hasHadoopAuthFilterInitializer = false;
+-    String filterInitializerConfKey = "hadoop.http.filter.initializers";
+-    Class<?>[] initializersClasses =
+-        conf.getClasses(filterInitializerConfKey);
+-    List<String> targets = new ArrayList<String>();
+-    if (initializersClasses != null) {
+-      for (Class<?> initializer : initializersClasses) {
+-        if (initializer.getName().equals(
+-            AuthenticationFilterInitializer.class.getName())) {
+-          hasHadoopAuthFilterInitializer = true;
+-          break;
+-        }
+-        targets.add(initializer.getName());
+-      }
+-    }
+-    if (!hasHadoopAuthFilterInitializer) {
+-      targets.add(AuthenticationFilterInitializer.class.getName());
+-      conf.set(filterInitializerConfKey, StringUtils.join(",", targets));
+-    }
+-  }
+-
+-  private void startWebApp() throws IOException {
+-    URI uri = URI.create("http://" + NetUtils.getHostPortString(bindAddress));
+-
+-    apiServer = new HttpServer2.Builder()
+-        .setName("api-server")
+-        .setConf(getConfig())
+-        .setSecurityEnabled(UserGroupInformation.isSecurityEnabled())
+-        .setUsernameConfKey(RM_WEBAPP_SPNEGO_USER_NAME_KEY)
+-        .setKeytabConfKey(RM_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
+-        .addEndpoint(uri).build();
+-
+-    String apiPackages =
+-        ApiServer.class.getPackage().getName() + SEP
+-            + GenericExceptionHandler.class.getPackage().getName() + SEP
+-            + YarnJacksonJaxbJsonProvider.class.getPackage().getName();
+-    apiServer.addJerseyResourcePackage(apiPackages, "/*");
+-
+-    try {
+-      logger.info("Service starting up. Logging start...");
+-      apiServer.start();
+-      logger.info("Server status = {}", apiServer.toString());
+-      for (Configuration conf : apiServer.getWebAppContext()
+-          .getConfigurations()) {
+-        logger.info("Configurations = {}", conf);
+-      }
+-      logger.info("Context Path = {}", Collections.singletonList(
+-          apiServer.getWebAppContext().getContextPath()));
+-      logger.info("ResourceBase = {}", Collections.singletonList(
+-          apiServer.getWebAppContext().getResourceBase()));
+-      logger.info("War = {}", Collections
+-          .singletonList(apiServer.getWebAppContext().getWar()));
+-    } catch (Exception ex) {
+-      logger.error("Hadoop HttpServer2 App **failed**", ex);
+-      throw ex;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/package-info.java
+deleted file mode 100644
+index 1bdf05adb23..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/package-info.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Package org.apache.hadoop.yarn.service.webapp contains classes to be used
+- * for YARN Services API.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.yarn.service.webapp;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
+deleted file mode 100644
+index b7ad6c9f789..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
++++ /dev/null
+@@ -1,444 +0,0 @@
+-<!---
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-## Examples
+-
+-### Create a simple single-component service with most attribute values as defaults
+-POST URL - http://localhost:8088/app/v1/services
+-
+-##### POST Request JSON
+-```json
+-{
+-  "name": "hello-world",
+-  "version": "1.0.0",
+-  "description": "hello world example",
+-  "components" :
+-    [
+-      {
+-        "name": "hello",
+-        "number_of_containers": 2,
+-        "artifact": {
+-          "id": "nginx:latest",
+-          "type": "DOCKER"
+-        },
+-        "launch_command": "./start_nginx.sh",
+-        "resource": {
+-          "cpus": 1,
+-          "memory": "256"
+-        }
+-      }
+-    ]
+-}
+-```
+-
+-##### GET Response JSON
+-GET URL - http://localhost:8088/app/v1/services/hello-world
+-
+-Note, lifetime value of -1 means unlimited lifetime.
+-
+-```json
+-{
+-    "name": "hello-world",
+-    "version": "1.0.0",
+-    "description": "hello world example",
+-    "id": "application_1503963985568_0002",
+-    "lifetime": -1,
+-    "state": "STABLE",
+-    "components": [
+-        {
+-            "name": "hello",
+-            "state": "STABLE",
+-            "resource": {
+-                "cpus": 1,
+-                "memory": "256"
+-            },
+-            "configuration": {
+-                "properties": {},
+-                "env": {},
+-                "files": []
+-            },
+-            "quicklinks": [],
+-            "containers": [
+-                {
+-                    "id": "container_e03_1503963985568_0002_01_000002",
+-                    "ip": "10.22.8.143",
+-                    "hostname": "ctr-e03-1503963985568-0002-01-000002.example.site",
+-                    "state": "READY",
+-                    "launch_time": 1504051512412,
+-                    "bare_host": "host100.cloud.com",
+-                    "component_instance_name": "hello-0"
+-                },
+-                {
+-                    "id": "container_e03_1503963985568_0002_01_000003",
+-                    "ip": "10.22.8.144",
+-                    "hostname": "ctr-e03-1503963985568-0002-01-000003.example.site",
+-                    "state": "READY",
+-                    "launch_time": 1504051536450,
+-                    "bare_host": "host100.cloud.com",
+-                    "component_instance_name": "hello-1"
+-                }
+-            ],
+-            "launch_command": "./start_nginx.sh",
+-            "number_of_containers": 1,
+-            "run_privileged_container": false
+-        }
+-    ],
+-    "configuration": {
+-        "properties": {},
+-        "env": {},
+-        "files": []
+-    },
+-    "quicklinks": {}
+-}
+-
+-```
+-### Update to modify the lifetime of a service
+-PUT URL - http://localhost:8088/app/v1/services/hello-world
+-
+-##### PUT Request JSON
+-
+-Note, irrespective of what the current lifetime value is, this update request will set the lifetime of the service to be 3600 seconds (1 hour) from the time the request is submitted. Hence, if a a service has remaining lifetime of 5 mins (say) and would like to extend it to an hour OR if an application has remaining lifetime of 5 hours (say) and would like to reduce it down to an hour, then for both scenarios you need to submit the same request below.
+-
+-```json
+-{
+-  "lifetime": 3600
+-}
+-```
+-### Stop a service
+-PUT URL - http://localhost:8088/app/v1/services/hello-world
+-
+-##### PUT Request JSON
+-```json
+-{
+-  "state": "STOPPED"
+-}
+-```
+-
+-### Start a service
+-PUT URL - http://localhost:8088/app/v1/services/hello-world
+-
+-##### PUT Request JSON
+-```json
+-{
+-  "state": "STARTED"
+-}
+-```
+-
+-### Update to flex up/down the number of containers (instances) of a component of a service
+-PUT URL - http://localhost:8088/app/v1/services/hello-world/components/hello
+-
+-##### PUT Request JSON
+-```json
+-{
+-  "number_of_containers": 3
+-}
+-```
+-
+-Alternatively, you can specify the entire "components" section instead.
+-
+-PUT URL - http://localhost:8088/app/v1/services/hello-world
+-##### PUT Request JSON
+-```json
+-{
+-  "state": "FLEX",
+-  "components" :
+-    [
+-      {
+-        "name": "hello",
+-        "number_of_containers": 3
+-      }
+-    ]
+-}
+-```
+-
+-### Destroy a service
+-DELETE URL - http://localhost:8088/app/v1/services/hello-world
+-
+-***
+-
+-### Create a complicated service  - HBase
+-POST URL - http://localhost:8088:/app/v1/services/hbase-app-1
+-
+-##### POST Request JSON
+-
+-```json
+-{
+-  "name": "hbase-app-1",
+-  "version": "1.0.0",
+-  "description": "hbase service",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "hbasemaster",
+-      "number_of_containers": 1,
+-      "artifact": {
+-        "id": "hbase:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/hdp/current/hbase-master/bin/hbase master start",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "2048"
+-      },
+-      "configuration": {
+-        "env": {
+-          "HBASE_LOG_DIR": "<LOG_DIR>"
+-        },
+-        "files": [
+-          {
+-            "type": "XML",
+-            "dest_file": "/etc/hadoop/conf/core-site.xml",
+-            "properties": {
+-              "fs.defaultFS": "${CLUSTER_FS_URI}"
+-            }
+-          },
+-          {
+-            "type": "XML",
+-            "dest_file": "/etc/hbase/conf/hbase-site.xml",
+-            "properties": {
+-              "hbase.cluster.distributed": "true",
+-              "hbase.zookeeper.quorum": "${CLUSTER_ZK_QUORUM}",
+-              "hbase.rootdir": "${SERVICE_HDFS_DIR}/hbase",
+-              "zookeeper.znode.parent": "${SERVICE_ZK_PATH}",
+-              "hbase.master.hostname": "hbasemaster.${SERVICE_NAME}.${USER}.${DOMAIN}",
+-              "hbase.master.info.port": "16010"
+-            }
+-          }
+-        ]
+-      }
+-    },
+-    {
+-      "name": "regionserver",
+-      "number_of_containers": 3,
+-      "artifact": {
+-        "id": "hbase:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/hdp/current/hbase-regionserver/bin/hbase regionserver start",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "2048"
+-      },
+-      "configuration": {
+-        "env": {
+-          "HBASE_LOG_DIR": "<LOG_DIR>"
+-        },
+-        "files": [
+-          {
+-            "type": "XML",
+-            "dest_file": "/etc/hadoop/conf/core-site.xml",
+-            "properties": {
+-              "fs.defaultFS": "${CLUSTER_FS_URI}"
+-            }
+-          },
+-          {
+-            "type": "XML",
+-            "dest_file": "/etc/hbase/conf/hbase-site.xml",
+-            "properties": {
+-              "hbase.cluster.distributed": "true",
+-              "hbase.zookeeper.quorum": "${CLUSTER_ZK_QUORUM}",
+-              "hbase.rootdir": "${SERVICE_HDFS_DIR}/hbase",
+-              "zookeeper.znode.parent": "${SERVICE_ZK_PATH}",
+-              "hbase.master.hostname": "hbasemaster.${SERVICE_NAME}.${USER}.${DOMAIN}",
+-              "hbase.master.info.port": "16010",
+-              "hbase.regionserver.hostname": "${COMPONENT_INSTANCE_NAME}.${SERVICE_NAME}.${USER}.${DOMAIN}"
+-            }
+-          }
+-        ]
+-      }
+-    }
+-  ],
+-  "quicklinks": {
+-    "HBase Master Status UI": "http://hbasemaster0.${SERVICE_NAME}.${USER}.${DOMAIN}:16010/master-status",
+-    "Proxied HBase Master Status UI": "http://app-proxy/${DOMAIN}/${USER}/${SERVICE_NAME}/hbasemaster/16010/"
+-  }
+-}
+-```
+-
+-### Create a service requesting GPUs in addition to CPUs and RAM
+-POST URL - http://localhost:8088/app/v1/services
+-
+-##### POST Request JSON
+-```json
+-{
+-  "name": "hello-world",
+-  "version": "1.0.0",
+-  "description": "hello world example with GPUs",
+-  "components" :
+-    [
+-      {
+-        "name": "hello",
+-        "number_of_containers": 2,
+-        "artifact": {
+-          "id": "nginx:latest",
+-          "type": "DOCKER"
+-        },
+-        "launch_command": "./start_nginx.sh",
+-        "resource": {
+-          "cpus": 1,
+-          "memory": "256",
+-          "additional" : {
+-            "yarn.io/gpu" : {
+-              "value" : 4,
+-              "unit" : ""
+-            }
+-          }
+-        }
+-      }
+-    ]
+-}
+-```
+-
+-### Create a service with a component requesting anti-affinity placement policy
+-POST URL - http://localhost:8088/app/v1/services
+-
+-##### POST Request JSON
+-```json
+-{
+-  "name": "hello-world",
+-  "version": "1.0.0",
+-  "description": "hello world example with anti-affinity",
+-  "components" :
+-    [
+-      {
+-        "name": "hello",
+-        "number_of_containers": 3,
+-        "artifact": {
+-          "id": "nginx:latest",
+-          "type": "DOCKER"
+-        },
+-        "launch_command": "./start_nginx.sh",
+-        "resource": {
+-          "cpus": 1,
+-          "memory": "256"
+-        },
+-        "placement_policy": {
+-          "constraints": [
+-            {
+-              "type": "ANTI_AFFINITY",
+-              "scope": "NODE",
+-              "node_attributes": {
+-                "os": ["linux", "windows"],
+-                "fault_domain": ["fd1", "fd2"]
+-              },
+-              "node_partitions": [
+-                "gpu",
+-                "fast-disk"
+-              ],
+-              "target_tags": [
+-                "hello"
+-              ]
+-            }
+-          ]
+-        }
+-      }
+-    ]
+-}
+-```
+-
+-##### GET Response JSON
+-GET URL - http://localhost:8088/app/v1/services/hello-world
+-
+-Note, for an anti-affinity component no more than 1 container will be allocated
+-in a specific node. In this example, 3 containers have been requested by
+-component "hello". All 3 containers were allocated because the cluster had 3 or
+-more NMs. If the cluster had less than 3 NMs then less than 3 containers would
+-be allocated. In cases when the number of allocated containers are less than the
+-number of requested containers, the component and the service will be in
+-non-STABLE state.
+-
+-```json
+-{
+-    "name": "hello-world",
+-    "version": "1.0.0",
+-    "description": "hello world example with anti-affinity",
+-    "id": "application_1503963985568_0003",
+-    "lifetime": -1,
+-    "state": "STABLE",
+-    "components": [
+-        {
+-            "name": "hello",
+-            "state": "STABLE",
+-            "resource": {
+-                "cpus": 1,
+-                "memory": "256"
+-            },
+-            "placement_policy": {
+-              "constraints": [
+-                {
+-                  "type": "ANTI_AFFINITY",
+-                  "scope": "NODE",
+-                  "node_attributes": {
+-                    "os": ["linux", "windows"],
+-                    "fault_domain": ["fd1", "fd2"]
+-                  },
+-                  "node_partitions": [
+-                    "gpu",
+-                    "fast-disk"
+-                  ],
+-                  "target_tags": [
+-                    "hello"
+-                  ]
+-                }
+-              ]
+-            },
+-            "configuration": {
+-                "properties": {},
+-                "env": {},
+-                "files": []
+-            },
+-            "quicklinks": [],
+-            "containers": [
+-                {
+-                    "id": "container_e03_1503963985568_0003_01_000002",
+-                    "ip": "10.22.8.143",
+-                    "hostname": "ctr-e03-1503963985568-0003-01-000002.example.site",
+-                    "state": "READY",
+-                    "launch_time": 1504051512412,
+-                    "bare_host": "host100.cloud.com",
+-                    "component_instance_name": "hello-0"
+-                },
+-                {
+-                    "id": "container_e03_1503963985568_0003_01_000003",
+-                    "ip": "10.22.8.144",
+-                    "hostname": "ctr-e03-1503963985568-0003-01-000003.example.site",
+-                    "state": "READY",
+-                    "launch_time": 1504051536450,
+-                    "bare_host": "host101.cloud.com",
+-                    "component_instance_name": "hello-1"
+-                },
+-                {
+-                    "id": "container_e03_1503963985568_0003_01_000004",
+-                    "ip": "10.22.8.145",
+-                    "hostname": "ctr-e03-1503963985568-0003-01-000004.example.site",
+-                    "state": "READY",
+-                    "launch_time": 1504051536450,
+-                    "bare_host": "host102.cloud.com",
+-                    "component_instance_name": "hello-2"
+-                }
+-            ],
+-            "launch_command": "./start_nginx.sh",
+-            "number_of_containers": 1,
+-            "run_privileged_container": false
+-        }
+-    ],
+-    "configuration": {
+-        "properties": {},
+-        "env": {},
+-        "files": []
+-    },
+-    "quicklinks": {}
+-}
+-```
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
+deleted file mode 100644
+index 7b198a008d4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
++++ /dev/null
+@@ -1,740 +0,0 @@
+-# Hadoop YARN REST APIs for services v1 spec in YAML
+-
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-swagger: '2.0'
+-info:
+-  title: "YARN Simplified API layer for services"
+-  description: |
+-    Bringing a new service on YARN today is not a simple experience. The APIs of existing
+-    frameworks are either too low level (native YARN), require writing new code (for frameworks with programmatic APIs)
+-    or writing a complex spec (for declarative frameworks).
+-
+-    This simplified REST API can be used to create and manage the lifecycle of YARN services.
+-    In most cases, the application owner will not be forced to make any changes to their applications.
+-    This is primarily true if the application is packaged with containerization technologies like Docker.
+-
+-    This document describes the API specifications (aka. YarnFile) for deploying/managing
+-    containerized services on YARN. The same JSON spec can be used for both REST API
+-    and CLI to manage the services.
+-
+-  version: "1.0.0"
+-  license:
+-    name: Apache 2.0
+-    url: http://www.apache.org/licenses/LICENSE-2.0.html
+-# the domain of the service
+-host: localhost
+-port: 8088(default)
+-# array of all schemes that your API supports
+-schemes:
+-  - http
+-consumes:
+-  - application/json
+-produces:
+-  - application/json
+-paths:
+-  /app/v1/services/version:
+-    get:
+-      summary: Get current version of the API server.
+-      description: Get current version of the API server.
+-      responses:
+-        200:
+-          description: Successful request
+-
+-  /app/v1/services:
+-    get:
+-      summary: (TBD) List of services running in the cluster.
+-      description: Get a list of all currently running services (response includes a minimal projection of the service info). For more details do a GET on a specific service name.
+-      responses:
+-        200:
+-          description: An array of services
+-          schema:
+-            type: array
+-            items:
+-              $ref: '#/definitions/Service'
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-    post:
+-      summary: Create a service
+-      description: Create a service. The request JSON is a service object with details required for creation. If the request is successful it returns 202 Accepted. A success of this API only confirms success in submission of the service creation request. There is no guarantee that the service will actually reach a RUNNING state. Resource availability and several other factors determines if the service will be deployed in the cluster. It is expected that clients would subsequently call the GET API to get details of the service and determine its state.
+-      parameters:
+-        - name: Service
+-          in: body
+-          description: Service request object
+-          required: true
+-          schema:
+-            $ref: '#/definitions/Service'
+-      responses:
+-        202:
+-          description: The request to create a service is accepted
+-        400:
+-          description: Invalid service definition provided in the request body
+-        500:
+-          description: Failed to create a service
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-
+-  /app/v1/services/{service_name}:
+-    put:
+-      summary: Update a service or upgrade the binary version of the components of a running service
+-      description: Update the runtime properties of a service. Currently the following operations are supported - update lifetime, stop/start a service.
+-                   The PUT operation is also used to orchestrate an upgrade of the service containers to a newer version of their artifacts (TBD).
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: Service
+-          in: body
+-          description: The updated service definition. It can contain the updated lifetime of a service or the desired state (STOPPED/STARTED) of a service to initiate a start/stop operation against the specified service
+-          required: true
+-          schema:
+-            $ref: '#/definitions/Service'
+-      responses:
+-        204:
+-          description: Update or upgrade was successful
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-    delete:
+-      summary: Destroy a service
+-      description: Destroy a service and release all resources. This API might have to return JSON data providing location of logs (TBD), etc.
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-      responses:
+-        204:
+-          description: Destroy was successful
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-    get:
+-      summary: Get details of a service.
+-      description: Return the details (including containers) of a running service
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-      responses:
+-        200:
+-          description: a service object
+-          schema:
+-            type: object
+-            items:
+-              $ref: '#/definitions/Service'
+-          examples:
+-            service_name: logsearch
+-            artifact:
+-              id: logsearch:latest
+-              type: docker
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-  /app/v1/services/{service_name}/components:
+-    put:
+-      summary: Upgrade multiple components.
+-      description: Set a component's desired number of instanes
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: components
+-          in: body
+-          description: Components to be upgraded with state set to UPGRADING
+-          required: true
+-          schema:
+-            type: array
+-            items:
+-              $ref: '#/definitions/Component'
+-      responses:
+-        200:
+-          description: Upgrading components.
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-  /app/v1/services/{service_name}/components/{component_name}:
+-    put:
+-      summary: Flex a component's number of instances or upgrade all the instances of the component.
+-      description: Set a component's desired number of instanes or upgrade the component.
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: component_name
+-          in: path
+-          description: Component name
+-          required: true
+-          type: string
+-        - name: Component
+-          in: body
+-          description: For flex, the definition of a component which contains the updated number of instances with state set to FLEXING. For upgrade, component definition with state set to UPGRADING.
+-          required: true
+-          schema:
+-            $ref: '#/definitions/Component'
+-      responses:
+-        200:
+-          description: Flex was successful
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-          schema:
+-            $ref: '#/definitions/ServiceStatus'
+-  /app/v1/services/{service_name}/component-instances:
+-    get:
+-      summary: Get component instances.
+-      description: Get component instances which match the query params.
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: componentName
+-          in: query
+-          description: Component name. Multiple values are allowed.
+-          type: string
+-        - name: version
+-          in: query
+-          description: Version of the service.
+-          type: string
+-        - name: containerState
+-          in: query
+-          description: Container state. Multiple values are allowed.
+-          type: string
+-      responses:
+-        200:
+-          description: Component instances.
+-          schema:
+-            type: array
+-            items:
+-              $ref: '#/definitions/ComponentContainers'
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-    put:
+-      summary: Upgrade multiple component instances.
+-      description: Upgrades multiple component instances
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: component instances
+-          in: body
+-          description: Component instances with state set to UPGRADING
+-          required: true
+-          schema:
+-            type: array
+-            items:
+-              $ref: '#/definitions/Container'
+-      responses:
+-        200:
+-          description: Upgrading component instance
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-  /app/v1/services/{service_name}/components/{component_name}/component-instances/{component_instance_name}:
+-    put:
+-      summary: Upgrade a single component instance.
+-      description: Upgrades a single component instance
+-      parameters:
+-        - name: service_name
+-          in: path
+-          description: Service name
+-          required: true
+-          type: string
+-        - name: component_name
+-          in: path
+-          description: Component name
+-          required: true
+-          type: string
+-        - name: component_instance_name
+-          in: path
+-          description: Component instance name
+-          required: true
+-          type: string
+-        - name: component instance
+-          in: body
+-          description: Component instance with state UPGRADING
+-          required: true
+-          schema:
+-            $ref: '#/definitions/Container'
+-      responses:
+-        200:
+-          description: Upgrading component instance
+-        404:
+-          description: Service does not exist
+-        default:
+-          description: Unexpected error
+-definitions:
+-  Service:
+-    description: a service resource has the following attributes.
+-    required:
+-      - name
+-      - version
+-    properties:
+-      name:
+-        type: string
+-        description: A unique service name. If Registry DNS is enabled, the max length is 63 characters.
+-      version:
+-        type: string
+-        description: Version of the service.
+-      description:
+-        type: string
+-        description: Description of the service.
+-      id:
+-        type: string
+-        description: A unique service id.
+-      artifact:
+-        description: The default artifact for all components of the service except the components which has Artifact type set to SERVICE (optional).
+-        $ref: '#/definitions/Artifact'
+-      resource:
+-        description: The default resource for all components of the service (optional).
+-        $ref: '#/definitions/Resource'
+-      launch_time:
+-        type: string
+-        format: date
+-        description: The time when the service was created, e.g. 2016-03-16T01:01:49.000Z.
+-      number_of_running_containers:
+-        type: integer
+-        format: int64
+-        description: In get response this provides the total number of running containers for this service (across all components) at the time of request. Note, a subsequent request can return a different number as and when more containers get allocated until it reaches the total number of containers or if a flex request has been made between the two requests.
+-      lifetime:
+-        type: integer
+-        format: int64
+-        description: Life time (in seconds) of the service from the time it reaches the STARTED state (after which it is automatically destroyed by YARN). For unlimited lifetime do not set a lifetime value.
+-      components:
+-        description: Components of a service.
+-        type: array
+-        items:
+-          $ref: '#/definitions/Component'
+-      configuration:
+-        description: Config properties of a service. Configurations provided at the service/global level are available to all the components. Specific properties can be overridden at the component level.
+-        $ref: '#/definitions/Configuration'
+-      state:
+-        description: State of the service. Specifying a value for this attribute for the PUT payload means update the service to this desired state.
+-        $ref: '#/definitions/ServiceState'
+-      quicklinks:
+-        type: object
+-        description: A blob of key-value pairs of quicklinks to be exported for a service.
+-        additionalProperties:
+-          type: string
+-      queue:
+-        type: string
+-        description: The YARN queue that this service should be submitted to.
+-      kerberos_principal:
+-        description: The principal info of the user who launches the service.
+-        $ref: '#/definitions/KerberosPrincipal'
+-      docker_client_config:
+-        type: string
+-        description: URI of the file containing the docker client configuration (e.g. hdfs:///tmp/config.json).
+-      dependencies:
+-        type: array
+-        items:
+-          type: string
+-        description: An array of services which should be in STABLE state, before this service can be started.
+-  ResourceInformation:
+-    description:
+-      ResourceInformation determines unit/value of resource types in addition to memory and vcores. It will be part of Resource object.
+-    properties:
+-      value:
+-        type: integer
+-        format: int64
+-        description: Integer value of the resource.
+-      unit:
+-        type: string
+-        description: Unit of the resource, acceptable values are - p/n/u/m/k/M/G/T/P/Ki/Mi/Gi/Ti/Pi. By default it is empty means no unit.
+-  Resource:
+-    description:
+-      Resource determines the amount of resources (vcores, memory, network, etc.) usable by a container. This field determines the resource to be applied for all the containers of a component or service. The resource specified at the service (or global) level can be overriden at the component level. Only one of profile OR cpu & memory are expected. It raises a validation exception otherwise.
+-    properties:
+-      profile:
+-        type: string
+-        description: Each resource profile has a unique id which is associated with a cluster-level predefined memory, cpus, etc.
+-      cpus:
+-        type: integer
+-        format: int32
+-        description: Amount of vcores allocated to each container (optional but overrides cpus in profile if specified).
+-      memory:
+-        type: string
+-        description: Amount of memory allocated to each container (optional but overrides memory in profile if specified). Currently accepts only an integer value and default unit is in MB.
+-      additional:
+-        type: object
+-        additionalProperties:
+-          $ref: '#/definitions/ResourceInformation'
+-        description: A map of resource type name to resource type information. Including value (integer), and unit (string). This will be used to specify resource other than cpu and memory. Please refer to example below.
+-  PlacementPolicy:
+-    description: Advanced placement policy of the components of a service.
+-    required:
+-      - constraints
+-    properties:
+-      constraints:
+-        description: Placement constraint details.
+-        type: array
+-        items:
+-          $ref: '#/definitions/PlacementConstraint'
+-  PlacementConstraint:
+-    description: Placement constraint details.
+-    required:
+-      - type
+-      - scope
+-    properties:
+-      name:
+-        description: An optional name associated to this constraint.
+-        type: string
+-        example: C1
+-      type:
+-        description: The type of placement.
+-        $ref: '#/definitions/PlacementType'
+-      scope:
+-        description: The scope of placement.
+-        $ref: '#/definitions/PlacementScope'
+-      target_tags:
+-        description: The name of the components that this component's placement policy is depending upon are added as target tags. So for affinity say, this component's containers are requesting to be placed on hosts where containers of the target tag component(s) are running on. Target tags can also contain the name of this component, in which case it implies that for anti-affinity say, no more than one container of this component can be placed on a host. Similarly, for cardinality, it would mean that containers of this component is requesting to be placed on hosts where at least minCardinality but no more than maxCardinality containers of the target tag component(s) are running.
+-        type: array
+-        items:
+-          type: string
+-      node_attributes:
+-        description: Node attributes are a set of key:value(s) pairs associated with nodes.
+-        type: object
+-        additionalProperties:
+-          type: array
+-          items:
+-            type: string
+-      node_partitions:
+-        description: Node partitions where the containers of this component can run.
+-        type: array
+-        items:
+-          type: string
+-      min_cardinality:
+-        type: integer
+-        format: int64
+-        description: When placement type is cardinality, the minimum number of containers of the depending component that a host should have, where containers of this component can be allocated on.
+-        example: 2
+-      max_cardinality:
+-        type: integer
+-        format: int64
+-        description: When placement type is cardinality, the maximum number of containers of the depending component that a host should have, where containers of this component can be allocated on.
+-        example: 3
+-  PlacementType:
+-    description: The type of placement - affinity/anti-affinity/affinity-with-cardinality with containers of another component or containers of the same component (self).
+-    properties:
+-      type:
+-        type: string
+-        enum:
+-          - AFFINITY
+-          - ANTI_AFFINITY
+-          - AFFINITY_WITH_CARDINALITY
+-  PlacementScope:
+-    description: The scope of placement for the containers of a component.
+-    properties:
+-      type:
+-        type: string
+-        enum:
+-          - NODE
+-          - RACK
+-  Artifact:
+-    description: Artifact of a service component. If not specified, component will just run the bare launch command and no artifact will be localized.
+-    required:
+-    - id
+-    properties:
+-      id:
+-        type: string
+-        description: Artifact id. Examples are package location uri for tarball based services, image name for docker, name of service, etc.
+-      type:
+-        type: string
+-        description: Artifact type, like docker, tarball, etc. (optional). For TARBALL type, the specified tarball will be localized to the container local working directory under a folder named lib. For SERVICE type, the service specified will be read and its components will be added into this service. The original component with artifact type SERVICE will be removed (any properties specified in the original component will be ignored).
+-        enum:
+-          - DOCKER
+-          - TARBALL
+-          - SERVICE
+-        default: DOCKER
+-      uri:
+-        type: string
+-        description: Artifact location to support multiple artifact stores (optional).
+-  Component:
+-    description: One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.
+-    required:
+-    - name
+-    properties:
+-      name:
+-        type: string
+-        description: Name of the service component (mandatory). If Registry DNS is enabled, the max length is 63 characters. If unique component support is enabled, the max length is lowered to 44 characters.
+-      state:
+-        description: The state of the component
+-        $ref: "#/definitions/ComponentState"
+-      dependencies:
+-        type: array
+-        items:
+-          type: string
+-        description: An array of service components which should be in READY state (as defined by readiness check), before this component can be started. The dependencies across all components of a service should be represented as a DAG.
+-      readiness_check:
+-        description: Readiness check for this component.
+-        $ref: '#/definitions/ReadinessCheck'
+-      artifact:
+-        description: Artifact of the component (optional). If not specified, the service level global artifact takes effect.
+-        $ref: '#/definitions/Artifact'
+-      launch_command:
+-        type: string
+-        description: The custom launch command of this component (optional for DOCKER component, required otherwise). When specified at the component level, it overrides the value specified at the global level (if any).
+-      resource:
+-        description: Resource of this component (optional). If not specified, the service level global resource takes effect.
+-        $ref: '#/definitions/Resource'
+-      number_of_containers:
+-        type: integer
+-        format: int64
+-        description: Number of containers for this component (optional). If not specified, the service level global number_of_containers takes effect.
+-      decommissioned_instances:
+-        type: array
+-        items:
+-          type: string
+-        description: List of decommissioned component instances.
+-      containers:
+-        type: array
+-        description: Containers of a started component. Specifying a value for this attribute for the POST payload raises a validation error. This blob is available only in the GET response of a started service.
+-        items:
+-          $ref: '#/definitions/Container'
+-      run_privileged_container:
+-        type: boolean
+-        description: Run all containers of this component in privileged mode (YARN-4262).
+-      placement_policy:
+-        description: Advanced scheduling and placement policies for all containers of this component.
+-        $ref: '#/definitions/PlacementPolicy'
+-      configuration:
+-        description: Config properties for this component.
+-        $ref: '#/definitions/Configuration'
+-      quicklinks:
+-        type: array
+-        items:
+-          type: string
+-        description: A list of quicklink keys defined at the service level, and to be resolved by this component.
+-      restartPolicy:
+-        type: string
+-        description: Policy of restart component. Including ALWAYS (Always restart component even if instance exit code = 0); ON_FAILURE (Only restart component if instance exit code != 0); NEVER (Do not restart in any cases)
+-        enum:
+-          - ALWAYS
+-          - ON_FAILURE
+-          - NEVER
+-        default: ALWAYS
+-  ReadinessCheck:
+-    description: A check to be performed to determine the readiness of a component instance (a container). If no readiness check is specified, the default readiness check will be used unless the yarn.service.default-readiness-check.enabled configuration property is set to false at the component, service, or system level. The artifact field is currently unsupported but may be implemented in the future, enabling a pluggable helper container to support advanced use cases.
+-    required:
+-    - type
+-    properties:
+-      type:
+-        type: string
+-        description: DEFAULT (AM checks whether the container has an IP and optionally performs a DNS lookup for the container hostname), HTTP (AM performs default checks, plus sends a REST call to the container and expects a response code between 200 and 299), or PORT (AM performs default checks, plus attempts to open a socket connection to the container on a specified port).
+-        enum:
+-          - DEFAULT
+-          - HTTP
+-          - PORT
+-      properties:
+-        type: object
+-        description: A blob of key value pairs that will be used to configure the check.
+-        additionalProperties:
+-          type: string
+-      artifact:
+-        description: Artifact of the pluggable readiness check helper container (optional). If specified, this helper container typically hosts the http uri and encapsulates the complex scripts required to perform actual container readiness check. At the end it is expected to respond a 204 No content just like the simplified use case. This pluggable framework benefits service owners who can run services without any packaging modifications. Note, artifacts of type docker only is supported for now. NOT IMPLEMENTED YET
+-        $ref: '#/definitions/Artifact'
+-  Configuration:
+-    description: Set of configuration properties that can be injected into the service components via envs, files and custom pluggable helper docker containers. Files of several standard formats like xml, properties, json, yaml and templates will be supported.
+-    properties:
+-      properties:
+-        type: object
+-        description: A blob of key-value pairs for configuring the YARN service AM.
+-        additionalProperties:
+-          type: string
+-      env:
+-        type: object
+-        description: A blob of key-value pairs which will be appended to the default system properties and handed off to the service at start time. All placeholder references to properties will be substituted before injection.
+-        additionalProperties:
+-          type: string
+-      files:
+-        description: Array of list of files that needs to be created and made available as volumes in the service component containers.
+-        type: array
+-        items:
+-          $ref: '#/definitions/ConfigFile'
+-  ConfigFile:
+-    description: A config file that needs to be created and made available as a volume in a service component container.
+-    properties:
+-      type:
+-        type: string
+-        description: Config file in the standard format like xml, properties, json, yaml, template.
+-        enum:
+-          - XML
+-          - PROPERTIES
+-          - JSON
+-          - YAML
+-          - TEMPLATE
+-          - HADOOP_XML
+-          - STATIC
+-          - ARCHIVE
+-      dest_file:
+-        type: string
+-        description: The path that this configuration file should be created as. If it is an absolute path, it will be mounted into the DOCKER container. Absolute paths are only allowed for DOCKER containers.  If it is a relative path, only the file name should be provided, and the file will be created in the container local working directory under a folder named conf.
+-      src_file:
+-        type: string
+-        description: This provides the source location of the configuration file, the content of which is dumped to dest_file post property substitutions, in the format as specified in type. Typically the src_file would point to a source controlled network accessible file maintained by tools like puppet, chef, or hdfs etc. Currently, only hdfs is supported.
+-      properties:
+-        type: object
+-        description: A blob of key value pairs that will be dumped in the dest_file in the format as specified in type. If src_file is specified, src_file content are dumped in the dest_file and these properties will overwrite, if any, existing properties in src_file or be added as new properties in src_file.
+-        additionalProperties:
+-          type: string
+-  Container:
+-    description: An instance of a running service container.
+-    properties:
+-      id:
+-        type: string
+-        description: Unique container id of a running service, e.g. container_e3751_1458061340047_0008_01_000002.
+-      launch_time:
+-        type: string
+-        format: date
+-        description: The time when the container was created, e.g. 2016-03-16T01:01:49.000Z. This will most likely be different from cluster launch time.
+-      ip:
+-        type: string
+-        description: IP address of a running container, e.g. 172.31.42.141. The IP address and hostname attribute values are dependent on the cluster/docker network setup as per YARN-4007.
+-      hostname:
+-        type: string
+-        description: Fully qualified hostname of a running container, e.g. ctr-e3751-1458061340047-0008-01-000002.examplestg.site. The IP address and hostname attribute values are dependent on the cluster/docker network setup as per YARN-4007.
+-      bare_host:
+-        type: string
+-        description: The bare node or host in which the container is running, e.g. cn008.example.com.
+-      state:
+-        description: State of the container of a service.
+-        $ref: '#/definitions/ContainerState'
+-      component_instance_name:
+-        type: string
+-        description: Name of the component instance that this container instance belongs to. Component instance name is named as $COMPONENT_NAME-i, where i is a
+-                     monotonically increasing integer. E.g. A componet called nginx can have multiple component instances named as nginx-0, nginx-1 etc.
+-                     Each component instance is backed by a container instance.
+-      resource:
+-        description: Resource used for this container.
+-        $ref: '#/definitions/Resource'
+-      artifact:
+-        description: Artifact used for this container.
+-        $ref: '#/definitions/Artifact'
+-      privileged_container:
+-        type: boolean
+-        description: Container running in privileged mode or not.
+-  ServiceState:
+-    description: The current state of a service.
+-    properties:
+-      state:
+-        type: string
+-        description: enum of the state of the service
+-        enum:
+-          - ACCEPTED
+-          - STARTED
+-          - STABLE
+-          - STOPPED
+-          - FAILED
+-          - FLEX
+-          - UPGRADING
+-          - UPGRADING_AUTO_FINALIZE
+-          - EXPRESS_UPGRADING
+-          - SUCCEEDED
+-          - CANCEL_UPGRADING
+-  ContainerState:
+-    description: The current state of the container of a service.
+-    properties:
+-      state:
+-        type: string
+-        description: enum of the state of the container
+-        enum:
+-          - RUNNING_BUT_UNREADY
+-          - READY
+-          - STOPPED
+-          - NEEDS_UPGRADE
+-          - UPGRADING
+-          - SUCCEEDED
+-          - FAILED
+-          - FAILED_UPGRADE
+-  ComponentState:
+-    description: The state of the component
+-    properties:
+-      state:
+-        type: string
+-        description: enum of the state of the component
+-        enum:
+-          - FLEXING
+-          - STABLE
+-          - NEEDS_UPGRADE
+-          - UPGRADING
+-          - SUCCEEDED
+-          - FAILED
+-  ServiceStatus:
+-    description: The current status of a submitted service, returned as a response to the GET API.
+-    properties:
+-      diagnostics:
+-        type: string
+-        description: Diagnostic information (if any) for the reason of the current state of the service. It typically has a non-null value, if the service is in a non-running state.
+-      state:
+-        description: Service state.
+-        $ref: '#/definitions/ServiceState'
+-      code:
+-        type: integer
+-        format: int32
+-        description: An error code specific to a scenario which service owners should be able to use to understand the failure in addition to the diagnostic information.
+-  KerberosPrincipal:
+-    description: The kerberos principal info of the user who launches the service.
+-    properties:
+-      principal_name:
+-        type: string
+-        description: The principal name of the user who launches the service. Note that `_HOST` is required in the `principal_name` field such as `testuser/_HOST@EXAMPLE.COM` because Hadoop client validates that the server's (in this case, the AM's) principal has hostname present when communicating to the server.
+-      keytab:
+-        type: string
+-        description: The URI of the kerberos keytab. Currently supports only files present on the bare host. URI starts with "file\://" - A path on the local host where the keytab is stored. It is assumed that admin pre-installs the keytabs on the local host before AM launches.
+-  ComponentContainers:
+-    description: Containers of a component.
+-    required:
+-    - component_name
+-    properties:
+-      component_name:
+-        type: string
+-        description: Name of the component.
+-      containers:
+-        type: array
+-        description: Containers of the component.
+-        items:
+-          $ref: '#/definitions/Container'
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/log4j-server.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/log4j-server.properties
+deleted file mode 100644
+index 8c679b9fc20..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/log4j-server.properties
++++ /dev/null
+@@ -1,76 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-#  or more contributor license agreements.  See the NOTICE file
+-#  distributed with this work for additional information
+-#  regarding copyright ownership.  The ASF licenses this file
+-#  to you under the Apache License, Version 2.0 (the
+-#  "License"); you may not use this file except in compliance
+-#  with the License.  You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License.
+-#
+-
+-# This is the log4j configuration for YARN Services REST API Server
+-
+-# Log rotation based on size (100KB) with a max of 10 backup files
+-log4j.rootLogger=INFO, restservicelog
+-log4j.threshhold=ALL
+-
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+-
+-log4j.appender.restservicelog=org.apache.log4j.RollingFileAppender
+-log4j.appender.restservicelog.layout=org.apache.log4j.PatternLayout
+-log4j.appender.restservicelog.File=${REST_SERVICE_LOG_DIR}/restservice.log
+-log4j.appender.restservicelog.MaxFileSize=1GB
+-log4j.appender.restservicelog.MaxBackupIndex=10
+-
+-# log layout skips stack-trace creation operations by avoiding line numbers and method
+-log4j.appender.restservicelog.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} - %m%n
+-
+-# debug edition is much more expensive
+-#log4j.appender.restservicelog.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
+-
+-# configure stderr
+-# set the conversion pattern of stderr
+-# Print the date in ISO 8601 format
+-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+-log4j.appender.stderr.Target=System.err
+-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stderr.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} - %m%n
+-
+-log4j.appender.subprocess=org.apache.log4j.ConsoleAppender
+-log4j.appender.subprocess.layout=org.apache.log4j.PatternLayout
+-log4j.appender.subprocess.layout.ConversionPattern=[%c{1}]: %m%n
+-
+-# for debugging REST API Service
+-#log4j.logger.org.apache.hadoop.yarn.services=DEBUG
+-
+-# uncomment to debug service lifecycle issues
+-#log4j.logger.org.apache.hadoop.yarn.service.launcher=DEBUG
+-#log4j.logger.org.apache.hadoop.yarn.service=DEBUG
+-
+-# uncomment for YARN operations
+-#log4j.logger.org.apache.hadoop.yarn.client=DEBUG
+-
+-# uncomment this to debug security problems
+-#log4j.logger.org.apache.hadoop.security=DEBUG
+-
+-#crank back on some noise
+-log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
+-log4j.logger.org.apache.hadoop.hdfs=WARN
+-log4j.logger.org.apache.hadoop.hdfs.shortcircuit=ERROR
+-
+-log4j.logger.org.apache.hadoop.yarn.server.nodemanager.containermanager.monitor=WARN
+-log4j.logger.org.apache.hadoop.yarn.server.nodemanager.NodeStatusUpdaterImpl=WARN
+-log4j.logger.org.apache.zookeeper=WARN
+-log4j.logger.org.apache.curator.framework.state=ERROR
+-log4j.logger.org.apache.curator.framework.imps=WARN
+-
+-log4j.logger.org.mortbay.log=DEBUG
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/webapps/api-server/app b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/webapps/api-server/app
+deleted file mode 100644
+index 6a077b10c2a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/resources/webapps/api-server/app
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-DON'T DELETE. REST WEBAPP RUN SCRIPT WILL STOP WORKING.
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/webapp/WEB-INF/web.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/webapp/WEB-INF/web.xml
+deleted file mode 100644
+index 1282c9f8635..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/main/webapp/WEB-INF/web.xml
++++ /dev/null
+@@ -1,36 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-  http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License.
+--->
+-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+-        version="3.0">
+-
+-    <servlet>
+-        <servlet-name>Jersey REST API</servlet-name>
+-        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+-        <init-param>
+-            <param-name>com.sun.jersey.config.property.packages</param-name>
+-            <param-value>org.apache.hadoop.yarn.service.webapp,org.apache.hadoop.yarn.service.api,org.apache.hadoop.yarn.service.api.records</param-value>
+-        </init-param>
+-        <init-param>
+-          <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+-          <param-value>true</param-value>
+-        </init-param>
+-        <load-on-startup>1</load-on-startup>
+-    </servlet>
+-    <servlet-mapping>
+-        <servlet-name>Jersey REST API</servlet-name>
+-        <url-pattern>/*</url-pattern>
+-    </servlet-mapping>
+-</web-app>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
+deleted file mode 100644
+index 89366b43889..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/ServiceClientTest.java
++++ /dev/null
+@@ -1,226 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.stream.Collectors;
+-
+-/**
+- * A mock version of ServiceClient - This class is design
+- * to simulate various error conditions that will happen
+- * when a consumer class calls ServiceClient.
+- */
+-public class ServiceClientTest extends ServiceClient {
+-
+-  private Configuration conf = new Configuration();
+-  private Service goodServiceStatus = buildLiveGoodService();
+-  private boolean initialized;
+-  private Set<String> expectedInstances = new HashSet<>();
+-  private Map<String, ApplicationId> serviceAppId = new HashMap<>();
+-
+-
+-  public ServiceClientTest() {
+-    super();
+-  }
+-
+-  @Override
+-  public void init(Configuration conf) {
+-    if (!initialized) {
+-      super.init(conf);
+-      initialized = true;
+-    }
+-  }
+-
+-  @Override
+-  public void stop() {
+-    // This is needed for testing  API Server which uses client to get status
+-    // and then perform an action.
+-  }
+-
+-  public void forceStop() {
+-    expectedInstances.clear();
+-    stop();
+-  }
+-
+-  @Override
+-  public Configuration getConfig() {
+-    return conf;
+-  }
+-
+-  @Override
+-  public ApplicationId actionCreate(Service service) throws IOException {
+-    ServiceApiUtil.validateAndResolveService(service,
+-        new SliderFileSystem(conf), getConfig());
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    serviceAppId.put(service.getName(), appId);
+-    return appId;
+-  }
+-
+-  @Override
+-  public Service getStatus(String appName) throws FileNotFoundException {
+-    if ("jenkins".equals(appName)) {
+-      return goodServiceStatus;
+-    } else {
+-      throw new FileNotFoundException("Service " + appName + " not found");
+-    }
+-  }
+-
+-  @Override
+-  public ApplicationId actionStartAndGetId(String serviceName)
+-      throws YarnException, IOException {
+-    if (serviceName != null && serviceName.equals("jenkins")) {
+-      ApplicationId appId =
+-          ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-      serviceAppId.put(serviceName, appId);
+-      return appId;
+-    } else {
+-      throw new ApplicationNotFoundException("");
+-    }
+-  }
+-
+-  @Override
+-  public int actionStop(String serviceName, boolean waitForAppStopped)
+-      throws YarnException, IOException {
+-    if (serviceName == null) {
+-      throw new NullPointerException();
+-    }
+-    if (serviceName.equals("jenkins")) {
+-      return EXIT_SUCCESS;
+-    } else if (serviceName.equals("jenkins-second-stop")) {
+-      return EXIT_COMMAND_ARGUMENT_ERROR;
+-    } else {
+-      throw new ApplicationNotFoundException("");
+-    }
+-  }
+-
+-  @Override
+-  public int actionDestroy(String serviceName) {
+-    if (serviceName != null) {
+-      if (serviceName.equals("jenkins")) {
+-        return EXIT_SUCCESS;
+-      } else if (serviceName.equals("jenkins-already-stopped")) {
+-        return EXIT_SUCCESS;
+-      } else if (serviceName.equals("jenkins-doesn't-exist")) {
+-        return EXIT_NOT_FOUND;
+-      } else if (serviceName.equals("jenkins-error-cleaning-registry")) {
+-        return EXIT_OTHER_FAILURE;
+-      }
+-    }
+-    throw new IllegalArgumentException();
+-  }
+-
+-  @Override
+-  public int initiateUpgrade(Service service) throws YarnException,
+-      IOException {
+-    if (service.getName() != null && service.getName().equals("jenkins")) {
+-      return EXIT_SUCCESS;
+-    } else {
+-      throw new IllegalArgumentException();
+-    }
+-  }
+-
+-  @Override
+-  public int actionUpgrade(Service service, List<Container> compInstances)
+-      throws IOException, YarnException {
+-    if (service.getName() != null && service.getName().equals("jenkins")
+-        && compInstances != null) {
+-      Set<String> actualInstances = compInstances.stream().map(
+-          Container::getComponentInstanceName).collect(Collectors.toSet());
+-      if (actualInstances.equals(expectedInstances)) {
+-        return EXIT_SUCCESS;
+-      }
+-    }
+-    throw new IllegalArgumentException();
+-  }
+-
+-  Service getGoodServiceStatus() {
+-    return goodServiceStatus;
+-  }
+-
+-  void setExpectedInstances(Set<String> instances) {
+-    if (instances != null) {
+-      expectedInstances.addAll(instances);
+-    }
+-  }
+-
+-  static Service buildGoodService() {
+-    Service service = new Service();
+-    service.setName("jenkins");
+-    service.setVersion("v1");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<>();
+-    for (int i = 0; i < 2; i++) {
+-      Component c = new Component();
+-      c.setName("jenkins" + i);
+-      c.setNumberOfContainers(2L);
+-      c.setArtifact(artifact);
+-      c.setLaunchCommand("");
+-      c.setResource(resource);
+-      components.add(c);
+-    }
+-    service.setComponents(components);
+-    return service;
+-  }
+-
+-  static Service buildLiveGoodService() {
+-    Service service = buildGoodService();
+-    Component comp = service.getComponents().iterator().next();
+-    List<Container> containers = new ArrayList<>();
+-    for (int i = 0; i < comp.getNumberOfContainers(); i++) {
+-      Container container = new Container();
+-      container.setComponentInstanceName(comp.getName() + "-" + (i + 1));
+-      container.setState(ContainerState.READY);
+-      containers.add(container);
+-    }
+-    comp.setContainers(containers);
+-    return service;
+-  }
+-
+-  @Override
+-  public synchronized ApplicationId getAppId(String serviceName)
+-      throws IOException, YarnException {
+-    return serviceAppId.get(serviceName);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+deleted file mode 100644
+index db2cffc9345..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
++++ /dev/null
+@@ -1,620 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import static org.junit.jupiter.api.Assertions.*;
+-
+-import java.io.BufferedWriter;
+-import java.io.File;
+-import java.io.FileWriter;
+-import java.util.ArrayList;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Artifact.TypeEnum;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.ServiceStatus;
+-import org.apache.hadoop.yarn.service.conf.RestApiConstants;
+-import org.apache.hadoop.yarn.service.webapp.ApiServer;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.mockito.Mockito;
+-
+-/**
+- * Test case for ApiServer REST API.
+- *
+- */
+-public class TestApiServer {
+-  private ApiServer apiServer;
+-  private HttpServletRequest request;
+-  private ServiceClientTest mockServerClient;
+-
+-  @BeforeEach
+-  public void setup() throws Exception {
+-    request = Mockito.mock(HttpServletRequest.class);
+-    Mockito.when(request.getRemoteUser())
+-        .thenReturn(System.getProperty("user.name"));
+-    mockServerClient = new ServiceClientTest();
+-    Configuration conf = new Configuration();
+-    conf.set("yarn.api-service.service.client.class",
+-        ServiceClientTest.class.getName());
+-    apiServer = new ApiServer(conf);
+-    apiServer.setServiceClient(mockServerClient);
+-  }
+-
+-  @AfterEach
+-  public void teardown() {
+-    mockServerClient.forceStop();
+-  }
+-
+-  @Test
+-  void testPathAnnotation() {
+-    assertNotNull(this.apiServer.getClass().getAnnotation(Path.class));
+-    assertTrue(this.apiServer.getClass().isAnnotationPresent(Path.class),
+-        "The controller has the annotation Path");
+-    final Path path = this.apiServer.getClass()
+-        .getAnnotation(Path.class);
+-    assertEquals("/v1", path.value(), "The path has /v1 annotation");
+-  }
+-
+-  @Test
+-  void testGetVersion() {
+-    final Response actual = apiServer.getVersion();
+-    assertEquals(Response.ok().build().getStatus(),
+-        actual.getStatus(),
+-        "Version number is");
+-  }
+-
+-  @Test
+-  void testBadCreateService() {
+-    Service service = new Service();
+-    // Test for invalid argument
+-    final Response actual = apiServer.createService(request, service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Create service is ");
+-  }
+-
+-  @Test
+-  void testGoodCreateService() throws Exception {
+-    String json = "{\"auths\": "
+-        + "{\"https://index.docker.io/v1/\": "
+-        + "{\"auth\": \"foobarbaz\"},"
+-        + "\"registry.example.com\": "
+-        + "{\"auth\": \"bazbarfoo\"}}}";
+-    File dockerTmpDir = new File("target", "docker-tmp");
+-    FileUtils.deleteQuietly(dockerTmpDir);
+-    dockerTmpDir.mkdirs();
+-    String dockerConfig = dockerTmpDir + "/config.json";
+-    BufferedWriter bw = new BufferedWriter(new FileWriter(dockerConfig));
+-    bw.write(json);
+-    bw.close();
+-    Service service = ServiceClientTest.buildGoodService();
+-    final Response actual = apiServer.createService(request, service);
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Create service is ");
+-  }
+-
+-  @Test
+-  void testInternalServerErrorDockerClientConfigMissingCreateService() {
+-    Service service = new Service();
+-    service.setName("jenkins");
+-    service.setVersion("v1");
+-    service.setDockerClientConfig("/does/not/exist/config.json");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<>();
+-    Component c = new Component();
+-    c.setName("jenkins");
+-    c.setNumberOfContainers(1L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    final Response actual = apiServer.createService(request, service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Create service is ");
+-  }
+-
+-  @Test
+-  void testBadGetService() {
+-    final String serviceName = "nonexistent-jenkins";
+-    final Response actual = apiServer.getService(request, serviceName);
+-    assertEquals(Response.status(Status.NOT_FOUND).build().getStatus(),
+-        actual.getStatus(),
+-        "Get service is ");
+-    ServiceStatus serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(RestApiConstants.ERROR_CODE_APP_NAME_INVALID, serviceStatus.getCode(),
+-        "Response code don't match");
+-    assertEquals("Service " + serviceName + " not found", serviceStatus.getDiagnostics(),
+-        "Response diagnostics don't match");
+-  }
+-
+-  @Test
+-  void testBadGetService2() {
+-    final Response actual = apiServer.getService(request, null);
+-    assertEquals(Response.status(Status.NOT_FOUND).build().getStatus(), actual.getStatus(),
+-        "Get service is ");
+-    ServiceStatus serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(RestApiConstants.ERROR_CODE_APP_NAME_INVALID, serviceStatus.getCode(),
+-        "Response code don't match");
+-    assertEquals("Service name cannot be null.", serviceStatus.getDiagnostics(),
+-        "Response diagnostics don't match");
+-  }
+-
+-  @Test
+-  void testGoodGetService() {
+-    final Response actual = apiServer.getService(request, "jenkins");
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "Get service is ");
+-  }
+-
+-  @Test
+-  void testBadDeleteService() {
+-    final Response actual = apiServer.deleteService(request, "no-jenkins");
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testBadDeleteService2() {
+-    final Response actual = apiServer.deleteService(request, null);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testBadDeleteService3() {
+-    final Response actual = apiServer.deleteService(request,
+-        "jenkins-doesn't-exist");
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testBadDeleteService4() {
+-    final Response actual = apiServer.deleteService(request,
+-        "jenkins-error-cleaning-registry");
+-    assertEquals(Response.status(Status.INTERNAL_SERVER_ERROR).build().getStatus(),
+-        actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testGoodDeleteService() {
+-    final Response actual = apiServer.deleteService(request, "jenkins");
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testDeleteStoppedService() {
+-    final Response actual = apiServer.deleteService(request, "jenkins-already-stopped");
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "Delete service is ");
+-  }
+-
+-  @Test
+-  void testDecreaseContainerAndStop() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STOPPED);
+-    service.setName("jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("jenkins");
+-    c.setNumberOfContainers(0L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    final Response actual = apiServer.updateService(request, "jenkins",
+-        service);
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "update service is ");
+-  }
+-
+-  @Test
+-  void testBadDecreaseContainerAndStop() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STOPPED);
+-    service.setName("no-jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("no-jenkins");
+-    c.setNumberOfContainers(-1L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    System.out.println("before stop");
+-    final Response actual = apiServer.updateService(request, "no-jenkins",
+-        service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "flex service is ");
+-  }
+-
+-  @Test
+-  void testIncreaseContainersAndStart() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STARTED);
+-    service.setName("jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("jenkins");
+-    c.setNumberOfContainers(2L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    final Response actual = apiServer.updateService(request, "jenkins",
+-        service);
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "flex service is ");
+-  }
+-
+-  @Test
+-  void testBadStartServices() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STARTED);
+-    service.setName("no-jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("jenkins");
+-    c.setNumberOfContainers(2L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    final Response actual = apiServer.updateService(request, "no-jenkins",
+-        service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "start service is ");
+-  }
+-
+-  @Test
+-  void testGoodStartServices() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STARTED);
+-    service.setName("jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("jenkins");
+-    c.setNumberOfContainers(2L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    final Response actual = apiServer.updateService(request, "jenkins",
+-        service);
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "start service is ");
+-  }
+-
+-  @Test
+-  void testBadStopServices() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STOPPED);
+-    service.setName("no-jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("no-jenkins");
+-    c.setNumberOfContainers(-1L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    System.out.println("before stop");
+-    final Response actual = apiServer.updateService(request, "no-jenkins",
+-        service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "stop service is ");
+-  }
+-
+-  @Test
+-  void testGoodStopServices() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STOPPED);
+-    service.setName("jenkins");
+-    System.out.println("before stop");
+-    final Response actual = apiServer.updateService(request, "jenkins",
+-        service);
+-    assertEquals(Response.status(Status.OK).build().getStatus(), actual.getStatus(),
+-        "stop service is ");
+-  }
+-
+-  @Test
+-  void testBadSecondStopServices() throws Exception {
+-    Service service = new Service();
+-    service.setState(ServiceState.STOPPED);
+-    service.setName("jenkins-second-stop");
+-    // simulates stop on an already stopped service
+-    System.out.println("before second stop");
+-    final Response actual = apiServer.updateService(request,
+-        "jenkins-second-stop", service);
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "stop service should have thrown 400 Bad Request: ");
+-    ServiceStatus serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals("Service jenkins-second-stop is already stopped",
+-        serviceStatus.getDiagnostics(),
+-        "Stop service should have failed with service already stopped");
+-  }
+-
+-  @Test
+-  void testUpdateService() {
+-    Service service = new Service();
+-    service.setState(ServiceState.STARTED);
+-    service.setName("no-jenkins");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(TypeEnum.DOCKER);
+-    artifact.setId("jenkins:latest");
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory("2048");
+-    List<Component> components = new ArrayList<Component>();
+-    Component c = new Component();
+-    c.setName("no-jenkins");
+-    c.setNumberOfContainers(-1L);
+-    c.setArtifact(artifact);
+-    c.setLaunchCommand("");
+-    c.setResource(resource);
+-    components.add(c);
+-    service.setComponents(components);
+-    System.out.println("before stop");
+-    final Response actual = apiServer.updateService(request, "no-jenkins",
+-        service);
+-    assertEquals(Response.status(Status.BAD_REQUEST)
+-        .build().getStatus(), actual.getStatus(), "update service is ");
+-  }
+-
+-  @Test
+-  void testUpdateComponent() {
+-    Response actual = apiServer.updateComponent(request, "jenkins",
+-        "jenkins-master", null);
+-    ServiceStatus serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Update component should have failed with 400 bad request");
+-    assertEquals("No component data provided", serviceStatus.getDiagnostics(),
+-        "Update component should have failed with no data error");
+-
+-    Component comp = new Component();
+-    actual = apiServer.updateComponent(request, "jenkins", "jenkins-master",
+-        comp);
+-    serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Update component should have failed with 400 bad request");
+-    assertEquals("No container count provided", serviceStatus.getDiagnostics(),
+-        "Update component should have failed with no count error");
+-
+-    comp.setNumberOfContainers(-1L);
+-    actual = apiServer.updateComponent(request, "jenkins", "jenkins-master",
+-        comp);
+-    serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Update component should have failed with 400 bad request");
+-    assertEquals("Invalid number of containers specified -1", serviceStatus.getDiagnostics(),
+-        "Update component should have failed with no count error");
+-
+-    comp.setName("jenkins-slave");
+-    comp.setNumberOfContainers(1L);
+-    actual = apiServer.updateComponent(request, "jenkins", "jenkins-master",
+-        comp);
+-    serviceStatus = (ServiceStatus) actual.getEntity();
+-    assertEquals(Response.status(Status.BAD_REQUEST).build().getStatus(),
+-        actual.getStatus(),
+-        "Update component should have failed with 400 bad request");
+-    assertEquals(
+-        "Component name in the request object (jenkins-slave) does not match "
+-            + "that in the URI path (jenkins-master)",
+-        serviceStatus.getDiagnostics(),
+-        "Update component should have failed with component name mismatch "
+-            + "error");
+-  }
+-
+-  @Test
+-  void testInitiateUpgrade() {
+-    Service goodService = ServiceClientTest.buildLiveGoodService();
+-    goodService.setVersion("v2");
+-    goodService.setState(ServiceState.UPGRADING);
+-    final Response actual = apiServer.updateService(request,
+-        goodService.getName(), goodService);
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Initiate upgrade is ");
+-  }
+-
+-  @Test
+-  void testUpgradeSingleInstance() {
+-    Service goodService = ServiceClientTest.buildLiveGoodService();
+-    Component comp = goodService.getComponents().iterator().next();
+-    Container container = comp.getContainers().iterator().next();
+-    container.setState(ContainerState.UPGRADING);
+-
+-    // To be able to upgrade, the service needs to be in UPGRADING
+-    // and container state needs to be in NEEDS_UPGRADE.
+-    Service serviceStatus = mockServerClient.getGoodServiceStatus();
+-    serviceStatus.setState(ServiceState.UPGRADING);
+-    Container liveContainer = serviceStatus.getComponents().iterator().next()
+-        .getContainers().iterator().next();
+-    liveContainer.setState(ContainerState.NEEDS_UPGRADE);
+-    mockServerClient.setExpectedInstances(Sets.newHashSet(
+-        liveContainer.getComponentInstanceName()));
+-
+-    final Response actual = apiServer.updateComponentInstance(request,
+-        goodService.getName(), comp.getName(),
+-        container.getComponentInstanceName(), container);
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Instance upgrade is ");
+-  }
+-
+-  @Test
+-  void testUpgradeMultipleInstances() {
+-    Service goodService = ServiceClientTest.buildLiveGoodService();
+-    Component comp = goodService.getComponents().iterator().next();
+-    comp.getContainers().forEach(container ->
+-        container.setState(ContainerState.UPGRADING));
+-
+-    // To be able to upgrade, the service needs to be in UPGRADING
+-    // and container state needs to be in NEEDS_UPGRADE.
+-    Service serviceStatus = mockServerClient.getGoodServiceStatus();
+-    serviceStatus.setState(ServiceState.UPGRADING);
+-    Set<String> expectedInstances = new HashSet<>();
+-    serviceStatus.getComponents().iterator().next().getContainers().forEach(
+-        container -> {
+-          container.setState(ContainerState.NEEDS_UPGRADE);
+-          expectedInstances.add(container.getComponentInstanceName());
+-        }
+-    );
+-    mockServerClient.setExpectedInstances(expectedInstances);
+-
+-    final Response actual = apiServer.updateComponentInstances(request,
+-        goodService.getName(), comp.getContainers());
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Instance upgrade is ");
+-  }
+-
+-  @Test
+-  void testUpgradeComponent() {
+-    Service goodService = ServiceClientTest.buildLiveGoodService();
+-    Component comp = goodService.getComponents().iterator().next();
+-    comp.setState(ComponentState.UPGRADING);
+-
+-    // To be able to upgrade, the service needs to be in UPGRADING
+-    // and component state needs to be in NEEDS_UPGRADE.
+-    Service serviceStatus = mockServerClient.getGoodServiceStatus();
+-    serviceStatus.setState(ServiceState.UPGRADING);
+-    Component liveComp = serviceStatus.getComponent(comp.getName());
+-    liveComp.setState(ComponentState.NEEDS_UPGRADE);
+-    Set<String> expectedInstances = new HashSet<>();
+-    liveComp.getContainers().forEach(container -> {
+-      expectedInstances.add(container.getComponentInstanceName());
+-      container.setState(ContainerState.NEEDS_UPGRADE);
+-    });
+-    mockServerClient.setExpectedInstances(expectedInstances);
+-
+-    final Response actual = apiServer.updateComponent(request,
+-        goodService.getName(), comp.getName(), comp);
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Component upgrade is ");
+-  }
+-
+-  @Test
+-  void testUpgradeMultipleComps() {
+-    Service goodService = ServiceClientTest.buildLiveGoodService();
+-    goodService.getComponents().forEach(comp ->
+-        comp.setState(ComponentState.UPGRADING));
+-
+-    // To be able to upgrade, the live service needs to be in UPGRADING
+-    // and component states needs to be in NEEDS_UPGRADE.
+-    Service serviceStatus = mockServerClient.getGoodServiceStatus();
+-    serviceStatus.setState(ServiceState.UPGRADING);
+-    Set<String> expectedInstances = new HashSet<>();
+-    serviceStatus.getComponents().forEach(liveComp -> {
+-      liveComp.setState(ComponentState.NEEDS_UPGRADE);
+-      liveComp.getContainers().forEach(liveContainer -> {
+-        expectedInstances.add(liveContainer.getComponentInstanceName());
+-        liveContainer.setState(ContainerState.NEEDS_UPGRADE);
+-      });
+-    });
+-    mockServerClient.setExpectedInstances(expectedInstances);
+-
+-    final Response actual = apiServer.updateComponents(request,
+-        goodService.getName(), goodService.getComponents());
+-    assertEquals(Response.status(Status.ACCEPTED).build().getStatus(),
+-        actual.getStatus(),
+-        "Component upgrade is ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestCleanupAfterKill.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestCleanupAfterKill.java
+deleted file mode 100644
+index c2f3c689e23..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestCleanupAfterKill.java
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.junit.jupiter.api.Timeout;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-
+-import java.io.IOException;
+-
+-/**
+- * Minicluster test that verifies registry cleanup when app lifetime is
+- * exceeded.
+- */
+-public class TestCleanupAfterKill extends ServiceTestUtils {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestCleanupAfterKill.class);
+-
+-  @BeforeEach
+-  public void setup() throws Exception {
+-    File tmpYarnDir = new File("target", "tmp");
+-    FileUtils.deleteQuietly(tmpYarnDir);
+-  }
+-
+-  @AfterEach
+-  public void tearDown() throws IOException {
+-    shutdown();
+-  }
+-
+-  @Test
+-  @Timeout(200000)
+-  void testRegistryCleanedOnLifetimeExceeded() throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    exampleApp.setLifetime(30L);
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-    String serviceZKPath = RegistryUtils.servicePath(RegistryUtils
+-        .currentUser(), YarnServiceConstants.APP_TYPE, exampleApp.getName());
+-    assertTrue(getCuratorService().zkPathExists(serviceZKPath),
+-        "Registry ZK service path doesn't exist");
+-
+-    // wait for app to be killed by RM
+-    ApplicationId exampleAppId = ApplicationId.fromString(exampleApp.getId());
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ApplicationReport ar = client.getYarnClient()
+-            .getApplicationReport(exampleAppId);
+-        return ar.getYarnApplicationState() == YarnApplicationState.KILLED;
+-      } catch (YarnException | IOException e) {
+-        throw new RuntimeException("while waiting", e);
+-      }
+-    }, 2000, 200000);
+-    assertFalse(getCuratorService().zkPathExists(serviceZKPath),
+-        "Registry ZK service path still exists after killed");
+-
+-    LOG.info("Destroy the service");
+-    assertEquals(0, client.actionDestroy(exampleApp.getName()));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java
+deleted file mode 100644
+index fe9c081ed64..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestApiServiceClient.java
++++ /dev/null
+@@ -1,344 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.client;
+-
+-import static org.junit.jupiter.api.Assertions.*;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-
+-import javax.servlet.ServletException;
+-import javax.servlet.http.HttpServlet;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.ServerConnector;
+-import org.eclipse.jetty.servlet.ServletContextHandler;
+-import org.eclipse.jetty.servlet.ServletHolder;
+-import org.eclipse.jetty.util.thread.QueuedThreadPool;
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.Test;
+-
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.*;
+-
+-/**
+- * Test case for CLI to API Service.
+- *
+- */
+-public class TestApiServiceClient {
+-  private static ApiServiceClient asc;
+-  private static ApiServiceClient badAsc;
+-  private static Server server;
+-
+-  /**
+-   * A mocked version of API Service for testing purpose.
+-   *
+-   */
+-  @SuppressWarnings("serial")
+-  public static class TestServlet extends HttpServlet {
+-
+-    @Override
+-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      System.out.println("Get was called");
+-      if (req.getPathInfo() != null
+-          && req.getPathInfo().contains("nonexistent-app")) {
+-        resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+-      } else {
+-        resp.setStatus(HttpServletResponse.SC_OK);
+-      }
+-    }
+-
+-    @Override
+-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    @Override
+-    protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    @Override
+-    protected void doDelete(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-  }
+-
+-  @BeforeAll
+-  public static void setup() throws Exception {
+-    server = new Server(8088);
+-    ((QueuedThreadPool)server.getThreadPool()).setMaxThreads(20);
+-    ServletContextHandler context = new ServletContextHandler();
+-    context.setContextPath("/app");
+-    server.setHandler(context);
+-    context.addServlet(new ServletHolder(TestServlet.class), "/*");
+-    ((ServerConnector)server.getConnectors()[0]).setHost("localhost");
+-    server.start();
+-
+-    Configuration conf = new Configuration();
+-    conf.set("yarn.resourcemanager.webapp.address",
+-        "localhost:8088");
+-    asc = new ApiServiceClient();
+-    asc.serviceInit(conf);
+-
+-    Configuration conf2 = new Configuration();
+-    conf2.set("yarn.resourcemanager.webapp.address",
+-        "localhost:8089");
+-    badAsc = new ApiServiceClient();
+-    badAsc.serviceInit(conf2);
+-  }
+-
+-  @AfterAll
+-  public static void tearDown() throws Exception {
+-    server.stop();
+-  }
+-
+-  @Test
+-  void testGetRMWebAddress() throws Exception {
+-    Configuration conf = new Configuration();
+-    conf.setBoolean(YarnConfiguration.RM_HA_ENABLED, true);
+-    conf.set(YarnConfiguration.RM_HA_IDS, "rm1");
+-    conf.set(YarnConfiguration.RM_HA_ID, "rm1");
+-    conf.set("yarn.resourcemanager.webapp.address.rm1", "localhost:0");
+-    ApiServiceClient asc1 = new ApiServiceClient(conf);
+-    boolean exceptionCaught = false;
+-    String diagnosticsMsg = null;
+-    try {
+-      String rmWebAddress = asc1.getRMWebAddress();
+-    } catch (IOException e) {
+-      exceptionCaught = true;
+-      diagnosticsMsg = e.getMessage();
+-    }
+-    assertTrue(exceptionCaught, "ApiServiceClient failed to throw exception");
+-    assertTrue(diagnosticsMsg.contains("Error connecting to localhost:0"),
+-        "Exception Message does not match");
+-  }
+-
+-  @Test
+-  void testLaunch() {
+-    String fileName = "target/test-classes/example-app.json";
+-    String appName = "example-app";
+-    long lifetime = 3600L;
+-    String queue = "default";
+-    try {
+-      int result = asc.actionLaunch(fileName, appName, lifetime, queue);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadLaunch() {
+-    String fileName = "unknown_file";
+-    String appName = "unknown_app";
+-    long lifetime = 3600L;
+-    String queue = "default";
+-    try {
+-      int result = badAsc.actionLaunch(fileName, appName, lifetime, queue);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testStatus() {
+-    String appName = "nonexistent-app";
+-    try {
+-      String result = asc.getStatusString(appName);
+-      assertEquals(" Service " + appName + " not found", result, "Status reponse don't match");
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testStop() {
+-    String appName = "example-app";
+-    try {
+-      int result = asc.actionStop(appName);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadStop() {
+-    String appName = "unknown_app";
+-    try {
+-      int result = badAsc.actionStop(appName);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testStart() {
+-    String appName = "example-app";
+-    try {
+-      int result = asc.actionStart(appName);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadStart() {
+-    String appName = "unknown_app";
+-    try {
+-      int result = badAsc.actionStart(appName);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testSave() {
+-    String fileName = "target/test-classes/example-app.json";
+-    String appName = "example-app";
+-    long lifetime = 3600L;
+-    String queue = "default";
+-    try {
+-      int result = asc.actionSave(fileName, appName, lifetime, queue);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadSave() {
+-    String fileName = "unknown_file";
+-    String appName = "unknown_app";
+-    long lifetime = 3600L;
+-    String queue = "default";
+-    try {
+-      int result = badAsc.actionSave(fileName, appName, lifetime, queue);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testFlex() {
+-    String appName = "example-app";
+-    HashMap<String, String> componentCounts = new HashMap<String, String>();
+-    try {
+-      int result = asc.actionFlex(appName, componentCounts);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadFlex() {
+-    String appName = "unknown_app";
+-    HashMap<String, String> componentCounts = new HashMap<String, String>();
+-    try {
+-      int result = badAsc.actionFlex(appName, componentCounts);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testDestroy() {
+-    String appName = "example-app";
+-    try {
+-      int result = asc.actionDestroy(appName);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testBadDestroy() {
+-    String appName = "unknown_app";
+-    try {
+-      int result = badAsc.actionDestroy(appName);
+-      assertEquals(EXIT_EXCEPTION_THROWN, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testInitiateServiceUpgrade() {
+-    String appName = "example-app";
+-    String upgradeFileName = "target/test-classes/example-app.json";
+-    try {
+-      int result = asc.initiateUpgrade(appName, upgradeFileName, false);
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testInstancesUpgrade() {
+-    String appName = "example-app";
+-    try {
+-      int result = asc.actionUpgradeInstances(appName, Lists.newArrayList(
+-          "comp-1", "comp-2"));
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testComponentsUpgrade() {
+-    String appName = "example-app";
+-    try {
+-      int result = asc.actionUpgradeComponents(appName, Lists.newArrayList(
+-          "comp"));
+-      assertEquals(EXIT_SUCCESS, result);
+-    } catch (IOException | YarnException e) {
+-      fail();
+-    }
+-  }
+-
+-  @Test
+-  void testNoneSecureApiClient() throws IOException {
+-    String url = asc.getServicePath("/foobar");
+-    assertTrue(url.contains("user.name"),
+-        "User.name flag is missing in service path.");
+-    assertTrue(url.contains(System.getProperty("user.name")),
+-        "User.name flag is not matching JVM user.");
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSecureApiServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSecureApiServiceClient.java
+deleted file mode 100644
+index 60c06e9aa75..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSecureApiServiceClient.java
++++ /dev/null
+@@ -1,192 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import static org.junit.jupiter.api.Assertions.*;
+-
+-import java.io.File;
+-import java.io.IOException;
+-
+-import javax.security.sasl.Sasl;
+-import javax.servlet.ServletException;
+-import javax.servlet.http.HttpServlet;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-
+-import java.util.Map;
+-import java.util.ArrayList;
+-import java.util.Enumeration;
+-import java.util.HashMap;
+-import java.util.List;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
+-import org.apache.hadoop.security.SecurityUtil;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.SaslRpcServer.QualityOfProtection;
+-import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
+-import org.apache.log4j.Logger;
+-import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.ServerConnector;
+-import org.eclipse.jetty.servlet.ServletContextHandler;
+-import org.eclipse.jetty.servlet.ServletHolder;
+-import org.eclipse.jetty.util.thread.QueuedThreadPool;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-/**
+- * Test Spnego Client Login.
+- */
+-public class TestSecureApiServiceClient extends KerberosSecurityTestcase {
+-
+-  private String clientPrincipal = "client";
+-
+-  private String server1Protocol = "HTTP";
+-
+-  private String server2Protocol = "server2";
+-
+-  private String host = "localhost";
+-
+-  private String server1Principal = server1Protocol + "/" + host;
+-
+-  private String server2Principal = server2Protocol + "/" + host;
+-
+-  private File keytabFile;
+-
+-  private Configuration testConf = new Configuration();
+-
+-  private Map<String, String> props;
+-  private static Server server;
+-  private static Logger LOG = Logger
+-      .getLogger(TestSecureApiServiceClient.class);
+-  private ApiServiceClient asc;
+-
+-  /**
+-   * A mocked version of API Service for testing purpose.
+-   *
+-   */
+-  @SuppressWarnings("serial")
+-  public static class TestServlet extends HttpServlet {
+-
+-    private static boolean headerFound = false;
+-
+-    @Override
+-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      Enumeration<String> headers = req.getHeaderNames();
+-      while(headers.hasMoreElements()) {
+-        String header = headers.nextElement();
+-        LOG.info(header);
+-      }
+-      if (req.getHeader("Authorization")!=null) {
+-        headerFound = true;
+-        resp.setStatus(HttpServletResponse.SC_OK);
+-      } else {
+-        headerFound = false;
+-        resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+-      }
+-    }
+-
+-    @Override
+-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    @Override
+-    protected void doPut(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    @Override
+-    protected void doDelete(HttpServletRequest req, HttpServletResponse resp)
+-        throws ServletException, IOException {
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    public static boolean isHeaderExist() {
+-      return headerFound;
+-    }
+-  }
+-
+-  @BeforeEach
+-  public void setUp() throws Exception {
+-    startMiniKdc();
+-    keytabFile = new File(getWorkDir(), "keytab");
+-    getKdc().createPrincipal(keytabFile, clientPrincipal, server1Principal,
+-        server2Principal);
+-    SecurityUtil.setAuthenticationMethod(AuthenticationMethod.KERBEROS,
+-        testConf);
+-    UserGroupInformation.setConfiguration(testConf);
+-    UserGroupInformation.setShouldRenewImmediatelyForTests(true);
+-    props = new HashMap<String, String>();
+-    props.put(Sasl.QOP, QualityOfProtection.AUTHENTICATION.saslQop);
+-    server = new Server(8088);
+-    ((QueuedThreadPool)server.getThreadPool()).setMaxThreads(20);
+-    ServletContextHandler context = new ServletContextHandler();
+-    context.setContextPath("/app");
+-    server.setHandler(context);
+-    context.addServlet(new ServletHolder(TestServlet.class), "/*");
+-    ((ServerConnector)server.getConnectors()[0]).setHost("localhost");
+-    server.start();
+-
+-    List<String> rmServers = new ArrayList<String>();
+-    rmServers.add("localhost:8088");
+-    testConf.set("yarn.resourcemanager.webapp.address",
+-        "localhost:8088");
+-    testConf.setBoolean(YarnConfiguration.RM_HA_ENABLED, true);
+-    asc = new ApiServiceClient() {
+-      @Override
+-      List<String> getRMHAWebAddresses(Configuration conf) {
+-        return rmServers;
+-      }
+-    };
+-    asc.serviceInit(testConf);
+-  }
+-
+-  @AfterEach
+-  public void tearDown() throws Exception {
+-    server.stop();
+-    stopMiniKdc();
+-  }
+-
+-  @Test
+-  void testHttpSpnegoChallenge() throws Exception {
+-    UserGroupInformation.loginUserFromKeytab(clientPrincipal, keytabFile
+-        .getCanonicalPath());
+-    String challenge = YarnClientUtils.generateToken("localhost");
+-    assertNotNull(challenge);
+-  }
+-
+-  @Test
+-  void testAuthorizationHeader() throws Exception {
+-    UserGroupInformation.loginUserFromKeytab(clientPrincipal, keytabFile
+-        .getCanonicalPath());
+-    String rmAddress = asc.getRMWebAddress();
+-    if (TestServlet.isHeaderExist()) {
+-      assertEquals(rmAddress, "http://localhost:8088");
+-    } else {
+-      fail("Did not see Authorization header.");
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSystemServiceManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSystemServiceManagerImpl.java
+deleted file mode 100644
+index a2f698fd31f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/client/TestSystemServiceManagerImpl.java
++++ /dev/null
+@@ -1,264 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-
+-import static org.junit.jupiter.api.Assertions.*;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.Set;
+-
+-/**
+- * Test class for system service manager.
+- */
+-public class TestSystemServiceManagerImpl {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestSystemServiceManagerImpl.class);
+-  private SystemServiceManagerImpl systemService;
+-  private Configuration conf;
+-  private String resourcePath = "system-services";
+-
+-  private String[] users = new String[] {"user1", "user2"};
+-  private static Map<String, Set<String>> loadedServices = new HashMap<>();
+-  private static Map<String, Set<String>> savedServices = new HashMap<>();
+-  private static Map<String, Set<String>> submittedServices = new HashMap<>();
+-
+-  @BeforeEach
+-  public void setup() {
+-    File file = new File(
+-        getClass().getClassLoader().getResource(resourcePath).getFile());
+-    conf = new Configuration();
+-    conf.set(YarnServiceConf.YARN_SERVICES_SYSTEM_SERVICE_DIRECTORY,
+-        file.getAbsolutePath());
+-    systemService = new SystemServiceManagerImpl() {
+-      @Override ServiceClient getServiceClient() {
+-        return new TestServiceClient();
+-      }
+-    };
+-    systemService.init(conf); // do not call explicit start
+-
+-    constructUserService(users[0], "example-app1");
+-    constructUserService(users[1], "example-app1", "example-app2");
+-  }
+-
+-  @AfterEach
+-  public void tearDown() {
+-    systemService.stop();
+-  }
+-
+-  @Test
+-  void testSystemServiceSubmission() throws Exception {
+-    systemService.start();
+-
+-    /* verify for ignored sevices count */
+-    Map<String, Integer> ignoredUserServices =
+-        systemService.getIgnoredUserServices();
+-    assertEquals(1, ignoredUserServices.size());
+-    assertTrue(ignoredUserServices.containsKey(users[0]),
+-        "User user1 doesn't exist.");
+-    int count = ignoredUserServices.get(users[0]);
+-    assertEquals(1, count);
+-    assertEquals(1,
+-        systemService.getBadFileNameExtensionSkipCounter());
+-    assertEquals(1, systemService.getBadDirSkipCounter());
+-
+-    Map<String, Set<Service>> userServices =
+-        systemService.getSyncUserServices();
+-    assertEquals(loadedServices.size(), userServices.size());
+-    verifyForScannedUserServices(userServices);
+-
+-    verifyForLaunchedUserServices();
+-
+-    // 2nd time launch service to handle if service exist scenario
+-    systemService.launchUserService(userServices);
+-    verifyForLaunchedUserServices();
+-
+-    // verify start of stopped services
+-    submittedServices.clear();
+-    systemService.launchUserService(userServices);
+-    verifyForLaunchedUserServices();
+-  }
+-
+-  private void verifyForScannedUserServices(
+-      Map<String, Set<Service>> userServices) {
+-    for (String user : users) {
+-      Set<Service> services = userServices.get(user);
+-      Set<String> serviceNames = loadedServices.get(user);
+-      assertEquals(serviceNames.size(), services.size());
+-      Iterator<Service> iterator = services.iterator();
+-      while (iterator.hasNext()) {
+-        Service next = iterator.next();
+-        assertTrue(serviceNames.contains(next.getName()),
+-            "Service name doesn't exist in expected userService " + serviceNames);
+-      }
+-    }
+-  }
+-
+-  public void constructUserService(String user, String... serviceNames) {
+-    Set<String> service = loadedServices.get(user);
+-    if (service == null) {
+-      service = new HashSet<>();
+-      for (String serviceName : serviceNames) {
+-        service.add(serviceName);
+-      }
+-      loadedServices.put(user, service);
+-    }
+-  }
+-
+-  class TestServiceClient extends ServiceClient {
+-    @Override
+-    protected void serviceStart() throws Exception {
+-      // do nothing
+-    }
+-
+-    @Override
+-    protected void serviceStop() throws Exception {
+-      // do nothing
+-    }
+-
+-    @Override
+-    protected void serviceInit(Configuration configuration)
+-        throws Exception {
+-      // do nothing
+-    }
+-
+-    @Override
+-    public int actionBuild(Service service)
+-        throws YarnException, IOException {
+-      String userName =
+-          UserGroupInformation.getCurrentUser().getShortUserName();
+-      Set<String> services = savedServices.get(userName);
+-      if (services == null) {
+-        services = new HashSet<>();
+-        savedServices.put(userName, services);
+-      }
+-      if (services.contains(service.getName())) {
+-        String message = "Failed to save service " + service.getName()
+-            + ", because it already exists.";
+-        throw new SliderException(SliderExitCodes.EXIT_INSTANCE_EXISTS,
+-            message);
+-      }
+-      services.add(service.getName());
+-      return 0;
+-    }
+-
+-    @Override
+-    public ApplicationId actionStartAndGetId(String serviceName)
+-        throws YarnException, IOException {
+-      String userName =
+-          UserGroupInformation.getCurrentUser().getShortUserName();
+-      Set<String> services = submittedServices.get(userName);
+-      if (services == null) {
+-        services = new HashSet<>();
+-        submittedServices.put(userName, services);
+-      }
+-      if (services.contains(serviceName)) {
+-        String message = "Failed to create service " + serviceName
+-            + ", because it is already running.";
+-        throw new YarnException(message);
+-      }
+-      services.add(serviceName);
+-      return ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    }
+-  }
+-
+-  private void verifyForLaunchedUserServices() {
+-    assertEquals(loadedServices.size(), submittedServices.size());
+-    for (Map.Entry<String, Set<String>> entry : submittedServices.entrySet()) {
+-      String user = entry.getKey();
+-      Set<String> serviceSet = entry.getValue();
+-      assertTrue(loadedServices.containsKey(user));
+-      Set<String> services = loadedServices.get(user);
+-      assertEquals(services.size(), serviceSet.size());
+-      assertTrue(services.containsAll(serviceSet));
+-    }
+-  }
+-
+-  @Test
+-  void testFileSystemCloseWhenCleanUpService() throws Exception {
+-    FileSystem fs = null;
+-    Path path = new Path("/tmp/servicedir");
+-
+-    HdfsConfiguration hdfsConfig = new HdfsConfiguration();
+-    MiniDFSCluster hdfsCluster = new MiniDFSCluster.Builder(hdfsConfig)
+-        .numDataNodes(1).build();
+-
+-    fs = hdfsCluster.getFileSystem();
+-    if (!fs.exists(path)) {
+-      fs.mkdirs(path);
+-    }
+-
+-    SystemServiceManagerImpl serviceManager = new SystemServiceManagerImpl();
+-
+-    hdfsConfig.set(YarnServiceConf.YARN_SERVICES_SYSTEM_SERVICE_DIRECTORY,
+-        path.toString());
+-    serviceManager.init(hdfsConfig);
+-
+-    // the FileSystem object owned by SystemServiceManager must not be closed
+-    // when cleanup a service
+-    hdfsConfig.set("hadoop.registry.zk.connection.timeout.ms", "100");
+-    hdfsConfig.set("hadoop.registry.zk.retry.times", "1");
+-    ApiServiceClient asc = new ApiServiceClient();
+-    asc.serviceInit(hdfsConfig);
+-    asc.actionCleanUp("testapp", "testuser");
+-
+-    try {
+-      serviceManager.start();
+-    } catch (Exception e) {
+-      if (e.getMessage().contains("Filesystem closed")) {
+-        fail("SystemServiceManagerImpl failed to handle " +
+-            "FileSystem close");
+-      } else {
+-        fail("Should not get any exceptions");
+-      }
+-    } finally {
+-      serviceManager.stop();
+-      fs = hdfsCluster.getFileSystem();
+-      if (fs.exists(path)) {
+-        fs.delete(path, true);
+-      }
+-      if (hdfsCluster != null) {
+-        hdfsCluster.shutdown();
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/example-app.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/example-app.json
+deleted file mode 100644
+index a2f41cf3cc5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/example-app.json
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/log4j.properties
+deleted file mode 100644
+index 81a3f6ad5d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/bad/bad.yarnfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/bad/bad.yarnfile
+deleted file mode 100644
+index 1d514d665fb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/bad/bad.yarnfile
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "bad",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app1.yarnfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app1.yarnfile
+deleted file mode 100644
+index 823561d8598..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app1.yarnfile
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app1",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app2.yarnfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app2.yarnfile
+deleted file mode 100644
+index 823561d8598..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app2.yarnfile
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app1",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app3.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app3.json
+deleted file mode 100644
+index 8a3a5612392..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user1/example-app3.json
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app3",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app1.yarnfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app1.yarnfile
+deleted file mode 100644
+index 823561d8598..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app1.yarnfile
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app1",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app2.yarnfile b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app2.yarnfile
+deleted file mode 100644
+index d8fd1d12fca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/system-services/sync/user2/example-app2.yarnfile
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app2",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/yarn-site.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index daac23adcd4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,19 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <!-- Dummy (invalid) config file to be overwritten by ServiceTestUtils with MiniCluster configuration. -->
+-</configuration>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf/yarnservice-log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf/yarnservice-log4j.properties
+deleted file mode 100644
+index 58c8e27133a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf/yarnservice-log4j.properties
++++ /dev/null
+@@ -1,62 +0,0 @@
+-# Licensed to the Apache Software Foundation (ASF) under one
+-#  or more contributor license agreements.  See the NOTICE file
+-#  distributed with this work for additional information
+-#  regarding copyright ownership.  The ASF licenses this file
+-#  to you under the Apache License, Version 2.0 (the
+-#  "License"); you may not use this file except in compliance
+-#  with the License.  You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#  Unless required by applicable law or agreed to in writing, software
+-#  distributed under the License is distributed on an "AS IS" BASIS,
+-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#  See the License for the specific language governing permissions and
+-#  limitations under the License.
+-#
+-
+-# This is the log4j configuration for Slider Application Master
+-
+-# Log rotation based on size (256MB) with a max of 20 backup files
+-log4j.rootLogger=INFO, amlog
+-log4j.threshhold=ALL
+-log4j.appender.amlog=org.apache.log4j.RollingFileAppender
+-log4j.appender.amlog.layout=org.apache.log4j.PatternLayout
+-log4j.appender.amlog.File=${LOG_DIR}/serviceam.log
+-log4j.appender.amlog.MaxFileSize=256MB
+-log4j.appender.amlog.MaxBackupIndex=20
+-
+-# log layout skips stack-trace creation operations by avoiding line numbers and method
+-log4j.appender.amlog.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} - %m%n
+-
+-# debug edition is much more expensive
+-#log4j.appender.amlog.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
+-
+-# configure stderr
+-# set the conversion pattern of stderr
+-# Print the date in ISO 8601 format
+-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
+-log4j.appender.stderr.Target=System.err
+-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stderr.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} - %m%n
+-
+-log4j.appender.subprocess=org.apache.log4j.ConsoleAppender
+-log4j.appender.subprocess.layout=org.apache.log4j.PatternLayout
+-log4j.appender.subprocess.layout.ConversionPattern=[%c{1}]: %m%n
+-
+-# for debugging yarn-service framework
+-#log4j.logger.org.apache.hadoop.yarn.service=DEBUG
+-
+-# uncomment for YARN operations
+-#log4j.logger.org.apache.hadoop.yarn.client=DEBUG
+-
+-# uncomment this to debug security problems
+-#log4j.logger.org.apache.hadoop.security=DEBUG
+-
+-#crank back on some noise
+-log4j.logger.org.apache.hadoop.util.NativeCodeLoader=ERROR
+-log4j.logger.org.apache.hadoop.hdfs=WARN
+-
+-log4j.logger.org.apache.zookeeper=WARN
+-log4j.logger.org.apache.curator.framework.state=ERROR
+-log4j.logger.org.apache.curator.framework.imps=WARN
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json
+deleted file mode 100755
+index 6a5f2f36a61..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/appcatalog/appcatalog.json
++++ /dev/null
+@@ -1,28 +0,0 @@
+-{
+-  "name": "appcatalog",
+-  "version": "1",
+-  "components" :
+-  [
+-    {
+-      "name": "catalog",
+-      "number_of_containers": 1,
+-      "artifact": {
+-        "id": "apache/hadoop-yarn-applications-catalog-docker:3.3.0-SNAPSHOT",
+-        "type": "DOCKER"
+-      },
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "2048"
+-      },
+-      "configuration": {
+-        "env": {
+-          "YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE":"true",
+-          "YARN_CONTAINER_RUNTIME_DOCKER_MOUNTS":"/etc/hadoop/conf:/etc/hadoop/conf:ro,/var/lib/sss/pipes:/var/lib/sss/pipes:rw",
+-          "JAVA_HOME":"/usr/lib/jvm/jre-1.8.0"
+-        },
+-        "properties": {
+-        }
+-      }
+-    }
+-  ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-no-dns.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-no-dns.json
+deleted file mode 100644
+index b8098848b35..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-no-dns.json
++++ /dev/null
+@@ -1,63 +0,0 @@
+-{
+-  "name": "httpd-service-no-dns",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "httpd",
+-      "number_of_containers": 2,
+-      "artifact": {
+-        "id": "centos/httpd-24-centos7:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/bin/run-httpd",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "readiness_check": {
+-        "type": "HTTP",
+-        "properties": {
+-          "url": "http://${THIS_HOST}:8080"
+-        }
+-      },
+-      "configuration": {
+-        "files": [
+-          {
+-            "type": "TEMPLATE",
+-            "dest_file": "/var/www/html/index.html",
+-            "properties": {
+-              "content": "<html><header><title>Title</title></header><body>Hello from ${COMPONENT_INSTANCE_NAME}!</body></html>"
+-            }
+-          }
+-        ]
+-      }
+-    },
+-    {
+-      "name": "httpd-proxy",
+-      "number_of_containers": 1,
+-      "dependencies": [ "httpd" ],
+-      "artifact": {
+-        "id": "centos/httpd-24-centos7:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/bin/run-httpd",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "configuration": {
+-        "files": [
+-          {
+-            "type": "TEMPLATE",
+-            "dest_file": "/etc/httpd/conf.d/httpd-proxy.conf",
+-            "src_file": "httpd-proxy-no-dns.conf"
+-          }
+-        ]
+-      }
+-    }
+-  ],
+-  "quicklinks": {
+-    "Apache HTTP Server": "http://httpd-proxy-0.${SERVICE_NAME}.${USER}.${DOMAIN}:8080"
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-proxy-no-dns.conf b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-proxy-no-dns.conf
+deleted file mode 100644
+index 9894e64d508..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd-no-dns/httpd-proxy-no-dns.conf
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-<Proxy balancer://test>
+-  BalancerMember http://${HTTPD-0_IP}:8080
+-  BalancerMember http://${HTTPD-1_IP}:8080
+-  ProxySet lbmethod=bytraffic
+-</Proxy>
+-
+-ProxyPass "/"  "balancer://test/"
+-ProxyPassReverse "/"  "balancer://test/"
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd-proxy.conf b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd-proxy.conf
+deleted file mode 100644
+index e8651a5c6cd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd-proxy.conf
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#
+-# Licensed to the Apache Software Foundation (ASF) under one or more
+-# contributor license agreements.  See the NOTICE file distributed with
+-# this work for additional information regarding copyright ownership.
+-# The ASF licenses this file to You under the Apache License, Version 2.0
+-# (the "License"); you may not use this file except in compliance with
+-# the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-<Proxy balancer://test>
+-  BalancerMember http://httpd-0.${SERVICE_NAME}.${USER}.${DOMAIN}:8080
+-  BalancerMember http://httpd-1.${SERVICE_NAME}.${USER}.${DOMAIN}:8080
+-  ProxySet lbmethod=bytraffic
+-</Proxy>
+-
+-ProxyPass "/"  "balancer://test/"
+-ProxyPassReverse "/"  "balancer://test/"
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd.json
+deleted file mode 100644
+index 849cacca345..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/httpd/httpd.json
++++ /dev/null
+@@ -1,56 +0,0 @@
+-{
+-  "name": "httpd-service",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "httpd",
+-      "number_of_containers": 2,
+-      "artifact": {
+-        "id": "centos/httpd-24-centos7:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/bin/run-httpd",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "configuration": {
+-        "files": [
+-          {
+-            "type": "TEMPLATE",
+-            "dest_file": "/var/www/html/index.html",
+-            "properties": {
+-              "content": "<html><header><title>Title</title></header><body>Hello from ${COMPONENT_INSTANCE_NAME}!</body></html>"
+-            }
+-          }
+-        ]
+-      }
+-    },
+-    {
+-      "name": "httpd-proxy",
+-      "number_of_containers": 1,
+-      "artifact": {
+-        "id": "centos/httpd-24-centos7:latest",
+-        "type": "DOCKER"
+-      },
+-      "launch_command": "/usr/bin/run-httpd",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "configuration": {
+-        "files": [
+-          {
+-            "type": "TEMPLATE",
+-            "dest_file": "/etc/httpd/conf.d/httpd-proxy.conf",
+-            "src_file": "httpd-proxy.conf"
+-          }
+-        ]
+-      }
+-    }
+-  ],
+-  "quicklinks": {
+-    "Apache HTTP Server": "http://httpd-proxy-0.${SERVICE_NAME}.${USER}.${DOMAIN}:8080"
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/sleeper/sleeper.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/sleeper/sleeper.json
+deleted file mode 100644
+index 954c704c24f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples/sleeper/sleeper.json
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "sleeper-service",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "sleeper",
+-      "number_of_containers": 2,
+-      "launch_command": "sleep 900000",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "256"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
+deleted file mode 100644
+index de41abcd74b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
++++ /dev/null
+@@ -1,279 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-yarn-services</artifactId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <artifactId>hadoop-yarn-services-core</artifactId>
+-  <packaging>jar</packaging>
+-  <name>Apache Hadoop YARN Services Core</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <build>
+-    <!-- resources are filtered for dynamic updates. This gets build info in-->
+-    <resources>
+-      <resource>
+-        <directory>src/main/resources</directory>
+-        <filtering>true</filtering>
+-      </resource>
+-    </resources>
+-    
+-    <plugins>
+-      <plugin>
+-        <groupId>org.xolstice.maven.plugins</groupId>
+-        <artifactId>protobuf-maven-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>src-compile-protoc</id>
+-            <configuration>
+-              <skip>false</skip>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>com.google.code.maven-replacer-plugin</groupId>
+-        <artifactId>replacer</artifactId>
+-        <executions>
+-          <execution>
+-            <id>replace-generated-sources</id>
+-            <configuration>
+-              <skip>false</skip>
+-            </configuration>
+-          </execution>
+-          <execution>
+-            <id>replace-sources</id>
+-            <configuration>
+-              <skip>false</skip>
+-            </configuration>
+-          </execution>
+-          <execution>
+-            <id>replace-test-sources</id>
+-            <configuration>
+-              <skip>false</skip>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+-          <environmentVariables>
+-            <JAVA_HOME>${java.home}</JAVA_HOME>
+-          </environmentVariables>
+-        </configuration>
+-      </plugin>
+-
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>**/*.json</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-
+-    </plugins>
+-  </build>
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.slf4j</groupId>
+-      <artifactId>slf4j-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>ch.qos.reload4j</groupId>
+-      <artifactId>reload4j</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.fasterxml.jackson.core</groupId>
+-      <artifactId>jackson-databind</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.fasterxml.jackson.core</groupId>
+-      <artifactId>jackson-annotations</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-registry</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.google.protobuf</groupId>
+-      <artifactId>protobuf-java</artifactId>
+-      <scope>${transient.protobuf2.scope}</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.commons</groupId>
+-      <artifactId>commons-configuration2</artifactId>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>servlet-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.commons</groupId>
+-      <artifactId>commons-compress</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>commons-io</groupId>
+-      <artifactId>commons-io</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-client</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-framework</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>javax.xml.bind</groupId>
+-      <artifactId>jaxb-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.yaml</groupId>
+-      <artifactId>snakeyaml</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-        <groupId>io.swagger</groupId>
+-        <artifactId>swagger-annotations</artifactId>
+-    </dependency>
+-
+-    <!-- ======================================================== -->
+-    <!-- Test dependencies -->
+-    <!-- ======================================================== -->
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-test</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.assertj</groupId>
+-      <artifactId>assertj-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-  </dependencies>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMPolicyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMPolicyProvider.java
+deleted file mode 100644
+index 365df0fabcd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMPolicyProvider.java
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.security.authorize.PolicyProvider;
+-import org.apache.hadoop.security.authorize.Service;
+-
+-/**
+- * PolicyProvider for Client to Service AM protocol.
+- */
+-public class ClientAMPolicyProvider extends PolicyProvider {
+-
+-  private static final Service[] CLIENT_AM_SERVICE =
+-      new Service[]{
+-          new Service(
+-              "security.yarn-service.client-am-protocol.acl",
+-              ClientAMProtocol.class)};
+-
+-  @Override
+-  public Service[] getServices() {
+-    return CLIENT_AM_SERVICE;
+-  };
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMProtocol.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMProtocol.java
+deleted file mode 100644
+index e43e6fbf47e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMProtocol.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceResponseProto;
+-
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-
+-
+-import java.io.IOException;
+-
+-public interface ClientAMProtocol {
+-  FlexComponentsResponseProto flexComponents(FlexComponentsRequestProto request)
+-      throws IOException, YarnException;
+-
+-  GetStatusResponseProto getStatus(GetStatusRequestProto requestProto)
+-      throws IOException, YarnException;
+-
+-  StopResponseProto stop(StopRequestProto requestProto)
+-      throws IOException, YarnException;
+-
+-  UpgradeServiceResponseProto upgrade(UpgradeServiceRequestProto request)
+-      throws IOException, YarnException;
+-
+-  RestartServiceResponseProto restart(RestartServiceRequestProto request)
+-      throws IOException, YarnException;
+-
+-  CompInstancesUpgradeResponseProto upgrade(
+-      CompInstancesUpgradeRequestProto request) throws IOException,
+-      YarnException;
+-
+-  GetCompInstancesResponseProto getCompInstances(
+-      GetCompInstancesRequestProto request) throws IOException, YarnException;
+-
+-  CancelUpgradeResponseProto cancelUpgrade(
+-      CancelUpgradeRequestProto request) throws IOException, YarnException;
+-
+-  DecommissionCompInstancesResponseProto decommissionCompInstances(
+-      DecommissionCompInstancesRequestProto request) throws IOException,
+-      YarnException;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMSecurityInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMSecurityInfo.java
+deleted file mode 100644
+index e19284bf12f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMSecurityInfo.java
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.KerberosInfo;
+-import org.apache.hadoop.security.SecurityInfo;
+-import org.apache.hadoop.security.token.TokenInfo;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.impl.pb.service.ClientAMProtocolPB;
+-
+-import java.lang.annotation.Annotation;
+-
+-/**
+- * Security Info for Client to Service AM protocol.
+- */
+-public class ClientAMSecurityInfo extends SecurityInfo{
+-  @Override
+-  public KerberosInfo getKerberosInfo(Class<?> protocol, Configuration conf) {
+-    if (!protocol.equals(ClientAMProtocolPB.class)) {
+-      return null;
+-    }
+-    return new KerberosInfo() {
+-
+-      @Override
+-      public Class<? extends Annotation> annotationType() {
+-        return null;
+-      }
+-
+-      @Override
+-      public String serverPrincipal() {
+-        return YarnServiceConstants.PRINCIPAL;
+-      }
+-
+-      @Override
+-      public String clientPrincipal() {
+-        return null;
+-      }
+-    };
+-  }
+-
+-  @Override
+-  public TokenInfo getTokenInfo(Class<?> protocol, Configuration conf) {
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+deleted file mode 100644
+index 2a9bf8d5d97..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
++++ /dev/null
+@@ -1,253 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.ComponentCountProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.utils.FilterUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.util.List;
+-
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.DECOMMISSION_INSTANCE;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.FLEX;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.YARN_SERVICE_AM_CLIENT_PORT_RANGE;
+-
+-public class ClientAMService extends AbstractService
+-    implements ClientAMProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ClientAMService.class);
+-
+-  private ServiceContext context;
+-  private Server server;
+-
+-  private InetSocketAddress bindAddress;
+-
+-  public ClientAMService(ServiceContext context) {
+-    super("Client AM Service");
+-    this.context = context;
+-  }
+-
+-  @Override protected void serviceStart() throws Exception {
+-    Configuration conf = getConfig();
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    String nodeHostString = getNMHostName();
+-
+-    InetSocketAddress address = new InetSocketAddress(nodeHostString, 0);
+-    server = rpc.getServer(ClientAMProtocol.class, this, address, conf,
+-        context.secretManager, 1, YARN_SERVICE_AM_CLIENT_PORT_RANGE);
+-
+-    // Enable service authorization?
+-    if (conf.getBoolean(
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
+-        false)) {
+-      this.server.refreshServiceAcl(getConfig(), new ClientAMPolicyProvider());
+-    }
+-
+-    server.start();
+-
+-    bindAddress = NetUtils.createSocketAddrForHost(nodeHostString,
+-        server.getListenerAddress().getPort());
+-
+-    LOG.info("Instantiated ClientAMService at " + bindAddress);
+-    super.serviceStart();
+-  }
+-
+-  @VisibleForTesting
+-  String getNMHostName() throws BadClusterStateException {
+-    return ServiceUtils.mandatoryEnvVariable(
+-        ApplicationConstants.Environment.NM_HOST.name());
+-  }
+-
+-  @Override protected void serviceStop() throws Exception {
+-    if (server != null) {
+-      server.stop();
+-    }
+-    super.serviceStop();
+-  }
+-
+-  @Override public FlexComponentsResponseProto flexComponents(
+-      FlexComponentsRequestProto request) throws IOException {
+-    if (!request.getComponentsList().isEmpty()) {
+-      for (ComponentCountProto component : request.getComponentsList()) {
+-        ComponentEvent event = new ComponentEvent(component.getName(), FLEX)
+-            .setDesired(component.getNumberOfContainers());
+-        context.scheduler.getDispatcher().getEventHandler().handle(event);
+-        LOG.info("Flexing component {} to {}", component.getName(),
+-            component.getNumberOfContainers());
+-      }
+-    }
+-    return FlexComponentsResponseProto.newBuilder().build();
+-  }
+-
+-  @Override
+-  public GetStatusResponseProto getStatus(GetStatusRequestProto request)
+-      throws IOException, YarnException {
+-    String stat = ServiceApiUtil.jsonSerDeser.toJson(context.service);
+-    return GetStatusResponseProto.newBuilder().setStatus(stat).build();
+-  }
+-
+-  @Override
+-  public StopResponseProto stop(StopRequestProto requestProto)
+-      throws IOException, YarnException {
+-    LOG.info("Stop the service by {}", UserGroupInformation.getCurrentUser());
+-    context.scheduler.getDiagnostics()
+-        .append("Stopped by user " + UserGroupInformation.getCurrentUser());
+-    context.scheduler.setGracefulStop(FinalApplicationStatus.ENDED);
+-
+-    // Stop the service in 2 seconds delay to make sure this rpc call is completed.
+-    // shutdown hook will be executed which will stop AM gracefully.
+-    Thread thread = new Thread() {
+-      @Override
+-      public void run() {
+-        try {
+-          Thread.sleep(2000);
+-          ExitUtil.terminate(0);
+-        } catch (InterruptedException e) {
+-          LOG.error("Interrupted while stopping", e);
+-        }
+-      }
+-    };
+-    thread.start();
+-    return StopResponseProto.newBuilder().build();
+-  }
+-
+-  public InetSocketAddress getBindAddress() {
+-    return bindAddress;
+-  }
+-
+-  @Override
+-  public UpgradeServiceResponseProto upgrade(
+-      UpgradeServiceRequestProto request) throws IOException {
+-    try {
+-      LOG.info("Upgrading service to version {} by {}", request.getVersion(),
+-          UserGroupInformation.getCurrentUser());
+-      context.getServiceManager().processUpgradeRequest(request.getVersion(),
+-          request.getAutoFinalize(), request.getExpressUpgrade());
+-      return UpgradeServiceResponseProto.newBuilder().build();
+-    } catch (Exception ex) {
+-      return UpgradeServiceResponseProto.newBuilder().setError(ex.getMessage())
+-          .build();
+-    }
+-  }
+-
+-  @Override
+-  public RestartServiceResponseProto restart(RestartServiceRequestProto request)
+-      throws IOException, YarnException {
+-    ServiceEvent event = new ServiceEvent(ServiceEventType.START);
+-    context.scheduler.getDispatcher().getEventHandler().handle(event);
+-    LOG.info("Restart service by {}", UserGroupInformation.getCurrentUser());
+-    return RestartServiceResponseProto.newBuilder().build();
+-  }
+-
+-  @Override
+-  public CompInstancesUpgradeResponseProto upgrade(
+-      CompInstancesUpgradeRequestProto request)
+-      throws IOException, YarnException {
+-    if (!request.getContainerIdsList().isEmpty()) {
+-
+-      for (String containerId : request.getContainerIdsList()) {
+-        ComponentInstanceEvent event =
+-            new ComponentInstanceEvent(ContainerId.fromString(containerId),
+-                ComponentInstanceEventType.UPGRADE);
+-        LOG.info("Upgrade container {}", containerId);
+-        context.scheduler.getDispatcher().getEventHandler().handle(event);
+-      }
+-    }
+-    return CompInstancesUpgradeResponseProto.newBuilder().build();
+-  }
+-
+-  @Override
+-  public GetCompInstancesResponseProto getCompInstances(
+-      GetCompInstancesRequestProto request) throws IOException {
+-    List<ComponentContainers> containers = FilterUtils.filterInstances(context,
+-        request);
+-    return GetCompInstancesResponseProto.newBuilder().setCompInstances(
+-        ServiceApiUtil.COMP_CONTAINERS_JSON_SERDE.toJson(containers.toArray(
+-            new ComponentContainers[containers.size()]))).build();
+-  }
+-
+-  @Override
+-  public CancelUpgradeResponseProto cancelUpgrade(
+-      CancelUpgradeRequestProto request) throws IOException, YarnException {
+-    LOG.info("Cancel service upgrade by {}",
+-        UserGroupInformation.getCurrentUser());
+-    ServiceEvent event = new ServiceEvent(ServiceEventType.CANCEL_UPGRADE);
+-    context.scheduler.getDispatcher().getEventHandler().handle(event);
+-    return CancelUpgradeResponseProto.newBuilder().build();
+-  }
+-
+-  @Override
+-  public DecommissionCompInstancesResponseProto decommissionCompInstances(
+-      DecommissionCompInstancesRequestProto request)
+-      throws IOException, YarnException {
+-    if (!request.getCompInstancesList().isEmpty()) {
+-      for (String instance : request.getCompInstancesList()) {
+-        String componentName = ServiceApiUtil.parseComponentName(instance);
+-        ComponentEvent event = new ComponentEvent(componentName,
+-            DECOMMISSION_INSTANCE).setInstanceName(instance);
+-        context.scheduler.getDispatcher().getEventHandler().handle(event);
+-        LOG.info("Decommissioning component {} instance {}", componentName,
+-            instance);
+-      }
+-    }
+-    return DecommissionCompInstancesResponseProto.newBuilder().build();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ContainerFailureTracker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ContainerFailureTracker.java
+deleted file mode 100644
+index 5982728ca73..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ContainerFailureTracker.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_NODE_BLACKLIST_THRESHOLD;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.NODE_BLACKLIST_THRESHOLD;
+-
+-/**
+- * This tracks the container failures per node. If the failure counter exceeds
+- * the maxFailurePerNode limit, it'll blacklist that node.
+- *
+- */
+-public class ContainerFailureTracker {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ContainerFailureTracker.class);
+-
+-  // Host -> num container failures
+-  private Map<String, Integer> failureCountPerNode = new HashMap<>();
+-  private Set<String> blackListedNodes = new HashSet<>();
+-  private ServiceContext context;
+-  private int maxFailurePerNode;
+-  private Component component;
+-
+-  public ContainerFailureTracker(ServiceContext context, Component component) {
+-    this.context = context;
+-    this.component = component;
+-    maxFailurePerNode = YarnServiceConf.getInt(NODE_BLACKLIST_THRESHOLD,
+-        DEFAULT_NODE_BLACKLIST_THRESHOLD, component.getComponentSpec()
+-        .getConfiguration(), context.scheduler.getConfig());
+-  }
+-
+-
+-  public synchronized void incNodeFailure(String host) {
+-    int num = 0;
+-    if (failureCountPerNode.containsKey(host)) {
+-      num = failureCountPerNode.get(host);
+-    }
+-    num++;
+-    failureCountPerNode.put(host, num);
+-
+-    // black list the node if exceed max failure
+-    if (num > maxFailurePerNode && !blackListedNodes.contains(host)) {
+-      List<String> blacklists = new ArrayList<>();
+-      blacklists.add(host);
+-      blackListedNodes.add(host);
+-      context.scheduler.getAmRMClient().updateBlacklist(blacklists, null);
+-      LOG.info("[COMPONENT {}]: Failed {} times on this host, blacklisted {}."
+-              + " Current list of blacklisted nodes: {}",
+-          component.getName(), num, host, blackListedNodes);
+-    }
+-  }
+-
+-  public synchronized void resetContainerFailures() {
+-    // reset container failure counter per node
+-    failureCountPerNode.clear();
+-    context.scheduler.getAmRMClient()
+-        .updateBlacklist(null, new ArrayList<>(blackListedNodes));
+-    LOG.info("[COMPONENT {}]: Clearing blacklisted nodes {} ",
+-        component.getName(), blackListedNodes);
+-    blackListedNodes.clear();
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceContext.java
+deleted file mode 100644
+index 2deffb8674f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceContext.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-
+-import java.nio.ByteBuffer;
+-
+-public class ServiceContext {
+-  public Service service = null;
+-  public SliderFileSystem fs;
+-  public String serviceHdfsDir = "";
+-  public ApplicationAttemptId attemptId;
+-  public LoadingCache<ConfigFile, Object> configCache;
+-  public ServiceScheduler scheduler;
+-  public ClientToAMTokenSecretManager secretManager;
+-  public ClientAMService clientAMService;
+-  // tokens used for container launch
+-  public ByteBuffer tokens;
+-  // AM keytab principal
+-  public String principal;
+-  // AM keytab location
+-  public String keytab;
+-  private ServiceManager serviceManager;
+-
+-  public ServiceContext() {
+-
+-  }
+-
+-  public ServiceManager getServiceManager() {
+-    return serviceManager;
+-  }
+-
+-  void setServiceManager(ServiceManager serviceManager) {
+-    this.serviceManager = Preconditions.checkNotNull(serviceManager);
+-  }
+-
+-  public Service getService() {
+-    return service;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEvent.java
+deleted file mode 100644
+index cf4455de378..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEvent.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.yarn.event.AbstractEvent;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-
+-import java.util.List;
+-
+-/**
+- * Events are handled by {@link ServiceManager} to manage the service
+- * state.
+- */
+-public class ServiceEvent extends AbstractEvent<ServiceEventType> {
+-
+-  private final ServiceEventType type;
+-  private String version;
+-  private boolean autoFinalize;
+-  private boolean expressUpgrade;
+-  // For express upgrade they should be in order.
+-  private List<Component> compsToUpgrade;
+-
+-  public ServiceEvent(ServiceEventType serviceEventType) {
+-    super(serviceEventType);
+-    this.type = serviceEventType;
+-  }
+-
+-  public ServiceEventType getType() {
+-    return type;
+-  }
+-
+-  public String getVersion() {
+-    return version;
+-  }
+-
+-  public ServiceEvent setVersion(String version) {
+-    this.version = version;
+-    return this;
+-  }
+-
+-  public boolean isAutoFinalize() {
+-    return autoFinalize;
+-  }
+-
+-  public ServiceEvent setAutoFinalize(boolean autoFinalize) {
+-    this.autoFinalize = autoFinalize;
+-    return this;
+-  }
+-
+-  public boolean isExpressUpgrade() {
+-    return expressUpgrade;
+-  }
+-
+-  public ServiceEvent setExpressUpgrade(boolean expressUpgrade) {
+-    this.expressUpgrade = expressUpgrade;
+-    return this;
+-  }
+-
+-  public List<Component> getCompsToUpgrade() {
+-    return compsToUpgrade;
+-  }
+-
+-  public ServiceEvent setCompsToUpgrade(List<Component> compsToUpgrade) {
+-    this.compsToUpgrade = compsToUpgrade;
+-    return this;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEventType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEventType.java
+deleted file mode 100644
+index 03afdd36f24..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceEventType.java
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-/**
+- * Types of {@link ServiceEvent}.
+- */
+-public enum ServiceEventType {
+-  START,
+-  UPGRADE,
+-  CHECK_STABLE,
+-  CANCEL_UPGRADE
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
+deleted file mode 100644
+index d37e5f0e205..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceManager.java
++++ /dev/null
+@@ -1,520 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.component.ComponentRestartPolicy;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.state.*;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.text.MessageFormat;
+-import java.util.ArrayList;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.jsonSerDeser;
+-
+-/**
+- * Manages the state of Service.
+- */
+-public class ServiceManager implements EventHandler<ServiceEvent> {
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      ServiceManager.class);
+-
+-  private final Service serviceSpec;
+-  private final ServiceContext context;
+-  private final ServiceScheduler scheduler;
+-  private final ReentrantReadWriteLock.ReadLock readLock;
+-  private final ReentrantReadWriteLock.WriteLock writeLock;
+-
+-  private final StateMachine<State, ServiceEventType, ServiceEvent>
+-      stateMachine;
+-  private final UpgradeComponentsFinder componentsFinder;
+-
+-  private final AsyncDispatcher dispatcher;
+-  private final SliderFileSystem fs;
+-
+-  private String upgradeVersion;
+-  private List<org.apache.hadoop.yarn.service.api.records
+-      .Component> componentsToUpgrade;
+-  private List<String> compsAffectedByUpgrade = new ArrayList<>();
+-  private String cancelledVersion;
+-
+-  private static final StateMachineFactory<ServiceManager, State,
+-      ServiceEventType, ServiceEvent> STATE_MACHINE_FACTORY =
+-      new StateMachineFactory<ServiceManager, State,
+-          ServiceEventType, ServiceEvent>(State.STABLE)
+-
+-          .addTransition(State.STABLE, EnumSet.of(State.STABLE,
+-              State.UPGRADING), ServiceEventType.UPGRADE,
+-              new StartUpgradeTransition())
+-
+-          .addTransition(State.STABLE, EnumSet.of(State.STABLE),
+-              ServiceEventType.CHECK_STABLE, new CheckStableTransition())
+-
+-          .addTransition(State.UPGRADING, EnumSet.of(State.STABLE,
+-              State.UPGRADING), ServiceEventType.START,
+-              new StartFromUpgradeTransition())
+-
+-          .addTransition(State.UPGRADING, EnumSet.of(State.STABLE,
+-              State.UPGRADING), ServiceEventType.CHECK_STABLE,
+-              new CheckStableTransition())
+-
+-          .addTransition(State.UPGRADING, State.UPGRADING,
+-              ServiceEventType.CANCEL_UPGRADE, new CancelUpgradeTransition())
+-          .installTopology();
+-
+-  public ServiceManager(ServiceContext context) {
+-    Preconditions.checkNotNull(context);
+-    this.context = context;
+-    serviceSpec = context.service;
+-    scheduler = context.scheduler;
+-    stateMachine = STATE_MACHINE_FACTORY.make(this);
+-    dispatcher = scheduler.getDispatcher();
+-
+-    ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+-    readLock = lock.readLock();
+-    writeLock = lock.writeLock();
+-    fs = context.fs;
+-    componentsFinder = new UpgradeComponentsFinder
+-        .DefaultUpgradeComponentsFinder();
+-  }
+-
+-  @Override
+-  public void handle(ServiceEvent event) {
+-    writeLock.lock();
+-    try {
+-      State oldState = getState();
+-      try {
+-        stateMachine.doTransition(event.getType(), event);
+-      } catch (InvalidStateTransitionException e) {
+-        LOG.error(MessageFormat.format(
+-            "[SERVICE]: Invalid event {1} at {2}.", event.getType(),
+-            oldState), e);
+-      }
+-      if (oldState != getState()) {
+-        LOG.info("[SERVICE] Transitioned from {} to {} on {} event.",
+-            oldState, getState(), event.getType());
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  private State getState() {
+-    this.readLock.lock();
+-    try {
+-      return this.stateMachine.getCurrentState();
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  private static class StartUpgradeTransition implements
+-      MultipleArcTransition<ServiceManager, ServiceEvent, State> {
+-
+-    @Override
+-    public State transition(ServiceManager serviceManager,
+-        ServiceEvent event) {
+-      serviceManager.upgradeVersion = event.getVersion();
+-      serviceManager.componentsToUpgrade = event.getCompsToUpgrade();
+-      event.getCompsToUpgrade().forEach(comp ->
+-          serviceManager.compsAffectedByUpgrade.add(comp.getName()));
+-      try {
+-        if (event.isExpressUpgrade()) {
+-          serviceManager.dispatchNeedUpgradeEvents(false);
+-          serviceManager.upgradeNextCompIfAny(false);
+-        } else {
+-          serviceManager.dispatchNeedUpgradeEvents(false);
+-        }
+-
+-        if (event.isExpressUpgrade()) {
+-          serviceManager.setServiceState(ServiceState.EXPRESS_UPGRADING);
+-        } else if (event.isAutoFinalize()) {
+-          serviceManager.setServiceState(ServiceState.UPGRADING_AUTO_FINALIZE);
+-        } else {
+-          serviceManager.setServiceState(ServiceState.UPGRADING);
+-        }
+-        ServiceApiUtil.checkServiceDependencySatisified(serviceManager
+-            .getServiceSpec());
+-        return State.UPGRADING;
+-      } catch (Throwable e) {
+-        LOG.error("[SERVICE]: Upgrade to version {} failed", event.getVersion(),
+-            e);
+-        return State.STABLE;
+-      }
+-    }
+-  }
+-
+-  private static class CheckStableTransition implements
+-      MultipleArcTransition<ServiceManager, ServiceEvent, State> {
+-
+-    @Override
+-    public State transition(ServiceManager serviceManager,
+-        ServiceEvent event) {
+-      //trigger check of service state
+-      ServiceState currState = serviceManager.serviceSpec.getState();
+-      if (currState.equals(ServiceState.STABLE)) {
+-        return State.STABLE;
+-      }
+-      if (currState.equals(ServiceState.EXPRESS_UPGRADING) ||
+-          currState.equals(ServiceState.CANCEL_UPGRADING)) {
+-
+-        if (!serviceManager.componentsToUpgrade.isEmpty()) {
+-          org.apache.hadoop.yarn.service.api.records.Component compSpec =
+-              serviceManager.componentsToUpgrade.get(0);
+-          Component component = serviceManager.scheduler.getAllComponents()
+-              .get(compSpec.getName());
+-
+-          if (!component.isUpgrading()) {
+-            serviceManager.componentsToUpgrade.remove(0);
+-            serviceManager.upgradeNextCompIfAny(
+-                currState.equals(ServiceState.CANCEL_UPGRADING));
+-          }
+-        }
+-      }
+-
+-      if (currState.equals(ServiceState.UPGRADING_AUTO_FINALIZE) ||
+-          ((currState.equals(ServiceState.EXPRESS_UPGRADING) ||
+-              currState.equals(ServiceState.CANCEL_UPGRADING)) &&
+-              serviceManager.componentsToUpgrade.isEmpty())) {
+-
+-        ServiceState targetState = checkIfStable(serviceManager.serviceSpec);
+-        if (targetState.equals(ServiceState.STABLE)) {
+-          if (serviceManager.finalizeUpgrade(
+-              currState.equals(ServiceState.CANCEL_UPGRADING))) {
+-            return State.STABLE;
+-          }
+-        }
+-      }
+-      return State.UPGRADING;
+-    }
+-  }
+-
+-  private static class StartFromUpgradeTransition implements
+-      MultipleArcTransition<ServiceManager, ServiceEvent, State> {
+-
+-    @Override
+-    public State transition(ServiceManager serviceManager, ServiceEvent event) {
+-      ServiceState currState = serviceManager.serviceSpec.getState();
+-
+-      ServiceState targetState = checkIfStable(serviceManager.serviceSpec);
+-      if (targetState.equals(ServiceState.STABLE)) {
+-        if (serviceManager.finalizeUpgrade(
+-            currState.equals(ServiceState.CANCEL_UPGRADING))) {
+-          return State.STABLE;
+-        }
+-      }
+-      return State.UPGRADING;
+-    }
+-  }
+-
+-  private static class CancelUpgradeTransition implements
+-      SingleArcTransition<ServiceManager, ServiceEvent> {
+-
+-    @Override
+-    public void transition(ServiceManager serviceManager,
+-        ServiceEvent event) {
+-      if (!serviceManager.getState().equals(State.UPGRADING)) {
+-        LOG.info("[SERVICE]: Cannot cancel the upgrade in {} state",
+-            serviceManager.getState());
+-        return;
+-      }
+-      try {
+-        Service targetSpec = ServiceApiUtil.loadService(
+-            serviceManager.context.fs, serviceManager.getName());
+-
+-        Service sourceSpec = ServiceApiUtil.loadServiceUpgrade(
+-            serviceManager.context.fs, serviceManager.getName(),
+-            serviceManager.upgradeVersion);
+-        serviceManager.cancelledVersion = serviceManager.upgradeVersion;
+-        LOG.info("[SERVICE] cancel version {}",
+-            serviceManager.cancelledVersion);
+-        serviceManager.upgradeVersion = serviceManager.serviceSpec.getVersion();
+-        serviceManager.componentsToUpgrade = serviceManager
+-            .resolveCompsToUpgrade(sourceSpec, targetSpec);
+-
+-        serviceManager.compsAffectedByUpgrade.clear();
+-        serviceManager.componentsToUpgrade.forEach(comp ->
+-            serviceManager.compsAffectedByUpgrade.add(comp.getName()));
+-
+-        serviceManager.dispatchNeedUpgradeEvents(true);
+-        serviceManager.upgradeNextCompIfAny(true);
+-        serviceManager.setServiceState(ServiceState.CANCEL_UPGRADING);
+-      } catch (Throwable e) {
+-        LOG.error("[SERVICE]: Cancellation of upgrade failed", e);
+-      }
+-    }
+-  }
+-
+-  private void upgradeNextCompIfAny(boolean cancelUpgrade) {
+-    if (!componentsToUpgrade.isEmpty()) {
+-      org.apache.hadoop.yarn.service.api.records.Component component =
+-          componentsToUpgrade.get(0);
+-
+-      serviceSpec.getComponent(component.getName()).getContainers().forEach(
+-          container -> {
+-            ComponentInstanceEvent upgradeEvent = new ComponentInstanceEvent(
+-                ContainerId.fromString(container.getId()),
+-                !cancelUpgrade ? ComponentInstanceEventType.UPGRADE :
+-                    ComponentInstanceEventType.CANCEL_UPGRADE);
+-            LOG.info("Upgrade container {} {}", container.getId(),
+-                cancelUpgrade);
+-            dispatcher.getEventHandler().handle(upgradeEvent);
+-          });
+-    }
+-  }
+-
+-  private void dispatchNeedUpgradeEvents(boolean cancelUpgrade) {
+-    if (componentsToUpgrade != null) {
+-      componentsToUpgrade.forEach(component -> {
+-        ComponentEvent needUpgradeEvent = new ComponentEvent(
+-            component.getName(), !cancelUpgrade ? ComponentEventType.UPGRADE :
+-            ComponentEventType.CANCEL_UPGRADE)
+-            .setTargetSpec(component)
+-            .setUpgradeVersion(upgradeVersion);
+-        LOG.info("Upgrade component {} {}", component.getName(), cancelUpgrade);
+-        context.scheduler.getDispatcher().getEventHandler()
+-            .handle(needUpgradeEvent);
+-      });
+-    }
+-  }
+-
+-  /**
+-   * @return whether finalization of upgrade was successful.
+-   */
+-  private boolean finalizeUpgrade(boolean cancelUpgrade) {
+-    if (!cancelUpgrade) {
+-      try {
+-        // save the application id and state to
+-        Service targetSpec = ServiceApiUtil.loadServiceUpgrade(
+-            fs, getName(), upgradeVersion);
+-        targetSpec.setId(serviceSpec.getId());
+-        targetSpec.setState(ServiceState.STABLE);
+-        Map<String, Component> allComps = scheduler.getAllComponents();
+-        targetSpec.getComponents().forEach(compSpec -> {
+-          Component comp = allComps.get(compSpec.getName());
+-          compSpec.setState(comp.getComponentSpec().getState());
+-        });
+-        jsonSerDeser.save(fs.getFileSystem(),
+-            ServiceApiUtil.getServiceJsonPath(fs, getName()), targetSpec, true);
+-      } catch (IOException e) {
+-        LOG.error("Upgrade did not complete because unable to re-write the" +
+-            " service definition", e);
+-        return false;
+-      }
+-    }
+-
+-    try {
+-      String upgradeVersionToDel = cancelUpgrade? cancelledVersion :
+-          upgradeVersion;
+-      LOG.info("[SERVICE]: delete upgrade dir version {}", upgradeVersionToDel);
+-      fs.deleteClusterUpgradeDir(getName(), upgradeVersionToDel);
+-
+-      for (String comp : compsAffectedByUpgrade) {
+-        String compDirVersionToDel = cancelUpgrade? cancelledVersion :
+-            serviceSpec.getVersion();
+-        LOG.info("[SERVICE]: delete {} dir version {}",  comp,
+-            compDirVersionToDel);
+-        fs.deleteComponentDir(compDirVersionToDel, comp);
+-      }
+-
+-      if (cancelUpgrade) {
+-        fs.deleteComponentsVersionDirIfEmpty(cancelledVersion);
+-      } else {
+-        fs.deleteComponentsVersionDirIfEmpty(serviceSpec.getVersion());
+-      }
+-
+-    } catch (IOException e) {
+-      LOG.warn("Unable to delete upgrade definition for service {} " +
+-          "version {}", getName(), upgradeVersion);
+-    }
+-    setServiceState(ServiceState.STABLE);
+-    serviceSpec.setVersion(upgradeVersion);
+-    upgradeVersion = null;
+-    cancelledVersion = null;
+-    compsAffectedByUpgrade.clear();
+-    return true;
+-  }
+-
+-  private static ServiceState checkIfStable(Service service) {
+-    // if desired == running
+-    for (org.apache.hadoop.yarn.service.api.records.Component comp :
+-        service.getComponents()) {
+-      if (!comp.getState().equals(
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE)) {
+-        return service.getState();
+-      }
+-    }
+-    return ServiceState.STABLE;
+-  }
+-
+-  /**
+-   * Service state gets directly modified by ServiceMaster and Component.
+-   * This is a problem for upgrade and flexing. For now, invoking
+-   * ServiceMaster.checkAndUpdateServiceState here to make it easy to fix
+-   * this in future.
+-   */
+-  public void checkAndUpdateServiceState() {
+-    writeLock.lock();
+-    try {
+-      if (!getState().equals(State.UPGRADING)) {
+-        ServiceMaster.checkAndUpdateServiceState(this.scheduler);
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  void processUpgradeRequest(String upgradeVersion,
+-      boolean autoFinalize, boolean expressUpgrade) throws IOException {
+-    Service targetSpec = ServiceApiUtil.loadServiceUpgrade(
+-        context.fs, context.service.getName(), upgradeVersion);
+-
+-    List<org.apache.hadoop.yarn.service.api.records.Component>
+-        compsNeedUpgradeList = resolveCompsToUpgrade(context.service,
+-        targetSpec);
+-
+-    ServiceEvent event = new ServiceEvent(ServiceEventType.UPGRADE)
+-        .setVersion(upgradeVersion)
+-        .setAutoFinalize(autoFinalize)
+-        .setExpressUpgrade(expressUpgrade);
+-
+-    if (expressUpgrade) {
+-      // In case of express upgrade  components need to be upgraded in order.
+-      // Once the service manager gets notified that a component finished
+-      // upgrading, it then issues event to upgrade the next component.
+-      Map<String, org.apache.hadoop.yarn.service.api.records.Component>
+-          compsNeedUpgradeByName = new HashMap<>();
+-      if (compsNeedUpgradeList != null) {
+-        compsNeedUpgradeList.forEach(component ->
+-            compsNeedUpgradeByName.put(component.getName(), component));
+-      }
+-      List<String> resolvedComps = ServiceApiUtil
+-          .resolveCompsDependency(targetSpec);
+-
+-      List<org.apache.hadoop.yarn.service.api.records.Component>
+-          orderedCompUpgrade = new LinkedList<>();
+-      resolvedComps.forEach(compName -> {
+-        org.apache.hadoop.yarn.service.api.records.Component component =
+-            compsNeedUpgradeByName.get(compName);
+-        if (component != null ) {
+-          orderedCompUpgrade.add(component);
+-        }
+-      });
+-      event.setCompsToUpgrade(orderedCompUpgrade);
+-    } else {
+-      event.setCompsToUpgrade(compsNeedUpgradeList);
+-    }
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        event);
+-
+-    if (autoFinalize && (compsNeedUpgradeList == null ||
+-        compsNeedUpgradeList.isEmpty())) {
+-      // nothing to upgrade and auto finalize is requested, trigger a
+-      // state check.
+-      context.scheduler.getDispatcher().getEventHandler().handle(
+-          new ServiceEvent(ServiceEventType.CHECK_STABLE));
+-    }
+-  }
+-
+-  private List<org.apache.hadoop.yarn.service.api.records.Component>
+-      resolveCompsToUpgrade(Service sourceSpec, Service targetSpec) {
+-
+-    List<org.apache.hadoop.yarn.service.api.records.Component>
+-        compsNeedUpgradeList = componentsFinder.
+-        findTargetComponentSpecs(sourceSpec, targetSpec);
+-
+-    // remove all components from need upgrade list if there restart policy
+-    // doesn't all upgrade.
+-    if (compsNeedUpgradeList != null) {
+-      compsNeedUpgradeList.removeIf(component -> {
+-        org.apache.hadoop.yarn.service.api.records.Component.RestartPolicyEnum
+-            restartPolicy = component.getRestartPolicy();
+-
+-        final ComponentRestartPolicy restartPolicyHandler =
+-            Component.getRestartPolicyHandler(restartPolicy);
+-        // Do not allow upgrades for components which have NEVER/ON_FAILURE
+-        // restart policy
+-        if (!restartPolicyHandler.allowUpgrades()) {
+-          LOG.info("The component {} has a restart policy that doesnt " +
+-                  "allow upgrades {} ", component.getName(),
+-              component.getRestartPolicy().toString());
+-          return true;
+-        }
+-
+-        return false;
+-      });
+-    }
+-
+-    return compsNeedUpgradeList;
+-  }
+-
+-  /**
+-   * Sets the state of the service in the service spec.
+-   * @param state service state
+-   */
+-  private void setServiceState(
+-      org.apache.hadoop.yarn.service.api.records.ServiceState state) {
+-    org.apache.hadoop.yarn.service.api.records.ServiceState curState =
+-        serviceSpec.getState();
+-    if (!curState.equals(state)) {
+-      serviceSpec.setState(state);
+-      LOG.info("[SERVICE] spec state changed from {} -> {}", curState, state);
+-    }
+-  }
+-
+-  /**
+-   * Returns the name of the service.
+-   */
+-  public String getName() {
+-    return serviceSpec.getName();
+-  }
+-
+-  /**
+-   * State of {@link ServiceManager}.
+-   */
+-  public enum State {
+-    STABLE, UPGRADING
+-  }
+-
+-  @VisibleForTesting
+-  Service getServiceSpec() {
+-    return serviceSpec;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMaster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMaster.java
+deleted file mode 100644
+index 00883d94eef..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMaster.java
++++ /dev/null
+@@ -1,357 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
+-
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.SecurityUtil;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.security.token.TokenIdentifier;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.util.GenericOptionsParser;
+-import org.apache.hadoop.util.ShutdownHookManager;
+-import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.monitor.ServiceMonitor;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.ByteBuffer;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Iterator;
+-import java.util.Map;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConstants.KEYTAB_LOCATION;
+-
+-public class ServiceMaster extends CompositeService {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceMaster.class);
+-
+-  public static final String YARNFILE_OPTION = "yarnfile";
+-  public static final String SERVICE_NAME_OPTION = "service_name";
+-  public static final String KEYTAB_OPTION = "keytab";
+-  public static final String PRINCIPAL_NAME_OPTION = "principal_name";
+-
+-  private String serviceDefPath;
+-  private String serviceName;
+-  private String serviceKeytab;
+-  private String servicePrincipalName;
+-  protected ServiceContext context;
+-
+-  public ServiceMaster(String name) {
+-    super(name);
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    printSystemEnv();
+-    context = new ServiceContext();
+-    Path appDir = getAppDir();
+-    context.serviceHdfsDir = appDir.toString();
+-    context.tokens = recordTokensForContainers();
+-    Credentials credentials = null;
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      credentials = UserGroupInformation.getCurrentUser().getCredentials();
+-      doSecureLogin();
+-    }
+-    SliderFileSystem fs = new SliderFileSystem(conf);
+-    fs.setAppDir(appDir);
+-    context.fs = fs;
+-    loadApplicationJson(context, fs);
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      // add back the credentials
+-      if (credentials != null) {
+-        UserGroupInformation.getCurrentUser().addCredentials(credentials);
+-      }
+-      removeHdfsDelegationToken(UserGroupInformation.getLoginUser());
+-    }
+-
+-    // Take yarn config from YarnFile and merge them into YarnConfiguration
+-    for (Map.Entry<String, String> entry : context.service
+-        .getConfiguration().getProperties().entrySet()) {
+-      conf.set(entry.getKey(), entry.getValue());
+-    }
+-
+-    ContainerId amContainerId = getAMContainerId();
+-
+-    ApplicationAttemptId attemptId = amContainerId.getApplicationAttemptId();
+-    LOG.info("Service AppAttemptId: " + attemptId);
+-    context.attemptId = attemptId;
+-
+-    // configure AM to wait forever for RM
+-    conf.setLong(YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_MS, -1);
+-    conf.unset(YarnConfiguration.CLIENT_FAILOVER_MAX_ATTEMPTS);
+-
+-    DefaultMetricsSystem.initialize("ServiceAppMaster");
+-
+-    context.secretManager = new ClientToAMTokenSecretManager(attemptId, null);
+-    ClientAMService clientAMService = createClientAMService();
+-    context.clientAMService = clientAMService;
+-    addService(clientAMService);
+-
+-    ServiceScheduler scheduler = createServiceScheduler(context);
+-    addService(scheduler);
+-    context.scheduler = scheduler;
+-
+-    ServiceMonitor monitor = new ServiceMonitor("Service Monitor", context);
+-    addService(monitor);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  @VisibleForTesting
+-  protected ClientAMService createClientAMService() {
+-    return new ClientAMService(context);
+-  }
+-
+-  // Record the tokens and use them for launching containers.
+-  // e.g. localization requires the hdfs delegation tokens
+-  @VisibleForTesting
+-  protected ByteBuffer recordTokensForContainers() throws IOException {
+-    Credentials copy = new Credentials(UserGroupInformation.getCurrentUser()
+-        .getCredentials());
+-    // Now remove the AM->RM token so that task containers cannot access it.
+-    Iterator<Token<?>> iter = copy.getAllTokens().iterator();
+-    while (iter.hasNext()) {
+-      Token<?> token = iter.next();
+-      LOG.info(token.toString());
+-      if (token.getKind().equals(AMRMTokenIdentifier.KIND_NAME)) {
+-        iter.remove();
+-      }
+-    }
+-    DataOutputBuffer dob = new DataOutputBuffer();
+-    try {
+-      copy.writeTokenStorageToStream(dob);
+-    } finally {
+-      dob.close();
+-    }
+-    return ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-  }
+-
+-  // 1. First try to use user specified keytabs
+-  // 2. If not specified, then try to use pre-installed keytab at localhost
+-  // 3. strip off hdfs delegation tokens to ensure use keytab to talk to hdfs
+-  private void doSecureLogin()
+-      throws IOException, URISyntaxException {
+-    // read the localized keytab specified by user
+-    File keytab = new File(String.format(KEYTAB_LOCATION, getServiceName()));
+-    if (!keytab.exists()) {
+-      LOG.info("No keytab localized at " + keytab);
+-      // Check if there exists a pre-installed keytab at host
+-      String preInstalledKeytab = context.service == null ? this.serviceKeytab
+-          : context.service.getKerberosPrincipal().getKeytab();
+-      if (!StringUtils.isEmpty(preInstalledKeytab)) {
+-        URI uri = new URI(preInstalledKeytab);
+-        if (uri.getScheme().equals("file")) {
+-          keytab = new File(uri);
+-          LOG.info("Using pre-installed keytab from localhost: " +
+-              preInstalledKeytab);
+-        }
+-      }
+-    }
+-    if (!keytab.exists()) {
+-      LOG.info("No keytab exists: " + keytab);
+-      return;
+-    }
+-    String principal = context.service == null ? this.servicePrincipalName
+-        : context.service.getKerberosPrincipal().getPrincipalName();
+-    if (StringUtils.isEmpty((principal))) {
+-      principal = UserGroupInformation.getLoginUser().getShortUserName();
+-      LOG.info("No principal name specified.  Will use AM " +
+-          "login identity {} to attempt keytab-based login", principal);
+-    }
+-
+-    LOG.info("User before logged in is: " + UserGroupInformation
+-        .getCurrentUser());
+-    String principalName = SecurityUtil.getServerPrincipal(principal,
+-        ServiceUtils.getLocalHostName(getConfig()));
+-    UserGroupInformation.loginUserFromKeytab(principalName,
+-        keytab.getAbsolutePath());
+-    LOG.info("User after logged in is: " + UserGroupInformation
+-        .getCurrentUser());
+-    context.principal = principalName;
+-    context.keytab = keytab.getAbsolutePath();
+-  }
+-
+-  // Remove HDFS delegation token from login user and ensure AM to use keytab
+-  // to talk to hdfs
+-  private static void removeHdfsDelegationToken(UserGroupInformation user) {
+-    if (!user.isFromKeytab()) {
+-      LOG.error("AM is not holding on a keytab in a secure deployment:" +
+-          " service will fail when tokens expire");
+-    }
+-    Credentials credentials = user.getCredentials();
+-    Iterator<Token<? extends TokenIdentifier>> iter =
+-        credentials.getAllTokens().iterator();
+-    while (iter.hasNext()) {
+-      Token<? extends TokenIdentifier> token = iter.next();
+-      if (token.getKind().equals(
+-          DelegationTokenIdentifier.HDFS_DELEGATION_KIND)) {
+-        LOG.info("Remove HDFS delegation token {}.", token);
+-        iter.remove();
+-      }
+-    }
+-  }
+-
+-  protected ContainerId getAMContainerId() throws BadClusterStateException {
+-    return ContainerId.fromString(ServiceUtils.mandatoryEnvVariable(
+-        ApplicationConstants.Environment.CONTAINER_ID.name()));
+-  }
+-
+-  protected Path getAppDir() {
+-    return new Path(serviceDefPath).getParent();
+-  }
+-
+-  protected String getServiceName() {
+-    return serviceName;
+-  }
+-
+-  protected ServiceScheduler createServiceScheduler(ServiceContext context)
+-      throws IOException, YarnException {
+-    return new ServiceScheduler(context);
+-  }
+-
+-  protected void loadApplicationJson(ServiceContext context,
+-      SliderFileSystem fs) throws IOException {
+-    context.service = ServiceApiUtil
+-        .loadServiceFrom(fs, new Path(serviceDefPath));
+-    context.service.setState(ServiceState.ACCEPTED);
+-    LOG.info(context.service.toString());
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    LOG.info("Starting service as user " + UserGroupInformation
+-        .getCurrentUser());
+-    UserGroupInformation.getLoginUser().doAs(
+-        (PrivilegedExceptionAction<Void>) () -> {
+-          super.serviceStart();
+-          return null;
+-        }
+-    );
+-  }
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping app master");
+-    super.serviceStop();
+-  }
+-
+-  // This method should be called whenever there is an increment or decrement
+-  // of a READY state component of a service
+-  public static synchronized void checkAndUpdateServiceState(
+-      ServiceScheduler scheduler) {
+-    ServiceState curState = scheduler.getApp().getState();
+-    // Check the state of all components
+-    boolean isStable = true;
+-    for (org.apache.hadoop.yarn.service.api.records.Component comp : scheduler
+-        .getApp().getComponents()) {
+-      if (comp.getState() !=
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE) {
+-        isStable = false;
+-        break;
+-      }
+-    }
+-    if (isStable) {
+-      scheduler.getApp().setState(ServiceState.STABLE);
+-    } else {
+-      // mark new state as started only if current state is stable, otherwise
+-      // leave it as is
+-      if (curState == ServiceState.STABLE) {
+-        scheduler.getApp().setState(ServiceState.STARTED);
+-      }
+-    }
+-    if (curState != scheduler.getApp().getState()) {
+-      LOG.info("Service state changed from {} -> {}", curState,
+-          scheduler.getApp().getState());
+-    }
+-    populateYarnSysFS(scheduler);
+-  }
+-
+-  private static void populateYarnSysFS(ServiceScheduler scheduler) {
+-    Service service = scheduler.getApp();
+-    scheduler.syncSysFs(service);
+-  }
+-
+-  private void printSystemEnv() {
+-    for (Map.Entry<String, String> envs : System.getenv().entrySet()) {
+-      LOG.info("{} = {}", envs.getKey(), envs.getValue());
+-    }
+-  }
+-
+-  public static void main(String[] args) throws Exception {
+-    Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
+-    org.apache.hadoop.util.StringUtils
+-        .startupShutdownMessage(ServiceMaster.class, args, LOG);
+-    try {
+-      ServiceMaster serviceMaster = new ServiceMaster("Service Master");
+-      ShutdownHookManager.get()
+-          .addShutdownHook(new CompositeServiceShutdownHook(serviceMaster), 30);
+-      YarnConfiguration conf = new YarnConfiguration();
+-      Options opts = new Options();
+-      opts.addOption(YARNFILE_OPTION, true, "HDFS path to JSON service " +
+-          "specification");
+-      opts.getOption(YARNFILE_OPTION).setRequired(true);
+-      opts.addOption(SERVICE_NAME_OPTION, true, "Service name");
+-      opts.getOption(SERVICE_NAME_OPTION).setRequired(true);
+-      opts.addOption(KEYTAB_OPTION, true, "Service AM keytab");
+-      opts.addOption(PRINCIPAL_NAME_OPTION, true,
+-          "Service AM keytab principal");
+-      GenericOptionsParser parser = new GenericOptionsParser(conf, opts, args);
+-      CommandLine cmdLine = parser.getCommandLine();
+-      serviceMaster.serviceDefPath = cmdLine.getOptionValue(YARNFILE_OPTION);
+-      serviceMaster.serviceName = cmdLine.getOptionValue(SERVICE_NAME_OPTION);
+-      serviceMaster.serviceKeytab = cmdLine.getOptionValue(KEYTAB_OPTION);
+-      serviceMaster.servicePrincipalName = cmdLine
+-          .getOptionValue(PRINCIPAL_NAME_OPTION);
+-      serviceMaster.init(conf);
+-      serviceMaster.start();
+-    } catch (Throwable t) {
+-      LOG.error("Error starting service master", t);
+-      ExitUtil.terminate(1, "Error starting service master");
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMetrics.java
+deleted file mode 100644
+index b5bbb7d0347..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceMetrics.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.metrics2.MetricsCollector;
+-import org.apache.hadoop.metrics2.MetricsInfo;
+-import org.apache.hadoop.metrics2.MetricsSource;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+-import org.apache.hadoop.metrics2.lib.MutableGaugeInt;
+-
+-import static org.apache.hadoop.metrics2.lib.Interns.info;
+-
+-@Metrics(context = "yarn-native-service")
+-public class ServiceMetrics implements MetricsSource {
+-
+-  @Metric("containers requested")
+-  public MutableGaugeInt containersRequested;
+-
+-  @Metric("containers running")
+-  public MutableGaugeInt containersRunning;
+-
+-  @Metric("containers ready")
+-  public MutableGaugeInt containersReady;
+-
+-  @Metric("containers desired")
+-  public MutableGaugeInt containersDesired;
+-
+-  @Metric("containers succeeded")
+-  public MutableGaugeInt containersSucceeded;
+-
+-  @Metric("containers failed")
+-  public MutableGaugeInt containersFailed;
+-
+-  @Metric("containers preempted")
+-  public MutableGaugeInt containersPreempted;
+-
+-  @Metric("containers surplus")
+-  public MutableGaugeInt surplusContainers;
+-
+-  @Metric("containers failed due to disk failure")
+-  public MutableGaugeInt containersDiskFailure;
+-
+-  protected final MetricsRegistry registry;
+-
+-  public ServiceMetrics(MetricsInfo metricsInfo) {
+-    registry = new MetricsRegistry(metricsInfo);
+-  }
+-
+-  @Override
+-  public void getMetrics(MetricsCollector collector, boolean all) {
+-    registry.snapshot(collector.addRecord(registry.info()), all);
+-  }
+-
+-  public static ServiceMetrics register(String name, String description) {
+-    ServiceMetrics metrics = new ServiceMetrics(info(name, description));
+-    DefaultMetricsSystem.instance().register(name, description, metrics);
+-    return metrics;
+-  }
+-
+-  public void tag(String name, String description, String value) {
+-    registry.tag(name, description, value);
+-  }
+-
+-  @Override public String toString() {
+-    return "ServiceMetrics{"
+-        + "containersRequested=" + containersRequested.value()
+-        + ", containersRunning=" + containersRunning.value()
+-        + ", containersDesired=" + containersDesired.value()
+-        + ", containersSucceeded=" + containersSucceeded.value()
+-        + ", containersFailed=" + containersFailed.value()
+-        + ", containersPreempted=" + containersPreempted.value()
+-        + ", surplusContainers=" + surplusContainers.value() + '}';
+-  }
+-}
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java
+deleted file mode 100644
+index 9da8f31fe4b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java
++++ /dev/null
+@@ -1,1145 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
+-import org.apache.hadoop.thirdparty.com.google.common.cache.CacheLoader;
+-import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource.Builder;
+-
+-import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.api.RegistryOperationsFactory;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.registry.client.types.ServiceRecord;
+-import org.apache.hadoop.registry.client.types.yarn.PersistencePolicies;
+-import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes;
+-import org.apache.hadoop.security.HadoopKerberosName;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.NodeReport;
+-import org.apache.hadoop.yarn.api.records.RejectedSchedulingRequest;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.UpdatedContainer;
+-import org.apache.hadoop.yarn.client.api.AMRMClient;
+-import org.apache.hadoop.yarn.client.api.TimelineV2Client;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.NMClientAsync;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.service.api.ServiceApiConstants;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.component.ComponentRestartPolicy;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.provider.ProviderUtils;
+-import org.apache.hadoop.yarn.service.registry.YarnRegistryViewForProviders;
+-import org.apache.hadoop.yarn.service.timelineservice.ServiceMetricsSink;
+-import org.apache.hadoop.yarn.service.timelineservice.ServiceTimelinePublisher;
+-import org.apache.hadoop.yarn.service.utils.HttpUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceRegistryUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.util.BoundedAppender;
+-import org.apache.hadoop.yarn.util.Clock;
+-import org.apache.hadoop.yarn.util.SystemClock;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.ByteBuffer;
+-import java.nio.charset.StandardCharsets;
+-import java.text.MessageFormat;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.ScheduledExecutorService;
+-import java.util.concurrent.TimeUnit;
+-
+-import static org.apache.hadoop.fs.FileSystem.FS_DEFAULT_NAME_KEY;
+-import static org.apache.hadoop.registry.client.api.RegistryConstants.*;
+-import static org.apache.hadoop.yarn.api.records.ContainerExitStatus
+-    .KILLED_AFTER_APP_COMPLETION;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.*;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.*;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.START;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConstants
+-    .CONTAINER_STATE_REPORT_AS_SERVICE_STATE;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes
+-    .EXIT_FALSE;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes
+-    .EXIT_SUCCESS;
+-
+-/**
+- *
+- */
+-public class ServiceScheduler extends CompositeService {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceScheduler.class);
+-  private Service app;
+-
+-   // This encapsulates the <code>app</code> with methods to upgrade the app.
+-  private ServiceManager serviceManager;
+-
+-  // component_name -> component
+-  private final Map<String, Component> componentsByName =
+-      new ConcurrentHashMap<>();
+-
+-  // id - > component
+-  protected final Map<Long, Component> componentsById =
+-      new ConcurrentHashMap<>();
+-
+-  private final Map<ContainerId, ComponentInstance> liveInstances =
+-      new ConcurrentHashMap<>();
+-
+-  private ServiceMetrics serviceMetrics;
+-
+-  private ServiceTimelinePublisher serviceTimelinePublisher;
+-
+-  private boolean timelineServiceEnabled;
+-
+-  // Global diagnostics that will be reported to RM on eRxit.
+-  // The unit the number of characters. This will be limited to 64 * 1024
+-  // characters.
+-  private BoundedAppender diagnostics = new BoundedAppender(64 * 1024);
+-
+-  // A cache for loading config files from remote such as hdfs
+-  public LoadingCache<ConfigFile, Object> configFileCache = null;
+-
+-  public ScheduledExecutorService executorService;
+-  public Map<String, String> globalTokens = new HashMap<>();
+-
+-  private AMRMClientAsync<AMRMClient.ContainerRequest> amRMClient;
+-  private NMClientAsync nmClient;
+-  private AsyncDispatcher dispatcher;
+-  private YarnRegistryViewForProviders yarnRegistryOperations;
+-  private ServiceContext context;
+-  private ContainerLaunchService containerLaunchService;
+-  private final Map<ContainerId, ComponentInstance> unRecoveredInstances =
+-      new ConcurrentHashMap<>();
+-  private long containerRecoveryTimeout;
+-
+-  // If even one component of a service uses placement constraints, then use
+-  // placement scheduler to schedule containers for all components (including
+-  // the ones with no constraints). Mixing of container requests and scheduling
+-  // requests for a single service is not recommended.
+-  private boolean hasAtLeastOnePlacementConstraint;
+-
+-  private boolean gracefulStop = false;
+-
+-  private volatile FinalApplicationStatus finalApplicationStatus =
+-      FinalApplicationStatus.ENDED;
+-
+-  private Clock systemClock;
+-
+-  // For unit test override since we don't want to terminate UT process.
+-  private ServiceUtils.ProcessTerminationHandler
+-      terminationHandler = new ServiceUtils.ProcessTerminationHandler();
+-
+-  public ServiceScheduler(ServiceContext context) {
+-    super(context.getService().getName());
+-    this.context = context;
+-    this.app = context.getService();
+-    this.systemClock = SystemClock.getInstance();
+-  }
+-
+-  public void buildInstance(ServiceContext context, Configuration configuration)
+-      throws YarnException, IOException {
+-    app = context.service;
+-    executorService = Executors.newScheduledThreadPool(10);
+-    RegistryOperations registryClient = null;
+-    if (UserGroupInformation.isSecurityEnabled() &&
+-        !StringUtils.isEmpty(context.principal)
+-        && !StringUtils.isEmpty(context.keytab)) {
+-      Configuration conf = getConfig();
+-      // Only take the first section of the principal
+-      // e.g. hdfs-demo@EXAMPLE.COM will take hdfs-demo
+-      // This is because somehow zookeeper client only uses the first section
+-      // for acl validations.
+-      String username = new HadoopKerberosName(context.principal.trim())
+-          .getServiceName();
+-      LOG.info("Set registry user accounts: sasl:" + username);
+-      conf.set(KEY_REGISTRY_USER_ACCOUNTS, "sasl:" + username);
+-      registryClient = RegistryOperationsFactory
+-          .createKerberosInstance(conf,
+-              "Client", context.principal, context.keytab);
+-    } else {
+-      registryClient = RegistryOperationsFactory
+-          .createInstance("ServiceScheduler", configuration);
+-    }
+-    addIfService(registryClient);
+-    yarnRegistryOperations =
+-        createYarnRegistryOperations(context, registryClient);
+-
+-    // register metrics,
+-    serviceMetrics = ServiceMetrics
+-        .register(app.getName(), "Metrics for service");
+-    serviceMetrics.tag("type", "Metrics type [component or service]", "service");
+-    serviceMetrics.tag("appId", "Service id for service", app.getId());
+-
+-    amRMClient = createAMRMClient();
+-    addIfService(amRMClient);
+-
+-    nmClient = createNMClient();
+-    nmClient.getClient().cleanupRunningContainersOnStop(false);
+-    addIfService(nmClient);
+-
+-    dispatcher = createAsyncDispatcher();
+-    dispatcher.register(ServiceEventType.class, new ServiceEventHandler());
+-    dispatcher.register(ComponentEventType.class,
+-        new ComponentEventHandler());
+-    dispatcher.register(ComponentInstanceEventType.class,
+-        new ComponentInstanceEventHandler());
+-    dispatcher.setDrainEventsOnStop();
+-    addIfService(dispatcher);
+-
+-    containerLaunchService = new ContainerLaunchService(context);
+-    addService(containerLaunchService);
+-
+-    if (YarnConfiguration.timelineServiceV2Enabled(configuration)) {
+-      TimelineV2Client timelineClient = TimelineV2Client
+-          .createTimelineClient(context.attemptId.getApplicationId());
+-      amRMClient.registerTimelineV2Client(timelineClient);
+-      serviceTimelinePublisher = new ServiceTimelinePublisher(timelineClient);
+-      addService(serviceTimelinePublisher);
+-      DefaultMetricsSystem.instance().register("ServiceMetricsSink",
+-          "For processing metrics to ATS",
+-          new ServiceMetricsSink(serviceTimelinePublisher));
+-      LOG.info("Timeline v2 is enabled.");
+-    }
+-
+-    initGlobalTokensForSubstitute(context);
+-    //substitute quicklinks
+-    ProviderUtils.substituteMapWithTokens(app.getQuicklinks(), globalTokens);
+-    createConfigFileCache(context.fs.getFileSystem());
+-
+-    createAllComponents();
+-    containerRecoveryTimeout = YarnServiceConf.getInt(
+-        YarnServiceConf.CONTAINER_RECOVERY_TIMEOUT_MS,
+-        YarnServiceConf.DEFAULT_CONTAINER_RECOVERY_TIMEOUT_MS,
+-        app.getConfiguration(), getConfig());
+-
+-    if (YarnConfiguration
+-        .timelineServiceV2Enabled(getConfig())) {
+-      timelineServiceEnabled = true;
+-    }
+-
+-    serviceManager = createServiceManager();
+-    context.setServiceManager(serviceManager);
+-
+-  }
+-
+-  protected YarnRegistryViewForProviders createYarnRegistryOperations(
+-      ServiceContext context, RegistryOperations registryClient) {
+-    return new YarnRegistryViewForProviders(registryClient,
+-        RegistryUtils.currentUser(), YarnServiceConstants.APP_TYPE, app.getName(),
+-        context.attemptId);
+-  }
+-
+-  protected ServiceManager createServiceManager() {
+-    return new ServiceManager(context);
+-  }
+-
+-  protected AsyncDispatcher createAsyncDispatcher() {
+-    return new AsyncDispatcher("Component  dispatcher");
+-  }
+-
+-  protected NMClientAsync createNMClient() {
+-    return NMClientAsync.createNMClientAsync(new NMClientCallback());
+-  }
+-
+-  protected AMRMClientAsync<AMRMClient.ContainerRequest> createAMRMClient() {
+-    return AMRMClientAsync
+-        .createAMRMClientAsync(1000, new AMRMClientCallback());
+-  }
+-
+-  public void setGracefulStop(FinalApplicationStatus applicationStatus) {
+-    this.gracefulStop = true;
+-    this.finalApplicationStatus = applicationStatus;
+-    nmClient.getClient().cleanupRunningContainersOnStop(true);
+-  }
+-
+-  @Override
+-  public void serviceInit(Configuration conf) throws Exception {
+-    try {
+-      buildInstance(context, conf);
+-    } catch (YarnException e) {
+-      throw new YarnRuntimeException(e);
+-    }
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  public void serviceStop() throws Exception {
+-    LOG.info("Stopping service scheduler");
+-
+-    if (executorService != null) {
+-      executorService.shutdownNow();
+-    }
+-
+-    DefaultMetricsSystem.shutdown();
+-
+-    // only stop the entire service when a graceful stop has been initiated
+-    // (e.g. via client RPC, not through the AM receiving a SIGTERM)
+-    if (gracefulStop) {
+-
+-      if (YarnConfiguration.timelineServiceV2Enabled(getConfig())) {
+-
+-        // mark other component-instances/containers as STOPPED
+-        final Map<ContainerId, ComponentInstance> liveInst =
+-            getLiveInstances();
+-        for (Map.Entry<ContainerId, ComponentInstance> instance : liveInst
+-            .entrySet()) {
+-          if (!ComponentInstance.isFinalState(
+-              instance.getValue().getContainerSpec().getState())) {
+-            LOG.info("{} Component instance state changed from {} to {}",
+-                instance.getValue().getCompInstanceName(),
+-                instance.getValue().getContainerSpec().getState(),
+-                ContainerState.STOPPED);
+-            serviceTimelinePublisher.componentInstanceFinished(
+-                instance.getKey(), KILLED_AFTER_APP_COMPLETION,
+-                ContainerState.STOPPED, getDiagnostics().toString());
+-          }
+-        }
+-
+-        LOG.info("Service state changed to {}", finalApplicationStatus);
+-        // mark attempt as unregistered
+-        serviceTimelinePublisher.serviceAttemptUnregistered(context,
+-            finalApplicationStatus, diagnostics.toString());
+-      }
+-
+-      // unregister AM
+-      amRMClient.unregisterApplicationMaster(finalApplicationStatus,
+-          diagnostics.toString(), "");
+-      LOG.info("Service {} unregistered with RM, with attemptId = {} "
+-              + ", diagnostics = {} ", app.getName(), context.attemptId,
+-          diagnostics);
+-    }
+-    super.serviceStop();
+-  }
+-
+-  @Override
+-  public void serviceStart() throws Exception {
+-    super.serviceStart();
+-    InetSocketAddress bindAddress = context.clientAMService.getBindAddress();
+-    // When yarn.resourcemanager.placement-constraints.handler is set to
+-    // placement-processor then constraints need to be added during
+-    // registerApplicationMaster.
+-    RegisterApplicationMasterResponse response = amRMClient
+-        .registerApplicationMaster(bindAddress.getHostName(),
+-            bindAddress.getPort(), "N/A");
+-
+-    // Update internal resource types according to response.
+-    if (response.getResourceTypes() != null) {
+-      ResourceUtils.reinitializeResources(response.getResourceTypes());
+-    }
+-
+-    if (response.getClientToAMTokenMasterKey() != null
+-        && response.getClientToAMTokenMasterKey().remaining() != 0) {
+-      context.secretManager
+-          .setMasterKey(response.getClientToAMTokenMasterKey().array());
+-    }
+-    registerServiceInstance(context.attemptId, app);
+-
+-    // Since AM has been started and registered, the service is in STARTED state
+-    app.setState(ServiceState.STARTED);
+-
+-    ServiceApiUtil.checkServiceDependencySatisified(context.service);
+-
+-    // recover components based on containers sent from RM
+-    recoverComponents(response);
+-
+-    for (Component component : componentsById.values()) {
+-      // Trigger initial evaluation of components
+-      if (component.areDependenciesReady()) {
+-        LOG.info("Triggering initial evaluation of component {}",
+-            component.getName());
+-        ComponentEvent event = new ComponentEvent(component.getName(), FLEX)
+-            .setDesired(component.getComponentSpec().getNumberOfContainers());
+-        component.handle(event);
+-      }
+-    }
+-  }
+-
+-  private void recoverComponents(RegisterApplicationMasterResponse response) {
+-    List<Container> containersFromPrevAttempt = response
+-        .getContainersFromPreviousAttempts();
+-    LOG.info("Received {} containers from previous attempt.",
+-        containersFromPrevAttempt.size());
+-    Map<String, ServiceRecord> existingRecords = new HashMap<>();
+-    List<String> existingComps = null;
+-    try {
+-      existingComps = yarnRegistryOperations.listComponents();
+-      LOG.info("Found {} containers from ZK registry: {}", existingComps.size(),
+-          existingComps);
+-    } catch (Exception e) {
+-      LOG.info("Could not read component paths: {}", e.getMessage());
+-    }
+-    if (existingComps != null) {
+-      for (String existingComp : existingComps) {
+-        try {
+-          ServiceRecord record =
+-              yarnRegistryOperations.getComponent(existingComp);
+-          existingRecords.put(existingComp, record);
+-        } catch (Exception e) {
+-          LOG.warn("Could not resolve record for component {}: {}",
+-              existingComp, e);
+-        }
+-      }
+-    }
+-    for (Container container : containersFromPrevAttempt) {
+-      LOG.info("Handling {} from previous attempt", container.getId());
+-      ServiceRecord record = existingRecords.remove(RegistryPathUtils
+-          .encodeYarnID(container.getId().toString()));
+-      if (record != null) {
+-        Component comp = componentsById.get(container.getAllocationRequestId());
+-        ComponentEvent event =
+-            new ComponentEvent(comp.getName(), CONTAINER_RECOVERED)
+-                .setContainer(container)
+-                .setInstance(comp.getComponentInstance(record.description));
+-        comp.handle(event);
+-        // do not remove requests in this case because we do not know if they
+-        // have already been removed
+-      } else {
+-        LOG.info("Record not found in registry for container {} from previous" +
+-            " attempt, releasing", container.getId());
+-        amRMClient.releaseAssignedContainer(container.getId());
+-      }
+-    }
+-    ApplicationId appId = ApplicationId.fromString(app.getId());
+-    existingRecords.forEach((encodedContainerId, record) -> {
+-      String componentName = record.get(YarnRegistryAttributes.YARN_COMPONENT);
+-      if (componentName != null) {
+-        Component component = componentsByName.get(componentName);
+-        if (component != null) {
+-          ComponentInstance compInstance = component.getComponentInstance(
+-              record.description);
+-          ContainerId containerId = ContainerId.fromString(record.get(
+-              YarnRegistryAttributes.YARN_ID));
+-          if (containerId.getApplicationAttemptId().getApplicationId()
+-              .equals(appId)) {
+-            unRecoveredInstances.put(containerId, compInstance);
+-            component.removePendingInstance(compInstance);
+-          }
+-        }
+-      }
+-    });
+-
+-    if (unRecoveredInstances.size() > 0) {
+-      executorService.schedule(() -> {
+-        synchronized (unRecoveredInstances) {
+-          // after containerRecoveryTimeout, all the containers that haven't be
+-          // recovered by the RM will released. The corresponding Component
+-          // Instances are added to the pending queues of their respective
+-          // component.
+-          unRecoveredInstances.forEach((containerId, instance) -> {
+-            LOG.info("{}, wait on container {} expired",
+-                instance.getCompInstanceId(), containerId);
+-            instance.cleanupRegistryAndCompHdfsDir(containerId);
+-            Component component = componentsByName.get(instance.getCompName());
+-            component.requestContainers(1);
+-            component.reInsertPendingInstance(instance);
+-            amRMClient.releaseAssignedContainer(containerId);
+-          });
+-          unRecoveredInstances.clear();
+-        }
+-      }, containerRecoveryTimeout, TimeUnit.MILLISECONDS);
+-    }
+-  }
+-
+-  private void initGlobalTokensForSubstitute(ServiceContext context) {
+-    // ZK
+-    globalTokens.put(ServiceApiConstants.CLUSTER_ZK_QUORUM, getConfig()
+-        .getTrimmed(KEY_REGISTRY_ZK_QUORUM, DEFAULT_REGISTRY_ZK_QUORUM));
+-    String user = RegistryUtils.currentUser();
+-    globalTokens.put(SERVICE_ZK_PATH,
+-        ServiceRegistryUtils.mkServiceHomePath(user, app.getName()));
+-
+-    globalTokens.put(ServiceApiConstants.USER, user);
+-    String dnsDomain = getConfig().getTrimmed(KEY_DNS_DOMAIN);
+-    if (dnsDomain != null && !dnsDomain.isEmpty()) {
+-      globalTokens.put(ServiceApiConstants.DOMAIN, dnsDomain);
+-    }
+-    // HDFS
+-    String clusterFs = getConfig().getTrimmed(FS_DEFAULT_NAME_KEY);
+-    if (clusterFs != null && !clusterFs.isEmpty()) {
+-      globalTokens.put(ServiceApiConstants.CLUSTER_FS_URI, clusterFs);
+-      globalTokens.put(ServiceApiConstants.CLUSTER_FS_HOST,
+-          URI.create(clusterFs).getHost());
+-    }
+-    globalTokens.put(SERVICE_HDFS_DIR, context.serviceHdfsDir);
+-    // service name
+-    globalTokens.put(SERVICE_NAME_LC, app.getName().toLowerCase());
+-    globalTokens.put(SERVICE_NAME, app.getName());
+-  }
+-
+-  private void createConfigFileCache(final FileSystem fileSystem) {
+-    this.configFileCache =
+-        CacheBuilder.newBuilder().expireAfterAccess(10, TimeUnit.MINUTES)
+-            .build(new CacheLoader<ConfigFile, Object>() {
+-              @Override public Object load(ConfigFile key) throws Exception {
+-                switch (key.getType()) {
+-                case HADOOP_XML:
+-                  try (FSDataInputStream input = fileSystem
+-                      .open(new Path(key.getSrcFile()))) {
+-                    org.apache.hadoop.conf.Configuration confRead =
+-                        new org.apache.hadoop.conf.Configuration(false);
+-                    confRead.addResource(input);
+-                    Map<String, String> map = new HashMap<>(confRead.size());
+-                    for (Map.Entry<String, String> entry : confRead) {
+-                      map.put(entry.getKey(), entry.getValue());
+-                    }
+-                    return map;
+-                  }
+-                case TEMPLATE:
+-                  try (FSDataInputStream fileInput = fileSystem
+-                      .open(new Path(key.getSrcFile()))) {
+-                    return IOUtils.toString(fileInput, StandardCharsets.UTF_8);
+-                  }
+-                default:
+-                  return null;
+-                }
+-              }
+-            });
+-    context.configCache = configFileCache;
+-  }
+-
+-  private void registerServiceInstance(ApplicationAttemptId attemptId,
+-      Service service) throws IOException {
+-    LOG.info("Registering " + attemptId + ", " + service.getName()
+-        + " into registry");
+-    ServiceRecord serviceRecord = new ServiceRecord();
+-    serviceRecord.set(YarnRegistryAttributes.YARN_ID,
+-        attemptId.getApplicationId().toString());
+-    serviceRecord.set(YarnRegistryAttributes.YARN_PERSISTENCE,
+-        PersistencePolicies.APPLICATION);
+-    serviceRecord.description = "YarnServiceMaster";
+-
+-    executorService.submit(new Runnable() {
+-      @Override public void run() {
+-        try {
+-          yarnRegistryOperations.registerSelf(serviceRecord, false);
+-          LOG.info("Registered service under {}; absolute path {}",
+-              yarnRegistryOperations.getSelfRegistrationPath(),
+-              yarnRegistryOperations.getAbsoluteSelfRegistrationPath());
+-          boolean isFirstAttempt = 1 == attemptId.getAttemptId();
+-          // delete the children in case there are any and this is an AM startup.
+-          // just to make sure everything underneath is purged
+-          if (isFirstAttempt) {
+-            yarnRegistryOperations.deleteChildren(
+-                yarnRegistryOperations.getSelfRegistrationPath(), true);
+-          }
+-        } catch (IOException e) {
+-          LOG.error(
+-              "Failed to register app " + app.getName() + " in registry", e);
+-        }
+-      }
+-    });
+-    if (YarnConfiguration.timelineServiceV2Enabled(getConfig())) {
+-      serviceTimelinePublisher.serviceAttemptRegistered(app, getConfig());
+-    }
+-  }
+-
+-  private void createAllComponents() {
+-    long allocateId = 0;
+-
+-    // sort components by dependencies
+-    Collection<org.apache.hadoop.yarn.service.api.records.Component> sortedComponents =
+-        ServiceApiUtil.sortByDependencies(app.getComponents());
+-
+-    for (org.apache.hadoop.yarn.service.api.records.Component compSpec : sortedComponents) {
+-      Component component = new Component(compSpec, allocateId, context);
+-      componentsById.put(allocateId, component);
+-      componentsByName.put(component.getName(), component);
+-      allocateId++;
+-      if (!hasAtLeastOnePlacementConstraint
+-          && compSpec.getPlacementPolicy() != null
+-          && compSpec.getPlacementPolicy().getConstraints() != null
+-          && !compSpec.getPlacementPolicy().getConstraints().isEmpty()) {
+-        hasAtLeastOnePlacementConstraint = true;
+-      }
+-    }
+-  }
+-
+-  private final class ServiceEventHandler
+-      implements EventHandler<ServiceEvent> {
+-    @Override
+-    public void handle(ServiceEvent event) {
+-      try {
+-        serviceManager.handle(event);
+-      } catch (Throwable t) {
+-        LOG.error(MessageFormat
+-            .format("[SERVICE]: Error in handling event type {0}",
+-                event.getType()), t);
+-      }
+-    }
+-  }
+-
+-  private final class ComponentEventHandler
+-      implements EventHandler<ComponentEvent> {
+-    @Override
+-    public void handle(ComponentEvent event) {
+-      Component component = componentsByName.get(event.getName());
+-
+-      if (component == null) {
+-        LOG.error("No component exists for " + event.getName());
+-        return;
+-      }
+-      try {
+-        component.handle(event);
+-      } catch (Throwable t) {
+-        LOG.error(MessageFormat
+-            .format("[COMPONENT {0}]: Error in handling event type {1}",
+-                component.getName(), event.getType()), t);
+-      }
+-    }
+-  }
+-
+-  private final class ComponentInstanceEventHandler
+-      implements EventHandler<ComponentInstanceEvent> {
+-    @Override
+-    public void handle(ComponentInstanceEvent event) {
+-      ComponentInstance instance =
+-          liveInstances.get(event.getContainerId());
+-      if (instance == null) {
+-        LOG.error("No component instance exists for " + event.getContainerId());
+-        return;
+-      }
+-      try {
+-        instance.handle(event);
+-      } catch (Throwable t) {
+-        LOG.error(instance.getCompInstanceId() +
+-            ": Error in handling event type " + event.getType(), t);
+-      }
+-    }
+-  }
+-
+-  class AMRMClientCallback extends AMRMClientAsync.AbstractCallbackHandler {
+-
+-    @Override
+-    public void onContainersAllocated(List<Container> containers) {
+-      LOG.info(containers.size() + " containers allocated. ");
+-      for (Container container : containers) {
+-        Component comp = componentsById.get(container.getAllocationRequestId());
+-        ComponentEvent event =
+-            new ComponentEvent(comp.getName(), CONTAINER_ALLOCATED)
+-                .setContainer(container);
+-        dispatcher.getEventHandler().handle(event);
+-        try {
+-          Collection<AMRMClient.ContainerRequest> requests = amRMClient
+-              .getMatchingRequests(container.getAllocationRequestId());
+-          LOG.info("[COMPONENT {}]: remove {} outstanding container requests " +
+-                  "for allocateId " + container.getAllocationRequestId(),
+-              comp.getName(), requests.size());
+-          // remove the corresponding request
+-          if (requests.iterator().hasNext()) {
+-            AMRMClient.ContainerRequest request = requests.iterator().next();
+-            amRMClient.removeContainerRequest(request);
+-          }
+-        } catch(Exception e) {
+-          //TODO Due to YARN-7490, exception may be thrown, catch and ignore for
+-          //now.
+-          LOG.error("Exception when removing the matching requests. ", e);
+-        }
+-      }
+-    }
+-
+-
+-    @Override
+-    public void onContainersReceivedFromPreviousAttempts(
+-        List<Container> containers) {
+-      LOG.info("Containers recovered after AM registered: {}", containers);
+-      if (containers == null || containers.isEmpty()) {
+-        return;
+-      }
+-      for (Container container : containers) {
+-        ComponentInstance compInstance;
+-        synchronized (unRecoveredInstances) {
+-          compInstance = unRecoveredInstances.remove(container.getId());
+-        }
+-        if (compInstance != null) {
+-          Component component = componentsById.get(
+-              container.getAllocationRequestId());
+-          ComponentEvent event = new ComponentEvent(component.getName(),
+-              CONTAINER_RECOVERED)
+-              .setInstance(compInstance)
+-              .setContainerId(container.getId())
+-              .setContainer(container);
+-          component.handle(event);
+-        } else {
+-          LOG.info("Not waiting to recover container {}, releasing",
+-              container.getId());
+-          amRMClient.releaseAssignedContainer(container.getId());
+-        }
+-      }
+-    }
+-
+-    @Override
+-    public void onContainersCompleted(List<ContainerStatus> statuses) {
+-      for (ContainerStatus status : statuses) {
+-        ContainerId containerId = status.getContainerId();
+-        ComponentInstance instance = liveInstances.get(status.getContainerId());
+-        if (instance == null) {
+-          LOG.warn(
+-              "Container {} Completed. No component instance exists. exitStatus={}. diagnostics={} ",
+-              containerId, status.getExitStatus(), status.getDiagnostics());
+-          continue;
+-        }
+-        ComponentEvent event =
+-            new ComponentEvent(instance.getCompName(), CONTAINER_COMPLETED)
+-                .setStatus(status).setInstance(instance)
+-                .setContainerId(containerId);
+-        dispatcher.getEventHandler().handle(event);
+-      }
+-    }
+-
+-    @Override
+-    public void onContainersUpdated(List<UpdatedContainer> containers) {
+-    }
+-
+-    @Override public void onShutdownRequest() {
+-      //Was used for non-work-preserving restart in YARN, should be deprecated.
+-    }
+-
+-    @Override public void onNodesUpdated(List<NodeReport> updatedNodes) {
+-      StringBuilder str = new StringBuilder();
+-      str.append("Nodes updated info: ").append(System.lineSeparator());
+-      for (NodeReport report : updatedNodes) {
+-        str.append(report.getNodeId()).append(", state = ")
+-            .append(report.getNodeState()).append(", healthDiagnostics = ")
+-            .append(report.getHealthReport()).append(System.lineSeparator());
+-      }
+-      LOG.warn(str.toString());
+-    }
+-
+-    @Override public float getProgress() {
+-      // get running containers over desired containers
+-      long total = 0;
+-      for (org.apache.hadoop.yarn.service.api.records.Component component : app
+-          .getComponents()) {
+-        total += component.getNumberOfContainers();
+-      }
+-      // Probably due to user flexed down to 0
+-      if (total == 0) {
+-        return 100;
+-      }
+-      return Math.max((float) liveInstances.size() / total * 100, 100);
+-    }
+-
+-    @Override public void onError(Throwable e) {
+-      LOG.error("Error in AMRMClient callback handler ", e);
+-    }
+-
+-    @Override
+-    public void onRequestsRejected(
+-        List<RejectedSchedulingRequest> rejectedSchedulingRequests) {
+-      LOG.error("Error in AMRMClient callback handler. Following scheduling "
+-          + "requests were rejected: {}", rejectedSchedulingRequests);
+-    }
+-  }
+-
+-  private class NMClientCallback extends NMClientAsync.AbstractCallbackHandler {
+-
+-    @Override public void onContainerStarted(ContainerId containerId,
+-        Map<String, ByteBuffer> allServiceResponse) {
+-      ComponentInstance instance = liveInstances.get(containerId);
+-      if (instance == null) {
+-        LOG.error("No component instance exists for " + containerId);
+-        return;
+-      }
+-      ComponentEvent event =
+-          new ComponentEvent(instance.getCompName(), CONTAINER_STARTED)
+-              .setInstance(instance).setContainerId(containerId);
+-      dispatcher.getEventHandler().handle(event);
+-    }
+-
+-    @Override public void onContainerStatusReceived(ContainerId containerId,
+-        ContainerStatus containerStatus) {
+-
+-    }
+-
+-    @Override public void onContainerStopped(ContainerId containerId) {
+-
+-    }
+-
+-    @Override
+-    public void onStartContainerError(ContainerId containerId, Throwable t) {
+-      ComponentInstance instance = liveInstances.get(containerId);
+-      if (instance == null) {
+-        LOG.error("No component instance exists for " + containerId);
+-        return;
+-      }
+-      LOG.error("Failed to start " + containerId, t);
+-      amRMClient.releaseAssignedContainer(containerId);
+-      // After container released, it'll get CONTAINER_COMPLETED event from RM
+-      // automatically which will trigger stopping COMPONENT INSTANCE
+-    }
+-
+-    @Override
+-    public void onContainerReInitialize(ContainerId containerId) {
+-      ComponentInstance instance = liveInstances.get(containerId);
+-      if (instance == null) {
+-        LOG.error("No component instance exists for {}", containerId);
+-        return;
+-      }
+-      dispatcher.getEventHandler().handle(
+-          new ComponentInstanceEvent(containerId, START));
+-    }
+-
+-    @Override
+-    public void onContainerReInitializeError(ContainerId containerId,
+-        Throwable t) {
+-      ComponentInstance instance = liveInstances.get(containerId);
+-      if (instance == null) {
+-        LOG.error("No component instance exists for {}", containerId);
+-        return;
+-      }
+-      ComponentEvent event = new ComponentEvent(instance.getCompName(),
+-          ComponentEventType.CONTAINER_COMPLETED)
+-          .setInstance(instance).setContainerId(containerId);
+-      dispatcher.getEventHandler().handle(event);
+-    }
+-
+-    @Override public void onContainerResourceIncreased(ContainerId containerId,
+-        Resource resource) {
+-
+-    }
+-
+-    @Override public void onContainerResourceUpdated(ContainerId containerId,
+-        Resource resource) {
+-
+-    }
+-
+-    @Override public void onGetContainerStatusError(ContainerId containerId,
+-        Throwable t) {
+-
+-    }
+-
+-    @Override
+-    public void onIncreaseContainerResourceError(ContainerId containerId,
+-        Throwable t) {
+-
+-    }
+-
+-    @Override
+-    public void onUpdateContainerResourceError(ContainerId containerId,
+-        Throwable t) {
+-
+-    }
+-
+-    @Override
+-    public void onStopContainerError(ContainerId containerId, Throwable t) {
+-
+-    }
+-  }
+-
+-  public ServiceMetrics getServiceMetrics() {
+-    return serviceMetrics;
+-  }
+-
+-  public AMRMClientAsync<AMRMClient.ContainerRequest> getAmRMClient() {
+-    return amRMClient;
+-  }
+-
+-  public NMClientAsync getNmClient() {
+-    return nmClient;
+-  }
+-
+-  public void addLiveCompInstance(ContainerId containerId,
+-      ComponentInstance instance) {
+-    liveInstances.put(containerId, instance);
+-  }
+-
+-  public void removeLiveCompInstance(ContainerId containerId) {
+-    liveInstances.remove(containerId);
+-  }
+-
+-  public YarnRegistryViewForProviders getYarnRegistryOperations() {
+-    return yarnRegistryOperations;
+-  }
+-
+-  public ServiceTimelinePublisher getServiceTimelinePublisher() {
+-    return serviceTimelinePublisher;
+-  }
+-
+-  public Map<ContainerId, ComponentInstance> getLiveInstances() {
+-    return liveInstances;
+-  }
+-
+-  public ContainerLaunchService getContainerLaunchService() {
+-    return containerLaunchService;
+-  }
+-
+-  public ServiceContext getContext() {
+-    return context;
+-  }
+-
+-  public Map<String, Component> getAllComponents() {
+-    return componentsByName;
+-  }
+-
+-  public Service getApp() {
+-    return app;
+-  }
+-
+-  public AsyncDispatcher getDispatcher() {
+-    return dispatcher;
+-  }
+-
+-  public BoundedAppender getDiagnostics() {
+-    return diagnostics;
+-  }
+-
+-  public boolean hasAtLeastOnePlacementConstraint() {
+-    return hasAtLeastOnePlacementConstraint;
+-  }
+-
+-  public boolean terminateServiceIfNeeded(Component component) {
+-    boolean serviceIsTerminated =
+-        terminateServiceIfDominantComponentFinished(component) ||
+-            terminateServiceIfAllComponentsFinished();
+-    return serviceIsTerminated;
+-  }
+-
+-  /**
+-   * If the service state component is finished, the service is also terminated.
+-   * @param component
+-   */
+-  private boolean terminateServiceIfDominantComponentFinished(Component
+-      component) {
+-    boolean shouldTerminate = false;
+-    boolean componentIsDominant = component.getComponentSpec()
+-        .getConfiguration().getPropertyBool(
+-            CONTAINER_STATE_REPORT_AS_SERVICE_STATE, false);
+-    if (componentIsDominant) {
+-      ComponentRestartPolicy restartPolicy =
+-          component.getRestartPolicyHandler();
+-      if (restartPolicy.shouldTerminate(component)) {
+-        shouldTerminate = true;
+-        boolean isSucceeded = restartPolicy.hasCompletedSuccessfully(component);
+-        org.apache.hadoop.yarn.service.api.records.ComponentState state
+-            = isSucceeded ?
+-            org.apache.hadoop.yarn.service.api.records.ComponentState.SUCCEEDED
+-            : org.apache.hadoop.yarn.service.api.records.ComponentState.FAILED;
+-        LOG.info("{} Component state changed from {} to {}",
+-            component.getName(), component.getComponentSpec().getState(),
+-            state);
+-        component.getComponentSpec().setState(state);
+-        LOG.info("Dominate component {} finished, exiting Service Master... " +
+-                ", final status=" + (isSucceeded ? "Succeeded" : "Failed"),
+-            component.getName());
+-        terminateService(isSucceeded);
+-      }
+-    }
+-    return shouldTerminate;
+-  }
+-
+-  /*
+-   * Check if all components of the scheduler finished.
+-   * If all components finished
+-   * (which #failed-instances + #suceeded-instances = #total-n-containers)
+-   * The service will be terminated.
+-  */
+-  private boolean terminateServiceIfAllComponentsFinished() {
+-    boolean shouldTerminate = true;
+-
+-    // Succeeded comps and failed comps, for logging purposes.
+-    Set<String> succeededComponents = new HashSet<>();
+-    Set<String> failedComponents = new HashSet<>();
+-
+-    for (Component comp : getAllComponents().values()) {
+-      ComponentRestartPolicy restartPolicy = comp.getRestartPolicyHandler();
+-
+-      if (restartPolicy.shouldTerminate(comp)) {
+-        if (restartPolicy.hasCompletedSuccessfully(comp)) {
+-          LOG.info("{} Component state changed from {} to {}",
+-              comp.getName(), comp.getComponentSpec().getState(),
+-              org.apache.hadoop
+-                  .yarn.service.api.records.ComponentState.SUCCEEDED);
+-          comp.getComponentSpec().setState(org.apache.hadoop
+-              .yarn.service.api.records.ComponentState.SUCCEEDED);
+-        } else {
+-          LOG.info("{} Component state changed from {} to {}",
+-              comp.getName(), comp.getComponentSpec().getState(),
+-              org.apache.hadoop
+-                  .yarn.service.api.records.ComponentState.FAILED);
+-          comp.getComponentSpec().setState(org.apache.hadoop
+-              .yarn.service.api.records.ComponentState.FAILED);
+-        }
+-
+-        if (isTimelineServiceEnabled()) {
+-          // record in ATS
+-          serviceTimelinePublisher.componentFinished(comp.getComponentSpec(),
+-              comp.getComponentSpec().getState(), systemClock.getTime());
+-        }
+-      } else {
+-        shouldTerminate = false;
+-        break;
+-      }
+-
+-      long nFailed = comp.getNumFailedInstances();
+-
+-      if (nFailed > 0) {
+-        failedComponents.add(comp.getName());
+-      } else {
+-        succeededComponents.add(comp.getName());
+-      }
+-    }
+-
+-    if (shouldTerminate) {
+-      LOG.info("All component finished, exiting Service Master... "
+-          + ", final status=" + (failedComponents.isEmpty() ?
+-          "Succeeded" :
+-          "Failed"));
+-      LOG.info("Succeeded components: [" + org.apache.commons.lang3.StringUtils
+-          .join(succeededComponents, ",") + "]");
+-      LOG.info("Failed components: [" + org.apache.commons.lang3.StringUtils
+-          .join(failedComponents, ",") + "]");
+-
+-      terminateService(failedComponents.isEmpty());
+-    }
+-    return shouldTerminate;
+-  }
+-
+-  private void terminateService(boolean isSucceeded) {
+-    int exitStatus = EXIT_SUCCESS;
+-    if (isSucceeded) {
+-      setGracefulStop(FinalApplicationStatus.SUCCEEDED);
+-      app.setState(ServiceState.SUCCEEDED);
+-    } else {
+-      setGracefulStop(FinalApplicationStatus.FAILED);
+-      app.setState(ServiceState.FAILED);
+-      exitStatus = EXIT_FALSE;
+-    }
+-
+-    getTerminationHandler().terminate(exitStatus);
+-  }
+-
+-  public Clock getSystemClock() {
+-    return systemClock;
+-  }
+-
+-  public boolean isTimelineServiceEnabled() {
+-    return timelineServiceEnabled;
+-  }
+-
+-  public ServiceUtils.ProcessTerminationHandler getTerminationHandler() {
+-    return terminationHandler;
+-  }
+-
+-  public void syncSysFs(Service yarnApp) {
+-    boolean success = true;
+-    Configuration conf = getConfig();
+-    String spec;
+-    boolean useKerberos = UserGroupInformation.isSecurityEnabled();
+-    boolean printSyncResult = false;
+-    try {
+-      String port = conf.get("yarn.nodemanager.webapp.address").split(":")[1];
+-      spec = ServiceApiUtil.jsonSerDeser.toJson(yarnApp);
+-      for (org.apache.hadoop.yarn.service.api.records.Component c :
+-          yarnApp.getComponents()) {
+-        Set<String> nodes = new HashSet<String>();
+-        boolean update = Boolean.parseBoolean(c.getConfiguration()
+-            .getEnv(ApplicationConstants.Environment
+-                .YARN_CONTAINER_RUNTIME_YARN_SYSFS_ENABLE.name()));
+-        if (!update) {
+-          continue;
+-        }
+-        printSyncResult = true;
+-        for (org.apache.hadoop.yarn.service.api.records.Container container :
+-            c.getContainers()) {
+-          String bareHost = container.getBareHost();
+-          nodes.add(bareHost);
+-        }
+-        for (String bareHost : nodes) {
+-          StringBuilder requestPath = new StringBuilder();
+-          if (YarnConfiguration.useHttps(conf)) {
+-            requestPath.append("https://");
+-          } else {
+-            requestPath.append("http://");
+-          }
+-          requestPath.append(bareHost)
+-              .append(":")
+-              .append(port)
+-              .append("/ws/v1/node/yarn/sysfs/")
+-              .append(UserGroupInformation.getCurrentUser()
+-                  .getShortUserName())
+-              .append("/")
+-              .append(yarnApp.getId());
+-          if (!useKerberos) {
+-            requestPath.append("?user.name=")
+-                .append(UserGroupInformation.getCurrentUser()
+-                    .getShortUserName());
+-          }
+-          Builder builder = HttpUtil.connect(requestPath.toString());
+-          ClientResponse response = builder.put(ClientResponse.class, spec);
+-          if (response.getStatus()!=ClientResponse.Status.OK.getStatusCode()) {
+-            LOG.warn("Error synchronize YARN sysfs: " +
+-                response.getEntity(String.class));
+-            success = false;
+-          }
+-        }
+-      }
+-      if (printSyncResult && success) {
+-        LOG.info("YARN sysfs synchronized.");
+-      }
+-    } catch (IOException | URISyntaxException | InterruptedException e) {
+-      LOG.error("Fail to sync service spec.", e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/UpgradeComponentsFinder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/UpgradeComponentsFinder.java
+deleted file mode 100644
+index 7a88ccf46c7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/UpgradeComponentsFinder.java
++++ /dev/null
+@@ -1,159 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Objects;
+-
+-/**
+- * Finds all the the target component specs.
+- */
+-public interface UpgradeComponentsFinder {
+-
+-  List<Component> findTargetComponentSpecs(Service currentDef,
+-      Service targetDef);
+-
+-  /**
+-   * Default implementation of {@link UpgradeComponentsFinder} that finds all
+-   * the target component specs.
+-   */
+-  class DefaultUpgradeComponentsFinder implements UpgradeComponentsFinder {
+-
+-    @Override
+-    public List<Component> findTargetComponentSpecs(Service currentDef,
+-        Service targetDef) {
+-      if (currentDef.getComponents().size() !=
+-          targetDef.getComponents().size()) {
+-        throw new UnsupportedOperationException(
+-            "addition/deletion of components not supported by upgrade");
+-      }
+-      if (!currentDef.getKerberosPrincipal().equals(
+-          targetDef.getKerberosPrincipal())) {
+-        throw new UnsupportedOperationException("changes to kerberos " +
+-            "principal not supported by upgrade");
+-      }
+-      if (!Objects.equals(currentDef.getQueue(), targetDef.getQueue())) {
+-        throw new UnsupportedOperationException("changes to queue " +
+-            "not supported by upgrade");
+-      }
+-
+-      if (!Objects.equals(currentDef.getResource(), targetDef.getResource())) {
+-        throw new UnsupportedOperationException("changes to resource " +
+-            "not supported by upgrade");
+-      }
+-
+-      if (!Objects.equals(currentDef.getDescription(),
+-          targetDef.getDescription())) {
+-        throw new UnsupportedOperationException("changes to description " +
+-            "not supported by upgrade");
+-      }
+-
+-      if (!Objects.equals(currentDef.getLaunchTime(),
+-          targetDef.getLaunchTime())) {
+-        throw new UnsupportedOperationException("changes to launch time " +
+-            "not supported by upgrade");
+-      }
+-
+-
+-      if (!Objects.equals(currentDef.getLifetime(),
+-          targetDef.getLifetime())) {
+-        throw new UnsupportedOperationException("changes to lifetime " +
+-            "not supported by upgrade");
+-      }
+-
+-      if (!Objects.equals(currentDef.getConfiguration(),
+-          targetDef.getConfiguration())) {
+-        return targetDef.getComponents();
+-      }
+-
+-      if (!Objects.equals(currentDef.getArtifact(), targetDef.getArtifact())) {
+-        return targetDef.getComponents();
+-      }
+-
+-      List<Component> targetComps = new ArrayList<>();
+-      targetDef.getComponents().forEach(component -> {
+-        Component currentComp = currentDef.getComponent(component.getName());
+-
+-        if (currentComp != null) {
+-          if (!Objects.equals(currentComp.getName(), component.getName())) {
+-            throw new UnsupportedOperationException(
+-                "changes to component name not supported by upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getDependencies(),
+-              component.getDependencies())) {
+-            throw new UnsupportedOperationException(
+-                "changes to component dependencies not supported by upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getReadinessCheck(),
+-              component.getReadinessCheck())) {
+-            throw new UnsupportedOperationException(
+-                "changes to component readiness check not supported by "
+-                    + "upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getResource(),
+-              component.getResource())) {
+-
+-            throw new UnsupportedOperationException(
+-                "changes to component resource not supported by upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getRunPrivilegedContainer(),
+-              component.getRunPrivilegedContainer())) {
+-            throw new UnsupportedOperationException(
+-                "changes to run privileged container not supported by upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getPlacementPolicy(),
+-              component.getPlacementPolicy())) {
+-            throw new UnsupportedOperationException(
+-                "changes to component placement policy not supported by "
+-                    + "upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getQuicklinks(),
+-              component.getQuicklinks())) {
+-            throw new UnsupportedOperationException(
+-                "changes to component quick links not supported by upgrade");
+-          }
+-
+-          if (!Objects.equals(currentComp.getArtifact(),
+-              component.getArtifact()) || !Objects.equals(
+-              currentComp.getLaunchCommand(), component.getLaunchCommand())
+-              || !Objects.equals(currentComp.getConfiguration(),
+-              component.getConfiguration())) {
+-            targetComps.add(component);
+-          }
+-        } else{
+-          throw new UnsupportedOperationException(
+-              "addition/deletion of components not supported by upgrade. "
+-                  + "Could not find component " + component.getName() + " in "
+-                  + "current service definition.");
+-        }
+-      });
+-      return targetComps;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/ServiceApiConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/ServiceApiConstants.java
+deleted file mode 100644
+index a4f2243d227..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/ServiceApiConstants.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.$;
+-
+-/**
+- * This class defines constants that can be used in input spec for
+- * variable substitutions
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public interface ServiceApiConstants {
+-
+-  // Constants for service
+-  String SERVICE_NAME = $("SERVICE_NAME");
+-
+-  String SERVICE_NAME_LC = $("SERVICE_NAME.lc");
+-
+-  String USER = $("USER");
+-
+-  String DOMAIN = $("DOMAIN");
+-
+-  // Constants for component
+-  String COMPONENT_NAME = $("COMPONENT_NAME");
+-
+-  String COMPONENT_NAME_LC = $("COMPONENT_NAME.lc");
+-
+-  String COMPONENT_INSTANCE_NAME = $("COMPONENT_INSTANCE_NAME");
+-
+-  // Constants for component instance
+-  String COMPONENT_ID = $("COMPONENT_ID");
+-
+-  String CONTAINER_ID = $("CONTAINER_ID");
+-
+-  // Templates for component instance host/IP
+-  String COMPONENT_INSTANCE_HOST = $("%s_HOST");
+-
+-  String COMPONENT_INSTANCE_IP = $("%s_IP");
+-
+-  // Constants for default cluster ZK
+-  String CLUSTER_ZK_QUORUM = $("CLUSTER_ZK_QUORUM");
+-
+-  // URI for the default cluster fs
+-  String CLUSTER_FS_URI = $("CLUSTER_FS_URI");
+-
+-  // the host component of the cluster fs UI
+-  String CLUSTER_FS_HOST = $("CLUSTER_FS_HOST");
+-
+-  // Path in zookeeper for a specific service
+-  String SERVICE_ZK_PATH = $("SERVICE_ZK_PATH");
+-
+-  // Constants for service specific hdfs dir
+-  String SERVICE_HDFS_DIR = $("SERVICE_HDFS_DIR");
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Artifact.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Artifact.java
+deleted file mode 100644
+index 12979f38430..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Artifact.java
++++ /dev/null
+@@ -1,166 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.io.Serializable;
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlEnum;
+-import javax.xml.bind.annotation.XmlType;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.annotation.JsonValue;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * Artifact of an service component.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Artifact of an service component")
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class Artifact implements Serializable {
+-  private static final long serialVersionUID = 3608929500111099035L;
+-
+-  private String id = null;
+-
+-  /**
+-   * Artifact Type.  DOCKER, TARBALL or SERVICE
+-   **/
+-  @XmlType(name = "artifact_type")
+-  @XmlEnum
+-  public enum TypeEnum {
+-    DOCKER("DOCKER"), TARBALL("TARBALL"), SERVICE("SERVICE");
+-
+-    private String value;
+-
+-    TypeEnum(String value) {
+-      this.value = value;
+-    }
+-
+-    @Override
+-    @JsonValue
+-    public String toString() {
+-      return value;
+-    }
+-  }
+-
+-  private TypeEnum type = TypeEnum.DOCKER;
+-  private String uri = null;
+-
+-  /**
+-   * Artifact id. Examples are package location uri for tarball based services,
+-   * image name for docker, etc.
+-   **/
+-  public Artifact id(String id) {
+-    this.id = id;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true, value = "Artifact id. Examples are package location uri for tarball based services, image name for docker, etc.")
+-  @JsonProperty("id")
+-  public String getId() {
+-    return id;
+-  }
+-
+-  public void setId(String id) {
+-    this.id = id;
+-  }
+-
+-  /**
+-   * Artifact type, like docker, tarball, etc. (optional).
+-   **/
+-  public Artifact type(TypeEnum type) {
+-    this.type = type;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact type, like docker, tarball, etc. (optional).")
+-  @JsonProperty("type")
+-  public TypeEnum getType() {
+-    return type;
+-  }
+-
+-  public void setType(TypeEnum type) {
+-    this.type = type;
+-  }
+-
+-  /**
+-   * Artifact location to support multiple artifact stores (optional).
+-   **/
+-  public Artifact uri(String uri) {
+-    this.uri = uri;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact location to support multiple artifact stores (optional).")
+-  @JsonProperty("uri")
+-  public String getUri() {
+-    return uri;
+-  }
+-
+-  public void setUri(String uri) {
+-    this.uri = uri;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Artifact artifact = (Artifact) o;
+-    return Objects.equals(this.id, artifact.id)
+-        && Objects.equals(this.type, artifact.type)
+-        && Objects.equals(this.uri, artifact.uri);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(id, type, uri);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Artifact {\n")
+-        .append("    id: ").append(toIndentedString(id)).append("\n")
+-        .append("    type: ").append(toIndentedString(type)).append("\n")
+-        .append("    uri: ").append(toIndentedString(uri)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/BaseResource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/BaseResource.java
+deleted file mode 100644
+index 4ccb3903173..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/BaseResource.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import java.io.Serializable;
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class BaseResource implements Serializable {
+-  private static final long serialVersionUID = 1492603053176889431L;
+-
+-  private String uri;
+-
+-  /**
+-   * Resource location for a service, e.g.
+-   * /app/v1/services/helloworld
+-   *
+-   **/
+-  public String getUri() {
+-    return uri;
+-  }
+-
+-  public void setUri(String uri) {
+-    this.uri = uri;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append("BaseResource [uri=")
+-        .append(uri)
+-        .append("]");
+-    return builder.toString();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java
+deleted file mode 100644
+index 8a5b7d402f7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java
++++ /dev/null
+@@ -1,563 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonValue;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.io.Serializable;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlEnum;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import javax.xml.bind.annotation.XmlType;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * One or more components of the service. If the service is HBase say,
+- * then the component can be a simple role like master or regionserver. If the
+- * service is a complex business webapp then a component can be other
+- * services say Kafka or Storm. Thereby it opens up the support for complex
+- * and nested services.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.")
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class Component implements Serializable {
+-  private static final long serialVersionUID = -8430058381509087805L;
+-
+-  @JsonProperty("name")
+-  private String name = null;
+-
+-  @JsonProperty("dependencies")
+-  private List<String> dependencies = new ArrayList<String>();
+-
+-  @JsonProperty("readiness_check")
+-  @XmlElement(name = "readiness_check")
+-  private ReadinessCheck readinessCheck = null;
+-
+-  @JsonProperty("artifact")
+-  private Artifact artifact = null;
+-
+-  @JsonProperty("launch_command")
+-  @XmlElement(name = "launch_command")
+-  private String launchCommand = null;
+-
+-  @JsonProperty("resource")
+-  private Resource resource = null;
+-
+-  @JsonProperty("number_of_containers")
+-  @XmlElement(name = "number_of_containers")
+-  private Long numberOfContainers = null;
+-
+-  @JsonProperty("decommissioned_instances")
+-  @XmlElement(name = "decommissioned_instances")
+-  private List<String> decommissionedInstances = new ArrayList<>();
+-
+-  @JsonProperty("run_privileged_container")
+-  @XmlElement(name = "run_privileged_container")
+-  private Boolean runPrivilegedContainer = false;
+-
+-  @JsonProperty("placement_policy")
+-  @XmlElement(name = "placement_policy")
+-  private PlacementPolicy placementPolicy = null;
+-
+-  @JsonProperty("state")
+-  private ComponentState state = ComponentState.FLEXING;
+-
+-  @JsonProperty("configuration")
+-  private Configuration configuration = new Configuration();
+-
+-  @JsonProperty("quicklinks")
+-  private List<String> quicklinks = new ArrayList<String>();
+-
+-  @JsonProperty("containers")
+-  private List<Container> containers =
+-      Collections.synchronizedList(new ArrayList<Container>());
+-
+-
+-  @JsonProperty("restart_policy")
+-  @XmlElement(name = "restart_policy")
+-  private RestartPolicyEnum restartPolicy = RestartPolicyEnum.ALWAYS;
+-
+-  /**
+-   * Policy of restart component. Including ALWAYS - Long lived components
+-   * (Always restart component instance even if instance exit code &#x3D; 0.);
+-   *
+-   * ON_FAILURE (Only restart component instance if instance exit code !&#x3D;
+-   * 0);
+-   * NEVER (Do not restart in any cases)
+-   *
+-   * @return restartPolicy
+-   **/
+-  @XmlType(name = "restart_policy")
+-  @XmlEnum
+-  public enum RestartPolicyEnum {
+-    ALWAYS("ALWAYS"),
+-
+-    ON_FAILURE("ON_FAILURE"),
+-
+-    NEVER("NEVER");
+-    private String value;
+-
+-    RestartPolicyEnum(String value) {
+-      this.value = value;
+-    }
+-
+-    @Override
+-    @JsonValue
+-    public String toString() {
+-      return value;
+-    }
+-  }
+-
+-  public Component restartPolicy(RestartPolicyEnum restartPolicyEnumVal) {
+-    this.restartPolicy = restartPolicyEnumVal;
+-    return this;
+-  }
+-
+-  /**
+-   * Policy of restart component.
+-   *
+-   * Including
+-   * ALWAYS (Always restart component instance even if instance exit
+-   * code &#x3D; 0);
+-   *
+-   * ON_FAILURE (Only restart component instance if instance exit code !&#x3D;
+-   * 0);
+-   *
+-   * NEVER (Do not restart in any cases)
+-   *
+-   * @return restartPolicy
+-   **/
+-  @ApiModelProperty(value = "Policy of restart component. Including ALWAYS "
+-      + "(Always restart component even if instance exit code = 0); "
+-      + "ON_FAILURE (Only restart component if instance exit code != 0); "
+-      + "NEVER (Do not restart in any cases)")
+-  public RestartPolicyEnum getRestartPolicy() {
+-    return restartPolicy;
+-  }
+-
+-  public void setRestartPolicy(RestartPolicyEnum restartPolicy) {
+-    this.restartPolicy = restartPolicy;
+-  }
+-
+-
+-  /**
+-   * Name of the service component (mandatory).
+-   **/
+-  public Component name(String name) {
+-    this.name = name;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true, value = "Name of the service component (mandatory).")
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  /**
+-   * An array of service components which should be in READY state (as
+-   * defined by readiness check), before this component can be started. The
+-   * dependencies across all components of a service should be represented
+-   * as a DAG.
+-   **/
+-  public Component dependencies(List<String> dependencies) {
+-    this.dependencies = dependencies;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "An array of service components which should be in READY state (as defined by readiness check), before this component can be started. The dependencies across all components of an service should be represented as a DAG.")
+-  public List<String> getDependencies() {
+-    return dependencies;
+-  }
+-
+-  public void setDependencies(List<String> dependencies) {
+-    this.dependencies = dependencies;
+-  }
+-
+-  /**
+-   * Readiness check for this component.
+-   **/
+-  public Component readinessCheck(ReadinessCheck readinessCheck) {
+-    this.readinessCheck = readinessCheck;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Readiness check for this component.")
+-  public ReadinessCheck getReadinessCheck() {
+-    return readinessCheck;
+-  }
+-
+-  public void setReadinessCheck(ReadinessCheck readinessCheck) {
+-    this.readinessCheck = readinessCheck;
+-  }
+-
+-  /**
+-   * Artifact of the component (optional). If not specified, the service
+-   * level global artifact takes effect.
+-   **/
+-  public Component artifact(Artifact artifact) {
+-    this.artifact = artifact;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact of the component (optional). If not specified, the service level global artifact takes effect.")
+-  public Artifact getArtifact() {
+-    return artifact;
+-  }
+-
+-  public void setArtifact(Artifact artifact) {
+-    this.artifact = artifact;
+-  }
+-
+-  /**
+-   * The custom launch command of this component (optional). When specified at
+-   * the component level, it overrides the value specified at the global level
+-   * (if any).
+-   **/
+-  public Component launchCommand(String launchCommand) {
+-    this.launchCommand = launchCommand;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The custom launch command of this component (optional). When specified at the component level, it overrides the value specified at the global level (if any).")
+-  public String getLaunchCommand() {
+-    return launchCommand;
+-  }
+-
+-  public void setLaunchCommand(String launchCommand) {
+-    this.launchCommand = launchCommand;
+-  }
+-
+-  /**
+-   * Resource of this component (optional). If not specified, the service
+-   * level global resource takes effect.
+-   **/
+-  public Component resource(Resource resource) {
+-    this.resource = resource;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Resource of this component (optional). If not specified, the service level global resource takes effect.")
+-  public Resource getResource() {
+-    return resource;
+-  }
+-
+-  public void setResource(Resource resource) {
+-    this.resource = resource;
+-  }
+-
+-  /**
+-   * Number of containers for this component (optional). If not specified,
+-   * the service level global number_of_containers takes effect.
+-   **/
+-  public Component numberOfContainers(Long numberOfContainers) {
+-    this.numberOfContainers = numberOfContainers;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Number of containers for this component (optional). If not specified, the service level global number_of_containers takes effect.")
+-  public Long getNumberOfContainers() {
+-    return numberOfContainers;
+-  }
+-
+-  public void setNumberOfContainers(Long numberOfContainers) {
+-    this.numberOfContainers = numberOfContainers;
+-  }
+-
+-  /**
+-   * A list of decommissioned component instances.
+-   **/
+-  public Component decommissionedInstances(List<String>
+-      decommissionedInstances) {
+-    this.decommissionedInstances = decommissionedInstances;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A list of decommissioned component instances.")
+-  public List<String> getDecommissionedInstances() {
+-    return decommissionedInstances;
+-  }
+-
+-  public void setDecommissionedInstances(List<String> decommissionedInstances) {
+-    this.decommissionedInstances = decommissionedInstances;
+-  }
+-
+-  public void addDecommissionedInstance(String componentInstanceName) {
+-    this.decommissionedInstances.add(componentInstanceName);
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Containers of a started component. Specifying a value for this attribute for the POST payload raises a validation error. This blob is available only in the GET response of a started service.")
+-  public List<Container> getContainers() {
+-    return containers;
+-  }
+-
+-  public void setContainers(List<Container> containers) {
+-    this.containers = containers;
+-  }
+-
+-  public void addContainer(Container container) {
+-    this.containers.add(container);
+-  }
+-
+-  public void removeContainer(Container container) {
+-    containers.remove(container);
+-  }
+-  public Container getContainer(String id) {
+-    for (Container container : containers) {
+-      if (container.getId().equals(id)) {
+-        return container;
+-      }
+-    }
+-    return null;
+-  }
+-
+-  public Container getComponentInstance(String compInstanceName) {
+-    for (Container container : containers) {
+-      if (compInstanceName.equals(container.getComponentInstanceName())) {
+-        return container;
+-      }
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Run all containers of this component in privileged mode (YARN-4262).
+-   **/
+-  public Component runPrivilegedContainer(Boolean runPrivilegedContainer) {
+-    this.runPrivilegedContainer = runPrivilegedContainer;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Run all containers of this component in privileged mode (YARN-4262).")
+-  public Boolean getRunPrivilegedContainer() {
+-    return runPrivilegedContainer;
+-  }
+-
+-  public void setRunPrivilegedContainer(Boolean runPrivilegedContainer) {
+-    this.runPrivilegedContainer = runPrivilegedContainer;
+-  }
+-
+-  /**
+-   * Advanced scheduling and placement policies for all containers of this
+-   * component.
+-   **/
+-  public Component placementPolicy(PlacementPolicy placementPolicy) {
+-    this.placementPolicy = placementPolicy;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Advanced scheduling and "
+-      + "placement policies for all containers of this component.")
+-  public PlacementPolicy getPlacementPolicy() {
+-    return placementPolicy;
+-  }
+-
+-  public void setPlacementPolicy(PlacementPolicy placementPolicy) {
+-    this.placementPolicy = placementPolicy;
+-  }
+-
+-  /**
+-   * Config properties for this component.
+-   **/
+-  public Component configuration(Configuration configuration) {
+-    this.configuration = configuration;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Config properties for this component.")
+-  public Configuration getConfiguration() {
+-    return configuration;
+-  }
+-
+-  public void setConfiguration(Configuration configuration) {
+-    this.configuration = configuration;
+-  }
+-
+-  /**
+-   * A list of quicklink keys defined at the service level, and to be
+-   * resolved by this component.
+-   **/
+-  public Component quicklinks(List<String> quicklinks) {
+-    this.quicklinks = quicklinks;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A list of quicklink keys defined at the service level, and to be resolved by this component.")
+-  public List<String> getQuicklinks() {
+-    return quicklinks;
+-  }
+-
+-  public void setQuicklinks(List<String> quicklinks) {
+-    this.quicklinks = quicklinks;
+-  }
+-
+-  public Component state(ComponentState state) {
+-    this.state = state;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "State of the component.")
+-  public ComponentState getState() {
+-    return state;
+-  }
+-
+-  public void setState(ComponentState state) {
+-    this.state = state;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Component component = (Component) o;
+-    return Objects.equals(this.name, component.name)
+-        && Objects.equals(this.dependencies, component.dependencies)
+-        && Objects.equals(this.readinessCheck, component.readinessCheck)
+-        && Objects.equals(this.artifact, component.artifact)
+-        && Objects.equals(this.launchCommand, component.launchCommand)
+-        && Objects.equals(this.resource, component.resource)
+-        && Objects.equals(this.numberOfContainers, component.numberOfContainers)
+-        && Objects.equals(this.runPrivilegedContainer,
+-            component.runPrivilegedContainer)
+-        && Objects.equals(this.placementPolicy, component.placementPolicy)
+-        && Objects.equals(this.configuration, component.configuration)
+-        && Objects.equals(this.quicklinks, component.quicklinks)
+-        && Objects.equals(this.state, component.state);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(name, dependencies, readinessCheck, artifact,
+-        launchCommand, resource, numberOfContainers,
+-        runPrivilegedContainer, placementPolicy, configuration, quicklinks, state);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Component {\n")
+-        .append("    name: ").append(toIndentedString(name)).append("\n")
+-        .append("    state: ").append(toIndentedString(state)).append("\n")
+-        .append("    dependencies: ").append(toIndentedString(dependencies))
+-        .append("\n")
+-        .append("    readinessCheck: ").append(toIndentedString(readinessCheck))
+-        .append("\n")
+-        .append("    artifact: ").append(toIndentedString(artifact))
+-        .append("\n")
+-        .append("    launchCommand: ").append(toIndentedString(launchCommand))
+-        .append("\n")
+-        .append("    resource: ").append(toIndentedString(resource))
+-        .append("\n")
+-        .append("    numberOfContainers: ")
+-        .append(toIndentedString(numberOfContainers)).append("\n")
+-        .append("    containers: ").append(toIndentedString(containers))
+-        .append("\n")
+-        .append("    runPrivilegedContainer: ")
+-        .append(toIndentedString(runPrivilegedContainer)).append("\n")
+-        .append("    placementPolicy: ")
+-        .append(toIndentedString(placementPolicy))
+-        .append("\n")
+-        .append("    configuration: ").append(toIndentedString(configuration))
+-        .append("\n")
+-        .append("    quicklinks: ").append(toIndentedString(quicklinks))
+-        .append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-
+-  /**
+-   * Merge from another component into this component without overwriting.
+-   */
+-  public void mergeFrom(Component that) {
+-    if (this.getArtifact() == null) {
+-      this.setArtifact(that.getArtifact());
+-    }
+-    if (this.getResource() == null) {
+-      this.setResource(that.getResource());
+-    }
+-    if (this.getNumberOfContainers() == null) {
+-      this.setNumberOfContainers(that.getNumberOfContainers());
+-    }
+-    if (this.getLaunchCommand() == null) {
+-      this.setLaunchCommand(that.getLaunchCommand());
+-    }
+-    this.getConfiguration().mergeFrom(that.getConfiguration());
+-    if (this.getQuicklinks() == null) {
+-      this.setQuicklinks(that.getQuicklinks());
+-    }
+-    if (this.getRunPrivilegedContainer() == null) {
+-      this.setRunPrivilegedContainer(that.getRunPrivilegedContainer());
+-    }
+-    if (this.getDependencies() == null) {
+-      this.setDependencies(that.getDependencies());
+-    }
+-    if (this.getPlacementPolicy() == null) {
+-      this.setPlacementPolicy(that.getPlacementPolicy());
+-    }
+-    if (this.getReadinessCheck() == null) {
+-      this.setReadinessCheck(that.getReadinessCheck());
+-    }
+-  }
+-
+-  public void overwrite(Component that) {
+-    setArtifact(that.getArtifact());
+-    setResource(that.resource);
+-    setNumberOfContainers(that.getNumberOfContainers());
+-    setLaunchCommand(that.getLaunchCommand());
+-    setConfiguration(that.configuration);
+-    setRunPrivilegedContainer(that.getRunPrivilegedContainer());
+-    setDependencies(that.getDependencies());
+-    setPlacementPolicy(that.getPlacementPolicy());
+-    setReadinessCheck(that.getReadinessCheck());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentContainers.java
+deleted file mode 100644
+index 7c8ab4a2a46..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentContainers.java
++++ /dev/null
+@@ -1,97 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import java.io.Serializable;
+-import java.util.List;
+-
+-/**
+- * Containers of a component.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Containers of a component.")
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class ComponentContainers implements Serializable {
+-
+-  private static final long serialVersionUID = -1456748479118874991L;
+-
+-  @JsonProperty("component_name")
+-  private String componentName;
+-
+-  @JsonProperty("containers")
+-  private List<Container> containers;
+-
+-  @ApiModelProperty(example = "null", required = true,
+-      value = "Name of the component.")
+-  public String getComponentName() {
+-    return componentName;
+-  }
+-
+-  public void setComponentName(String name) {
+-    this.componentName = name;
+-  }
+-
+-  /**
+-   * Name of the service component.
+-   **/
+-  public ComponentContainers name(String name) {
+-    this.componentName = name;
+-    return this;
+-  }
+-
+-  /**
+-   * Returns the containers of the component.
+-   */
+-  @ApiModelProperty(example = "null", value = "Containers of the component.")
+-  public List<Container> getContainers() {
+-    return containers;
+-  }
+-
+-  /**
+-   * Sets the containers.
+-   * @param containers containers of the component.
+-   */
+-  public void setContainers(List<Container> containers) {
+-    this.containers = containers;
+-  }
+-
+-  /**
+-   * Sets the containers.
+-   * @param compContainers containers of the component.
+-   */
+-  public ComponentContainers containers(List<Container> compContainers) {
+-    this.containers = compContainers;
+-    return this;
+-  }
+-
+-  /**
+-   * Add a container.
+-   * @param container container
+-   */
+-  public void addContainer(Container container) {
+-    containers.add(container);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentState.java
+deleted file mode 100644
+index 472f3749f70..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ComponentState.java
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The current state of a component.")
+-public enum ComponentState {
+-  FLEXING, STABLE, NEEDS_UPGRADE, UPGRADING, SUCCEEDED, FAILED;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFile.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFile.java
+deleted file mode 100644
+index 060e2045278..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFile.java
++++ /dev/null
+@@ -1,262 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.annotation.JsonValue;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlEnum;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import javax.xml.bind.annotation.XmlType;
+-
+-import java.io.Serializable;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-/**
+- * A config file that needs to be created and made available as a volume in an
+- * service component container.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "A config file that needs to be created and made available as a volume in an service component container.")
+-@XmlRootElement
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class ConfigFile implements Serializable {
+-  private static final long serialVersionUID = -7009402089417704612L;
+-
+-  /**
+-   * Config Type.  XML, JSON, YAML, TEMPLATE and HADOOP_XML are supported.
+-   **/
+-  @XmlType(name = "config_type")
+-  @XmlEnum
+-  public enum TypeEnum {
+-    XML("XML"), PROPERTIES("PROPERTIES"), JSON("JSON"), YAML("YAML"), TEMPLATE(
+-        "TEMPLATE"), HADOOP_XML("HADOOP_XML"), STATIC("STATIC"), ARCHIVE(
+-        "ARCHIVE");
+-
+-    private String value;
+-
+-    TypeEnum(String value) {
+-      this.value = value;
+-    }
+-
+-    @Override
+-    @JsonValue
+-    public String toString() {
+-      return value;
+-    }
+-  }
+-
+-  private TypeEnum type = null;
+-  private String destFile = null;
+-  private String srcFile = null;
+-  private LocalResourceVisibility visibility = null;
+-  private Map<String, String> properties = new HashMap<>();
+-
+-  public ConfigFile copy() {
+-    ConfigFile copy = new ConfigFile();
+-    copy.setType(this.getType());
+-    copy.setSrcFile(this.getSrcFile());
+-    copy.setDestFile(this.getDestFile());
+-    copy.setVisibility(this.visibility);
+-    if (this.getProperties() != null && !this.getProperties().isEmpty()) {
+-      copy.getProperties().putAll(this.getProperties());
+-    }
+-    return copy;
+-  }
+-
+-  /**
+-   * Config file in the standard format like xml, properties, json, yaml,
+-   * template.
+-   **/
+-  public ConfigFile type(TypeEnum type) {
+-    this.type = type;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Config file in the standard format like xml, properties, json, yaml, template.")
+-  @JsonProperty("type")
+-  public TypeEnum getType() {
+-    return type;
+-  }
+-
+-  public void setType(TypeEnum type) {
+-    this.type = type;
+-  }
+-
+-  /**
+-   * The absolute path that this configuration file should be mounted as, in the
+-   * service container.
+-   **/
+-  public ConfigFile destFile(String destFile) {
+-    this.destFile = destFile;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The absolute path that this configuration file should be mounted as, in the service container.")
+-  @JsonProperty("dest_file")
+-  public String getDestFile() {
+-    return destFile;
+-  }
+-
+-  @XmlElement(name = "dest_file")
+-  public void setDestFile(String destFile) {
+-    this.destFile = destFile;
+-  }
+-
+-  /**
+-   * This provides the source location of the configuration file, the content
+-   * of which is dumped to dest_file post property substitutions, in the format
+-   * as specified in type. Typically the src_file would point to a source
+-   * controlled network accessible file maintained by tools like puppet, chef,
+-   * or hdfs etc. Currently, only hdfs is supported.
+-   **/
+-  public ConfigFile srcFile(String srcFile) {
+-    this.srcFile = srcFile;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "This provides the source location of the configuration file, "
+-      + "the content of which is dumped to dest_file post property substitutions, in the format as specified in type. "
+-      + "Typically the src_file would point to a source controlled network accessible file maintained by tools like puppet, chef, or hdfs etc. Currently, only hdfs is supported.")
+-  @JsonProperty("src_file")
+-  public String getSrcFile() {
+-    return srcFile;
+-  }
+-
+-  @XmlElement(name = "src_file")
+-  public void setSrcFile(String srcFile) {
+-    this.srcFile = srcFile;
+-  }
+-
+-
+-  /**
+-   * Visibility of the Config file.
+-   **/
+-  public ConfigFile visibility(LocalResourceVisibility localrsrcVisibility) {
+-    this.visibility = localrsrcVisibility;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Visibility of the Config file")
+-  @JsonProperty("visibility")
+-  public LocalResourceVisibility getVisibility() {
+-    return visibility;
+-  }
+-
+-  @XmlElement(name = "visibility", defaultValue="APPLICATION")
+-  public void setVisibility(LocalResourceVisibility localrsrcVisibility) {
+-    this.visibility = localrsrcVisibility;
+-  }
+-
+-  /**
+-   A blob of key value pairs that will be dumped in the dest_file in the format
+-   as specified in type. If src_file is specified, src_file content are dumped
+-   in the dest_file and these properties will overwrite, if any, existing
+-   properties in src_file or be added as new properties in src_file.
+-   **/
+-  public ConfigFile properties(Map<String, String> properties) {
+-    this.properties = properties;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A blob of key value pairs that will be dumped in the dest_file in the format as specified in type."
+-      + " If src_file is specified, src_file content are dumped in the dest_file and these properties will overwrite, if any,"
+-      + " existing properties in src_file or be added as new properties in src_file.")
+-  @JsonProperty("properties")
+-  public Map<String, String> getProperties() {
+-    return properties;
+-  }
+-
+-  public void setProperties(Map<String, String> properties) {
+-    this.properties = properties;
+-  }
+-
+-  public long getLong(String name, long defaultValue) {
+-    if (name == null) {
+-      return defaultValue;
+-    }
+-    String value = properties.get(name.trim());
+-    return Long.parseLong(value);
+-  }
+-
+-  public boolean getBoolean(String name, boolean defaultValue) {
+-    if (name == null) {
+-      return defaultValue;
+-    }
+-    return Boolean.valueOf(properties.get(name.trim()));
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    ConfigFile configFile = (ConfigFile) o;
+-    return Objects.equals(this.type, configFile.type)
+-        && Objects.equals(this.destFile, configFile.destFile)
+-        && Objects.equals(this.srcFile, configFile.srcFile)
+-        && Objects.equals(this.visibility, configFile.visibility)
+-        && Objects.equals(this.properties, configFile.properties);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(type, destFile, srcFile, visibility, properties);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class ConfigFile {\n")
+-
+-        .append("    type: ").append(toIndentedString(type)).append("\n")
+-        .append("    destFile: ").append(toIndentedString(destFile))
+-        .append("\n")
+-        .append("    srcFile: ").append(toIndentedString(srcFile)).append("\n")
+-        .append("    visibility: ").append(toIndentedString(visibility))
+-        .append("\n")
+-        .append("    properties: ").append(toIndentedString(properties))
+-        .append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFormat.java
+deleted file mode 100644
+index 4e21ea08f98..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ConfigFormat.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import java.util.Locale;
+-
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public enum ConfigFormat {
+-
+-  JSON("json"),
+-  PROPERTIES("properties"),
+-  XML("xml"),
+-  HADOOP_XML("hadoop_xml"),
+-  TEMPLATE("template"),
+-  YAML("yaml");
+-
+-  ConfigFormat(String suffix) {
+-    this.suffix = suffix;
+-  }
+-
+-  private final String suffix;
+-
+-  public String getSuffix() {
+-    return suffix;
+-  }
+-
+-
+-  @Override
+-  public String toString() {
+-    return suffix;
+-  }
+-
+-  /**
+-   * Get a matching format or null
+-   * @param type
+-   * @return the format
+-   */
+-  public static ConfigFormat resolve(String type) {
+-    for (ConfigFormat format: values()) {
+-      if (format.getSuffix().equals(type.toLowerCase(Locale.ENGLISH))) {
+-        return format;
+-      }
+-    }
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Configuration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Configuration.java
+deleted file mode 100644
+index f52c7f27a04..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Configuration.java
++++ /dev/null
+@@ -1,224 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-
+-import java.io.Serializable;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-/**
+- * Set of configuration properties that can be injected into the service
+- * components via envs, files and custom pluggable helper docker containers.
+- * Files of several standard formats like xml, properties, json, yaml and
+- * templates will be supported.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Set of configuration properties that can be injected into the service components via envs, files and custom pluggable helper docker containers. Files of several standard formats like xml, properties, json, yaml and templates will be supported.")
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class Configuration implements Serializable {
+-  private static final long serialVersionUID = -4330788704981074466L;
+-
+-  private Map<String, String> properties = new HashMap<String, String>();
+-  private Map<String, String> env = new HashMap<String, String>();
+-  private List<ConfigFile> files = new ArrayList<ConfigFile>();
+-
+-  /**
+-   * A blob of key-value pairs of common service properties.
+-   **/
+-  public Configuration properties(Map<String, String> properties) {
+-    this.properties = properties;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A blob of key-value pairs of common service properties.")
+-  @JsonProperty("properties")
+-  public Map<String, String> getProperties() {
+-    return properties;
+-  }
+-
+-  public void setProperties(Map<String, String> properties) {
+-    this.properties = properties;
+-  }
+-
+-  /**
+-   * A blob of key-value pairs which will be appended to the default system
+-   * properties and handed off to the service at start time. All placeholder
+-   * references to properties will be substituted before injection.
+-   **/
+-  public Configuration env(Map<String, String> env) {
+-    this.env = env;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A blob of key-value pairs which will be appended to the default system properties and handed off to the service at start time. All placeholder references to properties will be substituted before injection.")
+-  @JsonProperty("env")
+-  public Map<String, String> getEnv() {
+-    return env;
+-  }
+-
+-  public void setEnv(Map<String, String> env) {
+-    this.env = env;
+-  }
+-
+-  /**
+-   * Array of list of files that needs to be created and made available as
+-   * volumes in the service component containers.
+-   **/
+-  public Configuration files(List<ConfigFile> files) {
+-    this.files = files;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Array of list of files that needs to be created and made available as volumes in the service component containers.")
+-  @JsonProperty("files")
+-  public List<ConfigFile> getFiles() {
+-    return files;
+-  }
+-
+-  public void setFiles(List<ConfigFile> files) {
+-    this.files = files;
+-  }
+-
+-  public long getPropertyLong(String name, long defaultValue) {
+-    String value = getProperty(name);
+-    if (StringUtils.isEmpty(value)) {
+-      return defaultValue;
+-    }
+-    return Long.parseLong(value);
+-  }
+-
+-  public int getPropertyInt(String name, int defaultValue) {
+-    String value = getProperty(name);
+-    if (StringUtils.isEmpty(value)) {
+-      return defaultValue;
+-    }
+-    return Integer.parseInt(value);
+-  }
+-
+-  public boolean getPropertyBool(String name, boolean defaultValue) {
+-    String value = getProperty(name);
+-    if (StringUtils.isEmpty(value)) {
+-      return defaultValue;
+-    }
+-    return Boolean.parseBoolean(value);
+-  }
+-
+-  public String getProperty(String name, String defaultValue) {
+-    String value = getProperty(name);
+-    if (StringUtils.isEmpty(value)) {
+-      return defaultValue;
+-    }
+-    return value;
+-  }
+-
+-  public void setProperty(String name, String value) {
+-    properties.put(name, value);
+-  }
+-
+-  public String getProperty(String name) {
+-    return properties.get(name.trim());
+-  }
+-
+-  public String getEnv(String name) {
+-    return env.get(name.trim());
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Configuration configuration = (Configuration) o;
+-    return Objects.equals(this.properties, configuration.properties)
+-        && Objects.equals(this.env, configuration.env)
+-        && Objects.equals(this.files, configuration.files);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(properties, env, files);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Configuration {\n")
+-
+-        .append("    properties: ").append(toIndentedString(properties))
+-        .append("\n")
+-        .append("    env: ").append(toIndentedString(env)).append("\n")
+-        .append("    files: ").append(toIndentedString(files)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-
+-  /**
+-   * Merge all properties and envs from that configuration to this configration.
+-   * For ConfigFiles, all properties and envs of that ConfigFile are merged into
+-   * this ConfigFile.
+-   */
+-  public synchronized void mergeFrom(Configuration that) {
+-    ServiceUtils.mergeMapsIgnoreDuplicateKeys(this.properties, that
+-        .getProperties());
+-    ServiceUtils.mergeMapsIgnoreDuplicateKeys(this.env, that.getEnv());
+-
+-    Map<String, ConfigFile> thatMap = new HashMap<>();
+-    for (ConfigFile file : that.getFiles()) {
+-      thatMap.put(file.getDestFile(), file.copy());
+-    }
+-    for (ConfigFile thisFile : files) {
+-      if(thatMap.containsKey(thisFile.getDestFile())) {
+-        ConfigFile thatFile = thatMap.get(thisFile.getDestFile());
+-        ServiceUtils.mergeMapsIgnoreDuplicateKeys(thisFile.getProperties(),
+-            thatFile.getProperties());
+-        thatMap.remove(thisFile.getDestFile());
+-      }
+-    }
+-    // add remaining new files from that Configration
+-    for (ConfigFile thatFile : thatMap.values()) {
+-      files.add(thatFile.copy());
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Container.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Container.java
+deleted file mode 100644
+index 0c03c9ed0b9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Container.java
++++ /dev/null
+@@ -1,345 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.util.Date;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * An instance of a running service container.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "An instance of a running service container")
+-@XmlRootElement
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class Container extends BaseResource {
+-  private static final long serialVersionUID = -8955788064529288L;
+-
+-  private String id = null;
+-  private Date launchTime = null;
+-  private String ip = null;
+-  private String hostname = null;
+-  private String bareHost = null;
+-  private ContainerState state = null;
+-  private String componentInstanceName = null;
+-  private Resource resource = null;
+-  private Artifact artifact = null;
+-  private Boolean privilegedContainer = null;
+-  private Map<String, List<Map<String, String>>> exposedPorts = null;
+-  private List<LocalizationStatus> localizationStatuses = null;
+-
+-  /**
+-   * Unique container id of a running service, e.g.
+-   * container_e3751_1458061340047_0008_01_000002.
+-   **/
+-  public Container id(String id) {
+-    this.id = id;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Unique container id of a running service, e.g. container_e3751_1458061340047_0008_01_000002.")
+-  @JsonProperty("id")
+-  public String getId() {
+-    return id;
+-  }
+-
+-  public void setId(String id) {
+-    this.id = id;
+-  }
+-
+-  /**
+-   * The time when the container was created, e.g. 2016-03-16T01:01:49.000Z.
+-   * This will most likely be different from cluster launch time.
+-   **/
+-  public Container launchTime(Date launchTime) {
+-    this.launchTime = launchTime == null ? null : (Date) launchTime.clone();
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The time when the container was created, e.g. 2016-03-16T01:01:49.000Z. This will most likely be different from cluster launch time.")
+-  @JsonProperty("launch_time")
+-  public Date getLaunchTime() {
+-    return launchTime == null ? null : (Date) launchTime.clone();
+-  }
+-
+-  @XmlElement(name = "launch_time")
+-  public void setLaunchTime(Date launchTime) {
+-    this.launchTime = launchTime == null ? null : (Date) launchTime.clone();
+-  }
+-
+-  /**
+-   * IP address of a running container, e.g. 172.31.42.141. The IP address and
+-   * hostname attribute values are dependent on the cluster/docker network setup
+-   * as per YARN-4007.
+-   **/
+-  public Container ip(String ip) {
+-    this.ip = ip;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "IP address of a running container, e.g. 172.31.42.141. The IP address and hostname attribute values are dependent on the cluster/docker network setup as per YARN-4007.")
+-  @JsonProperty("ip")
+-  public String getIp() {
+-    return ip;
+-  }
+-
+-  public void setIp(String ip) {
+-    this.ip = ip;
+-  }
+-
+-  /**
+-   * Fully qualified hostname of a running container, e.g.
+-   * ctr-e3751-1458061340047-0008-01-000002.examplestg.site. The IP address and
+-   * hostname attribute values are dependent on the cluster/docker network setup
+-   * as per YARN-4007.
+-   **/
+-  public Container hostname(String hostname) {
+-    this.hostname = hostname;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Fully qualified hostname of a running container, e.g. ctr-e3751-1458061340047-0008-01-000002.examplestg.site. The IP address and hostname attribute values are dependent on the cluster/docker network setup as per YARN-4007.")
+-  @JsonProperty("hostname")
+-  public String getHostname() {
+-    return hostname;
+-  }
+-
+-  public void setHostname(String hostname) {
+-    this.hostname = hostname;
+-  }
+-
+-  /**
+-   * The bare node or host in which the container is running, e.g.
+-   * cn008.example.com.
+-   **/
+-  public Container bareHost(String bareHost) {
+-    this.bareHost = bareHost;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The bare node or host in which the container is running, e.g. cn008.example.com.")
+-  @JsonProperty("bare_host")
+-  public String getBareHost() {
+-    return bareHost;
+-  }
+-
+-  @XmlElement(name = "bare_host")
+-  public void setBareHost(String bareHost) {
+-    this.bareHost = bareHost;
+-  }
+-
+-  /**
+-   * State of the container of an service.
+-   **/
+-  public Container state(ContainerState state) {
+-    this.state = state;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "State of the container of an service.")
+-  @JsonProperty("state")
+-  public ContainerState getState() {
+-    return state;
+-  }
+-
+-  public void setState(ContainerState state) {
+-    this.state = state;
+-  }
+-
+-  /**
+-   * Name of the component instance that this container instance belongs to.
+-   **/
+-  public Container componentInstanceName(String componentInstanceName) {
+-    this.componentInstanceName = componentInstanceName;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Name of the component instance that this container instance belongs to.")
+-  @JsonProperty("component_instance_name")
+-  public String getComponentInstanceName() {
+-    return componentInstanceName;
+-  }
+-
+-  @XmlElement(name = "component_instance_name")
+-  public void setComponentInstanceName(String componentInstanceName) {
+-    this.componentInstanceName = componentInstanceName;
+-  }
+-
+-  /**
+-   * Resource used for this container.
+-   **/
+-  public Container resource(Resource resource) {
+-    this.resource = resource;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Resource used for this container.")
+-  @JsonProperty("resource")
+-  public Resource getResource() {
+-    return resource;
+-  }
+-
+-  public void setResource(Resource resource) {
+-    this.resource = resource;
+-  }
+-
+-  /**
+-   * Artifact used for this container.
+-   **/
+-  public Container artifact(Artifact artifact) {
+-    this.artifact = artifact;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact used for this container.")
+-  @JsonProperty("artifact")
+-  public Artifact getArtifact() {
+-    return artifact;
+-  }
+-
+-  public void setArtifact(Artifact artifact) {
+-    this.artifact = artifact;
+-  }
+-
+-  /**
+-   * Container running in privileged mode or not.
+-   **/
+-  public Container privilegedContainer(Boolean privilegedContainer) {
+-    this.privilegedContainer = privilegedContainer;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Container running in privileged mode or not.")
+-  @JsonProperty("privileged_container")
+-  public Boolean getPrivilegedContainer() {
+-    return privilegedContainer;
+-  }
+-
+-  public void setPrivilegedContainer(Boolean privilegedContainer) {
+-    this.privilegedContainer = privilegedContainer;
+-  }
+-
+-  @ApiModelProperty(example = "null",
+-      value = "Ports exposed for this container.")
+-  @JsonProperty("exposed_ports")
+-  public Map<String, List<Map<String, String>>> getExposedPorts() {
+-    return exposedPorts;
+-  }
+-
+-  public void setExposedPorts(Map<String, List<Map<String, String>>> ports) {
+-    this.exposedPorts = ports;
+-  }
+-
+-  /**
+-   * Localization statuses.
+-   */
+-  @ApiModelProperty(example = "null", value =
+-      "Localization statuses of a container.")
+-  @JsonProperty("localization_statuses")
+-  public List<LocalizationStatus> getLocalizationStatuses() {
+-    return localizationStatuses;
+-  }
+-
+-  /**
+-   * Sets the localization statuses.
+-   * @param statuses localization statuses.
+-   */
+-  @XmlElement(name = "localization_statuses")
+-  public void setLocalizationStatuses(List<LocalizationStatus> statuses) {
+-    this.localizationStatuses = statuses;
+-  }
+-
+-  /**
+-   * Sets the localization statuses and returns the container.
+-   * @param statuses
+-   * @return
+-   */
+-  public Container localizationStatuses(List<LocalizationStatus> statuses) {
+-    this.localizationStatuses = statuses;
+-    return this;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Container container = (Container) o;
+-    return Objects.equals(this.id, container.id);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(id);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Container {\n");
+-
+-    sb.append("    id: ").append(toIndentedString(id)).append("\n")
+-        .append("    launchTime: ").append(toIndentedString(launchTime))
+-        .append("\n")
+-        .append("    ip: ").append(toIndentedString(ip)).append("\n")
+-        .append("    hostname: ").append(toIndentedString(hostname))
+-        .append("\n")
+-        .append("    bareHost: ").append(toIndentedString(bareHost))
+-        .append("\n")
+-        .append("    state: ").append(toIndentedString(state)).append("\n")
+-        .append("    componentInstanceName: ").append(toIndentedString(
+-            componentInstanceName))
+-        .append("\n")
+-        .append("    resource: ").append(toIndentedString(resource))
+-        .append("\n")
+-        .append("    artifact: ").append(toIndentedString(artifact))
+-        .append("\n")
+-        .append("    privilegedContainer: ")
+-        .append(toIndentedString(privilegedContainer)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ContainerState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ContainerState.java
+deleted file mode 100644
+index a6e9a2e7d82..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ContainerState.java
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * The current state of the container of an application.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public enum ContainerState {
+-  RUNNING_BUT_UNREADY, READY, STOPPED, NEEDS_UPGRADE, UPGRADING, SUCCEEDED,
+-  FAILED, FAILED_UPGRADE;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Error.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Error.java
+deleted file mode 100644
+index 1ba30f2e351..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Error.java
++++ /dev/null
+@@ -1,128 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.util.Objects;
+-
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class Error {
+-
+-  private Integer code = null;
+-  private String message = null;
+-  private String fields = null;
+-
+-  /**
+-   **/
+-  public Error code(Integer code) {
+-    this.code = code;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "")
+-  @JsonProperty("code")
+-  public Integer getCode() {
+-    return code;
+-  }
+-
+-  public void setCode(Integer code) {
+-    this.code = code;
+-  }
+-
+-  /**
+-   **/
+-  public Error message(String message) {
+-    this.message = message;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "")
+-  @JsonProperty("message")
+-  public String getMessage() {
+-    return message;
+-  }
+-
+-  public void setMessage(String message) {
+-    this.message = message;
+-  }
+-
+-  /**
+-   **/
+-  public Error fields(String fields) {
+-    this.fields = fields;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "")
+-  @JsonProperty("fields")
+-  public String getFields() {
+-    return fields;
+-  }
+-
+-  public void setFields(String fields) {
+-    this.fields = fields;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Error error = (Error) o;
+-    return Objects.equals(this.code, error.code)
+-        && Objects.equals(this.message, error.message)
+-        && Objects.equals(this.fields, error.fields);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(code, message, fields);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Error {\n")
+-
+-        .append("    code: ").append(toIndentedString(code)).append("\n")
+-        .append("    message: ").append(toIndentedString(message)).append("\n")
+-        .append("    fields: ").append(toIndentedString(fields)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/KerberosPrincipal.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/KerberosPrincipal.java
+deleted file mode 100644
+index 27125fbedc3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/KerberosPrincipal.java
++++ /dev/null
+@@ -1,146 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-import java.io.Serializable;
+-import java.util.Objects;
+-
+-/**
+- * The kerberos principal of the service.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The kerberos principal of the service.")
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class KerberosPrincipal implements Serializable {
+-  private static final long serialVersionUID = -6431667195287650037L;
+-
+-  @JsonProperty("principal_name")
+-  @XmlElement(name = "principal_name")
+-  private String principalName = null;
+-
+-  @JsonProperty("keytab")
+-  @XmlElement(name = "keytab")
+-  private String keytab = null;
+-
+-  public KerberosPrincipal principalName(String principalName) {
+-    this.principalName = principalName;
+-    return this;
+-  }
+-
+-  /**
+-   * The principal name of the service.
+-   *
+-   * @return principalName
+-   **/
+-  @ApiModelProperty(value = "The principal name of the service.")
+-  public String getPrincipalName() {
+-    return principalName;
+-  }
+-
+-  public void setPrincipalName(String principalName) {
+-    this.principalName = principalName;
+-  }
+-
+-  public KerberosPrincipal keytab(String keytab) {
+-    this.keytab = keytab;
+-    return this;
+-  }
+-
+-  /**
+-   * The URI of the kerberos keytab. It supports hadoop supported schemes
+-   * like \&quot;hdfs\&quot; \&quot;file\&quot; \&quot;s3\&quot;
+-   *  \&quot;viewfs\&quot; etc.If the URI starts with \&quot;
+-   * hdfs://\&quot; scheme, it indicates the path on hdfs where the keytab is
+-   * stored. The keytab will be localized by YARN and made available to AM in
+-   * its local directory. If the URI starts with \&quot;file://\&quot;
+-   * scheme, it indicates a path on the local host presumbaly installed by
+-   * admins upfront.
+-   *
+-   * @return keytab
+-   **/
+-  @ApiModelProperty(value = "The URI of the kerberos keytab. It supports"
+-      + " Hadoop supported filesystem types like \"hdfs\", \"file\","
+-      + " \"viewfs\", \"s3\" etc.If the URI starts with \"hdfs://\" scheme, "
+-      + "it indicates the path on hdfs where the keytab is stored. The "
+-      + "keytab will be localized by YARN and made available to AM in its local"
+-      + " directory. If the URI starts with \"file://\" scheme, it indicates a "
+-      + "path on the local host where the keytab is presumbaly installed by "
+-      + "admins upfront. ")
+-  public String getKeytab() {
+-    return keytab;
+-  }
+-
+-  public void setKeytab(String keytab) {
+-    this.keytab = keytab;
+-  }
+-
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    KerberosPrincipal kerberosPrincipal = (KerberosPrincipal) o;
+-    return Objects.equals(this.principalName, kerberosPrincipal
+-        .principalName) &&
+-        Objects.equals(this.keytab, kerberosPrincipal.keytab);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(principalName, keytab);
+-  }
+-
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class KerberosPrincipal {\n")
+-
+-        .append("    principalName: ").append(toIndentedString(principalName))
+-        .append("\n")
+-        .append("    keytab: ").append(toIndentedString(keytab)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-
+-}
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/LocalizationStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/LocalizationStatus.java
+deleted file mode 100644
+index 3f76ba3a346..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/LocalizationStatus.java
++++ /dev/null
+@@ -1,132 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import io.swagger.annotations.ApiModel;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.yarn.api.records.LocalizationState;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.io.Serializable;
+-
+-/**
+- * The status of localization.
+- */
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Localization status of a resource.")
+-@XmlRootElement
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class LocalizationStatus implements Serializable {
+-
+-  private static final long serialVersionUID = -5745287278502373531L;
+-
+-  private String destFile;
+-
+-  private LocalizationState state;
+-
+-  private String diagnostics;
+-
+-  /**
+-   * Destination file.
+-   */
+-  @JsonProperty("dest_file")
+-  public String getDestFile() {
+-    return destFile;
+-  }
+-
+-  /**
+-   * Sets the destination file.
+-   *
+-   * @param destFile destination file
+-   */
+-  @XmlElement(name = "dest_file")
+-  public void setDestFile(String destFile) {
+-    this.destFile = destFile;
+-  }
+-
+-  /**
+-   * Sets the destination file and returns the localization status.
+-   *
+-   * @param fileName destination file
+-   */
+-  public LocalizationStatus destFile(String fileName) {
+-    this.destFile = fileName;
+-    return this;
+-  }
+-
+-  /**
+-   * Localization state.
+-   */
+-  @JsonProperty("state")
+-  public LocalizationState getState() {
+-    return state;
+-  }
+-
+-  /**
+-   * Sets the localization state.
+-   *
+-   * @param localizationState localization state
+-   */
+-  @XmlElement(name = "state")
+-  public void setState(LocalizationState localizationState) {
+-    this.state = localizationState;
+-  }
+-
+-  /**
+-   * Sets the localization state and returns the localization status.
+-   *
+-   * @param localizationState localization state
+-   */
+-  public LocalizationStatus state(LocalizationState localizationState) {
+-    this.state = localizationState;
+-    return this;
+-  }
+-
+-  /**
+-   * Diagnostics.
+-   */
+-  @JsonProperty("diagnostics")
+-  public String getDiagnostics() {
+-    return diagnostics;
+-  }
+-
+-  /**
+-   * Sets the diagnostics.
+-   *
+-   * @param diag diagnostics
+-   */
+-  @XmlElement(name = "diagnostics")
+-  public void setDiagnostics(String diag) {
+-    this.diagnostics = diag;
+-  }
+-
+-  /**
+-   * Sets the diagnostics and returns the localization status.
+-   *
+-   * @param diag diagnostics
+-   */
+-  public LocalizationStatus diagnostics(String diag) {
+-    this.diagnostics = diag;
+-    return this;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementConstraint.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementConstraint.java
+deleted file mode 100644
+index 6b0bc61c424..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementConstraint.java
++++ /dev/null
+@@ -1,280 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import java.io.Serializable;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-/**
+- * Placement constraint details.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Placement constraint details.")
+-public class PlacementConstraint implements Serializable {
+-  private static final long serialVersionUID = 1518017165676511762L;
+-
+-  private String name = null;
+-  private PlacementType type = null;
+-  private PlacementScope scope = null;
+-  @JsonProperty("target_tags")
+-  @XmlElement(name = "target_tags")
+-  private List<String> targetTags = new ArrayList<>();
+-  @JsonProperty("node_attributes")
+-  @XmlElement(name = "node_attributes")
+-  private Map<String, List<String>> nodeAttributes = new HashMap<>();
+-  @JsonProperty("node_partitions")
+-  @XmlElement(name = "node_partitions")
+-  private List<String> nodePartitions = new ArrayList<>();
+-  @JsonProperty("min_cardinality")
+-  @XmlElement(name = "min_cardinality")
+-  private Long minCardinality = null;
+-  @JsonProperty("max_cardinality")
+-  @XmlElement(name = "max_cardinality")
+-  private Long maxCardinality = null;
+-
+-  /**
+-   * An optional name associated to this constraint.
+-   **/
+-  public PlacementConstraint name(String name) {
+-    this.name = name;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "C1", required = true)
+-  @JsonProperty("name")
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  /**
+-   * The type of placement.
+-   **/
+-  public PlacementConstraint type(PlacementType type) {
+-    this.type = type;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true)
+-  @JsonProperty("type")
+-  public PlacementType getType() {
+-    return type;
+-  }
+-
+-  public void setType(PlacementType type) {
+-    this.type = type;
+-  }
+-
+-  /**
+-   * The scope of placement.
+-   **/
+-  public PlacementConstraint scope(PlacementScope scope) {
+-    this.scope = scope;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true)
+-  @JsonProperty("scope")
+-  public PlacementScope getScope() {
+-    return scope;
+-  }
+-
+-  public void setScope(PlacementScope scope) {
+-    this.scope = scope;
+-  }
+-
+-  /**
+-   * The name of the components that this component's placement policy is
+-   * depending upon are added as target tags. So for affinity say, this
+-   * component's containers are requesting to be placed on hosts where
+-   * containers of the target tag component(s) are running on. Target tags can
+-   * also contain the name of this component, in which case it implies that for
+-   * anti-affinity say, no more than one container of this component can be
+-   * placed on a host. Similarly, for cardinality, it would mean that containers
+-   * of this component is requesting to be placed on hosts where at least
+-   * minCardinality but no more than maxCardinality containers of the target tag
+-   * component(s) are running.
+-   **/
+-  public PlacementConstraint targetTags(List<String> targetTags) {
+-    this.targetTags = targetTags;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "[\"hbase-regionserver\"]")
+-  public List<String> getTargetTags() {
+-    return targetTags;
+-  }
+-
+-  public void setTargetTags(List<String> targetTags) {
+-    this.targetTags = targetTags;
+-  }
+-
+-  /**
+-   * Node attributes are a set of key:value(s) pairs associated with nodes.
+-   */
+-  public PlacementConstraint nodeAttributes(
+-      Map<String, List<String>> nodeAttributes) {
+-    this.nodeAttributes = nodeAttributes;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "\"JavaVersion\":[\"1.7\", \"1.8\"]")
+-  public Map<String, List<String>> getNodeAttributes() {
+-    return nodeAttributes;
+-  }
+-
+-  public void setNodeAttributes(Map<String, List<String>> nodeAttributes) {
+-    this.nodeAttributes = nodeAttributes;
+-  }
+-
+-  /**
+-   * Node partitions where the containers of this component can run.
+-   */
+-  public PlacementConstraint nodePartitions(
+-      List<String> nodePartitions) {
+-    this.nodePartitions = nodePartitions;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "[\"gpu\", \"fast_disk\"]")
+-  public List<String> getNodePartitions() {
+-    return nodePartitions;
+-  }
+-
+-  public void setNodePartitions(List<String> nodePartitions) {
+-    this.nodePartitions = nodePartitions;
+-  }
+-
+-  /**
+-   * When placement type is cardinality, the minimum number of containers of the
+-   * depending component that a host should have, where containers of this
+-   * component can be allocated on.
+-   **/
+-  public PlacementConstraint minCardinality(Long minCardinality) {
+-    this.minCardinality = minCardinality;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "2")
+-  public Long getMinCardinality() {
+-    return minCardinality;
+-  }
+-
+-  public void setMinCardinality(Long minCardinality) {
+-    this.minCardinality = minCardinality;
+-  }
+-
+-  /**
+-   * When placement type is cardinality, the maximum number of containers of the
+-   * depending component that a host should have, where containers of this
+-   * component can be allocated on.
+-   **/
+-  public PlacementConstraint maxCardinality(Long maxCardinality) {
+-    this.maxCardinality = maxCardinality;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "3")
+-  public Long getMaxCardinality() {
+-    return maxCardinality;
+-  }
+-
+-  public void setMaxCardinality(Long maxCardinality) {
+-    this.maxCardinality = maxCardinality;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    PlacementConstraint placementConstraint = (PlacementConstraint) o;
+-    return Objects.equals(this.name, placementConstraint.name)
+-        && Objects.equals(this.type, placementConstraint.type)
+-        && Objects.equals(this.scope, placementConstraint.scope)
+-        && Objects.equals(this.targetTags, placementConstraint.targetTags)
+-        && Objects.equals(this.nodeAttributes,
+-            placementConstraint.nodeAttributes)
+-        && Objects.equals(this.nodePartitions,
+-            placementConstraint.nodePartitions)
+-        && Objects.equals(this.minCardinality,
+-            placementConstraint.minCardinality)
+-        && Objects.equals(this.maxCardinality,
+-            placementConstraint.maxCardinality);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(name, type, scope, targetTags, nodeAttributes,
+-        nodePartitions, minCardinality, maxCardinality);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class PlacementConstraint {\n")
+-
+-        .append("    name: ").append(toIndentedString(name)).append("\n")
+-        .append("    type: ").append(toIndentedString(type)).append("\n")
+-        .append("    scope: ").append(toIndentedString(scope)).append("\n")
+-        .append("    targetTags: ").append(toIndentedString(targetTags))
+-        .append("\n")
+-        .append("    nodeAttributes: ").append(toIndentedString(nodeAttributes))
+-        .append("\n")
+-        .append("    nodePartitions: ").append(toIndentedString(nodePartitions))
+-        .append("\n")
+-        .append("    minCardinality: ").append(toIndentedString(minCardinality))
+-        .append("\n")
+-        .append("    maxCardinality: ").append(toIndentedString(maxCardinality))
+-        .append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementPolicy.java
+deleted file mode 100644
+index 0b4225e1d68..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementPolicy.java
++++ /dev/null
+@@ -1,101 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import java.io.Serializable;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Objects;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-/**
+- * Advanced placement policy of the components of a service.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Advanced placement policy of the components of a "
+-    + "service.")
+-public class PlacementPolicy implements Serializable {
+-  private static final long serialVersionUID = 4341110649551172231L;
+-
+-  private List<PlacementConstraint> constraints = new ArrayList<>();
+-
+-  /**
+-   * Placement constraint details.
+-   **/
+-  public PlacementPolicy constraints(List<PlacementConstraint> constraints) {
+-    this.constraints = constraints;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true)
+-  @JsonProperty("constraints")
+-  public List<PlacementConstraint> getConstraints() {
+-    return constraints;
+-  }
+-
+-  public void setConstraints(List<PlacementConstraint> constraints) {
+-    this.constraints = constraints;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    PlacementPolicy placementPolicy = (PlacementPolicy) o;
+-    return Objects.equals(this.constraints, placementPolicy.constraints);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(constraints);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class PlacementPolicy {\n")
+-
+-        .append("    constraints: ").append(toIndentedString(constraints))
+-        .append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementScope.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementScope.java
+deleted file mode 100644
+index 01b1d5dedf3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementScope.java
++++ /dev/null
+@@ -1,53 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraints;
+-
+-import com.fasterxml.jackson.annotation.JsonValue;
+-
+-import io.swagger.annotations.ApiModel;
+-
+-/**
+- * The scope of placement for the containers of a component.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The scope of placement for the containers of a "
+-    + "component.")
+-public enum PlacementScope {
+-  NODE(PlacementConstraints.NODE), RACK(PlacementConstraints.RACK);
+-
+-  private String value;
+-
+-  PlacementScope(String value) {
+-    this.value = value;
+-  }
+-
+-  public String getValue() {
+-    return value;
+-  }
+-
+-  @Override
+-  @JsonValue
+-  public String toString() {
+-    return value;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementType.java
+deleted file mode 100644
+index 6dfe935fc53..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/PlacementType.java
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * The type of placement - affinity/anti-affinity/affinity-with-cardinality with
+- * containers of another component or containers of the same component (self).
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The type of placement - affinity/anti-affinity/"
+-    + "affinity-with-cardinality with containers of another component or "
+-    + "containers of the same component (self).")
+-public enum PlacementType {
+-  AFFINITY, ANTI_AFFINITY, AFFINITY_WITH_CARDINALITY;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ReadinessCheck.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ReadinessCheck.java
+deleted file mode 100644
+index 5f94d49e14e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ReadinessCheck.java
++++ /dev/null
+@@ -1,197 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.io.Serializable;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlEnum;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import javax.xml.bind.annotation.XmlType;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.annotation.JsonValue;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * A custom command or a pluggable helper container to determine the readiness
+- * of a container of a component. Readiness for every service is different.
+- * Hence the need for a simple interface, with scope to support advanced
+- * usecases.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "A custom command or a pluggable helper container to determine the readiness of a container of a component. Readiness for every service is different. Hence the need for a simple interface, with scope to support advanced usecases.")
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class ReadinessCheck implements Serializable {
+-  private static final long serialVersionUID = -3836839816887186801L;
+-
+-  /**
+-   * Type. HTTP and PORT
+-   **/
+-  @XmlType(name = "type")
+-  @XmlEnum
+-  public enum TypeEnum {
+-    DEFAULT("DEFAULT"),
+-    HTTP("HTTP"),
+-    PORT("PORT");
+-
+-    private String value;
+-
+-    TypeEnum(String value) {
+-      this.value = value;
+-    }
+-
+-    @Override
+-    @JsonValue
+-    public String toString() {
+-      return value;
+-    }
+-  }
+-
+-  @JsonProperty("type")
+-  @XmlElement(name = "type")
+-  private TypeEnum type = null;
+-  @JsonProperty("properties")
+-  @XmlElement(name = "properties")
+-  private Map<String, String> properties = new HashMap<String, String>();
+-  @JsonProperty("artifact")
+-  @XmlElement(name = "artifact")
+-  private Artifact artifact = null;
+-
+-  /**
+-   * E.g. HTTP (YARN will perform a simple REST call at a regular interval and
+-   * expect a 204 No content).
+-   **/
+-  public ReadinessCheck type(TypeEnum type) {
+-    this.type = type;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "E.g. HTTP (YARN will perform a simple REST call at a regular interval and expect a 204 No content).")
+-  public TypeEnum getType() {
+-    return type;
+-  }
+-
+-  public void setType(TypeEnum type) {
+-    this.type = type;
+-  }
+-
+-  public ReadinessCheck properties(Map<String, String> properties) {
+-    this.properties = properties;
+-    return this;
+-  }
+-
+-  public ReadinessCheck putPropsItem(String key, String propsItem) {
+-    this.properties.put(key, propsItem);
+-    return this;
+-  }
+-
+-  /**
+-   * A blob of key value pairs that will be used to configure the check.
+-   * @return properties
+-   **/
+-  @ApiModelProperty(example = "null", value = "A blob of key value pairs that will be used to configure the check.")
+-  public Map<String, String> getProperties() {
+-    return properties;
+-  }
+-
+-  public void setProperties(Map<String, String> properties) {
+-    this.properties = properties;
+-  }
+-
+-  /**
+-   * Artifact of the pluggable readiness check helper container (optional). If
+-   * specified, this helper container typically hosts the http uri and
+-   * encapsulates the complex scripts required to perform actual container
+-   * readiness check. At the end it is expected to respond a 204 No content just
+-   * like the simplified use case. This pluggable framework benefits service
+-   * owners who can run services without any packaging modifications. Note,
+-   * artifacts of type docker only is supported for now.
+-   **/
+-  public ReadinessCheck artifact(Artifact artifact) {
+-    this.artifact = artifact;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact of the pluggable readiness check helper container (optional). If specified, this helper container typically hosts the http uri and encapsulates the complex scripts required to perform actual container readiness check. At the end it is expected to respond a 204 No content just like the simplified use case. This pluggable framework benefits service owners who can run services without any packaging modifications. Note, artifacts of type docker only is supported for now.")
+-  public Artifact getArtifact() {
+-    return artifact;
+-  }
+-
+-  public void setArtifact(Artifact artifact) {
+-    this.artifact = artifact;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    ReadinessCheck readinessCheck = (ReadinessCheck) o;
+-    return Objects.equals(this.type, readinessCheck.type) &&
+-        Objects.equals(this.properties, readinessCheck.properties) &&
+-        Objects.equals(this.artifact, readinessCheck.artifact);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(type, properties, artifact);
+-  }
+-
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class ReadinessCheck {\n")
+-
+-        .append("    type: ").append(toIndentedString(type)).append("\n")
+-        .append("    properties: ").append(toIndentedString(properties))
+-        .append("\n")
+-        .append("    artifact: ").append(toIndentedString(artifact))
+-        .append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Resource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Resource.java
+deleted file mode 100644
+index 4ffe87be37b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Resource.java
++++ /dev/null
+@@ -1,191 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import javax.xml.bind.annotation.XmlElement;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-/**
+- * Resource determines the amount of resources (vcores, memory, network, etc.)
+- * usable by a container. This field determines the resource to be applied for
+- * all the containers of a component or service. The resource specified at
+- * the service (or global) level can be overriden at the component level. Only one
+- * of profile OR cpu &amp; memory are expected. It raises a validation
+- * exception otherwise.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "Resource determines the amount of resources (vcores, memory, network, etc.) usable by a container. This field determines the resource to be applied for all the containers of a component or service. The resource specified at the service (or global) level can be overriden at the component level. Only one of profile OR cpu & memory are expected. It raises a validation exception otherwise.")
+-public class Resource extends BaseResource implements Cloneable {
+-  private static final long serialVersionUID = -6431667797380250037L;
+-
+-  private String profile = null;
+-  private Integer cpus = 1;
+-  private String memory = null;
+-
+-  @JsonProperty("additional")
+-  @XmlElement(name = "additional")
+-  private Map<String, ResourceInformation> additional = new HashMap<>();
+-
+-  /**
+-   * Each resource profile has a unique id which is associated with a
+-   * cluster-level predefined memory, cpus, etc.
+-   **/
+-  public Resource profile(String profile) {
+-    this.profile = profile;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Each resource profile has a unique id which is associated with a cluster-level predefined memory, cpus, etc.")
+-  @JsonProperty("profile")
+-  public String getProfile() {
+-    return profile;
+-  }
+-
+-  public void setProfile(String profile) {
+-    this.profile = profile;
+-  }
+-
+-  /**
+-   * Amount of vcores allocated to each container (optional but overrides cpus
+-   * in profile if specified).
+-   **/
+-  public Resource cpus(Integer cpus) {
+-    this.cpus = cpus;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Amount of vcores allocated to each container (optional but overrides cpus in profile if specified).")
+-  @JsonProperty("cpus")
+-  public Integer getCpus() {
+-    return cpus;
+-  }
+-
+-  public void setCpus(Integer cpus) {
+-    this.cpus = cpus;
+-  }
+-
+-  /**
+-   * Amount of memory allocated to each container (optional but overrides memory
+-   * in profile if specified). Currently accepts only an integer value and
+-   * default unit is in MB.
+-   **/
+-  public Resource memory(String memory) {
+-    this.memory = memory;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Amount of memory allocated to each container (optional but overrides memory in profile if specified). Currently accepts only an integer value and default unit is in MB.")
+-  @JsonProperty("memory")
+-  public String getMemory() {
+-    return memory;
+-  }
+-
+-  public void setMemory(String memory) {
+-    this.memory = memory;
+-  }
+-
+-  @JsonIgnoreProperties(ignoreUnknown=true)
+-  public long calcMemoryMB() {
+-    if (this.memory == null) {
+-      return 0;
+-    }
+-    return Long.parseLong(memory);
+-  }
+-
+-  public Resource setResourceInformations(
+-      Map<String, ResourceInformation> resourceInformations) {
+-    this.additional = resourceInformations;
+-    return this;
+-  }
+-
+-  public Resource resourceInformations(
+-      Map<String, ResourceInformation> resourceInformations) {
+-    this.additional = resourceInformations;
+-    return this;
+-  }
+-
+-  /**
+-   * Map of resource name to ResourceInformation
+-   * @return additional
+-   **/
+-  @ApiModelProperty(value = "Map of resource name to ResourceInformation")
+-  @JsonProperty("additional")
+-  public Map<String, ResourceInformation> getAdditional() {
+-    return additional;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Resource resource = (Resource) o;
+-    return Objects.equals(this.profile, resource.profile) && Objects.equals(
+-        this.cpus, resource.cpus) && Objects.equals(this.memory,
+-        resource.memory) && Objects.equals(this.additional,
+-        resource.additional);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(profile, cpus, memory, additional);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Resource {\n")
+-
+-        .append("    profile: ").append(toIndentedString(profile)).append("\n")
+-        .append("    cpus: ").append(toIndentedString(cpus)).append("\n")
+-        .append("    memory: ").append(toIndentedString(memory)).append("\n")
+-        .append("    additional: ").append(
+-            toIndentedString(additional)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-
+-  @Override
+-  public Object clone() throws CloneNotSupportedException {
+-    return super.clone();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ResourceInformation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ResourceInformation.java
+deleted file mode 100644
+index 98f71268fbe..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ResourceInformation.java
++++ /dev/null
+@@ -1,152 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+-import com.google.gson.annotations.SerializedName;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.util.Map;
+-import java.util.Objects;
+-import java.util.Set;
+-
+-/**
+- * ResourceInformation determines unit/name/value of resource types in addition to memory and vcores. It will be part of Resource object
+- */
+-@ApiModel(description = "ResourceInformation determines unit/value of resource types in addition to memory and vcores. It will be part of Resource object")
+-public class ResourceInformation {
+-  @SerializedName("value")
+-  private Long value = null;
+-
+-  @SerializedName("unit")
+-  private String unit = null;
+-
+-  @SerializedName("attributes")
+-  private Map<String, String> attributes = null;
+-
+-  @SerializedName("tags")
+-  private Set<String> tags = null;
+-
+-  public ResourceInformation value(Long value) {
+-    this.value = value;
+-    return this;
+-  }
+-
+-  public ResourceInformation tags(Set<String> resourceTags) {
+-    this.tags = resourceTags;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(value = "")
+-  @JsonProperty("tags")
+-  public Set<String> getTags() {
+-    return tags == null ? ImmutableSet.of() : tags;
+-  }
+-
+-  @ApiModelProperty(value = "")
+-  @JsonProperty("attributes")
+-  public Map<String, String> getAttributes() {
+-    return attributes == null ? ImmutableMap.of() : attributes;
+-  }
+-
+-  public ResourceInformation attributes(Map<String, String> attributes) {
+-    this.attributes = attributes;
+-    return this;
+-  }
+-
+-  /**
+-   * Integer value of the resource.
+-   *
+-   * @return value
+-   **/
+-  @ApiModelProperty(value = "Integer value of the resource.")
+-  @JsonProperty("value")
+-  public Long getValue() {
+-    return value;
+-  }
+-
+-  public void setValue(Long value) {
+-    this.value = value;
+-  }
+-
+-  public ResourceInformation unit(String unit) {
+-    this.unit = unit;
+-    return this;
+-  }
+-
+-  /**
+-   * @return unit
+-   **/
+-  @ApiModelProperty(value = "")
+-  @JsonProperty("unit")
+-  public String getUnit() {
+-    return unit == null ? "" : unit;
+-  }
+-
+-  public void setUnit(String unit) {
+-    this.unit = unit;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    ResourceInformation resourceInformation = (ResourceInformation) o;
+-    return Objects
+-        .equals(this.value, resourceInformation.value) && Objects.equals(
+-        this.unit, resourceInformation.unit);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(value, unit);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class ResourceInformation {\n")
+-        .append("    value: ").append(toIndentedString(value)).append("\n")
+-        .append("    unit: ").append(toIndentedString(unit)).append("\n")
+-        .append("    attributes: ").append(toIndentedString(attributes))
+-        .append("\n")
+-        .append("    tags: ").append(toIndentedString(tags)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-
+-}
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Service.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Service.java
+deleted file mode 100644
+index 4171e189e1d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Service.java
++++ /dev/null
+@@ -1,472 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.Date;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Objects;
+-
+-/**
+- * An Service resource has the following attributes.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "An Service resource has the following attributes.")
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-@JsonPropertyOrder({ "name", "version", "description", "state", "resource",
+-    "number_of_containers", "lifetime", "containers" })
+-public class Service extends BaseResource {
+-  private static final long serialVersionUID = -4491694636566094885L;
+-
+-  private String name = null;
+-  private String id = null;
+-  private Artifact artifact = null;
+-  private Resource resource = null;
+-  @JsonProperty("launch_time")
+-  @XmlElement(name = "launch_time")
+-  private Date launchTime = null;
+-  @JsonProperty("number_of_running_containers")
+-  @XmlElement(name = "number_of_running_containers")
+-  private Long numberOfRunningContainers = null;
+-  private Long lifetime = null;
+-  private List<Component> components = new ArrayList<>();
+-  private Configuration configuration = new Configuration();
+-  private ServiceState state = null;
+-  private Map<String, String> quicklinks = new HashMap<>();
+-  private String queue = null;
+-  @JsonProperty("kerberos_principal")
+-  @XmlElement(name = "kerberos_principal")
+-  private KerberosPrincipal kerberosPrincipal = new KerberosPrincipal();
+-  private String version = null;
+-  private String description = null;
+-  private String dockerClientConfig = null;
+-  private List<String> dependencies = new ArrayList<String>();
+-
+-  /**
+-   * A unique service name.
+-   **/
+-  public Service name(String name) {
+-    this.name = name;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true, value = "A unique service name.")
+-  @JsonProperty("name")
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  /**
+-   * A unique service id.
+-   **/
+-  public Service id(String id) {
+-    this.id = id;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A unique service id.")
+-  @JsonProperty("id")
+-  public String getId() {
+-    return id;
+-  }
+-
+-  public void setId(String id) {
+-    this.id = id;
+-  }
+-
+-  @ApiModelProperty(example = "null", required = true,
+-      value = "Version of the service.")
+-  @JsonProperty("version")
+-  public String getVersion() {
+-    return version;
+-  }
+-
+-  public void setVersion(String version) {
+-    this.version = version;
+-  }
+-
+-  /**
+-   * Version of the service.
+-   */
+-  public Service version(String version) {
+-    this.version = version;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Description of the service.")
+-  @JsonProperty("description")
+-  public String getDescription() {
+-    return description;
+-  }
+-
+-  public void setDescription(String description) {
+-    this.description = description;
+-  }
+-
+-  /**
+-   * Description of the service.
+-   */
+-  public Service description(String description) {
+-    this.description = description;
+-    return this;
+-  }
+-
+-  /**
+-   * Artifact of single-component services. Mandatory if components
+-   * attribute is not specified.
+-   **/
+-  public Service artifact(Artifact artifact) {
+-    this.artifact = artifact;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Artifact of single-component services. Mandatory if components attribute is not specified.")
+-  @JsonProperty("artifact")
+-  public Artifact getArtifact() {
+-    return artifact;
+-  }
+-
+-  public void setArtifact(Artifact artifact) {
+-    this.artifact = artifact;
+-  }
+-
+-  /**
+-   * Resource of single-component services or the global default for
+-   * multi-component services. Mandatory if it is a single-component
+-   * service and if cpus and memory are not specified at the Service
+-   * level.
+-   **/
+-  public Service resource(Resource resource) {
+-    this.resource = resource;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Resource of single-component services or the global default for multi-component services. Mandatory if it is a single-component service and if cpus and memory are not specified at the Service level.")
+-  @JsonProperty("resource")
+-  public Resource getResource() {
+-    return resource;
+-  }
+-
+-  public void setResource(Resource resource) {
+-    this.resource = resource;
+-  }
+-
+-  /**
+-   * The time when the service was created, e.g. 2016-03-16T01:01:49.000Z.
+-   **/
+-  public Service launchTime(Date launchTime) {
+-    this.launchTime = launchTime == null ? null : (Date) launchTime.clone();
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The time when the service was created, e.g. 2016-03-16T01:01:49.000Z.")
+-  public Date getLaunchTime() {
+-    return launchTime == null ? null : (Date) launchTime.clone();
+-  }
+-
+-  public void setLaunchTime(Date launchTime) {
+-    this.launchTime = launchTime == null ? null : (Date) launchTime.clone();
+-  }
+-
+-  /**
+-   * In get response this provides the total number of running containers for
+-   * this service (across all components) at the time of request. Note, a
+-   * subsequent request can return a different number as and when more
+-   * containers get allocated until it reaches the total number of containers or
+-   * if a flex request has been made between the two requests.
+-   **/
+-  public Service numberOfRunningContainers(Long numberOfRunningContainers) {
+-    this.numberOfRunningContainers = numberOfRunningContainers;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "In get response this provides the total number of running containers for this service (across all components) at the time of request. Note, a subsequent request can return a different number as and when more containers get allocated until it reaches the total number of containers or if a flex request has been made between the two requests.")
+-  public Long getNumberOfRunningContainers() {
+-    return numberOfRunningContainers;
+-  }
+-
+-  public void setNumberOfRunningContainers(Long numberOfRunningContainers) {
+-    this.numberOfRunningContainers = numberOfRunningContainers;
+-  }
+-
+-  /**
+-   * Life time (in seconds) of the service from the time it reaches the
+-   * RUNNING_BUT_UNREADY state (after which it is automatically destroyed by YARN). For
+-   * unlimited lifetime do not set a lifetime value.
+-   **/
+-  public Service lifetime(Long lifetime) {
+-    this.lifetime = lifetime;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Life time (in seconds) of the service from the time it reaches the RUNNING_BUT_UNREADY state (after which it is automatically destroyed by YARN). For unlimited lifetime do not set a lifetime value.")
+-  @JsonProperty("lifetime")
+-  public Long getLifetime() {
+-    return lifetime;
+-  }
+-
+-  public void setLifetime(Long lifetime) {
+-    this.lifetime = lifetime;
+-  }
+-
+-  /**
+-   * Components of an service.
+-   **/
+-  public Service components(List<Component> components) {
+-    this.components = components;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Components of an service.")
+-  @JsonProperty("components")
+-  public List<Component> getComponents() {
+-    return components;
+-  }
+-
+-  public void setComponents(List<Component> components) {
+-    this.components = components;
+-  }
+-
+-  public void addComponent(Component component) {
+-    components.add(component);
+-  }
+-
+-  public Component getComponent(String name) {
+-    for (Component component : components) {
+-      if (component.getName().equals(name)) {
+-        return component;
+-      }
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Config properties of an service. Configurations provided at the
+-   * service/global level are available to all the components. Specific
+-   * properties can be overridden at the component level.
+-   **/
+-  public Service configuration(Configuration configuration) {
+-    this.configuration = configuration;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Config properties of an service. Configurations provided at the service/global level are available to all the components. Specific properties can be overridden at the component level.")
+-  @JsonProperty("configuration")
+-  public Configuration getConfiguration() {
+-    return configuration;
+-  }
+-
+-  public void setConfiguration(Configuration configuration) {
+-    this.configuration = configuration;
+-  }
+-
+-  /**
+-   * State of the service. Specifying a value for this attribute for the
+-   * POST payload raises a validation error. This attribute is available only in
+-   * the GET response of a started service.
+-   **/
+-  public Service state(ServiceState state) {
+-    this.state = state;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "State of the service. Specifying a value for this attribute for the POST payload raises a validation error. This attribute is available only in the GET response of a started service.")
+-  @JsonProperty("state")
+-  public ServiceState getState() {
+-    return state;
+-  }
+-
+-  public void setState(ServiceState state) {
+-    this.state = state;
+-  }
+-
+-  /**
+-   * A blob of key-value pairs of quicklinks to be exported for an service.
+-   **/
+-  public Service quicklinks(Map<String, String> quicklinks) {
+-    this.quicklinks = quicklinks;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A blob of key-value pairs of quicklinks to be exported for an service.")
+-  @JsonProperty("quicklinks")
+-  public Map<String, String> getQuicklinks() {
+-    return quicklinks;
+-  }
+-
+-  public void setQuicklinks(Map<String, String> quicklinks) {
+-    this.quicklinks = quicklinks;
+-  }
+-
+-  /**
+-   * The YARN queue that this service should be submitted to.
+-   **/
+-  public Service queue(String queue) {
+-    this.queue = queue;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "The YARN queue that this service should be submitted to.")
+-  @JsonProperty("queue")
+-  public String getQueue() {
+-    return queue;
+-  }
+-
+-  public void setQueue(String queue) {
+-    this.queue = queue;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "A list of dependent services.")
+-  @XmlElement(name = "dependencies")
+-  @JsonProperty("dependencies")
+-  public List<String> getDependencies() {
+-    return dependencies;
+-  }
+-
+-  public void setDependencies(List<String>
+-      dependencies) {
+-    this.dependencies = dependencies;
+-  }
+-
+-  public Service kerberosPrincipal(KerberosPrincipal kerberosPrincipal) {
+-    this.kerberosPrincipal = kerberosPrincipal;
+-    return this;
+-  }
+-
+-  /**
+-   * The Kerberos Principal of the service.
+-   * @return kerberosPrincipal
+-   **/
+-  @ApiModelProperty(value = "The Kerberos Principal of the service")
+-  public KerberosPrincipal getKerberosPrincipal() {
+-    return kerberosPrincipal;
+-  }
+-
+-  public void setKerberosPrincipal(KerberosPrincipal kerberosPrincipal) {
+-    this.kerberosPrincipal = kerberosPrincipal;
+-  }
+-
+-  @JsonProperty("docker_client_config")
+-  @XmlElement(name = "docker_client_config")
+-  @SuppressWarnings("checkstyle:hiddenfield")
+-  public Service dockerClientConfig(String dockerClientConfig) {
+-    this.dockerClientConfig = dockerClientConfig;
+-    return this;
+-  }
+-
+-  /**
+-   * The Docker client config for the service.
+-   * @return dockerClientConfig
+-   */
+-  @ApiModelProperty(value = "The Docker client config for the service")
+-  public String getDockerClientConfig() {
+-    return dockerClientConfig;
+-  }
+-
+-  public void setDockerClientConfig(String dockerClientConfig) {
+-    this.dockerClientConfig = dockerClientConfig;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    Service service = (Service) o;
+-    return Objects.equals(this.name, service.name);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(name);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class Service {\n")
+-
+-        .append("    name: ").append(toIndentedString(name)).append("\n")
+-        .append("    id: ").append(toIndentedString(id)).append("\n")
+-        .append("    version: ").append(toIndentedString(version)).append("\n")
+-        .append("    description: ").append(toIndentedString(description))
+-        .append("\n")
+-        .append("    artifact: ").append(toIndentedString(artifact))
+-        .append("\n")
+-        .append("    resource: ").append(toIndentedString(resource))
+-        .append("\n")
+-        .append("    launchTime: ").append(toIndentedString(launchTime))
+-        .append("\n")
+-        .append("    numberOfRunningContainers: ")
+-        .append(toIndentedString(numberOfRunningContainers)).append("\n")
+-        .append("    lifetime: ").append(toIndentedString(lifetime))
+-        .append("\n")
+-        .append("    components: ").append(toIndentedString(components))
+-        .append("\n")
+-        .append("    configuration: ").append(toIndentedString(configuration))
+-        .append("\n")
+-        .append("    state: ").append(toIndentedString(state)).append("\n")
+-        .append("    quicklinks: ").append(toIndentedString(quicklinks))
+-        .append("\n")
+-        .append("    queue: ").append(toIndentedString(queue)).append("\n")
+-        .append("    kerberosPrincipal: ")
+-        .append(toIndentedString(kerberosPrincipal)).append("\n")
+-        .append("    dockerClientConfig: ")
+-        .append(toIndentedString(dockerClientConfig)).append("\n")
+-        .append("    dependencies: ")
+-        .append(toIndentedString(dependencies)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceState.java
+deleted file mode 100644
+index 3f2f4f6b91d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceState.java
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * The current state of an service.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The current state of an service.")
+-public enum ServiceState {
+-  ACCEPTED, STARTED, STABLE, STOPPED, FAILED, FLEX, UPGRADING,
+-  UPGRADING_AUTO_FINALIZE, EXPRESS_UPGRADING, SUCCEEDED, CANCEL_UPGRADING;
+-
+-  public static boolean isUpgrading(ServiceState state) {
+-    return state.equals(UPGRADING) || state.equals(UPGRADING_AUTO_FINALIZE)
+-        || state.equals(EXPRESS_UPGRADING);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceStatus.java
+deleted file mode 100644
+index 60f8f2d891f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/ServiceStatus.java
++++ /dev/null
+@@ -1,147 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.api.records;
+-
+-import io.swagger.annotations.ApiModel;
+-import io.swagger.annotations.ApiModelProperty;
+-
+-import java.util.Objects;
+-
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-
+-/**
+- * The current status of a submitted service, returned as a response to the
+- * GET API.
+- **/
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-@ApiModel(description = "The current status of a submitted service, returned as a response to the GET API.")
+-@XmlRootElement
+-@JsonInclude(JsonInclude.Include.NON_NULL)
+-public class ServiceStatus extends BaseResource {
+-  private static final long serialVersionUID = -3469885905347851034L;
+-
+-  private String diagnostics = null;
+-  private ServiceState state = null;
+-  private Integer code = null;
+-
+-  /**
+-   * Diagnostic information (if any) for the reason of the current state of the
+-   * service. It typically has a non-null value, if the service is in a
+-   * non-running state.
+-   **/
+-  public ServiceStatus diagnostics(String diagnostics) {
+-    this.diagnostics = diagnostics;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Diagnostic information (if any) for the reason of the current state of the service. It typically has a non-null value, if the service is in a non-running state.")
+-  @JsonProperty("diagnostics")
+-  public String getDiagnostics() {
+-    return diagnostics;
+-  }
+-
+-  public void setDiagnostics(String diagnostics) {
+-    this.diagnostics = diagnostics;
+-  }
+-
+-  /**
+-   * Service state.
+-   **/
+-  public ServiceStatus state(ServiceState state) {
+-    this.state = state;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "Service state.")
+-  @JsonProperty("state")
+-  public ServiceState getState() {
+-    return state;
+-  }
+-
+-  public void setState(ServiceState state) {
+-    this.state = state;
+-  }
+-
+-  /**
+-   * An error code specific to a scenario which service owners should be able to
+-   * use to understand the failure in addition to the diagnostic information.
+-   **/
+-  public ServiceStatus code(Integer code) {
+-    this.code = code;
+-    return this;
+-  }
+-
+-  @ApiModelProperty(example = "null", value = "An error code specific to a scenario which service owners should be able to use to understand the failure in addition to the diagnostic information.")
+-  @JsonProperty("code")
+-  public Integer getCode() {
+-    return code;
+-  }
+-
+-  public void setCode(Integer code) {
+-    this.code = code;
+-  }
+-
+-  @Override
+-  public boolean equals(java.lang.Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    ServiceStatus serviceStatus = (ServiceStatus) o;
+-    return Objects.equals(this.diagnostics, serviceStatus.diagnostics)
+-        && Objects.equals(this.state, serviceStatus.state)
+-        && Objects.equals(this.code, serviceStatus.code);
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return Objects.hash(diagnostics, state, code);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder sb = new StringBuilder();
+-    sb.append("class ServiceStatus {\n")
+-
+-        .append("    diagnostics: ").append(toIndentedString(diagnostics))
+-        .append("\n")
+-        .append("    state: ").append(toIndentedString(state)).append("\n")
+-        .append("    code: ").append(toIndentedString(code)).append("\n")
+-        .append("}");
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Convert the given object to string with each line indented by 4 spaces
+-   * (except the first line).
+-   */
+-  private String toIndentedString(java.lang.Object o) {
+-    if (o == null) {
+-      return "null";
+-    }
+-    return o.toString().replace("\n", "\n    ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ClientAMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ClientAMProxy.java
+deleted file mode 100644
+index e8e7de42c02..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ClientAMProxy.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.io.retry.RetryPolicy;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.client.ServerProxy;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-
+-import java.net.InetSocketAddress;
+-
+-import static org.apache.hadoop.io.retry.RetryPolicies.TRY_ONCE_THEN_FAIL;
+-
+-public class ClientAMProxy extends ServerProxy{
+-
+-  public static <T> T createProxy(final Configuration conf,
+-      final Class<T> protocol, final UserGroupInformation ugi,
+-      final YarnRPC rpc, final InetSocketAddress serverAddress) {
+-    Configuration confClone = new Configuration(conf);
+-    confClone.setInt(
+-        CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY, 0);
+-    confClone.setInt(CommonConfigurationKeysPublic.
+-        IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SOCKET_TIMEOUTS_KEY, 0);
+-    RetryPolicy retryPolicy;
+-
+-    if (conf.getLong(YarnServiceConf.CLIENT_AM_RETRY_MAX_WAIT_MS, 0) == 0) {
+-      // by default no retry
+-      retryPolicy = TRY_ONCE_THEN_FAIL;
+-    } else {
+-      retryPolicy =
+-          createRetryPolicy(conf, YarnServiceConf.CLIENT_AM_RETRY_MAX_WAIT_MS,
+-              YarnServiceConf.DEFAULT_CLIENT_AM_RETRY_MAX_WAIT_MS,
+-              YarnServiceConf.CLIENT_AM_RETRY_MAX_INTERVAL_MS,
+-              YarnServiceConf.DEFAULT_CLIENT_AM_RETRY_MAX_INTERVAL_MS);
+-    }
+-    return createRetriableProxy(confClone, protocol, ugi, rpc, serverAddress,
+-        retryPolicy);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
+deleted file mode 100644
+index 9098bb4a751..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/client/ServiceClient.java
++++ /dev/null
+@@ -1,1804 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+-import org.apache.commons.compress.utils.IOUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.curator.framework.CuratorFramework;
+-import org.apache.curator.framework.CuratorFrameworkFactory;
+-import org.apache.curator.retry.RetryNTimes;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.DFSConfigKeys;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.registry.client.api.RegistryConstants;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.api.RegistryOperationsFactory;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.AccessControlList;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-
+-import org.apache.hadoop.yarn.api.records.*;
+-import org.apache.hadoop.yarn.client.api.AppAdminClient;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.client.api.YarnClientApplication;
+-import org.apache.hadoop.yarn.client.cli.ApplicationCLI;
+-import org.apache.hadoop.yarn.client.util.YarnClientUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.ComponentCountProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-import org.apache.hadoop.yarn.service.ClientAMProtocol;
+-import org.apache.hadoop.yarn.service.ServiceMaster;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile.TypeEnum;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.containerlaunch.ClasspathConstructor;
+-import org.apache.hadoop.yarn.service.containerlaunch.JavaCommandLineBuilder;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-import org.apache.hadoop.yarn.service.exceptions.ErrorStrings;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.provider.ProviderUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceRegistryUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.service.utils.ZookeeperUtils;
+-import org.apache.hadoop.yarn.util.DockerClientConfigHandler;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.util.Times;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.BufferedOutputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.OutputStreamWriter;
+-import java.io.Writer;
+-import java.net.InetSocketAddress;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.ByteBuffer;
+-import java.nio.charset.StandardCharsets;
+-import java.nio.file.Files;
+-import java.text.MessageFormat;
+-import java.util.*;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.stream.Collectors;
+-
+-import static org.apache.hadoop.yarn.api.records.YarnApplicationState.*;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.*;
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.jsonSerDeser;
+-import static org.apache.hadoop.yarn.service.utils.ServiceUtils.*;
+-
+-@InterfaceAudience.Public
+-@InterfaceStability.Unstable
+-public class ServiceClient extends AppAdminClient implements SliderExitCodes,
+-    YarnServiceConstants {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceClient.class);
+-  private SliderFileSystem fs;
+-  //TODO disable retry so that client / rest API doesn't block?
+-  protected YarnClient yarnClient;
+-  // Avoid looking up applicationId from fs all the time.
+-  private Map<String, AppInfo> cachedAppInfo = new ConcurrentHashMap<>();
+-
+-  private RegistryOperations registryClient;
+-  private CuratorFramework curatorClient;
+-  private YarnRPC rpc;
+-
+-  private static EnumSet<YarnApplicationState> terminatedStates =
+-      EnumSet.of(FINISHED, FAILED, KILLED);
+-  private static EnumSet<YarnApplicationState> liveStates =
+-      EnumSet.of(NEW, NEW_SAVING, SUBMITTED, ACCEPTED, RUNNING);
+-  private static EnumSet<YarnApplicationState> preRunningStates =
+-      EnumSet.of(NEW, NEW_SAVING, SUBMITTED, ACCEPTED);
+-
+-  @Override protected void serviceInit(Configuration configuration)
+-      throws Exception {
+-    fs = new SliderFileSystem(configuration);
+-    yarnClient = YarnClient.createYarnClient();
+-    rpc = YarnRPC.create(configuration);
+-    addService(yarnClient);
+-    super.serviceInit(configuration);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (registryClient != null) {
+-      registryClient.stop();
+-    }
+-    fs.getFileSystem().close();
+-    super.serviceStop();
+-  }
+-
+-  public Service loadAppJsonFromLocalFS(String fileName, String serviceName,
+-      Long lifetime, String queue) throws IOException, YarnException {
+-    File file = new File(fileName);
+-    if (!file.exists() && fileName.equals(file.getName())) {
+-      String examplesDirStr = System.getenv("YARN_SERVICE_EXAMPLES_DIR");
+-      String[] examplesDirs;
+-      if (examplesDirStr == null) {
+-        String yarnHome = System
+-            .getenv(ApplicationConstants.Environment.HADOOP_YARN_HOME.key());
+-        examplesDirs = new String[]{
+-            yarnHome + "/share/hadoop/yarn/yarn-service-examples",
+-            yarnHome + "/yarn-service-examples"
+-        };
+-      } else {
+-        examplesDirs = StringUtils.split(examplesDirStr, ":");
+-      }
+-      for (String dir : examplesDirs) {
+-        file = new File(MessageFormat.format("{0}/{1}/{2}.json",
+-            dir, fileName, fileName));
+-        if (file.exists()) {
+-          break;
+-        }
+-        // Then look for secondary location.
+-        file = new File(MessageFormat.format("{0}/{1}.json",
+-            dir, fileName));
+-        if (file.exists()) {
+-          break;
+-        }
+-      }
+-    }
+-    if (!file.exists()) {
+-      throw new YarnException("File or example could not be found: " +
+-          fileName);
+-    }
+-    Path filePath = new Path(file.getAbsolutePath());
+-    LOG.info("Loading service definition from local FS: " + filePath);
+-    Service service = jsonSerDeser
+-        .load(FileSystem.getLocal(getConfig()), filePath);
+-    if (!StringUtils.isEmpty(serviceName)) {
+-      service.setName(serviceName);
+-    }
+-    if (lifetime != null && lifetime > 0) {
+-      service.setLifetime(lifetime);
+-    }
+-    if (!StringUtils.isEmpty(queue)) {
+-      service.setQueue(queue);
+-    }
+-    return service;
+-  }
+-
+-  @Override
+-  public int actionSave(String fileName, String serviceName, Long lifetime,
+-      String queue) throws IOException, YarnException {
+-    return actionBuild(loadAppJsonFromLocalFS(fileName, serviceName,
+-        lifetime, queue));
+-  }
+-
+-  public int actionBuild(Service service)
+-      throws YarnException, IOException {
+-    ServiceApiUtil.validateAndResolveService(service, fs, getConfig());
+-    Path appDir = checkAppNotExistOnHdfs(service, false);
+-    ServiceApiUtil.createDirAndPersistApp(fs, appDir, service);
+-    return EXIT_SUCCESS;
+-  }
+-
+-  private ApplicationReport upgradePrecheck(Service service)
+-      throws YarnException, IOException {
+-    boolean upgradeEnabled = getConfig().getBoolean(
+-        YARN_SERVICE_UPGRADE_ENABLED, YARN_SERVICE_UPGRADE_ENABLED_DEFAULT);
+-    if (!upgradeEnabled) {
+-      throw new YarnException(ErrorStrings.SERVICE_UPGRADE_DISABLED);
+-    }
+-    Service persistedService = ServiceApiUtil.loadService(fs,
+-        service.getName());
+-    if (!StringUtils.isEmpty(persistedService.getId())) {
+-      cachedAppInfo.put(persistedService.getName(),
+-          new AppInfo(ApplicationId.fromString(persistedService.getId()),
+-              persistedService.getKerberosPrincipal().getPrincipalName()));
+-    }
+-
+-    if (persistedService.getVersion().equals(service.getVersion())) {
+-      String message = service.getName() + " is already at version "
+-          + service.getVersion() + ". There is nothing to upgrade.";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-    boolean foundNotNeverComp = false;
+-    for (Component comp : persistedService.getComponents()) {
+-      // If restart policy of any component is not NEVER then upgrade is
+-      // allowed.
+-      if (!comp.getRestartPolicy().equals(Component.RestartPolicyEnum.NEVER)) {
+-        foundNotNeverComp = true;
+-        break;
+-      }
+-    }
+-    if (!foundNotNeverComp) {
+-      String message = "All the components of the service " + service.getName()
+-          + " have " + Component.RestartPolicyEnum.NEVER + " restart policy, " +
+-          "so it cannot be upgraded.";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-    Service liveService = getStatus(service.getName());
+-    if (!liveService.getState().equals(ServiceState.STABLE)) {
+-      String message = service.getName() + " is at " + liveService.getState()
+-          + " state and upgrade can only be initiated when service is STABLE.";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-
+-    Path serviceUpgradeDir = checkAppNotExistOnHdfs(service, true);
+-    ServiceApiUtil.validateAndResolveService(service, fs, getConfig());
+-    ServiceApiUtil.createDirAndPersistApp(fs, serviceUpgradeDir, service);
+-
+-    ApplicationReport appReport = yarnClient
+-        .getApplicationReport(getAppId(service.getName()));
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(service.getName() + " AM hostname is empty");
+-    }
+-    return appReport;
+-  }
+-
+-  @Override
+-  public int actionUpgradeExpress(String appName, File path)
+-      throws IOException, YarnException {
+-    Service service =
+-        loadAppJsonFromLocalFS(path.getAbsolutePath(), appName, null, null);
+-    service.setState(ServiceState.UPGRADING_AUTO_FINALIZE);
+-    actionUpgradeExpress(service);
+-    return EXIT_SUCCESS;
+-  }
+-
+-  public int actionUpgradeExpress(Service service) throws YarnException,
+-      IOException {
+-    ApplicationReport appReport = upgradePrecheck(service);
+-    ClientAMProtocol proxy = createAMProxy(service.getName(), appReport);
+-    UpgradeServiceRequestProto.Builder requestBuilder =
+-        UpgradeServiceRequestProto.newBuilder();
+-    requestBuilder.setVersion(service.getVersion());
+-    if (service.getState().equals(ServiceState.UPGRADING_AUTO_FINALIZE)) {
+-      requestBuilder.setAutoFinalize(true);
+-    }
+-    if (service.getState().equals(ServiceState.EXPRESS_UPGRADING)) {
+-      requestBuilder.setExpressUpgrade(true);
+-      requestBuilder.setAutoFinalize(true);
+-    }
+-    UpgradeServiceResponseProto responseProto = proxy.upgrade(
+-        requestBuilder.build());
+-    if (responseProto.hasError()) {
+-      LOG.error("Service {} express upgrade to version {} failed because {}",
+-          service.getName(), service.getVersion(), responseProto.getError());
+-      throw new YarnException("Failed to express upgrade service " +
+-          service.getName() + " to version " + service.getVersion() +
+-          " because " + responseProto.getError());
+-    }
+-    return EXIT_SUCCESS;
+-  }
+-
+-  @Override
+-  public int initiateUpgrade(String appName, String fileName,
+-      boolean autoFinalize)
+-      throws IOException, YarnException {
+-    Service upgradeService = loadAppJsonFromLocalFS(fileName, appName,
+-        null, null);
+-    if (autoFinalize) {
+-      upgradeService.setState(ServiceState.UPGRADING_AUTO_FINALIZE);
+-    } else {
+-      upgradeService.setState(ServiceState.UPGRADING);
+-    }
+-    return initiateUpgrade(upgradeService);
+-  }
+-
+-  public int initiateUpgrade(Service service) throws YarnException,
+-      IOException {
+-    ApplicationReport appReport = upgradePrecheck(service);
+-    ClientAMProtocol proxy = createAMProxy(service.getName(), appReport);
+-
+-    UpgradeServiceRequestProto.Builder requestBuilder =
+-        UpgradeServiceRequestProto.newBuilder();
+-    requestBuilder.setVersion(service.getVersion());
+-    if (service.getState().equals(ServiceState.UPGRADING_AUTO_FINALIZE)) {
+-      requestBuilder.setAutoFinalize(true);
+-    }
+-    UpgradeServiceResponseProto responseProto = proxy.upgrade(
+-        requestBuilder.build());
+-    if (responseProto.hasError()) {
+-      LOG.error("Service {} upgrade to version {} failed because {}",
+-          service.getName(), service.getVersion(), responseProto.getError());
+-      throw new YarnException("Failed to upgrade service " + service.getName()
+-          + " to version " + service.getVersion() + " because " +
+-          responseProto.getError());
+-    }
+-    return EXIT_SUCCESS;
+-  }
+-
+-  @Override
+-  public int actionUpgradeInstances(String appName,
+-      List<String> componentInstances) throws IOException, YarnException {
+-    checkAppExistOnHdfs(appName);
+-    Service persistedService = ServiceApiUtil.loadService(fs, appName);
+-    List<Container> containersToUpgrade = ServiceApiUtil.
+-        getLiveContainers(persistedService, componentInstances);
+-    ServiceApiUtil.validateInstancesUpgrade(containersToUpgrade);
+-    return actionUpgrade(persistedService, containersToUpgrade);
+-  }
+-
+-  @Override
+-  public int actionUpgradeComponents(String appName,
+-      List<String> components) throws IOException, YarnException {
+-    checkAppExistOnHdfs(appName);
+-    Service persistedService = ServiceApiUtil.loadService(fs, appName);
+-    List<Container> containersToUpgrade = ServiceApiUtil
+-        .validateAndResolveCompsUpgrade(persistedService, components);
+-    return actionUpgrade(persistedService, containersToUpgrade);
+-  }
+-
+-  @Override
+-  public int actionCancelUpgrade(String appName) throws IOException,
+-      YarnException {
+-    Service liveService = getStatus(appName);
+-    if (liveService == null ||
+-        !ServiceState.isUpgrading(liveService.getState())) {
+-      throw new YarnException("Service " + appName + " is not upgrading, " +
+-          "so nothing to cancel.");
+-    }
+-
+-    ApplicationReport appReport = yarnClient.getApplicationReport(
+-        getAppId(appName));
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(appName + " AM hostname is empty");
+-    }
+-    ClientAMProtocol proxy = createAMProxy(appName, appReport);
+-    proxy.cancelUpgrade(CancelUpgradeRequestProto.newBuilder().build());
+-    return EXIT_SUCCESS;
+-  }
+-
+-  @Override
+-  public int actionDecommissionInstances(String appName,
+-      List<String> componentInstances) throws IOException, YarnException {
+-    checkAppExistOnHdfs(appName);
+-    Service persistedService = ServiceApiUtil.loadService(fs, appName);
+-    if (StringUtils.isEmpty(persistedService.getId())) {
+-      throw new YarnException(
+-          persistedService.getName() + " appId is null, may be not submitted " +
+-              "to YARN yet");
+-    }
+-    cachedAppInfo.put(persistedService.getName(), new AppInfo(
+-        ApplicationId.fromString(persistedService.getId()), persistedService
+-        .getKerberosPrincipal().getPrincipalName()));
+-
+-    for (String instance : componentInstances) {
+-      String componentName = ServiceApiUtil.parseComponentName(
+-          ServiceApiUtil.parseAndValidateComponentInstanceName(instance,
+-              appName, getConfig()));
+-      Component component = persistedService.getComponent(componentName);
+-      if (component == null) {
+-        throw new IllegalArgumentException(instance + " does not exist !");
+-      }
+-      if (!component.getDecommissionedInstances().contains(instance)) {
+-        component.addDecommissionedInstance(instance);
+-        component.setNumberOfContainers(Math.max(0, component
+-            .getNumberOfContainers() - 1));
+-      }
+-    }
+-    ServiceApiUtil.writeAppDefinition(fs, persistedService);
+-
+-    ApplicationReport appReport =
+-        yarnClient.getApplicationReport(ApplicationId.fromString(
+-            persistedService.getId()));
+-    if (appReport.getYarnApplicationState() != RUNNING) {
+-      String message =
+-          persistedService.getName() + " is at " + appReport
+-              .getYarnApplicationState() + " state, decommission can only be " +
+-              "invoked when service is running";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(persistedService.getName() + " AM hostname is " +
+-          "empty");
+-    }
+-    ClientAMProtocol proxy =
+-        createAMProxy(persistedService.getName(), appReport);
+-    DecommissionCompInstancesRequestProto.Builder requestBuilder =
+-        DecommissionCompInstancesRequestProto.newBuilder();
+-    requestBuilder.addAllCompInstances(componentInstances);
+-    proxy.decommissionCompInstances(requestBuilder.build());
+-    return EXIT_SUCCESS;
+-  }
+-
+-  @Override
+-  public int actionCleanUp(String appName, String userName) throws
+-      IOException, YarnException {
+-    if (cleanUpRegistry(appName, userName)) {
+-      return EXIT_SUCCESS;
+-    } else {
+-      return EXIT_FALSE;
+-    }
+-  }
+-
+-  @Override
+-  public String getInstances(String appName,
+-      List<String> components, String version, List<String> containerStates)
+-      throws IOException, YarnException {
+-    GetCompInstancesResponseProto result = filterContainers(appName, components,
+-        version, containerStates);
+-    return result.getCompInstances();
+-  }
+-
+-  public ComponentContainers[] getContainers(String appName,
+-      List<String> components,
+-      String version, List<ContainerState> containerStates)
+-      throws IOException, YarnException {
+-    GetCompInstancesResponseProto result = filterContainers(appName, components,
+-        version, containerStates != null ? containerStates.stream()
+-            .map(Enum::toString).collect(Collectors.toList()) : null);
+-
+-    return ServiceApiUtil.COMP_CONTAINERS_JSON_SERDE.fromJson(
+-        result.getCompInstances());
+-  }
+-
+-  private GetCompInstancesResponseProto filterContainers(String appName,
+-      List<String> components, String version,
+-      List<String> containerStates) throws IOException, YarnException {
+-    ApplicationReport appReport = yarnClient.getApplicationReport(getAppId(
+-        appName));
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(appName + " AM hostname is empty.");
+-    }
+-    ClientAMProtocol proxy = createAMProxy(appName, appReport);
+-    GetCompInstancesRequestProto.Builder req = GetCompInstancesRequestProto
+-        .newBuilder();
+-    if (components != null && !components.isEmpty()) {
+-      req.addAllComponentNames(components);
+-    }
+-    if (version != null) {
+-      req.setVersion(version);
+-    }
+-    if (containerStates != null && !containerStates.isEmpty()){
+-      req.addAllContainerStates(containerStates);
+-    }
+-    return proxy.getCompInstances(req.build());
+-  }
+-
+-  public int actionUpgrade(Service service, List<Container> compInstances)
+-      throws IOException, YarnException {
+-    ApplicationReport appReport =
+-        yarnClient.getApplicationReport(getAppId(service.getName()));
+-
+-    if (appReport.getYarnApplicationState() != RUNNING) {
+-      String message = service.getName() + " is at " +
+-          appReport.getYarnApplicationState()
+-          + " state, upgrade can only be invoked when service is running.";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(service.getName() + " AM hostname is empty.");
+-    }
+-    ClientAMProtocol proxy = createAMProxy(service.getName(), appReport);
+-
+-    List<String> containerIdsToUpgrade = new ArrayList<>();
+-    compInstances.forEach(compInst ->
+-        containerIdsToUpgrade.add(compInst.getId()));
+-    LOG.info("instances to upgrade {}", containerIdsToUpgrade);
+-    CompInstancesUpgradeRequestProto.Builder upgradeRequestBuilder =
+-        CompInstancesUpgradeRequestProto.newBuilder();
+-    upgradeRequestBuilder.addAllContainerIds(containerIdsToUpgrade);
+-    proxy.upgrade(upgradeRequestBuilder.build());
+-    return EXIT_SUCCESS;
+-  }
+-
+-  public int actionLaunch(String fileName, String serviceName, Long lifetime,
+-      String queue) throws IOException, YarnException {
+-    actionCreate(loadAppJsonFromLocalFS(fileName, serviceName, lifetime,
+-        queue));
+-    return EXIT_SUCCESS;
+-  }
+-
+-  public ApplicationId actionCreate(Service service)
+-      throws IOException, YarnException {
+-    String serviceName = service.getName();
+-    ServiceApiUtil.validateAndResolveService(service, fs, getConfig());
+-    verifyNoLiveAppInRM(serviceName, "create");
+-    Path appDir = checkAppNotExistOnHdfs(service, false);
+-
+-    // Write the definition first and then submit - AM will read the definition
+-    ServiceApiUtil.createDirAndPersistApp(fs, appDir, service);
+-    ApplicationId appId;
+-    try {
+-      appId = submitApp(service);
+-    } catch(YarnException e){
+-      actionDestroy(serviceName);
+-      throw e;
+-    }
+-    cachedAppInfo.put(serviceName, new AppInfo(appId, service
+-        .getKerberosPrincipal().getPrincipalName()));
+-    service.setId(appId.toString());
+-    // update app definition with appId
+-    ServiceApiUtil.writeAppDefinition(fs, appDir, service);
+-    return appId;
+-  }
+-
+-  public int actionFlex(String serviceName, Map<String, String>
+-      componentCountStrings) throws YarnException, IOException {
+-    Map<String, Long> componentCounts =
+-        new HashMap<>(componentCountStrings.size());
+-    Service persistedService =
+-        ServiceApiUtil.loadService(fs, serviceName);
+-    if (!StringUtils.isEmpty(persistedService.getId())) {
+-      cachedAppInfo.put(persistedService.getName(), new AppInfo(
+-          ApplicationId.fromString(persistedService.getId()),
+-          persistedService.getKerberosPrincipal().getPrincipalName()));
+-    } else {
+-      throw new YarnException(persistedService.getName()
+-          + " appId is null, may be not submitted to YARN yet");
+-    }
+-
+-    for (Map.Entry<String, String> entry : componentCountStrings.entrySet()) {
+-      String compName = entry.getKey();
+-      ServiceApiUtil.validateNameFormat(compName, getConfig());
+-      Component component = persistedService.getComponent(compName);
+-      if (component == null) {
+-        throw new IllegalArgumentException(entry.getKey() + " does not exist !");
+-      }
+-      long numberOfContainers =
+-          parseNumberOfContainers(component, entry.getValue());
+-      componentCounts.put(compName, numberOfContainers);
+-    }
+-    flexComponents(serviceName, componentCounts, persistedService);
+-    return EXIT_SUCCESS;
+-  }
+-
+-  // Parse the number of containers requested by user, e.g.
+-  // +5 means add 5 additional containers
+-  // -5 means reduce 5 containers, if it goes to negative, sets it to 0
+-  // 5 means sets it to 5 containers.
+-  private long parseNumberOfContainers(Component component, String newNumber) {
+-
+-    long orig = component.getNumberOfContainers();
+-    if (newNumber.startsWith("+")) {
+-      return orig + Long.parseLong(newNumber.substring(1));
+-    } else if (newNumber.startsWith("-")) {
+-      long ret = orig - Long.parseLong(newNumber.substring(1));
+-      if (ret < 0) {
+-        LOG.warn(MessageFormat.format(
+-            "[COMPONENT {0}]: component count goes to negative ({1}{2} = {3}),"
+-                + " ignore and reset it to 0.",
+-            component.getName(), orig, newNumber, ret));
+-        ret = 0;
+-      }
+-      return ret;
+-    } else {
+-      return Long.parseLong(newNumber);
+-    }
+-  }
+-
+-  // Called by Rest Service
+-  public Map<String, Long> flexByRestService(String serviceName,
+-      Map<String, Long> componentCounts) throws YarnException, IOException {
+-    // load app definition
+-    Service persistedService = ServiceApiUtil.loadService(fs, serviceName);
+-    if (StringUtils.isEmpty(persistedService.getId())) {
+-      throw new YarnException(
+-          serviceName + " appId is null, may be not submitted to YARN yet");
+-    }
+-    cachedAppInfo.put(persistedService.getName(), new AppInfo(
+-        ApplicationId.fromString(persistedService.getId()), persistedService
+-        .getKerberosPrincipal().getPrincipalName()));
+-    return flexComponents(serviceName, componentCounts, persistedService);
+-  }
+-
+-  private Map<String, Long> flexComponents(String serviceName,
+-      Map<String, Long> componentCounts, Service persistedService)
+-      throws YarnException, IOException {
+-    ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+-
+-    Map<String, Long> original = new HashMap<>(componentCounts.size());
+-
+-    ComponentCountProto.Builder countBuilder = ComponentCountProto.newBuilder();
+-    FlexComponentsRequestProto.Builder requestBuilder =
+-        FlexComponentsRequestProto.newBuilder();
+-
+-    for (Component persistedComp : persistedService.getComponents()) {
+-      String name = persistedComp.getName();
+-      if (componentCounts.containsKey(persistedComp.getName())) {
+-        original.put(name, persistedComp.getNumberOfContainers());
+-        persistedComp.setNumberOfContainers(componentCounts.get(name));
+-
+-        // build the request
+-        countBuilder.setName(persistedComp.getName())
+-            .setNumberOfContainers(persistedComp.getNumberOfContainers());
+-        requestBuilder.addComponents(countBuilder.build());
+-      }
+-    }
+-    if (original.size() < componentCounts.size()) {
+-      componentCounts.keySet().removeAll(original.keySet());
+-      throw new YarnException("Components " + componentCounts.keySet()
+-          + " do not exist in app definition.");
+-    }
+-    ServiceApiUtil.writeAppDefinition(fs, persistedService);
+-
+-    ApplicationId appId = getAppId(serviceName);
+-    if (appId == null) {
+-      String message = "Application ID doesn't exist for " + serviceName;
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-    ApplicationReport appReport =
+-        yarnClient.getApplicationReport(appId);
+-    if (appReport.getYarnApplicationState() != RUNNING) {
+-      String message =
+-          serviceName + " is at " + appReport.getYarnApplicationState()
+-              + " state, flex can only be invoked when service is running";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-
+-    Service liveService = getStatus(serviceName);
+-    if (liveService.getState().equals(ServiceState.UPGRADING) ||
+-        liveService.getState().equals(ServiceState.UPGRADING_AUTO_FINALIZE)) {
+-      String message = serviceName + " is at " +
+-          liveService.getState()
+-          + " state, flex can not be invoked when service is upgrading. ";
+-      LOG.error(message);
+-      throw new YarnException(message);
+-    }
+-
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      throw new YarnException(serviceName + " AM hostname is empty");
+-    }
+-    ClientAMProtocol proxy =
+-        createAMProxy(serviceName, appReport);
+-    proxy.flexComponents(requestBuilder.build());
+-    for (Map.Entry<String, Long> entry : original.entrySet()) {
+-      LOG.info("[COMPONENT {}]: number of containers changed from {} to {}",
+-          entry.getKey(), entry.getValue(),
+-          componentCounts.get(entry.getKey()));
+-    }
+-    return original;
+-  }
+-
+-  @Override
+-  public int actionStop(String serviceName)
+-      throws YarnException, IOException {
+-    return actionStop(serviceName, true);
+-  }
+-
+-  public int actionStop(String serviceName, boolean waitForAppStopped)
+-      throws YarnException, IOException {
+-    ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+-    ApplicationId currentAppId = getAppId(serviceName);
+-    if (currentAppId == null) {
+-      LOG.info("Application ID doesn't exist for service {}", serviceName);
+-      cleanUpRegistry(serviceName);
+-      return EXIT_COMMAND_ARGUMENT_ERROR;
+-    }
+-    ApplicationReport report = yarnClient.getApplicationReport(currentAppId);
+-    if (terminatedStates.contains(report.getYarnApplicationState())) {
+-      LOG.info("Service {} is already in a terminated state {}", serviceName,
+-          report.getYarnApplicationState());
+-      cleanUpRegistry(serviceName);
+-      return EXIT_COMMAND_ARGUMENT_ERROR;
+-    }
+-    if (preRunningStates.contains(report.getYarnApplicationState())) {
+-      String msg = serviceName + " is at " + report.getYarnApplicationState()
+-          + ", forcefully killed by user!";
+-      yarnClient.killApplication(currentAppId, msg);
+-      LOG.info(msg);
+-      cleanUpRegistry(serviceName);
+-      return EXIT_SUCCESS;
+-    }
+-    if (StringUtils.isEmpty(report.getHost())) {
+-      throw new YarnException(serviceName + " AM hostname is empty");
+-    }
+-    LOG.info("Stopping service {}, with appId = {}", serviceName, currentAppId);
+-    try {
+-      ClientAMProtocol proxy =
+-          createAMProxy(serviceName, report);
+-      cachedAppInfo.remove(serviceName);
+-      if (proxy != null) {
+-        // try to stop the app gracefully.
+-        StopRequestProto request = StopRequestProto.newBuilder().build();
+-        proxy.stop(request);
+-        LOG.info("Service " + serviceName + " is being gracefully stopped...");
+-      } else {
+-        yarnClient.killApplication(currentAppId,
+-            serviceName + " is forcefully killed by user!");
+-        LOG.info("Forcefully kill the service: " + serviceName);
+-        cleanUpRegistry(serviceName);
+-        return EXIT_SUCCESS;
+-      }
+-
+-      if (!waitForAppStopped) {
+-        cleanUpRegistry(serviceName);
+-        return EXIT_SUCCESS;
+-      }
+-      // Wait until the app is killed.
+-      long startTime = System.currentTimeMillis();
+-      int pollCount = 0;
+-      while (true) {
+-        Thread.sleep(2000);
+-        report = yarnClient.getApplicationReport(currentAppId);
+-        if (terminatedStates.contains(report.getYarnApplicationState())) {
+-          LOG.info("Service " + serviceName + " is stopped.");
+-          break;
+-        }
+-        // Forcefully kill after 10 seconds.
+-        if ((System.currentTimeMillis() - startTime) > 10000) {
+-          LOG.info("Stop operation timeout stopping, forcefully kill the app "
+-              + serviceName);
+-          yarnClient.killApplication(currentAppId,
+-              "Forcefully kill the app by user");
+-          break;
+-        }
+-        if (++pollCount % 10 == 0) {
+-          LOG.info("Waiting for service " + serviceName + " to be stopped.");
+-        }
+-      }
+-    } catch (IOException | YarnException | InterruptedException e) {
+-      LOG.info("Failed to stop " + serviceName + " gracefully due to: "
+-          + e.getMessage() + ", forcefully kill the app.");
+-      yarnClient.killApplication(currentAppId, "Forcefully kill the app");
+-    }
+-    cleanUpRegistry(serviceName);
+-    return EXIT_SUCCESS;
+-  }
+-
+-  @Override
+-  public int actionDestroy(String serviceName) throws YarnException,
+-      IOException {
+-    ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+-    verifyNoLiveAppInRM(serviceName, "destroy");
+-
+-    Path appDir = fs.buildClusterDirPath(serviceName);
+-    FileSystem fileSystem = fs.getFileSystem();
+-    // remove from the appId cache
+-    cachedAppInfo.remove(serviceName);
+-    int ret = EXIT_SUCCESS;
+-    if (fileSystem.exists(appDir)) {
+-      if (fileSystem.delete(appDir, true)) {
+-        LOG.info("Successfully deleted service dir for " + serviceName + ": "
+-            + appDir);
+-      } else {
+-        String message =
+-            "Failed to delete service + " + serviceName + " at:  " + appDir;
+-        LOG.info(message);
+-        throw new YarnException(message);
+-      }
+-    } else {
+-      LOG.info("Service '" + serviceName + "' doesn't exist at hdfs path: "
+-          + appDir);
+-      ret = EXIT_NOT_FOUND;
+-    }
+-
+-    // Delete Public Resource Dir
+-    Path publicResourceDir = new Path(fs.getBasePath(), serviceName);
+-    if (fileSystem.exists(publicResourceDir)) {
+-      if (fileSystem.delete(publicResourceDir, true)) {
+-        LOG.info("Successfully deleted public resource dir for "
+-            + serviceName + ": " + publicResourceDir);
+-      } else {
+-        String message = "Failed to delete public resource dir for service "
+-            + serviceName + " at:  " + publicResourceDir;
+-        LOG.info(message);
+-        throw new YarnException(message);
+-      }
+-    }
+-
+-    try {
+-      deleteZKNode(serviceName);
+-      // don't set destroySucceed to false if no ZK node exists because not
+-      // all services use a ZK node
+-    } catch (Exception e) {
+-      throw new IOException("Could not delete zk node for " + serviceName, e);
+-    }
+-    if (!cleanUpRegistry(serviceName)) {
+-      if (ret == EXIT_SUCCESS) {
+-        ret = EXIT_OTHER_FAILURE;
+-      }
+-    }
+-    if (ret == EXIT_SUCCESS) {
+-      LOG.info("Successfully destroyed service {}", serviceName);
+-      return ret;
+-    } else if (ret == EXIT_NOT_FOUND) {
+-      LOG.error("Error on destroy '" + serviceName + "': not found.");
+-      return ret;
+-    } else {
+-      LOG.error("Error on destroy '" + serviceName + "': error cleaning up " +
+-          "registry.");
+-      return ret;
+-    }
+-  }
+-
+-  private boolean cleanUpRegistry(String serviceName, String user) throws
+-      SliderException {
+-    String encodedName = RegistryUtils.registryUser(user);
+-
+-    String registryPath = RegistryUtils.servicePath(encodedName,
+-        YarnServiceConstants.APP_TYPE, serviceName);
+-    return cleanUpRegistryPath(registryPath, serviceName);
+-  }
+-
+-  private boolean cleanUpRegistry(String serviceName) throws SliderException {
+-    String registryPath =
+-        ServiceRegistryUtils.registryPathForInstance(serviceName);
+-    return cleanUpRegistryPath(registryPath, serviceName);
+-  }
+-
+-  private boolean cleanUpRegistryPath(String registryPath, String
+-      serviceName) throws SliderException {
+-    try {
+-      if (getRegistryClient().exists(registryPath)) {
+-        getRegistryClient().delete(registryPath, true);
+-      } else {
+-        LOG.info(
+-            "Service '" + serviceName + "' doesn't exist at ZK registry path: "
+-                + registryPath);
+-        // not counted as a failure if the registry entries don't exist
+-      }
+-    } catch (IOException e) {
+-      LOG.warn("Error deleting registry entry {}", registryPath, e);
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  private synchronized RegistryOperations getRegistryClient()
+-      throws SliderException, IOException {
+-
+-    if (registryClient == null) {
+-      registryClient =
+-          RegistryOperationsFactory.createInstance("ServiceClient", getConfig());
+-      registryClient.init(getConfig());
+-      registryClient.start();
+-    }
+-    return registryClient;
+-  }
+-
+-  /**
+-   * Delete service's ZK node. This is a different node from the service's
+-   * registry entry and is set aside for the service to use for its own ZK data.
+-   *
+-   * @param serviceName service name
+-   * @return true if the node was deleted, false if the node doesn't exist
+-   * @throws Exception if the node couldn't be deleted
+-   */
+-  private boolean deleteZKNode(String serviceName) throws Exception {
+-    CuratorFramework curatorFramework = getCuratorClient();
+-    String user = RegistryUtils.currentUser();
+-    String zkPath = ServiceRegistryUtils.mkServiceHomePath(user, serviceName);
+-    if (curatorFramework.checkExists().forPath(zkPath) != null) {
+-      curatorFramework.delete().deletingChildrenIfNeeded().forPath(zkPath);
+-      LOG.info("Deleted zookeeper path: " + zkPath);
+-      return true;
+-    } else {
+-      LOG.info(
+-          "Service '" + serviceName + "' doesn't exist at ZK path: " + zkPath);
+-      return false;
+-    }
+-  }
+-
+-  private synchronized CuratorFramework getCuratorClient()
+-      throws BadConfigException {
+-    String registryQuorum =
+-        getConfig().get(RegistryConstants.KEY_REGISTRY_ZK_QUORUM);
+-
+-    // though if neither is set: trouble
+-    if (ServiceUtils.isUnset(registryQuorum)) {
+-      throw new BadConfigException(
+-          "No Zookeeper quorum provided in the" + " configuration property "
+-              + RegistryConstants.KEY_REGISTRY_ZK_QUORUM);
+-    }
+-    ZookeeperUtils.splitToHostsAndPortsStrictly(registryQuorum);
+-
+-    if (curatorClient == null) {
+-      curatorClient =
+-          CuratorFrameworkFactory.builder().connectString(registryQuorum)
+-              .sessionTimeoutMs(10000).retryPolicy(new RetryNTimes(5, 2000))
+-              .build();
+-      curatorClient.start();
+-    }
+-    return curatorClient;
+-  }
+-
+-  private void verifyNoLiveAppInRM(String serviceName, String action)
+-      throws IOException, YarnException {
+-    Set<String> types = new HashSet<>(1);
+-    types.add(YarnServiceConstants.APP_TYPE);
+-    Set<String> tags = null;
+-    if (serviceName != null) {
+-      tags = Collections.singleton(ServiceUtils.createNameTag(serviceName));
+-    }
+-    GetApplicationsRequest request = GetApplicationsRequest.newInstance();
+-    request.setApplicationTypes(types);
+-    request.setApplicationTags(tags);
+-    request.setApplicationStates(liveStates);
+-    String user = UserGroupInformation.getCurrentUser().getUserName();
+-    if (user != null) {
+-      request.setUsers(Collections.singleton(user));
+-    }
+-    List<ApplicationReport> reports = yarnClient.getApplications(request);
+-    if (!reports.isEmpty()) {
+-      String message = "";
+-      if (action.equals("destroy")) {
+-        message = "Failed to destroy service " + serviceName
+-            + ", because it is still running.";
+-      } else {
+-        message = "Failed to " + action + " service " + serviceName
+-            + ", because it already exists.";
+-      }
+-      throw new YarnException(message);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  ApplicationId submitApp(Service app) throws IOException, YarnException {
+-    String serviceName = app.getName();
+-    Configuration conf = getConfig();
+-    Path appRootDir = fs.buildClusterDirPath(app.getName());
+-
+-    YarnClientApplication yarnApp = yarnClient.createApplication();
+-    ApplicationSubmissionContext submissionContext =
+-        yarnApp.getApplicationSubmissionContext();
+-    ServiceApiUtil.validateCompResourceSize(
+-        yarnApp.getNewApplicationResponse().getMaximumResourceCapability(),
+-        app);
+-
+-    submissionContext.setKeepContainersAcrossApplicationAttempts(true);
+-    if (app.getLifetime() > 0) {
+-      Map<ApplicationTimeoutType, Long> appTimeout = new HashMap<>();
+-      appTimeout.put(ApplicationTimeoutType.LIFETIME, app.getLifetime());
+-      submissionContext.setApplicationTimeouts(appTimeout);
+-    }
+-    submissionContext.setMaxAppAttempts(YarnServiceConf
+-        .getInt(YarnServiceConf.AM_RESTART_MAX, DEFAULT_AM_RESTART_MAX, app
+-            .getConfiguration(), conf));
+-    submissionContext.setAttemptFailuresValidityInterval(YarnServiceConf
+-        .getLong(YarnServiceConf.AM_FAILURES_VALIDITY_INTERVAL,
+-            DEFAULT_AM_FAILURES_VALIDITY_INTERVAL, app.getConfiguration(),
+-            conf));
+-
+-    setLogAggregationContext(app, conf, submissionContext);
+-
+-    Map<String, LocalResource> localResources = new HashMap<>();
+-
+-    // copy local slideram-log4j.properties to hdfs and add to localResources
+-    boolean hasAMLog4j =
+-        addAMLog4jResource(serviceName, conf, localResources);
+-    // copy jars to hdfs and add to localResources
+-    addJarResource(serviceName, localResources);
+-    // add keytab if in secure env
+-    addKeytabResourceIfSecure(fs, localResources, app);
+-    // add yarn sysfs to localResources
+-    addYarnSysFs(appRootDir, localResources, app);
+-    if (LOG.isDebugEnabled()) {
+-      printLocalResources(localResources);
+-    }
+-    Map<String, String> env = addAMEnv();
+-
+-    // create AM CLI
+-    String cmdStr = buildCommandLine(app, conf, appRootDir, hasAMLog4j);
+-    submissionContext.setResource(Resource.newInstance(YarnServiceConf
+-        .getLong(YarnServiceConf.AM_RESOURCE_MEM,
+-            YarnServiceConf.DEFAULT_KEY_AM_RESOURCE_MEM,
+-            app.getConfiguration(), conf), 1));
+-    String queue = app.getQueue();
+-    if (StringUtils.isEmpty(queue)) {
+-      queue = conf.get(YARN_QUEUE, DEFAULT_YARN_QUEUE);
+-    }
+-    submissionContext.setQueue(queue);
+-    submissionContext.setApplicationName(serviceName);
+-    submissionContext.setApplicationType(YarnServiceConstants.APP_TYPE);
+-    Set<String> appTags =
+-        AbstractClientProvider.createApplicationTags(serviceName, null, null);
+-    if (!appTags.isEmpty()) {
+-      submissionContext.setApplicationTags(appTags);
+-    }
+-    ContainerLaunchContext amLaunchContext =
+-        Records.newRecord(ContainerLaunchContext.class);
+-    amLaunchContext.setCommands(Collections.singletonList(cmdStr));
+-    amLaunchContext.setEnvironment(env);
+-    amLaunchContext.setLocalResources(localResources);
+-    addCredentials(amLaunchContext, app);
+-    submissionContext.setAMContainerSpec(amLaunchContext);
+-    yarnClient.submitApplication(submissionContext);
+-    return submissionContext.getApplicationId();
+-  }
+-
+-  /**
+-   * Compress (tar) the input files to the output file.
+-   *
+-   * @param files The files to compress
+-   * @param output The resulting output file (should end in .tar.gz)
+-   * @param bundleRoot
+-   * @throws IOException
+-   */
+-  public static File compressFiles(Collection<File> files, File output,
+-      String bundleRoot) throws IOException {
+-    try (FileOutputStream fos = new FileOutputStream(output);
+-        TarArchiveOutputStream taos = new TarArchiveOutputStream(
+-            new BufferedOutputStream(fos))) {
+-      taos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+-      for (File f : files) {
+-        addFilesToCompression(taos, f, "sysfs", bundleRoot);
+-      }
+-    }
+-    return output;
+-  }
+-
+-  /**
+-   * Compile file list for compression and going recursive for
+-   * nested directories.
+-   *
+-   * @param taos The archive
+-   * @param file The file to add to the archive
+-   * @param dir The directory that should serve as
+-   *            the parent directory in the archive
+-   * @throws IOException
+-   */
+-  private static void addFilesToCompression(TarArchiveOutputStream taos,
+-      File file, String dir, String bundleRoot) throws IOException {
+-    if (!file.isHidden()) {
+-      // Create an entry for the file
+-      if (!dir.equals(".")) {
+-        if (File.separator.equals("\\")) {
+-          dir = dir.replaceAll("\\\\", "/");
+-        }
+-      }
+-      taos.putArchiveEntry(
+-          new TarArchiveEntry(file, dir + "/" + file.getName()));
+-      if (file.isFile()) {
+-        // Add the file to the archive
+-        try (FileInputStream input = new FileInputStream(file)) {
+-          IOUtils.copy(input, taos);
+-          taos.closeArchiveEntry();
+-        }
+-      } else if (file.isDirectory()) {
+-        // close the archive entry
+-        if (!dir.equals(".")) {
+-          taos.closeArchiveEntry();
+-        }
+-        // go through all the files in the directory and using recursion, add
+-        // them to the archive
+-        File[] allFiles = file.listFiles();
+-        if (allFiles != null) {
+-          for (File childFile : allFiles) {
+-            addFilesToCompression(taos, childFile,
+-                file.getPath().substring(bundleRoot.length()), bundleRoot);
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  private void addYarnSysFs(Path path,
+-      Map<String, LocalResource> localResources, Service app)
+-          throws IOException {
+-    List<Component> componentsWithYarnSysFS = new ArrayList<Component>();
+-    for(Component c : app.getComponents()) {
+-      boolean enabled = Boolean.parseBoolean(c.getConfiguration()
+-          .getEnv(ApplicationConstants.Environment
+-              .YARN_CONTAINER_RUNTIME_YARN_SYSFS_ENABLE.name()));
+-      if (enabled) {
+-        componentsWithYarnSysFS.add(c);
+-      }
+-    }
+-    if(componentsWithYarnSysFS.size() == 0) {
+-      return;
+-    }
+-    String buffer = ServiceApiUtil.jsonSerDeser.toJson(app);
+-    File testDir =
+-        new File(System.getProperty("java.io.tmpdir"));
+-    File tmpDir = Files.createTempDirectory(
+-        testDir.toPath(), System.currentTimeMillis() + "-").toFile();
+-    if (tmpDir.exists()) {
+-      String serviceJsonPath = tmpDir.getAbsolutePath() + "/app.json";
+-      File localFile = new File(serviceJsonPath);
+-      if (localFile.createNewFile()) {
+-        try (Writer writer = new OutputStreamWriter(
+-            new FileOutputStream(localFile), StandardCharsets.UTF_8)) {
+-          writer.write(buffer);
+-        }
+-      } else {
+-        throw new IOException("Fail to write app.json to temp directory");
+-      }
+-      File destinationFile = new File(tmpDir.getAbsolutePath() + "/sysfs.tar");
+-      if (!destinationFile.createNewFile()) {
+-        throw new IOException("Fail to localize sysfs.tar.");
+-      }
+-      List<File> files = new ArrayList<File>();
+-      files.add(localFile);
+-      compressFiles(files, destinationFile, "sysfs");
+-      LocalResource localResource =
+-          fs.submitFile(destinationFile, path, ".", "sysfs.tar");
+-      Path serviceJson = new Path(path, "sysfs.tar");
+-      for (Component c  : componentsWithYarnSysFS) {
+-        ConfigFile e = new ConfigFile();
+-        e.type(TypeEnum.ARCHIVE);
+-        e.srcFile(serviceJson.toString());
+-        e.destFile("/hadoop/yarn");
+-        if (!c.getConfiguration().getFiles().contains(e)) {
+-          c.getConfiguration().getFiles().add(e);
+-        }
+-      }
+-      localResources.put("sysfs", localResource);
+-      if (!tmpDir.delete()) {
+-        LOG.warn("Failed to delete temp file: " + tmpDir.getAbsolutePath());
+-      }
+-    } else {
+-      throw new IOException("Fail to localize sysfs resource.");
+-    }
+-  }
+-
+-  private void setLogAggregationContext(Service app, Configuration conf,
+-      ApplicationSubmissionContext submissionContext) {
+-    LogAggregationContext context = Records.newRecord(LogAggregationContext
+-        .class);
+-    String finalLogInclude = YarnServiceConf.get
+-        (FINAL_LOG_INCLUSION_PATTERN, null, app.getConfiguration(), conf);
+-    if (!StringUtils.isEmpty(finalLogInclude)) {
+-      context.setIncludePattern(finalLogInclude);
+-    }
+-    String finalLogExclude = YarnServiceConf.get
+-        (FINAL_LOG_EXCLUSION_PATTERN, null, app.getConfiguration(), conf);
+-    if (!StringUtils.isEmpty(finalLogExclude)) {
+-      context.setExcludePattern(finalLogExclude);
+-    }
+-    String rollingLogInclude = YarnServiceConf.get
+-        (ROLLING_LOG_INCLUSION_PATTERN, null, app.getConfiguration(), conf);
+-    if (!StringUtils.isEmpty(rollingLogInclude)) {
+-      context.setRolledLogsIncludePattern(rollingLogInclude);
+-    }
+-    String rollingLogExclude = YarnServiceConf.get
+-        (ROLLING_LOG_EXCLUSION_PATTERN, null, app.getConfiguration(), conf);
+-    if (!StringUtils.isEmpty(rollingLogExclude)) {
+-      context.setRolledLogsExcludePattern(rollingLogExclude);
+-    }
+-    submissionContext.setLogAggregationContext(context);
+-  }
+-
+-  private void printLocalResources(Map<String, LocalResource> map) {
+-    LOG.debug("Added LocalResource for localization: ");
+-    StringBuilder builder = new StringBuilder();
+-    for (Map.Entry<String, LocalResource> entry : map.entrySet()) {
+-      builder.append(entry.getKey()).append(" -> ")
+-          .append(entry.getValue().getResource().getFile())
+-          .append(System.lineSeparator());
+-    }
+-    LOG.debug("{}", builder);
+-  }
+-
+-  private String buildCommandLine(Service app, Configuration conf,
+-      Path appRootDir, boolean hasSliderAMLog4j) throws BadConfigException {
+-    JavaCommandLineBuilder CLI = new JavaCommandLineBuilder();
+-    CLI.forceIPv4().headless();
+-    String jvmOpts = YarnServiceConf
+-        .get(YarnServiceConf.JVM_OPTS, "", app.getConfiguration(), conf);
+-    if (!jvmOpts.contains("-Xmx")) {
+-      jvmOpts += DEFAULT_AM_JVM_XMX;
+-    }
+-
+-    // validate possible command injection.
+-    ServiceApiUtil.validateJvmOpts(jvmOpts);
+-
+-    CLI.setJVMOpts(jvmOpts);
+-    if (hasSliderAMLog4j) {
+-      CLI.sysprop(SYSPROP_LOG4J_CONFIGURATION, YARN_SERVICE_LOG4J_FILENAME);
+-      CLI.sysprop(SYSPROP_LOG_DIR, ApplicationConstants.LOG_DIR_EXPANSION_VAR);
+-    }
+-    CLI.add(ServiceMaster.class.getCanonicalName());
+-    //TODO debugAM CLI.add(Arguments.ARG_DEBUG)
+-    CLI.add("-" + ServiceMaster.YARNFILE_OPTION, new Path(appRootDir,
+-        app.getName() + ".json"));
+-    CLI.add("-" + ServiceMaster.SERVICE_NAME_OPTION, app.getName());
+-    if (app.getKerberosPrincipal() != null) {
+-      if (!StringUtils.isEmpty(app.getKerberosPrincipal().getKeytab())) {
+-        CLI.add("-" + ServiceMaster.KEYTAB_OPTION,
+-            app.getKerberosPrincipal().getKeytab());
+-      }
+-      if (!StringUtils.isEmpty(app.getKerberosPrincipal().getPrincipalName())) {
+-        CLI.add("-" + ServiceMaster.PRINCIPAL_NAME_OPTION,
+-            app.getKerberosPrincipal().getPrincipalName());
+-      }
+-    }
+-    // pass the registry binding
+-    CLI.addConfOptionToCLI(conf, RegistryConstants.KEY_REGISTRY_ZK_ROOT,
+-        RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT);
+-    CLI.addMandatoryConfOption(conf, RegistryConstants.KEY_REGISTRY_ZK_QUORUM);
+-
+-    // write out the path output
+-    CLI.addOutAndErrFiles(STDOUT_AM, STDERR_AM);
+-    String cmdStr = CLI.build();
+-    LOG.debug("AM launch command: {}", cmdStr);
+-    return cmdStr;
+-  }
+-
+-  @VisibleForTesting
+-  protected Map<String, String> addAMEnv() throws IOException {
+-    Map<String, String> env = new HashMap<>();
+-    ClasspathConstructor classpath = buildClasspath(
+-        YarnServiceConstants.SUBMITTED_CONF_DIR,
+-        "lib",
+-        fs,
+-        getConfig().get(YarnServiceConf.YARN_SERVICE_CLASSPATH, ""),
+-        getConfig().getBoolean(YarnConfiguration.IS_MINI_YARN_CLUSTER, false));
+-    env.put("CLASSPATH", classpath.buildClasspath());
+-    env.put("LANG", "en_US.UTF-8");
+-    env.put("LC_ALL", "en_US.UTF-8");
+-    env.put("LANGUAGE", "en_US.UTF-8");
+-    String jaas = System.getenv("HADOOP_JAAS_DEBUG");
+-    if (jaas != null) {
+-      env.put("HADOOP_JAAS_DEBUG", jaas);
+-    }
+-    if (!UserGroupInformation.isSecurityEnabled()) {
+-      String userName = UserGroupInformation.getCurrentUser().getUserName();
+-      LOG.debug("Run as user {}", userName);
+-      // HADOOP_USER_NAME env is used by UserGroupInformation when log in
+-      // This env makes AM run as this user
+-      env.put("HADOOP_USER_NAME", userName);
+-    }
+-    LOG.debug("AM env: \n{}", stringifyMap(env));
+-    return env;
+-  }
+-
+-  protected Path addJarResource(String serviceName,
+-      Map<String, LocalResource> localResources)
+-      throws IOException, YarnException {
+-    Path libPath = fs.buildClusterDirPath(serviceName);
+-    ProviderUtils
+-        .addProviderJar(localResources, ServiceMaster.class, SERVICE_CORE_JAR, fs,
+-            libPath, "lib", false);
+-    Path dependencyLibTarGzip = fs.getDependencyTarGzip();
+-    if (actionDependency(null, false) == EXIT_SUCCESS) {
+-      LOG.info("Loading lib tar from " + dependencyLibTarGzip);
+-      fs.submitTarGzipAndUpdate(localResources);
+-    } else {
+-      if (dependencyLibTarGzip != null) {
+-        LOG.warn("Property {} has a value {}, but is not a valid file",
+-            YarnServiceConf.DEPENDENCY_TARBALL_PATH, dependencyLibTarGzip);
+-      }
+-      String[] libs = ServiceUtils.getLibDirs();
+-      LOG.info("Uploading all dependency jars to HDFS. For faster submission of"
+-          + " apps, set config property {} to the dependency tarball location."
+-          + " Dependency tarball can be uploaded to any HDFS path directly"
+-          + " or by using command: yarn app -{} [<Destination Folder>]",
+-          YarnServiceConf.DEPENDENCY_TARBALL_PATH,
+-          ApplicationCLI.ENABLE_FAST_LAUNCH);
+-      for (String libDirProp : libs) {
+-        ProviderUtils.addAllDependencyJars(localResources, fs, libPath, "lib",
+-            libDirProp);
+-      }
+-    }
+-    return libPath;
+-  }
+-
+-  private boolean addAMLog4jResource(String serviceName, Configuration conf,
+-      Map<String, LocalResource> localResources)
+-      throws IOException, BadClusterStateException {
+-    boolean hasAMLog4j = false;
+-    String hadoopConfDir =
+-        System.getenv(ApplicationConstants.Environment.HADOOP_CONF_DIR.name());
+-    if (hadoopConfDir != null) {
+-      File localFile =
+-          new File(hadoopConfDir, YarnServiceConstants.YARN_SERVICE_LOG4J_FILENAME);
+-      if (localFile.exists()) {
+-        Path localFilePath = createLocalPath(localFile);
+-        Path appDirPath = fs.buildClusterDirPath(serviceName);
+-        Path remoteConfPath =
+-            new Path(appDirPath, YarnServiceConstants.SUBMITTED_CONF_DIR);
+-        Path remoteFilePath =
+-            new Path(remoteConfPath, YarnServiceConstants.YARN_SERVICE_LOG4J_FILENAME);
+-        copy(conf, localFilePath, remoteFilePath);
+-        LocalResource localResource =
+-            fs.createAmResource(remoteConfPath, LocalResourceType.FILE,
+-            LocalResourceVisibility.APPLICATION);
+-        localResources.put(localFilePath.getName(), localResource);
+-        hasAMLog4j = true;
+-      } else {
+-        LOG.warn("AM log4j property file doesn't exist: " + localFile);
+-      }
+-    }
+-    return hasAMLog4j;
+-  }
+-
+-  @Override
+-  public int actionStart(String serviceName) throws YarnException, IOException {
+-    actionStartAndGetId(serviceName);
+-    return EXIT_SUCCESS;
+-  }
+-
+-  public ApplicationId actionStartAndGetId(String serviceName) throws
+-      YarnException, IOException {
+-    ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+-    Service liveService = getStatus(serviceName);
+-    if (liveService == null ||
+-        !liveService.getState().equals(ServiceState.UPGRADING)) {
+-      Path appDir = checkAppExistOnHdfs(serviceName);
+-      Service service = ServiceApiUtil.loadService(fs, serviceName);
+-      ServiceApiUtil.validateAndResolveService(service, fs, getConfig());
+-      // see if it is actually running and bail out;
+-      verifyNoLiveAppInRM(serviceName, "start");
+-      ApplicationId appId;
+-      try {
+-        appId = submitApp(service);
+-      } catch (YarnException e) {
+-        actionDestroy(serviceName);
+-        throw e;
+-      }
+-      cachedAppInfo.put(serviceName, new AppInfo(appId, service
+-          .getKerberosPrincipal().getPrincipalName()));
+-      service.setId(appId.toString());
+-      // write app definition on to hdfs
+-      Path appJson = ServiceApiUtil.writeAppDefinition(fs, appDir, service);
+-      LOG.info("Persisted service " + service.getName() + " at " + appJson);
+-      return appId;
+-    } else {
+-      LOG.info("Finalize service {} upgrade", serviceName);
+-      ApplicationId appId = getAppId(serviceName);
+-      ApplicationReport appReport = yarnClient.getApplicationReport(appId);
+-      if (StringUtils.isEmpty(appReport.getHost())) {
+-        throw new YarnException(serviceName + " AM hostname is empty");
+-      }
+-      ClientAMProtocol proxy = createAMProxy(serviceName, appReport);
+-
+-      RestartServiceRequestProto.Builder requestBuilder =
+-          RestartServiceRequestProto.newBuilder();
+-      proxy.restart(requestBuilder.build());
+-      return appId;
+-    }
+-  }
+-
+-  /**
+-   * Verifies that the service definition does not exist on hdfs.
+-   *
+-   * @param service   service
+-   * @param isUpgrade true for upgrades; false otherwise
+-   * @return path to the service definition..
+-   * @throws IOException
+-   * @throws SliderException
+-   */
+-  private Path checkAppNotExistOnHdfs(Service service, boolean isUpgrade)
+-      throws IOException, SliderException {
+-    Path appDir = !isUpgrade ? fs.buildClusterDirPath(service.getName()) :
+-        fs.buildClusterUpgradeDirPath(service.getName(), service.getVersion());
+-    fs.verifyDirectoryNonexistent(
+-        new Path(appDir, service.getName() + ".json"));
+-    return appDir;
+-  }
+-
+-  /**
+-   * Verifies that the service exists on hdfs.
+-   * @param serviceName service name
+-   * @return path to the service definition.
+-   * @throws IOException
+-   * @throws SliderException
+-   */
+-  private Path checkAppExistOnHdfs(String serviceName)
+-      throws IOException, SliderException {
+-    Path appDir = fs.buildClusterDirPath(serviceName);
+-    fs.verifyPathExists(new Path(appDir, serviceName + ".json"));
+-    return appDir;
+-  }
+-
+-  private void addCredentials(ContainerLaunchContext amContext, Service app)
+-      throws IOException {
+-    Credentials allCreds = new Credentials();
+-    // HDFS DT
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      String tokenRenewer = YarnClientUtils.getRmPrincipal(getConfig());
+-      if (StringUtils.isEmpty(tokenRenewer)) {
+-        throw new IOException(
+-            "Can't get Master Kerberos principal for the RM to use as renewer");
+-      }
+-      final org.apache.hadoop.security.token.Token<?>[] tokens =
+-          fs.getFileSystem().addDelegationTokens(tokenRenewer, allCreds);
+-      if (LOG.isDebugEnabled()) {
+-        if (tokens != null && tokens.length != 0) {
+-          for (Token<?> token : tokens) {
+-            LOG.debug("Got DT: {}", token);
+-          }
+-        }
+-      }
+-    }
+-
+-    if (!StringUtils.isEmpty(app.getDockerClientConfig())) {
+-      allCreds.addAll(DockerClientConfigHandler.readCredentialsFromConfigFile(
+-          new Path(app.getDockerClientConfig()), getConfig(), app.getName()));
+-    }
+-
+-    if (allCreds.numberOfTokens() > 0) {
+-      DataOutputBuffer dob = new DataOutputBuffer();
+-      allCreds.writeTokenStorageToStream(dob);
+-      ByteBuffer tokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-      amContext.setTokens(tokens);
+-    }
+-  }
+-
+-  private void addKeytabResourceIfSecure(SliderFileSystem fileSystem,
+-      Map<String, LocalResource> localResource, Service service)
+-      throws IOException, YarnException {
+-    if (!UserGroupInformation.isSecurityEnabled()) {
+-      return;
+-    }
+-    String principalName = service.getKerberosPrincipal().getPrincipalName();
+-    if (StringUtils.isEmpty(principalName)) {
+-      LOG.warn("No Kerberos principal name specified for " + service.getName());
+-      return;
+-    }
+-    if (StringUtils.isEmpty(service.getKerberosPrincipal().getKeytab())) {
+-      LOG.warn("No Kerberos keytab specified for " + service.getName());
+-      return;
+-    }
+-
+-    URI keytabURI;
+-    try {
+-      keytabURI = new URI(service.getKerberosPrincipal().getKeytab());
+-    } catch (URISyntaxException e) {
+-      throw new YarnException(e);
+-    }
+-
+-    if ("file".equals(keytabURI.getScheme())) {
+-      LOG.info("Using a keytab from localhost: " + keytabURI);
+-    } else {
+-      Path keytabPath = new Path(keytabURI);
+-      if (!fileSystem.getFileSystem().exists(keytabPath)) {
+-        LOG.warn(service.getName() + "'s keytab (principalName = "
+-            + principalName + ") doesn't exist at: " + keytabPath);
+-        return;
+-      }
+-      LocalResource keytabRes = fileSystem.createAmResource(keytabPath,
+-          LocalResourceType.FILE, LocalResourceVisibility.PRIVATE);
+-      localResource.put(String.format(YarnServiceConstants.KEYTAB_LOCATION,
+-          service.getName()), keytabRes);
+-      LOG.info("Adding " + service.getName() + "'s keytab for "
+-          + "localization, uri = " + keytabPath);
+-    }
+-  }
+-
+-  public String updateLifetime(String serviceName, long lifetime)
+-      throws YarnException, IOException {
+-    ApplicationId currentAppId = getAppId(serviceName);
+-    if (currentAppId == null) {
+-      throw new YarnException("Application ID not found for " + serviceName);
+-    }
+-    ApplicationReport report = yarnClient.getApplicationReport(currentAppId);
+-    if (report == null) {
+-      throw new YarnException("Service not found for " + serviceName);
+-    }
+-    ApplicationId appId = report.getApplicationId();
+-    LOG.info("Updating lifetime of an service: serviceName = " + serviceName
+-        + ", appId = " + appId + ", lifetime = " + lifetime);
+-    Map<ApplicationTimeoutType, String> map = new HashMap<>();
+-    String newTimeout =
+-        Times.formatISO8601(System.currentTimeMillis() + lifetime * 1000);
+-    map.put(ApplicationTimeoutType.LIFETIME, newTimeout);
+-    UpdateApplicationTimeoutsRequest request =
+-        UpdateApplicationTimeoutsRequest.newInstance(appId, map);
+-    yarnClient.updateApplicationTimeouts(request);
+-    LOG.info(
+-        "Successfully updated lifetime for an service: serviceName = " + serviceName
+-            + ", appId = " + appId + ". New expiry time in ISO8601 format is "
+-            + newTimeout);
+-    return newTimeout;
+-  }
+-
+-  public ServiceState convertState(YarnApplicationState state) {
+-    switch (state) {
+-    case NEW:
+-    case NEW_SAVING:
+-    case SUBMITTED:
+-    case ACCEPTED:
+-      return ServiceState.ACCEPTED;
+-    case RUNNING:
+-      return ServiceState.STARTED;
+-    case FINISHED:
+-    case KILLED:
+-      return ServiceState.STOPPED;
+-    case FAILED:
+-      return ServiceState.FAILED;
+-    default:
+-      return ServiceState.ACCEPTED;
+-    }
+-  }
+-
+-  @Override
+-  public String getStatusString(String appIdOrName)
+-      throws IOException, YarnException {
+-    try {
+-      // try parsing appIdOrName, if it succeeds, it means it's appId
+-      ApplicationId appId = ApplicationId.fromString(appIdOrName);
+-      return getStatusByAppId(appId);
+-    } catch (IllegalArgumentException e) {
+-      // not appId format, it could be appName.
+-      Service status = getStatus(appIdOrName);
+-      return ServiceApiUtil.jsonSerDeser.toJson(status);
+-    }
+-  }
+-
+-  private String getStatusByAppId(ApplicationId appId)
+-      throws IOException, YarnException {
+-    ApplicationReport appReport =
+-        yarnClient.getApplicationReport(appId);
+-
+-    if (appReport.getYarnApplicationState() != RUNNING) {
+-      return "";
+-    }
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      return "";
+-    }
+-    ClientAMProtocol amProxy = createAMProxy(appReport.getName(), appReport);
+-    GetStatusResponseProto response =
+-        amProxy.getStatus(GetStatusRequestProto.newBuilder().build());
+-    return response.getStatus();
+-  }
+-
+-  public Service getStatus(String serviceName)
+-      throws IOException, YarnException {
+-    ServiceApiUtil.validateNameFormat(serviceName, getConfig());
+-    Service appSpec = new Service();
+-    appSpec.setName(serviceName);
+-    appSpec.setState(ServiceState.STOPPED);
+-    ApplicationId currentAppId = getAppId(serviceName);
+-    if (currentAppId == null) {
+-      LOG.info("Service {} does not have an application ID", serviceName);
+-      return appSpec;
+-    }
+-    appSpec.setId(currentAppId.toString());
+-    ApplicationReport appReport = null;
+-    try {
+-      appReport = yarnClient.getApplicationReport(currentAppId);
+-    } catch (ApplicationNotFoundException e) {
+-      LOG.info("application ID {} doesn't exist", currentAppId);
+-      return appSpec;
+-    }
+-    if (appReport == null) {
+-      LOG.warn("application ID {} is reported as null", currentAppId);
+-      return appSpec;
+-    }
+-    appSpec.setState(convertState(appReport.getYarnApplicationState()));
+-    ApplicationTimeout lifetime =
+-        appReport.getApplicationTimeouts().get(ApplicationTimeoutType.LIFETIME);
+-    if (lifetime != null) {
+-      appSpec.setLifetime(lifetime.getRemainingTime());
+-    }
+-
+-    if (appReport.getYarnApplicationState() != RUNNING) {
+-      LOG.info("Service {} is at {} state", serviceName,
+-          appReport.getYarnApplicationState());
+-      return appSpec;
+-    }
+-    if (StringUtils.isEmpty(appReport.getHost())) {
+-      LOG.warn(serviceName + " AM hostname is empty");
+-      return appSpec;
+-    }
+-    ClientAMProtocol amProxy =
+-        createAMProxy(serviceName, appReport);
+-    GetStatusResponseProto response =
+-        amProxy.getStatus(GetStatusRequestProto.newBuilder().build());
+-    appSpec = jsonSerDeser.fromJson(response.getStatus());
+-    if (lifetime != null) {
+-      appSpec.setLifetime(lifetime.getRemainingTime());
+-    }
+-    return appSpec;
+-  }
+-
+-  public YarnClient getYarnClient() {
+-    return this.yarnClient;
+-  }
+-
+-  public int enableFastLaunch(String destinationFolder)
+-      throws IOException, YarnException {
+-    return actionDependency(destinationFolder, true);
+-  }
+-
+-  public int actionDependency(String destinationFolder, boolean overwrite) {
+-    String currentUser = RegistryUtils.currentUser();
+-    LOG.info("Running command as user {}", currentUser);
+-
+-    Path dependencyLibTarGzip;
+-    if (destinationFolder == null) {
+-      dependencyLibTarGzip = fs.getDependencyTarGzip();
+-    } else {
+-      dependencyLibTarGzip = new Path(destinationFolder,
+-          YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_NAME
+-              + YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_EXT);
+-    }
+-
+-    // Check if dependency has already been uploaded, in which case log
+-    // appropriately and exit success (unless overwrite has been requested)
+-    if (fs.isFile(dependencyLibTarGzip) && !overwrite) {
+-      System.out.println(String.format(
+-          "Dependency libs are already uploaded to %s.", dependencyLibTarGzip
+-              .toUri()));
+-      return EXIT_SUCCESS;
+-    }
+-
+-    String[] libDirs = ServiceUtils.getLibDirs();
+-    if (libDirs.length > 0) {
+-      File tempLibTarGzipFile = null;
+-      try {
+-        if (!checkPermissions(dependencyLibTarGzip)) {
+-          return EXIT_UNAUTHORIZED;
+-        }
+-
+-        tempLibTarGzipFile = File.createTempFile(
+-            YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_NAME + "_",
+-            YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_EXT);
+-        // copy all jars
+-        tarGzipFolder(libDirs, tempLibTarGzipFile, createJarFilter());
+-
+-        fs.copyLocalFileToHdfs(tempLibTarGzipFile, dependencyLibTarGzip,
+-            new FsPermission(YarnServiceConstants.DEPENDENCY_DIR_PERMISSIONS));
+-        LOG.info("To let apps use this tarball, in yarn-site set config " +
+-                "property {} to {}", YarnServiceConf.DEPENDENCY_TARBALL_PATH,
+-            dependencyLibTarGzip);
+-        return EXIT_SUCCESS;
+-      } catch (IOException e) {
+-        LOG.error("Got exception creating tarball and uploading to HDFS", e);
+-        return EXIT_EXCEPTION_THROWN;
+-      } finally {
+-        if (tempLibTarGzipFile != null) {
+-          if (!tempLibTarGzipFile.delete()) {
+-            LOG.warn("Failed to delete tmp file {}", tempLibTarGzipFile);
+-          }
+-        }
+-      }
+-    } else {
+-      return EXIT_FALSE;
+-    }
+-  }
+-
+-  private boolean checkPermissions(Path dependencyLibTarGzip) throws
+-      IOException {
+-    AccessControlList yarnAdminAcl = new AccessControlList(getConfig().get(
+-        YarnConfiguration.YARN_ADMIN_ACL,
+-        YarnConfiguration.DEFAULT_YARN_ADMIN_ACL));
+-    AccessControlList dfsAdminAcl = new AccessControlList(
+-        getConfig().get(DFSConfigKeys.DFS_ADMIN, " "));
+-    UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+-    if (!yarnAdminAcl.isUserAllowed(ugi) && !dfsAdminAcl.isUserAllowed(ugi)) {
+-      LOG.error("User must be on the {} or {} list to have permission to " +
+-          "upload AM dependency tarball", YarnConfiguration.YARN_ADMIN_ACL,
+-          DFSConfigKeys.DFS_ADMIN);
+-      return false;
+-    }
+-
+-    Path parent = dependencyLibTarGzip.getParent();
+-    while (parent != null) {
+-      if (fs.getFileSystem().exists(parent)) {
+-        FsPermission perm = fs.getFileSystem().getFileStatus(parent)
+-            .getPermission();
+-        if (!perm.getOtherAction().implies(FsAction.READ_EXECUTE)) {
+-          LOG.error("Parent directory {} of {} tarball location {} does not " +
+-              "have world read/execute permission", parent, YarnServiceConf
+-              .DEPENDENCY_TARBALL_PATH, dependencyLibTarGzip);
+-          return false;
+-        }
+-      }
+-      parent = parent.getParent();
+-    }
+-    return true;
+-  }
+-
+-  protected ClientAMProtocol createAMProxy(String serviceName,
+-      ApplicationReport appReport) throws IOException, YarnException {
+-
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      if (!cachedAppInfo.containsKey(serviceName)) {
+-        Service persistedService  = ServiceApiUtil.loadService(fs, serviceName);
+-        cachedAppInfo.put(serviceName, new AppInfo(appReport.getApplicationId(),
+-            persistedService.getKerberosPrincipal().getPrincipalName()));
+-      }
+-      String principalName = cachedAppInfo.get(serviceName).principalName;
+-      // Inject the principal into hadoop conf, because Hadoop
+-      // SaslRpcClient#getServerPrincipal requires a config for the
+-      // principal
+-      if (!StringUtils.isEmpty(principalName)) {
+-        getConfig().set(PRINCIPAL, principalName);
+-      } else {
+-        throw new YarnException("No principal specified in the persisted " +
+-            "service definition, fail to connect to AM.");
+-      }
+-    }
+-    InetSocketAddress address =
+-        NetUtils.createSocketAddrForHost(appReport.getHost(), appReport
+-            .getRpcPort());
+-    return ClientAMProxy.createProxy(getConfig(), ClientAMProtocol.class,
+-        UserGroupInformation.getCurrentUser(), rpc, address);
+-  }
+-
+-  @VisibleForTesting
+-  void setFileSystem(SliderFileSystem fileSystem)
+-      throws IOException {
+-    this.fs = fileSystem;
+-  }
+-
+-  @VisibleForTesting
+-  void setYarnClient(YarnClient yarnClient) {
+-    this.yarnClient = yarnClient;
+-  }
+-
+-  public synchronized ApplicationId getAppId(String serviceName)
+-      throws IOException, YarnException {
+-    if (cachedAppInfo.containsKey(serviceName)) {
+-      return cachedAppInfo.get(serviceName).appId;
+-    }
+-    Service persistedService = ServiceApiUtil.loadService(fs, serviceName);
+-    if (persistedService == null) {
+-      throw new YarnException("Service " + serviceName
+-          + " doesn't exist on hdfs. Please check if the app exists in RM");
+-    }
+-    if (persistedService.getId() == null) {
+-      return null;
+-    }
+-    ApplicationId currentAppId = ApplicationId.fromString(persistedService
+-        .getId());
+-    cachedAppInfo.put(serviceName, new AppInfo(currentAppId, persistedService
+-        .getKerberosPrincipal().getPrincipalName()));
+-    return currentAppId;
+-  }
+-
+-  private static class AppInfo {
+-    ApplicationId appId;
+-    String principalName;
+-
+-    AppInfo(ApplicationId appId, String principalName) {
+-      this.appId = appId;
+-      this.principalName = principalName;
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/AlwaysRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/AlwaysRestartPolicy.java
+deleted file mode 100644
+index 505120d8c25..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/AlwaysRestartPolicy.java
++++ /dev/null
+@@ -1,87 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-/**
+- * Always restart policy allows for restarts for long live components which
+- * never terminate.
+- */
+-public final class AlwaysRestartPolicy implements ComponentRestartPolicy {
+-
+-  private static AlwaysRestartPolicy INSTANCE = new AlwaysRestartPolicy();
+-
+-  private AlwaysRestartPolicy() {
+-  }
+-
+-  public static AlwaysRestartPolicy getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  @Override public boolean isLongLived() {
+-    return true;
+-  }
+-
+-  /**
+-   * This is always false since these components never terminate
+-   *
+-   * @param component
+-   * @return
+-   */
+-  @Override public boolean hasCompleted(Component component) {
+-    return false;
+-  }
+-
+-  /**
+-   * This is always false since these components never terminate
+-   *
+-   * @param component
+-   * @return
+-   */
+-  @Override public boolean hasCompletedSuccessfully(Component component) {
+-    return false;
+-  }
+-
+-  @Override public boolean shouldRelaunchInstance(
+-      ComponentInstance componentInstance, ContainerStatus containerStatus) {
+-    return true;
+-  }
+-
+-  @Override public boolean isReadyForDownStream(Component dependentComponent) {
+-    if (dependentComponent.getNumReadyInstances() < dependentComponent
+-        .getNumDesiredInstances()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean allowUpgrades() {
+-    return true;
+-  }
+-
+-  @Override public boolean shouldTerminate(Component component) {
+-    return false;
+-  }
+-
+-  @Override public boolean allowContainerRetriesForInstance(
+-      ComponentInstance componentInstance) {
+-    return true;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
+deleted file mode 100644
+index 4e9932a9e28..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
++++ /dev/null
+@@ -1,1310 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.ExecutionType;
+-import static org.apache.hadoop.yarn.service.api.records.Component
+-    .RestartPolicyEnum;
+-import org.apache.hadoop.yarn.api.records.ExecutionTypeRequest;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeOpCode;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceSizing;
+-import org.apache.hadoop.yarn.api.records.SchedulingRequest;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraint;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraint.TargetExpression;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraints;
+-import org.apache.hadoop.yarn.api.resource.PlacementConstraints.PlacementTargets;
+-import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.service.ServiceEvent;
+-import org.apache.hadoop.yarn.service.ServiceEventType;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceId;
+-import org.apache.hadoop.yarn.service.ContainerFailureTracker;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceMetrics;
+-import org.apache.hadoop.yarn.service.ServiceScheduler;
+-import org.apache.hadoop.yarn.service.api.records.PlacementPolicy;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.monitor.ComponentHealthThresholdMonitor;
+-import org.apache.hadoop.yarn.service.monitor.probe.MonitorUtils;
+-import org.apache.hadoop.yarn.service.monitor.probe.Probe;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.state.InvalidStateTransitionException;
+-import org.apache.hadoop.yarn.state.MultipleArcTransition;
+-import org.apache.hadoop.yarn.state.SingleArcTransition;
+-import org.apache.hadoop.yarn.state.StateMachine;
+-import org.apache.hadoop.yarn.state.StateMachineFactory;
+-import org.apache.hadoop.yarn.util.Apps;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.text.MessageFormat;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.concurrent.atomic.AtomicLong;
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-
+-import static org.apache.hadoop.yarn.api.records.ContainerExitStatus.*;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.*;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.*;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.CANCEL_UPGRADE;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.UPGRADE;
+-import static org.apache.hadoop.yarn.service.component.ComponentState.*;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.*;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.*;
+-
+-public class Component implements EventHandler<ComponentEvent> {
+-  private static final Logger LOG = LoggerFactory.getLogger(Component.class);
+-
+-  private org.apache.hadoop.yarn.service.api.records.Component componentSpec;
+-  private long allocateId;
+-  private Priority priority;
+-  private ServiceMetrics componentMetrics;
+-  private ServiceScheduler scheduler;
+-  private ServiceContext context;
+-  private AMRMClientAsync<ContainerRequest> amrmClient;
+-  private AtomicLong instanceIdCounter = new AtomicLong();
+-  private Map<String, ComponentInstance> compInstances =
+-      new ConcurrentHashMap<>();
+-  // component instances to be assigned with a container
+-  private List<ComponentInstance> pendingInstances =
+-      Collections.synchronizedList(new LinkedList<>());
+-  private ContainerFailureTracker failureTracker;
+-  private Probe probe;
+-  private final ReentrantReadWriteLock.ReadLock readLock;
+-  private final ReentrantReadWriteLock.WriteLock writeLock;
+-  public int maxContainerFailurePerComp;
+-  // The number of containers failed since last reset. This excludes preempted,
+-  // disk_failed containers etc. This will be reset to 0 periodically.
+-  public AtomicInteger currentContainerFailure = new AtomicInteger(0);
+-
+-  //succeeded and Failed instances are Populated only for RestartPolicyEnum
+-  //.ON_FAILURE/NEVER
+-  private Map<String, ComponentInstance> succeededInstances =
+-      new ConcurrentHashMap<>();
+-  private Map<String, ComponentInstance> failedInstances =
+-      new ConcurrentHashMap<>();
+-  private boolean healthThresholdMonitorEnabled = false;
+-
+-  private UpgradeStatus upgradeStatus = new UpgradeStatus();
+-  private UpgradeStatus cancelUpgradeStatus = new UpgradeStatus();
+-
+-  private StateMachine<ComponentState, ComponentEventType, ComponentEvent>
+-      stateMachine;
+-  private AsyncDispatcher dispatcher;
+-  private static final StateMachineFactory<Component, ComponentState, ComponentEventType, ComponentEvent>
+-      stateMachineFactory =
+-      new StateMachineFactory<Component, ComponentState, ComponentEventType, ComponentEvent>(
+-          INIT)
+-           // INIT will only got to FLEXING
+-          .addTransition(INIT, EnumSet.of(STABLE, FLEXING, INIT),
+-              FLEX, new FlexComponentTransition())
+-          // container recovered on AM restart
+-          .addTransition(INIT, INIT, CONTAINER_RECOVERED,
+-              new ContainerRecoveredTransition())
+-          // instance decommissioned
+-          .addTransition(INIT, INIT, DECOMMISSION_INSTANCE,
+-              new DecommissionInstanceTransition())
+-
+-          // container recovered in AM heartbeat
+-          .addTransition(FLEXING, FLEXING, CONTAINER_RECOVERED,
+-              new ContainerRecoveredTransition())
+-
+-          // container allocated by RM
+-          .addTransition(FLEXING, FLEXING, CONTAINER_ALLOCATED,
+-              new ContainerAllocatedTransition())
+-          // container launched on NM
+-          .addTransition(FLEXING, EnumSet.of(STABLE, FLEXING, UPGRADING),
+-              CONTAINER_STARTED, new ContainerStartedTransition())
+-          // container failed while flexing
+-          .addTransition(FLEXING, FLEXING, CONTAINER_COMPLETED,
+-              new ContainerCompletedTransition())
+-          // Flex while previous flex is still in progress
+-          .addTransition(FLEXING, EnumSet.of(FLEXING, STABLE), FLEX,
+-              new FlexComponentTransition())
+-          .addTransition(FLEXING, EnumSet.of(UPGRADING, FLEXING, STABLE),
+-              CHECK_STABLE, new CheckStableTransition())
+-          // instance decommissioned
+-          .addTransition(FLEXING, FLEXING, DECOMMISSION_INSTANCE,
+-              new DecommissionInstanceTransition())
+-
+-          // container failed while stable
+-          .addTransition(STABLE, FLEXING, CONTAINER_COMPLETED,
+-              new ContainerCompletedTransition())
+-          // Ignore surplus container
+-          .addTransition(STABLE, STABLE, CONTAINER_ALLOCATED,
+-              new ContainerAllocatedTransition())
+-          // Flex by user
+-          // For flex up, go to FLEXING state
+-          // For flex down, go to STABLE state
+-          .addTransition(STABLE, EnumSet.of(STABLE, FLEXING),
+-              FLEX, new FlexComponentTransition())
+-          // instance decommissioned
+-          .addTransition(STABLE, STABLE, DECOMMISSION_INSTANCE,
+-              new DecommissionInstanceTransition())
+-          // upgrade component
+-          .addTransition(STABLE, UPGRADING, UPGRADE,
+-              new NeedsUpgradeTransition())
+-          .addTransition(STABLE, CANCEL_UPGRADING, CANCEL_UPGRADE,
+-              new NeedsUpgradeTransition())
+-          .addTransition(STABLE, EnumSet.of(STABLE, FLEXING), CHECK_STABLE,
+-              new CheckStableTransition())
+-
+-          // Cancel upgrade while previous upgrade is still in progress
+-          .addTransition(UPGRADING, CANCEL_UPGRADING,
+-              CANCEL_UPGRADE, new NeedsUpgradeTransition())
+-          .addTransition(UPGRADING, EnumSet.of(UPGRADING, FLEXING, STABLE),
+-              CHECK_STABLE, new CheckStableTransition())
+-          .addTransition(UPGRADING, UPGRADING, CONTAINER_COMPLETED,
+-              new CompletedAfterUpgradeTransition())
+-          // instance decommissioned
+-          .addTransition(UPGRADING, UPGRADING, DECOMMISSION_INSTANCE,
+-              new DecommissionInstanceTransition())
+-
+-          .addTransition(CANCEL_UPGRADING, EnumSet.of(CANCEL_UPGRADING, FLEXING,
+-              STABLE), CHECK_STABLE, new CheckStableTransition())
+-          .addTransition(CANCEL_UPGRADING, CANCEL_UPGRADING,
+-              CONTAINER_COMPLETED, new CompletedAfterUpgradeTransition())
+-          .addTransition(CANCEL_UPGRADING, FLEXING, CONTAINER_ALLOCATED,
+-              new ContainerAllocatedTransition())
+-          // instance decommissioned
+-          .addTransition(CANCEL_UPGRADING, CANCEL_UPGRADING,
+-              DECOMMISSION_INSTANCE, new DecommissionInstanceTransition())
+-          .installTopology();
+-
+-  public Component(
+-      org.apache.hadoop.yarn.service.api.records.Component component,
+-      long allocateId, ServiceContext context) {
+-    this.allocateId = allocateId;
+-    this.priority = Priority.newInstance((int) allocateId);
+-    this.componentSpec = component;
+-    componentMetrics = ServiceMetrics.register(component.getName(),
+-        "Metrics for component " + component.getName());
+-    componentMetrics
+-        .tag("type", "Metrics type [component or service]", "component");
+-    this.scheduler = context.scheduler;
+-    this.context = context;
+-    amrmClient = scheduler.getAmRMClient();
+-    ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+-    this.readLock = lock.readLock();
+-    this.writeLock = lock.writeLock();
+-    this.stateMachine = stateMachineFactory.make(this);
+-    dispatcher = scheduler.getDispatcher();
+-    failureTracker =
+-        new ContainerFailureTracker(context, this);
+-    if (componentSpec.getReadinessCheck() != null ||
+-        YarnServiceConf.getBoolean(DEFAULT_READINESS_CHECK_ENABLED,
+-            DEFAULT_READINESS_CHECK_ENABLED_DEFAULT,
+-            componentSpec.getConfiguration(), scheduler.getConfig())) {
+-      probe = MonitorUtils.getProbe(componentSpec.getReadinessCheck());
+-    }
+-    maxContainerFailurePerComp = YarnServiceConf.getInt(
+-        CONTAINER_FAILURE_THRESHOLD, DEFAULT_CONTAINER_FAILURE_THRESHOLD,
+-        componentSpec.getConfiguration(), scheduler.getConfig());
+-    createNumCompInstances(component.getNumberOfContainers());
+-    setDesiredContainers(component.getNumberOfContainers().intValue());
+-    checkAndScheduleHealthThresholdMonitor();
+-  }
+-
+-  private void createNumCompInstances(long count) {
+-    for (int i = 0; i < count; i++) {
+-      createOneCompInstance();
+-    }
+-  }
+-
+-  private void createOneCompInstance() {
+-    ComponentInstanceId id =
+-        new ComponentInstanceId(instanceIdCounter.getAndIncrement(),
+-            componentSpec.getName());
+-    while (componentSpec.getDecommissionedInstances().contains(id
+-        .getCompInstanceName())) {
+-      id = new ComponentInstanceId(instanceIdCounter.getAndIncrement(),
+-          componentSpec.getName());
+-    }
+-    ComponentInstance instance = new ComponentInstance(this, id);
+-    compInstances.put(instance.getCompInstanceName(), instance);
+-    pendingInstances.add(instance);
+-  }
+-
+-  private void checkAndScheduleHealthThresholdMonitor() {
+-    // Determine health threshold percent
+-    int healthThresholdPercent = YarnServiceConf.getInt(
+-        CONTAINER_HEALTH_THRESHOLD_PERCENT,
+-        DEFAULT_CONTAINER_HEALTH_THRESHOLD_PERCENT,
+-        componentSpec.getConfiguration(), scheduler.getConfig());
+-    // Validations
+-    if (healthThresholdPercent == CONTAINER_HEALTH_THRESHOLD_PERCENT_DISABLED) {
+-      LOG.info("No health threshold monitor enabled for component {}",
+-          componentSpec.getName());
+-      return;
+-    }
+-    // If threshold is set to outside acceptable range then don't enable monitor
+-    if (healthThresholdPercent <= 0 || healthThresholdPercent > 100) {
+-      LOG.error(
+-          "Invalid health threshold percent {}% for component {}. Monitor not "
+-              + "enabled.",
+-          healthThresholdPercent, componentSpec.getName());
+-      return;
+-    }
+-    // Determine the threshold properties
+-    long window = YarnServiceConf.getLong(CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC,
+-        DEFAULT_CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC,
+-        componentSpec.getConfiguration(), scheduler.getConfig());
+-    long initDelay = YarnServiceConf.getLong(
+-        CONTAINER_HEALTH_THRESHOLD_INIT_DELAY_SEC,
+-        DEFAULT_CONTAINER_HEALTH_THRESHOLD_INIT_DELAY_SEC,
+-        componentSpec.getConfiguration(), scheduler.getConfig());
+-    long pollFrequency = YarnServiceConf.getLong(
+-        CONTAINER_HEALTH_THRESHOLD_POLL_FREQUENCY_SEC,
+-        DEFAULT_CONTAINER_HEALTH_THRESHOLD_POLL_FREQUENCY_SEC,
+-        componentSpec.getConfiguration(), scheduler.getConfig());
+-    // Validations
+-    if (window <= 0) {
+-      LOG.error(
+-          "Invalid health monitor window {} secs for component {}. Monitor not "
+-              + "enabled.",
+-          window, componentSpec.getName());
+-      return;
+-    }
+-    if (initDelay < 0) {
+-      LOG.error("Invalid health monitor init delay {} secs for component {}. "
+-          + "Monitor not enabled.", initDelay, componentSpec.getName());
+-      return;
+-    }
+-    if (pollFrequency <= 0) {
+-      LOG.error(
+-          "Invalid health monitor poll frequency {} secs for component {}. "
+-              + "Monitor not enabled.",
+-          pollFrequency, componentSpec.getName());
+-      return;
+-    }
+-    LOG.info(
+-        "Scheduling the health threshold monitor for component {} with percent "
+-            + "= {}%, window = {} secs, poll freq = {} secs, init-delay = {} "
+-            + "secs",
+-        componentSpec.getName(), healthThresholdPercent, window, pollFrequency,
+-        initDelay);
+-    // Add 3 extra seconds to initial delay to account for the time taken to
+-    // request containers before the monitor starts calculating health.
+-    this.scheduler.executorService.scheduleAtFixedRate(
+-        new ComponentHealthThresholdMonitor(this, healthThresholdPercent,
+-            window),
+-        initDelay + 3, pollFrequency, TimeUnit.SECONDS);
+-    setHealthThresholdMonitorEnabled(true);
+-  }
+-
+-  private static class FlexComponentTransition implements
+-      MultipleArcTransition<Component, ComponentEvent, ComponentState> {
+-    // For flex up, go to FLEXING state
+-    // For flex down, go to STABLE state
+-    @Override
+-    public ComponentState transition(Component component,
+-        ComponentEvent event) {
+-      component.setDesiredContainers((int) event.getDesired());
+-      if (!component.areDependenciesReady()) {
+-        LOG.info("[FLEX COMPONENT {}]: Flex deferred because dependencies not"
+-            + " satisfied.", component.getName());
+-        return component.getState();
+-      }
+-      if (component.getState() == INIT) {
+-        // This happens on init
+-        LOG.info("[INIT COMPONENT " + component.getName() + "]: " + event
+-            .getDesired() + " instances.");
+-        component.requestContainers(component.pendingInstances.size());
+-        return checkIfStable(component);
+-      }
+-      long before = component.getComponentSpec().getNumberOfContainers();
+-      long delta = event.getDesired() - before;
+-      component.getComponentSpec().setNumberOfContainers(event.getDesired());
+-      if (delta > 0) {
+-        // Scale up
+-        LOG.info("[FLEX UP COMPONENT " + component.getName() + "]: scaling up from "
+-                + before + " to " + event.getDesired());
+-        component.requestContainers(delta);
+-        component.createNumCompInstances(delta);
+-        component.setComponentState(
+-            org.apache.hadoop.yarn.service.api.records.ComponentState.FLEXING);
+-        component.getScheduler().getApp().setState(ServiceState.STARTED);
+-        return FLEXING;
+-      } else if (delta < 0) {
+-        delta = 0 - delta;
+-        // scale down
+-        LOG.info("[FLEX DOWN COMPONENT " + component.getName()
+-            + "]: scaling down from " + before + " to " + event.getDesired());
+-        List<ComponentInstance> list =
+-            new ArrayList<>(component.getAllComponentInstances());
+-
+-        // sort in Most recent -> oldest order, destroy most recent ones.
+-        list.sort(Collections.reverseOrder());
+-        for (int i = 0; i < delta; i++) {
+-          ComponentInstance instance = list.get(i);
+-          // remove the instance
+-          component.compInstances.remove(instance.getCompInstanceName());
+-          component.pendingInstances.remove(instance);
+-          // decrement id counter
+-          component.instanceIdCounter.decrementAndGet();
+-          instance.destroy();
+-        }
+-        checkAndUpdateComponentState(component, false);
+-        return component.componentSpec.getState()
+-            == org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE
+-                ? STABLE : FLEXING;
+-      } else {
+-        LOG.info("[FLEX COMPONENT " + component.getName() + "]: already has " +
+-            event.getDesired() + " instances, ignoring");
+-        return STABLE;
+-      }
+-    }
+-  }
+-
+-  private static class DecommissionInstanceTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      String instanceName = event.getInstanceName();
+-      String hostnameSuffix = component.getHostnameSuffix();
+-      if (instanceName.endsWith(hostnameSuffix)) {
+-        instanceName = instanceName.substring(0,
+-            instanceName.length() - hostnameSuffix.length());
+-      }
+-      if (component.getComponentSpec().getDecommissionedInstances()
+-          .contains(instanceName)) {
+-        LOG.info("Instance {} already decommissioned", instanceName);
+-        return;
+-      }
+-      component.getComponentSpec().addDecommissionedInstance(instanceName);
+-      ComponentInstance instance = component.getComponentInstance(instanceName);
+-      if (instance == null) {
+-        LOG.info("Instance was null for decommissioned instance {}",
+-            instanceName);
+-        return;
+-      }
+-      // remove the instance
+-      component.compInstances.remove(instance.getCompInstanceName());
+-      component.pendingInstances.remove(instance);
+-      component.scheduler.getServiceMetrics().containersDesired.decr();
+-      component.componentMetrics.containersDesired.decr();
+-      component.getComponentSpec().setNumberOfContainers(component
+-          .getComponentSpec().getNumberOfContainers() - 1);
+-      instance.destroy();
+-    }
+-  }
+-
+-  private static class ContainerAllocatedTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      component.assignContainerToCompInstance(event.getContainer());
+-    }
+-  }
+-
+-  private static class ContainerRecoveredTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      ComponentInstance instance = event.getInstance();
+-      Container container = event.getContainer();
+-      if (instance == null) {
+-        LOG.info("[COMPONENT {}]: Trying to recover {} but event did not " +
+-                "specify component instance",
+-            component.getName(), container.getId());
+-        component.releaseContainer(container);
+-        return;
+-      }
+-
+-      component.pendingInstances.remove(instance);
+-      instance.setContainer(container);
+-
+-      ProviderUtils.initCompInstanceDir(component.getContext().fs,
+-          component.createLaunchContext(component.componentSpec,
+-              component.scheduler.getApp().getVersion()), instance);
+-      component.getScheduler().addLiveCompInstance(container.getId(), instance);
+-      LOG.info("[COMPONENT {}]: Recovered {} for component instance {} on " +
+-              "host {}, num pending component instances reduced to {} ",
+-          component.getName(), container.getId(),
+-          instance.getCompInstanceName(), container.getNodeId(),
+-          component.pendingInstances.size());
+-      component.dispatcher.getEventHandler().handle(
+-          new ComponentInstanceEvent(container.getId(), START));
+-    }
+-  }
+-
+-  private static class ContainerStartedTransition implements
+-      MultipleArcTransition<Component,ComponentEvent,ComponentState> {
+-
+-    @Override public ComponentState transition(Component component,
+-        ComponentEvent event) {
+-      component.dispatcher.getEventHandler().handle(
+-          new ComponentInstanceEvent(event.getContainerId(), START));
+-      return checkIfStable(component);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  static ComponentState checkIfStable(Component component) {
+-    if (component.getRestartPolicyHandler().isLongLived()) {
+-      return updateStateForLongRunningComponents(component);
+-    } else{
+-      //NEVER/ON_FAILURE
+-      return updateStateForTerminatingComponents(component);
+-    }
+-  }
+-
+-  private static ComponentState updateStateForTerminatingComponents(
+-      Component component) {
+-    if (component.getNumRunningInstances() + component
+-        .getNumSucceededInstances() + component.getNumFailedInstances()
+-        < component.getComponentSpec().getNumberOfContainers()) {
+-      component.setComponentState(
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.FLEXING);
+-      return FLEXING;
+-    } else{
+-      component.setComponentState(
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE);
+-      return STABLE;
+-    }
+-  }
+-
+-  private static ComponentState updateStateForLongRunningComponents(
+-      Component component) {
+-    // if desired == running
+-    if (component.componentMetrics.containersReady.value() == component
+-        .getComponentSpec().getNumberOfContainers() &&
+-        !component.doesNeedUpgrade()) {
+-      component.setComponentState(
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE);
+-      return STABLE;
+-    } else if (component.doesNeedUpgrade()) {
+-      component.setComponentState(org.apache.hadoop.yarn.service.api.records.
+-          ComponentState.NEEDS_UPGRADE);
+-      return component.getState();
+-    } else if (component.componentMetrics.containersReady.value() != component
+-        .getComponentSpec().getNumberOfContainers()) {
+-      component.setComponentState(
+-          org.apache.hadoop.yarn.service.api.records.ComponentState.FLEXING);
+-      return FLEXING;
+-    }
+-    return component.getState();
+-  }
+-
+-  // This method should be called whenever there is an increment or decrement
+-  // of a READY state container of a component
+-  //This should not matter for terminating components
+-  private static synchronized void checkAndUpdateComponentState(
+-      Component component, boolean isIncrement) {
+-
+-    if (component.getRestartPolicyHandler().isLongLived()) {
+-      if (isIncrement) {
+-        // check if all containers are in READY state
+-        if (!component.upgradeStatus.areContainersUpgrading() &&
+-            !component.cancelUpgradeStatus.areContainersUpgrading() &&
+-            component.componentMetrics.containersReady.value() ==
+-                component.componentMetrics.containersDesired.value()) {
+-          component.setComponentState(
+-              org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE);
+-          // component state change will trigger re-check of service state
+-          component.context.getServiceManager().checkAndUpdateServiceState();
+-        }
+-      } else{
+-        // container moving out of READY state could be because of FLEX down so
+-        // still need to verify the count before changing the component state
+-        if (component.componentMetrics.containersReady.value()
+-            < component.componentMetrics.containersDesired.value()) {
+-          component.setComponentState(
+-              org.apache.hadoop.yarn.service.api.records.ComponentState
+-                  .FLEXING);
+-        } else if (component.componentMetrics.containersReady.value()
+-            == component.componentMetrics.containersDesired.value()) {
+-          component.setComponentState(
+-              org.apache.hadoop.yarn.service.api.records.ComponentState.STABLE);
+-        }
+-        // component state change will trigger re-check of service state
+-        component.context.getServiceManager().checkAndUpdateServiceState();
+-      }
+-    } else {
+-      // component state change will trigger re-check of service state
+-      component.context.getServiceManager().checkAndUpdateServiceState();
+-    }
+-    // triggers the state machine in component to reach appropriate state
+-    // once the state in spec is changed.
+-    component.dispatcher.getEventHandler().handle(
+-        new ComponentEvent(component.getName(),
+-            ComponentEventType.CHECK_STABLE));
+-  }
+-
+-  private static class ContainerCompletedTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      Preconditions.checkNotNull(event.getContainerId());
+-      component.updateMetrics(event.getStatus());
+-      component.dispatcher.getEventHandler().handle(
+-          new ComponentInstanceEvent(event.getContainerId(), STOP)
+-              .setStatus(event.getStatus()));
+-
+-      ComponentRestartPolicy restartPolicy =
+-          component.getRestartPolicyHandler();
+-
+-      if (restartPolicy.shouldRelaunchInstance(event.getInstance(),
+-          event.getStatus())) {
+-        component.componentSpec.setState(
+-            org.apache.hadoop.yarn.service.api.records.ComponentState.FLEXING);
+-
+-        if (component.context.service.getState().equals(ServiceState.STABLE)) {
+-          component.getScheduler().getApp().setState(ServiceState.STARTED);
+-          LOG.info("Service def state changed from {} -> {}",
+-              ServiceState.STABLE, ServiceState.STARTED);
+-        }
+-      }
+-    }
+-  }
+-
+-  private static class CompletedAfterUpgradeTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      Preconditions.checkNotNull(event.getContainerId());
+-      component.updateMetrics(event.getStatus());
+-      component.dispatcher.getEventHandler().handle(
+-          new ComponentInstanceEvent(event.getContainerId(), STOP)
+-              .setStatus(event.getStatus()));
+-    }
+-  }
+-
+-  private static class NeedsUpgradeTransition extends BaseTransition {
+-    @Override
+-    public void transition(Component component, ComponentEvent event) {
+-      boolean isCancel = event.getType().equals(CANCEL_UPGRADE);
+-      UpgradeStatus status = !isCancel ? component.upgradeStatus :
+-          component.cancelUpgradeStatus;
+-
+-      status.inProgress.set(true);
+-      status.targetSpec = event.getTargetSpec();
+-      status.targetVersion = event.getUpgradeVersion();
+-      LOG.info("[COMPONENT {}]: need upgrade to {}",
+-          component.getName(), status.targetVersion);
+-
+-      status.containersNeedUpgrade.set(
+-          component.componentSpec.getNumberOfContainers());
+-
+-      component.setComponentState(org.apache.hadoop.yarn.service.api.
+-          records.ComponentState.NEEDS_UPGRADE);
+-
+-      component.getAllComponentInstances().forEach(instance -> {
+-        instance.setContainerState(ContainerState.NEEDS_UPGRADE);
+-      });
+-
+-      if (event.getType().equals(CANCEL_UPGRADE)) {
+-        component.upgradeStatus.reset();
+-      }
+-    }
+-  }
+-
+-  private static class CheckStableTransition implements MultipleArcTransition
+-      <Component, ComponentEvent, ComponentState> {
+-
+-    @Override
+-    public ComponentState transition(Component component,
+-        ComponentEvent componentEvent) {
+-      // checkIfStable also updates the state in definition when STABLE
+-      ComponentState targetState = checkIfStable(component);
+-
+-      if (targetState.equals(STABLE) &&
+-          !(component.upgradeStatus.isCompleted() &&
+-              component.cancelUpgradeStatus.isCompleted())) {
+-        // Component stable after upgrade or cancel upgrade
+-        UpgradeStatus status = !component.cancelUpgradeStatus.isCompleted() ?
+-            component.cancelUpgradeStatus : component.upgradeStatus;
+-
+-        component.componentSpec.overwrite(status.getTargetSpec());
+-        status.reset();
+-
+-        ServiceEvent checkStable = new ServiceEvent(ServiceEventType.
+-            CHECK_STABLE);
+-        component.dispatcher.getEventHandler().handle(checkStable);
+-      }
+-      return targetState;
+-    }
+-  }
+-
+-  public void removePendingInstance(ComponentInstance instance) {
+-    pendingInstances.remove(instance);
+-  }
+-
+-  public void reInsertPendingInstance(ComponentInstance instance) {
+-    pendingInstances.add(instance);
+-  }
+-
+-  private void releaseContainer(Container container) {
+-    scheduler.getAmRMClient().releaseAssignedContainer(container.getId());
+-    componentMetrics.surplusContainers.incr();
+-    scheduler.getServiceMetrics().surplusContainers.incr();
+-  }
+-
+-  private void assignContainerToCompInstance(Container container) {
+-    if (pendingInstances.size() == 0) {
+-      LOG.info(
+-          "[COMPONENT {}]: No pending component instance left, release surplus container {}",
+-          getName(), container.getId());
+-      releaseContainer(container);
+-      return;
+-    }
+-    ComponentInstance instance = pendingInstances.remove(0);
+-    LOG.info(
+-        "[COMPONENT {}]: {} allocated, num pending component instances reduced to {}",
+-        getName(), container.getId(), pendingInstances.size());
+-    instance.setContainer(container);
+-    scheduler.addLiveCompInstance(container.getId(), instance);
+-    LOG.info(
+-        "[COMPONENT {}]: Assigned {} to component instance {} and launch on host {} ",
+-        getName(), container.getId(), instance.getCompInstanceName(),
+-        container.getNodeId());
+-    Future<ProviderService.ResolvedLaunchParams> resolvedParamFuture;
+-    if (!(upgradeStatus.isCompleted() && cancelUpgradeStatus.isCompleted())) {
+-      UpgradeStatus status = !cancelUpgradeStatus.isCompleted() ?
+-          cancelUpgradeStatus : upgradeStatus;
+-
+-      resolvedParamFuture = scheduler.getContainerLaunchService()
+-          .launchCompInstance(scheduler.getApp(), instance, container,
+-              createLaunchContext(status.getTargetSpec(),
+-                  status.getTargetVersion()));
+-    } else {
+-      resolvedParamFuture = scheduler.getContainerLaunchService()
+-          .launchCompInstance(
+-          scheduler.getApp(), instance, container,
+-          createLaunchContext(componentSpec, scheduler.getApp().getVersion()));
+-    }
+-    instance.updateResolvedLaunchParams(resolvedParamFuture);
+-  }
+-
+-  public ContainerLaunchService.ComponentLaunchContext createLaunchContext(
+-      org.apache.hadoop.yarn.service.api.records.Component compSpec,
+-      String version) {
+-    ContainerLaunchService.ComponentLaunchContext launchContext =
+-        new ContainerLaunchService.ComponentLaunchContext(compSpec.getName(),
+-            version);
+-    launchContext.setArtifact(compSpec.getArtifact())
+-        .setConfiguration(compSpec.getConfiguration())
+-        .setLaunchCommand(compSpec.getLaunchCommand())
+-        .setRunPrivilegedContainer(compSpec.getRunPrivilegedContainer());
+-    return launchContext;
+-  }
+-
+-  @SuppressWarnings({ "unchecked" })
+-  public void requestContainers(long count) {
+-    LOG.info("[COMPONENT {}] Requesting for {} container(s)",
+-        componentSpec.getName(), count);
+-    org.apache.hadoop.yarn.service.api.records.Resource componentResource =
+-        componentSpec.getResource();
+-
+-    Resource resource = Resource.newInstance(componentResource.calcMemoryMB(),
+-        componentResource.getCpus());
+-
+-    if (componentResource.getAdditional() != null) {
+-      for (Map.Entry<String, ResourceInformation> entry : componentResource
+-          .getAdditional().entrySet()) {
+-
+-        String resourceName = entry.getKey();
+-
+-        // Avoid setting memory/cpu under "additional"
+-        if (resourceName.equals(
+-            org.apache.hadoop.yarn.api.records.ResourceInformation.MEMORY_URI)
+-            || resourceName.equals(
+-            org.apache.hadoop.yarn.api.records.ResourceInformation.VCORES_URI)) {
+-          LOG.warn("Please set memory/vcore in the main section of resource, "
+-              + "ignoring this entry=" + resourceName);
+-          continue;
+-        }
+-
+-        ResourceInformation specInfo = entry.getValue();
+-        org.apache.hadoop.yarn.api.records.ResourceInformation ri =
+-            org.apache.hadoop.yarn.api.records.ResourceInformation.newInstance(
+-                entry.getKey(),
+-                specInfo.getUnit(),
+-                specInfo.getValue(),
+-                specInfo.getTags(),
+-                specInfo.getAttributes());
+-        resource.setResourceInformation(resourceName, ri);
+-      }
+-    }
+-
+-    if (!scheduler.hasAtLeastOnePlacementConstraint()) {
+-      for (int i = 0; i < count; i++) {
+-        ContainerRequest request = ContainerRequest.newBuilder()
+-            .capability(resource).priority(priority)
+-            .allocationRequestId(allocateId).relaxLocality(true).build();
+-        LOG.info("[COMPONENT {}] Submitting container request : {}",
+-            componentSpec.getName(), request);
+-        amrmClient.addContainerRequest(request);
+-      }
+-    } else {
+-      // Schedule placement requests. Validation of non-null target tags and
+-      // that they refer to existing component names are already done. So, no
+-      // need to validate here.
+-      PlacementPolicy placementPolicy = componentSpec.getPlacementPolicy();
+-      Collection<SchedulingRequest> schedulingRequests = new HashSet<>();
+-      // We prepare an AND-ed composite constraint to be the final composite
+-      // constraint. If placement expressions are specified to create advanced
+-      // composite constraints then this AND-ed composite constraint is not
+-      // used.
+-      PlacementConstraint finalConstraint = null;
+-      if (placementPolicy != null) {
+-        for (org.apache.hadoop.yarn.service.api.records.PlacementConstraint
+-            yarnServiceConstraint : placementPolicy.getConstraints()) {
+-          List<TargetExpression> targetExpressions = new ArrayList<>();
+-          // Currently only intra-application allocation tags are supported.
+-          if (!yarnServiceConstraint.getTargetTags().isEmpty()) {
+-            targetExpressions.add(PlacementTargets.allocationTag(
+-                yarnServiceConstraint.getTargetTags().toArray(new String[0])));
+-          }
+-          // Add all node attributes
+-          for (Map.Entry<String, List<String>> attribute : yarnServiceConstraint
+-              .getNodeAttributes().entrySet()) {
+-            targetExpressions
+-                .add(PlacementTargets.nodeAttribute(attribute.getKey(),
+-                    attribute.getValue().toArray(new String[0])));
+-          }
+-          // Add all node partitions
+-          if (!yarnServiceConstraint.getNodePartitions().isEmpty()) {
+-            targetExpressions
+-                .add(PlacementTargets.nodePartition(yarnServiceConstraint
+-                    .getNodePartitions().toArray(new String[0])));
+-          }
+-          PlacementConstraint constraint = null;
+-          switch (yarnServiceConstraint.getType()) {
+-          case AFFINITY:
+-            constraint = getAffinityConstraint(yarnServiceConstraint,
+-              targetExpressions);
+-            break;
+-          case ANTI_AFFINITY:
+-            constraint = getAntiAffinityConstraint(yarnServiceConstraint,
+-              targetExpressions);
+-            break;
+-          case AFFINITY_WITH_CARDINALITY:
+-            constraint = PlacementConstraints.targetCardinality(
+-                yarnServiceConstraint.getScope().name().toLowerCase(),
+-                yarnServiceConstraint.getMinCardinality() == null ? 0
+-                    : yarnServiceConstraint.getMinCardinality().intValue(),
+-                yarnServiceConstraint.getMaxCardinality() == null
+-                    ? Integer.MAX_VALUE
+-                    : yarnServiceConstraint.getMaxCardinality().intValue(),
+-                targetExpressions.toArray(new TargetExpression[0])).build();
+-            break;
+-          }
+-          if (constraint == null) {
+-            LOG.info("[COMPONENT {}] Placement constraint: null ",
+-                componentSpec.getName());
+-            continue;
+-          }
+-          // The default AND-ed final composite constraint
+-          if (finalConstraint != null) {
+-            finalConstraint = PlacementConstraints
+-                .and(constraint.getConstraintExpr(),
+-                    finalConstraint.getConstraintExpr())
+-                .build();
+-          } else {
+-            finalConstraint = constraint;
+-          }
+-          LOG.debug("[COMPONENT {}] Placement constraint: {}",
+-              componentSpec.getName(),
+-              constraint.getConstraintExpr().toString());
+-        }
+-      }
+-      ResourceSizing resourceSizing = ResourceSizing.newInstance((int) count,
+-          resource);
+-      LOG.debug("[COMPONENT {}] Resource sizing: {}", componentSpec.getName(),
+-          resourceSizing);
+-      SchedulingRequest request = SchedulingRequest.newBuilder()
+-          .priority(priority).allocationRequestId(allocateId)
+-          .allocationTags(Collections.singleton(componentSpec.getName()))
+-          .executionType(
+-              ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED, true))
+-          .placementConstraintExpression(finalConstraint)
+-          .resourceSizing(resourceSizing).build();
+-      LOG.info("[COMPONENT {}] Submitting scheduling request: {}",
+-          componentSpec.getName(), request);
+-      schedulingRequests.add(request);
+-      amrmClient.addSchedulingRequests(schedulingRequests);
+-    }
+-  }
+-
+-  private PlacementConstraint getAffinityConstraint(
+-      org.apache.hadoop.yarn.service.api.records.PlacementConstraint
+-      yarnServiceConstraint, List<TargetExpression> targetExpressions) {
+-    PlacementConstraint constraint = null;
+-    if (!yarnServiceConstraint.getTargetTags().isEmpty() ||
+-        !yarnServiceConstraint.getNodePartitions().isEmpty()) {
+-      constraint = PlacementConstraints
+-        .targetIn(yarnServiceConstraint.getScope().getValue(),
+-            targetExpressions.toArray(new TargetExpression[0]))
+-                .build();
+-    }
+-    if (!yarnServiceConstraint.getNodeAttributes().isEmpty()) {
+-      constraint = PlacementConstraints
+-        .targetNodeAttribute(yarnServiceConstraint.getScope().getValue(),
+-            NodeAttributeOpCode.EQ, targetExpressions.toArray(
+-                new TargetExpression[0])).build();
+-    }
+-    return constraint;
+-  }
+-
+-  private PlacementConstraint getAntiAffinityConstraint(
+-      org.apache.hadoop.yarn.service.api.records.PlacementConstraint
+-      yarnServiceConstraint, List<TargetExpression> targetExpressions) {
+-    PlacementConstraint constraint = null;
+-    if (!yarnServiceConstraint.getTargetTags().isEmpty() ||
+-        !yarnServiceConstraint.getNodePartitions().isEmpty()) {
+-      constraint = PlacementConstraints
+-        .targetNotIn(yarnServiceConstraint.getScope().getValue(),
+-            targetExpressions.toArray(new TargetExpression[0]))
+-                .build();
+-    }
+-    if (!yarnServiceConstraint.getNodeAttributes().isEmpty()) {
+-      constraint = PlacementConstraints
+-        .targetNodeAttribute(yarnServiceConstraint.getScope().getValue(),
+-            NodeAttributeOpCode.NE, targetExpressions.toArray(
+-                new TargetExpression[0])).build();
+-    }
+-    return constraint;
+-  }
+-
+-  private void setDesiredContainers(int n) {
+-    int delta = n - scheduler.getServiceMetrics().containersDesired.value();
+-    if (delta != 0) {
+-      scheduler.getServiceMetrics().containersDesired.incr(delta);
+-    }
+-    componentMetrics.containersDesired.set(n);
+-  }
+-
+-  private void updateMetrics(ContainerStatus status) {
+-    //when a container preparation fails while building launch context, then
+-    //the container status may not exist.
+-    if (status != null) {
+-      switch (status.getExitStatus()) {
+-        case SUCCESS:
+-          componentMetrics.containersSucceeded.incr();
+-          scheduler.getServiceMetrics().containersSucceeded.incr();
+-          return;
+-        case PREEMPTED:
+-          componentMetrics.containersPreempted.incr();
+-          scheduler.getServiceMetrics().containersPreempted.incr();
+-          break;
+-        case DISKS_FAILED:
+-          componentMetrics.containersDiskFailure.incr();
+-          scheduler.getServiceMetrics().containersDiskFailure.incr();
+-          break;
+-        default:
+-          break;
+-      }
+-    }
+-
+-    // containersFailed include preempted, disks_failed etc.
+-    componentMetrics.containersFailed.incr();
+-    scheduler.getServiceMetrics().containersFailed.incr();
+-
+-    if (status != null && Apps.shouldCountTowardsNodeBlacklisting(
+-        status.getExitStatus())) {
+-      String host = scheduler.getLiveInstances().get(status.getContainerId())
+-          .getNodeId().getHost();
+-      failureTracker.incNodeFailure(host);
+-      currentContainerFailure.getAndIncrement();
+-    }
+-  }
+-
+-  private boolean doesNeedUpgrade() {
+-    return cancelUpgradeStatus.areContainersUpgrading() ||
+-        upgradeStatus.areContainersUpgrading() ||
+-        upgradeStatus.failed.get();
+-  }
+-
+-  public boolean areDependenciesReady() {
+-    List<String> dependencies = componentSpec.getDependencies();
+-    if (ServiceUtils.isEmpty(dependencies)) {
+-      return true;
+-    }
+-    for (String dependency : dependencies) {
+-      Component dependentComponent = scheduler.getAllComponents().get(
+-          dependency);
+-      if (dependentComponent == null) {
+-        LOG.error("Couldn't find dependency {} for {} (should never happen)",
+-            dependency, getName());
+-        continue;
+-      }
+-
+-      if (!dependentComponent.isReadyForDownstream()) {
+-        LOG.info("[COMPONENT {}]: Dependency {} not satisfied, only {} of {}"
+-                + " instances are ready or the dependent component has not "
+-                + "completed ", getName(), dependency,
+-            dependentComponent.getNumReadyInstances(),
+-            dependentComponent.getNumDesiredInstances());
+-        return false;
+-      }
+-    }
+-    return true;
+-  }
+-
+-
+-  public Map<String, String> getDependencyHostIpTokens() {
+-    Map<String, String> tokens = new HashMap<>();
+-    List<String> dependencies = componentSpec.getDependencies();
+-    if (ServiceUtils.isEmpty(dependencies)) {
+-      return tokens;
+-    }
+-    for (String dependency : dependencies) {
+-      Collection<ComponentInstance> instances = scheduler.getAllComponents()
+-          .get(dependency).getAllComponentInstances();
+-      for (ComponentInstance instance : instances) {
+-        if (instance.getContainerStatus() == null) {
+-          continue;
+-        }
+-        if (ServiceUtils.isEmpty(instance.getContainerStatus().getIPs()) ||
+-            ServiceUtils.isUnset(instance.getContainerStatus().getHost())) {
+-          continue;
+-        }
+-        String ip = instance.getContainerStatus().getIPs().get(0);
+-        String host = instance.getContainerStatus().getHost();
+-        tokens.put(String.format(COMPONENT_INSTANCE_IP,
+-            instance.getCompInstanceName().toUpperCase()), ip);
+-        tokens.put(String.format(COMPONENT_INSTANCE_HOST,
+-            instance.getCompInstanceName().toUpperCase()), host);
+-      }
+-    }
+-    return tokens;
+-  }
+-
+-  public void incRunningContainers() {
+-    componentMetrics.containersRunning.incr();
+-    scheduler.getServiceMetrics().containersRunning.incr();
+-  }
+-
+-  public void decRunningContainers() {
+-    componentMetrics.containersRunning.decr();
+-    scheduler.getServiceMetrics().containersRunning.decr();
+-  }
+-
+-  public void incContainersReady(boolean updateDefinition) {
+-    componentMetrics.containersReady.incr();
+-    scheduler.getServiceMetrics().containersReady.incr();
+-    if (updateDefinition) {
+-      checkAndUpdateComponentState(this, true);
+-    }
+-  }
+-
+-  public void decContainersReady(boolean updateDefinition) {
+-    componentMetrics.containersReady.decr();
+-    scheduler.getServiceMetrics().containersReady.decr();
+-    if (updateDefinition) {
+-      checkAndUpdateComponentState(this, false);
+-    }
+-  }
+-
+-  public int getNumReadyInstances() {
+-    return componentMetrics.containersReady.value();
+-  }
+-
+-  public int getNumRunningInstances() {
+-    return componentMetrics.containersRunning.value();
+-  }
+-
+-  public int getNumDesiredInstances() {
+-    return componentMetrics.containersDesired.value();
+-  }
+-
+-  public ComponentInstance getComponentInstance(String componentInstanceName) {
+-    return compInstances.get(componentInstanceName);
+-  }
+-
+-  public Collection<ComponentInstance> getAllComponentInstances() {
+-    return compInstances.values();
+-  }
+-
+-  public org.apache.hadoop.yarn.service.api.records.Component getComponentSpec() {
+-    return this.componentSpec;
+-  }
+-
+-  public void resetCompFailureCount() {
+-    LOG.info("[COMPONENT {}]: Reset container failure count from {} to 0.",
+-        getName(), currentContainerFailure.get());
+-    currentContainerFailure.set(0);
+-    failureTracker.resetContainerFailures();
+-  }
+-
+-  public Probe getProbe() {
+-    return probe;
+-  }
+-
+-  public Priority getPriority() {
+-    return priority;
+-  }
+-
+-  public long getAllocateId() {
+-    return allocateId;
+-  }
+-
+-  public String getName () {
+-    return componentSpec.getName();
+-  }
+-
+-  public ComponentState getState() {
+-    this.readLock.lock();
+-
+-    try {
+-      return this.stateMachine.getCurrentState();
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Returns whether a component is upgrading or not.
+-   */
+-  public boolean isUpgrading() {
+-    this.readLock.lock();
+-
+-    try {
+-      return !(upgradeStatus.isCompleted() &&
+-          cancelUpgradeStatus.isCompleted());
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  public UpgradeStatus getUpgradeStatus() {
+-    this.readLock.lock();
+-    try {
+-      return upgradeStatus;
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  public UpgradeStatus getCancelUpgradeStatus() {
+-    this.readLock.lock();
+-    try {
+-      return cancelUpgradeStatus;
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  public ServiceScheduler getScheduler() {
+-    return scheduler;
+-  }
+-
+-  @Override
+-  public void handle(ComponentEvent event) {
+-    writeLock.lock();
+-    try {
+-      ComponentState oldState = getState();
+-      try {
+-        stateMachine.doTransition(event.getType(), event);
+-      } catch (InvalidStateTransitionException e) {
+-        LOG.error(MessageFormat.format("[COMPONENT {0}]: Invalid event {1} at {2}",
+-            componentSpec.getName(), event.getType(), oldState), e);
+-      }
+-      if (oldState != getState()) {
+-        LOG.info("[COMPONENT {}] Transitioned from {} to {} on {} event.",
+-            componentSpec.getName(), oldState, getState(), event.getType());
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  private static class BaseTransition implements
+-      SingleArcTransition<Component, ComponentEvent> {
+-
+-    @Override public void transition(Component component,
+-        ComponentEvent event) {
+-    }
+-  }
+-
+-  /**
+-   * Sets the state of the component in the component spec.
+-   * @param state component state
+-   */
+-  private void setComponentState(
+-      org.apache.hadoop.yarn.service.api.records.ComponentState state) {
+-    org.apache.hadoop.yarn.service.api.records.ComponentState curState =
+-        componentSpec.getState();
+-    if (!curState.equals(state)) {
+-      componentSpec.setState(state);
+-      LOG.info("[COMPONENT {}] spec state changed from {} -> {}",
+-          componentSpec.getName(), curState, state);
+-    }
+-  }
+-
+-  /**
+-   * Status of upgrade.
+-   */
+-  public static class UpgradeStatus {
+-    private org.apache.hadoop.yarn.service.api.records.Component targetSpec;
+-    private String targetVersion;
+-    private AtomicBoolean inProgress = new AtomicBoolean(false);
+-    private AtomicLong containersNeedUpgrade = new AtomicLong(0);
+-    private AtomicBoolean failed = new AtomicBoolean(false);
+-
+-    public org.apache.hadoop.yarn.service.api.records.
+-        Component getTargetSpec() {
+-      return targetSpec;
+-    }
+-
+-    public String getTargetVersion() {
+-      return targetVersion;
+-    }
+-
+-    /*
+-     * @return whether the upgrade is completed or not
+-     */
+-    public boolean isCompleted() {
+-      return !inProgress.get();
+-    }
+-
+-    public void decContainersThatNeedUpgrade() {
+-      if (inProgress.get()) {
+-        containersNeedUpgrade.decrementAndGet();
+-      }
+-    }
+-
+-    public void containerFailedUpgrade() {
+-      failed.set(true);
+-    }
+-
+-    void reset() {
+-      containersNeedUpgrade.set(0);
+-      targetSpec = null;
+-      targetVersion = null;
+-      inProgress.set(false);
+-      failed.set(false);
+-    }
+-
+-    boolean areContainersUpgrading() {
+-      return containersNeedUpgrade.get() != 0;
+-    }
+-  }
+-
+-  public ServiceContext getContext() {
+-    return context;
+-  }
+-
+-  // Only for testing
+-  public List<ComponentInstance> getPendingInstances() {
+-    return pendingInstances;
+-  }
+-
+-  public boolean isHealthThresholdMonitorEnabled() {
+-    return healthThresholdMonitorEnabled;
+-  }
+-
+-  public void setHealthThresholdMonitorEnabled(
+-      boolean healthThresholdMonitorEnabled) {
+-    this.healthThresholdMonitorEnabled = healthThresholdMonitorEnabled;
+-  }
+-
+-  public Collection<ComponentInstance> getSucceededInstances() {
+-    return succeededInstances.values();
+-  }
+-
+-  public long getNumSucceededInstances() {
+-    return succeededInstances.size();
+-  }
+-
+-  public long getNumFailedInstances() {
+-    return failedInstances.size();
+-  }
+-
+-  public Collection<ComponentInstance> getFailedInstances() {
+-    return failedInstances.values();
+-  }
+-
+-  public synchronized void markAsSucceeded(ComponentInstance instance) {
+-    removeFailedInstanceIfExists(instance);
+-    succeededInstances.put(instance.getCompInstanceName(), instance);
+-  }
+-
+-  public synchronized void markAsFailed(ComponentInstance instance) {
+-    removeSuccessfulInstanceIfExists(instance);
+-    failedInstances.put(instance.getCompInstanceName(), instance);
+-  }
+-
+-  public boolean removeFailedInstanceIfExists(ComponentInstance instance) {
+-    if (failedInstances.containsKey(instance.getCompInstanceName())) {
+-      failedInstances.remove(instance.getCompInstanceName());
+-      return true;
+-    }
+-    return false;
+-  }
+-
+-  public boolean removeSuccessfulInstanceIfExists(ComponentInstance instance) {
+-    if (succeededInstances.containsKey(instance.getCompInstanceName())) {
+-      succeededInstances.remove(instance.getCompInstanceName());
+-      return true;
+-    }
+-    return false;
+-  }
+-
+-  public boolean isReadyForDownstream() {
+-    return getRestartPolicyHandler().isReadyForDownStream(this);
+-  }
+-
+-  public static ComponentRestartPolicy getRestartPolicyHandler(
+-      RestartPolicyEnum restartPolicyEnum) {
+-
+-    if (RestartPolicyEnum.NEVER == restartPolicyEnum) {
+-      return NeverRestartPolicy.getInstance();
+-    } else if (RestartPolicyEnum.ON_FAILURE == restartPolicyEnum) {
+-      return OnFailureRestartPolicy.getInstance();
+-    } else{
+-      return AlwaysRestartPolicy.getInstance();
+-    }
+-  }
+-
+-  public ComponentRestartPolicy getRestartPolicyHandler() {
+-    RestartPolicyEnum restartPolicyEnum = getComponentSpec().getRestartPolicy();
+-    return getRestartPolicyHandler(restartPolicyEnum);
+-  }
+-
+-  public String getHostnameSuffix() {
+-    return ServiceApiUtil.getHostnameSuffix(context.service.getName(),
+-        scheduler.getConfig());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEvent.java
+deleted file mode 100644
+index 47a833a4068..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEvent.java
++++ /dev/null
+@@ -1,126 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.event.AbstractEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-public class ComponentEvent extends AbstractEvent<ComponentEventType> {
+-  private long desired;
+-  private final String name;
+-  private final ComponentEventType type;
+-  private Container container;
+-  private ComponentInstance instance;
+-  private String instanceName;
+-  private ContainerStatus status;
+-  private ContainerId containerId;
+-  private org.apache.hadoop.yarn.service.api.records.Component targetSpec;
+-  private String upgradeVersion;
+-
+-  public ContainerId getContainerId() {
+-    return containerId;
+-  }
+-
+-  public ComponentEvent setContainerId(ContainerId containerId) {
+-    this.containerId = containerId;
+-    return this;
+-  }
+-
+-  public ComponentEvent(String name, ComponentEventType type) {
+-    super(type);
+-    this.name = name;
+-    this.type = type;
+-  }
+-
+-  public String getName() {
+-    return name;
+-  }
+-
+-  public ComponentEventType getType() {
+-    return type;
+-  }
+-
+-  public long getDesired() {
+-    return desired;
+-  }
+-
+-  public ComponentEvent setDesired(long desired) {
+-    this.desired = desired;
+-    return this;
+-  }
+-
+-  public Container getContainer() {
+-    return container;
+-  }
+-
+-  public ComponentEvent setContainer(Container container) {
+-    this.container = container;
+-    return this;
+-  }
+-
+-  public ComponentInstance getInstance() {
+-    return instance;
+-  }
+-
+-  public ComponentEvent setInstance(ComponentInstance instance) {
+-    this.instance = instance;
+-    return this;
+-  }
+-
+-  public String getInstanceName() {
+-    return instanceName;
+-  }
+-
+-  public ComponentEvent setInstanceName(String instanceName) {
+-    this.instanceName = instanceName;
+-    return this;
+-  }
+-
+-  public ContainerStatus getStatus() {
+-    return status;
+-  }
+-
+-  public ComponentEvent setStatus(ContainerStatus status) {
+-    this.status = status;
+-    return this;
+-  }
+-
+-  public org.apache.hadoop.yarn.service.api.records.Component getTargetSpec() {
+-    return targetSpec;
+-  }
+-
+-  public ComponentEvent setTargetSpec(
+-      org.apache.hadoop.yarn.service.api.records.Component targetSpec) {
+-    this.targetSpec = Preconditions.checkNotNull(targetSpec);
+-    return this;
+-  }
+-
+-  public String getUpgradeVersion() {
+-    return upgradeVersion;
+-  }
+-
+-  public ComponentEvent setUpgradeVersion(String upgradeVersion) {
+-    this.upgradeVersion = upgradeVersion;
+-    return this;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEventType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEventType.java
+deleted file mode 100644
+index 558dc90f1f8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentEventType.java
++++ /dev/null
+@@ -1,31 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component;
+-
+-public enum ComponentEventType {
+-  FLEX,
+-  CONTAINER_ALLOCATED,
+-  CONTAINER_RECOVERED,
+-  CONTAINER_STARTED,
+-  CONTAINER_COMPLETED,
+-  CANCEL_UPGRADE,
+-  UPGRADE,
+-  CHECK_STABLE,
+-  DECOMMISSION_INSTANCE
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentRestartPolicy.java
+deleted file mode 100644
+index c5adffebcc8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentRestartPolicy.java
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-/**
+- * Interface for Component Restart policies.
+- * Which is used to make decisions on termination/restart of components and
+- * their instances.
+- */
+-public interface ComponentRestartPolicy {
+-
+-  boolean isLongLived();
+-
+-  boolean hasCompleted(Component component);
+-
+-  boolean hasCompletedSuccessfully(Component component);
+-
+-  boolean shouldRelaunchInstance(ComponentInstance componentInstance,
+-      ContainerStatus containerStatus);
+-
+-  boolean isReadyForDownStream(Component component);
+-
+-  boolean allowUpgrades();
+-
+-  boolean shouldTerminate(Component component);
+-
+-  boolean allowContainerRetriesForInstance(ComponentInstance componentInstance);
+-
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentState.java
+deleted file mode 100644
+index e1cd0c1bdf4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/ComponentState.java
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component;
+-
+-public enum ComponentState {
+-  INIT,
+-  FLEXING,
+-  STABLE,
+-  UPGRADING,
+-  CANCEL_UPGRADING
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java
+deleted file mode 100644
+index a3d67144223..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/NeverRestartPolicy.java
++++ /dev/null
+@@ -1,90 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-/**
+- * Policy for components with instances that do not require/support a restart.
+- */
+-public final class NeverRestartPolicy implements ComponentRestartPolicy {
+-
+-  private static NeverRestartPolicy INSTANCE = new NeverRestartPolicy();
+-
+-  private NeverRestartPolicy() {
+-  }
+-
+-  public static NeverRestartPolicy getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  @Override public boolean isLongLived() {
+-    return false;
+-  }
+-
+-  @Override public boolean hasCompleted(Component component) {
+-    if (component.getNumSucceededInstances() + component.getNumFailedInstances()
+-        < component.getNumDesiredInstances()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean hasCompletedSuccessfully(Component component) {
+-    if (component.getNumSucceededInstances() == component
+-        .getNumDesiredInstances()) {
+-      return true;
+-    }
+-    return false;
+-  }
+-
+-  @Override public boolean shouldRelaunchInstance(
+-      ComponentInstance componentInstance, ContainerStatus containerStatus) {
+-    return false;
+-  }
+-
+-  @Override public boolean isReadyForDownStream(Component dependentComponent) {
+-    if (dependentComponent.getNumReadyInstances()
+-        + dependentComponent.getNumSucceededInstances()
+-        + dependentComponent.getNumFailedInstances()
+-        < dependentComponent.getNumDesiredInstances()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean allowUpgrades() {
+-    return false;
+-  }
+-
+-  @Override public boolean shouldTerminate(Component component) {
+-    long nSucceeded = component.getNumSucceededInstances();
+-    long nFailed = component.getNumFailedInstances();
+-    if (nSucceeded + nFailed < component.getComponentSpec()
+-        .getNumberOfContainers()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean allowContainerRetriesForInstance(
+-      ComponentInstance componentInstance) {
+-    return false;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java
+deleted file mode 100644
+index 28ebf9ef329..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/OnFailureRestartPolicy.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-/**
+- * Policy for components that require restarts for instances on failure.
+- */
+-public final class OnFailureRestartPolicy implements ComponentRestartPolicy {
+-
+-  private static OnFailureRestartPolicy INSTANCE = new OnFailureRestartPolicy();
+-
+-  private OnFailureRestartPolicy() {
+-  }
+-
+-  public static OnFailureRestartPolicy getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  @Override public boolean isLongLived() {
+-    return false;
+-  }
+-
+-  @Override public boolean hasCompleted(Component component) {
+-    if (hasCompletedSuccessfully(component)) {
+-      return true;
+-    }
+-
+-    return false;
+-  }
+-
+-  @Override public boolean hasCompletedSuccessfully(Component component) {
+-    if (component.getNumSucceededInstances() == component
+-        .getNumDesiredInstances()) {
+-      return true;
+-    }
+-
+-    return false;
+-  }
+-
+-  @Override public boolean shouldRelaunchInstance(
+-      ComponentInstance componentInstance, ContainerStatus containerStatus) {
+-
+-    if (ComponentInstance.hasContainerFailed(containerStatus)) {
+-      return true;
+-    }
+-
+-    return false;
+-  }
+-
+-  @Override public boolean isReadyForDownStream(Component dependentComponent) {
+-    if (dependentComponent.getNumReadyInstances()
+-        + dependentComponent.getNumSucceededInstances()
+-        + dependentComponent.getNumFailedInstances()
+-        < dependentComponent.getNumDesiredInstances()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean allowUpgrades() {
+-    return false;
+-  }
+-
+-  @Override public boolean shouldTerminate(Component component) {
+-    long nSucceeded = component.getNumSucceededInstances();
+-    if (nSucceeded < component.getComponentSpec().getNumberOfContainers()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  @Override public boolean allowContainerRetriesForInstance(
+-      ComponentInstance componentInstance) {
+-    return true;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
+deleted file mode 100644
+index cab48704935..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstance.java
++++ /dev/null
+@@ -1,1181 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-import com.fasterxml.jackson.core.type.TypeReference;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-import org.apache.hadoop.registry.client.types.ServiceRecord;
+-import org.apache.hadoop.registry.client.types.yarn.PersistencePolicies;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.LocalizationState;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.client.api.NMClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.ContainerTokenIdentifier;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-import org.apache.hadoop.yarn.service.ServiceScheduler;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.LocalizationStatus;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.component.ComponentRestartPolicy;
+-import org.apache.hadoop.yarn.service.monitor.probe.DefaultProbe;
+-import org.apache.hadoop.yarn.service.monitor.probe.ProbeStatus;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.registry.YarnRegistryViewForProviders;
+-import org.apache.hadoop.yarn.service.timelineservice.ServiceTimelinePublisher;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.state.InvalidStateTransitionException;
+-import org.apache.hadoop.yarn.state.MultipleArcTransition;
+-import org.apache.hadoop.yarn.state.SingleArcTransition;
+-import org.apache.hadoop.yarn.state.StateMachine;
+-import org.apache.hadoop.yarn.state.StateMachineFactory;
+-import org.apache.hadoop.yarn.util.BoundedAppender;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.text.MessageFormat;
+-import java.util.ArrayList;
+-import java.util.Date;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ExecutionException;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.ScheduledFuture;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-import java.util.concurrent.locks.ReentrantReadWriteLock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+-
+-import static org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes.*;
+-
+-import static org.apache.hadoop.yarn.api.records.ContainerExitStatus
+-    .KILLED_AFTER_APP_COMPLETION;
+-import static org.apache.hadoop.yarn.api.records.ContainerExitStatus.KILLED_BY_APPMASTER;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.*;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState.*;
+-
+-public class ComponentInstance implements EventHandler<ComponentInstanceEvent>,
+-    Comparable<ComponentInstance> {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ComponentInstance.class);
+-  private static final String FAILED_BEFORE_LAUNCH_DIAG =
+-      "failed before launch";
+-  private static final String UPGRADE_FAILED = "upgrade failed";
+-
+-  private StateMachine<ComponentInstanceState, ComponentInstanceEventType,
+-      ComponentInstanceEvent> stateMachine;
+-  private Component component;
+-  private final ReadLock readLock;
+-  private final WriteLock writeLock;
+-
+-  private ComponentInstanceId compInstanceId = null;
+-  private Path compInstanceDir;
+-  private Container container;
+-  private YarnRegistryViewForProviders yarnRegistryOperations;
+-  private FileSystem fs;
+-  private boolean timelineServiceEnabled = false;
+-  private ServiceTimelinePublisher serviceTimelinePublisher;
+-  private ServiceScheduler scheduler;
+-  private BoundedAppender diagnostics = new BoundedAppender(64 * 1024);
+-  private volatile ScheduledFuture containerStatusFuture;
+-  private volatile ContainerStatus status;
+-  private long containerStartedTime = 0;
+-  // This container object is used for rest API query
+-  private org.apache.hadoop.yarn.service.api.records.Container containerSpec;
+-  private String serviceVersion;
+-  private AtomicBoolean upgradeInProgress = new AtomicBoolean(false);
+-  private boolean pendingCancelUpgrade = false;
+-  private ProviderService.ResolvedLaunchParams resolvedParams;
+-  private ScheduledFuture lclizationRetrieverFuture;
+-
+-  private static final StateMachineFactory<ComponentInstance,
+-      ComponentInstanceState, ComponentInstanceEventType,
+-      ComponentInstanceEvent>
+-      stateMachineFactory =
+-      new StateMachineFactory<ComponentInstance, ComponentInstanceState,
+-          ComponentInstanceEventType, ComponentInstanceEvent>(INIT)
+-      .addTransition(INIT, STARTED, START,
+-          new ContainerStartedTransition())
+-      .addTransition(INIT, INIT, STOP,
+-          // container failed before launching, nothing to cleanup from registry
+-          // This could happen if NMClient#startContainerAsync failed, container
+-          // will be completed, but COMP_INSTANCE is still at INIT.
+-          new ContainerStoppedTransition(true))
+-
+-      //From Running
+-      .addTransition(STARTED, INIT, STOP,
+-          new ContainerStoppedTransition())
+-      .addTransition(STARTED, READY, BECOME_READY,
+-          new ContainerBecomeReadyTransition(false))
+-
+-      // FROM READY
+-      .addTransition(READY, STARTED, BECOME_NOT_READY,
+-          new ContainerBecomeNotReadyTransition())
+-      .addTransition(READY, INIT, STOP, new ContainerStoppedTransition())
+-      .addTransition(READY, UPGRADING, UPGRADE, new UpgradeTransition())
+-      .addTransition(READY, EnumSet.of(READY, CANCEL_UPGRADING), CANCEL_UPGRADE,
+-          new CancelUpgradeTransition())
+-
+-      // FROM UPGRADING
+-      .addTransition(UPGRADING, EnumSet.of(READY, CANCEL_UPGRADING),
+-          CANCEL_UPGRADE, new CancelUpgradeTransition())
+-      .addTransition(UPGRADING, EnumSet.of(REINITIALIZED), START,
+-          new StartedAfterUpgradeTransition())
+-      .addTransition(UPGRADING, UPGRADING, STOP,
+-          new StoppedAfterUpgradeTransition())
+-
+-      // FROM CANCEL_UPGRADING
+-      .addTransition(CANCEL_UPGRADING, EnumSet.of(CANCEL_UPGRADING,
+-          REINITIALIZED), START, new StartedAfterUpgradeTransition())
+-      .addTransition(CANCEL_UPGRADING, EnumSet.of(CANCEL_UPGRADING, INIT),
+-          STOP, new StoppedAfterCancelUpgradeTransition())
+-
+-      // FROM REINITIALIZED
+-      .addTransition(REINITIALIZED, CANCEL_UPGRADING, CANCEL_UPGRADE,
+-          new CancelledAfterReinitTransition())
+-      .addTransition(REINITIALIZED, READY, BECOME_READY,
+-           new ContainerBecomeReadyTransition(true))
+-      .addTransition(REINITIALIZED, REINITIALIZED, STOP,
+-          new StoppedAfterUpgradeTransition())
+-      .installTopology();
+-
+-  public ComponentInstance(Component component,
+-      ComponentInstanceId compInstanceId) {
+-    this.stateMachine = stateMachineFactory.make(this);
+-    this.component = component;
+-    this.compInstanceId = compInstanceId;
+-    this.scheduler = component.getScheduler();
+-    this.yarnRegistryOperations =
+-        component.getScheduler().getYarnRegistryOperations();
+-    this.serviceTimelinePublisher =
+-        component.getScheduler().getServiceTimelinePublisher();
+-    if (YarnConfiguration
+-        .timelineServiceV2Enabled(component.getScheduler().getConfig())) {
+-      this.timelineServiceEnabled = true;
+-    }
+-    ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+-    this.readLock = lock.readLock();
+-    this.writeLock = lock.writeLock();
+-    this.fs = scheduler.getContext().fs.getFileSystem();
+-  }
+-
+-  private static class ContainerStartedTransition extends  BaseTransition {
+-    @Override public void transition(ComponentInstance compInstance,
+-        ComponentInstanceEvent event) {
+-      // Query container status for ip and host
+-      compInstance.initializeStatusRetriever(event, 0);
+-      compInstance.initializeLocalizationStatusRetriever(
+-          event.getContainerId());
+-
+-      long containerStartTime = System.currentTimeMillis();
+-      try {
+-        ContainerTokenIdentifier containerTokenIdentifier = BuilderUtils
+-            .newContainerTokenIdentifier(compInstance.getContainer()
+-                .getContainerToken());
+-        containerStartTime = containerTokenIdentifier.getCreationTime();
+-      } catch (Exception e) {
+-        LOG.info("Could not get container creation time, using current time");
+-      }
+-      org.apache.hadoop.yarn.service.api.records.Container container =
+-          new org.apache.hadoop.yarn.service.api.records.Container();
+-      container.setId(event.getContainerId().toString());
+-      container.setLaunchTime(new Date(containerStartTime));
+-      container.setState(ContainerState.RUNNING_BUT_UNREADY);
+-      container.setBareHost(compInstance.getNodeId().getHost());
+-      container.setComponentInstanceName(compInstance.getCompInstanceName());
+-      if (compInstance.containerSpec != null) {
+-        // remove the previous container.
+-        compInstance.getCompSpec().removeContainer(compInstance.containerSpec);
+-      }
+-      compInstance.containerSpec = container;
+-      compInstance.getCompSpec().addContainer(container);
+-      compInstance.containerStartedTime = containerStartTime;
+-      compInstance.component.incRunningContainers();
+-      compInstance.serviceVersion = compInstance.scheduler.getApp()
+-          .getVersion();
+-
+-      if (compInstance.timelineServiceEnabled) {
+-        compInstance.serviceTimelinePublisher
+-            .componentInstanceStarted(container, compInstance);
+-      }
+-    }
+-  }
+-
+-  private static class ContainerBecomeReadyTransition extends BaseTransition {
+-    private final boolean isReinitialized;
+-
+-    ContainerBecomeReadyTransition(boolean isReinitialized) {
+-      this.isReinitialized = isReinitialized;
+-    }
+-
+-    @Override
+-    public void transition(ComponentInstance compInstance,
+-        ComponentInstanceEvent event) {
+-      compInstance.setContainerState(ContainerState.READY);
+-      if (!isReinitialized) {
+-        compInstance.component.incContainersReady(true);
+-      } else {
+-        compInstance.component.incContainersReady(false);
+-        ComponentEvent checkState = new ComponentEvent(
+-            compInstance.component.getName(), ComponentEventType.CHECK_STABLE);
+-        compInstance.scheduler.getDispatcher().getEventHandler().handle(
+-            checkState);
+-      }
+-      compInstance.postContainerReady();
+-    }
+-  }
+-
+-  private static class StartedAfterUpgradeTransition implements
+-      MultipleArcTransition<ComponentInstance, ComponentInstanceEvent,
+-          ComponentInstanceState> {
+-
+-    @Override
+-    public ComponentInstanceState transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-
+-      if (instance.pendingCancelUpgrade) {
+-        // cancellation of upgrade was triggered before the upgrade was
+-        // finished.
+-        LOG.info("{} received started but cancellation pending",
+-            event.getContainerId());
+-        instance.upgradeInProgress.set(true);
+-        instance.cancelUpgrade();
+-        instance.pendingCancelUpgrade = false;
+-        return instance.getState();
+-      }
+-
+-      instance.upgradeInProgress.set(false);
+-      instance.setContainerState(ContainerState.RUNNING_BUT_UNREADY);
+-      if (instance.component.getProbe() != null &&
+-          instance.component.getProbe() instanceof DefaultProbe) {
+-        instance.initializeStatusRetriever(event, 30);
+-      } else {
+-        instance.initializeStatusRetriever(event, 0);
+-      }
+-      instance.initializeLocalizationStatusRetriever(event.getContainerId());
+-
+-      Component.UpgradeStatus status = instance.getState().equals(UPGRADING) ?
+-          instance.component.getUpgradeStatus() :
+-          instance.component.getCancelUpgradeStatus();
+-      status.decContainersThatNeedUpgrade();
+-
+-      instance.serviceVersion = status.getTargetVersion();
+-      return ComponentInstanceState.REINITIALIZED;
+-    }
+-  }
+-
+-  private void postContainerReady() {
+-    if (timelineServiceEnabled) {
+-      serviceTimelinePublisher.componentInstanceBecomeReady(containerSpec);
+-    }
+-    try {
+-      List<org.apache.hadoop.yarn.api.records.LocalizationStatus>
+-          statusesFromNM = scheduler.getNmClient().getClient()
+-          .getLocalizationStatuses(container.getId(), container.getNodeId());
+-      if (statusesFromNM != null && !statusesFromNM.isEmpty()) {
+-        updateLocalizationStatuses(statusesFromNM);
+-      }
+-    } catch (YarnException | IOException e) {
+-      LOG.warn("{} failure getting localization statuses", container.getId(),
+-          e);
+-    }
+-  }
+-
+-  private static class ContainerBecomeNotReadyTransition extends BaseTransition {
+-    @Override
+-    public void transition(ComponentInstance compInstance,
+-        ComponentInstanceEvent event) {
+-      compInstance.setContainerState(ContainerState.RUNNING_BUT_UNREADY);
+-      compInstance.component.decContainersReady(true);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  static void handleComponentInstanceRelaunch(ComponentInstance compInstance,
+-      ComponentInstanceEvent event, boolean failureBeforeLaunch,
+-      String containerDiag) {
+-    Component comp = compInstance.getComponent();
+-
+-    // Do we need to relaunch the service?
+-    boolean hasContainerFailed = failureBeforeLaunch || hasContainerFailed(
+-        event.getStatus());
+-
+-    ComponentRestartPolicy restartPolicy = comp.getRestartPolicyHandler();
+-    ContainerState containerState =
+-        hasContainerFailed ? ContainerState.FAILED : ContainerState.SUCCEEDED;
+-
+-    if (compInstance.getContainerSpec() != null) {
+-      compInstance.getContainerSpec().setState(containerState);
+-    }
+-
+-    if (restartPolicy.shouldRelaunchInstance(compInstance, event.getStatus())) {
+-      // re-ask the failed container.
+-      comp.requestContainers(1);
+-      comp.reInsertPendingInstance(compInstance);
+-
+-      StringBuilder builder = new StringBuilder();
+-      builder.append(compInstance.getCompInstanceId()).append(": ")
+-          .append(event.getContainerId()).append(
+-              " completed. Reinsert back to pending list and requested ")
+-          .append("a new container.").append(System.lineSeparator())
+-          .append(" exitStatus=").append(
+-              failureBeforeLaunch || event.getStatus() == null ? null :
+-                  event.getStatus().getExitStatus())
+-          .append(", diagnostics=")
+-          .append(failureBeforeLaunch ?
+-              FAILED_BEFORE_LAUNCH_DIAG :
+-              (event.getStatus() != null ? event.getStatus().getDiagnostics() :
+-                  UPGRADE_FAILED));
+-
+-      if (event.getStatus() != null && event.getStatus().getExitStatus() != 0) {
+-        LOG.error(builder.toString());
+-      } else{
+-        LOG.info(builder.toString());
+-      }
+-
+-      if (compInstance.timelineServiceEnabled) {
+-        // record in ATS
+-        LOG.info("Publishing component instance status {} {} ",
+-            event.getContainerId(), containerState);
+-        int exitStatus = failureBeforeLaunch || event.getStatus() == null ?
+-            ContainerExitStatus.INVALID : event.getStatus().getExitStatus();
+-        compInstance.serviceTimelinePublisher.componentInstanceFinished(
+-            event.getContainerId(), exitStatus,
+-            containerState, containerDiag);
+-      }
+-
+-    } else{
+-      // When no relaunch, update component's #succeeded/#failed
+-      // instances.
+-      if (hasContainerFailed) {
+-        comp.markAsFailed(compInstance);
+-      } else{
+-        comp.markAsSucceeded(compInstance);
+-      }
+-
+-      if (compInstance.timelineServiceEnabled) {
+-        // record in ATS
+-        int exitStatus = failureBeforeLaunch || event.getStatus() == null ?
+-            ContainerExitStatus.INVALID : event.getStatus().getExitStatus();
+-        compInstance.serviceTimelinePublisher.componentInstanceFinished(
+-            event.getContainerId(), exitStatus,
+-            containerState, containerDiag);
+-      }
+-
+-      LOG.info(compInstance.getCompInstanceId() + (!hasContainerFailed ?
+-          " succeeded" :
+-          " failed") + " without retry, exitStatus=" + event.getStatus());
+-      comp.getScheduler().terminateServiceIfNeeded(comp);
+-    }
+-  }
+-
+-  public static boolean hasContainerFailed(ContainerStatus containerStatus) {
+-    //Mark conainer as failed if we cant get its exit status i.e null?
+-    return containerStatus == null || containerStatus
+-        .getExitStatus() != ContainerExitStatus.SUCCESS;
+-  }
+-
+-  private static class ContainerStoppedTransition extends  BaseTransition {
+-    // whether the container failed before launched by AM or not.
+-    boolean failedBeforeLaunching = false;
+-    public ContainerStoppedTransition(boolean failedBeforeLaunching) {
+-      this.failedBeforeLaunching = failedBeforeLaunching;
+-    }
+-
+-    public ContainerStoppedTransition() {
+-      this(false);
+-    }
+-
+-    @Override
+-    public void transition(ComponentInstance compInstance,
+-        ComponentInstanceEvent event) {
+-
+-      Component comp = compInstance.component;
+-      ContainerStatus status = event.getStatus();
+-      // status is not available when upgrade fails
+-      String containerDiag = compInstance.getCompInstanceId() + ": " + (
+-          failedBeforeLaunching ? FAILED_BEFORE_LAUNCH_DIAG :
+-              (status != null ? status.getDiagnostics() : UPGRADE_FAILED));
+-      compInstance.diagnostics.append(containerDiag + System.lineSeparator());
+-      compInstance.cancelContainerStatusRetriever();
+-      compInstance.cancelLclRetriever();
+-
+-      if (compInstance.getState().equals(READY)) {
+-        compInstance.component.decContainersReady(true);
+-      }
+-      compInstance.component.decRunningContainers();
+-      // Should we fail (terminate) the service?
+-      boolean shouldFailService = false;
+-
+-      final ServiceScheduler scheduler = comp.getScheduler();
+-      scheduler.getAmRMClient().releaseAssignedContainer(
+-          event.getContainerId());
+-
+-      // Check if it exceeds the failure threshold, but only if health threshold
+-      // monitor is not enabled
+-      if (!comp.isHealthThresholdMonitorEnabled()
+-          && comp.currentContainerFailure.get()
+-          > comp.maxContainerFailurePerComp) {
+-        String exitDiag = MessageFormat.format(
+-            "[COMPONENT {0}]: Failed {1} times, exceeded the limit - {2}. "
+-                + "Shutting down now... "
+-                + System.lineSeparator(), comp.getName(),
+-            comp.currentContainerFailure.get(),
+-            comp.maxContainerFailurePerComp);
+-        compInstance.diagnostics.append(exitDiag);
+-        // append to global diagnostics that will be reported to RM.
+-        scheduler.getDiagnostics().append(containerDiag);
+-        scheduler.getDiagnostics().append(exitDiag);
+-        LOG.warn(exitDiag);
+-
+-        compInstance.getContainerSpec().setState(ContainerState.FAILED);
+-        comp.getComponentSpec().setState(ComponentState.FAILED);
+-        comp.getScheduler().getApp().setState(ServiceState.FAILED);
+-
+-        if (compInstance.timelineServiceEnabled) {
+-          // record in ATS
+-          compInstance.scheduler.getServiceTimelinePublisher()
+-              .componentInstanceFinished(compInstance.getContainer().getId(),
+-                  failedBeforeLaunching || status == null ? -1 :
+-                      status.getExitStatus(),
+-                  ContainerState.FAILED, containerDiag);
+-
+-          // mark other component-instances/containers as STOPPED
+-          for (ContainerId containerId : scheduler.getLiveInstances()
+-              .keySet()) {
+-            if (!compInstance.container.getId().equals(containerId)
+-                && !isFinalState(compInstance.getContainerSpec().getState())) {
+-              compInstance.getContainerSpec().setState(ContainerState.STOPPED);
+-              compInstance.scheduler.getServiceTimelinePublisher()
+-                  .componentInstanceFinished(containerId,
+-                      KILLED_AFTER_APP_COMPLETION, ContainerState.STOPPED,
+-                      scheduler.getDiagnostics().toString());
+-            }
+-          }
+-
+-          compInstance.scheduler.getServiceTimelinePublisher()
+-              .componentFinished(comp.getComponentSpec(), ComponentState.FAILED,
+-                  scheduler.getSystemClock().getTime());
+-
+-          compInstance.scheduler.getServiceTimelinePublisher()
+-              .serviceAttemptUnregistered(comp.getContext(),
+-                  FinalApplicationStatus.FAILED,
+-                  scheduler.getDiagnostics().toString());
+-        }
+-
+-        shouldFailService = true;
+-      }
+-
+-      if (!failedBeforeLaunching) {
+-        // clean up registry
+-        // If the container failed before launching, no need to cleanup
+-        // registry,
+-        // because it was not registered before.
+-        // hdfs dir content will be overwritten when a new container gets
+-        // started,
+-        // so no need remove.
+-        compInstance.scheduler.executorService.submit(
+-            () -> compInstance.cleanupRegistry(event.getContainerId()));
+-      }
+-
+-      // remove the failed ContainerId -> CompInstance mapping
+-      scheduler.removeLiveCompInstance(event.getContainerId());
+-
+-      // According to component restart policy, handle container restart
+-      // or finish the service (if all components finished)
+-      handleComponentInstanceRelaunch(compInstance, event,
+-          failedBeforeLaunching, containerDiag);
+-
+-      if (shouldFailService) {
+-        scheduler.getTerminationHandler().terminate(-1);
+-      }
+-    }
+-  }
+-
+-  public static boolean isFinalState(ContainerState state) {
+-    return ContainerState.FAILED.equals(state) || ContainerState.STOPPED
+-        .equals(state) || ContainerState.SUCCEEDED.equals(state);
+-  }
+-
+-  private static class StoppedAfterUpgradeTransition extends
+-      BaseTransition {
+-
+-    @Override
+-    public void transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-      instance.component.getUpgradeStatus().decContainersThatNeedUpgrade();
+-      instance.component.decRunningContainers();
+-
+-      final ServiceScheduler scheduler = instance.component.getScheduler();
+-      scheduler.getAmRMClient().releaseAssignedContainer(
+-          event.getContainerId());
+-      instance.scheduler.executorService.submit(
+-          () -> instance.cleanupRegistry(event.getContainerId()));
+-      scheduler.removeLiveCompInstance(event.getContainerId());
+-      instance.component.getUpgradeStatus().containerFailedUpgrade();
+-      instance.setContainerState(ContainerState.FAILED_UPGRADE);
+-      instance.upgradeInProgress.set(false);
+-    }
+-  }
+-
+-  private static class StoppedAfterCancelUpgradeTransition implements
+-      MultipleArcTransition<ComponentInstance, ComponentInstanceEvent,
+-          ComponentInstanceState> {
+-
+-    private ContainerStoppedTransition stoppedTransition =
+-        new ContainerStoppedTransition();
+-
+-    @Override
+-    public ComponentInstanceState transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-      if (instance.pendingCancelUpgrade) {
+-        // cancellation of upgrade was triggered before the upgrade was
+-        // finished.
+-        LOG.info("{} received stopped but cancellation pending",
+-            event.getContainerId());
+-        instance.upgradeInProgress.set(true);
+-        instance.cancelUpgrade();
+-        instance.pendingCancelUpgrade = false;
+-        return instance.getState();
+-      }
+-
+-      // When upgrade is cancelled, and container re-init fails
+-      instance.component.getCancelUpgradeStatus()
+-          .decContainersThatNeedUpgrade();
+-      instance.upgradeInProgress.set(false);
+-      stoppedTransition.transition(instance, event);
+-      return ComponentInstanceState.INIT;
+-    }
+-  }
+-
+-  private static class UpgradeTransition extends BaseTransition {
+-
+-    @Override
+-    public void transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-      if (!instance.component.getCancelUpgradeStatus().isCompleted()) {
+-        // last check to see if cancellation was triggered. The component may
+-        // have processed the cancel upgrade event but the instance doesn't know
+-        // it yet. If cancellation has been triggered then no point in
+-        // upgrading.
+-        return;
+-      }
+-      instance.upgradeInProgress.set(true);
+-      instance.setContainerState(ContainerState.UPGRADING);
+-      instance.component.decContainersReady(false);
+-
+-      Component.UpgradeStatus upgradeStatus = instance.component.
+-          getUpgradeStatus();
+-      instance.reInitHelper(upgradeStatus);
+-    }
+-  }
+-
+-  private static class CancelledAfterReinitTransition extends BaseTransition {
+-    @Override
+-    public void transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-      if (instance.upgradeInProgress.compareAndSet(false, true)) {
+-        instance.cancelUpgrade();
+-      } else {
+-        LOG.info("{} pending cancellation", event.getContainerId());
+-        instance.pendingCancelUpgrade = true;
+-      }
+-    }
+-  }
+-
+-  private static class CancelUpgradeTransition implements
+-      MultipleArcTransition<ComponentInstance, ComponentInstanceEvent,
+-          ComponentInstanceState> {
+-
+-    @Override
+-    public ComponentInstanceState transition(ComponentInstance instance,
+-        ComponentInstanceEvent event) {
+-      if (instance.upgradeInProgress.compareAndSet(false, true)) {
+-
+-        Component.UpgradeStatus cancelStatus = instance.component
+-            .getCancelUpgradeStatus();
+-
+-        if (instance.getServiceVersion().equals(
+-            cancelStatus.getTargetVersion())) {
+-          // previous upgrade didn't happen so just go back to READY
+-          LOG.info("{} nothing to cancel", event.getContainerId());
+-          cancelStatus.decContainersThatNeedUpgrade();
+-          instance.setContainerState(ContainerState.READY);
+-          ComponentEvent checkState = new ComponentEvent(
+-              instance.component.getName(), ComponentEventType.CHECK_STABLE);
+-          instance.scheduler.getDispatcher().getEventHandler()
+-              .handle(checkState);
+-          return ComponentInstanceState.READY;
+-        } else {
+-          instance.component.decContainersReady(false);
+-          instance.cancelUpgrade();
+-        }
+-      } else {
+-        LOG.info("{} pending cancellation", event.getContainerId());
+-        instance.pendingCancelUpgrade = true;
+-      }
+-      return ComponentInstanceState.CANCEL_UPGRADING;
+-    }
+-  }
+-
+-  private void cancelUpgrade() {
+-    LOG.info("{} cancelling upgrade", container.getId());
+-    setContainerState(ContainerState.UPGRADING);
+-    Component.UpgradeStatus cancelStatus = component.getCancelUpgradeStatus();
+-    reInitHelper(cancelStatus);
+-  }
+-
+-  private void reInitHelper(Component.UpgradeStatus upgradeStatus) {
+-    cancelContainerStatusRetriever();
+-    cancelLclRetriever();
+-    setContainerStatus(container.getId(), null);
+-    scheduler.executorService.submit(() -> cleanupRegistry(container.getId()));
+-    Future<ProviderService.ResolvedLaunchParams> launchParamsFuture =
+-        scheduler.getContainerLaunchService()
+-        .reInitCompInstance(scheduler.getApp(), this,
+-            this.container, this.component.createLaunchContext(
+-                upgradeStatus.getTargetSpec(),
+-                upgradeStatus.getTargetVersion()));
+-    updateResolvedLaunchParams(launchParamsFuture);
+-  }
+-
+-  private void initializeStatusRetriever(ComponentInstanceEvent event,
+-      long initialDelay) {
+-    boolean cancelOnSuccess = true;
+-    if (getCompSpec().getArtifact() != null &&
+-        getCompSpec().getArtifact().getType() == Artifact.TypeEnum.DOCKER) {
+-      // A docker container might get a different IP if the container is
+-      // relaunched by the NM, so we need to keep checking the status.
+-      // This is a temporary fix until the NM provides a callback for
+-      // container relaunch (see YARN-8265).
+-      cancelOnSuccess = false;
+-    }
+-    LOG.info("{} retrieve status after {}", compInstanceId, initialDelay);
+-    containerStatusFuture =
+-        scheduler.executorService.scheduleAtFixedRate(
+-            new ContainerStatusRetriever(scheduler, event.getContainerId(),
+-                this, cancelOnSuccess), initialDelay, 1,
+-            TimeUnit.SECONDS);
+-  }
+-
+-  public ComponentInstanceState getState() {
+-    this.readLock.lock();
+-
+-    try {
+-      return this.stateMachine.getCurrentState();
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Returns the version of service at which the instance is at.
+-   */
+-  public String getServiceVersion() {
+-    this.readLock.lock();
+-    try {
+-      return this.serviceVersion;
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Returns the state of the container in the container spec.
+-   */
+-  public ContainerState getContainerState() {
+-    this.readLock.lock();
+-    try {
+-      return this.containerSpec.getState();
+-    } finally {
+-      this.readLock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Sets the state of the container in the container spec. It is write
+-   * protected.
+-   *
+-   * @param state container state
+-   */
+-  public void setContainerState(ContainerState state) {
+-    this.writeLock.lock();
+-    try {
+-      ContainerState curState = containerSpec.getState();
+-      if (!curState.equals(state)) {
+-        containerSpec.setState(state);
+-        LOG.info("{} spec state state changed from {} -> {}",
+-            getCompInstanceId(), curState, state);
+-      }
+-    } finally {
+-      this.writeLock.unlock();
+-    }
+-  }
+-
+-  @Override
+-  public void handle(ComponentInstanceEvent event) {
+-    writeLock.lock();
+-    try {
+-      ComponentInstanceState oldState = getState();
+-      try {
+-        stateMachine.doTransition(event.getType(), event);
+-      } catch (InvalidStateTransitionException e) {
+-        LOG.error(getCompInstanceId() + ": Invalid event " + event.getType() +
+-            " at " + oldState, e);
+-      }
+-      if (oldState != getState()) {
+-        LOG.info(getCompInstanceId() + " Transitioned from " + oldState + " to "
+-            + getState() + " on " + event.getType() + " event");
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  public void setContainer(Container container) {
+-    this.container = container;
+-    this.compInstanceId.setContainerId(container.getId());
+-  }
+-
+-  public String getCompInstanceName() {
+-    return compInstanceId.getCompInstanceName();
+-  }
+-
+-  @VisibleForTesting
+-  void updateLocalizationStatuses(
+-      List<org.apache.hadoop.yarn.api.records.LocalizationStatus> statuses) {
+-    Map<String, String> resourcesCpy = new HashMap<>();
+-    readLock.lock();
+-    try {
+-      if (resolvedParams == null || resolvedParams.didLaunchFail() ||
+-          resolvedParams.getResolvedRsrcPaths() == null ||
+-          resolvedParams.getResolvedRsrcPaths().isEmpty()) {
+-        cancelLclRetriever();
+-        return;
+-      }
+-      resourcesCpy.putAll(resolvedParams.getResolvedRsrcPaths());
+-    } finally {
+-      readLock.unlock();
+-    }
+-    boolean allCompleted = true;
+-    Map<String, LocalizationStatus> fromNM = new HashMap<>();
+-    statuses.forEach(statusFromNM -> {
+-      LocalizationStatus lstatus = new LocalizationStatus()
+-          .destFile(statusFromNM.getResourceKey())
+-          .diagnostics(statusFromNM.getDiagnostics())
+-          .state(statusFromNM.getLocalizationState());
+-      fromNM.put(statusFromNM.getResourceKey(), lstatus);
+-    });
+-
+-    for (String resourceKey : resourcesCpy.keySet()) {
+-      LocalizationStatus lstatus = fromNM.get(resourceKey);
+-      if (lstatus == null ||
+-          lstatus.getState().equals(LocalizationState.PENDING)) {
+-        allCompleted = false;
+-        break;
+-      }
+-    }
+-
+-    List<LocalizationStatus> statusList = new ArrayList<>();
+-    statusList.addAll(fromNM.values());
+-    this.containerSpec.setLocalizationStatuses(statusList);
+-    if (allCompleted) {
+-      cancelLclRetriever();
+-    }
+-  }
+-
+-  public void updateResolvedLaunchParams(
+-      Future<ProviderService.ResolvedLaunchParams> future) {
+-    writeLock.lock();
+-    try {
+-      this.resolvedParams = future.get();
+-    } catch (InterruptedException | ExecutionException e) {
+-      LOG.error("{} updating resolved params", getCompInstanceId(), e);
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  public ContainerStatus getContainerStatus() {
+-    readLock.lock();
+-    try {
+-      return status;
+-    } finally {
+-      readLock.unlock();
+-    }
+-  }
+-
+-  private void setContainerStatus(ContainerId containerId,
+-      ContainerStatus latestStatus) {
+-    writeLock.lock();
+-    try {
+-      this.status = latestStatus;
+-      org.apache.hadoop.yarn.service.api.records.Container containerRec =
+-          getCompSpec().getContainer(containerId.toString());
+-
+-      if (containerRec != null) {
+-        if (latestStatus != null) {
+-          containerRec.setIp(StringUtils.join(",", latestStatus.getIPs()));
+-          containerRec.setHostname(latestStatus.getHost());
+-        } else {
+-          containerRec.setIp(null);
+-          containerRec.setHostname(null);
+-        }
+-      }
+-    } finally {
+-      writeLock.unlock();
+-    }
+-  }
+-
+-  public void updateContainerStatus(ContainerStatus status) {
+-    org.apache.hadoop.yarn.service.api.records.Container containerRec =
+-        getCompSpec().getContainer(status.getContainerId().toString());
+-    boolean doRegistryUpdate = true;
+-    if (containerRec != null) {
+-      String existingIP = containerRec.getIp();
+-      String newIP = StringUtils.join(",", status.getIPs());
+-      if (existingIP != null && newIP.equals(existingIP)) {
+-        doRegistryUpdate = false;
+-      }
+-    }
+-    ObjectMapper mapper = new ObjectMapper();
+-    try {
+-      Map<String, List<Map<String, String>>> ports = null;
+-      ports = mapper.readValue(status.getExposedPorts(),
+-          new TypeReference<Map<String, List<Map<String, String>>>>(){});
+-      container.setExposedPorts(ports);
+-    } catch (IOException e) {
+-      LOG.warn("Unable to process container ports mapping: {}", e);
+-    }
+-    setContainerStatus(status.getContainerId(), status);
+-    if (containerRec != null && timelineServiceEnabled && doRegistryUpdate) {
+-      serviceTimelinePublisher.componentInstanceIPHostUpdated(containerRec);
+-    }
+-
+-    if (doRegistryUpdate) {
+-      cleanupRegistry(status.getContainerId());
+-      LOG.info(
+-          getCompInstanceId() + " new IP = " + status.getIPs() + ", host = "
+-              + status.getHost() + ", updating registry");
+-      updateServiceRecord(yarnRegistryOperations, status);
+-    }
+-  }
+-
+-  public String getCompName() {
+-    return compInstanceId.getCompName();
+-  }
+-
+-  public void setCompInstanceDir(Path dir) {
+-    this.compInstanceDir = dir;
+-  }
+-
+-  public Component getComponent() {
+-    return component;
+-  }
+-
+-  public Container getContainer() {
+-    return container;
+-  }
+-
+-  public ComponentInstanceId getCompInstanceId() {
+-    return compInstanceId;
+-  }
+-
+-  public NodeId getNodeId() {
+-    return this.container.getNodeId();
+-  }
+-
+-  private org.apache.hadoop.yarn.service.api.records.Component getCompSpec() {
+-    return component.getComponentSpec();
+-  }
+-
+-  private static class BaseTransition implements
+-      SingleArcTransition<ComponentInstance, ComponentInstanceEvent> {
+-
+-    @Override public void transition(ComponentInstance compInstance,
+-        ComponentInstanceEvent event) {
+-    }
+-  }
+-
+-  public ProbeStatus ping() {
+-    if (component.getProbe() == null) {
+-      ProbeStatus status = new ProbeStatus();
+-      status.setSuccess(true);
+-      return status;
+-    }
+-    return component.getProbe().ping(this);
+-  }
+-
+-  // Write service record into registry
+-  private  void updateServiceRecord(
+-      YarnRegistryViewForProviders yarnRegistry, ContainerStatus status) {
+-    ServiceRecord record = new ServiceRecord();
+-    String containerId = status.getContainerId().toString();
+-    record.set(YARN_ID, containerId);
+-    record.description = getCompInstanceName();
+-    record.set(YARN_PERSISTENCE, PersistencePolicies.CONTAINER);
+-    record.set(YARN_IP, status.getIPs().get(0));
+-    record.set(YARN_HOSTNAME, status.getHost());
+-    record.set(YARN_COMPONENT, component.getName());
+-    try {
+-      yarnRegistry
+-          .putComponent(RegistryPathUtils.encodeYarnID(containerId), record);
+-    } catch (IOException e) {
+-      LOG.error(
+-          "Failed to update service record in registry: " + containerId + "");
+-    }
+-  }
+-
+-  // Called when user flexed down the container and ContainerStoppedTransition
+-  // is not executed in this case.
+-  // Release the container, dec running,
+-  // cleanup registry, hdfs dir, and send record to ATS
+-  public void destroy() {
+-    LOG.info(getCompInstanceId() + ": Flexed down by user, destroying.");
+-    diagnostics.append(getCompInstanceId() + ": Flexed down by user");
+-
+-    // update metrics
+-    if (getState() == STARTED) {
+-      component.decRunningContainers();
+-    }
+-    if (getState() == READY) {
+-      component.decContainersReady(true);
+-      component.decRunningContainers();
+-    }
+-    getCompSpec().removeContainer(containerSpec);
+-
+-    if (container == null) {
+-      LOG.info(getCompInstanceId() + " no container is assigned when " +
+-          "destroying");
+-      return;
+-    }
+-
+-    ContainerId containerId = container.getId();
+-    scheduler.removeLiveCompInstance(containerId);
+-    component.getScheduler().getAmRMClient()
+-        .releaseAssignedContainer(containerId);
+-
+-    if (timelineServiceEnabled) {
+-      serviceTimelinePublisher.componentInstanceFinished(containerId,
+-          KILLED_BY_APPMASTER, ContainerState.STOPPED, diagnostics.toString());
+-    }
+-    cancelContainerStatusRetriever();
+-    scheduler.executorService.submit(() ->
+-        cleanupRegistryAndCompHdfsDir(containerId));
+-    cancelLclRetriever();
+-  }
+-
+-  private void cleanupRegistry(ContainerId containerId) {
+-    String cid = RegistryPathUtils.encodeYarnID(containerId.toString());
+-    try {
+-       yarnRegistryOperations.deleteComponent(getCompInstanceId(), cid);
+-    } catch (IOException e) {
+-      LOG.error(getCompInstanceId() + ": Failed to delete registry", e);
+-    }
+-  }
+-
+-  //TODO Maybe have a dedicated cleanup service.
+-  public void cleanupRegistryAndCompHdfsDir(ContainerId containerId) {
+-    cleanupRegistry(containerId);
+-    try {
+-      if (compInstanceDir != null && fs.exists(compInstanceDir)) {
+-        boolean deleted = fs.delete(compInstanceDir, true);
+-        if (!deleted) {
+-          LOG.error(getCompInstanceId()
+-              + ": Failed to delete component instance dir: "
+-              + compInstanceDir);
+-        } else {
+-          LOG.info(getCompInstanceId() + ": Deleted component instance dir: "
+-              + compInstanceDir);
+-        }
+-      }
+-    } catch (IOException e) {
+-      LOG.warn(getCompInstanceId() + ": Failed to delete directory", e);
+-    }
+-  }
+-
+-  // Query container status until ip and hostname are available and update
+-  // the service record into registry service
+-  private static class ContainerStatusRetriever implements Runnable {
+-    private ContainerId containerId;
+-    private NodeId nodeId;
+-    private NMClient nmClient;
+-    private ComponentInstance instance;
+-    private boolean cancelOnSuccess;
+-    ContainerStatusRetriever(ServiceScheduler scheduler,
+-        ContainerId containerId, ComponentInstance instance, boolean
+-        cancelOnSuccess) {
+-      this.containerId = containerId;
+-      this.nodeId = instance.getNodeId();
+-      this.nmClient = scheduler.getNmClient().getClient();
+-      this.instance = instance;
+-      this.cancelOnSuccess = cancelOnSuccess;
+-    }
+-    @Override public void run() {
+-      ContainerStatus status = null;
+-      try {
+-        status = nmClient.getContainerStatus(containerId, nodeId);
+-      } catch (Exception e) {
+-        if (e instanceof YarnException) {
+-          throw new YarnRuntimeException(
+-              instance.compInstanceId + " Failed to get container status on "
+-                  + nodeId + " , cancelling.", e);
+-        }
+-        LOG.error(instance.compInstanceId + " Failed to get container status on "
+-            + nodeId + ", will try again", e);
+-        return;
+-      }
+-      if (ServiceUtils.isEmpty(status.getIPs()) || ServiceUtils
+-          .isUnset(status.getHost())) {
+-        return;
+-      }
+-      instance.updateContainerStatus(status);
+-      if (cancelOnSuccess) {
+-        LOG.info(
+-            instance.compInstanceId + " IP = " + status.getIPs() + ", host = "
+-                + status.getHost() + ", cancel container status retriever");
+-        instance.containerStatusFuture.cancel(false);
+-      }
+-    }
+-  }
+-
+-  private void cancelContainerStatusRetriever() {
+-    if (containerStatusFuture != null && !containerStatusFuture.isDone()) {
+-      containerStatusFuture.cancel(true);
+-    }
+-  }
+-
+-  private static class LocalizationStatusRetriever implements Runnable {
+-    private ContainerId containerId;
+-    private NodeId nodeId;
+-    private NMClient nmClient;
+-    private ComponentInstance instance;
+-
+-    LocalizationStatusRetriever(ServiceScheduler scheduler,
+-        ContainerId containerId, ComponentInstance instance) {
+-      this.nmClient = scheduler.getNmClient().getClient();
+-      this.containerId = containerId;
+-      this.instance = instance;
+-      this.nodeId = instance.getNodeId();
+-    }
+-
+-    @Override
+-    public void run() {
+-      List<org.apache.hadoop.yarn.api.records.LocalizationStatus>
+-          statusesFromNM = null;
+-      try {
+-        statusesFromNM = nmClient.getLocalizationStatuses(containerId,
+-            nodeId);
+-      } catch (YarnException | IOException e) {
+-        LOG.error("{} Failed to get localization statuses for {} {} ",
+-            instance.compInstanceId, nodeId, containerId, e);
+-      }
+-      if (statusesFromNM != null && !statusesFromNM.isEmpty()) {
+-        instance.updateLocalizationStatuses(statusesFromNM);
+-      }
+-    }
+-  }
+-
+-  private void initializeLocalizationStatusRetriever(
+-      ContainerId containerId) {
+-    LOG.info("{} retrieve localization statuses", compInstanceId);
+-    lclizationRetrieverFuture = scheduler.executorService.scheduleAtFixedRate(
+-        new LocalizationStatusRetriever(scheduler, containerId, this),
+-        0, 1, TimeUnit.SECONDS
+-    );
+-  }
+-
+-  private void cancelLclRetriever() {
+-    if (lclizationRetrieverFuture != null &&
+-        !lclizationRetrieverFuture.isDone()) {
+-      LOG.info("{} cancelling localization retriever", compInstanceId);
+-      lclizationRetrieverFuture.cancel(true);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  boolean isLclRetrieverActive() {
+-    return lclizationRetrieverFuture != null &&
+-        !lclizationRetrieverFuture.isCancelled()
+-         && !lclizationRetrieverFuture.isDone();
+-  }
+-
+-  public String getHostname() {
+-    return getCompInstanceName() + getComponent().getHostnameSuffix();
+-  }
+-
+-  @Override
+-  public int compareTo(ComponentInstance to) {
+-    return getCompInstanceId().compareTo(to.getCompInstanceId());
+-  }
+-
+-  @Override public boolean equals(Object o) {
+-    if (this == o)
+-      return true;
+-    if (o == null || getClass() != o.getClass())
+-      return false;
+-
+-    ComponentInstance instance = (ComponentInstance) o;
+-
+-    if (containerStartedTime != instance.containerStartedTime)
+-      return false;
+-    return compInstanceId.equals(instance.compInstanceId);
+-  }
+-
+-  @Override public int hashCode() {
+-    int result = compInstanceId.hashCode();
+-    result = 31 * result + (int) (containerStartedTime ^ (containerStartedTime
+-        >>> 32));
+-    return result;
+-  }
+-
+-  /**
+-   * Returns container spec.
+-   */
+-  public org.apache.hadoop.yarn.service.api.records
+-      .Container getContainerSpec() {
+-    readLock.lock();
+-    try {
+-      return containerSpec;
+-    } finally {
+-      readLock.unlock();
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEvent.java
+deleted file mode 100644
+index f88252618c3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEvent.java
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.event.AbstractEvent;
+-
+-public class ComponentInstanceEvent
+-    extends AbstractEvent<ComponentInstanceEventType> {
+-
+-  private ContainerId id;
+-  private ContainerStatus status;
+-  private boolean shouldDestroy = false;
+-
+-  public ComponentInstanceEvent(ContainerId containerId,
+-      ComponentInstanceEventType componentInstanceEventType) {
+-    super(componentInstanceEventType);
+-    Preconditions.checkNotNull(containerId);
+-    this.id = containerId;
+-  }
+-
+-  public ContainerId getContainerId() {
+-    return id;
+-  }
+-
+-  public ContainerStatus getStatus() {
+-    return this.status;
+-  }
+-
+-  public ComponentInstanceEvent setStatus(ContainerStatus status) {
+-    this.status = status;
+-    return this;
+-  }
+-
+-  public void setShouldDestroy() {
+-    shouldDestroy = true;
+-  }
+-
+-  public boolean shouldDestroy() {
+-    return shouldDestroy;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEventType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEventType.java
+deleted file mode 100644
+index b9181e5b3a4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceEventType.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-public enum ComponentInstanceEventType {
+-  START,
+-  STOP,
+-  BECOME_READY,
+-  BECOME_NOT_READY,
+-  UPGRADE,
+-  CANCEL_UPGRADE
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceId.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceId.java
+deleted file mode 100644
+index 14387ba0832..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceId.java
++++ /dev/null
+@@ -1,91 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-
+-public class ComponentInstanceId implements Comparable<ComponentInstanceId> {
+-
+-  private long Id;
+-  private String name;
+-  private ContainerId containerId;
+-
+-  public ComponentInstanceId(long id, String name) {
+-    Id = id;
+-    this.name = name;
+-  }
+-
+-  public long getId() {
+-    return Id;
+-  }
+-
+-  public String getCompName() {
+-    return name;
+-  }
+-
+-  public String getCompInstanceName() {
+-    return getCompName() + "-" + getId();
+-  }
+-
+-  public void setContainerId(ContainerId containerId) {
+-    this.containerId = containerId;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    if (containerId == null) {
+-      return "[COMPINSTANCE " + getCompInstanceName() + "]";
+-    } else {
+-      return "[COMPINSTANCE " + getCompInstanceName() + " : " + containerId + "]";
+-    }
+-  }
+-
+-  @Override public boolean equals(Object o) {
+-    if (this == o)
+-      return true;
+-    if (o == null || getClass() != o.getClass())
+-      return false;
+-
+-    ComponentInstanceId that = (ComponentInstanceId) o;
+-
+-    if (getId() != that.getId())
+-      return false;
+-    return getCompName() != null ? getCompName().equals(that.getCompName()) :
+-        that.getCompName() == null;
+-
+-  }
+-
+-  @Override public int hashCode() {
+-    int result = (int) (getId() ^ (getId() >>> 32));
+-    result = 31 * result + (getCompName() != null ? getCompName().hashCode() : 0);
+-    return result;
+-  }
+-
+-  @Override
+-  public int compareTo(ComponentInstanceId to) {
+-    int delta = this.getCompName().compareTo(to.getCompName());
+-    if (delta == 0) {
+-      return Long.compare(this.getId(), to.getId());
+-    } else if (delta < 0) {
+-      return -1;
+-    } else {
+-      return 1;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceState.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceState.java
+deleted file mode 100644
+index 92b221efdb9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/instance/ComponentInstanceState.java
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-public enum ComponentInstanceState {
+-  INIT,
+-  STARTED,
+-  READY,
+-  UPGRADING,
+-  CANCEL_UPGRADING,
+-  REINITIALIZED
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/RestApiConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/RestApiConstants.java
+deleted file mode 100644
+index 45ad7e4adbb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/RestApiConstants.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import javax.ws.rs.core.MediaType;
+-
+-public interface RestApiConstants {
+-
+-  // Rest endpoints
+-  String CONTEXT_ROOT = "/v1";
+-  String VERSION = "/services/version";
+-  String SERVICE_ROOT_PATH = "/services";
+-  String SERVICE_PATH = "/services/{service_name}";
+-  String COMPONENT_PATH = "/services/{service_name}/components/{component_name}";
+-
+-  String COMP_INSTANCE_PATH = SERVICE_PATH +
+-      "/component-instances/{component_instance_name}";
+-  String COMP_INSTANCE_LONG_PATH = COMPONENT_PATH +
+-      "/component-instances/{component_instance_name}";
+-  String COMP_INSTANCES = "component-instances";
+-  String COMP_INSTANCES_PATH = SERVICE_PATH + "/" + COMP_INSTANCES;
+-  String COMPONENTS = "components";
+-  String COMPONENTS_PATH = SERVICE_PATH + "/" + COMPONENTS;
+-
+-  String SERVICE_NAME = "service_name";
+-  String COMPONENT_NAME = "component_name";
+-  String COMP_INSTANCE_NAME = "component_instance_name";
+-
+-  String PARAM_COMP_NAME = "componentName";
+-  String PARAM_VERSION = "version";
+-  String PARAM_CONTAINER_STATE = "containerState";
+-
+-  String MEDIA_TYPE_JSON_UTF8 = MediaType.APPLICATION_JSON + ";charset=utf-8";
+-
+-  Long DEFAULT_UNLIMITED_LIFETIME = -1l;
+-
+-  Integer ERROR_CODE_APP_DOES_NOT_EXIST = 404001;
+-  Integer ERROR_CODE_APP_IS_NOT_RUNNING = 404002;
+-  Integer ERROR_CODE_APP_SUBMITTED_BUT_NOT_RUNNING_YET = 404003;
+-  Integer ERROR_CODE_APP_NAME_INVALID = 404004;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/SliderExitCodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/SliderExitCodes.java
+deleted file mode 100644
+index ee270cb90dd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/SliderExitCodes.java
++++ /dev/null
+@@ -1,88 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes;
+-
+-public interface SliderExitCodes extends LauncherExitCodes {
+-
+-  /**
+-   * starting point for exit codes; not an exception itself
+-   */
+-  int _EXIT_CODE_BASE =           64;
+-
+-  /**
+-   * service entered the failed state: {@value}
+-   */
+-  int EXIT_YARN_SERVICE_FAILED =  65;
+-
+-  /**
+-   * service was killed: {@value}
+-   */
+-  int EXIT_YARN_SERVICE_KILLED =  66;
+-
+-  /**
+-   * timeout on monitoring client: {@value}
+-   */
+-  int EXIT_TIMED_OUT =            67;
+-
+-  /**
+-   * service finished with an error: {@value}
+-   */
+-  int EXIT_YARN_SERVICE_FINISHED_WITH_ERROR = 68;
+-
+-  /**
+-   * the service instance is unknown: {@value}
+-   */
+-  int EXIT_UNKNOWN_INSTANCE =     69;
+-
+-  /**
+-   * the service instance is in the wrong state for that operation: {@value}
+-   */
+-  int EXIT_BAD_STATE =            70;
+-
+-  /**
+-   * A spawned master process failed 
+-   */
+-  int EXIT_PROCESS_FAILED =       71;
+-
+-  /**
+-   * The instance failed -too many containers were
+-   * failing or some other threshold was reached
+-   */
+-  int EXIT_DEPLOYMENT_FAILED =    72;
+-
+-  /**
+-   * The service is live -and the requested operation
+-   * does not work if the cluster is running
+-   */
+-  int EXIT_APPLICATION_IN_USE =   73;
+-
+-  /**
+-   * There already is an service instance of that name
+-   * when an attempt is made to create a new instance
+-   */
+-  int EXIT_INSTANCE_EXISTS =      75;
+-
+-  /**
+-   * Exit code when the configurations in valid/incomplete: {@value}
+-   */
+-  int EXIT_BAD_CONFIGURATION =    77;
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java
+deleted file mode 100644
+index d3716b91933..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConf.java
++++ /dev/null
+@@ -1,224 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-
+-// ALL SERVICE AM PROPERTIES ADDED TO THIS FILE MUST BE DOCUMENTED
+-// in the yarn site yarn-service/Configurations.md file.
+-public class YarnServiceConf {
+-
+-  private static final String YARN_SERVICE_PREFIX = "yarn.service.";
+-
+-  // Retry settings for the ServiceClient to talk to Service AppMaster
+-  public static final String CLIENT_AM_RETRY_MAX_WAIT_MS = "yarn.service.client-am.retry.max-wait-ms";
+-  public static final long DEFAULT_CLIENT_AM_RETRY_MAX_WAIT_MS = 15 * 60 * 1000;
+-  public static final String CLIENT_AM_RETRY_MAX_INTERVAL_MS = "yarn.service.client-am.retry-interval-ms";
+-  public static final long DEFAULT_CLIENT_AM_RETRY_MAX_INTERVAL_MS = 2 * 1000;
+-
+-  // Retry settings for container failures
+-  public static final String CONTAINER_RETRY_MAX = "yarn.service.container-failure.retry.max";
+-  public static final int DEFAULT_CONTAINER_RETRY_MAX = 10;
+-  public static final String CONTAINER_RETRY_INTERVAL = "yarn.service.container-failure.retry-interval-ms";
+-  public static final int DEFAULT_CONTAINER_RETRY_INTERVAL = 30000;
+-  public static final String CONTAINER_FAILURES_VALIDITY_INTERVAL =
+-      "yarn.service.container-failure.validity-interval-ms";
+-  public static final long DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL =
+-      600000;
+-
+-  public static final String AM_RESTART_MAX = "yarn.service.am-restart.max-attempts";
+-  public static final int DEFAULT_AM_RESTART_MAX = 20;
+-  public static final String AM_FAILURES_VALIDITY_INTERVAL =
+-      "yarn.service.am-failure.validity-interval-ms";
+-  public static final long DEFAULT_AM_FAILURES_VALIDITY_INTERVAL = -1;
+-  public static final String AM_RESOURCE_MEM = "yarn.service.am-resource.memory";
+-  public static final long DEFAULT_KEY_AM_RESOURCE_MEM = 1024;
+-  public static final String YARN_SERVICE_AM_CLIENT_PORT_RANGE =
+-      YARN_SERVICE_PREFIX + "am.client.port-range";
+-
+-  public static final String YARN_QUEUE = "yarn.service.queue";
+-  public static final String DEFAULT_YARN_QUEUE = "default";
+-
+-  public static final String API_SERVER_ADDRESS = "yarn.service.api-server.address";
+-  public static final String DEFAULT_API_SERVER_ADDRESS = "0.0.0.0:";
+-  public static final int DEFAULT_API_SERVER_PORT = 9191;
+-
+-  public static final String FINAL_LOG_INCLUSION_PATTERN = "yarn.service.log.include-pattern";
+-  public static final String FINAL_LOG_EXCLUSION_PATTERN = "yarn.service.log.exclude-pattern";
+-
+-  public static final String ROLLING_LOG_INCLUSION_PATTERN = "yarn.service.rolling-log.include-pattern";
+-  public static final String ROLLING_LOG_EXCLUSION_PATTERN = "yarn.service.rolling-log.exclude-pattern";
+-
+-  public static final String YARN_SERVICE_CLASSPATH = "yarn.service.classpath";
+-
+-  public static final String YARN_SERVICES_SYSTEM_SERVICE_DIRECTORY =
+-      YARN_SERVICE_PREFIX + "system-service.dir";
+-
+-  /**
+-   * The yarn service base path:
+-   * Defaults to HomeDir/.yarn/
+-   */
+-  public static final String YARN_SERVICE_BASE_PATH = "yarn.service.base.path";
+-
+-  /**
+-   * maximum number of failed containers (in a single component)
+-   * before the app exits
+-   */
+-  public static final String CONTAINER_FAILURE_THRESHOLD =
+-      "yarn.service.container-failure-per-component.threshold";
+-  public static final int DEFAULT_CONTAINER_FAILURE_THRESHOLD = 10;
+-
+-  /**
+-   * Maximum number of container failures on a node before the node is blacklisted
+-   */
+-  public static final String NODE_BLACKLIST_THRESHOLD =
+-      "yarn.service.node-blacklist.threshold";
+-  public static final int DEFAULT_NODE_BLACKLIST_THRESHOLD = 3;
+-
+-  /**
+-   * The failure count for CONTAINER_FAILURE_THRESHOLD and NODE_BLACKLIST_THRESHOLD
+-   * gets reset periodically, the unit is seconds.
+-   */
+-  public static final String CONTAINER_FAILURE_WINDOW =
+-      "yarn.service.failure-count-reset.window";
+-  public static final long DEFAULT_CONTAINER_FAILURE_WINDOW = 21600;
+-
+-  /**
+-   * interval between readiness checks.
+-   */
+-  public static final String READINESS_CHECK_INTERVAL = "yarn.service.readiness-check-interval.seconds";
+-  public static final int DEFAULT_READINESS_CHECK_INTERVAL = 30; // seconds
+-
+-  /**
+-   * Default readiness check enabled.
+-   */
+-  public static final String DEFAULT_READINESS_CHECK_ENABLED =
+-      "yarn.service.default-readiness-check.enabled";
+-  public static final boolean DEFAULT_READINESS_CHECK_ENABLED_DEFAULT = true;
+-
+-  /**
+-   * JVM opts.
+-   */
+-  public static final String JVM_OPTS = "yarn.service.am.java.opts";
+-  public static final String DEFAULT_AM_JVM_XMX = " -Xmx768m ";
+-
+-  /**
+-   * How long to wait until a container is considered dead.
+-   */
+-  public static final String CONTAINER_RECOVERY_TIMEOUT_MS =
+-      YARN_SERVICE_PREFIX + "container-recovery.timeout.ms";
+-
+-  public static final int DEFAULT_CONTAINER_RECOVERY_TIMEOUT_MS = 120000;
+-
+-  /**
+-   * The dependency tarball file location.
+-   */
+-  public static final String DEPENDENCY_TARBALL_PATH = YARN_SERVICE_PREFIX
+-      + "framework.path";
+-
+-  public static final String YARN_SERVICE_CONTAINER_HEALTH_THRESHOLD_PREFIX =
+-      YARN_SERVICE_PREFIX + "container-health-threshold.";
+-
+-  /**
+-   * Upgrade feature enabled for services.
+-   */
+-  public static final String YARN_SERVICE_UPGRADE_ENABLED =
+-      "yarn.service.upgrade.enabled";
+-  public static final boolean YARN_SERVICE_UPGRADE_ENABLED_DEFAULT = false;
+-
+-  /**
+-   * The container health threshold percent when explicitly set for a specific
+-   * component or globally for all components, will schedule a health check
+-   * monitor to periodically check for the percentage of healthy containers. It
+-   * runs the check at a specified/default poll frequency. It allows a component
+-   * to be below the health threshold for a specified/default window after which
+-   * it considers the service to be unhealthy and triggers a service stop. When
+-   * health threshold percent is enabled, CONTAINER_FAILURE_THRESHOLD is
+-   * ignored.
+-   */
+-  public static final String CONTAINER_HEALTH_THRESHOLD_PERCENT =
+-      YARN_SERVICE_CONTAINER_HEALTH_THRESHOLD_PREFIX + "percent";
+-  /**
+-   * Health check monitor poll frequency. It is an advanced setting and does not
+-   * need to be set unless the service owner understands the implication and
+-   * does not want the default.
+-   */
+-  public static final String CONTAINER_HEALTH_THRESHOLD_POLL_FREQUENCY_SEC =
+-      YARN_SERVICE_CONTAINER_HEALTH_THRESHOLD_PREFIX + "poll-frequency-secs";
+-  /**
+-   * The amount of time the health check monitor allows a specific component to
+-   * be below the health threshold after which it considers the service to be
+-   * unhealthy.
+-   */
+-  public static final String CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC =
+-      YARN_SERVICE_CONTAINER_HEALTH_THRESHOLD_PREFIX + "window-secs";
+-  /**
+-   * The amount of initial time the health check monitor waits before the first
+-   * check kicks in. It gives a lead time for the service containers to come up
+-   * for the first time.
+-   */
+-  public static final String CONTAINER_HEALTH_THRESHOLD_INIT_DELAY_SEC =
+-      YARN_SERVICE_CONTAINER_HEALTH_THRESHOLD_PREFIX + "init-delay-secs";
+-  /**
+-   * By default the health threshold percent does not come into play until it is
+-   * explicitly set in resource config for a specific component or globally for
+-   * all components. -1 signifies disabled.
+-   */
+-  public static final int CONTAINER_HEALTH_THRESHOLD_PERCENT_DISABLED = -1;
+-
+-  public static final int DEFAULT_CONTAINER_HEALTH_THRESHOLD_PERCENT =
+-      CONTAINER_HEALTH_THRESHOLD_PERCENT_DISABLED;
+-  public static final long DEFAULT_CONTAINER_HEALTH_THRESHOLD_POLL_FREQUENCY_SEC = 10;
+-  public static final long DEFAULT_CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC = 600;
+-  // The default for initial delay is same as default health window
+-  public static final long DEFAULT_CONTAINER_HEALTH_THRESHOLD_INIT_DELAY_SEC =
+-      DEFAULT_CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC;
+-
+-  /**
+-   * Get long value for the property. First get from the userConf, if not
+-   * present, get from systemConf.
+-   *
+-   * @param name name of the property
+-   * @param defaultValue default value of the property, if it is not defined in
+-   *                     userConf and systemConf.
+-   * @param userConf Configuration provided by client in the JSON definition
+-   * @param systemConf The YarnConfiguration in the system.
+-   * @return long value for the property
+-   */
+-  public static long getLong(String name, long defaultValue,
+-      Configuration userConf, org.apache.hadoop.conf.Configuration systemConf) {
+-    return userConf.getPropertyLong(name, systemConf.getLong(name, defaultValue));
+-  }
+-
+-  public static int getInt(String name, int defaultValue,
+-      Configuration userConf, org.apache.hadoop.conf.Configuration systemConf) {
+-    return userConf.getPropertyInt(name, systemConf.getInt(name, defaultValue));
+-  }
+-
+-  public static boolean getBoolean(String name, boolean defaultValue,
+-      Configuration userConf, org.apache.hadoop.conf.Configuration systemConf) {
+-    return userConf.getPropertyBool(name, systemConf.getBoolean(name,
+-        defaultValue));
+-  }
+-
+-  public static String get(String name, String defaultVal,
+-      Configuration userConf, org.apache.hadoop.conf.Configuration systemConf) {
+-    return userConf.getProperty(name, systemConf.get(name, defaultVal));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConstants.java
+deleted file mode 100644
+index dd940650c8a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/conf/YarnServiceConstants.java
++++ /dev/null
+@@ -1,102 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-public interface YarnServiceConstants {
+-
+-  /**
+-   * The path under which cluster and temp data are stored
+-   */
+-  String SERVICE_BASE_DIRECTORY = ".yarn";
+-
+-  /**
+-   * The paths under which Service AM dependency libraries are stored
+-   */
+-  String DEPENDENCY_LOCALIZED_DIR_LINK = "service_dep";
+-  String DEPENDENCY_DIR = "/yarn-services/%s/";
+-  String DEPENDENCY_TAR_GZ_FILE_NAME = "service-dep";
+-  String DEPENDENCY_TAR_GZ_FILE_EXT = ".tar.gz";
+-  String DEPENDENCY_DIR_PERMISSIONS = "755";
+-
+-  /**
+-   * Service type for YARN service
+-   */
+-  String APP_TYPE = "yarn-service";
+-
+-  String KEYTAB_DIR = "keytabs";
+-  String KEYTAB_LOCATION = KEYTAB_DIR + "/%s" + ".keytab";
+-
+-  String RESOURCE_DIR = "resources";
+-
+-
+-  String SERVICES_DIRECTORY = "services";
+-
+-  String SERVICES_PUBLIC_DIRECTORY = "/tmp/hadoop-yarn/staging/";
+-
+-  /**
+-   * JVM property to define the service lib directory;
+-   * this is set by the yarn.sh script
+-   */
+-  String PROPERTY_LIB_DIR = "service.libdir";
+-
+-  /**
+-   * name of generated dir for this conf
+-   */
+-  String SUBMITTED_CONF_DIR = "conf";
+-
+-  /**
+-   * Service AM log4j file name
+-   */
+-  String YARN_SERVICE_LOG4J_FILENAME = "yarnservice-log4j.properties";
+-
+-  /**
+-   * Log4j sysprop to name the resource
+-   */
+-  String SYSPROP_LOG4J_CONFIGURATION = "log4j.configuration";
+-
+-  /**
+-   * sysprop for Service AM log4j directory
+-   */
+-  String SYSPROP_LOG_DIR = "LOG_DIR";
+-
+-  String TMP_DIR_PREFIX = "tmp";
+-
+-
+-  String SERVICE_CORE_JAR = "yarn-service-core.jar";
+-
+-  String STDOUT_AM = "serviceam-out.txt";
+-  String STDERR_AM = "serviceam-err.txt";
+-
+-  String HADOOP_USER_NAME = "HADOOP_USER_NAME";
+-
+-  String APP_CONF_DIR = "conf";
+-  String APP_RESOURCES_DIR = "resources";
+-
+-  String APP_LIB_DIR = "lib";
+-
+-  String OUT_FILE = "stdout.txt";
+-  String ERR_FILE = "stderr.txt";
+-
+-  String CONTENT = "content";
+-  String PRINCIPAL = "yarn.service.am.principal";
+-
+-  String UPGRADE_DIR = "upgrade";
+-  String CONTAINER_STATE_REPORT_AS_SERVICE_STATE =
+-      "yarn.service.container-state-report-as-service-state";
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java
+deleted file mode 100644
+index 7db78949230..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/AbstractLauncher.java
++++ /dev/null
+@@ -1,262 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.ContainerRetryContext;
+-import org.apache.hadoop.yarn.api.records.ContainerRetryPolicy;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-/**
+- * Launcher of applications: base class
+- */
+-public class AbstractLauncher {
+-  private static final Logger log =
+-    LoggerFactory.getLogger(AbstractLauncher.class);
+-  public static final String CLASSPATH = "CLASSPATH";
+-  public static final String ENV_DOCKER_CONTAINER_MOUNTS =
+-      "YARN_CONTAINER_RUNTIME_DOCKER_MOUNTS";
+-  /**
+-   * Env vars; set up at final launch stage
+-   */
+-  protected final Map<String, String> envVars = new HashMap<>();
+-  protected final ContainerLaunchContext containerLaunchContext =
+-    Records.newRecord(ContainerLaunchContext.class);
+-  protected final List<String> commands = new ArrayList<>(20);
+-  protected final Map<String, LocalResource> localResources = new HashMap<>();
+-  protected final Map<String, String> mountPaths = new HashMap<>();
+-  private final Map<String, ByteBuffer> serviceData = new HashMap<>();
+-  protected boolean yarnDockerMode = false;
+-  protected String dockerImage;
+-  protected String dockerNetwork;
+-  protected String dockerHostname;
+-  protected boolean runPrivilegedContainer = false;
+-  private ServiceContext context;
+-
+-  public AbstractLauncher(ServiceContext context) {
+-    this.context = context;
+-  }
+-  
+-  public void setYarnDockerMode(boolean yarnDockerMode){
+-    this.yarnDockerMode = yarnDockerMode;
+-  }
+-
+-  /**
+-   * Get the env vars to work on
+-   * @return env vars
+-   */
+-  public Map<String, String> getEnv() {
+-    return envVars;
+-  }
+-
+-  /**
+-   * Get the launch commands.
+-   * @return the live list of commands 
+-   */
+-  public List<String> getCommands() {
+-    return commands;
+-  }
+-
+-  public void addLocalResource(String subPath, LocalResource resource) {
+-    localResources.put(subPath, resource);
+-  }
+-
+-  public void addLocalResource(String subPath, LocalResource resource, String mountPath) {
+-    localResources.put(subPath, resource);
+-    mountPaths.put(subPath, mountPath);
+-  }
+-
+-
+-  public void addCommand(String cmd) {
+-    commands.add(cmd);
+-  }
+-
+-  /**
+-   * Complete the launch context (copy in env vars, etc).
+-   * @return the container to launch
+-   */
+-  public ContainerLaunchContext completeContainerLaunch() throws IOException {
+-    
+-    String cmdStr = ServiceUtils.join(commands, " ", false);
+-    log.debug("Completed setting up container command {}", cmdStr);
+-    containerLaunchContext.setCommands(commands);
+-
+-    //env variables
+-    if (log.isDebugEnabled()) {
+-      log.debug("Environment variables");
+-      for (Map.Entry<String, String> envPair : envVars.entrySet()) {
+-        log.debug("    \"{}\"=\"{}\"", envPair.getKey(), envPair.getValue());
+-      }
+-    }    
+-    containerLaunchContext.setEnvironment(envVars);
+-
+-    //service data
+-    if (log.isDebugEnabled()) {
+-      log.debug("Service Data size");
+-      for (Map.Entry<String, ByteBuffer> entry : serviceData.entrySet()) {
+-        log.debug("\"{}\"=> {} bytes of data", entry.getKey(),
+-            entry.getValue().array().length);
+-      }
+-    }
+-    containerLaunchContext.setServiceData(serviceData);
+-
+-    // resources
+-    dumpLocalResources();
+-    containerLaunchContext.setLocalResources(localResources);
+-
+-    //tokens
+-    if (context.tokens != null) {
+-      containerLaunchContext.setTokens(context.tokens.duplicate());
+-    }
+-
+-    if(yarnDockerMode){
+-      Map<String, String> env = containerLaunchContext.getEnvironment();
+-      env.put("YARN_CONTAINER_RUNTIME_TYPE", "docker");
+-      env.put("YARN_CONTAINER_RUNTIME_DOCKER_IMAGE", dockerImage);
+-      if (ServiceUtils.isSet(dockerNetwork)) {
+-        env.put("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_NETWORK",
+-            dockerNetwork);
+-      }
+-      env.put("YARN_CONTAINER_RUNTIME_DOCKER_CONTAINER_HOSTNAME",
+-          dockerHostname);
+-      if (runPrivilegedContainer) {
+-        env.put("YARN_CONTAINER_RUNTIME_DOCKER_RUN_PRIVILEGED_CONTAINER",
+-            "true");
+-      }
+-      if (!mountPaths.isEmpty()) {
+-        StringBuilder sb = new StringBuilder();
+-        if (env.get(ENV_DOCKER_CONTAINER_MOUNTS) != null) {
+-          // user specified mounts in the spec
+-          sb.append(env.get(ENV_DOCKER_CONTAINER_MOUNTS));
+-        }
+-        for (Entry<String, String> mount : mountPaths.entrySet()) {
+-          if (sb.length() > 0) {
+-            sb.append(",");
+-          }
+-          sb.append(mount.getKey()).append(":")
+-              .append(mount.getValue()).append(":ro");
+-        }
+-        env.put(ENV_DOCKER_CONTAINER_MOUNTS, sb.toString());
+-      }
+-      log.info("yarn docker env var has been set {}",
+-          containerLaunchContext.getEnvironment().toString());
+-    }
+-
+-    return containerLaunchContext;
+-  }
+-
+-  public void setRetryContext(int maxRetries, int retryInterval,
+-      long failuresValidityInterval) {
+-    ContainerRetryContext retryContext = ContainerRetryContext
+-        .newInstance(ContainerRetryPolicy.RETRY_ON_ALL_ERRORS, null,
+-            maxRetries, retryInterval, failuresValidityInterval);
+-    containerLaunchContext.setContainerRetryContext(retryContext);
+-  }
+-
+-  /**
+-   * Dump local resources at debug level
+-   */
+-  private void dumpLocalResources() {
+-    if (log.isDebugEnabled()) {
+-      log.debug("{} resources: ", localResources.size());
+-      for (Map.Entry<String, LocalResource> entry : localResources.entrySet()) {
+-
+-        String key = entry.getKey();
+-        LocalResource val = entry.getValue();
+-        log.debug("{} = {}", key, ServiceUtils.stringify(val.getResource()));
+-      }
+-    }
+-  }
+-
+-  /**
+-   * This is critical for an insecure cluster -it passes
+-   * down the username to YARN, and so gives the code running
+-   * in containers the rights it needs to work with
+-   * data.
+-   * @throws IOException problems working with current user
+-   */
+-  protected void propagateUsernameInInsecureCluster() throws IOException {
+-    //insecure cluster: propagate user name via env variable
+-    String userName = UserGroupInformation.getCurrentUser().getUserName();
+-    envVars.put(YarnServiceConstants.HADOOP_USER_NAME, userName);
+-  }
+-
+-  /**
+-   * Utility method to set up the classpath
+-   * @param classpath classpath to use
+-   */
+-  public void setClasspath(ClasspathConstructor classpath) {
+-    setEnv(CLASSPATH, classpath.buildClasspath());
+-  }
+-
+-  /**
+-   * Set an environment variable in the launch context
+-   * @param var variable name
+-   * @param value value (must be non null)
+-   */
+-  public void setEnv(String var, String value) {
+-    Preconditions.checkArgument(var != null, "null variable name");
+-    Preconditions.checkArgument(value != null, "null value");
+-    envVars.put(var, value);
+-  }
+-
+-
+-  public void putEnv(Map<String, String> map) {
+-    envVars.putAll(map);
+-  }
+-
+-
+-  public void setDockerImage(String dockerImage) {
+-    this.dockerImage = dockerImage;
+-  }
+-
+-  public void setDockerNetwork(String dockerNetwork) {
+-    this.dockerNetwork = dockerNetwork;
+-  }
+-
+-  public void setDockerHostname(String dockerHostname) {
+-    this.dockerHostname = dockerHostname;
+-  }
+-
+-  public void setRunPrivilegedContainer(boolean runPrivilegedContainer) {
+-    this.runPrivilegedContainer = runPrivilegedContainer;
+-  }
+-
+-  @VisibleForTesting
+-  public String getDockerImage() {
+-    return dockerImage;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ClasspathConstructor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ClasspathConstructor.java
+deleted file mode 100644
+index 711abb25eac..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ClasspathConstructor.java
++++ /dev/null
+@@ -1,172 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.List;
+-
+-/**
+- * build a classpath -allows for entries to be injected in front of
+- * YARN classpath as well as behind, adds appropriate separators, 
+- * extraction of local classpath, etc.
+- */
+-public class ClasspathConstructor {
+-
+-    public static final String CLASS_PATH_SEPARATOR = ApplicationConstants.CLASS_PATH_SEPARATOR;
+-  private final List<String> pathElements = new ArrayList<>();
+-
+-  public ClasspathConstructor() {
+-  }
+-
+-
+-  /**
+-   * Get the list of JARs from the YARN settings
+-   * @param config configuration
+-   */
+-  public List<String> yarnApplicationClasspath(Configuration config) {
+-    String[] cp = config.getTrimmedStrings(
+-      YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-      YarnConfiguration.DEFAULT_YARN_CROSS_PLATFORM_APPLICATION_CLASSPATH);
+-    return cp != null ? Arrays.asList(cp) : new ArrayList<String>(0);
+-
+-  }
+-
+-
+-  @Override
+-  public String toString() {
+-    return buildClasspath();
+-  }
+-
+-  public String buildClasspath() {
+-    return ServiceUtils.join(pathElements,
+-        CLASS_PATH_SEPARATOR,
+-        false);
+-  }
+-
+-  /**
+-   * Get a copy of the path list
+-   * @return the JARs
+-   */
+-  public List<String> getPathElements() {
+-    return Collections.unmodifiableList(pathElements);
+-  }
+-
+-  /**
+-   * Append an entry
+-   * @param path path
+-   */
+-  public void append(String path) {
+-    pathElements.add(path);
+-  }
+-
+-  /**
+-   * Insert a path at the front of the list. This places it ahead of
+-   * the standard YARN artifacts
+-   * @param path path to the JAR. Absolute or relative -on the target
+-   * system
+-   */
+-  public void insert(String path) {
+-    pathElements.add(0, path);
+-  }
+-
+-  public void appendAll(Collection<String> paths) {
+-    pathElements.addAll(paths);
+-  }
+-
+-  public void insertAll(Collection<String> paths) {
+-    pathElements.addAll(0, paths);
+-  }
+-
+-
+-  public void addLibDir(String pathToLibDir) {
+-    append(buildLibDir(pathToLibDir));
+-  }
+-
+-  public void insertLibDir(String pathToLibDir) {
+-    insert(buildLibDir(pathToLibDir));
+-  }
+-
+-  public void addClassDirectory(String pathToDir) {
+-    append(appendDirectoryTerminator(pathToDir));
+-  }
+-
+-  public void insertClassDirectory(String pathToDir) {
+-    insert(buildLibDir(appendDirectoryTerminator(pathToDir)));
+-  }
+-
+-
+-  public void addRemoteClasspathEnvVar() {
+-    append(ApplicationConstants.Environment.CLASSPATH.$$());
+-  }
+-
+-
+-  public void insertRemoteClasspathEnvVar() {
+-    append(ApplicationConstants.Environment.CLASSPATH.$$());
+-  }
+-
+-
+-  /**
+-   * Build a lib dir path
+-   * @param pathToLibDir path to the directory; may or may not end with a
+-   * trailing space
+-   * @return a path to a lib dir that is compatible with the java classpath
+-   */
+-  public String buildLibDir(String pathToLibDir) {
+-    String dir = appendDirectoryTerminator(pathToLibDir);
+-    dir += "*";
+-    return dir;
+-  }
+-
+-  private String appendDirectoryTerminator(String pathToLibDir) {
+-    String dir = pathToLibDir.trim();
+-    if (!dir.endsWith("/")) {
+-      dir += "/";
+-    }
+-    return dir;
+-  }
+-
+-  /**
+-   * Split a classpath. This uses the local path separator so MUST NOT
+-   * be used to work with remote classpaths
+-   * @param localpath local path
+-   * @return a splite
+-   */
+-  public Collection<String> splitClasspath(String localpath) {
+-    String separator = System.getProperty("path.separator");
+-    return StringUtils.getStringCollection(localpath, separator);
+-  }
+-
+-  /**
+-   * Get the local JVM classpath split up
+-   * @return the list of entries on the JVM classpath env var
+-   */
+-  public Collection<String> localJVMClasspath() {
+-    return splitClasspath(System.getProperty("java.class.path"));
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/CommandLineBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/CommandLineBuilder.java
+deleted file mode 100644
+index 70e3fc23abb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/CommandLineBuilder.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-/**
+- * Build a single command line to include in the container commands;
+- * Special support for JVM command buildup.
+- */
+-public class CommandLineBuilder {
+-  protected final List<String> argumentList = new ArrayList<>(20);
+-
+-  /**
+-   * Add an entry to the command list
+-   * @param args arguments -these will be converted strings
+-   */
+-  public void add(Object... args) {
+-    for (Object arg : args) {
+-      argumentList.add(arg.toString());
+-    }
+-  }
+-
+-  // Get the number of arguments
+-  public int size() {
+-    return argumentList.size();
+-  }
+-  
+-  /**
+-   * Append the output and error files to the tail of the command
+-   * @param stdout out
+-   * @param stderr error. Set this to null to append into stdout
+-   */
+-  public void addOutAndErrFiles(String stdout, String stderr) {
+-    Preconditions.checkNotNull(stdout, "Null output file");
+-    Preconditions.checkState(!stdout.isEmpty(), "output filename invalid");
+-    // write out the path output
+-    argumentList.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" +
+-             stdout);
+-    if (stderr != null) {
+-      argumentList.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" +
+-               stderr);
+-    } else {
+-      argumentList.add("2>&1");
+-    }
+-  }
+-
+-  /**
+-   * This just returns the command line
+-   * @see #build()
+-   * @return the command line
+-   */
+-  @Override
+-  public String toString() {
+-    return build();
+-  }
+-
+-  /**
+-   * Build the command line
+-   * @return the command line
+-   */
+-  public String build() {
+-    return ServiceUtils.join(argumentList, " ");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ContainerLaunchService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ContainerLaunchService.java
+deleted file mode 100644
+index 3debc45f670..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/ContainerLaunchService.java
++++ /dev/null
+@@ -1,210 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.concurrent.Callable;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.Future;
+-
+-import static org.apache.hadoop.yarn.service.provider.ProviderService.FAILED_LAUNCH_PARAMS;
+-
+-public class ContainerLaunchService extends AbstractService{
+-
+-  protected static final Logger LOG =
+-      LoggerFactory.getLogger(ContainerLaunchService.class);
+-
+-  private ExecutorService executorService;
+-  private SliderFileSystem fs;
+-  private ServiceContext context;
+-  public ContainerLaunchService(ServiceContext context) {
+-    super(ContainerLaunchService.class.getName());
+-    this.fs = context.fs;
+-    this.context = context;
+-  }
+-
+-  @Override
+-  public void serviceInit(Configuration conf) throws Exception {
+-    executorService = Executors.newCachedThreadPool();
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (executorService != null) {
+-      executorService.shutdownNow();
+-    }
+-    super.serviceStop();
+-  }
+-
+-  public Future<ProviderService.ResolvedLaunchParams> launchCompInstance(
+-      Service service,
+-      ComponentInstance instance, Container container,
+-      ComponentLaunchContext componentLaunchContext) {
+-    ContainerLauncher launcher =
+-        new ContainerLauncher(service, instance, container,
+-            componentLaunchContext, false);
+-    return executorService.submit(launcher);
+-  }
+-
+-  public Future<ProviderService.ResolvedLaunchParams> reInitCompInstance(
+-      Service service,
+-      ComponentInstance instance, Container container,
+-      ComponentLaunchContext componentLaunchContext) {
+-    ContainerLauncher reInitializer = new ContainerLauncher(service, instance,
+-        container, componentLaunchContext, true);
+-    return executorService.submit(reInitializer);
+-  }
+-
+-  private class ContainerLauncher implements
+-      Callable<ProviderService.ResolvedLaunchParams> {
+-    public final Container container;
+-    public final Service service;
+-    public ComponentInstance instance;
+-    private final ComponentLaunchContext componentLaunchContext;
+-    private final boolean reInit;
+-
+-    ContainerLauncher(Service service, ComponentInstance instance,
+-        Container container, ComponentLaunchContext componentLaunchContext,
+-        boolean reInit) {
+-      this.container = container;
+-      this.service = service;
+-      this.instance = instance;
+-      this.componentLaunchContext = componentLaunchContext;
+-      this.reInit = reInit;
+-    }
+-
+-    @Override
+-    public ProviderService.ResolvedLaunchParams call() {
+-      ProviderService provider = ProviderFactory.getProviderService(
+-          componentLaunchContext.getArtifact());
+-      AbstractLauncher launcher = new AbstractLauncher(context);
+-      ProviderService.ResolvedLaunchParams resolvedParams = null;
+-      try {
+-        resolvedParams = provider.buildContainerLaunchContext(launcher, service,
+-            instance, fs, getConfig(), container, componentLaunchContext);
+-        if (!reInit) {
+-          LOG.info("launching container {}", container.getId());
+-          instance.getComponent().getScheduler().getNmClient()
+-              .startContainerAsync(container,
+-                  launcher.completeContainerLaunch());
+-        } else {
+-          LOG.info("reInitializing container {} with version {}",
+-              container.getId(), componentLaunchContext.getServiceVersion());
+-          instance.getComponent().getScheduler().getNmClient()
+-              .reInitializeContainerAsync(container.getId(),
+-                  launcher.completeContainerLaunch(), true);
+-        }
+-      } catch (Exception e) {
+-        LOG.error("{}: Failed to launch container.",
+-            instance.getCompInstanceId(), e);
+-        ComponentEvent event = new ComponentEvent(instance.getCompName(),
+-            ComponentEventType.CONTAINER_COMPLETED)
+-            .setInstance(instance).setContainerId(container.getId());
+-        context.scheduler.getDispatcher().getEventHandler().handle(event);
+-      }
+-      if (resolvedParams != null) {
+-        return resolvedParams;
+-      } else {
+-        return FAILED_LAUNCH_PARAMS;
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Launch context of a component.
+-   */
+-  public static class ComponentLaunchContext {
+-    private final String name;
+-    private final String serviceVersion;
+-    private Artifact artifact;
+-    private org.apache.hadoop.yarn.service.api.records.Configuration
+-        configuration;
+-    private String launchCommand;
+-    private boolean runPrivilegedContainer;
+-
+-    public ComponentLaunchContext(String name, String serviceVersion) {
+-      this.name = Preconditions.checkNotNull(name);
+-      this.serviceVersion = Preconditions.checkNotNull(serviceVersion);
+-    }
+-
+-    public String getName() {
+-      return name;
+-    }
+-
+-    public String getServiceVersion() {
+-      return serviceVersion;
+-    }
+-
+-    public Artifact getArtifact() {
+-      return artifact;
+-    }
+-
+-    public org.apache.hadoop.yarn.service.api.records.
+-        Configuration getConfiguration() {
+-      return configuration;
+-    }
+-
+-    public String getLaunchCommand() {
+-      return launchCommand;
+-    }
+-
+-    public boolean isRunPrivilegedContainer() {
+-      return runPrivilegedContainer;
+-    }
+-
+-    public ComponentLaunchContext setArtifact(Artifact artifact) {
+-      this.artifact = artifact;
+-      return this;
+-    }
+-
+-    public ComponentLaunchContext setConfiguration(org.apache.hadoop.yarn.
+-        service.api.records.Configuration configuration) {
+-      this.configuration = configuration;
+-      return this;
+-    }
+-
+-    public ComponentLaunchContext setLaunchCommand(String launchCommand) {
+-      this.launchCommand = launchCommand;
+-      return this;
+-    }
+-
+-    public ComponentLaunchContext setRunPrivilegedContainer(
+-        boolean runPrivilegedContainer) {
+-      this.runPrivilegedContainer = runPrivilegedContainer;
+-      return this;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/JavaCommandLineBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/JavaCommandLineBuilder.java
+deleted file mode 100644
+index 5578ea3624e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/containerlaunch/JavaCommandLineBuilder.java
++++ /dev/null
+@@ -1,180 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-
+-import java.util.Map;
+-
+-/**
+- * Command line builder purely for the Java CLI.
+- * Some of the <code>define</code> methods are designed to work with Hadoop tool and
+- * Slider launcher applications.
+- */
+-public class JavaCommandLineBuilder extends CommandLineBuilder {
+-
+-  public JavaCommandLineBuilder() {
+-    add(getJavaBinary());
+-  }
+-
+-  /**
+-   * Get the java binary. This is called in the constructor so don't try and
+-   * do anything other than return a constant.
+-   * @return the path to the Java binary
+-   */
+-  protected String getJavaBinary() {
+-    return ApplicationConstants.Environment.JAVA_HOME.$$() + "/bin/java";
+-  }
+-
+-  /**
+-   * Set JVM opts.
+-   * @param jvmOpts JVM opts
+-   */
+-  public void setJVMOpts(String jvmOpts) {
+-    if (ServiceUtils.isSet(jvmOpts)) {
+-      add(jvmOpts);
+-    }
+-  }
+-
+-  /**
+-   * Turn Java assertions on
+-   */
+-  public void enableJavaAssertions() {
+-    add("-ea");
+-    add("-esa");
+-  }
+-
+-  /**
+-   * Add a system property definition -must be used before setting the main entry point
+-   * @param property
+-   * @param value
+-   */
+-  public void sysprop(String property, String value) {
+-    Preconditions.checkArgument(property != null, "null property name");
+-    Preconditions.checkArgument(value != null, "null value");
+-    add("-D" + property + "=" + value);
+-  }
+-  
+-  public JavaCommandLineBuilder forceIPv4() {
+-    sysprop("java.net.preferIPv4Stack", "true");
+-    return this;
+-  }
+-  
+-  public JavaCommandLineBuilder headless() {
+-    sysprop("java.awt.headless", "true");
+-    return this;
+-  }
+-
+-  public boolean addConfOption(Configuration conf, String key) {
+-    return defineIfSet(key, conf.get(key));
+-  }
+-
+-  /**
+-   * Add a varargs list of configuration parameters —if they are present
+-   * @param conf configuration source
+-   * @param keys keys
+-   */
+-  public void addConfOptions(Configuration conf, String... keys) {
+-    for (String key : keys) {
+-      addConfOption(conf, key);
+-    }
+-  }
+-
+-  /**
+-   * Add all configuration options which match the prefix
+-   * @param conf configuration
+-   * @param prefix prefix, e.g {@code "slider."}
+-   * @return the number of entries copied
+-   */
+-  public int addPrefixedConfOptions(Configuration conf, String prefix) {
+-    int copied = 0;
+-    for (Map.Entry<String, String> entry : conf) {
+-      if (entry.getKey().startsWith(prefix)) {
+-        define(entry.getKey(), entry.getValue());
+-        copied++;
+-      }
+-    }
+-    return copied;
+-  }
+-
+-  /**
+-   * Ass a configuration option to the command line of  the application
+-   * @param conf configuration
+-   * @param key key
+-   * @param defVal default value
+-   * @return the resolved configuration option
+-   * @throws IllegalArgumentException if key is null or the looked up value
+-   * is null (that is: the argument is missing and devVal was null.
+-   */
+-  public String addConfOptionToCLI(Configuration conf,
+-      String key,
+-      String defVal) {
+-    Preconditions.checkArgument(key != null, "null key");
+-    String val = conf.get(key, defVal);
+-    define(key, val);
+-    return val;
+-  }
+-
+-  /**
+-   * Add a <code>-D key=val</code> command to the CLI. This is very Hadoop API
+-   * @param key key
+-   * @param val value
+-   * @throws IllegalArgumentException if either argument is null
+-   */
+-  public void define(String key, String val) {
+-    Preconditions.checkArgument(key != null, "null key");
+-    Preconditions.checkArgument(val != null, "null value");
+-    add("-D", key + "=" + val);
+-  }
+-
+-  /**
+-   * Add a <code>-D key=val</code> command to the CLI if <code>val</code>
+-   * is not null
+-   * @param key key
+-   * @param val value
+-   */
+-  public boolean defineIfSet(String key, String val) {
+-    Preconditions.checkArgument(key != null, "null key");
+-    if (val != null) {
+-      define(key, val);
+-      return true;
+-    } else {
+-      return false;
+-    }
+-  }
+-
+-  /**
+-   * Add a mandatory config option
+-   * @param conf configuration
+-   * @param key key
+-   * @throws BadConfigException if the key is missing
+-   */
+-  public void addMandatoryConfOption(Configuration conf,
+-      String key) throws BadConfigException {
+-    if (!addConfOption(conf, key)) {
+-      throw new BadConfigException("Missing configuration option: " + key);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadClusterStateException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadClusterStateException.java
+deleted file mode 100644
+index db9de7a1c26..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadClusterStateException.java
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-
+-/**
+- * The system is in a bad state
+- */
+-public class BadClusterStateException extends SliderException {
+-  public BadClusterStateException(String message,
+-                                  Object... args) {
+-    super(EXIT_BAD_STATE, message, args);
+-  }
+-
+-  public BadClusterStateException(Throwable throwable,
+-                                  String message, Object... args) {
+-    super(EXIT_BAD_STATE, throwable, message, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadCommandArgumentsException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadCommandArgumentsException.java
+deleted file mode 100644
+index 41e325159d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadCommandArgumentsException.java
++++ /dev/null
+@@ -1,30 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-public class BadCommandArgumentsException extends SliderException {
+-  public BadCommandArgumentsException(String s, Object... args) {
+-    super(EXIT_COMMAND_ARGUMENT_ERROR, s, args);
+-  }
+-
+-  public BadCommandArgumentsException(Throwable throwable, String message,
+-                                      Object... args) {
+-    super(EXIT_COMMAND_ARGUMENT_ERROR, throwable, message, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadConfigException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadConfigException.java
+deleted file mode 100644
+index 8199c3c17ed..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/BadConfigException.java
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-/**
+- * An exception to raise on a bad configuration
+- */
+-public class BadConfigException extends SliderException {
+-
+-  public BadConfigException(String s) {
+-    super(EXIT_BAD_CONFIGURATION, s);
+-  }
+-
+-  public BadConfigException(String message, Object... args) {
+-    super(EXIT_BAD_CONFIGURATION, message, args);
+-  }
+-
+-  public BadConfigException(
+-                            Throwable throwable,
+-                            String message, Object... args) {
+-    super(EXIT_BAD_CONFIGURATION, throwable, message, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ErrorStrings.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ErrorStrings.java
+deleted file mode 100644
+index 6ae124faedd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ErrorStrings.java
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-public interface ErrorStrings {
+-
+-  String PRINTF_E_INSTANCE_ALREADY_EXISTS = "Service Instance \"%s\" already exists and is defined in %s";
+-  String PRINTF_E_INSTANCE_DIR_ALREADY_EXISTS = "Service Instance dir already exists: %s";
+-
+-  /**
+-   * ERROR Strings
+-   */
+-  String ERROR_NO_ACTION = "No action specified";
+-  String ERROR_UNKNOWN_ACTION = "Unknown command: ";
+-  String ERROR_NOT_ENOUGH_ARGUMENTS =
+-    "Not enough arguments for action: ";
+-  String ERROR_PARSE_FAILURE =
+-      "Failed to parse ";
+-  /**
+-   * All the remaining values after argument processing
+-   */
+-  String ERROR_TOO_MANY_ARGUMENTS =
+-    "Too many arguments";
+-  String ERROR_DUPLICATE_ENTRY = "Duplicate entry for ";
+-
+-  String SERVICE_UPGRADE_DISABLED = "Service upgrade is disabled.";
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ExitCodeProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ExitCodeProvider.java
+deleted file mode 100644
+index d66b86030eb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ExitCodeProvider.java
++++ /dev/null
+@@ -1,32 +0,0 @@
+-/*
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-/**
+- * Get the exit code of an exception. Making it an interface allows
+- * us to retrofit exit codes onto existing classes
+- */
+-public interface ExitCodeProvider {
+-
+-  /**
+-   * Method to get the exit code
+-   * @return the exit code
+-   */
+-  int  getExitCode();
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/LauncherExitCodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/LauncherExitCodes.java
+deleted file mode 100644
+index 483fb48d465..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/LauncherExitCodes.java
++++ /dev/null
+@@ -1,196 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-/*
+- * Common Exit codes
+- * <p>
+- * Exit codes from 64 up are service specific.
+- * <p>
+- * Many of the exit codes are designed to resemble HTTP error codes,
+- * squashed into a single byte. e.g 44 , "not found" is the equivalent
+- * of 404
+- * <pre>
+- *    0-10: general command issues
+- *   30-39: equivalent to the 3XX responses, where those responses are
+- *          considered errors by the service.
+- *   40-49: request-related errors
+- *   50-59: server-side problems. These may be triggered by the request.
+- *   64-  : service specific error codes
+- * </pre>
+- */
+-public interface LauncherExitCodes {
+-  
+-  /**
+-   * 0: success
+-   */
+-  int EXIT_SUCCESS                    =  0;
+-
+-  /**
+-   * -1: generic "false" response. The operation worked but
+-   * the result was not true
+-   */
+-  int EXIT_FALSE                      = -1;
+-
+-  /**
+-   * Exit code when a client requested service termination: {@value}
+-   */
+-  int EXIT_CLIENT_INITIATED_SHUTDOWN  =  1;
+-
+-  /**
+-   * Exit code when targets could not be launched: {@value}
+-   */
+-  int EXIT_TASK_LAUNCH_FAILURE        =  2;
+-
+-  /**
+-   * Exit code when a control-C, kill -3, signal was picked up: {@value}
+-   */
+-  int EXIT_INTERRUPTED                = 3;
+-
+-  /**
+-   * Exit code when a usage message was printed: {@value}
+-   */
+-  int EXIT_USAGE                      = 4;
+-
+-  /**
+-   * Exit code when something happened but we can't be specific: {@value}
+-   */
+-  int EXIT_OTHER_FAILURE               = 5;
+-
+-  /**
+-   * Exit code on connectivity problems: {@value}
+-   */
+-  int EXIT_MOVED                      = 31;
+-  
+-  /**
+-   * found: {@value}.
+-   * <p>
+-   * This is low value as in HTTP it is normally a success/redirect;
+-   * whereas on the command line 0 is the sole success code.
+-   * <p>
+-   * <code>302 Found</code>
+-   */
+-  int EXIT_FOUND                      = 32;
+-
+-  /**
+-   * Exit code on a request where the destination has not changed
+-   * and (somehow) the command specified that this is an error.
+-   * That is, this exit code is somehow different from a "success"
+-   * : {@value}
+-   * <p>
+-   * <code>304 Not Modified </code>
+-  */
+-  int EXIT_NOT_MODIFIED               = 34;
+-
+-  /**
+-   * Exit code when the command line doesn't parse: {@value}, or
+-   * when it is otherwise invalid.
+-   * <p>
+-   * <code>400 BAD REQUEST</code>
+-   */
+-  int EXIT_COMMAND_ARGUMENT_ERROR     = 40;
+-
+-  /**
+-   * The request requires user authentication: {@value}
+-   * <p>
+-   * <code>401 Unauthorized</code>
+-   */
+-  int EXIT_UNAUTHORIZED               = 41;
+-  
+-  /**
+-   * Forbidden action: {@value}
+-   * <p>
+-   * <code>403: Forbidden</code>
+-   */
+-  int EXIT_FORBIDDEN                  = 43;
+-  
+-  /**
+-   * Something was not found: {@value}
+-   * <p>
+-   * <code>404: NOT FOUND</code>
+-   */
+-  int EXIT_NOT_FOUND                  = 44;
+-
+-  /**
+-   * The operation is not allowed: {@value}
+-   * <p>
+-   * <code>405: NOT ALLOWED</code>
+-   */
+-  int EXIT_OPERATION_NOT_ALLOWED       = 45;
+-
+-  /**
+-   * The command is somehow not acceptable: {@value}
+-   * <p>
+-   * <code>406: NOT ACCEPTABLE</code>
+-   */
+-  int EXIT_NOT_ACCEPTABLE            = 46;
+-
+-  /**
+-   * Exit code on connectivity problems: {@value}
+-   * <p>
+-   * <code>408: Request Timeout</code>
+-   */
+-  int EXIT_CONNECTIVITY_PROBLEM       = 48;
+-
+-  /**
+-   * The request could not be completed due to a conflict with the current
+-   * state of the resource.  {@value}
+-   * <p>
+-   * <code>409: conflict</code>
+-   */
+-  int EXIT_CONFLICT                   = 49;
+-
+-  /**
+-   * internal error: {@value}
+-   * <p>
+-   * <code>500 Internal Server Error</code>
+-   */
+-  int EXIT_INTERNAL_ERROR             = 50;
+-
+-  /**
+-   * Unimplemented feature: {@value}
+-   * <p>
+-   * <code>501: Not Implemented</code>
+-   */
+-  int EXIT_UNIMPLEMENTED              = 51;
+-
+-  /**
+-   * Service Unavailable; it may be available later: {@value}
+-   * <p>
+-   * <code>503 Service Unavailable</code>
+-   */
+-  int EXIT_SERVICE_UNAVAILABLE        = 53;
+-
+-  /**
+-   * The service does not support, or refuses to support this version: {@value}.
+-   * If raised, this is expected to be raised server-side and likely due
+-   * to client/server version incompatibilities.
+-   * <p>
+-   * <code> 505: Version Not Supported</code>
+-   */
+-  int EXIT_UNSUPPORTED_VERSION        = 55;
+-
+-  /**
+-   * Exit code when an exception was thrown from the service: {@value}
+-   * <p>
+-   * <code>5XX</code>
+-   */
+-  int EXIT_EXCEPTION_THROWN           = 56;
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/RestApiErrorMessages.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/RestApiErrorMessages.java
+deleted file mode 100644
+index 295f14af098..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/RestApiErrorMessages.java
++++ /dev/null
+@@ -1,131 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-public interface RestApiErrorMessages {
+-  String ERROR_APPLICATION_NAME_INVALID =
+-      "Service name is either empty or not provided";
+-  String ERROR_APPLICATION_VERSION_INVALID =
+-      "Version of service %s is either empty or not provided";
+-  String ERROR_APPLICATION_NAME_INVALID_FORMAT =
+-      "Service name %s is not valid - only lower case letters, digits, " +
+-          "and hyphen are allowed, and the name must be no more " +
+-          "than 63 characters";
+-  String ERROR_COMPONENT_NAME_INVALID =
+-      "Component name must be no more than %s characters: %s";
+-  String ERROR_COMPONENT_NAME_CONFLICTS_WITH_SERVICE_NAME =
+-      "Component name %s must not be same as service name %s";
+-  String ERROR_USER_NAME_INVALID =
+-      "User name must be no more than 63 characters";
+-
+-  String ERROR_APPLICATION_NOT_RUNNING = "Service not running";
+-  String ERROR_APPLICATION_DOES_NOT_EXIST = "Service not found";
+-  String ERROR_APPLICATION_IN_USE = "Service already exists in started"
+-      + " state";
+-  String ERROR_APPLICATION_INSTANCE_EXISTS = "Service already exists in"
+-      + " stopped/failed state (either restart with PUT or destroy with DELETE"
+-      + " before creating a new one)";
+-
+-  String ERROR_SUFFIX_FOR_COMPONENT =
+-      " for component %s (nor at the global level)";
+-  String ERROR_ARTIFACT_INVALID = "Artifact is not provided";
+-  String ERROR_ARTIFACT_FOR_COMP_INVALID =
+-      ERROR_ARTIFACT_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_ARTIFACT_ID_INVALID =
+-      "Artifact id (like docker image name) is either empty or not provided";
+-  String ERROR_ARTIFACT_ID_FOR_COMP_INVALID =
+-      ERROR_ARTIFACT_ID_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_ARTIFACT_PATH_FOR_COMP_INVALID = "For component %s with %s "
+-      + "artifact, path does not exist: %s";
+-  String ERROR_CONFIGFILE_DEST_FILE_FOR_COMP_NOT_ABSOLUTE = "For component %s "
+-      + "with %s artifact, dest_file must be a relative path: %s";
+-
+-  String ERROR_RESOURCE_INVALID = "Resource is not provided";
+-  String ERROR_RESOURCE_FOR_COMP_INVALID =
+-      ERROR_RESOURCE_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_RESOURCE_MEMORY_INVALID =
+-      "Service resource or memory not provided";
+-  String ERROR_RESOURCE_CPUS_INVALID =
+-      "Service resource or cpus not provided";
+-  String ERROR_RESOURCE_CPUS_INVALID_RANGE =
+-      "Unacceptable no of cpus specified, either zero or negative";
+-  String ERROR_RESOURCE_MEMORY_FOR_COMP_INVALID =
+-      ERROR_RESOURCE_MEMORY_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_RESOURCE_CPUS_FOR_COMP_INVALID =
+-      ERROR_RESOURCE_CPUS_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_RESOURCE_CPUS_FOR_COMP_INVALID_RANGE =
+-      ERROR_RESOURCE_CPUS_INVALID_RANGE
+-          + " for component %s (or at the global level)";
+-  String ERROR_CONTAINERS_COUNT_INVALID =
+-      "Invalid no of containers specified";
+-  String ERROR_CONTAINERS_COUNT_FOR_COMP_INVALID =
+-      ERROR_CONTAINERS_COUNT_INVALID + ERROR_SUFFIX_FOR_COMPONENT;
+-  String ERROR_DEPENDENCY_INVALID = "Dependency %s for component %s is " +
+-      "invalid, does not exist as a component";
+-  String ERROR_DEPENDENCY_CYCLE = "Invalid dependencies, a cycle may " +
+-      "exist: %s";
+-
+-  String ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_NOT_SUPPORTED =
+-      "Cannot specify" + " cpus/memory along with profile";
+-  String ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_FOR_COMP_NOT_SUPPORTED =
+-      ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_NOT_SUPPORTED
+-          + " for component %s";
+-  String ERROR_RESOURCE_PROFILE_NOT_SUPPORTED_YET =
+-      "Resource profile is not " + "supported yet. Please specify cpus/memory.";
+-
+-  String ERROR_NULL_ARTIFACT_ID =
+-      "Artifact Id can not be null if artifact type is none";
+-  String ERROR_ABSENT_NUM_OF_INSTANCE =
+-      "Num of instances should appear either globally or per component";
+-  String ERROR_ABSENT_LAUNCH_COMMAND =
+-      "launch_command is required when type is not DOCKER";
+-
+-  String ERROR_QUICKLINKS_FOR_COMP_INVALID = "Quicklinks specified at"
+-      + " component level, needs corresponding values set at service level";
+-  // Note: %sin is not a typo. Constraint name is optional so the error messages
+-  // below handle that scenario by adding a space if name is specified.
+-  String ERROR_PLACEMENT_POLICY_CONSTRAINT_TYPE_NULL = "Type not specified "
+-      + "for constraint %sin placement policy of component %s.";
+-  String ERROR_PLACEMENT_POLICY_CONSTRAINT_SCOPE_NULL = "Scope not specified "
+-      + "for constraint %sin placement policy of component %s.";
+-  String ERROR_PLACEMENT_POLICY_CONSTRAINT_TAGS_NULL = "Tag(s) not specified "
+-      + "for constraint %sin placement policy of component %s.";
+-  String ERROR_PLACEMENT_POLICY_TAG_NAME_NOT_SAME = "Invalid target tag %s "
+-      + "specified in placement policy of component %s. For now, target tags "
+-      + "support self reference only. Specifying anything other than its "
+-      + "component name is not supported. Set target tag of component %s to "
+-      + "%s.";
+-  String ERROR_PLACEMENT_POLICY_TAG_NAME_INVALID = "Invalid target tag %s "
+-      + "specified in placement policy of component %s. Target tags should be "
+-      + "a valid component name in the service.";
+-  String ERROR_PLACEMENT_POLICY_EXPRESSION_ELEMENT_NAME_INVALID = "Invalid "
+-      + "expression element name %s specified in placement policy of component "
+-      + "%s. Expression element names should be a valid constraint name or an "
+-      + "expression name defined for this component only.";
+-
+-  String ERROR_COMP_INSTANCE_DOES_NOT_NEED_UPGRADE = "The component instance " +
+-      "(%s) does not need an upgrade.";
+-
+-  String ERROR_COMP_DOES_NOT_NEED_UPGRADE = "The component (%s) does not need" +
+-      " an upgrade.";
+-  String ERROR_KERBEROS_PRINCIPAL_NAME_FORMAT = "Kerberos principal (%s) does " +
+-      " not contain a hostname.";
+-  String ERROR_KERBEROS_PRINCIPAL_MISSING = "Kerberos principal or keytab is" +
+-      " missing.";
+-  String ERROR_JVM_OPTS = "Invalid character in yarn.service.am.java.opts.";
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ServiceLaunchException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ServiceLaunchException.java
+deleted file mode 100644
+index e83ccbe5973..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/ServiceLaunchException.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/*
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * A service launch exception that includes an exit code;
+- * when caught by the ServiceLauncher, it will convert that
+- * into a process exit code.
+- */
+-public class ServiceLaunchException extends YarnException
+-  implements ExitCodeProvider, LauncherExitCodes {
+-
+-  private final int exitCode;
+-
+-  /**
+-   * Create an exception with the specific exit code
+-   * @param exitCode exit code
+-   * @param cause cause of the exception
+-   */
+-  public ServiceLaunchException(int exitCode, Throwable cause) {
+-    super(cause);
+-    this.exitCode = exitCode;
+-  }
+-
+-  /**
+-   * Create an exception with the specific exit code and text
+-   * @param exitCode exit code
+-   * @param message message to use in exception
+-   */
+-  public ServiceLaunchException(int exitCode, String message) {
+-    super(message);
+-    this.exitCode = exitCode;
+-  }
+-
+-  /**
+-   * Create an exception with the specific exit code, text and cause
+-   * @param exitCode exit code
+-   * @param message message to use in exception
+-   * @param cause cause of the exception
+-   */
+-  public ServiceLaunchException(int exitCode, String message, Throwable cause) {
+-    super(message, cause);
+-    this.exitCode = exitCode;
+-  }
+-
+-  /**
+-   * Get the exit code
+-   * @return the exit code
+-   */
+-  @Override
+-  public int getExitCode() {
+-    return exitCode;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/SliderException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/SliderException.java
+deleted file mode 100644
+index 5b74b80e298..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/SliderException.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-
+-public class SliderException extends ServiceLaunchException implements
+-    SliderExitCodes {
+-  public SliderException() {
+-    super(EXIT_EXCEPTION_THROWN, "SliderException");
+-  }
+-
+-  public SliderException(int code, String message) {
+-    super(code, message);
+-  }
+-
+-  public SliderException(String s) {
+-    super(EXIT_EXCEPTION_THROWN, s);
+-  }
+-
+-  public SliderException(String s, Throwable throwable) {
+-    super(EXIT_EXCEPTION_THROWN, s, throwable);
+-  }
+-
+-  /**
+-   * Format the exception as you create it
+-   * @param code exit code
+-   * @param message exception message -sprintf formatted
+-   * @param args arguments for the formatting
+-   */
+-  public SliderException(int code, String message, Object... args) {
+-    super(code, String.format(message, args));
+-  }
+-
+-  /**
+-   * Format the exception, include a throwable. 
+-   * The throwable comes before the message so that it is out of the varargs
+-   * @param code exit code
+-   * @param throwable thrown
+-   * @param message message
+-   * @param args arguments
+-   */
+-  public SliderException(int code,
+-      Throwable throwable,
+-      String message,
+-      Object... args) {
+-    super(code, String.format(message, args), throwable);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/UsageException.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/UsageException.java
+deleted file mode 100644
+index 3a9fa25507d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/exceptions/UsageException.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.exceptions;
+-
+-/**
+- * Used to raise a usage exception ... this has the exit code
+- * {@link #EXIT_USAGE}
+- */
+-public class UsageException extends SliderException {
+-  public UsageException(String s, Object... args) {
+-    super(EXIT_USAGE, s, args);
+-  }
+-
+-  public UsageException(Throwable throwable, String message,
+-      Object... args) {
+-    super(EXIT_USAGE, throwable, message, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/client/ClientAMProtocolPBClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/client/ClientAMProtocolPBClientImpl.java
+deleted file mode 100644
+index 79d6773d0ec..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/client/ClientAMProtocolPBClientImpl.java
++++ /dev/null
+@@ -1,171 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.impl.pb.client;
+-
+-import org.apache.hadoop.thirdparty.protobuf.ServiceException;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.ProtobufRpcEngine2;
+-import org.apache.hadoop.ipc.RPC;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.RPCUtil;
+-import org.apache.hadoop.yarn.service.ClientAMProtocol;
+-
+-import java.io.Closeable;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusResponseProto;
+-import org.apache.hadoop.yarn.service.impl.pb.service.ClientAMProtocolPB;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.StopRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-
+-public class ClientAMProtocolPBClientImpl
+-    implements ClientAMProtocol, Closeable {
+-
+-  private ClientAMProtocolPB proxy;
+-
+-  public ClientAMProtocolPBClientImpl(long clientVersion,
+-      InetSocketAddress addr, Configuration conf) throws IOException {
+-    RPC.setProtocolEngine(conf, ClientAMProtocolPB.class,
+-        ProtobufRpcEngine2.class);
+-    proxy = RPC.getProxy(ClientAMProtocolPB.class, clientVersion, addr, conf);
+-
+-  }
+-
+-  @Override public FlexComponentsResponseProto flexComponents(
+-      FlexComponentsRequestProto request) throws IOException, YarnException {
+-    try {
+-      return proxy.flexComponents(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public GetStatusResponseProto getStatus(GetStatusRequestProto request)
+-      throws IOException, YarnException {
+-    try {
+-      return proxy.getStatus(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public StopResponseProto stop(StopRequestProto requestProto)
+-      throws IOException, YarnException {
+-    try {
+-      return proxy.stop(null, requestProto);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override public void close() {
+-    if (this.proxy != null) {
+-      RPC.stopProxy(this.proxy);
+-    }
+-  }
+-
+-  @Override
+-  public UpgradeServiceResponseProto upgrade(
+-      UpgradeServiceRequestProto request) throws IOException, YarnException {
+-    try {
+-      return proxy.upgradeService(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public RestartServiceResponseProto restart(RestartServiceRequestProto request)
+-      throws IOException, YarnException {
+-    try {
+-      return proxy.restartService(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public CompInstancesUpgradeResponseProto upgrade(
+-      CompInstancesUpgradeRequestProto request)
+-      throws IOException, YarnException {
+-    try {
+-      return proxy.upgrade(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public GetCompInstancesResponseProto getCompInstances(
+-      GetCompInstancesRequestProto request) throws IOException, YarnException {
+-    try {
+-      return proxy.getCompInstances(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public CancelUpgradeResponseProto cancelUpgrade(
+-      CancelUpgradeRequestProto request) throws IOException, YarnException {
+-    try {
+-      return proxy.cancelUpgrade(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-
+-  @Override
+-  public DecommissionCompInstancesResponseProto decommissionCompInstances(
+-      DecommissionCompInstancesRequestProto request)
+-      throws IOException, YarnException {
+-    try {
+-      return proxy.decommissionCompInstances(null, request);
+-    } catch (ServiceException e) {
+-      RPCUtil.unwrapAndThrowException(e);
+-    }
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPB.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPB.java
+deleted file mode 100644
+index 6a9cd3785eb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPB.java
++++ /dev/null
+@@ -1,29 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.impl.pb.service;
+-
+-import org.apache.hadoop.ipc.ProtocolInfo;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol;
+-
+-@ProtocolInfo(
+-    protocolName = "org.apache.hadoop.yarn.service.ClientAMProtocol",
+-    protocolVersion = 1)
+-public interface ClientAMProtocolPB extends
+-    ClientAMProtocol.ClientAMProtocolService.BlockingInterface {
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPBServiceImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPBServiceImpl.java
+deleted file mode 100644
+index 47b11ebe960..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/impl/pb/service/ClientAMProtocolPBServiceImpl.java
++++ /dev/null
+@@ -1,145 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.impl.pb.service;
+-
+-import org.apache.hadoop.thirdparty.protobuf.RpcController;
+-import org.apache.hadoop.thirdparty.protobuf.ServiceException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CancelUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.DecommissionCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.FlexComponentsResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetStatusResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.RestartServiceResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-import org.apache.hadoop.yarn.service.ClientAMProtocol;
+-
+-import java.io.IOException;
+-
+-public class ClientAMProtocolPBServiceImpl implements ClientAMProtocolPB {
+-
+-  private ClientAMProtocol real;
+-
+-  public ClientAMProtocolPBServiceImpl(ClientAMProtocol impl) {
+-    this.real = impl;
+-  }
+-
+-  @Override
+-  public FlexComponentsResponseProto flexComponents(RpcController controller,
+-      FlexComponentsRequestProto request) throws ServiceException {
+-    try {
+-      return real.flexComponents(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override public GetStatusResponseProto getStatus(RpcController controller,
+-      GetStatusRequestProto request) throws ServiceException {
+-    try {
+-      return real.getStatus(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public org.apache.hadoop.yarn.proto.ClientAMProtocol.StopResponseProto stop(
+-      RpcController controller,
+-      org.apache.hadoop.yarn.proto.ClientAMProtocol.StopRequestProto request)
+-      throws ServiceException {
+-    try {
+-      return real.stop(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public UpgradeServiceResponseProto upgradeService(RpcController controller,
+-      UpgradeServiceRequestProto request) throws ServiceException {
+-    try {
+-      return real.upgrade(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public RestartServiceResponseProto restartService(RpcController controller,
+-      RestartServiceRequestProto request) throws ServiceException {
+-    try {
+-      return real.restart(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public CompInstancesUpgradeResponseProto upgrade(RpcController controller,
+-      CompInstancesUpgradeRequestProto request) throws ServiceException {
+-    try {
+-      return real.upgrade(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public GetCompInstancesResponseProto getCompInstances(
+-      RpcController controller, GetCompInstancesRequestProto request)
+-      throws ServiceException {
+-    try {
+-      return real.getCompInstances(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public CancelUpgradeResponseProto cancelUpgrade(
+-      RpcController controller, CancelUpgradeRequestProto request)
+-      throws ServiceException {
+-    try {
+-      return real.cancelUpgrade(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-
+-  @Override
+-  public DecommissionCompInstancesResponseProto decommissionCompInstances(
+-      RpcController controller, DecommissionCompInstancesRequestProto
+-      request) throws ServiceException {
+-    try {
+-      return real.decommissionCompInstances(request);
+-    } catch (IOException | YarnException e) {
+-      throw new ServiceException(e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ComponentHealthThresholdMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ComponentHealthThresholdMonitor.java
+deleted file mode 100644
+index 9cf62fcb410..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ComponentHealthThresholdMonitor.java
++++ /dev/null
+@@ -1,151 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor;
+-
+-import java.util.Date;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Monitors the health of containers of a specific component at a regular
+- * interval. It takes necessary actions when the health of a component drops
+- * below a desired threshold.
+- */
+-public class ComponentHealthThresholdMonitor implements Runnable {
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(ComponentHealthThresholdMonitor.class);
+-  private final Component component;
+-  private final int healthThresholdPercent;
+-  private final long healthThresholdWindowSecs;
+-  private final long healthThresholdWindowNanos;
+-  private long firstOccurrenceTimestamp = 0;
+-  // Sufficient logging happens when component health is below threshold.
+-  // However, there has to be some logging when it is above threshold, otherwise
+-  // service owners have no idea how the health is fluctuating. So let's log
+-  // whenever there is a change in component health, thereby preventing
+-  // excessive logging on every poll.
+-  private float prevReadyContainerFraction = 0;
+-
+-  public ComponentHealthThresholdMonitor(Component component,
+-      int healthThresholdPercent, long healthThresholdWindowSecs) {
+-    this.component = component;
+-    this.healthThresholdPercent = healthThresholdPercent;
+-    this.healthThresholdWindowSecs = healthThresholdWindowSecs;
+-    this.healthThresholdWindowNanos = TimeUnit.NANOSECONDS
+-        .convert(healthThresholdWindowSecs, TimeUnit.SECONDS);
+-  }
+-
+-  @Override
+-  public void run() {
+-    LOG.debug("ComponentHealthThresholdMonitor run method");
+-    // Perform container health checks against desired threshold
+-    long desiredContainerCount = component.getNumDesiredInstances();
+-    // If desired container count for this component is 0 then nothing to do
+-    if (desiredContainerCount == 0) {
+-      return;
+-    }
+-    long readyContainerCount = component.getNumReadyInstances();
+-    float thresholdFraction = (float) healthThresholdPercent / 100;
+-    // No possibility of div by 0 since desiredContainerCount won't be 0 here
+-    float readyContainerFraction = (float) readyContainerCount
+-        / desiredContainerCount;
+-    boolean healthChanged = false;
+-    if (Math.abs(
+-        readyContainerFraction - prevReadyContainerFraction) > .0000001) {
+-      prevReadyContainerFraction = readyContainerFraction;
+-      healthChanged = true;
+-    }
+-    String readyContainerPercentStr = String.format("%.2f",
+-        readyContainerFraction * 100);
+-    // Check if the current ready container percent is less than the
+-    // threshold percent
+-    if (readyContainerFraction < thresholdFraction) {
+-      // Check if it is the first occurrence and if yes set the timestamp
+-      long currentTimestamp = System.nanoTime();
+-      if (firstOccurrenceTimestamp == 0) {
+-        firstOccurrenceTimestamp = currentTimestamp;
+-        Date date = new Date();
+-        LOG.info(
+-            "[COMPONENT {}] Health has gone below threshold. Starting health "
+-                + "threshold timer at ts = {} ({})",
+-            component.getName(), date.getTime(), date);
+-      }
+-      long elapsedTime = currentTimestamp - firstOccurrenceTimestamp;
+-      long elapsedTimeSecs = TimeUnit.SECONDS.convert(elapsedTime,
+-          TimeUnit.NANOSECONDS);
+-      LOG.warn(
+-          "[COMPONENT {}] Current health {}% is below health threshold of "
+-              + "{}% for {} secs (threshold window = {} secs)",
+-          component.getName(), readyContainerPercentStr,
+-          healthThresholdPercent, elapsedTimeSecs, healthThresholdWindowSecs);
+-      if (elapsedTime > healthThresholdWindowNanos) {
+-        LOG.warn(
+-            "[COMPONENT {}] Current health {}% has been below health "
+-                + "threshold of {}% for {} secs (threshold window = {} secs)",
+-            component.getName(), readyContainerPercentStr,
+-            healthThresholdPercent, elapsedTimeSecs, healthThresholdWindowSecs);
+-        // Trigger service stop
+-        String exitDiag = String.format(
+-            "Service is being killed because container health for component "
+-                + "%s was %s%% (health threshold = %d%%) for %d secs "
+-                + "(threshold window = %d secs)",
+-            component.getName(), readyContainerPercentStr,
+-            healthThresholdPercent, elapsedTimeSecs, healthThresholdWindowSecs);
+-        // Append to global diagnostics that will be reported to RM.
+-        component.getScheduler().getDiagnostics().append(exitDiag);
+-        LOG.warn(exitDiag);
+-        // Sleep for 5 seconds in hope that the state can be recorded in ATS.
+-        // In case there's a client polling the component state, it can be
+-        // notified.
+-        try {
+-          Thread.sleep(5000);
+-        } catch (InterruptedException e) {
+-          LOG.error("Interrupted on sleep while exiting.", e);
+-        }
+-        ExitUtil.terminate(-1);
+-      }
+-    } else {
+-      String logMsg = "[COMPONENT {}] Health threshold = {}%, Current health "
+-          + "= {}% (Current Ready count = {}, Desired count = {})";
+-      if (healthChanged) {
+-        LOG.info(logMsg, component.getName(), healthThresholdPercent,
+-            readyContainerPercentStr, readyContainerCount,
+-            desiredContainerCount);
+-      } else {
+-        LOG.debug(logMsg, component.getName(), healthThresholdPercent,
+-            readyContainerPercentStr, readyContainerCount,
+-            desiredContainerCount);
+-      }
+-      // The container health might have recovered above threshold after being
+-      // below for less than the threshold window amount of time. So we need
+-      // to reset firstOccurrenceTimestamp to 0.
+-      if (firstOccurrenceTimestamp != 0) {
+-        Date date = new Date();
+-        LOG.info(
+-            "[COMPONENT {}] Health recovered above threshold at ts = {} ({})",
+-            component.getName(), date.getTime(), date);
+-        firstOccurrenceTimestamp = 0;
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ServiceMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ServiceMonitor.java
+deleted file mode 100644
+index 9e77e41bb9b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/ServiceMonitor.java
++++ /dev/null
+@@ -1,155 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentState;
+-import org.apache.hadoop.yarn.service.monitor.probe.ProbeStatus;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.Map;
+-import java.util.concurrent.Executors;
+-import java.util.concurrent.ScheduledExecutorService;
+-import java.util.concurrent.TimeUnit;
+-
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState.REINITIALIZED;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState.STARTED;
+-import static org.apache.hadoop.yarn.service.component.ComponentEventType.FLEX;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.BECOME_NOT_READY;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.BECOME_READY;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState.READY;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.CONTAINER_FAILURE_WINDOW;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_CONTAINER_FAILURE_WINDOW;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_READINESS_CHECK_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.READINESS_CHECK_INTERVAL;
+-
+-public class ServiceMonitor extends AbstractService {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceMonitor.class);
+-
+-  public ScheduledExecutorService executorService;
+-  private  Map<ContainerId, ComponentInstance> liveInstances = null;
+-  private ServiceContext context;
+-  private Configuration conf;
+-
+-  public ServiceMonitor(String name, ServiceContext context) {
+-    super(name);
+-    liveInstances = context.scheduler.getLiveInstances();
+-    this.context = context;
+-  }
+-
+-  @Override
+-  public void serviceInit(Configuration conf) throws Exception {
+-    executorService = Executors.newScheduledThreadPool(1);
+-    this.conf = conf;
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  public void serviceStart() throws Exception {
+-    long readinessCheckInterval = YarnServiceConf
+-        .getLong(READINESS_CHECK_INTERVAL, DEFAULT_READINESS_CHECK_INTERVAL,
+-            context.service.getConfiguration(), conf);
+-
+-    executorService
+-        .scheduleAtFixedRate(new ReadinessChecker(), readinessCheckInterval,
+-            readinessCheckInterval, TimeUnit.SECONDS);
+-
+-    // Default 6 hours.
+-    long failureResetInterval = YarnServiceConf
+-        .getLong(CONTAINER_FAILURE_WINDOW, DEFAULT_CONTAINER_FAILURE_WINDOW,
+-            context.service.getConfiguration(), conf);
+-
+-    executorService
+-        .scheduleAtFixedRate(new ContainerFailureReset(), failureResetInterval,
+-            failureResetInterval, TimeUnit.SECONDS);
+-  }
+-
+-  @Override
+-  public void serviceStop() throws Exception {
+-    if (executorService != null) {
+-      executorService.shutdownNow();
+-    }
+-  }
+-
+-  private class ReadinessChecker implements Runnable {
+-
+-    @Override
+-    public void run() {
+-
+-      // check if the comp instance are ready
+-      for (Map.Entry<ContainerId, ComponentInstance> entry : liveInstances
+-          .entrySet()) {
+-        ComponentInstance instance = entry.getValue();
+-
+-        ProbeStatus status = instance.ping();
+-        ComponentInstanceState instanceState = instance.getState();
+-        if (status.isSuccess()) {
+-          if (instanceState == STARTED || instanceState == REINITIALIZED) {
+-            LOG.info("Readiness check succeeded for {}: {}", instance
+-                .getCompInstanceName(), status);
+-            // synchronously update the state.
+-            instance.handle(
+-                new ComponentInstanceEvent(entry.getKey(), BECOME_READY));
+-          }
+-        } else {
+-          LOG.info("Readiness check failed for {}: {}", instance
+-              .getCompInstanceName(), status);
+-          if (instance.getState() == READY) {
+-            instance.handle(
+-                new ComponentInstanceEvent(entry.getKey(), BECOME_NOT_READY));
+-          }
+-        }
+-      }
+-
+-      for (Component component : context.scheduler.getAllComponents()
+-          .values()) {
+-        // If comp hasn't started yet and its dependencies are satisfied
+-        if (component.getState() == ComponentState.INIT && component
+-            .areDependenciesReady()) {
+-          LOG.info("[COMPONENT {}]: Dependencies satisfied, ramping up.",
+-              component.getName());
+-          ComponentEvent event = new ComponentEvent(component.getName(), FLEX)
+-              .setDesired(component.getComponentSpec().getNumberOfContainers());
+-          component.handle(event);
+-        }
+-      }
+-    }
+-  }
+-
+-  private class ContainerFailureReset implements Runnable {
+-    @Override
+-    public void run() {
+-      for (Component component : context.scheduler.getAllComponents().values()) {
+-        component.resetCompFailureCount();
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/DefaultProbe.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/DefaultProbe.java
+deleted file mode 100644
+index 4077013392e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/DefaultProbe.java
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.utils.ServiceRegistryUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-
+-import java.io.IOException;
+-import java.util.Collections;
+-import java.util.Map;
+-
+-/**
+- * A probe that checks whether the AM has retrieved an IP for a container.
+- * Optional parameters enable a subsequent check for whether a DNS lookup can
+- * be performed for the container's hostname. Configurable properties include:
+- *
+- *   dns.check.enabled - true if DNS check should be performed (default false)
+- *   dns.address - optional IP:port address of DNS server to use for DNS check
+- */
+-public class DefaultProbe extends Probe {
+-  private final boolean dnsCheckEnabled;
+-  private final String dnsAddress;
+-
+-  public DefaultProbe(Map<String, String> props) {
+-    this("Default probe: IP presence", props);
+-  }
+-
+-  protected DefaultProbe(String name, Map<String, String> props) {
+-    this.dnsCheckEnabled = getPropertyBool(props,
+-        DEFAULT_PROBE_DNS_CHECK_ENABLED,
+-        DEFAULT_PROBE_DNS_CHECK_ENABLED_DEFAULT);
+-    this.dnsAddress = props.get(DEFAULT_PROBE_DNS_ADDRESS);
+-    String additionalName = "";
+-    if (dnsCheckEnabled) {
+-      if (dnsAddress == null) {
+-        additionalName = " with DNS checking";
+-      } else {
+-        additionalName =  " with DNS checking and DNS server address " +
+-            dnsAddress;
+-      }
+-    }
+-    setName(name + additionalName);
+-  }
+-
+-  public static DefaultProbe create() throws IOException {
+-    return new DefaultProbe(Collections.emptyMap());
+-  }
+-
+-  public static DefaultProbe create(Map<String, String> props) throws
+-      IOException {
+-    return new DefaultProbe(props);
+-  }
+-
+-  @Override
+-  public ProbeStatus ping(ComponentInstance instance) {
+-    ProbeStatus status = new ProbeStatus();
+-
+-    ContainerStatus containerStatus = instance.getContainerStatus();
+-    if (containerStatus == null || ServiceUtils.isEmpty(containerStatus
+-        .getIPs())) {
+-      status.fail(this, new IOException(
+-          instance.getCompInstanceName() + ": IP is not available yet"));
+-      return status;
+-    }
+-
+-    String hostname = instance.getHostname();
+-    if (dnsCheckEnabled && !ServiceRegistryUtils.registryDNSLookupExists(
+-        dnsAddress, hostname)) {
+-      status.fail(this, new IOException(
+-          instance.getCompInstanceName() + ": DNS checking is enabled, but " +
+-              "lookup for " + hostname + " is not available yet"));
+-      return status;
+-    }
+-
+-    status.succeed(this);
+-    return status;
+-  }
+-
+-  protected boolean isDnsCheckEnabled() {
+-    return dnsCheckEnabled;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/HttpProbe.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/HttpProbe.java
+deleted file mode 100644
+index 40a87937629..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/HttpProbe.java
++++ /dev/null
+@@ -1,117 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.HttpURLConnection;
+-import java.net.URL;
+-import java.util.Map;
+-
+-/**
+- * A probe that checks whether a successful HTTP response code can be obtained
+- * from a container. A well-formed URL must be provided. The URL is intended
+- * to contain a token ${THIS_HOST} that will be replaced by the IP of the
+- * container. This probe also performs the checks of the {@link DefaultProbe}.
+- * Additional configurable properties include:
+- *
+- *   url - required URL for HTTP connection, e.g. http://${THIS_HOST}:8080
+- *   timeout - connection timeout (default 1000)
+- *   min.success - minimum response code considered successful (default 200)
+- *   max.success - maximum response code considered successful (default 299)
+- *
+- */
+-public class HttpProbe extends DefaultProbe {
+-  protected static final Logger log = LoggerFactory.getLogger(HttpProbe.class);
+-
+-  private static final String HOST_TOKEN = "${THIS_HOST}";
+-
+-  private final String urlString;
+-  private final int timeout;
+-  private final int min, max;
+-
+-
+-  public HttpProbe(String url, int timeout, int min, int max,
+-      Map<String, String> props) {
+-    super("Http probe of " + url + " [" + min + "-" + max + "]", props);
+-    this.urlString = url;
+-    this.timeout = timeout;
+-    this.min = min;
+-    this.max = max;
+-  }
+-
+-  public static HttpProbe create(Map<String, String> props)
+-      throws IOException {
+-    String urlString = getProperty(props, WEB_PROBE_URL, null);
+-    new URL(urlString);
+-    int timeout = getPropertyInt(props, WEB_PROBE_CONNECT_TIMEOUT,
+-        WEB_PROBE_CONNECT_TIMEOUT_DEFAULT);
+-    int minSuccess = getPropertyInt(props, WEB_PROBE_MIN_SUCCESS,
+-        WEB_PROBE_MIN_SUCCESS_DEFAULT);
+-    int maxSuccess = getPropertyInt(props, WEB_PROBE_MAX_SUCCESS,
+-        WEB_PROBE_MAX_SUCCESS_DEFAULT);
+-    return new HttpProbe(urlString, timeout, minSuccess, maxSuccess, props);
+-  }
+-
+-
+-  private static HttpURLConnection getConnection(URL url, int timeout) throws
+-      IOException {
+-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+-    connection.setInstanceFollowRedirects(true);
+-    connection.setConnectTimeout(timeout);
+-    return connection;
+-  }
+-
+-  @Override
+-  public ProbeStatus ping(ComponentInstance instance) {
+-    ProbeStatus status = super.ping(instance);
+-    if (!status.isSuccess()) {
+-      return status;
+-    }
+-    String ip = instance.getContainerStatus().getIPs().get(0);
+-    HttpURLConnection connection = null;
+-    String hostString = urlString.replace(HOST_TOKEN, ip);
+-    try {
+-      URL url = new URL(hostString);
+-      connection = getConnection(url, this.timeout);
+-      int rc = connection.getResponseCode();
+-      if (rc < min || rc > max) {
+-        String error = "Probe " + url + " error code: " + rc;
+-        log.info(error);
+-        status.fail(this,
+-            new IOException(error));
+-      } else {
+-        status.succeed(this);
+-      }
+-    } catch (Throwable e) {
+-      String error =
+-          "Probe " + hostString + " failed for IP " + ip + ": " + e;
+-      log.info(error, e);
+-      status.fail(this,
+-          new IOException(error, e));
+-    } finally {
+-      if (connection != null) {
+-        connection.disconnect();
+-      }
+-    }
+-    return status;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/LogEntryBuilder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/LogEntryBuilder.java
+deleted file mode 100644
+index 9ad86fe61bb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/LogEntryBuilder.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-/**
+- * Build up log entries for ease of splunk
+- */
+-public class LogEntryBuilder {
+-
+-  private final StringBuilder builder = new StringBuilder();
+-
+-  public LogEntryBuilder() {
+-  }
+-
+-  public LogEntryBuilder(String text) {
+-    elt(text);
+-  }
+-
+-
+-  public LogEntryBuilder(String name, Object value) {
+-    entry(name, value);
+-  }
+-
+-  public LogEntryBuilder elt(String text) {
+-    addComma();
+-    builder.append(text);
+-    return this;
+-  }
+-
+-  public LogEntryBuilder elt(String name, Object value) {
+-    addComma();
+-    entry(name, value);
+-    return this;
+-  }
+-
+-  private void addComma() {
+-    if (!isEmpty()) {
+-      builder.append(", ");
+-    }
+-  }
+-
+-  private void entry(String name, Object value) {
+-    builder.append(name).append('=');
+-    if (value != null) {
+-      builder.append('"').append(value.toString()).append('"');
+-    } else {
+-      builder.append("null");
+-    }
+-  }
+-
+-  @Override
+-  public String toString() {
+-    return builder.toString();
+-  }
+-
+-  private boolean isEmpty() {
+-    return builder.length() == 0;
+-  }
+-
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorKeys.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorKeys.java
+deleted file mode 100644
+index 97770d4d2b1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorKeys.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-/**
+- * Config keys for monitoring
+- */
+-public interface MonitorKeys {
+-
+-  /**
+-   * Default probing key : DNS check enabled {@value}.
+-   */
+-  String DEFAULT_PROBE_DNS_CHECK_ENABLED = "dns.check.enabled";
+-  /**
+-   * Default probing default : DNS check enabled {@value}.
+-   */
+-  boolean DEFAULT_PROBE_DNS_CHECK_ENABLED_DEFAULT = false;
+-  /**
+-   * Default probing key : DNS checking address IP:port {@value}.
+-   */
+-  String DEFAULT_PROBE_DNS_ADDRESS = "dns.address";
+-  /**
+-   * Port probing key : port to attempt to create a TCP connection to {@value}.
+-   */
+-  String PORT_PROBE_PORT = "port";
+-  /**
+-   * Port probing key : timeout for the the connection attempt {@value}.
+-   */
+-  String PORT_PROBE_CONNECT_TIMEOUT = "timeout";
+-  /**
+-   * Port probing default : timeout for the connection attempt {@value}.
+-   */
+-  int PORT_PROBE_CONNECT_TIMEOUT_DEFAULT = 1000;
+-
+-  /**
+-   * Web probing key : URL {@value}.
+-   */
+-  String WEB_PROBE_URL = "url";
+-  /**
+-   * Web probing key : min success code {@value}.
+-   */
+-  String WEB_PROBE_MIN_SUCCESS = "min.success";
+-  /**
+-   * Web probing key : max success code {@value}.
+-   */
+-  String WEB_PROBE_MAX_SUCCESS = "max.success";
+-  /**
+-   * Web probing default : min successful response code {@value}.
+-   */
+-  int WEB_PROBE_MIN_SUCCESS_DEFAULT = 200;
+-  /**
+-   * Web probing default : max successful response code {@value}.
+-   */
+-  int WEB_PROBE_MAX_SUCCESS_DEFAULT = 299;
+-  /**
+-   * Web probing key : timeout for the connection attempt {@value}
+-   */
+-  String WEB_PROBE_CONNECT_TIMEOUT = "timeout";
+-  /**
+-   * Port probing default : timeout for the connection attempt {@value}.
+-   */
+-  int WEB_PROBE_CONNECT_TIMEOUT_DEFAULT = 1000;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorUtils.java
+deleted file mode 100644
+index 0b57e6c6bf5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/MonitorUtils.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.hadoop.yarn.service.api.records.ReadinessCheck;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.Formatter;
+-import java.util.Locale;
+-
+-/**
+- * Various utils to work with the monitor
+- */
+-public final class MonitorUtils {
+-  protected static final Logger LOG = LoggerFactory.getLogger(MonitorUtils
+-      .class);
+-
+-  private MonitorUtils() {
+-  }
+-
+-  public static String toPlural(int val) {
+-    return val != 1 ? "s" : "";
+-  }
+-
+-  /**
+-   * Convert milliseconds to human time -the exact format is unspecified
+-   * @param milliseconds a time in milliseconds
+-   * @return a time that is converted to human intervals
+-   */
+-  public static String millisToHumanTime(long milliseconds) {
+-    StringBuilder sb = new StringBuilder();
+-    // Send all output to the Appendable object sb
+-    Formatter formatter = new Formatter(sb, Locale.US);
+-
+-    long s = Math.abs(milliseconds / 1000);
+-    long m = Math.abs(milliseconds % 1000);
+-    if (milliseconds > 0) {
+-      formatter.format("%d.%03ds", s, m);
+-    } else if (milliseconds == 0) {
+-      formatter.format("0");
+-    } else {
+-      formatter.format("-%d.%03ds", s, m);
+-    }
+-    return sb.toString();
+-  }
+-
+-  public static Probe getProbe(ReadinessCheck readinessCheck) {
+-    try {
+-      if (readinessCheck == null) {
+-        return DefaultProbe.create();
+-      }
+-      if (readinessCheck.getType() == null) {
+-        return DefaultProbe.create(readinessCheck.getProperties());
+-      }
+-      switch (readinessCheck.getType()) {
+-      case HTTP:
+-        return HttpProbe.create(readinessCheck.getProperties());
+-      case PORT:
+-        return PortProbe.create(readinessCheck.getProperties());
+-      default:
+-        return DefaultProbe.create(readinessCheck.getProperties());
+-      }
+-    } catch (Throwable t) {
+-      throw new IllegalArgumentException("Error creating readiness check " +
+-          t);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/PortProbe.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/PortProbe.java
+deleted file mode 100644
+index e62048a0aeb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/PortProbe.java
++++ /dev/null
+@@ -1,98 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.net.Socket;
+-import java.util.Map;
+-
+-/**
+- * A probe that checks whether a container has a specified port open. This
+- * probe also performs the checks of the {@link DefaultProbe}. Additional
+- * configurable properties include:
+- *
+- *   port - required port for socket connection
+- *   timeout - connection timeout (default 1000)
+- */
+-public class PortProbe extends DefaultProbe {
+-  protected static final Logger log = LoggerFactory.getLogger(PortProbe.class);
+-  private final int port;
+-  private final int timeout;
+-
+-  public PortProbe(int port, int timeout, Map<String, String> props) {
+-    super("Port probe of " + port + " for " + timeout + "ms", props);
+-    this.port = port;
+-    this.timeout = timeout;
+-  }
+-
+-  public static PortProbe create(Map<String, String> props)
+-      throws IOException {
+-    int port = getPropertyInt(props, PORT_PROBE_PORT, null);
+-
+-    if (port >= 65536) {
+-      throw new IOException(PORT_PROBE_PORT + " " + port + " is out of " +
+-          "range");
+-    }
+-
+-    int timeout = getPropertyInt(props, PORT_PROBE_CONNECT_TIMEOUT,
+-        PORT_PROBE_CONNECT_TIMEOUT_DEFAULT);
+-
+-    return new PortProbe(port, timeout, props);
+-  }
+-
+-  /**
+-   * Try to connect to the (host,port); a failure to connect within
+-   * the specified timeout is a failure.
+-   * @param instance role instance
+-   * @return the outcome
+-   */
+-  @Override
+-  public ProbeStatus ping(ComponentInstance instance) {
+-    ProbeStatus status = super.ping(instance);
+-    if (!status.isSuccess()) {
+-      return status;
+-    }
+-
+-    String ip = instance.getContainerStatus().getIPs().get(0);
+-    InetSocketAddress sockAddr = new InetSocketAddress(ip, port);
+-    Socket socket = new Socket();
+-    try {
+-      if (log.isDebugEnabled()) {
+-        log.debug(instance.getCompInstanceName() + ": Connecting " + sockAddr
+-            .toString() + ", timeout=" + MonitorUtils
+-            .millisToHumanTime(timeout));
+-      }
+-      socket.connect(sockAddr, timeout);
+-      status.succeed(this);
+-    } catch (Throwable e) {
+-      String error =
+-          instance.getCompInstanceName() + ": Probe " + sockAddr + " failed";
+-      log.debug(error, e);
+-      status.fail(this, new IOException(error, e));
+-    } finally {
+-      IOUtils.closeSocket(socket);
+-    }
+-    return status;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/Probe.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/Probe.java
+deleted file mode 100644
+index 78c79c7535b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/Probe.java
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-import java.io.IOException;
+-import java.util.Map;
+-
+-/**
+- * Base class of all probes.
+- */
+-public abstract class Probe implements MonitorKeys {
+-
+-  private String name;
+-
+-  protected Probe() {
+-  }
+-
+-  /**
+-   * Create a probe of a specific name
+-   *
+-   * @param name probe name
+-   */
+-  public Probe(String name) {
+-    this.name = name;
+-  }
+-
+-
+-  protected void setName(String name) {
+-    this.name = name;
+-  }
+-
+-  public String getName() {
+-    return name;
+-  }
+-
+-
+-  @Override
+-  public String toString() {
+-    return getName();
+-  }
+-
+-  public static String getProperty(Map<String, String> props, String name,
+-      String defaultValue) throws IOException {
+-    String value = props.get(name);
+-    if (StringUtils.isEmpty(value)) {
+-      if (defaultValue == null) {
+-        throw new IOException(name + " not specified");
+-      }
+-      return defaultValue;
+-    }
+-    return value;
+-  }
+-
+-  public static int getPropertyInt(Map<String, String> props, String name,
+-      Integer defaultValue) throws IOException {
+-    String value = props.get(name);
+-    if (StringUtils.isEmpty(value)) {
+-      if (defaultValue == null) {
+-        throw new IOException(name + " not specified");
+-      }
+-      return defaultValue;
+-    }
+-    return Integer.parseInt(value);
+-  }
+-
+-  public static boolean getPropertyBool(Map<String, String> props, String name,
+-      boolean defaultValue) {
+-    String value = props.get(name);
+-    if (StringUtils.isEmpty(value)) {
+-      return defaultValue;
+-    }
+-    return Boolean.parseBoolean(value);
+-  }
+-
+-  /**
+-   * perform any prelaunch initialization
+-   */
+-  public void init() throws IOException {
+-
+-  }
+-
+-  /**
+-   * Ping the endpoint. All exceptions must be caught and included in the
+-   * (failure) status.
+-   *
+-   * @param instance instance to ping
+-   * @return the status
+-   */
+-  public abstract ProbeStatus ping(ComponentInstance instance);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/ProbeStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/ProbeStatus.java
+deleted file mode 100644
+index bc62dcd0c1c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/monitor/probe/ProbeStatus.java
++++ /dev/null
+@@ -1,160 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import java.io.Serializable;
+-import java.util.Date;
+-
+-/**
+- * Status message of a probe. This is designed to be sent over the wire, though the exception
+- * Had better be unserializable at the far end if that is to work.
+- */
+-public final class ProbeStatus implements Serializable {
+-  private static final long serialVersionUID = 165468L;
+-
+-  private long timestamp;
+-  private String timestampText;
+-  private boolean success;
+-  private boolean realOutcome;
+-  private String message;
+-  private Throwable thrown;
+-  private transient Probe originator;
+-
+-  public ProbeStatus() {
+-  }
+-
+-  public ProbeStatus(long timestamp, String message, Throwable thrown) {
+-    this.success = false;
+-    this.message = message;
+-    this.thrown = thrown;
+-    setTimestamp(timestamp);
+-  }
+-
+-  public ProbeStatus(long timestamp, String message) {
+-    this.success = true;
+-    setTimestamp(timestamp);
+-    this.message = message;
+-    this.thrown = null;
+-  }
+-
+-  public long getTimestamp() {
+-    return timestamp;
+-  }
+-
+-  public void setTimestamp(long timestamp) {
+-    this.timestamp = timestamp;
+-    timestampText = new Date(timestamp).toString();
+-  }
+-
+-  public boolean isSuccess() {
+-    return success;
+-  }
+-
+-  /**
+-   * Set both the success and the real outcome bits to the same value
+-   * @param success the new value
+-   */
+-  public void setSuccess(boolean success) {
+-    this.success = success;
+-    realOutcome = success;
+-  }
+-
+-  public String getTimestampText() {
+-    return timestampText;
+-  }
+-
+-  public boolean getRealOutcome() {
+-    return realOutcome;
+-  }
+-
+-  public String getMessage() {
+-    return message;
+-  }
+-
+-  public void setMessage(String message) {
+-    this.message = message;
+-  }
+-
+-  public Throwable getThrown() {
+-    return thrown;
+-  }
+-
+-  public void setThrown(Throwable thrown) {
+-    this.thrown = thrown;
+-  }
+-
+-  /**
+-   * Get the probe that generated this result. May be null
+-   * @return a possibly null reference to a probe
+-   */
+-  public Probe getOriginator() {
+-    return originator;
+-  }
+-
+-  /**
+-   * The probe has succeeded -capture the current timestamp, set
+-   * success to true, and record any other data needed.
+-   * @param probe probe
+-   */
+-  public void succeed(Probe probe) {
+-    finish(probe, true, probe.getName(), null);
+-  }
+-
+-  /**
+-   * A probe has failed either because the test returned false, or an exception
+-   * was thrown. The {@link #success} field is set to false, any exception 
+-   * thrown is recorded.
+-   * @param probe probe that failed
+-   * @param thrown an exception that was thrown.
+-   */
+-  public void fail(Probe probe, Throwable thrown) {
+-    finish(probe, false, "Failure in " + probe, thrown);
+-  }
+-
+-  public void finish(Probe probe, boolean succeeded, String text, Throwable thrown) {
+-    setTimestamp(System.currentTimeMillis());
+-    setSuccess(succeeded);
+-    originator = probe;
+-    message = text;
+-    this.thrown = thrown;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    LogEntryBuilder builder = new LogEntryBuilder("Probe Status");
+-    builder.elt("time", timestampText)
+-           .elt("outcome", (success ? "success" : "failure"));
+-
+-    if (success != realOutcome) {
+-      builder.elt("originaloutcome", (realOutcome ? "success" : "failure"));
+-    }
+-    builder.elt("message", message);
+-    if (thrown != null) {
+-      builder.elt("exception", thrown);
+-    }
+-
+-    return builder.toString();
+-  }
+-
+-  /**
+-   * Flip the success bit on while the real outcome bit is kept false
+-   */
+-  public void markAsSuccessful() {
+-    success = true;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/package-info.java
+deleted file mode 100644
+index 766da0d6e30..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-/**
+- * Yarn Service framework.
+- */
+-@InterfaceAudience.Private
+-package org.apache.hadoop.yarn.service;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractClientProvider.java
+deleted file mode 100644
+index ae796196d25..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractClientProvider.java
++++ /dev/null
+@@ -1,150 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-
+-import java.io.IOException;
+-import java.nio.file.Paths;
+-import java.text.MessageFormat;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConstants.CONTENT;
+-
+-public abstract class AbstractClientProvider {
+-
+-  public AbstractClientProvider() {
+-  }
+-
+-  /**
+-   * Generates a fixed format of application tags given one or more of
+-   * application name, version and description. This allows subsequent query for
+-   * an application with a name only, version only or description only or any
+-   * combination of those as filters.
+-   *
+-   * @param appName name of the application
+-   * @param appVersion version of the application
+-   * @param appDescription brief description of the application
+-   * @return
+-   */
+-  public static final Set<String> createApplicationTags(String appName,
+-      String appVersion, String appDescription) {
+-    Set<String> tags = new HashSet<>();
+-    tags.add(ServiceUtils.createNameTag(appName));
+-    if (appVersion != null) {
+-      tags.add(ServiceUtils.createVersionTag(appVersion));
+-    }
+-    if (appDescription != null) {
+-      tags.add(ServiceUtils.createDescriptionTag(appDescription));
+-    }
+-    return tags;
+-  }
+-
+-  /**
+-   * Validate the artifact.
+-   * @param artifact
+-   */
+-  public abstract void validateArtifact(Artifact artifact, String compName,
+-      FileSystem fileSystem) throws IOException;
+-
+-  protected abstract void validateConfigFile(ConfigFile configFile,
+-      String compName, FileSystem fileSystem) throws IOException;
+-
+-  /**
+-   * Validate the config files.
+-   * @param configFiles config file list
+-   * @param fs file system
+-   */
+-  public void validateConfigFiles(List<ConfigFile> configFiles, String compName,
+-      FileSystem fs) throws IOException {
+-    Set<String> destFileSet = new HashSet<>();
+-
+-    for (ConfigFile file : configFiles) {
+-      if (file.getType() == null) {
+-        throw new IllegalArgumentException("File type is empty");
+-      }
+-      ConfigFile.TypeEnum fileType = file.getType();
+-
+-      if (fileType.equals(ConfigFile.TypeEnum.TEMPLATE)) {
+-        if (StringUtils.isEmpty(file.getSrcFile()) &&
+-            !file.getProperties().containsKey(CONTENT)) {
+-          throw new IllegalArgumentException(MessageFormat.format("For {0} " +
+-                  "format, either src_file must be specified in ConfigFile," +
+-                  " or the \"{1}\" key must be specified in " +
+-                  "the 'properties' field of ConfigFile. ",
+-              ConfigFile.TypeEnum.TEMPLATE, CONTENT));
+-        }
+-      } else if (fileType.equals(ConfigFile.TypeEnum.STATIC) || fileType.equals(
+-          ConfigFile.TypeEnum.ARCHIVE)) {
+-        if (!file.getProperties().isEmpty()) {
+-          throw new IllegalArgumentException(String
+-              .format("For %s format, should not specify any 'properties.'",
+-                  fileType));
+-        }
+-
+-        String srcFile = file.getSrcFile();
+-        if (srcFile == null || srcFile.isEmpty()) {
+-          throw new IllegalArgumentException(String.format(
+-              "For %s format, should make sure that srcFile is specified",
+-              fileType));
+-        }
+-        FileStatus fileStatus = fs.getFileStatus(new Path(srcFile));
+-        if (fileStatus != null && fileStatus.isDirectory()) {
+-          throw new IllegalArgumentException("srcFile=" + srcFile +
+-              " is a directory, which is not supported.");
+-        }
+-      }
+-      if (!StringUtils.isEmpty(file.getSrcFile())) {
+-        Path p = new Path(file.getSrcFile());
+-        if (!fs.exists(p)) {
+-          throw new IllegalArgumentException(
+-              "Specified src_file does not exist on " + fs.getScheme() + ": "
+-                  + file.getSrcFile());
+-        }
+-      }
+-
+-      if (StringUtils.isEmpty(file.getDestFile())) {
+-        throw new IllegalArgumentException("dest_file is empty.");
+-      }
+-
+-      if (destFileSet.contains(file.getDestFile())) {
+-        throw new IllegalArgumentException(
+-            "Duplicated ConfigFile exists: " + file.getDestFile());
+-      }
+-      destFileSet.add(file.getDestFile());
+-
+-      java.nio.file.Path destPath = Paths.get(file.getDestFile());
+-      if (!destPath.isAbsolute() && destPath.getNameCount() > 1) {
+-        throw new IllegalArgumentException("Non-absolute dest_file has more " +
+-            "than one path element");
+-      }
+-
+-      // provider-specific validation
+-      validateConfigFile(file, compName, fs);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractProviderService.java
+deleted file mode 100644
+index 52f2a4eb018..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/AbstractProviderService.java
++++ /dev/null
+@@ -1,176 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.ComponentRestartPolicy;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.CommandLineBuilder;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.CONTAINER_FAILURES_VALIDITY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.CONTAINER_RETRY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.CONTAINER_RETRY_MAX;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_CONTAINER_RETRY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEFAULT_CONTAINER_RETRY_MAX;
+-import static org.apache.hadoop.yarn.service.utils.ServiceApiUtil.$;
+-
+-public abstract class AbstractProviderService implements ProviderService,
+-    YarnServiceConstants {
+-
+-  protected static final Logger log =
+-      LoggerFactory.getLogger(AbstractProviderService.class);
+-
+-  public abstract void processArtifact(AbstractLauncher launcher,
+-      ComponentInstance compInstance, SliderFileSystem fileSystem,
+-      Service service,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchCtx)
+-      throws IOException;
+-
+-  public Map<String, String> buildContainerTokens(ComponentInstance instance,
+-      Container container,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext) {
+-      // Generate tokens (key-value pair) for config substitution.
+-      // Get pre-defined tokens
+-      Map<String, String> globalTokens =
+-          instance.getComponent().getScheduler().globalTokens;
+-      Map<String, String> tokensForSubstitution = ProviderUtils
+-          .initCompTokensForSubstitute(instance, container,
+-              compLaunchContext);
+-      tokensForSubstitution.putAll(globalTokens);
+-      return tokensForSubstitution;
+-  }
+-
+-  public void buildContainerEnvironment(AbstractLauncher launcher,
+-      Service service, ComponentInstance instance,
+-      SliderFileSystem fileSystem, Configuration yarnConf, Container container,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      Map<String, String> tokensForSubstitution)
+-          throws IOException, SliderException {
+-    // Set the environment variables in launcher
+-    launcher.putEnv(ServiceUtils.buildEnvMap(
+-        compLaunchContext.getConfiguration(), tokensForSubstitution));
+-    launcher.setEnv("WORK_DIR", ApplicationConstants.Environment.PWD.$());
+-    launcher.setEnv("LOG_DIR", ApplicationConstants.LOG_DIR_EXPANSION_VAR);
+-    if (System.getenv(HADOOP_USER_NAME) != null) {
+-      launcher.setEnv(HADOOP_USER_NAME, System.getenv(HADOOP_USER_NAME));
+-    }
+-    launcher.setEnv("LANG", "en_US.UTF-8");
+-    launcher.setEnv("LC_ALL", "en_US.UTF-8");
+-    launcher.setEnv("LANGUAGE", "en_US.UTF-8");
+-
+-    for (Entry<String, String> entry : launcher.getEnv().entrySet()) {
+-      tokensForSubstitution.put($(entry.getKey()), entry.getValue());
+-    }
+-  }
+-
+-  public void buildContainerLaunchCommand(AbstractLauncher launcher,
+-      Service service, ComponentInstance instance,
+-      SliderFileSystem fileSystem, Configuration yarnConf, Container container,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      Map<String, String> tokensForSubstitution)
+-          throws IOException, SliderException {
+-    // substitute launch command
+-    String launchCommand = compLaunchContext.getLaunchCommand();
+-    // docker container may have empty commands
+-    if (!StringUtils.isEmpty(launchCommand)) {
+-      launchCommand = ProviderUtils
+-          .substituteStrWithTokens(launchCommand, tokensForSubstitution);
+-      CommandLineBuilder operation = new CommandLineBuilder();
+-      operation.add(launchCommand);
+-      operation.addOutAndErrFiles(OUT_FILE, ERR_FILE);
+-      launcher.addCommand(operation.build());
+-    }
+-  }
+-
+-  public void buildContainerRetry(AbstractLauncher launcher,
+-      Configuration yarnConf,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      ComponentInstance instance) {
+-    // By default retry forever every 30 seconds
+-
+-    ComponentRestartPolicy restartPolicy = instance.getComponent()
+-        .getRestartPolicyHandler();
+-    if (restartPolicy.allowContainerRetriesForInstance(instance)) {
+-      launcher.setRetryContext(YarnServiceConf
+-          .getInt(CONTAINER_RETRY_MAX, DEFAULT_CONTAINER_RETRY_MAX,
+-              compLaunchContext.getConfiguration(), yarnConf), YarnServiceConf
+-          .getInt(CONTAINER_RETRY_INTERVAL, DEFAULT_CONTAINER_RETRY_INTERVAL,
+-              compLaunchContext.getConfiguration(), yarnConf), YarnServiceConf
+-          .getLong(CONTAINER_FAILURES_VALIDITY_INTERVAL,
+-              DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL,
+-              compLaunchContext.getConfiguration(), yarnConf));
+-    }
+-  }
+-
+-  public ResolvedLaunchParams buildContainerLaunchContext(
+-      AbstractLauncher launcher,
+-      Service service, ComponentInstance instance,
+-      SliderFileSystem fileSystem, Configuration yarnConf, Container container,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext)
+-      throws IOException, SliderException {
+-    ResolvedLaunchParams resolved = new ResolvedLaunchParams();
+-    processArtifact(launcher, instance, fileSystem, service, compLaunchContext);
+-
+-    ServiceContext context =
+-        instance.getComponent().getScheduler().getContext();
+-    // Generate tokens (key-value pair) for config substitution.
+-    Map<String, String> tokensForSubstitution =
+-        buildContainerTokens(instance, container, compLaunchContext);
+-
+-    // Setup launch context environment
+-    buildContainerEnvironment(launcher, service, instance,
+-        fileSystem, yarnConf, container, compLaunchContext,
+-        tokensForSubstitution);
+-
+-    // create config file on hdfs and addResolvedRsrcPath local resource
+-    ProviderUtils.createConfigFileAndAddLocalResource(launcher, fileSystem,
+-        compLaunchContext, tokensForSubstitution, instance, context, resolved);
+-
+-    // handles static files (like normal file / archive file) for localization.
+-    ProviderUtils.handleStaticFilesForLocalization(launcher, fileSystem,
+-        compLaunchContext, resolved);
+-
+-    // replace launch command with token specific information
+-    buildContainerLaunchCommand(launcher, service, instance, fileSystem,
+-        yarnConf, container, compLaunchContext, tokensForSubstitution);
+-
+-    // Setup container retry settings
+-    buildContainerRetry(launcher, yarnConf, compLaunchContext, instance);
+-
+-    return resolved;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderFactory.java
+deleted file mode 100644
+index 0f949e0bace..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderFactory.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.hadoop.yarn.service.provider.defaultImpl.DefaultProviderFactory;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.provider.docker.DockerProviderFactory;
+-import org.apache.hadoop.yarn.service.provider.tarball.TarballProviderFactory;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Base class for factories.
+- */
+-public abstract class ProviderFactory {
+-  protected static final Logger LOG =
+-      LoggerFactory.getLogger(ProviderFactory.class);
+-
+-  protected ProviderFactory() {}
+-
+-  public abstract AbstractClientProvider createClientProvider();
+-
+-  public abstract ProviderService createServerProvider();
+-
+-  public static synchronized ProviderService getProviderService(Artifact
+-      artifact) {
+-    return createServiceProviderFactory(artifact).createServerProvider();
+-  }
+-
+-  public static synchronized AbstractClientProvider getClientProvider(Artifact
+-      artifact) {
+-    return createServiceProviderFactory(artifact).createClientProvider();
+-  }
+-
+-  /**
+-   * Create a provider for a specific service
+-   * @param artifact artifact
+-   * @return provider factory
+-   */
+-  public static synchronized ProviderFactory createServiceProviderFactory(
+-      Artifact artifact) {
+-    if (artifact == null || artifact.getType() == null) {
+-      LOG.debug("Loading service provider type default");
+-      return DefaultProviderFactory.getInstance();
+-    }
+-    LOG.debug("Loading service provider type {}", artifact.getType());
+-    switch (artifact.getType()) {
+-      // TODO add handling for custom types?
+-      // TODO handle service
+-      case DOCKER:
+-        return DockerProviderFactory.getInstance();
+-      case TARBALL:
+-        return TarballProviderFactory.getInstance();
+-      default:
+-        throw new IllegalArgumentException(String.format("Resolution error, " +
+-                "%s should not be passed to createServiceProviderFactory",
+-            artifact.getType()));
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderService.java
+deleted file mode 100644
+index 6a7464f41f6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderService.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-public interface ProviderService {
+-
+-  /**
+-   * Set up the entire container launch context
+-   */
+-  ResolvedLaunchParams buildContainerLaunchContext(
+-      AbstractLauncher containerLauncher,
+-      Service service, ComponentInstance instance,
+-      SliderFileSystem sliderFileSystem, Configuration yarnConf,
+-      Container container,
+-      ContainerLaunchService.ComponentLaunchContext componentLaunchContext)
+-      throws IOException, SliderException;
+-
+-  /**
+-   * This holds any information that is resolved during building the launch
+-   * context for a container.
+-   * <p>
+-   * Right now it contains a mapping of resource keys to destination files
+-   * for resources that need to be localized.
+-   */
+-  class ResolvedLaunchParams {
+-    private Map<String, String> resolvedRsrcPaths = new HashMap<>();
+-
+-    void addResolvedRsrcPath(String resourceKey, String destFile) {
+-      Preconditions.checkNotNull(destFile, "dest file cannot be null");
+-      Preconditions.checkNotNull(resourceKey,
+-          "local resource cannot be null");
+-      resolvedRsrcPaths.put(resourceKey, destFile);
+-    }
+-
+-    public Map<String, String> getResolvedRsrcPaths() {
+-      return this.resolvedRsrcPaths;
+-    }
+-
+-    public boolean didLaunchFail() {
+-      return false;
+-    }
+-  }
+-
+-  ResolvedLaunchParams FAILED_LAUNCH_PARAMS = new ResolvedLaunchParams() {
+-    @Override
+-    public boolean didLaunchFail() {
+-      return true;
+-    }
+-  };
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderUtils.java
+deleted file mode 100644
+index 57d76dfeecd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/ProviderUtils.java
++++ /dev/null
+@@ -1,493 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsAction;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFormat;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.exceptions.BadCommandArgumentsException;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.utils.PublishedConfiguration;
+-import org.apache.hadoop.yarn.service.utils.PublishedConfigurationOutputter;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.nio.charset.StandardCharsets;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.ExecutionException;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.COMPONENT_ID;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.COMPONENT_INSTANCE_NAME;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.COMPONENT_NAME;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.COMPONENT_NAME_LC;
+-import static org.apache.hadoop.yarn.service.api.ServiceApiConstants.CONTAINER_ID;
+-
+-/**
+- * This is a factoring out of methods handy for providers. It's bonded to a log
+- * at construction time.
+- */
+-public class ProviderUtils implements YarnServiceConstants {
+-
+-  protected static final Logger log =
+-      LoggerFactory.getLogger(ProviderUtils.class);
+-
+-
+-  /**
+-   * Add oneself to the classpath. This does not work
+-   * on minicluster test runs where the JAR is not built up.
+-   * @param providerResources map of provider resources to add these entries to
+-   * @param providerClass provider to add
+-   * @param jarName name of the jar to use
+-   * @param sliderFileSystem target filesystem
+-   * @param tempPath path in the cluster FS for temp files
+-   * @param libdir relative directory to place resources
+-   * @param miniClusterTestRun true if minicluster is being used
+-   * @return true if the class was found in a JAR
+-   * 
+-   * @throws FileNotFoundException if the JAR was not found and this is NOT
+-   * a mini cluster test run
+-   * @throws IOException IO problems
+-   * @throws SliderException any Slider problem
+-   */
+-  public static boolean addProviderJar(
+-      Map<String, LocalResource> providerResources,
+-      Class providerClass,
+-      String jarName,
+-      SliderFileSystem sliderFileSystem,
+-      Path tempPath,
+-      String libdir,
+-      boolean miniClusterTestRun) throws
+-      IOException,
+-      SliderException {
+-    try {
+-      ServiceUtils.putJar(providerResources,
+-          sliderFileSystem,
+-          providerClass,
+-          tempPath,
+-          libdir,
+-          jarName);
+-      return true;
+-    } catch (FileNotFoundException e) {
+-      if (miniClusterTestRun) {
+-        return false;
+-      } else {
+-        throw e;
+-      }
+-    }
+-  }
+-  
+-  /**
+-   * Loads all dependency jars from the default path.
+-   * @param providerResources map of provider resources to add these entries to
+-   * @param sliderFileSystem target filesystem
+-   * @param tempPath path in the cluster FS for temp files
+-   * @param libDir relative directory to place resources
+-   * @param libLocalSrcDir explicitly supplied local libs dir
+-   * @throws IOException trouble copying to HDFS
+-   * @throws SliderException trouble copying to HDFS
+-   */
+-  public static void addAllDependencyJars(
+-      Map<String, LocalResource> providerResources,
+-      SliderFileSystem sliderFileSystem,
+-      Path tempPath,
+-      String libDir,
+-      String libLocalSrcDir)
+-      throws IOException, SliderException {
+-    if (ServiceUtils.isSet(libLocalSrcDir)) {
+-      File file = new File(libLocalSrcDir);
+-      if (!file.exists() || !file.isDirectory()) {
+-        throw new BadCommandArgumentsException(
+-            "Supplied lib src dir %s is not valid", libLocalSrcDir);
+-      }
+-    }
+-    ServiceUtils.putAllJars(providerResources, sliderFileSystem, tempPath,
+-        libDir, libLocalSrcDir);
+-  }
+-
+-  public static String substituteStrWithTokens(String content,
+-      Map<String, String> tokensForSubstitution) {
+-    for (Map.Entry<String, String> token : tokensForSubstitution.entrySet()) {
+-      content =
+-          content.replaceAll(Pattern.quote(token.getKey()), token.getValue());
+-    }
+-    return content;
+-  }
+-
+-  public static String replaceSpacesWithDelimiter(String content,
+-      String delimiter) {
+-    List<String> parts = new ArrayList<String>();
+-    Matcher m = Pattern.compile("([^\"]\\S*|\".+?\")\\s*").matcher(content);
+-    while (m.find()) {
+-      String part = m.group(1);
+-      if(part.startsWith("\"") && part.endsWith("\"")) {
+-        part = part.replaceAll("^\"|\"$", "");
+-      }
+-      parts.add(part);
+-    }
+-    return String.join(delimiter, parts);
+-  }
+-
+-  // configs will be substituted by corresponding env in tokenMap
+-  public static void substituteMapWithTokens(Map<String, String> configs,
+-      Map<String, String> tokenMap) {
+-    for (Map.Entry<String, String> entry : configs.entrySet()) {
+-      String value = entry.getValue();
+-      if (tokenMap != null) {
+-        for (Map.Entry<String, String> token : tokenMap.entrySet()) {
+-          value =
+-              value.replaceAll(Pattern.quote(token.getKey()), token.getValue());
+-        }
+-      }
+-      entry.setValue(value);
+-    }
+-  }
+-
+-  public static Path initCompInstanceDir(SliderFileSystem fs,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      ComponentInstance instance) {
+-    Path compDir = fs.getComponentDir(compLaunchContext.getServiceVersion(),
+-        compLaunchContext.getName());
+-    Path compInstanceDir = new Path(compDir, instance.getCompInstanceName());
+-    instance.setCompInstanceDir(compInstanceDir);
+-    return compInstanceDir;
+-  }
+-
+-  public static Path initCompPublicResourceDir(SliderFileSystem fs,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      ComponentInstance instance) {
+-    Path compDir = fs.getComponentPublicResourceDir(
+-        compLaunchContext.getServiceVersion(), compLaunchContext.getName());
+-    Path compPublicResourceDir = new Path(compDir,
+-        instance.getCompInstanceName());
+-    return compPublicResourceDir;
+-  }
+-
+-
+-  // 1. Create all config files for a component on hdfs for localization
+-  // 2. Add the config file to localResource
+-  public static synchronized void createConfigFileAndAddLocalResource(
+-      AbstractLauncher launcher, SliderFileSystem fs,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      Map<String, String> tokensForSubstitution, ComponentInstance instance,
+-      ServiceContext context, ProviderService.ResolvedLaunchParams
+-      resolvedParams)
+-      throws IOException {
+-
+-    Path compInstanceDir = initCompInstanceDir(fs, compLaunchContext, instance);
+-    if (!fs.getFileSystem().exists(compInstanceDir)) {
+-      log.info("{} version {} : Creating dir on hdfs: {}",
+-          instance.getCompInstanceId(), compLaunchContext.getServiceVersion(),
+-          compInstanceDir);
+-      fs.getFileSystem().mkdirs(compInstanceDir,
+-          new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE));
+-    } else {
+-      log.info("Component instance conf dir already exists: " + compInstanceDir);
+-    }
+-
+-    Path compPublicResourceDir = initCompPublicResourceDir(fs,
+-        compLaunchContext, instance);
+-    if (!fs.getFileSystem().exists(compPublicResourceDir)) {
+-      log.info("{} version {} : Creating Public Resource dir on hdfs: {}",
+-          instance.getCompInstanceId(), compLaunchContext.getServiceVersion(),
+-          compPublicResourceDir);
+-      fs.getFileSystem().mkdirs(compPublicResourceDir,
+-          new FsPermission(FsAction.ALL, FsAction.READ_EXECUTE,
+-          FsAction.EXECUTE));
+-    } else {
+-      log.info("Component instance public resource dir already exists: "
+-          + compPublicResourceDir);
+-    }
+-
+-    log.debug("Tokens substitution for component instance: {}{}{}" + instance
+-        .getCompInstanceName(), System.lineSeparator(), tokensForSubstitution);
+-
+-    for (ConfigFile originalFile : compLaunchContext.getConfiguration()
+-        .getFiles()) {
+-
+-      if (isStaticFile(originalFile)) {
+-        continue;
+-      }
+-      ConfigFile configFile = originalFile.copy();
+-      String fileName = new Path(configFile.getDestFile()).getName();
+-
+-      // substitute file name
+-      for (Map.Entry<String, String> token : tokensForSubstitution.entrySet()) {
+-        configFile.setDestFile(configFile.getDestFile()
+-            .replaceAll(Pattern.quote(token.getKey()), token.getValue()));
+-      }
+-
+-      /* When source file is not specified, write new configs
+-       * to compInstanceDir/fileName
+-       * When source file is specified, it reads and performs variable
+-       * substitution and merges in new configs, and writes a new file to
+-       * compInstanceDir/fileName.
+-       */
+-      Path remoteFile = null;
+-      LocalResourceVisibility visibility = configFile.getVisibility();
+-      if (visibility != null &&
+-          visibility.equals(LocalResourceVisibility.PUBLIC)) {
+-        remoteFile = new Path(compPublicResourceDir, fileName);
+-      } else {
+-        remoteFile = new Path(compInstanceDir, fileName);
+-      }
+-
+-      if (!fs.getFileSystem().exists(remoteFile)) {
+-        log.info("Saving config file on hdfs for component " + instance
+-            .getCompInstanceName() + ": " + configFile);
+-
+-        if (configFile.getSrcFile() != null) {
+-          // Load config file template
+-          switch (configFile.getType()) {
+-          case HADOOP_XML:
+-            // Hadoop_xml_template
+-            resolveHadoopXmlTemplateAndSaveOnHdfs(fs.getFileSystem(),
+-                tokensForSubstitution, configFile, remoteFile, context);
+-            break;
+-          case TEMPLATE:
+-            // plain-template
+-            resolvePlainTemplateAndSaveOnHdfs(fs.getFileSystem(),
+-                tokensForSubstitution, configFile, remoteFile, context);
+-            break;
+-          default:
+-            log.info("Not supporting loading src_file for " + configFile);
+-            break;
+-          }
+-        } else {
+-          // If src_file is not specified
+-          resolvePropsInConfigFileAndSaveOnHdfs(fs, tokensForSubstitution,
+-              instance, configFile, fileName, remoteFile);
+-        }
+-      }
+-
+-      // Add resource for localization
+-      LocalResource configResource =
+-          fs.createAmResource(remoteFile, LocalResourceType.FILE,
+-          configFile.getVisibility());
+-      Path destFile = new Path(configFile.getDestFile());
+-      String symlink = APP_CONF_DIR + "/" + fileName;
+-      addLocalResource(launcher, symlink, configResource, destFile,
+-          resolvedParams);
+-    }
+-  }
+-
+-  public static synchronized void handleStaticFilesForLocalization(
+-      AbstractLauncher launcher, SliderFileSystem fs, ContainerLaunchService
+-      .ComponentLaunchContext componentLaunchCtx,
+-      ProviderService.ResolvedLaunchParams resolvedParams)
+-      throws IOException {
+-    for (ConfigFile staticFile :
+-        componentLaunchCtx.getConfiguration().getFiles()) {
+-      // Only handle static file here.
+-      if (!isStaticFile(staticFile)) {
+-        continue;
+-      }
+-
+-      if (staticFile.getSrcFile() == null) {
+-        // This should not happen, AbstractClientProvider should have checked
+-        // this.
+-        throw new IOException("srcFile is null, please double check.");
+-      }
+-      Path sourceFile = new Path(staticFile.getSrcFile());
+-
+-      // Output properties to sourceFile if not existed
+-      if (!fs.getFileSystem().exists(sourceFile)) {
+-        throw new IOException(
+-            "srcFile=" + sourceFile + " doesn't exist, please double check.");
+-      }
+-
+-      FileStatus fileStatus = fs.getFileSystem().getFileStatus(sourceFile);
+-      if (fileStatus.isDirectory()) {
+-        throw new IOException("srcFile=" + sourceFile +
+-            " is a directory, which is not supported.");
+-      }
+-
+-      // Add resource for localization
+-      LocalResource localResource = fs.createAmResource(sourceFile,
+-          (staticFile.getType() == ConfigFile.TypeEnum.ARCHIVE ?
+-              LocalResourceType.ARCHIVE :
+-              LocalResourceType.FILE), staticFile.getVisibility());
+-
+-      Path destFile = new Path(sourceFile.getName());
+-      if (staticFile.getDestFile() != null && !staticFile.getDestFile()
+-          .isEmpty()) {
+-        destFile = new Path(staticFile.getDestFile());
+-      }
+-      addLocalResource(launcher, destFile.getName(), localResource, destFile,
+-          resolvedParams);
+-    }
+-  }
+-
+-  private static void addLocalResource(AbstractLauncher launcher,
+-      String symlink, LocalResource localResource, Path destFile,
+-      ProviderService.ResolvedLaunchParams resolvedParams) {
+-    if (destFile.isAbsolute()) {
+-      launcher.addLocalResource(symlink, localResource, destFile.toString());
+-      log.info("Added file for localization: "+ symlink +" -> " +
+-          localResource.getResource().getFile() + ", dest mount path: " +
+-          destFile);
+-    } else{
+-      launcher.addLocalResource(symlink, localResource);
+-      log.info("Added file for localization: " + symlink+ " -> " +
+-          localResource.getResource().getFile());
+-    }
+-    resolvedParams.addResolvedRsrcPath(symlink, destFile.toString());
+-  }
+-
+-  // Static file is files uploaded by users before launch the service. Which
+-  // should be localized to container local disk without any changes.
+-  private static boolean isStaticFile(ConfigFile file) {
+-    return file.getType().equals(ConfigFile.TypeEnum.ARCHIVE) || file.getType()
+-        .equals(ConfigFile.TypeEnum.STATIC);
+-  }
+-
+-  private static void resolvePropsInConfigFileAndSaveOnHdfs(SliderFileSystem fs,
+-      Map<String, String> tokensForSubstitution, ComponentInstance instance,
+-      ConfigFile configFile, String fileName, Path remoteFile)
+-      throws IOException {
+-    // substitute non-template configs
+-    substituteMapWithTokens(configFile.getProperties(), tokensForSubstitution);
+-
+-    // write configs onto hdfs
+-    PublishedConfiguration publishedConfiguration =
+-        new PublishedConfiguration(fileName,
+-            configFile.getProperties().entrySet());
+-    if (!fs.getFileSystem().exists(remoteFile)) {
+-      PublishedConfigurationOutputter configurationOutputter =
+-          PublishedConfigurationOutputter.createOutputter(
+-              ConfigFormat.resolve(configFile.getType().toString()),
+-              publishedConfiguration);
+-      try (FSDataOutputStream os = fs.getFileSystem().create(remoteFile)) {
+-        configurationOutputter.save(os);
+-        os.flush();
+-      }
+-    } else {
+-      log.info("Component instance = " + instance.getCompInstanceName()
+-              + ", config file already exists: " + remoteFile);
+-    }
+-  }
+-
+-  // 1. substitute config template - only handle hadoop_xml format
+-  // 2. save on hdfs
+-  @SuppressWarnings("unchecked")
+-  private static void resolveHadoopXmlTemplateAndSaveOnHdfs(FileSystem fs,
+-      Map<String, String> tokensForSubstitution, ConfigFile configFile,
+-      Path remoteFile, ServiceContext context) throws IOException {
+-    Map<String, String> conf;
+-    try {
+-      conf = (Map<String, String>) context.configCache.get(configFile);
+-    } catch (ExecutionException e) {
+-      log.info("Failed to load config file: " + configFile, e);
+-      return;
+-    }
+-    // make a copy for substitution
+-    org.apache.hadoop.conf.Configuration confCopy =
+-        new org.apache.hadoop.conf.Configuration(false);
+-    for (Map.Entry<String, String> entry : conf.entrySet()) {
+-      confCopy.set(entry.getKey(), entry.getValue());
+-    }
+-    // substitute properties
+-    for (Map.Entry<String, String> entry : configFile.getProperties().entrySet()) {
+-      confCopy.set(entry.getKey(), entry.getValue());
+-    }
+-    // substitute env variables
+-    for (Map.Entry<String, String> entry : confCopy) {
+-      String val = entry.getValue();
+-      if (val != null) {
+-        for (Map.Entry<String, String> token : tokensForSubstitution
+-            .entrySet()) {
+-          val = val.replaceAll(Pattern.quote(token.getKey()), token.getValue());
+-          confCopy.set(entry.getKey(), val);
+-        }
+-      }
+-    }
+-    // save on hdfs
+-    try (OutputStream output = fs.create(remoteFile)) {
+-      confCopy.writeXml(output);
+-      log.info("Reading config from: " + configFile.getSrcFile()
+-          + ", writing to: " + remoteFile);
+-    }
+-  }
+-
+-  // 1) read the template as a string
+-  // 2) do token substitution
+-  // 3) save on hdfs
+-  private static void resolvePlainTemplateAndSaveOnHdfs(FileSystem fs,
+-      Map<String, String> tokensForSubstitution, ConfigFile configFile,
+-      Path remoteFile, ServiceContext context) {
+-    String content;
+-    try {
+-      content = (String) context.configCache.get(configFile);
+-    } catch (ExecutionException e) {
+-      log.info("Failed to load config file: " + configFile, e);
+-      return;
+-    }
+-    // substitute tokens
+-    content = substituteStrWithTokens(content, tokensForSubstitution);
+-
+-    try (OutputStream output = fs.create(remoteFile)) {
+-      org.apache.commons.io.IOUtils.write(content, output, StandardCharsets.UTF_8);
+-    } catch (IOException e) {
+-      log.info("Failed to create " + remoteFile);
+-    }
+-  }
+-
+-  /**
+-   * Get initial component token map to be substituted into config values.
+-   * @return tokens to replace
+-   */
+-  public static Map<String, String> initCompTokensForSubstitute(
+-      ComponentInstance instance, Container container,
+-      ContainerLaunchService.ComponentLaunchContext componentLaunchContext) {
+-    Map<String, String> tokens = new HashMap<>();
+-    tokens.put(COMPONENT_NAME, componentLaunchContext.getName());
+-    tokens
+-        .put(COMPONENT_NAME_LC, componentLaunchContext.getName().toLowerCase());
+-    tokens.put(COMPONENT_INSTANCE_NAME, instance.getCompInstanceName());
+-    tokens.put(CONTAINER_ID, container.getId().toString());
+-    tokens.put(COMPONENT_ID,
+-        String.valueOf(instance.getCompInstanceId().getId()));
+-    tokens.putAll(instance.getComponent().getDependencyHostIpTokens());
+-    return tokens;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultClientProvider.java
+deleted file mode 100644
+index 2c9cf091456..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultClientProvider.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.defaultImpl;
+-
+-import java.io.IOException;
+-import java.nio.file.Paths;
+-
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-public class DefaultClientProvider extends AbstractClientProvider {
+-
+-  public DefaultClientProvider() {
+-  }
+-
+-  @Override
+-  public void validateArtifact(Artifact artifact, String compName,
+-      FileSystem fileSystem) {
+-  }
+-
+-  @Override
+-  @VisibleForTesting
+-  public void validateConfigFile(ConfigFile configFile, String compName,
+-      FileSystem fileSystem) throws IOException {
+-    // validate dest_file is not absolute
+-    if (Paths.get(configFile.getDestFile()).isAbsolute()) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_CONFIGFILE_DEST_FILE_FOR_COMP_NOT_ABSOLUTE,
+-          compName, "no", configFile.getDestFile()));
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderFactory.java
+deleted file mode 100644
+index 868bba8f8dc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderFactory.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.defaultImpl;
+-
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-
+-public final class DefaultProviderFactory extends ProviderFactory {
+-  private static final ProviderFactory FACTORY = new
+-      DefaultProviderFactory();
+-
+-  private DefaultProviderFactory() {}
+-
+-  private static class Client {
+-    static final AbstractClientProvider PROVIDER = new DefaultClientProvider();
+-  }
+-
+-  private static class Server {
+-    static final ProviderService PROVIDER = new DefaultProviderService();
+-  }
+-
+-  @Override
+-  public AbstractClientProvider createClientProvider() {
+-    return Client.PROVIDER;
+-  }
+-
+-  @Override
+-  public ProviderService createServerProvider() {
+-    return Server.PROVIDER;
+-  }
+-
+-  public static ProviderFactory getInstance() {
+-    return FACTORY;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderService.java
+deleted file mode 100644
+index 790fe20c5c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/defaultImpl/DefaultProviderService.java
++++ /dev/null
+@@ -1,38 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.defaultImpl;
+-
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.provider.AbstractProviderService;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-
+-import java.io.IOException;
+-
+-public class DefaultProviderService extends AbstractProviderService {
+-
+-  @Override
+-  public void processArtifact(AbstractLauncher launcher,
+-      ComponentInstance compInstance, SliderFileSystem fileSystem,
+-      Service service,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchCtx)
+-      throws IOException {
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerClientProvider.java
+deleted file mode 100644
+index 901d779b3b1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerClientProvider.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.docker;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-
+-import java.io.IOException;
+-
+-public class DockerClientProvider extends AbstractClientProvider
+-    implements YarnServiceConstants {
+-
+-  public DockerClientProvider() {
+-    super();
+-  }
+-
+-  @Override
+-  public void validateArtifact(Artifact artifact, String compName,
+-      FileSystem fileSystem) {
+-    if (artifact == null) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_ARTIFACT_FOR_COMP_INVALID, compName));
+-    }
+-    if (StringUtils.isEmpty(artifact.getId())) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_ARTIFACT_ID_FOR_COMP_INVALID, compName));
+-    }
+-  }
+-
+-  @Override
+-  protected void validateConfigFile(ConfigFile configFile, String compName,
+-      FileSystem fileSystem) throws IOException {
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java
+deleted file mode 100644
+index 992a40cebac..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerKeys.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.docker;
+-
+-public interface DockerKeys {
+-  String DOCKER_PREFIX = "docker.";
+-  String DOCKER_NETWORK = DOCKER_PREFIX + "network";
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderFactory.java
+deleted file mode 100644
+index 57330ab6ad0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderFactory.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.docker;
+-
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-
+-public class DockerProviderFactory extends ProviderFactory {
+-  private static final ProviderFactory FACTORY = new
+-      DockerProviderFactory();
+-
+-  private DockerProviderFactory() {
+-  }
+-
+-  private static class Client {
+-    static final AbstractClientProvider PROVIDER = new DockerClientProvider();
+-  }
+-
+-  private static class Server {
+-    static final ProviderService PROVIDER = new DockerProviderService();
+-  }
+-
+-  @Override
+-  public AbstractClientProvider createClientProvider() {
+-    return Client.PROVIDER;
+-  }
+-
+-  @Override
+-  public ProviderService createServerProvider() {
+-    return Server.PROVIDER;
+-  }
+-
+-  public static ProviderFactory getInstance() {
+-    return FACTORY;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java
+deleted file mode 100644
+index 9b4138e57d6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/docker/DockerProviderService.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.docker;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.provider.AbstractProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderUtils;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.CommandLineBuilder;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.api.ApplicationConstants.Environment;
+-
+-import java.io.IOException;
+-import java.util.Map;
+-
+-public class DockerProviderService extends AbstractProviderService
+-    implements DockerKeys {
+-
+-  @Override
+-  public void processArtifact(AbstractLauncher launcher,
+-      ComponentInstance compInstance, SliderFileSystem fileSystem,
+-      Service service, ContainerLaunchService.ComponentLaunchContext
+-      compLaunchCtx) throws IOException{
+-    launcher.setYarnDockerMode(true);
+-    launcher.setDockerImage(compLaunchCtx.getArtifact().getId());
+-    launcher.setDockerNetwork(compLaunchCtx.getConfiguration()
+-        .getProperty(DOCKER_NETWORK));
+-    launcher.setDockerHostname(compInstance.getHostname());
+-    launcher.setRunPrivilegedContainer(
+-        compLaunchCtx.isRunPrivilegedContainer());
+-  }
+-
+-  /**
+-   * Check if system is default to disable docker override or
+-   * user requested a Docker container with ENTRY_POINT support.
+-   *
+-   * @param compLaunchContext - launch context for the component.
+-   * @return true if Docker launch command override is disabled
+-   */
+-  private boolean checkUseEntryPoint(
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext) {
+-    boolean overrideDisable = false;
+-    String overrideDisableKey = Environment.
+-        YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE.
+-            name();
+-    String overrideDisableValue = (
+-        compLaunchContext.getConfiguration().getEnv(overrideDisableKey)
+-            != null) ?
+-            compLaunchContext.getConfiguration().getEnv(
+-                overrideDisableKey) : System.getenv(overrideDisableKey);
+-    overrideDisable = Boolean.parseBoolean(overrideDisableValue);
+-    return overrideDisable;
+-  }
+-
+-  @Override
+-  public void buildContainerLaunchCommand(AbstractLauncher launcher,
+-      Service service, ComponentInstance instance,
+-      SliderFileSystem fileSystem, Configuration yarnConf, Container container,
+-      ContainerLaunchService.ComponentLaunchContext compLaunchContext,
+-      Map<String, String> tokensForSubstitution)
+-          throws IOException, SliderException {
+-    boolean useEntryPoint = checkUseEntryPoint(compLaunchContext);
+-    if (useEntryPoint) {
+-      String launchCommand = compLaunchContext.getLaunchCommand();
+-      if (!StringUtils.isEmpty(launchCommand)) {
+-        if(launchCommand.contains(" ")) {
+-          // convert space delimiter command to exec format
+-          launchCommand = ProviderUtils
+-              .replaceSpacesWithDelimiter(launchCommand, ",");
+-        }
+-        launcher.addCommand(launchCommand);
+-      }
+-    } else {
+-      // substitute launch command
+-      String launchCommand = compLaunchContext.getLaunchCommand();
+-      // docker container may have empty commands
+-      if (!StringUtils.isEmpty(launchCommand)) {
+-        launchCommand = ProviderUtils
+-            .substituteStrWithTokens(launchCommand, tokensForSubstitution);
+-        CommandLineBuilder operation = new CommandLineBuilder();
+-        operation.add(launchCommand);
+-        operation.addOutAndErrFiles(OUT_FILE, ERR_FILE);
+-        launcher.addCommand(operation.build());
+-      }
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballClientProvider.java
+deleted file mode 100644
+index b801e0caa31..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballClientProvider.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.tarball;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-
+-import java.io.IOException;
+-import java.nio.file.Paths;
+-
+-public class TarballClientProvider extends AbstractClientProvider
+-    implements YarnServiceConstants {
+-
+-  public TarballClientProvider() {
+-  }
+-
+-  @Override
+-  public void validateArtifact(Artifact artifact, String compName,
+-      FileSystem fs) throws IOException {
+-    if (artifact == null) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_ARTIFACT_FOR_COMP_INVALID, compName));
+-    }
+-    if (StringUtils.isEmpty(artifact.getId())) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_ARTIFACT_ID_FOR_COMP_INVALID, compName));
+-    }
+-    Path p = new Path(artifact.getId());
+-    if (!fs.exists(p)) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_ARTIFACT_PATH_FOR_COMP_INVALID, compName,
+-          Artifact.TypeEnum.TARBALL.name(), artifact.getId()));
+-    }
+-  }
+-
+-  @Override
+-  protected void validateConfigFile(ConfigFile configFile, String compName,
+-      FileSystem fileSystem) throws IOException {
+-    // validate dest_file is not absolute
+-    if (Paths.get(configFile.getDestFile()).isAbsolute()) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_CONFIGFILE_DEST_FILE_FOR_COMP_NOT_ABSOLUTE,
+-          compName, Artifact.TypeEnum.TARBALL.name(),
+-          configFile.getDestFile()));
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderFactory.java
+deleted file mode 100644
+index 9d81f66e6b2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderFactory.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.tarball;
+-
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-
+-public class TarballProviderFactory extends ProviderFactory {
+-  private static final ProviderFactory FACTORY = new
+-      TarballProviderFactory();
+-
+-  private TarballProviderFactory() {
+-  }
+-
+-  private static class Client {
+-    static final AbstractClientProvider PROVIDER = new TarballClientProvider();
+-  }
+-
+-  private static class Server {
+-    static final ProviderService PROVIDER = new TarballProviderService();
+-  }
+-
+-  @Override
+-  public AbstractClientProvider createClientProvider() {
+-    return Client.PROVIDER;
+-  }
+-
+-  @Override
+-  public ProviderService createServerProvider() {
+-    return Server.PROVIDER;
+-  }
+-
+-  public static ProviderFactory getInstance() {
+-    return FACTORY;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderService.java
+deleted file mode 100644
+index cd783e77f76..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/provider/tarball/TarballProviderService.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.provider.tarball;
+-
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.provider.AbstractProviderService;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-
+-import java.io.IOException;
+-
+-public class TarballProviderService extends AbstractProviderService {
+-
+-  @Override
+-  public void processArtifact(AbstractLauncher launcher,
+-      ComponentInstance instance, SliderFileSystem fileSystem,
+-      Service service, ContainerLaunchService.ComponentLaunchContext
+-      compLaunchCtx) throws IOException {
+-    Path artifact = new Path(compLaunchCtx.getArtifact().getId());
+-    if (!fileSystem.isFile(artifact)) {
+-      throw new IOException(
+-          "Package doesn't exist as a resource: " + artifact);
+-    }
+-    log.info("Adding resource {}", artifact);
+-    LocalResourceType type = LocalResourceType.ARCHIVE;
+-    LocalResource packageResource = fileSystem.createAmResource(artifact, type,
+-        LocalResourceVisibility.APPLICATION);
+-    launcher.addLocalResource(APP_LIB_DIR, packageResource);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/CustomRegistryConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/CustomRegistryConstants.java
+deleted file mode 100644
+index 56634f678c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/CustomRegistryConstants.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.registry;
+-
+-/**
+- * These are constants unique to the Slider AM
+- */
+-public class CustomRegistryConstants {
+-
+-  public static final String MANAGEMENT_REST_API =
+-      "classpath:org.apache.slider.management";
+-  
+-  public static final String REGISTRY_REST_API =
+-      "classpath:org.apache.slider.registry";
+-  
+-  public static final String PUBLISHER_REST_API =
+-      "classpath:org.apache.slider.publisher";
+-
+-  public static final String PUBLISHER_CONFIGURATIONS_API =
+-      "classpath:org.apache.slider.publisher.configurations";
+-
+-  public static final String PUBLISHER_EXPORTS_API =
+-      "classpath:org.apache.slider.publisher.exports";
+-
+-  public static final String PUBLISHER_DOCUMENTS_API =
+-      "classpath:org.apache.slider.publisher.documents";
+-
+-  public static final String AGENT_SECURE_REST_API =
+-      "classpath:org.apache.slider.agents.secure";
+-
+-  public static final String AGENT_ONEWAY_REST_API =
+-      "classpath:org.apache.slider.agents.oneway";
+-
+-  public static final String AM_IPC_PROTOCOL =
+-      "classpath:org.apache.slider.appmaster.ipc";
+-
+-  public static final String AM_REST_BASE =
+-      "classpath:org.apache.slider.client.rest";
+-
+-  public static final String WEB_UI = "http://";
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/YarnRegistryViewForProviders.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/YarnRegistryViewForProviders.java
+deleted file mode 100644
+index 2b13cf0cae8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/registry/YarnRegistryViewForProviders.java
++++ /dev/null
+@@ -1,252 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.registry;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.fs.PathNotFoundException;
+-import org.apache.hadoop.registry.client.api.RegistryConstants;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.registry.client.api.BindFlags;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-
+-import org.apache.hadoop.registry.client.types.ServiceRecord;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceId;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.List;
+-
+-import static org.apache.hadoop.registry.client.binding.RegistryPathUtils.join;
+-
+-/**
+- * Registry view for providers. This tracks where the service
+- * is registered, offers access to the record and other things.
+- */
+-public class YarnRegistryViewForProviders {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(YarnRegistryViewForProviders.class);
+-
+-  private final RegistryOperations registryOperations;
+-  private final String user;
+-  private final String serviceClass;
+-  private final String instanceName;
+-  /**
+-   * Record used where the service registered itself.
+-   * Null until the service is registered
+-   */
+-  private ServiceRecord selfRegistration;
+-
+-  /**
+-   * Path where record was registered.
+-   * Null until the service is registered
+-   */
+-  private String selfRegistrationPath;
+-
+-  public YarnRegistryViewForProviders(RegistryOperations registryOperations,
+-      String user,
+-      String serviceClass,
+-      String instanceName,
+-      ApplicationAttemptId applicationAttemptId) {
+-    Preconditions.checkArgument(registryOperations != null,
+-        "null registry operations");
+-    Preconditions.checkArgument(user != null, "null user");
+-    Preconditions.checkArgument(ServiceUtils.isSet(serviceClass),
+-        "unset service class");
+-    Preconditions.checkArgument(ServiceUtils.isSet(instanceName),
+-        "instanceName");
+-    Preconditions.checkArgument(applicationAttemptId != null,
+-        "null applicationAttemptId");
+-    this.registryOperations = registryOperations;
+-    this.user = user;
+-    this.serviceClass = serviceClass;
+-    this.instanceName = instanceName;
+-  }
+-
+-  public String getUser() {
+-    return user;
+-  }
+-
+-
+-  private void setSelfRegistration(ServiceRecord selfRegistration) {
+-    this.selfRegistration = selfRegistration;
+-  }
+-
+-  /**
+-   * Get the path to where the service has registered itself.
+-   * Null until the service is registered
+-   * @return the service registration path.
+-   */
+-  public String getSelfRegistrationPath() {
+-    return selfRegistrationPath;
+-  }
+-
+-  /**
+-   * Get the absolute path to where the service has registered itself.
+-   * This includes the base registry path
+-   * Null until the service is registered
+-   * @return the service registration path.
+-   */
+-  public String getAbsoluteSelfRegistrationPath() {
+-    if (selfRegistrationPath == null) {
+-      return null;
+-    }
+-    String root = registryOperations.getConfig().getTrimmed(
+-        RegistryConstants.KEY_REGISTRY_ZK_ROOT,
+-        RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT);
+-    return RegistryPathUtils.join(root, selfRegistrationPath);
+-  }
+-
+-  /**
+-   * Add a component under the slider name/entry.
+-   * @param componentName component name
+-   * @param record record to put
+-   * @throws IOException
+-   */
+-  public void putComponent(String componentName,
+-      ServiceRecord record) throws
+-      IOException {
+-    putComponent(serviceClass, instanceName,
+-        componentName,
+-        record);
+-  }
+-
+-  /**
+-   * Add a component.
+-   * @param serviceClass service class to use under ~user
+-   * @param componentName component name
+-   * @param record record to put
+-   * @throws IOException
+-   */
+-  public void putComponent(String serviceClass,
+-      String serviceName,
+-      String componentName,
+-      ServiceRecord record) throws IOException {
+-    String path = RegistryUtils.componentPath(
+-        user, serviceClass, serviceName, componentName);
+-    String parentPath = RegistryPathUtils.parentOf(path);
+-    if (!registryOperations.exists(parentPath)) {
+-      registryOperations.mknode(parentPath, true);
+-    }
+-    registryOperations.bind(path, record, BindFlags.OVERWRITE);
+-  }
+-
+-  /**
+-   * Get a component.
+-   * @param componentName component name
+-   * @return the service record
+-   * @throws IOException
+-   */
+-  public ServiceRecord getComponent(String componentName) throws IOException {
+-    String path = RegistryUtils.componentPath(
+-        user, serviceClass, instanceName, componentName);
+-    LOG.info("Resolving path {}", path);
+-    return registryOperations.resolve(path);
+-  }
+-
+-  /**
+-   * List components.
+-   * @return a list of components
+-   * @throws IOException
+-   */
+-  public List<String> listComponents() throws IOException {
+-    String path = RegistryUtils.componentListPath(
+-        user, serviceClass, instanceName);
+-    return registryOperations.list(path);
+-  }
+-
+-  /**
+-   * Add a service under a path, optionally purging any history.
+-   * @param username user
+-   * @param serviceClass service class to use under ~user
+-   * @param serviceName name of the service
+-   * @param record service record
+-   * @param deleteTreeFirst perform recursive delete of the path first.
+-   * @return the path the service was created at
+-   * @throws IOException
+-   */
+-  public String putService(String username,
+-      String serviceClass,
+-      String serviceName,
+-      ServiceRecord record,
+-      boolean deleteTreeFirst) throws IOException {
+-    String path = RegistryUtils.servicePath(
+-        username, serviceClass, serviceName);
+-    if (deleteTreeFirst) {
+-      registryOperations.delete(path, true);
+-    }
+-    registryOperations.mknode(RegistryPathUtils.parentOf(path), true);
+-    registryOperations.bind(path, record, BindFlags.OVERWRITE);
+-    return path;
+-  }
+-
+-  /**
+-   * Add a service under a path for the current user.
+-   * @param record service record
+-   * @param deleteTreeFirst perform recursive delete of the path first
+-   * @return the path the service was created at
+-   * @throws IOException
+-   */
+-  public String registerSelf(
+-      ServiceRecord record,
+-      boolean deleteTreeFirst) throws IOException {
+-    selfRegistrationPath =
+-        putService(user, serviceClass, instanceName, record, deleteTreeFirst);
+-    setSelfRegistration(record);
+-    return selfRegistrationPath;
+-  }
+-
+-  /**
+-   * Delete a component.
+-   * @param containerId component name
+-   * @throws IOException
+-   */
+-  public void deleteComponent(ComponentInstanceId instanceId,
+-      String containerId) throws IOException {
+-    String path = RegistryUtils.componentPath(
+-        user, serviceClass, instanceName,
+-        containerId);
+-    LOG.info(instanceId + ": Deleting registry path " + path);
+-    registryOperations.delete(path, false);
+-  }
+-
+-  /**
+-   * Delete the children of a path -but not the path itself.
+-   * It is not an error if the path does not exist
+-   * @param path path to delete
+-   * @param recursive flag to request recursive deletes
+-   * @throws IOException IO problems
+-   */
+-  public void deleteChildren(String path, boolean recursive) throws IOException {
+-    List<String> childNames = null;
+-    try {
+-      childNames = registryOperations.list(path);
+-    } catch (PathNotFoundException e) {
+-      return;
+-    }
+-    for (String childName : childNames) {
+-      String child = join(path, childName);
+-      registryOperations.delete(child, recursive);
+-    }
+-  }
+-  
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java
+deleted file mode 100644
+index ff4556f7cd7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java
++++ /dev/null
+@@ -1,98 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-import org.apache.commons.configuration2.SubsetConfiguration;
+-import org.apache.hadoop.metrics2.MetricsRecord;
+-import org.apache.hadoop.metrics2.MetricsSink;
+-import org.apache.hadoop.metrics2.MetricsTag;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Write the metrics to a ATSv2. Generally, this class is instantiated via
+- * hadoop-metrics2 property files. Specifically, you would create this class by
+- * adding the following to by This would actually be set as: <code>
+- * [prefix].sink.[some instance name].class
+- * =org.apache.hadoop.yarn.service.timelineservice.ServiceMetricsSink
+- * </code>, where <tt>prefix</tt> is "atsv2": and <tt>some instance name</tt> is
+- * just any unique name, so properties can be differentiated if there are
+- * multiple sinks of the same type created
+- */
+-public class ServiceMetricsSink implements MetricsSink {
+-
+-  private static final Logger log =
+-      LoggerFactory.getLogger(ServiceMetricsSink.class);
+-
+-  private ServiceTimelinePublisher serviceTimelinePublisher;
+-
+-  public ServiceMetricsSink() {
+-
+-  }
+-
+-  public ServiceMetricsSink(ServiceTimelinePublisher publisher) {
+-    serviceTimelinePublisher = publisher;
+-  }
+-
+-  /**
+-   * Publishes service and component metrics to ATS.
+-   */
+-  @Override
+-  public void putMetrics(MetricsRecord record) {
+-    if (serviceTimelinePublisher.isStopped()) {
+-      log.warn("ServiceTimelinePublisher has stopped. "
+-          + "Not publishing any more metrics to ATS.");
+-      return;
+-    }
+-
+-    boolean isServiceMetrics = false;
+-    boolean isComponentMetrics = false;
+-    String appId = null;
+-    for (MetricsTag tag : record.tags()) {
+-      if (tag.name().equals("type") && tag.value().equals("service")) {
+-        isServiceMetrics = true;
+-      } else if (tag.name().equals("type") && tag.value().equals("component")) {
+-        isComponentMetrics = true;
+-        break; // if component metrics, no more information required from tag so
+-               // break the loop
+-      } else if (tag.name().equals("appId")) {
+-        appId = tag.value();
+-      }
+-    }
+-
+-    if (isServiceMetrics && appId != null) {
+-      log.debug("Publishing service metrics. {}", record);
+-      serviceTimelinePublisher.publishMetrics(record.metrics(), appId,
+-          ServiceTimelineEntityType.SERVICE_ATTEMPT.toString(),
+-          record.timestamp());
+-    } else if (isComponentMetrics) {
+-      log.debug("Publishing Component metrics. {}", record);
+-      serviceTimelinePublisher.publishMetrics(record.metrics(), record.name(),
+-          ServiceTimelineEntityType.COMPONENT.toString(), record.timestamp());
+-    }
+-  }
+-
+-  @Override
+-  public void init(SubsetConfiguration conf) {
+-  }
+-
+-  @Override
+-  public void flush() {
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEntityType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEntityType.java
+deleted file mode 100644
+index d5c95394aa4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEntityType.java
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-/**
+- * Slider entities that are published to ATS.
+- */
+-public enum ServiceTimelineEntityType {
+-  /**
+-   * Used for publishing service entity information.
+-   */
+-  SERVICE_ATTEMPT,
+-
+-  /**
+-   * Used for publishing component entity information.
+-   */
+-  COMPONENT,
+-
+-  /**
+-   * Used for publishing component instance entity information.
+-   */
+-  COMPONENT_INSTANCE
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEvent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEvent.java
+deleted file mode 100644
+index 832dad729ca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineEvent.java
++++ /dev/null
+@@ -1,39 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-/**
+- * Events that are used to store in ATS.
+- */
+-public enum ServiceTimelineEvent {
+-  SERVICE_ATTEMPT_REGISTERED,
+-
+-  SERVICE_ATTEMPT_UNREGISTERED,
+-
+-  COMPONENT_INSTANCE_REGISTERED,
+-
+-  COMPONENT_INSTANCE_UNREGISTERED,
+-
+-  COMPONENT_INSTANCE_IP_HOST_UPDATE,
+-
+-  COMPONENT_INSTANCE_BECOME_READY,
+-
+-  COMPONENT_FINISHED
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineMetricsConstants.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineMetricsConstants.java
+deleted file mode 100644
+index a5ef2b82534..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelineMetricsConstants.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-/**
+- * Constants which are stored as key in ATS
+- */
+-public final class ServiceTimelineMetricsConstants {
+-
+-  public static final String URI = "URI";
+-
+-  public static final String NAME = "NAME";
+-
+-  public static final String STATE = "STATE";
+-
+-  public static final String EXIT_STATUS_CODE = "EXIT_STATUS_CODE";
+-
+-  public static final String EXIT_REASON = "EXIT_REASON";
+-
+-  public static final String DIAGNOSTICS_INFO = "DIAGNOSTICS_INFO";
+-
+-  public static final String LAUNCH_TIME = "LAUNCH_TIME";
+-
+-  public static final String QUICK_LINKS = "QUICK_LINKS";
+-
+-  public static final String LAUNCH_COMMAND = "LAUNCH_COMMAND";
+-
+-  public static final String TOTAL_CONTAINERS = "NUMBER_OF_CONTAINERS";
+-
+-  public static final String RUNNING_CONTAINERS =
+-      "NUMBER_OF_RUNNING_CONTAINERS";
+-
+-  /**
+-   * Artifacts constants.
+-   */
+-  public static final String ARTIFACT_ID = "ARTIFACT_ID";
+-
+-  public static final String ARTIFACT_TYPE = "ARTIFACT_TYPE";
+-
+-  public static final String ARTIFACT_URI = "ARTIFACT_URI";
+-
+-  /**
+-   * Resource constants.
+-   */
+-  public static final String RESOURCE_CPU = "RESOURCE_CPU";
+-
+-  public static final String RESOURCE_MEMORY = "RESOURCE_MEMORY";
+-
+-  public static final String RESOURCE_PROFILE = "RESOURCE_PROFILE";
+-
+-  /**
+-   * component instance constants.
+-   */
+-  public static final String IP = "IP";
+-
+-  public static final String EXPOSED_PORTS = "EXPOSED_PORTS";
+-
+-  public static final String HOSTNAME = "HOSTNAME";
+-
+-  public static final String BARE_HOST = "BARE_HOST";
+-
+-  public static final String COMPONENT_NAME = "COMPONENT_NAME";
+-
+-  public static final String COMPONENT_INSTANCE_NAME = "COMPONENT_INSTANCE_NAME";
+-
+-  /**
+-   * component constants.
+-   */
+-  public static final String DEPENDENCIES = "DEPENDENCIES";
+-
+-  public static final String DESCRIPTION = "DESCRIPTION";
+-
+-  public static final String RUN_PRIVILEGED_CONTAINER =
+-      "RUN_PRIVILEGED_CONTAINER";
+-
+-  public static final String PLACEMENT_POLICY = "PLACEMENT_POLICY";
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java
+deleted file mode 100644
+index 0982b66b673..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceTimelinePublisher.java
++++ /dev/null
+@@ -1,401 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-import org.apache.hadoop.metrics2.AbstractMetric;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric;
+-import org.apache.hadoop.yarn.client.api.TimelineV2Client;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.*;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.Set;
+-
+-import static org.apache.hadoop.yarn.service.api.records.ContainerState.READY;
+-import static org.apache.hadoop.yarn.service.timelineservice.ServiceTimelineMetricsConstants.DIAGNOSTICS_INFO;
+-
+-/**
+- * A single service that publishes all the Timeline Entities.
+- */
+-public class ServiceTimelinePublisher extends CompositeService {
+-
+-  // Number of bytes of config which can be published in one shot to ATSv2.
+-  public static final int ATS_CONFIG_PUBLISH_SIZE_BYTES = 10 * 1024;
+-
+-  private TimelineV2Client timelineClient;
+-
+-  private volatile boolean stopped = false;
+-
+-  private static final Logger log =
+-      LoggerFactory.getLogger(ServiceTimelinePublisher.class);
+-
+-  @Override
+-  protected void serviceInit(org.apache.hadoop.conf.Configuration configuration)
+-      throws Exception {
+-    addService(timelineClient);
+-    super.serviceInit(configuration);
+-  }
+-
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    stopped = true;
+-    super.serviceStop();
+-  }
+-
+-  public boolean isStopped() {
+-    return stopped;
+-  }
+-
+-  public ServiceTimelinePublisher(TimelineV2Client client) {
+-    super(ServiceTimelinePublisher.class.getName());
+-    timelineClient = client;
+-  }
+-
+-  public void serviceAttemptRegistered(Service service,
+-      org.apache.hadoop.conf.Configuration systemConf) {
+-    long currentTimeMillis = service.getLaunchTime() == null
+-        ? System.currentTimeMillis() : service.getLaunchTime().getTime();
+-
+-    TimelineEntity entity = createServiceAttemptEntity(service.getId());
+-    entity.setCreatedTime(currentTimeMillis);
+-
+-    // create info keys
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.NAME, service.getName());
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE,
+-        ServiceState.STARTED.toString());
+-    entityInfos.put(ServiceTimelineMetricsConstants.LAUNCH_TIME,
+-        currentTimeMillis);
+-    entity.addInfo(ServiceTimelineMetricsConstants.QUICK_LINKS,
+-        service.getQuicklinks());
+-    entity.addInfo(entityInfos);
+-
+-    // add an event
+-    TimelineEvent startEvent = new TimelineEvent();
+-    startEvent.setId(ServiceTimelineEvent.SERVICE_ATTEMPT_REGISTERED.toString());
+-    startEvent.setTimestamp(currentTimeMillis);
+-    entity.addEvent(startEvent);
+-
+-    // publish before configurations published
+-    putEntity(entity);
+-
+-    // publish system config - YarnConfiguration
+-    populateTimelineEntity(systemConf.iterator(), service.getId(),
+-        ServiceTimelineEntityType.SERVICE_ATTEMPT.toString());
+-    // publish container conf
+-    publishContainerConf(service.getConfiguration(), service.getId(),
+-        ServiceTimelineEntityType.SERVICE_ATTEMPT.toString());
+-
+-    // publish component as separate entity.
+-    publishComponents(service.getComponents());
+-  }
+-
+-  public void serviceAttemptUpdated(Service service) {
+-    TimelineEntity entity = createServiceAttemptEntity(service.getId());
+-    entity.addInfo(ServiceTimelineMetricsConstants.QUICK_LINKS,
+-        service.getQuicklinks());
+-    putEntity(entity);
+-  }
+-
+-  public void serviceAttemptUnregistered(ServiceContext context,
+-      FinalApplicationStatus status, String diagnostics) {
+-    TimelineEntity entity = createServiceAttemptEntity(
+-        context.attemptId.getApplicationId().toString());
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE, status);
+-    entityInfos.put(DIAGNOSTICS_INFO, diagnostics);
+-    entity.addInfo(entityInfos);
+-
+-    // add an event
+-    TimelineEvent finishEvent = new TimelineEvent();
+-    finishEvent
+-        .setId(ServiceTimelineEvent.SERVICE_ATTEMPT_UNREGISTERED.toString());
+-    finishEvent.setTimestamp(System.currentTimeMillis());
+-    entity.addEvent(finishEvent);
+-
+-    putEntity(entity);
+-  }
+-
+-  public void componentInstanceStarted(Container container,
+-      ComponentInstance instance) {
+-
+-    TimelineEntity entity = createComponentInstanceEntity(container.getId());
+-    entity.setCreatedTime(container.getLaunchTime().getTime());
+-
+-    // create info keys
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.BARE_HOST,
+-        container.getBareHost());
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE,
+-        container.getState().toString());
+-    entityInfos.put(ServiceTimelineMetricsConstants.LAUNCH_TIME,
+-        container.getLaunchTime().getTime());
+-    entityInfos.put(ServiceTimelineMetricsConstants.COMPONENT_NAME,
+-        instance.getCompName());
+-    entityInfos.put(ServiceTimelineMetricsConstants.COMPONENT_INSTANCE_NAME,
+-        instance.getCompInstanceName());
+-    entity.addInfo(entityInfos);
+-
+-    // add an event
+-    TimelineEvent startEvent = new TimelineEvent();
+-    startEvent
+-        .setId(ServiceTimelineEvent.COMPONENT_INSTANCE_REGISTERED.toString());
+-    startEvent.setTimestamp(container.getLaunchTime().getTime());
+-    entity.addEvent(startEvent);
+-
+-    putEntity(entity);
+-  }
+-
+-  public void componentInstanceFinished(ContainerId containerId,
+-      int exitCode, ContainerState state, String diagnostics) {
+-    TimelineEntity entity = createComponentInstanceEntity(
+-        containerId.toString());
+-
+-    // create info keys
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.EXIT_STATUS_CODE,
+-        exitCode);
+-    entityInfos.put(DIAGNOSTICS_INFO, diagnostics);
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE, state);
+-    entity.addInfo(entityInfos);
+-
+-    // add an event
+-    TimelineEvent startEvent = new TimelineEvent();
+-    startEvent
+-        .setId(ServiceTimelineEvent.COMPONENT_INSTANCE_UNREGISTERED.toString());
+-    startEvent.setTimestamp(System.currentTimeMillis());
+-    entity.addEvent(startEvent);
+-
+-    putEntity(entity);
+-  }
+-
+-  public void componentInstanceIPHostUpdated(Container container) {
+-    TimelineEntity entity = createComponentInstanceEntity(container.getId());
+-
+-    // create info keys
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.IP, container.getIp());
+-    entityInfos.put(ServiceTimelineMetricsConstants.EXPOSED_PORTS,
+-        container.getExposedPorts());
+-    entityInfos.put(ServiceTimelineMetricsConstants.HOSTNAME,
+-        container.getHostname());
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE,
+-        container.getState().toString());
+-    entity.addInfo(entityInfos);
+-
+-    TimelineEvent updateEvent = new TimelineEvent();
+-    updateEvent.setId(ServiceTimelineEvent.COMPONENT_INSTANCE_IP_HOST_UPDATE
+-        .toString());
+-    updateEvent.setTimestamp(System.currentTimeMillis());
+-    entity.addEvent(updateEvent);
+-
+-    putEntity(entity);
+-  }
+-
+-  public void componentInstanceBecomeReady(Container container) {
+-    TimelineEntity entity = createComponentInstanceEntity(container.getId());
+-    Map<String, Object> entityInfo = new HashMap<>();
+-    entityInfo.put(ServiceTimelineMetricsConstants.STATE, READY);
+-    entity.addInfo(entityInfo);
+-    TimelineEvent updateEvent = new TimelineEvent();
+-    updateEvent.setId(ServiceTimelineEvent.COMPONENT_INSTANCE_BECOME_READY
+-        .toString());
+-    updateEvent.setTimestamp(System.currentTimeMillis());
+-    entity.addEvent(updateEvent);
+-    putEntity(entity);
+-  }
+-
+-  private void publishComponents(List<Component> components) {
+-    long currentTimeMillis = System.currentTimeMillis();
+-    for (Component component : components) {
+-      TimelineEntity entity = createComponentEntity(component.getName());
+-      entity.setCreatedTime(currentTimeMillis);
+-
+-      // create info keys
+-      Map<String, Object> entityInfos = new HashMap<String, Object>();
+-      if (component.getArtifact() != null) {
+-        entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_ID,
+-            component.getArtifact().getId());
+-        entityInfos.put(ServiceTimelineMetricsConstants.ARTIFACT_TYPE,
+-            component.getArtifact().getType().toString());
+-      }
+-
+-      if (component.getResource() != null) {
+-        entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_CPU,
+-            component.getResource().getCpus());
+-        entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_MEMORY,
+-            component.getResource().getMemory());
+-        if (component.getResource().getProfile() != null) {
+-          entityInfos.put(ServiceTimelineMetricsConstants.RESOURCE_PROFILE,
+-              component.getResource().getProfile());
+-        }
+-      }
+-
+-      if (component.getLaunchCommand() != null) {
+-        entityInfos.put(ServiceTimelineMetricsConstants.LAUNCH_COMMAND,
+-            component.getLaunchCommand());
+-      }
+-      entityInfos.put(ServiceTimelineMetricsConstants.RUN_PRIVILEGED_CONTAINER,
+-          component.getRunPrivilegedContainer().toString());
+-      entity.addInfo(entityInfos);
+-
+-      putEntity(entity);
+-
+-      // publish container specific configurations
+-      publishContainerConf(component.getConfiguration(), component.getName(),
+-          ServiceTimelineEntityType.COMPONENT.toString());
+-    }
+-  }
+-
+-  private void publishContainerConf(Configuration configuration,
+-      String entityId, String entityType) {
+-    populateTimelineEntity(configuration.getEnv().entrySet().iterator(),
+-        entityId, entityType);
+-
+-    for (ConfigFile configFile : configuration.getFiles()) {
+-      populateTimelineEntity(configFile.getProperties().entrySet().iterator(),
+-          entityId, entityType);
+-    }
+-  }
+-
+-  private void populateTimelineEntity(Iterator<Entry<String, String>> iterator,
+-      String entityId, String entityType) {
+-    int configSize = 0;
+-    TimelineEntity entity = createTimelineEntity(entityId, entityType);
+-    while (iterator.hasNext()) {
+-      Entry<String, String> entry = iterator.next();
+-      int size = entry.getKey().length() + entry.getValue().length();
+-      configSize += size;
+-      // Configs are split into multiple entities if they exceed 100kb in size.
+-      if (configSize > ATS_CONFIG_PUBLISH_SIZE_BYTES) {
+-        if (entity.getConfigs().size() > 0) {
+-          putEntity(entity);
+-          entity = createTimelineEntity(entityId, entityType);
+-        }
+-        configSize = size;
+-      }
+-      entity.addConfig(entry.getKey(), entry.getValue());
+-    }
+-    if (configSize > 0) {
+-      putEntity(entity);
+-    }
+-  }
+-
+-  /**
+-   * Called from ServiceMetricsSink at regular interval of time.
+-   * @param metrics of service or components
+-   * @param entityId Id of entity
+-   * @param entityType Type of entity
+-   * @param timestamp
+-   */
+-  public void publishMetrics(Iterable<AbstractMetric> metrics, String entityId,
+-      String entityType, long timestamp) {
+-    TimelineEntity entity = createTimelineEntity(entityId, entityType);
+-    Set<TimelineMetric> entityMetrics = new HashSet<TimelineMetric>();
+-    for (AbstractMetric metric : metrics) {
+-      TimelineMetric timelineMetric = new TimelineMetric();
+-      timelineMetric.setId(metric.name());
+-      timelineMetric.addValue(timestamp, metric.value());
+-      entityMetrics.add(timelineMetric);
+-    }
+-    entity.setMetrics(entityMetrics);
+-    putEntity(entity);
+-  }
+-
+-  private TimelineEntity createServiceAttemptEntity(String serviceId) {
+-    TimelineEntity entity = createTimelineEntity(serviceId,
+-        ServiceTimelineEntityType.SERVICE_ATTEMPT.toString());
+-    return entity;
+-  }
+-
+-  private TimelineEntity createComponentInstanceEntity(String instanceId) {
+-    TimelineEntity entity = createTimelineEntity(instanceId,
+-        ServiceTimelineEntityType.COMPONENT_INSTANCE.toString());
+-    return entity;
+-  }
+-
+-  private TimelineEntity createComponentEntity(String componentId) {
+-    TimelineEntity entity = createTimelineEntity(componentId,
+-        ServiceTimelineEntityType.COMPONENT.toString());
+-    return entity;
+-  }
+-
+-  private TimelineEntity createTimelineEntity(String entityId,
+-      String entityType) {
+-    TimelineEntity entity = new TimelineEntity();
+-    entity.setId(entityId);
+-    entity.setType(entityType);
+-    return entity;
+-  }
+-
+-  private void putEntity(TimelineEntity entity) {
+-    try {
+-      if (log.isDebugEnabled()) {
+-        log.debug("Publishing the entity " + entity + ", JSON-style content: "
+-            + TimelineUtils.dumpTimelineRecordtoJSON(entity));
+-      }
+-      if (timelineClient != null) {
+-        timelineClient.putEntitiesAsync(entity);
+-      } else {
+-        log.error("Seems like client has been removed before the entity "
+-            + "could be published for " + entity);
+-      }
+-    } catch (Exception e) {
+-      log.error("Error when publishing entity " + entity, e);
+-    }
+-  }
+-
+-  public void componentFinished(
+-      Component comp,
+-      ComponentState state, long finishTime) {
+-    createComponentEntity(comp.getName());
+-    TimelineEntity entity = createComponentEntity(comp.getName());
+-
+-    // create info keys
+-    Map<String, Object> entityInfos = new HashMap<String, Object>();
+-    entityInfos.put(ServiceTimelineMetricsConstants.STATE, state);
+-    entity.addInfo(entityInfos);
+-
+-    // add an event
+-    TimelineEvent startEvent = new TimelineEvent();
+-    startEvent
+-        .setId(ServiceTimelineEvent.COMPONENT_FINISHED.toString());
+-    startEvent.setTimestamp(finishTime);
+-    entity.addEvent(startEvent);
+-
+-    putEntity(entity);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/package-info.java
+deleted file mode 100644
+index 72f7842b836..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/package-info.java
++++ /dev/null
+@@ -1,27 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * ATS implementation
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ApplicationReportSerDeser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ApplicationReportSerDeser.java
+deleted file mode 100644
+index ffaf27f1298..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ApplicationReportSerDeser.java
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-
+-/**
+- * Persistence of {@link SerializedApplicationReport}
+- * 
+- */
+-public class ApplicationReportSerDeser
+-    extends JsonSerDeser<SerializedApplicationReport> {
+-  public ApplicationReportSerDeser() {
+-    super(SerializedApplicationReport.class);
+-  }
+-
+-
+-  private static final ApplicationReportSerDeser
+-      staticinstance = new ApplicationReportSerDeser();
+-
+-  /**
+-   * Convert an instance to a JSON string -sync access to a shared ser/deser
+-   * object instance
+-   * @param instance object to convert
+-   * @return a JSON string description
+-   * @throws JsonProcessingException parse problems
+-   */
+-  public static String toString(SerializedApplicationReport instance)
+-      throws JsonProcessingException {
+-    synchronized (staticinstance) {
+-      return staticinstance.toJson(instance);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ClientRegistryBinder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ClientRegistryBinder.java
+deleted file mode 100644
+index 25cab87d231..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ClientRegistryBinder.java
++++ /dev/null
+@@ -1,201 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.fs.PathNotFoundException;
+-import org.apache.hadoop.registry.client.api.RegistryConstants;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryTypeUtils;
+-import org.apache.hadoop.registry.client.exceptions.InvalidRecordException;
+-import org.apache.hadoop.registry.client.impl.zk.RegistryInternalConstants;
+-import org.apache.hadoop.registry.client.types.Endpoint;
+-import org.apache.hadoop.registry.client.types.ServiceRecord;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.List;
+-
+-import static org.apache.hadoop.registry.client.binding.RegistryPathUtils.encodeForRegistry;
+-import static org.apache.hadoop.registry.client.binding.RegistryUtils.convertUsername;
+-import static org.apache.hadoop.registry.client.binding.RegistryUtils.getCurrentUsernameUnencoded;
+-import static org.apache.hadoop.registry.client.binding.RegistryUtils.servicePath;
+-
+-/**
+- * Generic code to get the URLs for clients via the registry
+- */
+-public class ClientRegistryBinder {
+-  private static final Logger log =
+-      LoggerFactory.getLogger(ClientRegistryBinder.class);
+-
+-  private final RegistryOperations operations;
+-
+-  public ClientRegistryBinder(RegistryOperations operations) {
+-    this.operations = operations;
+-  }
+-
+-  /**
+-   * Buld the user path -switches to the system path if the user is "".
+-   * It also cross-converts the username to ascii via punycode
+-   * @param username username or ""
+-   * @return the path to the user
+-   */
+-  public static String homePathForUser(String username) {
+-    Preconditions.checkArgument(username != null, "null user");
+-
+-    // catch recursion
+-    if (username.startsWith(RegistryConstants.PATH_USERS)) {
+-      return username;
+-    }
+-
+-    if (username.isEmpty()) {
+-      return RegistryConstants.PATH_SYSTEM_SERVICES;
+-    }
+-
+-    // convert username to registry name
+-    String convertedName = convertUsername(username);
+-
+-    return RegistryPathUtils.join(RegistryConstants.PATH_USERS,
+-        encodeForRegistry(convertedName));
+-  }
+-
+-  /**
+-   * Get the current username, before any encoding has been applied.
+-   * @return the current user from the kerberos identity, falling back
+-   * to the user and/or env variables.
+-   */
+-  public static String currentUsernameUnencoded() {
+-    String env_hadoop_username = System.getenv(
+-        RegistryInternalConstants.HADOOP_USER_NAME);
+-    return getCurrentUsernameUnencoded(env_hadoop_username);
+-  }
+-
+-  /**
+-   * Qualify a user.
+-   * <ol>
+-   *   <li> <code>"~"</code> maps to user home path home</li>
+-   *   <li> <code>"~user"</code> maps to <code>/users/$user</code></li>
+-   *   <li> <code>"/"</code> maps to <code>/services/</code></li>
+-   * </ol>
+-   * @param user the username
+-   * @return the base path
+-   */
+-  public static String qualifyUser(String user) {
+-    // qualify the user
+-    String t = user.trim();
+-    if (t.startsWith("/")) {
+-      // already resolved
+-      return t;
+-    } else if (t.equals("~")) {
+-      // self
+-      return currentUsernameUnencoded();
+-    } else if (t.startsWith("~")) {
+-      // another user
+-      // convert username to registry name
+-      String convertedName = convertUsername(t.substring(1));
+-
+-      return RegistryPathUtils.join(RegistryConstants.PATH_USERS,
+-          encodeForRegistry(convertedName));
+-    } else {
+-      return "/" + t;
+-    }
+-  }
+-
+-  /**
+-   * Look up an external REST API
+-   * @param user user which will be qualified as per {@link #qualifyUser(String)}
+-   * @param serviceClass service class
+-   * @param instance instance name
+-   * @param api API
+-   * @return the API, or an exception is raised.
+-   * @throws IOException
+-   */
+-  public String lookupExternalRestAPI(String user,
+-      String serviceClass,
+-      String instance,
+-      String api)
+-      throws IOException {
+-    String qualified = qualifyUser(user);
+-    String path = servicePath(qualified, serviceClass, instance);
+-    String restAPI = resolveExternalRestAPI(api, path);
+-    if (restAPI == null) {
+-      throw new PathNotFoundException(path + " API " + api);
+-    }
+-    return restAPI;
+-  }
+-
+-  /**
+-   * Resolve a service record then return an external REST API exported it.
+-   *
+-   * @param api API to resolve
+-   * @param path path of the service record
+-   * @return null if the record exists but the API is absent or it has no
+-   * REST endpoints.
+-   * @throws IOException resolution problems, as covered in
+-   * {@link RegistryOperations#resolve(String)}
+-   */
+-  protected String resolveExternalRestAPI(String api, String path) throws
+-      IOException {
+-    ServiceRecord record = operations.resolve(path);
+-    return lookupRestAPI(record, api, true);
+-  }
+-
+-  /**
+-   * Look up an external REST API endpoint
+-   * @param record service record
+-   * @param api URI of api
+-   * @param external flag to indicate this is an external record
+-   * @return the first endpoint of the implementation, or null if there
+-   * is no entry for the API, implementation or it's the wrong type.
+-   */
+-  public static String lookupRestAPI(ServiceRecord record,
+-      String api, boolean external) throws InvalidRecordException {
+-    try {
+-      String url = null;
+-      Endpoint endpoint = getEndpoint(record, api, external);
+-      List<String> addresses =
+-          RegistryTypeUtils.retrieveAddressesUriType(endpoint);
+-      if (addresses != null && !addresses.isEmpty()) {
+-        url = addresses.get(0);
+-      }
+-      return url;
+-    } catch (InvalidRecordException e) {
+-      log.debug("looking for API {}", api, e);
+-      return null;
+-    }
+-  }
+-
+-  /**
+-   * Get an endpont by API
+-   * @param record service record
+-   * @param api API
+-   * @param external flag to indicate this is an external record
+-   * @return the endpoint or null
+-   */
+-  public static Endpoint getEndpoint(ServiceRecord record,
+-      String api,
+-      boolean external) {
+-    return external ? record.getExternalEndpoint(api)
+-                    : record.getInternalEndpoint(api);
+-  }
+-
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Comparators.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Comparators.java
+deleted file mode 100644
+index 9f0e5d40a57..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Comparators.java
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import java.io.Serializable;
+-import java.util.Comparator;
+-
+-/**
+- * Some general comparators
+- */
+-public class Comparators {
+-
+-  public static class LongComparator implements Comparator<Long>, Serializable {
+-    @Override
+-    public int compare(Long o1, Long o2) {
+-      return o1.compareTo(o2);
+-    }
+-  }
+-
+-  public static class InvertedLongComparator
+-      implements Comparator<Long>, Serializable {
+-    @Override
+-    public int compare(Long o1, Long o2) {
+-      return o2.compareTo(o1);
+-    }
+-  }
+-
+-  /**
+-   * Little template class to reverse any comparitor
+-   * @param <CompareType> the type that is being compared
+-   */
+-  public static class ComparatorReverser<CompareType> implements Comparator<CompareType>,
+-      Serializable {
+-
+-    final Comparator<CompareType> instance;
+-
+-    public ComparatorReverser(Comparator<CompareType> instance) {
+-      this.instance = instance;
+-    }
+-
+-    @Override
+-    public int compare(CompareType first, CompareType second) {
+-      return instance.compare(second, first);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigHelper.java
+deleted file mode 100644
+index c5ff20a6090..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigHelper.java
++++ /dev/null
+@@ -1,157 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.io.StringWriter;
+-import java.net.URL;
+-import java.util.Map;
+-
+-/**
+- * Methods to aid in config, both in the Configuration class and
+- * with other parts of setting up Slider-initated processes.
+- *
+- * Some of the methods take an argument of a map iterable for their sources; this allows
+- * the same method
+- */
+-public class ConfigHelper {
+-  private static final Logger log = LoggerFactory.getLogger(ConfigHelper.class);
+-
+-  /**
+-   * Set an entire map full of values
+-   *
+-   * @param config config to patch
+-   * @param map map of data
+-   * @param origin origin data
+-   */
+-  public static void addConfigMap(Configuration config,
+-                                  Map<String, String> map,
+-                                  String origin) throws BadConfigException {
+-    addConfigMap(config, map.entrySet(), origin);
+-  }
+-
+-  /**
+-   * Set an entire map full of values
+-   *
+-   * @param config config to patch
+-   * @param map map of data
+-   * @param origin origin data
+-   */
+-  public static void addConfigMap(Configuration config,
+-                                  Iterable<Map.Entry<String, String>> map,
+-                                  String origin) throws BadConfigException {
+-    for (Map.Entry<String, String> mapEntry : map) {
+-      String key = mapEntry.getKey();
+-      String value = mapEntry.getValue();
+-      if (value == null) {
+-        throw new BadConfigException("Null value for property " + key);
+-      }
+-      config.set(key, value, origin);
+-    }
+-  }
+-
+-  /**
+-   * Convert to an XML string
+-   * @param conf configuration
+-   * @return conf
+-   * @throws IOException
+-   */
+-  public static String toXml(Configuration conf) throws IOException {
+-    StringWriter writer = new StringWriter();
+-    conf.writeXml(writer);
+-    return writer.toString();
+-  }
+-
+-
+-  /**
+-   * Register a resource as a default resource.
+-   * Do not attempt to use this unless you understand that the
+-   * order in which default resources are loaded affects the outcome,
+-   * and that subclasses of Configuration often register new default
+-   * resources
+-   * @param resource the resource name
+-   * @return the URL or null
+-   */
+-  public static URL registerDefaultResource(String resource) {
+-    URL resURL = getResourceUrl(resource);
+-    if (resURL != null) {
+-      Configuration.addDefaultResource(resource);
+-    }
+-    return resURL;
+-  }
+-
+-  /**
+-   * Load a configuration from a resource on this classpath.
+-   * If the resource is not found, an empty configuration is returned
+-   * @param resource the resource name
+-   * @return the loaded configuration.
+-   */
+-  public static Configuration loadFromResource(String resource) {
+-    Configuration conf = new Configuration(false);
+-    URL resURL = getResourceUrl(resource);
+-    if (resURL != null) {
+-      log.debug("loaded resources from {}", resURL);
+-      conf.addResource(resource);
+-    } else{
+-      log.debug("failed to find {} on the classpath", resource);
+-    }
+-    return conf;
+-
+-  }
+-
+-  /**
+-   * Get the URL to a resource, null if not on the CP
+-   * @param resource resource to look for
+-   * @return the URL or null
+-   */
+-  public static URL getResourceUrl(String resource) {
+-    return ConfigHelper.class.getClassLoader()
+-                                  .getResource(resource);
+-  }
+-
+-  /**
+-   * This goes through the keyset of one configuration and retrieves each value
+-   * from a value source -a different or the same configuration. This triggers
+-   * the property resolution process of the value, resolving any variables against
+-   * in-config or inherited configurations
+-   * @param keysource source of keys
+-   * @param valuesource the source of values
+-   * @return a new configuration where <code>foreach key in keysource, get(key)==valuesource.get(key)</code>
+-   */
+-  public static Configuration resolveConfiguration(
+-      Iterable<Map.Entry<String, String>> keysource,
+-      Configuration valuesource) {
+-    Configuration result = new Configuration(false);
+-    for (Map.Entry<String, String> entry : keysource) {
+-      String key = entry.getKey();
+-      String value = valuesource.get(key);
+-      Preconditions.checkState(value != null,
+-          "no reference for \"%s\" in values", key);
+-      result.set(key, value);
+-    }
+-    return result;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigUtils.java
+deleted file mode 100644
+index 1bc7b0833c8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ConfigUtils.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-public class ConfigUtils {
+-
+-  public static String replaceProps(Map<String, String> config, String content) {
+-    Map<String, String> tokens = new HashMap<>();
+-    for (Entry<String, String> entry : config.entrySet()) {
+-      tokens.put("${" + entry.getKey() + "}", entry.getValue());
+-      tokens.put("{{" + entry.getKey() + "}}", entry.getValue());
+-    }
+-    String value = content;
+-    for (Map.Entry<String,String> token : tokens.entrySet()) {
+-      value = value.replaceAll(Pattern.quote(token.getKey()),
+-          Matcher.quoteReplacement(token.getValue()));
+-    }
+-    return value;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/CoreFileSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/CoreFileSystem.java
+deleted file mode 100644
+index 6978a02a098..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/CoreFileSystem.java
++++ /dev/null
+@@ -1,556 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.exceptions.ErrorStrings;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-public class CoreFileSystem {
+-  private static final Logger
+-    log = LoggerFactory.getLogger(CoreFileSystem.class);
+-
+-  private static final String UTF_8 = "UTF-8";
+-
+-  protected final FileSystem fileSystem;
+-  protected final Configuration configuration;
+-
+-  public CoreFileSystem(FileSystem fileSystem, Configuration configuration) {
+-    Preconditions.checkNotNull(fileSystem,
+-                               "Cannot create a CoreFileSystem with a null FileSystem");
+-    Preconditions.checkNotNull(configuration,
+-                               "Cannot create a CoreFileSystem with a null Configuration");
+-    this.fileSystem = fileSystem;
+-    this.configuration = configuration;
+-  }
+-
+-  public CoreFileSystem(Configuration configuration) throws IOException {
+-    Preconditions.checkNotNull(configuration,
+-                               "Cannot create a CoreFileSystem with a null Configuration");
+-    this.fileSystem = FileSystem.get(configuration);
+-    this.configuration = configuration;
+-  }
+-  
+-  /**
+-   * Get the temp path for this cluster
+-   * @param clustername name of the cluster
+-   * @return path for temp files (is not purged)
+-   */
+-  public Path getTempPathForCluster(String clustername) {
+-    Path clusterDir = buildClusterDirPath(clustername);
+-    return new Path(clusterDir, YarnServiceConstants.TMP_DIR_PREFIX);
+-  }
+-
+-  /**
+-   * Returns the underlying FileSystem for this object.
+-   *
+-   * @return filesystem
+-   */
+-  public FileSystem getFileSystem() {
+-    return fileSystem;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    final StringBuilder sb =
+-      new StringBuilder("CoreFileSystem{");
+-    sb.append("fileSystem=").append(fileSystem.getUri())
+-        .append('}');
+-    return sb.toString();
+-  }
+-
+-  /**
+-   * Build up the path string for a cluster instance -no attempt to
+-   * create the directory is made
+-   *
+-   * @param clustername name of the cluster
+-   * @return the path for persistent data
+-   */
+-  public Path buildClusterDirPath(String clustername) {
+-    Preconditions.checkNotNull(clustername);
+-    Path path = getBaseApplicationPath();
+-    return new Path(path, YarnServiceConstants.SERVICES_DIRECTORY + "/"
+-        + clustername);
+-  }
+-
+-  /**
+-   * Build up the upgrade path string for a cluster. No attempt to
+-   * create the directory is made.
+-   *
+-   * @param clusterName name of the cluster
+-   * @param version version of the cluster
+-   * @return the upgrade path to the cluster
+-   */
+-  public Path buildClusterUpgradeDirPath(String clusterName, String version) {
+-    Preconditions.checkNotNull(clusterName);
+-    Preconditions.checkNotNull(version);
+-    return new Path(buildClusterDirPath(clusterName),
+-        YarnServiceConstants.UPGRADE_DIR + "/" + version);
+-  }
+-
+-  /**
+-   * Delete the upgrade cluster directory.
+-   * @param clusterName name of the cluster
+-   * @param version     version of the cluster
+-   * @throws IOException
+-   */
+-  public void deleteClusterUpgradeDir(String clusterName, String version)
+-      throws IOException {
+-    Preconditions.checkNotNull(clusterName);
+-    Preconditions.checkNotNull(version);
+-    Path upgradeCluster = buildClusterUpgradeDirPath(clusterName, version);
+-    fileSystem.delete(upgradeCluster, true);
+-  }
+-  /**
+-   * Build up the path string for keytab install location -no attempt to
+-   * create the directory is made
+-   *
+-   * @return the path for keytab
+-   */
+-  public Path buildKeytabInstallationDirPath(String keytabFolder) {
+-    Preconditions.checkNotNull(keytabFolder);
+-    Path path = getBaseApplicationPath();
+-    return new Path(path, YarnServiceConstants.KEYTAB_DIR + "/" + keytabFolder);
+-  }
+-
+-  /**
+-   * Build up the path string for keytab install location -no attempt to
+-   * create the directory is made
+-   *
+-   * @return the path for keytab installation location
+-   */
+-  public Path buildKeytabPath(String keytabDir, String keytabName, String clusterName) {
+-    Path homePath = getHomeDirectory();
+-    Path baseKeytabDir;
+-    if (keytabDir != null) {
+-      baseKeytabDir = new Path(homePath, keytabDir);
+-    } else {
+-      baseKeytabDir = new Path(buildClusterDirPath(clusterName),
+-                               YarnServiceConstants.KEYTAB_DIR);
+-    }
+-    return keytabName == null ? baseKeytabDir :
+-        new Path(baseKeytabDir, keytabName);
+-  }
+-
+-  /**
+-   * Build up the path string for resource install location -no attempt to
+-   * create the directory is made
+-   *
+-   * @return the path for resource
+-   */
+-  public Path buildResourcePath(String resourceFolder) {
+-    Preconditions.checkNotNull(resourceFolder);
+-    Path path = getBaseApplicationPath();
+-    return new Path(path, YarnServiceConstants.RESOURCE_DIR + "/" + resourceFolder);
+-  }
+-
+-  /**
+-   * Build up the path string for resource install location -no attempt to
+-   * create the directory is made
+-   *
+-   * @return the path for resource
+-   */
+-  public Path buildResourcePath(String dirName, String fileName) {
+-    Preconditions.checkNotNull(dirName);
+-    Preconditions.checkNotNull(fileName);
+-    Path path = getBaseApplicationPath();
+-    return new Path(path, YarnServiceConstants.RESOURCE_DIR + "/" + dirName + "/" + fileName);
+-  }
+-
+-  /**
+-   * Create a directory with the given permissions.
+-   *
+-   * @param dir          directory
+-   * @param clusterPerms cluster permissions
+-   * @throws IOException  IO problem
+-   * @throws BadClusterStateException any cluster state problem
+-   */
+-  @SuppressWarnings("deprecation")
+-  public void createWithPermissions(Path dir, FsPermission clusterPerms) throws
+-          IOException,
+-          BadClusterStateException {
+-    if (fileSystem.isFile(dir)) {
+-      // HADOOP-9361 shows some filesystems don't correctly fail here
+-      throw new BadClusterStateException(
+-              "Cannot create a directory over a file %s", dir);
+-    }
+-    log.debug("mkdir {} with perms {}", dir, clusterPerms);
+-    //no mask whatoever
+-    fileSystem.getConf().set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY, "000");
+-    fileSystem.mkdirs(dir, clusterPerms);
+-    //and force set it anyway just to make sure
+-    fileSystem.setPermission(dir, clusterPerms);
+-  }
+-
+-  /**
+-   * Verify that the cluster directory is not present
+-   *
+-   * @param clustername      name of the cluster
+-   * @param clusterDirectory actual directory to look for
+-   * @throws IOException trouble with FS
+-   * @throws SliderException If the directory exists
+-   */
+-  public void verifyClusterDirectoryNonexistent(String clustername,
+-                                                Path clusterDirectory)
+-      throws IOException, SliderException {
+-    if (fileSystem.exists(clusterDirectory)) {
+-      throw new SliderException(SliderExitCodes.EXIT_INSTANCE_EXISTS,
+-              ErrorStrings.PRINTF_E_INSTANCE_ALREADY_EXISTS, clustername,
+-              clusterDirectory);
+-    }
+-  }
+-  /**
+-   * Verify that the given directory is not present
+-   *
+-   * @param clusterDirectory actual directory to look for
+-   * @throws IOException    trouble with FS
+-   * @throws SliderException If the directory exists
+-   */
+-  public void verifyDirectoryNonexistent(Path clusterDirectory) throws
+-          IOException,
+-      SliderException {
+-    if (fileSystem.exists(clusterDirectory)) {
+-      
+-      log.error("Dir {} exists: {}",
+-                clusterDirectory,
+-                listFSDir(clusterDirectory));
+-      throw new SliderException(SliderExitCodes.EXIT_INSTANCE_EXISTS,
+-              ErrorStrings.PRINTF_E_INSTANCE_DIR_ALREADY_EXISTS,
+-              clusterDirectory);
+-    }
+-  }
+-
+-  /**
+-   * Verify that a user has write access to a directory.
+-   * It does this by creating then deleting a temp file
+-   *
+-   * @param dirPath actual directory to look for
+-   * @throws FileNotFoundException file not found
+-   * @throws IOException  trouble with FS
+-   * @throws BadClusterStateException if the directory is not writeable
+-   */
+-  public void verifyDirectoryWriteAccess(Path dirPath) throws IOException,
+-      SliderException {
+-    verifyPathExists(dirPath);
+-    Path tempFile = new Path(dirPath, "tmp-file-for-checks");
+-    try {
+-      FSDataOutputStream out ;
+-      out = fileSystem.create(tempFile, true);
+-      IOUtils.closeStream(out);
+-      fileSystem.delete(tempFile, false);
+-    } catch (IOException e) {
+-      log.warn("Failed to create file {}: {}", tempFile, e);
+-      throw new BadClusterStateException(e,
+-              "Unable to write to directory %s : %s", dirPath, e.toString());
+-    }
+-  }
+-
+-  /**
+-   * Verify that a path exists
+-   * @param path path to check
+-   * @throws FileNotFoundException file not found
+-   * @throws IOException  trouble with FS
+-   */
+-  public void verifyPathExists(Path path) throws IOException {
+-    if (!fileSystem.exists(path)) {
+-      throw new FileNotFoundException(path.toString());
+-    }
+-  }
+-
+-  /**
+-   * Verify that a path exists
+-   * @param path path to check
+-   * @throws FileNotFoundException file not found or is not a file
+-   * @throws IOException  trouble with FS
+-   */
+-  public void verifyFileExists(Path path) throws IOException {
+-    FileStatus status = fileSystem.getFileStatus(path);
+-
+-    if (!status.isFile()) {
+-      throw new FileNotFoundException("Not a file: " + path.toString());
+-    }
+-  }
+-
+-  /**
+-   * Given a path, check if it exists and is a file
+-   * 
+-   * @param path
+-   *          absolute path to the file to check
+-   * @return true if and only if path exists and is a file, false for all other
+-   *          reasons including if file check throws IOException
+-   */
+-  public boolean isFile(Path path) {
+-    if (path == null) {
+-      return false;
+-    }
+-    boolean isFile = false;
+-    try {
+-      FileStatus status = fileSystem.getFileStatus(path);
+-      if (status.isFile()) {
+-        isFile = true;
+-      }
+-    } catch (IOException e) {
+-      // ignore, isFile is already set to false
+-    }
+-    return isFile;
+-  }
+-
+-  /**
+-   * Get the base path
+-   *
+-   * @return the base path optionally configured by 
+-   * {@link YarnServiceConf#YARN_SERVICE_BASE_PATH}
+-   */
+-  public Path getBaseApplicationPath() {
+-    String configuredBasePath = configuration
+-        .get(YarnServiceConf.YARN_SERVICE_BASE_PATH,
+-            getHomeDirectory() + "/" + YarnServiceConstants.SERVICE_BASE_DIRECTORY);
+-    return new Path(configuredBasePath);
+-  }
+-
+-  /**
+-   * Get service dependency absolute filepath in HDFS used for application
+-   * submission.
+-   * 
+-   * @return the absolute path to service dependency tarball in HDFS
+-   */
+-  public Path getDependencyTarGzip() {
+-    Path dependencyLibTarGzip = null;
+-    String configuredDependencyTarballPath = configuration
+-        .get(YarnServiceConf.DEPENDENCY_TARBALL_PATH);
+-    if (configuredDependencyTarballPath != null) {
+-      dependencyLibTarGzip = new Path(configuredDependencyTarballPath);
+-    }
+-    if (dependencyLibTarGzip == null) {
+-      dependencyLibTarGzip = new Path(String.format(YarnServiceConstants
+-          .DEPENDENCY_DIR, VersionInfo.getVersion()),
+-          YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_NAME
+-              + YarnServiceConstants.DEPENDENCY_TAR_GZ_FILE_EXT);
+-    }
+-    return dependencyLibTarGzip;
+-  }
+-
+-  public Path getHomeDirectory() {
+-    return fileSystem.getHomeDirectory();
+-  }
+-
+-  /**
+-   * Create an AM resource from the
+-   *
+-   * @param destPath     dest path in filesystem
+-   * @param resourceType resource type
+-   * @return the local resource for AM
+-   */
+-  public LocalResource createAmResource(Path destPath,
+-      LocalResourceType resourceType,
+-      LocalResourceVisibility visibility) throws IOException {
+-
+-    FileStatus destStatus = fileSystem.getFileStatus(destPath);
+-    LocalResource amResource = Records.newRecord(LocalResource.class);
+-    amResource.setType(resourceType);
+-    // Set visibility of the resource
+-    // Setting to most private option
+-    if (visibility == null) {
+-      visibility = LocalResourceVisibility.APPLICATION;
+-    }
+-    amResource.setVisibility(visibility);
+-    // Set the resource to be copied over
+-    amResource.setResource(
+-        URL.fromPath(fileSystem.resolvePath(destStatus.getPath())));
+-    // Set timestamp and length of file so that the framework
+-    // can do basic sanity checks for the local resource
+-    // after it has been copied over to ensure it is the same
+-    // resource the client intended to use with the service
+-    amResource.setTimestamp(destStatus.getModificationTime());
+-    amResource.setSize(destStatus.getLen());
+-    return amResource;
+-  }
+-
+-  /**
+-   * Register all files under a fs path as a directory to push out
+-   *
+-   * @param srcDir          src dir
+-   * @param destRelativeDir dest dir (no trailing /)
+-   * @return the map of entries
+-   */
+-  public Map<String, LocalResource> submitDirectory(Path srcDir, String destRelativeDir) throws IOException {
+-    //now register each of the files in the directory to be
+-    //copied to the destination
+-    FileStatus[] fileset = fileSystem.listStatus(srcDir);
+-    Map<String, LocalResource> localResources =
+-            new HashMap<String, LocalResource>(fileset.length);
+-    for (FileStatus entry : fileset) {
+-
+-      LocalResource resource = createAmResource(entry.getPath(),
+-              LocalResourceType.FILE, LocalResourceVisibility.APPLICATION);
+-      String relativePath = destRelativeDir + "/" + entry.getPath().getName();
+-      localResources.put(relativePath, resource);
+-    }
+-    return localResources;
+-  }
+-
+-  /**
+-   * Submit a JAR containing a specific class, returning
+-   * the resource to be mapped in
+-   *
+-   * @param clazz   class to look for
+-   * @param subdir  subdirectory (expected to end in a "/")
+-   * @param jarName <i>At the destination</i>
+-   * @return the local resource ref
+-   * @throws IOException trouble copying to HDFS
+-   */
+-  public LocalResource submitJarWithClass(Class clazz, Path tempPath, String subdir, String jarName)
+-          throws IOException, SliderException {
+-    File localFile = ServiceUtils.findContainingJarOrFail(clazz);
+-    return submitFile(localFile, tempPath, subdir, jarName);
+-  }
+-
+-  /**
+-   * Submit a local file to the filesystem references by the instance's cluster
+-   * filesystem
+-   *
+-   * @param localFile    filename
+-   * @param subdir       subdirectory (expected to end in a "/")
+-   * @param destFileName destination filename
+-   * @return the local resource ref
+-   * @throws IOException trouble copying to HDFS
+-   */
+-  public LocalResource submitFile(File localFile, Path tempPath, String subdir, String destFileName)
+-      throws IOException {
+-    Path src = new Path(localFile.toString());
+-    Path subdirPath = new Path(tempPath, subdir);
+-    fileSystem.mkdirs(subdirPath);
+-    Path destPath = new Path(subdirPath, destFileName);
+-    log.debug("Copying {} (size={} bytes) to {}", localFile, localFile.length(), destPath);
+-
+-    fileSystem.copyFromLocalFile(false, true, src, destPath);
+-
+-    // Set the type of resource - file or archive
+-    // archives are untarred at destination
+-    // we don't need the jar file to be untarred for now
+-    return createAmResource(destPath, LocalResourceType.FILE,
+-        LocalResourceVisibility.APPLICATION);
+-  }
+-
+-  /**
+-   * Submit the AM tar.gz resource referenced by the instance's cluster
+-   * filesystem. Also, update the providerResources object with the new
+-   * resource.
+-   * 
+-   * @param providerResources
+-   *          the provider resource map to be updated
+-   * @throws IOException
+-   *           trouble copying to HDFS
+-   */
+-  public void submitTarGzipAndUpdate(
+-      Map<String, LocalResource> providerResources) throws IOException,
+-      BadClusterStateException {
+-    Path dependencyLibTarGzip = getDependencyTarGzip();
+-    LocalResource lc = createAmResource(dependencyLibTarGzip,
+-        LocalResourceType.ARCHIVE, LocalResourceVisibility.APPLICATION);
+-    providerResources.put(YarnServiceConstants.DEPENDENCY_LOCALIZED_DIR_LINK, lc);
+-  }
+-
+-  public void copyLocalFileToHdfs(File localPath,
+-      Path destPath, FsPermission fp)
+-      throws IOException {
+-    if (localPath == null || destPath == null) {
+-      throw new IOException("Either localPath or destPath is null");
+-    }
+-    fileSystem.getConf().set(CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY,
+-        "000");
+-    fileSystem.mkdirs(destPath.getParent(), fp);
+-    log.info("Copying file {} to {}", localPath.toURI(), destPath);
+-    
+-    fileSystem.copyFromLocalFile(false, true, new Path(localPath.getPath()),
+-        destPath);
+-    // set file permissions of the destPath
+-    fileSystem.setPermission(destPath, fp);
+-  }
+-
+-  public void copyHdfsFileToLocal(Path hdfsPath, File destFile)
+-      throws IOException {
+-    if (hdfsPath == null || destFile == null) {
+-      throw new IOException("Either hdfsPath or destPath is null");
+-    }
+-    log.info("Copying file {} to {}", hdfsPath.toUri(), destFile.toURI());
+-
+-    Path destPath = new Path(destFile.getPath());
+-    fileSystem.copyToLocalFile(hdfsPath, destPath);
+-  }
+-
+-  /**
+-   * list entries in a filesystem directory
+-   *
+-   * @param path directory
+-   * @return a listing, one to a line
+-   * @throws IOException
+-   */
+-  public String listFSDir(Path path) throws IOException {
+-    FileStatus[] stats = fileSystem.listStatus(path);
+-    StringBuilder builder = new StringBuilder();
+-    for (FileStatus stat : stats) {
+-      builder.append(stat.getPath().toString())
+-              .append("\t")
+-              .append(stat.getLen())
+-              .append("\n");
+-    }
+-    return builder.toString();
+-  }
+-
+-  public String cat(Path path) throws IOException {
+-    FileStatus status = fileSystem.getFileStatus(path);
+-    byte[] b = new byte[(int) status.getLen()];
+-    FSDataInputStream in = null;
+-    try {
+-      in = fileSystem.open(path);
+-      int count = in.read(b);
+-      return new String(b, 0, count, UTF_8);
+-    } finally {
+-      IOUtils.closeStream(in);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Duration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Duration.java
+deleted file mode 100644
+index 6fadfd3af22..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/Duration.java
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import java.io.Closeable;
+-
+-/**
+- * A duration in milliseconds. This class can be used
+- * to count time, and to be polled to see if a time limit has
+- * passed.
+- */
+-public class Duration implements Closeable {
+-  public long start, finish;
+-  public final long limit;
+-
+-  /**
+-   * Create a duration instance with a limit of 0
+-   */
+-  public Duration() {
+-    this(0);
+-  }
+-
+-  /**
+-   * Create a duration with a limit specified in millis
+-   * @param limit duration in milliseconds
+-   */
+-  public Duration(long limit) {
+-    this.limit = limit;
+-  }
+-
+-  /**
+-   * Start
+-   * @return self
+-   */
+-  public Duration start() {
+-    start = now();
+-    return this;
+-  }
+-
+-  /**
+-   * The close operation relays to {@link #finish()}.
+-   * Implementing it allows Duration instances to be automatically
+-   * finish()'d in Java7 try blocks for when used in measuring durations.
+-   */
+-  @Override
+-  public final void close() {
+-    finish();
+-  }
+-
+-  public void finish() {
+-    finish = now();
+-  }
+-
+-  protected long now() {
+-    return System.nanoTime()/1000000;
+-  }
+-
+-  public long getInterval() {
+-    return finish - start;
+-  }
+-
+-  /**
+-   * return true if the limit has been exceeded
+-   * @return true if a limit was set and the current time
+-   * exceeds it.
+-   */
+-  public boolean getLimitExceeded() {
+-    return limit >= 0 && ((now() - start) > limit);
+-  }
+-
+-  @Override
+-  public String toString() {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append("Duration");
+-     if (finish >= start) {
+-       builder.append(" finished at ").append(getInterval()).append(" millis;");
+-     } else {
+-       if (start > 0) {
+-         builder.append(" started but not yet finished;");
+-       } else {
+-         builder.append(" unstarted;");
+-       }
+-     }
+-    if (limit > 0) {
+-      builder.append(" limit: ").append(limit).append(" millis");
+-      if (getLimitExceeded()) {
+-        builder.append(" -  exceeded");
+-      }
+-    }
+-    return  builder.toString();
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/FilterUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/FilterUtils.java
+deleted file mode 100644
+index b9b2ceec880..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/FilterUtils.java
++++ /dev/null
+@@ -1,94 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-public class FilterUtils {
+-
+-  /**
+-   * Returns containers filtered by requested fields.
+-   *
+-   * @param context   service context
+-   * @param filterReq filter request
+-   */
+-  public static List<ComponentContainers> filterInstances(
+-      ServiceContext context,
+-      ClientAMProtocol.GetCompInstancesRequestProto filterReq) {
+-    Map<String, ComponentContainers> containersByComp = new HashMap<>();
+-
+-    Map<ContainerId, ComponentInstance> instances =
+-        context.scheduler.getLiveInstances();
+-
+-    instances.forEach(((containerId, instance) -> {
+-      boolean include = true;
+-      if (filterReq.getComponentNamesList() != null &&
+-          !filterReq.getComponentNamesList().isEmpty()) {
+-        // filter by component name
+-        if (!filterReq.getComponentNamesList().contains(
+-            instance.getComponent().getName())) {
+-          include = false;
+-        }
+-      }
+-
+-      if (filterReq.getVersion() != null && !filterReq.getVersion().isEmpty()) {
+-        // filter by version
+-        String instanceServiceVersion = instance.getServiceVersion();
+-        if (instanceServiceVersion == null || !instanceServiceVersion.equals(
+-            filterReq.getVersion())) {
+-          include = false;
+-        }
+-      }
+-
+-      if (filterReq.getContainerStatesList() != null &&
+-          !filterReq.getContainerStatesList().isEmpty()) {
+-        // filter by state
+-        if (!filterReq.getContainerStatesList().contains(
+-            instance.getContainerState().toString())) {
+-          include = false;
+-        }
+-      }
+-
+-      if (include) {
+-        ComponentContainers compContainers =
+-            containersByComp.computeIfAbsent(instance.getCompName(),
+-                k -> {
+-                  ComponentContainers result = new ComponentContainers();
+-                  result.setContainers(new ArrayList<>());
+-                  result.setComponentName(instance.getCompName());
+-                  return result;
+-                });
+-
+-        compContainers.addContainer(instance.getContainerSpec());
+-      }
+-    }));
+-    List<ComponentContainers> result = new ArrayList<>();
+-    result.addAll(containersByComp.values());
+-    return result;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/HttpUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/HttpUtil.java
+deleted file mode 100644
+index 11190ebb535..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/HttpUtil.java
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import java.io.IOException;
+-import java.net.URI;
+-import java.net.URISyntaxException;
+-import java.nio.charset.StandardCharsets;
+-import java.security.PrivilegedExceptionAction;
+-
+-import javax.ws.rs.core.HttpHeaders;
+-import javax.ws.rs.core.MediaType;
+-
+-import org.apache.commons.codec.binary.Base64;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authentication.client.AuthenticationException;
+-import org.ietf.jgss.GSSContext;
+-import org.ietf.jgss.GSSException;
+-import org.ietf.jgss.GSSManager;
+-import org.ietf.jgss.GSSName;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.WebResource.Builder;
+-
+-/**
+- * Http connection utilities.
+- *
+- */
+-public class HttpUtil {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(HttpUtil.class);
+-  private static final Base64 BASE_64_CODEC = new Base64(0);
+-
+-  protected HttpUtil() {
+-    // prevents calls from subclass
+-    throw new UnsupportedOperationException();
+-  }
+-
+-  /**
+-   * Generate SPNEGO challenge request token.
+-   *
+-   * @param server - hostname to contact
+-   * @throws IOException
+-   * @throws InterruptedException
+-   */
+-  public static String generateToken(String server) throws
+-      IOException, InterruptedException {
+-    UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
+-    LOG.debug("The user credential is {}", currentUser);
+-    String challenge = currentUser
+-        .doAs(new PrivilegedExceptionAction<String>() {
+-          @Override
+-          public String run() throws Exception {
+-            try {
+-              GSSManager manager = GSSManager.getInstance();
+-              // GSS name for server
+-              GSSName serverName = manager.createName("HTTP@" + server,
+-                  GSSName.NT_HOSTBASED_SERVICE);
+-              // Create a GSSContext for authentication with the service.
+-              // We're passing client credentials as null since we want them to
+-              // be read from the Subject.
+-              // We're passing Oid as null to use the default.
+-              GSSContext gssContext = manager.createContext(
+-                  serverName.canonicalize(null), null, null,
+-                  GSSContext.DEFAULT_LIFETIME);
+-              gssContext.requestMutualAuth(true);
+-              gssContext.requestCredDeleg(true);
+-              // Establish context
+-              byte[] inToken = new byte[0];
+-              byte[] outToken = gssContext.initSecContext(inToken, 0,
+-                  inToken.length);
+-              gssContext.dispose();
+-              // Base64 encoded and stringified token for server
+-              LOG.debug("Got valid challenge for host {}", serverName);
+-              return new String(BASE_64_CODEC.encode(outToken),
+-                  StandardCharsets.US_ASCII);
+-            } catch (GSSException e) {
+-              LOG.error("Error: ", e);
+-              throw new AuthenticationException(e);
+-            }
+-          }
+-        });
+-    return challenge;
+-  }
+-
+-  public static Builder connect(String url) throws URISyntaxException,
+-      IOException, InterruptedException {
+-    boolean useKerberos = UserGroupInformation.isSecurityEnabled();
+-    URI resource = new URI(url);
+-    Client client = Client.create();
+-    Builder builder = client
+-        .resource(url).type(MediaType.APPLICATION_JSON);
+-    if (useKerberos) {
+-      String challenge = generateToken(resource.getHost());
+-      builder.header(HttpHeaders.AUTHORIZATION, "Negotiate " +
+-          challenge);
+-      LOG.debug("Authorization: Negotiate {}", challenge);
+-    }
+-    return builder;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/JsonSerDeser.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/JsonSerDeser.java
+deleted file mode 100644
+index 254d6c5d379..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/JsonSerDeser.java
++++ /dev/null
+@@ -1,238 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import com.fasterxml.jackson.core.JsonParseException;
+-import com.fasterxml.jackson.core.JsonProcessingException;
+-import com.fasterxml.jackson.databind.DeserializationFeature;
+-import com.fasterxml.jackson.databind.JsonMappingException;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+-import com.fasterxml.jackson.databind.SerializationFeature;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.nio.charset.StandardCharsets;
+-
+-/**
+- * Support for marshalling objects to and from JSON.
+- * This class is NOT thread safe; it constructs an object mapper
+- * as an instance field.
+- * @param <T>
+- */
+-public class JsonSerDeser<T> {
+-
+-  private static final Logger log = LoggerFactory.getLogger(JsonSerDeser.class);
+-
+-  private final Class<T> classType;
+-  private final ObjectMapper mapper;
+-
+-  /**
+-   * Create an instance bound to a specific type
+-   * @param classType class type
+-   */
+-  @SuppressWarnings("deprecation")
+-  public JsonSerDeser(Class<T> classType) {
+-    this.classType = classType;
+-    this.mapper = new ObjectMapper();
+-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+-    mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
+-  }
+-
+-  public JsonSerDeser(Class<T> classType, PropertyNamingStrategy namingStrategy) {
+-    this(classType);
+-    mapper.setPropertyNamingStrategy(namingStrategy);
+-  }
+-
+-  /**
+-   * Convert from JSON
+-   * @param json input
+-   * @return the parsed JSON
+-   * @throws IOException IO
+-   * @throws JsonMappingException failure to map from the JSON to this class
+-   */
+-  public T fromJson(String json)
+-    throws IOException, JsonParseException, JsonMappingException {
+-    try {
+-      return mapper.readValue(json, classType);
+-    } catch (IOException e) {
+-      log.error("Exception while parsing json : " + e + "\n" + json, e);
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * Convert from a JSON file
+-   * @param jsonFile input file
+-   * @return the parsed JSON
+-   * @throws IOException IO problems
+-   * @throws JsonMappingException failure to map from the JSON to this class
+-   */
+-  public T fromFile(File jsonFile)
+-    throws IOException, JsonParseException, JsonMappingException {
+-    File absoluteFile = jsonFile.getAbsoluteFile();
+-    try {
+-      return mapper.readValue(absoluteFile, classType);
+-    } catch (IOException e) {
+-      log.error("Exception while parsing json file {}", absoluteFile, e);
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * Convert from a JSON file
+-   * @param resource input file
+-   * @return the parsed JSON
+-   * @throws IOException IO problems
+-   * @throws JsonMappingException failure to map from the JSON to this class
+-   */
+- public T fromResource(String resource)
+-    throws IOException, JsonParseException, JsonMappingException {
+-    try(InputStream resStream = this.getClass().getResourceAsStream(resource)) {
+-      if (resStream == null) {
+-        throw new FileNotFoundException(resource);
+-      }
+-      return (T) (mapper.readValue(resStream, classType));
+-    } catch (IOException e) {
+-      log.error("Exception while parsing json resource {}", resource, e);
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * Convert from an input stream, closing the stream afterwards.
+-   * @param stream
+-   * @return the parsed JSON
+-   * @throws IOException IO problems
+-   */
+-  public T fromStream(InputStream stream) throws IOException {
+-    try {
+-      return (T) (mapper.readValue(stream, classType));
+-    } catch (IOException e) {
+-      log.error("Exception while parsing json input stream", e);
+-      throw e;
+-    } finally {
+-      IOUtils.closeStream(stream);
+-    }
+-  }
+-
+-  /**
+-   * clone by converting to JSON and back again.
+-   * This is much less efficient than any Java clone process.
+-   * @param instance instance to duplicate
+-   * @return a new instance
+-   * @throws IOException problems.
+-   */
+-  public T fromInstance(T instance) throws IOException {
+-    return fromJson(toJson(instance));
+-  }
+-
+-  /**
+-   * Deserialize from a byte array
+-   * @param b
+-   * @return the deserialized value
+-   * @throws IOException parse problems
+-   */
+-  public T fromBytes(byte[] b) throws IOException {
+-    String json = new String(b, 0, b.length, StandardCharsets.UTF_8);
+-    return fromJson(json);
+-  }
+-  
+-  /**
+-   * Load from a Hadoop filesystem
+-   * @param fs filesystem
+-   * @param path path
+-   * @return a loaded CD
+-   * @throws IOException IO problems
+-   * @throws JsonParseException parse problems
+-   * @throws JsonMappingException O/J mapping problems
+-   */
+-  public T load(FileSystem fs, Path path) throws IOException {
+-    FSDataInputStream dataInputStream = fs.open(path);
+-    return fromStream(dataInputStream);
+-  }
+-
+-
+-  /**
+-   * Save to a hadoop filesystem
+-   * @param fs filesystem
+-   * @param path path
+-   * @param instance instance to save
+-   * @param overwrite should any existing file be overwritten
+-   * @throws IOException IO exception
+-   */
+-  public void save(FileSystem fs, Path path, T instance,
+-                   boolean overwrite) throws
+-                                      IOException {
+-    FSDataOutputStream dataOutputStream = fs.create(path, overwrite);
+-    writeJsonAsBytes(instance, dataOutputStream);
+-  }
+-
+-  /**
+-   * Save an instance to a file
+-   * @param instance instance to save
+-   * @param file file
+-   * @throws IOException
+-   */
+-  public void save(T instance, File file) throws
+-      IOException {
+-    writeJsonAsBytes(instance, new FileOutputStream(file.getAbsoluteFile()));
+-  }
+-
+-  /**
+-   * Write the json as bytes -then close the file
+-   * @param dataOutputStream an outout stream that will always be closed
+-   * @throws IOException on any failure
+-   */
+-  private void writeJsonAsBytes(T instance,
+-      OutputStream dataOutputStream) throws IOException {
+-    try {
+-      String json = toJson(instance);
+-      byte[] b = json.getBytes(StandardCharsets.UTF_8);
+-      dataOutputStream.write(b);
+-      dataOutputStream.flush();
+-      dataOutputStream.close();
+-    } finally {
+-      IOUtils.closeStream(dataOutputStream);
+-    }
+-  }
+-
+-  /**
+-   * Convert an object to a JSON string
+-   * @param instance instance to convert
+-   * @return a JSON string description
+-   * @throws JsonProcessingException parse problems
+-   */
+-  public String toJson(T instance) throws JsonProcessingException {
+-    mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+-    return mapper.writeValueAsString(instance);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PatternValidator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PatternValidator.java
+deleted file mode 100644
+index 108ca22defe..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PatternValidator.java
++++ /dev/null
+@@ -1,58 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import java.util.regex.Pattern;
+-
+-/**
+- * Utility class to validate strings against a predefined pattern.
+- */
+-public class PatternValidator {
+-
+-  public static final String E_INVALID_NAME =
+-      "Invalid name %s does not match the pattern %s ";
+-  private final Pattern valid;
+-  private final String pattern;
+-
+-  public PatternValidator(String pattern) {
+-    this.pattern = pattern;
+-    valid = Pattern.compile(pattern);
+-  }
+-
+-  /**
+-   * Validate the name -restricting it to the set defined in 
+-   * @param name name to validate
+-   * @throws IllegalArgumentException if not a valid name
+-   */
+-  public void validate(String name) {
+-    if (!matches(name)) {
+-      throw new IllegalArgumentException(
+-          String.format(E_INVALID_NAME, name, pattern));
+-    }
+-  }
+-
+-  /**
+-   * Query to see if the pattern matches
+-   * @param name name to validate
+-   * @return true if the string matches the pattern
+-   */
+-  public boolean matches(String name) {
+-    return valid.matcher(name).matches();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PortScanner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PortScanner.java
+deleted file mode 100644
+index 1d64ed65e3f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PortScanner.java
++++ /dev/null
+@@ -1,113 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache License, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.yarn.service.conf.SliderExitCodes;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Iterator;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.TreeSet;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-/**
+- * a scanner which can take an input string for a range or scan the lot.
+- */
+-public class PortScanner {
+-  private static Pattern NUMBER_RANGE = Pattern.compile("^(\\d+)\\s*-\\s*(\\d+)$");
+-  private static Pattern SINGLE_NUMBER = Pattern.compile("^\\d+$");
+-
+-  private List<Integer> remainingPortsToCheck;
+-
+-  public PortScanner() {
+-  }
+-
+-  public void setPortRange(String input) throws BadConfigException {
+-    // first split based on commas
+-    Set<Integer> inputPorts= new TreeSet<Integer>();
+-    String[] ranges = input.split(",");
+-    for ( String range : ranges ) {
+-      if (range.trim().isEmpty()) {
+-        continue;
+-      }
+-      Matcher m = SINGLE_NUMBER.matcher(range.trim());
+-      if (m.find()) {
+-        inputPorts.add(Integer.parseInt(m.group()));
+-        continue;
+-      }
+-      m = NUMBER_RANGE.matcher(range.trim());
+-      if (m.find()) {
+-        String[] boundaryValues = m.group(0).split("-");
+-        int start = Integer.parseInt(boundaryValues[0].trim());
+-        int end = Integer.parseInt(boundaryValues[1].trim());
+-        if (end < start) {
+-          throw new BadConfigException("End of port range is before start: "
+-              + range + " in input: " + input);
+-        }
+-        for (int i = start; i < end + 1; i++) {
+-          inputPorts.add(i);
+-        }
+-        continue;
+-      }
+-      throw new BadConfigException("Bad port range: " + range + " in input: "
+-          + input);
+-    }
+-    if (inputPorts.size() == 0) {
+-      throw new BadConfigException("No ports found in range: " + input);
+-    }
+-    this.remainingPortsToCheck = new ArrayList<Integer>(inputPorts);
+-  }
+-
+-  public List<Integer> getRemainingPortsToCheck() {
+-    return remainingPortsToCheck;
+-  }
+-
+-  public int getAvailablePort() throws SliderException, IOException {
+-    if (remainingPortsToCheck != null) {
+-      return getAvailablePortViaPortArray();
+-    } else {
+-      return ServiceUtils.getOpenPort();
+-    }
+-  }
+-
+-  private int getAvailablePortViaPortArray() throws SliderException {
+-    boolean found = false;
+-    int availablePort = -1;
+-    Iterator<Integer> portsToCheck = this.remainingPortsToCheck.iterator();
+-    while (portsToCheck.hasNext() && !found) {
+-      int portToCheck = portsToCheck.next();
+-      found = ServiceUtils.isPortAvailable(portToCheck);
+-      if (found) {
+-        availablePort = portToCheck;
+-        portsToCheck.remove();
+-      }
+-    }
+-
+-    if (availablePort < 0) {
+-      throw new SliderException(SliderExitCodes.EXIT_BAD_CONFIGURATION,
+-        "No available ports found in configured range {}",
+-        remainingPortsToCheck);
+-    }
+-
+-    return availablePort;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfiguration.java
+deleted file mode 100644
+index e7ec2d6f5e7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfiguration.java
++++ /dev/null
+@@ -1,187 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.SerializationFeature;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-
+-import java.io.IOException;
+-import java.util.Date;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Properties;
+-
+-/**
+- * JSON-serializable description of a published key-val configuration.
+- * 
+- * The values themselves are not serialized in the external view; they have
+- * to be served up by the far end
+- */
+-@JsonIgnoreProperties(ignoreUnknown = true)
+-@JsonInclude(value = JsonInclude.Include.NON_NULL)
+-public class PublishedConfiguration {
+-
+-  public String description;
+-  public long updated;
+-  
+-  public String updatedTime;
+-
+-  public Map<String, String> entries = new HashMap<>();
+-
+-  public PublishedConfiguration() {
+-  }
+-
+-  /**
+-   * build an empty published configuration 
+-   * @param description configuration description
+-   */
+-  public PublishedConfiguration(String description) {
+-    this.description = description;
+-  }
+-
+-  /**
+-   * Build a configuration from the entries
+-   * @param description configuration description
+-   * @param entries entries to put
+-   */
+-  public PublishedConfiguration(String description,
+-      Iterable<Map.Entry<String, String>> entries) {
+-    this.description = description;
+-    putValues(entries);
+-  }
+-
+-  /**
+-   * Build a published configuration, using the keys from keysource,
+-   * but resolving the values from the value source, via Configuration.get()
+-   * @param description configuration description
+-   * @param keysource source of keys
+-   * @param valuesource source of values
+-   */
+-  public PublishedConfiguration(String description,
+-      Iterable<Map.Entry<String, String>> keysource,
+-      Configuration valuesource) {
+-    this.description = description;
+-    putValues(ConfigHelper.resolveConfiguration(keysource, valuesource));
+-  }
+-
+-  
+-  /**
+-   * Is the configuration empty. This means either that it has not
+-   * been given any values, or it is stripped down copy set down over the
+-   * wire.
+-   * @return true if it is empty
+-   */
+-  public boolean isEmpty() {
+-    return entries.isEmpty();
+-  }
+-
+-
+-  public void setUpdated(long updated) {
+-    this.updated = updated;
+-    this.updatedTime = new Date(updated).toString();
+-  }
+-
+-  public long getUpdated() {
+-    return updated;
+-  }
+-
+-  /**
+-   * Set the values from an iterable (this includes a Hadoop Configuration
+-   * and Java properties object).
+-   * Any existing value set is discarded
+-   * @param entries entries to put
+-   */
+-  public void putValues(Iterable<Map.Entry<String, String>> entries) {
+-    this.entries = new HashMap<String, String>();
+-    for (Map.Entry<String, String> entry : entries) {
+-      this.entries.put(entry.getKey(), entry.getValue());
+-    }
+-    
+-  }
+-
+-  /**
+-   * Convert to Hadoop XML
+-   * @return the configuration as a Hadoop Configuratin
+-   */
+-  public Configuration asConfiguration() {
+-    Configuration conf = new Configuration(false);
+-    try {
+-      ConfigHelper.addConfigMap(conf, entries, "");
+-    } catch (BadConfigException e) {
+-      // triggered on a null value; switch to a runtime (and discard the stack)
+-      throw new RuntimeException(e.toString());
+-    }
+-    return conf;
+-  }
+-  
+-  public String asConfigurationXML() throws IOException {
+-    return ConfigHelper.toXml(asConfiguration());
+-  }
+-
+-  /**
+-   * Convert values to properties
+-   * @return a property file
+-   */
+-  public Properties asProperties() {
+-    Properties props = new Properties();
+-    props.putAll(entries);
+-    return props;
+-  }
+-
+-  /**
+-   * Return the values as json string
+-   * @return the JSON representation
+-   * @throws IOException marshalling failure
+-   */
+-  public String asJson() throws IOException {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+-    String json = mapper.writeValueAsString(entries);
+-    return json;
+-  }
+-
+-
+-  /**
+-   * This makes a copy without the nested content -so is suitable
+-   * for returning as part of the list of a parent's values
+-   * @return the copy
+-   */
+-  public PublishedConfiguration shallowCopy() {
+-    PublishedConfiguration that = new PublishedConfiguration();
+-    that.description = this.description;
+-    that.updated = this.updated;
+-    that.updatedTime = this.updatedTime;
+-    return that;
+-  }
+-
+-  @Override
+-  public String toString() {
+-    final StringBuilder sb =
+-        new StringBuilder("PublishedConfiguration{");
+-    sb.append("description='").append(description).append('\'')
+-        .append(" entries = ").append(entries.size())
+-        .append('}');
+-    return sb.toString();
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfigurationOutputter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfigurationOutputter.java
+deleted file mode 100644
+index 3b39c10bf89..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/PublishedConfigurationOutputter.java
++++ /dev/null
+@@ -1,210 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.commons.io.IOUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFormat;
+-import org.yaml.snakeyaml.DumperOptions;
+-import org.yaml.snakeyaml.DumperOptions.FlowStyle;
+-import org.yaml.snakeyaml.Yaml;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.io.StringWriter;
+-import java.nio.charset.StandardCharsets;
+-import java.util.Properties;
+-
+-/**
+- * Output a published configuration
+- */
+-public abstract class PublishedConfigurationOutputter {
+-
+-  private static final String COMMENTS = "Generated by Apache Slider";
+-
+-  protected final PublishedConfiguration owner;
+-
+-  protected PublishedConfigurationOutputter(PublishedConfiguration owner) {
+-    this.owner = owner;
+-  }
+-
+-  /**
+-   * Save the config to a destination file, in the format of this outputter
+-   * @param dest destination file
+-   * @throws IOException
+-   */
+-/* JDK7
+-  public void save(File dest) throws IOException {
+-    try(FileOutputStream out = new FileOutputStream(dest)) {
+-      save(out);
+-      out.close();
+-    }
+-  }
+-*/
+-  public void save(File dest) throws IOException {
+-    FileUtils.writeStringToFile(dest, asString(), StandardCharsets.UTF_8);
+-  }
+-
+-  /**
+-   * Save the content. The default saves the asString() value
+-   * to the output stream
+-   * @param out output stream
+-   * @throws IOException
+-   */
+-  public void save(OutputStream out) throws IOException {
+-    IOUtils.write(asString(), out, StandardCharsets.UTF_8);
+-  }
+-  /**
+-   * Convert to a string
+-   * @return the string form
+-   * @throws IOException
+-   */
+-  public abstract String asString() throws IOException;
+-
+-  /**
+-   * Create an outputter for the chosen format
+-   * @param format format enumeration
+-   * @param owner owning config
+-   * @return the outputter
+-   */
+-
+-  public static PublishedConfigurationOutputter createOutputter(ConfigFormat format,
+-      PublishedConfiguration owner) {
+-    Preconditions.checkNotNull(owner);
+-    switch (format) {
+-      case XML:
+-      case HADOOP_XML:
+-        return new XmlOutputter(owner);
+-      case PROPERTIES:
+-        return new PropertiesOutputter(owner);
+-      case JSON:
+-        return new JsonOutputter(owner);
+-      case TEMPLATE:
+-        return new TemplateOutputter(owner);
+-      case YAML:
+-        return new YamlOutputter(owner);
+-      default:
+-        throw new RuntimeException("Unsupported format :" + format);
+-    }
+-  }
+-
+-  public static class XmlOutputter extends PublishedConfigurationOutputter {
+-
+-
+-    private final Configuration configuration;
+-
+-    public XmlOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-      configuration = owner.asConfiguration();
+-    }
+-
+-    @Override
+-    public void save(OutputStream out) throws IOException {
+-      configuration.writeXml(out);
+-    }
+-
+-    @Override
+-    public String asString() throws IOException {
+-      return ConfigHelper.toXml(configuration);
+-    }
+-
+-    public Configuration getConfiguration() {
+-      return configuration;
+-    }
+-  }
+-
+-  public static class PropertiesOutputter extends PublishedConfigurationOutputter {
+-
+-    private final Properties properties;
+-
+-    public PropertiesOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-      properties = owner.asProperties();
+-    }
+-
+-    @Override
+-    public void save(OutputStream out) throws IOException {
+-      properties.store(out, COMMENTS);
+-    }
+-
+-
+-    public String asString() throws IOException {
+-      StringWriter sw = new StringWriter();
+-      properties.store(sw, COMMENTS);
+-      return sw.toString();
+-    }
+-  }
+-
+-
+-  public static class JsonOutputter extends PublishedConfigurationOutputter {
+-
+-    public JsonOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-    }
+-
+-    @Override
+-    public String asString() throws IOException {
+-      return owner.asJson();
+-    }
+-  }
+-
+-
+-  public static class EnvOutputter extends PublishedConfigurationOutputter {
+-
+-    public EnvOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-    }
+-
+-    @Override
+-    public String asString() throws IOException {
+-      if (!owner.entries.containsKey("content")) {
+-        throw new IOException("Configuration has no content field and cannot " +
+-            "be retrieved as type 'env'");
+-      }
+-      String content = owner.entries.get("content");
+-      return ConfigUtils.replaceProps(owner.entries, content);
+-    }
+-  }
+-
+-  public static class TemplateOutputter extends EnvOutputter {
+-    public TemplateOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-    }
+-  }
+-
+-  public static class YamlOutputter extends PublishedConfigurationOutputter {
+-
+-    private final Yaml yaml;
+-
+-    public YamlOutputter(PublishedConfiguration owner) {
+-      super(owner);
+-      DumperOptions options = new DumperOptions();
+-      options.setDefaultFlowStyle(FlowStyle.BLOCK);
+-      yaml = new Yaml(options);
+-    }
+-
+-    public String asString() throws IOException {
+-      return yaml.dump(owner.entries);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SerializedApplicationReport.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SerializedApplicationReport.java
+deleted file mode 100644
+index 953f4c48ee4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SerializedApplicationReport.java
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-
+-import java.io.IOException;
+-
+-/**
+- * Serialized form of an service report which can be persisted
+- * and then parsed. It can not be converted back into a
+- * real YARN service report
+- * 
+- * Useful for testing
+- */
+-
+-@JsonIgnoreProperties(ignoreUnknown = true)
+-@JsonInclude(value = JsonInclude.Include.NON_NULL)
+-public class SerializedApplicationReport {
+-
+-  public String applicationId;
+-  public String applicationAttemptId;
+-  public String name;
+-  public String applicationType;
+-  public String user;
+-  public String queue;
+-  public String host;
+-  public Integer rpcPort;
+-  public String state;
+-  public String diagnostics;
+-  public String url;
+-  /**
+-   * This value is non-null only when a report is generated from a submission context.
+-   * The YARN {@link ApplicationReport} structure does not propagate this value
+-   * from the RM.
+-   */
+-  public Long submitTime;
+-  public Long startTime;
+-  public Long finishTime;
+-  public String finalStatus;
+-  public String origTrackingUrl;
+-  public Float progress;
+-  
+-  public SerializedApplicationReport() {
+-  }
+-  
+-  public SerializedApplicationReport(ApplicationReport report) {
+-    this.applicationId = report.getApplicationId().toString();
+-    ApplicationAttemptId attemptId = report.getCurrentApplicationAttemptId();
+-    this.applicationAttemptId = attemptId != null ? attemptId.toString() : "N/A";
+-    this.name = report.getName();
+-    this.applicationType = report.getApplicationType();
+-    this.user = report.getUser();
+-    this.queue = report.getQueue();
+-    this.host = report.getHost();
+-    this.rpcPort = report.getRpcPort();
+-    this.state = report.getYarnApplicationState().toString();
+-    this.diagnostics = report.getDiagnostics();
+-    this.startTime = report.getStartTime();
+-    this.finishTime = report.getFinishTime();
+-    FinalApplicationStatus appStatus = report.getFinalApplicationStatus();
+-    this.finalStatus = appStatus == null ? "" : appStatus.toString();
+-    this.progress = report.getProgress();
+-    this.url = report.getTrackingUrl();
+-    this.origTrackingUrl= report.getOriginalTrackingUrl();
+-  }
+-
+-  @Override
+-  public String toString() {
+-    try {
+-      return ApplicationReportSerDeser.toString(this);
+-    } catch (IOException e) {
+-      return super.toString();
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java
+deleted file mode 100644
+index b96d04a98e0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceApiUtil.java
++++ /dev/null
+@@ -1,786 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ArrayListMultimap;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.registry.client.api.RegistryConstants;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.api.records.KerberosPrincipal;
+-import org.apache.hadoop.yarn.service.api.records.PlacementConstraint;
+-import org.apache.hadoop.yarn.service.api.records.PlacementPolicy;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.conf.RestApiConstants;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-import org.apache.hadoop.yarn.service.monitor.probe.MonitorUtils;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.text.MessageFormat;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import static org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages.ERROR_COMP_DOES_NOT_NEED_UPGRADE;
+-import static org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages.ERROR_COMP_INSTANCE_DOES_NOT_NEED_UPGRADE;
+-
+-public class ServiceApiUtil {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceApiUtil.class);
+-  public static JsonSerDeser<Service> jsonSerDeser =
+-      new JsonSerDeser<>(Service.class,
+-          PropertyNamingStrategies.SNAKE_CASE);
+-
+-  public static final JsonSerDeser<Container[]> CONTAINER_JSON_SERDE =
+-      new JsonSerDeser<>(Container[].class,
+-          PropertyNamingStrategies.SNAKE_CASE);
+-
+-  public static final JsonSerDeser<ComponentContainers[]>
+-      COMP_CONTAINERS_JSON_SERDE = new JsonSerDeser<>(
+-          ComponentContainers[].class,
+-          PropertyNamingStrategies.SNAKE_CASE);
+-
+-  public static final JsonSerDeser<Component[]> COMP_JSON_SERDE =
+-      new JsonSerDeser<>(Component[].class,
+-          PropertyNamingStrategies.SNAKE_CASE);
+-
+-  private static final PatternValidator namePattern
+-      = new PatternValidator("[a-z][a-z0-9-]*");
+-
+-  private static final PatternValidator userNamePattern
+-      = new PatternValidator("[a-z][a-z0-9-.]*");
+-
+-  @VisibleForTesting
+-  public static void setJsonSerDeser(JsonSerDeser jsd) {
+-    jsonSerDeser = jsd;
+-  }
+-
+-  @VisibleForTesting
+-  public static void validateAndResolveService(Service service,
+-      SliderFileSystem fs, org.apache.hadoop.conf.Configuration conf) throws
+-      IOException {
+-    boolean dnsEnabled = conf.getBoolean(RegistryConstants.KEY_DNS_ENABLED,
+-        RegistryConstants.DEFAULT_DNS_ENABLED);
+-    if (dnsEnabled) {
+-      if (RegistryUtils.currentUser().length()
+-          > RegistryConstants.MAX_FQDN_LABEL_LENGTH) {
+-        throw new IllegalArgumentException(
+-            RestApiErrorMessages.ERROR_USER_NAME_INVALID);
+-      }
+-      userNamePattern.validate(RegistryUtils.currentUser());
+-    }
+-
+-    if (StringUtils.isEmpty(service.getName())) {
+-      throw new IllegalArgumentException(
+-          RestApiErrorMessages.ERROR_APPLICATION_NAME_INVALID);
+-    }
+-
+-    if (StringUtils.isEmpty(service.getVersion())) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_APPLICATION_VERSION_INVALID,
+-          service.getName()));
+-    }
+-
+-    validateNameFormat(service.getName(), conf);
+-
+-    // If the service has no components, throw error
+-    if (!hasComponent(service)) {
+-      throw new IllegalArgumentException(
+-          "No component specified for " + service.getName());
+-    }
+-
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      validateKerberosPrincipal(service.getKerberosPrincipal());
+-    }
+-
+-    // Validate the Docker client config.
+-    try {
+-      validateDockerClientConfiguration(service, conf);
+-    } catch (IOException e) {
+-      throw new IllegalArgumentException(e);
+-    }
+-
+-    // Validate there are no component name collisions (collisions are not
+-    // currently supported) and add any components from external services
+-    Configuration globalConf = service.getConfiguration();
+-    Set<String> componentNames = new HashSet<>();
+-    List<Component> componentsToRemove = new ArrayList<>();
+-    List<Component> componentsToAdd = new ArrayList<>();
+-    for (Component comp : service.getComponents()) {
+-      int maxCompLength = RegistryConstants.MAX_FQDN_LABEL_LENGTH;
+-      maxCompLength = maxCompLength - Long.toString(Long.MAX_VALUE).length();
+-      if (dnsEnabled && comp.getName().length() > maxCompLength) {
+-        throw new IllegalArgumentException(String.format(RestApiErrorMessages
+-            .ERROR_COMPONENT_NAME_INVALID, maxCompLength, comp.getName()));
+-      }
+-      if (service.getName().equals(comp.getName())) {
+-        throw new IllegalArgumentException(String.format(RestApiErrorMessages
+-                .ERROR_COMPONENT_NAME_CONFLICTS_WITH_SERVICE_NAME,
+-            comp.getName(), service.getName()));
+-      }
+-      if (componentNames.contains(comp.getName())) {
+-        throw new IllegalArgumentException("Component name collision: " +
+-            comp.getName());
+-      }
+-      // If artifact is of type SERVICE (which cannot be filled from global),
+-      // read external service and add its components to this service
+-      if (comp.getArtifact() != null && comp.getArtifact().getType() ==
+-          Artifact.TypeEnum.SERVICE) {
+-        if (StringUtils.isEmpty(comp.getArtifact().getId())) {
+-          throw new IllegalArgumentException(
+-              RestApiErrorMessages.ERROR_ARTIFACT_ID_INVALID);
+-        }
+-        LOG.info("Marking {} for removal", comp.getName());
+-        componentsToRemove.add(comp);
+-        List<Component> externalComponents = getComponents(fs,
+-            comp.getArtifact().getId());
+-        for (Component c : externalComponents) {
+-          Component override = service.getComponent(c.getName());
+-          if (override != null && override.getArtifact() == null) {
+-            // allow properties from external components to be overridden /
+-            // augmented by properties in this component, except for artifact
+-            // which must be read from external component
+-            override.mergeFrom(c);
+-            LOG.info("Merging external component {} from external {}", c
+-                .getName(), comp.getName());
+-          } else {
+-            if (componentNames.contains(c.getName())) {
+-              throw new IllegalArgumentException("Component name collision: " +
+-                  c.getName());
+-            }
+-            componentNames.add(c.getName());
+-            componentsToAdd.add(c);
+-            LOG.info("Adding component {} from external {}", c.getName(),
+-                comp.getName());
+-          }
+-        }
+-      } else {
+-        // otherwise handle as a normal component
+-        componentNames.add(comp.getName());
+-        // configuration
+-        comp.getConfiguration().mergeFrom(globalConf);
+-      }
+-    }
+-    service.getComponents().removeAll(componentsToRemove);
+-    service.getComponents().addAll(componentsToAdd);
+-
+-    // Validate components and let global values take effect if component level
+-    // values are not provided
+-    Artifact globalArtifact = service.getArtifact();
+-    Resource globalResource = service.getResource();
+-    for (Component comp : service.getComponents()) {
+-      // fill in global artifact unless it is type SERVICE
+-      if (comp.getArtifact() == null && service.getArtifact() != null
+-          && service.getArtifact().getType() != Artifact.TypeEnum
+-          .SERVICE) {
+-        comp.setArtifact(globalArtifact);
+-      }
+-      // fill in global resource
+-      if (comp.getResource() == null) {
+-        comp.setResource(globalResource);
+-      }
+-      // validate dependency existence
+-      if (comp.getDependencies() != null) {
+-        for (String dependency : comp.getDependencies()) {
+-          if (!componentNames.contains(dependency)) {
+-            throw new IllegalArgumentException(String.format(
+-                RestApiErrorMessages.ERROR_DEPENDENCY_INVALID, dependency,
+-                comp.getName()));
+-          }
+-        }
+-      }
+-      validateComponent(comp, fs.getFileSystem(), conf);
+-    }
+-    validatePlacementPolicy(service.getComponents(), componentNames);
+-
+-    // validate dependency tree
+-    sortByDependencies(service.getComponents());
+-
+-    // Service lifetime if not specified, is set to unlimited lifetime
+-    if (service.getLifetime() == null) {
+-      service.setLifetime(RestApiConstants.DEFAULT_UNLIMITED_LIFETIME);
+-    }
+-  }
+-
+-  public static void validateJvmOpts(String jvmOpts)
+-      throws IllegalArgumentException {
+-    Pattern pattern = Pattern.compile("[!~#?@*&%${}()<>\\[\\]|\",`;]");
+-    Matcher matcher = pattern.matcher(jvmOpts);
+-    if (matcher.find()) {
+-      throw new IllegalArgumentException(
+-          RestApiErrorMessages.ERROR_JVM_OPTS);
+-    }
+-  }
+-
+-  public static void validateKerberosPrincipal(
+-      KerberosPrincipal kerberosPrincipal) throws IOException {
+-    if (!StringUtils.isEmpty(kerberosPrincipal.getPrincipalName())) {
+-      if (!kerberosPrincipal.getPrincipalName().contains("/")) {
+-        throw new IllegalArgumentException(String.format(
+-            RestApiErrorMessages.ERROR_KERBEROS_PRINCIPAL_NAME_FORMAT,
+-            kerberosPrincipal.getPrincipalName()));
+-      }
+-    }
+-  }
+-
+-  private static void validateDockerClientConfiguration(Service service,
+-      org.apache.hadoop.conf.Configuration conf) throws IOException {
+-    String dockerClientConfig = service.getDockerClientConfig();
+-    if (!StringUtils.isEmpty(dockerClientConfig)) {
+-      Path dockerClientConfigPath = new Path(dockerClientConfig);
+-      FileSystem fs = dockerClientConfigPath.getFileSystem(conf);
+-      LOG.info("The supplied Docker client config is " + dockerClientConfig);
+-      if (!fs.exists(dockerClientConfigPath)) {
+-        throw new IOException(
+-            "The supplied Docker client config does not exist: "
+-                + dockerClientConfig);
+-      }
+-    }
+-  }
+-
+-  private static void validateComponent(Component comp, FileSystem fs,
+-      org.apache.hadoop.conf.Configuration conf)
+-      throws IOException {
+-    validateNameFormat(comp.getName(), conf);
+-
+-    AbstractClientProvider compClientProvider = ProviderFactory
+-        .getClientProvider(comp.getArtifact());
+-    compClientProvider.validateArtifact(comp.getArtifact(), comp.getName(), fs);
+-
+-    if (comp.getLaunchCommand() == null && (comp.getArtifact() == null || comp
+-        .getArtifact().getType() != Artifact.TypeEnum.DOCKER)) {
+-      throw new IllegalArgumentException(RestApiErrorMessages
+-          .ERROR_ABSENT_LAUNCH_COMMAND);
+-    }
+-
+-    validateServiceResource(comp.getResource(), comp);
+-
+-    if (comp.getNumberOfContainers() == null
+-        || comp.getNumberOfContainers() < 0) {
+-      throw new IllegalArgumentException(String.format(
+-          RestApiErrorMessages.ERROR_CONTAINERS_COUNT_FOR_COMP_INVALID
+-              + ": " + comp.getNumberOfContainers(), comp.getName()));
+-    }
+-    compClientProvider.validateConfigFiles(comp.getConfiguration()
+-        .getFiles(), comp.getName(), fs);
+-
+-    MonitorUtils.getProbe(comp.getReadinessCheck());
+-  }
+-
+-  // Check component or service name format and transform to lower case.
+-  public static void validateNameFormat(String name,
+-      org.apache.hadoop.conf.Configuration conf) {
+-    if (StringUtils.isEmpty(name)) {
+-      throw new IllegalArgumentException("Name can not be empty!");
+-    }
+-    // validate component name
+-    if (name.contains("_")) {
+-      throw new IllegalArgumentException(
+-          "Invalid format: " + name
+-              + ", can not use '_', as DNS hostname does not allow '_'. Use '-' Instead. ");
+-    }
+-    boolean dnsEnabled = conf.getBoolean(RegistryConstants.KEY_DNS_ENABLED,
+-        RegistryConstants.DEFAULT_DNS_ENABLED);
+-    if (dnsEnabled && name.length() > RegistryConstants.MAX_FQDN_LABEL_LENGTH) {
+-      throw new IllegalArgumentException(String
+-          .format("Invalid format %s, must be no more than 63 characters ",
+-              name));
+-    }
+-    namePattern.validate(name);
+-  }
+-
+-  private static void validatePlacementPolicy(List<Component> components,
+-      Set<String> componentNames) {
+-    for (Component comp : components) {
+-      PlacementPolicy placementPolicy = comp.getPlacementPolicy();
+-      if (placementPolicy != null) {
+-        for (PlacementConstraint constraint : placementPolicy
+-            .getConstraints()) {
+-          if (constraint.getType() == null) {
+-            throw new IllegalArgumentException(String.format(
+-              RestApiErrorMessages.ERROR_PLACEMENT_POLICY_CONSTRAINT_TYPE_NULL,
+-              constraint.getName() == null ? "" : constraint.getName() + " ",
+-              comp.getName()));
+-          }
+-          if (constraint.getScope() == null) {
+-            throw new IllegalArgumentException(String.format(
+-              RestApiErrorMessages.ERROR_PLACEMENT_POLICY_CONSTRAINT_SCOPE_NULL,
+-              constraint.getName() == null ? "" : constraint.getName() + " ",
+-              comp.getName()));
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  public static List<Component> getComponents(SliderFileSystem
+-      fs, String serviceName) throws IOException {
+-    return loadService(fs, serviceName).getComponents();
+-  }
+-
+-  public static Service loadService(SliderFileSystem fs, String
+-      serviceName) throws IOException {
+-    Path serviceJson = getServiceJsonPath(fs, serviceName);
+-    LOG.info("Loading service definition from " + serviceJson);
+-    return jsonSerDeser.load(fs.getFileSystem(), serviceJson);
+-  }
+-
+-  public static Service loadServiceUpgrade(SliderFileSystem fs,
+-      String serviceName, String version) throws IOException {
+-    Path versionPath = fs.buildClusterUpgradeDirPath(serviceName, version);
+-    Path versionedDef = new Path(versionPath, serviceName + ".json");
+-    LOG.info("Loading service definition from {}", versionedDef);
+-    return jsonSerDeser.load(fs.getFileSystem(), versionedDef);
+-  }
+-
+-  public static Service loadServiceFrom(SliderFileSystem fs,
+-      Path appDefPath) throws IOException {
+-    LOG.info("Loading service definition from " + appDefPath);
+-    return jsonSerDeser.load(fs.getFileSystem(), appDefPath);
+-  }
+-
+-  public static Path getServiceJsonPath(SliderFileSystem fs, String serviceName) {
+-    Path serviceDir = fs.buildClusterDirPath(serviceName);
+-    return new Path(serviceDir, serviceName + ".json");
+-  }
+-
+-  private static void validateServiceResource(Resource resource,
+-      Component comp) {
+-    // Only services/components of type SERVICE can skip resource requirement
+-    if (resource == null) {
+-      throw new IllegalArgumentException(
+-          comp == null ? RestApiErrorMessages.ERROR_RESOURCE_INVALID : String
+-              .format(RestApiErrorMessages.ERROR_RESOURCE_FOR_COMP_INVALID,
+-                  comp.getName()));
+-    }
+-    // One and only one of profile OR cpus & memory can be specified. Specifying
+-    // both raises validation error.
+-    if (StringUtils.isNotEmpty(resource.getProfile()) && (
+-        resource.getCpus() != null || StringUtils
+-            .isNotEmpty(resource.getMemory()))) {
+-      throw new IllegalArgumentException(comp == null ?
+-          RestApiErrorMessages.ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_NOT_SUPPORTED :
+-          String.format(
+-              RestApiErrorMessages.ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_FOR_COMP_NOT_SUPPORTED,
+-              comp.getName()));
+-    }
+-    // Currently resource profile is not supported yet, so we will raise
+-    // validation error if only resource profile is specified
+-    if (StringUtils.isNotEmpty(resource.getProfile())) {
+-      throw new IllegalArgumentException(
+-          RestApiErrorMessages.ERROR_RESOURCE_PROFILE_NOT_SUPPORTED_YET);
+-    }
+-
+-    String memory = resource.getMemory();
+-    Integer cpus = resource.getCpus();
+-    if (StringUtils.isEmpty(memory)) {
+-      throw new IllegalArgumentException(
+-          comp == null ? RestApiErrorMessages.ERROR_RESOURCE_MEMORY_INVALID :
+-              String.format(
+-                  RestApiErrorMessages.ERROR_RESOURCE_MEMORY_FOR_COMP_INVALID,
+-                  comp.getName()));
+-    }
+-    if (cpus == null) {
+-      throw new IllegalArgumentException(
+-          comp == null ? RestApiErrorMessages.ERROR_RESOURCE_CPUS_INVALID :
+-              String.format(
+-                  RestApiErrorMessages.ERROR_RESOURCE_CPUS_FOR_COMP_INVALID,
+-                  comp.getName()));
+-    }
+-    if (cpus <= 0) {
+-      throw new IllegalArgumentException(comp == null ?
+-          RestApiErrorMessages.ERROR_RESOURCE_CPUS_INVALID_RANGE : String
+-          .format(
+-              RestApiErrorMessages.ERROR_RESOURCE_CPUS_FOR_COMP_INVALID_RANGE,
+-              comp.getName()));
+-    }
+-  }
+-
+-  // check if comp mem size exceeds cluster limit
+-  public static void validateCompResourceSize(
+-      org.apache.hadoop.yarn.api.records.Resource maxResource,
+-      Service service) throws YarnException {
+-    for (Component component : service.getComponents()) {
+-      long mem = Long.parseLong(component.getResource().getMemory());
+-      if (mem > maxResource.getMemorySize()) {
+-        throw new YarnException(
+-            "Component " + component.getName() + ": specified memory size ("
+-                + mem + ") is larger than configured max container memory " +
+-                "size (" + maxResource.getMemorySize() + ")");
+-      }
+-      int cpu = component.getResource().getCpus();
+-      if (cpu > maxResource.getVirtualCores()) {
+-        throw new YarnException(
+-            "Component " + component.getName() + ": specified number of " +
+-                "virtual core (" + cpu + ") is larger than configured max " +
+-                "virtual core size (" + maxResource.getVirtualCores() + ")");
+-      }
+-    }
+-  }
+-
+-  private static boolean hasComponent(Service service) {
+-    if (service.getComponents() == null || service.getComponents()
+-        .isEmpty()) {
+-      return false;
+-    }
+-    return true;
+-  }
+-
+-  public static Collection<Component> sortByDependencies(List<Component>
+-      components) {
+-    Map<String, Component> sortedComponents =
+-        sortByDependencies(components, null);
+-    return sortedComponents.values();
+-  }
+-
+-  /**
+-   * Each internal call of sortByDependencies will identify all of the
+-   * components with the same dependency depth (the lowest depth that has not
+-   * been processed yet) and add them to the sortedComponents list, preserving
+-   * their original ordering in the components list.
+-   *
+-   * So the first time it is called, all components with no dependencies
+-   * (depth 0) will be identified. The next time it is called, all components
+-   * that have dependencies only on the the depth 0 components will be
+-   * identified (depth 1). This will be repeated until all components have
+-   * been added to the sortedComponents list. If no new components are
+-   * identified but the sortedComponents list is not complete, an error is
+-   * thrown.
+-   */
+-  private static Map<String, Component> sortByDependencies(List<Component>
+-      components, Map<String, Component> sortedComponents) {
+-    if (sortedComponents == null) {
+-      sortedComponents = new LinkedHashMap<>();
+-    }
+-
+-    Map<String, Component> componentsToAdd = new LinkedHashMap<>();
+-    List<Component> componentsSkipped = new ArrayList<>();
+-    for (Component component : components) {
+-      String name = component.getName();
+-      if (sortedComponents.containsKey(name)) {
+-        continue;
+-      }
+-      boolean dependenciesAlreadySorted = true;
+-      if (!ServiceUtils.isEmpty(component.getDependencies())) {
+-        for (String dependency : component.getDependencies()) {
+-          if (!sortedComponents.containsKey(dependency)) {
+-            dependenciesAlreadySorted = false;
+-            break;
+-          }
+-        }
+-      }
+-      if (dependenciesAlreadySorted) {
+-        componentsToAdd.put(name, component);
+-      } else {
+-        componentsSkipped.add(component);
+-      }
+-    }
+-
+-    if (componentsToAdd.size() == 0) {
+-      throw new IllegalArgumentException(String.format(RestApiErrorMessages
+-          .ERROR_DEPENDENCY_CYCLE, componentsSkipped));
+-    }
+-    sortedComponents.putAll(componentsToAdd);
+-    if (sortedComponents.size() == components.size()) {
+-      return sortedComponents;
+-    }
+-    return sortByDependencies(components, sortedComponents);
+-  }
+-
+-  public static void createDirAndPersistApp(SliderFileSystem fs, Path appDir,
+-      Service service)
+-      throws IOException, SliderException {
+-    FsPermission appDirPermission = new FsPermission("750");
+-    fs.createWithPermissions(appDir, appDirPermission);
+-    Path appJson = writeAppDefinition(fs, appDir, service);
+-    LOG.info("Persisted service {} version {} at {}", service.getName(),
+-        service.getVersion(), appJson);
+-  }
+-
+-  public static Path writeAppDefinition(SliderFileSystem fs, Path appDir,
+-      Service service) throws IOException {
+-    Path appJson = new Path(appDir, service.getName() + ".json");
+-    jsonSerDeser.save(fs.getFileSystem(), appJson, service, true);
+-    return appJson;
+-  }
+-
+-  public static Path writeAppDefinition(SliderFileSystem fs, Service service)
+-      throws IOException {
+-    Path appJson = getServiceJsonPath(fs, service.getName());
+-    jsonSerDeser.save(fs.getFileSystem(), appJson, service, true);
+-    return appJson;
+-  }
+-
+-  public static List<Container> getLiveContainers(Service service,
+-      List<String> componentInstances)
+-      throws YarnException {
+-    List<Container> result = new ArrayList<>();
+-
+-    // In order to avoid iterating over all the containers of all components,
+-    // first find the affected components by parsing the instance name.
+-    Multimap<String, String> affectedComps = ArrayListMultimap.create();
+-    for (String instanceName : componentInstances) {
+-      affectedComps.put(
+-          ServiceApiUtil.parseComponentName(instanceName), instanceName);
+-    }
+-
+-    service.getComponents().forEach(comp -> {
+-      // Iterating once over the containers of the affected component to
+-      // find all the containers. Avoiding multiple calls to
+-      // service.getComponent(...) and component.getContainer(...) because they
+-      // iterate over all the components of the service and all the containers
+-      // of the components respectively.
+-      if (affectedComps.get(comp.getName()) != null) {
+-        Collection<String> instanceNames = affectedComps.get(comp.getName());
+-        comp.getContainers().forEach(container -> {
+-          if (instanceNames.contains(container.getComponentInstanceName())) {
+-            result.add(container);
+-          }
+-        });
+-      }
+-    });
+-    return result;
+-  }
+-
+-  /**
+-   * Validates that the component instances that are requested to upgrade
+-   * require an upgrade.
+-   */
+-  public static void validateInstancesUpgrade(List<Container>
+-      liveContainers) throws YarnException {
+-    for (Container liveContainer : liveContainers) {
+-      if (!isUpgradable(liveContainer)) {
+-        // Nothing to upgrade
+-        throw new YarnException(String.format(
+-            ERROR_COMP_INSTANCE_DOES_NOT_NEED_UPGRADE,
+-            liveContainer.getComponentInstanceName()));
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Returns whether the container can be upgraded in the current state.
+-   */
+-  public static boolean isUpgradable(Container container) {
+-
+-    return container.getState() != null &&
+-        (container.getState().equals(ContainerState.NEEDS_UPGRADE) ||
+-            container.getState().equals(ContainerState.FAILED_UPGRADE));
+-  }
+-
+-  /**
+-   * Validates the components that are requested to upgrade require an upgrade.
+-   * It returns the instances of the components which need upgrade.
+-   */
+-  public static List<Container> validateAndResolveCompsUpgrade(
+-      Service liveService, Collection<String> compNames) throws YarnException {
+-    Preconditions.checkNotNull(compNames);
+-    HashSet<String> requestedComps = Sets.newHashSet(compNames);
+-    List<Container> containerNeedUpgrade = new ArrayList<>();
+-    for (Component liveComp : liveService.getComponents()) {
+-      if (requestedComps.contains(liveComp.getName())) {
+-        if (!liveComp.getState().equals(ComponentState.NEEDS_UPGRADE)) {
+-          // Nothing to upgrade
+-          throw new YarnException(String.format(
+-              ERROR_COMP_DOES_NOT_NEED_UPGRADE, liveComp.getName()));
+-        }
+-        liveComp.getContainers().forEach(liveContainer -> {
+-          if (isUpgradable(liveContainer)) {
+-            containerNeedUpgrade.add(liveContainer);
+-          }
+-        });
+-      }
+-    }
+-    return containerNeedUpgrade;
+-  }
+-
+-  /**
+-   * Validates the components that are requested are stable for upgrade.
+-   * It returns the instances of the components which are in ready state.
+-   */
+-  public static List<Container> validateAndResolveCompsStable(
+-      Service liveService, Collection<String> compNames) throws YarnException {
+-    Preconditions.checkNotNull(compNames);
+-    HashSet<String> requestedComps = Sets.newHashSet(compNames);
+-    List<Container> containerNeedUpgrade = new ArrayList<>();
+-    for (Component liveComp : liveService.getComponents()) {
+-      if (requestedComps.contains(liveComp.getName())) {
+-        if (!liveComp.getState().equals(ComponentState.STABLE)) {
+-          // Nothing to upgrade
+-          throw new YarnException(String.format(
+-              ERROR_COMP_DOES_NOT_NEED_UPGRADE, liveComp.getName()));
+-        }
+-        liveComp.getContainers().forEach(liveContainer -> {
+-          if (liveContainer.getState().equals(ContainerState.READY)) {
+-            containerNeedUpgrade.add(liveContainer);
+-          }
+-        });
+-      }
+-    }
+-    return containerNeedUpgrade;
+-  }
+-
+-  public static String getHostnameSuffix(String serviceName, org.apache
+-      .hadoop.conf.Configuration conf) {
+-    String domain = conf.get(RegistryConstants.KEY_DNS_DOMAIN);
+-    String hostnameSuffix;
+-    if (domain == null || domain.isEmpty()) {
+-      hostnameSuffix = MessageFormat
+-          .format(".{0}.{1}", serviceName, RegistryUtils.currentUser());
+-    } else {
+-      hostnameSuffix = MessageFormat
+-          .format(".{0}.{1}.{2}", serviceName,
+-              RegistryUtils.currentUser(), domain);
+-    }
+-    return hostnameSuffix;
+-  }
+-
+-  public static String parseAndValidateComponentInstanceName(String
+-      instanceOrHostname, String serviceName, org.apache.hadoop.conf
+-      .Configuration conf) throws IllegalArgumentException {
+-    int idx = instanceOrHostname.indexOf('.');
+-    String hostnameSuffix = getHostnameSuffix(serviceName, conf);
+-    if (idx != -1) {
+-      if (!instanceOrHostname.endsWith(hostnameSuffix)) {
+-        throw new IllegalArgumentException("Specified hostname " +
+-            instanceOrHostname + " does not have the expected format " +
+-            "componentInstanceName" +
+-            hostnameSuffix);
+-      }
+-      instanceOrHostname = instanceOrHostname.substring(0, instanceOrHostname
+-          .length() - hostnameSuffix.length());
+-    }
+-    idx = instanceOrHostname.indexOf('.');
+-    if (idx != -1) {
+-      throw new IllegalArgumentException("Specified hostname " +
+-          instanceOrHostname + " does not have the expected format " +
+-          "componentInstanceName" +
+-          hostnameSuffix);
+-    }
+-    return instanceOrHostname;
+-  }
+-
+-  public static String parseComponentName(String componentInstanceName)
+-      throws YarnException {
+-    int idx = componentInstanceName.indexOf('.');
+-    if (idx != -1) {
+-      componentInstanceName = componentInstanceName.substring(0, idx);
+-    }
+-    idx = componentInstanceName.lastIndexOf('-');
+-    if (idx == -1) {
+-      throw new YarnException("Invalid component instance (" +
+-          componentInstanceName + ") name.");
+-    }
+-    return componentInstanceName.substring(0, idx);
+-  }
+-
+-  public static String $(String s) {
+-    return "${" + s +"}";
+-  }
+-
+-  public static List<String> resolveCompsDependency(Service service) {
+-    List<String> components = new ArrayList<String>();
+-    for (Component component : service.getComponents()) {
+-      int depSize = component.getDependencies().size();
+-      if (!components.contains(component.getName())) {
+-        components.add(component.getName());
+-      }
+-      if (depSize != 0) {
+-        for (String depComp : component.getDependencies()) {
+-          if (!components.contains(depComp)) {
+-            components.add(0, depComp);
+-          }
+-        }
+-      }
+-    }
+-    return components;
+-  }
+-
+-  private static boolean serviceDependencySatisfied(Service service) {
+-    boolean result = true;
+-    try {
+-      List<String> dependencies = service
+-          .getDependencies();
+-      org.apache.hadoop.conf.Configuration conf =
+-          new org.apache.hadoop.conf.Configuration();
+-      if (dependencies != null && dependencies.size() > 0) {
+-        ServiceClient sc = new ServiceClient();
+-        sc.init(conf);
+-        sc.start();
+-        for (String dependent : dependencies) {
+-          Service dependentService = sc.getStatus(dependent);
+-          if (dependentService.getState() == null ||
+-              !dependentService.getState().equals(ServiceState.STABLE)) {
+-            result = false;
+-            LOG.info("Service dependency is not satisfied for " +
+-                "service: {} state: {}", dependent,
+-                dependentService.getState());
+-          }
+-        }
+-        sc.close();
+-      }
+-    } catch (IOException | YarnException e) {
+-      LOG.warn("Caught exception: ", e);
+-      LOG.info("Service dependency is not satisified.");
+-      result = false;
+-    }
+-    return result;
+-  }
+-
+-  public static void checkServiceDependencySatisified(Service service) {
+-    while (!serviceDependencySatisfied(service)) {
+-      try {
+-        LOG.info("Waiting for service dependencies.");
+-        Thread.sleep(15000L);
+-      } catch (InterruptedException e) {
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceRegistryUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceRegistryUtils.java
+deleted file mode 100644
+index 30ba503732d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceRegistryUtils.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.naming.Context;
+-import javax.naming.NameNotFoundException;
+-import javax.naming.NamingException;
+-import javax.naming.directory.Attributes;
+-import javax.naming.directory.DirContext;
+-import javax.naming.directory.InitialDirContext;
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-import java.util.Hashtable;
+-
+-
+-public class ServiceRegistryUtils {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceRegistryUtils.class);
+-
+-  public static final String SVC_USERS = "/services/yarn/users";
+-
+-  /**
+-   * Get the registry path for an instance under the user's home node
+-   * @param instanceName application instance
+-   * @return a path to the registry location for this application instance.
+-   */
+-  public static String registryPathForInstance(String instanceName) {
+-    return RegistryUtils.servicePath(
+-        RegistryUtils.currentUser(), YarnServiceConstants.APP_TYPE, instanceName
+-    );
+-  }
+-
+-  /**
+- * Build the path to a service folder
+- * @param username user name
+- * @param serviceName service name
+- * @return the home path to the service
+- */
+-  public static String mkServiceHomePath(String username, String serviceName) {
+-    return mkUserHomePath(username) + "/" + serviceName;
+-  }
+-
+-  /**
+-   * Build the path to a user home folder;
+-   */
+-  public static String mkUserHomePath(String username) {
+-    return SVC_USERS + "/" + username;
+-  }
+-
+-  /**
+-   * Determine whether a DNS lookup exists for a given name. If a DNS server
+-   * address is provided, the lookup will be performed against this DNS
+-   * server. This option is provided because it may be desirable to perform
+-   * the lookup against Registry DNS directly to avoid caching of negative
+-   * responses that may be performed by other DNS servers, thereby allowing the
+-   * lookup to succeed sooner.
+-   *
+-   * @param addr host:port dns address, or null
+-   * @param name name to look up
+-   * @return true if a lookup succeeds for the specified name
+-   */
+-  public static boolean registryDNSLookupExists(String addr, String
+-      name) {
+-    if (addr == null) {
+-      try {
+-        InetAddress.getByName(name);
+-        return true;
+-      } catch (UnknownHostException e) {
+-        return false;
+-      }
+-    }
+-
+-    String dnsURI = String.format("dns://%s", addr);
+-    Hashtable<String, Object> env = new Hashtable<>();
+-    env.put(Context.INITIAL_CONTEXT_FACTORY,
+-        "com.sun.jndi.dns.DnsContextFactory");
+-    env.put(Context.PROVIDER_URL, dnsURI);
+-
+-    try {
+-      DirContext ictx = new InitialDirContext(env);
+-      Attributes attrs = ictx.getAttributes(name, new String[]{"A"});
+-
+-      if (attrs.size() > 0) {
+-        return true;
+-      }
+-    } catch (NameNotFoundException e) {
+-      // this doesn't need to be logged
+-    } catch (NamingException e) {
+-      LOG.error("Got exception when performing DNS lookup", e);
+-    }
+-
+-    return false;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceUtils.java
+deleted file mode 100644
+index 2034cc3b5d5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ServiceUtils.java
++++ /dev/null
+@@ -1,599 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Preconditions;
+-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+-import org.apache.commons.lang3.ArrayUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FileUtil;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.net.DNS;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.yarn.api.ApplicationConstants;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.containerlaunch.ClasspathConstructor;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.annotation.Nullable;
+-import java.io.BufferedOutputStream;
+-import java.io.File;
+-import java.io.FileInputStream;
+-import java.io.FileNotFoundException;
+-import java.io.FileOutputStream;
+-import java.io.FilenameFilter;
+-import java.io.IOException;
+-import java.net.*;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.Enumeration;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Locale;
+-import java.util.Map;
+-import java.util.regex.Pattern;
+-import java.util.zip.GZIPOutputStream;
+-
+-import static org.apache.hadoop.fs.CommonConfigurationKeysPublic
+-    .HADOOP_SECURITY_DNS_INTERFACE_KEY;
+-import static org.apache.hadoop.fs.CommonConfigurationKeysPublic
+-    .HADOOP_SECURITY_DNS_NAMESERVER_KEY;
+-
+-/**
+- * These are slider-specific Util methods
+- */
+-public final class ServiceUtils {
+-
+-  private static final Logger log = LoggerFactory.getLogger(ServiceUtils.class);
+-
+-  private ServiceUtils() {
+-  }
+-
+-  /**
+-   * Implementation of set-ness, groovy definition of true/false for a string
+-   * @param s string
+-   * @return true iff the string is neither null nor empty
+-   */
+-  public static boolean isUnset(String s) {
+-    return s == null || s.isEmpty();
+-  }
+-
+-  public static boolean isSet(String s) {
+-    return !isUnset(s);
+-  }
+-
+-  public static boolean isEmpty(Collection l) {
+-    return l == null || l.isEmpty();
+-  }
+-
+-  /**
+-   * Find a containing JAR
+-   * @param clazz class to find
+-   * @return the file
+-   * @throws IOException any IO problem, including the class not having a
+-   * classloader
+-   * @throws FileNotFoundException if the class did not resolve to a file
+-   */
+-  public static File findContainingJarOrFail(Class clazz) throws IOException {
+-    File localFile = ServiceUtils.findContainingJar(clazz);
+-    if (null == localFile) {
+-      throw new FileNotFoundException("Could not find JAR containing " + clazz);
+-    }
+-    return localFile;
+-  }
+-
+-
+-  /**
+-   * Find a containing JAR
+-   * @param my_class class to find
+-   * @return the file or null if it is not found
+-   * @throws IOException any IO problem, including the class not having a
+-   * classloader
+-   */
+-  public static File findContainingJar(Class my_class) throws IOException {
+-    ClassLoader loader = my_class.getClassLoader();
+-    if (loader == null) {
+-      throw new IOException(
+-          "Class " + my_class + " does not have a classloader!");
+-    }
+-    String class_file = my_class.getName().replaceAll("\\.", "/") + ".class";
+-    Enumeration<URL> urlEnumeration = loader.getResources(class_file);
+-    for (; urlEnumeration.hasMoreElements(); ) {
+-      URL url = urlEnumeration.nextElement();
+-      if ("jar".equals(url.getProtocol())) {
+-        String toReturn = url.getPath();
+-        if (toReturn.startsWith("file:")) {
+-          toReturn = toReturn.substring("file:".length());
+-        }
+-        // URLDecoder is a misnamed class, since it actually decodes
+-        // x-www-form-urlencoded MIME type rather than actual
+-        // URL encoding (which the file path has). Therefore it would
+-        // decode +s to ' 's which is incorrect (spaces are actually
+-        // either unencoded or encoded as "%20"). Replace +s first, so
+-        // that they are kept sacred during the decoding process.
+-        toReturn = toReturn.replaceAll("\\+", "%2B");
+-        toReturn = URLDecoder.decode(toReturn, "UTF-8");
+-        String jarFilePath = toReturn.replaceAll("!.*$", "");
+-        return new File(jarFilePath);
+-      } else {
+-        log.info("could not locate JAR containing {} URL={}", my_class, url);
+-      }
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Copy a file to a new FS -both paths must be qualified.
+-   * @param conf conf file
+-   * @param srcFile src file
+-   * @param destFile dest file
+-   */
+-  @SuppressWarnings("deprecation")
+-  public static void copy(Configuration conf,
+-      Path srcFile,
+-      Path destFile) throws
+-      IOException,
+-      BadClusterStateException {
+-    FileSystem srcFS = FileSystem.get(srcFile.toUri(), conf);
+-    //list all paths in the src.
+-    if (!srcFS.exists(srcFile)) {
+-      throw new FileNotFoundException("Source file not found " + srcFile);
+-    }
+-    if (!srcFS.isFile(srcFile)) {
+-      throw new FileNotFoundException(
+-          "Source file not a file " + srcFile);
+-    }
+-    FileSystem destFS = FileSystem.get(destFile.toUri(), conf);
+-    FileUtil.copy(srcFS, srcFile, destFS, destFile, false, true, conf);
+-  }
+-
+-  /**
+-   * Take a collection, return a list containing the string value of every
+-   * element in the collection.
+-   * @param c collection
+-   * @return a stringified list
+-   */
+-  public static List<String> collectionToStringList(Collection c) {
+-    List<String> l = new ArrayList<>(c.size());
+-    for (Object o : c) {
+-      l.add(o.toString());
+-    }
+-    return l;
+-  }
+-
+-  /**
+-   * Join an collection of objects with a separator that appears after every
+-   * instance in the list -including at the end
+-   * @param collection collection to call toString() on each element
+-   * @param separator separator string
+-   * @return the joined entries
+-   */
+-  public static String join(Collection collection, String separator) {
+-    return join(collection, separator, true);
+-  }
+-
+-  /**
+-   * Join an collection of objects with a separator that appears after every
+-   * instance in the list -optionally at the end
+-   * @param collection collection to call toString() on each element
+-   * @param separator separator string
+-   * @param trailing add a trailing entry or not
+-   * @return the joined entries
+-   */
+-  public static String join(Collection collection,
+-      String separator,
+-      boolean trailing) {
+-    StringBuilder b = new StringBuilder();
+-    // fast return on empty collection
+-    if (collection.isEmpty()) {
+-      return trailing ? separator : "";
+-    }
+-    for (Object o : collection) {
+-      b.append(o)
+-          .append(separator);
+-    }
+-    int length = separator.length();
+-    String s = b.toString();
+-    return (trailing || s.isEmpty()) ?
+-           s : (b.substring(0, b.length() - length));
+-  }
+-
+-  /**
+-   * Join an array of strings with a separator that appears after every
+-   * instance in the list -optionally at the end
+-   * @param collection strings
+-   * @param separator separator string
+-   * @param trailing add a trailing entry or not
+-   * @return the joined entries
+-   */
+-  public static String join(String[] collection, String separator,
+-      boolean trailing) {
+-    return join(Arrays.asList(collection), separator, trailing);
+-  }
+-
+-  /**
+-   * Resolve a mandatory environment variable
+-   * @param key env var
+-   * @return the resolved value
+-   * @throws BadClusterStateException
+-   */
+-  public static String mandatoryEnvVariable(String key) throws
+-      BadClusterStateException {
+-    String v = System.getenv(key);
+-    if (v == null) {
+-      throw new BadClusterStateException("Missing Environment variable " + key);
+-    }
+-    return v;
+-  }
+-
+-  /**
+-   * Generic map merge logic
+-   * @param first first map
+-   * @param second second map
+-   * @param <T1> key type
+-   * @param <T2> value type
+-   * @return 'first' merged with the second
+-   */
+-  public static <T1, T2> Map<T1, T2> mergeMapsIgnoreDuplicateKeys(Map<T1, T2> first,
+-      Map<T1, T2> second) {
+-    Preconditions.checkArgument(first != null, "Null 'first' value");
+-    Preconditions.checkArgument(second != null, "Null 'second' value");
+-    for (Map.Entry<T1, T2> entry : second.entrySet()) {
+-      T1 key = entry.getKey();
+-      if (!first.containsKey(key)) {
+-        first.put(key, entry.getValue());
+-      }
+-    }
+-    return first;
+-  }
+-
+-  /**
+-   * Convert a map to a multi-line string for printing
+-   * @param map map to stringify
+-   * @return a string representation of the map
+-   */
+-  public static String stringifyMap(Map<String, String> map) {
+-    StringBuilder builder = new StringBuilder();
+-    for (Map.Entry<String, String> entry : map.entrySet()) {
+-      builder.append(entry.getKey())
+-             .append("=\"")
+-             .append(entry.getValue())
+-             .append("\"\n");
+-
+-    }
+-    return builder.toString();
+-  }
+-
+-  /**
+-   * Convert a YARN URL into a string value of a normal URL
+-   * @param url URL
+-   * @return string representatin
+-   */
+-  public static String stringify(org.apache.hadoop.yarn.api.records.URL url) {
+-    StringBuilder builder = new StringBuilder();
+-    builder.append(url.getScheme()).append("://");
+-    if (url.getHost() != null) {
+-      builder.append(url.getHost()).append(":").append(url.getPort());
+-    }
+-    builder.append(url.getFile());
+-    return builder.toString();
+-  }
+-
+-  /**
+-   * Get a random open port
+-   * @return true if the port was available for listening on
+-   */
+-  public static int getOpenPort() throws IOException {
+-    ServerSocket socket = null;
+-    try {
+-      socket = new ServerSocket(0);
+-      return socket.getLocalPort();
+-    } finally {
+-      if (socket != null) {
+-        socket.close();
+-      }
+-    }
+-  }
+-
+-  /**
+-   * See if a port is available for listening on by trying to listen
+-   * on it and seeing if that works or fails.
+-   * @param port port to listen to
+-   * @return true if the port was available for listening on
+-   */
+-  public static boolean isPortAvailable(int port) {
+-    try {
+-      ServerSocket socket = new ServerSocket(port);
+-      socket.close();
+-      return true;
+-    } catch (IOException e) {
+-      return false;
+-    }
+-  }
+-
+-  // Build env map: key -> value;
+-  // value will be replaced by the corresponding value in tokenMap, if any.
+-  public static Map<String, String> buildEnvMap(
+-      org.apache.hadoop.yarn.service.api.records.Configuration conf,
+-      Map<String,String> tokenMap) {
+-    if (tokenMap == null) {
+-      return conf.getEnv();
+-    }
+-    Map<String, String> env = new HashMap<>();
+-    for (Map.Entry<String, String> entry : conf.getEnv().entrySet()) {
+-      String key = entry.getKey();
+-      String val = entry.getValue();
+-      for (Map.Entry<String,String> token : tokenMap.entrySet()) {
+-        val = val.replaceAll(Pattern.quote(token.getKey()),
+-            token.getValue());
+-      }
+-      env.put(key,val);
+-    }
+-    return env;
+-  }
+-
+-  public static String[] getLibDirs() {
+-    String libDirStr = System.getProperty(YarnServiceConstants.PROPERTY_LIB_DIR);
+-    if (isUnset(libDirStr)) {
+-      return ArrayUtils.EMPTY_STRING_ARRAY;
+-    }
+-    return StringUtils.split(libDirStr, ',');
+-  }
+-
+-  /**
+-   * Submit a JAR containing a specific class and map it
+-   * @param providerResources provider map to build up
+-   * @param sliderFileSystem remote fs
+-   * @param clazz class to look for
+-   * @param libdir lib directory
+-   * @param jarName <i>At the destination</i>
+-   * @return the local resource ref
+-   * @throws IOException trouble copying to HDFS
+-   */
+-  public static LocalResource putJar(Map<String, LocalResource> providerResources,
+-      SliderFileSystem sliderFileSystem,
+-      Class clazz,
+-      Path tempPath,
+-      String libdir,
+-      String jarName
+-  )
+-      throws IOException, SliderException {
+-    LocalResource res = sliderFileSystem.submitJarWithClass(
+-        clazz,
+-        tempPath,
+-        libdir,
+-        jarName);
+-    providerResources.put(libdir + "/" + jarName, res);
+-    return res;
+-  }
+-
+-  /**
+-   * Submit a JAR containing and map it
+-   * @param providerResources provider map to build up
+-   * @param sliderFileSystem remote fs
+-   * @param libDir lib directory
+-   * @param srcPath copy jars from
+-   */
+-  public static void putAllJars(Map<String, LocalResource> providerResources,
+-                                SliderFileSystem sliderFileSystem,
+-                                Path tempPath,
+-                                String libDir,
+-                                String srcPath) throws IOException, SliderException {
+-    log.debug("Loading all dependencies from {}", srcPath);
+-    if (ServiceUtils.isSet(srcPath)) {
+-      File srcFolder = new File(srcPath);
+-      FilenameFilter jarFilter = createJarFilter();
+-      File[] listOfJars = srcFolder.listFiles(jarFilter);
+-      if (listOfJars == null || listOfJars.length == 0) {
+-        return;
+-      }
+-      for (File jarFile : listOfJars) {
+-        if (!jarFile.exists()) {
+-          log.debug("File does not exist, skipping: " + jarFile);
+-          continue;
+-        }
+-        LocalResource res = sliderFileSystem.submitFile(jarFile, tempPath, libDir, jarFile.getName());
+-        providerResources.put(libDir + "/" + jarFile.getName(), res);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Accept all filenames ending with {@code .jar}
+-   * @return a filename filter
+-   */
+-  public static FilenameFilter createJarFilter() {
+-    return new FilenameFilter() {
+-      public boolean accept(File dir, String name) {
+-        return name.toLowerCase(Locale.ENGLISH).endsWith(".jar");
+-      }
+-    };
+-  }
+-
+-  /**
+-   * Create a file:// path from a local file
+-   * @param file file to point the path
+-   * @return a new Path
+-   */
+-  public static Path createLocalPath(File file) {
+-    return new Path(file.toURI());
+-  }
+-
+-  /**
+-   * Build up the classpath for execution
+-   * -behaves very differently on a mini test cluster vs a production
+-   * production one.
+-   *
+-   * @param sliderConfDir relative path to the dir containing slider config
+-   *                      options to put on the classpath -or null
+-   * @param libdir directory containing the JAR files
+-   * @param configClassPath extra class path configured in yarn-site.xml
+-   * @param usingMiniMRCluster flag to indicate the MiniMR cluster is in use
+-   * (and hence the current classpath should be used, not anything built up)
+-   * @return a classpath
+-   */
+-  public static ClasspathConstructor buildClasspath(String sliderConfDir,
+-      String libdir,
+-      SliderFileSystem sliderFileSystem,
+-      String configClassPath,
+-      boolean usingMiniMRCluster) {
+-
+-    ClasspathConstructor classpath = new ClasspathConstructor();
+-    classpath.append(YarnServiceConstants.YARN_SERVICE_LOG4J_FILENAME);
+-
+-    // add the runtime classpath needed for tests to work
+-    if (usingMiniMRCluster) {
+-      // for mini cluster we pass down the java CP properties
+-      // and nothing else
+-      classpath.appendAll(classpath.localJVMClasspath());
+-    } else {
+-      if (sliderConfDir != null) {
+-        classpath.addClassDirectory(sliderConfDir);
+-      }
+-      classpath.addLibDir(libdir);
+-      if (sliderFileSystem.isFile(sliderFileSystem.getDependencyTarGzip())) {
+-        classpath.addLibDir(YarnServiceConstants.DEPENDENCY_LOCALIZED_DIR_LINK);
+-      }
+-      classpath.addRemoteClasspathEnvVar();
+-      classpath.append(ApplicationConstants.Environment.HADOOP_CONF_DIR.$$());
+-    }
+-
+-    if (!configClassPath.isEmpty()) {
+-      classpath.appendAll(Arrays.asList(configClassPath.split(",")));
+-    }
+-
+-    return classpath;
+-  }
+-
+-  /**
+-   * Given a source folder create a tar.gz file
+-   * 
+-   * @param libDirs
+-   * @param tarGzipFile
+-   * 
+-   * @throws IOException
+-   */
+-  public static void tarGzipFolder(String[] libDirs, File tarGzipFile,
+-      FilenameFilter filter) throws IOException {
+-    log.info("Tar-gzipping folders {} to {}", libDirs,
+-        tarGzipFile.getAbsolutePath());
+-
+-    try(TarArchiveOutputStream taos =
+-            new TarArchiveOutputStream(new GZIPOutputStream(
+-        new BufferedOutputStream(new FileOutputStream(tarGzipFile))))) {
+-      for (String libDir : libDirs) {
+-        File srcFolder = new File(libDir);
+-        List<String> files = new ArrayList<>();
+-        generateFileList(files, srcFolder, srcFolder, true, filter);
+-        for (String file : files) {
+-          File srcFile = new File(srcFolder, file);
+-          TarArchiveEntry tarEntry = new TarArchiveEntry(
+-              srcFile, file);
+-          taos.putArchiveEntry(tarEntry);
+-          try(FileInputStream in = new FileInputStream(srcFile)) {
+-            org.apache.commons.io.IOUtils.copy(in, taos);
+-          }
+-          taos.flush();
+-          taos.closeArchiveEntry();
+-        }
+-      }
+-    }
+-  }
+-
+-  private static void generateFileList(List<String> fileList, File node,
+-      File rootFolder, Boolean relative, FilenameFilter filter) {
+-    if (node.isFile()) {
+-      String fileFullPath = node.toString();
+-      if (relative) {
+-        fileList.add(fileFullPath.substring(rootFolder.toString().length() + 1,
+-            fileFullPath.length()));
+-      } else {
+-        fileList.add(fileFullPath);
+-      }
+-    }
+-
+-    if (node.isDirectory()) {
+-      String[] subNode = node.list(filter);
+-      if (subNode == null || subNode.length == 0) {
+-          return;
+-      }
+-      for (String filename : subNode) {
+-        generateFileList(fileList, new File(node, filename), rootFolder,
+-            relative, filter);
+-      }
+-    }
+-  }
+-
+-  public static String createNameTag(String name) {
+-    return "Name: " + name;
+-  }
+-
+-  public static String createVersionTag(String version) {
+-    return "Version: " + version;
+-  }
+-
+-  public static String createDescriptionTag(String description) {
+-    return "Description: " + description;
+-  }
+-
+-  // Copied from SecurityUtil because it is not public
+-  public static String getLocalHostName(@Nullable Configuration conf)
+-      throws UnknownHostException {
+-    if (conf != null) {
+-      String dnsInterface = conf.get(HADOOP_SECURITY_DNS_INTERFACE_KEY);
+-      String nameServer = conf.get(HADOOP_SECURITY_DNS_NAMESERVER_KEY);
+-
+-      if (dnsInterface != null) {
+-        return DNS.getDefaultHost(dnsInterface, nameServer, true);
+-      } else if (nameServer != null) {
+-        throw new IllegalArgumentException(HADOOP_SECURITY_DNS_NAMESERVER_KEY +
+-            " requires " + HADOOP_SECURITY_DNS_INTERFACE_KEY + ". Check your" +
+-            "configuration.");
+-      }
+-    }
+-
+-    // Fallback to querying the default hostname as we did before.
+-    return InetAddress.getLocalHost().getCanonicalHostName();
+-  }
+-
+-  /**
+-   * Process termination handler - exist with specified exit code after
+-   * waiting a while for ATS state to be in sync.
+-   */
+-  public static class ProcessTerminationHandler {
+-    public void terminate(int exitCode) {
+-      // Sleep for 5 seconds in hope that the state can be recorded in ATS.
+-      // in case there's a client polling the comp state, it can be notified.
+-      try {
+-        Thread.sleep(5000);
+-      } catch (InterruptedException e) {
+-        log.info("Interrupted on sleep while exiting.", e);
+-      }
+-      ExitUtil.terminate(exitCode);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SliderFileSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SliderFileSystem.java
+deleted file mode 100644
+index 4af97502269..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/SliderFileSystem.java
++++ /dev/null
+@@ -1,134 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-/**
+- * Extends Core Filesystem with operations to manipulate ClusterDescription
+- * persistent state
+- */
+-public class SliderFileSystem extends CoreFileSystem {
+-
+-  Path appDir = null;
+-
+-  public SliderFileSystem(FileSystem fileSystem,
+-      Configuration configuration) {
+-    super(fileSystem, configuration);
+-  }
+-
+-  public SliderFileSystem(Configuration configuration) throws IOException {
+-    super(configuration);
+-  }
+-
+-  public void setAppDir(Path appDir) {
+-    this.appDir = appDir;
+-  }
+-
+-  public Path getAppDir() {
+-    return this.appDir;
+-  }
+-
+-  /**
+-   * Returns the component directory path.
+-   *
+-   * @param serviceVersion service version
+-   * @param compName       component name
+-   * @return component directory
+-   */
+-  public Path getComponentDir(String serviceVersion, String compName) {
+-    return new Path(new Path(getAppDir(), "components"),
+-        serviceVersion + "/" + compName);
+-  }
+-
+-  public Path getBasePath() {
+-    String tmpDir = configuration.get("hadoop.tmp.dir");
+-    String basePath = YarnServiceConstants.SERVICE_BASE_DIRECTORY
+-        + "/" + YarnServiceConstants.SERVICES_DIRECTORY;
+-    return new Path(tmpDir, basePath);
+-  }
+-
+-  /**
+-   * Returns the component public resource directory path.
+-   *
+-   * @param serviceVersion service version
+-   * @param compName       component name
+-   * @return component public resource directory
+-   */
+-  public Path getComponentPublicResourceDir(String serviceVersion,
+-      String compName) {
+-    return new Path(new Path(getBasePath(), getAppDir().getName() + "/"
+-        + "components"), serviceVersion + "/" + compName);
+-  }
+-
+-  /**
+-   * Deletes the component directory.
+-   *
+-   * @param serviceVersion
+-   * @param compName
+-   * @throws IOException
+-   */
+-  public void deleteComponentDir(String serviceVersion, String compName)
+-      throws IOException {
+-    Path path = getComponentDir(serviceVersion, compName);
+-    if (fileSystem.exists(path)) {
+-      fileSystem.delete(path, true);
+-      LOG.debug("deleted dir {}", path);
+-    }
+-    Path publicResourceDir = getComponentPublicResourceDir(serviceVersion,
+-        compName);
+-    if (fileSystem.exists(publicResourceDir)) {
+-      fileSystem.delete(publicResourceDir, true);
+-      LOG.debug("deleted public resource dir {}", publicResourceDir);
+-    }
+-  }
+-
+-  /**
+-   * Deletes the components version directory.
+-   *
+-   * @param serviceVersion
+-   * @throws IOException
+-   */
+-  public void deleteComponentsVersionDirIfEmpty(String serviceVersion)
+-      throws IOException {
+-    Path path = new Path(new Path(getAppDir(), "components"), serviceVersion);
+-    if (fileSystem.exists(path) && fileSystem.listStatus(path).length == 0) {
+-      fileSystem.delete(path, true);
+-      LOG.info("deleted dir {}", path);
+-    }
+-    Path publicResourceDir = new Path(new Path(getBasePath(),
+-        getAppDir().getName() + "/" + "components"), serviceVersion);
+-    if (fileSystem.exists(publicResourceDir)
+-        && fileSystem.listStatus(publicResourceDir).length == 0) {
+-      fileSystem.delete(publicResourceDir, true);
+-      LOG.info("deleted public resource dir {}", publicResourceDir);
+-    }
+-  }
+-
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      SliderFileSystem.class);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ZookeeperUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ZookeeperUtils.java
+deleted file mode 100644
+index aa669878b5e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/utils/ZookeeperUtils.java
++++ /dev/null
+@@ -1,146 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.net.HostAndPort;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.service.exceptions.BadConfigException;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-public class ZookeeperUtils {
+-  public static final int DEFAULT_PORT = 2181;
+-
+-  public static String buildConnectionString(String zkHosts, int port) {
+-    String zkPort = Integer.toString(port);
+-    //parse the hosts
+-    String[] hostlist = zkHosts.split(",", 0);
+-    String quorum = ServiceUtils.join(hostlist, ":" + zkPort + ",", false);
+-    return quorum;
+-  }
+-
+-  /**
+-   * Take a quorum list and split it to (trimmed) pairs
+-   * @param hostPortQuorumList list of form h1:port, h2:port2,...
+-   * @return a possibly empty list of values between commas. They may not be
+-   * valid hostname:port pairs
+-   */
+-  public static List<String> splitToPairs(String hostPortQuorumList) {
+-    // split an address hot
+-    String[] strings = StringUtils.getStrings(hostPortQuorumList);
+-    int len = 0;
+-    if (strings != null) {
+-      len = strings.length;
+-    }
+-    List<String> tuples = new ArrayList<String>(len);
+-    if (strings != null) {
+-      for (String s : strings) {
+-        tuples.add(s.trim());
+-      }
+-    }
+-    return tuples;
+-  }
+-
+-  /**
+-   * Split a quorum list into a list of hostnames and ports
+-   * @param hostPortQuorumList split to a list of hosts and ports
+-   * @return a list of values
+-   */
+-  public static List<HostAndPort> splitToHostsAndPorts(String hostPortQuorumList) {
+-    // split an address hot
+-    String[] strings = StringUtils.getStrings(hostPortQuorumList);
+-    int len = 0;
+-    if (strings != null) {
+-      len = strings.length;
+-    }
+-    List<HostAndPort> list = new ArrayList<HostAndPort>(len);
+-    if (strings != null) {
+-      for (String s : strings) {
+-        list.add(HostAndPort.fromString(s.trim()).withDefaultPort(DEFAULT_PORT));
+-      }
+-    }
+-    return list;
+-  }
+-
+-  /**
+-   * Build up to a hosts only list
+-   * @param hostAndPorts
+-   * @return a list of the hosts only
+-   */
+-  public static String buildHostsOnlyList(List<HostAndPort> hostAndPorts) {
+-    StringBuilder sb = new StringBuilder();
+-    for (HostAndPort hostAndPort : hostAndPorts) {
+-      sb.append(hostAndPort.getHost()).append(",");
+-    }
+-    if (sb.length() > 0) {
+-      sb.delete(sb.length() - 1, sb.length());
+-    }
+-    return sb.toString();
+-  }
+-
+-  public static String buildQuorumEntry(HostAndPort hostAndPort,
+-    int defaultPort) {
+-    String s = hostAndPort.toString();
+-    if (hostAndPort.hasPort()) {
+-      return s;
+-    } else {
+-      return s + ":" + defaultPort;
+-    }
+-  }
+-
+-  /**
+-   * Build a quorum list, injecting a ":defaultPort" ref if needed on
+-   * any entry without one
+-   * @param hostAndPorts
+-   * @param defaultPort
+-   * @return
+-   */
+-  public static String buildQuorum(List<HostAndPort> hostAndPorts, int defaultPort) {
+-    List<String> entries = new ArrayList<String>(hostAndPorts.size());
+-    for (HostAndPort hostAndPort : hostAndPorts) {
+-      entries.add(buildQuorumEntry(hostAndPort, defaultPort));
+-    }
+-    return ServiceUtils.join(entries, ",", false);
+-  }
+-  
+-  public static String convertToHostsOnlyList(String quorum) throws
+-      BadConfigException {
+-    List<HostAndPort> hostAndPorts = splitToHostsAndPortsStrictly(quorum);
+-    return ZookeeperUtils.buildHostsOnlyList(hostAndPorts);
+-  }
+-
+-  public static List<HostAndPort> splitToHostsAndPortsStrictly(String quorum) throws
+-      BadConfigException {
+-    List<HostAndPort> hostAndPorts =
+-        ZookeeperUtils.splitToHostsAndPorts(quorum);
+-    if (hostAndPorts.isEmpty()) {
+-      throw new BadConfigException("empty zookeeper quorum");
+-    }
+-    return hostAndPorts;
+-  }
+-  
+-  public static int getFirstPort(String quorum, int defVal) throws
+-      BadConfigException {
+-    List<HostAndPort> hostAndPorts = splitToHostsAndPortsStrictly(quorum);
+-    int port = hostAndPorts.get(0).getPortOrDefault(defVal);
+-    return port;
+-
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/proto/ClientAMProtocol.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/proto/ClientAMProtocol.proto
+deleted file mode 100644
+index 0a84517d7c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/proto/ClientAMProtocol.proto
++++ /dev/null
+@@ -1,115 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-syntax = "proto2";
+-option java_package = "org.apache.hadoop.yarn.proto";
+-option java_outer_classname = "ClientAMProtocol";
+-option java_generic_services = true;
+-option java_generate_equals_and_hash = true;
+-package hadoop.yarn;
+-
+-service ClientAMProtocolService {
+-  rpc flexComponents(FlexComponentsRequestProto) returns (FlexComponentsResponseProto);
+-  rpc getStatus(GetStatusRequestProto) returns (GetStatusResponseProto);
+-  rpc stop(StopRequestProto) returns (StopResponseProto);
+-  rpc upgradeService(UpgradeServiceRequestProto)
+-    returns (UpgradeServiceResponseProto);
+-  rpc cancelUpgrade(CancelUpgradeRequestProto)
+-    returns (CancelUpgradeResponseProto);
+-  rpc restartService(RestartServiceRequestProto)
+-    returns (RestartServiceResponseProto);
+-  rpc upgrade(CompInstancesUpgradeRequestProto) returns
+-    (CompInstancesUpgradeResponseProto);
+-  rpc getCompInstances(GetCompInstancesRequestProto) returns
+-    (GetCompInstancesResponseProto);
+-  rpc decommissionCompInstances(DecommissionCompInstancesRequestProto)
+-    returns (DecommissionCompInstancesResponseProto);
+-}
+-
+-message FlexComponentsRequestProto {
+-  repeated ComponentCountProto components = 1;
+-}
+-
+-message ComponentCountProto {
+-  optional string name = 1;
+-  optional int64 numberOfContainers = 2;
+-}
+-
+-message FlexComponentsResponseProto {
+-}
+-
+-message GetStatusRequestProto {
+-
+-}
+-message GetStatusResponseProto {
+-  optional string status = 1;
+-}
+-
+-message StopRequestProto {
+-
+-}
+-
+-message StopResponseProto {
+-
+-}
+-
+-message UpgradeServiceRequestProto {
+-  optional string version = 1;
+-  optional bool autoFinalize = 2;
+-  optional bool expressUpgrade = 3;
+-}
+-
+-message UpgradeServiceResponseProto {
+-  optional string error = 1;
+-}
+-
+-message CancelUpgradeRequestProto {
+-}
+-
+-message CancelUpgradeResponseProto {
+-}
+-
+-message RestartServiceRequestProto {
+-}
+-
+-message RestartServiceResponseProto {
+-}
+-
+-message CompInstancesUpgradeRequestProto {
+-    repeated string containerIds = 1;
+-}
+-
+-message CompInstancesUpgradeResponseProto {
+-}
+-
+-message GetCompInstancesRequestProto {
+-  repeated string componentNames = 1;
+-  optional string version = 2;
+-  repeated string containerStates = 3;
+-}
+-
+-message GetCompInstancesResponseProto {
+-  optional string compInstances = 1;
+-}
+-
+-message DecommissionCompInstancesRequestProto {
+-  repeated string compInstances = 1;
+-}
+-
+-message DecommissionCompInstancesResponseProto {
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
+deleted file mode 100644
+index 14cdf68bc61..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-#
+-org.apache.hadoop.yarn.service.ClientAMSecurityInfo
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockRunningServiceContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockRunningServiceContext.java
+deleted file mode 100644
+index 4e3fc0999ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockRunningServiceContext.java
++++ /dev/null
+@@ -1,205 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Futures;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.client.api.NMClient;
+-import org.apache.hadoop.yarn.client.api.async.NMClientAsync;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.provider.ProviderService;
+-import org.apache.hadoop.yarn.service.provider.ProviderUtils;
+-import org.apache.hadoop.yarn.service.registry.YarnRegistryViewForProviders;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.mockito.invocation.InvocationOnMock;
+-import org.mockito.stubbing.Answer;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.concurrent.Future;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Mocked service context for a running service.
+- */
+-public class MockRunningServiceContext extends ServiceContext {
+-
+-  public MockRunningServiceContext(ServiceTestUtils.ServiceFSWatcher fsWatcher,
+-      Service serviceDef) throws Exception {
+-    super();
+-    this.service = serviceDef;
+-    this.fs = fsWatcher.getFs();
+-
+-    ContainerLaunchService mockLaunchService = mock(
+-        ContainerLaunchService.class);
+-
+-    this.scheduler = new ServiceScheduler(this) {
+-      @Override
+-      protected YarnRegistryViewForProviders
+-      createYarnRegistryOperations(
+-          ServiceContext context, RegistryOperations registryClient) {
+-        return mock(YarnRegistryViewForProviders.class);
+-      }
+-
+-      @Override
+-      public NMClientAsync createNMClient() {
+-        NMClientAsync nmClientAsync = super.createNMClient();
+-        NMClient nmClient = mock(NMClient.class);
+-        try {
+-          when(nmClient.getContainerStatus(any(), any()))
+-              .thenAnswer(
+-                  (Answer<ContainerStatus>) invocation -> ContainerStatus
+-                      .newInstance((ContainerId) invocation.getArguments()[0],
+-                          org.apache.hadoop.yarn.api.records.ContainerState
+-                              .RUNNING,
+-                          "", 0));
+-        } catch (YarnException | IOException e) {
+-          throw new RuntimeException(e);
+-        }
+-        nmClientAsync.setClient(nmClient);
+-        return nmClientAsync;
+-      }
+-
+-      @Override
+-      public ContainerLaunchService getContainerLaunchService() {
+-        return mockLaunchService;
+-      }
+-
+-      @Override
+-      public ServiceUtils.ProcessTerminationHandler getTerminationHandler() {
+-        return new
+-            ServiceUtils.ProcessTerminationHandler() {
+-              public void terminate(int exitCode) {
+-              }
+-            };
+-      }
+-
+-      @Override
+-      protected ServiceManager createServiceManager() {
+-        return ServiceTestUtils.createServiceManager(
+-            MockRunningServiceContext.this);
+-      }
+-    };
+-
+-
+-    this.scheduler.init(fsWatcher.getConf());
+-    when(mockLaunchService.launchCompInstance(any(), any(),
+-        any(), any())).thenAnswer(
+-        (Answer<Future<ProviderService.ResolvedLaunchParams>>)
+-            this::launchAndReinitHelper);
+-
+-    when(mockLaunchService.reInitCompInstance(any(), any(),
+-        any(), any())).thenAnswer((
+-        Answer<Future<ProviderService.ResolvedLaunchParams>>)
+-        this::launchAndReinitHelper);
+-    stabilizeComponents(this);
+-  }
+-
+-  private Future<ProviderService.ResolvedLaunchParams> launchAndReinitHelper(
+-      InvocationOnMock invocation) throws IOException, SliderException {
+-    AbstractLauncher launcher = new AbstractLauncher(
+-        scheduler.getContext());
+-    ComponentInstance instance = (ComponentInstance)
+-        invocation.getArguments()[1];
+-    Container container = (Container) invocation.getArguments()[2];
+-    ContainerLaunchService.ComponentLaunchContext clc =
+-        (ContainerLaunchService.ComponentLaunchContext)
+-            invocation.getArguments()[3];
+-
+-    ProviderService.ResolvedLaunchParams resolvedParams =
+-        new ProviderService.ResolvedLaunchParams();
+-    ProviderUtils.createConfigFileAndAddLocalResource(launcher, fs, clc,
+-        new HashMap<>(), instance, scheduler.getContext(), resolvedParams);
+-    ProviderUtils.handleStaticFilesForLocalization(launcher, fs, clc,
+-        resolvedParams);
+-    return Futures.immediateFuture(resolvedParams);
+-  }
+-
+-  private void stabilizeComponents(ServiceContext context) {
+-
+-    ApplicationId appId = ApplicationId.fromString(context.service.getId());
+-    ApplicationAttemptId attemptId = ApplicationAttemptId.newInstance(appId, 1);
+-    context.attemptId = attemptId;
+-    Map<String, Component>
+-        componentState = context.scheduler.getAllComponents();
+-
+-    int counter = 0;
+-    for (org.apache.hadoop.yarn.service.api.records.Component componentSpec :
+-        context.service.getComponents()) {
+-      Component component = new org.apache.hadoop.yarn.service.component.
+-          Component(componentSpec, 1L, context);
+-      componentState.put(component.getName(), component);
+-      component.handle(
+-          new ComponentEvent(component.getName(), ComponentEventType.FLEX)
+-              .setDesired(
+-                  component.getComponentSpec().getNumberOfContainers()));
+-
+-      for (int i = 0; i < componentSpec.getNumberOfContainers(); i++) {
+-        counter++;
+-        assignNewContainer(attemptId, counter, component);
+-      }
+-
+-      component.handle(new ComponentEvent(component.getName(),
+-          ComponentEventType.CHECK_STABLE));
+-    }
+-  }
+-
+-  public void assignNewContainer(ApplicationAttemptId attemptId,
+-      long containerNum, Component component) {
+-
+-    Container container = org.apache.hadoop.yarn.api.records.Container
+-        .newInstance(ContainerId.newContainerId(attemptId, containerNum),
+-            NODE_ID, "localhost", null, null,
+-            null);
+-    component.handle(new ComponentEvent(component.getName(),
+-        ComponentEventType.CONTAINER_ALLOCATED)
+-        .setContainer(container).setContainerId(container.getId()));
+-    ComponentInstance instance = this.scheduler.getLiveInstances().get(
+-        container.getId());
+-    ComponentInstanceEvent startEvent = new ComponentInstanceEvent(
+-        container.getId(), ComponentInstanceEventType.START);
+-    instance.handle(startEvent);
+-
+-    ComponentInstanceEvent readyEvent = new ComponentInstanceEvent(
+-        container.getId(), ComponentInstanceEventType.BECOME_READY);
+-    instance.handle(readyEvent);
+-  }
+-
+-  private static final NodeId NODE_ID = NodeId.fromString("localhost:0");
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
+deleted file mode 100644
+index 848120b29d5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/MockServiceAM.java
++++ /dev/null
+@@ -1,468 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import java.util.function.Supplier;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-import org.apache.hadoop.registry.client.types.ServiceRecord;
+-import org.apache.hadoop.registry.client.types.yarn.PersistencePolicies;
+-import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.client.api.AMRMClient;
+-import org.apache.hadoop.yarn.client.api.NMClient;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.client.api.async.NMClientAsync;
+-import org.apache.hadoop.yarn.client.api.impl.AMRMClientImpl;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentState;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState;
+-import org.apache.hadoop.yarn.service.exceptions.BadClusterStateException;
+-import org.apache.hadoop.yarn.service.registry.YarnRegistryViewForProviders;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.Collections;
+-import java.util.Iterator;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.ArgumentMatchers.anyString;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-public class MockServiceAM extends ServiceMaster {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(MockServiceAM.class);
+-
+-  Service service;
+-  // The list of containers fed by tests to be returned on
+-  // AMRMClientCallBackHandler#onContainersAllocated
+-  final List<Container> feedContainers =
+-      Collections.synchronizedList(new LinkedList<>());
+-
+-  final List<ContainerStatus> failedContainers =
+-      Collections.synchronizedList(new LinkedList<>());
+-
+-  private final List<Container> recoveredContainers =
+-      Collections.synchronizedList(new LinkedList<>());
+-
+-  private final Map<String, ServiceRecord> registryComponents =
+-      new ConcurrentHashMap<>();
+-
+-  private Map<ContainerId, ContainerStatus> containerStatuses =
+-      new ConcurrentHashMap<>();
+-
+-  private Set<ContainerId> releasedContainers = ConcurrentHashMap.newKeySet();
+-
+-  private Credentials amCreds;
+-
+-  public MockServiceAM(Service service) {
+-    super(service.getName());
+-    this.service = service;
+-  }
+-
+-  public MockServiceAM(Service service, Credentials amCreds) {
+-    super(service.getName());
+-    this.service = service;
+-    this.amCreds = amCreds;
+-  }
+-
+-  @Override
+-  protected ContainerId getAMContainerId()
+-      throws BadClusterStateException {
+-    return ContainerId.newContainerId(ApplicationAttemptId
+-        .newInstance(ApplicationId.fromString(service.getId()), 1), 1);
+-  }
+-
+-  @Override
+-  protected Path getAppDir() {
+-    Path path = new Path(new Path("target", "apps"), service.getName());
+-    LOG.info("Service path: {}", path);
+-    return path;
+-  }
+-
+-  @Override
+-  protected ClientAMService createClientAMService() {
+-    return new ClientAMService(context) {
+-      @Override
+-      String getNMHostName() {
+-        return "0.0.0.0";
+-      }
+-    };
+-  }
+-
+-  @Override
+-  protected ServiceScheduler createServiceScheduler(ServiceContext context)
+-      throws IOException, YarnException {
+-    return new ServiceScheduler(context) {
+-
+-      @SuppressWarnings("SuspiciousMethodCalls")
+-      @Override
+-      protected YarnRegistryViewForProviders createYarnRegistryOperations(
+-          ServiceContext context, RegistryOperations registryClient) {
+-        YarnRegistryViewForProviders yarnRegistryView = mock(
+-            YarnRegistryViewForProviders.class);
+-        if (!registryComponents.isEmpty()) {
+-          try {
+-            when(yarnRegistryView.listComponents())
+-                .thenReturn(new LinkedList<>(registryComponents.keySet()));
+-            when(yarnRegistryView.getComponent(anyString())).thenAnswer(
+-                invocation ->
+-                    registryComponents.get(invocation.getArguments()[0]));
+-          } catch (IOException e) {
+-            throw new RuntimeException(e);
+-          }
+-        }
+-        return yarnRegistryView;
+-      }
+-
+-      @Override
+-      protected AMRMClientAsync<AMRMClient.ContainerRequest> createAMRMClient() {
+-        AMRMClientImpl client1 = new AMRMClientImpl() {
+-          @Override public AllocateResponse allocate(float progressIndicator)
+-              throws YarnException, IOException {
+-
+-            AllocateResponse.AllocateResponseBuilder builder =
+-                AllocateResponse.newBuilder();
+-            // add new containers if any
+-            synchronized (feedContainers) {
+-              if (feedContainers.isEmpty()) {
+-                LOG.info("Allocating........ no containers");
+-              } else {
+-                // The AMRMClient will return containers for compoenent that are
+-                // at FLEXING state
+-                List<Container> allocatedContainers = new LinkedList<>();
+-                Iterator<Container> itor = feedContainers.iterator();
+-                while (itor.hasNext()) {
+-                  Container c = itor.next();
+-                  org.apache.hadoop.yarn.service.component.Component component =
+-                      componentsById.get(c.getAllocationRequestId());
+-                  if (component.getState() == ComponentState.FLEXING) {
+-                    LOG.info("Allocated container {} ", c.getId());
+-                    allocatedContainers.add(c);
+-                    itor.remove();
+-                  }
+-                }
+-                builder.allocatedContainers(allocatedContainers);
+-              }
+-            }
+-
+-            // add recovered containers if any
+-            synchronized (recoveredContainers) {
+-              if (!recoveredContainers.isEmpty()) {
+-                List<Container> containersFromPrevAttempt = new LinkedList<>();
+-                containersFromPrevAttempt.addAll(recoveredContainers);
+-                recoveredContainers.clear();
+-                builder.containersFromPreviousAttempt(
+-                    containersFromPrevAttempt);
+-              }
+-            }
+-
+-            // add failed containers if any
+-            synchronized (failedContainers) {
+-              if (!failedContainers.isEmpty()) {
+-                List<ContainerStatus> failed =
+-                    new LinkedList<>(failedContainers);
+-                failedContainers.clear();
+-                builder.completedContainersStatuses(failed);
+-              }
+-            }
+-            return builder.build();
+-          }
+-
+-          @Override
+-          public RegisterApplicationMasterResponse registerApplicationMaster(
+-              String appHostName, int appHostPort, String appTrackingUrl,
+-              Map placementConstraintsMap) throws YarnException, IOException {
+-            return this.registerApplicationMaster(appHostName, appHostPort,
+-                appTrackingUrl);
+-          }
+-
+-          @Override
+-            public RegisterApplicationMasterResponse registerApplicationMaster(
+-                String appHostName, int appHostPort, String appTrackingUrl) {
+-            RegisterApplicationMasterResponse response = mock(
+-                RegisterApplicationMasterResponse.class);
+-            when(response.getResourceTypes()).thenReturn(
+-                ResourceUtils.getResourcesTypeInfo());
+-            return response;
+-          }
+-
+-          @Override
+-          public synchronized void releaseAssignedContainer(
+-              ContainerId containerId) {
+-            releasedContainers.add(containerId);
+-            super.releaseAssignedContainer(containerId);
+-          }
+-
+-          @Override public void unregisterApplicationMaster(
+-              FinalApplicationStatus appStatus, String appMessage,
+-              String appTrackingUrl) {
+-            // DO nothing
+-          }
+-        };
+-
+-        AMRMClientAsync<AMRMClient.ContainerRequest> amrmClientAsync =
+-            AMRMClientAsync.createAMRMClientAsync(client1, 1000,
+-                this.new AMRMClientCallback());
+-
+-        return amrmClientAsync;
+-      }
+-
+-      @SuppressWarnings("SuspiciousMethodCalls")
+-      @Override
+-      public NMClientAsync createNMClient() {
+-        NMClientAsync nmClientAsync = super.createNMClient();
+-        NMClient nmClient = mock(NMClient.class);
+-        try {
+-          when(nmClient.getContainerStatus(any(), any()))
+-              .thenAnswer(invocation ->
+-                  containerStatuses.get(invocation.getArguments()[0]));
+-        } catch (YarnException | IOException e) {
+-          throw new RuntimeException(e);
+-        }
+-        nmClientAsync.setClient(nmClient);
+-        return nmClientAsync;
+-      }
+-    };
+-  }
+-
+-  @Override protected void loadApplicationJson(ServiceContext context,
+-      SliderFileSystem fs) throws IOException {
+-    context.service = service;
+-  }
+-
+-  public void feedRegistryComponent(ContainerId containerId, String compName,
+-      String compInstName) {
+-    ServiceRecord record = new ServiceRecord();
+-    record.set(YarnRegistryAttributes.YARN_ID, containerId.toString());
+-    record.description = compInstName;
+-    record.set(YarnRegistryAttributes.YARN_PERSISTENCE,
+-        PersistencePolicies.CONTAINER);
+-    record.set(YarnRegistryAttributes.YARN_IP, "localhost");
+-    record.set(YarnRegistryAttributes.YARN_HOSTNAME, "localhost");
+-    record.set(YarnRegistryAttributes.YARN_COMPONENT, compName);
+-    registryComponents.put(RegistryPathUtils.encodeYarnID(
+-        containerId.toString()), record);
+-  }
+-
+-  /**
+-   * Simulates a recovered container that is sent to the AM in the heartbeat
+-   * response.
+-   *
+-   * @param containerId The ID for the container
+-   * @param compName    The component to which the recovered container is fed.
+-   */
+-  public void feedRecoveredContainer(ContainerId containerId, String compName) {
+-    Container container = createContainer(containerId, compName);
+-    recoveredContainers.add(container);
+-    addContainerStatus(container, ContainerState.RUNNING);
+-  }
+-
+-  /**
+-   * Creates a mock container and container ID and feeds to the component.
+-   * @param service The service for the component
+-   * @param id The id for the container
+-   * @param compName The component to which the container is fed
+-   * @return
+-   */
+-  public Container feedContainerToComp(Service service, int id,
+-      String compName) {
+-    ContainerId containerId = createContainerId(id);
+-    return feedContainerToComp(service, containerId, compName);
+-  }
+-
+-  /**
+-   * Feeds the container to the component.
+-   * @param service The service for the component
+-   * @param containerId container id
+-   * @param compName The component to which the container is fed
+-   * @return
+-   */
+-  public Container feedContainerToComp(Service service, ContainerId containerId,
+-      String compName) {
+-    Container container = createContainer(containerId, compName);
+-    synchronized (feedContainers) {
+-      feedContainers.add(container);
+-    }
+-    addContainerStatus(container, ContainerState.RUNNING);
+-    return container;
+-  }
+-
+-  public void feedFailedContainerToComp(Service service, int id, String
+-      compName) {
+-    ApplicationId applicationId = ApplicationId.fromString(service.getId());
+-    ContainerId containerId = ContainerId
+-        .newContainerId(ApplicationAttemptId.newInstance(applicationId, 1), id);
+-    ContainerStatus status = Records.newRecord(ContainerStatus.class);
+-    status.setContainerId(containerId);
+-    synchronized (failedContainers) {
+-      failedContainers.add(status);
+-    }
+-  }
+-
+-  public Container updateContainerStatus(Service service, int id,
+-      String compName, String host) {
+-    ContainerId containerId = createContainerId(id);
+-    Container container = createContainer(containerId, compName);
+-    addContainerStatus(container, ContainerState.RUNNING, host);
+-    return container;
+-  }
+-
+-  public ContainerId createContainerId(int id) {
+-    ApplicationId applicationId = ApplicationId.fromString(service.getId());
+-    return ContainerId.newContainerId(
+-        ApplicationAttemptId.newInstance(applicationId, 1), id);
+-  }
+-
+-  private Container createContainer(ContainerId containerId, String compName) {
+-    NodeId nodeId = NodeId.newInstance("localhost", 1234);
+-    Container container = Container.newInstance(
+-        containerId, nodeId, "localhost",
+-        Resource.newInstance(100, 1),
+-        Priority.newInstance(0), null);
+-    long allocateId =
+-        context.scheduler.getAllComponents().get(compName).getAllocateId();
+-    container.setAllocationRequestId(allocateId);
+-    return container;
+-  }
+-
+-  public void flexComponent(String compName, long numberOfContainers)
+-      throws IOException {
+-    ClientAMProtocol.ComponentCountProto componentCountProto =
+-        ClientAMProtocol.ComponentCountProto.newBuilder().setName(compName)
+-            .setNumberOfContainers(numberOfContainers).build();
+-    ClientAMProtocol.FlexComponentsRequestProto requestProto =
+-        ClientAMProtocol.FlexComponentsRequestProto.newBuilder()
+-            .addComponents(componentCountProto).build();
+-    context.clientAMService.flexComponents(requestProto);
+-  }
+-
+-  public Component getComponent(String compName) {
+-    return context.scheduler.getAllComponents().get(compName);
+-  }
+-
+-  public void waitForDependenciesSatisfied(String compName)
+-      throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-      @Override public Boolean get() {
+-        return context.scheduler.getAllComponents().get(compName)
+-            .areDependenciesReady();
+-      }
+-    }, 1000, 20000);
+-  }
+-
+-  public void waitForNumDesiredContainers(String compName,
+-      int numDesiredContainers) throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-      @Override public Boolean get() {
+-        return context.scheduler.getAllComponents().get(compName)
+-            .getNumDesiredInstances() == numDesiredContainers;
+-      }
+-    }, 1000, 20000);
+-  }
+-
+-
+-  public ComponentInstance getCompInstance(String compName, String
+-      instanceName) {
+-    return context.scheduler.getAllComponents().get(compName)
+-        .getComponentInstance(instanceName);
+-  }
+-
+-  public void waitForCompInstanceState(ComponentInstance instance,
+-      ComponentInstanceState state)
+-      throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-      @Override
+-      public Boolean get() {
+-        return instance.getState().equals(state);
+-      }
+-    }, 1000, 20000);
+-  }
+-
+-  private void addContainerStatus(Container container, ContainerState state) {
+-    addContainerStatus(container, state, container.getNodeId().getHost());
+-  }
+-
+-  private void addContainerStatus(Container container, ContainerState state,
+-      String host) {
+-    ContainerStatus status = ContainerStatus.newInstance(container.getId(),
+-        state, "", 0);
+-    status.setHost(host);
+-    status.setIPs(Lists.newArrayList(host));
+-    containerStatuses.put(container.getId(), status);
+-  }
+-
+-  @Override
+-  protected ByteBuffer recordTokensForContainers()
+-      throws IOException {
+-    DataOutputBuffer dob = new DataOutputBuffer();
+-    if (amCreds == null) {
+-      return ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-    }
+-    try {
+-      amCreds.writeTokenStorageToStream(dob);
+-    } finally {
+-      dob.close();
+-    }
+-    return ByteBuffer.wrap(dob.getData(), 0, dob.getLength());
+-  }
+-
+-  /**
+-   * Waits for the container to get released
+-   * @param containerId           ContainerId
+-   */
+-  public void waitForContainerToRelease(ContainerId containerId)
+-      throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(() -> releasedContainers.contains(containerId),
+-        1000, 30000);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java
+deleted file mode 100644
+index b5ce0f17ac9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/ServiceTestUtils.java
++++ /dev/null
+@@ -1,584 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+-import org.apache.hadoop.thirdparty.com.google.common.base.Throwables;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.curator.test.TestingCluster;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.http.HttpServer2;
+-import org.apache.hadoop.registry.client.impl.zk.CuratorService;
+-import org.apache.hadoop.service.ServiceOperations;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.utils.JsonSerDeser;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.apache.hadoop.yarn.util.LinuxResourceCalculatorPlugin;
+-import org.apache.hadoop.yarn.util.ProcfsBasedProcessTree;
+-import org.junit.rules.TestWatcher;
+-import org.junit.runner.Description;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.FileOutputStream;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.net.URL;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.apache.hadoop.registry.client.api.RegistryConstants.KEY_REGISTRY_ZK_QUORUM;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.NM_PMEM_CHECK_ENABLED;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.NM_VMEM_CHECK_ENABLED;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.TIMELINE_SERVICE_ENABLED;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.AM_RESOURCE_MEM;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.YARN_SERVICE_BASE_PATH;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConstants
+-    .CONTAINER_STATE_REPORT_AS_SERVICE_STATE;
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-public class ServiceTestUtils {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ServiceTestUtils.class);
+-
+-  private MiniYARNCluster yarnCluster = null;
+-  private MiniDFSCluster hdfsCluster = null;
+-  private TestingCluster zkCluster;
+-  private CuratorService curatorService;
+-  private FileSystem fs = null;
+-  private Configuration conf = null;
+-  public static final int NUM_NMS = 1;
+-  private File basedir;
+-
+-  public static final JsonSerDeser<Service> JSON_SER_DESER =
+-      new JsonSerDeser<>(Service.class,
+-          PropertyNamingStrategies.SNAKE_CASE);
+-
+-  // Example service definition
+-  // 2 components, each of which has 2 containers.
+-  public static Service createExampleApplication() {
+-    Service exampleApp = new Service();
+-    exampleApp.setName("example-app");
+-    exampleApp.setVersion("v1");
+-    exampleApp.addComponent(createComponent("compa"));
+-    exampleApp.addComponent(createComponent("compb"));
+-    return exampleApp;
+-  }
+-
+-  // Example service definition
+-  // 2 components, each of which has 2 containers.
+-  public static Service createTerminatingJobExample(String serviceName) {
+-    Service exampleApp = new Service();
+-    exampleApp.setName(serviceName);
+-    exampleApp.setVersion("v1");
+-    exampleApp.addComponent(
+-        createComponent("terminating-comp1", 2, "sleep 1000",
+-            Component.RestartPolicyEnum.NEVER, null));
+-    exampleApp.addComponent(
+-        createComponent("terminating-comp2", 2, "sleep 1000",
+-            Component.RestartPolicyEnum.ON_FAILURE, null));
+-    exampleApp.addComponent(
+-        createComponent("terminating-comp3", 2, "sleep 1000",
+-            Component.RestartPolicyEnum.ON_FAILURE, null));
+-
+-    return exampleApp;
+-  }
+-
+-  public static Service createTerminatingDominantComponentJobExample(
+-      String serviceName) {
+-    Service exampleApp = new Service();
+-    exampleApp.setName(serviceName);
+-    exampleApp.setVersion("v1");
+-    Component serviceStateComponent = createComponent("terminating-comp1", 2,
+-        "sleep 1000", Component.RestartPolicyEnum.NEVER, null);
+-    serviceStateComponent.getConfiguration().setProperty(
+-        CONTAINER_STATE_REPORT_AS_SERVICE_STATE, "true");
+-    exampleApp.addComponent(serviceStateComponent);
+-    exampleApp.addComponent(
+-        createComponent("terminating-comp2", 2, "sleep 60000",
+-            Component.RestartPolicyEnum.ON_FAILURE, null));
+-
+-    return exampleApp;
+-  }
+-
+-  public static Component createComponent(String name) {
+-    return createComponent(name, 2L, "sleep 1000",
+-        Component.RestartPolicyEnum.ALWAYS, null);
+-  }
+-
+-  protected static Component createComponent(String name, long numContainers,
+-      String command) {
+-    Component comp1 = new Component();
+-    comp1.setNumberOfContainers(numContainers);
+-    comp1.setLaunchCommand(command);
+-    comp1.setName(name);
+-    Resource resource = new Resource();
+-    comp1.setResource(resource);
+-    resource.setMemory("128");
+-    resource.setCpus(1);
+-    return comp1;
+-  }
+-
+-  protected static Component createComponent(String name, long numContainers,
+-      String command, Component.RestartPolicyEnum restartPolicyEnum,
+-      List<String> dependencies) {
+-    Component comp = createComponent(name, numContainers, command);
+-    comp.setRestartPolicy(restartPolicyEnum);
+-
+-    if (dependencies != null) {
+-      comp.dependencies(dependencies);
+-    }
+-    return comp;
+-  }
+-
+-  public static SliderFileSystem initMockFs() throws IOException {
+-    return initMockFs(null);
+-  }
+-
+-  public static SliderFileSystem initMockFs(Service ext) throws IOException {
+-    SliderFileSystem sfs = mock(SliderFileSystem.class);
+-    FileSystem mockFs = mock(FileSystem.class);
+-    JsonSerDeser<Service> jsonSerDeser = mock(JsonSerDeser.class);
+-    when(sfs.getFileSystem()).thenReturn(mockFs);
+-    when(sfs.buildClusterDirPath(any())).thenReturn(
+-        new Path("cluster_dir_path"));
+-    if (ext != null) {
+-      when(jsonSerDeser.load(any(), any())).thenReturn(ext);
+-    }
+-    ServiceApiUtil.setJsonSerDeser(jsonSerDeser);
+-    return sfs;
+-  }
+-
+-  protected void setConf(YarnConfiguration conf) {
+-    this.conf = conf;
+-  }
+-
+-  protected Configuration getConf() {
+-    return conf;
+-  }
+-
+-  protected FileSystem getFS() {
+-    return fs;
+-  }
+-
+-  protected MiniYARNCluster getYarnCluster() {
+-    return yarnCluster;
+-  }
+-
+-  protected void setupInternal(int numNodeManager)
+-      throws Exception {
+-    LOG.info("Starting up YARN cluster");
+-    if (conf == null) {
+-      setConf(new YarnConfiguration());
+-      conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, false);
+-      conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_USE_RPC, false);
+-      conf.setInt(YarnConfiguration.RM_MAX_COMPLETED_APPLICATIONS,
+-          YarnConfiguration.DEFAULT_RM_MAX_COMPLETED_APPLICATIONS);
+-    }
+-    conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128);
+-    // reduce the teardown waiting time
+-    conf.setLong(YarnConfiguration.DISPATCHER_DRAIN_EVENTS_TIMEOUT, 1000);
+-    conf.set("yarn.log.dir", "target");
+-    // mark if we need to launch the v1 timeline server
+-    // disable aux-service based timeline aggregators
+-    conf.set(YarnConfiguration.NM_AUX_SERVICES, "");
+-    conf.set(YarnConfiguration.NM_VMEM_PMEM_RATIO, "8");
+-    // Enable ContainersMonitorImpl
+-    conf.set(YarnConfiguration.NM_CONTAINER_MON_RESOURCE_CALCULATOR,
+-        LinuxResourceCalculatorPlugin.class.getName());
+-    conf.set(YarnConfiguration.NM_CONTAINER_MON_PROCESS_TREE,
+-        ProcfsBasedProcessTree.class.getName());
+-    conf.setBoolean(
+-        YarnConfiguration.YARN_MINICLUSTER_CONTROL_RESOURCE_MONITORING, true);
+-    conf.setBoolean(TIMELINE_SERVICE_ENABLED, false);
+-    conf.setInt(YarnConfiguration.NM_MAX_PER_DISK_UTILIZATION_PERCENTAGE, 100);
+-    conf.setLong(DEBUG_NM_DELETE_DELAY_SEC, 60000);
+-    conf.setLong(AM_RESOURCE_MEM, 526);
+-    conf.setLong(YarnServiceConf.READINESS_CHECK_INTERVAL, 5);
+-    // Disable vmem check to disallow NM killing the container
+-    conf.setBoolean(NM_VMEM_CHECK_ENABLED, false);
+-    conf.setBoolean(NM_PMEM_CHECK_ENABLED, false);
+-    // set auth filters
+-    conf.set(HttpServer2.FILTER_INITIALIZER_PROPERTY,
+-        "org.apache.hadoop.security.AuthenticationFilterInitializer,"
+-            + "org.apache.hadoop.security.HttpCrossOriginFilterInitializer");
+-    // setup zk cluster
+-    zkCluster = new TestingCluster(1);
+-    zkCluster.start();
+-    conf.set(YarnConfiguration.RM_ZK_ADDRESS, zkCluster.getConnectString());
+-    conf.set(KEY_REGISTRY_ZK_QUORUM, zkCluster.getConnectString());
+-    LOG.info("ZK cluster: " + zkCluster.getConnectString());
+-
+-    curatorService = new CuratorService("testCuratorService");
+-    curatorService.init(conf);
+-    curatorService.start();
+-
+-    fs = FileSystem.get(conf);
+-    basedir = new File("target", "apps");
+-    if (basedir.exists()) {
+-      FileUtils.deleteDirectory(basedir);
+-    } else {
+-      basedir.mkdirs();
+-    }
+-
+-    conf.set(YARN_SERVICE_BASE_PATH, basedir.getAbsolutePath());
+-
+-    if (yarnCluster == null) {
+-      yarnCluster =
+-          new MiniYARNCluster(this.getClass().getSimpleName(), 1,
+-              numNodeManager, 1, 1);
+-      yarnCluster.init(conf);
+-      yarnCluster.start();
+-
+-      waitForNMsToRegister();
+-
+-      URL url = Thread.currentThread().getContextClassLoader()
+-          .getResource("yarn-site.xml");
+-      if (url == null) {
+-        throw new RuntimeException(
+-            "Could not find 'yarn-site.xml' dummy file in classpath");
+-      }
+-      Configuration yarnClusterConfig = yarnCluster.getConfig();
+-      yarnClusterConfig.set(YarnConfiguration.YARN_APPLICATION_CLASSPATH,
+-          new File(url.getPath()).getParent());
+-      //write the document to a buffer (not directly to the file, as that
+-      //can cause the file being written to get read -which will then fail.
+-      ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+-      yarnClusterConfig.writeXml(bytesOut);
+-      bytesOut.close();
+-      //write the bytes to the file in the classpath
+-      OutputStream os = new FileOutputStream(new File(url.getPath()));
+-      os.write(bytesOut.toByteArray());
+-      os.close();
+-      LOG.info("Write yarn-site.xml configs to: " + url);
+-    }
+-    if (hdfsCluster == null) {
+-      HdfsConfiguration hdfsConfig = new HdfsConfiguration();
+-      hdfsCluster = new MiniDFSCluster.Builder(hdfsConfig)
+-          .numDataNodes(1).build();
+-    }
+-
+-    try {
+-      Thread.sleep(2000);
+-    } catch (InterruptedException e) {
+-      LOG.info("setup thread sleep interrupted. message=" + e.getMessage());
+-    }
+-  }
+-
+-  public void shutdown() throws IOException {
+-    if (yarnCluster != null) {
+-      try {
+-        yarnCluster.stop();
+-      } finally {
+-        yarnCluster = null;
+-      }
+-    }
+-    if (hdfsCluster != null) {
+-      try {
+-        hdfsCluster.shutdown();
+-      } finally {
+-        hdfsCluster = null;
+-      }
+-    }
+-    if (curatorService != null) {
+-      ServiceOperations.stop(curatorService);
+-    }
+-    if (zkCluster != null) {
+-      zkCluster.stop();
+-    }
+-    if (basedir != null) {
+-      FileUtils.deleteDirectory(basedir);
+-    }
+-    SliderFileSystem sfs = new SliderFileSystem(conf);
+-    Path appDir = sfs.getBaseApplicationPath();
+-    sfs.getFileSystem().delete(appDir, true);
+-  }
+-
+-  private void waitForNMsToRegister() throws Exception {
+-    int sec = 60;
+-    while (sec >= 0) {
+-      if (yarnCluster.getResourceManager().getRMContext().getRMNodes().size()
+-          >= NUM_NMS) {
+-        break;
+-      }
+-      Thread.sleep(1000);
+-      sec--;
+-    }
+-  }
+-
+-  /**
+-   * Creates a {@link ServiceClient} for test purposes.
+-   */
+-  public static ServiceClient createClient(Configuration conf)
+-      throws Exception {
+-    ServiceClient client = new ServiceClient() {
+-      @Override
+-      protected Path addJarResource(String appName,
+-          Map<String, LocalResource> localResources)
+-          throws IOException, SliderException {
+-        // do nothing, the Unit test will use local jars
+-        return null;
+-      }
+-    };
+-    client.init(conf);
+-    client.start();
+-    return client;
+-  }
+-
+-  public static ServiceManager createServiceManager(ServiceContext context) {
+-    ServiceManager serviceManager = new ServiceManager(context);
+-    context.setServiceManager(serviceManager);
+-    return serviceManager;
+-  }
+-
+-  /**
+-   * Creates a YarnClient for test purposes.
+-   */
+-  public static YarnClient createYarnClient(Configuration conf) {
+-    YarnClient client = YarnClient.createYarnClient();
+-    client.init(conf);
+-    client.start();
+-    return client;
+-  }
+-
+-  protected CuratorService getCuratorService() throws IOException {
+-    return curatorService;
+-  }
+-
+-  /**
+-   * Watcher to initialize yarn service base path under target and deletes the
+-   * the test directory when finishes.
+-   */
+-  public static class ServiceFSWatcher extends TestWatcher {
+-    private YarnConfiguration conf;
+-    private SliderFileSystem fs;
+-    private java.nio.file.Path serviceBasePath;
+-
+-    @Override
+-    protected void starting(Description description) {
+-      conf = new YarnConfiguration();
+-      delete(description);
+-      serviceBasePath = Paths.get("target",
+-          description.getClassName(), description.getMethodName());
+-      conf.set(YARN_SERVICE_BASE_PATH, serviceBasePath.toString());
+-      try {
+-        Files.createDirectories(serviceBasePath);
+-        fs = new SliderFileSystem(conf);
+-        fs.setAppDir(new Path(serviceBasePath.toString()));
+-      } catch (IOException e) {
+-        Throwables.throwIfUnchecked(e);
+-        throw new RuntimeException(e);
+-      }
+-    }
+-
+-    @Override
+-    protected void finished(Description description) {
+-      delete(description);
+-    }
+-
+-    private void delete(Description description) {
+-      FileUtils.deleteQuietly(Paths.get("target",
+-          description.getClassName()).toFile());
+-    }
+-
+-    /**
+-     * Returns the yarn conf.
+-     */
+-    public YarnConfiguration getConf() {
+-      return conf;
+-    }
+-
+-    /**
+-     * Returns the file system.
+-     */
+-    public SliderFileSystem getFs() {
+-      return fs;
+-    }
+-
+-    /**
+-     * Returns the test service base path.
+-     */
+-    public java.nio.file.Path getServiceBasePath() {
+-      return serviceBasePath;
+-    }
+-  }
+-
+-  /**
+-   * Wait until all the containers for all components become ready state.
+-   *
+-   * @param client
+-   * @param exampleApp
+-   * @return all ready containers of a service.
+-   * @throws TimeoutException
+-   * @throws InterruptedException
+-   */
+-  protected Multimap<String, String> waitForAllCompToBeReady(ServiceClient
+-      client, Service exampleApp) throws TimeoutException,
+-      InterruptedException {
+-    int expectedTotalContainers = countTotalContainers(exampleApp);
+-
+-    Multimap<String, String> allContainers = HashMultimap.create();
+-
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        Service retrievedApp = client.getStatus(exampleApp.getName());
+-        int totalReadyContainers = 0;
+-        allContainers.clear();
+-        LOG.info("Num Components " + retrievedApp.getComponents().size());
+-        for (Component component : retrievedApp.getComponents()) {
+-          LOG.info("looking for  " + component.getName());
+-          LOG.info(component.toString());
+-          if (component.getContainers() != null) {
+-            if (component.getContainers().size() == exampleApp
+-                .getComponent(component.getName()).getNumberOfContainers()) {
+-              for (Container container : component.getContainers()) {
+-                LOG.info(
+-                    "Container state " + container.getState() + ", component "
+-                        + component.getName());
+-                if (container.getState() == ContainerState.READY) {
+-                  totalReadyContainers++;
+-                  allContainers.put(component.getName(), container.getId());
+-                  LOG.info("Found 1 ready container " + container.getId());
+-                }
+-              }
+-            } else {
+-              LOG.info(component.getName() + " Expected number of containers "
+-                  + exampleApp.getComponent(component.getName())
+-                  .getNumberOfContainers() + ", current = " + component
+-                  .getContainers());
+-            }
+-          }
+-        }
+-        LOG.info("Exit loop, totalReadyContainers= " + totalReadyContainers
+-            + " expected = " + expectedTotalContainers);
+-        return totalReadyContainers == expectedTotalContainers;
+-      } catch (Exception e) {
+-        e.printStackTrace();
+-        return false;
+-      }
+-    }, 2000, 200000);
+-    return allContainers;
+-  }
+-
+-  /**
+-   * Wait until service state becomes stable. A service is stable when all
+-   * requested containers of all components are running and in ready state.
+-   *
+-   * @param client
+-   * @param exampleApp
+-   * @throws TimeoutException
+-   * @throws InterruptedException
+-   */
+-  protected void waitForServiceToBeStable(ServiceClient client,
+-      Service exampleApp) throws TimeoutException, InterruptedException {
+-    waitForServiceToBeStable(client, exampleApp, 200000);
+-  }
+-
+-  protected void waitForServiceToBeStable(ServiceClient client,
+-      Service exampleApp, int waitForMillis)
+-      throws TimeoutException, InterruptedException {
+-    waitForServiceToBeInState(client, exampleApp, ServiceState.STABLE,
+-        waitForMillis);
+-  }
+-
+-  /**
+-   * Wait until service is started. It does not have to reach a stable state.
+-   *
+-   * @param client
+-   * @param exampleApp
+-   * @throws TimeoutException
+-   * @throws InterruptedException
+-   */
+-  protected void waitForServiceToBeStarted(ServiceClient client,
+-      Service exampleApp) throws TimeoutException, InterruptedException {
+-    waitForServiceToBeInState(client, exampleApp, ServiceState.STARTED);
+-  }
+-
+-  protected void waitForServiceToBeExpressUpgrading(ServiceClient client,
+-      Service exampleApp) throws TimeoutException, InterruptedException {
+-    waitForServiceToBeInState(client, exampleApp,
+-        ServiceState.EXPRESS_UPGRADING);
+-  }
+-
+-  protected void waitForServiceToBeInState(ServiceClient client,
+-      Service exampleApp, ServiceState desiredState) throws TimeoutException,
+-      InterruptedException {
+-    waitForServiceToBeInState(client, exampleApp, desiredState, 200000);
+-  }
+-
+-  /**
+-   * Wait until service is started. It does not have to reach a stable state.
+-   *
+-   * @param client
+-   * @param exampleApp
+-   * @throws TimeoutException
+-   * @throws InterruptedException
+-   */
+-  protected void waitForServiceToBeInState(ServiceClient client,
+-      Service exampleApp, ServiceState desiredState, int waitForMillis) throws
+-      TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        Service retrievedApp = client.getStatus(exampleApp.getName());
+-        return retrievedApp.getState() == desiredState;
+-      } catch (Exception e) {
+-        e.printStackTrace();
+-        return false;
+-      }
+-    }, 2000, waitForMillis);
+-  }
+-
+-  private int countTotalContainers(Service service) {
+-    int totalContainers = 0;
+-    for (Component component : service.getComponents()) {
+-      totalContainers += component.getNumberOfContainers();
+-    }
+-    return totalContainers;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java
+deleted file mode 100644
+index 012f204239b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestDefaultUpgradeComponentsFinder.java
++++ /dev/null
+@@ -1,123 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import java.util.*;
+-
+-import static org.junit.Assert.assertEquals;
+-
+-/**
+- * Tests for {@link UpgradeComponentsFinder.DefaultUpgradeComponentsFinder}.
+- */
+-public class TestDefaultUpgradeComponentsFinder {
+-
+-  private UpgradeComponentsFinder.DefaultUpgradeComponentsFinder finder =
+-      new UpgradeComponentsFinder.DefaultUpgradeComponentsFinder();
+-
+-  @Test
+-  public void testServiceArtifactChange() {
+-    Service currentDef = ServiceTestUtils.createExampleApplication();
+-    Service targetDef =  ServiceTestUtils.createExampleApplication();
+-    targetDef.getComponents().forEach(x -> x.setArtifact(
+-        TestServiceManager.createTestArtifact("v1")));
+-
+-    assertEquals("all components need upgrade",
+-        targetDef.getComponents(), finder.findTargetComponentSpecs(currentDef,
+-            targetDef));
+-  }
+-
+-  @Test
+-  public void testServiceUpgradeWithNewComponentAddition() {
+-    Service currentDef = ServiceTestUtils.createExampleApplication();
+-    Service targetDef = ServiceTestUtils.createExampleApplication();
+-    Iterator<Component> targetComponentsIter =
+-        targetDef.getComponents().iterator();
+-    Component firstComponent = targetComponentsIter.next();
+-    firstComponent.setName("newComponentA");
+-
+-    try {
+-      finder.findTargetComponentSpecs(currentDef, targetDef);
+-      Assert.fail("Expected error since component does not exist in service "
+-          + "definition");
+-    } catch (UnsupportedOperationException usoe) {
+-      assertEquals(
+-          "addition/deletion of components not supported by upgrade. Could "
+-              + "not find component newComponentA in current service "
+-              + "definition.",
+-          usoe.getMessage());
+-      //Expected
+-    }
+-  }
+-
+-  @Test
+-  public void testComponentArtifactChange() {
+-    Service currentDef = TestServiceManager.createBaseDef("test");
+-    Service targetDef =  TestServiceManager.createBaseDef("test");
+-
+-    targetDef.getComponents().get(0).setArtifact(
+-        TestServiceManager.createTestArtifact("v2"));
+-
+-    List<Component> expected = new ArrayList<>();
+-    expected.add(targetDef.getComponents().get(0));
+-
+-    assertEquals("single components needs upgrade",
+-        expected, finder.findTargetComponentSpecs(currentDef,
+-            targetDef));
+-  }
+-
+-  @Test
+-  public void testChangeInConfigFileProperty() {
+-    ConfigFile file = new ConfigFile().srcFile("src").destFile("dest")
+-        .type(ConfigFile.TypeEnum.HADOOP_XML);
+-
+-    Map<String, String> props = new HashMap<>();
+-    props.put("k1", "v1");
+-    file.setProperties(props);
+-
+-    Configuration conf = new Configuration().files(Lists.newArrayList(file));
+-
+-    Service currentDef = TestServiceManager.createBaseDef("test");
+-    currentDef.setConfiguration(conf);
+-
+-    // new spec has changes in config file property
+-    file = new ConfigFile().srcFile("src").destFile("dest")
+-        .type(ConfigFile.TypeEnum.HADOOP_XML);
+-    Map<String, String> changedProps = new HashMap<>();
+-    changedProps.put("k1", "v2");
+-    file.setProperties(changedProps);
+-
+-    conf = new Configuration().files(Lists.newArrayList(file));
+-
+-    Service targetDef =  TestServiceManager.createBaseDef("test");
+-    targetDef.setConfiguration(conf);
+-
+-    List<Component> expected = new ArrayList<>();
+-    expected.addAll(targetDef.getComponents());
+-
+-    assertEquals("all components needs upgrade",
+-        expected, finder.findTargetComponentSpecs(currentDef, targetDef));
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java
+deleted file mode 100644
+index 69c0c2cee57..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java
++++ /dev/null
+@@ -1,607 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
+-import org.apache.commons.io.FileUtils;
+-import org.apache.curator.test.TestingCluster;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.security.Credentials;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.security.token.TokenIdentifier;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.protocolrecords.ResourceTypes;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
+-import org.apache.hadoop.yarn.client.api.AMRMClient;
+-import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.event.Event;
+-import org.apache.hadoop.yarn.event.EventHandler;
+-import org.apache.hadoop.yarn.security.DockerCredentialTokenIdentifier;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.ComponentState;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceState;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.util.DockerClientConfigHandler;
+-import org.apache.hadoop.yarn.util.resource.ResourceUtils;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.mockito.Mockito;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.BufferedWriter;
+-import java.io.File;
+-import java.io.FileWriter;
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.List;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.apache.hadoop.registry.client.api.RegistryConstants.KEY_REGISTRY_ZK_QUORUM;
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.times;
+-import static org.mockito.Mockito.verify;
+-
+-public class TestServiceAM extends ServiceTestUtils{
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestServiceAM.class);
+-
+-  private File basedir;
+-  YarnConfiguration conf = new YarnConfiguration();
+-  TestingCluster zkCluster;
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Before
+-  public void setup() throws Exception {
+-    basedir = new File("target", "apps");
+-    if (basedir.exists()) {
+-      FileUtils.deleteDirectory(basedir);
+-    } else {
+-      basedir.mkdirs();
+-    }
+-    zkCluster = new TestingCluster(1);
+-    zkCluster.start();
+-    conf.set(KEY_REGISTRY_ZK_QUORUM, zkCluster.getConnectString());
+-    LOG.info("ZK cluster: {}", zkCluster.getConnectString());
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    if (basedir != null) {
+-      FileUtils.deleteDirectory(basedir);
+-    }
+-    if (zkCluster != null) {
+-      zkCluster.stop();
+-    }
+-  }
+-
+-  // Race condition YARN-7486
+-  // 1. Allocate 1 container to compa and wait it to be started
+-  // 2. Fail this container, and in the meanwhile allocate the 2nd container.
+-  // 3. The 2nd container should not be assigned to compa-0 instance, because
+-  //   the compa-0 instance is not stopped yet.
+-  // 4. check compa still has the instance in the pending list.
+-  @Test
+-  public void testContainerCompleted() throws TimeoutException,
+-      InterruptedException {
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setVersion("v1");
+-    exampleApp.setName("testContainerCompleted");
+-    exampleApp.addComponent(createComponent("compa", 1, "pwd"));
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    ComponentInstance compa0 = am.getCompInstance("compa", "compa-0");
+-    // allocate a container
+-    am.feedContainerToComp(exampleApp, 1, "compa");
+-    am.waitForCompInstanceState(compa0, ComponentInstanceState.STARTED);
+-
+-    LOG.info("Fail the container 1");
+-    // fail the container
+-    am.feedFailedContainerToComp(exampleApp, 1, "compa");
+-
+-    // allocate the second container immediately, this container will not be
+-    // assigned to comp instance
+-    // because the instance is not yet added to the pending list.
+-    am.feedContainerToComp(exampleApp, 2, "compa");
+-
+-    am.waitForCompInstanceState(compa0, ComponentInstanceState.INIT);
+-    // still 1 pending instance
+-    Assert.assertEquals(1,
+-        am.getComponent("compa").getPendingInstances().size());
+-    am.stop();
+-  }
+-
+-  // Test to verify that the containers of previous attempt are not prematurely
+-  // released. These containers are sent by the RM to the AM in the
+-  // heartbeat response.
+-  @Test(timeout = 200000)
+-  public void testContainersFromPreviousAttemptsWithRMRestart()
+-      throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setVersion("v1");
+-    exampleApp.setName("testContainersRecovers");
+-    String comp1Name = "comp1";
+-    String comp1InstName = "comp1-0";
+-
+-    org.apache.hadoop.yarn.service.api.records.Component compA =
+-        createComponent(comp1Name, 1, "sleep");
+-    exampleApp.addComponent(compA);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    ContainerId containerId = am.createContainerId(1);
+-    am.feedRegistryComponent(containerId, comp1Name, comp1InstName);
+-    am.init(conf);
+-    am.start();
+-
+-    ComponentInstance comp10 = am.getCompInstance(comp1Name, comp1InstName);
+-    am.feedRecoveredContainer(containerId, comp1Name);
+-    am.waitForCompInstanceState(comp10, ComponentInstanceState.STARTED);
+-
+-    // 0 pending instance
+-    Assert.assertEquals(0,
+-        am.getComponent(comp1Name).getPendingInstances().size());
+-
+-    GenericTestUtils.waitFor(() -> am.getCompInstance(comp1Name, comp1InstName)
+-        .getContainerStatus() != null, 2000, 200000);
+-
+-    Assert.assertEquals("container state",
+-        org.apache.hadoop.yarn.api.records.ContainerState.RUNNING,
+-        am.getCompInstance(comp1Name, comp1InstName).getContainerStatus()
+-            .getState());
+-    am.stop();
+-  }
+-
+-  // Test to verify that the containers of previous attempt are released and the
+-  // component instance is added to the pending queue when the recovery wait
+-  // time interval elapses.
+-  @Test(timeout = 200000)
+-  public void testContainersReleasedWhenExpired()
+-      throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testContainersRecovers");
+-    exampleApp.setVersion("v1");
+-    String comp1Name = "comp1";
+-    String comp1InstName = "comp1-0";
+-
+-    org.apache.hadoop.yarn.service.api.records.Component compA =
+-        createComponent(comp1Name, 1, "sleep");
+-    exampleApp.addComponent(compA);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    ContainerId containerId = am.createContainerId(1);
+-    am.feedRegistryComponent(containerId, comp1Name, comp1InstName);
+-    conf.setLong(YarnServiceConf.CONTAINER_RECOVERY_TIMEOUT_MS, 10);
+-    am.init(conf);
+-    am.start();
+-    Thread.sleep(100);
+-    GenericTestUtils.waitFor(() -> am.getComponent(comp1Name).getState()
+-        .equals(ComponentState.FLEXING), 100, 2000);
+-
+-    // 1 pending instance
+-    Assert.assertEquals(1, am.getComponent(comp1Name).getPendingInstances()
+-        .size());
+-
+-    am.feedContainerToComp(exampleApp, 2, comp1Name);
+-
+-    GenericTestUtils.waitFor(() -> am.getCompInstance(comp1Name, comp1InstName)
+-        .getContainerStatus() != null, 2000, 200000);
+-    Assert.assertEquals("container state",
+-        org.apache.hadoop.yarn.api.records.ContainerState.RUNNING,
+-        am.getCompInstance(comp1Name, comp1InstName).getContainerStatus()
+-            .getState());
+-  }
+-
+-  // Test to verify that the AM doesn't wait for containers of a different app
+-  // even though it corresponds to the same service.
+-  @Test(timeout = 200000)
+-  public void testContainersFromDifferentApp()
+-      throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testContainersFromDifferentApp");
+-    exampleApp.setVersion("v1");
+-    String comp1Name = "comp1";
+-    String comp1InstName = "comp1-0";
+-
+-    org.apache.hadoop.yarn.service.api.records.Component compA =
+-        createComponent(comp1Name, 1, "sleep");
+-    exampleApp.addComponent(compA);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    ContainerId containerId = am.createContainerId(1);
+-    // saves the container in the registry
+-    am.feedRegistryComponent(containerId, comp1Name, comp1InstName);
+-
+-    ApplicationId changedAppId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 2);
+-    exampleApp.setId(changedAppId.toString());
+-    am.init(conf);
+-    am.start();
+-    // 1 pending instance since the container in registry belongs to a different
+-    // app.
+-    Assert.assertEquals(1,
+-        am.getComponent(comp1Name).getPendingInstances().size());
+-
+-    am.feedContainerToComp(exampleApp, 1, comp1Name);
+-    GenericTestUtils.waitFor(() -> am.getCompInstance(comp1Name, comp1InstName)
+-        .getContainerStatus() != null, 2000, 200000);
+-
+-    Assert.assertEquals("container state",
+-        org.apache.hadoop.yarn.api.records.ContainerState.RUNNING,
+-        am.getCompInstance(comp1Name, comp1InstName).getContainerStatus()
+-            .getState());
+-    am.stop();
+-  }
+-
+-  @Test
+-  public void testScheduleWithMultipleResourceTypes()
+-      throws TimeoutException, InterruptedException, IOException {
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testScheduleWithMultipleResourceTypes");
+-    exampleApp.setVersion("v1");
+-
+-    List<ResourceTypeInfo> resourceTypeInfos = new ArrayList<>(
+-        ResourceUtils.getResourcesTypeInfo());
+-    // Add 3rd resource type.
+-    resourceTypeInfos.add(ResourceTypeInfo
+-        .newInstance("resource-1", "", ResourceTypes.COUNTABLE));
+-    // Reinitialize resource types
+-    ResourceUtils.reinitializeResources(resourceTypeInfos);
+-
+-    Component serviceCompoent = createComponent("compa", 1, "pwd");
+-    serviceCompoent.getResource().setResourceInformations(ImmutableMap
+-        .of("resource-1", new ResourceInformation().value(3333L).unit("Gi")));
+-    exampleApp.addComponent(serviceCompoent);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    ServiceScheduler serviceScheduler = am.context.scheduler;
+-    AMRMClientAsync<AMRMClient.ContainerRequest> amrmClientAsync =
+-        serviceScheduler.getAmRMClient();
+-
+-    Collection<AMRMClient.ContainerRequest> rr =
+-        amrmClientAsync.getMatchingRequests(0);
+-    Assert.assertEquals(1, rr.size());
+-
+-    org.apache.hadoop.yarn.api.records.Resource capability =
+-        rr.iterator().next().getCapability();
+-    Assert.assertEquals(3333L, capability.getResourceValue("resource-1"));
+-    Assert.assertEquals("Gi",
+-        capability.getResourceInformation("resource-1").getUnits());
+-
+-    am.stop();
+-  }
+-
+-  @Test
+-  public void testContainerCompletedEventProcessed() throws Exception {
+-    ServiceContext context = createServiceContext("abc");
+-    MockServiceScheduler scheduler = new MockServiceScheduler(context);
+-    scheduler.init(conf);
+-    ApplicationId appId = ApplicationId.newInstance(0, 0);
+-    ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId,
+-        1);
+-    ContainerId containerId1 = ContainerId.newContainerId(appAttemptId, 0);
+-    ContainerStatus containerStatus1 = ContainerStatus.newInstance(containerId1,
+-        org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-        "successful", 0);
+-    ContainerId containerId2 = ContainerId.newContainerId(appAttemptId, 1);
+-    ContainerStatus containerStatus2 = ContainerStatus.newInstance(containerId2,
+-        org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-        "successful", 0);
+-    ComponentInstance instance = Mockito.mock(ComponentInstance.class);
+-    Mockito.doReturn("componentInstance").when(instance).getCompName();
+-    scheduler.addLiveCompInstance(containerId2, instance);
+-    List<ContainerStatus> statuses = new ArrayList<>();
+-    // First container instance will be null
+-    statuses.add(containerStatus1);
+-    // Second container instance is added
+-    scheduler.addLiveCompInstance(containerId2, instance);
+-    statuses.add(containerStatus2);
+-    scheduler.callbackHandler.onContainersCompleted(statuses);
+-    // For second container event should be dispatched.
+-    verify(scheduler.dispatcher, times(1)).getEventHandler();
+-    DefaultMetricsSystem.shutdown();
+-  }
+-
+-  private ServiceContext createServiceContext(String name)
+-      throws Exception {
+-    Artifact artifact = new Artifact();
+-    artifact.setId("1");
+-    artifact.setType(Artifact.TypeEnum.TARBALL);
+-    Service serviceDef = ServiceTestUtils.createExampleApplication();
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    serviceDef.setId(applicationId.toString());
+-    serviceDef.setName(name);
+-    serviceDef.setState(ServiceState.STARTED);
+-    serviceDef.getComponents().forEach(component ->
+-        component.setArtifact(artifact));
+-    ServiceContext context = new MockRunningServiceContext(rule,
+-        serviceDef);
+-    context.scheduler.getDispatcher().setDrainEventsOnStop();
+-    context.scheduler.getDispatcher().start();
+-    return context;
+-  }
+-
+-  class MockServiceScheduler extends ServiceScheduler {
+-    private AsyncDispatcher dispatcher;
+-    private AMRMClientCallback callbackHandler = new AMRMClientCallback();
+-
+-    MockServiceScheduler(ServiceContext context) {
+-      super(context);
+-    }
+-
+-    @Override
+-    protected AsyncDispatcher createAsyncDispatcher() {
+-      dispatcher = Mockito.mock(AsyncDispatcher.class);
+-      EventHandler<Event> handler = Mockito.mock(EventHandler.class);
+-      Mockito.doReturn(handler).when(dispatcher).getEventHandler();
+-      return dispatcher;
+-    }
+-
+-    @Override
+-    protected AMRMClientAsync<AMRMClient.ContainerRequest> createAMRMClient() {
+-      return AMRMClientAsync.createAMRMClientAsync(1000, callbackHandler);
+-    }
+-
+-  }
+-
+-  @Test
+-  public void testRecordTokensForContainers() throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testContainerCompleted");
+-    exampleApp.addComponent(createComponent("compa", 1, "pwd"));
+-
+-    String json = "{\"auths\": "
+-        + "{\"https://index.docker.io/v1/\": "
+-        + "{\"auth\": \"foobarbaz\"},"
+-        + "\"registry.example.com\": "
+-        + "{\"auth\": \"bazbarfoo\"}}}";
+-    File dockerTmpDir = new File("target", "docker-tmp");
+-    FileUtils.deleteQuietly(dockerTmpDir);
+-    dockerTmpDir.mkdirs();
+-    String dockerConfig = dockerTmpDir + "/config.json";
+-    BufferedWriter bw = new BufferedWriter(new FileWriter(dockerConfig));
+-    bw.write(json);
+-    bw.close();
+-    Credentials dockerCred =
+-        DockerClientConfigHandler.readCredentialsFromConfigFile(
+-            new Path(dockerConfig), conf, applicationId.toString());
+-
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp, dockerCred);
+-    ByteBuffer amCredBuffer = am.recordTokensForContainers();
+-    Credentials amCreds =
+-        DockerClientConfigHandler.getCredentialsFromTokensByteBuffer(
+-            amCredBuffer);
+-
+-    assertEquals(2, amCreds.numberOfTokens());
+-    for (Token<? extends TokenIdentifier> tk : amCreds.getAllTokens()) {
+-      Assert.assertTrue(
+-          tk.getKind().equals(DockerCredentialTokenIdentifier.KIND));
+-    }
+-
+-    am.stop();
+-  }
+-
+-  @Test
+-  public void testIPChange() throws TimeoutException,
+-      InterruptedException {
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    String comp1Name = "comp1";
+-    String comp1InstName = "comp1-0";
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setVersion("v1");
+-    exampleApp.setName("testIPChange");
+-    Component comp1 = createComponent(comp1Name, 1, "sleep 60");
+-    comp1.setArtifact(new Artifact().type(Artifact.TypeEnum.DOCKER));
+-    exampleApp.addComponent(comp1);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    ComponentInstance comp1inst0 = am.getCompInstance(comp1Name, comp1InstName);
+-    // allocate a container
+-    am.feedContainerToComp(exampleApp, 1, comp1Name);
+-    GenericTestUtils.waitFor(() -> comp1inst0.getContainerStatus() != null,
+-        2000, 200000);
+-    // first host status will match the container nodeId
+-    Assert.assertEquals("localhost",
+-        comp1inst0.getContainerStatus().getHost());
+-
+-    LOG.info("Change the IP and host");
+-    // change the container status
+-    am.updateContainerStatus(exampleApp, 1, comp1Name, "new.host");
+-    GenericTestUtils.waitFor(() -> comp1inst0.getContainerStatus().getHost()
+-        .equals("new.host"), 2000, 200000);
+-
+-    LOG.info("Change the IP and host again");
+-    // change the container status
+-    am.updateContainerStatus(exampleApp, 1, comp1Name, "newer.host");
+-    GenericTestUtils.waitFor(() -> comp1inst0.getContainerStatus().getHost()
+-        .equals("newer.host"), 2000, 200000);
+-    am.stop();
+-  }
+-
+-  /**
+-   This test verifies that the containers are released and the
+-   component instance is added to the pending queue when building the launch
+-   context fails.
+-   Here, we intentionally have an artifact that doesn't have an id.
+-   This will cause TarballProviderService.processArtifact
+-   to throw an IllegalArgumentException because the Path object is
+-   constructed from the id of the artifact.
+-   In case the id is set to null or unset so it is effectively null,
+-   Path.checkPathArg throws an IllegalArgumentException.
+-  **/
+-  @Test(timeout = 30000)
+-  public void testContainersReleasedWhenPreLaunchFails()
+-      throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setVersion("v1");
+-    exampleApp.setName("testContainersReleasedWhenPreLaunchFails");
+-
+-    Component compA = createComponent("compa", 1, "pwd");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.TARBALL);
+-    compA.artifact(artifact);
+-    exampleApp.addComponent(compA);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    ContainerId containerId = am.createContainerId(1);
+-
+-    // allocate a container
+-    am.feedContainerToComp(exampleApp, containerId, "compa");
+-    am.waitForContainerToRelease(containerId);
+-    ComponentInstance compAinst0 = am.getCompInstance(compA.getName(),
+-        "compa-0");
+-    GenericTestUtils.waitFor(() ->
+-        am.getComponent(compA.getName()).getPendingInstances()
+-        .contains(compAinst0), 2000, 30000);
+-
+-    Assert.assertEquals(1,
+-        am.getComponent("compa").getPendingInstances().size());
+-    am.stop();
+-  }
+-
+-  @Test(timeout = 30000)
+-  public void testSyncSysFS() {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setVersion("v1");
+-    exampleApp.setName("tensorflow");
+-
+-    Component compA = createComponent("compa", 1, "pwd");
+-    compA.getConfiguration().getEnv().put(
+-        "YARN_CONTAINER_RUNTIME_YARN_SYSFS_ENABLE", "true");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.TARBALL);
+-    compA.artifact(artifact);
+-    exampleApp.addComponent(compA);
+-    try {
+-      MockServiceAM am = new MockServiceAM(exampleApp);
+-      am.init(conf);
+-      am.start();
+-      ServiceScheduler scheduler = am.context.scheduler;
+-      scheduler.syncSysFs(exampleApp);
+-      scheduler.close();
+-      am.stop();
+-      am.close();
+-    } catch (Exception e) {
+-      LOG.error("Fail to sync sysfs.", e);
+-      Assert.fail("Fail to sync sysfs.");
+-    }
+-  }
+-
+-  @Test
+-  public void testScheduleWithResourceAttributes() throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testScheduleWithResourceAttributes");
+-    exampleApp.setVersion("v1");
+-
+-    List<ResourceTypeInfo> resourceTypeInfos = new ArrayList<>(
+-        ResourceUtils.getResourcesTypeInfo());
+-    // Add 3rd resource type.
+-    resourceTypeInfos.add(ResourceTypeInfo
+-        .newInstance("test-resource", "", ResourceTypes.COUNTABLE));
+-    // Reinitialize resource types
+-    ResourceUtils.reinitializeResources(resourceTypeInfos);
+-
+-    Component serviceCompoent = createComponent("compa", 1, "pwd");
+-    serviceCompoent.getResource().setResourceInformations(
+-        ImmutableMap.of("test-resource",
+-            new ResourceInformation()
+-                .value(1234L)
+-                .unit("Gi")
+-                .attributes(ImmutableMap.of("k1", "v1", "k2", "v2"))));
+-    exampleApp.addComponent(serviceCompoent);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    ServiceScheduler serviceScheduler = am.context.scheduler;
+-    AMRMClientAsync<AMRMClient.ContainerRequest> amrmClientAsync =
+-        serviceScheduler.getAmRMClient();
+-
+-    Collection<AMRMClient.ContainerRequest> rr =
+-        amrmClientAsync.getMatchingRequests(0);
+-    Assert.assertEquals(1, rr.size());
+-
+-    org.apache.hadoop.yarn.api.records.Resource capability =
+-        rr.iterator().next().getCapability();
+-    Assert.assertEquals(1234L, capability.getResourceValue("test-resource"));
+-    Assert.assertEquals("Gi",
+-        capability.getResourceInformation("test-resource").getUnits());
+-    Assert.assertEquals(2, capability.getResourceInformation("test-resource")
+-        .getAttributes().size());
+-    am.stop();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceManager.java
+deleted file mode 100644
+index 1d8ccff4f6f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceManager.java
++++ /dev/null
+@@ -1,431 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.Collection;
+-import java.util.List;
+-import java.util.concurrent.TimeoutException;
+-
+-/**
+- * Tests for {@link ServiceManager}.
+- */
+-public class TestServiceManager {
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test (timeout = TIMEOUT)
+-  public void testUpgrade() throws Exception {
+-    ServiceContext context = createServiceContext("testUpgrade");
+-    initUpgrade(context, "v2", false, false, false);
+-    Assert.assertEquals("service not upgraded", ServiceState.UPGRADING,
+-        context.getServiceManager().getServiceSpec().getState());
+-  }
+-
+-  @Test (timeout = TIMEOUT)
+-  public void testRestartNothingToUpgrade()
+-      throws Exception {
+-    ServiceContext context = createServiceContext(
+-        "testRestartNothingToUpgrade");
+-    initUpgrade(context, "v2", false, false, false);
+-    ServiceManager manager = context.getServiceManager();
+-    //make components stable by upgrading all instances
+-    upgradeAndReadyAllInstances(context);
+-
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        new ServiceEvent(ServiceEventType.START));
+-    GenericTestUtils.waitFor(()->
+-        context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service not re-started", ServiceState.STABLE,
+-        manager.getServiceSpec().getState());
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testAutoFinalizeNothingToUpgrade() throws Exception {
+-    ServiceContext context = createServiceContext(
+-        "testAutoFinalizeNothingToUpgrade");
+-    initUpgrade(context, "v2", false, true, false);
+-    ServiceManager manager = context.getServiceManager();
+-    //make components stable by upgrading all instances
+-    upgradeAndReadyAllInstances(context);
+-
+-    GenericTestUtils.waitFor(()->
+-        context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service stable", ServiceState.STABLE,
+-        manager.getServiceSpec().getState());
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testRestartWithPendingUpgrade()
+-      throws Exception {
+-    ServiceContext context = createServiceContext("testRestart");
+-    initUpgrade(context, "v2", true, false, false);
+-    ServiceManager manager = context.getServiceManager();
+-
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        new ServiceEvent(ServiceEventType.START));
+-    context.scheduler.getDispatcher().stop();
+-    Assert.assertEquals("service should still be upgrading",
+-        ServiceState.UPGRADING, manager.getServiceSpec().getState());
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testFinalize() throws Exception {
+-    ServiceContext context = createServiceContext("testCheckState");
+-    initUpgrade(context, "v2", true, false, false);
+-    ServiceManager manager = context.getServiceManager();
+-    Assert.assertEquals("service not upgrading", ServiceState.UPGRADING,
+-        manager.getServiceSpec().getState());
+-
+-    //make components stable by upgrading all instances
+-    upgradeAndReadyAllInstances(context);
+-
+-    // finalize service
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        new ServiceEvent(ServiceEventType.START));
+-    GenericTestUtils.waitFor(()->
+-        context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service not re-started", ServiceState.STABLE,
+-        manager.getServiceSpec().getState());
+-
+-    validateUpgradeFinalization(manager.getName(), "v2");
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testAutoFinalize() throws Exception {
+-    ServiceContext context = createServiceContext("testCheckStateAutoFinalize");
+-    ServiceManager manager = context.getServiceManager();
+-    manager.getServiceSpec().setState(
+-        ServiceState.UPGRADING_AUTO_FINALIZE);
+-    initUpgrade(context, "v2", true, true, false);
+-
+-    // make components stable
+-    upgradeAndReadyAllInstances(context);
+-
+-    GenericTestUtils.waitFor(() ->
+-        context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service not stable",
+-        ServiceState.STABLE, manager.getServiceSpec().getState());
+-
+-    validateUpgradeFinalization(manager.getName(), "v2");
+-  }
+-
+-  @Test
+-  public void testInvalidUpgrade() throws Exception {
+-    ServiceContext serviceContext = createServiceContext("testInvalidUpgrade");
+-    ServiceManager manager = serviceContext.getServiceManager();
+-    manager.getServiceSpec().setState(
+-        ServiceState.UPGRADING_AUTO_FINALIZE);
+-    Service upgradedDef = ServiceTestUtils.createExampleApplication();
+-    upgradedDef.setName(manager.getName());
+-    upgradedDef.setVersion("v2");
+-    upgradedDef.setLifetime(2L);
+-    writeUpgradedDef(upgradedDef);
+-
+-    try {
+-      manager.processUpgradeRequest("v2", true, false);
+-    } catch (Exception ex) {
+-      Assert.assertTrue(ex instanceof UnsupportedOperationException);
+-      return;
+-    }
+-    Assert.fail();
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testExpressUpgrade() throws Exception {
+-    ServiceContext context = createServiceContext("testExpressUpgrade");
+-    ServiceManager manager = context.getServiceManager();
+-    manager.getServiceSpec().setState(ServiceState.EXPRESS_UPGRADING);
+-    initUpgrade(context, "v2", true, true, true);
+-
+-    List<String> comps = ServiceApiUtil.resolveCompsDependency(context.service);
+-    // wait till instances of first component are upgraded and ready
+-    String compA = comps.get(0);
+-    makeInstancesReadyAfterUpgrade(context, compA);
+-
+-    // wait till instances of second component are upgraded and ready
+-    String compB = comps.get(1);
+-    makeInstancesReadyAfterUpgrade(context, compB);
+-
+-    GenericTestUtils.waitFor(() ->
+-            context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-
+-    Assert.assertEquals("service not stable",
+-        ServiceState.STABLE, manager.getServiceSpec().getState());
+-    validateUpgradeFinalization(manager.getName(), "v2");
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testCancelUpgrade() throws Exception {
+-    ServiceContext context = createServiceContext("testCancelUpgrade");
+-    writeInitialDef(context.service);
+-    initUpgrade(context, "v2", true, false, false);
+-    ServiceManager manager = context.getServiceManager();
+-    Assert.assertEquals("service not upgrading", ServiceState.UPGRADING,
+-        manager.getServiceSpec().getState());
+-
+-    List<String> comps = ServiceApiUtil.resolveCompsDependency(context.service);
+-    // wait till instances of first component are upgraded and ready
+-    String compA = comps.get(0);
+-    // upgrade the instances
+-    upgradeInstances(context, compA);
+-    makeInstancesReadyAfterUpgrade(context, compA);
+-
+-    // cancel upgrade
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        new ServiceEvent(ServiceEventType.CANCEL_UPGRADE));
+-    makeInstancesReadyAfterUpgrade(context, compA);
+-
+-    GenericTestUtils.waitFor(()->
+-            context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service upgrade not cancelled", ServiceState.STABLE,
+-        manager.getServiceSpec().getState());
+-
+-    validateUpgradeFinalization(manager.getName(), "v1");
+-  }
+-
+-  @Test(timeout = TIMEOUT)
+-  public void testCancelUpgradeAfterInitiate() throws Exception {
+-    ServiceContext context = createServiceContext("testCancelUpgrade");
+-    writeInitialDef(context.service);
+-    initUpgrade(context, "v2", true, false, false);
+-    ServiceManager manager = context.getServiceManager();
+-    Assert.assertEquals("service not upgrading", ServiceState.UPGRADING,
+-        manager.getServiceSpec().getState());
+-
+-    // cancel upgrade
+-    context.scheduler.getDispatcher().getEventHandler().handle(
+-        new ServiceEvent(ServiceEventType.CANCEL_UPGRADE));
+-    GenericTestUtils.waitFor(()->
+-            context.service.getState().equals(ServiceState.STABLE),
+-        CHECK_EVERY_MILLIS, TIMEOUT);
+-    Assert.assertEquals("service upgrade not cancelled", ServiceState.STABLE,
+-        manager.getServiceSpec().getState());
+-
+-    validateUpgradeFinalization(manager.getName(), "v1");
+-  }
+-
+-  private void validateUpgradeFinalization(String serviceName,
+-      String expectedVersion) throws IOException {
+-    Service savedSpec = ServiceApiUtil.loadService(rule.getFs(), serviceName);
+-    Assert.assertEquals("service def not re-written", expectedVersion,
+-        savedSpec.getVersion());
+-    Assert.assertNotNull("app id not present", savedSpec.getId());
+-    Assert.assertEquals("state not stable", ServiceState.STABLE,
+-        savedSpec.getState());
+-    savedSpec.getComponents().forEach(compSpec ->
+-        Assert.assertEquals("comp not stable", ComponentState.STABLE,
+-        compSpec.getState()));
+-  }
+-
+-  private void initUpgrade(ServiceContext context, String version,
+-      boolean upgradeArtifact, boolean autoFinalize, boolean expressUpgrade)
+-      throws IOException, SliderException, TimeoutException,
+-      InterruptedException {
+-    ServiceManager serviceManager = context.getServiceManager();
+-    Service upgradedDef = ServiceTestUtils.createExampleApplication();
+-    upgradedDef.setName(serviceManager.getName());
+-    upgradedDef.setVersion(version);
+-    if (upgradeArtifact) {
+-      Artifact upgradedArtifact = createTestArtifact("2");
+-      upgradedDef.getComponents().forEach(component -> {
+-        component.setArtifact(upgradedArtifact);
+-      });
+-    }
+-    writeUpgradedDef(upgradedDef);
+-    serviceManager.processUpgradeRequest(version, autoFinalize, expressUpgrade);
+-    GenericTestUtils.waitFor(() -> {
+-      for (Component comp : context.scheduler.getAllComponents().values()) {
+-        if (!comp.getComponentSpec().getState().equals(
+-            ComponentState.NEEDS_UPGRADE)) {
+-          return false;
+-        }
+-      }
+-      return true;
+-    }, CHECK_EVERY_MILLIS, TIMEOUT);
+-  }
+-
+-  private void upgradeAndReadyAllInstances(ServiceContext context) throws
+-      TimeoutException, InterruptedException {
+-    upgradeAllInstances(context);
+-    makeAllInstancesReady(context);
+-  }
+-
+-  private void upgradeAllInstances(ServiceContext context) throws
+-      TimeoutException, InterruptedException {
+-    // upgrade the instances
+-    context.scheduler.getLiveInstances().forEach(((containerId, instance) -> {
+-      ComponentInstanceEvent event = new ComponentInstanceEvent(containerId,
+-          ComponentInstanceEventType.UPGRADE);
+-      context.scheduler.getDispatcher().getEventHandler().handle(event);
+-    }));
+-  }
+-
+-  private void makeAllInstancesReady(ServiceContext context)
+-      throws TimeoutException, InterruptedException {
+-    context.scheduler.getLiveInstances().forEach(((containerId, instance) -> {
+-      ComponentInstanceEvent startEvent = new ComponentInstanceEvent(
+-          containerId, ComponentInstanceEventType.START);
+-      context.scheduler.getDispatcher().getEventHandler().handle(startEvent);
+-
+-      ComponentInstanceEvent becomeReadyEvent = new ComponentInstanceEvent(
+-          containerId, ComponentInstanceEventType.BECOME_READY);
+-      context.scheduler.getDispatcher().getEventHandler().handle(
+-          becomeReadyEvent);
+-    }));
+-    GenericTestUtils.waitFor(()-> {
+-      for (ComponentInstance instance:
+-          context.scheduler.getLiveInstances().values()) {
+-        if (!instance.getContainerState().equals(ContainerState.READY)) {
+-          return false;
+-        }
+-      }
+-      return true;
+-    }, CHECK_EVERY_MILLIS, TIMEOUT);
+-  }
+-
+-  private void upgradeInstances(ServiceContext context, String compName) {
+-    Collection<ComponentInstance> compInstances = context.scheduler
+-        .getAllComponents().get(compName).getAllComponentInstances();
+-    compInstances.forEach(instance -> {
+-      ComponentInstanceEvent event = new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.UPGRADE);
+-      context.scheduler.getDispatcher().getEventHandler().handle(event);
+-    });
+-  }
+-
+-  private void makeInstancesReadyAfterUpgrade(ServiceContext context,
+-      String compName)
+-      throws TimeoutException, InterruptedException {
+-    Collection<ComponentInstance> compInstances = context.scheduler
+-        .getAllComponents().get(compName).getAllComponentInstances();
+-    GenericTestUtils.waitFor(() -> {
+-      for (ComponentInstance instance : compInstances) {
+-        if (!instance.getContainerState().equals(ContainerState.UPGRADING)) {
+-          return false;
+-        }
+-      }
+-      return true;
+-    }, CHECK_EVERY_MILLIS, TIMEOUT);
+-
+-    // instances of comp1 get upgraded and become ready event is triggered
+-    // become ready
+-    compInstances.forEach(instance -> {
+-      ComponentInstanceEvent startEvent = new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.START);
+-      context.scheduler.getDispatcher().getEventHandler().handle(startEvent);
+-
+-      ComponentInstanceEvent becomeReadyEvent = new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.BECOME_READY);
+-
+-      context.scheduler.getDispatcher().getEventHandler().handle(
+-          becomeReadyEvent);
+-    });
+-
+-    GenericTestUtils.waitFor(() -> {
+-      for (ComponentInstance instance : compInstances) {
+-        if (!instance.getContainerState().equals(ContainerState.READY)) {
+-          return false;
+-        }
+-      }
+-      return true;
+-    }, CHECK_EVERY_MILLIS, TIMEOUT);
+-  }
+-
+-  private ServiceContext createServiceContext(String name)
+-      throws Exception {
+-    Service service  = createBaseDef(name);
+-    ServiceContext context = new MockRunningServiceContext(rule,
+-        service);
+-    context.scheduler.getDispatcher().setDrainEventsOnStop();
+-    context.scheduler.getDispatcher().start();
+-    return context;
+-  }
+-
+-  public static Service createBaseDef(String name) {
+-    return createDef(name, ServiceTestUtils.createExampleApplication());
+-  }
+-
+-  public static Service createDef(String name, Service serviceDef) {
+-    ApplicationId applicationId = ApplicationId.newInstance(
+-        System.currentTimeMillis(), 1);
+-    serviceDef.setId(applicationId.toString());
+-    serviceDef.setName(name);
+-    serviceDef.setState(ServiceState.STARTED);
+-    Artifact artifact = createTestArtifact("1");
+-    serviceDef.getComponents().forEach(component ->
+-        component.setArtifact(artifact));
+-    return serviceDef;
+-  }
+-
+-  static Artifact createTestArtifact(String artifactId) {
+-    Artifact artifact = new Artifact();
+-    artifact.setId(artifactId);
+-    artifact.setType(Artifact.TypeEnum.TARBALL);
+-    return artifact;
+-  }
+-
+-  private void writeInitialDef(Service service)
+-      throws IOException, SliderException {
+-    Path servicePath = rule.getFs().buildClusterDirPath(
+-        service.getName());
+-    ServiceApiUtil.createDirAndPersistApp(rule.getFs(), servicePath,
+-        service);
+-  }
+-
+-  private void writeUpgradedDef(Service upgradedDef)
+-      throws IOException, SliderException {
+-    Path upgradePath = rule.getFs().buildClusterUpgradeDirPath(
+-        upgradedDef.getName(), upgradedDef.getVersion());
+-    ServiceApiUtil.createDirAndPersistApp(rule.getFs(), upgradePath,
+-        upgradedDef);
+-  }
+-
+-  private static final int TIMEOUT = 10000;
+-  private static final int CHECK_EVERY_MILLIS = 100;
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java
+deleted file mode 100644
+index 56aca5c89ab..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java
++++ /dev/null
+@@ -1,1028 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.registry.client.binding.RegistryPathUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.records.*;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.PlacementConstraint;
+-import org.apache.hadoop.yarn.service.api.records.PlacementPolicy;
+-import org.apache.hadoop.yarn.service.api.records.PlacementScope;
+-import org.apache.hadoop.yarn.service.api.records.PlacementType;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.exceptions.SliderException;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-
+-import org.hamcrest.CoreMatchers;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.junit.rules.TemporaryFolder;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.*;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static org.apache.hadoop.yarn.api.records.YarnApplicationState.FINISHED;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.*;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.EXIT_COMMAND_ARGUMENT_ERROR;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.EXIT_NOT_FOUND;
+-
+-/**
+- * End to end tests to test deploying services with MiniYarnCluster and a in-JVM
+- * ZK testing cluster.
+- */
+-public class TestYarnNativeServices extends ServiceTestUtils {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestYarnNativeServices.class);
+-
+-  @Rule
+-  public TemporaryFolder tmpFolder = new TemporaryFolder();
+-
+-  @Before
+-  public void setup() throws Exception {
+-    File tmpYarnDir = new File("target", "tmp");
+-    FileUtils.deleteQuietly(tmpYarnDir);
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    shutdown();
+-  }
+-
+-  // End-to-end test to use ServiceClient to deploy a service.
+-  // 1. Create a service with 2 components, each of which has 2 containers
+-  // 2. Flex up each component to 3 containers and check the component instance names
+-  // 3. Flex down each component to 1 container and check the component instance names
+-  // 4. Flex up each component to 2 containers and check the component instance names
+-  // 5. Stop the service
+-  // 6. Destroy the service
+-  @Test (timeout = 200000)
+-  public void testCreateFlexStopDestroyService() throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    client.actionCreate(exampleApp);
+-    SliderFileSystem fileSystem = new SliderFileSystem(getConf());
+-    Path appDir = fileSystem.buildClusterDirPath(exampleApp.getName());
+-    // check app.json is persisted.
+-    Assert.assertTrue(
+-        getFS().exists(new Path(appDir, exampleApp.getName() + ".json")));
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    // Flex two components, each from 2 container to 3 containers.
+-    flexComponents(client, exampleApp, 3L);
+-    // wait for flex to be completed, increase from 2 to 3 containers.
+-    waitForServiceToBeStable(client, exampleApp);
+-    // check all instances name for each component are in sequential order.
+-    checkCompInstancesInOrder(client, exampleApp);
+-
+-    // flex down to 1
+-    flexComponents(client, exampleApp, 1L);
+-    waitForServiceToBeStable(client, exampleApp);
+-    checkCompInstancesInOrder(client, exampleApp);
+-
+-    // check component dir and registry are cleaned up.
+-
+-    // flex up again to 2
+-    flexComponents(client, exampleApp, 2L);
+-    waitForServiceToBeStable(client, exampleApp);
+-    checkCompInstancesInOrder(client, exampleApp);
+-
+-    // stop the service
+-    LOG.info("Stop the service");
+-    client.actionStop(exampleApp.getName(), true);
+-    ApplicationReport report = client.getYarnClient()
+-        .getApplicationReport(ApplicationId.fromString(exampleApp.getId()));
+-    // AM unregisters with RM successfully
+-    Assert.assertEquals(FINISHED, report.getYarnApplicationState());
+-    Assert.assertEquals(FinalApplicationStatus.ENDED,
+-        report.getFinalApplicationStatus());
+-    String serviceZKPath = RegistryUtils.servicePath(RegistryUtils
+-        .currentUser(), YarnServiceConstants.APP_TYPE, exampleApp.getName());
+-    Assert.assertFalse("Registry ZK service path still exists after stop",
+-        getCuratorService().zkPathExists(serviceZKPath));
+-
+-    LOG.info("Destroy the service");
+-    // destroy the service and check the app dir is deleted from fs.
+-    Assert.assertEquals(0, client.actionDestroy(exampleApp.getName()));
+-    // check the service dir on hdfs (in this case, local fs) are deleted.
+-    Assert.assertFalse(getFS().exists(appDir));
+-
+-    // check that destroying again does not succeed
+-    Assert.assertEquals(EXIT_NOT_FOUND, client.actionDestroy(exampleApp.getName()));
+-  }
+-
+-  // Save a service without starting it and ensure that stop does not NPE and
+-  // that service can be successfully destroyed
+-  @Test (timeout = 200000)
+-  public void testStopDestroySavedService() throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    client.actionBuild(exampleApp);
+-    Assert.assertEquals(EXIT_COMMAND_ARGUMENT_ERROR, client.actionStop(
+-        exampleApp.getName()));
+-    Assert.assertEquals(0, client.actionDestroy(exampleApp.getName()));
+-  }
+-
+-  // Create compa with 2 containers
+-  // Create compb with 2 containers which depends on compa
+-  // Create compc with 2 containers which depends on compb
+-  // Check containers for compa started before containers for compb before
+-  // containers for compc
+-  @Test (timeout = 200000)
+-  public void testComponentStartOrder() throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = new Service();
+-    exampleApp.setName("teststartorder");
+-    exampleApp.setVersion("v1");
+-    exampleApp.addComponent(createComponent("compa", 2, "sleep 1000"));
+-
+-    // Let compb depend on compa
+-    Component compb = createComponent("compb", 2, "sleep 1000");
+-    compb.setDependencies(Collections.singletonList("compa"));
+-    exampleApp.addComponent(compb);
+-
+-    // Let compc depend on compb
+-    Component compc = createComponent("compc", 2, "sleep 1000");
+-    compc.setDependencies(Collections.singletonList("compb"));
+-    exampleApp.addComponent(compc);
+-
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    // check that containers for compa are launched before containers for compb
+-    checkContainerLaunchDependencies(client, exampleApp, "compa", "compb",
+-        "compc");
+-
+-    client.actionStop(exampleApp.getName(), true);
+-    client.actionDestroy(exampleApp.getName());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testCreateServiceSameNameDifferentUser() throws Exception {
+-    String sameAppName = "same-name";
+-    String userA = "usera";
+-    String userB = "userb";
+-
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    String origBasePath = getConf().get(YARN_SERVICE_BASE_PATH);
+-
+-    Service userAApp = new Service();
+-    userAApp.setName(sameAppName);
+-    userAApp.setVersion("v1");
+-    userAApp.addComponent(createComponent("comp", 1, "sleep 1000"));
+-
+-    Service userBApp = new Service();
+-    userBApp.setName(sameAppName);
+-    userBApp.setVersion("v1");
+-    userBApp.addComponent(createComponent("comp", 1, "sleep 1000"));
+-
+-    File userABasePath = null, userBBasePath = null;
+-    try {
+-      userABasePath = new File(origBasePath, userA);
+-      userABasePath.mkdirs();
+-      getConf().set(YARN_SERVICE_BASE_PATH, userABasePath.getAbsolutePath());
+-      client.actionCreate(userAApp);
+-      waitForServiceToBeStarted(client, userAApp);
+-
+-      userBBasePath = new File(origBasePath, userB);
+-      userBBasePath.mkdirs();
+-      getConf().set(YARN_SERVICE_BASE_PATH, userBBasePath.getAbsolutePath());
+-      client.actionBuild(userBApp);
+-    } catch (Exception e) {
+-      Assert
+-          .fail("Exception should not be thrown - " + e.getLocalizedMessage());
+-    } finally {
+-      if (userABasePath != null) {
+-        getConf().set(YARN_SERVICE_BASE_PATH, userABasePath.getAbsolutePath());
+-        client.actionStop(sameAppName, true);
+-        client.actionDestroy(sameAppName);
+-      }
+-      if (userBBasePath != null) {
+-        getConf().set(YARN_SERVICE_BASE_PATH, userBBasePath.getAbsolutePath());
+-        client.actionDestroy(sameAppName);
+-      }
+-    }
+-
+-    // Need to extend this test to validate that different users can create
+-    // apps of exact same name. So far only create followed by build is tested.
+-    // Need to test create followed by create.
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testCreateServiceSameNameSameUser() throws Exception {
+-    String sameAppName = "same-name";
+-    String user = UserGroupInformation.getCurrentUser().getUserName();
+-    System.setProperty("user.name", user);
+-
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-
+-    Service appA = new Service();
+-    appA.setName(sameAppName);
+-    appA.setVersion("v1");
+-    appA.addComponent(createComponent("comp", 1, "sleep 1000"));
+-
+-    Service appB = new Service();
+-    appB.setName(sameAppName);
+-    appB.setVersion("v1");
+-    appB.addComponent(createComponent("comp", 1, "sleep 1000"));
+-
+-    try {
+-      client.actionBuild(appA);
+-      client.actionBuild(appB);
+-    } catch (Exception e) {
+-      String expectedMsg = "Service Instance dir already exists:";
+-      if (e.getLocalizedMessage() != null) {
+-        Assert.assertThat(e.getLocalizedMessage(),
+-            CoreMatchers.containsString(expectedMsg));
+-      } else {
+-        Assert.fail("Message cannot be null. It has to say - " + expectedMsg);
+-      }
+-    } finally {
+-      // cleanup
+-      client.actionDestroy(sameAppName);
+-    }
+-
+-    try {
+-      client.actionCreate(appA);
+-      waitForServiceToBeStarted(client, appA);
+-
+-      client.actionCreate(appB);
+-      waitForServiceToBeStarted(client, appB);
+-    } catch (Exception e) {
+-      String expectedMsg = "Failed to create service " + sameAppName
+-          + ", because it already exists.";
+-      if (e.getLocalizedMessage() != null) {
+-        Assert.assertThat(e.getLocalizedMessage(),
+-            CoreMatchers.containsString(expectedMsg));
+-      } else {
+-        Assert.fail("Message cannot be null. It has to say - " + expectedMsg);
+-      }
+-    } finally {
+-      // cleanup
+-      client.actionStop(sameAppName, true);
+-      client.actionDestroy(sameAppName);
+-    }
+-  }
+-
+-  // Test to verify recovery of SeviceMaster after RM is restarted.
+-  // 1. Create an example service.
+-  // 2. Restart RM.
+-  // 3. Fail the application attempt.
+-  // 4. Verify ServiceMaster recovers.
+-  @Test(timeout = 200000)
+-  public void testRecoverComponentsAfterRMRestart() throws Exception {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.RECOVERY_ENABLED, true);
+-    conf.setBoolean(
+-        YarnConfiguration.RM_WORK_PRESERVING_RECOVERY_ENABLED, true);
+-    conf.setLong(YarnConfiguration.NM_RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_MS,
+-        500L);
+-
+-    conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true);
+-    conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_USE_RPC, true);
+-    conf.setInt(YarnConfiguration.RM_MAX_COMPLETED_APPLICATIONS,
+-        YarnConfiguration.DEFAULT_RM_MAX_COMPLETED_APPLICATIONS);
+-    setConf(conf);
+-    setupInternal(NUM_NMS);
+-
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    client.actionCreate(exampleApp);
+-    Multimap<String, String> containersBeforeFailure =
+-        waitForAllCompToBeReady(client, exampleApp);
+-
+-    LOG.info("Restart the resource manager");
+-    getYarnCluster().restartResourceManager(
+-        getYarnCluster().getActiveRMIndex());
+-    GenericTestUtils.waitFor(() ->
+-        getYarnCluster().getResourceManager().getServiceState() ==
+-            org.apache.hadoop.service.Service.STATE.STARTED, 2000, 200000);
+-    Assert.assertTrue("node managers connected",
+-        getYarnCluster().waitForNodeManagersToConnect(5000));
+-
+-    ApplicationId exampleAppId = ApplicationId.fromString(exampleApp.getId());
+-    ApplicationAttemptId applicationAttemptId = client.getYarnClient()
+-        .getApplicationReport(exampleAppId).getCurrentApplicationAttemptId();
+-
+-    LOG.info("Fail the application attempt {}", applicationAttemptId);
+-    client.getYarnClient().failApplicationAttempt(applicationAttemptId);
+-    //wait until attempt 2 is running
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ApplicationReport ar = client.getYarnClient()
+-            .getApplicationReport(exampleAppId);
+-        return ar.getCurrentApplicationAttemptId().getAttemptId() == 2 &&
+-            ar.getYarnApplicationState() == YarnApplicationState.RUNNING;
+-      } catch (YarnException | IOException e) {
+-        throw new RuntimeException("while waiting", e);
+-      }
+-    }, 2000, 200000);
+-
+-    Multimap<String, String> containersAfterFailure = waitForAllCompToBeReady(
+-        client, exampleApp);
+-    containersBeforeFailure.keys().forEach(compName -> {
+-      Assert.assertEquals("num containers after by restart for " + compName,
+-          containersBeforeFailure.get(compName).size(),
+-          containersAfterFailure.get(compName) == null ? 0 :
+-              containersAfterFailure.get(compName).size());
+-    });
+-
+-    LOG.info("Stop/destroy service {}", exampleApp);
+-    client.actionStop(exampleApp.getName(), true);
+-    client.actionDestroy(exampleApp.getName());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testUpgrade() throws Exception {
+-    setupInternal(NUM_NMS);
+-    getConf().setBoolean(YARN_SERVICE_UPGRADE_ENABLED, true);
+-    ServiceClient client = createClient(getConf());
+-
+-    Service service = createExampleApplication();
+-    client.actionCreate(service);
+-    waitForServiceToBeStable(client, service);
+-
+-    // upgrade the service
+-    Component component = service.getComponents().iterator().next();
+-    service.setState(ServiceState.UPGRADING);
+-    service.setVersion("v2");
+-    component.getConfiguration().getEnv().put("key1", "val1");
+-    client.initiateUpgrade(service);
+-
+-    // wait for service to be in upgrade state
+-    waitForServiceToBeInState(client, service, ServiceState.UPGRADING);
+-    SliderFileSystem fs = new SliderFileSystem(getConf());
+-    Service fromFs = ServiceApiUtil.loadServiceUpgrade(fs,
+-        service.getName(), service.getVersion());
+-    Assert.assertEquals(service.getName(), fromFs.getName());
+-    Assert.assertEquals(service.getVersion(), fromFs.getVersion());
+-
+-    // upgrade containers
+-    Service liveService = client.getStatus(service.getName());
+-    client.actionUpgrade(service,
+-        liveService.getComponent(component.getName()).getContainers());
+-    waitForAllCompToBeReady(client, service);
+-
+-    // finalize the upgrade
+-    client.actionStart(service.getName());
+-    waitForServiceToBeStable(client, service);
+-    Service active = client.getStatus(service.getName());
+-    Assert.assertEquals("component not stable", ComponentState.STABLE,
+-        active.getComponent(component.getName()).getState());
+-    Assert.assertEquals("comp does not have new env", "val1",
+-        active.getComponent(component.getName()).getConfiguration()
+-            .getEnv("key1"));
+-    LOG.info("Stop/destroy service {}", service);
+-    client.actionStop(service.getName(), true);
+-    client.actionDestroy(service.getName());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testExpressUpgrade() throws Exception {
+-    setupInternal(NUM_NMS);
+-    getConf().setBoolean(YARN_SERVICE_UPGRADE_ENABLED, true);
+-    ServiceClient client = createClient(getConf());
+-
+-    Service service = createExampleApplication();
+-    client.actionCreate(service);
+-    waitForServiceToBeStable(client, service);
+-
+-    // upgrade the service
+-    Component component = service.getComponents().iterator().next();
+-    service.setState(ServiceState.EXPRESS_UPGRADING);
+-    service.setVersion("v2");
+-    component.getConfiguration().getEnv().put("key1", "val1");
+-    Component component2 = service.getComponent("compb");
+-    component2.getConfiguration().getEnv().put("key2", "val2");
+-    client.actionUpgradeExpress(service);
+-
+-    waitForServiceToBeExpressUpgrading(client, service);
+-
+-    // wait for upgrade to complete
+-    waitForServiceToBeStable(client, service);
+-    Service active = client.getStatus(service.getName());
+-    Assert.assertEquals("version mismatch", service.getVersion(),
+-        active.getVersion());
+-    Assert.assertEquals("component not stable", ComponentState.STABLE,
+-        active.getComponent(component.getName()).getState());
+-    Assert.assertEquals("compa does not have new env", "val1",
+-        active.getComponent(component.getName()).getConfiguration()
+-            .getEnv("key1"));
+-    Assert.assertEquals("compb does not have new env", "val2",
+-        active.getComponent(component2.getName()).getConfiguration()
+-            .getEnv("key2"));
+-    LOG.info("Stop/destroy service {}", service);
+-    client.actionStop(service.getName(), true);
+-    client.actionDestroy(service.getName());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testCancelUpgrade() throws Exception {
+-    setupInternal(NUM_NMS);
+-    getConf().setBoolean(YARN_SERVICE_UPGRADE_ENABLED, true);
+-    ServiceClient client = createClient(getConf());
+-
+-    Service service = createExampleApplication();
+-    Component component = service.getComponents().iterator().next();
+-    component.getConfiguration().getEnv().put("key1", "val0");
+-
+-    client.actionCreate(service);
+-    waitForServiceToBeStable(client, service);
+-
+-    // upgrade the service
+-    service.setState(ServiceState.UPGRADING);
+-    service.setVersion("v2");
+-    component.getConfiguration().getEnv().put("key1", "val1");
+-    client.initiateUpgrade(service);
+-
+-    // wait for service to be in upgrade state
+-    waitForServiceToBeInState(client, service, ServiceState.UPGRADING);
+-
+-    // upgrade 1 container
+-    Service liveService = client.getStatus(service.getName());
+-    Container container = liveService.getComponent(component.getName())
+-        .getContainers().iterator().next();
+-    client.actionUpgrade(service, Lists.newArrayList(container));
+-
+-    Thread.sleep(500);
+-    // cancel the upgrade
+-    client.actionCancelUpgrade(service.getName());
+-    waitForServiceToBeStable(client, service);
+-    Service active = client.getStatus(service.getName());
+-    Assert.assertEquals("component not stable", ComponentState.STABLE,
+-        active.getComponent(component.getName()).getState());
+-    Assert.assertEquals("comp does not have new env", "val0",
+-        active.getComponent(component.getName()).getConfiguration()
+-            .getEnv("key1"));
+-    LOG.info("Stop/destroy service {}", service);
+-    client.actionStop(service.getName(), true);
+-    client.actionDestroy(service.getName());
+-  }
+-
+-  // Test to verify ANTI_AFFINITY placement policy
+-  // 1. Start mini cluster
+-  // with 3 NMs and scheduler placement-constraint handler
+-  // 2. Create an example service with 3 containers
+-  // 3. Verify no more than 1 container comes up in each of the 3 NMs
+-  // 4. Flex the component to 4 containers
+-  // 5. Verify that the 4th container does not even get allocated since there
+-  //    are only 3 NMs
+-  @Test (timeout = 200000)
+-  public void testCreateServiceWithPlacementPolicy() throws Exception {
+-    // We need to enable scheduler placement-constraint at the cluster level to
+-    // let apps use placement policies.
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
+-        YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER);
+-    conf.setInt(YarnConfiguration.RM_MAX_COMPLETED_APPLICATIONS,
+-        YarnConfiguration.DEFAULT_RM_MAX_COMPLETED_APPLICATIONS);
+-    setConf(conf);
+-    setupInternal(3);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = new Service();
+-    exampleApp.setName("example-app");
+-    exampleApp.setVersion("v1");
+-    Component comp = createComponent("compa", 3L, "sleep 1000");
+-    PlacementPolicy pp = new PlacementPolicy();
+-    PlacementConstraint pc = new PlacementConstraint();
+-    pc.setName("CA1");
+-    pc.setTargetTags(Collections.singletonList("compa"));
+-    pc.setScope(PlacementScope.NODE);
+-    pc.setType(PlacementType.ANTI_AFFINITY);
+-    pp.setConstraints(Collections.singletonList(pc));
+-    comp.setPlacementPolicy(pp);
+-    exampleApp.addComponent(comp);
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    // Check service is stable and all 3 containers are running
+-    Service service = client.getStatus(exampleApp.getName());
+-    Component component = service.getComponent("compa");
+-    Assert.assertEquals("Service state should be STABLE", ServiceState.STABLE,
+-        service.getState());
+-    Assert.assertEquals("3 containers are expected to be running", 3,
+-        component.getContainers().size());
+-    // Prepare a map of non-AM containers for later lookup
+-    Set<String> nonAMContainerIdSet = new HashSet<>();
+-    for (Container cont : component.getContainers()) {
+-      nonAMContainerIdSet.add(cont.getId());
+-    }
+-
+-    // Verify that no more than 1 non-AM container came up on each of the 3 NMs
+-    Set<String> hosts = new HashSet<>();
+-    ApplicationReport report = client.getYarnClient()
+-        .getApplicationReport(ApplicationId.fromString(exampleApp.getId()));
+-    GetContainersRequest req = GetContainersRequest
+-        .newInstance(report.getCurrentApplicationAttemptId());
+-    ResourceManager rm = getYarnCluster().getResourceManager();
+-    for (ContainerReport contReport : rm.getClientRMService().getContainers(req)
+-        .getContainerList()) {
+-      if (!nonAMContainerIdSet
+-          .contains(contReport.getContainerId().toString())) {
+-        continue;
+-      }
+-      if (hosts.contains(contReport.getNodeHttpAddress())) {
+-        Assert.fail("Container " + contReport.getContainerId()
+-            + " came up in the same host as another container.");
+-      } else {
+-        hosts.add(contReport.getNodeHttpAddress());
+-      }
+-    }
+-
+-    // Flex compa up to 5, which is more containers than the no of NMs
+-    Map<String, Long> compCounts = new HashMap<>();
+-    compCounts.put("compa", 5L);
+-    exampleApp.getComponent("compa").setNumberOfContainers(5L);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    try {
+-      // 10 secs is enough for the container to be started. The down side of
+-      // this test is that it has to wait that long. Setting a higher wait time
+-      // will add to the total time taken by tests to run.
+-      waitForServiceToBeStable(client, exampleApp, 10000);
+-      Assert.fail("Service should not be in a stable state. It should throw "
+-          + "a timeout exception.");
+-    } catch (Exception e) {
+-      // Check that service state is not STABLE and only 3 containers are
+-      // running and the fourth one should not get allocated.
+-      service = client.getStatus(exampleApp.getName());
+-      component = service.getComponent("compa");
+-      Assert.assertNotEquals("Service state should not be STABLE",
+-          ServiceState.STABLE, service.getState());
+-      Assert.assertEquals("Component state should be FLEXING",
+-          ComponentState.FLEXING, component.getState());
+-      Assert.assertEquals("3 containers are expected to be running", 3,
+-          component.getContainers().size());
+-    }
+-
+-    // Flex compa down to 4 now, which is still more containers than the no of
+-    // NMs. This tests the usecase that flex down does not kill any of the
+-    // currently running containers since the required number of containers are
+-    // still higher than the currently running number of containers. However,
+-    // component state will still be FLEXING and service state not STABLE.
+-    compCounts = new HashMap<>();
+-    compCounts.put("compa", 4L);
+-    exampleApp.getComponent("compa").setNumberOfContainers(4L);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    try {
+-      // 10 secs is enough for the container to be started. The down side of
+-      // this test is that it has to wait that long. Setting a higher wait time
+-      // will add to the total time taken by tests to run.
+-      waitForServiceToBeStable(client, exampleApp, 10000);
+-      Assert.fail("Service should not be in a stable state. It should throw "
+-          + "a timeout exception.");
+-    } catch (Exception e) {
+-      // Check that service state is not STABLE and only 3 containers are
+-      // running and the fourth one should not get allocated.
+-      service = client.getStatus(exampleApp.getName());
+-      component = service.getComponent("compa");
+-      Assert.assertNotEquals("Service state should not be STABLE",
+-          ServiceState.STABLE, service.getState());
+-      Assert.assertEquals("Component state should be FLEXING",
+-          ComponentState.FLEXING, component.getState());
+-      Assert.assertEquals("3 containers are expected to be running", 3,
+-          component.getContainers().size());
+-    }
+-
+-    // Finally flex compa down to 3, which is exactly the number of containers
+-    // currently running. This will bring the component and service states to
+-    // STABLE.
+-    compCounts = new HashMap<>();
+-    compCounts.put("compa", 3L);
+-    exampleApp.getComponent("compa").setNumberOfContainers(3L);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    LOG.info("Stop/destroy service {}", exampleApp);
+-    client.actionStop(exampleApp.getName(), true);
+-    client.actionDestroy(exampleApp.getName());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testAMSigtermDoesNotKillApplication() throws Exception {
+-    runAMSignalTest(SignalContainerCommand.GRACEFUL_SHUTDOWN);
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testAMSigkillDoesNotKillApplication() throws Exception {
+-    runAMSignalTest(SignalContainerCommand.FORCEFUL_SHUTDOWN);
+-  }
+-
+-  public void runAMSignalTest(SignalContainerCommand signal) throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-    Service appStatus1 = client.getStatus(exampleApp.getName());
+-    ApplicationId exampleAppId = ApplicationId.fromString(appStatus1.getId());
+-
+-    YarnClient yarnClient = createYarnClient(getConf());
+-    ApplicationReport applicationReport = yarnClient.getApplicationReport(
+-        exampleAppId);
+-
+-    ApplicationAttemptId firstAttemptId = applicationReport
+-        .getCurrentApplicationAttemptId();
+-    ApplicationAttemptReport attemptReport = yarnClient
+-        .getApplicationAttemptReport(firstAttemptId);
+-
+-    // the AM should not perform a graceful shutdown since the operation was not
+-    // initiated through the service client
+-    yarnClient.signalToContainer(attemptReport.getAMContainerId(), signal);
+-
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ApplicationReport ar = client.getYarnClient()
+-            .getApplicationReport(exampleAppId);
+-        YarnApplicationState state = ar.getYarnApplicationState();
+-        Assert.assertTrue(state == YarnApplicationState.RUNNING ||
+-            state == YarnApplicationState.ACCEPTED);
+-        if (state != YarnApplicationState.RUNNING) {
+-          return false;
+-        }
+-        if (ar.getCurrentApplicationAttemptId() == null ||
+-            ar.getCurrentApplicationAttemptId().equals(firstAttemptId)) {
+-          return false;
+-        }
+-        Service appStatus2 = client.getStatus(exampleApp.getName());
+-        if (appStatus2.getState() != ServiceState.STABLE) {
+-          return false;
+-        }
+-        Assert.assertEquals(getSortedContainerIds(appStatus1).toString(),
+-            getSortedContainerIds(appStatus2).toString());
+-        return true;
+-      } catch (YarnException | IOException e) {
+-        throw new RuntimeException("while waiting", e);
+-      }
+-    }, 2000, 200000);
+-  }
+-
+-  private static List<String> getSortedContainerIds(Service s) {
+-    List<String> containerIds = new ArrayList<>();
+-    for (Component component : s.getComponents()) {
+-      for (Container container : component.getContainers()) {
+-        containerIds.add(container.getId());
+-      }
+-    }
+-    Collections.sort(containerIds);
+-    return containerIds;
+-  }
+-
+-  // Test to verify component health threshold monitor. It uses anti-affinity
+-  // placement policy to make it easier to simulate container failure by
+-  // allocating more containers than the no of NMs.
+-  // 1. Start mini cluster with 3 NMs and scheduler placement-constraint handler
+-  // 2. Create an example service of 3 containers with anti-affinity placement
+-  //    policy and health threshold = 65%, window = 3 secs, init-delay = 0 secs,
+-  //    poll-frequency = 1 secs
+-  // 3. Flex the component to 4 containers. This makes health = 75%, so based on
+-  //    threshold the service will continue to run beyond the window of 3 secs.
+-  // 4. Flex the component to 5 containers. This makes health = 60%, so based on
+-  //    threshold the service will be stopped after the window of 3 secs.
+-  @Test (timeout = 200000)
+-  public void testComponentHealthThresholdMonitor() throws Exception {
+-    // We need to enable scheduler placement-constraint at the cluster level to
+-    // let apps use placement policies.
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.set(YarnConfiguration.RM_PLACEMENT_CONSTRAINTS_HANDLER,
+-        YarnConfiguration.SCHEDULER_RM_PLACEMENT_CONSTRAINTS_HANDLER);
+-    conf.setInt(YarnConfiguration.RM_MAX_COMPLETED_APPLICATIONS,
+-        YarnConfiguration.DEFAULT_RM_MAX_COMPLETED_APPLICATIONS);
+-    conf.setInt(YarnConfiguration.NM_VCORES, 1);
+-    setConf(conf);
+-    setupInternal(3);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = new Service();
+-    exampleApp.setName("example-app");
+-    exampleApp.setVersion("v1");
+-    Component comp = createComponent("compa", 3L, "sleep 1000");
+-    PlacementPolicy pp = new PlacementPolicy();
+-    PlacementConstraint pc = new PlacementConstraint();
+-    pc.setName("CA1");
+-    pc.setTargetTags(Collections.singletonList("compa"));
+-    pc.setScope(PlacementScope.NODE);
+-    pc.setType(PlacementType.ANTI_AFFINITY);
+-    pp.setConstraints(Collections.singletonList(pc));
+-    comp.setPlacementPolicy(pp);
+-    Configuration config = new Configuration();
+-    config.setProperty(CONTAINER_HEALTH_THRESHOLD_PERCENT, "65");
+-    config.setProperty(CONTAINER_HEALTH_THRESHOLD_WINDOW_SEC, "3");
+-    config.setProperty(CONTAINER_HEALTH_THRESHOLD_INIT_DELAY_SEC, "0");
+-    config.setProperty(CONTAINER_HEALTH_THRESHOLD_POLL_FREQUENCY_SEC, "1");
+-    config.setProperty(DEFAULT_READINESS_CHECK_ENABLED, "false");
+-    comp.setConfiguration(config);
+-    exampleApp.addComponent(comp);
+-    // Make sure AM does not come up after service is killed for this test
+-    Configuration serviceConfig = new Configuration();
+-    serviceConfig.setProperty(AM_RESTART_MAX, "1");
+-    exampleApp.setConfiguration(serviceConfig);
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    // Check service is stable and all 3 containers are running
+-    Service service = client.getStatus(exampleApp.getName());
+-    Component component = service.getComponent("compa");
+-    Assert.assertEquals("Service state should be STABLE", ServiceState.STABLE,
+-        service.getState());
+-    Assert.assertEquals("3 containers are expected to be running", 3,
+-        component.getContainers().size());
+-
+-    // Flex compa up to 4 - will make health 75% (3 out of 4 running), but still
+-    // above threshold of 65%, so service will continue to run.
+-    Map<String, Long> compCounts = new HashMap<>();
+-    compCounts.put("compa", 4L);
+-    exampleApp.getComponent("compa").setNumberOfContainers(4L);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    try {
+-      // Wait for 6 secs (window 3 secs + 1 for next poll + 2 for buffer). Since
+-      // the service will never go to stable state (because of anti-affinity the
+-      // 4th container will never be allocated) it will timeout. However, after
+-      // the timeout the service should continue to run since health is 75%
+-      // which is above the threshold of 65%.
+-      waitForServiceToBeStable(client, exampleApp, 6000);
+-      Assert.fail("Service should not be in a stable state. It should throw "
+-          + "a timeout exception.");
+-    } catch (Exception e) {
+-      // Check that service state is STARTED and only 3 containers are running
+-      service = client.getStatus(exampleApp.getName());
+-      component = service.getComponent("compa");
+-      Assert.assertEquals("Service state should be STARTED",
+-          ServiceState.STARTED, service.getState());
+-      Assert.assertEquals("Component state should be FLEXING",
+-          ComponentState.FLEXING, component.getState());
+-      Assert.assertEquals("3 containers are expected to be running", 3,
+-          component.getContainers().size());
+-    }
+-
+-    // Flex compa up to 5 - will make health 60% (3 out of 5 running), so
+-    // service will stop since it is below threshold of 65%.
+-    compCounts.put("compa", 5L);
+-    exampleApp.getComponent("compa").setNumberOfContainers(5L);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    try {
+-      // Wait for 14 secs (window 3 secs + 1 for next poll + 2 for buffer + 5
+-      // secs of service wait before shutting down + 3 secs app cleanup so that
+-      // API returns that service is in FAILED state). Note, because of
+-      // anti-affinity the 4th and 5th container will never be allocated.
+-      waitForServiceToBeInState(client, exampleApp, ServiceState.FAILED,
+-          14000);
+-    } catch (Exception e) {
+-      Assert.fail("Should not have thrown exception");
+-    }
+-
+-    LOG.info("Destroy service {}", exampleApp);
+-    client.actionDestroy(exampleApp.getName());
+-  }
+-
+-  // Check containers launched are in dependency order
+-  // Get all containers into a list and sort based on container launch time e.g.
+-  // compa-c1, compa-c2, compb-c1, compb-c2;
+-  // check that the container's launch time are align with the dependencies.
+-  private void checkContainerLaunchDependencies(ServiceClient client,
+-      Service exampleApp, String... compOrder)
+-      throws IOException, YarnException {
+-    Service retrievedApp = client.getStatus(exampleApp.getName());
+-    List<Container> containerList = new ArrayList<>();
+-    for (Component component : retrievedApp.getComponents()) {
+-      containerList.addAll(component.getContainers());
+-    }
+-    // sort based on launchTime
+-    containerList
+-        .sort((o1, o2) -> o1.getLaunchTime().compareTo(o2.getLaunchTime()));
+-    LOG.info("containerList: " + containerList);
+-    // check the containers are in the dependency order.
+-    int index = 0;
+-    for (String comp : compOrder) {
+-      long num = retrievedApp.getComponent(comp).getNumberOfContainers();
+-      for (int i = 0; i < num; i++) {
+-        String compInstanceName = containerList.get(index).getComponentInstanceName();
+-        String compName =
+-            compInstanceName.substring(0, compInstanceName.lastIndexOf('-'));
+-        Assert.assertEquals(comp, compName);
+-        index++;
+-      }
+-    }
+-  }
+-
+-
+-  private Map<String, Long> flexComponents(ServiceClient client,
+-      Service exampleApp, long count) throws YarnException, IOException {
+-    Map<String, Long> compCounts = new HashMap<>();
+-    compCounts.put("compa", count);
+-    compCounts.put("compb", count);
+-    // flex will update the persisted conf to reflect latest number of containers.
+-    exampleApp.getComponent("compa").setNumberOfContainers(count);
+-    exampleApp.getComponent("compb").setNumberOfContainers(count);
+-    client.flexByRestService(exampleApp.getName(), compCounts);
+-    return compCounts;
+-  }
+-
+-  // Check each component's comp instances name are in sequential order.
+-  // E.g. If there are two instances compA-1 and compA-2
+-  // When flex up to 4 instances, it should be compA-1 , compA-2, compA-3, compA-4
+-  // When flex down to 3 instances,  it should be compA-1 , compA-2, compA-3.
+-  private void checkCompInstancesInOrder(ServiceClient client,
+-      Service exampleApp) throws IOException, YarnException,
+-      TimeoutException, InterruptedException {
+-    waitForContainers(client, exampleApp);
+-    Service service = client.getStatus(exampleApp.getName());
+-    for (Component comp : service.getComponents()) {
+-      checkEachCompInstancesInOrder(comp, exampleApp.getName());
+-    }
+-  }
+-
+-  private void waitForContainers(ServiceClient client, Service exampleApp)
+-      throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        Service service = client.getStatus(exampleApp.getName());
+-        for (Component comp : service.getComponents()) {
+-          if (comp.getContainers().size() != comp.getNumberOfContainers()) {
+-            return false;
+-          }
+-        }
+-        return true;
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 2000, 200000);
+-  }
+-
+-  private void checkEachCompInstancesInOrder(Component component, String
+-      serviceName) throws TimeoutException, InterruptedException {
+-    TreeSet<String> instances = new TreeSet<>();
+-    for (Container container : component.getContainers()) {
+-      instances.add(container.getComponentInstanceName());
+-      String componentZKPath = RegistryUtils.componentPath(RegistryUtils
+-          .currentUser(), YarnServiceConstants.APP_TYPE, serviceName,
+-          RegistryPathUtils.encodeYarnID(container.getId()));
+-      GenericTestUtils.waitFor(() -> {
+-        try {
+-          return getCuratorService().zkPathExists(componentZKPath);
+-        } catch (IOException e) {
+-          return false;
+-        }
+-      }, 1000, 60000);
+-    }
+-
+-    int i = 0;
+-    for (String s : instances) {
+-      assertThat(s).isEqualTo(component.getName() + "-" + i);
+-      i++;
+-    }
+-  }
+-
+-  @Test (timeout = 200000)
+-  public void testRestartServiceForNonExistingInRM() throws Exception {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setInt(YarnConfiguration.RM_MAX_COMPLETED_APPLICATIONS, 0);
+-    setConf(conf);
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = createExampleApplication();
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-    try {
+-      client.actionStop(exampleApp.getName(), true);
+-    } catch (ApplicationNotFoundException e) {
+-      LOG.info("ignore ApplicationNotFoundException during stopping");
+-    }
+-    client.actionStart(exampleApp.getName());
+-    waitForServiceToBeStable(client, exampleApp);
+-    Service service = client.getStatus(exampleApp.getName());
+-    Assert.assertEquals("Restarted service state should be STABLE",
+-        ServiceState.STABLE, service.getState());
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testAMFailureValidity() throws Exception {
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = new Service();
+-    exampleApp.setName("example-app");
+-    exampleApp.setVersion("v1");
+-    exampleApp.addComponent(createComponent("compa", 2, "sleep 1000"));
+-    Configuration serviceConfig = new Configuration();
+-    serviceConfig.setProperty(AM_RESTART_MAX, "2");
+-    serviceConfig.setProperty(AM_FAILURES_VALIDITY_INTERVAL, "1000");
+-    exampleApp.setConfiguration(serviceConfig);
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    Service appStatus1 = client.getStatus(exampleApp.getName());
+-    ApplicationId exampleAppId = ApplicationId.fromString(appStatus1.getId());
+-    YarnClient yarnClient = createYarnClient(getConf());
+-
+-    // kill AM1
+-    ApplicationReport applicationReport = yarnClient.getApplicationReport(
+-        exampleAppId);
+-    ApplicationAttemptReport attemptReport = yarnClient
+-        .getApplicationAttemptReport(applicationReport
+-            .getCurrentApplicationAttemptId());
+-    yarnClient.signalToContainer(attemptReport.getAMContainerId(),
+-        SignalContainerCommand.GRACEFUL_SHUTDOWN);
+-    waitForServiceToBeStable(client, exampleApp);
+-    Assert.assertEquals(ServiceState.STABLE, client.getStatus(
+-        exampleApp.getName()).getState());
+-
+-    // kill AM2 after 'yarn.service.am-failure.validity-interval-ms'
+-    Thread.sleep(2000);
+-    applicationReport = yarnClient.getApplicationReport(exampleAppId);
+-    attemptReport = yarnClient.getApplicationAttemptReport(applicationReport
+-        .getCurrentApplicationAttemptId());
+-    yarnClient.signalToContainer(attemptReport.getAMContainerId(),
+-        SignalContainerCommand.GRACEFUL_SHUTDOWN);
+-    waitForServiceToBeStable(client, exampleApp);
+-    Assert.assertEquals(ServiceState.STABLE, client.getStatus(
+-        exampleApp.getName()).getState());
+-  }
+-
+-  public Service createServiceWithSingleComp(int memory){
+-    Service service = new Service();
+-    service.setName("example-app");
+-    service.setVersion("v1");
+-    Component component = new Component();
+-    component.setName("sleep");
+-    component.setNumberOfContainers(1L);
+-    component.setLaunchCommand("sleep 1000");
+-    org.apache.hadoop.yarn.service.api.records.Resource resource = new Resource();
+-    resource.setMemory(Integer.toString(memory));
+-    resource.setCpus(1);
+-    component.setResource(resource);
+-    service.addComponent(component);
+-    return service;
+-  }
+-
+-  @Test(timeout = 200000)
+-  public void testServiceSameNameWithFailure() throws Exception{
+-    setupInternal(NUM_NMS);
+-    ServiceClient client = createClient(getConf());
+-    try {
+-      client.actionCreate(createServiceWithSingleComp(1024000));
+-      Assert.fail("Service should throw YarnException as memory is " +
+-          "configured as 1000GB, which is more than allowed");
+-    } catch (YarnException e) {
+-      Assert.assertTrue(true);
+-    }
+-    Service service = createServiceWithSingleComp(128);
+-    try {
+-      client.actionCreate(service);
+-    } catch (SliderException e){
+-      Assert.fail("Not able to submit service as the files related to" +
+-          " failed service with same name are not cleared");
+-    }
+-    waitForServiceToBeStable(client,service);
+-    client.actionStop(service.getName(), true);
+-    client.actionDestroy(service.getName());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestBuildExternalComponents.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestBuildExternalComponents.java
+deleted file mode 100644
+index 6d5bb205cb1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestBuildExternalComponents.java
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.client.api.AppAdminClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.conf.ExampleAppJson;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.YARN_SERVICE_BASE_PATH;
+-
+-/**
+- * Test for building / resolving components of type SERVICE.
+- */
+-public class TestBuildExternalComponents {
+-
+-  protected Configuration conf = new YarnConfiguration();
+-  private File basedir;
+-
+-  // Check component names match with expected
+-  private static void checkComponentNames(List<Component> components,
+-      Set<String> expectedComponents) {
+-    Assert.assertEquals(expectedComponents.size(), components.size());
+-    for (Component comp : components) {
+-      Assert.assertTrue(expectedComponents.contains(comp.getName()));
+-    }
+-  }
+-
+-  // 1. Build the def file and store on fs
+-  // 2. check component names
+-  private void buildAndCheckComponents(String appName, String appDef,
+-      SliderFileSystem sfs, Set<String> names) throws Throwable {
+-    AppAdminClient client = AppAdminClient.createAppAdminClient(AppAdminClient
+-        .UNIT_TEST_TYPE, conf);
+-    client.actionSave(ExampleAppJson.resourceName(appDef), null, null,
+-        null);
+-
+-    // verify generated conf
+-    List<Component> components =
+-        ServiceApiUtil.getComponents(sfs, appName);
+-    checkComponentNames(components, names);
+-  }
+-
+-  @Before
+-  public void setup() throws IOException {
+-    basedir = new File("target", "apps");
+-    if (basedir.exists()) {
+-      FileUtils.deleteDirectory(basedir);
+-    } else {
+-      basedir.mkdirs();
+-    }
+-    conf.set(YARN_SERVICE_BASE_PATH, basedir.getAbsolutePath());
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    if (basedir != null) {
+-      FileUtils.deleteDirectory(basedir);
+-    }
+-  }
+-
+-  // Test applications defining external components(SERVICE type)
+-  // can be resolved correctly
+-  @Test
+-  public void testExternalComponentBuild() throws Throwable {
+-    SliderFileSystem sfs = new SliderFileSystem(conf);
+-
+-    Set<String> nameSet = new HashSet<>();
+-    nameSet.add("simple");
+-    nameSet.add("master");
+-    nameSet.add("worker");
+-
+-    // app-1 has 3 components: simple, master, worker
+-    buildAndCheckComponents("app-1", ExampleAppJson.APP_JSON, sfs, nameSet);
+-    buildAndCheckComponents("external-0", ExampleAppJson.EXTERNAL_JSON_0, sfs,
+-        nameSet);
+-
+-    nameSet.add("other");
+-
+-    // external1 has 3 components: simple(SERVICE - app1), master and other
+-    buildAndCheckComponents("external-1", ExampleAppJson.EXTERNAL_JSON_1, sfs,
+-        nameSet);
+-
+-    nameSet.add("another");
+-
+-    // external2 has 2 components: ext(SERVICE - external1), another
+-    buildAndCheckComponents("external-2", ExampleAppJson.EXTERNAL_JSON_2, sfs,
+-        nameSet);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceCLI.java
+deleted file mode 100644
+index f75c0afdbeb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceCLI.java
++++ /dev/null
+@@ -1,354 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.DFSConfigKeys;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.ToolRunner;
+-import org.apache.hadoop.yarn.client.cli.ApplicationCLI;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.conf.ExampleAppJson;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.junit.rules.TemporaryFolder;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.util.Arrays;
+-import java.util.List;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static org.apache.hadoop.yarn.client.api.AppAdminClient.YARN_APP_ADMIN_CLIENT_PREFIX;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEPENDENCY_TARBALL_PATH;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.YARN_SERVICE_BASE_PATH;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.EXIT_SUCCESS;
+-import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.EXIT_UNAUTHORIZED;
+-import static org.mockito.Mockito.spy;
+-
+-public class TestServiceCLI {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestServiceCLI
+-      .class);
+-
+-  @Rule
+-  public TemporaryFolder tmpFolder = new TemporaryFolder();
+-
+-  private Configuration conf = new YarnConfiguration();
+-  private SliderFileSystem fs;
+-  private ApplicationCLI cli;
+-  private File basedir;
+-  private String basedirProp;
+-  private File dependencyTarGzBaseDir;
+-  private Path dependencyTarGz;
+-  private String dependencyTarGzProp;
+-  private String yarnAdminNoneAclProp;
+-  private String dfsAdminAclProp;
+-
+-  private void createCLI() {
+-    cli = new ApplicationCLI();
+-    PrintStream sysOut = spy(new PrintStream(new ByteArrayOutputStream()));
+-    PrintStream sysErr = spy(new PrintStream(new ByteArrayOutputStream()));
+-    cli.setSysOutPrintStream(sysOut);
+-    cli.setSysErrPrintStream(sysErr);
+-    conf.set(YARN_APP_ADMIN_CLIENT_PREFIX + DUMMY_APP_TYPE,
+-        DummyServiceClient.class.getName());
+-    cli.setConf(conf);
+-  }
+-
+-  private int runCLI(String[] args) throws Exception {
+-    LOG.info("running CLI: yarn {}", Arrays.asList(args));
+-    return ToolRunner.run(cli, ApplicationCLI.preProcessArgs(args));
+-  }
+-
+-  private void buildApp(String serviceName, String appDef) throws Throwable {
+-    String[] args = {"app",
+-        "-D", basedirProp, "-save", serviceName,
+-        ExampleAppJson.resourceName(appDef),
+-        "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_SUCCESS, runCLI(args));
+-  }
+-
+-  private void buildApp(String serviceName, String appDef,
+-      String lifetime, String queue) throws Throwable {
+-    String[] args = {"app",
+-        "-D", basedirProp, "-save", serviceName,
+-        ExampleAppJson.resourceName(appDef),
+-        "-appTypes", DUMMY_APP_TYPE,
+-        "-updateLifetime", lifetime,
+-        "-changeQueue", queue};
+-    Assert.assertEquals(EXIT_SUCCESS, runCLI(args));
+-  }
+-
+-  private static Path getDependencyTarGz(File dir) {
+-    return new Path(new File(dir, YarnServiceConstants
+-        .DEPENDENCY_TAR_GZ_FILE_NAME + YarnServiceConstants
+-        .DEPENDENCY_TAR_GZ_FILE_EXT).getAbsolutePath());
+-  }
+-
+-  @Before
+-  public void setup() throws Throwable {
+-    basedir = new File("target", "apps");
+-    basedirProp = YARN_SERVICE_BASE_PATH + "=" + basedir.getAbsolutePath();
+-    conf.set(YARN_SERVICE_BASE_PATH, basedir.getAbsolutePath());
+-    fs = new SliderFileSystem(conf);
+-    dependencyTarGzBaseDir = tmpFolder.getRoot();
+-    fs.getFileSystem()
+-        .setPermission(new Path(dependencyTarGzBaseDir.getAbsolutePath()),
+-            new FsPermission("755"));
+-    dependencyTarGz = getDependencyTarGz(dependencyTarGzBaseDir);
+-    dependencyTarGzProp = DEPENDENCY_TARBALL_PATH + "=" + dependencyTarGz
+-        .toString();
+-    conf.set(DEPENDENCY_TARBALL_PATH, dependencyTarGz.toString());
+-
+-    if (basedir.exists()) {
+-      FileUtils.deleteDirectory(basedir);
+-    } else {
+-      basedir.mkdirs();
+-    }
+-    yarnAdminNoneAclProp = YarnConfiguration.YARN_ADMIN_ACL + "=none";
+-    dfsAdminAclProp = DFSConfigKeys.DFS_ADMIN + "=" +
+-        UserGroupInformation.getCurrentUser();
+-    System.setProperty(YarnServiceConstants.PROPERTY_LIB_DIR, basedir
+-        .getAbsolutePath());
+-    createCLI();
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    if (basedir != null) {
+-      FileUtils.deleteDirectory(basedir);
+-    }
+-    cli.stop();
+-  }
+-
+-  @Test (timeout = 180000)
+-  public void testFlexComponents() throws Throwable {
+-    // currently can only test building apps, since that is the only
+-    // operation that doesn't require an RM
+-    // TODO: expand CLI test to try other commands
+-    String serviceName = "app-1";
+-    buildApp(serviceName, ExampleAppJson.APP_JSON);
+-    checkApp(serviceName, "master", 1L, 3600L, null);
+-
+-    serviceName = "app-2";
+-    buildApp(serviceName, ExampleAppJson.APP_JSON, "1000", "qname");
+-    checkApp(serviceName, "master", 1L, 1000L, "qname");
+-  }
+-
+-  @Test
+-  public void testInitiateServiceUpgrade() throws Exception {
+-    String[] args = {"app", "-upgrade", "app-1",
+-        "-initiate", ExampleAppJson.resourceName(ExampleAppJson.APP_JSON),
+-        "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test (timeout = 180000)
+-  public void testInitiateAutoFinalizeServiceUpgrade() throws Exception {
+-    String[] args =  {"app", "-upgrade", "app-1",
+-        "-initiate", ExampleAppJson.resourceName(ExampleAppJson.APP_JSON),
+-        "-autoFinalize",
+-        "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test
+-  public void testUpgradeInstances() throws Exception {
+-    conf.set(YARN_APP_ADMIN_CLIENT_PREFIX + DUMMY_APP_TYPE,
+-        DummyServiceClient.class.getName());
+-    cli.setConf(conf);
+-    String[] args = {"app", "-upgrade", "app-1",
+-        "-instances", "comp1-0,comp1-1",
+-        "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test
+-  public void testUpgradeComponents() throws Exception {
+-    conf.set(YARN_APP_ADMIN_CLIENT_PREFIX + DUMMY_APP_TYPE,
+-        DummyServiceClient.class.getName());
+-    cli.setConf(conf);
+-    String[] args = {"app", "-upgrade", "app-1",
+-        "-components", "comp1,comp2",
+-        "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test
+-  public void testGetInstances() throws Exception {
+-    conf.set(YARN_APP_ADMIN_CLIENT_PREFIX + DUMMY_APP_TYPE,
+-        DummyServiceClient.class.getName());
+-    cli.setConf(conf);
+-    String[] args = {"container", "-list", "app-1",
+-        "-components", "comp1,comp2",
+-        "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test
+-  public void testCancelUpgrade() throws Exception {
+-    conf.set(YARN_APP_ADMIN_CLIENT_PREFIX + DUMMY_APP_TYPE,
+-        DummyServiceClient.class.getName());
+-    cli.setConf(conf);
+-    String[] args = {"app", "-upgrade", "app-1",
+-        "-cancel", "-appTypes", DUMMY_APP_TYPE};
+-    int result = cli.run(ApplicationCLI.preProcessArgs(args));
+-    assertThat(result).isEqualTo(0);
+-  }
+-
+-  @Test (timeout = 180000)
+-  public void testEnableFastLaunch() throws Exception {
+-    fs.getFileSystem().create(new Path(basedir.getAbsolutePath(), "test.jar"))
+-        .close();
+-
+-    Path defaultPath = new Path(dependencyTarGz.toString());
+-    Assert.assertFalse("Dependency tarball should not exist before the test",
+-        fs.isFile(defaultPath));
+-    String[] args = {"app", "-D", dependencyTarGzProp, "-enableFastLaunch",
+-        "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_SUCCESS, runCLI(args));
+-    Assert.assertTrue("Dependency tarball did not exist after the test",
+-        fs.isFile(defaultPath));
+-
+-    File secondBaseDir = new File(dependencyTarGzBaseDir, "2");
+-    Path secondTarGz = getDependencyTarGz(secondBaseDir);
+-    Assert.assertFalse("Dependency tarball should not exist before the test",
+-        fs.isFile(secondTarGz));
+-    String[] args2 = {"app", "-D", yarnAdminNoneAclProp, "-D",
+-        dfsAdminAclProp, "-D", dependencyTarGzProp, "-enableFastLaunch",
+-        secondBaseDir.getAbsolutePath(), "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_SUCCESS, runCLI(args2));
+-    Assert.assertTrue("Dependency tarball did not exist after the test",
+-        fs.isFile(secondTarGz));
+-  }
+-
+-  @Test (timeout = 180000)
+-  public void testEnableFastLaunchUserPermissions() throws Exception {
+-    String[] args = {"app", "-D", yarnAdminNoneAclProp, "-D",
+-        dependencyTarGzProp, "-enableFastLaunch", "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_UNAUTHORIZED, runCLI(args));
+-  }
+-
+-  @Test (timeout = 180000)
+-  public void testEnableFastLaunchFilePermissions() throws Exception {
+-    File badDir = new File(dependencyTarGzBaseDir, "bad");
+-    badDir.mkdir();
+-    fs.getFileSystem().setPermission(new Path(badDir.getAbsolutePath()),
+-        new FsPermission("751"));
+-
+-    String[] args = {"app", "-D", dependencyTarGzProp, "-enableFastLaunch",
+-        badDir.getAbsolutePath(), "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_UNAUTHORIZED, runCLI(args));
+-
+-    badDir = new File(badDir, "child");
+-    badDir.mkdir();
+-    fs.getFileSystem().setPermission(new Path(badDir.getAbsolutePath()),
+-        new FsPermission("755"));
+-
+-    String[] args2 = {"app", "-D", dependencyTarGzProp, "-enableFastLaunch",
+-        badDir.getAbsolutePath(), "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_UNAUTHORIZED, runCLI(args2));
+-
+-    badDir = new File(dependencyTarGzBaseDir, "badx");
+-    badDir.mkdir();
+-    fs.getFileSystem().setPermission(new Path(badDir.getAbsolutePath()),
+-        new FsPermission("754"));
+-
+-    String[] args3 = {"app", "-D", dependencyTarGzProp, "-enableFastLaunch",
+-        badDir.getAbsolutePath(), "-appTypes", DUMMY_APP_TYPE};
+-    Assert.assertEquals(EXIT_UNAUTHORIZED, runCLI(args3));
+-  }
+-
+-  private void checkApp(String serviceName, String compName, long count, Long
+-      lifetime, String queue) throws IOException {
+-    Service service = ServiceApiUtil.loadService(fs, serviceName);
+-    Assert.assertEquals(serviceName, service.getName());
+-    Assert.assertEquals(lifetime, service.getLifetime());
+-    Assert.assertEquals(queue, service.getQueue());
+-    List<Component> components = service.getComponents();
+-    for (Component component : components) {
+-      if (component.getName().equals(compName)) {
+-        Assert.assertEquals(count, component.getNumberOfContainers()
+-            .longValue());
+-        return;
+-      }
+-    }
+-    Assert.fail();
+-  }
+-
+-  private static final String DUMMY_APP_TYPE = "dummy";
+-
+-  /**
+-   * Dummy service client for test purpose.
+-   */
+-  public static class DummyServiceClient extends ServiceClient {
+-
+-    @Override
+-    public int initiateUpgrade(String appName, String fileName,
+-        boolean autoFinalize) throws IOException, YarnException {
+-      return 0;
+-    }
+-
+-    @Override
+-    public int actionUpgradeInstances(String appName,
+-        List<String> componentInstances) throws IOException, YarnException {
+-      return 0;
+-    }
+-
+-    @Override
+-    public int actionUpgradeComponents(String appName, List<String> components)
+-        throws IOException, YarnException {
+-      return 0;
+-    }
+-
+-    @Override
+-    public String getInstances(String appName, List<String> components,
+-        String version, List<String> containerStates)
+-        throws IOException, YarnException {
+-      return "";
+-    }
+-
+-    @Override
+-    public int actionCancelUpgrade(String appName) throws IOException,
+-        YarnException {
+-      return 0;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceClient.java
+deleted file mode 100644
+index 85da12f4d0a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceClient.java
++++ /dev/null
+@@ -1,334 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.client;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.ClientAMProtocol;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.CompInstancesUpgradeResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesResponseProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceRequestProto;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.UpgradeServiceResponseProto;
+-import org.apache.hadoop.yarn.service.MockRunningServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.apache.hadoop.yarn.service.exceptions.ErrorStrings;
+-import org.apache.hadoop.yarn.service.utils.FilterUtils;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.mockito.stubbing.Answer;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for {@link ServiceClient}.
+- */
+-public class TestServiceClient {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      TestServiceClient.class);
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test
+-  public void testAMEnvCustomClasspath() throws Exception {
+-    Service service = createService();
+-    service.getComponents().forEach(comp ->
+-            comp.setRestartPolicy(Component.RestartPolicyEnum.NEVER));
+-    ServiceClient client = MockServiceClient.create(rule, service, true);
+-    //saving the original value of the param, for restoration purposes
+-    String oldParam = client.getConfig().get("yarn.service.classpath", "");
+-    String originalPath = client.addAMEnv().get("CLASSPATH");
+-
+-    client.getConfig().set("yarn.service.classpath", "{{VAR_1}},{{VAR_2}}");
+-    String newPath = client.addAMEnv().get("CLASSPATH");
+-
+-    Assert.assertEquals(originalPath + "<CPS>{{VAR_1}}<CPS>{{VAR_2}}", newPath);
+-    //restoring the original value for service classpath
+-    client.getConfig().set("yarn.service.classpath", oldParam);
+-
+-    newPath = client.addAMEnv().get("CLASSPATH");
+-    Assert.assertEquals(originalPath, newPath);
+-
+-    client.stop();
+-  }
+-
+-  @Test
+-  public void testUpgradeDisabledByDefault() throws Exception {
+-    Service service = createService();
+-    ServiceClient client = MockServiceClient.create(rule, service, false);
+-
+-    //upgrade the service
+-    service.setVersion("v2");
+-    try {
+-      client.initiateUpgrade(service);
+-    } catch (YarnException ex) {
+-      Assert.assertEquals(ErrorStrings.SERVICE_UPGRADE_DISABLED,
+-          ex.getMessage());
+-      return;
+-    }
+-    Assert.fail();
+-  }
+-
+-  @Test
+-  public void testActionServiceUpgrade() throws Exception {
+-    Service service = createService();
+-    ServiceClient client = MockServiceClient.create(rule, service, true);
+-
+-    //upgrade the service
+-    service.setVersion("v2");
+-    client.initiateUpgrade(service);
+-
+-    Service fromFs = ServiceApiUtil.loadServiceUpgrade(rule.getFs(),
+-        service.getName(), service.getVersion());
+-    Assert.assertEquals(service.getName(), fromFs.getName());
+-    Assert.assertEquals(service.getVersion(), fromFs.getVersion());
+-    client.stop();
+-  }
+-
+-  @Test
+-  public void testActionCompInstanceUpgrade() throws Exception {
+-    Service service = createService();
+-    MockServiceClient client = MockServiceClient.create(rule, service, true);
+-
+-    //upgrade the service
+-    service.setVersion("v2");
+-    client.initiateUpgrade(service);
+-
+-    //add containers to the component that needs to be upgraded.
+-    Component comp = service.getComponents().iterator().next();
+-    ContainerId containerId = ContainerId.newContainerId(client.attemptId, 1L);
+-    comp.addContainer(new Container().id(containerId.toString()));
+-
+-    client.actionUpgrade(service, comp.getContainers());
+-    CompInstancesUpgradeResponseProto response = client.getLastProxyResponse(
+-        CompInstancesUpgradeResponseProto.class);
+-    Assert.assertNotNull("upgrade did not complete", response);
+-    client.stop();
+-  }
+-
+-  @Test
+-  public void testGetCompInstances() throws Exception {
+-    Service service = createService();
+-    MockServiceClient client = MockServiceClient.create(rule, service, true);
+-
+-    //upgrade the service
+-    service.setVersion("v2");
+-    client.initiateUpgrade(service);
+-
+-    //add containers to the component that needs to be upgraded.
+-    Component comp = service.getComponents().iterator().next();
+-    ContainerId containerId = ContainerId.newContainerId(client.attemptId, 1L);
+-    comp.addContainer(new Container().id(containerId.toString()));
+-
+-    ComponentContainers[] compContainers = client.getContainers(
+-        service.getName(), Lists.newArrayList("compa"), "v1", null);
+-    Assert.assertEquals("num comp", 1, compContainers.length);
+-    Assert.assertEquals("comp name", "compa",
+-        compContainers[0].getComponentName());
+-    Assert.assertEquals("num containers", 2,
+-        compContainers[0].getContainers().size());
+-    client.stop();
+-  }
+-
+-  @Test
+-  public void testUpgradeDisabledWhenAllCompsHaveNeverRestartPolicy()
+-      throws Exception {
+-    Service service = createService();
+-    service.getComponents().forEach(comp ->
+-        comp.setRestartPolicy(Component.RestartPolicyEnum.NEVER));
+-
+-    ServiceClient client = MockServiceClient.create(rule, service, true);
+-
+-    //upgrade the service
+-    service.setVersion("v2");
+-    try {
+-      client.initiateUpgrade(service);
+-    } catch (YarnException ex) {
+-      Assert.assertEquals("All the components of the service " +
+-              service.getName() + " have " + Component.RestartPolicyEnum.NEVER
+-              + " restart policy, so it cannot be upgraded.",
+-          ex.getMessage());
+-      return;
+-    }
+-    Assert.fail();
+-  }
+-
+-  private Service createService() throws IOException,
+-      YarnException {
+-    Service service = ServiceTestUtils.createExampleApplication();
+-    service.setVersion("v1");
+-    service.setState(ServiceState.UPGRADING);
+-    return service;
+-  }
+-
+-  private static final class MockServiceClient extends ServiceClient {
+-
+-    private final ApplicationId appId;
+-    private final ApplicationAttemptId attemptId;
+-    private final ClientAMProtocol amProxy;
+-    private Object proxyResponse;
+-    private Service service;
+-    private ServiceContext context;
+-
+-    private MockServiceClient()  {
+-      amProxy = mock(ClientAMProtocol.class);
+-      appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-      LOG.debug("mocking service client for {}", appId);
+-      attemptId = ApplicationAttemptId.newInstance(appId, 1);
+-    }
+-
+-    static MockServiceClient create(ServiceTestUtils.ServiceFSWatcher rule,
+-        Service service, boolean enableUpgrade)
+-        throws Exception {
+-      MockServiceClient client = new MockServiceClient();
+-      ApplicationId applicationId = ApplicationId.newInstance(
+-          System.currentTimeMillis(), 1);
+-      service.setId(applicationId.toString());
+-      client.context = new MockRunningServiceContext(rule, service);
+-
+-      YarnClient yarnClient = createMockYarnClient();
+-      ApplicationReport appReport = mock(ApplicationReport.class);
+-      when(appReport.getHost()).thenReturn("localhost");
+-      when(appReport.getYarnApplicationState()).thenReturn(
+-          YarnApplicationState.RUNNING);
+-
+-      ApplicationAttemptReport attemptReport =
+-          ApplicationAttemptReport.newInstance(client.attemptId, "localhost", 0,
+-              null, null, null,
+-              YarnApplicationAttemptState.RUNNING, null);
+-      when(yarnClient.getApplicationAttemptReport(any()))
+-          .thenReturn(attemptReport);
+-      when(yarnClient.getApplicationReport(client.appId)).thenReturn(appReport);
+-      when(client.amProxy.upgrade(
+-          any(UpgradeServiceRequestProto.class))).thenAnswer(
+-          (Answer<UpgradeServiceResponseProto>) invocation -> {
+-              UpgradeServiceResponseProto response =
+-                  UpgradeServiceResponseProto.newBuilder().build();
+-              client.proxyResponse = response;
+-              return response;
+-            });
+-      when(client.amProxy.upgrade(any(
+-          CompInstancesUpgradeRequestProto.class))).thenAnswer(
+-          (Answer<CompInstancesUpgradeResponseProto>) invocation -> {
+-              CompInstancesUpgradeResponseProto response =
+-                  CompInstancesUpgradeResponseProto.newBuilder().build();
+-              client.proxyResponse = response;
+-              return response;
+-            });
+-
+-      when(client.amProxy.getCompInstances(any(
+-          GetCompInstancesRequestProto.class))).thenAnswer(
+-          (Answer<GetCompInstancesResponseProto>) invocation -> {
+-
+-              GetCompInstancesRequestProto req = (GetCompInstancesRequestProto)
+-                  invocation.getArguments()[0];
+-
+-              List<ComponentContainers> compContainers =
+-                  FilterUtils.filterInstances(client.context, req);
+-              GetCompInstancesResponseProto response =
+-                  GetCompInstancesResponseProto.newBuilder().setCompInstances(
+-                      ServiceApiUtil.COMP_CONTAINERS_JSON_SERDE.toJson(
+-                          compContainers.toArray(
+-                              new ComponentContainers[compContainers.size()])))
+-                      .build();
+-
+-              client.proxyResponse = response;
+-              return response;
+-          });
+-
+-      client.setFileSystem(rule.getFs());
+-      client.setYarnClient(yarnClient);
+-      client.service = service;
+-      rule.getConf().setBoolean(YarnServiceConf.YARN_SERVICE_UPGRADE_ENABLED,
+-          enableUpgrade);
+-      client.init(rule.getConf());
+-      client.start();
+-      client.actionCreate(service);
+-      return client;
+-    }
+-
+-    @Override
+-    protected void serviceInit(Configuration configuration) throws Exception {
+-    }
+-
+-    @Override
+-    protected ClientAMProtocol createAMProxy(String serviceName,
+-        ApplicationReport appReport) throws IOException, YarnException {
+-      return amProxy;
+-    }
+-
+-    @Override
+-    ApplicationId submitApp(Service app) throws IOException, YarnException {
+-      return appId;
+-    }
+-
+-    @Override
+-    public Service getStatus(String serviceName) throws IOException,
+-        YarnException {
+-      service.setState(ServiceState.STABLE);
+-      return service;
+-    }
+-
+-    private <T> T getLastProxyResponse(Class<T> clazz) {
+-      if (clazz.isInstance(proxyResponse)) {
+-        return clazz.cast(proxyResponse);
+-      }
+-      return null;
+-    }
+-  }
+-
+-  private static YarnClient createMockYarnClient() throws IOException,
+-      YarnException {
+-    YarnClient yarnClient = mock(YarnClient.class);
+-    when(yarnClient.getApplications(any(
+-        GetApplicationsRequest.class))).thenReturn(new ArrayList<>());
+-    return yarnClient;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponent.java
+deleted file mode 100644
+index f8f948dd88f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponent.java
++++ /dev/null
+@@ -1,517 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.MockRunningServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.TestServiceManager;
+-import org.apache.hadoop.yarn.service.api.records.ComponentState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEvent;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType;
+-import org.apache.log4j.Logger;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-
+-import java.util.Iterator;
+-
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.BECOME_READY;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.START;
+-import static org.apache.hadoop.yarn.service.component.instance.ComponentInstanceEventType.STOP;
+-
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConstants
+-    .CONTAINER_STATE_REPORT_AS_SERVICE_STATE;
+-
+-/**
+- * Tests for {@link Component}.
+- */
+-public class TestComponent {
+-
+-  static final Logger LOG = Logger.getLogger(TestComponent.class);
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test
+-  public void testComponentUpgrade() throws Exception {
+-    ServiceContext context = createTestContext(rule, "testComponentUpgrade");
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-
+-    ComponentEvent upgradeEvent = new ComponentEvent(comp.getName(),
+-        ComponentEventType.UPGRADE);
+-    comp.handle(upgradeEvent);
+-    Assert.assertEquals("component not in need upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-  }
+-
+-  @Test
+-  public void testCheckState() throws Exception {
+-    String serviceName = "testCheckState";
+-    ServiceContext context = createTestContext(rule, serviceName);
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-
+-    comp.handle(new ComponentEvent(comp.getName(), ComponentEventType.UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(serviceName, comp.getName(), "key1",
+-            "val1")).setUpgradeVersion("v2"));
+-
+-    // one instance finished upgrading
+-    comp.getUpgradeStatus().decContainersThatNeedUpgrade();
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-    Assert.assertEquals("component not in need upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-
+-    // second instance finished upgrading
+-    comp.getUpgradeStatus().decContainersThatNeedUpgrade();
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in stable state",
+-        ComponentState.STABLE, comp.getComponentSpec().getState());
+-    Assert.assertEquals("component did not upgrade successfully", "val1",
+-        comp.getComponentSpec().getConfiguration().getEnv("key1"));
+-  }
+-
+-  @Test
+-  public void testContainerCompletedWhenUpgrading() throws Exception {
+-    String serviceName = "testContainerCompletedWhenUpgrading";
+-    MockRunningServiceContext context = createTestContext(rule, serviceName);
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-
+-    comp.handle(new ComponentEvent(comp.getName(), ComponentEventType.UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(serviceName, comp.getName(), "key1",
+-            "val1")).setUpgradeVersion("v2"));
+-    comp.getAllComponentInstances().forEach(instance ->
+-        instance.handle(new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE)));
+-
+-    // reinitialization of a container failed
+-    for(ComponentInstance instance : comp.getAllComponentInstances()) {
+-      ComponentEvent stopEvent = new ComponentEvent(comp.getName(),
+-          ComponentEventType.CONTAINER_COMPLETED)
+-          .setInstance(instance)
+-          .setContainerId(instance.getContainer().getId());
+-      comp.handle(stopEvent);
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), STOP));
+-    }
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in needs upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-  }
+-
+-  @Test
+-  public void testCancelUpgrade() throws Exception {
+-    ServiceContext context = createTestContext(rule, "testCancelUpgrade");
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-
+-    ComponentEvent upgradeEvent = new ComponentEvent(comp.getName(),
+-        ComponentEventType.CANCEL_UPGRADE);
+-    comp.handle(upgradeEvent);
+-    Assert.assertEquals("component not in need upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-
+-    Assert.assertEquals(
+-        org.apache.hadoop.yarn.service.component.ComponentState
+-            .CANCEL_UPGRADING, comp.getState());
+-  }
+-
+-  @Test
+-  public void testContainerCompletedCancelUpgrade() throws Exception {
+-    String serviceName = "testContainerCompletedCancelUpgrade";
+-    MockRunningServiceContext context = createTestContext(rule, serviceName);
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-
+-    // upgrade completes
+-    comp.handle(new ComponentEvent(comp.getName(), ComponentEventType.UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(serviceName, comp.getName(), "key1",
+-            "val1")).setUpgradeVersion("v2"));
+-    comp.getAllComponentInstances().forEach(instance ->
+-        instance.handle(new ComponentInstanceEvent(
+-            instance.getContainer().getId(),
+-            ComponentInstanceEventType.UPGRADE)));
+-
+-    // reinitialization of a container done
+-    for(ComponentInstance instance : comp.getAllComponentInstances()) {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), START));
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), BECOME_READY));
+-    }
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CANCEL_UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(serviceName, comp.getName(), "key1",
+-            "val0")).setUpgradeVersion("v1"));
+-    comp.getAllComponentInstances().forEach(instance ->
+-        instance.handle(new ComponentInstanceEvent(
+-            instance.getContainer().getId(),
+-            ComponentInstanceEventType.CANCEL_UPGRADE)));
+-
+-    Iterator<ComponentInstance> iter = comp.getAllComponentInstances()
+-        .iterator();
+-
+-    // cancel upgrade failed of a container
+-    ComponentInstance instance1 = iter.next();
+-    ComponentEvent stopEvent = new ComponentEvent(comp.getName(),
+-        ComponentEventType.CONTAINER_COMPLETED)
+-        .setInstance(instance1)
+-        .setContainerId(instance1.getContainer().getId());
+-    comp.handle(stopEvent);
+-    instance1.handle(new ComponentInstanceEvent(
+-        instance1.getContainer().getId(), STOP));
+-    Assert.assertEquals(
+-        org.apache.hadoop.yarn.service.component.ComponentState
+-            .CANCEL_UPGRADING, comp.getState());
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in needs upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-    Assert.assertEquals(
+-        org.apache.hadoop.yarn.service.component.ComponentState
+-            .CANCEL_UPGRADING, comp.getState());
+-
+-    // second instance finished upgrading
+-    ComponentInstance instance2 = iter.next();
+-    instance2.handle(new ComponentInstanceEvent(
+-        instance2.getContainer().getId(), ComponentInstanceEventType.START));
+-    instance2.handle(new ComponentInstanceEvent(
+-        instance2.getContainer().getId(),
+-        ComponentInstanceEventType.BECOME_READY));
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in flexing state",
+-        ComponentState.FLEXING, comp.getComponentSpec().getState());
+-    // new container get allocated
+-    context.assignNewContainer(context.attemptId, 10, comp);
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-            ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in stable state",
+-        ComponentState.STABLE, comp.getComponentSpec().getState());
+-    Assert.assertEquals("cancel upgrade failed", "val0",
+-        comp.getComponentSpec().getConfiguration().getEnv("key1"));
+-  }
+-
+-  @Test
+-  public void testCancelUpgradeSuccessWhileUpgrading() throws Exception {
+-    String serviceName = "testCancelUpgradeWhileUpgrading";
+-    MockRunningServiceContext context = createTestContext(rule, serviceName);
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-    cancelUpgradeWhileUpgrading(context, comp);
+-
+-    // cancel upgrade successful for both instances
+-    for(ComponentInstance instance : comp.getAllComponentInstances()) {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.START));
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.BECOME_READY));
+-    }
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in stable state",
+-        ComponentState.STABLE, comp.getComponentSpec().getState());
+-    Assert.assertEquals("cancel upgrade failed", "val0",
+-        comp.getComponentSpec().getConfiguration().getEnv("key1"));
+-  }
+-
+-  @Test
+-  public void testCancelUpgradeFailureWhileUpgrading() throws Exception {
+-    String serviceName = "testCancelUpgradeFailureWhileUpgrading";
+-    MockRunningServiceContext context = createTestContext(rule, serviceName);
+-    Component comp = context.scheduler.getAllComponents().entrySet().iterator()
+-        .next().getValue();
+-    cancelUpgradeWhileUpgrading(context, comp);
+-
+-    // cancel upgrade failed for both instances
+-    for(ComponentInstance instance : comp.getAllComponentInstances()) {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.STOP));
+-    }
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in flexing state",
+-        ComponentState.FLEXING, comp.getComponentSpec().getState());
+-
+-    for (ComponentInstance instance : comp.getAllComponentInstances()) {
+-      // new container get allocated
+-      context.assignNewContainer(context.attemptId, 10, comp);
+-    }
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in stable state",
+-        ComponentState.STABLE, comp.getComponentSpec().getState());
+-    Assert.assertEquals("cancel upgrade failed", "val0",
+-        comp.getComponentSpec().getConfiguration().getEnv("key1"));
+-  }
+-
+-  private void cancelUpgradeWhileUpgrading(
+-      MockRunningServiceContext context, Component comp)
+-      throws Exception {
+-
+-    comp.handle(new ComponentEvent(comp.getName(), ComponentEventType.UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(context.service.getName(),
+-            comp.getName(), "key1", "val1")).setUpgradeVersion("v0"));
+-
+-    Iterator<ComponentInstance> iter = comp.getAllComponentInstances()
+-        .iterator();
+-
+-    ComponentInstance instance1 = iter.next();
+-
+-    // instance1 is triggered to upgrade
+-    instance1.handle(new ComponentInstanceEvent(
+-        instance1.getContainer().getId(), ComponentInstanceEventType.UPGRADE));
+-
+-    // component upgrade is cancelled
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CANCEL_UPGRADE)
+-        .setTargetSpec(createSpecWithEnv(context.service.getName(),
+-            comp.getName(), "key1",
+-            "val0")).setUpgradeVersion("v0"));
+-
+-    // all instances upgrade is cancelled.
+-    comp.getAllComponentInstances().forEach(instance ->
+-        instance.handle(new ComponentInstanceEvent(
+-            instance.getContainer().getId(),
+-            ComponentInstanceEventType.CANCEL_UPGRADE)));
+-
+-    // regular upgrade failed for instance 1
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CONTAINER_COMPLETED).setInstance(instance1)
+-        .setContainerId(instance1.getContainer().getId()));
+-    instance1.handle(new ComponentInstanceEvent(
+-        instance1.getContainer().getId(), STOP));
+-
+-    // component should be in cancel upgrade
+-    Assert.assertEquals(
+-        org.apache.hadoop.yarn.service.component.ComponentState
+-            .CANCEL_UPGRADING, comp.getState());
+-
+-    comp.handle(new ComponentEvent(comp.getName(),
+-        ComponentEventType.CHECK_STABLE));
+-
+-    Assert.assertEquals("component not in needs upgrade state",
+-        ComponentState.NEEDS_UPGRADE, comp.getComponentSpec().getState());
+-    Assert.assertEquals(
+-        org.apache.hadoop.yarn.service.component.ComponentState
+-            .CANCEL_UPGRADING, comp.getState());
+-  }
+-
+-  @Test
+-  public void testComponentStateReachesStableStateWithTerminatingComponents()
+-      throws
+-      Exception {
+-    final String serviceName =
+-        "testComponentStateUpdatesWithTerminatingComponents";
+-
+-    Service testService = ServiceTestUtils.createTerminatingJobExample(
+-        serviceName);
+-    TestServiceManager.createDef(serviceName, testService);
+-
+-    ServiceContext context = new MockRunningServiceContext(rule, testService);
+-
+-    for (Component comp : context.scheduler.getAllComponents().values()) {
+-
+-      Iterator<ComponentInstance> instanceIter = comp.
+-          getAllComponentInstances().iterator();
+-
+-      ComponentInstance componentInstance = instanceIter.next();
+-      Container instanceContainer = componentInstance.getContainer();
+-
+-      Assert.assertEquals(0, comp.getNumSucceededInstances());
+-      Assert.assertEquals(0, comp.getNumFailedInstances());
+-      Assert.assertEquals(2, comp.getNumRunningInstances());
+-      Assert.assertEquals(2, comp.getNumReadyInstances());
+-      Assert.assertEquals(0, comp.getPendingInstances().size());
+-
+-      //stop 1 container
+-      ContainerStatus containerStatus = ContainerStatus.newInstance(
+-          instanceContainer.getId(),
+-          org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-          "successful", 0);
+-      comp.handle(new ComponentEvent(comp.getName(),
+-          ComponentEventType.CONTAINER_COMPLETED).setStatus(containerStatus)
+-          .setContainerId(instanceContainer.getId()));
+-      componentInstance.handle(
+-          new ComponentInstanceEvent(componentInstance.getContainer().getId(),
+-              ComponentInstanceEventType.STOP).setStatus(containerStatus));
+-
+-      Assert.assertEquals(1, comp.getNumSucceededInstances());
+-      Assert.assertEquals(0, comp.getNumFailedInstances());
+-      Assert.assertEquals(1, comp.getNumRunningInstances());
+-      Assert.assertEquals(1, comp.getNumReadyInstances());
+-      Assert.assertEquals(0, comp.getPendingInstances().size());
+-
+-      org.apache.hadoop.yarn.service.component.ComponentState componentState =
+-          Component.checkIfStable(comp);
+-      Assert.assertEquals(
+-          org.apache.hadoop.yarn.service.component.ComponentState.STABLE,
+-          componentState);
+-    }
+-  }
+-
+-  @Test
+-  public void testComponentStateUpdatesWithTerminatingComponents()
+-      throws
+-      Exception {
+-    final String serviceName =
+-        "testComponentStateUpdatesWithTerminatingComponents";
+-
+-    Service testService = ServiceTestUtils.createTerminatingJobExample(
+-        serviceName);
+-    TestServiceManager.createDef(serviceName, testService);
+-
+-    ServiceContext context = new MockRunningServiceContext(rule, testService);
+-
+-    for (Component comp : context.scheduler.getAllComponents().values()) {
+-      Iterator<ComponentInstance> instanceIter = comp.
+-          getAllComponentInstances().iterator();
+-
+-      while (instanceIter.hasNext()) {
+-
+-        ComponentInstance componentInstance = instanceIter.next();
+-        Container instanceContainer = componentInstance.getContainer();
+-
+-        //stop 1 container
+-        ContainerStatus containerStatus = ContainerStatus.newInstance(
+-            instanceContainer.getId(),
+-            org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-            "successful", 0);
+-        comp.handle(new ComponentEvent(comp.getName(),
+-            ComponentEventType.CONTAINER_COMPLETED).setStatus(containerStatus)
+-            .setContainerId(instanceContainer.getId()));
+-        componentInstance.handle(
+-            new ComponentInstanceEvent(componentInstance.getContainer().getId(),
+-                ComponentInstanceEventType.STOP).setStatus(containerStatus));
+-      }
+-
+-      ComponentState componentState =
+-          comp.getComponentSpec().getState();
+-      Assert.assertEquals(
+-          ComponentState.SUCCEEDED,
+-          componentState);
+-    }
+-
+-    ServiceState serviceState =
+-        testService.getState();
+-    Assert.assertEquals(
+-        ServiceState.SUCCEEDED,
+-        serviceState);
+-  }
+-
+-  @Test
+-  public void testComponentStateUpdatesWithTerminatingDominantComponents()
+-      throws Exception {
+-    final String serviceName =
+-        "testComponentStateUpdatesWithTerminatingServiceStateComponents";
+-
+-    Service testService =
+-        ServiceTestUtils.createTerminatingDominantComponentJobExample(
+-            serviceName);
+-    TestServiceManager.createDef(serviceName, testService);
+-
+-    ServiceContext context = new MockRunningServiceContext(rule, testService);
+-
+-    for (Component comp : context.scheduler.getAllComponents().values()) {
+-      boolean componentIsDominant = comp.getComponentSpec()
+-          .getConfiguration().getPropertyBool(
+-              CONTAINER_STATE_REPORT_AS_SERVICE_STATE, false);
+-      if (componentIsDominant) {
+-        Iterator<ComponentInstance> instanceIter = comp.
+-            getAllComponentInstances().iterator();
+-
+-        while (instanceIter.hasNext()) {
+-
+-          ComponentInstance componentInstance = instanceIter.next();
+-          Container instanceContainer = componentInstance.getContainer();
+-
+-          //stop 1 container
+-          ContainerStatus containerStatus = ContainerStatus.newInstance(
+-              instanceContainer.getId(),
+-              org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-              "successful", 0);
+-          comp.handle(new ComponentEvent(comp.getName(),
+-              ComponentEventType.CONTAINER_COMPLETED).setStatus(containerStatus)
+-              .setContainerId(instanceContainer.getId()));
+-          componentInstance.handle(
+-              new ComponentInstanceEvent(componentInstance.getContainer().
+-                  getId(), ComponentInstanceEventType.STOP).
+-                  setStatus(containerStatus));
+-        }
+-        ComponentState componentState =
+-            comp.getComponentSpec().getState();
+-        Assert.assertEquals(
+-            ComponentState.SUCCEEDED,
+-            componentState);
+-      }
+-    }
+-
+-    ServiceState serviceState =
+-        testService.getState();
+-    Assert.assertEquals(
+-        ServiceState.SUCCEEDED,
+-        serviceState);
+-  }
+-
+-  private static org.apache.hadoop.yarn.service.api.records.Component
+-      createSpecWithEnv(String serviceName, String compName, String key,
+-      String val) {
+-    Service service = TestServiceManager.createBaseDef(serviceName);
+-    org.apache.hadoop.yarn.service.api.records.Component spec =
+-        service.getComponent(compName);
+-    spec.getConfiguration().getEnv().put(key, val);
+-    return spec;
+-  }
+-
+-  public static MockRunningServiceContext createTestContext(
+-      ServiceTestUtils.ServiceFSWatcher fsWatcher, String serviceName)
+-      throws Exception {
+-    return new MockRunningServiceContext(fsWatcher,
+-        TestServiceManager.createBaseDef(serviceName));
+-  }
+-}
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentDecommissionInstances.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentDecommissionInstances.java
+deleted file mode 100644
+index e617410b0a6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentDecommissionInstances.java
++++ /dev/null
+@@ -1,147 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.registry.client.binding.RegistryUtils;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.client.ServiceClient;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.junit.rules.TemporaryFolder;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.Arrays;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.TimeoutException;
+-
+-/**
+- * Test decommissioning component instances.
+- */
+-public class TestComponentDecommissionInstances extends ServiceTestUtils {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestComponentDecommissionInstances.class);
+-
+-  private static final String APP_NAME = "test-decommission";
+-  private static final String COMPA = "compa";
+-
+-  @Rule
+-  public TemporaryFolder tmpFolder = new TemporaryFolder();
+-
+-  @Before
+-  public void setup() throws Exception {
+-    File tmpYarnDir = new File("target", "tmp");
+-    FileUtils.deleteQuietly(tmpYarnDir);
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    shutdown();
+-  }
+-
+-  @Test
+-  public void testDecommissionInstances() throws Exception {
+-    setupInternal(3);
+-    ServiceClient client = createClient(getConf());
+-    Service exampleApp = new Service();
+-    exampleApp.setName(APP_NAME);
+-    exampleApp.setVersion("v1");
+-    Component comp = createComponent(COMPA, 6L, "sleep 1000");
+-    exampleApp.addComponent(comp);
+-    client.actionCreate(exampleApp);
+-    waitForServiceToBeStable(client, exampleApp);
+-
+-    checkInstances(client, COMPA + "-0", COMPA + "-1", COMPA + "-2",
+-        COMPA + "-3", COMPA + "-4", COMPA + "-5");
+-    client.actionDecommissionInstances(APP_NAME, Arrays.asList(COMPA + "-1",
+-        COMPA + "-5"));
+-    waitForNumInstances(client, 4);
+-    checkInstances(client, COMPA + "-0", COMPA + "-2", COMPA + "-3",
+-        COMPA + "-4");
+-
+-    // Stop and start service
+-    client.actionStop(APP_NAME);
+-    waitForServiceToBeInState(client, exampleApp, ServiceState.STOPPED);
+-    client.actionStart(APP_NAME);
+-    waitForServiceToBeStable(client, exampleApp);
+-    checkInstances(client, COMPA + "-0", COMPA + "-2", COMPA + "-3",
+-        COMPA + "-4");
+-
+-    Map<String, String> compCounts = new HashMap<>();
+-    compCounts.put(COMPA, "5");
+-    client.actionFlex(APP_NAME, compCounts);
+-    waitForNumInstances(client, 5);
+-    checkInstances(client, COMPA + "-0", COMPA + "-2", COMPA + "-3",
+-        COMPA + "-4", COMPA + "-6");
+-
+-    client.actionDecommissionInstances(APP_NAME, Arrays.asList(COMPA + "-0."
+-            + APP_NAME + "." + RegistryUtils.currentUser()));
+-    waitForNumInstances(client, 4);
+-    checkInstances(client, COMPA + "-2", COMPA + "-3",
+-        COMPA + "-4", COMPA + "-6");
+-  }
+-
+-  private static void waitForNumInstances(ServiceClient client, int
+-      expectedInstances) throws TimeoutException, InterruptedException {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        Service retrievedApp = client.getStatus(APP_NAME);
+-        return retrievedApp.getComponent(COMPA).getContainers().size() ==
+-            expectedInstances && retrievedApp.getState() == ServiceState.STABLE;
+-      } catch (Exception e) {
+-        e.printStackTrace();
+-        return false;
+-      }
+-    }, 2000, 200000);
+-  }
+-
+-  private static void checkInstances(ServiceClient client, String... instances)
+-      throws IOException, YarnException {
+-    Service service = client.getStatus(APP_NAME);
+-    Component component = service.getComponent(COMPA);
+-    Assert.assertEquals("Service state should be STABLE", ServiceState.STABLE,
+-        service.getState());
+-    Assert.assertEquals(instances.length + " containers are expected to be " +
+-        "running", instances.length, component.getContainers().size());
+-    Set<String> existingInstances = new HashSet<>();
+-    for (Container cont : component.getContainers()) {
+-      existingInstances.add(cont.getComponentInstanceName());
+-    }
+-    Assert.assertEquals(instances.length + " instances are expected to be " +
+-        "running", instances.length, existingInstances.size());
+-    for (String instance : instances) {
+-      Assert.assertTrue("Expected instance did not exist " + instance,
+-          existingInstances.contains(instance));
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java
+deleted file mode 100644
+index 3e3b4a1a3dc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/TestComponentRestartPolicy.java
++++ /dev/null
+@@ -1,131 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.component;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.junit.Test;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for ComponentRestartPolicy implementations.
+- */
+-public class TestComponentRestartPolicy {
+-
+-  @Test
+-  public void testAlwaysRestartPolicy() throws Exception {
+-
+-    AlwaysRestartPolicy alwaysRestartPolicy = AlwaysRestartPolicy.getInstance();
+-
+-    Component component = mock(Component.class);
+-    when(component.getNumReadyInstances()).thenReturn(1);
+-    when(component.getNumDesiredInstances()).thenReturn(2);
+-
+-    ComponentInstance instance = mock(ComponentInstance.class);
+-    when(instance.getComponent()).thenReturn(component);
+-
+-    ContainerStatus containerStatus = mock(ContainerStatus.class);
+-
+-    assertEquals(true, alwaysRestartPolicy.isLongLived());
+-    assertEquals(true, alwaysRestartPolicy.allowUpgrades());
+-    assertEquals(false, alwaysRestartPolicy.hasCompleted(component));
+-    assertEquals(false,
+-        alwaysRestartPolicy.hasCompletedSuccessfully(component));
+-
+-    assertEquals(true,
+-        alwaysRestartPolicy.shouldRelaunchInstance(instance, containerStatus));
+-
+-    assertEquals(false, alwaysRestartPolicy.isReadyForDownStream(component));
+-  }
+-
+-  @Test
+-  public void testNeverRestartPolicy() throws Exception {
+-
+-    NeverRestartPolicy restartPolicy = NeverRestartPolicy.getInstance();
+-
+-    Component component = mock(Component.class);
+-    when(component.getNumSucceededInstances()).thenReturn(new Long(1));
+-    when(component.getNumFailedInstances()).thenReturn(new Long(2));
+-    when(component.getNumDesiredInstances()).thenReturn(3);
+-    when(component.getNumReadyInstances()).thenReturn(3);
+-
+-    ComponentInstance instance = mock(ComponentInstance.class);
+-    when(instance.getComponent()).thenReturn(component);
+-
+-    ContainerStatus containerStatus = mock(ContainerStatus.class);
+-
+-    assertEquals(false, restartPolicy.isLongLived());
+-    assertEquals(false, restartPolicy.allowUpgrades());
+-    assertEquals(true, restartPolicy.hasCompleted(component));
+-    assertEquals(false,
+-        restartPolicy.hasCompletedSuccessfully(component));
+-
+-    assertEquals(false,
+-        restartPolicy.shouldRelaunchInstance(instance, containerStatus));
+-
+-    assertEquals(true, restartPolicy.isReadyForDownStream(component));
+-  }
+-
+-  @Test
+-  public void testOnFailureRestartPolicy() throws Exception {
+-
+-    OnFailureRestartPolicy restartPolicy = OnFailureRestartPolicy.getInstance();
+-
+-    Component component = mock(Component.class);
+-    when(component.getNumSucceededInstances()).thenReturn(new Long(3));
+-    when(component.getNumFailedInstances()).thenReturn(new Long(0));
+-    when(component.getNumDesiredInstances()).thenReturn(3);
+-    when(component.getNumReadyInstances()).thenReturn(3);
+-
+-    ComponentInstance instance = mock(ComponentInstance.class);
+-    when(instance.getComponent()).thenReturn(component);
+-
+-    ContainerStatus containerStatus = mock(ContainerStatus.class);
+-    when(containerStatus.getExitStatus()).thenReturn(0);
+-
+-    assertEquals(false, restartPolicy.isLongLived());
+-    assertEquals(false, restartPolicy.allowUpgrades());
+-    assertEquals(true, restartPolicy.hasCompleted(component));
+-    assertEquals(true,
+-        restartPolicy.hasCompletedSuccessfully(component));
+-
+-    assertEquals(false,
+-        restartPolicy.shouldRelaunchInstance(instance, containerStatus));
+-
+-    assertEquals(true, restartPolicy.isReadyForDownStream(component));
+-
+-    when(component.getNumSucceededInstances()).thenReturn(new Long(2));
+-    when(component.getNumFailedInstances()).thenReturn(new Long(1));
+-    when(component.getNumDesiredInstances()).thenReturn(3);
+-
+-    assertEquals(false, restartPolicy.hasCompleted(component));
+-    assertEquals(false,
+-        restartPolicy.hasCompletedSuccessfully(component));
+-
+-    when(containerStatus.getExitStatus()).thenReturn(-1000);
+-
+-    assertEquals(true,
+-        restartPolicy.shouldRelaunchInstance(instance, containerStatus));
+-
+-    assertEquals(true, restartPolicy.isReadyForDownStream(component));
+-
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/instance/TestComponentInstance.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/instance/TestComponentInstance.java
+deleted file mode 100644
+index 06bca6f1b00..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/component/instance/TestComponentInstance.java
++++ /dev/null
+@@ -1,819 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.component.instance;
+-
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.LocalizationState;
+-import org.apache.hadoop.yarn.api.records.LocalizationStatus;
+-import org.apache.hadoop.yarn.service.MockRunningServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceScheduler;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.TestServiceManager;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.ComponentEvent;
+-import org.apache.hadoop.yarn.service.component.ComponentEventType;
+-import org.apache.hadoop.yarn.service.component.TestComponent;
+-import org.apache.hadoop.yarn.service.utils.ServiceUtils;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-import org.mockito.Mockito;
+-
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.nio.file.StandardOpenOption;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.ArgumentMatchers.anyInt;
+-import static org.mockito.ArgumentMatchers.eq;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.never;
+-import static org.mockito.Mockito.spy;
+-import static org.mockito.Mockito.times;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for {@link ComponentInstance}.
+- */
+-public class TestComponentInstance {
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test
+-  public void testContainerUpgrade() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testContainerUpgrade");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    ComponentInstanceEvent instanceEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(instanceEvent);
+-    Container containerSpec = component.getComponentSpec().getContainer(
+-        instance.getContainer().getId().toString());
+-    Assert.assertEquals("instance not upgrading", ContainerState.UPGRADING,
+-        containerSpec.getState());
+-  }
+-
+-  @Test
+-  public void testContainerReadyAfterUpgrade() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testContainerReadyAfterUpgrade");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-
+-    ComponentInstanceEvent instanceEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(instanceEvent);
+-    instance.handle(new ComponentInstanceEvent(instance.getContainer().getId(),
+-        ComponentInstanceEventType.START));
+-    Assert.assertEquals("instance not running",
+-        ContainerState.RUNNING_BUT_UNREADY,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-    instance.handle(new ComponentInstanceEvent(instance.getContainer().getId(),
+-        ComponentInstanceEventType.BECOME_READY));
+-    Assert.assertEquals("instance not ready", ContainerState.READY,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-  }
+-
+-
+-  @Test
+-  public void testContainerUpgradeFailed() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testContainerUpgradeFailed");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-
+-    ComponentInstanceEvent upgradeEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(upgradeEvent);
+-
+-    ContainerStatus containerStatus = mock(ContainerStatus.class);
+-    when(containerStatus.getExitStatus()).thenReturn(
+-        ContainerExitStatus.ABORTED);
+-    ComponentInstanceEvent stopEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.STOP)
+-        .setStatus(containerStatus);
+-    // this is the call back from NM for the upgrade
+-    instance.handle(stopEvent);
+-    Assert.assertEquals("instance did not fail", ContainerState.FAILED_UPGRADE,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-  }
+-
+-  @Test
+-  public void testFailureAfterReinit() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testContainerUpgradeFailed");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-
+-    ComponentInstanceEvent upgradeEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(upgradeEvent);
+-
+-    // NM finished updgrae
+-    instance.handle(new ComponentInstanceEvent(instance.getContainer().getId(),
+-        ComponentInstanceEventType.START));
+-    Assert.assertEquals("instance not running",
+-        ContainerState.RUNNING_BUT_UNREADY,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-
+-    ContainerStatus containerStatus = mock(ContainerStatus.class);
+-    when(containerStatus.getExitStatus()).thenReturn(
+-        ContainerExitStatus.ABORTED);
+-    ComponentInstanceEvent stopEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.STOP)
+-        .setStatus(containerStatus);
+-    // this is the call back from NM for the upgrade
+-    instance.handle(stopEvent);
+-    Assert.assertEquals("instance did not fail", ContainerState.FAILED_UPGRADE,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-  }
+-
+-  @Test
+-  public void testCancelNothingToUpgrade() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testCancelUpgradeWhenContainerReady");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    cancelCompUpgrade(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-
+-    ComponentInstanceEvent cancelEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(),
+-        ComponentInstanceEventType.CANCEL_UPGRADE);
+-    instance.handle(cancelEvent);
+-
+-    Assert.assertEquals("instance not ready", ContainerState.READY,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-  }
+-
+-  @Test
+-  public void testCancelUpgradeFailed() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testCancelUpgradeFailed");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    cancelCompUpgrade(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-
+-    ComponentInstanceEvent cancelEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(),
+-        ComponentInstanceEventType.CANCEL_UPGRADE);
+-    instance.handle(cancelEvent);
+-
+-    instance.handle(new ComponentInstanceEvent(instance.getContainer().getId(),
+-        ComponentInstanceEventType.STOP));
+-    Assert.assertEquals("instance not init", ComponentInstanceState.INIT,
+-        instance.getState());
+-  }
+-
+-  @Test
+-  public void testCancelAfterCompProcessedCancel() throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testCancelAfterCompProcessedCancel");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-    cancelCompUpgrade(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    ComponentInstanceEvent upgradeEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(upgradeEvent);
+-
+-    Assert.assertEquals("instance should start upgrading",
+-        ContainerState.NEEDS_UPGRADE,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-  }
+-
+-  @Test
+-  public void testCancelWhileUpgradeWithSuccess() throws Exception {
+-    validateCancelWhileUpgrading(true, true);
+-  }
+-
+-  @Test
+-  public void testCancelWhileUpgradeWithFailure() throws Exception {
+-    validateCancelWhileUpgrading(false, true);
+-  }
+-
+-  @Test
+-  public void testCancelFailedWhileUpgradeWithSuccess() throws Exception {
+-    validateCancelWhileUpgrading(true, false);
+-  }
+-
+-  @Test
+-  public void testCancelFailedWhileUpgradeWithFailure() throws Exception {
+-    validateCancelWhileUpgrading(false, false);
+-  }
+-
+-  @Test
+-  public void testUpdateLocalizationStatuses() throws Exception {
+-    Service def = TestServiceManager.createBaseDef(
+-        "testUpdateLocalizationStatuses");
+-
+-    String file1 = rule.getServiceBasePath().toString() + "/file1";
+-    Files.write(Paths.get(file1), "test file".getBytes(),
+-        StandardOpenOption.CREATE_NEW);
+-
+-    org.apache.hadoop.yarn.service.api.records.Component compDef =
+-        def.getComponents().iterator().next();
+-    ConfigFile configFile1 = new ConfigFile();
+-    configFile1.setType(ConfigFile.TypeEnum.STATIC);
+-    configFile1.setSrcFile(file1);
+-    compDef.setConfiguration(new Configuration().files(
+-        Lists.newArrayList(configFile1)));
+-
+-    ServiceContext context = new MockRunningServiceContext(rule, def);
+-    Component component = context.scheduler.getAllComponents().get(
+-        compDef.getName());
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    LocalizationStatus status = LocalizationStatus.newInstance("file1",
+-        LocalizationState.PENDING);
+-
+-    instance.updateLocalizationStatuses(Lists.newArrayList(status));
+-    Assert.assertTrue("retriever should still be active",
+-        instance.isLclRetrieverActive());
+-
+-    Container container = instance.getContainerSpec();
+-    Assert.assertTrue(container.getLocalizationStatuses() != null);
+-    Assert.assertEquals("dest file",
+-        container.getLocalizationStatuses().get(0).getDestFile(),
+-        status.getResourceKey());
+-    Assert.assertEquals("state",
+-        container.getLocalizationStatuses().get(0).getState(),
+-        status.getLocalizationState());
+-
+-    status = LocalizationStatus.newInstance("file1",
+-        LocalizationState.COMPLETED);
+-    instance.updateLocalizationStatuses(Lists.newArrayList(status));
+-    Assert.assertTrue("retriever should not be active",
+-        !instance.isLclRetrieverActive());
+-    Assert.assertTrue(container.getLocalizationStatuses() != null);
+-    Assert.assertEquals("dest file",
+-        container.getLocalizationStatuses().get(0).getDestFile(),
+-        status.getResourceKey());
+-    Assert.assertEquals("state",
+-        container.getLocalizationStatuses().get(0).getState(),
+-        status.getLocalizationState());
+-  }
+-
+-  private void validateCancelWhileUpgrading(boolean upgradeSuccessful,
+-      boolean cancelUpgradeSuccessful)
+-      throws Exception {
+-    ServiceContext context = TestComponent.createTestContext(rule,
+-        "testCancelWhileUpgrading");
+-    Component component = context.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    upgradeComponent(component);
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    ComponentInstanceEvent upgradeEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(), ComponentInstanceEventType.UPGRADE);
+-    instance.handle(upgradeEvent);
+-
+-    Assert.assertEquals("instance should be upgrading",
+-        ContainerState.UPGRADING,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-
+-    cancelCompUpgrade(component);
+-    ComponentInstanceEvent cancelEvent = new ComponentInstanceEvent(
+-        instance.getContainer().getId(),
+-        ComponentInstanceEventType.CANCEL_UPGRADE);
+-    instance.handle(cancelEvent);
+-
+-    // either upgrade failed or successful
+-    if (upgradeSuccessful) {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), ComponentInstanceEventType.START));
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.BECOME_READY));
+-    } else {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.STOP));
+-    }
+-
+-    Assert.assertEquals("instance not upgrading", ContainerState.UPGRADING,
+-        component.getComponentSpec().getContainer(instance.getContainer()
+-            .getId().toString()).getState());
+-
+-    // response for cancel received
+-    if (cancelUpgradeSuccessful) {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), ComponentInstanceEventType.START));
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(),
+-          ComponentInstanceEventType.BECOME_READY));
+-    } else {
+-      instance.handle(new ComponentInstanceEvent(
+-          instance.getContainer().getId(), ComponentInstanceEventType.STOP));
+-    }
+-    if (cancelUpgradeSuccessful) {
+-      Assert.assertEquals("instance not ready", ContainerState.READY,
+-          component.getComponentSpec().getContainer(instance.getContainer()
+-              .getId().toString()).getState());
+-    } else {
+-      Assert.assertEquals("instance not init", ComponentInstanceState.INIT,
+-          instance.getState());
+-    }
+-  }
+-
+-  private void upgradeComponent(Component component) {
+-    component.handle(new ComponentEvent(component.getName(),
+-        ComponentEventType.UPGRADE).setTargetSpec(component.getComponentSpec())
+-        .setUpgradeVersion("v2"));
+-  }
+-
+-  private void cancelCompUpgrade(Component component) {
+-    component.handle(new ComponentEvent(component.getName(),
+-        ComponentEventType.CANCEL_UPGRADE)
+-        .setTargetSpec(component.getComponentSpec())
+-        .setUpgradeVersion("v1"));
+-  }
+-
+-  private Component createComponent(ServiceScheduler scheduler,
+-      org.apache.hadoop.yarn.service.api.records.Component.RestartPolicyEnum
+-          restartPolicy, int nSucceededInstances, int nFailedInstances,
+-      int totalAsk, int componentId) {
+-
+-    assert (nSucceededInstances + nFailedInstances) <= totalAsk;
+-
+-    Component comp = mock(Component.class);
+-    org.apache.hadoop.yarn.service.api.records.Component componentSpec = mock(
+-        org.apache.hadoop.yarn.service.api.records.Component.class);
+-    when(componentSpec.getRestartPolicy()).thenReturn(restartPolicy);
+-    Configuration conf = new Configuration();
+-    when(componentSpec.getConfiguration()).thenReturn(conf);
+-    when(comp.getRestartPolicyHandler()).thenReturn(
+-        Component.getRestartPolicyHandler(restartPolicy));
+-    when(componentSpec.getNumberOfContainers()).thenReturn(
+-        Long.valueOf(totalAsk));
+-    when(comp.getComponentSpec()).thenReturn(componentSpec);
+-    when(comp.getScheduler()).thenReturn(scheduler);
+-
+-    Map<String, ComponentInstance> succeeded = new ConcurrentHashMap<>();
+-    Map<String, ComponentInstance> failed = new ConcurrentHashMap<>();
+-    scheduler.getAllComponents().put("comp" + componentId, comp);
+-
+-    Map<String, ComponentInstance> componentInstances = new HashMap<>();
+-
+-    for (int i = 0; i < nSucceededInstances; i++) {
+-      ComponentInstance componentInstance = createComponentInstance(comp, i);
+-      componentInstances.put(componentInstance.getCompInstanceName(),
+-          componentInstance);
+-      succeeded.put(componentInstance.getCompInstanceName(), componentInstance);
+-    }
+-
+-    for (int i = 0; i < nFailedInstances; i++) {
+-      ComponentInstance componentInstance = createComponentInstance(comp,
+-          i + nSucceededInstances);
+-      componentInstances.put(componentInstance.getCompInstanceName(),
+-          componentInstance);
+-      failed.put(componentInstance.getCompInstanceName(), componentInstance);
+-    }
+-
+-    int delta = totalAsk - nFailedInstances - nSucceededInstances;
+-
+-    for (int i = 0; i < delta; i++) {
+-      ComponentInstance componentInstance = createComponentInstance(comp,
+-          i + nSucceededInstances + nFailedInstances);
+-      componentInstances.put(componentInstance.getCompInstanceName(),
+-          componentInstance);
+-    }
+-
+-    when(comp.getAllComponentInstances()).thenReturn(
+-        componentInstances.values());
+-    when(comp.getSucceededInstances()).thenReturn(succeeded.values());
+-    when(comp.getFailedInstances()).thenReturn(failed.values());
+-    return comp;
+-  }
+-
+-  private Component createComponent(ServiceScheduler scheduler,
+-      org.apache.hadoop.yarn.service.api.records.Component.RestartPolicyEnum
+-          restartPolicy,
+-      int totalAsk, int componentId) {
+-
+-    Component comp = mock(Component.class);
+-    org.apache.hadoop.yarn.service.api.records.Component componentSpec = mock(
+-        org.apache.hadoop.yarn.service.api.records.Component.class);
+-    when(componentSpec.getRestartPolicy()).thenReturn(restartPolicy);
+-    Configuration conf = new Configuration();
+-    when(componentSpec.getConfiguration()).thenReturn(conf);
+-    when(comp.getRestartPolicyHandler()).thenReturn(
+-        Component.getRestartPolicyHandler(restartPolicy));
+-    when(componentSpec.getNumberOfContainers()).thenReturn(
+-        Long.valueOf(totalAsk));
+-    when(comp.getComponentSpec()).thenReturn(componentSpec);
+-    when(comp.getScheduler()).thenReturn(scheduler);
+-
+-    scheduler.getAllComponents().put("comp" + componentId, comp);
+-
+-    Map<String, ComponentInstance> componentInstances = new HashMap<>();
+-
+-    for (int i = 0; i < totalAsk; i++) {
+-      ComponentInstance componentInstance = createComponentInstance(comp, i);
+-      componentInstances.put(componentInstance.getCompInstanceName(),
+-          componentInstance);
+-    }
+-
+-    when(comp.getAllComponentInstances()).thenReturn(
+-        componentInstances.values());
+-    return comp;
+-  }
+-
+-  private ComponentInstance createComponentInstance(Component component,
+-      int instanceId) {
+-
+-    ComponentInstance componentInstance = mock(ComponentInstance.class);
+-    when(componentInstance.getComponent()).thenReturn(component);
+-    when(componentInstance.getCompInstanceName()).thenReturn(
+-        "compInstance" + instanceId);
+-    Container container = mock(Container.class);
+-    when(componentInstance.getContainerSpec()).thenReturn(container);
+-
+-    ServiceUtils.ProcessTerminationHandler terminationHandler = mock(
+-        ServiceUtils.ProcessTerminationHandler.class);
+-    when(component.getScheduler().getTerminationHandler()).thenReturn(
+-        terminationHandler);
+-
+-    return componentInstance;
+-  }
+-
+-  @Test
+-  public void testComponentRestartPolicy() {
+-
+-    Map<String, Component> allComponents = new HashMap<>();
+-    Service mockService = mock(Service.class);
+-    ServiceContext serviceContext = mock(ServiceContext.class);
+-    when(serviceContext.getService()).thenReturn(mockService);
+-    ServiceScheduler serviceSchedulerInstance = new ServiceScheduler(
+-        serviceContext);
+-    ServiceScheduler serviceScheduler = spy(serviceSchedulerInstance);
+-    when(serviceScheduler.getAllComponents()).thenReturn(allComponents);
+-    Mockito.doNothing().when(serviceScheduler).setGracefulStop(
+-        any(FinalApplicationStatus.class));
+-
+-    final String containerDiag = "Container succeeded";
+-
+-    ComponentInstanceEvent componentInstanceEvent = mock(
+-        ComponentInstanceEvent.class);
+-    ContainerId containerId = ContainerId.newContainerId(ApplicationAttemptId
+-        .newInstance(ApplicationId.newInstance(1234L, 1), 1), 1);
+-    ContainerStatus containerStatus = ContainerStatus.newInstance(containerId,
+-        org.apache.hadoop.yarn.api.records.ContainerState.COMPLETE,
+-        containerDiag, 0);
+-
+-    when(componentInstanceEvent.getStatus()).thenReturn(containerStatus);
+-
+-    // Test case1: one component, one instance, restart policy = ALWAYS, exit=0
+-    Component comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ALWAYS,
+-        1, 0, 1, 0);
+-    ComponentInstance componentInstance =
+-        comp.getAllComponentInstances().iterator().next();
+-
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(1)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), never()).terminate(
+-        anyInt());
+-
+-    // Test case2: one component, one instance, restart policy = ALWAYS, exit=1
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ALWAYS,
+-        0, 1, 1, 0);
+-    componentInstance = comp.getAllComponentInstances().iterator().next();
+-    containerStatus.setExitStatus(1);
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(1)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), never()).terminate(
+-        anyInt());
+-
+-    // Test case3: one component, one instance, restart policy = NEVER, exit=0
+-    // Should exit with code=0
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        1, 0, 1, 0);
+-    componentInstance = comp.getAllComponentInstances().iterator().next();
+-    containerStatus.setExitStatus(0);
+-
+-    Map<String, ComponentInstance> succeededInstances = new HashMap<>();
+-    succeededInstances.put(componentInstance.getCompInstanceName(),
+-        componentInstance);
+-    when(comp.getSucceededInstances()).thenReturn(succeededInstances.values());
+-    when(comp.getNumSucceededInstances()).thenReturn(new Long(1));
+-
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, times(1)).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(1)).terminate(eq(0));
+-
+-    // Test case4: one component, one instance, restart policy = NEVER, exit=1
+-    // Should exit with code=-1
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        0, 1, 1, 0);
+-    componentInstance = comp.getAllComponentInstances().iterator().next();
+-    containerStatus.setExitStatus(-1);
+-
+-    when(comp.getNumFailedInstances()).thenReturn(new Long(1));
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, times(1)).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(1)).terminate(
+-        eq(-1));
+-
+-    // Test case5: one component, one instance, restart policy = ON_FAILURE,
+-    // exit=1
+-    // Should continue run.
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ON_FAILURE,
+-        0, 1, 1, 0);
+-    componentInstance = comp.getAllComponentInstances().iterator().next();
+-    containerStatus.setExitStatus(1);
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(1)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(0)).terminate(
+-        anyInt());
+-
+-    // Test case6: one component, 3 instances, restart policy = NEVER, exit=1
+-    // 2 of the instances not completed, it should continue run.
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        0, 1, 3, 0);
+-    componentInstance = comp.getAllComponentInstances().iterator().next();
+-    containerStatus.setExitStatus(1);
+-    ComponentInstance.handleComponentInstanceRelaunch(componentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, times(1)).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(0)).terminate(
+-        anyInt());
+-
+-    // Test case7: one component, 3 instances, restart policy = ON_FAILURE,
+-    // exit=1
+-    // 2 of the instances completed, it should continue run.
+-
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ON_FAILURE,
+-        0, 1, 3, 0);
+-
+-    Iterator<ComponentInstance> iter =
+-        comp.getAllComponentInstances().iterator();
+-
+-    containerStatus.setExitStatus(1);
+-    ComponentInstance commponentInstance = iter.next();
+-    ComponentInstance.handleComponentInstanceRelaunch(commponentInstance,
+-        componentInstanceEvent, false, containerDiag);
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(1)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(0)).terminate(
+-        anyInt());
+-
+-    // Test case8: 2 components, 2 instances for each
+-    // comp2 already finished.
+-    // comp1 has a new instance finish, we should terminate the service
+-
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        2, 0);
+-    Collection<ComponentInstance> component1Instances =
+-        comp.getAllComponentInstances();
+-
+-    containerStatus.setExitStatus(-1);
+-
+-    Component comp2 = createComponent(
+-        componentInstance.getComponent().getScheduler(),
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        2, 1);
+-
+-    Collection<ComponentInstance> component2Instances =
+-        comp2.getAllComponentInstances();
+-
+-    Map<String, ComponentInstance> failed2Instances = new HashMap<>();
+-
+-    for (ComponentInstance component2Instance : component2Instances) {
+-      failed2Instances.put(component2Instance.getCompInstanceName(),
+-          component2Instance);
+-      when(component2Instance.getComponent().getFailedInstances()).thenReturn(
+-          failed2Instances.values());
+-      when(component2Instance.getComponent().getNumFailedInstances())
+-          .thenReturn(new Long(failed2Instances.size()));
+-      ComponentInstance.handleComponentInstanceRelaunch(component2Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    Map<String, ComponentInstance> failed1Instances = new HashMap<>();
+-
+-    // 2nd component, already finished.
+-    for (ComponentInstance component1Instance : component1Instances) {
+-      failed1Instances.put(component1Instance.getCompInstanceName(),
+-          component1Instance);
+-      when(component1Instance.getComponent().getFailedInstances()).thenReturn(
+-          failed1Instances.values());
+-      when(component1Instance.getComponent().getNumFailedInstances())
+-          .thenReturn(new Long(failed1Instances.size()));
+-      ComponentInstance.handleComponentInstanceRelaunch(component1Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    verify(comp, never()).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, times(2)).markAsFailed(any(ComponentInstance.class));
+-    verify(comp, times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-
+-    verify(serviceScheduler.getTerminationHandler(), times(1)).terminate(
+-        eq(-1));
+-
+-    // Test case9: 2 components, 2 instances for each
+-    // comp2 already finished.
+-    // comp1 has a new instance finish, we should terminate the service
+-    // All instance finish with 0, service should exit with 0 as well.
+-    containerStatus.setExitStatus(0);
+-
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ON_FAILURE,
+-        2, 0);
+-    component1Instances = comp.getAllComponentInstances();
+-
+-    comp2 = createComponent(componentInstance.getComponent().getScheduler(),
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.ON_FAILURE,
+-        2, 1);
+-
+-    component2Instances = comp2.getAllComponentInstances();
+-
+-    Map<String, ComponentInstance> succeeded2Instances = new HashMap<>();
+-
+-    for (ComponentInstance component2Instance : component2Instances) {
+-      succeeded2Instances.put(component2Instance.getCompInstanceName(),
+-          component2Instance);
+-      when(component2Instance.getComponent().getSucceededInstances())
+-          .thenReturn(succeeded2Instances.values());
+-      when(component2Instance.getComponent().getNumSucceededInstances())
+-          .thenReturn(new Long(succeeded2Instances.size()));
+-      ComponentInstance.handleComponentInstanceRelaunch(component2Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    Map<String, ComponentInstance> succeeded1Instances = new HashMap<>();
+-    // 2nd component, already finished.
+-    for (ComponentInstance component1Instance : component1Instances) {
+-      succeeded1Instances.put(component1Instance.getCompInstanceName(),
+-          component1Instance);
+-      when(component1Instance.getComponent().getSucceededInstances())
+-          .thenReturn(succeeded1Instances.values());
+-      when(component1Instance.getComponent().getNumSucceededInstances())
+-          .thenReturn(new Long(succeeded1Instances.size()));
+-      ComponentInstance.handleComponentInstanceRelaunch(component1Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    verify(comp, times(2)).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(componentInstance.getComponent(), times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), times(1)).terminate(eq(0));
+-
+-    // Test case10: 2 components, 2 instances for each
+-    // comp2 hasn't finished
+-    // comp1 finished.
+-    // Service should continue run.
+-
+-    comp = createComponent(serviceScheduler,
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        2, 0);
+-    component1Instances = comp.getAllComponentInstances();
+-
+-    comp2 = createComponent(componentInstance.getComponent().getScheduler(),
+-        org.apache.hadoop.yarn.service.api.records.Component
+-            .RestartPolicyEnum.NEVER,
+-        2, 1);
+-
+-    component2Instances = comp2.getAllComponentInstances();
+-
+-    for (ComponentInstance component2Instance : component2Instances) {
+-      ComponentInstance.handleComponentInstanceRelaunch(component2Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    succeeded1Instances = new HashMap<>();
+-    // 2nd component, already finished.
+-    for (ComponentInstance component1Instance : component1Instances) {
+-      succeeded1Instances.put(component1Instance.getCompInstanceName(),
+-          component1Instance);
+-      when(component1Instance.getComponent().getSucceededInstances())
+-          .thenReturn(succeeded1Instances.values());
+-      ComponentInstance.handleComponentInstanceRelaunch(component1Instance,
+-          componentInstanceEvent, false, containerDiag);
+-    }
+-
+-    verify(comp, times(2)).markAsSucceeded(any(ComponentInstance.class));
+-    verify(comp, never()).markAsFailed(any(ComponentInstance.class));
+-    verify(componentInstance.getComponent(), times(0)).reInsertPendingInstance(
+-        any(ComponentInstance.class));
+-    verify(serviceScheduler.getTerminationHandler(), never()).terminate(eq(0));
+-
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/ExampleAppJson.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/ExampleAppJson.java
+deleted file mode 100644
+index 754b589dce0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/ExampleAppJson.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.apache.hadoop.yarn.service.ServiceTestUtils.JSON_SER_DESER;
+-
+-/**
+- * Names of the example configs.
+- */
+-public final class ExampleAppJson {
+-
+-  public static final String APP_JSON = "app.json";
+-  public static final String OVERRIDE_JSON = "app-override.json";
+-  public static final String DEFAULT_JSON = "default.json";
+-  public static final String EXTERNAL_JSON_0 = "external0.json";
+-  public static final String EXTERNAL_JSON_1 = "external1.json";
+-  public static final String EXTERNAL_JSON_2 = "external2.json";
+-  public static final String EXTERNAL_JSON_3 = "external3.json";
+-
+-  public static final String PACKAGE = "/org/apache/hadoop/yarn/service/conf/examples/";
+-
+-
+-  private static final String[] ALL_EXAMPLES = {APP_JSON, OVERRIDE_JSON,
+-      DEFAULT_JSON};
+-
+-  public static final List<String> ALL_EXAMPLE_RESOURCES = new ArrayList<>();
+-  static {
+-    for (String example : ALL_EXAMPLES) {
+-      ALL_EXAMPLE_RESOURCES.add(PACKAGE + example);
+-    }
+-  }
+-
+-  private ExampleAppJson() {
+-  }
+-
+-  public static Service loadResource(String name) throws IOException {
+-    return JSON_SER_DESER.fromResource(PACKAGE + name);
+-  }
+-
+-  public static String resourceName(String name) {
+-    return "target/test-classes" + PACKAGE + name;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestAppJsonResolve.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestAppJsonResolve.java
+deleted file mode 100644
+index 04c84dc1a2b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestAppJsonResolve.java
++++ /dev/null
+@@ -1,236 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.ResourceInformation;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import static org.apache.hadoop.yarn.service.conf.ExampleAppJson.*;
+-
+-/**
+- * Test global configuration resolution.
+- */
+-public class TestAppJsonResolve extends Assert {
+-  protected static final Logger LOG =
+-      LoggerFactory.getLogger(TestAppJsonResolve.class);
+-
+-  @Test
+-  public void testOverride() throws Throwable {
+-    Service orig = ExampleAppJson.loadResource(OVERRIDE_JSON);
+-
+-    Configuration global = orig.getConfiguration();
+-    assertEquals("a", global.getProperty("g1"));
+-    assertEquals("b", global.getProperty("g2"));
+-    assertEquals(2, global.getFiles().size());
+-
+-    Configuration simple = orig.getComponent("simple").getConfiguration();
+-    assertEquals(0, simple.getProperties().size());
+-    assertEquals(1, simple.getFiles().size());
+-
+-    Configuration master = orig.getComponent("master").getConfiguration();
+-    assertEquals("m", master.getProperty("name"));
+-    assertEquals("overridden", master.getProperty("g1"));
+-    assertEquals(0, master.getFiles().size());
+-
+-    Configuration worker = orig.getComponent("worker").getConfiguration();
+-    LOG.info("worker = {}", worker);
+-    assertEquals(3, worker.getProperties().size());
+-    assertEquals(0, worker.getFiles().size());
+-
+-    assertEquals("worker", worker.getProperty("name"));
+-    assertEquals("overridden-by-worker", worker.getProperty("g1"));
+-    assertNull(worker.getProperty("g2"));
+-    assertEquals("1000", worker.getProperty("timeout"));
+-
+-    // here is the resolution
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    ServiceApiUtil.validateAndResolveService(orig, sfs, new
+-        YarnConfiguration());
+-
+-    global = orig.getConfiguration();
+-    LOG.info("global = {}", global);
+-    assertEquals("a", global.getProperty("g1"));
+-    assertEquals("b", global.getProperty("g2"));
+-    assertEquals(2, global.getFiles().size());
+-
+-    simple = orig.getComponent("simple").getConfiguration();
+-    assertEquals(2, simple.getProperties().size());
+-    assertEquals("a", simple.getProperty("g1"));
+-    assertEquals("b", simple.getProperty("g2"));
+-    assertEquals(2, simple.getFiles().size());
+-
+-    Set<ConfigFile> files = new HashSet<>();
+-    Map<String, String> props = new HashMap<>();
+-    props.put("k1", "overridden");
+-    props.put("k2", "v2");
+-    files.add(new ConfigFile().destFile("file1").type(ConfigFile.TypeEnum
+-        .PROPERTIES).properties(props));
+-    files.add(new ConfigFile().destFile("file2").type(ConfigFile.TypeEnum
+-        .XML).properties(Collections.singletonMap("k3", "v3")));
+-    assertTrue(files.contains(simple.getFiles().get(0)));
+-    assertTrue(files.contains(simple.getFiles().get(1)));
+-
+-    master = orig.getComponent("master").getConfiguration();
+-    LOG.info("master = {}", master);
+-    assertEquals(3, master.getProperties().size());
+-    assertEquals("m", master.getProperty("name"));
+-    assertEquals("overridden", master.getProperty("g1"));
+-    assertEquals("b", master.getProperty("g2"));
+-    assertEquals(2, master.getFiles().size());
+-
+-    props.put("k1", "v1");
+-    files.clear();
+-    files.add(new ConfigFile().destFile("file1").type(ConfigFile.TypeEnum
+-        .PROPERTIES).properties(props));
+-    files.add(new ConfigFile().destFile("file2").type(ConfigFile.TypeEnum
+-        .XML).properties(Collections.singletonMap("k3", "v3")));
+-
+-    assertTrue(files.contains(master.getFiles().get(0)));
+-    assertTrue(files.contains(master.getFiles().get(1)));
+-
+-    worker = orig.getComponent("worker").getConfiguration();
+-    LOG.info("worker = {}", worker);
+-    assertEquals(4, worker.getProperties().size());
+-
+-    assertEquals("worker", worker.getProperty("name"));
+-    assertEquals("overridden-by-worker", worker.getProperty("g1"));
+-    assertEquals("b", worker.getProperty("g2"));
+-    assertEquals("1000", worker.getProperty("timeout"));
+-    assertEquals(2, worker.getFiles().size());
+-
+-    assertTrue(files.contains(worker.getFiles().get(0)));
+-    assertTrue(files.contains(worker.getFiles().get(1)));
+-  }
+-
+-  @Test
+-  public void testOverrideExternalConfiguration() throws IOException {
+-    Service orig = ExampleAppJson.loadResource(EXTERNAL_JSON_1);
+-
+-    Configuration global = orig.getConfiguration();
+-    assertEquals(0, global.getProperties().size());
+-
+-    assertEquals(3, orig.getComponents().size());
+-
+-    Configuration simple = orig.getComponent("simple").getConfiguration();
+-    assertEquals(0, simple.getProperties().size());
+-
+-    Configuration master = orig.getComponent("master").getConfiguration();
+-    assertEquals(1, master.getProperties().size());
+-    assertEquals("is-overridden", master.getProperty("g3"));
+-
+-    Configuration other = orig.getComponent("other").getConfiguration();
+-    assertEquals(0, other.getProperties().size());
+-
+-    // load the external service
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    Service ext = ExampleAppJson.loadResource(APP_JSON);
+-    ServiceApiUtil.validateAndResolveService(ext, sfs, new
+-        YarnConfiguration());
+-
+-    // perform the resolution on original service
+-    sfs = ServiceTestUtils.initMockFs(ext);
+-    ServiceApiUtil.validateAndResolveService(orig, sfs, new
+-        YarnConfiguration());
+-
+-    global = orig.getConfiguration();
+-    assertEquals(0, global.getProperties().size());
+-
+-    assertEquals(4, orig.getComponents().size());
+-
+-    simple = orig.getComponent("simple").getConfiguration();
+-    assertEquals(3, simple.getProperties().size());
+-    assertEquals("a", simple.getProperty("g1"));
+-    assertEquals("b", simple.getProperty("g2"));
+-    assertEquals("60",
+-        simple.getProperty("yarn.service.failure-count-reset.window"));
+-
+-    master = orig.getComponent("master").getConfiguration();
+-    assertEquals(5, master.getProperties().size());
+-    assertEquals("512M", master.getProperty("jvm.heapsize"));
+-    assertEquals("overridden", master.getProperty("g1"));
+-    assertEquals("b", master.getProperty("g2"));
+-    assertEquals("is-overridden", master.getProperty("g3"));
+-    assertEquals("60",
+-        simple.getProperty("yarn.service.failure-count-reset.window"));
+-
+-    Configuration worker = orig.getComponent("worker").getConfiguration();
+-    LOG.info("worker = {}", worker);
+-    assertEquals(4, worker.getProperties().size());
+-    assertEquals("512M", worker.getProperty("jvm.heapsize"));
+-    assertEquals("overridden-by-worker", worker.getProperty("g1"));
+-    assertEquals("b", worker.getProperty("g2"));
+-    assertEquals("60",
+-        worker.getProperty("yarn.service.failure-count-reset.window"));
+-
+-    // Validate worker's resources
+-    Resource workerResource = orig.getComponent("worker").getResource();
+-    Assert.assertEquals(1, workerResource.getCpus().intValue());
+-    Assert.assertEquals(1024, workerResource.calcMemoryMB());
+-    Assert.assertNotNull(workerResource.getAdditional());
+-    Assert.assertEquals(2, workerResource.getAdditional().size());
+-    Assert.assertEquals(3333, workerResource.getAdditional().get(
+-        "resource-1").getValue().longValue());
+-    Assert.assertEquals("Gi", workerResource.getAdditional().get(
+-        "resource-1").getUnit());
+-
+-    Assert.assertEquals(5, workerResource.getAdditional().get(
+-        "yarn.io/gpu").getValue().longValue());
+-    Assert.assertEquals("", workerResource.getAdditional().get(
+-        "yarn.io/gpu").getUnit());
+-
+-    other = orig.getComponent("other").getConfiguration();
+-    assertEquals(0, other.getProperties().size());
+-  }
+-
+-  @Test
+-  public void testSetResourceAttributes() throws IOException {
+-    Service orig = ExampleAppJson.loadResource(EXTERNAL_JSON_3);
+-    Component component = orig.getComponent("volume-service");
+-    Assert.assertNotNull(component);
+-    Map<String, ResourceInformation> adResource = component
+-        .getResource().getAdditional();
+-    Assert.assertNotNull(adResource);
+-    Assert.assertEquals(1, adResource.size());
+-    Map.Entry<String, ResourceInformation> volume = adResource
+-        .entrySet().iterator().next();
+-    Assert.assertEquals("yarn.io/csi-volume", volume.getKey());
+-    Assert.assertEquals(100L, volume.getValue().getValue().longValue());
+-    Assert.assertEquals(2, volume.getValue().getAttributes().size());
+-    Assert.assertEquals(1, volume.getValue().getTags().size());
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestLoadExampleAppJson.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestLoadExampleAppJson.java
+deleted file mode 100644
+index a813da3bff1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestLoadExampleAppJson.java
++++ /dev/null
+@@ -1,71 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-import static org.apache.hadoop.yarn.service.ServiceTestUtils.JSON_SER_DESER;
+-
+-/**
+- * Test loading example resources.
+- */
+-@RunWith(value = Parameterized.class)
+-public class TestLoadExampleAppJson extends Assert {
+-  private String resource;
+-
+-  public TestLoadExampleAppJson(String resource) {
+-    this.resource = resource;
+-  }
+-
+-  @Parameterized.Parameters
+-  public static Collection<String[]> filenames() {
+-    String[][] stringArray = new String[ExampleAppJson
+-        .ALL_EXAMPLE_RESOURCES.size()][1];
+-    int i = 0;
+-    for (String s : ExampleAppJson.ALL_EXAMPLE_RESOURCES) {
+-      stringArray[i++][0] = s;
+-    }
+-    return Arrays.asList(stringArray);
+-  }
+-
+-  @Test
+-  public void testLoadResource() throws Throwable {
+-    try {
+-      Service service = JSON_SER_DESER.fromResource(resource);
+-
+-      SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-
+-      ServiceApiUtil.validateAndResolveService(service, sfs,
+-          new YarnConfiguration());
+-    } catch (Exception e) {
+-      throw new Exception("exception loading " + resource + ":" + e.toString());
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestValidateServiceNames.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestValidateServiceNames.java
+deleted file mode 100644
+index d7fa9a04dbb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/conf/TestValidateServiceNames.java
++++ /dev/null
+@@ -1,125 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.conf;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.service.utils.ServiceApiUtil;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import java.util.Arrays;
+-import java.util.List;
+-
+-/**
+- * Test cluster name validation.
+- */
+-public class TestValidateServiceNames {
+-
+-  void assertValidName(String name) {
+-    ServiceApiUtil.validateNameFormat(name, new Configuration());
+-  }
+-
+-  void assertInvalidName(String name) {
+-    try {
+-      ServiceApiUtil.validateNameFormat(name, new Configuration());
+-      Assert.fail();
+-    } catch (IllegalArgumentException e) {
+-      //
+-    }
+-  }
+-
+-  void assertInvalid(List<String> names) {
+-    for (String name : names) {
+-      assertInvalidName(name);
+-    }
+-  }
+-
+-  void assertValid(List<String> names) {
+-    for (String name : names) {
+-      assertValidName(name);
+-    }
+-  }
+-
+-  @Test
+-  public void testEmptyName() throws Throwable {
+-    assertInvalidName("");
+-  }
+-
+-  @Test
+-  public void testSpaceName() throws Throwable {
+-    assertInvalidName(" ");
+-  }
+-
+-
+-  @Test
+-  public void testLeadingHyphen() throws Throwable {
+-    assertInvalidName("-hyphen");
+-  }
+-
+-  @Test
+-  public void testTitleLetters() throws Throwable {
+-    assertInvalidName("Title");
+-  }
+-
+-  @Test
+-  public void testCapitalLetters() throws Throwable {
+-    assertInvalidName("UPPER-CASE-CLUSTER");
+-  }
+-
+-  @Test
+-  public void testInnerBraced() throws Throwable {
+-    assertInvalidName("a[a");
+-  }
+-
+-  @Test
+-  public void testLeadingBrace() throws Throwable {
+-    assertInvalidName("[");
+-  }
+-
+-  @Test
+-  public void testNonalphaLeadingChars() throws Throwable {
+-    assertInvalid(Arrays.asList(
+-        "[a", "#", "@", "=", "*", "."
+-    ));
+-  }
+-
+-  @Test
+-  public void testNonalphaInnerChars() throws Throwable {
+-    assertInvalid(Arrays.asList(
+-        "a[a", "b#", "c@", "d=", "e*", "f.", "g ", "h i"
+-    ));
+-  }
+-
+-  @Test
+-  public void testClusterValid() throws Throwable {
+-    assertValidName("cluster");
+-  }
+-
+-  @Test
+-  public void testValidNames() throws Throwable {
+-    assertValid(Arrays.asList(
+-        "cluster",
+-        "cluster1",
+-        "very-very-very-long-cluster-name",
+-        "c1234567890"
+-    ));
+-
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java
+deleted file mode 100644
+index 31ca38297c8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/containerlaunch/TestAbstractLauncher.java
++++ /dev/null
+@@ -1,119 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.containerlaunch;
+-
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.component.AlwaysRestartPolicy;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.NeverRestartPolicy;
+-import org.apache.hadoop.yarn.service.component.OnFailureRestartPolicy;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.provider.defaultImpl
+-    .DefaultProviderService;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-
+-import static org.apache.hadoop.fi.FiConfig.getConfig;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf
+-    .DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf
+-    .DEFAULT_CONTAINER_RETRY_INTERVAL;
+-import static org.apache.hadoop.yarn.service.conf.YarnServiceConf
+-    .DEFAULT_CONTAINER_RETRY_MAX;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.reset;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.verifyZeroInteractions;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for {@link AbstractLauncher}.
+- */
+-public class TestAbstractLauncher {
+-
+-  private AbstractLauncher launcher;
+-
+-  @Before
+-  public void setup() {
+-    launcher = new AbstractLauncher(mock(ServiceContext.class));
+-  }
+-
+-  @Test
+-  public void testDockerContainerMounts() throws IOException {
+-    launcher.yarnDockerMode = true;
+-    launcher.envVars.put(AbstractLauncher.ENV_DOCKER_CONTAINER_MOUNTS,
+-        "s1:t1:ro");
+-    launcher.mountPaths.put("s2", "t2");
+-    launcher.completeContainerLaunch();
+-    String dockerContainerMounts = launcher.containerLaunchContext
+-        .getEnvironment().get(AbstractLauncher.ENV_DOCKER_CONTAINER_MOUNTS);
+-
+-    Assert.assertEquals("s1:t1:ro,s2:t2:ro", dockerContainerMounts);
+-  }
+-
+-  @Test
+-  public void testContainerRetries() throws Exception {
+-
+-    DefaultProviderService providerService = new DefaultProviderService();
+-    AbstractLauncher mockLauncher = mock(AbstractLauncher.class);
+-    ContainerLaunchService.ComponentLaunchContext componentLaunchContext =
+-        mock(ContainerLaunchService.ComponentLaunchContext.class);
+-
+-    ComponentInstance componentInstance = mock(ComponentInstance.class);
+-
+-    //Never Restart Policy
+-    Component component = mock(Component.class);
+-    when(componentInstance.getComponent()).thenReturn(component);
+-
+-    when(component.getRestartPolicyHandler()).thenReturn(NeverRestartPolicy
+-        .getInstance());
+-
+-    providerService.buildContainerRetry(mockLauncher, getConfig(),
+-        componentLaunchContext, componentInstance);
+-    verifyZeroInteractions(mockLauncher);
+-
+-
+-    //OnFailure restart policy
+-    when(component.getRestartPolicyHandler()).thenReturn(OnFailureRestartPolicy
+-        .getInstance());
+-    when(componentLaunchContext.getConfiguration()).thenReturn(new
+-        Configuration());
+-    providerService.buildContainerRetry(mockLauncher, getConfig(),
+-        componentLaunchContext, componentInstance);
+-    verify(mockLauncher).setRetryContext(DEFAULT_CONTAINER_RETRY_MAX,
+-        DEFAULT_CONTAINER_RETRY_INTERVAL,
+-        DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL);
+-
+-    reset(mockLauncher);
+-
+-    //Always restart policy
+-    when(component.getRestartPolicyHandler()).thenReturn(AlwaysRestartPolicy
+-        .getInstance());
+-    providerService.buildContainerRetry(mockLauncher, getConfig(),
+-        componentLaunchContext, componentInstance);
+-
+-    verify(mockLauncher).setRetryContext(DEFAULT_CONTAINER_RETRY_MAX,
+-        DEFAULT_CONTAINER_RETRY_INTERVAL,
+-        DEFAULT_CONTAINER_FAILURES_VALIDITY_INTERVAL);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/TestServiceMonitor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/TestServiceMonitor.java
+deleted file mode 100644
+index c758e6fbeaa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/TestServiceMonitor.java
++++ /dev/null
+@@ -1,126 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-
+-package org.apache.hadoop.yarn.service.monitor;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.curator.test.TestingCluster;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.MockServiceAM;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConf;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.Collections;
+-
+-import static org.apache.hadoop.registry.client.api.RegistryConstants
+-    .KEY_REGISTRY_ZK_QUORUM;
+-
+-public class TestServiceMonitor extends ServiceTestUtils {
+-
+-  private File basedir;
+-  YarnConfiguration conf = new YarnConfiguration();
+-  TestingCluster zkCluster;
+-
+-  @Before
+-  public void setup() throws Exception {
+-    basedir = new File("target", "apps");
+-    if (basedir.exists()) {
+-      FileUtils.deleteDirectory(basedir);
+-    } else {
+-      basedir.mkdirs();
+-    }
+-    conf.setLong(YarnServiceConf.READINESS_CHECK_INTERVAL, 2);
+-    zkCluster = new TestingCluster(1);
+-    zkCluster.start();
+-    conf.set(KEY_REGISTRY_ZK_QUORUM, zkCluster.getConnectString());
+-    System.out.println("ZK cluster: " +  zkCluster.getConnectString());
+-  }
+-
+-  @After
+-  public void tearDown() throws IOException {
+-    if (basedir != null) {
+-      FileUtils.deleteDirectory(basedir);
+-    }
+-    if (zkCluster != null) {
+-      zkCluster.stop();
+-    }
+-  }
+-
+-  // Create compa with 1 container
+-  // Create compb with 1 container
+-  // Verify compb dependency satisfied
+-  // Increase compa to 2 containers
+-  // Verify compb dependency becomes unsatisfied.
+-  @Test
+-  public void testComponentDependency() throws Exception{
+-    ApplicationId applicationId = ApplicationId.newInstance(123456, 1);
+-    Service exampleApp = new Service();
+-    exampleApp.setVersion("v1");
+-    exampleApp.setId(applicationId.toString());
+-    exampleApp.setName("testComponentDependency");
+-    exampleApp.addComponent(createComponent("compa", 1, "sleep 1000"));
+-    // Let compb depends on compa;
+-    Component compb = createComponent("compb", 1, "sleep 1000", Component
+-        .RestartPolicyEnum.ON_FAILURE, Collections.singletonList("compa"));
+-    // Let compb depends on compb;
+-    Component compc = createComponent("compc", 1, "sleep 1000", Component
+-        .RestartPolicyEnum.NEVER, Collections.singletonList("compb"));
+-
+-    exampleApp.addComponent(compb);
+-    exampleApp.addComponent(compc);
+-
+-    MockServiceAM am = new MockServiceAM(exampleApp);
+-    am.init(conf);
+-    am.start();
+-
+-    // compa ready
+-    Assert.assertTrue(am.getComponent("compa").areDependenciesReady());
+-    //compb not ready
+-    Assert.assertFalse(am.getComponent("compb").areDependenciesReady());
+-
+-    // feed 1 container to compa,
+-    am.feedContainerToComp(exampleApp, 1, "compa");
+-    // waiting for compb's dependencies are satisfied
+-    am.waitForDependenciesSatisfied("compb");
+-
+-    // feed 1 container to compb,
+-    am.feedContainerToComp(exampleApp, 2, "compb");
+-    // waiting for compc's dependencies are satisfied
+-    am.waitForDependenciesSatisfied("compc");
+-
+-    // feed 1 container to compb
+-    am.feedContainerToComp(exampleApp, 2, "compb");
+-    am.flexComponent("compa", 2);
+-    am.waitForNumDesiredContainers("compa", 2);
+-
+-    // compb dependencies not satisfied again.
+-    Assert.assertFalse(am.getComponent("compb").areDependenciesReady());
+-    am.stop();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/probe/TestDefaultProbe.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/probe/TestDefaultProbe.java
+deleted file mode 100644
+index 8169e67b7c3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/monitor/probe/TestDefaultProbe.java
++++ /dev/null
+@@ -1,155 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.monitor.probe;
+-
+-import org.apache.hadoop.yarn.api.records.ContainerStatus;
+-import org.apache.hadoop.yarn.service.api.records.ReadinessCheck;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.mockito.invocation.InvocationOnMock;
+-import org.mockito.stubbing.Answer;
+-
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import static org.junit.Assert.assertFalse;
+-import static org.junit.Assert.assertTrue;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for default probe.
+- */
+-@RunWith(Parameterized.class)
+-public class TestDefaultProbe {
+-  private final DefaultProbe probe;
+-
+-  public TestDefaultProbe(Probe probe) {
+-    this.probe = (DefaultProbe) probe;
+-  }
+-
+-  @Parameterized.Parameters
+-  public static Collection<Object[]> data() {
+-    // test run 1: Default probe checks that container has an IP
+-    Probe p1 = MonitorUtils.getProbe(null);
+-
+-    // test run 2: Default probe with DNS check for component instance hostname
+-    ReadinessCheck rc2 = new ReadinessCheck()
+-        .type(ReadinessCheck.TypeEnum.DEFAULT)
+-        .properties(Collections.singletonMap(
+-            MonitorKeys.DEFAULT_PROBE_DNS_CHECK_ENABLED, "true"));
+-    Probe p2 = MonitorUtils.getProbe(rc2);
+-
+-    // test run 3: Default probe with DNS check using specific DNS server
+-    Map<String, String> props = new HashMap<>();
+-    props.put(MonitorKeys.DEFAULT_PROBE_DNS_CHECK_ENABLED, "true");
+-    props.put(MonitorKeys.DEFAULT_PROBE_DNS_ADDRESS, "8.8.8.8");
+-    ReadinessCheck rc3 = new ReadinessCheck()
+-        .type(ReadinessCheck.TypeEnum.DEFAULT).properties(props);
+-    Probe p3 = MonitorUtils.getProbe(rc3);
+-
+-    return Arrays.asList(new Object[][] {{p1}, {p2}, {p3}});
+-  }
+-
+-  @Test
+-  public void testDefaultProbe() {
+-    // component instance has a good hostname, so probe will eventually succeed
+-    // whether or not DNS checking is enabled
+-    ComponentInstance componentInstance =
+-        createMockComponentInstance("example.com");
+-    checkPingResults(probe, componentInstance, false);
+-
+-    // component instance has a bad hostname, so probe will fail when DNS
+-    // checking is enabled
+-    componentInstance = createMockComponentInstance("bad.dns.test");
+-    checkPingResults(probe, componentInstance, probe.isDnsCheckEnabled());
+-  }
+-
+-  private static void checkPingResults(Probe probe, ComponentInstance
+-      componentInstance, boolean expectDNSCheckFailure) {
+-    // on the first ping, null container status results in failure
+-    ProbeStatus probeStatus = probe.ping(componentInstance);
+-    assertFalse("Expected failure for " + probeStatus.toString(),
+-        probeStatus.isSuccess());
+-    assertTrue("Expected IP failure for " + probeStatus.toString(),
+-        probeStatus.toString().contains(
+-        componentInstance.getCompInstanceName() + ": IP is not available yet"));
+-
+-    // on the second ping, container status is retrieved but there are no
+-    // IPs, resulting in failure
+-    probeStatus = probe.ping(componentInstance);
+-    assertFalse("Expected failure for " + probeStatus.toString(),
+-        probeStatus.isSuccess());
+-    assertTrue("Expected IP failure for " + probeStatus.toString(),
+-        probeStatus.toString().contains(componentInstance
+-            .getCompInstanceName() + ": IP is not available yet"));
+-
+-    // on the third ping, IPs are retrieved and success depends on whether or
+-    // not a DNS lookup can be performed for the component instance hostname
+-    probeStatus = probe.ping(componentInstance);
+-    if (expectDNSCheckFailure) {
+-      assertFalse("Expected failure for " + probeStatus.toString(),
+-          probeStatus.isSuccess());
+-      assertTrue("Expected DNS failure for " + probeStatus.toString(),
+-          probeStatus.toString().contains(componentInstance
+-              .getCompInstanceName() + ": DNS checking is enabled, but lookup" +
+-              " for " + componentInstance.getHostname() + " is not available " +
+-              "yet"));
+-    } else {
+-      assertTrue("Expected success for " + probeStatus.toString(),
+-          probeStatus.isSuccess());
+-    }
+-  }
+-
+-  private static ComponentInstance createMockComponentInstance(String
+-      hostname) {
+-    ComponentInstance componentInstance = mock(ComponentInstance.class);
+-    when(componentInstance.getHostname()).thenReturn(hostname);
+-    when(componentInstance.getCompInstanceName()).thenReturn("comp-0");
+-    when(componentInstance.getContainerStatus())
+-        .thenAnswer(new Answer<ContainerStatus>() {
+-          private int count = 0;
+-
+-          @Override
+-          public ContainerStatus answer(InvocationOnMock invocationOnMock) {
+-            count++;
+-            if (count == 1) {
+-              // first call to getContainerStatus returns null
+-              return null;
+-            } else if (count == 2) {
+-              // second call returns a ContainerStatus with no IPs
+-              ContainerStatus containerStatus = mock(ContainerStatus.class);
+-              when(containerStatus.getIPs()).thenReturn(null);
+-              return containerStatus;
+-            } else {
+-              // third call returns a ContainerStatus with one IP
+-              ContainerStatus containerStatus = mock(ContainerStatus.class);
+-              when(containerStatus.getIPs())
+-                  .thenReturn(Collections.singletonList("1.2.3.4"));
+-              return containerStatus;
+-            }
+-          }
+-        });
+-    return componentInstance;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestAbstractProviderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestAbstractProviderService.java
+deleted file mode 100644
+index b56ccb5cf37..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestAbstractProviderService.java
++++ /dev/null
+@@ -1,157 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.Container;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.service.MockRunningServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.TestServiceManager;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.component.Component;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.provider.docker.DockerProviderService;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Rule;
+-import org.junit.Test;
+-
+-import java.io.File;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Tests for {@link AbstractProviderService}
+- */
+-public class TestAbstractProviderService {
+-
+-  private ServiceContext serviceContext;
+-  private Service testService;
+-  private AbstractLauncher launcher;
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Before
+-  public void setup() throws Exception {
+-    testService = TestServiceManager.createBaseDef("testService");
+-    serviceContext = new MockRunningServiceContext(rule, testService);
+-    launcher = new AbstractLauncher(serviceContext);
+-    rule.getFs().setAppDir(new Path("target/testAbstractProviderService"));
+-  }
+-
+-  @After
+-  public void teardown() throws Exception {
+-    FileUtils.deleteQuietly(
+-        new File(rule.getFs().getAppDir().toUri().getPath()));
+-  }
+-
+-  @Test
+-  public void testBuildContainerLaunchCommand() throws Exception {
+-    AbstractProviderService providerService = new DockerProviderService();
+-    Component component = serviceContext.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    ContainerLaunchService.ComponentLaunchContext clc =
+-        createEntryPointCLCFor(testService, component, "sleep,9000");
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    Container container = mock(Container.class);
+-    providerService.buildContainerLaunchCommand(launcher, testService, instance,
+-        rule.getFs(), serviceContext.scheduler.getConfig(), container, clc,
+-        null);
+-
+-    Assert.assertEquals("commands", Lists.newArrayList(clc.getLaunchCommand()),
+-        launcher.getCommands());
+-  }
+-
+-  @Test
+-  public void testBuildContainerLaunchCommandWithSpace() throws Exception {
+-    AbstractProviderService providerService = new DockerProviderService();
+-    Component component = serviceContext.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    ContainerLaunchService.ComponentLaunchContext clc =
+-        createEntryPointCLCFor(testService, component, "ls -l \" space\"");
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    Container container = mock(Container.class);
+-    providerService.buildContainerLaunchCommand(launcher, testService, instance,
+-        rule.getFs(), serviceContext.scheduler.getConfig(), container, clc,
+-        null);
+-
+-    Assert.assertEquals("commands don't match.",
+-        Lists.newArrayList("ls,-l, space"), launcher.getCommands());
+-  }
+-
+-  @Test
+-  public void testBuildContainerLaunchContext() throws Exception {
+-    AbstractProviderService providerService = new DockerProviderService();
+-    Component component = serviceContext.scheduler.getAllComponents().entrySet()
+-        .iterator().next().getValue();
+-    ContainerLaunchService.ComponentLaunchContext clc =
+-        createEntryPointCLCFor(testService, component, "sleep,9000");
+-
+-    ComponentInstance instance = component.getAllComponentInstances().iterator()
+-        .next();
+-    Container container = mock(Container.class);
+-    ContainerId containerId = ContainerId.newContainerId(
+-        ApplicationAttemptId.newInstance(ApplicationId.newInstance(
+-            System.currentTimeMillis(), 1), 1), 1L);
+-    when(container.getId()).thenReturn(containerId);
+-    providerService.buildContainerLaunchContext(launcher, testService, instance,
+-        rule.getFs(), serviceContext.scheduler.getConfig(), container, clc);
+-
+-    Assert.assertEquals("artifact", clc.getArtifact().getId(),
+-        launcher.getDockerImage());
+-  }
+-
+-  private static ContainerLaunchService.ComponentLaunchContext
+-      createEntryPointCLCFor(Service service, Component component,
+-          String launchCmd) {
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.DOCKER);
+-    artifact.setId("example");
+-    Map<String, String> env = new HashMap<>();
+-    env.put("YARN_CONTAINER_RUNTIME_DOCKER_DELAYED_REMOVAL", "true");
+-    env.put("YARN_CONTAINER_RUNTIME_DOCKER_RUN_OVERRIDE_DISABLE", "true");
+-    component.getComponentSpec().getConfiguration().setEnv(env);
+-
+-    return new ContainerLaunchService.ComponentLaunchContext(
+-        component.getName(),
+-        service.getVersion())
+-        .setArtifact(artifact)
+-        .setConfiguration(component.getComponentSpec().getConfiguration())
+-        .setLaunchCommand(launchCmd);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestProviderUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestProviderUtils.java
+deleted file mode 100644
+index bfdcccd268c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/provider/TestProviderUtils.java
++++ /dev/null
+@@ -1,185 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.provider;
+-
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.api.records.Configuration;
+-import org.apache.hadoop.yarn.service.containerlaunch.AbstractLauncher;
+-import org.apache.hadoop.yarn.service.containerlaunch.ContainerLaunchService;
+-import org.apache.hadoop.yarn.service.utils.SliderFileSystem;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.mockito.Mockito;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Test functionality of ProviderUtils.
+- */
+-public class TestProviderUtils {
+-  @Test
+-  public void testStaticFileLocalization() throws IOException {
+-    // A bunch of mocks ...
+-    ContainerLaunchService.ComponentLaunchContext compLaunchCtx =
+-        mock(ContainerLaunchService.ComponentLaunchContext.class);
+-    AbstractLauncher launcher = mock(AbstractLauncher.class);
+-    SliderFileSystem sfs = mock(SliderFileSystem.class);
+-    FileSystem fs = mock(FileSystem.class);
+-    when(fs.getFileStatus(any(Path.class))).thenAnswer(
+-        invocationOnMock -> new FileStatus(1L, false, 1, 1L, 1L,
+-            (Path) invocationOnMock.getArguments()[0]));
+-    when(fs.exists(any(Path.class))).thenReturn(true);
+-    when(sfs.getFileSystem()).thenReturn(fs);
+-    Configuration conf = mock(Configuration.class);
+-    List<ConfigFile> configFileList = new ArrayList<>();
+-    when(conf.getFiles()).thenReturn(configFileList);
+-    when(compLaunchCtx.getConfiguration()).thenReturn(conf);
+-    when(sfs.createAmResource(any(Path.class), any(LocalResourceType.class),
+-        any(LocalResourceVisibility.class))).thenAnswer(
+-          invocationOnMock -> new LocalResource() {
+-            @Override
+-            public URL getResource() {
+-              return URL.fromPath(((Path) invocationOnMock.getArguments()[0]));
+-            }
+-
+-            @Override
+-            public void setResource(URL resource) {
+-
+-            }
+-
+-            @Override
+-            public long getSize() {
+-              return 0;
+-            }
+-
+-            @Override
+-            public void setSize(long size) {
+-
+-            }
+-
+-            @Override
+-            public long getTimestamp() {
+-              return 0;
+-            }
+-
+-            @Override
+-            public void setTimestamp(long timestamp) {
+-
+-            }
+-
+-            @Override
+-            public LocalResourceType getType() {
+-              return (LocalResourceType) invocationOnMock.getArguments()[1];
+-            }
+-
+-            @Override
+-            public void setType(LocalResourceType type) {
+-
+-            }
+-
+-            @Override
+-            public LocalResourceVisibility getVisibility() {
+-              return LocalResourceVisibility.APPLICATION;
+-            }
+-
+-            @Override
+-            public void setVisibility(LocalResourceVisibility visibility) {
+-
+-            }
+-
+-            @Override
+-            public String getPattern() {
+-              return null;
+-            }
+-
+-            @Override
+-            public void setPattern(String pattern) {
+-
+-            }
+-
+-            @Override
+-            public boolean getShouldBeUploadedToSharedCache() {
+-              return false;
+-            }
+-
+-            @Override
+-            public void setShouldBeUploadedToSharedCache(
+-                boolean shouldBeUploadedToSharedCache) {
+-
+-            }
+-          });
+-
+-    // Initialize list of files.
+-    //archive
+-    configFileList.add(new ConfigFile().srcFile("hdfs://default/sourceFile1")
+-        .destFile("destFile1").type(ConfigFile.TypeEnum.ARCHIVE)
+-        .visibility(LocalResourceVisibility.APPLICATION));
+-
+-    //static file
+-    configFileList.add(new ConfigFile().srcFile("hdfs://default/sourceFile2")
+-        .destFile("folder/destFile_2").type(ConfigFile.TypeEnum.STATIC)
+-        .visibility(LocalResourceVisibility.APPLICATION));
+-
+-    //This will be ignored since type is JSON
+-    configFileList.add(new ConfigFile().srcFile("hdfs://default/sourceFile3")
+-        .destFile("destFile3").type(ConfigFile.TypeEnum.JSON)
+-        .visibility(LocalResourceVisibility.APPLICATION));
+-    //No destination file specified
+-    configFileList.add(new ConfigFile().srcFile("hdfs://default/sourceFile4")
+-        .type(ConfigFile.TypeEnum.STATIC)
+-        .visibility(LocalResourceVisibility.APPLICATION));
+-
+-    ProviderService.ResolvedLaunchParams resolved =
+-        new ProviderService.ResolvedLaunchParams();
+-    ProviderUtils.handleStaticFilesForLocalization(launcher, sfs,
+-        compLaunchCtx, resolved);
+-    Mockito.verify(launcher).addLocalResource(Mockito.eq("destFile1"),
+-        any(LocalResource.class));
+-    Mockito.verify(launcher).addLocalResource(
+-        Mockito.eq("destFile_2"), any(LocalResource.class));
+-    Mockito.verify(launcher).addLocalResource(
+-        Mockito.eq("sourceFile4"), any(LocalResource.class));
+-
+-    Assert.assertEquals(3, resolved.getResolvedRsrcPaths().size());
+-    Assert.assertEquals(resolved.getResolvedRsrcPaths().get("destFile1"),
+-        "destFile1");
+-  }
+-
+-  @Test
+-  public void testReplaceSpacesWithDelimiter() {
+-    String command = "ls  -l \" space\"";
+-    String expected = "ls,-l, space";
+-    String actual = ProviderUtils.replaceSpacesWithDelimiter(command, ",");
+-    Assert.assertEquals("replaceSpaceWithDelimiter produces unexpected result.",
+-        expected, actual);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestAbstractClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestAbstractClientProvider.java
+deleted file mode 100644
+index 8908a1d415b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestAbstractClientProvider.java
++++ /dev/null
+@@ -1,163 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.providers;
+-
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.provider.AbstractClientProvider;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Test the AbstractClientProvider shared methods.
+- */
+-public class TestAbstractClientProvider {
+-  private static final String EXCEPTION_PREFIX = "Should have thrown " +
+-      "exception: ";
+-  private static final String NO_EXCEPTION_PREFIX = "Should not have thrown " +
+-      "exception: ";
+-
+-  private static class ClientProvider extends AbstractClientProvider {
+-    @Override
+-    public void validateArtifact(Artifact artifact, String compName,
+-        FileSystem fileSystem) throws IOException {
+-    }
+-
+-    @Override
+-    protected void validateConfigFile(ConfigFile configFile, String compName,
+-        FileSystem fileSystem) throws IOException {
+-    }
+-  }
+-
+-  @Test
+-  public void testConfigFiles() throws IOException {
+-    ClientProvider clientProvider = new ClientProvider();
+-    FileSystem mockFs = mock(FileSystem.class);
+-    FileStatus mockFileStatus = mock(FileStatus.class);
+-    when(mockFs.exists(any())).thenReturn(true);
+-
+-    String compName = "sleeper";
+-    ConfigFile configFile = new ConfigFile();
+-    List<ConfigFile> configFiles = new ArrayList<>();
+-    configFiles.add(configFile);
+-
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "null file type");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFile.setType(ConfigFile.TypeEnum.TEMPLATE);
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "empty src_file for type template");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFile.setSrcFile("srcfile");
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "empty dest file");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFile.setDestFile("destfile");
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    configFile = new ConfigFile();
+-    configFile.setType(ConfigFile.TypeEnum.JSON);
+-    configFile.setSrcFile(null);
+-    configFile.setDestFile("path/destfile2");
+-    configFiles.add(configFile);
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "dest file with multiple path elements");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFile.setDestFile("/path/destfile2");
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    configFile.setDestFile("destfile");
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "duplicate dest file");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFiles.clear();
+-    configFile = new ConfigFile();
+-    configFile.setType(ConfigFile.TypeEnum.STATIC);
+-    configFile.setSrcFile(null);
+-    configFile.setDestFile("path/destfile3");
+-    configFiles.add(configFile);
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "dest file with multiple path elements");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    configFile.setDestFile("/path/destfile3");
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "src file should be specified");
+-    } catch (IllegalArgumentException e) {
+-    }
+-
+-    //should succeed
+-    configFile.setSrcFile("srcFile");
+-    configFile.setDestFile("destfile3");
+-    clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-
+-    when(mockFileStatus.isDirectory()).thenReturn(true);
+-    when(mockFs.getFileStatus(new Path("srcFile")))
+-        .thenReturn(mockFileStatus).thenReturn(mockFileStatus);
+-
+-    configFiles.clear();
+-    configFile = new ConfigFile();
+-    configFile.setType(ConfigFile.TypeEnum.STATIC);
+-    configFile.setSrcFile("srcFile");
+-    configFile.setDestFile("destfile3");
+-    configFiles.add(configFile);
+-
+-    try {
+-      clientProvider.validateConfigFiles(configFiles, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + "src file is a directory");
+-    } catch (IllegalArgumentException e) {
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestDefaultClientProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestDefaultClientProvider.java
+deleted file mode 100644
+index 6d6720bb7e6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestDefaultClientProvider.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.providers;
+-
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.yarn.service.api.records.ConfigFile;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-import org.apache.hadoop.yarn.service.provider.defaultImpl.DefaultClientProvider;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-public class TestDefaultClientProvider {
+-  private static final String EXCEPTION_PREFIX = "Should have thrown "
+-      + "exception: ";
+-  private static final String NO_EXCEPTION_PREFIX = "Should not have thrown "
+-      + "exception: ";
+-
+-  @Test
+-  public void testConfigFile() throws IOException {
+-    DefaultClientProvider defaultClientProvider = new DefaultClientProvider();
+-    FileSystem mockFs = mock(FileSystem.class);
+-    when(mockFs.exists(any())).thenReturn(true);
+-
+-    String compName = "sleeper";
+-    ConfigFile configFile = new ConfigFile();
+-    configFile.setDestFile("/var/tmp/a.txt");
+-
+-    try {
+-      defaultClientProvider.validateConfigFile(configFile, compName, mockFs);
+-      Assert.fail(EXCEPTION_PREFIX + " dest_file must be relative");
+-    } catch (IllegalArgumentException e) {
+-      String actualMsg = String.format(
+-          RestApiErrorMessages.ERROR_CONFIGFILE_DEST_FILE_FOR_COMP_NOT_ABSOLUTE,
+-          compName, "no", configFile.getDestFile());
+-      Assert.assertEquals(actualMsg, e.getLocalizedMessage());
+-    }
+-
+-    configFile.setDestFile("../a.txt");
+-    try {
+-      defaultClientProvider.validateConfigFile(configFile, compName, mockFs);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getLocalizedMessage());
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestProviderFactory.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestProviderFactory.java
+deleted file mode 100644
+index 56f4555b16c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/providers/TestProviderFactory.java
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.providers;
+-
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Artifact.TypeEnum;
+-import org.apache.hadoop.yarn.service.provider.ProviderFactory;
+-import org.apache.hadoop.yarn.service.provider.defaultImpl.DefaultClientProvider;
+-import org.apache.hadoop.yarn.service.provider.defaultImpl.DefaultProviderFactory;
+-import org.apache.hadoop.yarn.service.provider.defaultImpl.DefaultProviderService;
+-import org.apache.hadoop.yarn.service.provider.docker.DockerClientProvider;
+-import org.apache.hadoop.yarn.service.provider.docker.DockerProviderFactory;
+-import org.apache.hadoop.yarn.service.provider.docker.DockerProviderService;
+-import org.apache.hadoop.yarn.service.provider.tarball.TarballClientProvider;
+-import org.apache.hadoop.yarn.service.provider.tarball.TarballProviderFactory;
+-import org.apache.hadoop.yarn.service.provider.tarball.TarballProviderService;
+-
+-import org.junit.Test;
+-
+-import static org.junit.Assert.assertTrue;
+-
+-/**
+- * Test provider factories.
+- */
+-public class TestProviderFactory {
+-  @Test
+-  public void testDockerFactory() throws Throwable {
+-    ProviderFactory factory = ProviderFactory
+-        .createServiceProviderFactory(new Artifact().type(TypeEnum.DOCKER));
+-    assertTrue(factory instanceof DockerProviderFactory);
+-    assertTrue(factory.createClientProvider() instanceof DockerClientProvider);
+-    assertTrue(factory.createServerProvider() instanceof DockerProviderService);
+-    assertTrue(ProviderFactory.getProviderService(new Artifact()
+-        .type(TypeEnum.DOCKER)) instanceof DockerProviderService);
+-  }
+-
+-  @Test
+-  public void testTarballFactory() throws Throwable {
+-    ProviderFactory factory = ProviderFactory
+-        .createServiceProviderFactory(new Artifact().type(TypeEnum.TARBALL));
+-    assertTrue(factory instanceof TarballProviderFactory);
+-    assertTrue(factory.createClientProvider() instanceof TarballClientProvider);
+-    assertTrue(factory.createServerProvider() instanceof
+-        TarballProviderService);
+-    assertTrue(ProviderFactory.getProviderService(new Artifact()
+-        .type(TypeEnum.TARBALL)) instanceof TarballProviderService);
+-  }
+-
+-  @Test
+-  public void testDefaultFactory() throws Throwable {
+-    ProviderFactory factory = ProviderFactory
+-        .createServiceProviderFactory(null);
+-    assertTrue(factory instanceof DefaultProviderFactory);
+-    assertTrue(factory.createClientProvider() instanceof DefaultClientProvider);
+-    assertTrue(factory.createServerProvider() instanceof DefaultProviderService);
+-    assertTrue(ProviderFactory.getProviderService(null) instanceof
+-        DefaultProviderService);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java
+deleted file mode 100644
+index a77e6c8d317..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/timelineservice/TestServiceTimelinePublisher.java
++++ /dev/null
+@@ -1,297 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- *  or more contributor license agreements.  See the NOTICE file
+- *  distributed with this work for additional information
+- *  regarding copyright ownership.  The ASF licenses this file
+- *  to you under the Apache License, Version 2.0 (the
+- *  "License"); you may not use this file except in compliance
+- *  with the License.  You may obtain a copy of the License at
+- *
+- *       http://www.apache.org/licenses/LICENSE-2.0
+- *
+- *  Unless required by applicable law or agreed to in writing, software
+- *  distributed under the License is distributed on an "AS IS" BASIS,
+- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- *  See the License for the specific language governing permissions and
+- *  limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.timelineservice;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEntity.Identifier;
+-import org.apache.hadoop.yarn.client.api.TimelineV2Client;
+-import org.apache.hadoop.yarn.client.api.impl.TimelineV2ClientImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.Container;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.apache.hadoop.yarn.service.api.records.PlacementConstraint;
+-import org.apache.hadoop.yarn.service.api.records.PlacementPolicy;
+-import org.apache.hadoop.yarn.service.api.records.PlacementType;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstance;
+-import org.apache.hadoop.yarn.service.component.instance.ComponentInstanceId;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.Date;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Test class for ServiceTimelinePublisher.
+- */
+-public class TestServiceTimelinePublisher {
+-  private TimelineV2Client timelineClient;
+-  private Configuration config;
+-  private ServiceTimelinePublisher serviceTimelinePublisher;
+-  private static String SERVICE_NAME = "HBASE";
+-  private static String SERVICEID = "application_1490093646524_0005";
+-  private static String ARTIFACTID = "ARTIFACTID";
+-  private static String COMPONENT_NAME = "DEFAULT";
+-  private static String CONTAINER_ID =
+-      "container_e02_1490093646524_0005_01_000001";
+-  private static String CONTAINER_IP =
+-      "localhost";
+-  private static String CONTAINER_HOSTNAME =
+-      "cnl124-localhost.site";
+-  private static String CONTAINER_BAREHOST =
+-      "localhost.com";
+-
+-  @Before
+-  public void setUp() throws Exception {
+-    config = new Configuration();
+-    config.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
+-    config.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f);
+-    timelineClient =
+-        new DummyTimelineClient(ApplicationId.fromString(SERVICEID));
+-    serviceTimelinePublisher = new ServiceTimelinePublisher(timelineClient);
+-    serviceTimelinePublisher.init(config);
+-    serviceTimelinePublisher.start();
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    if (serviceTimelinePublisher != null) {
+-      serviceTimelinePublisher.stop();
+-    }
+-    if (timelineClient != null) {
+-      timelineClient.stop();
+-    }
+-  }
+-
+-  @Test
+-  public void testServiceAttemptEntity() {
+-    Service service = createMockApplication();
+-    serviceTimelinePublisher
+-        .serviceAttemptRegistered(service, new YarnConfiguration());
+-
+-    Collection<TimelineEntity> lastPublishedEntities =
+-        ((DummyTimelineClient) timelineClient).getLastPublishedEntities();
+-    // 2 entities because during registration component also registered.
+-    assertEquals(2, lastPublishedEntities.size());
+-    for (TimelineEntity timelineEntity : lastPublishedEntities) {
+-      if (timelineEntity.getType() == ServiceTimelineEntityType.COMPONENT
+-          .toString()) {
+-        verifyComponentTimelineEntity(timelineEntity);
+-      } else {
+-        verifyServiceAttemptTimelineEntity(timelineEntity, null, true);
+-      }
+-    }
+-
+-    ServiceContext context = new ServiceContext();
+-    context.attemptId = ApplicationAttemptId
+-        .newInstance(ApplicationId.fromString(service.getId()), 1);
+-    String exitDiags = "service killed";
+-    serviceTimelinePublisher.serviceAttemptUnregistered(context,
+-        FinalApplicationStatus.ENDED, exitDiags);
+-    lastPublishedEntities =
+-        ((DummyTimelineClient) timelineClient).getLastPublishedEntities();
+-    for (TimelineEntity timelineEntity : lastPublishedEntities) {
+-      if (timelineEntity.getType() == ServiceTimelineEntityType.SERVICE_ATTEMPT
+-          .toString()) {
+-        verifyServiceAttemptTimelineEntity(timelineEntity, exitDiags,
+-            false);
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testComponentInstanceEntity() {
+-    Container container = new Container();
+-    container.id(CONTAINER_ID).ip(CONTAINER_IP).bareHost(CONTAINER_BAREHOST)
+-        .hostname(CONTAINER_HOSTNAME).state(ContainerState.RUNNING_BUT_UNREADY)
+-        .launchTime(new Date());
+-    ComponentInstanceId id = new ComponentInstanceId(0, COMPONENT_NAME);
+-    ComponentInstance instance = mock(ComponentInstance.class);
+-    when(instance.getCompName()).thenReturn(COMPONENT_NAME);
+-    when(instance.getCompInstanceName()).thenReturn("comp_instance_name");
+-    serviceTimelinePublisher.componentInstanceStarted(container,
+-        instance);
+-
+-    Collection<TimelineEntity> lastPublishedEntities =
+-        ((DummyTimelineClient) timelineClient).getLastPublishedEntities();
+-    assertEquals(1, lastPublishedEntities.size());
+-    TimelineEntity entity = lastPublishedEntities.iterator().next();
+-
+-    assertEquals(1, entity.getEvents().size());
+-    assertEquals(CONTAINER_ID, entity.getId());
+-    assertEquals(CONTAINER_BAREHOST,
+-        entity.getInfo().get(ServiceTimelineMetricsConstants.BARE_HOST));
+-    assertEquals(COMPONENT_NAME,
+-        entity.getInfo().get(ServiceTimelineMetricsConstants.COMPONENT_NAME));
+-    assertEquals(ContainerState.RUNNING_BUT_UNREADY.toString(),
+-        entity.getInfo().get(ServiceTimelineMetricsConstants.STATE));
+-
+-    // updated container state
+-    container.setState(ContainerState.READY);
+-    serviceTimelinePublisher.componentInstanceIPHostUpdated(container);
+-    lastPublishedEntities =
+-        ((DummyTimelineClient) timelineClient).getLastPublishedEntities();
+-    assertEquals(1, lastPublishedEntities.size());
+-    entity = lastPublishedEntities.iterator().next();
+-    assertEquals(2, entity.getEvents().size());
+-    assertEquals(ContainerState.READY.toString(),
+-        entity.getInfo().get(ServiceTimelineMetricsConstants.STATE));
+-
+-  }
+-
+-  private void verifyServiceAttemptTimelineEntity(TimelineEntity timelineEntity,
+-      String message, boolean isRegistedEntity) {
+-    assertEquals(SERVICEID, timelineEntity.getId());
+-    assertEquals(SERVICE_NAME,
+-        timelineEntity.getInfo().get(ServiceTimelineMetricsConstants.NAME));
+-    if (isRegistedEntity) {
+-      assertEquals(ServiceState.STARTED.toString(),
+-          timelineEntity.getInfo().get(ServiceTimelineMetricsConstants.STATE));
+-      assertEquals(ServiceTimelineEvent.SERVICE_ATTEMPT_REGISTERED.toString(),
+-          timelineEntity.getEvents().iterator().next().getId());
+-    } else {
+-      assertEquals("ENDED",
+-          timelineEntity.getInfo().get(ServiceTimelineMetricsConstants.STATE).toString());
+-      assertEquals(message, timelineEntity.getInfo()
+-          .get(ServiceTimelineMetricsConstants.DIAGNOSTICS_INFO));
+-      assertEquals(2, timelineEntity.getEvents().size());
+-      assertEquals(ServiceTimelineEvent.SERVICE_ATTEMPT_UNREGISTERED.toString(),
+-          timelineEntity.getEvents().iterator().next().getId());
+-    }
+-  }
+-
+-  private void verifyComponentTimelineEntity(TimelineEntity entity) {
+-    Map<String, Object> info = entity.getInfo();
+-    assertEquals("DEFAULT", entity.getId());
+-    assertEquals(ARTIFACTID,
+-        info.get(ServiceTimelineMetricsConstants.ARTIFACT_ID));
+-    assertEquals("DOCKER",
+-        info.get(ServiceTimelineMetricsConstants.ARTIFACT_TYPE));
+-    assertEquals("medium",
+-        info.get(ServiceTimelineMetricsConstants.RESOURCE_PROFILE));
+-    assertEquals(1, info.get(ServiceTimelineMetricsConstants.RESOURCE_CPU));
+-    assertEquals("1024",
+-        info.get(ServiceTimelineMetricsConstants.RESOURCE_MEMORY));
+-    assertEquals("sleep 1",
+-        info.get(ServiceTimelineMetricsConstants.LAUNCH_COMMAND));
+-    assertEquals("false",
+-        info.get(ServiceTimelineMetricsConstants.RUN_PRIVILEGED_CONTAINER));
+-  }
+-
+-  private static Service createMockApplication() {
+-    Service service = mock(Service.class);
+-
+-    when(service.getId()).thenReturn(SERVICEID);
+-    when(service.getLaunchTime()).thenReturn(new Date());
+-    when(service.getState()).thenReturn(ServiceState.STARTED);
+-    when(service.getName()).thenReturn(SERVICE_NAME);
+-    when(service.getConfiguration()).thenReturn(
+-        new org.apache.hadoop.yarn.service.api.records.Configuration());
+-
+-    Component component = mock(Component.class);
+-    Artifact artifact = new Artifact();
+-    artifact.setId(ARTIFACTID);
+-    Resource resource = new Resource();
+-    resource.setCpus(1);
+-    resource.setMemory(1024 + "");
+-    resource.setProfile("medium");
+-    when(component.getArtifact()).thenReturn(artifact);
+-    when(component.getName()).thenReturn(COMPONENT_NAME);
+-    when(component.getResource()).thenReturn(resource);
+-    when(component.getLaunchCommand()).thenReturn("sleep 1");
+-    PlacementPolicy placementPolicy = new PlacementPolicy();
+-    PlacementConstraint placementConstraint = new PlacementConstraint();
+-    placementConstraint.setType(PlacementType.ANTI_AFFINITY);
+-    placementPolicy
+-        .setConstraints(Collections.singletonList(placementConstraint));
+-    when(component.getPlacementPolicy()).thenReturn(placementPolicy);
+-    when(component.getConfiguration()).thenReturn(
+-        new org.apache.hadoop.yarn.service.api.records.Configuration());
+-    List<Component> components = new ArrayList<Component>();
+-    components.add(component);
+-
+-    when(service.getComponents()).thenReturn(components);
+-    return service;
+-  }
+-
+-  protected static class DummyTimelineClient extends TimelineV2ClientImpl {
+-    private Map<Identifier, TimelineEntity> lastPublishedEntities =
+-        new HashMap<>();
+-
+-    public DummyTimelineClient(ApplicationId appId) {
+-      super(appId);
+-    }
+-
+-    @Override
+-    public void putEntitiesAsync(TimelineEntity... entities)
+-        throws IOException, YarnException {
+-      putEntities(entities);
+-    }
+-
+-    @Override
+-    public void putEntities(TimelineEntity... entities)
+-        throws IOException, YarnException {
+-      for (TimelineEntity timelineEntity : entities) {
+-        TimelineEntity entity =
+-            lastPublishedEntities.get(timelineEntity.getIdentifier());
+-        if (entity == null) {
+-          lastPublishedEntities.put(timelineEntity.getIdentifier(),
+-              timelineEntity);
+-        } else {
+-          entity.addMetrics(timelineEntity.getMetrics());
+-          entity.addEvents(timelineEntity.getEvents());
+-          entity.addInfo(timelineEntity.getInfo());
+-          entity.addConfigs(timelineEntity.getConfigs());
+-          entity.addRelatesToEntities(timelineEntity.getRelatesToEntities());
+-          entity
+-              .addIsRelatedToEntities(timelineEntity.getIsRelatedToEntities());
+-        }
+-      }
+-    }
+-
+-    public Collection<TimelineEntity> getLastPublishedEntities() {
+-      return lastPublishedEntities.values();
+-    }
+-
+-    public void reset() {
+-      lastPublishedEntities = null;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestCoreFileSystem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestCoreFileSystem.java
+deleted file mode 100644
+index ba4a65813d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestCoreFileSystem.java
++++ /dev/null
+@@ -1,46 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.conf.YarnServiceConstants;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-
+-/**
+- * Tests for {@link CoreFileSystem}.
+- */
+-public class TestCoreFileSystem {
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test
+-  public void testClusterUpgradeDirPath() {
+-    String serviceName = "testClusterUpgrade";
+-    String version = "v1";
+-    Path expectedPath = new Path(rule.getFs().buildClusterDirPath(serviceName),
+-        YarnServiceConstants.UPGRADE_DIR + "/" + version);
+-    Assert.assertEquals("incorrect upgrade path", expectedPath,
+-        rule.getFs().buildClusterUpgradeDirPath(serviceName, version));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestFilterUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestFilterUtils.java
+deleted file mode 100644
+index 59cc441818a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestFilterUtils.java
++++ /dev/null
+@@ -1,111 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.yarn.proto.ClientAMProtocol.GetCompInstancesRequestProto;
+-import org.apache.hadoop.yarn.service.MockRunningServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceContext;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.TestServiceManager;
+-import org.apache.hadoop.yarn.service.api.records.ComponentContainers;
+-import org.apache.hadoop.yarn.service.api.records.ContainerState;
+-import org.junit.Assert;
+-import org.junit.Rule;
+-import org.junit.Test;
+-
+-import java.util.List;
+-
+-public class TestFilterUtils {
+-
+-  @Rule
+-  public ServiceTestUtils.ServiceFSWatcher rule =
+-      new ServiceTestUtils.ServiceFSWatcher();
+-
+-  @Test
+-  public void testNoFilter() throws Exception {
+-    GetCompInstancesRequestProto req = GetCompInstancesRequestProto.newBuilder()
+-        .build();
+-    List<ComponentContainers> compContainers = FilterUtils.filterInstances(
+-        new MockRunningServiceContext(rule,
+-            TestServiceManager.createBaseDef("service")), req);
+-    Assert.assertEquals("num comps", 2, compContainers.size());
+-    compContainers.forEach(item -> {
+-      Assert.assertEquals("num containers", 2, item.getContainers().size());
+-    });
+-  }
+-
+-  @Test
+-  public void testFilterWithComp() throws Exception {
+-    GetCompInstancesRequestProto req = GetCompInstancesRequestProto.newBuilder()
+-        .addAllComponentNames(Lists.newArrayList("compa")).build();
+-    List<ComponentContainers> compContainers = FilterUtils.filterInstances(
+-        new MockRunningServiceContext(rule,
+-            TestServiceManager.createBaseDef("service")), req);
+-    Assert.assertEquals("num comps", 1, compContainers.size());
+-    Assert.assertEquals("comp name", "compa",
+-        compContainers.get(0).getComponentName());
+-
+-    Assert.assertEquals("num containers", 2,
+-        compContainers.get(0).getContainers().size());
+-  }
+-
+-  @Test
+-  public void testFilterWithVersion() throws Exception {
+-    ServiceContext sc = new MockRunningServiceContext(rule,
+-        TestServiceManager.createBaseDef("service"));
+-    GetCompInstancesRequestProto.Builder reqBuilder =
+-        GetCompInstancesRequestProto.newBuilder();
+-
+-    reqBuilder.setVersion("v2");
+-    Assert.assertEquals("num comps", 0,
+-        FilterUtils.filterInstances(sc, reqBuilder.build()).size());
+-
+-    reqBuilder.addAllComponentNames(Lists.newArrayList("compa"))
+-        .setVersion("v1").build();
+-
+-    Assert.assertEquals("num containers", 2,
+-        FilterUtils.filterInstances(sc, reqBuilder.build()).get(0)
+-            .getContainers().size());
+-  }
+-
+-  @Test
+-  public void testFilterWithState() throws Exception {
+-    ServiceContext sc = new MockRunningServiceContext(rule,
+-        TestServiceManager.createBaseDef("service"));
+-    GetCompInstancesRequestProto.Builder reqBuilder =
+-        GetCompInstancesRequestProto.newBuilder();
+-
+-    reqBuilder.addAllContainerStates(Lists.newArrayList(
+-        ContainerState.READY.toString()));
+-    List<ComponentContainers> compContainers = FilterUtils.filterInstances(sc,
+-        reqBuilder.build());
+-    Assert.assertEquals("num comps", 2, compContainers.size());
+-    compContainers.forEach(item -> {
+-      Assert.assertEquals("num containers", 2, item.getContainers().size());
+-    });
+-
+-    reqBuilder.clearContainerStates();
+-    reqBuilder.addAllContainerStates(Lists.newArrayList(
+-        ContainerState.STOPPED.toString()));
+-    Assert.assertEquals("num comps", 0,
+-        FilterUtils.filterInstances(sc, reqBuilder.build()).size());
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestServiceApiUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestServiceApiUtil.java
+deleted file mode 100644
+index 5c80f85f577..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestServiceApiUtil.java
++++ /dev/null
+@@ -1,771 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.service.utils;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.registry.client.api.RegistryConstants;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.service.ServiceTestUtils;
+-import org.apache.hadoop.yarn.service.api.records.Artifact;
+-import org.apache.hadoop.yarn.service.api.records.Component;
+-import org.apache.hadoop.yarn.service.api.records.KerberosPrincipal;
+-import org.apache.hadoop.yarn.service.api.records.PlacementConstraint;
+-import org.apache.hadoop.yarn.service.api.records.PlacementPolicy;
+-import org.apache.hadoop.yarn.service.api.records.PlacementScope;
+-import org.apache.hadoop.yarn.service.api.records.PlacementType;
+-import org.apache.hadoop.yarn.service.api.records.Resource;
+-import org.apache.hadoop.yarn.service.api.records.Service;
+-import org.apache.hadoop.yarn.service.api.records.ServiceState;
+-import org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages;
+-import org.junit.Assert;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.List;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+-import static org.apache.hadoop.yarn.service.conf.RestApiConstants.DEFAULT_UNLIMITED_LIFETIME;
+-import static org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages.*;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.fail;
+-
+-/**
+- * Test for ServiceApiUtil helper methods.
+- */
+-public class TestServiceApiUtil extends ServiceTestUtils {
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(TestServiceApiUtil.class);
+-  private static final String EXCEPTION_PREFIX = "Should have thrown " +
+-      "exception: ";
+-  private static final String NO_EXCEPTION_PREFIX = "Should not have thrown " +
+-      "exception: ";
+-
+-  private static final String LEN_64_STR =
+-      "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz01";
+-
+-  private static final YarnConfiguration CONF_DEFAULT_DNS = new
+-      YarnConfiguration();
+-  private static final YarnConfiguration CONF_DNS_ENABLED = new
+-      YarnConfiguration();
+-
+-  @BeforeClass
+-  public static void init() {
+-    CONF_DNS_ENABLED.setBoolean(RegistryConstants.KEY_DNS_ENABLED, true);
+-  }
+-
+-  @Test(timeout = 90000)
+-  public void testResourceValidation() throws Exception {
+-    assertEquals(RegistryConstants.MAX_FQDN_LABEL_LENGTH + 1, LEN_64_STR
+-        .length());
+-
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-
+-    Service app = new Service();
+-
+-    // no name
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no name");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(ERROR_APPLICATION_NAME_INVALID, e.getMessage());
+-    }
+-
+-    app.setName("test");
+-    // no version
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + " service with no version");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(ERROR_APPLICATION_VERSION_INVALID,
+-          app.getName()), e.getMessage());
+-    }
+-
+-    app.setVersion("v1");
+-    // bad format name
+-    String[] badNames = {"4finance", "Finance", "finance@home", LEN_64_STR};
+-    for (String badName : badNames) {
+-      app.setName(badName);
+-      try {
+-        ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-        Assert.fail(EXCEPTION_PREFIX + "service with bad name " + badName);
+-      } catch (IllegalArgumentException e) {
+-
+-      }
+-    }
+-
+-    // launch command not specified
+-    app.setName(LEN_64_STR);
+-    Component comp = new Component().name("comp1");
+-    app.addComponent(comp);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DEFAULT_DNS);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no launch command");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(RestApiErrorMessages.ERROR_ABSENT_LAUNCH_COMMAND,
+-          e.getMessage());
+-    }
+-
+-    // launch command not specified
+-    app.setName(LEN_64_STR.substring(0, RegistryConstants
+-        .MAX_FQDN_LABEL_LENGTH));
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no launch command");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(RestApiErrorMessages.ERROR_ABSENT_LAUNCH_COMMAND,
+-          e.getMessage());
+-    }
+-
+-    // memory not specified
+-    comp.setLaunchCommand("sleep 1");
+-    Resource res = new Resource();
+-    app.setResource(res);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no memory");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_RESOURCE_MEMORY_FOR_COMP_INVALID,
+-          comp.getName()), e.getMessage());
+-    }
+-
+-    // invalid no of cpus
+-    res.setMemory("100mb");
+-    res.setCpus(-2);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(
+-          EXCEPTION_PREFIX + "service with invalid no of cpus");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_RESOURCE_CPUS_FOR_COMP_INVALID_RANGE,
+-          comp.getName()), e.getMessage());
+-    }
+-
+-    // number of containers not specified
+-    res.setCpus(2);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no container count");
+-    } catch (IllegalArgumentException e) {
+-      Assert.assertTrue(e.getMessage()
+-          .contains(ERROR_CONTAINERS_COUNT_INVALID));
+-    }
+-
+-    // specifying profile along with cpus/memory raises exception
+-    res.setProfile("hbase_finance_large");
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX
+-          + "service with resource profile along with cpus/memory");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(RestApiErrorMessages
+-              .ERROR_RESOURCE_PROFILE_MULTIPLE_VALUES_FOR_COMP_NOT_SUPPORTED,
+-          comp.getName()),
+-          e.getMessage());
+-    }
+-
+-    // currently resource profile alone is not supported.
+-    // TODO: remove the next test once resource profile alone is supported.
+-    res.setCpus(null);
+-    res.setMemory(null);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with resource profile only");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(ERROR_RESOURCE_PROFILE_NOT_SUPPORTED_YET,
+-          e.getMessage());
+-    }
+-
+-    // unset profile here and add cpus/memory back
+-    res.setProfile(null);
+-    res.setCpus(2);
+-    res.setMemory("2gb");
+-
+-    // null number of containers
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "null number of containers");
+-    } catch (IllegalArgumentException e) {
+-      Assert.assertTrue(e.getMessage()
+-          .startsWith(ERROR_CONTAINERS_COUNT_INVALID));
+-    }
+-  }
+-
+-  @Test
+-  public void testArtifacts() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-
+-    Service app = new Service();
+-    app.setName("service1");
+-    app.setVersion("v1");
+-    Resource res = new Resource();
+-    app.setResource(res);
+-    res.setMemory("512M");
+-
+-    // no artifact id fails with default type
+-    Artifact artifact = new Artifact();
+-    app.setArtifact(artifact);
+-    String compName = "comp1";
+-    Component comp = ServiceTestUtils.createComponent(compName);
+-
+-    app.setComponents(Collections.singletonList(comp));
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no artifact id");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(ERROR_ARTIFACT_ID_FOR_COMP_INVALID, compName),
+-          e.getMessage());
+-    }
+-
+-    // no artifact id fails with SERVICE type
+-    artifact.setType(Artifact.TypeEnum.SERVICE);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no artifact id");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(ERROR_ARTIFACT_ID_INVALID, e.getMessage());
+-    }
+-
+-    // no artifact id fails with TARBALL type
+-    artifact.setType(Artifact.TypeEnum.TARBALL);
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with no artifact id");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(ERROR_ARTIFACT_ID_FOR_COMP_INVALID, compName),
+-          e.getMessage());
+-    }
+-
+-    // everything valid here
+-    artifact.setType(Artifact.TypeEnum.DOCKER);
+-    artifact.setId("docker.io/centos:centos7");
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      LOG.error("service attributes specified should be valid here", e);
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    assertThat(app.getLifetime()).isEqualTo(DEFAULT_UNLIMITED_LIFETIME);
+-  }
+-
+-  private static Resource createValidResource() {
+-    Resource res = new Resource();
+-    res.setMemory("512M");
+-    return res;
+-  }
+-
+-  private static Component createValidComponent(String compName) {
+-    Component comp = new Component();
+-    comp.setName(compName);
+-    comp.setResource(createValidResource());
+-    comp.setNumberOfContainers(1L);
+-    comp.setLaunchCommand("sleep 1");
+-    return comp;
+-  }
+-
+-  private static Service createValidApplication(String compName) {
+-    Service app = new Service();
+-    app.setName("name");
+-    app.setVersion("v1");
+-    app.setResource(createValidResource());
+-    if (compName != null) {
+-      app.addComponent(createValidComponent(compName));
+-    }
+-    return app;
+-  }
+-
+-  @Test
+-  public void testExternalApplication() throws IOException {
+-    Service ext = createValidApplication("comp1");
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs(ext);
+-
+-    Service app = createValidApplication(null);
+-
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.SERVICE);
+-    artifact.setId("id");
+-    app.setArtifact(artifact);
+-    app.addComponent(ServiceTestUtils.createComponent("comp2"));
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    assertEquals(1, app.getComponents().size());
+-    assertNotNull(app.getComponent("comp2"));
+-  }
+-
+-  @Test
+-  public void testDuplicateComponents() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-
+-    String compName = "comp1";
+-    Service app = createValidApplication(compName);
+-    app.addComponent(createValidComponent(compName));
+-
+-    // duplicate component name fails
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with component collision");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals("Component name collision: " + compName, e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testComponentNameSameAsServiceName() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    Service app = new Service();
+-    app.setName("test");
+-    app.setVersion("v1");
+-    app.addComponent(createValidComponent("test"));
+-
+-    //component name same as service name
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "component name matches service name");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals("Component name test must not be same as service name test",
+-          e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testExternalDuplicateComponent() throws IOException {
+-    Service ext = createValidApplication("comp1");
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs(ext);
+-
+-    Service app = createValidApplication("comp1");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.SERVICE);
+-    artifact.setId("id");
+-    app.getComponent("comp1").setArtifact(artifact);
+-
+-    // duplicate component name okay in the case of SERVICE component
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testExternalComponent() throws IOException {
+-    Service ext = createValidApplication("comp1");
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs(ext);
+-
+-    Service app = createValidApplication("comp2");
+-    Artifact artifact = new Artifact();
+-    artifact.setType(Artifact.TypeEnum.SERVICE);
+-    artifact.setId("id");
+-    app.setArtifact(artifact);
+-
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    assertEquals(1, app.getComponents().size());
+-    // artifact ID not inherited from global
+-    assertNotNull(app.getComponent("comp2"));
+-
+-    // set SERVICE artifact id on component
+-    app.getComponent("comp2").setArtifact(artifact);
+-
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    assertEquals(1, app.getComponents().size());
+-    // original component replaced by external component
+-    assertNotNull(app.getComponent("comp1"));
+-  }
+-
+-  public static void verifyDependencySorting(List<Component> components,
+-      Component... expectedSorting) {
+-    Collection<Component> actualSorting = ServiceApiUtil.sortByDependencies(
+-        components);
+-    assertEquals(expectedSorting.length, actualSorting.size());
+-    int i = 0;
+-    for (Component component : actualSorting) {
+-      assertEquals(expectedSorting[i++], component);
+-    }
+-  }
+-
+-  @Test
+-  public void testDependencySorting() throws IOException {
+-    Component a = ServiceTestUtils.createComponent("a");
+-    Component b = ServiceTestUtils.createComponent("b");
+-    Component c = ServiceTestUtils.createComponent("c");
+-    Component d =
+-        ServiceTestUtils.createComponent("d").dependencies(Arrays.asList("c"));
+-    Component e = ServiceTestUtils.createComponent("e")
+-        .dependencies(Arrays.asList("b", "d"));
+-
+-    verifyDependencySorting(Arrays.asList(a, b, c), a, b, c);
+-    verifyDependencySorting(Arrays.asList(c, a, b), c, a, b);
+-    verifyDependencySorting(Arrays.asList(a, b, c, d, e), a, b, c, d, e);
+-    verifyDependencySorting(Arrays.asList(e, d, c, b, a), c, b, a, d, e);
+-
+-    c.setDependencies(Arrays.asList("e"));
+-    try {
+-      verifyDependencySorting(Arrays.asList(a, b, c, d, e));
+-      Assert.fail(EXCEPTION_PREFIX + "components with dependency cycle");
+-    } catch (IllegalArgumentException ex) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_DEPENDENCY_CYCLE, Arrays.asList(c, d,
+-              e)), ex.getMessage());
+-    }
+-
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    Service service = createValidApplication(null);
+-    service.setComponents(Arrays.asList(c, d, e));
+-    try {
+-      ServiceApiUtil.validateAndResolveService(service, sfs,
+-          CONF_DEFAULT_DNS);
+-      Assert.fail(EXCEPTION_PREFIX + "components with bad dependencies");
+-    } catch (IllegalArgumentException ex) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_DEPENDENCY_INVALID, "b", "e"), ex
+-          .getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testInvalidComponent() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    testComponent(sfs);
+-  }
+-
+-  @Test
+-  public void testValidateCompName() {
+-    String[] invalidNames = {
+-        "EXAMPLE", // UPPER case not allowed
+-        "example_app" // underscore not allowed.
+-    };
+-    for (String name : invalidNames) {
+-      try {
+-        ServiceApiUtil.validateNameFormat(name, new Configuration());
+-        Assert.fail();
+-      } catch (IllegalArgumentException ex) {
+-        ex.printStackTrace();
+-      }
+-    }
+-  }
+-
+-  private static void testComponent(SliderFileSystem sfs)
+-      throws IOException {
+-    int maxLen = RegistryConstants.MAX_FQDN_LABEL_LENGTH;
+-    assertEquals(19, Long.toString(Long.MAX_VALUE).length());
+-    maxLen = maxLen - Long.toString(Long.MAX_VALUE).length();
+-
+-    String compName = LEN_64_STR.substring(0, maxLen + 1);
+-    Service app = createValidApplication(null);
+-    app.addComponent(createValidComponent(compName));
+-
+-    // invalid component name fails if dns is enabled
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "service with invalid component name");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(RestApiErrorMessages
+-          .ERROR_COMPONENT_NAME_INVALID, maxLen, compName), e.getMessage());
+-    }
+-
+-    // does not fail if dns is disabled
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DEFAULT_DNS);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    compName = LEN_64_STR.substring(0, maxLen);
+-    app = createValidApplication(null);
+-    app.addComponent(createValidComponent(compName));
+-
+-    // does not fail
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testPlacementPolicy() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    Service app = createValidApplication("comp-a");
+-    Component comp = app.getComponents().get(0);
+-    PlacementPolicy pp = new PlacementPolicy();
+-    PlacementConstraint pc = new PlacementConstraint();
+-    pc.setName("CA1");
+-    pp.setConstraints(Collections.singletonList(pc));
+-    comp.setPlacementPolicy(pp);
+-
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "constraint with no type");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_PLACEMENT_POLICY_CONSTRAINT_TYPE_NULL,
+-          "CA1 ", "comp-a"), e.getMessage());
+-    }
+-
+-    // Set the type
+-    pc.setType(PlacementType.ANTI_AFFINITY);
+-
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-      Assert.fail(EXCEPTION_PREFIX + "constraint with no scope");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(String.format(
+-          RestApiErrorMessages.ERROR_PLACEMENT_POLICY_CONSTRAINT_SCOPE_NULL,
+-          "CA1 ", "comp-a"), e.getMessage());
+-    }
+-
+-    // Set the scope
+-    pc.setScope(PlacementScope.NODE);
+-
+-    // Target tag is optional.
+-    pc.setTargetTags(Collections.singletonList("comp-a"));
+-
+-    // Validation can succeed for any arbitrary target, only scheduler knows
+-    // if the target tag is valid.
+-    try {
+-      ServiceApiUtil.validateAndResolveService(app, sfs, CONF_DNS_ENABLED);
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testKerberosPrincipal() throws IOException {
+-    SliderFileSystem sfs = ServiceTestUtils.initMockFs();
+-    Service app = createValidApplication("comp-a");
+-    KerberosPrincipal kp = new KerberosPrincipal();
+-    kp.setKeytab("file:///tmp/a.keytab");
+-    kp.setPrincipalName("user/_HOST@domain.com");
+-    app.setKerberosPrincipal(kp);
+-
+-    // This should succeed
+-    try {
+-      ServiceApiUtil.validateKerberosPrincipal(app.getKerberosPrincipal());
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    // Keytab with no URI scheme should succeed too
+-    kp.setKeytab("/some/path");
+-    try {
+-      ServiceApiUtil.validateKerberosPrincipal(app.getKerberosPrincipal());
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testKerberosPrincipalNameFormat() throws IOException {
+-    Service app = createValidApplication("comp-a");
+-    KerberosPrincipal kp = new KerberosPrincipal();
+-    kp.setPrincipalName("user@domain.com");
+-    app.setKerberosPrincipal(kp);
+-
+-    try {
+-      ServiceApiUtil.validateKerberosPrincipal(app.getKerberosPrincipal());
+-      Assert.fail(EXCEPTION_PREFIX + "service with invalid principal name " +
+-          "format.");
+-    } catch (IllegalArgumentException e) {
+-      assertEquals(
+-          String.format(
+-              RestApiErrorMessages.ERROR_KERBEROS_PRINCIPAL_NAME_FORMAT,
+-              kp.getPrincipalName()),
+-          e.getMessage());
+-    }
+-
+-    kp.setPrincipalName("user/_HOST@domain.com");
+-    try {
+-      ServiceApiUtil.validateKerberosPrincipal(app.getKerberosPrincipal());
+-    } catch (IllegalArgumentException e) {
+-      Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-
+-    kp.setPrincipalName(null);
+-    kp.setKeytab(null);
+-    try {
+-      ServiceApiUtil.validateKerberosPrincipal(app.getKerberosPrincipal());
+-    } catch (NullPointerException e) {
+-        Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
+-    }
+-  }
+-
+-  @Test
+-  public void testResolveCompsDependency() {
+-    Service service = createExampleApplication();
+-    List<String> dependencies = new ArrayList<String>();
+-    dependencies.add("compb");
+-    Component compa = createComponent("compa");
+-    compa.setDependencies(dependencies);
+-    Component compb = createComponent("compb");
+-    service.addComponent(compa);
+-    service.addComponent(compb);
+-    List<String> order = ServiceApiUtil.resolveCompsDependency(service);
+-    List<String> expected = new ArrayList<String>();
+-    expected.add("compb");
+-    expected.add("compa");
+-    for (int i = 0; i < expected.size(); i++) {
+-      Assert.assertEquals("Components are not equal.", expected.get(i),
+-          order.get(i));
+-    }
+-  }
+-
+-  @Test
+-  public void testResolveCompsDependencyReversed() {
+-    Service service = createExampleApplication();
+-    List<String> dependencies = new ArrayList<String>();
+-    dependencies.add("compa");
+-    Component compa = createComponent("compa");
+-    Component compb = createComponent("compb");
+-    compb.setDependencies(dependencies);
+-    service.addComponent(compa);
+-    service.addComponent(compb);
+-    List<String> order = ServiceApiUtil.resolveCompsDependency(service);
+-    List<String> expected = new ArrayList<String>();
+-    expected.add("compa");
+-    expected.add("compb");
+-    for (int i = 0; i < expected.size(); i++) {
+-      Assert.assertEquals("Components are not equal.", expected.get(i),
+-          order.get(i));
+-    }
+-  }
+-
+-  @Test
+-  public void testResolveCompsCircularDependency() {
+-    Service service = createExampleApplication();
+-    List<String> dependencies = new ArrayList<String>();
+-    List<String> dependencies2 = new ArrayList<String>();
+-    dependencies.add("compb");
+-    dependencies2.add("compa");
+-    Component compa = createComponent("compa");
+-    compa.setDependencies(dependencies);
+-    Component compb = createComponent("compb");
+-    compa.setDependencies(dependencies2);
+-    service.addComponent(compa);
+-    service.addComponent(compb);
+-    List<String> order = ServiceApiUtil.resolveCompsDependency(service);
+-    List<String> expected = new ArrayList<String>();
+-    expected.add("compa");
+-    expected.add("compb");
+-    for (int i = 0; i < expected.size(); i++) {
+-      Assert.assertEquals("Components are not equal.", expected.get(i),
+-          order.get(i));
+-    }
+-  }
+-
+-  @Test
+-  public void testResolveNoCompsDependency() {
+-    Service service = createExampleApplication();
+-    Component compa = createComponent("compa");
+-    Component compb = createComponent("compb");
+-    service.addComponent(compa);
+-    service.addComponent(compb);
+-    List<String> order = ServiceApiUtil.resolveCompsDependency(service);
+-    List<String> expected = new ArrayList<String>();
+-    expected.add("compa");
+-    expected.add("compb");
+-    for (int i = 0; i < expected.size(); i++) {
+-      Assert.assertEquals("Components are not equal.", expected.get(i),
+-          order.get(i));
+-    }
+-  }
+-
+-  @Test(timeout = 1500)
+-  public void testNoServiceDependencies() {
+-    Service service = createExampleApplication();
+-    Component compa = createComponent("compa");
+-    Component compb = createComponent("compb");
+-    service.addComponent(compa);
+-    service.addComponent(compb);
+-    List<String> dependencies = new ArrayList<String>();
+-    service.setDependencies(dependencies);
+-    ServiceApiUtil.checkServiceDependencySatisified(service);
+-  }
+-
+-  @Test
+-  public void testServiceDependencies() {
+-    Thread thread = new Thread() {
+-      @Override
+-      public void run() {
+-        Service service = createExampleApplication();
+-        Component compa = createComponent("compa");
+-        Component compb = createComponent("compb");
+-        service.addComponent(compa);
+-        service.addComponent(compb);
+-        List<String> dependencies = new ArrayList<String>();
+-        dependencies.add("abc");
+-        service.setDependencies(dependencies);
+-        Service dependent = createExampleApplication();
+-        dependent.setState(ServiceState.STOPPED);
+-        ServiceApiUtil.checkServiceDependencySatisified(service);
+-      }
+-    };
+-    thread.start();
+-    try {
+-      Thread.sleep(1000);
+-    } catch (InterruptedException e) {
+-    }
+-    Assert.assertTrue(thread.isAlive());
+-  }
+-
+-  @Test
+-  public void testJvmOpts() throws Exception {
+-    String invalidJvmOpts = "`ping -c 3 example.com`";
+-    intercept(IllegalArgumentException.class,
+-        "Invalid character in yarn.service.am.java.opts.",
+-        () -> ServiceApiUtil.validateJvmOpts(invalidJvmOpts));
+-    String validJvmOpts = "-Dyarn.service.am.java.opts=-Xmx768m "
+-        + "-Djava.security.auth.login.config=/opt/hadoop/etc/jaas-zk.conf";
+-    try {
+-      ServiceApiUtil.validateJvmOpts(validJvmOpts);
+-    } catch (Exception ex) {
+-      fail("Invalid character in yarn.service.am.java.opts.");
+-    }
+-  }
+-
+-  public static Service createExampleApplication() {
+-
+-    Service exampleApp = new Service();
+-    exampleApp.setName("example-app");
+-    exampleApp.setVersion("v1");
+-    return exampleApp;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/example-app.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/example-app.json
+deleted file mode 100644
+index a2f41cf3cc5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/example-app.json
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "example-app",
+-  "version": "1.0.0",
+-  "components" :
+-  [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 2",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "128"
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/log4j.properties
+deleted file mode 100644
+index 81a3f6ad5d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app-override.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app-override.json
+deleted file mode 100644
+index a4062bcd030..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app-override.json
++++ /dev/null
+@@ -1,77 +0,0 @@
+-{
+-  "name": "app-1",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "configuration": {
+-    "properties": {
+-      "g1": "a",
+-      "g2": "b"
+-    },
+-    "files": [
+-      {
+-        "type": "PROPERTIES",
+-        "dest_file": "file1",
+-        "properties": {
+-          "k1": "v1",
+-          "k2": "v2"
+-        }
+-      },
+-      {
+-        "type": "XML",
+-        "dest_file": "file2",
+-        "properties": {
+-          "k3": "v3"
+-        }
+-      }
+-    ]
+-  },
+-  "resource": {
+-    "cpus": 1,
+-    "memory": "512"
+-  },
+-  "components": [
+-    {
+-      "name": "simple",
+-      "launch_command": "sleep 3600",
+-      "number_of_containers": 2,
+-      "configuration": {
+-        "files": [
+-          {
+-            "type": "PROPERTIES",
+-            "dest_file": "file1",
+-            "properties": {
+-              "k1": "overridden"
+-            }
+-          }
+-        ]
+-      }
+-    },
+-    {
+-      "name": "master",
+-      "launch_command": "sleep 3600",
+-      "number_of_containers": 2,
+-      "configuration": {
+-        "properties": {
+-          "name": "m",
+-          "g1": "overridden"
+-        }
+-      }
+-    },
+-    {
+-      "name": "worker",
+-      "number_of_containers": 2,
+-      "launch_command": "sleep 3600",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024"
+-      },
+-      "configuration": {
+-        "properties": {
+-          "name": "worker",
+-          "g1": "overridden-by-worker",
+-          "timeout": "1000"
+-        }
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app.json
+deleted file mode 100644
+index 9765eafebcd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/app.json
++++ /dev/null
+@@ -1,60 +0,0 @@
+-{
+-  "name": "app-1",
+-  "version": "1.0.0",
+-  "id" : "application_1503358878042_0011",
+-  "lifetime": "3600",
+-  "configuration": {
+-    "properties": {
+-      "g1": "a",
+-      "g2": "b",
+-      "yarn.service.failure-count-reset.window": "60"
+-    }
+-  },
+-  "resource": {
+-    "cpus": 1,
+-    "memory": "512"
+-  },
+-  "components": [
+-    {
+-      "name": "simple",
+-      "number_of_containers": 2,
+-      "launch_command": "sleep 3600"
+-    },
+-    {
+-      "name": "master",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 3600",
+-      "configuration": {
+-        "properties": {
+-          "g1": "overridden",
+-          "g3": "will-be-overridden",
+-          "jvm.heapsize": "512M"
+-        }
+-      }
+-    },
+-    {
+-      "name": "worker",
+-      "number_of_containers": 5,
+-      "launch_command": "sleep 3600",
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "1024",
+-        "additional": {
+-          "resource-1": {
+-            "value": 3333,
+-            "unit": "Gi"
+-          },
+-          "yarn.io/gpu": {
+-            "value": 5
+-          }
+-        }
+-      },
+-      "configuration": {
+-        "properties": {
+-          "g1": "overridden-by-worker",
+-          "jvm.heapsize": "512M"
+-        }
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/default.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/default.json
+deleted file mode 100644
+index fc159c0a79a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/default.json
++++ /dev/null
+@@ -1,17 +0,0 @@
+-{
+-  "name": "default-app-1",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components" :
+-  [
+-    {
+-      "name": "sleep",
+-      "number_of_containers": 1,
+-      "launch_command": "sleep 3600",
+-      "resource": {
+-        "cpus": 2,
+-        "memory": "256"
+-      }
+-    }
+-  ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external0.json
+deleted file mode 100644
+index 8c7af45a6a3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external0.json
++++ /dev/null
+@@ -1,16 +0,0 @@
+-{
+-  "name": "external-0",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-
+-  "components" : [
+-    {
+-      "name" : "comp1",
+-      "artifact": {
+-        "type": "SERVICE",
+-        "id": "app-1"
+-      }
+-    }
+-  ]
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external1.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external1.json
+deleted file mode 100644
+index b206a77ad4e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external1.json
++++ /dev/null
+@@ -1,31 +0,0 @@
+-{
+-  "name": "external-1",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "simple",
+-      "artifact": {
+-        "type": "SERVICE",
+-        "id": "app-1"
+-      }
+-    },
+-    {
+-      "name": "master",
+-      "configuration": {
+-        "properties": {
+-          "g3": "is-overridden"
+-        }
+-      }
+-    },
+-    {
+-      "name": "other",
+-      "launch_command": "sleep 3600",
+-      "number_of_containers": 2,
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "512"
+-      }
+-    }
+-  ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external2.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external2.json
+deleted file mode 100644
+index 01445a1dd55..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external2.json
++++ /dev/null
+@@ -1,23 +0,0 @@
+-{
+-  "name": "external-2",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "ext",
+-      "artifact": {
+-        "type": "SERVICE",
+-        "id": "external-1"
+-      }
+-    },
+-    {
+-      "name": "another",
+-      "launch_command": "sleep 3600",
+-      "number_of_containers": 1,
+-      "resource": {
+-        "cpus": 1,
+-        "memory": "512"
+-      }
+-    }
+-  ]
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external3.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external3.json
+deleted file mode 100644
+index ef8e3238cc6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/org/apache/hadoop/yarn/service/conf/examples/external3.json
++++ /dev/null
+@@ -1,27 +0,0 @@
+-{
+-  "name": "external-3",
+-  "version": "1.0.0",
+-  "lifetime": "3600",
+-  "components": [
+-    {
+-      "name": "volume-service",
+-      "launch_command": "sleep 3600",
+-      "number_of_containers": 1,
+-      "resource": {
+-        "": 1,
+-        "memory": "512",
+-        "additional": {
+-          "yarn.io/csi-volume": {
+-            "value": 100,
+-            "unit": "Gi",
+-            "tags": ["sample-tag"],
+-            "attributes" : {
+-              "driver" : "hostpath",
+-              "mountPath" : "/mnt/data"
+-            }
+-          }
+-        }
+-      }
+-    }
+-  ]
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/yarn-site.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index 266caa9e184..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,19 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <!-- Dummy (invalid) config file to be overwriten by TestYarnNativeServices with MiniCluster configuration. -->
+-</configuration>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml
+deleted file mode 100644
+index e3a1495c6a6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/pom.xml
++++ /dev/null
+@@ -1,39 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-    <parent>
+-        <artifactId>hadoop-yarn-applications</artifactId>
+-        <groupId>org.apache.hadoop</groupId>
+-        <version>3.4.0</version>
+-    </parent>
+-    <modelVersion>4.0.0</modelVersion>
+-    <artifactId>hadoop-yarn-services</artifactId>
+-    <name>Apache Hadoop YARN Services</name>
+-    <packaging>pom</packaging>
+-
+-    <properties>
+-        <hadoop.common.build.dir>${basedir}/../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
+-    </properties>
+-
+-    <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+-
+-    <modules>
+-        <module>hadoop-yarn-services-core</module>
+-        <module>hadoop-yarn-services-api</module>
+-    </modules>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index 2cde68a34e9..65ea6f55f1d 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -33,10 +33,6 @@
+ 
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+-  <modules>
+-    <module>hadoop-yarn-services</module>
+-  </modules>
+-
+  <profiles>
+   <profile>
+     <id>clover</id>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index a91c83dc424..1b63feee876 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -81,10 +81,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-services-core</artifactId>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.0/23-remove-hadoop-yarn-applications.patch b/hadoop/stackable/patches/3.4.0/23-remove-hadoop-yarn-applications.patch
new file mode 100644
index 000000000..b6c015570
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/23-remove-hadoop-yarn-applications.patch
@@ -0,0 +1,82 @@
+Entirely remove hadoop-yarn-applications
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../hadoop-yarn/hadoop-yarn-applications/pom.xml   |   53 --------------------
+ hadoop-yarn-project/hadoop-yarn/pom.xml            |    1 
+ 2 files changed, 54 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+deleted file mode 100644
+index 65ea6f55f1d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ /dev/null
+@@ -1,53 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-applications</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN Applications</name>
+-  <packaging>pom</packaging>
+-
+-  <properties>
+-    <hadoop.common.build.dir>${basedir}/../../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
+-  </properties>
+-
+-  <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+-
+- <profiles>
+-  <profile>
+-    <id>clover</id>
+-    <activation>
+-      <activeByDefault>false</activeByDefault>
+-      <property>
+-        <name>clover</name>
+-      </property>
+-    </activation>
+-    <dependencies>
+-      <dependency>
+-        <groupId>com.cenqua.clover</groupId>
+-        <artifactId>clover</artifactId>
+-      </dependency>
+-    </dependencies>
+-  </profile>
+-</profiles>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 38b7a872619..200ff2cb770 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -239,7 +239,6 @@
+     <module>hadoop-yarn-api</module>
+     <module>hadoop-yarn-common</module>
+     <module>hadoop-yarn-server</module>
+-    <module>hadoop-yarn-applications</module>
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+   </modules>
diff --git a/hadoop/stackable/patches/3.4.0/24-remove-hadoop-yarn-server-router.patch b/hadoop/stackable/patches/3.4.0/24-remove-hadoop-yarn-server-router.patch
new file mode 100644
index 000000000..2977306fb
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/24-remove-hadoop-yarn-server-router.patch
@@ -0,0 +1,44560 @@
+Entirely remove hadoop-yarn-server-router
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-project/pom.xml                             |    6 
+ .../hadoop-yarn-server-router/pom.xml              |  182 -
+ .../delegation/RouterDelegationTokenSupport.java   |   65 
+ .../security/token/delegation/package-info.java    |   20 
+ .../apache/hadoop/yarn/server/router/Router.java   |  443 ---
+ .../yarn/server/router/RouterAuditLogger.java      |  365 --
+ .../hadoop/yarn/server/router/RouterMetrics.java   | 2476 --------------
+ .../yarn/server/router/RouterServerUtil.java       |  833 -----
+ .../server/router/cleaner/SubClusterCleaner.java   |   92 -
+ .../yarn/server/router/cleaner/package-info.java   |   20 
+ .../clientrm/AbstractClientRequestInterceptor.java |  114 -
+ .../ApplicationSubmissionContextInterceptor.java   |   66 
+ .../yarn/server/router/clientrm/ClientMethod.java  |   71 
+ .../router/clientrm/ClientRequestInterceptor.java  |   80 
+ .../clientrm/DefaultClientRequestInterceptor.java  |  362 --
+ .../clientrm/FederationClientInterceptor.java      | 2365 --------------
+ .../PassThroughClientRequestInterceptor.java       |  315 --
+ .../router/clientrm/RouterClientRMService.java     |  667 ----
+ .../router/clientrm/RouterYarnClientUtils.java     |  575 ---
+ .../yarn/server/router/clientrm/package-info.java  |   20 
+ .../hadoop/yarn/server/router/package-info.java    |   20 
+ .../rmadmin/AbstractRMAdminRequestInterceptor.java |   96 -
+ .../rmadmin/DefaultRMAdminRequestInterceptor.java  |  261 --
+ .../rmadmin/FederationRMAdminInterceptor.java      | 1574 ---------
+ .../router/rmadmin/RMAdminProtocolMethod.java      |  186 -
+ .../router/rmadmin/RMAdminRequestInterceptor.java  |   65 
+ .../router/rmadmin/RouterRMAdminService.java       |  449 ---
+ .../yarn/server/router/rmadmin/package-info.java   |   20 
+ .../RouterDelegationTokenSecretManager.java        |  375 --
+ .../security/authorize/RouterPolicyProvider.java   |   66 
+ .../router/security/authorize/package-info.java    |   22 
+ .../yarn/server/router/security/package-info.java  |   19 
+ .../yarn/server/router/webapp/AboutBlock.java      |   86 
+ .../yarn/server/router/webapp/AboutPage.java       |   37 
+ .../webapp/AbstractRESTRequestInterceptor.java     |  109 -
+ .../yarn/server/router/webapp/AppsBlock.java       |  215 -
+ .../hadoop/yarn/server/router/webapp/AppsPage.java |   84 
+ .../webapp/DefaultRequestInterceptorREST.java      |  620 ----
+ .../yarn/server/router/webapp/FederationBlock.java |  268 --
+ .../router/webapp/FederationInterceptorREST.java   | 3472 --------------------
+ .../yarn/server/router/webapp/FederationPage.java  |   60 
+ .../yarn/server/router/webapp/HTTPMethods.java     |   34 
+ .../server/router/webapp/MetricsOverviewTable.java |  360 --
+ .../hadoop/yarn/server/router/webapp/NavBlock.java |   74 
+ .../yarn/server/router/webapp/NodeLabelsBlock.java |  178 -
+ .../yarn/server/router/webapp/NodeLabelsPage.java  |   56 
+ .../yarn/server/router/webapp/NodesBlock.java      |  206 -
+ .../yarn/server/router/webapp/NodesPage.java       |   65 
+ .../router/webapp/RESTRequestInterceptor.java      |  140 -
+ .../yarn/server/router/webapp/RouterBlock.java     |  357 --
+ .../server/router/webapp/RouterController.java     |   64 
+ .../yarn/server/router/webapp/RouterView.java      |   52 
+ .../yarn/server/router/webapp/RouterWebApp.java    |   57 
+ .../server/router/webapp/RouterWebServiceUtil.java |  776 ----
+ .../server/router/webapp/RouterWebServices.java    |  964 ------
+ .../router/webapp/cache/RouterAppInfoCacheKey.java |  156 -
+ .../server/router/webapp/cache/package-info.java   |   18 
+ .../webapp/dao/FederationBulkActivitiesInfo.java   |   49 
+ .../router/webapp/dao/FederationClusterInfo.java   |   50 
+ .../webapp/dao/FederationClusterUserInfo.java      |   49 
+ .../router/webapp/dao/FederationConfInfo.java      |   55 
+ .../webapp/dao/FederationRMQueueAclInfo.java       |   50 
+ .../webapp/dao/FederationSchedulerTypeInfo.java    |   49 
+ .../router/webapp/dao/RouterClusterMetrics.java    |  323 --
+ .../yarn/server/router/webapp/dao/RouterInfo.java  |  104 -
+ .../router/webapp/dao/RouterSchedulerMetrics.java  |  120 -
+ .../server/router/webapp/dao/SubClusterResult.java |   59 
+ .../server/router/webapp/dao/package-info.java     |   20 
+ .../yarn/server/router/webapp/package-info.java    |   20 
+ .../hadoop/yarn/server/router/TestRouter.java      |  407 --
+ .../yarn/server/router/TestRouterAuditLogger.java  |  253 -
+ .../yarn/server/router/TestRouterMetrics.java      | 2382 --------------
+ .../yarn/server/router/TestRouterServerUtil.java   |  164 -
+ .../server/router/TestRouterStoreCommands.java     |   77 
+ .../router/cleaner/TestSubClusterCleaner.java      |  158 -
+ .../router/clientrm/BaseRouterClientRMTest.java    |  609 ----
+ .../clientrm/MockClientRequestInterceptor.java     |   80 
+ .../PassThroughClientRequestInterceptor.java       |  316 --
+ ...estApplicationSubmissionContextInterceptor.java |  160 -
+ .../clientrm/TestFederationClientInterceptor.java  | 1731 ----------
+ .../TestFederationClientInterceptorRetry.java      |  431 --
+ .../router/clientrm/TestRouterClientRMService.java |  270 --
+ .../router/clientrm/TestRouterYarnClientUtils.java |  768 ----
+ .../TestSequentialBroadcastPolicyManager.java      |   54 
+ .../clientrm/TestSequentialRouterPolicy.java       |   78 
+ .../TestableFederationClientInterceptor.java       |  257 -
+ .../router/rmadmin/BaseRouterRMAdminTest.java      |  318 --
+ .../rmadmin/MockRMAdminRequestInterceptor.java     |   72 
+ .../PassThroughRMAdminRequestInterceptor.java      |  212 -
+ .../rmadmin/TestFederationRMAdminInterceptor.java  | 1092 ------
+ .../router/rmadmin/TestRouterRMAdminService.java   |  278 --
+ .../TestableFederationRMAdminInterceptor.java      |  105 -
+ .../router/secure/AbstractSecureRouterTest.java    |  249 -
+ .../TestRouterDelegationTokenSecretManager.java    |  201 -
+ .../server/router/secure/TestSecureLogins.java     |  156 -
+ .../subcluster/TestFederationSubCluster.java       |  345 --
+ .../server/router/subcluster/TestMockRouter.java   |   93 -
+ .../router/subcluster/TestMockSubCluster.java      |  100 -
+ .../TestYarnFederationWithCapacityScheduler.java   |  615 ----
+ .../fair/TestYarnFederationWithFairScheduler.java  |  639 ----
+ .../router/webapp/BaseRouterWebServicesTest.java   |  419 --
+ .../yarn/server/router/webapp/JavaProcess.java     |   86 
+ .../webapp/MockDefaultRequestInterceptorREST.java  | 1406 --------
+ .../router/webapp/MockRESTRequestInterceptor.java  |  394 --
+ .../yarn/server/router/webapp/MockRouter.java      |   99 -
+ .../webapp/PassThroughRESTRequestInterceptor.java  |  401 --
+ .../webapp/TestFederationInterceptorREST.java      | 2267 -------------
+ .../webapp/TestFederationInterceptorRESTRetry.java |  581 ---
+ .../server/router/webapp/TestFederationWebApp.java |  135 -
+ .../router/webapp/TestRouterWebAppProxy.java       |  298 --
+ .../router/webapp/TestRouterWebServiceUtil.java    |  775 ----
+ .../router/webapp/TestRouterWebServices.java       |  340 --
+ .../router/webapp/TestRouterWebServicesREST.java   | 1477 ---------
+ .../webapp/TestableFederationInterceptorREST.java  |  124 -
+ .../src/test/resources/capability                  |   21 
+ .../src/test/resources/capacity-scheduler.xml      |  156 -
+ .../src/test/resources/fair-scheduler.xml          |   43 
+ .../src/test/resources/log4j.properties            |   19 
+ .../test/resources/profiles/sample-profiles-1.json |   24 
+ .../src/test/resources/yarn-site.xml               |   54 
+ .../hadoop-yarn/hadoop-yarn-server/pom.xml         |    1 
+ hadoop-yarn-project/pom.xml                        |    4 
+ 122 files changed, 43540 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/RouterDelegationTokenSupport.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterAuditLogger.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/SubClusterCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/AbstractClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ApplicationSubmissionContextInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientMethod.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/DefaultClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterYarnClientUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/AbstractRMAdminRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/DefaultRMAdminRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminProtocolMethod.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/RouterDelegationTokenSecretManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/RouterPolicyProvider.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AbstractRESTRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/HTTPMethods.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/MetricsOverviewTable.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NavBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RESTRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterView.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebApp.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/RouterAppInfoCacheKey.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationBulkActivitiesInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterUserInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationConfInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationRMQueueAclInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationSchedulerTypeInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterClusterMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterSchedulerMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/SubClusterResult.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouter.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterAuditLogger.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterServerUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterStoreCommands.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/cleaner/TestSubClusterCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/BaseRouterClientRMTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/MockClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestApplicationSubmissionContextInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptorRetry.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterClientRMService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterYarnClientUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialBroadcastPolicyManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialRouterPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestableFederationClientInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/BaseRouterRMAdminTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/MockRMAdminRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/PassThroughRMAdminRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestableFederationRMAdminInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/AbstractSecureRouterTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestRouterDelegationTokenSecretManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestSecureLogins.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockRouter.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockSubCluster.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/JavaProcess.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRESTRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRouter.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorRESTRetry.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebAppProxy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServicesREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capability
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capacity-scheduler.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/fair-scheduler.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/log4j.properties
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/profiles/sample-profiles-1.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/yarn-site.xml
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 460cbf132e2..d365a5c70da 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -568,12 +568,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-router</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml
+deleted file mode 100644
+index 88c58a8d9fb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/pom.xml
++++ /dev/null
+@@ -1,182 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn-server</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <groupId>org.apache.hadoop</groupId>
+-  <artifactId>hadoop-yarn-server-router</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN Router</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-params</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.google.inject</groupId>
+-      <artifactId>guice</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minikdc</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-auth</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-client</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.curator</groupId>
+-      <artifactId>curator-test</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/RouterDelegationTokenSupport.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/RouterDelegationTokenSupport.java
+deleted file mode 100644
+index d530f751cb2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/RouterDelegationTokenSupport.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.security.token.delegation;
+-
+-import org.apache.hadoop.io.WritableUtils;
+-import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager.DelegationTokenInformation;
+-
+-import java.io.ByteArrayInputStream;
+-import java.io.ByteArrayOutputStream;
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.util.Base64;
+-
+-/**
+- * Workaround for serialization of {@link DelegationTokenInformation} through package access.
+- * Future version of Hadoop should add this to DelegationTokenInformation itself.
+- */
+-public final class RouterDelegationTokenSupport {
+-
+-  private RouterDelegationTokenSupport() {
+-  }
+-
+-  public static String encodeDelegationTokenInformation(DelegationTokenInformation token) {
+-    try {
+-      ByteArrayOutputStream bos = new ByteArrayOutputStream();
+-      DataOutputStream out = new DataOutputStream(bos);
+-      WritableUtils.writeVInt(out, token.password.length);
+-      out.write(token.password);
+-      out.writeLong(token.renewDate);
+-      out.flush();
+-      byte[] tokenInfoBytes = bos.toByteArray();
+-      return Base64.getUrlEncoder().encodeToString(tokenInfoBytes);
+-    } catch (IOException ex) {
+-      throw new RuntimeException("Failed to encode token.", ex);
+-    }
+-  }
+-
+-  public static DelegationTokenInformation decodeDelegationTokenInformation(byte[] tokenBytes)
+-      throws IOException {
+-    DataInputStream in = new DataInputStream(new ByteArrayInputStream(tokenBytes));
+-    DelegationTokenInformation token = new DelegationTokenInformation(0, null);
+-    int len = WritableUtils.readVInt(in);
+-    token.password = new byte[len];
+-    in.readFully(token.password);
+-    token.renewDate = in.readLong();
+-    return token;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
+deleted file mode 100644
+index 3a1cb3e69ae..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/security/token/delegation/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router security token delegation. **/
+-package org.apache.hadoop.security.token.delegation;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java
+deleted file mode 100644
+index bb7bfd55413..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/Router.java
++++ /dev/null
+@@ -1,443 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router;
+-
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.net.InetAddress;
+-import java.net.URL;
+-import java.net.InetSocketAddress;
+-import java.net.UnknownHostException;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-import org.apache.commons.cli.CommandLine;
+-import org.apache.commons.cli.DefaultParser;
+-import org.apache.commons.cli.Option;
+-import org.apache.commons.cli.Options;
+-import org.apache.commons.cli.ParseException;
+-import org.apache.commons.cli.MissingArgumentException;
+-import org.apache.commons.lang.time.DurationFormatUtils;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.source.JvmMetrics;
+-import org.apache.hadoop.security.HttpCrossOriginFilterInitializer;
+-import org.apache.hadoop.security.SecurityUtil;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.JvmPauseMonitor;
+-import org.apache.hadoop.util.ShutdownHookManager;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.util.GenericOptionsParser;
+-import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebAppUtil;
+-import org.apache.hadoop.yarn.server.router.cleaner.SubClusterCleaner;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.router.rmadmin.RouterRMAdminService;
+-import org.apache.hadoop.yarn.server.router.webapp.RouterWebApp;
+-import org.apache.hadoop.yarn.server.webproxy.FedAppReportFetcher;
+-import org.apache.hadoop.yarn.server.webproxy.ProxyUriUtils;
+-import org.apache.hadoop.yarn.server.webproxy.WebAppProxy;
+-import org.apache.hadoop.yarn.server.webproxy.WebAppProxyServlet;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.apache.hadoop.yarn.webapp.WebApps;
+-import org.apache.hadoop.yarn.webapp.WebApps.Builder;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.apache.hadoop.yarn.webapp.util.WebServiceClient;
+-import org.eclipse.jetty.webapp.WebAppContext;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_ROUTER_DEREGISTER_SUBCLUSTER_ENABLED;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.ROUTER_DEREGISTER_SUBCLUSTER_ENABLED;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.ROUTER_SUBCLUSTER_CLEANER_INTERVAL_TIME;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_ROUTER_SUBCLUSTER_CLEANER_INTERVAL_TIME;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.ROUTER_SCHEDULED_EXECUTOR_THREADS;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_ROUTER_SCHEDULED_EXECUTOR_THREADS;
+-
+-/**
+- * The router is a stateless YARN component which is the entry point to the
+- * cluster. It can be deployed on multiple nodes behind a Virtual IP (VIP) with
+- * a LoadBalancer.
+- *
+- * The Router exposes the ApplicationClientProtocol (RPC and REST) to the
+- * outside world, transparently hiding the presence of ResourceManager(s), which
+- * allows users to request and update reservations, submit and kill
+- * applications, and request status on running applications.
+- *
+- * In addition, it exposes the ResourceManager Admin API.
+- *
+- * This provides a placeholder for throttling mis-behaving clients (YARN-1546)
+- * and masks the access to multiple RMs (YARN-3659).
+- */
+-public class Router extends CompositeService {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(Router.class);
+-  private static CompositeServiceShutdownHook routerShutdownHook;
+-  private Configuration conf;
+-  private AtomicBoolean isStopping = new AtomicBoolean(false);
+-  private JvmPauseMonitor pauseMonitor;
+-  @VisibleForTesting
+-  protected RouterClientRMService clientRMProxyService;
+-  @VisibleForTesting
+-  protected RouterRMAdminService rmAdminProxyService;
+-  private WebApp webApp;
+-  @VisibleForTesting
+-  protected String webAppAddress;
+-  private static long clusterTimeStamp = System.currentTimeMillis();
+-  private FedAppReportFetcher fetcher = null;
+-  private static final String CMD_FORMAT_STATE_STORE = "-format-state-store";
+-  private static final String CMD_REMOVE_APPLICATION_FROM_STATE_STORE =
+-      "-remove-application-from-state-store";
+-
+-  /**
+-   * Priority of the Router shutdown hook.
+-   */
+-  public static final int SHUTDOWN_HOOK_PRIORITY = 30;
+-
+-  private static final String METRICS_NAME = "Router";
+-
+-  private static final String UI2_WEBAPP_NAME = "/ui2";
+-
+-  private ScheduledThreadPoolExecutor scheduledExecutorService;
+-  private SubClusterCleaner subClusterCleaner;
+-
+-  public Router() {
+-    super(Router.class.getName());
+-  }
+-
+-  protected void doSecureLogin() throws IOException {
+-    SecurityUtil.login(this.conf, YarnConfiguration.ROUTER_KEYTAB,
+-        YarnConfiguration.ROUTER_PRINCIPAL, getHostName(this.conf));
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration config) throws Exception {
+-    this.conf = config;
+-    UserGroupInformation.setConfiguration(this.conf);
+-    // ClientRM Proxy
+-    clientRMProxyService = createClientRMProxyService();
+-    addService(clientRMProxyService);
+-    // RMAdmin Proxy
+-    rmAdminProxyService = createRMAdminProxyService();
+-    addService(rmAdminProxyService);
+-    // WebService
+-    webAppAddress = WebAppUtils.getWebAppBindURL(this.conf,
+-        YarnConfiguration.ROUTER_BIND_HOST,
+-        WebAppUtils.getRouterWebAppURLWithoutScheme(this.conf));
+-    // Metrics
+-    DefaultMetricsSystem.initialize(METRICS_NAME);
+-    JvmMetrics jm = JvmMetrics.initSingleton("Router", null);
+-    pauseMonitor = new JvmPauseMonitor();
+-    addService(pauseMonitor);
+-    jm.setPauseMonitor(pauseMonitor);
+-
+-    // Initialize subClusterCleaner
+-    this.subClusterCleaner = new SubClusterCleaner(this.conf);
+-    int scheduledExecutorThreads = conf.getInt(ROUTER_SCHEDULED_EXECUTOR_THREADS,
+-        DEFAULT_ROUTER_SCHEDULED_EXECUTOR_THREADS);
+-    this.scheduledExecutorService = new ScheduledThreadPoolExecutor(scheduledExecutorThreads);
+-
+-    WebServiceClient.initialize(config);
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    try {
+-      doSecureLogin();
+-    } catch (IOException e) {
+-      throw new YarnRuntimeException("Failed Router login", e);
+-    }
+-    boolean isDeregisterSubClusterEnabled = this.conf.getBoolean(
+-        ROUTER_DEREGISTER_SUBCLUSTER_ENABLED, DEFAULT_ROUTER_DEREGISTER_SUBCLUSTER_ENABLED);
+-    if (isDeregisterSubClusterEnabled) {
+-      long scCleanerIntervalMs = this.conf.getTimeDuration(ROUTER_SUBCLUSTER_CLEANER_INTERVAL_TIME,
+-          DEFAULT_ROUTER_SUBCLUSTER_CLEANER_INTERVAL_TIME, TimeUnit.MILLISECONDS);
+-      this.scheduledExecutorService.scheduleAtFixedRate(this.subClusterCleaner,
+-          0, scCleanerIntervalMs, TimeUnit.MILLISECONDS);
+-      LOG.info("Scheduled SubClusterCleaner With Interval: {}.",
+-          DurationFormatUtils.formatDurationISO(scCleanerIntervalMs));
+-    }
+-    startWepApp();
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (webApp != null) {
+-      webApp.stop();
+-    }
+-    if (isStopping.getAndSet(true)) {
+-      return;
+-    }
+-    super.serviceStop();
+-    DefaultMetricsSystem.shutdown();
+-    WebServiceClient.destroy();
+-  }
+-
+-  protected void shutDown() {
+-    new Thread(Router.this::stop).start();
+-  }
+-
+-  protected RouterClientRMService createClientRMProxyService() {
+-    return new RouterClientRMService();
+-  }
+-
+-  protected RouterRMAdminService createRMAdminProxyService() {
+-    return new RouterRMAdminService();
+-  }
+-
+-  @Private
+-  public WebApp getWebapp() {
+-    return this.webApp;
+-  }
+-
+-  @VisibleForTesting
+-  public void startWepApp() {
+-
+-    // Initialize RouterWeb's CrossOrigin capability.
+-    boolean enableCors = conf.getBoolean(YarnConfiguration.ROUTER_WEBAPP_ENABLE_CORS_FILTER,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_ENABLE_CORS_FILTER);
+-    if (enableCors) {
+-      conf.setBoolean(HttpCrossOriginFilterInitializer.PREFIX
+-          + HttpCrossOriginFilterInitializer.ENABLED_SUFFIX, true);
+-    }
+-
+-    LOG.info("Instantiating RouterWebApp at {}.", webAppAddress);
+-
+-    RMWebAppUtil.setupSecurityAndFilters(conf, null);
+-
+-    Builder<Object> builder =
+-        WebApps.$for("cluster", null, null, "ws").with(conf).at(webAppAddress);
+-    if (RouterServerUtil.isRouterWebProxyEnable(conf)) {
+-      fetcher = new FedAppReportFetcher(conf);
+-      builder.withServlet(ProxyUriUtils.PROXY_SERVLET_NAME, ProxyUriUtils.PROXY_PATH_SPEC,
+-          WebAppProxyServlet.class);
+-      builder.withAttribute(WebAppProxy.FETCHER_ATTRIBUTE, fetcher);
+-      String proxyHostAndPort = getProxyHostAndPort(conf);
+-      String[] proxyParts = proxyHostAndPort.split(":");
+-      builder.withAttribute(WebAppProxy.PROXY_HOST_ATTRIBUTE, proxyParts[0]);
+-    }
+-    webApp = builder.start(new RouterWebApp(this), getUIWebAppContext());
+-  }
+-
+-  private WebAppContext getUIWebAppContext() {
+-    WebAppContext uiWebAppContext = null;
+-    boolean isWebUI2Enabled = conf.getBoolean(YarnConfiguration.YARN_WEBAPP_UI2_ENABLE,
+-        YarnConfiguration.DEFAULT_YARN_WEBAPP_UI2_ENABLE);
+-
+-    if(isWebUI2Enabled) {
+-      String onDiskPath = conf.get(YarnConfiguration.YARN_WEBAPP_UI2_WARFILE_PATH);
+-      uiWebAppContext = new WebAppContext();
+-      uiWebAppContext.setContextPath(UI2_WEBAPP_NAME);
+-
+-      if (null == onDiskPath) {
+-        String war = "hadoop-yarn-ui-" + VersionInfo.getVersion() + ".war";
+-        URL url = getClass().getClassLoader().getResource(war);
+-        if (null == url) {
+-          onDiskPath = getWebAppsPath("ui2");
+-        } else {
+-          onDiskPath = url.getFile();
+-        }
+-      }
+-
+-      if (onDiskPath == null || onDiskPath.isEmpty()) {
+-        LOG.error("No war file or webapps found for yarn federation!");
+-      } else {
+-        if (onDiskPath.endsWith(".war")) {
+-          uiWebAppContext.setWar(onDiskPath);
+-          LOG.info("Using war file at: {}.", onDiskPath);
+-        } else {
+-          uiWebAppContext.setResourceBase(onDiskPath);
+-          LOG.info("Using webapps at: {}.", onDiskPath);
+-        }
+-      }
+-    }
+-    return uiWebAppContext;
+-  }
+-
+-  private String getWebAppsPath(String appName) {
+-    URL url = getClass().getClassLoader().getResource("webapps/" + appName);
+-    if (url == null) {
+-      return "";
+-    }
+-    return url.toString();
+-  }
+-
+-  public static String getProxyHostAndPort(Configuration conf) {
+-    String addr = conf.get(YarnConfiguration.PROXY_ADDRESS);
+-    if(addr == null || addr.isEmpty()) {
+-      InetSocketAddress address = conf.getSocketAddr(YarnConfiguration.ROUTER_WEBAPP_ADDRESS,
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_ADDRESS,
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_PORT);
+-      addr = WebAppUtils.getResolvedAddress(address);
+-    }
+-    return addr;
+-  }
+-
+-  public static void main(String[] argv) {
+-    Configuration conf = new YarnConfiguration();
+-    Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
+-    StringUtils.startupShutdownMessage(Router.class, argv, LOG);
+-    Router router = new Router();
+-    try {
+-      GenericOptionsParser hParser = new GenericOptionsParser(conf, argv);
+-      argv = hParser.getRemainingArgs();
+-      if (argv.length > 1) {
+-        executeRouterCommand(conf, argv);
+-      } else {
+-        // Remove the old hook if we are rebooting.
+-        if (null != routerShutdownHook) {
+-          ShutdownHookManager.get().removeShutdownHook(routerShutdownHook);
+-        }
+-        routerShutdownHook = new CompositeServiceShutdownHook(router);
+-        ShutdownHookManager.get().addShutdownHook(routerShutdownHook, SHUTDOWN_HOOK_PRIORITY);
+-        router.init(conf);
+-        router.start();
+-      }
+-    } catch (Throwable t) {
+-      LOG.error("Error starting Router", t);
+-      System.exit(-1);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  public RouterClientRMService getClientRMProxyService() {
+-    return clientRMProxyService;
+-  }
+-
+-  @VisibleForTesting
+-  public RouterRMAdminService getRmAdminProxyService() {
+-    return rmAdminProxyService;
+-  }
+-
+-  /**
+-   * Returns the hostname for this Router. If the hostname is not
+-   * explicitly configured in the given config, then it is determined.
+-   *
+-   * @param config configuration
+-   * @return the hostname (NB: may not be a FQDN)
+-   * @throws UnknownHostException if the hostname cannot be determined
+-   */
+-  private String getHostName(Configuration config)
+-      throws UnknownHostException {
+-    String name = config.get(YarnConfiguration.ROUTER_KERBEROS_PRINCIPAL_HOSTNAME_KEY);
+-    if (name == null) {
+-      name = InetAddress.getLocalHost().getHostName();
+-    }
+-    return name;
+-  }
+-
+-  public static long getClusterTimeStamp() {
+-    return clusterTimeStamp;
+-  }
+-
+-  @VisibleForTesting
+-  public FedAppReportFetcher getFetcher() {
+-    return fetcher;
+-  }
+-
+-  @VisibleForTesting
+-  public static void removeApplication(Configuration conf, String applicationId)
+-      throws Exception {
+-    FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(conf);
+-    ApplicationId removeAppId = ApplicationId.fromString(applicationId);
+-    LOG.info("Deleting application {} from state store.", removeAppId);
+-    facade.deleteApplicationHomeSubCluster(removeAppId);
+-    LOG.info("Application is deleted from state store");
+-  }
+-
+-  private static void handFormatStateStore(Configuration conf) {
+-    try {
+-      System.out.println("Deleting Federation state store.");
+-      FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(conf);
+-      System.out.println("Federation state store has been cleaned.");
+-      facade.deleteStore();
+-    } catch (Exception e) {
+-      System.err.println("Delete Federation state store error, exception = " + e);
+-    }
+-  }
+-
+-  private static void handRemoveApplicationFromStateStore(Configuration conf,
+-      String applicationId) {
+-    try {
+-      removeApplication(conf, applicationId);
+-      System.out.println("Application " + applicationId + " is deleted from state store");
+-    } catch (Exception e) {
+-      System.err.println("Application " + applicationId + " error, exception = " + e);
+-    }
+-  }
+-
+-  private static void executeRouterCommand(Configuration conf, String[] args) {
+-    // Step1. Define Options.
+-    Options opts = new Options();
+-    Option formatStateStoreOpt = new Option("format-state-store",  false,
+-        " Formats the FederationStateStore. " +
+-        "This will clear the FederationStateStore and " +
+-        "is useful if past applications are no longer needed. " +
+-        "This should be run only when the Router is not running.");
+-    Option removeApplicationFromStateStoreOpt = new Option("remove-application-from-state-store",
+-        false, " Remove the application from FederationStateStore. " +
+-         " This should be run only when the Router is not running. ");
+-    opts.addOption(formatStateStoreOpt);
+-    opts.addOption(removeApplicationFromStateStoreOpt);
+-
+-    // Step2. Parse Options.
+-    try {
+-      String cmd = args[0];
+-
+-      CommandLine cliParser = new DefaultParser().parse(opts, args);
+-
+-      if (CMD_FORMAT_STATE_STORE.equals(cmd)) {
+-        handFormatStateStore(conf);
+-      } else if (CMD_REMOVE_APPLICATION_FROM_STATE_STORE.equals(cmd)) {
+-        if (cliParser.hasOption(removeApplicationFromStateStoreOpt)) {
+-          String applicationId = cliParser.getOptionValue(removeApplicationFromStateStoreOpt);
+-          handRemoveApplicationFromStateStore(conf, applicationId);
+-        } else {
+-          System.err.println("remove-application-from-state-store requires application arg.");
+-        }
+-      } else {
+-        System.out.println("No related commands found.");
+-        printUsage(System.err);
+-      }
+-    } catch (MissingArgumentException ex) {
+-      System.out.println("Missing argument for options.");
+-      printUsage(System.err);
+-    } catch (ParseException e) {
+-      System.out.println("Parsing of a command-line error.");
+-      printUsage(System.err);
+-    }
+-  }
+-
+-  private static void printUsage(PrintStream out) {
+-    out.println("Usage: yarn router [-format-state-store] | " +
+-        "[-remove-application-from-state-store <appId>]");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterAuditLogger.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterAuditLogger.java
+deleted file mode 100644
+index b0902a5e5c1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterAuditLogger.java
++++ /dev/null
+@@ -1,365 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router;
+-
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.net.InetAddress;
+-
+-/**
+- * Manages Router audit logs.
+- * Audit log format is written as key=value pairs. Tab separated.
+- */
+-public final class RouterAuditLogger {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterAuditLogger.class);
+-
+-  private RouterAuditLogger() {
+-  }
+-
+-  enum Keys {USER, OPERATION, TARGET, RESULT, IP, PERMISSIONS, DESCRIPTION, APPID, SUBCLUSTERID}
+-
+-  public static class AuditConstants {
+-    static final String SUCCESS = "SUCCESS";
+-    static final String FAILURE = "FAILURE";
+-    static final String KEY_VAL_SEPARATOR = "=";
+-    static final char PAIR_SEPARATOR = '\t';
+-
+-    public static final String GET_NEW_APP = "Get New App";
+-    public static final String SUBMIT_NEW_APP = "Submit New App";
+-    public static final String FORCE_KILL_APP = "Force Kill App";
+-    public static final String GET_APP_REPORT = "Get Application Report";
+-    public static final String TARGET_CLIENT_RM_SERVICE = "RouterClientRMService";
+-    public static final String TARGET_WEB_SERVICE = "RouterWebServices";
+-    public static final String UNKNOWN = "UNKNOWN";
+-    public static final String GET_APPLICATIONS = "Get Applications";
+-    public static final String GET_CLUSTERMETRICS = "Get ClusterMetrics";
+-    public static final String GET_CLUSTERNODES = "Get ClusterNodes";
+-    public static final String GET_QUEUEINFO = "Get QueueInfo";
+-    public static final String GET_QUEUE_USER_ACLS = "Get QueueUserAcls";
+-    public static final String MOVE_APPLICATION_ACROSS_QUEUES = "Move ApplicationAcrossQueues";
+-    public static final String GET_NEW_RESERVATION = "Get NewReservation";
+-    public static final String SUBMIT_RESERVATION = "Submit Reservation";
+-    public static final String LIST_RESERVATIONS = "List Reservations";
+-    public static final String UPDATE_RESERVATION = "Update Reservation";
+-    public static final String DELETE_RESERVATION = "Delete Reservation";
+-    public static final String GET_NODETOLABELS = "Get NodeToLabels";
+-    public static final String GET_LABELSTONODES = "Get LabelsToNodes";
+-    public static final String GET_CLUSTERNODELABELS = "Get ClusterNodeLabels";
+-    public static final String GET_APPLICATION_ATTEMPT_REPORT = "Get ApplicationAttemptReport";
+-    public static final String GET_APPLICATION_ATTEMPTS = "Get ApplicationAttempts";
+-    public static final String GET_CONTAINERREPORT = "Get ContainerReport";
+-    public static final String GET_CONTAINERS = "Get Containers";
+-    public static final String GET_DELEGATIONTOKEN = "Get DelegationToken";
+-    public static final String RENEW_DELEGATIONTOKEN = "Renew DelegationToken";
+-    public static final String CANCEL_DELEGATIONTOKEN = "Cancel DelegationToken";
+-    public static final String FAIL_APPLICATIONATTEMPT = "Fail ApplicationAttempt";
+-    public static final String UPDATE_APPLICATIONPRIORITY = "Update ApplicationPriority";
+-    public static final String SIGNAL_TOCONTAINER = "Signal ToContainer";
+-    public static final String UPDATE_APPLICATIONTIMEOUTS = "Update ApplicationTimeouts";
+-    public static final String GET_RESOURCEPROFILES = "Get ResourceProfiles";
+-    public static final String GET_RESOURCEPROFILE = "Get ResourceProfile";
+-    public static final String GET_RESOURCETYPEINFO = "Get ResourceTypeInfo";
+-    public static final String GET_ATTRIBUTESTONODES = "Get AttributesToNodes";
+-    public static final String GET_CLUSTERNODEATTRIBUTES = "Get ClusterNodeAttributes";
+-    public static final String GET_NODESTOATTRIBUTES = "Get NodesToAttributes";
+-    public static final String GET_CLUSTERINFO = "Get ClusterInfo";
+-    public static final String GET_CLUSTERUSERINFO = "Get ClusterUserInfo";
+-    public static final String GET_SCHEDULERINFO = "Get SchedulerInfo";
+-    public static final String DUMP_SCHEDULERLOGS = "Dump SchedulerLogs";
+-    public static final String GET_ACTIVITIES = "Get Activities";
+-    public static final String GET_BULKACTIVITIES = "Get BulkActivities";
+-    public static final String GET_APPACTIVITIES = "Get AppActivities";
+-    public static final String GET_APPSTATISTICS = "Get AppStatistics";
+-    public static final String GET_RMNODELABELS = "Get RMNodeLabels";
+-    public static final String REPLACE_LABELSONNODES = "Replace LabelsOnNodes";
+-    public static final String REPLACE_LABELSONNODE = "Replace LabelsOnNode";
+-    public static final String GET_CLUSTER_NODELABELS = "Get ClusterNodeLabels";
+-    public static final String ADD_TO_CLUSTER_NODELABELS = "Add To ClusterNodeLabels";
+-    public static final String REMOVE_FROM_CLUSTERNODELABELS = "Remove From ClusterNodeLabels";
+-    public static final String GET_LABELS_ON_NODE = "Get LabelsOnNode";
+-    public static final String GET_APP_PRIORITY = "Get AppPriority";
+-    public static final String UPDATE_APP_QUEUE = "Update AppQueue";
+-    public static final String POST_DELEGATION_TOKEN = "Post DelegationToken";
+-    public static final String POST_DELEGATION_TOKEN_EXPIRATION = "Post DelegationTokenExpiration";
+-    public static final String GET_APP_TIMEOUT = "Get App Timeout";
+-    public static final String GET_APP_TIMEOUTS = "Get App Timeouts";
+-    public static final String CHECK_USER_ACCESS_TO_QUEUE = "Check User AccessToQueue";
+-    public static final String GET_APP_ATTEMPT = "Get AppAttempt";
+-    public static final String GET_CONTAINER = "Get Container";
+-    public static final String UPDATE_SCHEDULER_CONFIGURATION = "Update SchedulerConfiguration";
+-    public static final String GET_SCHEDULER_CONFIGURATION = "Get SchedulerConfiguration";
+-  }
+-
+-  public static void logSuccess(String user, String operation, String target) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(createSuccessLog(user, operation, target, null, null));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a successful event.
+-   *
+-   * @param user User who made the service request to the Router
+-   * @param operation Operation requested by the user.
+-   * @param target The target on which the operation is being performed.
+-   * @param appId Application Id in which operation was performed.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logSuccess(String user, String operation, String target,
+-      ApplicationId appId) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(createSuccessLog(user, operation, target, appId, null));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a successful event.
+-   *
+-   * @param user         User who made the service request to the Router
+-   * @param operation    Operation requested by the user.
+-   * @param target       The target on which the operation is being performed.
+-   * @param appId        Application Id in which operation was performed.
+-   * @param subClusterId Subcluster Id in which operation is performed.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logSuccess(String user, String operation, String target,
+-      ApplicationId appId, SubClusterId subClusterId) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(createSuccessLog(user, operation, target, appId, subClusterId));
+-    }
+-  }
+-
+-  /**
+-   * A helper api for creating an audit log for a successful event.
+-   */
+-  static String createSuccessLog(String user, String operation, String target,
+-      ApplicationId appId, SubClusterId subClusterID) {
+-    StringBuilder b =
+-        createStringBuilderForSuccessEvent(user, operation, target);
+-    if (appId != null) {
+-      add(Keys.APPID, appId.toString(), b);
+-    }
+-    if (subClusterID != null) {
+-      add(Keys.SUBCLUSTERID, subClusterID.toString(), b);
+-    }
+-    return b.toString();
+-  }
+-
+-  /**
+-   * A helper function for creating the common portion of a successful
+-   * log message.
+-   */
+-  private static StringBuilder createStringBuilderForSuccessEvent(String user,
+-      String operation, String target) {
+-    StringBuilder b = new StringBuilder();
+-    start(Keys.USER, user, b);
+-    addRemoteIP(b);
+-    add(Keys.OPERATION, operation, b);
+-    add(Keys.TARGET, target, b);
+-    add(Keys.RESULT, AuditConstants.SUCCESS, b);
+-    return b;
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a failed event.
+-   *
+-   * @param user User who made the service request.
+-   * @param operation Operation requested by the user.
+-   * @param perm Target permissions.
+-   * @param target The target on which the operation is being performed.
+-   * @param description Some additional information as to why the operation
+-   *                    failed.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logFailure(String user, String operation, String perm,
+-      String target, String description) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(
+-          createFailureLog(user, operation, perm, target, description, null,
+-              null));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a failed event.
+-   *
+-   * @param user User who made the service request.
+-   * @param operation Operation requested by the user.
+-   * @param perm Target permissions.
+-   * @param target The target on which the operation is being performed.
+-   * @param descriptionFormat the description message format string.
+-   * @param args format parameter.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logFailure(String user, String operation, String perm,
+-      String target, String descriptionFormat, Object... args) {
+-    if (LOG.isInfoEnabled()) {
+-      String description = String.format(descriptionFormat, args);
+-      LOG.info(createFailureLog(user, operation, perm, target, description, null, null));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a failed event.
+-   *
+-   * @param user User who made the service request.
+-   * @param operation Operation requested by the user.
+-   * @param perm Target permissions.
+-   * @param target The target on which the operation is being performed.
+-   * @param description Some additional information as to why the operation
+-   *                    failed.
+-   * @param appId Application Id in which operation was performed.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logFailure(String user, String operation, String perm,
+-      String target, String description, ApplicationId appId) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(
+-          createFailureLog(user, operation, perm, target, description, appId,
+-              null));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parseable audit log string for a failed event.
+-   *
+-   * @param user User who made the service request.
+-   * @param operation Operation requested by the user.
+-   * @param perm Target permissions.
+-   * @param target The target on which the operation is being performed.
+-   * @param description Some additional information as to why the operation
+-   *                    failed.
+-   * @param appId Application Id in which operation was performed.
+-   * @param subClusterId SubCluster Id in which operation was performed.
+-   *
+-   * <br><br>
+-   * Note that the {@link RouterAuditLogger} uses tabs ('\t') as a key-val
+-   * delimiter and hence the value fields should not contains tabs ('\t').
+-   */
+-  public static void logFailure(String user, String operation, String perm,
+-      String target, String description, ApplicationId appId,
+-      SubClusterId subClusterId) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(
+-          createFailureLog(user, operation, perm, target, description, appId,
+-              subClusterId));
+-    }
+-  }
+-
+-  /**
+-   * Create a readable and parsable audit log string for a failed event.
+-   *
+-   * @param user User who made the service request.
+-   * @param operation Operation requested by the user.
+-   * @param perm Target permissions.
+-   * @param target The target on which the operation is being performed.
+-   * @param description Some additional information as to why the operation failed.
+-   * @param subClusterId SubCluster Id in which operation was performed.
+-   */
+-  public static void logFailure(String user, String operation, String perm,
+-      String target, String description, SubClusterId subClusterId) {
+-    if (LOG.isInfoEnabled()) {
+-      LOG.info(createFailureLog(user, operation, perm, target, description, null,
+-          subClusterId));
+-    }
+-  }
+-
+-  /**
+-   * A helper api for creating an audit log for a failure event.
+-   */
+-  static String createFailureLog(String user, String operation, String perm,
+-      String target, String description, ApplicationId appId,
+-      SubClusterId subClusterId) {
+-    StringBuilder b =
+-        createStringBuilderForFailureLog(user, operation, target, description,
+-            perm);
+-    if (appId != null) {
+-      add(Keys.APPID, appId.toString(), b);
+-    }
+-    if (subClusterId != null) {
+-      add(Keys.SUBCLUSTERID, subClusterId.toString(), b);
+-    }
+-    return b.toString();
+-  }
+-
+-  /**
+-   * A helper function for creating the common portion of a failure
+-   * log message.
+-   */
+-  private static StringBuilder createStringBuilderForFailureLog(String user,
+-      String operation, String target, String description, String perm) {
+-    StringBuilder b = new StringBuilder();
+-    start(Keys.USER, user, b);
+-    addRemoteIP(b);
+-    add(Keys.OPERATION, operation, b);
+-    add(Keys.TARGET, target, b);
+-    add(Keys.RESULT, AuditConstants.FAILURE, b);
+-    add(Keys.DESCRIPTION, description, b);
+-    add(Keys.PERMISSIONS, perm, b);
+-    return b;
+-  }
+-
+-  /**
+-   * Adds the first key-val pair to the passed builder in the following format
+-   * key=value.
+-   */
+-  static void start(Keys key, String value, StringBuilder b) {
+-    b.append(key.name()).append(AuditConstants.KEY_VAL_SEPARATOR).append(value);
+-  }
+-
+-  /**
+-   * Appends the key-val pair to the passed builder in the following format
+-   * <pair-delim>key=value.
+-   */
+-  static void add(Keys key, String value, StringBuilder b) {
+-    b.append(AuditConstants.PAIR_SEPARATOR).append(key.name())
+-        .append(AuditConstants.KEY_VAL_SEPARATOR).append(value);
+-  }
+-
+-  /**
+-   * A helper api to add remote IP address.
+-   */
+-  static void addRemoteIP(StringBuilder b) {
+-    InetAddress ip = Server.getRemoteIp();
+-    // ip address can be null for testcases
+-    if (ip != null) {
+-      add(Keys.IP, ip.getHostAddress(), b);
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java
+deleted file mode 100644
+index dfbe5325dea..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterMetrics.java
++++ /dev/null
+@@ -1,2476 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.metrics2.MetricsInfo;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.*;
+-
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-import static org.apache.hadoop.metrics2.lib.Interns.info;
+-
+-/**
+- * This class is for maintaining the various Router Federation Interceptor
+- * activity statistics and publishing them through the metrics interfaces.
+- */
+-@InterfaceAudience.Private
+-@Metrics(about = "Metrics for Router Federation Interceptor", context = "fedr")
+-public final class RouterMetrics {
+-
+-  private static final MetricsInfo RECORD_INFO =
+-      info("RouterMetrics", "Router Federation Interceptor");
+-  private static AtomicBoolean isInitialized = new AtomicBoolean(false);
+-
+-  // Metrics for operation failed
+-  @Metric("# of applications failed to be submitted")
+-  private MutableGaugeInt numAppsFailedSubmitted;
+-  @Metric("# of applications failed to be created")
+-  private MutableGaugeInt numAppsFailedCreated;
+-  @Metric("# of applications failed to be killed")
+-  private MutableGaugeInt numAppsFailedKilled;
+-  @Metric("# of application reports failed to be retrieved")
+-  private MutableGaugeInt numAppsFailedRetrieved;
+-  @Metric("# of multiple applications reports failed to be retrieved")
+-  private MutableGaugeInt numMultipleAppsFailedRetrieved;
+-  @Metric("# of getApplicationAttempts failed to be retrieved")
+-  private MutableGaugeInt numAppAttemptsFailedRetrieved;
+-  @Metric("# of getClusterMetrics failed to be retrieved")
+-  private MutableGaugeInt numGetClusterMetricsFailedRetrieved;
+-  @Metric("# of getClusterNodes failed to be retrieved")
+-  private MutableGaugeInt numGetClusterNodesFailedRetrieved;
+-  @Metric("# of getNodeToLabels failed to be retrieved")
+-  private MutableGaugeInt numGetNodeToLabelsFailedRetrieved;
+-  @Metric("# of getNodeToLabels failed to be retrieved")
+-  private MutableGaugeInt numGetLabelsToNodesFailedRetrieved;
+-  @Metric("# of getClusterNodeLabels failed to be retrieved")
+-  private MutableGaugeInt numGetClusterNodeLabelsFailedRetrieved;
+-  @Metric("# of getApplicationAttemptReports failed to be retrieved")
+-  private MutableGaugeInt numAppAttemptReportFailedRetrieved;
+-  @Metric("# of getQueueUserAcls failed to be retrieved")
+-  private MutableGaugeInt numGetQueueUserAclsFailedRetrieved;
+-  @Metric("# of getContainerReport failed to be retrieved")
+-  private MutableGaugeInt numGetContainerReportFailedRetrieved;
+-  @Metric("# of getContainers failed to be retrieved")
+-  private MutableGaugeInt numGetContainersFailedRetrieved;
+-  @Metric("# of listReservations failed to be retrieved")
+-  private MutableGaugeInt numListReservationsFailedRetrieved;
+-  @Metric("# of getResourceTypeInfo failed to be retrieved")
+-  private MutableGaugeInt numGetResourceTypeInfo;
+-  @Metric("# of failApplicationAttempt failed to be retrieved")
+-  private MutableGaugeInt numFailAppAttemptFailedRetrieved;
+-  @Metric("# of updateApplicationPriority failed to be retrieved")
+-  private MutableGaugeInt numUpdateAppPriorityFailedRetrieved;
+-  @Metric("# of updateApplicationPriority failed to be retrieved")
+-  private MutableGaugeInt numUpdateAppTimeoutsFailedRetrieved;
+-  @Metric("# of signalToContainer failed to be retrieved")
+-  private MutableGaugeInt numSignalToContainerFailedRetrieved;
+-  @Metric("# of getQueueInfo failed to be retrieved")
+-  private MutableGaugeInt numGetQueueInfoFailedRetrieved;
+-  @Metric("# of moveApplicationAcrossQueues failed to be retrieved")
+-  private MutableGaugeInt numMoveApplicationAcrossQueuesFailedRetrieved;
+-  @Metric("# of getResourceProfiles failed to be retrieved")
+-  private MutableGaugeInt numGetResourceProfilesFailedRetrieved;
+-  @Metric("# of getResourceProfile failed to be retrieved")
+-  private MutableGaugeInt numGetResourceProfileFailedRetrieved;
+-  @Metric("# of getAttributesToNodes failed to be retrieved")
+-  private MutableGaugeInt numGetAttributesToNodesFailedRetrieved;
+-  @Metric("# of getClusterNodeAttributes failed to be retrieved")
+-  private MutableGaugeInt numGetClusterNodeAttributesFailedRetrieved;
+-  @Metric("# of getNodesToAttributes failed to be retrieved")
+-  private MutableGaugeInt numGetNodesToAttributesFailedRetrieved;
+-  @Metric("# of getNewReservation failed to be retrieved")
+-  private MutableGaugeInt numGetNewReservationFailedRetrieved;
+-  @Metric("# of submitReservation failed to be retrieved")
+-  private MutableGaugeInt numSubmitReservationFailedRetrieved;
+-  @Metric("# of submitReservation failed to be retrieved")
+-  private MutableGaugeInt numUpdateReservationFailedRetrieved;
+-  @Metric("# of deleteReservation failed to be retrieved")
+-  private MutableGaugeInt numDeleteReservationFailedRetrieved;
+-  @Metric("# of listReservation failed to be retrieved")
+-  private MutableGaugeInt numListReservationFailedRetrieved;
+-  @Metric("# of getAppActivities failed to be retrieved")
+-  private MutableGaugeInt numGetAppActivitiesFailedRetrieved;
+-  @Metric("# of getAppStatistics failed to be retrieved")
+-  private MutableGaugeInt numGetAppStatisticsFailedRetrieved;
+-  @Metric("# of getAppPriority failed to be retrieved")
+-  private MutableGaugeInt numGetAppPriorityFailedRetrieved;
+-  @Metric("# of getAppQueue failed to be retrieved")
+-  private MutableGaugeInt numGetAppQueueFailedRetrieved;
+-  @Metric("# of updateAppQueue failed to be retrieved")
+-  private MutableGaugeInt numUpdateAppQueueFailedRetrieved;
+-  @Metric("# of getAppTimeout failed to be retrieved")
+-  private MutableGaugeInt numGetAppTimeoutFailedRetrieved;
+-  @Metric("# of getAppTimeouts failed to be retrieved")
+-  private MutableGaugeInt numGetAppTimeoutsFailedRetrieved;
+-  @Metric("# of refreshQueues failed to be retrieved")
+-  private MutableGaugeInt numRefreshQueuesFailedRetrieved;
+-  @Metric("# of getRMNodeLabels failed to be retrieved")
+-  private MutableGaugeInt numGetRMNodeLabelsFailedRetrieved;
+-  @Metric("# of checkUserAccessToQueue failed to be retrieved")
+-  private MutableGaugeInt numCheckUserAccessToQueueFailedRetrieved;
+-  @Metric("# of refreshNodes failed to be retrieved")
+-  private MutableGaugeInt numRefreshNodesFailedRetrieved;
+-  @Metric("# of getDelegationToken failed to be retrieved")
+-  private MutableGaugeInt numGetDelegationTokenFailedRetrieved;
+-  @Metric("# of renewDelegationToken failed to be retrieved")
+-  private MutableGaugeInt numRenewDelegationTokenFailedRetrieved;
+-  @Metric("# of renewDelegationToken failed to be retrieved")
+-  private MutableGaugeInt numCancelDelegationTokenFailedRetrieved;
+-  @Metric("# of dumpSchedulerLogs failed to be retrieved")
+-  private MutableGaugeInt numDumpSchedulerLogsFailedRetrieved;
+-  @Metric("# of getActivities failed to be retrieved")
+-  private MutableGaugeInt numGetActivitiesFailedRetrieved;
+-  @Metric("# of getBulkActivities failed to be retrieved")
+-  private MutableGaugeInt numGetBulkActivitiesFailedRetrieved;
+-  @Metric("# of getSchedulerInfo failed to be retrieved")
+-  private MutableGaugeInt numGetSchedulerInfoFailedRetrieved;
+-  @Metric("# of refreshSuperUserGroupsConfiguration failed to be retrieved")
+-  private MutableGaugeInt numRefreshSuperUserGroupsConfigurationFailedRetrieved;
+-  @Metric("# of refreshUserToGroupsMappings failed to be retrieved")
+-  private MutableGaugeInt numRefreshUserToGroupsMappingsFailedRetrieved;
+-  @Metric("# of deregisterSubCluster failed to be retrieved")
+-  private MutableGaugeInt numDeregisterSubClusterFailedRetrieved;
+-  @Metric("# of saveFederationQueuePolicy failed to be retrieved")
+-  private MutableGaugeInt numSaveFederationQueuePolicyFailedRetrieved;
+-  @Metric("# of batchSaveFederationQueuePolicies failed to be retrieved")
+-  private MutableGaugeInt numBatchSaveFederationQueuePoliciesFailedRetrieved;
+-  @Metric("# of listFederationQueuePolicies failed to be retrieved")
+-  private MutableGaugeInt numListFederationQueuePoliciesFailedRetrieved;
+-  @Metric("# of deleteFederationApplication failed to be retrieved")
+-  private MutableGaugeInt numDeleteFederationApplicationFailedRetrieved;
+-  @Metric("# of getFederationSubClusters failed to be retrieved")
+-  private MutableGaugeInt numGetFederationSubClustersFailedRetrieved;
+-  @Metric("# of deleteFederationPoliciesByQueues failed to be retrieved")
+-  private MutableGaugeInt numDeleteFederationPoliciesByQueuesRetrieved;
+-  @Metric("# of refreshAdminAcls failed to be retrieved")
+-  private MutableGaugeInt numRefreshAdminAclsFailedRetrieved;
+-  @Metric("# of refreshServiceAcls failed to be retrieved")
+-  private MutableGaugeInt numRefreshServiceAclsFailedRetrieved;
+-  @Metric("# of replaceLabelsOnNodes failed to be retrieved")
+-  private MutableGaugeInt numReplaceLabelsOnNodesFailedRetrieved;
+-  @Metric("# of replaceLabelsOnNode failed to be retrieved")
+-  private MutableGaugeInt numReplaceLabelsOnNodeFailedRetrieved;
+-  @Metric("# of addToClusterNodeLabels failed to be retrieved")
+-  private MutableGaugeInt numAddToClusterNodeLabelsFailedRetrieved;
+-  @Metric("# of removeFromClusterNodeLabels failed to be retrieved")
+-  private MutableGaugeInt numRemoveFromClusterNodeLabelsFailedRetrieved;
+-  @Metric("# of numUpdateSchedulerConfiguration failed to be retrieved")
+-  private MutableGaugeInt numUpdateSchedulerConfigurationFailedRetrieved;
+-  @Metric("# of numGetSchedulerConfiguration failed to be retrieved")
+-  private MutableGaugeInt numGetSchedulerConfigurationFailedRetrieved;
+-  @Metric("# of getClusterInfo failed to be retrieved")
+-  private MutableGaugeInt numGetClusterInfoFailedRetrieved;
+-  @Metric("# of getClusterUserInfo failed to be retrieved")
+-  private MutableGaugeInt numGetClusterUserInfoFailedRetrieved;
+-  @Metric("# of updateNodeResource failed to be retrieved")
+-  private MutableGaugeInt numUpdateNodeResourceFailedRetrieved;
+-  @Metric("# of refreshNodesResources failed to be retrieved")
+-  private MutableGaugeInt numRefreshNodesResourcesFailedRetrieved;
+-  @Metric("# of checkForDecommissioningNodes failed to be retrieved")
+-  private MutableGaugeInt numCheckForDecommissioningNodesFailedRetrieved;
+-  @Metric("# of refreshClusterMaxPriority failed to be retrieved")
+-  private MutableGaugeInt numRefreshClusterMaxPriorityFailedRetrieved;
+-  @Metric("# of mapAttributesToNodes failed to be retrieved")
+-  private MutableGaugeInt numMapAttributesToNodesFailedRetrieved;
+-  @Metric("# of getGroupsForUser failed to be retrieved")
+-  private MutableGaugeInt numGetGroupsForUserFailedRetrieved;
+-
+-  // Aggregate metrics are shared, and don't have to be looked up per call
+-  @Metric("Total number of successful Submitted apps and latency(ms)")
+-  private MutableRate totalSucceededAppsSubmitted;
+-  @Metric("Total number of successful Killed apps and latency(ms)")
+-  private MutableRate totalSucceededAppsKilled;
+-  @Metric("Total number of successful Created apps and latency(ms)")
+-  private MutableRate totalSucceededAppsCreated;
+-  @Metric("Total number of successful Retrieved app reports and latency(ms)")
+-  private MutableRate totalSucceededAppsRetrieved;
+-  @Metric("Total number of successful Retrieved multiple apps reports and latency(ms)")
+-  private MutableRate totalSucceededMultipleAppsRetrieved;
+-  @Metric("Total number of successful Retrieved appAttempt reports and latency(ms)")
+-  private MutableRate totalSucceededAppAttemptsRetrieved;
+-  @Metric("Total number of successful Retrieved getClusterMetrics and latency(ms)")
+-  private MutableRate totalSucceededGetClusterMetricsRetrieved;
+-  @Metric("Total number of successful Retrieved getClusterNodes and latency(ms)")
+-  private MutableRate totalSucceededGetClusterNodesRetrieved;
+-  @Metric("Total number of successful Retrieved getNodeToLabels and latency(ms)")
+-  private MutableRate totalSucceededGetNodeToLabelsRetrieved;
+-  @Metric("Total number of successful Retrieved getNodeToLabels and latency(ms)")
+-  private MutableRate totalSucceededGetLabelsToNodesRetrieved;
+-  @Metric("Total number of successful Retrieved getClusterNodeLabels and latency(ms)")
+-  private MutableRate totalSucceededGetClusterNodeLabelsRetrieved;
+-  @Metric("Total number of successful Retrieved getApplicationAttemptReport and latency(ms)")
+-  private MutableRate totalSucceededAppAttemptReportRetrieved;
+-  @Metric("Total number of successful Retrieved getQueueUserAcls and latency(ms)")
+-  private MutableRate totalSucceededGetQueueUserAclsRetrieved;
+-  @Metric("Total number of successful Retrieved getContainerReport and latency(ms)")
+-  private MutableRate totalSucceededGetContainerReportRetrieved;
+-  @Metric("Total number of successful Retrieved getContainers and latency(ms)")
+-  private MutableRate totalSucceededGetContainersRetrieved;
+-  @Metric("Total number of successful Retrieved listReservations and latency(ms)")
+-  private MutableRate totalSucceededListReservationsRetrieved;
+-  @Metric("Total number of successful Retrieved getResourceTypeInfo and latency(ms)")
+-  private MutableRate totalSucceededGetResourceTypeInfoRetrieved;
+-  @Metric("Total number of successful Retrieved failApplicationAttempt and latency(ms)")
+-  private MutableRate totalSucceededFailAppAttemptRetrieved;
+-  @Metric("Total number of successful Retrieved updateApplicationPriority and latency(ms)")
+-  private MutableRate totalSucceededUpdateAppPriorityRetrieved;
+-  @Metric("Total number of successful Retrieved updateApplicationTimeouts and latency(ms)")
+-  private MutableRate totalSucceededUpdateAppTimeoutsRetrieved;
+-  @Metric("Total number of successful Retrieved signalToContainer and latency(ms)")
+-  private MutableRate totalSucceededSignalToContainerRetrieved;
+-  @Metric("Total number of successful Retrieved getQueueInfo and latency(ms)")
+-  private MutableRate totalSucceededGetQueueInfoRetrieved;
+-  @Metric("Total number of successful Retrieved moveApplicationAcrossQueues and latency(ms)")
+-  private MutableRate totalSucceededMoveApplicationAcrossQueuesRetrieved;
+-  @Metric("Total number of successful Retrieved getResourceProfiles and latency(ms)")
+-  private MutableRate totalSucceededGetResourceProfilesRetrieved;
+-  @Metric("Total number of successful Retrieved getResourceProfile and latency(ms)")
+-  private MutableRate totalSucceededGetResourceProfileRetrieved;
+-  @Metric("Total number of successful Retrieved getAttributesToNodes and latency(ms)")
+-  private MutableRate totalSucceededGetAttributesToNodesRetrieved;
+-  @Metric("Total number of successful Retrieved getClusterNodeAttributes and latency(ms)")
+-  private MutableRate totalSucceededGetClusterNodeAttributesRetrieved;
+-  @Metric("Total number of successful Retrieved getNodesToAttributes and latency(ms)")
+-  private MutableRate totalSucceededGetNodesToAttributesRetrieved;
+-  @Metric("Total number of successful Retrieved GetNewReservation and latency(ms)")
+-  private MutableRate totalSucceededGetNewReservationRetrieved;
+-  @Metric("Total number of successful Retrieved SubmitReservation and latency(ms)")
+-  private MutableRate totalSucceededSubmitReservationRetrieved;
+-  @Metric("Total number of successful Retrieved UpdateReservation and latency(ms)")
+-  private MutableRate totalSucceededUpdateReservationRetrieved;
+-  @Metric("Total number of successful Retrieved DeleteReservation and latency(ms)")
+-  private MutableRate totalSucceededDeleteReservationRetrieved;
+-  @Metric("Total number of successful Retrieved ListReservation and latency(ms)")
+-  private MutableRate totalSucceededListReservationRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppActivities and latency(ms)")
+-  private MutableRate totalSucceededGetAppActivitiesRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppStatistics and latency(ms)")
+-  private MutableRate totalSucceededGetAppStatisticsRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppPriority and latency(ms)")
+-  private MutableRate totalSucceededGetAppPriorityRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppQueue and latency(ms)")
+-  private MutableRate totalSucceededGetAppQueueRetrieved;
+-  @Metric("Total number of successful Retrieved UpdateAppQueue and latency(ms)")
+-  private MutableRate totalSucceededUpdateAppQueueRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppTimeout and latency(ms)")
+-  private MutableRate totalSucceededGetAppTimeoutRetrieved;
+-  @Metric("Total number of successful Retrieved GetAppTimeouts and latency(ms)")
+-  private MutableRate totalSucceededGetAppTimeoutsRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshQueues and latency(ms)")
+-  private MutableRate totalSucceededRefreshQueuesRetrieved;
+-  @Metric("Total number of successful Retrieved GetRMNodeLabels and latency(ms)")
+-  private MutableRate totalSucceededGetRMNodeLabelsRetrieved;
+-  @Metric("Total number of successful Retrieved CheckUserAccessToQueue and latency(ms)")
+-  private MutableRate totalSucceededCheckUserAccessToQueueRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshNodes and latency(ms)")
+-  private MutableRate totalSucceededRefreshNodesRetrieved;
+-  @Metric("Total number of successful Retrieved GetDelegationToken and latency(ms)")
+-  private MutableRate totalSucceededGetDelegationTokenRetrieved;
+-  @Metric("Total number of successful Retrieved RenewDelegationToken and latency(ms)")
+-  private MutableRate totalSucceededRenewDelegationTokenRetrieved;
+-  @Metric("Total number of successful Retrieved CancelDelegationToken and latency(ms)")
+-  private MutableRate totalSucceededCancelDelegationTokenRetrieved;
+-  @Metric("Total number of successful Retrieved DumpSchedulerLogs and latency(ms)")
+-  private MutableRate totalSucceededDumpSchedulerLogsRetrieved;
+-  @Metric("Total number of successful Retrieved GetActivities and latency(ms)")
+-  private MutableRate totalSucceededGetActivitiesRetrieved;
+-  @Metric("Total number of successful Retrieved GetBulkActivities and latency(ms)")
+-  private MutableRate totalSucceededGetBulkActivitiesRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshSuperUserGroupsConfig and latency(ms)")
+-  private MutableRate totalSucceededRefreshSuperUserGroupsConfigurationRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshUserToGroupsMappings and latency(ms)")
+-  private MutableRate totalSucceededRefreshUserToGroupsMappingsRetrieved;
+-  @Metric("Total number of successful Retrieved ReplaceLabelsOnNodes and latency(ms)")
+-  private MutableRate totalSucceededReplaceLabelsOnNodesRetrieved;
+-  @Metric("Total number of successful Retrieved ReplaceLabelsOnNode and latency(ms)")
+-  private MutableRate totalSucceededReplaceLabelsOnNodeRetrieved;
+-  @Metric("Total number of successful Retrieved GetSchedulerInfo and latency(ms)")
+-  private MutableRate totalSucceededGetSchedulerInfoRetrieved;
+-  @Metric("Total number of successful Retrieved DeregisterSubCluster and latency(ms)")
+-  private MutableRate totalSucceededDeregisterSubClusterRetrieved;
+-  @Metric("Total number of successful Retrieved SaveFederationQueuePolicy and latency(ms)")
+-  private MutableRate totalSucceededSaveFederationQueuePolicyRetrieved;
+-  @Metric("Total number of successful Retrieved BatchSaveFederationQueuePolicies and latency(ms)")
+-  private MutableRate totalSucceededBatchSaveFederationQueuePoliciesRetrieved;
+-  @Metric("Total number of successful Retrieved ListFederationQueuePolicies and latency(ms)")
+-  private MutableRate totalSucceededListFederationQueuePoliciesFailedRetrieved;
+-  @Metric("Total number of successful Retrieved DeleteFederationApplication and latency(ms)")
+-  private MutableRate totalSucceededDeleteFederationApplicationFailedRetrieved;
+-  @Metric("Total number of successful Retrieved getFederationSubClusters and latency(ms)")
+-  private MutableRate totalSucceededGetFederationSubClustersRetrieved;
+-  @Metric("Total number of successful Retrieved DeleteFederationPoliciesByQueues and latency(ms)")
+-  private MutableRate totalSucceededDeleteFederationPoliciesByQueuesRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshAdminAcls and latency(ms)")
+-  private MutableRate totalSucceededRefreshAdminAclsRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshServiceAcls and latency(ms)")
+-  private MutableRate totalSucceededRefreshServiceAclsRetrieved;
+-  @Metric("Total number of successful Retrieved AddToClusterNodeLabels and latency(ms)")
+-  private MutableRate totalSucceededAddToClusterNodeLabelsRetrieved;
+-  @Metric("Total number of successful Retrieved RemoveFromClusterNodeLabels and latency(ms)")
+-  private MutableRate totalSucceededRemoveFromClusterNodeLabelsRetrieved;
+-  @Metric("Total number of successful Retrieved updateSchedulerConfiguration and latency(ms)")
+-  private MutableRate totalSucceededUpdateSchedulerConfigurationRetrieved;
+-  @Metric("Total number of successful Retrieved getSchedulerConfiguration and latency(ms)")
+-  private MutableRate totalSucceededGetSchedulerConfigurationRetrieved;
+-  @Metric("Total number of successful Retrieved GetClusterInfoRetrieved and latency(ms)")
+-  private MutableRate totalSucceededGetClusterInfoRetrieved;
+-  @Metric("Total number of successful Retrieved GetClusterUserInfoRetrieved and latency(ms)")
+-  private MutableRate totalSucceededGetClusterUserInfoRetrieved;
+-  @Metric("Total number of successful Retrieved UpdateNodeResource and latency(ms)")
+-  private MutableRate totalSucceededUpdateNodeResourceRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshNodesResources and latency(ms)")
+-  private MutableRate totalSucceededRefreshNodesResourcesRetrieved;
+-  @Metric("Total number of successful Retrieved CheckForDecommissioningNodes and latency(ms)")
+-  private MutableRate totalSucceededCheckForDecommissioningNodesRetrieved;
+-  @Metric("Total number of successful Retrieved RefreshClusterMaxPriority and latency(ms)")
+-  private MutableRate totalSucceededRefreshClusterMaxPriorityRetrieved;
+-  @Metric("Total number of successful Retrieved MapAttributesToNodes and latency(ms)")
+-  private MutableRate totalSucceededMapAttributesToNodesRetrieved;
+-  @Metric("Total number of successful Retrieved GetGroupsForUser and latency(ms)")
+-  private MutableRate totalSucceededGetGroupsForUsersRetrieved;
+-
+-  /**
+-   * Provide quantile counters for all latencies.
+-   */
+-  private MutableQuantiles submitApplicationLatency;
+-  private MutableQuantiles getNewApplicationLatency;
+-  private MutableQuantiles killApplicationLatency;
+-  private MutableQuantiles getApplicationReportLatency;
+-  private MutableQuantiles getApplicationsReportLatency;
+-  private MutableQuantiles getApplicationAttemptReportLatency;
+-  private MutableQuantiles getClusterMetricsLatency;
+-  private MutableQuantiles getClusterNodesLatency;
+-  private MutableQuantiles getNodeToLabelsLatency;
+-  private MutableQuantiles getLabelToNodesLatency;
+-  private MutableQuantiles getClusterNodeLabelsLatency;
+-  private MutableQuantiles getApplicationAttemptsLatency;
+-  private MutableQuantiles getQueueUserAclsLatency;
+-  private MutableQuantiles getContainerReportLatency;
+-  private MutableQuantiles getContainerLatency;
+-  private MutableQuantiles listReservationsLatency;
+-  private MutableQuantiles listResourceTypeInfoLatency;
+-  private MutableQuantiles failAppAttemptLatency;
+-  private MutableQuantiles updateAppPriorityLatency;
+-  private MutableQuantiles updateAppTimeoutsLatency;
+-  private MutableQuantiles signalToContainerLatency;
+-  private MutableQuantiles getQueueInfoLatency;
+-  private MutableQuantiles moveApplicationAcrossQueuesLatency;
+-  private MutableQuantiles getResourceProfilesLatency;
+-  private MutableQuantiles getResourceProfileLatency;
+-  private MutableQuantiles getAttributesToNodesLatency;
+-  private MutableQuantiles getClusterNodeAttributesLatency;
+-  private MutableQuantiles getNodesToAttributesLatency;
+-  private MutableQuantiles getNewReservationLatency;
+-  private MutableQuantiles submitReservationLatency;
+-  private MutableQuantiles updateReservationLatency;
+-  private MutableQuantiles deleteReservationLatency;
+-  private MutableQuantiles listReservationLatency;
+-  private MutableQuantiles getAppActivitiesLatency;
+-  private MutableQuantiles getAppStatisticsLatency;
+-  private MutableQuantiles getAppPriorityLatency;
+-  private MutableQuantiles getAppQueueLatency;
+-  private MutableQuantiles getUpdateQueueLatency;
+-  private MutableQuantiles getAppTimeoutLatency;
+-  private MutableQuantiles getAppTimeoutsLatency;
+-  private MutableQuantiles refreshQueuesLatency;
+-  private MutableQuantiles getRMNodeLabelsLatency;
+-  private MutableQuantiles checkUserAccessToQueueLatency;
+-  private MutableQuantiles refreshNodesLatency;
+-  private MutableQuantiles getDelegationTokenLatency;
+-  private MutableQuantiles renewDelegationTokenLatency;
+-  private MutableQuantiles cancelDelegationTokenLatency;
+-  private MutableQuantiles dumpSchedulerLogsLatency;
+-  private MutableQuantiles getActivitiesLatency;
+-  private MutableQuantiles getBulkActivitiesLatency;
+-  private MutableQuantiles getSchedulerInfoRetrievedLatency;
+-  private MutableQuantiles refreshSuperUserGroupsConfLatency;
+-  private MutableQuantiles refreshUserToGroupsMappingsLatency;
+-  private MutableQuantiles refreshDeregisterSubClusterLatency;
+-  private MutableQuantiles saveFederationQueuePolicyLatency;
+-  private MutableQuantiles batchSaveFederationQueuePoliciesLatency;
+-  private MutableQuantiles listFederationQueuePoliciesLatency;
+-  private MutableQuantiles deleteFederationApplicationLatency;
+-  private MutableQuantiles getFederationSubClustersLatency;
+-  private MutableQuantiles deleteFederationPoliciesByQueuesLatency;
+-  private MutableQuantiles refreshAdminAclsLatency;
+-  private MutableQuantiles refreshServiceAclsLatency;
+-  private MutableQuantiles replaceLabelsOnNodesLatency;
+-  private MutableQuantiles replaceLabelsOnNodeLatency;
+-  private MutableQuantiles addToClusterNodeLabelsLatency;
+-  private MutableQuantiles removeFromClusterNodeLabelsLatency;
+-  private MutableQuantiles updateSchedulerConfigLatency;
+-  private MutableQuantiles getSchedulerConfigurationLatency;
+-  private MutableQuantiles getClusterInfoLatency;
+-  private MutableQuantiles getClusterUserInfoLatency;
+-  private MutableQuantiles updateNodeResourceLatency;
+-  private MutableQuantiles refreshNodesResourcesLatency;
+-  private MutableQuantiles checkForDecommissioningNodesLatency;
+-  private MutableQuantiles refreshClusterMaxPriorityLatency;
+-  private MutableQuantiles mapAttributesToNodesLatency;
+-  private MutableQuantiles getGroupsForUserLatency;
+-
+-  private static volatile RouterMetrics instance = null;
+-  private static MetricsRegistry registry;
+-
+-  @SuppressWarnings("checkstyle:MethodLength")
+-  private RouterMetrics() {
+-    registry = new MetricsRegistry(RECORD_INFO);
+-    registry.tag(RECORD_INFO, "Router");
+-    getNewApplicationLatency = registry.newQuantiles("getNewApplicationLatency",
+-        "latency of get new application", "ops", "latency", 10);
+-    submitApplicationLatency = registry.newQuantiles("submitApplicationLatency",
+-        "latency of submit application", "ops", "latency", 10);
+-    killApplicationLatency = registry.newQuantiles("killApplicationLatency",
+-        "latency of kill application", "ops", "latency", 10);
+-    getApplicationReportLatency =
+-        registry.newQuantiles("getApplicationReportLatency",
+-            "latency of get application report", "ops", "latency", 10);
+-    getApplicationsReportLatency =
+-        registry.newQuantiles("getApplicationsReportLatency",
+-            "latency of get applications report", "ops", "latency", 10);
+-    getApplicationAttemptReportLatency =
+-        registry.newQuantiles("getApplicationAttemptReportLatency",
+-                    "latency of get applicationattempt " +
+-                            "report", "ops", "latency", 10);
+-    getClusterMetricsLatency =
+-        registry.newQuantiles("getClusterMetricsLatency",
+-            "latency of get cluster metrics", "ops", "latency", 10);
+-
+-    getClusterNodesLatency =
+-        registry.newQuantiles("getClusterNodesLatency",
+-            "latency of get cluster nodes", "ops", "latency", 10);
+-
+-    getNodeToLabelsLatency =
+-        registry.newQuantiles("getNodeToLabelsLatency",
+-            "latency of get node labels", "ops", "latency", 10);
+-
+-    getLabelToNodesLatency =
+-        registry.newQuantiles("getLabelToNodesLatency",
+-            "latency of get label nodes", "ops", "latency", 10);
+-
+-    getClusterNodeLabelsLatency =
+-        registry.newQuantiles("getClusterNodeLabelsLatency",
+-            "latency of get cluster node labels", "ops", "latency", 10);
+-
+-    getApplicationAttemptsLatency =
+-        registry.newQuantiles("getApplicationAttemptsLatency",
+-            "latency of get application attempts", "ops", "latency", 10);
+-
+-    getQueueUserAclsLatency =
+-        registry.newQuantiles("getQueueUserAclsLatency",
+-            "latency of get queue user acls", "ops", "latency", 10);
+-
+-    getContainerReportLatency =
+-        registry.newQuantiles("getContainerReportLatency",
+-            "latency of get container report", "ops", "latency", 10);
+-
+-    getContainerLatency =
+-        registry.newQuantiles("getContainerLatency",
+-            "latency of get container", "ops", "latency", 10);
+-
+-    listReservationsLatency =
+-        registry.newQuantiles("listReservationsLatency",
+-            "latency of list reservations", "ops", "latency", 10);
+-
+-    listResourceTypeInfoLatency =
+-        registry.newQuantiles("getResourceTypeInfoLatency",
+-            "latency of get resource type info", "ops", "latency", 10);
+-
+-    failAppAttemptLatency =
+-        registry.newQuantiles("failApplicationAttemptLatency",
+-            "latency of fail application attempt", "ops", "latency", 10);
+-
+-    updateAppPriorityLatency =
+-        registry.newQuantiles("updateApplicationPriorityLatency",
+-            "latency of update application priority", "ops", "latency", 10);
+-
+-    updateAppTimeoutsLatency =
+-        registry.newQuantiles("updateApplicationTimeoutsLatency",
+-            "latency of update application timeouts", "ops", "latency", 10);
+-
+-    signalToContainerLatency =
+-        registry.newQuantiles("signalToContainerLatency",
+-            "latency of signal to container timeouts", "ops", "latency", 10);
+-
+-    getQueueInfoLatency =
+-        registry.newQuantiles("getQueueInfoLatency",
+-            "latency of get queue info timeouts", "ops", "latency", 10);
+-
+-    moveApplicationAcrossQueuesLatency =
+-        registry.newQuantiles("moveApplicationAcrossQueuesLatency",
+-            "latency of move application across queues timeouts", "ops", "latency", 10);
+-
+-    getResourceProfilesLatency =
+-        registry.newQuantiles("getResourceProfilesLatency",
+-            "latency of get resource profiles timeouts", "ops", "latency", 10);
+-
+-    getResourceProfileLatency =
+-        registry.newQuantiles("getResourceProfileLatency",
+-            "latency of get resource profile timeouts", "ops", "latency", 10);
+-
+-    getAttributesToNodesLatency =
+-        registry.newQuantiles("getAttributesToNodesLatency",
+-            "latency of get attributes to nodes timeouts", "ops", "latency", 10);
+-
+-    getClusterNodeAttributesLatency =
+-        registry.newQuantiles("getClusterNodeAttributesLatency",
+-            "latency of get cluster node attributes timeouts", "ops", "latency", 10);
+-
+-    getNodesToAttributesLatency =
+-        registry.newQuantiles("getNodesToAttributesLatency",
+-            "latency of get nodes to attributes timeouts", "ops", "latency", 10);
+-
+-    getNewReservationLatency =
+-        registry.newQuantiles("getNewReservationLatency",
+-            "latency of get new reservation timeouts", "ops", "latency", 10);
+-
+-    submitReservationLatency =
+-        registry.newQuantiles("submitReservationLatency",
+-            "latency of submit reservation timeouts", "ops", "latency", 10);
+-
+-    updateReservationLatency =
+-        registry.newQuantiles("updateReservationLatency",
+-            "latency of update reservation timeouts", "ops", "latency", 10);
+-
+-    deleteReservationLatency =
+-        registry.newQuantiles("deleteReservationLatency",
+-            "latency of delete reservation timeouts", "ops", "latency", 10);
+-
+-    listReservationLatency =
+-        registry.newQuantiles("listReservationLatency",
+-            "latency of list reservation timeouts", "ops", "latency", 10);
+-
+-    getAppActivitiesLatency = registry.newQuantiles("getAppActivitiesLatency",
+-         "latency of get app activities timeouts", "ops", "latency", 10);
+-
+-    getAppStatisticsLatency = registry.newQuantiles("getAppStatisticsLatency",
+-         "latency of get app statistics timeouts", "ops", "latency", 10);
+-
+-    getAppPriorityLatency = registry.newQuantiles("getAppPriorityLatency",
+-         "latency of get app priority timeouts", "ops", "latency", 10);
+-
+-    getAppQueueLatency = registry.newQuantiles("getAppQueueLatency",
+-         "latency of get app queue timeouts", "ops", "latency", 10);
+-
+-    getUpdateQueueLatency = registry.newQuantiles("getUpdateQueueLatency",
+-        "latency of update app queue timeouts", "ops", "latency", 10);
+-
+-    getAppTimeoutLatency = registry.newQuantiles("getAppTimeoutLatency",
+-        "latency of get apptimeout timeouts", "ops", "latency", 10);
+-
+-    getAppTimeoutsLatency = registry.newQuantiles("getAppTimeoutsLatency",
+-         "latency of get apptimeouts timeouts", "ops", "latency", 10);
+-
+-    refreshQueuesLatency = registry.newQuantiles("refreshQueuesLatency",
+-         "latency of get refresh queues timeouts", "ops", "latency", 10);
+-
+-    getRMNodeLabelsLatency = registry.newQuantiles("getRMNodeLabelsLatency",
+-        "latency of get rmnodelabels timeouts", "ops", "latency", 10);
+-
+-    checkUserAccessToQueueLatency = registry.newQuantiles("checkUserAccessToQueueLatency",
+-        "latency of get apptimeouts timeouts", "ops", "latency", 10);
+-
+-    refreshNodesLatency = registry.newQuantiles("refreshNodesLatency",
+-        "latency of get refresh nodes timeouts", "ops", "latency", 10);
+-
+-    getDelegationTokenLatency = registry.newQuantiles("getDelegationTokenLatency",
+-        "latency of get delegation token timeouts", "ops", "latency", 10);
+-
+-    renewDelegationTokenLatency = registry.newQuantiles("renewDelegationTokenLatency",
+-       "latency of renew delegation token timeouts", "ops", "latency", 10);
+-
+-    cancelDelegationTokenLatency = registry.newQuantiles("cancelDelegationTokenLatency",
+-        "latency of cancel delegation token timeouts", "ops", "latency", 10);
+-
+-    dumpSchedulerLogsLatency = registry.newQuantiles("dumpSchedulerLogsLatency",
+-        "latency of dump scheduler logs timeouts", "ops", "latency", 10);
+-
+-    getActivitiesLatency = registry.newQuantiles("getActivitiesLatency",
+-        "latency of get activities timeouts", "ops", "latency", 10);
+-
+-    getBulkActivitiesLatency = registry.newQuantiles("getBulkActivitiesLatency",
+-         "latency of get bulk activities timeouts", "ops", "latency", 10);
+-
+-    getSchedulerInfoRetrievedLatency = registry.newQuantiles("getSchedulerInfoRetrievedLatency",
+-        "latency of get scheduler info timeouts", "ops", "latency", 10);
+-
+-    refreshSuperUserGroupsConfLatency = registry.newQuantiles("refreshSuperUserGroupsConfLatency",
+-        "latency of refresh superuser groups configuration timeouts", "ops", "latency", 10);
+-
+-    refreshUserToGroupsMappingsLatency = registry.newQuantiles("refreshUserToGroupsMappingsLatency",
+-        "latency of refresh user to groups mappings timeouts", "ops", "latency", 10);
+-
+-    refreshDeregisterSubClusterLatency = registry.newQuantiles("refreshDeregisterSubClusterLatency",
+-        "latency of deregister subcluster timeouts", "ops", "latency", 10);
+-
+-    saveFederationQueuePolicyLatency = registry.newQuantiles("saveFederationQueuePolicyLatency",
+-        "latency of save federation queue policy timeouts", "ops", "latency", 10);
+-
+-    batchSaveFederationQueuePoliciesLatency = registry.newQuantiles(
+-        "batchSaveFederationQueuePoliciesLatency",
+-        "latency of batch save federationqueuepolicies timeouts", "ops", "latency", 10);
+-
+-    listFederationQueuePoliciesLatency = registry.newQuantiles(
+-        "listFederationQueuePoliciesLatency",
+-        "latency of list federationqueuepolicies timeouts", "ops", "latency", 10);
+-
+-    deleteFederationApplicationLatency = registry.newQuantiles(
+-        "deleteFederationApplicationLatency",
+-        "latency of delete FederationApplication timeouts", "ops", "latency", 10);
+-
+-    getFederationSubClustersLatency = registry.newQuantiles(
+-        "getFederationSubClustersLatency",
+-        "latency of get FederationSubClusters timeouts", "ops", "latency", 10);
+-
+-    deleteFederationPoliciesByQueuesLatency = registry.newQuantiles(
+-        "deleteFederationPoliciesByQueuesLatency",
+-        "latency of delete FederationPoliciesByQueues timeouts", "ops", "latency", 10);
+-
+-    refreshAdminAclsLatency = registry.newQuantiles("refreshAdminAclsLatency",
+-        "latency of refresh admin acls timeouts", "ops", "latency", 10);
+-
+-    refreshServiceAclsLatency = registry.newQuantiles("refreshServiceAclsLatency",
+-        "latency of refresh service acls timeouts", "ops", "latency", 10);
+-
+-    replaceLabelsOnNodesLatency = registry.newQuantiles("replaceLabelsOnNodesLatency",
+-        "latency of replace labels on nodes timeouts", "ops", "latency", 10);
+-
+-    replaceLabelsOnNodeLatency = registry.newQuantiles("replaceLabelsOnNodeLatency",
+-        "latency of replace labels on node timeouts", "ops", "latency", 10);
+-
+-    addToClusterNodeLabelsLatency = registry.newQuantiles("addToClusterNodeLabelsLatency",
+-        "latency of add cluster nodelabels timeouts", "ops", "latency", 10);
+-
+-    removeFromClusterNodeLabelsLatency = registry.newQuantiles("removeFromClusterNodeLabelsLatency",
+-        "latency of remove cluster nodelabels timeouts", "ops", "latency", 10);
+-
+-    updateSchedulerConfigLatency = registry.newQuantiles("updateSchedulerConfigurationLatency",
+-        "latency of update scheduler configuration timeouts", "ops", "latency", 10);
+-
+-    getSchedulerConfigurationLatency = registry.newQuantiles("getSchedulerConfigurationLatency",
+-        "latency of get scheduler configuration timeouts", "ops", "latency", 10);
+-
+-    getClusterInfoLatency = registry.newQuantiles("getClusterInfoLatency",
+-        "latency of get cluster info timeouts", "ops", "latency", 10);
+-
+-    getClusterUserInfoLatency = registry.newQuantiles("getClusterUserInfoLatency",
+-        "latency of get cluster user info timeouts", "ops", "latency", 10);
+-
+-    updateNodeResourceLatency = registry.newQuantiles("updateNodeResourceLatency",
+-        "latency of update node resource timeouts", "ops", "latency", 10);
+-
+-    refreshNodesResourcesLatency = registry.newQuantiles("refreshNodesResourcesLatency",
+-        "latency of refresh nodes resources timeouts", "ops", "latency", 10);
+-
+-    checkForDecommissioningNodesLatency = registry.newQuantiles(
+-        "checkForDecommissioningNodesLatency", "latency of check for decommissioningnodes timeouts",
+-        "ops", "latency", 10);
+-
+-    refreshClusterMaxPriorityLatency = registry.newQuantiles("refreshClusterMaxPriorityLatency",
+-        "latency of refresh cluster max priority timeouts", "ops", "latency", 10);
+-
+-    mapAttributesToNodesLatency = registry.newQuantiles("mapAttributesToNodesLatency",
+-        "latency of map attributes to nodes timeouts", "ops", "latency", 10);
+-
+-    getGroupsForUserLatency = registry.newQuantiles("getGroupsForUserLatency",
+-        "latency of get groups for user timeouts", "ops", "latency", 10);
+-  }
+-
+-  public static RouterMetrics getMetrics() {
+-    if (!isInitialized.get()) {
+-      synchronized (RouterMetrics.class) {
+-        if (instance == null) {
+-          instance = DefaultMetricsSystem.instance().register("RouterMetrics",
+-              "Metrics for the Yarn Router", new RouterMetrics());
+-          isInitialized.set(true);
+-        }
+-      }
+-    }
+-    return instance;
+-  }
+-
+-  @VisibleForTesting
+-  synchronized static void destroy() {
+-    isInitialized.set(false);
+-    instance = null;
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppsCreated() {
+-    return totalSucceededAppsCreated.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppsSubmitted() {
+-    return totalSucceededAppsSubmitted.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppsKilled() {
+-    return totalSucceededAppsKilled.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppsRetrieved() {
+-    return totalSucceededAppsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppAttemptsRetrieved() {
+-    return totalSucceededAppAttemptsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededMultipleAppsRetrieved() {
+-    return totalSucceededMultipleAppsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterMetricsRetrieved(){
+-    return totalSucceededGetClusterMetricsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterNodesRetrieved(){
+-    return totalSucceededGetClusterNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetNodeToLabelsRetrieved(){
+-    return totalSucceededGetNodeToLabelsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetLabelsToNodesRetrieved(){
+-    return totalSucceededGetLabelsToNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterNodeLabelsRetrieved(){
+-    return totalSucceededGetClusterNodeLabelsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAppAttemptReportRetrieved(){
+-    return totalSucceededAppAttemptReportRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetQueueUserAclsRetrieved(){
+-    return totalSucceededGetQueueUserAclsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetContainerReportRetrieved() {
+-    return totalSucceededGetContainerReportRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetContainersRetrieved() {
+-    return totalSucceededGetContainersRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededListReservationsRetrieved() {
+-    return totalSucceededListReservationsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetResourceTypeInfoRetrieved() {
+-    return totalSucceededGetResourceTypeInfoRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededFailAppAttemptRetrieved() {
+-    return totalSucceededFailAppAttemptRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateAppPriorityRetrieved() {
+-    return totalSucceededUpdateAppPriorityRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateAppTimeoutsRetrieved() {
+-    return totalSucceededUpdateAppTimeoutsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededSignalToContainerRetrieved() {
+-    return totalSucceededSignalToContainerRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetQueueInfoRetrieved() {
+-    return totalSucceededGetQueueInfoRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededMoveApplicationAcrossQueuesRetrieved() {
+-    return totalSucceededMoveApplicationAcrossQueuesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetResourceProfilesRetrieved() {
+-    return totalSucceededGetResourceProfilesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetResourceProfileRetrieved() {
+-    return totalSucceededGetResourceProfileRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAttributesToNodesRetrieved() {
+-    return totalSucceededGetAttributesToNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterNodeAttributesRetrieved() {
+-    return totalSucceededGetClusterNodeAttributesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetNodesToAttributesRetrieved() {
+-    return totalSucceededGetNodesToAttributesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetNewReservationRetrieved() {
+-    return totalSucceededGetNewReservationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededSubmitReservationRetrieved() {
+-    return totalSucceededSubmitReservationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateReservationRetrieved() {
+-    return totalSucceededUpdateReservationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededDeleteReservationRetrieved() {
+-    return totalSucceededDeleteReservationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededListReservationRetrieved() {
+-    return totalSucceededListReservationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppActivitiesRetrieved() {
+-    return totalSucceededGetAppActivitiesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppStatisticsRetrieved() {
+-    return totalSucceededGetAppStatisticsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppPriorityRetrieved() {
+-    return totalSucceededGetAppPriorityRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppQueueRetrieved() {
+-    return totalSucceededGetAppQueueRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateAppQueueRetrieved() {
+-    return totalSucceededUpdateAppQueueRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppTimeoutRetrieved() {
+-    return totalSucceededGetAppTimeoutRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetAppTimeoutsRetrieved() {
+-    return totalSucceededGetAppTimeoutsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshQueuesRetrieved() {
+-    return totalSucceededRefreshQueuesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshNodesRetrieved() {
+-    return totalSucceededRefreshNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetRMNodeLabelsRetrieved() {
+-    return totalSucceededGetRMNodeLabelsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededCheckUserAccessToQueueRetrieved() {
+-    return totalSucceededCheckUserAccessToQueueRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetDelegationTokenRetrieved() {
+-    return totalSucceededGetDelegationTokenRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRenewDelegationTokenRetrieved() {
+-    return totalSucceededRenewDelegationTokenRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededCancelDelegationTokenRetrieved() {
+-    return totalSucceededCancelDelegationTokenRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededDumpSchedulerLogsRetrieved() {
+-    return totalSucceededDumpSchedulerLogsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetActivitiesRetrieved() {
+-    return totalSucceededGetActivitiesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetBulkActivitiesRetrieved() {
+-    return totalSucceededGetBulkActivitiesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetSchedulerInfoRetrieved() {
+-    return totalSucceededGetSchedulerInfoRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededDeregisterSubClusterRetrieved() {
+-    return totalSucceededDeregisterSubClusterRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededSaveFederationQueuePolicyRetrieved() {
+-    return totalSucceededSaveFederationQueuePolicyRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededBatchSaveFederationQueuePoliciesRetrieved() {
+-    return totalSucceededBatchSaveFederationQueuePoliciesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededListFederationQueuePoliciesFailedRetrieved() {
+-    return totalSucceededListFederationQueuePoliciesFailedRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededDeleteFederationApplicationFailedRetrieved() {
+-    return totalSucceededDeleteFederationApplicationFailedRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetFederationSubClustersRetrieved() {
+-    return totalSucceededGetFederationSubClustersRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededDeleteFederationPoliciesByQueuesRetrieved() {
+-    return totalSucceededDeleteFederationPoliciesByQueuesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshAdminAclsRetrieved() {
+-    return totalSucceededRefreshAdminAclsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshServiceAclsRetrieved() {
+-    return totalSucceededRefreshServiceAclsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededAddToClusterNodeLabelsRetrieved() {
+-    return totalSucceededAddToClusterNodeLabelsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRemoveFromClusterNodeLabelsRetrieved() {
+-    return totalSucceededRemoveFromClusterNodeLabelsRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateSchedulerConfigurationRetrieved() {
+-    return totalSucceededUpdateSchedulerConfigurationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetSchedulerConfigurationRetrieved() {
+-    return totalSucceededGetSchedulerConfigurationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterInfoRetrieved() {
+-    return totalSucceededGetClusterInfoRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetClusterUserInfoRetrieved() {
+-    return totalSucceededGetClusterUserInfoRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededUpdateNodeResourceRetrieved() {
+-    return totalSucceededUpdateNodeResourceRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshNodesResourcesRetrieved() {
+-    return totalSucceededRefreshNodesResourcesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededCheckForDecommissioningNodesRetrieved() {
+-    return totalSucceededCheckForDecommissioningNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshClusterMaxPriorityRetrieved() {
+-    return totalSucceededRefreshClusterMaxPriorityRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededMapAttributesToNodesRetrieved() {
+-    return totalSucceededMapAttributesToNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededGetGroupsForUsersRetrieved() {
+-    return totalSucceededGetGroupsForUsersRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededRefreshSuperUserGroupsConfigurationRetrieved() {
+-    return totalSucceededRefreshSuperUserGroupsConfigurationRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededReplaceLabelsOnNodesRetrieved() {
+-    return totalSucceededReplaceLabelsOnNodesRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public long getNumSucceededReplaceLabelsOnNodeRetrieved() {
+-    return totalSucceededReplaceLabelsOnNodeRetrieved.lastStat().numSamples();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededAppsCreated() {
+-    return totalSucceededAppsCreated.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededAppsSubmitted() {
+-    return totalSucceededAppsSubmitted.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededAppsKilled() {
+-    return totalSucceededAppsKilled.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppAttemptReport() {
+-    return totalSucceededAppAttemptReportRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppReport() {
+-    return totalSucceededAppsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededMultipleGetAppReport() {
+-    return totalSucceededMultipleAppsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterMetricsRetrieved() {
+-    return totalSucceededGetClusterMetricsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterNodesRetrieved() {
+-    return totalSucceededGetClusterNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetNodeToLabelsRetrieved() {
+-    return totalSucceededGetNodeToLabelsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetLabelsToNodesRetrieved() {
+-    return totalSucceededGetLabelsToNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterNodeLabelsRetrieved() {
+-    return totalSucceededGetClusterNodeLabelsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededAppAttemptRetrieved() {
+-    return totalSucceededAppAttemptsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetQueueUserAclsRetrieved() {
+-    return totalSucceededGetQueueUserAclsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetContainerReportRetrieved() {
+-    return totalSucceededGetContainerReportRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetContainersRetrieved() {
+-    return totalSucceededGetContainersRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededListReservationsRetrieved() {
+-    return totalSucceededListReservationsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetResourceTypeInfoRetrieved() {
+-    return totalSucceededGetResourceTypeInfoRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededFailAppAttemptRetrieved() {
+-    return totalSucceededFailAppAttemptRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateAppPriorityRetrieved() {
+-    return totalSucceededUpdateAppPriorityRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateAppTimeoutsRetrieved() {
+-    return totalSucceededUpdateAppTimeoutsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededSignalToContainerRetrieved() {
+-    return totalSucceededSignalToContainerRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetQueueInfoRetrieved() {
+-    return totalSucceededGetQueueInfoRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededMoveApplicationAcrossQueuesRetrieved() {
+-    return totalSucceededMoveApplicationAcrossQueuesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetResourceProfilesRetrieved() {
+-    return totalSucceededGetResourceProfilesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetResourceProfileRetrieved() {
+-    return totalSucceededGetResourceProfileRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAttributesToNodesRetrieved() {
+-    return totalSucceededGetAttributesToNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterNodeAttributesRetrieved() {
+-    return totalSucceededGetClusterNodeAttributesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetNodesToAttributesRetrieved() {
+-    return totalSucceededGetNodesToAttributesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetNewReservationRetrieved() {
+-    return totalSucceededGetNewReservationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededSubmitReservationRetrieved() {
+-    return totalSucceededSubmitReservationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateReservationRetrieved() {
+-    return totalSucceededUpdateReservationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededDeleteReservationRetrieved() {
+-    return totalSucceededDeleteReservationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededListReservationRetrieved() {
+-    return totalSucceededListReservationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppActivitiesRetrieved() {
+-    return totalSucceededGetAppActivitiesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppStatisticsRetrieved() {
+-    return totalSucceededGetAppStatisticsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppPriorityRetrieved() {
+-    return totalSucceededGetAppPriorityRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppQueueRetrieved() {
+-    return totalSucceededGetAppQueueRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateAppQueueRetrieved() {
+-    return totalSucceededUpdateAppQueueRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppTimeoutRetrieved() {
+-    return totalSucceededGetAppTimeoutRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetAppTimeoutsRetrieved() {
+-    return totalSucceededGetAppTimeoutsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshQueuesRetrieved() {
+-    return totalSucceededRefreshQueuesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshNodesRetrieved() {
+-    return totalSucceededRefreshNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetRMNodeLabelsRetrieved() {
+-    return totalSucceededGetRMNodeLabelsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededCheckUserAccessToQueueRetrieved() {
+-    return totalSucceededCheckUserAccessToQueueRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetDelegationTokenRetrieved() {
+-    return totalSucceededGetDelegationTokenRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRenewDelegationTokenRetrieved() {
+-    return totalSucceededRenewDelegationTokenRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededCancelDelegationTokenRetrieved() {
+-    return totalSucceededCancelDelegationTokenRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededDumpSchedulerLogsRetrieved() {
+-    return totalSucceededDumpSchedulerLogsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetActivitiesRetrieved() {
+-    return totalSucceededGetActivitiesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetBulkActivitiesRetrieved() {
+-    return totalSucceededGetBulkActivitiesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetSchedulerInfoRetrieved() {
+-    return totalSucceededGetSchedulerInfoRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededDeregisterSubClusterRetrieved() {
+-    return totalSucceededDeregisterSubClusterRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededSaveFederationQueuePolicyRetrieved() {
+-    return totalSucceededSaveFederationQueuePolicyRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved() {
+-    return totalSucceededBatchSaveFederationQueuePoliciesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededListFederationQueuePoliciesRetrieved() {
+-    return totalSucceededListFederationQueuePoliciesFailedRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededDeleteFederationApplicationFailedRetrieved() {
+-    return totalSucceededDeleteFederationApplicationFailedRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetFederationSubClustersRetrieved() {
+-    return totalSucceededGetFederationSubClustersRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededDeleteFederationPoliciesByQueuesRetrieved() {
+-    return totalSucceededDeleteFederationPoliciesByQueuesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshAdminAclsRetrieved() {
+-    return totalSucceededRefreshAdminAclsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshServiceAclsRetrieved() {
+-    return totalSucceededRefreshServiceAclsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededAddToClusterNodeLabelsRetrieved() {
+-    return totalSucceededAddToClusterNodeLabelsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRemoveFromClusterNodeLabelsRetrieved() {
+-    return totalSucceededRemoveFromClusterNodeLabelsRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateSchedulerConfigurationRetrieved() {
+-    return totalSucceededUpdateSchedulerConfigurationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetSchedulerConfigurationRetrieved() {
+-    return totalSucceededGetSchedulerConfigurationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterInfoRetrieved() {
+-    return totalSucceededGetClusterInfoRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetClusterUserInfoRetrieved() {
+-    return totalSucceededGetClusterUserInfoRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededUpdateNodeResourceRetrieved() {
+-    return totalSucceededUpdateNodeResourceRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshNodesResourcesRetrieved() {
+-    return totalSucceededRefreshNodesResourcesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededCheckForDecommissioningNodesRetrieved() {
+-    return totalSucceededCheckForDecommissioningNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshClusterMaxPriorityRetrieved() {
+-    return totalSucceededRefreshClusterMaxPriorityRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededMapAttributesToNodesRetrieved() {
+-    return totalSucceededMapAttributesToNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededGetGroupsForUsersRetrieved() {
+-    return totalSucceededGetGroupsForUsersRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededRefreshSuperUserGroupsConfigurationRetrieved() {
+-    return totalSucceededRefreshSuperUserGroupsConfigurationRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededReplaceLabelsOnNodesRetrieved() {
+-    return totalSucceededReplaceLabelsOnNodesRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public double getLatencySucceededReplaceLabelsOnNodeRetrieved() {
+-    return totalSucceededReplaceLabelsOnNodeRetrieved.lastStat().mean();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppsFailedCreated() {
+-    return numAppsFailedCreated.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppsFailedSubmitted() {
+-    return numAppsFailedSubmitted.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppsFailedKilled() {
+-    return numAppsFailedKilled.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppsFailedRetrieved() {
+-    return numAppsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppAttemptsFailedRetrieved() {
+-    return numAppAttemptsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getMultipleAppsFailedRetrieved() {
+-    return numMultipleAppsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getClusterMetricsFailedRetrieved() {
+-    return numGetClusterMetricsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getClusterNodesFailedRetrieved() {
+-    return numGetClusterNodesFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getNodeToLabelsFailedRetrieved() {
+-    return numGetNodeToLabelsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getLabelsToNodesFailedRetrieved() {
+-    return numGetLabelsToNodesFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getGetClusterNodeLabelsFailedRetrieved() {
+-    return numGetClusterNodeLabelsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getAppAttemptReportFailedRetrieved() {
+-    return numAppAttemptReportFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getQueueUserAclsFailedRetrieved() {
+-    return numGetQueueUserAclsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getContainerReportFailedRetrieved() {
+-    return numGetContainerReportFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getContainersFailedRetrieved() {
+-    return numGetContainersFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getListReservationsFailedRetrieved() {
+-    return numListReservationsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getGetResourceTypeInfoRetrieved() {
+-    return numGetResourceTypeInfo.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getFailApplicationAttemptFailedRetrieved() {
+-    return numFailAppAttemptFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getUpdateApplicationPriorityFailedRetrieved() {
+-    return numUpdateAppPriorityFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getUpdateApplicationTimeoutsFailedRetrieved() {
+-    return numUpdateAppTimeoutsFailedRetrieved.value();
+-  }
+-
+-  @VisibleForTesting
+-  public int getSignalToContainerFailedRetrieved() {
+-    return numSignalToContainerFailedRetrieved.value();
+-  }
+-
+-  public int getQueueInfoFailedRetrieved() {
+-    return numGetQueueInfoFailedRetrieved.value();
+-  }
+-
+-  public int getMoveApplicationAcrossQueuesFailedRetrieved() {
+-    return numMoveApplicationAcrossQueuesFailedRetrieved.value();
+-  }
+-
+-  public int getResourceProfilesFailedRetrieved() {
+-    return numGetResourceProfilesFailedRetrieved.value();
+-  }
+-
+-  public int getResourceProfileFailedRetrieved() {
+-    return numGetResourceProfileFailedRetrieved.value();
+-  }
+-
+-  public int getAttributesToNodesFailedRetrieved() {
+-    return numGetAttributesToNodesFailedRetrieved.value();
+-  }
+-
+-  public int getClusterNodeAttributesFailedRetrieved() {
+-    return numGetClusterNodeAttributesFailedRetrieved.value();
+-  }
+-
+-  public int getNodesToAttributesFailedRetrieved() {
+-    return numGetNodesToAttributesFailedRetrieved.value();
+-  }
+-
+-  public int getNewReservationFailedRetrieved() {
+-    return numGetNewReservationFailedRetrieved.value();
+-  }
+-
+-  public int getSubmitReservationFailedRetrieved() {
+-    return numSubmitReservationFailedRetrieved.value();
+-  }
+-
+-  public int getUpdateReservationFailedRetrieved() {
+-    return numUpdateReservationFailedRetrieved.value();
+-  }
+-
+-  public int getDeleteReservationFailedRetrieved() {
+-    return numDeleteReservationFailedRetrieved.value();
+-  }
+-
+-  public int getListReservationFailedRetrieved() {
+-    return numListReservationFailedRetrieved.value();
+-  }
+-
+-  public int getAppActivitiesFailedRetrieved() {
+-    return numGetAppActivitiesFailedRetrieved.value();
+-  }
+-
+-  public int getAppStatisticsFailedRetrieved() {
+-    return numGetAppStatisticsFailedRetrieved.value();
+-  }
+-
+-  public int getAppPriorityFailedRetrieved() {
+-    return numGetAppPriorityFailedRetrieved.value();
+-  }
+-
+-  public int getAppQueueFailedRetrieved() {
+-    return numGetAppQueueFailedRetrieved.value();
+-  }
+-
+-  public int getUpdateAppQueueFailedRetrieved() {
+-    return numUpdateAppQueueFailedRetrieved.value();
+-  }
+-
+-  public int getAppTimeoutFailedRetrieved() {
+-    return numGetAppTimeoutFailedRetrieved.value();
+-  }
+-
+-  public int getAppTimeoutsFailedRetrieved() {
+-    return numGetAppTimeoutsFailedRetrieved.value();
+-  }
+-
+-
+-  public int getRefreshQueuesFailedRetrieved() {
+-    return numRefreshQueuesFailedRetrieved.value();
+-  }
+-
+-  public int getRMNodeLabelsFailedRetrieved() {
+-    return numGetRMNodeLabelsFailedRetrieved.value();
+-  }
+-
+-  public int getCheckUserAccessToQueueFailedRetrieved() {
+-    return numCheckUserAccessToQueueFailedRetrieved.value();
+-  }
+-
+-  public int getNumRefreshNodesFailedRetrieved() {
+-    return numRefreshNodesFailedRetrieved.value();
+-  }
+-
+-  public int getNumRefreshSuperUserGroupsConfigurationFailedRetrieved() {
+-    return numRefreshSuperUserGroupsConfigurationFailedRetrieved.value();
+-  }
+-
+-  public int getNumRefreshUserToGroupsMappingsFailedRetrieved() {
+-    return numRefreshUserToGroupsMappingsFailedRetrieved.value();
+-  }
+-
+-  public int getDeregisterSubClusterFailedRetrieved() {
+-    return numDeregisterSubClusterFailedRetrieved.value();
+-  }
+-
+-  public int getSaveFederationQueuePolicyFailedRetrieved() {
+-    return numSaveFederationQueuePolicyFailedRetrieved.value();
+-  }
+-
+-  public int getBatchSaveFederationQueuePoliciesFailedRetrieved() {
+-    return numBatchSaveFederationQueuePoliciesFailedRetrieved.value();
+-  }
+-
+-  public int getListFederationQueuePoliciesFailedRetrieved() {
+-    return numListFederationQueuePoliciesFailedRetrieved.value();
+-  }
+-
+-  public int getDeleteFederationApplicationFailedRetrieved() {
+-    return numDeleteFederationApplicationFailedRetrieved.value();
+-  }
+-
+-  public int getFederationSubClustersFailedRetrieved() {
+-    return numGetFederationSubClustersFailedRetrieved.value();
+-  }
+-
+-  public int getDeleteFederationPoliciesByQueuesRetrieved() {
+-    return numDeleteFederationPoliciesByQueuesRetrieved.value();
+-  }
+-
+-  public int getNumRefreshAdminAclsFailedRetrieved() {
+-    return numRefreshAdminAclsFailedRetrieved.value();
+-  }
+-
+-  public int getNumRefreshServiceAclsFailedRetrieved() {
+-    return numRefreshServiceAclsFailedRetrieved.value();
+-  }
+-
+-  public int getNumReplaceLabelsOnNodesFailedRetrieved() {
+-    return numReplaceLabelsOnNodesFailedRetrieved.value();
+-  }
+-
+-  public int getNumReplaceLabelsOnNodeFailedRetrieved() {
+-    return numReplaceLabelsOnNodeFailedRetrieved.value();
+-  }
+-
+-  public int getNumAddToClusterNodeLabelsFailedRetrieved() {
+-    return numAddToClusterNodeLabelsFailedRetrieved.value();
+-  }
+-
+-  public int getNumRemoveFromClusterNodeLabelsFailedRetrieved() {
+-    return numRemoveFromClusterNodeLabelsFailedRetrieved.value();
+-  }
+-
+-  public int getUpdateSchedulerConfigurationFailedRetrieved() {
+-    return numUpdateSchedulerConfigurationFailedRetrieved.value();
+-  }
+-
+-  public int getSchedulerConfigurationFailedRetrieved() {
+-    return numGetSchedulerConfigurationFailedRetrieved.value();
+-  }
+-
+-  public int getClusterInfoFailedRetrieved() {
+-    return numGetClusterInfoFailedRetrieved.value();
+-  }
+-
+-  public int getClusterUserInfoFailedRetrieved() {
+-    return numGetClusterUserInfoFailedRetrieved.value();
+-  }
+-
+-  public int getUpdateNodeResourceFailedRetrieved() {
+-    return numUpdateNodeResourceFailedRetrieved.value();
+-  }
+-
+-  public int getRefreshNodesResourcesFailedRetrieved() {
+-    return numRefreshNodesResourcesFailedRetrieved.value();
+-  }
+-
+-  public int getCheckForDecommissioningNodesFailedRetrieved() {
+-    return numCheckForDecommissioningNodesFailedRetrieved.value();
+-  }
+-
+-  public int getRefreshClusterMaxPriorityFailedRetrieved() {
+-    return numRefreshClusterMaxPriorityFailedRetrieved.value();
+-  }
+-
+-  public int getMapAttributesToNodesFailedRetrieved() {
+-    return numMapAttributesToNodesFailedRetrieved.value();
+-  }
+-
+-  public int getGroupsForUserFailedRetrieved() {
+-    return numGetGroupsForUserFailedRetrieved.value();
+-  }
+-
+-  public int getDelegationTokenFailedRetrieved() {
+-    return numGetDelegationTokenFailedRetrieved.value();
+-  }
+-
+-  public int getRenewDelegationTokenFailedRetrieved() {
+-    return numRenewDelegationTokenFailedRetrieved.value();
+-  }
+-
+-  public int getCancelDelegationTokenFailedRetrieved() {
+-    return numCancelDelegationTokenFailedRetrieved.value();
+-  }
+-
+-  public int getDumpSchedulerLogsFailedRetrieved() {
+-    return numDumpSchedulerLogsFailedRetrieved.value();
+-  }
+-
+-  public int getActivitiesFailedRetrieved() {
+-    return numGetActivitiesFailedRetrieved.value();
+-  }
+-
+-  public int getBulkActivitiesFailedRetrieved(){
+-    return numGetBulkActivitiesFailedRetrieved.value();
+-  }
+-
+-  public int getSchedulerInfoFailedRetrieved() {
+-    return numGetSchedulerInfoFailedRetrieved.value();
+-  }
+-
+-  public void succeededAppsCreated(long duration) {
+-    totalSucceededAppsCreated.add(duration);
+-    getNewApplicationLatency.add(duration);
+-  }
+-
+-  public void succeededAppsSubmitted(long duration) {
+-    totalSucceededAppsSubmitted.add(duration);
+-    submitApplicationLatency.add(duration);
+-  }
+-
+-  public void succeededAppsKilled(long duration) {
+-    totalSucceededAppsKilled.add(duration);
+-    killApplicationLatency.add(duration);
+-  }
+-
+-  public void succeededAppsRetrieved(long duration) {
+-    totalSucceededAppsRetrieved.add(duration);
+-    getApplicationReportLatency.add(duration);
+-  }
+-
+-  public void succeededMultipleAppsRetrieved(long duration) {
+-    totalSucceededMultipleAppsRetrieved.add(duration);
+-    getApplicationsReportLatency.add(duration);
+-  }
+-
+-  public void succeededAppAttemptsRetrieved(long duration) {
+-    totalSucceededAppAttemptsRetrieved.add(duration);
+-    getApplicationAttemptsLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterMetricsRetrieved(long duration) {
+-    totalSucceededGetClusterMetricsRetrieved.add(duration);
+-    getClusterMetricsLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterNodesRetrieved(long duration) {
+-    totalSucceededGetClusterNodesRetrieved.add(duration);
+-    getClusterNodesLatency.add(duration);
+-  }
+-
+-  public void succeededGetNodeToLabelsRetrieved(long duration) {
+-    totalSucceededGetNodeToLabelsRetrieved.add(duration);
+-    getNodeToLabelsLatency.add(duration);
+-  }
+-
+-  public void succeededGetLabelsToNodesRetrieved(long duration) {
+-    totalSucceededGetLabelsToNodesRetrieved.add(duration);
+-    getLabelToNodesLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterNodeLabelsRetrieved(long duration) {
+-    totalSucceededGetClusterNodeLabelsRetrieved.add(duration);
+-    getClusterNodeLabelsLatency.add(duration);
+-  }
+-
+-  public void succeededAppAttemptReportRetrieved(long duration) {
+-    totalSucceededAppAttemptReportRetrieved.add(duration);
+-    getApplicationAttemptReportLatency.add(duration);
+-  }
+-
+-  public void succeededGetQueueUserAclsRetrieved(long duration) {
+-    totalSucceededGetQueueUserAclsRetrieved.add(duration);
+-    getQueueUserAclsLatency.add(duration);
+-  }
+-
+-  public void succeededGetContainerReportRetrieved(long duration) {
+-    totalSucceededGetContainerReportRetrieved.add(duration);
+-    getContainerReportLatency.add(duration);
+-  }
+-
+-  public void succeededGetContainersRetrieved(long duration) {
+-    totalSucceededGetContainersRetrieved.add(duration);
+-    getContainerLatency.add(duration);
+-  }
+-
+-  public void succeededListReservationsRetrieved(long duration) {
+-    totalSucceededListReservationsRetrieved.add(duration);
+-    listReservationsLatency.add(duration);
+-  }
+-
+-  public void succeededGetResourceTypeInfoRetrieved(long duration) {
+-    totalSucceededGetResourceTypeInfoRetrieved.add(duration);
+-    listResourceTypeInfoLatency.add(duration);
+-  }
+-
+-  public void succeededFailAppAttemptRetrieved(long duration) {
+-    totalSucceededFailAppAttemptRetrieved.add(duration);
+-    failAppAttemptLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateAppPriorityRetrieved(long duration) {
+-    totalSucceededUpdateAppPriorityRetrieved.add(duration);
+-    updateAppPriorityLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateAppTimeoutsRetrieved(long duration) {
+-    totalSucceededUpdateAppTimeoutsRetrieved.add(duration);
+-    updateAppTimeoutsLatency.add(duration);
+-  }
+-
+-  public void succeededSignalToContainerRetrieved(long duration) {
+-    totalSucceededSignalToContainerRetrieved.add(duration);
+-    signalToContainerLatency.add(duration);
+-  }
+-
+-  public void succeededGetQueueInfoRetrieved(long duration) {
+-    totalSucceededGetQueueInfoRetrieved.add(duration);
+-    getQueueInfoLatency.add(duration);
+-  }
+-
+-  public void succeededMoveApplicationAcrossQueuesRetrieved(long duration) {
+-    totalSucceededMoveApplicationAcrossQueuesRetrieved.add(duration);
+-    moveApplicationAcrossQueuesLatency.add(duration);
+-  }
+-
+-  public void succeededGetResourceProfilesRetrieved(long duration) {
+-    totalSucceededGetResourceProfilesRetrieved.add(duration);
+-    getResourceProfilesLatency.add(duration);
+-  }
+-
+-  public void succeededGetResourceProfileRetrieved(long duration) {
+-    totalSucceededGetResourceProfileRetrieved.add(duration);
+-    getResourceProfileLatency.add(duration);
+-  }
+-
+-  public void succeededGetAttributesToNodesRetrieved(long duration) {
+-    totalSucceededGetAttributesToNodesRetrieved.add(duration);
+-    getAttributesToNodesLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterNodeAttributesRetrieved(long duration) {
+-    totalSucceededGetClusterNodeAttributesRetrieved.add(duration);
+-    getClusterNodeAttributesLatency.add(duration);
+-  }
+-
+-  public void succeededGetNodesToAttributesRetrieved(long duration) {
+-    totalSucceededGetNodesToAttributesRetrieved.add(duration);
+-    getNodesToAttributesLatency.add(duration);
+-  }
+-
+-  public void succeededGetNewReservationRetrieved(long duration) {
+-    totalSucceededGetNewReservationRetrieved.add(duration);
+-    getNewReservationLatency.add(duration);
+-  }
+-
+-  public void succeededSubmitReservationRetrieved(long duration) {
+-    totalSucceededSubmitReservationRetrieved.add(duration);
+-    submitReservationLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateReservationRetrieved(long duration) {
+-    totalSucceededUpdateReservationRetrieved.add(duration);
+-    updateReservationLatency.add(duration);
+-  }
+-
+-  public void succeededDeleteReservationRetrieved(long duration) {
+-    totalSucceededDeleteReservationRetrieved.add(duration);
+-    deleteReservationLatency.add(duration);
+-  }
+-
+-  public void succeededListReservationRetrieved(long duration) {
+-    totalSucceededListReservationRetrieved.add(duration);
+-    listReservationLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppActivitiesRetrieved(long duration) {
+-    totalSucceededGetAppActivitiesRetrieved.add(duration);
+-    getAppActivitiesLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppStatisticsRetrieved(long duration) {
+-    totalSucceededGetAppStatisticsRetrieved.add(duration);
+-    getAppStatisticsLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppPriorityRetrieved(long duration) {
+-    totalSucceededGetAppPriorityRetrieved.add(duration);
+-    getAppPriorityLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppQueueRetrieved(long duration) {
+-    totalSucceededGetAppQueueRetrieved.add(duration);
+-    getAppQueueLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateAppQueueRetrieved(long duration) {
+-    totalSucceededUpdateAppQueueRetrieved.add(duration);
+-    getUpdateQueueLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppTimeoutRetrieved(long duration) {
+-    totalSucceededGetAppTimeoutRetrieved.add(duration);
+-    getAppTimeoutLatency.add(duration);
+-  }
+-
+-  public void succeededGetAppTimeoutsRetrieved(long duration) {
+-    totalSucceededGetAppTimeoutsRetrieved.add(duration);
+-    getAppTimeoutsLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshQueuesRetrieved(long duration) {
+-    totalSucceededRefreshQueuesRetrieved.add(duration);
+-    refreshQueuesLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshNodesRetrieved(long duration) {
+-    totalSucceededRefreshNodesRetrieved.add(duration);
+-    refreshNodesLatency.add(duration);
+-  }
+-
+-  public void succeededGetRMNodeLabelsRetrieved(long duration) {
+-    totalSucceededGetRMNodeLabelsRetrieved.add(duration);
+-    getRMNodeLabelsLatency.add(duration);
+-  }
+-
+-  public void succeededCheckUserAccessToQueueRetrieved(long duration) {
+-    totalSucceededCheckUserAccessToQueueRetrieved.add(duration);
+-    checkUserAccessToQueueLatency.add(duration);
+-  }
+-
+-  public void succeededGetDelegationTokenRetrieved(long duration) {
+-    totalSucceededGetDelegationTokenRetrieved.add(duration);
+-    getDelegationTokenLatency.add(duration);
+-  }
+-
+-  public void succeededRenewDelegationTokenRetrieved(long duration) {
+-    totalSucceededRenewDelegationTokenRetrieved.add(duration);
+-    renewDelegationTokenLatency.add(duration);
+-  }
+-
+-  public void succeededCancelDelegationTokenRetrieved(long duration) {
+-    totalSucceededCancelDelegationTokenRetrieved.add(duration);
+-    cancelDelegationTokenLatency.add(duration);
+-  }
+-
+-  public void succeededDumpSchedulerLogsRetrieved(long duration) {
+-    totalSucceededDumpSchedulerLogsRetrieved.add(duration);
+-    dumpSchedulerLogsLatency.add(duration);
+-  }
+-
+-  public void succeededGetActivitiesLatencyRetrieved(long duration) {
+-    totalSucceededGetActivitiesRetrieved.add(duration);
+-    getActivitiesLatency.add(duration);
+-  }
+-
+-  public void succeededGetBulkActivitiesRetrieved(long duration) {
+-    totalSucceededGetBulkActivitiesRetrieved.add(duration);
+-    getBulkActivitiesLatency.add(duration);
+-  }
+-
+-  public void succeededGetSchedulerInfoRetrieved(long duration) {
+-    totalSucceededGetSchedulerInfoRetrieved.add(duration);
+-    getSchedulerInfoRetrievedLatency.add(duration);
+-  }
+-
+-  public void succeededDeregisterSubClusterRetrieved(long duration) {
+-    totalSucceededDeregisterSubClusterRetrieved.add(duration);
+-    refreshDeregisterSubClusterLatency.add(duration);
+-  }
+-
+-  public void succeededSaveFederationQueuePolicyRetrieved(long duration) {
+-    totalSucceededSaveFederationQueuePolicyRetrieved.add(duration);
+-    saveFederationQueuePolicyLatency.add(duration);
+-  }
+-
+-  public void succeededBatchSaveFederationQueuePoliciesRetrieved(long duration) {
+-    totalSucceededBatchSaveFederationQueuePoliciesRetrieved.add(duration);
+-    batchSaveFederationQueuePoliciesLatency.add(duration);
+-  }
+-
+-  public void succeededListFederationQueuePoliciesRetrieved(long duration) {
+-    totalSucceededListFederationQueuePoliciesFailedRetrieved.add(duration);
+-    listFederationQueuePoliciesLatency.add(duration);
+-  }
+-
+-  public void succeededDeleteFederationApplicationFailedRetrieved(long duration) {
+-    totalSucceededDeleteFederationApplicationFailedRetrieved.add(duration);
+-    deleteFederationApplicationLatency.add(duration);
+-  }
+-
+-  public void succeededGetFederationSubClustersRetrieved(long duration) {
+-    totalSucceededGetFederationSubClustersRetrieved.add(duration);
+-    getFederationSubClustersLatency.add(duration);
+-  }
+-
+-  public void succeededDeleteFederationPoliciesByQueuesRetrieved(long duration) {
+-    totalSucceededDeleteFederationPoliciesByQueuesRetrieved.add(duration);
+-    deleteFederationPoliciesByQueuesLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshAdminAclsRetrieved(long duration) {
+-    totalSucceededRefreshAdminAclsRetrieved.add(duration);
+-    refreshAdminAclsLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshServiceAclsRetrieved(long duration) {
+-    totalSucceededRefreshServiceAclsRetrieved.add(duration);
+-    refreshServiceAclsLatency.add(duration);
+-  }
+-
+-  public void succeededAddToClusterNodeLabelsRetrieved(long duration) {
+-    totalSucceededAddToClusterNodeLabelsRetrieved.add(duration);
+-    addToClusterNodeLabelsLatency.add(duration);
+-  }
+-
+-  public void succeededRemoveFromClusterNodeLabelsRetrieved(long duration) {
+-    totalSucceededRemoveFromClusterNodeLabelsRetrieved.add(duration);
+-    removeFromClusterNodeLabelsLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateSchedulerConfigurationRetrieved(long duration) {
+-    totalSucceededUpdateSchedulerConfigurationRetrieved.add(duration);
+-    updateSchedulerConfigLatency.add(duration);
+-  }
+-
+-  public void succeededGetSchedulerConfigurationRetrieved(long duration) {
+-    totalSucceededGetSchedulerConfigurationRetrieved.add(duration);
+-    getSchedulerConfigurationLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterInfoRetrieved(long duration) {
+-    totalSucceededGetClusterInfoRetrieved.add(duration);
+-    getClusterInfoLatency.add(duration);
+-  }
+-
+-  public void succeededGetClusterUserInfoRetrieved(long duration) {
+-    totalSucceededGetClusterUserInfoRetrieved.add(duration);
+-    getClusterUserInfoLatency.add(duration);
+-  }
+-
+-  public void succeededUpdateNodeResourceRetrieved(long duration) {
+-    totalSucceededUpdateNodeResourceRetrieved.add(duration);
+-    updateNodeResourceLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshNodesResourcesRetrieved(long duration) {
+-    totalSucceededRefreshNodesResourcesRetrieved.add(duration);
+-    refreshNodesResourcesLatency.add(duration);
+-  }
+-
+-  public void succeededCheckForDecommissioningNodesRetrieved(long duration) {
+-    totalSucceededCheckForDecommissioningNodesRetrieved.add(duration);
+-    checkForDecommissioningNodesLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshClusterMaxPriorityRetrieved(long duration) {
+-    totalSucceededRefreshClusterMaxPriorityRetrieved.add(duration);
+-    refreshClusterMaxPriorityLatency.add(duration);
+-  }
+-
+-  public void succeededMapAttributesToNodesRetrieved(long duration) {
+-    totalSucceededMapAttributesToNodesRetrieved.add(duration);
+-    mapAttributesToNodesLatency.add(duration);
+-  }
+-
+-  public void succeededGetGroupsForUsersRetrieved(long duration) {
+-    totalSucceededGetGroupsForUsersRetrieved.add(duration);
+-    getGroupsForUserLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshSuperUserGroupsConfRetrieved(long duration) {
+-    totalSucceededRefreshSuperUserGroupsConfigurationRetrieved.add(duration);
+-    refreshSuperUserGroupsConfLatency.add(duration);
+-  }
+-
+-  public void succeededRefreshUserToGroupsMappingsRetrieved(long duration) {
+-    totalSucceededRefreshUserToGroupsMappingsRetrieved.add(duration);
+-    refreshUserToGroupsMappingsLatency.add(duration);
+-  }
+-
+-  public void succeededReplaceLabelsOnNodesRetrieved(long duration) {
+-    totalSucceededReplaceLabelsOnNodesRetrieved.add(duration);
+-    replaceLabelsOnNodesLatency.add(duration);
+-  }
+-
+-  public void succeededReplaceLabelsOnNodeRetrieved(long duration) {
+-    totalSucceededReplaceLabelsOnNodeRetrieved.add(duration);
+-    replaceLabelsOnNodeLatency.add(duration);
+-  }
+-
+-  public void incrAppsFailedCreated() {
+-    numAppsFailedCreated.incr();
+-  }
+-
+-  public void incrAppsFailedSubmitted() {
+-    numAppsFailedSubmitted.incr();
+-  }
+-
+-  public void incrAppsFailedKilled() {
+-    numAppsFailedKilled.incr();
+-  }
+-
+-  public void incrAppsFailedRetrieved() {
+-    numAppsFailedRetrieved.incr();
+-  }
+-
+-  public void incrMultipleAppsFailedRetrieved() {
+-    numMultipleAppsFailedRetrieved.incr();
+-  }
+-
+-  public void incrAppAttemptsFailedRetrieved() {
+-    numAppAttemptsFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetClusterMetricsFailedRetrieved() {
+-    numGetClusterMetricsFailedRetrieved.incr();
+-  }
+-
+-  public void incrClusterNodesFailedRetrieved() {
+-    numGetClusterNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrNodeToLabelsFailedRetrieved() {
+-    numGetNodeToLabelsFailedRetrieved.incr();
+-  }
+-
+-  public void incrLabelsToNodesFailedRetrieved() {
+-    numGetLabelsToNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrClusterNodeLabelsFailedRetrieved() {
+-    numGetClusterNodeLabelsFailedRetrieved.incr();
+-  }
+-
+-  public void incrAppAttemptReportFailedRetrieved() {
+-    numAppAttemptReportFailedRetrieved.incr();
+-  }
+-
+-  public void incrQueueUserAclsFailedRetrieved() {
+-    numGetQueueUserAclsFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetContainerReportFailedRetrieved() {
+-    numGetContainerReportFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetContainersFailedRetrieved() {
+-    numGetContainersFailedRetrieved.incr();
+-  }
+-
+-  public void incrListReservationsFailedRetrieved() {
+-    numListReservationsFailedRetrieved.incr();
+-  }
+-
+-  public void incrResourceTypeInfoFailedRetrieved() {
+-    numGetResourceTypeInfo.incr();
+-  }
+-
+-  public void incrFailAppAttemptFailedRetrieved() {
+-    numFailAppAttemptFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateAppPriorityFailedRetrieved() {
+-    numUpdateAppPriorityFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateApplicationTimeoutsRetrieved() {
+-    numUpdateAppTimeoutsFailedRetrieved.incr();
+-  }
+-
+-  public void incrSignalToContainerFailedRetrieved() {
+-    numSignalToContainerFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetQueueInfoFailedRetrieved() {
+-    numGetQueueInfoFailedRetrieved.incr();
+-  }
+-
+-  public void incrMoveApplicationAcrossQueuesFailedRetrieved() {
+-    numMoveApplicationAcrossQueuesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetResourceProfilesFailedRetrieved() {
+-    numGetResourceProfilesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetResourceProfileFailedRetrieved() {
+-    numGetResourceProfileFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAttributesToNodesFailedRetrieved() {
+-    numGetAttributesToNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetClusterNodeAttributesFailedRetrieved() {
+-    numGetClusterNodeAttributesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetNodesToAttributesFailedRetrieved() {
+-    numGetNodesToAttributesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetNewReservationFailedRetrieved() {
+-    numGetNewReservationFailedRetrieved.incr();
+-  }
+-
+-  public void incrSubmitReservationFailedRetrieved() {
+-    numSubmitReservationFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateReservationFailedRetrieved() {
+-    numUpdateReservationFailedRetrieved.incr();
+-  }
+-
+-  public void incrDeleteReservationFailedRetrieved() {
+-    numDeleteReservationFailedRetrieved.incr();
+-  }
+-
+-  public void incrListReservationFailedRetrieved() {
+-    numListReservationFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppActivitiesFailedRetrieved() {
+-    numGetAppActivitiesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppStatisticsFailedRetrieved() {
+-    numGetAppStatisticsFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppPriorityFailedRetrieved() {
+-    numGetAppPriorityFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppQueueFailedRetrieved() {
+-    numGetAppQueueFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateAppQueueFailedRetrieved() {
+-    numUpdateAppQueueFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppTimeoutFailedRetrieved() {
+-    numGetAppTimeoutFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetAppTimeoutsFailedRetrieved() {
+-    numGetAppTimeoutsFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshQueuesFailedRetrieved() {
+-    numRefreshQueuesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetRMNodeLabelsFailedRetrieved() {
+-    numGetRMNodeLabelsFailedRetrieved.incr();
+-  }
+-
+-  public void incrCheckUserAccessToQueueFailedRetrieved() {
+-    numCheckUserAccessToQueueFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshNodesFailedRetrieved() {
+-    numRefreshNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshSuperUserGroupsConfigurationFailedRetrieved() {
+-    numRefreshSuperUserGroupsConfigurationFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshUserToGroupsMappingsFailedRetrieved() {
+-    numRefreshUserToGroupsMappingsFailedRetrieved.incr();
+-  }
+-
+-  public void incrDeregisterSubClusterFailedRetrieved() {
+-    numDeregisterSubClusterFailedRetrieved.incr();
+-  }
+-
+-  public void incrSaveFederationQueuePolicyFailedRetrieved() {
+-    numSaveFederationQueuePolicyFailedRetrieved.incr();
+-  }
+-
+-  public void incrBatchSaveFederationQueuePoliciesFailedRetrieved() {
+-    numBatchSaveFederationQueuePoliciesFailedRetrieved.incr();
+-  }
+-
+-  public void incrListFederationQueuePoliciesFailedRetrieved() {
+-    numListFederationQueuePoliciesFailedRetrieved.incr();
+-  }
+-
+-  public void incrDeleteFederationApplicationFailedRetrieved() {
+-    numDeleteFederationApplicationFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetFederationSubClustersFailedRetrieved() {
+-    numGetFederationSubClustersFailedRetrieved.incr();
+-  }
+-
+-  public void incrDeleteFederationPoliciesByQueuesRetrieved() {
+-    numDeleteFederationPoliciesByQueuesRetrieved.incr();
+-  }
+-
+-  public void incrRefreshAdminAclsFailedRetrieved() {
+-    numRefreshAdminAclsFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshServiceAclsFailedRetrieved() {
+-    numRefreshServiceAclsFailedRetrieved.incr();
+-  }
+-
+-  public void incrAddToClusterNodeLabelsFailedRetrieved() {
+-    numAddToClusterNodeLabelsFailedRetrieved.incr();
+-  }
+-
+-  public void incrRemoveFromClusterNodeLabelsFailedRetrieved() {
+-    numRemoveFromClusterNodeLabelsFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateSchedulerConfigurationFailedRetrieved() {
+-    numUpdateSchedulerConfigurationFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetSchedulerConfigurationFailedRetrieved() {
+-    numGetSchedulerConfigurationFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetClusterInfoFailedRetrieved() {
+-    numGetClusterInfoFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetClusterUserInfoFailedRetrieved() {
+-    numGetClusterUserInfoFailedRetrieved.incr();
+-  }
+-
+-  public void incrUpdateNodeResourceFailedRetrieved() {
+-    numUpdateNodeResourceFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshNodesResourcesFailedRetrieved() {
+-    numRefreshNodesResourcesFailedRetrieved.incr();
+-  }
+-
+-  public void incrCheckForDecommissioningNodesFailedRetrieved() {
+-    numCheckForDecommissioningNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrRefreshClusterMaxPriorityFailedRetrieved() {
+-    numRefreshClusterMaxPriorityFailedRetrieved.incr();
+-  }
+-
+-  public void incrMapAttributesToNodesFailedRetrieved() {
+-    numMapAttributesToNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetGroupsForUserFailedRetrieved() {
+-    numGetGroupsForUserFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetDelegationTokenFailedRetrieved() {
+-    numGetDelegationTokenFailedRetrieved.incr();
+-  }
+-
+-  public void incrRenewDelegationTokenFailedRetrieved() {
+-    numRenewDelegationTokenFailedRetrieved.incr();
+-  }
+-
+-  public void incrCancelDelegationTokenFailedRetrieved() {
+-    numCancelDelegationTokenFailedRetrieved.incr();
+-  }
+-
+-  public void incrReplaceLabelsOnNodesFailedRetrieved() {
+-    numReplaceLabelsOnNodesFailedRetrieved.incr();
+-  }
+-
+-  public void incrReplaceLabelsOnNodeFailedRetrieved() {
+-    numReplaceLabelsOnNodeFailedRetrieved.incr();
+-  }
+-
+-  public void incrDumpSchedulerLogsFailedRetrieved() {
+-    numDumpSchedulerLogsFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetActivitiesFailedRetrieved() {
+-    numGetActivitiesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetBulkActivitiesFailedRetrieved() {
+-    numGetBulkActivitiesFailedRetrieved.incr();
+-  }
+-
+-  public void incrGetSchedulerInfoFailedRetrieved() {
+-    numGetSchedulerInfoFailedRetrieved.incr();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java
+deleted file mode 100644
+index 744ddc87050..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/RouterServerUtil.java
++++ /dev/null
+@@ -1,833 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router;
+-
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.commons.lang3.math.NumberUtils;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceAudience.Public;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.conf.StorageUnit;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.thirdparty.protobuf.GeneratedMessageV3;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl;
+-import org.apache.hadoop.yarn.api.records.impl.pb.ContainerLaunchContextPBImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.proto.YarnProtos.StringStringMapProto;
+-import org.apache.hadoop.yarn.proto.YarnProtos.StringBytesMapProto;
+-import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationACLMapProto;
+-import org.apache.hadoop.yarn.proto.YarnProtos.StringLocalResourceMapProto;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDefinitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestInfo;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.ObjectOutputStream;
+-import java.lang.reflect.InvocationTargetException;
+-import java.lang.reflect.Method;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.List;
+-import java.util.EnumSet;
+-import java.io.IOException;
+-
+-/**
+- * Common utility methods used by the Router server.
+- *
+- */
+-@Private
+-@Unstable
+-public final class RouterServerUtil {
+-
+-  private static final String APPLICATION_ID_PREFIX = "application_";
+-
+-  private static final String APP_ATTEMPT_ID_PREFIX = "appattempt_";
+-
+-  private static final String CONTAINER_PREFIX = "container_";
+-
+-  private static final String EPOCH_PREFIX = "e";
+-
+-  private static final String RESERVEIDSTR_PREFIX = "reservation_";
+-
+-  /** Disable constructor. */
+-  private RouterServerUtil() {
+-  }
+-
+-  public static final Logger LOG =
+-      LoggerFactory.getLogger(RouterServerUtil.class);
+-
+-  /**
+-   * Throws an exception due to an error.
+-   *
+-   * @param t the throwable raised in the called class.
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @throws YarnException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowException(Throwable t, String errMsgFormat, Object... args)
+-      throws YarnException {
+-    String msg = String.format(errMsgFormat, args);
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(msg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new YarnException(newErrMsg, t);
+-    } else {
+-      LOG.error(msg);
+-      throw new YarnException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an exception due to an error.
+-   *
+-   * @param errMsg the error message
+-   * @param t the throwable raised in the called class.
+-   * @throws YarnException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowException(String errMsg, Throwable t)
+-      throws YarnException {
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(errMsg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new YarnException(newErrMsg, t);
+-    } else {
+-      LOG.error(errMsg);
+-      throw new YarnException(errMsg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an exception due to an error.
+-   *
+-   * @param errMsg the error message
+-   * @throws YarnException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowException(String errMsg) throws YarnException {
+-    LOG.error(errMsg);
+-    throw new YarnException(errMsg);
+-  }
+-
+-  private static String getErrorMsg(String errMsg, Throwable t) {
+-    if (t.getMessage() != null) {
+-      return errMsg + "" + t.getMessage();
+-    }
+-    return errMsg;
+-  }
+-
+-  public static <R> R createRequestInterceptorChain(Configuration conf, String pipeLineClassName,
+-      String interceptorClassName, Class<R> clazz) {
+-
+-    List<String> interceptorClassNames = getInterceptorClassNames(conf,
+-        pipeLineClassName, interceptorClassName);
+-
+-    R pipeline = null;
+-    R current = null;
+-
+-    for (String className : interceptorClassNames) {
+-      try {
+-        Class<?> interceptorClass = conf.getClassByName(className);
+-        if (clazz.isAssignableFrom(interceptorClass)) {
+-          Object interceptorInstance = ReflectionUtils.newInstance(interceptorClass, conf);
+-          if (pipeline == null) {
+-            pipeline = clazz.cast(interceptorInstance);
+-            current = clazz.cast(interceptorInstance);
+-            continue;
+-          } else {
+-            Method method = clazz.getMethod("setNextInterceptor", clazz);
+-            method.invoke(current, interceptorInstance);
+-            current = clazz.cast(interceptorInstance);
+-          }
+-        } else {
+-          LOG.error("Class: {} not instance of {}.", className, clazz.getCanonicalName());
+-          throw new YarnRuntimeException("Class: " + className + " not instance of "
+-              + clazz.getCanonicalName());
+-        }
+-      } catch (ClassNotFoundException e) {
+-        LOG.error("Could not instantiate RequestInterceptor: {}", className, e);
+-        throw new YarnRuntimeException("Could not instantiate RequestInterceptor: " + className, e);
+-      } catch (InvocationTargetException e) {
+-        LOG.error("RequestInterceptor {} call setNextInterceptor error.", className, e);
+-        throw new YarnRuntimeException("RequestInterceptor " + className
+-            + " call setNextInterceptor error.", e);
+-      } catch (NoSuchMethodException e) {
+-        LOG.error("RequestInterceptor {} does not contain the method setNextInterceptor.",
+-            className);
+-        throw new YarnRuntimeException("RequestInterceptor " + className +
+-            " does not contain the method setNextInterceptor.", e);
+-      } catch (IllegalAccessException e) {
+-        LOG.error("RequestInterceptor {} call the method setNextInterceptor " +
+-            "does not have access.", className);
+-        throw new YarnRuntimeException("RequestInterceptor "
+-            + className + " call the method setNextInterceptor does not have access.", e);
+-      }
+-    }
+-
+-    if (pipeline == null) {
+-      throw new YarnRuntimeException(
+-          "RequestInterceptor pipeline is not configured in the system.");
+-    }
+-
+-    return pipeline;
+-  }
+-
+-  private static List<String> getInterceptorClassNames(Configuration conf,
+-      String pipeLineClass, String interceptorClass) {
+-    String configuredInterceptorClassNames = conf.get(pipeLineClass, interceptorClass);
+-    List<String> interceptorClassNames = new ArrayList<>();
+-    Collection<String> tempList =
+-        StringUtils.getStringCollection(configuredInterceptorClassNames);
+-    for (String item : tempList) {
+-      interceptorClassNames.add(item.trim());
+-    }
+-    return interceptorClassNames;
+-  }
+-
+-  /**
+-   * Throws an IOException due to an error.
+-   *
+-   * @param errMsg the error message
+-   * @param t the throwable raised in the called class.
+-   * @throws IOException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowIOException(String errMsg, Throwable t)
+-      throws IOException {
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(errMsg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new IOException(newErrMsg, t);
+-    } else {
+-      LOG.error(errMsg);
+-      throw new IOException(errMsg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an IOException due to an error.
+-   *
+-   * @param t the throwable raised in the called class.
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @throws IOException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowIOException(Throwable t, String errMsgFormat, Object... args)
+-      throws IOException {
+-    String msg = String.format(errMsgFormat, args);
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(msg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new IOException(newErrMsg, t);
+-    } else {
+-      LOG.error(msg);
+-      throw new IOException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an RunTimeException due to an error.
+-   *
+-   * @param errMsg the error message
+-   * @param t the throwable raised in the called class.
+-   * @throws RuntimeException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowRunTimeException(String errMsg, Throwable t)
+-      throws RuntimeException {
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(errMsg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new RuntimeException(newErrMsg, t);
+-    } else {
+-      LOG.error(errMsg);
+-      throw new RuntimeException(errMsg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an RunTimeException due to an error.
+-   *
+-   * @param t the throwable raised in the called class.
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @throws RuntimeException on failure
+-   */
+-  @Public
+-  @Unstable
+-  public static void logAndThrowRunTimeException(Throwable t, String errMsgFormat, Object... args)
+-      throws RuntimeException {
+-    String msg = String.format(errMsgFormat, args);
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(msg, t);
+-      LOG.error(newErrMsg, t);
+-      throw new RuntimeException(newErrMsg, t);
+-    } else {
+-      LOG.error(msg);
+-      throw new RuntimeException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an RunTimeException due to an error.
+-   *
+-   * @param t the throwable raised in the called class.
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @return RuntimeException
+-   */
+-  @Public
+-  @Unstable
+-  public static RuntimeException logAndReturnRunTimeException(
+-      Throwable t, String errMsgFormat, Object... args) {
+-    String msg = String.format(errMsgFormat, args);
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(msg, t);
+-      LOG.error(newErrMsg, t);
+-      return new RuntimeException(newErrMsg, t);
+-    } else {
+-      LOG.error(msg);
+-      return new RuntimeException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Throws an RunTimeException due to an error.
+-   *
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @return RuntimeException
+-   */
+-  @Public
+-  @Unstable
+-  public static RuntimeException logAndReturnRunTimeException(
+-      String errMsgFormat, Object... args) {
+-    return logAndReturnRunTimeException(null, errMsgFormat, args);
+-  }
+-
+-  /**
+-   * Throws an YarnRuntimeException due to an error.
+-   *
+-   * @param t the throwable raised in the called class.
+-   * @param errMsgFormat the error message format string.
+-   * @param args referenced by the format specifiers in the format string.
+-   * @return YarnRuntimeException
+-   */
+-  @Public
+-  @Unstable
+-  public static YarnRuntimeException logAndReturnYarnRunTimeException(
+-      Throwable t, String errMsgFormat, Object... args) {
+-    String msg = String.format(errMsgFormat, args);
+-    if (t != null) {
+-      String newErrMsg = getErrorMsg(msg, t);
+-      LOG.error(newErrMsg, t);
+-      return new YarnRuntimeException(newErrMsg, t);
+-    } else {
+-      LOG.error(msg);
+-      return new YarnRuntimeException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Check applicationId is accurate.
+-   *
+-   * We need to ensure that applicationId cannot be empty and
+-   * can be converted to ApplicationId object normally.
+-   *
+-   * @param applicationId applicationId of type string
+-   * @throws IllegalArgumentException If the format of the applicationId is not accurate,
+-   * an IllegalArgumentException needs to be thrown.
+-   */
+-  @Public
+-  @Unstable
+-  public static void validateApplicationId(String applicationId)
+-      throws IllegalArgumentException {
+-
+-    // Make Sure applicationId is not empty.
+-    if (applicationId == null || applicationId.isEmpty()) {
+-      throw new IllegalArgumentException("Parameter error, the appId is empty or null.");
+-    }
+-
+-    // Make sure the prefix information of applicationId is accurate.
+-    if (!applicationId.startsWith(APPLICATION_ID_PREFIX)) {
+-      throw new IllegalArgumentException("Invalid ApplicationId prefix: "
+-          + applicationId + ". The valid ApplicationId should start with prefix application");
+-    }
+-
+-    // Check the split position of the string.
+-    int pos1 = APPLICATION_ID_PREFIX.length() - 1;
+-    int pos2 = applicationId.indexOf('_', pos1 + 1);
+-    if (pos2 < 0) {
+-      throw new IllegalArgumentException("Invalid ApplicationId: " + applicationId);
+-    }
+-
+-    // Confirm that the parsed rmId and appId are numeric types.
+-    String rmId = applicationId.substring(pos1 + 1, pos2);
+-    String appId = applicationId.substring(pos2 + 1);
+-    if(!NumberUtils.isDigits(rmId) || !NumberUtils.isDigits(appId)){
+-      throw new IllegalArgumentException("Invalid ApplicationId: " + applicationId);
+-    }
+-  }
+-
+-  /**
+-   * Check appAttemptId is accurate.
+-   *
+-   * We need to ensure that appAttemptId cannot be empty and
+-   * can be converted to ApplicationAttemptId object normally.
+-   *
+-   * @param appAttemptId appAttemptId of type string.
+-   * @throws IllegalArgumentException If the format of the appAttemptId is not accurate,
+-   * an IllegalArgumentException needs to be thrown.
+-   */
+-  @Public
+-  @Unstable
+-  public static void validateApplicationAttemptId(String appAttemptId)
+-      throws IllegalArgumentException {
+-
+-    // Make Sure appAttemptId is not empty.
+-    if (appAttemptId == null || appAttemptId.isEmpty()) {
+-      throw new IllegalArgumentException("Parameter error, the appAttemptId is empty or null.");
+-    }
+-
+-    // Make sure the prefix information of appAttemptId is accurate.
+-    if (!appAttemptId.startsWith(APP_ATTEMPT_ID_PREFIX)) {
+-      throw new IllegalArgumentException("Invalid AppAttemptId prefix: " + appAttemptId);
+-    }
+-
+-    // Check the split position of the string.
+-    int pos1 = APP_ATTEMPT_ID_PREFIX.length() - 1;
+-    int pos2 = appAttemptId.indexOf('_', pos1 + 1);
+-    if (pos2 < 0) {
+-      throw new IllegalArgumentException("Invalid AppAttemptId: " + appAttemptId);
+-    }
+-    int pos3 = appAttemptId.indexOf('_', pos2 + 1);
+-    if (pos3 < 0) {
+-      throw new IllegalArgumentException("Invalid AppAttemptId: " + appAttemptId);
+-    }
+-
+-    // Confirm that the parsed rmId and appId and attemptId are numeric types.
+-    String rmId = appAttemptId.substring(pos1 + 1, pos2);
+-    String appId = appAttemptId.substring(pos2 + 1, pos3);
+-    String attemptId = appAttemptId.substring(pos3 + 1);
+-
+-    if (!NumberUtils.isDigits(rmId) || !NumberUtils.isDigits(appId)
+-        || !NumberUtils.isDigits(attemptId)) {
+-      throw new IllegalArgumentException("Invalid AppAttemptId: " + appAttemptId);
+-    }
+-  }
+-
+-  /**
+-   * Check containerId is accurate.
+-   *
+-   * We need to ensure that containerId cannot be empty and
+-   * can be converted to ContainerId object normally.
+-   *
+-   * @param containerId containerId of type string.
+-   * @throws IllegalArgumentException If the format of the appAttemptId is not accurate,
+-   * an IllegalArgumentException needs to be thrown.
+-   */
+-  @Public
+-  @Unstable
+-  public static void validateContainerId(String containerId)
+-      throws IllegalArgumentException {
+-
+-    // Make Sure containerId is not empty.
+-    if (containerId == null || containerId.isEmpty()) {
+-      throw new IllegalArgumentException("Parameter error, the containerId is empty or null.");
+-    }
+-
+-    // Make sure the prefix information of containerId is accurate.
+-    if (!containerId.startsWith(CONTAINER_PREFIX)) {
+-      throw new IllegalArgumentException("Invalid ContainerId prefix: " + containerId);
+-    }
+-
+-    // Check the split position of the string.
+-    int pos1 = CONTAINER_PREFIX.length() - 1;
+-
+-    String epoch = "0";
+-    if (containerId.regionMatches(pos1 + 1, EPOCH_PREFIX, 0, EPOCH_PREFIX.length())) {
+-      int pos2 = containerId.indexOf('_', pos1 + 1);
+-      if (pos2 < 0) {
+-        throw new IllegalArgumentException("Invalid ContainerId: " + containerId);
+-      }
+-      String epochStr = containerId.substring(pos1 + 1 + EPOCH_PREFIX.length(), pos2);
+-      epoch = epochStr;
+-      // rewind the current position
+-      pos1 = pos2;
+-    }
+-
+-    int pos2 = containerId.indexOf('_', pos1 + 1);
+-    if (pos2 < 0) {
+-      throw new IllegalArgumentException("Invalid ContainerId: " + containerId);
+-    }
+-
+-    int pos3 = containerId.indexOf('_', pos2 + 1);
+-    if (pos3 < 0) {
+-      throw new IllegalArgumentException("Invalid ContainerId: " + containerId);
+-    }
+-
+-    int pos4 = containerId.indexOf('_', pos3 + 1);
+-    if (pos4 < 0) {
+-      throw new IllegalArgumentException("Invalid ContainerId: " + containerId);
+-    }
+-
+-    // Confirm that the parsed appId and clusterTimestamp and attemptId and cid and epoch
+-    // are numeric types.
+-    String appId = containerId.substring(pos2 + 1, pos3);
+-    String clusterTimestamp = containerId.substring(pos1 + 1, pos2);
+-    String attemptId = containerId.substring(pos3 + 1, pos4);
+-    String cid = containerId.substring(pos4 + 1);
+-
+-    if (!NumberUtils.isDigits(appId) || !NumberUtils.isDigits(clusterTimestamp)
+-        || !NumberUtils.isDigits(attemptId) || !NumberUtils.isDigits(cid)
+-        || !NumberUtils.isDigits(epoch)) {
+-      throw new IllegalArgumentException("Invalid ContainerId: " + containerId);
+-    }
+-  }
+-
+-  public static boolean isAllowedDelegationTokenOp() throws IOException {
+-    if (UserGroupInformation.isSecurityEnabled()) {
+-      return EnumSet.of(UserGroupInformation.AuthenticationMethod.KERBEROS,
+-          UserGroupInformation.AuthenticationMethod.KERBEROS_SSL,
+-          UserGroupInformation.AuthenticationMethod.CERTIFICATE)
+-          .contains(UserGroupInformation.getCurrentUser()
+-          .getRealAuthenticationMethod());
+-    } else {
+-      return true;
+-    }
+-  }
+-
+-  public static String getRenewerForToken(Token<RMDelegationTokenIdentifier> token)
+-      throws IOException {
+-    UserGroupInformation user = UserGroupInformation.getCurrentUser();
+-    UserGroupInformation loginUser = UserGroupInformation.getLoginUser();
+-    // we can always renew our own tokens
+-    return loginUser.getUserName().equals(user.getUserName())
+-        ? token.decodeIdentifier().getRenewer().toString() : user.getShortUserName();
+-  }
+-
+-  /**
+-   * Set User information.
+-   *
+-   * If the username is empty, we will use the Yarn Router user directly.
+-   * Do not create a proxy user if userName matches the userName on current UGI.
+-   *
+-   * @param userName userName.
+-   * @return UserGroupInformation.
+-   */
+-  public static UserGroupInformation setupUser(final String userName) {
+-    UserGroupInformation user = null;
+-    try {
+-      // If userName is empty, we will return UserGroupInformation.getCurrentUser.
+-      // Do not create a proxy user if user name matches the user name on
+-      // current UGI
+-      if (userName == null || userName.trim().isEmpty()) {
+-        user = UserGroupInformation.getCurrentUser();
+-      } else if (UserGroupInformation.isSecurityEnabled()) {
+-        user = UserGroupInformation.createProxyUser(userName, UserGroupInformation.getLoginUser());
+-      } else if (userName.equalsIgnoreCase(UserGroupInformation.getCurrentUser().getUserName())) {
+-        user = UserGroupInformation.getCurrentUser();
+-      } else {
+-        user = UserGroupInformation.createProxyUser(userName,
+-            UserGroupInformation.getCurrentUser());
+-      }
+-      return user;
+-    } catch (IOException e) {
+-      throw RouterServerUtil.logAndReturnYarnRunTimeException(e,
+-          "Error while creating Router Service for user : %s.", user);
+-    }
+-  }
+-
+-  /**
+-   * Check reservationId is accurate.
+-   *
+-   * We need to ensure that reservationId cannot be empty and
+-   * can be converted to ReservationId object normally.
+-   *
+-   * @param reservationId reservationId.
+-   * @throws IllegalArgumentException If the format of the reservationId is not accurate,
+-   * an IllegalArgumentException needs to be thrown.
+-   */
+-  @Public
+-  @Unstable
+-  public static void validateReservationId(String reservationId) throws IllegalArgumentException {
+-
+-    if (reservationId == null || reservationId.isEmpty()) {
+-      throw new IllegalArgumentException("Parameter error, the reservationId is empty or null.");
+-    }
+-
+-    if (!reservationId.startsWith(RESERVEIDSTR_PREFIX)) {
+-      throw new IllegalArgumentException("Invalid ReservationId: " + reservationId);
+-    }
+-
+-    String[] resFields = reservationId.split("_");
+-    if (resFields.length != 3) {
+-      throw new IllegalArgumentException("Invalid ReservationId: " + reservationId);
+-    }
+-
+-    String clusterTimestamp = resFields[1];
+-    String id = resFields[2];
+-    if (!NumberUtils.isDigits(id) || !NumberUtils.isDigits(clusterTimestamp)) {
+-      throw new IllegalArgumentException("Invalid ReservationId: " + reservationId);
+-    }
+-  }
+-
+-  /**
+-   * Convert ReservationDefinitionInfo to ReservationDefinition.
+-   *
+-   * @param definitionInfo ReservationDefinitionInfo Object.
+-   * @return ReservationDefinition.
+-   */
+-  public static ReservationDefinition convertReservationDefinition(
+-      ReservationDefinitionInfo definitionInfo) {
+-    if (definitionInfo == null || definitionInfo.getReservationRequests() == null
+-        || definitionInfo.getReservationRequests().getReservationRequest() == null
+-        || definitionInfo.getReservationRequests().getReservationRequest().isEmpty()) {
+-      throw new RuntimeException("definitionInfo Or ReservationRequests is Null.");
+-    }
+-
+-    // basic variable
+-    long arrival = definitionInfo.getArrival();
+-    long deadline = definitionInfo.getDeadline();
+-
+-    // ReservationRequests reservationRequests
+-    String name = definitionInfo.getReservationName();
+-    String recurrenceExpression = definitionInfo.getRecurrenceExpression();
+-    Priority priority = Priority.newInstance(definitionInfo.getPriority());
+-
+-    // reservation requests info
+-    List<ReservationRequest> reservationRequestList = new ArrayList<>();
+-
+-    ReservationRequestsInfo reservationRequestsInfo = definitionInfo.getReservationRequests();
+-
+-    List<ReservationRequestInfo> reservationRequestInfos =
+-        reservationRequestsInfo.getReservationRequest();
+-
+-    for (ReservationRequestInfo resRequestInfo : reservationRequestInfos) {
+-      ResourceInfo resourceInfo = resRequestInfo.getCapability();
+-      Resource capability =
+-          Resource.newInstance(resourceInfo.getMemorySize(), resourceInfo.getvCores());
+-      ReservationRequest reservationRequest = ReservationRequest.newInstance(capability,
+-          resRequestInfo.getNumContainers(), resRequestInfo.getMinConcurrency(),
+-          resRequestInfo.getDuration());
+-      reservationRequestList.add(reservationRequest);
+-    }
+-
+-    ReservationRequestInterpreter[] values = ReservationRequestInterpreter.values();
+-    ReservationRequestInterpreter reservationRequestInterpreter =
+-        values[reservationRequestsInfo.getReservationRequestsInterpreter()];
+-    ReservationRequests reservationRequests = ReservationRequests.newInstance(
+-        reservationRequestList, reservationRequestInterpreter);
+-
+-    ReservationDefinition definition = ReservationDefinition.newInstance(
+-        arrival, deadline, reservationRequests, name, recurrenceExpression, priority);
+-
+-    return definition;
+-  }
+-
+-  /**
+-   * Checks if the ApplicationSubmissionContext submitted with the application
+-   * is valid.
+-   *
+-   * Current checks:
+-   * - if its size is within limits.
+-   *
+-   * @param appContext the app context to check.
+-   * @param conf Configuration.
+-   * @throws IOException if an IO error occurred.
+-   * @throws YarnException yarn exception.
+-   */
+-  @Public
+-  @Unstable
+-  public static void checkAppSubmissionContext(ApplicationSubmissionContextPBImpl appContext,
+-      Configuration conf) throws IOException, YarnException {
+-    // Prevents DoS over the ApplicationClientProtocol by checking the context
+-    // the application was submitted with for any excessively large fields.
+-    double bytesOfMaxAscSize = conf.getStorageSize(
+-        YarnConfiguration.ROUTER_ASC_INTERCEPTOR_MAX_SIZE,
+-        YarnConfiguration.DEFAULT_ROUTER_ASC_INTERCEPTOR_MAX_SIZE, StorageUnit.BYTES);
+-    if (appContext != null) {
+-      int bytesOfSerializedSize = appContext.getProto().getSerializedSize();
+-      if (bytesOfSerializedSize >= bytesOfMaxAscSize) {
+-        logContainerLaunchContext(appContext);
+-        String applicationId = appContext.getApplicationId().toString();
+-        String limit = StringUtils.byteDesc((long) bytesOfMaxAscSize);
+-        String appContentSize = StringUtils.byteDesc(bytesOfSerializedSize);
+-        String errMsg = String.format(
+-            "The size of the ApplicationSubmissionContext of the application %s is " +
+-            "above the limit %s, size = %s.", applicationId, limit, appContentSize);
+-        LOG.error(errMsg);
+-        throw new YarnException(errMsg);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Private helper for checkAppSubmissionContext that logs the fields in the
+-   * context for debugging.
+-   *
+-   * @param appContext the app context.
+-   * @throws IOException if an IO error occurred.
+-   */
+-  @Private
+-  @Unstable
+-  private static void logContainerLaunchContext(ApplicationSubmissionContextPBImpl appContext)
+-      throws IOException {
+-    if (appContext == null || appContext.getAMContainerSpec() == null ||
+-        !(appContext.getAMContainerSpec() instanceof ContainerLaunchContextPBImpl)) {
+-      return;
+-    }
+-
+-    ContainerLaunchContext launchContext = appContext.getAMContainerSpec();
+-    ContainerLaunchContextPBImpl clc = (ContainerLaunchContextPBImpl) launchContext;
+-    LOG.warn("ContainerLaunchContext size: {}.", clc.getProto().getSerializedSize());
+-
+-    // ContainerLaunchContext contains:
+-    // 1) Map<String, LocalResource> localResources,
+-    List<StringLocalResourceMapProto> lrs = clc.getProto().getLocalResourcesList();
+-    logContainerLaunchContext("LocalResource size: {}. Length: {}.", lrs);
+-
+-    // 2) Map<String, String> environment, List<String> commands,
+-    List<StringStringMapProto> envs = clc.getProto().getEnvironmentList();
+-    logContainerLaunchContext("Environment size: {}. Length: {}.", envs);
+-
+-    List<String> cmds = clc.getCommands();
+-    if (CollectionUtils.isNotEmpty(cmds)) {
+-      LOG.warn("Commands size: {}. Length: {}.", cmds.size(), serialize(cmds).length);
+-    }
+-
+-    // 3) Map<String, ByteBuffer> serviceData,
+-    List<StringBytesMapProto> serviceData = clc.getProto().getServiceDataList();
+-    logContainerLaunchContext("ServiceData size: {}. Length: {}.", serviceData);
+-
+-    // 4) Map<ApplicationAccessType, String> acls
+-    List<ApplicationACLMapProto> acls = clc.getProto().getApplicationACLsList();
+-    logContainerLaunchContext("ACLs size: {}. Length: {}.", acls);
+-  }
+-
+-  /**
+-   * Log ContainerLaunchContext Data SerializedSize.
+-   *
+-   * @param format format of logging.
+-   * @param lists data list.
+-   * @param <R> generic type R.
+-   */
+-  private static <R extends GeneratedMessageV3> void logContainerLaunchContext(String format,
+-      List<R> lists) {
+-    if (CollectionUtils.isNotEmpty(lists)) {
+-      int sumLength = 0;
+-      for (R item : lists) {
+-        sumLength += item.getSerializedSize();
+-      }
+-      LOG.warn(format, lists.size(), sumLength);
+-    }
+-  }
+-
+-  /**
+-   * Serialize an object in ByteArray.
+-   *
+-   * @return obj ByteArray.
+-   * @throws IOException if an IO error occurred.
+-   */
+-  @Private
+-  @Unstable
+-  private static byte[] serialize(Object obj) throws IOException {
+-    try (ByteArrayOutputStream b = new ByteArrayOutputStream()) {
+-      try (ObjectOutputStream o = new ObjectOutputStream(b)) {
+-        o.writeObject(obj);
+-      }
+-      return b.toByteArray();
+-    }
+-  }
+-
+-  /**
+-   * Get trimmed version of ApplicationSubmissionContext to be saved to
+-   * Federation State Store.
+-   *
+-   * @param actualContext actual ApplicationSubmissionContext.
+-   * @return trimmed ApplicationSubmissionContext.
+-   */
+-  @Private
+-  @Unstable
+-  public static ApplicationSubmissionContext getTrimmedAppSubmissionContext(
+-      ApplicationSubmissionContext actualContext) {
+-    if (actualContext == null) {
+-      return null;
+-    }
+-
+-    // Set Basic information
+-    ApplicationSubmissionContext trimmedContext =
+-        Records.newRecord(ApplicationSubmissionContext.class);
+-    trimmedContext.setApplicationId(actualContext.getApplicationId());
+-    trimmedContext.setApplicationName(actualContext.getApplicationName());
+-    trimmedContext.setQueue(actualContext.getQueue());
+-    trimmedContext.setPriority(actualContext.getPriority());
+-    trimmedContext.setApplicationType(actualContext.getApplicationType());
+-    trimmedContext.setNodeLabelExpression(actualContext.getNodeLabelExpression());
+-    trimmedContext.setLogAggregationContext(actualContext.getLogAggregationContext());
+-    trimmedContext.setApplicationTags(actualContext.getApplicationTags());
+-    trimmedContext.setApplicationSchedulingPropertiesMap(
+-        actualContext.getApplicationSchedulingPropertiesMap());
+-    trimmedContext.setKeepContainersAcrossApplicationAttempts(
+-        actualContext.getKeepContainersAcrossApplicationAttempts());
+-    trimmedContext.setApplicationTimeouts(actualContext.getApplicationTimeouts());
+-
+-    return trimmedContext;
+-  }
+-
+-  public static boolean isRouterWebProxyEnable(Configuration conf) {
+-    return conf.getBoolean(YarnConfiguration.ROUTER_WEBAPP_PROXY_ENABLE,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_PROXY_ENABLE);
+-  }
+-
+-  public static boolean checkPolicyManagerValid(String policyManager,
+-      List<String> supportWeightList) throws YarnException {
+-    if (supportWeightList.contains(policyManager)) {
+-      return true;
+-    }
+-    return false;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/SubClusterCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/SubClusterCleaner.java
+deleted file mode 100644
+index 35e4d7a998e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/SubClusterCleaner.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.cleaner;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.Date;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-
+-/**
+- * The SubClusterCleaner thread is used to check whether the SubCluster
+- * has exceeded the heartbeat time.
+- * If the SubCluster heartbeat time exceeds 30 mins, set the SubCluster to LOST.
+- * Check the thread every 1 mins, check once.
+- */
+-public class SubClusterCleaner implements Runnable {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(SubClusterCleaner.class);
+-  private FederationStateStoreFacade federationFacade;
+-  private long heartbeatExpirationMillis;
+-
+-  public SubClusterCleaner(Configuration conf) {
+-    federationFacade = FederationStateStoreFacade.getInstance(conf);
+-    this.heartbeatExpirationMillis =
+-        conf.getTimeDuration(YarnConfiguration.ROUTER_SUBCLUSTER_EXPIRATION_TIME,
+-        YarnConfiguration.DEFAULT_ROUTER_SUBCLUSTER_EXPIRATION_TIME, TimeUnit.MILLISECONDS);
+-  }
+-
+-  @Override
+-  public void run() {
+-    try {
+-      // Step1. Get Current Time.
+-      Date now = new Date();
+-      LOG.info("SubClusterCleaner at {}.", now);
+-
+-      Map<SubClusterId, SubClusterInfo> subClusters = federationFacade.getSubClusters(true);
+-
+-      for (Map.Entry<SubClusterId, SubClusterInfo> subCluster : subClusters.entrySet()) {
+-        // Step2. Get information about subClusters.
+-        SubClusterId subClusterId = subCluster.getKey();
+-        SubClusterInfo subClusterInfo = subCluster.getValue();
+-        SubClusterState subClusterState = subClusterInfo.getState();
+-        long lastHeartBeatTime = subClusterInfo.getLastHeartBeat();
+-
+-        // We Only Check SubClusters in NEW and RUNNING states
+-        if (subClusterState.isUsable()) {
+-          long heartBeatInterval = now.getTime() - lastHeartBeatTime;
+-          try {
+-            // HeartBeat Interval Exceeds Expiration Time
+-            if (heartBeatInterval > heartbeatExpirationMillis) {
+-              LOG.info("Deregister SubCluster {} in state {} last heartbeat at {}.",
+-                  subClusterId, subClusterState, new Date(lastHeartBeatTime));
+-              federationFacade.deregisterSubCluster(subClusterId, SubClusterState.SC_LOST);
+-            }
+-          } catch (YarnException e) {
+-            LOG.error("deregisterSubCluster failed on SubCluster {}.", subClusterId, e);
+-          }
+-        } else {
+-          LOG.debug("SubCluster {} in state {} last heartbeat at {}, " +
+-              "heartbeat interval < 30mins, no need for Deregister.",
+-              subClusterId, subClusterState, new Date(lastHeartBeatTime));
+-        }
+-      }
+-    } catch (Throwable e) {
+-      LOG.error("SubClusterCleaner Fails.", e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/package-info.java
+deleted file mode 100644
+index 75477508cb1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/cleaner/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router Cleaner package. **/
+-package org.apache.hadoop.yarn.server.router.cleaner;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/AbstractClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/AbstractClientRequestInterceptor.java
+deleted file mode 100644
+index 10ed71b6010..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/AbstractClientRequestInterceptor.java
++++ /dev/null
+@@ -1,114 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Implements the {@link ClientRequestInterceptor} interface and provides common
+- * functionality which can can be used and/or extended by other concrete
+- * interceptor classes.
+- *
+- */
+-public abstract class AbstractClientRequestInterceptor
+-    implements ClientRequestInterceptor {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(AbstractClientRequestInterceptor.class);
+-
+-  private Configuration conf;
+-  private ClientRequestInterceptor nextInterceptor;
+-
+-  @SuppressWarnings("checkstyle:visibilitymodifier")
+-  protected UserGroupInformation user = null;
+-
+-  private RouterDelegationTokenSecretManager tokenSecretManager = null;
+-
+-  /**
+-   * Sets the {@link ClientRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public void setNextInterceptor(ClientRequestInterceptor nextInterceptor) {
+-    this.nextInterceptor = nextInterceptor;
+-  }
+-
+-  /**
+-   * Sets the {@link Configuration}.
+-   */
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.setConf(conf);
+-    }
+-  }
+-
+-  /**
+-   * Gets the {@link Configuration}.
+-   */
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  /**
+-   * Initializes the {@link ClientRequestInterceptor}.
+-   */
+-  @Override
+-  public void init(String userName) {
+-    this.user = RouterServerUtil.setupUser(userName);
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.init(userName);
+-    }
+-  }
+-
+-  /**
+-   * Disposes the {@link ClientRequestInterceptor}.
+-   */
+-  @Override
+-  public void shutdown() {
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.shutdown();
+-    }
+-  }
+-
+-  /**
+-   * Gets the next {@link ClientRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public ClientRequestInterceptor getNextInterceptor() {
+-    return this.nextInterceptor;
+-  }
+-
+-  @Override
+-  public RouterDelegationTokenSecretManager getTokenSecretManager() {
+-    return tokenSecretManager;
+-  }
+-
+-  @Override
+-  public void setTokenSecretManager(RouterDelegationTokenSecretManager tokenSecretManager) {
+-    this.tokenSecretManager = tokenSecretManager;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ApplicationSubmissionContextInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ApplicationSubmissionContextInterceptor.java
+deleted file mode 100644
+index 6ec3fe334d3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ApplicationSubmissionContextInterceptor.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.router.RouterAuditLogger;
+-import org.apache.hadoop.yarn.server.router.RouterMetrics;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SUBMIT_NEW_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.TARGET_CLIENT_RM_SERVICE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UNKNOWN;
+-
+-/**
+- * It prevents DoS attack over the ApplicationClientProtocol. Currently, it
+- * checks the size of the ApplicationSubmissionContext. If it exceeds the limit
+- * it can cause Zookeeper failures.
+- */
+-public class ApplicationSubmissionContextInterceptor extends PassThroughClientRequestInterceptor {
+-
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getApplicationSubmissionContext() == null ||
+-        request.getApplicationSubmissionContext().getApplicationId() == null) {
+-      RouterMetrics.getMetrics().incrAppsFailedSubmitted();
+-      String errMsg =
+-          "Missing submitApplication request or applicationSubmissionContext information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg);
+-      RouterServerUtil.logAndThrowException(errMsg, null);
+-    }
+-
+-    ApplicationSubmissionContext appContext = request.getApplicationSubmissionContext();
+-    ApplicationSubmissionContextPBImpl asc = (ApplicationSubmissionContextPBImpl) appContext;
+-
+-    // Check for excessively large fields, throw exception if found
+-    RouterServerUtil.checkAppSubmissionContext(asc, getConf());
+-
+-    // Check succeeded - app submit will be passed on to the next interceptor
+-    return getNextInterceptor().submitApplication(request);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientMethod.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientMethod.java
+deleted file mode 100644
+index 126cf1d1207..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientMethod.java
++++ /dev/null
+@@ -1,71 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-import java.util.Arrays;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Class to define client method,params and arguments.
+- */
+-public class ClientMethod {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(ClientMethod.class);
+-  /**
+-   * List of parameters: static and dynamic values, matchings types.
+-   */
+-  private final Object[] params;
+-  /**
+-   * List of method parameters types, matches parameters.
+-   */
+-  private final Class<?>[] types;
+-  /**
+-   * String name of the method.
+-   */
+-  private final String methodName;
+-
+-  public ClientMethod(String method, Class<?>[] pTypes, Object... pParams)
+-      throws IOException {
+-    if (pParams.length != pTypes.length) {
+-      throw new IOException("Invalid parameters for method " + method);
+-    }
+-
+-    this.params = pParams;
+-    this.types = Arrays.copyOf(pTypes, pTypes.length);
+-    this.methodName = method;
+-  }
+-
+-  public Object[] getParams() {
+-    return Arrays.copyOf(this.params, this.params.length);
+-  }
+-
+-  public String getMethodName() {
+-    return methodName;
+-  }
+-
+-  /**
+-   * Get the calling types for this method.
+-   *
+-   * @return An array of calling types.
+-   */
+-  public Class<?>[] getTypes() {
+-    return Arrays.copyOf(this.types, this.types.length);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientRequestInterceptor.java
+deleted file mode 100644
+index 6e19cbadf9d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/ClientRequestInterceptor.java
++++ /dev/null
+@@ -1,80 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-
+-/**
+- * Defines the contract to be implemented by the request interceptor classes,
+- * that can be used to intercept and inspect messages sent from the client to
+- * the resource manager.
+- */
+-public interface ClientRequestInterceptor
+-    extends ApplicationClientProtocol, Configurable {
+-  /**
+-   * This method is called for initializing the interceptor. This is guaranteed
+-   * to be called only once in the lifetime of this instance.
+-   *
+-   * @param user the name of the client
+-   */
+-  void init(String user);
+-
+-  /**
+-   * This method is called to release the resources held by the interceptor.
+-   * This will be called when the application pipeline is being destroyed. The
+-   * concrete implementations should dispose the resources and forward the
+-   * request to the next interceptor, if any.
+-   */
+-  void shutdown();
+-
+-  /**
+-   * Sets the next interceptor in the pipeline. The concrete implementation of
+-   * this interface should always pass the request to the nextInterceptor after
+-   * inspecting the message. The last interceptor in the chain is responsible to
+-   * send the messages to the resource manager service and so the last
+-   * interceptor will not receive this method call.
+-   *
+-   * @param nextInterceptor the ClientRequestInterceptor to set in the pipeline
+-   */
+-  void setNextInterceptor(ClientRequestInterceptor nextInterceptor);
+-
+-  /**
+-   * Returns the next interceptor in the chain.
+-   *
+-   * @return the next interceptor in the chain
+-   */
+-  ClientRequestInterceptor getNextInterceptor();
+-
+-  /**
+-   * Set RouterDelegationTokenSecretManager for specific interceptor to support Token operations,
+-   * including create Token, update Token, and delete Token.
+-   *
+-   * @param tokenSecretManager Router DelegationTokenSecretManager
+-   */
+-  void setTokenSecretManager(RouterDelegationTokenSecretManager tokenSecretManager);
+-
+-  /**
+-   * Get RouterDelegationTokenSecretManager.
+-   *
+-   * @return Router DelegationTokenSecretManager.
+-   */
+-  RouterDelegationTokenSecretManager getTokenSecretManager();
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/DefaultClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/DefaultClientRequestInterceptor.java
+deleted file mode 100644
+index e7cc024b640..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/DefaultClientRequestInterceptor.java
++++ /dev/null
+@@ -1,362 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.client.ClientRMProxy;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Extends the {@code AbstractRequestInterceptorClient} class and provides an
+- * implementation that simply forwards the client requests to the cluster
+- * resource manager.
+- *
+- */
+-public class DefaultClientRequestInterceptor
+-    extends AbstractClientRequestInterceptor {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DefaultClientRequestInterceptor.class);
+-  private ApplicationClientProtocol clientRMProxy;
+-
+-  @Override
+-  public void init(String userName) {
+-    super.init(userName);
+-    try {
+-      final Configuration conf = this.getConf();
+-      clientRMProxy = user.doAs(
+-          (PrivilegedExceptionAction<ApplicationClientProtocol>) () ->
+-               ClientRMProxy.createRMProxy(conf, ApplicationClientProtocol.class));
+-    } catch (Exception e) {
+-      StringBuilder message = new StringBuilder();
+-      message.append("Error while creating Router RMClient Service");
+-      if (user != null) {
+-        message.append(", user: " + user);
+-      }
+-      LOG.error(message.toString(), e);
+-      throw new YarnRuntimeException(message.toString(), e);
+-    }
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(ClientRequestInterceptor next) {
+-    throw new YarnRuntimeException(
+-        "setNextInterceptor is being called on DefaultRequestInterceptor,"
+-            + "which should be the last one in the chain "
+-            + "Check if the interceptor pipeline configuration is correct");
+-  }
+-
+-  @Override
+-  public GetNewApplicationResponse getNewApplication(
+-      GetNewApplicationRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getNewApplication(request);
+-  }
+-
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-    return clientRMProxy.submitApplication(request);
+-  }
+-
+-  @Override
+-  public KillApplicationResponse forceKillApplication(
+-      KillApplicationRequest request) throws YarnException, IOException {
+-    return clientRMProxy.forceKillApplication(request);
+-  }
+-
+-  @Override
+-  public GetClusterMetricsResponse getClusterMetrics(
+-      GetClusterMetricsRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getClusterMetrics(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getClusterNodes(request);
+-  }
+-
+-  @Override
+-  public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getQueueInfo(request);
+-  }
+-
+-  @Override
+-  public GetQueueUserAclsInfoResponse getQueueUserAcls(
+-      GetQueueUserAclsInfoRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getQueueUserAcls(request);
+-  }
+-
+-  @Override
+-  public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      MoveApplicationAcrossQueuesRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.moveApplicationAcrossQueues(request);
+-  }
+-
+-  @Override
+-  public GetNewReservationResponse getNewReservation(
+-      GetNewReservationRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getNewReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationSubmissionResponse submitReservation(
+-      ReservationSubmissionRequest request) throws YarnException, IOException {
+-    return clientRMProxy.submitReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationListResponse listReservations(
+-      ReservationListRequest request) throws YarnException, IOException {
+-    return clientRMProxy.listReservations(request);
+-  }
+-
+-  @Override
+-  public ReservationUpdateResponse updateReservation(
+-      ReservationUpdateRequest request) throws YarnException, IOException {
+-    return clientRMProxy.updateReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationDeleteResponse deleteReservation(
+-      ReservationDeleteRequest request) throws YarnException, IOException {
+-    return clientRMProxy.deleteReservation(request);
+-  }
+-
+-  @Override
+-  public GetNodesToLabelsResponse getNodeToLabels(
+-      GetNodesToLabelsRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getNodeToLabels(request);
+-  }
+-
+-  @Override
+-  public GetLabelsToNodesResponse getLabelsToNodes(
+-      GetLabelsToNodesRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getLabelsToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeLabelsResponse getClusterNodeLabels(
+-      GetClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public GetApplicationReportResponse getApplicationReport(
+-      GetApplicationReportRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getApplicationReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationsResponse getApplications(GetApplicationsRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getApplications(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      GetApplicationAttemptReportRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getApplicationAttemptReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptsResponse getApplicationAttempts(
+-      GetApplicationAttemptsRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getApplicationAttempts(request);
+-  }
+-
+-  @Override
+-  public GetContainerReportResponse getContainerReport(
+-      GetContainerReportRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getContainerReport(request);
+-  }
+-
+-  @Override
+-  public GetContainersResponse getContainers(GetContainersRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getContainers(request);
+-  }
+-
+-  @Override
+-  public GetDelegationTokenResponse getDelegationToken(
+-      GetDelegationTokenRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getDelegationToken(request);
+-  }
+-
+-  @Override
+-  public RenewDelegationTokenResponse renewDelegationToken(
+-      RenewDelegationTokenRequest request) throws YarnException, IOException {
+-    return clientRMProxy.renewDelegationToken(request);
+-  }
+-
+-  @Override
+-  public CancelDelegationTokenResponse cancelDelegationToken(
+-      CancelDelegationTokenRequest request) throws YarnException, IOException {
+-    return clientRMProxy.cancelDelegationToken(request);
+-  }
+-
+-  @Override
+-  public FailApplicationAttemptResponse failApplicationAttempt(
+-      FailApplicationAttemptRequest request) throws YarnException, IOException {
+-    return clientRMProxy.failApplicationAttempt(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationPriorityResponse updateApplicationPriority(
+-      UpdateApplicationPriorityRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.updateApplicationPriority(request);
+-  }
+-
+-  @Override
+-  public SignalContainerResponse signalToContainer(
+-      SignalContainerRequest request) throws YarnException, IOException {
+-    return clientRMProxy.signalToContainer(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
+-      UpdateApplicationTimeoutsRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.updateApplicationTimeouts(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceProfilesResponse getResourceProfiles(
+-      GetAllResourceProfilesRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getResourceProfiles(request);
+-  }
+-
+-  @Override
+-  public GetResourceProfileResponse getResourceProfile(
+-      GetResourceProfileRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getResourceProfile(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceTypeInfoResponse getResourceTypeInfo(
+-      GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getResourceTypeInfo(request);
+-  }
+-
+-  @Override
+-  public GetAttributesToNodesResponse getAttributesToNodes(
+-      GetAttributesToNodesRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeAttributesResponse getClusterNodeAttributes(
+-      GetClusterNodeAttributesRequest request)
+-      throws YarnException, IOException {
+-    return clientRMProxy.getClusterNodeAttributes(request);
+-  }
+-
+-  @Override
+-  public GetNodesToAttributesResponse getNodesToAttributes(
+-      GetNodesToAttributesRequest request) throws YarnException, IOException {
+-    return clientRMProxy.getNodesToAttributes(request);
+-  }
+-
+-  @VisibleForTesting
+-  public void setRMClient(ApplicationClientProtocol clientRM) {
+-    this.clientRMProxy = clientRM;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
+deleted file mode 100644
+index ab0e1b345e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/FederationClientInterceptor.java
++++ /dev/null
+@@ -1,2365 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.commons.lang3.tuple.Pair;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import java.io.IOException;
+-import java.lang.reflect.Method;
+-import java.lang.reflect.InvocationTargetException;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.TreeMap;
+-import java.util.concurrent.BlockingQueue;
+-import java.util.concurrent.Callable;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-import java.util.concurrent.ExecutionException;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.LinkedBlockingQueue;
+-import java.util.concurrent.ThreadFactory;
+-import java.util.concurrent.ThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.federation.failover.FederationProxyProviderUtil;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
+-import org.apache.hadoop.yarn.server.federation.policies.RouterPolicyFacade;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
+-import org.apache.hadoop.yarn.server.federation.retry.FederationActionRetry;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.store.records.ReservationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.RouterAuditLogger;
+-import org.apache.hadoop.yarn.server.router.RouterMetrics;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.util.Clock;
+-import org.apache.hadoop.yarn.util.MonotonicClock;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NEW_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SUBMIT_NEW_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APP_REPORT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.FORCE_KILL_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.TARGET_CLIENT_RM_SERVICE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UNKNOWN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERNODES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_QUEUE_USER_ACLS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPLICATIONS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERMETRICS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_QUEUEINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.MOVE_APPLICATION_ACROSS_QUEUES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NEW_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SUBMIT_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.LIST_RESERVATIONS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.DELETE_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NODETOLABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_LABELSTONODES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERNODELABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPLICATION_ATTEMPT_REPORT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPLICATION_ATTEMPTS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CONTAINERREPORT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CONTAINERS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_DELEGATIONTOKEN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.RENEW_DELEGATIONTOKEN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.CANCEL_DELEGATIONTOKEN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.FAIL_APPLICATIONATTEMPT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_APPLICATIONPRIORITY;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SIGNAL_TOCONTAINER;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_APPLICATIONTIMEOUTS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_RESOURCEPROFILES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_RESOURCEPROFILE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_RESOURCETYPEINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_ATTRIBUTESTONODES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERNODEATTRIBUTES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NODESTOATTRIBUTES;
+-
+-/**
+- * Extends the {@code AbstractRequestInterceptorClient} class and provides an
+- * implementation for federation of YARN RM and scaling an application across
+- * multiple YARN SubClusters. All the federation specific implementation is
+- * encapsulated in this class. This is always the last interceptor in the chain.
+- */
+-public class FederationClientInterceptor
+-    extends AbstractClientRequestInterceptor {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(FederationClientInterceptor.class);
+-
+-  private int numSubmitRetries;
+-  private Map<SubClusterId, ApplicationClientProtocol> clientRMProxies;
+-  private FederationStateStoreFacade federationFacade;
+-  private Random rand;
+-  private RouterPolicyFacade policyFacade;
+-  private RouterMetrics routerMetrics;
+-  private ThreadPoolExecutor executorService;
+-  private final Clock clock = new MonotonicClock();
+-  private boolean returnPartialReport;
+-  private long submitIntervalTime;
+-  private boolean allowPartialResult;
+-
+-  @Override
+-  public void init(String userName) {
+-    super.init(userName);
+-
+-    federationFacade = FederationStateStoreFacade.getInstance(getConf());
+-    rand = new Random(System.currentTimeMillis());
+-
+-    int numMinThreads = getNumMinThreads(getConf());
+-
+-    int numMaxThreads = getNumMaxThreads(getConf());
+-
+-    long keepAliveTime = getConf().getTimeDuration(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_KEEP_ALIVE_TIME,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_KEEP_ALIVE_TIME, TimeUnit.SECONDS);
+-
+-    ThreadFactory threadFactory = new ThreadFactoryBuilder()
+-        .setNameFormat("RPC Router Client-" + userName + "-%d ").build();
+-
+-    BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
+-    this.executorService = new ThreadPoolExecutor(numMinThreads, numMaxThreads,
+-        keepAliveTime, TimeUnit.MILLISECONDS, workQueue, threadFactory);
+-
+-    // Adding this line so that unused user threads will exit and be cleaned up if idle for too long
+-    boolean allowCoreThreadTimeOut =  getConf().getBoolean(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_ALLOW_CORE_THREAD_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_ALLOW_CORE_THREAD_TIMEOUT);
+-
+-    if (keepAliveTime > 0 && allowCoreThreadTimeOut) {
+-      this.executorService.allowCoreThreadTimeOut(allowCoreThreadTimeOut);
+-    }
+-
+-    final Configuration conf = this.getConf();
+-
+-    try {
+-      policyFacade = new RouterPolicyFacade(conf, federationFacade,
+-          this.federationFacade.getSubClusterResolver(), null);
+-    } catch (FederationPolicyInitializationException e) {
+-      LOG.error(e.getMessage());
+-    }
+-
+-    numSubmitRetries = conf.getInt(
+-        YarnConfiguration.ROUTER_CLIENTRM_SUBMIT_RETRY,
+-        YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_SUBMIT_RETRY);
+-
+-    submitIntervalTime = conf.getTimeDuration(
+-        YarnConfiguration.ROUTER_CLIENTRM_SUBMIT_INTERVAL_TIME,
+-        YarnConfiguration.DEFAULT_CLIENTRM_SUBMIT_INTERVAL_TIME, TimeUnit.MILLISECONDS);
+-
+-    clientRMProxies = new ConcurrentHashMap<>();
+-    routerMetrics = RouterMetrics.getMetrics();
+-
+-    returnPartialReport = conf.getBoolean(
+-        YarnConfiguration.ROUTER_CLIENTRM_PARTIAL_RESULTS_ENABLED,
+-        YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_PARTIAL_RESULTS_ENABLED);
+-
+-    allowPartialResult = conf.getBoolean(
+-        YarnConfiguration.ROUTER_INTERCEPTOR_ALLOW_PARTIAL_RESULT_ENABLED,
+-        YarnConfiguration.DEFAULT_ROUTER_INTERCEPTOR_ALLOW_PARTIAL_RESULT_ENABLED);
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(ClientRequestInterceptor next) {
+-    throw new YarnRuntimeException("setNextInterceptor is being called on "
+-        + "FederationClientRequestInterceptor, which should be the last one "
+-        + "in the chain. Check if the interceptor pipeline configuration "
+-        + "is correct");
+-  }
+-
+-  @VisibleForTesting
+-  protected ApplicationClientProtocol getClientRMProxyForSubCluster(
+-      SubClusterId subClusterId) throws YarnException {
+-
+-    if (clientRMProxies.containsKey(subClusterId)) {
+-      return clientRMProxies.get(subClusterId);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = null;
+-    try {
+-      boolean serviceAuthEnabled = getConf().getBoolean(
+-          CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, false);
+-      UserGroupInformation realUser = user;
+-      if (serviceAuthEnabled) {
+-        realUser = UserGroupInformation.createProxyUser(
+-            user.getShortUserName(), UserGroupInformation.getLoginUser());
+-      }
+-      clientRMProxy = FederationProxyProviderUtil.createRMProxy(getConf(),
+-          ApplicationClientProtocol.class, subClusterId, realUser);
+-    } catch (Exception e) {
+-      RouterServerUtil.logAndThrowException(
+-          "Unable to create the interface to reach the SubCluster " + subClusterId, e);
+-    }
+-    clientRMProxies.put(subClusterId, clientRMProxy);
+-    return clientRMProxy;
+-  }
+-
+-  private SubClusterId getRandomActiveSubCluster(
+-      Map<SubClusterId, SubClusterInfo> activeSubClusters) throws YarnException {
+-    if (activeSubClusters == null || activeSubClusters.isEmpty()) {
+-      RouterServerUtil.logAndThrowException(
+-          FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE, null);
+-    }
+-    List<SubClusterId> list = new ArrayList<>(activeSubClusters.keySet());
+-    return list.get(rand.nextInt(list.size()));
+-  }
+-
+-  /**
+-   * YARN Router forwards every getNewApplication requests to any RM. During
+-   * this operation there will be no communication with the State Store. The
+-   * Router will forward the requests to any SubCluster. The Router will retry
+-   * to submit the request on #numSubmitRetries different SubClusters. The
+-   * SubClusters are randomly chosen from the active ones.
+-   *
+-   * Possible failures and behaviors:
+-   *
+-   * Client: identical behavior as {@code ClientRMService}.
+-   *
+-   * Router: the Client will timeout and resubmit.
+-   *
+-   * ResourceManager: the Router will timeout and contacts another RM.
+-   *
+-   * StateStore: not in the execution.
+-   */
+-  @Override
+-  public GetNewApplicationResponse getNewApplication(
+-      GetNewApplicationRequest request) throws YarnException, IOException {
+-
+-    if (request == null) {
+-      routerMetrics.incrAppsFailedCreated();
+-      String errMsg = "Missing getNewApplication request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg);
+-      RouterServerUtil.logAndThrowException(errMsg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    Map<SubClusterId, SubClusterInfo> subClustersActive =
+-        federationFacade.getSubClusters(true);
+-
+-    // Try calling the getNewApplication method
+-    List<SubClusterId> blacklist = new ArrayList<>();
+-    int activeSubClustersCount = federationFacade.getActiveSubClustersCount();
+-    int actualRetryNums = Math.min(activeSubClustersCount, numSubmitRetries);
+-
+-    try {
+-      GetNewApplicationResponse response =
+-          ((FederationActionRetry<GetNewApplicationResponse>) (retryCount) ->
+-          invokeGetNewApplication(subClustersActive, blacklist, request, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededAppsCreated(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedCreated();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, e.getMessage());
+-      RouterServerUtil.logAndThrowException(e.getMessage(), e);
+-    }
+-
+-    routerMetrics.incrAppsFailedCreated();
+-    String errMsg = "Failed to create a new application.";
+-    RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_APP, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, errMsg);
+-    throw new YarnException(errMsg);
+-  }
+-
+-  /**
+-   * Invoke GetNewApplication to different subClusters.
+-   *
+-   * @param subClustersActive Active SubClusters
+-   * @param blackList Blacklist avoid repeated calls to unavailable subCluster.
+-   * @param request getNewApplicationRequest.
+-   * @param retryCount number of retries.
+-   * @return Get NewApplicationResponse response, If the response is empty, the request fails,
+-   * if the response is not empty, the request is successful.
+-   * @throws YarnException yarn exception.
+-   * @throws IOException io error.
+-   */
+-  private GetNewApplicationResponse invokeGetNewApplication(
+-      Map<SubClusterId, SubClusterInfo> subClustersActive,
+-      List<SubClusterId> blackList, GetNewApplicationRequest request, int retryCount)
+-      throws YarnException, IOException {
+-    SubClusterId subClusterId =
+-        federationFacade.getRandomActiveSubCluster(subClustersActive, blackList);
+-    LOG.info("getNewApplication try #{} on SubCluster {}.", retryCount, subClusterId);
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    try {
+-      GetNewApplicationResponse response = clientRMProxy.getNewApplication(request);
+-      if (response != null) {
+-        RouterAuditLogger.logSuccess(user.getShortUserName(), GET_NEW_APP,
+-            TARGET_CLIENT_RM_SERVICE, response.getApplicationId(), subClusterId);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, e.getMessage(), subClusterId);
+-      LOG.warn("Unable to create a new ApplicationId in SubCluster {}.", subClusterId.getId(), e);
+-      blackList.add(subClusterId);
+-      throw e;
+-    }
+-    // If SubmitApplicationResponse is empty, the request fails.
+-    String msg = String.format("Unable to create a new ApplicationId in SubCluster %s.",
+-        subClusterId.getId());
+-    throw new YarnException(msg);
+-  }
+-
+-  /**
+-   * Today, in YARN there are no checks of any applicationId submitted.
+-   *
+-   * Base scenarios:
+-   *
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into
+-   * StateStore with the selected SubCluster (e.g. SC1) and the appId. The
+-   * State Store replies with the selected SubCluster (e.g. SC1). The Router
+-   * submits the request to the selected SubCluster.
+-   *
+-   * In case of State Store failure:
+-   *
+-   * The client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. Due to the
+-   * State Store down the Router times out and it will retry depending on the
+-   * FederationFacade settings. The Router replies to the client with an error
+-   * message.
+-   *
+-   * If State Store fails after inserting the tuple: identical behavior as
+-   * {@code ClientRMService}.
+-   *
+-   * In case of Router failure:
+-   *
+-   * Scenario 1 – Crash before submission to the ResourceManager
+-   *
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * crashes. The Client timeouts and resubmits the application. The Router
+-   * selects one SubCluster to forward the request. The Router inserts a tuple
+-   * into State Store with the selected SubCluster (e.g. SC2) and the appId.
+-   * Because the tuple is already inserted in the State Store, it returns the
+-   * previous selected SubCluster (e.g. SC1). The Router submits the request
+-   * to the selected SubCluster (e.g. SC1).
+-   *
+-   * Scenario 2 – Crash after submission to the ResourceManager
+-   *
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * submits the request to the selected SubCluster. The Router crashes. The
+-   * Client timeouts and resubmit the application. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC2) and the appId. The State
+-   * Store replies with the selected SubCluster (e.g. SC1). The Router submits
+-   * the request to the selected SubCluster (e.g. SC1). When a client re-submits
+-   * the same application to the same RM, it does not raise an exception and
+-   * replies with operation successful message.
+-   *
+-   * In case of Client failure: identical behavior as {@code ClientRMService}.
+-   *
+-   * In case of ResourceManager failure:
+-   *
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * submits the request to the selected SubCluster. The entire SubCluster is
+-   * down – all the RMs in HA or the master RM is not reachable. The Router
+-   * times out. The Router selects a new SubCluster to forward the request.
+-   * The Router update a tuple into State Store with the selected SubCluster
+-   * (e.g. SC2) and the appId. The State Store replies with OK answer. The
+-   * Router submits the request to the selected SubCluster (e.g. SC2).
+-   */
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getApplicationSubmissionContext() == null
+-        || request.getApplicationSubmissionContext().getApplicationId() == null) {
+-      routerMetrics.incrAppsFailedSubmitted();
+-      String errMsg =
+-          "Missing submitApplication request or applicationSubmissionContext information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg);
+-      RouterServerUtil.logAndThrowException(errMsg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ApplicationId applicationId =
+-        request.getApplicationSubmissionContext().getApplicationId();
+-    List<SubClusterId> blacklist = new ArrayList<>();
+-
+-    try {
+-
+-      // We need to handle this situation,
+-      // the user will provide us with an expected submitRetries,
+-      // but if the number of Active SubClusters is less than this number at this time,
+-      // we should provide a high number of retry according to the number of Active SubClusters.
+-      int activeSubClustersCount = federationFacade.getActiveSubClustersCount();
+-      int actualRetryNums = Math.min(activeSubClustersCount, numSubmitRetries);
+-
+-      // Try calling the SubmitApplication method
+-      SubmitApplicationResponse response =
+-          ((FederationActionRetry<SubmitApplicationResponse>) (retryCount) ->
+-          invokeSubmitApplication(blacklist, request, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededAppsSubmitted(stopTime - startTime);
+-        return response;
+-      }
+-
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedSubmitted();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, e.getMessage(), applicationId);
+-      RouterServerUtil.logAndThrowException(e.getMessage(), e);
+-    }
+-
+-    routerMetrics.incrAppsFailedSubmitted();
+-    String msg = String.format("Application %s with appId %s failed to be submitted.",
+-        request.getApplicationSubmissionContext().getApplicationName(), applicationId);
+-    RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, msg, applicationId);
+-    throw new YarnException(msg);
+-  }
+-
+-  /**
+-   * Invoke SubmitApplication to different subClusters.
+-   *
+-   * Step1. Select homeSubCluster for Application according to Policy.
+-   *
+-   * Step2. Query homeSubCluster according to ApplicationId,
+-   * if homeSubCluster does not exist or first attempt(consider repeated submissions), write;
+-   * if homeSubCluster exists, update.
+-   *
+-   * Step3. Find the clientRMProxy of the corresponding cluster according to homeSubCluster,
+-   * and then call the SubmitApplication method.
+-   *
+-   * Step4. If SubmitApplicationResponse is empty, the request fails,
+-   * if SubmitApplicationResponse is not empty, the request is successful.
+-   *
+-   * @param blackList Blacklist avoid repeated calls to unavailable subCluster.
+-   * @param request submitApplicationRequest.
+-   * @param retryCount number of retries.
+-   * @return submitApplication response, If the response is empty, the request fails,
+-   *      if the response is not empty, the request is successful.
+-   * @throws YarnException yarn exception.
+-   */
+-  private SubmitApplicationResponse invokeSubmitApplication(
+-      List<SubClusterId> blackList, SubmitApplicationRequest request, int retryCount)
+-      throws YarnException, IOException {
+-
+-    // The request is not checked here,
+-    // because the request has been checked before the method is called.
+-    // We get applicationId and subClusterId from context.
+-    ApplicationSubmissionContext appSubmissionContext = request.getApplicationSubmissionContext();
+-    ApplicationId applicationId = appSubmissionContext.getApplicationId();
+-    SubClusterId subClusterId = null;
+-
+-    try {
+-
+-      // Step1. Select homeSubCluster for Application according to Policy.
+-      subClusterId = policyFacade.getHomeSubcluster(appSubmissionContext, blackList);
+-      LOG.info("submitApplication appId {} try #{} on SubCluster {}.",
+-          applicationId, retryCount, subClusterId);
+-
+-      // Step2. We Store the mapping relationship
+-      // between Application and HomeSubCluster in stateStore.
+-      ApplicationSubmissionContext trimmedAppSubmissionContext =
+-          RouterServerUtil.getTrimmedAppSubmissionContext(appSubmissionContext);
+-      federationFacade.addOrUpdateApplicationHomeSubCluster(
+-          applicationId, subClusterId, retryCount, trimmedAppSubmissionContext);
+-
+-      // Step3. SubmitApplication to the subCluster
+-      ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-      SubmitApplicationResponse response = clientRMProxy.submitApplication(request);
+-
+-      // Step4. if SubmitApplicationResponse is not empty, the request is successful.
+-      if (response != null) {
+-        LOG.info("Application {} submitted on subCluster {}.", applicationId, subClusterId);
+-        RouterAuditLogger.logSuccess(user.getShortUserName(), SUBMIT_NEW_APP,
+-            TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, e.getMessage(), applicationId, subClusterId);
+-      LOG.warn("Unable to submitApplication appId {} try #{} on SubCluster {}.",
+-          applicationId, retryCount, subClusterId, e);
+-      if (subClusterId != null) {
+-        blackList.add(subClusterId);
+-      }
+-      throw e;
+-    }
+-
+-    // If SubmitApplicationResponse is empty, the request fails.
+-    String msg = String.format("Application %s failed to be submitted.", applicationId);
+-    throw new YarnException(msg);
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   *
+-   * Possible failures and behaviors:
+-   *
+-   * Client: identical behavior as {@code ClientRMService}.
+-   *
+-   * Router: the Client will timeout and resubmit the request.
+-   *
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   *
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public KillApplicationResponse forceKillApplication(
+-      KillApplicationRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getApplicationId() == null) {
+-      routerMetrics.incrAppsFailedKilled();
+-      String msg = "Missing forceKillApplication request or ApplicationId.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FORCE_KILL_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-
+-    ApplicationId applicationId = request.getApplicationId();
+-    SubClusterId subClusterId = null;
+-
+-    try {
+-      subClusterId = federationFacade
+-          .getApplicationHomeSubCluster(request.getApplicationId());
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppsFailedKilled();
+-      String msg =
+-          String.format("Application %s does not exist in FederationStateStore.", applicationId);
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FORCE_KILL_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg, applicationId);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy =
+-        getClientRMProxyForSubCluster(subClusterId);
+-
+-    KillApplicationResponse response = null;
+-    try {
+-      LOG.info("forceKillApplication {} on SubCluster {}.", applicationId, subClusterId);
+-      response = clientRMProxy.forceKillApplication(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedKilled();
+-      String msg = "Unable to kill the application report.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FORCE_KILL_APP, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg, applicationId, subClusterId);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to kill the application {} to SubCluster {}.",
+-          applicationId, subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededAppsKilled(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), FORCE_KILL_APP,
+-        TARGET_CLIENT_RM_SERVICE, applicationId);
+-    return response;
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   *
+-   * Possible failure:
+-   *
+-   * Client: identical behavior as {@code ClientRMService}.
+-   *
+-   * Router: the Client will timeout and resubmit the request.
+-   *
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   *
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public GetApplicationReportResponse getApplicationReport(
+-      GetApplicationReportRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getApplicationId() == null) {
+-      routerMetrics.incrAppsFailedRetrieved();
+-      String errMsg = "Missing getApplicationReport request or applicationId information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APP_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg);
+-      RouterServerUtil.logAndThrowException(errMsg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-
+-    try {
+-      subClusterId = federationFacade
+-          .getApplicationHomeSubCluster(request.getApplicationId());
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppsFailedRetrieved();
+-      String errMsg = String.format("Application %s does not exist in FederationStateStore.",
+-          request.getApplicationId());
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APP_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg, request.getApplicationId());
+-      RouterServerUtil.logAndThrowException(errMsg, e);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy =
+-        getClientRMProxyForSubCluster(subClusterId);
+-    GetApplicationReportResponse response = null;
+-
+-    try {
+-      response = clientRMProxy.getApplicationReport(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedRetrieved();
+-      String errMsg = String.format("Unable to get the application report for %s to SubCluster %s.",
+-          request.getApplicationId(), subClusterId.getId());
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APP_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg, request.getApplicationId(), subClusterId);
+-      RouterServerUtil.logAndThrowException(errMsg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the report of "
+-          + "the application {} to SubCluster {}.",
+-          request.getApplicationId(), subClusterId.getId());
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededAppsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_APP_REPORT,
+-        TARGET_CLIENT_RM_SERVICE, request.getApplicationId());
+-    return response;
+-  }
+-
+-  /**
+-   * The Yarn Router will forward the request to all the Yarn RMs in parallel,
+-   * after that it will group all the ApplicationReports by the ApplicationId.
+-   *
+-   * Possible failure:
+-   *
+-   * Client: identical behavior as {@code ClientRMService}.
+-   *
+-   * Router: the Client will timeout and resubmit the request.
+-   *
+-   * ResourceManager: the Router calls each Yarn RM in parallel. In case a
+-   * Yarn RM fails, a single call will timeout. However, the Router will
+-   * merge the ApplicationReports it got, and provides a partial list to
+-   * the client.
+-   *
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public GetApplicationsResponse getApplications(GetApplicationsRequest request)
+-      throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrMultipleAppsFailedRetrieved();
+-      String msg = "Missing getApplications request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATIONS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getApplications",
+-        new Class[] {GetApplicationsRequest.class}, new Object[] {request});
+-    Collection<GetApplicationsResponse> applications = null;
+-    try {
+-      applications = invokeConcurrent(remoteMethod, GetApplicationsResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrMultipleAppsFailedRetrieved();
+-      String msg = "Unable to get applications due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATIONS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededMultipleAppsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_APPLICATIONS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the Application Reports
+-    return RouterYarnClientUtils.mergeApplications(applications, returnPartialReport);
+-  }
+-
+-  @Override
+-  public GetClusterMetricsResponse getClusterMetrics(
+-      GetClusterMetricsRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrGetClusterMetricsFailedRetrieved();
+-      String msg = "Missing getApplications request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERMETRICS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getClusterMetrics",
+-        new Class[] {GetClusterMetricsRequest.class}, new Object[] {request});
+-    Collection<GetClusterMetricsResponse> clusterMetrics = null;
+-    try {
+-      clusterMetrics = invokeConcurrent(remoteMethod, GetClusterMetricsResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetClusterMetricsFailedRetrieved();
+-      String msg = "Unable to get cluster metrics due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERMETRICS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetClusterMetricsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CLUSTERMETRICS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.merge(clusterMetrics);
+-  }
+-
+-  <R> Collection<R> invokeConcurrent(ClientMethod request, Class<R> clazz)
+-      throws YarnException {
+-
+-    // Get Active SubClusters
+-    Map<SubClusterId, SubClusterInfo> subClusterInfo = federationFacade.getSubClusters(true);
+-    Collection<SubClusterId> subClusterIds = subClusterInfo.keySet();
+-
+-    List<Callable<Pair<SubClusterId, Object>>> callables = new ArrayList<>();
+-    List<Future<Pair<SubClusterId, Object>>> futures = new ArrayList<>();
+-    Map<SubClusterId, Exception> exceptions = new TreeMap<>();
+-
+-    // Generate parallel Callable tasks
+-    for (SubClusterId subClusterId : subClusterIds) {
+-      callables.add(() -> {
+-        try {
+-          ApplicationClientProtocol protocol = getClientRMProxyForSubCluster(subClusterId);
+-          String methodName = request.getMethodName();
+-          Class<?>[] types = request.getTypes();
+-          Object[] params = request.getParams();
+-          Method method = ApplicationClientProtocol.class.getMethod(methodName, types);
+-          Object result = method.invoke(protocol, params);
+-          return Pair.of(subClusterId, result);
+-        } catch (Exception e) {
+-          Throwable cause = e.getCause();
+-          // We use Callable. If the exception thrown here is InvocationTargetException,
+-          // it is a wrapped exception. We need to get the real cause of the error.
+-          if (cause != null && cause instanceof InvocationTargetException) {
+-            cause = cause.getCause();
+-          }
+-          String errMsg = (cause.getMessage() != null) ? cause.getMessage() : "UNKNOWN";
+-          YarnException yarnException =
+-              new YarnException(String.format("subClusterId %s exec %s error %s.",
+-              subClusterId, request.getMethodName(), errMsg), e);
+-          return Pair.of(subClusterId, yarnException);
+-        }
+-      });
+-    }
+-
+-    // Get results from multiple threads
+-    Map<SubClusterId, R> results = new TreeMap<>();
+-    try {
+-      futures.addAll(executorService.invokeAll(callables));
+-      futures.stream().forEach(future -> {
+-        SubClusterId subClusterId = null;
+-        try {
+-          Pair<SubClusterId, Object> pair = future.get();
+-          subClusterId = pair.getKey();
+-          Object result = pair.getValue();
+-          if (result instanceof YarnException) {
+-            throw YarnException.class.cast(result);
+-          }
+-          results.put(subClusterId, clazz.cast(result));
+-        } catch (InterruptedException | ExecutionException | YarnException e) {
+-          Throwable cause = e.getCause();
+-          LOG.error("Cannot execute {} on {} : {}", request.getMethodName(),
+-              subClusterId.getId(), cause.getMessage());
+-          exceptions.put(subClusterId, e);
+-        }
+-      });
+-    } catch (InterruptedException e) {
+-      throw new YarnException("invokeConcurrent Failed.", e);
+-    }
+-
+-    // All sub-clusters return results to be considered successful,
+-    // otherwise an exception will be thrown.
+-    if (exceptions != null && !exceptions.isEmpty()) {
+-      if (!allowPartialResult || exceptions.keySet().size() == subClusterIds.size()) {
+-        throw new YarnException("invokeConcurrent Failed = " +
+-            StringUtils.join(exceptions.values(), ","));
+-      }
+-    }
+-
+-    // return result
+-    return results.values();
+-  }
+-
+-  <R> Collection<R> invoke(ClientMethod request, Class<R> clazz, String subClusterId)
+-      throws YarnException {
+-
+-    // Get Active SubClusters
+-    Map<SubClusterId, SubClusterInfo> subClusterInfoMap = federationFacade.getSubClusters(true);
+-
+-    // According to subCluster of string type, convert to SubClusterId type
+-    SubClusterId subClusterIdKey = SubClusterId.newInstance(subClusterId);
+-
+-    // If the provided subCluster is not Active or does not exist,
+-    // an exception will be returned directly.
+-    if (!subClusterInfoMap.containsKey(subClusterIdKey)) {
+-      throw new YarnException("subClusterId = " + subClusterId + " is not an active subCluster.");
+-    }
+-
+-    try {
+-      ApplicationClientProtocol protocol = getClientRMProxyForSubCluster(subClusterIdKey);
+-      String methodName = request.getMethodName();
+-      Class<?>[] types = request.getTypes();
+-      Object[] params = request.getParams();
+-      Method method = ApplicationClientProtocol.class.getMethod(methodName, types);
+-      Object result = method.invoke(protocol, params);
+-      if (result != null) {
+-        return Collections.singletonList(clazz.cast(result));
+-      }
+-    } catch (Exception e) {
+-      throw new YarnException("invoke Failed, An exception occurred in subClusterId = " +
+-          subClusterId, e);
+-    }
+-
+-    throw new YarnException("invoke Failed, An exception occurred in subClusterId = " +
+-        subClusterId);
+-  }
+-
+-  @Override
+-  public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request)
+-      throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrClusterNodesFailedRetrieved();
+-      String msg = "Missing getClusterNodes request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getClusterNodes",
+-        new Class[]{GetClusterNodesRequest.class}, new Object[]{request});
+-    try {
+-      Collection<GetClusterNodesResponse> clusterNodes =
+-          invokeConcurrent(remoteMethod, GetClusterNodesResponse.class);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededGetClusterNodesRetrieved(stopTime - startTime);
+-      RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CLUSTERNODES,
+-          TARGET_CLIENT_RM_SERVICE);
+-      return RouterYarnClientUtils.mergeClusterNodesResponse(clusterNodes);
+-    } catch (Exception ex) {
+-      routerMetrics.incrClusterNodesFailedRetrieved();
+-      String msg = "Unable to get cluster nodes due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    throw new YarnException("Unable to get cluster nodes.");
+-  }
+-
+-  /**
+-   * <p>The interface used by clients to get information about <em>queues</em>
+-   * from the <code>ResourceManager</code>.</p>
+-   *
+-   * <p>The client, via {@link GetQueueInfoRequest}, can ask for details such
+-   * as used/total resources, child queues, running applications etc.</p>
+-   *
+-   * <p> In secure mode,the <code>ResourceManager</code> verifies access before
+-   * providing the information.</p>
+-   *
+-   * @param request request to get queue information
+-   * @return queue information
+-   * @throws YarnException exceptions from yarn servers.
+-   * @throws IOException io error occur.
+-   */
+-  @Override
+-  public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request)
+-      throws YarnException, IOException {
+-    if (request == null || request.getQueueName() == null) {
+-      routerMetrics.incrGetQueueInfoFailedRetrieved();
+-      String msg = "Missing getQueueInfo request or queueName.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_QUEUEINFO, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    String rSubCluster = request.getSubClusterId();
+-
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getQueueInfo",
+-        new Class[]{GetQueueInfoRequest.class}, new Object[]{request});
+-    Collection<GetQueueInfoResponse> queues = null;
+-    try {
+-      if (StringUtils.isNotBlank(rSubCluster)) {
+-        queues = invoke(remoteMethod, GetQueueInfoResponse.class, rSubCluster);
+-      } else {
+-        queues = invokeConcurrent(remoteMethod, GetQueueInfoResponse.class);
+-      }
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetQueueInfoFailedRetrieved();
+-      String msg = "Unable to get queue [" + request.getQueueName() + "] to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_QUEUEINFO, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetQueueInfoRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_QUEUEINFO, TARGET_CLIENT_RM_SERVICE);
+-    // Merge the GetQueueInfoResponse
+-    return RouterYarnClientUtils.mergeQueues(queues);
+-  }
+-
+-  @Override
+-  public GetQueueUserAclsInfoResponse getQueueUserAcls(
+-      GetQueueUserAclsInfoRequest request) throws YarnException, IOException {
+-    if(request == null){
+-      routerMetrics.incrQueueUserAclsFailedRetrieved();
+-      String msg = "Missing getQueueUserAcls request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_QUEUE_USER_ACLS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getQueueUserAcls",
+-        new Class[] {GetQueueUserAclsInfoRequest.class}, new Object[] {request});
+-    Collection<GetQueueUserAclsInfoResponse> queueUserAcls = null;
+-    try {
+-      queueUserAcls = invokeConcurrent(remoteMethod, GetQueueUserAclsInfoResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrQueueUserAclsFailedRetrieved();
+-      String msg = "Unable to get queue user Acls due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_QUEUE_USER_ACLS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetQueueUserAclsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_QUEUE_USER_ACLS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the QueueUserAclsInfoResponse
+-    return RouterYarnClientUtils.mergeQueueUserAcls(queueUserAcls);
+-  }
+-
+-  @Override
+-  public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      MoveApplicationAcrossQueuesRequest request)
+-      throws YarnException, IOException {
+-    if (request == null || request.getApplicationId() == null || request.getTargetQueue() == null) {
+-      routerMetrics.incrMoveApplicationAcrossQueuesFailedRetrieved();
+-      String msg = "Missing moveApplicationAcrossQueues request or " +
+-          "applicationId or target queue.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), MOVE_APPLICATION_ACROSS_QUEUES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-
+-    ApplicationId applicationId = request.getApplicationId();
+-    try {
+-      subClusterId = federationFacade
+-          .getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrMoveApplicationAcrossQueuesFailedRetrieved();
+-      String errMsgFormat = "Application %s does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), MOVE_APPLICATION_ACROSS_QUEUES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, String.format(errMsgFormat, applicationId));
+-      RouterServerUtil.logAndThrowException(e, errMsgFormat, applicationId);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    MoveApplicationAcrossQueuesResponse response = null;
+-    try {
+-      response = clientRMProxy.moveApplicationAcrossQueues(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrMoveApplicationAcrossQueuesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to moveApplicationAcrossQueues for %s to SubCluster %s.", applicationId,
+-          subClusterId.getId());
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when moveApplicationAcrossQueues "
+-           + "the applicationId {} to Queue {} In SubCluster {}.",
+-           request.getApplicationId(), request.getTargetQueue(), subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), MOVE_APPLICATION_ACROSS_QUEUES,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    routerMetrics.succeededMoveApplicationAcrossQueuesRetrieved(stopTime - startTime);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetNewReservationResponse getNewReservation(
+-      GetNewReservationRequest request) throws YarnException, IOException {
+-
+-    if (request == null) {
+-      routerMetrics.incrGetNewReservationFailedRetrieved();
+-      String errMsg = "Missing getNewReservation request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, errMsg);
+-      RouterServerUtil.logAndThrowException(errMsg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    Map<SubClusterId, SubClusterInfo> subClustersActive = federationFacade.getSubClusters(true);
+-
+-    for (int i = 0; i < numSubmitRetries; ++i) {
+-      SubClusterId subClusterId = getRandomActiveSubCluster(subClustersActive);
+-      LOG.info("getNewReservation try #{} on SubCluster {}.", i, subClusterId);
+-      ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-      try {
+-        GetNewReservationResponse response = clientRMProxy.getNewReservation(request);
+-        if (response != null) {
+-          long stopTime = clock.getTime();
+-          routerMetrics.succeededGetNewReservationRetrieved(stopTime - startTime);
+-          RouterAuditLogger.logSuccess(user.getShortUserName(), GET_NEW_RESERVATION,
+-              TARGET_CLIENT_RM_SERVICE);
+-          return response;
+-        }
+-      } catch (Exception e) {
+-        String logFormatted = "Unable to create a new Reservation in SubCluster {}.";
+-        LOG.warn(logFormatted, subClusterId.getId(), e);
+-        RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_RESERVATION, UNKNOWN,
+-            TARGET_CLIENT_RM_SERVICE, logFormatted, subClusterId.getId());
+-        subClustersActive.remove(subClusterId);
+-      }
+-    }
+-
+-    routerMetrics.incrGetNewReservationFailedRetrieved();
+-    String errMsg = "Failed to create a new reservation.";
+-    RouterAuditLogger.logFailure(user.getShortUserName(), GET_NEW_RESERVATION, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, errMsg);
+-    throw new YarnException(errMsg);
+-  }
+-
+-  @Override
+-  public ReservationSubmissionResponse submitReservation(
+-      ReservationSubmissionRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getReservationId() == null
+-        || request.getReservationDefinition() == null || request.getQueue() == null) {
+-      routerMetrics.incrSubmitReservationFailedRetrieved();
+-      String msg = "Missing submitReservation request or reservationId " +
+-          "or reservation definition or queue.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ReservationId reservationId = request.getReservationId();
+-
+-    for (int i = 0; i < numSubmitRetries; i++) {
+-      try {
+-        // First, Get SubClusterId according to specific strategy.
+-        SubClusterId subClusterId = policyFacade.getReservationHomeSubCluster(request);
+-        LOG.info("submitReservation ReservationId {} try #{} on SubCluster {}.",
+-            reservationId, i, subClusterId);
+-        ReservationHomeSubCluster reservationHomeSubCluster =
+-            ReservationHomeSubCluster.newInstance(reservationId, subClusterId);
+-
+-        // Second, determine whether the current ReservationId has a corresponding subCluster.
+-        // If it does not exist, add it. If it exists, update it.
+-        Boolean exists = existsReservationHomeSubCluster(reservationId);
+-
+-        // We may encounter the situation of repeated submission of Reservation,
+-        // at this time we should try to use the reservation that has been allocated
+-        // !exists indicates that the reservation does not exist and needs to be added
+-        // i==0, mainly to consider repeated submissions,
+-        // so the first time to apply for reservation, try to use the original reservation
+-        if (!exists || i == 0) {
+-          addReservationHomeSubCluster(reservationId, reservationHomeSubCluster);
+-        } else {
+-          updateReservationHomeSubCluster(subClusterId, reservationId, reservationHomeSubCluster);
+-        }
+-
+-        // Third, Submit a Reservation request to the subCluster
+-        ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-        ReservationSubmissionResponse response = clientRMProxy.submitReservation(request);
+-        if (response != null) {
+-          LOG.info("Reservation {} submitted on subCluster {}.", reservationId, subClusterId);
+-          long stopTime = clock.getTime();
+-          routerMetrics.succeededSubmitReservationRetrieved(stopTime - startTime);
+-          RouterAuditLogger.logSuccess(user.getShortUserName(), SUBMIT_RESERVATION,
+-              TARGET_CLIENT_RM_SERVICE);
+-          return response;
+-        }
+-      } catch (Exception e) {
+-        LOG.warn("Unable to submit(try #{}) the Reservation {}.", i, reservationId, e);
+-      }
+-    }
+-
+-    routerMetrics.incrSubmitReservationFailedRetrieved();
+-    String msg = String.format("Reservation %s failed to be submitted.", reservationId);
+-    RouterAuditLogger.logFailure(user.getShortUserName(), SUBMIT_RESERVATION, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, msg);
+-    throw new YarnException(msg);
+-  }
+-
+-  @Override
+-  public ReservationListResponse listReservations(
+-      ReservationListRequest request) throws YarnException, IOException {
+-    if (request == null || request.getReservationId() == null) {
+-      routerMetrics.incrListReservationsFailedRetrieved();
+-      String msg = "Missing listReservations request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), LIST_RESERVATIONS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("listReservations",
+-        new Class[] {ReservationListRequest.class}, new Object[] {request});
+-    Collection<ReservationListResponse> listResponses = null;
+-    try {
+-      listResponses = invokeConcurrent(remoteMethod, ReservationListResponse.class);
+-    } catch (Exception ex) {
+-      String msg = "Unable to list reservations node due to exception.";
+-      routerMetrics.incrListReservationsFailedRetrieved();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), LIST_RESERVATIONS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededListReservationsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), LIST_RESERVATIONS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the ReservationListResponse
+-    return RouterYarnClientUtils.mergeReservationsList(listResponses);
+-  }
+-
+-  @Override
+-  public ReservationUpdateResponse updateReservation(
+-      ReservationUpdateRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getReservationId() == null
+-        || request.getReservationDefinition() == null) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      String msg = "Missing updateReservation request or reservationId or reservation definition.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ReservationId reservationId = request.getReservationId();
+-    SubClusterId subClusterId = getReservationHomeSubCluster(reservationId);
+-
+-    try {
+-      ApplicationClientProtocol client = getClientRMProxyForSubCluster(subClusterId);
+-      ReservationUpdateResponse response = client.updateReservation(request);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededUpdateReservationRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(user.getShortUserName(), UPDATE_RESERVATION,
+-            TARGET_CLIENT_RM_SERVICE);
+-        return response;
+-      }
+-    } catch (Exception ex) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      String msg = "Unable to reservation update due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    routerMetrics.incrUpdateReservationFailedRetrieved();
+-    String msg = String.format("Reservation %s failed to be update.", reservationId);
+-    RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_RESERVATION, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, msg);
+-    throw new YarnException(msg);
+-  }
+-
+-  @Override
+-  public ReservationDeleteResponse deleteReservation(
+-      ReservationDeleteRequest request) throws YarnException, IOException {
+-    if (request == null || request.getReservationId() == null) {
+-      routerMetrics.incrDeleteReservationFailedRetrieved();
+-      String msg = "Missing deleteReservation request or reservationId.";
+-      RouterServerUtil.logAndThrowException(msg, null);
+-      RouterAuditLogger.logFailure(user.getShortUserName(), DELETE_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ReservationId reservationId = request.getReservationId();
+-    SubClusterId subClusterId = getReservationHomeSubCluster(reservationId);
+-
+-    try {
+-      ApplicationClientProtocol client = getClientRMProxyForSubCluster(subClusterId);
+-      ReservationDeleteResponse response = client.deleteReservation(request);
+-      if (response != null) {
+-        federationFacade.deleteReservationHomeSubCluster(reservationId);
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededDeleteReservationRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(user.getShortUserName(), DELETE_RESERVATION,
+-            TARGET_CLIENT_RM_SERVICE);
+-        return response;
+-      }
+-    } catch (Exception ex) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      String msg = "Unable to reservation delete due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), DELETE_RESERVATION, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    routerMetrics.incrDeleteReservationFailedRetrieved();
+-    String msg = String.format("Reservation %s failed to be delete.", reservationId);
+-    RouterAuditLogger.logFailure(user.getShortUserName(), DELETE_RESERVATION, UNKNOWN,
+-        TARGET_CLIENT_RM_SERVICE, msg);
+-    throw new YarnException(msg);
+-  }
+-
+-  @Override
+-  public GetNodesToLabelsResponse getNodeToLabels(
+-      GetNodesToLabelsRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrNodeToLabelsFailedRetrieved();
+-      String msg = "Missing getNodesToLabels request.";
+-      RouterServerUtil.logAndThrowException(msg, null);
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NODETOLABELS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getNodeToLabels",
+-        new Class[] {GetNodesToLabelsRequest.class}, new Object[] {request});
+-    Collection<GetNodesToLabelsResponse> clusterNodes = null;
+-    try {
+-      clusterNodes = invokeConcurrent(remoteMethod, GetNodesToLabelsResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrNodeToLabelsFailedRetrieved();
+-      String msg = "Unable to get node label due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NODETOLABELS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetNodeToLabelsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_NODETOLABELS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the NodesToLabelsResponse
+-    return RouterYarnClientUtils.mergeNodesToLabelsResponse(clusterNodes);
+-  }
+-
+-  @Override
+-  public GetLabelsToNodesResponse getLabelsToNodes(
+-      GetLabelsToNodesRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      String msg = "Missing getNodesToLabels request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_LABELSTONODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getLabelsToNodes",
+-         new Class[] {GetLabelsToNodesRequest.class}, new Object[] {request});
+-    Collection<GetLabelsToNodesResponse> labelNodes = null;
+-    try {
+-      labelNodes = invokeConcurrent(remoteMethod, GetLabelsToNodesResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      String msg = "Unable to get label node due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_LABELSTONODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetLabelsToNodesRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_LABELSTONODES,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the LabelsToNodesResponse
+-    return RouterYarnClientUtils.mergeLabelsToNodes(labelNodes);
+-  }
+-
+-  @Override
+-  public GetClusterNodeLabelsResponse getClusterNodeLabels(
+-      GetClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrClusterNodeLabelsFailedRetrieved();
+-      String msg = "Missing getClusterNodeLabels request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODELABELS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getClusterNodeLabels",
+-         new Class[] {GetClusterNodeLabelsRequest.class}, new Object[] {request});
+-    Collection<GetClusterNodeLabelsResponse> nodeLabels = null;
+-    try {
+-      nodeLabels = invokeConcurrent(remoteMethod, GetClusterNodeLabelsResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrClusterNodeLabelsFailedRetrieved();
+-      String msg = "Unable to get cluster nodeLabels due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODELABELS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetClusterNodeLabelsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CLUSTERNODELABELS,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the ClusterNodeLabelsResponse
+-    return RouterYarnClientUtils.mergeClusterNodeLabelsResponse(nodeLabels);
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   *
+-   * Possible failure:
+-   *
+-   * Client: identical behavior as {@code ClientRMService}.
+-   *
+-   * Router: the Client will timeout and resubmit the request.
+-   *
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   *
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      GetApplicationAttemptReportRequest request)
+-      throws YarnException, IOException {
+-
+-    if (request == null || request.getApplicationAttemptId() == null
+-            || request.getApplicationAttemptId().getApplicationId() == null) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      String msg = "Missing getApplicationAttemptReport request or applicationId " +
+-          "or applicationAttemptId information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPT_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-    ApplicationId applicationId = request.getApplicationAttemptId().getApplicationId();
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      String msgFormat = "ApplicationAttempt %s belongs to " +
+-          "Application %s does not exist in FederationStateStore.";
+-      ApplicationAttemptId applicationAttemptId = request.getApplicationAttemptId();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPT_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msgFormat, applicationAttemptId, applicationId);
+-      RouterServerUtil.logAndThrowException(e, msgFormat, applicationAttemptId, applicationId);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy =
+-        getClientRMProxyForSubCluster(subClusterId);
+-
+-    GetApplicationAttemptReportResponse response = null;
+-    try {
+-      response = clientRMProxy.getApplicationAttemptReport(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      String msg = String.format(
+-          "Unable to get the applicationAttempt report for %s to SubCluster %s.",
+-          request.getApplicationAttemptId(), subClusterId.getId());
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPT_REPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the report of "
+-          + "the applicationAttempt {} to SubCluster {}.",
+-          request.getApplicationAttemptId(), subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededAppAttemptReportRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_APPLICATION_ATTEMPT_REPORT,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptsResponse getApplicationAttempts(
+-      GetApplicationAttemptsRequest request) throws YarnException, IOException {
+-    if (request == null || request.getApplicationId() == null) {
+-      routerMetrics.incrAppAttemptsFailedRetrieved();
+-      String msg = "Missing getApplicationAttempts request or application id.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ApplicationId applicationId = request.getApplicationId();
+-    SubClusterId subClusterId = null;
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException ex) {
+-      routerMetrics.incrAppAttemptsFailedRetrieved();
+-      String msg = "Application " + applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    GetApplicationAttemptsResponse response = null;
+-    try {
+-      response = clientRMProxy.getApplicationAttempts(request);
+-    } catch (Exception ex) {
+-      routerMetrics.incrAppAttemptsFailedRetrieved();
+-      String msg = "Unable to get the application attempts for " +
+-          applicationId + " from SubCluster " + subClusterId.getId();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_APPLICATION_ATTEMPTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the attempts list of " +
+-           "the application = {} to SubCluster = {}.", applicationId,
+-           subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_APPLICATION_ATTEMPTS,
+-        TARGET_CLIENT_RM_SERVICE, applicationId);
+-    routerMetrics.succeededAppAttemptsRetrieved(stopTime - startTime);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetContainerReportResponse getContainerReport(
+-      GetContainerReportRequest request) throws YarnException, IOException {
+-    if(request == null || request.getContainerId() == null){
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      String msg = "Missing getContainerReport request or containerId";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CONTAINERREPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ApplicationId applicationId = request.getContainerId().
+-        getApplicationAttemptId().getApplicationId();
+-    SubClusterId subClusterId = null;
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException ex) {
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      String msg = "Application " + applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CONTAINERREPORT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    GetContainerReportResponse response = null;
+-
+-    try {
+-      response = clientRMProxy.getContainerReport(request);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      LOG.error("Unable to get the container report for {} from SubCluster {}.",
+-          applicationId, subClusterId.getId(), ex);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the container report of " +
+-           "the ContainerId = {} From SubCluster = {}.", request.getContainerId(),
+-           subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CONTAINERREPORT,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    routerMetrics.succeededGetContainerReportRetrieved(stopTime - startTime);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetContainersResponse getContainers(GetContainersRequest request)
+-      throws YarnException, IOException {
+-    if (request == null || request.getApplicationAttemptId() == null) {
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      String msg = "Missing getContainers request or ApplicationAttemptId.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CONTAINERS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    ApplicationId applicationId = request.getApplicationAttemptId().getApplicationId();
+-    SubClusterId subClusterId = null;
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException ex) {
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      String msg = "Application " + applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CONTAINERS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    GetContainersResponse response = null;
+-
+-    try {
+-      response = clientRMProxy.getContainers(request);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      String msg = "Unable to get the containers for " +
+-          applicationId + " from SubCluster " + subClusterId.getId();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CONTAINERS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the container report of " +
+-          "the ApplicationId = {} From SubCluster = {}.", applicationId,
+-          subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CONTAINERS,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    routerMetrics.succeededGetContainersRetrieved(stopTime - startTime);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetDelegationTokenResponse getDelegationToken(
+-      GetDelegationTokenRequest request) throws YarnException, IOException {
+-
+-    if (request == null || request.getRenewer() == null) {
+-      routerMetrics.incrGetDelegationTokenFailedRetrieved();
+-      String msg = "Missing getDelegationToken request or Renewer.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_DELEGATIONTOKEN, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    try {
+-      // Verify that the connection is kerberos authenticated
+-      if (!RouterServerUtil.isAllowedDelegationTokenOp()) {
+-        routerMetrics.incrGetDelegationTokenFailedRetrieved();
+-        String msg = "Delegation Token can be issued only with kerberos authentication.";
+-        RouterAuditLogger.logFailure(user.getShortUserName(), GET_DELEGATIONTOKEN, UNKNOWN,
+-            TARGET_CLIENT_RM_SERVICE, msg);
+-        throw new IOException(msg);
+-      }
+-
+-      long startTime = clock.getTime();
+-      UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
+-      Text owner = new Text(ugi.getUserName());
+-      Text realUser = null;
+-      if (ugi.getRealUser() != null) {
+-        realUser = new Text(ugi.getRealUser().getUserName());
+-      }
+-
+-      RMDelegationTokenIdentifier tokenIdentifier =
+-          new RMDelegationTokenIdentifier(owner, new Text(request.getRenewer()), realUser);
+-      Token<RMDelegationTokenIdentifier> realRMDToken =
+-          new Token<>(tokenIdentifier, this.getTokenSecretManager());
+-
+-      org.apache.hadoop.yarn.api.records.Token routerRMDTToken =
+-          BuilderUtils.newDelegationToken(realRMDToken.getIdentifier(),
+-              realRMDToken.getKind().toString(),
+-              realRMDToken.getPassword(), realRMDToken.getService().toString());
+-
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededGetDelegationTokenRetrieved((stopTime - startTime));
+-      RouterAuditLogger.logSuccess(user.getShortUserName(), GET_DELEGATIONTOKEN,
+-          TARGET_CLIENT_RM_SERVICE);
+-      return GetDelegationTokenResponse.newInstance(routerRMDTToken);
+-    } catch(IOException e) {
+-      routerMetrics.incrGetDelegationTokenFailedRetrieved();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_DELEGATIONTOKEN, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, "getDelegationToken error, errMsg = " + e.getMessage());
+-      throw new YarnException(e);
+-    }
+-  }
+-
+-  @Override
+-  public RenewDelegationTokenResponse renewDelegationToken(
+-      RenewDelegationTokenRequest request) throws YarnException, IOException {
+-    try {
+-
+-      if (!RouterServerUtil.isAllowedDelegationTokenOp()) {
+-        routerMetrics.incrRenewDelegationTokenFailedRetrieved();
+-        String msg = "Delegation Token can be renewed only with kerberos authentication";
+-        RouterAuditLogger.logFailure(user.getShortUserName(), RENEW_DELEGATIONTOKEN, UNKNOWN,
+-            TARGET_CLIENT_RM_SERVICE, msg);
+-        throw new IOException(msg);
+-      }
+-
+-      long startTime = clock.getTime();
+-      org.apache.hadoop.yarn.api.records.Token protoToken = request.getDelegationToken();
+-      Token<RMDelegationTokenIdentifier> token = new Token<>(
+-          protoToken.getIdentifier().array(), protoToken.getPassword().array(),
+-          new Text(protoToken.getKind()), new Text(protoToken.getService()));
+-      String renewer = RouterServerUtil.getRenewerForToken(token);
+-      long nextExpTime = this.getTokenSecretManager().renewToken(token, renewer);
+-      RenewDelegationTokenResponse renewResponse =
+-          Records.newRecord(RenewDelegationTokenResponse.class);
+-      renewResponse.setNextExpirationTime(nextExpTime);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededRenewDelegationTokenRetrieved((stopTime - startTime));
+-      RouterAuditLogger.logSuccess(user.getShortUserName(), RENEW_DELEGATIONTOKEN,
+-          TARGET_CLIENT_RM_SERVICE);
+-      return renewResponse;
+-
+-    } catch (IOException e) {
+-      routerMetrics.incrRenewDelegationTokenFailedRetrieved();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), RENEW_DELEGATIONTOKEN, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, "renewDelegationToken error, errMsg = " + e.getMessage());
+-      throw new YarnException(e);
+-    }
+-  }
+-
+-  @Override
+-  public CancelDelegationTokenResponse cancelDelegationToken(
+-      CancelDelegationTokenRequest request) throws YarnException, IOException {
+-    try {
+-      if (!RouterServerUtil.isAllowedDelegationTokenOp()) {
+-        routerMetrics.incrCancelDelegationTokenFailedRetrieved();
+-        String msg = "Delegation Token can be cancelled only with kerberos authentication";
+-        RouterAuditLogger.logFailure(user.getShortUserName(), CANCEL_DELEGATIONTOKEN, UNKNOWN,
+-            TARGET_CLIENT_RM_SERVICE, msg);
+-        throw new IOException(msg);
+-      }
+-
+-      long startTime = clock.getTime();
+-      org.apache.hadoop.yarn.api.records.Token protoToken = request.getDelegationToken();
+-      Token<RMDelegationTokenIdentifier> token = new Token<>(
+-          protoToken.getIdentifier().array(), protoToken.getPassword().array(),
+-          new Text(protoToken.getKind()), new Text(protoToken.getService()));
+-      String currentUser = UserGroupInformation.getCurrentUser().getUserName();
+-      this.getTokenSecretManager().cancelToken(token, currentUser);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededCancelDelegationTokenRetrieved((stopTime - startTime));
+-      RouterAuditLogger.logSuccess(user.getShortUserName(), CANCEL_DELEGATIONTOKEN,
+-          TARGET_CLIENT_RM_SERVICE);
+-      return Records.newRecord(CancelDelegationTokenResponse.class);
+-    } catch (IOException e) {
+-      routerMetrics.incrCancelDelegationTokenFailedRetrieved();
+-      RouterAuditLogger.logFailure(user.getShortUserName(), CANCEL_DELEGATIONTOKEN, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, "cancelDelegationToken error, errMsg = " + e.getMessage());
+-      throw new YarnException(e);
+-    }
+-  }
+-
+-  @Override
+-  public FailApplicationAttemptResponse failApplicationAttempt(
+-      FailApplicationAttemptRequest request) throws YarnException, IOException {
+-    if (request == null || request.getApplicationAttemptId() == null
+-          || request.getApplicationAttemptId().getApplicationId() == null) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "Missing failApplicationAttempt request or applicationId " +
+-          "or applicationAttemptId information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FAIL_APPLICATIONATTEMPT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-    ApplicationAttemptId applicationAttemptId = request.getApplicationAttemptId();
+-    ApplicationId applicationId = applicationAttemptId.getApplicationId();
+-
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "ApplicationAttempt " +
+-          applicationAttemptId + " belongs to Application " + applicationId +
+-          " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FAIL_APPLICATIONATTEMPT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    FailApplicationAttemptResponse response = null;
+-    try {
+-      response = clientRMProxy.failApplicationAttempt(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "Unable to get the applicationAttempt report for " +
+-          applicationAttemptId + " to SubCluster " + subClusterId;
+-      RouterAuditLogger.logFailure(user.getShortUserName(), FAIL_APPLICATIONATTEMPT, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when attempting to retrieve the report of " +
+-          "the applicationAttempt {} to SubCluster {}.",
+-          request.getApplicationAttemptId(), subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededFailAppAttemptRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), FAIL_APPLICATIONATTEMPT,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    return response;
+-  }
+-
+-  @Override
+-  public UpdateApplicationPriorityResponse updateApplicationPriority(
+-      UpdateApplicationPriorityRequest request)
+-      throws YarnException, IOException {
+-    if (request == null || request.getApplicationId() == null
+-            || request.getApplicationPriority() == null) {
+-      routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-      String msg = "Missing updateApplicationPriority request or applicationId " +
+-          "or applicationPriority information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONPRIORITY, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-    ApplicationId applicationId = request.getApplicationId();
+-
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-      String msg = "Application " +
+-          applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONPRIORITY, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    UpdateApplicationPriorityResponse response = null;
+-    try {
+-      response = clientRMProxy.updateApplicationPriority(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "Unable to update application priority for " +
+-          applicationId + " to SubCluster " + subClusterId;
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONPRIORITY, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when update application priority of " +
+-           "the applicationId {} to SubCluster {}.",
+-           applicationId, subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededUpdateAppPriorityRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    return response;
+-  }
+-
+-  @Override
+-  public SignalContainerResponse signalToContainer(
+-      SignalContainerRequest request) throws YarnException, IOException {
+-    if (request == null || request.getContainerId() == null
+-            || request.getCommand() == null) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      String msg = "Missing signalToContainer request or containerId or command information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SIGNAL_TOCONTAINER, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-    ApplicationId applicationId =
+-        request.getContainerId().getApplicationAttemptId().getApplicationId();
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException ex) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      String msg = "Application " + applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SIGNAL_TOCONTAINER, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    SignalContainerResponse response = null;
+-    try {
+-      response = clientRMProxy.signalToContainer(request);
+-    } catch (Exception ex) {
+-      String msg = "Unable to signal to container for " + applicationId +
+-          " from SubCluster " + subClusterId;
+-      RouterAuditLogger.logFailure(user.getShortUserName(), SIGNAL_TOCONTAINER, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when signal to container of " +
+-          "the applicationId {} to SubCluster {}.", applicationId, subClusterId);
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededSignalToContainerRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), SIGNAL_TOCONTAINER,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    return response;
+-  }
+-
+-  @Override
+-  public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
+-      UpdateApplicationTimeoutsRequest request)
+-      throws YarnException, IOException {
+-    if (request == null || request.getApplicationId() == null
+-            || request.getApplicationTimeouts() == null) {
+-      routerMetrics.incrUpdateApplicationTimeoutsRetrieved();
+-      String msg = "Missing updateApplicationTimeouts request or applicationId or " +
+-          "applicationTimeouts information.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONTIMEOUTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-
+-    long startTime = clock.getTime();
+-    SubClusterId subClusterId = null;
+-    ApplicationId applicationId = request.getApplicationId();
+-    try {
+-      subClusterId = getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "Application " + applicationId + " does not exist in FederationStateStore.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONTIMEOUTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-    UpdateApplicationTimeoutsResponse response = null;
+-    try {
+-      response = clientRMProxy.updateApplicationTimeouts(request);
+-    } catch (Exception e) {
+-      routerMetrics.incrFailAppAttemptFailedRetrieved();
+-      String msg = "Unable to update application timeout for " + applicationId +
+-          " to SubCluster " + subClusterId;
+-      RouterAuditLogger.logFailure(user.getShortUserName(), UPDATE_APPLICATIONTIMEOUTS, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, e);
+-    }
+-
+-    if (response == null) {
+-      LOG.error("No response when update application timeout of " +
+-          "the applicationId {} to SubCluster {}.",
+-          applicationId, subClusterId.getId());
+-    }
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededUpdateAppTimeoutsRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-        TARGET_CLIENT_RM_SERVICE, applicationId, subClusterId);
+-    return response;
+-  }
+-
+-  @Override
+-  public GetAllResourceProfilesResponse getResourceProfiles(
+-      GetAllResourceProfilesRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrGetResourceProfilesFailedRetrieved();
+-      String msg = "Missing getResourceProfiles request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCEPROFILES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getResourceProfiles",
+-        new Class[] {GetAllResourceProfilesRequest.class}, new Object[] {request});
+-    Collection<GetAllResourceProfilesResponse> resourceProfiles = null;
+-    try {
+-      resourceProfiles = invokeConcurrent(remoteMethod, GetAllResourceProfilesResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetResourceProfilesFailedRetrieved();
+-      String msg = "Unable to get resource profiles due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCEPROFILES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException("Unable to get resource profiles due to exception.",
+-          ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetResourceProfilesRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_RESOURCEPROFILES,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.mergeClusterResourceProfilesResponse(resourceProfiles);
+-  }
+-
+-  @Override
+-  public GetResourceProfileResponse getResourceProfile(
+-      GetResourceProfileRequest request) throws YarnException, IOException {
+-    if (request == null || request.getProfileName() == null) {
+-      routerMetrics.incrGetResourceProfileFailedRetrieved();
+-      String msg = "Missing getResourceProfile request or profileName.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCEPROFILE, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getResourceProfile",
+-        new Class[] {GetResourceProfileRequest.class}, new Object[] {request});
+-    Collection<GetResourceProfileResponse> resourceProfile = null;
+-    try {
+-      resourceProfile = invokeConcurrent(remoteMethod, GetResourceProfileResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetResourceProfileFailedRetrieved();
+-      String msg = "Unable to get resource profile due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCEPROFILE, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetResourceProfileRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_RESOURCEPROFILE,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.mergeClusterResourceProfileResponse(resourceProfile);
+-  }
+-
+-  @Override
+-  public GetAllResourceTypeInfoResponse getResourceTypeInfo(
+-      GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrResourceTypeInfoFailedRetrieved();
+-      String msg = "Missing getResourceTypeInfo request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCETYPEINFO, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getResourceTypeInfo",
+-        new Class[] {GetAllResourceTypeInfoRequest.class}, new Object[] {request});
+-    Collection<GetAllResourceTypeInfoResponse> listResourceTypeInfo;
+-    try {
+-      listResourceTypeInfo = invokeConcurrent(remoteMethod, GetAllResourceTypeInfoResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrResourceTypeInfoFailedRetrieved();
+-      String msg = "Unable to get all resource type info node due to exception.";
+-      LOG.error(msg, ex);
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_RESOURCETYPEINFO, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      throw ex;
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetResourceTypeInfoRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_RESOURCETYPEINFO,
+-        TARGET_CLIENT_RM_SERVICE);
+-    // Merge the GetAllResourceTypeInfoResponse
+-    return RouterYarnClientUtils.mergeResourceTypes(listResourceTypeInfo);
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    executorService.shutdown();
+-    super.shutdown();
+-  }
+-
+-  @Override
+-  public GetAttributesToNodesResponse getAttributesToNodes(
+-      GetAttributesToNodesRequest request) throws YarnException, IOException {
+-    if (request == null || request.getNodeAttributes() == null) {
+-      routerMetrics.incrGetAttributesToNodesFailedRetrieved();
+-      String msg = "Missing getAttributesToNodes request or nodeAttributes.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_ATTRIBUTESTONODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getAttributesToNodes",
+-        new Class[] {GetAttributesToNodesRequest.class}, new Object[] {request});
+-    Collection<GetAttributesToNodesResponse> attributesToNodesResponses = null;
+-    try {
+-      attributesToNodesResponses =
+-          invokeConcurrent(remoteMethod, GetAttributesToNodesResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetAttributesToNodesFailedRetrieved();
+-      String msg = "Unable to get attributes to nodes due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_ATTRIBUTESTONODES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetAttributesToNodesRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_ATTRIBUTESTONODES,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.mergeAttributesToNodesResponse(attributesToNodesResponses);
+-  }
+-
+-  @Override
+-  public GetClusterNodeAttributesResponse getClusterNodeAttributes(
+-      GetClusterNodeAttributesRequest request) throws YarnException, IOException {
+-    if (request == null) {
+-      routerMetrics.incrGetClusterNodeAttributesFailedRetrieved();
+-      String msg = "Missing getClusterNodeAttributes request.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODEATTRIBUTES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getClusterNodeAttributes",
+-        new Class[] {GetClusterNodeAttributesRequest.class}, new Object[] {request});
+-    Collection<GetClusterNodeAttributesResponse> clusterNodeAttributesResponses = null;
+-    try {
+-      clusterNodeAttributesResponses = invokeConcurrent(remoteMethod,
+-          GetClusterNodeAttributesResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetClusterNodeAttributesFailedRetrieved();
+-      String msg = "Unable to get cluster node attributes due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_CLUSTERNODEATTRIBUTES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetClusterNodeAttributesRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_CLUSTERNODEATTRIBUTES,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.mergeClusterNodeAttributesResponse(clusterNodeAttributesResponses);
+-  }
+-
+-  @Override
+-  public GetNodesToAttributesResponse getNodesToAttributes(
+-      GetNodesToAttributesRequest request) throws YarnException, IOException {
+-    if (request == null || request.getHostNames() == null) {
+-      routerMetrics.incrGetNodesToAttributesFailedRetrieved();
+-      String msg = "Missing getNodesToAttributes request or hostNames.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NODESTOATTRIBUTES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, null);
+-    }
+-    long startTime = clock.getTime();
+-    ClientMethod remoteMethod = new ClientMethod("getNodesToAttributes",
+-        new Class[] {GetNodesToAttributesRequest.class}, new Object[] {request});
+-    Collection<GetNodesToAttributesResponse> nodesToAttributesResponses = null;
+-    try {
+-      nodesToAttributesResponses = invokeConcurrent(remoteMethod,
+-          GetNodesToAttributesResponse.class);
+-    } catch (Exception ex) {
+-      routerMetrics.incrGetNodesToAttributesFailedRetrieved();
+-      String msg = "Unable to get nodes to attributes due to exception.";
+-      RouterAuditLogger.logFailure(user.getShortUserName(), GET_NODESTOATTRIBUTES, UNKNOWN,
+-          TARGET_CLIENT_RM_SERVICE, msg);
+-      RouterServerUtil.logAndThrowException(msg, ex);
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetNodesToAttributesRetrieved(stopTime - startTime);
+-    RouterAuditLogger.logSuccess(user.getShortUserName(), GET_NODESTOATTRIBUTES,
+-        TARGET_CLIENT_RM_SERVICE);
+-    return RouterYarnClientUtils.mergeNodesToAttributesResponse(nodesToAttributesResponses);
+-  }
+-
+-  protected SubClusterId getApplicationHomeSubCluster(
+-      ApplicationId applicationId) throws YarnException {
+-    if (applicationId == null) {
+-      LOG.error("ApplicationId is Null, Can't find in SubCluster.");
+-      return null;
+-    }
+-
+-    SubClusterId resultSubClusterId = null;
+-
+-    // try looking for applicationId in Home SubCluster
+-    try {
+-      resultSubClusterId = federationFacade.
+-          getApplicationHomeSubCluster(applicationId);
+-    } catch (YarnException ex) {
+-      if(LOG.isDebugEnabled()){
+-        LOG.debug("Can't find applicationId = {} in home sub cluster, " +
+-             " try foreach sub clusters.", applicationId);
+-      }
+-    }
+-    if (resultSubClusterId != null) {
+-      return resultSubClusterId;
+-    }
+-
+-    // if applicationId not found in Home SubCluster,
+-    // foreach Clusters
+-    Map<SubClusterId, SubClusterInfo> subClusters =
+-        federationFacade.getSubClusters(true);
+-    for (SubClusterId subClusterId : subClusters.keySet()) {
+-      try {
+-        ApplicationClientProtocol clientRMProxy = getClientRMProxyForSubCluster(subClusterId);
+-        if(clientRMProxy == null) {
+-          continue;
+-        }
+-        GetApplicationReportRequest appReportRequest =
+-            GetApplicationReportRequest.newInstance(applicationId);
+-        GetApplicationReportResponse appReportResponse =
+-            clientRMProxy.getApplicationReport(appReportRequest);
+-
+-        if(appReportResponse!=null && applicationId.equals(
+-            appReportResponse.getApplicationReport().getApplicationId())){
+-          resultSubClusterId = federationFacade.addApplicationHomeSubCluster(
+-               ApplicationHomeSubCluster.newInstance(applicationId, subClusterId));
+-          return resultSubClusterId;
+-        }
+-
+-      } catch (Exception ex) {
+-        if(LOG.isDebugEnabled()){
+-          LOG.debug("Can't find applicationId = {} in Sub Cluster!", applicationId);
+-        }
+-      }
+-    }
+-
+-    String errorMsg =
+-        String.format("Can't find applicationId = %s in any sub clusters", applicationId);
+-    throw new YarnException(errorMsg);
+-  }
+-
+-  protected SubClusterId getReservationHomeSubCluster(ReservationId reservationId)
+-      throws YarnException {
+-
+-    if (reservationId == null) {
+-      LOG.error("ReservationId is Null, Can't find in SubCluster.");
+-      return null;
+-    }
+-
+-    // try looking for reservation in Home SubCluster
+-    try {
+-      SubClusterId resultSubClusterId =
+-          federationFacade.getReservationHomeSubCluster(reservationId);
+-      if (resultSubClusterId != null) {
+-        return resultSubClusterId;
+-      }
+-    } catch (YarnException e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Can't find reservationId = %s in home sub cluster.", reservationId);
+-    }
+-
+-    String errorMsg =
+-        String.format("Can't find reservationId = %s in home sub cluster.", reservationId);
+-    throw new YarnException(errorMsg);
+-  }
+-
+-  @VisibleForTesting
+-  public FederationStateStoreFacade getFederationFacade() {
+-    return federationFacade;
+-  }
+-
+-  @VisibleForTesting
+-  public Map<SubClusterId, ApplicationClientProtocol> getClientRMProxies() {
+-    return clientRMProxies;
+-  }
+-
+-  private Boolean existsReservationHomeSubCluster(ReservationId reservationId) {
+-    try {
+-      SubClusterId subClusterId = federationFacade.getReservationHomeSubCluster(reservationId);
+-      if (subClusterId != null) {
+-        return true;
+-      }
+-    } catch (YarnException e) {
+-      LOG.warn("get homeSubCluster by reservationId = {} error.", reservationId, e);
+-    }
+-    return false;
+-  }
+-
+-  private void addReservationHomeSubCluster(ReservationId reservationId,
+-      ReservationHomeSubCluster homeSubCluster) throws YarnException {
+-    try {
+-      // persist the mapping of reservationId and the subClusterId which has
+-      // been selected as its home
+-      federationFacade.addReservationHomeSubCluster(homeSubCluster);
+-    } catch (YarnException e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to insert the ReservationId %s into the FederationStateStore.",
+-          reservationId);
+-    }
+-  }
+-
+-  private void updateReservationHomeSubCluster(SubClusterId subClusterId,
+-      ReservationId reservationId, ReservationHomeSubCluster homeSubCluster) throws YarnException {
+-    try {
+-      // update the mapping of reservationId and the home subClusterId to
+-      // the new subClusterId we have selected
+-      federationFacade.updateReservationHomeSubCluster(homeSubCluster);
+-    } catch (YarnException e) {
+-      SubClusterId subClusterIdInStateStore =
+-          federationFacade.getReservationHomeSubCluster(reservationId);
+-      if (subClusterId == subClusterIdInStateStore) {
+-        LOG.info("Reservation {} already submitted on SubCluster {}.",
+-            reservationId, subClusterId);
+-      } else {
+-        RouterServerUtil.logAndThrowException(e,
+-            "Unable to update the ReservationId %s into the FederationStateStore.",
+-            reservationId);
+-      }
+-    }
+-  }
+-
+-  protected int getNumMinThreads(Configuration conf) {
+-
+-    String threadSize = conf.get(YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE);
+-
+-    // If the user configures YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE,
+-    // we will still get the number of threads from this configuration.
+-    if (StringUtils.isNotBlank(threadSize)) {
+-      LOG.warn("{} is a deprecated property, " +
+-          "please remove it, use {} to configure the minimum number of thread pool.",
+-          YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE,
+-          YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE);
+-      return Integer.parseInt(threadSize);
+-    }
+-
+-    int numMinThreads = conf.getInt(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE);
+-    return numMinThreads;
+-  }
+-
+-  protected int getNumMaxThreads(Configuration conf) {
+-
+-    String threadSize = conf.get(YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE);
+-
+-    // If the user configures YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE,
+-    // we will still get the number of threads from this configuration.
+-    if (StringUtils.isNotBlank(threadSize)) {
+-      LOG.warn("{} is a deprecated property, " +
+-          "please remove it, use {} to configure the maximum number of thread pool.",
+-          YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE,
+-          YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE);
+-      return Integer.parseInt(threadSize);
+-    }
+-
+-    int numMaxThreads = conf.getInt(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE);
+-    return numMaxThreads;
+-  }
+-
+-  @VisibleForTesting
+-  public void setNumSubmitRetries(int numSubmitRetries) {
+-    this.numSubmitRetries = numSubmitRetries;
+-  }
+-
+-  @VisibleForTesting
+-  public void setAllowPartialResult(boolean allowPartialResult) {
+-    this.allowPartialResult = allowPartialResult;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
+deleted file mode 100644
+index fa830d38811..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
++++ /dev/null
+@@ -1,315 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * Interceptor that does not do anything other than forwarding it to the next
+- * Interceptor in the chain.
+- */
+-public class PassThroughClientRequestInterceptor extends AbstractClientRequestInterceptor {
+-
+-  @Override
+-  public GetNewApplicationResponse getNewApplication(
+-      GetNewApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNewApplication(request);
+-  }
+-
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().submitApplication(request);
+-  }
+-
+-  @Override
+-  public KillApplicationResponse forceKillApplication(
+-      KillApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().forceKillApplication(request);
+-  }
+-
+-  @Override
+-  public GetClusterMetricsResponse getClusterMetrics(
+-      GetClusterMetricsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getClusterMetrics(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodes(request);
+-  }
+-
+-  @Override
+-  public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getQueueInfo(request);
+-  }
+-
+-  @Override
+-  public GetQueueUserAclsInfoResponse getQueueUserAcls(
+-      GetQueueUserAclsInfoRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getQueueUserAcls(request);
+-  }
+-
+-  @Override
+-  public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      MoveApplicationAcrossQueuesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().moveApplicationAcrossQueues(request);
+-  }
+-
+-  @Override
+-  public GetNewReservationResponse getNewReservation(
+-      GetNewReservationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNewReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationSubmissionResponse submitReservation(
+-      ReservationSubmissionRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().submitReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationListResponse listReservations(
+-      ReservationListRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().listReservations(request);
+-  }
+-
+-  @Override
+-  public ReservationUpdateResponse updateReservation(
+-      ReservationUpdateRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().updateReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationDeleteResponse deleteReservation(
+-      ReservationDeleteRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().deleteReservation(request);
+-  }
+-
+-  @Override
+-  public GetNodesToLabelsResponse getNodeToLabels(
+-      GetNodesToLabelsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNodeToLabels(request);
+-  }
+-
+-  @Override
+-  public GetLabelsToNodesResponse getLabelsToNodes(
+-      GetLabelsToNodesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getLabelsToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeLabelsResponse getClusterNodeLabels(
+-      GetClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public GetApplicationReportResponse getApplicationReport(
+-      GetApplicationReportRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationsResponse getApplications(GetApplicationsRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getApplications(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      GetApplicationAttemptReportRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationAttemptReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptsResponse getApplicationAttempts(
+-      GetApplicationAttemptsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationAttempts(request);
+-  }
+-
+-  @Override
+-  public GetContainerReportResponse getContainerReport(
+-      GetContainerReportRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getContainerReport(request);
+-  }
+-
+-  @Override
+-  public GetContainersResponse getContainers(GetContainersRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getContainers(request);
+-  }
+-
+-  @Override
+-  public GetDelegationTokenResponse getDelegationToken(
+-      GetDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getDelegationToken(request);
+-  }
+-
+-  @Override
+-  public RenewDelegationTokenResponse renewDelegationToken(
+-      RenewDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().renewDelegationToken(request);
+-  }
+-
+-  @Override
+-  public CancelDelegationTokenResponse cancelDelegationToken(
+-      CancelDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().cancelDelegationToken(request);
+-  }
+-
+-  @Override
+-  public FailApplicationAttemptResponse failApplicationAttempt(
+-      FailApplicationAttemptRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().failApplicationAttempt(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationPriorityResponse updateApplicationPriority(
+-      UpdateApplicationPriorityRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().updateApplicationPriority(request);
+-  }
+-
+-  @Override
+-  public SignalContainerResponse signalToContainer(
+-      SignalContainerRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().signalToContainer(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
+-      UpdateApplicationTimeoutsRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().updateApplicationTimeouts(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceProfilesResponse getResourceProfiles(
+-      GetAllResourceProfilesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceProfiles(request);
+-  }
+-
+-  @Override
+-  public GetResourceProfileResponse getResourceProfile(
+-      GetResourceProfileRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceProfile(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceTypeInfoResponse getResourceTypeInfo(
+-      GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceTypeInfo(request);
+-  }
+-
+-  @Override
+-  public GetAttributesToNodesResponse getAttributesToNodes(
+-      GetAttributesToNodesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeAttributesResponse getClusterNodeAttributes(
+-      GetClusterNodeAttributesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodeAttributes(request);
+-  }
+-
+-  @Override
+-  public GetNodesToAttributesResponse getNodesToAttributes(
+-      GetNodesToAttributesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNodesToAttributes(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java
+deleted file mode 100644
+index 3d45ad207cf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterClientRMService.java
++++ /dev/null
+@@ -1,667 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-import java.net.InetAddress;
+-import java.net.InetSocketAddress;
+-import java.net.URL;
+-import java.util.Collections;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.PolicyProvider;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.server.router.security.authorize.RouterPolicyProvider;
+-import org.apache.hadoop.yarn.util.LRUCacheHashMap;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-/**
+- * RouterClientRMService is a service that runs on each router that can be used
+- * to intercept and inspect {@link ApplicationClientProtocol} messages from
+- * client to the cluster resource manager. It listens
+- * {@link ApplicationClientProtocol} messages from the client and creates a
+- * request intercepting pipeline instance for each client. The pipeline is a
+- * chain of {@link ClientRequestInterceptor} instances that can inspect and
+- * modify the request/response as needed. The main difference with
+- * AMRMProxyService is the protocol they implement.
+- */
+-public class RouterClientRMService extends AbstractService
+-    implements ApplicationClientProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterClientRMService.class);
+-
+-  private Server server;
+-  private InetSocketAddress listenerEndpoint;
+-
+-  // For each user we store an interceptors' pipeline.
+-  // For performance issue we use LRU cache to keep in memory the newest ones
+-  // and remove the oldest used ones.
+-  private Map<String, RequestInterceptorChainWrapper> userPipelineMap;
+-
+-  private URL redirectURL;
+-  private RouterDelegationTokenSecretManager routerDTSecretManager;
+-
+-  public RouterClientRMService() {
+-    super(RouterClientRMService.class.getName());
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    LOG.info("Starting Router ClientRMService.");
+-    Configuration conf = getConfig();
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    UserGroupInformation.setConfiguration(conf);
+-
+-    this.listenerEndpoint =
+-        conf.getSocketAddr(YarnConfiguration.ROUTER_BIND_HOST,
+-            YarnConfiguration.ROUTER_CLIENTRM_ADDRESS,
+-            YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_ADDRESS,
+-            YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_PORT);
+-
+-    if (RouterServerUtil.isRouterWebProxyEnable(conf)) {
+-      redirectURL = getRedirectURL();
+-    }
+-
+-    int maxCacheSize =
+-        conf.getInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-            YarnConfiguration.DEFAULT_ROUTER_PIPELINE_CACHE_MAX_SIZE);
+-    this.userPipelineMap = Collections.synchronizedMap(new LRUCacheHashMap<>(maxCacheSize, true));
+-
+-    Configuration serverConf = new Configuration(conf);
+-
+-    int numWorkerThreads =
+-        serverConf.getInt(YarnConfiguration.RM_CLIENT_THREAD_COUNT,
+-            YarnConfiguration.DEFAULT_RM_CLIENT_THREAD_COUNT);
+-
+-    // Initialize RouterRMDelegationTokenSecretManager.
+-    routerDTSecretManager = createRouterRMDelegationTokenSecretManager(conf);
+-    routerDTSecretManager.startThreads();
+-
+-    this.server = rpc.getServer(ApplicationClientProtocol.class, this,
+-        listenerEndpoint, serverConf, routerDTSecretManager, numWorkerThreads);
+-
+-    // Enable service authorization?
+-    if (conf.getBoolean(
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, false)) {
+-      refreshServiceAcls(conf, RouterPolicyProvider.getInstance());
+-    }
+-
+-    this.server.start();
+-    LOG.info("Router ClientRMService listening on address: {}.", this.server.getListenerAddress());
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping Router ClientRMService.");
+-    if (this.server != null) {
+-      this.server.stop();
+-    }
+-    userPipelineMap.clear();
+-    super.serviceStop();
+-  }
+-
+-  @VisibleForTesting
+-  public Server getServer() {
+-    return this.server;
+-  }
+-
+-  @Override
+-  public GetNewApplicationResponse getNewApplication(
+-      GetNewApplicationRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getNewApplication(request);
+-  }
+-
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().submitApplication(request);
+-  }
+-
+-  @Override
+-  public KillApplicationResponse forceKillApplication(
+-      KillApplicationRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().forceKillApplication(request);
+-  }
+-
+-  @Override
+-  public GetClusterMetricsResponse getClusterMetrics(
+-      GetClusterMetricsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getClusterMetrics(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getClusterNodes(request);
+-  }
+-
+-  @Override
+-  public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getQueueInfo(request);
+-  }
+-
+-  @Override
+-  public GetQueueUserAclsInfoResponse getQueueUserAcls(
+-      GetQueueUserAclsInfoRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getQueueUserAcls(request);
+-  }
+-
+-  @Override
+-  public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      MoveApplicationAcrossQueuesRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().moveApplicationAcrossQueues(request);
+-  }
+-
+-  @Override
+-  public GetNewReservationResponse getNewReservation(
+-      GetNewReservationRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getNewReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationSubmissionResponse submitReservation(
+-      ReservationSubmissionRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().submitReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationListResponse listReservations(
+-      ReservationListRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().listReservations(request);
+-  }
+-
+-  @Override
+-  public ReservationUpdateResponse updateReservation(
+-      ReservationUpdateRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().updateReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationDeleteResponse deleteReservation(
+-      ReservationDeleteRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().deleteReservation(request);
+-  }
+-
+-  @Override
+-  public GetNodesToLabelsResponse getNodeToLabels(
+-      GetNodesToLabelsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getNodeToLabels(request);
+-  }
+-
+-  @Override
+-  public GetLabelsToNodesResponse getLabelsToNodes(
+-      GetLabelsToNodesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getLabelsToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeLabelsResponse getClusterNodeLabels(
+-      GetClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public GetApplicationReportResponse getApplicationReport(
+-      GetApplicationReportRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    GetApplicationReportResponse response = pipeline.getRootInterceptor()
+-        .getApplicationReport(request);
+-    if (RouterServerUtil.isRouterWebProxyEnable(getConfig())) {
+-      // After redirect url, tracking url in application report will
+-      // redirect to embeded proxy server of router
+-      URL url = new URL(response.getApplicationReport().getTrackingUrl());
+-      String redirectUrl = new URL(redirectURL.getProtocol(),
+-          redirectURL.getHost(), redirectURL.getPort(), url.getFile())
+-          .toString();
+-      if (LOG.isDebugEnabled()) {
+-        LOG.debug("The tracking url of application {} is redirect from {} to {}",
+-            response.getApplicationReport().getApplicationId(), url, redirectUrl);
+-      }
+-      response.getApplicationReport().setTrackingUrl(redirectUrl);
+-    }
+-    return response;
+-  }
+-
+-  @Override
+-  public GetApplicationsResponse getApplications(GetApplicationsRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getApplications(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      GetApplicationAttemptReportRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getApplicationAttemptReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptsResponse getApplicationAttempts(
+-      GetApplicationAttemptsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getApplicationAttempts(request);
+-  }
+-
+-  @Override
+-  public GetContainerReportResponse getContainerReport(
+-      GetContainerReportRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getContainerReport(request);
+-  }
+-
+-  @Override
+-  public GetContainersResponse getContainers(GetContainersRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getContainers(request);
+-  }
+-
+-  @Override
+-  public GetDelegationTokenResponse getDelegationToken(
+-      GetDelegationTokenRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getDelegationToken(request);
+-  }
+-
+-  @Override
+-  public RenewDelegationTokenResponse renewDelegationToken(
+-      RenewDelegationTokenRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().renewDelegationToken(request);
+-  }
+-
+-  @Override
+-  public CancelDelegationTokenResponse cancelDelegationToken(
+-      CancelDelegationTokenRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().cancelDelegationToken(request);
+-  }
+-
+-  @Override
+-  public FailApplicationAttemptResponse failApplicationAttempt(
+-      FailApplicationAttemptRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().failApplicationAttempt(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationPriorityResponse updateApplicationPriority(
+-      UpdateApplicationPriorityRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().updateApplicationPriority(request);
+-  }
+-
+-  @Override
+-  public SignalContainerResponse signalToContainer(
+-      SignalContainerRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().signalToContainer(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
+-      UpdateApplicationTimeoutsRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().updateApplicationTimeouts(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceProfilesResponse getResourceProfiles(
+-      GetAllResourceProfilesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getResourceProfiles(request);
+-  }
+-
+-  @Override
+-  public GetResourceProfileResponse getResourceProfile(
+-      GetResourceProfileRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getResourceProfile(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceTypeInfoResponse getResourceTypeInfo(
+-      GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getResourceTypeInfo(request);
+-  }
+-
+-  @Override
+-  public GetAttributesToNodesResponse getAttributesToNodes(
+-      GetAttributesToNodesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeAttributesResponse getClusterNodeAttributes(
+-      GetClusterNodeAttributesRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getClusterNodeAttributes(request);
+-  }
+-
+-  @Override
+-  public GetNodesToAttributesResponse getNodesToAttributes(
+-      GetNodesToAttributesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getNodesToAttributes(request);
+-  }
+-
+-  @VisibleForTesting
+-  public RequestInterceptorChainWrapper getInterceptorChain()
+-      throws IOException {
+-    String user = UserGroupInformation.getCurrentUser().getUserName();
+-    RequestInterceptorChainWrapper chain = userPipelineMap.get(user);
+-    if (chain != null && chain.getRootInterceptor() != null) {
+-      return chain;
+-    }
+-    return initializePipeline(user);
+-  }
+-
+-  void refreshServiceAcls(Configuration configuration,
+-      PolicyProvider policyProvider) {
+-    this.server.refreshServiceAcl(configuration, policyProvider);
+-  }
+-
+-  /**
+-   * Gets the Request interceptor chains for all the users.
+-   *
+-   * @return the request interceptor chains.
+-   */
+-  @VisibleForTesting
+-  protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
+-    return this.userPipelineMap;
+-  }
+-
+-  /**
+-   * This method creates and returns reference of the first interceptor in the
+-   * chain of request interceptor instances.
+-   *
+-   * @return the reference of the first interceptor in the chain
+-   */
+-  @VisibleForTesting
+-  protected ClientRequestInterceptor createRequestInterceptorChain() {
+-    Configuration conf = getConfig();
+-    return RouterServerUtil.createRequestInterceptorChain(conf,
+-        YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_INTERCEPTOR_CLASS,
+-        ClientRequestInterceptor.class);
+-  }
+-
+-  /**
+-   * Initializes the request interceptor pipeline for the specified application.
+-   *
+-   * @param user
+-   */
+-  private RequestInterceptorChainWrapper initializePipeline(String user) {
+-    synchronized (this.userPipelineMap) {
+-      if (this.userPipelineMap.containsKey(user)) {
+-        LOG.info("Request to start an already existing user: {}"
+-            + " was received, so ignoring.", user);
+-        return userPipelineMap.get(user);
+-      }
+-
+-      RequestInterceptorChainWrapper chainWrapper =
+-          new RequestInterceptorChainWrapper();
+-      try {
+-        // We should init the pipeline instance after it is created and then
+-        // add to the map, to ensure thread safe.
+-        LOG.info("Initializing request processing pipeline for application for the user: {}.",
+-            user);
+-
+-        ClientRequestInterceptor interceptorChain =
+-            this.createRequestInterceptorChain();
+-        interceptorChain.init(user);
+-
+-        // We set the RouterDelegationTokenSecretManager instance to the interceptorChain
+-        // and let the interceptor use it.
+-        if (routerDTSecretManager != null) {
+-          interceptorChain.setTokenSecretManager(routerDTSecretManager);
+-        }
+-
+-        chainWrapper.init(interceptorChain);
+-      } catch (Exception e) {
+-        LOG.error("Init ClientRequestInterceptor error for user: {}.", user, e);
+-        throw e;
+-      }
+-
+-      this.userPipelineMap.put(user, chainWrapper);
+-      return chainWrapper;
+-    }
+-  }
+-
+-  /**
+-   * Private structure for encapsulating RequestInterceptor and user instances.
+-   *
+-   */
+-  @Private
+-  public static class RequestInterceptorChainWrapper {
+-    private ClientRequestInterceptor rootInterceptor;
+-
+-    /**
+-     * Initializes the wrapper with the specified parameters.
+-     *
+-     * @param interceptor the first interceptor in the pipeline
+-     */
+-    public synchronized void init(ClientRequestInterceptor interceptor) {
+-      this.rootInterceptor = interceptor;
+-    }
+-
+-    /**
+-     * Gets the root request interceptor.
+-     *
+-     * @return the root request interceptor
+-     */
+-    public synchronized ClientRequestInterceptor getRootInterceptor() {
+-      return rootInterceptor;
+-    }
+-
+-    /**
+-     * Shutdown the chain of interceptors when the object is destroyed.
+-     */
+-    @Override
+-    protected void finalize() {
+-      rootInterceptor.shutdown();
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  public Map<String, RequestInterceptorChainWrapper> getUserPipelineMap() {
+-    return userPipelineMap;
+-  }
+-
+-  /**
+-   * Create RouterRMDelegationTokenSecretManager.
+-   * In the YARN federation, the Router will replace the RM to
+-   * manage the RMDelegationToken (generate, update, cancel),
+-   * so the relevant configuration parameters still obtain the configuration parameters of the RM.
+-   *
+-   * @param conf Configuration
+-   * @return RouterDelegationTokenSecretManager.
+-   */
+-  protected RouterDelegationTokenSecretManager createRouterRMDelegationTokenSecretManager(
+-      Configuration conf) {
+-
+-    long secretKeyInterval = conf.getLong(
+-        YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT);
+-
+-    long tokenMaxLifetime = conf.getLong(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT);
+-
+-    long tokenRenewInterval = conf.getLong(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT);
+-
+-    long removeScanInterval = conf.getTimeDuration(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_DEFAULT,
+-        TimeUnit.MILLISECONDS);
+-
+-    return new RouterDelegationTokenSecretManager(secretKeyInterval,
+-        tokenMaxLifetime, tokenRenewInterval, removeScanInterval, conf);
+-  }
+-
+-  @VisibleForTesting
+-  public RouterDelegationTokenSecretManager getRouterDTSecretManager() {
+-    return routerDTSecretManager;
+-  }
+-
+-  @VisibleForTesting
+-  public void setRouterDTSecretManager(RouterDelegationTokenSecretManager routerDTSecretManager) {
+-    this.routerDTSecretManager = routerDTSecretManager;
+-  }
+-
+-  @VisibleForTesting
+-  public void initUserPipelineMap(Configuration conf) {
+-    int maxCacheSize = conf.getInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-        YarnConfiguration.DEFAULT_ROUTER_PIPELINE_CACHE_MAX_SIZE);
+-    this.userPipelineMap = Collections.synchronizedMap(new LRUCacheHashMap<>(maxCacheSize, true));
+-  }
+-
+-  private URL getRedirectURL() throws Exception {
+-    Configuration conf = getConfig();
+-    String webAppAddress = WebAppUtils.getWebAppBindURL(conf, YarnConfiguration.ROUTER_BIND_HOST,
+-        WebAppUtils.getRouterWebAppURLWithoutScheme(conf));
+-    String[] hostPort = StringUtils.split(webAppAddress, ':');
+-    if (hostPort.length != 2) {
+-      throw new YarnRuntimeException("Router can't get valid redirect proxy url");
+-    }
+-    String host = hostPort[0];
+-    int port = Integer.parseInt(hostPort[1]);
+-    if (StringUtils.isBlank(host) || host.equals("0.0.0.0")) {
+-      host = InetAddress.getLocalHost().getCanonicalHostName();
+-    }
+-    return new URL(YarnConfiguration.useHttps(this.getConfig()) ? "https" : "http", host, port, "");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterYarnClientUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterYarnClientUtils.java
+deleted file mode 100644
+index feba3f0cad1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/RouterYarnClientUtils.java
++++ /dev/null
+@@ -1,575 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.Set;
+-import java.util.HashSet;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
+-import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+-import org.apache.hadoop.yarn.api.records.NodeReport;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
+-import org.apache.hadoop.yarn.api.records.ReservationAllocationState;
+-import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
+-import org.apache.hadoop.yarn.api.records.QueueInfo;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeKey;
+-import org.apache.hadoop.yarn.api.records.NodeToAttributeValue;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeInfo;
+-import org.apache.hadoop.yarn.server.uam.UnmanagedApplicationManager;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-
+-/**
+- * Util class for Router Yarn client API calls.
+- */
+-public final class RouterYarnClientUtils {
+-
+-  private final static String PARTIAL_REPORT = "Partial Report ";
+-
+-  private RouterYarnClientUtils() {
+-
+-  }
+-
+-  public static GetClusterMetricsResponse merge(
+-      Collection<GetClusterMetricsResponse> responses) {
+-    YarnClusterMetrics tmp = YarnClusterMetrics.newInstance(0);
+-    for (GetClusterMetricsResponse response : responses) {
+-      YarnClusterMetrics metrics = response.getClusterMetrics();
+-      tmp.setNumNodeManagers(
+-          tmp.getNumNodeManagers() + metrics.getNumNodeManagers());
+-      tmp.setNumActiveNodeManagers(
+-          tmp.getNumActiveNodeManagers() + metrics.getNumActiveNodeManagers());
+-      tmp.setNumDecommissioningNodeManagers(
+-          tmp.getNumDecommissioningNodeManagers() + metrics
+-              .getNumDecommissioningNodeManagers());
+-      tmp.setNumDecommissionedNodeManagers(
+-          tmp.getNumDecommissionedNodeManagers() + metrics
+-              .getNumDecommissionedNodeManagers());
+-      tmp.setNumLostNodeManagers(
+-          tmp.getNumLostNodeManagers() + metrics.getNumLostNodeManagers());
+-      tmp.setNumRebootedNodeManagers(tmp.getNumRebootedNodeManagers() + metrics
+-          .getNumRebootedNodeManagers());
+-      tmp.setNumUnhealthyNodeManagers(
+-          tmp.getNumUnhealthyNodeManagers() + metrics
+-              .getNumUnhealthyNodeManagers());
+-      tmp.setNumShutdownNodeManagers(
+-          tmp.getNumShutdownNodeManagers() + metrics
+-              .getNumShutdownNodeManagers());
+-    }
+-    return GetClusterMetricsResponse.newInstance(tmp);
+-  }
+-
+-  /**
+-   * Merges a list of ApplicationReports grouping by ApplicationId.
+-   * Our current policy is to merge the application reports from the reachable
+-   * SubClusters.
+-   * @param responses a list of ApplicationResponse to merge
+-   * @param returnPartialResult if the merge ApplicationReports should contain
+-   * partial result or not
+-   * @return the merged ApplicationsResponse
+-   */
+-  public static GetApplicationsResponse mergeApplications(
+-      Collection<GetApplicationsResponse> responses,
+-      boolean returnPartialResult){
+-    Map<ApplicationId, ApplicationReport> federationAM = new HashMap<>();
+-    Map<ApplicationId, ApplicationReport> federationUAMSum = new HashMap<>();
+-
+-    for (GetApplicationsResponse appResponse : responses){
+-      for (ApplicationReport appReport : appResponse.getApplicationList()){
+-        ApplicationId appId = appReport.getApplicationId();
+-        // Check if this ApplicationReport is an AM
+-        if (!appReport.isUnmanagedApp()) {
+-          // Insert in the list of AM
+-          federationAM.put(appId, appReport);
+-          // Check if there are any UAM found before
+-          if (federationUAMSum.containsKey(appId)) {
+-            // Merge the current AM with the found UAM
+-            mergeAMWithUAM(appReport, federationUAMSum.get(appId));
+-            // Remove the sum of the UAMs
+-            federationUAMSum.remove(appId);
+-          }
+-          // This ApplicationReport is an UAM
+-        } else if (federationAM.containsKey(appId)) {
+-          // Merge the current UAM with its own AM
+-          mergeAMWithUAM(federationAM.get(appId), appReport);
+-        } else if (federationUAMSum.containsKey(appId)) {
+-          // Merge the current UAM with its own UAM and update the list of UAM
+-          ApplicationReport mergedUAMReport =
+-              mergeUAMWithUAM(federationUAMSum.get(appId), appReport);
+-          federationUAMSum.put(appId, mergedUAMReport);
+-        } else {
+-          // Insert in the list of UAM
+-          federationUAMSum.put(appId, appReport);
+-        }
+-      }
+-    }
+-    // Check the remaining UAMs are depending or not from federation
+-    for (ApplicationReport appReport : federationUAMSum.values()) {
+-      if (mergeUamToReport(appReport.getName(), returnPartialResult)) {
+-        federationAM.put(appReport.getApplicationId(), appReport);
+-      }
+-    }
+-
+-    return GetApplicationsResponse.newInstance(federationAM.values());
+-  }
+-
+-  private static ApplicationReport mergeUAMWithUAM(ApplicationReport uam1,
+-      ApplicationReport uam2){
+-    uam1.setName(PARTIAL_REPORT + uam1.getApplicationId());
+-    mergeAMWithUAM(uam1, uam2);
+-    return uam1;
+-  }
+-
+-  private static void mergeAMWithUAM(ApplicationReport am,
+-      ApplicationReport uam){
+-    ApplicationResourceUsageReport amResourceReport =
+-        am.getApplicationResourceUsageReport();
+-
+-    ApplicationResourceUsageReport uamResourceReport =
+-        uam.getApplicationResourceUsageReport();
+-
+-    if (amResourceReport == null) {
+-      am.setApplicationResourceUsageReport(uamResourceReport);
+-    } else if (uamResourceReport != null) {
+-
+-      amResourceReport.setNumUsedContainers(
+-          amResourceReport.getNumUsedContainers() +
+-              uamResourceReport.getNumUsedContainers());
+-
+-      amResourceReport.setNumReservedContainers(
+-          amResourceReport.getNumReservedContainers() +
+-              uamResourceReport.getNumReservedContainers());
+-
+-      amResourceReport.setUsedResources(Resources.add(
+-          amResourceReport.getUsedResources(),
+-          uamResourceReport.getUsedResources()));
+-
+-      amResourceReport.setReservedResources(Resources.add(
+-          amResourceReport.getReservedResources(),
+-          uamResourceReport.getReservedResources()));
+-
+-      amResourceReport.setNeededResources(Resources.add(
+-          amResourceReport.getNeededResources(),
+-          uamResourceReport.getNeededResources()));
+-
+-      amResourceReport.setMemorySeconds(
+-          amResourceReport.getMemorySeconds() +
+-              uamResourceReport.getMemorySeconds());
+-
+-      amResourceReport.setVcoreSeconds(
+-          amResourceReport.getVcoreSeconds() +
+-              uamResourceReport.getVcoreSeconds());
+-
+-      amResourceReport.setQueueUsagePercentage(
+-          amResourceReport.getQueueUsagePercentage() +
+-              uamResourceReport.getQueueUsagePercentage());
+-
+-      amResourceReport.setClusterUsagePercentage(
+-          amResourceReport.getClusterUsagePercentage() +
+-              uamResourceReport.getClusterUsagePercentage());
+-
+-      am.setApplicationResourceUsageReport(amResourceReport);
+-    }
+-  }
+-
+-  /**
+-   * Returns whether or not to add an unmanaged application to the report.
+-   * @param appName Application Name
+-   * @param returnPartialResult if the merge ApplicationReports should contain
+-   * partial result or not
+-   */
+-  private static boolean mergeUamToReport(String appName,
+-      boolean returnPartialResult){
+-    if (returnPartialResult) {
+-      return true;
+-    }
+-    if (appName == null) {
+-      return false;
+-    }
+-    return !(appName.startsWith(UnmanagedApplicationManager.APP_NAME) ||
+-        appName.startsWith(PARTIAL_REPORT));
+-  }
+-
+-  /**
+-   * Merges a list of GetClusterNodesResponse.
+-   *
+-   * @param responses a list of GetClusterNodesResponse to merge.
+-   * @return the merged GetClusterNodesResponse.
+-   */
+-  public static GetClusterNodesResponse mergeClusterNodesResponse(
+-      Collection<GetClusterNodesResponse> responses) {
+-    GetClusterNodesResponse clusterNodesResponse = Records.newRecord(GetClusterNodesResponse.class);
+-    List<NodeReport> nodeReports = new ArrayList<>();
+-    for (GetClusterNodesResponse response : responses) {
+-      if (response != null && response.getNodeReports() != null) {
+-        nodeReports.addAll(response.getNodeReports());
+-      }
+-    }
+-    clusterNodesResponse.setNodeReports(nodeReports);
+-    return clusterNodesResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetNodesToLabelsResponse.
+-   *
+-   * @param responses a list of GetNodesToLabelsResponse to merge.
+-   * @return the merged GetNodesToLabelsResponse.
+-   */
+-  public static GetNodesToLabelsResponse mergeNodesToLabelsResponse(
+-      Collection<GetNodesToLabelsResponse> responses) {
+-    GetNodesToLabelsResponse nodesToLabelsResponse = Records.newRecord(
+-         GetNodesToLabelsResponse.class);
+-    Map<NodeId, Set<String>> nodesToLabelMap = new HashMap<>();
+-    for (GetNodesToLabelsResponse response : responses) {
+-      if (response != null && response.getNodeToLabels() != null) {
+-        nodesToLabelMap.putAll(response.getNodeToLabels());
+-      }
+-    }
+-    nodesToLabelsResponse.setNodeToLabels(nodesToLabelMap);
+-    return nodesToLabelsResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetLabelsToNodesResponse.
+-   *
+-   * @param responses a list of GetLabelsToNodesResponse to merge.
+-   * @return the merged GetLabelsToNodesResponse.
+-   */
+-  public static GetLabelsToNodesResponse mergeLabelsToNodes(
+-      Collection<GetLabelsToNodesResponse> responses){
+-    GetLabelsToNodesResponse labelsToNodesResponse = Records.newRecord(
+-        GetLabelsToNodesResponse.class);
+-    Map<String, Set<NodeId>> labelsToNodesMap = new HashMap<>();
+-    for (GetLabelsToNodesResponse response : responses) {
+-      if (response != null && response.getLabelsToNodes() != null) {
+-        Map<String, Set<NodeId>> clusterLabelsToNodesMap = response.getLabelsToNodes();
+-        for (Map.Entry<String, Set<NodeId>> entry : clusterLabelsToNodesMap.entrySet()) {
+-          String label = entry.getKey();
+-          Set<NodeId> clusterNodes = entry.getValue();
+-          if (labelsToNodesMap.containsKey(label)) {
+-            Set<NodeId> allNodes = labelsToNodesMap.get(label);
+-            allNodes.addAll(clusterNodes);
+-          } else {
+-            labelsToNodesMap.put(label, clusterNodes);
+-          }
+-        }
+-      }
+-    }
+-    labelsToNodesResponse.setLabelsToNodes(labelsToNodesMap);
+-    return labelsToNodesResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetClusterNodeLabelsResponse.
+-   *
+-   * @param responses a list of GetClusterNodeLabelsResponse to merge.
+-   * @return the merged GetClusterNodeLabelsResponse.
+-   */
+-  public static GetClusterNodeLabelsResponse mergeClusterNodeLabelsResponse(
+-      Collection<GetClusterNodeLabelsResponse> responses) {
+-    GetClusterNodeLabelsResponse nodeLabelsResponse = Records.newRecord(
+-        GetClusterNodeLabelsResponse.class);
+-    Set<NodeLabel> nodeLabelsList = new HashSet<>();
+-    for (GetClusterNodeLabelsResponse response : responses) {
+-      if (response != null && response.getNodeLabelList() != null) {
+-        nodeLabelsList.addAll(response.getNodeLabelList());
+-      }
+-    }
+-    nodeLabelsResponse.setNodeLabelList(new ArrayList<>(nodeLabelsList));
+-    return nodeLabelsResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetQueueUserAclsInfoResponse.
+-   *
+-   * @param responses a list of GetQueueUserAclsInfoResponse to merge.
+-   * @return the merged GetQueueUserAclsInfoResponse.
+-   */
+-  public static GetQueueUserAclsInfoResponse mergeQueueUserAcls(
+-      Collection<GetQueueUserAclsInfoResponse> responses) {
+-    GetQueueUserAclsInfoResponse aclsInfoResponse = Records.newRecord(
+-        GetQueueUserAclsInfoResponse.class);
+-    Set<QueueUserACLInfo> queueUserACLInfos = new HashSet<>();
+-    for (GetQueueUserAclsInfoResponse response : responses) {
+-      if (response != null && response.getUserAclsInfoList() != null) {
+-        queueUserACLInfos.addAll(response.getUserAclsInfoList());
+-      }
+-    }
+-    aclsInfoResponse.setUserAclsInfoList(new ArrayList<>(queueUserACLInfos));
+-    return aclsInfoResponse;
+-  }
+-
+-  /**
+-   * Merges a list of ReservationListResponse.
+-   *
+-   * @param responses a list of ReservationListResponse to merge.
+-   * @return the merged ReservationListResponse.
+-   */
+-  public static ReservationListResponse mergeReservationsList(
+-      Collection<ReservationListResponse> responses) {
+-    ReservationListResponse reservationListResponse =
+-        Records.newRecord(ReservationListResponse.class);
+-    List<ReservationAllocationState> reservationAllocationStates =
+-        new ArrayList<>();
+-    for (ReservationListResponse response : responses) {
+-      if (response != null && response.getReservationAllocationState() != null) {
+-        reservationAllocationStates.addAll(
+-            response.getReservationAllocationState());
+-      }
+-    }
+-    reservationListResponse.setReservationAllocationState(
+-        reservationAllocationStates);
+-    return reservationListResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetAllResourceTypeInfoResponse.
+-   *
+-   * @param responses a list of GetAllResourceTypeInfoResponse to merge.
+-   * @return the merged GetAllResourceTypeInfoResponse.
+-   */
+-  public static GetAllResourceTypeInfoResponse mergeResourceTypes(
+-      Collection<GetAllResourceTypeInfoResponse> responses) {
+-    GetAllResourceTypeInfoResponse resourceTypeInfoResponse =
+-        Records.newRecord(GetAllResourceTypeInfoResponse.class);
+-    Set<ResourceTypeInfo> resourceTypeInfoSet = new HashSet<>();
+-    for (GetAllResourceTypeInfoResponse response : responses) {
+-      if (response != null && response.getResourceTypeInfo() != null) {
+-        resourceTypeInfoSet.addAll(response.getResourceTypeInfo());
+-      }
+-    }
+-    resourceTypeInfoResponse.setResourceTypeInfo(
+-        new ArrayList<>(resourceTypeInfoSet));
+-    return resourceTypeInfoResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetQueueInfoResponse.
+-   *
+-   * @param responses a list of GetQueueInfoResponse to merge.
+-   * @return the merged GetQueueInfoResponse.
+-   */
+-  public static GetQueueInfoResponse mergeQueues(
+-      Collection<GetQueueInfoResponse> responses) {
+-    GetQueueInfoResponse queueResponse = Records.newRecord(
+-        GetQueueInfoResponse.class);
+-
+-    QueueInfo queueInfo = null;
+-    for (GetQueueInfoResponse response : responses) {
+-      if (response != null && response.getQueueInfo() != null) {
+-        if (queueInfo == null) {
+-          queueInfo = response.getQueueInfo();
+-        } else {
+-          // set Capacity\MaximumCapacity\CurrentCapacity
+-          queueInfo.setCapacity(queueInfo.getCapacity() + response.getQueueInfo().getCapacity());
+-          queueInfo.setMaximumCapacity(
+-              queueInfo.getMaximumCapacity() + response.getQueueInfo().getMaximumCapacity());
+-          queueInfo.setCurrentCapacity(
+-              queueInfo.getCurrentCapacity() + response.getQueueInfo().getCurrentCapacity());
+-
+-          // set childQueues
+-          List<QueueInfo> childQueues = new ArrayList<>(queueInfo.getChildQueues());
+-          childQueues.addAll(response.getQueueInfo().getChildQueues());
+-          queueInfo.setChildQueues(childQueues);
+-
+-          // set applications
+-          List<ApplicationReport> applicationReports = new ArrayList<>(queueInfo.getApplications());
+-          applicationReports.addAll(response.getQueueInfo().getApplications());
+-          queueInfo.setApplications(applicationReports);
+-
+-          // set accessibleNodeLabels
+-          Set<String> accessibleNodeLabels = new HashSet<>();
+-          if (queueInfo.getAccessibleNodeLabels() != null) {
+-            accessibleNodeLabels.addAll(queueInfo.getAccessibleNodeLabels());
+-          }
+-
+-          // set min resourceVCore
+-          queueInfo.setMinResourceVCore(queueInfo.getMinResourceVCore() +
+-              response.getQueueInfo().getMinResourceVCore());
+-
+-          // set min resourceMemory
+-          queueInfo.setMinResourceMemory(queueInfo.getMinResourceMemory() +
+-              response.getQueueInfo().getMinResourceMemory());
+-
+-          // set max resourceVCore
+-          queueInfo.setMinResourceVCore(queueInfo.getMaxResourceVCore() +
+-              response.getQueueInfo().getMaxResourceVCore());
+-
+-          // set max resourceMemory
+-          queueInfo.setMinResourceMemory(queueInfo.getMaxResourceMemory() +
+-              response.getQueueInfo().getMaxResourceMemory());
+-
+-          // set reserved resourceVCore
+-          queueInfo.setReservedResourceVCore(queueInfo.getReservedResourceVCore() +
+-              response.getQueueInfo().getMaxResourceVCore());
+-
+-          // set reserved resourceMemory
+-          queueInfo.setReservedResourceMemory(queueInfo.getReservedResourceMemory() +
+-              response.getQueueInfo().getMaxResourceMemory());
+-
+-          // set maxRunningApp
+-          queueInfo.setMaxRunningApp(queueInfo.getMaxRunningApp() +
+-              response.getQueueInfo().getMaxRunningApp());
+-
+-          // set steadyFairShareVCore
+-          queueInfo.setSteadyFairShareVCore(queueInfo.getSteadyFairShareVCore() +
+-              response.getQueueInfo().getSteadyFairShareVCore());
+-
+-          // set steadyFairShareMemory
+-          queueInfo.setSteadyFairShareMemory(queueInfo.getSteadyFairShareMemory() +
+-              response.getQueueInfo().getSteadyFairShareMemory());
+-
+-          // set Weight
+-          queueInfo.setWeight(queueInfo.getWeight() +
+-              response.getQueueInfo().getWeight());
+-
+-          if (response.getQueueInfo() != null) {
+-            accessibleNodeLabels.addAll(response.getQueueInfo().getAccessibleNodeLabels());
+-          }
+-          queueInfo.setAccessibleNodeLabels(accessibleNodeLabels);
+-        }
+-      }
+-    }
+-    queueResponse.setQueueInfo(queueInfo);
+-    return queueResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetAllResourceProfilesResponse.
+-   *
+-   * @param responses a list of GetAllResourceProfilesResponse to merge.
+-   * @return the merged GetAllResourceProfilesResponse.
+-   */
+-  public static GetAllResourceProfilesResponse mergeClusterResourceProfilesResponse(
+-      Collection<GetAllResourceProfilesResponse> responses) {
+-    GetAllResourceProfilesResponse profilesResponse =
+-        Records.newRecord(GetAllResourceProfilesResponse.class);
+-    Map<String, Resource> profilesMap = new HashMap<>();
+-    for (GetAllResourceProfilesResponse response : responses) {
+-      if (response != null && response.getResourceProfiles() != null) {
+-        for (Map.Entry<String, Resource> entry : response.getResourceProfiles().entrySet()) {
+-          String key = entry.getKey();
+-          Resource r1 = profilesMap.getOrDefault(key, null);
+-          Resource r2 = entry.getValue();
+-          Resource rAdd = r1 == null ? r2 : Resources.add(r1, r2);
+-          profilesMap.put(key, rAdd);
+-        }
+-      }
+-    }
+-    profilesResponse.setResourceProfiles(profilesMap);
+-    return profilesResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetResourceProfileResponse.
+-   *
+-   * @param responses a list of GetResourceProfileResponse to merge.
+-   * @return the merged GetResourceProfileResponse.
+-   */
+-  public static GetResourceProfileResponse mergeClusterResourceProfileResponse(
+-      Collection<GetResourceProfileResponse> responses) {
+-    GetResourceProfileResponse profileResponse =
+-        Records.newRecord(GetResourceProfileResponse.class);
+-    Resource resource = Resource.newInstance(0, 0);
+-    for (GetResourceProfileResponse response : responses) {
+-      if (response != null && response.getResource() != null) {
+-        Resource responseResource = response.getResource();
+-        resource = Resources.add(resource, responseResource);
+-      }
+-    }
+-    profileResponse.setResource(resource);
+-    return profileResponse;
+-  }
+-
+-  /**
+-   * Merges a list of GetAttributesToNodesResponse.
+-   *
+-   * @param responses a list of GetAttributesToNodesResponse to merge.
+-   * @return the merged GetAttributesToNodesResponse.
+-   */
+-  public static GetAttributesToNodesResponse mergeAttributesToNodesResponse(
+-      Collection<GetAttributesToNodesResponse> responses) {
+-    Map<NodeAttributeKey, List<NodeToAttributeValue>> nodeAttributeMap = new HashMap<>();
+-    for (GetAttributesToNodesResponse response : responses) {
+-      if (response != null && response.getAttributesToNodes() != null) {
+-        nodeAttributeMap.putAll(response.getAttributesToNodes());
+-      }
+-    }
+-    return GetAttributesToNodesResponse.newInstance(nodeAttributeMap);
+-  }
+-
+-  /**
+-   * Merges a list of GetClusterNodeAttributesResponse.
+-   *
+-   * @param responses a list of GetClusterNodeAttributesResponse to merge.
+-   * @return the merged GetClusterNodeAttributesResponse.
+-   */
+-  public static GetClusterNodeAttributesResponse mergeClusterNodeAttributesResponse(
+-      Collection<GetClusterNodeAttributesResponse> responses) {
+-    Set<NodeAttributeInfo> nodeAttributeInfo = new HashSet<>();
+-    for (GetClusterNodeAttributesResponse response : responses) {
+-      if (response != null && response.getNodeAttributes() != null) {
+-        nodeAttributeInfo.addAll(response.getNodeAttributes());
+-      }
+-    }
+-    return GetClusterNodeAttributesResponse.newInstance(nodeAttributeInfo);
+-  }
+-
+-  /**
+-   * Merges a list of GetNodesToAttributesResponse.
+-   *
+-   * @param responses a list of GetNodesToAttributesResponse to merge.
+-   * @return the merged GetNodesToAttributesResponse.
+-   */
+-  public static GetNodesToAttributesResponse mergeNodesToAttributesResponse(
+-      Collection<GetNodesToAttributesResponse> responses) {
+-    Map<String, Set<NodeAttribute>> attributesMap = new HashMap<>();
+-    for (GetNodesToAttributesResponse response : responses) {
+-      if (response != null && response.getNodeToAttributes() != null) {
+-        attributesMap.putAll(response.getNodeToAttributes());
+-      }
+-    }
+-    return GetNodesToAttributesResponse.newInstance(attributesMap);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/package-info.java
+deleted file mode 100644
+index 7d1dadd373b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/clientrm/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router ClientRM Proxy Service package. **/
+-package org.apache.hadoop.yarn.server.router.clientrm;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/package-info.java
+deleted file mode 100644
+index bca1f640104..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router Server package. **/
+-package org.apache.hadoop.yarn.server.router;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/AbstractRMAdminRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/AbstractRMAdminRequestInterceptor.java
+deleted file mode 100644
+index 8b09d699719..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/AbstractRMAdminRequestInterceptor.java
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-
+-/**
+- * Implements the {@link RMAdminRequestInterceptor} interface and provides
+- * common functionality which can can be used and/or extended by other concrete
+- * interceptor classes.
+- *
+- */
+-public abstract class AbstractRMAdminRequestInterceptor
+-    implements RMAdminRequestInterceptor {
+-  private Configuration conf;
+-  private RMAdminRequestInterceptor nextInterceptor;
+-
+-  @SuppressWarnings("checkstyle:visibilitymodifier")
+-  protected UserGroupInformation user = null;
+-
+-  /**
+-   * Sets the {@link RMAdminRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public void setNextInterceptor(RMAdminRequestInterceptor nextInterceptor) {
+-    this.nextInterceptor = nextInterceptor;
+-  }
+-
+-  /**
+-   * Sets the {@link Configuration}.
+-   */
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.setConf(conf);
+-    }
+-  }
+-
+-  /**
+-   * Gets the {@link Configuration}.
+-   */
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  /**
+-   * Initializes the {@link RMAdminRequestInterceptor}.
+-   */
+-  @Override
+-  public void init(String userName) {
+-    this.user = RouterServerUtil.setupUser(userName);
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.init(userName);
+-    }
+-  }
+-
+-  /**
+-   * Disposes the {@link RMAdminRequestInterceptor}.
+-   */
+-  @Override
+-  public void shutdown() {
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.shutdown();
+-    }
+-  }
+-
+-  /**
+-   * Gets the next {@link RMAdminRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public RMAdminRequestInterceptor getNextInterceptor() {
+-    return this.nextInterceptor;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/DefaultRMAdminRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/DefaultRMAdminRequestInterceptor.java
+deleted file mode 100644
+index a5531cd6225..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/DefaultRMAdminRequestInterceptor.java
++++ /dev/null
+@@ -1,261 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.StandbyException;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.client.ClientRMProxy;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesResponse;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-/**
+- * Extends the {@link AbstractRMAdminRequestInterceptor} class and provides an
+- * implementation that simply forwards the client requests to the cluster
+- * resource manager.
+- *
+- */
+-public class DefaultRMAdminRequestInterceptor
+-    extends AbstractRMAdminRequestInterceptor {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DefaultRMAdminRequestInterceptor.class);
+-  private ResourceManagerAdministrationProtocol rmAdminProxy;
+-  private UserGroupInformation user = null;
+-
+-  @Override
+-  public void init(String userName) {
+-    super.init(userName);
+-    try {
+-      final Configuration conf = this.getConf();
+-      rmAdminProxy = user.doAs(
+-          (PrivilegedExceptionAction<ResourceManagerAdministrationProtocol>) () ->
+-               ClientRMProxy.createRMProxy(conf, ResourceManagerAdministrationProtocol.class));
+-    } catch (Exception e) {
+-      StringBuilder message = new StringBuilder();
+-      message.append("Error while creating Router RMAdmin Service");
+-      if (user != null) {
+-        message.append(", user: " + user);
+-      }
+-      LOG.error(message.toString(), e);
+-      throw new YarnRuntimeException(message.toString(), e);
+-    }
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(RMAdminRequestInterceptor next) {
+-    throw new YarnRuntimeException("setNextInterceptor is being called on "
+-        + "DefaultRMAdminRequestInterceptor, which should be the last one "
+-        + "in the chain. Check if the interceptor pipeline configuration "
+-        + "is correct");
+-  }
+-
+-  @VisibleForTesting
+-  public void setRMAdmin(ResourceManagerAdministrationProtocol rmAdmin) {
+-    this.rmAdminProxy = rmAdmin;
+-  }
+-
+-  @Override
+-  public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return rmAdminProxy.refreshQueues(request);
+-  }
+-
+-  @Override
+-  public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return rmAdminProxy.refreshNodes(request);
+-  }
+-
+-  @Override
+-  public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
+-      RefreshSuperUserGroupsConfigurationRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return rmAdminProxy.refreshSuperUserGroupsConfiguration(request);
+-  }
+-
+-  @Override
+-  public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
+-      RefreshUserToGroupsMappingsRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return rmAdminProxy.refreshUserToGroupsMappings(request);
+-  }
+-
+-  @Override
+-  public RefreshAdminAclsResponse refreshAdminAcls(
+-      RefreshAdminAclsRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.refreshAdminAcls(request);
+-  }
+-
+-  @Override
+-  public RefreshServiceAclsResponse refreshServiceAcls(
+-      RefreshServiceAclsRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.refreshServiceAcls(request);
+-  }
+-
+-  @Override
+-  public UpdateNodeResourceResponse updateNodeResource(
+-      UpdateNodeResourceRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.updateNodeResource(request);
+-  }
+-
+-  @Override
+-  public RefreshNodesResourcesResponse refreshNodesResources(
+-      RefreshNodesResourcesRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.refreshNodesResources(request);
+-  }
+-
+-  @Override
+-  public AddToClusterNodeLabelsResponse addToClusterNodeLabels(
+-      AddToClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.addToClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
+-      RemoveFromClusterNodeLabelsRequest request)
+-      throws YarnException, IOException {
+-    return rmAdminProxy.removeFromClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
+-      ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.replaceLabelsOnNode(request);
+-  }
+-
+-  @Override
+-  public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
+-      CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
+-      throws YarnException, IOException {
+-    return rmAdminProxy
+-        .checkForDecommissioningNodes(checkForDecommissioningNodesRequest);
+-  }
+-
+-  @Override
+-  public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
+-      RefreshClusterMaxPriorityRequest request)
+-      throws YarnException, IOException {
+-    return rmAdminProxy.refreshClusterMaxPriority(request);
+-  }
+-
+-  @Override
+-  public String[] getGroupsForUser(String userName) throws IOException {
+-    return rmAdminProxy.getGroupsForUser(userName);
+-  }
+-
+-  @Override
+-  public NodesToAttributesMappingResponse mapAttributesToNodes(
+-      NodesToAttributesMappingRequest request)
+-      throws YarnException, IOException {
+-    return rmAdminProxy.mapAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public DeregisterSubClusterResponse deregisterSubCluster(DeregisterSubClusterRequest request)
+-      throws YarnException, IOException {
+-    return rmAdminProxy.deregisterSubCluster(request);
+-  }
+-
+-  @Override
+-  public SaveFederationQueuePolicyResponse saveFederationQueuePolicy(
+-      SaveFederationQueuePolicyRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.saveFederationQueuePolicy(request);
+-  }
+-
+-  @Override
+-  public BatchSaveFederationQueuePoliciesResponse batchSaveFederationQueuePolicies(
+-      BatchSaveFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.batchSaveFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
+-      QueryFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.listFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationApplicationResponse deleteFederationApplication(
+-      DeleteFederationApplicationRequest request)
+-      throws YarnException, IOException {
+-    return rmAdminProxy.deleteFederationApplication(request);
+-  }
+-
+-  @Override
+-  public GetSubClustersResponse getFederationSubClusters(
+-      GetSubClustersRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.getFederationSubClusters(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationQueuePoliciesResponse deleteFederationPoliciesByQueues(
+-      DeleteFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return rmAdminProxy.deleteFederationPoliciesByQueues(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java
+deleted file mode 100644
+index fee734f4fb3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/FederationRMAdminInterceptor.java
++++ /dev/null
+@@ -1,1574 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.commons.collections.MapUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.ipc.StandbyException;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusters;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.FederationQueueWeight;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.FederationSubCluster;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersResponse;
+-import org.apache.hadoop.yarn.server.federation.failover.FederationProxyProviderUtil;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.PriorityBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedHomePolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.RouterMetrics;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.util.Clock;
+-import org.apache.hadoop.yarn.util.MonotonicClock;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.List;
+-import java.util.Arrays;
+-import java.util.ArrayList;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.Collection;
+-import java.util.Set;
+-import java.util.Date;
+-import java.util.HashSet;
+-import java.util.concurrent.ThreadPoolExecutor;
+-import java.util.concurrent.ThreadFactory;
+-import java.util.concurrent.BlockingQueue;
+-import java.util.concurrent.LinkedBlockingQueue;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.stream.Collectors;
+-
+-import static org.apache.hadoop.yarn.server.router.RouterServerUtil.checkPolicyManagerValid;
+-
+-public class FederationRMAdminInterceptor extends AbstractRMAdminRequestInterceptor {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(FederationRMAdminInterceptor.class);
+-
+-  private static final String COMMA = ",";
+-  private static final String COLON = ":";
+-
+-  private static final List<String> SUPPORT_WEIGHT_MANAGERS =
+-      new ArrayList<>(Arrays.asList(WeightedLocalityPolicyManager.class.getName(),
+-      PriorityBroadcastPolicyManager.class.getName(), WeightedHomePolicyManager.class.getName()));
+-
+-  private Map<SubClusterId, ResourceManagerAdministrationProtocol> adminRMProxies;
+-  private FederationStateStoreFacade federationFacade;
+-  private final Clock clock = new MonotonicClock();
+-  private RouterMetrics routerMetrics;
+-  private ThreadPoolExecutor executorService;
+-  private Configuration conf;
+-  private long heartbeatExpirationMillis;
+-
+-  @Override
+-  public void init(String userName) {
+-    super.init(userName);
+-
+-    int numThreads = getConf().getInt(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREADS_SIZE);
+-    ThreadFactory threadFactory = new ThreadFactoryBuilder()
+-        .setNameFormat("RPC Router RMAdminClient-" + userName + "-%d ").build();
+-
+-    long keepAliveTime = getConf().getTimeDuration(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_KEEP_ALIVE_TIME,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_KEEP_ALIVE_TIME, TimeUnit.SECONDS);
+-
+-    BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
+-    this.executorService = new ThreadPoolExecutor(numThreads, numThreads,
+-        keepAliveTime, TimeUnit.MILLISECONDS, workQueue, threadFactory);
+-
+-    boolean allowCoreThreadTimeOut =  getConf().getBoolean(
+-        YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_ALLOW_CORE_THREAD_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_USER_CLIENT_THREAD_POOL_ALLOW_CORE_THREAD_TIMEOUT);
+-
+-    if (keepAliveTime > 0 && allowCoreThreadTimeOut) {
+-      this.executorService.allowCoreThreadTimeOut(allowCoreThreadTimeOut);
+-    }
+-
+-    federationFacade = FederationStateStoreFacade.getInstance(this.getConf());
+-    this.conf = this.getConf();
+-    this.adminRMProxies = new ConcurrentHashMap<>();
+-    routerMetrics = RouterMetrics.getMetrics();
+-
+-    this.heartbeatExpirationMillis = this.conf.getTimeDuration(
+-        YarnConfiguration.ROUTER_SUBCLUSTER_EXPIRATION_TIME,
+-        YarnConfiguration.DEFAULT_ROUTER_SUBCLUSTER_EXPIRATION_TIME, TimeUnit.MILLISECONDS);
+-  }
+-
+-  @VisibleForTesting
+-  protected ResourceManagerAdministrationProtocol getAdminRMProxyForSubCluster(
+-      SubClusterId subClusterId) throws Exception {
+-
+-    if (adminRMProxies.containsKey(subClusterId)) {
+-      return adminRMProxies.get(subClusterId);
+-    }
+-
+-    ResourceManagerAdministrationProtocol adminRMProxy = null;
+-    try {
+-      boolean serviceAuthEnabled = this.conf.getBoolean(
+-          CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, false);
+-      UserGroupInformation realUser = user;
+-      if (serviceAuthEnabled) {
+-        realUser = UserGroupInformation.createProxyUser(
+-            user.getShortUserName(), UserGroupInformation.getLoginUser());
+-      }
+-      adminRMProxy = FederationProxyProviderUtil.createRMProxy(getConf(),
+-          ResourceManagerAdministrationProtocol.class, subClusterId, realUser);
+-    } catch (Exception e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to create the interface to reach the SubCluster %s", subClusterId);
+-    }
+-    adminRMProxies.put(subClusterId, adminRMProxy);
+-    return adminRMProxy;
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(RMAdminRequestInterceptor next) {
+-    throw new YarnRuntimeException("setNextInterceptor is being called on "
+-       + "FederationRMAdminRequestInterceptor, which should be the last one "
+-       + "in the chain. Check if the interceptor pipeline configuration "
+-       + "is correct");
+-  }
+-
+-  /**
+-   * Refresh queue requests.
+-   *
+-   * The Router supports refreshing all SubCluster queues at once,
+-   * and also supports refreshing queues by SubCluster.
+-   *
+-   * @param request RefreshQueuesRequest, If subClusterId is not empty,
+-   * it means that we want to refresh the queue of the specified subClusterId.
+-   * If subClusterId is empty, it means we want to refresh all queues.
+-   *
+-   * @return RefreshQueuesResponse, There is no specific information in the response,
+-   * as long as it is not empty, it means that the request is successful.
+-   *
+-   * @throws StandbyException exception thrown by non-active server.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshQueuesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshQueues request.", null);
+-    }
+-
+-    // call refreshQueues of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-           new Class[] {RefreshQueuesRequest.class}, new Object[] {request});
+-
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshQueuesResponse> refreshQueueResps =
+-          remoteMethod.invokeConcurrent(this, RefreshQueuesResponse.class, subClusterId);
+-
+-      // If we get the return result from refreshQueueResps,
+-      // it means that the call has been successful,
+-      // and the RefreshQueuesResponse method can be reconstructed and returned.
+-      if (CollectionUtils.isNotEmpty(refreshQueueResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshQueuesRetrieved(stopTime - startTime);
+-        return RefreshQueuesResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshQueuesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshQueue due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshQueuesFailedRetrieved();
+-    throw new YarnException("Unable to refreshQueue.");
+-  }
+-
+-  /**
+-   * Refresh node requests.
+-   *
+-   * The Router supports refreshing all SubCluster nodes at once,
+-   * and also supports refreshing node by SubCluster.
+-   *
+-   * @param request RefreshNodesRequest, If subClusterId is not empty,
+-   * it means that we want to refresh the node of the specified subClusterId.
+-   * If subClusterId is empty, it means we want to refresh all nodes.
+-   *
+-   * @return RefreshNodesResponse, There is no specific information in the response,
+-   * as long as it is not empty, it means that the request is successful.
+-   *
+-   * @throws StandbyException exception thrown by non-active server.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-
+-    // parameter verification.
+-    // We will not check whether the DecommissionType is empty,
+-    // because this parameter has a default value at the proto level.
+-    if (request == null) {
+-      routerMetrics.incrRefreshNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshNodes request.", null);
+-    }
+-
+-    // call refreshNodes of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[] {RefreshNodesRequest.class}, new Object[] {request});
+-
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshNodesResponse> refreshNodesResps =
+-          remoteMethod.invokeConcurrent(this, RefreshNodesResponse.class, subClusterId);
+-
+-      if (CollectionUtils.isNotEmpty(refreshNodesResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshNodesRetrieved(stopTime - startTime);
+-        return RefreshNodesResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshNodes due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshNodesFailedRetrieved();
+-    throw new YarnException("Unable to refreshNodes due to exception.");
+-  }
+-
+-  /**
+-   * Refresh SuperUserGroupsConfiguration requests.
+-   *
+-   * The Router supports refreshing all subCluster SuperUserGroupsConfiguration at once,
+-   * and also supports refreshing SuperUserGroupsConfiguration by SubCluster.
+-   *
+-   * @param request RefreshSuperUserGroupsConfigurationRequest,
+-   * If subClusterId is not empty, it means that we want to
+-   * refresh the superuser groups configuration of the specified subClusterId.
+-   * If subClusterId is empty, it means we want to
+-   * refresh all subCluster superuser groups configuration.
+-   *
+-   * @return RefreshSuperUserGroupsConfigurationResponse,
+-   * There is no specific information in the response, as long as it is not empty,
+-   * it means that the request is successful.
+-   *
+-   * @throws StandbyException exception thrown by non-active server.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
+-      RefreshSuperUserGroupsConfigurationRequest request)
+-      throws StandbyException, YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshSuperUserGroupsConfigurationFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshSuperUserGroupsConfiguration request.",
+-          null);
+-    }
+-
+-    // call refreshSuperUserGroupsConfiguration of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[] {RefreshSuperUserGroupsConfigurationRequest.class}, new Object[] {request});
+-
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshSuperUserGroupsConfigurationResponse> refreshSuperUserGroupsConfResps =
+-          remoteMethod.invokeConcurrent(this, RefreshSuperUserGroupsConfigurationResponse.class,
+-          subClusterId);
+-
+-      if (CollectionUtils.isNotEmpty(refreshSuperUserGroupsConfResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshSuperUserGroupsConfRetrieved(stopTime - startTime);
+-        return RefreshSuperUserGroupsConfigurationResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshSuperUserGroupsConfigurationFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshSuperUserGroupsConfiguration due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshSuperUserGroupsConfigurationFailedRetrieved();
+-    throw new YarnException("Unable to refreshSuperUserGroupsConfiguration.");
+-  }
+-
+-  /**
+-   * Refresh UserToGroupsMappings requests.
+-   *
+-   * The Router supports refreshing all subCluster UserToGroupsMappings at once,
+-   * and also supports refreshing UserToGroupsMappings by subCluster.
+-   *
+-   * @param request RefreshUserToGroupsMappingsRequest,
+-   * If subClusterId is not empty, it means that we want to
+-   * refresh the user groups mapping of the specified subClusterId.
+-   * If subClusterId is empty, it means we want to
+-   * refresh all subCluster user groups mapping.
+-   *
+-   * @return RefreshUserToGroupsMappingsResponse,
+-   * There is no specific information in the response, as long as it is not empty,
+-   * it means that the request is successful.
+-   *
+-   * @throws StandbyException exception thrown by non-active server.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
+-      RefreshUserToGroupsMappingsRequest request) throws StandbyException, YarnException,
+-      IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshUserToGroupsMappingsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshUserToGroupsMappings request.", null);
+-    }
+-
+-    // call refreshUserToGroupsMappings of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[] {RefreshUserToGroupsMappingsRequest.class}, new Object[] {request});
+-
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshUserToGroupsMappingsResponse> refreshUserToGroupsMappingsResps =
+-          remoteMethod.invokeConcurrent(this, RefreshUserToGroupsMappingsResponse.class,
+-          subClusterId);
+-
+-      if (CollectionUtils.isNotEmpty(refreshUserToGroupsMappingsResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshUserToGroupsMappingsRetrieved(stopTime - startTime);
+-        return RefreshUserToGroupsMappingsResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshUserToGroupsMappingsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshUserToGroupsMappings due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshUserToGroupsMappingsFailedRetrieved();
+-    throw new YarnException("Unable to refreshUserToGroupsMappings.");
+-  }
+-
+-  @Override
+-  public RefreshAdminAclsResponse refreshAdminAcls(RefreshAdminAclsRequest request)
+-      throws YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshAdminAclsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshAdminAcls request.", null);
+-    }
+-
+-    // call refreshAdminAcls of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[] {RefreshAdminAclsRequest.class}, new Object[] {request});
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshAdminAclsResponse> refreshAdminAclsResps =
+-          remoteMethod.invokeConcurrent(this, RefreshAdminAclsResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(refreshAdminAclsResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshAdminAclsRetrieved(stopTime - startTime);
+-        return RefreshAdminAclsResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshAdminAclsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshAdminAcls due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshAdminAclsFailedRetrieved();
+-    throw new YarnException("Unable to refreshAdminAcls.");
+-  }
+-
+-  @Override
+-  public RefreshServiceAclsResponse refreshServiceAcls(RefreshServiceAclsRequest request)
+-      throws YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshServiceAclsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshServiceAcls request.", null);
+-    }
+-
+-    // call refreshAdminAcls of activeSubClusters.
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{RefreshServiceAclsRequest.class}, new Object[]{request});
+-      String subClusterId = request.getSubClusterId();
+-      Collection<RefreshServiceAclsResponse> refreshServiceAclsResps =
+-          remoteMethod.invokeConcurrent(this, RefreshServiceAclsResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(refreshServiceAclsResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshServiceAclsRetrieved(stopTime - startTime);
+-        return RefreshServiceAclsResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshServiceAclsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshAdminAcls due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshServiceAclsFailedRetrieved();
+-    throw new YarnException("Unable to refreshServiceAcls.");
+-  }
+-
+-  @Override
+-  public UpdateNodeResourceResponse updateNodeResource(UpdateNodeResourceRequest request)
+-      throws YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrUpdateNodeResourceFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing UpdateNodeResource request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrUpdateNodeResourceFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing UpdateNodeResource SubClusterId.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{UpdateNodeResourceRequest.class}, new Object[]{request});
+-      Collection<UpdateNodeResourceResponse> updateNodeResourceResps =
+-          remoteMethod.invokeConcurrent(this, UpdateNodeResourceResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(updateNodeResourceResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededUpdateNodeResourceRetrieved(stopTime - startTime);
+-        return UpdateNodeResourceResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrUpdateNodeResourceFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to updateNodeResource due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrUpdateNodeResourceFailedRetrieved();
+-    throw new YarnException("Unable to updateNodeResource.");
+-  }
+-
+-  @Override
+-  public RefreshNodesResourcesResponse refreshNodesResources(RefreshNodesResourcesRequest request)
+-      throws YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshNodesResourcesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshNodesResources request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrRefreshNodesResourcesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshNodesResources SubClusterId.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{RefreshNodesResourcesRequest.class}, new Object[]{request});
+-      Collection<RefreshNodesResourcesResponse> refreshNodesResourcesResps =
+-          remoteMethod.invokeConcurrent(this, RefreshNodesResourcesResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(refreshNodesResourcesResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshNodesResourcesRetrieved(stopTime - startTime);
+-        return RefreshNodesResourcesResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshNodesResourcesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshNodesResources due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshNodesResourcesFailedRetrieved();
+-    throw new YarnException("Unable to refreshNodesResources.");
+-  }
+-
+-  @Override
+-  public AddToClusterNodeLabelsResponse addToClusterNodeLabels(
+-      AddToClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing AddToClusterNodeLabels request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing AddToClusterNodeLabels SubClusterId.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{AddToClusterNodeLabelsRequest.class}, new Object[]{request});
+-      Collection<AddToClusterNodeLabelsResponse> addToClusterNodeLabelsResps =
+-          remoteMethod.invokeConcurrent(this, AddToClusterNodeLabelsResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(addToClusterNodeLabelsResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededAddToClusterNodeLabelsRetrieved(stopTime - startTime);
+-        return AddToClusterNodeLabelsResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to addToClusterNodeLabels due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-    throw new YarnException("Unable to addToClusterNodeLabels.");
+-  }
+-
+-  @Override
+-  public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
+-      RemoveFromClusterNodeLabelsRequest request)
+-      throws YarnException, IOException {
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RemoveFromClusterNodeLabels request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RemoveFromClusterNodeLabels SubClusterId.",
+-          null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{RemoveFromClusterNodeLabelsRequest.class}, new Object[]{request});
+-      Collection<RemoveFromClusterNodeLabelsResponse> refreshNodesResourcesResps =
+-          remoteMethod.invokeConcurrent(this, RemoveFromClusterNodeLabelsResponse.class,
+-          subClusterId);
+-      if (CollectionUtils.isNotEmpty(refreshNodesResourcesResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRemoveFromClusterNodeLabelsRetrieved(stopTime - startTime);
+-        return RemoveFromClusterNodeLabelsResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to removeFromClusterNodeLabels due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-    throw new YarnException("Unable to removeFromClusterNodeLabels.");
+-  }
+-
+-  @Override
+-  public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(ReplaceLabelsOnNodeRequest request)
+-      throws YarnException, IOException {
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing ReplaceLabelsOnNode request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing ReplaceLabelsOnNode SubClusterId.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{ReplaceLabelsOnNodeRequest.class}, new Object[]{request});
+-      Collection<ReplaceLabelsOnNodeResponse> replaceLabelsOnNodeResps =
+-          remoteMethod.invokeConcurrent(this, ReplaceLabelsOnNodeResponse.class, subClusterId);
+-      if (CollectionUtils.isNotEmpty(replaceLabelsOnNodeResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRemoveFromClusterNodeLabelsRetrieved(stopTime - startTime);
+-        return ReplaceLabelsOnNodeResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to replaceLabelsOnNode due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-    throw new YarnException("Unable to replaceLabelsOnNode.");
+-  }
+-
+-  @Override
+-  public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
+-      CheckForDecommissioningNodesRequest request) throws YarnException, IOException {
+-
+-    // Parameter check
+-    if (request == null) {
+-      RouterServerUtil.logAndThrowException("Missing checkForDecommissioningNodes request.", null);
+-      routerMetrics.incrCheckForDecommissioningNodesFailedRetrieved();
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrCheckForDecommissioningNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing checkForDecommissioningNodes SubClusterId.",
+-          null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{CheckForDecommissioningNodesRequest.class}, new Object[]{request});
+-
+-      Collection<CheckForDecommissioningNodesResponse> responses =
+-          remoteMethod.invokeConcurrent(this, CheckForDecommissioningNodesResponse.class,
+-          subClusterId);
+-
+-      if (CollectionUtils.isNotEmpty(responses)) {
+-        // We selected a subCluster, the list is not empty and size=1.
+-        List<CheckForDecommissioningNodesResponse> collects =
+-            responses.stream().collect(Collectors.toList());
+-        if (!collects.isEmpty() && collects.size() == 1) {
+-          CheckForDecommissioningNodesResponse response = collects.get(0);
+-          long stopTime = clock.getTime();
+-          routerMetrics.succeededCheckForDecommissioningNodesRetrieved((stopTime - startTime));
+-          Set<NodeId> nodes = response.getDecommissioningNodes();
+-          return CheckForDecommissioningNodesResponse.newInstance(nodes);
+-        }
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrCheckForDecommissioningNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to checkForDecommissioningNodes due to exception " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrCheckForDecommissioningNodesFailedRetrieved();
+-    throw new YarnException("Unable to checkForDecommissioningNodes.");
+-  }
+-
+-  @Override
+-  public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
+-      RefreshClusterMaxPriorityRequest request) throws YarnException, IOException {
+-
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrRefreshClusterMaxPriorityFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshClusterMaxPriority request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrRefreshClusterMaxPriorityFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing RefreshClusterMaxPriority SubClusterId.",
+-          null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{RefreshClusterMaxPriorityRequest.class}, new Object[]{request});
+-      Collection<RefreshClusterMaxPriorityResponse> refreshClusterMaxPriorityResps =
+-          remoteMethod.invokeConcurrent(this, RefreshClusterMaxPriorityResponse.class,
+-          subClusterId);
+-      if (CollectionUtils.isNotEmpty(refreshClusterMaxPriorityResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededRefreshClusterMaxPriorityRetrieved(stopTime - startTime);
+-        return RefreshClusterMaxPriorityResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrRefreshClusterMaxPriorityFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to refreshClusterMaxPriority due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrRefreshClusterMaxPriorityFailedRetrieved();
+-    throw new YarnException("Unable to refreshClusterMaxPriority.");
+-  }
+-
+-  @Override
+-  public NodesToAttributesMappingResponse mapAttributesToNodes(
+-      NodesToAttributesMappingRequest request) throws YarnException, IOException {
+-    // parameter verification.
+-    if (request == null) {
+-      routerMetrics.incrMapAttributesToNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing mapAttributesToNodes request.", null);
+-    }
+-
+-    String subClusterId = request.getSubClusterId();
+-    if (StringUtils.isBlank(subClusterId)) {
+-      routerMetrics.incrMapAttributesToNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing mapAttributesToNodes SubClusterId.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{NodesToAttributesMappingRequest.class}, new Object[]{request});
+-      Collection<NodesToAttributesMappingResponse> mapAttributesToNodesResps =
+-          remoteMethod.invokeConcurrent(this, NodesToAttributesMappingResponse.class,
+-          subClusterId);
+-      if (CollectionUtils.isNotEmpty(mapAttributesToNodesResps)) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededMapAttributesToNodesRetrieved(stopTime - startTime);
+-        return NodesToAttributesMappingResponse.newInstance();
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrMapAttributesToNodesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to mapAttributesToNodes due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrMapAttributesToNodesFailedRetrieved();
+-    throw new YarnException("Unable to mapAttributesToNodes.");
+-  }
+-
+-  @Override
+-  public String[] getGroupsForUser(String user) throws IOException {
+-    // parameter verification.
+-    if (StringUtils.isBlank(user)) {
+-      routerMetrics.incrGetGroupsForUserFailedRetrieved();
+-      RouterServerUtil.logAndThrowIOException("Missing getGroupsForUser user.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      RMAdminProtocolMethod remoteMethod = new RMAdminProtocolMethod(
+-          new Class[]{String.class}, new Object[]{user});
+-      Collection<String[]> getGroupsForUserResps =
+-          remoteMethod.invokeConcurrent(this, String[].class, null);
+-      if (CollectionUtils.isNotEmpty(getGroupsForUserResps)) {
+-        long stopTime = clock.getTime();
+-        Set<String> groups = new HashSet<>();
+-        for (String[] groupArr : getGroupsForUserResps) {
+-          if (groupArr != null && groupArr.length > 0) {
+-            for (String group : groupArr) {
+-              groups.add(group);
+-            }
+-          }
+-        }
+-        routerMetrics.succeededGetGroupsForUsersRetrieved(stopTime - startTime);
+-        return groups.toArray(new String[]{});
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetGroupsForUserFailedRetrieved();
+-      RouterServerUtil.logAndThrowIOException(e,
+-          "Unable to getGroupsForUser due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrGetGroupsForUserFailedRetrieved();
+-    throw new IOException("Unable to getGroupsForUser.");
+-  }
+-
+-  @VisibleForTesting
+-  public FederationStateStoreFacade getFederationFacade() {
+-    return federationFacade;
+-  }
+-
+-  @VisibleForTesting
+-  public ThreadPoolExecutor getExecutorService() {
+-    return executorService;
+-  }
+-
+-  /**
+-   * In YARN Federation mode, We allow users to mark subClusters
+-   * With no heartbeat for a long time as SC_LOST state.
+-   *
+-   * If we include a specific subClusterId in the request, check for the specified subCluster.
+-   * If subClusterId is empty, all subClusters are checked.
+-   *
+-   * @param request deregisterSubCluster request.
+-   * The request contains the id of to deregister sub-cluster.
+-   * @return Response from deregisterSubCluster.
+-   * @throws YarnException exceptions from yarn servers.
+-   * @throws IOException if an IO error occurred.
+-   */
+-  @Override
+-  public DeregisterSubClusterResponse deregisterSubCluster(DeregisterSubClusterRequest request)
+-      throws YarnException, IOException {
+-
+-    if (request == null) {
+-      routerMetrics.incrDeregisterSubClusterFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing DeregisterSubCluster request.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      List<DeregisterSubClusters> deregisterSubClusterList = new ArrayList<>();
+-      String reqSubClusterId = request.getSubClusterId();
+-      if (StringUtils.isNotBlank(reqSubClusterId)) {
+-        // If subCluster is not empty, process the specified subCluster.
+-        DeregisterSubClusters deregisterSubClusters = deregisterSubCluster(reqSubClusterId);
+-        deregisterSubClusterList.add(deregisterSubClusters);
+-      } else {
+-        // Traversing all Active SubClusters,
+-        // for subCluster whose heartbeat times out, update the status to SC_LOST.
+-        Map<SubClusterId, SubClusterInfo> subClusterInfo = federationFacade.getSubClusters(true);
+-        for (Map.Entry<SubClusterId, SubClusterInfo> entry : subClusterInfo.entrySet()) {
+-          SubClusterId subClusterId = entry.getKey();
+-          DeregisterSubClusters deregisterSubClusters = deregisterSubCluster(subClusterId.getId());
+-          deregisterSubClusterList.add(deregisterSubClusters);
+-        }
+-      }
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededDeregisterSubClusterRetrieved(stopTime - startTime);
+-      return DeregisterSubClusterResponse.newInstance(deregisterSubClusterList);
+-    } catch (Exception e) {
+-      routerMetrics.incrDeregisterSubClusterFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to deregisterSubCluster due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrDeregisterSubClusterFailedRetrieved();
+-    throw new YarnException("Unable to deregisterSubCluster.");
+-  }
+-
+-  /**
+-   * Save the Queue Policy for the Federation.
+-   *
+-   * @param request saveFederationQueuePolicy Request.
+-   * @return Response from saveFederationQueuePolicy.
+-   * @throws YarnException exceptions from yarn servers.
+-   * @throws IOException if an IO error occurred.
+-   */
+-  @Override
+-  public SaveFederationQueuePolicyResponse saveFederationQueuePolicy(
+-      SaveFederationQueuePolicyRequest request) throws YarnException, IOException {
+-
+-    // Parameter validation.
+-
+-    if (request == null) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing SaveFederationQueuePolicy request.", null);
+-    }
+-
+-    FederationQueueWeight federationQueueWeight = request.getFederationQueueWeight();
+-    if (federationQueueWeight == null) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing FederationQueueWeight information.", null);
+-    }
+-
+-    String queue = request.getQueue();
+-    if (StringUtils.isBlank(queue)) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing Queue information.", null);
+-    }
+-
+-    String policyManagerClassName = request.getPolicyManagerClassName();
+-    if (!checkPolicyManagerValid(policyManagerClassName, SUPPORT_WEIGHT_MANAGERS)) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(policyManagerClassName +
+-          " does not support the use of queue weights.", null);
+-    }
+-
+-    String amRmWeight = federationQueueWeight.getAmrmWeight();
+-    FederationQueueWeight.checkSubClusterQueueWeightRatioValid(amRmWeight);
+-
+-    String routerWeight = federationQueueWeight.getRouterWeight();
+-    FederationQueueWeight.checkSubClusterQueueWeightRatioValid(routerWeight);
+-
+-    String headRoomAlpha = federationQueueWeight.getHeadRoomAlpha();
+-    FederationQueueWeight.checkHeadRoomAlphaValid(headRoomAlpha);
+-
+-    try {
+-      long startTime = clock.getTime();
+-
+-      // Step2, parse amRMPolicyWeights.
+-      Map<SubClusterIdInfo, Float> amRMPolicyWeights = getSubClusterWeightMap(amRmWeight);
+-      LOG.debug("amRMPolicyWeights = {}.", amRMPolicyWeights);
+-
+-      // Step3, parse routerPolicyWeights.
+-      Map<SubClusterIdInfo, Float> routerPolicyWeights = getSubClusterWeightMap(routerWeight);
+-      LOG.debug("routerWeights = {}.", amRMPolicyWeights);
+-
+-      // Step4, Initialize WeightedPolicyInfo.
+-      WeightedPolicyInfo weightedPolicyInfo = new WeightedPolicyInfo();
+-      weightedPolicyInfo.setHeadroomAlpha(Float.parseFloat(headRoomAlpha));
+-      weightedPolicyInfo.setAMRMPolicyWeights(amRMPolicyWeights);
+-      weightedPolicyInfo.setRouterPolicyWeights(routerPolicyWeights);
+-
+-      // Step5, Set SubClusterPolicyConfiguration.
+-      SubClusterPolicyConfiguration policyConfiguration =
+-          SubClusterPolicyConfiguration.newInstance(queue, policyManagerClassName,
+-          weightedPolicyInfo.toByteBuffer());
+-      federationFacade.setPolicyConfiguration(policyConfiguration);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededSaveFederationQueuePolicyRetrieved(stopTime - startTime);
+-      return SaveFederationQueuePolicyResponse.newInstance("save policy success.");
+-    } catch (Exception e) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to saveFederationQueuePolicy due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-    throw new YarnException("Unable to saveFederationQueuePolicy.");
+-  }
+-
+-  /**
+-   * Batch Save the Queue Policies for the Federation.
+-   *
+-   * @param request BatchSaveFederationQueuePolicies Request
+-   * @return Response from batchSaveFederationQueuePolicies.
+-   * @throws YarnException exceptions from yarn servers.
+-   * @throws IOException if an IO error occurred.
+-   */
+-  @Override
+-  public BatchSaveFederationQueuePoliciesResponse batchSaveFederationQueuePolicies(
+-      BatchSaveFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-
+-    // Parameter validation.
+-    if (request == null) {
+-      routerMetrics.incrBatchSaveFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "Missing BatchSaveFederationQueuePoliciesRequest request.", null);
+-    }
+-
+-    List<FederationQueueWeight> federationQueueWeights = request.getFederationQueueWeights();
+-    if (federationQueueWeights == null) {
+-      routerMetrics.incrBatchSaveFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException("Missing FederationQueueWeights information.", null);
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      for (FederationQueueWeight federationQueueWeight : federationQueueWeights) {
+-        saveFederationQueuePolicy(federationQueueWeight);
+-      }
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededBatchSaveFederationQueuePoliciesRetrieved(stopTime - startTime);
+-      return BatchSaveFederationQueuePoliciesResponse.newInstance("batch save policies success.");
+-    } catch (Exception e) {
+-      routerMetrics.incrBatchSaveFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to batchSaveFederationQueuePolicies due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrBatchSaveFederationQueuePoliciesFailedRetrieved();
+-    throw new YarnException("Unable to batchSaveFederationQueuePolicies.");
+-  }
+-
+-  /**
+-   * List the Queue Policies for the Federation.
+-   *
+-   * @param request QueryFederationQueuePolicies Request.
+-   * @return QueryFederationQueuePolicies Response.
+-   *
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
+-      QueryFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-
+-    // Parameter validation.
+-    if (request == null) {
+-      routerMetrics.incrListFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "Missing ListFederationQueuePolicies Request.", null);
+-    }
+-
+-    if (request.getPageSize() <= 0) {
+-      routerMetrics.incrListFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "PageSize cannot be negative or zero.", null);
+-    }
+-
+-    if (request.getCurrentPage() <= 0) {
+-      routerMetrics.incrListFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "CurrentPage cannot be negative or zero.", null);
+-    }
+-
+-    try {
+-      QueryFederationQueuePoliciesResponse response;
+-
+-      long startTime = clock.getTime();
+-      String queue = request.getQueue();
+-      List<String> queues = request.getQueues();
+-      int currentPage = request.getCurrentPage();
+-      int pageSize = request.getPageSize();
+-
+-      // Print log
+-      LOG.info("queue = {}, queues={}, currentPage={}, pageSize={}",
+-          queue, queues, currentPage, pageSize);
+-
+-      Map<String, SubClusterPolicyConfiguration> policiesConfigurations =
+-          federationFacade.getPoliciesConfigurations();
+-
+-      // If the queue is not empty, filter according to the queue.
+-      if (StringUtils.isNotBlank(queue)) {
+-        response = filterPoliciesConfigurationsByQueue(queue, policiesConfigurations,
+-            pageSize, currentPage);
+-      } else if(CollectionUtils.isNotEmpty(queues)) {
+-        // If queues are not empty, filter by queues, which may return multiple results.
+-        // We filter by pagination.
+-        response = filterPoliciesConfigurationsByQueues(queues, policiesConfigurations,
+-            pageSize, currentPage);
+-      } else {
+-        // If we don't have any filtering criteria, we should also support paginating the results.
+-        response = filterPoliciesConfigurations(policiesConfigurations, pageSize, currentPage);
+-      }
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededListFederationQueuePoliciesRetrieved(stopTime - startTime);
+-      if (response == null) {
+-        response = QueryFederationQueuePoliciesResponse.newInstance();
+-      }
+-      return response;
+-    } catch (Exception e) {
+-      routerMetrics.incrListFederationQueuePoliciesFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to ListFederationQueuePolicies due to exception. " + e.getMessage());
+-    }
+-
+-    routerMetrics.incrListFederationQueuePoliciesFailedRetrieved();
+-    throw new YarnException("Unable to listFederationQueuePolicies.");
+-  }
+-
+-  @Override
+-  public DeleteFederationApplicationResponse deleteFederationApplication(
+-      DeleteFederationApplicationRequest request) throws YarnException, IOException {
+-
+-    // Parameter validation.
+-    if (request == null) {
+-      routerMetrics.incrDeleteFederationApplicationFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "Missing deleteFederationApplication Request.", null);
+-    }
+-
+-    String application = request.getApplication();
+-    if (StringUtils.isBlank(application)) {
+-      routerMetrics.incrDeleteFederationApplicationFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "ApplicationId cannot be null.", null);
+-    }
+-
+-    // Try calling deleteApplicationHomeSubCluster to delete the application.
+-    try {
+-      long startTime = clock.getTime();
+-      ApplicationId applicationId = ApplicationId.fromString(application);
+-      federationFacade.deleteApplicationHomeSubCluster(applicationId);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededDeleteFederationApplicationFailedRetrieved(stopTime - startTime);
+-      return DeleteFederationApplicationResponse.newInstance(
+-          "applicationId = " + applicationId + " delete success.");
+-    } catch (Exception e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to deleteFederationApplication due to exception. " + e.getMessage());
+-    }
+-
+-    throw new YarnException("Unable to deleteFederationApplication.");
+-  }
+-
+-  /**
+-   * Get federation subcluster list.
+-   *
+-   * @param request GetSubClustersRequest Request.
+-   * @return SubClusters Response.
+-   * @throws YarnException exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public GetSubClustersResponse getFederationSubClusters(GetSubClustersRequest request)
+-       throws YarnException, IOException {
+-
+-    // Parameter validation.
+-    if (request == null) {
+-      routerMetrics.incrGetFederationSubClustersFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "Missing getFederationSubClusters Request.", null);
+-    }
+-
+-    // Step1. Get all subClusters of the cluster.
+-    Map<SubClusterId, SubClusterInfo> subClusters =
+-        federationFacade.getSubClusters(false);
+-
+-    // Step2. Get FederationSubCluster data.
+-    List<FederationSubCluster> federationSubClusters = new ArrayList<>();
+-    long startTime = clock.getTime();
+-    for (Map.Entry<SubClusterId, SubClusterInfo> subCluster : subClusters.entrySet()) {
+-      SubClusterId subClusterId = subCluster.getKey();
+-      try {
+-        SubClusterInfo subClusterInfo = subCluster.getValue();
+-        long lastHeartBeat = subClusterInfo.getLastHeartBeat();
+-        Date lastHeartBeatDate = new Date(lastHeartBeat);
+-        FederationSubCluster federationSubCluster = FederationSubCluster.newInstance(
+-            subClusterId.getId(), subClusterInfo.getState().name(), lastHeartBeatDate.toString());
+-        federationSubClusters.add(federationSubCluster);
+-      } catch (Exception e) {
+-        routerMetrics.incrGetFederationSubClustersFailedRetrieved();
+-        LOG.error("getSubClusters SubClusterId = [%s] error.", subClusterId, e);
+-      }
+-    }
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededGetFederationSubClustersRetrieved(stopTime - startTime);
+-
+-    // Step3. Return results.
+-    return GetSubClustersResponse.newInstance(federationSubClusters);
+-  }
+-
+-  /**
+-   * Delete Policies based on the provided queue list.
+-   *
+-   * @param request DeleteFederationQueuePoliciesRequest Request.
+-   * @return If the deletion is successful, the queue deletion success message will be returned.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   * @throws IOException io error occurs.
+-   */
+-  @Override
+-  public DeleteFederationQueuePoliciesResponse deleteFederationPoliciesByQueues(
+-      DeleteFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-
+-    // Parameter validation.
+-    if (request == null) {
+-      routerMetrics.incrDeleteFederationPoliciesByQueuesRetrieved();
+-      RouterServerUtil.logAndThrowException(
+-          "Missing deleteFederationQueuePoliciesByQueues Request.", null);
+-    }
+-
+-    List<String> queues = request.getQueues();
+-    if (CollectionUtils.isEmpty(queues)) {
+-      routerMetrics.incrDeleteFederationPoliciesByQueuesRetrieved();
+-      RouterServerUtil.logAndThrowException("queues cannot be null.", null);
+-    }
+-
+-    // Try calling deleteApplicationHomeSubCluster to delete the application.
+-    try {
+-      long startTime = clock.getTime();
+-      federationFacade.deletePolicyConfigurations(queues);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededDeleteFederationPoliciesByQueuesRetrieved(stopTime - startTime);
+-      return DeleteFederationQueuePoliciesResponse.newInstance(
+-         "queues = " + StringUtils.join(queues, ",") + " delete success.");
+-    } catch (Exception e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Unable to deleteFederationPoliciesByQueues due to exception. " + e.getMessage());
+-    }
+-    throw new YarnException("Unable to deleteFederationPoliciesByQueues.");
+-  }
+-
+-  /**
+-   * According to the configuration information of the queue filtering queue,
+-   * this part should only return 1 result.
+-   *
+-   * @param queue queueName.
+-   * @param policiesConfigurations policy configurations.
+-   * @param pageSize Items per page.
+-   * @param currentPage The number of pages to be queried.
+-   * @return federation queue policies response.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   *
+-   */
+-  private QueryFederationQueuePoliciesResponse filterPoliciesConfigurationsByQueue(String queue,
+-      Map<String, SubClusterPolicyConfiguration> policiesConfigurations,
+-      int pageSize, int currentPage) throws YarnException {
+-
+-    // Step1. Check the parameters, if the policy list is empty, return empty directly.
+-    if (MapUtils.isEmpty(policiesConfigurations)) {
+-      return null;
+-    }
+-    SubClusterPolicyConfiguration policyConf = policiesConfigurations.getOrDefault(queue, null);
+-    if(policyConf == null) {
+-      return null;
+-    }
+-
+-    // Step2. Parse the parameters.
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    FederationQueueWeight federationQueueWeight = parseFederationQueueWeight(queue, policyConf);
+-    federationQueueWeights.add(federationQueueWeight);
+-
+-    // Step3. Return result.
+-    return QueryFederationQueuePoliciesResponse.newInstance(
+-        1, 1, currentPage, pageSize, federationQueueWeights);
+-  }
+-
+-  /**
+-   * Filter queue configuration information based on the queue list.
+-   *
+-   * @param queues The name of the queue.
+-   * @param policiesConfigurations policy configurations.
+-   * @param pageSize Items per page.
+-   * @param currentPage The number of pages to be queried.
+-   * @return federation queue policies response.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   */
+-  private QueryFederationQueuePoliciesResponse filterPoliciesConfigurationsByQueues(
+-      List<String> queues, Map<String, SubClusterPolicyConfiguration> policiesConfigurations,
+-      int pageSize, int currentPage) throws YarnException {
+-
+-    // Step1. Check the parameters, if the policy list is empty, return empty directly.
+-    if (MapUtils.isEmpty(policiesConfigurations)) {
+-      return null;
+-    }
+-
+-    // Step2. Filtering for Queue Policies.
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    for (String queue : queues) {
+-      SubClusterPolicyConfiguration policyConf = policiesConfigurations.getOrDefault(queue, null);
+-      if(policyConf == null) {
+-        continue;
+-      }
+-      FederationQueueWeight federationQueueWeight = parseFederationQueueWeight(queue, policyConf);
+-      if (federationQueueWeight != null) {
+-        federationQueueWeights.add(federationQueueWeight);
+-      }
+-    }
+-
+-    // Step3. To paginate the returned results.
+-    return queryFederationQueuePoliciesPagination(federationQueueWeights, pageSize, currentPage);
+-  }
+-
+-  /**
+-   * Filter PoliciesConfigurations, and we paginate Policies within this method.
+-   *
+-   * @param policiesConfigurations policy configurations.
+-   * @param pageSize Items per page.
+-   * @param currentPage The number of pages to be queried.
+-   * @return federation queue policies response.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   */
+-  private QueryFederationQueuePoliciesResponse filterPoliciesConfigurations(
+-      Map<String, SubClusterPolicyConfiguration> policiesConfigurations,
+-      int pageSize, int currentPage) throws YarnException {
+-
+-    // Step1. Check the parameters, if the policy list is empty, return empty directly.
+-    if (MapUtils.isEmpty(policiesConfigurations)) {
+-      return null;
+-    }
+-
+-    // Step2. Traverse policiesConfigurations and obtain the FederationQueueWeight list.
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    for (Map.Entry<String, SubClusterPolicyConfiguration> entry :
+-        policiesConfigurations.entrySet()) {
+-      String queue = entry.getKey();
+-      SubClusterPolicyConfiguration policyConf = entry.getValue();
+-      if (policyConf == null) {
+-        continue;
+-      }
+-      FederationQueueWeight federationQueueWeight = parseFederationQueueWeight(queue, policyConf);
+-      if (federationQueueWeight != null) {
+-        federationQueueWeights.add(federationQueueWeight);
+-      }
+-    }
+-
+-    // Step3. To paginate the returned results.
+-    return queryFederationQueuePoliciesPagination(federationQueueWeights, pageSize, currentPage);
+-  }
+-
+-  /**
+-   * Pagination for FederationQueuePolicies.
+-   *
+-   * @param queueWeights List Of FederationQueueWeight.
+-   * @param pageSize Items per page.
+-   * @param currentPage The number of pages to be queried.
+-   * @return federation queue policies response.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   */
+-  private QueryFederationQueuePoliciesResponse queryFederationQueuePoliciesPagination(
+-      List<FederationQueueWeight> queueWeights, int pageSize, int currentPage)
+-      throws YarnException {
+-    if (CollectionUtils.isEmpty(queueWeights)) {
+-      return null;
+-    }
+-
+-    int startIndex = (currentPage - 1) * pageSize;
+-    int endIndex = Math.min(startIndex + pageSize, queueWeights.size());
+-
+-    if (startIndex > endIndex) {
+-      throw new YarnException("The index of the records to be retrieved " +
+-          "has exceeded the maximum index.");
+-    }
+-
+-    List<FederationQueueWeight> subFederationQueueWeights =
+-        queueWeights.subList(startIndex, endIndex);
+-
+-    int totalSize = queueWeights.size();
+-    int totalPage =
+-        (totalSize % pageSize == 0) ? totalSize / pageSize : (totalSize / pageSize) + 1;
+-
+-    // Step3. Returns the Queue Policies result.
+-    return QueryFederationQueuePoliciesResponse.newInstance(
+-        totalSize, totalPage, currentPage, pageSize, subFederationQueueWeights);
+-  }
+-
+-  /**
+-   * Parses a FederationQueueWeight from the given queue and SubClusterPolicyConfiguration.
+-   *
+-   * @param queue The name of the queue.
+-   * @param policyConf policy configuration.
+-   * @return Queue weights for representing Federation.
+-   * @throws YarnException YarnException indicates exceptions from yarn servers.
+-   */
+-  private FederationQueueWeight parseFederationQueueWeight(String queue,
+-      SubClusterPolicyConfiguration policyConf) throws YarnException {
+-
+-    if (policyConf != null) {
+-      ByteBuffer params = policyConf.getParams();
+-      WeightedPolicyInfo weightedPolicyInfo = WeightedPolicyInfo.fromByteBuffer(params);
+-      Map<SubClusterIdInfo, Float> amrmPolicyWeights = weightedPolicyInfo.getAMRMPolicyWeights();
+-      Map<SubClusterIdInfo, Float> routerPolicyWeights =
+-          weightedPolicyInfo.getRouterPolicyWeights();
+-      float headroomAlpha = weightedPolicyInfo.getHeadroomAlpha();
+-      String policyManagerClassName = policyConf.getType();
+-
+-      String amrmPolicyWeight = parsePolicyWeights(amrmPolicyWeights);
+-      String routerPolicyWeight = parsePolicyWeights(routerPolicyWeights);
+-
+-      FederationQueueWeight.checkSubClusterQueueWeightRatioValid(amrmPolicyWeight);
+-      FederationQueueWeight.checkSubClusterQueueWeightRatioValid(routerPolicyWeight);
+-
+-      return FederationQueueWeight.newInstance(routerPolicyWeight, amrmPolicyWeight,
+-          String.valueOf(headroomAlpha), queue, policyManagerClassName);
+-    }
+-
+-    return null;
+-  }
+-
+-  /**
+-   * Parses the policy weights from the provided policyWeights map.
+-   * returns a string similar to the following:
+-   * SC-1:0.7,SC-2:0.3
+-   *
+-   * @param policyWeights
+-   *        A map containing SubClusterIdInfo as keys and corresponding weight values.
+-   * @return A string representation of the parsed policy weights.
+-   */
+-  protected String parsePolicyWeights(Map<SubClusterIdInfo, Float> policyWeights) {
+-    if (MapUtils.isEmpty(policyWeights)) {
+-      return null;
+-    }
+-    List<String> policyWeightList = new ArrayList<>();
+-    for (Map.Entry<SubClusterIdInfo, Float> entry : policyWeights.entrySet()) {
+-      SubClusterIdInfo key = entry.getKey();
+-      Float value = entry.getValue();
+-      policyWeightList.add(key.toId() + ":" + value);
+-    }
+-    return StringUtils.join(policyWeightList, ",");
+-  }
+-
+-  /**
+-   * Save FederationQueuePolicy.
+-   *
+-   * @param federationQueueWeight queue weight.
+-   * @throws YarnException exceptions from yarn servers.
+-   */
+-  private void saveFederationQueuePolicy(FederationQueueWeight federationQueueWeight)
+-      throws YarnException {
+-
+-    // Step1, Check whether the weight setting of the queue is as expected.
+-    String queue = federationQueueWeight.getQueue();
+-    String policyManagerClassName = federationQueueWeight.getPolicyManagerClassName();
+-
+-    if (StringUtils.isBlank(queue)) {
+-      RouterServerUtil.logAndThrowException("Missing Queue information.", null);
+-    }
+-
+-    if (StringUtils.isBlank(policyManagerClassName)) {
+-      RouterServerUtil.logAndThrowException("Missing PolicyManagerClassName information.", null);
+-    }
+-
+-    if (!checkPolicyManagerValid(policyManagerClassName, SUPPORT_WEIGHT_MANAGERS)) {
+-      routerMetrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-      RouterServerUtil.logAndThrowException(policyManagerClassName +
+-              "does not support the use of queue weights.", null);
+-    }
+-
+-    String amRmWeight = federationQueueWeight.getAmrmWeight();
+-    FederationQueueWeight.checkSubClusterQueueWeightRatioValid(amRmWeight);
+-
+-    String routerWeight = federationQueueWeight.getRouterWeight();
+-    FederationQueueWeight.checkSubClusterQueueWeightRatioValid(routerWeight);
+-
+-    String headRoomAlpha = federationQueueWeight.getHeadRoomAlpha();
+-    FederationQueueWeight.checkHeadRoomAlphaValid(headRoomAlpha);
+-
+-    // Step2, parse amRMPolicyWeights.
+-    Map<SubClusterIdInfo, Float> amRMPolicyWeights = getSubClusterWeightMap(amRmWeight);
+-    LOG.debug("amRMPolicyWeights = {}.", amRMPolicyWeights);
+-
+-    // Step3, parse routerPolicyWeights.
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = getSubClusterWeightMap(routerWeight);
+-    LOG.debug("routerWeights = {}.", amRMPolicyWeights);
+-
+-    // Step4, Initialize WeightedPolicyInfo.
+-    WeightedPolicyInfo weightedPolicyInfo = new WeightedPolicyInfo();
+-    weightedPolicyInfo.setHeadroomAlpha(Float.parseFloat(headRoomAlpha));
+-    weightedPolicyInfo.setAMRMPolicyWeights(amRMPolicyWeights);
+-    weightedPolicyInfo.setRouterPolicyWeights(routerPolicyWeights);
+-
+-    // Step5, Set SubClusterPolicyConfiguration.
+-    SubClusterPolicyConfiguration policyConfiguration =
+-        SubClusterPolicyConfiguration.newInstance(queue, policyManagerClassName,
+-        weightedPolicyInfo.toByteBuffer());
+-    federationFacade.setPolicyConfiguration(policyConfiguration);
+-  }
+-
+-  /**
+-   * Get the Map of SubClusterWeight.
+-   *
+-   * This method can parse the Weight information of Router and
+-   * the Weight information of AMRMProxy.
+-   *
+-   * An example of a parsed string is as follows:
+-   * SC-1:0.7,SC-2:0.3
+-   *
+-   * @param policyWeight policyWeight.
+-   * @return Map of SubClusterWeight.
+-   * @throws YarnException exceptions from yarn servers.
+-   */
+-  protected Map<SubClusterIdInfo, Float> getSubClusterWeightMap(String policyWeight)
+-      throws YarnException {
+-    FederationQueueWeight.checkSubClusterQueueWeightRatioValid(policyWeight);
+-    Map<SubClusterIdInfo, Float> result = new HashMap<>();
+-    String[] policyWeights = policyWeight.split(COMMA);
+-    for (String policyWeightItem : policyWeights) {
+-      String[] subClusterWeight = policyWeightItem.split(COLON);
+-      String subClusterId = subClusterWeight[0];
+-      SubClusterIdInfo subClusterIdInfo = new SubClusterIdInfo(subClusterId);
+-      String weight = subClusterWeight[1];
+-      result.put(subClusterIdInfo, Float.valueOf(weight));
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * deregisterSubCluster by SubClusterId.
+-   *
+-   * @param reqSubClusterId subClusterId.
+-   * @throws YarnException indicates exceptions from yarn servers.
+-   */
+-  private DeregisterSubClusters deregisterSubCluster(String reqSubClusterId) {
+-
+-    DeregisterSubClusters deregisterSubClusters;
+-
+-    try {
+-      // Step1. Get subCluster information.
+-      SubClusterId subClusterId = SubClusterId.newInstance(reqSubClusterId);
+-      SubClusterInfo subClusterInfo = federationFacade.getSubCluster(subClusterId);
+-      SubClusterState subClusterState = subClusterInfo.getState();
+-      long lastHeartBeat = subClusterInfo.getLastHeartBeat();
+-      Date lastHeartBeatDate = new Date(lastHeartBeat);
+-      deregisterSubClusters = DeregisterSubClusters.newInstance(
+-          reqSubClusterId, "NONE", lastHeartBeatDate.toString(),
+-          "Normal Heartbeat", subClusterState.name());
+-
+-      // Step2. Deregister subCluster.
+-      if (subClusterState.isUsable()) {
+-        LOG.warn("Deregister SubCluster {} in State {} last heartbeat at {}.",
+-            subClusterId, subClusterState, lastHeartBeatDate);
+-        // heartbeat interval time.
+-        long heartBearTimeInterval = Time.now() - lastHeartBeat;
+-        if (heartBearTimeInterval - heartbeatExpirationMillis < 0) {
+-          boolean deregisterSubClusterFlag =
+-              federationFacade.deregisterSubCluster(subClusterId, SubClusterState.SC_LOST);
+-          if (deregisterSubClusterFlag) {
+-            deregisterSubClusters.setDeregisterState("SUCCESS");
+-            deregisterSubClusters.setSubClusterState("SC_LOST");
+-            deregisterSubClusters.setInformation("Heartbeat Time >= " +
+-                heartbeatExpirationMillis / (1000 * 60) + "minutes");
+-          } else {
+-            deregisterSubClusters.setDeregisterState("FAILED");
+-            deregisterSubClusters.setInformation("DeregisterSubClusters Failed.");
+-          }
+-        }
+-      } else {
+-        deregisterSubClusters.setDeregisterState("FAILED");
+-        deregisterSubClusters.setInformation("The subCluster is Unusable, " +
+-            "So it can't be Deregistered");
+-        LOG.warn("The SubCluster {} is Unusable (SubClusterState:{}), So it can't be Deregistered",
+-            subClusterId, subClusterState);
+-      }
+-      return deregisterSubClusters;
+-    } catch (YarnException e) {
+-      LOG.error("SubCluster {} DeregisterSubCluster Failed", reqSubClusterId, e);
+-      deregisterSubClusters = DeregisterSubClusters.newInstance(
+-          reqSubClusterId, "FAILED", "UNKNOWN", e.getMessage(), "UNKNOWN");
+-      return deregisterSubClusters;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminProtocolMethod.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminProtocolMethod.java
+deleted file mode 100644
+index 665545ce6ea..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminProtocolMethod.java
++++ /dev/null
+@@ -1,186 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.commons.lang3.tuple.Pair;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationMethodWrapper;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.lang.reflect.Method;
+-import java.util.Collection;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.TreeMap;
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.concurrent.Callable;
+-import java.util.concurrent.ExecutionException;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.ThreadPoolExecutor;
+-
+-/**
+- * Class to define admin method, params and arguments.
+- */
+-public class RMAdminProtocolMethod extends FederationMethodWrapper {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RMAdminProtocolMethod.class);
+-
+-  private FederationStateStoreFacade federationFacade;
+-  private FederationRMAdminInterceptor rmAdminInterceptor;
+-  private Configuration configuration;
+-
+-  public RMAdminProtocolMethod(Class<?>[] pTypes, Object... pParams)
+-      throws IOException {
+-    super(pTypes, pParams);
+-  }
+-
+-  public <R> Collection<R> invokeConcurrent(FederationRMAdminInterceptor interceptor,
+-      Class<R> clazz, String subClusterId) throws YarnException {
+-    this.rmAdminInterceptor = interceptor;
+-    this.federationFacade = FederationStateStoreFacade.getInstance(interceptor.getConf());
+-    this.configuration = interceptor.getConf();
+-    if (StringUtils.isNotBlank(subClusterId)) {
+-      return invoke(clazz, subClusterId);
+-    } else {
+-      return invokeConcurrent(clazz);
+-    }
+-  }
+-
+-  @Override
+-  protected <R> Collection<R> invokeConcurrent(Class<R> clazz) throws YarnException {
+-    String methodName = Thread.currentThread().getStackTrace()[3].getMethodName();
+-    this.setMethodName(methodName);
+-
+-    ThreadPoolExecutor executorService = rmAdminInterceptor.getExecutorService();
+-
+-    // Get Active SubClusters
+-    Map<SubClusterId, SubClusterInfo> subClusterInfo =
+-        federationFacade.getSubClusters(true);
+-    Collection<SubClusterId> subClusterIds = subClusterInfo.keySet();
+-
+-    List<Callable<Pair<SubClusterId, Object>>> callables = new ArrayList<>();
+-    List<Future<Pair<SubClusterId, Object>>> futures = new ArrayList<>();
+-    Map<SubClusterId, Exception> exceptions = new TreeMap<>();
+-
+-    // Generate parallel Callable tasks
+-    for (SubClusterId subClusterId : subClusterIds) {
+-      callables.add(() -> {
+-        ResourceManagerAdministrationProtocol protocol =
+-            rmAdminInterceptor.getAdminRMProxyForSubCluster(subClusterId);
+-        Class<?>[] types = this.getTypes();
+-        Object[] params = this.getParams();
+-        Method method = ResourceManagerAdministrationProtocol.class.getMethod(methodName, types);
+-        Object result = method.invoke(protocol, params);
+-        return Pair.of(subClusterId, result);
+-      });
+-    }
+-
+-    // Get results from multiple threads
+-    Map<SubClusterId, R> results = new TreeMap<>();
+-    try {
+-      futures.addAll(executorService.invokeAll(callables));
+-      futures.stream().forEach(future -> {
+-        SubClusterId subClusterId = null;
+-        try {
+-          Pair<SubClusterId, Object> pair = future.get();
+-          subClusterId = pair.getKey();
+-          Object result = pair.getValue();
+-          if (result != null) {
+-            R rResult = clazz.cast(result);
+-            results.put(subClusterId, rResult);
+-          }
+-        } catch (InterruptedException | ExecutionException e) {
+-          Throwable cause = e.getCause();
+-          LOG.error("Cannot execute {} on {}: {}", methodName, subClusterId, cause.getMessage());
+-          exceptions.put(subClusterId, e);
+-        }
+-      });
+-    } catch (InterruptedException e) {
+-      throw new YarnException("invokeConcurrent Failed.", e);
+-    }
+-
+-    // All sub-clusters return results to be considered successful,
+-    // otherwise an exception will be thrown.
+-    if (exceptions != null && !exceptions.isEmpty()) {
+-      Set<SubClusterId> subClusterIdSets = exceptions.keySet();
+-      throw new YarnException("invokeConcurrent Failed, An exception occurred in subClusterIds = " +
+-          StringUtils.join(subClusterIdSets, ","));
+-    }
+-
+-    // return result
+-    return results.values();
+-  }
+-
+-  /**
+-   * Call the method in the protocol according to the subClusterId.
+-   *
+-   * @param clazz return type
+-   * @param subClusterId subCluster Id
+-   * @param <R> Generic R
+-   * @return response collection.
+-   * @throws YarnException yarn exception.
+-   */
+-  protected <R> Collection<R> invoke(Class<R> clazz, String subClusterId) throws YarnException {
+-
+-    // Get the method name to call
+-    String methodName = Thread.currentThread().getStackTrace()[3].getMethodName();
+-    this.setMethodName(methodName);
+-
+-    // Get Active SubClusters
+-    Map<SubClusterId, SubClusterInfo> subClusterInfoMap =
+-        federationFacade.getSubClusters(true);
+-
+-    // According to subCluster of string type, convert to SubClusterId type
+-    SubClusterId subClusterIdKey = SubClusterId.newInstance(subClusterId);
+-
+-    // If the provided subCluster is not Active or does not exist,
+-    // an exception will be returned directly.
+-    if (!subClusterInfoMap.containsKey(subClusterIdKey)) {
+-      throw new YarnException("subClusterId = " + subClusterId + " is not an active subCluster.");
+-    }
+-
+-    // Call the method in the protocol and convert it according to clazz.
+-    try {
+-      ResourceManagerAdministrationProtocol protocol =
+-          rmAdminInterceptor.getAdminRMProxyForSubCluster(subClusterIdKey);
+-      Class<?>[] types = this.getTypes();
+-      Object[] params = this.getParams();
+-      Method method = ResourceManagerAdministrationProtocol.class.getMethod(methodName, types);
+-      Object result = method.invoke(protocol, params);
+-      if (result != null) {
+-        return Collections.singletonList(clazz.cast(result));
+-      }
+-    } catch (Exception e) {
+-      throw new YarnException("invoke Failed, An exception occurred in subClusterId = " +
+-          subClusterId, e);
+-    }
+-    throw new YarnException("invoke Failed, An exception occurred in subClusterId = " +
+-        subClusterId);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminRequestInterceptor.java
+deleted file mode 100644
+index 29ab9e6add2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RMAdminRequestInterceptor.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-
+-/**
+- * Defines the contract to be implemented by the request interceptor classes,
+- * that can be used to intercept and inspect messages sent from the client to
+- * the resource manager.
+- */
+-public interface RMAdminRequestInterceptor
+-    extends ResourceManagerAdministrationProtocol, Configurable {
+-  /**
+-   * This method is called for initializing the interceptor. This is guaranteed
+-   * to be called only once in the lifetime of this instance.
+-   *
+-   * @param user the name of the client
+-   */
+-  void init(String user);
+-
+-  /**
+-   * This method is called to release the resources held by the interceptor.
+-   * This will be called when the application pipeline is being destroyed. The
+-   * concrete implementations should dispose the resources and forward the
+-   * request to the next interceptor, if any.
+-   */
+-  void shutdown();
+-
+-  /**
+-   * Sets the next interceptor in the pipeline. The concrete implementation of
+-   * this interface should always pass the request to the nextInterceptor after
+-   * inspecting the message. The last interceptor in the chain is responsible to
+-   * send the messages to the resource manager service and so the last
+-   * interceptor will not receive this method call.
+-   *
+-   * @param nextInterceptor the RMAdminRequestInterceptor to set in the pipeline
+-   */
+-  void setNextInterceptor(RMAdminRequestInterceptor nextInterceptor);
+-
+-  /**
+-   * Returns the next interceptor in the chain.
+-   *
+-   * @return the next interceptor in the chain
+-   */
+-  RMAdminRequestInterceptor getNextInterceptor();
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java
+deleted file mode 100644
+index 94e72c4e57a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/RouterRMAdminService.java
++++ /dev/null
+@@ -1,449 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.util.Collections;
+-import java.util.Map;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.ipc.StandbyException;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.PolicyProvider;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.router.security.authorize.RouterPolicyProvider;
+-import org.apache.hadoop.yarn.util.LRUCacheHashMap;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-/**
+- * RouterRMAdminService is a service that runs on each router that can be used
+- * to intercept and inspect {@code ResourceManagerAdministrationProtocol}
+- * messages from client to the cluster resource manager. It listens
+- * {@code ResourceManagerAdministrationProtocol} messages from the client and
+- * creates a request intercepting pipeline instance for each client. The
+- * pipeline is a chain of interceptor instances that can inspect and modify the
+- * request/response as needed. The main difference with AMRMProxyService is the
+- * protocol they implement.
+- */
+-public class RouterRMAdminService extends AbstractService
+-    implements ResourceManagerAdministrationProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterRMAdminService.class);
+-
+-  private Server server;
+-  private InetSocketAddress listenerEndpoint;
+-
+-  // For each user we store an interceptors' pipeline.
+-  // For performance issue we use LRU cache to keep in memory the newest ones
+-  // and remove the oldest used ones.
+-  private Map<String, RequestInterceptorChainWrapper> userPipelineMap;
+-
+-  public RouterRMAdminService() {
+-    super(RouterRMAdminService.class.getName());
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    LOG.info("Starting Router RMAdmin Service.");
+-    Configuration conf = getConfig();
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    UserGroupInformation.setConfiguration(conf);
+-
+-    this.listenerEndpoint =
+-        conf.getSocketAddr(YarnConfiguration.ROUTER_BIND_HOST,
+-            YarnConfiguration.ROUTER_RMADMIN_ADDRESS,
+-            YarnConfiguration.DEFAULT_ROUTER_RMADMIN_ADDRESS,
+-            YarnConfiguration.DEFAULT_ROUTER_RMADMIN_PORT);
+-
+-    int maxCacheSize =
+-        conf.getInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-            YarnConfiguration.DEFAULT_ROUTER_PIPELINE_CACHE_MAX_SIZE);
+-    this.userPipelineMap = Collections.synchronizedMap(new LRUCacheHashMap<>(maxCacheSize, true));
+-
+-    Configuration serverConf = new Configuration(conf);
+-
+-    int numWorkerThreads =
+-        serverConf.getInt(YarnConfiguration.RM_ADMIN_CLIENT_THREAD_COUNT,
+-            YarnConfiguration.DEFAULT_RM_ADMIN_CLIENT_THREAD_COUNT);
+-
+-    this.server = rpc.getServer(ResourceManagerAdministrationProtocol.class,
+-        this, listenerEndpoint, serverConf, null, numWorkerThreads);
+-
+-    if (conf.getBoolean(
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, false)) {
+-      refreshServiceAcls(conf, RouterPolicyProvider.getInstance());
+-    }
+-
+-    this.server.start();
+-    LOG.info("Router RMAdminService listening on address: {}.", this.server.getListenerAddress());
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping Router RMAdminService.");
+-    if (this.server != null) {
+-      this.server.stop();
+-    }
+-    userPipelineMap.clear();
+-    super.serviceStop();
+-  }
+-
+-  void refreshServiceAcls(Configuration configuration,
+-      PolicyProvider policyProvider) {
+-    this.server.refreshServiceAcl(configuration, policyProvider);
+-  }
+-
+-  @VisibleForTesting
+-  public Server getServer() {
+-    return this.server;
+-  }
+-
+-  @VisibleForTesting
+-  public RequestInterceptorChainWrapper getInterceptorChain()
+-      throws IOException {
+-    String user = UserGroupInformation.getCurrentUser().getUserName();
+-    RequestInterceptorChainWrapper chain = userPipelineMap.get(user);
+-    if (chain != null && chain.getRootInterceptor() != null) {
+-      return chain;
+-    }
+-    return initializePipeline(user);
+-  }
+-
+-  /**
+-   * Gets the Request interceptor chains for all the users.
+-   *
+-   * @return the request interceptor chains.
+-   */
+-  @VisibleForTesting
+-  protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
+-    return this.userPipelineMap;
+-  }
+-
+-  /**
+-   * This method creates and returns reference of the first interceptor in the
+-   * chain of request interceptor instances.
+-   *
+-   * @return the reference of the first interceptor in the chain
+-   */
+-  @VisibleForTesting
+-  protected RMAdminRequestInterceptor createRequestInterceptorChain() {
+-    Configuration conf = getConfig();
+-    return RouterServerUtil.createRequestInterceptorChain(conf,
+-        YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,
+-        YarnConfiguration.DEFAULT_ROUTER_RMADMIN_INTERCEPTOR_CLASS,
+-        RMAdminRequestInterceptor.class);
+-  }
+-
+-  /**
+-   * Initializes the request interceptor pipeline for the specified user.
+-   *
+-   * @param user
+-   */
+-  private RequestInterceptorChainWrapper initializePipeline(String user) {
+-    synchronized (this.userPipelineMap) {
+-      if (this.userPipelineMap.containsKey(user)) {
+-        LOG.info("Request to start an already existing user: {}"
+-            + " was received, so ignoring.", user);
+-        return userPipelineMap.get(user);
+-      }
+-
+-      RequestInterceptorChainWrapper chainWrapper =
+-          new RequestInterceptorChainWrapper();
+-      try {
+-        // We should init the pipeline instance after it is created and then
+-        // add to the map, to ensure thread safe.
+-        LOG.info("Initializing request processing pipeline for user: {}.", user);
+-
+-        RMAdminRequestInterceptor interceptorChain =
+-            this.createRequestInterceptorChain();
+-        interceptorChain.init(user);
+-        chainWrapper.init(interceptorChain);
+-      } catch (Exception e) {
+-        LOG.error("Init RMAdminRequestInterceptor error for user: {}.", user, e);
+-        throw e;
+-      }
+-
+-      this.userPipelineMap.put(user, chainWrapper);
+-      return chainWrapper;
+-    }
+-  }
+-
+-  /**
+-   * Private structure for encapsulating RequestInterceptor and user instances.
+-   *
+-   */
+-  @Private
+-  public static class RequestInterceptorChainWrapper {
+-    private RMAdminRequestInterceptor rootInterceptor;
+-
+-    /**
+-     * Initializes the wrapper with the specified parameters.
+-     *
+-     * @param interceptor the first interceptor in the pipeline
+-     */
+-    public synchronized void init(RMAdminRequestInterceptor interceptor) {
+-      this.rootInterceptor = interceptor;
+-    }
+-
+-    /**
+-     * Gets the root request interceptor.
+-     *
+-     * @return the root request interceptor
+-     */
+-    public synchronized RMAdminRequestInterceptor getRootInterceptor() {
+-      return rootInterceptor;
+-    }
+-
+-    /**
+-     * Shutdown the chain of interceptors when the object is destroyed.
+-     */
+-    @Override
+-    protected void finalize() {
+-      rootInterceptor.shutdown();
+-    }
+-  }
+-
+-  @Override
+-  public String[] getGroupsForUser(String user) throws IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getGroupsForUser(user);
+-  }
+-
+-  @Override
+-  public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshQueues(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshNodes(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
+-      RefreshSuperUserGroupsConfigurationRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor()
+-        .refreshSuperUserGroupsConfiguration(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
+-      RefreshUserToGroupsMappingsRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshUserToGroupsMappings(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshAdminAclsResponse refreshAdminAcls(
+-      RefreshAdminAclsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshAdminAcls(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshServiceAclsResponse refreshServiceAcls(
+-      RefreshServiceAclsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshServiceAcls(request);
+-
+-  }
+-
+-  @Override
+-  public UpdateNodeResourceResponse updateNodeResource(
+-      UpdateNodeResourceRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().updateNodeResource(request);
+-
+-  }
+-
+-  @Override
+-  public RefreshNodesResourcesResponse refreshNodesResources(
+-      RefreshNodesResourcesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshNodesResources(request);
+-
+-  }
+-
+-  @Override
+-  public AddToClusterNodeLabelsResponse addToClusterNodeLabels(
+-      AddToClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().addToClusterNodeLabels(request);
+-
+-  }
+-
+-  @Override
+-  public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
+-      RemoveFromClusterNodeLabelsRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().removeFromClusterNodeLabels(request);
+-
+-  }
+-
+-  @Override
+-  public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
+-      ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().replaceLabelsOnNode(request);
+-
+-  }
+-
+-  @Override
+-  public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
+-      CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor()
+-        .checkForDecommissioningNodes(checkForDecommissioningNodesRequest);
+-  }
+-
+-  @Override
+-  public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
+-      RefreshClusterMaxPriorityRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().refreshClusterMaxPriority(request);
+-  }
+-
+-  @Override
+-  public NodesToAttributesMappingResponse mapAttributesToNodes(
+-      NodesToAttributesMappingRequest request)
+-      throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().mapAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public DeregisterSubClusterResponse deregisterSubCluster(
+-      DeregisterSubClusterRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().deregisterSubCluster(request);
+-  }
+-
+-  @Override
+-  public SaveFederationQueuePolicyResponse saveFederationQueuePolicy(
+-      SaveFederationQueuePolicyRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().saveFederationQueuePolicy(request);
+-  }
+-
+-  @Override
+-  public BatchSaveFederationQueuePoliciesResponse batchSaveFederationQueuePolicies(
+-      BatchSaveFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().batchSaveFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
+-      QueryFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().listFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationApplicationResponse deleteFederationApplication(
+-      DeleteFederationApplicationRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().deleteFederationApplication(request);
+-  }
+-
+-  @Override
+-  public GetSubClustersResponse getFederationSubClusters(
+-      GetSubClustersRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().getFederationSubClusters(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationQueuePoliciesResponse deleteFederationPoliciesByQueues(
+-      DeleteFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain();
+-    return pipeline.getRootInterceptor().deleteFederationPoliciesByQueues(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/package-info.java
+deleted file mode 100644
+index 98a7ed0841c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/rmadmin/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router RM Admin Proxy Service package. **/
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/RouterDelegationTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/RouterDelegationTokenSecretManager.java
+deleted file mode 100644
+index 16a00808a76..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/RouterDelegationTokenSecretManager.java
++++ /dev/null
+@@ -1,375 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.security;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Public;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager;
+-import org.apache.hadoop.security.token.delegation.DelegationKey;
+-import org.apache.hadoop.security.token.delegation.RouterDelegationTokenSupport;
+-import org.apache.hadoop.util.ExitUtil;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.security.client.YARNDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKey;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterMasterKeyResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterRMTokenResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.Base64;
+-
+-/**
+- * A Router specific delegation token secret manager.
+- * The secret manager is responsible for generating and accepting the password
+- * for each token.
+- */
+-public class RouterDelegationTokenSecretManager
+-    extends AbstractDelegationTokenSecretManager<RMDelegationTokenIdentifier> {
+-
+-  private static final Logger LOG = LoggerFactory
+-      .getLogger(RouterDelegationTokenSecretManager.class);
+-
+-  private FederationStateStoreFacade federationFacade;
+-
+-  /**
+-   * Create a Router Secret manager.
+-   *
+-   * @param delegationKeyUpdateInterval        the number of milliseconds for rolling
+-   *                                           new secret keys.
+-   * @param delegationTokenMaxLifetime         the maximum lifetime of the delegation
+-   *                                           tokens in milliseconds
+-   * @param delegationTokenRenewInterval       how often the tokens must be renewed
+-   *                                           in milliseconds
+-   * @param delegationTokenRemoverScanInterval how often the tokens are scanned
+-   * @param conf Configuration.
+-   */
+-  public RouterDelegationTokenSecretManager(long delegationKeyUpdateInterval,
+-      long delegationTokenMaxLifetime, long delegationTokenRenewInterval,
+-      long delegationTokenRemoverScanInterval, Configuration conf) {
+-    super(delegationKeyUpdateInterval, delegationTokenMaxLifetime,
+-        delegationTokenRenewInterval, delegationTokenRemoverScanInterval);
+-    this.federationFacade = FederationStateStoreFacade.getInstance(conf);
+-  }
+-
+-  @Override
+-  public RMDelegationTokenIdentifier createIdentifier() {
+-    return new RMDelegationTokenIdentifier();
+-  }
+-
+-  private boolean shouldIgnoreException(Exception e) {
+-    return !running && e.getCause() instanceof InterruptedException;
+-  }
+-
+-  /**
+-   * The Router Supports Store the New Master Key.
+-   * During this Process, Facade will call the specific StateStore to store the MasterKey.
+-   *
+-   * @param newKey DelegationKey
+-   */
+-  @Override
+-  public void storeNewMasterKey(DelegationKey newKey) {
+-    try {
+-      federationFacade.storeNewMasterKey(newKey);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in storing master key with KeyID: {}.", newKey.getKeyId());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Remove the master key.
+-   * During this Process, Facade will call the specific StateStore to remove the MasterKey.
+-   *
+-   * @param delegationKey DelegationKey
+-   */
+-  @Override
+-  public void removeStoredMasterKey(DelegationKey delegationKey) {
+-    try {
+-      federationFacade.removeStoredMasterKey(delegationKey);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in removing master key with KeyID: {}.", delegationKey.getKeyId());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Store new Token.
+-   *
+-   * @param identifier RMDelegationToken
+-   * @param renewDate renewDate
+-   * @throws IOException IO exception occurred.
+-   */
+-  @Override
+-  public void storeNewToken(RMDelegationTokenIdentifier identifier,
+-      long renewDate) throws IOException {
+-    try {
+-      federationFacade.storeNewToken(identifier, renewDate);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in storing RMDelegationToken with sequence number: {}.",
+-            identifier.getSequenceNumber());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Store new Token.
+-   *
+-   * @param identifier RMDelegationToken.
+-   * @param tokenInfo DelegationTokenInformation.
+-   */
+-  public void storeNewToken(RMDelegationTokenIdentifier identifier,
+-      DelegationTokenInformation tokenInfo) {
+-    try {
+-      String token =
+-          RouterDelegationTokenSupport.encodeDelegationTokenInformation(tokenInfo);
+-      long renewDate = tokenInfo.getRenewDate();
+-
+-      federationFacade.storeNewToken(identifier, renewDate, token);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in storing RMDelegationToken with sequence number: {}.",
+-            identifier.getSequenceNumber());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Update Token.
+-   *
+-   * @param id RMDelegationToken
+-   * @param renewDate renewDate
+-   * @throws IOException IO exception occurred
+-   */
+-  @Override
+-  public void updateStoredToken(RMDelegationTokenIdentifier id, long renewDate) throws IOException {
+-    try {
+-      federationFacade.updateStoredToken(id, renewDate);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in updating persisted RMDelegationToken with sequence number: {}.",
+-            id.getSequenceNumber());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Update Token.
+-   *
+-   * @param identifier RMDelegationToken.
+-   * @param tokenInfo DelegationTokenInformation.
+-   */
+-  public void updateStoredToken(RMDelegationTokenIdentifier identifier,
+-      DelegationTokenInformation tokenInfo) {
+-    try {
+-      long renewDate = tokenInfo.getRenewDate();
+-      String token = RouterDelegationTokenSupport.encodeDelegationTokenInformation(tokenInfo);
+-      federationFacade.updateStoredToken(identifier, renewDate, token);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in updating persisted RMDelegationToken with sequence number: {}.",
+-            identifier.getSequenceNumber());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router Supports Remove Token.
+-   *
+-   * @param identifier Delegation Token
+-   * @throws IOException IO exception occurred.
+-   */
+-  @Override
+-  public void removeStoredToken(RMDelegationTokenIdentifier identifier) throws IOException {
+-    try {
+-      federationFacade.removeStoredToken(identifier);
+-    } catch (Exception e) {
+-      if (!shouldIgnoreException(e)) {
+-        LOG.error("Error in removing RMDelegationToken with sequence number: {}",
+-            identifier.getSequenceNumber());
+-        ExitUtil.terminate(1, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * The Router supports obtaining the DelegationKey stored in the Router StateStote
+-   * according to the DelegationKey.
+-   *
+-   * @param key Param DelegationKey
+-   * @return Delegation Token
+-   * @throws YarnException An internal conversion error occurred when getting the Token
+-   * @throws IOException IO exception occurred
+-   */
+-  public DelegationKey getMasterKeyByDelegationKey(DelegationKey key)
+-      throws YarnException, IOException {
+-    try {
+-      RouterMasterKeyResponse response = federationFacade.getMasterKeyByDelegationKey(key);
+-      RouterMasterKey masterKey = response.getRouterMasterKey();
+-      ByteBuffer keyByteBuf = masterKey.getKeyBytes();
+-      byte[] keyBytes = new byte[keyByteBuf.remaining()];
+-      keyByteBuf.get(keyBytes);
+-      DelegationKey delegationKey =
+-          new DelegationKey(masterKey.getKeyId(), masterKey.getExpiryDate(), keyBytes);
+-      return delegationKey;
+-    } catch (IOException ex) {
+-      throw new IOException(ex);
+-    } catch (YarnException ex) {
+-      throw new YarnException(ex);
+-    }
+-  }
+-
+-  /**
+-   * Get RMDelegationTokenIdentifier according to RouterStoreToken.
+-   *
+-   * @param identifier RMDelegationTokenIdentifier
+-   * @return RMDelegationTokenIdentifier
+-   * @throws YarnException An internal conversion error occurred when getting the Token
+-   * @throws IOException IO exception occurred
+-   */
+-  public RMDelegationTokenIdentifier getTokenByRouterStoreToken(
+-      RMDelegationTokenIdentifier identifier) throws YarnException, IOException {
+-    try {
+-      RouterRMTokenResponse response = federationFacade.getTokenByRouterStoreToken(identifier);
+-      YARNDelegationTokenIdentifier responseIdentifier =
+-          response.getRouterStoreToken().getTokenIdentifier();
+-      return (RMDelegationTokenIdentifier) responseIdentifier;
+-    } catch (Exception ex) {
+-      throw new YarnException(ex);
+-    }
+-  }
+-
+-  public void setFederationFacade(FederationStateStoreFacade federationFacade) {
+-    this.federationFacade = federationFacade;
+-  }
+-
+-  @Public
+-  @VisibleForTesting
+-  public int getLatestDTSequenceNumber() {
+-    return delegationTokenSequenceNumber;
+-  }
+-
+-  @Public
+-  @VisibleForTesting
+-  public synchronized Set<DelegationKey> getAllMasterKeys() {
+-    return new HashSet<>(allKeys.values());
+-  }
+-
+-  @Public
+-  @VisibleForTesting
+-  public synchronized Map<RMDelegationTokenIdentifier, Long> getAllTokens() {
+-    Map<RMDelegationTokenIdentifier, Long> allTokens = new HashMap<>();
+-    for (Map.Entry<RMDelegationTokenIdentifier,
+-         DelegationTokenInformation> entry : currentTokens.entrySet()) {
+-      RMDelegationTokenIdentifier keyIdentifier = entry.getKey();
+-      DelegationTokenInformation tokenInformation = entry.getValue();
+-      allTokens.put(keyIdentifier, tokenInformation.getRenewDate());
+-    }
+-    return allTokens;
+-  }
+-
+-  public long getRenewDate(RMDelegationTokenIdentifier ident)
+-      throws InvalidToken {
+-    DelegationTokenInformation info = currentTokens.get(ident);
+-    if (info == null) {
+-      throw new InvalidToken("token (" + ident.toString()
+-          + ") can't be found in cache");
+-    }
+-    return info.getRenewDate();
+-  }
+-
+-  @Override
+-  protected synchronized int incrementDelegationTokenSeqNum() {
+-    return federationFacade.incrementDelegationTokenSeqNum();
+-  }
+-
+-  @Override
+-  protected void storeToken(RMDelegationTokenIdentifier rmDelegationTokenIdentifier,
+-      DelegationTokenInformation tokenInfo) throws IOException {
+-    this.currentTokens.put(rmDelegationTokenIdentifier, tokenInfo);
+-    this.addTokenForOwnerStats(rmDelegationTokenIdentifier);
+-    storeNewToken(rmDelegationTokenIdentifier, tokenInfo);
+-  }
+-
+-  @Override
+-  protected void updateToken(RMDelegationTokenIdentifier rmDelegationTokenIdentifier,
+-      DelegationTokenInformation tokenInfo) throws IOException {
+-    this.currentTokens.put(rmDelegationTokenIdentifier, tokenInfo);
+-    updateStoredToken(rmDelegationTokenIdentifier, tokenInfo);
+-  }
+-
+-  @Override
+-  protected DelegationTokenInformation getTokenInfo(
+-      RMDelegationTokenIdentifier ident) {
+-    // First check if I have this..
+-    DelegationTokenInformation tokenInfo = currentTokens.get(ident);
+-    if (tokenInfo == null) {
+-      try {
+-        RouterRMTokenResponse response = federationFacade.getTokenByRouterStoreToken(ident);
+-        RouterStoreToken routerStoreToken = response.getRouterStoreToken();
+-        String tokenStr = routerStoreToken.getTokenInfo();
+-        byte[] tokenBytes = Base64.getUrlDecoder().decode(tokenStr);
+-        tokenInfo = RouterDelegationTokenSupport.decodeDelegationTokenInformation(tokenBytes);
+-      } catch (Exception e) {
+-        LOG.error("Error retrieving tokenInfo [" + ident.getSequenceNumber()
+-            + "] from StateStore.", e);
+-        throw new YarnRuntimeException(e);
+-      }
+-    }
+-    return tokenInfo;
+-  }
+-
+-  @Override
+-  protected synchronized int getDelegationTokenSeqNum() {
+-    return federationFacade.getDelegationTokenSeqNum();
+-  }
+-
+-  @Override
+-  protected synchronized void setDelegationTokenSeqNum(int seqNum) {
+-    federationFacade.setDelegationTokenSeqNum(seqNum);
+-  }
+-
+-  @Override
+-  protected synchronized int getCurrentKeyId() {
+-    return federationFacade.getCurrentKeyId();
+-  }
+-
+-  @Override
+-  protected synchronized int incrementCurrentKeyId() {
+-    return federationFacade.incrementCurrentKeyId();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/RouterPolicyProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/RouterPolicyProvider.java
+deleted file mode 100644
+index 917e1855a9e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/RouterPolicyProvider.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements. See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership. The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License. You may obtain a copy of the License at
+-*
+-* http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.router.security.authorize;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+-import org.apache.hadoop.security.authorize.PolicyProvider;
+-import org.apache.hadoop.security.authorize.Service;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocolPB;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocolPB;
+-
+-/**
+- * {@link PolicyProvider} for YARN Router server protocols.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-public class RouterPolicyProvider extends PolicyProvider {
+-
+-  private static volatile RouterPolicyProvider routerPolicyProvider = null;
+-
+-  private RouterPolicyProvider() {
+-  }
+-
+-  @InterfaceAudience.Private
+-  @InterfaceStability.Unstable
+-  public static RouterPolicyProvider getInstance() {
+-    if (routerPolicyProvider == null) {
+-      synchronized (RouterPolicyProvider.class) {
+-        if (routerPolicyProvider == null) {
+-          routerPolicyProvider = new RouterPolicyProvider();
+-        }
+-      }
+-    }
+-    return routerPolicyProvider;
+-  }
+-
+-  private static final Service[] ROUTER_SERVICES = new Service[] {
+-      new Service(
+-          YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_APPLICATIONCLIENT_PROTOCOL,
+-          ApplicationClientProtocolPB.class),
+-      new Service(
+-          YarnConfiguration.YARN_SECURITY_SERVICE_AUTHORIZATION_RESOURCEMANAGER_ADMINISTRATION_PROTOCOL,
+-          ResourceManagerAdministrationProtocolPB.class), };
+-
+-  @Override
+-  public Service[] getServices() {
+-    return ROUTER_SERVICES;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/package-info.java
+deleted file mode 100644
+index da9c8bcd68b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/authorize/package-info.java
++++ /dev/null
+@@ -1,22 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router Security Authorization package. **/
+-package org.apache.hadoop.yarn.server.router.security.authorize;
+-
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/package-info.java
+deleted file mode 100644
+index 16a7488c071..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/security/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.security;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutBlock.java
+deleted file mode 100644
+index 4ae43f01f24..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutBlock.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.commons.lang3.time.DateFormatUtils;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.RouterInfo;
+-import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+-
+-import com.google.inject.Inject;
+-
+-/**
+- * About block for the Router Web UI.
+- */
+-public class AboutBlock extends RouterBlock {
+-
+-  private final Router router;
+-
+-  @Inject
+-  AboutBlock(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // If Yarn Federation is not enabled, the user needs to be prompted.
+-    initUserHelpInformationDiv(html, isEnabled);
+-
+-    // Metrics Overview Table
+-    html.__(MetricsOverviewTable.class);
+-
+-    // Init Yarn Router Basic Information
+-    initYarnRouterBasicInformation(isEnabled);
+-
+-    // InfoBlock
+-    html.__(InfoBlock.class);
+-  }
+-
+-  /**
+-   * Init Yarn Router Basic Infomation.
+-   * @param isEnabled true, federation is enabled; false, federation is not enabled.
+-   */
+-  private void initYarnRouterBasicInformation(boolean isEnabled) {
+-    FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(router.getConfig());
+-    RouterInfo routerInfo = new RouterInfo(router);
+-    String lastStartTime =
+-        DateFormatUtils.format(routerInfo.getStartedOn(), DATE_PATTERN);
+-    try {
+-      info("Yarn Router Overview").
+-          __("Federation Enabled:", String.valueOf(isEnabled)).
+-          __("Router ID:", routerInfo.getClusterId()).
+-          __("Router state:", routerInfo.getState()).
+-          __("Router SubCluster Count:", facade.getSubClusters(true).size()).
+-          __("Router RMStateStore:", routerInfo.getRouterStateStore()).
+-          __("Router started on:", lastStartTime).
+-          __("Router version:", routerInfo.getRouterBuildVersion() +
+-             " on " + routerInfo.getRouterVersionBuiltOn()).
+-          __("Hadoop version:", routerInfo.getHadoopBuildVersion() +
+-             " on " + routerInfo.getHadoopVersionBuiltOn());
+-    } catch (YarnException e) {
+-      LOG.error("initYarnRouterBasicInformation error.", e);
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutPage.java
+deleted file mode 100644
+index 3c9f00dbfc6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AboutPage.java
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-
+-/**
+- * About page for the Router Web UI.
+- */
+-public class AboutPage extends RouterView {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return AboutBlock.class;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AbstractRESTRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AbstractRESTRequestInterceptor.java
+deleted file mode 100644
+index ad79addfca4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AbstractRESTRequestInterceptor.java
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-
+-/**
+- * Extends the RequestInterceptor class and provides common functionality which
+- * can be used and/or extended by other concrete interceptor classes.
+- */
+-public abstract class AbstractRESTRequestInterceptor
+-    implements RESTRequestInterceptor {
+-
+-  private Configuration conf;
+-  private RESTRequestInterceptor nextInterceptor;
+-  private UserGroupInformation user = null;
+-  private RouterClientRMService routerClientRMService = null;
+-
+-  /**
+-   * Sets the {@link RESTRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public void setNextInterceptor(RESTRequestInterceptor nextInterceptor) {
+-    this.nextInterceptor = nextInterceptor;
+-  }
+-
+-  /**
+-   * Sets the {@link Configuration}.
+-   */
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.setConf(conf);
+-    }
+-  }
+-
+-  /**
+-   * Gets the {@link Configuration}.
+-   */
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  /**
+-   * Initializes the {@link RESTRequestInterceptor}.
+-   */
+-  @Override
+-  public void init(String userName) {
+-    this.user = RouterServerUtil.setupUser(userName);
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.init(userName);
+-    }
+-  }
+-
+-  /**
+-   * Disposes the {@link RESTRequestInterceptor}.
+-   */
+-  @Override
+-  public void shutdown() {
+-    if (this.nextInterceptor != null) {
+-      this.nextInterceptor.shutdown();
+-    }
+-  }
+-
+-  /**
+-   * Gets the next {@link RESTRequestInterceptor} in the chain.
+-   */
+-  @Override
+-  public RESTRequestInterceptor getNextInterceptor() {
+-    return this.nextInterceptor;
+-  }
+-
+-  public UserGroupInformation getUser() {
+-    return user;
+-  }
+-
+-  @Override
+-  public RouterClientRMService getRouterClientRMService() {
+-    return routerClientRMService;
+-  }
+-
+-  @Override
+-  public void setRouterClientRMService(RouterClientRMService routerClientRMService) {
+-    this.routerClientRMService = routerClientRMService;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsBlock.java
+deleted file mode 100644
+index 4fa07b70fa7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsBlock.java
++++ /dev/null
+@@ -1,215 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static org.apache.commons.text.StringEscapeUtils.escapeHtml4;
+-import static org.apache.commons.text.StringEscapeUtils.escapeEcmaScript;
+-import static org.apache.hadoop.yarn.util.StringHelper.join;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.APP_SC;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.APP_STATE;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.C_PROGRESSBAR;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.C_PROGRESSBAR_VALUE;
+-
+-import com.sun.jersey.api.client.Client;
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-import com.google.inject.Inject;
+-
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.stream.Collectors;
+-
+-/**
+- * Applications block for the Router Web UI.
+- */
+-public class AppsBlock extends RouterBlock {
+-
+-  private final Router router;
+-  private final Configuration conf;
+-
+-  @Inject
+-  AppsBlock(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-    this.conf = this.router.getConfig();
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // Get subClusterName
+-    String subClusterName = $(APP_SC);
+-    String reqState = $(APP_STATE);
+-
+-    // We will try to get the subClusterName.
+-    // If the subClusterName is not empty,
+-    // it means that we need to get the Node list of a subCluster.
+-    AppsInfo appsInfo = null;
+-    if (subClusterName != null && !subClusterName.isEmpty()) {
+-      initSubClusterMetricsOverviewTable(html, subClusterName);
+-      appsInfo = getSubClusterAppsInfo(subClusterName, reqState);
+-    } else {
+-      // Metrics Overview Table
+-      html.__(MetricsOverviewTable.class);
+-      appsInfo = getYarnFederationAppsInfo(isEnabled);
+-    }
+-
+-    initYarnFederationAppsOfCluster(appsInfo, html);
+-  }
+-
+-  private static String escape(String str) {
+-    return escapeEcmaScript(escapeHtml4(str));
+-  }
+-
+-  private AppsInfo getYarnFederationAppsInfo(boolean isEnabled) {
+-    String webAddress = null;
+-    if (isEnabled) {
+-      webAddress = WebAppUtils.getRouterWebAppURLWithScheme(this.conf);
+-    } else {
+-      webAddress = WebAppUtils.getRMWebAppURLWithScheme(this.conf);
+-    }
+-    return getSubClusterAppsInfoByWebAddress(webAddress, StringUtils.EMPTY);
+-  }
+-
+-  private AppsInfo getSubClusterAppsInfo(String subCluster, String states) {
+-    try {
+-      SubClusterId subClusterId = SubClusterId.newInstance(subCluster);
+-      FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(this.conf);
+-      SubClusterInfo subClusterInfo = facade.getSubCluster(subClusterId);
+-
+-      if (subClusterInfo != null) {
+-        // Prepare webAddress
+-        String webAddress = subClusterInfo.getRMWebServiceAddress();
+-        String herfWebAppAddress;
+-        if (webAddress != null && !webAddress.isEmpty()) {
+-          herfWebAppAddress = WebAppUtils.getHttpSchemePrefix(conf) + webAddress;
+-          return getSubClusterAppsInfoByWebAddress(herfWebAppAddress, states);
+-        }
+-      }
+-    } catch (Exception e) {
+-      LOG.error("get AppsInfo From SubCluster = {} error.", subCluster, e);
+-    }
+-    return null;
+-  }
+-
+-  private AppsInfo getSubClusterAppsInfoByWebAddress(String webAddress, String states) {
+-    Client client = RouterWebServiceUtil.createJerseyClient(conf);
+-    Map<String, String[]> queryParams = new HashMap<>();
+-    if (StringUtils.isNotBlank(states)) {
+-      queryParams.put("states", new String[]{states});
+-    }
+-    AppsInfo apps = RouterWebServiceUtil
+-        .genericForward(webAddress, null, AppsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS, null, queryParams, conf,
+-        client);
+-    client.destroy();
+-    return apps;
+-  }
+-
+-  private void initYarnFederationAppsOfCluster(AppsInfo appsInfo, Block html) {
+-
+-    TBODY<TABLE<Hamlet>> tbody = html.table("#apps").thead()
+-        .tr()
+-        .th(".id", "ID")
+-        .th(".user", "User")
+-        .th(".name", "Name")
+-        .th(".type", "Application Type")
+-        .th(".queue", "Queue")
+-        .th(".priority", "Application Priority")
+-        .th(".starttime", "StartTime")
+-        .th(".finishtime", "FinishTime")
+-        .th(".state", "State")
+-        .th(".finalstatus", "FinalStatus")
+-        .th(".progress", "Progress")
+-        .th(".ui", "Tracking UI")
+-        .__().__().tbody();
+-
+-    // Render the applications
+-    StringBuilder appsTableData = new StringBuilder("[\n");
+-
+-    if (appsInfo != null && CollectionUtils.isNotEmpty(appsInfo.getApps())) {
+-
+-      List<String> appInfoList =
+-          appsInfo.getApps().stream().map(this::parseAppInfoData).collect(Collectors.toList());
+-
+-      if (CollectionUtils.isNotEmpty(appInfoList)) {
+-        String formattedAppInfo = StringUtils.join(appInfoList, ",");
+-        appsTableData.append(formattedAppInfo);
+-      }
+-    }
+-
+-    appsTableData.append("]");
+-    html.script().$type("text/javascript")
+-        .__("var appsTableData=" + appsTableData).__();
+-
+-    tbody.__().__();
+-  }
+-
+-  private String parseAppInfoData(AppInfo app) {
+-    StringBuilder appsDataBuilder = new StringBuilder();
+-    try {
+-      String percent = String.format("%.1f", app.getProgress() * 100.0F);
+-      String trackingURL = app.getTrackingUrl() == null ? "#" : app.getTrackingUrl();
+-
+-      // AppID numerical value parsed by parseHadoopID in yarn.dt.plugins.js
+-      appsDataBuilder.append("[\"")
+-          .append("<a href='").append(trackingURL).append("'>")
+-          .append(app.getAppId()).append("</a>\",\"")
+-          .append(escape(app.getUser())).append("\",\"")
+-          .append(escape(app.getName())).append("\",\"")
+-          .append(escape(app.getApplicationType())).append("\",\"")
+-          .append(escape(app.getQueue())).append("\",\"")
+-          .append(app.getPriority()).append("\",\"")
+-          .append(app.getStartTime()).append("\",\"")
+-          .append(app.getFinishTime()).append("\",\"")
+-          .append(app.getState()).append("\",\"")
+-          .append(app.getFinalStatus()).append("\",\"")
+-          // Progress bar
+-          .append("<br title='").append(percent).append("'> <div class='")
+-          .append(C_PROGRESSBAR).append("' title='")
+-          .append(join(percent, '%')).append("'> ").append("<div class='")
+-          .append(C_PROGRESSBAR_VALUE).append("' style='")
+-          .append(join("width:", percent, '%')).append("'> </div> </div>")
+-          // History link
+-          .append("\",\"<a href='").append(trackingURL).append("'>")
+-          .append("History").append("</a>");
+-      appsDataBuilder.append("\"]\n");
+-
+-    } catch (Exception e) {
+-      LOG.warn("Cannot add application {}: {}", app.getAppId(), e.getMessage());
+-    }
+-    return appsDataBuilder.toString();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsPage.java
+deleted file mode 100644
+index f820aed05f2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/AppsPage.java
++++ /dev/null
+@@ -1,84 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static org.apache.hadoop.yarn.util.StringHelper.sjoin;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.APP_STATE;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.APP_SC;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.yarn.webapp.SubView;
+-
+-class AppsPage extends RouterView {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-    set(DATATABLES_ID, "apps");
+-    set(initID(DATATABLES, "apps"), appsTableInit());
+-    setTableStyles(html, "apps", ".queue {width:6em}", ".ui {width:8em}");
+-
+-    // Set the correct title.
+-    String subClusterName = $(APP_SC);
+-    String reqState = $(APP_STATE);
+-
+-    if(StringUtils.isBlank(subClusterName)){
+-      subClusterName = "Federation ";
+-    }
+-    reqState = (StringUtils.isBlank(reqState) ? "All" : reqState);
+-    setTitle(sjoin(subClusterName, reqState,  "Applications"));
+-  }
+-
+-  private String appsTableInit() {
+-    // id, user, name, queue, starttime, finishtime, state, status, progress, ui
+-    return tableInit()
+-      .append(", 'aaData': appsTableData")
+-      .append(", bDeferRender: true")
+-      .append(", bProcessing: true")
+-
+-      .append("\n, aoColumnDefs: ")
+-      .append(getAppsTableColumnDefs())
+-
+-      // Sort by id upon page load
+-      .append(", aaSorting: [[0, 'desc']]}").toString();
+-  }
+-
+-  protected String getAppsTableColumnDefs() {
+-    StringBuilder sb = new StringBuilder();
+-    return sb
+-      .append("[\n")
+-      .append("{'sType':'string', 'aTargets': [0]")
+-      .append(", 'mRender': parseHadoopID }")
+-
+-      .append("\n, {'sType':'numeric', 'aTargets': [6, 7]")
+-      .append(", 'mRender': renderHadoopDate }")
+-
+-      .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [10]")
+-      .append(", 'mRender': parseHadoopProgress }]").toString();
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return AppsBlock.class;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java
+deleted file mode 100644
+index 9d3e3be6f6e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/DefaultRequestInterceptorREST.java
++++ /dev/null
+@@ -1,620 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.Response;
+-
+-import com.sun.jersey.api.client.Client;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-/**
+- * Extends the AbstractRequestInterceptorClient class and provides an
+- * implementation that simply forwards the client requests to the resource
+- * manager.
+- */
+-public class DefaultRequestInterceptorREST
+-    extends AbstractRESTRequestInterceptor {
+-
+-  private String webAppAddress;
+-  private SubClusterId subClusterId = null;
+-
+-  // It is very expensive to create the client
+-  // Jersey will spawn a thread for every client request
+-  private Client client = null;
+-
+-  public void setWebAppAddress(String webAppAddress) {
+-    this.webAppAddress = webAppAddress;
+-  }
+-
+-  protected String getWebAppAddress() {
+-    return this.webAppAddress;
+-  }
+-
+-  protected void setSubClusterId(SubClusterId scId) {
+-    this.subClusterId = scId;
+-  }
+-
+-  protected SubClusterId getSubClusterId() {
+-    return this.subClusterId;
+-  }
+-
+-  @Override
+-  public void init(String user) {
+-    super.init(user);
+-    webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(getConf());
+-    client = RouterWebServiceUtil.createJerseyClient(getConf());
+-  }
+-
+-  @Override
+-  public ClusterInfo get() {
+-    return getClusterInfo();
+-  }
+-
+-  @Override
+-  public ClusterInfo getClusterInfo() {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        ClusterInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.INFO, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(HttpServletRequest hsr) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        ClusterUserInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.CLUSTER_USER_INFO, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        ClusterMetricsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.METRICS, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        SchedulerTypeInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public String dumpSchedulerLogs(String time, HttpServletRequest hsr)
+-      throws IOException {
+-    // time is specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        String.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_LOGS, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public NodesInfo getNodes(String states) {
+-    // states will be part of additionalParam
+-    Map<String, String[]> additionalParam = new HashMap<String, String[]>();
+-    if (states != null && !states.isEmpty()) {
+-      additionalParam.put(RMWSConsts.STATES, new String[] {states});
+-    }
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        NodesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.NODES, null,
+-        additionalParam, getConf(), client);
+-  }
+-
+-  @Override
+-  public NodeInfo getNode(String nodeId) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        NodeInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.NODES + "/" + nodeId, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public ResourceInfo updateNodeResource(HttpServletRequest hsr,
+-      String nodeId, ResourceOptionInfo resourceOption) {
+-    final String nodePath =
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.NODES + "/" + nodeId;
+-    return RouterWebServiceUtil
+-        .genericForward(webAppAddress, hsr, ResourceInfo.class,
+-            HTTPMethods.POST, nodePath + "/resource", resourceOption, null,
+-            getConf(), client);
+-  }
+-
+-  @Override
+-  public AppsInfo getApps(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-    // all the params are specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
+-      String groupBy) {
+-    // nodeId is specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        ActivitiesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_ACTIVITIES, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
+-      String groupBy, int activitiesCount) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        BulkActivitiesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_BULK_ACTIVITIES,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
+-      String appId, String time, Set<String> requestPriorities,
+-      Set<String> allocationRequestIds, String groupBy, String limit,
+-      Set<String> actions, boolean summarize) {
+-    // time and appId are specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppActivitiesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_APP_ACTIVITIES,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(HttpServletRequest hsr,
+-      Set<String> stateQueries, Set<String> typeQueries) {
+-    // stateQueries and typeQueries are specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        ApplicationStatisticsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APP_STATISTICS, null, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public AppInfo getApp(HttpServletRequest hsr, String appId,
+-      Set<String> unselectedFields) {
+-    // unselectedFields is specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS + "/" + appId, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppState getAppState(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppState.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.STATE,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateAppState(AppState targetState, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.PUT, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.STATE,
+-        targetState, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        NodeToLabelsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.GET_NODE_TO_LABELS, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(Set<String> labels)
+-      throws IOException {
+-    // labels will be part of additionalParam
+-    Map<String, String[]> additionalParam = new HashMap<>();
+-    if (labels != null && !labels.isEmpty()) {
+-      additionalParam.put(RMWSConsts.LABELS,
+-          labels.toArray(new String[labels.size()]));
+-    }
+-    return RouterWebServiceUtil.genericForward(webAppAddress, null,
+-        LabelsToNodesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.LABEL_MAPPINGS, null,
+-        additionalParam, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNodes(NodeToLabelsEntryList newNodeToLabels,
+-      HttpServletRequest hsr) throws IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.REPLACE_NODE_TO_LABELS,
+-        newNodeToLabels, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNode(Set<String> newNodeLabelsName,
+-      HttpServletRequest hsr, String nodeId) throws Exception {
+-    // newNodeLabelsName is specified inside hsr
+-    return RouterWebServiceUtil
+-        .genericForward(webAppAddress, hsr,
+-            Response.class, HTTPMethods.POST, RMWSConsts.RM_WEB_SERVICE_PATH
+-                + RMWSConsts.NODES + "/" + nodeId + "/replace-labels",
+-            null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        NodeLabelsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.GET_NODE_LABELS, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.ADD_NODE_LABELS,
+-        newNodeLabels, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    // oldNodeLabels is specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.REMOVE_NODE_LABELS, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(HttpServletRequest hsr, String nodeId)
+-      throws IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        NodeLabelsInfo.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.NODES + "/" + nodeId + "/get-labels",
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppPriority getAppPriority(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppPriority.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.PRIORITY,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.PUT, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.PRIORITY,
+-        targetPriority, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppQueue getAppQueue(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppQueue.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.QUEUE,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.PUT, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.QUEUE,
+-        targetQueue, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response createNewApplication(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS_NEW_APPLICATION, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS, newApp, null,
+-        getConf(), client);
+-  }
+-
+-  @Override
+-  public Response postDelegationToken(DelegationToken tokenData,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException,
+-      InterruptedException, Exception {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.DELEGATION_TOKEN, tokenData,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response postDelegationTokenExpiration(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.DELEGATION_TOKEN_EXPIRATION,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response cancelDelegationToken(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.DELETE,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.DELEGATION_TOKEN, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response createNewReservation(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.RESERVATION_NEW, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.RESERVATION_SUBMIT,
+-        resContext, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.RESERVATION_UPDATE,
+-        resContext, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.POST,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.RESERVATION_DELETE,
+-        resContext, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response listReservation(String queue, String reservationId,
+-      long startTime, long endTime, boolean includeResourceAllocations,
+-      HttpServletRequest hsr) throws Exception {
+-    // queue, reservationId, startTime, endTime, includeResourceAllocations are
+-    // specified inside hsr
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.RESERVATION_LIST, null,
+-        null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(HttpServletRequest hsr, String appId,
+-      String type) throws AuthorizationException {
+-    return RouterWebServiceUtil
+-        .genericForward(webAppAddress, hsr, AppTimeoutInfo.class,
+-            HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS
+-                + "/" + appId + "/" + RMWSConsts.TIMEOUTS + "/" + type,
+-            null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppTimeoutsInfo.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.TIMEOUTS,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        Response.class, HTTPMethods.PUT, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.TIMEOUT,
+-        appTimeout, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        AppAttemptsInfo.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH
+-            + RMWSConsts.APPS + "/" + appId + "/" + RMWSConsts.APPATTEMPTS,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
+-      String queueAclType, HttpServletRequest hsr) throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        RMQueueAclInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH +  "/" + RMWSConsts.QUEUES + "/" + queue
+-            + "/access", null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public AppAttemptInfo getAppAttempt(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, req,
+-        AppAttemptInfo.class,
+-        HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS + "/"
+-            + appId + "/" + RMWSConsts.APPATTEMPTS + "/" + appAttemptId,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public ContainersInfo getContainers(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, req,
+-        ContainersInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS + "/" + appId + "/"
+-            + RMWSConsts.APPATTEMPTS + "/" + appAttemptId + "/"
+-            + RMWSConsts.CONTAINERS,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public ContainerInfo getContainer(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId,
+-      String containerId) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, req,
+-        ContainerInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.APPS + "/" + appId + "/"
+-            + RMWSConsts.APPATTEMPTS + "/" + appAttemptId + "/"
+-            + RMWSConsts.CONTAINERS + "/" + containerId,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest req)
+-      throws AuthorizationException, InterruptedException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, req,
+-        Response.class, HTTPMethods.PUT,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_CONF,
+-        mutationInfo, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest req)
+-      throws AuthorizationException {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, req,
+-        Response.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_CONF,
+-        null, null, getConf(), client);
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(RESTRequestInterceptor next) {
+-    throw new YarnRuntimeException("setNextInterceptor is being called on "
+-        + "DefaultRequestInterceptorREST, which should be the last one "
+-        + "in the chain. Check if the interceptor pipeline configuration "
+-        + "is correct");
+-  }
+-
+-  @Override
+-  public Response signalToContainer(String containerId, String command,
+-      HttpServletRequest req) throws AuthorizationException {
+-    return RouterWebServiceUtil
+-        .genericForward(webAppAddress, req, Response.class, HTTPMethods.POST,
+-            RMWSConsts.RM_WEB_SERVICE_PATH + "/" + RMWSConsts.CONTAINERS + "/"
+-                + containerId + "/" + RMWSConsts.SIGNAL + "/" + command, null,
+-            null, getConf(), client);
+-  }
+-
+-  @VisibleForTesting
+-  public Client getClient() {
+-    return client;
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getRMNodeLabels(HttpServletRequest hsr) {
+-    return RouterWebServiceUtil.genericForward(webAppAddress, hsr,
+-        NodeLabelsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.GET_RM_NODE_LABELS,
+-        null, null, getConf(), client);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java
+deleted file mode 100644
+index 7876d5d6f1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationBlock.java
++++ /dev/null
+@@ -1,268 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.StringReader;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.Date;
+-
+-import com.google.gson.Gson;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TABLE;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet.TBODY;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-import com.google.inject.Inject;
+-import com.sun.jersey.api.json.JSONConfiguration;
+-import com.sun.jersey.api.json.JSONJAXBContext;
+-import com.sun.jersey.api.json.JSONUnmarshaller;
+-
+-class FederationBlock extends RouterBlock {
+-
+-  private final Router router;
+-
+-  @Inject
+-  FederationBlock(ViewContext ctx, Router router) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  public void render(Block html) {
+-
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // init Html Page Federation
+-    initHtmlPageFederation(html, isEnabled);
+-  }
+-
+-  /**
+-   * Parse the capability and obtain the metric information of the cluster.
+-   *
+-   * @param capability metric json obtained from RM.
+-   * @return ClusterMetricsInfo Object
+-   */
+-  protected ClusterMetricsInfo getClusterMetricsInfo(String capability) {
+-    try {
+-      if (capability != null && !capability.isEmpty()) {
+-        JSONJAXBContext jc = new JSONJAXBContext(
+-            JSONConfiguration.mapped().rootUnwrapping(false).build(), ClusterMetricsInfo.class);
+-        JSONUnmarshaller unmarShaller = jc.createJSONUnmarshaller();
+-        StringReader stringReader = new StringReader(capability);
+-        ClusterMetricsInfo clusterMetrics =
+-            unmarShaller.unmarshalFromJSON(stringReader, ClusterMetricsInfo.class);
+-        return clusterMetrics;
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Cannot parse SubCluster info", e);
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Initialize the subCluster details JavaScript of the Federation page.
+-   *
+-   * This part of the js script will control to display or hide the detailed information
+-   * of the subCluster when the user clicks on the subClusterId.
+-   *
+-   * We will obtain the specific information of a SubCluster,
+-   * including the information of Applications, Resources, and Nodes.
+-   *
+-   * @param html html object
+-   * @param subClusterDetailMap subCluster Detail Map
+-   */
+-  private void initFederationSubClusterDetailTableJs(Block html,
+-      List<Map<String, String>> subClusterDetailMap) {
+-    Gson gson = new Gson();
+-    html.script().$type("text/javascript").
+-        __(" var scTableData = " + gson.toJson(subClusterDetailMap) + "; ")
+-        .__();
+-    html.script(root_url("static/federation/federation.js"));
+-  }
+-
+-  /**
+-   * Initialize the Html page.
+-   *
+-   * @param html html object
+-   */
+-  private void initHtmlPageFederation(Block html, boolean isEnabled) {
+-    List<Map<String, String>> lists = new ArrayList<>();
+-
+-    // Table header
+-    TBODY<TABLE<Hamlet>> tbody =
+-        html.table("#rms").$class("cell-border").$style("width:100%").thead().tr()
+-        .th(".id", "SubCluster")
+-        .th(".state", "State")
+-        .th(".lastStartTime", "LastStartTime")
+-        .th(".lastHeartBeat", "LastHeartBeat")
+-        .th(".resources", "Resources")
+-        .th(".nodes", "Nodes")
+-        .__().__().tbody();
+-
+-    try {
+-      if (isEnabled) {
+-        initSubClusterPage(tbody, lists);
+-      } else {
+-        initLocalClusterPage(tbody, lists);
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Cannot render Router Federation.", e);
+-    }
+-
+-    // Init FederationBlockTableJs
+-    initFederationSubClusterDetailTableJs(html, lists);
+-
+-    // Tips
+-    tbody.__().__().div().p().$style("color:red")
+-        .__("*The application counts are local per subcluster").__().__();
+-  }
+-
+-  /**
+-   * Initialize the Federation page of the local-cluster.
+-   *
+-   * @param tbody HTML tbody.
+-   * @param lists subCluster page data list.
+-   */
+-  private void initLocalClusterPage(TBODY<TABLE<Hamlet>> tbody, List<Map<String, String>> lists) {
+-    Configuration config = this.router.getConfig();
+-    SubClusterInfo localCluster = getSubClusterInfoByLocalCluster(config);
+-    if (localCluster != null) {
+-      try {
+-        initSubClusterPageItem(tbody, localCluster, lists);
+-      } catch (Exception e) {
+-        LOG.error("init LocalCluster = {} page data error.", localCluster, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Initialize the Federation page of the sub-cluster.
+-   *
+-   * @param tbody HTML tbody.
+-   * @param lists subCluster page data list.
+-   */
+-  private void initSubClusterPage(TBODY<TABLE<Hamlet>> tbody, List<Map<String, String>> lists) {
+-    // Sort the SubClusters
+-    List<SubClusterInfo> subClusters = getSubClusterInfoList();
+-
+-    // Iterate through the sub-clusters and display data for each sub-cluster.
+-    // If a sub-cluster cannot display data, skip it.
+-    for (SubClusterInfo subCluster : subClusters) {
+-      try {
+-        initSubClusterPageItem(tbody, subCluster, lists);
+-      } catch (Exception e) {
+-        LOG.error("init subCluster = {} page data error.", subCluster, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * We will initialize the specific SubCluster's data within this method.
+-   *
+-   * @param tbody HTML TBody.
+-   * @param subClusterInfo Sub-cluster information.
+-   * @param lists Used to record data that needs to be displayed in JS.
+-   */
+-  private void initSubClusterPageItem(TBODY<TABLE<Hamlet>> tbody,
+-      SubClusterInfo subClusterInfo, List<Map<String, String>> lists) {
+-
+-    Map<String, String> subClusterMap = new HashMap<>();
+-
+-    // Prepare subCluster
+-    SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-    String subClusterIdText = subClusterId.getId();
+-
+-    // Prepare WebAppAddress
+-    String webAppAddress = subClusterInfo.getRMWebServiceAddress();
+-    String herfWebAppAddress = "";
+-    if (webAppAddress != null && !webAppAddress.isEmpty()) {
+-      herfWebAppAddress =
+-          WebAppUtils.getHttpSchemePrefix(this.router.getConfig()) + webAppAddress;
+-    }
+-
+-    // Prepare Capability
+-    String capability = subClusterInfo.getCapability();
+-    ClusterMetricsInfo subClusterMetricsInfo = getClusterMetricsInfo(capability);
+-
+-    if (subClusterMetricsInfo == null) {
+-      return;
+-    }
+-
+-    // Prepare LastStartTime & LastHeartBeat
+-    Date lastStartTime = new Date(subClusterInfo.getLastStartTime());
+-    Date lastHeartBeat = new Date(subClusterInfo.getLastHeartBeat());
+-
+-    // Prepare Resource
+-    long totalMB = subClusterMetricsInfo.getTotalMB();
+-    String totalMBDesc = StringUtils.byteDesc(totalMB * BYTES_IN_MB);
+-    long totalVirtualCores = subClusterMetricsInfo.getTotalVirtualCores();
+-    String resources = String.format("<memory:%s, vCores:%s>", totalMBDesc, totalVirtualCores);
+-
+-    // Prepare Node
+-    long totalNodes = subClusterMetricsInfo.getTotalNodes();
+-    long activeNodes = subClusterMetricsInfo.getActiveNodes();
+-    String nodes = String.format("<totalNodes:%s, activeNodes:%s>", totalNodes, activeNodes);
+-
+-    // Prepare HTML Table
+-    String stateStyle = "color:#dc3545;font-weight:bolder";
+-    SubClusterState state = subClusterInfo.getState();
+-    if (SubClusterState.SC_RUNNING == state) {
+-      stateStyle = "color:#28a745;font-weight:bolder";
+-    }
+-
+-    tbody.tr().$id(subClusterIdText)
+-        .td().$class("details-control").a(herfWebAppAddress, subClusterIdText).__()
+-        .td().$style(stateStyle).__(state.name()).__()
+-        .td().__(lastStartTime).__()
+-        .td().__(lastHeartBeat).__()
+-        .td(resources)
+-        .td(nodes)
+-        .__();
+-
+-    // Formatted memory information
+-    long allocatedMB = subClusterMetricsInfo.getAllocatedMB();
+-    String allocatedMBDesc = StringUtils.byteDesc(allocatedMB * BYTES_IN_MB);
+-    long availableMB = subClusterMetricsInfo.getAvailableMB();
+-    String availableMBDesc = StringUtils.byteDesc(availableMB * BYTES_IN_MB);
+-    long pendingMB = subClusterMetricsInfo.getPendingMB();
+-    String pendingMBDesc = StringUtils.byteDesc(pendingMB * BYTES_IN_MB);
+-    long reservedMB = subClusterMetricsInfo.getReservedMB();
+-    String reservedMBDesc = StringUtils.byteDesc(reservedMB * BYTES_IN_MB);
+-
+-    subClusterMap.put("totalmemory", totalMBDesc);
+-    subClusterMap.put("allocatedmemory", allocatedMBDesc);
+-    subClusterMap.put("availablememory", availableMBDesc);
+-    subClusterMap.put("pendingmemory", pendingMBDesc);
+-    subClusterMap.put("reservedmemory", reservedMBDesc);
+-    subClusterMap.put("subcluster", subClusterId.getId());
+-    subClusterMap.put("capability", capability);
+-    lists.add(subClusterMap);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
+deleted file mode 100644
+index fcfc7fa300e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationInterceptorREST.java
++++ /dev/null
+@@ -1,3472 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.lang.reflect.Method;
+-import java.security.Principal;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.Set;
+-import java.util.concurrent.CompletionService;
+-import java.util.concurrent.ExecutorCompletionService;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Future;
+-import java.util.concurrent.TimeUnit;
+-import java.util.stream.Collectors;
+-import java.util.stream.Stream;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletRequestWrapper;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.HttpHeaders;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.commons.lang3.tuple.Pair;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.impl.prefetch.Validate;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.util.concurrent.HadoopExecutors;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
+-import org.apache.hadoop.yarn.server.federation.policies.RouterPolicyFacade;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyException;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
+-import org.apache.hadoop.yarn.server.federation.resolver.SubClusterResolver;
+-import org.apache.hadoop.yarn.server.federation.retry.FederationActionRetry;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.NodeIDsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebAppUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDefinitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry;
+-import org.apache.hadoop.yarn.server.router.RouterAuditLogger;
+-import org.apache.hadoop.yarn.server.router.RouterMetrics;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.router.clientrm.ClientMethod;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.server.router.webapp.cache.RouterAppInfoCacheKey;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationBulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationRMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.SubClusterResult;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationSchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationConfInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
+-import org.apache.hadoop.yarn.server.utils.BuilderUtils;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.util.LRUCacheHashMap;
+-import org.apache.hadoop.yarn.webapp.dao.ConfInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-import org.apache.hadoop.yarn.util.Clock;
+-import org.apache.hadoop.yarn.util.MonotonicClock;
+-import org.apache.hadoop.yarn.webapp.NotFoundException;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-
+-import static org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade.getRandomActiveSubCluster;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NEW_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SUBMIT_NEW_APP;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTERUSERINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_SCHEDULERINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.DUMP_SCHEDULERLOGS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_ACTIVITIES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_BULKACTIVITIES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPACTIVITIES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPSTATISTICS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NODETOLABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_RMNODELABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_LABELSTONODES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UNKNOWN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.TARGET_WEB_SERVICE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.REPLACE_LABELSONNODES;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.REPLACE_LABELSONNODE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CLUSTER_NODELABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.ADD_TO_CLUSTER_NODELABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.REMOVE_FROM_CLUSTERNODELABELS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_LABELS_ON_NODE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APP_PRIORITY;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_QUEUEINFO;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_APPLICATIONPRIORITY;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_APP_QUEUE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.POST_DELEGATION_TOKEN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.POST_DELEGATION_TOKEN_EXPIRATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.CANCEL_DELEGATIONTOKEN;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_NEW_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SUBMIT_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.DELETE_RESERVATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.LIST_RESERVATIONS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APP_TIMEOUT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APP_TIMEOUTS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_APPLICATIONTIMEOUTS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APPLICATION_ATTEMPTS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.CHECK_USER_ACCESS_TO_QUEUE;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_APP_ATTEMPT;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CONTAINERS;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_CONTAINER;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.UPDATE_SCHEDULER_CONFIGURATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.GET_SCHEDULER_CONFIGURATION;
+-import static org.apache.hadoop.yarn.server.router.RouterAuditLogger.AuditConstants.SIGNAL_TOCONTAINER;
+-import static org.apache.hadoop.yarn.server.router.webapp.RouterWebServiceUtil.extractToken;
+-import static org.apache.hadoop.yarn.server.router.webapp.RouterWebServiceUtil.getKerberosUserGroupInformation;
+-
+-/**
+- * Extends the {@code AbstractRESTRequestInterceptor} class and provides an
+- * implementation for federation of YARN RM and scaling an application across
+- * multiple YARN SubClusters. All the federation specific implementation is
+- * encapsulated in this class. This is always the last interceptor in the chain.
+- */
+-public class FederationInterceptorREST extends AbstractRESTRequestInterceptor {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(FederationInterceptorREST.class);
+-
+-  private int numSubmitRetries;
+-  private FederationStateStoreFacade federationFacade;
+-  private RouterPolicyFacade policyFacade;
+-  private RouterMetrics routerMetrics;
+-  private final Clock clock = new MonotonicClock();
+-  private boolean returnPartialReport;
+-  private boolean appInfosCacheEnabled;
+-  private int appInfosCacheCount;
+-  private boolean allowPartialResult;
+-  private long submitIntervalTime;
+-
+-  private Map<SubClusterId, DefaultRequestInterceptorREST> interceptors;
+-  private LRUCacheHashMap<RouterAppInfoCacheKey, AppsInfo> appInfosCaches;
+-
+-  /**
+-   * Thread pool used for asynchronous operations.
+-   */
+-  private ExecutorService threadpool;
+-
+-  @Override
+-  public void init(String user) {
+-
+-    super.init(user);
+-
+-    federationFacade = FederationStateStoreFacade.getInstance(getConf());
+-
+-    final Configuration conf = this.getConf();
+-
+-    try {
+-      SubClusterResolver subClusterResolver =
+-          this.federationFacade.getSubClusterResolver();
+-      policyFacade = new RouterPolicyFacade(
+-          conf, federationFacade, subClusterResolver, null);
+-    } catch (FederationPolicyInitializationException e) {
+-      throw new YarnRuntimeException(e);
+-    }
+-
+-    numSubmitRetries = conf.getInt(
+-        YarnConfiguration.ROUTER_CLIENTRM_SUBMIT_RETRY,
+-        YarnConfiguration.DEFAULT_ROUTER_CLIENTRM_SUBMIT_RETRY);
+-
+-    interceptors = new HashMap<>();
+-    routerMetrics = RouterMetrics.getMetrics();
+-    threadpool = HadoopExecutors.newCachedThreadPool(new ThreadFactoryBuilder()
+-        .setNameFormat("FederationInterceptorREST #%d")
+-        .build());
+-
+-    returnPartialReport = conf.getBoolean(
+-        YarnConfiguration.ROUTER_WEBAPP_PARTIAL_RESULTS_ENABLED,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_PARTIAL_RESULTS_ENABLED);
+-
+-    appInfosCacheEnabled = conf.getBoolean(
+-        YarnConfiguration.ROUTER_APPSINFO_ENABLED,
+-        YarnConfiguration.DEFAULT_ROUTER_APPSINFO_ENABLED);
+-
+-    if(appInfosCacheEnabled) {
+-      appInfosCacheCount = conf.getInt(
+-          YarnConfiguration.ROUTER_APPSINFO_CACHED_COUNT,
+-          YarnConfiguration.DEFAULT_ROUTER_APPSINFO_CACHED_COUNT);
+-      appInfosCaches = new LRUCacheHashMap<>(appInfosCacheCount, true);
+-    }
+-
+-    allowPartialResult = conf.getBoolean(
+-        YarnConfiguration.ROUTER_INTERCEPTOR_ALLOW_PARTIAL_RESULT_ENABLED,
+-        YarnConfiguration.DEFAULT_ROUTER_INTERCEPTOR_ALLOW_PARTIAL_RESULT_ENABLED);
+-
+-    submitIntervalTime = conf.getTimeDuration(
+-        YarnConfiguration.ROUTER_CLIENTRM_SUBMIT_INTERVAL_TIME,
+-        YarnConfiguration.DEFAULT_CLIENTRM_SUBMIT_INTERVAL_TIME, TimeUnit.MILLISECONDS);
+-  }
+-
+-  @VisibleForTesting
+-  protected DefaultRequestInterceptorREST getInterceptorForSubCluster(SubClusterId subClusterId) {
+-    if (interceptors.containsKey(subClusterId)) {
+-      return interceptors.get(subClusterId);
+-    } else {
+-      LOG.error("The interceptor for SubCluster {} does not exist in the cache.",
+-          subClusterId);
+-      return null;
+-    }
+-  }
+-
+-  private DefaultRequestInterceptorREST createInterceptorForSubCluster(
+-      SubClusterId subClusterId, String webAppAddress) {
+-
+-    final Configuration conf = this.getConf();
+-
+-    String interceptorClassName = conf.get(
+-        YarnConfiguration.ROUTER_WEBAPP_DEFAULT_INTERCEPTOR_CLASS,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_DEFAULT_INTERCEPTOR_CLASS);
+-
+-    DefaultRequestInterceptorREST interceptorInstance;
+-    try {
+-      Class<?> interceptorClass = conf.getClassByName(interceptorClassName);
+-      if (DefaultRequestInterceptorREST.class.isAssignableFrom(interceptorClass)) {
+-        interceptorInstance =
+-            (DefaultRequestInterceptorREST) ReflectionUtils.newInstance(interceptorClass, conf);
+-        String userName = getUser().getUserName();
+-        interceptorInstance.init(userName);
+-      } else {
+-        throw new YarnRuntimeException("Class: " + interceptorClassName + " not instance of "
+-            + DefaultRequestInterceptorREST.class.getCanonicalName());
+-      }
+-    } catch (ClassNotFoundException e) {
+-      throw new YarnRuntimeException("Could not instantiate ApplicationMasterRequestInterceptor: " +
+-          interceptorClassName, e);
+-    }
+-
+-    String webAppAddressWithScheme = WebAppUtils.getHttpSchemePrefix(conf) + webAppAddress;
+-    interceptorInstance.setWebAppAddress(webAppAddressWithScheme);
+-    interceptorInstance.setSubClusterId(subClusterId);
+-    interceptors.put(subClusterId, interceptorInstance);
+-    return interceptorInstance;
+-  }
+-
+-  protected DefaultRequestInterceptorREST getOrCreateInterceptorForSubCluster(
+-      SubClusterInfo subClusterInfo) {
+-    if (subClusterInfo != null) {
+-      final SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-      final String webServiceAddress = subClusterInfo.getRMWebServiceAddress();
+-      return getOrCreateInterceptorForSubCluster(subClusterId, webServiceAddress);
+-    }
+-    return null;
+-  }
+-
+-  protected DefaultRequestInterceptorREST getOrCreateInterceptorByAppId(String appId)
+-      throws YarnException {
+-    // We first check the applicationId
+-    RouterServerUtil.validateApplicationId(appId);
+-
+-    // Get homeSubCluster By appId
+-    SubClusterInfo subClusterInfo = getHomeSubClusterInfoByAppId(appId);
+-    LOG.info("appId = {} : subClusterInfo = {}.", appId, subClusterInfo.getSubClusterId());
+-    return getOrCreateInterceptorForSubCluster(subClusterInfo);
+-  }
+-
+-  protected DefaultRequestInterceptorREST getOrCreateInterceptorByNodeId(String nodeId) {
+-    SubClusterInfo subClusterInfo = getNodeSubcluster(nodeId);
+-    return getOrCreateInterceptorForSubCluster(subClusterInfo);
+-  }
+-
+-  @VisibleForTesting
+-  protected DefaultRequestInterceptorREST getOrCreateInterceptorForSubCluster(
+-      SubClusterId subClusterId, String webAppAddress) {
+-    DefaultRequestInterceptorREST interceptor = getInterceptorForSubCluster(subClusterId);
+-    String webAppAddressWithScheme =
+-        WebAppUtils.getHttpSchemePrefix(this.getConf()) + webAppAddress;
+-    if (interceptor == null || !webAppAddressWithScheme.equals(interceptor.getWebAppAddress())) {
+-      interceptor = createInterceptorForSubCluster(subClusterId, webAppAddress);
+-    }
+-    return interceptor;
+-  }
+-
+-  /**
+-   * YARN Router forwards every getNewApplication requests to any RM. During
+-   * this operation there will be no communication with the State Store. The
+-   * Router will forward the requests to any SubCluster. The Router will retry
+-   * to submit the request on #numSubmitRetries different SubClusters. The
+-   * SubClusters are randomly chosen from the active ones.
+-   * <p>
+-   * Possible failures and behaviors:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit.
+-   * <p>
+-   * ResourceManager: the Router will timeout and contacts another RM.
+-   * <p>
+-   * StateStore: not in the execution.
+-   */
+-  @Override
+-  public Response createNewApplication(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-
+-    long startTime = clock.getTime();
+-
+-    try {
+-      Map<SubClusterId, SubClusterInfo> subClustersActive =
+-          federationFacade.getSubClusters(true);
+-
+-      // We declare blackList and retries.
+-      List<SubClusterId> blackList = new ArrayList<>();
+-      int actualRetryNums = federationFacade.getRetryNumbers(numSubmitRetries);
+-      Response response = ((FederationActionRetry<Response>) (retryCount) ->
+-          invokeGetNewApplication(subClustersActive, blackList, hsr, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-
+-      // If the response is not empty and the status is SC_OK,
+-      // this request can be returned directly.
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_OK) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededAppsCreated(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (FederationPolicyException e) {
+-      // If a FederationPolicyException is thrown, the service is unavailable.
+-      routerMetrics.incrAppsFailedCreated();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.SERVICE_UNAVAILABLE).entity(e.getLocalizedMessage()).build();
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedCreated();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getLocalizedMessage()).build();
+-    }
+-
+-    // return error message directly.
+-    String errMsg = "Fail to create a new application.";
+-    LOG.error(errMsg);
+-    routerMetrics.incrAppsFailedCreated();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_APP, UNKNOWN,
+-        TARGET_WEB_SERVICE, errMsg);
+-    return Response.status(Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+-  }
+-
+-  /**
+-   * Invoke GetNewApplication to different subClusters.
+-   *
+-   * @param subClustersActive Active SubClusters.
+-   * @param blackList Blacklist avoid repeated calls to unavailable subCluster.
+-   * @param hsr HttpServletRequest.
+-   * @param retryCount number of retries.
+-   * @return Get response, If the response is empty or status not equal SC_OK, the request fails,
+-   * if the response is not empty and status equal SC_OK, the request is successful.
+-   * @throws YarnException yarn exception.
+-   * @throws IOException io error.
+-   * @throws InterruptedException interrupted exception.
+-   */
+-  private Response invokeGetNewApplication(Map<SubClusterId, SubClusterInfo> subClustersActive,
+-      List<SubClusterId> blackList, HttpServletRequest hsr, int retryCount)
+-      throws YarnException, IOException, InterruptedException {
+-
+-    SubClusterId subClusterId = getRandomActiveSubCluster(subClustersActive, blackList);
+-
+-    LOG.info("getNewApplication try #{} on SubCluster {}.", retryCount, subClusterId);
+-
+-    DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(subClusterId,
+-        subClustersActive.get(subClusterId).getRMWebServiceAddress());
+-
+-    try {
+-      Response response = interceptor.createNewApplication(hsr);
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_OK) {
+-        ApplicationId applicationId = ApplicationId.fromString(response.getEntity().toString());
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_NEW_APP,
+-            TARGET_WEB_SERVICE, applicationId, subClusterId);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      blackList.add(subClusterId);
+-      RouterServerUtil.logAndThrowException(e.getMessage(), e);
+-    }
+-
+-    // We need to throw the exception directly.
+-    String msg = String.format("Unable to create a new ApplicationId in SubCluster %s.",
+-        subClusterId.getId());
+-    throw new YarnException(msg);
+-  }
+-
+-  /**
+-   * Today, in YARN there are no checks of any applicationId submitted.
+-   * <p>
+-   * Base scenarios:
+-   * <p>
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into
+-   * StateStore with the selected SubCluster (e.g. SC1) and the appId. The
+-   * State Store replies with the selected SubCluster (e.g. SC1). The Router
+-   * submits the request to the selected SubCluster.
+-   * <p>
+-   * In case of State Store failure:
+-   * <p>
+-   * The client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. Due to the
+-   * State Store down the Router times out and it will retry depending on the
+-   * FederationFacade settings. The Router replies to the client with an error
+-   * message.
+-   * <p>
+-   * If State Store fails after inserting the tuple: identical behavior as
+-   * {@code RMWebServices}.
+-   * <p>
+-   * In case of Router failure:
+-   * <p>
+-   * Scenario 1 – Crash before submission to the ResourceManager
+-   * <p>
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * crashes. The Client timeouts and resubmits the application. The Router
+-   * selects one SubCluster to forward the request. The Router inserts a tuple
+-   * into State Store with the selected SubCluster (e.g. SC2) and the appId.
+-   * Because the tuple is already inserted in the State Store, it returns the
+-   * previous selected SubCluster (e.g. SC1). The Router submits the request
+-   * to the selected SubCluster (e.g. SC1).
+-   * <p>
+-   * Scenario 2 – Crash after submission to the ResourceManager
+-   * <p>
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * submits the request to the selected SubCluster. The Router crashes. The
+-   * Client timeouts and resubmit the application. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC2) and the appId. The State
+-   * Store replies with the selected SubCluster (e.g. SC1). The Router submits
+-   * the request to the selected SubCluster (e.g. SC1). When a client re-submits
+-   * the same application to the same RM, it does not raise an exception and
+-   * replies with operation successful message.
+-   * <p>
+-   * In case of Client failure: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * In case of ResourceManager failure:
+-   * <p>
+-   * The Client submits an application to the Router. The Router selects one
+-   * SubCluster to forward the request. The Router inserts a tuple into State
+-   * Store with the selected SubCluster (e.g. SC1) and the appId. The Router
+-   * submits the request to the selected SubCluster. The entire SubCluster is
+-   * down – all the RMs in HA or the master RM is not reachable. The Router
+-   * times out. The Router selects a new SubCluster to forward the request.
+-   * The Router update a tuple into State Store with the selected SubCluster
+-   * (e.g. SC2) and the appId. The State Store replies with OK answer. The
+-   * Router submits the request to the selected SubCluster (e.g. SC2).
+-   */
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp, HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-
+-    long startTime = clock.getTime();
+-
+-    // We verify the parameters to ensure that newApp is not empty and
+-    // that the format of applicationId is correct.
+-    if (newApp == null || newApp.getApplicationId() == null) {
+-      routerMetrics.incrAppsFailedSubmitted();
+-      String errMsg = "Missing ApplicationSubmissionContextInfo or "
+-          + "applicationSubmissionContext information.";
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, errMsg);
+-      return Response.status(Status.BAD_REQUEST).entity(errMsg).build();
+-    }
+-
+-    try {
+-      String applicationId = newApp.getApplicationId();
+-      RouterServerUtil.validateApplicationId(applicationId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppsFailedSubmitted();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getMessage());
+-      return Response.status(Status.BAD_REQUEST).entity(e.getLocalizedMessage()).build();
+-    }
+-
+-    List<SubClusterId> blackList = new ArrayList<>();
+-    try {
+-      int activeSubClustersCount = federationFacade.getActiveSubClustersCount();
+-      int actualRetryNums = Math.min(activeSubClustersCount, numSubmitRetries);
+-      Response response = ((FederationActionRetry<Response>) (retryCount) ->
+-          invokeSubmitApplication(newApp, blackList, hsr, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededAppsSubmitted(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      routerMetrics.incrAppsFailedSubmitted();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getMessage());
+-      return Response.status(Status.SERVICE_UNAVAILABLE).entity(e.getLocalizedMessage()).build();
+-    }
+-
+-    routerMetrics.incrAppsFailedSubmitted();
+-    String errMsg = String.format("Application %s with appId %s failed to be submitted.",
+-        newApp.getApplicationName(), newApp.getApplicationId());
+-    LOG.error(errMsg);
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-        TARGET_WEB_SERVICE, errMsg);
+-    return Response.status(Status.SERVICE_UNAVAILABLE).entity(errMsg).build();
+-  }
+-
+-  /**
+-   * Invoke SubmitApplication to different subClusters.
+-   *
+-   * @param submissionContext application submission context.
+-   * @param blackList Blacklist avoid repeated calls to unavailable subCluster.
+-   * @param hsr HttpServletRequest.
+-   * @param retryCount number of retries.
+-   * @return Get response, If the response is empty or status not equal SC_ACCEPTED,
+-   * the request fails, if the response is not empty and status equal SC_OK,
+-   * the request is successful.
+-   * @throws YarnException yarn exception.
+-   * @throws IOException io error.
+-   */
+-  private Response invokeSubmitApplication(ApplicationSubmissionContextInfo submissionContext,
+-      List<SubClusterId> blackList, HttpServletRequest hsr, int retryCount)
+-      throws YarnException, IOException, InterruptedException {
+-
+-    // Step1. We convert ApplicationSubmissionContextInfo to ApplicationSubmissionContext
+-    // and Prepare parameters.
+-    ApplicationSubmissionContext context =
+-        RMWebAppUtil.createAppSubmissionContext(submissionContext, this.getConf());
+-    ApplicationId applicationId = ApplicationId.fromString(submissionContext.getApplicationId());
+-    SubClusterId subClusterId = null;
+-
+-    try {
+-      // Get subClusterId from policy.
+-      subClusterId = policyFacade.getHomeSubcluster(context, blackList);
+-
+-      // Print the log of submitting the submitApplication.
+-      LOG.info("submitApplication appId {} try #{} on SubCluster {}.",
+-          applicationId, retryCount, subClusterId);
+-
+-      // Step2. We Store the mapping relationship
+-      // between Application and HomeSubCluster in stateStore.
+-      ApplicationSubmissionContext trimmedAppSubmissionContext =
+-          RouterServerUtil.getTrimmedAppSubmissionContext(context);
+-      federationFacade.addOrUpdateApplicationHomeSubCluster(
+-          applicationId, subClusterId, retryCount, trimmedAppSubmissionContext);
+-
+-      // Step3. We get subClusterInfo based on subClusterId.
+-      SubClusterInfo subClusterInfo = federationFacade.getSubCluster(subClusterId);
+-      if (subClusterInfo == null) {
+-        throw new YarnException("Can't Find SubClusterId = " + subClusterId);
+-      }
+-
+-      // Step4. Submit the request, if the response is HttpServletResponse.SC_ACCEPTED,
+-      // We return the response, otherwise we throw an exception.
+-      Response response = getOrCreateInterceptorForSubCluster(subClusterId,
+-          subClusterInfo.getRMWebServiceAddress()).submitApplication(submissionContext, hsr);
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_ACCEPTED) {
+-        LOG.info("Application {} with appId {} submitted on {}.",
+-            context.getApplicationName(), applicationId, subClusterId);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), SUBMIT_NEW_APP,
+-            TARGET_WEB_SERVICE, applicationId, subClusterId);
+-        return response;
+-      }
+-      String msg = String.format("application %s failed to be submitted.", applicationId);
+-      throw new YarnException(msg);
+-    } catch (Exception e) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_NEW_APP, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getMessage(), applicationId, subClusterId);
+-      LOG.warn("Unable to submit the application {} to SubCluster {}.", applicationId,
+-          subClusterId, e);
+-      if (subClusterId != null) {
+-        blackList.add(subClusterId);
+-      }
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   * <p>
+-   * Possible failure:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public AppInfo getApp(HttpServletRequest hsr, String appId, Set<String> unselectedFields) {
+-
+-    try {
+-      long startTime = clock.getTime();
+-
+-      // Get SubClusterInfo according to applicationId
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      if (interceptor == null) {
+-        routerMetrics.incrAppsFailedRetrieved();
+-        return null;
+-      }
+-      AppInfo response = interceptor.getApp(hsr, appId, unselectedFields);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededAppsRetrieved(stopTime - startTime);
+-      return response;
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppsFailedRetrieved();
+-      LOG.error("getApp Error, applicationId = {}.", appId, e);
+-      return null;
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppsFailedRetrieved();
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   * <p>
+-   * Possible failures and behaviors:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public Response updateAppState(AppState targetState, HttpServletRequest hsr, String appId)
+-      throws AuthorizationException, YarnException, InterruptedException, IOException {
+-
+-    long startTime = clock.getTime();
+-
+-    ApplicationId applicationId;
+-    try {
+-      applicationId = ApplicationId.fromString(appId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppsFailedKilled();
+-      return Response
+-          .status(Status.BAD_REQUEST)
+-          .entity(e.getLocalizedMessage())
+-          .build();
+-    }
+-
+-    SubClusterInfo subClusterInfo;
+-    SubClusterId subClusterId;
+-    try {
+-      subClusterId =
+-          federationFacade.getApplicationHomeSubCluster(applicationId);
+-      subClusterInfo = federationFacade.getSubCluster(subClusterId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppsFailedKilled();
+-      return Response
+-          .status(Status.BAD_REQUEST)
+-          .entity(e.getLocalizedMessage())
+-          .build();
+-    }
+-
+-    Response response = getOrCreateInterceptorForSubCluster(subClusterId,
+-        subClusterInfo.getRMWebServiceAddress()).updateAppState(targetState,
+-            hsr, appId);
+-
+-    long stopTime = clock.getTime();
+-    routerMetrics.succeededAppsRetrieved(stopTime - startTime);
+-
+-    return response;
+-  }
+-
+-  /**
+-   * The YARN Router will forward the request to all the YARN RMs in parallel,
+-   * after that it will group all the ApplicationReports by the ApplicationId.
+-   * <p>
+-   * Possible failure:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router calls each YARN RM in parallel by using one
+-   * thread for each YARN RM. In case a YARN RM fails, a single call will
+-   * timeout. However, the Router will merge the ApplicationReports it got, and
+-   * provides a partial list to the client.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public AppsInfo getApps(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-
+-    RouterAppInfoCacheKey routerAppInfoCacheKey = RouterAppInfoCacheKey.newInstance(
+-        hsr, stateQuery, statesQuery, finalStatusQuery, userQuery, queueQuery, count,
+-        startedBegin, startedEnd, finishBegin, finishEnd, applicationTypes,
+-        applicationTags, name, unselectedFields);
+-
+-    if (appInfosCacheEnabled && routerAppInfoCacheKey != null) {
+-      if (appInfosCaches.containsKey(routerAppInfoCacheKey)) {
+-        return appInfosCaches.get(routerAppInfoCacheKey);
+-      }
+-    }
+-
+-    AppsInfo apps = new AppsInfo();
+-    long startTime = clock.getTime();
+-
+-    // HttpServletRequest does not work with ExecutorCompletionService.
+-    // Create a duplicate hsr.
+-    final HttpServletRequest hsrCopy = clone(hsr);
+-    Collection<SubClusterInfo> subClusterInfos = federationFacade.getActiveSubClusters();
+-
+-    List<AppsInfo> appsInfos = subClusterInfos.parallelStream().map(subCluster -> {
+-      try {
+-        DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(subCluster);
+-        AppsInfo rmApps = interceptor.getApps(hsrCopy, stateQuery, statesQuery, finalStatusQuery,
+-            userQuery, queueQuery, count, startedBegin, startedEnd, finishBegin, finishEnd,
+-            applicationTypes, applicationTags, name, unselectedFields);
+-        if (rmApps != null) {
+-          return rmApps;
+-        }
+-      } catch (Exception e) {
+-        LOG.warn("Failed to get application report.", e);
+-      }
+-      routerMetrics.incrMultipleAppsFailedRetrieved();
+-      LOG.error("Subcluster {} failed to return appReport.", subCluster.getSubClusterId());
+-      return null;
+-    }).collect(Collectors.toList());
+-
+-    appsInfos.forEach(appsInfo -> {
+-      if (appsInfo != null) {
+-        apps.addAll(appsInfo.getApps());
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededMultipleAppsRetrieved(stopTime - startTime);
+-      }
+-    });
+-
+-    if (apps.getApps().isEmpty()) {
+-      return new AppsInfo();
+-    }
+-
+-    // Merge all the application reports got from all the available YARN RMs
+-    AppsInfo resultAppsInfo = RouterWebServiceUtil.mergeAppsInfo(
+-        apps.getApps(), returnPartialReport);
+-
+-    if (appInfosCacheEnabled && routerAppInfoCacheKey != null) {
+-      appInfosCaches.put(routerAppInfoCacheKey, resultAppsInfo);
+-    }
+-
+-    return resultAppsInfo;
+-  }
+-
+-  /**
+-   * Get a copy of a HTTP request. This is for thread safety.
+-   * @param hsr HTTP servlet request to copy.
+-   * @return Copy of the HTTP request.
+-   */
+-  private HttpServletRequestWrapper clone(final HttpServletRequest hsr) {
+-    if (hsr == null) {
+-      return null;
+-    }
+-
+-    final Map<String, String[]> parameterMap = hsr.getParameterMap();
+-    final String pathInfo = hsr.getPathInfo();
+-    final String user = hsr.getRemoteUser();
+-    final Principal principal = hsr.getUserPrincipal();
+-    final String mediaType = RouterWebServiceUtil.getMediaTypeFromHttpServletRequest(
+-        hsr, AppsInfo.class);
+-    return new HttpServletRequestWrapper(hsr) {
+-        public Map<String, String[]> getParameterMap() {
+-          return parameterMap;
+-        }
+-        public String getPathInfo() {
+-          return pathInfo;
+-        }
+-        public String getRemoteUser() {
+-          return user;
+-        }
+-        public Principal getUserPrincipal() {
+-          return principal;
+-        }
+-        public String getHeader(String value) {
+-          // we override only Accept
+-          if (value.equals(HttpHeaders.ACCEPT)) {
+-            return mediaType;
+-          }
+-          return null;
+-        }
+-      };
+-  }
+-
+-  /**
+-   * Get the active subcluster in the federation.
+-   *
+-   * @param subClusterId subClusterId.
+-   * @return subClusterInfo.
+-   * @throws NotFoundException If the subclusters cannot be found.
+-   */
+-  private SubClusterInfo getActiveSubCluster(String subClusterId)
+-      throws NotFoundException {
+-    try {
+-      SubClusterId pSubClusterId = SubClusterId.newInstance(subClusterId);
+-      return federationFacade.getSubCluster(pSubClusterId);
+-    } catch (YarnException e) {
+-      throw new NotFoundException(e.getMessage());
+-    }
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the request to all the SubClusters to find
+-   * where the node is running.
+-   * <p>
+-   * Possible failure:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public NodeInfo getNode(String nodeId) {
+-
+-    final Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-
+-    if (subClustersActive.isEmpty()) {
+-      throw new NotFoundException(FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE);
+-    }
+-
+-    final Map<SubClusterInfo, NodeInfo> results = getNode(subClustersActive, nodeId);
+-
+-    // Collect the responses
+-    NodeInfo nodeInfo = null;
+-    for (NodeInfo nodeResponse : results.values()) {
+-      try {
+-        // Check if the node was already found in a different SubCluster and
+-        // it has an old health report
+-        if (nodeInfo == null || nodeInfo.getLastHealthUpdate() <
+-            nodeResponse.getLastHealthUpdate()) {
+-          nodeInfo = nodeResponse;
+-        }
+-      } catch (Throwable e) {
+-        LOG.warn("Failed to get node report ", e);
+-      }
+-    }
+-
+-    if (nodeInfo == null) {
+-      throw new NotFoundException("nodeId, " + nodeId + ", is not found");
+-    }
+-    return nodeInfo;
+-  }
+-
+-  /**
+-   * Get a node and the subcluster where it is.
+-   *
+-   * @param subClusters Subclusters where to search.
+-   * @param nodeId      Identifier of the node we are looking for.
+-   * @return Map between subcluster and node.
+-   */
+-  private Map<SubClusterInfo, NodeInfo> getNode(Collection<SubClusterInfo> subClusters,
+-      String nodeId) {
+-
+-    // Parallel traversal of subClusters
+-    Stream<Pair<SubClusterInfo, NodeInfo>> pairStream = subClusters.parallelStream().map(
+-        subClusterInfo -> {
+-            final SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-            try {
+-              DefaultRequestInterceptorREST interceptor =
+-                   getOrCreateInterceptorForSubCluster(subClusterInfo);
+-              return Pair.of(subClusterInfo, interceptor.getNode(nodeId));
+-            } catch (Exception e) {
+-              LOG.error("Subcluster {} failed to return nodeInfo.", subClusterId, e);
+-              return null;
+-            }
+-        });
+-
+-    // Collect the results
+-    final Map<SubClusterInfo, NodeInfo> results = new HashMap<>();
+-    pairStream.forEach(pair -> {
+-      if (pair != null) {
+-        SubClusterInfo subCluster = pair.getKey();
+-        NodeInfo nodeInfo = pair.getValue();
+-        results.put(subCluster, nodeInfo);
+-      }
+-    });
+-
+-    return results;
+-  }
+-
+-  /**
+-   * Get the subcluster a node belongs to.
+-   *
+-   * @param nodeId Identifier of the node we are looking for.
+-   * @return The subcluster containing the node.
+-   * @throws NotFoundException If the node cannot be found.
+-   */
+-  private SubClusterInfo getNodeSubcluster(String nodeId) throws NotFoundException {
+-
+-    final Collection<SubClusterInfo> subClusters = federationFacade.getActiveSubClusters();
+-    final Map<SubClusterInfo, NodeInfo> results = getNode(subClusters, nodeId);
+-
+-    SubClusterInfo subcluster = null;
+-    NodeInfo nodeInfo = null;
+-    for (Entry<SubClusterInfo, NodeInfo> entry : results.entrySet()) {
+-      NodeInfo nodeResponse = entry.getValue();
+-      if (nodeInfo == null || nodeInfo.getLastHealthUpdate() <
+-          nodeResponse.getLastHealthUpdate()) {
+-        subcluster = entry.getKey();
+-        nodeInfo = nodeResponse;
+-      }
+-    }
+-    if (subcluster == null) {
+-      throw new NotFoundException("Cannot find " + nodeId + " in any subcluster");
+-    }
+-    return subcluster;
+-  }
+-
+-  /**
+-   * The YARN Router will forward the request to all the YARN RMs in parallel,
+-   * after that it will remove all the duplicated NodeInfo by using the NodeId.
+-   * <p>
+-   * Possible failure:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router calls each YARN RM in parallel by using one
+-   * thread for each YARN RM. In case a YARN RM fails, a single call will
+-   * timeout. However, the Router will use the NodesInfo it got, and provides a
+-   * partial list to the client.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public NodesInfo getNodes(String states) {
+-
+-    NodesInfo nodes = new NodesInfo();
+-    try {
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      Class[] argsClasses = new Class[]{String.class};
+-      Object[] args = new Object[]{states};
+-      ClientMethod remoteMethod = new ClientMethod("getNodes", argsClasses, args);
+-      Map<SubClusterInfo, NodesInfo> nodesMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, NodesInfo.class);
+-      nodesMap.values().forEach(nodesInfo -> nodes.addAll(nodesInfo.getNodes()));
+-    } catch (NotFoundException e) {
+-      LOG.error("get all active sub cluster(s) error.", e);
+-      throw e;
+-    } catch (YarnException e) {
+-      LOG.error("getNodes by states = {} error.", states, e);
+-      throw new YarnRuntimeException(e);
+-    } catch (IOException e) {
+-      LOG.error("getNodes by states = {} error with io error.", states, e);
+-      throw new YarnRuntimeException(e);
+-    }
+-
+-    // Delete duplicate from all the node reports got from all the available
+-    // YARN RMs. Nodes can be moved from one subclusters to another. In this
+-    // operation they result LOST/RUNNING in the previous SubCluster and
+-    // NEW/RUNNING in the new one.
+-    return RouterWebServiceUtil.deleteDuplicateNodesInfo(nodes.getNodes());
+-  }
+-
+-  /**
+-   * This method changes the resources of a specific node, and it is reachable
+-   * by using {@link RMWSConsts#NODE_RESOURCE}.
+-   *
+-   * @param hsr The servlet request.
+-   * @param nodeId The node we want to retrieve the information for.
+-   *               It is a PathParam.
+-   * @param resourceOption The resource change.
+-   * @return the resources of a specific node.
+-   */
+-  @Override
+-  public ResourceInfo updateNodeResource(HttpServletRequest hsr,
+-      String nodeId, ResourceOptionInfo resourceOption) {
+-    DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByNodeId(nodeId);
+-    return interceptor.updateNodeResource(hsr, nodeId, resourceOption);
+-  }
+-
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    ClusterMetricsInfo metrics = new ClusterMetricsInfo();
+-
+-    Collection<SubClusterInfo> subClusterInfos = federationFacade.getActiveSubClusters();
+-
+-    Stream<ClusterMetricsInfo> clusterMetricsInfoStream = subClusterInfos.parallelStream()
+-        .map(subClusterInfo -> {
+-          DefaultRequestInterceptorREST interceptor =
+-              getOrCreateInterceptorForSubCluster(subClusterInfo);
+-          try {
+-            return interceptor.getClusterMetricsInfo();
+-          } catch (Exception e) {
+-            LOG.error("Subcluster {} failed to return Cluster Metrics.",
+-                subClusterInfo.getSubClusterId());
+-            return null;
+-          }
+-        });
+-
+-    clusterMetricsInfoStream.forEach(clusterMetricsInfo -> {
+-      try {
+-        if (clusterMetricsInfo != null) {
+-          RouterWebServiceUtil.mergeMetrics(metrics, clusterMetricsInfo);
+-        }
+-      } catch (Throwable e) {
+-        LOG.warn("Failed to get nodes report.", e);
+-      }
+-    });
+-
+-    return metrics;
+-  }
+-
+-  /**
+-   * The YARN Router will forward to the respective YARN RM in which the AM is
+-   * running.
+-   * <p>
+-   * Possible failure:
+-   * <p>
+-   * Client: identical behavior as {@code RMWebServices}.
+-   * <p>
+-   * Router: the Client will timeout and resubmit the request.
+-   * <p>
+-   * ResourceManager: the Router will timeout and the call will fail.
+-   * <p>
+-   * State Store: the Router will timeout and it will retry depending on the
+-   * FederationFacade settings - if the failure happened before the select
+-   * operation.
+-   */
+-  @Override
+-  public AppState getAppState(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    try {
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      if (interceptor != null) {
+-        return interceptor.getAppState(hsr, appId);
+-      }
+-    } catch (YarnException | IllegalArgumentException e) {
+-      LOG.error("getHomeSubClusterInfoByAppId error, applicationId = {}.", appId, e);
+-    }
+-    return new AppState();
+-  }
+-
+-  @Override
+-  public ClusterInfo get() {
+-    return getClusterInfo();
+-  }
+-
+-  /**
+-   * This method retrieves the cluster information, and it is reachable by using
+-   * {@link RMWSConsts#INFO}.
+-   *
+-   * In Federation mode, we will return a FederationClusterInfo object,
+-   * which contains a set of ClusterInfo.
+-   *
+-   * @return the cluster information.
+-   */
+-  @Override
+-  public ClusterInfo getClusterInfo() {
+-    try {
+-      long startTime = Time.now();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      Class[] argsClasses = new Class[]{};
+-      Object[] args = new Object[]{};
+-      ClientMethod remoteMethod = new ClientMethod("getClusterInfo", argsClasses, args);
+-      Map<SubClusterInfo, ClusterInfo> subClusterInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, ClusterInfo.class);
+-      FederationClusterInfo federationClusterInfo = new FederationClusterInfo();
+-      subClusterInfoMap.forEach((subClusterInfo, clusterInfo) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        clusterInfo.setSubClusterId(subClusterId.getId());
+-        federationClusterInfo.getList().add(clusterInfo);
+-      });
+-      long stopTime = Time.now();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_CLUSTERINFO,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededGetClusterInfoRetrieved(stopTime - startTime);
+-      return federationClusterInfo;
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetClusterInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("Get all active sub cluster(s) error.", e);
+-    } catch (YarnException | IOException e) {
+-      routerMetrics.incrGetClusterInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getClusterInfo error.", e);
+-    }
+-    routerMetrics.incrGetClusterInfoFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERINFO, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getClusterInfo error.");
+-    throw new RuntimeException("getClusterInfo error.");
+-  }
+-
+-  /**
+-   * This method retrieves the cluster user information, and it is reachable by using
+-   * {@link RMWSConsts#CLUSTER_USER_INFO}.
+-   *
+-   * In Federation mode, we will return a ClusterUserInfo object,
+-   * which contains a set of ClusterUserInfo.
+-   *
+-   * @param hsr the servlet request
+-   * @return the cluster user information
+-   */
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(HttpServletRequest hsr) {
+-    try {
+-      long startTime = Time.now();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class};
+-      Object[] args = new Object[]{hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("getClusterUserInfo", argsClasses, args);
+-      Map<SubClusterInfo, ClusterUserInfo> subClusterInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, ClusterUserInfo.class);
+-      FederationClusterUserInfo federationClusterUserInfo = new FederationClusterUserInfo();
+-      subClusterInfoMap.forEach((subClusterInfo, clusterUserInfo) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        clusterUserInfo.setSubClusterId(subClusterId.getId());
+-        federationClusterUserInfo.getList().add(clusterUserInfo);
+-      });
+-      long stopTime = Time.now();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_CLUSTERUSERINFO,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededGetClusterUserInfoRetrieved(stopTime - startTime);
+-      return federationClusterUserInfo;
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetClusterUserInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERUSERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("Get all active sub cluster(s) error.", e);
+-    } catch (YarnException | IOException e) {
+-      routerMetrics.incrGetClusterUserInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERUSERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getClusterUserInfo error.", e);
+-    }
+-    routerMetrics.incrGetClusterUserInfoFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTERUSERINFO, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getClusterUserInfo error.");
+-    throw new RuntimeException("getClusterUserInfo error.");
+-  }
+-
+-  /**
+-   * This method retrieves the current scheduler status, and it is reachable by
+-   * using {@link RMWSConsts#SCHEDULER}.
+-   * For the federation mode, the SchedulerType information of the cluster
+-   * cannot be integrated and displayed, and the specific cluster information needs to be marked.
+-   *
+-   * @return the current scheduler status
+-   */
+-  @Override
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    try {
+-      long startTime = Time.now();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      Class[] argsClasses = new Class[]{};
+-      Object[] args = new Object[]{};
+-      ClientMethod remoteMethod = new ClientMethod("getSchedulerInfo", argsClasses, args);
+-      Map<SubClusterInfo, SchedulerTypeInfo> subClusterInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, SchedulerTypeInfo.class);
+-      FederationSchedulerTypeInfo federationSchedulerTypeInfo = new FederationSchedulerTypeInfo();
+-      subClusterInfoMap.forEach((subClusterInfo, schedulerTypeInfo) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        schedulerTypeInfo.setSubClusterId(subClusterId.getId());
+-        federationSchedulerTypeInfo.getList().add(schedulerTypeInfo);
+-      });
+-      long stopTime = Time.now();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_SCHEDULERINFO,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededGetSchedulerInfoRetrieved(stopTime - startTime);
+-      return federationSchedulerTypeInfo;
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetSchedulerInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("Get all active sub cluster(s) error.", e);
+-    } catch (YarnException | IOException e) {
+-      routerMetrics.incrGetSchedulerInfoFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULERINFO, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getSchedulerInfo error.", e);
+-    }
+-    routerMetrics.incrGetSchedulerInfoFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULERINFO, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getSchedulerInfo error.");
+-    throw new RuntimeException("getSchedulerInfo error.");
+-  }
+-
+-  /**
+-   * This method dumps the scheduler logs for the time got in input, and it is
+-   * reachable by using {@link RMWSConsts#SCHEDULER_LOGS}.
+-   *
+-   * @param time the period of time. It is a FormParam.
+-   * @param hsr the servlet request
+-   * @return the result of the operation
+-   * @throws IOException when it cannot create dump log file
+-   */
+-  @Override
+-  public String dumpSchedulerLogs(String time, HttpServletRequest hsr)
+-      throws IOException {
+-
+-    // Step1. We will check the time parameter to
+-    // ensure that the time parameter is not empty and greater than 0.
+-
+-    if (StringUtils.isBlank(time)) {
+-      routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, the time is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the time is empty or null.");
+-    }
+-
+-    try {
+-      int period = Integer.parseInt(time);
+-      if (period <= 0) {
+-        throw new IllegalArgumentException("time must be greater than 0.");
+-      }
+-    } catch (NumberFormatException e) {
+-      routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw new IllegalArgumentException("time must be a number.");
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    // Step2. Call dumpSchedulerLogs of each subcluster.
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{String.class, HttpServletRequest.class};
+-      Object[] args = new Object[]{time, hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("dumpSchedulerLogs", argsClasses, args);
+-      Map<SubClusterInfo, String> dumpSchedulerLogsMap = invokeConcurrent(
+-          subClustersActive, remoteMethod, String.class);
+-      StringBuilder stringBuilder = new StringBuilder();
+-      dumpSchedulerLogsMap.forEach((subClusterInfo, msg) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        stringBuilder.append("subClusterId")
+-            .append(subClusterId).append(" : ").append(msg).append("; ");
+-      });
+-      long stopTime = clock.getTime();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), DUMP_SCHEDULERLOGS,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededDumpSchedulerLogsRetrieved(stopTime - startTime);
+-      return stringBuilder.toString();
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to dump SchedulerLogs by time: %s.", time);
+-    } catch (YarnException e) {
+-      routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "dumpSchedulerLogs by time = %s error .", time);
+-    }
+-
+-    routerMetrics.incrDumpSchedulerLogsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), DUMP_SCHEDULERLOGS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "dumpSchedulerLogs Failed.");
+-    throw new RuntimeException("dumpSchedulerLogs Failed.");
+-  }
+-
+-  /**
+-   * This method retrieve all the activities in a specific node, and it is
+-   * reachable by using {@link RMWSConsts#SCHEDULER_ACTIVITIES}.
+-   *
+-   * @param hsr the servlet request
+-   * @param nodeId the node we want to retrieve the activities. It is a
+-   *          QueryParam.
+-   * @param groupBy the groupBy type by which the activities should be
+-   *          aggregated. It is a QueryParam.
+-   * @return all the activities in the specific node
+-   */
+-  @Override
+-  public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
+-      String groupBy) {
+-    try {
+-      // Check the parameters to ensure that the parameters are not empty
+-      Validate.checkNotNullAndNotEmpty(nodeId, "nodeId");
+-      Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
+-
+-      // Query SubClusterInfo according to id,
+-      // if the nodeId cannot get SubClusterInfo, an exception will be thrown directly.
+-      // Call the corresponding subCluster to get ActivitiesInfo.
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByNodeId(nodeId);
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      ActivitiesInfo activitiesInfo = interceptor.getActivities(hsrCopy, nodeId, groupBy);
+-      if (activitiesInfo != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_ACTIVITIES,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetActivitiesLatencyRetrieved(stopTime - startTime);
+-        return activitiesInfo;
+-      }
+-    } catch (IllegalArgumentException | NotFoundException e) {
+-      routerMetrics.incrGetActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_ACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_ACTIVITIES, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getActivities Failed.");
+-    routerMetrics.incrGetActivitiesFailedRetrieved();
+-    throw new RuntimeException("getActivities Failed.");
+-  }
+-
+-  /**
+-   * This method retrieve the last n activities inside scheduler, and it is
+-   * reachable by using {@link RMWSConsts#SCHEDULER_BULK_ACTIVITIES}.
+-   *
+-   * @param hsr the servlet request
+-   * @param groupBy the groupBy type by which the activities should be
+-   *        aggregated. It is a QueryParam.
+-   * @param activitiesCount number of activities
+-   * @return last n activities
+-   */
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
+-      String groupBy, int activitiesCount) throws InterruptedException {
+-    try {
+-      // Step1. Check the parameters to ensure that the parameters are not empty
+-      Validate.checkNotNullAndNotEmpty(groupBy, "groupBy");
+-      Validate.checkNotNegative(activitiesCount, "activitiesCount");
+-
+-      // Step2. Call the interface of subCluster concurrently and get the returned result.
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class, String.class, int.class};
+-      Object[] args = new Object[]{hsrCopy, groupBy, activitiesCount};
+-      ClientMethod remoteMethod = new ClientMethod("getBulkActivities", argsClasses, args);
+-      Map<SubClusterInfo, BulkActivitiesInfo> appStatisticsMap = invokeConcurrent(
+-          subClustersActive, remoteMethod, BulkActivitiesInfo.class);
+-
+-      // Step3. Generate Federation objects and set subCluster information.
+-      long startTime = clock.getTime();
+-      FederationBulkActivitiesInfo fedBulkActivitiesInfo = new FederationBulkActivitiesInfo();
+-      appStatisticsMap.forEach((subClusterInfo, bulkActivitiesInfo) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        bulkActivitiesInfo.setSubClusterId(subClusterId.getId());
+-        fedBulkActivitiesInfo.getList().add(bulkActivitiesInfo);
+-      });
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_BULKACTIVITIES,
+-          TARGET_WEB_SERVICE);
+-      long stopTime = clock.getTime();
+-      routerMetrics.succeededGetBulkActivitiesRetrieved(stopTime - startTime);
+-      return fedBulkActivitiesInfo;
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetBulkActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_BULKACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetBulkActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_BULKACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("get all active sub cluster(s) error.", e);
+-    } catch (IOException e) {
+-      routerMetrics.incrGetBulkActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_BULKACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getBulkActivities by groupBy = %s, activitiesCount = %s with io error.",
+-          groupBy, String.valueOf(activitiesCount));
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetBulkActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_BULKACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getBulkActivities by groupBy = %s, activitiesCount = %s with yarn error.",
+-          groupBy, String.valueOf(activitiesCount));
+-    }
+-
+-    routerMetrics.incrGetBulkActivitiesFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_BULKACTIVITIES, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getBulkActivities Failed.");
+-    throw new RuntimeException("getBulkActivities Failed.");
+-  }
+-
+-  @Override
+-  public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
+-      String appId, String time, Set<String> requestPriorities,
+-      Set<String> allocationRequestIds, String groupBy, String limit,
+-      Set<String> actions, boolean summarize) {
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      AppActivitiesInfo appActivitiesInfo = interceptor.getAppActivities(hsrCopy, appId, time,
+-          requestPriorities, allocationRequestIds, groupBy, limit, actions, summarize);
+-      if (appActivitiesInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetAppActivitiesRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APPACTIVITIES,
+-            TARGET_WEB_SERVICE);
+-        return appActivitiesInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetAppActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get subCluster by appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppActivitiesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPACTIVITIES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getAppActivities by appId = %s error .", appId);
+-    }
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPACTIVITIES, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getAppActivities Failed.");
+-    routerMetrics.incrGetAppActivitiesFailedRetrieved();
+-    throw new RuntimeException("getAppActivities Failed.");
+-  }
+-
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(HttpServletRequest hsr,
+-      Set<String> stateQueries, Set<String> typeQueries) {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class, Set.class, Set.class};
+-      Object[] args = new Object[]{hsrCopy, stateQueries, typeQueries};
+-      ClientMethod remoteMethod = new ClientMethod("getAppStatistics", argsClasses, args);
+-      Map<SubClusterInfo, ApplicationStatisticsInfo> appStatisticsMap = invokeConcurrent(
+-          subClustersActive, remoteMethod, ApplicationStatisticsInfo.class);
+-      ApplicationStatisticsInfo applicationStatisticsInfo  =
+-          RouterWebServiceUtil.mergeApplicationStatisticsInfo(appStatisticsMap.values());
+-      if (applicationStatisticsInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetAppStatisticsRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APPSTATISTICS,
+-            TARGET_WEB_SERVICE);
+-        return applicationStatisticsInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetAppStatisticsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPSTATISTICS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("get all active sub cluster(s) error.", e);
+-    } catch (IOException e) {
+-      routerMetrics.incrGetAppStatisticsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPSTATISTICS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getAppStatistics error by stateQueries = %s, typeQueries = %s with io error.",
+-          StringUtils.join(stateQueries, ","), StringUtils.join(typeQueries, ","));
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppStatisticsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPSTATISTICS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getAppStatistics by stateQueries = %s, typeQueries = %s with yarn error.",
+-          StringUtils.join(stateQueries, ","), StringUtils.join(typeQueries, ","));
+-    }
+-    routerMetrics.incrGetAppStatisticsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPSTATISTICS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getAppStatistics Failed.");
+-    throw RouterServerUtil.logAndReturnRunTimeException(
+-        "getAppStatistics by stateQueries = %s, typeQueries = %s Failed.",
+-        StringUtils.join(stateQueries, ","), StringUtils.join(typeQueries, ","));
+-  }
+-
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class};
+-      Object[] args = new Object[]{hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("getNodeToLabels", argsClasses, args);
+-      Map<SubClusterInfo, NodeToLabelsInfo> nodeToLabelsInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, NodeToLabelsInfo.class);
+-      NodeToLabelsInfo nodeToLabelsInfo =
+-          RouterWebServiceUtil.mergeNodeToLabels(nodeToLabelsInfoMap);
+-      if (nodeToLabelsInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetNodeToLabelsRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_NODETOLABELS,
+-            TARGET_WEB_SERVICE);
+-        return nodeToLabelsInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrNodeToLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NODETOLABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrNodeToLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NODETOLABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("getNodeToLabels error.", e);
+-    }
+-    routerMetrics.incrNodeToLabelsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NODETOLABELS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getNodeToLabels Failed.");
+-    throw new RuntimeException("getNodeToLabels Failed.");
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getRMNodeLabels(HttpServletRequest hsr) throws IOException {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class};
+-      Object[] args = new Object[]{hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("getRMNodeLabels", argsClasses, args);
+-      Map<SubClusterInfo, NodeLabelsInfo> nodeToLabelsInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, NodeLabelsInfo.class);
+-      NodeLabelsInfo nodeToLabelsInfo =
+-          RouterWebServiceUtil.mergeNodeLabelsInfo(nodeToLabelsInfoMap);
+-      if (nodeToLabelsInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetRMNodeLabelsRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_RMNODELABELS,
+-            TARGET_WEB_SERVICE);
+-        return nodeToLabelsInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetRMNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_RMNODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetRMNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_RMNODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("getRMNodeLabels error.", e);
+-    }
+-    routerMetrics.incrGetRMNodeLabelsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_RMNODELABELS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getRMNodeLabels Failed.");
+-    throw new RuntimeException("getRMNodeLabels Failed.");
+-  }
+-
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(Set<String> labels)
+-      throws IOException {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      Class[] argsClasses = new Class[]{Set.class};
+-      Object[] args = new Object[]{labels};
+-      ClientMethod remoteMethod = new ClientMethod("getLabelsToNodes", argsClasses, args);
+-      Map<SubClusterInfo, LabelsToNodesInfo> labelsToNodesInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, LabelsToNodesInfo.class);
+-      Map<NodeLabelInfo, NodeIDsInfo> labelToNodesMap = new HashMap<>();
+-      labelsToNodesInfoMap.values().forEach(labelsToNode -> {
+-        Map<NodeLabelInfo, NodeIDsInfo> values = labelsToNode.getLabelsToNodes();
+-        for (Map.Entry<NodeLabelInfo, NodeIDsInfo> item : values.entrySet()) {
+-          NodeLabelInfo key = item.getKey();
+-          NodeIDsInfo leftValue = item.getValue();
+-          NodeIDsInfo rightValue = labelToNodesMap.getOrDefault(key, null);
+-          NodeIDsInfo newValue = NodeIDsInfo.add(leftValue, rightValue);
+-          labelToNodesMap.put(key, newValue);
+-        }
+-      });
+-      LabelsToNodesInfo labelsToNodesInfo = new LabelsToNodesInfo(labelToNodesMap);
+-      if (labelsToNodesInfo != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_LABELSTONODES,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetLabelsToNodesRetrieved(stopTime - startTime);
+-        return labelsToNodesInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELSTONODES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELSTONODES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException(
+-          e, "getLabelsToNodes by labels = %s with yarn error.", StringUtils.join(labels, ","));
+-    }
+-    routerMetrics.incrLabelsToNodesFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELSTONODES, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getLabelsToNodes Failed.");
+-    throw RouterServerUtil.logAndReturnRunTimeException(
+-        "getLabelsToNodes by labels = %s Failed.", StringUtils.join(labels, ","));
+-  }
+-
+-  /**
+-   * This method replaces all the node labels for specific nodes, and it is
+-   * reachable by using {@link RMWSConsts#REPLACE_NODE_TO_LABELS}.
+-   *
+-   * @see ResourceManagerAdministrationProtocol#replaceLabelsOnNode
+-   * @param newNodeToLabels the list of new labels. It is a content param.
+-   * @param hsr the servlet request
+-   * @return Response containing the status code
+-   * @throws IOException if an exception happened
+-   */
+-  @Override
+-  public Response replaceLabelsOnNodes(NodeToLabelsEntryList newNodeToLabels,
+-      HttpServletRequest hsr) throws IOException {
+-
+-    // Step1. Check the parameters to ensure that the parameters are not empty.
+-    if (newNodeToLabels == null) {
+-      routerMetrics.incrReplaceLabelsOnNodesFailedRetrieved();
+-      throw new IllegalArgumentException("Parameter error, newNodeToLabels must not be empty.");
+-    }
+-    List<NodeToLabelsEntry> nodeToLabelsEntries = newNodeToLabels.getNodeToLabels();
+-    if (CollectionUtils.isEmpty(nodeToLabelsEntries)) {
+-      routerMetrics.incrReplaceLabelsOnNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REPLACE_LABELSONNODES, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, " +
+-          "nodeToLabelsEntries must not be empty.");
+-      throw new IllegalArgumentException("Parameter error, " +
+-         "nodeToLabelsEntries must not be empty.");
+-    }
+-
+-    try {
+-
+-      // Step2. We map the NodeId and NodeToLabelsEntry in the request.
+-      Map<String, NodeToLabelsEntry> nodeIdToLabels = new HashMap<>();
+-      newNodeToLabels.getNodeToLabels().forEach(nodeIdToLabel -> {
+-        String nodeId = nodeIdToLabel.getNodeId();
+-        nodeIdToLabels.put(nodeId, nodeIdToLabel);
+-      });
+-
+-      // Step3. We map SubCluster with NodeToLabelsEntryList
+-      Map<SubClusterInfo, NodeToLabelsEntryList> subClusterToNodeToLabelsEntryList =
+-          new HashMap<>();
+-      nodeIdToLabels.forEach((nodeId, nodeToLabelsEntry) -> {
+-        SubClusterInfo subClusterInfo = getNodeSubcluster(nodeId);
+-        NodeToLabelsEntryList nodeToLabelsEntryList = subClusterToNodeToLabelsEntryList.
+-            getOrDefault(subClusterInfo, new NodeToLabelsEntryList());
+-        nodeToLabelsEntryList.getNodeToLabels().add(nodeToLabelsEntry);
+-        subClusterToNodeToLabelsEntryList.put(subClusterInfo, nodeToLabelsEntryList);
+-      });
+-
+-      // Step4. Traverse the subCluster and call the replaceLabelsOnNodes interface.
+-      long startTime = clock.getTime();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      StringBuilder builder = new StringBuilder();
+-      subClusterToNodeToLabelsEntryList.forEach((subClusterInfo, nodeToLabelsEntryList) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        try {
+-          DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-              subClusterInfo);
+-          interceptor.replaceLabelsOnNodes(nodeToLabelsEntryList, hsrCopy);
+-          builder.append("subCluster-").append(subClusterId.getId()).append(":Success,");
+-        } catch (Exception e) {
+-          LOG.error("replaceLabelsOnNodes Failed. subClusterId = {}.", subClusterId, e);
+-          builder.append("subCluster-").append(subClusterId.getId()).append(":Failed,");
+-        }
+-      });
+-      long stopTime = clock.getTime();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), REPLACE_LABELSONNODES,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededReplaceLabelsOnNodesRetrieved(stopTime - startTime);
+-
+-      // Step5. return call result.
+-      return Response.status(Status.OK).entity(builder.toString()).build();
+-    } catch (Exception e) {
+-      routerMetrics.incrReplaceLabelsOnNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REPLACE_LABELSONNODES, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-  }
+-
+-  /**
+-   * This method replaces all the node labels for specific node, and it is
+-   * reachable by using {@link RMWSConsts#NODES_NODEID_REPLACE_LABELS}.
+-   *
+-   * @see ResourceManagerAdministrationProtocol#replaceLabelsOnNode
+-   * @param newNodeLabelsName the list of new labels. It is a QueryParam.
+-   * @param hsr the servlet request
+-   * @param nodeId the node we want to replace the node labels. It is a
+-   *     PathParam.
+-   * @return Response containing the status code
+-   * @throws Exception if an exception happened
+-   */
+-  @Override
+-  public Response replaceLabelsOnNode(Set<String> newNodeLabelsName,
+-      HttpServletRequest hsr, String nodeId) throws Exception {
+-
+-    // Step1. Check the parameters to ensure that the parameters are not empty.
+-    if (StringUtils.isBlank(nodeId)) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REPLACE_LABELSONNODE, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, nodeId must not be null or empty.");
+-      throw new IllegalArgumentException("Parameter error, nodeId must not be null or empty.");
+-    }
+-    if (CollectionUtils.isEmpty(newNodeLabelsName)) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REPLACE_LABELSONNODE, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, newNodeLabelsName must not be empty.");
+-      throw new IllegalArgumentException("Parameter error, newNodeLabelsName must not be empty.");
+-    }
+-
+-    try {
+-      // Step2. We find the subCluster according to the nodeId,
+-      // and then call the replaceLabelsOnNode of the subCluster.
+-      long startTime = clock.getTime();
+-      SubClusterInfo subClusterInfo = getNodeSubcluster(nodeId);
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByNodeId(nodeId);
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      interceptor.replaceLabelsOnNode(newNodeLabelsName, hsrCopy, nodeId);
+-
+-      // Step3. Return the response result.
+-      long stopTime = clock.getTime();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), REPLACE_LABELSONNODE,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededReplaceLabelsOnNodeRetrieved(stopTime - startTime);
+-      String msg = "subCluster#" + subClusterInfo.getSubClusterId().getId() + ":Success;";
+-      return Response.status(Status.OK).entity(msg).build();
+-    } catch (Exception e) {
+-      routerMetrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REPLACE_LABELSONNODE, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class};
+-      Object[] args = new Object[]{hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("getClusterNodeLabels", argsClasses, args);
+-      Map<SubClusterInfo, NodeLabelsInfo> nodeToLabelsInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, NodeLabelsInfo.class);
+-      Set<NodeLabel> hashSets = Sets.newHashSet();
+-      nodeToLabelsInfoMap.values().forEach(item -> hashSets.addAll(item.getNodeLabels()));
+-      NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo(hashSets);
+-      if (nodeLabelsInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetClusterNodeLabelsRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_CLUSTER_NODELABELS,
+-            TARGET_WEB_SERVICE);
+-        return nodeLabelsInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("getClusterNodeLabels with yarn error.", e);
+-    }
+-    routerMetrics.incrClusterNodeLabelsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CLUSTER_NODELABELS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "getClusterNodeLabels Failed.");
+-    throw new RuntimeException("getClusterNodeLabels Failed.");
+-  }
+-
+-  /**
+-   * This method adds specific node labels for specific nodes, and it is
+-   * reachable by using {@link RMWSConsts#ADD_NODE_LABELS}.
+-   *
+-   * @see ResourceManagerAdministrationProtocol#addToClusterNodeLabels
+-   * @param newNodeLabels the node labels to add. It is a content param.
+-   * @param hsr the servlet request
+-   * @return Response containing the status code
+-   * @throws Exception in case of bad request
+-   */
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-
+-    if (newNodeLabels == null) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, the newNodeLabels is null.");
+-      throw new IllegalArgumentException("Parameter error, the newNodeLabels is null.");
+-    }
+-
+-    List<NodeLabelInfo> nodeLabelInfos = newNodeLabels.getNodeLabelsInfo();
+-    if (CollectionUtils.isEmpty(nodeLabelInfos)) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, "Parameter error, the nodeLabelsInfo is null or empty.");
+-      throw new IllegalArgumentException("Parameter error, the nodeLabelsInfo is null or empty.");
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActives = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{NodeLabelsInfo.class, HttpServletRequest.class};
+-      Object[] args = new Object[]{newNodeLabels, hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("addToClusterNodeLabels", argsClasses, args);
+-      Map<SubClusterInfo, Response> responseInfoMap =
+-          invokeConcurrent(subClustersActives, remoteMethod, Response.class);
+-      StringBuffer buffer = new StringBuffer();
+-      // SubCluster-0:SUCCESS,SubCluster-1:SUCCESS
+-      responseInfoMap.forEach((subClusterInfo, response) ->
+-          buildAppendMsg(subClusterInfo, buffer, response));
+-      long stopTime = clock.getTime();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededAddToClusterNodeLabelsRetrieved((stopTime - startTime));
+-      return Response.status(Status.OK).entity(buffer.toString()).build();
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS, UNKNOWN,
+-          TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("addToClusterNodeLabels with yarn error.", e);
+-    }
+-
+-    routerMetrics.incrAddToClusterNodeLabelsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), ADD_TO_CLUSTER_NODELABELS, UNKNOWN,
+-        TARGET_WEB_SERVICE, "addToClusterNodeLabels Failed.");
+-    throw new RuntimeException("addToClusterNodeLabels Failed.");
+-  }
+-
+-  /**
+-   * This method removes all the node labels for specific nodes, and it is
+-   * reachable by using {@link RMWSConsts#REMOVE_NODE_LABELS}.
+-   *
+-   * @see ResourceManagerAdministrationProtocol#removeFromClusterNodeLabels
+-   * @param oldNodeLabels the node labels to remove. It is a QueryParam.
+-   * @param hsr the servlet request
+-   * @return Response containing the status code
+-   * @throws Exception in case of bad request
+-   */
+-  @Override
+-  public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-
+-    if (CollectionUtils.isEmpty(oldNodeLabels)) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REMOVE_FROM_CLUSTERNODELABELS,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the oldNodeLabels is null or empty.");
+-      throw new IllegalArgumentException("Parameter error, the oldNodeLabels is null or empty.");
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActives = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{Set.class, HttpServletRequest.class};
+-      Object[] args = new Object[]{oldNodeLabels, hsrCopy};
+-      ClientMethod remoteMethod =
+-          new ClientMethod("removeFromClusterNodeLabels", argsClasses, args);
+-      Map<SubClusterInfo, Response> responseInfoMap =
+-          invokeConcurrent(subClustersActives, remoteMethod, Response.class);
+-      StringBuffer buffer = new StringBuffer();
+-      // SubCluster-0:SUCCESS,SubCluster-1:SUCCESS
+-      responseInfoMap.forEach((subClusterInfo, response) ->
+-          buildAppendMsg(subClusterInfo, buffer, response));
+-      long stopTime = clock.getTime();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), REMOVE_FROM_CLUSTERNODELABELS,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededRemoveFromClusterNodeLabelsRetrieved(stopTime - startTime);
+-      return Response.status(Status.OK).entity(buffer.toString()).build();
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REMOVE_FROM_CLUSTERNODELABELS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), REMOVE_FROM_CLUSTERNODELABELS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("removeFromClusterNodeLabels with yarn error.", e);
+-    }
+-
+-    routerMetrics.incrRemoveFromClusterNodeLabelsFailedRetrieved();
+-    throw new RuntimeException("removeFromClusterNodeLabels Failed.");
+-  }
+-
+-  /**
+-   * Build Append information.
+-   *
+-   * @param subClusterInfo subCluster information.
+-   * @param buffer StringBuffer.
+-   * @param response response message.
+-   */
+-  private void buildAppendMsg(SubClusterInfo subClusterInfo, StringBuffer buffer,
+-      Response response) {
+-    SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-    String state = response != null &&
+-        (response.getStatus() == Status.OK.getStatusCode()) ? "SUCCESS" : "FAILED";
+-    buffer.append("SubCluster-")
+-        .append(subClusterId.getId())
+-        .append(":")
+-        .append(state)
+-        .append(",");
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(HttpServletRequest hsr, String nodeId)
+-      throws IOException {
+-    try {
+-      long startTime = clock.getTime();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class, String.class};
+-      Object[] args = new Object[]{hsrCopy, nodeId};
+-      ClientMethod remoteMethod = new ClientMethod("getLabelsOnNode", argsClasses, args);
+-      Map<SubClusterInfo, NodeLabelsInfo> nodeToLabelsInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, NodeLabelsInfo.class);
+-      Set<NodeLabel> hashSets = Sets.newHashSet();
+-      nodeToLabelsInfoMap.values().forEach(item -> hashSets.addAll(item.getNodeLabels()));
+-      NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo(hashSets);
+-      if (nodeLabelsInfo != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetLabelsToNodesRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_LABELS_ON_NODE,
+-            TARGET_WEB_SERVICE);
+-        return nodeLabelsInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELS_ON_NODE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException("get all active sub cluster(s) error.", e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrLabelsToNodesFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELS_ON_NODE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowIOException(
+-          e, "getLabelsOnNode nodeId = %s with yarn error.", nodeId);
+-    }
+-    routerMetrics.incrLabelsToNodesFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_LABELS_ON_NODE,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getLabelsOnNode by nodeId = " + nodeId + " Failed.");
+-    throw RouterServerUtil.logAndReturnRunTimeException(
+-        "getLabelsOnNode by nodeId = %s Failed.", nodeId);
+-  }
+-
+-  @Override
+-  public AppPriority getAppPriority(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppPriority appPriority = interceptor.getAppPriority(hsr, appId);
+-      if (appPriority != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetAppPriorityRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APP_PRIORITY,
+-            TARGET_WEB_SERVICE);
+-        return appPriority;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetAppPriorityFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_PRIORITY,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the getAppPriority appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppPriorityFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_PRIORITY,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getAppPriority error.", e);
+-    }
+-    routerMetrics.incrGetAppPriorityFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_PRIORITY,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppPriority Failed.");
+-    throw new RuntimeException("getAppPriority Failed.");
+-  }
+-
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-
+-    if (targetPriority == null) {
+-      routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the targetPriority is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the targetPriority is empty or null.");
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      Response response = interceptor.updateApplicationPriority(targetPriority, hsr, appId);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededUpdateAppPriorityRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-            TARGET_WEB_SERVICE);
+-        return response;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the updateApplicationPriority appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("updateApplicationPriority error.", e);
+-    }
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONPRIORITY,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppPriority Failed.");
+-    routerMetrics.incrUpdateAppPriorityFailedRetrieved();
+-    throw new RuntimeException("updateApplicationPriority Failed.");
+-  }
+-
+-  @Override
+-  public AppQueue getAppQueue(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppQueue queue = interceptor.getAppQueue(hsr, appId);
+-      if (queue != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededGetAppQueueRetrieved((stopTime - startTime));
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_QUEUEINFO,
+-            TARGET_WEB_SERVICE);
+-        return queue;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetAppQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_QUEUEINFO,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e, "Unable to get queue by appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_QUEUEINFO,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getAppQueue error.", e);
+-    }
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_QUEUEINFO,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppQueue Failed.");
+-    routerMetrics.incrGetAppQueueFailedRetrieved();
+-    throw new RuntimeException("getAppQueue Failed.");
+-  }
+-
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-
+-    if (targetQueue == null) {
+-      routerMetrics.incrUpdateAppQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APP_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the targetQueue is null.");
+-      throw new IllegalArgumentException("Parameter error, the targetQueue is null.");
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      Response response = interceptor.updateAppQueue(targetQueue, hsr, appId);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        routerMetrics.succeededUpdateAppQueueRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), UPDATE_APP_QUEUE,
+-            TARGET_WEB_SERVICE);
+-        return response;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrUpdateAppQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APP_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to update app queue by appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrUpdateAppQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APP_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("updateAppQueue error.", e);
+-    }
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APP_QUEUE,
+-        UNKNOWN, TARGET_WEB_SERVICE, "updateAppQueue Failed.");
+-    routerMetrics.incrUpdateAppQueueFailedRetrieved();
+-    throw new RuntimeException("updateAppQueue Failed.");
+-  }
+-
+-  /**
+-   * This method posts a delegation token from the client.
+-   *
+-   * @param tokenData the token to delegate. It is a content param.
+-   * @param hsr the servlet request.
+-   * @return Response containing the status code.
+-   * @throws AuthorizationException if Kerberos auth failed.
+-   * @throws IOException if the delegation failed.
+-   * @throws InterruptedException if interrupted.
+-   * @throws Exception in case of bad request.
+-   */
+-  @Override
+-  public Response postDelegationToken(DelegationToken tokenData, HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException, Exception {
+-
+-    if (tokenData == null || hsr == null) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), POST_DELEGATION_TOKEN,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the tokenData or hsr is null.");
+-      throw new IllegalArgumentException("Parameter error, the tokenData or hsr is null.");
+-    }
+-
+-    try {
+-      // get Caller UserGroupInformation
+-      Configuration conf = federationFacade.getConf();
+-      UserGroupInformation callerUGI = getKerberosUserGroupInformation(conf, hsr);
+-
+-      // create a delegation token
+-      return createDelegationToken(tokenData, callerUGI);
+-    } catch (YarnException e) {
+-      LOG.error("Create delegation token request failed.", e);
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), POST_DELEGATION_TOKEN,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.FORBIDDEN).entity(e.getMessage()).build();
+-    }
+-  }
+-
+-  /**
+-   * Create DelegationToken.
+-   *
+-   * @param dtoken DelegationToken Data.
+-   * @param callerUGI UserGroupInformation.
+-   * @return Response.
+-   * @throws Exception An exception occurred when creating a delegationToken.
+-   */
+-  private Response createDelegationToken(DelegationToken dtoken, UserGroupInformation callerUGI)
+-      throws IOException, InterruptedException {
+-
+-    String renewer = dtoken.getRenewer();
+-
+-    GetDelegationTokenResponse resp = callerUGI.doAs(
+-        (PrivilegedExceptionAction<GetDelegationTokenResponse>) () -> {
+-        GetDelegationTokenRequest createReq = GetDelegationTokenRequest.newInstance(renewer);
+-        return this.getRouterClientRMService().getDelegationToken(createReq);
+-      });
+-
+-    DelegationToken respToken = getDelegationToken(renewer, resp);
+-    RouterAuditLogger.logSuccess(getUser().getShortUserName(), POST_DELEGATION_TOKEN,
+-        TARGET_WEB_SERVICE);
+-    return Response.status(Status.OK).entity(respToken).build();
+-  }
+-
+-  /**
+-   * Get DelegationToken.
+-   *
+-   * @param renewer renewer.
+-   * @param resp GetDelegationTokenResponse.
+-   * @return DelegationToken.
+-   * @throws IOException if there are I/O errors.
+-   */
+-  private DelegationToken getDelegationToken(String renewer, GetDelegationTokenResponse resp)
+-      throws IOException {
+-    // Step1. Parse token from GetDelegationTokenResponse.
+-    Token<RMDelegationTokenIdentifier> tk = getToken(resp);
+-    String tokenKind = tk.getKind().toString();
+-    RMDelegationTokenIdentifier tokenIdentifier = tk.decodeIdentifier();
+-    String owner = tokenIdentifier.getOwner().toString();
+-    long maxDate = tokenIdentifier.getMaxDate();
+-
+-    // Step2. Call the interface to get the expiration time of Token.
+-    RouterClientRMService clientRMService = this.getRouterClientRMService();
+-    RouterDelegationTokenSecretManager tokenSecretManager =
+-        clientRMService.getRouterDTSecretManager();
+-    long currentExpiration = tokenSecretManager.getRenewDate(tokenIdentifier);
+-
+-    // Step3. Generate Delegation token.
+-    DelegationToken delegationToken = new DelegationToken(tk.encodeToUrlString(),
+-        renewer, owner, tokenKind, currentExpiration, maxDate);
+-
+-    return delegationToken;
+-  }
+-
+-  /**
+-   * GetToken.
+-   * We convert RMDelegationToken in GetDelegationTokenResponse to Token.
+-   *
+-   * @param resp GetDelegationTokenResponse.
+-   * @return Token.
+-   */
+-  private static Token<RMDelegationTokenIdentifier> getToken(GetDelegationTokenResponse resp) {
+-    org.apache.hadoop.yarn.api.records.Token token = resp.getRMDelegationToken();
+-    byte[] identifier = token.getIdentifier().array();
+-    byte[] password = token.getPassword().array();
+-    Text kind = new Text(token.getKind());
+-    Text service = new Text(token.getService());
+-    return new Token<>(identifier, password, kind, service);
+-  }
+-
+-  /**
+-   * This method updates the expiration for a delegation token from the client.
+-   *
+-   * @param hsr the servlet request
+-   * @return Response containing the status code.
+-   * @throws AuthorizationException if Kerberos auth failed.
+-   * @throws IOException if the delegation failed.
+-   * @throws InterruptedException  if interrupted.
+-   * @throws Exception in case of bad request.
+-   */
+-  @Override
+-  public Response postDelegationTokenExpiration(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException, Exception {
+-
+-    if (hsr == null) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), POST_DELEGATION_TOKEN_EXPIRATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the hsr is null.");
+-      throw new IllegalArgumentException("Parameter error, the hsr is null.");
+-    }
+-
+-    try {
+-      // get Caller UserGroupInformation
+-      Configuration conf = federationFacade.getConf();
+-      UserGroupInformation callerUGI = getKerberosUserGroupInformation(conf, hsr);
+-      return renewDelegationToken(hsr, callerUGI);
+-    } catch (YarnException e) {
+-      LOG.error("Renew delegation token request failed.", e);
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), POST_DELEGATION_TOKEN_EXPIRATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.FORBIDDEN).entity(e.getMessage()).build();
+-    }
+-  }
+-
+-  /**
+-   * Renew DelegationToken.
+-   *
+-   * @param hsr HttpServletRequest.
+-   * @param callerUGI UserGroupInformation.
+-   * @return Response
+-   * @throws IOException if there are I/O errors.
+-   * @throws InterruptedException if any thread has interrupted.
+-   */
+-  private Response renewDelegationToken(HttpServletRequest hsr, UserGroupInformation callerUGI)
+-      throws IOException, InterruptedException {
+-
+-    // renew Delegation Token
+-    DelegationToken tokenData = new DelegationToken();
+-    String encodeToken = extractToken(hsr).encodeToUrlString();
+-    tokenData.setToken(encodeToken);
+-
+-    // Parse token data
+-    Token<RMDelegationTokenIdentifier> token = extractToken(tokenData.getToken());
+-    org.apache.hadoop.yarn.api.records.Token dToken =
+-        BuilderUtils.newDelegationToken(token.getIdentifier(), token.getKind().toString(),
+-        token.getPassword(), token.getService().toString());
+-
+-    // Renew token
+-    RenewDelegationTokenResponse resp = callerUGI.doAs(
+-        (PrivilegedExceptionAction<RenewDelegationTokenResponse>) () -> {
+-        RenewDelegationTokenRequest req = RenewDelegationTokenRequest.newInstance(dToken);
+-        return this.getRouterClientRMService().renewDelegationToken(req);
+-      });
+-
+-    // return DelegationToken
+-    long renewTime = resp.getNextExpirationTime();
+-    DelegationToken respToken = new DelegationToken();
+-    respToken.setNextExpirationTime(renewTime);
+-    RouterAuditLogger.logSuccess(getUser().getShortUserName(), POST_DELEGATION_TOKEN_EXPIRATION,
+-        TARGET_WEB_SERVICE);
+-    return Response.status(Status.OK).entity(respToken).build();
+-  }
+-
+-  /**
+-   * Cancel DelegationToken.
+-   *
+-   * @param hsr the servlet request
+-   * @return  Response containing the status code.
+-   * @throws AuthorizationException if Kerberos auth failed.
+-   * @throws IOException if the delegation failed.
+-   * @throws InterruptedException if interrupted.
+-   * @throws Exception in case of bad request.
+-   */
+-  @Override
+-  public Response cancelDelegationToken(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException, Exception {
+-    try {
+-      // get Caller UserGroupInformation
+-      Configuration conf = federationFacade.getConf();
+-      UserGroupInformation callerUGI = getKerberosUserGroupInformation(conf, hsr);
+-
+-      // parse Token Data
+-      Token<RMDelegationTokenIdentifier> token = extractToken(hsr);
+-      org.apache.hadoop.yarn.api.records.Token dToken = BuilderUtils
+-          .newDelegationToken(token.getIdentifier(), token.getKind().toString(),
+-          token.getPassword(), token.getService().toString());
+-
+-      // cancelDelegationToken
+-      callerUGI.doAs((PrivilegedExceptionAction<CancelDelegationTokenResponse>) () -> {
+-        CancelDelegationTokenRequest req = CancelDelegationTokenRequest.newInstance(dToken);
+-        return this.getRouterClientRMService().cancelDelegationToken(req);
+-      });
+-
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), CANCEL_DELEGATIONTOKEN,
+-          TARGET_WEB_SERVICE);
+-      return Response.status(Status.OK).build();
+-    } catch (YarnException e) {
+-      LOG.error("Cancel delegation token request failed.", e);
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CANCEL_DELEGATIONTOKEN,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.FORBIDDEN).entity(e.getMessage()).build();
+-    }
+-  }
+-
+-  @Override
+-  public Response createNewReservation(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    long startTime = clock.getTime();
+-    try {
+-      Map<SubClusterId, SubClusterInfo> subClustersActive =
+-          federationFacade.getSubClusters(true);
+-      // We declare blackList and retries.
+-      List<SubClusterId> blackList = new ArrayList<>();
+-      int actualRetryNums = federationFacade.getRetryNumbers(numSubmitRetries);
+-      Response response = ((FederationActionRetry<Response>) (retryCount) ->
+-          invokeCreateNewReservation(subClustersActive, blackList, hsr, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-      // If the response is not empty and the status is SC_OK,
+-      // this request can be returned directly.
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_OK) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_NEW_RESERVATION,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetNewReservationRetrieved(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (FederationPolicyException e) {
+-      // If a FederationPolicyException is thrown, the service is unavailable.
+-      routerMetrics.incrGetNewReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.SERVICE_UNAVAILABLE).entity(e.getLocalizedMessage()).build();
+-    } catch (Exception e) {
+-      routerMetrics.incrGetNewReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getLocalizedMessage()).build();
+-    }
+-
+-    // return error message directly.
+-    String errMsg = "Fail to create a new reservation.";
+-    LOG.error(errMsg);
+-    routerMetrics.incrGetNewReservationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_NEW_RESERVATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, errMsg);
+-    return Response.status(Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
+-  }
+-
+-  private Response invokeCreateNewReservation(Map<SubClusterId, SubClusterInfo> subClustersActive,
+-      List<SubClusterId> blackList, HttpServletRequest hsr, int retryCount)
+-      throws YarnException {
+-    SubClusterId subClusterId = getRandomActiveSubCluster(subClustersActive, blackList);
+-    LOG.info("createNewReservation try #{} on SubCluster {}.", retryCount, subClusterId);
+-    SubClusterInfo subClusterInfo = subClustersActive.get(subClusterId);
+-    DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-        subClusterId, subClusterInfo.getRMWebServiceAddress());
+-    try {
+-      Response response = interceptor.createNewReservation(hsr);
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_OK) {
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      blackList.add(subClusterId);
+-      RouterServerUtil.logAndThrowException(e.getMessage(), e);
+-    }
+-    // We need to throw the exception directly.
+-    String msg = String.format("Unable to create a new ReservationId in SubCluster %s.",
+-        subClusterId.getId());
+-    throw new YarnException(msg);
+-  }
+-
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException, InterruptedException {
+-    long startTime = clock.getTime();
+-    if (resContext == null || resContext.getReservationId() == null
+-        || resContext.getReservationDefinition() == null || resContext.getQueue() == null) {
+-      routerMetrics.incrSubmitReservationFailedRetrieved();
+-      String errMsg = "Missing submitReservation resContext or reservationId " +
+-          "or reservation definition or queue.";
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, errMsg);
+-      return Response.status(Status.BAD_REQUEST).entity(errMsg).build();
+-    }
+-
+-    // Check that the resId format is accurate
+-    String resId = resContext.getReservationId();
+-    try {
+-      RouterServerUtil.validateReservationId(resId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrSubmitReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    List<SubClusterId> blackList = new ArrayList<>();
+-    try {
+-      int activeSubClustersCount = federationFacade.getActiveSubClustersCount();
+-      int actualRetryNums = Math.min(activeSubClustersCount, numSubmitRetries);
+-      Response response = ((FederationActionRetry<Response>) (retryCount) ->
+-          invokeSubmitReservation(resContext, blackList, hsr, retryCount)).
+-          runWithRetries(actualRetryNums, submitIntervalTime);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), SUBMIT_RESERVATION,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededSubmitReservationRetrieved(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      routerMetrics.incrSubmitReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      return Response.status(Status.SERVICE_UNAVAILABLE).entity(e.getLocalizedMessage()).build();
+-    }
+-
+-    routerMetrics.incrSubmitReservationFailedRetrieved();
+-    String msg = String.format("Reservation %s failed to be submitted.", resId);
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), SUBMIT_RESERVATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, msg);
+-    return Response.status(Status.SERVICE_UNAVAILABLE).entity(msg).build();
+-  }
+-
+-  private Response invokeSubmitReservation(ReservationSubmissionRequestInfo requestContext,
+-      List<SubClusterId> blackList, HttpServletRequest hsr, int retryCount)
+-      throws YarnException, IOException, InterruptedException {
+-    String resId = requestContext.getReservationId();
+-    ReservationId reservationId = ReservationId.parseReservationId(resId);
+-    ReservationDefinitionInfo definitionInfo = requestContext.getReservationDefinition();
+-    ReservationDefinition definition =
+-         RouterServerUtil.convertReservationDefinition(definitionInfo);
+-
+-    // First, Get SubClusterId according to specific strategy.
+-    ReservationSubmissionRequest request = ReservationSubmissionRequest.newInstance(
+-        definition, requestContext.getQueue(), reservationId);
+-    SubClusterId subClusterId = null;
+-
+-    try {
+-      // Get subClusterId from policy.
+-      subClusterId = policyFacade.getReservationHomeSubCluster(request);
+-
+-      // Print the log of submitting the submitApplication.
+-      LOG.info("submitReservation ReservationId {} try #{} on SubCluster {}.", reservationId,
+-          retryCount, subClusterId);
+-
+-      // Step2. We Store the mapping relationship
+-      // between Application and HomeSubCluster in stateStore.
+-      federationFacade.addOrUpdateReservationHomeSubCluster(reservationId,
+-          subClusterId, retryCount);
+-
+-      // Step3. We get subClusterInfo based on subClusterId.
+-      SubClusterInfo subClusterInfo = federationFacade.getSubCluster(subClusterId);
+-
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-      HttpServletRequest hsrCopy = clone(hsr);
+-      Response response = interceptor.submitReservation(requestContext, hsrCopy);
+-      if (response != null && response.getStatus() == HttpServletResponse.SC_ACCEPTED) {
+-        LOG.info("Reservation {} submitted on subCluster {}.", reservationId, subClusterId);
+-        return response;
+-      }
+-      String msg = String.format("application %s failed to be submitted.", resId);
+-      throw new YarnException(msg);
+-    } catch (Exception e) {
+-      LOG.warn("Unable to submit the reservation {} to SubCluster {}.", resId,
+-          subClusterId, e);
+-      if (subClusterId != null) {
+-        blackList.add(subClusterId);
+-      }
+-      throw e;
+-    }
+-  }
+-
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException, InterruptedException {
+-
+-    // parameter verification
+-    if (resContext == null || resContext.getReservationId() == null
+-        || resContext.getReservationDefinition() == null) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      String errMsg = "Missing updateReservation resContext or reservationId " +
+-          "or reservation definition.";
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, errMsg);
+-      return Response.status(Status.BAD_REQUEST).entity(errMsg).build();
+-    }
+-
+-    // get reservationId
+-    String reservationId = resContext.getReservationId();
+-
+-    // Check that the reservationId format is accurate
+-    try {
+-      RouterServerUtil.validateReservationId(reservationId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    try {
+-      SubClusterInfo subClusterInfo = getHomeSubClusterInfoByReservationId(reservationId);
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-      HttpServletRequest hsrCopy = clone(hsr);
+-      Response response = interceptor.updateReservation(resContext, hsrCopy);
+-      if (response != null) {
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), UPDATE_RESERVATION,
+-            TARGET_WEB_SERVICE);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      routerMetrics.incrUpdateReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("updateReservation Failed.", e);
+-    }
+-
+-    // throw an exception
+-    routerMetrics.incrUpdateReservationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_RESERVATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, "updateReservation Failed, reservationId = " + reservationId);
+-    throw new YarnRuntimeException("updateReservation Failed, reservationId = " + reservationId);
+-  }
+-
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-
+-    // parameter verification
+-    if (resContext == null || resContext.getReservationId() == null) {
+-      routerMetrics.incrDeleteReservationFailedRetrieved();
+-      String errMsg = "Missing deleteReservation request or reservationId.";
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DELETE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, errMsg);
+-      return Response.status(Status.BAD_REQUEST).entity(errMsg).build();
+-    }
+-
+-    // get ReservationId
+-    String reservationId = resContext.getReservationId();
+-
+-    // Check that the reservationId format is accurate
+-    try {
+-      RouterServerUtil.validateReservationId(reservationId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrDeleteReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DELETE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    try {
+-      SubClusterInfo subClusterInfo = getHomeSubClusterInfoByReservationId(reservationId);
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-      HttpServletRequest hsrCopy = clone(hsr);
+-      Response response = interceptor.deleteReservation(resContext, hsrCopy);
+-      if (response != null) {
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), DELETE_RESERVATION,
+-            TARGET_WEB_SERVICE);
+-        return response;
+-      }
+-    } catch (Exception e) {
+-      routerMetrics.incrDeleteReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), DELETE_RESERVATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("deleteReservation Failed.", e);
+-    }
+-
+-    // throw an exception
+-    routerMetrics.incrDeleteReservationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), DELETE_RESERVATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, "deleteReservation Failed, reservationId = " + reservationId);
+-    throw new YarnRuntimeException("deleteReservation Failed, reservationId = " + reservationId);
+-  }
+-
+-  @Override
+-  public Response listReservation(String queue, String reservationId,
+-      long startTime, long endTime, boolean includeResourceAllocations,
+-      HttpServletRequest hsr) throws Exception {
+-
+-    if (queue == null || queue.isEmpty()) {
+-      routerMetrics.incrListReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), LIST_RESERVATIONS,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the queue is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the queue is empty or null.");
+-    }
+-
+-    if (reservationId == null || reservationId.isEmpty()) {
+-      routerMetrics.incrListReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), LIST_RESERVATIONS,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the reservationId is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the reservationId is empty or null.");
+-    }
+-
+-    // Check that the reservationId format is accurate
+-    try {
+-      RouterServerUtil.validateReservationId(reservationId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrListReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), LIST_RESERVATIONS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    try {
+-      long startTime1 = clock.getTime();
+-      SubClusterInfo subClusterInfo = getHomeSubClusterInfoByReservationId(reservationId);
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-      HttpServletRequest hsrCopy = clone(hsr);
+-      Response response = interceptor.listReservation(queue, reservationId, startTime, endTime,
+-          includeResourceAllocations, hsrCopy);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), LIST_RESERVATIONS,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededListReservationRetrieved(stopTime - startTime1);
+-        return response;
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrListReservationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), LIST_RESERVATIONS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("listReservation error.", e);
+-    }
+-
+-    routerMetrics.incrListReservationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), LIST_RESERVATIONS,
+-        UNKNOWN, TARGET_WEB_SERVICE, "listReservation Failed.");
+-    throw new YarnException("listReservation Failed.");
+-  }
+-
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(HttpServletRequest hsr, String appId,
+-      String type) throws AuthorizationException {
+-
+-    if (type == null || type.isEmpty()) {
+-      routerMetrics.incrGetAppTimeoutFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUT,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the type is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the type is empty or null.");
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppTimeoutInfo appTimeoutInfo = interceptor.getAppTimeout(hsr, appId, type);
+-      if (appTimeoutInfo != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APP_TIMEOUT,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetAppTimeoutRetrieved((stopTime - startTime));
+-        return appTimeoutInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetAppTimeoutFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUT,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the getAppTimeout appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppTimeoutFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUT,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getAppTimeout error.", e);
+-    }
+-    routerMetrics.incrGetAppTimeoutFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUT,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppTimeout Failed.");
+-    throw new RuntimeException("getAppTimeout Failed.");
+-  }
+-
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-
+-    try {
+-      long startTime = clock.getTime();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppTimeoutsInfo appTimeoutsInfo = interceptor.getAppTimeouts(hsr, appId);
+-      if (appTimeoutsInfo != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APP_TIMEOUTS,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetAppTimeoutsRetrieved((stopTime - startTime));
+-        return appTimeoutsInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetAppTimeoutsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the getAppTimeouts appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetAppTimeoutsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getAppTimeouts error.", e);
+-    }
+-
+-    routerMetrics.incrGetAppTimeoutsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_TIMEOUTS,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppTimeouts Failed.");
+-    throw new RuntimeException("getAppTimeouts Failed.");
+-  }
+-
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-
+-    if (appTimeout == null) {
+-      routerMetrics.incrUpdateApplicationTimeoutsRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the appTimeout is null.");
+-      throw new IllegalArgumentException("Parameter error, the appTimeout is null.");
+-    }
+-
+-    try {
+-      long startTime = Time.now();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      Response response = interceptor.updateApplicationTimeout(appTimeout, hsr, appId);
+-      if (response != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededUpdateAppTimeoutsRetrieved((stopTime - startTime));
+-        return response;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrUpdateApplicationTimeoutsRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the updateApplicationTimeout appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrUpdateApplicationTimeoutsRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("updateApplicationTimeout error.", e);
+-    }
+-
+-    routerMetrics.incrUpdateApplicationTimeoutsRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_APPLICATIONTIMEOUTS,
+-        UNKNOWN, TARGET_WEB_SERVICE, "updateApplicationTimeout Failed.");
+-    throw new RuntimeException("updateApplicationTimeout Failed.");
+-  }
+-
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId) {
+-
+-    try {
+-      long startTime = Time.now();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppAttemptsInfo appAttemptsInfo = interceptor.getAppAttempts(hsr, appId);
+-      if (appAttemptsInfo != null) {
+-        long stopTime = Time.now();
+-        routerMetrics.succeededAppAttemptsRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APPLICATION_ATTEMPTS,
+-            TARGET_WEB_SERVICE);
+-        return appAttemptsInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppAttemptsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPLICATION_ATTEMPTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to get the AppAttempt appId: %s.", appId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppAttemptsFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPLICATION_ATTEMPTS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getAppAttempts error.", e);
+-    }
+-
+-    routerMetrics.incrAppAttemptsFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APPLICATION_ATTEMPTS,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppAttempts Failed.");
+-    throw new RuntimeException("getAppAttempts Failed.");
+-  }
+-
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
+-      String queueAclType, HttpServletRequest hsr) throws AuthorizationException {
+-
+-    // Parameter Verification
+-    if (queue == null || queue.isEmpty()) {
+-      routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the queue is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the queue is empty or null.");
+-    }
+-
+-    if (username == null || username.isEmpty()) {
+-      routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the username is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the username is empty or null.");
+-    }
+-
+-    if (queueAclType == null || queueAclType.isEmpty()) {
+-      routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the queueAclType is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the queueAclType is empty or null.");
+-    }
+-
+-    // Traverse SubCluster and call checkUserAccessToQueue Api
+-    try {
+-      long startTime = Time.now();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{String.class, String.class, String.class,
+-          HttpServletRequest.class};
+-      Object[] args = new Object[]{queue, username, queueAclType, hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("checkUserAccessToQueue", argsClasses, args);
+-      Map<SubClusterInfo, RMQueueAclInfo> rmQueueAclInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, RMQueueAclInfo.class);
+-      FederationRMQueueAclInfo aclInfo = new FederationRMQueueAclInfo();
+-      rmQueueAclInfoMap.forEach((subClusterInfo, rMQueueAclInfo) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        rMQueueAclInfo.setSubClusterId(subClusterId.getId());
+-        aclInfo.getList().add(rMQueueAclInfo);
+-      });
+-      long stopTime = Time.now();
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          TARGET_WEB_SERVICE);
+-      routerMetrics.succeededCheckUserAccessToQueueRetrieved(stopTime - startTime);
+-      return aclInfo;
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("Get all active sub cluster(s) error.", e);
+-    } catch (YarnException | IOException e) {
+-      routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("checkUserAccessToQueue error.", e);
+-    }
+-
+-    routerMetrics.incrCheckUserAccessToQueueFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), CHECK_USER_ACCESS_TO_QUEUE,
+-        UNKNOWN, TARGET_WEB_SERVICE, "checkUserAccessToQueue error.");
+-    throw new RuntimeException("checkUserAccessToQueue error.");
+-  }
+-
+-  @Override
+-  public AppAttemptInfo getAppAttempt(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-
+-    // Check that the appId/appAttemptId format is accurate
+-    try {
+-      RouterServerUtil.validateApplicationAttemptId(appAttemptId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_ATTEMPT,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    // Call the getAppAttempt method
+-    try {
+-      long startTime = Time.now();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      AppAttemptInfo appAttemptInfo = interceptor.getAppAttempt(req, res, appId, appAttemptId);
+-      if (appAttemptInfo != null) {
+-        long stopTime = Time.now();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_APP_ATTEMPT,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededAppAttemptReportRetrieved(stopTime - startTime);
+-        return appAttemptInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_ATTEMPT,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Unable to getAppAttempt by appId: %s, appAttemptId: %s.", appId, appAttemptId);
+-    } catch (YarnException e) {
+-      routerMetrics.incrAppAttemptReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_ATTEMPT,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "getAppAttempt error, appId: %s, appAttemptId: %s.", appId, appAttemptId);
+-    }
+-
+-    routerMetrics.incrAppAttemptReportFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_APP_ATTEMPT,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getAppAttempt failed.");
+-    throw RouterServerUtil.logAndReturnRunTimeException(
+-        "getAppAttempt failed, appId: %s, appAttemptId: %s.", appId, appAttemptId);
+-  }
+-
+-  @Override
+-  public ContainersInfo getContainers(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-
+-    // Check that the appId/appAttemptId format is accurate
+-    try {
+-      RouterServerUtil.validateApplicationId(appId);
+-      RouterServerUtil.validateApplicationAttemptId(appAttemptId);
+-    } catch (IllegalArgumentException e) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINERS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      throw e;
+-    }
+-
+-    try {
+-      long startTime = clock.getTime();
+-      ContainersInfo containersInfo = new ContainersInfo();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      Class[] argsClasses = new Class[]{
+-          HttpServletRequest.class, HttpServletResponse.class, String.class, String.class};
+-      Object[] args = new Object[]{req, res, appId, appAttemptId};
+-      ClientMethod remoteMethod = new ClientMethod("getContainers", argsClasses, args);
+-      Map<SubClusterInfo, ContainersInfo> containersInfoMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, ContainersInfo.class);
+-      if (containersInfoMap != null && !containersInfoMap.isEmpty()) {
+-        containersInfoMap.values().forEach(containers ->
+-            containersInfo.addAll(containers.getContainers()));
+-      }
+-      if (containersInfo != null) {
+-        long stopTime = clock.getTime();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_CONTAINERS,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededGetContainersRetrieved(stopTime - startTime);
+-        return containersInfo;
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINERS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e, "getContainers error, appId = %s, " +
+-          " appAttemptId = %s, Probably getActiveSubclusters error.", appId, appAttemptId);
+-    } catch (IOException | YarnException e) {
+-      routerMetrics.incrGetContainersFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINERS,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e, "getContainers error, appId = %s, " +
+-          " appAttemptId = %s.", appId, appAttemptId);
+-    }
+-
+-    routerMetrics.incrGetContainersFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINERS,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getContainers failed.");
+-    throw RouterServerUtil.logAndReturnRunTimeException(
+-        "getContainers failed, appId: %s, appAttemptId: %s.", appId, appAttemptId);
+-  }
+-
+-  @Override
+-  public ContainerInfo getContainer(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId,
+-      String containerId) {
+-
+-    // FederationInterceptorREST#getContainer is logically
+-    // the same as FederationClientInterceptor#getContainerReport,
+-    // so use the same Metric.
+-
+-    // Check that the appId/appAttemptId/containerId format is accurate
+-    try {
+-      RouterServerUtil.validateApplicationAttemptId(appAttemptId);
+-      RouterServerUtil.validateContainerId(containerId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    try {
+-      long startTime = Time.now();
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorByAppId(appId);
+-      ContainerInfo containerInfo =
+-          interceptor.getContainer(req, res, appId, appAttemptId, containerId);
+-      if (containerInfo != null) {
+-        long stopTime = Time.now();
+-        routerMetrics.succeededGetContainerReportRetrieved(stopTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_CONTAINER,
+-            TARGET_WEB_SERVICE);
+-        return containerInfo;
+-      }
+-    } catch (IllegalArgumentException e) {
+-      String msg = String.format(
+-          "Unable to get the AppAttempt appId: %s, appAttemptId: %s, containerId: %s.", appId,
+-          appAttemptId, containerId);
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(msg, e);
+-    } catch (YarnException e) {
+-      routerMetrics.incrGetContainerReportFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("getContainer Failed.", e);
+-    }
+-
+-    routerMetrics.incrGetContainerReportFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_CONTAINER,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getContainer Failed.");
+-    throw new RuntimeException("getContainer Failed.");
+-  }
+-
+-  /**
+-   * This method updates the Scheduler configuration, and it is reachable by
+-   * using {@link RMWSConsts#SCHEDULER_CONF}.
+-   *
+-   * @param mutationInfo th information for making scheduler configuration
+-   *        changes (supports adding, removing, or updating a queue, as well
+-   *        as global scheduler conf changes)
+-   * @param hsr the servlet request
+-   * @return Response containing the status code
+-   * @throws AuthorizationException if the user is not authorized to invoke this
+-   *         method
+-   * @throws InterruptedException if interrupted
+-   */
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest hsr) throws AuthorizationException, InterruptedException {
+-
+-    // Make Sure mutationInfo is not null.
+-    if (mutationInfo == null) {
+-      routerMetrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE,
+-          "Parameter error, the schedConfUpdateInfo is empty or null.");
+-      throw new IllegalArgumentException(
+-          "Parameter error, the schedConfUpdateInfo is empty or null.");
+-    }
+-
+-    // In federated mode, we may have a mix of multiple schedulers.
+-    // In order to ensure accurate update scheduler configuration,
+-    // we need users to explicitly set subClusterId.
+-    String pSubClusterId = mutationInfo.getSubClusterId();
+-    if (StringUtils.isBlank(pSubClusterId)) {
+-      routerMetrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE,
+-          "Parameter error, the subClusterId is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, " +
+-          "the subClusterId is empty or null.");
+-    }
+-
+-    // Get the subClusterInfo , then update the scheduler configuration.
+-    try {
+-      long startTime = clock.getTime();
+-      SubClusterInfo subClusterInfo = getActiveSubCluster(pSubClusterId);
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-      Response response = interceptor.updateSchedulerConfiguration(mutationInfo, hsr);
+-      if (response != null) {
+-        long endTime = clock.getTime();
+-        routerMetrics.succeededUpdateSchedulerConfigurationRetrieved(endTime - startTime);
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-            TARGET_WEB_SERVICE);
+-        return Response.status(response.getStatus()).entity(response.getEntity()).build();
+-      }
+-    } catch (NotFoundException e) {
+-      routerMetrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "Get subCluster error. subClusterId = %s", pSubClusterId);
+-    } catch (Exception e) {
+-      routerMetrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException(e,
+-          "UpdateSchedulerConfiguration error. subClusterId = %s", pSubClusterId);
+-    }
+-
+-    routerMetrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), UPDATE_SCHEDULER_CONFIGURATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, "UpdateSchedulerConfiguration Failed.");
+-    throw new RuntimeException("UpdateSchedulerConfiguration error. subClusterId = "
+-        + pSubClusterId);
+-  }
+-
+-  /**
+-   * This method retrieves all the Scheduler configuration, and it is reachable
+-   * by using {@link RMWSConsts#SCHEDULER_CONF}.
+-   *
+-   * @param hsr the servlet request
+-   * @return Response containing the status code
+-   * @throws AuthorizationException if the user is not authorized to invoke this
+-   *      method.
+-   */
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest hsr)
+-      throws AuthorizationException {
+-    try {
+-      long startTime = clock.getTime();
+-      FederationConfInfo federationConfInfo = new FederationConfInfo();
+-      Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-      final HttpServletRequest hsrCopy = clone(hsr);
+-      Class[] argsClasses = new Class[]{HttpServletRequest.class};
+-      Object[] args = new Object[]{hsrCopy};
+-      ClientMethod remoteMethod = new ClientMethod("getSchedulerConfiguration", argsClasses, args);
+-      Map<SubClusterInfo, Response> responseMap =
+-          invokeConcurrent(subClustersActive, remoteMethod, Response.class);
+-      responseMap.forEach((subClusterInfo, response) -> {
+-        SubClusterId subClusterId = subClusterInfo.getSubClusterId();
+-        if (response == null) {
+-          String errorMsg = subClusterId + " Can't getSchedulerConfiguration.";
+-          federationConfInfo.getErrorMsgs().add(errorMsg);
+-        } else if (response.getStatus() == Status.BAD_REQUEST.getStatusCode()) {
+-          String errorMsg = String.valueOf(response.getEntity());
+-          federationConfInfo.getErrorMsgs().add(errorMsg);
+-        } else if (response.getStatus() == Status.OK.getStatusCode()) {
+-          ConfInfo fedConfInfo = (ConfInfo) response.getEntity();
+-          fedConfInfo.setSubClusterId(subClusterId.getId());
+-          federationConfInfo.getList().add(fedConfInfo);
+-        }
+-      });
+-      long endTime = clock.getTime();
+-      routerMetrics.succeededGetSchedulerConfigurationRetrieved(endTime - startTime);
+-      RouterAuditLogger.logSuccess(getUser().getShortUserName(), GET_SCHEDULER_CONFIGURATION,
+-          TARGET_WEB_SERVICE);
+-      return Response.status(Status.OK).entity(federationConfInfo).build();
+-    } catch (NotFoundException e) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      routerMetrics.incrGetSchedulerConfigurationFailedRetrieved();
+-      RouterServerUtil.logAndThrowRunTimeException("get all active sub cluster(s) error.", e);
+-    } catch (Exception e) {
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULER_CONFIGURATION,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      routerMetrics.incrGetSchedulerConfigurationFailedRetrieved();
+-      return Response.status(Status.BAD_REQUEST).entity("getSchedulerConfiguration error.").build();
+-    }
+-
+-    routerMetrics.incrGetSchedulerConfigurationFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), GET_SCHEDULER_CONFIGURATION,
+-        UNKNOWN, TARGET_WEB_SERVICE, "getSchedulerConfiguration Failed.");
+-    throw new RuntimeException("getSchedulerConfiguration Failed.");
+-  }
+-
+-  @Override
+-  public void setNextInterceptor(RESTRequestInterceptor next) {
+-    throw new YarnRuntimeException("setNextInterceptor is being called on "
+-        + "FederationInterceptorREST, which should be the last one "
+-        + "in the chain. Check if the interceptor pipeline configuration "
+-        + "is correct");
+-  }
+-
+-  @Override
+-  public Response signalToContainer(String containerId, String command,
+-      HttpServletRequest req) {
+-
+-    // Check if containerId is empty or null
+-    try {
+-      RouterServerUtil.validateContainerId(containerId);
+-    } catch (IllegalArgumentException e) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      throw e;
+-    }
+-
+-    // Check if command is empty or null
+-    if (command == null || command.isEmpty()) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, "Parameter error, the command is empty or null.");
+-      throw new IllegalArgumentException("Parameter error, the command is empty or null.");
+-    }
+-
+-    try {
+-      long startTime = Time.now();
+-
+-      ContainerId containerIdObj = ContainerId.fromString(containerId);
+-      ApplicationId applicationId = containerIdObj.getApplicationAttemptId().getApplicationId();
+-      SubClusterInfo subClusterInfo = getHomeSubClusterInfoByAppId(applicationId.toString());
+-      DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-          subClusterInfo.getSubClusterId(), subClusterInfo.getRMWebServiceAddress());
+-
+-      Response response = interceptor.signalToContainer(containerId, command, req);
+-      if (response != null) {
+-        long stopTime = Time.now();
+-        RouterAuditLogger.logSuccess(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-            TARGET_WEB_SERVICE);
+-        routerMetrics.succeededSignalToContainerRetrieved(stopTime - startTime);
+-        return response;
+-      }
+-    } catch (YarnException e) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("signalToContainer Failed.", e);
+-    } catch (AuthorizationException e) {
+-      routerMetrics.incrSignalToContainerFailedRetrieved();
+-      RouterAuditLogger.logFailure(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-          UNKNOWN, TARGET_WEB_SERVICE, e.getLocalizedMessage());
+-      RouterServerUtil.logAndThrowRunTimeException("signalToContainer Author Failed.", e);
+-    }
+-
+-    routerMetrics.incrSignalToContainerFailedRetrieved();
+-    RouterAuditLogger.logFailure(getUser().getShortUserName(), SIGNAL_TOCONTAINER,
+-        UNKNOWN, TARGET_WEB_SERVICE, "signalToContainer Failed.");
+-    throw new RuntimeException("signalToContainer Failed.");
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    if (threadpool != null) {
+-      threadpool.shutdown();
+-    }
+-  }
+-
+-  private <R> Map<SubClusterInfo, R> invokeConcurrent(Collection<SubClusterInfo> clusterIds,
+-      ClientMethod request, Class<R> clazz) throws YarnException {
+-
+-    Map<SubClusterInfo, R> results = new HashMap<>();
+-
+-    // If there is a sub-cluster access error,
+-    // we should choose whether to throw exception information according to user configuration.
+-    // Send the requests in parallel.
+-    CompletionService<SubClusterResult<R>> compSvc = new ExecutorCompletionService<>(threadpool);
+-
+-    // This part of the code should be able to expose the accessed Exception information.
+-    // We use Pair to store related information. The left value of the Pair is the response,
+-    // and the right value is the exception.
+-    // If the request is normal, the response is not empty and the exception is empty;
+-    // if the request is abnormal, the response is empty and the exception is not empty.
+-    for (final SubClusterInfo info : clusterIds) {
+-      compSvc.submit(() -> {
+-        DefaultRequestInterceptorREST interceptor = getOrCreateInterceptorForSubCluster(
+-            info.getSubClusterId(), info.getRMWebServiceAddress());
+-        try {
+-          Method method = DefaultRequestInterceptorREST.class.
+-              getMethod(request.getMethodName(), request.getTypes());
+-          Object retObj = method.invoke(interceptor, request.getParams());
+-          R ret = clazz.cast(retObj);
+-          return new SubClusterResult<>(info, ret, null);
+-        } catch (Exception e) {
+-          LOG.error("SubCluster {} failed to call {} method.",
+-              info.getSubClusterId(), request.getMethodName(), e);
+-          return new SubClusterResult<>(info, null, e);
+-        }
+-      });
+-    }
+-
+-    for (int i = 0; i < clusterIds.size(); i++) {
+-      SubClusterInfo subClusterInfo = null;
+-      try {
+-        Future<SubClusterResult<R>> future = compSvc.take();
+-        SubClusterResult<R> result = future.get();
+-        subClusterInfo = result.getSubClusterInfo();
+-
+-        R response = result.getResponse();
+-        if (response != null) {
+-          results.put(subClusterInfo, response);
+-        }
+-
+-        Exception exception = result.getException();
+-        if (exception != null) {
+-          throw exception;
+-        }
+-      } catch (Throwable e) {
+-        String subClusterId = subClusterInfo != null ?
+-            subClusterInfo.getSubClusterId().getId() : "UNKNOWN";
+-        LOG.error("SubCluster {} failed to {} report.", subClusterId, request.getMethodName(), e);
+-        // If allowPartialResult=false, it means that if an exception occurs in a subCluster,
+-        // an exception will be thrown directly.
+-        if (!allowPartialResult) {
+-          throw new YarnException("SubCluster " + subClusterId +
+-              " failed to " + request.getMethodName() + " report.", e);
+-        }
+-      }
+-    }
+-
+-    return results;
+-  }
+-
+-  /**
+-   * get the HomeSubCluster according to ApplicationId.
+-   *
+-   * @param appId applicationId
+-   * @return HomeSubCluster
+-   * @throws YarnException on failure
+-   */
+-  private SubClusterInfo getHomeSubClusterInfoByAppId(String appId)
+-      throws YarnException {
+-
+-    if (StringUtils.isBlank(appId)) {
+-      throw new IllegalArgumentException("applicationId can't null or empty.");
+-    }
+-
+-    try {
+-      ApplicationId applicationId = ApplicationId.fromString(appId);
+-      SubClusterId subClusterId = federationFacade.getApplicationHomeSubCluster(applicationId);
+-      if (subClusterId == null) {
+-        RouterServerUtil.logAndThrowException(null,
+-            "Can't get HomeSubCluster by applicationId %s", applicationId);
+-      }
+-      return federationFacade.getSubCluster(subClusterId);
+-    } catch (IllegalArgumentException e){
+-      throw new IllegalArgumentException(e);
+-    } catch (YarnException e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Get HomeSubClusterInfo by applicationId %s failed.", appId);
+-    }
+-    throw new YarnException("Unable to get subCluster by applicationId = " + appId);
+-  }
+-
+-  /**
+-   * get the HomeSubCluster according to ReservationId.
+-   *
+-   * @param resId reservationId
+-   * @return HomeSubCluster
+-   * @throws YarnException on failure
+-   */
+-  private SubClusterInfo getHomeSubClusterInfoByReservationId(String resId)
+-      throws YarnException {
+-    try {
+-      ReservationId reservationId = ReservationId.parseReservationId(resId);
+-      SubClusterId subClusterId = federationFacade.getReservationHomeSubCluster(reservationId);
+-      if (subClusterId == null) {
+-        RouterServerUtil.logAndThrowException(null,
+-            "Can't get HomeSubCluster by reservationId %s", resId);
+-      }
+-      return federationFacade.getSubCluster(subClusterId);
+-    } catch (YarnException | IOException e) {
+-      RouterServerUtil.logAndThrowException(e,
+-          "Get HomeSubClusterInfo by reservationId %s failed.", resId);
+-    }
+-    throw new YarnException("Unable to get subCluster by reservationId = " + resId);
+-  }
+-
+-  @VisibleForTesting
+-  public LRUCacheHashMap<RouterAppInfoCacheKey, AppsInfo> getAppInfosCaches() {
+-    return appInfosCaches;
+-  }
+-
+-  @VisibleForTesting
+-  public Map<SubClusterId, DefaultRequestInterceptorREST> getInterceptors() {
+-    return interceptors;
+-  }
+-
+-  public void setAllowPartialResult(boolean allowPartialResult) {
+-    this.allowPartialResult = allowPartialResult;
+-  }
+-
+-  @VisibleForTesting
+-  public Map<SubClusterInfo, NodesInfo> invokeConcurrentGetNodeLabel()
+-      throws IOException, YarnException {
+-    Collection<SubClusterInfo> subClustersActive = federationFacade.getActiveSubClusters();
+-    Class[] argsClasses = new Class[]{String.class};
+-    Object[] args = new Object[]{null};
+-    ClientMethod remoteMethod = new ClientMethod("getNodes", argsClasses, args);
+-    return invokeConcurrent(subClustersActive, remoteMethod, NodesInfo.class);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationPage.java
+deleted file mode 100644
+index 1a1ae400121..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/FederationPage.java
++++ /dev/null
+@@ -1,60 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-
+-/**
+- * Renders a block for the applications with metrics information.
+- */
+-class FederationPage extends RouterView {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-    setTitle("About The YARN Federation");
+-    set(DATATABLES_ID, "rms");
+-    set("ui.div.id", "div_id");
+-    set(initID(DATATABLES, "rms"), rmsTableInit());
+-    setTableStyles(html, "rms", ".healthStatus {width:10em}",
+-        ".healthReport {width:10em}");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return FederationBlock.class;
+-  }
+-
+-  private String rmsTableInit() {
+-    StringBuilder builder = tableInit().append(", aoColumnDefs: [");
+-    builder
+-        .append("{'sName':'State', 'sType':'string', 'bSearchable':false, 'aTargets':[1]},")
+-        .append("{'sName':'LastStartTime', 'sType':'string', 'bSearchable':false, 'aTargets':[2]},")
+-        .append("{'sName':'lastHeartBeat', 'sType':'string', 'bSearchable':false, 'aTargets':[3]},")
+-        .append("{'sName':'resource', 'sType':'string', 'bSearchable':false, 'aTargets':[4]},")
+-        .append("{'sName':'nodes', 'sType':'string', 'bSearchable':false, 'aTargets':[5]}")
+-        .append("]}");
+-    return builder.toString();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/HTTPMethods.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/HTTPMethods.java
+deleted file mode 100644
+index 45056ca701b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/HTTPMethods.java
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-/**
+- * HTTP verbs.
+- **/
+-public enum HTTPMethods {
+-
+-  /* to retrieve resource representation/information */
+-  GET,
+-  /* to update existing resource */
+-  PUT,
+-  /* to delete resources */
+-  DELETE,
+-  /* to create new subordinate resources */
+-  POST
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/MetricsOverviewTable.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/MetricsOverviewTable.java
+deleted file mode 100644
+index aeb953915af..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/MetricsOverviewTable.java
++++ /dev/null
+@@ -1,360 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import com.google.inject.Inject;
+-import com.sun.jersey.api.client.Client;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerOverviewInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.RouterClusterMetrics;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.RouterSchedulerMetrics;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-import java.io.IOException;
+-import java.util.Collection;
+-import java.util.List;
+-
+-public class MetricsOverviewTable extends RouterBlock {
+-
+-  private final Router router;
+-
+-  @Inject
+-  MetricsOverviewTable(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-    // Initialize page styles
+-    html.style(".metrics {margin-bottom:5px}");
+-
+-    // get routerClusterMetrics Info
+-    ClusterMetricsInfo routerClusterMetricsInfo = getRouterClusterMetricsInfo();
+-    RouterClusterMetrics routerClusterMetrics = new RouterClusterMetrics(routerClusterMetricsInfo);
+-
+-    // metrics div
+-    Hamlet.DIV<Hamlet> div = html.div().$class("metrics");
+-    try {
+-      initFederationClusterAppsMetrics(div, routerClusterMetrics);
+-      initFederationClusterNodesMetrics(div, routerClusterMetrics);
+-      List<SubClusterInfo> subClusters = getSubClusterInfoList();
+-      initFederationClusterSchedulersMetrics(div, routerClusterMetrics, subClusters);
+-    } catch (Exception e) {
+-      LOG.error("MetricsOverviewTable init error.", e);
+-    }
+-    div.__();
+-  }
+-
+-  protected void render(Block html, String subClusterId) {
+-    // Initialize page styles
+-    html.style(".metrics {margin-bottom:5px}");
+-
+-    // get subClusterId ClusterMetrics Info
+-    ClusterMetricsInfo clusterMetricsInfo =
+-        getClusterMetricsInfoBySubClusterId(subClusterId);
+-    RouterClusterMetrics routerClusterMetrics =
+-        new RouterClusterMetrics(clusterMetricsInfo, subClusterId);
+-
+-    // metrics div
+-    Hamlet.DIV<Hamlet> div = html.div().$class("metrics");
+-    try {
+-      initFederationClusterAppsMetrics(div, routerClusterMetrics);
+-      initFederationClusterNodesMetrics(div, routerClusterMetrics);
+-      Collection<SubClusterInfo> subClusters = getSubClusterInfoList(subClusterId);
+-      initFederationClusterSchedulersMetrics(div, routerClusterMetrics, subClusters);
+-    } catch (Exception e) {
+-      LOG.error("MetricsOverviewTable init error.", e);
+-    }
+-    div.__();
+-  }
+-
+-  /**
+-   * Init Federation Cluster Apps Metrics.
+-   * Contains App information, resource usage information.
+-   *
+-   * @param div data display div.
+-   * @param metrics data metric information.
+-   */
+-  private void initFederationClusterAppsMetrics(Hamlet.DIV<Hamlet> div,
+-      RouterClusterMetrics metrics) {
+-    div.h3(metrics.getWebPageTitlePrefix() + " Cluster Metrics").
+-        table("#metricsoverview").
+-        thead().$class("ui-widget-header").
+-        // Initialize table header information
+-        tr().
+-        th().$class("ui-state-default").__("Apps Submitted").__().
+-        th().$class("ui-state-default").__("Apps Pending").__().
+-        th().$class("ui-state-default").__("Apps Running").__().
+-        th().$class("ui-state-default").__("Apps Completed").__().
+-        th().$class("ui-state-default").__("Containers Running").__().
+-        th().$class("ui-state-default").__("Used Resources").__().
+-        th().$class("ui-state-default").__("Total Resources").__().
+-        th().$class("ui-state-default").__("Reserved Resources").__().
+-        th().$class("ui-state-default").__("Physical Mem Used %").__().
+-        th().$class("ui-state-default").__("Physical VCores Used %").__().
+-        __().
+-        __().
+-        // Initialize table data information
+-        tbody().$class("ui-widget-content").
+-        tr().
+-        td(metrics.getAppsSubmitted()).
+-        td(metrics.getAppsPending()).
+-        td(String.valueOf(metrics.getAppsRunning())).
+-        td(metrics.getAppsCompleted()).
+-        td(metrics.getAllocatedContainers()).
+-        td(metrics.getUsedResources()).
+-        td(metrics.getTotalResources()).
+-        td(metrics.getReservedResources()).
+-        td(metrics.getUtilizedMBPercent()).
+-        td(metrics.getUtilizedVirtualCoresPercent()).
+-        __().
+-        __().__();
+-  }
+-
+-  /**
+-   * Init Federation Cluster Nodes Metrics.
+-   *
+-   * @param div data display div.
+-   * @param metrics data metric information.
+-   */
+-  private void initFederationClusterNodesMetrics(Hamlet.DIV<Hamlet> div,
+-      RouterClusterMetrics metrics) {
+-    div.h3(metrics.getWebPageTitlePrefix() + " Cluster Nodes Metrics").
+-        table("#nodemetricsoverview").
+-        thead().$class("ui-widget-header").
+-        // Initialize table header information
+-        tr().
+-        th().$class("ui-state-default").__("Active Nodes").__().
+-        th().$class("ui-state-default").__("Decommissioning Nodes").__().
+-        th().$class("ui-state-default").__("Decommissioned Nodes").__().
+-        th().$class("ui-state-default").__("Lost Nodes").__().
+-        th().$class("ui-state-default").__("Unhealthy Nodes").__().
+-        th().$class("ui-state-default").__("Rebooted Nodes").__().
+-        th().$class("ui-state-default").__("Shutdown Nodes").__().
+-        __().
+-        __().
+-        // Initialize table data information
+-        tbody().$class("ui-widget-content").
+-        tr().
+-        td().a(url("nodes"), String.valueOf(metrics.getActiveNodes())).__().
+-        td().a(url("nodes/router/?node.state=decommissioning"),
+-            String.valueOf(metrics.getDecommissioningNodes())).__().
+-        td().a(url("nodes/router/?node.state=decommissioned"),
+-            String.valueOf(metrics.getDecommissionedNodes())).__().
+-        td().a(url("nodes/router/?node.state=lost"),
+-            String.valueOf(metrics.getLostNodes())).__().
+-        td().a(url("nodes/router/?node.state=unhealthy"),
+-            String.valueOf(metrics.getUnhealthyNodes())).__().
+-        td().a(url("nodes/router/?node.state=rebooted"),
+-            String.valueOf(metrics.getRebootedNodes())).__().
+-        td().a(url("nodes/router/?node.state=shutdown"),
+-            String.valueOf(metrics.getShutdownNodes())).__().
+-        __().
+-        __().__();
+-  }
+-
+-  /**
+-   * Init Federation Cluster SchedulersMetrics.
+-   *
+-   * @param div data display div.
+-   * @param metrics data metric information.
+-   * @param subclusters active subcluster List.
+-   * @throws YarnException yarn error.
+-   * @throws IOException io error.
+-   * @throws InterruptedException interrupt error.
+-   */
+-  private void initFederationClusterSchedulersMetrics(Hamlet.DIV<Hamlet> div,
+-      RouterClusterMetrics metrics, Collection<SubClusterInfo> subclusters)
+-      throws YarnException, IOException, InterruptedException {
+-
+-    Hamlet.TBODY<Hamlet.TABLE<Hamlet.DIV<Hamlet>>> fsMetricsScheduleTr =
+-        div.h3(metrics.getWebPageTitlePrefix() + " Scheduler Metrics").
+-        table("#schedulermetricsoverview").
+-        thead().$class("ui-widget-header").
+-        tr().
+-        th().$class("ui-state-default").__("SubCluster").__().
+-        th().$class("ui-state-default").__("Scheduler Type").__().
+-        th().$class("ui-state-default").__("Scheduling Resource Type").__().
+-        th().$class("ui-state-default").__("Minimum Allocation").__().
+-        th().$class("ui-state-default").__("Maximum Allocation").__().
+-        th().$class("ui-state-default").__("Maximum Cluster Application Priority").__().
+-        th().$class("ui-state-default").__("Scheduler Busy %").__().
+-        th().$class("ui-state-default").__("RM Dispatcher EventQueue Size").__().
+-        th().$class("ui-state-default")
+-        .__("Scheduler Dispatcher EventQueue Size").__().
+-        __().
+-        __().
+-        tbody().$class("ui-widget-content");
+-
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // If Federation mode is not enabled or there is currently no SubCluster available,
+-    // each column in the list should be displayed as N/A
+-    if (!isEnabled) {
+-      initLocalClusterOverViewTable(fsMetricsScheduleTr);
+-    } else if (subclusters != null && !subclusters.isEmpty()) {
+-      initSubClusterOverViewTable(metrics, fsMetricsScheduleTr, subclusters);
+-    } else {
+-      showRouterSchedulerMetricsData(UNAVAILABLE, fsMetricsScheduleTr);
+-    }
+-
+-    fsMetricsScheduleTr.__().__();
+-  }
+-
+-  /**
+-   * We display Scheduler information for local cluster.
+-   *
+-   * @param fsMetricsScheduleTr MetricsScheduleTr.
+-   */
+-  private void initLocalClusterOverViewTable(
+-      Hamlet.TBODY<Hamlet.TABLE<Hamlet.DIV<Hamlet>>> fsMetricsScheduleTr) {
+-    // configuration
+-    Configuration config = this.router.getConfig();
+-    Client client = RouterWebServiceUtil.createJerseyClient(config);
+-    String webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(config);
+-
+-    // Get the name of the local cluster.
+-    String localClusterName = config.get(YarnConfiguration.RM_CLUSTER_ID, UNAVAILABLE);
+-    SchedulerOverviewInfo schedulerOverviewInfo =
+-        getSchedulerOverviewInfo(webAppAddress, config, client);
+-    if (schedulerOverviewInfo != null) {
+-      RouterSchedulerMetrics rsMetrics =
+-          new RouterSchedulerMetrics(localClusterName, schedulerOverviewInfo);
+-      // Basic information
+-      showRouterSchedulerMetricsData(rsMetrics, fsMetricsScheduleTr);
+-    } else {
+-      showRouterSchedulerMetricsData(localClusterName, fsMetricsScheduleTr);
+-    }
+-  }
+-
+-  /**
+-   * We display Scheduler information for multiple subClusters.
+-   *
+-   * @param metrics RouterClusterMetrics.
+-   * @param fsMetricsScheduleTr MetricsScheduleTr.
+-   * @param subClusters subCluster list.
+-   */
+-  private void initSubClusterOverViewTable(RouterClusterMetrics metrics,
+-      Hamlet.TBODY<Hamlet.TABLE<Hamlet.DIV<Hamlet>>> fsMetricsScheduleTr,
+-      Collection<SubClusterInfo> subClusters) {
+-
+-    // configuration
+-    Configuration config = this.router.getConfig();
+-
+-    Client client = RouterWebServiceUtil.createJerseyClient(config);
+-
+-    // Traverse all SubClusters to get cluster information.
+-    for (SubClusterInfo subcluster : subClusters) {
+-      // We need to make sure subCluster is not null
+-      if (subcluster != null && subcluster.getSubClusterId() != null) {
+-        // Call the RM interface to obtain schedule information
+-        String webAppAddress =  WebAppUtils.getHttpSchemePrefix(config) +
+-            subcluster.getRMWebServiceAddress();
+-        SchedulerOverviewInfo schedulerOverviewInfo =
+-            getSchedulerOverviewInfo(webAppAddress, config, client);
+-
+-        // If schedulerOverviewInfo is not null,
+-        // We will display information from rsMetrics, otherwise we will not display information.
+-        if (schedulerOverviewInfo != null) {
+-          RouterSchedulerMetrics rsMetrics =
+-              new RouterSchedulerMetrics(subcluster, metrics, schedulerOverviewInfo);
+-          // Basic information
+-          showRouterSchedulerMetricsData(rsMetrics, fsMetricsScheduleTr);
+-        }
+-      }
+-    }
+-
+-    client.destroy();
+-  }
+-
+-  /**
+-   * Get SchedulerOverview information based on webAppAddress.
+-   *
+-   * @param webAppAddress webAppAddress.
+-   * @param config configuration.
+-   * @param client jersey Client.
+-   * @return SchedulerOverviewInfo.
+-   */
+-  private SchedulerOverviewInfo getSchedulerOverviewInfo(String webAppAddress,
+-      Configuration config, Client client) {
+-    try {
+-      SchedulerOverviewInfo schedulerOverviewInfo = RouterWebServiceUtil
+-          .genericForward(webAppAddress, null, SchedulerOverviewInfo.class, HTTPMethods.GET,
+-          RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.SCHEDULER_OVERVIEW, null, null,
+-           config, client);
+-      return schedulerOverviewInfo;
+-    } catch (Exception e) {
+-      LOG.error("get SchedulerOverviewInfo from webAppAddress = {} error.",
+-          webAppAddress, e);
+-      return null;
+-    }
+-  }
+-
+-  /**
+-   * Show RouterSchedulerMetricsData.
+-   *
+-   * @param rsMetrics routerSchedulerMetrics.
+-   * @param fsMetricsScheduleTr MetricsScheduleTr.
+-   */
+-  private void showRouterSchedulerMetricsData(RouterSchedulerMetrics rsMetrics,
+-      Hamlet.TBODY<Hamlet.TABLE<Hamlet.DIV<Hamlet>>> fsMetricsScheduleTr) {
+-    // Basic information
+-    fsMetricsScheduleTr.tr().
+-        td(rsMetrics.getSubCluster()).
+-        td(rsMetrics.getSchedulerType()).
+-        td(rsMetrics.getSchedulingResourceType()).
+-        td(rsMetrics.getMinimumAllocation()).
+-        td(rsMetrics.getMaximumAllocation()).
+-        td(rsMetrics.getApplicationPriority()).
+-        td(rsMetrics.getSchedulerBusy()).
+-        td(rsMetrics.getRmDispatcherEventQueueSize()).
+-        td(rsMetrics.getSchedulerDispatcherEventQueueSize()).
+-        __();
+-  }
+-
+-  /**
+-   * Show RouterSchedulerMetricsData.
+-   *
+-   * @param subClusterId subClusterId.
+-   * @param fsMetricsScheduleTr MetricsScheduleTr.
+-   */
+-  private void showRouterSchedulerMetricsData(String subClusterId,
+-      Hamlet.TBODY<Hamlet.TABLE<Hamlet.DIV<Hamlet>>> fsMetricsScheduleTr) {
+-    String subCluster = StringUtils.isNotBlank(subClusterId) ? subClusterId : UNAVAILABLE;
+-    fsMetricsScheduleTr.tr().
+-        td(subCluster).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE).
+-        td(UNAVAILABLE)
+-        .__();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NavBlock.java
+deleted file mode 100644
+index aa04096688f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NavBlock.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import com.google.inject.Inject;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.webapp.WebPageUtils;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-
+-import java.util.List;
+-/**
+- * Navigation block for the Router Web UI.
+- */
+-public class NavBlock extends RouterBlock {
+-
+-  private Router router;
+-
+-  @Inject
+-  public NavBlock(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  public void render(Block html) {
+-
+-    String federationText = isYarnFederationEnabled() ? "Federation" : "LocalCluster";
+-
+-    Hamlet.UL<Hamlet.DIV<Hamlet>> mainList = html.div("#nav").
+-        h3("Cluster").
+-        ul().
+-        li().a(url(""), "About").__().
+-        li().a(url("federation"), federationText).__();
+-
+-    List<String> subClusterIds = getActiveSubClusterIds();
+-
+-    // ### nodes info
+-    initNodesMenu(mainList, subClusterIds);
+-
+-    // ### nodelabels info
+-    initNodeLabelsMenu(mainList, subClusterIds);
+-
+-    // ### applications info
+-    initApplicationsMenu(mainList, subClusterIds);
+-
+-    // ### tools
+-    Hamlet.DIV<Hamlet> sectionBefore = mainList.__();
+-    Configuration conf = new Configuration();
+-    Hamlet.UL<Hamlet.DIV<Hamlet>> tools = WebPageUtils.appendToolSection(sectionBefore, conf);
+-
+-    if (tools == null) {
+-      return;
+-    }
+-
+-    tools.__().__();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsBlock.java
+deleted file mode 100644
+index 28bc49ed8cc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsBlock.java
++++ /dev/null
+@@ -1,178 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import com.google.inject.Inject;
+-import com.sun.jersey.api.client.Client;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.PartitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.YarnWebParams;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_SC;
+-
+-/**
+- * Navigation block for the Router Web UI.
+- */
+-public class NodeLabelsBlock extends RouterBlock {
+-
+-  private Router router;
+-
+-  @Inject
+-  public NodeLabelsBlock(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // Get subClusterName
+-    String subClusterName = $(NODE_SC);
+-
+-    NodeLabelsInfo nodeLabelsInfo = null;
+-    if (StringUtils.isNotEmpty(subClusterName)) {
+-      nodeLabelsInfo = getSubClusterNodeLabelsInfo(subClusterName);
+-    } else {
+-      nodeLabelsInfo = getYarnFederationNodeLabelsInfo(isEnabled);
+-    }
+-
+-    initYarnFederationNodeLabelsOfCluster(nodeLabelsInfo, html);
+-  }
+-
+-  /**
+-   * Get NodeLabels Info based on SubCluster.
+-   * @return NodeLabelsInfo.
+-   */
+-  private NodeLabelsInfo getSubClusterNodeLabelsInfo(String subCluster) {
+-    try {
+-      SubClusterId subClusterId = SubClusterId.newInstance(subCluster);
+-      FederationStateStoreFacade facade =
+-          FederationStateStoreFacade.getInstance(router.getConfig());
+-      SubClusterInfo subClusterInfo = facade.getSubCluster(subClusterId);
+-
+-      if (subClusterInfo != null) {
+-        // Prepare webAddress
+-        String webAddress = subClusterInfo.getRMWebServiceAddress();
+-        String herfWebAppAddress = "";
+-        if (webAddress != null && !webAddress.isEmpty()) {
+-          herfWebAppAddress =
+-              WebAppUtils.getHttpSchemePrefix(this.router.getConfig()) + webAddress;
+-          return getSubClusterNodeLabelsByWebAddress(herfWebAppAddress);
+-        }
+-      }
+-    } catch (Exception e) {
+-      LOG.error("get NodeLabelsInfo From SubCluster = {} error.", subCluster, e);
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * We will obtain the NodeLabel information of multiple sub-clusters.
+-   *
+-   * If Federation mode is enabled, get the NodeLabels of multiple sub-clusters,
+-   * otherwise get the NodeLabels of the local cluster.
+-   *
+-   * @param isEnabled Whether to enable Federation mode,
+-   * true, Federation mode; false, Non-Federation mode.
+-   *
+-   * @return NodeLabelsInfo.
+-   */
+-  private NodeLabelsInfo getYarnFederationNodeLabelsInfo(boolean isEnabled) {
+-    Configuration config = this.router.getConfig();
+-    String webAddress;
+-    if (isEnabled) {
+-      webAddress = WebAppUtils.getRouterWebAppURLWithScheme(config);
+-    } else {
+-      webAddress = WebAppUtils.getRMWebAppURLWithScheme(config);
+-    }
+-    return getSubClusterNodeLabelsByWebAddress(webAddress);
+-  }
+-
+-  /**
+-   * Get NodeLabels based on WebAddress.
+-   *
+-   * @param webAddress RM WebAddress.
+-   * @return NodeLabelsInfo.
+-   */
+-  private NodeLabelsInfo getSubClusterNodeLabelsByWebAddress(String webAddress) {
+-    Configuration conf = this.router.getConfig();
+-    Client client = RouterWebServiceUtil.createJerseyClient(conf);
+-    NodeLabelsInfo nodes = RouterWebServiceUtil
+-        .genericForward(webAddress, null, NodeLabelsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.GET_RM_NODE_LABELS, null, null, conf,
+-        client);
+-    client.destroy();
+-    return nodes;
+-  }
+-
+-  /**
+-   * Initialize the Router page based on NodeLabels.
+-   *
+-   * @param nodeLabelsInfo NodeLabelsInfo.
+-   * @param html html Block.
+-   */
+-  private void initYarnFederationNodeLabelsOfCluster(NodeLabelsInfo nodeLabelsInfo, Block html) {
+-
+-    Hamlet.TBODY<Hamlet.TABLE<Hamlet>> tbody = html.table("#nodelabels").
+-        thead().
+-        tr().
+-        th(".name", "Label Name").
+-        th(".type", "Label Type").
+-        th(".numOfActiveNMs", "Num Of Active NMs").
+-        th(".totalResource", "Total Resource").
+-        __().__().
+-        tbody();
+-
+-    if (nodeLabelsInfo != null) {
+-      for (NodeLabelInfo info : nodeLabelsInfo.getNodeLabelsInfo()) {
+-        Hamlet.TR<Hamlet.TBODY<Hamlet.TABLE<Hamlet>>> row =
+-            tbody.tr().td(info.getName().isEmpty() ?
+-            NodeLabel.DEFAULT_NODE_LABEL_PARTITION : info.getName());
+-        String type = (info.getExclusivity()) ? "Exclusive Partition" : "Non Exclusive Partition";
+-        row = row.td(type);
+-        int nActiveNMs = info.getActiveNMs();
+-        if (nActiveNMs > 0) {
+-          row = row.td().a(url("nodes",
+-              "?" + YarnWebParams.NODE_LABEL + "=" + info.getName()), String.valueOf(nActiveNMs))
+-              .__();
+-        } else {
+-          row = row.td(String.valueOf(nActiveNMs));
+-        }
+-
+-        PartitionInfo partitionInfo = info.getPartitionInfo();
+-        ResourceInfo available = partitionInfo.getResourceAvailable();
+-        row.td(available.toFormattedString()).__();
+-      }
+-    }
+-
+-    tbody.__().__();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsPage.java
+deleted file mode 100644
+index 5ab462ee0f1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodeLabelsPage.java
++++ /dev/null
+@@ -1,56 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.RouterWebServiceUtil.generateWebTitle;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_SC;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_LABEL;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
+-
+-/**
+- * Renders a block for the nodelabels with metrics information.
+- */
+-public class NodeLabelsPage extends RouterView {
+-
+-  @Override
+-  protected void preHead(Hamlet.HTML<__> html) {
+-    commonPreHead(html);
+-    String type = $(NODE_SC);
+-    String nodeLabel = $(NODE_LABEL);
+-    String title = "Node labels of the cluster";
+-
+-    if (nodeLabel != null && !nodeLabel.isEmpty()) {
+-      title = generateWebTitle(title, nodeLabel);
+-    } else if (type != null && !type.isEmpty()) {
+-      title = generateWebTitle(title, type);
+-    }
+-
+-    setTitle(title);
+-    set(DATATABLES_ID, "nodelabels");
+-    setTableStyles(html, "nodelabels", ".healthStatus {width:10em}", ".healthReport {width:10em}");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return NodeLabelsBlock.class;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesBlock.java
+deleted file mode 100644
+index 4544ed4ed44..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesBlock.java
++++ /dev/null
+@@ -1,206 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import com.sun.jersey.api.client.Client;
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-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.TR;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-
+-import com.google.inject.Inject;
+-
+-import java.util.Date;
+-
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_SC;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_LABEL;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_STATE;
+-
+-/**
+- * Nodes block for the Router Web UI.
+- */
+-public class NodesBlock extends RouterBlock {
+-
+-  private final Router router;
+-
+-  @Inject
+-  NodesBlock(Router router, ViewContext ctx) {
+-    super(router, ctx);
+-    this.router = router;
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-
+-    boolean isEnabled = isYarnFederationEnabled();
+-
+-    // Get subClusterName
+-    String subClusterName = $(NODE_SC);
+-    String state = $(NODE_STATE);
+-    String nodeLabel = $(NODE_LABEL);
+-
+-    // We will try to get the subClusterName.
+-    // If the subClusterName is not empty,
+-    // it means that we need to get the Node list of a subCluster.
+-    NodesInfo nodesInfo;
+-    if (subClusterName != null && !subClusterName.isEmpty() &&
+-        !ROUTER.equalsIgnoreCase(subClusterName)) {
+-      initSubClusterMetricsOverviewTable(html, subClusterName);
+-      nodesInfo = getSubClusterNodesInfo(subClusterName);
+-    } else {
+-      // Metrics Overview Table
+-      html.__(MetricsOverviewTable.class);
+-      nodesInfo = getYarnFederationNodesInfo(isEnabled);
+-    }
+-
+-    // Initialize NodeInfo List
+-    initYarnFederationNodesOfCluster(nodesInfo, html, state, nodeLabel);
+-  }
+-
+-  private NodesInfo getYarnFederationNodesInfo(boolean isEnabled) {
+-    Configuration config = this.router.getConfig();
+-    String webAddress;
+-    if (isEnabled) {
+-      webAddress = WebAppUtils.getRouterWebAppURLWithScheme(this.router.getConfig());
+-    } else {
+-      webAddress = WebAppUtils.getRMWebAppURLWithScheme(config);
+-    }
+-    return getSubClusterNodesInfoByWebAddress(webAddress);
+-  }
+-
+-  private NodesInfo getSubClusterNodesInfo(String subCluster) {
+-    try {
+-      SubClusterId subClusterId = SubClusterId.newInstance(subCluster);
+-      FederationStateStoreFacade facade =
+-          FederationStateStoreFacade.getInstance(this.router.getConfig());
+-      SubClusterInfo subClusterInfo = facade.getSubCluster(subClusterId);
+-
+-      if (subClusterInfo != null) {
+-        // Prepare webAddress
+-        String webAddress = subClusterInfo.getRMWebServiceAddress();
+-        String herfWebAppAddress;
+-        if (webAddress != null && !webAddress.isEmpty()) {
+-          herfWebAppAddress =
+-              WebAppUtils.getHttpSchemePrefix(this.router.getConfig()) + webAddress;
+-          return getSubClusterNodesInfoByWebAddress(herfWebAppAddress);
+-        }
+-      }
+-    } catch (Exception e) {
+-      LOG.error("get NodesInfo From SubCluster = {} error.", subCluster, e);
+-    }
+-    return null;
+-  }
+-
+-  private NodesInfo getSubClusterNodesInfoByWebAddress(String webAddress) {
+-    Configuration conf = this.router.getConfig();
+-    Client client = RouterWebServiceUtil.createJerseyClient(conf);
+-    NodesInfo nodes = RouterWebServiceUtil
+-        .genericForward(webAddress, null, NodesInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.NODES, null, null, conf,
+-        client);
+-    client.destroy();
+-    return nodes;
+-  }
+-
+-  private void initYarnFederationNodesOfCluster(NodesInfo nodesInfo, Block html,
+-      String filterState, String filterLabel) {
+-    TBODY<TABLE<Hamlet>> tbody = html.table("#nodes").thead().tr()
+-        .th(".nodelabels", "Node Labels")
+-        .th(".rack", "Rack")
+-        .th(".state", "Node State")
+-        .th(".nodeaddress", "Node Address")
+-        .th(".nodehttpaddress", "Node HTTP Address")
+-        .th(".lastHealthUpdate", "Last health-update")
+-        .th(".healthReport", "Health-report")
+-        .th(".containers", "Containers")
+-        .th(".mem", "Mem Used")
+-        .th(".mem", "Mem Avail")
+-        .th(".vcores", "VCores Used")
+-        .th(".vcores", "VCores Avail")
+-        .th(".nodeManagerVersion", "Version")
+-        .__().__().tbody();
+-
+-    if (nodesInfo != null && CollectionUtils.isNotEmpty(nodesInfo.getNodes())) {
+-      for (NodeInfo info : nodesInfo.getNodes()) {
+-        if (filterState != null && !filterState.isEmpty() && !filterState.equals(info.getState())) {
+-          continue;
+-        }
+-
+-        // Besides state, we need to filter label as well.
+-        if (!filterLabel.equals(RMNodeLabelsManager.ANY)) {
+-          if (filterLabel.isEmpty()) {
+-            // Empty label filter means only shows nodes without label
+-            if (!info.getNodeLabels().isEmpty()) {
+-              continue;
+-            }
+-          } else if (!info.getNodeLabels().contains(filterLabel)) {
+-            // Only nodes have given label can show on web page.
+-            continue;
+-          }
+-        }
+-
+-        int usedMemory = (int) info.getUsedMemory();
+-        int availableMemory = (int) info.getAvailableMemory();
+-        TR<TBODY<TABLE<Hamlet>>> row = tbody.tr();
+-        row.td().__(StringUtils.join(",", info.getNodeLabels())).__();
+-        row.td().__(info.getRack()).__();
+-        row.td().__(info.getState()).__();
+-        row.td().__(info.getNodeId()).__();
+-        boolean isInactive = false;
+-        if (isInactive) {
+-          row.td().__(UNAVAILABLE).__();
+-        } else {
+-          String httpAddress = info.getNodeHTTPAddress();
+-          String herfWebAppAddress = "";
+-          if (httpAddress != null && !httpAddress.isEmpty()) {
+-            herfWebAppAddress =
+-                WebAppUtils.getHttpSchemePrefix(this.router.getConfig()) + httpAddress;
+-          }
+-          row.td().a(herfWebAppAddress, httpAddress).__();
+-        }
+-
+-        row.td().br().$title(String.valueOf(info.getLastHealthUpdate())).__()
+-            .__(new Date(info.getLastHealthUpdate())).__()
+-            .td(info.getHealthReport())
+-            .td(String.valueOf(info.getNumContainers())).td().br()
+-            .$title(String.valueOf(usedMemory)).__()
+-            .__(StringUtils.byteDesc(usedMemory * BYTES_IN_MB)).__().td().br()
+-            .$title(String.valueOf(availableMemory)).__()
+-            .__(StringUtils.byteDesc(availableMemory * BYTES_IN_MB)).__()
+-            .td(String.valueOf(info.getUsedVirtualCores()))
+-            .td(String.valueOf(info.getAvailableVirtualCores()))
+-            .td(info.getVersion()).__();
+-      }
+-    }
+-
+-    tbody.__().__();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesPage.java
+deleted file mode 100644
+index 386e540b7d6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/NodesPage.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.RouterWebServiceUtil.generateWebTitle;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_SC;
+-import static org.apache.hadoop.yarn.webapp.YarnWebParams.NODE_STATE;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.tableInit;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-
+-class NodesPage extends RouterView {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-    String type = $(NODE_SC);
+-    String state = $(NODE_STATE);
+-    String title = "Nodes of the cluster";
+-    if (state != null && !state.isEmpty()) {
+-      title = generateWebTitle(title, state);
+-    } else if (type != null && !type.isEmpty()) {
+-      title = generateWebTitle(title, type);
+-    }
+-    setTitle(title);
+-    set(DATATABLES_ID, "nodes");
+-    set(initID(DATATABLES, "nodes"), nodesTableInit());
+-    setTableStyles(html, "nodes", ".healthStatus {width:10em}",
+-        ".healthReport {width:10em}");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return NodesBlock.class;
+-  }
+-
+-  private String nodesTableInit() {
+-    StringBuilder b = tableInit().append(", aoColumnDefs: [");
+-    b.append("{'bSearchable': false, 'aTargets': [ 7 ]}")
+-        .append(", {'sType': 'title-numeric', 'bSearchable': false, "
+-            + "'aTargets': [ 2, 3, 4, 5, 6 ] }")
+-        .append(", {'sType': 'title-numeric', 'aTargets': [ 5 ]}")
+-        .append("]}");
+-    return b.toString();
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RESTRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RESTRequestInterceptor.java
+deleted file mode 100644
+index 2724cdd5ad2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RESTRequestInterceptor.java
++++ /dev/null
+@@ -1,140 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServiceProtocol;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.webapp.WebServices;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-
+-/**
+- * Defines the contract to be implemented by the request interceptor classes,
+- * that can be used to intercept and inspect messages sent from the client to
+- * the resource manager server.
+- *
+- * This class includes 4 methods getAppAttempts, getAppAttempt, getContainers
+- * and getContainer that belong to {@link WebServices}. They are in this class
+- * to make sure that RouterWebServices implements the same REST methods of
+- * {@code RMWebServices}.
+- */
+-public interface RESTRequestInterceptor
+-    extends RMWebServiceProtocol, Configurable {
+-
+-  /**
+-   * This method is called for initializing the interceptor. This is guaranteed
+-   * to be called only once in the lifetime of this instance.
+-   *
+-   * @param user the name of the client
+-   */
+-  void init(String user);
+-
+-  /**
+-   * This method is called to release the resources held by the interceptor.
+-   * This will be called when the application pipeline is being destroyed. The
+-   * concrete implementations should dispose the resources and forward the
+-   * request to the next interceptor, if any.
+-   */
+-  void shutdown();
+-
+-  /**
+-   * Sets the next interceptor in the pipeline. The concrete implementation of
+-   * this interface should always pass the request to the nextInterceptor after
+-   * inspecting the message. The last interceptor in the chain is responsible to
+-   * send the messages to the resource manager service and so the last
+-   * interceptor will not receive this method call.
+-   *
+-   * @param nextInterceptor the RESTRequestInterceptor to set in the pipeline
+-   */
+-  void setNextInterceptor(RESTRequestInterceptor nextInterceptor);
+-
+-  /**
+-   * Returns the next interceptor in the chain.
+-   *
+-   * @return the next interceptor in the chain
+-   */
+-  RESTRequestInterceptor getNextInterceptor();
+-
+-  /**
+-   *
+-   * @see WebServices#getAppAttempt(HttpServletRequest, HttpServletResponse,
+-   *      String, String)
+-   * @param req the servlet request
+-   * @param res the servlet response
+-   * @param appId the application we want to get the appAttempt. It is a
+-   *          PathParam.
+-   * @param appAttemptId the AppAttempt we want to get the info. It is a
+-   *          PathParam.
+-   * @return AppAttemptInfo of the specific AppAttempt
+-   */
+-  AppAttemptInfo getAppAttempt(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId);
+-
+-  /**
+-   *
+-   * @see WebServices#getContainers(HttpServletRequest, HttpServletResponse,
+-   *      String, String)
+-   * @param req the servlet request
+-   * @param res the servlet response
+-   * @param appId the application we want to get the containers info. It is a
+-   *          PathParam.
+-   * @param appAttemptId the AppAttempt we want to get the info. It is a
+-   *          PathParam.
+-   * @return ContainersInfo of all the containers that belong to the specific
+-   *         AppAttempt
+-   */
+-  ContainersInfo getContainers(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId);
+-
+-  /**
+-   *
+-   * @see WebServices#getContainer(HttpServletRequest, HttpServletResponse,
+-   *      String, String, String)
+-   * @param req the servlet request
+-   * @param res the servlet response
+-   * @param appId the application we want to get the containers info. It is a
+-   *          PathParam.
+-   * @param appAttemptId the AppAttempt we want to get the info. It is a
+-   *          PathParam.
+-   * @param containerId the container we want to get the info. It is a
+-   *          PathParam.
+-   * @return ContainerInfo of the specific ContainerId
+-   */
+-  ContainerInfo getContainer(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId, String containerId);
+-
+-  /**
+-   * Set RouterClientRMService.
+-   *
+-   * @param routerClientRMService routerClientRMService.
+-   */
+-  void setRouterClientRMService(RouterClientRMService routerClientRMService);
+-
+-  /**
+-   * Get RouterClientRMService.
+-   *
+-   * @return RouterClientRMService
+-   */
+-  RouterClientRMService getRouterClientRMService();
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterBlock.java
+deleted file mode 100644
+index 55bcb81f259..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterBlock.java
++++ /dev/null
+@@ -1,357 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.json.JSONConfiguration;
+-import com.sun.jersey.api.json.JSONJAXBContext;
+-import com.sun.jersey.api.json.JSONMarshaller;
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+-
+-import java.io.StringWriter;
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.Map;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.Comparator;
+-
+-public abstract class RouterBlock extends HtmlBlock {
+-
+-  private final Router router;
+-  private final ViewContext ctx;
+-  private final FederationStateStoreFacade facade;
+-  private final Configuration conf;
+-
+-  public static final String ROUTER = "router";
+-
+-  public RouterBlock(Router router, ViewContext ctx) {
+-    super(ctx);
+-    this.ctx = ctx;
+-    this.router = router;
+-    this.facade = FederationStateStoreFacade.getInstance(router.getConfig());
+-    this.conf = this.router.getConfig();
+-  }
+-
+-  /**
+-   * Get RouterClusterMetrics Info.
+-   *
+-   * @return Router ClusterMetricsInfo.
+-   */
+-  protected ClusterMetricsInfo getRouterClusterMetricsInfo() {
+-    boolean isEnabled = isYarnFederationEnabled();
+-    String webAppAddress;
+-    if(isEnabled) {
+-      webAppAddress = WebAppUtils.getRouterWebAppURLWithScheme(conf);
+-    } else {
+-      webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(conf);
+-    }
+-    return getClusterMetricsInfo(webAppAddress);
+-  }
+-
+-  /**
+-   * Get RouterClusterMetrics Info.
+-   *
+-   * @param webAppAddress webAppAddress.
+-   * @return ClusterMetricsInfo.
+-   */
+-  protected ClusterMetricsInfo getClusterMetricsInfo(String webAppAddress) {
+-    // If webAppAddress is empty, we will return NULL.
+-    if (StringUtils.isBlank(webAppAddress)) {
+-      return null;
+-    }
+-
+-    // We will get ClusterMetricsInfo By webAppAddress.
+-    Client client = RouterWebServiceUtil.createJerseyClient(conf);
+-    ClusterMetricsInfo metrics = RouterWebServiceUtil
+-        .genericForward(webAppAddress, null, ClusterMetricsInfo.class, HTTPMethods.GET,
+-        RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.METRICS, null, null,
+-        conf, client);
+-    client.destroy();
+-    return metrics;
+-  }
+-
+-  /**
+-   * Get a list of subclusters.
+-   *
+-   * @return subcluster List.
+-   */
+-  protected List<SubClusterInfo> getSubClusterInfoList() {
+-    List<SubClusterInfo> subClusters = new ArrayList<>();
+-    try {
+-      Map<SubClusterId, SubClusterInfo> subClustersInfo = facade.getSubClusters(true);
+-
+-      // Sort the SubClusters.
+-      subClusters.addAll(subClustersInfo.values());
+-      Comparator<? super SubClusterInfo> cmp = Comparator.comparing(o -> o.getSubClusterId());
+-      Collections.sort(subClusters, cmp);
+-
+-      // Return results
+-      return subClusters;
+-    } catch (YarnException e) {
+-      LOG.error("getSubClusterInfoList error.", e);
+-      return subClusters;
+-    }
+-  }
+-
+-  /**
+-   * Whether Yarn Federation is enabled.
+-   *
+-   * @return true, enable yarn federation; false, not enable yarn federation;
+-   */
+-  protected boolean isYarnFederationEnabled() {
+-    boolean isEnabled = conf.getBoolean(
+-        YarnConfiguration.FEDERATION_ENABLED,
+-        YarnConfiguration.DEFAULT_FEDERATION_ENABLED);
+-    return isEnabled;
+-  }
+-
+-  /**
+-   * Get a list of SubClusterIds for ActiveSubClusters.
+-   *
+-   * @return list of SubClusterIds.
+-   */
+-  protected List<String> getActiveSubClusterIds() {
+-    List<String> result = new ArrayList<>();
+-    try {
+-      Map<SubClusterId, SubClusterInfo> subClustersInfo = facade.getSubClusters(true);
+-      subClustersInfo.values().stream().forEach(subClusterInfo -> {
+-        result.add(subClusterInfo.getSubClusterId().getId());
+-      });
+-    } catch (Exception e) {
+-      LOG.error("getActiveSubClusters error.", e);
+-    }
+-    return result;
+-  }
+-
+-  /**
+-   * init SubCluster MetricsOverviewTable.
+-   *
+-   * @param html HTML Object.
+-   * @param subclusterId subClusterId
+-   */
+-  protected void initSubClusterMetricsOverviewTable(Block html, String subclusterId) {
+-    MetricsOverviewTable metricsOverviewTable = new MetricsOverviewTable(this.router, this.ctx);
+-    metricsOverviewTable.render(html, subclusterId);
+-  }
+-
+-  /**
+-   * Get ClusterMetricsInfo By SubClusterId.
+-   *
+-   * @param subclusterId subClusterId
+-   * @return SubCluster RM ClusterMetricsInfo
+-   */
+-  protected ClusterMetricsInfo getClusterMetricsInfoBySubClusterId(String subclusterId) {
+-    try {
+-      SubClusterId subClusterId = SubClusterId.newInstance(subclusterId);
+-      SubClusterInfo subClusterInfo = facade.getSubCluster(subClusterId);
+-      if (subClusterInfo != null) {
+-        Client client = RouterWebServiceUtil.createJerseyClient(this.conf);
+-        // Call the RM interface to obtain schedule information
+-        String webAppAddress =  WebAppUtils.getHttpSchemePrefix(this.conf) +
+-            subClusterInfo.getRMWebServiceAddress();
+-        ClusterMetricsInfo metrics = RouterWebServiceUtil
+-            .genericForward(webAppAddress, null, ClusterMetricsInfo.class, HTTPMethods.GET,
+-            RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.METRICS, null, null,
+-            conf, client);
+-        client.destroy();
+-        return metrics;
+-      }
+-    } catch (Exception e) {
+-      LOG.error("getClusterMetricsInfoBySubClusterId subClusterId = {} error.", subclusterId, e);
+-    }
+-    return null;
+-  }
+-
+-  /**
+-   * Get SubClusterInfo based on subclusterId.
+-   *
+-   * @param subclusterId subCluster Id
+-   * @return SubClusterInfo Collection
+-   */
+-  protected Collection<SubClusterInfo> getSubClusterInfoList(String subclusterId) {
+-    try {
+-      SubClusterId subClusterId = SubClusterId.newInstance(subclusterId);
+-      SubClusterInfo subClusterInfo = facade.getSubCluster(subClusterId);
+-      return Collections.singletonList(subClusterInfo);
+-    } catch (Exception e) {
+-      LOG.error("getSubClusterInfoList subClusterId = {} error.", subclusterId, e);
+-    }
+-    return null;
+-  }
+-
+-  public FederationStateStoreFacade getFacade() {
+-    return facade;
+-  }
+-
+-  /**
+-   * Initialize the Nodes menu.
+-   *
+-   * @param mainList HTML Object.
+-   * @param subClusterIds subCluster List.
+-   */
+-  protected void initNodesMenu(Hamlet.UL<Hamlet.DIV<Hamlet>> mainList,
+-      List<String> subClusterIds) {
+-    if (CollectionUtils.isNotEmpty(subClusterIds)) {
+-      Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.DIV<Hamlet>>>> nodesList =
+-          mainList.li().a(url("nodes"), "Nodes").ul().
+-          $style("padding:0.3em 1em 0.1em 2em");
+-
+-      // ### nodes info
+-      nodesList.li().__();
+-      for (String subClusterId : subClusterIds) {
+-        nodesList.li().a(url("nodes", subClusterId), subClusterId).__();
+-      }
+-      nodesList.__().__();
+-    } else {
+-      mainList.li().a(url("nodes"), "Nodes").__();
+-    }
+-  }
+-
+-  /**
+-   * Initialize the Applications menu.
+-   *
+-   * @param mainList HTML Object.
+-   * @param subClusterIds subCluster List.
+-   */
+-  protected void initApplicationsMenu(Hamlet.UL<Hamlet.DIV<Hamlet>> mainList,
+-      List<String> subClusterIds) {
+-    if (CollectionUtils.isNotEmpty(subClusterIds)) {
+-      Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.DIV<Hamlet>>>> apps =
+-          mainList.li().a(url("apps"), "Applications").ul();
+-      apps.li().__();
+-      for (String subClusterId : subClusterIds) {
+-        Hamlet.LI<Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.DIV<Hamlet>>>>> subClusterList = apps.
+-            li().a(url("apps", subClusterId), subClusterId);
+-        Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.DIV<Hamlet>>>>>> subAppStates =
+-            subClusterList.ul().$style("padding:0.3em 1em 0.1em 2em");
+-        subAppStates.li().__();
+-        for (YarnApplicationState state : YarnApplicationState.values()) {
+-          subAppStates.
+-              li().a(url("apps", subClusterId, state.toString()), state.toString()).__();
+-        }
+-        subAppStates.li().__().__();
+-        subClusterList.__();
+-      }
+-      apps.__().__();
+-    } else {
+-      mainList.li().a(url("apps"), "Applications").__();
+-    }
+-  }
+-
+-  /**
+-   * Initialize the NodeLabels menu.
+-   *
+-   * @param mainList HTML Object.
+-   * @param subClusterIds subCluster List.
+-   */
+-  protected void initNodeLabelsMenu(Hamlet.UL<Hamlet.DIV<Hamlet>> mainList,
+-      List<String> subClusterIds) {
+-
+-    if (CollectionUtils.isNotEmpty(subClusterIds)) {
+-      Hamlet.UL<Hamlet.LI<Hamlet.UL<Hamlet.DIV<Hamlet>>>> nodesList =
+-          mainList.li().a(url("nodelabels"), "Node Labels").ul().
+-          $style("padding:0.3em 1em 0.1em 2em");
+-
+-      // ### nodelabels info
+-      nodesList.li().__();
+-      for (String subClusterId : subClusterIds) {
+-        nodesList.li().a(url("nodelabels", subClusterId), subClusterId).__();
+-      }
+-      nodesList.__().__();
+-    } else {
+-      mainList.li().a(url("nodelabels"), "Node Labels").__();
+-    }
+-  }
+-
+-  /**
+-   * Generate SubClusterInfo based on local cluster information.
+-   *
+-   * @param config Configuration.
+-   * @return SubClusterInfo.
+-   */
+-  protected SubClusterInfo getSubClusterInfoByLocalCluster(Configuration config) {
+-
+-    Client client = null;
+-    try {
+-
+-      // Step1. Retrieve the name of the local cluster and ClusterMetricsInfo.
+-      String localClusterName = config.get(YarnConfiguration.RM_CLUSTER_ID, UNAVAILABLE);
+-      String webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(config);
+-      String rmWebAppURLWithoutScheme = WebAppUtils.getRMWebAppURLWithoutScheme(config);
+-      client = RouterWebServiceUtil.createJerseyClient(config);
+-      ClusterMetricsInfo clusterMetricsInfos = RouterWebServiceUtil
+-          .genericForward(webAppAddress, null, ClusterMetricsInfo.class, HTTPMethods.GET,
+-          RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.METRICS, null, null,
+-           config, client);
+-
+-      if (clusterMetricsInfos == null) {
+-        return null;
+-      }
+-
+-      // Step2. Retrieve cluster information for the local cluster to obtain its startup time.
+-      ClusterInfo clusterInfo = RouterWebServiceUtil.genericForward(webAppAddress, null,
+-          ClusterInfo.class, HTTPMethods.GET, RMWSConsts.RM_WEB_SERVICE_PATH + RMWSConsts.INFO,
+-          null, null, config, client);
+-
+-      if (clusterInfo == null) {
+-        return null;
+-      }
+-
+-      // Step3. Get Local-Cluster Capability
+-      JSONJAXBContext jc = new JSONJAXBContext(
+-          JSONConfiguration.mapped().rootUnwrapping(false).build(), ClusterMetricsInfo.class);
+-      JSONMarshaller marshaller = jc.createJSONMarshaller();
+-      StringWriter writer = new StringWriter();
+-      marshaller.marshallToJSON(clusterMetricsInfos, writer);
+-      String capability = writer.toString();
+-
+-      // Step4. Generate SubClusterInfo.
+-      SubClusterId subClusterId = SubClusterId.newInstance(localClusterName);
+-      SubClusterInfo subClusterInfo = SubClusterInfo.newInstance(subClusterId,
+-          rmWebAppURLWithoutScheme, SubClusterState.SC_RUNNING, clusterInfo.getStartedOn(),
+-          Time.now(), capability);
+-
+-      return subClusterInfo;
+-    } catch (Exception e) {
+-      LOG.error("An error occurred while parsing the local YARN cluster.", e);
+-    } finally {
+-      if (client != null) {
+-        client.destroy();
+-      }
+-    }
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterController.java
+deleted file mode 100644
+index 7d7165f7cad..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterController.java
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.Controller;
+-
+-import com.google.inject.Inject;
+-
+-/**
+- * Controller for the Router Web UI.
+- */
+-public class RouterController extends Controller {
+-
+-  @Inject
+-  RouterController(RequestContext ctx) {
+-    super(ctx);
+-  }
+-
+-  @Override
+-  public void index() {
+-    setTitle("About the YARN Router");
+-    render(AboutPage.class);
+-  }
+-
+-  public void about() {
+-    setTitle("About the Cluster");
+-    render(AboutPage.class);
+-  }
+-
+-  public void federation() {
+-    render(FederationPage.class);
+-  }
+-
+-  public void apps() {
+-    setTitle("Applications");
+-    render(AppsPage.class);
+-  }
+-
+-  public void nodes() {
+-    setTitle("Nodes");
+-    render(NodesPage.class);
+-  }
+-
+-  public void nodeLabels() {
+-    setTitle("Node Labels");
+-    render(NodeLabelsPage.class);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterView.java
+deleted file mode 100644
+index b377f7dc1dd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterView.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-import org.apache.hadoop.yarn.webapp.view.TwoColumnLayout;
+-
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.*;
+-
+-/**
+- * View for the Router Web UI.
+- */
+-public class RouterView extends TwoColumnLayout {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-
+-    setTitle("Router");
+-  }
+-
+-  protected void commonPreHead(Page.HTML<__> html) {
+-    set(ACCORDION_ID, "nav");
+-    set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> nav() {
+-    return NavBlock.class;
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return AboutBlock.class;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebApp.java
+deleted file mode 100644
+index 989a3d43b43..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebApp.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.apache.hadoop.yarn.webapp.YarnWebParams;
+-
+-import static org.apache.hadoop.yarn.util.StringHelper.pajoin;
+-
+-/**
+- * The Router webapp.
+- */
+-public class RouterWebApp extends WebApp implements YarnWebParams {
+-  private Router router;
+-
+-  public RouterWebApp(Router router) {
+-    this.router = router;
+-  }
+-
+-  @Override
+-  public void setup() {
+-    bind(JAXBContextResolver.class);
+-    bind(RouterWebServices.class);
+-    bind(GenericExceptionHandler.class);
+-    bind(RouterWebApp.class).toInstance(this);
+-
+-    if (router != null) {
+-      bind(Router.class).toInstance(router);
+-    }
+-    route("/", RouterController.class);
+-    route("/cluster", RouterController.class, "about");
+-    route("/about", RouterController.class, "about");
+-    route(pajoin("/apps", APP_SC, APP_STATE), RouterController.class, "apps");
+-    route(pajoin("/nodes", NODE_SC), RouterController.class, "nodes");
+-    route("/federation", RouterController.class, "federation");
+-    route(pajoin("/nodelabels", NODE_SC), RouterController.class, "nodeLabels");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java
+deleted file mode 100644
+index f2c385fd022..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java
++++ /dev/null
+@@ -1,776 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+-import static javax.servlet.http.HttpServletResponse.SC_OK;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices.DELEGATION_TOKEN_HEADER;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.LinkedHashMap;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.Collection;
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.concurrent.TimeUnit;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.ws.rs.core.HttpHeaders;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.MultivaluedMap;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.ResponseBuilder;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticationHandler;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebAppUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.PartitionInfo;
+-import org.apache.hadoop.yarn.server.uam.UnmanagedApplicationManager;
+-import org.apache.hadoop.yarn.webapp.BadRequestException;
+-import org.apache.hadoop.yarn.webapp.ForbiddenException;
+-import org.apache.hadoop.yarn.webapp.NotFoundException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import com.sun.jersey.api.ConflictException;
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource;
+-import com.sun.jersey.api.client.WebResource.Builder;
+-import com.sun.jersey.core.util.MultivaluedMapImpl;
+-
+-/**
+- * The Router webservice util class.
+- */
+-public final class RouterWebServiceUtil {
+-
+-  private static String user = "YarnRouter";
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterWebServiceUtil.class.getName());
+-
+-  private final static String PARTIAL_REPORT = "Partial Report ";
+-
+-  /** Disable constructor. */
+-  private RouterWebServiceUtil() {
+-  }
+-
+-  /**
+-   * Creates and performs a REST call to a specific WebService.
+-   *
+-   * @param webApp the address of the remote webapp
+-   * @param hsr the servlet request
+-   * @param returnType the return type of the REST call
+-   * @param <T> Type of return object.
+-   * @param method the HTTP method of the REST call
+-   * @param targetPath additional path to add to the webapp address
+-   * @param formParam the form parameters as input for a specific REST call
+-   * @param additionalParam the query parameters as input for a specific REST
+-   *          call in case the call has no servlet request
+-   * @param conf configuration.
+-   * @param client same client used to reduce number of clients created
+-   * @return the retrieved entity from the REST call
+-   */
+-  protected static <T> T genericForward(final String webApp,
+-      final HttpServletRequest hsr, final Class<T> returnType,
+-      final HTTPMethods method, final String targetPath, final Object formParam,
+-      final Map<String, String[]> additionalParam, Configuration conf,
+-      Client client) {
+-
+-    UserGroupInformation callerUGI = null;
+-
+-    if (hsr != null) {
+-      callerUGI = RMWebAppUtil.getCallerUserGroupInformation(hsr, true);
+-    } else {
+-      // user not required
+-      callerUGI = UserGroupInformation.createRemoteUser(user);
+-
+-    }
+-
+-    if (callerUGI == null) {
+-      LOG.error("Unable to obtain user name, user not authenticated");
+-      return null;
+-    }
+-
+-    try {
+-      return callerUGI.doAs(new PrivilegedExceptionAction<T>() {
+-        @SuppressWarnings("unchecked")
+-        @Override
+-        public T run() {
+-
+-          Map<String, String[]> paramMap = null;
+-
+-          // We can have hsr or additionalParam. There are no case with both.
+-          if (hsr != null) {
+-            paramMap = hsr.getParameterMap();
+-          } else if (additionalParam != null) {
+-            paramMap = additionalParam;
+-          }
+-
+-          ClientResponse response = RouterWebServiceUtil
+-              .invokeRMWebService(webApp, targetPath, method,
+-                  (hsr == null) ? null : hsr.getPathInfo(), paramMap, formParam,
+-                  getMediaTypeFromHttpServletRequest(hsr, returnType), conf,
+-                  client);
+-          if (Response.class.equals(returnType)) {
+-            return (T) RouterWebServiceUtil.clientResponseToResponse(response);
+-          }
+-
+-          try {
+-            // YARN RM can answer with Status.OK or it throws an exception
+-            if (response.getStatus() == SC_OK) {
+-              return response.getEntity(returnType);
+-            }
+-            if (response.getStatus() == SC_NO_CONTENT) {
+-              try {
+-                return returnType.getConstructor().newInstance();
+-              } catch (RuntimeException | ReflectiveOperationException e) {
+-                LOG.error("Cannot create empty entity for {}", returnType, e);
+-              }
+-            }
+-            RouterWebServiceUtil.retrieveException(response);
+-            return null;
+-          } finally {
+-            if (response != null) {
+-              response.close();
+-            }
+-          }
+-        }
+-      });
+-    } catch (InterruptedException e) {
+-      return null;
+-    } catch (IOException e) {
+-      return null;
+-    }
+-  }
+-
+-  /**
+-   * Performs an invocation of a REST call on a remote RMWebService.
+-   * @param webApp the address of the remote webapp
+-   * @param path  to add to the webapp address
+-   * @param method the HTTP method of the REST call
+-   * @param additionalPath the servlet request path
+-   * @param queryParams hsr of additional Param
+-   * @param formParam the form parameters as input for a specific REST call
+-   * @param mediaType Media type for Servlet request call
+-   * @param conf to support http and https
+-   * @param client same client used to reduce number of clients created
+-   * @return Client response to REST call
+-   */
+-  private static ClientResponse invokeRMWebService(String webApp, String path,
+-      HTTPMethods method, String additionalPath,
+-      Map<String, String[]> queryParams, Object formParam, String mediaType,
+-      Configuration conf, Client client) {
+-    InetSocketAddress socketAddress = NetUtils
+-        .getConnectAddress(NetUtils.createSocketAddr(webApp));
+-    String scheme = YarnConfiguration.useHttps(conf) ? "https://" : "http://";
+-    String webAddress = scheme + socketAddress.getHostName() + ":"
+-        + socketAddress.getPort();
+-    WebResource webResource = client.resource(webAddress).path(path);
+-
+-    if (additionalPath != null && !additionalPath.isEmpty()) {
+-      webResource = webResource.path(additionalPath);
+-    }
+-
+-    if (queryParams != null && !queryParams.isEmpty()) {
+-      MultivaluedMap<String, String> paramMap = new MultivaluedMapImpl();
+-
+-      for (Entry<String, String[]> param : queryParams.entrySet()) {
+-        String[] values = param.getValue();
+-        for (int i = 0; i < values.length; i++) {
+-          paramMap.add(param.getKey(), values[i]);
+-        }
+-      }
+-      webResource = webResource.queryParams(paramMap);
+-    }
+-
+-    Builder builder = null;
+-    if (formParam != null) {
+-      builder = webResource.entity(formParam, mediaType);
+-      builder = builder.accept(mediaType);
+-    } else {
+-      builder = webResource.accept(mediaType);
+-    }
+-
+-    ClientResponse response = null;
+-
+-    try {
+-      switch (method) {
+-      case DELETE:
+-        response = builder.delete(ClientResponse.class);
+-        break;
+-      case GET:
+-        response = builder.get(ClientResponse.class);
+-        break;
+-      case POST:
+-        response = builder.post(ClientResponse.class);
+-        break;
+-      case PUT:
+-        response = builder.put(ClientResponse.class);
+-        break;
+-      default:
+-        break;
+-      }
+-    } finally {
+-      client.destroy();
+-    }
+-
+-    return response;
+-  }
+-
+-  public static Response clientResponseToResponse(ClientResponse r) {
+-    if (r == null) {
+-      return null;
+-    }
+-    // copy the status code
+-    ResponseBuilder rb = Response.status(r.getStatus());
+-    // copy all the headers
+-    for (Entry<String, List<String>> entry : r.getHeaders().entrySet()) {
+-      for (String value : entry.getValue()) {
+-        rb.header(entry.getKey(), value);
+-      }
+-    }
+-    // copy the entity
+-    rb.entity(r.getEntityInputStream());
+-    // return the response
+-    return rb.build();
+-  }
+-
+-  public static void retrieveException(ClientResponse response) {
+-    String serverErrorMsg = response.getEntity(String.class);
+-    int status = response.getStatus();
+-    if (status == 400) {
+-      throw new BadRequestException(serverErrorMsg);
+-    }
+-    if (status == 403) {
+-      throw new ForbiddenException(serverErrorMsg);
+-    }
+-    if (status == 404) {
+-      throw new NotFoundException(serverErrorMsg);
+-    }
+-    if (status == 409) {
+-      throw new ConflictException(serverErrorMsg);
+-    }
+-
+-  }
+-
+-  /**
+-   * Merges a list of AppInfo grouping by ApplicationId. Our current policy is
+-   * to merge the application reports from the reachable SubClusters. Via
+-   * configuration parameter, we decide whether to return applications for which
+-   * the primary AM is missing or to omit them.
+-   *
+-   * @param appsInfo a list of AppInfo to merge
+-   * @param returnPartialResult if the merge AppsInfo should contain partial
+-   *          result or not
+-   * @return the merged AppsInfo
+-   */
+-  public static AppsInfo mergeAppsInfo(ArrayList<AppInfo> appsInfo,
+-      boolean returnPartialResult) {
+-    AppsInfo allApps = new AppsInfo();
+-
+-    Map<String, AppInfo> federationAM = new HashMap<>();
+-    Map<String, AppInfo> federationUAMSum = new HashMap<>();
+-    for (AppInfo a : appsInfo) {
+-      // Check if this AppInfo is an AM
+-      if (a.getAMHostHttpAddress() != null) {
+-        // Insert in the list of AM
+-        federationAM.put(a.getAppId(), a);
+-        // Check if there are any UAM found before
+-        if (federationUAMSum.containsKey(a.getAppId())) {
+-          // Merge the current AM with the found UAM
+-          mergeAMWithUAM(a, federationUAMSum.get(a.getAppId()));
+-          // Remove the sum of the UAMs
+-          federationUAMSum.remove(a.getAppId());
+-        }
+-        // This AppInfo is an UAM
+-      } else {
+-        if (federationAM.containsKey(a.getAppId())) {
+-          // Merge the current UAM with its own AM
+-          mergeAMWithUAM(federationAM.get(a.getAppId()), a);
+-        } else if (federationUAMSum.containsKey(a.getAppId())) {
+-          // Merge the current UAM with its own UAM and update the list of UAM
+-          federationUAMSum.put(a.getAppId(),
+-              mergeUAMWithUAM(federationUAMSum.get(a.getAppId()), a));
+-        } else {
+-          // Insert in the list of UAM
+-          federationUAMSum.put(a.getAppId(), a);
+-        }
+-      }
+-    }
+-
+-    // Check the remaining UAMs are depending or not from federation
+-    for (AppInfo a : federationUAMSum.values()) {
+-      if (returnPartialResult || (a.getName() != null
+-          && !(a.getName().startsWith(UnmanagedApplicationManager.APP_NAME)
+-              || a.getName().startsWith(PARTIAL_REPORT)))) {
+-        federationAM.put(a.getAppId(), a);
+-      }
+-    }
+-
+-    allApps.addAll(new ArrayList<>(federationAM.values()));
+-    return allApps;
+-  }
+-
+-  /**
+-   * Create a Jersey client instance.
+-   * @param conf Configuration
+-   * @return a jersey client
+-   */
+-  protected static Client createJerseyClient(Configuration conf) {
+-    Client client = Client.create();
+-
+-    long checkConnectTimeOut = conf.getLong(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, 0);
+-    int connectTimeOut = (int) conf.getTimeDuration(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS);
+-    if (checkConnectTimeOut <= 0 || checkConnectTimeOut > Integer.MAX_VALUE) {
+-      LOG.warn("Configuration {} = {} ms error. We will use the default value({} ms).",
+-          YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, connectTimeOut,
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT);
+-      connectTimeOut = (int) TimeUnit.MILLISECONDS.convert(
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS);
+-    }
+-    client.setConnectTimeout(connectTimeOut);
+-
+-    long checkReadTimeout = conf.getLong(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT, 0);
+-    int readTimeout = (int) conf.getTimeDuration(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_READ_TIMEOUT, TimeUnit.MILLISECONDS);
+-
+-    if (checkReadTimeout < 0) {
+-      LOG.warn("Configuration {} = {} ms error. We will use the default value({} ms).",
+-          YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, connectTimeOut,
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT);
+-      readTimeout = (int) TimeUnit.MILLISECONDS.convert(
+-          YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS);
+-    }
+-    client.setReadTimeout(readTimeout);
+-
+-    return client;
+-  }
+-
+-  private static AppInfo mergeUAMWithUAM(AppInfo uam1, AppInfo uam2) {
+-    AppInfo partialReport = new AppInfo();
+-    partialReport.setAppId(uam1.getAppId());
+-    partialReport.setName(PARTIAL_REPORT + uam1.getAppId());
+-    // We pick the status of the first uam
+-    partialReport.setState(uam1.getState());
+-    // Merge the newly partial AM with UAM1 and then with UAM2
+-    mergeAMWithUAM(partialReport, uam1);
+-    mergeAMWithUAM(partialReport, uam2);
+-    return partialReport;
+-  }
+-
+-  private static void mergeAMWithUAM(AppInfo am, AppInfo uam) {
+-    am.setPreemptedResourceMB(
+-        am.getPreemptedResourceMB() + uam.getPreemptedResourceMB());
+-    am.setPreemptedResourceVCores(
+-        am.getPreemptedResourceVCores() + uam.getPreemptedResourceVCores());
+-    am.setNumNonAMContainerPreempted(am.getNumNonAMContainerPreempted()
+-        + uam.getNumNonAMContainerPreempted());
+-    am.setNumAMContainerPreempted(
+-        am.getNumAMContainerPreempted() + uam.getNumAMContainerPreempted());
+-    am.setPreemptedMemorySeconds(
+-        am.getPreemptedMemorySeconds() + uam.getPreemptedMemorySeconds());
+-    am.setPreemptedVcoreSeconds(
+-        am.getPreemptedVcoreSeconds() + uam.getPreemptedVcoreSeconds());
+-
+-    if (am.getState() == YarnApplicationState.RUNNING
+-        && uam.getState() == am.getState()) {
+-
+-      am.getResourceRequests().addAll(uam.getResourceRequests());
+-
+-      am.setAllocatedMB(am.getAllocatedMB() + uam.getAllocatedMB());
+-      am.setAllocatedVCores(am.getAllocatedVCores() + uam.getAllocatedVCores());
+-      am.setReservedMB(am.getReservedMB() + uam.getReservedMB());
+-      am.setReservedVCores(am.getReservedVCores() + uam.getReservedMB());
+-      am.setRunningContainers(
+-          am.getRunningContainers() + uam.getRunningContainers());
+-      am.setMemorySeconds(am.getMemorySeconds() + uam.getMemorySeconds());
+-      am.setVcoreSeconds(am.getVcoreSeconds() + uam.getVcoreSeconds());
+-    }
+-  }
+-
+-  /**
+-   * Deletes all the duplicate NodeInfo by discarding the old instances.
+-   *
+-   * @param nodes a list of NodeInfo to check for duplicates
+-   * @return a NodesInfo that contains a list of NodeInfos without duplicates
+-   */
+-  public static NodesInfo deleteDuplicateNodesInfo(ArrayList<NodeInfo> nodes) {
+-    NodesInfo nodesInfo = new NodesInfo();
+-
+-    Map<String, NodeInfo> nodesMap = new LinkedHashMap<>();
+-    for (NodeInfo node : nodes) {
+-      String nodeId = node.getNodeId();
+-      // If the node already exists, it could be an old instance
+-      if (nodesMap.containsKey(nodeId)) {
+-        // Check if the node is an old instance
+-        if (nodesMap.get(nodeId).getLastHealthUpdate() < node
+-            .getLastHealthUpdate()) {
+-          nodesMap.put(node.getNodeId(), node);
+-        }
+-      } else {
+-        nodesMap.put(node.getNodeId(), node);
+-      }
+-    }
+-    nodesInfo.addAll(new ArrayList<>(nodesMap.values()));
+-    return nodesInfo;
+-  }
+-
+-  /**
+-   * Adds all the values from the second ClusterMetricsInfo to the first one.
+-   *
+-   * @param metrics the ClusterMetricsInfo we want to update
+-   * @param metricsResponse the ClusterMetricsInfo we want to add to the first
+-   *          param
+-   */
+-  public static void mergeMetrics(ClusterMetricsInfo metrics,
+-      ClusterMetricsInfo metricsResponse) {
+-    metrics.setAppsSubmitted(
+-        metrics.getAppsSubmitted() + metricsResponse.getAppsSubmitted());
+-    metrics.setAppsCompleted(
+-        metrics.getAppsCompleted() + metricsResponse.getAppsCompleted());
+-    metrics.setAppsPending(
+-        metrics.getAppsPending() + metricsResponse.getAppsPending());
+-    metrics.setAppsRunning(
+-        metrics.getAppsRunning() + metricsResponse.getAppsRunning());
+-    metrics.setAppsFailed(
+-        metrics.getAppsFailed() + metricsResponse.getAppsFailed());
+-    metrics.setAppsKilled(
+-        metrics.getAppsKilled() + metricsResponse.getAppsKilled());
+-
+-    metrics.setReservedMB(
+-        metrics.getReservedMB() + metricsResponse.getReservedMB());
+-    metrics.setAvailableMB(
+-        metrics.getAvailableMB() + metricsResponse.getAvailableMB());
+-    metrics.setAllocatedMB(
+-        metrics.getAllocatedMB() + metricsResponse.getAllocatedMB());
+-
+-    metrics.setReservedVirtualCores(metrics.getReservedVirtualCores()
+-        + metricsResponse.getReservedVirtualCores());
+-    metrics.setAvailableVirtualCores(metrics.getAvailableVirtualCores()
+-        + metricsResponse.getAvailableVirtualCores());
+-    metrics.setAllocatedVirtualCores(metrics.getAllocatedVirtualCores()
+-        + metricsResponse.getAllocatedVirtualCores());
+-
+-    metrics.setContainersAllocated(metrics.getContainersAllocated()
+-        + metricsResponse.getContainersAllocated());
+-    metrics.setContainersReserved(metrics.getReservedContainers()
+-        + metricsResponse.getReservedContainers());
+-    metrics.setContainersPending(metrics.getPendingContainers()
+-        + metricsResponse.getPendingContainers());
+-
+-    metrics.setTotalMB(metrics.getTotalMB()
+-        + metricsResponse.getTotalMB());
+-    metrics.setUtilizedMB(metrics.getUtilizedMB()
+-        + metricsResponse.getUtilizedMB());
+-    metrics.setTotalVirtualCores(metrics.getTotalVirtualCores()
+-        + metricsResponse.getTotalVirtualCores());
+-    metrics.setTotalNodes(metrics.getTotalNodes()
+-        + metricsResponse.getTotalNodes());
+-    metrics.setUtilizedVirtualCores(metrics.getUtilizedVirtualCores()
+-        + metricsResponse.getUtilizedVirtualCores());
+-    metrics.setLostNodes(metrics.getLostNodes()
+-        + metricsResponse.getLostNodes());
+-    metrics.setUnhealthyNodes(metrics.getUnhealthyNodes()
+-        + metricsResponse.getUnhealthyNodes());
+-    metrics.setDecommissioningNodes(metrics.getDecommissioningNodes()
+-        + metricsResponse.getDecommissioningNodes());
+-    metrics.setDecommissionedNodes(metrics.getDecommissionedNodes()
+-        + metricsResponse.getDecommissionedNodes());
+-    metrics.setRebootedNodes(metrics.getRebootedNodes()
+-        + metricsResponse.getRebootedNodes());
+-    metrics.setActiveNodes(metrics.getActiveNodes()
+-        + metricsResponse.getActiveNodes());
+-    metrics.setShutdownNodes(metrics.getShutdownNodes()
+-        + metricsResponse.getShutdownNodes());
+-
+-    int utilizedVirtualCoresPercent = metrics.getTotalVirtualCores() <= 0 ? 0 :
+-        (int) (metrics.getUtilizedVirtualCores() * 100 / metrics.getTotalVirtualCores());
+-    metrics.setUtilizedVirtualCoresPercent(utilizedVirtualCoresPercent);
+-
+-    int utilizedMBPercent = metrics.getTotalMB() <= 0 ? 0 :
+-        (int) (metrics.getUtilizedMB() * 100 / metrics.getTotalMB());
+-    metrics.setUtilizedMBPercent(utilizedMBPercent);
+-  }
+-
+-  /**
+-   * Extract from HttpServletRequest the MediaType in output.
+-   *
+-   * @param request the servlet request.
+-   * @param returnType the return type of the REST call.
+-   * @param <T> Generic Type T.
+-   * @return MediaType.
+-   */
+-  protected static <T> String getMediaTypeFromHttpServletRequest(
+-      HttpServletRequest request, final Class<T> returnType) {
+-    if (request == null) {
+-      // By default, we return XML for REST call without HttpServletRequest
+-      return MediaType.APPLICATION_XML;
+-    }
+-    // TODO
+-    if (!returnType.equals(Response.class)) {
+-      return MediaType.APPLICATION_XML;
+-    }
+-    String header = request.getHeader(HttpHeaders.ACCEPT);
+-    if (header == null || header.equals("*")) {
+-      // By default, we return JSON
+-      return MediaType.APPLICATION_JSON;
+-    }
+-    return header;
+-  }
+-
+-  public static NodeToLabelsInfo mergeNodeToLabels(
+-      Map<SubClusterInfo, NodeToLabelsInfo> nodeToLabelsInfoMap) {
+-
+-    HashMap<String, NodeLabelsInfo> nodeToLabels = new HashMap<>();
+-    Collection<NodeToLabelsInfo> nodeToLabelsInfos = nodeToLabelsInfoMap.values();
+-
+-    nodeToLabelsInfos.stream().forEach(nodeToLabelsInfo -> {
+-      for (Map.Entry<String, NodeLabelsInfo> item : nodeToLabelsInfo.getNodeToLabels().entrySet()) {
+-        String key = item.getKey();
+-        NodeLabelsInfo itemValue = item.getValue();
+-        NodeLabelsInfo nodeToLabelsValue = nodeToLabels.getOrDefault(item.getKey(), null);
+-        Set<NodeLabel> hashSet = new HashSet<>();
+-        if (itemValue != null) {
+-          hashSet.addAll(itemValue.getNodeLabels());
+-        }
+-        if (nodeToLabelsValue != null) {
+-          hashSet.addAll(nodeToLabelsValue.getNodeLabels());
+-        }
+-        nodeToLabels.put(key, new NodeLabelsInfo(hashSet));
+-      }
+-    });
+-
+-    return new NodeToLabelsInfo(nodeToLabels);
+-  }
+-
+-  public static ApplicationStatisticsInfo mergeApplicationStatisticsInfo(
+-      Collection<ApplicationStatisticsInfo> appStatistics) {
+-    ApplicationStatisticsInfo result = new ApplicationStatisticsInfo();
+-    Map<String, StatisticsItemInfo> statisticsItemMap = new HashMap<>();
+-
+-    appStatistics.stream().forEach(appStatistic -> {
+-      List<StatisticsItemInfo> statisticsItemInfos = appStatistic.getStatItems();
+-      for (StatisticsItemInfo statisticsItemInfo : statisticsItemInfos) {
+-
+-        String statisticsItemKey =
+-            statisticsItemInfo.getType() + "_" + statisticsItemInfo.getState().toString();
+-
+-        StatisticsItemInfo statisticsItemValue;
+-        if (statisticsItemMap.containsKey(statisticsItemKey)) {
+-          statisticsItemValue = statisticsItemMap.get(statisticsItemKey);
+-          long statisticsItemValueCount = statisticsItemValue.getCount();
+-          long statisticsItemInfoCount = statisticsItemInfo.getCount();
+-          long newCount = statisticsItemValueCount + statisticsItemInfoCount;
+-          statisticsItemValue.setCount(newCount);
+-        } else {
+-          statisticsItemValue = new StatisticsItemInfo(statisticsItemInfo);
+-        }
+-
+-        statisticsItemMap.put(statisticsItemKey, statisticsItemValue);
+-      }
+-    });
+-
+-    if (!statisticsItemMap.isEmpty()) {
+-      result.getStatItems().addAll(statisticsItemMap.values());
+-    }
+-
+-    return result;
+-  }
+-
+-  public static NodeLabelsInfo mergeNodeLabelsInfo(Map<SubClusterInfo, NodeLabelsInfo> paramMap) {
+-    Map<String, NodeLabelInfo> resultMap = new HashMap<>();
+-    paramMap.values().stream()
+-        .flatMap(nodeLabelsInfo -> nodeLabelsInfo.getNodeLabelsInfo().stream())
+-        .forEach(nodeLabelInfo -> {
+-          String keyLabelName = nodeLabelInfo.getName();
+-          if (resultMap.containsKey(keyLabelName)) {
+-            NodeLabelInfo mapNodeLabelInfo = resultMap.get(keyLabelName);
+-            mapNodeLabelInfo = mergeNodeLabelInfo(mapNodeLabelInfo, nodeLabelInfo);
+-            resultMap.put(keyLabelName, mapNodeLabelInfo);
+-          } else {
+-            resultMap.put(keyLabelName, nodeLabelInfo);
+-          }
+-        });
+-    NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo();
+-    nodeLabelsInfo.getNodeLabelsInfo().addAll(resultMap.values());
+-    return nodeLabelsInfo;
+-  }
+-
+-  private static NodeLabelInfo mergeNodeLabelInfo(NodeLabelInfo left, NodeLabelInfo right) {
+-    NodeLabelInfo resultNodeLabelInfo = new NodeLabelInfo();
+-    resultNodeLabelInfo.setName(left.getName());
+-
+-    int newActiveNMs = left.getActiveNMs() + right.getActiveNMs();
+-    resultNodeLabelInfo.setActiveNMs(newActiveNMs);
+-
+-    boolean newExclusivity = left.getExclusivity() && right.getExclusivity();
+-    resultNodeLabelInfo.setExclusivity(newExclusivity);
+-
+-    PartitionInfo leftPartition = left.getPartitionInfo();
+-    PartitionInfo rightPartition = right.getPartitionInfo();
+-    PartitionInfo newPartitionInfo = PartitionInfo.addTo(leftPartition, rightPartition);
+-    resultNodeLabelInfo.setPartitionInfo(newPartitionInfo);
+-    return resultNodeLabelInfo;
+-  }
+-
+-  /**
+-   * initForWritableEndpoints does the init and acls verification for all
+-   * writable REST end points.
+-   *
+-   * @param conf Configuration.
+-   * @param callerUGI remote caller who initiated the request.
+-   * @throws AuthorizationException in case of no access to perfom this op.
+-   */
+-  public static void initForWritableEndpoints(Configuration conf, UserGroupInformation callerUGI)
+-          throws AuthorizationException {
+-    if (callerUGI == null) {
+-      String msg = "Unable to obtain user name, user not authenticated";
+-      throw new AuthorizationException(msg);
+-    }
+-
+-    if (UserGroupInformation.isSecurityEnabled() && isStaticUser(conf, callerUGI)) {
+-      String msg = "The default static user cannot carry out this operation.";
+-      throw new ForbiddenException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Determine whether the user is a static user.
+-   *
+-   * @param conf Configuration.
+-   * @param callerUGI remote caller who initiated the request.
+-   * @return true, static user; false, not static user;
+-   */
+-  private static boolean isStaticUser(Configuration conf, UserGroupInformation callerUGI) {
+-    String staticUser = conf.get(CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER,
+-            CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER);
+-    return staticUser.equals(callerUGI.getUserName());
+-  }
+-
+-  public static void createKerberosUserGroupInformation(HttpServletRequest hsr)
+-          throws YarnException {
+-    String authType = hsr.getAuthType();
+-
+-    if (!KerberosAuthenticationHandler.TYPE.equalsIgnoreCase(authType)) {
+-      String msg = "Delegation token operations can only be carried out on a "
+-              + "Kerberos authenticated channel. Expected auth type is "
+-              + KerberosAuthenticationHandler.TYPE + ", got type " + authType;
+-      throw new YarnException(msg);
+-    }
+-
+-    Object ugiAttr =
+-            hsr.getAttribute(DelegationTokenAuthenticationHandler.DELEGATION_TOKEN_UGI_ATTRIBUTE);
+-    if (ugiAttr != null) {
+-      String msg = "Delegation token operations cannot be carried out using "
+-              + "delegation token authentication.";
+-      throw new YarnException(msg);
+-    }
+-  }
+-
+-  /**
+-   * Parse Token data.
+-   *
+-   * @param encodedToken tokenData
+-   * @return RMDelegationTokenIdentifier.
+-   */
+-  public static Token<RMDelegationTokenIdentifier> extractToken(String encodedToken) {
+-    Token<RMDelegationTokenIdentifier> token = new Token<>();
+-    try {
+-      token.decodeFromUrlString(encodedToken);
+-    } catch (Exception ie) {
+-      throw new BadRequestException("Could not decode encoded token");
+-    }
+-    return token;
+-  }
+-
+-  public static Token<RMDelegationTokenIdentifier> extractToken(HttpServletRequest request) {
+-    String encodedToken = request.getHeader(DELEGATION_TOKEN_HEADER);
+-    if (encodedToken == null) {
+-      String msg = "Header '" + DELEGATION_TOKEN_HEADER
+-              + "' containing encoded token not found";
+-      throw new BadRequestException(msg);
+-    }
+-    return extractToken(encodedToken);
+-  }
+-
+-  /**
+-   * Get Kerberos UserGroupInformation.
+-   *
+-   * Parse ugi from hsr and set kerberos authentication attributes.
+-   *
+-   * @param conf Configuration.
+-   * @param request the servlet request.
+-   * @return UserGroupInformation.
+-   * @throws AuthorizationException if Kerberos auth failed.
+-   * @throws YarnException If Authentication Type verification fails.
+-   */
+-  public static UserGroupInformation getKerberosUserGroupInformation(Configuration conf,
+-      HttpServletRequest request) throws AuthorizationException, YarnException {
+-    // Parse ugi from hsr And Check ugi as expected.
+-    // If ugi is empty or user is a static user, an exception will be thrown.
+-    UserGroupInformation callerUGI = RMWebAppUtil.getCallerUserGroupInformation(request, true);
+-    initForWritableEndpoints(conf, callerUGI);
+-
+-    // Set AuthenticationMethod Kerberos for ugi.
+-    createKerberosUserGroupInformation(request);
+-    callerUGI.setAuthenticationMethod(UserGroupInformation.AuthenticationMethod.KERBEROS);
+-
+-    // return caller UGI
+-    return callerUGI;
+-  }
+-
+-  public static String generateWebTitle(String title, String msg) {
+-    StringBuilder stringBuilder = new StringBuilder();
+-    stringBuilder.append(title);
+-    stringBuilder.append(" (");
+-    stringBuilder.append(msg);
+-    stringBuilder.append(")");
+-    return stringBuilder.toString();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java
+deleted file mode 100644
+index 4e0d97e83e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServices.java
++++ /dev/null
+@@ -1,964 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.Collections;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.Consumes;
+-import javax.ws.rs.DELETE;
+-import javax.ws.rs.DefaultValue;
+-import javax.ws.rs.FormParam;
+-import javax.ws.rs.GET;
+-import javax.ws.rs.POST;
+-import javax.ws.rs.PUT;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.PathParam;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.QueryParam;
+-import javax.ws.rs.core.Context;
+-import javax.ws.rs.core.MediaType;
+-import javax.ws.rs.core.Response;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.http.JettyUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServiceProtocol;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.util.LRUCacheHashMap;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import com.google.inject.Inject;
+-import com.google.inject.Singleton;
+-
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices.DEFAULT_ACTIVITIES_COUNT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices.DEFAULT_SUMMARIZE;
+-
+-/**
+- * RouterWebServices is a service that runs on each router that can be used to
+- * intercept and inspect {@link RMWebServiceProtocol} messages from client to
+- * the cluster resource manager. It listens {@link RMWebServiceProtocol} REST
+- * messages from the client and creates a request intercepting pipeline instance
+- * for each client. The pipeline is a chain of {@link RESTRequestInterceptor}
+- * instances that can inspect and modify the request/response as needed. The
+- * main difference with AMRMProxyService is the protocol they implement.
+- **/
+-@Singleton
+-@Path(RMWSConsts.RM_WEB_SERVICE_PATH)
+-public class RouterWebServices implements RMWebServiceProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterWebServices.class);
+-  private final Router router;
+-  private final Configuration conf;
+-  private @Context HttpServletResponse response;
+-
+-  private Map<String, RequestInterceptorChainWrapper> userPipelineMap;
+-
+-  // -------Default values of QueryParams for RMWebServiceProtocol--------
+-
+-  public static final String DEFAULT_QUEUE = "default";
+-  public static final String DEFAULT_RESERVATION_ID = "";
+-  public static final String DEFAULT_START_TIME = "0";
+-  public static final String DEFAULT_END_TIME = "-1";
+-  public static final String DEFAULT_INCLUDE_RESOURCE = "false";
+-
+-  @Inject
+-  public RouterWebServices(final Router router, Configuration conf) {
+-    this.router = router;
+-    this.conf = conf;
+-    int maxCacheSize =
+-        conf.getInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-            YarnConfiguration.DEFAULT_ROUTER_PIPELINE_CACHE_MAX_SIZE);
+-    this.userPipelineMap = Collections.synchronizedMap(new LRUCacheHashMap<>(maxCacheSize, true));
+-  }
+-
+-  private void init() {
+-    // clear content type
+-    response.setContentType(null);
+-  }
+-
+-  @VisibleForTesting
+-  protected RequestInterceptorChainWrapper getInterceptorChain(
+-      final HttpServletRequest hsr) {
+-    String user = "";
+-    if (hsr != null) {
+-      user = hsr.getRemoteUser();
+-    }
+-    try {
+-      if (user == null || user.equals("")) {
+-        // Yarn Router user
+-        user = UserGroupInformation.getCurrentUser().getUserName();
+-      }
+-    } catch (IOException e) {
+-      LOG.error("Cannot get user: {}", e.getMessage());
+-    }
+-    RequestInterceptorChainWrapper chain = userPipelineMap.get(user);
+-    if (chain != null && chain.getRootInterceptor() != null) {
+-      return chain;
+-    }
+-    return initializePipeline(user);
+-  }
+-
+-  /**
+-   * Gets the Request interceptor chains for all the users.
+-   *
+-   * @return the request interceptor chains.
+-   */
+-  @VisibleForTesting
+-  protected Map<String, RequestInterceptorChainWrapper> getPipelines() {
+-    return this.userPipelineMap;
+-  }
+-
+-  /**
+-   * This method creates and returns reference of the first interceptor in the
+-   * chain of request interceptor instances.
+-   *
+-   * @return the reference of the first interceptor in the chain
+-   */
+-  @VisibleForTesting
+-  protected RESTRequestInterceptor createRequestInterceptorChain() {
+-    return RouterServerUtil.createRequestInterceptorChain(conf,
+-        YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_INTERCEPTOR_CLASS,
+-        RESTRequestInterceptor.class);
+-  }
+-
+-  /**
+-   * Initializes the request interceptor pipeline for the specified user.
+-   *
+-   * @param user specified user.
+-   */
+-  private RequestInterceptorChainWrapper initializePipeline(String user) {
+-    synchronized (this.userPipelineMap) {
+-      if (this.userPipelineMap.containsKey(user)) {
+-        LOG.info("Request to start an already existing user: {}"
+-            + " was received, so ignoring.", user);
+-        return userPipelineMap.get(user);
+-      }
+-
+-      RequestInterceptorChainWrapper chainWrapper =
+-          new RequestInterceptorChainWrapper();
+-      try {
+-        // We should init the pipeline instance after it is created and then
+-        // add to the map, to ensure thread safe.
+-        LOG.info("Initializing request processing pipeline for user: {}.", user);
+-
+-        RESTRequestInterceptor interceptorChain =
+-            this.createRequestInterceptorChain();
+-        interceptorChain.init(user);
+-        RouterClientRMService routerClientRMService = router.getClientRMProxyService();
+-        interceptorChain.setRouterClientRMService(routerClientRMService);
+-        chainWrapper.init(interceptorChain);
+-      } catch (Exception e) {
+-        LOG.error("Init RESTRequestInterceptor error for user: {}", user, e);
+-        throw e;
+-      }
+-
+-      this.userPipelineMap.put(user, chainWrapper);
+-      return chainWrapper;
+-    }
+-  }
+-
+-  /**
+-   * Private structure for encapsulating RequestInterceptor and user instances.
+-   *
+-   */
+-  @Private
+-  public static class RequestInterceptorChainWrapper {
+-    private RESTRequestInterceptor rootInterceptor;
+-
+-    /**
+-     * Initializes the wrapper with the specified parameters.
+-     *
+-     * @param interceptor the first interceptor in the pipeline
+-     */
+-    public synchronized void init(RESTRequestInterceptor interceptor) {
+-      this.rootInterceptor = interceptor;
+-    }
+-
+-    /**
+-     * Gets the root request interceptor.
+-     *
+-     * @return the root request interceptor
+-     */
+-    public synchronized RESTRequestInterceptor getRootInterceptor() {
+-      return rootInterceptor;
+-    }
+-
+-    /**
+-     * Shutdown the chain of interceptors when the object is destroyed.
+-     */
+-    @Override
+-    protected void finalize() {
+-      rootInterceptor.shutdown();
+-    }
+-  }
+-
+-  @GET
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ClusterInfo get() {
+-    return getClusterInfo();
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.INFO)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ClusterInfo getClusterInfo() {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getClusterInfo();
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.CLUSTER_USER_INFO)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(@Context HttpServletRequest hsr) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getClusterUserInfo(hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.METRICS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getClusterMetricsInfo();
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.SCHEDULER)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getSchedulerInfo();
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.SCHEDULER_LOGS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public String dumpSchedulerLogs(@FormParam(RMWSConsts.TIME) String time,
+-      @Context HttpServletRequest hsr) throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().dumpSchedulerLogs(time, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.NODES)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public NodesInfo getNodes(@QueryParam(RMWSConsts.STATES) String states) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getNodes(states);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.NODES_NODEID)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public NodeInfo getNode(@PathParam(RMWSConsts.NODEID) String nodeId) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getNode(nodeId);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.NODE_RESOURCE)
+-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ResourceInfo updateNodeResource(
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.NODEID) String nodeId,
+-      ResourceOptionInfo resourceOption) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().updateNodeResource(
+-        hsr, nodeId, resourceOption);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppsInfo getApps(@Context HttpServletRequest hsr,
+-      @QueryParam(RMWSConsts.STATE) String stateQuery,
+-      @QueryParam(RMWSConsts.STATES) Set<String> statesQuery,
+-      @QueryParam(RMWSConsts.FINAL_STATUS) String finalStatusQuery,
+-      @QueryParam(RMWSConsts.USER) String userQuery,
+-      @QueryParam(RMWSConsts.QUEUE) String queueQuery,
+-      @QueryParam(RMWSConsts.LIMIT) String count,
+-      @QueryParam(RMWSConsts.STARTED_TIME_BEGIN) String startedBegin,
+-      @QueryParam(RMWSConsts.STARTED_TIME_END) String startedEnd,
+-      @QueryParam(RMWSConsts.FINISHED_TIME_BEGIN) String finishBegin,
+-      @QueryParam(RMWSConsts.FINISHED_TIME_END) String finishEnd,
+-      @QueryParam(RMWSConsts.APPLICATION_TYPES) Set<String> applicationTypes,
+-      @QueryParam(RMWSConsts.APPLICATION_TAGS) Set<String> applicationTags,
+-      @QueryParam(RMWSConsts.NAME) String name,
+-      @QueryParam(RMWSConsts.DESELECTS) Set<String> unselectedFields) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getApps(hsr, stateQuery, statesQuery,
+-        finalStatusQuery, userQuery, queueQuery, count, startedBegin,
+-        startedEnd, finishBegin, finishEnd, applicationTypes, applicationTags,
+-        name, unselectedFields);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.SCHEDULER_ACTIVITIES)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ActivitiesInfo getActivities(@Context HttpServletRequest hsr,
+-      @QueryParam(RMWSConsts.NODEID) String nodeId,
+-      @QueryParam(RMWSConsts.GROUP_BY) String groupBy) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor()
+-        .getActivities(hsr, nodeId, groupBy);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.SCHEDULER_BULK_ACTIVITIES)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(
+-      @Context HttpServletRequest hsr,
+-      @QueryParam(RMWSConsts.GROUP_BY) String groupBy,
+-      @QueryParam(RMWSConsts.ACTIVITIES_COUNT)
+-      @DefaultValue(DEFAULT_ACTIVITIES_COUNT) int activitiesCount)
+-      throws InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getBulkActivities(hsr, groupBy,
+-        activitiesCount);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.SCHEDULER_APP_ACTIVITIES)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppActivitiesInfo getAppActivities(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @QueryParam(RMWSConsts.MAX_TIME) String time,
+-      @QueryParam(RMWSConsts.REQUEST_PRIORITIES) Set<String> requestPriorities,
+-      @QueryParam(RMWSConsts.ALLOCATION_REQUEST_IDS)
+-          Set<String> allocationRequestIds,
+-      @QueryParam(RMWSConsts.GROUP_BY) String groupBy,
+-      @QueryParam(RMWSConsts.LIMIT) String limit,
+-      @QueryParam(RMWSConsts.ACTIONS) Set<String> actions,
+-      @QueryParam(RMWSConsts.SUMMARIZE) @DefaultValue(DEFAULT_SUMMARIZE)
+-          boolean summarize) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppActivities(hsr, appId, time,
+-        requestPriorities, allocationRequestIds, groupBy, limit, actions,
+-        summarize);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APP_STATISTICS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(
+-      @Context HttpServletRequest hsr,
+-      @QueryParam(RMWSConsts.STATES) Set<String> stateQueries,
+-      @QueryParam(RMWSConsts.APPLICATION_TYPES) Set<String> typeQueries) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppStatistics(hsr, stateQueries,
+-        typeQueries);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppInfo getApp(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @QueryParam(RMWSConsts.DESELECTS) Set<String> unselectedFields) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getApp(hsr, appId, unselectedFields);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_STATE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppState getAppState(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppState(hsr, appId);
+-  }
+-
+-  @PUT
+-  @Path(RMWSConsts.APPS_APPID_STATE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response updateAppState(AppState targetState,
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().updateAppState(targetState, hsr,
+-        appId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.GET_NODE_TO_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(@Context HttpServletRequest hsr)
+-      throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getNodeToLabels(hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.LABEL_MAPPINGS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(
+-      @QueryParam(RMWSConsts.LABELS) Set<String> labels) throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(null);
+-    return pipeline.getRootInterceptor().getLabelsToNodes(labels);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.REPLACE_NODE_TO_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response replaceLabelsOnNodes(
+-      final NodeToLabelsEntryList newNodeToLabels,
+-      @Context HttpServletRequest hsr) throws Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().replaceLabelsOnNodes(newNodeToLabels,
+-        hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.NODES_NODEID_REPLACE_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response replaceLabelsOnNode(
+-      @QueryParam(RMWSConsts.LABELS) Set<String> newNodeLabelsName,
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.NODEID) String nodeId) throws Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().replaceLabelsOnNode(newNodeLabelsName,
+-        hsr, nodeId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.GET_NODE_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(@Context HttpServletRequest hsr)
+-      throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getClusterNodeLabels(hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.ADD_NODE_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
+-      @Context HttpServletRequest hsr) throws Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().addToClusterNodeLabels(newNodeLabels,
+-        hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.REMOVE_NODE_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response removeFromClusterNodeLabels(
+-      @QueryParam(RMWSConsts.LABELS) Set<String> oldNodeLabels,
+-      @Context HttpServletRequest hsr) throws Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor()
+-        .removeFromClusterNodeLabels(oldNodeLabels, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.NODES_NODEID_GETLABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.NODEID) String nodeId) throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getLabelsOnNode(hsr, nodeId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_PRIORITY)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppPriority getAppPriority(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppPriority(hsr, appId);
+-  }
+-
+-  @PUT
+-  @Path(RMWSConsts.APPS_APPID_PRIORITY)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority,
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor()
+-        .updateApplicationPriority(targetPriority, hsr, appId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_QUEUE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppQueue getAppQueue(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppQueue(hsr, appId);
+-  }
+-
+-  @PUT
+-  @Path(RMWSConsts.APPS_APPID_QUEUE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue,
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().updateAppQueue(targetQueue, hsr,
+-        appId);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.APPS_NEW_APPLICATION)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response createNewApplication(@Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().createNewApplication(hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.APPS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp,
+-      @Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().submitApplication(newApp, hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.DELEGATION_TOKEN)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response postDelegationToken(DelegationToken tokenData,
+-      @Context HttpServletRequest hsr) throws AuthorizationException,
+-      IOException, InterruptedException, Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().postDelegationToken(tokenData, hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.DELEGATION_TOKEN_EXPIRATION)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response postDelegationTokenExpiration(@Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().postDelegationTokenExpiration(hsr);
+-  }
+-
+-  @DELETE
+-  @Path(RMWSConsts.DELEGATION_TOKEN)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response cancelDelegationToken(@Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().cancelDelegationToken(hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.RESERVATION_NEW)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response createNewReservation(@Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().createNewReservation(hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.RESERVATION_SUBMIT)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      @Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().submitReservation(resContext, hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.RESERVATION_UPDATE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      @Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().updateReservation(resContext, hsr);
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.RESERVATION_DELETE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext,
+-      @Context HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().deleteReservation(resContext, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.RESERVATION_LIST)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response listReservation(
+-      @QueryParam(RMWSConsts.QUEUE) @DefaultValue(DEFAULT_QUEUE) String queue,
+-      @QueryParam(RMWSConsts.RESERVATION_ID)
+-      @DefaultValue(DEFAULT_RESERVATION_ID) String reservationId,
+-      @QueryParam(RMWSConsts.START_TIME) @DefaultValue(DEFAULT_START_TIME) long startTime,
+-      @QueryParam(RMWSConsts.END_TIME) @DefaultValue(DEFAULT_END_TIME) long endTime,
+-      @QueryParam(RMWSConsts.INCLUDE_RESOURCE)
+-      @DefaultValue(DEFAULT_INCLUDE_RESOURCE) boolean includeResourceAllocations,
+-      @Context HttpServletRequest hsr) throws Exception {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().listReservation(queue, reservationId,
+-        startTime, endTime, includeResourceAllocations, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_TIMEOUTS_TYPE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @PathParam(RMWSConsts.TYPE) String type) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppTimeout(hsr, appId, type);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_TIMEOUTS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppTimeouts(hsr, appId);
+-  }
+-
+-  @PUT
+-  @Path(RMWSConsts.APPS_TIMEOUT)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
+-      @Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().updateApplicationTimeout(appTimeout,
+-        hsr, appId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_APPATTEMPTS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(@Context HttpServletRequest hsr,
+-      @PathParam(RMWSConsts.APPID) String appId) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getAppAttempts(hsr, appId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.CHECK_USER_ACCESS_TO_QUEUE)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-                MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(
+-      @PathParam(RMWSConsts.QUEUE) String queue,
+-      @QueryParam(RMWSConsts.USER) String username,
+-      @QueryParam(RMWSConsts.QUEUE_ACL_TYPE)
+-      @DefaultValue("SUBMIT_APPLICATIONS") String queueAclType,
+-      @Context HttpServletRequest hsr) throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().checkUserAccessToQueue(queue,
+-        username, queueAclType, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_APPATTEMPTS_APPATTEMPTID)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo getAppAttempt(
+-      @Context HttpServletRequest req, @Context HttpServletResponse res,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @PathParam(RMWSConsts.APPATTEMPTID) String appAttemptId) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(req);
+-    return pipeline.getRootInterceptor().getAppAttempt(req, res, appId,
+-        appAttemptId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.APPS_APPID_APPATTEMPTS_APPATTEMPTID_CONTAINERS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public ContainersInfo getContainers(@Context HttpServletRequest req,
+-      @Context HttpServletResponse res,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @PathParam(RMWSConsts.APPATTEMPTID) String appAttemptId) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(req);
+-    return pipeline.getRootInterceptor().getContainers(req, res, appId,
+-        appAttemptId);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.GET_CONTAINER)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public ContainerInfo getContainer(@Context HttpServletRequest req,
+-      @Context HttpServletResponse res,
+-      @PathParam(RMWSConsts.APPID) String appId,
+-      @PathParam(RMWSConsts.APPATTEMPTID) String appAttemptId,
+-      @PathParam(RMWSConsts.CONTAINERID) String containerId) {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(req);
+-    return pipeline.getRootInterceptor().getContainer(req, res, appId,
+-        appAttemptId, containerId);
+-  }
+-
+-  @PUT
+-  @Path(RMWSConsts.SCHEDULER_CONF)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, InterruptedException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor()
+-        .updateSchedulerConfiguration(mutationInfo, hsr);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.SCHEDULER_CONF)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest hsr)
+-      throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getSchedulerConfiguration(hsr);
+-  }
+-
+-  @VisibleForTesting
+-  protected void setResponse(HttpServletResponse response) {
+-    this.response = response;
+-  }
+-
+-  @POST
+-  @Path(RMWSConsts.SIGNAL_TO_CONTAINER)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public Response signalToContainer(
+-      @PathParam(RMWSConsts.CONTAINERID) String containerId,
+-      @PathParam(RMWSConsts.COMMAND) String command,
+-      @Context HttpServletRequest req)
+-      throws AuthorizationException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(req);
+-    return pipeline.getRootInterceptor()
+-        .signalToContainer(containerId, command, req);
+-  }
+-
+-  @GET
+-  @Path(RMWSConsts.GET_RM_NODE_LABELS)
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public NodeLabelsInfo getRMNodeLabels(@Context HttpServletRequest hsr)
+-      throws IOException {
+-    init();
+-    RequestInterceptorChainWrapper pipeline = getInterceptorChain(hsr);
+-    return pipeline.getRootInterceptor().getRMNodeLabels(hsr);
+-  }
+-
+-  public Router getRouter() {
+-    return router;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/RouterAppInfoCacheKey.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/RouterAppInfoCacheKey.java
+deleted file mode 100644
+index 27164f00415..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/RouterAppInfoCacheKey.java
++++ /dev/null
+@@ -1,156 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.cache;
+-
+-import org.apache.commons.lang3.builder.EqualsBuilder;
+-import org.apache.commons.lang3.builder.HashCodeBuilder;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebAppUtil;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import java.util.Set;
+-
+-public class RouterAppInfoCacheKey {
+-
+-  private static String user = "YarnRouter";
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(RouterAppInfoCacheKey.class.getName());
+-
+-  private UserGroupInformation ugi;
+-  private String stateQuery;
+-  private Set<String> statesQuery;
+-  private String finalStatusQuery;
+-  private String userQuery;
+-  private String queueQuery;
+-  private String count;
+-  private String startedBegin;
+-  private String startedEnd;
+-  private String finishBegin;
+-  private String finishEnd;
+-  private Set<String> applicationTypes;
+-  private Set<String> applicationTags;
+-  private String name;
+-  private Set<String> unselectedFields;
+-
+-  public RouterAppInfoCacheKey() {
+-
+-  }
+-
+-  @SuppressWarnings("checkstyle:ParameterNumber")
+-  public RouterAppInfoCacheKey(UserGroupInformation ugi, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-    this.ugi = ugi;
+-    this.stateQuery = stateQuery;
+-    this.statesQuery = statesQuery;
+-    this.finalStatusQuery = finalStatusQuery;
+-    this.userQuery = userQuery;
+-    this.queueQuery = queueQuery;
+-    this.count = count;
+-    this.startedBegin = startedBegin;
+-    this.startedEnd = startedEnd;
+-    this.finishBegin = finishBegin;
+-    this.finishEnd = finishEnd;
+-    this.applicationTypes = applicationTypes;
+-    this.applicationTags = applicationTags;
+-    this.name = name;
+-    this.unselectedFields = unselectedFields;
+-  }
+-
+-
+-  @SuppressWarnings("checkstyle:ParameterNumber")
+-  public static RouterAppInfoCacheKey newInstance(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields)  {
+-
+-    UserGroupInformation callerUGI = null;
+-    if (hsr != null) {
+-      callerUGI = RMWebAppUtil.getCallerUserGroupInformation(hsr, true);
+-    } else {
+-      // user not required
+-      callerUGI = UserGroupInformation.createRemoteUser("YarnRouter");
+-    }
+-
+-    if (callerUGI == null) {
+-      LOG.error("Unable to obtain user name, user not authenticated.");
+-      return null;
+-    }
+-
+-    return new RouterAppInfoCacheKey(
+-        callerUGI, stateQuery, statesQuery, finalStatusQuery, userQuery,
+-        queueQuery, count, startedBegin, startedEnd, finishBegin, finishEnd,
+-        applicationTypes, applicationTags, name, unselectedFields);
+-  }
+-
+-  @Override
+-  public boolean equals(Object o) {
+-    if (this == o) {
+-      return true;
+-    }
+-    if (o == null || getClass() != o.getClass()) {
+-      return false;
+-    }
+-    RouterAppInfoCacheKey that = (RouterAppInfoCacheKey) o;
+-
+-    return new EqualsBuilder()
+-        .append(this.ugi.getUserName(), that.ugi.getUserName())
+-        .append(this.stateQuery, that.stateQuery)
+-        .append(this.statesQuery, that.statesQuery)
+-        .append(this.finalStatusQuery, that.finalStatusQuery)
+-        .append(this.userQuery, that.userQuery)
+-        .append(this.queueQuery, that.queueQuery)
+-        .append(this.count, that.count)
+-        .append(this.startedBegin, that.startedBegin)
+-        .append(this.startedEnd, that.startedEnd)
+-        .append(this.finishBegin, that.finishBegin)
+-        .append(this.finishEnd, that.finishEnd)
+-        .append(this.applicationTypes, that.applicationTypes)
+-        .append(this.applicationTags, that.applicationTags)
+-        .append(this.name, that.name)
+-        .append(this.unselectedFields, that.unselectedFields)
+-        .isEquals();
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    return new HashCodeBuilder()
+-       .append(this.ugi.getUserName())
+-       .append(this.stateQuery)
+-       .append(this.statesQuery)
+-       .append(this.finalStatusQuery)
+-       .append(this.userQuery)
+-       .append(this.queueQuery)
+-       .append(this.count)
+-       .append(this.startedBegin)
+-       .append(this.startedEnd)
+-       .append(this.finishBegin)
+-       .append(this.finishEnd)
+-       .append(this.applicationTypes)
+-       .append(this.applicationTags)
+-       .append(this.name)
+-       .append(this.unselectedFields)
+-       .toHashCode();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/package-info.java
+deleted file mode 100644
+index 187cd72fe25..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/cache/package-info.java
++++ /dev/null
+@@ -1,18 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.cache;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationBulkActivitiesInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationBulkActivitiesInfo.java
+deleted file mode 100644
+index 87d11ad0feb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationBulkActivitiesInfo.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationBulkActivitiesInfo extends BulkActivitiesInfo {
+-
+-  @XmlElement(name = "subCluster")
+-  private ArrayList<BulkActivitiesInfo> list = new ArrayList<>();
+-
+-  public FederationBulkActivitiesInfo() {
+-  } // JAXB needs this
+-
+-  public FederationBulkActivitiesInfo(ArrayList<BulkActivitiesInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public ArrayList<BulkActivitiesInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(ArrayList<BulkActivitiesInfo> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterInfo.java
+deleted file mode 100644
+index 9b8d7b5431a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterInfo.java
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationClusterInfo extends ClusterInfo {
+-
+-  @XmlElement(name = "subCluster")
+-  private List<ClusterInfo> list = new ArrayList<>();
+-
+-  public FederationClusterInfo() {
+-  } // JAXB needs this
+-
+-  public FederationClusterInfo(ArrayList<ClusterInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public List<ClusterInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(List<ClusterInfo> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterUserInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterUserInfo.java
+deleted file mode 100644
+index b4a19b7919d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationClusterUserInfo.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationClusterUserInfo extends ClusterUserInfo {
+-  @XmlElement(name = "subCluster")
+-  private List<ClusterUserInfo> list = new ArrayList<>();
+-
+-  public FederationClusterUserInfo() {
+-  } // JAXB needs this
+-
+-  public FederationClusterUserInfo(ArrayList<ClusterUserInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public List<ClusterUserInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(List<ClusterUserInfo> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationConfInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationConfInfo.java
+deleted file mode 100644
+index 6a5e611a4f8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationConfInfo.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.webapp.dao.ConfInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationConfInfo extends ConfInfo {
+-  @XmlElement(name = "subCluster")
+-  private List<ConfInfo> list = new ArrayList<>();
+-
+-  @XmlElement(name = "errorMsgs")
+-  private List<String> errorMsgs = new ArrayList<>();
+-  public FederationConfInfo() {
+-  } // JAXB needs this
+-
+-  public List<ConfInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(List<ConfInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public List<String> getErrorMsgs() {
+-    return errorMsgs;
+-  }
+-
+-  public void setErrorMsgs(List<String> errorMsgs) {
+-    this.errorMsgs = errorMsgs;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationRMQueueAclInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationRMQueueAclInfo.java
+deleted file mode 100644
+index 4e61fd772ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationRMQueueAclInfo.java
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationRMQueueAclInfo extends RMQueueAclInfo {
+-
+-  @XmlElement(name = "subCluster")
+-  private List<RMQueueAclInfo> list = new ArrayList<>();
+-
+-  public FederationRMQueueAclInfo() {
+-  } // JAXB needs this
+-
+-  public FederationRMQueueAclInfo(ArrayList<RMQueueAclInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public List<RMQueueAclInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(List<RMQueueAclInfo> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationSchedulerTypeInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationSchedulerTypeInfo.java
+deleted file mode 100644
+index 733af0ce8e2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/FederationSchedulerTypeInfo.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlElement;
+-import javax.xml.bind.annotation.XmlRootElement;
+-import java.util.ArrayList;
+-import java.util.List;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class FederationSchedulerTypeInfo extends SchedulerTypeInfo {
+-  @XmlElement(name = "subCluster")
+-  private List<SchedulerTypeInfo> list = new ArrayList<>();
+-
+-  public FederationSchedulerTypeInfo() {
+-  } // JAXB needs this
+-
+-  public FederationSchedulerTypeInfo(ArrayList<SchedulerTypeInfo> list) {
+-    this.list = list;
+-  }
+-
+-  public List<SchedulerTypeInfo> getList() {
+-    return list;
+-  }
+-
+-  public void setList(List<SchedulerTypeInfo> list) {
+-    this.list = list;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterClusterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterClusterMetrics.java
+deleted file mode 100644
+index f06f85574db..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterClusterMetrics.java
++++ /dev/null
+@@ -1,323 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class RouterClusterMetrics {
+-
+-  protected static final long BYTES_IN_MB = 1024 * 1024;
+-  private static final Logger LOG = LoggerFactory.getLogger(RouterClusterMetrics.class);
+-
+-  // webPageTitlePrefix
+-  private String webPageTitlePrefix = "Federation";
+-
+-  // Application Information.
+-  private String appsSubmitted = "N/A";
+-  private String appsCompleted = "N/A";
+-  private String appsPending = "N/A";
+-  private String appsRunning = "N/A";
+-  private String appsFailed = "N/A";
+-  private String appsKilled = "N/A";
+-
+-  // Memory Information.
+-  private String totalMemory = "N/A";
+-  private String reservedMemory = "N/A";
+-  private String availableMemory = "N/A";
+-  private String allocatedMemory = "N/A";
+-  private String pendingMemory = "N/A";
+-
+-  // VirtualCores Information.
+-  private String reservedVirtualCores = "N/A";
+-  private String availableVirtualCores = "N/A";
+-  private String allocatedVirtualCores = "N/A";
+-  private String pendingVirtualCores = "N/A";
+-  private String totalVirtualCores = "N/A";
+-
+-  // Resources Information.
+-  private String usedResources = "N/A";
+-  private String totalResources = "N/A";
+-  private String reservedResources = "N/A";
+-  private String allocatedContainers = "N/A";
+-
+-  // Resource Percent Information.
+-  private String utilizedMBPercent = "N/A";
+-  private String utilizedVirtualCoresPercent = "N/A";
+-
+-  // Node Information.
+-  private String activeNodes = "N/A";
+-  private String decommissioningNodes = "N/A";
+-  private String decommissionedNodes = "N/A";
+-  private String lostNodes = "N/A";
+-  private String unhealthyNodes = "N/A";
+-  private String rebootedNodes = "N/A";
+-  private String shutdownNodes = "N/A";
+-
+-  public RouterClusterMetrics() {
+-
+-  }
+-
+-  public RouterClusterMetrics(ClusterMetricsInfo metrics) {
+-    if (metrics != null) {
+-      // Application Information Conversion.
+-      conversionApplicationInformation(metrics);
+-
+-      // Memory Information Conversion.
+-      conversionMemoryInformation(metrics);
+-
+-      // Resources Information Conversion.
+-      conversionResourcesInformation(metrics);
+-
+-      // Percent Information Conversion.
+-      conversionResourcesPercent(metrics);
+-
+-      // Node Information Conversion.
+-      conversionNodeInformation(metrics);
+-    }
+-  }
+-
+-  public RouterClusterMetrics(ClusterMetricsInfo metrics,
+-      String webPageTitlePrefix) {
+-    this(metrics);
+-    this.webPageTitlePrefix = webPageTitlePrefix;
+-  }
+-
+-  // Get Key Metric Information
+-  public String getAppsSubmitted() {
+-    return appsSubmitted;
+-  }
+-
+-  public String getAppsCompleted() {
+-    return appsCompleted;
+-  }
+-
+-  public String getAppsPending() {
+-    return appsPending;
+-  }
+-
+-  public String getAppsRunning() {
+-    return appsRunning;
+-  }
+-
+-  public String getAppsFailed() {
+-    return appsFailed;
+-  }
+-
+-  public String getAppsKilled() {
+-    return appsKilled;
+-  }
+-
+-  public String getTotalMemory() {
+-    return totalMemory;
+-  }
+-
+-  public String getReservedMemory() {
+-    return reservedMemory;
+-  }
+-
+-  public String getAvailableMemory() {
+-    return availableMemory;
+-  }
+-
+-  public String getAllocatedMemory() {
+-    return allocatedMemory;
+-  }
+-
+-  public String getPendingMemory() {
+-    return pendingMemory;
+-  }
+-
+-  public String getReservedVirtualCores() {
+-    return reservedVirtualCores;
+-  }
+-
+-  public String getAvailableVirtualCores() {
+-    return availableVirtualCores;
+-  }
+-
+-  public String getAllocatedVirtualCores() {
+-    return allocatedVirtualCores;
+-  }
+-
+-  public String getPendingVirtualCores() {
+-    return pendingVirtualCores;
+-  }
+-
+-  public String getTotalVirtualCores() {
+-    return totalVirtualCores;
+-  }
+-
+-  public String getUsedResources() {
+-    return usedResources;
+-  }
+-
+-  public String getTotalResources() {
+-    return totalResources;
+-  }
+-
+-  public String getReservedResources() {
+-    return reservedResources;
+-  }
+-
+-  public String getAllocatedContainers() {
+-    return allocatedContainers;
+-  }
+-
+-  public String getUtilizedMBPercent() {
+-    return utilizedMBPercent;
+-  }
+-
+-  public String getUtilizedVirtualCoresPercent() {
+-    return utilizedVirtualCoresPercent;
+-  }
+-
+-  public String getActiveNodes() {
+-    return activeNodes;
+-  }
+-
+-  public String getDecommissioningNodes() {
+-    return decommissioningNodes;
+-  }
+-
+-  public String getDecommissionedNodes() {
+-    return decommissionedNodes;
+-  }
+-
+-  public String getLostNodes() {
+-    return lostNodes;
+-  }
+-
+-  public String getUnhealthyNodes() {
+-    return unhealthyNodes;
+-  }
+-
+-  public String getRebootedNodes() {
+-    return rebootedNodes;
+-  }
+-
+-  public String getShutdownNodes() {
+-    return shutdownNodes;
+-  }
+-
+-  // Metric Information Conversion
+-  public void conversionApplicationInformation(ClusterMetricsInfo metrics) {
+-    try {
+-      // Application Information.
+-      this.appsSubmitted = String.valueOf(metrics.getAppsSubmitted());
+-      this.appsCompleted = String.valueOf(metrics.getAppsCompleted() +
+-           metrics.getAppsFailed() + metrics.getAppsKilled());
+-      this.appsPending = String.valueOf(metrics.getAppsPending());
+-      this.appsRunning = String.valueOf(metrics.getAppsRunning());
+-      this.appsFailed = String.valueOf(metrics.getAppsFailed());
+-      this.appsKilled = String.valueOf(metrics.getAppsKilled());
+-    } catch (Exception e) {
+-      LOG.error("conversionApplicationInformation error.", e);
+-    }
+-  }
+-
+-  // Metric Memory Information
+-  public void conversionMemoryInformation(ClusterMetricsInfo metrics) {
+-    try {
+-      // Memory Information.
+-      this.totalMemory = StringUtils.byteDesc(metrics.getTotalMB() * BYTES_IN_MB);
+-      this.reservedMemory = StringUtils.byteDesc(metrics.getReservedMB() * BYTES_IN_MB);
+-      this.availableMemory = StringUtils.byteDesc(metrics.getAvailableMB() * BYTES_IN_MB);
+-      this.allocatedMemory = StringUtils.byteDesc(metrics.getAllocatedMB() * BYTES_IN_MB);
+-      this.pendingMemory = StringUtils.byteDesc(metrics.getPendingMB() * BYTES_IN_MB);
+-    } catch (Exception e) {
+-      LOG.error("conversionMemoryInformation error.", e);
+-    }
+-  }
+-
+-  // ResourcesInformation Conversion
+-  public void conversionResourcesInformation(ClusterMetricsInfo metrics) {
+-    try {
+-      // Parse resource information from metrics.
+-      Resource metricUsedResources;
+-      Resource metricTotalResources;
+-      Resource metricReservedResources;
+-
+-      int metricAllocatedContainers;
+-      if (metrics.getCrossPartitionMetricsAvailable()) {
+-        metricAllocatedContainers = metrics.getTotalAllocatedContainersAcrossPartition();
+-        metricUsedResources = metrics.getTotalUsedResourcesAcrossPartition().getResource();
+-        metricTotalResources = metrics.getTotalClusterResourcesAcrossPartition().getResource();
+-        metricReservedResources = metrics.getTotalReservedResourcesAcrossPartition().getResource();
+-        // getTotalUsedResourcesAcrossPartition includes reserved resources.
+-        Resources.subtractFrom(metricUsedResources, metricReservedResources);
+-      } else {
+-        metricAllocatedContainers = metrics.getContainersAllocated();
+-        metricUsedResources = Resource.newInstance(metrics.getAllocatedMB(),
+-            (int) metrics.getAllocatedVirtualCores());
+-        metricTotalResources = Resource.newInstance(metrics.getTotalMB(),
+-            (int) metrics.getTotalVirtualCores());
+-        metricReservedResources = Resource.newInstance(metrics.getReservedMB(),
+-            (int) metrics.getReservedVirtualCores());
+-      }
+-
+-      // Convert to standard format.
+-      usedResources = metricUsedResources.getFormattedString();
+-      totalResources = metricTotalResources.getFormattedString();
+-      reservedResources = metricReservedResources.getFormattedString();
+-      allocatedContainers =  String.valueOf(metricAllocatedContainers);
+-
+-    } catch (Exception e) {
+-      LOG.error("conversionResourcesInformation error.", e);
+-    }
+-  }
+-
+-  // ResourcesPercent Conversion
+-  public void conversionResourcesPercent(ClusterMetricsInfo metrics) {
+-    try {
+-      this.utilizedMBPercent = String.valueOf(metrics.getUtilizedMBPercent());
+-      this.utilizedVirtualCoresPercent = String.valueOf(metrics.getUtilizedVirtualCoresPercent());
+-    } catch (Exception e) {
+-      LOG.error("conversionResourcesPercent error.", e);
+-    }
+-  }
+-
+-  // NodeInformation Conversion
+-  public void conversionNodeInformation(ClusterMetricsInfo metrics) {
+-    try {
+-      this.activeNodes = String.valueOf(metrics.getActiveNodes());
+-      this.decommissioningNodes = String.valueOf(metrics.getDecommissioningNodes());
+-      this.decommissionedNodes = String.valueOf(metrics.getDecommissionedNodes());
+-      this.lostNodes = String.valueOf(metrics.getLostNodes());
+-      this.unhealthyNodes = String.valueOf(metrics.getUnhealthyNodes());
+-      this.rebootedNodes = String.valueOf(metrics.getRebootedNodes());
+-      this.shutdownNodes = String.valueOf(metrics.getShutdownNodes());
+-    } catch (Exception e) {
+-      LOG.error("conversionNodeInformation error.", e);
+-    }
+-  }
+-
+-  public String getWebPageTitlePrefix() {
+-    return webPageTitlePrefix;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterInfo.java
+deleted file mode 100644
+index 7cedd0c8e1f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterInfo.java
++++ /dev/null
+@@ -1,104 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.service.Service;
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.util.YarnVersionInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class RouterInfo {
+-  private long id;
+-  private long startedOn;
+-  private Service.STATE state;
+-  private String routerStateStoreName;
+-  private String routerVersion;
+-  private String routerBuildVersion;
+-  private String routerVersionBuiltOn;
+-  private String hadoopVersion;
+-  private String hadoopBuildVersion;
+-  private String hadoopVersionBuiltOn;
+-
+-  public RouterInfo() {
+-  } // JAXB needs this
+-
+-  public RouterInfo(Router router) {
+-    long ts = Router.getClusterTimeStamp();
+-    this.id = ts;
+-    this.state = router.getServiceState();
+-    Configuration configuration = router.getConfig();
+-    this.routerStateStoreName = configuration.get(
+-        YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS,
+-        YarnConfiguration.DEFAULT_FEDERATION_STATESTORE_CLIENT_CLASS);
+-    this.routerVersion = YarnVersionInfo.getVersion();
+-    this.routerBuildVersion = YarnVersionInfo.getBuildVersion();
+-    this.routerVersionBuiltOn = YarnVersionInfo.getDate();
+-    this.hadoopVersion = VersionInfo.getVersion();
+-    this.hadoopBuildVersion = VersionInfo.getBuildVersion();
+-    this.hadoopVersionBuiltOn = VersionInfo.getDate();
+-    this.startedOn = ts;
+-  }
+-
+-  public String getState() {
+-    return this.state.toString();
+-  }
+-
+-  public String getRouterStateStore() {
+-    return this.routerStateStoreName;
+-  }
+-
+-  public String getRouterVersion() {
+-    return this.routerVersion;
+-  }
+-
+-  public String getRouterBuildVersion() {
+-    return this.routerBuildVersion;
+-  }
+-
+-  public String getRouterVersionBuiltOn() {
+-    return this.routerVersionBuiltOn;
+-  }
+-
+-  public String getHadoopVersion() {
+-    return this.hadoopVersion;
+-  }
+-
+-  public String getHadoopBuildVersion() {
+-    return this.hadoopBuildVersion;
+-  }
+-
+-  public String getHadoopVersionBuiltOn() {
+-    return this.hadoopVersionBuiltOn;
+-  }
+-
+-  public long getClusterId() {
+-    return this.id;
+-  }
+-
+-  public long getStartedOn() {
+-    return this.startedOn;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterSchedulerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterSchedulerMetrics.java
+deleted file mode 100644
+index 714642cec83..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/RouterSchedulerMetrics.java
++++ /dev/null
+@@ -1,120 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerOverviewInfo;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class RouterSchedulerMetrics {
+-
+-  // Metrics Log.
+-  private static final Logger LOG = LoggerFactory.getLogger(RouterSchedulerMetrics.class);
+-
+-  // Scheduler Information.
+-  private String subCluster = "N/A";
+-  private String schedulerType = "N/A";
+-  private String schedulingResourceType = "N/A";
+-  private String minimumAllocation = "N/A";
+-  private String maximumAllocation = "N/A";
+-  private String applicationPriority = "N/A";
+-  private String schedulerBusy = "N/A";
+-  private String rmDispatcherEventQueueSize = "N/A";
+-  private String schedulerDispatcherEventQueueSize = "N/A";
+-
+-  public RouterSchedulerMetrics() {
+-
+-  }
+-
+-  public RouterSchedulerMetrics(SubClusterInfo subClusterInfo, RouterClusterMetrics metrics,
+-      SchedulerOverviewInfo overview) {
+-    if (subClusterInfo != null) {
+-      initRouterSchedulerMetrics(subClusterInfo.getSubClusterId().getId(), overview);
+-    }
+-  }
+-
+-  public RouterSchedulerMetrics(String localClusterName, SchedulerOverviewInfo overview) {
+-    initRouterSchedulerMetrics(localClusterName, overview);
+-  }
+-
+-  private void initRouterSchedulerMetrics(String subClusterName,
+-      SchedulerOverviewInfo overview) {
+-    try {
+-      // Parse Scheduler Information.
+-      this.subCluster = subClusterName;
+-      this.schedulerType = overview.getSchedulerType();
+-      this.schedulingResourceType = overview.getSchedulingResourceType();
+-      this.minimumAllocation = overview.getMinimumAllocation().toString();
+-      this.maximumAllocation = overview.getMaximumAllocation().toString();
+-      this.applicationPriority = String.valueOf(overview.getApplicationPriority());
+-      if (overview.getSchedulerBusy() != -1) {
+-        this.schedulerBusy = String.valueOf(overview.getSchedulerBusy());
+-      }
+-      this.rmDispatcherEventQueueSize =
+-          String.valueOf(overview.getRmDispatcherEventQueueSize());
+-      this.schedulerDispatcherEventQueueSize =
+-          String.valueOf(overview.getSchedulerDispatcherEventQueueSize());
+-    } catch (Exception ex) {
+-      LOG.error("RouterSchedulerMetrics Error.", ex);
+-    }
+-  }
+-
+-  public String getSubCluster() {
+-    return subCluster;
+-  }
+-
+-  public String getSchedulerType() {
+-    return schedulerType;
+-  }
+-
+-  public String getSchedulingResourceType() {
+-    return schedulingResourceType;
+-  }
+-
+-  public String getMinimumAllocation() {
+-    return minimumAllocation;
+-  }
+-
+-  public String getMaximumAllocation() {
+-    return maximumAllocation;
+-  }
+-
+-  public String getApplicationPriority() {
+-    return applicationPriority;
+-  }
+-
+-  public String getRmDispatcherEventQueueSize() {
+-    return rmDispatcherEventQueueSize;
+-  }
+-
+-  public String getSchedulerDispatcherEventQueueSize() {
+-    return schedulerDispatcherEventQueueSize;
+-  }
+-
+-  public String getSchedulerBusy() {
+-    return schedulerBusy;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/SubClusterResult.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/SubClusterResult.java
+deleted file mode 100644
+index 2a527c28d10..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/SubClusterResult.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+-
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-
+-public class SubClusterResult<R> {
+-  private SubClusterInfo subClusterInfo;
+-  private R response;
+-  private Exception exception;
+-
+-  public SubClusterResult() {
+-  }
+-
+-  public SubClusterResult(SubClusterInfo subCluster, R res, Exception ex) {
+-    this.subClusterInfo = subCluster;
+-    this.response = res;
+-    this.exception = ex;
+-  }
+-
+-  public SubClusterInfo getSubClusterInfo() {
+-    return subClusterInfo;
+-  }
+-
+-  public void setSubClusterInfo(SubClusterInfo subClusterInfo) {
+-    this.subClusterInfo = subClusterInfo;
+-  }
+-
+-  public Exception getException() {
+-    return exception;
+-  }
+-
+-  public void setException(Exception exception) {
+-    this.exception = exception;
+-  }
+-
+-  public R getResponse() {
+-    return response;
+-  }
+-
+-  public void setResponse(R response) {
+-    this.response = response;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/package-info.java
+deleted file mode 100644
+index 27f43ad1ff4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/dao/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router Web Dao package. **/
+-package org.apache.hadoop.yarn.server.router.webapp.dao;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/package-info.java
+deleted file mode 100644
+index bd94ead9c06..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/package-info.java
++++ /dev/null
+@@ -1,20 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/** Router WebApp package. **/
+-package org.apache.hadoop.yarn.server.router.webapp;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouter.java
+deleted file mode 100644
+index f51ac6d2b83..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouter.java
++++ /dev/null
+@@ -1,407 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-import static org.junit.Assert.fail;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.http.HttpServer2;
+-import org.apache.hadoop.security.HttpCrossOriginFilterInitializer;
+-import org.apache.hadoop.security.authorize.AccessControlList;
+-import org.apache.hadoop.security.authorize.ServiceAuthorizationManager;
+-import org.apache.hadoop.security.http.CrossOriginFilter;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.eclipse.jetty.servlet.FilterHolder;
+-import org.eclipse.jetty.servlet.ServletHandler;
+-import org.eclipse.jetty.webapp.WebAppContext;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.mockito.Mockito;
+-
+-import javax.servlet.FilterChain;
+-import javax.servlet.ServletException;
+-import javax.servlet.ServletOutputStream;
+-import javax.servlet.http.Cookie;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import java.io.ByteArrayOutputStream;
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.io.PrintWriter;
+-import java.util.Collection;
+-import java.util.HashMap;
+-import java.util.Locale;
+-import java.util.Map;
+-
+-/**
+- * Tests {@link Router}.
+- */
+-public class TestRouter {
+-
+-  @Test
+-  public void testJVMMetricsService() {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    Router router = new Router();
+-    router.init(conf);
+-    assertEquals(3, router.getServices().size());
+-  }
+-
+-  @Test
+-  public void testServiceACLRefresh() {
+-    Configuration conf = new Configuration();
+-    conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
+-        true);
+-    String aclsString = "alice,bob users,wheel";
+-    conf.set("security.applicationclient.protocol.acl", aclsString);
+-    conf.set("security.resourcemanager-administration.protocol.acl",
+-        aclsString);
+-
+-    Router router = new Router();
+-    router.init(conf);
+-    router.start();
+-
+-    // verify service Acls refresh for RouterClientRMService
+-    ServiceAuthorizationManager clientRMServiceManager =
+-        router.clientRMProxyService.getServer().
+-        getServiceAuthorizationManager();
+-    verifyServiceACLsRefresh(clientRMServiceManager,
+-        org.apache.hadoop.yarn.api.ApplicationClientProtocolPB.class,
+-        aclsString);
+-
+-    // verify service Acls refresh for RouterRMAdminService
+-    ServiceAuthorizationManager routerAdminServiceManager =
+-        router.rmAdminProxyService.getServer().getServiceAuthorizationManager();
+-    verifyServiceACLsRefresh(routerAdminServiceManager,
+-        org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocolPB.class,
+-        aclsString);
+-
+-    router.stop();
+-
+-  }
+-
+-  private void verifyServiceACLsRefresh(ServiceAuthorizationManager manager,
+-      Class<?> protocol, String aclString) {
+-    if (manager.getProtocolsWithAcls().size() == 0) {
+-      fail("Acls are not refreshed for protocol " + protocol);
+-    }
+-    for (Class<?> protocolClass : manager.getProtocolsWithAcls()) {
+-      AccessControlList accessList = manager.getProtocolsAcls(protocolClass);
+-      if (protocolClass == protocol) {
+-        Assert.assertEquals(accessList.getAclString(), aclString);
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testRouterSupportCrossOrigin() throws ServletException, IOException {
+-
+-    // We design test cases like this
+-    // We start the Router and enable the Router to support Cross-origin.
+-    // In the configuration, we allow example.com to access.
+-    // 1. We simulate example.com and get the correct response
+-    // 2. We simulate example.org and cannot get a response
+-
+-    // Initialize RouterWeb's CrossOrigin capability
+-    Configuration conf = new Configuration();
+-    conf.setBoolean(YarnConfiguration.ROUTER_WEBAPP_ENABLE_CORS_FILTER, true);
+-    conf.set("hadoop.http.filter.initializers", HttpCrossOriginFilterInitializer.class.getName());
+-    conf.set(HttpCrossOriginFilterInitializer.PREFIX + CrossOriginFilter.ALLOWED_ORIGINS,
+-        "example.com");
+-    conf.set(HttpCrossOriginFilterInitializer.PREFIX + CrossOriginFilter.ALLOWED_HEADERS,
+-        "X-Requested-With,Accept");
+-    conf.set(HttpCrossOriginFilterInitializer.PREFIX + CrossOriginFilter.ALLOWED_METHODS,
+-        "GET,POST");
+-
+-    // Start the router
+-    Router router = new Router();
+-    router.init(conf);
+-    router.start();
+-    router.getServices();
+-
+-    // Get assigned to Filter.
+-    // The name of the filter is "Cross Origin Filter",
+-    // which is specified in HttpCrossOriginFilterInitializer.
+-    WebApp webApp = router.getWebapp();
+-    HttpServer2 httpServer2 = webApp.getHttpServer();
+-    WebAppContext webAppContext = httpServer2.getWebAppContext();
+-    ServletHandler servletHandler = webAppContext.getServletHandler();
+-    FilterHolder holder = servletHandler.getFilter("Cross Origin Filter");
+-    CrossOriginFilter filter = (CrossOriginFilter) holder.getFilter();
+-
+-    // 1. Simulate [example.com] for access
+-    HttpServletRequest mockReq = Mockito.mock(HttpServletRequest.class);
+-    Mockito.when(mockReq.getHeader("Origin")).thenReturn("example.com");
+-    Mockito.when(mockReq.getHeader("Access-Control-Request-Method")).thenReturn("GET");
+-    Mockito.when(mockReq.getHeader("Access-Control-Request-Headers"))
+-        .thenReturn("X-Requested-With");
+-
+-    // Objects to verify interactions based on request
+-    HttpServletResponseForRouterTest mockRes = new HttpServletResponseForRouterTest();
+-    FilterChain mockChain = Mockito.mock(FilterChain.class);
+-
+-    // Object under test
+-    filter.doFilter(mockReq, mockRes, mockChain);
+-
+-    // Why is 5, because when Filter passes,
+-    // CrossOriginFilter will set 5 values to Map
+-    Assert.assertEquals(5, mockRes.getHeaders().size());
+-    String allowResult = mockRes.getHeader("Access-Control-Allow-Credentials");
+-    Assert.assertEquals("true", allowResult);
+-
+-    // 2. Simulate [example.org] for access
+-    HttpServletRequest mockReq2 = Mockito.mock(HttpServletRequest.class);
+-    Mockito.when(mockReq2.getHeader("Origin")).thenReturn("example.org");
+-    Mockito.when(mockReq2.getHeader("Access-Control-Request-Method")).thenReturn("GET");
+-    Mockito.when(mockReq2.getHeader("Access-Control-Request-Headers"))
+-        .thenReturn("X-Requested-With");
+-
+-    // Objects to verify interactions based on request
+-    HttpServletResponseForRouterTest mockRes2 = new HttpServletResponseForRouterTest();
+-    FilterChain mockChain2 = Mockito.mock(FilterChain.class);
+-
+-    // Object under test
+-    filter.doFilter(mockReq2, mockRes2, mockChain2);
+-
+-    // Why is 0, because when the Filter fails,
+-    // CrossOriginFilter will not set any value
+-    Assert.assertEquals(0, mockRes2.getHeaders().size());
+-
+-    router.stop();
+-  }
+-
+-  @Test
+-  public void testUserProvidedUGIConf() throws Exception {
+-    String errMsg = "Invalid attribute value for " +
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION + " of DUMMYAUTH";
+-    Configuration dummyConf = new YarnConfiguration();
+-    dummyConf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "DUMMYAUTH");
+-    Router router = new Router();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class, errMsg,
+-        () -> router.init(dummyConf));
+-    router.stop();
+-  }
+-
+-  private class HttpServletResponseForRouterTest implements HttpServletResponse {
+-    private final Map<String, String> headers = new HashMap<>(1);
+-
+-    @Override
+-    public void addCookie(Cookie cookie) {
+-
+-    }
+-
+-    @Override
+-    public boolean containsHeader(String name) {
+-      return false;
+-    }
+-
+-    @Override
+-    public String encodeURL(String url) {
+-      return null;
+-    }
+-
+-    @Override
+-    public String encodeRedirectURL(String url) {
+-      return null;
+-    }
+-
+-    @Override
+-    public String encodeUrl(String url) {
+-      return null;
+-    }
+-
+-    @Override
+-    public String encodeRedirectUrl(String url) {
+-      return null;
+-    }
+-
+-    @Override
+-    public void sendError(int sc, String msg) throws IOException {
+-
+-    }
+-
+-    @Override
+-    public void sendError(int sc) throws IOException {
+-
+-    }
+-
+-    @Override
+-    public void sendRedirect(String location) throws IOException {
+-
+-    }
+-
+-    @Override
+-    public void setDateHeader(String name, long date) {
+-
+-    }
+-
+-    @Override
+-    public void addDateHeader(String name, long date) {
+-
+-    }
+-
+-    @Override
+-    public void setHeader(String name, String value) {
+-      headers.put(name, value);
+-    }
+-
+-    @Override
+-    public void addHeader(String name, String value) {
+-
+-    }
+-
+-    @Override
+-    public void setIntHeader(String name, int value) {
+-
+-    }
+-
+-    @Override
+-    public void addIntHeader(String name, int value) {
+-
+-    }
+-
+-    @Override
+-    public void setStatus(int sc) {
+-
+-    }
+-
+-    @Override
+-    public void setStatus(int sc, String sm) {
+-
+-    }
+-
+-    @Override
+-    public int getStatus() {
+-      return 0;
+-    }
+-
+-    public String getHeader(String name) {
+-      return headers.get(name);
+-    }
+-
+-    @Override
+-    public Collection<String> getHeaders(String name) {
+-      return null;
+-    }
+-
+-    @Override
+-    public Collection<String> getHeaderNames() {
+-      return null;
+-    }
+-
+-    public Map<String, String> getHeaders() {
+-      return headers;
+-    }
+-
+-    @Override
+-    public String getCharacterEncoding() {
+-      return null;
+-    }
+-
+-    @Override
+-    public String getContentType() {
+-      return null;
+-    }
+-
+-    @Override
+-    public ServletOutputStream getOutputStream() throws IOException {
+-      return null;
+-    }
+-
+-    @Override
+-    public PrintWriter getWriter() throws IOException {
+-      return null;
+-    }
+-
+-    @Override
+-    public void setCharacterEncoding(String charset) {
+-
+-    }
+-
+-    @Override
+-    public void setContentLength(int len) {
+-
+-    }
+-
+-    @Override
+-    public void setContentLengthLong(long len) {
+-
+-    }
+-
+-    @Override
+-    public void setContentType(String type) {
+-
+-    }
+-
+-    @Override
+-    public void setBufferSize(int size) {
+-
+-    }
+-
+-    @Override
+-    public int getBufferSize() {
+-      return 0;
+-    }
+-
+-    @Override
+-    public void flushBuffer() throws IOException {
+-
+-    }
+-
+-    @Override
+-    public void resetBuffer() {
+-
+-    }
+-
+-    @Override
+-    public boolean isCommitted() {
+-      return false;
+-    }
+-
+-    @Override
+-    public void reset() {
+-
+-    }
+-
+-    @Override
+-    public void setLocale(Locale loc) {
+-
+-    }
+-
+-    @Override
+-    public Locale getLocale() {
+-      return null;
+-    }
+-  }
+-
+-  @Test
+-  public void testRouterCLI() {
+-    ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
+-    ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
+-    System.setOut(new PrintStream(dataOut));
+-    System.setErr(new PrintStream(dataErr));
+-    Router.main(new String[]{"-help", "-format-state-store"});
+-    assertTrue(dataErr.toString().contains(
+-        "Usage: yarn router [-format-state-store] | " +
+-        "[-remove-application-from-state-store <appId>]"));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterAuditLogger.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterAuditLogger.java
+deleted file mode 100644
+index 287048237ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterAuditLogger.java
++++ /dev/null
+@@ -1,253 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.ClientId;
+-import org.apache.hadoop.ipc.ProtobufRpcEngine2;
+-import org.apache.hadoop.ipc.RPC;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.ipc.TestRpcBase;
+-import org.apache.hadoop.ipc.protobuf.TestProtos;
+-import org.apache.hadoop.ipc.protobuf.TestRpcServiceProtos;
+-import org.apache.hadoop.ipc.TestRPC;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.thirdparty.protobuf.BlockingService;
+-import org.apache.hadoop.thirdparty.protobuf.RpcController;
+-import org.apache.hadoop.thirdparty.protobuf.ServiceException;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.net.InetAddress;
+-import java.net.InetSocketAddress;
+-
+-/**
+- * Tests {@link RouterAuditLogger}.
+- */
+-public class TestRouterAuditLogger {
+-  private static final String USER = "test";
+-  private static final String OPERATION = "oper";
+-  private static final String TARGET = "tgt";
+-  private static final String DESC = "description of an audit log";
+-
+-  private static final ApplicationId APPID = mock(ApplicationId.class);
+-  private static final SubClusterId SUBCLUSTERID = mock(SubClusterId.class);
+-
+-  @Before public void setUp() throws Exception {
+-    when(APPID.toString()).thenReturn("app_1");
+-    when(SUBCLUSTERID.toString()).thenReturn("sc0");
+-  }
+-
+-  /**
+-   * Test the AuditLog format with key-val pair.
+-   */
+-  @Test
+-  public void testKeyValLogFormat() {
+-    StringBuilder actLog = new StringBuilder();
+-    StringBuilder expLog = new StringBuilder();
+-
+-    // add the first k=v pair and check
+-    RouterAuditLogger.start(RouterAuditLogger.Keys.USER, USER, actLog);
+-    expLog.append("USER=test");
+-    assertEquals(expLog.toString(), actLog.toString());
+-
+-    // append another k1=v1 pair to already added k=v and test
+-    RouterAuditLogger.add(RouterAuditLogger.Keys.OPERATION, OPERATION, actLog);
+-    expLog.append("\tOPERATION=oper");
+-    assertEquals(expLog.toString(), actLog.toString());
+-
+-    // append another k1=null pair and test
+-    RouterAuditLogger.add(RouterAuditLogger.Keys.APPID, null, actLog);
+-    expLog.append("\tAPPID=null");
+-    assertEquals(expLog.toString(), actLog.toString());
+-
+-    // now add the target and check of the final string
+-    RouterAuditLogger.add(RouterAuditLogger.Keys.TARGET, TARGET, actLog);
+-    expLog.append("\tTARGET=tgt");
+-    assertEquals(expLog.toString(), actLog.toString());
+-  }
+-
+-  /**
+-   * Test the AuditLog format for successful events.
+-   */
+-  private void testSuccessLogFormatHelper(boolean checkIP, ApplicationId appId,
+-      SubClusterId subClusterId) {
+-    // check without the IP
+-    String sLog = RouterAuditLogger
+-        .createSuccessLog(USER, OPERATION, TARGET, appId, subClusterId);
+-    StringBuilder expLog = new StringBuilder();
+-    expLog.append("USER=test\t");
+-    if (checkIP) {
+-      InetAddress ip = Server.getRemoteIp();
+-      if (ip != null && ip.getHostAddress() != null) {
+-        expLog.append(RouterAuditLogger.Keys.IP.name())
+-            .append("=").append(ip.getHostAddress()).append("\t");
+-      }
+-    }
+-    expLog.append("OPERATION=oper\tTARGET=tgt\tRESULT=SUCCESS");
+-    if (appId != null) {
+-      expLog.append("\tAPPID=app_1");
+-    }
+-    if (subClusterId != null) {
+-      expLog.append("\tSUBCLUSTERID=sc0");
+-    }
+-    assertEquals(expLog.toString(), sLog);
+-  }
+-
+-  /**
+-   * Test the AuditLog format for successful events passing nulls.
+-   */
+-  private void testSuccessLogNulls() {
+-    String sLog =
+-        RouterAuditLogger.createSuccessLog(null, null, null, null, null);
+-    StringBuilder expLog = new StringBuilder();
+-    expLog.append("USER=null\t");
+-    expLog.append("OPERATION=null\tTARGET=null\tRESULT=SUCCESS");
+-    assertEquals(expLog.toString(), sLog);
+-  }
+-
+-  /**
+-   * Test the AuditLog format for successful events with the various
+-   * parameters.
+-   */
+-  private void testSuccessLogFormat(boolean checkIP) {
+-    testSuccessLogFormatHelper(checkIP, null, null);
+-    testSuccessLogFormatHelper(checkIP, APPID, null);
+-    testSuccessLogFormatHelper(checkIP, null, SUBCLUSTERID);
+-    testSuccessLogFormatHelper(checkIP, APPID, SUBCLUSTERID);
+-  }
+-
+-  /**
+-   *  Test the AuditLog format for failure events.
+-   */
+-  private void testFailureLogFormatHelper(boolean checkIP, ApplicationId appId,
+-      SubClusterId subClusterId) {
+-    String fLog = RouterAuditLogger
+-        .createFailureLog(USER, OPERATION, "UNKNOWN", TARGET, DESC, appId,
+-            subClusterId);
+-    StringBuilder expLog = new StringBuilder();
+-    expLog.append("USER=test\t");
+-    if (checkIP) {
+-      InetAddress ip = Server.getRemoteIp();
+-      if (ip != null && ip.getHostAddress() != null) {
+-        expLog.append(RouterAuditLogger.Keys.IP.name())
+-            .append("=")
+-            .append(ip.getHostAddress()).append("\t");
+-      }
+-    }
+-    expLog.append("OPERATION=oper\tTARGET=tgt\tRESULT=FAILURE\t");
+-    expLog.append("DESCRIPTION=description of an audit log");
+-    expLog.append("\tPERMISSIONS=UNKNOWN");
+-
+-    if (appId != null) {
+-      expLog.append("\tAPPID=app_1");
+-    }
+-    if (subClusterId != null) {
+-      expLog.append("\tSUBCLUSTERID=sc0");
+-    }
+-    assertEquals(expLog.toString(), fLog);
+-  }
+-
+-  /**
+-   * Test the AuditLog format for failure events with the various
+-   * parameters.
+-   */
+-  private void testFailureLogFormat(boolean checkIP) {
+-    testFailureLogFormatHelper(checkIP, null, null);
+-    testFailureLogFormatHelper(checkIP, APPID, null);
+-    testFailureLogFormatHelper(checkIP, null, SUBCLUSTERID);
+-    testFailureLogFormatHelper(checkIP, APPID, SUBCLUSTERID);
+-  }
+-
+-  /**
+-   *  Test {@link RouterAuditLogger}.
+-   */
+-  @Test
+-  public void testRouterAuditLoggerWithOutIP() {
+-    testSuccessLogFormat(false);
+-    testFailureLogFormat(false);
+-  }
+-
+-  /**
+-   * A special extension of {@link TestRPC.TestImpl} RPC server with
+-   * {@link TestRPC.TestImpl#ping()} testing the audit logs.
+-   */
+-  private class MyTestRouterRPCServer extends TestRpcBase.PBServerImpl {
+-    @Override
+-    public TestProtos.EmptyResponseProto ping(
+-            RpcController unused, TestProtos.EmptyRequestProto request)
+-            throws ServiceException {
+-      // Ensure clientId is received
+-      byte[] clientId = Server.getClientId();
+-      Assert.assertNotNull(clientId);
+-      Assert.assertEquals(ClientId.BYTE_LENGTH, clientId.length);
+-      // test with ip set
+-      testSuccessLogFormat(true);
+-      testFailureLogFormat(true);
+-      return TestProtos.EmptyResponseProto.newBuilder().build();
+-    }
+-  }
+-
+-  /**
+-   * Test {@link RouterAuditLogger} with IP set.
+-   */
+-  @Test
+-  public void testRouterAuditLoggerWithIP() throws Exception {
+-    Configuration conf = new Configuration();
+-    RPC.setProtocolEngine(conf, TestRpcBase.TestRpcService.class, ProtobufRpcEngine2.class);
+-
+-    // Create server side implementation
+-    MyTestRouterRPCServer serverImpl = new MyTestRouterRPCServer();
+-    BlockingService service = TestRpcServiceProtos.TestProtobufRpcProto
+-        .newReflectiveBlockingService(serverImpl);
+-
+-    // start the IPC server
+-    Server server = new RPC.Builder(conf)
+-        .setProtocol(TestRpcBase.TestRpcService.class)
+-        .setInstance(service).setBindAddress("0.0.0.0")
+-        .setPort(0).setNumHandlers(5).setVerbose(true).build();
+-
+-    server.start();
+-
+-    InetSocketAddress address = NetUtils.getConnectAddress(server);
+-
+-    // Make a client connection and test the audit log
+-    TestRpcBase.TestRpcService proxy = null;
+-    try {
+-      proxy = RPC.getProxy(TestRpcBase.TestRpcService.class,
+-          TestRPC.TestProtocol.versionID, address, conf);
+-      // Start the testcase
+-      TestProtos.EmptyRequestProto pingRequest =
+-          TestProtos.EmptyRequestProto.newBuilder().build();
+-      proxy.ping(null, pingRequest);
+-    } finally {
+-      server.stop();
+-      if (proxy != null) {
+-        RPC.stopProxy(proxy);
+-      }
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java
+deleted file mode 100644
+index 36c97e02eb1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterMetrics.java
++++ /dev/null
+@@ -1,2382 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router;
+-
+-import org.junit.Assert;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This class validates the correctness of Router Federation Interceptor
+- * Metrics.
+- */
+-public class TestRouterMetrics {
+-  public static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterMetrics.class);
+-
+-  // All the operations in the bad subcluster failed.
+-  private MockBadSubCluster badSubCluster = new MockBadSubCluster();
+-  // All the operations in the bad subcluster succeed.
+-  private MockGoodSubCluster goodSubCluster = new MockGoodSubCluster();
+-
+-  private static RouterMetrics metrics = RouterMetrics.getMetrics();
+-
+-  private static final Double ASSERT_DOUBLE_DELTA = 0.01;
+-
+-  @BeforeClass
+-  public static void init() {
+-
+-    LOG.info("Test: aggregate metrics are initialized correctly");
+-
+-    Assert.assertEquals(0, metrics.getNumSucceededAppsCreated());
+-    Assert.assertEquals(0, metrics.getNumSucceededAppsSubmitted());
+-    Assert.assertEquals(0, metrics.getNumSucceededAppsKilled());
+-    Assert.assertEquals(0, metrics.getNumSucceededAppsRetrieved());
+-    Assert.assertEquals(0,
+-        metrics.getNumSucceededAppAttemptsRetrieved());
+-
+-    Assert.assertEquals(0, metrics.getAppsFailedCreated());
+-    Assert.assertEquals(0, metrics.getAppsFailedSubmitted());
+-    Assert.assertEquals(0, metrics.getAppsFailedKilled());
+-    Assert.assertEquals(0, metrics.getAppsFailedRetrieved());
+-    Assert.assertEquals(0,
+-        metrics.getAppAttemptsFailedRetrieved());
+-
+-    LOG.info("Test: aggregate metrics are updated correctly");
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Created Apps
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededAppsCreated() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededAppsCreated();
+-
+-    goodSubCluster.getNewApplication(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppsCreated());
+-    Assert.assertEquals(100, metrics.getLatencySucceededAppsCreated(), 0);
+-
+-    goodSubCluster.getNewApplication(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppsCreated());
+-    Assert.assertEquals(150, metrics.getLatencySucceededAppsCreated(), 0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to create Apps.
+-   */
+-  @Test
+-  public void testAppsFailedCreated() {
+-
+-    long totalBadbefore = metrics.getAppsFailedCreated();
+-
+-    badSubCluster.getNewApplication();
+-
+-    Assert.assertEquals(totalBadbefore + 1, metrics.getAppsFailedCreated());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Submitted Apps
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededAppsSubmitted() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededAppsSubmitted();
+-
+-    goodSubCluster.submitApplication(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppsSubmitted());
+-    Assert.assertEquals(100, metrics.getLatencySucceededAppsSubmitted(), 0);
+-
+-    goodSubCluster.submitApplication(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppsSubmitted());
+-    Assert.assertEquals(150, metrics.getLatencySucceededAppsSubmitted(), 0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to submit Apps.
+-   */
+-  @Test
+-  public void testAppsFailedSubmitted() {
+-
+-    long totalBadbefore = metrics.getAppsFailedSubmitted();
+-
+-    badSubCluster.submitApplication();
+-
+-    Assert.assertEquals(totalBadbefore + 1, metrics.getAppsFailedSubmitted());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Killed Apps
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededAppsKilled() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededAppsKilled();
+-
+-    goodSubCluster.forceKillApplication(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppsKilled());
+-    Assert.assertEquals(100, metrics.getLatencySucceededAppsKilled(), 0);
+-
+-    goodSubCluster.forceKillApplication(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppsKilled());
+-    Assert.assertEquals(150, metrics.getLatencySucceededAppsKilled(), 0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to kill Apps.
+-   */
+-  @Test
+-  public void testAppsFailedKilled() {
+-
+-    long totalBadbefore = metrics.getAppsFailedKilled();
+-
+-    badSubCluster.forceKillApplication();
+-
+-    Assert.assertEquals(totalBadbefore + 1, metrics.getAppsFailedKilled());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Retrieved Apps
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededAppsReport() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededAppsRetrieved();
+-
+-    goodSubCluster.getApplicationReport(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppsRetrieved());
+-    Assert.assertEquals(100, metrics.getLatencySucceededGetAppReport(), 0);
+-
+-    goodSubCluster.getApplicationReport(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppsRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededGetAppReport(), 0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to retrieve Apps.
+-   */
+-  @Test
+-  public void testAppsReportFailed() {
+-
+-    long totalBadbefore = metrics.getAppsFailedRetrieved();
+-
+-    badSubCluster.getApplicationReport();
+-
+-    Assert.assertEquals(totalBadbefore + 1, metrics.getAppsFailedRetrieved());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric:
+-   * Retrieved AppAttempt Report
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededAppAttemptReport() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededAppAttemptReportRetrieved();
+-
+-    goodSubCluster.getApplicationAttemptReport(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppAttemptReportRetrieved());
+-    Assert.assertEquals(100,
+-        metrics.getLatencySucceededGetAppAttemptReport(), ASSERT_DOUBLE_DELTA);
+-
+-    goodSubCluster.getApplicationAttemptReport(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppAttemptReportRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppAttemptReport(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric:
+-   * Failed to retrieve AppAttempt Report.
+-   */
+-  @Test
+-  public void testAppAttemptReportFailed() {
+-
+-    long totalBadBefore = metrics.getAppAttemptReportFailedRetrieved();
+-
+-    badSubCluster.getApplicationAttemptReport();
+-
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppAttemptReportFailedRetrieved());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Retrieved Multiple Apps
+-   * successfully.
+-   */
+-  @Test
+-  public void testSucceededMultipleAppsReport() {
+-
+-    long totalGoodBefore = metrics.getNumSucceededMultipleAppsRetrieved();
+-
+-    goodSubCluster.getApplicationsReport(100);
+-
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededMultipleAppsRetrieved());
+-    Assert.assertEquals(100, metrics.getLatencySucceededMultipleGetAppReport(),
+-        0);
+-
+-    goodSubCluster.getApplicationsReport(200);
+-
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededMultipleAppsRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededMultipleGetAppReport(),
+-        0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to retrieve
+-   * Multiple Apps.
+-   */
+-  @Test
+-  public void testMulipleAppsReportFailed() {
+-
+-    long totalBadbefore = metrics.getMultipleAppsFailedRetrieved();
+-
+-    badSubCluster.getApplicationsReport();
+-
+-    Assert.assertEquals(totalBadbefore + 1,
+-        metrics.getMultipleAppsFailedRetrieved());
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Retrieved getClusterMetrics
+-   * multiple times successfully.
+-   */
+-  @Test
+-  public void testSucceededGetClusterMetrics() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterMetricsRetrieved();
+-    goodSubCluster.getClusterMetrics(100);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetClusterMetricsRetrieved());
+-    Assert.assertEquals(100, metrics.getLatencySucceededGetClusterMetricsRetrieved(),
+-        0);
+-    goodSubCluster.getClusterMetrics(200);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetClusterMetricsRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededGetClusterMetricsRetrieved(),
+-        0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of the metric: Failed to
+-   * retrieve getClusterMetrics.
+-   */
+-  @Test
+-  public void testGetClusterMetricsFailed() {
+-    long totalBadbefore = metrics.getClusterMetricsFailedRetrieved();
+-    badSubCluster.getClusterMetrics();
+-    Assert.assertEquals(totalBadbefore + 1,
+-        metrics.getClusterMetricsFailedRetrieved());
+-  }
+-
+-  // Records failures for all calls
+-  private class MockBadSubCluster {
+-    public void getNewApplication() {
+-      LOG.info("Mocked: failed getNewApplication call");
+-      metrics.incrAppsFailedCreated();
+-    }
+-
+-    public void submitApplication() {
+-      LOG.info("Mocked: failed submitApplication call");
+-      metrics.incrAppsFailedSubmitted();
+-    }
+-
+-    public void forceKillApplication() {
+-      LOG.info("Mocked: failed forceKillApplication call");
+-      metrics.incrAppsFailedKilled();
+-    }
+-
+-    public void getApplicationReport() {
+-      LOG.info("Mocked: failed getApplicationReport call");
+-      metrics.incrAppsFailedRetrieved();
+-    }
+-
+-    public void getApplicationAttemptReport() {
+-      LOG.info("Mocked: failed getApplicationAttemptReport call");
+-      metrics.incrAppAttemptReportFailedRetrieved();
+-    }
+-
+-    public void getApplicationsReport() {
+-      LOG.info("Mocked: failed getApplicationsReport call");
+-      metrics.incrMultipleAppsFailedRetrieved();
+-    }
+-
+-    public void getClusterMetrics() {
+-      LOG.info("Mocked: failed getClusterMetrics call");
+-      metrics.incrGetClusterMetricsFailedRetrieved();
+-    }
+-
+-    public void getClusterNodes() {
+-      LOG.info("Mocked: failed getClusterNodes call");
+-      metrics.incrClusterNodesFailedRetrieved();
+-    }
+-
+-    public void getNodeToLabels() {
+-      LOG.info("Mocked: failed getNodeToLabels call");
+-      metrics.incrNodeToLabelsFailedRetrieved();
+-    }
+-
+-    public void getLabelToNodes() {
+-      LOG.info("Mocked: failed getLabelToNodes call");
+-      metrics.incrLabelsToNodesFailedRetrieved();
+-    }
+-
+-    public void getClusterNodeLabels() {
+-      LOG.info("Mocked: failed getClusterNodeLabels call");
+-      metrics.incrClusterNodeLabelsFailedRetrieved();
+-    }
+-
+-    public void getQueueUserAcls() {
+-      LOG.info("Mocked: failed getQueueUserAcls call");
+-      metrics.incrQueueUserAclsFailedRetrieved();
+-    }
+-
+-    public void getListReservations() {
+-      LOG.info("Mocked: failed listReservations call");
+-      metrics.incrListReservationsFailedRetrieved();
+-    }
+-
+-    public void getApplicationAttempts() {
+-      LOG.info("Mocked: failed getApplicationAttempts call");
+-      metrics.incrAppAttemptsFailedRetrieved();
+-    }
+-
+-    public void getContainerReport() {
+-      LOG.info("Mocked: failed getContainerReport call");
+-      metrics.incrGetContainerReportFailedRetrieved();
+-    }
+-
+-    public void getContainers() {
+-      LOG.info("Mocked: failed getContainer call");
+-      metrics.incrGetContainersFailedRetrieved();
+-    }
+-
+-    public void getResourceTypeInfo() {
+-      LOG.info("Mocked: failed getResourceTypeInfo call");
+-      metrics.incrResourceTypeInfoFailedRetrieved();
+-    }
+-
+-    public void getFailApplicationAttempt() {
+-      LOG.info("Mocked: failed failApplicationAttempt call");
+-      metrics.incrFailAppAttemptFailedRetrieved();
+-    }
+-
+-    public void getUpdateApplicationPriority() {
+-      LOG.info("Mocked: failed updateApplicationPriority call");
+-      metrics.incrUpdateAppPriorityFailedRetrieved();
+-    }
+-
+-    public void getUpdateApplicationTimeouts() {
+-      LOG.info("Mocked: failed updateApplicationTimeouts call");
+-      metrics.incrUpdateApplicationTimeoutsRetrieved();
+-    }
+-
+-    public void getSignalContainer() {
+-      LOG.info("Mocked: failed signalContainer call");
+-      metrics.incrSignalToContainerFailedRetrieved();
+-    }
+-
+-    public void getQueueInfo() {
+-      LOG.info("Mocked: failed getQueueInfo call");
+-      metrics.incrGetQueueInfoFailedRetrieved();
+-    }
+-
+-    public void moveApplicationAcrossQueuesFailed() {
+-      LOG.info("Mocked: failed moveApplicationAcrossQueuesFailed call");
+-      metrics.incrMoveApplicationAcrossQueuesFailedRetrieved();
+-    }
+-
+-    public void getResourceProfilesFailed() {
+-      LOG.info("Mocked: failed getResourceProfilesFailed call");
+-      metrics.incrGetResourceProfilesFailedRetrieved();
+-    }
+-
+-    public void getResourceProfileFailed() {
+-      LOG.info("Mocked: failed getResourceProfileFailed call");
+-      metrics.incrGetResourceProfileFailedRetrieved();
+-    }
+-
+-    public void getAttributesToNodesFailed() {
+-      LOG.info("Mocked: failed getAttributesToNodesFailed call");
+-      metrics.incrGetAttributesToNodesFailedRetrieved();
+-    }
+-
+-    public void getClusterNodeAttributesFailed() {
+-      LOG.info("Mocked: failed getClusterNodeAttributesFailed call");
+-      metrics.incrGetClusterNodeAttributesFailedRetrieved();
+-    }
+-
+-    public void getNodesToAttributesFailed() {
+-      LOG.info("Mocked: failed getNodesToAttributesFailed call");
+-      metrics.incrGetNodesToAttributesFailedRetrieved();
+-    }
+-
+-    public void getNewReservationFailed() {
+-      LOG.info("Mocked: failed getNewReservationFailed call");
+-      metrics.incrGetNewReservationFailedRetrieved();
+-    }
+-
+-    public void getSubmitReservationFailed() {
+-      LOG.info("Mocked: failed getSubmitReservationFailed call");
+-      metrics.incrSubmitReservationFailedRetrieved();
+-    }
+-
+-    public void getUpdateReservationFailed() {
+-      LOG.info("Mocked: failed getUpdateReservationFailed call");
+-      metrics.incrUpdateReservationFailedRetrieved();
+-    }
+-
+-    public void getDeleteReservationFailed() {
+-      LOG.info("Mocked: failed getDeleteReservationFailed call");
+-      metrics.incrDeleteReservationFailedRetrieved();
+-    }
+-
+-    public void getListReservationFailed() {
+-      LOG.info("Mocked: failed getListReservationFailed call");
+-      metrics.incrListReservationFailedRetrieved();
+-    }
+-
+-    public void getAppActivitiesFailed() {
+-      LOG.info("Mocked: failed getAppActivitiesFailed call");
+-      metrics.incrGetAppActivitiesFailedRetrieved();
+-    }
+-
+-    public void getAppStatisticsFailed() {
+-      LOG.info("Mocked: failed getAppStatisticsFailed call");
+-      metrics.incrGetAppStatisticsFailedRetrieved();
+-    }
+-
+-    public void getAppPriorityFailed() {
+-      LOG.info("Mocked: failed getAppPriorityFailed call");
+-      metrics.incrGetAppPriorityFailedRetrieved();
+-    }
+-
+-    public void getAppQueueFailed() {
+-      LOG.info("Mocked: failed getAppQueueFailed call");
+-      metrics.incrGetAppQueueFailedRetrieved();
+-    }
+-
+-    public void getUpdateQueueFailed() {
+-      LOG.info("Mocked: failed getUpdateQueueFailed call");
+-      metrics.incrUpdateAppQueueFailedRetrieved();
+-    }
+-
+-    public void getAppTimeoutFailed() {
+-      LOG.info("Mocked: failed getAppTimeoutFailed call");
+-      metrics.incrGetAppTimeoutFailedRetrieved();
+-    }
+-
+-    public void getAppTimeoutsFailed() {
+-      LOG.info("Mocked: failed getAppTimeoutsFailed call");
+-      metrics.incrGetAppTimeoutsFailedRetrieved();
+-    }
+-
+-    public void getRMNodeLabelsFailed() {
+-      LOG.info("Mocked: failed getRMNodeLabelsFailed call");
+-      metrics.incrGetRMNodeLabelsFailedRetrieved();
+-    }
+-
+-    public void getCheckUserAccessToQueueFailed() {
+-      LOG.info("Mocked: failed checkUserAccessToQueue call");
+-      metrics.incrCheckUserAccessToQueueFailedRetrieved();
+-    }
+-
+-    public void getDelegationTokenFailed() {
+-      LOG.info("Mocked: failed getDelegationToken call");
+-      metrics.incrGetDelegationTokenFailedRetrieved();
+-    }
+-
+-    public void getRenewDelegationTokenFailed() {
+-      LOG.info("Mocked: failed renewDelegationToken call");
+-      metrics.incrRenewDelegationTokenFailedRetrieved();
+-    }
+-
+-    public void getRefreshAdminAclsFailedRetrieved() {
+-      LOG.info("Mocked: failed refreshAdminAcls call");
+-      metrics.incrRefreshAdminAclsFailedRetrieved();
+-    }
+-
+-    public void getRefreshServiceAclsFailedRetrieved() {
+-      LOG.info("Mocked: failed refreshServiceAcls call");
+-      metrics.incrRefreshServiceAclsFailedRetrieved();
+-    }
+-
+-    public void getReplaceLabelsOnNodesFailed() {
+-      LOG.info("Mocked: failed replaceLabelsOnNodes call");
+-      metrics.incrReplaceLabelsOnNodesFailedRetrieved();
+-    }
+-
+-    public void getReplaceLabelsOnNodeFailed() {
+-      LOG.info("Mocked: failed ReplaceLabelOnNode call");
+-      metrics.incrReplaceLabelsOnNodeFailedRetrieved();
+-    }
+-
+-    public void getDumpSchedulerLogsFailed() {
+-      LOG.info("Mocked: failed DumpSchedulerLogs call");
+-      metrics.incrDumpSchedulerLogsFailedRetrieved();
+-    }
+-
+-    public void getActivitiesFailed() {
+-      LOG.info("Mocked: failed getBulkActivitie call");
+-      metrics.incrGetActivitiesFailedRetrieved();
+-    }
+-
+-    public void getBulkActivitiesFailed() {
+-      LOG.info("Mocked: failed getBulkActivitie call");
+-      metrics.incrGetBulkActivitiesFailedRetrieved();
+-    }
+-
+-    public void getDeregisterSubClusterFailed() {
+-      LOG.info("Mocked: failed deregisterSubCluster call");
+-      metrics.incrDeregisterSubClusterFailedRetrieved();
+-    }
+-
+-    public void getSchedulerConfigurationFailed() {
+-      LOG.info("Mocked: failed getSchedulerConfiguration call");
+-      metrics.incrGetSchedulerConfigurationFailedRetrieved();
+-    }
+-
+-    public void updateSchedulerConfigurationFailedRetrieved() {
+-      LOG.info("Mocked: failed updateSchedulerConfiguration call");
+-      metrics.incrUpdateSchedulerConfigurationFailedRetrieved();
+-    }
+-
+-    public void getClusterInfoFailed() {
+-      LOG.info("Mocked: failed getClusterInfo call");
+-      metrics.incrGetClusterInfoFailedRetrieved();
+-    }
+-
+-    public void getClusterUserInfoFailed() {
+-      LOG.info("Mocked: failed getClusterUserInfo call");
+-      metrics.incrGetClusterUserInfoFailedRetrieved();
+-    }
+-
+-    public void getUpdateNodeResourceFailed() {
+-      LOG.info("Mocked: failed getClusterUserInfo call");
+-      metrics.incrUpdateNodeResourceFailedRetrieved();
+-    }
+-
+-    public void getRefreshNodesResourcesFailed() {
+-      LOG.info("Mocked: failed refreshNodesResources call");
+-      metrics.incrRefreshNodesResourcesFailedRetrieved();
+-    }
+-
+-    public void getCheckForDecommissioningNodesFailed() {
+-      LOG.info("Mocked: failed checkForDecommissioningNodes call");
+-      metrics.incrCheckForDecommissioningNodesFailedRetrieved();
+-    }
+-
+-    public void getRefreshClusterMaxPriorityFailed() {
+-      LOG.info("Mocked: failed refreshClusterMaxPriority call");
+-      metrics.incrRefreshClusterMaxPriorityFailedRetrieved();
+-    }
+-
+-    public void getMapAttributesToNodesFailed() {
+-      LOG.info("Mocked: failed getMapAttributesToNode call");
+-      metrics.incrMapAttributesToNodesFailedRetrieved();
+-    }
+-
+-    public void getGroupsForUserFailed() {
+-      LOG.info("Mocked: failed getGroupsForUser call");
+-      metrics.incrGetGroupsForUserFailedRetrieved();
+-    }
+-
+-    public void getSaveFederationQueuePolicyFailedRetrieved() {
+-      LOG.info("Mocked: failed refreshClusterMaxPriority call");
+-      metrics.incrSaveFederationQueuePolicyFailedRetrieved();
+-    }
+-
+-    public void getBatchSaveFederationQueuePoliciesFailedRetrieved() {
+-      LOG.info("Mocked: failed BatchSaveFederationQueuePolicies call");
+-      metrics.incrBatchSaveFederationQueuePoliciesFailedRetrieved();
+-    }
+-
+-    public void getListFederationQueuePoliciesFailedRetrieved() {
+-      LOG.info("Mocked: failed ListFederationQueuePolicies call");
+-      metrics.incrListFederationQueuePoliciesFailedRetrieved();
+-    }
+-
+-    public void getFederationSubClustersFailedRetrieved() {
+-      LOG.info("Mocked: failed GetFederationSubClusters call");
+-      metrics.incrGetFederationSubClustersFailedRetrieved();
+-    }
+-    public void getDeleteFederationPoliciesByQueuesFailedRetrieved() {
+-      LOG.info("Mocked: failed DeleteFederationPoliciesByQueues call");
+-      metrics.incrDeleteFederationPoliciesByQueuesRetrieved();
+-    }
+-  }
+-
+-  // Records successes for all calls
+-  private class MockGoodSubCluster {
+-    public void getNewApplication(long duration) {
+-      LOG.info("Mocked: successful getNewApplication call with duration {}",
+-          duration);
+-      metrics.succeededAppsCreated(duration);
+-    }
+-
+-    public void submitApplication(long duration) {
+-      LOG.info("Mocked: successful submitApplication call with duration {}",
+-          duration);
+-      metrics.succeededAppsSubmitted(duration);
+-    }
+-
+-    public void forceKillApplication(long duration) {
+-      LOG.info("Mocked: successful forceKillApplication call with duration {}",
+-          duration);
+-      metrics.succeededAppsKilled(duration);
+-    }
+-
+-    public void getApplicationReport(long duration) {
+-      LOG.info("Mocked: successful getApplicationReport call with duration {}",
+-          duration);
+-      metrics.succeededAppsRetrieved(duration);
+-    }
+-
+-    public void getApplicationAttemptReport(long duration) {
+-      LOG.info("Mocked: successful getApplicationAttemptReport call " +
+-          "with duration {}", duration);
+-      metrics.succeededAppAttemptReportRetrieved(duration);
+-    }
+-
+-    public void getApplicationsReport(long duration) {
+-      LOG.info("Mocked: successful getApplicationsReport call with duration {}",
+-          duration);
+-      metrics.succeededMultipleAppsRetrieved(duration);
+-    }
+-
+-    public void getClusterMetrics(long duration){
+-      LOG.info("Mocked: successful getClusterMetrics call with duration {}",
+-              duration);
+-      metrics.succeededGetClusterMetricsRetrieved(duration);
+-    }
+-
+-    public void getClusterNodes(long duration) {
+-      LOG.info("Mocked: successful getClusterNodes call with duration {}", duration);
+-      metrics.succeededGetClusterNodesRetrieved(duration);
+-    }
+-
+-    public void getNodeToLabels(long duration) {
+-      LOG.info("Mocked: successful getNodeToLabels call with duration {}", duration);
+-      metrics.succeededGetNodeToLabelsRetrieved(duration);
+-    }
+-
+-    public void getLabelToNodes(long duration) {
+-      LOG.info("Mocked: successful getLabelToNodes call with duration {}", duration);
+-      metrics.succeededGetLabelsToNodesRetrieved(duration);
+-    }
+-
+-    public void getClusterNodeLabels(long duration) {
+-      LOG.info("Mocked: successful getClusterNodeLabels call with duration {}", duration);
+-      metrics.succeededGetClusterNodeLabelsRetrieved(duration);
+-    }
+-
+-    public void getQueueUserAcls(long duration) {
+-      LOG.info("Mocked: successful getQueueUserAcls call with duration {}", duration);
+-      metrics.succeededGetQueueUserAclsRetrieved(duration);
+-    }
+-
+-    public void getListReservations(long duration) {
+-      LOG.info("Mocked: successful listReservations call with duration {}", duration);
+-      metrics.succeededListReservationsRetrieved(duration);
+-    }
+-
+-    public void getApplicationAttempts(long duration) {
+-      LOG.info("Mocked: successful getApplicationAttempts call with duration {}", duration);
+-      metrics.succeededAppAttemptsRetrieved(duration);
+-    }
+-
+-    public void getContainerReport(long duration) {
+-      LOG.info("Mocked: successful getContainerReport call with duration {}", duration);
+-      metrics.succeededGetContainerReportRetrieved(duration);
+-    }
+-
+-    public void getContainers(long duration) {
+-      LOG.info("Mocked: successful getContainer call with duration {}", duration);
+-      metrics.succeededGetContainersRetrieved(duration);
+-    }
+-
+-    public void getResourceTypeInfo(long duration) {
+-      LOG.info("Mocked: successful getResourceTypeInfo call with duration {}", duration);
+-      metrics.succeededGetResourceTypeInfoRetrieved(duration);
+-    }
+-
+-    public void getFailApplicationAttempt(long duration) {
+-      LOG.info("Mocked: successful failApplicationAttempt call with duration {}", duration);
+-      metrics.succeededFailAppAttemptRetrieved(duration);
+-    }
+-
+-    public void getUpdateApplicationPriority(long duration) {
+-      LOG.info("Mocked: successful updateApplicationPriority call with duration {}", duration);
+-      metrics.succeededUpdateAppPriorityRetrieved(duration);
+-    }
+-
+-    public void getUpdateApplicationTimeouts(long duration) {
+-      LOG.info("Mocked: successful updateApplicationTimeouts call with duration {}", duration);
+-      metrics.succeededUpdateAppTimeoutsRetrieved(duration);
+-    }
+-
+-    public void getSignalToContainerTimeouts(long duration) {
+-      LOG.info("Mocked: successful signalToContainer call with duration {}", duration);
+-      metrics.succeededSignalToContainerRetrieved(duration);
+-    }
+-
+-    public void getQueueInfoRetrieved(long duration) {
+-      LOG.info("Mocked: successful getQueueInfo call with duration {}", duration);
+-      metrics.succeededGetQueueInfoRetrieved(duration);
+-    }
+-
+-    public void moveApplicationAcrossQueuesRetrieved(long duration) {
+-      LOG.info("Mocked: successful moveApplicationAcrossQueues call with duration {}", duration);
+-      metrics.succeededMoveApplicationAcrossQueuesRetrieved(duration);
+-    }
+-
+-    public void getResourceProfilesRetrieved(long duration) {
+-      LOG.info("Mocked: successful getResourceProfiles call with duration {}", duration);
+-      metrics.succeededGetResourceProfilesRetrieved(duration);
+-    }
+-
+-    public void getResourceProfileRetrieved(long duration) {
+-      LOG.info("Mocked: successful getResourceProfile call with duration {}", duration);
+-      metrics.succeededGetResourceProfileRetrieved(duration);
+-    }
+-
+-    public void getAttributesToNodesRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAttributesToNodes call with duration {}", duration);
+-      metrics.succeededGetAttributesToNodesRetrieved(duration);
+-    }
+-
+-    public void getClusterNodeAttributesRetrieved(long duration) {
+-      LOG.info("Mocked: successful getClusterNodeAttributes call with duration {}", duration);
+-      metrics.succeededGetClusterNodeAttributesRetrieved(duration);
+-    }
+-
+-    public void getNodesToAttributesRetrieved(long duration) {
+-      LOG.info("Mocked: successful getNodesToAttributes call with duration {}", duration);
+-      metrics.succeededGetNodesToAttributesRetrieved(duration);
+-    }
+-
+-    public void getNewReservationRetrieved(long duration) {
+-      LOG.info("Mocked: successful getNewReservation call with duration {}", duration);
+-      metrics.succeededGetNewReservationRetrieved(duration);
+-    }
+-
+-    public void getSubmitReservationRetrieved(long duration) {
+-      LOG.info("Mocked: successful getSubmitReservation call with duration {}", duration);
+-      metrics.succeededSubmitReservationRetrieved(duration);
+-    }
+-
+-    public void getUpdateReservationRetrieved(long duration) {
+-      LOG.info("Mocked: successful getUpdateReservation call with duration {}", duration);
+-      metrics.succeededUpdateReservationRetrieved(duration);
+-    }
+-
+-    public void getDeleteReservationRetrieved(long duration) {
+-      LOG.info("Mocked: successful getDeleteReservation call with duration {}", duration);
+-      metrics.succeededDeleteReservationRetrieved(duration);
+-    }
+-
+-    public void getListReservationRetrieved(long duration) {
+-      LOG.info("Mocked: successful getListReservation call with duration {}", duration);
+-      metrics.succeededListReservationRetrieved(duration);
+-    }
+-
+-    public void getAppActivitiesRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppActivities call with duration {}", duration);
+-      metrics.succeededGetAppActivitiesRetrieved(duration);
+-    }
+-
+-    public void getAppStatisticsRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppStatistics call with duration {}", duration);
+-      metrics.succeededGetAppStatisticsRetrieved(duration);
+-    }
+-
+-    public void getAppPriorityRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppPriority call with duration {}", duration);
+-      metrics.succeededGetAppPriorityRetrieved(duration);
+-    }
+-
+-    public void getAppQueueRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppQueue call with duration {}", duration);
+-      metrics.succeededGetAppQueueRetrieved(duration);
+-    }
+-
+-    public void getUpdateQueueRetrieved(long duration) {
+-      LOG.info("Mocked: successful getUpdateQueue call with duration {}", duration);
+-      metrics.succeededUpdateAppQueueRetrieved(duration);
+-    }
+-
+-    public void getAppTimeoutRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppTimeout call with duration {}", duration);
+-      metrics.succeededGetAppTimeoutRetrieved(duration);
+-    }
+-
+-    public void getAppTimeoutsRetrieved(long duration) {
+-      LOG.info("Mocked: successful getAppTimeouts call with duration {}", duration);
+-      metrics.succeededGetAppTimeoutsRetrieved(duration);
+-    }
+-
+-    public void getRMNodeLabelsRetrieved(long duration) {
+-      LOG.info("Mocked: successful getRMNodeLabels call with duration {}", duration);
+-      metrics.succeededGetRMNodeLabelsRetrieved(duration);
+-    }
+-
+-    public void getCheckUserAccessToQueueRetrieved(long duration) {
+-      LOG.info("Mocked: successful CheckUserAccessToQueue call with duration {}", duration);
+-      metrics.succeededCheckUserAccessToQueueRetrieved(duration);
+-    }
+-
+-    public void getGetDelegationTokenRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetDelegationToken call with duration {}", duration);
+-      metrics.succeededGetDelegationTokenRetrieved(duration);
+-    }
+-
+-    public void getRenewDelegationTokenRetrieved(long duration) {
+-      LOG.info("Mocked: successful RenewDelegationToken call with duration {}", duration);
+-      metrics.succeededRenewDelegationTokenRetrieved(duration);
+-    }
+-
+-    public void getRefreshAdminAclsRetrieved(long duration) {
+-      LOG.info("Mocked: successful RefreshAdminAcls call with duration {}", duration);
+-      metrics.succeededRefreshAdminAclsRetrieved(duration);
+-    }
+-
+-    public void getRefreshServiceAclsRetrieved(long duration) {
+-      LOG.info("Mocked: successful RefreshServiceAcls call with duration {}", duration);
+-      metrics.succeededRefreshServiceAclsRetrieved(duration);
+-    }
+-
+-    public void getNumSucceededReplaceLabelsOnNodesRetrieved(long duration) {
+-      LOG.info("Mocked: successful ReplaceLabelsOnNodes call with duration {}", duration);
+-      metrics.succeededReplaceLabelsOnNodesRetrieved(duration);
+-    }
+-
+-    public void getNumSucceededReplaceLabelsOnNodeRetrieved(long duration) {
+-      LOG.info("Mocked: successful ReplaceLabelOnNode call with duration {}", duration);
+-      metrics.succeededReplaceLabelsOnNodeRetrieved(duration);
+-    }
+-
+-    public void getDumpSchedulerLogsRetrieved(long duration) {
+-      LOG.info("Mocked: successful DumpSchedulerLogs call with duration {}", duration);
+-      metrics.succeededDumpSchedulerLogsRetrieved(duration);
+-    }
+-
+-    public void getActivitiesRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetActivities call with duration {}", duration);
+-      metrics.succeededGetActivitiesLatencyRetrieved(duration);
+-    }
+-
+-    public void getBulkActivitiesRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetBulkActivities call with duration {}", duration);
+-      metrics.succeededGetBulkActivitiesRetrieved(duration);
+-    }
+-
+-    public void getDeregisterSubClusterRetrieved(long duration) {
+-      LOG.info("Mocked: successful DeregisterSubCluster call with duration {}", duration);
+-      metrics.succeededDeregisterSubClusterRetrieved(duration);
+-    }
+-
+-    public void addToClusterNodeLabelsRetrieved(long duration) {
+-      LOG.info("Mocked: successful AddToClusterNodeLabels call with duration {}", duration);
+-      metrics.succeededAddToClusterNodeLabelsRetrieved(duration);
+-    }
+-
+-    public void getSchedulerConfigurationRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetSchedulerConfiguration call with duration {}", duration);
+-      metrics.succeededGetSchedulerConfigurationRetrieved(duration);
+-    }
+-
+-    public void getUpdateSchedulerConfigurationRetrieved(long duration) {
+-      LOG.info("Mocked: successful UpdateSchedulerConfiguration call with duration {}", duration);
+-      metrics.succeededUpdateSchedulerConfigurationRetrieved(duration);
+-    }
+-
+-    public void getClusterInfoRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetClusterInfoRetrieved call with duration {}", duration);
+-      metrics.succeededGetClusterInfoRetrieved(duration);
+-    }
+-
+-    public void getClusterUserInfoRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetClusterUserInfoRetrieved call with duration {}", duration);
+-      metrics.succeededGetClusterUserInfoRetrieved(duration);
+-    }
+-
+-    public void getUpdateNodeResourceRetrieved(long duration) {
+-      LOG.info("Mocked: successful UpdateNodeResourceRetrieved call with duration {}", duration);
+-      metrics.succeededUpdateNodeResourceRetrieved(duration);
+-    }
+-
+-    public void getRefreshNodesResourcesRetrieved(long duration) {
+-      LOG.info("Mocked: successful RefreshNodesResourcesRetrieved call with duration {}", duration);
+-      metrics.succeededRefreshNodesResourcesRetrieved(duration);
+-    }
+-
+-    public void getCheckForDecommissioningNodesRetrieved(long duration) {
+-      LOG.info("Mocked: successful CheckForDecommissioningNodesRetrieved call with duration {}",
+-          duration);
+-      metrics.succeededCheckForDecommissioningNodesRetrieved(duration);
+-    }
+-
+-    public void getRefreshClusterMaxPriorityRetrieved(long duration) {
+-      LOG.info("Mocked: successful RefreshClusterMaxPriority call with duration {}",
+-          duration);
+-      metrics.succeededRefreshClusterMaxPriorityRetrieved(duration);
+-    }
+-
+-    public void getMapAttributesToNodesRetrieved(long duration) {
+-      LOG.info("Mocked: successful MapAttributesToNodes call with duration {}",
+-          duration);
+-      metrics.succeededMapAttributesToNodesRetrieved(duration);
+-    }
+-
+-    public void getGroupsForUsersRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetGroupsForUsers call with duration {}",
+-          duration);
+-      metrics.succeededGetGroupsForUsersRetrieved(duration);
+-    }
+-
+-    public void getSaveFederationQueuePolicyRetrieved(long duration) {
+-      LOG.info("Mocked: successful SaveFederationQueuePolicy call with duration {}",
+-          duration);
+-      metrics.succeededSaveFederationQueuePolicyRetrieved(duration);
+-    }
+-
+-    public void getBatchSaveFederationQueuePoliciesRetrieved(long duration) {
+-      LOG.info("Mocked: successful BatchSaveFederationQueuePoliciesRetrieved " +
+-          " call with duration {}", duration);
+-      metrics.succeededBatchSaveFederationQueuePoliciesRetrieved(duration);
+-    }
+-
+-    public void getListFederationQueuePoliciesRetrieved(long duration) {
+-      LOG.info("Mocked: successful ListFederationQueuePoliciesRetrieved " +
+-          " call with duration {}", duration);
+-      metrics.succeededListFederationQueuePoliciesRetrieved(duration);
+-    }
+-
+-    public void getFederationSubClustersRetrieved(long duration) {
+-      LOG.info("Mocked: successful GetFederationSubClustersRetrieved " +
+-          " call with duration {}", duration);
+-      metrics.succeededGetFederationSubClustersRetrieved(duration);
+-    }
+-    public void deleteFederationPoliciesByQueuesRetrieved(long duration) {
+-      LOG.info("Mocked: successful DeleteFederationPoliciesByQueuesRetrieved " +
+-          " call with duration {}", duration);
+-      metrics.succeededDeleteFederationPoliciesByQueuesRetrieved(duration);
+-    }
+-  }
+-
+-  @Test
+-  public void testSucceededGetClusterNodes() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterNodesRetrieved();
+-    goodSubCluster.getClusterNodes(150);
+-    Assert.assertEquals(totalGoodBefore + 1, metrics.getNumSucceededGetClusterNodesRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededGetClusterNodesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getClusterNodes(300);
+-    Assert.assertEquals(totalGoodBefore + 2, metrics.getNumSucceededGetClusterNodesRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetClusterNodesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetClusterNodesFailed() {
+-    long totalBadBefore = metrics.getClusterNodesFailedRetrieved();
+-    badSubCluster.getClusterNodes();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getClusterNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetNodeToLabels() {
+-    long totalGoodBefore = metrics.getNumSucceededGetNodeToLabelsRetrieved();
+-    goodSubCluster.getNodeToLabels(150);
+-    Assert.assertEquals(totalGoodBefore + 1, metrics.getNumSucceededGetNodeToLabelsRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededGetNodeToLabelsRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getNodeToLabels(300);
+-    Assert.assertEquals(totalGoodBefore + 2, metrics.getNumSucceededGetNodeToLabelsRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetNodeToLabelsRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetNodeToLabelsFailed() {
+-    long totalBadBefore = metrics.getNodeToLabelsFailedRetrieved();
+-    badSubCluster.getNodeToLabels();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getNodeToLabelsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededLabelsToNodes() {
+-    long totalGoodBefore = metrics.getNumSucceededGetLabelsToNodesRetrieved();
+-    goodSubCluster.getLabelToNodes(150);
+-    Assert.assertEquals(totalGoodBefore + 1, metrics.getNumSucceededGetLabelsToNodesRetrieved());
+-    Assert.assertEquals(150, metrics.getLatencySucceededGetLabelsToNodesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getLabelToNodes(300);
+-    Assert.assertEquals(totalGoodBefore + 2, metrics.getNumSucceededGetLabelsToNodesRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetLabelsToNodesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetLabelsToNodesFailed() {
+-    long totalBadBefore = metrics.getLabelsToNodesFailedRetrieved();
+-    badSubCluster.getLabelToNodes();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getLabelsToNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededClusterNodeLabels() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterNodeLabelsRetrieved();
+-    goodSubCluster.getClusterNodeLabels(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetClusterNodeLabelsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetClusterNodeLabelsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getClusterNodeLabels(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetClusterNodeLabelsRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetClusterNodeLabelsRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testClusterNodeLabelsFailed() {
+-    long totalBadBefore = metrics.getGetClusterNodeLabelsFailedRetrieved();
+-    badSubCluster.getClusterNodeLabels();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getGetClusterNodeLabelsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededQueueUserAcls() {
+-    long totalGoodBefore = metrics.getNumSucceededGetQueueUserAclsRetrieved();
+-    goodSubCluster.getQueueUserAcls(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetQueueUserAclsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetQueueUserAclsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getQueueUserAcls(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetQueueUserAclsRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetQueueUserAclsRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testQueueUserAclsFailed() {
+-    long totalBadBefore = metrics.getQueueUserAclsFailedRetrieved();
+-    badSubCluster.getQueueUserAcls();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getQueueUserAclsFailedRetrieved());
+-  }
+-  @Test
+-  public void testSucceededListReservations() {
+-    long totalGoodBefore = metrics.getNumSucceededListReservationsRetrieved();
+-    goodSubCluster.getListReservations(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededListReservationsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededListReservationsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getListReservations(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededListReservationsRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededListReservationsRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testListReservationsFailed() {
+-    long totalBadBefore = metrics.getListReservationsFailedRetrieved();
+-    badSubCluster.getListReservations();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getListReservationsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetApplicationAttempts() {
+-    long totalGoodBefore = metrics.getNumSucceededAppAttemptsRetrieved();
+-    goodSubCluster.getApplicationAttempts(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAppAttemptsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededAppAttemptRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getApplicationAttempts(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAppAttemptsRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededAppAttemptRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetApplicationAttemptsFailed() {
+-    long totalBadBefore = metrics.getAppAttemptsFailedRetrieved();
+-    badSubCluster.getApplicationAttempts();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getAppAttemptsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetContainerReport() {
+-    long totalGoodBefore = metrics.getNumSucceededGetContainerReportRetrieved();
+-    goodSubCluster.getContainerReport(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetContainerReportRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetContainerReportRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getContainerReport(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetContainerReportRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetContainerReportRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetContainerReportFailed() {
+-    long totalBadBefore = metrics.getContainerReportFailedRetrieved();
+-    badSubCluster.getContainerReport();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getContainerReportFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetContainers() {
+-    long totalGoodBefore = metrics.getNumSucceededGetContainersRetrieved();
+-    goodSubCluster.getContainers(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetContainersRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetContainersRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getContainers(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetContainersRetrieved());
+-    Assert.assertEquals(225, metrics.getLatencySucceededGetContainersRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetContainersFailed() {
+-    long totalBadBefore = metrics.getContainersFailedRetrieved();
+-    badSubCluster.getContainers();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getContainersFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetResourceTypeInfo() {
+-    long totalGoodBefore = metrics.getNumSucceededGetResourceTypeInfoRetrieved();
+-    goodSubCluster.getResourceTypeInfo(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetResourceTypeInfoRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetResourceTypeInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getResourceTypeInfo(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetResourceTypeInfoRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetResourceTypeInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetResourceTypeInfoFailed() {
+-    long totalBadBefore = metrics.getGetResourceTypeInfoRetrieved();
+-    badSubCluster.getResourceTypeInfo();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getGetResourceTypeInfoRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededFailApplicationAttempt() {
+-    long totalGoodBefore = metrics.getNumSucceededFailAppAttemptRetrieved();
+-    goodSubCluster.getFailApplicationAttempt(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededFailAppAttemptRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededFailAppAttemptRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getFailApplicationAttempt(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededFailAppAttemptRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededFailAppAttemptRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testFailApplicationAttemptFailed() {
+-    long totalBadBefore = metrics.getFailApplicationAttemptFailedRetrieved();
+-    badSubCluster.getFailApplicationAttempt();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getFailApplicationAttemptFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededUpdateApplicationPriority() {
+-    long totalGoodBefore = metrics.getNumSucceededUpdateAppPriorityRetrieved();
+-    goodSubCluster.getUpdateApplicationPriority(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateAppPriorityRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateAppPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateApplicationPriority(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateAppPriorityRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateAppPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testUpdateApplicationPriorityFailed() {
+-    long totalBadBefore = metrics.getUpdateApplicationPriorityFailedRetrieved();
+-    badSubCluster.getUpdateApplicationPriority();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getUpdateApplicationPriorityFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededUpdateAppTimeoutsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededUpdateAppTimeoutsRetrieved();
+-    goodSubCluster.getUpdateApplicationTimeouts(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateAppTimeoutsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateAppTimeoutsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateApplicationTimeouts(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateAppTimeoutsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateAppTimeoutsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testUpdateAppTimeoutsFailed() {
+-    long totalBadBefore = metrics.getUpdateApplicationTimeoutsFailedRetrieved();
+-    badSubCluster.getUpdateApplicationTimeouts();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getUpdateApplicationTimeoutsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededSignalToContainerRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededSignalToContainerRetrieved();
+-    goodSubCluster.getSignalToContainerTimeouts(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededSignalToContainerRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededSignalToContainerRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getSignalToContainerTimeouts(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededSignalToContainerRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededSignalToContainerRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testSignalToContainerFailed() {
+-    long totalBadBefore = metrics.getSignalToContainerFailedRetrieved();
+-    badSubCluster.getSignalContainer();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getSignalToContainerFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetQueueInfoRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetQueueInfoRetrieved();
+-    goodSubCluster.getQueueInfoRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetQueueInfoRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetQueueInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getQueueInfoRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetQueueInfoRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetQueueInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetQueueInfoFailed() {
+-    long totalBadBefore = metrics.getQueueInfoFailedRetrieved();
+-    badSubCluster.getQueueInfo();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getQueueInfoFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededMoveApplicationAcrossQueuesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededMoveApplicationAcrossQueuesRetrieved();
+-    goodSubCluster.moveApplicationAcrossQueuesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededMoveApplicationAcrossQueuesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededMoveApplicationAcrossQueuesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.moveApplicationAcrossQueuesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededMoveApplicationAcrossQueuesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededMoveApplicationAcrossQueuesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testMoveApplicationAcrossQueuesRetrievedFailed() {
+-    long totalBadBefore = metrics.getMoveApplicationAcrossQueuesFailedRetrieved();
+-    badSubCluster.moveApplicationAcrossQueuesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getMoveApplicationAcrossQueuesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetResourceProfilesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetResourceProfilesRetrieved();
+-    goodSubCluster.getResourceProfilesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetResourceProfilesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetResourceProfilesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getResourceProfilesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetResourceProfilesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetResourceProfilesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetResourceProfilesRetrievedFailed() {
+-    long totalBadBefore = metrics.getResourceProfilesFailedRetrieved();
+-    badSubCluster.getResourceProfilesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getResourceProfilesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetResourceProfileRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetResourceProfileRetrieved();
+-    goodSubCluster.getResourceProfileRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetResourceProfileRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetResourceProfileRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getResourceProfileRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetResourceProfileRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetResourceProfileRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetResourceProfileRetrievedFailed() {
+-    long totalBadBefore = metrics.getResourceProfileFailedRetrieved();
+-    badSubCluster.getResourceProfileFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getResourceProfileFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSucceededGetAttributesToNodesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAttributesToNodesRetrieved();
+-    goodSubCluster.getAttributesToNodesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAttributesToNodesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAttributesToNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAttributesToNodesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAttributesToNodesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAttributesToNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAttributesToNodesRetrievedFailed() {
+-    long totalBadBefore = metrics.getAttributesToNodesFailedRetrieved();
+-    badSubCluster.getAttributesToNodesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAttributesToNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetClusterNodeAttributesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterNodeAttributesRetrieved();
+-    goodSubCluster.getClusterNodeAttributesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetClusterNodeAttributesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetClusterNodeAttributesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getClusterNodeAttributesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetClusterNodeAttributesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetClusterNodeAttributesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetClusterNodeAttributesRetrievedFailed() {
+-    long totalBadBefore = metrics.getClusterNodeAttributesFailedRetrieved();
+-    badSubCluster.getClusterNodeAttributesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getClusterNodeAttributesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetNodesToAttributesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetNodesToAttributesRetrieved();
+-    goodSubCluster.getNodesToAttributesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetNodesToAttributesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetNodesToAttributesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getNodesToAttributesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetNodesToAttributesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetNodesToAttributesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetNodesToAttributesRetrievedFailed() {
+-    long totalBadBefore = metrics.getNodesToAttributesFailedRetrieved();
+-    badSubCluster.getNodesToAttributesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNodesToAttributesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetNewReservationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetNewReservationRetrieved();
+-    goodSubCluster.getNewReservationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetNewReservationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetNewReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getNewReservationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetNewReservationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetNewReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetNewReservationRetrievedFailed() {
+-    long totalBadBefore = metrics.getNewReservationFailedRetrieved();
+-    badSubCluster.getNewReservationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNewReservationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetSubmitReservationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededSubmitReservationRetrieved();
+-    goodSubCluster.getSubmitReservationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededSubmitReservationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededSubmitReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getSubmitReservationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededSubmitReservationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededSubmitReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetSubmitReservationRetrievedFailed() {
+-    long totalBadBefore = metrics.getSubmitReservationFailedRetrieved();
+-    badSubCluster.getSubmitReservationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getSubmitReservationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetUpdateReservationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededUpdateReservationRetrieved();
+-    goodSubCluster.getUpdateReservationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateReservationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateReservationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateReservationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetUpdateReservationRetrievedFailed() {
+-    long totalBadBefore = metrics.getUpdateReservationFailedRetrieved();
+-    badSubCluster.getUpdateReservationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getUpdateReservationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetDeleteReservationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededDeleteReservationRetrieved();
+-    goodSubCluster.getDeleteReservationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededDeleteReservationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededDeleteReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getDeleteReservationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededDeleteReservationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededDeleteReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetDeleteReservationRetrievedFailed() {
+-    long totalBadBefore = metrics.getDeleteReservationFailedRetrieved();
+-    badSubCluster.getDeleteReservationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getDeleteReservationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetListReservationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededListReservationRetrieved();
+-    goodSubCluster.getListReservationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededListReservationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededListReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getListReservationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededListReservationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededListReservationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetListReservationRetrievedFailed() {
+-    long totalBadBefore = metrics.getListReservationFailedRetrieved();
+-    badSubCluster.getListReservationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getListReservationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppActivitiesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppActivitiesRetrieved();
+-    goodSubCluster.getAppActivitiesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppActivitiesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppActivitiesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppActivitiesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppActivitiesRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppActivitiesFailedRetrieved();
+-    badSubCluster.getAppActivitiesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppActivitiesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppStatisticsLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppStatisticsRetrieved();
+-    goodSubCluster.getAppStatisticsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppStatisticsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppStatisticsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppStatisticsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppStatisticsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppStatisticsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppStatisticsRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppStatisticsFailedRetrieved();
+-    badSubCluster.getAppStatisticsFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppStatisticsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppPriorityLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppPriorityRetrieved();
+-    goodSubCluster.getAppPriorityRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppPriorityRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppPriorityRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppPriorityRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppPriorityRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppPriorityFailedRetrieved();
+-    badSubCluster.getAppPriorityFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppPriorityFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppQueueLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppQueueRetrieved();
+-    goodSubCluster.getAppQueueRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppQueueRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppQueueRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppQueueRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppQueueRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppQueueFailedRetrieved();
+-    badSubCluster.getAppQueueFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppQueueFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testUpdateAppQueueLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededUpdateAppQueueRetrieved();
+-    goodSubCluster.getUpdateQueueRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateAppQueueRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateAppQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateQueueRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateAppQueueRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateAppQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testUpdateAppQueueRetrievedFailed() {
+-    long totalBadBefore = metrics.getUpdateAppQueueFailedRetrieved();
+-    badSubCluster.getUpdateQueueFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getUpdateAppQueueFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppTimeoutLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppTimeoutRetrieved();
+-    goodSubCluster.getAppTimeoutRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppTimeoutRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppTimeoutRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppTimeoutRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppTimeoutRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppTimeoutRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppTimeoutRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppTimeoutFailedRetrieved();
+-    badSubCluster.getAppTimeoutFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppTimeoutFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetAppTimeoutsLatencyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetAppTimeoutsRetrieved();
+-    goodSubCluster.getAppTimeoutsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetAppTimeoutsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetAppTimeoutsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getAppTimeoutsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetAppTimeoutsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetAppTimeoutsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetAppTimeoutsRetrievedFailed() {
+-    long totalBadBefore = metrics.getAppTimeoutsFailedRetrieved();
+-    badSubCluster.getAppTimeoutsFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getAppTimeoutsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetRMNodeLabelsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetRMNodeLabelsRetrieved();
+-    goodSubCluster.getRMNodeLabelsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetRMNodeLabelsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetRMNodeLabelsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRMNodeLabelsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetRMNodeLabelsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetRMNodeLabelsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetRMNodeLabelsRetrievedFailed() {
+-    long totalBadBefore = metrics.getRMNodeLabelsFailedRetrieved();
+-    badSubCluster.getRMNodeLabelsFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getRMNodeLabelsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testCheckUserAccessToQueueRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededCheckUserAccessToQueueRetrieved();
+-    goodSubCluster.getCheckUserAccessToQueueRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededCheckUserAccessToQueueRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededCheckUserAccessToQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getCheckUserAccessToQueueRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededCheckUserAccessToQueueRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededCheckUserAccessToQueueRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testCheckUserAccessToQueueRetrievedFailed() {
+-    long totalBadBefore = metrics.getCheckUserAccessToQueueFailedRetrieved();
+-    badSubCluster.getCheckUserAccessToQueueFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getCheckUserAccessToQueueFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetDelegationTokenRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetDelegationTokenRetrieved();
+-    goodSubCluster.getGetDelegationTokenRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetDelegationTokenRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getGetDelegationTokenRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetDelegationTokenRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetDelegationTokenRetrievedFailed() {
+-    long totalBadBefore = metrics.getDelegationTokenFailedRetrieved();
+-    badSubCluster.getDelegationTokenFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getDelegationTokenFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testRenewDelegationTokenRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededRenewDelegationTokenRetrieved();
+-    goodSubCluster.getRenewDelegationTokenRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededRenewDelegationTokenRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededRenewDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRenewDelegationTokenRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededRenewDelegationTokenRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededRenewDelegationTokenRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testRenewDelegationTokenRetrievedFailed() {
+-    long totalBadBefore = metrics.getRenewDelegationTokenFailedRetrieved();
+-    badSubCluster.getRenewDelegationTokenFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getRenewDelegationTokenFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testRefreshAdminAclsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededRefreshAdminAclsRetrieved();
+-    goodSubCluster.getRefreshAdminAclsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededRefreshAdminAclsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededRefreshAdminAclsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRefreshAdminAclsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededRefreshAdminAclsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededRefreshAdminAclsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testRefreshAdminAclsRetrievedFailed() {
+-    long totalBadBefore = metrics.getNumRefreshAdminAclsFailedRetrieved();
+-    badSubCluster.getRefreshAdminAclsFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNumRefreshAdminAclsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testRefreshServiceAclsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededRefreshServiceAclsRetrieved();
+-    goodSubCluster.getRefreshServiceAclsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededRefreshServiceAclsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededRefreshServiceAclsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRefreshServiceAclsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededRefreshServiceAclsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededRefreshServiceAclsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testRefreshServiceAclsRetrievedFailed() {
+-    long totalBadBefore = metrics.getNumRefreshServiceAclsFailedRetrieved();
+-    badSubCluster.getRefreshServiceAclsFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNumRefreshServiceAclsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededReplaceLabelsOnNodesRetrieved();
+-    goodSubCluster.getNumSucceededReplaceLabelsOnNodesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededReplaceLabelsOnNodesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededReplaceLabelsOnNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getNumSucceededReplaceLabelsOnNodesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededReplaceLabelsOnNodesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededReplaceLabelsOnNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodesRetrievedFailed() {
+-    long totalBadBefore = metrics.getNumReplaceLabelsOnNodesFailedRetrieved();
+-    badSubCluster.getReplaceLabelsOnNodesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNumReplaceLabelsOnNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodeRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededReplaceLabelsOnNodeRetrieved();
+-    goodSubCluster.getNumSucceededReplaceLabelsOnNodeRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededReplaceLabelsOnNodeRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededReplaceLabelsOnNodeRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getNumSucceededReplaceLabelsOnNodeRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededReplaceLabelsOnNodeRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededReplaceLabelsOnNodeRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelOnNodeRetrievedFailed() {
+-    long totalBadBefore = metrics.getNumReplaceLabelsOnNodeFailedRetrieved();
+-    badSubCluster.getReplaceLabelsOnNodeFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getNumReplaceLabelsOnNodeFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testDumpSchedulerLogsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededDumpSchedulerLogsRetrieved();
+-    goodSubCluster.getDumpSchedulerLogsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededDumpSchedulerLogsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededDumpSchedulerLogsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getDumpSchedulerLogsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededDumpSchedulerLogsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededDumpSchedulerLogsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testDumpSchedulerLogsRetrievedFailed() {
+-    long totalBadBefore = metrics.getDumpSchedulerLogsFailedRetrieved();
+-    badSubCluster.getDumpSchedulerLogsFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getDumpSchedulerLogsFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetActivitiesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetActivitiesRetrieved();
+-    goodSubCluster.getActivitiesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetActivitiesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getActivitiesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetActivitiesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetActivitiesRetrievedFailed() {
+-    long totalBadBefore = metrics.getActivitiesFailedRetrieved();
+-    badSubCluster.getActivitiesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getActivitiesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetBulkActivitiesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetBulkActivitiesRetrieved();
+-    goodSubCluster.getBulkActivitiesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetBulkActivitiesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetBulkActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getBulkActivitiesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetBulkActivitiesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetBulkActivitiesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetBulkActivitiesRetrievedFailed() {
+-    long totalBadBefore = metrics.getBulkActivitiesFailedRetrieved();
+-    badSubCluster.getBulkActivitiesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getBulkActivitiesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testDeregisterSubClusterRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededDeregisterSubClusterRetrieved();
+-    goodSubCluster.getDeregisterSubClusterRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededDeregisterSubClusterRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededDeregisterSubClusterRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getDeregisterSubClusterRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededDeregisterSubClusterRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededDeregisterSubClusterRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testDeregisterSubClusterRetrievedFailed() {
+-    long totalBadBefore = metrics.getDeregisterSubClusterFailedRetrieved();
+-    badSubCluster.getDeregisterSubClusterFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getDeregisterSubClusterFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabelsRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededAddToClusterNodeLabelsRetrieved();
+-    goodSubCluster.addToClusterNodeLabelsRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededAddToClusterNodeLabelsRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededAddToClusterNodeLabelsRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.addToClusterNodeLabelsRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededAddToClusterNodeLabelsRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededAddToClusterNodeLabelsRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetSchedulerConfigurationRetrievedFailed() {
+-    long totalBadBefore = metrics.getSchedulerConfigurationFailedRetrieved();
+-    badSubCluster.getSchedulerConfigurationFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getSchedulerConfigurationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetSchedulerConfigurationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetSchedulerConfigurationRetrieved();
+-    goodSubCluster.getSchedulerConfigurationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetSchedulerConfigurationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetSchedulerConfigurationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getSchedulerConfigurationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetSchedulerConfigurationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetSchedulerConfigurationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testUpdateSchedulerConfigurationRetrievedFailed() {
+-    long totalBadBefore = metrics.getUpdateSchedulerConfigurationFailedRetrieved();
+-    badSubCluster.updateSchedulerConfigurationFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getUpdateSchedulerConfigurationFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testUpdateSchedulerConfigurationRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededUpdateSchedulerConfigurationRetrieved();
+-    goodSubCluster.getUpdateSchedulerConfigurationRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateSchedulerConfigurationRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateSchedulerConfigurationRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateSchedulerConfigurationRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateSchedulerConfigurationRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateSchedulerConfigurationRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetClusterInfoRetrievedFailed() {
+-    long totalBadBefore = metrics.getClusterInfoFailedRetrieved();
+-    badSubCluster.getClusterInfoFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getClusterInfoFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetClusterInfoRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterInfoRetrieved();
+-    goodSubCluster.getClusterInfoRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetClusterInfoRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetClusterInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getClusterInfoRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetClusterInfoRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetClusterInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetClusterUserInfoRetrievedFailed() {
+-    long totalBadBefore = metrics.getClusterUserInfoFailedRetrieved();
+-    badSubCluster.getClusterUserInfoFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getClusterUserInfoFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetClusterUserInfoRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterUserInfoRetrieved();
+-    goodSubCluster.getClusterUserInfoRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetClusterUserInfoRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetClusterUserInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getClusterUserInfoRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetClusterUserInfoRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetClusterUserInfoRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResourceRetrievedFailed() {
+-    long totalBadBefore = metrics.getUpdateNodeResourceFailedRetrieved();
+-    badSubCluster.getUpdateNodeResourceFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getUpdateNodeResourceFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResourceRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetClusterUserInfoRetrieved();
+-    goodSubCluster.getUpdateNodeResourceRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededUpdateNodeResourceRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededUpdateNodeResourceRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getUpdateNodeResourceRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededUpdateNodeResourceRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededUpdateNodeResourceRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testRefreshNodesResourcesRetrievedFailed() {
+-    long totalBadBefore = metrics.getRefreshNodesResourcesFailedRetrieved();
+-    badSubCluster.getRefreshNodesResourcesFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getRefreshNodesResourcesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testRefreshNodesResourcesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededRefreshNodesResourcesRetrieved();
+-    goodSubCluster.getRefreshNodesResourcesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededRefreshNodesResourcesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededRefreshNodesResourcesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRefreshNodesResourcesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededRefreshNodesResourcesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededRefreshNodesResourcesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testCheckForDecommissioningNodesFailedRetrieved() {
+-    long totalBadBefore = metrics.getCheckForDecommissioningNodesFailedRetrieved();
+-    badSubCluster.getCheckForDecommissioningNodesFailed();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getCheckForDecommissioningNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testCheckForDecommissioningNodesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededCheckForDecommissioningNodesRetrieved();
+-    goodSubCluster.getCheckForDecommissioningNodesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededCheckForDecommissioningNodesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededCheckForDecommissioningNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getCheckForDecommissioningNodesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededCheckForDecommissioningNodesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededCheckForDecommissioningNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testRefreshClusterMaxPriorityFailedRetrieved() {
+-    long totalBadBefore = metrics.getRefreshClusterMaxPriorityFailedRetrieved();
+-    badSubCluster.getRefreshClusterMaxPriorityFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getRefreshClusterMaxPriorityFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testRefreshClusterMaxPriorityRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededRefreshClusterMaxPriorityRetrieved();
+-    goodSubCluster.getRefreshClusterMaxPriorityRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededRefreshClusterMaxPriorityRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededRefreshClusterMaxPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getRefreshClusterMaxPriorityRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededRefreshClusterMaxPriorityRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededRefreshClusterMaxPriorityRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetMapAttributesToNodesFailedRetrieved() {
+-    long totalBadBefore = metrics.getMapAttributesToNodesFailedRetrieved();
+-    badSubCluster.getMapAttributesToNodesFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getMapAttributesToNodesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetMapAttributesToNodesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededMapAttributesToNodesRetrieved();
+-    goodSubCluster.getMapAttributesToNodesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededMapAttributesToNodesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededMapAttributesToNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getMapAttributesToNodesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededMapAttributesToNodesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededMapAttributesToNodesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetGroupsForUserFailedRetrieved() {
+-    long totalBadBefore = metrics.getGroupsForUserFailedRetrieved();
+-    badSubCluster.getGroupsForUserFailed();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getGroupsForUserFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetGroupsForUserRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetGroupsForUsersRetrieved();
+-    goodSubCluster.getGroupsForUsersRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetGroupsForUsersRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetGroupsForUsersRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getGroupsForUsersRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetGroupsForUsersRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetGroupsForUsersRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testSaveFederationQueuePolicyFailedRetrieved() {
+-    long totalBadBefore = metrics.getSaveFederationQueuePolicyFailedRetrieved();
+-    badSubCluster.getSaveFederationQueuePolicyFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1, metrics.getSaveFederationQueuePolicyFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testSaveFederationQueuePolicyRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededSaveFederationQueuePolicyRetrieved();
+-    goodSubCluster.getSaveFederationQueuePolicyRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededSaveFederationQueuePolicyRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededSaveFederationQueuePolicyRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getSaveFederationQueuePolicyRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededSaveFederationQueuePolicyRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededSaveFederationQueuePolicyRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetBatchSaveFederationQueuePoliciesFailedRetrieved() {
+-    long totalBadBefore = metrics.getBatchSaveFederationQueuePoliciesFailedRetrieved();
+-    badSubCluster.getBatchSaveFederationQueuePoliciesFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getBatchSaveFederationQueuePoliciesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetBatchSaveFederationQueuePoliciesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededBatchSaveFederationQueuePoliciesRetrieved();
+-    goodSubCluster.getBatchSaveFederationQueuePoliciesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededBatchSaveFederationQueuePoliciesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getBatchSaveFederationQueuePoliciesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededBatchSaveFederationQueuePoliciesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededBatchSaveFederationQueuePoliciesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testListFederationQueuePoliciesFailedRetrieved() {
+-    long totalBadBefore = metrics.getListFederationQueuePoliciesFailedRetrieved();
+-    badSubCluster.getListFederationQueuePoliciesFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getListFederationQueuePoliciesFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testListFederationQueuePoliciesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededListFederationQueuePoliciesFailedRetrieved();
+-    goodSubCluster.getListFederationQueuePoliciesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededListFederationQueuePoliciesFailedRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededListFederationQueuePoliciesRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getListFederationQueuePoliciesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededListFederationQueuePoliciesFailedRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededListFederationQueuePoliciesRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testGetFederationSubClustersFailedRetrieved() {
+-    long totalBadBefore = metrics.getFederationSubClustersFailedRetrieved();
+-    badSubCluster.getFederationSubClustersFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getFederationSubClustersFailedRetrieved());
+-  }
+-
+-  @Test
+-  public void testGetFederationSubClustersRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededGetFederationSubClustersRetrieved();
+-    goodSubCluster.getFederationSubClustersRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededGetFederationSubClustersRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededGetFederationSubClustersRetrieved(), ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.getFederationSubClustersRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededGetFederationSubClustersRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededGetFederationSubClustersRetrieved(), ASSERT_DOUBLE_DELTA);
+-  }
+-
+-  @Test
+-  public void testDeleteFederationPoliciesByQueuesFailedRetrieved() {
+-    long totalBadBefore = metrics.getDeleteFederationPoliciesByQueuesRetrieved();
+-    badSubCluster.getDeleteFederationPoliciesByQueuesFailedRetrieved();
+-    Assert.assertEquals(totalBadBefore + 1,
+-        metrics.getDeleteFederationPoliciesByQueuesRetrieved());
+-  }
+-
+-  @Test
+-  public void testDeleteFederationPoliciesByQueuesRetrieved() {
+-    long totalGoodBefore = metrics.getNumSucceededDeleteFederationPoliciesByQueuesRetrieved();
+-    goodSubCluster.deleteFederationPoliciesByQueuesRetrieved(150);
+-    Assert.assertEquals(totalGoodBefore + 1,
+-        metrics.getNumSucceededDeleteFederationPoliciesByQueuesRetrieved());
+-    Assert.assertEquals(150,
+-        metrics.getLatencySucceededDeleteFederationPoliciesByQueuesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-    goodSubCluster.deleteFederationPoliciesByQueuesRetrieved(300);
+-    Assert.assertEquals(totalGoodBefore + 2,
+-        metrics.getNumSucceededDeleteFederationPoliciesByQueuesRetrieved());
+-    Assert.assertEquals(225,
+-        metrics.getLatencySucceededDeleteFederationPoliciesByQueuesRetrieved(),
+-        ASSERT_DOUBLE_DELTA);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterServerUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterServerUtil.java
+deleted file mode 100644
+index dcf3bd5bc0e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterServerUtil.java
++++ /dev/null
+@@ -1,164 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */package org.apache.hadoop.yarn.server.router;
+-
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDefinitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.nio.ByteBuffer;
+-import java.nio.charset.StandardCharsets;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.TestFederationInterceptorREST.getReservationSubmissionRequestInfo;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-
+-public class TestRouterServerUtil {
+-
+-  public static final Logger LOG = LoggerFactory.getLogger(TestRouterServerUtil.class);
+-
+-  @Test
+-  public void testConvertReservationDefinition() {
+-    // Prepare parameters
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 1);
+-    ReservationSubmissionRequestInfo requestInfo =
+-        getReservationSubmissionRequestInfo(reservationId);
+-    ReservationDefinitionInfo expectDefinitionInfo = requestInfo.getReservationDefinition();
+-
+-    // ReservationDefinitionInfo conversion ReservationDefinition
+-    ReservationDefinition convertDefinition =
+-        RouterServerUtil.convertReservationDefinition(expectDefinitionInfo);
+-
+-    // reservationDefinition is not null
+-    assertNotNull(convertDefinition);
+-    assertEquals(expectDefinitionInfo.getArrival(), convertDefinition.getArrival());
+-    assertEquals(expectDefinitionInfo.getDeadline(), convertDefinition.getDeadline());
+-
+-    Priority priority = convertDefinition.getPriority();
+-    assertNotNull(priority);
+-    assertEquals(expectDefinitionInfo.getPriority(), priority.getPriority());
+-    assertEquals(expectDefinitionInfo.getRecurrenceExpression(),
+-        convertDefinition.getRecurrenceExpression());
+-    assertEquals(expectDefinitionInfo.getReservationName(), convertDefinition.getReservationName());
+-
+-    ReservationRequestsInfo expectRequestsInfo = expectDefinitionInfo.getReservationRequests();
+-    List<ReservationRequestInfo> expectRequestsInfoList =
+-        expectRequestsInfo.getReservationRequest();
+-
+-    ReservationRequests convertReservationRequests =
+-        convertDefinition.getReservationRequests();
+-    assertNotNull(convertReservationRequests);
+-
+-    List<ReservationRequest> convertRequestList =
+-        convertReservationRequests.getReservationResources();
+-    assertNotNull(convertRequestList);
+-    assertEquals(1, convertRequestList.size());
+-
+-    ReservationRequestInfo expectResRequestInfo = expectRequestsInfoList.get(0);
+-    ReservationRequest convertResRequest = convertRequestList.get(0);
+-    assertNotNull(convertResRequest);
+-    assertEquals(expectResRequestInfo.getNumContainers(), convertResRequest.getNumContainers());
+-    assertEquals(expectResRequestInfo.getDuration(), convertResRequest.getDuration());
+-
+-    ResourceInfo expectResourceInfo = expectResRequestInfo.getCapability();
+-    Resource convertResource = convertResRequest.getCapability();
+-    assertNotNull(expectResourceInfo);
+-    assertEquals(expectResourceInfo.getMemorySize(), convertResource.getMemorySize());
+-    assertEquals(expectResourceInfo.getvCores(), convertResource.getVirtualCores());
+-  }
+-
+-  @Test
+-  public void testConvertReservationDefinitionEmpty() throws Exception {
+-
+-    // param ReservationDefinitionInfo is Null
+-    ReservationDefinitionInfo definitionInfo = null;
+-
+-    // null request1
+-    LambdaTestUtils.intercept(RuntimeException.class,
+-        "definitionInfo Or ReservationRequests is Null.",
+-        () -> RouterServerUtil.convertReservationDefinition(definitionInfo));
+-
+-    // param ReservationRequests is Null
+-    ReservationDefinitionInfo definitionInfo2 = new ReservationDefinitionInfo();
+-
+-    // null request2
+-    LambdaTestUtils.intercept(RuntimeException.class,
+-        "definitionInfo Or ReservationRequests is Null.",
+-        () -> RouterServerUtil.convertReservationDefinition(definitionInfo2));
+-
+-    // param ReservationRequests is Null
+-    ReservationDefinitionInfo definitionInfo3 = new ReservationDefinitionInfo();
+-    ReservationRequestsInfo requestsInfo = new ReservationRequestsInfo();
+-    definitionInfo3.setReservationRequests(requestsInfo);
+-
+-    // null request3
+-    LambdaTestUtils.intercept(RuntimeException.class,
+-        "definitionInfo Or ReservationRequests is Null.",
+-        () -> RouterServerUtil.convertReservationDefinition(definitionInfo3));
+-  }
+-
+-  @Test
+-  public void testLoadFederationPolicyManager() throws Exception {
+-
+-    // In this unit test, we have configured the yarn-site.xml file with
+-    // the yarn.federation.policy-manager-params parameter,
+-    // and subsequently, we parse this parameter.
+-    // We have configured two subclusters, SC-1 and SC-2,
+-    // with routerPolicyWeights set to SC-1:0.7 and SC-2:0.3,
+-    // and amrmPolicyWeights set to SC-1:0.6 and SC-2:0.4.
+-    // Additionally, headroomAlpha is set to 1.0.
+-
+-    YarnConfiguration conf = new YarnConfiguration();
+-    String defaultPolicyParamString = conf.get(YarnConfiguration.FEDERATION_POLICY_MANAGER_PARAMS,
+-        YarnConfiguration.DEFAULT_FEDERATION_POLICY_MANAGER_PARAMS);
+-    assertNotNull(defaultPolicyParamString);
+-    ByteBuffer defaultPolicyParam = ByteBuffer.wrap(
+-        defaultPolicyParamString.getBytes(StandardCharsets.UTF_8));
+-    WeightedPolicyInfo policyInfo = WeightedPolicyInfo.fromByteBuffer(defaultPolicyParam);
+-    float headroomAlpha = policyInfo.getHeadroomAlpha();
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = policyInfo.getRouterPolicyWeights();
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights = policyInfo.getAMRMPolicyWeights();
+-
+-    SubClusterIdInfo sc1 = new SubClusterIdInfo("SC-1");
+-    SubClusterIdInfo sc2 = new SubClusterIdInfo("SC-2");
+-
+-    assertEquals(1.0, headroomAlpha, 0.001);
+-    assertEquals(0.7, routerPolicyWeights.get(sc1), 0.001);
+-    assertEquals(0.3, routerPolicyWeights.get(sc2), 0.001);
+-
+-    assertEquals(0.6, amrmPolicyWeights.get(sc1), 0.001);
+-    assertEquals(0.4, amrmPolicyWeights.get(sc2), 0.001);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterStoreCommands.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterStoreCommands.java
+deleted file mode 100644
+index 04007ca88df..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/TestRouterStoreCommands.java
++++ /dev/null
+@@ -1,77 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.AddApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-public class TestRouterStoreCommands {
+-
+-  ////////////////////////////////
+-  // Router Constants
+-  ////////////////////////////////
+-  private Configuration conf;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-
+-  @Before
+-  public void setup() throws YarnException {
+-    conf = new YarnConfiguration();
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-    facade = FederationStateStoreFacade.getInstance(conf);
+-    facade.reinitialize(stateStore, conf);
+-  }
+-
+-  @Test
+-  public void testRemoveApplicationFromRouterStateStore() throws Exception {
+-
+-    // We will design such a unit test.
+-    // We will write the applicationId and subCluster into the stateStore,
+-    // and then remove the application through Router.removeApplication.
+-    // At this time, if we continue to query through the stateStore,
+-    // We will get a prompt that application not exists.
+-
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    SubClusterId homeSubCluster = SubClusterId.newInstance("SC-1");
+-    ApplicationHomeSubCluster applicationHomeSubCluster =
+-        ApplicationHomeSubCluster.newInstance(appId, homeSubCluster);
+-    AddApplicationHomeSubClusterRequest request =
+-        AddApplicationHomeSubClusterRequest.newInstance(applicationHomeSubCluster);
+-    stateStore.addApplicationHomeSubCluster(request);
+-    Router.removeApplication(conf, appId.toString());
+-
+-    GetApplicationHomeSubClusterRequest request1 =
+-        GetApplicationHomeSubClusterRequest.newInstance(appId);
+-
+-    LambdaTestUtils.intercept(YarnException.class, "Application " + appId + " does not exist.",
+-        () -> stateStore.getApplicationHomeSubCluster(request1));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/cleaner/TestSubClusterCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/cleaner/TestSubClusterCleaner.java
+deleted file mode 100644
+index d24ac9827da..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/cleaner/TestSubClusterCleaner.java
++++ /dev/null
+@@ -1,158 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.cleaner;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterHeartbeatRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterHeartbeatResponse;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.util.Map;
+-import java.util.concurrent.TimeoutException;
+-
+-public class TestSubClusterCleaner {
+-
+-  ////////////////////////////////
+-  // Router Constants
+-  ////////////////////////////////
+-  private Configuration conf;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-  private SubClusterCleaner cleaner;
+-  private final static int NUM_SUBCLUSTERS = 4;
+-  private final static long EXPIRATION_TIME = Time.now() - 5000;
+-
+-  @Before
+-  public void setup() throws YarnException {
+-    conf = new YarnConfiguration();
+-    conf.setLong(YarnConfiguration.ROUTER_SUBCLUSTER_EXPIRATION_TIME, 1000);
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-
+-    facade = FederationStateStoreFacade.getInstance(conf);
+-    facade.reinitialize(stateStore, conf);
+-
+-    cleaner = new SubClusterCleaner(conf);
+-    for (int i = 0; i < NUM_SUBCLUSTERS; i++){
+-      // Create sub cluster id and info
+-      SubClusterId subClusterId = SubClusterId.newInstance("SC-" + i);
+-      SubClusterInfo subClusterInfo = SubClusterInfo.newInstance(subClusterId,
+-          "127.0.0.1:1", "127.0.0.1:2", "127.0.0.1:3", "127.0.0.1:4",
+-           SubClusterState.SC_RUNNING, Time.now(), "");
+-      // Register the subCluster
+-      stateStore.registerSubCluster(
+-          SubClusterRegisterRequest.newInstance(subClusterInfo));
+-    }
+-  }
+-
+-  @Test
+-  public void testSubClustersWithOutHeartBeat()
+-      throws InterruptedException, TimeoutException, YarnException {
+-
+-    // We set up such a unit test, We set the status of all subClusters to RUNNING,
+-    // and Manually set subCluster heartbeat expiration.
+-    // At this time, the size of the Active SubCluster is 0.
+-    Map<SubClusterId, SubClusterInfo> subClustersMap = facade.getSubClusters(false);
+-
+-    // Step1. Manually set subCluster heartbeat expiration.
+-    // subCluster has no heartbeat, and all subClusters will expire.
+-    subClustersMap.keySet().forEach(subClusterId ->
+-        stateStore.setExpiredHeartbeat(subClusterId, EXPIRATION_TIME));
+-
+-    // Step2. Run the Cleaner to change the status of the expired SubCluster to SC_LOST.
+-    cleaner.run();
+-
+-    // Step3. All clusters have expired,
+-    // so the current Federation has no active subClusters.
+-    int count = facade.getActiveSubClustersCount();
+-    Assert.assertEquals(0, count);
+-
+-    // Step4. Check Active SubCluster Status.
+-    // We want all subClusters to be SC_LOST.
+-    subClustersMap.values().forEach(subClusterInfo -> {
+-      SubClusterState subClusterState = subClusterInfo.getState();
+-      Assert.assertEquals(SubClusterState.SC_LOST, subClusterState);
+-    });
+-  }
+-
+-  @Test
+-  public void testSubClustersPartWithHeartBeat() throws YarnException, InterruptedException {
+-
+-    // Step1. Manually set subCluster heartbeat expiration.
+-    for (int i = 0; i < NUM_SUBCLUSTERS; i++) {
+-      // Create subCluster id and info.
+-      expiredSubcluster("SC-" + i);
+-    }
+-
+-    // Step2. Run the Cleaner to change the status of the expired SubCluster to SC_LOST.
+-    cleaner.run();
+-
+-    // Step3. Let SC-0, SC-1 resume heartbeat.
+-    resumeSubClusterHeartbeat("SC-0");
+-    resumeSubClusterHeartbeat("SC-1");
+-
+-    // Step4. At this point we should have 2 subClusters that are surviving clusters.
+-    int count = facade.getActiveSubClustersCount();
+-    Assert.assertEquals(2, count);
+-
+-    // Step5. The result we expect is that SC-0 and SC-1 are in the RUNNING state,
+-    // and SC-2 and SC-3 are in the SC_LOST state.
+-    checkSubClusterState("SC-0", SubClusterState.SC_RUNNING);
+-    checkSubClusterState("SC-1", SubClusterState.SC_RUNNING);
+-    checkSubClusterState("SC-2", SubClusterState.SC_LOST);
+-    checkSubClusterState("SC-3", SubClusterState.SC_LOST);
+-  }
+-
+-  private void resumeSubClusterHeartbeat(String pSubClusterId)
+-      throws YarnException {
+-    SubClusterId subClusterId = SubClusterId.newInstance(pSubClusterId);
+-    SubClusterHeartbeatRequest request = SubClusterHeartbeatRequest.newInstance(
+-        subClusterId, Time.now(), SubClusterState.SC_RUNNING, "test");
+-    SubClusterHeartbeatResponse response = stateStore.subClusterHeartbeat(request);
+-    Assert.assertNotNull(response);
+-  }
+-
+-  private void expiredSubcluster(String pSubClusterId) {
+-    SubClusterId subClusterId = SubClusterId.newInstance(pSubClusterId);
+-    stateStore.setExpiredHeartbeat(subClusterId, EXPIRATION_TIME);
+-  }
+-
+-  private void checkSubClusterState(String pSubClusterId, SubClusterState expectState)
+-      throws YarnException {
+-    Map<SubClusterId, SubClusterInfo> subClustersMap = facade.getSubClusters(false);
+-    SubClusterId subClusterId = SubClusterId.newInstance(pSubClusterId);
+-    SubClusterInfo subClusterInfo = subClustersMap.get(subClusterId);
+-    if (subClusterInfo == null) {
+-      throw new YarnException("subClusterId=" + pSubClusterId + " does not exist.");
+-    }
+-    Assert.assertEquals(expectState, subClusterInfo.getState());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/BaseRouterClientRMTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/BaseRouterClientRMTest.java
+deleted file mode 100644
+index 905b60f31ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/BaseRouterClientRMTest.java
++++ /dev/null
+@@ -1,609 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import static org.mockito.Mockito.mock;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Collections;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.MockApps;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.Token;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystemTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.util.Clock;
+-import org.apache.hadoop.yarn.util.UTCClock;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-
+-/**
+- * Base class for all the RouterClientRMService test cases. It provides utility
+- * methods that can be used by the concrete test case classes.
+- *
+- */
+-public abstract class BaseRouterClientRMTest {
+-
+-  /**
+-   * The RouterClientRMService instance that will be used by all the test cases.
+-   */
+-  private MockRouterClientRMService clientrmService;
+-  /**
+-   * Thread pool used for asynchronous operations.
+-   */
+-  private static ExecutorService threadpool = Executors.newCachedThreadPool();
+-  private Configuration conf;
+-  private AsyncDispatcher dispatcher;
+-
+-  public final static int TEST_MAX_CACHE_SIZE = 10;
+-
+-  protected MockRouterClientRMService getRouterClientRMService() {
+-    Assert.assertNotNull(this.clientrmService);
+-    return this.clientrmService;
+-  }
+-
+-  protected Configuration createConfiguration() {
+-    YarnConfiguration config = new YarnConfiguration();
+-    String mockPassThroughInterceptorClass =
+-        PassThroughClientRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain will call the mock resource manager. The others in the chain will
+-    // simply forward it to the next one in the chain
+-    config.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass
+-            + "," + mockPassThroughInterceptorClass + ","
+-            + MockClientRequestInterceptor.class.getName());
+-
+-    config.setInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-        TEST_MAX_CACHE_SIZE);
+-    CapacitySchedulerConfiguration schedulerConf =
+-        new CapacitySchedulerConfiguration(config);
+-    ReservationSystemTestUtil.setupQueueConfiguration(schedulerConf);
+-    schedulerConf.setClass(YarnConfiguration.RM_SCHEDULER,
+-        CapacityScheduler.class, ResourceScheduler.class);
+-    schedulerConf.setBoolean(YarnConfiguration.RM_RESERVATION_SYSTEM_ENABLE,
+-        true);
+-    return schedulerConf;
+-  }
+-
+-  @Before
+-  public void setUp() throws IOException {
+-    this.conf = createConfiguration();
+-    this.dispatcher = new AsyncDispatcher();
+-    this.dispatcher.init(conf);
+-    this.dispatcher.start();
+-    this.clientrmService = createAndStartRouterClientRMService();
+-  }
+-
+-  public void setUpConfig() {
+-    this.conf = createConfiguration();
+-  }
+-
+-  protected Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    if (clientrmService != null) {
+-      clientrmService.stop();
+-      clientrmService = null;
+-    }
+-    if (this.dispatcher != null) {
+-      this.dispatcher.stop();
+-    }
+-  }
+-
+-  protected ExecutorService getThreadPool() {
+-    return threadpool;
+-  }
+-
+-  protected MockRouterClientRMService createAndStartRouterClientRMService() {
+-    MockRouterClientRMService svc = new MockRouterClientRMService();
+-    svc.init(conf);
+-    svc.start();
+-    return svc;
+-  }
+-
+-  protected static class MockRouterClientRMService
+-      extends RouterClientRMService {
+-    public MockRouterClientRMService() {
+-      super();
+-    }
+-  }
+-
+-  protected GetNewApplicationResponse getNewApplication(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetNewApplicationResponse>() {
+-          @Override
+-          public GetNewApplicationResponse run() throws Exception {
+-            GetNewApplicationRequest req =
+-                GetNewApplicationRequest.newInstance();
+-            GetNewApplicationResponse response =
+-                getRouterClientRMService().getNewApplication(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected SubmitApplicationResponse submitApplication(
+-      final ApplicationId appId, String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<SubmitApplicationResponse>() {
+-          @Override
+-          public SubmitApplicationResponse run() throws Exception {
+-            ContainerLaunchContext amContainerSpec = mock(
+-                ContainerLaunchContext.class);
+-            ApplicationSubmissionContext context = ApplicationSubmissionContext
+-                .newInstance(appId, MockApps.newAppName(), "q1",
+-                    Priority.newInstance(0), amContainerSpec, false, false, -1,
+-                    Resources.createResource(
+-                        YarnConfiguration.
+-                        DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB),
+-                    "MockApp");
+-            SubmitApplicationRequest req = SubmitApplicationRequest
+-                .newInstance(context);
+-            SubmitApplicationResponse response = getRouterClientRMService()
+-                .submitApplication(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected KillApplicationResponse forceKillApplication(
+-      final ApplicationId appId, String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<KillApplicationResponse>() {
+-          @Override
+-          public KillApplicationResponse run() throws Exception {
+-            KillApplicationRequest req =
+-                KillApplicationRequest.newInstance(appId);
+-            KillApplicationResponse response =
+-                getRouterClientRMService().forceKillApplication(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetClusterMetricsResponse getClusterMetrics(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetClusterMetricsResponse>() {
+-          @Override
+-          public GetClusterMetricsResponse run() throws Exception {
+-            GetClusterMetricsRequest req =
+-                GetClusterMetricsRequest.newInstance();
+-            GetClusterMetricsResponse response =
+-                getRouterClientRMService().getClusterMetrics(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetClusterNodesResponse getClusterNodes(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetClusterNodesResponse>() {
+-          @Override
+-          public GetClusterNodesResponse run() throws Exception {
+-            GetClusterNodesRequest req = GetClusterNodesRequest.newInstance();
+-            GetClusterNodesResponse response =
+-                getRouterClientRMService().getClusterNodes(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetQueueInfoResponse getQueueInfo(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetQueueInfoResponse>() {
+-          @Override
+-          public GetQueueInfoResponse run() throws Exception {
+-            GetQueueInfoRequest req =
+-                GetQueueInfoRequest.newInstance("default", false, false, false);
+-            GetQueueInfoResponse response =
+-                getRouterClientRMService().getQueueInfo(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetQueueUserAclsInfoResponse getQueueUserAcls(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetQueueUserAclsInfoResponse>() {
+-          @Override
+-          public GetQueueUserAclsInfoResponse run() throws Exception {
+-            GetQueueUserAclsInfoRequest req =
+-                GetQueueUserAclsInfoRequest.newInstance();
+-            GetQueueUserAclsInfoResponse response =
+-                getRouterClientRMService().getQueueUserAcls(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      String user, final ApplicationId appId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        new PrivilegedExceptionAction<MoveApplicationAcrossQueuesResponse>() {
+-          @Override
+-          public MoveApplicationAcrossQueuesResponse run() throws Exception {
+-
+-            MoveApplicationAcrossQueuesRequest req =
+-                MoveApplicationAcrossQueuesRequest.newInstance(appId,
+-                    "newQueue");
+-            MoveApplicationAcrossQueuesResponse response =
+-                getRouterClientRMService().moveApplicationAcrossQueues(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  public GetNewReservationResponse getNewReservation(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetNewReservationResponse>() {
+-          @Override
+-          public GetNewReservationResponse run() throws Exception {
+-            GetNewReservationResponse response = getRouterClientRMService()
+-                .getNewReservation(GetNewReservationRequest.newInstance());
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected ReservationSubmissionResponse submitReservation(String user,
+-      final ReservationId reservationId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<ReservationSubmissionResponse>() {
+-          @Override
+-          public ReservationSubmissionResponse run() throws Exception {
+-            Clock clock = new UTCClock();
+-            long arrival = clock.getTime();
+-            long duration = 60000;
+-            long deadline = (long) (arrival + 1.05 * duration);
+-            ReservationSubmissionRequest req = ReservationSystemTestUtil
+-                .createSimpleReservationRequest(reservationId, 1, arrival,
+-                    deadline, duration);
+-            ReservationSubmissionResponse response =
+-                getRouterClientRMService().submitReservation(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected ReservationUpdateResponse updateReservation(String user,
+-      final ReservationId reservationId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<ReservationUpdateResponse>() {
+-          @Override
+-          public ReservationUpdateResponse run() throws Exception {
+-            Clock clock = new UTCClock();
+-            long arrival = clock.getTime();
+-            long duration = 60000;
+-            long deadline = (long) (arrival + 1.05 * duration);
+-            ReservationDefinition rDef =
+-                createSimpleReservationRequest(1, arrival, deadline, duration,
+-                    reservationId).getReservationDefinition();
+-
+-            ReservationUpdateRequest req =
+-                ReservationUpdateRequest.newInstance(rDef, reservationId);
+-            ReservationUpdateResponse response =
+-                getRouterClientRMService().updateReservation(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected ReservationDeleteResponse deleteReservation(String user,
+-      final ReservationId reservationId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<ReservationDeleteResponse>() {
+-          @Override
+-          public ReservationDeleteResponse run() throws Exception {
+-            ReservationDeleteRequest req =
+-                ReservationDeleteRequest.newInstance(reservationId);
+-            ReservationDeleteResponse response =
+-                getRouterClientRMService().deleteReservation(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetNodesToLabelsResponse getNodeToLabels(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetNodesToLabelsResponse>() {
+-          @Override
+-          public GetNodesToLabelsResponse run() throws Exception {
+-            GetNodesToLabelsRequest req = GetNodesToLabelsRequest.newInstance();
+-            GetNodesToLabelsResponse response =
+-                getRouterClientRMService().getNodeToLabels(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetLabelsToNodesResponse getLabelsToNodes(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetLabelsToNodesResponse>() {
+-          @Override
+-          public GetLabelsToNodesResponse run() throws Exception {
+-            GetLabelsToNodesRequest req = GetLabelsToNodesRequest.newInstance();
+-            GetLabelsToNodesResponse response =
+-                getRouterClientRMService().getLabelsToNodes(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetClusterNodeLabelsResponse getClusterNodeLabels(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetClusterNodeLabelsResponse>() {
+-          @Override
+-          public GetClusterNodeLabelsResponse run() throws Exception {
+-            GetClusterNodeLabelsRequest req =
+-                GetClusterNodeLabelsRequest.newInstance();
+-            GetClusterNodeLabelsResponse response =
+-                getRouterClientRMService().getClusterNodeLabels(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetApplicationReportResponse getApplicationReport(String user,
+-      final ApplicationId appId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetApplicationReportResponse>() {
+-          @Override
+-          public GetApplicationReportResponse run() throws Exception {
+-            GetApplicationReportRequest req =
+-                GetApplicationReportRequest.newInstance(appId);
+-            GetApplicationReportResponse response =
+-                getRouterClientRMService().getApplicationReport(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetApplicationsResponse getApplications(String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetApplicationsResponse>() {
+-          @Override
+-          public GetApplicationsResponse run() throws Exception {
+-            GetApplicationsRequest req = GetApplicationsRequest.newInstance();
+-            GetApplicationsResponse response =
+-                getRouterClientRMService().getApplications(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      String user, final ApplicationAttemptId appAttemptId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        new PrivilegedExceptionAction<GetApplicationAttemptReportResponse>() {
+-          @Override
+-          public GetApplicationAttemptReportResponse run() throws Exception {
+-            GetApplicationAttemptReportRequest req =
+-                GetApplicationAttemptReportRequest.newInstance(appAttemptId);
+-            GetApplicationAttemptReportResponse response =
+-                getRouterClientRMService().getApplicationAttemptReport(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetApplicationAttemptsResponse getApplicationAttempts(String user,
+-      final ApplicationId applicationId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetApplicationAttemptsResponse>() {
+-          @Override
+-          public GetApplicationAttemptsResponse run() throws Exception {
+-            GetApplicationAttemptsRequest req =
+-                GetApplicationAttemptsRequest.newInstance(applicationId);
+-            GetApplicationAttemptsResponse response =
+-                getRouterClientRMService().getApplicationAttempts(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetContainerReportResponse getContainerReport(String user,
+-      final ContainerId containerId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetContainerReportResponse>() {
+-          @Override
+-          public GetContainerReportResponse run() throws Exception {
+-            GetContainerReportRequest req =
+-                GetContainerReportRequest.newInstance(containerId);
+-            GetContainerReportResponse response =
+-                getRouterClientRMService().getContainerReport(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetContainersResponse getContainers(String user,
+-      final ApplicationAttemptId appAttemptId)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetContainersResponse>() {
+-          @Override
+-          public GetContainersResponse run() throws Exception {
+-            GetContainersRequest req =
+-                GetContainersRequest.newInstance(appAttemptId);
+-            GetContainersResponse response =
+-                getRouterClientRMService().getContainers(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected GetDelegationTokenResponse getDelegationToken(final String user)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<GetDelegationTokenResponse>() {
+-          @Override
+-          public GetDelegationTokenResponse run() throws Exception {
+-            GetDelegationTokenRequest req =
+-                GetDelegationTokenRequest.newInstance(user);
+-            GetDelegationTokenResponse response =
+-                getRouterClientRMService().getDelegationToken(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected RenewDelegationTokenResponse renewDelegationToken(String user,
+-      final Token token)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<RenewDelegationTokenResponse>() {
+-          @Override
+-          public RenewDelegationTokenResponse run() throws Exception {
+-            RenewDelegationTokenRequest req =
+-                RenewDelegationTokenRequest.newInstance(token);
+-            RenewDelegationTokenResponse response =
+-                getRouterClientRMService().renewDelegationToken(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  protected CancelDelegationTokenResponse cancelDelegationToken(String user,
+-      final Token token)
+-      throws YarnException, IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<CancelDelegationTokenResponse>() {
+-          @Override
+-          public CancelDelegationTokenResponse run() throws Exception {
+-            CancelDelegationTokenRequest req =
+-                CancelDelegationTokenRequest.newInstance(token);
+-            CancelDelegationTokenResponse response =
+-                getRouterClientRMService().cancelDelegationToken(req);
+-            return response;
+-          }
+-        });
+-  }
+-
+-  private ReservationSubmissionRequest createSimpleReservationRequest(
+-      int numContainers, long arrival, long deadline, long duration,
+-      ReservationId reservationId) {
+-    // create a request with a single atomic ask
+-    ReservationRequest r = ReservationRequest
+-        .newInstance(Resource.newInstance(1024, 1), numContainers, 1, duration);
+-    ReservationRequests reqs = ReservationRequests.newInstance(
+-        Collections.singletonList(r), ReservationRequestInterpreter.R_ALL);
+-    ReservationDefinition rDef = ReservationDefinition.newInstance(arrival,
+-        deadline, reqs, "testRouterClientRMService#reservation");
+-    ReservationSubmissionRequest request = ReservationSubmissionRequest
+-        .newInstance(rDef, "dedicated", reservationId);
+-    return request;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/MockClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/MockClientRequestInterceptor.java
+deleted file mode 100644
+index c85bbd6f2ea..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/MockClientRequestInterceptor.java
++++ /dev/null
+@@ -1,80 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.ClientRMService;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.junit.Assert;
+-
+-/**
+- * This class mocks the ClientRequestInterceptor.
+- */
+-public class MockClientRequestInterceptor
+-    extends DefaultClientRequestInterceptor {
+-
+-  MockRM mockRM = null;
+-
+-  public void init(String user) {
+-    mockRM = new MockRM(super.getConf()) {
+-      @Override
+-      protected ClientRMService createClientRMService() {
+-        return new ClientRMService(getRMContext(), getResourceScheduler(),
+-            rmAppManager, applicationACLsManager, queueACLsManager,
+-            getRMContext().getRMDelegationTokenSecretManager()) {
+-          @Override
+-          protected void serviceStart() {
+-            // override to not start rpc handler
+-          }
+-
+-          @Override
+-          protected void serviceStop() {
+-            // don't do anything
+-          }
+-
+-          @Override
+-          public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-              MoveApplicationAcrossQueuesRequest request) throws YarnException {
+-            return MoveApplicationAcrossQueuesResponse.newInstance();
+-          }
+-        };
+-      }
+-    };
+-    mockRM.init(super.getConf());
+-    mockRM.start();
+-    try {
+-      mockRM.registerNode("127.0.0.1:1", 102400, 100);
+-      // allow plan follower to synchronize
+-      Thread.sleep(1050);
+-    } catch (Exception e) {
+-      Assert.fail(e.getMessage());
+-    }
+-    super.setRMClient(mockRM.getClientRMService());
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    if (mockRM != null) {
+-      mockRM.stop();
+-    }
+-    super.shutdown();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
+deleted file mode 100644
+index d4820fc12b5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/PassThroughClientRequestInterceptor.java
++++ /dev/null
+@@ -1,316 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * Mock interceptor that does not do anything other than forwarding it to the
+- * next interceptor in the chain.
+- */
+-public class PassThroughClientRequestInterceptor
+-    extends AbstractClientRequestInterceptor {
+-
+-  @Override
+-  public GetNewApplicationResponse getNewApplication(
+-      GetNewApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNewApplication(request);
+-  }
+-
+-  @Override
+-  public SubmitApplicationResponse submitApplication(
+-      SubmitApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().submitApplication(request);
+-  }
+-
+-  @Override
+-  public KillApplicationResponse forceKillApplication(
+-      KillApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().forceKillApplication(request);
+-  }
+-
+-  @Override
+-  public GetClusterMetricsResponse getClusterMetrics(
+-      GetClusterMetricsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getClusterMetrics(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodesResponse getClusterNodes(GetClusterNodesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodes(request);
+-  }
+-
+-  @Override
+-  public GetQueueInfoResponse getQueueInfo(GetQueueInfoRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getQueueInfo(request);
+-  }
+-
+-  @Override
+-  public GetQueueUserAclsInfoResponse getQueueUserAcls(
+-      GetQueueUserAclsInfoRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getQueueUserAcls(request);
+-  }
+-
+-  @Override
+-  public MoveApplicationAcrossQueuesResponse moveApplicationAcrossQueues(
+-      MoveApplicationAcrossQueuesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().moveApplicationAcrossQueues(request);
+-  }
+-
+-  @Override
+-  public GetNewReservationResponse getNewReservation(
+-      GetNewReservationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNewReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationSubmissionResponse submitReservation(
+-      ReservationSubmissionRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().submitReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationListResponse listReservations(
+-      ReservationListRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().listReservations(request);
+-  }
+-
+-  @Override
+-  public ReservationUpdateResponse updateReservation(
+-      ReservationUpdateRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().updateReservation(request);
+-  }
+-
+-  @Override
+-  public ReservationDeleteResponse deleteReservation(
+-      ReservationDeleteRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().deleteReservation(request);
+-  }
+-
+-  @Override
+-  public GetNodesToLabelsResponse getNodeToLabels(
+-      GetNodesToLabelsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNodeToLabels(request);
+-  }
+-
+-  @Override
+-  public GetLabelsToNodesResponse getLabelsToNodes(
+-      GetLabelsToNodesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getLabelsToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeLabelsResponse getClusterNodeLabels(
+-      GetClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public GetApplicationReportResponse getApplicationReport(
+-      GetApplicationReportRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationsResponse getApplications(GetApplicationsRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getApplications(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptReportResponse getApplicationAttemptReport(
+-      GetApplicationAttemptReportRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationAttemptReport(request);
+-  }
+-
+-  @Override
+-  public GetApplicationAttemptsResponse getApplicationAttempts(
+-      GetApplicationAttemptsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getApplicationAttempts(request);
+-  }
+-
+-  @Override
+-  public GetContainerReportResponse getContainerReport(
+-      GetContainerReportRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getContainerReport(request);
+-  }
+-
+-  @Override
+-  public GetContainersResponse getContainers(GetContainersRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getContainers(request);
+-  }
+-
+-  @Override
+-  public GetDelegationTokenResponse getDelegationToken(
+-      GetDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getDelegationToken(request);
+-  }
+-
+-  @Override
+-  public RenewDelegationTokenResponse renewDelegationToken(
+-      RenewDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().renewDelegationToken(request);
+-  }
+-
+-  @Override
+-  public CancelDelegationTokenResponse cancelDelegationToken(
+-      CancelDelegationTokenRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().cancelDelegationToken(request);
+-  }
+-
+-  @Override
+-  public FailApplicationAttemptResponse failApplicationAttempt(
+-      FailApplicationAttemptRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().failApplicationAttempt(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationPriorityResponse updateApplicationPriority(
+-      UpdateApplicationPriorityRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().updateApplicationPriority(request);
+-  }
+-
+-  @Override
+-  public SignalContainerResponse signalToContainer(
+-      SignalContainerRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().signalToContainer(request);
+-  }
+-
+-  @Override
+-  public UpdateApplicationTimeoutsResponse updateApplicationTimeouts(
+-      UpdateApplicationTimeoutsRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().updateApplicationTimeouts(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceProfilesResponse getResourceProfiles(
+-      GetAllResourceProfilesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceProfiles(request);
+-  }
+-
+-  @Override
+-  public GetResourceProfileResponse getResourceProfile(
+-      GetResourceProfileRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceProfile(request);
+-  }
+-
+-  @Override
+-  public GetAllResourceTypeInfoResponse getResourceTypeInfo(
+-      GetAllResourceTypeInfoRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getResourceTypeInfo(request);
+-  }
+-
+-  @Override
+-  public GetAttributesToNodesResponse getAttributesToNodes(
+-      GetAttributesToNodesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public GetClusterNodeAttributesResponse getClusterNodeAttributes(
+-      GetClusterNodeAttributesRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getClusterNodeAttributes(request);
+-  }
+-
+-  @Override
+-  public GetNodesToAttributesResponse getNodesToAttributes(
+-      GetNodesToAttributesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().getNodesToAttributes(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestApplicationSubmissionContextInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestApplicationSubmissionContextInterceptor.java
+deleted file mode 100644
+index d3cf6de4abf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestApplicationSubmissionContextInterceptor.java
++++ /dev/null
+@@ -1,160 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *  http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.nio.ByteBuffer;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.LocalResource;
+-import org.apache.hadoop.yarn.api.records.LocalResourceType;
+-import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.URL;
+-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.junit.Test;
+-
+-/**
+- * Extends the {@code BaseRouterClientRMTest} and overrides methods in order to
+- * use the {@code RouterClientRMService} pipeline test cases for testing the
+- * {@code ApplicationSubmissionContextInterceptor} class. The tests for
+- * {@code RouterClientRMService} has been written cleverly so that it can be
+- * reused to validate different request interceptor chains.
+- */
+-public class TestApplicationSubmissionContextInterceptor extends BaseRouterClientRMTest {
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    String mockPassThroughInterceptorClass =
+-        PassThroughClientRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain is the application submission context interceptor that checks
+-    // for exceeded submission context size
+-    // The others in the chain will simply forward it to the next one in the
+-    // chain
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," +
+-        ApplicationSubmissionContextInterceptor.class.getName() + "," +
+-        MockClientRequestInterceptor.class.getName());
+-
+-    // Lower the max application context size
+-    conf.set(YarnConfiguration.ROUTER_ASC_INTERCEPTOR_MAX_SIZE, "512B");
+-
+-    return conf;
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of empty
+-   * request.
+-   * @throws Exception error occur.
+-   */
+-  @Test
+-  public void testSubmitApplicationEmptyRequest() throws Exception {
+-
+-    MockRouterClientRMService rmService = getRouterClientRMService();
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing submitApplication request or applicationSubmissionContext information.",
+-        () -> rmService.submitApplication(null));
+-
+-    ApplicationSubmissionContext context = ApplicationSubmissionContext.newInstance(
+-        null, "", "", null, null, false, false, -1, null, null);
+-    SubmitApplicationRequest request = SubmitApplicationRequest.newInstance(context);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing submitApplication request or applicationSubmissionContext information.",
+-        () -> rmService.submitApplication(null));
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication by setting up
+-   * null, valid, and large ContainerLaunchContexts.
+-   * @throws Exception error occur.
+-   */
+-  @Test
+-  public void testCLCExceedSize() throws Exception {
+-
+-    ApplicationSubmissionContext context = ApplicationSubmissionContext.newInstance(
+-        ApplicationId.newInstance(1, 1), "test", "default",
+-        Priority.newInstance(0), null, false, true, 2,
+-        Resource.newInstance(10, 2), "test");
+-
+-    LocalResource localResource = LocalResource.newInstance(
+-        URL.newInstance("hdfs", "somehost", 12345, "/some/path/to/rsrc"),
+-        LocalResourceType.FILE, LocalResourceVisibility.APPLICATION, 123L,
+-        1234567890L);
+-
+-    Map<String, LocalResource> localResources = new HashMap<>();
+-    localResources.put("rsrc", localResource);
+-
+-    Map<String, String> env = new HashMap<>();
+-    env.put("somevar", "someval");
+-
+-    List<String> containerCmds = new ArrayList<>();
+-    containerCmds.add("somecmd");
+-    containerCmds.add("somearg");
+-
+-    Map<String, ByteBuffer> serviceData = new HashMap<>();
+-    serviceData.put("someservice", ByteBuffer.wrap(new byte[] {0x1, 0x2, 0x3}));
+-    ByteBuffer containerTokens = ByteBuffer.wrap(new byte[] {0x7, 0x8, 0x9, 0xa});
+-
+-    Map<ApplicationAccessType, String> acls = new HashMap<>();
+-    acls.put(ApplicationAccessType.VIEW_APP, "viewuser");
+-    acls.put(ApplicationAccessType.MODIFY_APP, "moduser");
+-    ContainerLaunchContext clc = ContainerLaunchContext.newInstance(
+-        localResources, env, containerCmds, serviceData, containerTokens, acls);
+-    ApplicationSubmissionContextPBImpl appSubmissionContextPB =
+-        (ApplicationSubmissionContextPBImpl) context;
+-    Configuration configuration = getConf();
+-
+-    // Null ApplicationSubmissionContext
+-    RouterServerUtil.checkAppSubmissionContext(null, configuration);
+-
+-    // Null ContainerLaunchContext
+-    RouterServerUtil.checkAppSubmissionContext(appSubmissionContextPB, configuration);
+-
+-    // Valid ContainerLaunchContext
+-    context.setAMContainerSpec(clc);
+-    RouterServerUtil.checkAppSubmissionContext(appSubmissionContextPB, configuration);
+-
+-    // ContainerLaunchContext exceeds 1MB
+-    for (int i = 0; i < 1000; i++) {
+-      localResources.put("rsrc" + i, localResource);
+-    }
+-    ContainerLaunchContext clcExceedSize = ContainerLaunchContext.newInstance(
+-        localResources, env, containerCmds, serviceData, containerTokens, acls);
+-    context.setAMContainerSpec(clcExceedSize);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "The size of the ApplicationSubmissionContext of the application",
+-        () -> RouterServerUtil.checkAppSubmissionContext(appSubmissionContextPB, configuration));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java
+deleted file mode 100644
+index 3c2c7b4d3b3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptor.java
++++ /dev/null
+@@ -1,1731 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.EnumSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.Set;
+-import java.util.stream.Collectors;
+-import java.util.Arrays;
+-import java.util.Collection;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.MockApps;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationAttemptsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainersResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetContainerReportResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.FailApplicationAttemptResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationPriorityResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UpdateApplicationTimeoutsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SignalContainerResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.QueueACL;
+-import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
+-import org.apache.hadoop.yarn.api.records.SignalContainerCommand;
+-import org.apache.hadoop.yarn.api.records.QueueInfo;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeKey;
+-import org.apache.hadoop.yarn.api.records.NodeToAttributeValue;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeInfo;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeType;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.Token;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.UniformBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterRMDTSecretManagerState;
+-import org.apache.hadoop.yarn.server.federation.store.records.RouterStoreToken;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockNM;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.util.ConverterUtils;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.util.Times;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Extends the {@code BaseRouterClientRMTest} and overrides methods in order to
+- * use the {@code RouterClientRMService} pipeline test cases for testing the
+- * {@code FederationInterceptor} class. The tests for
+- * {@code RouterClientRMService} has been written cleverly so that it can be
+- * reused to validate different request interceptor chains.
+- */
+-public class TestFederationClientInterceptor extends BaseRouterClientRMTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestFederationClientInterceptor.class);
+-
+-  private TestableFederationClientInterceptor interceptor;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreTestUtil stateStoreUtil;
+-  private List<SubClusterId> subClusters;
+-
+-  private String user = "test-user";
+-
+-  private final static int NUM_SUBCLUSTER = 4;
+-
+-  private final static int APP_PRIORITY_ZERO = 0;
+-
+-  private final static long DEFAULT_DURATION = 10 * 60 * 1000;
+-
+-  @Override
+-  public void setUp() throws IOException {
+-    super.setUpConfig();
+-    interceptor = new TestableFederationClientInterceptor();
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(this.getConf());
+-    FederationStateStoreFacade.getInstance(getConf()).reinitialize(stateStore, getConf());
+-    stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-
+-    interceptor.setConf(this.getConf());
+-    interceptor.init(user);
+-    RouterDelegationTokenSecretManager tokenSecretManager =
+-        interceptor.createRouterRMDelegationTokenSecretManager(this.getConf());
+-
+-    tokenSecretManager.startThreads();
+-    interceptor.setTokenSecretManager(tokenSecretManager);
+-
+-    subClusters = new ArrayList<>();
+-
+-    try {
+-      for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-        SubClusterId sc = SubClusterId.newInstance(Integer.toString(i));
+-        stateStoreUtil.registerSubCluster(sc);
+-        subClusters.add(sc);
+-      }
+-    } catch (YarnException e) {
+-      LOG.error(e.getMessage());
+-      Assert.fail();
+-    }
+-
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-  }
+-
+-  @Override
+-  public void tearDown() {
+-    interceptor.shutdown();
+-    super.tearDown();
+-  }
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    String mockPassThroughInterceptorClass =
+-        PassThroughClientRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain is the federation interceptor that calls the mock resource manager.
+-    // The others in the chain will simply forward it to the next one in the
+-    // chain
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass
+-        + "," + TestableFederationClientInterceptor.class.getName());
+-
+-    conf.set(YarnConfiguration.FEDERATION_POLICY_MANAGER,
+-        UniformBroadcastPolicyManager.class.getName());
+-
+-    // Disable StateStoreFacade cache
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-
+-    conf.setInt("yarn.scheduler.minimum-allocation-mb", 512);
+-    conf.setInt("yarn.scheduler.minimum-allocation-vcores", 1);
+-    conf.setInt("yarn.scheduler.maximum-allocation-mb", 100 * 1024);
+-    conf.setInt("yarn.scheduler.maximum-allocation-vcores", 100);
+-
+-    conf.setBoolean("hadoop.security.authentication", true);
+-    return conf;
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication. The return
+-   * ApplicationId has to belong to one of the SubCluster in the cluster.
+-   */
+-  @Test
+-  public void testGetNewApplication() throws YarnException, IOException {
+-    LOG.info("Test FederationClientInterceptor: Get New Application.");
+-
+-    GetNewApplicationRequest request = GetNewApplicationRequest.newInstance();
+-    GetNewApplicationResponse response = interceptor.getNewApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(response.getApplicationId());
+-    Assert.assertEquals(response.getApplicationId().getClusterTimestamp(),
+-        ResourceManager.getClusterTimeStamp());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication. The application
+-   * has to be submitted to one of the SubCluster in the cluster.
+-   */
+-  @Test
+-  public void testSubmitApplication()
+-      throws YarnException, IOException {
+-    LOG.info("Test FederationClientInterceptor: Submit Application.");
+-
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    SubClusterId scIdResult = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult);
+-    Assert.assertTrue(subClusters.contains(scIdResult));
+-  }
+-
+-  private SubmitApplicationRequest mockSubmitApplicationRequest(
+-      ApplicationId appId) {
+-    ContainerLaunchContext amContainerSpec = mock(ContainerLaunchContext.class);
+-    ApplicationSubmissionContext context = ApplicationSubmissionContext.newInstance(
+-        appId, MockApps.newAppName(), "default",
+-        Priority.newInstance(APP_PRIORITY_ZERO), amContainerSpec, false, false, -1,
+-        Resources.createResource(YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB),
+-        "MockApp");
+-    SubmitApplicationRequest request = SubmitApplicationRequest.newInstance(context);
+-    return request;
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of
+-   * multiple submission. The first retry has to be submitted to the same
+-   * SubCluster of the first attempt.
+-   */
+-  @Test
+-  public void testSubmitApplicationMultipleSubmission()
+-      throws YarnException, IOException, InterruptedException {
+-    LOG.info(
+-        "Test FederationClientInterceptor: Submit Application - Multiple");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // First attempt
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    SubClusterId scIdResult = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult);
+-
+-    // First retry
+-    response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    SubClusterId scIdResult2 = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult2);
+-    Assert.assertEquals(scIdResult, scIdResult);
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of empty
+-   * request.
+-   */
+-  @Test
+-  public void testSubmitApplicationEmptyRequest()
+-      throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Submit Application - Empty.");
+-
+-    // null request1
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing submitApplication request or applicationSubmissionContext information.",
+-        () -> interceptor.submitApplication(null));
+-
+-    // null request2
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing submitApplication request or applicationSubmissionContext information.",
+-        () -> interceptor.submitApplication(SubmitApplicationRequest.newInstance(null)));
+-
+-    // null request3
+-    ApplicationSubmissionContext context = ApplicationSubmissionContext
+-        .newInstance(null, "", "", null, null, false, false, -1, null, null);
+-    SubmitApplicationRequest request =
+-        SubmitApplicationRequest.newInstance(context);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing submitApplication request or applicationSubmissionContext information.",
+-        () -> interceptor.submitApplication(request));
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testForceKillApplication()
+-      throws YarnException, IOException, InterruptedException {
+-    LOG.info("Test FederationClientInterceptor: Force Kill Application.");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application we are going to kill later
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    KillApplicationRequest requestKill = KillApplicationRequest.newInstance(appId);
+-    KillApplicationResponse responseKill = interceptor.forceKillApplication(requestKill);
+-    Assert.assertNotNull(responseKill);
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case of
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testForceKillApplicationNotExists() throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Force Kill Application - Not Exists");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    KillApplicationRequest requestKill =
+-        KillApplicationRequest.newInstance(appId);
+-
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Application " + appId + " does not exist in FederationStateStore.",
+-        () -> interceptor.forceKillApplication(requestKill));
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case of
+-   * empty request.
+-   */
+-  @Test
+-  public void testForceKillApplicationEmptyRequest()
+-      throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Force Kill Application - Empty.");
+-
+-    // null request1
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing forceKillApplication request or ApplicationId.",
+-        () -> interceptor.forceKillApplication(null));
+-
+-    // null request2
+-    KillApplicationRequest killRequest = KillApplicationRequest.newInstance(null);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing forceKillApplication request or ApplicationId.",
+-        () -> interceptor.forceKillApplication(killRequest));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testGetApplicationReport()
+-      throws YarnException, IOException, InterruptedException {
+-    LOG.info("Test FederationClientInterceptor: Get Application Report");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application we want the report later
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    GetApplicationReportRequest requestGet =
+-        GetApplicationReportRequest.newInstance(appId);
+-
+-    GetApplicationReportResponse responseGet =
+-        interceptor.getApplicationReport(requestGet);
+-
+-    Assert.assertNotNull(responseGet);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case the
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testGetApplicationNotExists()
+-      throws Exception {
+-    LOG.info("Test ApplicationClientProtocol: Get Application Report - Not Exists.");
+-
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    GetApplicationReportRequest requestGet = GetApplicationReportRequest.newInstance(appId);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Application " + appId + " does not exist in FederationStateStore.",
+-        () -> interceptor.getApplicationReport(requestGet));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case of
+-   * empty request.
+-   */
+-  @Test
+-  public void testGetApplicationEmptyRequest()
+-      throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Get Application Report - Empty.");
+-
+-    // null request1
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getApplicationReport request or applicationId information.",
+-        () -> interceptor.getApplicationReport(null));
+-
+-    // null request2
+-    GetApplicationReportRequest reportRequest = GetApplicationReportRequest.newInstance(null);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getApplicationReport request or applicationId information.",
+-        () -> interceptor.getApplicationReport(reportRequest));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationAttemptReport in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testGetApplicationAttemptReport()
+-          throws YarnException, IOException, InterruptedException {
+-    LOG.info("Test FederationClientInterceptor: Get ApplicationAttempt Report.");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application we want the applicationAttempt report later
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    // Call GetApplicationAttempts Get ApplicationAttemptId
+-    GetApplicationAttemptsRequest attemptsRequest =
+-         GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-         interceptor.getApplicationAttempts(attemptsRequest);
+-
+-    // Wait for app to start
+-    while(attemptsResponse.getApplicationAttemptList().size() == 0) {
+-      attemptsResponse =
+-          interceptor.getApplicationAttempts(attemptsRequest);
+-    }
+-
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    GetApplicationAttemptReportRequest requestGet =
+-         GetApplicationAttemptReportRequest.newInstance(
+-         attemptsResponse.getApplicationAttemptList().get(0).getApplicationAttemptId());
+-
+-    GetApplicationAttemptReportResponse responseGet =
+-         interceptor.getApplicationAttemptReport(requestGet);
+-
+-    Assert.assertNotNull(responseGet);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationAttemptReport in case the
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testGetApplicationAttemptNotExists() throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Get ApplicationAttempt Report - Not Exists.");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    ApplicationAttemptId appAttemptID =
+-        ApplicationAttemptId.newInstance(appId, 1);
+-    GetApplicationAttemptReportRequest requestGet =
+-        GetApplicationAttemptReportRequest.newInstance(appAttemptID);
+-
+-    LambdaTestUtils.intercept(YarnException.class, "ApplicationAttempt " +
+-        appAttemptID + " belongs to Application " +
+-        appId + " does not exist in FederationStateStore.",
+-        () -> interceptor.getApplicationAttemptReport(requestGet));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationAttemptReport in case of
+-   * empty request.
+-   */
+-  @Test
+-  public void testGetApplicationAttemptEmptyRequest()
+-      throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Get ApplicationAttempt Report - Empty.");
+-
+-    // null request1
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getApplicationAttemptReport request or applicationId " +
+-        "or applicationAttemptId information.",
+-        () -> interceptor.getApplicationAttemptReport(null));
+-
+-    // null request2
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getApplicationAttemptReport request or applicationId " +
+-        "or applicationAttemptId information.",
+-        () -> interceptor.getApplicationAttemptReport(
+-        GetApplicationAttemptReportRequest.newInstance(null)));
+-
+-    // null request3
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getApplicationAttemptReport request or applicationId " +
+-        "or applicationAttemptId information.",
+-        () -> interceptor.getApplicationAttemptReport(
+-        GetApplicationAttemptReportRequest.newInstance(
+-        ApplicationAttemptId.newInstance(null, 1))));
+-  }
+-
+-
+-  @Test
+-  public void testGetClusterMetricsRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Cluster Metrics request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getClusterMetrics request.",
+-        () -> interceptor.getClusterMetrics(null));
+-
+-    // normal request.
+-    GetClusterMetricsResponse response =
+-        interceptor.getClusterMetrics(GetClusterMetricsRequest.newInstance());
+-    Assert.assertEquals(subClusters.size(),
+-        response.getClusterMetrics().getNumNodeManagers());
+-
+-    // Clear Membership
+-    Map<SubClusterId, SubClusterInfo> membership = new HashMap<>();
+-    membership.putAll(stateStore.getMembership());
+-    stateStore.getMembership().clear();
+-
+-    ClientMethod remoteMethod = new ClientMethod("getClusterMetrics",
+-        new Class[] {GetClusterMetricsRequest.class},
+-        new Object[] {GetClusterMetricsRequest.newInstance()});
+-    Collection<GetClusterMetricsResponse> clusterMetrics = interceptor.invokeConcurrent(
+-        remoteMethod, GetClusterMetricsResponse.class);
+-    Assert.assertTrue(clusterMetrics.isEmpty());
+-
+-    // Restore membership
+-    stateStore.setMembership(membership);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationsResponse in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testGetApplicationsResponse()
+-      throws YarnException, IOException, InterruptedException {
+-    LOG.info("Test FederationClientInterceptor: Get Applications Response.");
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    Set<String> appTypes = Collections.singleton("MockApp");
+-    GetApplicationsRequest requestGet = GetApplicationsRequest.newInstance(appTypes);
+-    GetApplicationsResponse responseGet = interceptor.getApplications(requestGet);
+-
+-    Assert.assertNotNull(responseGet);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationsResponse in case of
+-   * empty request.
+-   */
+-  @Test
+-  public void testGetApplicationsNullRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Get Applications request.");
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getApplications request.",
+-        () -> interceptor.getApplications(null));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationsResponse in case applications
+-   * with given type does not exist.
+-   */
+-  @Test
+-  public void testGetApplicationsApplicationTypeNotExists() throws Exception{
+-    LOG.info("Test FederationClientInterceptor: Application with type does not exist.");
+-
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    Set<String> appTypes = Collections.singleton("SPARK");
+-
+-    GetApplicationsRequest requestGet = GetApplicationsRequest.newInstance(appTypes);
+-    GetApplicationsResponse responseGet = interceptor.getApplications(requestGet);
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertTrue(responseGet.getApplicationList().isEmpty());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationsResponse in case applications
+-   * with given YarnApplicationState does not exist.
+-   */
+-  @Test
+-  public void testGetApplicationsApplicationStateNotExists() throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Application with state does not exist.");
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    EnumSet<YarnApplicationState> applicationStates = EnumSet.noneOf(
+-        YarnApplicationState.class);
+-    applicationStates.add(YarnApplicationState.KILLED);
+-
+-    GetApplicationsRequest requestGet =
+-        GetApplicationsRequest.newInstance(applicationStates);
+-
+-    GetApplicationsResponse responseGet = interceptor.getApplications(requestGet);
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertTrue(responseGet.getApplicationList().isEmpty());
+-  }
+-
+-  @Test
+-  public void testGetClusterNodesRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Cluster Nodes request.");
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getClusterNodes request.",
+-        () -> interceptor.getClusterNodes(null));
+-    // normal request.
+-    GetClusterNodesResponse response =
+-        interceptor.getClusterNodes(GetClusterNodesRequest.newInstance());
+-    Assert.assertEquals(subClusters.size(), response.getNodeReports().size());
+-  }
+-
+-  @Test
+-  public void testGetNodeToLabelsRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor :  Get Node To Labels request.");
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getNodesToLabels request.",
+-        () -> interceptor.getNodeToLabels(null));
+-    // normal request.
+-    GetNodesToLabelsResponse response =
+-        interceptor.getNodeToLabels(GetNodesToLabelsRequest.newInstance());
+-    Assert.assertEquals(0, response.getNodeToLabels().size());
+-  }
+-
+-  @Test
+-  public void testGetLabelsToNodesRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor :  Get Labels To Node request.");
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getLabelsToNodes request.",
+-        () -> interceptor.getLabelsToNodes(null));
+-    // normal request.
+-    GetLabelsToNodesResponse response =
+-        interceptor.getLabelsToNodes(GetLabelsToNodesRequest.newInstance());
+-    Assert.assertEquals(0, response.getLabelsToNodes().size());
+-  }
+-
+-  @Test
+-  public void testClusterNodeLabelsRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor :  Get Cluster NodeLabels request.");
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getClusterNodeLabels request.",
+-        () -> interceptor.getClusterNodeLabels(null));
+-    // normal request.
+-    GetClusterNodeLabelsResponse response =
+-        interceptor.getClusterNodeLabels(GetClusterNodeLabelsRequest.newInstance());
+-    Assert.assertEquals(0, response.getNodeLabelList().size());
+-  }
+-
+-  @Test
+-  public void testGetQueueUserAcls() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get QueueUserAcls request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getQueueUserAcls request.",
+-        () -> interceptor.getQueueUserAcls(null));
+-
+-    // normal request
+-    GetQueueUserAclsInfoResponse response = interceptor.getQueueUserAcls(
+-        GetQueueUserAclsInfoRequest.newInstance());
+-
+-    Assert.assertNotNull(response);
+-
+-    List<QueueACL> submitAndAdministerAcl = new ArrayList<>();
+-    submitAndAdministerAcl.add(QueueACL.SUBMIT_APPLICATIONS);
+-    submitAndAdministerAcl.add(QueueACL.ADMINISTER_QUEUE);
+-
+-    QueueUserACLInfo exceptRootQueueACLInfo = QueueUserACLInfo.newInstance("root",
+-        submitAndAdministerAcl);
+-
+-    QueueUserACLInfo queueRootQueueACLInfo = response.getUserAclsInfoList().stream().
+-        filter(acl->acl.getQueueName().equals("root")).
+-        collect(Collectors.toList()).get(0);
+-
+-    Assert.assertEquals(exceptRootQueueACLInfo, queueRootQueueACLInfo);
+-  }
+-
+-  @Test
+-  public void testListReservations() throws Exception {
+-    LOG.info("Test FederationClientInterceptor :  Get ListReservations request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing listReservations request.",
+-        () -> interceptor.listReservations(null));
+-
+-    // normal request
+-    ReservationId reservationId = ReservationId.newInstance(1653487680L, 1L);
+-    ReservationListResponse response = interceptor.listReservations(
+-        ReservationListRequest.newInstance("root.decided", reservationId.toString()));
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(0, response.getReservationAllocationState().size());
+-  }
+-
+-  @Test
+-  public void testGetContainersRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Containers request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getContainers request " +
+-        "or ApplicationAttemptId.", () -> interceptor.getContainers(null));
+-
+-    // normal request
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-        GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-        interceptor.getApplicationAttempts(attemptsRequest);
+-
+-    // Wait for app to start
+-    while(attemptsResponse.getApplicationAttemptList().size() == 0) {
+-      attemptsResponse =
+-          interceptor.getApplicationAttempts(attemptsRequest);
+-    }
+-
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    // Call GetContainers
+-    GetContainersRequest containersRequest =
+-        GetContainersRequest.newInstance(
+-        attemptsResponse.getApplicationAttemptList().get(0).getApplicationAttemptId());
+-    GetContainersResponse containersResponse =
+-        interceptor.getContainers(containersRequest);
+-
+-    Assert.assertNotNull(containersResponse);
+-  }
+-
+-  @Test
+-  public void testGetContainerReportRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Container Report request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getContainerReport request " +
+-        "or containerId", () -> interceptor.getContainerReport(null));
+-
+-    // normal request
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-         GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-         interceptor.getApplicationAttempts(attemptsRequest);
+-
+-    // Wait for app to start
+-    while(attemptsResponse.getApplicationAttemptList().size() == 0) {
+-      attemptsResponse =
+-          interceptor.getApplicationAttempts(attemptsRequest);
+-    }
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    ApplicationAttemptId attemptId = attemptsResponse.getApplicationAttemptList().
+-        get(0).getApplicationAttemptId();
+-    ContainerId containerId = ContainerId.newContainerId(attemptId, 1);
+-
+-    // Call ContainerReport, RM does not allocate Container, Here is null
+-    GetContainerReportRequest containerReportRequest =
+-         GetContainerReportRequest.newInstance(containerId);
+-    GetContainerReportResponse containerReportResponse =
+-         interceptor.getContainerReport(containerReportRequest);
+-
+-    Assert.assertEquals(containerReportResponse, null);
+-  }
+-
+-  @Test
+-  public void getApplicationAttempts() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Application Attempts request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getApplicationAttempts " +
+-            "request or application id.", () -> interceptor.getApplicationAttempts(null));
+-
+-    // normal request
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-         GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-         interceptor.getApplicationAttempts(attemptsRequest);
+-
+-    Assert.assertNotNull(attemptsResponse);
+-  }
+-
+-  @Test
+-  public void testGetResourceTypeInfoRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor :  Get Resource TypeInfo request.");
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getResourceTypeInfo request.",
+-        () -> interceptor.getResourceTypeInfo(null));
+-    // normal request.
+-    GetAllResourceTypeInfoResponse response =
+-        interceptor.getResourceTypeInfo(GetAllResourceTypeInfoRequest.newInstance());
+-    Assert.assertEquals(2, response.getResourceTypeInfo().size());
+-  }
+-
+-  @Test
+-  public void testFailApplicationAttempt() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Fail Application Attempt request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing failApplicationAttempt request " +
+-        "or applicationId or applicationAttemptId information.",
+-        () -> interceptor.failApplicationAttempt(null));
+-
+-    // normal request
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    SubClusterId subClusterId = interceptor.getApplicationHomeSubCluster(appId);
+-    Assert.assertNotNull(subClusterId);
+-
+-    MockRM mockRM = interceptor.getMockRMs().get(subClusterId);
+-    mockRM.waitForState(appId, RMAppState.ACCEPTED);
+-    RMApp rmApp = mockRM.getRMContext().getRMApps().get(appId);
+-    mockRM.waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+-        RMAppAttemptState.SCHEDULED);
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-        GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-        interceptor.getApplicationAttempts(attemptsRequest);
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    ApplicationAttemptId attemptId = attemptsResponse.getApplicationAttemptList().
+-        get(0).getApplicationAttemptId();
+-
+-    FailApplicationAttemptRequest requestFailAppAttempt =
+-        FailApplicationAttemptRequest.newInstance(attemptId);
+-    FailApplicationAttemptResponse responseFailAppAttempt =
+-        interceptor.failApplicationAttempt(requestFailAppAttempt);
+-
+-    Assert.assertNotNull(responseFailAppAttempt);
+-  }
+-
+-  @Test
+-  public void testUpdateApplicationPriority() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Update Application Priority request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing updateApplicationPriority request " +
+-        "or applicationId or applicationPriority information.",
+-        () -> interceptor.updateApplicationPriority(null));
+-
+-    // normal request
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    SubClusterId subClusterId = interceptor.getApplicationHomeSubCluster(appId);
+-    Assert.assertNotNull(subClusterId);
+-
+-    MockRM mockRM = interceptor.getMockRMs().get(subClusterId);
+-    mockRM.waitForState(appId, RMAppState.ACCEPTED);
+-    RMApp rmApp = mockRM.getRMContext().getRMApps().get(appId);
+-    mockRM.waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+-        RMAppAttemptState.SCHEDULED);
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-        GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-        interceptor.getApplicationAttempts(attemptsRequest);
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    Priority priority = Priority.newInstance(20);
+-    UpdateApplicationPriorityRequest requestUpdateAppPriority =
+-        UpdateApplicationPriorityRequest.newInstance(appId, priority);
+-    UpdateApplicationPriorityResponse responseAppPriority =
+-        interceptor.updateApplicationPriority(requestUpdateAppPriority);
+-
+-    Assert.assertNotNull(responseAppPriority);
+-    Assert.assertEquals(20,
+-        responseAppPriority.getApplicationPriority().getPriority());
+-  }
+-
+-  @Test
+-  public void testUpdateApplicationTimeouts() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Update Application Timeouts request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing updateApplicationTimeouts request " +
+-        "or applicationId or applicationTimeouts information.",
+-        () -> interceptor.updateApplicationTimeouts(null));
+-
+-    // normal request
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    SubClusterId subClusterId = interceptor.getApplicationHomeSubCluster(appId);
+-    Assert.assertNotNull(subClusterId);
+-
+-    MockRM mockRM = interceptor.getMockRMs().get(subClusterId);
+-    mockRM.waitForState(appId, RMAppState.ACCEPTED);
+-    RMApp rmApp = mockRM.getRMContext().getRMApps().get(appId);
+-    mockRM.waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+-        RMAppAttemptState.SCHEDULED);
+-
+-    // Call GetApplicationAttempts
+-    GetApplicationAttemptsRequest attemptsRequest =
+-        GetApplicationAttemptsRequest.newInstance(appId);
+-    GetApplicationAttemptsResponse attemptsResponse =
+-        interceptor.getApplicationAttempts(attemptsRequest);
+-    Assert.assertNotNull(attemptsResponse);
+-
+-    String appTimeout =
+-        Times.formatISO8601(System.currentTimeMillis() + 5 * 1000);
+-    Map<ApplicationTimeoutType, String> applicationTimeouts = new HashMap<>();
+-    applicationTimeouts.put(ApplicationTimeoutType.LIFETIME, appTimeout);
+-
+-    UpdateApplicationTimeoutsRequest timeoutsRequest =
+-        UpdateApplicationTimeoutsRequest.newInstance(appId, applicationTimeouts);
+-    UpdateApplicationTimeoutsResponse timeoutsResponse =
+-        interceptor.updateApplicationTimeouts(timeoutsRequest);
+-
+-    String responseTimeOut =
+-        timeoutsResponse.getApplicationTimeouts().get(ApplicationTimeoutType.LIFETIME);
+-    Assert.assertNotNull(timeoutsResponse);
+-    Assert.assertEquals(appTimeout, responseTimeOut);
+-  }
+-
+-  @Test
+-  public void testSignalContainer() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Signal Container request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing signalToContainer request " +
+-        "or containerId or command information.", () -> interceptor.signalToContainer(null));
+-
+-    // normal request
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    SubClusterId subClusterId = interceptor.getApplicationHomeSubCluster(appId);
+-    Assert.assertNotNull(subClusterId);
+-
+-    MockRM mockRM = interceptor.getMockRMs().get(subClusterId);
+-    mockRM.waitForState(appId, RMAppState.ACCEPTED);
+-    RMApp rmApp = mockRM.getRMContext().getRMApps().get(appId);
+-    mockRM.waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+-        RMAppAttemptState.SCHEDULED);
+-    MockNM nm = interceptor.getMockNMs().get(subClusterId);
+-    nm.nodeHeartbeat(true);
+-    MockRM.waitForState(rmApp.getCurrentAppAttempt(), RMAppAttemptState.ALLOCATED);
+-    mockRM.sendAMLaunched(rmApp.getCurrentAppAttempt().getAppAttemptId());
+-
+-    ContainerId containerId = rmApp.getCurrentAppAttempt().getMasterContainer().getId();
+-
+-    SignalContainerRequest signalContainerRequest =
+-        SignalContainerRequest.newInstance(containerId, SignalContainerCommand.GRACEFUL_SHUTDOWN);
+-    SignalContainerResponse signalContainerResponse =
+-        interceptor.signalToContainer(signalContainerRequest);
+-
+-    Assert.assertNotNull(signalContainerResponse);
+-  }
+-
+-  @Test
+-  public void testMoveApplicationAcrossQueues() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : MoveApplication AcrossQueues request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing moveApplicationAcrossQueues request " +
+-        "or applicationId or target queue.", () -> interceptor.moveApplicationAcrossQueues(null));
+-
+-    // normal request
+-    ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    // Submit the application
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    SubClusterId subClusterId = interceptor.getApplicationHomeSubCluster(appId);
+-    Assert.assertNotNull(subClusterId);
+-
+-    MockRM mockRM = interceptor.getMockRMs().get(subClusterId);
+-    mockRM.waitForState(appId, RMAppState.ACCEPTED);
+-    RMApp rmApp = mockRM.getRMContext().getRMApps().get(appId);
+-    mockRM.waitForState(rmApp.getCurrentAppAttempt().getAppAttemptId(),
+-          RMAppAttemptState.SCHEDULED);
+-    MockNM nm = interceptor.getMockNMs().get(subClusterId);
+-    nm.nodeHeartbeat(true);
+-    MockRM.waitForState(rmApp.getCurrentAppAttempt(), RMAppAttemptState.ALLOCATED);
+-    mockRM.sendAMLaunched(rmApp.getCurrentAppAttempt().getAppAttemptId());
+-
+-    MoveApplicationAcrossQueuesRequest acrossQueuesRequest =
+-        MoveApplicationAcrossQueuesRequest.newInstance(appId, "root.target");
+-    MoveApplicationAcrossQueuesResponse acrossQueuesResponse =
+-        interceptor.moveApplicationAcrossQueues(acrossQueuesRequest);
+-
+-    Assert.assertNotNull(acrossQueuesResponse);
+-  }
+-
+-
+-  @Test
+-  public void testGetQueueInfo() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Queue Info request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getQueueInfo request or queueName.",
+-        () -> interceptor.getQueueInfo(null));
+-
+-    // normal request
+-    GetQueueInfoResponse response = interceptor.getQueueInfo(
+-        GetQueueInfoRequest.newInstance("root", true, true, true));
+-
+-    Assert.assertNotNull(response);
+-
+-    QueueInfo queueInfo = response.getQueueInfo();
+-    Assert.assertNotNull(queueInfo);
+-    Assert.assertEquals("root", queueInfo.getQueueName());
+-    Assert.assertEquals(4.0, queueInfo.getCapacity(), 0);
+-    Assert.assertEquals(0.0, queueInfo.getCurrentCapacity(), 0);
+-    Assert.assertEquals(12, queueInfo.getChildQueues().size(), 0);
+-    Assert.assertEquals(1, queueInfo.getAccessibleNodeLabels().size());
+-  }
+-
+-  @Test
+-  public void testSubClusterGetQueueInfo() throws IOException, YarnException {
+-    // We have set up a unit test where we access queue information for subcluster1.
+-    GetQueueInfoResponse response = interceptor.getQueueInfo(
+-        GetQueueInfoRequest.newInstance("root", true, true, true, "1"));
+-    Assert.assertNotNull(response);
+-
+-    QueueInfo queueInfo = response.getQueueInfo();
+-    Assert.assertNotNull(queueInfo);
+-    Assert.assertEquals("root", queueInfo.getQueueName());
+-    Assert.assertEquals(1.0, queueInfo.getCapacity(), 0);
+-    Assert.assertEquals(0.0, queueInfo.getCurrentCapacity(), 0);
+-    Assert.assertEquals(3, queueInfo.getChildQueues().size(), 0);
+-    Assert.assertEquals(1, queueInfo.getAccessibleNodeLabels().size());
+-  }
+-
+-  @Test
+-  public void testGetResourceProfiles() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Resource Profiles request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getResourceProfiles request.",
+-        () -> interceptor.getResourceProfiles(null));
+-
+-    // normal request
+-    GetAllResourceProfilesRequest request = GetAllResourceProfilesRequest.newInstance();
+-    GetAllResourceProfilesResponse response = interceptor.getResourceProfiles(request);
+-
+-    Assert.assertNotNull(response);
+-    Map<String, Resource> resProfiles = response.getResourceProfiles();
+-
+-    Resource maxResProfiles = resProfiles.get("maximum");
+-    Assert.assertEquals(32768, maxResProfiles.getMemorySize());
+-    Assert.assertEquals(16, maxResProfiles.getVirtualCores());
+-
+-    Resource defaultResProfiles = resProfiles.get("default");
+-    Assert.assertEquals(8192, defaultResProfiles.getMemorySize());
+-    Assert.assertEquals(8, defaultResProfiles.getVirtualCores());
+-
+-    Resource minimumResProfiles = resProfiles.get("minimum");
+-    Assert.assertEquals(4096, minimumResProfiles.getMemorySize());
+-    Assert.assertEquals(4, minimumResProfiles.getVirtualCores());
+-  }
+-
+-  @Test
+-  public void testGetResourceProfile() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get Resource Profile request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getResourceProfile request or profileName.",
+-        () -> interceptor.getResourceProfile(null));
+-
+-    // normal request
+-    GetResourceProfileRequest request = GetResourceProfileRequest.newInstance("maximum");
+-    GetResourceProfileResponse response = interceptor.getResourceProfile(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(32768, response.getResource().getMemorySize());
+-    Assert.assertEquals(16, response.getResource().getVirtualCores());
+-
+-    GetResourceProfileRequest request2 = GetResourceProfileRequest.newInstance("default");
+-    GetResourceProfileResponse response2 = interceptor.getResourceProfile(request2);
+-
+-    Assert.assertNotNull(response2);
+-    Assert.assertEquals(8192, response2.getResource().getMemorySize());
+-    Assert.assertEquals(8, response2.getResource().getVirtualCores());
+-
+-    GetResourceProfileRequest request3 = GetResourceProfileRequest.newInstance("minimum");
+-    GetResourceProfileResponse response3 = interceptor.getResourceProfile(request3);
+-
+-    Assert.assertNotNull(response3);
+-    Assert.assertEquals(4096, response3.getResource().getMemorySize());
+-    Assert.assertEquals(4, response3.getResource().getVirtualCores());
+-  }
+-
+-  @Test
+-  public void testGetAttributesToNodes() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get AttributesToNodes request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getAttributesToNodes request " +
+-        "or nodeAttributes.", () -> interceptor.getAttributesToNodes(null));
+-
+-    // normal request
+-    GetAttributesToNodesResponse response =
+-        interceptor.getAttributesToNodes(GetAttributesToNodesRequest.newInstance());
+-
+-    Assert.assertNotNull(response);
+-    Map<NodeAttributeKey, List<NodeToAttributeValue>> attrs = response.getAttributesToNodes();
+-    Assert.assertNotNull(attrs);
+-    Assert.assertEquals(4, attrs.size());
+-
+-    NodeAttribute gpu = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "GPU",
+-        NodeAttributeType.STRING, "nvidia");
+-    NodeToAttributeValue attributeValue1 =
+-        NodeToAttributeValue.newInstance("0-host1", gpu.getAttributeValue());
+-    NodeAttributeKey gpuKey = gpu.getAttributeKey();
+-    Assert.assertTrue(attrs.get(gpuKey).contains(attributeValue1));
+-  }
+-
+-  @Test
+-  public void testClusterNodeAttributes() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get ClusterNodeAttributes request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class, "Missing getClusterNodeAttributes request.",
+-        () -> interceptor.getClusterNodeAttributes(null));
+-
+-    // normal request
+-    GetClusterNodeAttributesResponse response =
+-        interceptor.getClusterNodeAttributes(GetClusterNodeAttributesRequest.newInstance());
+-
+-    Assert.assertNotNull(response);
+-    Set<NodeAttributeInfo> nodeAttributeInfos = response.getNodeAttributes();
+-    Assert.assertNotNull(nodeAttributeInfos);
+-    Assert.assertEquals(4, nodeAttributeInfos.size());
+-
+-    NodeAttributeInfo nodeAttributeInfo1 =
+-        NodeAttributeInfo.newInstance(NodeAttributeKey.newInstance("GPU"),
+-        NodeAttributeType.STRING);
+-    Assert.assertTrue(nodeAttributeInfos.contains(nodeAttributeInfo1));
+-
+-    NodeAttributeInfo nodeAttributeInfo2 =
+-        NodeAttributeInfo.newInstance(NodeAttributeKey.newInstance("OS"),
+-        NodeAttributeType.STRING);
+-    Assert.assertTrue(nodeAttributeInfos.contains(nodeAttributeInfo2));
+-  }
+-
+-  @Test
+-  public void testNodesToAttributes() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get NodesToAttributes request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getNodesToAttributes request or hostNames.",
+-        () -> interceptor.getNodesToAttributes(null));
+-
+-    // normal request
+-    Set<String> hostNames = Collections.singleton("0-host1");
+-    GetNodesToAttributesResponse response =
+-        interceptor.getNodesToAttributes(GetNodesToAttributesRequest.newInstance(hostNames));
+-    Assert.assertNotNull(response);
+-
+-    Map<String, Set<NodeAttribute>> nodeAttributeMap = response.getNodeToAttributes();
+-    Assert.assertNotNull(nodeAttributeMap);
+-    Assert.assertEquals(1, nodeAttributeMap.size());
+-
+-    NodeAttribute gpu = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "GPU",
+-        NodeAttributeType.STRING, "nvida");
+-    Assert.assertTrue(nodeAttributeMap.get("0-host1").contains(gpu));
+-  }
+-
+-  @Test
+-  public void testGetNewReservation() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : Get NewReservation request.");
+-
+-    // null request
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getNewReservation request.", () -> interceptor.getNewReservation(null));
+-
+-    // normal request
+-    GetNewReservationRequest request = GetNewReservationRequest.newInstance();
+-    GetNewReservationResponse response = interceptor.getNewReservation(request);
+-    Assert.assertNotNull(response);
+-
+-    ReservationId reservationId = response.getReservationId();
+-    Assert.assertNotNull(reservationId);
+-    Assert.assertTrue(reservationId.toString().contains("reservation"));
+-    Assert.assertEquals(reservationId.getClusterTimestamp(), ResourceManager.getClusterTimeStamp());
+-  }
+-
+-  @Test
+-  public void testSubmitReservation() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : SubmitReservation request.");
+-
+-    // get new reservationId
+-    GetNewReservationRequest request = GetNewReservationRequest.newInstance();
+-    GetNewReservationResponse response = interceptor.getNewReservation(request);
+-    Assert.assertNotNull(response);
+-
+-    // Submit Reservation
+-    ReservationId reservationId = response.getReservationId();
+-    ReservationDefinition rDefinition = createReservationDefinition(1024, 1);
+-    ReservationSubmissionRequest rSubmissionRequest = ReservationSubmissionRequest.newInstance(
+-        rDefinition, "decided", reservationId);
+-
+-    ReservationSubmissionResponse submissionResponse =
+-        interceptor.submitReservation(rSubmissionRequest);
+-    Assert.assertNotNull(submissionResponse);
+-
+-    SubClusterId subClusterId = stateStoreUtil.queryReservationHomeSC(reservationId);
+-    Assert.assertNotNull(subClusterId);
+-    Assert.assertTrue(subClusters.contains(subClusterId));
+-  }
+-
+-  @Test
+-  public void testSubmitReservationEmptyRequest() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : SubmitReservation request empty.");
+-
+-    String errorMsg =
+-        "Missing submitReservation request or reservationId or reservation definition or queue.";
+-
+-    // null request1
+-    LambdaTestUtils.intercept(YarnException.class, errorMsg,
+-        () -> interceptor.submitReservation(null));
+-
+-    // null request2
+-    ReservationSubmissionRequest request2 =
+-        ReservationSubmissionRequest.newInstance(null, null, null);
+-    LambdaTestUtils.intercept(YarnException.class, errorMsg,
+-        () -> interceptor.submitReservation(request2));
+-
+-    // null request3
+-    ReservationSubmissionRequest request3 =
+-        ReservationSubmissionRequest.newInstance(null, "q1", null);
+-    LambdaTestUtils.intercept(YarnException.class, errorMsg,
+-        () -> interceptor.submitReservation(request3));
+-
+-    // null request4
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 1);
+-    ReservationSubmissionRequest request4 =
+-        ReservationSubmissionRequest.newInstance(null, null,  reservationId);
+-    LambdaTestUtils.intercept(YarnException.class, errorMsg,
+-        () -> interceptor.submitReservation(request4));
+-
+-    // null request5
+-    long arrival = Time.now();
+-    long deadline = arrival + (int)(DEFAULT_DURATION * 1.1);
+-
+-    ReservationRequest rRequest = ReservationRequest.newInstance(
+-        Resource.newInstance(1024, 1), 1, 1, DEFAULT_DURATION);
+-    ReservationRequest[] rRequests = new ReservationRequest[] {rRequest};
+-    ReservationDefinition rDefinition = createReservationDefinition(arrival, deadline, rRequests,
+-        ReservationRequestInterpreter.R_ALL, "u1");
+-    ReservationSubmissionRequest request5 =
+-        ReservationSubmissionRequest.newInstance(rDefinition, null,  reservationId);
+-    LambdaTestUtils.intercept(YarnException.class, errorMsg,
+-        () -> interceptor.submitReservation(request5));
+-  }
+-
+-  @Test
+-  public void testSubmitReservationMultipleSubmission() throws Exception {
+-    LOG.info("Test FederationClientInterceptor: Submit Reservation - Multiple");
+-
+-    // get new reservationId
+-    GetNewReservationRequest request = GetNewReservationRequest.newInstance();
+-    GetNewReservationResponse response = interceptor.getNewReservation(request);
+-    Assert.assertNotNull(response);
+-
+-    // First Submit Reservation
+-    ReservationId reservationId = response.getReservationId();
+-    ReservationDefinition rDefinition = createReservationDefinition(1024, 1);
+-    ReservationSubmissionRequest rSubmissionRequest = ReservationSubmissionRequest.newInstance(
+-        rDefinition, "decided", reservationId);
+-    ReservationSubmissionResponse submissionResponse =
+-        interceptor.submitReservation(rSubmissionRequest);
+-    Assert.assertNotNull(submissionResponse);
+-
+-    SubClusterId subClusterId1 = stateStoreUtil.queryReservationHomeSC(reservationId);
+-    Assert.assertNotNull(subClusterId1);
+-    Assert.assertTrue(subClusters.contains(subClusterId1));
+-
+-    // First Retry, repeat the submission
+-    ReservationSubmissionResponse submissionResponse1 =
+-        interceptor.submitReservation(rSubmissionRequest);
+-    Assert.assertNotNull(submissionResponse1);
+-
+-    // Expect reserved clusters to be consistent
+-    SubClusterId subClusterId2 = stateStoreUtil.queryReservationHomeSC(reservationId);
+-    Assert.assertNotNull(subClusterId2);
+-    Assert.assertEquals(subClusterId1, subClusterId2);
+-  }
+-
+-  @Test
+-  public void testUpdateReservation() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : UpdateReservation request.");
+-
+-    // get new reservationId
+-    GetNewReservationRequest request = GetNewReservationRequest.newInstance();
+-    GetNewReservationResponse response = interceptor.getNewReservation(request);
+-    Assert.assertNotNull(response);
+-
+-    // allow plan follower to synchronize, manually trigger an assignment
+-    Map<SubClusterId, MockRM> mockRMs = interceptor.getMockRMs();
+-    for (MockRM mockRM : mockRMs.values()) {
+-      ReservationSystem reservationSystem = mockRM.getReservationSystem();
+-      reservationSystem.synchronizePlan("root.decided", true);
+-    }
+-
+-    // Submit Reservation
+-    ReservationId reservationId = response.getReservationId();
+-    ReservationDefinition rDefinition = createReservationDefinition(1024, 1);
+-    ReservationSubmissionRequest rSubmissionRequest = ReservationSubmissionRequest.newInstance(
+-        rDefinition, "decided", reservationId);
+-
+-    ReservationSubmissionResponse submissionResponse =
+-        interceptor.submitReservation(rSubmissionRequest);
+-    Assert.assertNotNull(submissionResponse);
+-
+-    // Update Reservation
+-    ReservationDefinition rDefinition2 = createReservationDefinition(2048, 1);
+-    ReservationUpdateRequest updateRequest =
+-        ReservationUpdateRequest.newInstance(rDefinition2, reservationId);
+-    ReservationUpdateResponse updateResponse =
+-        interceptor.updateReservation(updateRequest);
+-    Assert.assertNotNull(updateResponse);
+-
+-    SubClusterId subClusterId = stateStoreUtil.queryReservationHomeSC(reservationId);
+-    Assert.assertNotNull(subClusterId);
+-  }
+-
+-  @Test
+-  public void testDeleteReservation() throws Exception {
+-    LOG.info("Test FederationClientInterceptor : DeleteReservation request.");
+-
+-    // get new reservationId
+-    GetNewReservationRequest request = GetNewReservationRequest.newInstance();
+-    GetNewReservationResponse response = interceptor.getNewReservation(request);
+-    Assert.assertNotNull(response);
+-
+-    // allow plan follower to synchronize, manually trigger an assignment
+-    Map<SubClusterId, MockRM> mockRMs = interceptor.getMockRMs();
+-    for (MockRM mockRM : mockRMs.values()) {
+-      ReservationSystem reservationSystem = mockRM.getReservationSystem();
+-      reservationSystem.synchronizePlan("root.decided", true);
+-    }
+-
+-    // Submit Reservation
+-    ReservationId reservationId = response.getReservationId();
+-    ReservationDefinition rDefinition = createReservationDefinition(1024, 1);
+-    ReservationSubmissionRequest rSubmissionRequest = ReservationSubmissionRequest.newInstance(
+-        rDefinition, "decided", reservationId);
+-
+-    ReservationSubmissionResponse submissionResponse =
+-        interceptor.submitReservation(rSubmissionRequest);
+-    Assert.assertNotNull(submissionResponse);
+-
+-    // Delete Reservation
+-    ReservationDeleteRequest deleteRequest = ReservationDeleteRequest.newInstance(reservationId);
+-    ReservationDeleteResponse deleteResponse = interceptor.deleteReservation(deleteRequest);
+-    Assert.assertNotNull(deleteResponse);
+-
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Reservation " + reservationId + " does not exist",
+-        () -> stateStoreUtil.queryReservationHomeSC(reservationId));
+-  }
+-
+-
+-  private ReservationDefinition createReservationDefinition(int memory, int core) {
+-    // get reservationId
+-    long arrival = Time.now();
+-    long deadline = arrival + (int)(DEFAULT_DURATION * 1.1);
+-
+-    ReservationRequest rRequest = ReservationRequest.newInstance(
+-        Resource.newInstance(memory, core), 1, 1, DEFAULT_DURATION);
+-    ReservationRequest[] rRequests = new ReservationRequest[] {rRequest};
+-
+-    ReservationDefinition rDefinition = createReservationDefinition(arrival, deadline, rRequests,
+-        ReservationRequestInterpreter.R_ALL, "u1");
+-
+-    return rDefinition;
+-  }
+-
+-  /**
+-   * This method is used to create a ReservationDefinition.
+-   *
+-   * @param arrival Job arrival time
+-   * @param deadline Job deadline
+-   * @param reservationRequests reservationRequest Array
+-   * @param rType Enumeration of various types of
+-   *              dependencies among multiple ReservationRequest
+-   * @param username username
+-   * @return ReservationDefinition
+-   */
+-  private ReservationDefinition createReservationDefinition(long arrival,
+-      long deadline, ReservationRequest[] reservationRequests,
+-      ReservationRequestInterpreter rType, String username) {
+-    ReservationRequests requests = ReservationRequests
+-        .newInstance(Arrays.asList(reservationRequests), rType);
+-    return ReservationDefinition.newInstance(arrival, deadline,
+-        requests, username, "0", Priority.UNDEFINED);
+-  }
+-
+-  @Test
+-  public void testGetNumMinThreads() {
+-    // If we don't configure YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE,
+-    // we expect to get 5 threads
+-    int minThreads = interceptor.getNumMinThreads(this.getConf());
+-    Assert.assertEquals(5, minThreads);
+-
+-    // If we configure YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE,
+-    // we expect to get 3 threads
+-    this.getConf().unset(YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE);
+-    this.getConf().setInt(YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MINIMUM_POOL_SIZE, 3);
+-    int minThreads2 = interceptor.getNumMinThreads(this.getConf());
+-    Assert.assertEquals(3, minThreads2);
+-  }
+-
+-  @Test
+-  public void testGetNumMaxThreads() {
+-    // If we don't configure YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE,
+-    // we expect to get 5 threads
+-    int minThreads = interceptor.getNumMaxThreads(this.getConf());
+-    Assert.assertEquals(5, minThreads);
+-
+-    // If we configure YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE,
+-    // we expect to get 8 threads
+-    this.getConf().unset(YarnConfiguration.ROUTER_USER_CLIENT_THREADS_SIZE);
+-    this.getConf().setInt(YarnConfiguration.ROUTER_USER_CLIENT_THREAD_POOL_MAXIMUM_POOL_SIZE, 8);
+-    int minThreads2 = interceptor.getNumMaxThreads(this.getConf());
+-    Assert.assertEquals(8, minThreads2);
+-  }
+-
+-  @Test
+-  public void testGetDelegationToken() throws IOException, YarnException {
+-
+-    // We design such a unit test to check
+-    // that the execution of the GetDelegationToken method is as expected.
+-    //
+-    // 1. Apply for a DelegationToken for renewer1,
+-    // the Router returns the DelegationToken of the user, and the KIND of the token is
+-    // RM_DELEGATION_TOKEN
+-    //
+-    // 2. We maintain the compatibility with RMDelegationTokenIdentifier,
+-    // we can serialize the token into RMDelegationTokenIdentifier.
+-    //
+-    // 3. We can get the issueDate, and compare the data in the StateStore,
+-    // the data should be consistent.
+-
+-    // Step1. We apply for DelegationToken for renewer1
+-    // Both response & delegationToken cannot be empty
+-    GetDelegationTokenRequest request = mock(GetDelegationTokenRequest.class);
+-    when(request.getRenewer()).thenReturn("renewer1");
+-    GetDelegationTokenResponse response = interceptor.getDelegationToken(request);
+-    Assert.assertNotNull(response);
+-    Token delegationToken = response.getRMDelegationToken();
+-    Assert.assertNotNull(delegationToken);
+-    Assert.assertEquals("RM_DELEGATION_TOKEN", delegationToken.getKind());
+-
+-    // Step2. Serialize the returned Token as RMDelegationTokenIdentifier.
+-    org.apache.hadoop.security.token.Token<RMDelegationTokenIdentifier> token =
+-        ConverterUtils.convertFromYarn(delegationToken, (Text) null);
+-    RMDelegationTokenIdentifier rMDelegationTokenIdentifier = token.decodeIdentifier();
+-    Assert.assertNotNull(rMDelegationTokenIdentifier);
+-
+-    // Step3. Verify the returned data of the token.
+-    String renewer = rMDelegationTokenIdentifier.getRenewer().toString();
+-    long issueDate = rMDelegationTokenIdentifier.getIssueDate();
+-    long maxDate = rMDelegationTokenIdentifier.getMaxDate();
+-    Assert.assertEquals("renewer1", renewer);
+-
+-    long tokenMaxLifetime = this.getConf().getLong(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT);
+-    Assert.assertEquals(issueDate + tokenMaxLifetime, maxDate);
+-
+-    RouterRMDTSecretManagerState managerState = stateStore.getRouterRMSecretManagerState();
+-    Assert.assertNotNull(managerState);
+-
+-    Map<RMDelegationTokenIdentifier, RouterStoreToken> delegationTokenState =
+-        managerState.getTokenState();
+-    Assert.assertNotNull(delegationTokenState);
+-    Assert.assertTrue(delegationTokenState.containsKey(rMDelegationTokenIdentifier));
+-
+-    long tokenRenewInterval = this.getConf().getLong(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT);
+-    RouterStoreToken resultRouterStoreToken = delegationTokenState.get(rMDelegationTokenIdentifier);
+-    Assert.assertNotNull(resultRouterStoreToken);
+-    long renewDate = resultRouterStoreToken.getRenewDate();
+-    Assert.assertEquals(issueDate + tokenRenewInterval, renewDate);
+-  }
+-
+-  @Test
+-  public void testRenewDelegationToken() throws IOException, YarnException {
+-
+-    // We design such a unit test to check
+-    // that the execution of the GetDelegationToken method is as expected
+-    // 1. Call GetDelegationToken to apply for delegationToken.
+-    // 2. Call renewDelegationToken to refresh delegationToken.
+-    // By looking at the code of AbstractDelegationTokenSecretManager#renewToken,
+-    // we know that renewTime is calculated as Math.min(id.getMaxDate(), now + tokenRenewInterval)
+-    // so renewTime will be less than or equal to maxDate.
+-    // 3. We will compare whether the expirationTime returned to the
+-    // client is consistent with the renewDate in the stateStore.
+-
+-    // Step1. Call GetDelegationToken to apply for delegationToken.
+-    GetDelegationTokenRequest request = mock(GetDelegationTokenRequest.class);
+-    when(request.getRenewer()).thenReturn("renewer2");
+-    GetDelegationTokenResponse response = interceptor.getDelegationToken(request);
+-    Assert.assertNotNull(response);
+-    Token delegationToken = response.getRMDelegationToken();
+-
+-    org.apache.hadoop.security.token.Token<RMDelegationTokenIdentifier> token =
+-        ConverterUtils.convertFromYarn(delegationToken, (Text) null);
+-    RMDelegationTokenIdentifier rMDelegationTokenIdentifier = token.decodeIdentifier();
+-    String renewer = rMDelegationTokenIdentifier.getRenewer().toString();
+-    long maxDate = rMDelegationTokenIdentifier.getMaxDate();
+-    Assert.assertEquals("renewer2", renewer);
+-
+-    // Step2. Call renewDelegationToken to refresh delegationToken.
+-    RenewDelegationTokenRequest renewRequest = Records.newRecord(RenewDelegationTokenRequest.class);
+-    renewRequest.setDelegationToken(delegationToken);
+-    RenewDelegationTokenResponse renewResponse = interceptor.renewDelegationToken(renewRequest);
+-    Assert.assertNotNull(renewResponse);
+-
+-    long expDate = renewResponse.getNextExpirationTime();
+-    Assert.assertTrue(expDate <= maxDate);
+-
+-    // Step3. Compare whether the expirationTime returned to
+-    // the client is consistent with the renewDate in the stateStore
+-    RouterRMDTSecretManagerState managerState = stateStore.getRouterRMSecretManagerState();
+-    Map<RMDelegationTokenIdentifier, RouterStoreToken> delegationTokenState =
+-        managerState.getTokenState();
+-    Assert.assertNotNull(delegationTokenState);
+-    Assert.assertTrue(delegationTokenState.containsKey(rMDelegationTokenIdentifier));
+-    RouterStoreToken resultRouterStoreToken = delegationTokenState.get(rMDelegationTokenIdentifier);
+-    Assert.assertNotNull(resultRouterStoreToken);
+-    long renewDate = resultRouterStoreToken.getRenewDate();
+-    Assert.assertEquals(expDate, renewDate);
+-  }
+-
+-  @Test
+-  public void testCancelDelegationToken() throws IOException, YarnException {
+-
+-    // We design such a unit test to check
+-    // that the execution of the CancelDelegationToken method is as expected
+-    // 1. Call GetDelegationToken to apply for delegationToken.
+-    // 2. Call CancelDelegationToken to cancel delegationToken.
+-    // 3. Query the data in the StateStore and confirm that the Delegation has been deleted.
+-
+-    // Step1. Call GetDelegationToken to apply for delegationToken.
+-    GetDelegationTokenRequest request = mock(GetDelegationTokenRequest.class);
+-    when(request.getRenewer()).thenReturn("renewer3");
+-    GetDelegationTokenResponse response = interceptor.getDelegationToken(request);
+-    Assert.assertNotNull(response);
+-    Token delegationToken = response.getRMDelegationToken();
+-
+-    // Step2. Call CancelDelegationToken to cancel delegationToken.
+-    CancelDelegationTokenRequest cancelTokenRequest =
+-        CancelDelegationTokenRequest.newInstance(delegationToken);
+-    CancelDelegationTokenResponse cancelTokenResponse =
+-        interceptor.cancelDelegationToken(cancelTokenRequest);
+-    Assert.assertNotNull(cancelTokenResponse);
+-
+-    // Step3. Query the data in the StateStore and confirm that the Delegation has been deleted.
+-    // At this point, the size of delegationTokenState should be 0.
+-    RouterRMDTSecretManagerState managerState = stateStore.getRouterRMSecretManagerState();
+-    Map<RMDelegationTokenIdentifier, RouterStoreToken> delegationTokenState =
+-        managerState.getTokenState();
+-    Assert.assertNotNull(delegationTokenState);
+-    Assert.assertEquals(0, delegationTokenState.size());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptorRetry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptorRetry.java
+deleted file mode 100644
+index f0ecf8367cc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestFederationClientInterceptorRetry.java
++++ /dev/null
+@@ -1,431 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_POLICY_MANAGER;
+-import static org.hamcrest.CoreMatchers.is;
+-import static org.mockito.Mockito.mock;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.List;
+-
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.MockApps;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+-import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.UniformBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.junit.Assert;
+-import org.junit.Assume;
+-import org.junit.Test;
+-import org.junit.runner.RunWith;
+-import org.junit.runners.Parameterized;
+-import org.junit.runners.Parameterized.Parameters;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE;
+-
+-/**
+- * Extends the {@code BaseRouterClientRMTest} and overrides methods in order to
+- * use the {@code RouterClientRMService} pipeline test cases for testing the
+- * {@code FederationInterceptor} class. The tests for
+- * {@code RouterClientRMService} has been written cleverly so that it can be
+- * reused to validate different request interceptor chains.
+- *
+- * It tests the case with SubClusters down and the Router logic of retries. We
+- * have 1 good SubCluster and 2 bad ones for all the tests.
+- */
+-@RunWith(Parameterized.class)
+-public class TestFederationClientInterceptorRetry
+-    extends BaseRouterClientRMTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestFederationClientInterceptorRetry.class);
+-
+-  @Parameters
+-  public static Collection<String[]> getParameters() {
+-    return Arrays.asList(new String[][] {{UniformBroadcastPolicyManager.class.getName()},
+-        {TestSequentialBroadcastPolicyManager.class.getName()}});
+-  }
+-
+-  private TestableFederationClientInterceptor interceptor;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreTestUtil stateStoreUtil;
+-  private String routerPolicyManagerName;
+-
+-  private String user = "test-user";
+-
+-  // running and registered
+-  private static SubClusterId good;
+-
+-  // registered but not running
+-  private static SubClusterId bad1;
+-  private static SubClusterId bad2;
+-
+-  private static List<SubClusterId> scs = new ArrayList<>();
+-
+-  public TestFederationClientInterceptorRetry(String policyManagerName) {
+-    this.routerPolicyManagerName = policyManagerName;
+-  }
+-
+-  @Override
+-  public void setUp() throws IOException {
+-    super.setUpConfig();
+-    interceptor = new TestableFederationClientInterceptor();
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(this.getConf());
+-    FederationStateStoreFacade.getInstance(getConf()).reinitialize(stateStore,
+-        getConf());
+-    stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-
+-    interceptor.setConf(this.getConf());
+-    interceptor.init(user);
+-
+-    // Create SubClusters
+-    good = SubClusterId.newInstance("0");
+-    bad1 = SubClusterId.newInstance("1");
+-    bad2 = SubClusterId.newInstance("2");
+-    scs.add(good);
+-    scs.add(bad1);
+-    scs.add(bad2);
+-
+-    // The mock RM will not start in these SubClusters, this is done to simulate
+-    // a SubCluster down
+-
+-    interceptor.registerBadSubCluster(bad1);
+-    interceptor.registerBadSubCluster(bad2);
+-  }
+-
+-  @Override
+-  public void tearDown() {
+-    interceptor.shutdown();
+-    super.tearDown();
+-  }
+-
+-  private void setupCluster(List<SubClusterId> scsToRegister) throws YarnException {
+-
+-    try {
+-      // Clean up the StateStore before every test
+-      stateStoreUtil.deregisterAllSubClusters();
+-
+-      for (SubClusterId sc : scsToRegister) {
+-        stateStoreUtil.registerSubCluster(sc);
+-      }
+-    } catch (YarnException e) {
+-      LOG.error(e.getMessage());
+-      Assert.fail();
+-    }
+-  }
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    String mockPassThroughInterceptorClass =
+-        PassThroughClientRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain is the federation interceptor that calls the mock resource manager.
+-    // The others in the chain will simply forward it to the next one in the
+-    // chain
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass
+-            + "," + TestableFederationClientInterceptor.class.getName());
+-
+-    conf.set(FEDERATION_POLICY_MANAGER, this.routerPolicyManagerName);
+-
+-    // Disable StateStoreFacade cache
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-
+-    return conf;
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testGetNewApplicationOneBadSC() throws Exception {
+-
+-    LOG.info("Test getNewApplication with one bad SubCluster");
+-    setupCluster(Arrays.asList(bad2));
+-
+-    GetNewApplicationRequest request = GetNewApplicationRequest.newInstance();
+-    LambdaTestUtils.intercept(YarnException.class, NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        () -> interceptor.getNewApplication(request));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testGetNewApplicationTwoBadSCs() throws Exception {
+-
+-    LOG.info("Test getNewApplication with two bad SubClusters");
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    GetNewApplicationRequest request = GetNewApplicationRequest.newInstance();
+-    LambdaTestUtils.intercept(YarnException.class, NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        () -> interceptor.getNewApplication(request));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 1 bad SubCluster and 1 good one.
+-   */
+-  @Test
+-  public void testGetNewApplicationOneBadOneGood() throws YarnException, IOException {
+-
+-    LOG.info("Test getNewApplication with one bad, one good SC");
+-    setupCluster(Arrays.asList(good, bad2));
+-    GetNewApplicationRequest request = GetNewApplicationRequest.newInstance();
+-    GetNewApplicationResponse response = interceptor.getNewApplication(request);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(ResourceManager.getClusterTimeStamp(),
+-        response.getApplicationId().getClusterTimestamp());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testSubmitApplicationOneBadSC() throws Exception {
+-
+-    LOG.info("Test submitApplication with one bad SubCluster");
+-    setupCluster(Arrays.asList(bad2));
+-
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    LambdaTestUtils.intercept(YarnException.class, NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        () -> interceptor.submitApplication(request));
+-  }
+-
+-  private SubmitApplicationRequest mockSubmitApplicationRequest(ApplicationId appId) {
+-    ContainerLaunchContext amContainerSpec = mock(ContainerLaunchContext.class);
+-    ApplicationSubmissionContext context = ApplicationSubmissionContext
+-        .newInstance(appId, MockApps.newAppName(), "q1",
+-        Priority.newInstance(0), amContainerSpec, false, false, -1,
+-        Resources.createResource(YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_MB),
+-        "MockApp");
+-    SubmitApplicationRequest request = SubmitApplicationRequest.newInstance(context);
+-    return request;
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testSubmitApplicationTwoBadSCs() throws Exception {
+-
+-    LOG.info("Test submitApplication with two bad SubClusters.");
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    LambdaTestUtils.intercept(YarnException.class, NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        () -> interceptor.submitApplication(request));
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 1 bad SubCluster and a good one.
+-   */
+-  @Test
+-  public void testSubmitApplicationOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    LOG.info("Test submitApplication with one bad, one good SC.");
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    SubmitApplicationResponse response = interceptor.submitApplication(request);
+-    Assert.assertNotNull(response);
+-
+-    GetApplicationHomeSubClusterRequest getAppRequest =
+-        GetApplicationHomeSubClusterRequest.newInstance(appId);
+-    GetApplicationHomeSubClusterResponse getAppResponse =
+-        stateStore.getApplicationHomeSubCluster(getAppRequest);
+-    Assert.assertNotNull(getAppResponse);
+-
+-    ApplicationHomeSubCluster responseHomeSubCluster =
+-        getAppResponse.getApplicationHomeSubCluster();
+-    Assert.assertNotNull(responseHomeSubCluster);
+-    SubClusterId respSubClusterId = responseHomeSubCluster.getHomeSubCluster();
+-    Assert.assertEquals(good, respSubClusterId);
+-  }
+-
+-  @Test
+-  public void testSubmitApplicationTwoBadOneGood() throws Exception {
+-
+-    LOG.info("Test submitApplication with two bad, one good SC.");
+-
+-    // This test must require the TestSequentialRouterPolicy policy
+-    Assume.assumeThat(routerPolicyManagerName,
+-        is(TestSequentialBroadcastPolicyManager.class.getName()));
+-
+-    setupCluster(Arrays.asList(bad1, bad2, good));
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    // Use the TestSequentialRouterPolicy strategy,
+-    // which will sort the SubClusterId because good=0, bad1=1, bad2=2
+-    // We will get 2, 1, 0 [bad2, bad1, good]
+-    // Set the retryNum to 1
+-    // 1st time will use bad2, 2nd time will use bad1
+-    // bad1 is updated to stateStore
+-    interceptor.setNumSubmitRetries(1);
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-    LambdaTestUtils.intercept(YarnException.class, "RM is stopped",
+-        () -> interceptor.submitApplication(request));
+-
+-    // We will get bad1
+-    checkSubmitSubCluster(appId, bad1);
+-
+-    // Set the retryNum to 2
+-    // 1st time will use bad2, 2nd time will use bad1, 3rd good
+-    interceptor.setNumSubmitRetries(2);
+-    SubmitApplicationResponse submitAppResponse = interceptor.submitApplication(request);
+-    Assert.assertNotNull(submitAppResponse);
+-
+-    // We will get good
+-    checkSubmitSubCluster(appId, good);
+-  }
+-
+-  private void checkSubmitSubCluster(ApplicationId appId, SubClusterId expectSubCluster)
+-      throws YarnException {
+-    GetApplicationHomeSubClusterRequest getAppRequest =
+-        GetApplicationHomeSubClusterRequest.newInstance(appId);
+-    GetApplicationHomeSubClusterResponse getAppResponse =
+-        stateStore.getApplicationHomeSubCluster(getAppRequest);
+-    Assert.assertNotNull(getAppResponse);
+-    Assert.assertNotNull(getAppResponse);
+-    ApplicationHomeSubCluster responseHomeSubCluster =
+-        getAppResponse.getApplicationHomeSubCluster();
+-    Assert.assertNotNull(responseHomeSubCluster);
+-    SubClusterId respSubClusterId = responseHomeSubCluster.getHomeSubCluster();
+-    Assert.assertEquals(expectSubCluster, respSubClusterId);
+-  }
+-
+-  @Test
+-  public void testSubmitApplicationTwoBadNodeWithRealError() throws Exception {
+-    LOG.info("Test submitApplication with two bad SubClusters.");
+-    setupCluster(Arrays.asList(bad1, bad2));
+-    interceptor.setNumSubmitRetries(1);
+-
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 5);
+-
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    LambdaTestUtils.intercept(YarnException.class, "RM is stopped",
+-        () -> interceptor.submitApplication(request));
+-  }
+-
+-  @Test
+-  public void testSubmitApplicationOneBadNodeWithRealError() throws Exception {
+-    LOG.info("Test submitApplication with one bad SubClusters.");
+-    setupCluster(Arrays.asList(bad1));
+-    interceptor.setNumSubmitRetries(0);
+-
+-    final ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 6);
+-
+-    final SubmitApplicationRequest request = mockSubmitApplicationRequest(appId);
+-
+-    LambdaTestUtils.intercept(YarnException.class, "RM is stopped",
+-        () -> interceptor.submitApplication(request));
+-  }
+-
+-  @Test
+-  public void testGetClusterMetricsTwoBadNodeWithRealError() throws Exception {
+-    LOG.info("Test getClusterMetrics with two bad SubClusters.");
+-    setupCluster(Arrays.asList(bad1, bad2));
+-    GetClusterMetricsRequest request = GetClusterMetricsRequest.newInstance();
+-
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId 1 exec getClusterMetrics error RM is stopped.",
+-        () -> interceptor.getClusterMetrics(request));
+-
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId 2 exec getClusterMetrics error RM is stopped.",
+-        () -> interceptor.getClusterMetrics(request));
+-  }
+-
+-  @Test
+-  public void testGetClusterMetricsOneBadNodeWithRealError() throws Exception {
+-    LOG.info("Test getClusterMetrics with one bad SubClusters.");
+-    setupCluster(Arrays.asList(bad1));
+-    GetClusterMetricsRequest request = GetClusterMetricsRequest.newInstance();
+-
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId 1 exec getClusterMetrics error RM is stopped.",
+-        () -> interceptor.getClusterMetrics(request));
+-  }
+-
+-  @Test
+-  public void testGetClusterMetricsOneBadOneGoodNodeWithRealError() throws Exception {
+-    LOG.info("Test getClusterMetrics with one bad and one good SubCluster.");
+-    setupCluster(Arrays.asList(bad1, good));
+-    GetClusterMetricsRequest request = GetClusterMetricsRequest.newInstance();
+-
+-    GetClusterMetricsResponse clusterMetrics = interceptor.getClusterMetrics(request);
+-    Assert.assertNotNull(clusterMetrics);
+-
+-    // If partial results are not allowed to be returned, an exception will be thrown.
+-    interceptor.setAllowPartialResult(false);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId 1 exec getClusterMetrics error RM is stopped.",
+-        () -> interceptor.getClusterMetrics(request));
+-    interceptor.setAllowPartialResult(true);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterClientRMService.java
+deleted file mode 100644
+index a7bec085d1e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterClientRMService.java
++++ /dev/null
+@@ -1,270 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Map;
+-
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNewReservationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.MoveApplicationAcrossQueuesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService.RequestInterceptorChainWrapper;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Test class to validate the ClientRM Service inside the Router.
+- */
+-public class TestRouterClientRMService extends BaseRouterClientRMTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterClientRMService.class);
+-
+-  /**
+-   * Tests if the pipeline is created properly.
+-   */
+-  @Test
+-  public void testRequestInterceptorChainCreation() throws Exception {
+-    ClientRequestInterceptor root =
+-        super.getRouterClientRMService().createRequestInterceptorChain();
+-    int index = 0;
+-    while (root != null) {
+-      // The current pipeline is:
+-      // PassThroughClientRequestInterceptor - index = 0
+-      // PassThroughClientRequestInterceptor - index = 1
+-      // PassThroughClientRequestInterceptor - index = 2
+-      // MockClientRequestInterceptor - index = 3
+-      switch (index) {
+-      case 0: // Fall to the next case
+-      case 1: // Fall to the next case
+-      case 2:
+-        // If index is equal to 0,1 or 2 we fall in this check
+-        Assert.assertEquals(PassThroughClientRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      case 3:
+-        Assert.assertEquals(MockClientRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      default:
+-        Assert.fail();
+-      }
+-      root = root.getNextInterceptor();
+-      index++;
+-    }
+-    Assert.assertEquals("The number of interceptors in chain does not match", 4,
+-        index);
+-  }
+-
+-  /**
+-   * Test if the RouterClientRM forwards all the requests to the MockRM and get
+-   * back the responses.
+-   */
+-  @Test
+-  public void testRouterClientRMServiceE2E() throws Exception {
+-
+-    String user = "test1";
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get New Application");
+-
+-    GetNewApplicationResponse responseGetNewApp = getNewApplication(user);
+-    Assert.assertNotNull(responseGetNewApp);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Submit Application");
+-
+-    SubmitApplicationResponse responseSubmitApp =
+-        submitApplication(responseGetNewApp.getApplicationId(), user);
+-    Assert.assertNotNull(responseSubmitApp);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get Cluster Metrics");
+-
+-    GetClusterMetricsResponse responseGetClusterMetrics =
+-        getClusterMetrics(user);
+-    Assert.assertNotNull(responseGetClusterMetrics);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get Cluster Nodes");
+-
+-    GetClusterNodesResponse responseGetClusterNodes = getClusterNodes(user);
+-    Assert.assertNotNull(responseGetClusterNodes);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get Queue Info");
+-
+-    GetQueueInfoResponse responseGetQueueInfo = getQueueInfo(user);
+-    Assert.assertNotNull(responseGetQueueInfo);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get Queue User");
+-
+-    GetQueueUserAclsInfoResponse responseGetQueueUser = getQueueUserAcls(user);
+-    Assert.assertNotNull(responseGetQueueUser);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get Cluster Node");
+-
+-    GetClusterNodeLabelsResponse responseGetClusterNode =
+-        getClusterNodeLabels(user);
+-    Assert.assertNotNull(responseGetClusterNode);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Move Application Across Queues");
+-
+-    MoveApplicationAcrossQueuesResponse responseMoveApp =
+-        moveApplicationAcrossQueues(user, responseGetNewApp.getApplicationId());
+-    Assert.assertNotNull(responseMoveApp);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Get New Reservation");
+-
+-    GetNewReservationResponse getNewReservationResponse =
+-        getNewReservation(user);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Submit Reservation");
+-
+-    ReservationSubmissionResponse responseSubmitReser =
+-        submitReservation(user, getNewReservationResponse.getReservationId());
+-    Assert.assertNotNull(responseSubmitReser);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Update Reservation");
+-
+-    ReservationUpdateResponse responseUpdateReser =
+-        updateReservation(user, getNewReservationResponse.getReservationId());
+-    Assert.assertNotNull(responseUpdateReser);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Delete Reservation");
+-
+-    ReservationDeleteResponse responseDeleteReser =
+-        deleteReservation(user, getNewReservationResponse.getReservationId());
+-    Assert.assertNotNull(responseDeleteReser);
+-
+-    LOG.info("testRouterClientRMServiceE2E - Kill Application");
+-
+-    KillApplicationResponse responseKillApp =
+-        forceKillApplication(responseGetNewApp.getApplicationId(), user);
+-    Assert.assertNotNull(responseKillApp);
+-  }
+-
+-  /**
+-   * Test if the different chains for users are generated, and LRU cache is
+-   * working as expected.
+-   */
+-  @Test
+-  public void testUsersChainMapWithLRUCache()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    Map<String, RequestInterceptorChainWrapper> pipelines;
+-    RequestInterceptorChainWrapper chain;
+-
+-    getNewApplication("test1");
+-    getNewApplication("test2");
+-    getNewApplication("test3");
+-    getNewApplication("test4");
+-    getNewApplication("test5");
+-    getNewApplication("test6");
+-    getNewApplication("test7");
+-    getNewApplication("test8");
+-
+-    pipelines = super.getRouterClientRMService().getPipelines();
+-    Assert.assertEquals(8, pipelines.size());
+-
+-    getNewApplication("test9");
+-    getNewApplication("test10");
+-    getNewApplication("test1");
+-    getNewApplication("test11");
+-
+-    // The cache max size is defined in
+-    // BaseRouterClientRMTest.TEST_MAX_CACHE_SIZE
+-    Assert.assertEquals(10, pipelines.size());
+-
+-    chain = pipelines.get("test1");
+-    Assert.assertNotNull("test1 should not be evicted", chain);
+-
+-    chain = pipelines.get("test2");
+-    Assert.assertNull("test2 should have been evicted", chain);
+-  }
+-
+-  /**
+-   * This test validates if the ClientRequestInterceptor chain for the user
+-   * can build and init correctly when a multi-client process begins to
+-   * request RouterClientRMService for the same user simultaneously.
+-   */
+-  @Test
+-  public void testClientPipelineConcurrent() throws InterruptedException {
+-    final String user = "test1";
+-
+-    /*
+-     * ClientTestThread is a thread to simulate a client request to get a
+-     * ClientRequestInterceptor for the user.
+-     */
+-    class ClientTestThread extends Thread {
+-      private ClientRequestInterceptor interceptor;
+-      @Override public void run() {
+-        try {
+-          interceptor = pipeline();
+-        } catch (IOException | InterruptedException e) {
+-          e.printStackTrace();
+-        }
+-      }
+-      private ClientRequestInterceptor pipeline()
+-          throws IOException, InterruptedException {
+-        return UserGroupInformation.createRemoteUser(user).doAs(
+-            new PrivilegedExceptionAction<ClientRequestInterceptor>() {
+-              @Override
+-              public ClientRequestInterceptor run() throws Exception {
+-                RequestInterceptorChainWrapper wrapper =
+-                    getRouterClientRMService().getInterceptorChain();
+-                ClientRequestInterceptor interceptor =
+-                    wrapper.getRootInterceptor();
+-                Assert.assertNotNull(interceptor);
+-                LOG.info("init client interceptor success for user " + user);
+-                return interceptor;
+-              }
+-            });
+-      }
+-    }
+-
+-    /*
+-     * We start the first thread. It should not finish initing a chainWrapper
+-     * before the other thread starts. In this way, the second thread can
+-     * init at the same time of the first one. In the end, we validate that
+-     * the 2 threads get the same chainWrapper without going into error.
+-     */
+-    ClientTestThread client1 = new ClientTestThread();
+-    ClientTestThread client2 = new ClientTestThread();
+-    client1.start();
+-    client2.start();
+-    client1.join();
+-    client2.join();
+-
+-    Assert.assertNotNull(client1.interceptor);
+-    Assert.assertNotNull(client2.interceptor);
+-    Assert.assertTrue(client1.interceptor == client2.interceptor);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterYarnClientUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterYarnClientUtils.java
+deleted file mode 100644
+index 346e9e87841..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestRouterYarnClientUtils.java
++++ /dev/null
+@@ -1,768 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetLabelsToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceTypeInfoResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetResourceProfileResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAllResourceProfilesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetAttributesToNodesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodeAttributesResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetNodesToAttributesResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.QueueACL;
+-import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
+-import org.apache.hadoop.yarn.api.records.ReservationAllocationState;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.ResourceTypeInfo;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeType;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeKey;
+-import org.apache.hadoop.yarn.api.records.NodeToAttributeValue;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeInfo;
+-import org.apache.hadoop.yarn.util.Records;
+-import org.apache.hadoop.yarn.server.uam.UnmanagedApplicationManager;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-/**
+- * Test class for RouterYarnClientUtils.
+- */
+-public class TestRouterYarnClientUtils {
+-
+-  private final static String PARTIAL_REPORT = "Partial Report ";
+-
+-  @Test
+-  public void testClusterMetricsMerge() {
+-    ArrayList<GetClusterMetricsResponse> responses = new ArrayList<>();
+-    responses.add(getClusterMetricsResponse(1));
+-    responses.add(getClusterMetricsResponse(2));
+-    GetClusterMetricsResponse result = RouterYarnClientUtils.merge(responses);
+-    YarnClusterMetrics resultMetrics = result.getClusterMetrics();
+-    Assert.assertEquals(3, resultMetrics.getNumNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumActiveNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumDecommissioningNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumDecommissionedNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumLostNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumRebootedNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumUnhealthyNodeManagers());
+-    Assert.assertEquals(3, resultMetrics.getNumShutdownNodeManagers());
+-  }
+-
+-  public GetClusterMetricsResponse getClusterMetricsResponse(int value) {
+-    YarnClusterMetrics metrics = YarnClusterMetrics.newInstance(value);
+-    metrics.setNumUnhealthyNodeManagers(value);
+-    metrics.setNumRebootedNodeManagers(value);
+-    metrics.setNumLostNodeManagers(value);
+-    metrics.setNumDecommissioningNodeManagers(value);
+-    metrics.setNumDecommissionedNodeManagers(value);
+-    metrics.setNumActiveNodeManagers(value);
+-    metrics.setNumNodeManagers(value);
+-    metrics.setNumShutdownNodeManagers(value);
+-    return GetClusterMetricsResponse.newInstance(metrics);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * RouterYarnClientUtils#mergeApplications.
+-   */
+-  @Test
+-  public void testMergeApplications() {
+-    ArrayList<GetApplicationsResponse> responses = new ArrayList<>();
+-    responses.add(getApplicationsResponse(1, false));
+-    responses.add(getApplicationsResponse(2, false));
+-    GetApplicationsResponse result = RouterYarnClientUtils.
+-        mergeApplications(responses, false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(2, result.getApplicationList().size());
+-
+-    String appName1 = result.getApplicationList().get(0).getName();
+-    String appName2 = result.getApplicationList().get(1).getName();
+-
+-    // Check that no Unmanaged applications are added to the result
+-    Assert.assertEquals(false,
+-        appName1.contains(UnmanagedApplicationManager.APP_NAME));
+-    Assert.assertEquals(false,
+-        appName2.contains(UnmanagedApplicationManager.APP_NAME));
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * RouterYarnClientUtils#mergeApplications.
+-   */
+-  @Test
+-  public void testMergeUnmanagedApplications() {
+-    ArrayList<GetApplicationsResponse> responses = new ArrayList<>();
+-    responses.add(getApplicationsResponse(1, true));
+-
+-    // Check response if partial results are enabled
+-    GetApplicationsResponse result = RouterYarnClientUtils.
+-        mergeApplications(responses, true);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getApplicationList().size());
+-    ApplicationReport appReport = result.getApplicationList().iterator().next();
+-    String appName = appReport.getName();
+-    Assert.assertTrue(appName.startsWith(PARTIAL_REPORT));
+-
+-    // Check ApplicationResourceUsageReport merge
+-    ApplicationResourceUsageReport resourceUsageReport =
+-        appReport.getApplicationResourceUsageReport();
+-
+-    Assert.assertEquals(2, resourceUsageReport.getNumUsedContainers());
+-    Assert.assertEquals(4, resourceUsageReport.getNumReservedContainers());
+-
+-    // Check response if partial results are disabled
+-    result = RouterYarnClientUtils.
+-        mergeApplications(responses, false);
+-    Assert.assertNotNull(result);
+-    Assert.assertTrue(result.getApplicationList().isEmpty());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * RouterYarnClientUtils#mergeApplications when
+-   * ApplicationResourceUsageReport might be null.
+-   */
+-  @Test
+-  public void testMergeApplicationsNullResourceUsage() {
+-    ApplicationId appId = ApplicationId.newInstance(1234, 1);
+-    ApplicationReport appReport = ApplicationReport.newInstance(
+-        appId, ApplicationAttemptId.newInstance(appId, 1),
+-        "user", "queue", "app1", "host",
+-        124, null, YarnApplicationState.RUNNING,
+-        "diagnostics", "url", 0, 0,
+-        0, FinalApplicationStatus.SUCCEEDED, null, "N/A",
+-        0.53789f, "YARN", null, null, false, null, null, null);
+-
+-    ApplicationReport uamAppReport = ApplicationReport.newInstance(
+-        appId, ApplicationAttemptId.newInstance(appId, 1),
+-        "user", "queue", "app1", "host",
+-        124, null, YarnApplicationState.RUNNING,
+-        "diagnostics", "url", 0, 0,
+-        0, FinalApplicationStatus.SUCCEEDED, null, "N/A",
+-        0.53789f, "YARN", null, null, true, null, null, null);
+-
+-
+-    ArrayList<GetApplicationsResponse> responses = new ArrayList<>();
+-    List<ApplicationReport> applications = new ArrayList<>();
+-    applications.add(appReport);
+-    applications.add(uamAppReport);
+-    responses.add(GetApplicationsResponse.newInstance(applications));
+-
+-    GetApplicationsResponse result = RouterYarnClientUtils.
+-        mergeApplications(responses, false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getApplicationList().size());
+-
+-    String appName = result.getApplicationList().get(0).getName();
+-
+-    // Check that no Unmanaged applications are added to the result
+-    Assert.assertFalse(appName.contains(UnmanagedApplicationManager.APP_NAME));
+-  }
+-
+-  /**
+-   * This generates a GetApplicationsResponse with 2 applications with
+-   * same ApplicationId.
+-   * @param value Used as Id in ApplicationId
+-   * @param uamOnly If set to true, only unmanaged applications are added in
+-   *                response, else one managed and one unmanaged applications
+-   *                are added with same ApplicationId.
+-   * @return GetApplicationsResponse
+-   */
+-  private GetApplicationsResponse getApplicationsResponse(int value,
+-      boolean uamOnly) {
+-    String appName = uamOnly? UnmanagedApplicationManager.APP_NAME: "appname";
+-    List<ApplicationReport> applications = new ArrayList<>();
+-
+-    // Create first application report. This is a managed app by default.
+-    // If uamOnly is true, this becomes unmanaged application.
+-    ApplicationId appId = ApplicationId.newInstance(1234, value);
+-    Resource resource = Resource.newInstance(1024, 1);
+-    ApplicationResourceUsageReport appResourceUsageReport =
+-        ApplicationResourceUsageReport.newInstance(
+-            1, 2, resource, resource,
+-            resource, null, 0.1f,
+-            0.1f, null);
+-
+-    ApplicationReport appReport = ApplicationReport.newInstance(
+-        appId, ApplicationAttemptId.newInstance(appId, 1),
+-        "user", "queue", appName, "host",
+-        124, null, YarnApplicationState.RUNNING,
+-        "diagnostics", "url", 0, 0,
+-        0, FinalApplicationStatus.SUCCEEDED, appResourceUsageReport, "N/A",
+-        0.53789f, "YARN", null, null, uamOnly, null, null, null);
+-
+-    // Create second application report. This is always unmanaged application.
+-    ApplicationId appId2 = ApplicationId.newInstance(1234, value);
+-    ApplicationReport appReport2 = ApplicationReport.newInstance(
+-        appId2, ApplicationAttemptId.newInstance(appId, 1),
+-        "user", "queue", UnmanagedApplicationManager.APP_NAME, "host",
+-        124, null, YarnApplicationState.RUNNING,
+-        "diagnostics", "url", 0, 0,
+-        0, FinalApplicationStatus.SUCCEEDED, appResourceUsageReport, "N/A",
+-        0.53789f, "YARN", null, null, true, null, null, null);
+-
+-    applications.add(appReport);
+-    applications.add(appReport2);
+-
+-    return GetApplicationsResponse.newInstance(applications);
+-  }
+-
+-  @Test
+-  public void testMergeNodesToLabelsResponse() {
+-    NodeId node1 = NodeId.fromString("SubCluster1Node1:1111");
+-    NodeId node2 = NodeId.fromString("SubCluster1Node2:2222");
+-    NodeId node3 = NodeId.fromString("SubCluster2Node1:1111");
+-
+-    Map<NodeId, Set<String>> nodeLabelsMapSC1 = new HashMap<>();
+-    nodeLabelsMapSC1.put(node1, ImmutableSet.of("node1"));
+-    nodeLabelsMapSC1.put(node2, ImmutableSet.of("node2"));
+-    nodeLabelsMapSC1.put(node3, ImmutableSet.of("node3"));
+-
+-    // normal response
+-    GetNodesToLabelsResponse response1 = Records.newRecord(
+-        GetNodesToLabelsResponse.class);
+-    response1.setNodeToLabels(nodeLabelsMapSC1);
+-
+-    // empty response
+-    Map<NodeId, Set<String>> nodeLabelsMapSC2 = new HashMap<>();
+-    GetNodesToLabelsResponse response2 = Records.newRecord(
+-        GetNodesToLabelsResponse.class);
+-    response2.setNodeToLabels(nodeLabelsMapSC2);
+-
+-    // null response
+-    GetNodesToLabelsResponse response3 = null;
+-
+-    Map<NodeId, Set<String>> expectedResponse = new HashMap<>();
+-    expectedResponse.put(node1, ImmutableSet.of("node1"));
+-    expectedResponse.put(node2, ImmutableSet.of("node2"));
+-    expectedResponse.put(node3, ImmutableSet.of("node3"));
+-
+-    List<GetNodesToLabelsResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-
+-    GetNodesToLabelsResponse response = RouterYarnClientUtils.
+-        mergeNodesToLabelsResponse(responses);
+-    Assert.assertEquals(expectedResponse, response.getNodeToLabels());
+-  }
+-
+-  @Test
+-  public void testMergeClusterNodeLabelsResponse() {
+-    NodeLabel nodeLabel1 = NodeLabel.newInstance("nodeLabel1");
+-    NodeLabel nodeLabel2 = NodeLabel.newInstance("nodeLabel2");
+-    NodeLabel nodeLabel3 = NodeLabel.newInstance("nodeLabel3");
+-
+-    // normal response
+-    List<NodeLabel> nodeLabelListSC1 = new ArrayList<>();
+-    nodeLabelListSC1.add(nodeLabel1);
+-    nodeLabelListSC1.add(nodeLabel2);
+-    nodeLabelListSC1.add(nodeLabel3);
+-
+-    GetClusterNodeLabelsResponse response1 = Records.newRecord(
+-        GetClusterNodeLabelsResponse.class);
+-    response1.setNodeLabelList(nodeLabelListSC1);
+-
+-    // empty response
+-    List<NodeLabel> nodeLabelListSC2 = new ArrayList<>();
+-
+-    GetClusterNodeLabelsResponse response2 = Records.newRecord(
+-        GetClusterNodeLabelsResponse.class);
+-    response2.setNodeLabelList(nodeLabelListSC2);
+-
+-    // null response
+-    GetClusterNodeLabelsResponse response3 = null;
+-
+-    List<GetClusterNodeLabelsResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-
+-    List<NodeLabel> expectedResponse = new ArrayList<>();
+-    expectedResponse.add(nodeLabel1);
+-    expectedResponse.add(nodeLabel2);
+-    expectedResponse.add(nodeLabel3);
+-
+-    GetClusterNodeLabelsResponse response = RouterYarnClientUtils.
+-        mergeClusterNodeLabelsResponse(responses);
+-    Assert.assertTrue(CollectionUtils.isEqualCollection(expectedResponse,
+-        response.getNodeLabelList()));
+-  }
+-
+-  @Test
+-  public void testMergeLabelsToNodes(){
+-    NodeId node1 = NodeId.fromString("SubCluster1Node1:1111");
+-    NodeId node2 = NodeId.fromString("SubCluster1Node2:2222");
+-    NodeId node3 = NodeId.fromString("SubCluster2node1:1111");
+-    NodeId node4 = NodeId.fromString("SubCluster2node2:2222");
+-
+-    Map<String, Set<NodeId>> labelsToNodesSC1 = new HashMap<>();
+-
+-    Set<NodeId> nodeIdSet1 = new HashSet<>();
+-    nodeIdSet1.add(node1);
+-    nodeIdSet1.add(node2);
+-    labelsToNodesSC1.put("Label1", nodeIdSet1);
+-
+-    // normal response
+-    GetLabelsToNodesResponse response1 = Records.newRecord(
+-        GetLabelsToNodesResponse.class);
+-    response1.setLabelsToNodes(labelsToNodesSC1);
+-    Map<String, Set<NodeId>> labelsToNodesSC2 = new HashMap<>();
+-    Set<NodeId> nodeIdSet2 = new HashSet<>();
+-    nodeIdSet2.add(node3);
+-    Set<NodeId> nodeIdSet3 = new HashSet<>();
+-    nodeIdSet3.add(node4);
+-    labelsToNodesSC2.put("Label1", nodeIdSet2);
+-    labelsToNodesSC2.put("Label2", nodeIdSet3);
+-
+-    GetLabelsToNodesResponse response2 = Records.newRecord(
+-        GetLabelsToNodesResponse.class);
+-    response2.setLabelsToNodes(labelsToNodesSC2);
+-
+-    // empty response
+-    GetLabelsToNodesResponse response3 = Records.newRecord(
+-        GetLabelsToNodesResponse.class);
+-
+-    // null response
+-    GetLabelsToNodesResponse response4 = null;
+-
+-    List<GetLabelsToNodesResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    Map<String, Set<NodeId>> expectedResponse = new HashMap<>();
+-    Set<NodeId> nodeIdMergedSet1 = new HashSet<>();
+-    nodeIdMergedSet1.add(node1);
+-    nodeIdMergedSet1.add(node2);
+-    nodeIdMergedSet1.add(node3);
+-
+-    Set<NodeId> nodeIdMergedSet2 = new HashSet<>();
+-    nodeIdMergedSet2.add(node4);
+-    expectedResponse.put("Label1", nodeIdMergedSet1);
+-    expectedResponse.put("Label2", nodeIdMergedSet2);
+-
+-    GetLabelsToNodesResponse response = RouterYarnClientUtils.
+-        mergeLabelsToNodes(responses);
+-
+-    Assert.assertEquals(expectedResponse, response.getLabelsToNodes());
+-  }
+-
+-  @Test
+-  public void testMergeQueueUserAclsResponse() {
+-
+-    List<QueueACL> submitOnlyAcl = new ArrayList<>();
+-    submitOnlyAcl.add(QueueACL.SUBMIT_APPLICATIONS);
+-
+-    List<QueueACL> administerOnlyAcl = new ArrayList<>();
+-    administerOnlyAcl.add(QueueACL.ADMINISTER_QUEUE);
+-
+-    List<QueueACL> submitAndAdministerAcl = new ArrayList<>();
+-    submitAndAdministerAcl.add(QueueACL.ADMINISTER_QUEUE);
+-    submitAndAdministerAcl.add(QueueACL.SUBMIT_APPLICATIONS);
+-
+-    QueueUserACLInfo queueUserACLInfo1 = QueueUserACLInfo.newInstance(
+-        "root", submitAndAdministerAcl);
+-
+-    QueueUserACLInfo queueUserACLInfo2 = QueueUserACLInfo.newInstance(
+-        "default", submitOnlyAcl);
+-
+-    QueueUserACLInfo queueUserACLInfo3 = QueueUserACLInfo.newInstance(
+-        "root", submitAndAdministerAcl);
+-
+-    QueueUserACLInfo queueUserACLInfo4 = QueueUserACLInfo.newInstance(
+-        "yarn", administerOnlyAcl);
+-
+-    List<QueueUserACLInfo> queueUserACLInfoList1 = new ArrayList<>();
+-    List<QueueUserACLInfo> queueUserACLInfoList2 = new ArrayList<>();
+-
+-    queueUserACLInfoList1.add(queueUserACLInfo1);
+-    queueUserACLInfoList1.add(queueUserACLInfo2);
+-    queueUserACLInfoList2.add(queueUserACLInfo3);
+-    queueUserACLInfoList2.add(queueUserACLInfo4);
+-
+-    // normal response
+-    GetQueueUserAclsInfoResponse response1 = Records.newRecord(
+-        GetQueueUserAclsInfoResponse.class);
+-    response1.setUserAclsInfoList(queueUserACLInfoList1);
+-    GetQueueUserAclsInfoResponse response2 = Records.newRecord(
+-        GetQueueUserAclsInfoResponse.class);
+-    response2.setUserAclsInfoList(queueUserACLInfoList2);
+-
+-    // empty response
+-    GetQueueUserAclsInfoResponse response3 = Records.newRecord(
+-        GetQueueUserAclsInfoResponse.class);
+-
+-    // null response
+-    GetQueueUserAclsInfoResponse response4 = null;
+-
+-    List<GetQueueUserAclsInfoResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    // expected user acls
+-    List<QueueUserACLInfo> expectedOutput = new ArrayList<>();
+-    expectedOutput.add(queueUserACLInfo1);
+-    expectedOutput.add(queueUserACLInfo2);
+-    expectedOutput.add(queueUserACLInfo4);
+-
+-    GetQueueUserAclsInfoResponse response =
+-        RouterYarnClientUtils.mergeQueueUserAcls(responses);
+-    Assert.assertTrue(CollectionUtils.isEqualCollection(expectedOutput,
+-        response.getUserAclsInfoList()));
+-  }
+-
+-  @Test
+-  public void testMergeReservationsList() {
+-
+-    // normal response
+-    ReservationListResponse response1 = createReservationListResponse(
+-        165348678000L, 165348690000L, 165348678000L, 1L);
+-
+-    ReservationListResponse response2 = createReservationListResponse(
+-        165348750000L, 165348768000L, 165348750000L, 1L);
+-
+-    // empty response
+-    ReservationListResponse response3 = ReservationListResponse.newInstance(new ArrayList<>());
+-
+-    // null response
+-    ReservationListResponse response4 = null;
+-
+-    List<ReservationListResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    // expected response
+-    List<ReservationAllocationState> expectedResponse = new ArrayList<>();
+-    expectedResponse.addAll(response1.getReservationAllocationState());
+-    expectedResponse.addAll(response2.getReservationAllocationState());
+-
+-    ReservationListResponse response =
+-        RouterYarnClientUtils.mergeReservationsList(responses);
+-    Assert.assertEquals(expectedResponse, response.getReservationAllocationState());
+-  }
+-
+-  private ReservationListResponse createReservationListResponse(long startTime,
+-      long endTime, long reservationTime, long reservationNumber) {
+-    List<ReservationAllocationState> reservationsList = new ArrayList<>();
+-    ReservationDefinition reservationDefinition =
+-        Records.newRecord(ReservationDefinition.class);
+-    reservationDefinition.setArrival(startTime);
+-    reservationDefinition.setDeadline(endTime);
+-    ReservationAllocationState reservationAllocationState =
+-        Records.newRecord(ReservationAllocationState.class);
+-    ReservationId reservationId = ReservationId.newInstance(reservationTime,
+-        reservationNumber);
+-    reservationAllocationState.setReservationDefinition(reservationDefinition);
+-    reservationAllocationState.setReservationId(reservationId);
+-    reservationsList.add(reservationAllocationState);
+-    return ReservationListResponse.newInstance(reservationsList);
+-  }
+-
+-  @Test
+-  public void testMergeResourceTypes() {
+-
+-    ResourceTypeInfo resourceTypeInfo1 = ResourceTypeInfo.newInstance("vcores");
+-    ResourceTypeInfo resourceTypeInfo2 = ResourceTypeInfo.newInstance("gpu");
+-    ResourceTypeInfo resourceTypeInfo3 = ResourceTypeInfo.newInstance("memory-mb");
+-
+-    List<ResourceTypeInfo> resourceTypeInfoList1 = new ArrayList<>();
+-    resourceTypeInfoList1.add(resourceTypeInfo1);
+-    resourceTypeInfoList1.add(resourceTypeInfo3);
+-
+-    List<ResourceTypeInfo> resourceTypeInfoList2 = new ArrayList<>();
+-    resourceTypeInfoList2.add(resourceTypeInfo3);
+-    resourceTypeInfoList2.add(resourceTypeInfo2);
+-
+-    // normal response
+-    GetAllResourceTypeInfoResponse response1 =
+-        Records.newRecord(GetAllResourceTypeInfoResponse.class);
+-    response1.setResourceTypeInfo(resourceTypeInfoList1);
+-
+-    GetAllResourceTypeInfoResponse response2 =
+-        Records.newRecord(GetAllResourceTypeInfoResponse.class);
+-    response2.setResourceTypeInfo(resourceTypeInfoList2);
+-
+-    // empty response
+-    GetAllResourceTypeInfoResponse response3 =
+-        Records.newRecord(GetAllResourceTypeInfoResponse.class);
+-
+-    // null response
+-    GetAllResourceTypeInfoResponse response4 = null;
+-
+-    List<GetAllResourceTypeInfoResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    // expected response
+-    List<ResourceTypeInfo> expectedResponse = new ArrayList<>();
+-    expectedResponse.add(resourceTypeInfo1);
+-    expectedResponse.add(resourceTypeInfo2);
+-    expectedResponse.add(resourceTypeInfo3);
+-    GetAllResourceTypeInfoResponse response =
+-        RouterYarnClientUtils.mergeResourceTypes(responses);
+-    Assert.assertTrue(CollectionUtils.isEqualCollection(expectedResponse,
+-        response.getResourceTypeInfo()));
+-  }
+-
+-  @Test
+-  public void testMergeResourceProfiles() {
+-    // normal response1
+-    Map<String, Resource> profiles = new HashMap<>();
+-    Resource resource1 = Resource.newInstance(1024, 1);
+-    GetAllResourceProfilesResponse response1 = GetAllResourceProfilesResponse.newInstance();
+-    profiles.put("maximum", resource1);
+-    response1.setResourceProfiles(profiles);
+-
+-    // normal response2
+-    profiles = new HashMap<>();
+-    Resource resource2 = Resource.newInstance(2048, 2);
+-    GetAllResourceProfilesResponse response2 = GetAllResourceProfilesResponse.newInstance();
+-    profiles.put("maximum", resource2);
+-    response2.setResourceProfiles(profiles);
+-
+-    // empty response
+-    GetAllResourceProfilesResponse response3 = GetAllResourceProfilesResponse.newInstance();
+-
+-    // null response
+-    GetAllResourceProfilesResponse response4 = null;
+-
+-    List<GetAllResourceProfilesResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    GetAllResourceProfilesResponse response =
+-        RouterYarnClientUtils.mergeClusterResourceProfilesResponse(responses);
+-    Resource resource = response.getResourceProfiles().get("maximum");
+-    Assert.assertEquals(3, resource.getVirtualCores());
+-    Assert.assertEquals(3072, resource.getMemorySize());
+-  }
+-
+-  @Test
+-  public void testMergeResourceProfile() {
+-    // normal response1
+-    Resource resource1 = Resource.newInstance(1024, 1);
+-    GetResourceProfileResponse response1 =
+-        Records.newRecord(GetResourceProfileResponse.class);
+-    response1.setResource(resource1);
+-
+-    // normal response2
+-    Resource resource2 = Resource.newInstance(2048, 2);
+-    GetResourceProfileResponse response2 =
+-        Records.newRecord(GetResourceProfileResponse.class);
+-    response2.setResource(resource2);
+-
+-    // empty response
+-    GetResourceProfileResponse response3 =
+-        Records.newRecord(GetResourceProfileResponse.class);
+-
+-    // null response
+-    GetResourceProfileResponse response4 = null;
+-
+-    List<GetResourceProfileResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    GetResourceProfileResponse response =
+-        RouterYarnClientUtils.mergeClusterResourceProfileResponse(responses);
+-    Resource resource = response.getResource();
+-    Assert.assertEquals(3, resource.getVirtualCores());
+-    Assert.assertEquals(3072, resource.getMemorySize());
+-  }
+-
+-  @Test
+-  public void testMergeAttributesToNodesResponse() {
+-    // normal response1
+-    NodeAttribute gpu = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "GPU",
+-        NodeAttributeType.STRING, "nvidia");
+-    Map<NodeAttributeKey, List<NodeToAttributeValue>> map1 = new HashMap<>();
+-    List<NodeToAttributeValue> lists1 = new ArrayList<>();
+-    NodeToAttributeValue attributeValue1 =
+-        NodeToAttributeValue.newInstance("node1", gpu.getAttributeValue());
+-    lists1.add(attributeValue1);
+-    map1.put(gpu.getAttributeKey(), lists1);
+-    GetAttributesToNodesResponse response1 = GetAttributesToNodesResponse.newInstance(map1);
+-
+-    // normal response2
+-    NodeAttribute docker = NodeAttribute.newInstance(NodeAttribute.PREFIX_DISTRIBUTED, "DOCKER",
+-        NodeAttributeType.STRING, "docker0");
+-    Map<NodeAttributeKey, List<NodeToAttributeValue>> map2 = new HashMap<>();
+-    List<NodeToAttributeValue> lists2 = new ArrayList<>();
+-    NodeToAttributeValue attributeValue2 =
+-        NodeToAttributeValue.newInstance("node2", docker.getAttributeValue());
+-    lists2.add(attributeValue2);
+-    map2.put(docker.getAttributeKey(), lists2);
+-    GetAttributesToNodesResponse response2 = GetAttributesToNodesResponse.newInstance(map2);
+-
+-    // empty response3
+-    GetAttributesToNodesResponse response3 =
+-        GetAttributesToNodesResponse.newInstance(new HashMap<>());
+-
+-    // null response4
+-    GetAttributesToNodesResponse response4 = null;
+-
+-    List<GetAttributesToNodesResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    GetAttributesToNodesResponse response =
+-        RouterYarnClientUtils.mergeAttributesToNodesResponse(responses);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(2, response.getAttributesToNodes().size());
+-
+-    Map<NodeAttributeKey, List<NodeToAttributeValue>> attrs = response.getAttributesToNodes();
+-
+-    NodeAttributeKey gpuKey = gpu.getAttributeKey();
+-    Assert.assertEquals(attributeValue1.toString(), attrs.get(gpuKey).get(0).toString());
+-
+-    NodeAttributeKey dockerKey = docker.getAttributeKey();
+-    Assert.assertEquals(attributeValue2.toString(), attrs.get(dockerKey).get(0).toString());
+-  }
+-
+-  @Test
+-  public void testMergeClusterNodeAttributesResponse() {
+-    // normal response1
+-    NodeAttributeInfo nodeAttributeInfo1 =
+-        NodeAttributeInfo.newInstance(NodeAttributeKey.newInstance("GPU"),
+-        NodeAttributeType.STRING);
+-    Set<NodeAttributeInfo> attributes1 = new HashSet<>();
+-    attributes1.add(nodeAttributeInfo1);
+-    GetClusterNodeAttributesResponse response1 =
+-        GetClusterNodeAttributesResponse.newInstance(attributes1);
+-
+-    // normal response2
+-    NodeAttributeInfo nodeAttributeInfo2 =
+-        NodeAttributeInfo.newInstance(NodeAttributeKey.newInstance("CPU"),
+-        NodeAttributeType.STRING);
+-    Set<NodeAttributeInfo> attributes2 = new HashSet<>();
+-    attributes2.add(nodeAttributeInfo2);
+-    GetClusterNodeAttributesResponse response2 =
+-        GetClusterNodeAttributesResponse.newInstance(attributes2);
+-
+-    // empty response3
+-    GetClusterNodeAttributesResponse response3 =
+-        GetClusterNodeAttributesResponse.newInstance(new HashSet<>());
+-
+-    // null response4
+-    GetClusterNodeAttributesResponse response4 = null;
+-
+-    List<GetClusterNodeAttributesResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    GetClusterNodeAttributesResponse response =
+-        RouterYarnClientUtils.mergeClusterNodeAttributesResponse(responses);
+-
+-    Assert.assertNotNull(response);
+-
+-    Set<NodeAttributeInfo> nodeAttributeInfos = response.getNodeAttributes();
+-    Assert.assertEquals(2, nodeAttributeInfos.size());
+-    Assert.assertTrue(nodeAttributeInfos.contains(nodeAttributeInfo1));
+-    Assert.assertTrue(nodeAttributeInfos.contains(nodeAttributeInfo2));
+-  }
+-
+-  @Test
+-  public void testMergeNodesToAttributesResponse() {
+-    // normal response1
+-    NodeAttribute gpu = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "GPU",
+-        NodeAttributeType.STRING, "nvida");
+-    NodeAttribute os = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "OS",
+-        NodeAttributeType.STRING, "windows64");
+-    NodeAttribute dist = NodeAttribute.newInstance(NodeAttribute.PREFIX_DISTRIBUTED, "VERSION",
+-        NodeAttributeType.STRING, "3_0_2");
+-    Map<String, Set<NodeAttribute>> node1Map = new HashMap<>();
+-    node1Map.put("node1", ImmutableSet.of(gpu, os, dist));
+-    GetNodesToAttributesResponse response1 = GetNodesToAttributesResponse.newInstance(node1Map);
+-
+-    // normal response2
+-    NodeAttribute docker = NodeAttribute.newInstance(NodeAttribute.PREFIX_DISTRIBUTED, "DOCKER",
+-        NodeAttributeType.STRING, "docker0");
+-    Map<String, Set<NodeAttribute>> node2Map = new HashMap<>();
+-    node2Map.put("node2", ImmutableSet.of(docker));
+-    GetNodesToAttributesResponse response2 = GetNodesToAttributesResponse.newInstance(node2Map);
+-
+-    // empty response3
+-    GetNodesToAttributesResponse response3 =
+-        GetNodesToAttributesResponse.newInstance(new HashMap<>());
+-
+-    // null response4
+-    GetNodesToAttributesResponse response4 = null;
+-
+-    List<GetNodesToAttributesResponse> responses = new ArrayList<>();
+-    responses.add(response1);
+-    responses.add(response2);
+-    responses.add(response3);
+-    responses.add(response4);
+-
+-    GetNodesToAttributesResponse response =
+-        RouterYarnClientUtils.mergeNodesToAttributesResponse(responses);
+-
+-    Assert.assertNotNull(response);
+-
+-    Map<String, Set<NodeAttribute>> hostToAttrs = response.getNodeToAttributes();
+-    Assert.assertNotNull(hostToAttrs);
+-    Assert.assertEquals(2, hostToAttrs.size());
+-    Assert.assertTrue(hostToAttrs.get("node1").contains(dist));
+-    Assert.assertTrue(hostToAttrs.get("node1").contains(gpu));
+-    Assert.assertTrue(hostToAttrs.get("node1").contains(os));
+-    Assert.assertTrue(hostToAttrs.get("node2").contains(docker));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialBroadcastPolicyManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialBroadcastPolicyManager.java
+deleted file mode 100644
+index ffc702f64ea..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialBroadcastPolicyManager.java
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.hadoop.yarn.server.federation.policies.amrmproxy.BroadcastAMRMProxyPolicy;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.AbstractPolicyManager;
+-
+-/**
+- * This PolicyManager is used for testing and will contain the
+- * {@link TestSequentialRouterPolicy} policy.
+- *
+- * When we test FederationClientInterceptor Retry,
+- * we hope that SubCluster can return in a certain order, not randomly.
+- * We can view the policy description by linking to TestSequentialRouterPolicy.
+- */
+-public class TestSequentialBroadcastPolicyManager extends AbstractPolicyManager {
+-  public TestSequentialBroadcastPolicyManager() {
+-    // this structurally hard-codes two compatible policies for Router and
+-    // AMRMProxy.
+-    routerFederationPolicy = TestSequentialRouterPolicy.class;
+-    amrmProxyFederationPolicy = BroadcastAMRMProxyPolicy.class;
+-  }
+-
+-  @Override
+-  public WeightedPolicyInfo getWeightedPolicyInfo() {
+-    return null;
+-  }
+-
+-  @Override
+-  public void setWeightedPolicyInfo(WeightedPolicyInfo weightedPolicyInfo) {
+-  }
+-
+-  @Override
+-  public boolean isSupportWeightedPolicyInfo() {
+-    return false;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialRouterPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialRouterPolicy.java
+deleted file mode 100644
+index e702b764fed..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestSequentialRouterPolicy.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContext;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyInitializationContextValidator;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
+-import org.apache.hadoop.yarn.server.federation.policies.router.AbstractRouterPolicy;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-
+-/**
+- * This is a test strategy,
+- * the purpose of this strategy is to return subClusters in descending order of subClusterId.
+- *
+- * This strategy is to verify the situation of Retry during the use of FederationClientInterceptor.
+- * The conditions of use are as follows:
+- * 1.We require subClusterId to be an integer.
+- * 2.The larger the subCluster, the sooner the representative is selected.
+- *
+- * We have 4 subClusters, 2 normal subClusters, 2 bad subClusters.
+- * We expect to select badSubClusters first and then goodSubClusters during testing.
+- * We can set the subCluster like this, good1 = [0], good2 = [1], bad1 = [2], bad2 = [3].
+- * This strategy will return [3, 2, 1, 0],
+- * The selection order of subCluster is bad2, bad1, good2, good1.
+- */
+-public class TestSequentialRouterPolicy extends AbstractRouterPolicy {
+-
+-  @Override
+-  public void reinitialize(FederationPolicyInitializationContext policyContext)
+-      throws FederationPolicyInitializationException {
+-    FederationPolicyInitializationContextValidator.validate(policyContext,
+-        this.getClass().getCanonicalName());
+-    setPolicyContext(policyContext);
+-  }
+-
+-  @Override
+-  protected SubClusterId chooseSubCluster(String queue,
+-      Map<SubClusterId, SubClusterInfo> preSelectSubClusters) throws YarnException {
+-    /**
+-      * This strategy is only suitable for testing. We need to obtain subClusters sequentially.
+-      * We have 3 subClusters, 1 goodSubCluster and 2 badSubClusters.
+-      * The sc-id of goodSubCluster is 0, and the sc-id of badSubCluster is 1 and 2.
+-      * We hope Return in reverse order, that is, return 2, 1, 0
+-      * Return to badCluster first.
+-      */
+-    List<SubClusterId> subClusterIds = new ArrayList<>(preSelectSubClusters.keySet());
+-    if (subClusterIds.size() > 1) {
+-      subClusterIds.sort((o1, o2) -> Integer.parseInt(o2.getId()) - Integer.parseInt(o1.getId()));
+-    }
+-    if(CollectionUtils.isNotEmpty(subClusterIds)){
+-      return subClusterIds.get(0);
+-    }
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestableFederationClientInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestableFederationClientInterceptor.java
+deleted file mode 100644
+index 9d6b87e8cc9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/clientrm/TestableFederationClientInterceptor.java
++++ /dev/null
+@@ -1,257 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.clientrm;
+-
+-import static org.mockito.Mockito.mock;
+-
+-import java.io.IOException;
+-import java.net.ConnectException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.TimeoutException;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeType;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.nodelabels.NodeAttributesManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.resourcemanager.ClientRMService;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockNM;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMAppManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.Plan;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.security.QueueACLsManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.server.security.ApplicationACLsManager;
+-import org.junit.Assert;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Extends the FederationClientInterceptor and overrides methods to provide a
+- * testable implementation of FederationClientInterceptor.
+- */
+-public class TestableFederationClientInterceptor
+-    extends FederationClientInterceptor {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestableFederationClientInterceptor.class);
+-
+-  private ConcurrentHashMap<SubClusterId, MockRM> mockRMs =
+-      new ConcurrentHashMap<>();
+-
+-  private ConcurrentHashMap<SubClusterId, MockNM> mockNMs =
+-      new ConcurrentHashMap<>();
+-
+-  private List<SubClusterId> badSubCluster = new ArrayList<SubClusterId>();
+-
+-  @Override
+-  protected ApplicationClientProtocol getClientRMProxyForSubCluster(
+-      SubClusterId subClusterId) throws YarnException {
+-
+-    MockRM mockRM = null;
+-    synchronized (this) {
+-      if (mockRMs.containsKey(subClusterId)) {
+-        mockRM = mockRMs.get(subClusterId);
+-      } else {
+-        mockRM = new MockRM();
+-        if (badSubCluster.contains(subClusterId)) {
+-          RMContext rmContext = mock(RMContext.class);
+-          return new MockClientRMService(rmContext, null, null, null, null,
+-              null);
+-        }
+-        mockRM.init(super.getConf());
+-        mockRM.start();
+-        try {
+-          MockNM nm = mockRM.registerNode("127.0.0.1:1234", 8*1024, 4);
+-          mockNMs.put(subClusterId, nm);
+-        } catch (Exception e) {
+-          Assert.fail(e.getMessage());
+-        }
+-        mockRMs.put(subClusterId, mockRM);
+-      }
+-      initNodeAttributes(subClusterId, mockRM);
+-      initReservationSystem(mockRM);
+-      return mockRM.getClientRMService();
+-    }
+-  }
+-
+-  private static class MockClientRMService extends ClientRMService {
+-
+-    MockClientRMService(RMContext rmContext, YarnScheduler scheduler,
+-        RMAppManager rmAppManager,
+-        ApplicationACLsManager applicationACLsManager,
+-        QueueACLsManager queueACLsManager,
+-        RMDelegationTokenSecretManager rmDTSecretManager) {
+-      super(rmContext, scheduler, rmAppManager, applicationACLsManager,
+-          queueACLsManager, rmDTSecretManager);
+-    }
+-
+-    @Override
+-    public SubmitApplicationResponse submitApplication(
+-        SubmitApplicationRequest request) throws YarnException, IOException {
+-      throw new ConnectException("RM is stopped");
+-    }
+-
+-    @Override
+-    public GetClusterMetricsResponse getClusterMetrics(GetClusterMetricsRequest request)
+-        throws YarnException {
+-      throw new YarnException("RM is stopped");
+-    }
+-  }
+-
+-  /**
+-   * For testing purpose, some subclusters has to be down to simulate particular
+-   * scenarios as RM Failover, network issues. For this reason we keep track of
+-   * these bad subclusters. This method make the subcluster unusable.
+-   *
+-   * @param badSC the subcluster to make unusable
+-   * @throws IOException
+-   */
+-  protected void registerBadSubCluster(SubClusterId badSC) throws IOException {
+-    badSubCluster.add(badSC);
+-    if (mockRMs.contains(badSC)) {
+-      mockRMs.get(badSC).close();
+-    }
+-  }
+-
+-  public ConcurrentHashMap<SubClusterId, MockRM> getMockRMs() {
+-    return mockRMs;
+-  }
+-
+-  public ConcurrentHashMap<SubClusterId, MockNM> getMockNMs() {
+-    return mockNMs;
+-  }
+-
+-  private void initNodeAttributes(SubClusterId subClusterId, MockRM mockRM)  {
+-    String node1 = subClusterId.getId() +"-host1";
+-    String node2 = subClusterId.getId() +"-host2";
+-    NodeAttributesManager mgr = mockRM.getRMContext().getNodeAttributesManager();
+-    NodeAttribute gpu =
+-        NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "GPU",
+-        NodeAttributeType.STRING, "nvidia");
+-    NodeAttribute os =
+-        NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "OS",
+-        NodeAttributeType.STRING, "windows64");
+-    NodeAttribute docker =
+-        NodeAttribute.newInstance(NodeAttribute.PREFIX_DISTRIBUTED, "DOCKER",
+-        NodeAttributeType.STRING, "docker0");
+-    NodeAttribute dist =
+-        NodeAttribute.newInstance(NodeAttribute.PREFIX_DISTRIBUTED, "VERSION",
+-        NodeAttributeType.STRING, "3_0_2");
+-    Map<String, Set<NodeAttribute>> nodes = new HashMap<>();
+-    nodes.put(node1, ImmutableSet.of(gpu, os, dist));
+-    nodes.put(node2, ImmutableSet.of(docker, dist));
+-    try {
+-      mgr.addNodeAttributes(nodes);
+-    } catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  private void initReservationSystem(MockRM mockRM) throws YarnException {
+-    try {
+-      // Ensure that the reserved resources of the RM#Reservation System are allocated
+-      String planName = "root.decided";
+-      ReservationSystem reservationSystem = mockRM.getReservationSystem();
+-      reservationSystem.synchronizePlan(planName, true);
+-
+-      GenericTestUtils.waitFor(() -> {
+-        Plan plan = reservationSystem.getPlan(planName);
+-        Resource resource = plan.getTotalCapacity();
+-        return (resource.getMemorySize() > 0 && resource.getVirtualCores() > 0);
+-      }, 100, 2000);
+-    } catch (TimeoutException | InterruptedException e) {
+-      throw new YarnException(e);
+-    }
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    if (mockRMs != null && !mockRMs.isEmpty()) {
+-      for (Map.Entry<SubClusterId, MockRM> item : mockRMs.entrySet()) {
+-        SubClusterId subClusterId = item.getKey();
+-
+-        // close mockNM
+-        MockNM mockNM = mockNMs.getOrDefault(subClusterId, null);
+-        try {
+-          mockNM.unRegisterNode();
+-          mockNM = null;
+-        } catch (Exception e) {
+-          LOG.error("mockNM unRegisterNode error.", e);
+-        }
+-
+-        // close mockRM
+-        MockRM mockRM = item.getValue();
+-        if (mockRM != null) {
+-          mockRM.stop();
+-        }
+-      }
+-    }
+-    mockNMs.clear();
+-    mockRMs.clear();
+-    super.shutdown();
+-  }
+-
+-  public RouterDelegationTokenSecretManager createRouterRMDelegationTokenSecretManager(
+-      Configuration conf) {
+-
+-    long secretKeyInterval = conf.getTimeDuration(
+-        YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT,
+-        TimeUnit.MILLISECONDS);
+-
+-    long tokenMaxLifetime = conf.getTimeDuration(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT,
+-        TimeUnit.MILLISECONDS);
+-
+-    long tokenRenewInterval = conf.getTimeDuration(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT,
+-        TimeUnit.MILLISECONDS);
+-
+-    long removeScanInterval = conf.getTimeDuration(
+-        YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_KEY,
+-        YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_DEFAULT,
+-        TimeUnit.MILLISECONDS);
+-
+-    return new RouterDelegationTokenSecretManager(secretKeyInterval,
+-        tokenMaxLifetime, tokenRenewInterval, removeScanInterval, conf);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/BaseRouterRMAdminTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/BaseRouterRMAdminTest.java
+deleted file mode 100644
+index 33cda8751db..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/BaseRouterRMAdminTest.java
++++ /dev/null
+@@ -1,318 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.HashMap;
+-import java.util.Set;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Executors;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.event.AsyncDispatcher;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-
+-/**
+- * Base class for all the RouterRMAdminService test cases. It provides utility
+- * methods that can be used by the concrete test case classes.
+- *
+- */
+-public abstract class BaseRouterRMAdminTest {
+-
+-  /**
+-   * The RouterRMAdminService instance that will be used by all the test cases.
+-   */
+-  private MockRouterRMAdminService rmAdminService;
+-  /**
+-   * Thread pool used for asynchronous operations.
+-   */
+-  private static ExecutorService threadpool = Executors.newCachedThreadPool();
+-  private Configuration conf;
+-  private AsyncDispatcher dispatcher;
+-
+-  public final static int TEST_MAX_CACHE_SIZE = 10;
+-
+-  protected MockRouterRMAdminService getRouterRMAdminService() {
+-    Assert.assertNotNull(this.rmAdminService);
+-    return this.rmAdminService;
+-  }
+-
+-  @Before
+-  public void setUp() {
+-    this.conf = createConfiguration();
+-    this.dispatcher = new AsyncDispatcher();
+-    this.dispatcher.init(conf);
+-    this.dispatcher.start();
+-    this.rmAdminService = createAndStartRouterRMAdminService();
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-  }
+-
+-  protected Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  public void setUpConfig() {
+-    this.conf = createConfiguration();
+-  }
+-
+-  protected Configuration createConfiguration() {
+-    YarnConfiguration config = new YarnConfiguration();
+-    String mockPassThroughInterceptorClass =
+-        PassThroughRMAdminRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain will call the mock resource manager. The others in the chain will
+-    // simply forward it to the next one in the chain
+-    config.set(YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass + "," +
+-        mockPassThroughInterceptorClass + "," + MockRMAdminRequestInterceptor.class.getName());
+-
+-    config.setInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE, TEST_MAX_CACHE_SIZE);
+-    return config;
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    if (rmAdminService != null) {
+-      rmAdminService.stop();
+-      rmAdminService = null;
+-    }
+-    if (this.dispatcher != null) {
+-      this.dispatcher.stop();
+-    }
+-  }
+-
+-  protected ExecutorService getThreadPool() {
+-    return threadpool;
+-  }
+-
+-  protected MockRouterRMAdminService createAndStartRouterRMAdminService() {
+-    MockRouterRMAdminService svc = new MockRouterRMAdminService();
+-    svc.init(conf);
+-    svc.start();
+-    return svc;
+-  }
+-
+-  protected static class MockRouterRMAdminService extends RouterRMAdminService {
+-    public MockRouterRMAdminService() {
+-      super();
+-    }
+-  }
+-
+-  protected RefreshQueuesResponse refreshQueues(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<RefreshQueuesResponse>) () -> {
+-          RefreshQueuesRequest req = RefreshQueuesRequest.newInstance();
+-          RefreshQueuesResponse response =
+-              getRouterRMAdminService().refreshQueues(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshNodesResponse refreshNodes(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<RefreshNodesResponse>) () -> {
+-          RefreshNodesRequest req = RefreshNodesRequest.newInstance();
+-          RefreshNodesResponse response =
+-              getRouterRMAdminService().refreshNodes(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
+-      String user) throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        (PrivilegedExceptionAction<RefreshSuperUserGroupsConfigurationResponse>) () -> {
+-          RefreshSuperUserGroupsConfigurationRequest req =
+-              RefreshSuperUserGroupsConfigurationRequest.newInstance();
+-          RefreshSuperUserGroupsConfigurationResponse response =
+-              getRouterRMAdminService()
+-                  .refreshSuperUserGroupsConfiguration(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
+-      String user) throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        (PrivilegedExceptionAction<RefreshUserToGroupsMappingsResponse>) () -> {
+-          RefreshUserToGroupsMappingsRequest req =
+-              RefreshUserToGroupsMappingsRequest.newInstance();
+-          RefreshUserToGroupsMappingsResponse response =
+-              getRouterRMAdminService().refreshUserToGroupsMappings(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshAdminAclsResponse refreshAdminAcls(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<RefreshAdminAclsResponse>) () -> {
+-          RefreshAdminAclsRequest req = RefreshAdminAclsRequest.newInstance();
+-          RefreshAdminAclsResponse response =
+-              getRouterRMAdminService().refreshAdminAcls(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshServiceAclsResponse refreshServiceAcls(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<RefreshServiceAclsResponse>) () -> {
+-          RefreshServiceAclsRequest req =
+-              RefreshServiceAclsRequest.newInstance();
+-          RefreshServiceAclsResponse response =
+-              getRouterRMAdminService().refreshServiceAcls(req);
+-          return response;
+-        });
+-  }
+-
+-  protected UpdateNodeResourceResponse updateNodeResource(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<UpdateNodeResourceResponse>) () -> {
+-          UpdateNodeResourceRequest req =
+-              UpdateNodeResourceRequest.newInstance(null);
+-          UpdateNodeResourceResponse response =
+-              getRouterRMAdminService().updateNodeResource(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshNodesResourcesResponse refreshNodesResources(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<RefreshNodesResourcesResponse>) () -> {
+-          RefreshNodesResourcesRequest req =
+-              RefreshNodesResourcesRequest.newInstance();
+-          RefreshNodesResourcesResponse response =
+-              getRouterRMAdminService().refreshNodesResources(req);
+-          return response;
+-        });
+-  }
+-
+-  protected AddToClusterNodeLabelsResponse addToClusterNodeLabels(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<AddToClusterNodeLabelsResponse>) () -> {
+-          AddToClusterNodeLabelsRequest req =
+-              AddToClusterNodeLabelsRequest.newInstance(null);
+-          AddToClusterNodeLabelsResponse response =
+-              getRouterRMAdminService().addToClusterNodeLabels(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
+-      String user) throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        (PrivilegedExceptionAction<RemoveFromClusterNodeLabelsResponse>) () -> {
+-          RemoveFromClusterNodeLabelsRequest req =
+-              RemoveFromClusterNodeLabelsRequest.newInstance(null);
+-          RemoveFromClusterNodeLabelsResponse response =
+-              getRouterRMAdminService().removeFromClusterNodeLabels(req);
+-          return response;
+-        });
+-  }
+-
+-  protected ReplaceLabelsOnNodeResponse replaceLabelsOnNode(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs((PrivilegedExceptionAction<ReplaceLabelsOnNodeResponse>) () -> {
+-          ReplaceLabelsOnNodeRequest req = ReplaceLabelsOnNodeRequest
+-              .newInstance(new HashMap<NodeId, Set<String>>());
+-          ReplaceLabelsOnNodeResponse response =
+-              getRouterRMAdminService().replaceLabelsOnNode(req);
+-          return response;
+-        });
+-  }
+-
+-  protected CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
+-      String user) throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        (PrivilegedExceptionAction<CheckForDecommissioningNodesResponse>) () -> {
+-          CheckForDecommissioningNodesRequest req =
+-              CheckForDecommissioningNodesRequest.newInstance();
+-          CheckForDecommissioningNodesResponse response =
+-              getRouterRMAdminService().checkForDecommissioningNodes(req);
+-          return response;
+-        });
+-  }
+-
+-  protected RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
+-      String user) throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user).doAs(
+-        (PrivilegedExceptionAction<RefreshClusterMaxPriorityResponse>) () -> {
+-          RefreshClusterMaxPriorityRequest req =
+-              RefreshClusterMaxPriorityRequest.newInstance();
+-          RefreshClusterMaxPriorityResponse response =
+-              getRouterRMAdminService().refreshClusterMaxPriority(req);
+-          return response;
+-        });
+-  }
+-
+-  protected String[] getGroupsForUser(String user)
+-      throws IOException, InterruptedException {
+-    return UserGroupInformation.createRemoteUser(user)
+-        .doAs(new PrivilegedExceptionAction<String[]>() {
+-          @Override
+-          public String[] run() throws Exception {
+-            String[] response =
+-                getRouterRMAdminService().getGroupsForUser(user);
+-            return response;
+-          }
+-        });
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/MockRMAdminRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/MockRMAdminRequestInterceptor.java
+deleted file mode 100644
+index a1a366f7664..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/MockRMAdminRequestInterceptor.java
++++ /dev/null
+@@ -1,72 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.resourcemanager.AdminService;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-
+-/**
+- * This class mocks the RMAdminRequestInterceptor.
+- */
+-public class MockRMAdminRequestInterceptor
+-    extends DefaultRMAdminRequestInterceptor {
+-
+-  MockRM mockRM = null;
+-  public void init(String user) {
+-    mockRM = new MockRM(super.getConf()) {
+-      @Override
+-      protected AdminService createAdminService() {
+-        return new AdminService(this) {
+-          @Override
+-          protected void startServer() {
+-            // override to not start rpc handler
+-          }
+-
+-          @Override
+-          public RefreshServiceAclsResponse refreshServiceAcls(
+-              RefreshServiceAclsRequest request)
+-              throws YarnException, IOException {
+-            return RefreshServiceAclsResponse.newInstance();
+-          }
+-
+-          @Override
+-          protected void stopServer() {
+-            // don't do anything
+-          }
+-        };
+-      }
+-    };
+-    mockRM.init(super.getConf());
+-    mockRM.start();
+-    super.setRMAdmin(mockRM.getAdminService());
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    if (mockRM != null) {
+-      mockRM.stop();
+-    }
+-    super.shutdown();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/PassThroughRMAdminRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/PassThroughRMAdminRequestInterceptor.java
+deleted file mode 100644
+index 943e9440ecf..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/PassThroughRMAdminRequestInterceptor.java
++++ /dev/null
+@@ -1,212 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-
+-import org.apache.hadoop.ipc.StandbyException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeregisterSubClusterResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesResponse;
+-
+-/**
+- * Mock interceptor that does not do anything other than forwarding it to the
+- * next interceptor in the chain.
+- */
+-public class PassThroughRMAdminRequestInterceptor
+-    extends AbstractRMAdminRequestInterceptor {
+-
+-  @Override
+-  public RefreshQueuesResponse refreshQueues(RefreshQueuesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return getNextInterceptor().refreshQueues(request);
+-  }
+-
+-  @Override
+-  public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return getNextInterceptor().refreshNodes(request);
+-  }
+-
+-  @Override
+-  public RefreshSuperUserGroupsConfigurationResponse refreshSuperUserGroupsConfiguration(
+-      RefreshSuperUserGroupsConfigurationRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return getNextInterceptor().refreshSuperUserGroupsConfiguration(request);
+-  }
+-
+-  @Override
+-  public RefreshUserToGroupsMappingsResponse refreshUserToGroupsMappings(
+-      RefreshUserToGroupsMappingsRequest request)
+-      throws StandbyException, YarnException, IOException {
+-    return getNextInterceptor().refreshUserToGroupsMappings(request);
+-  }
+-
+-  @Override
+-  public RefreshAdminAclsResponse refreshAdminAcls(
+-      RefreshAdminAclsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().refreshAdminAcls(request);
+-  }
+-
+-  @Override
+-  public RefreshServiceAclsResponse refreshServiceAcls(
+-      RefreshServiceAclsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().refreshServiceAcls(request);
+-  }
+-
+-  @Override
+-  public UpdateNodeResourceResponse updateNodeResource(
+-      UpdateNodeResourceRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().updateNodeResource(request);
+-  }
+-
+-  @Override
+-  public RefreshNodesResourcesResponse refreshNodesResources(
+-      RefreshNodesResourcesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().refreshNodesResources(request);
+-  }
+-
+-  @Override
+-  public AddToClusterNodeLabelsResponse addToClusterNodeLabels(
+-      AddToClusterNodeLabelsRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().addToClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public RemoveFromClusterNodeLabelsResponse removeFromClusterNodeLabels(
+-      RemoveFromClusterNodeLabelsRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().removeFromClusterNodeLabels(request);
+-  }
+-
+-  @Override
+-  public ReplaceLabelsOnNodeResponse replaceLabelsOnNode(
+-      ReplaceLabelsOnNodeRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().replaceLabelsOnNode(request);
+-  }
+-
+-  @Override
+-  public CheckForDecommissioningNodesResponse checkForDecommissioningNodes(
+-      CheckForDecommissioningNodesRequest checkForDecommissioningNodesRequest)
+-      throws YarnException, IOException {
+-    return getNextInterceptor()
+-        .checkForDecommissioningNodes(checkForDecommissioningNodesRequest);
+-  }
+-
+-  @Override
+-  public RefreshClusterMaxPriorityResponse refreshClusterMaxPriority(
+-      RefreshClusterMaxPriorityRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().refreshClusterMaxPriority(request);
+-  }
+-
+-  @Override
+-  public String[] getGroupsForUser(String user) throws IOException {
+-    return getNextInterceptor().getGroupsForUser(user);
+-  }
+-
+-  @Override
+-  public NodesToAttributesMappingResponse mapAttributesToNodes(
+-      NodesToAttributesMappingRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().mapAttributesToNodes(request);
+-  }
+-
+-  @Override
+-  public DeregisterSubClusterResponse deregisterSubCluster(DeregisterSubClusterRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().deregisterSubCluster(request);
+-  }
+-
+-  @Override
+-  public SaveFederationQueuePolicyResponse saveFederationQueuePolicy(
+-      SaveFederationQueuePolicyRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().saveFederationQueuePolicy(request);
+-  }
+-
+-  @Override
+-  public BatchSaveFederationQueuePoliciesResponse batchSaveFederationQueuePolicies(
+-      BatchSaveFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().batchSaveFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public QueryFederationQueuePoliciesResponse listFederationQueuePolicies(
+-      QueryFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().listFederationQueuePolicies(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationApplicationResponse deleteFederationApplication(
+-      DeleteFederationApplicationRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().deleteFederationApplication(request);
+-  }
+-
+-  @Override
+-  public GetSubClustersResponse getFederationSubClusters(GetSubClustersRequest request)
+-      throws YarnException, IOException {
+-    return getNextInterceptor().getFederationSubClusters(request);
+-  }
+-
+-  @Override
+-  public DeleteFederationQueuePoliciesResponse deleteFederationPoliciesByQueues(
+-      DeleteFederationQueuePoliciesRequest request) throws YarnException, IOException {
+-    return getNextInterceptor().deleteFederationPoliciesByQueues(request);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java
+deleted file mode 100644
+index ffea73bc712..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestFederationRMAdminInterceptor.java
++++ /dev/null
+@@ -1,1092 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.DecommissionType;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceOption;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.NodeAttribute;
+-import org.apache.hadoop.yarn.api.records.NodeAttributeType;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodesToAttributesMappingRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AttributeMappingOperationType;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.NodeToAttributes;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.FederationQueueWeight;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SaveFederationQueuePolicyResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.BatchSaveFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.QueryFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationApplicationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.GetSubClustersResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.FederationSubCluster;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.DeleteFederationQueuePoliciesResponse;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.nio.ByteBuffer;
+-import java.text.DecimalFormat;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.LinkedHashMap;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.Random;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-
+-/**
+- * Extends the FederationRMAdminInterceptor and overrides methods to provide a
+- * testable implementation of FederationRMAdminInterceptor.
+- */
+-public class TestFederationRMAdminInterceptor extends BaseRouterRMAdminTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestFederationRMAdminInterceptor.class);
+-
+-  ////////////////////////////////
+-  // constant information
+-  ////////////////////////////////
+-  private final static String USER_NAME = "test-user";
+-  private final static int NUM_SUBCLUSTER = 4;
+-  private final static int GB = 1024;
+-
+-  private TestableFederationRMAdminInterceptor interceptor;
+-  private FederationStateStoreFacade facade;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreTestUtil stateStoreUtil;
+-  private List<SubClusterId> subClusters;
+-
+-  @Override
+-  public void setUp() {
+-
+-    super.setUpConfig();
+-
+-    // Initialize facade & stateSore
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(this.getConf());
+-    facade = FederationStateStoreFacade.getInstance(this.getConf());
+-    facade.reinitialize(stateStore, this.getConf());
+-    stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-
+-    // Initialize interceptor
+-    interceptor = new TestableFederationRMAdminInterceptor();
+-    interceptor.setConf(this.getConf());
+-    interceptor.init(USER_NAME);
+-
+-    // Storage SubClusters
+-    subClusters = new ArrayList<>();
+-    try {
+-      for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-        SubClusterId sc = SubClusterId.newInstance("SC-" + i);
+-        stateStoreUtil.registerSubCluster(sc);
+-        subClusters.add(sc);
+-      }
+-    } catch (YarnException e) {
+-      LOG.error(e.getMessage());
+-      Assert.fail();
+-    }
+-
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-  }
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-    // Set Enable YarnFederation
+-    YarnConfiguration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-
+-    String mockPassThroughInterceptorClass =
+-        PassThroughRMAdminRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain will call the mock resource manager. The others in the chain will
+-    // simply forward it to the next one in the chain
+-    config.set(YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass + "," +
+-        TestFederationRMAdminInterceptor.class.getName());
+-    config.setBoolean(
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, true);
+-    return config;
+-  }
+-
+-  @Override
+-  public void tearDown() {
+-    interceptor.shutdown();
+-    super.tearDown();
+-  }
+-
+-  @Test
+-  public void testRefreshQueues() throws Exception {
+-    // We will test 2 cases:
+-    // case 1, request is null.
+-    // case 2, normal request.
+-    // If the request is null, a Missing RefreshQueues request exception will be thrown.
+-
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RefreshQueues request.",
+-        () -> interceptor.refreshQueues(null));
+-
+-    // normal request.
+-    RefreshQueuesRequest request = RefreshQueuesRequest.newInstance();
+-    RefreshQueuesResponse response = interceptor.refreshQueues(request);
+-    assertNotNull(response);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshQueues() throws Exception {
+-    // We will test 2 cases:
+-    // case 1, test the existing subCluster (SC-1).
+-    // case 2, test the non-exist subCluster.
+-
+-    String existSubCluster = "SC-1";
+-    RefreshQueuesRequest request = RefreshQueuesRequest.newInstance(existSubCluster);
+-    interceptor.refreshQueues(request);
+-
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshQueuesRequest request1 = RefreshQueuesRequest.newInstance(notExistsSubCluster);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshQueues(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshNodes() throws Exception {
+-    // We will test 2 cases:
+-    // case 1, request is null.
+-    // case 2, normal request.
+-    // If the request is null, a Missing RefreshNodes request exception will be thrown.
+-
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing RefreshNodes request.", () -> interceptor.refreshNodes(null));
+-
+-    // normal request.
+-    RefreshNodesRequest request = RefreshNodesRequest.newInstance(DecommissionType.NORMAL);
+-    interceptor.refreshNodes(request);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshNodes() throws Exception {
+-
+-    // We will test 2 cases:
+-    // case 1, test the existing subCluster (SC-1).
+-    // case 2, test the non-exist subCluster.
+-
+-    RefreshNodesRequest request =
+-        RefreshNodesRequest.newInstance(DecommissionType.NORMAL, 10, "SC-1");
+-    interceptor.refreshNodes(request);
+-
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshNodesRequest request1 = RefreshNodesRequest.newInstance(
+-        DecommissionType.NORMAL, 10, notExistsSubCluster);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshNodes(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshSuperUserGroupsConfiguration() throws Exception {
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing RefreshSuperUserGroupsConfiguration request.",
+-        () -> interceptor.refreshSuperUserGroupsConfiguration(null));
+-
+-    // normal request.
+-    // There is no return information defined in RefreshSuperUserGroupsConfigurationResponse,
+-    // as long as it is not empty, it means that the command is successfully executed.
+-    RefreshSuperUserGroupsConfigurationRequest request =
+-        RefreshSuperUserGroupsConfigurationRequest.newInstance();
+-    RefreshSuperUserGroupsConfigurationResponse response =
+-        interceptor.refreshSuperUserGroupsConfiguration(request);
+-    assertNotNull(response);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshSuperUserGroupsConfiguration() throws Exception {
+-
+-    // case 1, test the existing subCluster (SC-1).
+-    String existSubCluster = "SC-1";
+-    RefreshSuperUserGroupsConfigurationRequest request =
+-        RefreshSuperUserGroupsConfigurationRequest.newInstance(existSubCluster);
+-    RefreshSuperUserGroupsConfigurationResponse response =
+-        interceptor.refreshSuperUserGroupsConfiguration(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshSuperUserGroupsConfigurationRequest request1 =
+-        RefreshSuperUserGroupsConfigurationRequest.newInstance(notExistsSubCluster);
+-    LambdaTestUtils.intercept(Exception.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshSuperUserGroupsConfiguration(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshUserToGroupsMappings() throws Exception {
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing RefreshUserToGroupsMappings request.",
+-        () -> interceptor.refreshUserToGroupsMappings(null));
+-
+-    // normal request.
+-    RefreshUserToGroupsMappingsRequest request = RefreshUserToGroupsMappingsRequest.newInstance();
+-    RefreshUserToGroupsMappingsResponse response = interceptor.refreshUserToGroupsMappings(request);
+-    assertNotNull(response);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshUserToGroupsMappings() throws Exception {
+-    // case 1, test the existing subCluster (SC-1).
+-    String existSubCluster = "SC-1";
+-    RefreshUserToGroupsMappingsRequest request =
+-        RefreshUserToGroupsMappingsRequest.newInstance(existSubCluster);
+-    RefreshUserToGroupsMappingsResponse response =
+-        interceptor.refreshUserToGroupsMappings(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshUserToGroupsMappingsRequest request1 =
+-        RefreshUserToGroupsMappingsRequest.newInstance(notExistsSubCluster);
+-    LambdaTestUtils.intercept(Exception.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshUserToGroupsMappings(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshAdminAcls() throws Exception {
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RefreshAdminAcls request.",
+-        () -> interceptor.refreshAdminAcls(null));
+-
+-    // normal request.
+-    RefreshAdminAclsRequest request = RefreshAdminAclsRequest.newInstance();
+-    RefreshAdminAclsResponse response = interceptor.refreshAdminAcls(request);
+-    assertNotNull(response);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshAdminAcls() throws Exception {
+-    // case 1, test the existing subCluster (SC-1).
+-    String existSubCluster = "SC-1";
+-    RefreshAdminAclsRequest request = RefreshAdminAclsRequest.newInstance(existSubCluster);
+-    RefreshAdminAclsResponse response = interceptor.refreshAdminAcls(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshAdminAclsRequest request1 = RefreshAdminAclsRequest.newInstance(notExistsSubCluster);
+-    LambdaTestUtils.intercept(Exception.class, "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshAdminAcls(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshServiceAcls() throws Exception {
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RefreshServiceAcls request.",
+-        () -> interceptor.refreshServiceAcls(null));
+-
+-    // normal request.
+-    RefreshServiceAclsRequest request = RefreshServiceAclsRequest.newInstance();
+-    RefreshServiceAclsResponse response = interceptor.refreshServiceAcls(request);
+-    assertNotNull(response);
+-  }
+-
+-  @Test
+-  public void testSC1RefreshServiceAcls() throws Exception {
+-    // case 1, test the existing subCluster (SC-1).
+-    String existSubCluster = "SC-1";
+-    RefreshServiceAclsRequest request = RefreshServiceAclsRequest.newInstance(existSubCluster);
+-    RefreshServiceAclsResponse response = interceptor.refreshServiceAcls(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    String notExistsSubCluster = "SC-NON";
+-    RefreshServiceAclsRequest request1 = RefreshServiceAclsRequest.newInstance(notExistsSubCluster);
+-    LambdaTestUtils.intercept(Exception.class, "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshServiceAcls(request1));
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResourceEmptyRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing UpdateNodeResource request.",
+-        () -> interceptor.updateNodeResource(null));
+-
+-    // null request2.
+-    Map<NodeId, ResourceOption> nodeResourceMap = new HashMap<>();
+-    UpdateNodeResourceRequest request = UpdateNodeResourceRequest.newInstance(nodeResourceMap);
+-    LambdaTestUtils.intercept(YarnException.class, "Missing UpdateNodeResource SubClusterId.",
+-        () -> interceptor.updateNodeResource(request));
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResourceNormalRequest() throws Exception {
+-    // case 1, test the existing subCluster (SC-1).
+-    Map<NodeId, ResourceOption> nodeResourceMap = new HashMap<>();
+-    NodeId nodeId = NodeId.newInstance("127.0.0.1", 1);
+-    ResourceOption resourceOption =
+-        ResourceOption.newInstance(Resource.newInstance(2 * GB, 1), -1);
+-    nodeResourceMap.put(nodeId, resourceOption);
+-    UpdateNodeResourceRequest request =
+-        UpdateNodeResourceRequest.newInstance(nodeResourceMap, "SC-1");
+-    UpdateNodeResourceResponse response = interceptor.updateNodeResource(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    UpdateNodeResourceRequest request1 =
+-        UpdateNodeResourceRequest.newInstance(nodeResourceMap, "SC-NON");
+-    LambdaTestUtils.intercept(Exception.class, "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.updateNodeResource(request1));
+-  }
+-
+-  @Test
+-  public void testRefreshNodesResourcesEmptyRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RefreshNodesResources request.",
+-        () -> interceptor.refreshNodesResources(null));
+-
+-    // null request2.
+-    RefreshNodesResourcesRequest request = RefreshNodesResourcesRequest.newInstance();
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RefreshNodesResources SubClusterId.",
+-        () -> interceptor.refreshNodesResources(request));
+-  }
+-
+-  @Test
+-  public void testRefreshNodesResourcesNormalRequest() throws Exception {
+-    // case 1, test the existing subCluster (SC-1).
+-    RefreshNodesResourcesRequest request = RefreshNodesResourcesRequest.newInstance("SC-1");
+-    RefreshNodesResourcesResponse response = interceptor.refreshNodesResources(request);
+-    assertNotNull(response);
+-
+-    // case 2, test the non-exist subCluster.
+-    RefreshNodesResourcesRequest request1 = RefreshNodesResourcesRequest.newInstance("SC-NON");
+-    LambdaTestUtils.intercept(Exception.class, "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.refreshNodesResources(request1));
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabelsEmptyRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing AddToClusterNodeLabels request.",
+-        () -> interceptor.addToClusterNodeLabels(null));
+-
+-    // null request2.
+-    AddToClusterNodeLabelsRequest request = AddToClusterNodeLabelsRequest.newInstance(null, null);
+-    LambdaTestUtils.intercept(YarnException.class, "Missing AddToClusterNodeLabels SubClusterId.",
+-        () -> interceptor.addToClusterNodeLabels(request));
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabelsNormalRequest() throws Exception {
+-    // case1, We add NodeLabel to subCluster SC-1
+-    NodeLabel nodeLabelA = NodeLabel.newInstance("a");
+-    NodeLabel nodeLabelB = NodeLabel.newInstance("b");
+-    List<NodeLabel> labels = new ArrayList<>();
+-    labels.add(nodeLabelA);
+-    labels.add(nodeLabelB);
+-
+-    AddToClusterNodeLabelsRequest request =
+-        AddToClusterNodeLabelsRequest.newInstance("SC-1", labels);
+-    AddToClusterNodeLabelsResponse response = interceptor.addToClusterNodeLabels(request);
+-    assertNotNull(response);
+-
+-    // case2, test the non-exist subCluster.
+-    AddToClusterNodeLabelsRequest request1 =
+-        AddToClusterNodeLabelsRequest.newInstance("SC-NON", labels);
+-    LambdaTestUtils.intercept(Exception.class, "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.addToClusterNodeLabels(request1));
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabelsEmptyRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing RemoveFromClusterNodeLabels request.",
+-        () -> interceptor.removeFromClusterNodeLabels(null));
+-
+-    // null request2.
+-    RemoveFromClusterNodeLabelsRequest request =
+-        RemoveFromClusterNodeLabelsRequest.newInstance(null, null);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing RemoveFromClusterNodeLabels SubClusterId.",
+-        () -> interceptor.removeFromClusterNodeLabels(request));
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabelsNormalRequest() throws Exception {
+-    // case1, We add nodelabel a for SC-1, and then remove nodelabel a
+-
+-    // Step1. Add NodeLabel for subCluster SC-1
+-    NodeLabel nodeLabelA = NodeLabel.newInstance("a");
+-    NodeLabel nodeLabelB = NodeLabel.newInstance("b");
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(nodeLabelA);
+-    nodeLabels.add(nodeLabelB);
+-
+-    AddToClusterNodeLabelsRequest request =
+-        AddToClusterNodeLabelsRequest.newInstance("SC-1", nodeLabels);
+-    interceptor.addToClusterNodeLabels(request);
+-
+-    // Step2. We delete the label a of subCluster SC-1
+-    Set<String> labels = new HashSet<>();
+-    labels.add("a");
+-
+-    RemoveFromClusterNodeLabelsRequest request1 =
+-        RemoveFromClusterNodeLabelsRequest.newInstance("SC-1", labels);
+-    RemoveFromClusterNodeLabelsResponse response =
+-        interceptor.removeFromClusterNodeLabels(request1);
+-    assertNotNull(response);
+-
+-    // case2, test the non-exist subCluster.
+-    RemoveFromClusterNodeLabelsRequest request2 =
+-        RemoveFromClusterNodeLabelsRequest.newInstance("SC-NON", labels);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.removeFromClusterNodeLabels(request2));
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodeEmptyRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing ReplaceLabelsOnNode request.",
+-        () -> interceptor.replaceLabelsOnNode(null));
+-
+-    // null request2.
+-    Map<NodeId, Set<String>> labelMap = new HashMap<>();
+-    ReplaceLabelsOnNodeRequest request = ReplaceLabelsOnNodeRequest.newInstance(labelMap, null);
+-    LambdaTestUtils.intercept(YarnException.class, "Missing ReplaceLabelsOnNode SubClusterId.",
+-        () -> interceptor.replaceLabelsOnNode(request));
+-  }
+-
+-  @Test
+-  public void tesReplaceLabelsOnNodeEmptyNormalRequest() throws Exception {
+-    // case1, We add nodelabel for SC-1, and then replace the label for the specific node.
+-    NodeLabel nodeLabelA = NodeLabel.newInstance("a");
+-    NodeLabel nodeLabelB = NodeLabel.newInstance("b");
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(nodeLabelA);
+-    nodeLabels.add(nodeLabelB);
+-
+-    AddToClusterNodeLabelsRequest request =
+-        AddToClusterNodeLabelsRequest.newInstance("SC-1", nodeLabels);
+-    interceptor.addToClusterNodeLabels(request);
+-
+-    Map<NodeId, Set<String>> pMap = new HashMap<>();
+-    NodeId nodeId = NodeId.newInstance("127.0.0.1", 0);
+-    Set<String> labels = new HashSet<>();
+-    labels.add("a");
+-    pMap.put(nodeId, labels);
+-
+-    ReplaceLabelsOnNodeRequest request1 = ReplaceLabelsOnNodeRequest.newInstance(pMap, "SC-1");
+-    ReplaceLabelsOnNodeResponse response = interceptor.replaceLabelsOnNode(request1);
+-    assertNotNull(response);
+-
+-    // case2, test the non-exist subCluster.
+-    ReplaceLabelsOnNodeRequest request2 =
+-        ReplaceLabelsOnNodeRequest.newInstance(pMap, "SC-NON");
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "subClusterId = SC-NON is not an active subCluster.",
+-        () -> interceptor.replaceLabelsOnNode(request2));
+-  }
+-
+-  @Test
+-  public void testCheckForDecommissioningNodesRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing checkForDecommissioningNodes request.",
+-        () -> interceptor.checkForDecommissioningNodes(null));
+-
+-    // null request2.
+-    CheckForDecommissioningNodesRequest request =
+-        CheckForDecommissioningNodesRequest.newInstance(null);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing checkForDecommissioningNodes SubClusterId.",
+-        () -> interceptor.checkForDecommissioningNodes(request));
+-  }
+-
+-  @Test
+-  public void testCheckForDecommissioningNodesNormalRequest() throws Exception {
+-    CheckForDecommissioningNodesRequest request =
+-        CheckForDecommissioningNodesRequest.newInstance("SC-1");
+-    CheckForDecommissioningNodesResponse response =
+-        interceptor.checkForDecommissioningNodes(request);
+-    assertNotNull(response);
+-    Set<NodeId> nodeIds = response.getDecommissioningNodes();
+-    assertNotNull(nodeIds);
+-    assertEquals(0, nodeIds.size());
+-  }
+-
+-  @Test
+-  public void testMapAttributesToNodesRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing mapAttributesToNodes request.",
+-        () -> interceptor.mapAttributesToNodes(null));
+-
+-    // null request2.
+-    NodeAttribute nodeAttribute = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "x",
+-        NodeAttributeType.STRING, "dfasdf");
+-    List<NodeAttribute> nodeAttributeList = Collections.singletonList(nodeAttribute);
+-    NodeToAttributes nodeToAttributes = NodeToAttributes.newInstance("host1", nodeAttributeList);
+-    List<NodeToAttributes> nodeToAttributesList = Collections.singletonList(nodeToAttributes);
+-    NodesToAttributesMappingRequest request = NodesToAttributesMappingRequest.newInstance(
+-        AttributeMappingOperationType.ADD, nodeToAttributesList, true, null);
+-    LambdaTestUtils.intercept(YarnException.class, "Missing mapAttributesToNodes SubClusterId.",
+-        () -> interceptor.mapAttributesToNodes(request));
+-  }
+-
+-  @Test
+-  public void testMapAttributesToNodesNormalRequest() throws Exception {
+-    NodeAttribute nodeAttribute = NodeAttribute.newInstance(NodeAttribute.PREFIX_CENTRALIZED, "x",
+-        NodeAttributeType.STRING, "dfasdf");
+-    List<NodeAttribute> nodeAttributeList = Collections.singletonList(nodeAttribute);
+-    NodeToAttributes nodeToAttributes =
+-        NodeToAttributes.newInstance("127.0.0.1", nodeAttributeList);
+-    List<NodeToAttributes> nodeToAttributesList = Collections.singletonList(nodeToAttributes);
+-    NodesToAttributesMappingRequest request = NodesToAttributesMappingRequest.newInstance(
+-        AttributeMappingOperationType.ADD, nodeToAttributesList, true, "SC-1");
+-    interceptor.mapAttributesToNodes(request);
+-  }
+-
+-  @Test
+-  public void testGetGroupsForUserRequest() throws Exception {
+-    // null request1.
+-    LambdaTestUtils.intercept(IOException.class, "Missing getGroupsForUser user.",
+-        () -> interceptor.getGroupsForUser(null));
+-  }
+-
+-  @Test
+-  public void testGetGroupsForUserNormalRequest() throws Exception {
+-    String[] groups = interceptor.getGroupsForUser("admin");
+-    assertNotNull(groups);
+-    assertEquals(1, groups.length);
+-    assertEquals("admin", groups[0]);
+-  }
+-
+-  @Test
+-  public void testSaveFederationQueuePolicyErrorRequest() throws Exception {
+-    // null request.
+-    LambdaTestUtils.intercept(YarnException.class, "Missing SaveFederationQueuePolicy request.",
+-        () -> interceptor.saveFederationQueuePolicy(null));
+-
+-    // federationQueueWeight is null.
+-    LambdaTestUtils.intercept(
+-        IllegalArgumentException.class, "FederationQueueWeight cannot be null.",
+-        () -> SaveFederationQueuePolicyRequest.newInstance("root.a", null, "-"));
+-
+-    // queue is null
+-    FederationQueueWeight federationQueueWeight =
+-        FederationQueueWeight.newInstance("SC-1:0.7,SC-2:0.3", "SC-1:0.7,SC-2:0.3", "1.0");
+-    SaveFederationQueuePolicyRequest request =
+-        SaveFederationQueuePolicyRequest.newInstance("", federationQueueWeight, "-");
+-    LambdaTestUtils.intercept(YarnException.class, "Missing Queue information.",
+-        () -> interceptor.saveFederationQueuePolicy(request));
+-
+-    // PolicyManager needs to support weight
+-    FederationQueueWeight federationQueueWeight2 = FederationQueueWeight.newInstance(
+-        "SC-1:0.7,SC-2:0.3", "SC-1:0.8,SC-2:0.3", "1.0");
+-    SaveFederationQueuePolicyRequest request2 =
+-        SaveFederationQueuePolicyRequest.newInstance("root.a", federationQueueWeight2,
+-        "TestPolicyManager");
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "TestPolicyManager does not support the use of queue weights.",
+-        () -> interceptor.saveFederationQueuePolicy(request2));
+-
+-    // routerWeight / amrmWeight
+-    // The sum of the routerWeight is not equal to 1.
+-    String policyTypeName = WeightedLocalityPolicyManager.class.getCanonicalName();
+-    FederationQueueWeight federationQueueWeight3 = FederationQueueWeight.newInstance(
+-        "SC-1:0.7,SC-2:0.3", "SC-1:0.8,SC-2:0.3", "1.0");
+-    SaveFederationQueuePolicyRequest request3 =
+-        SaveFederationQueuePolicyRequest.newInstance("root.a", federationQueueWeight3,
+-        policyTypeName);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "The sum of ratios for all subClusters must be equal to 1.",
+-        () -> interceptor.saveFederationQueuePolicy(request3));
+-  }
+-
+-  @Test
+-  public void testSaveFederationQueuePolicyRequest() throws IOException, YarnException {
+-
+-    // We design unit tests, including 2 SubCluster (SC-1, SC-2)
+-    // Router Weight: SC-1=0.7,SC-2=0.3
+-    // AMRM Weight: SC-1=0.6,SC-2=0.4
+-    // headRoomAlpha: 1.0
+-    String queue = "root.a";
+-    String subCluster1 = "SC-1";
+-    String subCluster2 = "SC-2";
+-    String routerWeight = "SC-1:0.7,SC-2:0.3";
+-    String amrmWeight = "SC-1:0.6,SC-2:0.4";
+-    String headRoomAlpha = "1.0";
+-
+-    // Step1. Write FederationQueue information to stateStore.
+-    String policyTypeName = WeightedLocalityPolicyManager.class.getCanonicalName();
+-    FederationQueueWeight federationQueueWeight =
+-        FederationQueueWeight.newInstance(routerWeight, amrmWeight, headRoomAlpha);
+-    SaveFederationQueuePolicyRequest request =
+-        SaveFederationQueuePolicyRequest.newInstance(queue, federationQueueWeight, policyTypeName);
+-    SaveFederationQueuePolicyResponse response = interceptor.saveFederationQueuePolicy(request);
+-    assertNotNull(response);
+-    assertEquals("save policy success.", response.getMessage());
+-
+-    // Step2. We query Policy information from FederationStateStore.
+-    FederationStateStoreFacade federationFacade = interceptor.getFederationFacade();
+-    SubClusterPolicyConfiguration policyConfiguration =
+-        federationFacade.getPolicyConfiguration(queue);
+-    assertNotNull(policyConfiguration);
+-    assertEquals(queue, policyConfiguration.getQueue());
+-
+-    ByteBuffer params = policyConfiguration.getParams();
+-    assertNotNull(params);
+-    WeightedPolicyInfo weightedPolicyInfo = WeightedPolicyInfo.fromByteBuffer(params);
+-    assertNotNull(weightedPolicyInfo);
+-
+-    SubClusterIdInfo sc1 = new SubClusterIdInfo(subCluster1);
+-    SubClusterIdInfo sc2 = new SubClusterIdInfo(subCluster2);
+-
+-    // Step3. We will compare the accuracy of routerPolicyWeights and amrmPolicyWeights.
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = weightedPolicyInfo.getRouterPolicyWeights();
+-    Float sc1Weight = routerPolicyWeights.get(sc1);
+-    assertNotNull(sc1Weight);
+-    assertEquals(0.7f, sc1Weight.floatValue(), 0.00001);
+-
+-    Float sc2Weight = routerPolicyWeights.get(sc2);
+-    assertNotNull(sc2Weight);
+-    assertEquals(0.3f, sc2Weight.floatValue(), 0.00001);
+-
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights = weightedPolicyInfo.getAMRMPolicyWeights();
+-    Float sc1AMRMWeight = amrmPolicyWeights.get(sc1);
+-    assertNotNull(sc1AMRMWeight);
+-    assertEquals(0.6f, sc1AMRMWeight.floatValue(), 0.00001);
+-
+-    Float sc2AMRMWeight = amrmPolicyWeights.get(sc2);
+-    assertNotNull(sc2AMRMWeight);
+-    assertEquals(0.4f, sc2AMRMWeight.floatValue(), 0.00001);
+-  }
+-
+-  @Test
+-  public void testBatchSaveFederationQueuePoliciesRequest() throws IOException, YarnException {
+-
+-    // subClusters
+-    List<String> subClusterLists = new ArrayList<>();
+-    subClusterLists.add("SC-1");
+-    subClusterLists.add("SC-2");
+-
+-    // generate queue A, queue B, queue C
+-    FederationQueueWeight rootA = generateFederationQueueWeight("root.a", subClusterLists);
+-    FederationQueueWeight rootB = generateFederationQueueWeight("root.b", subClusterLists);
+-    FederationQueueWeight rootC = generateFederationQueueWeight("root.b", subClusterLists);
+-
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    federationQueueWeights.add(rootA);
+-    federationQueueWeights.add(rootB);
+-    federationQueueWeights.add(rootC);
+-
+-    // Step1. Save Queue Policies in Batches
+-    BatchSaveFederationQueuePoliciesRequest request =
+-        BatchSaveFederationQueuePoliciesRequest.newInstance(federationQueueWeights);
+-
+-    BatchSaveFederationQueuePoliciesResponse policiesResponse =
+-        interceptor.batchSaveFederationQueuePolicies(request);
+-
+-    assertNotNull(policiesResponse);
+-    assertNotNull(policiesResponse.getMessage());
+-    assertEquals("batch save policies success.", policiesResponse.getMessage());
+-
+-    // Step2. We query Policy information from FederationStateStore.
+-    FederationStateStoreFacade federationFacade = interceptor.getFederationFacade();
+-    SubClusterPolicyConfiguration policyConfiguration =
+-        federationFacade.getPolicyConfiguration("root.a");
+-    assertNotNull(policyConfiguration);
+-    assertEquals("root.a", policyConfiguration.getQueue());
+-
+-    ByteBuffer params = policyConfiguration.getParams();
+-    assertNotNull(params);
+-    WeightedPolicyInfo weightedPolicyInfo = WeightedPolicyInfo.fromByteBuffer(params);
+-    assertNotNull(weightedPolicyInfo);
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights = weightedPolicyInfo.getAMRMPolicyWeights();
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = weightedPolicyInfo.getRouterPolicyWeights();
+-
+-    SubClusterIdInfo sc1 = new SubClusterIdInfo("SC-1");
+-    SubClusterIdInfo sc2 = new SubClusterIdInfo("SC-2");
+-
+-    // Check whether the AMRMWeight of SC-1 and SC-2 of root.a meet expectations
+-    FederationQueueWeight queueWeight = federationQueueWeights.get(0);
+-    Map<SubClusterIdInfo, Float> subClusterAmrmWeightMap =
+-        interceptor.getSubClusterWeightMap(queueWeight.getAmrmWeight());
+-    Float sc1ExpectedAmrmWeightFloat = amrmPolicyWeights.get(sc1);
+-    Float sc1AmrmWeightFloat = subClusterAmrmWeightMap.get(sc1);
+-    assertNotNull(sc1AmrmWeightFloat);
+-    assertEquals(sc1ExpectedAmrmWeightFloat, sc1AmrmWeightFloat, 0.00001);
+-
+-    Float sc2ExpectedAmrmWeightFloat = amrmPolicyWeights.get(sc2);
+-    Float sc2AmrmWeightFloat = subClusterAmrmWeightMap.get(sc2);
+-    assertNotNull(sc2ExpectedAmrmWeightFloat);
+-    assertEquals(sc2ExpectedAmrmWeightFloat, sc2AmrmWeightFloat, 0.00001);
+-
+-    // Check whether the RouterPolicyWeight of SC-1 and SC-2 of root.a meet expectations
+-    Map<SubClusterIdInfo, Float> subClusterRouterWeightMap =
+-        interceptor.getSubClusterWeightMap(queueWeight.getRouterWeight());
+-    Float sc1ExpectedRouterWeightFloat = routerPolicyWeights.get(sc1);
+-    Float sc1RouterWeightFloat = subClusterRouterWeightMap.get(sc1);
+-    assertNotNull(sc1RouterWeightFloat);
+-    assertEquals(sc1ExpectedRouterWeightFloat, sc1RouterWeightFloat, 0.00001);
+-
+-    Float sc2ExpectedRouterWeightFloat = routerPolicyWeights.get(sc2);
+-    Float sc2RouterWeightFloat = subClusterRouterWeightMap.get(sc2);
+-    assertNotNull(sc2ExpectedRouterWeightFloat);
+-    assertEquals(sc2ExpectedRouterWeightFloat, sc2RouterWeightFloat, 0.00001);
+-  }
+-
+-  /**
+-   * Generate FederationQueueWeight.
+-   * We will generate the weight information of the queue.
+-   *
+-   * @param queue queue name
+-   * @param pSubClusters subClusters
+-   * @return subCluster FederationQueueWeight
+-   */
+-  private FederationQueueWeight generateFederationQueueWeight(
+-      String queue, List<String> pSubClusters) {
+-    String routerWeight = generatePolicyWeight(pSubClusters);
+-    String amrmWeight = generatePolicyWeight(pSubClusters);
+-    String policyTypeName = WeightedLocalityPolicyManager.class.getCanonicalName();
+-    String headRoomAlpha = "1.0";
+-    return FederationQueueWeight.newInstance(routerWeight, amrmWeight, headRoomAlpha,
+-        queue, policyTypeName);
+-  }
+-
+-  /**
+-   * Generating Policy Weight Data.
+-   *
+-   * @param pSubClusters set of sub-clusters.
+-   * @return policy Weight String, like SC-1:0.7,SC-2:0.3
+-   */
+-  private String generatePolicyWeight(List<String> pSubClusters) {
+-    List<String> weights = generateWeights(pSubClusters.size());
+-    List<String> subClusterWeight = new ArrayList<>();
+-    for (int i = 0; i < pSubClusters.size(); i++) {
+-      String subCluster = pSubClusters.get(i);
+-      String weight = weights.get(i);
+-      subClusterWeight.add(subCluster + ":" + weight);
+-    }
+-    return StringUtils.join(subClusterWeight, ",");
+-  }
+-
+-  /**
+-   * Generate a set of random numbers, and the sum of the numbers is 1.
+-   *
+-   * @param n number of random numbers generated.
+-   * @return a set of random numbers
+-   */
+-  private List<String> generateWeights(int n) {
+-    List<Float> randomNumbers = new ArrayList<>();
+-    float total = 0.0f;
+-
+-    Random random = new Random();
+-    for (int i = 0; i < n - 1; i++) {
+-      float randNum = random.nextFloat();
+-      randomNumbers.add(randNum);
+-      total += randNum;
+-    }
+-
+-    float lastNumber = 1 - total;
+-    randomNumbers.add(lastNumber);
+-
+-    DecimalFormat decimalFormat = new DecimalFormat("#.##");
+-    List<String> formattedRandomNumbers = new ArrayList<>();
+-    for (double number : randomNumbers) {
+-      String formattedNumber = decimalFormat.format(number);
+-      formattedRandomNumbers.add(formattedNumber);
+-    }
+-
+-    return formattedRandomNumbers;
+-  }
+-
+-  @Test
+-  public void testParsePolicyWeights() {
+-    Map<SubClusterIdInfo, Float> policyWeights = new LinkedHashMap<>();
+-    SubClusterIdInfo sc1 = new SubClusterIdInfo("SC-1");
+-    policyWeights.put(sc1, 0.7f);
+-    SubClusterIdInfo sc2 = new SubClusterIdInfo("SC-2");
+-    policyWeights.put(sc2, 0.3f);
+-    String policyWeight = interceptor.parsePolicyWeights(policyWeights);
+-    assertEquals("SC-1:0.7,SC-2:0.3", policyWeight);
+-  }
+-
+-  @Test
+-  public void testFilterPoliciesConfigurationsByQueues() throws Exception {
+-    // SubClusters : SC-1,SC-2
+-    List<String> subClusterLists = new ArrayList<>();
+-    subClusterLists.add("SC-1");
+-    subClusterLists.add("SC-2");
+-
+-    // We initialize 26 queues, queue root.a~root.z
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    for (char letter = 'a'; letter <= 'z'; letter++) {
+-      FederationQueueWeight leaf =
+-          generateFederationQueueWeight("root." + letter, subClusterLists);
+-      federationQueueWeights.add(leaf);
+-    }
+-
+-    // Save Queue Policies in Batches
+-    BatchSaveFederationQueuePoliciesRequest request =
+-        BatchSaveFederationQueuePoliciesRequest.newInstance(federationQueueWeights);
+-
+-    BatchSaveFederationQueuePoliciesResponse policiesResponse =
+-        interceptor.batchSaveFederationQueuePolicies(request);
+-
+-    assertNotNull(policiesResponse);
+-    assertNotNull(policiesResponse.getMessage());
+-    assertEquals("batch save policies success.", policiesResponse.getMessage());
+-
+-    // We query 12 queues, root.a ~ root.l
+-    List<String> queues = new ArrayList<>();
+-    for (char letter = 'a'; letter <= 'l'; letter++) {
+-      queues.add("root." + letter);
+-    }
+-
+-    // Queue1: We query page 1, 10 items per page, and the returned result should be 10 items.
+-    // TotalPage should be 2, TotalSize should be 12.
+-    QueryFederationQueuePoliciesRequest request1 =
+-        QueryFederationQueuePoliciesRequest.newInstance(10, 1, "", queues);
+-    QueryFederationQueuePoliciesResponse response1 =
+-        interceptor.listFederationQueuePolicies(request1);
+-    assertNotNull(response1);
+-    assertEquals(1, response1.getCurrentPage());
+-    assertEquals(10, response1.getPageSize());
+-    assertEquals(2, response1.getTotalPage());
+-    assertEquals(12, response1.getTotalSize());
+-    List<FederationQueueWeight> federationQueueWeights1 = response1.getFederationQueueWeights();
+-    assertNotNull(federationQueueWeights1);
+-    assertEquals(10, federationQueueWeights1.size());
+-
+-    // Queue2: We query page 1, 12 items per page, and the returned result should be 12 items.
+-    // TotalPage should be 1, TotalSize should be 12.
+-    QueryFederationQueuePoliciesRequest request2 =
+-        QueryFederationQueuePoliciesRequest.newInstance(12, 1, "", queues);
+-    QueryFederationQueuePoliciesResponse response2 =
+-        interceptor.listFederationQueuePolicies(request2);
+-    assertNotNull(response2);
+-    assertEquals(1, response2.getCurrentPage());
+-    assertEquals(12, response2.getPageSize());
+-    assertEquals(1, response2.getTotalPage());
+-    assertEquals(12, response2.getTotalSize());
+-    List<FederationQueueWeight> federationQueueWeights2 = response2.getFederationQueueWeights();
+-    assertNotNull(federationQueueWeights2);
+-    assertEquals(12, federationQueueWeights2.size());
+-
+-    // Queue3: Boundary limit exceeded
+-    // We filter 12 queues, should return 12 records, 12 per page,
+-    // should return 1 page, but we are going to return page 2.
+-    QueryFederationQueuePoliciesRequest request3 =
+-        QueryFederationQueuePoliciesRequest.newInstance(12, 2, "", queues);
+-    QueryFederationQueuePoliciesResponse response3 =
+-        interceptor.listFederationQueuePolicies(request3);
+-    assertNotNull(response3);
+-    assertEquals(2, response3.getCurrentPage());
+-    assertEquals(12, response3.getPageSize());
+-    assertEquals(1, response2.getTotalPage());
+-    assertEquals(12, response3.getTotalSize());
+-    List<FederationQueueWeight> federationQueueWeights3 = response3.getFederationQueueWeights();
+-    assertNotNull(federationQueueWeights3);
+-    assertEquals(0, federationQueueWeights3.size());
+-
+-    // Queue4: Boundary limit exceeded
+-    // We pass in some negative parameters and we will get some exceptions
+-    QueryFederationQueuePoliciesRequest request4 =
+-        QueryFederationQueuePoliciesRequest.newInstance(-1, 2, "", queues);
+-    LambdaTestUtils.intercept(YarnException.class, "PageSize cannot be negative or zero.",
+-        () -> interceptor.listFederationQueuePolicies(request4));
+-
+-    // Queue5: Boundary limit exceeded
+-    // We pass in some negative parameters and we will get some exceptions
+-    QueryFederationQueuePoliciesRequest request5 =
+-        QueryFederationQueuePoliciesRequest.newInstance(10, -1, "", queues);
+-    LambdaTestUtils.intercept(YarnException.class, "CurrentPage cannot be negative or zero.",
+-        () -> interceptor.listFederationQueuePolicies(request5));
+-
+-    // Queue6: We use Queue as the condition,
+-    // at this time we will only get the only one return value.
+-    QueryFederationQueuePoliciesRequest request6 =
+-        QueryFederationQueuePoliciesRequest.newInstance(10, 1, "root.a", null);
+-    QueryFederationQueuePoliciesResponse response6 =
+-        interceptor.listFederationQueuePolicies(request6);
+-    assertNotNull(response6);
+-    assertEquals(1, response6.getCurrentPage());
+-    assertEquals(10, response6.getPageSize());
+-    assertEquals(1, response6.getTotalPage());
+-    assertEquals(1, response6.getTotalSize());
+-    List<FederationQueueWeight> federationQueueWeights6 = response6.getFederationQueueWeights();
+-    assertNotNull(federationQueueWeights6);
+-    assertEquals(1, federationQueueWeights6.size());
+-
+-    // Queue7: We design such a test case, we do not set any filter conditions,
+-    // but we need to get the return results
+-    QueryFederationQueuePoliciesRequest request7 =
+-        QueryFederationQueuePoliciesRequest.newInstance(10, 1, null, null);
+-    QueryFederationQueuePoliciesResponse response7 =
+-        interceptor.listFederationQueuePolicies(request7);
+-    assertNotNull(response7);
+-    assertEquals(1, response7.getCurrentPage());
+-    assertEquals(10, response7.getPageSize());
+-    assertEquals(3, response7.getTotalPage());
+-    assertEquals(26, response7.getTotalSize());
+-    List<FederationQueueWeight> federationQueueWeights7 = response7.getFederationQueueWeights();
+-    assertNotNull(federationQueueWeights7);
+-    assertEquals(10, federationQueueWeights7.size());
+-
+-    // Queue8: We are designing a unit test where the number of records
+-    // we need to retrieve exceeds the maximum number of Policies available.
+-    QueryFederationQueuePoliciesRequest request8 =
+-        QueryFederationQueuePoliciesRequest.newInstance(10, 10, null, null);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "The index of the records to be retrieved has exceeded the maximum index.",
+-        () -> interceptor.listFederationQueuePolicies(request8));
+-  }
+-
+-  @Test
+-  public void testDeleteFederationApplication() throws Exception {
+-    ApplicationId applicationId = ApplicationId.newInstance(10, 1);
+-    DeleteFederationApplicationRequest request1 =
+-        DeleteFederationApplicationRequest.newInstance(applicationId.toString());
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Application application_10_0001 does not exist.",
+-        () -> interceptor.deleteFederationApplication(request1));
+-
+-    ApplicationId applicationId2 = ApplicationId.newInstance(10, 2);
+-    SubClusterId homeSubCluster = SubClusterId.newInstance("SC-1");
+-    ApplicationHomeSubCluster appHomeSubCluster =
+-        ApplicationHomeSubCluster.newInstance(applicationId2, homeSubCluster);
+-    facade.addApplicationHomeSubCluster(appHomeSubCluster);
+-    DeleteFederationApplicationRequest request2 =
+-        DeleteFederationApplicationRequest.newInstance(applicationId2.toString());
+-    DeleteFederationApplicationResponse deleteFederationApplicationResponse =
+-        interceptor.deleteFederationApplication(request2);
+-    assertNotNull(deleteFederationApplicationResponse);
+-    assertEquals("applicationId = " + applicationId2 + " delete success.",
+-        deleteFederationApplicationResponse.getMessage());
+-  }
+-
+-  @Test
+-  public void testGetFederationSubClusters() throws Exception {
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "Missing getFederationSubClusters Request.",
+-        () -> interceptor.getFederationSubClusters(null));
+-
+-    GetSubClustersRequest request = GetSubClustersRequest.newInstance();
+-    GetSubClustersResponse federationSubClusters = interceptor.getFederationSubClusters(request);
+-    assertNotNull(federationSubClusters);
+-
+-    List<FederationSubCluster> federationSubClustersList =
+-        federationSubClusters.getFederationSubClusters();
+-    assertNotNull(federationSubClustersList);
+-    assertEquals(4, federationSubClustersList.size());
+-  }
+-
+-  @Test
+-  public void testDeleteFederationPoliciesByQueues() throws IOException, YarnException {
+-    // subClusters
+-    List<String> subClusterLists = new ArrayList<>();
+-    subClusterLists.add("SC-1");
+-    subClusterLists.add("SC-2");
+-
+-    // generate queue A, queue B, queue C
+-    FederationQueueWeight rootA = generateFederationQueueWeight("root.a", subClusterLists);
+-    FederationQueueWeight rootB = generateFederationQueueWeight("root.b", subClusterLists);
+-    FederationQueueWeight rootC = generateFederationQueueWeight("root.c", subClusterLists);
+-
+-    List<FederationQueueWeight> federationQueueWeights = new ArrayList<>();
+-    federationQueueWeights.add(rootA);
+-    federationQueueWeights.add(rootB);
+-    federationQueueWeights.add(rootC);
+-
+-    // Step1. Save Queue Policies in Batches
+-    BatchSaveFederationQueuePoliciesRequest request =
+-        BatchSaveFederationQueuePoliciesRequest.newInstance(federationQueueWeights);
+-
+-    BatchSaveFederationQueuePoliciesResponse policiesResponse =
+-        interceptor.batchSaveFederationQueuePolicies(request);
+-
+-    assertNotNull(policiesResponse);
+-    assertNotNull(policiesResponse.getMessage());
+-    assertEquals("batch save policies success.", policiesResponse.getMessage());
+-
+-    // Step2. Delete the policy of root.c
+-    List<String> deleteQueues = new ArrayList<>();
+-    deleteQueues.add("root.c");
+-    DeleteFederationQueuePoliciesRequest deleteRequest =
+-        DeleteFederationQueuePoliciesRequest.newInstance(deleteQueues);
+-    DeleteFederationQueuePoliciesResponse deleteResponse =
+-        interceptor.deleteFederationPoliciesByQueues(deleteRequest);
+-    assertNotNull(deleteResponse);
+-    String message = deleteResponse.getMessage();
+-    assertEquals("queues = root.c delete success.", message);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
+deleted file mode 100644
+index 867c71fa82e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestRouterRMAdminService.java
++++ /dev/null
+@@ -1,278 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Map;
+-
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.AddToClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.CheckForDecommissioningNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshClusterMaxPriorityResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResourcesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RemoveFromClusterNodeLabelsResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.ReplaceLabelsOnNodeResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.UpdateNodeResourceResponse;
+-import org.apache.hadoop.yarn.server.router.rmadmin.RouterRMAdminService.RequestInterceptorChainWrapper;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Test class to validate the RMAdmin Service inside the Router.
+- */
+-public class TestRouterRMAdminService extends BaseRouterRMAdminTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterRMAdminService.class);
+-
+-  /**
+-   * Tests if the pipeline is created properly.
+-   */
+-  @Test
+-  public void testRequestInterceptorChainCreation() throws Exception {
+-    RMAdminRequestInterceptor root =
+-        super.getRouterRMAdminService().createRequestInterceptorChain();
+-    int index = 0;
+-    while (root != null) {
+-      // The current pipeline is:
+-      // PassThroughRMAdminRequestInterceptor - index = 0
+-      // PassThroughRMAdminRequestInterceptor - index = 1
+-      // PassThroughRMAdminRequestInterceptor - index = 2
+-      // MockClientRequestInterceptor - index = 3
+-      switch (index) {
+-      case 0: // Fall to the next case
+-      case 1: // Fall to the next case
+-      case 2:
+-        // If index is equal to 0,1 or 2 we fall in this check
+-        Assert.assertEquals(
+-            PassThroughRMAdminRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      case 3:
+-        Assert.assertEquals(MockRMAdminRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      default:
+-        Assert.fail();
+-      }
+-      root = root.getNextInterceptor();
+-      index++;
+-    }
+-    Assert.assertEquals("The number of interceptors in chain does not match", 4,
+-        index);
+-  }
+-
+-  /**
+-   * Test if the RouterRMAdmin forwards all the requests to the MockRM and get
+-   * back the responses.
+-   */
+-  @Test
+-  public void testRouterRMAdminServiceE2E() throws Exception {
+-
+-    String user = "test1";
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Queues");
+-
+-    RefreshQueuesResponse responseRefreshQueues = refreshQueues(user);
+-    Assert.assertNotNull(responseRefreshQueues);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Nodes");
+-
+-    RefreshNodesResponse responseRefreshNodes = refreshNodes(user);
+-    Assert.assertNotNull(responseRefreshNodes);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Super User");
+-
+-    RefreshSuperUserGroupsConfigurationResponse responseRefreshSuperUser =
+-        refreshSuperUserGroupsConfiguration(user);
+-    Assert.assertNotNull(responseRefreshSuperUser);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh User to Group");
+-
+-    RefreshUserToGroupsMappingsResponse responseRefreshUserToGroup =
+-        refreshUserToGroupsMappings(user);
+-    Assert.assertNotNull(responseRefreshUserToGroup);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Admin Acls");
+-
+-    RefreshAdminAclsResponse responseRefreshAdminAcls = refreshAdminAcls(user);
+-    Assert.assertNotNull(responseRefreshAdminAcls);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Service Acls");
+-
+-    RefreshServiceAclsResponse responseRefreshServiceAcls =
+-        refreshServiceAcls(user);
+-    Assert.assertNotNull(responseRefreshServiceAcls);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Update Node Resource");
+-
+-    UpdateNodeResourceResponse responseUpdateNodeResource =
+-        updateNodeResource(user);
+-    Assert.assertNotNull(responseUpdateNodeResource);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Nodes Resource");
+-
+-    RefreshNodesResourcesResponse responseRefreshNodesResources =
+-        refreshNodesResources(user);
+-    Assert.assertNotNull(responseRefreshNodesResources);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Add To Cluster NodeLabels");
+-
+-    AddToClusterNodeLabelsResponse responseAddToClusterNodeLabels =
+-        addToClusterNodeLabels(user);
+-    Assert.assertNotNull(responseAddToClusterNodeLabels);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Remove To Cluster NodeLabels");
+-
+-    RemoveFromClusterNodeLabelsResponse responseRemoveFromClusterNodeLabels =
+-        removeFromClusterNodeLabels(user);
+-    Assert.assertNotNull(responseRemoveFromClusterNodeLabels);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Replace Labels On Node");
+-
+-    ReplaceLabelsOnNodeResponse responseReplaceLabelsOnNode =
+-        replaceLabelsOnNode(user);
+-    Assert.assertNotNull(responseReplaceLabelsOnNode);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Check For Decommissioning Nodes");
+-
+-    CheckForDecommissioningNodesResponse responseCheckForDecom =
+-        checkForDecommissioningNodes(user);
+-    Assert.assertNotNull(responseCheckForDecom);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Refresh Cluster Max Priority");
+-
+-    RefreshClusterMaxPriorityResponse responseRefreshClusterMaxPriority =
+-        refreshClusterMaxPriority(user);
+-    Assert.assertNotNull(responseRefreshClusterMaxPriority);
+-
+-    LOG.info("testRouterRMAdminServiceE2E - Get Groups For User");
+-
+-    String[] responseGetGroupsForUser = getGroupsForUser(user);
+-    Assert.assertNotNull(responseGetGroupsForUser);
+-
+-  }
+-
+-  /**
+-   * Test if the different chains for users are generated, and LRU cache is
+-   * working as expected.
+-   */
+-  @Test
+-  public void testUsersChainMapWithLRUCache()
+-      throws IOException, InterruptedException {
+-
+-    Map<String, RequestInterceptorChainWrapper> pipelines;
+-    RequestInterceptorChainWrapper chain;
+-
+-    refreshQueues("test1");
+-    refreshQueues("test2");
+-    refreshQueues("test3");
+-    refreshQueues("test4");
+-    refreshQueues("test5");
+-    refreshQueues("test6");
+-    refreshQueues("test7");
+-    refreshQueues("test8");
+-
+-    pipelines = super.getRouterRMAdminService().getPipelines();
+-    Assert.assertEquals(8, pipelines.size());
+-
+-    refreshQueues("test9");
+-    refreshQueues("test10");
+-    refreshQueues("test1");
+-    refreshQueues("test11");
+-
+-    // The cache max size is defined in
+-    // BaseRouterClientRMTest.TEST_MAX_CACHE_SIZE
+-    Assert.assertEquals(10, pipelines.size());
+-
+-    chain = pipelines.get("test1");
+-    Assert.assertNotNull("test1 should not be evicted", chain);
+-
+-    chain = pipelines.get("test2");
+-    Assert.assertNull("test2 should have been evicted", chain);
+-  }
+-
+-  /**
+-   * This test validates if the RMAdminRequestInterceptor chain for the user
+-   * can build and init correctly when a multi-client process begins to
+-   * request RouterRMAdminService for the same user simultaneously.
+-   */
+-  @Test
+-  public void testRMAdminPipelineConcurrent() throws InterruptedException {
+-    final String user = "test1";
+-
+-    /*
+-     * ClientTestThread is a thread to simulate a client request to get a
+-     * RMAdminRequestInterceptor for the user.
+-     */
+-    class ClientTestThread extends Thread {
+-      private RMAdminRequestInterceptor interceptor;
+-      @Override public void run() {
+-        try {
+-          interceptor = pipeline();
+-        } catch (IOException | InterruptedException e) {
+-          e.printStackTrace();
+-        }
+-      }
+-      private RMAdminRequestInterceptor pipeline()
+-          throws IOException, InterruptedException {
+-        return UserGroupInformation.createRemoteUser(user).doAs(
+-            new PrivilegedExceptionAction<RMAdminRequestInterceptor>() {
+-              @Override
+-              public RMAdminRequestInterceptor run() throws Exception {
+-                RequestInterceptorChainWrapper wrapper =
+-                    getRouterRMAdminService().getInterceptorChain();
+-                RMAdminRequestInterceptor interceptor =
+-                    wrapper.getRootInterceptor();
+-                Assert.assertNotNull(interceptor);
+-                LOG.info("init rm admin interceptor success for user" + user);
+-                return interceptor;
+-              }
+-            });
+-      }
+-    }
+-
+-    /*
+-     * We start the first thread. It should not finish initing a chainWrapper
+-     * before the other thread starts. In this way, the second thread can
+-     * init at the same time of the first one. In the end, we validate that
+-     * the 2 threads get the same chainWrapper without going into error.
+-     */
+-    ClientTestThread client1 = new ClientTestThread();
+-    ClientTestThread client2 = new ClientTestThread();
+-    client1.start();
+-    client2.start();
+-    client1.join();
+-    client2.join();
+-
+-    Assert.assertNotNull(client1.interceptor);
+-    Assert.assertNotNull(client2.interceptor);
+-    Assert.assertTrue(client1.interceptor == client2.interceptor);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestableFederationRMAdminInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestableFederationRMAdminInterceptor.java
+deleted file mode 100644
+index 29d06385e4e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/rmadmin/TestableFederationRMAdminInterceptor.java
++++ /dev/null
+@@ -1,105 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.rmadmin;
+-
+-import org.apache.commons.collections.MapUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.resourcemanager.AdminService;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.net.ConnectException;
+-import java.util.Set;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_CLUSTER_ID;
+-
+-public class TestableFederationRMAdminInterceptor extends FederationRMAdminInterceptor {
+-
+-  // Record log information
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestableFederationRMAdminInterceptor.class);
+-
+-  // Used to Store the relationship between SubClusterId and RM
+-  private ConcurrentHashMap<SubClusterId, MockRM> mockRMs = new ConcurrentHashMap<>();
+-
+-  // Store Bad subCluster
+-  private Set<SubClusterId> badSubCluster = new HashSet<>();
+-
+-  @Override
+-  protected ResourceManagerAdministrationProtocol getAdminRMProxyForSubCluster(
+-      SubClusterId subClusterId) throws Exception {
+-    MockRM mockRM;
+-    synchronized (this) {
+-      if (mockRMs.containsKey(subClusterId)) {
+-        mockRM = mockRMs.get(subClusterId);
+-      } else {
+-        YarnConfiguration config = new YarnConfiguration(super.getConf());
+-        config.set(RM_CLUSTER_ID, "subcluster." + subClusterId);
+-        mockRM = new MockRM(config);
+-        if (badSubCluster.contains(subClusterId)) {
+-          return new MockRMAdminBadService(mockRM);
+-        }
+-        mockRM.init(config);
+-        mockRM.start();
+-        mockRM.registerNode("127.0.0.1:1", 102400, 100);
+-        mockRMs.put(subClusterId, mockRM);
+-      }
+-      return mockRM.getAdminService();
+-    }
+-  }
+-
+-  // This represents an unserviceable SubCluster
+-  private class MockRMAdminBadService extends AdminService {
+-    MockRMAdminBadService(ResourceManager rm) {
+-      super(rm);
+-    }
+-
+-    @Override
+-    public void refreshQueues() throws IOException, YarnException {
+-      throw new ConnectException("RM is stopped");
+-    }
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    // if mockRMs is not null
+-    if (MapUtils.isNotEmpty(mockRMs)) {
+-      for (Map.Entry<SubClusterId, MockRM> item : mockRMs.entrySet()) {
+-        SubClusterId subClusterId = item.getKey();
+-        // close mockRM.
+-        MockRM mockRM = item.getValue();
+-        if (mockRM != null) {
+-          LOG.info("subClusterId = {} mockRM shutdown.", subClusterId);
+-          mockRM.stop();
+-        }
+-      }
+-    }
+-    mockRMs.clear();
+-    super.shutdown();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/AbstractSecureRouterTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/AbstractSecureRouterTest.java
+deleted file mode 100644
+index a074689cccd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/AbstractSecureRouterTest.java
++++ /dev/null
+@@ -1,249 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.secure;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.minikdc.MiniKdc;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.TestRMRestart;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.clientrm.FederationClientInterceptor;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.concurrent.ConcurrentHashMap;
+-
+-import static org.junit.Assert.assertNull;
+-import static org.junit.Assert.assertTrue;
+-import static org.junit.Assert.assertNotNull;
+-
+-public abstract class AbstractSecureRouterTest {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(AbstractSecureRouterTest.class);
+-
+-  ////////////////////////////////
+-  // Kerberos Constants
+-  ////////////////////////////////
+-
+-  public static final String REALM = "EXAMPLE.COM";
+-  public static final String ROUTER = "router";
+-  public static final String LOCALHOST = "localhost";
+-  public static final String IP127001 = "127.0.0.1";
+-  public static final String ROUTER_LOCALHOST = "router/" + LOCALHOST;
+-  public static final String ROUTER_127001 = "router/" + IP127001;
+-  public static final String ROUTER_REALM = "router@" + REALM;
+-  public static final String ROUTER_LOCALHOST_REALM = ROUTER_LOCALHOST + "@" + REALM;
+-  public static final String SUN_SECURITY_KRB5_DEBUG = "sun.security.krb5.debug";
+-  public static final String KERBEROS = "kerberos";
+-
+-  ////////////////////////////////
+-  // BeforeSecureRouterTestClass Init
+-  ////////////////////////////////
+-
+-  private static MiniKdc kdc;
+-  private static File routerKeytab;
+-  private static File kdcWorkDir;
+-  private static Configuration conf;
+-
+-  ////////////////////////////////
+-  // Specific Constant
+-  // Like Mem, VCore, ClusterNum
+-  ////////////////////////////////
+-  private static final int NUM_SUBCLUSTER = 4;
+-  private static final int GB = 1024;
+-  private static final int NM_MEMORY = 8 * GB;
+-  private static final int NM_VCORE = 4;
+-
+-  ////////////////////////////////
+-  // Test use in subclasses
+-  ////////////////////////////////
+-
+-  private Router router = null;
+-
+-  private static ConcurrentHashMap<SubClusterId, MockRM> mockRMs =
+-      new ConcurrentHashMap<>();
+-
+-  @BeforeClass
+-  public static void beforeSecureRouterTestClass() throws Exception {
+-    // Sets up the KDC and Principals.
+-    setupKDCAndPrincipals();
+-
+-    // Init YarnConfiguration
+-    conf = new YarnConfiguration();
+-
+-    // Enable Kerberos authentication configuration
+-    conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, true);
+-    conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, KERBEROS);
+-
+-    // Router configuration
+-    conf.set(YarnConfiguration.ROUTER_BIND_HOST, "0.0.0.0");
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        FederationClientInterceptor.class.getName());
+-
+-    // Router Kerberos KeyTab configuration
+-    conf.set(YarnConfiguration.ROUTER_PRINCIPAL, ROUTER_LOCALHOST_REALM);
+-    conf.set(YarnConfiguration.ROUTER_KEYTAB, routerKeytab.getAbsolutePath());
+-
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-  }
+-
+-  /**
+-   * Sets up the KDC and Principals.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public static void setupKDCAndPrincipals() throws Exception {
+-    // set up the KDC
+-    File target = new File(System.getProperty("test.dir", "target"));
+-    kdcWorkDir = new File(target, "kdc");
+-    kdcWorkDir.mkdirs();
+-    if (!kdcWorkDir.mkdirs()) {
+-      assertTrue(kdcWorkDir.isDirectory());
+-    }
+-    Properties kdcConf = MiniKdc.createConf();
+-    kdcConf.setProperty(MiniKdc.DEBUG, "true");
+-    kdc = new MiniKdc(kdcConf, kdcWorkDir);
+-    kdc.start();
+-    routerKeytab = createKeytab(ROUTER, "router.keytab");
+-  }
+-
+-  /**
+-   * Initialize RM in safe mode.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public static void setupSecureMockRM() throws Exception {
+-    for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-      SubClusterId sc = SubClusterId.newInstance(i);
+-      if (mockRMs.containsKey(sc)) {
+-        continue;
+-      }
+-      MockRM mockRM = new TestRMRestart.TestSecurityMockRM(conf);
+-      mockRM.start();
+-      mockRM.registerNode("127.0.0.1:1234", NM_MEMORY, NM_VCORE);
+-      mockRMs.put(sc, mockRM);
+-    }
+-  }
+-
+-  /**
+-   * Create the keytab for the given principal, includes
+-   * raw principal and $principal/localhost.
+-   *
+-   * @param principal principal short name.
+-   * @param filename filename of keytab.
+-   * @return file of keytab.
+-   * @throws Exception an error occurred.
+-   */
+-  public static File createKeytab(String principal, String filename) throws Exception {
+-    assertTrue("empty principal", StringUtils.isNotBlank(principal));
+-    assertTrue("empty host", StringUtils.isNotBlank(filename));
+-    assertNotNull("null KDC", kdc);
+-    File keytab = new File(kdcWorkDir, filename);
+-    kdc.createPrincipal(keytab,
+-        principal,
+-        principal + "/localhost",
+-        principal + "/127.0.0.1");
+-    return keytab;
+-  }
+-
+-  /**
+-   * Start the router in safe mode.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public synchronized void startSecureRouter() {
+-    assertNull("Router is already running", router);
+-    MemoryFederationStateStore stateStore = new MemoryFederationStateStore();
+-    stateStore.init(getConf());
+-    FederationStateStoreFacade.getInstance(getConf()).reinitialize(stateStore, getConf());
+-    UserGroupInformation.setConfiguration(conf);
+-    router = new Router();
+-    router.init(conf);
+-    router.start();
+-  }
+-
+-  /**
+-   * Shut down the KDC service.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public static void teardownKDC() throws Exception {
+-    if (kdc != null) {
+-      kdc.stop();
+-      kdc = null;
+-    }
+-  }
+-
+-  /**
+-   * Stop the router in safe mode.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  protected synchronized void stopSecureRouter() throws Exception {
+-    if (router != null) {
+-      router.stop();
+-      router = null;
+-    }
+-  }
+-
+-  /**
+-   * Stop the entire test service.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  @AfterClass
+-  public static void afterSecureRouterTest() throws Exception {
+-    LOG.info("teardown of kdc instance.");
+-    teardownKDC();
+-    if (mockRMs != null && mockRMs.isEmpty()) {
+-      for (MockRM mockRM : mockRMs.values()) {
+-        mockRM.close();
+-      }
+-    }
+-    mockRMs.clear();
+-  }
+-
+-  public static MiniKdc getKdc() {
+-    return kdc;
+-  }
+-
+-  public Router getRouter() {
+-    return router;
+-  }
+-
+-  public static ConcurrentHashMap<SubClusterId, MockRM> getMockRMs() {
+-    return mockRMs;
+-  }
+-
+-  public static Configuration getConf() {
+-    return conf;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestRouterDelegationTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestRouterDelegationTokenSecretManager.java
+deleted file mode 100644
+index eac2c5a03ba..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestRouterDelegationTokenSecretManager.java
++++ /dev/null
+@@ -1,201 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.secure;
+-
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.security.token.delegation.DelegationKey;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.security.client.RMDelegationTokenIdentifier;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertArrayEquals;
+-
+-public class TestRouterDelegationTokenSecretManager extends AbstractSecureRouterTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterDelegationTokenSecretManager.class);
+-
+-  @Test
+-  public void testRouterStoreNewMasterKey() throws Exception {
+-    LOG.info("Test RouterDelegationTokenSecretManager: StoreNewMasterKey.");
+-
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Store NewMasterKey
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    RouterDelegationTokenSecretManager secretManager =
+-        routerClientRMService.getRouterDTSecretManager();
+-    DelegationKey storeKey = new DelegationKey(1234, 4321, "keyBytes".getBytes());
+-    secretManager.storeNewMasterKey(storeKey);
+-
+-    // Get DelegationKey
+-    DelegationKey paramKey = new DelegationKey(1234, 4321, "keyBytes".getBytes());
+-    DelegationKey responseKey = secretManager.getMasterKeyByDelegationKey(paramKey);
+-
+-    assertNotNull(paramKey);
+-    assertEquals(storeKey.getExpiryDate(), responseKey.getExpiryDate());
+-    assertEquals(storeKey.getKeyId(), responseKey.getKeyId());
+-    assertArrayEquals(storeKey.getEncodedKey(), responseKey.getEncodedKey());
+-    assertEquals(storeKey, responseKey);
+-
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterRemoveStoredMasterKey() throws Exception {
+-    LOG.info("Test RouterDelegationTokenSecretManager: RemoveStoredMasterKey.");
+-
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Store NewMasterKey
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    RouterDelegationTokenSecretManager secretManager =
+-        routerClientRMService.getRouterDTSecretManager();
+-    DelegationKey storeKey = new DelegationKey(1234, 4321, "keyBytes".getBytes());
+-    secretManager.storeNewMasterKey(storeKey);
+-
+-    // Remove DelegationKey
+-    secretManager.removeStoredMasterKey(storeKey);
+-
+-    // Get DelegationKey
+-    DelegationKey paramKey = new DelegationKey(1234, 4321, "keyBytes".getBytes());
+-    LambdaTestUtils.intercept(IOException.class,
+-        "GetMasterKey with keyID: " + storeKey.getKeyId() + " does not exist.",
+-        () -> secretManager.getMasterKeyByDelegationKey(paramKey));
+-
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterStoreNewToken() throws Exception {
+-    LOG.info("Test RouterDelegationTokenSecretManager: StoreNewToken.");
+-
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Store new rm-token
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    RouterDelegationTokenSecretManager secretManager =
+-        routerClientRMService.getRouterDTSecretManager();
+-    RMDelegationTokenIdentifier dtId1 = new RMDelegationTokenIdentifier(
+-        new Text("owner1"), new Text("renewer1"), new Text("realuser1"));
+-    int sequenceNumber = 1;
+-    dtId1.setSequenceNumber(sequenceNumber);
+-    Long renewDate1 = Time.now();
+-    secretManager.storeNewToken(dtId1, renewDate1);
+-
+-    // query rm-token
+-    RMDelegationTokenIdentifier dtId2 = new RMDelegationTokenIdentifier(
+-        new Text("owner1"), new Text("renewer1"), new Text("realuser1"));
+-    dtId2.setSequenceNumber(sequenceNumber);
+-    RMDelegationTokenIdentifier dtId3 = secretManager.getTokenByRouterStoreToken(dtId2);
+-    Assert.assertEquals(dtId1, dtId3);
+-
+-    // query rm-token2 not exists
+-    sequenceNumber++;
+-    dtId2.setSequenceNumber(2);
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "RMDelegationToken: " + dtId2 + " does not exist.",
+-        () -> secretManager.getTokenByRouterStoreToken(dtId2));
+-
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterUpdateNewToken() throws Exception {
+-    LOG.info("Test RouterDelegationTokenSecretManager: UpdateNewToken.");
+-
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Store new rm-token
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    RouterDelegationTokenSecretManager secretManager =
+-        routerClientRMService.getRouterDTSecretManager();
+-    RMDelegationTokenIdentifier dtId1 = new RMDelegationTokenIdentifier(
+-        new Text("owner1"), new Text("renewer1"), new Text("realuser1"));
+-    int sequenceNumber = 1;
+-    dtId1.setSequenceNumber(sequenceNumber);
+-    Long renewDate1 = Time.now();
+-    secretManager.storeNewToken(dtId1, renewDate1);
+-
+-    sequenceNumber++;
+-    dtId1.setSequenceNumber(sequenceNumber);
+-    secretManager.updateStoredToken(dtId1, renewDate1);
+-
+-    // query rm-token
+-    RMDelegationTokenIdentifier dtId2 = new RMDelegationTokenIdentifier(
+-        new Text("owner1"), new Text("renewer1"), new Text("realuser1"));
+-    dtId2.setSequenceNumber(sequenceNumber);
+-    RMDelegationTokenIdentifier dtId3 = secretManager.getTokenByRouterStoreToken(dtId2);
+-    assertNotNull(dtId3);
+-    assertEquals(dtId1.getKind(), dtId3.getKind());
+-    assertEquals(dtId1.getOwner(), dtId3.getOwner());
+-    assertEquals(dtId1.getRealUser(), dtId3.getRealUser());
+-    assertEquals(dtId1.getRenewer(), dtId3.getRenewer());
+-    assertEquals(dtId1.getIssueDate(), dtId3.getIssueDate());
+-    assertEquals(dtId1.getMasterKeyId(), dtId3.getMasterKeyId());
+-    assertEquals(dtId1.getSequenceNumber(), dtId3.getSequenceNumber());
+-    assertEquals(sequenceNumber, dtId3.getSequenceNumber());
+-    assertEquals(dtId1, dtId3);
+-
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterRemoveToken() throws Exception {
+-    LOG.info("Test RouterDelegationTokenSecretManager: RouterRemoveToken.");
+-
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Store new rm-token
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    RouterDelegationTokenSecretManager secretManager =
+-        routerClientRMService.getRouterDTSecretManager();
+-    RMDelegationTokenIdentifier dtId1 = new RMDelegationTokenIdentifier(
+-        new Text("owner1"), new Text("renewer1"), new Text("realuser1"));
+-    int sequenceNumber = 1;
+-    dtId1.setSequenceNumber(sequenceNumber);
+-    Long renewDate1 = Time.now();
+-    secretManager.storeNewToken(dtId1, renewDate1);
+-
+-    // Remove rm-token
+-    secretManager.removeStoredToken(dtId1);
+-
+-    // query rm-token
+-    LambdaTestUtils.intercept(YarnException.class,
+-        "RMDelegationToken: " + dtId1 + " does not exist.",
+-        () -> secretManager.getTokenByRouterStoreToken(dtId1));
+-
+-    stopSecureRouter();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestSecureLogins.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestSecureLogins.java
+deleted file mode 100644
+index 40911814c04..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/secure/TestSecureLogins.java
++++ /dev/null
+@@ -1,156 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.secure;
+-
+-import org.apache.commons.collections.MapUtils;
+-import org.apache.hadoop.service.Service;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse;
+-import org.apache.hadoop.yarn.api.records.YarnClusterMetrics;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.clientrm.FederationClientInterceptor;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.router.rmadmin.DefaultRMAdminRequestInterceptor;
+-import org.apache.hadoop.yarn.server.router.rmadmin.RouterRMAdminService;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.List;
+-import java.util.Map;
+-
+-public class TestSecureLogins extends AbstractSecureRouterTest {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestSecureLogins.class);
+-
+-  @Test
+-  public void testHasRealm() throws Throwable {
+-    Assert.assertNotNull(getRealm());
+-    LOG.info("Router principal = {}", getPrincipalAndRealm(ROUTER_LOCALHOST));
+-  }
+-
+-  @Test
+-  public void testRouterSecureLogin() throws Exception {
+-    startSecureRouter();
+-
+-    List<Service> services = this.getRouter().getServices();
+-    Assert.assertNotNull(services);
+-    Assert.assertEquals(3, services.size());
+-
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterClientRMService() throws Exception {
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Start RM and RouterClientRMService in Secure mode
+-    setupSecureMockRM();
+-    initRouterClientRMService();
+-
+-    // Test the simple rpc call of the Router in the Secure environment
+-    RouterClientRMService routerClientRMService = this.getRouter().getClientRMProxyService();
+-    GetClusterMetricsRequest metricsRequest = GetClusterMetricsRequest.newInstance();
+-    GetClusterMetricsResponse metricsResponse =
+-        routerClientRMService.getClusterMetrics(metricsRequest);
+-    Assert.assertNotNull(metricsResponse);
+-    YarnClusterMetrics clusterMetrics = metricsResponse.getClusterMetrics();
+-    Assert.assertEquals(4, clusterMetrics.getNumNodeManagers());
+-    Assert.assertEquals(0, clusterMetrics.getNumLostNodeManagers());
+-
+-    // Stop the Router in Secure Mode
+-    stopSecureRouter();
+-  }
+-
+-  @Test
+-  public void testRouterRMAdminService() throws Exception {
+-    // Start the Router in Secure Mode
+-    startSecureRouter();
+-
+-    // Start RM and RouterClientRMService in Secure mode
+-    setupSecureMockRM();
+-    initRouterRMAdminService();
+-
+-    // Test the simple rpc call of the Router in the Secure environment
+-    RouterRMAdminService routerRMAdminService = this.getRouter().getRmAdminProxyService();
+-    RefreshNodesRequest refreshNodesRequest = RefreshNodesRequest.newInstance();
+-    RefreshNodesResponse refreshNodesResponse =
+-        routerRMAdminService.refreshNodes(refreshNodesRequest);
+-    Assert.assertNotNull(refreshNodesResponse);
+-
+-    // Stop the Router in Secure Mode
+-    stopSecureRouter();
+-  }
+-
+-  public static String getPrincipalAndRealm(String principal) {
+-    return principal + "@" + getRealm();
+-  }
+-
+-  protected static String getRealm() {
+-    return getKdc().getRealm();
+-  }
+-
+-  private void initRouterClientRMService() throws Exception {
+-    Router router = this.getRouter();
+-    Map<SubClusterId, MockRM> mockRMs = getMockRMs();
+-
+-    RouterClientRMService rmService = router.getClientRMProxyService();
+-    RouterClientRMService.RequestInterceptorChainWrapper wrapper = rmService.getInterceptorChain();
+-    FederationClientInterceptor interceptor =
+-        (FederationClientInterceptor) wrapper.getRootInterceptor();
+-    FederationStateStoreFacade stateStoreFacade = interceptor.getFederationFacade();
+-    FederationStateStore stateStore = stateStoreFacade.getStateStore();
+-    FederationStateStoreTestUtil stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-    Map<SubClusterId, ApplicationClientProtocol> clientRMProxies = interceptor.getClientRMProxies();
+-
+-    if (MapUtils.isNotEmpty(mockRMs)) {
+-      for (Map.Entry<SubClusterId, MockRM> entry : mockRMs.entrySet()) {
+-        SubClusterId sc = entry.getKey();
+-        MockRM mockRM = entry.getValue();
+-        stateStoreUtil.registerSubCluster(sc);
+-        if (clientRMProxies.containsKey(sc)) {
+-          continue;
+-        }
+-        clientRMProxies.put(sc, mockRM.getClientRMService());
+-      }
+-    }
+-  }
+-
+-  private void initRouterRMAdminService() throws Exception {
+-    Router router = this.getRouter();
+-    Map<SubClusterId, MockRM> mockRMs = getMockRMs();
+-    SubClusterId sc = SubClusterId.newInstance(0);
+-    MockRM mockRM = mockRMs.get(sc);
+-    RouterRMAdminService routerRMAdminService = router.getRmAdminProxyService();
+-    RouterRMAdminService.RequestInterceptorChainWrapper rmAdminChainWrapper =
+-        routerRMAdminService.getInterceptorChain();
+-    DefaultRMAdminRequestInterceptor rmInterceptor =
+-        (DefaultRMAdminRequestInterceptor) rmAdminChainWrapper.getRootInterceptor();
+-    rmInterceptor.setRMAdmin(mockRM.getAdminService());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java
+deleted file mode 100644
+index 71034558687..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestFederationSubCluster.java
++++ /dev/null
+@@ -1,345 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.subcluster;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource;
+-import org.apache.commons.collections.CollectionUtils;
+-import org.apache.curator.framework.CuratorFramework;
+-import org.apache.curator.framework.CuratorFrameworkFactory;
+-import org.apache.curator.framework.state.ConnectionState;
+-import org.apache.curator.retry.RetryNTimes;
+-import org.apache.curator.test.TestingServer;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.io.retry.RetryPolicy;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClustersInfoRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClustersInfoResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.HTTPMethods;
+-import org.apache.hadoop.yarn.server.router.webapp.JavaProcess;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.concurrent.TimeoutException;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_OK;
+-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_NEW_APPLICATION;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.ADD_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.router.webapp.TestRouterWebServicesREST.waitWebAppRunning;
+-import static org.junit.Assert.assertEquals;
+-
+-public class TestFederationSubCluster {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestFederationSubCluster.class);
+-  private static TestingServer curatorTestingServer;
+-  private static CuratorFramework curatorFramework;
+-  private static JavaProcess subCluster1;
+-  private static JavaProcess subCluster2;
+-  private static JavaProcess router;
+-  public static final String ZK_FEDERATION_STATESTORE =
+-      "org.apache.hadoop.yarn.server.federation.store.impl.ZookeeperFederationStateStore";
+-  private static String userName = "test";
+-
+-  public void startFederationSubCluster(int zkPort, String sc1Param,
+-      String sc2Param, String routerParam) throws IOException, InterruptedException,
+-      YarnException, TimeoutException {
+-
+-    // Step1. Initialize ZK's service.
+-    try {
+-      curatorTestingServer = new TestingServer(zkPort);
+-      curatorTestingServer.start();
+-      String connectString = curatorTestingServer.getConnectString();
+-      curatorFramework = CuratorFrameworkFactory.builder()
+-          .connectString(connectString)
+-          .retryPolicy(new RetryNTimes(100, 100))
+-          .build();
+-      curatorFramework.start();
+-      curatorFramework.getConnectionStateListenable().addListener((client, newState) -> {
+-        if (newState == ConnectionState.CONNECTED) {
+-          System.out.println("Connected to the ZooKeeper server!");
+-        }
+-      });
+-    } catch (Exception e) {
+-      LOG.error("Cannot initialize ZooKeeper store.", e);
+-      throw new IOException(e);
+-    }
+-
+-    // Step2. Create a temporary directory output log.
+-    File baseDir = GenericTestUtils.getTestDir("processes");
+-    baseDir.mkdirs();
+-    String baseName = TestFederationSubCluster.class.getSimpleName();
+-
+-    // Step3. Initialize subCluster SC-1
+-    String sc1WebAddress = getSCWebAddress(sc1Param);
+-    File rmOutput = new File(baseDir, baseName + "-" + Time.now() + "-rm.log");
+-    rmOutput.createNewFile();
+-    List<String> addClasspath = new LinkedList<>();
+-    addClasspath.add("../hadoop-yarn-server-timelineservice/target/classes");
+-    subCluster1 = new JavaProcess(TestMockSubCluster.class, addClasspath, rmOutput, sc1Param);
+-    waitWebAppRunning(sc1WebAddress, RM_WEB_SERVICE_PATH);
+-
+-    // Step4. Initialize subCluster SC-2
+-    String sc2WebAddress = getSCWebAddress(sc2Param);
+-    File rmOutput2 = new File(baseDir, baseName + "-" + Time.now() + "-rm.log");
+-    rmOutput2.createNewFile();
+-    List<String> addClasspath2 = new LinkedList<>();
+-    addClasspath2.add("../hadoop-yarn-server-timelineservice/target/classes");
+-    subCluster2 = new JavaProcess(TestMockSubCluster.class, addClasspath2, rmOutput2, sc2Param);
+-    waitWebAppRunning(sc2WebAddress, RM_WEB_SERVICE_PATH);
+-
+-    // Step5. Confirm that subClusters have been registered to ZK.
+-    String zkAddress = getZkAddress(zkPort);
+-    verifyRegistration(zkAddress);
+-
+-    // Step6. Initialize router
+-    String routerWebAddress = getRouterWebAddress(routerParam);
+-    File routerOutput = new File(baseDir, baseName + "-" + Time.now() + "-router.log");
+-    routerOutput.createNewFile();
+-    router = new JavaProcess(TestMockRouter.class, null, routerOutput, routerParam);
+-    waitWebAppRunning(routerWebAddress, RM_WEB_SERVICE_PATH);
+-  }
+-
+-  private String getSCWebAddress(String scParam) {
+-    String[] scParams = scParam.split(",");
+-    return "http://localhost:" + scParams[3];
+-  }
+-
+-  private String getRouterWebAddress(String routerParam) {
+-    String[] routerParams = routerParam.split(",");
+-    return "http://localhost:" + routerParams[2];
+-  }
+-
+-  private String getZkAddress(int port) {
+-    return "localhost:" + port;
+-  }
+-
+-  public void stop() throws Exception {
+-    if (subCluster1 != null) {
+-      subCluster1.stop();
+-    }
+-    if (subCluster2 != null) {
+-      subCluster2.stop();
+-    }
+-    if (router != null) {
+-      router.stop();
+-    }
+-    if (curatorTestingServer != null) {
+-      curatorTestingServer.stop();
+-    }
+-  }
+-
+-  private void verifyRegistration(String zkAddress)
+-      throws YarnException, InterruptedException, TimeoutException {
+-    Configuration conf = new Configuration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    conf.set(YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS, ZK_FEDERATION_STATESTORE);
+-    conf.set(CommonConfigurationKeys.ZK_ADDRESS, zkAddress);
+-    RetryPolicy retryPolicy = FederationStateStoreFacade.createRetryPolicy(conf);
+-    FederationStateStore stateStore = (FederationStateStore)
+-        FederationStateStoreFacade.createRetryInstance(conf,
+-        YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS,
+-        YarnConfiguration.DEFAULT_FEDERATION_STATESTORE_CLIENT_CLASS,
+-        FederationStateStore.class, retryPolicy);
+-    stateStore.init(conf);
+-    FederationStateStoreFacade.getInstance().reinitialize(stateStore, conf);
+-    GetSubClustersInfoRequest request = GetSubClustersInfoRequest.newInstance(true);
+-
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        GetSubClustersInfoResponse response = stateStore.getSubClusters(request);
+-        List<SubClusterInfo> subClusters = response.getSubClusters();
+-        if (CollectionUtils.isNotEmpty(subClusters)) {
+-          return true;
+-        }
+-      } catch (Exception e) {
+-      }
+-      return false;
+-    }, 5000, 50 * 1000);
+-  }
+-
+-  public static <T> T performGetCalls(final String routerAddress, final String path,
+-       final Class<T> returnType, final String queryName,
+-       final String queryValue) throws IOException, InterruptedException {
+-
+-    Client clientToRouter = Client.create();
+-    clientToRouter.setReadTimeout(5000);
+-    clientToRouter.setConnectTimeout(5000);
+-    WebResource toRouter = clientToRouter.resource(routerAddress).path(path);
+-
+-    final WebResource.Builder toRouterBuilder;
+-
+-    if (queryValue != null && queryName != null) {
+-      toRouterBuilder = toRouter.queryParam(queryName, queryValue).accept(APPLICATION_XML);
+-    } else {
+-      toRouterBuilder = toRouter.accept(APPLICATION_XML);
+-    }
+-
+-    return UserGroupInformation.createRemoteUser(userName).doAs(
+-        (PrivilegedExceptionAction<T>) () -> {
+-          ClientResponse response = toRouterBuilder.get(ClientResponse.class);
+-          assertEquals(SC_OK, response.getStatus());
+-          return response.getEntity(returnType);
+-        });
+-  }
+-
+-  public static ClientResponse performCall(final String routerAddress, final String webAddress,
+-      final String queryKey, final String queryValue, final Object context,
+-      final HTTPMethods method) throws IOException, InterruptedException {
+-
+-    return UserGroupInformation.createRemoteUser(userName).doAs(
+-        (PrivilegedExceptionAction<ClientResponse>) () -> {
+-          Client clientToRouter = Client.create();
+-          WebResource toRouter = clientToRouter.resource(routerAddress).path(webAddress);
+-
+-          WebResource toRouterWR = toRouter;
+-          if (queryKey != null && queryValue != null) {
+-            toRouterWR = toRouterWR.queryParam(queryKey, queryValue);
+-          }
+-
+-          WebResource.Builder builder;
+-          if (context != null) {
+-            builder = toRouterWR.entity(context, APPLICATION_JSON);
+-            builder = builder.accept(APPLICATION_JSON);
+-          } else {
+-            builder = toRouterWR.accept(APPLICATION_JSON);
+-          }
+-
+-          ClientResponse response = null;
+-
+-          switch (method) {
+-            case DELETE:
+-              response = builder.delete(ClientResponse.class);
+-              break;
+-            case POST:
+-              response = builder.post(ClientResponse.class);
+-              break;
+-            case PUT:
+-              response = builder.put(ClientResponse.class);
+-              break;
+-            default:
+-              break;
+-          }
+-
+-          return response;
+-      });
+-  }
+-
+-  public String getNodeId(String rmAddress) {
+-    Client clientToRM = Client.create();
+-    clientToRM.setConnectTimeout(3000);
+-    clientToRM.setReadTimeout(3000);
+-    WebResource toRM = clientToRM.resource(rmAddress).path(RM_WEB_SERVICE_PATH + NODES);
+-    ClientResponse response =
+-        toRM.accept(APPLICATION_XML).get(ClientResponse.class);
+-    NodesInfo ci = response.getEntity(NodesInfo.class);
+-    List<NodeInfo> nodes = ci.getNodes();
+-    if (nodes.isEmpty()) {
+-      return null;
+-    }
+-    clientToRM.destroy();
+-    return nodes.get(0).getNodeId();
+-  }
+-
+-  public NewApplication getNewApplicationId(String routerAddress) {
+-    Client clientToRM = Client.create();
+-    clientToRM.setConnectTimeout(3000);
+-    clientToRM.setReadTimeout(3000);
+-    WebResource toRM = clientToRM.resource(routerAddress).path(
+-        RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION);
+-    ClientResponse response = toRM.accept(APPLICATION_XML).post(ClientResponse.class);
+-    clientToRM.destroy();
+-    return response.getEntity(NewApplication.class);
+-  }
+-
+-  public String submitApplication(String routerAddress) {
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    String appId = getNewApplicationId(routerAddress).getApplicationId();
+-    context.setApplicationId(appId);
+-    Client clientToRouter = Client.create();
+-    clientToRouter.setConnectTimeout(3000);
+-    clientToRouter.setReadTimeout(3000);
+-    WebResource toRM = clientToRouter.resource(routerAddress).path(
+-        RM_WEB_SERVICE_PATH + APPS);
+-    toRM.entity(context, APPLICATION_XML).accept(APPLICATION_XML).post(ClientResponse.class);
+-    clientToRouter.destroy();
+-    return appId;
+-  }
+-
+-  public NewReservation getNewReservationId(String routerAddress) {
+-    Client clientToRM = Client.create();
+-    clientToRM.setConnectTimeout(3000);
+-    clientToRM.setReadTimeout(3000);
+-    WebResource toRM = clientToRM.resource(routerAddress).
+-        path(RM_WEB_SERVICE_PATH + RESERVATION_NEW);
+-    ClientResponse response = toRM.accept(APPLICATION_XML).post(ClientResponse.class);
+-    return response.getEntity(NewReservation.class);
+-  }
+-
+-  public String addNodeLabel(String routerAddress) {
+-    Client clientToRM = Client.create();
+-    clientToRM.setConnectTimeout(3000);
+-    clientToRM.setReadTimeout(3000);
+-    WebResource toRM = clientToRM.resource(routerAddress)
+-        .path(RM_WEB_SERVICE_PATH + ADD_NODE_LABELS);
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(NodeLabel.newInstance("default"));
+-    NodeLabelsInfo context = new NodeLabelsInfo(nodeLabels);
+-    ClientResponse response = toRM
+-        .entity(context, APPLICATION_XML)
+-        .accept(APPLICATION_XML)
+-        .post(ClientResponse.class);
+-    return response.getEntity(String.class);
+-  }
+-
+-  public static String format(String format, Object... args) {
+-    Pattern p = Pattern.compile("\\{.*?}");
+-    Matcher m = p.matcher(format);
+-    String newFormat = m.replaceAll("%s");
+-    return String.format(newFormat, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockRouter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockRouter.java
+deleted file mode 100644
+index 751a3fed648..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockRouter.java
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.subcluster;
+-
+-import org.apache.commons.lang3.ArrayUtils;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.io.retry.RetryPolicy;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Tests {@link Router}.
+- */
+-public class TestMockRouter {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestMockRouter.class);
+-
+-  public TestMockRouter() {
+-  }
+-
+-  public static void main(String[] args) throws YarnException {
+-    if (ArrayUtils.isEmpty(args)) {
+-      return;
+-    }
+-
+-    // Step1. Parse the parameters.
+-    String[] params = args[0].split(",");
+-    int pRouterClientRMPort = Integer.parseInt(params[0]);
+-    int pRouterAdminAddressPort = Integer.parseInt(params[1]);
+-    int pRouterWebAddressPort = Integer.parseInt(params[2]);
+-    String zkAddress = params[3];
+-
+-    LOG.info("routerClientRMPort={}, routerAdminAddressPort={}, routerWebAddressPort={}, " +
+-        "zkAddress = {}.", pRouterClientRMPort, pRouterAdminAddressPort,
+-        pRouterWebAddressPort, zkAddress);
+-
+-    YarnConfiguration conf = new YarnConfiguration();
+-    Router router = new Router();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    conf.set(YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS,
+-        "org.apache.hadoop.yarn.server.federation.store.impl.ZookeeperFederationStateStore");
+-    conf.set(YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE,
+-        "org.apache.hadoop.yarn.server.router.webapp.FederationInterceptorREST");
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        "org.apache.hadoop.yarn.server.router.clientrm.FederationClientInterceptor");
+-    conf.set(CommonConfigurationKeys.ZK_ADDRESS, zkAddress);
+-    conf.set(YarnConfiguration.ROUTER_RMADMIN_INTERCEPTOR_CLASS_PIPELINE,
+-        "org.apache.hadoop.yarn.server.router.rmadmin.FederationRMAdminInterceptor");
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, -1);
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_ADDRESS, getHostNameAndPort(pRouterClientRMPort));
+-    conf.set(YarnConfiguration.ROUTER_RMADMIN_ADDRESS, getHostNameAndPort(pRouterAdminAddressPort));
+-    conf.set(YarnConfiguration.ROUTER_WEBAPP_ADDRESS,
+-        getHostNameAndPort(pRouterWebAddressPort));
+-
+-    RetryPolicy retryPolicy = FederationStateStoreFacade.createRetryPolicy(conf);
+-
+-    router.init(conf);
+-    router.start();
+-
+-    FederationStateStore stateStore = (FederationStateStore)
+-        FederationStateStoreFacade.createRetryInstance(conf,
+-        YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS,
+-        YarnConfiguration.DEFAULT_FEDERATION_STATESTORE_CLIENT_CLASS,
+-        FederationStateStore.class, retryPolicy);
+-    stateStore.init(conf);
+-    FederationStateStoreFacade.getInstance().reinitialize(stateStore, conf);
+-  }
+-
+-  private static String getHostNameAndPort(int port) {
+-    return MiniYARNCluster.getHostname() + ":" + port;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockSubCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockSubCluster.java
+deleted file mode 100644
+index 00227ae9ffc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/TestMockSubCluster.java
++++ /dev/null
+@@ -1,100 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.subcluster;
+-
+-import org.apache.commons.lang3.ArrayUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.ZK_FEDERATION_STATESTORE;
+-
+-public class TestMockSubCluster {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestMockSubCluster.class);
+-  private Configuration conf;
+-  private String subClusterId;
+-
+-  public TestMockSubCluster() {
+-  }
+-
+-  public TestMockSubCluster(String pSubClusterId, Configuration pConf) {
+-    this.conf = pConf;
+-    this.subClusterId = pSubClusterId;
+-  }
+-
+-  private static String getHostNameAndPort(int port) {
+-    return MiniYARNCluster.getHostname() + ":" + port;
+-  }
+-
+-  public void startYarnSubCluster() {
+-    MiniYARNCluster yrCluster = new MiniYARNCluster(subClusterId, 3, 1, 1, false);
+-    yrCluster.init(conf);
+-    yrCluster.start();
+-  }
+-
+-  public static void main(String[] args) {
+-    if (ArrayUtils.isEmpty(args)) {
+-      return;
+-    }
+-
+-    // Step1. Parse the parameters.
+-    String[] params = args[0].split(",");
+-    int pRmAddressPort = Integer.parseInt(params[0]);
+-    int pRmSchedulerAddressPort = Integer.parseInt(params[1]);
+-    int pRmTrackerAddressPort = Integer.parseInt(params[2]);
+-    int pRmWebAddressPort = Integer.parseInt(params[3]);
+-    int pRmAdminAddressPort = Integer.parseInt(params[4]);
+-    String pSubClusterId = params[5];
+-    String pZkAddress = params[6];
+-    String schedulerType = params[7];
+-
+-    // Step 2. Print the parameters.
+-    LOG.info("subClusterId = {}, rmAddressPort = {}, rmSchedulerAddressPort = {}, " +
+-        "rmTrackerAddressPort = {}, rmWebAddressPort = {}, rmAdminAddressPort = {}",
+-        pSubClusterId, pRmAddressPort, pRmSchedulerAddressPort, pRmTrackerAddressPort,
+-        pRmWebAddressPort, pRmAdminAddressPort);
+-
+-    // Step 3. determine which scheduler to use.
+-    Configuration conf = new YarnConfiguration();
+-    conf.set(YarnConfiguration.RM_ADDRESS, getHostNameAndPort(pRmAddressPort));
+-    conf.set(YarnConfiguration.RM_ADMIN_ADDRESS, getHostNameAndPort(pRmAdminAddressPort));
+-    conf.set(YarnConfiguration.RM_HOSTNAME, MiniYARNCluster.getHostname());
+-    conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, getHostNameAndPort(pRmSchedulerAddressPort));
+-    conf.set(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
+-        getHostNameAndPort(pRmTrackerAddressPort));
+-    conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, getHostNameAndPort(pRmWebAddressPort));
+-    conf.setBoolean(YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS, true);
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    conf.set(YarnConfiguration.FEDERATION_STATESTORE_CLIENT_CLASS, ZK_FEDERATION_STATESTORE);
+-    conf.set(CommonConfigurationKeys.ZK_ADDRESS, pZkAddress);
+-    conf.set(YarnConfiguration.RM_CLUSTER_ID, pSubClusterId);
+-    if (schedulerType.equals("fair-scheduler")) {
+-      conf.set("yarn.resourcemanager.scheduler.class",
+-          "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler");
+-      conf.set("yarn.scheduler.fair.allocation.file", "fair-scheduler.xml");
+-    }
+-
+-    // Step 4, start the mockSubCluster cluster.
+-    TestMockSubCluster sc = new TestMockSubCluster(pSubClusterId, conf);
+-    sc.startYarnSubCluster();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java
+deleted file mode 100644
+index 9fc4b5fd036..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/capacity/TestYarnFederationWithCapacityScheduler.java
++++ /dev/null
+@@ -1,615 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.subcluster.capacity;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
+-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+-import com.sun.jersey.api.client.ClientResponse;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationSchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppInfo;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.concurrent.TimeoutException;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_OK;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.INFO;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.CLUSTER_USER_INFO;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.METRICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.STATES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER_ACTIVITIES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_NEW_APPLICATION;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APP_STATISTICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_STATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_PRIORITY;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_QUEUE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_SUBMIT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_UPDATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_DELETE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID_GETLABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABEL_MAPPINGS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.ADD_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REMOVE_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REPLACE_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.format;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.PUT;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-public class TestYarnFederationWithCapacityScheduler {
+-
+-  private static TestFederationSubCluster testFederationSubCluster;
+-  private static Set<String> subClusters;
+-  private static final String ROUTER_WEB_ADDRESS = "http://localhost:18089";
+-  private static final String SC1_RM_WEB_ADDRESS = "http://localhost:18088";
+-  private static final String SC2_RM_WEB_ADDRESS = "http://localhost:28088";
+-
+-  @BeforeClass
+-  public static void setUp()
+-      throws IOException, InterruptedException, YarnException, TimeoutException {
+-    testFederationSubCluster = new TestFederationSubCluster();
+-    testFederationSubCluster.startFederationSubCluster(2181,
+-        "18032,18030,18031,18088,18033,SC-1,127.0.0.1:2181,capacity-scheduler",
+-        "28032,28030,28031,28088,28033,SC-2,127.0.0.1:2181,capacity-scheduler",
+-        "18050,18052,18089,127.0.0.1:2181");
+-    subClusters = Sets.newHashSet();
+-    subClusters.add("SC-1");
+-    subClusters.add("SC-2");
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws Exception {
+-    testFederationSubCluster.stop();
+-  }
+-
+-  @Test
+-  public void testGetClusterInfo() throws InterruptedException, IOException {
+-    FederationClusterInfo federationClusterInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH,
+-        FederationClusterInfo.class, null, null);
+-    List<ClusterInfo> clusterInfos = federationClusterInfo.getList();
+-    assertNotNull(clusterInfos);
+-    assertEquals(2, clusterInfos.size());
+-    for (ClusterInfo clusterInfo : clusterInfos) {
+-      assertNotNull(clusterInfo);
+-      assertTrue(subClusters.contains(clusterInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testInfo() throws InterruptedException, IOException {
+-    FederationClusterInfo federationClusterInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + INFO,
+-        FederationClusterInfo.class, null, null);
+-    List<ClusterInfo> clusterInfos = federationClusterInfo.getList();
+-    assertNotNull(clusterInfos);
+-    assertEquals(2, clusterInfos.size());
+-    for (ClusterInfo clusterInfo : clusterInfos) {
+-      assertNotNull(clusterInfo);
+-      assertTrue(subClusters.contains(clusterInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testClusterUserInfo() throws Exception {
+-    FederationClusterUserInfo federationClusterUserInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + CLUSTER_USER_INFO,
+-        FederationClusterUserInfo.class, null, null);
+-    List<ClusterUserInfo> clusterUserInfos = federationClusterUserInfo.getList();
+-    assertNotNull(clusterUserInfos);
+-    assertEquals(2, clusterUserInfos.size());
+-    for (ClusterUserInfo clusterUserInfo : clusterUserInfos) {
+-      assertNotNull(clusterUserInfo);
+-      assertTrue(subClusters.contains(clusterUserInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testMetricsInfo() throws Exception {
+-    // It takes time to start the sub-cluster.
+-    // We need to wait for the sub-cluster to be completely started,
+-    // so we need to set the waiting time.
+-    // The resources of the two sub-clusters we registered are 24C and 12G,
+-    // so the resources that the Router should collect are 48C and 24G.
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ClusterMetricsInfo clusterMetricsInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + METRICS, ClusterMetricsInfo.class, null, null);
+-        assertNotNull(clusterMetricsInfo);
+-        return (48 == clusterMetricsInfo.getTotalVirtualCores() &&
+-            24576 == clusterMetricsInfo.getTotalMB());
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testSchedulerInfo() throws Exception {
+-    FederationSchedulerTypeInfo schedulerTypeInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + SCHEDULER, FederationSchedulerTypeInfo.class, null, null);
+-    assertNotNull(schedulerTypeInfo);
+-    List<SchedulerTypeInfo> schedulerTypeInfos = schedulerTypeInfo.getList();
+-    assertNotNull(schedulerTypeInfos);
+-    assertEquals(2, schedulerTypeInfos.size());
+-    for (SchedulerTypeInfo schedulerTypeInfoItem : schedulerTypeInfos) {
+-      assertNotNull(schedulerTypeInfoItem);
+-      assertTrue(subClusters.contains(schedulerTypeInfoItem.getSubClusterId()));
+-      CapacitySchedulerInfo schedulerInfo =
+-          (CapacitySchedulerInfo) schedulerTypeInfoItem.getSchedulerInfo();
+-      assertNotNull(schedulerInfo);
+-      assertEquals(3, schedulerInfo.getQueues().getQueueInfoList().size());
+-    }
+-  }
+-
+-  @Test
+-  public void testNodesEmpty() throws Exception {
+-    // We are in 2 sub-clusters, each with 3 nodes, so our Router should correspond to 6 nodes.
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        NodesInfo nodesInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, null, null);
+-        assertNotNull(nodesInfo);
+-        ArrayList<NodeInfo> nodes = nodesInfo.getNodes();
+-        assertNotNull(nodes);
+-        return (6 == nodes.size());
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testNodesLost() throws Exception {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        NodesInfo nodesInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, STATES, "LOST");
+-        assertNotNull(nodesInfo);
+-        ArrayList<NodeInfo> nodes = nodesInfo.getNodes();
+-        assertNotNull(nodes);
+-        return nodes.isEmpty();
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testNode() throws Exception {
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-    NodeInfo nodeInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
+-        NodeInfo.class, null, null);
+-    assertNotNull(nodeInfo);
+-    assertEquals(rm1NodeId, nodeInfo.getNodeId());
+-
+-    String rm2NodeId = testFederationSubCluster.getNodeId(SC2_RM_WEB_ADDRESS);
+-    NodeInfo nodeInfo2 =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm2NodeId),
+-        NodeInfo.class, null, null);
+-    assertNotNull(nodeInfo2);
+-    assertEquals(rm2NodeId, nodeInfo2.getNodeId());
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResource() throws Exception {
+-    // wait until a node shows up and check the resources
+-    GenericTestUtils.waitFor(() -> testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS) != null,
+-         100, 5 * 1000);
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-
+-    // assert memory and default vcores
+-    NodeInfo nodeInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
+-        NodeInfo.class, null, null);
+-    assertEquals(4096, nodeInfo.getTotalResource().getMemorySize());
+-    assertEquals(8, nodeInfo.getTotalResource().getvCores());
+-  }
+-
+-  @Test
+-  public void testActivies() throws Exception {
+-    // wait until a node shows up and check the resources
+-    GenericTestUtils.waitFor(() -> testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS) != null,
+-        100, 5 * 1000);
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-
+-    ActivitiesInfo activitiesInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + SCHEDULER_ACTIVITIES, ActivitiesInfo.class, "nodeId", rm1NodeId);
+-
+-    assertNotNull(activitiesInfo);
+-    assertEquals(rm1NodeId, activitiesInfo.getNodeId());
+-  }
+-
+-  @Test
+-  public void testAppActivitiesXML() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppActivitiesInfo appActivitiesInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + "/scheduler/app-activities/" + appId,
+-        AppActivitiesInfo.class, null, null);
+-    assertNotNull(appActivitiesInfo);
+-    assertEquals(appId, appActivitiesInfo.getApplicationId());
+-  }
+-
+-  @Test
+-  public void testAppStatistics() throws Exception {
+-    ApplicationStatisticsInfo applicationStatisticsInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APP_STATISTICS, ApplicationStatisticsInfo.class, STATES, "RUNNING");
+-    assertNotNull(applicationStatisticsInfo);
+-    ArrayList<StatisticsItemInfo> statItems = applicationStatisticsInfo.getStatItems();
+-    assertNotNull(statItems);
+-    assertEquals(1, statItems.size());
+-  }
+-
+-  @Test
+-  public void testNewApplication() throws Exception {
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION, null,
+-        null, null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    NewApplication ci = response.getEntity(NewApplication.class);
+-    assertNotNull(ci);
+-  }
+-
+-  @Test
+-  public void testSubmitApplicationXML() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-  }
+-
+-  @Test
+-  public void testApps() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppsInfo appsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APPS, AppsInfo.class, null, null);
+-    assertNotNull(appsInfo);
+-    assertEquals(1, appsInfo.getApps().size());
+-  }
+-
+-  @Test
+-  public void testApp() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppInfo appInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID, appId),
+-        AppInfo.class, null, null);
+-    assertNotNull(appInfo);
+-  }
+-
+-  @Test
+-  public void testAppAttempt() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppAttemptsInfo appAttemptsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_APPATTEMPTS, appId),
+-        AppAttemptsInfo.class, null, null);
+-    assertNotNull(appAttemptsInfo);
+-    ArrayList<AppAttemptInfo> attempts = appAttemptsInfo.getAttempts();
+-    assertNotNull(attempts);
+-    assertEquals(1, attempts.size());
+-  }
+-
+-  @Test
+-  public void testAppState() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppState appState = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId),
+-         AppState.class, null, null);
+-    assertNotNull(appState);
+-    String state = appState.getState();
+-    assertNotNull(state);
+-    assertEquals("ACCEPTED", state);
+-  }
+-
+-  @Test
+-  public void testUpdateAppState() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppState appState = new AppState("KILLED");
+-    String pathApp = RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        pathApp, null, null, appState, PUT);
+-    assertNotNull(response);
+-    assertEquals(SC_ACCEPTED, response.getStatus());
+-    AppState appState1 = response.getEntity(AppState.class);
+-    assertNotNull(appState1);
+-    assertNotNull(appState1.getState());
+-    assertEquals("KILLING", appState1.getState());
+-  }
+-
+-  @Test
+-  public void testAppPriority() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppPriority appPriority = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        AppPriority.class, null, null);
+-    assertNotNull(appPriority);
+-    assertEquals(-1, appPriority.getPriority());
+-  }
+-
+-  @Test
+-  public void testUpdateAppPriority() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppPriority appPriority = new AppPriority(1);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        null, null, appPriority, PUT);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    AppPriority ci = response.getEntity(AppPriority.class);
+-    assertNotNull(ci);
+-    assertNotNull(ci.getPriority());
+-    assertEquals(1, ci.getPriority());
+-  }
+-
+-  @Test
+-  public void testAppQueue() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppQueue appQueue = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        AppQueue.class, null, null);
+-    assertNotNull(appQueue);
+-    String queue = appQueue.getQueue();
+-    assertEquals("root.default", queue);
+-  }
+-
+-  @Test
+-  public void testUpdateAppQueue() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppQueue appQueue = new AppQueue("root.default");
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        null, null, appQueue, PUT);
+-    assertEquals(SC_OK, response.getStatus());
+-    AppQueue appQueue1 = response.getEntity(AppQueue.class);
+-    assertNotNull(appQueue1);
+-    String queue1 = appQueue1.getQueue();
+-    assertEquals("root.default", queue1);
+-  }
+-
+-  @Test
+-  public void testAppTimeouts() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppTimeoutsInfo appTimeoutsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId),
+-        AppTimeoutsInfo.class, null, null);
+-    assertNotNull(appTimeoutsInfo);
+-    ArrayList<AppTimeoutInfo> appTimeouts = appTimeoutsInfo.getAppTimeouts();
+-    assertNotNull(appTimeouts);
+-    assertEquals(1, appTimeouts.size());
+-    AppTimeoutInfo appTimeoutInfo = appTimeouts.get(0);
+-    assertNotNull(appTimeoutInfo);
+-    assertEquals(ApplicationTimeoutType.LIFETIME, appTimeoutInfo.getTimeoutType());
+-    assertEquals("UNLIMITED", appTimeoutInfo.getExpireTime());
+-  }
+-
+-  @Test
+-  public void testAppTimeout() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    String pathApp = RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId);
+-    AppTimeoutInfo appTimeoutInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        pathApp + "/" + "LIFETIME", AppTimeoutInfo.class, null, null);
+-    assertNotNull(appTimeoutInfo);
+-  }
+-
+-  @Test
+-  public void testUpdateAppTimeouts() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppTimeoutInfo appTimeoutInfo = new AppTimeoutInfo();
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
+-        null, null, appTimeoutInfo, PUT);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testNewReservation() throws Exception {
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_NEW,
+-        null, null, null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    NewReservation ci = response.getEntity(NewReservation.class);
+-    assertNotNull(ci);
+-  }
+-
+-  @Test
+-  public void testSubmitReservation() throws Exception {
+-    ReservationSubmissionRequestInfo context = new ReservationSubmissionRequestInfo();
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    context.setReservationId(newReservationId.getReservationId());
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null, null, context, POST);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testUpdateReservation() throws Exception {
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    String reservationId = newReservationId.getReservationId();
+-    ReservationUpdateRequestInfo context = new ReservationUpdateRequestInfo();
+-    context.setReservationId(reservationId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, context, POST);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testDeleteReservation() throws Exception {
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    String reservationId = newReservationId.getReservationId();
+-    ReservationDeleteRequestInfo context = new ReservationDeleteRequestInfo();
+-    context.setReservationId(reservationId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, context, POST);
+-    assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testGetClusterNodeLabels() throws Exception {
+-    NodeLabelsInfo nodeLabelsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + GET_NODE_LABELS, NodeLabelsInfo.class, null, null);
+-    assertNotNull(nodeLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsOnNode() throws Exception {
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-    NodeLabelsInfo nodeLabelsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID_GETLABELS, rm1NodeId),
+-        NodeLabelsInfo.class, null, null);
+-    assertNotNull(nodeLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsMappingEmpty() throws Exception {
+-    LabelsToNodesInfo labelsToNodesInfo = TestFederationSubCluster.performGetCalls(
+-        ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + LABEL_MAPPINGS,
+-        LabelsToNodesInfo.class, null, null);
+-    assertNotNull(labelsToNodesInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsMapping() throws Exception {
+-    LabelsToNodesInfo labelsToNodesInfo = TestFederationSubCluster.performGetCalls(
+-        ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + LABEL_MAPPINGS,
+-        LabelsToNodesInfo.class, LABELS, "label1");
+-    assertNotNull(labelsToNodesInfo);
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabels() throws Exception {
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(NodeLabel.newInstance("default"));
+-    NodeLabelsInfo context = new NodeLabelsInfo(nodeLabels);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + ADD_NODE_LABELS, null, null, context, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testGetNodeToLabels() throws Exception {
+-    NodeToLabelsInfo nodeToLabelsInfo = TestFederationSubCluster.performGetCalls(
+-        ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + GET_NODE_TO_LABELS,
+-        NodeToLabelsInfo.class, null, null);
+-    assertNotNull(nodeToLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabels() throws Exception {
+-    testFederationSubCluster.addNodeLabel(ROUTER_WEB_ADDRESS);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + REMOVE_NODE_LABELS,
+-        LABELS, "default", null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodes() throws Exception {
+-    testFederationSubCluster.addNodeLabel(ROUTER_WEB_ADDRESS);
+-    NodeToLabelsEntryList context = new NodeToLabelsEntryList();
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + REPLACE_NODE_TO_LABELS,
+-        null, null, context, POST);
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java
+deleted file mode 100644
+index 8af40193149..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/subcluster/fair/TestYarnFederationWithFairScheduler.java
++++ /dev/null
+@@ -1,639 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.subcluster.fair;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
+-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+-import com.sun.jersey.api.client.ClientResponse;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceOption;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQueueInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationSchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppsInfo;
+-import org.codehaus.jettison.json.JSONObject;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.INFO;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.CLUSTER_USER_INFO;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.METRICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.STATES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID_REPLACE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER_ACTIVITIES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_NEW_APPLICATION;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APP_STATISTICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APP_ID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_STATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_PRIORITY;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_QUEUE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_SUBMIT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_UPDATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_DELETE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID_GETLABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABEL_MAPPINGS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.ADD_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REMOVE_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REPLACE_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODE_RESOURCE;
+-import static org.apache.hadoop.yarn.server.router.subcluster.TestFederationSubCluster.format;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.PUT;
+-import static org.apache.http.HttpStatus.SC_OK;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-public class TestYarnFederationWithFairScheduler {
+-  private static TestFederationSubCluster testFederationSubCluster;
+-  private static Set<String> subClusters;
+-  private static final String ROUTER_WEB_ADDRESS = "http://localhost:28089";
+-  private static final String SC1_RM_WEB_ADDRESS = "http://localhost:38088";
+-  private static final String SC2_RM_WEB_ADDRESS = "http://localhost:48088";
+-
+-  @BeforeClass
+-  public static void setUp()
+-      throws IOException, InterruptedException, YarnException, TimeoutException {
+-    testFederationSubCluster = new TestFederationSubCluster();
+-    testFederationSubCluster.startFederationSubCluster(2182,
+-        "38032,38030,38031,38088,38033,SC-1,127.0.0.1:2182,fair-scheduler",
+-        "48032,48030,48031,48088,48033,SC-2,127.0.0.1:2182,fair-scheduler",
+-        "28050,28052,28089,127.0.0.1:2182");
+-    subClusters = Sets.newHashSet();
+-    subClusters.add("SC-1");
+-    subClusters.add("SC-2");
+-  }
+-
+-  @AfterClass
+-  public static void shutDown() throws Exception {
+-    testFederationSubCluster.stop();
+-  }
+-
+-  @Test
+-  public void testGetClusterInfo() throws InterruptedException, IOException {
+-    FederationClusterInfo federationClusterInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH,
+-        FederationClusterInfo.class, null, null);
+-    List<ClusterInfo> clusterInfos = federationClusterInfo.getList();
+-    assertNotNull(clusterInfos);
+-    assertEquals(2, clusterInfos.size());
+-    for (ClusterInfo clusterInfo : clusterInfos) {
+-      assertNotNull(clusterInfo);
+-      assertTrue(subClusters.contains(clusterInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testInfo() throws InterruptedException, IOException {
+-    FederationClusterInfo federationClusterInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + INFO,
+-        FederationClusterInfo.class, null, null);
+-    List<ClusterInfo> clusterInfos = federationClusterInfo.getList();
+-    assertNotNull(clusterInfos);
+-    assertEquals(2, clusterInfos.size());
+-    for (ClusterInfo clusterInfo : clusterInfos) {
+-      assertNotNull(clusterInfo);
+-      assertTrue(subClusters.contains(clusterInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testClusterUserInfo() throws Exception {
+-    FederationClusterUserInfo federationClusterUserInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + CLUSTER_USER_INFO,
+-        FederationClusterUserInfo.class, null, null);
+-    List<ClusterUserInfo> clusterUserInfos = federationClusterUserInfo.getList();
+-    assertNotNull(clusterUserInfos);
+-    assertEquals(2, clusterUserInfos.size());
+-    for (ClusterUserInfo clusterUserInfo : clusterUserInfos) {
+-      assertNotNull(clusterUserInfo);
+-      assertTrue(subClusters.contains(clusterUserInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testMetricsInfo() throws Exception {
+-    // It takes time to start the sub-cluster.
+-    // We need to wait for the sub-cluster to be completely started,
+-    // so we need to set the waiting time.
+-    // The resources of the two sub-clusters we registered are 24C and 12G,
+-    // so the resources that the Router should collect are 48C and 24G.
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        ClusterMetricsInfo clusterMetricsInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + METRICS, ClusterMetricsInfo.class, null, null);
+-        assertNotNull(clusterMetricsInfo);
+-        return (48 == clusterMetricsInfo.getTotalVirtualCores() &&
+-            24576 == clusterMetricsInfo.getTotalMB());
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testSchedulerInfo() throws Exception {
+-    FederationSchedulerTypeInfo schedulerTypeInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + SCHEDULER, FederationSchedulerTypeInfo.class, null, null);
+-    assertNotNull(schedulerTypeInfo);
+-    List<SchedulerTypeInfo> schedulerTypeInfos = schedulerTypeInfo.getList();
+-    assertNotNull(schedulerTypeInfos);
+-    assertEquals(2, schedulerTypeInfos.size());
+-    for (SchedulerTypeInfo schedulerTypeInfoItem : schedulerTypeInfos) {
+-      assertNotNull(schedulerTypeInfoItem);
+-      assertTrue(subClusters.contains(schedulerTypeInfoItem.getSubClusterId()));
+-      FairSchedulerQueueInfo rootQueueInfo =
+-          ((FairSchedulerInfo) schedulerTypeInfoItem.getSchedulerInfo()).getRootQueueInfo();
+-      assertNotNull(rootQueueInfo);
+-      assertEquals("fair", rootQueueInfo.getSchedulingPolicy());
+-    }
+-  }
+-
+-  @Test
+-  public void testNodesEmpty() throws Exception {
+-    // We are in 2 sub-clusters, each with 3 nodes, so our Router should correspond to 6 nodes.
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        NodesInfo nodesInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, null, null);
+-        assertNotNull(nodesInfo);
+-        ArrayList<NodeInfo> nodes = nodesInfo.getNodes();
+-        assertNotNull(nodes);
+-        return (6 == nodes.size());
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testNodesLost() throws Exception {
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        NodesInfo nodesInfo =
+-            TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-            RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, STATES, "LOST");
+-        assertNotNull(nodesInfo);
+-        ArrayList<NodeInfo> nodes = nodesInfo.getNodes();
+-        assertNotNull(nodes);
+-        return nodes.isEmpty();
+-      } catch (Exception e) {
+-        return false;
+-      }
+-    }, 5000, 50 * 5000);
+-  }
+-
+-  @Test
+-  public void testNode() throws Exception {
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-    NodeInfo nodeInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
+-        NodeInfo.class, null, null);
+-    assertNotNull(nodeInfo);
+-    assertEquals(rm1NodeId, nodeInfo.getNodeId());
+-
+-    String rm2NodeId = testFederationSubCluster.getNodeId(SC2_RM_WEB_ADDRESS);
+-    NodeInfo nodeInfo2 =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm2NodeId),
+-        NodeInfo.class, null, null);
+-    assertNotNull(nodeInfo2);
+-    assertEquals(rm2NodeId, nodeInfo2.getNodeId());
+-  }
+-
+-  @Test
+-  public void testUpdateNodeResource() throws Exception {
+-    // wait until a node shows up and check the resources
+-    GenericTestUtils.waitFor(() -> testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS) != null,
+-        100, 5 * 1000);
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-
+-    // assert memory and default vcores
+-    NodeInfo nodeInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
+-        NodeInfo.class, null, null);
+-    assertEquals(4096, nodeInfo.getTotalResource().getMemorySize());
+-    assertEquals(8, nodeInfo.getTotalResource().getvCores());
+-
+-    Resource resource = Resource.newInstance(4096, 5);
+-    ResourceOptionInfo resourceOption = new ResourceOptionInfo(
+-        ResourceOption.newInstance(resource, 1000));
+-    ClientResponse routerResponse = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODE_RESOURCE, rm1NodeId),
+-        null, null, resourceOption, POST);
+-    JSONObject json = routerResponse.getEntity(JSONObject.class);
+-    JSONObject totalResource = json.getJSONObject("resourceInfo");
+-    assertEquals(resource.getMemorySize(), totalResource.getLong("memory"));
+-    assertEquals(resource.getVirtualCores(), totalResource.getLong("vCores"));
+-
+-    // assert updated memory and cores
+-    NodeInfo nodeInfo1 = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, rm1NodeId),
+-        NodeInfo.class, null, null);
+-    assertEquals(4096, nodeInfo1.getTotalResource().getMemorySize());
+-    assertEquals(5, nodeInfo1.getTotalResource().getvCores());
+-  }
+-
+-  @Test
+-  public void testActivies() throws Exception {
+-    // wait until a node shows up and check the resources
+-    GenericTestUtils.waitFor(() -> testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS) != null,
+-        100, 5 * 1000);
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-
+-    ActivitiesInfo activitiesInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + SCHEDULER_ACTIVITIES, ActivitiesInfo.class, "nodeId", rm1NodeId);
+-
+-    assertNotNull(activitiesInfo);
+-    assertEquals(rm1NodeId, activitiesInfo.getNodeId());
+-    assertEquals("Not Capacity Scheduler", activitiesInfo.getDiagnostic());
+-  }
+-
+-  @Test
+-  public void testAppActivities() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppActivitiesInfo appActivitiesInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + "/scheduler/app-activities/" + appId,
+-        AppActivitiesInfo.class, APP_ID, appId);
+-    assertNotNull(appActivitiesInfo);
+-    assertEquals(appId, appActivitiesInfo.getApplicationId());
+-    assertEquals("Not Capacity Scheduler", appActivitiesInfo.getDiagnostic());
+-  }
+-
+-  @Test
+-  public void testAppStatistics() throws Exception {
+-    ApplicationStatisticsInfo applicationStatisticsInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APP_STATISTICS, ApplicationStatisticsInfo.class, STATES, "RUNNING");
+-    assertNotNull(applicationStatisticsInfo);
+-    ArrayList<StatisticsItemInfo> statItems = applicationStatisticsInfo.getStatItems();
+-    assertNotNull(statItems);
+-    assertEquals(1, statItems.size());
+-  }
+-
+-  @Test
+-  public void testNewApplication() throws Exception {
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION, null,
+-        null, null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    NewApplication ci = response.getEntity(NewApplication.class);
+-    assertNotNull(ci);
+-  }
+-
+-  @Test
+-  public void testSubmitApplication() {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-  }
+-
+-  @Test
+-  public void testApps() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppsInfo appsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + APPS, AppsInfo.class, null, null);
+-    assertNotNull(appsInfo);
+-    assertEquals(1, appsInfo.getApps().size());
+-  }
+-
+-  @Test
+-  public void testAppAttempt() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppAttemptsInfo appAttemptsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_APPATTEMPTS, appId),
+-        AppAttemptsInfo.class, null, null);
+-    assertNotNull(appAttemptsInfo);
+-    ArrayList<AppAttemptInfo> attempts = appAttemptsInfo.getAttempts();
+-    assertNotNull(attempts);
+-    assertEquals(1, attempts.size());
+-  }
+-
+-  @Test
+-  public void testAppState() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppState appState = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId),
+-        AppState.class, null, null);
+-    assertNotNull(appState);
+-    String state = appState.getState();
+-    assertNotNull(state);
+-    assertEquals("ACCEPTED", state);
+-  }
+-
+-  @Test
+-  public void testUpdateAppState() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppState appState = new AppState("KILLED");
+-    String pathApp = RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        pathApp, null, null, appState, PUT);
+-    assertNotNull(response);
+-    assertEquals(SC_ACCEPTED, response.getStatus());
+-    AppState appState1 = response.getEntity(AppState.class);
+-    assertNotNull(appState1);
+-    assertNotNull(appState1.getState());
+-    assertEquals("KILLING", appState1.getState());
+-  }
+-
+-  @Test
+-  public void testAppPriority() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    assertNotNull(appId);
+-    AppPriority appPriority = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        AppPriority.class, null, null);
+-    assertNotNull(appPriority);
+-    assertEquals(0, appPriority.getPriority());
+-  }
+-
+-  @Test
+-  public void testUpdateAppPriority() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppPriority appPriority = new AppPriority(1);
+-    // FairScheduler does not support Update Application Priority.
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        null, null, appPriority, PUT);
+-    assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
+-  }
+-
+-  @Test
+-  public void testAppQueue() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppQueue appQueue = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        AppQueue.class, null, null);
+-    assertNotNull(appQueue);
+-    String queue = appQueue.getQueue();
+-    assertEquals("root.dr_dot_who", queue);
+-  }
+-
+-  @Test
+-  public void testUpdateAppQueue() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppQueue appQueue = new AppQueue("root.a");
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        null, null, appQueue, PUT);
+-    assertEquals(SC_OK, response.getStatus());
+-    AppQueue appQueue1 = response.getEntity(AppQueue.class);
+-    assertNotNull(appQueue1);
+-    String queue1 = appQueue1.getQueue();
+-    assertEquals("root.a", queue1);
+-  }
+-
+-  @Test
+-  public void testAppTimeouts() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppTimeoutsInfo appTimeoutsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId),
+-        AppTimeoutsInfo.class, null, null);
+-    assertNotNull(appTimeoutsInfo);
+-    ArrayList<AppTimeoutInfo> appTimeouts = appTimeoutsInfo.getAppTimeouts();
+-    assertNotNull(appTimeouts);
+-    assertEquals(1, appTimeouts.size());
+-    AppTimeoutInfo appTimeoutInfo = appTimeouts.get(0);
+-    assertNotNull(appTimeoutInfo);
+-    assertEquals(ApplicationTimeoutType.LIFETIME, appTimeoutInfo.getTimeoutType());
+-    assertEquals("UNLIMITED", appTimeoutInfo.getExpireTime());
+-  }
+-
+-  @Test
+-  public void testAppTimeout() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    String pathApp = RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId);
+-    AppTimeoutInfo appTimeoutInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        pathApp + "/" + "LIFETIME", AppTimeoutInfo.class, null, null);
+-    assertNotNull(appTimeoutInfo);
+-  }
+-
+-  @Test
+-  public void testUpdateAppTimeouts() throws Exception {
+-    String appId = testFederationSubCluster.submitApplication(ROUTER_WEB_ADDRESS);
+-    AppTimeoutInfo appTimeoutInfo = new AppTimeoutInfo();
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
+-        null, null, appTimeoutInfo, PUT);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testNewReservation() throws Exception {
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_NEW,
+-        null, null, null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    NewReservation ci = response.getEntity(NewReservation.class);
+-    assertNotNull(ci);
+-  }
+-
+-  @Test
+-  public void testSubmitReservation() throws Exception {
+-    ReservationSubmissionRequestInfo context = new ReservationSubmissionRequestInfo();
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    context.setReservationId(newReservationId.getReservationId());
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null, null, context, POST);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testUpdateReservation() throws Exception {
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    String reservationId = newReservationId.getReservationId();
+-    ReservationUpdateRequestInfo context = new ReservationUpdateRequestInfo();
+-    context.setReservationId(reservationId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, context, POST);
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testDeleteReservation() throws Exception {
+-    NewReservation newReservationId =
+-        testFederationSubCluster.getNewReservationId(ROUTER_WEB_ADDRESS);
+-    String reservationId = newReservationId.getReservationId();
+-    ReservationDeleteRequestInfo context = new ReservationDeleteRequestInfo();
+-    context.setReservationId(reservationId);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, context, POST);
+-    assertEquals(SC_SERVICE_UNAVAILABLE, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testGetClusterNodeLabels() throws Exception {
+-    NodeLabelsInfo nodeLabelsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + GET_NODE_LABELS, NodeLabelsInfo.class, null, null);
+-    assertNotNull(nodeLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsOnNode() throws Exception {
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-    NodeLabelsInfo nodeLabelsInfo = TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID_GETLABELS, rm1NodeId),
+-        NodeLabelsInfo.class, null, null);
+-    assertNotNull(nodeLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsMappingEmpty() throws Exception {
+-    LabelsToNodesInfo labelsToNodesInfo =
+-        TestFederationSubCluster.performGetCalls(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + LABEL_MAPPINGS, LabelsToNodesInfo.class, null, null);
+-    assertNotNull(labelsToNodesInfo);
+-  }
+-
+-  @Test
+-  public void testGetLabelsMapping() throws Exception {
+-    LabelsToNodesInfo labelsToNodesInfo = TestFederationSubCluster.performGetCalls(
+-        ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + LABEL_MAPPINGS,
+-        LabelsToNodesInfo.class, LABELS, "label1");
+-    assertNotNull(labelsToNodesInfo);
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabels() throws Exception {
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(NodeLabel.newInstance("default"));
+-    NodeLabelsInfo context = new NodeLabelsInfo(nodeLabels);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + ADD_NODE_LABELS, null, null, context, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testGetNodeToLabels() throws Exception {
+-    NodeToLabelsInfo nodeToLabelsInfo = TestFederationSubCluster.performGetCalls(
+-        ROUTER_WEB_ADDRESS, RM_WEB_SERVICE_PATH + GET_NODE_TO_LABELS,
+-        NodeToLabelsInfo.class, null, null);
+-    assertNotNull(nodeToLabelsInfo);
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabels() throws Exception {
+-    testFederationSubCluster.addNodeLabel(ROUTER_WEB_ADDRESS);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + REMOVE_NODE_LABELS,
+-        LABELS, "default", null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodes() throws Exception {
+-    testFederationSubCluster.addNodeLabel(ROUTER_WEB_ADDRESS);
+-    NodeToLabelsEntryList context = new NodeToLabelsEntryList();
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        RM_WEB_SERVICE_PATH + REPLACE_NODE_TO_LABELS,
+-        null, null, context, POST);
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNode() throws Exception {
+-    String rm1NodeId = testFederationSubCluster.getNodeId(SC1_RM_WEB_ADDRESS);
+-    String pathNode = RM_WEB_SERVICE_PATH +
+-        format(NODES_NODEID_REPLACE_LABELS, rm1NodeId);
+-    testFederationSubCluster.addNodeLabel(ROUTER_WEB_ADDRESS);
+-    ClientResponse response = TestFederationSubCluster.performCall(ROUTER_WEB_ADDRESS,
+-        pathNode, LABELS, "default", null, POST);
+-    assertEquals(SC_OK, response.getStatus());
+-    String entity = response.getEntity(String.class);
+-    assertNotNull(entity);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java
+deleted file mode 100644
+index 423e0e5a38c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/BaseRouterWebServicesTest.java
++++ /dev/null
+@@ -1,419 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.spy;
+-import static org.mockito.Mockito.when;
+-
+-import java.io.IOException;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.Response;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.webapp.RouterWebServices.RequestInterceptorChainWrapper;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.mockito.Mockito;
+-
+-/**
+- * Base class for all the RouterRMAdminService test cases. It provides utility
+- * methods that can be used by the concrete test case classes.
+- *
+- */
+-public abstract class BaseRouterWebServicesTest {
+-
+-  private YarnConfiguration conf;
+-
+-  private Router router;
+-  public final static int TEST_MAX_CACHE_SIZE = 10;
+-
+-  public static final String QUEUE_DEFAULT = "default";
+-  public static final String QUEUE_DEFAULT_FULL = CapacitySchedulerConfiguration.ROOT +
+-      CapacitySchedulerConfiguration.DOT + QUEUE_DEFAULT;
+-  public static final String QUEUE_DEDICATED = "dedicated";
+-  public static final String QUEUE_DEDICATED_FULL = CapacitySchedulerConfiguration.ROOT +
+-      CapacitySchedulerConfiguration.DOT + QUEUE_DEDICATED;
+-
+-  private RouterWebServices routerWebService;
+-
+-  @Before
+-  public void setUp() throws YarnException, IOException {
+-
+-    this.conf = createConfiguration();
+-
+-    router = spy(new Router());
+-    Mockito.doNothing().when(router).startWepApp();
+-    routerWebService = new RouterWebServices(router, conf);
+-    routerWebService.setResponse(mock(HttpServletResponse.class));
+-
+-    router.init(conf);
+-    router.start();
+-  }
+-
+-  protected YarnConfiguration createConfiguration() {
+-    YarnConfiguration config = new YarnConfiguration();
+-    String mockPassThroughInterceptorClass =
+-        PassThroughRESTRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain will call the mock resource manager. The others in the chain will
+-    // simply forward it to the next one in the chain
+-    config.set(YarnConfiguration.ROUTER_WEBAPP_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + "," + mockPassThroughInterceptorClass
+-            + "," + mockPassThroughInterceptorClass + ","
+-            + MockRESTRequestInterceptor.class.getName());
+-
+-    config.setInt(YarnConfiguration.ROUTER_PIPELINE_CACHE_MAX_SIZE,
+-        TEST_MAX_CACHE_SIZE);
+-    return config;
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    if (router != null) {
+-      router.stop();
+-    }
+-  }
+-
+-  public void setUpConfig() {
+-    this.conf = createConfiguration();
+-  }
+-
+-  protected Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  protected RouterWebServices getRouterWebServices() {
+-    Assert.assertNotNull(this.routerWebService);
+-    return this.routerWebService;
+-  }
+-
+-  protected ClusterInfo get(String user)
+-      throws IOException, InterruptedException {
+-    // HSR is not used here
+-    return routerWebService.get();
+-  }
+-
+-  protected ClusterInfo getClusterInfo(String user)
+-      throws IOException, InterruptedException {
+-    // HSR is not used here
+-    return routerWebService.getClusterInfo();
+-  }
+-
+-  protected ClusterMetricsInfo getClusterMetricsInfo(String user)
+-      throws IOException, InterruptedException {
+-    // HSR is not used here
+-    return routerWebService.getClusterMetricsInfo();
+-  }
+-
+-  protected SchedulerTypeInfo getSchedulerInfo(String user)
+-      throws IOException, InterruptedException {
+-    // HSR is not used here
+-    return routerWebService.getSchedulerInfo();
+-  }
+-
+-  protected String dumpSchedulerLogs(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.dumpSchedulerLogs(null,
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected NodesInfo getNodes(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getNodes(null);
+-  }
+-
+-  protected NodeInfo getNode(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getNode(null);
+-  }
+-
+-  protected AppsInfo getApps(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getApps(createHttpServletRequest(user), null, null,
+-        null, null, null, null, null, null, null, null, null, null, null,
+-        null);
+-  }
+-
+-  protected ActivitiesInfo getActivities(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getActivities(
+-        createHttpServletRequest(user), null, null);
+-  }
+-
+-  protected BulkActivitiesInfo getBulkActivities(String user)
+-      throws InterruptedException {
+-    return routerWebService.getBulkActivities(
+-        createHttpServletRequest(user), null, 0);
+-  }
+-
+-  protected AppActivitiesInfo getAppActivities(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppActivities(createHttpServletRequest(user),
+-        null, null, null, null, null, null, null, false);
+-  }
+-
+-  protected ApplicationStatisticsInfo getAppStatistics(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppStatistics(
+-        createHttpServletRequest(user), null, null);
+-  }
+-
+-  protected AppInfo getApp(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getApp(createHttpServletRequest(user), null, null);
+-  }
+-
+-  protected AppState getAppState(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppState(createHttpServletRequest(user), null);
+-  }
+-
+-  protected Response updateAppState(String user) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return routerWebService.updateAppState(
+-        null, createHttpServletRequest(user), null);
+-  }
+-
+-  protected NodeToLabelsInfo getNodeToLabels(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getNodeToLabels(createHttpServletRequest(user));
+-  }
+-
+-  protected LabelsToNodesInfo getLabelsToNodes(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getLabelsToNodes(null);
+-  }
+-
+-  protected Response replaceLabelsOnNodes(String user) throws Exception {
+-    return routerWebService.replaceLabelsOnNodes(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response replaceLabelsOnNode(String user) throws Exception {
+-    return routerWebService.replaceLabelsOnNode(
+-        null, createHttpServletRequest(user), null);
+-  }
+-
+-  protected NodeLabelsInfo getClusterNodeLabels(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getClusterNodeLabels(
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response addToClusterNodeLabels(String user) throws Exception {
+-    return routerWebService.addToClusterNodeLabels(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response removeFromClusterNodeLabels(String user) throws Exception {
+-    return routerWebService.removeFromClusterNodeLabels(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected NodeLabelsInfo getLabelsOnNode(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getLabelsOnNode(
+-        createHttpServletRequest(user), null);
+-  }
+-
+-  protected AppPriority getAppPriority(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppPriority(
+-        createHttpServletRequest(user), null);
+-  }
+-
+-  protected Response updateApplicationPriority(String user)
+-      throws AuthorizationException, YarnException, InterruptedException,
+-      IOException {
+-    return routerWebService.updateApplicationPriority(
+-        null, createHttpServletRequest(user), null);
+-  }
+-
+-  protected AppQueue getAppQueue(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppQueue(createHttpServletRequest(user), null);
+-  }
+-
+-  protected Response updateAppQueue(String user) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return routerWebService.updateAppQueue(
+-        null, createHttpServletRequest(user), null);
+-  }
+-
+-  protected Response createNewApplication(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.createNewApplication(
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response submitApplication(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.submitApplication(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response postDelegationToken(String user)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return routerWebService.postDelegationToken(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response postDelegationTokenExpiration(String user)
+-      throws AuthorizationException, IOException, Exception {
+-    return routerWebService.postDelegationTokenExpiration(
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response cancelDelegationToken(String user)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return routerWebService.cancelDelegationToken(
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response createNewReservation(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.createNewReservation(
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response submitReservation(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.submitReservation(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response updateReservation(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.updateReservation(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response deleteReservation(String user)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return routerWebService.deleteReservation(
+-        null, createHttpServletRequest(user));
+-  }
+-
+-  protected Response listReservation(String user) throws Exception {
+-    return routerWebService.listReservation(
+-        null, null, 0, 0, false, createHttpServletRequest(user));
+-  }
+-
+-  protected AppTimeoutInfo getAppTimeout(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppTimeout(
+-        createHttpServletRequest(user), null, null);
+-  }
+-
+-  protected AppTimeoutsInfo getAppTimeouts(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppTimeouts(
+-        createHttpServletRequest(user), null);
+-  }
+-
+-  protected Response updateApplicationTimeout(String user)
+-      throws AuthorizationException, YarnException, InterruptedException,
+-      IOException {
+-    return routerWebService.updateApplicationTimeout(
+-        null, createHttpServletRequest(user), null);
+-  }
+-
+-  protected AppAttemptsInfo getAppAttempts(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppAttempts(
+-        createHttpServletRequest(user), null);
+-  }
+-
+-  protected AppAttemptInfo getAppAttempt(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getAppAttempt(
+-        createHttpServletRequest(user), null, null, null);
+-  }
+-
+-  protected ContainersInfo getContainers(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getContainers(
+-        createHttpServletRequest(user), null, null, null);
+-  }
+-
+-  protected ContainerInfo getContainer(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.getContainer(
+-        createHttpServletRequest(user), null, null, null, null);
+-  }
+-
+-  protected RequestInterceptorChainWrapper getInterceptorChain(String user)
+-      throws IOException, InterruptedException {
+-    HttpServletRequest request = createHttpServletRequest(user);
+-    return routerWebService.getInterceptorChain(request);
+-  }
+-
+-  private HttpServletRequest createHttpServletRequest(String user) {
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-    when(request.getRemoteUser()).thenReturn(user);
+-    return request;
+-  }
+-
+-  protected Response updateSchedulerConfiguration(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.updateSchedulerConfiguration(null,
+-        createHttpServletRequest(user));
+-  }
+-
+-  protected Response getSchedulerConfiguration(String user)
+-      throws IOException, InterruptedException {
+-    return routerWebService.
+-        getSchedulerConfiguration(createHttpServletRequest(user));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/JavaProcess.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/JavaProcess.java
+deleted file mode 100644
+index 3760b96c241..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/JavaProcess.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.List;
+-
+-/**
+- * Helper class to start a new process.
+- */
+-public class JavaProcess {
+-
+-  private Process process;
+-
+-  public JavaProcess(Class<?> clazz, File output)
+-      throws IOException, InterruptedException {
+-    this(clazz, null, output);
+-  }
+-
+-  public JavaProcess(Class<?> clazz, List<String> addClassPaths, File output)
+-      throws IOException {
+-    String javaHome = System.getProperty("java.home");
+-    String javaBin =
+-        javaHome + File.separator + "bin" + File.separator + "java";
+-    String classpath = System.getProperty("java.class.path");
+-    classpath = classpath.concat("./src/test/resources");
+-    if (addClassPaths != null) {
+-      for (String addClasspath : addClassPaths) {
+-        classpath = classpath.concat(File.pathSeparatorChar + addClasspath);
+-      }
+-    }
+-    String className = clazz.getCanonicalName();
+-    ProcessBuilder builder =
+-        new ProcessBuilder(javaBin, "-cp", classpath, className);
+-    builder.redirectInput(ProcessBuilder.Redirect.INHERIT);
+-    builder.redirectOutput(output);
+-    builder.redirectError(output);
+-    process = builder.start();
+-  }
+-
+-  public JavaProcess(Class<?> clazz, List<String> addClassPaths, File output, String param)
+-      throws IOException {
+-    String javaHome = System.getProperty("java.home");
+-    String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
+-    String classpath = System.getProperty("java.class.path");
+-    classpath = classpath.concat("./src/test/resources");
+-    if (addClassPaths != null) {
+-      for (String addClasspath : addClassPaths) {
+-        classpath = classpath.concat(File.pathSeparatorChar + addClasspath);
+-      }
+-    }
+-    String className = clazz.getCanonicalName();
+-    ProcessBuilder builder =
+-        new ProcessBuilder(javaBin, "-cp", classpath, className, param);
+-    builder.redirectInput(ProcessBuilder.Redirect.INHERIT);
+-    builder.redirectOutput(output);
+-    builder.redirectError(output);
+-    process = builder.start();
+-  }
+-
+-  public void stop() throws InterruptedException {
+-    if (process != null) {
+-      process.destroy();
+-      process.waitFor();
+-      process.exitValue();
+-    }
+-  }
+-
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
+deleted file mode 100644
+index f162ab6be65..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockDefaultRequestInterceptorREST.java
++++ /dev/null
+@@ -1,1406 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.net.ConnectException;
+-import java.security.Principal;
+-import java.util.ArrayList;
+-import java.util.Set;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.Collections;
+-import java.util.Arrays;
+-import java.util.List;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.concurrent.atomic.AtomicLong;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.stream.Collectors;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.Context;
+-import javax.ws.rs.core.HttpHeaders;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.commons.lang3.EnumUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationDeleteRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationListResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationUpdateRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.NodeId;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ContainerState;
+-import org.apache.hadoop.yarn.api.records.ContainerReport;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.SignalContainerCommand;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationAttemptState;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeout;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.QueueACL;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.resourcemanager.ClientRMService;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.reservation.ReservationSystem;
+-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ActiveUsersManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivitiesManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivitiesLogger;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityLevel;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.LeafQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.TestUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CSQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerTestUtilities;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.conf.MutableCSConfigurationProvider;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerApp;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.fica.FiCaSchedulerNode;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.NodeIDsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationListInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDefinitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateResponseInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteResponseInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeAllocationInfo;
+-import org.apache.hadoop.yarn.server.router.RouterServerUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.PartitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo;
+-import org.apache.hadoop.yarn.server.scheduler.SchedulerRequestKey;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.util.SystemClock;
+-import org.apache.hadoop.yarn.util.resource.Resources;
+-import org.apache.hadoop.yarn.webapp.BadRequestException;
+-import org.apache.hadoop.yarn.webapp.ForbiddenException;
+-import org.apache.hadoop.yarn.webapp.NotFoundException;
+-import org.apache.hadoop.yarn.webapp.dao.ConfInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-import org.mockito.Mockito;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEFAULT;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEFAULT_FULL;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEDICATED;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEDICATED_FULL;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * This class mocks the RESTRequestInterceptor.
+- */
+-public class MockDefaultRequestInterceptorREST
+-    extends DefaultRequestInterceptorREST {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(MockDefaultRequestInterceptorREST.class);
+-  final private AtomicInteger applicationCounter = new AtomicInteger(0);
+-  // True if the Mock RM is running, false otherwise.
+-  // This property allows us to write tests for specific scenario as YARN RM
+-  // down e.g. network issue, failover.
+-  private boolean isRunning = true;
+-  private Map<ApplicationId, ApplicationReport> applicationMap = new HashMap<>();
+-  public static final String APP_STATE_RUNNING = "RUNNING";
+-
+-  // duration(milliseconds), 1mins
+-  public static final long DURATION = 60*1000;
+-
+-  // Containers 4
+-  public static final int NUM_CONTAINERS = 4;
+-
+-  private Map<ReservationId, SubClusterId> reservationMap = new HashMap<>();
+-  private AtomicLong resCounter = new AtomicLong();
+-  private MockRM mockRM = null;
+-
+-  private void validateRunning() throws ConnectException {
+-    if (!isRunning) {
+-      throw new ConnectException("RM is stopped");
+-    }
+-  }
+-
+-  @Override
+-  public Response createNewApplication(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    validateRunning();
+-
+-    ApplicationId applicationId =
+-        ApplicationId.newInstance(Integer.parseInt(getSubClusterId().getId()),
+-            applicationCounter.incrementAndGet());
+-    NewApplication appId =
+-        new NewApplication(applicationId.toString(), new ResourceInfo());
+-    return Response.status(Status.OK).entity(appId).build();
+-  }
+-
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    validateRunning();
+-
+-    ApplicationId appId = ApplicationId.fromString(newApp.getApplicationId());
+-    LOG.info("Application submitted: " + appId);
+-
+-    // Initialize appReport
+-    ApplicationReport appReport = ApplicationReport.newInstance(
+-        appId, ApplicationAttemptId.newInstance(appId, 1), null, newApp.getQueue(), null, null, 0,
+-        null, YarnApplicationState.ACCEPTED, "", null, 0, 0, null, null, null, 0,
+-        newApp.getApplicationType(), null, null, false, Priority.newInstance(newApp.getPriority()),
+-        null, null);
+-
+-    // Initialize appTimeoutsMap
+-    HashMap<ApplicationTimeoutType, ApplicationTimeout> appTimeoutsMap = new HashMap<>();
+-    ApplicationTimeoutType timeoutType = ApplicationTimeoutType.LIFETIME;
+-    ApplicationTimeout appTimeOut =
+-        ApplicationTimeout.newInstance(ApplicationTimeoutType.LIFETIME, "UNLIMITED", 10);
+-    appTimeoutsMap.put(timeoutType, appTimeOut);
+-    appReport.setApplicationTimeouts(appTimeoutsMap);
+-
+-    applicationMap.put(appId, appReport);
+-    return Response.status(Status.ACCEPTED).header(HttpHeaders.LOCATION, "")
+-        .entity(getSubClusterId()).build();
+-  }
+-
+-  @Override
+-  public AppInfo getApp(HttpServletRequest hsr, String appId,
+-      Set<String> unselectedFields) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    return new AppInfo();
+-  }
+-
+-  @Override
+-  public AppsInfo getApps(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    AppsInfo appsInfo = new AppsInfo();
+-    AppInfo appInfo = new AppInfo();
+-
+-    appInfo.setAppId(
+-        ApplicationId.newInstance(Integer.parseInt(getSubClusterId().getId()),
+-            applicationCounter.incrementAndGet()).toString());
+-    appInfo.setAMHostHttpAddress("http://i_am_the_AM:1234");
+-
+-    appsInfo.add(appInfo);
+-    return appsInfo;
+-  }
+-
+-  @Override
+-  public Response updateAppState(AppState targetState, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    validateRunning();
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (applicationMap.remove(applicationId) == null) {
+-      throw new ApplicationNotFoundException(
+-          "Trying to kill an absent application: " + appId);
+-    }
+-
+-    if (targetState == null) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-
+-    LOG.info("Force killing application: " + appId);
+-    AppState ret = new AppState();
+-    ret.setState(targetState.toString());
+-    return Response.status(Status.OK).entity(ret).build();
+-  }
+-
+-  @Override
+-  public NodeInfo getNode(String nodeId) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    NodeInfo node = null;
+-    SubClusterId subCluster = getSubClusterId();
+-    String subClusterId = subCluster.getId();
+-    if (nodeId.contains(subClusterId) || nodeId.contains("test")) {
+-      node = new NodeInfo();
+-      node.setId(nodeId);
+-      node.setLastHealthUpdate(Integer.parseInt(getSubClusterId().getId()));
+-    }
+-    return node;
+-  }
+-
+-  @Override
+-  public NodesInfo getNodes(String states) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    NodeInfo node = new NodeInfo();
+-    node.setId("Node " + Integer.valueOf(getSubClusterId().getId()));
+-    node.setLastHealthUpdate(Integer.parseInt(getSubClusterId().getId()));
+-    NodesInfo nodes = new NodesInfo();
+-    nodes.add(node);
+-    return nodes;
+-  }
+-
+-  @Override
+-  public ResourceInfo updateNodeResource(HttpServletRequest hsr,
+-      String nodeId, ResourceOptionInfo resourceOption) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    Resource resource = resourceOption.getResourceOption().getResource();
+-    return new ResourceInfo(resource);
+-  }
+-
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    ClusterMetricsInfo metrics = new ClusterMetricsInfo();
+-    metrics.setAppsSubmitted(Integer.parseInt(getSubClusterId().getId()));
+-    metrics.setAppsCompleted(Integer.parseInt(getSubClusterId().getId()));
+-    metrics.setAppsPending(Integer.parseInt(getSubClusterId().getId()));
+-    metrics.setAppsRunning(Integer.parseInt(getSubClusterId().getId()));
+-    metrics.setAppsFailed(Integer.parseInt(getSubClusterId().getId()));
+-    metrics.setAppsKilled(Integer.parseInt(getSubClusterId().getId()));
+-
+-    return metrics;
+-  }
+-
+-  @Override
+-  public AppState getAppState(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    return new AppState(APP_STATE_RUNNING);
+-  }
+-
+-  public void setSubClusterId(int subClusterId) {
+-    setSubClusterId(SubClusterId.newInstance(Integer.toString(subClusterId)));
+-  }
+-
+-  public boolean isRunning() {
+-    return isRunning;
+-  }
+-
+-  public void setRunning(boolean runningMode) {
+-    this.isRunning = runningMode;
+-  }
+-
+-  @Override
+-  public ContainersInfo getContainers(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    // Try format conversion for app_id
+-    ApplicationId applicationId = null;
+-    try {
+-      applicationId = ApplicationId.fromString(appId);
+-    } catch (Exception e) {
+-      throw new BadRequestException(e);
+-    }
+-
+-    // Try format conversion for app_attempt_id
+-    ApplicationAttemptId applicationAttemptId = null;
+-    try {
+-      applicationAttemptId =
+-          ApplicationAttemptId.fromString(appAttemptId);
+-    } catch (Exception e) {
+-      throw new BadRequestException(e);
+-    }
+-
+-    // We avoid to check if the Application exists in the system because we need
+-    // to validate that each subCluster returns 1 container.
+-    ContainersInfo containers = new ContainersInfo();
+-
+-    int subClusterId = Integer.valueOf(getSubClusterId().getId());
+-
+-    ContainerId containerId = ContainerId.newContainerId(
+-        ApplicationAttemptId.fromString(appAttemptId), subClusterId);
+-    Resource allocatedResource =
+-        Resource.newInstance(subClusterId, subClusterId);
+-
+-    NodeId assignedNode = NodeId.newInstance("Node", subClusterId);
+-    Priority priority = Priority.newInstance(subClusterId);
+-    long creationTime = subClusterId;
+-    long finishTime = subClusterId;
+-    String diagnosticInfo = "Diagnostic " + subClusterId;
+-    String logUrl = "Log " + subClusterId;
+-    int containerExitStatus = subClusterId;
+-    ContainerState containerState = ContainerState.COMPLETE;
+-    String nodeHttpAddress = "HttpAddress " + subClusterId;
+-
+-    ContainerReport containerReport = ContainerReport.newInstance(
+-        containerId, allocatedResource, assignedNode, priority,
+-        creationTime, finishTime, diagnosticInfo, logUrl,
+-        containerExitStatus, containerState, nodeHttpAddress);
+-
+-    ContainerInfo container = new ContainerInfo(containerReport);
+-    containers.add(container);
+-
+-    return containers;
+-  }
+-
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr) throws IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    NodeLabelsInfo cpuNode = new NodeLabelsInfo(Collections.singleton("CPU"));
+-    NodeLabelsInfo gpuNode = new NodeLabelsInfo(Collections.singleton("GPU"));
+-
+-    HashMap<String, NodeLabelsInfo> nodeLabels = new HashMap<>();
+-    nodeLabels.put("node1", cpuNode);
+-    nodeLabels.put("node2", gpuNode);
+-    return new NodeToLabelsInfo(nodeLabels);
+-  }
+-
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(Set<String> labels) throws IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    Map<NodeLabelInfo, NodeIDsInfo> labelsToNodes = new HashMap<>();
+-
+-    NodeLabel labelX = NodeLabel.newInstance("x", false);
+-    NodeLabelInfo nodeLabelInfoX = new NodeLabelInfo(labelX);
+-    ArrayList<String> hostsX = new ArrayList<>(Arrays.asList("host1A", "host1B"));
+-    Resource resourceX = Resource.newInstance(20*1024, 10);
+-    NodeIDsInfo nodeIDsInfoX = new NodeIDsInfo(hostsX, resourceX);
+-    labelsToNodes.put(nodeLabelInfoX, nodeIDsInfoX);
+-
+-    NodeLabel labelY = NodeLabel.newInstance("y", false);
+-    NodeLabelInfo nodeLabelInfoY = new NodeLabelInfo(labelY);
+-    ArrayList<String> hostsY = new ArrayList<>(Arrays.asList("host2A", "host2B"));
+-    Resource resourceY = Resource.newInstance(40*1024, 20);
+-    NodeIDsInfo nodeIDsInfoY = new NodeIDsInfo(hostsY, resourceY);
+-    labelsToNodes.put(nodeLabelInfoY, nodeIDsInfoY);
+-
+-    NodeLabel labelZ = NodeLabel.newInstance("z", false);
+-    NodeLabelInfo nodeLabelInfoZ = new NodeLabelInfo(labelZ);
+-    ArrayList<String> hostsZ = new ArrayList<>(Arrays.asList("host3A", "host3B"));
+-    Resource resourceZ = Resource.newInstance(80*1024, 40);
+-    NodeIDsInfo nodeIDsInfoZ = new NodeIDsInfo(hostsZ, resourceZ);
+-    labelsToNodes.put(nodeLabelInfoZ, nodeIDsInfoZ);
+-
+-    return new LabelsToNodesInfo(labelsToNodes);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(HttpServletRequest hsr) throws IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    NodeLabel labelCpu = NodeLabel.newInstance("cpu", false);
+-    NodeLabel labelGpu = NodeLabel.newInstance("gpu", false);
+-    return new NodeLabelsInfo(Sets.newHashSet(labelCpu, labelGpu));
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(HttpServletRequest hsr, String nodeId) throws IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    if (StringUtils.equalsIgnoreCase(nodeId, "node1")) {
+-      NodeLabel labelCpu = NodeLabel.newInstance("x", false);
+-      NodeLabel labelGpu = NodeLabel.newInstance("y", false);
+-      return new NodeLabelsInfo(Sets.newHashSet(labelCpu, labelGpu));
+-    } else {
+-      return null;
+-    }
+-  }
+-
+-  @Override
+-  public ContainerInfo getContainer(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId, String containerId) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ContainerId newContainerId = ContainerId.fromString(containerId);
+-
+-    Resource allocatedResource = Resource.newInstance(1024, 2);
+-
+-    int subClusterId = Integer.valueOf(getSubClusterId().getId());
+-    NodeId assignedNode = NodeId.newInstance("Node", subClusterId);
+-    Priority priority = Priority.newInstance(subClusterId);
+-    long creationTime = subClusterId;
+-    long finishTime = subClusterId;
+-    String diagnosticInfo = "Diagnostic " + subClusterId;
+-    String logUrl = "Log " + subClusterId;
+-    int containerExitStatus = subClusterId;
+-    ContainerState containerState = ContainerState.COMPLETE;
+-    String nodeHttpAddress = "HttpAddress " + subClusterId;
+-
+-    ContainerReport containerReport = ContainerReport.newInstance(
+-        newContainerId, allocatedResource, assignedNode, priority,
+-        creationTime, finishTime, diagnosticInfo, logUrl,
+-        containerExitStatus, containerState, nodeHttpAddress);
+-
+-    return new ContainerInfo(containerReport);
+-  }
+-
+-  @Override
+-  public Response signalToContainer(String containerId, String command,
+-      HttpServletRequest req) throws AuthorizationException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    if (!EnumUtils.isValidEnum(SignalContainerCommand.class, command.toUpperCase())) {
+-      String errMsg = "Invalid command: " + command.toUpperCase() + ", valid commands are: "
+-          + Arrays.asList(SignalContainerCommand.values());
+-      return Response.status(Status.BAD_REQUEST).entity(errMsg).build();
+-    }
+-
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public AppAttemptInfo getAppAttempt(HttpServletRequest req, HttpServletResponse res,
+-      String appId, String appAttemptId) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    ApplicationAttemptId attemptId = ApplicationAttemptId.fromString(appAttemptId);
+-
+-    ApplicationReport newApplicationReport = ApplicationReport.newInstance(
+-        applicationId, attemptId, "user", "queue", "appname", "host", 124, null,
+-        YarnApplicationState.RUNNING, "diagnostics", "url", 1, 2, 3, 4,
+-        FinalApplicationStatus.SUCCEEDED, null, "N/A", 0.53789f, "YARN", null);
+-
+-    ApplicationAttemptReport attempt = ApplicationAttemptReport.newInstance(
+-        attemptId, "host", 124, "url", "oUrl", "diagnostics",
+-        YarnApplicationAttemptState.FINISHED, ContainerId.newContainerId(
+-        newApplicationReport.getCurrentApplicationAttemptId(), 1));
+-
+-    return new AppAttemptInfo(attempt);
+-  }
+-
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    AppAttemptsInfo infos = new AppAttemptsInfo();
+-    infos.add(TestRouterWebServiceUtil.generateAppAttemptInfo(0));
+-    infos.add(TestRouterWebServiceUtil.generateAppAttemptInfo(1));
+-    return infos;
+-  }
+-
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(HttpServletRequest hsr,
+-      String appId, String type) throws AuthorizationException {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    Map<ApplicationTimeoutType, ApplicationTimeout> timeouts = appReport.getApplicationTimeouts();
+-    ApplicationTimeoutType paramType = ApplicationTimeoutType.valueOf(type);
+-
+-    if (paramType == null) {
+-      throw new NotFoundException("application timeout type not found");
+-    }
+-
+-    if (!timeouts.containsKey(paramType)) {
+-      throw new NotFoundException("timeout with id: " + appId + " not found");
+-    }
+-
+-    ApplicationTimeout applicationTimeout = timeouts.get(paramType);
+-
+-    AppTimeoutInfo timeoutInfo = new AppTimeoutInfo();
+-    timeoutInfo.setExpiryTime(applicationTimeout.getExpiryTime());
+-    timeoutInfo.setTimeoutType(applicationTimeout.getTimeoutType());
+-    timeoutInfo.setRemainingTime(applicationTimeout.getRemainingTime());
+-
+-    return timeoutInfo;
+-  }
+-
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    Map<ApplicationTimeoutType, ApplicationTimeout> timeouts = appReport.getApplicationTimeouts();
+-
+-    AppTimeoutsInfo timeoutsInfo = new AppTimeoutsInfo();
+-
+-    for (ApplicationTimeout timeout : timeouts.values()) {
+-      AppTimeoutInfo timeoutInfo = new AppTimeoutInfo();
+-      timeoutInfo.setExpiryTime(timeout.getExpiryTime());
+-      timeoutInfo.setTimeoutType(timeout.getTimeoutType());
+-      timeoutInfo.setRemainingTime(timeout.getRemainingTime());
+-      timeoutsInfo.add(timeoutInfo);
+-    }
+-
+-    return timeoutsInfo;
+-  }
+-
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    Map<ApplicationTimeoutType, ApplicationTimeout> timeouts = appReport.getApplicationTimeouts();
+-
+-    ApplicationTimeoutType paramTimeoutType = appTimeout.getTimeoutType();
+-    if (!timeouts.containsKey(paramTimeoutType)) {
+-      throw new NotFoundException("TimeOutType with id: " + appId + " not found");
+-    }
+-
+-    ApplicationTimeout applicationTimeout = timeouts.get(paramTimeoutType);
+-    applicationTimeout.setTimeoutType(appTimeout.getTimeoutType());
+-    applicationTimeout.setExpiryTime(appTimeout.getExpireTime());
+-    applicationTimeout.setRemainingTime(appTimeout.getRemainingTimeInSec());
+-
+-    AppTimeoutInfo result = new AppTimeoutInfo(applicationTimeout);
+-
+-    return Response.status(Status.OK).entity(result).build();
+-  }
+-
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority, HttpServletRequest hsr,
+-      String appId) throws YarnException, InterruptedException, IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (targetPriority == null) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    Priority newPriority = Priority.newInstance(targetPriority.getPriority());
+-    appReport.setPriority(newPriority);
+-
+-    return Response.status(Status.OK).entity(targetPriority).build();
+-  }
+-
+-  @Override
+-  public AppPriority getAppPriority(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    Priority priority = appReport.getPriority();
+-
+-    return new AppPriority(priority.getPriority());
+-  }
+-
+-  @Override
+-  public AppQueue getAppQueue(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-    String queue = applicationMap.get(applicationId).getQueue();
+-    return new AppQueue(queue);
+-  }
+-
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue, HttpServletRequest hsr, String appId)
+-      throws AuthorizationException, YarnException, InterruptedException, IOException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-    if (targetQueue == null || StringUtils.isBlank(targetQueue.getQueue())) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    String originalQueue = appReport.getQueue();
+-    appReport.setQueue(targetQueue.getQueue());
+-    applicationMap.put(applicationId, appReport);
+-    LOG.info("Update applicationId = {} from originalQueue = {} to targetQueue = {}.",
+-        appId, originalQueue, targetQueue);
+-
+-    AppQueue targetAppQueue = new AppQueue(targetQueue.getQueue());
+-    return Response.status(Status.OK).entity(targetAppQueue).build();
+-  }
+-
+-  public void updateApplicationState(YarnApplicationState appState, String appId)
+-      throws AuthorizationException, YarnException, InterruptedException, IOException {
+-    validateRunning();
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-    ApplicationReport appReport = applicationMap.get(applicationId);
+-    appReport.setYarnApplicationState(appState);
+-  }
+-
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(
+-      HttpServletRequest hsr, Set<String> stateQueries, Set<String> typeQueries) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    Map<String, StatisticsItemInfo> itemInfoMap = new HashMap<>();
+-
+-    for (ApplicationReport appReport : applicationMap.values()) {
+-
+-      YarnApplicationState appState = appReport.getYarnApplicationState();
+-      String appType = appReport.getApplicationType();
+-
+-      if (stateQueries.contains(appState.name()) && typeQueries.contains(appType)) {
+-        String itemInfoMapKey = appState.toString() + "_" + appType;
+-        StatisticsItemInfo itemInfo = itemInfoMap.getOrDefault(itemInfoMapKey, null);
+-        if (itemInfo == null) {
+-          itemInfo = new StatisticsItemInfo(appState, appType, 1);
+-        } else {
+-          long newCount = itemInfo.getCount() + 1;
+-          itemInfo.setCount(newCount);
+-        }
+-        itemInfoMap.put(itemInfoMapKey, itemInfo);
+-      }
+-    }
+-
+-    return new ApplicationStatisticsInfo(itemInfoMap.values());
+-  }
+-
+-  @Override
+-  public AppActivitiesInfo getAppActivities(
+-      HttpServletRequest hsr, String appId, String time, Set<String> requestPriorities,
+-      Set<String> allocationRequestIds, String groupBy, String limit, Set<String> actions,
+-      boolean summarize) {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ApplicationId applicationId = ApplicationId.fromString(appId);
+-    if (!applicationMap.containsKey(applicationId)) {
+-      throw new NotFoundException("app with id: " + appId + " not found");
+-    }
+-
+-    SchedulerNode schedulerNode = TestUtils.getMockNode("host0", "rack", 1, 10240);
+-
+-    RMContext rmContext = Mockito.mock(RMContext.class);
+-    Mockito.when(rmContext.getYarnConfiguration()).thenReturn(this.getConf());
+-    ResourceScheduler scheduler = Mockito.mock(ResourceScheduler.class);
+-    Mockito.when(scheduler.getMinimumResourceCapability()).thenReturn(Resources.none());
+-    Mockito.when(rmContext.getScheduler()).thenReturn(scheduler);
+-    LeafQueue mockQueue = Mockito.mock(LeafQueue.class);
+-    Map<ApplicationId, RMApp> rmApps = new ConcurrentHashMap<>();
+-    Mockito.doReturn(rmApps).when(rmContext).getRMApps();
+-
+-    FiCaSchedulerNode node = (FiCaSchedulerNode) schedulerNode;
+-    ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(applicationId, 0);
+-    RMApp mockApp = Mockito.mock(RMApp.class);
+-    Mockito.doReturn(appAttemptId.getApplicationId()).when(mockApp).getApplicationId();
+-    Mockito.doReturn(FinalApplicationStatus.UNDEFINED).when(mockApp).getFinalApplicationStatus();
+-    rmApps.put(appAttemptId.getApplicationId(), mockApp);
+-    FiCaSchedulerApp app = new FiCaSchedulerApp(appAttemptId, "user", mockQueue,
+-        mock(ActiveUsersManager.class), rmContext);
+-
+-    ActivitiesManager newActivitiesManager = new ActivitiesManager(rmContext);
+-    newActivitiesManager.turnOnAppActivitiesRecording(app.getApplicationId(), 3);
+-
+-    int numActivities = 10;
+-    for (int i = 0; i < numActivities; i++) {
+-      ActivitiesLogger.APP.startAppAllocationRecording(newActivitiesManager, node,
+-          SystemClock.getInstance().getTime(), app);
+-      ActivitiesLogger.APP.recordAppActivityWithoutAllocation(newActivitiesManager, node, app,
+-          new SchedulerRequestKey(Priority.newInstance(0), 0, null),
+-          ActivityDiagnosticConstant.NODE_IS_BLACKLISTED, ActivityState.REJECTED,
+-          ActivityLevel.NODE);
+-      ActivitiesLogger.APP.finishSkippedAppAllocationRecording(newActivitiesManager,
+-          app.getApplicationId(), ActivityState.SKIPPED, ActivityDiagnosticConstant.EMPTY);
+-    }
+-
+-    Set<Integer> prioritiesInt =
+-        requestPriorities.stream().map(pri -> Integer.parseInt(pri)).collect(Collectors.toSet());
+-    Set<Long> allocationReqIds =
+-        allocationRequestIds.stream().map(id -> Long.parseLong(id)).collect(Collectors.toSet());
+-    AppActivitiesInfo appActivitiesInfo = newActivitiesManager.
+-        getAppActivitiesInfo(app.getApplicationId(), prioritiesInt, allocationReqIds, null,
+-        Integer.parseInt(limit), summarize, 3);
+-
+-    return appActivitiesInfo;
+-  }
+-
+-  @Override
+-  public Response listReservation(String queue, String reservationId, long startTime, long endTime,
+-      boolean includeResourceAllocations, HttpServletRequest hsr) throws Exception {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    if (!StringUtils.equals(queue, QUEUE_DEDICATED_FULL)) {
+-      throw new RuntimeException("The specified queue: " + queue +
+-          " is not managed by reservation system." +
+-          " Please try again with a valid reservable queue.");
+-    }
+-
+-    ReservationId reservationID =
+-        ReservationId.parseReservationId(reservationId);
+-
+-    if (!reservationMap.containsKey(reservationID)) {
+-      throw new NotFoundException("reservationId with id: " + reservationId + " not found");
+-    }
+-
+-    ClientRMService clientService = mockRM.getClientRMService();
+-
+-    // listReservations
+-    ReservationListRequest request = ReservationListRequest.newInstance(
+-        queue, reservationId, startTime, endTime, includeResourceAllocations);
+-    ReservationListResponse resRespInfo = clientService.listReservations(request);
+-    ReservationListInfo resResponse =
+-        new ReservationListInfo(resRespInfo, includeResourceAllocations);
+-
+-    return Response.status(Status.OK).entity(resResponse).build();
+-  }
+-
+-  @Override
+-  public Response createNewReservation(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ReservationId resId = ReservationId.newInstance(Time.now(), resCounter.incrementAndGet());
+-    LOG.info("Allocated new reservationId: {}.", resId);
+-
+-    NewReservation reservationId = new NewReservation(resId.toString());
+-    return Response.status(Status.OK).entity(reservationId).build();
+-  }
+-
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException, InterruptedException {
+-
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    ReservationId reservationId = ReservationId.parseReservationId(resContext.getReservationId());
+-    ReservationDefinitionInfo definitionInfo = resContext.getReservationDefinition();
+-    ReservationDefinition definition =
+-            RouterServerUtil.convertReservationDefinition(definitionInfo);
+-    ReservationSubmissionRequest request = ReservationSubmissionRequest.newInstance(
+-            definition, resContext.getQueue(), reservationId);
+-    submitReservation(request);
+-
+-    LOG.info("Reservation submitted: {}.", reservationId);
+-
+-    SubClusterId subClusterId = getSubClusterId();
+-    reservationMap.put(reservationId, subClusterId);
+-
+-    return Response.status(Status.ACCEPTED).build();
+-  }
+-
+-  private void submitReservation(ReservationSubmissionRequest request) {
+-    try {
+-      // synchronize plan
+-      ReservationSystem reservationSystem = mockRM.getReservationSystem();
+-      reservationSystem.synchronizePlan(QUEUE_DEDICATED_FULL, true);
+-      // Generate reserved resources
+-      ClientRMService clientService = mockRM.getClientRMService();
+-      clientService.submitReservation(request);
+-    } catch (IOException | YarnException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException, InterruptedException {
+-
+-    if (resContext == null || resContext.getReservationId() == null ||
+-        resContext.getReservationDefinition() == null) {
+-      return Response.status(Status.BAD_REQUEST).build();
+-    }
+-
+-    String resId = resContext.getReservationId();
+-    ReservationId reservationId = ReservationId.parseReservationId(resId);
+-
+-    if (!reservationMap.containsKey(reservationId)) {
+-      throw new NotFoundException("reservationId with id: " + reservationId + " not found");
+-    }
+-
+-    // Generate reserved resources
+-    updateReservation(resContext);
+-
+-    ReservationUpdateResponseInfo resRespInfo = new ReservationUpdateResponseInfo();
+-    return Response.status(Status.OK).entity(resRespInfo).build();
+-  }
+-
+-  private void updateReservation(ReservationUpdateRequestInfo resContext) throws IOException {
+-
+-    if (resContext == null) {
+-      throw new BadRequestException("Input ReservationSubmissionContext should not be null");
+-    }
+-
+-    ReservationDefinitionInfo resInfo = resContext.getReservationDefinition();
+-    if (resInfo == null) {
+-      throw new BadRequestException("Input ReservationDefinition should not be null");
+-    }
+-
+-    ReservationRequestsInfo resReqsInfo = resInfo.getReservationRequests();
+-    if (resReqsInfo == null || resReqsInfo.getReservationRequest() == null
+-        || resReqsInfo.getReservationRequest().isEmpty()) {
+-      throw new BadRequestException("The ReservationDefinition should " +
+-          "contain at least one ReservationRequest");
+-    }
+-
+-    if (resContext.getReservationId() == null) {
+-      throw new BadRequestException("Update operations must specify an existing ReservationId");
+-    }
+-
+-    ReservationRequestInterpreter[] values = ReservationRequestInterpreter.values();
+-    ReservationRequestInterpreter requestInterpreter =
+-        values[resReqsInfo.getReservationRequestsInterpreter()];
+-    List<ReservationRequest> list = new ArrayList<>();
+-
+-    for (ReservationRequestInfo resReqInfo : resReqsInfo.getReservationRequest()) {
+-      ResourceInfo rInfo = resReqInfo.getCapability();
+-      Resource capability = Resource.newInstance(rInfo.getMemorySize(), rInfo.getvCores());
+-      int numContainers = resReqInfo.getNumContainers();
+-      int minConcurrency = resReqInfo.getMinConcurrency();
+-      long duration = resReqInfo.getDuration();
+-      ReservationRequest rr = ReservationRequest.newInstance(
+-          capability, numContainers, minConcurrency, duration);
+-      list.add(rr);
+-    }
+-
+-    ReservationRequests reqs = ReservationRequests.newInstance(list, requestInterpreter);
+-    ReservationDefinition rDef = ReservationDefinition.newInstance(
+-        resInfo.getArrival(), resInfo.getDeadline(), reqs,
+-        resInfo.getReservationName(), resInfo.getRecurrenceExpression(),
+-        Priority.newInstance(resInfo.getPriority()));
+-    ReservationUpdateRequest request = ReservationUpdateRequest.newInstance(
+-        rDef, ReservationId.parseReservationId(resContext.getReservationId()));
+-
+-    ClientRMService clientService = mockRM.getClientRMService();
+-    try {
+-      clientService.updateReservation(request);
+-    } catch (YarnException ex) {
+-      throw new RuntimeException(ex);
+-    }
+-  }
+-
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext, HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    if (!isRunning) {
+-      throw new RuntimeException("RM is stopped");
+-    }
+-
+-    try {
+-      String resId = resContext.getReservationId();
+-      ReservationId reservationId = ReservationId.parseReservationId(resId);
+-
+-      if (!reservationMap.containsKey(reservationId)) {
+-        throw new NotFoundException("reservationId with id: " + reservationId + " not found");
+-      }
+-
+-      ReservationDeleteRequest reservationDeleteRequest =
+-          ReservationDeleteRequest.newInstance(reservationId);
+-      ClientRMService clientService = mockRM.getClientRMService();
+-      clientService.deleteReservation(reservationDeleteRequest);
+-
+-      ReservationDeleteResponseInfo resRespInfo = new ReservationDeleteResponseInfo();
+-      reservationMap.remove(reservationId);
+-
+-      return Response.status(Status.OK).entity(resRespInfo).build();
+-    } catch (YarnException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  @VisibleForTesting
+-  public MockRM getMockRM() {
+-    return mockRM;
+-  }
+-
+-  @VisibleForTesting
+-  public void setMockRM(MockRM mockResourceManager) {
+-    this.mockRM = mockResourceManager;
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getRMNodeLabels(HttpServletRequest hsr) {
+-
+-    NodeLabelInfo nodeLabelInfo = new NodeLabelInfo();
+-    nodeLabelInfo.setExclusivity(true);
+-    nodeLabelInfo.setName("Test-Label");
+-    nodeLabelInfo.setActiveNMs(10);
+-    PartitionInfo partitionInfo = new PartitionInfo();
+-
+-    NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo();
+-    nodeLabelsInfo.getNodeLabelsInfo().add(nodeLabelInfo);
+-
+-    return nodeLabelsInfo;
+-  }
+-
+-  private MockRM setupResourceManager() throws Exception {
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-
+-    CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
+-
+-    // Define default queue
+-    conf.setCapacity(QUEUE_DEFAULT_FULL, 20);
+-    // Define dedicated queues
+-    conf.setQueues(CapacitySchedulerConfiguration.ROOT,
+-        new String[] {QUEUE_DEFAULT,  QUEUE_DEDICATED});
+-    conf.setCapacity(QUEUE_DEDICATED_FULL, 80);
+-    conf.setReservable(QUEUE_DEDICATED_FULL, true);
+-
+-    conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, ResourceScheduler.class);
+-    conf.setBoolean(YarnConfiguration.RM_RESERVATION_SYSTEM_ENABLE, true);
+-    MockRM rm = new MockRM(conf);
+-    rm.start();
+-    rm.registerNode("127.0.0.1:5678", 100*1024, 100);
+-    return rm;
+-  }
+-
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
+-      String queueAclType, HttpServletRequest hsr) throws AuthorizationException {
+-
+-    ResourceManager mockResourceManager = mock(ResourceManager.class);
+-    Configuration conf = new YarnConfiguration();
+-
+-    ResourceScheduler mockScheduler = new CapacityScheduler() {
+-      @Override
+-      public synchronized boolean checkAccess(UserGroupInformation callerUGI,
+-          QueueACL acl, String queueName) {
+-        if (acl == QueueACL.ADMINISTER_QUEUE) {
+-          if (callerUGI.getUserName().equals("admin")) {
+-            return true;
+-          }
+-        } else {
+-          if (ImmutableSet.of("admin", "yarn").contains(callerUGI.getUserName())) {
+-            return true;
+-          }
+-        }
+-        return false;
+-      }
+-    };
+-
+-    when(mockResourceManager.getResourceScheduler()).thenReturn(mockScheduler);
+-    MockRMWebServices webSvc = new MockRMWebServices(mockResourceManager, conf,
+-        mock(HttpServletResponse.class));
+-    return webSvc.checkUserAccessToQueue(queue, username, queueAclType, hsr);
+-  }
+-
+-  class MockRMWebServices {
+-
+-    @Context
+-    private HttpServletResponse httpServletResponse;
+-    private ResourceManager resourceManager;
+-
+-    private void initForReadableEndpoints() {
+-      // clear content type
+-      httpServletResponse.setContentType(null);
+-    }
+-
+-    MockRMWebServices(ResourceManager rm, Configuration conf, HttpServletResponse response) {
+-      this.resourceManager = rm;
+-      this.httpServletResponse = response;
+-    }
+-
+-    private UserGroupInformation getCallerUserGroupInformation(
+-        HttpServletRequest hsr, boolean usePrincipal) {
+-
+-      String remoteUser = hsr.getRemoteUser();
+-
+-      if (usePrincipal) {
+-        Principal princ = hsr.getUserPrincipal();
+-        remoteUser = princ == null ? null : princ.getName();
+-      }
+-
+-      UserGroupInformation callerUGI = null;
+-      if (remoteUser != null) {
+-        callerUGI = UserGroupInformation.createRemoteUser(remoteUser);
+-      }
+-
+-      return callerUGI;
+-    }
+-
+-    public RMQueueAclInfo checkUserAccessToQueue(
+-        String queue, String username, String queueAclType, HttpServletRequest hsr)
+-        throws AuthorizationException {
+-      initForReadableEndpoints();
+-
+-      // For the user who invokes this REST call, he/she should have admin access
+-      // to the queue. Otherwise we will reject the call.
+-      UserGroupInformation callerUGI = getCallerUserGroupInformation(hsr, true);
+-      if (callerUGI != null && !this.resourceManager.getResourceScheduler().checkAccess(
+-              callerUGI, QueueACL.ADMINISTER_QUEUE, queue)) {
+-        throw new ForbiddenException(
+-                "User=" + callerUGI.getUserName() + " doesn't haven access to queue="
+-                        + queue + " so it cannot check ACLs for other users.");
+-      }
+-
+-      // Create UGI for the to-be-checked user.
+-      UserGroupInformation user = UserGroupInformation.createRemoteUser(username);
+-      if (user == null) {
+-        throw new ForbiddenException(
+-           "Failed to retrieve UserGroupInformation for user=" + username);
+-      }
+-
+-      // Check if the specified queue acl is valid.
+-      QueueACL queueACL;
+-      try {
+-        queueACL = QueueACL.valueOf(queueAclType);
+-      } catch (IllegalArgumentException e) {
+-        throw new BadRequestException("Specified queueAclType=" + queueAclType
+-            + " is not a valid type, valid queue acl types={"
+-            + "SUBMIT_APPLICATIONS/ADMINISTER_QUEUE}");
+-      }
+-
+-      if (!this.resourceManager.getResourceScheduler().checkAccess(user, queueACL, queue)) {
+-        return new RMQueueAclInfo(false, user.getUserName(),
+-            "User=" + username + " doesn't have access to queue=" + queue
+-            + " with acl-type=" + queueAclType);
+-      }
+-
+-      return new RMQueueAclInfo(true, user.getUserName(), "");
+-    }
+-
+-    public String dumpSchedulerLogs(String time, HttpServletRequest hsr)
+-        throws IOException {
+-
+-      int period = Integer.parseInt(time);
+-      if (period <= 0) {
+-        throw new BadRequestException("Period must be greater than 0");
+-      }
+-
+-      return "Capacity scheduler logs are being created.";
+-    }
+-  }
+-
+-  @Override
+-  public String dumpSchedulerLogs(String time, HttpServletRequest hsr) throws IOException {
+-    ResourceManager mockResourceManager = mock(ResourceManager.class);
+-    Configuration conf = new YarnConfiguration();
+-    MockRMWebServices webSvc = new MockRMWebServices(mockResourceManager, conf,
+-        mock(HttpServletResponse.class));
+-    return webSvc.dumpSchedulerLogs(time, hsr);
+-  }
+-
+-  public Response replaceLabelsOnNodes(NodeToLabelsEntryList newNodeToLabels,
+-      HttpServletRequest hsr) throws IOException {
+-    return super.replaceLabelsOnNodes(newNodeToLabels, hsr);
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNode(Set<String> newNodeLabelsName,
+-      HttpServletRequest hsr, String nodeId) throws Exception {
+-    return super.replaceLabelsOnNode(newNodeLabelsName, hsr, nodeId);
+-  }
+-
+-  public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId, String groupBy) {
+-    if (!EnumUtils.isValidEnum(RMWSConsts.ActivitiesGroupBy.class, groupBy.toUpperCase())) {
+-      String errMessage = "Got invalid groupBy: " + groupBy + ", valid groupBy types: "
+-          + Arrays.asList(RMWSConsts.ActivitiesGroupBy.values());
+-      throw new IllegalArgumentException(errMessage);
+-    }
+-
+-    SubClusterId subClusterId = getSubClusterId();
+-    ActivitiesInfo activitiesInfo = mock(ActivitiesInfo.class);
+-    Mockito.when(activitiesInfo.getNodeId()).thenReturn(nodeId);
+-    Mockito.when(activitiesInfo.getTimestamp()).thenReturn(1673081972L);
+-    Mockito.when(activitiesInfo.getDiagnostic()).thenReturn("Diagnostic:" + subClusterId.getId());
+-
+-    List<NodeAllocationInfo> allocationInfos = new ArrayList<>();
+-    NodeAllocationInfo nodeAllocationInfo = mock(NodeAllocationInfo.class);
+-    Mockito.when(nodeAllocationInfo.getPartition()).thenReturn("p" + subClusterId.getId());
+-    Mockito.when(nodeAllocationInfo.getFinalAllocationState()).thenReturn("ALLOCATED");
+-
+-    allocationInfos.add(nodeAllocationInfo);
+-    Mockito.when(activitiesInfo.getAllocations()).thenReturn(allocationInfos);
+-    return activitiesInfo;
+-  }
+-
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
+-      String groupBy, int activitiesCount) {
+-
+-    if (activitiesCount <= 0) {
+-      throw new IllegalArgumentException("activitiesCount needs to be greater than 0.");
+-    }
+-
+-    if (!EnumUtils.isValidEnum(RMWSConsts.ActivitiesGroupBy.class, groupBy.toUpperCase())) {
+-      String errMessage = "Got invalid groupBy: " + groupBy + ", valid groupBy types: "
+-          + Arrays.asList(RMWSConsts.ActivitiesGroupBy.values());
+-      throw new IllegalArgumentException(errMessage);
+-    }
+-
+-    BulkActivitiesInfo bulkActivitiesInfo = new BulkActivitiesInfo();
+-
+-    for (int i = 0; i < activitiesCount; i++) {
+-      SubClusterId subClusterId = getSubClusterId();
+-      ActivitiesInfo activitiesInfo = mock(ActivitiesInfo.class);
+-      Mockito.when(activitiesInfo.getNodeId()).thenReturn(subClusterId + "-nodeId-" + i);
+-      Mockito.when(activitiesInfo.getTimestamp()).thenReturn(1673081972L);
+-      Mockito.when(activitiesInfo.getDiagnostic()).thenReturn("Diagnostic:" + subClusterId.getId());
+-
+-      List<NodeAllocationInfo> allocationInfos = new ArrayList<>();
+-      NodeAllocationInfo nodeAllocationInfo = mock(NodeAllocationInfo.class);
+-      Mockito.when(nodeAllocationInfo.getPartition()).thenReturn("p" + subClusterId.getId());
+-      Mockito.when(nodeAllocationInfo.getFinalAllocationState()).thenReturn("ALLOCATED");
+-
+-      allocationInfos.add(nodeAllocationInfo);
+-      Mockito.when(activitiesInfo.getAllocations()).thenReturn(allocationInfos);
+-      bulkActivitiesInfo.getActivities().add(activitiesInfo);
+-    }
+-
+-    return bulkActivitiesInfo;
+-  }
+-
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    try {
+-      ResourceManager resourceManager = CapacitySchedulerTestUtilities.createResourceManager();
+-      CapacityScheduler cs = (CapacityScheduler) resourceManager.getResourceScheduler();
+-      CSQueue root = cs.getRootQueue();
+-      SchedulerInfo schedulerInfo = new CapacitySchedulerInfo(root, cs);
+-      return new SchedulerTypeInfo(schedulerInfo);
+-    } catch (Exception e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels, HttpServletRequest hsr)
+-      throws Exception {
+-    List<NodeLabelInfo> nodeLabelInfoList = newNodeLabels.getNodeLabelsInfo();
+-    NodeLabelInfo nodeLabelInfo = nodeLabelInfoList.get(0);
+-    String nodeLabelName = nodeLabelInfo.getName();
+-
+-    // If nodeLabelName is ALL, we let all subclusters pass
+-    if (StringUtils.equals("ALL", nodeLabelName)) {
+-      return Response.status(Status.OK).build();
+-    } else if (StringUtils.equals("A0", nodeLabelName)) {
+-      SubClusterId subClusterId = getSubClusterId();
+-      String id = subClusterId.getId();
+-      if (StringUtils.contains("A0", id)) {
+-        return Response.status(Status.OK).build();
+-      } else {
+-        return Response.status(Status.BAD_REQUEST).entity(null).build();
+-      }
+-    }
+-    throw new YarnException("addToClusterNodeLabels Error");
+-  }
+-
+-  @Override
+-  public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels, HttpServletRequest hsr)
+-      throws Exception {
+-    // If oldNodeLabels contains ALL, we let all subclusters pass
+-    if (oldNodeLabels.contains("ALL")) {
+-      return Response.status(Status.OK).build();
+-    } else if (oldNodeLabels.contains("A0")) {
+-      SubClusterId subClusterId = getSubClusterId();
+-      String id = subClusterId.getId();
+-      if (StringUtils.contains("A0", id)) {
+-        return Response.status(Status.OK).build();
+-      } else {
+-        return Response.status(Status.BAD_REQUEST).entity(null).build();
+-      }
+-    }
+-    throw new YarnException("removeFromClusterNodeLabels Error");
+-  }
+-
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest req) throws AuthorizationException, InterruptedException {
+-    RMContext rmContext = mockRM.getRMContext();
+-    MutableCSConfigurationProvider provider = new MutableCSConfigurationProvider(rmContext);
+-    try {
+-      Configuration conf = new Configuration();
+-      conf.set(YarnConfiguration.SCHEDULER_CONFIGURATION_STORE_CLASS,
+-          YarnConfiguration.MEMORY_CONFIGURATION_STORE);
+-      provider.init(conf);
+-      provider.logAndApplyMutation(UserGroupInformation.getCurrentUser(), mutationInfo);
+-    } catch (Exception e) {
+-      throw new RuntimeException(e);
+-    }
+-    return Response.status(Status.OK).
+-        entity("Configuration change successfully applied.").build();
+-  }
+-
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest req) throws AuthorizationException {
+-    return Response.status(Status.OK).entity(new ConfInfo(mockRM.getConfig()))
+-        .build();
+-  }
+-
+-  public ClusterInfo getClusterInfo() {
+-    ClusterInfo clusterInfo = new ClusterInfo(mockRM);
+-    return clusterInfo;
+-  }
+-
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(HttpServletRequest hsr) {
+-    String remoteUser = hsr.getRemoteUser();
+-    UserGroupInformation callerUGI = UserGroupInformation.createRemoteUser(remoteUser);
+-    return new ClusterUserInfo(mockRM, callerUGI);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRESTRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRESTRequestInterceptor.java
+deleted file mode 100644
+index a09199b9e85..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRESTRequestInterceptor.java
++++ /dev/null
+@@ -1,394 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.Set;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-
+-/**
+- * This class mocks the RESTRequestInterceptor.
+- */
+-public class MockRESTRequestInterceptor extends AbstractRESTRequestInterceptor {
+-
+-  @Override
+-  public void setNextInterceptor(RESTRequestInterceptor next) {
+-    throw new YarnRuntimeException(
+-        "setNextInterceptor is being called on MockRESTRequestInterceptor,"
+-            + "which should be the last one in the chain. "
+-            + "Check if the interceptor pipeline configuration is correct");
+-  }
+-
+-  @Override
+-  public ClusterInfo get() {
+-    return new ClusterInfo();
+-  }
+-
+-  @Override
+-  public ClusterInfo getClusterInfo() {
+-    return new ClusterInfo();
+-  }
+-
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(HttpServletRequest hsr) {
+-    return new ClusterUserInfo();
+-  }
+-
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    return new ClusterMetricsInfo();
+-  }
+-
+-  @Override
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    return new SchedulerTypeInfo();
+-  }
+-
+-  @Override
+-  public String dumpSchedulerLogs(String time, HttpServletRequest hsr)
+-      throws IOException {
+-    return "Done";
+-  }
+-
+-  @Override
+-  public NodesInfo getNodes(String states) {
+-    return new NodesInfo();
+-  }
+-
+-  @Override
+-  public NodeInfo getNode(String nodeId) {
+-    return new NodeInfo();
+-  }
+-
+-  @Override
+-  public ResourceInfo updateNodeResource(HttpServletRequest hsr, String nodeId,
+-      ResourceOptionInfo resourceOption) throws AuthorizationException {
+-    return new ResourceInfo();
+-  }
+-
+-  @SuppressWarnings("checkstyle:parameternumber")
+-  @Override
+-  public AppsInfo getApps(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-    return new AppsInfo();
+-  }
+-
+-  @Override
+-  public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
+-      String groupBy) {
+-    return new ActivitiesInfo();
+-  }
+-
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
+-       String groupBy, int activitiesCount) throws InterruptedException{
+-    return new BulkActivitiesInfo();
+-  }
+-
+-  @Override
+-  public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
+-      String appId, String time, Set<String> requestPriorities,
+-      Set<String> allocationRequestIds, String groupBy, String limit,
+-      Set<String> actions, boolean summarize) {
+-    return new AppActivitiesInfo();
+-  }
+-
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(HttpServletRequest hsr,
+-      Set<String> stateQueries, Set<String> typeQueries) {
+-    return new ApplicationStatisticsInfo();
+-  }
+-
+-  @Override
+-  public AppInfo getApp(HttpServletRequest hsr, String appId,
+-      Set<String> unselectedFields) {
+-    return new AppInfo();
+-  }
+-
+-  @Override
+-  public AppState getAppState(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return new AppState();
+-  }
+-
+-  @Override
+-  public Response updateAppState(AppState targetState, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return new NodeToLabelsInfo();
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getRMNodeLabels(HttpServletRequest hsr) throws IOException {
+-    return new NodeLabelsInfo();
+-  }
+-
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(Set<String> labels)
+-      throws IOException {
+-    return new LabelsToNodesInfo();
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNodes(NodeToLabelsEntryList newNodeToLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNode(Set<String> newNodeLabelsName,
+-      HttpServletRequest hsr, String nodeId) throws Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return new NodeLabelsInfo();
+-  }
+-
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(HttpServletRequest hsr, String nodeId)
+-      throws IOException {
+-    return new NodeLabelsInfo();
+-  }
+-
+-  @Override
+-  public AppPriority getAppPriority(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return new AppPriority();
+-  }
+-
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public AppQueue getAppQueue(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return new AppQueue();
+-  }
+-
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response createNewApplication(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response postDelegationToken(DelegationToken tokenData,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException,
+-      InterruptedException, Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response postDelegationTokenExpiration(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response cancelDelegationToken(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response createNewReservation(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response listReservation(String queue, String reservationId,
+-      long startTime, long endTime, boolean includeResourceAllocations,
+-      HttpServletRequest hsr) throws Exception {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(HttpServletRequest hsr, String appId,
+-      String type) throws AuthorizationException {
+-    return new AppTimeoutInfo();
+-  }
+-
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return new AppTimeoutsInfo();
+-  }
+-
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId) {
+-    return new AppAttemptsInfo();
+-  }
+-
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
+-      String queueAclType, HttpServletRequest hsr) {
+-    return new RMQueueAclInfo(true, username, "");
+-  }
+-
+-  @Override
+-  public AppAttemptInfo getAppAttempt(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return new AppAttemptInfo();
+-  }
+-
+-  @Override
+-  public ContainersInfo getContainers(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return new ContainersInfo();
+-  }
+-
+-  @Override
+-  public ContainerInfo getContainer(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId,
+-      String containerId) {
+-    return new ContainerInfo();
+-  }
+-
+-  @Override
+-  public Response signalToContainer(String containerId, String command,
+-      HttpServletRequest req) {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest hsr) throws AuthorizationException, InterruptedException {
+-    return Response.status(Status.OK).build();
+-  }
+-
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest hsr)
+-      throws AuthorizationException {
+-    return Response.status(Status.OK).build();
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRouter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRouter.java
+deleted file mode 100644
+index 95b9e13936f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/MockRouter.java
++++ /dev/null
+@@ -1,99 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.commons.io.FileUtils;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.Router;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.nio.charset.StandardCharsets;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-public class MockRouter extends Router {
+-
+-  private FederationStateStoreFacade facade;
+-
+-  public MockRouter(Configuration configuration)
+-      throws InterruptedException, YarnException, IOException {
+-    this.setConfig(configuration);
+-
+-    boolean isEnabled = configuration.getBoolean(
+-        YarnConfiguration.FEDERATION_ENABLED,
+-        YarnConfiguration.DEFAULT_FEDERATION_ENABLED);
+-
+-    if (isEnabled) {
+-      facade = FederationStateStoreFacade.getInstance(configuration);
+-      initTestFederationSubCluster();
+-    }
+-  }
+-
+-  public void initTestFederationSubCluster()
+-      throws IOException, InterruptedException, YarnException {
+-
+-    // Initialize subcluster information
+-    String scAmRMAddress = "5.6.7.8:5";
+-    String scClientRMAddress = "5.6.7.8:6";
+-    String scRmAdminAddress = "5.6.7.8:7";
+-    String scWebAppAddress = "127.0.0.1:8080";
+-
+-    // Initialize subcluster capability
+-    String[] capabilityPathItems = new String[] {".", "target", "test-classes", "capability"};
+-    String capabilityPath = StringUtils.join(capabilityPathItems, File.separator);
+-    String capabilityJson =
+-        FileUtils.readFileToString(new File(capabilityPath), StandardCharsets.UTF_8);
+-
+-    // capability json needs to remove asflicense
+-    String regex = "\"___asflicense__.*\\n(.*,\\n){1,15}.*\\n.*";
+-    Pattern p = Pattern.compile(regex);
+-    Matcher m = p.matcher(capabilityJson);
+-    capabilityJson = m.replaceAll("").trim();
+-
+-    // Initialize subcluster sc1
+-    SubClusterInfo sc1 =
+-        SubClusterInfo.newInstance(SubClusterId.newInstance("SC-1"),
+-        scAmRMAddress, scClientRMAddress, scRmAdminAddress, scWebAppAddress,
+-        SubClusterState.SC_RUNNING, Time.now(), capabilityJson);
+-    Thread.sleep(5000);
+-    sc1.setLastHeartBeat(Time.now());
+-
+-    // Initialize subcluster sc2
+-    SubClusterInfo sc2 =
+-        SubClusterInfo.newInstance(SubClusterId.newInstance("SC-2"),
+-        scAmRMAddress, scClientRMAddress, scRmAdminAddress, scWebAppAddress,
+-        SubClusterState.SC_RUNNING, Time.now(), capabilityJson);
+-    Thread.sleep(5000);
+-    sc2.setLastHeartBeat(Time.now());
+-
+-    FederationStateStore stateStore = facade.getStateStore();
+-    stateStore.registerSubCluster(SubClusterRegisterRequest.newInstance(sc1));
+-    stateStore.registerSubCluster(SubClusterRegisterRequest.newInstance(sc2));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java
+deleted file mode 100644
+index 1bffd40db3c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/PassThroughRESTRequestInterceptor.java
++++ /dev/null
+@@ -1,401 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.Set;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import javax.ws.rs.core.Response;
+-
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-
+-/**
+- * Mock interceptor that does not do anything other than forwarding it to the
+- * next interceptor in the chain.
+- */
+-public class PassThroughRESTRequestInterceptor
+-    extends AbstractRESTRequestInterceptor {
+-
+-  @Override
+-  public AppAttemptsInfo getAppAttempts(HttpServletRequest hsr, String appId) {
+-    return getNextInterceptor().getAppAttempts(hsr, appId);
+-  }
+-
+-  @Override
+-  public RMQueueAclInfo checkUserAccessToQueue(String queue, String username,
+-      String queueAclType, HttpServletRequest hsr)
+-      throws AuthorizationException {
+-    return getNextInterceptor().checkUserAccessToQueue(queue, username,
+-        queueAclType, hsr);
+-  }
+-
+-  @Override
+-  public AppAttemptInfo getAppAttempt(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return getNextInterceptor().getAppAttempt(req, res, appId, appAttemptId);
+-  }
+-
+-  @Override
+-  public ContainersInfo getContainers(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId) {
+-    return getNextInterceptor().getContainers(req, res, appId, appAttemptId);
+-  }
+-
+-  @Override
+-  public ContainerInfo getContainer(HttpServletRequest req,
+-      HttpServletResponse res, String appId, String appAttemptId,
+-      String containerId) {
+-    return getNextInterceptor().getContainer(req, res, appId, appAttemptId,
+-        containerId);
+-  }
+-
+-  @Override
+-  public ClusterInfo get() {
+-    return getNextInterceptor().get();
+-  }
+-
+-  @Override
+-  public ClusterInfo getClusterInfo() {
+-    return getNextInterceptor().getClusterInfo();
+-  }
+-
+-  @Override
+-  public ClusterUserInfo getClusterUserInfo(HttpServletRequest hsr) {
+-    return getNextInterceptor().getClusterUserInfo(hsr);
+-  }
+-
+-  @Override
+-  public ClusterMetricsInfo getClusterMetricsInfo() {
+-    return getNextInterceptor().getClusterMetricsInfo();
+-  }
+-
+-  @Override
+-  public SchedulerTypeInfo getSchedulerInfo() {
+-    return getNextInterceptor().getSchedulerInfo();
+-  }
+-
+-  @Override
+-  public String dumpSchedulerLogs(String time, HttpServletRequest hsr)
+-      throws IOException {
+-    return getNextInterceptor().dumpSchedulerLogs(time, hsr);
+-  }
+-
+-  @Override
+-  public NodesInfo getNodes(String states) {
+-    return getNextInterceptor().getNodes(states);
+-  }
+-
+-  @Override
+-  public NodeInfo getNode(String nodeId) {
+-    return getNextInterceptor().getNode(nodeId);
+-  }
+-
+-  @Override
+-  public ResourceInfo updateNodeResource(HttpServletRequest hsr, String nodeId,
+-      ResourceOptionInfo resourceOption) throws AuthorizationException {
+-    return getNextInterceptor().updateNodeResource(
+-        hsr, nodeId, resourceOption);
+-  }
+-
+-  @Override
+-  public AppsInfo getApps(HttpServletRequest hsr, String stateQuery,
+-      Set<String> statesQuery, String finalStatusQuery, String userQuery,
+-      String queueQuery, String count, String startedBegin, String startedEnd,
+-      String finishBegin, String finishEnd, Set<String> applicationTypes,
+-      Set<String> applicationTags, String name, Set<String> unselectedFields) {
+-    return getNextInterceptor().getApps(hsr, stateQuery, statesQuery,
+-        finalStatusQuery, userQuery, queueQuery, count, startedBegin,
+-        startedEnd, finishBegin, finishEnd, applicationTypes, applicationTags,
+-        name, unselectedFields);
+-  }
+-
+-  @Override
+-  public ActivitiesInfo getActivities(HttpServletRequest hsr, String nodeId,
+-      String groupBy) {
+-    return getNextInterceptor().getActivities(hsr, nodeId, groupBy);
+-  }
+-
+-  @Override
+-  public BulkActivitiesInfo getBulkActivities(HttpServletRequest hsr,
+-      String groupBy, int activitiesCount) throws InterruptedException {
+-    return getNextInterceptor().getBulkActivities(hsr, groupBy,
+-        activitiesCount);
+-  }
+-
+-  @Override
+-  public AppActivitiesInfo getAppActivities(HttpServletRequest hsr,
+-      String appId, String time, Set<String> requestPriorities,
+-      Set<String> allocationRequestIds, String groupBy, String limit,
+-      Set<String> actions, boolean summarize) {
+-    return getNextInterceptor().getAppActivities(hsr, appId, time,
+-        requestPriorities, allocationRequestIds, groupBy, limit,
+-        actions, summarize);
+-  }
+-
+-  @Override
+-  public ApplicationStatisticsInfo getAppStatistics(HttpServletRequest hsr,
+-      Set<String> stateQueries, Set<String> typeQueries) {
+-    return getNextInterceptor().getAppStatistics(hsr, stateQueries,
+-        typeQueries);
+-  }
+-
+-  @Override
+-  public AppInfo getApp(HttpServletRequest hsr, String appId,
+-      Set<String> unselectedFields) {
+-    return getNextInterceptor().getApp(hsr, appId, unselectedFields);
+-  }
+-
+-  @Override
+-  public AppState getAppState(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return getNextInterceptor().getAppState(hsr, appId);
+-  }
+-
+-  @Override
+-  public Response updateAppState(AppState targetState, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return getNextInterceptor().updateAppState(targetState, hsr, appId);
+-  }
+-
+-  @Override
+-  public NodeToLabelsInfo getNodeToLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return getNextInterceptor().getNodeToLabels(hsr);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getRMNodeLabels(HttpServletRequest hsr) throws IOException {
+-    return getNextInterceptor().getRMNodeLabels(hsr);
+-  }
+-
+-  @Override
+-  public LabelsToNodesInfo getLabelsToNodes(Set<String> labels)
+-      throws IOException {
+-    return getNextInterceptor().getLabelsToNodes(labels);
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNodes(NodeToLabelsEntryList newNodeToLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return getNextInterceptor().replaceLabelsOnNodes(newNodeToLabels, hsr);
+-  }
+-
+-  @Override
+-  public Response replaceLabelsOnNode(Set<String> newNodeLabelsName,
+-      HttpServletRequest hsr, String nodeId) throws Exception {
+-    return getNextInterceptor().replaceLabelsOnNode(newNodeLabelsName, hsr,
+-        nodeId);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getClusterNodeLabels(HttpServletRequest hsr)
+-      throws IOException {
+-    return getNextInterceptor().getClusterNodeLabels(hsr);
+-  }
+-
+-  @Override
+-  public Response addToClusterNodeLabels(NodeLabelsInfo newNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return getNextInterceptor().addToClusterNodeLabels(newNodeLabels, hsr);
+-  }
+-
+-  @Override
+-  public Response removeFromClusterNodeLabels(Set<String> oldNodeLabels,
+-      HttpServletRequest hsr) throws Exception {
+-    return getNextInterceptor().removeFromClusterNodeLabels(oldNodeLabels, hsr);
+-  }
+-
+-  @Override
+-  public NodeLabelsInfo getLabelsOnNode(HttpServletRequest hsr, String nodeId)
+-      throws IOException {
+-    return getNextInterceptor().getLabelsOnNode(hsr, nodeId);
+-  }
+-
+-  @Override
+-  public AppPriority getAppPriority(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return getNextInterceptor().getAppPriority(hsr, appId);
+-  }
+-
+-  @Override
+-  public Response updateApplicationPriority(AppPriority targetPriority,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return getNextInterceptor().updateApplicationPriority(targetPriority, hsr,
+-        appId);
+-  }
+-
+-  @Override
+-  public AppQueue getAppQueue(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return getNextInterceptor().getAppQueue(hsr, appId);
+-  }
+-
+-  @Override
+-  public Response updateAppQueue(AppQueue targetQueue, HttpServletRequest hsr,
+-      String appId) throws AuthorizationException, YarnException,
+-      InterruptedException, IOException {
+-    return getNextInterceptor().updateAppQueue(targetQueue, hsr, appId);
+-  }
+-
+-  @Override
+-  public Response createNewApplication(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().createNewApplication(hsr);
+-  }
+-
+-  @Override
+-  public Response submitApplication(ApplicationSubmissionContextInfo newApp,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().submitApplication(newApp, hsr);
+-  }
+-
+-  @Override
+-  public Response postDelegationToken(DelegationToken tokenData,
+-      HttpServletRequest hsr) throws AuthorizationException, IOException,
+-      InterruptedException, Exception {
+-    return getNextInterceptor().postDelegationToken(tokenData, hsr);
+-  }
+-
+-  @Override
+-  public Response postDelegationTokenExpiration(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, Exception {
+-    return getNextInterceptor().postDelegationTokenExpiration(hsr);
+-  }
+-
+-  @Override
+-  public Response cancelDelegationToken(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException,
+-      Exception {
+-    return getNextInterceptor().cancelDelegationToken(hsr);
+-  }
+-
+-  @Override
+-  public Response createNewReservation(HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().createNewReservation(hsr);
+-  }
+-
+-  @Override
+-  public Response submitReservation(ReservationSubmissionRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().submitReservation(resContext, hsr);
+-  }
+-
+-  @Override
+-  public Response updateReservation(ReservationUpdateRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().updateReservation(resContext, hsr);
+-  }
+-
+-  @Override
+-  public Response deleteReservation(ReservationDeleteRequestInfo resContext,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, IOException, InterruptedException {
+-    return getNextInterceptor().deleteReservation(resContext, hsr);
+-  }
+-
+-  @Override
+-  public Response listReservation(String queue, String reservationId,
+-      long startTime, long endTime, boolean includeResourceAllocations,
+-      HttpServletRequest hsr) throws Exception {
+-    return getNextInterceptor().listReservation(queue, reservationId, startTime,
+-        endTime, includeResourceAllocations, hsr);
+-  }
+-
+-  @Override
+-  public AppTimeoutInfo getAppTimeout(HttpServletRequest hsr, String appId,
+-      String type) throws AuthorizationException {
+-    return getNextInterceptor().getAppTimeout(hsr, appId, type);
+-  }
+-
+-  @Override
+-  public AppTimeoutsInfo getAppTimeouts(HttpServletRequest hsr, String appId)
+-      throws AuthorizationException {
+-    return getNextInterceptor().getAppTimeouts(hsr, appId);
+-  }
+-
+-  @Override
+-  public Response updateApplicationTimeout(AppTimeoutInfo appTimeout,
+-      HttpServletRequest hsr, String appId) throws AuthorizationException,
+-      YarnException, InterruptedException, IOException {
+-    return getNextInterceptor().updateApplicationTimeout(appTimeout, hsr,
+-        appId);
+-  }
+-
+-  @Override
+-  public Response signalToContainer(String containerId,
+-      String command, HttpServletRequest req) throws AuthorizationException {
+-    return getNextInterceptor().signalToContainer(containerId, command, req);
+-  }
+-
+-  @Override
+-  public Response updateSchedulerConfiguration(SchedConfUpdateInfo mutationInfo,
+-      HttpServletRequest hsr)
+-      throws AuthorizationException, InterruptedException {
+-    return getNextInterceptor().updateSchedulerConfiguration(mutationInfo, hsr);
+-  }
+-
+-  @Override
+-  public Response getSchedulerConfiguration(HttpServletRequest hsr)
+-      throws AuthorizationException {
+-    return getNextInterceptor().getSchedulerConfiguration(hsr);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
+deleted file mode 100644
+index 9bde2a3dcd1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorREST.java
++++ /dev/null
+@@ -1,2267 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.security.Principal;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.Arrays;
+-import java.util.HashSet;
+-import java.util.Collections;
+-import java.util.stream.Collectors;
+-import java.util.concurrent.TimeUnit;
+-
+-import javax.servlet.http.HttpServletRequest;
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.core.Response.Status;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.security.authorize.AuthorizationException;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.http.HttpConfig;
+-import org.apache.hadoop.util.Lists;
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReservationSubmissionRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ReservationId;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceOption;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.ApplicationTimeoutType;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.ReservationDefinition;
+-import org.apache.hadoop.yarn.api.records.Priority;
+-import org.apache.hadoop.yarn.api.records.ReservationRequest;
+-import org.apache.hadoop.yarn.api.records.ReservationRequests;
+-import org.apache.hadoop.yarn.api.records.ReservationRequestInterpreter;
+-import org.apache.hadoop.yarn.api.records.ContainerId;
+-import org.apache.hadoop.yarn.api.records.QueueACL;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.UniformBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationListInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.RMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.NodeIDsInfo;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService.RequestInterceptorChainWrapper;
+-import org.apache.hadoop.yarn.server.router.clientrm.TestableFederationClientInterceptor;
+-import org.apache.hadoop.yarn.server.router.security.RouterDelegationTokenSecretManager;
+-import org.apache.hadoop.yarn.server.router.webapp.cache.RouterAppInfoCacheKey;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDefinitionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfoList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeAllocationInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationConfInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationRMQueueAclInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationBulkActivitiesInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationSchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.dao.FederationClusterUserInfo;
+-import org.apache.hadoop.yarn.util.LRUCacheHashMap;
+-import org.apache.hadoop.yarn.util.MonotonicClock;
+-import org.apache.hadoop.yarn.util.Times;
+-import org.apache.hadoop.yarn.util.YarnVersionInfo;
+-import org.apache.hadoop.yarn.webapp.BadRequestException;
+-import org.apache.hadoop.yarn.webapp.dao.ConfInfo;
+-import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo;
+-import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.junit.Assert;
+-import org.junit.Test;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_KEY_UPDATE_INTERVAL_KEY;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_MAX_LIFETIME_KEY;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_DEFAULT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_KEY;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.MockDefaultRequestInterceptorREST.DURATION;
+-import static org.apache.hadoop.yarn.server.router.webapp.MockDefaultRequestInterceptorREST.NUM_CONTAINERS;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Extends the {@code BaseRouterClientRMTest} and overrides methods in order to
+- * use the {@code RouterClientRMService} pipeline test cases for testing the
+- * {@code FederationInterceptor} class. The tests for
+- * {@code RouterClientRMService} has been written cleverly so that it can be
+- * reused to validate different request interceptor chains.
+- */
+-public class TestFederationInterceptorREST extends BaseRouterWebServicesTest {
+-
+-  private final static int NUM_SUBCLUSTER = 4;
+-  private static final int BAD_REQUEST = 400;
+-  private static final int ACCEPTED = 202;
+-  private static final String TEST_USER = "test-user";
+-  private static final int OK = 200;
+-  private static String user = "test-user";
+-  private TestableFederationInterceptorREST interceptor;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreTestUtil stateStoreUtil;
+-  private List<SubClusterId> subClusters;
+-  private static final String TEST_RENEWER = "test-renewer";
+-
+-  public void setUp() throws YarnException, IOException {
+-
+-    super.setUpConfig();
+-    interceptor = new TestableFederationInterceptorREST();
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(this.getConf());
+-    FederationStateStoreFacade.getInstance(this.getConf()).reinitialize(stateStore,
+-        this.getConf());
+-    stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-
+-    interceptor.setConf(this.getConf());
+-    interceptor.init(TEST_USER);
+-
+-    subClusters = new ArrayList<>();
+-
+-    for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-      SubClusterId sc = SubClusterId.newInstance(Integer.toString(i));
+-      stateStoreUtil.registerSubCluster(sc);
+-      subClusters.add(sc);
+-    }
+-
+-    RouterClientRMService routerClientRMService = new RouterClientRMService();
+-    routerClientRMService.initUserPipelineMap(getConf());
+-    long secretKeyInterval = this.getConf().getLong(
+-        RM_DELEGATION_KEY_UPDATE_INTERVAL_KEY, RM_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT);
+-    long tokenMaxLifetime = this.getConf().getLong(
+-        RM_DELEGATION_TOKEN_MAX_LIFETIME_KEY, RM_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT);
+-    long tokenRenewInterval = this.getConf().getLong(
+-        RM_DELEGATION_TOKEN_RENEW_INTERVAL_KEY, RM_DELEGATION_TOKEN_RENEW_INTERVAL_DEFAULT);
+-    long removeScanInterval = this.getConf().getTimeDuration(
+-        RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_KEY,
+-        RM_DELEGATION_TOKEN_REMOVE_SCAN_INTERVAL_DEFAULT, TimeUnit.MILLISECONDS);
+-    RouterDelegationTokenSecretManager tokenSecretManager = new RouterDelegationTokenSecretManager(
+-        secretKeyInterval, tokenMaxLifetime, tokenRenewInterval, removeScanInterval,
+-        this.getConf());
+-    tokenSecretManager.startThreads();
+-    routerClientRMService.setRouterDTSecretManager(tokenSecretManager);
+-
+-    TestableFederationClientInterceptor clientInterceptor =
+-        new TestableFederationClientInterceptor();
+-    clientInterceptor.setConf(this.getConf());
+-    clientInterceptor.init(TEST_RENEWER);
+-    clientInterceptor.setTokenSecretManager(tokenSecretManager);
+-    RequestInterceptorChainWrapper wrapper = new RequestInterceptorChainWrapper();
+-    wrapper.init(clientInterceptor);
+-    routerClientRMService.getUserPipelineMap().put(TEST_RENEWER, wrapper);
+-    interceptor.setRouterClientRMService(routerClientRMService);
+-
+-    for (SubClusterId subCluster : subClusters) {
+-      SubClusterInfo subClusterInfo = stateStoreUtil.querySubClusterInfo(subCluster);
+-      interceptor.getOrCreateInterceptorForSubCluster(
+-          subCluster, subClusterInfo.getRMWebServiceAddress());
+-    }
+-
+-    interceptor.setupResourceManager();
+-
+-  }
+-
+-  @Override
+-  public void tearDown() {
+-    interceptor.shutdown();
+-    super.tearDown();
+-  }
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    conf.set(YarnConfiguration.ROUTER_WEBAPP_DEFAULT_INTERCEPTOR_CLASS,
+-        MockDefaultRequestInterceptorREST.class.getName());
+-    String mockPassThroughInterceptorClass =
+-        PassThroughRESTRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain is the federation interceptor that calls the mock resource manager.
+-    // The others in the chain will simply forward it to the next one in the
+-    // chain
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + ","
+-            + TestableFederationInterceptorREST.class.getName());
+-
+-    conf.set(YarnConfiguration.FEDERATION_POLICY_MANAGER,
+-        UniformBroadcastPolicyManager.class.getName());
+-
+-    // Disable StateStoreFacade cache
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-
+-    // Open AppsInfo Cache
+-    conf.setBoolean(YarnConfiguration.ROUTER_APPSINFO_ENABLED, true);
+-    conf.setInt(YarnConfiguration.ROUTER_APPSINFO_CACHED_COUNT, 10);
+-
+-    return conf;
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication. The return
+-   * ApplicationId has to belong to one of the SubCluster in the cluster.
+-   */
+-  @Test
+-  public void testGetNewApplication() throws IOException, InterruptedException {
+-
+-    Response response = interceptor.createNewApplication(null);
+-
+-    Assert.assertNotNull(response);
+-    NewApplication ci = (NewApplication) response.getEntity();
+-    Assert.assertNotNull(ci);
+-    ApplicationId appId = ApplicationId.fromString(ci.getApplicationId());
+-    Assert.assertTrue(appId.getClusterTimestamp() < NUM_SUBCLUSTER);
+-    Assert.assertTrue(appId.getClusterTimestamp() >= 0);
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication. The application
+-   * has to be submitted to one of the SubCluster in the cluster.
+-   */
+-  @Test
+-  public void testSubmitApplication()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    Response response = interceptor.submitApplication(context, null);
+-    Assert.assertEquals(ACCEPTED, response.getStatus());
+-    SubClusterId ci = (SubClusterId) response.getEntity();
+-
+-    Assert.assertNotNull(response);
+-    SubClusterId scIdResult = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult);
+-    Assert.assertTrue(subClusters.contains(scIdResult));
+-    Assert.assertEquals(ci, scIdResult);
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of
+-   * multiple submission. The first retry has to be submitted to the same
+-   * SubCluster of the first attempt.
+-   */
+-  @Test
+-  public void testSubmitApplicationMultipleSubmission()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // First attempt
+-    Response response = interceptor.submitApplication(context, null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(ACCEPTED, response.getStatus());
+-
+-    SubClusterId scIdResult = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult);
+-
+-    // First retry
+-    response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(ACCEPTED, response.getStatus());
+-    SubClusterId scIdResult2 = stateStoreUtil.queryApplicationHomeSC(appId);
+-    Assert.assertNotNull(scIdResult2);
+-    Assert.assertEquals(scIdResult, scIdResult2);
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of empty
+-   * request.
+-   */
+-  @Test
+-  public void testSubmitApplicationEmptyRequest() throws IOException, InterruptedException {
+-
+-    // ApplicationSubmissionContextInfo null
+-    Response response = interceptor.submitApplication(null, null);
+-
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-
+-    // ApplicationSubmissionContextInfo empty
+-    response = interceptor
+-        .submitApplication(new ApplicationSubmissionContextInfo(), null);
+-
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    response = interceptor.submitApplication(context, null);
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case of
+-   * application in wrong format.
+-   */
+-  @Test
+-  public void testSubmitApplicationWrongFormat() throws IOException, InterruptedException {
+-
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId("Application_wrong_id");
+-    Response response = interceptor.submitApplication(context, null);
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testForceKillApplication()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Submit the application we are going to kill later
+-    Response response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    AppState appState = new AppState("KILLED");
+-
+-    Response responseKill =
+-        interceptor.updateAppState(appState, null, appId.toString());
+-    Assert.assertNotNull(responseKill);
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case of
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testForceKillApplicationNotExists()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-    AppState appState = new AppState("KILLED");
+-
+-    Response response =
+-        interceptor.updateAppState(appState, null, appId.toString());
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case of
+-   * application in wrong format.
+-   */
+-  @Test
+-  public void testForceKillApplicationWrongFormat()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    AppState appState = new AppState("KILLED");
+-    Response response =
+-        interceptor.updateAppState(appState, null, "Application_wrong_id");
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-  }
+-
+-  /**
+-   * This test validates the correctness of ForceKillApplication in case of
+-   * empty request.
+-   */
+-  @Test
+-  public void testForceKillApplicationEmptyRequest()
+-      throws YarnException, IOException, InterruptedException {
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Submit the application we are going to kill later
+-    interceptor.submitApplication(context, null);
+-
+-    Response response =
+-        interceptor.updateAppState(null, null, appId.toString());
+-    Assert.assertEquals(BAD_REQUEST, response.getStatus());
+-
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testGetApplicationReport()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Submit the application we want the report later
+-    Response response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    AppInfo responseGet = interceptor.getApp(null, appId.toString(), null);
+-
+-    Assert.assertNotNull(responseGet);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case the
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testGetApplicationNotExists() {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-
+-    AppInfo response = interceptor.getApp(null, appId.toString(), null);
+-
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationReport in case of
+-   * application in wrong format.
+-   */
+-  @Test
+-  public void testGetApplicationWrongFormat() {
+-
+-    AppInfo response = interceptor.getApp(null, "Application_wrong_id", null);
+-
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationsReport in case each
+-   * subcluster provided one application.
+-   */
+-  @Test
+-  public void testGetApplicationsReport() {
+-
+-    AppsInfo responseGet = interceptor.getApps(null, null, null, null, null,
+-        null, null, null, null, null, null, null, null, null, null);
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertEquals(NUM_SUBCLUSTER, responseGet.getApps().size());
+-    // The merged operations is tested in TestRouterWebServiceUtil
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case each subcluster
+-   * provided one node with the LastHealthUpdate set to the SubClusterId. The
+-   * expected result would be the NodeInfo from the last SubCluster that has
+-   * LastHealthUpdate equal to Num_SubCluster -1.
+-   */
+-  @Test
+-  public void testGetNode() {
+-
+-    NodeInfo responseGet = interceptor.getNode("testGetNode");
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertEquals(NUM_SUBCLUSTER - 1, responseGet.getLastHealthUpdate());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case each subcluster
+-   * provided one node.
+-   */
+-  @Test
+-  public void testGetNodes() {
+-
+-    NodesInfo responseGet = interceptor.getNodes(null);
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertEquals(NUM_SUBCLUSTER, responseGet.getNodes().size());
+-    // The remove duplicate operations is tested in TestRouterWebServiceUtil
+-  }
+-
+-  /**
+-   * This test validates the correctness of updateNodeResource().
+-   */
+-  @Test
+-  public void testUpdateNodeResource() {
+-    List<NodeInfo> nodes = interceptor.getNodes(null).getNodes();
+-    Assert.assertFalse(nodes.isEmpty());
+-    final String nodeId = nodes.get(0).getNodeId();
+-    ResourceOptionInfo resourceOption = new ResourceOptionInfo(
+-        ResourceOption.newInstance(
+-            Resource.newInstance(2048, 3), 1000));
+-    ResourceInfo resource = interceptor.updateNodeResource(
+-        null, nodeId, resourceOption);
+-    Assert.assertNotNull(resource);
+-    Assert.assertEquals(2048, resource.getMemorySize());
+-    Assert.assertEquals(3, resource.getvCores());
+-  }
+-
+-  /**
+-   * This test validates the correctness of getClusterMetricsInfo in case each
+-   * SubCluster provided a ClusterMetricsInfo with appsSubmitted set to the
+-   * SubClusterId. The expected result would be appSubmitted equals to the sum
+-   * of SubClusterId. SubClusterId in this case is an integer.
+-   */
+-  @Test
+-  public void testGetClusterMetrics() {
+-
+-    ClusterMetricsInfo responseGet = interceptor.getClusterMetricsInfo();
+-
+-    Assert.assertNotNull(responseGet);
+-    int expectedAppSubmitted = 0;
+-    for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-      expectedAppSubmitted += i;
+-    }
+-    Assert.assertEquals(expectedAppSubmitted, responseGet.getAppsSubmitted());
+-    // The merge operations is tested in TestRouterWebServiceUtil
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationState in case the
+-   * application exists in the cluster.
+-   */
+-  @Test
+-  public void testGetApplicationState()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Submit the application we want the report later
+-    Response response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    AppState responseGet = interceptor.getAppState(null, appId.toString());
+-
+-    Assert.assertNotNull(responseGet);
+-    Assert.assertEquals(MockDefaultRequestInterceptorREST.APP_STATE_RUNNING,
+-        responseGet.getState());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationState in case the
+-   * application does not exist in StateStore.
+-   */
+-  @Test
+-  public void testGetApplicationStateNotExists() throws IOException {
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(Time.now(), 1);
+-
+-    AppState response = interceptor.getAppState(null, appId.toString());
+-
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApplicationState in case of
+-   * application in wrong format.
+-   */
+-  @Test
+-  public void testGetApplicationStateWrongFormat()
+-      throws IOException {
+-
+-    AppState response = interceptor.getAppState(null, "Application_wrong_id");
+-
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the creation of new interceptor in case of a
+-   * RMSwitchover in a subCluster.
+-   */
+-  @Test
+-  public void testRMSwitchoverOfOneSC() throws Exception {
+-    SubClusterId subClusterId = SubClusterId.newInstance(Integer.toString(0));
+-
+-    interceptor.getClusterMetricsInfo();
+-    Assert.assertEquals("http://1.2.3.4:4", interceptor
+-            .getInterceptorForSubCluster(subClusterId).getWebAppAddress());
+-
+-    //Register the first subCluster with secondRM simulating RMSwitchover
+-    registerSubClusterWithSwitchoverRM(subClusterId);
+-
+-    interceptor.getClusterMetricsInfo();
+-    Assert.assertEquals("http://5.6.7.8:8", interceptor
+-            .getInterceptorForSubCluster(subClusterId).getWebAppAddress());
+-  }
+-
+-  private void registerSubClusterWithSwitchoverRM(SubClusterId subClusterId)
+-          throws YarnException {
+-    String amRMAddress = "5.6.7.8:5";
+-    String clientRMAddress = "5.6.7.8:6";
+-    String rmAdminAddress = "5.6.7.8:7";
+-    String webAppAddress = "5.6.7.8:8";
+-
+-    SubClusterInfo subClusterInfo = SubClusterInfo.newInstance(subClusterId,
+-            amRMAddress, clientRMAddress, rmAdminAddress, webAppAddress,
+-            SubClusterState.SC_RUNNING, new MonotonicClock().getTime(),
+-            "capability");
+-    stateStore.registerSubCluster(
+-            SubClusterRegisterRequest.newInstance(subClusterInfo));
+-  }
+-
+-  @Test
+-  public void testGetContainers()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Submit the application we want the report later
+-    Response response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertNotNull(stateStoreUtil.queryApplicationHomeSC(appId));
+-
+-    ApplicationAttemptId appAttempt = ApplicationAttemptId.newInstance(appId, 1);
+-
+-    ContainersInfo responseGet = interceptor.getContainers(
+-        null, null, appId.toString(), appAttempt.toString());
+-
+-    Assert.assertEquals(4, responseGet.getContainers().size());
+-  }
+-
+-  @Test
+-  public void testGetContainersNotExists() throws Exception {
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the appAttemptId is empty or null.",
+-        () -> interceptor.getContainers(null, null, appId.toString(), null));
+-  }
+-
+-  @Test
+-  public void testGetContainersWrongFormat() throws Exception {
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationAttemptId appAttempt = ApplicationAttemptId.newInstance(appId, 1);
+-
+-    // Test Case 1: appId is wrong format, appAttemptId is accurate.
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Invalid ApplicationId prefix: Application_wrong_id. " +
+-        "The valid ApplicationId should start with prefix application",
+-        () -> interceptor.getContainers(null, null, "Application_wrong_id", appAttempt.toString()));
+-
+-    // Test Case2: appId is accurate, appAttemptId is wrong format.
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Invalid AppAttemptId prefix: AppAttempt_wrong_id",
+-        () -> interceptor.getContainers(null, null, appId.toString(), "AppAttempt_wrong_id"));
+-  }
+-
+-  @Test
+-  public void testGetNodeToLabels() throws IOException {
+-    NodeToLabelsInfo info = interceptor.getNodeToLabels(null);
+-    HashMap<String, NodeLabelsInfo> map = info.getNodeToLabels();
+-    Assert.assertNotNull(map);
+-    Assert.assertEquals(2, map.size());
+-
+-    NodeLabelsInfo node1Value = map.getOrDefault("node1", null);
+-    Assert.assertNotNull(node1Value);
+-    Assert.assertEquals(1, node1Value.getNodeLabelsName().size());
+-    Assert.assertEquals("CPU", node1Value.getNodeLabelsName().get(0));
+-
+-    NodeLabelsInfo node2Value = map.getOrDefault("node2", null);
+-    Assert.assertNotNull(node2Value);
+-    Assert.assertEquals(1, node2Value.getNodeLabelsName().size());
+-    Assert.assertEquals("GPU", node2Value.getNodeLabelsName().get(0));
+-  }
+-
+-  @Test
+-  public void testGetLabelsToNodes() throws Exception {
+-    LabelsToNodesInfo labelsToNodesInfo = interceptor.getLabelsToNodes(null);
+-    Map<NodeLabelInfo, NodeIDsInfo> map = labelsToNodesInfo.getLabelsToNodes();
+-    Assert.assertNotNull(map);
+-    Assert.assertEquals(3, map.size());
+-
+-    NodeLabel labelX = NodeLabel.newInstance("x", false);
+-    NodeLabelInfo nodeLabelInfoX = new NodeLabelInfo(labelX);
+-    NodeIDsInfo nodeIDsInfoX = map.get(nodeLabelInfoX);
+-    Assert.assertNotNull(nodeIDsInfoX);
+-    Assert.assertEquals(2, nodeIDsInfoX.getNodeIDs().size());
+-    Resource resourceX =
+-        nodeIDsInfoX.getPartitionInfo().getResourceAvailable().getResource();
+-    Assert.assertNotNull(resourceX);
+-    Assert.assertEquals(4*10, resourceX.getVirtualCores());
+-    Assert.assertEquals(4*20*1024, resourceX.getMemorySize());
+-
+-    NodeLabel labelY = NodeLabel.newInstance("y", false);
+-    NodeLabelInfo nodeLabelInfoY = new NodeLabelInfo(labelY);
+-    NodeIDsInfo nodeIDsInfoY = map.get(nodeLabelInfoY);
+-    Assert.assertNotNull(nodeIDsInfoY);
+-    Assert.assertEquals(2, nodeIDsInfoY.getNodeIDs().size());
+-    Resource resourceY =
+-        nodeIDsInfoY.getPartitionInfo().getResourceAvailable().getResource();
+-    Assert.assertNotNull(resourceY);
+-    Assert.assertEquals(4*20, resourceY.getVirtualCores());
+-    Assert.assertEquals(4*40*1024, resourceY.getMemorySize());
+-  }
+-
+-  @Test
+-  public void testGetClusterNodeLabels() throws Exception {
+-    NodeLabelsInfo nodeLabelsInfo = interceptor.getClusterNodeLabels(null);
+-    Assert.assertNotNull(nodeLabelsInfo);
+-    Assert.assertEquals(2, nodeLabelsInfo.getNodeLabelsName().size());
+-
+-    List<String> nodeLabelsName = nodeLabelsInfo.getNodeLabelsName();
+-    Assert.assertNotNull(nodeLabelsName);
+-    Assert.assertTrue(nodeLabelsName.contains("cpu"));
+-    Assert.assertTrue(nodeLabelsName.contains("gpu"));
+-
+-    ArrayList<NodeLabelInfo> nodeLabelInfos = nodeLabelsInfo.getNodeLabelsInfo();
+-    Assert.assertNotNull(nodeLabelInfos);
+-    Assert.assertEquals(2, nodeLabelInfos.size());
+-    NodeLabelInfo cpuNodeLabelInfo = new NodeLabelInfo("cpu", false);
+-    Assert.assertTrue(nodeLabelInfos.contains(cpuNodeLabelInfo));
+-    NodeLabelInfo gpuNodeLabelInfo = new NodeLabelInfo("gpu", false);
+-    Assert.assertTrue(nodeLabelInfos.contains(gpuNodeLabelInfo));
+-  }
+-
+-  @Test
+-  public void testGetLabelsOnNode() throws Exception {
+-    NodeLabelsInfo nodeLabelsInfo = interceptor.getLabelsOnNode(null, "node1");
+-    Assert.assertNotNull(nodeLabelsInfo);
+-    Assert.assertEquals(2, nodeLabelsInfo.getNodeLabelsName().size());
+-
+-    List<String> nodeLabelsName = nodeLabelsInfo.getNodeLabelsName();
+-    Assert.assertNotNull(nodeLabelsName);
+-    Assert.assertTrue(nodeLabelsName.contains("x"));
+-    Assert.assertTrue(nodeLabelsName.contains("y"));
+-
+-    // null request
+-    interceptor.setAllowPartialResult(false);
+-    NodeLabelsInfo nodeLabelsInfo2 = interceptor.getLabelsOnNode(null, "node2");
+-    Assert.assertNotNull(nodeLabelsInfo2);
+-    Assert.assertEquals(0, nodeLabelsInfo2.getNodeLabelsName().size());
+-  }
+-
+-  @Test
+-  public void testGetContainer() throws Exception {
+-    //
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationAttemptId appAttemptId = ApplicationAttemptId.newInstance(appId, 1);
+-    ContainerId appContainerId = ContainerId.newContainerId(appAttemptId, 1);
+-    String applicationId = appId.toString();
+-    String attemptId = appAttemptId.toString();
+-    String containerId = appContainerId.toString();
+-
+-    // Submit application to multiSubCluster
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(applicationId);
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    // Test Case1: Wrong ContainerId
+-    LambdaTestUtils.intercept(IllegalArgumentException.class, "Invalid ContainerId prefix: 0",
+-        () -> interceptor.getContainer(null, null, applicationId, attemptId, "0"));
+-
+-    // Test Case2: Correct ContainerId
+-
+-    ContainerInfo containerInfo = interceptor.getContainer(null, null, applicationId,
+-        attemptId, containerId);
+-    Assert.assertNotNull(containerInfo);
+-  }
+-
+-  @Test
+-  public void testGetAppAttempts() throws IOException, InterruptedException {
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    AppAttemptsInfo appAttemptsInfo = interceptor.getAppAttempts(null, appId.toString());
+-    Assert.assertNotNull(appAttemptsInfo);
+-
+-    ArrayList<AppAttemptInfo> attemptLists = appAttemptsInfo.getAttempts();
+-    Assert.assertNotNull(appAttemptsInfo);
+-    Assert.assertEquals(2, attemptLists.size());
+-
+-    AppAttemptInfo attemptInfo1 = attemptLists.get(0);
+-    Assert.assertNotNull(attemptInfo1);
+-    Assert.assertEquals(0, attemptInfo1.getAttemptId());
+-    Assert.assertEquals("AppAttemptId_0", attemptInfo1.getAppAttemptId());
+-    Assert.assertEquals("LogLink_0", attemptInfo1.getLogsLink());
+-    Assert.assertEquals(1659621705L, attemptInfo1.getFinishedTime());
+-
+-    AppAttemptInfo attemptInfo2 = attemptLists.get(1);
+-    Assert.assertNotNull(attemptInfo2);
+-    Assert.assertEquals(0, attemptInfo2.getAttemptId());
+-    Assert.assertEquals("AppAttemptId_1", attemptInfo2.getAppAttemptId());
+-    Assert.assertEquals("LogLink_1", attemptInfo2.getLogsLink());
+-    Assert.assertEquals(1659621705L, attemptInfo2.getFinishedTime());
+-  }
+-
+-  @Test
+-  public void testGetAppAttempt() throws IOException, InterruptedException {
+-
+-    // Generate ApplicationId information
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Generate ApplicationAttemptId information
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-    ApplicationAttemptId expectAppAttemptId = ApplicationAttemptId.newInstance(appId, 1);
+-    String appAttemptId = expectAppAttemptId.toString();
+-
+-    org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo
+-        appAttemptInfo = interceptor.getAppAttempt(null, null, appId.toString(), appAttemptId);
+-
+-    Assert.assertNotNull(appAttemptInfo);
+-    Assert.assertEquals(expectAppAttemptId.toString(), appAttemptInfo.getAppAttemptId());
+-    Assert.assertEquals("url", appAttemptInfo.getTrackingUrl());
+-    Assert.assertEquals("oUrl", appAttemptInfo.getOriginalTrackingUrl());
+-    Assert.assertEquals(124, appAttemptInfo.getRpcPort());
+-    Assert.assertEquals("host", appAttemptInfo.getHost());
+-  }
+-
+-  @Test
+-  public void testGetAppTimeout() throws IOException, InterruptedException {
+-
+-    // Generate ApplicationId information
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Generate ApplicationAttemptId information
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    ApplicationTimeoutType appTimeoutType = ApplicationTimeoutType.LIFETIME;
+-    AppTimeoutInfo appTimeoutInfo =
+-        interceptor.getAppTimeout(null, appId.toString(), appTimeoutType.toString());
+-    Assert.assertNotNull(appTimeoutInfo);
+-    Assert.assertEquals(10, appTimeoutInfo.getRemainingTimeInSec());
+-    Assert.assertEquals("UNLIMITED", appTimeoutInfo.getExpireTime());
+-    Assert.assertEquals(appTimeoutType, appTimeoutInfo.getTimeoutType());
+-  }
+-
+-  @Test
+-  public void testGetAppTimeouts() throws IOException, InterruptedException {
+-
+-    // Generate ApplicationId information
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Generate ApplicationAttemptId information
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    AppTimeoutsInfo appTimeoutsInfo = interceptor.getAppTimeouts(null, appId.toString());
+-    Assert.assertNotNull(appTimeoutsInfo);
+-
+-    List<AppTimeoutInfo> timeouts = appTimeoutsInfo.getAppTimeouts();
+-    Assert.assertNotNull(timeouts);
+-    Assert.assertEquals(1, timeouts.size());
+-
+-    AppTimeoutInfo resultAppTimeout = timeouts.get(0);
+-    Assert.assertNotNull(resultAppTimeout);
+-    Assert.assertEquals(10, resultAppTimeout.getRemainingTimeInSec());
+-    Assert.assertEquals("UNLIMITED", resultAppTimeout.getExpireTime());
+-    Assert.assertEquals(ApplicationTimeoutType.LIFETIME, resultAppTimeout.getTimeoutType());
+-  }
+-
+-  @Test
+-  public void testUpdateApplicationTimeout() throws IOException, InterruptedException,
+-      YarnException {
+-
+-    // Generate ApplicationId information
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    // Generate ApplicationAttemptId information
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    long newLifetime = 10L;
+-    // update 10L seconds more to timeout
+-    String timeout = Times.formatISO8601(Time.now() + newLifetime * 1000);
+-    AppTimeoutInfo paramAppTimeOut = new AppTimeoutInfo();
+-    paramAppTimeOut.setExpiryTime(timeout);
+-    // RemainingTime = Math.max((timeoutInMillis - System.currentTimeMillis()) / 1000, 0))
+-    paramAppTimeOut.setRemainingTime(newLifetime);
+-    paramAppTimeOut.setTimeoutType(ApplicationTimeoutType.LIFETIME);
+-
+-    Response response =
+-        interceptor.updateApplicationTimeout(paramAppTimeOut, null, appId.toString());
+-    Assert.assertNotNull(response);
+-    AppTimeoutInfo entity = (AppTimeoutInfo) response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertEquals(paramAppTimeOut.getExpireTime(), entity.getExpireTime());
+-    Assert.assertEquals(paramAppTimeOut.getTimeoutType(), entity.getTimeoutType());
+-    Assert.assertEquals(paramAppTimeOut.getRemainingTimeInSec(), entity.getRemainingTimeInSec());
+-  }
+-
+-  @Test
+-  public void testUpdateApplicationPriority() throws IOException, InterruptedException,
+-      YarnException {
+-
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setPriority(20);
+-
+-    // Submit the application we are going to kill later
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    int iPriority = 10;
+-    // Set Priority for application
+-    Response response = interceptor.updateApplicationPriority(
+-        new AppPriority(iPriority), null, appId.toString());
+-
+-    Assert.assertNotNull(response);
+-    AppPriority entity = (AppPriority) response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertEquals(iPriority, entity.getPriority());
+-  }
+-
+-  @Test
+-  public void testGetAppPriority() throws IOException, InterruptedException {
+-
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    int priority = 40;
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setPriority(priority);
+-
+-    // Submit the application we are going to kill later
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    // Set Priority for application
+-    AppPriority appPriority = interceptor.getAppPriority(null, appId.toString());
+-    Assert.assertNotNull(appPriority);
+-    Assert.assertEquals(priority, appPriority.getPriority());
+-  }
+-
+-  @Test
+-  public void testUpdateAppQueue() throws IOException, InterruptedException,
+-      YarnException {
+-
+-    String oldQueue = "oldQueue";
+-    String newQueue = "newQueue";
+-
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setQueue(oldQueue);
+-
+-    // Submit the application
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    // Set New Queue for application
+-    Response response = interceptor.updateAppQueue(new AppQueue(newQueue),
+-        null, appId.toString());
+-
+-    Assert.assertNotNull(response);
+-    AppQueue appQueue = (AppQueue) response.getEntity();
+-    Assert.assertEquals(newQueue, appQueue.getQueue());
+-
+-    // Get AppQueue by application
+-    AppQueue queue = interceptor.getAppQueue(null, appId.toString());
+-    Assert.assertNotNull(queue);
+-    Assert.assertEquals(newQueue, queue.getQueue());
+-  }
+-
+-  @Test
+-  public void testGetAppQueue() throws IOException, InterruptedException {
+-    String queueName = "queueName";
+-
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setQueue(queueName);
+-
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    // Get Queue by application
+-    AppQueue queue = interceptor.getAppQueue(null, appId.toString());
+-    Assert.assertNotNull(queue);
+-    Assert.assertEquals(queueName, queue.getQueue());
+-  }
+-
+-  @Test
+-  public void testGetAppsInfoCache() {
+-
+-    AppsInfo responseGet = interceptor.getApps(
+-        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+-    Assert.assertNotNull(responseGet);
+-
+-    RouterAppInfoCacheKey cacheKey = RouterAppInfoCacheKey.newInstance(
+-        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+-
+-    LRUCacheHashMap<RouterAppInfoCacheKey, AppsInfo> appsInfoCache =
+-        interceptor.getAppInfosCaches();
+-    Assert.assertNotNull(appsInfoCache);
+-    Assert.assertFalse(appsInfoCache.isEmpty());
+-    Assert.assertEquals(1, appsInfoCache.size());
+-    Assert.assertTrue(appsInfoCache.containsKey(cacheKey));
+-
+-    AppsInfo cacheResult = appsInfoCache.get(cacheKey);
+-    Assert.assertNotNull(cacheResult);
+-    Assert.assertEquals(responseGet, cacheResult);
+-  }
+-
+-  @Test
+-  public void testGetAppStatistics() throws IOException, InterruptedException, YarnException {
+-
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setApplicationType("MapReduce");
+-    context.setQueue("queue");
+-
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-
+-    GetApplicationHomeSubClusterRequest request =
+-        GetApplicationHomeSubClusterRequest.newInstance(appId);
+-    GetApplicationHomeSubClusterResponse response =
+-        stateStore.getApplicationHomeSubCluster(request);
+-
+-    Assert.assertNotNull(response);
+-    ApplicationHomeSubCluster homeSubCluster = response.getApplicationHomeSubCluster();
+-
+-    DefaultRequestInterceptorREST interceptorREST =
+-        interceptor.getInterceptorForSubCluster(homeSubCluster.getHomeSubCluster());
+-
+-    MockDefaultRequestInterceptorREST mockInterceptorREST =
+-        (MockDefaultRequestInterceptorREST) interceptorREST;
+-    mockInterceptorREST.updateApplicationState(YarnApplicationState.RUNNING,
+-        appId.toString());
+-
+-    Set<String> stateQueries = new HashSet<>();
+-    stateQueries.add(YarnApplicationState.RUNNING.name());
+-
+-    Set<String> typeQueries = new HashSet<>();
+-    typeQueries.add("MapReduce");
+-
+-    ApplicationStatisticsInfo response2 =
+-        interceptor.getAppStatistics(null, stateQueries, typeQueries);
+-
+-    Assert.assertNotNull(response2);
+-    Assert.assertFalse(response2.getStatItems().isEmpty());
+-
+-    StatisticsItemInfo result = response2.getStatItems().get(0);
+-    Assert.assertEquals(1, result.getCount());
+-    Assert.assertEquals(YarnApplicationState.RUNNING, result.getState());
+-    Assert.assertEquals("MapReduce", result.getType());
+-  }
+-
+-  @Test
+-  public void testGetAppActivities() throws IOException, InterruptedException {
+-    // Submit application to multiSubCluster
+-    ApplicationId appId = ApplicationId.newInstance(Time.now(), 1);
+-    ApplicationSubmissionContextInfo context = new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    context.setApplicationType("MapReduce");
+-    context.setQueue("queue");
+-
+-    Assert.assertNotNull(interceptor.submitApplication(context, null));
+-    Set<String> prioritiesSet = Collections.singleton("0");
+-    Set<String> allocationRequestIdsSet = Collections.singleton("0");
+-
+-    AppActivitiesInfo appActivitiesInfo =
+-        interceptor.getAppActivities(null, appId.toString(), String.valueOf(Time.now()),
+-        prioritiesSet, allocationRequestIdsSet, null, "-1", null, false);
+-
+-    Assert.assertNotNull(appActivitiesInfo);
+-    Assert.assertEquals(appId.toString(), appActivitiesInfo.getApplicationId());
+-    Assert.assertEquals(10, appActivitiesInfo.getAllocations().size());
+-  }
+-
+-  @Test
+-  public void testListReservation() throws Exception {
+-
+-    // submitReservation
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 1);
+-    submitReservation(reservationId);
+-
+-    // Call the listReservation method
+-    String applyReservationId = reservationId.toString();
+-    Response listReservationResponse = interceptor.listReservation(
+-        QUEUE_DEDICATED_FULL, applyReservationId, -1, -1, false, null);
+-    Assert.assertNotNull(listReservationResponse);
+-    Assert.assertNotNull(listReservationResponse.getStatus());
+-    Status status = Status.fromStatusCode(listReservationResponse.getStatus());
+-    Assert.assertEquals(Status.OK, status);
+-
+-    Object entity = listReservationResponse.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertNotNull(entity instanceof ReservationListInfo);
+-
+-    Assert.assertTrue(entity instanceof ReservationListInfo);
+-    ReservationListInfo listInfo = (ReservationListInfo) entity;
+-    Assert.assertNotNull(listInfo);
+-
+-    List<ReservationInfo> reservationInfoList = listInfo.getReservations();
+-    Assert.assertNotNull(reservationInfoList);
+-    Assert.assertEquals(1, reservationInfoList.size());
+-
+-    ReservationInfo reservationInfo = reservationInfoList.get(0);
+-    Assert.assertNotNull(reservationInfo);
+-    Assert.assertEquals(applyReservationId, reservationInfo.getReservationId());
+-
+-    ReservationDefinitionInfo definitionInfo = reservationInfo.getReservationDefinition();
+-    Assert.assertNotNull(definitionInfo);
+-
+-    ReservationRequestsInfo reservationRequestsInfo = definitionInfo.getReservationRequests();
+-    Assert.assertNotNull(reservationRequestsInfo);
+-
+-    ArrayList<ReservationRequestInfo> reservationRequestInfoList =
+-        reservationRequestsInfo.getReservationRequest();
+-    Assert.assertNotNull(reservationRequestInfoList);
+-    Assert.assertEquals(1, reservationRequestInfoList.size());
+-
+-    ReservationRequestInfo reservationRequestInfo = reservationRequestInfoList.get(0);
+-    Assert.assertNotNull(reservationRequestInfo);
+-    Assert.assertEquals(4, reservationRequestInfo.getNumContainers());
+-
+-    ResourceInfo resourceInfo = reservationRequestInfo.getCapability();
+-    Assert.assertNotNull(resourceInfo);
+-
+-    int vCore = resourceInfo.getvCores();
+-    long memory = resourceInfo.getMemorySize();
+-    Assert.assertEquals(1, vCore);
+-    Assert.assertEquals(1024, memory);
+-  }
+-
+-  @Test
+-  public void testCreateNewReservation() throws Exception {
+-    Response response = interceptor.createNewReservation(null);
+-    Assert.assertNotNull(response);
+-
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof NewReservation);
+-
+-    NewReservation newReservation = (NewReservation) entity;
+-    Assert.assertNotNull(newReservation);
+-    Assert.assertTrue(newReservation.getReservationId().contains("reservation"));
+-  }
+-
+-  @Test
+-  public void testSubmitReservation() throws Exception {
+-
+-    // submit reservation
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 2);
+-    Response response = submitReservation(reservationId);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatus());
+-
+-    String applyReservationId = reservationId.toString();
+-    Response reservationResponse = interceptor.listReservation(
+-        QUEUE_DEDICATED_FULL, applyReservationId, -1, -1, false, null);
+-    Assert.assertNotNull(reservationResponse);
+-
+-    Object entity = reservationResponse.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertNotNull(entity instanceof ReservationListInfo);
+-
+-    Assert.assertTrue(entity instanceof ReservationListInfo);
+-    ReservationListInfo listInfo = (ReservationListInfo) entity;
+-    Assert.assertNotNull(listInfo);
+-
+-    List<ReservationInfo> reservationInfos = listInfo.getReservations();
+-    Assert.assertNotNull(reservationInfos);
+-    Assert.assertEquals(1, reservationInfos.size());
+-
+-    ReservationInfo reservationInfo = reservationInfos.get(0);
+-    Assert.assertNotNull(reservationInfo);
+-    Assert.assertEquals(reservationInfo.getReservationId(), applyReservationId);
+-  }
+-
+-  @Test
+-  public void testUpdateReservation() throws Exception {
+-    // submit reservation
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 3);
+-    Response response = submitReservation(reservationId);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatus());
+-
+-    // update reservation
+-    ReservationSubmissionRequest resSubRequest =
+-        getReservationSubmissionRequest(reservationId, 6, 2048, 2);
+-    ReservationDefinition reservationDefinition = resSubRequest.getReservationDefinition();
+-    ReservationDefinitionInfo reservationDefinitionInfo =
+-        new ReservationDefinitionInfo(reservationDefinition);
+-
+-    ReservationUpdateRequestInfo updateRequestInfo = new ReservationUpdateRequestInfo();
+-    updateRequestInfo.setReservationId(reservationId.toString());
+-    updateRequestInfo.setReservationDefinition(reservationDefinitionInfo);
+-    Response updateReservationResp = interceptor.updateReservation(updateRequestInfo, null);
+-    Assert.assertNotNull(updateReservationResp);
+-    Assert.assertEquals(Status.OK.getStatusCode(), updateReservationResp.getStatus());
+-
+-    String applyReservationId = reservationId.toString();
+-    Response reservationResponse = interceptor.listReservation(
+-            QUEUE_DEDICATED_FULL, applyReservationId, -1, -1, false, null);
+-    Assert.assertNotNull(reservationResponse);
+-
+-    Object entity = reservationResponse.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertNotNull(entity instanceof ReservationListInfo);
+-
+-    Assert.assertTrue(entity instanceof ReservationListInfo);
+-    ReservationListInfo listInfo = (ReservationListInfo) entity;
+-    Assert.assertNotNull(listInfo);
+-
+-    List<ReservationInfo> reservationInfos = listInfo.getReservations();
+-    Assert.assertNotNull(reservationInfos);
+-    Assert.assertEquals(1, reservationInfos.size());
+-
+-    ReservationInfo reservationInfo = reservationInfos.get(0);
+-    Assert.assertNotNull(reservationInfo);
+-    Assert.assertEquals(reservationInfo.getReservationId(), applyReservationId);
+-
+-    ReservationDefinitionInfo resDefinitionInfo = reservationInfo.getReservationDefinition();
+-    Assert.assertNotNull(resDefinitionInfo);
+-
+-    ReservationRequestsInfo reservationRequestsInfo = resDefinitionInfo.getReservationRequests();
+-    Assert.assertNotNull(reservationRequestsInfo);
+-
+-    ArrayList<ReservationRequestInfo> reservationRequestInfoList =
+-            reservationRequestsInfo.getReservationRequest();
+-    Assert.assertNotNull(reservationRequestInfoList);
+-    Assert.assertEquals(1, reservationRequestInfoList.size());
+-
+-    ReservationRequestInfo reservationRequestInfo = reservationRequestInfoList.get(0);
+-    Assert.assertNotNull(reservationRequestInfo);
+-    Assert.assertEquals(6, reservationRequestInfo.getNumContainers());
+-
+-    ResourceInfo resourceInfo = reservationRequestInfo.getCapability();
+-    Assert.assertNotNull(resourceInfo);
+-
+-    int vCore = resourceInfo.getvCores();
+-    long memory = resourceInfo.getMemorySize();
+-    Assert.assertEquals(2, vCore);
+-    Assert.assertEquals(2048, memory);
+-  }
+-
+-  @Test
+-  public void testDeleteReservation() throws Exception {
+-    // submit reservation
+-    ReservationId reservationId = ReservationId.newInstance(Time.now(), 4);
+-    Response response = submitReservation(reservationId);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(Status.ACCEPTED.getStatusCode(), response.getStatus());
+-
+-    String applyResId = reservationId.toString();
+-    Response reservationResponse = interceptor.listReservation(
+-        QUEUE_DEDICATED_FULL, applyResId, -1, -1, false, null);
+-    Assert.assertNotNull(reservationResponse);
+-
+-    ReservationDeleteRequestInfo deleteRequestInfo =
+-        new ReservationDeleteRequestInfo();
+-    deleteRequestInfo.setReservationId(applyResId);
+-    Response delResponse = interceptor.deleteReservation(deleteRequestInfo, null);
+-    Assert.assertNotNull(delResponse);
+-
+-    LambdaTestUtils.intercept(Exception.class,
+-        "reservationId with id: " + reservationId + " not found",
+-        () -> interceptor.listReservation(QUEUE_DEDICATED_FULL, applyResId, -1, -1, false, null));
+-  }
+-
+-  private Response submitReservation(ReservationId reservationId)
+-       throws IOException, InterruptedException {
+-    ReservationSubmissionRequestInfo resSubmissionRequestInfo =
+-        getReservationSubmissionRequestInfo(reservationId);
+-    return interceptor.submitReservation(resSubmissionRequestInfo, null);
+-  }
+-
+-  public static ReservationSubmissionRequestInfo getReservationSubmissionRequestInfo(
+-      ReservationId reservationId) {
+-
+-    ReservationSubmissionRequest resSubRequest =
+-        getReservationSubmissionRequest(reservationId, NUM_CONTAINERS, 1024, 1);
+-    ReservationDefinition reservationDefinition = resSubRequest.getReservationDefinition();
+-
+-    ReservationSubmissionRequestInfo resSubmissionRequestInfo =
+-        new ReservationSubmissionRequestInfo();
+-    resSubmissionRequestInfo.setQueue(resSubRequest.getQueue());
+-    resSubmissionRequestInfo.setReservationId(reservationId.toString());
+-    ReservationDefinitionInfo reservationDefinitionInfo =
+-        new ReservationDefinitionInfo(reservationDefinition);
+-    resSubmissionRequestInfo.setReservationDefinition(reservationDefinitionInfo);
+-
+-    return resSubmissionRequestInfo;
+-  }
+-
+-  public static ReservationSubmissionRequest getReservationSubmissionRequest(
+-      ReservationId reservationId, int numContainers, int memory, int vcore) {
+-
+-    // arrival time from which the resource(s) can be allocated.
+-    long arrival = Time.now();
+-
+-    // deadline by when the resource(s) must be allocated.
+-    // The reason for choosing 1.05 is that this gives an integer
+-    // DURATION * 0.05 = 3000(ms)
+-    // deadline = arrival + 3000ms
+-    long deadline = (long) (arrival + 1.05 * DURATION);
+-
+-    return createSimpleReservationRequest(
+-        reservationId, numContainers, arrival, deadline, DURATION, memory, vcore);
+-  }
+-
+-  public static ReservationSubmissionRequest createSimpleReservationRequest(
+-      ReservationId reservationId, int numContainers, long arrival,
+-      long deadline, long duration, int memory, int vcore) {
+-    // create a request with a single atomic ask
+-    ReservationRequest r = ReservationRequest.newInstance(
+-        Resource.newInstance(memory, vcore), numContainers, 1, duration);
+-    ReservationRequests reqs = ReservationRequests.newInstance(
+-        Collections.singletonList(r), ReservationRequestInterpreter.R_ALL);
+-    ReservationDefinition rDef = ReservationDefinition.newInstance(
+-        arrival, deadline, reqs, "testClientRMService#reservation", "0", Priority.UNDEFINED);
+-    return ReservationSubmissionRequest.newInstance(rDef, QUEUE_DEDICATED_FULL, reservationId);
+-  }
+-
+-  @Test
+-  public void testWebAddressWithScheme() {
+-    // The style of the web address reported by the subCluster in the heartbeat is 0.0.0.0:8000
+-    // We design the following 2 test cases:
+-    String webAppAddress = "0.0.0.0:8000";
+-
+-    // 1. We try to disable Https, at this point we should get the following link:
+-    // http://0.0.0.0:8000
+-    String expectedHttpWebAddress = "http://0.0.0.0:8000";
+-    String webAppAddressWithScheme =
+-        WebAppUtils.getHttpSchemePrefix(this.getConf()) + webAppAddress;
+-    Assert.assertEquals(expectedHttpWebAddress, webAppAddressWithScheme);
+-
+-    // 2. We try to enable Https，at this point we should get the following link:
+-    // https://0.0.0.0:8000
+-    Configuration configuration = this.getConf();
+-    configuration.set(YarnConfiguration.YARN_HTTP_POLICY_KEY,
+-        HttpConfig.Policy.HTTPS_ONLY.name());
+-    String expectedHttpsWebAddress = "https://0.0.0.0:8000";
+-    String webAppAddressWithScheme2 =
+-        WebAppUtils.getHttpSchemePrefix(this.getConf()) + webAppAddress;
+-    Assert.assertEquals(expectedHttpsWebAddress, webAppAddressWithScheme2);
+-  }
+-
+-  @Test
+-  public void testCheckUserAccessToQueue() throws Exception {
+-
+-    interceptor.setAllowPartialResult(false);
+-
+-    // Case 1: Only queue admin user can access other user's information
+-    HttpServletRequest mockHsr = mockHttpServletRequestByUserName("non-admin");
+-    String errorMsg1 = "User=non-admin doesn't haven access to queue=queue " +
+-        "so it cannot check ACLs for other users.";
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, errorMsg1,
+-        () -> interceptor.checkUserAccessToQueue("queue", "jack",
+-        QueueACL.SUBMIT_APPLICATIONS.name(), mockHsr));
+-
+-    // Case 2: request an unknown ACL causes BAD_REQUEST
+-    HttpServletRequest mockHsr1 = mockHttpServletRequestByUserName("admin");
+-    String errorMsg2 = "Specified queueAclType=XYZ_ACL is not a valid type, " +
+-        "valid queue acl types={SUBMIT_APPLICATIONS/ADMINISTER_QUEUE}";
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, errorMsg2,
+-        () -> interceptor.checkUserAccessToQueue("queue", "jack", "XYZ_ACL", mockHsr1));
+-
+-    // We design a test, admin user has ADMINISTER_QUEUE, SUBMIT_APPLICATIONS permissions,
+-    // yarn user has SUBMIT_APPLICATIONS permissions, other users have no permissions
+-
+-    // Case 3: get FORBIDDEN for rejected ACL
+-    checkUserAccessToQueueFailed("queue", "jack", QueueACL.SUBMIT_APPLICATIONS, "admin");
+-    checkUserAccessToQueueFailed("queue", "jack", QueueACL.ADMINISTER_QUEUE, "admin");
+-
+-    // Case 4: get OK for listed ACLs
+-    checkUserAccessToQueueSuccess("queue", "admin", QueueACL.ADMINISTER_QUEUE, "admin");
+-    checkUserAccessToQueueSuccess("queue", "admin", QueueACL.SUBMIT_APPLICATIONS, "admin");
+-
+-    // Case 5: get OK only for SUBMIT_APP acl for "yarn" user
+-    checkUserAccessToQueueFailed("queue", "yarn", QueueACL.ADMINISTER_QUEUE, "admin");
+-    checkUserAccessToQueueSuccess("queue", "yarn", QueueACL.SUBMIT_APPLICATIONS, "admin");
+-
+-    interceptor.setAllowPartialResult(true);
+-  }
+-
+-  private void checkUserAccessToQueueSuccess(String queue, String userName,
+-      QueueACL queueACL, String mockUser) throws AuthorizationException {
+-    HttpServletRequest mockHsr = mockHttpServletRequestByUserName(mockUser);
+-    RMQueueAclInfo aclInfo =
+-        interceptor.checkUserAccessToQueue(queue, userName, queueACL.name(), mockHsr);
+-    Assert.assertNotNull(aclInfo);
+-    Assert.assertTrue(aclInfo instanceof FederationRMQueueAclInfo);
+-    FederationRMQueueAclInfo fedAclInfo = (FederationRMQueueAclInfo) aclInfo;
+-    List<RMQueueAclInfo> aclInfos = fedAclInfo.getList();
+-    Assert.assertNotNull(aclInfos);
+-    Assert.assertEquals(4, aclInfos.size());
+-    for (RMQueueAclInfo rMQueueAclInfo : aclInfos) {
+-      Assert.assertTrue(rMQueueAclInfo.isAllowed());
+-    }
+-  }
+-
+-  private void checkUserAccessToQueueFailed(String queue, String userName,
+-      QueueACL queueACL, String mockUser) throws AuthorizationException {
+-    HttpServletRequest mockHsr = mockHttpServletRequestByUserName(mockUser);
+-    RMQueueAclInfo aclInfo =
+-        interceptor.checkUserAccessToQueue(queue, userName, queueACL.name(), mockHsr);
+-    Assert.assertNotNull(aclInfo);
+-    Assert.assertTrue(aclInfo instanceof FederationRMQueueAclInfo);
+-    FederationRMQueueAclInfo fedAclInfo = (FederationRMQueueAclInfo) aclInfo;
+-    List<RMQueueAclInfo> aclInfos = fedAclInfo.getList();
+-    Assert.assertNotNull(aclInfos);
+-    Assert.assertEquals(4, aclInfos.size());
+-    for (RMQueueAclInfo rMQueueAclInfo : aclInfos) {
+-      Assert.assertFalse(rMQueueAclInfo.isAllowed());
+-      String expectDiagnostics = "User=" + userName +
+-          " doesn't have access to queue=queue with acl-type=" + queueACL.name();
+-      Assert.assertEquals(expectDiagnostics, rMQueueAclInfo.getDiagnostics());
+-    }
+-  }
+-
+-  private HttpServletRequest mockHttpServletRequestByUserName(String username) {
+-    HttpServletRequest mockHsr = mock(HttpServletRequest.class);
+-    when(mockHsr.getRemoteUser()).thenReturn(username);
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(username);
+-    when(mockHsr.getUserPrincipal()).thenReturn(principal);
+-    return mockHsr;
+-  }
+-
+-  @Test
+-  public void testCheckFederationInterceptorRESTClient() {
+-    SubClusterId subClusterId = SubClusterId.newInstance("SC-1");
+-    String webAppSocket = "SC-1:WebAddress";
+-    String webAppAddress = "http://" + webAppSocket;
+-
+-    Configuration configuration = new Configuration();
+-    FederationInterceptorREST rest = new FederationInterceptorREST();
+-    rest.setConf(configuration);
+-    rest.init("router");
+-
+-    DefaultRequestInterceptorREST interceptorREST =
+-        rest.getOrCreateInterceptorForSubCluster(subClusterId, webAppSocket);
+-
+-    Assert.assertNotNull(interceptorREST);
+-    Assert.assertNotNull(interceptorREST.getClient());
+-    Assert.assertEquals(webAppAddress, interceptorREST.getWebAppAddress());
+-  }
+-
+-  @Test
+-  public void testInvokeConcurrent() throws IOException, YarnException {
+-
+-    // We design such a test case, we call the interceptor's getNodes interface,
+-    // this interface will generate the following test data
+-    // subCluster0 Node 0
+-    // subCluster1 Node 1
+-    // subCluster2 Node 2
+-    // subCluster3 Node 3
+-    // We use the returned data to verify whether the subClusterId
+-    // of the multi-thread call can match the node data
+-    Map<SubClusterInfo, NodesInfo> subClusterInfoNodesInfoMap =
+-        interceptor.invokeConcurrentGetNodeLabel();
+-    Assert.assertNotNull(subClusterInfoNodesInfoMap);
+-    Assert.assertEquals(4, subClusterInfoNodesInfoMap.size());
+-
+-    subClusterInfoNodesInfoMap.forEach((subClusterInfo, nodesInfo) -> {
+-      String subClusterId = subClusterInfo.getSubClusterId().getId();
+-      List<NodeInfo> nodeInfos = nodesInfo.getNodes();
+-      Assert.assertNotNull(nodeInfos);
+-      Assert.assertEquals(1, nodeInfos.size());
+-
+-      String expectNodeId = "Node " + subClusterId;
+-      String nodeId = nodeInfos.get(0).getNodeId();
+-      Assert.assertEquals(expectNodeId, nodeId);
+-    });
+-  }
+-
+-  @Test
+-  public void testGetSchedulerInfo() {
+-    // In this test case, we will get the return results of 4 sub-clusters.
+-    SchedulerTypeInfo typeInfo = interceptor.getSchedulerInfo();
+-    Assert.assertNotNull(typeInfo);
+-    Assert.assertTrue(typeInfo instanceof FederationSchedulerTypeInfo);
+-
+-    FederationSchedulerTypeInfo federationSchedulerTypeInfo =
+-        (FederationSchedulerTypeInfo) typeInfo;
+-    Assert.assertNotNull(federationSchedulerTypeInfo);
+-    List<SchedulerTypeInfo> schedulerTypeInfos = federationSchedulerTypeInfo.getList();
+-    Assert.assertNotNull(schedulerTypeInfos);
+-    Assert.assertEquals(4, schedulerTypeInfos.size());
+-    List<String> subClusterIds = subClusters.stream().map(SubClusterId::getId).
+-        collect(Collectors.toList());
+-
+-    for (SchedulerTypeInfo schedulerTypeInfo : schedulerTypeInfos) {
+-      Assert.assertNotNull(schedulerTypeInfo);
+-
+-      // 1. Whether the returned subClusterId is in the subCluster list
+-      String subClusterId = schedulerTypeInfo.getSubClusterId();
+-      Assert.assertTrue(subClusterIds.contains(subClusterId));
+-
+-      // 2. We test CapacityScheduler, the returned type should be CapacityScheduler.
+-      SchedulerInfo schedulerInfo = schedulerTypeInfo.getSchedulerInfo();
+-      Assert.assertNotNull(schedulerInfo);
+-      Assert.assertTrue(schedulerInfo instanceof CapacitySchedulerInfo);
+-      CapacitySchedulerInfo capacitySchedulerInfo = (CapacitySchedulerInfo) schedulerInfo;
+-      Assert.assertNotNull(capacitySchedulerInfo);
+-
+-      // 3. The parent queue name should be root
+-      String queueName = capacitySchedulerInfo.getQueueName();
+-      Assert.assertEquals("root", queueName);
+-
+-      // 4. schedulerType should be CapacityScheduler
+-      String schedulerType = capacitySchedulerInfo.getSchedulerType();
+-      Assert.assertEquals("Capacity Scheduler", schedulerType);
+-
+-      // 5. queue path should be root
+-      String queuePath = capacitySchedulerInfo.getQueuePath();
+-      Assert.assertEquals("root", queuePath);
+-
+-      // 6. mockRM has 2 test queues, [root.a, root.b]
+-      List<String> queues = Lists.newArrayList("root.a", "root.b");
+-      CapacitySchedulerQueueInfoList csSchedulerQueueInfoList = capacitySchedulerInfo.getQueues();
+-      Assert.assertNotNull(csSchedulerQueueInfoList);
+-      List<CapacitySchedulerQueueInfo> csQueueInfoList =
+-          csSchedulerQueueInfoList.getQueueInfoList();
+-      Assert.assertEquals(2, csQueueInfoList.size());
+-      for (CapacitySchedulerQueueInfo csQueueInfo : csQueueInfoList) {
+-        Assert.assertNotNull(csQueueInfo);
+-        Assert.assertTrue(queues.contains(csQueueInfo.getQueuePath()));
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testPostDelegationTokenErrorHsr() throws Exception {
+-    // Prepare delegationToken data
+-    DelegationToken token = new DelegationToken();
+-    token.setRenewer(TEST_RENEWER);
+-
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-
+-    // If we don't set token
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the tokenData or hsr is null.",
+-        () -> interceptor.postDelegationToken(null, request));
+-
+-    // If we don't set hsr
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the tokenData or hsr is null.",
+-        () -> interceptor.postDelegationToken(token, null));
+-
+-    // If we don't set renewUser, we will get error message.
+-    LambdaTestUtils.intercept(AuthorizationException.class,
+-        "Unable to obtain user name, user not authenticated",
+-        () -> interceptor.postDelegationToken(token, request));
+-
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(TEST_RENEWER);
+-    when(request.getRemoteUser()).thenReturn(TEST_RENEWER);
+-    when(request.getUserPrincipal()).thenReturn(principal);
+-
+-    // If we don't set the authentication type, we will get error message.
+-    Response response = interceptor.postDelegationToken(token, request);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(response.getStatus(), Status.FORBIDDEN.getStatusCode());
+-    String errMsg = "Delegation token operations can only be carried out on a " +
+-        "Kerberos authenticated channel. Expected auth type is kerberos, got type null";
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof String);
+-    String entityMsg = String.valueOf(entity);
+-    Assert.assertTrue(errMsg.contains(entityMsg));
+-  }
+-
+-  @Test
+-  public void testPostDelegationToken() throws Exception {
+-    Long now = Time.now();
+-
+-    DelegationToken token = new DelegationToken();
+-    token.setRenewer(TEST_RENEWER);
+-
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(TEST_RENEWER);
+-
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-    when(request.getRemoteUser()).thenReturn(TEST_RENEWER);
+-    when(request.getUserPrincipal()).thenReturn(principal);
+-    when(request.getAuthType()).thenReturn("kerberos");
+-
+-    Response response = interceptor.postDelegationToken(token, request);
+-    Assert.assertNotNull(response);
+-
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof DelegationToken);
+-
+-    DelegationToken dtoken = (DelegationToken) entity;
+-    Assert.assertEquals(TEST_RENEWER, dtoken.getRenewer());
+-    Assert.assertEquals(TEST_RENEWER, dtoken.getOwner());
+-    Assert.assertEquals("RM_DELEGATION_TOKEN", dtoken.getKind());
+-    Assert.assertNotNull(dtoken.getToken());
+-    Assert.assertTrue(dtoken.getNextExpirationTime() > now);
+-  }
+-
+-  @Test
+-  public void testPostDelegationTokenExpirationError() throws Exception {
+-
+-    // If we don't set hsr
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the hsr is null.",
+-        () -> interceptor.postDelegationTokenExpiration(null));
+-
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(TEST_RENEWER);
+-
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-    when(request.getRemoteUser()).thenReturn(TEST_RENEWER);
+-    when(request.getUserPrincipal()).thenReturn(principal);
+-    when(request.getAuthType()).thenReturn("kerberos");
+-
+-    // If we don't set the header.
+-    String errorMsg = "Header 'Hadoop-YARN-RM-Delegation-Token' containing encoded token not found";
+-    LambdaTestUtils.intercept(BadRequestException.class, errorMsg,
+-        () -> interceptor.postDelegationTokenExpiration(request));
+-  }
+-
+-  @Test
+-  public void testPostDelegationTokenExpiration() throws Exception {
+-
+-    DelegationToken token = new DelegationToken();
+-    token.setRenewer(TEST_RENEWER);
+-
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(TEST_RENEWER);
+-
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-    when(request.getRemoteUser()).thenReturn(TEST_RENEWER);
+-    when(request.getUserPrincipal()).thenReturn(principal);
+-    when(request.getAuthType()).thenReturn("kerberos");
+-
+-    Response response = interceptor.postDelegationToken(token, request);
+-    Assert.assertNotNull(response);
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof DelegationToken);
+-    DelegationToken dtoken = (DelegationToken) entity;
+-
+-    final String yarnTokenHeader = "Hadoop-YARN-RM-Delegation-Token";
+-    when(request.getHeader(yarnTokenHeader)).thenReturn(dtoken.getToken());
+-
+-    Response renewResponse = interceptor.postDelegationTokenExpiration(request);
+-    Assert.assertNotNull(renewResponse);
+-
+-    Object renewEntity = renewResponse.getEntity();
+-    Assert.assertNotNull(renewEntity);
+-    Assert.assertTrue(renewEntity instanceof DelegationToken);
+-
+-    // renewDelegation, we only return renewDate, other values are NULL.
+-    DelegationToken renewDToken = (DelegationToken) renewEntity;
+-    Assert.assertNull(renewDToken.getRenewer());
+-    Assert.assertNull(renewDToken.getOwner());
+-    Assert.assertNull(renewDToken.getKind());
+-    Assert.assertTrue(renewDToken.getNextExpirationTime() > dtoken.getNextExpirationTime());
+-  }
+-
+-  @Test
+-  public void testCancelDelegationToken() throws Exception {
+-    DelegationToken token = new DelegationToken();
+-    token.setRenewer(TEST_RENEWER);
+-
+-    Principal principal = mock(Principal.class);
+-    when(principal.getName()).thenReturn(TEST_RENEWER);
+-
+-    HttpServletRequest request = mock(HttpServletRequest.class);
+-    when(request.getRemoteUser()).thenReturn(TEST_RENEWER);
+-    when(request.getUserPrincipal()).thenReturn(principal);
+-    when(request.getAuthType()).thenReturn("kerberos");
+-
+-    Response response = interceptor.postDelegationToken(token, request);
+-    Assert.assertNotNull(response);
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof DelegationToken);
+-    DelegationToken dtoken = (DelegationToken) entity;
+-
+-    final String yarnTokenHeader = "Hadoop-YARN-RM-Delegation-Token";
+-    when(request.getHeader(yarnTokenHeader)).thenReturn(dtoken.getToken());
+-
+-    Response cancelResponse = interceptor.cancelDelegationToken(request);
+-    Assert.assertNotNull(cancelResponse);
+-    Assert.assertEquals(response.getStatus(), Status.OK.getStatusCode());
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodes() throws Exception {
+-    // subCluster0 -> node0:0 -> label:NodeLabel0
+-    // subCluster1 -> node1:1 -> label:NodeLabel1
+-    // subCluster2 -> node2:2 -> label:NodeLabel2
+-    // subCluster3 -> node3:3 -> label:NodeLabel3
+-    NodeToLabelsEntryList nodeToLabelsEntryList = new NodeToLabelsEntryList();
+-    for (int i = 0; i < NUM_SUBCLUSTER; i++) {
+-      // labels
+-      List<String> labels = new ArrayList<>();
+-      labels.add("NodeLabel" + i);
+-      // nodes
+-      String nodeId = "node" + i + ":" + i;
+-      NodeToLabelsEntry nodeToLabelsEntry = new NodeToLabelsEntry(nodeId, labels);
+-      List<NodeToLabelsEntry> nodeToLabelsEntries = nodeToLabelsEntryList.getNodeToLabels();
+-      nodeToLabelsEntries.add(nodeToLabelsEntry);
+-    }
+-
+-    // one of the results:
+-    // subCluster#0:Success;subCluster#1:Success;subCluster#3:Success;subCluster#2:Success;
+-    // We can't confirm the complete return order.
+-    Response response = interceptor.replaceLabelsOnNodes(nodeToLabelsEntryList, null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(200, response.getStatus());
+-
+-    Object entityObject = response.getEntity();
+-    Assert.assertNotNull(entityObject);
+-
+-    String entityValue = String.valueOf(entityObject);
+-    String[] entities = entityValue.split(",");
+-    Assert.assertNotNull(entities);
+-    Assert.assertEquals(4, entities.length);
+-    String expectValue =
+-        "subCluster-0:Success,subCluster-1:Success,subCluster-2:Success,subCluster-3:Success,";
+-    for (String entity : entities) {
+-      Assert.assertTrue(expectValue.contains(entity));
+-    }
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodesError() throws Exception {
+-    // newNodeToLabels is null
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, newNodeToLabels must not be empty.",
+-        () -> interceptor.replaceLabelsOnNodes(null, null));
+-
+-    // nodeToLabelsEntryList is Empty
+-    NodeToLabelsEntryList nodeToLabelsEntryList = new NodeToLabelsEntryList();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, nodeToLabelsEntries must not be empty.",
+-        () -> interceptor.replaceLabelsOnNodes(nodeToLabelsEntryList, null));
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNode() throws Exception {
+-    // subCluster3 -> node3:3 -> label:NodeLabel3
+-    String nodeId = "node3:3";
+-    Set<String> labels = Collections.singleton("NodeLabel3");
+-
+-    // We expect the following result: subCluster#3:Success;
+-    String expectValue = "subCluster#3:Success;";
+-    Response response = interceptor.replaceLabelsOnNode(labels, null, nodeId);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(200, response.getStatus());
+-
+-    Object entityObject = response.getEntity();
+-    Assert.assertNotNull(entityObject);
+-
+-    String entityValue = String.valueOf(entityObject);
+-    Assert.assertNotNull(entityValue);
+-    Assert.assertEquals(expectValue, entityValue);
+-  }
+-
+-  @Test
+-  public void testReplaceLabelsOnNodeError() throws Exception {
+-    // newNodeToLabels is null
+-    String nodeId = "node3:3";
+-    Set<String> labels = Collections.singleton("NodeLabel3");
+-    Set<String> labelsEmpty = new HashSet<>();
+-
+-    // nodeId is null
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, nodeId must not be null or empty.",
+-        () -> interceptor.replaceLabelsOnNode(labels, null, null));
+-
+-    // labels is null
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, newNodeLabelsName must not be empty.",
+-        () -> interceptor.replaceLabelsOnNode(null, null, nodeId));
+-
+-    // labels is empty
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, newNodeLabelsName must not be empty.",
+-        () -> interceptor.replaceLabelsOnNode(labelsEmpty, null, nodeId));
+-  }
+-
+-  @Test
+-  public void testDumpSchedulerLogs() throws Exception {
+-    HttpServletRequest mockHsr = mockHttpServletRequestByUserName("admin");
+-    String dumpSchedulerLogsMsg = interceptor.dumpSchedulerLogs("1", mockHsr);
+-
+-    // We cannot guarantee the calling order of the sub-clusters,
+-    // We guarantee that the returned result contains the information of each subCluster.
+-    Assert.assertNotNull(dumpSchedulerLogsMsg);
+-    subClusters.forEach(subClusterId -> {
+-      String subClusterMsg =
+-          "subClusterId" + subClusterId + " : Capacity scheduler logs are being created.; ";
+-      Assert.assertTrue(dumpSchedulerLogsMsg.contains(subClusterMsg));
+-    });
+-  }
+-
+-  @Test
+-  public void testDumpSchedulerLogsError() throws Exception {
+-    HttpServletRequest mockHsr = mockHttpServletRequestByUserName("admin");
+-
+-    // time is empty
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the time is empty or null.",
+-        () -> interceptor.dumpSchedulerLogs(null, mockHsr));
+-
+-    // time is negative
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "time must be greater than 0.",
+-        () -> interceptor.dumpSchedulerLogs("-1", mockHsr));
+-
+-    // time is non-numeric
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "time must be a number.",
+-        () -> interceptor.dumpSchedulerLogs("abc", mockHsr));
+-  }
+-
+-  @Test
+-  public void testGetActivitiesNormal() {
+-    ActivitiesInfo activitiesInfo = interceptor.getActivities(null, "1", "DIAGNOSTIC");
+-    Assert.assertNotNull(activitiesInfo);
+-
+-    String nodeId = activitiesInfo.getNodeId();
+-    Assert.assertNotNull(nodeId);
+-    Assert.assertEquals("1", nodeId);
+-
+-    String diagnostic = activitiesInfo.getDiagnostic();
+-    Assert.assertNotNull(diagnostic);
+-    Assert.assertTrue(StringUtils.contains(diagnostic, "Diagnostic"));
+-
+-    long timestamp = activitiesInfo.getTimestamp();
+-    Assert.assertEquals(1673081972L, timestamp);
+-
+-    List<NodeAllocationInfo> allocationInfos = activitiesInfo.getAllocations();
+-    Assert.assertNotNull(allocationInfos);
+-    Assert.assertEquals(1, allocationInfos.size());
+-  }
+-
+-  @Test
+-  public void testGetActivitiesError() throws Exception {
+-    // nodeId is empty
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "'nodeId' must not be empty.",
+-        () -> interceptor.getActivities(null, "", "DIAGNOSTIC"));
+-
+-    // groupBy is empty
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "'groupBy' must not be empty.",
+-        () -> interceptor.getActivities(null, "1", ""));
+-
+-    // groupBy value is wrong
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Got invalid groupBy: TEST1, valid groupBy types: [DIAGNOSTIC]",
+-        () -> interceptor.getActivities(null, "1", "TEST1"));
+-  }
+-
+-  @Test
+-  public void testGetBulkActivitiesNormal() throws InterruptedException {
+-    BulkActivitiesInfo bulkActivitiesInfo =
+-        interceptor.getBulkActivities(null, "DIAGNOSTIC", 5);
+-    Assert.assertNotNull(bulkActivitiesInfo);
+-
+-    Assert.assertTrue(bulkActivitiesInfo instanceof FederationBulkActivitiesInfo);
+-
+-    FederationBulkActivitiesInfo federationBulkActivitiesInfo =
+-        (FederationBulkActivitiesInfo) bulkActivitiesInfo;
+-    Assert.assertNotNull(federationBulkActivitiesInfo);
+-
+-    List<BulkActivitiesInfo> activitiesInfos = federationBulkActivitiesInfo.getList();
+-    Assert.assertNotNull(activitiesInfos);
+-    Assert.assertEquals(4, activitiesInfos.size());
+-
+-    for (BulkActivitiesInfo activitiesInfo : activitiesInfos) {
+-      Assert.assertNotNull(activitiesInfo);
+-      List<ActivitiesInfo> activitiesInfoList = activitiesInfo.getActivities();
+-      Assert.assertNotNull(activitiesInfoList);
+-      Assert.assertEquals(5, activitiesInfoList.size());
+-    }
+-  }
+-
+-  @Test
+-  public void testGetBulkActivitiesError() throws Exception {
+-    // activitiesCount < 0
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "'activitiesCount' must not be negative.",
+-        () -> interceptor.getBulkActivities(null, "DIAGNOSTIC", -1));
+-
+-    // groupBy value is wrong
+-    LambdaTestUtils.intercept(YarnRuntimeException.class,
+-        "Got invalid groupBy: TEST1, valid groupBy types: [DIAGNOSTIC]",
+-        () -> interceptor.getBulkActivities(null, "TEST1", 1));
+-
+-    // groupBy is empty
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "'groupBy' must not be empty.",
+-        () -> interceptor.getBulkActivities(null, "", 1));
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabels1() throws Exception {
+-    // In this test, we try to add ALL label, all subClusters will return success.
+-    NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo();
+-    NodeLabelInfo nodeLabelInfo = new NodeLabelInfo("ALL", true);
+-    nodeLabelsInfo.getNodeLabelsInfo().add(nodeLabelInfo);
+-
+-    Response response = interceptor.addToClusterNodeLabels(nodeLabelsInfo, null);
+-    Assert.assertNotNull(response);
+-
+-    Object entityObj = response.getEntity();
+-    Assert.assertNotNull(entityObj);
+-
+-    String entity = String.valueOf(entityObj);
+-    String[] entities = StringUtils.split(entity, ",");
+-    Assert.assertNotNull(entities);
+-    Assert.assertEquals(4, entities.length);
+-
+-    // The order in which the cluster returns messages is uncertain,
+-    // we confirm the result by contains
+-    String expectedMsg =
+-        "SubCluster-0:SUCCESS,SubCluster-1:SUCCESS,SubCluster-2:SUCCESS,SubCluster-3:SUCCESS";
+-    Arrays.stream(entities).forEach(item -> Assert.assertTrue(expectedMsg.contains(item)));
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabels2() throws Exception {
+-    // In this test, we try to add A0 label,
+-    // subCluster0 will return success, and other subClusters will return null
+-    NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo();
+-    NodeLabelInfo nodeLabelInfo = new NodeLabelInfo("A0", true);
+-    nodeLabelsInfo.getNodeLabelsInfo().add(nodeLabelInfo);
+-
+-    Response response = interceptor.addToClusterNodeLabels(nodeLabelsInfo, null);
+-    Assert.assertNotNull(response);
+-
+-    Object entityObj = response.getEntity();
+-    Assert.assertNotNull(entityObj);
+-
+-    String expectedValue = "SubCluster-0:SUCCESS,";
+-    String entity = String.valueOf(entityObj);
+-    Assert.assertTrue(entity.contains(expectedValue));
+-  }
+-
+-  @Test
+-  public void testAddToClusterNodeLabelsError() throws Exception {
+-    // the newNodeLabels is null
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the newNodeLabels is null.",
+-        () -> interceptor.addToClusterNodeLabels(null, null));
+-
+-    // the nodeLabelsInfo is null
+-    NodeLabelsInfo nodeLabelsInfo = new NodeLabelsInfo();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the nodeLabelsInfo is null or empty.",
+-        () -> interceptor.addToClusterNodeLabels(nodeLabelsInfo, null));
+-
+-    // error nodeLabelsInfo
+-    NodeLabelsInfo nodeLabelsInfo1 = new NodeLabelsInfo();
+-    NodeLabelInfo nodeLabelInfo1 = new NodeLabelInfo("A", true);
+-    nodeLabelsInfo1.getNodeLabelsInfo().add(nodeLabelInfo1);
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, "addToClusterNodeLabels Error",
+-        () -> interceptor.addToClusterNodeLabels(nodeLabelsInfo1, null));
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabels1() throws Exception {
+-    Set<String> oldNodeLabels = Sets.newHashSet();
+-    oldNodeLabels.add("ALL");
+-
+-    Response response = interceptor.removeFromClusterNodeLabels(oldNodeLabels, null);
+-    Assert.assertNotNull(response);
+-
+-    Object entityObj = response.getEntity();
+-    Assert.assertNotNull(entityObj);
+-
+-    String entity = String.valueOf(entityObj);
+-    String[] entities = StringUtils.split(entity, ",");
+-    Assert.assertNotNull(entities);
+-    Assert.assertEquals(4, entities.length);
+-
+-    // The order in which the cluster returns messages is uncertain,
+-    // we confirm the result by contains
+-    String expectedMsg =
+-        "SubCluster-0:SUCCESS,SubCluster-1:SUCCESS,SubCluster-2:SUCCESS,SubCluster-3:SUCCESS";
+-    Arrays.stream(entities).forEach(item -> Assert.assertTrue(expectedMsg.contains(item)));
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabels2() throws Exception {
+-    Set<String> oldNodeLabels = Sets.newHashSet();
+-    oldNodeLabels.add("A0");
+-
+-    Response response = interceptor.removeFromClusterNodeLabels(oldNodeLabels, null);
+-    Assert.assertNotNull(response);
+-
+-    Object entityObj = response.getEntity();
+-    Assert.assertNotNull(entityObj);
+-
+-    String expectedValue = "SubCluster-0:SUCCESS,";
+-    String entity = String.valueOf(entityObj);
+-    Assert.assertTrue(entity.contains(expectedValue));
+-  }
+-
+-  @Test
+-  public void testRemoveFromClusterNodeLabelsError() throws Exception {
+-    // the oldNodeLabels is null
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the oldNodeLabels is null or empty.",
+-        () -> interceptor.removeFromClusterNodeLabels(null, null));
+-
+-    // the oldNodeLabels is empty
+-    Set<String> oldNodeLabels = Sets.newHashSet();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the oldNodeLabels is null or empty.",
+-        () -> interceptor.removeFromClusterNodeLabels(oldNodeLabels, null));
+-
+-    // error oldNodeLabels
+-    Set<String> oldNodeLabels1 = Sets.newHashSet();
+-    oldNodeLabels1.add("A1");
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, "removeFromClusterNodeLabels Error",
+-        () -> interceptor.removeFromClusterNodeLabels(oldNodeLabels1, null));
+-  }
+-
+-  @Test
+-  public void testGetSchedulerConfiguration() throws Exception {
+-    Response response = interceptor.getSchedulerConfiguration(null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(OK, response.getStatus());
+-
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-    Assert.assertTrue(entity instanceof FederationConfInfo);
+-
+-    FederationConfInfo federationConfInfo = FederationConfInfo.class.cast(entity);
+-    List<ConfInfo> confInfos = federationConfInfo.getList();
+-    Assert.assertNotNull(confInfos);
+-    Assert.assertEquals(4, confInfos.size());
+-
+-    List<String> errors = federationConfInfo.getErrorMsgs();
+-    Assert.assertEquals(0, errors.size());
+-
+-    Set<String> subClusterSet = subClusters.stream()
+-        .map(subClusterId -> subClusterId.getId()).collect(Collectors.toSet());
+-
+-    for (ConfInfo confInfo : confInfos) {
+-      List<ConfInfo.ConfItem> confItems = confInfo.getItems();
+-      Assert.assertNotNull(confItems);
+-      Assert.assertTrue(confItems.size() > 0);
+-      Assert.assertTrue(subClusterSet.contains(confInfo.getSubClusterId()));
+-    }
+-  }
+-
+-  @Test
+-  public void testGetClusterUserInfo() {
+-    String requestUserName = "test-user";
+-    HttpServletRequest hsr = mock(HttpServletRequest.class);
+-    when(hsr.getRemoteUser()).thenReturn(requestUserName);
+-    ClusterUserInfo clusterUserInfo = interceptor.getClusterUserInfo(hsr);
+-
+-    Assert.assertNotNull(clusterUserInfo);
+-    Assert.assertTrue(clusterUserInfo instanceof FederationClusterUserInfo);
+-
+-    FederationClusterUserInfo federationClusterUserInfo =
+-        (FederationClusterUserInfo) clusterUserInfo;
+-
+-    List<ClusterUserInfo> fedClusterUserInfoList = federationClusterUserInfo.getList();
+-    Assert.assertNotNull(fedClusterUserInfoList);
+-    Assert.assertEquals(4, fedClusterUserInfoList.size());
+-
+-    List<String> subClusterIds = subClusters.stream().map(
+-        subClusterId -> subClusterId.getId()).collect(Collectors.toList());
+-    MockRM mockRM = interceptor.getMockRM();
+-
+-    for (ClusterUserInfo fedClusterUserInfo : fedClusterUserInfoList) {
+-      // Check subClusterId
+-      String subClusterId = fedClusterUserInfo.getSubClusterId();
+-      Assert.assertNotNull(subClusterId);
+-      Assert.assertTrue(subClusterIds.contains(subClusterId));
+-
+-      // Check requestedUser
+-      String requestedUser = fedClusterUserInfo.getRequestedUser();
+-      Assert.assertNotNull(requestedUser);
+-      Assert.assertEquals(requestUserName, requestedUser);
+-
+-      // Check rmLoginUser
+-      String rmLoginUser = fedClusterUserInfo.getRmLoginUser();
+-      Assert.assertNotNull(rmLoginUser);
+-      Assert.assertEquals(mockRM.getRMLoginUser(), rmLoginUser);
+-    }
+-  }
+-
+-  @Test
+-  public void testUpdateSchedulerConfigurationErrorMsg() throws Exception {
+-    SchedConfUpdateInfo mutationInfo = new SchedConfUpdateInfo();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the subClusterId is empty or null.",
+-        () -> interceptor.updateSchedulerConfiguration(mutationInfo, null));
+-
+-    LambdaTestUtils.intercept(IllegalArgumentException.class,
+-        "Parameter error, the schedConfUpdateInfo is empty or null.",
+-        () -> interceptor.updateSchedulerConfiguration(null, null));
+-  }
+-
+-  @Test
+-  public void testUpdateSchedulerConfiguration()
+-      throws AuthorizationException, InterruptedException {
+-    SchedConfUpdateInfo updateInfo = new SchedConfUpdateInfo();
+-    updateInfo.setSubClusterId("1");
+-    Map<String, String> goodUpdateMap = new HashMap<>();
+-    goodUpdateMap.put("goodKey", "goodVal");
+-    QueueConfigInfo goodUpdateInfo = new
+-        QueueConfigInfo("root.default", goodUpdateMap);
+-    updateInfo.getUpdateQueueInfo().add(goodUpdateInfo);
+-    Response response = interceptor.updateSchedulerConfiguration(updateInfo, null);
+-
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(OK, response.getStatus());
+-
+-    String expectMsg = "Configuration change successfully applied.";
+-    Object entity = response.getEntity();
+-    Assert.assertNotNull(entity);
+-
+-    String entityMsg = String.valueOf(entity);
+-    Assert.assertEquals(expectMsg, entityMsg);
+-  }
+-
+-  @Test
+-  public void testGetClusterInfo() {
+-    ClusterInfo clusterInfos = interceptor.getClusterInfo();
+-    Assert.assertNotNull(clusterInfos);
+-    Assert.assertTrue(clusterInfos instanceof FederationClusterInfo);
+-
+-    FederationClusterInfo federationClusterInfos =
+-        (FederationClusterInfo) (clusterInfos);
+-
+-    List<ClusterInfo> fedClusterInfosList = federationClusterInfos.getList();
+-    Assert.assertNotNull(fedClusterInfosList);
+-    Assert.assertEquals(4, fedClusterInfosList.size());
+-
+-    List<String> subClusterIds = subClusters.stream().map(
+-        subClusterId -> subClusterId.getId()).collect(Collectors.toList());
+-
+-    MockRM mockRM = interceptor.getMockRM();
+-    String yarnVersion = YarnVersionInfo.getVersion();
+-
+-    for (ClusterInfo clusterInfo : fedClusterInfosList) {
+-      String subClusterId = clusterInfo.getSubClusterId();
+-      // Check subClusterId
+-      Assert.assertTrue(subClusterIds.contains(subClusterId));
+-
+-      // Check state
+-      String clusterState = mockRM.getServiceState().toString();
+-      Assert.assertEquals(clusterState, clusterInfo.getState());
+-
+-      // Check rmStateStoreName
+-      String rmStateStoreName =
+-          mockRM.getRMContext().getStateStore().getClass().getName();
+-      Assert.assertEquals(rmStateStoreName, clusterInfo.getRMStateStore());
+-
+-      // Check RM Version
+-      Assert.assertEquals(yarnVersion, clusterInfo.getRMVersion());
+-
+-      // Check haZooKeeperConnectionState
+-      String rmHAZookeeperConnectionState = mockRM.getRMContext().getHAZookeeperConnectionState();
+-      Assert.assertEquals(rmHAZookeeperConnectionState,
+-          clusterInfo.getHAZookeeperConnectionState());
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorRESTRetry.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorRESTRetry.java
+deleted file mode 100644
+index 762a4417980..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationInterceptorRESTRetry.java
++++ /dev/null
+@@ -1,581 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.List;
+-
+-import javax.ws.rs.core.Response;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.UniformBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreTestUtil;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.router.clientrm.PassThroughClientRequestInterceptor;
+-import org.apache.hadoop.yarn.server.router.clientrm.TestableFederationClientInterceptor;
+-import org.apache.hadoop.yarn.webapp.NotFoundException;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Extends the {@code BaseRouterWebServicesTest} and overrides methods in order
+- * to use the {@code RouterWebServices} pipeline test cases for testing the
+- * {@code FederationInterceptorREST} class. The tests for
+- * {@code RouterWebServices} has been written cleverly so that it can be reused
+- * to validate different request interceptor chains.
+- * <p>
+- * It tests the case with SubClusters down and the Router logic of retries. We
+- * have 1 good SubCluster and 2 bad ones for all the tests.
+- */
+-public class TestFederationInterceptorRESTRetry
+-    extends BaseRouterWebServicesTest {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestFederationInterceptorRESTRetry.class);
+-  private static final int SERVICE_UNAVAILABLE = 503;
+-  private static final int ACCEPTED = 202;
+-  private static final int OK = 200;
+-  // running and registered
+-  private static SubClusterId good;
+-  // registered but not running
+-  private static SubClusterId bad1;
+-  private static SubClusterId bad2;
+-  private static List<SubClusterId> scs = new ArrayList<SubClusterId>();
+-  private TestableFederationInterceptorREST interceptor;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreTestUtil stateStoreUtil;
+-  private String user = "test-user";
+-
+-  @Override
+-  public void setUp() {
+-    super.setUpConfig();
+-
+-    Configuration conf = this.getConf();
+-
+-    // Compatible with historical test cases, we set router.allow-partial-result.enable=false.
+-    conf.setBoolean(YarnConfiguration.ROUTER_INTERCEPTOR_ALLOW_PARTIAL_RESULT_ENABLED, false);
+-
+-    interceptor = new TestableFederationInterceptorREST();
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-    FederationStateStoreFacade.getInstance(conf).reinitialize(stateStore,
+-        getConf());
+-    stateStoreUtil = new FederationStateStoreTestUtil(stateStore);
+-
+-    interceptor.setConf(this.getConf());
+-    interceptor.init(user);
+-
+-    // Create SubClusters
+-    good = SubClusterId.newInstance("1");
+-    bad1 = SubClusterId.newInstance("2");
+-    bad2 = SubClusterId.newInstance("3");
+-    scs.add(good);
+-    scs.add(bad1);
+-    scs.add(bad2);
+-
+-    // The mock RM will not start in these SubClusters, this is done to simulate
+-    // a SubCluster down
+-
+-    interceptor.registerBadSubCluster(bad1);
+-    interceptor.registerBadSubCluster(bad2);
+-  }
+-
+-  @Override
+-  public void tearDown() {
+-    interceptor.shutdown();
+-    super.tearDown();
+-  }
+-
+-  private void setupCluster(List<SubClusterId> scsToRegister)
+-      throws YarnException {
+-
+-    try {
+-      // Clean up the StateStore before every test
+-      stateStoreUtil.deregisterAllSubClusters();
+-
+-      for (SubClusterId sc : scsToRegister) {
+-        stateStoreUtil.registerSubCluster(sc);
+-      }
+-    } catch (YarnException e) {
+-      LOG.error(e.getMessage());
+-      Assert.fail();
+-    }
+-  }
+-
+-  @Override
+-  protected YarnConfiguration createConfiguration() {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-
+-    conf.set(YarnConfiguration.ROUTER_WEBAPP_DEFAULT_INTERCEPTOR_CLASS,
+-        MockDefaultRequestInterceptorREST.class.getName());
+-
+-    String mockPassThroughInterceptorClass =
+-        PassThroughClientRequestInterceptor.class.getName();
+-
+-    // Create a request interceptor pipeline for testing. The last one in the
+-    // chain is the federation interceptor that calls the mock resource manager.
+-    // The others in the chain will simply forward it to the next one in the
+-    // chain
+-    conf.set(YarnConfiguration.ROUTER_CLIENTRM_INTERCEPTOR_CLASS_PIPELINE,
+-        mockPassThroughInterceptorClass + ","
+-            + TestableFederationClientInterceptor.class.getName());
+-
+-    conf.set(YarnConfiguration.FEDERATION_POLICY_MANAGER,
+-        UniformBroadcastPolicyManager.class.getName());
+-
+-    // Disable StateStoreFacade cache
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-
+-    return conf;
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testGetNewApplicationOneBadSC()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    setupCluster(Arrays.asList(bad2));
+-
+-    Response response = interceptor.createNewApplication(null);
+-    Assert.assertEquals(SERVICE_UNAVAILABLE, response.getStatus());
+-    Assert.assertEquals(FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        response.getEntity());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testGetNewApplicationTwoBadSCs()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    LOG.info("Test getNewApplication with two bad SCs.");
+-
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    Response response = interceptor.createNewApplication(null);
+-    Assert.assertEquals(SERVICE_UNAVAILABLE, response.getStatus());
+-    Assert.assertEquals(FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        response.getEntity());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNewApplication in case the
+-   * cluster is composed of only 1 bad SubCluster and 1 good one.
+-   */
+-  @Test
+-  public void testGetNewApplicationOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    LOG.info("Test getNewApplication with one bad, one good SC.");
+-
+-    setupCluster(Arrays.asList(good, bad2));
+-    Response response = interceptor.createNewApplication(null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(OK, response.getStatus());
+-
+-    NewApplication newApp = (NewApplication) response.getEntity();
+-    Assert.assertNotNull(newApp);
+-
+-    ApplicationId appId = ApplicationId.fromString(newApp.getApplicationId());
+-    Assert.assertNotNull(appId);
+-
+-    Assert.assertEquals(Integer.parseInt(good.getId()), appId.getClusterTimestamp());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testSubmitApplicationOneBadSC()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    LOG.info("Test submitApplication with one bad SC.");
+-
+-    setupCluster(Arrays.asList(bad2));
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    Response response = interceptor.submitApplication(context, null);
+-    Assert.assertEquals(SERVICE_UNAVAILABLE, response.getStatus());
+-    Assert.assertEquals(FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        response.getEntity());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testSubmitApplicationTwoBadSCs()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-
+-    Response response = interceptor.submitApplication(context, null);
+-    Assert.assertEquals(SERVICE_UNAVAILABLE, response.getStatus());
+-    Assert.assertEquals(FederationPolicyUtils.NO_ACTIVE_SUBCLUSTER_AVAILABLE,
+-        response.getEntity());
+-  }
+-
+-  /**
+-   * This test validates the correctness of SubmitApplication in case the
+-   * cluster is composed of only 1 bad SubCluster and a good one.
+-   */
+-  @Test
+-  public void testSubmitApplicationOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-    System.out.println("Test submitApplication with one bad, one good SC");
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    ApplicationId appId =
+-        ApplicationId.newInstance(System.currentTimeMillis(), 1);
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(appId.toString());
+-    Response response = interceptor.submitApplication(context, null);
+-
+-    Assert.assertEquals(ACCEPTED, response.getStatus());
+-
+-    Assert.assertEquals(good,
+-        stateStore
+-            .getApplicationHomeSubCluster(
+-                GetApplicationHomeSubClusterRequest.newInstance(appId))
+-            .getApplicationHomeSubCluster().getHomeSubCluster());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApps in case the cluster is
+-   * composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testGetAppsOneBadSC()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    setupCluster(Arrays.asList(bad2));
+-
+-    AppsInfo response = interceptor.getApps(null, null, null, null, null, null,
+-        null, null, null, null, null, null, null, null, null);
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApps in case the cluster is
+-   * composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testGetAppsTwoBadSCs()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    AppsInfo response = interceptor.getApps(null, null, null, null, null, null,
+-        null, null, null, null, null, null, null, null, null);
+-    Assert.assertNull(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetApps in case the cluster is
+-   * composed of only 1 bad SubCluster and a good one.
+-   */
+-  @Test
+-  public void testGetAppsOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    AppsInfo response = interceptor.getApps(null, null, null, null, null, null,
+-        null, null, null, null, null, null, null, null, null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(1, response.getApps().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNode in case the cluster is
+-   * composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testGetNodeOneBadSC()
+-      throws YarnException, IOException, InterruptedException {
+-
+-    setupCluster(Arrays.asList(bad2));
+-    try {
+-      interceptor.getNode("testGetNodeOneBadSC");
+-      Assert.fail();
+-    } catch (NotFoundException e) {
+-      Assert.assertTrue(
+-          e.getMessage().contains("nodeId, testGetNodeOneBadSC, is not found"));
+-    }
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNode in case the cluster is
+-   * composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testGetNodeTwoBadSCs()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    try {
+-      interceptor.getNode("testGetNodeTwoBadSCs");
+-      Assert.fail();
+-    } catch (NotFoundException e) {
+-      Assert.assertTrue(e.getMessage()
+-          .contains("nodeId, testGetNodeTwoBadSCs, is not found"));
+-    }
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNode in case the cluster is
+-   * composed of only 1 bad SubCluster and a good one.
+-   */
+-  @Test
+-  public void testGetNodeOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    NodeInfo response = interceptor.getNode(null);
+-    Assert.assertNotNull(response);
+-    // Check if the only node came from Good SubCluster
+-    Assert.assertEquals(good.getId(),
+-        Long.toString(response.getLastHealthUpdate()));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case the cluster is
+-   * composed of only 1 bad SubCluster.
+-   */
+-  @Test
+-  public void testGetNodesOneBadSC() throws Exception {
+-
+-    setupCluster(Arrays.asList(bad2));
+-
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, "RM is stopped",
+-        () -> interceptor.getNodes(null));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case the cluster is
+-   * composed of only 2 bad SubClusters.
+-   */
+-  @Test
+-  public void testGetNodesTwoBadSCs() throws Exception {
+-
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, "RM is stopped",
+-        () -> interceptor.getNodes(null));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case the cluster is
+-   * composed of only 1 bad SubCluster and a good one.
+-   */
+-  @Test
+-  public void testGetNodesOneBadOneGood() throws Exception {
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    LambdaTestUtils.intercept(YarnRuntimeException.class, "RM is stopped",
+-        () -> interceptor.getNodes(null));
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetNodes in case the cluster is
+-   * composed of only 1 bad SubCluster. The excepted result would be a
+-   * ClusterMetricsInfo with all its values set to 0.
+-   */
+-  @Test
+-  public void testGetClusterMetricsOneBadSC()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(bad2));
+-
+-    ClusterMetricsInfo response = interceptor.getClusterMetricsInfo();
+-    Assert.assertNotNull(response);
+-    // check if we got an empty metrics
+-    checkEmptyMetrics(response);
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetClusterMetrics in case the
+-   * cluster is composed of only 2 bad SubClusters. The excepted result would be
+-   * a ClusterMetricsInfo with all its values set to 0.
+-   */
+-  @Test
+-  public void testGetClusterMetricsTwoBadSCs()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    ClusterMetricsInfo response = interceptor.getClusterMetricsInfo();
+-    Assert.assertNotNull(response);
+-    // check if we got an empty metrics
+-    Assert.assertEquals(0, response.getAppsSubmitted());
+-  }
+-
+-  /**
+-   * This test validates the correctness of GetClusterMetrics in case the
+-   * cluster is composed of only 1 bad SubCluster and a good one. The good
+-   * SubCluster provided a ClusterMetricsInfo with appsSubmitted set to its
+-   * SubClusterId. The expected result would be appSubmitted equals to its
+-   * SubClusterId. SubClusterId in this case is an integer.
+-   */
+-  @Test
+-  public void testGetClusterMetricsOneBadOneGood()
+-      throws YarnException, IOException, InterruptedException {
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    ClusterMetricsInfo response = interceptor.getClusterMetricsInfo();
+-    Assert.assertNotNull(response);
+-    checkMetricsFromGoodSC(response);
+-    // The merge operations is tested in TestRouterWebServiceUtil
+-  }
+-
+-  private void checkMetricsFromGoodSC(ClusterMetricsInfo response) {
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsSubmitted());
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsCompleted());
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsPending());
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsRunning());
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsFailed());
+-    Assert.assertEquals(Integer.parseInt(good.getId()),
+-        response.getAppsKilled());
+-  }
+-
+-  private void checkEmptyMetrics(ClusterMetricsInfo response) {
+-    Assert.assertEquals(0, response.getAppsSubmitted());
+-    Assert.assertEquals(0, response.getAppsCompleted());
+-    Assert.assertEquals(0, response.getAppsPending());
+-    Assert.assertEquals(0, response.getAppsRunning());
+-    Assert.assertEquals(0, response.getAppsFailed());
+-    Assert.assertEquals(0, response.getAppsKilled());
+-
+-    Assert.assertEquals(0, response.getReservedMB());
+-    Assert.assertEquals(0, response.getAvailableMB());
+-    Assert.assertEquals(0, response.getAllocatedMB());
+-
+-    Assert.assertEquals(0, response.getReservedVirtualCores());
+-    Assert.assertEquals(0, response.getAvailableVirtualCores());
+-    Assert.assertEquals(0, response.getAllocatedVirtualCores());
+-
+-    Assert.assertEquals(0, response.getContainersAllocated());
+-    Assert.assertEquals(0, response.getReservedContainers());
+-    Assert.assertEquals(0, response.getPendingContainers());
+-
+-    Assert.assertEquals(0, response.getTotalMB());
+-    Assert.assertEquals(0, response.getTotalVirtualCores());
+-    Assert.assertEquals(0, response.getTotalNodes());
+-    Assert.assertEquals(0, response.getLostNodes());
+-    Assert.assertEquals(0, response.getUnhealthyNodes());
+-    Assert.assertEquals(0, response.getDecommissioningNodes());
+-    Assert.assertEquals(0, response.getDecommissionedNodes());
+-    Assert.assertEquals(0, response.getRebootedNodes());
+-    Assert.assertEquals(0, response.getActiveNodes());
+-    Assert.assertEquals(0, response.getShutdownNodes());
+-  }
+-
+-  @Test
+-  public void testGetNodesOneBadSCAllowPartial() throws Exception {
+-    // We set allowPartialResult to true.
+-    // In this test case, we set up a subCluster,
+-    // and the subCluster status is bad, we can't get the response,
+-    // an exception should be thrown at this time.
+-    interceptor.setAllowPartialResult(true);
+-    setupCluster(Arrays.asList(bad2));
+-
+-    NodesInfo nodesInfo = interceptor.getNodes(null);
+-    Assert.assertNotNull(nodesInfo);
+-
+-    // We need to set allowPartialResult=false
+-    interceptor.setAllowPartialResult(false);
+-  }
+-
+-  @Test
+-  public void testGetNodesTwoBadSCsAllowPartial() throws Exception {
+-    // We set allowPartialResult to true.
+-    // In this test case, we set up 2 subClusters,
+-    // and the status of these 2 subClusters is bad. When we call the interface,
+-    // an exception should be returned.
+-    interceptor.setAllowPartialResult(true);
+-    setupCluster(Arrays.asList(bad1, bad2));
+-
+-    NodesInfo nodesInfo = interceptor.getNodes(null);
+-    Assert.assertNotNull(nodesInfo);
+-
+-    // We need to set allowPartialResult=false
+-    interceptor.setAllowPartialResult(false);
+-  }
+-
+-  @Test
+-  public void testGetNodesOneBadOneGoodAllowPartial() throws Exception {
+-
+-    // allowPartialResult = true,
+-    // We tolerate exceptions and return normal results
+-    interceptor.setAllowPartialResult(true);
+-    setupCluster(Arrays.asList(good, bad2));
+-
+-    NodesInfo response = interceptor.getNodes(null);
+-    Assert.assertNotNull(response);
+-    Assert.assertEquals(1, response.getNodes().size());
+-    // Check if the only node came from Good SubCluster
+-    Assert.assertEquals(good.getId(),
+-        Long.toString(response.getNodes().get(0).getLastHealthUpdate()));
+-
+-    // allowPartialResult = false,
+-    // We do not tolerate exceptions and will throw exceptions directly
+-    interceptor.setAllowPartialResult(false);
+-
+-    setupCluster(Arrays.asList(good, bad2));
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java
+deleted file mode 100644
+index f703dab9552..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestFederationWebApp.java
++++ /dev/null
+@@ -1,135 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.webapp.test.WebAppTests;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-public class TestFederationWebApp extends TestRouterWebServicesREST {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestFederationWebApp.class);
+-
+-  @Test
+-  public void testFederationWebViewNotEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationWebView - NotEnable Federation.");
+-    // Test Federation is not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-    WebAppTests.testPage(FederationPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationWebViewEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationWebView - Enable Federation.");
+-    // Test Federation Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    WebAppTests.testPage(FederationPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationAboutViewEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationAboutViewEnable - Enable Federation.");
+-    // Test Federation Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    WebAppTests.testPage(AboutPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationAboutViewNotEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationAboutViewNotEnable - NotEnable Federation.");
+-    // Test Federation Not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-    WebAppTests.testPage(AboutPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationNodeViewEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationNodeViewEnable - Enable Federation.");
+-    // Test Federation Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    WebAppTests.testPage(NodesPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationNodeViewNotEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationNodeViewNotEnable - NotEnable Federation.");
+-    // Test Federation Not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-    WebAppTests.testPage(NodesPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationAppViewEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationAppViewEnable - Enable Federation.");
+-    // Test Federation Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    WebAppTests.testPage(AppsPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testFederationAppViewNotEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testFederationAppViewNotEnable - NotEnable Federation.");
+-    // Test Federation Not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-    WebAppTests.testPage(AppsPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testNodeLabelAppViewNotEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testNodeLabelAppViewNotEnable - NotEnable Federation.");
+-    // Test Federation Not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-    WebAppTests.testPage(NodeLabelsPage.class, Router.class, new MockRouter(config));
+-  }
+-
+-  @Test
+-  public void testNodeLabelAppViewEnable()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testNodeLabelAppViewEnable - Enable Federation.");
+-    // Test Federation Not Enabled
+-    Configuration config = new YarnConfiguration();
+-    config.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    WebAppTests.testPage(NodeLabelsPage.class, Router.class, new MockRouter(config));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebAppProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebAppProxy.java
+deleted file mode 100644
+index 205b6e9236a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebAppProxy.java
++++ /dev/null
+@@ -1,298 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
+-import org.apache.hadoop.yarn.api.ApplicationHistoryProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.router.clientrm.FederationClientInterceptor;
+-import org.apache.hadoop.yarn.server.router.clientrm.RouterClientRMService.RequestInterceptorChainWrapper;
+-import org.apache.hadoop.yarn.server.webproxy.FedAppReportFetcher;
+-import org.eclipse.jetty.server.Server;
+-import org.eclipse.jetty.server.ServerConnector;
+-import org.eclipse.jetty.servlet.ServletContextHandler;
+-import org.eclipse.jetty.servlet.ServletHolder;
+-import org.eclipse.jetty.util.thread.QueuedThreadPool;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-import org.mockito.Mockito;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.servlet.http.HttpServlet;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-import java.net.HttpURLConnection;
+-import java.net.URL;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Mockito.mock;
+-
+-public class TestRouterWebAppProxy {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestRouterWebAppProxy.class);
+-
+-  public static final String AM_PREFIX = "AM";
+-  public static final String RM_PREFIX = "RM";
+-  public static final String AHS_PREFIX = "AHS";
+-
+-  /*
+-   * Mocked Server is used for simulating the web of AppMaster, ResourceMamanger or TimelineServer.
+-   * */
+-  private static Server mockServer;
+-  private static int mockServerPort = 0;
+-
+-  /**
+-   * Simple http server. Server should send answer with status 200
+-   */
+-  @BeforeClass
+-  public static void setUp() throws Exception {
+-    mockServer = new Server(0);
+-    ((QueuedThreadPool) mockServer.getThreadPool()).setMaxThreads(20);
+-    ServletContextHandler context = new ServletContextHandler();
+-    context.setContextPath("/");
+-    context.addServlet(new ServletHolder(new MockWebServlet(AM_PREFIX)), "/amweb/*");
+-    context.addServlet(new ServletHolder(new MockWebServlet(RM_PREFIX)), "/cluster/app/*");
+-    context.addServlet(new ServletHolder(new MockWebServlet(AHS_PREFIX)),
+-        "/applicationhistory/app/*");
+-    mockServer.setHandler(context);
+-    ((ServerConnector) mockServer.getConnectors()[0]).setHost("localhost");
+-    mockServer.start();
+-    mockServerPort = ((ServerConnector) mockServer.getConnectors()[0]).getLocalPort();
+-    LOG.info("Running embedded servlet container at: http://localhost:" + mockServerPort);
+-  }
+-
+-  @Test(timeout=10000)
+-  public void testRouterWebAppProxyFed() throws Exception {
+-
+-    Configuration conf = new Configuration();
+-    conf.set(YarnConfiguration.ROUTER_WEBAPP_ADDRESS, "localhost:9090");
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-    conf.setBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, true);
+-    conf.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS, "localhost:" + mockServerPort);
+-    // overriding num of web server threads, see HttpServer.HTTP_MAXTHREADS
+-    conf.setInt("hadoop.http.max.threads", 10);
+-
+-    // Create sub cluster information.
+-    SubClusterId subClusterId1 = SubClusterId.newInstance("scid1");
+-    SubClusterId subClusterId2 = SubClusterId.newInstance("scid2");
+-    SubClusterInfo subClusterInfo1 = SubClusterInfo.newInstance(subClusterId1, "10.0.0.1:1",
+-        "10.0.0.1:1", "10.0.0.1:1", "localhost:" + mockServerPort, SubClusterState.SC_RUNNING, 0,
+-        "");
+-    SubClusterInfo subClusterInfo2 = SubClusterInfo.newInstance(subClusterId2, "10.0.0.2:1",
+-        "10.0.0.2:1", "10.0.0.2:1", "10.0.0.2:1", SubClusterState.SC_RUNNING, 0, "");
+-
+-    // App1 and App2 is running applications.
+-    ApplicationId appId1 = ApplicationId.newInstance(0, 1);
+-    ApplicationId appId2 = ApplicationId.newInstance(0, 2);
+-    String appUrl1 = "http://localhost:" + mockServerPort + "/amweb/" + appId1;
+-    String proxyAppUrl1 = "http://localhost:" + mockServerPort + "/proxy/" + appId1;
+-    String appUrl2 = "http://localhost:" + mockServerPort + "/amweb/" + appId2;
+-    String proxyAppUrl2 = "http://localhost:" + mockServerPort + "/proxy/" + appId2;
+-    // App3 is accepted application, has not registered original url to am.
+-    ApplicationId appId3 = ApplicationId.newInstance(0, 3);
+-    String proxyAppUrl3 = "http://localhost:" + mockServerPort + "/proxy/" + appId3;
+-    // App4 is finished application, has remove from rm, but not remove from timeline server.
+-    ApplicationId appId4 = ApplicationId.newInstance(0, 4);
+-    String proxyAppUrl4 = "http://localhost:" + mockServerPort + "/proxy/" + appId4;
+-
+-    // Mock for application
+-    ApplicationClientProtocol appManager1 = mock(ApplicationClientProtocol.class);
+-    Mockito.when(appManager1.getApplicationReport(GetApplicationReportRequest.newInstance(appId1)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId1, YarnApplicationState.RUNNING, proxyAppUrl1, appUrl1)));
+-    Mockito.when(appManager1.getApplicationReport(GetApplicationReportRequest.newInstance(appId3)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId3, YarnApplicationState.ACCEPTED, proxyAppUrl2, null)));
+-
+-    ApplicationClientProtocol appManager2 = mock(ApplicationClientProtocol.class);
+-    Mockito.when(appManager2.getApplicationReport(GetApplicationReportRequest.newInstance(appId2)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId2, YarnApplicationState.RUNNING, proxyAppUrl3, appUrl2)));
+-    Mockito.when(appManager2.getApplicationReport(GetApplicationReportRequest.newInstance(appId4)))
+-        .thenThrow(new ApplicationNotFoundException("APP NOT FOUND"));
+-
+-    ApplicationHistoryProtocol historyManager = mock(ApplicationHistoryProtocol.class);
+-    Mockito.when(
+-            historyManager.getApplicationReport(GetApplicationReportRequest.newInstance(appId4)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId4, YarnApplicationState.FINISHED, proxyAppUrl4, null)));
+-
+-    // Initial federation store.
+-    FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(conf);
+-    facade.getStateStore()
+-        .registerSubCluster(SubClusterRegisterRequest.newInstance(subClusterInfo1));
+-    facade.getStateStore()
+-        .registerSubCluster(SubClusterRegisterRequest.newInstance(subClusterInfo2));
+-    facade.addApplicationHomeSubCluster(
+-        ApplicationHomeSubCluster.newInstance(appId1, subClusterId1));
+-    facade.addApplicationHomeSubCluster(
+-        ApplicationHomeSubCluster.newInstance(appId2, subClusterId2));
+-    facade.addApplicationHomeSubCluster(
+-        ApplicationHomeSubCluster.newInstance(appId3, subClusterId1));
+-    facade.addApplicationHomeSubCluster(
+-        ApplicationHomeSubCluster.newInstance(appId4, subClusterId2));
+-
+-    // Start router for test
+-    Router router = new Router();
+-    router.init(conf);
+-    router.start();
+-    String user = UserGroupInformation.getCurrentUser().getUserName();
+-    RequestInterceptorChainWrapper wrapper = mock(RequestInterceptorChainWrapper.class);
+-    FederationClientInterceptor interceptor = mock(FederationClientInterceptor.class);
+-    Mockito.when(interceptor.getApplicationReport(GetApplicationReportRequest.newInstance(appId1)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId1, YarnApplicationState.RUNNING, proxyAppUrl1, appUrl1)));
+-    Mockito.when(interceptor.getApplicationReport(GetApplicationReportRequest.newInstance(appId2)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId2, YarnApplicationState.RUNNING, proxyAppUrl2, appUrl2)));
+-    Mockito.when(interceptor.getApplicationReport(GetApplicationReportRequest.newInstance(appId3)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId3, YarnApplicationState.ACCEPTED, proxyAppUrl3, null)));
+-    Mockito.when(interceptor.getApplicationReport(GetApplicationReportRequest.newInstance(appId4)))
+-        .thenReturn(GetApplicationReportResponse.newInstance(
+-            newApplicationReport(appId4, YarnApplicationState.FINISHED, proxyAppUrl4, null)));
+-    Mockito.when(wrapper.getRootInterceptor()).thenReturn(interceptor);
+-    router.getClientRMProxyService().getUserPipelineMap().put(user, wrapper);
+-    try {
+-      // set Mocked rm and timeline
+-      FedAppReportFetcher appReportFetcher = router.getFetcher();
+-      appReportFetcher.registerSubCluster(subClusterInfo1, appManager1);
+-      appReportFetcher.registerSubCluster(subClusterInfo2, appManager2);
+-      appReportFetcher.setHistoryManager(historyManager);
+-
+-      // App1 is running in subcluster1, and original url is registered in rm of subCluster1.
+-      // So router will get original url from rm by getApplicationReport. Then router
+-      // will fetch the webapp directly.
+-      GetApplicationReportResponse response = router.getClientRMProxyService()
+-          .getApplicationReport(GetApplicationReportRequest.newInstance(appId1));
+-      URL url = new URL(response.getApplicationReport().getTrackingUrl());
+-      HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+-      conn.connect();
+-      assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
+-      assertEquals(AM_PREFIX + "/" + appId1, readResponse(conn));
+-      conn.disconnect();
+-
+-      // App2 is running in subcluster2, and original url is registered
+-      // in rm of subCluster2. So router will get original url from rm by
+-      // getApplicationReport. Then router will fetch the webapp directly.
+-      response = router.getClientRMProxyService()
+-          .getApplicationReport(GetApplicationReportRequest.newInstance(appId2));
+-      url = new URL(response.getApplicationReport().getTrackingUrl());
+-      conn = (HttpURLConnection) url.openConnection();
+-      conn.connect();
+-      assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
+-      assertEquals(AM_PREFIX + "/" + appId2, readResponse(conn));
+-      conn.disconnect();
+-
+-      // App3 is accepted in subcluster1, and original url is not registered
+-      // yet. So router will fetch the application web from rm.
+-      response = router.getClientRMProxyService()
+-          .getApplicationReport(GetApplicationReportRequest.newInstance(appId3));
+-      url = new URL(response.getApplicationReport().getTrackingUrl());
+-      conn = (HttpURLConnection) url.openConnection();
+-      conn.connect();
+-      assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
+-      assertEquals(RM_PREFIX + "/" + appId3, readResponse(conn));
+-      conn.disconnect();
+-
+-      // App4 is finished in subcluster2, and have removed from rm, but not
+-      // removed from timeline server. So rouer will fetch the
+-      // application web from timeline server.
+-      response = router.getClientRMProxyService()
+-          .getApplicationReport(GetApplicationReportRequest.newInstance(appId4));
+-      url = new URL(response.getApplicationReport().getTrackingUrl());
+-      conn = (HttpURLConnection) url.openConnection();
+-      conn.connect();
+-      assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
+-      assertEquals(AHS_PREFIX + "/" + appId4, readResponse(conn));
+-      conn.disconnect();
+-    } finally {
+-      router.close();
+-    }
+-  }
+-
+-  private ApplicationReport newApplicationReport(ApplicationId appId, YarnApplicationState state,
+-                                                 String trackingUrl, String origTrackingUrl) {
+-    return ApplicationReport.newInstance(appId, null, "testuser", null, null, null, 0, null, state,
+-        null, trackingUrl, 0, 0, 0, null, null, origTrackingUrl, 0f, null, null);
+-  }
+-
+-  private String readResponse(HttpURLConnection conn) throws IOException {
+-    InputStream input = conn.getInputStream();
+-    byte[] bytes = new byte[input.available()];
+-    input.read(bytes);
+-    return new String(bytes);
+-  }
+-
+-  /*
+-   * This servlet is used for simulate the web of AppMaster, ResourceManager,
+-   * TimelineServer and so on.
+-   * */
+-  public static class MockWebServlet extends HttpServlet {
+-
+-    private String role;
+-
+-    public MockWebServlet(String role) {
+-      this.role = role;
+-    }
+-
+-    @Override
+-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+-        throws IOException {
+-      if (req.getPathInfo() != null) {
+-        resp.getWriter().write(role + req.getPathInfo());
+-      }
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-
+-    @Override
+-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+-        throws IOException {
+-      InputStream is = req.getInputStream();
+-      OutputStream os = resp.getOutputStream();
+-      int c = is.read();
+-      while (c > -1) {
+-        os.write(c);
+-        c = is.read();
+-      }
+-      is.close();
+-      os.close();
+-      resp.setStatus(HttpServletResponse.SC_OK);
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java
+deleted file mode 100644
+index 5e480e7714a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServiceUtil.java
++++ /dev/null
+@@ -1,775 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Random;
+-import java.util.concurrent.TimeUnit;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.config.ClientConfig;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo;
+-import org.apache.hadoop.yarn.server.uam.UnmanagedApplicationManager;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Test class to validate RouterWebServiceUtil methods.
+- */
+-public class TestRouterWebServiceUtil {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterWebServiceUtil.class);
+-
+-  private static final ApplicationId APPID1 = ApplicationId.newInstance(1, 1);
+-  private static final ApplicationId APPID2 = ApplicationId.newInstance(2, 1);
+-  private static final ApplicationId APPID3 = ApplicationId.newInstance(3, 1);
+-  private static final ApplicationId APPID4 = ApplicationId.newInstance(4, 1);
+-
+-  private static final String NODE1 = "Node1";
+-  private static final String NODE2 = "Node2";
+-  private static final String NODE3 = "Node3";
+-  private static final String NODE4 = "Node4";
+-
+-  /**
+-   * This test validates the correctness of RouterWebServiceUtil#mergeAppsInfo
+-   * in case we want to merge 4 AMs. The expected result would be the same 4
+-   * AMs.
+-   */
+-  @Test
+-  public void testMerge4DifferentApps() {
+-
+-    AppsInfo apps = new AppsInfo();
+-    int value = 1000;
+-
+-    AppInfo app1 = new AppInfo();
+-    app1.setAppId(APPID1.toString());
+-    app1.setAMHostHttpAddress("http://i_am_the_AM1:1234");
+-    app1.setState(YarnApplicationState.FINISHED);
+-    app1.setNumAMContainerPreempted(value);
+-    apps.add(app1);
+-
+-    AppInfo app2 = new AppInfo();
+-    app2.setAppId(APPID2.toString());
+-    app2.setAMHostHttpAddress("http://i_am_the_AM2:1234");
+-    app2.setState(YarnApplicationState.ACCEPTED);
+-    app2.setAllocatedVCores(2 * value);
+-
+-    apps.add(app2);
+-
+-    AppInfo app3 = new AppInfo();
+-    app3.setAppId(APPID3.toString());
+-    app3.setAMHostHttpAddress("http://i_am_the_AM3:1234");
+-    app3.setState(YarnApplicationState.RUNNING);
+-    app3.setReservedMB(3 * value);
+-    apps.add(app3);
+-
+-    AppInfo app4 = new AppInfo();
+-    app4.setAppId(APPID4.toString());
+-    app4.setAMHostHttpAddress("http://i_am_the_AM4:1234");
+-    app4.setState(YarnApplicationState.NEW);
+-    app4.setAllocatedMB(4 * value);
+-    apps.add(app4);
+-
+-    AppsInfo result = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(4, result.getApps().size());
+-
+-    List<String> appIds = new ArrayList<String>();
+-    AppInfo appInfo1 = null, appInfo2 = null, appInfo3 = null, appInfo4 = null;
+-    for (AppInfo app : result.getApps()) {
+-      appIds.add(app.getAppId());
+-      if (app.getAppId().equals(APPID1.toString())) {
+-        appInfo1 = app;
+-      }
+-      if (app.getAppId().equals(APPID2.toString())) {
+-        appInfo2 = app;
+-      }
+-      if (app.getAppId().equals(APPID3.toString())) {
+-        appInfo3 = app;
+-      }
+-      if (app.getAppId().equals(APPID4.toString())) {
+-        appInfo4 = app;
+-      }
+-    }
+-
+-    Assert.assertTrue(appIds.contains(APPID1.toString()));
+-    Assert.assertTrue(appIds.contains(APPID2.toString()));
+-    Assert.assertTrue(appIds.contains(APPID3.toString()));
+-    Assert.assertTrue(appIds.contains(APPID4.toString()));
+-
+-    // Check preservations APP1
+-    Assert.assertEquals(app1.getState(), appInfo1.getState());
+-    Assert.assertEquals(app1.getNumAMContainerPreempted(),
+-        appInfo1.getNumAMContainerPreempted());
+-
+-    // Check preservations APP2
+-    Assert.assertEquals(app2.getState(), appInfo2.getState());
+-    Assert.assertEquals(app3.getAllocatedVCores(),
+-        appInfo3.getAllocatedVCores());
+-
+-    // Check preservations APP3
+-    Assert.assertEquals(app3.getState(), appInfo3.getState());
+-    Assert.assertEquals(app3.getReservedMB(), appInfo3.getReservedMB());
+-
+-    // Check preservations APP3
+-    Assert.assertEquals(app4.getState(), appInfo4.getState());
+-    Assert.assertEquals(app3.getAllocatedMB(), appInfo3.getAllocatedMB());
+-  }
+-
+-  /**
+-   * This test validates the correctness of RouterWebServiceUtil#mergeAppsInfo
+-   * in case we want to merge 2 UAMs and their own AM. The status of the AM is
+-   * FINISHED, so we check the correctness of the merging of the historical
+-   * values. The expected result would be 1 report with the merged information.
+-   */
+-  @Test
+-  public void testMergeAppsFinished() {
+-
+-    AppsInfo apps = new AppsInfo();
+-
+-    String amHost = "http://i_am_the_AM1:1234";
+-    AppInfo am = new AppInfo();
+-    am.setAppId(APPID1.toString());
+-    am.setAMHostHttpAddress(amHost);
+-    am.setState(YarnApplicationState.FINISHED);
+-
+-    int value = 1000;
+-    setAppInfoFinished(am, value);
+-
+-    apps.add(am);
+-
+-    AppInfo uam1 = new AppInfo();
+-    uam1.setAppId(APPID1.toString());
+-    apps.add(uam1);
+-
+-    setAppInfoFinished(uam1, value);
+-
+-    AppInfo uam2 = new AppInfo();
+-    uam2.setAppId(APPID1.toString());
+-    apps.add(uam2);
+-
+-    setAppInfoFinished(uam2, value);
+-
+-    // in this case the result does not change if we enable partial result
+-    AppsInfo result = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getApps().size());
+-
+-    AppInfo app = result.getApps().get(0);
+-
+-    Assert.assertEquals(APPID1.toString(), app.getAppId());
+-    Assert.assertEquals(amHost, app.getAMHostHttpAddress());
+-    Assert.assertEquals(value * 3, app.getPreemptedResourceMB());
+-    Assert.assertEquals(value * 3, app.getPreemptedResourceVCores());
+-    Assert.assertEquals(value * 3, app.getNumNonAMContainerPreempted());
+-    Assert.assertEquals(value * 3, app.getNumAMContainerPreempted());
+-    Assert.assertEquals(value * 3, app.getPreemptedMemorySeconds());
+-    Assert.assertEquals(value * 3, app.getPreemptedVcoreSeconds());
+-  }
+-
+-  private void setAppInfoFinished(AppInfo am, int value) {
+-    am.setPreemptedResourceMB(value);
+-    am.setPreemptedResourceVCores(value);
+-    am.setNumNonAMContainerPreempted(value);
+-    am.setNumAMContainerPreempted(value);
+-    am.setPreemptedMemorySeconds(value);
+-    am.setPreemptedVcoreSeconds(value);
+-  }
+-
+-  /**
+-   * This test validates the correctness of RouterWebServiceUtil#mergeAppsInfo
+-   * in case we want to merge 2 UAMs and their own AM. The status of the AM is
+-   * RUNNING, so we check the correctness of the merging of the runtime values.
+-   * The expected result would be 1 report with the merged information.
+-   */
+-  @Test
+-  public void testMergeAppsRunning() {
+-
+-    AppsInfo apps = new AppsInfo();
+-
+-    String amHost = "http://i_am_the_AM2:1234";
+-    AppInfo am = new AppInfo();
+-    am.setAppId(APPID2.toString());
+-    am.setAMHostHttpAddress(amHost);
+-    am.setState(YarnApplicationState.RUNNING);
+-
+-    int value = 1000;
+-    setAppInfoRunning(am, value);
+-
+-    apps.add(am);
+-
+-    AppInfo uam1 = new AppInfo();
+-    uam1.setAppId(APPID2.toString());
+-    uam1.setState(YarnApplicationState.RUNNING);
+-    apps.add(uam1);
+-
+-    setAppInfoRunning(uam1, value);
+-
+-    AppInfo uam2 = new AppInfo();
+-    uam2.setAppId(APPID2.toString());
+-    uam2.setState(YarnApplicationState.RUNNING);
+-    apps.add(uam2);
+-
+-    setAppInfoRunning(uam2, value);
+-
+-    // in this case the result does not change if we enable partial result
+-    AppsInfo result = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getApps().size());
+-
+-    AppInfo app = result.getApps().get(0);
+-
+-    Assert.assertEquals(APPID2.toString(), app.getAppId());
+-    Assert.assertEquals(amHost, app.getAMHostHttpAddress());
+-    Assert.assertEquals(value * 3, app.getAllocatedMB());
+-    Assert.assertEquals(value * 3, app.getAllocatedVCores());
+-    Assert.assertEquals(value * 3, app.getReservedMB());
+-    Assert.assertEquals(value * 3, app.getReservedVCores());
+-    Assert.assertEquals(value * 3, app.getRunningContainers());
+-    Assert.assertEquals(value * 3, app.getMemorySeconds());
+-    Assert.assertEquals(value * 3, app.getVcoreSeconds());
+-    Assert.assertEquals(3, app.getResourceRequests().size());
+-  }
+-
+-  private void setAppInfoRunning(AppInfo am, int value) {
+-    am.getResourceRequests().add(new ResourceRequestInfo());
+-    am.setAllocatedMB(value);
+-    am.setAllocatedVCores(value);
+-    am.setReservedMB(value);
+-    am.setReservedVCores(value);
+-    am.setRunningContainers(value);
+-    am.setMemorySeconds(value);
+-    am.setVcoreSeconds(value);
+-  }
+-
+-  /**
+-   * This test validates the correctness of RouterWebServiceUtil#mergeAppsInfo
+-   * in case we want to merge 2 UAMs without their own AM. The expected result
+-   * would be an empty report or a partial report of the 2 UAMs depending on the
+-   * selected policy.
+-   */
+-  @Test
+-  public void testMerge2UAM() {
+-
+-    AppsInfo apps = new AppsInfo();
+-
+-    AppInfo app1 = new AppInfo();
+-    app1.setAppId(APPID1.toString());
+-    app1.setName(UnmanagedApplicationManager.APP_NAME);
+-    app1.setState(YarnApplicationState.RUNNING);
+-    apps.add(app1);
+-
+-    AppInfo app2 = new AppInfo();
+-    app2.setAppId(APPID1.toString());
+-    app2.setName(UnmanagedApplicationManager.APP_NAME);
+-    app2.setState(YarnApplicationState.RUNNING);
+-    apps.add(app2);
+-
+-    AppsInfo result = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(0, result.getApps().size());
+-
+-    // By enabling partial result, the expected result would be a partial report
+-    // of the 2 UAMs
+-    AppsInfo result2 = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), true);
+-    Assert.assertNotNull(result2);
+-    Assert.assertEquals(1, result2.getApps().size());
+-    Assert.assertEquals(YarnApplicationState.RUNNING,
+-        result2.getApps().get(0).getState());
+-  }
+-
+-  /**
+-   * This test validates the correctness of RouterWebServiceUtil#mergeAppsInfo
+-   * in case we want to merge 1 UAM that does not depend on Federation. The
+-   * excepted result would be the same app report.
+-   */
+-  @Test
+-  public void testMergeUAM() {
+-
+-    AppsInfo apps = new AppsInfo();
+-
+-    AppInfo app1 = new AppInfo();
+-    app1.setAppId(APPID1.toString());
+-    app1.setName("Test");
+-    apps.add(app1);
+-
+-    // in this case the result does not change if we enable partial result
+-    AppsInfo result = RouterWebServiceUtil.mergeAppsInfo(apps.getApps(), false);
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getApps().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * RouterWebServiceUtil#deleteDuplicateNodesInfo in case we want to merge 4
+-   * Nodes. The expected result would be the same 4 Nodes.
+-   */
+-  @Test
+-  public void testDeleteDuplicate4DifferentNodes() {
+-
+-    NodesInfo nodes = new NodesInfo();
+-
+-    NodeInfo nodeInfo1 = new NodeInfo();
+-    nodeInfo1.setId(NODE1);
+-    nodes.add(nodeInfo1);
+-
+-    NodeInfo nodeInfo2 = new NodeInfo();
+-    nodeInfo2.setId(NODE2);
+-    nodes.add(nodeInfo2);
+-
+-    NodeInfo nodeInfo3 = new NodeInfo();
+-    nodeInfo3.setId(NODE3);
+-    nodes.add(nodeInfo3);
+-
+-    NodeInfo nodeInfo4 = new NodeInfo();
+-    nodeInfo4.setId(NODE4);
+-    nodes.add(nodeInfo4);
+-
+-    NodesInfo result =
+-        RouterWebServiceUtil.deleteDuplicateNodesInfo(nodes.getNodes());
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(4, result.getNodes().size());
+-
+-    List<String> nodesIds = new ArrayList<String>();
+-
+-    for (NodeInfo node : result.getNodes()) {
+-      nodesIds.add(node.getNodeId());
+-    }
+-
+-    Assert.assertTrue(nodesIds.contains(NODE1));
+-    Assert.assertTrue(nodesIds.contains(NODE2));
+-    Assert.assertTrue(nodesIds.contains(NODE3));
+-    Assert.assertTrue(nodesIds.contains(NODE4));
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RouterWebServiceUtil#deleteDuplicateNodesInfo(ArrayList)} in case we
+-   * want to merge 3 nodes with the same id. The expected result would be 1 node
+-   * report with the newest healthy report.
+-   */
+-  @Test
+-  public void testDeleteDuplicateNodes() {
+-
+-    NodesInfo nodes = new NodesInfo();
+-
+-    NodeInfo node1 = new NodeInfo();
+-    node1.setId(NODE1);
+-    node1.setLastHealthUpdate(0);
+-    nodes.add(node1);
+-
+-    NodeInfo node2 = new NodeInfo();
+-    node2.setId(NODE1);
+-    node2.setLastHealthUpdate(1);
+-    nodes.add(node2);
+-
+-    NodeInfo node3 = new NodeInfo();
+-    node3.setId(NODE1);
+-    node3.setLastHealthUpdate(2);
+-    nodes.add(node3);
+-
+-    NodesInfo result =
+-        RouterWebServiceUtil.deleteDuplicateNodesInfo(nodes.getNodes());
+-    Assert.assertNotNull(result);
+-    Assert.assertEquals(1, result.getNodes().size());
+-
+-    NodeInfo node = result.getNodes().get(0);
+-
+-    Assert.assertEquals(NODE1, node.getNodeId());
+-    Assert.assertEquals(2, node.getLastHealthUpdate());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RouterWebServiceUtil#mergeMetrics}.
+-   */
+-  @Test
+-  public void testMergeMetrics() {
+-    ClusterMetricsInfo metrics = new ClusterMetricsInfo();
+-    ClusterMetricsInfo metricsResponse = new ClusterMetricsInfo();
+-
+-    long seed = System.currentTimeMillis();
+-    setUpClusterMetrics(metrics, seed);
+-    // ensure that we don't reuse the same seed when setting up metricsResponse
+-    // or it might mask bugs
+-    seed += 1000000000;
+-    setUpClusterMetrics(metricsResponse, seed);
+-    ClusterMetricsInfo metricsClone = createClusterMetricsClone(metrics);
+-    RouterWebServiceUtil.mergeMetrics(metrics, metricsResponse);
+-
+-    Assert.assertEquals(
+-        metricsResponse.getAppsSubmitted() + metricsClone.getAppsSubmitted(),
+-        metrics.getAppsSubmitted());
+-    Assert.assertEquals(
+-        metricsResponse.getAppsCompleted() + metricsClone.getAppsCompleted(),
+-        metrics.getAppsCompleted());
+-    Assert.assertEquals(
+-        metricsResponse.getAppsPending() + metricsClone.getAppsPending(),
+-        metrics.getAppsPending());
+-    Assert.assertEquals(
+-        metricsResponse.getAppsRunning() + metricsClone.getAppsRunning(),
+-        metrics.getAppsRunning());
+-    Assert.assertEquals(
+-        metricsResponse.getAppsFailed() + metricsClone.getAppsFailed(),
+-        metrics.getAppsFailed());
+-    Assert.assertEquals(
+-        metricsResponse.getAppsKilled() + metricsClone.getAppsKilled(),
+-        metrics.getAppsKilled());
+-
+-    Assert.assertEquals(
+-        metricsResponse.getReservedMB() + metricsClone.getReservedMB(),
+-        metrics.getReservedMB());
+-    Assert.assertEquals(
+-        metricsResponse.getAvailableMB() + metricsClone.getAvailableMB(),
+-        metrics.getAvailableMB());
+-    Assert.assertEquals(
+-        metricsResponse.getAllocatedMB() + metricsClone.getAllocatedMB(),
+-        metrics.getAllocatedMB());
+-
+-    Assert.assertEquals(
+-        metricsResponse.getReservedVirtualCores()
+-            + metricsClone.getReservedVirtualCores(),
+-        metrics.getReservedVirtualCores());
+-    Assert.assertEquals(
+-        metricsResponse.getAvailableVirtualCores()
+-            + metricsClone.getAvailableVirtualCores(),
+-        metrics.getAvailableVirtualCores());
+-    Assert.assertEquals(
+-        metricsResponse.getAllocatedVirtualCores()
+-            + metricsClone.getAllocatedVirtualCores(),
+-        metrics.getAllocatedVirtualCores());
+-
+-    Assert.assertEquals(
+-        metricsResponse.getContainersAllocated()
+-            + metricsClone.getContainersAllocated(),
+-        metrics.getContainersAllocated());
+-    Assert.assertEquals(
+-        metricsResponse.getReservedContainers()
+-            + metricsClone.getReservedContainers(),
+-        metrics.getReservedContainers());
+-    Assert.assertEquals(
+-        metricsResponse.getPendingContainers()
+-            + metricsClone.getPendingContainers(),
+-        metrics.getPendingContainers());
+-
+-    Assert.assertEquals(
+-        metricsResponse.getTotalMB() + metricsClone.getTotalMB(),
+-        metrics.getTotalMB());
+-    Assert.assertEquals(
+-        metricsResponse.getUtilizedMB() + metricsClone.getUtilizedMB(),
+-        metrics.getUtilizedMB());
+-    Assert.assertEquals(
+-        metricsResponse.getTotalVirtualCores()
+-            + metricsClone.getTotalVirtualCores(),
+-        metrics.getTotalVirtualCores());
+-    Assert.assertEquals(
+-        metricsResponse.getUtilizedVirtualCores() + metricsClone.getUtilizedVirtualCores(),
+-        metrics.getUtilizedVirtualCores());
+-    Assert.assertEquals(
+-        metricsResponse.getTotalNodes() + metricsClone.getTotalNodes(),
+-        metrics.getTotalNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getLostNodes() + metricsClone.getLostNodes(),
+-        metrics.getLostNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getUnhealthyNodes() + metricsClone.getUnhealthyNodes(),
+-        metrics.getUnhealthyNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getDecommissioningNodes()
+-            + metricsClone.getDecommissioningNodes(),
+-        metrics.getDecommissioningNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getDecommissionedNodes()
+-            + metricsClone.getDecommissionedNodes(),
+-        metrics.getDecommissionedNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getRebootedNodes() + metricsClone.getRebootedNodes(),
+-        metrics.getRebootedNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getActiveNodes() + metricsClone.getActiveNodes(),
+-        metrics.getActiveNodes());
+-    Assert.assertEquals(
+-        metricsResponse.getShutdownNodes() + metricsClone.getShutdownNodes(),
+-        metrics.getShutdownNodes());
+-  }
+-
+-  private ClusterMetricsInfo createClusterMetricsClone(
+-      ClusterMetricsInfo metrics) {
+-    ClusterMetricsInfo metricsClone = new ClusterMetricsInfo();
+-    metricsClone.setAppsSubmitted(metrics.getAppsSubmitted());
+-    metricsClone.setAppsCompleted(metrics.getAppsCompleted());
+-    metricsClone.setAppsPending(metrics.getAppsPending());
+-    metricsClone.setAppsRunning(metrics.getAppsRunning());
+-    metricsClone.setAppsFailed(metrics.getAppsFailed());
+-    metricsClone.setAppsKilled(metrics.getAppsKilled());
+-
+-    metricsClone.setReservedMB(metrics.getReservedMB());
+-    metricsClone.setAvailableMB(metrics.getAvailableMB());
+-    metricsClone.setAllocatedMB(metrics.getAllocatedMB());
+-
+-    metricsClone.setReservedVirtualCores(metrics.getReservedVirtualCores());
+-    metricsClone.setAvailableVirtualCores(metrics.getAvailableVirtualCores());
+-    metricsClone.setAllocatedVirtualCores(metrics.getAllocatedVirtualCores());
+-
+-    metricsClone.setContainersAllocated(metrics.getContainersAllocated());
+-    metricsClone.setContainersReserved(metrics.getReservedContainers());
+-    metricsClone.setContainersPending(metrics.getPendingContainers());
+-
+-    metricsClone.setTotalMB(metrics.getTotalMB());
+-    metricsClone.setUtilizedMB(metrics.getUtilizedMB());
+-    metricsClone.setTotalVirtualCores(metrics.getTotalVirtualCores());
+-    metricsClone.setUtilizedVirtualCores(metrics.getUtilizedVirtualCores());
+-    metricsClone.setTotalNodes(metrics.getTotalNodes());
+-    metricsClone.setLostNodes(metrics.getLostNodes());
+-    metricsClone.setUnhealthyNodes(metrics.getUnhealthyNodes());
+-    metricsClone.setDecommissioningNodes(metrics.getDecommissioningNodes());
+-    metricsClone.setDecommissionedNodes(metrics.getDecommissionedNodes());
+-    metricsClone.setRebootedNodes(metrics.getRebootedNodes());
+-    metricsClone.setActiveNodes(metrics.getActiveNodes());
+-    metricsClone.setShutdownNodes(metrics.getShutdownNodes());
+-    return metricsClone;
+-
+-  }
+-
+-  private void setUpClusterMetrics(ClusterMetricsInfo metrics, long seed) {
+-    LOG.info("Using seed: " + seed);
+-    Random rand = new Random(seed);
+-    metrics.setAppsSubmitted(rand.nextInt(1000));
+-    metrics.setAppsCompleted(rand.nextInt(1000));
+-    metrics.setAppsPending(rand.nextInt(1000));
+-    metrics.setAppsRunning(rand.nextInt(1000));
+-    metrics.setAppsFailed(rand.nextInt(1000));
+-    metrics.setAppsKilled(rand.nextInt(1000));
+-
+-    metrics.setReservedMB(rand.nextInt(1000));
+-    metrics.setAvailableMB(rand.nextInt(1000));
+-    metrics.setAllocatedMB(rand.nextInt(1000));
+-
+-    metrics.setReservedVirtualCores(rand.nextInt(1000));
+-    metrics.setAvailableVirtualCores(rand.nextInt(1000));
+-    metrics.setAllocatedVirtualCores(rand.nextInt(1000));
+-
+-    metrics.setContainersAllocated(rand.nextInt(1000));
+-    metrics.setContainersReserved(rand.nextInt(1000));
+-    metrics.setContainersPending(rand.nextInt(1000));
+-
+-    metrics.setTotalMB(rand.nextInt(1000));
+-    metrics.setUtilizedMB(metrics.getTotalMB() - rand.nextInt(100));
+-    metrics.setTotalVirtualCores(rand.nextInt(1000));
+-    metrics.setUtilizedVirtualCores(metrics.getUtilizedVirtualCores() - rand.nextInt(100));
+-    metrics.setTotalNodes(rand.nextInt(1000));
+-    metrics.setLostNodes(rand.nextInt(1000));
+-    metrics.setUnhealthyNodes(rand.nextInt(1000));
+-    metrics.setDecommissioningNodes(rand.nextInt(1000));
+-    metrics.setDecommissionedNodes(rand.nextInt(1000));
+-    metrics.setRebootedNodes(rand.nextInt(1000));
+-    metrics.setActiveNodes(rand.nextInt(1000));
+-    metrics.setShutdownNodes(rand.nextInt(1000));
+-  }
+-
+-  public static AppAttemptInfo generateAppAttemptInfo(int attemptId) {
+-    AppAttemptInfo appAttemptInfo = mock(AppAttemptInfo.class);
+-    when(appAttemptInfo.getAppAttemptId()).thenReturn("AppAttemptId_" + attemptId);
+-    when(appAttemptInfo.getAttemptId()).thenReturn(0);
+-    when(appAttemptInfo.getFinishedTime()).thenReturn(1659621705L);
+-    when(appAttemptInfo.getLogsLink()).thenReturn("LogLink_" + attemptId);
+-    return appAttemptInfo;
+-  }
+-
+-  @Test
+-  public void testMergeApplicationStatisticsInfo() {
+-    ApplicationStatisticsInfo infoA = new ApplicationStatisticsInfo();
+-    ApplicationStatisticsInfo infoB = new ApplicationStatisticsInfo();
+-
+-    StatisticsItemInfo item1 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
+-    StatisticsItemInfo item2 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 20);
+-
+-    infoA.add(item1);
+-    infoB.add(item2);
+-
+-    List<ApplicationStatisticsInfo> lists = new ArrayList<>();
+-    lists.add(infoA);
+-    lists.add(infoB);
+-
+-    ApplicationStatisticsInfo mergeInfo =
+-        RouterWebServiceUtil.mergeApplicationStatisticsInfo(lists);
+-    ArrayList<StatisticsItemInfo> statItem = mergeInfo.getStatItems();
+-
+-    Assert.assertNotNull(statItem);
+-    Assert.assertEquals(1, statItem.size());
+-
+-    StatisticsItemInfo first = statItem.get(0);
+-
+-    Assert.assertEquals(item1.getCount() + item2.getCount(), first.getCount());
+-    Assert.assertEquals(item1.getType(), first.getType());
+-    Assert.assertEquals(item1.getState(), first.getState());
+-  }
+-
+-  @Test
+-  public void testMergeDiffApplicationStatisticsInfo() {
+-    ApplicationStatisticsInfo infoA = new ApplicationStatisticsInfo();
+-    StatisticsItemInfo item1 = new StatisticsItemInfo(YarnApplicationState.ACCEPTED, "*", 10);
+-    StatisticsItemInfo item2 =
+-        new StatisticsItemInfo(YarnApplicationState.NEW_SAVING, "test1", 20);
+-    infoA.add(item1);
+-    infoA.add(item2);
+-
+-    ApplicationStatisticsInfo infoB = new ApplicationStatisticsInfo();
+-    StatisticsItemInfo item3 =
+-        new StatisticsItemInfo(YarnApplicationState.NEW_SAVING, "test1", 30);
+-    StatisticsItemInfo item4 = new StatisticsItemInfo(YarnApplicationState.FINISHED, "test3", 40);
+-    infoB.add(item3);
+-    infoB.add(item4);
+-
+-    List<ApplicationStatisticsInfo> lists = new ArrayList<>();
+-    lists.add(infoA);
+-    lists.add(infoB);
+-
+-    ApplicationStatisticsInfo mergeInfo =
+-        RouterWebServiceUtil.mergeApplicationStatisticsInfo(lists);
+-
+-    Assert.assertEquals(3, mergeInfo.getStatItems().size());
+-    List<StatisticsItemInfo> mergeInfoStatItems = mergeInfo.getStatItems();
+-
+-    StatisticsItemInfo item1Result = null;
+-    StatisticsItemInfo item2Result = null;
+-    StatisticsItemInfo item3Result = null;
+-
+-    for (StatisticsItemInfo item : mergeInfoStatItems) {
+-      // ACCEPTED
+-      if (item.getState() == YarnApplicationState.ACCEPTED) {
+-        item1Result = item;
+-      }
+-
+-      // NEW_SAVING
+-      if (item.getState() == YarnApplicationState.NEW_SAVING) {
+-        item2Result = item;
+-      }
+-
+-      // FINISHED
+-      if (item.getState() == YarnApplicationState.FINISHED) {
+-        item3Result = item;
+-      }
+-    }
+-
+-    Assert.assertEquals(YarnApplicationState.ACCEPTED, item1Result.getState());
+-    Assert.assertEquals(item1.getCount(), item1Result.getCount());
+-    Assert.assertEquals(YarnApplicationState.NEW_SAVING, item2Result.getState());
+-    Assert.assertEquals((item2.getCount() + item3.getCount()), item2Result.getCount());
+-    Assert.assertEquals(YarnApplicationState.FINISHED, item3Result.getState());
+-    Assert.assertEquals(item4.getCount(), item3Result.getCount());
+-  }
+-
+-  @Test
+-  public void testCreateJerseyClient() {
+-    // Case1,  default timeout, The default timeout is 30s.
+-    YarnConfiguration configuration = new YarnConfiguration();
+-    Client client01 = RouterWebServiceUtil.createJerseyClient(configuration);
+-    Map<String, Object> properties = client01.getProperties();
+-    int readTimeOut = (int) properties.get(ClientConfig.PROPERTY_READ_TIMEOUT);
+-    int connectTimeOut = (int) properties.get(ClientConfig.PROPERTY_CONNECT_TIMEOUT);
+-    Assert.assertEquals(30000, readTimeOut);
+-    Assert.assertEquals(30000, connectTimeOut);
+-    client01.destroy();
+-
+-    // Case2, set a negative timeout, We'll get the default timeout(30s)
+-    YarnConfiguration configuration2 = new YarnConfiguration();
+-    configuration2.setLong(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, -1L);
+-    configuration2.setLong(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT, -1L);
+-    Client client02 = RouterWebServiceUtil.createJerseyClient(configuration2);
+-    Map<String, Object> properties02 = client02.getProperties();
+-    int readTimeOut02 = (int) properties02.get(ClientConfig.PROPERTY_READ_TIMEOUT);
+-    int connectTimeOut02 =  (int) properties02.get(ClientConfig.PROPERTY_CONNECT_TIMEOUT);
+-    Assert.assertEquals(30000, readTimeOut02);
+-    Assert.assertEquals(30000, connectTimeOut02);
+-    client02.destroy();
+-
+-    // Case3, Set the maximum value that exceeds the integer
+-    // We'll get the default timeout(30s)
+-    YarnConfiguration configuration3 = new YarnConfiguration();
+-    long connectTimeOutLong = (long) Integer.MAX_VALUE + 1;
+-    long readTimeOutLong = (long) Integer.MAX_VALUE + 1;
+-
+-    configuration3.setLong(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, connectTimeOutLong);
+-    configuration3.setLong(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT, readTimeOutLong);
+-    Client client03 = RouterWebServiceUtil.createJerseyClient(configuration3);
+-    Map<String, Object> properties03 = client03.getProperties();
+-    int readTimeOut03 = (int) properties03.get(ClientConfig.PROPERTY_READ_TIMEOUT);
+-    int connectTimeOut03 = (int) properties03.get(ClientConfig.PROPERTY_CONNECT_TIMEOUT);
+-    Assert.assertEquals(30000, readTimeOut03);
+-    Assert.assertEquals(30000, connectTimeOut03);
+-    client03.destroy();
+-  }
+-
+-  @Test
+-  public void testJerseyClient() {
+-    // Case1, Set to negative 1.
+-    YarnConfiguration conf = new YarnConfiguration();
+-    conf.setLong(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, -1L);
+-    conf.setLong(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT, -1L);
+-
+-    int connectTimeOut = (int) getTimeDuration(conf,
+-        YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT);
+-    int readTimeout = (int) getTimeDuration(conf,
+-        YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_READ_TIMEOUT);
+-    Assert.assertEquals(-1, connectTimeOut);
+-    Assert.assertEquals(-1, readTimeout);
+-
+-    // Case2, Set the maximum value that exceeds the integer.
+-    // Converted to int, there will be a value out of bounds.
+-    YarnConfiguration conf1 = new YarnConfiguration();
+-    long connectTimeOutLong = (long) Integer.MAX_VALUE + 1;
+-    long readTimeOutLong = (long) Integer.MAX_VALUE + 1;
+-    conf1.setLong(YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT, connectTimeOutLong);
+-    conf1.setLong(YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT, readTimeOutLong);
+-
+-    int connectTimeOut1 = (int) getTimeDuration(conf1,
+-        YarnConfiguration.ROUTER_WEBAPP_CONNECT_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_CONNECT_TIMEOUT);
+-    int readTimeout1 = (int) getTimeDuration(conf1,
+-        YarnConfiguration.ROUTER_WEBAPP_READ_TIMEOUT,
+-        YarnConfiguration.DEFAULT_ROUTER_WEBAPP_READ_TIMEOUT);
+-    Assert.assertEquals(-2147483648, connectTimeOut1);
+-    Assert.assertEquals(-2147483648, readTimeout1);
+-  }
+-
+-  private long getTimeDuration(YarnConfiguration conf, String varName, long defaultValue) {
+-    return conf.getTimeDuration(varName, defaultValue, TimeUnit.MILLISECONDS);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServices.java
+deleted file mode 100644
+index dbcd7db21c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServices.java
++++ /dev/null
+@@ -1,340 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.Map;
+-
+-import javax.ws.rs.core.Response;
+-
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.webapp.RouterWebServices.RequestInterceptorChainWrapper;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Test class to validate the WebService interceptor model inside the Router.
+- */
+-public class TestRouterWebServices extends BaseRouterWebServicesTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterWebServices.class);
+-
+-  private String user = "test1";
+-
+-  /**
+-   * Test that all requests get forwarded to the last interceptor in the chain
+-   * get back the responses.
+-   */
+-  @Test
+-  public void testRouterWebServicesE2E() throws Exception {
+-
+-    ClusterInfo clusterInfo = get(user);
+-    Assert.assertNotNull(clusterInfo);
+-
+-    ClusterInfo clusterInfo2 = getClusterInfo(user);
+-    Assert.assertNotNull(clusterInfo2);
+-
+-    ClusterMetricsInfo clusterMetricsInfo = getClusterMetricsInfo(user);
+-    Assert.assertNotNull(clusterMetricsInfo);
+-
+-    SchedulerTypeInfo schedulerTypeInfo = getSchedulerInfo(user);
+-    Assert.assertNotNull(schedulerTypeInfo);
+-
+-    String dumpResult = dumpSchedulerLogs(user);
+-    Assert.assertNotNull(dumpResult);
+-
+-    NodesInfo nodesInfo = getNodes(user);
+-    Assert.assertNotNull(nodesInfo);
+-
+-    NodeInfo nodeInfo = getNode(user);
+-    Assert.assertNotNull(nodeInfo);
+-
+-    AppsInfo appsInfo = getApps(user);
+-    Assert.assertNotNull(appsInfo);
+-
+-    ActivitiesInfo activitiesInfo = getActivities(user);
+-    Assert.assertNotNull(activitiesInfo);
+-
+-    AppActivitiesInfo appActiviesInfo = getAppActivities(user);
+-    Assert.assertNotNull(appActiviesInfo);
+-
+-    ApplicationStatisticsInfo applicationStatisticsInfo =
+-        getAppStatistics(user);
+-    Assert.assertNotNull(applicationStatisticsInfo);
+-
+-    AppInfo appInfo = getApp(user);
+-    Assert.assertNotNull(appInfo);
+-
+-    AppState appState = getAppState(user);
+-    Assert.assertNotNull(appState);
+-
+-    Response response = updateAppState(user);
+-    Assert.assertNotNull(response);
+-
+-    NodeToLabelsInfo nodeToLabelsInfo = getNodeToLabels(user);
+-    Assert.assertNotNull(nodeToLabelsInfo);
+-
+-    LabelsToNodesInfo labelsToNodesInfo = getLabelsToNodes(user);
+-    Assert.assertNotNull(labelsToNodesInfo);
+-
+-    Response response2 = replaceLabelsOnNodes(user);
+-    Assert.assertNotNull(response2);
+-
+-    Response response3 = replaceLabelsOnNode(user);
+-    Assert.assertNotNull(response3);
+-
+-    NodeLabelsInfo nodeLabelsInfo = getClusterNodeLabels(user);
+-    Assert.assertNotNull(nodeLabelsInfo);
+-
+-    Response response4 = addToClusterNodeLabels(user);
+-    Assert.assertNotNull(response4);
+-
+-    Response response5 = removeFromClusterNodeLabels(user);
+-    Assert.assertNotNull(response5);
+-
+-    NodeLabelsInfo nodeLabelsInfo2 = getLabelsOnNode(user);
+-    Assert.assertNotNull(nodeLabelsInfo2);
+-
+-    AppPriority appPriority = getAppPriority(user);
+-    Assert.assertNotNull(appPriority);
+-
+-    Response response6 = updateApplicationPriority(user);
+-    Assert.assertNotNull(response6);
+-
+-    AppQueue appQueue = getAppQueue(user);
+-    Assert.assertNotNull(appQueue);
+-
+-    Response response7 = updateAppQueue(user);
+-    Assert.assertNotNull(response7);
+-
+-    Response response8 = createNewApplication(user);
+-    Assert.assertNotNull(response8);
+-
+-    Response response9 = submitApplication(user);
+-    Assert.assertNotNull(response9);
+-
+-    Response response10 = postDelegationToken(user);
+-    Assert.assertNotNull(response10);
+-
+-    Response response11 = postDelegationTokenExpiration(user);
+-    Assert.assertNotNull(response11);
+-
+-    Response response12 = cancelDelegationToken(user);
+-    Assert.assertNotNull(response12);
+-
+-    Response response13 = createNewReservation(user);
+-    Assert.assertNotNull(response13);
+-
+-    Response response14 = submitReservation(user);
+-    Assert.assertNotNull(response14);
+-
+-    Response response15 = updateReservation(user);
+-    Assert.assertNotNull(response15);
+-
+-    Response response16 = deleteReservation(user);
+-    Assert.assertNotNull(response16);
+-
+-    Response response17 = listReservation(user);
+-    Assert.assertNotNull(response17);
+-
+-    AppTimeoutInfo appTimeoutInfo = getAppTimeout(user);
+-    Assert.assertNotNull(appTimeoutInfo);
+-
+-    AppTimeoutsInfo appTimeoutsInfo = getAppTimeouts(user);
+-    Assert.assertNotNull(appTimeoutsInfo);
+-
+-    Response response18 = updateApplicationTimeout(user);
+-    Assert.assertNotNull(response18);
+-
+-    AppAttemptsInfo appAttemptsInfo = getAppAttempts(user);
+-    Assert.assertNotNull(appAttemptsInfo);
+-
+-    AppAttemptInfo appAttemptInfo = getAppAttempt(user);
+-    Assert.assertNotNull(appAttemptInfo);
+-
+-    ContainersInfo containersInfo = getContainers(user);
+-    Assert.assertNotNull(containersInfo);
+-
+-    ContainerInfo containerInfo = getContainer(user);
+-    Assert.assertNotNull(containerInfo);
+-
+-    Response response19 = updateSchedulerConfiguration(user);
+-    Assert.assertNotNull(response19);
+-
+-    Response response20 = getSchedulerConfiguration(user);
+-    Assert.assertNotNull(response20);
+-  }
+-
+-  /**
+-   * Tests if the pipeline is created properly.
+-   */
+-  @Test
+-  public void testRequestInterceptorChainCreation() throws Exception {
+-    RESTRequestInterceptor root =
+-        super.getRouterWebServices().createRequestInterceptorChain();
+-    int index = 0;
+-    while (root != null) {
+-      // The current pipeline is:
+-      // PassThroughRESTRequestInterceptor - index = 0
+-      // PassThroughRESTRequestInterceptor - index = 1
+-      // PassThroughRESTRequestInterceptor - index = 2
+-      // MockRESTRequestInterceptor - index = 3
+-      switch (index) {
+-      case 0: // Fall to the next case
+-      case 1: // Fall to the next case
+-      case 2:
+-        // If index is equal to 0,1 or 2 we fall in this check
+-        Assert.assertEquals(PassThroughRESTRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      case 3:
+-        Assert.assertEquals(MockRESTRequestInterceptor.class.getName(),
+-            root.getClass().getName());
+-        break;
+-      default:
+-        Assert.fail();
+-      }
+-      root = root.getNextInterceptor();
+-      index++;
+-    }
+-    Assert.assertEquals("The number of interceptors in chain does not match", 4,
+-        index);
+-  }
+-
+-  /**
+-   * Test if the different chains for users are generated, and LRU cache is
+-   * working as expected.
+-   */
+-  @Test
+-  public void testUsersChainMapWithLRUCache()
+-      throws YarnException, IOException, InterruptedException {
+-    getInterceptorChain("test1");
+-    getInterceptorChain("test2");
+-    getInterceptorChain("test3");
+-    getInterceptorChain("test4");
+-    getInterceptorChain("test5");
+-    getInterceptorChain("test6");
+-    getInterceptorChain("test7");
+-    getInterceptorChain("test8");
+-
+-    Map<String, RequestInterceptorChainWrapper> pipelines =
+-        getRouterWebServices().getPipelines();
+-    Assert.assertEquals(8, pipelines.size());
+-
+-    getInterceptorChain("test9");
+-    getInterceptorChain("test10");
+-    getInterceptorChain("test1");
+-    getInterceptorChain("test11");
+-
+-    // The cache max size is defined in TEST_MAX_CACHE_SIZE
+-    Assert.assertEquals(10, pipelines.size());
+-
+-    RequestInterceptorChainWrapper chain = pipelines.get("test1");
+-    Assert.assertNotNull("test1 should not be evicted", chain);
+-
+-    chain = pipelines.get("test2");
+-    Assert.assertNull("test2 should have been evicted", chain);
+-  }
+-
+-  /**
+-   * This test validates if the RESTRequestInterceptor chain for the user
+-   * can build and init correctly when a multi-client process begins to
+-   * request RouterWebServices for the same user simultaneously.
+-   */
+-  @Test
+-  public void testWebPipelineConcurrent() throws InterruptedException {
+-    final String user = "test1";
+-
+-    /*
+-     * ClientTestThread is a thread to simulate a client request to get a
+-     * RESTRequestInterceptor for the user.
+-     */
+-    class ClientTestThread extends Thread {
+-      private RESTRequestInterceptor interceptor;
+-      @Override public void run() {
+-        try {
+-          interceptor = pipeline();
+-        } catch (IOException | InterruptedException e) {
+-          e.printStackTrace();
+-        }
+-      }
+-      private RESTRequestInterceptor pipeline()
+-          throws IOException, InterruptedException {
+-        return UserGroupInformation.createRemoteUser(user).doAs(
+-            new PrivilegedExceptionAction<RESTRequestInterceptor>() {
+-              @Override
+-              public RESTRequestInterceptor run() throws Exception {
+-                RequestInterceptorChainWrapper wrapper =
+-                    getInterceptorChain(user);
+-                RESTRequestInterceptor interceptor =
+-                    wrapper.getRootInterceptor();
+-                Assert.assertNotNull(interceptor);
+-                LOG.info("init web interceptor success for user" + user);
+-                return interceptor;
+-              }
+-            });
+-      }
+-    }
+-
+-    /*
+-     * We start the first thread. It should not finish initing a chainWrapper
+-     * before the other thread starts. In this way, the second thread can
+-     * init at the same time of the first one. In the end, we validate that
+-     * the 2 threads get the same chainWrapper without going into error.
+-     */
+-    ClientTestThread client1 = new ClientTestThread();
+-    ClientTestThread client2 = new ClientTestThread();
+-    client1.start();
+-    client2.start();
+-    client1.join();
+-    client2.join();
+-
+-    Assert.assertNotNull(client1.interceptor);
+-    Assert.assertNotNull(client2.interceptor);
+-    Assert.assertSame(client1.interceptor, client2.interceptor);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServicesREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServicesREST.java
+deleted file mode 100644
+index 40c9c76fc1c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestRouterWebServicesREST.java
++++ /dev/null
+@@ -1,1477 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
+-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
+-import static javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE;
+-import static javax.servlet.http.HttpServletResponse.SC_OK;
+-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.ADD_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS_APPATTEMPTID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_APPATTEMPTS_APPATTEMPTID_CONTAINERS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_PRIORITY;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_QUEUE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_APPID_STATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_NEW_APPLICATION;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APPS_TIMEOUTS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APP_ID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.APP_STATISTICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.GET_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.INFO;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.LABEL_MAPPINGS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.METRICS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODE_RESOURCE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID_GETLABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.NODES_NODEID_REPLACE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REMOVE_NODE_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.REPLACE_NODE_TO_LABELS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_DELETE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_NEW;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_SUBMIT;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RESERVATION_UPDATE;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER_ACTIVITIES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER_APP_ACTIVITIES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.SCHEDULER_LOGS;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.STATES;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.TIME;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.POST;
+-import static org.apache.hadoop.yarn.server.router.webapp.HTTPMethods.PUT;
+-import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
+-import static org.apache.hadoop.yarn.webapp.util.WebAppUtils.getNMWebAppURLWithoutScheme;
+-import static org.apache.hadoop.yarn.webapp.util.WebAppUtils.getRMWebAppURLWithScheme;
+-import static org.apache.hadoop.yarn.webapp.util.WebAppUtils.getRouterWebAppURLWithScheme;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.fail;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.concurrent.CompletionService;
+-import java.util.concurrent.ExecutorCompletionService;
+-import java.util.concurrent.ExecutorService;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.concurrent.HadoopExecutors;
+-import org.apache.hadoop.yarn.api.records.NodeLabel;
+-import org.apache.hadoop.yarn.api.records.Resource;
+-import org.apache.hadoop.yarn.api.records.ResourceOption;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServiceProtocol;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.router.Router;
+-import org.apache.hadoop.yarn.server.webapp.WebServices;
+-import org.apache.hadoop.yarn.server.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.server.webapp.dao.ContainersInfo;
+-import org.codehaus.jettison.json.JSONObject;
+-import org.junit.AfterClass;
+-import org.junit.BeforeClass;
+-import org.junit.Test;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.ClientHandlerException;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource;
+-import com.sun.jersey.api.client.ClientResponse.Status;
+-import com.sun.jersey.api.client.WebResource.Builder;
+-
+-import net.jcip.annotations.NotThreadSafe;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.servlet.http.HttpServletRequest;
+-
+-/**
+- * This test validate E2E the correctness of the RouterWebServices. It starts
+- * Router, RM and NM in 3 different processes to avoid servlet conflicts. Each
+- * test creates a REST call to Router and validate that the operation complete
+- * successfully.
+- */
+-@NotThreadSafe
+-public class TestRouterWebServicesREST {
+-
+-  /** The number of concurrent submissions for multi-thread test. */
+-  private static final int NUM_THREADS_TESTS = 100;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestRouterWebServicesREST.class);
+-
+-  private static String userName = "test";
+-
+-  private static JavaProcess rm;
+-  private static JavaProcess nm;
+-  private static JavaProcess router;
+-
+-  private static String rmAddress;
+-  private static String routerAddress;
+-  private static String nmAddress;
+-
+-  private static Configuration conf;
+-
+-  /**
+-   * Wait until the webservice is up and running.
+-   */
+-  public static void waitWebAppRunning(
+-      final String address, final String path) {
+-    try {
+-      final Client clientToRouter = Client.create();
+-      final WebResource toRouter = clientToRouter
+-          .resource(address)
+-          .path(path);
+-      GenericTestUtils.waitFor(() -> {
+-        try {
+-          ClientResponse response = toRouter
+-              .accept(APPLICATION_JSON)
+-              .get(ClientResponse.class);
+-          if (response.getStatus() == SC_OK) {
+-            // process is up and running
+-            return true;
+-          }
+-        } catch (ClientHandlerException e) {
+-          // process is not up and running
+-        }
+-        return false;
+-      }, 1000, 20 * 1000);
+-    } catch (Exception e) {
+-      fail("Web app not running");
+-    }
+-  }
+-
+-  @BeforeClass
+-  public static void setUp() throws Exception {
+-    conf = new YarnConfiguration();
+-
+-    File baseDir = GenericTestUtils.getTestDir("processes");
+-    baseDir.mkdirs();
+-    String baseName = TestRouterWebServicesREST.class.getSimpleName();
+-
+-    File rmOutput = new File(baseDir, baseName + "-rm.log");
+-    rmOutput.createNewFile();
+-    List<String> addClasspath = new LinkedList<>();
+-    addClasspath.add("../hadoop-yarn-server-timelineservice/target/classes");
+-    rm = new JavaProcess(ResourceManager.class, addClasspath, rmOutput);
+-    rmAddress = getRMWebAppURLWithScheme(conf);
+-    waitWebAppRunning(rmAddress, RM_WEB_SERVICE_PATH);
+-
+-    File routerOutput = new File(baseDir, baseName + "-router.log");
+-    routerOutput.createNewFile();
+-    router = new JavaProcess(Router.class, routerOutput);
+-    routerAddress = getRouterWebAppURLWithScheme(conf);
+-    waitWebAppRunning(routerAddress, RM_WEB_SERVICE_PATH);
+-
+-    File nmOutput = new File(baseDir, baseName + "-nm.log");
+-    nmOutput.createNewFile();
+-    nm = new JavaProcess(NodeManager.class, nmOutput);
+-    nmAddress = "http://" + getNMWebAppURLWithoutScheme(conf);
+-    waitWebAppRunning(nmAddress, "/ws/v1/node");
+-  }
+-
+-  @AfterClass
+-  public static void stop() throws Exception {
+-    if (nm != null) {
+-      nm.stop();
+-    }
+-    if (router != null) {
+-      router.stop();
+-    }
+-    if (rm != null) {
+-      rm.stop();
+-    }
+-  }
+-
+-  /**
+-   * Performs 2 GET calls one to RM and the one to Router. In positive case, it
+-   * returns the 2 answers in a list.
+-   */
+-  private static <T> List<T> performGetCalls(final String path,
+-      final Class<T> returnType, final String queryName,
+-      final String queryValue) throws IOException, InterruptedException {
+-    Client clientToRouter = Client.create();
+-    WebResource toRouter = clientToRouter.resource(routerAddress).path(path);
+-
+-    Client clientToRM = Client.create();
+-    WebResource toRM = clientToRM.resource(rmAddress).path(path);
+-
+-    final Builder toRouterBuilder;
+-    final Builder toRMBuilder;
+-
+-    if (queryValue != null && queryName != null) {
+-      toRouterBuilder = toRouter
+-          .queryParam(queryName, queryValue)
+-          .accept(APPLICATION_XML);
+-      toRMBuilder = toRM
+-          .queryParam(queryName, queryValue)
+-          .accept(APPLICATION_XML);
+-    } else {
+-      toRouterBuilder = toRouter.accept(APPLICATION_XML);
+-      toRMBuilder = toRM.accept(APPLICATION_XML);
+-    }
+-
+-    return UserGroupInformation.createRemoteUser(userName)
+-        .doAs((PrivilegedExceptionAction<List<T>>) () -> {
+-          ClientResponse response =
+-              toRouterBuilder.get(ClientResponse.class);
+-          ClientResponse response2 = toRMBuilder.get(ClientResponse.class);
+-          assertEquals(SC_OK, response.getStatus());
+-          assertEquals(SC_OK, response2.getStatus());
+-          List<T> responses = new ArrayList<>();
+-          responses.add(response.getEntity(returnType));
+-          responses.add(response2.getEntity(returnType));
+-          return responses;
+-        });
+-  }
+-
+-  /**
+-   * Performs a POST/PUT/DELETE call to Router and returns the ClientResponse.
+-   */
+-  private static ClientResponse performCall(final String webAddress,
+-      final String queryKey, final String queryValue, final Object context,
+-      final HTTPMethods method) throws IOException, InterruptedException {
+-
+-    return UserGroupInformation.createRemoteUser(userName)
+-        .doAs((PrivilegedExceptionAction<ClientResponse>) () -> {
+-          Client clientToRouter = Client.create();
+-          WebResource toRouter = clientToRouter
+-              .resource(routerAddress)
+-              .path(webAddress);
+-
+-          WebResource toRouterWR = toRouter;
+-          if (queryKey != null && queryValue != null) {
+-            toRouterWR = toRouterWR.queryParam(queryKey, queryValue);
+-          }
+-
+-          Builder builder;
+-          if (context != null) {
+-            builder = toRouterWR.entity(context, APPLICATION_JSON);
+-            builder = builder.accept(APPLICATION_JSON);
+-          } else {
+-            builder = toRouter.accept(APPLICATION_JSON);
+-          }
+-
+-          ClientResponse response = null;
+-
+-          switch (method) {
+-          case DELETE:
+-            response = builder.delete(ClientResponse.class);
+-            break;
+-          case POST:
+-            response = builder.post(ClientResponse.class);
+-            break;
+-          case PUT:
+-            response = builder.put(ClientResponse.class);
+-            break;
+-          default:
+-            break;
+-          }
+-
+-          return response;
+-        });
+-  }
+-
+-  /**
+-   * This test validates the correctness of {@link RMWebServiceProtocol#get()}
+-   * inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testInfoXML() throws Exception {
+-
+-    List<ClusterInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH, ClusterInfo.class, null, null);
+-
+-    ClusterInfo routerResponse = responses.get(0);
+-    ClusterInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getRMVersion(),
+-        routerResponse.getRMVersion());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getClusterInfo()} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testClusterInfoXML() throws Exception {
+-
+-    List<ClusterInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + INFO, ClusterInfo.class, null, null);
+-
+-    ClusterInfo routerResponse = responses.get(0);
+-    ClusterInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getRMVersion(),
+-        routerResponse.getRMVersion());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getClusterMetricsInfo()} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testMetricsInfoXML() throws Exception {
+-
+-    List<ClusterMetricsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + METRICS, ClusterMetricsInfo.class, null, null);
+-
+-    ClusterMetricsInfo routerResponse = responses.get(0);
+-    ClusterMetricsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getActiveNodes(),
+-        routerResponse.getActiveNodes());
+-  }
+-
+-  /*
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getSchedulerInfo()} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testSchedulerInfoXML() throws Exception {
+-
+-    List<SchedulerTypeInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + SCHEDULER, SchedulerTypeInfo.class, null, null);
+-
+-    SchedulerTypeInfo routerResponse = responses.get(0);
+-    SchedulerTypeInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getSchedulerInfo().getSchedulerType(),
+-        routerResponse.getSchedulerInfo().getSchedulerType());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getNodes(String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testNodesEmptyXML() throws Exception {
+-
+-    List<NodesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, null, null);
+-
+-    NodesInfo routerResponse = responses.get(0);
+-    NodesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getNodes().size(),
+-        routerResponse.getNodes().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getNodes(String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testNodesXML() throws Exception {
+-
+-    List<NodesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + NODES, NodesInfo.class, STATES, "LOST");
+-
+-    NodesInfo routerResponse = responses.get(0);
+-    NodesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getNodes().size(),
+-        routerResponse.getNodes().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getNode(String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testNodeXML() throws Exception {
+-
+-    List<NodeInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, getNodeId()),
+-        NodeInfo.class, null, null);
+-
+-    NodeInfo routerResponse = responses.get(0);
+-    NodeInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getVersion(),
+-        routerResponse.getVersion());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateNodeResource} inside Router.
+-   */
+-  @Test
+-  public void testUpdateNodeResource() throws Exception {
+-
+-    // wait until a node shows up and check the resources
+-    GenericTestUtils.waitFor(() -> getNodeId() != null, 100, 5 * 1000);
+-    String nodeId = getNodeId();
+-
+-    // assert memory and default vcores
+-    List<NodeInfo> responses0 = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, getNodeId()),
+-        NodeInfo.class, null, null);
+-    NodeInfo nodeInfo0 = responses0.get(0);
+-    assertEquals(8192, nodeInfo0.getTotalResource().getMemorySize());
+-    assertEquals(8, nodeInfo0.getTotalResource().getvCores());
+-
+-    // update memory to 4096MB and 5 cores
+-    Resource resource = Resource.newInstance(4096, 5);
+-    ResourceOptionInfo resourceOption = new ResourceOptionInfo(
+-        ResourceOption.newInstance(resource, 1000));
+-    ClientResponse routerResponse = performCall(
+-        RM_WEB_SERVICE_PATH + format(NODE_RESOURCE, nodeId),
+-        null, null, resourceOption, POST);
+-    assertResponseStatusCode(Status.OK, routerResponse.getStatusInfo());
+-    JSONObject json = routerResponse.getEntity(JSONObject.class);
+-    JSONObject totalResource = json.getJSONObject("resourceInfo");
+-    assertEquals(resource.getMemorySize(), totalResource.getLong("memory"));
+-    assertEquals(resource.getVirtualCores(), totalResource.getLong("vCores"));
+-
+-    // assert updated memory and cores
+-    List<NodeInfo> responses1 = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID, getNodeId()),
+-        NodeInfo.class, null, null);
+-    NodeInfo nodeInfo1 = responses1.get(0);
+-    assertEquals(4096, nodeInfo1.getTotalResource().getMemorySize());
+-    assertEquals(5, nodeInfo1.getTotalResource().getvCores());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getActivities(HttpServletRequest, String, String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testActiviesXML() throws Exception {
+-
+-    List<ActivitiesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + SCHEDULER_ACTIVITIES,
+-        ActivitiesInfo.class, null, null);
+-
+-    ActivitiesInfo routerResponse = responses.get(0);
+-    ActivitiesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppActivities} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppActivitiesXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppActivitiesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + SCHEDULER_APP_ACTIVITIES,
+-        AppActivitiesInfo.class, APP_ID, appId);
+-
+-    AppActivitiesInfo routerResponse = responses.get(0);
+-    AppActivitiesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppStatistics} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppStatisticsXML() throws Exception {
+-
+-    submitApplication();
+-
+-    List<ApplicationStatisticsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + APP_STATISTICS,
+-        ApplicationStatisticsInfo.class, STATES, "RUNNING");
+-
+-    ApplicationStatisticsInfo routerResponse = responses.get(0);
+-    ApplicationStatisticsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getStatItems().size(),
+-        routerResponse.getStatItems().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#dumpSchedulerLogs} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testDumpSchedulerLogsXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse =
+-        performCall(RM_WEB_SERVICE_PATH + SCHEDULER_LOGS,
+-            null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + SCHEDULER_LOGS, TIME, "1", null, POST);
+-
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#createNewApplication} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testNewApplicationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION, null,
+-        null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION, null,
+-        null, null, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    NewApplication ci = response.getEntity(NewApplication.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#submitApplication} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testSubmitApplicationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + APPS, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    context.setApplicationId(getNewApplicationId().getApplicationId());
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + APPS, null, null, context, POST);
+-
+-    assertEquals(SC_ACCEPTED, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getApps} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppsXML() throws Exception {
+-
+-    submitApplication();
+-
+-    List<AppsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + APPS, AppsInfo.class, null, null);
+-
+-    AppsInfo routerResponse = responses.get(0);
+-    AppsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getApps().size(),
+-        routerResponse.getApps().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getApp} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID, appId),
+-        AppInfo.class, null, null);
+-
+-    AppInfo routerResponse = responses.get(0);
+-    AppInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getAMHostHttpAddress(),
+-        routerResponse.getAMHostHttpAddress());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppAttempts} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppAttemptXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppAttemptsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_APPATTEMPTS, appId),
+-        AppAttemptsInfo.class, null, null);
+-
+-    AppAttemptsInfo routerResponse = responses.get(0);
+-    AppAttemptsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getAttempts().size(),
+-        routerResponse.getAttempts().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppState} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppStateXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppState> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId),
+-        AppState.class, null, null);
+-
+-    AppState routerResponse = responses.get(0);
+-    AppState rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getState(),
+-        routerResponse.getState());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateAppState} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testUpdateAppStateXML() throws Exception {
+-
+-    String appId = submitApplication();
+-    String pathApp =
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_STATE, appId);
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        pathApp, null, null, null, POST);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    AppState appState = new AppState("KILLED");
+-
+-    ClientResponse response = performCall(
+-        pathApp, null, null, appState, PUT);
+-
+-    assertEquals(SC_ACCEPTED, response.getStatus());
+-    AppState ci = response.getEntity(AppState.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppPriority} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppPriorityXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppPriority> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        AppPriority.class, null, null);
+-
+-    AppPriority routerResponse = responses.get(0);
+-    AppPriority rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(rmResponse.getPriority(), routerResponse.getPriority());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateApplicationPriority(
+-   *     AppPriority, HttpServletRequest, String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testUpdateAppPriorityXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        null, null, null, POST);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    AppPriority appPriority = new AppPriority(1);
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_PRIORITY, appId),
+-        null, null, appPriority, PUT);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    AppPriority ci = response.getEntity(AppPriority.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppQueue(HttpServletRequest, String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppQueueXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppQueue> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        AppQueue.class, null, null);
+-
+-    AppQueue routerResponse = responses.get(0);
+-    AppQueue rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(rmResponse.getQueue(), routerResponse.getQueue());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateAppQueue(AppQueue, HttpServletRequest, String)}
+-   * inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testUpdateAppQueueXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        null, null, null, POST);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    AppQueue appQueue = new AppQueue("default");
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_QUEUE, appId),
+-        null, null, appQueue, PUT);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    AppQueue ci = response.getEntity(AppQueue.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppTimeouts} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppTimeoutsXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    List<AppTimeoutsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId),
+-        AppTimeoutsInfo.class, null, null);
+-
+-    AppTimeoutsInfo routerResponse = responses.get(0);
+-    AppTimeoutsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getAppTimeouts().size(),
+-        routerResponse.getAppTimeouts().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getAppTimeout} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAppTimeoutXML() throws Exception {
+-
+-    String appId = submitApplication();
+-    String pathApp = RM_WEB_SERVICE_PATH + format(APPS_TIMEOUTS, appId);
+-    List<AppTimeoutInfo> responses = performGetCalls(
+-        pathApp + "/" + "LIFETIME", AppTimeoutInfo.class, null, null);
+-
+-    AppTimeoutInfo routerResponse = responses.get(0);
+-    AppTimeoutInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getExpireTime(),
+-        routerResponse.getExpireTime());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateApplicationTimeout}
+-   * inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testUpdateAppTimeoutsXML() throws Exception {
+-
+-    String appId = submitApplication();
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
+-        null, null, null, POST);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with a bad request
+-    AppTimeoutInfo appTimeoutInfo = new AppTimeoutInfo();
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + format(APPS_TIMEOUT, appId),
+-        null, null, appTimeoutInfo, PUT);
+-
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#createNewReservation(HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testNewReservationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_NEW,
+-        null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_NEW,
+-        null, null, null, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    NewReservation ci = response.getEntity(NewReservation.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#submitReservation(
+-   *     ReservationSubmissionRequestInfo, HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testSubmitReservationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null,
+-        null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    ReservationSubmissionRequestInfo context =
+-        new ReservationSubmissionRequestInfo();
+-    context.setReservationId(getNewReservationId().getReservationId());
+-    // ReservationDefinition is null
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_SUBMIT, null, null, context, POST);
+-
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#updateReservation(
+-   *     ReservationUpdateRequestInfo, HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testUpdateReservationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    String reservationId = getNewReservationId().getReservationId();
+-    ReservationUpdateRequestInfo context = new ReservationUpdateRequestInfo();
+-    context.setReservationId(reservationId);
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_UPDATE, null, null, context, POST);
+-
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#deleteReservation(
+-   *     ReservationDeleteRequestInfo, HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testDeleteReservationXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    String reservationId = getNewReservationId().getReservationId();
+-    ReservationDeleteRequestInfo context = new ReservationDeleteRequestInfo();
+-    context.setReservationId(reservationId);
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + RESERVATION_DELETE, null, null, context, POST);
+-
+-    assertEquals(SC_BAD_REQUEST, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getNodeToLabels(HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetNodeToLabelsXML() throws Exception {
+-
+-    List<NodeToLabelsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + GET_NODE_TO_LABELS,
+-        NodeToLabelsInfo.class, null, null);
+-
+-    NodeToLabelsInfo routerResponse = responses.get(0);
+-    NodeToLabelsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getNodeToLabels().size(),
+-        routerResponse.getNodeToLabels().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getClusterNodeLabels(HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetClusterNodeLabelsXML() throws Exception {
+-
+-    List<NodeLabelsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + GET_NODE_LABELS,
+-        NodeLabelsInfo.class, null, null);
+-
+-    NodeLabelsInfo routerResponse = responses.get(0);
+-    NodeLabelsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getNodeLabels().size(),
+-        routerResponse.getNodeLabels().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getLabelsOnNode(HttpServletRequest, String)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetLabelsOnNodeXML() throws Exception {
+-
+-    List<NodeLabelsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + format(NODES_NODEID_GETLABELS, getNodeId()),
+-        NodeLabelsInfo.class, null, null);
+-
+-    NodeLabelsInfo routerResponse = responses.get(0);
+-    NodeLabelsInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getNodeLabels().size(),
+-        routerResponse.getNodeLabels().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getLabelsToNodes(Set<String>)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetLabelsMappingEmptyXML() throws Exception {
+-
+-    List<LabelsToNodesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + LABEL_MAPPINGS,
+-        LabelsToNodesInfo.class, null, null);
+-
+-    LabelsToNodesInfo routerResponse = responses.get(0);
+-    LabelsToNodesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getLabelsToNodes().size(),
+-        routerResponse.getLabelsToNodes().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#getLabelsToNodes(Set<String>)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetLabelsMappingXML() throws Exception {
+-
+-    List<LabelsToNodesInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + LABEL_MAPPINGS,
+-        LabelsToNodesInfo.class, LABELS, "label1");
+-
+-    LabelsToNodesInfo routerResponse = responses.get(0);
+-    LabelsToNodesInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getLabelsToNodes().size(),
+-        routerResponse.getLabelsToNodes().size());
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#addToClusterNodeLabels(
+-   *     NodeLabelsInfo, HttpServletRequest)} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testAddToClusterNodeLabelsXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + ADD_NODE_LABELS,
+-        null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(NodeLabel.newInstance("default"));
+-    NodeLabelsInfo context = new NodeLabelsInfo(nodeLabels);
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + ADD_NODE_LABELS, null, null, context, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#removeFromClusterNodeLabels} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testRemoveFromClusterNodeLabelsXML()
+-      throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + REMOVE_NODE_LABELS, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    addNodeLabel();
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + REMOVE_NODE_LABELS,
+-        LABELS, "default", null, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#replaceLabelsOnNodes} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testReplaceLabelsOnNodesXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    ClientResponse badResponse = performCall(
+-        RM_WEB_SERVICE_PATH + REPLACE_NODE_TO_LABELS, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    addNodeLabel();
+-
+-    NodeToLabelsEntryList context = new NodeToLabelsEntryList();
+-
+-    ClientResponse response = performCall(
+-        RM_WEB_SERVICE_PATH + REPLACE_NODE_TO_LABELS,
+-        null, null, context, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of
+-   * {@link RMWebServiceProtocol#replaceLabelsOnNode} inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testReplaceLabelsOnNodeXML() throws Exception {
+-
+-    // Test with a wrong HTTP method
+-    String pathNode = RM_WEB_SERVICE_PATH +
+-        format(NODES_NODEID_REPLACE_LABELS, getNodeId());
+-    ClientResponse badResponse = performCall(
+-        pathNode, null, null, null, PUT);
+-
+-    assertEquals(SC_SERVICE_UNAVAILABLE, badResponse.getStatus());
+-
+-    // Test with the correct HTTP method
+-    addNodeLabel();
+-
+-    ClientResponse response = performCall(
+-        pathNode, LABELS, "default", null, POST);
+-
+-    assertEquals(SC_OK, response.getStatus());
+-    String ci = response.getEntity(String.class);
+-    assertNotNull(ci);
+-  }
+-
+-  /**
+-   * This test validates the correctness of {@link WebServices#getAppAttempt}
+-   * inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetAppAttemptXML() throws Exception {
+-
+-    String appId = submitApplication();
+-    String pathAttempts = RM_WEB_SERVICE_PATH + format(
+-        APPS_APPID_APPATTEMPTS_APPATTEMPTID, appId, getAppAttempt(appId));
+-    List<AppAttemptInfo> responses = performGetCalls(
+-        pathAttempts, AppAttemptInfo.class, null, null);
+-
+-    AppAttemptInfo routerResponse = responses.get(0);
+-    AppAttemptInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getAppAttemptId(),
+-        routerResponse.getAppAttemptId());
+-  }
+-
+-  /**
+-   * This test validates the correctness of {@link WebServices#getContainers}
+-   * inside Router.
+-   */
+-  @Test(timeout = 2000)
+-  public void testGetContainersXML() throws Exception {
+-
+-    String appId = submitApplication();
+-    String pathAttempts = RM_WEB_SERVICE_PATH + format(
+-        APPS_APPID_APPATTEMPTS_APPATTEMPTID_CONTAINERS,
+-        appId, getAppAttempt(appId));
+-    List<ContainersInfo> responses = performGetCalls(
+-        pathAttempts, ContainersInfo.class, null, null);
+-
+-    ContainersInfo routerResponse = responses.get(0);
+-    ContainersInfo rmResponse = responses.get(1);
+-
+-    assertNotNull(routerResponse);
+-    assertNotNull(rmResponse);
+-
+-    assertEquals(
+-        rmResponse.getContainers().size(),
+-        routerResponse.getContainers().size());
+-  }
+-
+-  @Test(timeout = 60000)
+-  public void testGetAppsMultiThread() throws Exception {
+-    final int iniNumApps = getNumApps();
+-
+-    // This submits an application
+-    testGetContainersXML();
+-    // This submits an application
+-    testAppsXML();
+-
+-    // Wait at most 10 seconds until we see all the applications
+-    GenericTestUtils.waitFor(() -> {
+-      try {
+-        // Check if we have the 2 apps we submitted
+-        return getNumApps() == iniNumApps + 2;
+-      } catch (Exception e) {
+-        fail();
+-      }
+-      return false;
+-    }, 100, 10 * 1000);
+-
+-    // Multithreaded getApps()
+-    ExecutorService threadpool = HadoopExecutors.newCachedThreadPool(
+-        new ThreadFactoryBuilder()
+-            .setNameFormat("REST Tester #%d")
+-            .build());
+-    CompletionService<Void> svc = new ExecutorCompletionService<>(threadpool);
+-    try {
+-      // Submit a bunch of operations concurrently
+-      for (int i = 0; i < NUM_THREADS_TESTS; i++) {
+-        svc.submit(() -> {
+-          assertEquals(iniNumApps + 2, getNumApps());
+-          return null;
+-        });
+-      }
+-    } finally {
+-      threadpool.shutdown();
+-    }
+-
+-    assertEquals(iniNumApps + 2, getNumApps());
+-  }
+-
+-  /**
+-   * Get the number of applications in the system.
+-   * @return Number of applications in the system
+-   * @throws Exception If we cannot get the applications.
+-   */
+-  private int getNumApps() throws Exception {
+-    List<AppsInfo> responses = performGetCalls(
+-        RM_WEB_SERVICE_PATH + APPS, AppsInfo.class, null, null);
+-    AppsInfo routerResponse = responses.get(0);
+-    AppsInfo rmResponse = responses.get(1);
+-    assertEquals(rmResponse.getApps().size(), routerResponse.getApps().size());
+-    return rmResponse.getApps().size();
+-  }
+-
+-  private String getNodeId() {
+-    Client clientToRM = Client.create();
+-    WebResource toRM = clientToRM.resource(rmAddress)
+-        .path(RM_WEB_SERVICE_PATH + NODES);
+-    ClientResponse response =
+-        toRM.accept(APPLICATION_XML).get(ClientResponse.class);
+-    NodesInfo ci = response.getEntity(NodesInfo.class);
+-    List<NodeInfo> nodes = ci.getNodes();
+-    if (nodes.isEmpty()) {
+-      return null;
+-    }
+-    return nodes.get(0).getNodeId();
+-  }
+-
+-  private NewApplication getNewApplicationId() {
+-    Client clientToRM = Client.create();
+-    WebResource toRM = clientToRM.resource(rmAddress)
+-        .path(RM_WEB_SERVICE_PATH + APPS_NEW_APPLICATION);
+-    ClientResponse response =
+-        toRM.accept(APPLICATION_XML).post(ClientResponse.class);
+-    return response.getEntity(NewApplication.class);
+-  }
+-
+-  private String submitApplication() {
+-    ApplicationSubmissionContextInfo context =
+-        new ApplicationSubmissionContextInfo();
+-    String appId = getNewApplicationId().getApplicationId();
+-    context.setApplicationId(appId);
+-
+-    Client clientToRouter = Client.create();
+-    WebResource toRM = clientToRouter.resource(rmAddress)
+-        .path(RM_WEB_SERVICE_PATH + APPS);
+-    toRM.entity(context, APPLICATION_XML)
+-        .accept(APPLICATION_XML)
+-        .post(ClientResponse.class);
+-    return appId;
+-  }
+-
+-  private NewReservation getNewReservationId() {
+-    Client clientToRM = Client.create();
+-    WebResource toRM = clientToRM.resource(rmAddress)
+-        .path(RM_WEB_SERVICE_PATH + RESERVATION_NEW);
+-    ClientResponse response = toRM.
+-        accept(APPLICATION_XML)
+-        .post(ClientResponse.class);
+-    return response.getEntity(NewReservation.class);
+-  }
+-
+-  private String addNodeLabel() {
+-    Client clientToRM = Client.create();
+-    WebResource toRM = clientToRM.resource(rmAddress)
+-        .path(RM_WEB_SERVICE_PATH + ADD_NODE_LABELS);
+-    List<NodeLabel> nodeLabels = new ArrayList<>();
+-    nodeLabels.add(NodeLabel.newInstance("default"));
+-    NodeLabelsInfo context = new NodeLabelsInfo(nodeLabels);
+-    ClientResponse response = toRM
+-        .entity(context, APPLICATION_XML)
+-        .accept(APPLICATION_XML)
+-        .post(ClientResponse.class);
+-    return response.getEntity(String.class);
+-  }
+-
+-  private String getAppAttempt(String appId) {
+-    Client clientToRM = Client.create();
+-    String pathAppAttempt =
+-        RM_WEB_SERVICE_PATH + format(APPS_APPID_APPATTEMPTS, appId);
+-    WebResource toRM = clientToRM.resource(rmAddress)
+-        .path(pathAppAttempt);
+-    ClientResponse response = toRM
+-        .accept(APPLICATION_XML)
+-        .get(ClientResponse.class);
+-    AppAttemptsInfo ci = response.getEntity(AppAttemptsInfo.class);
+-    return ci.getAttempts().get(0).getAppAttemptId();
+-  }
+-
+-  /**
+-   * Convert format using {name} (HTTP base) into %s (Java based).
+-   * @param format Initial format using {}.
+-   * @param args Arguments for the format.
+-   * @return New format using %s.
+-   */
+-  private static String format(String format, Object... args) {
+-    Pattern p = Pattern.compile("\\{.*?}");
+-    Matcher m = p.matcher(format);
+-    String newFormat = m.replaceAll("%s");
+-    return String.format(newFormat, args);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java
+deleted file mode 100644
+index 0e37b7c9749..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/java/org/apache/hadoop/yarn/server/router/webapp/TestableFederationInterceptorREST.java
++++ /dev/null
+@@ -1,124 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.router.webapp;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.Map;
+-
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEDICATED_FULL;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEFAULT_FULL;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEFAULT;
+-import static org.apache.hadoop.yarn.server.router.webapp.BaseRouterWebServicesTest.QUEUE_DEDICATED;
+-
+-/**
+- * Extends the FederationInterceptorREST and overrides methods to provide a
+- * testable implementation of FederationInterceptorREST.
+- */
+-public class TestableFederationInterceptorREST
+-    extends FederationInterceptorREST {
+-
+-  private List<SubClusterId> badSubCluster = new ArrayList<>();
+-  private MockRM mockRM = null;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestableFederationInterceptorREST.class);
+-
+-  /**
+-   * For testing purpose, some subclusters has to be down to simulate particular
+-   * scenarios as RM Failover, network issues. For this reason we keep track of
+-   * these bad subclusters. This method make the subcluster unusable.
+-   *
+-   * @param badSC the subcluster to make unusable
+-   */
+-  protected void registerBadSubCluster(SubClusterId badSC) {
+-
+-    // Adding in the cache the bad SubCluster, in this way we can stop them
+-    getOrCreateInterceptorForSubCluster(badSC, "1.2.3.4:4");
+-
+-    badSubCluster.add(badSC);
+-    MockDefaultRequestInterceptorREST interceptor =
+-        (MockDefaultRequestInterceptorREST) super.getInterceptorForSubCluster(
+-            badSC);
+-    interceptor.setRunning(false);
+-  }
+-
+-  protected void setupResourceManager() throws IOException {
+-
+-    if (mockRM != null) {
+-      return;
+-    }
+-
+-    try {
+-
+-      DefaultMetricsSystem.setMiniClusterMode(true);
+-      CapacitySchedulerConfiguration conf = new CapacitySchedulerConfiguration();
+-
+-      // Define default queue
+-      conf.setCapacity(QUEUE_DEFAULT_FULL, 20);
+-      // Define dedicated queues
+-      String[] queues = new String[]{QUEUE_DEFAULT, QUEUE_DEDICATED};
+-      conf.setQueues(CapacitySchedulerConfiguration.ROOT, queues);
+-      conf.setCapacity(QUEUE_DEDICATED_FULL, 80);
+-      conf.setReservable(QUEUE_DEDICATED_FULL, true);
+-
+-      conf.setClass(YarnConfiguration.RM_SCHEDULER,
+-          CapacityScheduler.class, ResourceScheduler.class);
+-      conf.setBoolean(YarnConfiguration.RM_RESERVATION_SYSTEM_ENABLE, true);
+-      conf.setBoolean(YarnConfiguration.RM_WORK_PRESERVING_RECOVERY_ENABLED, false);
+-
+-      mockRM = new MockRM(conf);
+-      mockRM.start();
+-      mockRM.registerNode("127.0.0.1:5678", 100*1024, 100);
+-
+-      Map<SubClusterId, DefaultRequestInterceptorREST> interceptors = super.getInterceptors();
+-      for (DefaultRequestInterceptorREST item : interceptors.values()) {
+-        MockDefaultRequestInterceptorREST interceptor = (MockDefaultRequestInterceptorREST) item;
+-        interceptor.setMockRM(mockRM);
+-      }
+-    } catch (Exception e) {
+-      LOG.error("setupResourceManager failed.", e);
+-      throw new IOException(e);
+-    }
+-  }
+-
+-  @Override
+-  public void shutdown() {
+-    if (mockRM != null) {
+-      mockRM.stop();
+-      mockRM = null;
+-    }
+-    super.shutdown();
+-  }
+-
+-  public MockRM getMockRM() {
+-    return mockRM;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capability b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capability
+deleted file mode 100644
+index e6cf4a1cd03..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capability
++++ /dev/null
+@@ -1,21 +0,0 @@
+-{
+-    "___asflicense__": [
+-         "",
+-         "Licensed to the Apache Software Foundation (ASF) under one",
+-         "or more contributor license agreements.  See the NOTICE file",
+-         "distributed with this work for additional information",
+-         "regarding copyright ownership.  The ASF licenses this file",
+-         "to you under the Apache License, Version 2.0 (the",
+-         "\"License\"); you may not use this file except in compliance",
+-         "with the License.  You may obtain a copy of the License at",
+-         "",
+-         "     http://www.apache.org/licenses/LICENSE-2.0",
+-         "",
+-         "Unless required by applicable law or agreed to in writing, software",
+-         "distributed under the License is distributed on an \"AS IS\" BASIS,",
+-         "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+-         "See the License for the specific language governing permissions and",
+-         "limitations under the License."
+-     ],
+-     "clusterMetrics":{"appsSubmitted":"0","appsCompleted":"0","appsPending":"0","appsRunning":"0","appsFailed":"0","appsKilled":"0","reservedMB":"0","availableMB":"4096","allocatedMB":"0","pendingMB":"0","reservedVirtualCores":"0","availableVirtualCores":"4","allocatedVirtualCores":"0","pendingVirtualCores":"0","containersAllocated":"0","containersReserved":"0","containersPending":"0","totalMB":"4096","totalVirtualCores":"4","utilizedMBPercent":"0","utilizedVirtualCoresPercent":"0","rmSchedulerBusyPercent":"-1","totalNodes":"1","lostNodes":"0","unhealthyNodes":"0","decommissioningNodes":"0","decommissionedNodes":"0","rebootedNodes":"0","activeNodes":"1","shutdownNodes":"0","containerAssignedPerSecond":"0","totalUsedResourcesAcrossPartition":{"memory":"0","vCores":"0","resourceInformations":{"resourceInformation":[{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"memory-mb","resourceType":"COUNTABLE","units":"Mi","value":"0"},{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"vcores","resourceType":"COUNTABLE","units":"","value":"0"}]}},"totalClusterResourcesAcrossPartition":{"memory":"4096","vCores":"4","resourceInformations":{"resourceInformation":[{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"memory-mb","resourceType":"COUNTABLE","units":"Mi","value":"4096"},{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"vcores","resourceType":"COUNTABLE","units":"","value":"4"}]}},"totalReservedResourcesAcrossPartition":{"memory":"0","vCores":"0","resourceInformations":{"resourceInformation":[{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"memory-mb","resourceType":"COUNTABLE","units":"Mi","value":"0"},{"attributes":null,"maximumAllocation":"9223372036854775807","minimumAllocation":"0","name":"vcores","resourceType":"COUNTABLE","units":"","value":"0"}]}},"totalAllocatedContainersAcrossPartition":"0","crossPartitionMetricsAvailable":"true","rmEventQueueSize":"0","schedulerEventQueueSize":"0"}
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capacity-scheduler.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capacity-scheduler.xml
+deleted file mode 100644
+index a8487f3f3c0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/capacity-scheduler.xml
++++ /dev/null
+@@ -1,156 +0,0 @@
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<configuration>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.maximum-applications</name>
+-    <value>10000</value>
+-    <description>
+-      Maximum number of applications that can be pending and running.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.maximum-am-resource-percent</name>
+-    <value>0.1</value>
+-    <description>
+-      Maximum percent of resources in the cluster which can be used to run
+-      application masters i.e. controls number of concurrent running
+-      applications.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.resource-calculator</name>
+-    <value>org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator</value>
+-    <description>
+-      The ResourceCalculator implementation to be used to compare
+-      Resources in the scheduler.
+-      The default i.e. DefaultResourceCalculator only uses Memory while
+-      DominantResourceCalculator uses dominant-resource to compare
+-      multi-dimensional resources such as Memory, CPU etc.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.queues</name>
+-    <value>default,decided,target</value>
+-    <description>
+-      The queues at the this level (root is the root queue).
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.capacity</name>
+-    <value>50</value>
+-    <description>Default queue target capacity.</description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.target.capacity</name>
+-    <value>10</value>
+-    <description>target queue capacity.</description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.decided.capacity</name>
+-    <value>40</value>
+-    <description>decided queue capacity.</description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.user-limit-factor</name>
+-    <value>1</value>
+-    <description>
+-      Default queue user limit a percentage from 0.0 to 1.0.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.maximum-capacity</name>
+-    <value>100</value>
+-    <description>
+-      The maximum capacity of the default queue.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.state</name>
+-    <value>RUNNING</value>
+-    <description>
+-      The state of the default queue. State can be one of RUNNING or STOPPED.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.target.state</name>
+-    <value>RUNNING</value>
+-    <description>
+-      The state of the target queue. State can be one of RUNNING or STOPPED.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
+-    <value>*</value>
+-    <description>
+-      The ACL of who can submit jobs to the default queue.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.target.acl_submit_applications</name>
+-    <value>*</value>
+-    <description>
+-      The ACL of who can submit jobs to the target queue.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.default.acl_administer_queue</name>
+-    <value>*</value>
+-    <description>
+-      The ACL of who can administer jobs on the default queue.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.target.acl_administer_queue</name>
+-    <value>*</value>
+-    <description>
+-      The ACL of who can administer jobs on the target queue.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.root.decided.reservable</name>
+-    <value>true</value>
+-    <description>
+-      indicates to the ReservationSystem that the queue’s resources
+-      is available for users to reserve.
+-    </description>
+-  </property>
+-
+-  <property>
+-    <name>yarn.scheduler.capacity.node-locality-delay</name>
+-    <value>-1</value>
+-    <description>
+-      Number of missed scheduling opportunities after which the CapacityScheduler
+-      attempts to schedule rack-local containers.
+-      Typically this should be set to number of racks in the cluster, this
+-      feature is disabled by default, set to -1.
+-    </description>
+-  </property>
+-
+-</configuration>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/fair-scheduler.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/fair-scheduler.xml
+deleted file mode 100644
+index cc00c45c97d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/fair-scheduler.xml
++++ /dev/null
+@@ -1,43 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<!--
+-  This file contains pool and user allocations for the Fair Scheduler.
+-  Its format is explained in the Fair Scheduler documentation at
+-  http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html.
+-  The documentation also includes a sample config file.
+--->
+-
+-<allocations>
+-  <queue name="root">
+-    <weight>1.0</weight>
+-    <queue name="a">
+-      <weight>0.33</weight>
+-      <minResources>8192 mb, 4 vcores</minResources>
+-      <maxResources>16384 mb, 8 vcores</maxResources>
+-    </queue>
+-    <queue name="b">
+-      <weight>0.33</weight>
+-      <minResources>8192 mb, 4 vcores</minResources>
+-      <maxResources>16384 mb, 8 vcores</maxResources>
+-    </queue>
+-    <queue name="c">
+-      <weight>0.34</weight>
+-      <minResources>8192 mb, 4 vcores</minResources>
+-      <maxResources>16384 mb, 8 vcores</maxResources>
+-    </queue>
+-  </queue>
+-  <userMaxAppsDefault>5</userMaxAppsDefault>
+-</allocations>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/log4j.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/log4j.properties
+deleted file mode 100644
+index 81a3f6ad5d2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#   Licensed under the Apache License, Version 2.0 (the "License");
+-#   you may not use this file except in compliance with the License.
+-#   You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/profiles/sample-profiles-1.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/profiles/sample-profiles-1.json
+deleted file mode 100644
+index 8485ab6f3d5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/profiles/sample-profiles-1.json
++++ /dev/null
+@@ -1,24 +0,0 @@
+-{
+-    "___asflicense__": [
+-        "",
+-        "Licensed to the Apache Software Foundation (ASF) under one",
+-        "or more contributor license agreements.  See the NOTICE file",
+-        "distributed with this work for additional information",
+-        "regarding copyright ownership.  The ASF licenses this file",
+-        "to you under the Apache License, Version 2.0 (the",
+-        "\"License\"); you may not use this file except in compliance",
+-        "with the License.  You may obtain a copy of the License at",
+-        "",
+-        "     http://www.apache.org/licenses/LICENSE-2.0",
+-        "",
+-        "Unless required by applicable law or agreed to in writing, software",
+-        "distributed under the License is distributed on an \"AS IS\" BASIS,",
+-        "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+-        "See the License for the specific language governing permissions and",
+-        "limitations under the License."
+-    ],
+-    "default" : {
+-        "memory-mb" : 2048,
+-        "vcores" : 2
+-    }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/yarn-site.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/yarn-site.xml
+deleted file mode 100644
+index 94b7972dae7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/test/resources/yarn-site.xml
++++ /dev/null
+@@ -1,54 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-
+-<configuration>
+-  <property>
+-    <name>yarn.resourcemanager.reservation-system.enable</name>
+-    <value>true</value>
+-  </property>
+-  <property>
+-    <name>yarn.node-labels.enabled</name>
+-    <value>true</value>
+-  </property>
+-  <property>
+-    <name>yarn.resourcemanager.webapp.address</name>
+-    <value>0.0.0.0:8080</value>
+-  </property>
+-  <property>
+-    <name>yarn.cluster.max-application-priority</name>
+-    <value>50</value>
+-  </property>
+-  <property>
+-    <name>yarn.resourcemanager.resource-profiles.enabled</name>
+-    <value>true</value>
+-  </property>
+-  <property>
+-    <name>yarn.resourcemanager.resource-profiles.source-file</name>
+-    <value>profiles/sample-profiles-1.json</value>
+-  </property>
+-  <property>
+-    <name>yarn.federation.policy-manager-params</name>
+-    <value>{"routerPolicyWeights":{"entry":[{"key":{"id":"SC-2"},"value":"0.3"},{"key":{"id":"SC-1"},"value":"0.7"}]},"amrmPolicyWeights":{"entry":[{"key":{"id":"SC-2"},"value":"0.4"},{"key":{"id":"SC-1"},"value":"0.6"}]},"headroomAlpha":"1.0"}</value>
+-  </property>
+-  <property>
+-    <name>yarn.resourcemanager.cluster-id</name>
+-    <value>local-cluster</value>
+-  </property>
+-  <property>
+-    <name>yarn.router.interceptor.allow-partial-result.enable</name>
+-    <value>true</value>
+-  </property>
+-</configuration>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index bc89f53f578..d30ba8bee60 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -45,7 +45,6 @@
+     <module>hadoop-yarn-server-timelineservice</module>
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
+-    <module>hadoop-yarn-server-router</module>
+     <module>hadoop-yarn-server-timelineservice-documentstore</module>
+     <module>hadoop-yarn-server-globalpolicygenerator</module>
+   </modules>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index 1b63feee876..da50ab149ad 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -73,10 +73,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-router</artifactId>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
diff --git a/hadoop/stackable/patches/3.4.0/25-remove-hadoop-yarn-server-globalpolicygenerator.patch b/hadoop/stackable/patches/3.4.0/25-remove-hadoop-yarn-server-globalpolicygenerator.patch
new file mode 100644
index 000000000..e4f81cbe4
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/25-remove-hadoop-yarn-server-globalpolicygenerator.patch
@@ -0,0 +1,5330 @@
+Entirely remove hadoop-yarn-server-globalpolicygenerator
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-project/pom.xml                             |    6 
+ .../pom.xml                                        |  148 --------
+ .../server/globalpolicygenerator/GPGContext.java   |   40 --
+ .../globalpolicygenerator/GPGContextImpl.java      |   63 ---
+ .../globalpolicygenerator/GPGPolicyFacade.java     |  229 ------------
+ .../server/globalpolicygenerator/GPGUtils.java     |  150 --------
+ .../GlobalPolicyGenerator.java                     |  386 --------------------
+ .../applicationcleaner/ApplicationCleaner.java     |  160 --------
+ .../DefaultApplicationCleaner.java                 |   96 -----
+ .../applicationcleaner/package-info.java           |   19 -
+ .../server/globalpolicygenerator/package-info.java |   19 -
+ .../policygenerator/GlobalPolicy.java              |   78 ----
+ .../policygenerator/LoadBasedGlobalPolicy.java     |  329 -----------------
+ .../policygenerator/NoOpGlobalPolicy.java          |   36 --
+ .../policygenerator/PolicyGenerator.java           |  267 --------------
+ .../UniformWeightedLocalityGlobalPolicy.java       |   68 ---
+ .../policygenerator/package-info.java              |   24 -
+ .../subclustercleaner/SubClusterCleaner.java       |  113 ------
+ .../subclustercleaner/package-info.java            |   19 -
+ .../webapp/GPGController.java                      |   49 ---
+ .../webapp/GPGOverviewBlock.java                   |   88 ----
+ .../webapp/GPGOverviewPage.java                    |   52 ---
+ .../webapp/GPGPoliciesBlock.java                   |  110 ------
+ .../webapp/GPGPoliciesPage.java                    |   55 ---
+ .../globalpolicygenerator/webapp/GPGWebApp.java    |   47 --
+ .../webapp/GPGWebServices.java                     |   62 ---
+ .../globalpolicygenerator/webapp/NavBlock.java     |   43 --
+ .../globalpolicygenerator/webapp/dao/GpgInfo.java  |   81 ----
+ .../webapp/dao/package-info.java                   |   19 -
+ .../globalpolicygenerator/webapp/package-info.java |   24 -
+ .../globalpolicygenerator/TestGPGPolicyFacade.java |  356 ------------------
+ .../TestGlobalPolicyGenerator.java                 |   86 ----
+ .../TestDefaultApplicationCleaner.java             |  204 ----------
+ .../policygenerator/TestLoadBasedGlobalPolicy.java |  206 -----------
+ .../policygenerator/TestPolicyGenerator.java       |  392 --------------------
+ .../secure/AbstractGlobalPolicyGeneratorTest.java  |  177 ---------
+ .../secure/TestGpgSecureLogins.java                |   50 ---
+ .../subclustercleaner/TestSubClusterCleaner.java   |  121 ------
+ .../webapp/TestGPGWebApp.java                      |   51 ---
+ .../webapp/TestGPGWebServices.java                 |   96 -----
+ .../src/test/resources/schedulerInfo1.json         |  134 -------
+ .../src/test/resources/schedulerInfo2.json         |  196 ----------
+ .../hadoop-yarn/hadoop-yarn-server/pom.xml         |    1 
+ hadoop-yarn-project/pom.xml                        |    4 
+ 44 files changed, 4954 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContext.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContextImpl.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGPolicyFacade.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/ApplicationCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/DefaultApplicationCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/GlobalPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/LoadBasedGlobalPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/NoOpGlobalPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/PolicyGenerator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/UniformWeightedLocalityGlobalPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/SubClusterCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/NavBlock.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/GpgInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGPGPolicyFacade.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGlobalPolicyGenerator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/TestDefaultApplicationCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestLoadBasedGlobalPolicy.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestPolicyGenerator.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/AbstractGlobalPolicyGeneratorTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/TestGpgSecureLogins.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/TestSubClusterCleaner.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebApp.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebServices.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo1.json
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo2.json
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index d365a5c70da..4cb65cf3741 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -568,12 +568,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+-        <version>${project.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
+deleted file mode 100644
+index d7b7b5cdd1e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml
++++ /dev/null
+@@ -1,148 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn-server</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <groupId>org.apache.hadoop</groupId>
+-  <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN GlobalPolicyGenerator</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-all</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.hsqldb</groupId>
+-      <artifactId>hsqldb</artifactId>
+-      <scope>test</scope>
+-      <classifier>jdk8</classifier>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minikdc</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-auth</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+-      <artifactId>jersey-test-framework-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+-      <artifactId>jersey-test-framework-grizzly2</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.rat</groupId>
+-        <artifactId>apache-rat-plugin</artifactId>
+-        <configuration>
+-          <excludes>
+-            <exclude>src/test/resources/schedulerInfo1.json</exclude>
+-            <exclude>src/test/resources/schedulerInfo2.json</exclude>
+-          </excludes>
+-        </configuration>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContext.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContext.java
+deleted file mode 100644
+index e54244d7133..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContext.java
++++ /dev/null
+@@ -1,40 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import org.apache.hadoop.yarn.server.federation.utils.FederationRegistryClient;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-
+-/**
+- * Context for Global Policy Generator.
+- */
+-public interface GPGContext {
+-
+-  FederationStateStoreFacade getStateStoreFacade();
+-
+-  void setStateStoreFacade(FederationStateStoreFacade facade);
+-
+-  GPGPolicyFacade getPolicyFacade();
+-
+-  void setPolicyFacade(GPGPolicyFacade facade);
+-
+-  FederationRegistryClient getRegistryClient();
+-
+-  void setRegistryClient(FederationRegistryClient client);
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContextImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContextImpl.java
+deleted file mode 100644
+index b14f5029901..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGContextImpl.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import org.apache.hadoop.yarn.server.federation.utils.FederationRegistryClient;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-
+-/**
+- * Context implementation for Global Policy Generator.
+- */
+-public class GPGContextImpl implements GPGContext {
+-
+-  private FederationStateStoreFacade facade;
+-  private GPGPolicyFacade policyFacade;
+-  private FederationRegistryClient registryClient;
+-
+-  @Override
+-  public FederationStateStoreFacade getStateStoreFacade() {
+-    return facade;
+-  }
+-
+-  @Override
+-  public void setStateStoreFacade(
+-      FederationStateStoreFacade federationStateStoreFacade) {
+-    this.facade = federationStateStoreFacade;
+-  }
+-
+-  @Override
+-  public GPGPolicyFacade getPolicyFacade(){
+-    return policyFacade;
+-  }
+-
+-  @Override
+-  public void setPolicyFacade(GPGPolicyFacade gpgPolicyfacade){
+-    policyFacade = gpgPolicyfacade;
+-  }
+-
+-  @Override
+-  public FederationRegistryClient getRegistryClient() {
+-    return registryClient;
+-  }
+-
+-  @Override
+-  public void setRegistryClient(FederationRegistryClient client) {
+-    registryClient = client;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGPolicyFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGPolicyFacade.java
+deleted file mode 100644
+index 78ce60c621b..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGPolicyFacade.java
++++ /dev/null
+@@ -1,229 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.FederationPolicyUtils;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.policies.router.FederationRouterPolicy;
+-import org.apache.hadoop.yarn.server.federation.policies.amrmproxy.FederationAMRMProxyPolicy;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.nio.ByteBuffer;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-/**
+- * A utility class for the GPG Policy Generator to read and write policies
+- * into the FederationStateStore. Policy specific logic is abstracted away in
+- * this class, so the PolicyGenerator can avoid dealing with policy
+- * construction, reinitialization, and serialization.
+- *
+- * There are only two exposed methods:
+- *
+- * {@link #getPolicyManager(String)}
+- * Gets the PolicyManager via queue name. Null if there is no policy
+- * configured for the specified queue. The PolicyManager can be used to
+- * extract the {@link FederationRouterPolicy} and
+- * {@link FederationAMRMProxyPolicy}, as well as any policy specific parameters
+- *
+- * {@link #setPolicyManager(FederationPolicyManager)}
+- * Sets the PolicyManager. If the policy configuration is the same, no change
+- * occurs. Otherwise, the internal cache is updated and the new configuration
+- * is written into the FederationStateStore
+- *
+- * This class assumes that the GPG is the only service
+- * writing policies. Thus, the only FederationStateStore reads occur the first
+- * time a queue policy is retrieved - after that, the GPG only writes to the
+- * FederationStateStore.
+- *
+- * The class uses a PolicyManager cache and a SubClusterPolicyConfiguration
+- * cache. The primary use for these caches are to serve reads, and to
+- * identify when the PolicyGenerator has actually changed the policy
+- * so unnecessary FederationStateStore policy writes can be avoided.
+- */
+-
+-public class GPGPolicyFacade {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(GPGPolicyFacade.class);
+-
+-  private FederationStateStoreFacade stateStore;
+-
+-  private Map<String, FederationPolicyManager> policyManagerMap;
+-  private Map<String, SubClusterPolicyConfiguration> policyConfMap;
+-
+-  private boolean readOnly;
+-
+-  public GPGPolicyFacade(FederationStateStoreFacade stateStore,
+-      Configuration conf) {
+-    this.stateStore = stateStore;
+-    this.policyManagerMap = new HashMap<>();
+-    this.policyConfMap = new HashMap<>();
+-    this.readOnly =
+-        conf.getBoolean(YarnConfiguration.GPG_POLICY_GENERATOR_READONLY,
+-            YarnConfiguration.DEFAULT_GPG_POLICY_GENERATOR_READONLY);
+-  }
+-
+-  /**
+-   * Provides a utility for the policy generator to read the policy manager
+-   * from the FederationStateStore. Because the policy generator should be the
+-   * only component updating the policy, this implementation does not use the
+-   * reinitialization feature.
+-   *
+-   * @param queueName the name of the queue we want the policy manager for.
+-   * @return the policy manager responsible for the queue policy.
+-   * @throws YarnException exceptions from yarn servers.
+-   */
+-  public FederationPolicyManager getPolicyManager(String queueName)
+-      throws YarnException {
+-    FederationPolicyManager policyManager = policyManagerMap.get(queueName);
+-
+-    // If we don't have the policy manager cached, pull configuration
+-    // from the FederationStateStore to create and cache it
+-    if (policyManager == null) {
+-      try {
+-
+-        // If we don't have the configuration cached, pull it
+-        // from the stateStore
+-        SubClusterPolicyConfiguration conf = policyConfMap.get(queueName);
+-
+-        if (conf == null) {
+-          conf = stateStore.getPolicyConfiguration(queueName);
+-        }
+-
+-        // If configuration is still null, it does not exist in the
+-        // FederationStateStore
+-        if (conf == null) {
+-          LOG.info("Read null policy for queue {}.", queueName);
+-          return null;
+-        }
+-
+-        // Generate PolicyManager based on PolicyManagerType.
+-        String policyManagerType = conf.getType();
+-        policyManager = FederationPolicyUtils.instantiatePolicyManager(policyManagerType);
+-        policyManager.setQueue(queueName);
+-
+-        // If PolicyManager supports Weighted PolicyInfo, it means that
+-        // we need to use this parameter to determine which sub-cluster the router goes to
+-        // or which sub-cluster the container goes to.
+-        if (policyManager.isSupportWeightedPolicyInfo()) {
+-          ByteBuffer weightedPolicyInfoParams = conf.getParams();
+-          if (weightedPolicyInfoParams == null) {
+-            LOG.warn("Warning: Queue = {}, FederationPolicyManager {} WeightedPolicyInfo is empty.",
+-                queueName, policyManagerType);
+-            return null;
+-          }
+-          WeightedPolicyInfo weightedPolicyInfo =
+-              WeightedPolicyInfo.fromByteBuffer(conf.getParams());
+-          policyManager.setWeightedPolicyInfo(weightedPolicyInfo);
+-        } else {
+-          LOG.warn("Warning: FederationPolicyManager of unsupported WeightedPolicyInfo type {}, " +
+-              "initialization may be incomplete.", policyManager.getClass());
+-        }
+-
+-        policyManagerMap.put(queueName, policyManager);
+-        policyConfMap.put(queueName, conf);
+-      } catch (YarnException e) {
+-        LOG.error("Error reading SubClusterPolicyConfiguration from state "
+-            + "store for queue: {}", queueName);
+-        throw e;
+-      }
+-    }
+-    return policyManager;
+-  }
+-
+-  /**
+-   * Provides a utility for the policy generator to write a policy manager
+-   * into the FederationStateStore. The facade keeps a cache and will only write
+-   * into the FederationStateStore if the policy configuration has changed.
+-   *
+-   * @param policyManager The policy manager we want to update into the state
+-   *                      store. It contains policy information as well as
+-   *                      the queue name we will update for.
+-   * @throws YarnException  exceptions from yarn servers.
+-   */
+-  public void setPolicyManager(FederationPolicyManager policyManager)
+-      throws YarnException {
+-    if (policyManager == null) {
+-      LOG.warn("Attempting to set null policy manager");
+-      return;
+-    }
+-    // Extract the configuration from the policy manager
+-    String queue = policyManager.getQueue();
+-    SubClusterPolicyConfiguration conf;
+-    try {
+-      conf = policyManager.serializeConf();
+-    } catch (FederationPolicyInitializationException e) {
+-      LOG.warn("Error serializing policy for queue {}", queue);
+-      throw e;
+-    }
+-    if (conf == null) {
+-      // State store does not currently support setting a policy back to null
+-      // because it reads the queue name to set from the policy!
+-      LOG.warn("Skip setting policy to null for queue {} into state store",
+-          queue);
+-      return;
+-    }
+-    // Compare with configuration cache, if different, write the conf into
+-    // store and update our conf and manager cache
+-    if (!confCacheEqual(queue, conf)) {
+-      try {
+-        if (readOnly) {
+-          LOG.info("[read-only] Skipping policy update for queue {}", queue);
+-          return;
+-        }
+-        LOG.info("Updating policy for queue {} into state store", queue);
+-        stateStore.setPolicyConfiguration(conf);
+-        policyConfMap.put(queue, conf);
+-        policyManagerMap.put(queue, policyManager);
+-      } catch (YarnException e) {
+-        LOG.warn("Error writing SubClusterPolicyConfiguration to state "
+-            + "store for queue: {}", queue);
+-        throw e;
+-      }
+-    } else {
+-      LOG.info("Setting unchanged policy - state store write skipped");
+-    }
+-  }
+-
+-  /**
+-   * @param queue the queue to check the cached policy configuration for
+-   * @param conf the new policy configuration
+-   * @return whether or not the conf is equal to the cached conf
+-   */
+-  private boolean confCacheEqual(String queue,
+-      SubClusterPolicyConfiguration conf) {
+-    SubClusterPolicyConfiguration cachedConf = policyConfMap.get(queue);
+-    if (conf == null && cachedConf == null) {
+-      return true;
+-    } else if (conf != null && cachedConf != null) {
+-      if (conf.equals(cachedConf)) {
+-        return true;
+-      }
+-    }
+-    return false;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGUtils.java
+deleted file mode 100644
+index 13e1a8a0127..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GPGUtils.java
++++ /dev/null
+@@ -1,150 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import static javax.servlet.http.HttpServletResponse.SC_OK;
+-import static org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts.RM_WEB_SERVICE_PATH;
+-import static org.apache.hadoop.yarn.webapp.util.WebAppUtils.HTTPS_PREFIX;
+-import static org.apache.hadoop.yarn.webapp.util.WebAppUtils.HTTP_PREFIX;
+-
+-import java.net.InetSocketAddress;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.TimeUnit;
+-
+-import javax.ws.rs.core.MediaType;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-
+-import com.sun.jersey.api.client.Client;
+-import com.sun.jersey.api.client.ClientResponse;
+-import com.sun.jersey.api.client.WebResource;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-
+-/**
+- * GPGUtils contains utility functions for the GPG.
+- *
+- */
+-public final class GPGUtils {
+-
+-  // hide constructor
+-  private GPGUtils() {
+-  }
+-
+-  /**
+-   * Performs an invocation of the remote RMWebService.
+-   *
+-   * @param <T> Generic T.
+-   * @param webAddr WebAddress.
+-   * @param path url path.
+-   * @param returnType return type.
+-   * @param selectParam query parameters.
+-   * @param conf configuration.
+-   * @return response entity.
+-   */
+-  public static <T> T invokeRMWebService(String webAddr, String path, final Class<T> returnType,
+-      Configuration conf, String selectParam) {
+-    Client client = createJerseyClient(conf);
+-    T obj;
+-
+-    // webAddr stores the form of host:port in subClusterInfo
+-    InetSocketAddress socketAddress = NetUtils
+-        .getConnectAddress(NetUtils.createSocketAddr(webAddr));
+-    String scheme = YarnConfiguration.useHttps(conf) ? HTTPS_PREFIX : HTTP_PREFIX;
+-    String webAddress = scheme + socketAddress.getHostName() + ":" + socketAddress.getPort();
+-    WebResource webResource = client.resource(webAddress);
+-
+-    if (selectParam != null) {
+-      webResource = webResource.queryParam(RMWSConsts.DESELECTS, selectParam);
+-    }
+-
+-    ClientResponse response = null;
+-    try {
+-      response = webResource.path(RM_WEB_SERVICE_PATH).path(path)
+-          .accept(MediaType.APPLICATION_XML).get(ClientResponse.class);
+-      if (response.getStatus() == SC_OK) {
+-        obj = response.getEntity(returnType);
+-      } else {
+-        throw new YarnRuntimeException(
+-            "Bad response from remote web service: " + response.getStatus());
+-      }
+-      return obj;
+-    } finally {
+-      if (response != null) {
+-        response.close();
+-        response = null;
+-      }
+-      client.destroy();
+-    }
+-  }
+-
+-  /**
+-   * Performs an invocation of the remote RMWebService.
+-   *
+-   * @param <T> Generic T.
+-   * @param webAddr WebAddress.
+-   * @param path url path.
+-   * @param returnType return type.
+-   * @param config configuration.
+-   * @return response entity.
+-   */
+-  public static <T> T invokeRMWebService(String webAddr,
+-      String path, final Class<T> returnType, Configuration config) {
+-    return invokeRMWebService(webAddr, path, returnType, config, null);
+-  }
+-
+-  /**
+-   * Creates a uniform weighting of 1.0 for each sub cluster.
+-   *
+-   * @param ids subClusterId set
+-   * @return weight of subCluster.
+-   */
+-  public static Map<SubClusterIdInfo, Float> createUniformWeights(
+-      Set<SubClusterId> ids) {
+-    Map<SubClusterIdInfo, Float> weights = new HashMap<>();
+-    for(SubClusterId id : ids) {
+-      weights.put(new SubClusterIdInfo(id), 1.0f);
+-    }
+-    return weights;
+-  }
+-
+-  /**
+-   * Create JerseyClient based on configuration file.
+-   * We will set the timeout when creating JerseyClient.
+-   *
+-   * @param conf Configuration.
+-   * @return JerseyClient.
+-   */
+-  public static Client createJerseyClient(Configuration conf) {
+-    Client client = Client.create();
+-    int connectTimeOut = (int) conf.getTimeDuration(YarnConfiguration.GPG_WEBAPP_CONNECT_TIMEOUT,
+-        YarnConfiguration.DEFAULT_GPG_WEBAPP_CONNECT_TIMEOUT, TimeUnit.MILLISECONDS);
+-    client.setConnectTimeout(connectTimeOut);
+-    int readTimeout = (int) conf.getTimeDuration(YarnConfiguration.GPG_WEBAPP_READ_TIMEOUT,
+-        YarnConfiguration.DEFAULT_GPG_WEBAPP_READ_TIMEOUT, TimeUnit.MILLISECONDS);
+-    client.setReadTimeout(readTimeout);
+-    return client;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
+deleted file mode 100644
+index a3e231da1a3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/GlobalPolicyGenerator.java
++++ /dev/null
+@@ -1,386 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import java.io.IOException;
+-import java.io.PrintStream;
+-import java.net.InetAddress;
+-import java.net.UnknownHostException;
+-import java.util.ArrayList;
+-import java.util.List;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-import org.apache.commons.lang.time.DurationFormatUtils;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.source.JvmMetrics;
+-import org.apache.hadoop.security.AuthenticationFilterInitializer;
+-import org.apache.hadoop.security.HttpCrossOriginFilterInitializer;
+-import org.apache.hadoop.security.SecurityUtil;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.GenericOptionsParser;
+-import org.apache.hadoop.util.JvmPauseMonitor;
+-import org.apache.hadoop.util.ShutdownHookManager;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationRegistryClient;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner.ApplicationCleaner;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator.PolicyGenerator;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.subclustercleaner.SubClusterCleaner;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.webapp.GPGWebApp;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.apache.hadoop.yarn.webapp.WebApps;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.apache.hadoop.yarn.webapp.util.WebServiceClient;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Global Policy Generator (GPG) is a Yarn Federation component. By tuning the
+- * Federation policies in Federation State Store, GPG overlooks the entire
+- * federated cluster and ensures that the system is tuned and balanced all the
+- * time.
+- *
+- * The GPG operates continuously but out-of-band from all cluster operations,
+- * that allows to enforce global invariants, affect load balancing, trigger
+- * draining of sub-clusters that will undergo maintenance, etc.
+- */
+-public class GlobalPolicyGenerator extends CompositeService {
+-
+-  public static final Logger LOG =
+-      LoggerFactory.getLogger(GlobalPolicyGenerator.class);
+-
+-  // YARN Variables
+-  private static CompositeServiceShutdownHook gpgShutdownHook;
+-  public static final int SHUTDOWN_HOOK_PRIORITY = 30;
+-  private AtomicBoolean isStopping = new AtomicBoolean(false);
+-  private static final String METRICS_NAME = "Global Policy Generator";
+-  private static long gpgStartupTime = System.currentTimeMillis();
+-
+-  // Federation Variables
+-  private GPGContext gpgContext;
+-  private RegistryOperations registry;
+-
+-  // Scheduler service that runs tasks periodically
+-  private ScheduledThreadPoolExecutor scheduledExecutorService;
+-  private SubClusterCleaner subClusterCleaner;
+-  private ApplicationCleaner applicationCleaner;
+-  private PolicyGenerator policyGenerator;
+-  private String webAppAddress;
+-  private JvmPauseMonitor pauseMonitor;
+-  private WebApp webApp;
+-
+-  public GlobalPolicyGenerator() {
+-    super(GlobalPolicyGenerator.class.getName());
+-    this.gpgContext = new GPGContextImpl();
+-  }
+-
+-  protected void doSecureLogin() throws IOException {
+-    Configuration config = getConfig();
+-    SecurityUtil.login(config, YarnConfiguration.GPG_KEYTAB,
+-        YarnConfiguration.GPG_PRINCIPAL, getHostName(config));
+-  }
+-
+-  protected void initAndStart(Configuration conf, boolean hasToReboot) {
+-    // Remove the old hook if we are rebooting.
+-    if (hasToReboot && null != gpgShutdownHook) {
+-      ShutdownHookManager.get().removeShutdownHook(gpgShutdownHook);
+-    }
+-    gpgShutdownHook = new CompositeServiceShutdownHook(this);
+-    ShutdownHookManager.get().addShutdownHook(gpgShutdownHook,
+-        SHUTDOWN_HOOK_PRIORITY);
+-    this.init(conf);
+-    this.start();
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    UserGroupInformation.setConfiguration(conf);
+-    // Set up the context
+-    this.gpgContext.setStateStoreFacade(FederationStateStoreFacade.getInstance(conf));
+-    GPGPolicyFacade gpgPolicyFacade =
+-        new GPGPolicyFacade(this.gpgContext.getStateStoreFacade(), conf);
+-    this.gpgContext.setPolicyFacade(gpgPolicyFacade);
+-
+-    this.registry = FederationStateStoreFacade.createInstance(conf,
+-        YarnConfiguration.YARN_REGISTRY_CLASS,
+-        YarnConfiguration.DEFAULT_YARN_REGISTRY_CLASS,
+-        RegistryOperations.class);
+-    this.registry.init(conf);
+-
+-    UserGroupInformation user = UserGroupInformation.getCurrentUser();
+-    FederationRegistryClient registryClient =
+-        new FederationRegistryClient(conf, this.registry, user);
+-    this.gpgContext.setRegistryClient(registryClient);
+-
+-    this.scheduledExecutorService = new ScheduledThreadPoolExecutor(
+-        conf.getInt(YarnConfiguration.GPG_SCHEDULED_EXECUTOR_THREADS,
+-            YarnConfiguration.DEFAULT_GPG_SCHEDULED_EXECUTOR_THREADS));
+-    this.subClusterCleaner = new SubClusterCleaner(conf, this.gpgContext);
+-
+-    this.applicationCleaner = FederationStateStoreFacade.createInstance(conf,
+-        YarnConfiguration.GPG_APPCLEANER_CLASS,
+-        YarnConfiguration.DEFAULT_GPG_APPCLEANER_CLASS, ApplicationCleaner.class);
+-    this.applicationCleaner.init(conf, this.gpgContext);
+-
+-    this.policyGenerator = new PolicyGenerator(conf, this.gpgContext);
+-
+-    this.webAppAddress = WebAppUtils.getGPGWebAppURLWithoutScheme(conf);
+-    DefaultMetricsSystem.initialize(METRICS_NAME);
+-    JvmMetrics jm = JvmMetrics.initSingleton("GPG", null);
+-    pauseMonitor = new JvmPauseMonitor();
+-    addService(pauseMonitor);
+-    jm.setPauseMonitor(pauseMonitor);
+-
+-    // super.serviceInit after all services are added
+-    super.serviceInit(conf);
+-    WebServiceClient.initialize(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    try {
+-      doSecureLogin();
+-    } catch (IOException e) {
+-      throw new YarnRuntimeException("Failed GPG login", e);
+-    }
+-
+-    super.serviceStart();
+-
+-    this.registry.start();
+-
+-    // Schedule SubClusterCleaner service
+-    Configuration config = getConfig();
+-    long scCleanerIntervalMs = config.getTimeDuration(
+-        YarnConfiguration.GPG_SUBCLUSTER_CLEANER_INTERVAL_MS,
+-        YarnConfiguration.DEFAULT_GPG_SUBCLUSTER_CLEANER_INTERVAL_MS, TimeUnit.MILLISECONDS);
+-    if (scCleanerIntervalMs > 0) {
+-      this.scheduledExecutorService.scheduleAtFixedRate(this.subClusterCleaner,
+-          0, scCleanerIntervalMs, TimeUnit.MILLISECONDS);
+-      LOG.info("Scheduled sub-cluster cleaner with interval: {}",
+-          DurationFormatUtils.formatDurationISO(scCleanerIntervalMs));
+-    }
+-
+-    // Schedule ApplicationCleaner service
+-    long appCleanerIntervalMs = config.getTimeDuration(
+-        YarnConfiguration.GPG_APPCLEANER_INTERVAL_MS,
+-        YarnConfiguration.DEFAULT_GPG_APPCLEANER_INTERVAL_MS, TimeUnit.MILLISECONDS);
+-
+-    if (appCleanerIntervalMs > 0) {
+-      this.scheduledExecutorService.scheduleAtFixedRate(this.applicationCleaner,
+-          0, appCleanerIntervalMs, TimeUnit.MILLISECONDS);
+-      LOG.info("Scheduled application cleaner with interval: {}",
+-          DurationFormatUtils.formatDurationISO(appCleanerIntervalMs));
+-    }
+-
+-    // Schedule PolicyGenerator
+-    // We recommend using yarn.federation.gpg.policy.generator.interval
+-    // instead of yarn.federation.gpg.policy.generator.interval-ms
+-
+-    // To ensure compatibility,
+-    // let's first obtain the value of "yarn.federation.gpg.policy.generator.interval-ms."
+-    long policyGeneratorIntervalMillis = 0L;
+-    String generatorIntervalMS = config.get(YarnConfiguration.GPG_POLICY_GENERATOR_INTERVAL_MS);
+-    if (generatorIntervalMS != null) {
+-      LOG.warn("yarn.federation.gpg.policy.generator.interval-ms is deprecated property, " +
+-          " we better set it yarn.federation.gpg.policy.generator.interval.");
+-      policyGeneratorIntervalMillis = Long.parseLong(generatorIntervalMS);
+-    }
+-
+-    // If it is not available, let's retrieve
+-    // the value of "yarn.federation.gpg.policy.generator.interval" instead.
+-    if (policyGeneratorIntervalMillis == 0) {
+-      policyGeneratorIntervalMillis = config.getTimeDuration(
+-          YarnConfiguration.GPG_POLICY_GENERATOR_INTERVAL,
+-          YarnConfiguration.DEFAULT_GPG_POLICY_GENERATOR_INTERVAL, TimeUnit.MILLISECONDS);
+-    }
+-
+-    if(policyGeneratorIntervalMillis > 0){
+-      this.scheduledExecutorService.scheduleAtFixedRate(this.policyGenerator,
+-          0, policyGeneratorIntervalMillis, TimeUnit.MILLISECONDS);
+-      LOG.info("Scheduled policy-generator with interval: {}",
+-          DurationFormatUtils.formatDurationISO(policyGeneratorIntervalMillis));
+-    }
+-    startWepApp();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.registry != null) {
+-      this.registry.stop();
+-      this.registry = null;
+-    }
+-
+-    try {
+-      if (this.scheduledExecutorService != null
+-          && !this.scheduledExecutorService.isShutdown()) {
+-        this.scheduledExecutorService.shutdown();
+-        LOG.info("Stopped ScheduledExecutorService");
+-      }
+-    } catch (Exception e) {
+-      LOG.error("Failed to shutdown ScheduledExecutorService", e);
+-      throw e;
+-    }
+-
+-    if (this.isStopping.getAndSet(true)) {
+-      return;
+-    }
+-    if (webApp != null) {
+-      webApp.stop();
+-    }
+-    DefaultMetricsSystem.shutdown();
+-    super.serviceStop();
+-    WebServiceClient.destroy();
+-  }
+-
+-  public String getName() {
+-    return "FederationGlobalPolicyGenerator";
+-  }
+-
+-  public GPGContext getGPGContext() {
+-    return this.gpgContext;
+-  }
+-
+-  @VisibleForTesting
+-  public void startWepApp() {
+-    Configuration configuration = getConfig();
+-
+-    boolean enableCors = configuration.getBoolean(YarnConfiguration.GPG_WEBAPP_ENABLE_CORS_FILTER,
+-        YarnConfiguration.DEFAULT_GPG_WEBAPP_ENABLE_CORS_FILTER);
+-
+-    if (enableCors) {
+-      configuration.setBoolean(HttpCrossOriginFilterInitializer.PREFIX
+-          + HttpCrossOriginFilterInitializer.ENABLED_SUFFIX, true);
+-    }
+-
+-    // Always load pseudo authentication filter to parse "user.name" in an URL
+-    // to identify a HTTP request's user.
+-    boolean hasHadoopAuthFilterInitializer = false;
+-    String filterInitializerConfKey = "hadoop.http.filter.initializers";
+-    Class<?>[] initializersClasses = configuration.getClasses(filterInitializerConfKey);
+-
+-    List<String> targets = new ArrayList<>();
+-    if (initializersClasses != null) {
+-      for (Class<?> initializer : initializersClasses) {
+-        if (initializer.getName().equals(AuthenticationFilterInitializer.class.getName())) {
+-          hasHadoopAuthFilterInitializer = true;
+-          break;
+-        }
+-        targets.add(initializer.getName());
+-      }
+-    }
+-    if (!hasHadoopAuthFilterInitializer) {
+-      targets.add(AuthenticationFilterInitializer.class.getName());
+-      configuration.set(filterInitializerConfKey, StringUtils.join(",", targets));
+-    }
+-    LOG.info("Instantiating GPGWebApp at {}.", webAppAddress);
+-    GPGWebApp gpgWebApp = new GPGWebApp(this);
+-    webApp = WebApps.$for("gpg", GPGContext.class, this.gpgContext,
+-        "ws").at(webAppAddress).start(gpgWebApp);
+-  }
+-
+-  @SuppressWarnings("resource")
+-  public static void startGPG(String[] argv, Configuration conf) {
+-    boolean federationEnabled = conf.getBoolean(YarnConfiguration.FEDERATION_ENABLED,
+-        YarnConfiguration.DEFAULT_FEDERATION_ENABLED);
+-    if (federationEnabled) {
+-      Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
+-      StringUtils.startupShutdownMessage(GlobalPolicyGenerator.class, argv, LOG);
+-      GlobalPolicyGenerator globalPolicyGenerator = new GlobalPolicyGenerator();
+-      globalPolicyGenerator.initAndStart(conf, false);
+-    } else {
+-      LOG.warn("Federation is not enabled. The gpg cannot start.");
+-    }
+-  }
+-
+-  /**
+-   * Returns the hostname for this Router. If the hostname is not
+-   * explicitly configured in the given config, then it is determined.
+-   *
+-   * @param config configuration
+-   * @return the hostname (NB: may not be a FQDN)
+-   * @throws UnknownHostException if the hostname cannot be determined
+-   */
+-  private String getHostName(Configuration config)
+-      throws UnknownHostException {
+-    String name = config.get(YarnConfiguration.GPG_KERBEROS_PRINCIPAL_HOSTNAME_KEY);
+-    if (name == null) {
+-      name = InetAddress.getLocalHost().getHostName();
+-    }
+-    return name;
+-  }
+-
+-  public static void main(String[] argv) {
+-    try {
+-      YarnConfiguration conf = new YarnConfiguration();
+-      GenericOptionsParser hParser = new GenericOptionsParser(conf, argv);
+-      argv = hParser.getRemainingArgs();
+-      if (argv.length > 1) {
+-        if (argv[0].equals("-format-policy-store")) {
+-          handFormatPolicyStateStore(conf);
+-        } else {
+-          printUsage(System.err);
+-        }
+-      } else {
+-        startGPG(argv, conf);
+-      }
+-    } catch (Throwable t) {
+-      LOG.error("Error starting global policy generator", t);
+-      System.exit(-1);
+-    }
+-  }
+-
+-  public static long getGPGStartupTime() {
+-    return gpgStartupTime;
+-  }
+-
+-  @VisibleForTesting
+-  public WebApp getWebApp() {
+-    return webApp;
+-  }
+-
+-  private static void printUsage(PrintStream out) {
+-    out.println("Usage: yarn gpg [-format-policy-store]");
+-  }
+-
+-  private static void handFormatPolicyStateStore(Configuration conf) {
+-    try {
+-      System.out.println("Deleting Federation policy state store.");
+-      FederationStateStoreFacade facade = FederationStateStoreFacade.getInstance(conf);
+-      System.out.println("Federation policy state store has been cleaned.");
+-      facade.deleteAllPoliciesConfigurations();
+-    } catch (Exception e) {
+-      LOG.error("Delete Federation policy state store error.", e);
+-      System.err.println("Delete Federation policy state store error, exception = " + e);
+-    }
+-  }
+-
+-  @Override
+-  public void setConfig(Configuration conf) {
+-    super.setConfig(conf);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/ApplicationCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/ApplicationCleaner.java
+deleted file mode 100644
+index 76380af8c98..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/ApplicationCleaner.java
++++ /dev/null
+@@ -1,160 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner;
+-
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import org.apache.commons.lang3.time.DurationFormatUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationRegistryClient;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.DeSelectFields;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The ApplicationCleaner is a runnable that cleans up old applications from
+- * table applicationsHomeSubCluster in FederationStateStore.
+- */
+-public abstract class ApplicationCleaner implements Runnable {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ApplicationCleaner.class);
+-
+-  private Configuration conf;
+-  private GPGContext gpgContext;
+-  private FederationRegistryClient registryClient;
+-
+-  private int minRouterSuccessCount;
+-  private int maxRouterRetry;
+-  private long routerQueryIntevalMillis;
+-
+-  public void init(Configuration config, GPGContext context)
+-      throws YarnException {
+-
+-    this.gpgContext = context;
+-    this.conf = config;
+-    this.registryClient = context.getRegistryClient();
+-
+-    String routerSpecString =
+-        this.conf.get(YarnConfiguration.GPG_APPCLEANER_CONTACT_ROUTER_SPEC,
+-            YarnConfiguration.DEFAULT_GPG_APPCLEANER_CONTACT_ROUTER_SPEC);
+-    String[] specs = routerSpecString.split(",");
+-    if (specs.length != 3) {
+-      throw new YarnException("Expect three comma separated values in "
+-          + YarnConfiguration.GPG_APPCLEANER_CONTACT_ROUTER_SPEC + " but get "
+-          + routerSpecString);
+-    }
+-    this.minRouterSuccessCount = Integer.parseInt(specs[0]);
+-    this.maxRouterRetry = Integer.parseInt(specs[1]);
+-    this.routerQueryIntevalMillis = Long.parseLong(specs[2]);
+-
+-    if (this.minRouterSuccessCount > this.maxRouterRetry) {
+-      throw new YarnException("minRouterSuccessCount "
+-          + this.minRouterSuccessCount
+-          + " should not be larger than maxRouterRetry" + this.maxRouterRetry);
+-    }
+-    if (this.minRouterSuccessCount <= 0) {
+-      throw new YarnException("minRouterSuccessCount "
+-          + this.minRouterSuccessCount + " should be positive");
+-    }
+-
+-    LOG.info("Initialized AppCleaner with Router query with min success {}, " +
+-        "max retry {}, retry interval {}.", this.minRouterSuccessCount,
+-        this.maxRouterRetry,
+-        DurationFormatUtils.formatDurationISO(this.routerQueryIntevalMillis));
+-  }
+-
+-  public GPGContext getGPGContext() {
+-    return this.gpgContext;
+-  }
+-
+-  public FederationRegistryClient getRegistryClient() {
+-    return this.registryClient;
+-  }
+-
+-  /**
+-   * Query router for applications.
+-   *
+-   * @return the set of applications
+-   * @throws YarnRuntimeException when router call fails
+-   */
+-  public Set<ApplicationId> getAppsFromRouter() throws YarnRuntimeException {
+-    String webAppAddress = WebAppUtils.getRouterWebAppURLWithScheme(conf);
+-
+-    LOG.info("Contacting router at: {}.", webAppAddress);
+-    AppsInfo appsInfo = GPGUtils.invokeRMWebService(webAppAddress, RMWSConsts.APPS,
+-        AppsInfo.class, conf, DeSelectFields.DeSelectType.RESOURCE_REQUESTS.toString());
+-
+-    Set<ApplicationId> appSet = new HashSet<>();
+-    for (AppInfo appInfo : appsInfo.getApps()) {
+-      appSet.add(ApplicationId.fromString(appInfo.getAppId()));
+-    }
+-    return appSet;
+-  }
+-
+-  /**
+-   * Get the list of known applications in the cluster from Router.
+-   *
+-   * @return the list of known applications
+-   * @throws YarnException if get app fails
+-   */
+-  public Set<ApplicationId> getRouterKnownApplications() throws YarnException {
+-    int successCount = 0, totalAttemptCount = 0;
+-    Set<ApplicationId> resultSet = new HashSet<>();
+-    while (totalAttemptCount < this.maxRouterRetry) {
+-      try {
+-        Set<ApplicationId> routerApps = getAppsFromRouter();
+-        resultSet.addAll(routerApps);
+-        LOG.info("Attempt {}: {} known apps from Router, {} in total",
+-            totalAttemptCount, routerApps.size(), resultSet.size());
+-
+-        successCount++;
+-        if (successCount >= this.minRouterSuccessCount) {
+-          return resultSet;
+-        }
+-
+-        // Wait for the next attempt
+-        try {
+-          Thread.sleep(this.routerQueryIntevalMillis);
+-        } catch (InterruptedException e) {
+-          LOG.warn("Sleep interrupted after attempt {}.", totalAttemptCount);
+-        }
+-      } catch (Exception e) {
+-        LOG.warn("Router query attempt {} failed.", totalAttemptCount, e);
+-      } finally {
+-        totalAttemptCount++;
+-      }
+-    }
+-    throw new YarnException("Only " + successCount
+-        + " success Router queries after " + totalAttemptCount + " retries");
+-  }
+-
+-  @Override
+-  public abstract void run();
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/DefaultApplicationCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/DefaultApplicationCleaner.java
+deleted file mode 100644
+index c3f79d0284c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/DefaultApplicationCleaner.java
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner;
+-
+-import java.util.Date;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-import java.util.stream.Collectors;
+-
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-
+-/**
+- * The default ApplicationCleaner that cleans up old applications from table
+- * applicationsHomeSubCluster in FederationStateStore.
+- */
+-public class DefaultApplicationCleaner extends ApplicationCleaner {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(DefaultApplicationCleaner.class);
+-
+-  @Override
+-  public void run() {
+-    Date now = new Date();
+-    LOG.info("Application cleaner run at time {}", now);
+-
+-    FederationStateStoreFacade facade = getGPGContext().getStateStoreFacade();
+-    try {
+-      // Get the candidate list from StateStore before calling router
+-      Set<ApplicationId> allStateStoreApps = new HashSet<>();
+-      List<ApplicationHomeSubCluster> response =
+-          facade.getApplicationsHomeSubCluster();
+-      for (ApplicationHomeSubCluster app : response) {
+-        allStateStoreApps.add(app.getApplicationId());
+-      }
+-      LOG.info("{} app entries in FederationStateStore", allStateStoreApps.size());
+-
+-      // Get the candidate list from Registry before calling router
+-      List<String> allRegistryApps = getRegistryClient().getAllApplications();
+-      LOG.info("{} app entries in FederationRegistry", allStateStoreApps.size());
+-
+-      // Get the list of known apps from Router
+-      Set<ApplicationId> routerApps = getRouterKnownApplications();
+-      LOG.info("{} known applications from Router", routerApps.size());
+-
+-      // Clean up StateStore entries
+-      Set<ApplicationId> toDelete =
+-          Sets.difference(allStateStoreApps, routerApps);
+-
+-      LOG.info("Deleting {} applications from statestore", toDelete.size());
+-      LOG.debug("Apps to delete: {}.",
+-          toDelete.stream().map(Object::toString).collect(Collectors.joining(",")));
+-
+-      for (ApplicationId appId : toDelete) {
+-        try {
+-          LOG.debug("Deleting {} from statestore ", appId);
+-          facade.deleteApplicationHomeSubCluster(appId);
+-        } catch (Exception e) {
+-          LOG.error("deleteApplicationHomeSubCluster failed at application {}.", appId, e);
+-        }
+-      }
+-
+-      // Clean up Registry entries
+-      for (String app : allRegistryApps) {
+-        ApplicationId appId = ApplicationId.fromString(app);
+-        if (!routerApps.contains(appId)) {
+-          LOG.debug("removing finished application entry for {}", app);
+-          getRegistryClient().removeAppFromRegistry(appId, true);
+-        }
+-      }
+-    } catch (Throwable e) {
+-      LOG.error("Application cleaner started at time {} fails. ", now, e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/package-info.java
+deleted file mode 100644
+index dd302c81f45..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/package-info.java
+deleted file mode 100644
+index abaa57c81e0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/GlobalPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/GlobalPolicy.java
+deleted file mode 100644
+index ab60a48434e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/GlobalPolicy.java
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-
+-import java.util.Collections;
+-import java.util.Map;
+-
+-/**
+- * This interface defines the plug-able policy that the PolicyGenerator uses
+- * to update policies into the state store.
+- */
+-
+-public abstract class GlobalPolicy implements Configurable {
+-
+-  private Configuration conf;
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return conf;
+-  }
+-
+-  /**
+-   * Return a map of the object type and RM path to request it from - the
+-   * framework will query these paths and provide the objects to the policy.
+-   * Delegating this responsibility to the PolicyGenerator enables us to avoid
+-   * duplicate calls to the same * endpoints as the GlobalPolicy is invoked
+-   * once per queue.
+-   *
+-   * @return a map of the object type and RM path.
+-   */
+-  protected Map<Class<?>, String> registerPaths() {
+-    // Default register nothing
+-    return Collections.emptyMap();
+-  }
+-
+-  /**
+-   * Given a queue, cluster metrics, and policy manager, update the policy
+-   * to account for the cluster status. This method defines the policy generator
+-   * behavior.
+-   *
+-   * @param queueName   name of the queue
+-   * @param clusterInfo subClusterId map to cluster information about the
+-   *                    SubCluster used to make policy decisions
+-   * @param manager     the FederationPolicyManager for the queue's existing
+-   *                    policy the manager may be null, in which case the policy
+-   *                    will need to be created
+-   * @return policy manager that handles the updated (or created) policy
+-   */
+-  protected abstract FederationPolicyManager updatePolicy(String queueName,
+-      Map<SubClusterId, Map<Class, Object>> clusterInfo,
+-      FederationPolicyManager manager);
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/LoadBasedGlobalPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/LoadBasedGlobalPolicy.java
+deleted file mode 100644
+index f728b92d71f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/LoadBasedGlobalPolicy.java
++++ /dev/null
+@@ -1,329 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.commons.collections.MapUtils;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.ArrayList;
+-import java.util.Comparator;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MIN_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_MIN_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MAX_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_MAX_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MAX_EDIT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_MAX_EDIT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_SCALING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_SCALING;
+-
+-/**
+- * Load based policy that generates weighted policies by scaling
+- * the cluster load (based on pending) to a weight from 0.0 to 1.0.
+- */
+-public class LoadBasedGlobalPolicy extends GlobalPolicy {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(LoadBasedGlobalPolicy.class);
+-
+-  public enum Scaling {
+-    LINEAR,
+-    QUADRATIC,
+-    LOG,
+-    NONE
+-  }
+-
+-  // Minimum pending count before the policy starts scaling down the weights
+-  private int minPending;
+-  // Maximum pending count before policy stops scaling down the weights
+-  // (they'll be set to min weight)
+-  private int maxPending;
+-  // Minimum weight that a sub cluster will be assigned
+-  private float minWeight;
+-  // Maximum number of weights that can be scaled down simultaneously
+-  private int maxEdit;
+-  // Scaling type
+-  private Scaling scaling = Scaling.NONE;
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    super.setConf(conf);
+-    minPending = conf.getInt(FEDERATION_GPG_LOAD_BASED_MIN_PENDING,
+-        DEFAULT_FEDERATION_GPG_LOAD_BASED_MIN_PENDING);
+-    maxPending = conf.getInt(FEDERATION_GPG_LOAD_BASED_MAX_PENDING,
+-        DEFAULT_FEDERATION_GPG_LOAD_BASED_MAX_PENDING);
+-    minWeight = conf.getFloat(FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT,
+-        DEFAULT_FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT);
+-    maxEdit = conf.getInt(FEDERATION_GPG_LOAD_BASED_MAX_EDIT,
+-        DEFAULT_FEDERATION_GPG_LOAD_BASED_MAX_EDIT);
+-
+-    try {
+-      scaling = Scaling.valueOf(conf.get(FEDERATION_GPG_LOAD_BASED_SCALING,
+-          DEFAULT_FEDERATION_GPG_LOAD_BASED_SCALING));
+-    } catch (IllegalArgumentException e) {
+-      LOG.warn("Invalid scaling mode provided", e);
+-    }
+-
+-    // Check that all configuration values are valid
+-    if (!(minPending <= maxPending)) {
+-      throw new YarnRuntimeException("minPending = " + minPending
+-          + " must be less than or equal to maxPending=" + maxPending);
+-    }
+-    if (!(minWeight >= 0 && minWeight < 1)) {
+-      throw new YarnRuntimeException(
+-          "minWeight = " + minWeight + " must be within range [0,1)");
+-    }
+-  }
+-
+-  @Override
+-  protected Map<Class<?>, String> registerPaths() {
+-    // Register for the endpoints we want to receive information on
+-    Map<Class<?>, String> map = new HashMap<>();
+-    map.put(ClusterMetricsInfo.class, RMWSConsts.METRICS);
+-    return map;
+-  }
+-
+-  /**
+-   * Update the policy of the queue.
+-   *
+-   * @param queueName   name of the queue
+-   * @param clusterInfo subClusterId map to cluster information about the
+-   *                    SubCluster used to make policy decisions
+-   * @param currentManager the FederationPolicyManager for the queue's existing
+-   * policy the manager may be null, in which case the policy
+-   * will need to be created.
+-   *
+-   * @return FederationPolicyManager.
+-   */
+-  @Override
+-  protected FederationPolicyManager updatePolicy(String queueName,
+-      Map<SubClusterId, Map<Class, Object>> clusterInfo,
+-      FederationPolicyManager currentManager) {
+-    if (currentManager == null) {
+-      LOG.info("Creating load based weighted policy queue {}.", queueName);
+-      currentManager = getWeightedLocalityPolicyManager(queueName, clusterInfo);
+-    } else if (currentManager instanceof WeightedLocalityPolicyManager) {
+-      LOG.info("Updating load based weighted policy queue {}.", queueName);
+-      currentManager = getWeightedLocalityPolicyManager(queueName, clusterInfo);
+-    } else {
+-      LOG.warn("Policy for queue {} is of type {}, expected {}.", queueName,
+-          currentManager.getClass(), WeightedLocalityPolicyManager.class);
+-    }
+-    return currentManager;
+-  }
+-
+-  /**
+-   * GPG can help update the policy of the queue.
+-   *
+-   * We automatically generate the weight of the subCluster
+-   * according to the clusterMetrics of the subCluster.
+-   *
+-   * @param queue queueName.
+-   * @param subClusterMetricInfos Metric information of the subCluster.
+-   * @return WeightedLocalityPolicyManager.
+-   */
+-  protected WeightedLocalityPolicyManager getWeightedLocalityPolicyManager(String queue,
+-      Map<SubClusterId, Map<Class, Object>> subClusterMetricInfos) {
+-
+-    // Parse the metric information of the subCluster.
+-    Map<SubClusterId, ClusterMetricsInfo> clusterMetrics =
+-        getSubClustersMetricsInfo(subClusterMetricInfos);
+-
+-    if (MapUtils.isEmpty(clusterMetrics)) {
+-      return null;
+-    }
+-
+-    // Get the new weight of the subCluster.
+-    WeightedLocalityPolicyManager manager = new WeightedLocalityPolicyManager();
+-    Map<SubClusterIdInfo, Float> weights = getTargetWeights(clusterMetrics);
+-    manager.setQueue(queue);
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(weights);
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(weights);
+-    return manager;
+-  }
+-
+-  /**
+-   * Get the ClusterMetric information of the subCluster.
+-   *
+-   * @param subClusterMetricsInfo subCluster Metric Information.
+-   * @return Mapping relationship between subCluster and Metric.
+-   */
+-  protected Map<SubClusterId, ClusterMetricsInfo> getSubClustersMetricsInfo(
+-      Map<SubClusterId, Map<Class, Object>> subClusterMetricsInfo) {
+-
+-    // Check whether the Metric information of the sub-cluster is empty,
+-    // if it is empty, we will directly return null.
+-    if(MapUtils.isEmpty(subClusterMetricsInfo)) {
+-      LOG.warn("The metric info of the subCluster is empty.");
+-      return null;
+-    }
+-
+-    Map<SubClusterId, ClusterMetricsInfo> clusterMetrics = new HashMap<>();
+-    for (Map.Entry<SubClusterId, Map<Class, Object>> entry : subClusterMetricsInfo.entrySet()) {
+-      SubClusterId subClusterId = entry.getKey();
+-      Map<Class, Object> subClusterMetrics = entry.getValue();
+-      ClusterMetricsInfo clusterMetricsInfo = (ClusterMetricsInfo)
+-          subClusterMetrics.getOrDefault(ClusterMetricsInfo.class, null);
+-      clusterMetrics.put(subClusterId, clusterMetricsInfo);
+-    }
+-
+-    // return subCluster Metric Information.
+-    return clusterMetrics;
+-  }
+-
+-  /**
+-   * Get subCluster target weight.
+-   *
+-   * @param clusterMetrics Metric of the subCluster.
+-   * @return subCluster Weights.
+-   */
+-  @VisibleForTesting
+-  protected Map<SubClusterIdInfo, Float> getTargetWeights(
+-      Map<SubClusterId, ClusterMetricsInfo> clusterMetrics) {
+-    Map<SubClusterIdInfo, Float> weights = GPGUtils.createUniformWeights(clusterMetrics.keySet());
+-
+-    List<SubClusterId> scs = new ArrayList<>(clusterMetrics.keySet());
+-    // Sort the sub clusters into descending order based on pending load
+-    scs.sort(new SortByDescendingLoad(clusterMetrics));
+-
+-    // Keep the top N loaded sub clusters
+-    scs = scs.subList(0, Math.min(maxEdit, scs.size()));
+-
+-    for (SubClusterId sc : scs) {
+-      LOG.info("Updating weight for sub cluster {}", sc.toString());
+-      int pending = clusterMetrics.get(sc).getAppsPending();
+-      if (pending <= minPending) {
+-        LOG.info("Load ({}) is lower than minimum ({}), skipping", pending, minPending);
+-      } else if (pending < maxPending) {
+-        // The different scaling strategies should all map values from the
+-        // range min_pending+1 to max_pending to the range min_weight to 1.0f
+-        // so we pre-process and simplify the domain to some value [1, MAX-MIN)
+-        int val = pending - minPending;
+-        int maxVal = maxPending - minPending;
+-
+-        // Scale the weights to respect the config minimum
+-        float weight = getWeightByScaling(maxVal, val);
+-        weight = weight * (1.0f - minWeight);
+-        weight += minWeight;
+-        weights.put(new SubClusterIdInfo(sc), weight);
+-        LOG.info("Load ({}) is within maximum ({}), setting weights via {} "
+-            + "scale to {}", pending, maxPending, scaling, weight);
+-      } else {
+-        weights.put(new SubClusterIdInfo(sc), minWeight);
+-        LOG.info("Load ({}) exceeded maximum ({}), setting weight to minimum: {}",
+-            pending, maxPending, minWeight);
+-      }
+-    }
+-    validateWeights(weights);
+-    return weights;
+-  }
+-
+-  /**
+-   * Get weight information.
+-   * We will calculate the weight information according to different Scaling.
+-   *
+-   * NONE: No calculation is required, and the weight is 1 at this time.
+-   *
+-   * LINEAR: For linear computation, we will use (maxPendingVal - curPendingVal) / (maxPendingVal).
+-   *
+-   * QUADRATIC: Calculated using quadratic,
+-   * We will calculate quadratic for maxPendingVal, curPendingVal,
+-   * then use this formula = (maxPendingVal - curPendingVal) / (maxPendingVal).
+-   *
+-   * LOG(LOGARITHM): Calculated using logarithm,
+-   * We will calculate logarithm for maxPendingVal, curPendingVal,
+-   * then use this formula = (maxPendingVal - curPendingVal) / (maxPendingVal).
+-   *
+-   * @param maxPendingVal maxPending - minPending
+-   * @param curPendingVal pending - minPending
+-   * @return Calculated weight information.
+-   */
+-  protected float getWeightByScaling(int maxPendingVal, int curPendingVal) {
+-    float weight = 1.0f;
+-    switch (scaling) {
+-    case NONE:
+-      break;
+-    case LINEAR:
+-      weight = (float) (maxPendingVal - curPendingVal) / (float) (maxPendingVal);
+-      break;
+-    case QUADRATIC:
+-      double maxValQuad = Math.pow(maxPendingVal, 2);
+-      double valQuad = Math.pow(curPendingVal, 2);
+-      weight = (float) (maxValQuad - valQuad) / (float) (maxValQuad);
+-      break;
+-    case LOG:
+-      double maxValLog = Math.log(maxPendingVal);
+-      double valLog = Math.log(curPendingVal);
+-      weight = (float) (maxValLog - valLog) / (float) (maxValLog);
+-      break;
+-    default:
+-      LOG.warn("No suitable scaling found, Skip.");
+-      break;
+-    }
+-    return weight;
+-  }
+-
+-  /**
+-   * Helper to avoid all zero weights. If weights are all zero, they're reset
+-   * to one
+-   * @param weights weights to validate
+-   */
+-  private void validateWeights(Map<SubClusterIdInfo, Float> weights) {
+-    for(Float w : weights.values()) {
+-      // If we find a nonzero weight, we're validated
+-      if(w > 0.0f) {
+-        return;
+-      }
+-    }
+-    LOG.warn("All {} generated weights were 0.0f. Resetting to 1.0f.", weights.size());
+-    // All weights were zero. Reset all back to 1.0
+-    weights.replaceAll((i, v) -> 1.0f);
+-  }
+-
+-  private static final class SortByDescendingLoad
+-      implements Comparator<SubClusterId> {
+-
+-    private Map<SubClusterId, ClusterMetricsInfo> clusterMetrics;
+-
+-    private SortByDescendingLoad(
+-        Map<SubClusterId, ClusterMetricsInfo> clusterMetrics) {
+-      this.clusterMetrics = clusterMetrics;
+-    }
+-
+-    public int compare(SubClusterId a, SubClusterId b) {
+-      // Sort by pending load
+-      return clusterMetrics.get(b).getAppsPending() - clusterMetrics.get(a)
+-          .getAppsPending();
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/NoOpGlobalPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/NoOpGlobalPolicy.java
+deleted file mode 100644
+index c2d578f7717..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/NoOpGlobalPolicy.java
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-
+-import java.util.Map;
+-
+-/**
+- * Default policy that does not update any policy configurations.
+- */
+-public class NoOpGlobalPolicy extends GlobalPolicy{
+-
+-  @Override
+-  public FederationPolicyManager updatePolicy(String queueName,
+-      Map<SubClusterId, Map<Class, Object>> clusterInfo,
+-      FederationPolicyManager manager) {
+-    return null;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/PolicyGenerator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/PolicyGenerator.java
+deleted file mode 100644
+index 1f0fbd11a74..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/PolicyGenerator.java
++++ /dev/null
+@@ -1,267 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.conf.Configurable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Map;
+-import java.util.Set;
+-
+-/**
+- * The PolicyGenerator runs periodically and updates the policy configuration
+- * for each queue into the FederationStateStore. The policy update behavior is
+- * defined by the GlobalPolicy instance that is used.
+- */
+-
+-public class PolicyGenerator implements Runnable, Configurable {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(PolicyGenerator.class);
+-
+-  private GPGContext gpgContext;
+-  private Configuration conf;
+-
+-  // Information request map
+-  private Map<Class, String> pathMap = new HashMap<>();
+-
+-  // Global policy instance
+-  @VisibleForTesting
+-  private GlobalPolicy policy;
+-
+-  /**
+-   * The PolicyGenerator periodically reads SubCluster load and updates
+-   * policies into the FederationStateStore.
+-   *
+-   * @param conf Configuration.
+-   * @param context GPG Context.
+-   */
+-  public PolicyGenerator(Configuration conf, GPGContext context) {
+-    setConf(conf);
+-    init(context);
+-  }
+-
+-  private void init(GPGContext context) {
+-    this.gpgContext = context;
+-    LOG.info("Initialized PolicyGenerator");
+-  }
+-
+-  @Override
+-  public void setConf(Configuration conf) {
+-    this.conf = conf;
+-    this.policy = FederationStateStoreFacade.createInstance(conf,
+-        YarnConfiguration.GPG_GLOBAL_POLICY_CLASS,
+-        YarnConfiguration.DEFAULT_GPG_GLOBAL_POLICY_CLASS, GlobalPolicy.class);
+-    policy.setConf(conf);
+-    pathMap.putAll(policy.registerPaths());
+-  }
+-
+-  @Override
+-  public Configuration getConf() {
+-    return this.conf;
+-  }
+-
+-  @Override
+-  public final void run() {
+-    Map<SubClusterId, SubClusterInfo> activeSubClusters;
+-    try {
+-      activeSubClusters = gpgContext.getStateStoreFacade().getSubClusters(true);
+-    } catch (YarnException e) {
+-      LOG.error("Error retrieving active sub-clusters", e);
+-      return;
+-    }
+-
+-    // Parse the scheduler information from all the SCs
+-    Map<SubClusterId, SchedulerInfo> schedInfo = getSchedulerInfo(activeSubClusters);
+-
+-    // Extract and enforce that all the schedulers have matching type
+-    Set<String> queueNames = extractQueues(schedInfo);
+-
+-    // Remove black listed SubClusters
+-    activeSubClusters.keySet().removeAll(getBlackList());
+-    LOG.info("Active non-blacklist sub-clusters: {}",
+-        activeSubClusters.keySet());
+-
+-    // Get cluster metrics information from non-black listed RMs - later used
+-    // to evaluate SubCluster load
+-    Map<SubClusterId, Map<Class, Object>> clusterInfo =
+-        getInfos(activeSubClusters);
+-
+-    // Update into the FederationStateStore
+-    for (String queueName : queueNames) {
+-      // Retrieve the manager from the policy facade
+-      FederationPolicyManager manager;
+-      try {
+-        manager = this.gpgContext.getPolicyFacade().getPolicyManager(queueName);
+-      } catch (YarnException e) {
+-        LOG.error("GetPolicy for queue {} failed.", queueName, e);
+-        continue;
+-      }
+-      LOG.info("Updating policy for queue {}.", queueName);
+-      manager = policy.updatePolicy(queueName, clusterInfo, manager);
+-      try {
+-        this.gpgContext.getPolicyFacade().setPolicyManager(manager);
+-      } catch (YarnException e) {
+-        LOG.error("SetPolicy for queue {} failed.", queueName, e);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Helper to retrieve metrics from the RM REST endpoints.
+-   *
+-   * @param activeSubClusters A map of active SubCluster IDs to info
+-   * @return Mapping relationship between SubClusterId and Metric.
+-   */
+-  @VisibleForTesting
+-  protected Map<SubClusterId, Map<Class, Object>> getInfos(
+-      Map<SubClusterId, SubClusterInfo> activeSubClusters) {
+-
+-    Map<SubClusterId, Map<Class, Object>> clusterInfo = new HashMap<>();
+-    for (SubClusterInfo sci : activeSubClusters.values()) {
+-      for (Map.Entry<Class, String> e : this.pathMap.entrySet()) {
+-        if (!clusterInfo.containsKey(sci.getSubClusterId())) {
+-          clusterInfo.put(sci.getSubClusterId(), new HashMap<>());
+-        }
+-        Object ret = GPGUtils.invokeRMWebService(sci.getRMWebServiceAddress(),
+-            e.getValue(), e.getKey(), conf);
+-        clusterInfo.get(sci.getSubClusterId()).put(e.getKey(), ret);
+-      }
+-    }
+-
+-    return clusterInfo;
+-  }
+-
+-  /**
+-   * Helper to retrieve SchedulerInfos.
+-   *
+-   * @param activeSubClusters A map of active SubCluster IDs to info
+-   * @return Mapping relationship between SubClusterId and SubClusterInfo.
+-   */
+-  @VisibleForTesting
+-  protected Map<SubClusterId, SchedulerInfo> getSchedulerInfo(
+-      Map<SubClusterId, SubClusterInfo> activeSubClusters) {
+-    Map<SubClusterId, SchedulerInfo> schedInfo =
+-        new HashMap<>();
+-    for (SubClusterInfo sci : activeSubClusters.values()) {
+-      SchedulerTypeInfo sti = GPGUtils
+-          .invokeRMWebService(sci.getRMWebServiceAddress(),
+-              RMWSConsts.SCHEDULER, SchedulerTypeInfo.class, conf);
+-      if(sti != null){
+-        schedInfo.put(sci.getSubClusterId(), sti.getSchedulerInfo());
+-      } else {
+-        LOG.warn("Skipped null scheduler info from SubCluster {}.", sci.getSubClusterId());
+-      }
+-    }
+-    return schedInfo;
+-  }
+-
+-  /**
+-   * Helper to get a set of blacklisted SubCluster Ids from configuration.
+-   */
+-  private Set<SubClusterId> getBlackList() {
+-    String blackListParam =
+-        conf.get(YarnConfiguration.GPG_POLICY_GENERATOR_BLACKLIST);
+-    if(blackListParam == null){
+-      return Collections.emptySet();
+-    }
+-    Set<SubClusterId> blackList = new HashSet<>();
+-    for (String id : blackListParam.split(",")) {
+-      blackList.add(SubClusterId.newInstance(id));
+-    }
+-    return blackList;
+-  }
+-
+-  /**
+-   * Given the scheduler information for all RMs, extract the union of
+-   * queue names - right now we only consider instances of capacity scheduler.
+-   *
+-   * @param schedInfo the scheduler information
+-   * @return a set of queue names
+-   */
+-  private Set<String> extractQueues(Map<SubClusterId, SchedulerInfo> schedInfo) {
+-    Set<String> queueNames = new HashSet<>();
+-    for (Map.Entry<SubClusterId, SchedulerInfo> entry : schedInfo.entrySet()) {
+-      if (entry.getValue() instanceof CapacitySchedulerInfo) {
+-        // Flatten the queue structure and get only non leaf queues
+-        queueNames.addAll(flattenQueue((CapacitySchedulerInfo) entry.getValue())
+-            .get(CapacitySchedulerQueueInfo.class));
+-      } else {
+-        LOG.warn("Skipping SubCluster {}, not configured with capacity scheduler.",
+-            entry.getKey());
+-      }
+-    }
+-    return queueNames;
+-  }
+-
+-  // Helpers to flatten the queue structure into a multimap of
+-  // queue type to set of queue names
+-  private Map<Class, Set<String>> flattenQueue(CapacitySchedulerInfo csi) {
+-    Map<Class, Set<String>> flattened = new HashMap<>();
+-    addOrAppend(flattened, csi.getClass(), csi.getQueueName());
+-    for (CapacitySchedulerQueueInfo csqi : csi.getQueues().getQueueInfoList()) {
+-      flattenQueue(csqi, flattened);
+-    }
+-    return flattened;
+-  }
+-
+-  private void flattenQueue(CapacitySchedulerQueueInfo csi,
+-      Map<Class, Set<String>> flattened) {
+-    addOrAppend(flattened, csi.getClass(), csi.getQueueName());
+-    if (csi.getQueues() != null) {
+-      for (CapacitySchedulerQueueInfo csqi : csi.getQueues().getQueueInfoList()) {
+-        flattenQueue(csqi, flattened);
+-      }
+-    }
+-  }
+-
+-  private <K, V> void addOrAppend(Map<K, Set<V>> multimap, K key, V value) {
+-    if (!multimap.containsKey(key)) {
+-      multimap.put(key, new HashSet<>());
+-    }
+-    multimap.get(key).add(value);
+-  }
+-
+-  public GlobalPolicy getPolicy() {
+-    return policy;
+-  }
+-
+-  public void setPolicy(GlobalPolicy policy) {
+-    this.policy = policy;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/UniformWeightedLocalityGlobalPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/UniformWeightedLocalityGlobalPolicy.java
+deleted file mode 100644
+index 23e99062c7d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/UniformWeightedLocalityGlobalPolicy.java
++++ /dev/null
+@@ -1,68 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGUtils;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.Map;
+-
+-/**
+- * Simple policy that generates and updates uniform weighted locality
+- * policies.
+- */
+-public class UniformWeightedLocalityGlobalPolicy extends GlobalPolicy {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(UniformWeightedLocalityGlobalPolicy.class);
+-
+-  @Override
+-  protected FederationPolicyManager updatePolicy(String queueName,
+-      Map<SubClusterId, Map<Class, Object>> clusterInfo, FederationPolicyManager currentManager){
+-
+-    if(currentManager == null){
+-      // Set uniform weights for all SubClusters
+-      LOG.info("Creating uniform weighted policy queue {}.", queueName);
+-      WeightedLocalityPolicyManager manager = new WeightedLocalityPolicyManager();
+-      manager.setQueue(queueName);
+-      Map<SubClusterIdInfo, Float> policyWeights =
+-          GPGUtils.createUniformWeights(clusterInfo.keySet());
+-      manager.getWeightedPolicyInfo().setAMRMPolicyWeights(policyWeights);
+-      manager.getWeightedPolicyInfo().setRouterPolicyWeights(policyWeights);
+-      currentManager = manager;
+-    }
+-
+-    if(currentManager instanceof WeightedLocalityPolicyManager){
+-      LOG.info("Updating policy for queue {} to default weights.", queueName);
+-      WeightedLocalityPolicyManager wlpmanager = (WeightedLocalityPolicyManager) currentManager;
+-      Map<SubClusterIdInfo, Float> uniformWeights =
+-          GPGUtils.createUniformWeights(clusterInfo.keySet());
+-      wlpmanager.getWeightedPolicyInfo().setAMRMPolicyWeights(uniformWeights);
+-      wlpmanager.getWeightedPolicyInfo().setRouterPolicyWeights(uniformWeights);
+-    } else {
+-      LOG.info("Policy for queue {} is of type {}, expected {}",
+-          queueName, currentManager.getClass(), WeightedLocalityPolicyManager.class);
+-    }
+-    return currentManager;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/package-info.java
+deleted file mode 100644
+index e8ff436ad33..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Classes comprising the policy generator for the GPG. Responsibilities include
+- * generating and updating policies based on the cluster status.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/SubClusterCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/SubClusterCleaner.java
+deleted file mode 100644
+index aa1dda7464c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/SubClusterCleaner.java
++++ /dev/null
+@@ -1,113 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.subclustercleaner;
+-
+-import java.util.Date;
+-import java.util.Map;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.commons.lang.time.DurationFormatUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The sub-cluster cleaner is one of the GPG's services that periodically checks
+- * the membership table in FederationStateStore and mark sub-clusters that have
+- * not sent a heartbeat in certain amount of time as LOST.
+- */
+-public class SubClusterCleaner implements Runnable {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SubClusterCleaner.class);
+-
+-  private GPGContext gpgContext;
+-  private long heartbeatExpirationMillis;
+-
+-  /**
+-   * The sub-cluster cleaner runnable is invoked by the sub cluster cleaner
+-   * service to check the membership table and remove sub clusters that have not
+-   * sent a heart beat in some amount of time.
+-   *
+-   * @param conf configuration.
+-   * @param gpgContext GPGContext.
+-   */
+-  public SubClusterCleaner(Configuration conf, GPGContext gpgContext) {
+-    this.heartbeatExpirationMillis = conf.getTimeDuration(
+-        YarnConfiguration.GPG_SUBCLUSTER_EXPIRATION_MS,
+-        YarnConfiguration.DEFAULT_GPG_SUBCLUSTER_EXPIRATION_MS, TimeUnit.MILLISECONDS);
+-    this.gpgContext = gpgContext;
+-    LOG.info("Initialized SubClusterCleaner with heartbeat expiration of {}",
+-        DurationFormatUtils.formatDurationISO(this.heartbeatExpirationMillis));
+-  }
+-
+-  @Override
+-  public void run() {
+-    try {
+-      Date now = new Date();
+-      LOG.info("SubClusterCleaner at {}", now);
+-
+-      Map<SubClusterId, SubClusterInfo> infoMap =
+-          this.gpgContext.getStateStoreFacade().getSubClusters(false, true);
+-
+-      // Iterate over each sub cluster and check last heartbeat
+-      for (Map.Entry<SubClusterId, SubClusterInfo> entry : infoMap.entrySet()) {
+-        SubClusterInfo subClusterInfo = entry.getValue();
+-
+-        Date lastHeartBeat = new Date(subClusterInfo.getLastHeartBeat());
+-        if (LOG.isDebugEnabled()) {
+-          LOG.debug("Checking subcluster {} in state {}, last heartbeat at {}",
+-              subClusterInfo.getSubClusterId(), subClusterInfo.getState(),
+-              lastHeartBeat);
+-        }
+-
+-        if (subClusterInfo.getState().isUsable()) {
+-          long timeUntilDeregister = this.heartbeatExpirationMillis
+-              - (now.getTime() - lastHeartBeat.getTime());
+-          // Deregister sub-cluster as SC_LOST if last heartbeat too old
+-          if (timeUntilDeregister < 0) {
+-            LOG.warn(
+-                "Deregistering subcluster {} in state {} last heartbeat at {}",
+-                subClusterInfo.getSubClusterId(), subClusterInfo.getState(),
+-                new Date(subClusterInfo.getLastHeartBeat()));
+-            try {
+-              this.gpgContext.getStateStoreFacade().deregisterSubCluster(
+-                  subClusterInfo.getSubClusterId(), SubClusterState.SC_LOST);
+-            } catch (Exception e) {
+-              LOG.error("deregisterSubCluster failed on subcluster "
+-                  + subClusterInfo.getSubClusterId(), e);
+-            }
+-          } else if (LOG.isDebugEnabled()) {
+-            LOG.debug("Time until deregister for subcluster {}: {}",
+-                entry.getKey(),
+-                DurationFormatUtils.formatDurationISO(timeUntilDeregister));
+-          }
+-        }
+-      }
+-    } catch (Throwable e) {
+-      LOG.error("Subcluster cleaner fails: ", e);
+-    }
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/package-info.java
+deleted file mode 100644
+index f65444aa366..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.subclustercleaner;
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGController.java
+deleted file mode 100644
+index 4b81c8a128c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGController.java
++++ /dev/null
+@@ -1,49 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.Controller;
+-import com.google.inject.Inject;
+-
+-/**
+- * Controller for the GPG Web UI.
+- */
+-public class GPGController extends Controller {
+-
+-  @Inject
+-  GPGController(RequestContext ctx) {
+-    super(ctx);
+-  }
+-
+-  @Override
+-  public void index() {
+-    setTitle("GPG");
+-    render(GPGOverviewPage.class);
+-  }
+-
+-  public void overview() {
+-    setTitle("GPG");
+-    render(GPGOverviewPage.class);
+-  }
+-
+-  public void policies() {
+-    setTitle("Global Policy Generator Policies");
+-    render(GPGPoliciesPage.class);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewBlock.java
+deleted file mode 100644
+index 06617564ce6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewBlock.java
++++ /dev/null
+@@ -1,88 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import java.util.Date;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.util.YarnVersionInfo;
+-import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+-import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+-
+-import com.google.inject.Inject;
+-
+-/**
+- * Overview block for the GPG Web UI.
+- */
+-public class GPGOverviewBlock extends HtmlBlock {
+-
+-  private GlobalPolicyGenerator globalPolicyGenerator;
+-
+-  @Inject
+-  GPGOverviewBlock(GlobalPolicyGenerator gpg, ViewContext ctx) {
+-    super(ctx);
+-    this.globalPolicyGenerator = gpg;
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-    Configuration config = this.globalPolicyGenerator.getConfig();
+-
+-    String appCleaner = "disable";
+-    long appCleanerIntervalMs = config.getTimeDuration(YarnConfiguration.GPG_APPCLEANER_INTERVAL_MS,
+-        YarnConfiguration.DEFAULT_GPG_APPCLEANER_INTERVAL_MS, TimeUnit.MILLISECONDS);
+-    if (appCleanerIntervalMs > 0) {
+-      appCleaner = "enable, interval : " + appCleanerIntervalMs + " ms";
+-    }
+-
+-    String scCleaner = "disable";
+-    long scCleanerIntervalMs = config.getTimeDuration(
+-        YarnConfiguration.GPG_SUBCLUSTER_CLEANER_INTERVAL_MS,
+-        YarnConfiguration.DEFAULT_GPG_SUBCLUSTER_CLEANER_INTERVAL_MS, TimeUnit.MILLISECONDS);
+-    if (scCleanerIntervalMs > 0) {
+-      scCleaner = "enable, interval : " + scCleanerIntervalMs + " ms";
+-    }
+-
+-    String pgGenerator = "disable";
+-    long policyGeneratorIntervalMillis = config.getTimeDuration(
+-        YarnConfiguration.GPG_POLICY_GENERATOR_INTERVAL,
+-        YarnConfiguration.DEFAULT_GPG_POLICY_GENERATOR_INTERVAL, TimeUnit.MILLISECONDS);
+-
+-    if (policyGeneratorIntervalMillis > 0) {
+-      pgGenerator = "enable, interval : " + policyGeneratorIntervalMillis + " ms";
+-    }
+-
+-    String policy = config.get(YarnConfiguration.GPG_GLOBAL_POLICY_CLASS,
+-        YarnConfiguration.DEFAULT_GPG_GLOBAL_POLICY_CLASS);
+-
+-    info("GPG Details")
+-        .__("GPG started on", new Date(GlobalPolicyGenerator.getGPGStartupTime()))
+-        .__("GPG application cleaner", appCleaner)
+-        .__("GPG subcluster cleaner", scCleaner)
+-        .__("GPG policy generator", pgGenerator)
+-        .__("GPG policy generator class", policy)
+-        .__("GPG Version", YarnVersionInfo.getVersion())
+-        .__("Hadoop Version", VersionInfo.getVersion());
+-
+-    html.__(InfoBlock.class);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewPage.java
+deleted file mode 100644
+index b7086ea71ae..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGOverviewPage.java
++++ /dev/null
+@@ -1,52 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-import org.apache.hadoop.yarn.webapp.view.TwoColumnLayout;
+-
+-/**
+- * Overview page for the GPG Web UI.
+- */
+-public class GPGOverviewPage extends TwoColumnLayout {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-    setTitle("GPG");
+-  }
+-
+-  protected void commonPreHead(Page.HTML<__> html) {
+-    set(ACCORDION_ID, "nav");
+-    set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> nav() {
+-    return NavBlock.class;
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return GPGOverviewBlock.class;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesBlock.java
+deleted file mode 100644
+index 641576a30ca..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesBlock.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import com.google.inject.Inject;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.policies.exceptions.FederationPolicyInitializationException;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.webapp.hamlet2.Hamlet;
+-import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+-
+-import java.nio.ByteBuffer;
+-import java.util.Collection;
+-import java.util.Map;
+-
+-/**
+- * Overview block for the GPG Policies Web UI.
+- */
+-public class GPGPoliciesBlock extends HtmlBlock {
+-
+-  private final GlobalPolicyGenerator gpg;
+-
+-  private final FederationStateStoreFacade facade;
+-
+-  @Inject
+-  GPGPoliciesBlock(GlobalPolicyGenerator gpg, ViewContext ctx) {
+-    super(ctx);
+-    this.gpg = gpg;
+-    this.facade = FederationStateStoreFacade.getInstance(gpg.getConfig());
+-  }
+-
+-  @Override
+-  protected void render(Block html) {
+-    try {
+-      Collection<SubClusterPolicyConfiguration> policies =
+-          facade.getPoliciesConfigurations().values();
+-      initYarnFederationPolicies(policies, html);
+-    } catch (Exception e) {
+-      LOG.error("Get GPGPolicies Error.", e);
+-    }
+-  }
+-
+-  private void initYarnFederationPolicies(Collection<SubClusterPolicyConfiguration> policies,
+-      Block html) throws FederationPolicyInitializationException {
+-
+-    Hamlet.TBODY<Hamlet.TABLE<Hamlet>> tbody = html.table("#policies").
+-        thead().
+-        tr().
+-        th(".queue", "Queue Name").
+-        th(".policyType", "Policy Type").
+-        th(".routerPolicyWeights", "Router PolicyWeights").
+-        th(".amrmPolicyWeights", "Router AMRMPolicyWeights").
+-        th(".headroomAlpha", "Router Headroom Alpha").
+-        __().__().
+-        tbody();
+-
+-    if (policies != null) {
+-      for (SubClusterPolicyConfiguration policy : policies) {
+-        Hamlet.TR<Hamlet.TBODY<Hamlet.TABLE<Hamlet>>> row = tbody.tr().td(policy.getQueue());
+-        // Policy Type
+-        String type = policy.getType();
+-        row = row.td(type);
+-
+-        // WeightedPolicyInfo
+-        ByteBuffer params = policy.getParams();
+-        WeightedPolicyInfo weightedPolicyInfo = WeightedPolicyInfo.fromByteBuffer(params);
+-        row = row.td(policyWeight2String(weightedPolicyInfo.getRouterPolicyWeights()));
+-        row = row.td(policyWeight2String(weightedPolicyInfo.getAMRMPolicyWeights()));
+-        row.td(String.valueOf(weightedPolicyInfo.getHeadroomAlpha())).__();
+-      }
+-    }
+-
+-    tbody.__().__();
+-  }
+-
+-  /**
+-   * We will convert the PolicyWeight to string format.
+-   *
+-   * @param weights PolicyWeight.
+-   * @return string format PolicyWeight. example: SC-1:0.91, SC-2:0.09
+-   */
+-  private String policyWeight2String(Map<SubClusterIdInfo, Float> weights) {
+-    StringBuilder sb = new StringBuilder();
+-    for (Map.Entry<SubClusterIdInfo, Float> entry : weights.entrySet()) {
+-      sb.append(entry.getKey().toId()).append(": ").append(entry.getValue()).append(", ");
+-    }
+-    if (sb.length() > 2) {
+-      sb.setLength(sb.length() - 2);
+-    }
+-    return sb.toString();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesPage.java
+deleted file mode 100644
+index f9ff5f5c8bd..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGPoliciesPage.java
++++ /dev/null
+@@ -1,55 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.SubView;
+-import org.apache.hadoop.yarn.webapp.view.TwoColumnLayout;
+-
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.DATATABLES_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-
+-/**
+- * Overview page for the GPG Policies Web UI.
+- */
+-public class GPGPoliciesPage extends TwoColumnLayout {
+-
+-  @Override
+-  protected void preHead(Page.HTML<__> html) {
+-    commonPreHead(html);
+-  }
+-
+-  protected void commonPreHead(Page.HTML<__> html) {
+-    setTitle("Global Policy Generator Policies");
+-    set(ACCORDION_ID, "nav");
+-    set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
+-    set(DATATABLES_ID, "policies");
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> content() {
+-    return GPGPoliciesBlock.class;
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> nav() {
+-    return NavBlock.class;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
+deleted file mode 100644
+index 0bbe49db25f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebApp.java
++++ /dev/null
+@@ -1,47 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver;
+-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-
+-/**
+- * The GPG webapp.
+- */
+-public class GPGWebApp extends WebApp {
+-  private GlobalPolicyGenerator gpg;
+-
+-  public GPGWebApp(GlobalPolicyGenerator gpg) {
+-    this.gpg = gpg;
+-  }
+-
+-  @Override
+-  public void setup() {
+-    bind(GPGWebServices.class);
+-    bind(JAXBContextResolver.class);
+-    bind(GPGWebApp.class).toInstance(this);
+-    bind(GenericExceptionHandler.class);
+-    if (gpg != null) {
+-      bind(GlobalPolicyGenerator.class).toInstance(gpg);
+-    }
+-    route("/", GPGController.class, "overview");
+-    route("/policies", GPGController.class, "policies");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebServices.java
+deleted file mode 100644
+index ef6b50d83ad..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/GPGWebServices.java
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/** * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import com.google.inject.Inject;
+-import com.google.inject.Singleton;
+-import org.apache.hadoop.http.JettyUtils;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.webapp.dao.GpgInfo;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import javax.ws.rs.GET;
+-import javax.ws.rs.Path;
+-import javax.ws.rs.Produces;
+-import javax.ws.rs.core.MediaType;
+-
+-@Singleton
+-@Path("/ws/v1/gpg")
+-public class GPGWebServices {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(GPGWebServices.class);
+-
+-  private GlobalPolicyGenerator gpgGenerator;
+-  private WebApp webapp;
+-
+-  @Inject
+-  public GPGWebServices(final GlobalPolicyGenerator gpg, final WebApp webapp) {
+-    this.gpgGenerator = gpg;
+-    this.webapp = webapp;
+-  }
+-
+-  @GET
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-      MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public GpgInfo get() {
+-    return new GpgInfo(this.gpgGenerator.getGPGContext());
+-  }
+-
+-  @GET
+-  @Path("/info")
+-  @Produces({ MediaType.APPLICATION_JSON + "; " + JettyUtils.UTF_8,
+-       MediaType.APPLICATION_XML + "; " + JettyUtils.UTF_8 })
+-  public GpgInfo getGPGInfo() {
+-    return new GpgInfo(this.gpgGenerator.getGPGContext());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/NavBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/NavBlock.java
+deleted file mode 100644
+index 3650287df38..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/NavBlock.java
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+-
+-/**
+- * Navigation block for the GPG Web UI.
+- */
+-public class NavBlock extends HtmlBlock {
+-
+-  @Override
+-  public void render(Block html) {
+-    html.
+-      div("#nav").
+-        h3("GPG").
+-        ul().
+-          li().a(url(""), "Overview").__().
+-          li().a(url("policies"), "Policies").__().
+-        __().
+-        h3("Tools").
+-        ul().
+-          li().a("/conf", "Configuration").__().
+-          li().a("/logs", "Local logs").__().
+-          li().a("/stacks", "Server stacks").__().
+-          li().a("/jmx?qry=Hadoop:*", "Server metrics").__().__().__();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/GpgInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/GpgInfo.java
+deleted file mode 100644
+index a5c6c29e9fc..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/GpgInfo.java
++++ /dev/null
+@@ -1,81 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp.dao;
+-
+-import org.apache.hadoop.util.VersionInfo;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.util.YarnVersionInfo;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-@XmlRootElement
+-@XmlAccessorType(XmlAccessType.FIELD)
+-public class GpgInfo {
+-  private String gpgVersion;
+-  private String gpgBuildVersion;
+-  private String gpgVersionBuiltOn;
+-  private String hadoopVersion;
+-  private String hadoopBuildVersion;
+-  private String hadoopVersionBuiltOn;
+-  private long gpgStartupTime;
+-
+-  public GpgInfo() {
+-  } // JAXB needs this
+-
+-  public GpgInfo(final GPGContext context) {
+-    this.gpgVersion = YarnVersionInfo.getVersion();
+-    this.gpgBuildVersion = YarnVersionInfo.getBuildVersion();
+-    this.gpgVersionBuiltOn = YarnVersionInfo.getDate();
+-    this.hadoopVersion = VersionInfo.getVersion();
+-    this.hadoopBuildVersion = VersionInfo.getBuildVersion();
+-    this.hadoopVersionBuiltOn = VersionInfo.getDate();
+-    this.gpgStartupTime = GlobalPolicyGenerator.getGPGStartupTime();
+-  }
+-
+-  public String getGpgVersion() {
+-    return gpgVersion;
+-  }
+-
+-  public String getGpgBuildVersion() {
+-    return gpgBuildVersion;
+-  }
+-
+-  public String getGpgVersionBuiltOn() {
+-    return gpgVersionBuiltOn;
+-  }
+-
+-  public String getHadoopVersion() {
+-    return hadoopVersion;
+-  }
+-
+-  public String getHadoopBuildVersion() {
+-    return hadoopBuildVersion;
+-  }
+-
+-  public String getHadoopVersionBuiltOn() {
+-    return hadoopVersionBuiltOn;
+-  }
+-
+-  public long getGpgStartupTime() {
+-    return gpgStartupTime;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/package-info.java
+deleted file mode 100644
+index b687ba28907..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/dao/package-info.java
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp.dao;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/package-info.java
+deleted file mode 100644
+index 762212b49a1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/main/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/package-info.java
++++ /dev/null
+@@ -1,24 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-/**
+- * Classes comprising the policy generator for the GPG. Responsibilities include
+- * generating and updating policies based on the cluster status.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGPGPolicyFacade.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGPGPolicyFacade.java
+deleted file mode 100644
+index 217c4a58967..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGPGPolicyFacade.java
++++ /dev/null
+@@ -1,356 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.times;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-
+-import org.apache.commons.lang3.NotImplementedException;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.dao.WeightedPolicyInfo;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedHomePolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.UniformBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.HashBroadcastPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.HomePolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.RejectAllPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.SetSubClusterPolicyConfigurationRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.mockito.Matchers;
+-
+-import java.util.List;
+-import java.util.ArrayList;
+-import java.util.Map;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-/**
+- * Unit test for GPG Policy Facade.
+- */
+-public class TestGPGPolicyFacade {
+-
+-  private Configuration conf;
+-  private FederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-  private GPGPolicyFacade policyFacade;
+-
+-  private Set<SubClusterId> subClusterIds;
+-
+-  private SubClusterPolicyConfiguration testConf;
+-
+-  private static final String TEST_QUEUE = "test-queue";
+-
+-  public TestGPGPolicyFacade() {
+-    conf = new Configuration();
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-    subClusterIds = new HashSet<>();
+-    subClusterIds.add(SubClusterId.newInstance("sc0"));
+-    subClusterIds.add(SubClusterId.newInstance("sc1"));
+-    subClusterIds.add(SubClusterId.newInstance("sc2"));
+-    facade = FederationStateStoreFacade.getInstance(conf);
+-  }
+-
+-  @Before
+-  public void setUp() throws YarnException {
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-    facade.reinitialize(stateStore, conf);
+-    policyFacade = new GPGPolicyFacade(facade, conf);
+-    WeightedLocalityPolicyManager manager =
+-        new WeightedLocalityPolicyManager();
+-    // Add a test policy for test queue
+-    manager.setQueue(TEST_QUEUE);
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    testConf = manager.serializeConf();
+-    stateStore.setPolicyConfiguration(SetSubClusterPolicyConfigurationRequest
+-        .newInstance(testConf));
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    stateStore.close();
+-    stateStore = null;
+-  }
+-
+-  @Test
+-  public void testGetPolicy() throws YarnException {
+-    WeightedLocalityPolicyManager manager =
+-        (WeightedLocalityPolicyManager) policyFacade
+-            .getPolicyManager(TEST_QUEUE);
+-    Assert.assertEquals(testConf, manager.serializeConf());
+-  }
+-
+-  /**
+-   * Test that new policies are written into the state store.
+-   */
+-  @Test
+-  public void testSetNewPolicy() throws YarnException {
+-    WeightedLocalityPolicyManager manager =
+-        new WeightedLocalityPolicyManager();
+-    manager.setQueue(TEST_QUEUE + 0);
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    SubClusterPolicyConfiguration policyConf = manager.serializeConf();
+-    policyFacade.setPolicyManager(manager);
+-
+-    manager =
+-        (WeightedLocalityPolicyManager) policyFacade
+-            .getPolicyManager(TEST_QUEUE + 0);
+-    Assert.assertEquals(policyConf, manager.serializeConf());
+-  }
+-
+-  /**
+-   * Test that overwriting policies are updated in the state store.
+-   */
+-  @Test
+-  public void testOverwritePolicy() throws YarnException {
+-    subClusterIds.add(SubClusterId.newInstance("sc3"));
+-    WeightedLocalityPolicyManager manager =
+-        new WeightedLocalityPolicyManager();
+-    manager.setQueue(TEST_QUEUE);
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    SubClusterPolicyConfiguration policyConf = manager.serializeConf();
+-    policyFacade.setPolicyManager(manager);
+-
+-    manager =
+-        (WeightedLocalityPolicyManager) policyFacade
+-            .getPolicyManager(TEST_QUEUE);
+-    Assert.assertEquals(policyConf, manager.serializeConf());
+-  }
+-
+-  /**
+-   * Test that the write through cache works.
+-   */
+-  @Test
+-  public void testWriteCache() throws YarnException {
+-    stateStore = mock(MemoryFederationStateStore.class);
+-    facade.reinitialize(stateStore, conf);
+-    when(stateStore.getPolicyConfiguration(Matchers.any(
+-        GetSubClusterPolicyConfigurationRequest.class))).thenReturn(
+-        GetSubClusterPolicyConfigurationResponse.newInstance(testConf));
+-    policyFacade = new GPGPolicyFacade(facade, conf);
+-
+-    // Query once to fill the cache
+-    FederationPolicyManager manager = policyFacade.getPolicyManager(TEST_QUEUE);
+-    // State store should be contacted once
+-    verify(stateStore, times(1)).getPolicyConfiguration(
+-        Matchers.any(GetSubClusterPolicyConfigurationRequest.class));
+-
+-    // If we set the same policy, the state store should be untouched
+-    policyFacade.setPolicyManager(manager);
+-    verify(stateStore, times(0)).setPolicyConfiguration(
+-        Matchers.any(SetSubClusterPolicyConfigurationRequest.class));
+-  }
+-
+-  /**
+-   * Test that when read only is enabled, the state store is not changed.
+-   */
+-  @Test
+-  public void testReadOnly() throws YarnException {
+-    conf.setBoolean(YarnConfiguration.GPG_POLICY_GENERATOR_READONLY, true);
+-    stateStore = mock(MemoryFederationStateStore.class);
+-    facade.reinitialize(stateStore, conf);
+-    when(stateStore.getPolicyConfiguration(Matchers.any(
+-        GetSubClusterPolicyConfigurationRequest.class))).thenReturn(
+-        GetSubClusterPolicyConfigurationResponse.newInstance(testConf));
+-    policyFacade = new GPGPolicyFacade(facade, conf);
+-
+-    // If we set a policy, the state store should be untouched
+-    WeightedLocalityPolicyManager manager =
+-        new WeightedLocalityPolicyManager();
+-    // Add a test policy for test queue
+-    manager.setQueue(TEST_QUEUE);
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(
+-        GPGUtils.createUniformWeights(subClusterIds));
+-    policyFacade.setPolicyManager(manager);
+-    verify(stateStore, times(0)).setPolicyConfiguration(
+-        Matchers.any(SetSubClusterPolicyConfigurationRequest.class));
+-  }
+-
+-  @Test
+-  public void testGetWeightedLocalityPolicyManager() throws YarnException {
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(new Configuration());
+-
+-    // root.a uses WeightedLocalityPolicyManager.
+-    // Step1. Prepare amRMPolicyWeights and routerPolicyWeights
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights = new HashMap<>();
+-    amrmPolicyWeights.put(new SubClusterIdInfo("SC-1"), 0.7f);
+-    amrmPolicyWeights.put(new SubClusterIdInfo("SC-2"), 0.3f);
+-
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = new HashMap<>();
+-    routerPolicyWeights.put(new SubClusterIdInfo("SC-1"), 0.6f);
+-    routerPolicyWeights.put(new SubClusterIdInfo("SC-2"), 0.4f);
+-
+-    WeightedPolicyInfo weightedPolicyInfo = new WeightedPolicyInfo();
+-    weightedPolicyInfo.setHeadroomAlpha(1);
+-    weightedPolicyInfo.setAMRMPolicyWeights(amrmPolicyWeights);
+-    weightedPolicyInfo.setRouterPolicyWeights(routerPolicyWeights);
+-
+-    // Step2. Set PolicyConfiguration.
+-    String policyManagerType = WeightedLocalityPolicyManager.class.getName();
+-    SubClusterPolicyConfiguration config = SubClusterPolicyConfiguration.newInstance("root.a",
+-        policyManagerType, weightedPolicyInfo.toByteBuffer());
+-    SetSubClusterPolicyConfigurationRequest request =
+-        SetSubClusterPolicyConfigurationRequest.newInstance(config);
+-    stateStore.setPolicyConfiguration(request);
+-
+-    // Step3. Get FederationPolicyManager using policyFacade.
+-    facade.reinitialize(stateStore, conf);
+-    policyFacade = new GPGPolicyFacade(facade, conf);
+-    FederationPolicyManager policyManager = policyFacade.getPolicyManager("root.a");
+-    Assert.assertNotNull(policyManager);
+-    Assert.assertTrue(policyManager.isSupportWeightedPolicyInfo());
+-    WeightedPolicyInfo weightedPolicyInfo1 = policyManager.getWeightedPolicyInfo();
+-    Assert.assertNotNull(weightedPolicyInfo1);
+-    Assert.assertTrue(policyManager instanceof WeightedLocalityPolicyManager);
+-
+-    // Step4. Confirm amrmPolicyWeight is accurate.
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights1 = weightedPolicyInfo1.getAMRMPolicyWeights();
+-    Assert.assertNotNull(amrmPolicyWeights1);
+-    Float sc1Float = amrmPolicyWeights1.get(new SubClusterIdInfo("SC-1"));
+-    Float sc2Float = amrmPolicyWeights1.get(new SubClusterIdInfo("SC-2"));
+-    Assert.assertEquals(0.7, sc1Float, 0.001);
+-    Assert.assertEquals(0.3, sc2Float, 0.001);
+-
+-    // Step5. Confirm amrmPolicyWeight is accurate.
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights1 =
+-        weightedPolicyInfo1.getRouterPolicyWeights();
+-    Assert.assertNotNull(routerPolicyWeights1);
+-    Float sc1Float1 = routerPolicyWeights1.get(new SubClusterIdInfo("SC-1"));
+-    Float sc2Float2 = routerPolicyWeights1.get(new SubClusterIdInfo("SC-2"));
+-    Assert.assertEquals(0.6, sc1Float1, 0.001);
+-    Assert.assertEquals(0.4, sc2Float2, 0.001);
+-  }
+-
+-  @Test
+-  public void testGetWeightedHomePolicyManager() throws YarnException {
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(new Configuration());
+-
+-    // root.b uses WeightedHomePolicyManager.
+-    // Step1. Prepare routerPolicyWeights.
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights = new HashMap<>();
+-    routerPolicyWeights.put(new SubClusterIdInfo("SC-1"), 0.8f);
+-    routerPolicyWeights.put(new SubClusterIdInfo("SC-2"), 0.2f);
+-
+-    WeightedPolicyInfo weightedPolicyInfo = new WeightedPolicyInfo();
+-    weightedPolicyInfo.setHeadroomAlpha(1);
+-    weightedPolicyInfo.setRouterPolicyWeights(routerPolicyWeights);
+-
+-    // Step2. Set PolicyConfiguration.
+-    String policyManagerType = WeightedHomePolicyManager.class.getName();
+-    SubClusterPolicyConfiguration config = SubClusterPolicyConfiguration.newInstance("root.b",
+-        policyManagerType, weightedPolicyInfo.toByteBuffer());
+-    SetSubClusterPolicyConfigurationRequest request =
+-        SetSubClusterPolicyConfigurationRequest.newInstance(config);
+-    stateStore.setPolicyConfiguration(request);
+-
+-    // Step3. Get FederationPolicyManager using policyFacade.
+-    facade.reinitialize(stateStore, conf);
+-    policyFacade = new GPGPolicyFacade(facade, conf);
+-    FederationPolicyManager policyManager = policyFacade.getPolicyManager("root.b");
+-    Assert.assertNotNull(policyManager);
+-    Assert.assertTrue(policyManager.isSupportWeightedPolicyInfo());
+-    WeightedPolicyInfo weightedPolicyInfo1 = policyManager.getWeightedPolicyInfo();
+-    Assert.assertNotNull(weightedPolicyInfo1);
+-
+-    // Step4. Confirm amrmPolicyWeight is accurate.
+-    Map<SubClusterIdInfo, Float> amrmPolicyWeights1 = weightedPolicyInfo1.getAMRMPolicyWeights();
+-    Assert.assertNotNull(amrmPolicyWeights1);
+-    Assert.assertEquals(0, amrmPolicyWeights1.size());
+-
+-    // Step5. Confirm amrmPolicyWeight is accurate.
+-    Map<SubClusterIdInfo, Float> routerPolicyWeights1 =
+-        weightedPolicyInfo1.getRouterPolicyWeights();
+-    Assert.assertNotNull(routerPolicyWeights1);
+-    Float sc1Float1 = routerPolicyWeights1.get(new SubClusterIdInfo("SC-1"));
+-    Float sc2Float2 = routerPolicyWeights1.get(new SubClusterIdInfo("SC-2"));
+-    Assert.assertEquals(0.8, sc1Float1, 0.001);
+-    Assert.assertEquals(0.2, sc2Float2, 0.001);
+-  }
+-
+-  @Test
+-  public void testGetUniformBroadcastPolicyManager() throws Exception {
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(new Configuration());
+-
+-    List<String> notSupportWeightedPolicyInfos = new ArrayList<>();
+-    notSupportWeightedPolicyInfos.add(HashBroadcastPolicyManager.class.getName());
+-    notSupportWeightedPolicyInfos.add(UniformBroadcastPolicyManager.class.getName());
+-    notSupportWeightedPolicyInfos.add(HomePolicyManager.class.getName());
+-    notSupportWeightedPolicyInfos.add(RejectAllPolicyManager.class.getName());
+-    String prefix = "org.apache.hadoop.yarn.server.federation.policies.manager.";
+-
+-    for (String policyManagerType : notSupportWeightedPolicyInfos) {
+-      // root.c uses UniformBroadcastPolicyManager.
+-      // Step1. Prepare routerPolicyWeights.
+-      WeightedPolicyInfo weightedPolicyInfo = new WeightedPolicyInfo();
+-      weightedPolicyInfo.setHeadroomAlpha(1);
+-
+-      // Step2. Set PolicyConfiguration.
+-      SubClusterPolicyConfiguration config = SubClusterPolicyConfiguration.newInstance("root.c",
+-          policyManagerType, weightedPolicyInfo.toByteBuffer());
+-      SetSubClusterPolicyConfigurationRequest request =
+-          SetSubClusterPolicyConfigurationRequest.newInstance(config);
+-      stateStore.setPolicyConfiguration(request);
+-
+-      // Step3. Get FederationPolicyManager using policyFacade.
+-      facade.reinitialize(stateStore, conf);
+-      policyFacade = new GPGPolicyFacade(facade, conf);
+-      FederationPolicyManager policyManager = policyFacade.getPolicyManager("root.c");
+-      Assert.assertNotNull(policyManager);
+-      Assert.assertFalse(policyManager.isSupportWeightedPolicyInfo());
+-      String policyManagerTypeSimple = policyManagerType.replace(prefix, "");
+-      // Verify that PolicyManager is initialized successfully,
+-      // but getWeightedPolicyInfo is not supported.
+-      LambdaTestUtils.intercept(NotImplementedException.class,
+-          policyManagerTypeSimple + " does not implement getWeightedPolicyInfo.",
+-          () -> policyManager.getWeightedPolicyInfo());
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGlobalPolicyGenerator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGlobalPolicyGenerator.java
+deleted file mode 100644
+index a32970488f9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/TestGlobalPolicyGenerator.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- *  Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.service.Service;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.test.LambdaTestUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.junit.Test;
+-
+-import java.io.ByteArrayOutputStream;
+-import java.io.PrintStream;
+-import java.util.List;
+-import java.util.concurrent.TimeoutException;
+-
+-import static org.junit.Assert.assertTrue;
+-
+-/**
+- * Unit test for GlobalPolicyGenerator.
+- */
+-public class TestGlobalPolicyGenerator {
+-
+-  @Test(timeout = 1000)
+-  public void testNonFederation() {
+-    Configuration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, false);
+-
+-    // If GPG starts running, this call will not return
+-    GlobalPolicyGenerator.startGPG(new String[0], conf);
+-  }
+-
+-  @Test
+-  public void testGpgWithFederation() throws InterruptedException, TimeoutException {
+-    // In this test case, we hope that gpg can start normally in federation mode.
+-    Configuration conf = new YarnConfiguration();
+-    conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true);
+-
+-    GlobalPolicyGenerator gpg = new GlobalPolicyGenerator();
+-    gpg.initAndStart(conf, false);
+-
+-    GenericTestUtils.waitFor(() -> {
+-      List<Service> services = gpg.getServices();
+-      return (services.size() == 1 && gpg.getWebApp() != null);
+-    }, 100, 5000);
+-  }
+-
+-  @Test
+-  public void testGPGCLI() {
+-    ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
+-    ByteArrayOutputStream dataErr = new ByteArrayOutputStream();
+-    System.setOut(new PrintStream(dataOut));
+-    System.setErr(new PrintStream(dataErr));
+-    GlobalPolicyGenerator.main(new String[]{"-help", "-format-policy-store"});
+-    assertTrue(dataErr.toString().contains(
+-        "Usage: yarn gpg [-format-policy-store]"));
+-  }
+-
+-  @Test
+-  public void testUserProvidedUGIConf() throws Exception {
+-    String errMsg = "Invalid attribute value for " +
+-        CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION + " of DUMMYAUTH";
+-    Configuration dummyConf = new YarnConfiguration();
+-    dummyConf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, "DUMMYAUTH");
+-    GlobalPolicyGenerator gpg = new GlobalPolicyGenerator();
+-    LambdaTestUtils.intercept(IllegalArgumentException.class, errMsg, () -> gpg.init(dummyConf));
+-    gpg.stop();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/TestDefaultApplicationCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/TestDefaultApplicationCleaner.java
+deleted file mode 100644
+index c028bbdbe2c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/applicationcleaner/TestDefaultApplicationCleaner.java
++++ /dev/null
+@@ -1,204 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.applicationcleaner;
+-
+-import java.util.ArrayList;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Set;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.registry.client.api.RegistryOperations;
+-import org.apache.hadoop.registry.client.impl.FSRegistryOperationsService;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.security.token.Token;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.AddApplicationHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.ApplicationHomeSubCluster;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationsHomeSubClusterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetApplicationsHomeSubClusterResponse;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationRegistryClient;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContextImpl;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Unit test for DefaultApplicationCleaner in GPG.
+- */
+-public class TestDefaultApplicationCleaner {
+-  private Configuration conf;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-  private ApplicationCleaner appCleaner;
+-  private GPGContext gpgContext;
+-  private RegistryOperations registry;
+-  private FederationRegistryClient registryClient;
+-
+-  private List<ApplicationId> appIds;
+-  // The list of applications returned by mocked router
+-  private Set<ApplicationId> routerAppIds;
+-
+-  private ApplicationId appIdToAddConcurrently;
+-
+-  @Before
+-  public void setup() throws Exception {
+-    conf = new YarnConfiguration();
+-
+-    // No Router query retry
+-    conf.set(YarnConfiguration.GPG_APPCLEANER_CONTACT_ROUTER_SPEC, "1,1,0");
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-
+-    facade = FederationStateStoreFacade.getInstance();
+-    facade.reinitialize(stateStore, conf);
+-
+-    registry = new FSRegistryOperationsService();
+-    registry.init(conf);
+-    registry.start();
+-
+-    UserGroupInformation user = UserGroupInformation.getCurrentUser();
+-    registryClient = new FederationRegistryClient(conf, registry, user);
+-    registryClient.cleanAllApplications();
+-    Assert.assertEquals(0, registryClient.getAllApplications().size());
+-
+-    gpgContext = new GPGContextImpl();
+-    gpgContext.setStateStoreFacade(facade);
+-    gpgContext.setRegistryClient(registryClient);
+-
+-    appCleaner = new TestableDefaultApplicationCleaner();
+-    appCleaner.init(conf, gpgContext);
+-
+-    routerAppIds = new HashSet<>();
+-
+-    appIds = new ArrayList<>();
+-    for (int i = 0; i < 3; i++) {
+-      ApplicationId appId = ApplicationId.newInstance(0, i);
+-      appIds.add(appId);
+-
+-      SubClusterId subClusterId =
+-          SubClusterId.newInstance("SUBCLUSTER-" + i);
+-
+-      stateStore.addApplicationHomeSubCluster(
+-          AddApplicationHomeSubClusterRequest.newInstance(
+-              ApplicationHomeSubCluster.newInstance(appId, subClusterId)));
+-
+-      // Write some registry entries for the app
+-      registryClient.writeAMRMTokenForUAM(appId, subClusterId.toString(),
+-          new Token<AMRMTokenIdentifier>());
+-    }
+-    Assert.assertEquals(3, registryClient.getAllApplications().size());
+-    appIdToAddConcurrently = null;
+-  }
+-
+-  @After
+-  public void breakDown() {
+-    if (stateStore != null) {
+-      stateStore.close();
+-      stateStore = null;
+-    }
+-    if (registryClient != null) {
+-      registryClient.cleanAllApplications();
+-      registryClient = null;
+-    }
+-    if (registry != null) {
+-      registry.stop();
+-      registry = null;
+-    }
+-  }
+-
+-  @Test
+-  public void testFederationStateStoreAppsCleanUp() throws YarnException {
+-    // Set first app to be still known by Router
+-    ApplicationId appId = appIds.get(0);
+-    routerAppIds.add(appId);
+-
+-    // Another random app not in stateStore known by Router
+-    appId = ApplicationId.newInstance(100, 200);
+-    routerAppIds.add(appId);
+-
+-    appCleaner.run();
+-
+-    // Only one app should be left
+-    Assert.assertEquals(1,
+-        stateStore
+-            .getApplicationsHomeSubCluster(
+-                GetApplicationsHomeSubClusterRequest.newInstance())
+-            .getAppsHomeSubClusters().size());
+-
+-    // The known app should not be cleaned in registry
+-    Assert.assertEquals(1, registryClient.getAllApplications().size());
+-  }
+-
+-  /**
+-   * Testable version of DefaultApplicationCleaner.
+-   */
+-  public class TestableDefaultApplicationCleaner
+-      extends DefaultApplicationCleaner {
+-    @Override
+-    public Set<ApplicationId> getAppsFromRouter() throws YarnRuntimeException {
+-      if (appIdToAddConcurrently != null) {
+-        SubClusterId scId = SubClusterId.newInstance("MySubClusterId");
+-        try {
+-          ApplicationHomeSubCluster appHomeSubCluster =
+-              ApplicationHomeSubCluster.newInstance(appIdToAddConcurrently, scId);
+-          AddApplicationHomeSubClusterRequest request =
+-              AddApplicationHomeSubClusterRequest.newInstance(appHomeSubCluster);
+-          stateStore.addApplicationHomeSubCluster(request);
+-        } catch (YarnException e) {
+-          throw new YarnRuntimeException(e);
+-        }
+-        registryClient.writeAMRMTokenForUAM(appIdToAddConcurrently, scId.toString(),
+-            new Token<>());
+-      }
+-      return routerAppIds;
+-    }
+-  }
+-
+-  @Test
+-  public void testConcurrentNewApp() throws YarnException {
+-    appIdToAddConcurrently = ApplicationId.newInstance(1, 1);
+-
+-    appCleaner.run();
+-
+-    // The concurrently added app should be still there
+-    GetApplicationsHomeSubClusterRequest appHomeSubClusterRequest =
+-         GetApplicationsHomeSubClusterRequest.newInstance();
+-    GetApplicationsHomeSubClusterResponse applicationsHomeSubCluster =
+-        stateStore.getApplicationsHomeSubCluster(appHomeSubClusterRequest);
+-    Assert.assertNotNull(applicationsHomeSubCluster);
+-    List<ApplicationHomeSubCluster> appsHomeSubClusters =
+-        applicationsHomeSubCluster.getAppsHomeSubClusters();
+-    Assert.assertNotNull(appsHomeSubClusters);
+-    Assert.assertEquals(1, appsHomeSubClusters.size());
+-
+-    // The concurrently added app should be still there
+-    Assert.assertEquals(1, registryClient.getAllApplications().size());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestLoadBasedGlobalPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestLoadBasedGlobalPolicy.java
+deleted file mode 100644
+index df58b30aaaa..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestLoadBasedGlobalPolicy.java
++++ /dev/null
+@@ -1,206 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterIdInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MAX_EDIT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MIN_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MAX_PENDING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.FEDERATION_GPG_LOAD_BASED_SCALING;
+-import static org.apache.hadoop.yarn.conf.YarnConfiguration.DEFAULT_FEDERATION_GPG_LOAD_BASED_SCALING;
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertTrue;
+-
+-/**
+- * Unit test for the Load Based Global Policy.
+- */
+-public class TestLoadBasedGlobalPolicy {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(TestLoadBasedGlobalPolicy.class);
+-
+-  private static final int NUM_SC = 3;
+-  private static final float DELTA = 0.00001f;
+-
+-  private static final int MIN_PENDING = 100;
+-  private static final int MAX_PENDING = 500;
+-
+-  private List<SubClusterId> subClusterIds;
+-  private Map<SubClusterId, ClusterMetricsInfo> clusterMetricsInfos;
+-  private Map<SubClusterIdInfo, Float> weights;
+-
+-  private final Configuration conf;
+-  private final LoadBasedGlobalPolicy policyGenerator;
+-
+-  public TestLoadBasedGlobalPolicy() {
+-    conf = new Configuration();
+-    policyGenerator = new LoadBasedGlobalPolicy();
+-  }
+-
+-  @Before
+-  public void setUp() {
+-
+-    conf.setInt(FEDERATION_GPG_LOAD_BASED_MAX_EDIT, 2);
+-    conf.setInt(FEDERATION_GPG_LOAD_BASED_MIN_PENDING, MIN_PENDING);
+-    conf.setInt(FEDERATION_GPG_LOAD_BASED_MAX_PENDING, MAX_PENDING);
+-    conf.setFloat(FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT, 0.0f);
+-    conf.set(FEDERATION_GPG_LOAD_BASED_SCALING, LoadBasedGlobalPolicy.Scaling.LINEAR.name());
+-    policyGenerator.setConf(conf);
+-
+-    subClusterIds = new ArrayList<>();
+-    clusterMetricsInfos = new HashMap<>();
+-    // Set up sub clusters
+-    for (int i = 0; i < NUM_SC; ++i) {
+-      // subClusterId
+-      SubClusterId id = SubClusterId.newInstance("sc" + i);
+-      subClusterIds.add(id);
+-
+-      // Cluster metrics info
+-      ClusterMetricsInfo metricsInfo = new ClusterMetricsInfo();
+-      metricsInfo.setAppsPending(50);
+-      clusterMetricsInfos.put(id, metricsInfo);
+-    }
+-  }
+-
+-  @Test
+-  public void testSimpleTargetWeights() {
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(1.0, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-  }
+-
+-  @Test
+-  public void testLoadTargetWeights() {
+-    getMetric(0).setAppsPending(100);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(1.0, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-    getMetric(0).setAppsPending(500);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(0.0, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-  }
+-
+-  @Test
+-  public void testMaxEdit() {
+-    // The policy should be able to edit 2 weights
+-    getMetric(0).setAppsPending(MAX_PENDING + 200);
+-    getMetric(1).setAppsPending(MAX_PENDING + 100);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(0.0, getWeight(0), DELTA);
+-    assertEquals(0.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-    // After updating the config, it should only edit the most loaded
+-    conf.setInt(FEDERATION_GPG_LOAD_BASED_MAX_EDIT, 1);
+-    policyGenerator.setConf(conf);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(0.0, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-  }
+-
+-  @Test
+-  public void testMinWeight() {
+-    // If a minimum weight is set, the generator should not go below it
+-    conf.setFloat(FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT, 0.5f);
+-    policyGenerator.setConf(conf);
+-    getMetric(0).setAppsPending(Integer.MAX_VALUE);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(0.5, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-  }
+-
+-  @Test
+-  public void testScaling() {
+-    LOG.info("Testing that the generator weights are monotonically"
+-        + " decreasing regardless of scaling method");
+-    for (LoadBasedGlobalPolicy.Scaling scaling :
+-        new LoadBasedGlobalPolicy.Scaling[] {LoadBasedGlobalPolicy.Scaling.LINEAR,
+-            LoadBasedGlobalPolicy.Scaling.QUADRATIC, LoadBasedGlobalPolicy.Scaling.LOG }) {
+-      LOG.info("Testing {} scaling...", scaling);
+-      conf.set(DEFAULT_FEDERATION_GPG_LOAD_BASED_SCALING, scaling.name());
+-      policyGenerator.setConf(conf);
+-      // Test a continuous range for scaling
+-      float prevWeight = 1.01f;
+-      for (int load = 0; load < MAX_PENDING * 2; ++load) {
+-        getMetric(0).setAppsPending(load);
+-        weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-        if (load < MIN_PENDING) {
+-          // Below the minimum load, it should stay 1.0f
+-          assertEquals(1.0f, getWeight(0), DELTA);
+-        } else if (load < MAX_PENDING) {
+-          // In the specified range, the weight should consistently decrease
+-          float weight = getWeight(0);
+-          assertTrue(weight < prevWeight);
+-          prevWeight = weight;
+-        } else {
+-          // Above the maximum load, it should stay 0.0f
+-          assertEquals(0.0f, getWeight(0), DELTA);
+-        }
+-      }
+-    }
+-  }
+-
+-  @Test
+-  public void testNonZero() {
+-    // If all generated weights are zero, they should be set back to one
+-    conf.setFloat(FEDERATION_GPG_LOAD_BASED_MIN_WEIGHT, 0.0f);
+-    conf.setInt(FEDERATION_GPG_LOAD_BASED_MAX_EDIT, 3);
+-    policyGenerator.setConf(conf);
+-    getMetric(0).setAppsPending(Integer.MAX_VALUE);
+-    getMetric(1).setAppsPending(Integer.MAX_VALUE);
+-    getMetric(2).setAppsPending(Integer.MAX_VALUE);
+-    weights = policyGenerator.getTargetWeights(clusterMetricsInfos);
+-    assertEquals(weights.size(), 3);
+-    assertEquals(1.0, getWeight(0), DELTA);
+-    assertEquals(1.0, getWeight(1), DELTA);
+-    assertEquals(1.0, getWeight(2), DELTA);
+-  }
+-
+-  private float getWeight(int sc) {
+-    return weights.get(new SubClusterIdInfo(subClusterIds.get(sc)));
+-  }
+-
+-  private ClusterMetricsInfo getMetric(int sc) {
+-    return clusterMetricsInfos.get(subClusterIds.get(sc));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestPolicyGenerator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestPolicyGenerator.java
+deleted file mode 100644
+index 446eeee2cd9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/policygenerator/TestPolicyGenerator.java
++++ /dev/null
+@@ -1,392 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.policygenerator;
+-
+-import com.sun.jersey.api.json.JSONConfiguration;
+-import com.sun.jersey.api.json.JSONJAXBContext;
+-import com.sun.jersey.api.json.JSONUnmarshaller;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.net.NetUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.FederationPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.policies.manager.WeightedLocalityPolicyManager;
+-import org.apache.hadoop.yarn.server.federation.store.FederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClusterPolicyConfigurationResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.GetSubClustersInfoResponse;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterPolicyConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContextImpl;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGPolicyFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGUtils;
+-import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
+-import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWSConsts;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfoList;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfo;
+-import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-import org.mockito.ArgumentCaptor;
+-
+-import javax.xml.bind.JAXBException;
+-import java.io.IOException;
+-import java.io.StringReader;
+-import java.net.InetSocketAddress;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.mockito.Matchers.any;
+-import static org.mockito.Matchers.eq;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.times;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Unit test for GPG Policy Generator.
+- */
+-public class TestPolicyGenerator {
+-
+-  private static final int NUM_SC = 3;
+-
+-  private Configuration conf;
+-  private FederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-
+-  private List<SubClusterId> subClusterIds;
+-  private Map<SubClusterId, SubClusterInfo> subClusterInfos;
+-  private Map<SubClusterId, Map<Class, Object>> clusterInfos;
+-  private Map<SubClusterId, SchedulerInfo> schedulerInfos;
+-
+-  private GPGContext gpgContext;
+-
+-  private PolicyGenerator policyGenerator;
+-
+-  public TestPolicyGenerator() {
+-    conf = new Configuration();
+-    conf.setInt(YarnConfiguration.FEDERATION_CACHE_TIME_TO_LIVE_SECS, 0);
+-    facade = FederationStateStoreFacade.getInstance(conf);
+-    gpgContext = new GPGContextImpl();
+-    gpgContext.setPolicyFacade(new GPGPolicyFacade(facade, conf));
+-    gpgContext.setStateStoreFacade(facade);
+-
+-  }
+-
+-  @Before
+-  public void setUp() throws IOException, YarnException, JAXBException {
+-    subClusterIds = new ArrayList<>();
+-    subClusterInfos = new HashMap<>();
+-    clusterInfos = new HashMap<>();
+-    schedulerInfos = new HashMap<>();
+-
+-    CapacitySchedulerInfo sti1 =
+-        readJSON("src/test/resources/schedulerInfo1.json",
+-            CapacitySchedulerInfo.class);
+-    CapacitySchedulerInfo sti2 =
+-        readJSON("src/test/resources/schedulerInfo2.json",
+-            CapacitySchedulerInfo.class);
+-
+-    // Set up sub clusters
+-    for (int i = 0; i < NUM_SC; ++i) {
+-      // Sub cluster Id
+-      SubClusterId id = SubClusterId.newInstance("sc" + i);
+-      subClusterIds.add(id);
+-
+-      // Sub cluster info
+-      SubClusterInfo cluster = SubClusterInfo
+-          .newInstance(id, "amrm:" + i, "clientrm:" + i, "rmadmin:" + i,
+-              "rmweb:" + i, SubClusterState.SC_RUNNING, 0, "");
+-      subClusterInfos.put(id, cluster);
+-
+-      // Cluster metrics info
+-      ClusterMetricsInfo metricsInfo = new ClusterMetricsInfo();
+-      metricsInfo.setAppsPending(2000);
+-      if (!clusterInfos.containsKey(id)) {
+-        clusterInfos.put(id, new HashMap<Class, Object>());
+-      }
+-      clusterInfos.get(id).put(ClusterMetricsInfo.class, metricsInfo);
+-
+-      schedulerInfos.put(id, sti1);
+-    }
+-
+-    // Change one of the sub cluster schedulers
+-    schedulerInfos.put(subClusterIds.get(0), sti2);
+-
+-    stateStore = mock(FederationStateStore.class);
+-    when(stateStore.getSubClusters(any()))
+-        .thenReturn(GetSubClustersInfoResponse.newInstance(
+-        new ArrayList<>(subClusterInfos.values())));
+-    facade.reinitialize(stateStore, conf);
+-  }
+-
+-  @After
+-  public void tearDown() throws Exception {
+-    stateStore.close();
+-    stateStore = null;
+-  }
+-
+-  private <T> T readJSON(String pathname, Class<T> classy)
+-      throws IOException, JAXBException {
+-
+-    JSONJAXBContext jc =
+-        new JSONJAXBContext(JSONConfiguration.mapped().build(), classy);
+-    JSONUnmarshaller unmarshaller = jc.createJSONUnmarshaller();
+-    String contents = new String(Files.readAllBytes(Paths.get(pathname)));
+-    return unmarshaller.unmarshalFromJSON(new StringReader(contents), classy);
+-
+-  }
+-
+-  @Test
+-  public void testPolicyGenerator() throws YarnException {
+-    policyGenerator = new TestablePolicyGenerator();
+-    policyGenerator.setPolicy(mock(GlobalPolicy.class));
+-    policyGenerator.run();
+-    verify(policyGenerator.getPolicy(), times(1))
+-        .updatePolicy("default", clusterInfos, null);
+-    verify(policyGenerator.getPolicy(), times(1))
+-        .updatePolicy("default2", clusterInfos, null);
+-  }
+-
+-  @Test
+-  public void testBlacklist() throws YarnException {
+-    conf.set(YarnConfiguration.GPG_POLICY_GENERATOR_BLACKLIST,
+-        subClusterIds.get(0).toString());
+-    Map<SubClusterId, Map<Class, Object>> blacklistedCMI =
+-        new HashMap<>(clusterInfos);
+-    blacklistedCMI.remove(subClusterIds.get(0));
+-    policyGenerator = new TestablePolicyGenerator();
+-    policyGenerator.setPolicy(mock(GlobalPolicy.class));
+-    policyGenerator.run();
+-    verify(policyGenerator.getPolicy(), times(1))
+-        .updatePolicy("default", blacklistedCMI, null);
+-    verify(policyGenerator.getPolicy(), times(0))
+-        .updatePolicy("default", clusterInfos, null);
+-  }
+-
+-  @Test
+-  public void testBlacklistTwo() throws YarnException {
+-    conf.set(YarnConfiguration.GPG_POLICY_GENERATOR_BLACKLIST,
+-        subClusterIds.get(0).toString() + "," + subClusterIds.get(1)
+-            .toString());
+-    Map<SubClusterId, Map<Class, Object>> blacklistedCMI =
+-        new HashMap<>(clusterInfos);
+-    blacklistedCMI.remove(subClusterIds.get(0));
+-    blacklistedCMI.remove(subClusterIds.get(1));
+-    policyGenerator = new TestablePolicyGenerator();
+-    policyGenerator.setPolicy(mock(GlobalPolicy.class));
+-    policyGenerator.run();
+-    verify(policyGenerator.getPolicy(), times(1))
+-        .updatePolicy("default", blacklistedCMI, null);
+-    verify(policyGenerator.getPolicy(), times(0))
+-        .updatePolicy("default", clusterInfos, null);
+-  }
+-
+-  @Test
+-  public void testExistingPolicy() throws YarnException {
+-    WeightedLocalityPolicyManager manager = new WeightedLocalityPolicyManager();
+-    // Add a test policy for test queue
+-    manager.setQueue("default");
+-    manager.getWeightedPolicyInfo().setAMRMPolicyWeights(GPGUtils
+-        .createUniformWeights(new HashSet<>(subClusterIds)));
+-    manager.getWeightedPolicyInfo().setRouterPolicyWeights(GPGUtils
+-        .createUniformWeights(new HashSet<>(subClusterIds)));
+-    SubClusterPolicyConfiguration testConf = manager.serializeConf();
+-    when(stateStore.getPolicyConfiguration(
+-        GetSubClusterPolicyConfigurationRequest.newInstance("default")))
+-        .thenReturn(
+-            GetSubClusterPolicyConfigurationResponse.newInstance(testConf));
+-
+-    policyGenerator = new TestablePolicyGenerator();
+-    policyGenerator.setPolicy(mock(GlobalPolicy.class));
+-    policyGenerator.run();
+-
+-    ArgumentCaptor<FederationPolicyManager> argCaptor =
+-        ArgumentCaptor.forClass(FederationPolicyManager.class);
+-    verify(policyGenerator.getPolicy(), times(1))
+-        .updatePolicy(eq("default"), eq(clusterInfos), argCaptor.capture());
+-    assertEquals(argCaptor.getValue().getClass(), manager.getClass());
+-    assertEquals(argCaptor.getValue().serializeConf(), manager.serializeConf());
+-  }
+-
+-  @Test
+-  public void testCallRM() {
+-
+-    CapacitySchedulerConfiguration csConf =
+-        new CapacitySchedulerConfiguration();
+-
+-    final String a = CapacitySchedulerConfiguration.ROOT + ".a";
+-    final String b = CapacitySchedulerConfiguration.ROOT + ".b";
+-    final String a1 = a + ".a1";
+-    final String a2 = a + ".a2";
+-    final String b1 = b + ".b1";
+-    final String b2 = b + ".b2";
+-    final String b3 = b + ".b3";
+-    float aCapacity = 10.5f;
+-    float bCapacity = 89.5f;
+-    float a1Capacity = 30;
+-    float a2Capacity = 70;
+-    float b1Capacity = 79.2f;
+-    float b2Capacity = 0.8f;
+-    float b3Capacity = 20;
+-
+-    // Define top-level queues
+-    csConf.setQueues(CapacitySchedulerConfiguration.ROOT,
+-        new String[] {"a", "b"});
+-
+-    csConf.setCapacity(a, aCapacity);
+-    csConf.setCapacity(b, bCapacity);
+-
+-    // Define 2nd-level queues
+-    csConf.setQueues(a, new String[] {"a1", "a2"});
+-    csConf.setCapacity(a1, a1Capacity);
+-    csConf.setUserLimitFactor(a1, 100.0f);
+-    csConf.setCapacity(a2, a2Capacity);
+-    csConf.setUserLimitFactor(a2, 100.0f);
+-
+-    csConf.setQueues(b, new String[] {"b1", "b2", "b3"});
+-    csConf.setCapacity(b1, b1Capacity);
+-    csConf.setUserLimitFactor(b1, 100.0f);
+-    csConf.setCapacity(b2, b2Capacity);
+-    csConf.setUserLimitFactor(b2, 100.0f);
+-    csConf.setCapacity(b3, b3Capacity);
+-    csConf.setUserLimitFactor(b3, 100.0f);
+-
+-    YarnConfiguration rmConf = new YarnConfiguration(csConf);
+-
+-    ResourceManager resourceManager = new ResourceManager();
+-    rmConf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
+-        ResourceScheduler.class);
+-    resourceManager.init(rmConf);
+-    resourceManager.start();
+-
+-    String rmAddress = WebAppUtils.getRMWebAppURLWithScheme(this.conf);
+-    String webAppAddress = getServiceAddress(NetUtils.createSocketAddr(rmAddress));
+-
+-    SchedulerTypeInfo sti = GPGUtils.invokeRMWebService(webAppAddress, RMWSConsts.SCHEDULER,
+-        SchedulerTypeInfo.class, conf);
+-
+-    Assert.assertNotNull(sti);
+-    SchedulerInfo schedulerInfo = sti.getSchedulerInfo();
+-    Assert.assertTrue(schedulerInfo instanceof CapacitySchedulerInfo);
+-
+-    CapacitySchedulerInfo capacitySchedulerInfo = (CapacitySchedulerInfo) schedulerInfo;
+-    Assert.assertNotNull(capacitySchedulerInfo);
+-
+-    CapacitySchedulerQueueInfoList queues = capacitySchedulerInfo.getQueues();
+-    Assert.assertNotNull(queues);
+-    ArrayList<CapacitySchedulerQueueInfo> queueInfoList = queues.getQueueInfoList();
+-    Assert.assertNotNull(queueInfoList);
+-    Assert.assertEquals(2, queueInfoList.size());
+-
+-    CapacitySchedulerQueueInfo queueA = queueInfoList.get(0);
+-    Assert.assertNotNull(queueA);
+-    Assert.assertEquals("root.a", queueA.getQueuePath());
+-    Assert.assertEquals(10.5f, queueA.getCapacity(), 0.00001);
+-    CapacitySchedulerQueueInfoList queueAQueues = queueA.getQueues();
+-    Assert.assertNotNull(queueAQueues);
+-    ArrayList<CapacitySchedulerQueueInfo> queueInfoAList = queueAQueues.getQueueInfoList();
+-    Assert.assertNotNull(queueInfoAList);
+-    Assert.assertEquals(2, queueInfoAList.size());
+-    CapacitySchedulerQueueInfo queueA1 = queueInfoAList.get(0);
+-    Assert.assertNotNull(queueA1);
+-    Assert.assertEquals(30f, queueA1.getCapacity(), 0.00001);
+-    CapacitySchedulerQueueInfo queueA2 = queueInfoAList.get(1);
+-    Assert.assertNotNull(queueA2);
+-    Assert.assertEquals(70f, queueA2.getCapacity(), 0.00001);
+-
+-    CapacitySchedulerQueueInfo queueB = queueInfoList.get(1);
+-    Assert.assertNotNull(queueB);
+-    Assert.assertEquals("root.b", queueB.getQueuePath());
+-    Assert.assertEquals(89.5f, queueB.getCapacity(), 0.00001);
+-    CapacitySchedulerQueueInfoList queueBQueues = queueB.getQueues();
+-    Assert.assertNotNull(queueBQueues);
+-    ArrayList<CapacitySchedulerQueueInfo> queueInfoBList = queueBQueues.getQueueInfoList();
+-    Assert.assertNotNull(queueInfoBList);
+-    Assert.assertEquals(3, queueInfoBList.size());
+-    CapacitySchedulerQueueInfo queueB1 = queueInfoBList.get(0);
+-    Assert.assertNotNull(queueB1);
+-    Assert.assertEquals(79.2f, queueB1.getCapacity(), 0.00001);
+-    CapacitySchedulerQueueInfo queueB2 = queueInfoBList.get(1);
+-    Assert.assertNotNull(queueB2);
+-    Assert.assertEquals(0.8f, queueB2.getCapacity(), 0.00001);
+-    CapacitySchedulerQueueInfo queueB3 = queueInfoBList.get(2);
+-    Assert.assertNotNull(queueB3);
+-    Assert.assertEquals(20f, queueB3.getCapacity(), 0.00001);
+-  }
+-
+-  private String getServiceAddress(InetSocketAddress address) {
+-    InetSocketAddress socketAddress = NetUtils.getConnectAddress(address);
+-    return socketAddress.getAddress().getHostAddress() + ":" + socketAddress.getPort();
+-  }
+-
+-  /**
+-   * Testable policy generator overrides the methods that communicate
+-   * with the RM REST endpoint, allowing us to inject faked responses.
+-   */
+-  class TestablePolicyGenerator extends PolicyGenerator {
+-
+-    TestablePolicyGenerator() {
+-      super(conf, gpgContext);
+-    }
+-
+-    @Override
+-    protected Map<SubClusterId, Map<Class, Object>> getInfos(
+-        Map<SubClusterId, SubClusterInfo> activeSubClusters) {
+-      Map<SubClusterId, Map<Class, Object>> ret = new HashMap<>();
+-      for (SubClusterId id : activeSubClusters.keySet()) {
+-        if (!ret.containsKey(id)) {
+-          ret.put(id, new HashMap<>());
+-        }
+-        ret.get(id).put(ClusterMetricsInfo.class,
+-            clusterInfos.get(id).get(ClusterMetricsInfo.class));
+-      }
+-      return ret;
+-    }
+-
+-    @Override
+-    protected Map<SubClusterId, SchedulerInfo> getSchedulerInfo(
+-        Map<SubClusterId, SubClusterInfo> activeSubClusters) {
+-      Map<SubClusterId, SchedulerInfo> ret = new HashMap<>();
+-      for (SubClusterId id : activeSubClusters.keySet()) {
+-        ret.put(id, schedulerInfos.get(id));
+-      }
+-      return ret;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/AbstractGlobalPolicyGeneratorTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/AbstractGlobalPolicyGeneratorTest.java
+deleted file mode 100644
+index 03a8e8f22c3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/AbstractGlobalPolicyGeneratorTest.java
++++ /dev/null
+@@ -1,177 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.secure;
+-
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.minikdc.MiniKdc;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.junit.BeforeClass;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.util.Properties;
+-
+-import static org.junit.Assert.assertNotNull;
+-import static org.junit.Assert.assertNull;
+-import static org.junit.Assert.assertTrue;
+-
+-public abstract class AbstractGlobalPolicyGeneratorTest {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(AbstractGlobalPolicyGeneratorTest.class);
+-
+-  ////////////////////////////////
+-  // Kerberos Constants
+-  ////////////////////////////////
+-
+-  public static final String REALM = "EXAMPLE.COM";
+-  public static final String GPG = "gpg";
+-  public static final String LOCALHOST = "localhost";
+-  public static final String IP127001 = "127.0.0.1";
+-  public static final String GPG_LOCALHOST = "gpg/" + LOCALHOST;
+-  public static final String GPG_LOCALHOST_REALM = GPG_LOCALHOST + "@" + REALM;
+-  public static final String SUN_SECURITY_KRB5_DEBUG = "sun.security.krb5.debug";
+-  public static final String KERBEROS = "kerberos";
+-
+-  ////////////////////////////////
+-  // BeforeSecureRouterTestClass Init
+-  ////////////////////////////////
+-
+-  private static MiniKdc kdc;
+-  private static File routerKeytab;
+-  private static File kdcWorkDir;
+-  private static Configuration conf;
+-  private GlobalPolicyGenerator gpg;
+-
+-  @BeforeClass
+-  public static void beforeSecureRouterTestClass() throws Exception {
+-    // Sets up the KDC and Principals.
+-    setupKDCAndPrincipals();
+-
+-    // Init YarnConfiguration
+-    conf = new YarnConfiguration();
+-
+-    // Enable Kerberos authentication configuration
+-    conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, true);
+-    conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, KERBEROS);
+-
+-    // Router Kerberos KeyTab configuration
+-    conf.set(YarnConfiguration.GPG_PRINCIPAL, GPG_LOCALHOST_REALM);
+-    conf.set(YarnConfiguration.GPG_KEYTAB, routerKeytab.getAbsolutePath());
+-
+-    DefaultMetricsSystem.setMiniClusterMode(true);
+-  }
+-
+-  /**
+-   * Sets up the KDC and Principals.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public static void setupKDCAndPrincipals() throws Exception {
+-    // set up the KDC
+-    File target = new File(System.getProperty("test.dir", "target"));
+-    kdcWorkDir = new File(target, "kdc");
+-    kdcWorkDir.mkdirs();
+-    if (!kdcWorkDir.mkdirs()) {
+-      assertTrue(kdcWorkDir.isDirectory());
+-    }
+-    Properties kdcConf = MiniKdc.createConf();
+-    kdcConf.setProperty(MiniKdc.DEBUG, "true");
+-    kdc = new MiniKdc(kdcConf, kdcWorkDir);
+-    kdc.start();
+-    routerKeytab = createKeytab(GPG, "gpg.keytab");
+-  }
+-
+-  /**
+-   * Create the keytab for the given principal, includes
+-   * raw principal and $principal/localhost.
+-   *
+-   * @param principal principal short name.
+-   * @param filename filename of keytab.
+-   * @return file of keytab.
+-   * @throws Exception an error occurred.
+-   */
+-  public static File createKeytab(String principal, String filename) throws Exception {
+-    assertTrue("empty principal", StringUtils.isNotBlank(principal));
+-    assertTrue("empty host", StringUtils.isNotBlank(filename));
+-    assertNotNull("null KDC", kdc);
+-    File keytab = new File(kdcWorkDir, filename);
+-    kdc.createPrincipal(keytab,
+-        principal,
+-        principal + "/localhost",
+-        principal + "/127.0.0.1");
+-    return keytab;
+-  }
+-
+-  /**
+-   * Start the router in safe mode.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public synchronized void startSecureGPG() {
+-    assertNull("GPG is already running", gpg);
+-    MemoryFederationStateStore stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-    FederationStateStoreFacade.getInstance(conf).reinitialize(stateStore, conf);
+-    UserGroupInformation.setConfiguration(conf);
+-    gpg = new GlobalPolicyGenerator();
+-    gpg.init(conf);
+-    gpg.start();
+-  }
+-
+-  /**
+-   * Shut down the KDC service.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  public static void teardownKDC() throws Exception {
+-    if (kdc != null) {
+-      kdc.stop();
+-      kdc = null;
+-    }
+-  }
+-
+-  public GlobalPolicyGenerator getGpg() {
+-    return gpg;
+-  }
+-
+-  public static MiniKdc getKdc() {
+-    return kdc;
+-  }
+-
+-  /**
+-   * Stop the router in safe mode.
+-   *
+-   * @throws Exception an error occurred.
+-   */
+-  protected synchronized void stopSecureRouter() throws Exception {
+-    if (gpg != null) {
+-      gpg.stop();
+-      gpg = null;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/TestGpgSecureLogins.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/TestGpgSecureLogins.java
+deleted file mode 100644
+index 990a587db50..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/secure/TestGpgSecureLogins.java
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.secure;
+-
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.junit.Assert;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-public class TestGpgSecureLogins extends AbstractGlobalPolicyGeneratorTest {
+-  private static final Logger LOG = LoggerFactory.getLogger(TestGpgSecureLogins.class);
+-
+-  @Test
+-  public void testHasRealm() throws Throwable {
+-    Assert.assertNotNull(getRealm());
+-    LOG.info("Router principal = {}", getPrincipalAndRealm(GPG_LOCALHOST));
+-  }
+-
+-  @Test
+-  public void testRouterSecureLogin() throws Exception {
+-    startSecureGPG();
+-    GPGContext gpgContext = this.getGpg().getGPGContext();
+-    Assert.assertNotNull(gpgContext);
+-    stopSecureRouter();
+-  }
+-
+-  public static String getPrincipalAndRealm(String principal) {
+-    return principal + "@" + getRealm();
+-  }
+-
+-  protected static String getRealm() {
+-    return getKdc().getRealm();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/TestSubClusterCleaner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/TestSubClusterCleaner.java
+deleted file mode 100644
+index 996aea820a8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/subclustercleaner/TestSubClusterCleaner.java
++++ /dev/null
+@@ -1,121 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.subclustercleaner;
+-
+-import java.util.ArrayList;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.federation.store.impl.MemoryFederationStateStore;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterHeartbeatRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterInfo;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterRegisterRequest;
+-import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState;
+-import org.apache.hadoop.yarn.server.federation.utils.FederationStateStoreFacade;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContextImpl;
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-/**
+- * Unit test for Sub-cluster Cleaner in GPG.
+- */
+-public class TestSubClusterCleaner {
+-
+-  private Configuration conf;
+-  private MemoryFederationStateStore stateStore;
+-  private FederationStateStoreFacade facade;
+-  private SubClusterCleaner cleaner;
+-  private GPGContext gpgContext;
+-
+-  private static final long TWO_SECONDS = TimeUnit.SECONDS.toMillis(2);
+-
+-  private ArrayList<SubClusterId> subClusterIds;
+-
+-  @Before
+-  public void setup() throws YarnException {
+-    conf = new YarnConfiguration();
+-
+-    // subcluster expires in one second
+-    conf.setLong(YarnConfiguration.GPG_SUBCLUSTER_EXPIRATION_MS, 1000);
+-
+-    stateStore = new MemoryFederationStateStore();
+-    stateStore.init(conf);
+-
+-    facade = FederationStateStoreFacade.getInstance(conf);
+-    facade.reinitialize(stateStore, conf);
+-
+-    gpgContext = new GPGContextImpl();
+-    gpgContext.setStateStoreFacade(facade);
+-
+-    cleaner = new SubClusterCleaner(conf, gpgContext);
+-
+-    // Create and register six sub clusters
+-    subClusterIds = new ArrayList<SubClusterId>();
+-    for (int i = 0; i < 3; i++) {
+-      // Create sub cluster id and info
+-      SubClusterId subClusterId =
+-          SubClusterId.newInstance("SUBCLUSTER-" + Integer.toString(i));
+-
+-      SubClusterInfo subClusterInfo = SubClusterInfo.newInstance(subClusterId,
+-          "1.2.3.4:1", "1.2.3.4:2", "1.2.3.4:3", "1.2.3.4:4",
+-          SubClusterState.SC_RUNNING, System.currentTimeMillis(), "");
+-      // Register the sub cluster
+-      stateStore.registerSubCluster(
+-          SubClusterRegisterRequest.newInstance(subClusterInfo));
+-      // Append the id to a local list
+-      subClusterIds.add(subClusterId);
+-    }
+-  }
+-
+-  @After
+-  public void breakDown() throws Exception {
+-    stateStore.close();
+-  }
+-
+-  @Test
+-  public void testSubClusterRegisterHeartBeatTime() throws YarnException {
+-    cleaner.run();
+-    Assert.assertEquals(3, facade.getSubClusters(true, true).size());
+-  }
+-
+-  /**
+-   * Test the base use case.
+-   */
+-  @Test
+-  public void testSubClusterHeartBeat() throws YarnException {
+-    // The first subcluster reports as Unhealthy
+-    SubClusterId subClusterId = subClusterIds.get(0);
+-    stateStore.subClusterHeartbeat(SubClusterHeartbeatRequest
+-        .newInstance(subClusterId, SubClusterState.SC_UNHEALTHY, "capacity"));
+-
+-    // The second subcluster didn't heartbeat for two seconds, should mark lost
+-    subClusterId = subClusterIds.get(1);
+-    stateStore.setSubClusterLastHeartbeat(subClusterId,
+-        System.currentTimeMillis() - TWO_SECONDS);
+-
+-    cleaner.run();
+-    Assert.assertEquals(1, facade.getSubClusters(true, true).size());
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebApp.java
+deleted file mode 100644
+index 418a0716b4c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebApp.java
++++ /dev/null
+@@ -1,51 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.webapp.test.WebAppTests;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-public class TestGPGWebApp {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(TestGPGWebApp.class);
+-
+-  @Test
+-  public void testGPGPoliciesPageWebView()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testGPGPoliciesPageWebView.");
+-    WebAppTests.testPage(GPGPoliciesPage.class, GlobalPolicyGenerator.class,
+-        new GlobalPolicyGenerator());
+-  }
+-
+-  @Test
+-  public void testGPGOverview()
+-      throws InterruptedException, YarnException, IOException {
+-    LOG.info("testGPGOverview.");
+-    GlobalPolicyGenerator globalPolicyGenerator = new GlobalPolicyGenerator();
+-    globalPolicyGenerator.setConfig(new Configuration());
+-    WebAppTests.testPage(GPGOverviewPage.class, GlobalPolicyGenerator.class,
+-        globalPolicyGenerator);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebServices.java
+deleted file mode 100644
+index 9e665e0c8bb..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/java/org/apache/hadoop/yarn/server/globalpolicygenerator/webapp/TestGPGWebServices.java
++++ /dev/null
+@@ -1,96 +0,0 @@
+-/** * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.globalpolicygenerator.webapp;
+-
+-import com.google.inject.Guice;
+-import com.google.inject.servlet.GuiceFilter;
+-import com.google.inject.servlet.ServletModule;
+-import com.sun.jersey.api.client.WebResource;
+-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
+-import com.sun.jersey.test.framework.WebAppDescriptor;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GPGContext;
+-import org.apache.hadoop.yarn.server.globalpolicygenerator.GlobalPolicyGenerator;
+-import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver;
+-import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+-import org.apache.hadoop.yarn.webapp.GuiceServletConfig;
+-import org.apache.hadoop.yarn.webapp.JerseyTestBase;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.codehaus.jettison.json.JSONException;
+-import org.codehaus.jettison.json.JSONObject;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import javax.ws.rs.core.MediaType;
+-
+-import static org.junit.Assert.assertNotNull;
+-
+-public class TestGPGWebServices extends JerseyTestBase {
+-  private static GlobalPolicyGenerator gpg;
+-  private static GPGWebApp webApp;
+-
+-  private static class XWebServletModule extends ServletModule {
+-    @Override
+-    protected void configureServlets() {
+-      bind(JAXBContextResolver.class);
+-      bind(GPGWebServices.class);
+-      bind(GenericExceptionHandler.class);
+-      gpg = new GlobalPolicyGenerator();
+-      webApp = new GPGWebApp(gpg);
+-      bind(WebApp.class).toInstance(webApp);
+-      bind(GlobalPolicyGenerator.class).toInstance(gpg);
+-      bind(GPGContext.class).toInstance(gpg.getGPGContext());
+-      serve("/*").with(GuiceContainer.class);
+-    }
+-  }
+-
+-  static {
+-    GuiceServletConfig.setInjector(
+-        Guice.createInjector(new XWebServletModule()));
+-  }
+-
+-  @Before
+-  @Override
+-  public void setUp() throws Exception {
+-    super.setUp();
+-    GuiceServletConfig.setInjector(
+-        Guice.createInjector(new XWebServletModule()));
+-  }
+-
+-  public TestGPGWebServices() {
+-    super(new WebAppDescriptor.Builder(
+-        "org.apache.hadoop.yarn.server.globalpolicygenerator.webapp")
+-        .contextListenerClass(GuiceServletConfig.class)
+-        .filterClass(GuiceFilter.class)
+-        .contextPath("jersey-guice-filter").servletPath("/").build());
+-  }
+-
+-  @Test
+-  public void testGetGPG() throws JSONException, Exception {
+-    WebResource r = resource();
+-    JSONObject json = r.path("ws").path("v1").path("gpg")
+-        .accept(MediaType.APPLICATION_JSON).get(JSONObject.class);
+-    assertNotNull(json);
+-  }
+-
+-  @Test
+-  public void testGetGPGInfo() throws JSONException, Exception {
+-    WebResource r = resource();
+-    JSONObject json = r.path("ws").path("v1").path("gpg").path("info")
+-        .accept(MediaType.APPLICATION_JSON).get(JSONObject.class);
+-    assertNotNull(json);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo1.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo1.json
+deleted file mode 100644
+index 3ad45945f96..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo1.json
++++ /dev/null
+@@ -1,134 +0,0 @@
+-{
+-  "capacity": 100.0,
+-  "usedCapacity": 0.0,
+-  "maxCapacity": 100.0,
+-  "queueName": "root",
+-  "queues": {
+-    "queue": [
+-      {
+-        "type": "capacitySchedulerLeafQueueInfo",
+-        "capacity": 100.0,
+-        "usedCapacity": 0.0,
+-        "maxCapacity": 100.0,
+-        "absoluteCapacity": 100.0,
+-        "absoluteMaxCapacity": 100.0,
+-        "absoluteUsedCapacity": 0.0,
+-        "numApplications": 484,
+-        "queueName": "default",
+-        "state": "RUNNING",
+-        "resourcesUsed": {
+-          "memory": 0,
+-          "vCores": 0
+-        },
+-        "hideReservationQueues": false,
+-        "nodeLabels": [
+-          "*"
+-        ],
+-        "numActiveApplications": 484,
+-        "numPendingApplications": 0,
+-        "numContainers": 0,
+-        "maxApplications": 10000,
+-        "maxApplicationsPerUser": 10000,
+-        "userLimit": 100,
+-        "users": {
+-          "user": [
+-            {
+-              "username": "Default",
+-              "resourcesUsed": {
+-                "memory": 0,
+-                "vCores": 0
+-              },
+-              "numPendingApplications": 0,
+-              "numActiveApplications": 468,
+-              "AMResourceUsed": {
+-                "memory": 30191616,
+-                "vCores": 468
+-              },
+-              "userResourceLimit": {
+-                "memory": 31490048,
+-                "vCores": 7612
+-              }
+-            }
+-          ]
+-        },
+-        "userLimitFactor": 1.0,
+-        "AMResourceLimit": {
+-          "memory": 31490048,
+-          "vCores": 7612
+-        },
+-        "usedAMResource": {
+-          "memory": 30388224,
+-          "vCores": 532
+-        },
+-        "userAMResourceLimit": {
+-          "memory": 31490048,
+-          "vCores": 7612
+-        },
+-        "preemptionDisabled": true
+-      }
+-    ]
+-  },
+-  "health": {
+-    "lastrun": 1517951638085,
+-    "operationsInfo": {
+-      "entry": {
+-        "key": "last-allocation",
+-        "value": {
+-          "nodeId": "node0:0",
+-          "containerId": "container_e61477_1517922128312_0340_01_000001",
+-          "queue": "root.default"
+-        }
+-      },
+-      "entry": {
+-        "key": "last-reservation",
+-        "value": {
+-          "nodeId": "node0:1",
+-          "containerId": "container_e61477_1517879828320_0249_01_000001",
+-          "queue": "root.default"
+-        }
+-      },
+-      "entry": {
+-        "key": "last-release",
+-        "value": {
+-          "nodeId": "node0:2",
+-          "containerId": "container_e61477_1517922128312_0340_01_000001",
+-          "queue": "root.default"
+-        }
+-      },
+-      "entry": {
+-        "key": "last-preemption",
+-        "value": {
+-          "nodeId": "N/A",
+-          "containerId": "N/A",
+-          "queue": "N/A"
+-        }
+-      }
+-    },
+-    "lastRunDetails": [
+-      {
+-        "operation": "releases",
+-        "count": 0,
+-        "resources": {
+-          "memory": 0,
+-          "vCores": 0
+-        }
+-      },
+-      {
+-        "operation": "allocations",
+-        "count": 0,
+-        "resources": {
+-          "memory": 0,
+-          "vCores": 0
+-        }
+-      },
+-      {
+-        "operation": "reservations",
+-        "count": 0,
+-        "resources": {
+-          "memory": 0,
+-          "vCores": 0
+-        }
+-      }
+-    ]
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo2.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo2.json
+deleted file mode 100644
+index 2ff879e8699..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/src/test/resources/schedulerInfo2.json
++++ /dev/null
+@@ -1,196 +0,0 @@
+- {
+-      "type": "capacityScheduler",
+-      "capacity": 100.0,
+-      "usedCapacity": 0.0,
+-      "maxCapacity": 100.0,
+-      "queueName": "root",
+-      "queues": {
+-        "queue": [
+-          {
+-            "type": "capacitySchedulerLeafQueueInfo",
+-            "capacity": 100.0,
+-            "usedCapacity": 0.0,
+-            "maxCapacity": 100.0,
+-            "absoluteCapacity": 100.0,
+-            "absoluteMaxCapacity": 100.0,
+-            "absoluteUsedCapacity": 0.0,
+-            "numApplications": 484,
+-            "queueName": "default",
+-            "state": "RUNNING",
+-            "resourcesUsed": {
+-              "memory": 0,
+-              "vCores": 0
+-            },
+-            "hideReservationQueues": false,
+-            "nodeLabels": [
+-              "*"
+-            ],
+-            "numActiveApplications": 484,
+-            "numPendingApplications": 0,
+-            "numContainers": 0,
+-            "maxApplications": 10000,
+-            "maxApplicationsPerUser": 10000,
+-            "userLimit": 100,
+-            "users": {
+-              "user": [
+-                {
+-                  "username": "Default",
+-                  "resourcesUsed": {
+-                    "memory": 0,
+-                    "vCores": 0
+-                  },
+-                  "numPendingApplications": 0,
+-                  "numActiveApplications": 468,
+-                  "AMResourceUsed": {
+-                    "memory": 30191616,
+-                    "vCores": 468
+-                  },
+-                  "userResourceLimit": {
+-                    "memory": 31490048,
+-                    "vCores": 7612
+-                  }
+-                }
+-              ]
+-            },
+-            "userLimitFactor": 1.0,
+-            "AMResourceLimit": {
+-              "memory": 31490048,
+-              "vCores": 7612
+-            },
+-            "usedAMResource": {
+-              "memory": 30388224,
+-              "vCores": 532
+-            },
+-            "userAMResourceLimit": {
+-              "memory": 31490048,
+-              "vCores": 7612
+-            },
+-            "preemptionDisabled": true
+-          },
+-          {
+-            "type": "capacitySchedulerLeafQueueInfo",
+-            "capacity": 100.0,
+-            "usedCapacity": 0.0,
+-            "maxCapacity": 100.0,
+-            "absoluteCapacity": 100.0,
+-            "absoluteMaxCapacity": 100.0,
+-            "absoluteUsedCapacity": 0.0,
+-            "numApplications": 484,
+-            "queueName": "default2",
+-            "state": "RUNNING",
+-            "resourcesUsed": {
+-              "memory": 0,
+-              "vCores": 0
+-            },
+-            "hideReservationQueues": false,
+-            "nodeLabels": [
+-              "*"
+-            ],
+-            "numActiveApplications": 484,
+-            "numPendingApplications": 0,
+-            "numContainers": 0,
+-            "maxApplications": 10000,
+-            "maxApplicationsPerUser": 10000,
+-            "userLimit": 100,
+-            "users": {
+-              "user": [
+-                {
+-                  "username": "Default",
+-                  "resourcesUsed": {
+-                    "memory": 0,
+-                    "vCores": 0
+-                  },
+-                  "numPendingApplications": 0,
+-                  "numActiveApplications": 468,
+-                  "AMResourceUsed": {
+-                    "memory": 30191616,
+-                    "vCores": 468
+-                  },
+-                  "userResourceLimit": {
+-                    "memory": 31490048,
+-                    "vCores": 7612
+-                  }
+-                }
+-              ]
+-            },
+-            "userLimitFactor": 1.0,
+-            "AMResourceLimit": {
+-              "memory": 31490048,
+-              "vCores": 7612
+-            },
+-            "usedAMResource": {
+-              "memory": 30388224,
+-              "vCores": 532
+-            },
+-            "userAMResourceLimit": {
+-              "memory": 31490048,
+-              "vCores": 7612
+-            },
+-            "preemptionDisabled": true
+-          }
+-        ]
+-      },
+-      "health": {
+-        "lastrun": 1517951638085,
+-        "operationsInfo": {
+-          "entry": {
+-            "key": "last-allocation",
+-            "value": {
+-              "nodeId": "node0:0",
+-              "containerId": "container_e61477_1517922128312_0340_01_000001",
+-              "queue": "root.default"
+-            }
+-          },
+-          "entry": {
+-            "key": "last-reservation",
+-            "value": {
+-              "nodeId": "node0:1",
+-              "containerId": "container_e61477_1517879828320_0249_01_000001",
+-              "queue": "root.default"
+-            }
+-          },
+-          "entry": {
+-            "key": "last-release",
+-            "value": {
+-              "nodeId": "node0:2",
+-              "containerId": "container_e61477_1517922128312_0340_01_000001",
+-              "queue": "root.default"
+-            }
+-          },
+-          "entry": {
+-            "key": "last-preemption",
+-            "value": {
+-              "nodeId": "N/A",
+-              "containerId": "N/A",
+-              "queue": "N/A"
+-            }
+-          }
+-        },
+-        "lastRunDetails": [
+-          {
+-            "operation": "releases",
+-            "count": 0,
+-            "resources": {
+-              "memory": 0,
+-              "vCores": 0
+-            }
+-          },
+-          {
+-            "operation": "allocations",
+-            "count": 0,
+-            "resources": {
+-              "memory": 0,
+-              "vCores": 0
+-            }
+-          },
+-          {
+-            "operation": "reservations",
+-            "count": 0,
+-            "resources": {
+-              "memory": 0,
+-              "vCores": 0
+-            }
+-          }
+-        ]
+-      }
+-    }
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index d30ba8bee60..f37b0ff8573 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -46,6 +46,5 @@
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
+     <module>hadoop-yarn-server-timelineservice-documentstore</module>
+-    <module>hadoop-yarn-server-globalpolicygenerator</module>
+   </modules>
+ </project>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index da50ab149ad..91631bda56c 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -73,10 +73,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.0/26-remove-hadoop-yarn-server-timeline-pluginstorage.patch b/hadoop/stackable/patches/3.4.0/26-remove-hadoop-yarn-server-timeline-pluginstorage.patch
new file mode 100644
index 000000000..531b41cc2
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/26-remove-hadoop-yarn-server-timeline-pluginstorage.patch
@@ -0,0 +1,4196 @@
+Entirely remove hadoop-yarn-server-timeline-pluginstorage
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ hadoop-project/pom.xml                             |   13 
+ .../pom.xml                                        |  173 ---
+ .../yarn/server/timeline/EntityCacheItem.java      |  157 --
+ .../timeline/EntityGroupFSTimelineStore.java       | 1280 --------------------
+ .../EntityGroupFSTimelineStoreMetrics.java         |  160 ---
+ .../server/timeline/LevelDBCacheTimelineStore.java |  328 -----
+ .../hadoop/yarn/server/timeline/LogInfo.java       |  304 -----
+ .../server/timeline/TimelineEntityGroupPlugin.java |   74 -
+ .../hadoop/yarn/server/timeline/package-info.java  |   23 
+ .../server/timeline/EntityGroupPlugInForTest.java  |   59 -
+ .../yarn/server/timeline/PluginStoreTestUtils.java |  256 ----
+ .../timeline/TestEntityGroupFSTimelineStore.java   |  809 -------------
+ .../timeline/TestLevelDBCacheTimelineStore.java    |  108 --
+ .../hadoop/yarn/server/timeline/TestLogInfo.java   |  249 ----
+ .../TestOverrideTimelineStoreYarnClient.java       |   57 -
+ .../hadoop-yarn/hadoop-yarn-server/pom.xml         |    1 
+ 16 files changed, 4051 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityCacheItem.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStoreMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LogInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineEntityGroupPlugin.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/package-info.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/EntityGroupPlugInForTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/PluginStoreTestUtils.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLogInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestOverrideTimelineStoreYarnClient.java
+
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 4cb65cf3741..c69e44739ce 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -555,19 +555,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-        <type>test-jar</type>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml
+deleted file mode 100644
+index b7d526a7b9c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/pom.xml
++++ /dev/null
+@@ -1,173 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0"
+-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+-                      https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <parent>
+-    <artifactId>hadoop-yarn-server</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <modelVersion>4.0.0</modelVersion>
+-  <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN Timeline Plugin Storage</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-    <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>provided</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>commons-el</groupId>
+-          <artifactId>commons-el</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>tomcat</groupId>
+-          <artifactId>jasper-runtime</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>tomcat</groupId>
+-          <artifactId>jasper-compiler</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.eclipse.jetty</groupId>
+-          <artifactId>jsp-2.1-jetty</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+-      <version>${project.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+-      <version>${project.version}</version>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.slf4j</groupId>
+-      <artifactId>slf4j-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop.thirdparty</groupId>
+-      <artifactId>hadoop-shaded-guava</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs-client</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.assertj</groupId>
+-      <artifactId>assertj-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-params</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.fasterxml.jackson.core</groupId>
+-      <artifactId>jackson-databind</artifactId>
+-    </dependency>
+-  </dependencies>
+-
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-            <phase>test-compile</phase>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityCacheItem.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityCacheItem.java
+deleted file mode 100644
+index 8df60ab15a5..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityCacheItem.java
++++ /dev/null
+@@ -1,157 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-
+-/**
+- * Cache item for timeline server v1.5 reader cache. Each cache item has a
+- * TimelineStore that can be filled with data within one entity group.
+- */
+-public class EntityCacheItem {
+-  private static final Logger LOG
+-      = LoggerFactory.getLogger(EntityCacheItem.class);
+-
+-  private TimelineStore store;
+-  private TimelineEntityGroupId groupId;
+-  private EntityGroupFSTimelineStore.AppLogs appLogs;
+-  private long lastRefresh;
+-  private Configuration config;
+-
+-  public EntityCacheItem(TimelineEntityGroupId gId, Configuration config) {
+-    this.groupId = gId;
+-    this.config = config;
+-  }
+-
+-  /**
+-   * @return The application log associated to this cache item, may be null.
+-   */
+-  public synchronized EntityGroupFSTimelineStore.AppLogs getAppLogs() {
+-    return this.appLogs;
+-  }
+-
+-  /**
+-   * Set the application logs to this cache item. The entity group should be
+-   * associated with this application.
+-   *
+-   * @param incomingAppLogs Application logs this cache item mapped to
+-   */
+-  public synchronized void setAppLogs(
+-      EntityGroupFSTimelineStore.AppLogs incomingAppLogs) {
+-    this.appLogs = incomingAppLogs;
+-  }
+-
+-  /**
+-   * @return The timeline store, either loaded or unloaded, of this cache item.
+-   * This method will not hold the storage from being reclaimed.
+-   */
+-  public synchronized TimelineStore getStore() {
+-    return store;
+-  }
+-
+-  /**
+-   * Refresh this cache item if it needs refresh. This will enforce an appLogs
+-   * rescan and then load new data. The refresh process is synchronized with
+-   * other operations on the same cache item.
+-   *
+-   * @param aclManager ACL manager for the timeline storage
+-   * @param metrics Metrics to trace the status of the entity group store
+-   * @return a {@link org.apache.hadoop.yarn.server.timeline.TimelineStore}
+-   *         object filled with all entities in the group.
+-   * @throws IOException
+-   */
+-  public synchronized TimelineStore refreshCache(TimelineACLsManager aclManager,
+-      EntityGroupFSTimelineStoreMetrics metrics) throws IOException {
+-    if (needRefresh()) {
+-      long startTime = Time.monotonicNow();
+-      // If an application is not finished, we only update summary logs (and put
+-      // new entities into summary storage).
+-      // Otherwise, since the application is done, we can update detail logs.
+-      if (!appLogs.isDone()) {
+-        appLogs.parseSummaryLogs();
+-      } else if (appLogs.getDetailLogs().isEmpty()) {
+-        appLogs.scanForLogs();
+-      }
+-      if (!appLogs.getDetailLogs().isEmpty()) {
+-        if (store == null) {
+-          store = ReflectionUtils.newInstance(config.getClass(
+-              YarnConfiguration
+-                  .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_CACHE_STORE,
+-              MemoryTimelineStore.class, TimelineStore.class),
+-              config);
+-          store.init(config);
+-          store.start();
+-        } else {
+-          // Store is not null, the refresh is triggered by stale storage.
+-          metrics.incrCacheStaleRefreshes();
+-        }
+-        try (TimelineDataManager tdm =
+-                new TimelineDataManager(store, aclManager)) {
+-          tdm.init(config);
+-          tdm.start();
+-          // Load data from appLogs to tdm
+-          appLogs.loadDetailLog(tdm, groupId);
+-        }
+-      }
+-      updateRefreshTimeToNow();
+-      metrics.addCacheRefreshTime(Time.monotonicNow() - startTime);
+-    } else {
+-      LOG.debug("Cache new enough, skip refreshing");
+-      metrics.incrNoRefreshCacheRead();
+-    }
+-    return store;
+-  }
+-
+-  /**
+-   * Force releasing the cache item for the given group id, even though there
+-   * may be active references.
+-   */
+-  public synchronized void forceRelease() {
+-    try {
+-      if (store != null) {
+-        store.close();
+-      }
+-    } catch (IOException e) {
+-      LOG.warn("Error closing timeline store", e);
+-    }
+-    store = null;
+-    // reset offsets so next time logs are re-parsed
+-    for (LogInfo log : appLogs.getDetailLogs()) {
+-      if (log.getFilename().contains(groupId.toString())) {
+-        log.setOffset(0);
+-      }
+-    }
+-    LOG.debug("Cache for group {} released. ", groupId);
+-  }
+-
+-  private boolean needRefresh() {
+-    return (Time.monotonicNow() - lastRefresh > 10000);
+-  }
+-
+-  private void updateRefreshTimeToNow() {
+-    this.lastRefresh = Time.monotonicNow();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java
+deleted file mode 100644
+index 1f4a9f42a9f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java
++++ /dev/null
+@@ -1,1280 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.databind.MappingJsonFactory;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.type.TypeFactory;
+-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import org.apache.commons.lang3.mutable.MutableBoolean;
+-import org.apache.commons.lang3.tuple.Pair;
+-import org.apache.commons.lang3.StringUtils;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.RemoteIterator;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.io.LongWritable;
+-import org.apache.hadoop.io.Text;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.service.ServiceOperations;
+-import org.apache.hadoop.ipc.CallerContext;
+-import org.apache.hadoop.util.ApplicationClassLoader;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomains;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEvents;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.timeline.TimelineDataManager.CheckAcl;
+-import org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager;
+-import org.apache.hadoop.yarn.util.Apps;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.IOException;
+-import java.lang.reflect.UndeclaredThrowableException;
+-import java.net.MalformedURLException;
+-import java.security.AccessController;
+-import java.security.PrivilegedActionException;
+-import java.security.PrivilegedExceptionAction;
+-import java.util.ArrayList;
+-import java.util.Arrays;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.LinkedHashMap;
+-import java.util.LinkedList;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.SortedSet;
+-import java.util.TreeSet;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ConcurrentMap;
+-import java.util.concurrent.ScheduledThreadPoolExecutor;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.atomic.AtomicBoolean;
+-
+-/**
+- * Plugin timeline storage to support timeline server v1.5 API. This storage
+- * uses a file system to store timeline entities in their groups.
+- */
+-public class EntityGroupFSTimelineStore extends CompositeService
+-    implements TimelineStore {
+-
+-  static final String DOMAIN_LOG_PREFIX = "domainlog-";
+-  static final String SUMMARY_LOG_PREFIX = "summarylog-";
+-  static final String ENTITY_LOG_PREFIX = "entitylog-";
+-
+-  static final String ATS_V15_SERVER_DFS_CALLER_CTXT = "yarn_ats_server_v1_5";
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      EntityGroupFSTimelineStore.class);
+-  private static final FsPermission ACTIVE_DIR_PERMISSION =
+-      new FsPermission((short) 01777);
+-  private static final FsPermission DONE_DIR_PERMISSION =
+-      new FsPermission((short) 0700);
+-
+-  // Active dir: <activeRoot>/appId/attemptId/cacheId.log
+-  // Done dir: <doneRoot>/cluster_ts/hash1/hash2/appId/attemptId/cacheId.log
+-  private static final String APP_DONE_DIR_PREFIX_FORMAT =
+-      "%d" + Path.SEPARATOR     // cluster timestamp
+-          + "%04d" + Path.SEPARATOR // app num / 1,000,000
+-          + "%03d" + Path.SEPARATOR // (app num / 1000) % 1000
+-          + "%s" + Path.SEPARATOR; // full app id
+-  // Indicates when to force release a cache item even if there are active
+-  // readers. Enlarge this factor may increase memory usage for the reader since
+-  // there may be more cache items "hanging" in memory but not in cache.
+-  private static final int CACHE_ITEM_OVERFLOW_FACTOR = 2;
+-
+-  private YarnClient yarnClient;
+-  private TimelineStore summaryStore;
+-  private TimelineACLsManager aclManager;
+-  private TimelineDataManager summaryTdm;
+-  private ConcurrentMap<ApplicationId, AppLogs> appIdLogMap =
+-      new ConcurrentHashMap<ApplicationId, AppLogs>();
+-  private ScheduledThreadPoolExecutor executor;
+-  private AtomicBoolean stopExecutors = new AtomicBoolean(false);
+-  private FileSystem fs;
+-  private ObjectMapper objMapper;
+-  private JsonFactory jsonFactory;
+-  private Path activeRootPath;
+-  private Path doneRootPath;
+-  private long logRetainMillis;
+-  private long unknownActiveMillis;
+-  private int appCacheMaxSize = 0;
+-  private boolean recoveryEnabled;
+-  private Path checkpointFile;
+-  private ConcurrentMap<String, Pair<Long, Long>> recoveredLogs =
+-      new ConcurrentHashMap<String, Pair<Long, Long>>();
+-
+-  private List<TimelineEntityGroupPlugin> cacheIdPlugins;
+-  private Map<TimelineEntityGroupId, EntityCacheItem> cachedLogs;
+-  private boolean aclsEnabled;
+-
+-  @VisibleForTesting
+-  @InterfaceAudience.Private
+-  EntityGroupFSTimelineStoreMetrics metrics;
+-
+-  public EntityGroupFSTimelineStore() {
+-    super(EntityGroupFSTimelineStore.class.getSimpleName());
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    metrics = EntityGroupFSTimelineStoreMetrics.create();
+-    summaryStore = createSummaryStore();
+-    addService(summaryStore);
+-
+-    long logRetainSecs = conf.getLong(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETAIN_SECONDS,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RETAIN_SECONDS_DEFAULT);
+-    logRetainMillis = logRetainSecs * 1000;
+-    LOG.info("Cleaner set to delete logs older than {} seconds", logRetainSecs);
+-    long unknownActiveSecs = conf.getLong(
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_UNKNOWN_ACTIVE_SECONDS,
+-        YarnConfiguration.
+-            TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_UNKNOWN_ACTIVE_SECONDS_DEFAULT
+-    );
+-    unknownActiveMillis = unknownActiveSecs * 1000;
+-    LOG.info("Unknown apps will be treated as complete after {} seconds",
+-        unknownActiveSecs);
+-    appCacheMaxSize = conf.getInt(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_APP_CACHE_SIZE,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_APP_CACHE_SIZE_DEFAULT);
+-    LOG.info("Application cache size is {}", appCacheMaxSize);
+-    cachedLogs = Collections.synchronizedMap(
+-      new LinkedHashMap<TimelineEntityGroupId, EntityCacheItem>(
+-          appCacheMaxSize + 1, 0.75f, true) {
+-          @Override
+-          protected boolean removeEldestEntry(
+-              Map.Entry<TimelineEntityGroupId, EntityCacheItem> eldest) {
+-            if (super.size() > appCacheMaxSize) {
+-              TimelineEntityGroupId groupId = eldest.getKey();
+-              LOG.debug("Evicting {} due to space limitations", groupId);
+-              EntityCacheItem cacheItem = eldest.getValue();
+-              LOG.debug("Force release cache {}.", groupId);
+-              cacheItem.forceRelease();
+-              if (cacheItem.getAppLogs().isDone()) {
+-                appIdLogMap.remove(groupId.getApplicationId());
+-              }
+-              metrics.incrCacheEvicts();
+-              return true;
+-            }
+-            return false;
+-          }
+-      });
+-    cacheIdPlugins = loadPlugIns(conf);
+-    // Initialize yarn client for application status
+-    yarnClient = createAndInitYarnClient(conf);
+-    // if non-null, hook its lifecycle up
+-    addIfService(yarnClient);
+-    activeRootPath = new Path(conf.get(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_ACTIVE_DIR,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_ACTIVE_DIR_DEFAULT));
+-    doneRootPath = new Path(conf.get(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR_DEFAULT));
+-    fs = activeRootPath.getFileSystem(conf);
+-    checkpointFile = new Path(fs.getHomeDirectory(), "atscheckpoint");
+-    recoveryEnabled = conf.getBoolean(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RECOVERY_ENABLED,
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_RECOVERY_ENABLED_DEFAULT);
+-
+-    aclsEnabled = conf.getBoolean(YarnConfiguration.YARN_ACL_ENABLE,
+-    YarnConfiguration.DEFAULT_YARN_ACL_ENABLE);
+-    CallerContext.setCurrent(
+-        new CallerContext.Builder(ATS_V15_SERVER_DFS_CALLER_CTXT).build());
+-    super.serviceInit(conf);
+-  }
+-
+-  private List<TimelineEntityGroupPlugin> loadPlugIns(Configuration conf)
+-      throws RuntimeException {
+-    Collection<String> pluginNames = conf.getTrimmedStringCollection(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSES);
+-
+-    String pluginClasspath = conf.getTrimmed(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSPATH);
+-    String[] systemClasses = conf.getTrimmedStrings(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_SYSTEM_CLASSES);
+-
+-    List<TimelineEntityGroupPlugin> pluginList
+-        = new LinkedList<TimelineEntityGroupPlugin>();
+-    ClassLoader customClassLoader = null;
+-    if (pluginClasspath != null && pluginClasspath.length() > 0) {
+-      try {
+-        customClassLoader = createPluginClassLoader(pluginClasspath,
+-            systemClasses);
+-      } catch (IOException ioe) {
+-        LOG.warn("Error loading classloader", ioe);
+-      }
+-    }
+-    for (final String name : pluginNames) {
+-      LOG.debug("Trying to load plugin class {}", name);
+-      TimelineEntityGroupPlugin cacheIdPlugin = null;
+-
+-      try {
+-        if (customClassLoader != null) {
+-          LOG.debug("Load plugin {} with classpath: {}", name, pluginClasspath);
+-          Class<?> clazz = Class.forName(name, true, customClassLoader);
+-          Class<? extends TimelineEntityGroupPlugin> sClass = clazz.asSubclass(
+-              TimelineEntityGroupPlugin.class);
+-          cacheIdPlugin = ReflectionUtils.newInstance(sClass, conf);
+-        } else {
+-          LOG.debug("Load plugin class with system classpath");
+-          Class<?> clazz = conf.getClassByName(name);
+-          cacheIdPlugin =
+-              (TimelineEntityGroupPlugin) ReflectionUtils.newInstance(
+-                  clazz, conf);
+-        }
+-      } catch (Exception e) {
+-        LOG.warn("Error loading plugin " + name, e);
+-        throw new RuntimeException("No class defined for " + name, e);
+-      }
+-
+-      LOG.info("Load plugin class {}", cacheIdPlugin.getClass().getName());
+-      pluginList.add(cacheIdPlugin);
+-    }
+-    return pluginList;
+-  }
+-
+-  private TimelineStore createSummaryStore() {
+-    return ReflectionUtils.newInstance(getConfig().getClass(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SUMMARY_STORE,
+-        LeveldbTimelineStore.class, TimelineStore.class), getConfig());
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-
+-    super.serviceStart();
+-    LOG.info("Starting {}", getName());
+-    summaryStore.start();
+-
+-    Configuration conf = getConfig();
+-    aclManager = new TimelineACLsManager(conf);
+-    aclManager.setTimelineStore(summaryStore);
+-    summaryTdm = new TimelineDataManager(summaryStore, aclManager);
+-    summaryTdm.init(conf);
+-    addService(summaryTdm);
+-    // start child services that aren't already started
+-    super.serviceStart();
+-
+-    if (!fs.exists(activeRootPath)) {
+-      fs.mkdirs(activeRootPath);
+-      fs.setPermission(activeRootPath, ACTIVE_DIR_PERMISSION);
+-    }
+-    if (!fs.exists(doneRootPath)) {
+-      fs.mkdirs(doneRootPath);
+-      fs.setPermission(doneRootPath, DONE_DIR_PERMISSION);
+-    }
+-
+-    // Recover the lastProcessedTime and offset for logfiles
+-    if (recoveryEnabled && fs.exists(checkpointFile)) {
+-      try (FSDataInputStream in = fs.open(checkpointFile)) {
+-        recoveredLogs.putAll(recoverLogFiles(in));
+-      } catch (IOException e) {
+-        LOG.warn("Failed to recover summarylog files from the checkpointfile", e);
+-      }
+-    }
+-
+-    objMapper = new ObjectMapper();
+-    objMapper.setAnnotationIntrospector(
+-        new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()));
+-    jsonFactory = new MappingJsonFactory(objMapper);
+-    final long scanIntervalSecs = conf.getLong(
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SCAN_INTERVAL_SECONDS,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SCAN_INTERVAL_SECONDS_DEFAULT
+-    );
+-    final long cleanerIntervalSecs = conf.getLong(
+-        YarnConfiguration
+-          .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_CLEANER_INTERVAL_SECONDS,
+-        YarnConfiguration
+-          .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_CLEANER_INTERVAL_SECONDS_DEFAULT
+-    );
+-    final int numThreads = conf.getInt(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_THREADS,
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_THREADS_DEFAULT);
+-    LOG.info("Scanning active directory {} every {} seconds", activeRootPath,
+-        scanIntervalSecs);
+-    LOG.info("Cleaning logs every {} seconds", cleanerIntervalSecs);
+-
+-    executor = new ScheduledThreadPoolExecutor(numThreads,
+-        new ThreadFactoryBuilder().setNameFormat("EntityLogPluginWorker #%d")
+-            .build());
+-    executor.scheduleAtFixedRate(new EntityLogScanner(), 0, scanIntervalSecs,
+-        TimeUnit.SECONDS);
+-    executor.scheduleAtFixedRate(new EntityLogCleaner(), cleanerIntervalSecs,
+-        cleanerIntervalSecs, TimeUnit.SECONDS);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping {}", getName());
+-    stopExecutors.set(true);
+-    if (executor != null) {
+-      executor.shutdown();
+-      if (executor.isTerminating()) {
+-        LOG.info("Waiting for executor to terminate");
+-        boolean terminated = executor.awaitTermination(10, TimeUnit.SECONDS);
+-        if (terminated) {
+-          LOG.info("Executor terminated");
+-        } else {
+-          LOG.warn("Executor did not terminate");
+-          executor.shutdownNow();
+-        }
+-      }
+-    }
+-    synchronized (cachedLogs) {
+-      for (EntityCacheItem cacheItem : cachedLogs.values()) {
+-        ServiceOperations.stopQuietly(cacheItem.getStore());
+-      }
+-    }
+-    CallerContext.setCurrent(null);
+-    super.serviceStop();
+-  }
+-
+-  /* Returns Map of SummaryLog files. The Value Pair has
+-  lastProcessedTime and offset */
+-  HashMap<String, Pair<Long, Long>> recoverLogFiles(
+-      DataInputStream in) throws IOException {
+-    HashMap<String, Pair<Long, Long>> logFiles = new HashMap<>();
+-    long totalEntries = in.readLong();
+-    for (long i = 0; i < totalEntries; i++) {
+-      Text attemptDirName = new Text();
+-      attemptDirName.readFields(in);
+-      Text fileName = new Text();
+-      fileName.readFields(in);
+-      LongWritable lastProcessedTime = new LongWritable();
+-      lastProcessedTime.readFields(in);
+-      LongWritable offset = new LongWritable();
+-      offset.readFields(in);
+-      Pair<Long, Long> pair = Pair.of(lastProcessedTime.get(), offset.get());
+-      logFiles.put(attemptDirName + Path.SEPARATOR + fileName, pair);
+-    }
+-    LOG.info("Recovered {} summarylog files", totalEntries);
+-    return logFiles;
+-  }
+-
+-  // Stores set of SummaryLog files
+-  void storeLogFiles(Collection<AppLogs> appLogs,
+-      DataOutputStream checkPointStream) throws IOException {
+-    long totalEntries = 0L;
+-    for (AppLogs appLog : appLogs) {
+-      totalEntries += appLog.summaryLogs.size();
+-    }
+-    checkPointStream.writeLong(totalEntries);
+-    for (AppLogs appLog : appLogs) {
+-      for (LogInfo summaryLog : appLog.summaryLogs) {
+-        new Text(summaryLog.getAttemptDirName()).write(checkPointStream);
+-        new Text(summaryLog.getFilename()).write(checkPointStream);
+-        new LongWritable(summaryLog.getLastProcessedTime()).write(checkPointStream);
+-        new LongWritable(summaryLog.getOffset()).write(checkPointStream);
+-      }
+-    }
+-    LOG.info("Stored {} summarylog files into checkPointFile", totalEntries);
+-  }
+-
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  int scanActiveLogs() throws IOException {
+-    long startTime = Time.monotonicNow();
+-    // Store the Last Processed Time and Offset
+-    if (recoveryEnabled && appIdLogMap.size() > 0) {
+-
+-      try (FSDataOutputStream checkPointStream = fs.create(checkpointFile, true)) {
+-
+-        storeLogFiles(appIdLogMap.values(), checkPointStream);
+-
+-      } catch (Exception e) {
+-        LOG.warn("Failed to checkpoint the summarylog files", e);
+-      }
+-    }
+-    int logsToScanCount = scanActiveLogs(activeRootPath);
+-    metrics.addActiveLogDirScanTime(Time.monotonicNow() - startTime);
+-    return logsToScanCount;
+-  }
+-
+-  int scanActiveLogs(Path dir) throws IOException {
+-    RemoteIterator<FileStatus> iter = list(dir);
+-    int logsToScanCount = 0;
+-    while (iter.hasNext()) {
+-      FileStatus stat = iter.next();
+-      String name = stat.getPath().getName();
+-      ApplicationId appId = parseApplicationId(name);
+-      if (appId != null) {
+-        LOG.debug("scan logs for {} in {}", appId, stat.getPath());
+-        logsToScanCount++;
+-        AppLogs logs = getAndSetActiveLog(appId, stat.getPath());
+-        executor.execute(new ActiveLogParser(logs));
+-      } else {
+-        if (stat.isDirectory()) {
+-          logsToScanCount += scanActiveLogs(stat.getPath());
+-        } else {
+-          LOG.warn("Ignoring unexpected file in active directory {}",
+-              stat.getPath());
+-        }
+-      }
+-    }
+-    return logsToScanCount;
+-  }
+-
+-  /**
+-   * List a directory, returning an iterator which will fail fast if this
+-   * service has been stopped
+-   * @param path path to list
+-   * @return an iterator over the contents of the directory
+-   * @throws IOException
+-   */
+-  private RemoteIterator<FileStatus> list(Path path) throws IOException {
+-    return new StoppableRemoteIterator(fs.listStatusIterator(path));
+-  }
+-
+-  private AppLogs createAndPutAppLogsIfAbsent(ApplicationId appId,
+-      Path appDirPath, AppState appState) {
+-    AppLogs appLogs = new AppLogs(appId, appDirPath, appState);
+-    AppLogs oldAppLogs = appIdLogMap.putIfAbsent(appId, appLogs);
+-    if (oldAppLogs != null) {
+-      appLogs = oldAppLogs;
+-    }
+-    return appLogs;
+-  }
+-
+-  private AppLogs getAndSetActiveLog(ApplicationId appId, Path appDirPath) {
+-    AppLogs appLogs = appIdLogMap.get(appId);
+-    if (appLogs == null) {
+-      appLogs = createAndPutAppLogsIfAbsent(appId, appDirPath, AppState.ACTIVE);
+-    }
+-    return appLogs;
+-  }
+-
+-  // searches for the app logs and returns it if found else null
+-  private AppLogs getAndSetAppLogs(ApplicationId applicationId)
+-      throws IOException {
+-    LOG.debug("Looking for app logs mapped for app id {}", applicationId);
+-    AppLogs appLogs = appIdLogMap.get(applicationId);
+-    if (appLogs == null) {
+-      AppState appState = AppState.UNKNOWN;
+-      Path appDirPath = getDoneAppPath(applicationId);
+-      if (fs.exists(appDirPath)) {
+-        appState = AppState.COMPLETED;
+-      } else {
+-        appDirPath = getActiveAppPath(applicationId);
+-        if (fs.exists(appDirPath)) {
+-          appState = AppState.ACTIVE;
+-        } else {
+-          // check for user directory inside active path
+-          RemoteIterator<FileStatus> iter = list(activeRootPath);
+-          while (iter.hasNext()) {
+-            Path child = new Path(iter.next().getPath().getName(),
+-                applicationId.toString());
+-            appDirPath = new Path(activeRootPath, child);
+-            if (fs.exists(appDirPath)) {
+-              appState = AppState.ACTIVE;
+-              break;
+-            }
+-          }
+-        }
+-      }
+-      if (appState != AppState.UNKNOWN) {
+-        LOG.debug("Create and try to add new appLogs to appIdLogMap for {}",
+-            applicationId);
+-        appLogs = createAndPutAppLogsIfAbsent(
+-            applicationId, appDirPath, appState);
+-      }
+-    }
+-    return appLogs;
+-  }
+-
+-  /**
+-   * Main function for entity log cleaner. This method performs depth first
+-   * search from a given dir path for all application log dirs. Once found, it
+-   * will decide if the directory should be cleaned up and then clean them.
+-   *
+-   * @param dirpath the root directory the cleaner should start with. Note that
+-   *                dirpath should be a directory that contains a set of
+-   *                application log directories. The cleaner method will not
+-   *                work if the given dirpath itself is an application log dir.
+-   * @param retainMillis
+-   * @throws IOException
+-   */
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  void cleanLogs(Path dirpath, long retainMillis)
+-      throws IOException {
+-    long now = Time.now();
+-    RemoteIterator<FileStatus> iter = list(dirpath);
+-    while (iter.hasNext()) {
+-      FileStatus stat = iter.next();
+-      if (isValidClusterTimeStampDir(stat)) {
+-        Path clusterTimeStampPath = stat.getPath();
+-        MutableBoolean appLogDirPresent = new MutableBoolean(false);
+-        cleanAppLogDir(clusterTimeStampPath, retainMillis, appLogDirPresent);
+-        if (appLogDirPresent.isFalse() &&
+-            (now - stat.getModificationTime() > retainMillis)) {
+-          deleteDir(clusterTimeStampPath);
+-        }
+-      }
+-    }
+-  }
+-
+-
+-  private void cleanAppLogDir(Path dirpath, long retainMillis,
+-      MutableBoolean appLogDirPresent) throws IOException {
+-    long now = Time.now();
+-    // Depth first search from root directory for all application log dirs
+-    RemoteIterator<FileStatus> iter = list(dirpath);
+-    while (iter.hasNext()) {
+-      FileStatus stat = iter.next();
+-      Path childPath = stat.getPath();
+-      if (stat.isDirectory()) {
+-        // If current is an application log dir, decide if we need to remove it
+-        // and remove if necessary.
+-        // Otherwise, keep iterating into it.
+-        ApplicationId appId = parseApplicationId(childPath.getName());
+-        if (appId != null) { // Application log dir
+-          appLogDirPresent.setTrue();
+-          if (shouldCleanAppLogDir(childPath, now, fs, retainMillis)) {
+-            deleteDir(childPath);
+-          }
+-        } else { // Keep cleaning inside
+-          cleanAppLogDir(childPath, retainMillis, appLogDirPresent);
+-        }
+-      }
+-    }
+-  }
+-
+-  private void deleteDir(Path path) {
+-    try {
+-      LOG.info("Deleting {}", path);
+-      if (fs.delete(path, true)) {
+-        metrics.incrLogsDirsCleaned();
+-      } else {
+-        LOG.error("Unable to remove {}", path);
+-      }
+-    } catch (IOException e) {
+-      LOG.error("Unable to remove {}", path, e);
+-    }
+-  }
+-
+-  private boolean isValidClusterTimeStampDir(FileStatus stat) {
+-    return stat.isDirectory() &&
+-        StringUtils.isNumeric(stat.getPath().getName());
+-  }
+-
+-
+-  private static boolean shouldCleanAppLogDir(Path appLogPath, long now,
+-      FileSystem fs, long logRetainMillis) throws IOException {
+-    RemoteIterator<FileStatus> iter = fs.listStatusIterator(appLogPath);
+-    while (iter.hasNext()) {
+-      FileStatus stat = iter.next();
+-      if (now - stat.getModificationTime() <= logRetainMillis) {
+-        // found a dir entry that is fresh enough to prevent
+-        // cleaning this directory.
+-        LOG.debug("{} not being cleaned due to {}", appLogPath, stat.getPath());
+-        return false;
+-      }
+-      // Otherwise, keep searching files inside for directories.
+-      if (stat.isDirectory()) {
+-        if (!shouldCleanAppLogDir(stat.getPath(), now, fs, logRetainMillis)) {
+-          return false;
+-        }
+-      }
+-    }
+-    return true;
+-  }
+-
+-  // converts the String to an ApplicationId or null if conversion failed
+-  private static ApplicationId parseApplicationId(String appIdStr) {
+-    try {
+-      return ApplicationId.fromString(appIdStr);
+-    } catch (IllegalArgumentException e) {
+-      return null;
+-    }
+-  }
+-
+-  private static ClassLoader createPluginClassLoader(
+-      final String appClasspath, final String[] systemClasses)
+-      throws IOException {
+-    try {
+-      return AccessController.doPrivileged(
+-        new PrivilegedExceptionAction<ClassLoader>() {
+-          @Override
+-          public ClassLoader run() throws MalformedURLException {
+-            return new ApplicationClassLoader(appClasspath,
+-                EntityGroupFSTimelineStore.class.getClassLoader(),
+-                Arrays.asList(systemClasses));
+-          }
+-        }
+-      );
+-    } catch (PrivilegedActionException e) {
+-      Throwable t = e.getCause();
+-      if (t instanceof MalformedURLException) {
+-        throw (MalformedURLException) t;
+-      }
+-      throw new IOException(e);
+-    }
+-  }
+-
+-  private Path getActiveAppPath(ApplicationId appId) {
+-    return new Path(activeRootPath, appId.toString());
+-  }
+-
+-  private Path getDoneAppPath(ApplicationId appId) {
+-    // cut up the app ID into mod(1000) buckets
+-    int appNum = appId.getId();
+-    appNum /= 1000;
+-    int bucket2 = appNum % 1000;
+-    int bucket1 = appNum / 1000;
+-    return new Path(doneRootPath,
+-        String.format(APP_DONE_DIR_PREFIX_FORMAT, appId.getClusterTimestamp(),
+-            bucket1, bucket2, appId.toString()));
+-  }
+-
+-  /**
+-   * Create and initialize the YARN Client. Tests may override/mock this.
+-   * If they return null, then {@link #getAppState(ApplicationId)} MUST
+-   * also be overridden
+-   * @param conf configuration
+-   * @return the yarn client, or null.
+-   *
+-   */
+-  @VisibleForTesting
+-  protected YarnClient createAndInitYarnClient(Configuration conf) {
+-    YarnClient client = YarnClient.createYarnClient();
+-    client.init(conf);
+-    return client;
+-  }
+-
+-  /**
+-   * Get the application state.
+-   * @param appId application ID
+-   * @return the state or {@link AppState#UNKNOWN} if it could not
+-   * be determined
+-   * @throws IOException on IO problems
+-   */
+-  @VisibleForTesting
+-  protected AppState getAppState(ApplicationId appId) throws IOException {
+-    return getAppState(appId, yarnClient);
+-  }
+-
+-  /**
+-   * Get all plugins for tests.
+-   * @return all plugins
+-   */
+-  @VisibleForTesting
+-  List<TimelineEntityGroupPlugin> getPlugins() {
+-    return cacheIdPlugins;
+-  }
+-
+-  /**
+-   * Ask the RM for the state of the application.
+-   * This method has to be synchronized to control traffic to RM
+-   * @param appId application ID
+-   * @param yarnClient
+-   * @return the state or {@link AppState#UNKNOWN} if it could not
+-   * be determined
+-   * @throws IOException
+-   */
+-  private static synchronized AppState getAppState(ApplicationId appId,
+-      YarnClient yarnClient) throws IOException {
+-    AppState appState = AppState.ACTIVE;
+-    try {
+-      ApplicationReport report = yarnClient.getApplicationReport(appId);
+-      if (Apps.isApplicationFinalState(report.getYarnApplicationState())) {
+-        appState = AppState.COMPLETED;
+-      }
+-    } catch (ApplicationNotFoundException e) {
+-      appState = AppState.UNKNOWN;
+-    } catch (YarnException e) {
+-      throw new IOException(e);
+-    }
+-    return appState;
+-  }
+-
+-  /**
+-   * Application states,
+-   */
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  public enum AppState {
+-    ACTIVE,
+-    UNKNOWN,
+-    COMPLETED
+-  }
+-
+-  class AppLogs {
+-    private ApplicationId appId;
+-    private Path appDirPath;
+-    private AppState appState;
+-    private List<LogInfo> summaryLogs = new ArrayList<LogInfo>();
+-    private List<LogInfo> detailLogs = new ArrayList<LogInfo>();
+-
+-    public AppLogs(ApplicationId appId, Path appPath, AppState state) {
+-      this.appId = appId;
+-      appDirPath = appPath;
+-      appState = state;
+-    }
+-
+-    public synchronized boolean isDone() {
+-      return appState == AppState.COMPLETED;
+-    }
+-
+-    public synchronized ApplicationId getAppId() {
+-      return appId;
+-    }
+-
+-    public synchronized Path getAppDirPath() {
+-      return appDirPath;
+-    }
+-
+-    synchronized List<LogInfo> getSummaryLogs() {
+-      return summaryLogs;
+-    }
+-
+-    synchronized List<LogInfo> getDetailLogs() {
+-      return detailLogs;
+-    }
+-
+-    public synchronized void parseSummaryLogs() throws IOException {
+-      parseSummaryLogs(summaryTdm);
+-    }
+-
+-    @InterfaceAudience.Private
+-    @VisibleForTesting
+-    synchronized void parseSummaryLogs(TimelineDataManager tdm)
+-        throws IOException {
+-      long startTime = Time.monotonicNow();
+-      if (!isDone()) {
+-        LOG.debug("Try to parse summary log for log {} in {}",
+-            appId, appDirPath);
+-        appState = getAppState(appId);
+-        long recentLogModTime = scanForLogs();
+-        if (appState == AppState.UNKNOWN) {
+-          if (Time.now() - recentLogModTime > unknownActiveMillis) {
+-            LOG.info(
+-                "{} state is UNKNOWN and logs are stale, assuming COMPLETED",
+-                appId);
+-            appState = AppState.COMPLETED;
+-          }
+-        }
+-      }
+-      List<LogInfo> removeList = new ArrayList<LogInfo>();
+-      for (LogInfo log : summaryLogs) {
+-        if (fs.exists(log.getPath(appDirPath))) {
+-          long summaryEntityParsed
+-              = log.parseForStore(tdm, appDirPath, isDone(), jsonFactory,
+-              objMapper, fs);
+-          metrics.incrEntitiesReadToSummary(summaryEntityParsed);
+-        } else {
+-          // The log may have been removed, remove the log
+-          removeList.add(log);
+-          LOG.info("File {} no longer exists, remove it from log list",
+-              log.getPath(appDirPath));
+-        }
+-      }
+-      summaryLogs.removeAll(removeList);
+-      metrics.addSummaryLogReadTime(Time.monotonicNow() - startTime);
+-    }
+-
+-    // scans for new logs and returns the modification timestamp of the
+-    // most recently modified log
+-    @InterfaceAudience.Private
+-    @VisibleForTesting
+-    long scanForLogs() throws IOException {
+-      LOG.debug("scanForLogs on {}", appDirPath);
+-      long newestModTime = 0;
+-      RemoteIterator<FileStatus> iterAttempt = list(appDirPath);
+-      while (iterAttempt.hasNext()) {
+-        FileStatus statAttempt = iterAttempt.next();
+-        LOG.debug("scanForLogs on {}", statAttempt.getPath().getName());
+-        if (!statAttempt.isDirectory()
+-            || !statAttempt.getPath().getName()
+-            .startsWith(ApplicationAttemptId.appAttemptIdStrPrefix)) {
+-          LOG.debug("Scanner skips for unknown dir/file {}",
+-              statAttempt.getPath());
+-          continue;
+-        }
+-        String attemptDirName = statAttempt.getPath().getName();
+-        RemoteIterator<FileStatus> iterCache = list(statAttempt.getPath());
+-        while (iterCache.hasNext()) {
+-          FileStatus statCache = iterCache.next();
+-          if (!statCache.isFile()) {
+-            continue;
+-          }
+-          String filename = statCache.getPath().getName();
+-          String owner = statCache.getOwner();
+-          //YARN-10884:Owner of File is set to Null on WASB Append Operation.ATS fails to read such
+-          //files as UGI cannot be constructed using Null User.To Fix this,anonymous user is set
+-          //when ACL us Disabled as the UGI is not needed there
+-          if ((owner == null || owner.isEmpty()) && !aclsEnabled) {
+-            LOG.debug("The owner was null when acl disabled, hence making the owner anonymous");
+-            owner = "anonymous";
+-          }
+-          // We should only update time for log files.
+-          boolean shouldSetTime = true;
+-          LOG.debug("scan for log file: {}", filename);
+-          if (filename.startsWith(DOMAIN_LOG_PREFIX)) {
+-            addSummaryLog(attemptDirName, filename, owner, true);
+-          } else if (filename.startsWith(SUMMARY_LOG_PREFIX)) {
+-            addSummaryLog(attemptDirName, filename, owner,
+-                false);
+-          } else if (filename.startsWith(ENTITY_LOG_PREFIX)) {
+-            addDetailLog(attemptDirName, filename, owner);
+-          } else {
+-            shouldSetTime = false;
+-          }
+-          if (shouldSetTime) {
+-            newestModTime
+-              = Math.max(statCache.getModificationTime(), newestModTime);
+-          }
+-        }
+-      }
+-
+-      // if there are no logs in the directory then use the modification
+-      // time of the directory itself
+-      if (newestModTime == 0) {
+-        newestModTime = fs.getFileStatus(appDirPath).getModificationTime();
+-      }
+-
+-      return newestModTime;
+-    }
+-
+-    private void addSummaryLog(String attemptDirName,
+-        String filename, String owner, boolean isDomainLog) {
+-      for (LogInfo log : summaryLogs) {
+-        if (log.getFilename().equals(filename)
+-            && log.getAttemptDirName().equals(attemptDirName)) {
+-          return;
+-        }
+-      }
+-      LOG.debug("Incoming log {} not present in my summaryLogs list, add it",
+-          filename);
+-      LogInfo log;
+-      if (isDomainLog) {
+-        log = new DomainLogInfo(attemptDirName, filename, owner);
+-        summaryLogs.add(0, log);
+-      } else {
+-        log = new EntityLogInfo(attemptDirName, filename, owner);
+-        summaryLogs.add(log);
+-      }
+-      // This is to avoid processing summary files again during Restart of ATS
+-      if (recoveryEnabled) {
+-        Pair<Long, Long> pair = recoveredLogs.remove(log.getAttemptDirName()
+-            + Path.SEPARATOR + log.getFilename());
+-        if (pair != null) {
+-          log.setLastProcessedTime(pair.getKey());
+-          log.setOffset(pair.getValue());
+-        }
+-      }
+-    }
+-
+-    private synchronized void addDetailLog(String attemptDirName,
+-        String filename, String owner) {
+-      for (LogInfo log : detailLogs) {
+-        if (log.getFilename().equals(filename)
+-            && log.getAttemptDirName().equals(attemptDirName)) {
+-          return;
+-        }
+-      }
+-      detailLogs.add(new EntityLogInfo(attemptDirName, filename, owner));
+-    }
+-
+-    synchronized void loadDetailLog(TimelineDataManager tdm,
+-        TimelineEntityGroupId groupId) throws IOException {
+-      List<LogInfo> removeList = new ArrayList<>();
+-      for (LogInfo log : detailLogs) {
+-        LOG.debug("Try refresh logs for {}", log.getFilename());
+-        // Only refresh the log that matches the cache id
+-        if (log.matchesGroupId(groupId)) {
+-          Path dirPath = getAppDirPath();
+-          if (fs.exists(log.getPath(dirPath))) {
+-            LOG.debug("Refresh logs for cache id {}", groupId);
+-            log.parseForStore(tdm, dirPath, isDone(),
+-                jsonFactory, objMapper, fs);
+-          } else {
+-            // The log may have been removed, remove the log
+-            removeList.add(log);
+-            LOG.info(
+-                "File {} no longer exists, removing it from log list",
+-                log.getPath(dirPath));
+-          }
+-        }
+-      }
+-      detailLogs.removeAll(removeList);
+-    }
+-
+-    public synchronized void moveToDone() throws IOException {
+-      Path doneAppPath = getDoneAppPath(appId);
+-      if (!doneAppPath.equals(appDirPath)) {
+-        Path donePathParent = doneAppPath.getParent();
+-        if (!fs.exists(donePathParent)) {
+-          fs.mkdirs(donePathParent);
+-        }
+-        LOG.debug("Application {} is done, trying to move to done dir {}",
+-            appId, doneAppPath);
+-        if (!fs.rename(appDirPath, doneAppPath)) {
+-          throw new IOException("Rename " + appDirPath + " to " + doneAppPath
+-              + " failed");
+-        } else {
+-          LOG.info("Moved {} to {}", appDirPath, doneAppPath);
+-        }
+-        appDirPath = doneAppPath;
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Extract any nested throwable forwarded from IPC operations.
+-   * @param e exception
+-   * @return either the exception passed an an argument, or any nested
+-   * exception which was wrapped inside an {@link UndeclaredThrowableException}
+-   */
+-  private Throwable extract(Exception e) {
+-    Throwable t = e;
+-    if (e instanceof UndeclaredThrowableException && e.getCause() != null) {
+-      t = e.getCause();
+-    }
+-    return t;
+-  }
+-
+-  private class EntityLogScanner implements Runnable {
+-    @Override
+-    public void run() {
+-      LOG.debug("Active scan starting");
+-      try {
+-        int scanned = scanActiveLogs();
+-        LOG.debug("Scanned {} active applications", scanned);
+-      } catch (Exception e) {
+-        Throwable t = extract(e);
+-        if (t instanceof InterruptedException) {
+-          LOG.info("File scanner interrupted");
+-        } else {
+-          LOG.error("Error scanning active files", t);
+-        }
+-      }
+-      LOG.debug("Active scan complete");
+-    }
+-  }
+-
+-  private class ActiveLogParser implements Runnable {
+-    private AppLogs appLogs;
+-
+-    public ActiveLogParser(AppLogs logs) {
+-      appLogs = logs;
+-    }
+-
+-    @Override
+-    public void run() {
+-      try {
+-        LOG.debug("Begin parsing summary logs. ");
+-        appLogs.parseSummaryLogs();
+-        if (appLogs.isDone()) {
+-          appLogs.moveToDone();
+-          appIdLogMap.remove(appLogs.getAppId());
+-        }
+-        LOG.debug("End parsing summary logs. ");
+-      } catch (Exception e) {
+-        Throwable t = extract(e);
+-        if (t instanceof InterruptedException) {
+-          LOG.info("Log parser interrupted");
+-        } else {
+-          LOG.error("Error processing logs for " + appLogs.getAppId(), t);
+-        }
+-      }
+-    }
+-  }
+-
+-  private class EntityLogCleaner implements Runnable {
+-    @Override
+-    public void run() {
+-      LOG.debug("Cleaner starting");
+-      long startTime = Time.monotonicNow();
+-      try {
+-        cleanLogs(doneRootPath, logRetainMillis);
+-      } catch (Exception e) {
+-        Throwable t = extract(e);
+-        if (t instanceof InterruptedException) {
+-          LOG.info("Cleaner interrupted");
+-        } else {
+-          LOG.error("Error cleaning files", e);
+-        }
+-      } finally {
+-        metrics.addLogCleanTime(Time.monotonicNow() - startTime);
+-      }
+-      LOG.debug("Cleaner finished");
+-    }
+-  }
+-
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  void setFs(FileSystem incomingFs) {
+-    this.fs = incomingFs;
+-  }
+-
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  void setCachedLogs(TimelineEntityGroupId groupId, EntityCacheItem cacheItem) {
+-    cachedLogs.put(groupId, cacheItem);
+-  }
+-
+-  private List<TimelineStore> getTimelineStoresFromCacheIds(
+-      Set<TimelineEntityGroupId> groupIds, String entityType,
+-      List<EntityCacheItem> cacheItems)
+-      throws IOException {
+-    List<TimelineStore> stores = new LinkedList<TimelineStore>();
+-    // For now we just handle one store in a context. We return the first
+-    // non-null storage for the group ids.
+-    for (TimelineEntityGroupId groupId : groupIds) {
+-      TimelineStore storeForId = getCachedStore(groupId, cacheItems);
+-      if (storeForId != null) {
+-        LOG.debug("Adding {} as a store for the query", storeForId.getName());
+-        stores.add(storeForId);
+-        metrics.incrGetEntityToDetailOps();
+-      }
+-    }
+-    if (stores.size() == 0) {
+-      LOG.debug("Using summary store for {}", entityType);
+-      stores.add(this.summaryStore);
+-      metrics.incrGetEntityToSummaryOps();
+-    }
+-    return stores;
+-  }
+-
+-  protected List<TimelineStore> getTimelineStoresForRead(String entityId,
+-      String entityType, List<EntityCacheItem> cacheItems)
+-      throws IOException {
+-    Set<TimelineEntityGroupId> groupIds = new HashSet<TimelineEntityGroupId>();
+-    for (TimelineEntityGroupPlugin cacheIdPlugin : cacheIdPlugins) {
+-      LOG.debug("Trying plugin {} for id {} and type {}",
+-          cacheIdPlugin.getClass().getName(), entityId, entityType);
+-      Set<TimelineEntityGroupId> idsFromPlugin
+-          = cacheIdPlugin.getTimelineEntityGroupId(entityId, entityType);
+-      if (idsFromPlugin == null) {
+-        LOG.debug("Plugin returned null " + cacheIdPlugin.getClass().getName());
+-      } else {
+-        LOG.debug("Plugin returned ids: " + idsFromPlugin);
+-      }
+-
+-      if (idsFromPlugin != null) {
+-        groupIds.addAll(idsFromPlugin);
+-        LOG.debug("plugin {} returns a non-null value on query",
+-            cacheIdPlugin.getClass().getName());
+-      }
+-    }
+-    return getTimelineStoresFromCacheIds(groupIds, entityType, cacheItems);
+-  }
+-
+-  private List<TimelineStore> getTimelineStoresForRead(String entityType,
+-      NameValuePair primaryFilter, Collection<NameValuePair> secondaryFilters,
+-      List<EntityCacheItem> cacheItems) throws IOException {
+-    Set<TimelineEntityGroupId> groupIds = new HashSet<TimelineEntityGroupId>();
+-    for (TimelineEntityGroupPlugin cacheIdPlugin : cacheIdPlugins) {
+-      Set<TimelineEntityGroupId> idsFromPlugin =
+-          cacheIdPlugin.getTimelineEntityGroupId(entityType, primaryFilter,
+-              secondaryFilters);
+-      if (idsFromPlugin != null) {
+-        LOG.debug("plugin {} returns a non-null value on query {}",
+-            cacheIdPlugin.getClass().getName(), idsFromPlugin);
+-        groupIds.addAll(idsFromPlugin);
+-      }
+-    }
+-    return getTimelineStoresFromCacheIds(groupIds, entityType, cacheItems);
+-  }
+-
+-  // find a cached timeline store or null if it cannot be located
+-  private TimelineStore getCachedStore(TimelineEntityGroupId groupId,
+-      List<EntityCacheItem> cacheItems) throws IOException {
+-    EntityCacheItem cacheItem;
+-    synchronized (this.cachedLogs) {
+-      // Note that the content in the cache log storage may be stale.
+-      cacheItem = this.cachedLogs.get(groupId);
+-      if (cacheItem == null) {
+-        LOG.debug("Set up new cache item for id {}", groupId);
+-        cacheItem = new EntityCacheItem(groupId, getConfig());
+-        AppLogs appLogs = getAndSetAppLogs(groupId.getApplicationId());
+-        if (appLogs != null) {
+-          LOG.debug("Set applogs {} for group id {}", appLogs, groupId);
+-          cacheItem.setAppLogs(appLogs);
+-          this.cachedLogs.put(groupId, cacheItem);
+-        } else {
+-          LOG.warn("AppLogs for groupId {} is set to null!", groupId);
+-        }
+-      }
+-    }
+-    TimelineStore store = null;
+-    if (cacheItem.getAppLogs() != null) {
+-      AppLogs appLogs = cacheItem.getAppLogs();
+-      LOG.debug("try refresh cache {} {}", groupId, appLogs.getAppId());
+-      cacheItems.add(cacheItem);
+-      store = cacheItem.refreshCache(aclManager, metrics);
+-    } else {
+-      LOG.warn("AppLogs for group id {} is null", groupId);
+-    }
+-    return store;
+-  }
+-
+-  @Override
+-  public TimelineEntities getEntities(String entityType, Long limit,
+-      Long windowStart, Long windowEnd, String fromId, Long fromTs,
+-      NameValuePair primaryFilter, Collection<NameValuePair> secondaryFilters,
+-      EnumSet<Field> fieldsToRetrieve, CheckAcl checkAcl) throws IOException {
+-    LOG.debug("getEntities type={} primary={}", entityType, primaryFilter);
+-    List<EntityCacheItem> relatedCacheItems = new ArrayList<>();
+-    List<TimelineStore> stores = getTimelineStoresForRead(entityType,
+-        primaryFilter, secondaryFilters, relatedCacheItems);
+-    TimelineEntities returnEntities = new TimelineEntities();
+-    for (TimelineStore store : stores) {
+-      LOG.debug("Try timeline store {} for the request", store.getName());
+-      TimelineEntities entities = store.getEntities(entityType, limit,
+-          windowStart, windowEnd, fromId, fromTs, primaryFilter,
+-          secondaryFilters, fieldsToRetrieve, checkAcl);
+-      if (entities != null) {
+-        returnEntities.addEntities(entities.getEntities());
+-      }
+-    }
+-    return returnEntities;
+-  }
+-
+-  @Override
+-  public TimelineEntity getEntity(String entityId, String entityType,
+-      EnumSet<Field> fieldsToRetrieve) throws IOException {
+-    LOG.debug("getEntity type={} id={}", entityType, entityId);
+-    List<EntityCacheItem> relatedCacheItems = new ArrayList<>();
+-    List<TimelineStore> stores = getTimelineStoresForRead(entityId, entityType,
+-        relatedCacheItems);
+-    for (TimelineStore store : stores) {
+-      LOG.debug("Try timeline store {}:{} for the request", store.getName(),
+-          store.toString());
+-      TimelineEntity e =
+-          store.getEntity(entityId, entityType, fieldsToRetrieve);
+-      if (e != null) {
+-        return e;
+-      }
+-    }
+-    LOG.debug("getEntity: Found nothing");
+-    return null;
+-  }
+-
+-  @Override
+-  public TimelineEvents getEntityTimelines(String entityType,
+-      SortedSet<String> entityIds, Long limit, Long windowStart,
+-      Long windowEnd, Set<String> eventTypes) throws IOException {
+-    LOG.debug("getEntityTimelines type={} ids={}", entityType, entityIds);
+-    TimelineEvents returnEvents = new TimelineEvents();
+-    List<EntityCacheItem> relatedCacheItems = new ArrayList<>();
+-
+-    if (entityIds == null || entityIds.isEmpty()) {
+-      return returnEvents;
+-    }
+-
+-    for (String entityId : entityIds) {
+-      LOG.debug("getEntityTimeline type={} id={}", entityType, entityId);
+-      List<TimelineStore> stores
+-          = getTimelineStoresForRead(entityId, entityType, relatedCacheItems);
+-      for (TimelineStore store : stores) {
+-        LOG.debug("Try timeline store {}:{} for the request", store.getName(),
+-            store.toString());
+-        SortedSet<String> entityIdSet = new TreeSet<>();
+-        entityIdSet.add(entityId);
+-        TimelineEvents events =
+-            store.getEntityTimelines(entityType, entityIdSet, limit,
+-                windowStart, windowEnd, eventTypes);
+-        if (events != null) {
+-          returnEvents.addEvents(events.getAllEvents());
+-        }
+-      }
+-    }
+-    return returnEvents;
+-  }
+-
+-  @Override
+-  public TimelineDomain getDomain(String domainId) throws IOException {
+-    return summaryStore.getDomain(domainId);
+-  }
+-
+-  @Override
+-  public TimelineDomains getDomains(String owner) throws IOException {
+-    return summaryStore.getDomains(owner);
+-  }
+-
+-  @Override
+-  public TimelinePutResponse put(TimelineEntities data) throws IOException {
+-    return summaryStore.put(data);
+-  }
+-
+-  @Override
+-  public void put(TimelineDomain domain) throws IOException {
+-    summaryStore.put(domain);
+-  }
+-
+-  /**
+-   * This is a special remote iterator whose {@link #hasNext()} method
+-   * returns false if {@link #stopExecutors} is true.
+-   *
+-   * This provides an implicit shutdown of all iterative file list and scan
+-   * operations without needing to implement it in the while loops themselves.
+-   */
+-  private class StoppableRemoteIterator implements RemoteIterator<FileStatus> {
+-    private final RemoteIterator<FileStatus> remote;
+-
+-    public StoppableRemoteIterator(RemoteIterator<FileStatus> remote) {
+-      this.remote = remote;
+-    }
+-
+-    @Override
+-    public boolean hasNext() throws IOException {
+-      return !stopExecutors.get() && remote.hasNext();
+-    }
+-
+-    @Override
+-    public FileStatus next() throws IOException {
+-      return remote.next();
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStoreMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStoreMetrics.java
+deleted file mode 100644
+index de2ef3ba6f2..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStoreMetrics.java
++++ /dev/null
+@@ -1,160 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.metrics2.MetricsSystem;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+-import org.apache.hadoop.metrics2.lib.MutableStat;
+-
+-/**
+- * This class tracks metrics for the EntityGroupFSTimelineStore. It tracks
+- * the read and write metrics for timeline server v1.5. It serves as a
+- * complement to {@link TimelineDataManagerMetrics}.
+- */
+-@Metrics(about="Metrics for EntityGroupFSTimelineStore", context="yarn")
+-public class EntityGroupFSTimelineStoreMetrics {
+-  private static final String DEFAULT_VALUE_WITH_SCALE = "TimeMs";
+-
+-  // General read related metrics
+-  @Metric("getEntity calls to summary storage")
+-  private MutableCounterLong getEntityToSummaryOps;
+-
+-  @Metric("getEntity calls to detail storage")
+-  private MutableCounterLong getEntityToDetailOps;
+-
+-  // Summary data related metrics
+-  @Metric(value = "summary log read ops and time",
+-      valueName = DEFAULT_VALUE_WITH_SCALE)
+-  private MutableStat summaryLogRead;
+-
+-  @Metric("entities read into the summary storage")
+-  private MutableCounterLong entitiesReadToSummary;
+-
+-  // Detail data cache related metrics
+-  @Metric("cache storage read that does not require a refresh")
+-  private MutableCounterLong noRefreshCacheRead;
+-
+-  @Metric("cache storage refresh due to the cached storage is stale")
+-  private MutableCounterLong cacheStaleRefreshes;
+-
+-  @Metric("cache storage evicts")
+-  private MutableCounterLong cacheEvicts;
+-
+-  @Metric(value = "cache storage refresh ops and time",
+-      valueName = DEFAULT_VALUE_WITH_SCALE)
+-  private MutableStat cacheRefresh;
+-
+-  // Log scanner and cleaner related metrics
+-  @Metric(value = "active log scan ops and time",
+-      valueName = DEFAULT_VALUE_WITH_SCALE)
+-  private MutableStat activeLogDirScan;
+-
+-  @Metric(value = "log cleaner purging ops and time",
+-      valueName = DEFAULT_VALUE_WITH_SCALE)
+-  private MutableStat logClean;
+-
+-  @Metric("log cleaner dirs purged")
+-  private MutableCounterLong logsDirsCleaned;
+-
+-  private static EntityGroupFSTimelineStoreMetrics instance = null;
+-
+-  EntityGroupFSTimelineStoreMetrics() {
+-  }
+-
+-  public static synchronized EntityGroupFSTimelineStoreMetrics create() {
+-    if (instance == null) {
+-      MetricsSystem ms = DefaultMetricsSystem.instance();
+-      instance = ms.register(new EntityGroupFSTimelineStoreMetrics());
+-    }
+-    return instance;
+-  }
+-
+-  // Setters
+-  // General read related
+-  public void incrGetEntityToSummaryOps() {
+-    getEntityToSummaryOps.incr();
+-  }
+-
+-  public void incrGetEntityToDetailOps() {
+-    getEntityToDetailOps.incr();
+-  }
+-
+-  // Summary data related
+-  public void addSummaryLogReadTime(long msec) {
+-    summaryLogRead.add(msec);
+-  }
+-
+-  public void incrEntitiesReadToSummary(long delta) {
+-    entitiesReadToSummary.incr(delta);
+-  }
+-
+-  // Cache related
+-  public void incrNoRefreshCacheRead() {
+-    noRefreshCacheRead.incr();
+-  }
+-
+-  public void incrCacheStaleRefreshes() {
+-    cacheStaleRefreshes.incr();
+-  }
+-
+-  public void incrCacheEvicts() {
+-    cacheEvicts.incr();
+-  }
+-
+-  public void addCacheRefreshTime(long msec) {
+-    cacheRefresh.add(msec);
+-  }
+-
+-  // Log scanner and cleaner related
+-  public void addActiveLogDirScanTime(long msec) {
+-    activeLogDirScan.add(msec);
+-  }
+-
+-  public void addLogCleanTime(long msec) {
+-    logClean.add(msec);
+-  }
+-
+-  public void incrLogsDirsCleaned() {
+-    logsDirsCleaned.incr();
+-  }
+-
+-  // Getters
+-  MutableCounterLong getEntitiesReadToSummary() {
+-    return entitiesReadToSummary;
+-  }
+-
+-  MutableCounterLong getLogsDirsCleaned() {
+-    return logsDirsCleaned;
+-  }
+-
+-  MutableCounterLong getGetEntityToSummaryOps() {
+-    return getEntityToSummaryOps;
+-  }
+-
+-  MutableCounterLong getGetEntityToDetailOps() {
+-    return getEntityToDetailOps;
+-  }
+-
+-  MutableStat getCacheRefresh() {
+-    return cacheRefresh;
+-  }
+-}
+-
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
+deleted file mode 100644
+index f84eeebbf0c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LevelDBCacheTimelineStore.java
++++ /dev/null
+@@ -1,328 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.timeline.util.LeveldbUtils;
+-import org.fusesource.leveldbjni.JniDBFactory;
+-import org.iq80.leveldb.DB;
+-import org.iq80.leveldb.DBIterator;
+-import org.iq80.leveldb.Options;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.util.Map;
+-import java.util.concurrent.atomic.AtomicInteger;
+-
+-/**
+- * LevelDB implementation of {@link KeyValueBasedTimelineStore}. This
+- * implementation stores the entity hash map into a LevelDB instance.
+- * There are two partitions of the key space. One partition is to store a
+- * entity id to start time mapping:
+- *
+- * i!ENTITY_ID!ENTITY_TYPE to ENTITY_START_TIME
+- *
+- * The other partition is to store the actual data:
+- *
+- * e!START_TIME!ENTITY_ID!ENTITY_TYPE to ENTITY_BYTES
+- *
+- * This storage does not have any garbage collection mechanism, and is designed
+- * mainly for caching usages.
+- */
+-@Private
+-@Unstable
+-public class LevelDBCacheTimelineStore extends KeyValueBasedTimelineStore {
+-  private static final Logger LOG
+-      = LoggerFactory.getLogger(LevelDBCacheTimelineStore.class);
+-  private static final String CACHED_LDB_FILE_PREFIX = "-timeline-cache.ldb";
+-  private String dbId;
+-  private DB entityDb;
+-  private Configuration configuration;
+-  private static final AtomicInteger DB_COUNTER = new AtomicInteger(0);
+-  private static final String CACHED_LDB_FILENAME = "db";
+-
+-  public LevelDBCacheTimelineStore(String id, String name) {
+-    super(name);
+-    dbId = id;
+-    entityInsertTimes = new MemoryTimelineStore.HashMapStoreAdapter<>();
+-    domainById = new MemoryTimelineStore.HashMapStoreAdapter<>();
+-    domainsByOwner = new MemoryTimelineStore.HashMapStoreAdapter<>();
+-  }
+-
+-  public LevelDBCacheTimelineStore(String id) {
+-    this(id, LevelDBCacheTimelineStore.class.getName());
+-  }
+-
+-  public LevelDBCacheTimelineStore() {
+-    this(CACHED_LDB_FILENAME + String.valueOf(DB_COUNTER.getAndIncrement()),
+-        LevelDBCacheTimelineStore.class.getName());
+-  }
+-
+-  @Override
+-  protected synchronized void serviceInit(Configuration conf) throws Exception {
+-    configuration = conf;
+-    Options options = new Options();
+-    options.createIfMissing(true);
+-    options.cacheSize(conf.getLong(
+-        YarnConfiguration.TIMELINE_SERVICE_LEVELDB_CACHE_READ_CACHE_SIZE,
+-        YarnConfiguration.
+-            DEFAULT_TIMELINE_SERVICE_LEVELDB_CACHE_READ_CACHE_SIZE));
+-    JniDBFactory factory = new JniDBFactory();
+-    Path dbPath = new Path(
+-        conf.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_PATH),
+-        dbId + CACHED_LDB_FILE_PREFIX);
+-    FileSystem localFS = null;
+-
+-    try {
+-      localFS = FileSystem.getLocal(conf);
+-      if (!localFS.exists(dbPath)) {
+-        if (!localFS.mkdirs(dbPath)) {
+-          throw new IOException("Couldn't create directory for leveldb " +
+-              "timeline store " + dbPath);
+-        }
+-        localFS.setPermission(dbPath, LeveldbUtils.LEVELDB_DIR_UMASK);
+-      }
+-    } finally {
+-      IOUtils.cleanupWithLogger(LOG, localFS);
+-    }
+-    LOG.info("Using leveldb path " + dbPath);
+-    entityDb = factory.open(new File(dbPath.toString()), options);
+-    entities = new LevelDBMapAdapter<>(entityDb);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected synchronized void serviceStop() throws Exception {
+-    IOUtils.cleanupWithLogger(LOG, entityDb);
+-    Path dbPath = new Path(
+-        configuration.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_PATH),
+-        dbId + CACHED_LDB_FILE_PREFIX);
+-    FileSystem localFS = null;
+-    try {
+-      localFS = FileSystem.getLocal(configuration);
+-      if (!localFS.delete(dbPath, true)) {
+-          throw new IOException("Couldn't delete data file for leveldb " +
+-              "timeline store " + dbPath);
+-      }
+-    } finally {
+-      IOUtils.cleanupWithLogger(LOG, localFS);
+-    }
+-    super.serviceStop();
+-  }
+-
+-  /**
+-   * A specialized hash map storage that uses LevelDB for storing entity id to
+-   * entity mappings.
+-   *
+-   * @param <K> an {@link EntityIdentifier} typed hash key
+-   * @param <V> a {@link TimelineEntity} typed value
+-   */
+-  static class LevelDBMapAdapter<K extends EntityIdentifier,
+-      V extends TimelineEntity> implements TimelineStoreMapAdapter<K, V> {
+-    private static final String TIME_INDEX_PREFIX = "i";
+-    private static final String ENTITY_STORAGE_PREFIX = "e";
+-    DB entityDb;
+-
+-    public LevelDBMapAdapter(DB currLevelDb) {
+-      entityDb = currLevelDb;
+-    }
+-
+-    @Override
+-    public V get(K entityId) {
+-      V result = null;
+-      // Read the start time from the index
+-      byte[] startTimeBytes = entityDb.get(getStartTimeKey(entityId));
+-      if (startTimeBytes == null) {
+-        return null;
+-      }
+-
+-      // Build the key for the entity storage and read it
+-      try {
+-        result = getEntityForKey(getEntityKey(entityId, startTimeBytes));
+-      } catch (IOException e) {
+-        LOG.error("GenericObjectMapper cannot read key from key "
+-            + entityId.toString()
+-            + " into an object. Read aborted! ");
+-        LOG.error(e.getMessage());
+-      }
+-
+-      return result;
+-    }
+-
+-    @Override
+-    public void put(K entityId, V entity) {
+-      Long startTime = entity.getStartTime();
+-      if (startTime == null) {
+-        startTime = System.currentTimeMillis();
+-      }
+-      // Build the key for the entity storage and read it
+-      byte[] startTimeBytes = GenericObjectMapper.writeReverseOrderedLong(
+-          startTime);
+-      try {
+-        byte[] valueBytes = GenericObjectMapper.write(entity);
+-        entityDb.put(getEntityKey(entityId, startTimeBytes), valueBytes);
+-      } catch (IOException e) {
+-        LOG.error("GenericObjectMapper cannot write "
+-            + entity.getClass().getName()
+-            + " into a byte array. Write aborted! ");
+-        LOG.error(e.getMessage());
+-      }
+-
+-      // Build the key for the start time index
+-      entityDb.put(getStartTimeKey(entityId), startTimeBytes);
+-    }
+-
+-    @Override
+-    public void remove(K entityId) {
+-      // Read the start time from the index (key starts with an "i") then delete
+-      // the record
+-      LeveldbUtils.KeyBuilder startTimeKeyBuilder
+-          = LeveldbUtils.KeyBuilder.newInstance();
+-      startTimeKeyBuilder.add(TIME_INDEX_PREFIX).add(entityId.getId())
+-          .add(entityId.getType());
+-      byte[] startTimeBytes = entityDb.get(startTimeKeyBuilder.getBytes());
+-      if (startTimeBytes == null) {
+-        return;
+-      }
+-      entityDb.delete(startTimeKeyBuilder.getBytes());
+-
+-      // Build the key for the entity storage and delete it
+-      entityDb.delete(getEntityKey(entityId, startTimeBytes));
+-    }
+-
+-    @Override
+-    public CloseableIterator<V> valueSetIterator() {
+-      return getIterator(null, Long.MAX_VALUE);
+-    }
+-
+-    @Override
+-    public CloseableIterator<V> valueSetIterator(V minV) {
+-      return getIterator(
+-          new EntityIdentifier(minV.getEntityId(), minV.getEntityType()),
+-          minV.getStartTime());
+-    }
+-
+-    private CloseableIterator<V> getIterator(
+-        EntityIdentifier startId, long startTimeMax) {
+-
+-      final DBIterator internalDbIterator = entityDb.iterator();
+-
+-      // we need to iterate from the first element with key greater than or
+-      // equal to ENTITY_STORAGE_PREFIX!maxTS(!startId), but stop on the first
+-      // key who does not have prefix ENTITY_STORATE_PREFIX
+-
+-      // decide end prefix
+-      LeveldbUtils.KeyBuilder entityPrefixKeyBuilder
+-          = LeveldbUtils.KeyBuilder.newInstance();
+-      entityPrefixKeyBuilder.add(ENTITY_STORAGE_PREFIX);
+-      final byte[] prefixBytes = entityPrefixKeyBuilder.getBytesForLookup();
+-      // decide start prefix on top of end prefix and seek
+-      final byte[] startTimeBytes
+-          = GenericObjectMapper.writeReverseOrderedLong(startTimeMax);
+-      entityPrefixKeyBuilder.add(startTimeBytes, true);
+-      if (startId != null) {
+-        entityPrefixKeyBuilder.add(startId.getId());
+-      }
+-      final byte[] startPrefixBytes
+-          = entityPrefixKeyBuilder.getBytesForLookup();
+-      internalDbIterator.seek(startPrefixBytes);
+-
+-      return new CloseableIterator<V>() {
+-        @Override
+-        public boolean hasNext() {
+-          if (!internalDbIterator.hasNext()) {
+-            return false;
+-          }
+-          Map.Entry<byte[], byte[]> nextEntry = internalDbIterator.peekNext();
+-          if (LeveldbUtils.prefixMatches(
+-              prefixBytes, prefixBytes.length, nextEntry.getKey())) {
+-            return true;
+-          }
+-          return false;
+-        }
+-
+-        @Override
+-        public V next() {
+-          if (hasNext()) {
+-            Map.Entry<byte[], byte[]> nextRaw = internalDbIterator.next();
+-            try {
+-              V result = getEntityForKey(nextRaw.getKey());
+-              return result;
+-            } catch (IOException e) {
+-              LOG.error("GenericObjectMapper cannot read key from key "
+-                  + nextRaw.getKey()
+-                  + " into an object. Read aborted! ");
+-              LOG.error(e.getMessage());
+-            }
+-          }
+-          return null;
+-        }
+-
+-        // We do not support remove operations within one iteration
+-        @Override
+-        public void remove() {
+-          LOG.error("LevelDB map adapter does not support iterate-and-remove"
+-              + " use cases. ");
+-        }
+-
+-        @Override
+-        public void close() throws IOException {
+-          internalDbIterator.close();
+-        }
+-      };
+-    }
+-    static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+-
+-    @SuppressWarnings("unchecked")
+-    private V getEntityForKey(byte[] key) throws IOException {
+-      byte[] resultRaw = entityDb.get(key);
+-      if (resultRaw == null) {
+-        return null;
+-      }
+-      return (V) OBJECT_MAPPER.readValue(resultRaw, TimelineEntity.class);
+-    }
+-
+-    private byte[] getStartTimeKey(K entityId) {
+-      LeveldbUtils.KeyBuilder startTimeKeyBuilder
+-          = LeveldbUtils.KeyBuilder.newInstance();
+-      startTimeKeyBuilder.add(TIME_INDEX_PREFIX).add(entityId.getId())
+-          .add(entityId.getType());
+-      return startTimeKeyBuilder.getBytes();
+-    }
+-
+-    private byte[] getEntityKey(K entityId, byte[] startTimeBytes) {
+-      LeveldbUtils.KeyBuilder entityKeyBuilder
+-          = LeveldbUtils.KeyBuilder.newInstance();
+-      entityKeyBuilder.add(ENTITY_STORAGE_PREFIX).add(startTimeBytes, true)
+-          .add(entityId.getId()).add(entityId.getType());
+-      return entityKeyBuilder.getBytes();
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LogInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LogInfo.java
+deleted file mode 100644
+index 8cc6b72ab9c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/LogInfo.java
++++ /dev/null
+@@ -1,304 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonParseException;
+-import com.fasterxml.jackson.core.JsonParser;
+-import com.fasterxml.jackson.databind.MappingIterator;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.util.Time;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.util.ArrayList;
+-
+-abstract class LogInfo {
+-  public static final String ENTITY_FILE_NAME_DELIMITERS = "_.";
+-
+-  public String getAttemptDirName() {
+-    return attemptDirName;
+-  }
+-
+-  public long getOffset() {
+-    return offset;
+-  }
+-
+-  public void setOffset(long newOffset) {
+-    this.offset = newOffset;
+-  }
+-
+-
+-  public long getLastProcessedTime() {
+-    return lastProcessedTime;
+-  }
+-
+-  public void setLastProcessedTime(long lastProcessedTime) {
+-    this.lastProcessedTime = lastProcessedTime;
+-  }
+-
+-  private String attemptDirName;
+-  private long lastProcessedTime = -1;
+-  private String filename;
+-  private String user;
+-  private long offset = 0;
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(LogInfo.class);
+-
+-  public LogInfo(String attemptDirName, String file, String owner) {
+-    this.attemptDirName = attemptDirName;
+-    filename = file;
+-    user = owner;
+-  }
+-
+-  public Path getPath(Path rootPath) {
+-    Path attemptPath = new Path(rootPath, attemptDirName);
+-    return new Path(attemptPath, filename);
+-  }
+-
+-  public String getFilename() {
+-    return filename;
+-  }
+-
+-  public boolean matchesGroupId(TimelineEntityGroupId groupId) {
+-    return matchesGroupId(groupId.toString());
+-  }
+-
+-  @InterfaceAudience.Private
+-  @VisibleForTesting
+-  boolean matchesGroupId(String groupId){
+-    // Return true if the group id is a segment (separated by _, ., or end of
+-    // string) of the file name.
+-    int pos = filename.indexOf(groupId);
+-    if (pos < 0) {
+-      return false;
+-    }
+-    return filename.length() == pos + groupId.length()
+-        || ENTITY_FILE_NAME_DELIMITERS.contains(String.valueOf(
+-        filename.charAt(pos + groupId.length())
+-    ));
+-  }
+-
+-  public long parseForStore(TimelineDataManager tdm, Path appDirPath,
+-      boolean appCompleted, JsonFactory jsonFactory, ObjectMapper objMapper,
+-      FileSystem fs) throws IOException {
+-    LOG.debug("Parsing for log dir {} on attempt {}", appDirPath,
+-        attemptDirName);
+-    Path logPath = getPath(appDirPath);
+-    FileStatus status = fs.getFileStatus(logPath);
+-    long numParsed = 0;
+-    if (status != null) {
+-      long curModificationTime = status.getModificationTime();
+-      if (curModificationTime > getLastProcessedTime()) {
+-        long startTime = Time.monotonicNow();
+-        try {
+-          LOG.info("Parsing {} at offset {}", logPath, offset);
+-          long count =
+-              parsePath(tdm, logPath, appCompleted, jsonFactory, objMapper, fs);
+-          setLastProcessedTime(curModificationTime);
+-          LOG.info("Parsed {} entities from {} in {} msec", count, logPath,
+-              Time.monotonicNow() - startTime);
+-          numParsed += count;
+-        } catch (RuntimeException e) {
+-          // If AppLogs cannot parse this log, it may be corrupted or just empty
+-          if (e.getCause() instanceof JsonParseException
+-              && (status.getLen() > 0 || offset > 0)) {
+-            // log on parse problems if the file as been read in the past or
+-            // is visibly non-empty
+-            LOG.info("Log {} appears to be corrupted. Skip. ", logPath);
+-          } else {
+-            LOG.error("Failed to parse " + logPath + " from offset " + offset,
+-                e);
+-          }
+-        }
+-      } else {
+-        LOG.info("Skip Parsing {} as there is no change", logPath);
+-      }
+-    } else {
+-      LOG.warn("{} no longer exists. Skip for scanning. ", logPath);
+-    }
+-    return numParsed;
+-  }
+-
+-  private long parsePath(TimelineDataManager tdm, Path logPath,
+-      boolean appCompleted, JsonFactory jsonFactory, ObjectMapper objMapper,
+-      FileSystem fs) throws IOException {
+-    UserGroupInformation ugi =
+-        UserGroupInformation.createRemoteUser(user);
+-    FSDataInputStream in = fs.open(logPath);
+-    JsonParser parser = null;
+-    try {
+-      in.seek(offset);
+-      try {
+-        parser = jsonFactory.createParser((InputStream)in);
+-        parser.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, false);
+-      } catch (IOException e) {
+-        // if app hasn't completed then there may be errors due to the
+-        // incomplete file which are treated as EOF until app completes
+-        if (appCompleted) {
+-          throw e;
+-        } else {
+-          LOG.debug("Exception in parse path: {}", e.getMessage());
+-          return 0;
+-        }
+-      }
+-
+-      return doParse(tdm, parser, objMapper, ugi, appCompleted);
+-    } finally {
+-      IOUtils.closeStream(parser);
+-      IOUtils.closeStream(in);
+-    }
+-  }
+-
+-  protected abstract long doParse(TimelineDataManager tdm, JsonParser parser,
+-      ObjectMapper objMapper, UserGroupInformation ugi, boolean appCompleted)
+-      throws IOException;
+-}
+-
+-class EntityLogInfo extends LogInfo {
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      EntityGroupFSTimelineStore.class);
+-
+-  public EntityLogInfo(String attemptId,
+-      String file, String owner) {
+-    super(attemptId, file, owner);
+-  }
+-
+-  @Override
+-  protected long doParse(TimelineDataManager tdm, JsonParser parser,
+-      ObjectMapper objMapper, UserGroupInformation ugi, boolean appCompleted)
+-      throws IOException {
+-    long count = 0;
+-    TimelineEntities entities = new TimelineEntities();
+-    ArrayList<TimelineEntity> entityList = new ArrayList<TimelineEntity>(1);
+-    boolean postError = false;
+-    try {
+-      MappingIterator<TimelineEntity> iter = objMapper.readValues(parser,
+-          TimelineEntity.class);
+-      long curPos;
+-      while (iter.hasNext()) {
+-        TimelineEntity entity = iter.next();
+-        String etype = entity.getEntityType();
+-        String eid = entity.getEntityId();
+-        LOG.debug("Read entity {} of {}", eid, etype);
+-        ++count;
+-        curPos = ((FSDataInputStream) parser.getInputSource()).getPos();
+-        LOG.debug("Parser now at offset {}", curPos);
+-
+-        try {
+-          LOG.debug("Adding {}({}) to store", eid, etype);
+-          entityList.add(entity);
+-          entities.setEntities(entityList);
+-          TimelinePutResponse response = tdm.postEntities(entities, ugi);
+-          for (TimelinePutResponse.TimelinePutError e
+-              : response.getErrors()) {
+-            LOG.warn("Error putting entity: {} ({}): {}",
+-                e.getEntityId(), e.getEntityType(), e.getErrorCode());
+-          }
+-          setOffset(curPos);
+-          entityList.clear();
+-        } catch (YarnException e) {
+-          postError = true;
+-          throw new IOException("Error posting entities", e);
+-        } catch (IOException e) {
+-          postError = true;
+-          throw new IOException("Error posting entities", e);
+-        }
+-      }
+-    } catch (IOException e) {
+-      // if app hasn't completed then there may be errors due to the
+-      // incomplete file which are treated as EOF until app completes
+-      if (appCompleted || postError) {
+-        throw e;
+-      }
+-    } catch (RuntimeException e) {
+-      if (appCompleted || !(e.getCause() instanceof JsonParseException)) {
+-        throw e;
+-      }
+-    }
+-    return count;
+-  }
+-}
+-
+-class DomainLogInfo extends LogInfo {
+-  private static final Logger LOG = LoggerFactory.getLogger(
+-      EntityGroupFSTimelineStore.class);
+-
+-  public DomainLogInfo(String attemptDirName, String file,
+-      String owner) {
+-    super(attemptDirName, file, owner);
+-  }
+-
+-  protected long doParse(TimelineDataManager tdm, JsonParser parser,
+-      ObjectMapper objMapper, UserGroupInformation ugi, boolean appCompleted)
+-      throws IOException {
+-    long count = 0;
+-    long curPos;
+-    boolean putError = false;
+-    try {
+-      MappingIterator<TimelineDomain> iter = objMapper.readValues(parser,
+-          TimelineDomain.class);
+-
+-      while (iter.hasNext()) {
+-        TimelineDomain domain = iter.next();
+-        domain.setOwner(ugi.getShortUserName());
+-        LOG.trace("Read domain {}", domain.getId());
+-        ++count;
+-        curPos = ((FSDataInputStream) parser.getInputSource()).getPos();
+-        LOG.debug("Parser now at offset {}", curPos);
+-
+-        try {
+-          tdm.putDomain(domain, ugi);
+-          setOffset(curPos);
+-        } catch (YarnException e) {
+-          putError = true;
+-          throw new IOException("Error posting domain", e);
+-        } catch (IOException e) {
+-          putError = true;
+-          throw new IOException("Error posting domain", e);
+-        }
+-      }
+-    } catch (IOException e) {
+-      // if app hasn't completed then there may be errors due to the
+-      // incomplete file which are treated as EOF until app completes
+-      if (appCompleted || putError) {
+-        throw e;
+-      }
+-    } catch (RuntimeException e) {
+-      if (appCompleted || !(e.getCause() instanceof JsonParseException)) {
+-        throw e;
+-      }
+-    }
+-    return count;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineEntityGroupPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineEntityGroupPlugin.java
+deleted file mode 100644
+index 9cdbf5fc2e9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/TimelineEntityGroupPlugin.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-
+-import java.util.Collection;
+-import java.util.Set;
+-import java.util.SortedSet;
+-
+-/**
+- * Plugin to map a requested query ( or an Entity/set of Entities ) to a CacheID.
+- * The Cache ID is an identifier to the data set that needs to be queried to
+- * serve the response for the query.
+- */
+-public abstract class TimelineEntityGroupPlugin {
+-
+-  /**
+-   * Get the {@link TimelineEntityGroupId}s for the data sets that need to be
+-   * scanned to serve the query.
+-   *
+-   * @param entityType Entity Type being queried
+-   * @param primaryFilter Primary filter being applied
+-   * @param secondaryFilters Secondary filters being applied in the query
+-   * @return {@link org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId}
+-   */
+-  public abstract Set<TimelineEntityGroupId> getTimelineEntityGroupId(
+-      String entityType, NameValuePair primaryFilter,
+-      Collection<NameValuePair> secondaryFilters);
+-
+-  /**
+-   * Get the {@link TimelineEntityGroupId}s for the data sets that need to be
+-   * scanned to serve the query.
+-   *
+-   * @param entityType Entity Type being queried
+-   * @param entityId Entity Id being requested
+-   * @return {@link org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId}
+-   */
+-  public abstract Set<TimelineEntityGroupId> getTimelineEntityGroupId(
+-      String entityId,
+-      String entityType);
+-
+-
+-  /**
+-   * Get the {@link TimelineEntityGroupId}s for the data sets that need to be
+-   * scanned to serve the query.
+-   *
+-   * @param entityType Entity Type being queried
+-   * @param entityIds Entity Ids being requested
+-   * @param eventTypes Event Types being requested
+-   * @return {@link org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId}
+-   */
+-  public abstract Set<TimelineEntityGroupId> getTimelineEntityGroupId(
+-      String entityType, SortedSet<String> entityIds,
+-      Set<String> eventTypes);
+-
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/package-info.java
+deleted file mode 100644
+index 6f61bba43d3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/package-info.java
++++ /dev/null
+@@ -1,23 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-@InterfaceAudience.Private
+-@InterfaceStability.Unstable
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.classification.InterfaceAudience;
+-import org.apache.hadoop.classification.InterfaceStability;
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/EntityGroupPlugInForTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/EntityGroupPlugInForTest.java
+deleted file mode 100644
+index 89208054de3..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/EntityGroupPlugInForTest.java
++++ /dev/null
+@@ -1,59 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.util.Sets;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntityGroupId;
+-
+-import java.util.Collection;
+-import java.util.Set;
+-import java.util.SortedSet;
+-
+-class EntityGroupPlugInForTest extends TimelineEntityGroupPlugin {
+-
+-  static final String APP_ID_FILTER_NAME = "appid";
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityType,
+-      NameValuePair primaryFilter,
+-      Collection<NameValuePair> secondaryFilters) {
+-    ApplicationId appId = ApplicationId.fromString(
+-        primaryFilter.getValue().toString());
+-    return Sets.newHashSet(getStandardTimelineGroupId(appId));
+-  }
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityId,
+-      String entityType) {
+-    ApplicationId appId = ApplicationId.fromString(
+-        entityId);
+-    return Sets.newHashSet(getStandardTimelineGroupId(appId));
+-  }
+-
+-  @Override
+-  public Set<TimelineEntityGroupId> getTimelineEntityGroupId(String entityType,
+-      SortedSet<String> entityIds,
+-      Set<String> eventTypes) {
+-    return Sets.newHashSet();
+-  }
+-
+-  static TimelineEntityGroupId getStandardTimelineGroupId(ApplicationId appId) {
+-    return TimelineEntityGroupId.newInstance(appId, "test");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/PluginStoreTestUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/PluginStoreTestUtils.java
+deleted file mode 100644
+index cb887fe264f..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/PluginStoreTestUtils.java
++++ /dev/null
+@@ -1,256 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.type.TypeFactory;
+-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEvent;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.util.ArrayList;
+-import java.util.Collections;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-
+-/**
+- * Utility methods related to the ATS v1.5 plugin storage tests.
+- */
+-public class PluginStoreTestUtils {
+-
+-  /**
+-   * For a given file system, setup directories ready to test the plugin storage.
+-   *
+-   * @param fs a {@link FileSystem} object that the plugin storage will work with
+-   * @return the dfsCluster ready to start plugin storage tests.
+-   * @throws IOException
+-   */
+-  public static FileSystem prepareFileSystemForPluginStore(FileSystem fs)
+-      throws IOException {
+-    Path activeDir = new Path(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_ACTIVE_DIR_DEFAULT
+-    );
+-    Path doneDir = new Path(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR_DEFAULT
+-    );
+-
+-    fs.mkdirs(activeDir);
+-    fs.mkdirs(doneDir);
+-    return fs;
+-  }
+-
+-  /**
+-   * Prepare configuration for plugin tests. This method will also add the mini
+-   * DFS cluster's info to the configuration.
+-   * Note: the test program needs to setup the reader plugin by itself.
+-   *
+-   * @param conf
+-   * @param dfsCluster
+-   * @return the modified configuration
+-   */
+-  public static YarnConfiguration prepareConfiguration(YarnConfiguration conf,
+-      MiniDFSCluster dfsCluster) {
+-    conf.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY,
+-        dfsCluster.getURI().toString());
+-    conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 1.5f);
+-    conf.setLong(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SCAN_INTERVAL_SECONDS,
+-        1);
+-    conf.set(YarnConfiguration.TIMELINE_SERVICE_STORE,
+-        EntityGroupFSTimelineStore.class.getName());
+-    return conf;
+-  }
+-
+-  static FSDataOutputStream createLogFile(Path logPath, FileSystem fs)
+-      throws IOException {
+-    FSDataOutputStream stream;
+-    stream = fs.create(logPath, true);
+-    return stream;
+-  }
+-
+-  static ObjectMapper createObjectMapper() {
+-    ObjectMapper mapper = new ObjectMapper();
+-    mapper.setAnnotationIntrospector(
+-        new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()));
+-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+-    return mapper;
+-  }
+-
+-  /**
+-   * Create sample entities for testing
+-   * @return two timeline entities in a {@link TimelineEntities} object
+-   */
+-  static TimelineEntities generateTestEntities() {
+-    TimelineEntities entities = new TimelineEntities();
+-    Map<String, Set<Object>> primaryFilters =
+-        new HashMap<String, Set<Object>>();
+-    Set<Object> l1 = new HashSet<Object>();
+-    l1.add("username");
+-    Set<Object> l2 = new HashSet<Object>();
+-    l2.add(Integer.MAX_VALUE);
+-    Set<Object> l3 = new HashSet<Object>();
+-    l3.add("123abc");
+-    Set<Object> l4 = new HashSet<Object>();
+-    l4.add((long)Integer.MAX_VALUE + 1l);
+-    primaryFilters.put("user", l1);
+-    primaryFilters.put("appname", l2);
+-    primaryFilters.put("other", l3);
+-    primaryFilters.put("long", l4);
+-    Map<String, Object> secondaryFilters = new HashMap<String, Object>();
+-    secondaryFilters.put("startTime", 123456);
+-    secondaryFilters.put("status", "RUNNING");
+-    Map<String, Object> otherInfo1 = new HashMap<String, Object>();
+-    otherInfo1.put("info1", "val1");
+-    otherInfo1.putAll(secondaryFilters);
+-
+-    String entityId1 = "id_1";
+-    String entityType1 = "type_1";
+-    String entityId2 = "id_2";
+-    String entityType2 = "type_2";
+-
+-    Map<String, Set<String>> relatedEntities =
+-        new HashMap<String, Set<String>>();
+-    relatedEntities.put(entityType2, Collections.singleton(entityId2));
+-
+-    TimelineEvent ev3 = createEvent(789l, "launch_event", null);
+-    TimelineEvent ev4 = createEvent(0l, "init_event", null);
+-    List<TimelineEvent> events = new ArrayList<TimelineEvent>();
+-    events.add(ev3);
+-    events.add(ev4);
+-    entities.addEntity(createEntity(entityId2, entityType2, 456l, events, null,
+-        null, null, "domain_id_1"));
+-
+-    TimelineEvent ev1 = createEvent(123l, "start_event", null);
+-    entities.addEntity(createEntity(entityId1, entityType1, 123l,
+-        Collections.singletonList(ev1), relatedEntities, primaryFilters,
+-        otherInfo1, "domain_id_1"));
+-    return entities;
+-  }
+-
+-  static void verifyTestEntities(TimelineDataManager tdm)
+-      throws YarnException, IOException {
+-    TimelineEntity entity1 = tdm.getEntity("type_1", "id_1",
+-        EnumSet.allOf(TimelineReader.Field.class),
+-        UserGroupInformation.getLoginUser());
+-    TimelineEntity entity2 = tdm.getEntity("type_2", "id_2",
+-        EnumSet.allOf(TimelineReader.Field.class),
+-        UserGroupInformation.getLoginUser());
+-    assertNotNull(entity1);
+-    assertNotNull(entity2);
+-    assertEquals((Long) 123l, entity1.getStartTime(), "Failed to read out entity 1");
+-    assertEquals((Long) 456l, entity2.getStartTime(), "Failed to read out entity 2");
+-  }
+-
+-  /**
+-   * Create a test entity
+-   */
+-  static TimelineEntity createEntity(String entityId, String entityType,
+-      Long startTime, List<TimelineEvent> events,
+-      Map<String, Set<String>> relatedEntities,
+-      Map<String, Set<Object>> primaryFilters,
+-      Map<String, Object> otherInfo, String domainId) {
+-    TimelineEntity entity = new TimelineEntity();
+-    entity.setEntityId(entityId);
+-    entity.setEntityType(entityType);
+-    entity.setStartTime(startTime);
+-    entity.setEvents(events);
+-    if (relatedEntities != null) {
+-      for (Map.Entry<String, Set<String>> e : relatedEntities.entrySet()) {
+-        for (String v : e.getValue()) {
+-          entity.addRelatedEntity(e.getKey(), v);
+-        }
+-      }
+-    } else {
+-      entity.setRelatedEntities(null);
+-    }
+-    entity.setPrimaryFilters(primaryFilters);
+-    entity.setOtherInfo(otherInfo);
+-    entity.setDomainId(domainId);
+-    return entity;
+-  }
+-
+-  /**
+-   * Create a test event
+-   */
+-  static TimelineEvent createEvent(long timestamp, String type, Map<String,
+-      Object> info) {
+-    TimelineEvent event = new TimelineEvent();
+-    event.setTimestamp(timestamp);
+-    event.setEventType(type);
+-    event.setEventInfo(info);
+-    return event;
+-  }
+-
+-  /**
+-   * Write timeline entities to a file system
+-   * @param entities
+-   * @param logPath
+-   * @param fs
+-   * @throws IOException
+-   */
+-  static void writeEntities(TimelineEntities entities, Path logPath,
+-      FileSystem fs) throws IOException {
+-    FSDataOutputStream outStream = createLogFile(logPath, fs);
+-    JsonGenerator jsonGenerator
+-        = new JsonFactory().createGenerator((OutputStream)outStream);
+-    jsonGenerator.setPrettyPrinter(new MinimalPrettyPrinter("\n"));
+-    ObjectMapper objMapper = createObjectMapper();
+-    for (TimelineEntity entity : entities.getEntities()) {
+-      objMapper.writeValue(jsonGenerator, entity);
+-    }
+-    outStream.close();
+-  }
+-
+-  static TimelineDataManager getTdmWithStore(Configuration config, TimelineStore store) {
+-    TimelineACLsManager aclManager = new TimelineACLsManager(config);
+-    TimelineDataManager tdm = new TimelineDataManager(store, aclManager);
+-    tdm.init(config);
+-    return tdm;
+-  }
+-
+-  static TimelineDataManager getTdmWithMemStore(Configuration config) {
+-    TimelineStore store = new MemoryTimelineStore("MemoryStore.test");
+-    TimelineDataManager tdm = getTdmWithStore(config, store);
+-    return tdm;
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
+deleted file mode 100644
+index 748cf92747e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestEntityGroupFSTimelineStore.java
++++ /dev/null
+@@ -1,809 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.commons.lang3.tuple.Pair;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileContext;
+-import org.apache.hadoop.fs.FileContextTestHelper;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+-import org.apache.hadoop.metrics2.lib.MutableStat;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.test.GenericTestUtils;
+-import org.apache.hadoop.util.ApplicationClassLoader;
+-import org.apache.hadoop.util.JarFinder;
+-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.timeline.EntityGroupFSTimelineStore.AppState;
+-import org.apache.hadoop.yarn.server.timeline.TimelineReader.Field;
+-import org.apache.hadoop.yarn.util.ConverterUtils;
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-import org.junit.jupiter.api.TestInfo;
+-
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import com.fasterxml.jackson.databind.type.TypeFactory;
+-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
+-
+-import java.io.DataInputStream;
+-import java.io.DataOutputStream;
+-import java.io.File;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.net.URL;
+-import java.net.URLClassLoader;
+-import java.util.ArrayList;
+-import java.util.EnumSet;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.atomic.AtomicInteger;
+-import java.util.function.Supplier;
+-
+-import static org.assertj.core.api.Assertions.assertThat;
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.junit.jupiter.api.Assertions.fail;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.when;
+-
+-public class TestEntityGroupFSTimelineStore extends TimelineStoreTestUtils {
+-
+-  private static final String SAMPLE_APP_PREFIX_CACHE_TEST = "1234_000";
+-  private static final int CACHE_TEST_CACHE_SIZE = 5;
+-
+-  private static final String TEST_SUMMARY_LOG_FILE_NAME
+-      = EntityGroupFSTimelineStore.SUMMARY_LOG_PREFIX + "test";
+-  private static final String TEST_DOMAIN_LOG_FILE_NAME
+-      = EntityGroupFSTimelineStore.DOMAIN_LOG_PREFIX + "test";
+-
+-  private static final Path TEST_ROOT_DIR
+-      = new Path(System.getProperty("test.build.data",
+-          System.getProperty("java.io.tmpdir")),
+-      TestEntityGroupFSTimelineStore.class.getSimpleName());
+-
+-  private static Configuration config = new YarnConfiguration();
+-  private static MiniDFSCluster hdfsCluster;
+-  private static FileSystem fs;
+-  private static FileContext fc;
+-  private static FileContextTestHelper fileContextTestHelper =
+-      new FileContextTestHelper("/tmp/TestEntityGroupFSTimelineStore");
+-
+-  private static List<ApplicationId> sampleAppIds;
+-  private static ApplicationId mainTestAppId;
+-  private static Path mainTestAppDirPath;
+-  private static Path testDoneDirPath;
+-  private static Path testActiveDirPath;
+-  private static String mainEntityLogFileName;
+-
+-  private EntityGroupFSTimelineStore store;
+-  private TimelineEntity entityNew;
+-
+-  private File rootDir;
+-  private File testJar;
+-
+-  @BeforeAll
+-  public static void setupClass() throws Exception {
+-    config.setBoolean(YarnConfiguration.TIMELINE_SERVICE_TTL_ENABLE, false);
+-    config.set(
+-        YarnConfiguration
+-            .TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SUMMARY_ENTITY_TYPES,
+-        "YARN_APPLICATION,YARN_APPLICATION_ATTEMPT,YARN_CONTAINER");
+-    config.setInt(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_APP_CACHE_SIZE,
+-        CACHE_TEST_CACHE_SIZE);
+-    config.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, TEST_ROOT_DIR.toString());
+-    HdfsConfiguration hdfsConfig = new HdfsConfiguration();
+-    hdfsCluster
+-        = new MiniDFSCluster.Builder(hdfsConfig).numDataNodes(1).build();
+-    fs = hdfsCluster.getFileSystem();
+-    fc = FileContext.getFileContext(hdfsCluster.getURI(0), config);
+-
+-    sampleAppIds = new ArrayList<>(CACHE_TEST_CACHE_SIZE + 1);
+-    for (int i = 0; i < CACHE_TEST_CACHE_SIZE + 1; i++) {
+-      ApplicationId appId = ApplicationId.fromString(
+-          ConverterUtils.APPLICATION_PREFIX + "_" + SAMPLE_APP_PREFIX_CACHE_TEST
+-              + i);
+-      sampleAppIds.add(appId);
+-    }
+-    testActiveDirPath = getTestRootPath("active");
+-    // Among all sample applicationIds, choose the first one for most of the
+-    // tests.
+-    mainTestAppId = sampleAppIds.get(0);
+-    mainTestAppDirPath = new Path(testActiveDirPath, mainTestAppId.toString());
+-    mainEntityLogFileName = EntityGroupFSTimelineStore.ENTITY_LOG_PREFIX
+-          + EntityGroupPlugInForTest.getStandardTimelineGroupId(mainTestAppId);
+-
+-    testDoneDirPath = getTestRootPath("done");
+-    config.set(YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR,
+-        testDoneDirPath.toString());
+-    config.set(
+-        YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_ACTIVE_DIR,
+-        testActiveDirPath.toString());
+-  }
+-
+-  @BeforeEach
+-  public void setup(TestInfo testInfo) throws Exception {
+-    for (ApplicationId appId : sampleAppIds) {
+-      Path attemotDirPath =
+-          new Path(new Path(testActiveDirPath, appId.toString()),
+-              getAttemptDirName(appId));
+-      createTestFiles(appId, attemotDirPath);
+-    }
+-
+-    store = new EntityGroupFSTimelineStore();
+-    if (testInfo.getTestMethod().get().getName().contains("Plugin")) {
+-      rootDir = GenericTestUtils.getTestDir(getClass()
+-          .getSimpleName());
+-      if (!rootDir.exists()) {
+-        rootDir.mkdirs();
+-      }
+-      testJar = null;
+-      testJar = JarFinder.makeClassLoaderTestJar(this.getClass(), rootDir,
+-          "test-runjar.jar", 2048,
+-          EntityGroupPlugInForTest.class.getName());
+-      config.set(
+-          YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSPATH,
+-          testJar.getAbsolutePath());
+-      // add "-org.apache.hadoop." as system classes
+-      String systemClasses = "-org.apache.hadoop." + "," +
+-          ApplicationClassLoader.SYSTEM_CLASSES_DEFAULT;
+-      config.set(
+-          YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_SYSTEM_CLASSES,
+-          systemClasses);
+-
+-      config.set(YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSES,
+-          EntityGroupPlugInForTest.class.getName());
+-    }
+-    store.init(config);
+-    store.setFs(fs);
+-    store.start();
+-  }
+-
+-  @AfterEach
+-  public void tearDown() throws Exception {
+-    store.stop();
+-    for (ApplicationId appId : sampleAppIds) {
+-      fs.delete(new Path(testActiveDirPath,appId.toString()), true);
+-    }
+-    if (testJar != null) {
+-      testJar.delete();
+-      rootDir.delete();
+-    }
+-  }
+-
+-  @AfterAll
+-  public static void tearDownClass() throws Exception {
+-    hdfsCluster.shutdown();
+-    FileContext fileContext = FileContext.getLocalFSFileContext();
+-    fileContext.delete(new Path(
+-        config.get(YarnConfiguration.TIMELINE_SERVICE_LEVELDB_PATH)), true);
+-  }
+-
+-  @Test
+-  void testAppLogsScanLogs() throws Exception {
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    appLogs.scanForLogs();
+-    List<LogInfo> summaryLogs = appLogs.getSummaryLogs();
+-    List<LogInfo> detailLogs = appLogs.getDetailLogs();
+-    assertEquals(2, summaryLogs.size());
+-    assertEquals(1, detailLogs.size());
+-
+-    for (LogInfo log : summaryLogs) {
+-      String fileName = log.getFilename();
+-      assertTrue(fileName.equals(TEST_SUMMARY_LOG_FILE_NAME)
+-          || fileName.equals(TEST_DOMAIN_LOG_FILE_NAME));
+-    }
+-
+-    for (LogInfo log : detailLogs) {
+-      String fileName = log.getFilename();
+-      assertEquals(fileName, mainEntityLogFileName);
+-    }
+-  }
+-
+-  @Test
+-  void testAppLogsDomainLogLastlyScanned() throws Exception {
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    Path attemptDirPath = new Path(new Path(testActiveDirPath,
+-            mainTestAppId.toString()),
+-        getAttemptDirName(mainTestAppId));
+-    //Delete the domain log from AppDirPath so first scan won't find it
+-    fs.delete(new Path(attemptDirPath, TEST_DOMAIN_LOG_FILE_NAME), false);
+-    appLogs.scanForLogs();
+-    List<LogInfo> summaryLogs = appLogs.getSummaryLogs();
+-    assertEquals(1, summaryLogs.size());
+-    assertEquals(TEST_SUMMARY_LOG_FILE_NAME, summaryLogs.get(0).getFilename());
+-
+-    //Generate the domain log
+-    FSDataOutputStream out = fs.create(
+-        new Path(attemptDirPath, TEST_DOMAIN_LOG_FILE_NAME));
+-    out.close();
+-
+-    appLogs.scanForLogs();
+-    assertEquals(2, summaryLogs.size());
+-    assertEquals(TEST_DOMAIN_LOG_FILE_NAME, summaryLogs.get(0).getFilename());
+-  }
+-
+-  @Test
+-  void testMoveToDone() throws Exception {
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    Path pathBefore = appLogs.getAppDirPath();
+-    appLogs.moveToDone();
+-    Path pathAfter = appLogs.getAppDirPath();
+-    assertNotEquals(pathBefore, pathAfter);
+-    assertTrue(pathAfter.toString().contains(testDoneDirPath.toString()));
+-
+-    fs.delete(pathAfter, true);
+-  }
+-
+-  @Test
+-  void testParseSummaryLogs() throws Exception {
+-    TimelineDataManager tdm = PluginStoreTestUtils.getTdmWithMemStore(config);
+-    MutableCounterLong scanned = store.metrics.getEntitiesReadToSummary();
+-    long beforeScan = scanned.value();
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    appLogs.scanForLogs();
+-    appLogs.parseSummaryLogs(tdm);
+-    PluginStoreTestUtils.verifyTestEntities(tdm);
+-    assertEquals(beforeScan + 2L, scanned.value());
+-  }
+-
+-  @Test
+-  void testWithAnonymousUser() throws Exception {
+-    try {
+-      TimelineDataManager tdm = PluginStoreTestUtils.getTdmWithMemStore(config);
+-      EntityGroupFSTimelineStore.AppLogs appLogs =
+-          store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-              AppState.COMPLETED);
+-      FileStatus fileStatus = mock(FileStatus.class);
+-      when(fileStatus.getOwner()).thenReturn(null);
+-      appLogs.scanForLogs();
+-      appLogs.parseSummaryLogs(tdm);
+-      PluginStoreTestUtils.verifyTestEntities(tdm);
+-    } catch (IllegalArgumentException ie) {
+-      fail("No exception needs to be thrown as anonymous user is configured");
+-    }
+-  }
+-
+-  @Test
+-  void testCleanLogs() throws Exception {
+-    // Create test dirs and files
+-    // Irrelevant file, should not be reclaimed
+-    String appDirName = mainTestAppId.toString();
+-    String attemptDirName = ApplicationAttemptId.appAttemptIdStrPrefix
+-        + appDirName + "_1";
+-    Path irrelevantFilePath = new Path(
+-        testDoneDirPath, "irrelevant.log");
+-    FSDataOutputStream stream = fs.create(irrelevantFilePath);
+-    stream.close();
+-    // Irrelevant directory, should not be reclaimed
+-    Path irrelevantDirPath = new Path(testDoneDirPath, "irrelevant");
+-    fs.mkdirs(irrelevantDirPath);
+-
+-    Path doneAppHomeDir = new Path(new Path(new Path(testDoneDirPath,
+-        Long.toString(mainTestAppId.getClusterTimestamp())), "0000"), "001");
+-    // First application, untouched after creation
+-    Path appDirClean = new Path(doneAppHomeDir, appDirName);
+-    Path attemptDirClean = new Path(appDirClean, attemptDirName);
+-    fs.mkdirs(attemptDirClean);
+-    Path filePath = new Path(attemptDirClean, "test.log");
+-    stream = fs.create(filePath);
+-    stream.close();
+-    // Second application, one file touched after creation
+-    Path appDirHoldByFile = new Path(doneAppHomeDir, appDirName + "1");
+-    Path attemptDirHoldByFile
+-        = new Path(appDirHoldByFile, attemptDirName);
+-    fs.mkdirs(attemptDirHoldByFile);
+-    Path filePathHold = new Path(attemptDirHoldByFile, "test1.log");
+-    stream = fs.create(filePathHold);
+-    stream.close();
+-    // Third application, one dir touched after creation
+-    Path appDirHoldByDir = new Path(doneAppHomeDir, appDirName + "2");
+-    Path attemptDirHoldByDir = new Path(appDirHoldByDir, attemptDirName);
+-    fs.mkdirs(attemptDirHoldByDir);
+-    Path dirPathHold = new Path(attemptDirHoldByDir, "hold");
+-    fs.mkdirs(dirPathHold);
+-    // Fourth application, empty dirs
+-    Path appDirEmpty = new Path(doneAppHomeDir, appDirName + "3");
+-    Path attemptDirEmpty = new Path(appDirEmpty, attemptDirName);
+-    fs.mkdirs(attemptDirEmpty);
+-    Path dirPathEmpty = new Path(attemptDirEmpty, "empty");
+-    fs.mkdirs(dirPathEmpty);
+-
+-    // Should retain all logs after this run
+-    MutableCounterLong dirsCleaned = store.metrics.getLogsDirsCleaned();
+-    long before = dirsCleaned.value();
+-    store.cleanLogs(testDoneDirPath, 10000);
+-    assertTrue(fs.exists(irrelevantDirPath));
+-    assertTrue(fs.exists(irrelevantFilePath));
+-    assertTrue(fs.exists(filePath));
+-    assertTrue(fs.exists(filePathHold));
+-    assertTrue(fs.exists(dirPathHold));
+-    assertTrue(fs.exists(dirPathEmpty));
+-
+-    // Make sure the created dir is old enough
+-    Thread.sleep(2000);
+-    // Touch the second application
+-    stream = fs.append(filePathHold);
+-    stream.writeBytes("append");
+-    stream.close();
+-    // Touch the third application by creating a new dir
+-    fs.mkdirs(new Path(dirPathHold, "holdByMe"));
+-
+-    store.cleanLogs(testDoneDirPath, 1000);
+-
+-    // Verification after the second cleaner call
+-    assertTrue(fs.exists(irrelevantDirPath));
+-    assertTrue(fs.exists(irrelevantFilePath));
+-    assertTrue(fs.exists(filePathHold));
+-    assertTrue(fs.exists(dirPathHold));
+-    assertTrue(fs.exists(doneAppHomeDir));
+-
+-    // appDirClean and appDirEmpty should be cleaned up
+-    assertFalse(fs.exists(appDirClean));
+-    assertFalse(fs.exists(appDirEmpty));
+-    assertEquals(before + 2L, dirsCleaned.value());
+-  }
+-
+-  @Test
+-  void testCleanBuckets() throws Exception {
+-    // ClusterTimeStampDir with App Log Dirs
+-    Path clusterTimeStampDir1 = new Path(testDoneDirPath,
+-        Long.toString(sampleAppIds.get(0).getClusterTimestamp()));
+-    Path appDir1 = new Path(new Path(new Path(
+-        clusterTimeStampDir1, "0000"), "000"), sampleAppIds.get(0).toString());
+-    Path appDir2 = new Path(new Path(new Path(
+-        clusterTimeStampDir1, "0000"), "001"), sampleAppIds.get(1).toString());
+-    Path appDir3 = new Path(new Path(new Path(
+-        clusterTimeStampDir1, "0000"), "002"), sampleAppIds.get(2).toString());
+-    Path appDir4 = new Path(new Path(new Path(
+-        clusterTimeStampDir1, "0001"), "000"), sampleAppIds.get(3).toString());
+-
+-    // ClusterTimeStampDir with no App Log Dirs
+-    Path clusterTimeStampDir2 = new Path(testDoneDirPath, "1235");
+-
+-    // Irrevelant ClusterTimeStampDir
+-    Path clusterTimeStampDir3 = new Path(testDoneDirPath, "irrevelant");
+-    Path appDir5 = new Path(new Path(new Path(
+-        clusterTimeStampDir3, "0000"), "000"), sampleAppIds.get(4).toString());
+-
+-    fs.mkdirs(appDir1);
+-    fs.mkdirs(appDir2);
+-    fs.mkdirs(appDir3);
+-    fs.mkdirs(appDir4);
+-    fs.mkdirs(clusterTimeStampDir2);
+-    fs.mkdirs(appDir5);
+-
+-    Thread.sleep(2000);
+-
+-    store.cleanLogs(testDoneDirPath, 1000);
+-
+-    // ClusterTimeStampDir will be removed only if no App Log Dir Present
+-    assertTrue(fs.exists(clusterTimeStampDir1));
+-    assertFalse(fs.exists(appDir1));
+-    assertFalse(fs.exists(appDir2));
+-    assertFalse(fs.exists(appDir3));
+-    assertFalse(fs.exists(appDir4));
+-    assertFalse(fs.exists(clusterTimeStampDir2));
+-    assertTrue(fs.exists(appDir5));
+-
+-    store.cleanLogs(testDoneDirPath, 1000);
+-    assertFalse(fs.exists(clusterTimeStampDir1));
+-  }
+-
+-  @Test
+-  void testNullCheckGetEntityTimelines() throws Exception {
+-    try {
+-      store.getEntityTimelines("YARN_APPLICATION", null, null, null, null,
+-          null);
+-    } catch (NullPointerException e) {
+-      fail("NPE when getEntityTimelines called with Null EntityIds");
+-    }
+-  }
+-
+-  @Test
+-  void testPluginRead() throws Exception {
+-    // Verify precondition
+-    assertEquals(EntityGroupPlugInForTest.class.getName(),
+-        store.getConfig().get(
+-            YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSES));
+-    List<TimelineEntityGroupPlugin> currPlugins = store.getPlugins();
+-    for (TimelineEntityGroupPlugin plugin : currPlugins) {
+-      ClassLoader pluginClassLoader = plugin.getClass().getClassLoader();
+-      assertTrue(pluginClassLoader instanceof ApplicationClassLoader,
+-          "Should set up ApplicationClassLoader");
+-      URL[] paths = ((URLClassLoader) pluginClassLoader).getURLs();
+-      boolean foundJAR = false;
+-      for (URL path : paths) {
+-        if (path.toString().contains(testJar.getAbsolutePath())) {
+-          foundJAR = true;
+-        }
+-      }
+-      assertTrue(foundJAR, "Not found path " + testJar.getAbsolutePath()
+-          + " for plugin " + plugin.getClass().getName());
+-    }
+-    // Load data and cache item, prepare timeline store by making a cache item
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    EntityCacheItem cacheItem = new EntityCacheItem(
+-        EntityGroupPlugInForTest.getStandardTimelineGroupId(mainTestAppId),
+-        config);
+-    cacheItem.setAppLogs(appLogs);
+-    store.setCachedLogs(
+-        EntityGroupPlugInForTest.getStandardTimelineGroupId(mainTestAppId),
+-        cacheItem);
+-    MutableCounterLong detailLogEntityRead =
+-        store.metrics.getGetEntityToDetailOps();
+-    MutableStat cacheRefresh = store.metrics.getCacheRefresh();
+-    long numEntityReadBefore = detailLogEntityRead.value();
+-    long cacheRefreshBefore = cacheRefresh.lastStat().numSamples();
+-
+-    // Generate TDM
+-    TimelineDataManager tdm
+-        = PluginStoreTestUtils.getTdmWithStore(config, store);
+-
+-    // Verify single entity read
+-    TimelineEntity entity3 = tdm.getEntity("type_3", mainTestAppId.toString(),
+-        EnumSet.allOf(TimelineReader.Field.class),
+-        UserGroupInformation.getLoginUser());
+-    assertNotNull(entity3);
+-    assertEquals(entityNew.getStartTime(), entity3.getStartTime());
+-    // Verify multiple entities read
+-    NameValuePair primaryFilter = new NameValuePair(
+-        EntityGroupPlugInForTest.APP_ID_FILTER_NAME, mainTestAppId.toString());
+-    TimelineEntities entities = tdm.getEntities("type_3", primaryFilter, null,
+-        null, null, null, null, null, EnumSet.allOf(TimelineReader.Field.class),
+-        UserGroupInformation.getLoginUser());
+-    assertEquals(1, entities.getEntities().size());
+-    for (TimelineEntity entity : entities.getEntities()) {
+-      assertEquals(entityNew.getStartTime(), entity.getStartTime());
+-    }
+-    // Verify metrics
+-    assertEquals(numEntityReadBefore + 2L, detailLogEntityRead.value());
+-    assertEquals(cacheRefreshBefore + 1L, cacheRefresh.lastStat().numSamples());
+-  }
+-
+-  @Test
+-  void testSummaryRead() throws Exception {
+-    // Load data
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath,
+-            AppState.COMPLETED);
+-    MutableCounterLong summaryLogEntityRead
+-        = store.metrics.getGetEntityToSummaryOps();
+-    long numEntityReadBefore = summaryLogEntityRead.value();
+-    TimelineDataManager tdm
+-        = PluginStoreTestUtils.getTdmWithStore(config, store);
+-    appLogs.scanForLogs();
+-    appLogs.parseSummaryLogs(tdm);
+-
+-    // Verify single entity read
+-    PluginStoreTestUtils.verifyTestEntities(tdm);
+-    // Verify multiple entities read
+-    TimelineEntities entities = tdm.getEntities("type_1", null, null, null,
+-        null, null, null, null, EnumSet.allOf(TimelineReader.Field.class),
+-        UserGroupInformation.getLoginUser());
+-    assertThat(entities.getEntities()).hasSize(1);
+-    for (TimelineEntity entity : entities.getEntities()) {
+-      assertEquals((Long) 123L, entity.getStartTime());
+-    }
+-    // Verify metrics
+-    assertEquals(numEntityReadBefore + 5L, summaryLogEntityRead.value());
+-
+-  }
+-
+-  @Test
+-  void testGetEntityPluginRead() throws Exception {
+-    EntityGroupFSTimelineStore store = null;
+-    ApplicationId appId =
+-        ApplicationId.fromString("application_1501509265053_0001");
+-    String user = UserGroupInformation.getCurrentUser().getShortUserName();
+-    Path userBase = new Path(testActiveDirPath, user);
+-    Path userAppRoot = new Path(userBase, appId.toString());
+-    Path attemotDirPath = new Path(userAppRoot, getAttemptDirName(appId));
+-
+-    try {
+-      store = createAndStartTimelineStore(AppState.ACTIVE);
+-      String logFileName = EntityGroupFSTimelineStore.ENTITY_LOG_PREFIX
+-          + EntityGroupPlugInForTest.getStandardTimelineGroupId(appId);
+-      createTestFiles(appId, attemotDirPath, logFileName);
+-      TimelineEntity entity = store.getEntity(entityNew.getEntityId(),
+-          entityNew.getEntityType(), EnumSet.allOf(Field.class));
+-      assertNotNull(entity);
+-      assertEquals(entityNew.getEntityId(), entity.getEntityId());
+-      assertEquals(entityNew.getEntityType(), entity.getEntityType());
+-    } finally {
+-      if (store != null) {
+-        store.stop();
+-      }
+-      fs.delete(userBase, true);
+-    }
+-  }
+-
+-  @Test
+-  void testScanActiveLogsWithInvalidFile() throws Exception {
+-    Path invalidFile = new Path(testActiveDirPath, "invalidfile");
+-    try {
+-      if (!fs.exists(invalidFile)) {
+-        fs.createNewFile(invalidFile);
+-      }
+-      store.scanActiveLogs();
+-    } catch (StackOverflowError error) {
+-      fail("EntityLogScanner crashed with StackOverflowError");
+-    } finally {
+-      if (fs.exists(invalidFile)) {
+-        fs.delete(invalidFile, false);
+-      }
+-    }
+-  }
+-
+-  @Test
+-  void testScanActiveLogsAndMoveToDonePluginRead() throws Exception {
+-    EntityGroupFSTimelineStore store = null;
+-    ApplicationId appId =
+-        ApplicationId.fromString("application_1501509265053_0002");
+-    String user = UserGroupInformation.getCurrentUser().getShortUserName();
+-    Path userBase = new Path(testActiveDirPath, user);
+-    Path userAppRoot = new Path(userBase, appId.toString());
+-    Path attemotDirPath = new Path(userAppRoot, getAttemptDirName(appId));
+-
+-    try {
+-      store = createAndStartTimelineStore(AppState.COMPLETED);
+-      String logFileName = EntityGroupFSTimelineStore.ENTITY_LOG_PREFIX
+-          + EntityGroupPlugInForTest.getStandardTimelineGroupId(appId);
+-      createTestFiles(appId, attemotDirPath, logFileName);
+-      store.scanActiveLogs();
+-
+-      TimelineEntity entity = store.getEntity(entityNew.getEntityId(),
+-          entityNew.getEntityType(), EnumSet.allOf(Field.class));
+-      assertNotNull(entity);
+-      assertEquals(entityNew.getEntityId(), entity.getEntityId());
+-      assertEquals(entityNew.getEntityType(), entity.getEntityType());
+-    } finally {
+-      if (store != null) {
+-        store.stop();
+-      }
+-      fs.delete(userBase, true);
+-    }
+-  }
+-
+-  // TestTimelineStore to validate the put entities call
+-  static class TestTimelineStore extends LeveldbTimelineStore {
+-    static final AtomicInteger ENTITIES_COUNT = new AtomicInteger(0);
+-
+-    TestTimelineStore() {
+-      super();
+-    }
+-
+-    @Override
+-    public TimelinePutResponse put(TimelineEntities entities) {
+-      ENTITIES_COUNT.getAndAdd(entities.getEntities().size());
+-      return new TimelinePutResponse();
+-    }
+-
+-    public static int getEntitiesCount() {
+-      return ENTITIES_COUNT.get();
+-    }
+-  }
+-
+-  @Test
+-  void testIfAnyDuplicateEntities() throws Exception {
+-    // Create an application with some entities
+-    ApplicationId appId =
+-        ApplicationId.fromString("application_1501509265053_0002");
+-    String user = UserGroupInformation.getCurrentUser().getShortUserName();
+-    Path activeDirPath = getTestRootPath("active1");
+-    Path doneDirPath = getTestRootPath("done1");
+-    Path userBase = new Path(activeDirPath, user);
+-    Path userAppRoot = new Path(userBase, appId.toString());
+-    Path attemptDirPath = new Path(userAppRoot, getAttemptDirName(appId));
+-
+-    String logFileName = EntityGroupFSTimelineStore.ENTITY_LOG_PREFIX
+-        + EntityGroupPlugInForTest.getStandardTimelineGroupId(appId);
+-    createTestFiles(appId, attemptDirPath, logFileName);
+-
+-    // stop the default store before creating new store to get the lock
+-    store.stop();
+-    EntityGroupFSTimelineStore newStore = new EntityGroupFSTimelineStore() {
+-      @Override
+-      protected AppState getAppState(ApplicationId appId) throws IOException {
+-        return AppState.ACTIVE;
+-      }
+-    };
+-
+-    try {
+-      // Start ATS with TestTimelineStore
+-      Configuration newConfig = new YarnConfiguration(config);
+-      newConfig.set(YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_SUMMARY_STORE,
+-          TestTimelineStore.class.getName());
+-      newConfig.set(YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_DONE_DIR,
+-          doneDirPath.toString());
+-      newConfig.set(
+-          YarnConfiguration.TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_ACTIVE_DIR,
+-          activeDirPath.toString());
+-      newStore.init(newConfig);
+-      newStore.setFs(fs);
+-      newStore.start();
+-
+-      // Validate if the initial entities count are correct
+-      newStore.scanActiveLogs();
+-      GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-        @Override
+-        public Boolean get() {
+-          return TestTimelineStore.getEntitiesCount() == 2;
+-        }
+-      }, 100, 10000);
+-      assertEquals(2, TestTimelineStore.getEntitiesCount(), "Wrong Initial Entities Count");
+-
+-      // Append the Summary log file with few more entities
+-      TimelineEntities entities = PluginStoreTestUtils.generateTestEntities();
+-      FSDataOutputStream outStream = fs.append(
+-          new Path(attemptDirPath, TEST_SUMMARY_LOG_FILE_NAME));
+-      JsonGenerator jsonGenerator
+-          = new JsonFactory().createGenerator((OutputStream) outStream);
+-      jsonGenerator.setPrettyPrinter(new MinimalPrettyPrinter("\n"));
+-      ObjectMapper objMapper = new ObjectMapper();
+-      objMapper.setAnnotationIntrospector(
+-          new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()));
+-      objMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+-      for (TimelineEntity entity : entities.getEntities()) {
+-        objMapper.writeValue(jsonGenerator, entity);
+-      }
+-      outStream.close();
+-
+-      // Validate if there are any duplicates
+-      newStore.scanActiveLogs();
+-      GenericTestUtils.waitFor(new Supplier<Boolean>() {
+-        @Override
+-        public Boolean get() {
+-          return TestTimelineStore.getEntitiesCount() == 4;
+-        }
+-      }, 100, 10000);
+-      assertEquals(4, TestTimelineStore.getEntitiesCount(), "Duplicate Entities present");
+-
+-    } finally {
+-      if (newStore != null) {
+-        newStore.stop();
+-      }
+-      fs.delete(userAppRoot, true);
+-    }
+-  }
+-
+-  @Test
+-  void testStateStoreAndRecovery() throws Exception {
+-    // Prepare the AppLogs Data
+-    EntityGroupFSTimelineStore.AppLogs appLogs =
+-        store.new AppLogs(mainTestAppId, mainTestAppDirPath, AppState.COMPLETED);
+-    appLogs.scanForLogs();
+-    List<LogInfo> summaryLogs = appLogs.getSummaryLogs();
+-    List<EntityGroupFSTimelineStore.AppLogs> logsList = new ArrayList<>();
+-    logsList.add(appLogs);
+-
+-    // Store the Log files
+-    Path checkpointFile = new Path(fs.getHomeDirectory(), "atscheckpoint");
+-    try (DataOutputStream dataOutputStream = fs.create(checkpointFile)) {
+-      store.storeLogFiles(logsList, dataOutputStream);
+-    } catch (IOException e) {
+-      fail("Failed to store the log files");
+-    }
+-
+-    // Recover the Log files and validate the contents
+-    try (DataInputStream dataInputStream = fs.open(checkpointFile)) {
+-      HashMap<String, Pair<Long, Long>> logFiles =
+-          store.recoverLogFiles(dataInputStream);
+-      assertEquals(summaryLogs.size(), logFiles.size());
+-      for (LogInfo logInfo : summaryLogs) {
+-        String logFileName = logInfo.getAttemptDirName() +
+-            Path.SEPARATOR + logInfo.getFilename();
+-        Pair<Long, Long> pair = logFiles.get(logFileName);
+-        assertNotNull(pair, "Failed to recover " + logFileName);
+-        assertTrue(logInfo.getLastProcessedTime() == pair.getLeft(),
+-            "LastProcessedTime is not same");
+-        assertTrue(logInfo.getOffset() == pair.getRight(),
+-            "Offset is not same");
+-      }
+-    } catch (IOException e) {
+-      fail("Failed to recover the log files");
+-    }
+-  }
+-
+-
+-  private EntityGroupFSTimelineStore createAndStartTimelineStore(
+-      AppState appstate) {
+-    // stop before creating new store to get the lock
+-    store.stop();
+-
+-    EntityGroupFSTimelineStore newStore = new EntityGroupFSTimelineStore() {
+-      @Override
+-      protected AppState getAppState(ApplicationId appId) throws IOException {
+-        return appstate;
+-      }
+-    };
+-    newStore.init(config);
+-    newStore.setFs(fs);
+-    newStore.start();
+-    return newStore;
+-  }
+-
+-  private void createTestFiles(ApplicationId appId, Path attemptDirPath)
+-      throws IOException {
+-    createTestFiles(appId, attemptDirPath, mainEntityLogFileName);
+-  }
+-
+-  private void createTestFiles(ApplicationId appId, Path attemptDirPath,
+-      String logPath) throws IOException {
+-    TimelineEntities entities = PluginStoreTestUtils.generateTestEntities();
+-    PluginStoreTestUtils.writeEntities(entities,
+-        new Path(attemptDirPath, TEST_SUMMARY_LOG_FILE_NAME), fs);
+-    Map<String, Set<Object>> primaryFilters = new HashMap<>();
+-    Set<Object> appSet = new HashSet<Object>();
+-    appSet.add(appId.toString());
+-    primaryFilters.put(EntityGroupPlugInForTest.APP_ID_FILTER_NAME, appSet);
+-    entityNew = PluginStoreTestUtils
+-        .createEntity(appId.toString(), "type_3", 789L, null, null,
+-            primaryFilters, null, "domain_id_1");
+-    TimelineEntities entityList = new TimelineEntities();
+-    entityList.addEntity(entityNew);
+-    PluginStoreTestUtils.writeEntities(entityList,
+-        new Path(attemptDirPath, logPath), fs);
+-
+-    FSDataOutputStream out = fs.create(
+-        new Path(attemptDirPath, TEST_DOMAIN_LOG_FILE_NAME));
+-    out.close();
+-  }
+-
+-  private static Path getTestRootPath(String pathString) {
+-    return fileContextTestHelper.getTestRootPath(fc, pathString);
+-  }
+-
+-  private static String getAttemptDirName(ApplicationId appId) {
+-    return ApplicationAttemptId.appAttemptIdStrPrefix + appId.toString() + "_1";
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
+deleted file mode 100644
+index 7763956330e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLevelDBCacheTimelineStore.java
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import java.io.IOException;
+-
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-
+-public class TestLevelDBCacheTimelineStore extends TimelineStoreTestUtils {
+-
+-  @BeforeEach
+-  public void setup() throws Exception {
+-    store = new LevelDBCacheTimelineStore("app1");
+-    store.init(new YarnConfiguration());
+-    store.start();
+-    loadTestEntityData();
+-    loadVerificationEntityData();
+-    loadTestDomainData();
+-  }
+-
+-  @AfterEach
+-  public void tearDown() throws Exception {
+-    store.stop();
+-  }
+-
+-  public TimelineStore getTimelineStore() {
+-    return store;
+-  }
+-
+-  @Test
+-  void testDefaultConstructor() {
+-    TimelineStore store = null;
+-    try {
+-      store = ReflectionUtils.newInstance(LevelDBCacheTimelineStore.class,
+-          new YarnConfiguration());
+-    } finally {
+-      assertNotNull(store, "LevelDBCacheTimelineStore failed to instantiate");
+-    }
+-  }
+-
+-  @Test
+-  public void testGetSingleEntity() throws IOException {
+-    super.testGetSingleEntity();
+-  }
+-
+-  @Test
+-  public void testGetEntities() throws IOException {
+-    super.testGetEntities();
+-  }
+-
+-  @Test
+-  public void testGetEntitiesWithFromId() throws IOException {
+-    super.testGetEntitiesWithFromId();
+-  }
+-
+-  @Test
+-  public void testGetEntitiesWithFromTs() throws IOException {
+-    super.testGetEntitiesWithFromTs();
+-  }
+-
+-  @Test
+-  public void testGetEntitiesWithPrimaryFilters() throws IOException {
+-    super.testGetEntitiesWithPrimaryFilters();
+-  }
+-
+-  @Test
+-  public void testGetEntitiesWithSecondaryFilters() throws IOException {
+-    super.testGetEntitiesWithSecondaryFilters();
+-  }
+-
+-  @Test
+-  public void testGetEvents() throws IOException {
+-    super.testGetEvents();
+-  }
+-
+-  @Test
+-  public void testGetDomain() throws IOException {
+-    super.testGetDomain();
+-  }
+-
+-  @Test
+-  public void testGetDomains() throws IOException {
+-    super.testGetDomains();
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLogInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLogInfo.java
+deleted file mode 100644
+index 6a4527c13c9..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLogInfo.java
++++ /dev/null
+@@ -1,249 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements.  See the NOTICE file distributed with this
+- * work for additional information regarding copyright ownership.  The ASF
+- * licenses this file to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- * <p/>
+- * http://www.apache.org/licenses/LICENSE-2.0
+- * <p/>
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+- * License for the specific language governing permissions and limitations under
+- * the License.
+- */
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import com.fasterxml.jackson.core.JsonFactory;
+-import com.fasterxml.jackson.core.JsonGenerator;
+-import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
+-import com.fasterxml.jackson.databind.ObjectMapper;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileContext;
+-import org.apache.hadoop.fs.FileContextTestHelper;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.fs.permission.FsPermission;
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineDomain;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntities;
+-import org.apache.hadoop.yarn.api.records.timeline.TimelineEntity;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.nio.charset.StandardCharsets;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-
+-public class TestLogInfo {
+-
+-  private static final Path TEST_ROOT_DIR = new Path(
+-      System.getProperty("test.build.data",
+-          System.getProperty("java.io.tmpdir")),
+-      TestLogInfo.class.getSimpleName());
+-
+-  private static final String TEST_ATTEMPT_DIR_NAME = "test_app";
+-  private static final String TEST_ENTITY_FILE_NAME = "test_entity";
+-  private static final String TEST_DOMAIN_FILE_NAME = "test_domain";
+-  private static final String TEST_BROKEN_FILE_NAME = "test_broken";
+-
+-  private Configuration config = new YarnConfiguration();
+-  private MiniDFSCluster hdfsCluster;
+-  private FileSystem fs;
+-  private FileContext fc;
+-  private FileContextTestHelper fileContextTestHelper = new FileContextTestHelper("/tmp/TestLogInfo");
+-  private ObjectMapper objMapper;
+-
+-  private JsonFactory jsonFactory = new JsonFactory();
+-  private JsonGenerator jsonGenerator;
+-  private FSDataOutputStream outStream = null;
+-  private FSDataOutputStream outStreamDomain = null;
+-
+-  private TimelineDomain testDomain;
+-
+-  private static final short FILE_LOG_DIR_PERMISSIONS = 0770;
+-
+-  @BeforeEach
+-  public void setup() throws Exception {
+-    config.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, TEST_ROOT_DIR.toString());
+-    HdfsConfiguration hdfsConfig = new HdfsConfiguration();
+-    hdfsCluster = new MiniDFSCluster.Builder(hdfsConfig).numDataNodes(1).build();
+-    fs = hdfsCluster.getFileSystem();
+-    fc = FileContext.getFileContext(hdfsCluster.getURI(0), config);
+-    Path testAppDirPath = getTestRootPath(TEST_ATTEMPT_DIR_NAME);
+-    fs.mkdirs(testAppDirPath, new FsPermission(FILE_LOG_DIR_PERMISSIONS));
+-    objMapper = PluginStoreTestUtils.createObjectMapper();
+-
+-    TimelineEntities testEntities = PluginStoreTestUtils.generateTestEntities();
+-    writeEntitiesLeaveOpen(testEntities,
+-        new Path(testAppDirPath, TEST_ENTITY_FILE_NAME));
+-
+-    testDomain = new TimelineDomain();
+-    testDomain.setId("domain_1");
+-    testDomain.setReaders(UserGroupInformation.getLoginUser().getUserName());
+-    testDomain.setOwner(UserGroupInformation.getLoginUser().getUserName());
+-    testDomain.setDescription("description");
+-    writeDomainLeaveOpen(testDomain,
+-        new Path(testAppDirPath, TEST_DOMAIN_FILE_NAME));
+-
+-    writeBrokenFile(new Path(testAppDirPath, TEST_BROKEN_FILE_NAME));
+-  }
+-
+-  @AfterEach
+-  public void tearDown() throws Exception {
+-    jsonGenerator.close();
+-    outStream.close();
+-    outStreamDomain.close();
+-    hdfsCluster.shutdown();
+-  }
+-
+-  @Test
+-  void testMatchesGroupId() throws Exception {
+-    String testGroupId = "app1_group1";
+-    // Match
+-    EntityLogInfo testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        "app1_group1",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertTrue(testLogInfo.matchesGroupId(testGroupId));
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        "test_app1_group1",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertTrue(testLogInfo.matchesGroupId(testGroupId));
+-    // Unmatch
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app2_group1",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertFalse(testLogInfo.matchesGroupId(testGroupId));
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app1_group2",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertFalse(testLogInfo.matchesGroupId(testGroupId));
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app1_group12",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertFalse(testLogInfo.matchesGroupId(testGroupId));
+-    // Check delimiters
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app1_group1_2",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertTrue(testLogInfo.matchesGroupId(testGroupId));
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app1_group1.dat",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertTrue(testLogInfo.matchesGroupId(testGroupId));
+-    // Check file names shorter than group id
+-    testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME, "app2",
+-        UserGroupInformation.getLoginUser().getUserName());
+-    assertFalse(testLogInfo.matchesGroupId(testGroupId));
+-  }
+-
+-  @Test
+-  void testParseEntity() throws Exception {
+-    // Load test data
+-    TimelineDataManager tdm = PluginStoreTestUtils.getTdmWithMemStore(config);
+-    EntityLogInfo testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        TEST_ENTITY_FILE_NAME,
+-        UserGroupInformation.getLoginUser().getUserName());
+-    testLogInfo.parseForStore(tdm, getTestRootPath(), true, jsonFactory, objMapper,
+-        fs);
+-    // Verify for the first batch
+-    PluginStoreTestUtils.verifyTestEntities(tdm);
+-    tdm.close();
+-  }
+-
+-  @Test
+-  void testParseBrokenEntity() throws Exception {
+-    // Load test data
+-    TimelineDataManager tdm = PluginStoreTestUtils.getTdmWithMemStore(config);
+-    EntityLogInfo testLogInfo = new EntityLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        TEST_BROKEN_FILE_NAME,
+-        UserGroupInformation.getLoginUser().getUserName());
+-    DomainLogInfo domainLogInfo = new DomainLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        TEST_BROKEN_FILE_NAME,
+-        UserGroupInformation.getLoginUser().getUserName());
+-    // Try parse, should not fail
+-    testLogInfo.parseForStore(tdm, getTestRootPath(), true, jsonFactory, objMapper,
+-        fs);
+-    domainLogInfo.parseForStore(tdm, getTestRootPath(), true, jsonFactory, objMapper,
+-        fs);
+-    tdm.close();
+-  }
+-
+-  @Test
+-  void testParseDomain() throws Exception {
+-    // Load test data
+-    TimelineDataManager tdm = PluginStoreTestUtils.getTdmWithMemStore(config);
+-    DomainLogInfo domainLogInfo = new DomainLogInfo(TEST_ATTEMPT_DIR_NAME,
+-        TEST_DOMAIN_FILE_NAME,
+-        UserGroupInformation.getLoginUser().getUserName());
+-    domainLogInfo.parseForStore(tdm, getTestRootPath(), true, jsonFactory, objMapper,
+-        fs);
+-    // Verify domain data
+-    TimelineDomain resultDomain = tdm.getDomain("domain_1",
+-        UserGroupInformation.getLoginUser());
+-    assertNotNull(resultDomain);
+-    assertEquals(testDomain.getReaders(), resultDomain.getReaders());
+-    assertEquals(testDomain.getOwner(), resultDomain.getOwner());
+-    assertEquals(testDomain.getDescription(), resultDomain.getDescription());
+-  }
+-
+-  private void writeBrokenFile(Path logPath) throws IOException {
+-    FSDataOutputStream out = null;
+-    try {
+-      String broken = "{ broken { [[]} broken";
+-      out = PluginStoreTestUtils.createLogFile(logPath, fs);
+-      out.write(broken.getBytes(StandardCharsets.UTF_8));
+-      out.close();
+-      out = null;
+-    } finally {
+-      if (out != null) {
+-        out.close();
+-      }
+-    }
+-  }
+-
+-  // TestLogInfo needs to maintain opened hdfs files so we have to build our own
+-  // write methods
+-  private void writeEntitiesLeaveOpen(TimelineEntities entities, Path logPath)
+-      throws IOException {
+-    if (outStream == null) {
+-      outStream = PluginStoreTestUtils.createLogFile(logPath, fs);
+-      jsonGenerator = new JsonFactory().createGenerator(
+-          (OutputStream)outStream);
+-      jsonGenerator.setPrettyPrinter(new MinimalPrettyPrinter("\n"));
+-    }
+-    for (TimelineEntity entity : entities.getEntities()) {
+-      objMapper.writeValue(jsonGenerator, entity);
+-    }
+-    outStream.hflush();
+-  }
+-
+-  private void writeDomainLeaveOpen(TimelineDomain domain, Path logPath)
+-      throws IOException {
+-    if (outStreamDomain == null) {
+-      outStreamDomain = PluginStoreTestUtils.createLogFile(logPath, fs);
+-    }
+-    // Write domain uses its own json generator to isolate from entity writers
+-    JsonGenerator jsonGeneratorLocal
+-        = new JsonFactory().createGenerator((OutputStream)outStreamDomain);
+-    jsonGeneratorLocal.setPrettyPrinter(new MinimalPrettyPrinter("\n"));
+-    objMapper.writeValue(jsonGeneratorLocal, domain);
+-    outStreamDomain.hflush();
+-  }
+-
+-  private Path getTestRootPath() {
+-    return fileContextTestHelper.getTestRootPath(fc);
+-  }
+-
+-  private Path getTestRootPath(String pathString) {
+-    return fileContextTestHelper.getTestRootPath(fc, pathString);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestOverrideTimelineStoreYarnClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestOverrideTimelineStoreYarnClient.java
+deleted file mode 100644
+index 5b9500a4017..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/test/java/org/apache/hadoop/yarn/server/timeline/TestOverrideTimelineStoreYarnClient.java
++++ /dev/null
+@@ -1,57 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.timeline;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.junit.jupiter.api.Test;
+-
+-import java.io.IOException;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-
+-public class TestOverrideTimelineStoreYarnClient {
+-
+-  @Test
+-  void testLifecycleAndOverride() throws Throwable {
+-    YarnConfiguration conf = new YarnConfiguration();
+-    try (NoRMStore store = new NoRMStore()) {
+-      store.init(conf);
+-      store.start();
+-      assertEquals(EntityGroupFSTimelineStore.AppState.ACTIVE,
+-          store.getAppState(ApplicationId.newInstance(1, 1)));
+-      store.stop();
+-    }
+-  }
+-
+-  private static class NoRMStore extends EntityGroupFSTimelineStore {
+-    @Override
+-    protected YarnClient createAndInitYarnClient(Configuration conf) {
+-      return null;
+-    }
+-
+-    @Override
+-    protected AppState getAppState(ApplicationId appId)
+-        throws IOException {
+-      return AppState.ACTIVE;
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index f37b0ff8573..d6e27fafc36 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -41,7 +41,6 @@
+     <module>hadoop-yarn-server-sharedcachemanager</module>
+     <module>hadoop-yarn-server-tests</module>
+     <module>hadoop-yarn-server-applicationhistoryservice</module>
+-    <module>hadoop-yarn-server-timeline-pluginstorage</module>
+     <module>hadoop-yarn-server-timelineservice</module>
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
diff --git a/hadoop/stackable/patches/3.4.0/27-remove-hadoop-client-check-test-invariants.patch b/hadoop/stackable/patches/3.4.0/27-remove-hadoop-client-check-test-invariants.patch
new file mode 100644
index 000000000..4fb6324bf
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/27-remove-hadoop-client-check-test-invariants.patch
@@ -0,0 +1,376 @@
+Entirely remove hadoop-client-check-test-invariants
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../hadoop-client-check-test-invariants/pom.xml    |  205 --------------------
+ .../resources/ensure-jars-have-correct-contents.sh |   98 ----------
+ hadoop-client-modules/pom.xml                      |    1 
+ hadoop-dist/pom.xml                                |    6 -
+ hadoop-project/pom.xml                             |    6 -
+ 5 files changed, 316 deletions(-)
+ delete mode 100644 hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+ delete mode 100644 hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+
+diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+deleted file mode 100644
+index 3f149738554..00000000000
+--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
++++ /dev/null
+@@ -1,205 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!--
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-client-check-test-invariants</artifactId>
+-  <version>3.4.0</version>
+-  <packaging>pom</packaging>
+-
+-  <description>
+-  Enforces our invariants for the test client modules.
+-  E.g. that modules have a specific set of transitive dependencies
+-  and shaded artifacts only contain classes that are in particular
+-  packages. Does the enforcement through the maven-enforcer-plugin
+-  and an integration test.
+-  </description>
+-  <name>Apache Hadoop Client Packaging Invariants for Test</name>
+-
+-  <properties>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-runtime</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-minicluster</artifactId>
+-    </dependency>
+-  </dependencies>
+-  <build>
+-    <plugins>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-enforcer-plugin</artifactId>
+-        <dependencies>
+-          <dependency>
+-            <groupId>org.codehaus.mojo</groupId>
+-            <artifactId>extra-enforcer-rules</artifactId>
+-            <version>1.5.1</version>
+-          </dependency>
+-        </dependencies>
+-        <executions>
+-          <execution>
+-            <id>enforce-banned-dependencies</id>
+-            <goals>
+-              <goal>enforce</goal>
+-            </goals>
+-            <configuration>
+-              <rules>
+-                <banTransitiveDependencies>
+-<!--
+-                  <message>
+-    Our client-facing artifacts are not supposed to have additional dependencies
+-    and one or more of them do. The output from the enforcer plugin should give
+-    specifics.
+-                  </message>
+--->
+-                  <excludes>
+-                    <!-- annotations is provided, and both artifacts exclude the tools transitive,
+-                         but enforcer still sees it.
+-                    -->
+-                    <exclude>org.apache.hadoop:hadoop-annotations</exclude>
+-                    <!-- Leave slf4j unshaded so downstream users can configure logging. -->
+-                    <exclude>org.slf4j:slf4j-api</exclude>
+-                    <!-- Leave commons-logging unshaded so downstream users can configure logging. -->
+-                    <exclude>commons-logging:commons-logging</exclude>
+-                    <!-- Leave reload4j unshaded so downstream users can configure logging. -->
+-                    <exclude>ch.qos.reload4j:reload4j</exclude>
+-                    <!-- Leave JUnit unshaded so downstream can use our test helper classes -->
+-                    <exclude>junit:junit</exclude>
+-                    <!-- JUnit brings in hamcrest -->
+-                    <exclude> org.hamcrest:hamcrest-core</exclude>
+-                    <!-- Leave javax annotations we need exposed -->
+-                    <exclude>com.google.code.findbugs:jsr305</exclude>
+-                    <!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
+-                    <exclude>org.bouncycastle:*</exclude>
+-                    <!-- Leave snappy that includes native methods which cannot be relocated. -->
+-                    <exclude>org.xerial.snappy:*</exclude>
+-                  </excludes>
+-                </banTransitiveDependencies>
+-                <banDuplicateClasses>
+-                  <findAllDuplicates>true</findAllDuplicates>
+-                  <dependencies>
+-                    <dependency>
+-                      <groupId>org.apache.hadoop</groupId>
+-                      <artifactId>hadoop-annotations</artifactId>
+-                      <ignoreClasses>
+-                        <ignoreClass>*</ignoreClass>
+-                      </ignoreClasses>
+-                    </dependency>
+-                  </dependencies>
+-                </banDuplicateClasses>
+-              </rules>
+-<!-- TODO we need a rule for "the constants in this set of classes haven't been shaded / don't have this prefix"
+-     Manually checking the set of Keys that look like packages we relocate:
+-
+-      cat `find . \( -name '*Keys.java' -o -name '*KeysPublic.java' \) -a -path '*/src/main/*'`  | grep -E "\"(io\.|org\.|com\.|net\.)" | grep -v "^package" | grep -v "^import" | grep -v "\"org.apache.hadoop"
+-
+-     Manually check the set of shaded artifacts to see if the Keys constants have been relocated:
+-
+-     for clazz in `find . \( -name '*Keys.java' -o -name '*KeysPublic.java' \) -a -path '*/src/main/*'`; do
+-       clazz=${clazz#*src/main/java/}
+-       clazz="${clazz%.java}"
+-       javap -cp hadoop-client-modules/hadoop-client-api/target/hadoop-client-api-3.0.0-alpha2-SNAPSHOT.jar:hadoop-client-modules/hadoop-client-runtime/target/hadoop-client-runtime-3.0.0-alpha2-SNAPSHOT.jar:hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-3.0.0-alpha2-SNAPSHOT.jar \
+-           -constants "${clazz//\//.}" | grep "org.apache.hadoop.shaded"
+-     done
+--->
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-resources-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>test-resources</id>
+-            <phase>pre-integration-test</phase>
+-            <goals>
+-              <goal>testResources</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <!-- create a maven pom property that has all of our dependencies.
+-         below in the integration-test phase we'll pass this list
+-         of paths to our jar checker script.
+-      -->
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-dependency-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>put-client-artifacts-in-a-property</id>
+-            <phase>pre-integration-test</phase>
+-            <goals>
+-              <goal>build-classpath</goal>
+-            </goals>
+-            <configuration>
+-              <!-- these two get covered in our non-test invariant check -->
+-              <excludeArtifactIds>hadoop-client-api,hadoop-client-runtime</excludeArtifactIds>
+-              <excludeTransitive>true</excludeTransitive>
+-              <pathSeparator>;</pathSeparator>
+-              <outputProperty>hadoop-client-artifacts</outputProperty>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-      <!--
+-        Check that we actually relocated everything we included.
+-        It's critical that we don't ship third party dependencies that haven't
+-        been relocated under our pacakge space, since this will lead to
+-        difficult to debug classpath errors for downstream. Unfortunately, that
+-        means inspecting all the jars.
+-        -->
+-      <plugin>
+-        <groupId>org.codehaus.mojo</groupId>
+-        <artifactId>exec-maven-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>check-jar-contents</id>
+-            <phase>integration-test</phase>
+-            <goals>
+-              <goal>exec</goal>
+-            </goals>
+-            <configuration>
+-              <executable>${shell-executable}</executable>
+-              <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+-              <arguments>
+-                <argument>ensure-jars-have-correct-contents.sh</argument>
+-                <argument>${hadoop-client-artifacts}</argument>
+-              </arguments>
+-            </configuration>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-
+-</project>
+-
+diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+deleted file mode 100644
+index 0dbfefbf4f1..00000000000
+--- a/hadoop-client-modules/hadoop-client-check-test-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
++++ /dev/null
+@@ -1,98 +0,0 @@
+-#!/usr/bin/env bash
+-# Licensed to the Apache Software Foundation (ASF) under one
+-# or more contributor license agreements.  See the NOTICE file
+-# distributed with this work for additional information
+-# regarding copyright ownership.  The ASF licenses this file
+-# to you under the Apache License, Version 2.0 (the
+-# "License"); you may not use this file except in compliance
+-# with the License.  You may obtain a copy of the License at
+-#
+-#     http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-
+-# Usage: $0 [/path/to/some/example.jar;/path/to/another/example/created.jar]
+-#
+-# accepts a single command line argument with a colon separated list of
+-# paths to jars to check. Iterates through each such passed jar and checks
+-# all the contained paths to make sure they follow the below constructed
+-# safe list.
+-
+-# We use +=, which is a bash 3.1+ feature
+-if [[ -z "${BASH_VERSINFO[0]}" ]] \
+-   || [[ "${BASH_VERSINFO[0]}" -lt 3 ]] \
+-   || [[ "${BASH_VERSINFO[0]}" -eq 3 && "${BASH_VERSINFO[1]}" -lt 1 ]]; then
+-  echo "bash v3.1+ is required. Sorry."
+-  exit 1
+-fi
+-
+-set -e
+-set -o pipefail
+-
+-# we have to allow the directories that lead to the org/apache/hadoop dir
+-allowed_expr="(^org/$|^org/apache/$"
+-# We allow the following things to exist in our client artifacts:
+-#   * classes in packages that start with org.apache.hadoop, which by
+-#     convention should be in a path that looks like org/apache/hadoop
+-allowed_expr+="|^org/apache/hadoop/"
+-#   * whatever in the "META-INF" directory
+-allowed_expr+="|^META-INF/"
+-#   * whatever under the "webapps" directory; for things shipped by yarn
+-allowed_expr+="|^webapps/"
+-#   * Resources files used by Hadoop YARN mini cluster
+-allowed_expr+="|^TERMINAL/"
+-#   * Hadoop's default configuration files, which have the form
+-#     "_module_-default.xml"
+-allowed_expr+="|^[^-]*-default.xml$"
+-#   * Hadoop's versioning properties files, which have the form
+-#     "_module_-version-info.properties"
+-allowed_expr+="|^[^-]*-version-info.properties$"
+-#   * Hadoop's application classloader properties file.
+-allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
+-#   * Used by JavaSandboxLinuxContainerRuntime as a default, loaded
+-#     from root, so can't relocate. :(
+-allowed_expr+="|^java.policy$"
+-#   * Used by javax.annotation
+-allowed_expr+="|^jndi.properties$"
+-
+-allowed_expr+=")"
+-declare -i bad_artifacts=0
+-declare -a bad_contents
+-declare -a artifact_list
+-while IFS='' read -r -d ';' line; do artifact_list+=("$line"); done < <(printf '%s;' "$1")
+-if [ "${#artifact_list[@]}" -eq 0 ]; then
+-  echo "[ERROR] No artifacts passed in."
+-  exit 1
+-fi
+-
+-jar_list_failed ()
+-{
+-    echo "[ERROR] Listing jar contents for file '${artifact}' failed."
+-    exit 1
+-}
+-trap jar_list_failed SIGUSR1
+-
+-for artifact in "${artifact_list[@]}"; do
+-  # Note: On Windows the output from jar tf may contain \r\n's.  Normalize to \n.
+-  while IFS='' read -r line; do bad_contents+=("$line"); done < <( ( jar tf "${artifact}" | sed 's/\\r//' || kill -SIGUSR1 $$ ) | grep -v -E "${allowed_expr}" )
+-  if [ ${#bad_contents[@]} -gt 0 ]; then
+-    echo "[ERROR] Found artifact with unexpected contents: '${artifact}'"
+-    echo "    Please check the following and either correct the build or update"
+-    echo "    the allowed list with reasoning."
+-    echo ""
+-    for bad_line in "${bad_contents[@]}"; do
+-      echo "    ${bad_line}"
+-    done
+-    bad_artifacts=${bad_artifacts}+1
+-  else
+-    echo "[INFO] Artifact looks correct: '$(basename "${artifact}")'"
+-  fi
+-done
+-
+-if [ "${bad_artifacts}" -gt 0 ]; then
+-  exit 1
+-fi
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 42745731454..373ffd1483f 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -37,7 +37,6 @@
+     <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+-    <module>hadoop-client-check-test-invariants</module>
+     <!-- Attempt to use the created libraries -->
+     <module>hadoop-client-integration-tests</module>
+   </modules>
+diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
+index 6c22e6be8f9..7cd2b677e60 100644
+--- a/hadoop-dist/pom.xml
++++ b/hadoop-dist/pom.xml
+@@ -67,12 +67,6 @@
+       <type>pom</type>
+       <scope>provided</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-check-test-invariants</artifactId>
+-      <type>pom</type>
+-      <scope>provided</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-client-integration-tests</artifactId>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index c69e44739ce..0b9c7a05762 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -285,12 +285,6 @@
+         <version>${hadoop.version}</version>
+         <type>pom</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-check-test-invariants</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>pom</type>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-client-integration-tests</artifactId>
diff --git a/hadoop/stackable/patches/3.4.0/28-remove-hadoop-client-integration-tests.patch b/hadoop/stackable/patches/3.4.0/28-remove-hadoop-client-integration-tests.patch
new file mode 100644
index 000000000..a012be5bb
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/28-remove-hadoop-client-integration-tests.patch
@@ -0,0 +1,630 @@
+Entirely remove remove-hadoop-client-integration-tests
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../hadoop-client-integration-tests/pom.xml        |  206 --------------------
+ .../apache/hadoop/example/ITUseHadoopCodecs.java   |  144 --------------
+ .../apache/hadoop/example/ITUseMiniCluster.java    |  125 ------------
+ .../src/test/resources/hdfs-site.xml               |   34 ---
+ .../src/test/resources/log4j.properties            |   24 --
+ hadoop-client-modules/pom.xml                      |    2 
+ hadoop-dist/pom.xml                                |    6 -
+ hadoop-project/pom.xml                             |    5 
+ 8 files changed, 546 deletions(-)
+ delete mode 100644 hadoop-client-modules/hadoop-client-integration-tests/pom.xml
+ delete mode 100644 hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseHadoopCodecs.java
+ delete mode 100644 hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java
+ delete mode 100644 hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/hdfs-site.xml
+ delete mode 100644 hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/log4j.properties
+
+diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
+deleted file mode 100644
+index 3ea19baed19..00000000000
+--- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
++++ /dev/null
+@@ -1,206 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-client-integration-tests</artifactId>
+-  <version>3.4.0</version>
+-
+-  <description>Checks that we can use the generated artifacts</description>
+-  <name>Apache Hadoop Client Packaging Integration Tests</name>
+-
+-  <properties>
+-    <failsafe.timeout>400</failsafe.timeout>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>ch.qos.reload4j</groupId>
+-      <artifactId>reload4j</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.slf4j</groupId>
+-      <artifactId>slf4j-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.lz4</groupId>
+-      <artifactId>lz4-java</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-  <profiles>
+-    <profile>
+-      <id>shade</id>
+-      <activation>
+-        <property><name>!skipShade</name></property>
+-      </activation>
+-      <dependencies>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-client-api</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-client-runtime</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-client-minicluster</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.bouncycastle</groupId>
+-          <artifactId>bcprov-jdk15on</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.bouncycastle</groupId>
+-          <artifactId>bcpkix-jdk15on</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>javax.xml.bind</groupId>
+-          <artifactId>jaxb-api</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>javax.activation</groupId>
+-          <artifactId>activation</artifactId>
+-          <version>1.1.1</version>
+-          <scope>test</scope>
+-        </dependency>
+-      </dependencies>
+-      <build>
+-        <plugins>
+-          <!-- Because our tests rely on our shaded artifacts, we can't compile
+-               them until after the package phase has run.
+-            -->
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-compiler-plugin</artifactId>
+-            <executions>
+-            <!--
+-               First, let's make sure the normal test-compile doesn't try to
+-               compile our integration tests.
+-            -->
+-              <execution>
+-                <id>default-testCompile</id>
+-                <phase>test-compile</phase>
+-                <configuration>
+-                  <testExcludes>
+-                    <testExclude>**/IT*</testExclude>
+-                    <testExclude>**/*IT</testExclude>
+-                  </testExcludes>
+-                </configuration>
+-              </execution>
+-            <!--
+-               Finally, let's make a 'just for integration tests'-compile that
+-               fires off prior to our integration tests but after the package
+-               phase has created our shaded artifacts.
+-            -->
+-              <execution>
+-                <id>compile-integration-tests</id>
+-                <phase>pre-integration-test</phase>
+-                <goals>
+-                  <goal>testCompile</goal>
+-                </goals>
+-                <configuration>
+-                  <testIncludes>
+-                    <testInclude>**/IT*</testInclude>
+-                    <testInclude>**/*IT</testInclude>
+-                  </testIncludes>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-failsafe-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <goals>
+-                  <goal>integration-test</goal>
+-                  <goal>verify</goal>
+-                </goals>
+-                <configuration>
+-                  <trimStackTrace>false</trimStackTrace>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-    <profile>
+-      <id>noshade</id>
+-      <activation>
+-        <property><name>skipShade</name></property>
+-      </activation>
+-      <dependencies>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-common</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-hdfs-client</artifactId>
+-          <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-hdfs</artifactId>
+-          <scope>test</scope>
+-          <type>test-jar</type>
+-          <exclusions>
+-            <exclusion>
+-              <groupId>org.ow2.asm</groupId>
+-              <artifactId>asm-commons</artifactId>
+-            </exclusion>
+-          </exclusions>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-server-tests</artifactId>
+-          <scope>test</scope>
+-          <type>test-jar</type>
+-        </dependency>
+-        <dependency>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-common</artifactId>
+-          <scope>test</scope>
+-          <type>test-jar</type>
+-        </dependency>
+-      </dependencies>
+-    </profile>
+-  </profiles>
+-
+-</project>
+-
+diff --git a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseHadoopCodecs.java b/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseHadoopCodecs.java
+deleted file mode 100644
+index fd0effa143b..00000000000
+--- a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseHadoopCodecs.java
++++ /dev/null
+@@ -1,144 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- *
+- */
+-
+-package org.apache.hadoop.example;
+-
+-import static org.junit.Assert.assertEquals;
+-import static org.junit.Assert.assertFalse;
+-
+-import java.io.*;
+-import java.util.Arrays;
+-import java.util.Random;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.CommonConfigurationKeys;
+-import org.apache.hadoop.io.DataInputBuffer;
+-import org.apache.hadoop.io.DataOutputBuffer;
+-import org.apache.hadoop.io.RandomDatum;
+-import org.apache.hadoop.io.compress.CompressionCodec;
+-import org.apache.hadoop.io.compress.CompressionInputStream;
+-import org.apache.hadoop.io.compress.CompressionOutputStream;
+-import org.apache.hadoop.io.compress.zlib.ZlibFactory;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.junit.Test;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * Ensure that we can perform codec operations given the API and runtime jars
+- * by performing some simple smoke tests.
+- */
+-public class ITUseHadoopCodecs {
+-
+-  private static final Logger LOG = LoggerFactory.getLogger(ITUseHadoopCodecs.class);
+-
+-  private Configuration haddopConf = new Configuration();
+-  private int dataCount = 100;
+-  private int dataSeed = new Random().nextInt();
+-
+-  @Test
+-  public void testGzipCodec() throws IOException {
+-    ZlibFactory.setNativeZlibLoaded(false);
+-    assertFalse(ZlibFactory.isNativeZlibLoaded(haddopConf));
+-    codecTest(haddopConf, dataSeed, 0, "org.apache.hadoop.io.compress.GzipCodec");
+-    codecTest(haddopConf, dataSeed, dataCount, "org.apache.hadoop.io.compress.GzipCodec");
+-  }
+-
+-  @Test
+-  public void testSnappyCodec() throws IOException {
+-    codecTest(haddopConf, dataSeed, 0, "org.apache.hadoop.io.compress.SnappyCodec");
+-    codecTest(haddopConf, dataSeed, dataCount, "org.apache.hadoop.io.compress.SnappyCodec");
+-  }
+-
+-  @Test
+-  public void testLz4Codec() {
+-    Arrays.asList(false, true).forEach(config -> {
+-      haddopConf.setBoolean(
+-          CommonConfigurationKeys.IO_COMPRESSION_CODEC_LZ4_USELZ4HC_KEY,
+-          config);
+-      try {
+-        codecTest(haddopConf, dataSeed, 0, "org.apache.hadoop.io.compress.Lz4Codec");
+-        codecTest(haddopConf, dataSeed, dataCount, "org.apache.hadoop.io.compress.Lz4Codec");
+-      } catch (IOException e) {
+-        throw new RuntimeException("failed when running codecTest", e);
+-      }
+-    });
+-  }
+-
+-  private void codecTest(Configuration conf, int seed, int count, String codecClass)
+-      throws IOException {
+-
+-    // Create the codec
+-    CompressionCodec codec = null;
+-    try {
+-      codec = (CompressionCodec)
+-              ReflectionUtils.newInstance(conf.getClassByName(codecClass), conf);
+-    } catch (ClassNotFoundException cnfe) {
+-      throw new IOException("Illegal codec!");
+-    }
+-    LOG.info("Created a Codec object of type: " + codecClass);
+-
+-    // Generate data
+-    DataOutputBuffer data = new DataOutputBuffer();
+-    RandomDatum.Generator generator = new RandomDatum.Generator(seed);
+-    for(int i = 0; i < count; ++i) {
+-      generator.next();
+-      RandomDatum key = generator.getKey();
+-      RandomDatum value = generator.getValue();
+-
+-      key.write(data);
+-      value.write(data);
+-    }
+-    LOG.info("Generated " + count + " records");
+-
+-    // Compress data
+-    DataOutputBuffer compressedDataBuffer = new DataOutputBuffer();
+-    try (CompressionOutputStream deflateFilter =
+-        codec.createOutputStream(compressedDataBuffer);
+-        DataOutputStream deflateOut =
+-            new DataOutputStream(new BufferedOutputStream(deflateFilter))) {
+-      deflateOut.write(data.getData(), 0, data.getLength());
+-      deflateOut.flush();
+-      deflateFilter.finish();
+-    }
+-
+-    // De-compress data
+-    DataInputBuffer deCompressedDataBuffer = new DataInputBuffer();
+-    deCompressedDataBuffer.reset(compressedDataBuffer.getData(), 0,
+-            compressedDataBuffer.getLength());
+-    DataInputBuffer originalData = new DataInputBuffer();
+-    originalData.reset(data.getData(), 0, data.getLength());
+-    try (CompressionInputStream inflateFilter =
+-        codec.createInputStream(deCompressedDataBuffer);
+-        DataInputStream originalIn =
+-            new DataInputStream(new BufferedInputStream(originalData))) {
+-
+-      // Check
+-      int expected;
+-      do {
+-        expected = originalIn.read();
+-        assertEquals("Inflated stream read by byte does not match",
+-                expected, inflateFilter.read());
+-      } while (expected != -1);
+-    }
+-
+-    LOG.info("SUCCESS! Completed checking " + count + " records");
+-  }
+-}
+diff --git a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java b/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java
+deleted file mode 100644
+index 2e304861bab..00000000000
+--- a/hadoop-client-modules/hadoop-client-integration-tests/src/test/java/org/apache/hadoop/example/ITUseMiniCluster.java
++++ /dev/null
+@@ -1,125 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *   http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied.  See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- *
+- */
+-
+-package org.apache.hadoop.example;
+-
+-import java.io.IOException;
+-import java.net.URISyntaxException;
+-
+-import org.junit.After;
+-import org.junit.Assert;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.FSDataInputStream;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.io.IOUtils;
+-
+-import org.apache.hadoop.conf.Configuration;
+-
+-import org.apache.hadoop.hdfs.HdfsConfiguration;
+-import org.apache.hadoop.hdfs.MiniDFSCluster;
+-
+-import org.apache.hadoop.hdfs.web.WebHdfsTestUtil;
+-import org.apache.hadoop.hdfs.web.WebHdfsConstants;
+-import org.apache.hadoop.yarn.server.MiniYARNCluster;
+-
+-/**
+- * Ensure that we can perform operations against the shaded minicluster
+- * given the API and runtime jars by performing some simple smoke tests.
+- */
+-public class ITUseMiniCluster {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ITUseMiniCluster.class);
+-
+-  private MiniDFSCluster cluster;
+-  private MiniYARNCluster yarnCluster;
+-
+-  private static final String TEST_PATH = "/foo/bar/cats/dee";
+-  private static final String FILENAME = "test.file";
+-
+-  private static final String TEXT = "Lorem ipsum dolor sit amet, consectetur "
+-      + "adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore "
+-      + "magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation "
+-      + "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute "
+-      + "irure dolor in reprehenderit in voluptate velit esse cillum dolore eu "
+-      + "fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident,"
+-      + " sunt in culpa qui officia deserunt mollit anim id est laborum.";
+-
+-  @Before
+-  public void clusterUp() throws IOException {
+-    final Configuration conf = new HdfsConfiguration();
+-    cluster = new MiniDFSCluster.Builder(conf)
+-        .numDataNodes(3)
+-        .build();
+-    cluster.waitActive();
+-
+-    conf.set("yarn.scheduler.capacity.root.queues", "default");
+-    conf.setInt("yarn.scheduler.capacity.root.default.capacity", 100);
+-    yarnCluster = new MiniYARNCluster(getClass().getName(), 1, 1, 1, 1);
+-    yarnCluster.init(conf);
+-    yarnCluster.start();
+-  }
+-
+-  @After
+-  public void clusterDown() {
+-    if (cluster != null) {
+-      cluster.close();
+-    }
+-    IOUtils.cleanupWithLogger(LOG, yarnCluster);
+-  }
+-
+-  @Test
+-  public void useHdfsFileSystem() throws IOException {
+-    try (FileSystem fs = cluster.getFileSystem()) {
+-      simpleReadAfterWrite(fs);
+-    }
+-  }
+-
+-  public void simpleReadAfterWrite(final FileSystem fs) throws IOException {
+-    LOG.info("Testing read-after-write with FS implementation: {}", fs);
+-    final Path path = new Path(TEST_PATH, FILENAME);
+-    if (!fs.mkdirs(path.getParent())) {
+-      throw new IOException("Mkdirs failed to create " +
+-          TEST_PATH);
+-    }
+-    try (FSDataOutputStream out = fs.create(path)) {
+-      out.writeUTF(TEXT);
+-    }
+-    try (FSDataInputStream in = fs.open(path)) {
+-      final String result = in.readUTF();
+-      Assert.assertEquals("Didn't read back text we wrote.", TEXT, result);
+-    }
+-  }
+-
+-  @Test
+-  public void useWebHDFS() throws IOException, URISyntaxException {
+-    try (FileSystem fs = WebHdfsTestUtil.getWebHdfsFileSystem(
+-        cluster.getConfiguration(0), WebHdfsConstants.WEBHDFS_SCHEME)) {
+-      simpleReadAfterWrite(fs);
+-    }
+-  }
+-}
+diff --git a/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/hdfs-site.xml b/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/hdfs-site.xml
+deleted file mode 100644
+index cd13532906e..00000000000
+--- a/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/hdfs-site.xml
++++ /dev/null
+@@ -1,34 +0,0 @@
+-<?xml version="1.0"?>
+-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<!-- Put site-specific property overrides in this file. -->
+-
+-<configuration>
+-  <!-- Turn security off for tests by default -->
+-  <property>
+-    <name>hadoop.security.authentication</name>
+-    <value>simple</value>
+-  </property>
+-  <!-- Disable min block size since most tests use tiny blocks -->
+-  <property>
+-    <name>dfs.namenode.fs-limits.min-block-size</name>
+-    <value>0</value>
+-  </property>
+-
+-</configuration>
+diff --git a/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/log4j.properties b/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/log4j.properties
+deleted file mode 100644
+index db66160d850..00000000000
+--- a/hadoop-client-modules/hadoop-client-integration-tests/src/test/resources/log4j.properties
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#
+-#   Licensed to the Apache Software Foundation (ASF) under one or more
+-#   contributor license agreements.  See the NOTICE file distributed with
+-#   this work for additional information regarding copyright ownership.
+-#   The ASF licenses this file to You under the Apache License, Version 2.0
+-#   (the "License"); you may not use this file except in compliance with
+-#   the License.  You may obtain a copy of the License at
+-#
+-#       http://www.apache.org/licenses/LICENSE-2.0
+-#
+-#   Unless required by applicable law or agreed to in writing, software
+-#   distributed under the License is distributed on an "AS IS" BASIS,
+-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-#   See the License for the specific language governing permissions and
+-#   limitations under the License.
+-#
+-# log4j configuration used during build and unit tests
+-
+-log4j.rootLogger=info,stdout
+-log4j.threshold=ALL
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
+-
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 373ffd1483f..7f8a5710784 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -37,8 +37,6 @@
+     <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+-    <!-- Attempt to use the created libraries -->
+-    <module>hadoop-client-integration-tests</module>
+   </modules>
+ 
+ </project>
+diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
+index 7cd2b677e60..39a485d2944 100644
+--- a/hadoop-dist/pom.xml
++++ b/hadoop-dist/pom.xml
+@@ -67,12 +67,6 @@
+       <type>pom</type>
+       <scope>provided</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-integration-tests</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-
+   </dependencies>
+ 
+   <build>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 0b9c7a05762..609b6d5b3ca 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -285,11 +285,6 @@
+         <version>${hadoop.version}</version>
+         <type>pom</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-integration-tests</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-client-runtime</artifactId>
diff --git a/hadoop/stackable/patches/3.4.0/29-remove-hadoop-client-minicluster.patch b/hadoop/stackable/patches/3.4.0/29-remove-hadoop-client-minicluster.patch
new file mode 100644
index 000000000..e65913dd1
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/29-remove-hadoop-client-minicluster.patch
@@ -0,0 +1,1171 @@
+Entirely remove hadoop-client-minicluster
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ dev-support/bin/dist-layout-stitching              |    1 
+ .../hadoop-client-minicluster/pom.xml              | 1111 --------------------
+ hadoop-client-modules/pom.xml                      |    2 
+ hadoop-project/pom.xml                             |    5 
+ 4 files changed, 1119 deletions(-)
+ delete mode 100644 hadoop-client-modules/hadoop-client-minicluster/pom.xml
+
+diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
+index e769b26ff84..1f6c1f79f5a 100755
+--- a/dev-support/bin/dist-layout-stitching
++++ b/dev-support/bin/dist-layout-stitching
+@@ -146,7 +146,6 @@ run cp -pr "${ROOT}/hadoop-common-project/hadoop-kms/target/hadoop-kms-${VERSION
+ run mkdir -p "share/hadoop/client"
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-api/target/hadoop-client-api-${VERSION}.jar" share/hadoop/client/
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-runtime/target/hadoop-client-runtime-${VERSION}.jar" share/hadoop/client/
+-run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/
+ 
+ run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
+ 
+diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+deleted file mode 100644
+index dda856fc21c..00000000000
+--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
++++ /dev/null
+@@ -1,1111 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+- Licensed under the Apache License, Version 2.0 (the "License");
+- you may not use this file except in compliance with the License.
+- You may obtain a copy of the License at
+-
+-   http://www.apache.org/licenses/LICENSE-2.0
+-
+- Unless required by applicable law or agreed to in writing, software
+- distributed under the License is distributed on an "AS IS" BASIS,
+- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- See the License for the specific language governing permissions and
+- limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <groupId>org.apache.hadoop</groupId>
+-    <artifactId>hadoop-project</artifactId>
+-    <version>3.4.0</version>
+-    <relativePath>../../hadoop-project</relativePath>
+-  </parent>
+-  <artifactId>hadoop-client-minicluster</artifactId>
+-  <version>3.4.0</version>
+-  <packaging>jar</packaging>
+-
+-  <description>Apache Hadoop Minicluster for Clients</description>
+-  <name>Apache Hadoop Client Test Minicluster</name>
+-
+-  <properties>
+-    <shaded.dependency.prefix>org.apache.hadoop.shaded</shaded.dependency.prefix>
+-    <!-- We contain no source -->
+-    <maven.javadoc.skip>true</maven.javadoc.skip>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-api</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <!-- This is the api's compile dependency, but we don't want it to be compile dependency here too. -->
+-    <dependency>
+-      <groupId>org.xerial.snappy</groupId>
+-      <artifactId>snappy-java</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-runtime</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <!-- Leave JUnit as a direct dependency -->
+-    <dependency>
+-      <groupId>junit</groupId>
+-      <artifactId>junit</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <!-- Adding hadoop-annotations so we can make it optional to remove from our transitive tree -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-annotations</artifactId>
+-      <scope>compile</scope>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>jdk.tools</groupId>
+-          <artifactId>jdk.tools</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- uncomment this dependency if you need to use
+-         `mvn dependency:tree -Dverbose` to determine if a dependency shows up
+-         in both the hadoop-client-* artifacts and something under minicluster.
+-    -->
+-<!--
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+- -->
+-    <!-- Anything we're going to include in the relocated jar we list as optional
+-         in order to work around MNG-5899
+-      -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-minicluster</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <!-- exclude everything that comes in via the shaded runtime and api  TODO remove once we have a filter for "is in these artifacts" -->
+-        <!-- Skip jersey, since we need it again here. -->
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-hdfs-client</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-mapreduce-client-app</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-mapreduce-client-core</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-        </exclusion>
+-        <!-- exclude things that came in via transitive in shaded runtime and api -->
+-        <exclusion>
+-          <groupId>io.netty</groupId>
+-          <artifactId>netty</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>javax.servlet-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.xml.bind</groupId>
+-          <artifactId>jaxb-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>xml-apis</groupId>
+-          <artifactId>xml-apis</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.avro</groupId>
+-          <artifactId>avro</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.curator</groupId>
+-          <artifactId>curator-client</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-mapreduce-client-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>${leveldbjni.group}</groupId>
+-          <artifactId>leveldbjni-all</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.eclipse.jetty</groupId>
+-          <artifactId>jetty-util</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.google.guava</groupId>
+-          <artifactId>guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.google.protobuf</groupId>
+-          <artifactId>protobuf-java</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-collections</groupId>
+-          <artifactId>commons-collections</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-io</groupId>
+-          <artifactId>commons-io</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.commons</groupId>
+-          <artifactId>commons-lang3</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.commons</groupId>
+-          <artifactId>commons-text</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-logging</groupId>
+-          <artifactId>commons-logging</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.slf4j</groupId>
+-          <artifactId>slf4j-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.slf4j</groupId>
+-          <artifactId>slf4j-log4j12</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.slf4j</groupId>
+-          <artifactId>slf4j-reload4j</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>ch.qos.reload4j</groupId>
+-          <artifactId>reload4j</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.core</groupId>
+-          <artifactId>jackson-annotations</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.core</groupId>
+-          <artifactId>jackson-core</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.core</groupId>
+-          <artifactId>jackson-databind</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-cli</groupId>
+-          <artifactId>commons-cli</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-codec</groupId>
+-          <artifactId>commons-codec</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>javax.servlet-api</artifactId>
+-        </exclusion>
+-
+-        <!-- removing dependency jars from yarn-server-common, which are
+-        already included in hadoop-client-runtime and hadoop-client-api
+-         -->
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-auth</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.httpcomponents</groupId>
+-          <artifactId>httpclient</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.httpcomponents</groupId>
+-          <artifactId>httpcore</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.nimbusds</groupId>
+-          <artifactId>nimbus-jose-jwt</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>net.minidev</groupId>
+-          <artifactId>json-smart</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>net.minidev</groupId>
+-          <artifactId>accessors-smart</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-simplekdc</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-util</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>token-provider</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-crypto</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerby-util</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerby-pkix</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerby-asn1</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-core</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerby-config</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerby-xdr</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-identity</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-server</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-identity</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.kerby</groupId>
+-          <artifactId>kerb-admin</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.curator</groupId>
+-          <artifactId>curator-framework</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.curator</groupId>
+-          <artifactId>curator-recipes</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-net</groupId>
+-          <artifactId>commons-net</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>dnsjava</groupId>
+-          <artifactId>dnsjava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop.thirdparty</groupId>
+-          <artifactId>hadoop-shaded-guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.ow2.asm</groupId>
+-          <artifactId>asm-commons</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- Add optional runtime dependency on the in-development timeline server module
+-         to indicate that downstream folks interested in turning it on need that dep.
+-      -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+-      <scope>runtime</scope>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>*</groupId>
+-          <artifactId>*</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- Add back in transitive dependencies of hadoop-minicluster that are test-jar artifacts excluded as a side effect of excluding the jar
+-         Note that all of these must be marked "optional" because they won't be removed from the reduced-dependencies pom after they're included.
+-      -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <scope>compile</scope>
+-      <type>test-jar</type>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>*</groupId>
+-          <artifactId>*</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-hdfs</artifactId>
+-      <scope>compile</scope>
+-      <type>test-jar</type>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>*</groupId>
+-          <artifactId>*</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+-      <scope>compile</scope>
+-      <type>test-jar</type>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>*</groupId>
+-          <artifactId>*</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-
+-    <!-- Add back in Mockito since the hadoop-hdfs test jar needs it. -->
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <!-- Add back in the transitive dependencies excluded from hadoop-common in client TODO remove once we have a filter for "is in these artifacts" -->
+-    <!-- skip javax.servlet:servlet-api because it's in client -->
+-    <!-- Skip commons-logging:commons-logging-api because it looks like nothing actually included it -->
+-    <!-- Skip jetty-util because it's in client -->
+-    <dependency>
+-      <groupId>com.sun.jersey</groupId>
+-      <artifactId>jersey-core</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.ws.rs</groupId>
+-          <artifactId>jsr311-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-          <groupId>com.sun.jersey</groupId>
+-          <artifactId>jersey-client</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.github.pjfanning</groupId>
+-      <artifactId>jersey-json</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.core</groupId>
+-          <artifactId>jackson-core</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.core</groupId>
+-          <artifactId>jackson-databind</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.fasterxml.jackson.jaxrs</groupId>
+-          <artifactId>jackson-jaxrs-json-provider</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.xml.bind</groupId>
+-          <artifactId>jaxb-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.codehaus.jettison</groupId>
+-          <artifactId>jettison</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.sun.jersey</groupId>
+-      <artifactId>jersey-server</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.sun.jersey</groupId>
+-      <artifactId>jersey-servlet</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>servlet-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.enterprise</groupId>
+-          <artifactId>cdi-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>ch.qos.cal10n</groupId>
+-          <artifactId>cal10n-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- skip org.apache.avro:avro-ipc because it doesn't look like hadoop-common actually uses it -->
+-    <dependency>
+-      <groupId>net.sf.kosmosfs</groupId>
+-      <artifactId>kfs</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.jcraft</groupId>
+-      <artifactId>jsch</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <!-- add back in transitive dependencies of hadoop-mapreduce-client-app removed in client -->
+-    <!-- Skipping javax.servlet:servlet-api because it's in client -->
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>javax.servlet-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-registry</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-server-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>${leveldbjni.group}</groupId>
+-          <artifactId>leveldbjni-all</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.eclipse.jetty</groupId>
+-          <artifactId>jetty-util</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop.thirdparty</groupId>
+-          <artifactId>hadoop-shaded-guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.google.guava</groupId>
+-          <artifactId>guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.google.protobuf</groupId>
+-          <artifactId>protobuf-java</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-codec</groupId>
+-          <artifactId>commons-codec</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.commons</groupId>
+-          <artifactId>commons-lang3</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-logging</groupId>
+-          <artifactId>commons-logging</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.slf4j</groupId>
+-          <artifactId>slf4j-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>javax.xml.bind</groupId>
+-          <artifactId>jaxb-api</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>javax.servlet</groupId>
+-          <artifactId>javax.servlet-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-api</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop</groupId>
+-          <artifactId>hadoop-yarn-server-common</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>com.google.guava</groupId>
+-          <artifactId>guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.apache.hadoop.thirdparty</groupId>
+-          <artifactId>hadoop-shaded-guava</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>commons-logging</groupId>
+-          <artifactId>commons-logging</artifactId>
+-        </exclusion>
+-        <exclusion>
+-          <groupId>org.eclipse.jetty</groupId>
+-          <artifactId>jetty-util</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- skipping hadoop-annotations -->
+-    <dependency>
+-      <groupId>com.google.inject.extensions</groupId>
+-      <artifactId>guice-servlet</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <!-- skipping junit:junit because it is test scope -->
+-    <!-- skipping avro because it is in client via hadoop-common -->
+-    <!-- skipping jline:jline because it is only present at test scope in the original -->
+-    <!-- skipping io.netty:netty because it's in client -->
+-    <!-- add back in transitive dependencies of hadoop-yarn-api removed in client -->
+-    <!-- skipping hadoop-annotations -->
+-    <dependency>
+-      <groupId>com.google.inject</groupId>
+-      <artifactId>guice</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>com.google.guava</groupId>
+-          <artifactId>guava</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+-      <artifactId>jersey-test-framework-grizzly2</artifactId>
+-      <optional>true</optional>
+-      <exclusions>
+-        <!-- excluding because client already has the tomcat version -->
+-        <exclusion>
+-          <groupId>org.glassfish</groupId>
+-          <artifactId>javax.servlet</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <!-- skipping jersey-server because it's above -->
+-    <dependency>
+-      <groupId>com.sun.jersey.contribs</groupId>
+-      <artifactId>jersey-guice</artifactId>
+-      <optional>true</optional>
+-    </dependency>
+-    <!-- skipping guice-servlet because it's above -->
+-    <!-- skipping avro because it is in client via hadoop-common -->
+-    <!-- skipping jersey-core because it's above -->
+-    <!-- skipping jersey-json because it's above. -->
+-    <!-- skipping io.netty:netty because it's in client -->
+-    <!-- Add back in transitive dependencies from hadoop-mapreduce-client-core that were excluded by client -->
+-    <!-- skipping junit:junit because it is test scope -->
+-    <!-- skipping guice because it's above -->
+-    <!-- skipping jersey-test-framework-grizzly2 because it's above -->
+-    <!-- skipping jersey-server because it's above -->
+-    <!-- skipping jersey-guice because it's above -->
+-    <!-- skipping avro because it is in client via hadoop-common -->
+-    <!-- skipping hadoop-annotations -->
+-    <!-- skipping guice-servlet because it's above -->
+-    <!-- skipping jersey-json because it's above. -->
+-    <!-- skipping io.netty:netty because it's in client -->
+-    <!-- add back in transitive dependencies of hadoop-mapreduce-client-jobclient that were excluded from client -->
+-    <!-- skipping junit:junit because it is test scope -->
+-    <!-- skipping avro because it is in client via hadoop-common -->
+-    <!-- skipping hadoop-annotations -->
+-    <!-- skipping guice-servlet because it's above -->
+-    <!-- skipping io.netty:netty because it's in client -->
+-  </dependencies>
+-  <profiles>
+-    <profile>
+-      <id>shade</id>
+-      <activation>
+-        <property><name>!skipShade</name></property>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <!-- We contain no source -->
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-source-plugin</artifactId>
+-              <configuration>
+-                <skipSource>true</skipSource>
+-              </configuration>
+-          </plugin>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-shade-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <phase>package</phase>
+-                <goals>
+-                  <goal>shade</goal>
+-                </goals>
+-                <configuration>
+-                  <artifactSet>
+-                    <excludes>
+-                      <!-- Fine to expose our already-shaded deps as dependencies -->
+-                      <exclude>org.apache.hadoop:hadoop-annotations</exclude>
+-                      <exclude>org.apache.hadoop:hadoop-client-api</exclude>
+-                      <exclude>org.apache.hadoop:hadoop-client-runtime</exclude>
+-                      <!-- Fine to expose our purposefully not-shaded deps as dependencies -->
+-                      <exclude>org.slf4j:slf4j-api</exclude>
+-                      <exclude>commons-logging:commons-logging</exclude>
+-                      <exclude>junit:junit</exclude>
+-                      <exclude>com.google.code.findbugs:jsr305</exclude>
+-                      <exclude>ch.qos.reload4j:reload4j</exclude>
+-                      <exclude>org.eclipse.jetty.websocket:websocket-common</exclude>
+-                      <exclude>org.eclipse.jetty.websocket:websocket-api</exclude>
+-                      <!-- We need a filter that matches just those things that are included in the above artiacts -->
+-                      <!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
+-                      <exclude>org.bouncycastle:*</exclude>
+-                      <!-- Leave snappy that includes native methods which cannot be relocated. -->
+-                      <exclude>org.xerial.snappy:*</exclude>
+-                    </excludes>
+-                  </artifactSet>
+-                  <filters>
+-                    <!-- Some of our dependencies include source, so remove it. -->
+-                    <filter>
+-                      <artifact>*:*</artifact>
+-                      <excludes>
+-                        <exclude>**/*.java</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <!-- We pull in several test jars; keep out the actual test classes -->
+-                    <filter>
+-                      <artifact>*:*</artifact>
+-                      <excludes>
+-                        <exclude>**/Test*.class</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <!-- Since runtime has classes for these jars, we exclude them.
+-                         We still want the java services api files, since those were excluded in runtime
+-                      -->
+-                    <filter>
+-                      <artifact>com.sun.jersey:jersey-client</artifact>
+-                      <excludes>
+-                        <exclude>**/*.class</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>com.sun.jersey:jersey-core</artifact>
+-                      <excludes>
+-                        <exclude>**/*.class</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>com.sun.jersey:jersey-servlet</artifact>
+-                      <excludes>
+-                        <exclude>**/*.class</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.apache.hadoop:hadoop-mapreduce-client-jobclient:*</artifact>
+-                      <excludes>
+-                        <exclude>testjar/*</exclude>
+-                        <exclude>testshell/*</exclude>
+-                        <exclude>testdata/*</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>*:*</artifact>
+-                      <excludes>
+-                        <exclude>META-INF/versions/9/module-info.class</exclude>
+-                        <exclude>META-INF/versions/11/module-info.class</exclude>
+-                      </excludes>
+-                    </filter>
+-
+-                    <!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
+-                    <filter>
+-                      <artifact>org.mockito:mockito-core</artifact>
+-                      <excludes>
+-                        <exclude>asm-license.txt</exclude>
+-                        <exclude>cglib-license.txt</exclude>
+-                        <exclude>hamcrest-license.txt</exclude>
+-                        <exclude>objenesis-license.txt</exclude>
+-                        <exclude>org/hamcrest/**/*.class</exclude>
+-                        <exclude>org/hamcrest/*.class</exclude>
+-                        <exclude>org/objenesis/**/*.class</exclude>
+-                        <exclude>org/objenesis/*.class</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <!-- skip grizzly internals we don't need to run. -->
+-                    <filter>
+-                      <artifact>org.glassfish.grizzly:grizzly-http-servlet</artifact>
+-                      <excludes>
+-                        <exclude>catalog.cat</exclude>
+-                        <exclude>javaee_5.xsd</exclude>
+-                        <exclude>javaee_6.xsd</exclude>
+-                        <exclude>javaee_web_services_client_1_2.xsd</exclude>
+-                        <exclude>javaee_web_services_client_1_3.xsd</exclude>
+-                        <exclude>jsp_2_1.xsd</exclude>
+-                        <exclude>jsp_2_2.xsd</exclude>
+-                        <exclude>web-app_2_5.xsd</exclude>
+-                        <exclude>web-app_3_0.xsd</exclude>
+-                        <exclude>web-common_3_0.xsd</exclude>
+-                        <exclude>xml.xsd</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <!-- skip jetty license info already incorporated into LICENSE/NOTICE -->
+-                      <artifact>org.eclipse.jetty:*</artifact>
+-                      <excludes>
+-                        <exclude>about.html</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <!-- skip jetty license info already incorporated into LICENSE/NOTICE -->
+-                      <artifact>org.eclipse.jetty.websocket:*</artifact>
+-                      <excludes>
+-                        <exclude>about.html</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.apache.hadoop:*</artifact>
+-                      <excludes>
+-                        <!-- No shipping log4j configs in a downstream facing library -->
+-                        <exclude>log4j.properties</exclude>
+-                        <exclude>container-log4j.properties</exclude>
+-                        <!-- keep optional runtime configuration out of the jar; downstream can provide -->
+-                        <exclude>capacity-scheduler.xml</exclude>
+-                        <exclude>krb5.conf</exclude>
+-                        <exclude>.keep</exclude>
+-                      </excludes>
+-                    </filter>
+-
+-                    <!-- remove .xsd from ehcache -->
+-                    <filter>
+-                      <artifact>org.ehcache</artifact>
+-                      <excludes>
+-                        <exclude>ehcache-107ext.xsd</exclude>
+-                        <exclude>ehcache-core.xsd</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty.websocket:javax-websocket-server-impl</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty.websocket:websocket-client</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-io</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <!-- Jetty 9.4.x: jetty-client and jetty-xml are depended by org.eclipse.jetty.websocket:websocket-client.-->
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-client</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-xml</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-http</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-util-ajax</artifact>
+-                      <excludes>
+-                        <exclude>*/**</exclude>
+-                      </excludes>
+-                    </filter>
+-                    <filter>
+-                      <artifact>org.eclipse.jetty:jetty-server</artifact>
+-                      <excludes>
+-                        <exclude>jetty-dir.css</exclude>
+-                      </excludes>
+-                    </filter>
+-                  </filters>
+-
+-                  <!-- relocate classes from mssql-jdbc -->
+-                  <relocations>
+-                    <relocation>
+-                      <pattern>microsoft/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.microsoft.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-
+-                    <relocation>
+-                      <pattern>org/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.org.</shadedPattern>
+-                      <excludes>
+-                        <exclude>org/apache/hadoop/*</exclude>
+-                        <exclude>org/apache/hadoop/**/*</exclude>
+-                        <!-- Our non-shaded logging libraries -->
+-                        <exclude>org/slf4j/*</exclude>
+-                        <exclude>org/slf4j/**/*</exclude>
+-                        <exclude>org/apache/commons/logging/*</exclude>
+-                        <exclude>org/apache/commons/logging/**/*</exclude>
+-                        <exclude>org/apache/log4j/*</exclude>
+-                        <exclude>org/apache/log4j/**/*</exclude>
+-                        <exclude>**/pom.xml</exclude>
+-                        <!-- Our non-shaded JUnit library -->
+-                        <exclude>org/junit/*</exclude>
+-                        <exclude>org/junit/**/*</exclude>
+-                        <!-- Not the org/ packages that are a part of the jdk -->
+-
+-                        <exclude>org/ietf/jgss/*</exclude>
+-                        <exclude>org/omg/**/*</exclude>
+-                        <exclude>org/w3c/dom/*</exclude>
+-                        <exclude>org/w3c/dom/**/*</exclude>
+-                        <exclude>org/xml/sax/*</exclude>
+-                        <exclude>org/xml/sax/**/*</exclude>
+-                        <exclude>org/bouncycastle/*</exclude>
+-                        <exclude>org/bouncycastle/**/*</exclude>
+-                        <!-- Exclude snappy-java -->
+-                        <exclude>org/xerial/snappy/*</exclude>
+-                        <exclude>org/xerial/snappy/**/*</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>contribs/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.contribs.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>com/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.com.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                        <!-- Not the com/ packages that are a part of particular jdk implementations -->
+-                        <exclude>com/sun/tools/*</exclude>
+-                        <exclude>com/sun/javadoc/*</exclude>
+-                        <exclude>com/sun/security/*</exclude>
+-                        <exclude>com/sun/jndi/*</exclude>
+-                        <exclude>com/sun/management/*</exclude>
+-                        <exclude>com/sun/tools/**/*</exclude>
+-                        <exclude>com/sun/javadoc/**/*</exclude>
+-                        <exclude>com/sun/security/**/*</exclude>
+-                        <exclude>com/sun/jndi/**/*</exclude>
+-                        <exclude>com/sun/management/**/*</exclude>
+-                        <exclude>com/ibm/security/*</exclude>
+-                        <exclude>com/ibm/security/**/*</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>io/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.io.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                        <!-- Exclude config keys for Hadoop that look like package names -->
+-                        <exclude>io/compression/*</exclude>
+-                        <exclude>io/compression/**/*</exclude>
+-                        <exclude>io/mapfile/*</exclude>
+-                        <exclude>io/mapfile/**/*</exclude>
+-                        <exclude>io/map/index/*</exclude>
+-                        <exclude>io/seqfile/*</exclude>
+-                        <exclude>io/seqfile/**/*</exclude>
+-                        <exclude>io/file/buffer/size</exclude>
+-                        <exclude>io/skip/checksum/errors</exclude>
+-                        <exclude>io/sort/*</exclude>
+-                        <exclude>io/serializations</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javassist/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javassist.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <!-- JSRs that haven't made it to inclusion in J2SE -->
+-                    <relocation>
+-                      <pattern>javax/el/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.el.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/cache/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.cache.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/inject/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.inject.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/servlet/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.servlet.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/ws/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.ws.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/websocket/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.websocket.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>javax/annotation/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.javax.websocket.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>jersey/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.jersey.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <relocation>
+-                      <pattern>net/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.net.</shadedPattern>
+-                      <excludes>
+-                        <exclude>**/pom.xml</exclude>
+-                        <!-- Exclude config keys for Hadoop that look like package names -->
+-                        <exclude>net/topology/*</exclude>
+-                        <exclude>net/topology/**/*</exclude>
+-                        <!-- Exclude lz4-java -->
+-                        <exclude>net/jpountz/*</exclude>
+-                        <exclude>net/jpountz/**/*</exclude>
+-                      </excludes>
+-                    </relocation>
+-                    <!-- okio declares a top level package instead of nested -->
+-                    <relocation>
+-                      <pattern>okio/</pattern>
+-                      <shadedPattern>${shaded.dependency.prefix}.okio.</shadedPattern>
+-                    </relocation>
+-                  </relocations>
+-                  <transformers>
+-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+-                    <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+-                      <resources>
+-                        <resource>LICENSE</resource>
+-                        <resource>LICENSE.txt</resource>
+-                        <resource>NOTICE</resource>
+-                        <resource>NOTICE.txt</resource>
+-                        <resource>Grizzly_THIRDPARTYLICENSEREADME.txt</resource>
+-                        <resource>LICENSE.dom-documentation.txt</resource>
+-                        <resource>LICENSE.dom-software.txt</resource>
+-                        <resource>LICENSE.dom-documentation.txt</resource>
+-                        <resource>LICENSE.sax.txt</resource>
+-                      </resources>
+-                    </transformer>
+-                    <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+-                      <resource>META-INF/LICENSE.txt</resource>
+-                      <file>${basedir}/../../LICENSE.txt</file>
+-                    </transformer>
+-                    <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+-                      <resource>META-INF/NOTICE.txt</resource>
+-                      <file>${basedir}/../../NOTICE.txt</file>
+-                    </transformer>
+-                  </transformers>
+-                </configuration>
+-              </execution>
+-            </executions>
+-          </plugin>
+-          <plugin>
+-            <groupId>org.codehaus.mojo</groupId>
+-            <artifactId>license-maven-plugin</artifactId>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-    <profile>
+-      <id>noshade</id>
+-      <activation>
+-        <property><name>skipShade</name></property>
+-      </activation>
+-      <build>
+-        <plugins>
+-          <!-- We contain no source -->
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-source-plugin</artifactId>
+-              <configuration>
+-                <skipSource>true</skipSource>
+-              </configuration>
+-          </plugin>
+-          <plugin>
+-            <groupId>org.codehaus.mojo</groupId>
+-            <artifactId>license-maven-plugin</artifactId>
+-          </plugin>
+-        </plugins>
+-      </build>
+-    </profile>
+-  </profiles>
+-
+-</project>
+-
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 7f8a5710784..5214f2c4fd5 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -33,8 +33,6 @@
+     <module>hadoop-client-api</module>
+     <!-- Should be used at runtime scope for remaining classes necessary for hadoop-client-api to function -->
+     <module>hadoop-client-runtime</module>
+-    <!-- Should be used at test scope for those that need access to mini cluster that works with above api and runtime -->
+-    <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+   </modules>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 609b6d5b3ca..31b00ded6d8 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -290,11 +290,6 @@
+         <artifactId>hadoop-client-runtime</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-minicluster</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-common</artifactId>
diff --git a/hadoop/stackable/patches/3.4.0/30-remove-hadoop-yarn-server-sharedcachemanager.patch b/hadoop/stackable/patches/3.4.0/30-remove-hadoop-yarn-server-sharedcachemanager.patch
new file mode 100644
index 000000000..0762a5e59
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/30-remove-hadoop-yarn-server-sharedcachemanager.patch
@@ -0,0 +1,4544 @@
+Entirely remove hadoop-yarn-server-sharedcachemanager
+
+From: Lars Francke <git@lars-francke.de>
+
+
+---
+ .../hadoop-yarn-server-sharedcachemanager/pom.xml  |  103 ----
+ .../yarn/server/sharedcachemanager/AppChecker.java |   65 --
+ .../server/sharedcachemanager/CleanerService.java  |  219 --------
+ .../server/sharedcachemanager/CleanerTask.java     |  309 ------------
+ .../sharedcachemanager/ClientProtocolService.java  |  193 -------
+ .../sharedcachemanager/RemoteAppChecker.java       |  102 ----
+ .../SCMAdminProtocolService.java                   |  144 -----
+ .../sharedcachemanager/SharedCacheManager.java     |  164 ------
+ .../SharedCacheUploaderService.java                |  140 -----
+ .../sharedcachemanager/metrics/CleanerMetrics.java |  151 ------
+ .../metrics/ClientSCMMetrics.java                  |   91 ---
+ .../metrics/SharedCacheUploaderMetrics.java        |   82 ---
+ .../sharedcachemanager/store/InMemorySCMStore.java |  525 --------------------
+ .../server/sharedcachemanager/store/SCMStore.java  |  213 --------
+ .../store/SharedCacheResource.java                 |   64 --
+ .../store/SharedCacheResourceReference.java        |   86 ---
+ .../sharedcachemanager/webapp/SCMController.java   |   43 --
+ .../sharedcachemanager/webapp/SCMMetricsInfo.java  |   70 ---
+ .../sharedcachemanager/webapp/SCMOverviewPage.java |   95 ----
+ .../sharedcachemanager/webapp/SCMWebServer.java    |   92 ----
+ .../server/sharedcachemanager/DummyAppChecker.java |   43 --
+ .../server/sharedcachemanager/TestCleanerTask.java |  152 ------
+ .../TestClientSCMProtocolService.java              |  281 -----------
+ .../sharedcachemanager/TestRemoteAppChecker.java   |  108 ----
+ .../TestSCMAdminProtocolService.java               |  136 -----
+ .../TestSharedCacheUploaderService.java            |  192 -------
+ .../metrics/TestCleanerMetrics.java                |   65 --
+ .../sharedcachemanager/store/SCMStoreBaseTest.java |   42 --
+ .../store/TestInMemorySCMStore.java                |  318 ------------
+ .../hadoop-yarn/hadoop-yarn-server/pom.xml         |    1 
+ 30 files changed, 4289 deletions(-)
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheUploaderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestCleanerTask.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestClientSCMProtocolService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestRemoteAppChecker.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSharedCacheUploaderService.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/TestCleanerMetrics.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStoreBaseTest.java
+ delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/TestInMemorySCMStore.java
+
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml
+deleted file mode 100644
+index 823073631ee..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/pom.xml
++++ /dev/null
+@@ -1,103 +0,0 @@
+-<?xml version="1.0"?>
+-<!--
+-  Licensed under the Apache License, Version 2.0 (the "License");
+-  you may not use this file except in compliance with the License.
+-  You may obtain a copy of the License at
+-
+-    http://www.apache.org/licenses/LICENSE-2.0
+-
+-  Unless required by applicable law or agreed to in writing, software
+-  distributed under the License is distributed on an "AS IS" BASIS,
+-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-  See the License for the specific language governing permissions and
+-  limitations under the License. See accompanying LICENSE file.
+--->
+-<project xmlns:pom="http://maven.apache.org/POM/4.0.0">
+-  <modelVersion>4.0.0</modelVersion>
+-  <parent>
+-    <artifactId>hadoop-yarn-server</artifactId>
+-    <groupId>org.apache.hadoop</groupId>
+-    <version>3.4.0</version>
+-  </parent>
+-  <artifactId>hadoop-yarn-server-sharedcachemanager</artifactId>
+-  <version>3.4.0</version>
+-  <name>Apache Hadoop YARN SharedCacheManager</name>
+-
+-  <properties>
+-    <!-- Needed for generating FindBugs warnings using parent pom -->
+-    <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
+-  </properties>
+-
+-  <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-api</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-common</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-client</artifactId>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-common</artifactId>
+-      <type>test-jar</type>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-tests</artifactId>
+-      <scope>test</scope>
+-      <type>test-jar</type>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-api</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.jupiter</groupId>
+-      <artifactId>junit-jupiter-engine</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.junit.platform</groupId>
+-      <artifactId>junit-platform-launcher</artifactId>
+-      <scope>test</scope>
+-    </dependency>
+-  </dependencies>
+-  
+-  <build>
+-      <plugins>
+-
+-      <!-- Publish tests jar -->
+-      <plugin>
+-        <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-            <phase>test-compile</phase>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
+-  </build>
+-</project>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java
+deleted file mode 100644
+index 4ac94106700..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/AppChecker.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.util.Collection;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * An interface for checking whether an app is running so that the cleaner
+- * service may determine if it can safely remove a cached entry.
+- */
+-@Private
+-@Evolving
+-public abstract class AppChecker extends CompositeService {
+-
+-  public AppChecker() {
+-    super("AppChecker");
+-  }
+-
+-  public AppChecker(String name) {
+-    super(name);
+-  }
+-
+-  /**
+-   * Returns whether the app is in an active state.
+-   * 
+-   * @return true if the app is found and is not in one of the completed states;
+-   *         false otherwise
+-   * @throws YarnException if there is an error in determining the app state
+-   */
+-  @Private
+-  public abstract boolean isApplicationActive(ApplicationId id)
+-      throws YarnException;
+-
+-  /**
+-   * Returns the list of all active apps at the given time.
+-   * 
+-   * @return the list of active apps, or an empty list if there is none
+-   * @throws YarnException if there is an error in obtaining the list
+-   */
+-  @Private
+-  public abstract Collection<ApplicationId> getActiveApplications()
+-      throws YarnException;
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java
+deleted file mode 100644
+index f93b81e385c..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerService.java
++++ /dev/null
+@@ -1,219 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.lang.management.ManagementFactory;
+-import java.util.concurrent.ScheduledExecutorService;
+-import java.util.concurrent.ThreadFactory;
+-import java.util.concurrent.TimeUnit;
+-import java.util.concurrent.locks.Lock;
+-import java.util.concurrent.locks.ReentrantLock;
+-
+-import org.apache.hadoop.HadoopIllegalArgumentException;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FSDataOutputStream;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.concurrent.HadoopExecutors;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.CleanerMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The cleaner service that maintains the shared cache area, and cleans up stale
+- * entries on a regular basis.
+- */
+-@Private
+-@Evolving
+-public class CleanerService extends CompositeService {
+-  /**
+-   * The name of the global cleaner lock that the cleaner creates to indicate
+-   * that a cleaning process is in progress.
+-   */
+-  public static final String GLOBAL_CLEANER_PID = ".cleaner_pid";
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CleanerService.class);
+-
+-  private Configuration conf;
+-  private CleanerMetrics metrics;
+-  private ScheduledExecutorService scheduledExecutor;
+-  private final SCMStore store;
+-  private final Lock cleanerTaskLock;
+-
+-  public CleanerService(SCMStore store) {
+-    super("CleanerService");
+-    this.store = store;
+-    this.cleanerTaskLock = new ReentrantLock();
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    this.conf = conf;
+-
+-    // create scheduler executor service that services the cleaner tasks
+-    // use 2 threads to accommodate the on-demand tasks and reduce the chance of
+-    // back-to-back runs
+-    ThreadFactory tf =
+-        new ThreadFactoryBuilder().setNameFormat("Shared cache cleaner").build();
+-    scheduledExecutor = HadoopExecutors.newScheduledThreadPool(2, tf);
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    if (!writeGlobalCleanerPidFile()) {
+-      throw new YarnException("The global cleaner pid file already exists! " +
+-          "It appears there is another CleanerService running in the cluster");
+-    }
+-
+-    this.metrics = CleanerMetrics.getInstance();
+-
+-    // Start dependent services (i.e. AppChecker)
+-    super.serviceStart();
+-
+-    Runnable task =
+-        CleanerTask.create(conf, store, metrics, cleanerTaskLock);
+-    long periodInMinutes = getPeriod(conf);
+-    scheduledExecutor.scheduleAtFixedRate(task, getInitialDelay(conf),
+-        periodInMinutes, TimeUnit.MINUTES);
+-    LOG.info("Scheduled the shared cache cleaner task to run every "
+-        + periodInMinutes + " minutes.");
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Shutting down the background thread.");
+-    scheduledExecutor.shutdownNow();
+-    try {
+-      if (scheduledExecutor.awaitTermination(10, TimeUnit.SECONDS)) {
+-        LOG.info("The background thread stopped.");
+-      } else {
+-        LOG.warn("Gave up waiting for the cleaner task to shutdown.");
+-      }
+-    } catch (InterruptedException e) {
+-      LOG.warn("The cleaner service was interrupted while shutting down the task.",
+-          e);
+-    }
+-
+-    removeGlobalCleanerPidFile();
+-
+-    super.serviceStop();
+-  }
+-
+-  /**
+-   * Execute an on-demand cleaner task.
+-   */
+-  protected void runCleanerTask() {
+-    Runnable task =
+-        CleanerTask.create(conf, store, metrics, cleanerTaskLock);
+-    // this is a non-blocking call (it simply submits the task to the executor
+-    // queue and returns)
+-    this.scheduledExecutor.execute(task);
+-  }
+-
+-  /**
+-   * To ensure there are not multiple instances of the SCM running on a given
+-   * cluster, a global pid file is used. This file contains the hostname of the
+-   * machine that owns the pid file.
+-   *
+-   * @return true if the pid file was written, false otherwise
+-   * @throws YarnException
+-   */
+-  private boolean writeGlobalCleanerPidFile() throws YarnException {
+-    String root =
+-        conf.get(YarnConfiguration.SHARED_CACHE_ROOT,
+-            YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT);
+-    Path pidPath = new Path(root, GLOBAL_CLEANER_PID);
+-    try {
+-      FileSystem fs = FileSystem.get(this.conf);
+-
+-      if (fs.exists(pidPath)) {
+-        return false;
+-      }
+-
+-      FSDataOutputStream os = fs.create(pidPath, false);
+-      // write the hostname and the process id in the global cleaner pid file
+-      final String ID = ManagementFactory.getRuntimeMXBean().getName();
+-      os.writeUTF(ID);
+-      os.close();
+-      // add it to the delete-on-exit to ensure it gets deleted when the JVM
+-      // exits
+-      fs.deleteOnExit(pidPath);
+-    } catch (IOException e) {
+-      throw new YarnException(e);
+-    }
+-    LOG.info("Created the global cleaner pid file at " + pidPath.toString());
+-    return true;
+-  }
+-
+-  private void removeGlobalCleanerPidFile() {
+-    try {
+-      FileSystem fs = FileSystem.get(this.conf);
+-      String root =
+-          conf.get(YarnConfiguration.SHARED_CACHE_ROOT,
+-              YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT);
+-
+-      Path pidPath = new Path(root, GLOBAL_CLEANER_PID);
+-
+-
+-      fs.delete(pidPath, false);
+-      LOG.info("Removed the global cleaner pid file at " + pidPath.toString());
+-    } catch (IOException e) {
+-      LOG.error(
+-          "Unable to remove the global cleaner pid file! The file may need "
+-              + "to be removed manually.", e);
+-    }
+-  }
+-
+-  private static int getInitialDelay(Configuration conf) {
+-    int initialDelayInMinutes =
+-        conf.getInt(YarnConfiguration.SCM_CLEANER_INITIAL_DELAY_MINS,
+-            YarnConfiguration.DEFAULT_SCM_CLEANER_INITIAL_DELAY_MINS);
+-    // negative value is invalid; use the default
+-    if (initialDelayInMinutes < 0) {
+-      throw new HadoopIllegalArgumentException("Negative initial delay value: "
+-          + initialDelayInMinutes
+-          + ". The initial delay must be greater than zero.");
+-    }
+-    return initialDelayInMinutes;
+-  }
+-
+-  private static int getPeriod(Configuration conf) {
+-    int periodInMinutes =
+-        conf.getInt(YarnConfiguration.SCM_CLEANER_PERIOD_MINS,
+-            YarnConfiguration.DEFAULT_SCM_CLEANER_PERIOD_MINS);
+-    // non-positive value is invalid; use the default
+-    if (periodInMinutes <= 0) {
+-      throw new HadoopIllegalArgumentException("Non-positive period value: "
+-          + periodInMinutes
+-          + ". The cleaner period must be greater than or equal to zero.");
+-    }
+-    return periodInMinutes;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java
+deleted file mode 100644
+index 3e0a62b63a1..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/CleanerTask.java
++++ /dev/null
+@@ -1,309 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.util.concurrent.locks.Lock;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.sharedcache.SharedCacheUtil;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.CleanerMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * The task that runs and cleans up the shared cache area for stale entries and
+- * orphaned files. It is expected that only one cleaner task runs at any given
+- * point in time.
+- */
+-@Private
+-@Evolving
+-class CleanerTask implements Runnable {
+-  private static final String RENAMED_SUFFIX = "-renamed";
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(CleanerTask.class);
+-
+-  private final String location;
+-  private final long sleepTime;
+-  private final int nestedLevel;
+-  private final Path root;
+-  private final FileSystem fs;
+-  private final SCMStore store;
+-  private final CleanerMetrics metrics;
+-  private final Lock cleanerTaskLock;
+-
+-  /**
+-   * Creates a cleaner task based on the configuration. This is provided for
+-   * convenience.
+-   *
+-   * @param conf
+-   * @param store
+-   * @param metrics
+-   * @param cleanerTaskLock lock that ensures a serial execution of cleaner
+-   *                        task
+-   * @return an instance of a CleanerTask
+-   */
+-  public static CleanerTask create(Configuration conf, SCMStore store,
+-      CleanerMetrics metrics, Lock cleanerTaskLock) {
+-    try {
+-      // get the root directory for the shared cache
+-      String location =
+-          conf.get(YarnConfiguration.SHARED_CACHE_ROOT,
+-              YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT);
+-
+-      long sleepTime =
+-          conf.getLong(YarnConfiguration.SCM_CLEANER_RESOURCE_SLEEP_MS,
+-              YarnConfiguration.DEFAULT_SCM_CLEANER_RESOURCE_SLEEP_MS);
+-      int nestedLevel = SharedCacheUtil.getCacheDepth(conf);
+-      FileSystem fs = FileSystem.get(conf);
+-
+-      return new CleanerTask(location, sleepTime, nestedLevel, fs, store,
+-          metrics, cleanerTaskLock);
+-    } catch (IOException e) {
+-      LOG.error("Unable to obtain the filesystem for the cleaner service", e);
+-      throw new ExceptionInInitializerError(e);
+-    }
+-  }
+-
+-  /**
+-   * Creates a cleaner task based on the root directory location and the
+-   * filesystem.
+-   */
+-  CleanerTask(String location, long sleepTime, int nestedLevel, FileSystem fs,
+-      SCMStore store, CleanerMetrics metrics, Lock cleanerTaskLock) {
+-    this.location = location;
+-    this.sleepTime = sleepTime;
+-    this.nestedLevel = nestedLevel;
+-    this.root = new Path(location);
+-    this.fs = fs;
+-    this.store = store;
+-    this.metrics = metrics;
+-    this.cleanerTaskLock = cleanerTaskLock;
+-  }
+-
+-  @Override
+-  public void run() {
+-    if (!this.cleanerTaskLock.tryLock()) {
+-      // there is already another task running
+-      LOG.warn("A cleaner task is already running. "
+-          + "This scheduled cleaner task will do nothing.");
+-      return;
+-    }
+-
+-    try {
+-      if (!fs.exists(root)) {
+-        LOG.error("The shared cache root " + location + " was not found. "
+-            + "The cleaner task will do nothing.");
+-        return;
+-      }
+-
+-      // we're now ready to process the shared cache area
+-      process();
+-    } catch (Throwable e) {
+-      LOG.error("Unexpected exception while initializing the cleaner task. "
+-          + "This task will do nothing,", e);
+-    } finally {
+-      // this is set to false regardless of if it is a scheduled or on-demand
+-      // task
+-      this.cleanerTaskLock.unlock();
+-    }
+-  }
+-
+-  /**
+-   * Sweeps and processes the shared cache area to clean up stale and orphaned
+-   * files.
+-   */
+-  void process() {
+-    // mark the beginning of the run in the metrics
+-    metrics.reportCleaningStart();
+-    try {
+-      // now traverse individual directories and process them
+-      // the directory structure is specified by the nested level parameter
+-      // (e.g. 9/c/d/<checksum>)
+-      String pattern = SharedCacheUtil.getCacheEntryGlobPattern(nestedLevel);
+-      FileStatus[] resources =
+-          fs.globStatus(new Path(root, pattern));
+-      int numResources = resources == null ? 0 : resources.length;
+-      LOG.info("Processing " + numResources + " resources in the shared cache");
+-      long beginMs = System.currentTimeMillis();
+-      if (resources != null) {
+-        for (FileStatus resource : resources) {
+-          // check for interruption so it can abort in a timely manner in case
+-          // of shutdown
+-          if (Thread.currentThread().isInterrupted()) {
+-            LOG.warn("The cleaner task was interrupted. Aborting.");
+-            break;
+-          }
+-
+-          if (resource.isDirectory()) {
+-            processSingleResource(resource);
+-          } else {
+-            LOG.warn("Invalid file at path " + resource.getPath().toString()
+-                +
+-                " when a directory was expected");
+-          }
+-          // add sleep time between cleaning each directory if it is non-zero
+-          if (sleepTime > 0) {
+-            Thread.sleep(sleepTime);
+-          }
+-        }
+-      }
+-      long endMs = System.currentTimeMillis();
+-      long durationMs = endMs - beginMs;
+-      LOG.info("Processed " + numResources + " resource(s) in " + durationMs +
+-          " ms.");
+-    } catch (IOException e1) {
+-      LOG.error("Unable to complete the cleaner task", e1);
+-    } catch (InterruptedException e2) {
+-      Thread.currentThread().interrupt(); // restore the interrupt
+-    }
+-  }
+-
+-  /**
+-   * Returns a path for the root directory for the shared cache.
+-   */
+-  Path getRootPath() {
+-    return root;
+-  }
+-
+-  /**
+-   * Processes a single shared cache resource directory.
+-   */
+-  void processSingleResource(FileStatus resource) {
+-    Path path = resource.getPath();
+-    // indicates the processing status of the resource
+-    ResourceStatus resourceStatus = ResourceStatus.INIT;
+-
+-    // first, if the path ends with the renamed suffix, it indicates the
+-    // directory was moved (as stale) but somehow not deleted (probably due to
+-    // SCM failure); delete the directory
+-    if (path.toString().endsWith(RENAMED_SUFFIX)) {
+-      LOG.info("Found a renamed directory that was left undeleted at " +
+-          path.toString() + ". Deleting.");
+-      try {
+-        if (fs.delete(path, true)) {
+-          resourceStatus = ResourceStatus.DELETED;
+-        }
+-      } catch (IOException e) {
+-        LOG.error("Error while processing a shared cache resource: " + path, e);
+-      }
+-    } else {
+-      // this is the path to the cache resource directory
+-      // the directory name is the resource key (i.e. a unique identifier)
+-      String key = path.getName();
+-
+-      try {
+-        store.cleanResourceReferences(key);
+-      } catch (YarnException e) {
+-        LOG.error("Exception thrown while removing dead appIds.", e);
+-      }
+-
+-      if (store.isResourceEvictable(key, resource)) {
+-        try {
+-          /*
+-           * TODO See YARN-2663: There is a race condition between
+-           * store.removeResource(key) and
+-           * removeResourceFromCacheFileSystem(path) operations because they do
+-           * not happen atomically and resources can be uploaded with different
+-           * file names by the node managers.
+-           */
+-          // remove the resource from scm (checks for appIds as well)
+-          if (store.removeResource(key)) {
+-            // remove the resource from the file system
+-            boolean deleted = removeResourceFromCacheFileSystem(path);
+-            if (deleted) {
+-              resourceStatus = ResourceStatus.DELETED;
+-            } else {
+-              LOG.error("Failed to remove path from the file system."
+-                  + " Skipping this resource: " + path);
+-              resourceStatus = ResourceStatus.ERROR;
+-            }
+-          } else {
+-            // we did not delete the resource because it contained application
+-            // ids
+-            resourceStatus = ResourceStatus.PROCESSED;
+-          }
+-        } catch (IOException e) {
+-          LOG.error(
+-              "Failed to remove path from the file system. Skipping this resource: "
+-                  + path, e);
+-          resourceStatus = ResourceStatus.ERROR;
+-        }
+-      } else {
+-        resourceStatus = ResourceStatus.PROCESSED;
+-      }
+-    }
+-
+-    // record the processing
+-    switch (resourceStatus) {
+-    case DELETED:
+-      metrics.reportAFileDelete();
+-      break;
+-    case PROCESSED:
+-      metrics.reportAFileProcess();
+-      break;
+-    case ERROR:
+-      metrics.reportAFileError();
+-      break;
+-    default:
+-      LOG.error("Cleaner encountered an invalid status (" + resourceStatus
+-          + ") while processing resource: " + path.getName());
+-    }
+-  }
+-
+-  private boolean removeResourceFromCacheFileSystem(Path path)
+-      throws IOException {
+-    // rename the directory to make the delete atomic
+-    Path renamedPath = new Path(path.toString() + RENAMED_SUFFIX);
+-    if (fs.rename(path, renamedPath)) {
+-      // the directory can be removed safely now
+-      // log the original path
+-      LOG.info("Deleting " + path.toString());
+-      return fs.delete(renamedPath, true);
+-    } else {
+-      // we were unable to remove it for some reason: it's best to leave
+-      // it at that
+-      LOG.error("We were not able to rename the directory to "
+-          + renamedPath.toString() + ". We will leave it intact.");
+-    }
+-    return false;
+-  }
+-
+-  /**
+-   * A status indicating what happened with the processing of a given cache
+-   * resource.
+-   */
+-  private enum ResourceStatus {
+-    INIT,
+-    /** Resource was successfully processed, but not deleted **/
+-    PROCESSED,
+-    /** Resource was successfully deleted **/
+-    DELETED,
+-    /** The cleaner task ran into an error while processing the resource **/
+-    ERROR
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java
+deleted file mode 100644
+index 4275674aa47..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/ClientProtocolService.java
++++ /dev/null
+@@ -1,193 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.api.ClientSCMProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReleaseSharedCacheResourceRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReleaseSharedCacheResourceResponse;
+-import org.apache.hadoop.yarn.api.protocolrecords.UseSharedCacheResourceRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UseSharedCacheResourceResponse;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.RPCUtil;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.sharedcache.SharedCacheUtil;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.ClientSCMMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SharedCacheResourceReference;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This service handles all rpc calls from the client to the shared cache
+- * manager.
+- */
+-@Private
+-@Evolving
+-public class ClientProtocolService extends AbstractService implements
+-    ClientSCMProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ClientProtocolService.class);
+-
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  private Server server;
+-  InetSocketAddress clientBindAddress;
+-  private final SCMStore store;
+-  private int cacheDepth;
+-  private String cacheRoot;
+-  private ClientSCMMetrics metrics;
+-
+-  public ClientProtocolService(SCMStore store) {
+-    super(ClientProtocolService.class.getName());
+-    this.store = store;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    this.clientBindAddress = getBindAddress(conf);
+-
+-    this.cacheDepth = SharedCacheUtil.getCacheDepth(conf);
+-
+-    this.cacheRoot =
+-        conf.get(YarnConfiguration.SHARED_CACHE_ROOT,
+-            YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  InetSocketAddress getBindAddress(Configuration conf) {
+-    return conf.getSocketAddr(YarnConfiguration.SCM_CLIENT_SERVER_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_CLIENT_SERVER_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_CLIENT_SERVER_PORT);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    Configuration conf = getConfig();
+-    this.metrics = ClientSCMMetrics.getInstance();
+-
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    this.server =
+-        rpc.getServer(ClientSCMProtocol.class, this,
+-            clientBindAddress,
+-            conf, null, // Secret manager null for now (security not supported)
+-            conf.getInt(YarnConfiguration.SCM_CLIENT_SERVER_THREAD_COUNT,
+-                YarnConfiguration.DEFAULT_SCM_CLIENT_SERVER_THREAD_COUNT));
+-
+-    // TODO (YARN-2774): Enable service authorization
+-
+-    this.server.start();
+-    clientBindAddress =
+-        conf.updateConnectAddr(YarnConfiguration.SCM_CLIENT_SERVER_ADDRESS,
+-            server.getListenerAddress());
+-
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.server != null) {
+-      this.server.stop();
+-    }
+-
+-    super.serviceStop();
+-  }
+-
+-  @Override
+-  public UseSharedCacheResourceResponse use(
+-      UseSharedCacheResourceRequest request) throws YarnException,
+-      IOException {
+-
+-    UseSharedCacheResourceResponse response =
+-        recordFactory.newRecordInstance(UseSharedCacheResourceResponse.class);
+-
+-    UserGroupInformation callerUGI;
+-    try {
+-      callerUGI = UserGroupInformation.getCurrentUser();
+-    } catch (IOException ie) {
+-      LOG.info("Error getting UGI ", ie);
+-      throw RPCUtil.getRemoteException(ie);
+-    }
+-
+-    String fileName =
+-        this.store.addResourceReference(request.getResourceKey(),
+-            new SharedCacheResourceReference(request.getAppId(),
+-                callerUGI.getShortUserName()));
+-
+-    if (fileName != null) {
+-      response
+-          .setPath(getCacheEntryFilePath(request.getResourceKey(), fileName));
+-      this.metrics.incCacheHitCount();
+-    } else {
+-      this.metrics.incCacheMissCount();
+-    }
+-
+-    return response;
+-  }
+-
+-  @Override
+-  public ReleaseSharedCacheResourceResponse release(
+-      ReleaseSharedCacheResourceRequest request) throws YarnException,
+-      IOException {
+-
+-    ReleaseSharedCacheResourceResponse response =
+-        recordFactory
+-            .newRecordInstance(ReleaseSharedCacheResourceResponse.class);
+-
+-    UserGroupInformation callerUGI;
+-    try {
+-      callerUGI = UserGroupInformation.getCurrentUser();
+-    } catch (IOException ie) {
+-      LOG.info("Error getting UGI ", ie);
+-      throw RPCUtil.getRemoteException(ie);
+-    }
+-
+-    boolean removed =
+-        this.store.removeResourceReference(
+-            request.getResourceKey(),
+-            new SharedCacheResourceReference(request.getAppId(), callerUGI
+-                .getShortUserName()), true);
+-
+-    if (removed) {
+-      this.metrics.incCacheRelease();
+-    }
+-
+-    return response;
+-  }
+-
+-  private String getCacheEntryFilePath(String checksum, String filename) {
+-    return SharedCacheUtil.getCacheEntryPath(this.cacheDepth,
+-        this.cacheRoot, checksum) + Path.SEPARATOR_CHAR + filename;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java
+deleted file mode 100644
+index 2bf3a896355..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/RemoteAppChecker.java
++++ /dev/null
+@@ -1,102 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.EnumSet;
+-import java.util.List;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * An implementation of AppChecker that queries the resource manager remotely to
+- * determine whether the app is running.
+- */
+-@Private
+-@Unstable
+-public class RemoteAppChecker extends AppChecker {
+-
+-  private static final EnumSet<YarnApplicationState> ACTIVE_STATES = EnumSet
+-      .of(YarnApplicationState.NEW, YarnApplicationState.ACCEPTED,
+-          YarnApplicationState.NEW_SAVING, YarnApplicationState.SUBMITTED,
+-          YarnApplicationState.RUNNING);
+-
+-  private final YarnClient client;
+-
+-  public RemoteAppChecker() {
+-    this(YarnClient.createYarnClient());
+-  }
+-
+-  RemoteAppChecker(YarnClient client) {
+-    super("RemoteAppChecker");
+-    this.client = client;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    addService(client);
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  @Private
+-  public boolean isApplicationActive(ApplicationId id) throws YarnException {
+-    ApplicationReport report = null;
+-    try {
+-      report = client.getApplicationReport(id);
+-    } catch (ApplicationNotFoundException e) {
+-      // the app does not exist
+-      return false;
+-    } catch (IOException e) {
+-      throw new YarnException(e);
+-    }
+-
+-    if (report == null) {
+-      // the app does not exist
+-      return false;
+-    }
+-
+-    return ACTIVE_STATES.contains(report.getYarnApplicationState());
+-  }
+-
+-  @Override
+-  @Private
+-  public Collection<ApplicationId> getActiveApplications() throws YarnException {
+-    try {
+-      List<ApplicationId> activeApps = new ArrayList<ApplicationId>();
+-      List<ApplicationReport> apps = client.getApplications(ACTIVE_STATES);
+-      for (ApplicationReport app: apps) {
+-        activeApps.add(app.getApplicationId());
+-      }
+-      return activeApps;
+-    } catch (IOException e) {
+-      throw new YarnException(e);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java
+deleted file mode 100644
+index e6a885bff5e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SCMAdminProtocolService.java
++++ /dev/null
+@@ -1,144 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.security.AccessControlException;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.security.YarnAuthorizationProvider;
+-import org.apache.hadoop.yarn.server.api.SCMAdminProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskResponse;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.RPCUtil;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This service handles all SCMAdminProtocol rpc calls from administrators
+- * to the shared cache manager.
+- */
+-@Private
+-@Unstable
+-public class SCMAdminProtocolService extends AbstractService implements
+-    SCMAdminProtocol {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SCMAdminProtocolService.class);
+-
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  private Server server;
+-  InetSocketAddress clientBindAddress;
+-  private final CleanerService cleanerService;
+-  private YarnAuthorizationProvider authorizer;
+-  public SCMAdminProtocolService(CleanerService cleanerService) {
+-    super(SCMAdminProtocolService.class.getName());
+-    this.cleanerService = cleanerService;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    this.clientBindAddress = getBindAddress(conf);
+-    authorizer = YarnAuthorizationProvider.getInstance(conf);
+-    super.serviceInit(conf);
+-  }
+-
+-  InetSocketAddress getBindAddress(Configuration conf) {
+-    return conf.getSocketAddr(YarnConfiguration.SCM_ADMIN_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_ADMIN_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_ADMIN_PORT);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    Configuration conf = getConfig();
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    this.server =
+-        rpc.getServer(SCMAdminProtocol.class, this,
+-            clientBindAddress,
+-            conf, null, // Secret manager null for now (security not supported)
+-            conf.getInt(YarnConfiguration.SCM_ADMIN_CLIENT_THREAD_COUNT,
+-                YarnConfiguration.DEFAULT_SCM_ADMIN_CLIENT_THREAD_COUNT));
+-
+-    // TODO: Enable service authorization (see YARN-2774)
+-
+-    this.server.start();
+-    clientBindAddress =
+-        conf.updateConnectAddr(YarnConfiguration.SCM_ADMIN_ADDRESS,
+-            server.getListenerAddress());
+-
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.server != null) {
+-      this.server.stop();
+-    }
+-
+-    super.serviceStop();
+-  }
+-
+-  private void checkAcls(String method) throws YarnException {
+-    UserGroupInformation user;
+-    try {
+-      user = UserGroupInformation.getCurrentUser();
+-    } catch (IOException ioe) {
+-      LOG.warn("Couldn't get current user", ioe);
+-      throw RPCUtil.getRemoteException(ioe);
+-    }
+-
+-    if (!authorizer.isAdmin(user)) {
+-      LOG.warn("User " + user.getShortUserName() + " doesn't have permission" +
+-          " to call '" + method + "'");
+-
+-      throw RPCUtil.getRemoteException(
+-          new AccessControlException("User " + user.getShortUserName() +
+-          " doesn't have permission" + " to call '" + method + "'"));
+-    }
+-    LOG.info("SCM Admin: " + method + " invoked by user " +
+-        user.getShortUserName());
+-  }
+-
+-  @Override
+-  public RunSharedCacheCleanerTaskResponse runCleanerTask(
+-      RunSharedCacheCleanerTaskRequest request) throws YarnException {
+-    checkAcls("runCleanerTask");
+-    RunSharedCacheCleanerTaskResponse response =
+-        recordFactory.newRecordInstance(RunSharedCacheCleanerTaskResponse.class);
+-    this.cleanerService.runCleanerTask();
+-    // if we are here, then we have submitted the request to the cleaner
+-    // service, ack the request to the admin client
+-    response.setAccepted(true);
+-    return response;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java
+deleted file mode 100644
+index 6eefd75613e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheManager.java
++++ /dev/null
+@@ -1,164 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.source.JvmMetrics;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.util.ShutdownHookManager;
+-import org.apache.hadoop.util.StringUtils;
+-import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.webapp.SCMWebServer;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This service maintains the shared cache meta data. It handles claiming and
+- * releasing of resources, all rpc calls from the client to the shared cache
+- * manager, and administrative commands. It also persists the shared cache meta
+- * data to a backend store, and cleans up stale entries on a regular basis.
+- */
+-@Private
+-@Unstable
+-public class SharedCacheManager extends CompositeService {
+-  /**
+-   * Priority of the SharedCacheManager shutdown hook.
+-   */
+-  public static final int SHUTDOWN_HOOK_PRIORITY = 30;
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SharedCacheManager.class);
+-
+-  private SCMStore store;
+-
+-  public SharedCacheManager() {
+-    super("SharedCacheManager");
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-
+-    this.store = createSCMStoreService(conf);
+-    addService(store);
+-
+-    CleanerService cs = createCleanerService(store);
+-    addService(cs);
+-
+-    SharedCacheUploaderService nms =
+-        createNMCacheUploaderSCMProtocolService(store);
+-    addService(nms);
+-
+-    ClientProtocolService cps = createClientProtocolService(store);
+-    addService(cps);
+-
+-    SCMAdminProtocolService saps = createSCMAdminProtocolService(cs);
+-    addService(saps);
+-
+-    SCMWebServer webUI = createSCMWebServer(this);
+-    addService(webUI);
+-
+-    // init metrics
+-    DefaultMetricsSystem.initialize("SharedCacheManager");
+-    JvmMetrics.initSingleton("SharedCacheManager", null);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  @SuppressWarnings("unchecked")
+-  private static SCMStore createSCMStoreService(Configuration conf) {
+-    Class<? extends SCMStore> defaultStoreClass;
+-    try {
+-      defaultStoreClass =
+-          (Class<? extends SCMStore>) Class
+-              .forName(YarnConfiguration.DEFAULT_SCM_STORE_CLASS);
+-    } catch (Exception e) {
+-      throw new YarnRuntimeException("Invalid default scm store class"
+-          + YarnConfiguration.DEFAULT_SCM_STORE_CLASS, e);
+-    }
+-
+-    SCMStore store =
+-        ReflectionUtils.newInstance(conf.getClass(
+-            YarnConfiguration.SCM_STORE_CLASS,
+-            defaultStoreClass, SCMStore.class), conf);
+-    return store;
+-  }
+-
+-  private CleanerService createCleanerService(SCMStore store) {
+-    return new CleanerService(store);
+-  }
+-
+-  private SharedCacheUploaderService
+-      createNMCacheUploaderSCMProtocolService(SCMStore store) {
+-    return new SharedCacheUploaderService(store);
+-  }
+-
+-  private ClientProtocolService createClientProtocolService(SCMStore store) {
+-    return new ClientProtocolService(store);
+-  }
+-
+-  private SCMAdminProtocolService createSCMAdminProtocolService(
+-      CleanerService cleanerService) {
+-    return new SCMAdminProtocolService(cleanerService);
+-  }
+-
+-  private SCMWebServer createSCMWebServer(SharedCacheManager scm) {
+-    return new SCMWebServer(scm);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-
+-    DefaultMetricsSystem.shutdown();
+-    super.serviceStop();
+-  }
+-
+-  /**
+-   * For testing purposes only.
+-   */
+-  @VisibleForTesting
+-  SCMStore getSCMStore() {
+-    return this.store;
+-  }
+-
+-  public static void main(String[] args) {
+-    Thread.setDefaultUncaughtExceptionHandler(new YarnUncaughtExceptionHandler());
+-    StringUtils.startupShutdownMessage(SharedCacheManager.class, args, LOG);
+-    try {
+-      Configuration conf = new YarnConfiguration();
+-      SharedCacheManager sharedCacheManager = new SharedCacheManager();
+-      ShutdownHookManager.get().addShutdownHook(
+-          new CompositeServiceShutdownHook(sharedCacheManager),
+-          SHUTDOWN_HOOK_PRIORITY);
+-      sharedCacheManager.init(conf);
+-      sharedCacheManager.start();
+-    } catch (Throwable t) {
+-      LOG.error("Error starting SharedCacheManager", t);
+-      System.exit(-1);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheUploaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheUploaderService.java
+deleted file mode 100644
+index dd87b679cb4..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/SharedCacheUploaderService.java
++++ /dev/null
+@@ -1,140 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.Server;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.api.SCMUploaderProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SCMUploaderCanUploadRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SCMUploaderCanUploadResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SCMUploaderNotifyRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SCMUploaderNotifyResponse;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.SharedCacheUploaderMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-
+-/**
+- * This service handles all rpc calls from the NodeManager uploader to the
+- * shared cache manager.
+- */
+-public class SharedCacheUploaderService extends AbstractService
+-    implements SCMUploaderProtocol {
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  private Server server;
+-  InetSocketAddress bindAddress;
+-  private final SCMStore store;
+-  private SharedCacheUploaderMetrics metrics;
+-
+-  public SharedCacheUploaderService(SCMStore store) {
+-    super(SharedCacheUploaderService.class.getName());
+-    this.store = store;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    this.bindAddress = getBindAddress(conf);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  InetSocketAddress getBindAddress(Configuration conf) {
+-    return conf.getSocketAddr(YarnConfiguration.SCM_UPLOADER_SERVER_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_UPLOADER_SERVER_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_UPLOADER_SERVER_PORT);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    Configuration conf = getConfig();
+-    this.metrics = SharedCacheUploaderMetrics.getInstance();
+-
+-    YarnRPC rpc = YarnRPC.create(conf);
+-    this.server =
+-        rpc.getServer(SCMUploaderProtocol.class, this, bindAddress,
+-            conf, null, // Secret manager null for now (security not supported)
+-            conf.getInt(YarnConfiguration.SCM_UPLOADER_SERVER_THREAD_COUNT,
+-                YarnConfiguration.DEFAULT_SCM_UPLOADER_SERVER_THREAD_COUNT));
+-
+-    // TODO (YARN-2774): Enable service authorization
+-
+-    this.server.start();
+-    bindAddress =
+-        conf.updateConnectAddr(YarnConfiguration.SCM_UPLOADER_SERVER_ADDRESS,
+-            server.getListenerAddress());
+-
+-    super.serviceStart();
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.server != null) {
+-      this.server.stop();
+-      this.server = null;
+-    }
+-
+-    super.serviceStop();
+-  }
+-
+-  @Override
+-  public SCMUploaderNotifyResponse notify(SCMUploaderNotifyRequest request)
+-      throws YarnException, IOException {
+-    SCMUploaderNotifyResponse response =
+-        recordFactory.newRecordInstance(SCMUploaderNotifyResponse.class);
+-
+-    // TODO (YARN-2774): proper security/authorization needs to be implemented
+-
+-    String filename =
+-        store.addResource(request.getResourceKey(), request.getFileName());
+-
+-    boolean accepted = filename.equals(request.getFileName());
+-
+-    if (accepted) {
+-      this.metrics.incAcceptedUploads();
+-    } else {
+-      this.metrics.incRejectedUploads();
+-    }
+-
+-    response.setAccepted(accepted);
+-
+-    return response;
+-  }
+-
+-  @Override
+-  public SCMUploaderCanUploadResponse canUpload(
+-      SCMUploaderCanUploadRequest request) throws YarnException, IOException {
+-    // TODO (YARN-2781): we may want to have a more flexible policy of
+-    // instructing the node manager to upload only if it meets a certain
+-    // criteria
+-    // until then we return true for now
+-    SCMUploaderCanUploadResponse response =
+-        recordFactory.newRecordInstance(SCMUploaderCanUploadResponse.class);
+-    response.setUploadable(true);
+-    return response;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java
+deleted file mode 100644
+index 55cb074f7a0..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/CleanerMetrics.java
++++ /dev/null
+@@ -1,151 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.sharedcachemanager.metrics;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.metrics2.MetricsSource;
+-import org.apache.hadoop.metrics2.MetricsSystem;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.lib.MetricsAnnotations;
+-import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+-import org.apache.hadoop.metrics2.lib.MetricsSourceBuilder;
+-import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+-import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This class is for maintaining the various Cleaner activity statistics and
+- * publishing them through the metrics interfaces.
+- */
+-@Private
+-@Evolving
+-@Metrics(name = "CleanerActivity", about = "Cleaner service metrics", context = "yarn")
+-public class CleanerMetrics {
+-  public static final Logger LOG =
+-      LoggerFactory.getLogger(CleanerMetrics.class);
+-  private final MetricsRegistry registry = new MetricsRegistry("cleaner");
+-  private final static CleanerMetrics INSTANCE = create();
+-  
+-  public static CleanerMetrics getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  @Metric("number of deleted files over all runs")
+-  private MutableCounterLong totalDeletedFiles;
+-
+-  public long getTotalDeletedFiles() {
+-    return totalDeletedFiles.value();
+-  }
+-
+-  private @Metric("number of deleted files in the last run")
+-  MutableGaugeLong deletedFiles;
+-
+-  public long getDeletedFiles() {
+-    return deletedFiles.value();
+-  }
+-
+-  private @Metric("number of processed files over all runs")
+-  MutableCounterLong totalProcessedFiles;
+-
+-  public long getTotalProcessedFiles() {
+-    return totalProcessedFiles.value();
+-  }
+-
+-  private @Metric("number of processed files in the last run")
+-  MutableGaugeLong processedFiles;
+-
+-  public long getProcessedFiles() {
+-    return processedFiles.value();
+-  }
+-
+-  @Metric("number of file errors over all runs")
+-  private MutableCounterLong totalFileErrors;
+-
+-  public long getTotalFileErrors() {
+-    return totalFileErrors.value();
+-  }
+-
+-  private @Metric("number of file errors in the last run")
+-  MutableGaugeLong fileErrors;
+-
+-  public long getFileErrors() {
+-    return fileErrors.value();
+-  }
+-
+-  private CleanerMetrics() {
+-  }
+-
+-  /**
+-   * The metric source obtained after parsing the annotations
+-   */
+-  MetricsSource metricSource;
+-
+-  static CleanerMetrics create() {
+-    MetricsSystem ms = DefaultMetricsSystem.instance();
+-
+-    CleanerMetrics metricObject = new CleanerMetrics();
+-    MetricsSourceBuilder sb = MetricsAnnotations.newSourceBuilder(metricObject);
+-    final MetricsSource s = sb.build();
+-    ms.register("cleaner", "The cleaner service of truly shared cache", s);
+-    metricObject.metricSource = s;
+-    return metricObject;
+-  }
+-
+-  /**
+-   * Report a delete operation at the current system time
+-   */
+-  public void reportAFileDelete() {
+-    totalProcessedFiles.incr();
+-    processedFiles.incr();
+-    totalDeletedFiles.incr();
+-    deletedFiles.incr();
+-  }
+-
+-  /**
+-   * Report a process operation at the current system time
+-   */
+-  public void reportAFileProcess() {
+-    totalProcessedFiles.incr();
+-    processedFiles.incr();
+-  }
+-
+-  /**
+-   * Report a process operation error at the current system time
+-   */
+-  public void reportAFileError() {
+-    totalProcessedFiles.incr();
+-    processedFiles.incr();
+-    totalFileErrors.incr();
+-    fileErrors.incr();
+-  }
+-
+-  /**
+-   * Report the start a new run of the cleaner.
+-   *
+-   */
+-  public void reportCleaningStart() {
+-    processedFiles.set(0);
+-    deletedFiles.set(0);
+-    fileErrors.set(0);
+-  }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java
+deleted file mode 100644
+index a69efaf1501..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/ClientSCMMetrics.java
++++ /dev/null
+@@ -1,91 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.sharedcachemanager.metrics;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.metrics2.MetricsSystem;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+-import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This class is for maintaining  client requests metrics
+- * and publishing them through the metrics interfaces.
+- */
+-@Private
+-@Unstable
+-@Metrics(about="Client SCM metrics", context="yarn")
+-public class ClientSCMMetrics {
+-
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(ClientSCMMetrics.class);
+-  final MetricsRegistry registry;
+-  private final static ClientSCMMetrics INSTANCE = create();
+-
+-  private ClientSCMMetrics() {
+-    registry = new MetricsRegistry("clientRequests");
+-    LOG.debug("Initialized {}", registry);
+-  }
+-  
+-  public static ClientSCMMetrics getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  static ClientSCMMetrics create() {
+-    MetricsSystem ms = DefaultMetricsSystem.instance();
+-
+-    ClientSCMMetrics metrics = new ClientSCMMetrics();
+-    ms.register("clientRequests", null, metrics);
+-    return metrics;
+-  }
+-
+-  @Metric("Number of cache hits") MutableCounterLong cacheHits;
+-  @Metric("Number of cache misses") MutableCounterLong cacheMisses;
+-  @Metric("Number of cache releases") MutableCounterLong cacheReleases;
+-
+-  /**
+-   * One cache hit event
+-   */
+-  public void incCacheHitCount() {
+-    cacheHits.incr();
+-  }
+-
+-  /**
+-   * One cache miss event
+-   */
+-  public void incCacheMissCount() {
+-    cacheMisses.incr();
+-  }
+-
+-  /**
+-   * One cache release event
+-   */
+-  public void incCacheRelease() {
+-    cacheReleases.incr();
+-  }
+-
+-  public long getCacheHits() { return cacheHits.value(); }
+-  public long getCacheMisses() { return cacheMisses.value(); }
+-  public long getCacheReleases() { return cacheReleases.value(); }
+-
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java
+deleted file mode 100644
+index b86620d1734..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/SharedCacheUploaderMetrics.java
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.sharedcachemanager.metrics;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.metrics2.MetricsSystem;
+-import org.apache.hadoop.metrics2.annotation.Metric;
+-import org.apache.hadoop.metrics2.annotation.Metrics;
+-import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+-import org.apache.hadoop.metrics2.lib.MetricsRegistry;
+-import org.apache.hadoop.metrics2.lib.MutableCounterLong;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * This class is for maintaining shared cache uploader requests metrics
+- * and publishing them through the metrics interfaces.
+- */
+-@Private
+-@Evolving
+-@Metrics(about="shared cache upload metrics", context="yarn")
+-public class SharedCacheUploaderMetrics {
+-
+-  static final Logger LOG =
+-      LoggerFactory.getLogger(SharedCacheUploaderMetrics.class);
+-  final MetricsRegistry registry;
+-  private final static SharedCacheUploaderMetrics INSTANCE = create();
+-
+-  private SharedCacheUploaderMetrics() {
+-    registry = new MetricsRegistry("SharedCacheUploaderRequests");
+-    LOG.debug("Initialized {}", registry);
+-  }
+-
+-  public static SharedCacheUploaderMetrics getInstance() {
+-    return INSTANCE;
+-  }
+-
+-  static SharedCacheUploaderMetrics create() {
+-    MetricsSystem ms = DefaultMetricsSystem.instance();
+-
+-    SharedCacheUploaderMetrics metrics =
+-        new SharedCacheUploaderMetrics();
+-    ms.register("SharedCacheUploaderRequests", null, metrics);
+-    return metrics;
+-  }
+-
+-  @Metric("Number of accepted uploads") MutableCounterLong acceptedUploads;
+-  @Metric("Number of rejected uploads") MutableCounterLong rejectedUploads;
+-
+-  /**
+-   * One accepted upload event
+-   */
+-  public void incAcceptedUploads() {
+-    acceptedUploads.incr();
+-  }
+-
+-  /**
+-   * One rejected upload event
+-   */
+-  public void incRejectedUploads() {
+-    rejectedUploads.incr();
+-  }
+-
+-  public long getAcceptedUploads() { return acceptedUploads.value(); }
+-  public long getRejectUploads() { return rejectedUploads.value(); }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java
+deleted file mode 100644
+index 760ba7481ae..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/InMemorySCMStore.java
++++ /dev/null
+@@ -1,525 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.ConcurrentHashMap;
+-import java.util.concurrent.ScheduledExecutorService;
+-import java.util.concurrent.ThreadFactory;
+-import java.util.concurrent.TimeUnit;
+-
+-import org.apache.hadoop.HadoopIllegalArgumentException;
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.util.StringInterner;
+-import org.apache.hadoop.util.concurrent.HadoopExecutors;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.server.sharedcache.SharedCacheUtil;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.AppChecker;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * A thread safe version of an in-memory SCM store. The thread safety is
+- * implemented with two key pieces: (1) at the mapping level a ConcurrentHashMap
+- * is used to allow concurrency to resources and their associated references,
+- * and (2) a key level lock is used to ensure mutual exclusion between any
+- * operation that accesses a resource with the same key. <br>
+- * <br>
+- * To ensure safe key-level locking, we use the original string key and intern
+- * it weakly using hadoop's <code>StringInterner</code>. It avoids the pitfalls
+- * of using built-in String interning. The interned strings are also weakly
+- * referenced, so it can be garbage collected once it is done. And there is
+- * little risk of keys being available for other parts of the code so they can
+- * be used as locks accidentally. <br>
+- * <br>
+- * Resources in the in-memory store are evicted based on a time staleness
+- * criteria. If a resource is not referenced (i.e. used) for a given period, it
+- * is designated as a stale resource and is considered evictable.
+- */
+-@Private
+-@Evolving
+-public class InMemorySCMStore extends SCMStore {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(InMemorySCMStore.class);
+-
+-  private final Map<String, SharedCacheResource> cachedResources =
+-      new ConcurrentHashMap<String, SharedCacheResource>();
+-  private Collection<ApplicationId> initialApps =
+-      new ArrayList<ApplicationId>();
+-  private final Object initialAppsLock = new Object();
+-  private long startTime;
+-  private int stalenessMinutes;
+-  private ScheduledExecutorService scheduler;
+-  private int initialDelayMin;
+-  private int checkPeriodMin;
+-
+-  public InMemorySCMStore() {
+-    super(InMemorySCMStore.class.getName());
+-  }
+-
+-  @VisibleForTesting
+-  public InMemorySCMStore(AppChecker appChecker) {
+-    super(InMemorySCMStore.class.getName(), appChecker);
+-  }
+-
+-  private String intern(String key) {
+-    return StringInterner.weakIntern(key);
+-  }
+-
+-  /**
+-   * The in-memory store bootstraps itself from the shared cache entries that
+-   * exist in HDFS.
+-   */
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-
+-    this.startTime = System.currentTimeMillis();
+-    this.initialDelayMin = getInitialDelay(conf);
+-    this.checkPeriodMin = getCheckPeriod(conf);
+-    this.stalenessMinutes = getStalenessPeriod(conf);
+-
+-    bootstrap(conf);
+-
+-    ThreadFactory tf =
+-        new ThreadFactoryBuilder().setNameFormat("InMemorySCMStore")
+-            .build();
+-    scheduler = HadoopExecutors.newSingleThreadScheduledExecutor(tf);
+-
+-    super.serviceInit(conf);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    // start composed services first
+-    super.serviceStart();
+-
+-    // Get initial list of running applications
+-    LOG.info("Getting the active app list to initialize the in-memory scm store");
+-    synchronized (initialAppsLock) {
+-      initialApps = appChecker.getActiveApplications();
+-    }
+-    LOG.info(initialApps.size() + " apps recorded as active at this time");
+-
+-    Runnable task = new AppCheckTask(appChecker);
+-    scheduler.scheduleAtFixedRate(task, initialDelayMin, checkPeriodMin,
+-        TimeUnit.MINUTES);
+-    LOG.info("Scheduled the in-memory scm store app check task to run every "
+-        + checkPeriodMin + " minutes.");
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    LOG.info("Stopping the " + InMemorySCMStore.class.getSimpleName()
+-        + " service.");
+-    if (scheduler != null) {
+-      LOG.info("Shutting down the background thread.");
+-      scheduler.shutdownNow();
+-      try {
+-        if (!scheduler.awaitTermination(10, TimeUnit.SECONDS)) {
+-          LOG.warn("Gave up waiting for the app check task to shutdown.");
+-        }
+-      } catch (InterruptedException e) {
+-        LOG.warn(
+-            "The InMemorySCMStore was interrupted while shutting down the "
+-                + "app check task.", e);
+-      }
+-      LOG.info("The background thread stopped.");
+-    }
+-    super.serviceStop();
+-  }
+-
+-  private void bootstrap(Configuration conf) throws IOException {
+-    Map<String, String> initialCachedResources =
+-        getInitialCachedResources(FileSystem.get(conf), conf);
+-    LOG.info("Bootstrapping from " + initialCachedResources.size()
+-        + " cache resources located in the file system");
+-    Iterator<Map.Entry<String, String>> it =
+-        initialCachedResources.entrySet().iterator();
+-    while (it.hasNext()) {
+-      Map.Entry<String, String> e = it.next();
+-      String key = intern(e.getKey());
+-      String fileName = e.getValue();
+-      SharedCacheResource resource = new SharedCacheResource(fileName);
+-      // we don't hold the lock for this as it is done as part of serviceInit
+-      cachedResources.put(key, resource);
+-      // clear out the initial resource to reduce the footprint
+-      it.remove();
+-    }
+-    LOG.info("Bootstrapping complete");
+-  }
+-
+-  @VisibleForTesting
+-  Map<String, String> getInitialCachedResources(FileSystem fs,
+-      Configuration conf) throws IOException {
+-    // get the root directory for the shared cache
+-    String location =
+-        conf.get(YarnConfiguration.SHARED_CACHE_ROOT,
+-            YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT);
+-    Path root = new Path(location);
+-    try {
+-      fs.getFileStatus(root);
+-    } catch (FileNotFoundException e) {
+-      String message =
+-          "The shared cache root directory " + location + " was not found";
+-      LOG.error(message);
+-      throw (IOException)new FileNotFoundException(message)
+-          .initCause(e);
+-    }
+-
+-    int nestedLevel = SharedCacheUtil.getCacheDepth(conf);
+-    // now traverse individual directories and process them
+-    // the directory structure is specified by the nested level parameter
+-    // (e.g. 9/c/d/<checksum>/file)
+-    String pattern = SharedCacheUtil.getCacheEntryGlobPattern(nestedLevel+1);
+-
+-    LOG.info("Querying for all individual cached resource files");
+-    FileStatus[] entries = fs.globStatus(new Path(root, pattern));
+-    int numEntries = entries == null ? 0 : entries.length;
+-    LOG.info("Found " + numEntries + " files: processing for one resource per "
+-        + "key");
+-
+-    Map<String, String> initialCachedEntries = new HashMap<String, String>();
+-    if (entries != null) {
+-      for (FileStatus entry : entries) {
+-        Path file = entry.getPath();
+-        String fileName = file.getName();
+-        if (entry.isFile()) {
+-          // get the parent to get the checksum
+-          Path parent = file.getParent();
+-          if (parent != null) {
+-            // the name of the immediate parent directory is the checksum
+-            String key = parent.getName();
+-            // make sure we insert only one file per checksum whichever comes
+-            // first
+-            if (initialCachedEntries.containsKey(key)) {
+-              LOG.warn("Key " + key + " is already mapped to file "
+-                  + initialCachedEntries.get(key) + "; file " + fileName
+-                  + " will not be added");
+-            } else {
+-              initialCachedEntries.put(key, fileName);
+-            }
+-          }
+-        }
+-      }
+-    }
+-    LOG.info("A total of " + initialCachedEntries.size()
+-        + " files are now mapped");
+-    return initialCachedEntries;
+-  }
+-
+-  /**
+-   * Adds the given resource to the store under the key and the filename. If the
+-   * entry is already found, it returns the existing filename. It represents the
+-   * state of the store at the time of this query. The entry may change or even
+-   * be removed once this method returns. The caller should be prepared to
+-   * handle that situation.
+-   * 
+-   * @return the filename of the newly inserted resource or that of the existing
+-   *         resource
+-   */
+-  @Override
+-  public String addResource(String key, String fileName) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource == null) {
+-        resource = new SharedCacheResource(fileName);
+-        cachedResources.put(interned, resource);
+-      }
+-      return resource.getFileName();
+-    }
+-  }
+-
+-  /**
+-   * Adds the provided resource reference to the cache resource under the key,
+-   * and updates the access time. If it returns a non-null value, the caller may
+-   * safely assume that the resource will not be removed at least until the app
+-   * in this resource reference has terminated.
+-   * 
+-   * @return the filename of the resource, or null if the resource is not found
+-   */
+-  @Override
+-  public String addResourceReference(String key,
+-      SharedCacheResourceReference ref) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource == null) { // it's not mapped
+-        return null;
+-      }
+-      resource.addReference(ref);
+-      resource.updateAccessTime();
+-      return resource.getFileName();
+-    }
+-  }
+-
+-  /**
+-   * Returns the list of resource references currently registered under the
+-   * cache entry. If the list is empty, it returns an empty collection. The
+-   * returned collection is unmodifiable and a snapshot of the information at
+-   * the time of the query. The state may change after this query returns. The
+-   * caller should handle the situation that some or all of these resource
+-   * references are no longer relevant.
+-   * 
+-   * @return the collection that contains the resource references associated
+-   *         with the resource; or an empty collection if no resource references
+-   *         are registered under this resource
+-   */
+-  @Override
+-  public Collection<SharedCacheResourceReference> getResourceReferences(String key) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource == null) {
+-        return Collections.emptySet();
+-      }
+-      Set<SharedCacheResourceReference> refs =
+-          new HashSet<SharedCacheResourceReference>(
+-              resource.getResourceReferences());
+-      return Collections.unmodifiableSet(refs);
+-    }
+-  }
+-
+-  /**
+-   * Removes the provided resource reference from the resource. If the resource
+-   * does not exist, nothing will be done.
+-   */
+-  @Override
+-  public boolean removeResourceReference(String key, SharedCacheResourceReference ref,
+-      boolean updateAccessTime) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      boolean removed = false;
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource != null) {
+-        Set<SharedCacheResourceReference> resourceRefs =
+-            resource.getResourceReferences();
+-        removed = resourceRefs.remove(ref);
+-        if (updateAccessTime) {
+-          resource.updateAccessTime();
+-        }
+-      }
+-      return removed;
+-    }
+-  }
+-
+-  /**
+-   * Removes the provided collection of resource references from the resource.
+-   * If the resource does not exist, nothing will be done.
+-   */
+-  @Override
+-  public void removeResourceReferences(String key,
+-      Collection<SharedCacheResourceReference> refs, boolean updateAccessTime) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource != null) {
+-        Set<SharedCacheResourceReference> resourceRefs =
+-            resource.getResourceReferences();
+-        resourceRefs.removeAll(refs);
+-        if (updateAccessTime) {
+-          resource.updateAccessTime();
+-        }
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Provides atomicity for the method.
+-   */
+-  @Override
+-  public void cleanResourceReferences(String key) throws YarnException {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      super.cleanResourceReferences(key);
+-    }
+-  }
+-
+-  /**
+-   * Removes the given resource from the store. Returns true if the resource is
+-   * found and removed or if the resource is not found. Returns false if it was
+-   * unable to remove the resource because the resource reference list was not
+-   * empty.
+-   */
+-  @Override
+-  public boolean removeResource(String key) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      if (resource == null) {
+-        return true;
+-      }
+-
+-      if (!resource.getResourceReferences().isEmpty()) {
+-        return false;
+-      }
+-      // no users
+-      cachedResources.remove(interned);
+-      return true;
+-    }
+-  }
+-
+-  /**
+-   * Obtains the access time for a resource. It represents the view of the
+-   * resource at the time of the query. The value may have been updated at a
+-   * later point.
+-   * 
+-   * @return the access time of the resource if found; -1 if the resource is not
+-   *         found
+-   */
+-  @VisibleForTesting
+-  long getAccessTime(String key) {
+-    String interned = intern(key);
+-    synchronized (interned) {
+-      SharedCacheResource resource = cachedResources.get(interned);
+-      return resource == null ? -1 : resource.getAccessTime();
+-    }
+-  }
+-
+-  @Override
+-  public boolean isResourceEvictable(String key, FileStatus file) {
+-    synchronized (initialAppsLock) {
+-      if (initialApps.size() > 0) {
+-        return false;
+-      }
+-    }
+-
+-    long staleTime =
+-        System.currentTimeMillis()
+-            - TimeUnit.MINUTES.toMillis(this.stalenessMinutes);
+-    long accessTime = getAccessTime(key);
+-    if (accessTime == -1) {
+-      // check modification time
+-      long modTime = file.getModificationTime();
+-      // if modification time is older then the store startup time, we need to
+-      // just use the store startup time as the last point of certainty
+-      long lastUse = modTime < this.startTime ? this.startTime : modTime;
+-      return lastUse < staleTime;
+-    } else {
+-      // check access time
+-      return accessTime < staleTime;
+-    }
+-  }
+-
+-  private static int getStalenessPeriod(Configuration conf) {
+-    int stalenessMinutes =
+-        conf.getInt(YarnConfiguration.IN_MEMORY_STALENESS_PERIOD_MINS,
+-            YarnConfiguration.DEFAULT_IN_MEMORY_STALENESS_PERIOD_MINS);
+-    // non-positive value is invalid; use the default
+-    if (stalenessMinutes <= 0) {
+-      throw new HadoopIllegalArgumentException("Non-positive staleness value: "
+-          + stalenessMinutes
+-          + ". The staleness value must be greater than zero.");
+-    }
+-    return stalenessMinutes;
+-  }
+-
+-  private static int getInitialDelay(Configuration conf) {
+-    int initialMinutes =
+-        conf.getInt(YarnConfiguration.IN_MEMORY_INITIAL_DELAY_MINS,
+-            YarnConfiguration.DEFAULT_IN_MEMORY_INITIAL_DELAY_MINS);
+-    // non-positive value is invalid; use the default
+-    if (initialMinutes <= 0) {
+-      throw new HadoopIllegalArgumentException(
+-          "Non-positive initial delay value: " + initialMinutes
+-              + ". The initial delay value must be greater than zero.");
+-    }
+-    return initialMinutes;
+-  }
+-
+-  private static int getCheckPeriod(Configuration conf) {
+-    int checkMinutes =
+-        conf.getInt(YarnConfiguration.IN_MEMORY_CHECK_PERIOD_MINS,
+-            YarnConfiguration.DEFAULT_IN_MEMORY_CHECK_PERIOD_MINS);
+-    // non-positive value is invalid; use the default
+-    if (checkMinutes <= 0) {
+-      throw new HadoopIllegalArgumentException(
+-          "Non-positive check period value: " + checkMinutes
+-              + ". The check period value must be greater than zero.");
+-    }
+-    return checkMinutes;
+-  }
+-
+-  @Private
+-  @Evolving
+-  class AppCheckTask implements Runnable {
+-
+-    private final AppChecker taskAppChecker;
+-
+-    public AppCheckTask(AppChecker appChecker) {
+-      this.taskAppChecker = appChecker;
+-    }
+-
+-    @Override
+-    public void run() {
+-      try {
+-        LOG.info("Checking the initial app list for finished applications.");
+-        synchronized (initialAppsLock) {
+-          if (initialApps.isEmpty()) {
+-            // we're fine, no-op; there are no active apps that were running at
+-            // the time of the service start
+-          } else {
+-            LOG.info("Looking into " + initialApps.size()
+-                + " apps to see if they are still active");
+-            Iterator<ApplicationId> it = initialApps.iterator();
+-            while (it.hasNext()) {
+-              ApplicationId id = it.next();
+-              try {
+-                if (!taskAppChecker.isApplicationActive(id)) {
+-                  // remove it from the list
+-                  it.remove();
+-                }
+-              } catch (YarnException e) {
+-                LOG.warn("Exception while checking the app status;"
+-                    + " will leave the entry in the list", e);
+-                // continue
+-              }
+-            }
+-          }
+-          LOG.info("There are now " + initialApps.size()
+-              + " entries in the list");
+-        }
+-      } catch (Throwable e) {
+-        LOG.error(
+-            "Unexpected exception thrown during in-memory store app check task."
+-                + " Rescheduling task.", e);
+-      }
+-
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java
+deleted file mode 100644
+index 685b86ca367..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStore.java
++++ /dev/null
+@@ -1,213 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import java.util.Collection;
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.service.CompositeService;
+-import org.apache.hadoop.util.ReflectionUtils;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.AppChecker;
+-
+-import org.apache.hadoop.classification.VisibleForTesting;
+-
+-
+-/**
+- * An abstract class for the data store used by the shared cache manager
+- * service. All implementations of methods in this interface need to be thread
+- * safe and atomic.
+- */
+-@Private
+-@Evolving
+-public abstract class SCMStore extends CompositeService {
+-
+-  protected AppChecker appChecker;
+-
+-  protected SCMStore(String name) {
+-    super(name);
+-  }
+-
+-  @VisibleForTesting
+-  SCMStore(String name, AppChecker appChecker) {
+-    super(name);
+-    this.appChecker = appChecker;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    if (this.appChecker == null) {
+-      this.appChecker = createAppCheckerService(conf);
+-    }
+-    addService(appChecker);
+-    super.serviceInit(conf);
+-  }
+-
+-  /**
+-   * Add a resource to the shared cache and it's associated filename. The
+-   * resource is identified by a unique key. If the key already exists no action
+-   * is taken and the filename of the existing resource is returned. If the key
+-   * does not exist, the resource is added, it's access time is set, and the
+-   * filename of the resource is returned.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @param fileName the filename of the resource
+-   * @return the filename of the resource as represented by the cache
+-   */
+-  @Private
+-  public abstract String addResource(String key, String fileName);
+-
+-  /**
+-   * Remove a resource from the shared cache.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @return true if the resource was removed or did not exist, false if the
+-   *         resource existed, contained at least one
+-   *         <code>SharedCacheResourceReference</code> and was not removed.
+-   */
+-  @Private
+-  public abstract boolean removeResource(String key);
+-
+-  /**
+-   * Add a <code>SharedCacheResourceReference</code> to a resource and update
+-   * the resource access time.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @param ref the <code>SharedCacheResourceReference</code> to add
+-   * @return String the filename of the resource if the
+-   *         <code>SharedCacheResourceReference</code> was added or already
+-   *         existed. null if the resource did not exist
+-   */
+-  @Private
+-  public abstract String addResourceReference(String key,
+-      SharedCacheResourceReference ref);
+-
+-  /**
+-   * Get the <code>SharedCacheResourceReference</code>(s) associated with the
+-   * resource.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @return an unmodifiable collection of
+-   *         <code>SharedCacheResourceReferences</code>. If the resource does
+-   *         not exist, an empty set is returned.
+-   */
+-  @Private
+-  public abstract Collection<SharedCacheResourceReference> getResourceReferences(
+-      String key);
+-
+-  /**
+-   * Remove a <code>SharedCacheResourceReference</code> from a resource.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @param ref the <code>SharedCacheResourceReference</code> to remove
+-   * @param updateAccessTime true if the call should update the access time for
+-   *          the resource
+-   * @return true if the reference was removed, false otherwise
+-   */
+-  @Private
+-  public abstract boolean removeResourceReference(String key,
+-      SharedCacheResourceReference ref, boolean updateAccessTime);
+-
+-  /**
+-   * Remove a collection of <code>SharedCacheResourceReferences</code> from a
+-   * resource.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @param refs the collection of <code>SharedCacheResourceReference</code>s to
+-   *          remove
+-   * @param updateAccessTime true if the call should update the access time for
+-   *          the resource
+-   */
+-  @Private
+-  public abstract void removeResourceReferences(String key,
+-      Collection<SharedCacheResourceReference> refs, boolean updateAccessTime);
+-
+-  /**
+-   * Clean all resource references to a cache resource that contain application
+-   * ids pointing to finished applications. If the resource key does not exist,
+-   * do nothing.
+-   *
+-   * @param key a unique identifier for a resource
+-   * @throws YarnException
+-   */
+-  @Private
+-  public void cleanResourceReferences(String key) throws YarnException {
+-    Collection<SharedCacheResourceReference> refs = getResourceReferences(key);
+-    if (!refs.isEmpty()) {
+-      Set<SharedCacheResourceReference> refsToRemove =
+-          new HashSet<SharedCacheResourceReference>();
+-      for (SharedCacheResourceReference r : refs) {
+-        if (!appChecker.isApplicationActive(r.getAppId())) {
+-          // application in resource reference is dead, it is safe to remove the
+-          // reference
+-          refsToRemove.add(r);
+-        }
+-      }
+-      if (refsToRemove.size() > 0) {
+-        removeResourceReferences(key, refsToRemove, false);
+-      }
+-    }
+-  }
+-
+-  /**
+-   * Check if a specific resource is evictable according to the store's enabled
+-   * cache eviction policies.
+-   * 
+-   * @param key a unique identifier for a resource
+-   * @param file the <code>FileStatus</code> object for the resource file in the
+-   *          file system.
+-   * @return true if the resource is evicatble, false otherwise
+-   */
+-  @Private
+-  public abstract boolean isResourceEvictable(String key, FileStatus file);
+-
+-  /**
+-   * Create an instance of the AppChecker service via reflection based on the
+-   * {@link YarnConfiguration#SCM_APP_CHECKER_CLASS} parameter.
+-   * 
+-   * @param conf
+-   * @return an instance of the AppChecker class
+-   */
+-  @Private
+-  @SuppressWarnings("unchecked")
+-  public static AppChecker createAppCheckerService(Configuration conf) {
+-    Class<? extends AppChecker> defaultCheckerClass;
+-    try {
+-      defaultCheckerClass =
+-          (Class<? extends AppChecker>) Class
+-              .forName(YarnConfiguration.DEFAULT_SCM_APP_CHECKER_CLASS);
+-    } catch (Exception e) {
+-      throw new YarnRuntimeException("Invalid default scm app checker class"
+-          + YarnConfiguration.DEFAULT_SCM_APP_CHECKER_CLASS, e);
+-    }
+-
+-    AppChecker checker =
+-        ReflectionUtils.newInstance(conf.getClass(
+-            YarnConfiguration.SCM_APP_CHECKER_CLASS, defaultCheckerClass,
+-            AppChecker.class), conf);
+-    return checker;
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java
+deleted file mode 100644
+index cb0df541b1d..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResource.java
++++ /dev/null
+@@ -1,64 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import java.util.HashSet;
+-import java.util.Set;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-
+-/**
+- * Class that encapsulates the cache resource. The instances are not thread
+- * safe. Any operation that uses the resource must use thread-safe mechanisms to
+- * ensure safe access with the only exception of the filename.
+- */
+-@Private
+-@Evolving
+-class SharedCacheResource {
+-  private long accessTime;
+-  private final Set<SharedCacheResourceReference> refs;
+-  private final String fileName;
+-
+-  SharedCacheResource(String fileName) {
+-    this.accessTime = System.currentTimeMillis();
+-    this.refs = new HashSet<SharedCacheResourceReference>();
+-    this.fileName = fileName;
+-  }
+-
+-  long getAccessTime() {
+-    return accessTime;
+-  }
+-
+-  void updateAccessTime() {
+-    accessTime = System.currentTimeMillis();
+-  }
+-
+-  String getFileName() {
+-    return this.fileName;
+-  }
+-
+-  Set<SharedCacheResourceReference> getResourceReferences() {
+-    return this.refs;
+-  }
+-
+-  boolean addReference(SharedCacheResourceReference ref) {
+-    return this.refs.add(ref);
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java
+deleted file mode 100644
+index d595d9708b8..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SharedCacheResourceReference.java
++++ /dev/null
+@@ -1,86 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Evolving;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-
+-/**
+- * This is an object that represents a reference to a shared cache resource.
+- */
+-@Private
+-@Evolving
+-public class SharedCacheResourceReference {
+-  private final ApplicationId appId;
+-  private final String shortUserName;
+-
+-  /**
+-   * Create a resource reference.
+-   * 
+-   * @param appId <code>ApplicationId</code> that is referencing a resource.
+-   * @param shortUserName <code>ShortUserName</code> of the user that created
+-   *          the reference.
+-   */
+-  public SharedCacheResourceReference(ApplicationId appId, String shortUserName) {
+-    this.appId = appId;
+-    this.shortUserName = shortUserName;
+-  }
+-
+-  public ApplicationId getAppId() {
+-    return this.appId;
+-  }
+-
+-  public String getShortUserName() {
+-    return this.shortUserName;
+-  }
+-
+-  @Override
+-  public int hashCode() {
+-    final int prime = 31;
+-    int result = 1;
+-    result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+-    result =
+-        prime * result
+-            + ((shortUserName == null) ? 0 : shortUserName.hashCode());
+-    return result;
+-  }
+-
+-  @Override
+-  public boolean equals(Object obj) {
+-    if (this == obj)
+-      return true;
+-    if (obj == null)
+-      return false;
+-    if (getClass() != obj.getClass())
+-      return false;
+-    SharedCacheResourceReference other = (SharedCacheResourceReference) obj;
+-    if (appId == null) {
+-      if (other.appId != null)
+-        return false;
+-    } else if (!appId.equals(other.appId))
+-      return false;
+-    if (shortUserName == null) {
+-      if (other.shortUserName != null)
+-        return false;
+-    } else if (!shortUserName.equals(other.shortUserName))
+-      return false;
+-    return true;
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java
+deleted file mode 100644
+index f597d14bf4e..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMController.java
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.webapp;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.webapp.Controller;
+-
+-/**
+- * The controller class for the shared cache manager web app.
+- */
+-@Private
+-@Unstable
+-public class SCMController extends Controller {
+-  @Override
+-  public void index() {
+-    setTitle("Shared Cache Manager");
+-  }
+-
+-  /**
+-   * It is referenced in SCMWebServer.SCMWebApp.setup()
+-   */
+-  @SuppressWarnings("unused")
+-  public void overview() {
+-    render(SCMOverviewPage.class);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java
+deleted file mode 100644
+index 24aa1452a67..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMMetricsInfo.java
++++ /dev/null
+@@ -1,70 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.webapp;
+-
+-import javax.xml.bind.annotation.XmlAccessType;
+-import javax.xml.bind.annotation.XmlAccessorType;
+-import javax.xml.bind.annotation.XmlRootElement;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.CleanerMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.ClientSCMMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.SharedCacheUploaderMetrics;
+-
+-/**
+- * This class is used to summarize useful shared cache manager metrics for the
+- * webUI display.
+- */
+-@XmlRootElement(name = "SCMMetrics")
+-@XmlAccessorType(XmlAccessType.FIELD)
+-@Private
+-@Unstable
+-public class SCMMetricsInfo {
+-  protected long totalDeletedFiles;
+-  protected long totalProcessedFiles;
+-  protected long cacheHits;
+-  protected long cacheMisses;
+-  protected long cacheReleases;
+-  protected long acceptedUploads;
+-  protected long rejectedUploads;
+-
+-  public SCMMetricsInfo() {
+-  }
+-  
+-  public SCMMetricsInfo(CleanerMetrics cleanerMetrics,
+-      ClientSCMMetrics clientSCMMetrics,
+-      SharedCacheUploaderMetrics scmUploaderMetrics) {
+-    totalDeletedFiles = cleanerMetrics.getTotalDeletedFiles();
+-    totalProcessedFiles = cleanerMetrics.getTotalProcessedFiles();
+-    cacheHits = clientSCMMetrics.getCacheHits();
+-    cacheMisses = clientSCMMetrics.getCacheMisses();
+-    cacheReleases = clientSCMMetrics.getCacheReleases();
+-    acceptedUploads = scmUploaderMetrics.getAcceptedUploads();
+-    rejectedUploads = scmUploaderMetrics.getRejectUploads();
+-  }
+-
+-  public long getTotalDeletedFiles() { return totalDeletedFiles; }
+-  public long getTotalProcessedFiles() { return totalProcessedFiles; }
+-  public long getCacheHits() { return cacheHits; }
+-  public long getCacheMisses() { return cacheMisses; }
+-  public long getCacheReleases() { return cacheReleases; }
+-  public long getAcceptedUploads() { return acceptedUploads; }
+-  public long getRejectUploads() { return rejectedUploads; }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java
+deleted file mode 100644
+index cec085b3191..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMOverviewPage.java
++++ /dev/null
+@@ -1,95 +0,0 @@
+-/**
+-* Licensed to the Apache Software Foundation (ASF) under one
+-* or more contributor license agreements.  See the NOTICE file
+-* distributed with this work for additional information
+-* regarding copyright ownership.  The ASF licenses this file
+-* to you under the Apache License, Version 2.0 (the
+-* "License"); you may not use this file except in compliance
+-* with the License.  You may obtain a copy of the License at
+-*
+-*     http://www.apache.org/licenses/LICENSE-2.0
+-*
+-* Unless required by applicable law or agreed to in writing, software
+-* distributed under the License is distributed on an "AS IS" BASIS,
+-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-* See the License for the specific language governing permissions and
+-* limitations under the License.
+-*/
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.webapp;
+-
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.ACCORDION_ID;
+-import static org.apache.hadoop.yarn.webapp.view.JQueryUI.initID;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.CleanerMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.ClientSCMMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.SharedCacheUploaderMetrics;
+-import org.apache.hadoop.yarn.util.Times;
+-import org.apache.hadoop.yarn.webapp.SubView;
+-import org.apache.hadoop.yarn.webapp.view.HtmlBlock;
+-import org.apache.hadoop.yarn.webapp.view.InfoBlock;
+-import org.apache.hadoop.yarn.webapp.view.TwoColumnLayout;
+-
+-import com.google.inject.Inject;
+-
+-/**
+- * This class is to render the shared cache manager web ui overview page.
+- */
+-@Private
+-@Unstable
+-public class SCMOverviewPage extends TwoColumnLayout {
+-
+-  @Override protected void preHead(Page.HTML<__> html) {
+-    set(ACCORDION_ID, "nav");
+-    set(initID(ACCORDION, "nav"), "{autoHeight:false, active:0}");
+-  }
+-
+-  @Override protected Class<? extends SubView> content() {
+-    return SCMOverviewBlock.class;
+-  }
+-
+-  @Override
+-  protected Class<? extends SubView> nav() {
+-    return SCMOverviewNavBlock.class;
+-  }
+-
+-  static private class SCMOverviewNavBlock extends HtmlBlock {
+-    @Override
+-    protected void render(Block html) {
+-      html.div("#nav").h3("Tools").ul().li().a("/conf", "Configuration").__()
+-          .li().a("/stacks", "Thread dump").__().li().a("/logs", "Logs").__()
+-          .li().a("/metrics", "Metrics").__().__().__();
+-    }
+-  }
+-
+-  static private class SCMOverviewBlock extends HtmlBlock {
+-    final SharedCacheManager scm;
+-
+-    @Inject
+-    SCMOverviewBlock(SharedCacheManager scm, ViewContext ctx) {
+-      super(ctx);
+-      this.scm = scm;
+-    }
+-
+-    @Override
+-    protected void render(Block html) {
+-      SCMMetricsInfo metricsInfo = new SCMMetricsInfo(
+-          CleanerMetrics.getInstance(), ClientSCMMetrics.getInstance(),
+-              SharedCacheUploaderMetrics.getInstance());
+-      info("Shared Cache Manager overview").
+-          __("Started on:", Times.format(scm.getStartTime())).
+-          __("Cache hits: ", metricsInfo.getCacheHits()).
+-          __("Cache misses: ", metricsInfo.getCacheMisses()).
+-          __("Cache releases: ", metricsInfo.getCacheReleases()).
+-          __("Accepted uploads: ", metricsInfo.getAcceptedUploads()).
+-          __("Rejected uploads: ", metricsInfo.getRejectUploads()).
+-          __("Deleted files by the cleaner: ", metricsInfo.getTotalDeletedFiles()).
+-          __("Processed files by the cleaner: ", metricsInfo.getTotalProcessedFiles());
+-      html.__(InfoBlock.class);
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java
+deleted file mode 100644
+index 7984090fdce..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/main/java/org/apache/hadoop/yarn/server/sharedcachemanager/webapp/SCMWebServer.java
++++ /dev/null
+@@ -1,92 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.webapp;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.service.AbstractService;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager;
+-import org.apache.hadoop.yarn.webapp.WebApp;
+-import org.apache.hadoop.yarn.webapp.WebApps;
+-import org.slf4j.Logger;
+-import org.slf4j.LoggerFactory;
+-
+-/**
+- * A very simple web interface for the metrics reported by
+- * {@link org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager}
+- * TODO: Security for web ui (See YARN-2774)
+- */
+-@Private
+-@Unstable
+-public class SCMWebServer extends AbstractService {
+-  private static final Logger LOG =
+-      LoggerFactory.getLogger(SCMWebServer.class);
+-
+-  private final SharedCacheManager scm;
+-  private WebApp webApp;
+-  private String bindAddress;
+-
+-  public SCMWebServer(SharedCacheManager scm) {
+-    super(SCMWebServer.class.getName());
+-    this.scm = scm;
+-  }
+-
+-  @Override
+-  protected void serviceInit(Configuration conf) throws Exception {
+-    this.bindAddress = getBindAddress(conf);
+-    super.serviceInit(conf);
+-  }
+-
+-  private String getBindAddress(Configuration conf) {
+-    return conf.get(YarnConfiguration.SCM_WEBAPP_ADDRESS,
+-        YarnConfiguration.DEFAULT_SCM_WEBAPP_ADDRESS);
+-  }
+-
+-  @Override
+-  protected void serviceStart() throws Exception {
+-    SCMWebApp scmWebApp = new SCMWebApp(scm);
+-    this.webApp = WebApps.$for("sharedcache").at(bindAddress).start(scmWebApp);
+-    LOG.info("Instantiated " + SCMWebApp.class.getName() + " at " + bindAddress);
+-  }
+-
+-  @Override
+-  protected void serviceStop() throws Exception {
+-    if (this.webApp != null) {
+-      this.webApp.stop();
+-    }
+-  }
+-
+-  private class SCMWebApp extends WebApp {
+-    private final SharedCacheManager scm;
+-
+-    public SCMWebApp(SharedCacheManager scm) {
+-      this.scm = scm;
+-    }
+-
+-    @Override
+-    public void setup() {
+-      if (scm != null) {
+-        bind(SharedCacheManager.class).toInstance(scm);
+-      }
+-      route("/", SCMController.class, "overview");
+-    }
+-  }
+-}
+\ No newline at end of file
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java
+deleted file mode 100644
+index 2b7c72cf283..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/DummyAppChecker.java
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.util.ArrayList;
+-import java.util.Collection;
+-
+-import org.apache.hadoop.classification.InterfaceAudience.Private;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.exceptions.YarnException;
+-
+-/**
+- * A dummy app checker class for testing only.
+- */
+-public class DummyAppChecker extends AppChecker {
+-  @Override
+-  @Private
+-  public boolean isApplicationActive(ApplicationId id) throws YarnException {
+-    return false;
+-  }
+-
+-  @Override
+-  @Private
+-  public Collection<ApplicationId> getActiveApplications() throws YarnException {
+-    return new ArrayList<ApplicationId>();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestCleanerTask.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestCleanerTask.java
+deleted file mode 100644
+index 019ef67bd6a..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestCleanerTask.java
++++ /dev/null
+@@ -1,152 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.util.concurrent.locks.Lock;
+-import java.util.concurrent.locks.ReentrantLock;
+-
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.fs.Path;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.CleanerMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-
+-import static org.mockito.ArgumentMatchers.anyBoolean;
+-import static org.mockito.ArgumentMatchers.eq;
+-import static org.mockito.ArgumentMatchers.isA;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.never;
+-import static org.mockito.Mockito.spy;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-
+-public class TestCleanerTask {
+-  private static final String ROOT =
+-      YarnConfiguration.DEFAULT_SHARED_CACHE_ROOT;
+-  private static final long SLEEP_TIME =
+-      YarnConfiguration.DEFAULT_SCM_CLEANER_RESOURCE_SLEEP_MS;
+-  private static final int NESTED_LEVEL =
+-      YarnConfiguration.DEFAULT_SHARED_CACHE_NESTED_LEVEL;
+-
+-  @Test
+-  void testNonExistentRoot() throws Exception {
+-    FileSystem fs = mock(FileSystem.class);
+-    CleanerMetrics metrics = mock(CleanerMetrics.class);
+-    SCMStore store = mock(SCMStore.class);
+-
+-    CleanerTask task =
+-        createSpiedTask(fs, store, metrics, new ReentrantLock());
+-    // the shared cache root does not exist
+-    when(fs.exists(task.getRootPath())).thenReturn(false);
+-
+-    task.run();
+-
+-    // process() should not be called
+-    verify(task, never()).process();
+-  }
+-
+-  @Test
+-  void testProcessFreshResource() throws Exception {
+-    FileSystem fs = mock(FileSystem.class);
+-    CleanerMetrics metrics = mock(CleanerMetrics.class);
+-    SCMStore store = mock(SCMStore.class);
+-
+-    CleanerTask task =
+-        createSpiedTask(fs, store, metrics, new ReentrantLock());
+-
+-    // mock a resource that is not evictable
+-    when(store.isResourceEvictable(isA(String.class), isA(FileStatus.class)))
+-        .thenReturn(false);
+-    FileStatus status = mock(FileStatus.class);
+-    when(status.getPath()).thenReturn(new Path(ROOT + "/a/b/c/abc"));
+-
+-    // process the resource
+-    task.processSingleResource(status);
+-
+-    // the directory should not be renamed
+-    verify(fs, never()).rename(eq(status.getPath()), isA(Path.class));
+-    // metrics should record a processed file (but not delete)
+-    verify(metrics).reportAFileProcess();
+-    verify(metrics, never()).reportAFileDelete();
+-  }
+-
+-  @Test
+-  void testProcessEvictableResource() throws Exception {
+-    FileSystem fs = mock(FileSystem.class);
+-    CleanerMetrics metrics = mock(CleanerMetrics.class);
+-    SCMStore store = mock(SCMStore.class);
+-
+-    CleanerTask task =
+-        createSpiedTask(fs, store, metrics, new ReentrantLock());
+-
+-    // mock an evictable resource
+-    when(store.isResourceEvictable(isA(String.class), isA(FileStatus.class)))
+-        .thenReturn(true);
+-    FileStatus status = mock(FileStatus.class);
+-    when(status.getPath()).thenReturn(new Path(ROOT + "/a/b/c/abc"));
+-    when(store.removeResource(isA(String.class))).thenReturn(true);
+-    // rename succeeds
+-    when(fs.rename(isA(Path.class), isA(Path.class))).thenReturn(true);
+-    // delete returns true
+-    when(fs.delete(isA(Path.class), anyBoolean())).thenReturn(true);
+-
+-    // process the resource
+-    task.processSingleResource(status);
+-
+-    // the directory should be renamed
+-    verify(fs).rename(eq(status.getPath()), isA(Path.class));
+-    // metrics should record a deleted file
+-    verify(metrics).reportAFileDelete();
+-    verify(metrics, never()).reportAFileProcess();
+-  }
+-
+-  private CleanerTask createSpiedTask(FileSystem fs, SCMStore store,
+-      CleanerMetrics metrics, Lock isCleanerRunning) {
+-    return spy(new CleanerTask(ROOT, SLEEP_TIME, NESTED_LEVEL, fs, store,
+-        metrics, isCleanerRunning));
+-  }
+-
+-  @Test
+-  void testResourceIsInUseHasAnActiveApp() throws Exception {
+-    FileSystem fs = mock(FileSystem.class);
+-    CleanerMetrics metrics = mock(CleanerMetrics.class);
+-    SCMStore store = mock(SCMStore.class);
+-
+-    FileStatus resource = mock(FileStatus.class);
+-    when(resource.getPath()).thenReturn(new Path(ROOT + "/a/b/c/abc"));
+-    // resource is stale
+-    when(store.isResourceEvictable(isA(String.class), isA(FileStatus.class)))
+-        .thenReturn(true);
+-    // but still has appIds
+-    when(store.removeResource(isA(String.class))).thenReturn(false);
+-
+-    CleanerTask task =
+-        createSpiedTask(fs, store, metrics, new ReentrantLock());
+-
+-    // process the resource
+-    task.processSingleResource(resource);
+-
+-    // metrics should record a processed file (but not delete)
+-    verify(metrics).reportAFileProcess();
+-    verify(metrics, never()).reportAFileDelete();
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestClientSCMProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestClientSCMProtocolService.java
+deleted file mode 100644
+index 314332798ab..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestClientSCMProtocolService.java
++++ /dev/null
+@@ -1,281 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.RPC;
+-import org.apache.hadoop.security.UserGroupInformation;
+-import org.apache.hadoop.yarn.api.ClientSCMProtocol;
+-import org.apache.hadoop.yarn.api.protocolrecords.ReleaseSharedCacheResourceRequest;
+-import org.apache.hadoop.yarn.api.protocolrecords.UseSharedCacheResourceRequest;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.ClientSCMMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.InMemorySCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SharedCacheResourceReference;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.junit.jupiter.api.Assertions.assertNull;
+-import static org.mockito.Mockito.spy;
+-
+-
+-/**
+- * Basic unit tests for the Client to SCM Protocol Service.
+- */
+-public class TestClientSCMProtocolService {
+-  private static File testDir = null;
+-
+-  @BeforeAll
+-  public static void setupTestDirs() throws IOException {
+-    testDir = new File("target",
+-        TestSharedCacheUploaderService.class.getCanonicalName());
+-    testDir.delete();
+-    testDir.mkdirs();
+-    testDir = testDir.getAbsoluteFile();
+-  }
+-
+-  @AfterAll
+-  public static void cleanupTestDirs() throws IOException {
+-    if (testDir != null) {
+-      testDir.delete();
+-    }
+-  }
+-
+-
+-  private ClientProtocolService service;
+-  private ClientSCMProtocol clientSCMProxy;
+-  private SCMStore store;
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  @BeforeEach
+-  public void startUp() {
+-    Configuration conf = new Configuration();
+-    conf.set(YarnConfiguration.SCM_STORE_CLASS,
+-        InMemorySCMStore.class.getName());
+-    conf.set(YarnConfiguration.SHARED_CACHE_ROOT, testDir.getPath());
+-    AppChecker appChecker = spy(new DummyAppChecker());
+-    store = new InMemorySCMStore(appChecker);
+-    store.init(conf);
+-    store.start();
+-
+-    service = new ClientProtocolService(store);
+-    service.init(conf);
+-    service.start();
+-
+-    YarnRPC rpc = YarnRPC.create(new Configuration());
+-
+-    InetSocketAddress scmAddress =
+-        conf.getSocketAddr(YarnConfiguration.SCM_CLIENT_SERVER_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_CLIENT_SERVER_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_CLIENT_SERVER_PORT);
+-
+-    clientSCMProxy =
+-        (ClientSCMProtocol) rpc.getProxy(ClientSCMProtocol.class, scmAddress,
+-            conf);
+-  }
+-
+-  @AfterEach
+-  public void cleanUp() {
+-    if (store != null) {
+-      store.stop();
+-      store = null;
+-    }
+-
+-    if (service != null) {
+-      service.stop();
+-      service = null;
+-    }
+-
+-    if (clientSCMProxy != null) {
+-      RPC.stopProxy(clientSCMProxy);
+-      clientSCMProxy = null;
+-    }
+-  }
+-
+-  @Test
+-  void testUse_MissingEntry() throws Exception {
+-    long misses = ClientSCMMetrics.getInstance().getCacheMisses();
+-    UseSharedCacheResourceRequest request =
+-        recordFactory.newRecordInstance(UseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(1, 1L));
+-    assertNull(clientSCMProxy.use(request).getPath());
+-    assertEquals(1, ClientSCMMetrics
+-        .getInstance().getCacheMisses() - misses, "Client SCM metrics aren't updated.");
+-  }
+-
+-  @Test
+-  void testUse_ExistingEntry_NoAppIds() throws Exception {
+-    // Pre-populate the SCM with one cache entry
+-    store.addResource("key1", "foo.jar");
+-
+-    long hits = ClientSCMMetrics.getInstance().getCacheHits();
+-
+-    UseSharedCacheResourceRequest request =
+-        recordFactory.newRecordInstance(UseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(2, 2L));
+-    // Expecting default depth of 3 and under the shared cache root dir
+-    String expectedPath = testDir.getAbsolutePath() + "/k/e/y/key1/foo.jar";
+-    assertEquals(expectedPath, clientSCMProxy.use(request).getPath());
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-    assertEquals(1, ClientSCMMetrics
+-        .getInstance().getCacheHits() - hits, "Client SCM metrics aren't updated.");
+-
+-  }
+-
+-  @Test
+-  void testUse_ExistingEntry_OneId() throws Exception {
+-    // Pre-populate the SCM with one cache entry
+-    store.addResource("key1", "foo.jar");
+-    store.addResourceReference("key1",
+-        new SharedCacheResourceReference(createAppId(1, 1L), "user"));
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-    long hits = ClientSCMMetrics.getInstance().getCacheHits();
+-
+-    // Add a new distinct appId
+-    UseSharedCacheResourceRequest request =
+-        recordFactory.newRecordInstance(UseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(2, 2L));
+-
+-    // Expecting default depth of 3 under the shared cache root dir
+-    String expectedPath = testDir.getAbsolutePath() + "/k/e/y/key1/foo.jar";
+-    assertEquals(expectedPath, clientSCMProxy.use(request).getPath());
+-    assertEquals(2, store.getResourceReferences("key1").size());
+-    assertEquals(1, ClientSCMMetrics
+-        .getInstance().getCacheHits() - hits, "Client SCM metrics aren't updated.");
+-  }
+-
+-  @Test
+-  void testUse_ExistingEntry_DupId() throws Exception {
+-    // Pre-populate the SCM with one cache entry
+-    store.addResource("key1", "foo.jar");
+-    UserGroupInformation testUGI = UserGroupInformation.getCurrentUser();
+-    store.addResourceReference("key1",
+-        new SharedCacheResourceReference(createAppId(1, 1L),
+-            testUGI.getShortUserName()));
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-
+-    long hits = ClientSCMMetrics.getInstance().getCacheHits();
+-
+-    // Add a new duplicate appId
+-    UseSharedCacheResourceRequest request =
+-        recordFactory.newRecordInstance(UseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(1, 1L));
+-
+-    // Expecting default depth of 3 under the shared cache root dir
+-    String expectedPath = testDir.getAbsolutePath() + "/k/e/y/key1/foo.jar";
+-    assertEquals(expectedPath, clientSCMProxy.use(request).getPath());
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-
+-    assertEquals(1, ClientSCMMetrics
+-        .getInstance().getCacheHits() - hits, "Client SCM metrics aren't updated.");
+-  }
+-
+-  @Test
+-  void testRelease_ExistingEntry_NonExistantAppId() throws Exception {
+-    // Pre-populate the SCM with one cache entry
+-    store.addResource("key1", "foo.jar");
+-    store.addResourceReference("key1",
+-        new SharedCacheResourceReference(createAppId(1, 1L), "user"));
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-
+-    long releases = ClientSCMMetrics.getInstance().getCacheReleases();
+-
+-    ReleaseSharedCacheResourceRequest request =
+-        recordFactory
+-            .newRecordInstance(ReleaseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(2, 2L));
+-    clientSCMProxy.release(request);
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-
+-    assertEquals(
+-        0,
+-        ClientSCMMetrics.getInstance().getCacheReleases() - releases,
+-        "Client SCM metrics were updated when a release did not happen");
+-
+-  }
+-
+-  @Test
+-  void testRelease_ExistingEntry_WithAppId() throws Exception {
+-    // Pre-populate the SCM with one cache entry
+-    store.addResource("key1", "foo.jar");
+-    UserGroupInformation testUGI = UserGroupInformation.getCurrentUser();
+-    store.addResourceReference("key1",
+-        new SharedCacheResourceReference(createAppId(1, 1L),
+-            testUGI.getShortUserName()));
+-    assertEquals(1, store.getResourceReferences("key1").size());
+-
+-    long releases = ClientSCMMetrics.getInstance().getCacheReleases();
+-
+-    ReleaseSharedCacheResourceRequest request =
+-        recordFactory
+-            .newRecordInstance(ReleaseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key1");
+-    request.setAppId(createAppId(1, 1L));
+-    clientSCMProxy.release(request);
+-    assertEquals(0, store.getResourceReferences("key1").size());
+-
+-    assertEquals(1, ClientSCMMetrics
+-        .getInstance().getCacheReleases() - releases, "Client SCM metrics aren't updated.");
+-
+-  }
+-
+-  @Test
+-  void testRelease_MissingEntry() throws Exception {
+-
+-    long releases = ClientSCMMetrics.getInstance().getCacheReleases();
+-
+-    ReleaseSharedCacheResourceRequest request =
+-        recordFactory
+-            .newRecordInstance(ReleaseSharedCacheResourceRequest.class);
+-    request.setResourceKey("key2");
+-    request.setAppId(createAppId(2, 2L));
+-    clientSCMProxy.release(request);
+-    assertNotNull(store.getResourceReferences("key2"));
+-    assertEquals(0, store.getResourceReferences("key2").size());
+-    assertEquals(
+-        0,
+-        ClientSCMMetrics.getInstance().getCacheReleases() - releases,
+-        "Client SCM metrics were updated when a release did not happen.");
+-  }
+-
+-  private ApplicationId createAppId(int id, long timestamp) {
+-    return ApplicationId.newInstance(timestamp, id);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestRemoteAppChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestRemoteAppChecker.java
+deleted file mode 100644
+index 29a4291dac6..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestRemoteAppChecker.java
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.api.records.ApplicationReport;
+-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
+-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationReportPBImpl;
+-import org.apache.hadoop.yarn.client.api.YarnClient;
+-import org.apache.hadoop.yarn.client.api.impl.YarnClientImpl;
+-import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
+-
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.mockito.Mockito.doReturn;
+-import static org.mockito.Mockito.doThrow;
+-import static org.mockito.Mockito.spy;
+-
+-public class TestRemoteAppChecker {
+-
+-  private RemoteAppChecker checker;
+-
+-  @AfterEach
+-  public void cleanup() {
+-    if (checker != null) {
+-      checker.stop();
+-    }
+-  }
+-
+-  /**
+-   * Creates/initializes/starts a RemoteAppChecker with a spied
+-   * DummyYarnClientImpl.
+-   * 
+-   * @return the spied DummyYarnClientImpl in the created AppChecker
+-   */
+-  private YarnClient createCheckerWithMockedClient() {
+-    YarnClient client = spy(new DummyYarnClientImpl());
+-    checker = new RemoteAppChecker(client);
+-    checker.init(new Configuration());
+-    checker.start();
+-    return client;
+-  }
+-
+-  @Test
+-  void testNonExistentApp() throws Exception {
+-    YarnClient client = createCheckerWithMockedClient();
+-    ApplicationId id = ApplicationId.newInstance(1, 1);
+-
+-    // test for null
+-    doReturn(null).when(client).getApplicationReport(id);
+-    assertFalse(checker.isApplicationActive(id));
+-
+-    // test for ApplicationNotFoundException
+-    doThrow(new ApplicationNotFoundException("Throw!")).when(client)
+-        .getApplicationReport(id);
+-    assertFalse(checker.isApplicationActive(id));
+-  }
+-
+-  @Test
+-  void testRunningApp() throws Exception {
+-    YarnClient client = createCheckerWithMockedClient();
+-    ApplicationId id = ApplicationId.newInstance(1, 1);
+-
+-    // create a report and set the state to an active one
+-    ApplicationReport report = new ApplicationReportPBImpl();
+-    report.setYarnApplicationState(YarnApplicationState.ACCEPTED);
+-    doReturn(report).when(client).getApplicationReport(id);
+-
+-    assertTrue(checker.isApplicationActive(id));
+-  }
+-
+-  class DummyYarnClientImpl extends YarnClientImpl {
+-    @Override
+-    protected void serviceInit(Configuration conf) throws Exception {
+-      // do nothing
+-    }
+-
+-    @Override
+-    protected void serviceStart() {
+-      // do nothing
+-    }
+-
+-    @Override
+-    protected void serviceStop() {
+-      // do nothing
+-    }
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java
+deleted file mode 100644
+index 9c55452a7f7..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSCMAdminProtocolService.java
++++ /dev/null
+@@ -1,136 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.RPC;
+-import org.apache.hadoop.yarn.client.SCMAdmin;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.api.SCMAdminProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskRequest;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.RunSharedCacheCleanerTaskResponse;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.impl.pb.RunSharedCacheCleanerTaskResponsePBImpl;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.InMemorySCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.mockito.ArgumentMatchers.any;
+-import static org.mockito.ArgumentMatchers.isA;
+-import static org.mockito.Mockito.doNothing;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.spy;
+-import static org.mockito.Mockito.times;
+-import static org.mockito.Mockito.verify;
+-import static org.mockito.Mockito.when;
+-
+-/**
+- * Basic unit tests for the SCM Admin Protocol Service and SCMAdmin.
+- */
+-public class TestSCMAdminProtocolService {
+-
+-  static SCMAdminProtocolService service;
+-  static SCMAdminProtocol SCMAdminProxy;
+-  static SCMAdminProtocol mockAdmin;
+-  static SCMAdmin adminCLI;
+-  static SCMStore store;
+-  static CleanerService cleaner;
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  @BeforeEach
+-  public void startUp() {
+-    Configuration conf = new Configuration();
+-    conf.set(YarnConfiguration.SCM_STORE_CLASS,
+-        InMemorySCMStore.class.getName());
+-
+-    cleaner = mock(CleanerService.class);
+-
+-    service = spy(new SCMAdminProtocolService(cleaner));
+-    service.init(conf);
+-    service.start();
+-
+-    YarnRPC rpc = YarnRPC.create(new Configuration());
+-
+-    InetSocketAddress scmAddress =
+-        conf.getSocketAddr(YarnConfiguration.SCM_ADMIN_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_ADMIN_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_ADMIN_PORT);
+-
+-    SCMAdminProxy =
+-        (SCMAdminProtocol) rpc.getProxy(SCMAdminProtocol.class, scmAddress,
+-            conf);
+-
+-    mockAdmin = mock(SCMAdminProtocol.class);
+-    adminCLI = new SCMAdmin(new Configuration()) {
+-      @Override
+-      protected SCMAdminProtocol createSCMAdminProtocol() throws IOException {
+-        return mockAdmin;
+-      }
+-    };
+-  }
+-
+-  @AfterEach
+-  public void cleanUpTest() {
+-    if (service != null) {
+-      service.stop();
+-    }
+-
+-    if (SCMAdminProxy != null) {
+-      RPC.stopProxy(SCMAdminProxy);
+-    }
+-  }
+-
+-  @Test
+-  void testRunCleanerTask() throws Exception {
+-    doNothing().when(cleaner).runCleanerTask();
+-    RunSharedCacheCleanerTaskRequest request =
+-        recordFactory.newRecordInstance(RunSharedCacheCleanerTaskRequest.class);
+-    RunSharedCacheCleanerTaskResponse response = SCMAdminProxy.runCleanerTask(request);
+-    assertTrue(response.getAccepted(), "cleaner task request isn't accepted");
+-    verify(service, times(1)).runCleanerTask(any(RunSharedCacheCleanerTaskRequest.class));
+-  }
+-
+-  @Test
+-  void testRunCleanerTaskCLI() throws Exception {
+-    String[] args = {"-runCleanerTask"};
+-    RunSharedCacheCleanerTaskResponse rp =
+-        new RunSharedCacheCleanerTaskResponsePBImpl();
+-    rp.setAccepted(true);
+-    when(mockAdmin.runCleanerTask(isA(RunSharedCacheCleanerTaskRequest.class)))
+-        .thenReturn(rp);
+-    assertEquals(0, adminCLI.run(args));
+-    rp.setAccepted(false);
+-    when(mockAdmin.runCleanerTask(isA(RunSharedCacheCleanerTaskRequest.class)))
+-        .thenReturn(rp);
+-    assertEquals(1, adminCLI.run(args));
+-    verify(mockAdmin, times(2)).runCleanerTask(
+-        any(RunSharedCacheCleanerTaskRequest.class));
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSharedCacheUploaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSharedCacheUploaderService.java
+deleted file mode 100644
+index 38833680f69..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/TestSharedCacheUploaderService.java
++++ /dev/null
+@@ -1,192 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager;
+-
+-import java.io.File;
+-import java.io.IOException;
+-import java.net.InetSocketAddress;
+-import java.util.Collection;
+-
+-import org.junit.jupiter.api.AfterAll;
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeAll;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.ipc.RPC;
+-import org.apache.hadoop.yarn.conf.YarnConfiguration;
+-import org.apache.hadoop.yarn.factories.RecordFactory;
+-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+-import org.apache.hadoop.yarn.ipc.YarnRPC;
+-import org.apache.hadoop.yarn.server.api.SCMUploaderProtocol;
+-import org.apache.hadoop.yarn.server.api.protocolrecords.SCMUploaderNotifyRequest;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.metrics.SharedCacheUploaderMetrics;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.InMemorySCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SCMStore;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.store.SharedCacheResourceReference;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertNotNull;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.mockito.Mockito.spy;
+-
+-
+-/**
+- * Basic unit tests for the NodeManger to SCM Protocol Service.
+- */
+-public class TestSharedCacheUploaderService {
+-  private static File testDir = null;
+-
+-  @BeforeAll
+-  public static void setupTestDirs() throws IOException {
+-    testDir = new File("target",
+-        TestSharedCacheUploaderService.class.getCanonicalName());
+-    testDir.delete();
+-    testDir.mkdirs();
+-    testDir = testDir.getAbsoluteFile();
+-  }
+-
+-  @AfterAll
+-  public static void cleanupTestDirs() throws IOException {
+-    if (testDir != null) {
+-      testDir.delete();
+-    }
+-  }
+-
+-  private SharedCacheUploaderService service;
+-  private SCMUploaderProtocol proxy;
+-  private SCMStore store;
+-  private final RecordFactory recordFactory = RecordFactoryProvider
+-      .getRecordFactory(null);
+-
+-  @BeforeEach
+-  public void startUp() {
+-    Configuration conf = new Configuration();
+-    conf.set(YarnConfiguration.SCM_STORE_CLASS,
+-        InMemorySCMStore.class.getName());
+-    conf.set(YarnConfiguration.SHARED_CACHE_ROOT, testDir.getPath());
+-    AppChecker appChecker = spy(new DummyAppChecker());
+-    store = new InMemorySCMStore(appChecker);
+-    store.init(conf);
+-    store.start();
+-
+-    service = new SharedCacheUploaderService(store);
+-    service.init(conf);
+-    service.start();
+-
+-    YarnRPC rpc = YarnRPC.create(new Configuration());
+-
+-    InetSocketAddress scmAddress =
+-        conf.getSocketAddr(YarnConfiguration.SCM_UPLOADER_SERVER_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_UPLOADER_SERVER_ADDRESS,
+-            YarnConfiguration.DEFAULT_SCM_UPLOADER_SERVER_PORT);
+-
+-    proxy =
+-        (SCMUploaderProtocol) rpc.getProxy(
+-            SCMUploaderProtocol.class, scmAddress, conf);
+-  }
+-
+-  @AfterEach
+-  public void cleanUp() {
+-    if (store != null) {
+-      store.stop();
+-    }
+-
+-    if (service != null) {
+-      service.stop();
+-    }
+-
+-    if (proxy != null) {
+-      RPC.stopProxy(proxy);
+-    }
+-  }
+-
+-  @Test
+-  void testNotify_noEntry() throws Exception {
+-    long accepted =
+-        SharedCacheUploaderMetrics.getInstance().getAcceptedUploads();
+-
+-    SCMUploaderNotifyRequest request =
+-        recordFactory.newRecordInstance(SCMUploaderNotifyRequest.class);
+-    request.setResourceKey("key1");
+-    request.setFilename("foo.jar");
+-    assertTrue(proxy.notify(request).getAccepted());
+-    Collection<SharedCacheResourceReference> set =
+-        store.getResourceReferences("key1");
+-    assertNotNull(set);
+-    assertEquals(0, set.size());
+-
+-    assertEquals(
+-        1,
+-        SharedCacheUploaderMetrics.getInstance().getAcceptedUploads() -
+-            accepted,
+-        "NM upload metrics aren't updated.");
+-
+-  }
+-
+-  @Test
+-  void testNotify_entryExists_differentName() throws Exception {
+-
+-    long rejected =
+-        SharedCacheUploaderMetrics.getInstance().getRejectUploads();
+-
+-    store.addResource("key1", "foo.jar");
+-    SCMUploaderNotifyRequest request =
+-        recordFactory.newRecordInstance(SCMUploaderNotifyRequest.class);
+-    request.setResourceKey("key1");
+-    request.setFilename("foobar.jar");
+-    assertFalse(proxy.notify(request).getAccepted());
+-    Collection<SharedCacheResourceReference> set =
+-        store.getResourceReferences("key1");
+-    assertNotNull(set);
+-    assertEquals(0, set.size());
+-    assertEquals(
+-        1,
+-        SharedCacheUploaderMetrics.getInstance().getRejectUploads() -
+-            rejected,
+-        "NM upload metrics aren't updated.");
+-
+-  }
+-
+-  @Test
+-  void testNotify_entryExists_sameName() throws Exception {
+-
+-    long accepted =
+-        SharedCacheUploaderMetrics.getInstance().getAcceptedUploads();
+-
+-    store.addResource("key1", "foo.jar");
+-    SCMUploaderNotifyRequest request =
+-        recordFactory.newRecordInstance(SCMUploaderNotifyRequest.class);
+-    request.setResourceKey("key1");
+-    request.setFilename("foo.jar");
+-    assertTrue(proxy.notify(request).getAccepted());
+-    Collection<SharedCacheResourceReference> set =
+-        store.getResourceReferences("key1");
+-    assertNotNull(set);
+-    assertEquals(0, set.size());
+-    assertEquals(
+-        1,
+-        SharedCacheUploaderMetrics.getInstance().getAcceptedUploads() -
+-            accepted,
+-        "NM upload metrics aren't updated.");
+-
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/TestCleanerMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/TestCleanerMetrics.java
+deleted file mode 100644
+index 6829d9a6347..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/metrics/TestCleanerMetrics.java
++++ /dev/null
+@@ -1,65 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.apache.hadoop.yarn.server.sharedcachemanager.metrics;
+-
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-
+-public class TestCleanerMetrics {
+-
+-  Configuration conf = new Configuration();
+-  CleanerMetrics cleanerMetrics;
+-
+-  @BeforeEach
+-  public void init() {
+-    cleanerMetrics = CleanerMetrics.getInstance();
+-  }
+-
+-  @Test
+-  void testMetricsOverMultiplePeriods() {
+-    simulateACleanerRun();
+-    assertMetrics(4, 4, 1, 1);
+-    simulateACleanerRun();
+-    assertMetrics(4, 8, 1, 2);
+-  }
+-
+-  public void simulateACleanerRun() {
+-    cleanerMetrics.reportCleaningStart();
+-    cleanerMetrics.reportAFileProcess();
+-    cleanerMetrics.reportAFileDelete();
+-    cleanerMetrics.reportAFileProcess();
+-    cleanerMetrics.reportAFileProcess();
+-  }
+-
+-  void assertMetrics(int proc, int totalProc, int del, int totalDel) {
+-    assertEquals(
+-        proc,
+-        cleanerMetrics.getProcessedFiles(),
+-        "Processed files in the last period are not measured correctly");
+-    assertEquals(totalProc, cleanerMetrics.getTotalProcessedFiles(),
+-        "Total processed files are not measured correctly");
+-    assertEquals(del, cleanerMetrics.getDeletedFiles(),
+-        "Deleted files in the last period are not measured correctly");
+-    assertEquals(totalDel, cleanerMetrics.getTotalDeletedFiles(),
+-        "Total deleted files are not measured correctly");
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStoreBaseTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStoreBaseTest.java
+deleted file mode 100644
+index 2374bf3fdbe..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/SCMStoreBaseTest.java
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.util.ReflectionUtils;
+-
+-/**
+- * All test classes that test an SCMStore implementation must extend this class.
+- */
+-public abstract class SCMStoreBaseTest {
+-
+-  /**
+-   * Get the SCMStore implementation class associated with this test class.
+-   */
+-  abstract Class<? extends SCMStore> getStoreClass();
+-
+-  @Test
+-  void TestZeroArgConstructor() throws Exception {
+-    // Test that the SCMStore implementation class is compatible with
+-    // ReflectionUtils#newInstance
+-    ReflectionUtils.newInstance(getStoreClass(), new Configuration());
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/TestInMemorySCMStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/TestInMemorySCMStore.java
+deleted file mode 100644
+index 5cb5332be41..00000000000
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-sharedcachemanager/src/test/java/org/apache/hadoop/yarn/server/sharedcachemanager/store/TestInMemorySCMStore.java
++++ /dev/null
+@@ -1,318 +0,0 @@
+-/**
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements.  See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership.  The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License.  You may obtain a copy of the License at
+- *
+- *     http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-
+-package org.apache.hadoop.yarn.server.sharedcachemanager.store;
+-
+-import java.util.ArrayList;
+-import java.util.Collection;
+-import java.util.Collections;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+-import java.util.Map;
+-import java.util.Set;
+-import java.util.concurrent.Callable;
+-import java.util.concurrent.CountDownLatch;
+-import java.util.concurrent.ExecutorService;
+-import java.util.concurrent.Future;
+-
+-import org.junit.jupiter.api.AfterEach;
+-import org.junit.jupiter.api.BeforeEach;
+-import org.junit.jupiter.api.Test;
+-
+-import org.apache.hadoop.conf.Configuration;
+-import org.apache.hadoop.fs.FileStatus;
+-import org.apache.hadoop.fs.FileSystem;
+-import org.apache.hadoop.util.concurrent.HadoopExecutors;
+-import org.apache.hadoop.yarn.api.records.ApplicationId;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.AppChecker;
+-import org.apache.hadoop.yarn.server.sharedcachemanager.DummyAppChecker;
+-
+-import static org.junit.jupiter.api.Assertions.assertEquals;
+-import static org.junit.jupiter.api.Assertions.assertFalse;
+-import static org.junit.jupiter.api.Assertions.assertNull;
+-import static org.junit.jupiter.api.Assertions.assertSame;
+-import static org.junit.jupiter.api.Assertions.assertTrue;
+-import static org.mockito.ArgumentMatchers.isA;
+-import static org.mockito.Mockito.doReturn;
+-import static org.mockito.Mockito.mock;
+-import static org.mockito.Mockito.spy;
+-
+-public class TestInMemorySCMStore extends SCMStoreBaseTest {
+-
+-  private InMemorySCMStore store;
+-  private AppChecker checker;
+-
+-  @Override
+-  Class<? extends SCMStore> getStoreClass() {
+-    return InMemorySCMStore.class;
+-  }
+-
+-  @BeforeEach
+-  public void setup() {
+-    this.checker = spy(new DummyAppChecker());
+-    this.store = spy(new InMemorySCMStore(checker));
+-  }
+-
+-  @AfterEach
+-  public void cleanup() {
+-    if (this.store != null) {
+-      this.store.stop();
+-    }
+-  }
+-
+-  private void startEmptyStore() throws Exception {
+-    doReturn(new ArrayList<ApplicationId>()).when(checker)
+-        .getActiveApplications();
+-    doReturn(new HashMap<String, String>()).when(store)
+-        .getInitialCachedResources(isA(FileSystem.class),
+-            isA(Configuration.class));
+-    this.store.init(new Configuration());
+-    this.store.start();
+-  }
+-
+-  private Map<String, String> startStoreWithResources() throws Exception {
+-    Map<String, String> initialCachedResources = new HashMap<String, String>();
+-    int count = 10;
+-    for (int i = 0; i < count; i++) {
+-      String key = String.valueOf(i);
+-      String fileName = key + ".jar";
+-      initialCachedResources.put(key, fileName);
+-    }
+-    doReturn(new ArrayList<ApplicationId>()).when(checker)
+-        .getActiveApplications();
+-    doReturn(initialCachedResources).when(store).getInitialCachedResources(
+-        isA(FileSystem.class), isA(Configuration.class));
+-    this.store.init(new Configuration());
+-    this.store.start();
+-    return initialCachedResources;
+-  }
+-
+-  private void startStoreWithApps() throws Exception {
+-    ArrayList<ApplicationId> list = new ArrayList<ApplicationId>();
+-    int count = 5;
+-    for (int i = 0; i < count; i++) {
+-      list.add(createAppId(i, i));
+-    }
+-    doReturn(list).when(checker).getActiveApplications();
+-    doReturn(new HashMap<String, String>()).when(store)
+-        .getInitialCachedResources(isA(FileSystem.class),
+-            isA(Configuration.class));
+-    this.store.init(new Configuration());
+-    this.store.start();
+-  }
+-
+-  @Test
+-  void testAddResourceConcurrency() throws Exception {
+-    startEmptyStore();
+-    final String key = "key1";
+-    int count = 5;
+-    ExecutorService exec = HadoopExecutors.newFixedThreadPool(count);
+-    List<Future<String>> futures = new ArrayList<Future<String>>(count);
+-    final CountDownLatch start = new CountDownLatch(1);
+-    for (int i = 0; i < count; i++) {
+-      final String fileName = "foo-" + i + ".jar";
+-      Callable<String> task = new Callable<String>() {
+-        public String call() throws Exception {
+-          start.await();
+-          String result = store.addResource(key, fileName);
+-          System.out.println("fileName: " + fileName + ", result: " + result);
+-          return result;
+-        }
+-      };
+-      futures.add(exec.submit(task));
+-    }
+-    // start them all at the same time
+-    start.countDown();
+-    // check the result; they should all agree with the value
+-    Set<String> results = new HashSet<String>();
+-    for (Future<String> future : futures) {
+-      results.add(future.get());
+-    }
+-    assertSame(1, results.size());
+-    exec.shutdown();
+-  }
+-
+-  @Test
+-  void testAddResourceRefNonExistentResource() throws Exception {
+-    startEmptyStore();
+-    String key = "key1";
+-    ApplicationId id = createAppId(1, 1L);
+-    // try adding an app id without adding the key first
+-    assertNull(store.addResourceReference(key,
+-        new SharedCacheResourceReference(id, "user")));
+-  }
+-
+-  @Test
+-  void testRemoveResourceEmptyRefs() throws Exception {
+-    startEmptyStore();
+-    String key = "key1";
+-    String fileName = "foo.jar";
+-    // first add resource
+-    store.addResource(key, fileName);
+-    // try removing the resource; it should return true
+-    assertTrue(store.removeResource(key));
+-  }
+-
+-  @Test
+-  void testAddResourceRefRemoveResource() throws Exception {
+-    startEmptyStore();
+-    String key = "key1";
+-    ApplicationId id = createAppId(1, 1L);
+-    String user = "user";
+-    // add the resource, and then add a resource ref
+-    store.addResource(key, "foo.jar");
+-    store.addResourceReference(key, new SharedCacheResourceReference(id, user));
+-    // removeResource should return false
+-    assertTrue(!store.removeResource(key));
+-    // the resource and the ref should be intact
+-    Collection<SharedCacheResourceReference> refs = store.getResourceReferences(key);
+-    assertTrue(refs != null);
+-    assertEquals(Collections.singleton(new SharedCacheResourceReference(id, user)), refs);
+-  }
+-
+-  @Test
+-  void testAddResourceRefConcurrency() throws Exception {
+-    startEmptyStore();
+-    final String key = "key1";
+-    final String user = "user";
+-    String fileName = "foo.jar";
+-
+-    // first add the resource
+-    store.addResource(key, fileName);
+-
+-    // make concurrent addResourceRef calls (clients)
+-    int count = 5;
+-    ExecutorService exec = HadoopExecutors.newFixedThreadPool(count);
+-    List<Future<String>> futures = new ArrayList<Future<String>>(count);
+-    final CountDownLatch start = new CountDownLatch(1);
+-    for (int i = 0; i < count; i++) {
+-      final ApplicationId id = createAppId(i, i);
+-      Callable<String> task = new Callable<String>() {
+-        public String call() throws Exception {
+-          start.await();
+-          return store.addResourceReference(key,
+-              new SharedCacheResourceReference(id, user));
+-        }
+-      };
+-      futures.add(exec.submit(task));
+-    }
+-    // start them all at the same time
+-    start.countDown();
+-    // check the result
+-    Set<String> results = new HashSet<String>();
+-    for (Future<String> future : futures) {
+-      results.add(future.get());
+-    }
+-    // they should all have the same file name
+-    assertSame(1, results.size());
+-    assertEquals(Collections.singleton(fileName), results);
+-    // there should be 5 refs as a result
+-    Collection<SharedCacheResourceReference> refs = store.getResourceReferences(key);
+-    assertSame(count, refs.size());
+-    exec.shutdown();
+-  }
+-
+-  @Test
+-  void testAddResourceRefAddResourceConcurrency() throws Exception {
+-    startEmptyStore();
+-    final String key = "key1";
+-    final String fileName = "foo.jar";
+-    final String user = "user";
+-    final ApplicationId id = createAppId(1, 1L);
+-    // add the resource and add the resource ref at the same time
+-    ExecutorService exec = HadoopExecutors.newFixedThreadPool(2);
+-    final CountDownLatch start = new CountDownLatch(1);
+-    Callable<String> addKeyTask = new Callable<String>() {
+-      public String call() throws Exception {
+-        start.await();
+-        return store.addResource(key, fileName);
+-      }
+-    };
+-    Callable<String> addAppIdTask = new Callable<String>() {
+-      public String call() throws Exception {
+-        start.await();
+-        return store.addResourceReference(key,
+-            new SharedCacheResourceReference(id, user));
+-      }
+-    };
+-    Future<String> addAppIdFuture = exec.submit(addAppIdTask);
+-    Future<String> addKeyFuture = exec.submit(addKeyTask);
+-    // start them at the same time
+-    start.countDown();
+-    // get the results
+-    String addKeyResult = addKeyFuture.get();
+-    String addAppIdResult = addAppIdFuture.get();
+-    assertEquals(fileName, addKeyResult);
+-    System.out.println("addAppId() result: " + addAppIdResult);
+-    // it may be null or the fileName depending on the timing
+-    assertTrue(addAppIdResult == null || addAppIdResult.equals(fileName));
+-    exec.shutdown();
+-  }
+-
+-  @Test
+-  void testRemoveRef() throws Exception {
+-    startEmptyStore();
+-    String key = "key1";
+-    String fileName = "foo.jar";
+-    String user = "user";
+-    // first add the resource
+-    store.addResource(key, fileName);
+-    // add a ref
+-    ApplicationId id = createAppId(1, 1L);
+-    SharedCacheResourceReference myRef = new SharedCacheResourceReference(id, user);
+-    String result = store.addResourceReference(key, myRef);
+-    assertEquals(fileName, result);
+-    Collection<SharedCacheResourceReference> refs = store.getResourceReferences(key);
+-    assertSame(1, refs.size());
+-    assertEquals(Collections.singleton(myRef), refs);
+-    // remove the same ref
+-    store.removeResourceReferences(key, Collections.singleton(myRef), true);
+-    Collection<SharedCacheResourceReference> newRefs = store.getResourceReferences(key);
+-    assertTrue(newRefs == null || newRefs.isEmpty());
+-  }
+-
+-  @Test
+-  void testBootstrapping() throws Exception {
+-    Map<String, String> initialCachedResources = startStoreWithResources();
+-    int count = initialCachedResources.size();
+-    ApplicationId id = createAppId(1, 1L);
+-    // the entries from the cached entries should now exist
+-    for (int i = 0; i < count; i++) {
+-      String key = String.valueOf(i);
+-      String fileName = key + ".jar";
+-      String result =
+-          store.addResourceReference(key, new SharedCacheResourceReference(id,
+-              "user"));
+-      // the value should not be null (i.e. it has the key) and the filename should match
+-      assertEquals(fileName, result);
+-      // the initial input should be emptied
+-      assertTrue(initialCachedResources.isEmpty());
+-    }
+-  }
+-
+-  @Test
+-  void testEvictableWithInitialApps() throws Exception {
+-    startStoreWithApps();
+-    assertFalse(store.isResourceEvictable("key", mock(FileStatus.class)));
+-  }
+-
+-  private ApplicationId createAppId(int id, long timestamp) {
+-    return ApplicationId.newInstance(timestamp, id);
+-  }
+-}
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index d6e27fafc36..d4702b11a57 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -38,7 +38,6 @@
+     <module>hadoop-yarn-server-nodemanager</module>
+     <module>hadoop-yarn-server-web-proxy</module>
+     <module>hadoop-yarn-server-resourcemanager</module>
+-    <module>hadoop-yarn-server-sharedcachemanager</module>
+     <module>hadoop-yarn-server-tests</module>
+     <module>hadoop-yarn-server-applicationhistoryservice</module>
+     <module>hadoop-yarn-server-timelineservice</module>
diff --git a/hadoop/stackable/patches/3.4.0/series b/hadoop/stackable/patches/3.4.0/series
new file mode 100644
index 000000000..38005038b
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.0/series
@@ -0,0 +1,31 @@
+# This series applies on Git commit bd8b77f398f626bb7791783192ee7a5dfaeec760
+01-remove-hadoop-archive-logs.patch
+02-remove-hadoop-archives.patch
+03-remove-hadoop-benchmark.patch
+04-remove-hadoop-datajoin.patch
+05-remove-hadoop-dynamometer.patch
+06-remove-hadoop-extras.patch
+07-remove-hadoop-gridmix.patch
+08-remove-hadoop-kafka.patch
+09-remove-hadoop-openstack.patch
+10-remove-hadoop-pipes.patch
+11-remove-hadoop-resourceestimator.patch
+12-remove-hadoop-sls.patch
+13-remove-hadoop-rumen.patch
+14-remove-hadoop-streaming.patch
+15-hadoop-yarn-csi.patch
+16-remove-hadoop-yarn-ui.patch
+17-remove-hadoop-yarn-registry.patch
+18-remove-hadoop-yarn-applications-catalog.patch
+19-remove-hadoop-yarn-applications-distributedshell.patch
+20-remove-hadoop-yarn-applications-mawo.patch
+21-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
+22-remove-hadoop-yarn-services.patch
+23-remove-hadoop-yarn-applications.patch
+24-remove-hadoop-yarn-server-router.patch
+25-remove-hadoop-yarn-server-globalpolicygenerator.patch
+26-remove-hadoop-yarn-server-timeline-pluginstorage.patch
+27-remove-hadoop-client-check-test-invariants.patch
+28-remove-hadoop-client-integration-tests.patch
+29-remove-hadoop-client-minicluster.patch
+30-remove-hadoop-yarn-server-sharedcachemanager.patch
diff --git a/hadoop/stackable/patches/3.4.0/001-YARN-11527-3.4.0.patch b/hadoop/stackable/patches/old3.4.0/001-YARN-11527-3.4.0.patch
similarity index 100%
rename from hadoop/stackable/patches/3.4.0/001-YARN-11527-3.4.0.patch
rename to hadoop/stackable/patches/old3.4.0/001-YARN-11527-3.4.0.patch
diff --git a/hadoop/stackable/patches/3.4.0/002-datanode-registration-override-3.4.0.patch b/hadoop/stackable/patches/old3.4.0/002-datanode-registration-override-3.4.0.patch
similarity index 100%
rename from hadoop/stackable/patches/3.4.0/002-datanode-registration-override-3.4.0.patch
rename to hadoop/stackable/patches/old3.4.0/002-datanode-registration-override-3.4.0.patch
diff --git a/hadoop/stackable/patches/3.4.0/003-add-perf-event-itimer-3.4.0.patch b/hadoop/stackable/patches/old3.4.0/003-add-perf-event-itimer-3.4.0.patch
similarity index 100%
rename from hadoop/stackable/patches/3.4.0/003-add-perf-event-itimer-3.4.0.patch
rename to hadoop/stackable/patches/old3.4.0/003-add-perf-event-itimer-3.4.0.patch
diff --git a/hadoop/stackable/patches/3.4.0/004-HDFS-17378-3.4.0.patch b/hadoop/stackable/patches/old3.4.0/004-HDFS-17378-3.4.0.patch
similarity index 100%
rename from hadoop/stackable/patches/3.4.0/004-HDFS-17378-3.4.0.patch
rename to hadoop/stackable/patches/old3.4.0/004-HDFS-17378-3.4.0.patch

From 96138a2ca9e129a0ea47d5be7e3a03471a7a4fcf Mon Sep 17 00:00:00 2001
From: Lars Francke <git@lars-francke.de>
Date: Mon, 15 Jul 2024 10:03:18 +0200
Subject: [PATCH 2/4] WIP

---
 java-devel/Dockerfile     |  2 ++
 renovate.json             | 16 ++++++++++++++++
 stackable-base/Dockerfile |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
index e5e90dcc8..4b02348a6 100644
--- a/java-devel/Dockerfile
+++ b/java-devel/Dockerfile
@@ -53,3 +53,5 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
 # This variable is supported as of Log4j version 2.10 and
 # disables the vulnerable feature
 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
+
+COPY --chown=stackable:stackable shared/maven/settings.xml /stackable/.m2/
diff --git a/renovate.json b/renovate.json
index 994b3f019..c0db8f9cc 100644
--- a/renovate.json
+++ b/renovate.json
@@ -3,5 +3,21 @@
   "extends": [
     "local>stackabletech/.github:renovate-config",
     "docker:pinDigests"
+  ],
+  "packageRules": [
+    {
+      "matchDatasources": [
+        "docker"
+      ],
+      "registryUrls": [
+        "https://registry.access.redhat.com"
+      ],
+      "packagePatterns": [
+        "^ubi9/ubi-minimal$"
+      ],
+      "updateTypes": [
+        "version"
+      ]
+    }
   ]
 }
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index ea8ea9bc0..70d611314 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -135,3 +135,5 @@ LABEL org.opencontainers.image.url="https://stackable.tech"
 LABEL org.opencontainers.image.source="https://github.com/stackabletech/docker-images/"
 LABEL org.opencontainers.image.vendor="Stackable GmbH"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
+
+COPY --chown=stackable:stackable shared/npm/.npmrc /stackable/.npmrc

From 651c0583ad9aebd4af20f31a4443ecae81c19590 Mon Sep 17 00:00:00 2001
From: Lars Francke <git@lars-francke.de>
Date: Mon, 2 Sep 2024 11:15:23 +0200
Subject: [PATCH 3/4] remove temp stuff

---
 java-devel/Dockerfile     | 2 +-
 stackable-base/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
index 4b02348a6..20f1213b4 100644
--- a/java-devel/Dockerfile
+++ b/java-devel/Dockerfile
@@ -54,4 +54,4 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
 # disables the vulnerable feature
 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
 
-COPY --chown=stackable:stackable shared/maven/settings.xml /stackable/.m2/
+# COPY --chown=stackable:stackable shared/maven/settings.xml /stackable/.m2/
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 70d611314..ab1b3fa51 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -136,4 +136,4 @@ LABEL org.opencontainers.image.source="https://github.com/stackabletech/docker-i
 LABEL org.opencontainers.image.vendor="Stackable GmbH"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
-COPY --chown=stackable:stackable shared/npm/.npmrc /stackable/.npmrc
+# COPY --chown=stackable:stackable shared/npm/.npmrc /stackable/.npmrc

From 18594080054f874fcf5cb945a98ca39612b81768 Mon Sep 17 00:00:00 2001
From: dervoeti <lukas.voetmand@stackable.tech>
Date: Mon, 4 Nov 2024 17:44:36 +0100
Subject: [PATCH 4/4] wip: some patchfiles for hadoop 3.4.1

---
 .../3.4.1/001-patch-cyclonedx-plugin.patch    |  35 +++
 .../3.4.1/002-update-dependencies.patch       | 213 ++++++++++++++++++
 .../003-remove-hadoop-archive-logs.patch      |  89 ++++++++
 .../3.4.1/004-remove-hadoop-archives.patch    |  89 ++++++++
 .../3.4.1/005-remove-hadoop-benchmark.patch   |  12 +
 .../3.4.1/006-remove-hadoop-datajoin.patch    |  62 +++++
 .../3.4.1/007-remove-hadoop-dynamometer.patch |  36 +++
 .../3.4.1/008-remove-hadoop-extras.patch      |  77 +++++++
 .../3.4.1/009-remove-hadoop-gridmix.patch     |  82 +++++++
 .../3.4.1/010-remove-hadoop-kafka.patch       |  29 +++
 .../3.4.1/011-remove-hadoop-openstack.patch   |  30 +++
 .../3.4.1/012-remove-hadoop-pipes.patch       |  78 +++++++
 .../013-remove-hadoop-resourceestimator.patch |  41 ++++
 .../patches/3.4.1/014-remove-hadoop-sls.patch |  78 +++++++
 .../3.4.1/015-remove-hadoop-rumen.patch       |  82 +++++++
 .../3.4.1/016-remove-hadoop-streaming.patch   |  88 ++++++++
 .../3.4.1/017-remove-hadoop-yarn-csi.patch    |  44 ++++
 .../3.4.1/018-remove-hadoop-yarn-ui.patch     |  30 +++
 .../019-remove-hadoop-yarn-registry.patch     |  12 +
 ...ove-hadoop-yarn-applications-catalog.patch |  46 ++++
 ...p-yarn-applications-distributedshell.patch |  47 ++++
 ...remove-hadoop-yarn-applications-mawo.patch |  12 +
 ...n-applications-unmanaged-am-launcher.patch |  30 +++
 .../024-remove-hadoop-yarn-applications.patch |  12 +
 .../025-remove-hadoop-yarn-services.patch     |  96 ++++++++
 ...026-remove-hadoop-yarn-server-router.patch |  44 ++++
 ...op-yarn-server-globalpolicygenerator.patch |  43 ++++
 ...p-yarn-server-timeline-pluginstorage.patch |  36 +++
 ...-hadoop-client-check-test-invariants.patch |  46 ++++
 ...move-hadoop-client-integration-tests.patch |  46 ++++
 ...031-remove-hadoop-client-minicluster.patch |  41 ++++
 ...adoop-yarn-server-sharedcachemanager.patch |  12 +
 32 files changed, 1718 insertions(+)
 create mode 100644 hadoop/stackable/patches/3.4.1/001-patch-cyclonedx-plugin.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/002-update-dependencies.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/003-remove-hadoop-archive-logs.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/004-remove-hadoop-archives.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/005-remove-hadoop-benchmark.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/006-remove-hadoop-datajoin.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/007-remove-hadoop-dynamometer.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/008-remove-hadoop-extras.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/009-remove-hadoop-gridmix.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/010-remove-hadoop-kafka.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/011-remove-hadoop-openstack.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/012-remove-hadoop-pipes.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/013-remove-hadoop-resourceestimator.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/014-remove-hadoop-sls.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/015-remove-hadoop-rumen.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/016-remove-hadoop-streaming.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/017-remove-hadoop-yarn-csi.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/018-remove-hadoop-yarn-ui.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/019-remove-hadoop-yarn-registry.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/020-remove-hadoop-yarn-applications-catalog.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/021-remove-hadoop-yarn-applications-distributedshell.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/022-remove-hadoop-yarn-applications-mawo.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/023-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/024-remove-hadoop-yarn-applications.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/025-remove-hadoop-yarn-services.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/026-remove-hadoop-yarn-server-router.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/027-remove-hadoop-yarn-server-globalpolicygenerator.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/028-remove-hadoop-yarn-server-timeline-pluginstorage.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/029-remove-hadoop-client-check-test-invariants.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/030-remove-hadoop-client-integration-tests.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/031-remove-hadoop-client-minicluster.patch
 create mode 100644 hadoop/stackable/patches/3.4.1/032-remove-hadoop-yarn-server-sharedcachemanager.patch

diff --git a/hadoop/stackable/patches/3.4.1/001-patch-cyclonedx-plugin.patch b/hadoop/stackable/patches/3.4.1/001-patch-cyclonedx-plugin.patch
new file mode 100644
index 000000000..8cb849d78
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/001-patch-cyclonedx-plugin.patch
@@ -0,0 +1,35 @@
+diff --git a/pom.xml b/pom.xml
+index 16a3733..c309dc6 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -118,7 +118,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
+     <spotbugs-maven-plugin.version>4.2.0</spotbugs-maven-plugin.version>
+     <jsonschema2pojo-maven-plugin.version>1.1.1</jsonschema2pojo-maven-plugin.version>
+     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+-    <cyclonedx.version>2.7.10</cyclonedx.version>
++    <cyclonedx.version>2.8.0</cyclonedx.version>
+ 
+     <shell-executable>bash</shell-executable>
+ 
+@@ -770,6 +770,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
+             <groupId>org.cyclonedx</groupId>
+             <artifactId>cyclonedx-maven-plugin</artifactId>
+             <version>${cyclonedx.version}</version>
++            <configuration>
++              <projectType>application</projectType>
++              <schemaVersion>1.5</schemaVersion>
++              <skipNotDeployed>false</skipNotDeployed>
++            </configuration>
+             <executions>
+               <execution>
+                 <phase>package</phase>
+@@ -778,9 +783,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
+                 </goals>
+               </execution>
+             </executions>
+-            <configuration>
+-              <outputFormat>xml</outputFormat>
+-            </configuration>
+           </plugin>
+         </plugins>
+       </build>
diff --git a/hadoop/stackable/patches/3.4.1/002-update-dependencies.patch b/hadoop/stackable/patches/3.4.1/002-update-dependencies.patch
new file mode 100644
index 000000000..a60b62dd0
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/002-update-dependencies.patch
@@ -0,0 +1,213 @@
+diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
+index b2d2a8d100..97e281ba85 100644
+--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
++++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java
+@@ -33,7 +33,7 @@ public class TestAvroSerialization {
+   @Test
+   public void testSpecific() throws Exception {
+     AvroRecord before = new AvroRecord();
+-    before.intField = 5;
++    before.setIntField(5);
+     AvroRecord after = SerializationTestUtil.testSerialization(conf, before);
+     assertEquals(before, after);
+   }
+diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java
+index 66f3781239..aa70bbff62 100644
+--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java
++++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java
+@@ -31,8 +31,8 @@ public class JobQueueChangeEvent implements HistoryEvent {
+   private JobQueueChange datum = new JobQueueChange();
+   
+   public JobQueueChangeEvent(JobID id, String queueName) {
+-    datum.jobid = new Utf8(id.toString());
+-    datum.jobQueueName = new Utf8(queueName);
++    datum.setJobid(new Utf8(id.toString()));
++    datum.setJobQueueName(new Utf8(queueName));
+   }
+   
+   JobQueueChangeEvent() { }
+@@ -54,13 +54,13 @@ public class JobQueueChangeEvent implements HistoryEvent {
+   
+   /** Get the Job ID */
+   public JobID getJobId() {
+-    return JobID.forName(datum.jobid.toString());
++    return JobID.forName(datum.getJobid().toString());
+   }
+   
+   /** Get the new Job queue name */
+   public String getJobQueueName() {
+-    if (datum.jobQueueName != null) {
+-      return datum.jobQueueName.toString();
++    if (datum.getJobQueueName() != null) {
++      return datum.getJobQueueName().toString();
+     }
+     return null;
+   }
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index bcba56eced..2d52e3ebb1 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -37,7 +37,7 @@
+     <!--Whether to proceed to next module if any test failures exist-->
+     <maven.test.failure.ignore>true</maven.test.failure.ignore>
+     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+-    <jetty.version>9.4.53.v20231009</jetty.version>
++    <jetty.version>9.4.56.v20240826</jetty.version>
+     <test.exclude>_</test.exclude>
+     <test.exclude.pattern>_</test.exclude.pattern>
+ 
+@@ -63,7 +63,7 @@
+     <java.security.egd>file:///dev/urandom</java.security.egd>
+ 
+     <!-- avro version -->
+-    <avro.version>1.9.2</avro.version>
++    <avro.version>1.11.4</avro.version>
+ 
+     <!-- jersey version -->
+     <jersey.version>1.19.4</jersey.version>
+@@ -108,7 +108,7 @@
+     <findbugs.version>3.0.5</findbugs.version>
+     <dnsjava.version>3.6.1</dnsjava.version>
+ 
+-    <guava.version>27.0-jre</guava.version>
++    <guava.version>32.0.1-jre</guava.version>
+     <guice.version>4.2.3</guice.version>
+ 
+     <bouncycastle.version>1.78.1</bouncycastle.version>
+@@ -143,7 +143,7 @@
+     <jna.version>5.2.0</jna.version>
+     <gson.version>2.9.0</gson.version>
+     <metrics.version>3.2.4</metrics.version>
+-    <netty4.version>4.1.100.Final</netty4.version>
++    <netty4.version>4.1.108.Final</netty4.version>
+     <snappy-java.version>1.1.10.4</snappy-java.version>
+     <lz4-java.version>1.7.1</lz4-java.version>
+ 
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
+index 1213e6a46f..603b248f6e 100644
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
++++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java
+@@ -460,7 +460,7 @@ public class JobBuilder {
+     }
+     task.setFinishTime(event.getFinishTime());
+     task.setTaskStatus(getPre21Value(event.getTaskStatus()));
+-    task.incorporateCounters(((TaskFinished) event.getDatum()).counters);
++    task.incorporateCounters(((TaskFinished) event.getDatum()).getCounters());
+   }
+ 
+   private void processTaskFailedEvent(TaskFailedEvent event) {
+@@ -472,7 +472,7 @@ public class JobBuilder {
+     task.setFinishTime(event.getFinishTime());
+     task.setTaskStatus(getPre21Value(event.getTaskStatus()));
+     TaskFailed t = (TaskFailed)(event.getDatum());
+-    task.putDiagnosticInfo(t.error.toString());
++    task.putDiagnosticInfo(t.getError().toString());
+     // killed task wouldn't have failed attempt.
+     if (t.getFailedDueToAttempt() != null) {
+       task.putFailedDueToAttemptId(t.getFailedDueToAttempt().toString());
+@@ -542,7 +542,7 @@ public class JobBuilder {
+     }
+     attempt.setFinishTime(event.getFinishTime());
+     attempt
+-        .incorporateCounters(((TaskAttemptFinished) event.getDatum()).counters);
++        .incorporateCounters(((TaskAttemptFinished) event.getDatum()).getCounters());
+   }
+ 
+   private void processReduceAttemptFinishedEvent(
+@@ -568,7 +568,7 @@ public class JobBuilder {
+     attempt.setShuffleFinished(event.getShuffleFinishTime());
+     attempt.setSortFinished(event.getSortFinishTime());
+     attempt
+-        .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).counters);
++        .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).getCounters());
+     attempt.arraySetClockSplits(event.getClockSplits());
+     attempt.arraySetCpuUsages(event.getCpuUsages());
+     attempt.arraySetVMemKbytes(event.getVMemKbytes());
+@@ -596,7 +596,7 @@ public class JobBuilder {
+     // is redundant, but making this will add future-proofing.
+     attempt.setFinishTime(event.getFinishTime());
+     attempt
+-      .incorporateCounters(((MapAttemptFinished) event.getDatum()).counters);
++      .incorporateCounters(((MapAttemptFinished) event.getDatum()).getCounters());
+     attempt.arraySetClockSplits(event.getClockSplits());
+     attempt.arraySetCpuUsages(event.getCpuUsages());
+     attempt.arraySetVMemKbytes(event.getVMemKbytes());
+@@ -661,11 +661,11 @@ public class JobBuilder {
+ 
+     JobFinished job = (JobFinished)event.getDatum();
+     Map<String, Long> countersMap =
+-        JobHistoryUtils.extractCounters(job.totalCounters);
++        JobHistoryUtils.extractCounters(job.getTotalCounters());
+     result.putTotalCounters(countersMap);
+-    countersMap = JobHistoryUtils.extractCounters(job.mapCounters);
++    countersMap = JobHistoryUtils.extractCounters(job.getMapCounters());
+     result.putMapCounters(countersMap);
+-    countersMap = JobHistoryUtils.extractCounters(job.reduceCounters);
++    countersMap = JobHistoryUtils.extractCounters(job.getReduceCounters());
+     result.putReduceCounters(countersMap);
+   }
+ 
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
+index 6ae87bbd40..34ef95f337 100644
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
++++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java
+@@ -157,9 +157,9 @@ public class JobHistoryUtils {
+   static Map<String, Long> extractCounters(JhCounters counters) {
+     Map<String, Long> countersMap = new HashMap<String, Long>();
+     if (counters != null) {
+-      for (JhCounterGroup group : counters.groups) {
+-        for (JhCounter counter : group.counts) {
+-          countersMap.put(counter.name.toString(), counter.value);
++      for (JhCounterGroup group : counters.getGroups()) {
++        for (JhCounter counter : group.getCounts()) {
++          countersMap.put(counter.getName().toString(), counter.getValue());
+         }
+       }
+     }
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
+index 4ae33a7661..2308e58690 100644
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
++++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java
+@@ -268,11 +268,11 @@ public class LoggedTask implements DeepCompare {
+       String counterName) {
+     counterName = canonicalizeCounterName(counterName);
+ 
+-    for (JhCounterGroup group : counters.groups) {
+-      for (JhCounter counter : group.counts) {
++    for (JhCounterGroup group : counters.getGroups()) {
++      for (JhCounter counter : group.getCounts()) {
+         if (counterName
+-            .equals(canonicalizeCounterName(counter.name.toString()))) {
+-          thunk.set(counter.value);
++            .equals(canonicalizeCounterName(counter.getName().toString()))) {
++          thunk.set(counter.getValue());
+           return;
+         }
+       }
+diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
+index 5c6abd372c..fae53b2926 100644
+--- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
++++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
+@@ -636,11 +636,11 @@ public class LoggedTaskAttempt implements DeepCompare {
+       String counterName) {
+     counterName = canonicalizeCounterName(counterName);
+ 
+-    for (JhCounterGroup group : counters.groups) {
+-      for (JhCounter counter : group.counts) {
++    for (JhCounterGroup group : counters.getGroups()) {
++      for (JhCounter counter : group.getCounts()) {
+         if (counterName
+-            .equals(canonicalizeCounterName(counter.name.toString()))) {
+-          thunk.set(counter.value);
++            .equals(canonicalizeCounterName(counter.getName().toString()))) {
++          thunk.set(counter.getValue());
+           return;
+         }
+       }
+@@ -769,4 +769,4 @@ public class LoggedTaskAttempt implements DeepCompare {
+     compare1(vMemKbytes, other.vMemKbytes, loc, "vMemKbytes");
+     compare1(physMemKbytes, other.physMemKbytes, loc, "physMemKbytes");
+   }
+-}
+\ No newline at end of file
++}
diff --git a/hadoop/stackable/patches/3.4.1/003-remove-hadoop-archive-logs.patch b/hadoop/stackable/patches/3.4.1/003-remove-hadoop-archive-logs.patch
new file mode 100644
index 000000000..10bd977a3
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/003-remove-hadoop-archive-logs.patch
@@ -0,0 +1,89 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index c01d9c42820..ee9e9040ec8 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -23,14 +23,6 @@
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
+   <fileSets>
+-    <fileSet>
+-      <directory>../hadoop-archive-logs/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-archives/src/main/shellprofile.d</directory>
+       <includes>
+@@ -98,13 +90,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-archive-logs/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-datajoin/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 2d52e3ebb12..84a618f8ab6 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -646,11 +646,6 @@
+         <artifactId>hadoop-archives</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-archive-logs</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 8e85f379ef7..014df29226d 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -192,7 +192,6 @@
+     <menu name="Tools" inherit="top">
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="Hadoop Archives" href="hadoop-archives/HadoopArchives.html"/>
+-      <item name="Hadoop Archive Logs" href="hadoop-archive-logs/HadoopArchiveLogs.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index afd7d33b494..68a5b04a0b2 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-archives</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-archive-logs</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 1818c65e313..64927f70b6e 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-dynamometer</module>
+     <module>hadoop-archives</module>
+-    <module>hadoop-archive-logs</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-datajoin</module>
diff --git a/hadoop/stackable/patches/3.4.1/004-remove-hadoop-archives.patch b/hadoop/stackable/patches/3.4.1/004-remove-hadoop-archives.patch
new file mode 100644
index 000000000..8e58f031b
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/004-remove-hadoop-archives.patch
@@ -0,0 +1,89 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index ee9e9040ec8..67f1c9a4586 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -23,14 +23,6 @@
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
+   <fileSets>
+-    <fileSet>
+-      <directory>../hadoop-archives/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/src/main/shellprofile.d</directory>
+       <includes>
+@@ -83,13 +75,6 @@
+       </includes>
+       <outputDirectory>lib/native/examples</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-archives/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-datajoin/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 84a618f8ab6..a751b9dd84d 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -641,11 +641,6 @@
+         <artifactId>hadoop-streaming</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-archives</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 014df29226d..d4fe2c03160 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -191,7 +191,6 @@
+ 
+     <menu name="Tools" inherit="top">
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+-      <item name="Hadoop Archives" href="hadoop-archives/HadoopArchives.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 68a5b04a0b2..470afb1eaa6 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -55,11 +55,6 @@
+       <artifactId>hadoop-federation-balance</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-archives</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 64927f70b6e..6178bb15ecf 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -34,7 +34,6 @@
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-dynamometer</module>
+-    <module>hadoop-archives</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-datajoin</module>
diff --git a/hadoop/stackable/patches/3.4.1/005-remove-hadoop-benchmark.patch b/hadoop/stackable/patches/3.4.1/005-remove-hadoop-benchmark.patch
new file mode 100644
index 000000000..28c3616dc
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/005-remove-hadoop-benchmark.patch
@@ -0,0 +1,12 @@
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 6178bb15ecf..16b2adeda68 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -49,7 +49,6 @@
+     <module>hadoop-azure-datalake</module>
+     <module>hadoop-aliyun</module>
+     <module>hadoop-fs2img</module>
+-    <module>hadoop-benchmark</module>
+   </modules>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.1/006-remove-hadoop-datajoin.patch b/hadoop/stackable/patches/3.4.1/006-remove-hadoop-datajoin.patch
new file mode 100644
index 000000000..cf31a5ca3
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/006-remove-hadoop-datajoin.patch
@@ -0,0 +1,62 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 67f1c9a4586..9121e90cdbd 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -75,13 +75,6 @@
+       </includes>
+       <outputDirectory>lib/native/examples</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-datajoin/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index a751b9dd84d..acc94c6e50e 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -663,11 +663,6 @@
+         <version>${hadoop.version}</version>
+         <type>test-jar</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-datajoin</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-rumen</artifactId>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 470afb1eaa6..1c3afdfeb82 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-datajoin</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-extras</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 16b2adeda68..0f4b0954e1e 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-dynamometer</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+-    <module>hadoop-datajoin</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-extras</module>
+     <module>hadoop-pipes</module>
diff --git a/hadoop/stackable/patches/3.4.1/007-remove-hadoop-dynamometer.patch b/hadoop/stackable/patches/3.4.1/007-remove-hadoop-dynamometer.patch
new file mode 100644
index 000000000..b697b2f9d
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/007-remove-hadoop-dynamometer.patch
@@ -0,0 +1,36 @@
+diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
+index d4bfd8aaada..e769b26ff84 100755
+--- a/dev-support/bin/dist-layout-stitching
++++ b/dev-support/bin/dist-layout-stitching
+@@ -149,7 +149,6 @@ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-runtime/target/hadoop-cli
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/
+ 
+ run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
+-run copy "${ROOT}/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-dist/target/hadoop-dynamometer-dist-${VERSION}" .
+ 
+ 
+ echo
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index d4fe2c03160..4da6c2fdc20 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -198,7 +198,6 @@
+       <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+-      <item name="Dynamometer" href="hadoop-dynamometer/Dynamometer.html"/>
+     </menu>
+ 
+     <menu name="Reference" inherit="top">
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 0f4b0954e1e..01ef91f75f6 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -33,7 +33,6 @@
+     <module>hadoop-streaming</module>
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+-    <module>hadoop-dynamometer</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
diff --git a/hadoop/stackable/patches/3.4.1/008-remove-hadoop-extras.patch b/hadoop/stackable/patches/3.4.1/008-remove-hadoop-extras.patch
new file mode 100644
index 000000000..c96cebd62
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/008-remove-hadoop-extras.patch
@@ -0,0 +1,77 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 9121e90cdbd..5d59374cbf0 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -39,14 +39,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-extras/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-pipes/src/main/native/pipes/api/hadoop</directory>
+       <includes>
+@@ -89,13 +81,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-extras/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-gridmix/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index acc94c6e50e..ffe72c5ac49 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -668,11 +668,6 @@
+         <artifactId>hadoop-rumen</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-extras</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+ 
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 1c3afdfeb82..8abe0914853 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-extras</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-gridmix</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 01ef91f75f6..fdfccd6b274 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-extras</module>
+     <module>hadoop-pipes</module>
+     <module>hadoop-openstack</module>
+     <module>hadoop-sls</module>
diff --git a/hadoop/stackable/patches/3.4.1/009-remove-hadoop-gridmix.patch b/hadoop/stackable/patches/3.4.1/009-remove-hadoop-gridmix.patch
new file mode 100644
index 000000000..bce2eb334
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/009-remove-hadoop-gridmix.patch
@@ -0,0 +1,82 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 5d59374cbf0..f99ebc66e8a 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -81,21 +81,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-gridmix/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-gridmix/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-rumen/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index ffe72c5ac49..056b64c46a1 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -630,11 +630,6 @@
+         <artifactId>hadoop-mapreduce-examples</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-gridmix</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+ 
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 4da6c2fdc20..56b942953f2 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -193,7 +193,6 @@
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+-      <item name="GridMix" href="hadoop-gridmix/GridMix.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+       <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 8abe0914853..01301855fcc 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,11 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-gridmix</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-pipes</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index fdfccd6b274..ff98d837a7e 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -34,7 +34,6 @@
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+-    <module>hadoop-gridmix</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-pipes</module>
+     <module>hadoop-openstack</module>
diff --git a/hadoop/stackable/patches/3.4.1/010-remove-hadoop-kafka.patch b/hadoop/stackable/patches/3.4.1/010-remove-hadoop-kafka.patch
new file mode 100644
index 000000000..6b026a0e9
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/010-remove-hadoop-kafka.patch
@@ -0,0 +1,29 @@
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 01301855fcc..fd38216ef5a 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -73,12 +73,6 @@
+       <scope>compile</scope>
+       <version>${project.version}</version>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-kafka</artifactId>
+-      <scope>compile</scope>
+-      <version>${project.version}</version>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index ff98d837a7e..74fc141ddf7 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -41,7 +41,6 @@
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+-    <module>hadoop-kafka</module>
+     <module>hadoop-azure-datalake</module>
+     <module>hadoop-aliyun</module>
+     <module>hadoop-fs2img</module>
diff --git a/hadoop/stackable/patches/3.4.1/011-remove-hadoop-openstack.patch b/hadoop/stackable/patches/3.4.1/011-remove-hadoop-openstack.patch
new file mode 100644
index 000000000..a90ee9b26
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/011-remove-hadoop-openstack.patch
@@ -0,0 +1,30 @@
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 056b64c46a1..253208f1eeb 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -682,13 +682,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <!-- This is empty; retained only for downstream app build compatibility. -->
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-openstack</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-azure</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 74fc141ddf7..d0d152c3172 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-pipes</module>
+-    <module>hadoop-openstack</module>
+     <module>hadoop-sls</module>
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
diff --git a/hadoop/stackable/patches/3.4.1/012-remove-hadoop-pipes.patch b/hadoop/stackable/patches/3.4.1/012-remove-hadoop-pipes.patch
new file mode 100644
index 000000000..896520d32
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/012-remove-hadoop-pipes.patch
@@ -0,0 +1,78 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index f99ebc66e8a..76eb0568048 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -39,34 +39,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/src/main/native/pipes/api/hadoop</directory>
+-      <includes>
+-        <include>*.hh</include>
+-      </includes>
+-      <outputDirectory>/include</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/src/main/native/utils/api/hadoop</directory>
+-      <includes>
+-        <include>*.hh</include>
+-      </includes>
+-      <outputDirectory>/include</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/target/native</directory>
+-      <includes>
+-        <include>*.a</include>
+-      </includes>
+-      <outputDirectory>lib/native</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-pipes/target/native/examples</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>lib/native/examples</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-distcp/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+@@ -158,8 +130,6 @@
+         <exclude>org.apache.hadoop:hadoop-common</exclude>
+         <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
+         <exclude>org.apache.hadoop:hadoop-client</exclude>
+-        <!-- pipes is native stuff, this just keeps pom from being package-->
+-        <exclude>org.apache.hadoop:hadoop-pipes</exclude>
+         <!-- use slf4j from common to avoid multiple binding warnings -->
+         <exclude>org.slf4j:slf4j-api</exclude>
+         <exclude>org.slf4j:slf4j-reload4j</exclude>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index fd38216ef5a..a5dbad6cb7d 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -60,13 +60,6 @@
+       <artifactId>hadoop-rumen</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-pipes</artifactId>
+-      <scope>compile</scope>
+-      <type>pom</type>
+-      <version>${project.version}</version>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-aws</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index d0d152c3172..6ddcc96f82f 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-pipes</module>
+     <module>hadoop-sls</module>
+     <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
diff --git a/hadoop/stackable/patches/3.4.1/013-remove-hadoop-resourceestimator.patch b/hadoop/stackable/patches/3.4.1/013-remove-hadoop-resourceestimator.patch
new file mode 100644
index 000000000..37d3dfa1f
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/013-remove-hadoop-resourceestimator.patch
@@ -0,0 +1,41 @@
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 56b942953f2..45c1c19ea75 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -194,7 +194,6 @@
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+-      <item name="Resource Estimator Service" href="hadoop-resourceestimator/ResourceEstimator.html"/>
+       <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index a5dbad6cb7d..8781f0b9b42 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -83,12 +83,6 @@
+       <artifactId>hadoop-sls</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-resourceestimator</artifactId>
+-        <version>${project.version}</version>
+-        <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure-datalake</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 6ddcc96f82f..48920bab35b 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -36,7 +36,6 @@
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-sls</module>
+-    <module>hadoop-resourceestimator</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+     <module>hadoop-azure-datalake</module>
diff --git a/hadoop/stackable/patches/3.4.1/014-remove-hadoop-sls.patch b/hadoop/stackable/patches/3.4.1/014-remove-hadoop-sls.patch
new file mode 100644
index 000000000..378b827ff
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/014-remove-hadoop-sls.patch
@@ -0,0 +1,78 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 76eb0568048..411ae8d6251 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -83,17 +83,6 @@
+       <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+       <fileMode>0755</fileMode>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-sls/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-sls/target/hadoop-sls-${project.version}/sls</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sls</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-resourceestimator/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 253208f1eeb..4678ceba842 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -1507,11 +1507,6 @@
+         <artifactId>metrics-core</artifactId>
+         <version>${metrics.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-sls</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-cloud-storage</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 45c1c19ea75..d212938b2e5 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -194,7 +194,6 @@
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+-      <item name="Scheduler Load Simulator" href="hadoop-sls/SchedulerLoadSimulator.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+ 
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 8781f0b9b42..eae261ade7a 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -78,11 +78,6 @@
+       <scope>compile</scope>
+       <version>${project.version}</version>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-sls</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-azure-datalake</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 48920bab35b..9e520eb1125 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -35,7 +35,6 @@
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+-    <module>hadoop-sls</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
+     <module>hadoop-azure-datalake</module>
diff --git a/hadoop/stackable/patches/3.4.1/015-remove-hadoop-rumen.patch b/hadoop/stackable/patches/3.4.1/015-remove-hadoop-rumen.patch
new file mode 100644
index 000000000..b7c57ee46
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/015-remove-hadoop-rumen.patch
@@ -0,0 +1,82 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 411ae8d6251..89b474f9afc 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -53,21 +53,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-rumen/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-rumen/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-streaming/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 4678ceba842..31d6da673ae 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -658,11 +658,6 @@
+         <version>${hadoop.version}</version>
+         <type>test-jar</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-rumen</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+ 
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index d212938b2e5..8be5e704e86 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -193,7 +193,6 @@
+       <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+-      <item name="Rumen" href="hadoop-rumen/Rumen.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+     </menu>
+ 
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index eae261ade7a..35f9b0be70f 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -55,11 +55,6 @@
+       <artifactId>hadoop-federation-balance</artifactId>
+       <scope>compile</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-rumen</artifactId>
+-      <scope>compile</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-aws</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 9e520eb1125..5b3ebd13a42 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -33,7 +33,6 @@
+     <module>hadoop-streaming</module>
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+-    <module>hadoop-rumen</module>
+     <module>hadoop-tools-dist</module>
+     <module>hadoop-azure</module>
+     <module>hadoop-aws</module>
diff --git a/hadoop/stackable/patches/3.4.1/016-remove-hadoop-streaming.patch b/hadoop/stackable/patches/3.4.1/016-remove-hadoop-streaming.patch
new file mode 100644
index 000000000..8d494ad65
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/016-remove-hadoop-streaming.patch
@@ -0,0 +1,88 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+index 89b474f9afc..d5ff61d9ffd 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+@@ -53,21 +53,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-streaming/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>../hadoop-streaming/src/main/shellprofile.d</directory>
+-      <includes>
+-        <include>*</include>
+-      </includes>
+-      <outputDirectory>/libexec/shellprofile.d</outputDirectory>
+-      <fileMode>0755</fileMode>
+-    </fileSet>
+     <fileSet>
+       <directory>../hadoop-resourceestimator/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 31d6da673ae..3b6a3c97f9b 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -631,11 +631,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-streaming</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml
+index 8be5e704e86..10202de9d17 100644
+--- a/hadoop-project/src/site/site.xml
++++ b/hadoop-project/src/site/site.xml
+@@ -190,7 +190,6 @@
+     </menu>
+ 
+     <menu name="Tools" inherit="top">
+-      <item name="Hadoop Streaming" href="hadoop-streaming/HadoopStreaming.html"/>
+       <item name="DistCp" href="hadoop-distcp/DistCp.html"/>
+       <item name="HDFS Federation Balance" href="hadoop-federation-balance/HDFSFederationBalance.html"/>
+       <item name="Hadoop Benchmarking" href="hadoop-project-dist/hadoop-common/Benchmarking.html"/>
+diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml
+index 35f9b0be70f..04033969353 100644
+--- a/hadoop-tools/hadoop-tools-dist/pom.xml
++++ b/hadoop-tools/hadoop-tools-dist/pom.xml
+@@ -34,17 +34,6 @@
+   </properties>
+ 
+   <dependencies>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-streaming</artifactId>
+-      <scope>compile</scope>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>org.projectlombok</groupId>
+-          <artifactId>lombok</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-distcp</artifactId>
+diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml
+index 5b3ebd13a42..10fc262e242 100644
+--- a/hadoop-tools/pom.xml
++++ b/hadoop-tools/pom.xml
+@@ -30,7 +30,6 @@
+   <packaging>pom</packaging>
+ 
+   <modules>
+-    <module>hadoop-streaming</module>
+     <module>hadoop-distcp</module>
+     <module>hadoop-federation-balance</module>
+     <module>hadoop-tools-dist</module>
diff --git a/hadoop/stackable/patches/3.4.1/017-remove-hadoop-yarn-csi.patch b/hadoop/stackable/patches/3.4.1/017-remove-hadoop-yarn-csi.patch
new file mode 100644
index 000000000..9f0af106c
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/017-remove-hadoop-yarn-csi.patch
@@ -0,0 +1,44 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index cd86ce4e417..71031593c3c 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -220,10 +220,6 @@
+       <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/target/lib</directory>
+       <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/lib</outputDirectory>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-csi/target/lib</directory>
+-      <outputDirectory>share/hadoop/${hadoop.component}/csi/lib</outputDirectory>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/target/lib</directory>
+       <outputDirectory>share/hadoop/${hadoop.component}/timelineservice/lib</outputDirectory>
+@@ -266,16 +262,6 @@
+         <unpack>false</unpack>
+       </binaries>
+     </moduleSet>
+-    <moduleSet>
+-      <includes>
+-        <include>org.apache.hadoop:hadoop-yarn-csi</include>
+-      </includes>
+-      <binaries>
+-        <outputDirectory>share/hadoop/${hadoop.component}/csi</outputDirectory>
+-        <includeDependencies>false</includeDependencies>
+-        <unpack>false</unpack>
+-      </binaries>
+-    </moduleSet>
+     <moduleSet>
+       <excludes>
+         <exclude>org.apache.hadoop:hadoop-yarn-server-timelineservice*</exclude>
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index f1131576132..239afc8daf6 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -244,7 +244,6 @@
+     <module>hadoop-yarn-client</module>
+     <module>hadoop-yarn-registry</module>
+     <module>hadoop-yarn-ui</module>
+-    <module>hadoop-yarn-csi</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.1/018-remove-hadoop-yarn-ui.patch b/hadoop/stackable/patches/3.4.1/018-remove-hadoop-yarn-ui.patch
new file mode 100644
index 000000000..bb81f2cb4
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/018-remove-hadoop-yarn-ui.patch
@@ -0,0 +1,30 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 71031593c3c..9230f0c7a75 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -203,13 +203,6 @@
+     <fileSet>
+       <directory>${project.build.directory}/site</directory>
+       <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+-    </fileSet>
+-      <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-ui/target/hadoop-yarn-ui-${project.version}</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/webapps/ui2</outputDirectory>
+-      <includes>
+-        <include>**/*</include>
+-      </includes>
+     </fileSet>
+     <!-- Copy dependecies from hadoop-yarn-server-timelineservice as well -->
+     <fileSet>
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 239afc8daf6..40282e48a3b 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -243,7 +243,6 @@
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+     <module>hadoop-yarn-registry</module>
+-    <module>hadoop-yarn-ui</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.1/019-remove-hadoop-yarn-registry.patch b/hadoop/stackable/patches/3.4.1/019-remove-hadoop-yarn-registry.patch
new file mode 100644
index 000000000..4a92ebd83
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/019-remove-hadoop-yarn-registry.patch
@@ -0,0 +1,12 @@
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 40282e48a3b..21a01043990 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -242,7 +242,6 @@
+     <module>hadoop-yarn-applications</module>
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+-    <module>hadoop-yarn-registry</module>
+   </modules>
+   <!--  -->
+ </project>
diff --git a/hadoop/stackable/patches/3.4.1/020-remove-hadoop-yarn-applications-catalog.patch b/hadoop/stackable/patches/3.4.1/020-remove-hadoop-yarn-applications-catalog.patch
new file mode 100644
index 000000000..e5f12a816
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/020-remove-hadoop-yarn-applications-catalog.patch
@@ -0,0 +1,46 @@
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 3b6a3c97f9b..9dea7400edb 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -605,13 +605,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>war</type>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index 1e751a73d80..f453d0dadcf 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -37,7 +37,6 @@
+     <module>hadoop-yarn-applications-distributedshell</module>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+-    <module>hadoop-yarn-applications-catalog</module>
+     <module>hadoop-yarn-applications-mawo</module>
+   </modules>
+ 
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index 564c051137b..0a3f39e41bc 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -85,11 +85,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-services-core</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-applications-catalog-webapp</artifactId>
+-      <type>war</type>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.1/021-remove-hadoop-yarn-applications-distributedshell.patch b/hadoop/stackable/patches/3.4.1/021-remove-hadoop-yarn-applications-distributedshell.patch
new file mode 100644
index 000000000..110be4ef3
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/021-remove-hadoop-yarn-applications-distributedshell.patch
@@ -0,0 +1,47 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 9230f0c7a75..7b0bf7219cc 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -79,13 +79,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 9dea7400edb..cd9576b088f 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -555,12 +555,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index f453d0dadcf..b550bf83deb 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -34,7 +34,6 @@
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+   <modules>
+-    <module>hadoop-yarn-applications-distributedshell</module>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+     <module>hadoop-yarn-applications-mawo</module>
diff --git a/hadoop/stackable/patches/3.4.1/022-remove-hadoop-yarn-applications-mawo.patch b/hadoop/stackable/patches/3.4.1/022-remove-hadoop-yarn-applications-mawo.patch
new file mode 100644
index 000000000..a79dffc57
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/022-remove-hadoop-yarn-applications-mawo.patch
@@ -0,0 +1,12 @@
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index b550bf83deb..3933c52faad 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -36,7 +36,6 @@
+   <modules>
+     <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+-    <module>hadoop-yarn-applications-mawo</module>
+   </modules>
+ 
+  <profiles>
diff --git a/hadoop/stackable/patches/3.4.1/023-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch b/hadoop/stackable/patches/3.4.1/023-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
new file mode 100644
index 000000000..a3960c532
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/023-remove-hadoop-yarn-applications-unmanaged-am-launcher.patch
@@ -0,0 +1,30 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 7b0bf7219cc..3c9cf4642ba 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -104,13 +104,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-client/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index 3933c52faad..b1c38d02b86 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -34,7 +34,6 @@
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+   <modules>
+-    <module>hadoop-yarn-applications-unmanaged-am-launcher</module>
+     <module>hadoop-yarn-services</module>
+   </modules>
+ 
diff --git a/hadoop/stackable/patches/3.4.1/024-remove-hadoop-yarn-applications.patch b/hadoop/stackable/patches/3.4.1/024-remove-hadoop-yarn-applications.patch
new file mode 100644
index 000000000..53c7a2f56
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/024-remove-hadoop-yarn-applications.patch
@@ -0,0 +1,12 @@
+diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml
+index 21a01043990..fbc1bc3304c 100644
+--- a/hadoop-yarn-project/hadoop-yarn/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/pom.xml
+@@ -239,7 +239,6 @@
+     <module>hadoop-yarn-api</module>
+     <module>hadoop-yarn-common</module>
+     <module>hadoop-yarn-server</module>
+-    <module>hadoop-yarn-applications</module>
+     <module>hadoop-yarn-site</module>
+     <module>hadoop-yarn-client</module>
+   </modules>
diff --git a/hadoop/stackable/patches/3.4.1/025-remove-hadoop-yarn-services.patch b/hadoop/stackable/patches/3.4.1/025-remove-hadoop-yarn-services.patch
new file mode 100644
index 000000000..30172cc17
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/025-remove-hadoop-yarn-services.patch
@@ -0,0 +1,96 @@
+diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+index 3c9cf4642ba..5e5af377854 100644
+--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
++++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+@@ -79,31 +79,6 @@
+         <include>*-sources.jar</include>
+       </includes>
+     </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/conf</directory>
+-      <outputDirectory>etc/hadoop</outputDirectory>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/examples</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/yarn-service-examples</outputDirectory>
+-      <includes>
+-        <include>**/*</include>
+-      </includes>
+-    </fileSet>
+-    <fileSet>
+-      <directory>hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-api/target</directory>
+-      <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+-      <includes>
+-        <include>*-sources.jar</include>
+-      </includes>
+-    </fileSet>
+     <fileSet>
+       <directory>hadoop-yarn/hadoop-yarn-client/target</directory>
+       <outputDirectory>/share/hadoop/${hadoop.component}/sources</outputDirectory>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index cd9576b088f..ad056195706 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -580,25 +580,6 @@
+         <version>${project.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-core</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-core</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>test-jar</type>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-services-api</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+index b1c38d02b86..32bdf55d1d7 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
+@@ -33,10 +33,6 @@
+ 
+   <!-- Do not add dependencies here, add them to the POM of the leaf module -->
+ 
+-  <modules>
+-    <module>hadoop-yarn-services</module>
+-  </modules>
+-
+  <profiles>
+   <profile>
+     <id>clover</id>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index 0a3f39e41bc..e79e643a7f1 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -81,10 +81,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-services-core</artifactId>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.1/026-remove-hadoop-yarn-server-router.patch b/hadoop/stackable/patches/3.4.1/026-remove-hadoop-yarn-server-router.patch
new file mode 100644
index 000000000..4a244ff37
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/026-remove-hadoop-yarn-server-router.patch
@@ -0,0 +1,44 @@
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index ad056195706..9a1ae24385b 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -568,12 +568,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-router</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index 1856e97a654..e62d38f14e9 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -45,7 +45,6 @@
+     <module>hadoop-yarn-server-timelineservice</module>
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
+-    <module>hadoop-yarn-server-router</module>
+     <module>hadoop-yarn-server-timelineservice-documentstore</module>
+     <module>hadoop-yarn-server-globalpolicygenerator</module>
+   </modules>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index e79e643a7f1..2f5d50dc3fc 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -73,10 +73,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-router</artifactId>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
diff --git a/hadoop/stackable/patches/3.4.1/027-remove-hadoop-yarn-server-globalpolicygenerator.patch b/hadoop/stackable/patches/3.4.1/027-remove-hadoop-yarn-server-globalpolicygenerator.patch
new file mode 100644
index 000000000..0c3b118da
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/027-remove-hadoop-yarn-server-globalpolicygenerator.patch
@@ -0,0 +1,43 @@
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 9a1ae24385b..1cf40d06dfe 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -568,12 +568,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+-        <version>${project.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index e62d38f14e9..7b0441dd616 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -46,6 +46,5 @@
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
+     <module>hadoop-yarn-server-timelineservice-documentstore</module>
+-    <module>hadoop-yarn-server-globalpolicygenerator</module>
+   </modules>
+ </project>
+diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml
+index 2f5d50dc3fc..0ceeb5380de 100644
+--- a/hadoop-yarn-project/pom.xml
++++ b/hadoop-yarn-project/pom.xml
+@@ -73,10 +73,6 @@
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-yarn-server-globalpolicygenerator</artifactId>
+-    </dependency>
+   </dependencies>
+ 
+   <build>
diff --git a/hadoop/stackable/patches/3.4.1/028-remove-hadoop-yarn-server-timeline-pluginstorage.patch b/hadoop/stackable/patches/3.4.1/028-remove-hadoop-yarn-server-timeline-pluginstorage.patch
new file mode 100644
index 000000000..5682a1788
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/028-remove-hadoop-yarn-server-timeline-pluginstorage.patch
@@ -0,0 +1,36 @@
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index 1cf40d06dfe..b623be5215f 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -555,19 +555,6 @@
+         <version>${hadoop.version}</version>
+       </dependency>
+ 
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-yarn-server-timeline-pluginstorage</artifactId>
+-        <type>test-jar</type>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+-
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index 7b0441dd616..ca533269634 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -41,7 +41,6 @@
+     <module>hadoop-yarn-server-sharedcachemanager</module>
+     <module>hadoop-yarn-server-tests</module>
+     <module>hadoop-yarn-server-applicationhistoryservice</module>
+-    <module>hadoop-yarn-server-timeline-pluginstorage</module>
+     <module>hadoop-yarn-server-timelineservice</module>
+     <module>hadoop-yarn-server-timelineservice-hbase</module>
+     <module>hadoop-yarn-server-timelineservice-hbase-tests</module>
diff --git a/hadoop/stackable/patches/3.4.1/029-remove-hadoop-client-check-test-invariants.patch b/hadoop/stackable/patches/3.4.1/029-remove-hadoop-client-check-test-invariants.patch
new file mode 100644
index 000000000..ba254daf2
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/029-remove-hadoop-client-check-test-invariants.patch
@@ -0,0 +1,46 @@
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 03e6c0d97df..6e044ae1181 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -37,7 +37,6 @@
+     <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+-    <module>hadoop-client-check-test-invariants</module>
+     <!-- Attempt to use the created libraries -->
+     <module>hadoop-client-integration-tests</module>
+   </modules>
+diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
+index f035cc9692b..fa1878a1303 100644
+--- a/hadoop-dist/pom.xml
++++ b/hadoop-dist/pom.xml
+@@ -67,12 +67,6 @@
+       <type>pom</type>
+       <scope>provided</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-check-test-invariants</artifactId>
+-      <type>pom</type>
+-      <scope>provided</scope>
+-    </dependency>
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>hadoop-client-integration-tests</artifactId>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index b623be5215f..abff3976b4f 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -285,12 +285,6 @@
+         <version>${hadoop.version}</version>
+         <type>pom</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-check-test-invariants</artifactId>
+-        <version>${hadoop.version}</version>
+-        <type>pom</type>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-client-integration-tests</artifactId>
diff --git a/hadoop/stackable/patches/3.4.1/030-remove-hadoop-client-integration-tests.patch b/hadoop/stackable/patches/3.4.1/030-remove-hadoop-client-integration-tests.patch
new file mode 100644
index 000000000..46b5ec861
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/030-remove-hadoop-client-integration-tests.patch
@@ -0,0 +1,46 @@
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 6e044ae1181..1a858204c66 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -37,8 +37,6 @@
+     <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+-    <!-- Attempt to use the created libraries -->
+-    <module>hadoop-client-integration-tests</module>
+   </modules>
+ 
+ </project>
+diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
+index fa1878a1303..d321f29be64 100644
+--- a/hadoop-dist/pom.xml
++++ b/hadoop-dist/pom.xml
+@@ -67,12 +67,6 @@
+       <type>pom</type>
+       <scope>provided</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.apache.hadoop</groupId>
+-      <artifactId>hadoop-client-integration-tests</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-
+   </dependencies>
+ 
+   <build>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index abff3976b4f..b49ad05a1e0 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -285,11 +285,6 @@
+         <version>${hadoop.version}</version>
+         <type>pom</type>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-integration-tests</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-client-runtime</artifactId>
diff --git a/hadoop/stackable/patches/3.4.1/031-remove-hadoop-client-minicluster.patch b/hadoop/stackable/patches/3.4.1/031-remove-hadoop-client-minicluster.patch
new file mode 100644
index 000000000..460761be6
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/031-remove-hadoop-client-minicluster.patch
@@ -0,0 +1,41 @@
+diff --git a/dev-support/bin/dist-layout-stitching b/dev-support/bin/dist-layout-stitching
+index e769b26ff84..1f6c1f79f5a 100755
+--- a/dev-support/bin/dist-layout-stitching
++++ b/dev-support/bin/dist-layout-stitching
+@@ -146,7 +146,6 @@ run cp -pr "${ROOT}/hadoop-common-project/hadoop-kms/target/hadoop-kms-${VERSION
+ run mkdir -p "share/hadoop/client"
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-api/target/hadoop-client-api-${VERSION}.jar" share/hadoop/client/
+ run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-runtime/target/hadoop-client-runtime-${VERSION}.jar" share/hadoop/client/
+-run cp -p "${ROOT}/hadoop-client-modules/hadoop-client-minicluster/target/hadoop-client-minicluster-${VERSION}.jar" share/hadoop/client/
+ 
+ run copy "${ROOT}/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${VERSION}" .
+ 
+diff --git a/hadoop-client-modules/pom.xml b/hadoop-client-modules/pom.xml
+index 1a858204c66..1b77a04bb4c 100644
+--- a/hadoop-client-modules/pom.xml
++++ b/hadoop-client-modules/pom.xml
+@@ -33,8 +33,6 @@
+     <module>hadoop-client-api</module>
+     <!-- Should be used at runtime scope for remaining classes necessary for hadoop-client-api to function -->
+     <module>hadoop-client-runtime</module>
+-    <!-- Should be used at test scope for those that need access to mini cluster that works with above api and runtime -->
+-    <module>hadoop-client-minicluster</module>
+     <!-- Checks invariants above -->
+     <module>hadoop-client-check-invariants</module>
+   </modules>
+diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
+index b49ad05a1e0..9ed26fbeb67 100644
+--- a/hadoop-project/pom.xml
++++ b/hadoop-project/pom.xml
+@@ -290,11 +290,6 @@
+         <artifactId>hadoop-client-runtime</artifactId>
+         <version>${hadoop.version}</version>
+       </dependency>
+-      <dependency>
+-        <groupId>org.apache.hadoop</groupId>
+-        <artifactId>hadoop-client-minicluster</artifactId>
+-        <version>${hadoop.version}</version>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.hadoop</groupId>
+         <artifactId>hadoop-common</artifactId>
diff --git a/hadoop/stackable/patches/3.4.1/032-remove-hadoop-yarn-server-sharedcachemanager.patch b/hadoop/stackable/patches/3.4.1/032-remove-hadoop-yarn-server-sharedcachemanager.patch
new file mode 100644
index 000000000..c31d78cdc
--- /dev/null
+++ b/hadoop/stackable/patches/3.4.1/032-remove-hadoop-yarn-server-sharedcachemanager.patch
@@ -0,0 +1,12 @@
+diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+index ca533269634..0dffcee97f9 100644
+--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/pom.xml
+@@ -38,7 +38,6 @@
+     <module>hadoop-yarn-server-nodemanager</module>
+     <module>hadoop-yarn-server-web-proxy</module>
+     <module>hadoop-yarn-server-resourcemanager</module>
+-    <module>hadoop-yarn-server-sharedcachemanager</module>
+     <module>hadoop-yarn-server-tests</module>
+     <module>hadoop-yarn-server-applicationhistoryservice</module>
+     <module>hadoop-yarn-server-timelineservice</module>